From b6d0843e552f498fa5963b93fdb89bbfceea8021 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Thu, 4 Oct 2018 14:33:29 +0200
Subject: [PATCH 01/13] Fix dashboard edition when a bad OQL is present in
 dashlet 'Group By'

---
 application/dashlet.class.inc.php | 110 ++++++++++++++++++++----------
 1 file changed, 74 insertions(+), 36 deletions(-)

diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php
index 7132c8f2b..f06ec427a 100644
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -330,31 +330,62 @@ EOF
 
 	protected function GetGroupByOptions($sOql)
 	{
-		$oQuery = $this->oModelReflection->GetQuery($sOql);
-		$sClass = $oQuery->GetClass();
 		$aGroupBy = array();
-		foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType)
+		try
 		{
-			if ($sAttType == 'AttributeLinkedSet') continue;
-			if (is_subclass_of($sAttType, 'AttributeLinkedSet')) continue;
-			if ($sAttType == 'AttributeFriendlyName') continue;
-			if (is_subclass_of($sAttType, 'AttributeFriendlyName')) continue;
-			if ($sAttType == 'AttributeExternalField') continue;
-			if (is_subclass_of($sAttType, 'AttributeExternalField')) continue;
-			if ($sAttType == 'AttributeOneWayPassword') continue;
-
-			$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
-			$aGroupBy[$sAttCode] = $sLabel;
-
-			if (is_subclass_of($sAttType, 'AttributeDateTime') || $sAttType == 'AttributeDateTime')
+			$oQuery = $this->oModelReflection->GetQuery($sOql);
+			$sClass = $oQuery->GetClass();
+			foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType)
 			{
-				$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel);
-				$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month', $sLabel);
-				$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek', $sLabel);
-				$aGroupBy[$sAttCode.':day_of_month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth', $sLabel);
+				if ($sAttType == 'AttributeLinkedSet')
+				{
+					continue;
+				}
+				if (is_subclass_of($sAttType, 'AttributeLinkedSet'))
+				{
+					continue;
+				}
+				if ($sAttType == 'AttributeFriendlyName')
+				{
+					continue;
+				}
+				if (is_subclass_of($sAttType, 'AttributeFriendlyName'))
+				{
+					continue;
+				}
+				if ($sAttType == 'AttributeExternalField')
+				{
+					continue;
+				}
+				if (is_subclass_of($sAttType, 'AttributeExternalField'))
+				{
+					continue;
+				}
+				if ($sAttType == 'AttributeOneWayPassword')
+				{
+					continue;
+				}
+
+				$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
+				$aGroupBy[$sAttCode] = $sLabel;
+
+				if (is_subclass_of($sAttType, 'AttributeDateTime') || $sAttType == 'AttributeDateTime')
+				{
+					$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel);
+					$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month',
+						$sLabel);
+					$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek',
+						$sLabel);
+					$aGroupBy[$sAttCode.':day_of_month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth',
+						$sLabel);
+				}
 			}
+			asort($aGroupBy);
+		}
+		catch(Exception $e)
+		{
+			// Bad OQL is ignored
 		}
-		asort($aGroupBy);
 		return $aGroupBy;
 	}
 
@@ -1219,25 +1250,32 @@ abstract class DashletGroupBy extends Dashlet
 	protected function GetNumericAttributes($sOql)
 	{
 		$aFunctionAttributes = array();
-		$oQuery = $this->oModelReflection->GetQuery($sOql);
-		$sClass = $oQuery->GetClass();
-		if (is_null($sClass))
+		try
 		{
-			return $aFunctionAttributes;
-		}
-		foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType)
-		{
-			switch ($sAttType)
+			$oQuery = $this->oModelReflection->GetQuery($sOql);
+			$sClass = $oQuery->GetClass();
+			if (is_null($sClass))
 			{
-				case 'AttributeDecimal':
-				case 'AttributeDuration':
-				case 'AttributeInteger':
-				case 'AttributePercentage':
-				case 'AttributeSubItem': // TODO: Known limitation: no unit displayed (values in sec)
-					$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
-					$aFunctionAttributes[$sAttCode] = $sLabel;
-					break;
+				return $aFunctionAttributes;
 			}
+			foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType)
+			{
+				switch ($sAttType)
+				{
+					case 'AttributeDecimal':
+					case 'AttributeDuration':
+					case 'AttributeInteger':
+					case 'AttributePercentage':
+					case 'AttributeSubItem': // TODO: Known limitation: no unit displayed (values in sec)
+						$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
+						$aFunctionAttributes[$sAttCode] = $sLabel;
+						break;
+				}
+			}
+		}
+		catch (Exception $e)
+		{
+			// Ignore bad OQL
 		}
 
 		return $aFunctionAttributes;

From b84ac80aaaee96d9b75138db67b7c3b371570c1a Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 8 Oct 2018 13:05:45 +0200
Subject: [PATCH 02/13] =?UTF-8?q?(Cherry=20pick=20from=20develop=20ab1715e?=
 =?UTF-8?q?)=20N=C2=B01576=20Portal:=20Security=20hardening=20(missed=20on?=
 =?UTF-8?q?e=20file=20in=20previous=20commit).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../managebrickcontroller.class.inc.php       | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
index ac094151e..99cd4174e 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
@@ -577,7 +577,7 @@ class ManageBrickController extends BrickController
 						$oAttDef = MetaModel::GetAttributeDef($sCurrentClass, $sItemAttr);
 						if ($oAttDef->IsExternalKey())
 						{
-							$sValue = $oCurrentRow->Get($sItemAttr.'_friendlyname');
+							$sValue = $oCurrentRow->GetAsHTML($sItemAttr.'_friendlyname');
 
 							// Adding a view action on the external keys
 							if ($oCurrentRow->Get($sItemAttr) !== $oAttDef->GetNullValue())
@@ -595,13 +595,22 @@ class ManageBrickController extends BrickController
 								}
 							}
 						}
-						elseif ($oAttDef instanceof AttributeSubItem || $oAttDef instanceof AttributeDuration)
-						{
-							$sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
-						}
+						elseif ($oAttDef instanceof AttributeImage)
+                        {
+                            $oOrmDoc = $oCurrentRow->Get($sItemAttr);
+                            if (is_object($oOrmDoc) && !$oOrmDoc->IsEmpty())
+                            {
+                                $sUrl = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oCurrentRow), 'sObjectId' => $oCurrentRow->GetKey(), 'sObjectField' => $sItemAttr, 'cache' => 86400));
+                            }
+                            else
+                            {
+                                $sUrl = $oAttDef->Get('default_image');
+                            }
+                            $sValue = '<img src="' . $sUrl . '" />';
+                        }
 						else
 						{
-							$sValue = $oAttDef->GetValueLabel($oCurrentRow->Get($sItemAttr));
+                            $sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
 						}
 						unset($oAttDef);
 

From 4a431be0a9e0f4a510d45c00f361a2f4bcbf4383 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Thu, 2 Aug 2018 10:34:58 +0200
Subject: [PATCH 03/13] =?UTF-8?q?(Cherry=20picked=20from=20commit=20509906?=
 =?UTF-8?q?0)=20N=C2=B01203=20:=20Correctly=20use=20'from'=20field=20for?=
 =?UTF-8?q?=20test=20email=20notifications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/action.class.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index fc5a3e3f6..55a96fcda 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -360,6 +360,7 @@ class ActionEmail extends ActionNotification
 			$sTestBody .= "</div>\n";
 			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
 			$oEmail->SetRecipientTO($this->Get('test_recipient'));
+			$oEmail->SetRecipientFrom($sFrom);
 			$oEmail->SetReferences($sReference);
 			$oEmail->SetMessageId($sMessageId);
 		}

From 21d7de7d8d504acd2c9d774ce32e4acf61ae0a6c Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Tue, 9 Oct 2018 17:36:30 +0200
Subject: [PATCH 04/13] =?UTF-8?q?Use=20a=20longer=20timeout=20to=20let=20t?=
 =?UTF-8?q?he=20IFRAME=20load=20itself=20and=20inform=20iTop=20Hub=20of=20?=
 =?UTF-8?q?the=20updated=20configuration.=20(Bug=20N=C2=B01672)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-hub-connector/js/hub.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datamodels/2.x/itop-hub-connector/js/hub.js b/datamodels/2.x/itop-hub-connector/js/hub.js
index cf4387d52..b5f468c3b 100644
--- a/datamodels/2.x/itop-hub-connector/js/hub.js
+++ b/datamodels/2.x/itop-hub-connector/js/hub.js
@@ -138,7 +138,7 @@ $(function()
 				if (this.options.redirect_after_completion_url != '')
 				{
 					var sUrl = this.options.redirect_after_completion_url;
-					window.setTimeout(function() { window.location.href = sUrl; }, 500);					
+					window.setTimeout(function() { window.location.href = sUrl; }, 3000);					
 				}
 			}
 			else

From 80be4b4371b2a7367b458f17f173dfd83d81c3cc Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Tue, 9 Oct 2018 17:18:14 +0200
Subject: [PATCH 05/13] idea files improvements - use Combodo preset - JS code
 style (use tab for indentation, newlines in if/else statements)

---
 .idea/codeStyles/Project.xml         | 8 ++++++++
 .idea/codeStyles/codeStyleConfig.xml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index cbc60d1a0..4f6f26a5a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -11,6 +11,14 @@
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="PHPDOC_USE_FQCN" value="true" />
     </PHPCodeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="PHP">
       <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
       <option name="BRACE_STYLE" value="2" />
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index 79ee123c2..d68e1e434 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Combodo" />
   </state>
 </component>
\ No newline at end of file

From 91b7130671ed45b5c0f1a3859aecf74977e53b29 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Tue, 9 Oct 2018 17:19:23 +0200
Subject: [PATCH 06/13] =?UTF-8?q?N=C2=B01556=20Advanced=20Search=20:=20fix?=
 =?UTF-8?q?=20removing=20only=20criteria=20in=20first=20row=20(was=20gener?=
 =?UTF-8?q?ating=20"AND=201")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/search/search_form_handler.js | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js
index e64f5056f..2929eea63 100644
--- a/js/search/search_form_handler.js
+++ b/js/search/search_form_handler.js
@@ -229,32 +229,38 @@ $(function()
 				}]
 			};
 			// - Retrieve criterion
-			this.elements.criterion_area.find('.sf_criterion_row').each(function(iIdx){
-				var oCriterionRowElem = $(this);
+			var iCurrentCriterionRow = 0;
+			this.elements.criterion_area.find('.sf_criterion_row').each(function (iDomCriterionRowIdx) {
+				var isFirstRow = (iDomCriterionRowIdx === 0),
+					oCriterionRowElem = $(this),
+					oCriteriaRowCriterias = oCriterionRowElem.find('.search_form_criteria');
 
-				if (oCriterionRowElem.find('.search_form_criteria').length == 0 && iIdx > 0)
+				if (oCriteriaRowCriterias.length === 0)
 				{
-					$(this).remove();
+					if (!isFirstRow)
+					{
+						$(this).remove();
+					}
 				}
 				else
 				{
-					oCriterionRowElem.find('.search_form_criteria').each(function ()
-					{
+					oCriteriaRowCriterias.each(function () {
 						var oCriteriaData = $(this).triggerHandler('itop.search.criteria.get_data');
 
 						if (null != oCriteriaData)
 						{
-							if (!oCriterion['or'][iIdx])
+							if (!oCriterion['or'][iCurrentCriterionRow])
 							{
-								oCriterion['or'][iIdx] = {'and': []};
+								oCriterion['or'][iCurrentCriterionRow] = {'and': []};
 							}
-							oCriterion['or'][iIdx]['and'].push(oCriteriaData);
+							oCriterion['or'][iCurrentCriterionRow]['and'].push(oCriteriaData);
 						}
 						else
 						{
 							$(this).remove();
 						}
 					});
+					iCurrentCriterionRow++;
 				}
 			});
 			// - Update search

From eb630efdf54d0ecd4ad729b1f6579a55aebc9135 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Tue, 9 Oct 2018 18:12:37 +0200
Subject: [PATCH 07/13] =?UTF-8?q?N=C2=B01658=20update=20advanced=20search?=
 =?UTF-8?q?=20german=20translation=20(UI:Search:NoAutoSubmit:ExplainText)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dictionaries/de.dictionary.itop.ui.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index 21f13aef2..37f502da5 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -1177,7 +1177,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
     // Search form
     'UI:Search:Toggle' => 'Ein-/Ausklappen',
     'UI:Search:AutoSubmit:DisabledHint' => 'Automatische Eingabe für diese Klasse deaktiviert',
-	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.~~',
+	'UI:Search:NoAutoSubmit:ExplainText' => 'Fügen Sie ein Kriterium in das Suchfeld ein oder klicken Sie auf die Suchschaltfläche, um die Objekte anzuzeigen.',
     'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Kriterium hinzufügen',
     // - Add new criteria button
     'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Kürzlich verwendet',

From 41a479b48da84c995d8204706d43076a409fc6a8 Mon Sep 17 00:00:00 2001
From: steffunky <stephen.abello@combodo.com>
Date: Tue, 9 Oct 2018 18:01:22 +0200
Subject: [PATCH 08/13] =?UTF-8?q?N=C2=B01555:=20fixed=20a=20case=20where?=
 =?UTF-8?q?=20AttributeExternal=20field=20was=20pointing=20anything=20else?=
 =?UTF-8?q?=20than=20an=20ExternalKey=20and=20its=20label=20wouldn't=20sho?=
 =?UTF-8?q?w=20up=20on=20search=20criteria?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/oql/expression.class.inc.php | 4665 +++++++++++++++--------------
 1 file changed, 2338 insertions(+), 2327 deletions(-)

diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php
index 3d3f4e80e..c8e7b633a 100644
--- a/core/oql/expression.class.inc.php
+++ b/core/oql/expression.class.inc.php
@@ -1,2328 +1,2339 @@
-<?php
-// Copyright (c) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-class MissingQueryArgument extends CoreException
-{
-}
-
-
-abstract class Expression
-{
-	/**
-	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
-	 **/
-	public function DeepClone()
-	{
-		return unserialize(serialize($this));
-	}
-
-	// recursive translation of identifiers
-	abstract public function GetUnresolvedFields($sAlias, &$aUnresolved);
-
-	/**
-	 * @param array $aTranslationData
-	 * @param bool $bMatchAll
-	 * @param bool $bMarkFieldsAsResolved
-	 *
-	 * @return Expression Translated expression
-	 */
-	abstract public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);
-
-	/**
-	 * recursive rendering
-	 *
-	 * @param array $aArgs used as input by default, or used as output if bRetrofitParams set to True
-	 * @param bool $bRetrofitParams
-	 *
-	 * @return array|string
-	 * @throws \MissingQueryArgument
-	 */
-	abstract public function Render(&$aArgs = null, $bRetrofitParams = false);
-
-	/**
-	 * @param DBObjectSearch $oSearch
-	 * @param array $aArgs
-	 * @param AttributeDefinition $oAttDef
-	 *
-	 * @param array $aCtx
-	 *
-	 * @return array parameters for the search form
-	 */
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		return $this->Render($aArgs);
-	}
-
-	public function GetAttDef($aClasses = array())
-	{
-		return null;
-	}
-
-	/**
-	 * Recursively browse the expression tree
-	 * @param Closure $callback
-	 * @return mixed
-	 */
-	abstract public function Browse(Closure $callback);
-
-	abstract public function ApplyParameters($aArgs);
-
-	// recursively builds an array of class => fieldname
-	abstract public function ListRequiredFields();
-
-	// recursively list field parents ($aTable = array of sParent => dummy)
-	abstract public function CollectUsedParents(&$aTable);
-
-	abstract public function IsTrue();
-
-	// recursively builds an array of [classAlias][fieldName] => value
-	abstract public function ListConstantFields();
-
-	public function RequiresField($sClass, $sFieldName)
-	{
-		// #@# todo - optimize : this is called quite often when building a single query !
-		$aRequired = $this->ListRequiredFields();
-		if (!in_array($sClass.'.'.$sFieldName, $aRequired)) return false;
-		return true;
-	}
-
-	public function serialize()
-	{
-		return base64_encode($this->Render());
-	}
-
-	/**
-	 * @param $sValue
-	 *
-	 * @return Expression
-	 * @throws OQLException
-	 */
-	static public function unserialize($sValue)
-	{
-		return self::FromOQL(base64_decode($sValue));
-	}
-
-	/**
-	 * @param $sConditionExpr
-	 * @return Expression
-	 */
-	static public function FromOQL($sConditionExpr)
-	{
-		static $aCache = array();
-		if (array_key_exists($sConditionExpr, $aCache))
-		{
-			return unserialize($aCache[$sConditionExpr]);
-		}
-		$oOql = new OqlInterpreter($sConditionExpr);
-		$oExpression = $oOql->ParseExpression();
-		$aCache[$sConditionExpr] = serialize($oExpression);
-
-		return $oExpression;
-	}
-
-	static public function FromSQL($sSQL)
-	{
-		$oSql = new SQLExpression($sSQL);
-		return $oSql;
-	}
-
-	/**
-	 * @param Expression $oExpr
-	 * @return Expression
-	 */
-	public function LogAnd(Expression $oExpr)
-	{
-		if ($this->IsTrue()) return clone $oExpr;
-		if ($oExpr->IsTrue()) return clone $this;
-		return new BinaryExpression($this, 'AND', $oExpr);
-	}
-
-	/**
-	 * @param Expression $oExpr
-	 * @return Expression
-	 */
-	public function LogOr(Expression $oExpr)
-	{
-		return new BinaryExpression($this, 'OR', $oExpr);
-	}
-
-	abstract public function RenameParam($sOldName, $sNewName);
-	abstract public function RenameAlias($sOldName, $sNewName);
-
-	/**
-	 * Make the most relevant label, given the value of the expression
-	 *
-	 * @param DBSearch oFilter The context in which this expression has been used
-	 * @param string sValue The value returned by the query, for this expression
-	 * @param string sDefault The default value if no relevant label could be computed
-	 *
-	 * @return The label
-	 */
-	public function MakeValueLabel($oFilter, $sValue, $sDefault)
-	{
-		return $sDefault;
-	}
-
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		return array(
-			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE_RAW,
-			'oql' => $this->Render($aArgs, $bRetrofitParams),
-			'label' => $this->Display($oSearch, $aArgs, $oAttDef),
-			'source' => get_class($this),
-		);
-	}
-
-	/**
-	 * Split binary expression on given operator
-	 *
-	 * @param Expression $oExpr
-	 * @param string $sOperator
-	 * @param array $aAndExpr
-	 *
-	 * @return array of expressions
-	 */
-	public static function Split($oExpr, $sOperator = 'AND', &$aAndExpr = array())
-	{
-		if (($oExpr instanceof BinaryExpression) && ($oExpr->GetOperator() == $sOperator))
-		{
-			static::Split($oExpr->GetLeftExpr(), $sOperator, $aAndExpr);
-			static::Split($oExpr->GetRightExpr(), $sOperator, $aAndExpr);
-		}
-		else
-		{
-			$aAndExpr[] = $oExpr;
-		}
-
-		return $aAndExpr;
-	}
-}
-
-class SQLExpression extends Expression
-{
-	protected $m_sSQL;
-
-	public function __construct($sSQL)
-	{
-		$this->m_sSQL  = $sSQL;
-	}
-
-	public function IsTrue()
-	{
-		return false;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		return $this->m_sSQL;
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		return clone $this;
-	}
-
-	public function ListRequiredFields()
-	{
-		return array();
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-	}
-
-	public function ListConstantFields()
-	{
-		return array();
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		// Do nothing, since there is nothing to rename
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		// Do nothing, since there is nothing to rename
-	}
-}
-
-
-
-class BinaryExpression extends Expression
-{
-	protected $m_oLeftExpr; // filter code or an SQL expression (later?)
-	protected $m_oRightExpr;
-	protected $m_sOperator;
-
-	public function __construct($oLeftExpr, $sOperator, $oRightExpr)
-	{
-		if (!is_object($oLeftExpr))
-		{
-			throw new CoreException('Expecting an Expression object on the left hand', array('found_type' => gettype($oLeftExpr)));
-		}
-		if (!is_object($oRightExpr))
-		{
-			throw new CoreException('Expecting an Expression object on the right hand', array('found_type' => gettype($oRightExpr)));
-		}
-		if (!$oLeftExpr instanceof Expression)
-		{
-			throw new CoreException('Expecting an Expression object on the left hand', array('found_class' => get_class($oLeftExpr)));
-		}
-		if (!$oRightExpr instanceof Expression)
-		{
-			throw new CoreException('Expecting an Expression object on the right hand', array('found_class' => get_class($oRightExpr)));
-		}
-		if ( (($sOperator == "IN") ||  ($sOperator == "NOT IN")) && !$oRightExpr instanceof ListExpression)
-		{
-			throw new CoreException("Expecting a List Expression object on the right hand for operator $sOperator", array('found_class' => get_class($oRightExpr)));
-		}
-		$this->m_oLeftExpr  = $oLeftExpr;
-		$this->m_oRightExpr = $oRightExpr;
-		$this->m_sOperator  = $sOperator;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		if ($this->m_sOperator == 'AND')
-		{
-			if ($this->m_oLeftExpr->IsTrue() && $this->m_oRightExpr->IsTrue()) return true;
-		}
-		elseif ($this->m_sOperator == 'OR')
-		{
-			if ($this->m_oLeftExpr->IsTrue() || $this->m_oRightExpr->IsTrue()) return true;
-		}
-		return false;
-	}
-
-	public function GetLeftExpr()
-	{
-		return $this->m_oLeftExpr;
-	}
-
-	public function GetRightExpr()
-	{
-		return $this->m_oRightExpr;
-	}
-
-	public function GetOperator()
-	{
-		return $this->m_sOperator;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		$sOperator = $this->GetOperator();
-		$sLeft = $this->GetLeftExpr()->Render($aArgs, $bRetrofitParams);
-		$sRight = $this->GetRightExpr()->Render($aArgs, $bRetrofitParams);
-		return "($sLeft $sOperator $sRight)";
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-		$this->m_oLeftExpr->Browse($callback);
-		$this->m_oRightExpr->Browse($callback);
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-		if ($this->m_oLeftExpr instanceof VariableExpression)
-		{
-			$this->m_oLeftExpr = $this->m_oLeftExpr->GetAsScalar($aArgs);
-		}
-		else //if ($this->m_oLeftExpr instanceof Expression)
-		{
-			$this->m_oLeftExpr->ApplyParameters($aArgs);
-		}
-		if ($this->m_oRightExpr instanceof VariableExpression)
-		{
-			$this->m_oRightExpr = $this->m_oRightExpr->GetAsScalar($aArgs);
-		}
-		else //if ($this->m_oRightExpr instanceof Expression)
-		{
-			$this->m_oRightExpr->ApplyParameters($aArgs);
-		}
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		$this->GetLeftExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
-		$this->GetRightExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		$oLeft = $this->GetLeftExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		return new BinaryExpression($oLeft, $this->GetOperator(), $oRight);
-	}
-
-	public function ListRequiredFields()
-	{
-		$aLeft = $this->GetLeftExpr()->ListRequiredFields();
-		$aRight = $this->GetRightExpr()->ListRequiredFields();
-		return array_merge($aLeft, $aRight);
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-		$this->GetLeftExpr()->CollectUsedParents($aTable);
-		$this->GetRightExpr()->CollectUsedParents($aTable);
-	}
-
-	public function GetAttDef($aClasses = array())
-	{
-		$oAttDef = $this->GetLeftExpr()->GetAttDef($aClasses);
-		if (!is_null($oAttDef)) return $oAttDef;
-
-		return $this->GetRightExpr()->GetAttDef($aClasses);
-	}
-
-	/**
-	 * List all constant expression of the form <field> = <scalar> or <field> = :<variable>
-	 * Could be extended to support <field> = <function><constant_expression>
-	 */
-	public function ListConstantFields()
-	{
-		$aResult = array();
-		if ($this->m_sOperator == '=')
-		{
-			if (($this->m_oLeftExpr instanceof FieldExpression) && ($this->m_oRightExpr instanceof ScalarExpression))
-			{
-				$aResult[$this->m_oLeftExpr->GetParent()][$this->m_oLeftExpr->GetName()] = $this->m_oRightExpr;
-			}
-			else if (($this->m_oRightExpr instanceof FieldExpression) && ($this->m_oLeftExpr instanceof ScalarExpression))
-			{
-				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
-			}
-			else if (($this->m_oLeftExpr instanceof FieldExpression) && ($this->m_oRightExpr instanceof VariableExpression))
-			{
-				$aResult[$this->m_oLeftExpr->GetParent()][$this->m_oLeftExpr->GetName()] = $this->m_oRightExpr;
-			}
-			else if (($this->m_oRightExpr instanceof FieldExpression) && ($this->m_oLeftExpr instanceof VariableExpression))
-			{
-				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
-			}
-		}
-		else if ($this->m_sOperator == 'AND')
-		{
-			// Strictly, this should be done only for the AND operator
-			$aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields());
-		}
-		return $aResult;
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		$this->GetLeftExpr()->RenameParam($sOldName, $sNewName);
-		$this->GetRightExpr()->RenameParam($sOldName, $sNewName);
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		$this->GetLeftExpr()->RenameAlias($sOldName, $sNewName);
-		$this->GetRightExpr()->RenameAlias($sOldName, $sNewName);
-	}
-
-	// recursive rendering
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		$bReverseOperator = false;
-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$aClasses = $oSearch->GetJoinedClasses();
-		}
-		else
-		{
-			$aClasses = array($oSearch->GetClass());
-		}
-		$oLeftExpr = $this->GetLeftExpr();
-		if ($oLeftExpr instanceof FieldExpression)
-		{
-			$oAttDef = $oLeftExpr->GetAttDef($aClasses);
-		}
-		$oRightExpr = $this->GetRightExpr();
-		if ($oRightExpr instanceof FieldExpression)
-		{
-			$oAttDef = $oRightExpr->GetAttDef($aClasses);
-			$bReverseOperator = true;
-		}
-
-
-		if ($bReverseOperator)
-		{
-			$sRight = $oRightExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
-			$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
-
-			// switch left and right expressions so reverse the operator
-			// Note that the operation is the same so < becomes > and not >=
-			switch ($this->GetOperator())
-			{
-				case '>':
-					$sOperator = '<';
-					break;
-				case '<':
-					$sOperator = '>';
-					break;
-				case '>=':
-					$sOperator = '<=';
-					break;
-				case '<=':
-					$sOperator = '>=';
-					break;
-				default:
-					$sOperator = $this->GetOperator();
-					break;
-			}
-			$sOperator = $this->OperatorToNaturalLanguage($sOperator, $oAttDef);
-
-			return "({$sRight}{$sOperator}{$sLeft})";
-		}
-
-		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
-		$sRight = $oRightExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
-
-		$sOperator = $this->GetOperator();
-		$sOperator = $this->OperatorToNaturalLanguage($sOperator, $oAttDef);
-
-		return "({$sLeft}{$sOperator}{$sRight})";
-	}
-
-	private function OperatorToNaturalLanguage($sOperator, $oAttDef)
-	{
-		if ($oAttDef instanceof AttributeDateTime)
-		{
-			return Dict::S('Expression:Operator:Date:'.$sOperator, " $sOperator ");
-		}
-
-		return Dict::S('Expression:Operator:'.$sOperator, " $sOperator ");
-	}
-
-	/**
-	 * @param DBSearch $oSearch
-	 * @param null $aArgs
-	 * @param bool $bRetrofitParams
-	 * @param null $oAttDef
-	 *
-	 * @return array
-	 */
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$bReverseOperator = false;
-		$oLeftExpr = $this->GetLeftExpr();
-		$oRightExpr = $this->GetRightExpr();
-
-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$aClasses = $oSearch->GetJoinedClasses();
-		}
-		else
-		{
-			$aClasses = array($oSearch->GetClass());
-		}
-
-		$oAttDef = $oLeftExpr->GetAttDef($aClasses);
-		if (is_null($oAttDef))
-		{
-			$oAttDef = $oRightExpr->GetAttDef($aClasses);
-			$bReverseOperator = true;
-		}
-
-		if (is_null($oAttDef))
-		{
-			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		}
-
-
-		if ($bReverseOperator)
-		{
-			$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-			// $oAttDef can be different now
-			$oAttDef = $oRightExpr->GetAttDef($aClasses);
-			$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-
-			// switch left and right expressions so reverse the operator
-			// Note that the operation is the same so < becomes > and not >=
-			switch ($this->GetOperator())
-			{
-				case '>':
-					$sOperator = '<';
-					break;
-				case '<':
-					$sOperator = '>';
-					break;
-				case '>=':
-					$sOperator = '<=';
-					break;
-				case '<=':
-					$sOperator = '>=';
-					break;
-				default:
-					$sOperator = $this->GetOperator();
-					break;
-			}
-			$aCriteria = self::MergeCriteria($aCriteriaRight, $aCriteriaLeft, $sOperator);
-		}
-		else
-		{
-			$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-			// $oAttDef can be different now
-			$oAttDef = $oLeftExpr->GetAttDef($aClasses);
-			$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-
-			$aCriteria = self::MergeCriteria($aCriteriaLeft, $aCriteriaRight, $this->GetOperator());
-		}
-		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
-		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $oAttDef);
-
-		if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] != $aCriteriaRight['ref']))
-		{
-			// Only one Field is supported in the expressions
-			$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
-		}
-
-		return $aCriteria;
-	}
-
-	protected static function MergeCriteria($aCriteriaLeft, $aCriteriaRight, $sOperator)
-	{
-		$aCriteriaOverride = array();
-		$aCriteriaOverride['operator'] = $sOperator;
-		if ($sOperator == 'OR')
-		{
-			if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] == $aCriteriaRight['ref']))
-			{
-				if (isset($aCriteriaLeft['widget']) && isset($aCriteriaRight['widget']) && ($aCriteriaLeft['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY) && ($aCriteriaRight['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY))
-				{
-					$aCriteriaOverride['operator'] = 'IN';
-					$aCriteriaOverride['is_hierarchical'] = true;
-
-					if (isset($aCriteriaLeft['values']) && isset($aCriteriaRight['values']))
-					{
-						$aCriteriaOverride['values'] = array_merge($aCriteriaLeft['values'], $aCriteriaRight['values']);
-					}
-				}
-			}
-		}
-
-		return array_merge($aCriteriaLeft, $aCriteriaRight, $aCriteriaOverride);
-	}
-}
-
-
-class UnaryExpression extends Expression
-{
-	protected $m_value;
-
-	public function __construct($value)
-	{
-		$this->m_value = $value;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return ($this->m_value == 1);
-	}
-
-	public function GetValue()
-	{
-		return $this->m_value;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		return CMDBSource::Quote($this->m_value);
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		return clone $this;
-	}
-
-	public function ListRequiredFields()
-	{
-		return array();
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-	}
-
-	public function ListConstantFields()
-	{
-		return array();
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		// Do nothing
-		// really ? what about :param{$iParamIndex} ??
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		// Do nothing
-	}
-}
-
-class ScalarExpression extends UnaryExpression
-{
-	public function __construct($value)
-	{
-		if (!is_scalar($value) && !is_null($value) && (!$value instanceof OqlHexValue))
-		{
-			throw new CoreException('Attempt to create a scalar expression from a non scalar', array('var_type'=>gettype($value)));
-		}
-		parent::__construct($value);
-	}
-
-	/**
-	 * @param array $oSearch
-	 * @param array $aArgs
-	 * @param AttributeDefinition $oAttDef
-	 *
-	 * @param array $aCtx
-	 *
-	 * @return array|string
-	 * @throws \Exception
-	 */
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		if (!is_null($oAttDef))
-		{
-			if ($oAttDef->IsExternalKey())
-			{
-				try
-				{
-					/** @var AttributeExternalKey $oAttDef */
-					$sTarget = $oAttDef->GetTargetClass();
-					$oObj = MetaModel::GetObject($sTarget, $this->m_value, false);
-					if (empty($oObj))
-					{
-						return Dict::S('Enum:Undefined');
-					}
-
-					return $oObj->Get("friendlyname");
-				} catch (CoreException $e)
-				{
-				}
-			}
-
-			if (!($oAttDef instanceof AttributeDateTime))
-			{
-				return $oAttDef->GetAsPlainText($this->m_value);
-			}
-		}
-
-		if (strpos($this->m_value, '%') === 0)
-		{
-			return '';
-		}
-
-		if (isset($aCtx['date_display']))
-		{
-			return $aCtx['date_display']->MakeValueLabel($oSearch, $this->m_value, $this->m_value);
-		}
-
-		return $this->Render($aArgs);
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		if (is_null($this->m_value))
-		{
-			$sRet = 'NULL';
-		}
-		else
-		{
-			$sRet = CMDBSource::Quote($this->m_value);
-		}
-		return $sRet;
-	}
-
-	public function GetAsScalar($aArgs)
-	{
-		return clone $this;
-	}
-
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$aCriteria = array();
-		switch ((string)($this->m_value))
-		{
-			case '%Y-%m-%d':
-				$aCriteria['unit'] = 'DAY';
-				break;
-			case '%Y-%m':
-				$aCriteria['unit'] = 'MONTH';
-				break;
-			case '%w':
-				$aCriteria['unit'] = 'WEEKDAY';
-				break;
-			case '%H':
-				$aCriteria['unit'] = 'HOUR';
-				break;
-			default:
-				$aValue = array('value' => $this->GetValue());
-				if (!is_null($oAttDef))
-				{
-					switch (true)
-					{
-						case ($oAttDef instanceof AttributeExternalField):
-							try
-							{
-								if ($this->GetValue() == 0)
-								{
-									$aValue['label'] = Dict::S('UI:UndefinedObject');
-								}
-								else
-								{
-									/** @var AttributeExternalKey $oAttDef */
-									$sTarget = $oAttDef->GetFinalAttDef()->GetTargetClass();
-									$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
-
-									$aValue['label'] = $oObj->Get("friendlyname");
-								}
-							}
-							catch (Exception $e)
-							{
-								IssueLog::Error($e->getMessage());
-							}
-							break;
-						case $oAttDef->IsExternalKey():
-							try
-							{
-								if ($this->GetValue() == 0)
-								{
-									$aValue['label'] = Dict::S('UI:UndefinedObject');
-								}
-								else
-								{
-									/** @var AttributeExternalKey $oAttDef */
-									$sTarget = $oAttDef->GetTargetClass();
-									$oObj = MetaModel::GetObject($sTarget, $this->GetValue(), true, true);
-									$aValue['label'] = $oObj->Get("friendlyname");
-								}
-							}
-							catch (Exception $e)
-							{
-								IssueLog::Error($e->getMessage());
-							}
-							break;
-						default:
-							try
-							{
-								$aValue['label'] = $oAttDef->GetAsPlainText($this->GetValue());
-							} catch (Exception $e)
-							{
-								$aValue['label'] = $this->GetValue();
-							}
-							break;
-					}
-				}
-				$aCriteria['values'] = array($aValue);
-				break;
-		}
-		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
-		return $aCriteria;
-	}
-
-}
-
-class TrueExpression extends ScalarExpression
-{
-	public function __construct()
-	{
-		parent::__construct(1);
-	}
-
-	public function IsTrue()
-	{
-		return true;
-	}
-}
-
-class FalseExpression extends ScalarExpression
-{
-	public function __construct()
-	{
-		parent::__construct(0);
-	}
-
-	public function IsTrue()
-	{
-		return false;
-	}
-}
-
-class FieldExpression extends UnaryExpression
-{
-	protected $m_sParent;
-	protected $m_sName;
-
-	public function __construct($sName, $sParent = '')
-	{
-		parent::__construct("$sParent.$sName");
-
-		$this->m_sParent = $sParent;
-		$this->m_sName = $sName;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return false;
-	}
-
-	public function GetParent() {return $this->m_sParent;}
-	public function GetName() {return $this->m_sName;}
-
-	public function SetParent($sParent)
-	{
-		$this->m_sParent = $sParent;
-		$this->m_value = $sParent.'.'.$this->m_sName;
-	}
-
-	private function GetClassName($aClasses = array())
-	{
-		if (isset($aClasses[$this->m_sParent]))
-		{
-			return $aClasses[$this->m_sParent];
-		}
-		else
-		{
-			return $this->m_sParent;
-		}
-	}
-
-	/**
-	 * @param DBObjectSearch $oSearch
-	 * @param array $aArgs
-	 * @param AttributeDefinition $oAttDef
-	 *
-	 * @param array $aCtx
-	 *
-	 * @return array|string
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 */
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		if (empty($this->m_sParent))
-		{
-			return "`{$this->m_sName}`";
-		}
-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$aClasses = $oSearch->GetJoinedClasses();
-		}
-		else
-		{
-			$aClasses = array($oSearch->GetClass());
-		}
-		$sClass = $this->GetClassName($aClasses);
-		$sAttName = MetaModel::GetLabel($sClass, $this->m_sName);
-		if ($sClass != $oSearch->GetClass())
-		{
-			$sAttName = MetaModel::GetName($sClass).':'.$sAttName;
-		}
-
-		return $sAttName;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		if (empty($this->m_sParent))
-		{
-			return "`{$this->m_sName}`";
-		}
-		return "`{$this->m_sParent}`.`{$this->m_sName}`";
-	}
-
-	public function GetAttDef($aClasses = array())
-	{
-		if (!empty($this->m_sParent))
-		{
-			$sClass = $this->GetClassName($aClasses);
-			$aAttDefs = MetaModel::ListAttributeDefs($sClass);
-			if (isset($aAttDefs[$this->m_sName]))
-			{
-				return $aAttDefs[$this->m_sName];
-			}
-			else
-			{
-				if ($this->m_sName == 'id')
-				{
-					$aParams = array(
-						'default_value' => 0,
-						'is_null_allowed' => false,
-						'allowed_values' => null,
-						'depends_on' => null,
-						'sql' => 'id',
-					);
-
-					return new AttributeInteger($this->m_sName, $aParams);
-				}
-			}
-		}
-
-		return null;
-	}
-
-
-	public function ListRequiredFields()
-	{
-		return array($this->m_sParent.'.'.$this->m_sName);
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-		$aTable[$this->m_sParent] = true;
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		if ($this->m_sParent == $sAlias)
-		{
-			// Add a reference to the field
-			$aUnresolved[$this->m_sName] = $this;
-		}
-		elseif ($sAlias == '')
-		{
-			// An empty alias means "any alias"
-			// In such a case, the results are indexed differently
-			$aUnresolved[$this->m_sParent][$this->m_sName] = $this;
-		}
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		if (!array_key_exists($this->m_sParent, $aTranslationData))
-		{
-			if ($bMatchAll) throw new CoreException('Unknown parent id in translation table', array('parent_id' => $this->m_sParent, 'translation_table' => array_keys($aTranslationData)));
-
-			return clone $this;
-		}
-		if (!array_key_exists($this->m_sName, $aTranslationData[$this->m_sParent]))
-		{
-			if (!array_key_exists('*', $aTranslationData[$this->m_sParent]))
-			{
-				// #@# debug - if ($bMatchAll) MyHelpers::var_dump_html($aTranslationData, true);
-				if ($bMatchAll) throw new CoreException('Unknown name in translation table', array('name' => $this->m_sName, 'parent_id' => $this->m_sParent, 'translation_table' => array_keys($aTranslationData[$this->m_sParent])));
-				return clone $this;
-			}
-			$sNewParent = $aTranslationData[$this->m_sParent]['*'];
-			$sNewName = $this->m_sName;
-			if ($bMarkFieldsAsResolved)
-			{
-				$oRet = new FieldExpressionResolved($sNewName, $sNewParent);
-			}
-			else
-			{
-				$oRet = new FieldExpression($sNewName, $sNewParent);
-			}
-		}
-		else
-		{
-			$oRet = $aTranslationData[$this->m_sParent][$this->m_sName];
-		}
-		return $oRet;
-	}
-
-	/**
-	 * Make the most relevant label, given the value of the expression
-	 *
-	 * @param DBSearch oFilter The context in which this expression has been used
-	 * @param string sValue The value returned by the query, for this expression
-	 * @param string sDefault The default value if no relevant label could be computed
-	 *
-	 * @return The label
-	 * @throws \CoreException
-	 */
-	public function MakeValueLabel($oFilter, $sValue, $sDefault)
-	{
-		$sAttCode = $this->GetName();
-		$sParentAlias = $this->GetParent();
-
-		$aSelectedClasses = $oFilter->GetSelectedClasses();
-		$sClass = $aSelectedClasses[$sParentAlias];
-
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		// Set a default value for the general case
-		$sRes = $oAttDef->GetAsHtml($sValue);
-
-		// Exceptions...
-		if ($oAttDef->IsExternalKey())
-		{
-			/** @var AttributeExternalKey $oAttDef */
-			$sObjClass = $oAttDef->GetTargetClass();
-			$iObjKey = (int)$sValue;
-			if ($iObjKey > 0)
-			{
-				$oObject = MetaModel::GetObjectWithArchive($sObjClass, $iObjKey, true, true);
-				$sRes = $oObject->GetHyperlink();
-			}
-			else
-			{
-				// Undefined
-				$sRes = DBObject::MakeHyperLink($sObjClass, 0);
-			}
-		}
-		elseif ($oAttDef->IsExternalField())
-		{
-			if (is_null($sValue))
-			{
-				$sRes = Dict::S('UI:UndefinedObject');
-			}
-		}
-		return $sRes;
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		if ($this->m_sParent == $sOldName)
-		{
-			$this->m_sParent = $sNewName;
-		}
-	}
-
-	private function GetJoinedFilters($oSearch, $iOperatorCodeTarget)
-	{
-		$aFilters = array();
-		$aPointingToByKey = $oSearch->GetCriteria_PointingTo();
-		foreach ($aPointingToByKey as $sExtKey => $aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				if ($iOperatorCode == $iOperatorCodeTarget)
-				{
-					foreach($aFilter as $oExtFilter)
-					{
-						$aFilters[$sExtKey] = $oExtFilter;
-					}
-				}
-			}
-		}
-		return $aFilters;
-	}
-
-	/**
-	 * @param DBObjectSearch $oSearch
-	 * @param null $aArgs
-	 * @param bool $bRetrofitParams
-	 * @param AttributeDefinition $oAttDef
-	 *
-	 * @return array
-	 */
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$aCriteria = array();
-		$aCriteria['is_hierarchical'] = false;
-		// Replace BELOW joins by the corresponding external key for the search
-		// Try to detect hierarchical links
-		if ($this->m_sName == 'id')
-		{
-			if (method_exists($oSearch, 'GetCriteria_PointingTo'))
-			{
-				$aFilters = $this->GetJoinedFilters($oSearch, TREE_OPERATOR_EQUALS);
-				if (!empty($aFilters))
-				{
-					foreach($aFilters as $sExtKey => $oFilter)
-					{
-						$aSubFilters = $this->GetJoinedFilters($oFilter, TREE_OPERATOR_BELOW);
-						foreach($aSubFilters as $oSubFilter)
-						{
-							/** @var \DBObjectSearch $oSubFilter */
-							$sClassAlias = $oSubFilter->GetClassAlias();
-							if ($sClassAlias == $this->m_sParent)
-							{
-								// Hierarchical link detected
-								// replace current field with the corresponding external key
-								$this->m_sName = $sExtKey;
-								$this->m_sParent = $oSearch->GetClassAlias();
-								$aCriteria['is_hierarchical'] = true;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		if (method_exists($oSearch, 'GetJoinedClasses'))
-		{
-			$oAttDef = $this->GetAttDef($oSearch->GetJoinedClasses());
-		}
-		else
-		{
-			$oAttDef = $this->GetAttDef($oSearch->GetSelectedClasses());
-		}
-		if (!is_null($oAttDef))
-		{
-			$sSearchType = $oAttDef->GetSearchType();
-			try
-			{
-				if ($sSearchType == AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY)
-				{
-					if (MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass()))
-					{
-						$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
-					}
-				}
-			}
-			catch (CoreException $e)
-			{
-			}
-		}
-		else
-		{
-			$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE;
-		}
-
-		$aCriteria['widget'] = $sSearchType;
-		$aCriteria['ref'] = $this->GetParent().'.'.$this->GetName();
-		$aCriteria['class_alias'] = $this->GetParent();
-
-		return $aCriteria;
-	}
-}
-
-// Has been resolved into an SQL expression
-class FieldExpressionResolved extends FieldExpression
-{
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		return clone $this;
-	}
-}
-
-class VariableExpression extends UnaryExpression
-{
-	protected $m_sName;
-
-	public function __construct($sName)
-	{
-		parent::__construct($sName);
-
-		$this->m_sName = $sName;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return false;
-	}
-
-	public function GetName()
-	{
-		return $this->m_sName;
-	}
-
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		$sValue = $this->m_value;
-		if (!is_null($aArgs) && (array_key_exists($this->m_sName, $aArgs)))
-		{
-			$sValue = $aArgs[$this->m_sName];
-		}
-		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
-		{
-			$sParamName = substr($this->m_sName, 0, $iPos);
-			$oObj = null;
-			$sAttCode = 'id';
-			if (array_key_exists($sParamName.'->object()', $aArgs))
-			{
-				$sAttCode = substr($this->m_sName, $iPos + 2);
-				$oObj = $aArgs[$sParamName.'->object()'];
-			}
-			elseif (array_key_exists($sParamName, $aArgs))
-			{
-				$sAttCode = substr($this->m_sName, $iPos + 2);
-				$oObj = $aArgs[$sParamName];
-			}
-			if (!is_null($oObj))
-			{
-				if ($sAttCode == 'id')
-				{
-					$sValue = $oObj->Get("friendlyname");
-				}
-				else
-				{
-					$sValue = $oObj->Get($sAttCode);
-				}
-
-				return $sValue;
-			}
-		}
-		if (!is_null($oAttDef))
-		{
-			if ($oAttDef->IsExternalKey())
-			{
-				try
-				{
-					/** @var AttributeExternalKey $oAttDef */
-					$sTarget = $oAttDef->GetTargetClass();
-					$oObj = MetaModel::GetObject($sTarget, $sValue);
-
-					return $oObj->Get("friendlyname");
-				} catch (CoreException $e)
-				{
-				}
-			}
-
-			return $oAttDef->GetAsPlainText($sValue);
-		}
-
-		return $this->Render($aArgs);
-	}
-
-	// recursive rendering
-
-	/**
-	 * @param null $aArgs
-	 * @param bool $bRetrofitParams
-	 *
-	 * @return array|string
-	 * @throws \MissingQueryArgument
-	 */
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		if (is_null($aArgs))
-		{
-			return ':'.$this->m_sName;
-		}
-		elseif (array_key_exists($this->m_sName, $aArgs))
-		{
-			$res = CMDBSource::Quote($aArgs[$this->m_sName]);
-			if (is_array($res))
-			{
-				$res = implode(', ', $res);
-			}
-			return $res;
-		}
-		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
-		{
-			$sParamName = substr($this->m_sName, 0, $iPos);
-			if (array_key_exists($sParamName.'->object()', $aArgs))
-			{
-				$sAttCode = substr($this->m_sName, $iPos + 2);
-				$oObj = $aArgs[$sParamName.'->object()'];
-				if ($sAttCode == 'id')
-				{
-					return CMDBSource::Quote($oObj->GetKey());
-				}
-				return CMDBSource::Quote($oObj->Get($sAttCode));
-			}
-		}
-
-		if ($bRetrofitParams)
-		{
-			$aArgs[$this->m_sName] = null;
-			return ':'.$this->m_sName;
-		}
-		else
-		{
-			throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>array_keys($aArgs)));
-		}
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		if ($this->m_sName == $sOldName)
-		{
-			$this->m_sName = $sNewName;
-		}
-	}
-
-	public function GetAsScalar($aArgs)
-	{
-		$oRet = null;
-		if (array_key_exists($this->m_sName, $aArgs))
-		{
-			$oRet = new ScalarExpression($aArgs[$this->m_sName]);
-		}
-		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
-		{
-			$sParamName = substr($this->m_sName, 0, $iPos);
-			if (array_key_exists($sParamName.'->object()', $aArgs))
-			{
-				$sAttCode = substr($this->m_sName, $iPos + 2);
-				$oObj = $aArgs[$sParamName.'->object()'];
-				if ($sAttCode == 'id')
-				{
-					$oRet = new ScalarExpression($oObj->GetKey());
-				}
-				elseif (MetaModel::IsValidAttCode(get_class($oObj), $sAttCode))
-				{
-					$oRet = new ScalarExpression($oObj->Get($sAttCode));
-				}
-				else
-				{
-					throw new CoreException("Query argument {$this->m_sName} not matching any attribute of class ".get_class($oObj));
-				}
-			}
-		}
-		if (is_null($oRet))
-		{
-			throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>array_keys($aArgs)));
-		}
-		return $oRet;
-	}
-}
-
-// Temporary, until we implement functions and expression casting!
-// ... or until we implement a real full text search based in the MATCH() expression
-class ListExpression extends Expression
-{
-	protected $m_aExpressions;
-
-	public function __construct($aExpressions)
-	{
-		$this->m_aExpressions = $aExpressions;
-	}
-
-	public static function FromScalars($aScalars)
-	{
-		$aExpressions = array();
-		foreach($aScalars as $value)
-		{
-			$aExpressions[] = new ScalarExpression($value);
-		}
-		return new ListExpression($aExpressions);
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return false;
-	}
-
-	public function GetItems()
-	{
-		return $this->m_aExpressions;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes[] = $oExpr->Render($aArgs, $bRetrofitParams);
-		}
-		return '('.implode(', ', $aRes).')';
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->Browse($callback);
-		}
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $idx => $oExpr)
-		{
-			if ($oExpr instanceof VariableExpression)
-			{
-				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
-			}
-			else
-			{
-				$oExpr->ApplyParameters($aArgs);
-			}
-		}
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
-		}
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-		return new ListExpression($aRes);
-	}
-
-	public function ListRequiredFields()
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
-		}
-		return $aRes;
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->CollectUsedParents($aTable);
-		}
-	}
-
-	public function ListConstantFields()
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
-		}
-		return $aRes;
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $key => $oExpr)
-		{
-			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
-		}
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $key => $oExpr)
-		{
-			$oExpr->RenameAlias($sOldName, $sNewName);
-		}
-	}
-
-	public function GetAttDef($aClasses = array())
-	{
-		foreach($this->m_aExpressions as $oExpression)
-		{
-			$oAttDef = $oExpression->GetAttDef($aClasses);
-			if (!is_null($oAttDef)) return $oAttDef;
-		}
-
-		return null;
-	}
-
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$aValues = array();
-
-		foreach($this->m_aExpressions as $oExpression)
-		{
-			$aCrit = $oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-			if (array_key_exists('values', $aCrit))
-			{
-				$aValues = array_merge($aValues, $aCrit['values']);
-			}
-		}
-
-		return array('values' => $aValues);
-	}
-}
-
-
-class FunctionExpression extends Expression
-{
-	protected $m_sVerb;
-	protected $m_aArgs; // array of expressions
-
-	public function __construct($sVerb, $aArgExpressions)
-	{
-		$this->m_sVerb = $sVerb;
-		$this->m_aArgs = $aArgExpressions;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return false;
-	}
-
-	public function GetVerb()
-	{
-		return $this->m_sVerb;
-	}
-
-	public function GetArgs()
-	{
-		return $this->m_aArgs;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		$aRes = array();
-		foreach ($this->m_aArgs as $iPos => $oExpr)
-		{
-			$aRes[] = $oExpr->Render($aArgs, $bRetrofitParams);
-		}
-		return $this->m_sVerb.'('.implode(', ', $aRes).')';
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-		foreach ($this->m_aArgs as $iPos => $oExpr)
-		{
-			$oExpr->Browse($callback);
-		}
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-		$aRes = array();
-		foreach ($this->m_aArgs as $idx => $oExpr)
-		{
-			if ($oExpr instanceof VariableExpression)
-			{
-				$this->m_aArgs[$idx] = $oExpr->GetAsScalar($aArgs);
-			}
-			else
-			{
-				$oExpr->ApplyParameters($aArgs);
-			}
-		}
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		foreach ($this->m_aArgs as $oExpr)
-		{
-			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
-		}
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		$aRes = array();
-		foreach ($this->m_aArgs as $oExpr)
-		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-		return new FunctionExpression($this->m_sVerb, $aRes);
-	}
-
-	public function ListRequiredFields()
-	{
-		$aRes = array();
-		foreach ($this->m_aArgs as $oExpr)
-		{
-			$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
-		}
-		return $aRes;
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-		foreach ($this->m_aArgs as $oExpr)
-		{
-			$oExpr->CollectUsedParents($aTable);
-		}
-	}
-
-	public function ListConstantFields()
-	{
-		$aRes = array();
-		foreach ($this->m_aArgs as $oExpr)
-		{
-			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
-		}
-		return $aRes;
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		foreach ($this->m_aArgs as $key => $oExpr)
-		{
-			$this->m_aArgs[$key] = $oExpr->RenameParam($sOldName, $sNewName);
-		}
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		foreach ($this->m_aArgs as $key => $oExpr)
-		{
-			$oExpr->RenameAlias($sOldName, $sNewName);
-		}
-	}
-
-	public function GetAttDef($aClasses = array())
-	{
-		foreach($this->m_aArgs as $oExpression)
-		{
-			$oAttDef = $oExpression->GetAttDef($aClasses);
-			if (!is_null($oAttDef)) return $oAttDef;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Make the most relevant label, given the value of the expression
-	 *
-	 * @param DBSearch oFilter The context in which this expression has been used
-	 * @param string sValue The value returned by the query, for this expression
-	 * @param string sDefault The default value if no relevant label could be computed
-	 *
-	 * @return The label
-	 */
-	public function MakeValueLabel($oFilter, $sValue, $sDefault)
-	{
-		static $aWeekDayToString = null;
-		if (is_null($aWeekDayToString))
-		{
-			// Init the correspondance table
-			$aWeekDayToString = array(
-				0 => Dict::S('DayOfWeek-Sunday'),
-				1 => Dict::S('DayOfWeek-Monday'),
-				2 => Dict::S('DayOfWeek-Tuesday'),
-				3 => Dict::S('DayOfWeek-Wednesday'),
-				4 => Dict::S('DayOfWeek-Thursday'),
-				5 => Dict::S('DayOfWeek-Friday'),
-				6 => Dict::S('DayOfWeek-Saturday')
-			);
-		}
-		static $aMonthToString = null;
-		if (is_null($aMonthToString))
-		{
-			// Init the correspondance table
-			$aMonthToString = array(
-				1 => Dict::S('Month-01'),
-				2 => Dict::S('Month-02'),
-				3 => Dict::S('Month-03'),
-				4 => Dict::S('Month-04'),
-				5 => Dict::S('Month-05'),
-				6 => Dict::S('Month-06'),
-				7 => Dict::S('Month-07'),
-				8 => Dict::S('Month-08'),
-				9 => Dict::S('Month-09'),
-				10 => Dict::S('Month-10'),
-				11 => Dict::S('Month-11'),
-				12 => Dict::S('Month-12'),
-			);
-		}
-
-		$sRes = $sDefault;
-		if (strtolower($this->m_sVerb) == 'date_format')
-		{
-			$oFormatExpr = $this->m_aArgs[1];
-			if ($oFormatExpr->Render() == "'%w'")
-			{
-				if (isset($aWeekDayToString[(int)$sValue]))
-				{
-					$sRes = $aWeekDayToString[(int)$sValue];
-				}
-			}
-			elseif ($oFormatExpr->Render() == "'%Y-%m'")
-			{
-				// yyyy-mm => "yyyy month"
-				$iMonth = (int) substr($sValue, -2); // the two last chars
-				$sRes = substr($sValue, 0, 4).' '.$aMonthToString[$iMonth];
-			}
-			elseif ($oFormatExpr->Render() == "'%Y-%m-%d'")
-			{
-				// yyyy-mm-dd => "month d"
-				$iMonth = (int) substr($sValue, 5, 2);
-				$sRes = $aMonthToString[$iMonth].' '.(int)substr($sValue, -2);
-			}
-			elseif ($oFormatExpr->Render() == "'%H'")
-			{
-				// H => "H Hour(s)"
-				$sRes = $sValue.':00';
-			}
-		}
-		return $sRes;
-	}
-
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		$sOperation = '';
-		$sVerb = '';
-		switch ($this->m_sVerb)
-		{
-			case 'NOW':
-				$sVerb = $this->VerbToNaturalLanguage();
-				break;
-			case 'DATE_SUB':
-				$sVerb = ' -';
-				break;
-			case 'DATE_ADD':
-				$sVerb = ' +';
-				break;
-			case 'DATE_FORMAT':
-				$aCtx['date_display'] = $this;
-				break;
-			default:
-				return $this->Render($aArgs);
-		}
-
-		foreach($this->m_aArgs as $oExpression)
-		{
-			if ($oExpression instanceof IntervalExpression)
-			{
-				$sOperation .= $sVerb;
-				$sVerb = '';
-			}
-			$sOperation .= $oExpression->Display($oSearch, $aArgs, $oAttDef, $aCtx);
-		}
-
-		if (!empty($sVerb))
-		{
-			$sOperation .= $sVerb;
-		}
-		return $sOperation;
-	}
-
-	private function VerbToNaturalLanguage()
-	{
-		return Dict::S('Expression:Verb:'.$this->m_sVerb, " {$this->m_sVerb} ");
-	}
-
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$aCriteria = array();
-		switch ($this->m_sVerb)
-		{
-			case 'ISNULL':
-				$aCriteria['operator'] = $this->m_sVerb;
-				foreach($this->m_aArgs as $oExpression)
-				{
-					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
-				}
-				$aCriteria['has_undefined'] = true;
-				$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
-				break;
-
-			case 'NOW':
-				$aCriteria = array('widget' => 'date_time');
-				$aCriteria['is_relative'] = true;
-				$aCriteria['verb'] = $this->m_sVerb;
-				break;
-
-			case 'DATE_ADD':
-			case 'DATE_SUB':
-			case 'DATE_FORMAT':
-				$aCriteria = array('widget' => 'date_time');
-				foreach($this->m_aArgs as $oExpression)
-				{
-					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
-				}
-				$aCriteria['verb'] = $this->m_sVerb;
-				break;
-
-			default:
-				return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		}
-
-		return $aCriteria;
-	}
-}
-
-class IntervalExpression extends Expression
-{
-	protected $m_oValue; // expression
-	protected $m_sUnit;
-
-	public function __construct($oValue, $sUnit)
-	{
-		$this->m_oValue = $oValue;
-		$this->m_sUnit = $sUnit;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return false;
-	}
-
-	public function GetValue()
-	{
-		return $this->m_oValue;
-	}
-
-	public function GetUnit()
-	{
-		return $this->m_sUnit;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		return 'INTERVAL '.$this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-		$this->m_oValue->Browse($callback);
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-		if ($this->m_oValue instanceof VariableExpression)
-		{
-			$this->m_oValue = $this->m_oValue->GetAsScalar($aArgs);
-		}
-		else
-		{
-			$this->m_oValue->ApplyParameters($aArgs);
-		}
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		$this->m_oValue->GetUnresolvedFields($sAlias, $aUnresolved);
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		return new IntervalExpression($this->m_oValue->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved), $this->m_sUnit);
-	}
-
-	public function ListRequiredFields()
-	{
-		return array();
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-	}
-
-	public function ListConstantFields()
-	{
-		return array();
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		$this->m_oValue->RenameParam($sOldName, $sNewName);
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		$this->m_oValue->RenameAlias($sOldName, $sNewName);
-	}
-
-	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
-	{
-		$aCriteria = $this->m_oValue->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
-		$aCriteria['unit'] = $this->m_sUnit;
-
-		return $aCriteria;
-	}
-
-	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
-	{
-		return $this->m_oValue->Render($aArgs).' '.Dict::S('Expression:Unit:Long:'.$this->m_sUnit, $this->m_sUnit);
-	}
-}
-
-class CharConcatExpression extends Expression
-{
-	protected $m_aExpressions;
-
-	public function __construct($aExpressions)
-	{
-		$this->m_aExpressions = $aExpressions;
-	}
-
-	public function IsTrue()
-	{
-		// return true if we are certain that it will be true
-		return false;
-	}
-
-	public function GetItems()
-	{
-		return $this->m_aExpressions;
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
-			// Concat will be globally NULL if one single argument is null !
-			$aRes[] = "COALESCE($sCol, '')";
-		}
-		return "CAST(CONCAT(".implode(', ', $aRes).") AS CHAR)";
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->Browse($callback);
-		}
-	}
-
-	public function ApplyParameters($aArgs)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $idx => $oExpr)
-		{
-			if ($oExpr instanceof VariableExpression)
-			{
-				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
-			}
-			else
-			{
-				$this->m_aExpressions->ApplyParameters($aArgs);
-			}
-		}
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
-		}
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-		return new CharConcatExpression($aRes);
-	}
-
-	public function ListRequiredFields()
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
-		}
-		return $aRes;
-	}
-
-	public function CollectUsedParents(&$aTable)
-	{
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->CollectUsedParents($aTable);
-		}
-	}
-
-	public function ListConstantFields()
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
-		}
-		return $aRes;
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		foreach ($this->m_aExpressions as $key => $oExpr)
-		{
-			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
-		}
-	}
-
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		foreach ($this->m_aExpressions as $key => $oExpr)
-		{
-			$oExpr->RenameAlias($sOldName, $sNewName);
-		}
-	}
-}
-
-
-class CharConcatWSExpression extends CharConcatExpression
-{
-	protected $m_separator;
-
-	public function __construct($separator, $aExpressions)
-	{
-		$this->m_separator = $separator;
-		parent::__construct($aExpressions);
-	}
-
-	// recursive rendering
-	public function Render(&$aArgs = null, $bRetrofitParams = false)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
-			// Concat will be globally NULL if one single argument is null !
-			$aRes[] = "COALESCE($sCol, '')";
-		}
-		$sSep = CMDBSource::Quote($this->m_separator);
-		return "CAST(CONCAT_WS($sSep, ".implode(', ', $aRes).") AS CHAR)";
-	}
-
-	public function Browse(Closure $callback)
-	{
-		$callback($this);
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$oExpr->Browse($callback);
-		}
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		$aRes = array();
-		foreach ($this->m_aExpressions as $oExpr)
-		{
-			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-		return new CharConcatWSExpression($this->m_separator, $aRes);
-	}
-}
-
-
-class QueryBuilderExpressions
-{
-	/**
-	 * @var Expression
-	 */
-	protected $m_oConditionExpr;
-	/**
-	 * @var Expression[]
-	 */
-	protected $m_aSelectExpr;
-	/**
-	 * @var Expression[]
-	 */
-	protected $m_aGroupByExpr;
-	/**
-	 * @var Expression[]
-	 */
-	protected $m_aJoinFields;
-	/**
-	 * @var string[]
-	 */
-	protected $m_aClassIds;
-
-	public function __construct(DBObjectSearch $oSearch, $aGroupByExpr = null, $aSelectExpr = null)
-	{
-		$this->m_oConditionExpr = $oSearch->GetCriteria();
-		if (!$oSearch->GetShowObsoleteData())
-		{
-			foreach ($oSearch->GetSelectedClasses() as $sAlias => $sClass)
-			{
-				if (MetaModel::IsObsoletable($sClass))
-				{
-					$oNotObsolete = new BinaryExpression(new FieldExpression('obsolescence_flag', $sAlias), '=', new ScalarExpression(0));
-					$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oNotObsolete);
-				}
-			}
-		}
-		$this->m_aSelectExpr = is_null($aSelectExpr) ? array() : $aSelectExpr;
-		$this->m_aGroupByExpr = $aGroupByExpr;
-		$this->m_aJoinFields = array();
-
-		$this->m_aClassIds = array();
-		foreach($oSearch->GetJoinedClasses() as $sClassAlias => $sClass)
-		{
-			$this->m_aClassIds[$sClassAlias] = new FieldExpression('id', $sClassAlias);
-		}
-	}
-
-	public function GetSelect()
-	{
-		return $this->m_aSelectExpr;
-	}
-
-	public function GetGroupBy()
-	{
-		return $this->m_aGroupByExpr;
-	}
-
-	public function GetCondition()
-	{
-		return $this->m_oConditionExpr;
-	}
-
-	/**
-	 * @return Expression|mixed
-	 */
-	public function PopJoinField()
-	{
-		return array_pop($this->m_aJoinFields);
-	}
-
-	/**
-	 * @param string $sAttAlias
-	 * @param Expression $oExpression
-	 */
-	public function AddSelect($sAttAlias, Expression $oExpression)
-	{
-		$this->m_aSelectExpr[$sAttAlias] = $oExpression;
-	}
-
-	/**
-	 * @param Expression $oExpression
-	 */
-	public function AddCondition(Expression $oExpression)
-	{
-		$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oExpression);
-	}
-
-	/**
-	 * @param Expression $oExpression
-	 */
-	public function PushJoinField(Expression $oExpression)
-	{
-		array_push($this->m_aJoinFields, $oExpression);
-	}
-
-	/**
-	 * Get tables representing the queried objects
-	 * Could be further optimized: when the first join is an outer join, then the rest can be omitted
-	 * @param array $aTables
-	 * @return array
-	 */
-	public function GetMandatoryTables(&$aTables = null)
-	{
-		if (is_null($aTables)) $aTables = array();
-
-		foreach($this->m_aClassIds as $sClass => $oExpression)
-		{
-			$oExpression->CollectUsedParents($aTables);
-		}
-
-		return $aTables;
-	}
-
-	public function GetUnresolvedFields($sAlias, &$aUnresolved)
-	{
-		$this->m_oConditionExpr->GetUnresolvedFields($sAlias, $aUnresolved);
-		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
-		{
-			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
-		}
-		if ($this->m_aGroupByExpr)
-		{
-			foreach($this->m_aGroupByExpr as $sColAlias => $oExpr)
-			{
-				$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
-			}
-		}
-		foreach($this->m_aJoinFields as $oExpression)
-		{
-			$oExpression->GetUnresolvedFields($sAlias, $aUnresolved);
-		}
-	}
-
-	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
-	{
-		$this->m_oConditionExpr = $this->m_oConditionExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
-		{
-			$this->m_aSelectExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-		if ($this->m_aGroupByExpr)
-		{
-			foreach($this->m_aGroupByExpr as $sColAlias => $oExpr)
-			{
-				$this->m_aGroupByExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-			}
-		}
-		foreach($this->m_aJoinFields as $index => $oExpression)
-		{
-			$this->m_aJoinFields[$index] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-
-		foreach($this->m_aClassIds as $sClass => $oExpression)
-		{
-			$this->m_aClassIds[$sClass] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
-		}
-	}
-
-	public function RenameParam($sOldName, $sNewName)
-	{
-		$this->m_oConditionExpr->RenameParam($sOldName, $sNewName);
-		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
-		{
-			$this->m_aSelectExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
-		}
-		if ($this->m_aGroupByExpr)
-		{
-			foreach($this->m_aGroupByExpr as $sColAlias => $oExpr)
-			{
-				$this->m_aGroupByExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
-			}
-		}
-		foreach($this->m_aJoinFields as $index => $oExpression)
-		{
-			$this->m_aJoinFields[$index] = $oExpression->RenameParam($sOldName, $sNewName);
-		}
-	}
+<?php
+// Copyright (c) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+class MissingQueryArgument extends CoreException
+{
+}
+
+
+abstract class Expression
+{
+	/**
+	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
+	 **/
+	public function DeepClone()
+	{
+		return unserialize(serialize($this));
+	}
+
+	// recursive translation of identifiers
+	abstract public function GetUnresolvedFields($sAlias, &$aUnresolved);
+
+	/**
+	 * @param array $aTranslationData
+	 * @param bool $bMatchAll
+	 * @param bool $bMarkFieldsAsResolved
+	 *
+	 * @return Expression Translated expression
+	 */
+	abstract public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true);
+
+	/**
+	 * recursive rendering
+	 *
+	 * @param array $aArgs used as input by default, or used as output if bRetrofitParams set to True
+	 * @param bool $bRetrofitParams
+	 *
+	 * @return array|string
+	 * @throws \MissingQueryArgument
+	 */
+	abstract public function Render(&$aArgs = null, $bRetrofitParams = false);
+
+	/**
+	 * @param DBObjectSearch $oSearch
+	 * @param array $aArgs
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @param array $aCtx
+	 *
+	 * @return array parameters for the search form
+	 */
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		return $this->Render($aArgs);
+	}
+
+	public function GetAttDef($aClasses = array())
+	{
+		return null;
+	}
+
+	/**
+	 * Recursively browse the expression tree
+	 * @param Closure $callback
+	 * @return mixed
+	 */
+	abstract public function Browse(Closure $callback);
+
+	abstract public function ApplyParameters($aArgs);
+
+	// recursively builds an array of class => fieldname
+	abstract public function ListRequiredFields();
+
+	// recursively list field parents ($aTable = array of sParent => dummy)
+	abstract public function CollectUsedParents(&$aTable);
+
+	abstract public function IsTrue();
+
+	// recursively builds an array of [classAlias][fieldName] => value
+	abstract public function ListConstantFields();
+
+	public function RequiresField($sClass, $sFieldName)
+	{
+		// #@# todo - optimize : this is called quite often when building a single query !
+		$aRequired = $this->ListRequiredFields();
+		if (!in_array($sClass.'.'.$sFieldName, $aRequired)) return false;
+		return true;
+	}
+
+	public function serialize()
+	{
+		return base64_encode($this->Render());
+	}
+
+	/**
+	 * @param $sValue
+	 *
+	 * @return Expression
+	 * @throws OQLException
+	 */
+	static public function unserialize($sValue)
+	{
+		return self::FromOQL(base64_decode($sValue));
+	}
+
+	/**
+	 * @param $sConditionExpr
+	 * @return Expression
+	 */
+	static public function FromOQL($sConditionExpr)
+	{
+		static $aCache = array();
+		if (array_key_exists($sConditionExpr, $aCache))
+		{
+			return unserialize($aCache[$sConditionExpr]);
+		}
+		$oOql = new OqlInterpreter($sConditionExpr);
+		$oExpression = $oOql->ParseExpression();
+		$aCache[$sConditionExpr] = serialize($oExpression);
+
+		return $oExpression;
+	}
+
+	static public function FromSQL($sSQL)
+	{
+		$oSql = new SQLExpression($sSQL);
+		return $oSql;
+	}
+
+	/**
+	 * @param Expression $oExpr
+	 * @return Expression
+	 */
+	public function LogAnd(Expression $oExpr)
+	{
+		if ($this->IsTrue()) return clone $oExpr;
+		if ($oExpr->IsTrue()) return clone $this;
+		return new BinaryExpression($this, 'AND', $oExpr);
+	}
+
+	/**
+	 * @param Expression $oExpr
+	 * @return Expression
+	 */
+	public function LogOr(Expression $oExpr)
+	{
+		return new BinaryExpression($this, 'OR', $oExpr);
+	}
+
+	abstract public function RenameParam($sOldName, $sNewName);
+	abstract public function RenameAlias($sOldName, $sNewName);
+
+	/**
+	 * Make the most relevant label, given the value of the expression
+	 *
+	 * @param DBSearch oFilter The context in which this expression has been used
+	 * @param string sValue The value returned by the query, for this expression
+	 * @param string sDefault The default value if no relevant label could be computed
+	 *
+	 * @return The label
+	 */
+	public function MakeValueLabel($oFilter, $sValue, $sDefault)
+	{
+		return $sDefault;
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		return array(
+			'widget' => AttributeDefinition::SEARCH_WIDGET_TYPE_RAW,
+			'oql' => $this->Render($aArgs, $bRetrofitParams),
+			'label' => $this->Display($oSearch, $aArgs, $oAttDef),
+			'source' => get_class($this),
+		);
+	}
+
+	/**
+	 * Split binary expression on given operator
+	 *
+	 * @param Expression $oExpr
+	 * @param string $sOperator
+	 * @param array $aAndExpr
+	 *
+	 * @return array of expressions
+	 */
+	public static function Split($oExpr, $sOperator = 'AND', &$aAndExpr = array())
+	{
+		if (($oExpr instanceof BinaryExpression) && ($oExpr->GetOperator() == $sOperator))
+		{
+			static::Split($oExpr->GetLeftExpr(), $sOperator, $aAndExpr);
+			static::Split($oExpr->GetRightExpr(), $sOperator, $aAndExpr);
+		}
+		else
+		{
+			$aAndExpr[] = $oExpr;
+		}
+
+		return $aAndExpr;
+	}
+}
+
+class SQLExpression extends Expression
+{
+	protected $m_sSQL;
+
+	public function __construct($sSQL)
+	{
+		$this->m_sSQL  = $sSQL;
+	}
+
+	public function IsTrue()
+	{
+		return false;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return $this->m_sSQL;
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return clone $this;
+	}
+
+	public function ListRequiredFields()
+	{
+		return array();
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+	}
+
+	public function ListConstantFields()
+	{
+		return array();
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		// Do nothing, since there is nothing to rename
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		// Do nothing, since there is nothing to rename
+	}
+}
+
+
+
+class BinaryExpression extends Expression
+{
+	protected $m_oLeftExpr; // filter code or an SQL expression (later?)
+	protected $m_oRightExpr;
+	protected $m_sOperator;
+
+	public function __construct($oLeftExpr, $sOperator, $oRightExpr)
+	{
+		if (!is_object($oLeftExpr))
+		{
+			throw new CoreException('Expecting an Expression object on the left hand', array('found_type' => gettype($oLeftExpr)));
+		}
+		if (!is_object($oRightExpr))
+		{
+			throw new CoreException('Expecting an Expression object on the right hand', array('found_type' => gettype($oRightExpr)));
+		}
+		if (!$oLeftExpr instanceof Expression)
+		{
+			throw new CoreException('Expecting an Expression object on the left hand', array('found_class' => get_class($oLeftExpr)));
+		}
+		if (!$oRightExpr instanceof Expression)
+		{
+			throw new CoreException('Expecting an Expression object on the right hand', array('found_class' => get_class($oRightExpr)));
+		}
+		if ( (($sOperator == "IN") ||  ($sOperator == "NOT IN")) && !$oRightExpr instanceof ListExpression)
+		{
+			throw new CoreException("Expecting a List Expression object on the right hand for operator $sOperator", array('found_class' => get_class($oRightExpr)));
+		}
+		$this->m_oLeftExpr  = $oLeftExpr;
+		$this->m_oRightExpr = $oRightExpr;
+		$this->m_sOperator  = $sOperator;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		if ($this->m_sOperator == 'AND')
+		{
+			if ($this->m_oLeftExpr->IsTrue() && $this->m_oRightExpr->IsTrue()) return true;
+		}
+		elseif ($this->m_sOperator == 'OR')
+		{
+			if ($this->m_oLeftExpr->IsTrue() || $this->m_oRightExpr->IsTrue()) return true;
+		}
+		return false;
+	}
+
+	public function GetLeftExpr()
+	{
+		return $this->m_oLeftExpr;
+	}
+
+	public function GetRightExpr()
+	{
+		return $this->m_oRightExpr;
+	}
+
+	public function GetOperator()
+	{
+		return $this->m_sOperator;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$sOperator = $this->GetOperator();
+		$sLeft = $this->GetLeftExpr()->Render($aArgs, $bRetrofitParams);
+		$sRight = $this->GetRightExpr()->Render($aArgs, $bRetrofitParams);
+		return "($sLeft $sOperator $sRight)";
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		$this->m_oLeftExpr->Browse($callback);
+		$this->m_oRightExpr->Browse($callback);
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+		if ($this->m_oLeftExpr instanceof VariableExpression)
+		{
+			$this->m_oLeftExpr = $this->m_oLeftExpr->GetAsScalar($aArgs);
+		}
+		else //if ($this->m_oLeftExpr instanceof Expression)
+		{
+			$this->m_oLeftExpr->ApplyParameters($aArgs);
+		}
+		if ($this->m_oRightExpr instanceof VariableExpression)
+		{
+			$this->m_oRightExpr = $this->m_oRightExpr->GetAsScalar($aArgs);
+		}
+		else //if ($this->m_oRightExpr instanceof Expression)
+		{
+			$this->m_oRightExpr->ApplyParameters($aArgs);
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->GetLeftExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
+		$this->GetRightExpr()->GetUnresolvedFields($sAlias, $aUnresolved);
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$oLeft = $this->GetLeftExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		$oRight = $this->GetRightExpr()->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		return new BinaryExpression($oLeft, $this->GetOperator(), $oRight);
+	}
+
+	public function ListRequiredFields()
+	{
+		$aLeft = $this->GetLeftExpr()->ListRequiredFields();
+		$aRight = $this->GetRightExpr()->ListRequiredFields();
+		return array_merge($aLeft, $aRight);
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+		$this->GetLeftExpr()->CollectUsedParents($aTable);
+		$this->GetRightExpr()->CollectUsedParents($aTable);
+	}
+
+	public function GetAttDef($aClasses = array())
+	{
+		$oAttDef = $this->GetLeftExpr()->GetAttDef($aClasses);
+		if (!is_null($oAttDef)) return $oAttDef;
+
+		return $this->GetRightExpr()->GetAttDef($aClasses);
+	}
+
+	/**
+	 * List all constant expression of the form <field> = <scalar> or <field> = :<variable>
+	 * Could be extended to support <field> = <function><constant_expression>
+	 */
+	public function ListConstantFields()
+	{
+		$aResult = array();
+		if ($this->m_sOperator == '=')
+		{
+			if (($this->m_oLeftExpr instanceof FieldExpression) && ($this->m_oRightExpr instanceof ScalarExpression))
+			{
+				$aResult[$this->m_oLeftExpr->GetParent()][$this->m_oLeftExpr->GetName()] = $this->m_oRightExpr;
+			}
+			else if (($this->m_oRightExpr instanceof FieldExpression) && ($this->m_oLeftExpr instanceof ScalarExpression))
+			{
+				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
+			}
+			else if (($this->m_oLeftExpr instanceof FieldExpression) && ($this->m_oRightExpr instanceof VariableExpression))
+			{
+				$aResult[$this->m_oLeftExpr->GetParent()][$this->m_oLeftExpr->GetName()] = $this->m_oRightExpr;
+			}
+			else if (($this->m_oRightExpr instanceof FieldExpression) && ($this->m_oLeftExpr instanceof VariableExpression))
+			{
+				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
+			}
+		}
+		else if ($this->m_sOperator == 'AND')
+		{
+			// Strictly, this should be done only for the AND operator
+			$aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields());
+		}
+		return $aResult;
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->GetLeftExpr()->RenameParam($sOldName, $sNewName);
+		$this->GetRightExpr()->RenameParam($sOldName, $sNewName);
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		$this->GetLeftExpr()->RenameAlias($sOldName, $sNewName);
+		$this->GetRightExpr()->RenameAlias($sOldName, $sNewName);
+	}
+
+	// recursive rendering
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		$bReverseOperator = false;
+		if (method_exists($oSearch, 'GetJoinedClasses'))
+		{
+			$aClasses = $oSearch->GetJoinedClasses();
+		}
+		else
+		{
+			$aClasses = array($oSearch->GetClass());
+		}
+		$oLeftExpr = $this->GetLeftExpr();
+		if ($oLeftExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oLeftExpr->GetAttDef($aClasses);
+		}
+		$oRightExpr = $this->GetRightExpr();
+		if ($oRightExpr instanceof FieldExpression)
+		{
+			$oAttDef = $oRightExpr->GetAttDef($aClasses);
+			$bReverseOperator = true;
+		}
+
+
+		if ($bReverseOperator)
+		{
+			$sRight = $oRightExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
+			$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
+
+			// switch left and right expressions so reverse the operator
+			// Note that the operation is the same so < becomes > and not >=
+			switch ($this->GetOperator())
+			{
+				case '>':
+					$sOperator = '<';
+					break;
+				case '<':
+					$sOperator = '>';
+					break;
+				case '>=':
+					$sOperator = '<=';
+					break;
+				case '<=':
+					$sOperator = '>=';
+					break;
+				default:
+					$sOperator = $this->GetOperator();
+					break;
+			}
+			$sOperator = $this->OperatorToNaturalLanguage($sOperator, $oAttDef);
+
+			return "({$sRight}{$sOperator}{$sLeft})";
+		}
+
+		$sLeft = $oLeftExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
+		$sRight = $oRightExpr->Display($oSearch, $aArgs, $oAttDef, $aCtx);
+
+		$sOperator = $this->GetOperator();
+		$sOperator = $this->OperatorToNaturalLanguage($sOperator, $oAttDef);
+
+		return "({$sLeft}{$sOperator}{$sRight})";
+	}
+
+	private function OperatorToNaturalLanguage($sOperator, $oAttDef)
+	{
+		if ($oAttDef instanceof AttributeDateTime)
+		{
+			return Dict::S('Expression:Operator:Date:'.$sOperator, " $sOperator ");
+		}
+
+		return Dict::S('Expression:Operator:'.$sOperator, " $sOperator ");
+	}
+
+	/**
+	 * @param DBSearch $oSearch
+	 * @param null $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param null $oAttDef
+	 *
+	 * @return array
+	 */
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$bReverseOperator = false;
+		$oLeftExpr = $this->GetLeftExpr();
+		$oRightExpr = $this->GetRightExpr();
+
+		if (method_exists($oSearch, 'GetJoinedClasses'))
+		{
+			$aClasses = $oSearch->GetJoinedClasses();
+		}
+		else
+		{
+			$aClasses = array($oSearch->GetClass());
+		}
+
+		$oAttDef = $oLeftExpr->GetAttDef($aClasses);
+		if (is_null($oAttDef))
+		{
+			$oAttDef = $oRightExpr->GetAttDef($aClasses);
+			$bReverseOperator = true;
+		}
+
+		if (is_null($oAttDef))
+		{
+			return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		}
+
+
+		if ($bReverseOperator)
+		{
+			$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+			// $oAttDef can be different now
+			$oAttDef = $oRightExpr->GetAttDef($aClasses);
+			$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+
+			// switch left and right expressions so reverse the operator
+			// Note that the operation is the same so < becomes > and not >=
+			switch ($this->GetOperator())
+			{
+				case '>':
+					$sOperator = '<';
+					break;
+				case '<':
+					$sOperator = '>';
+					break;
+				case '>=':
+					$sOperator = '<=';
+					break;
+				case '<=':
+					$sOperator = '>=';
+					break;
+				default:
+					$sOperator = $this->GetOperator();
+					break;
+			}
+			$aCriteria = self::MergeCriteria($aCriteriaRight, $aCriteriaLeft, $sOperator);
+		}
+		else
+		{
+			$aCriteriaLeft = $oLeftExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+			// $oAttDef can be different now
+			$oAttDef = $oLeftExpr->GetAttDef($aClasses);
+			$aCriteriaRight = $oRightExpr->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+
+			$aCriteria = self::MergeCriteria($aCriteriaLeft, $aCriteriaRight, $this->GetOperator());
+		}
+		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
+		$aCriteria['label'] = $this->Display($oSearch, $aArgs, $oAttDef);
+
+		if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] != $aCriteriaRight['ref']))
+		{
+			// Only one Field is supported in the expressions
+			$aCriteria['widget'] = AttributeDefinition::SEARCH_WIDGET_TYPE_RAW;
+		}
+
+		return $aCriteria;
+	}
+
+	protected static function MergeCriteria($aCriteriaLeft, $aCriteriaRight, $sOperator)
+	{
+		$aCriteriaOverride = array();
+		$aCriteriaOverride['operator'] = $sOperator;
+		if ($sOperator == 'OR')
+		{
+			if (isset($aCriteriaLeft['ref']) && isset($aCriteriaRight['ref']) && ($aCriteriaLeft['ref'] == $aCriteriaRight['ref']))
+			{
+				if (isset($aCriteriaLeft['widget']) && isset($aCriteriaRight['widget']) && ($aCriteriaLeft['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY) && ($aCriteriaRight['widget'] == AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY))
+				{
+					$aCriteriaOverride['operator'] = 'IN';
+					$aCriteriaOverride['is_hierarchical'] = true;
+
+					if (isset($aCriteriaLeft['values']) && isset($aCriteriaRight['values']))
+					{
+						$aCriteriaOverride['values'] = array_merge($aCriteriaLeft['values'], $aCriteriaRight['values']);
+					}
+				}
+			}
+		}
+
+		return array_merge($aCriteriaLeft, $aCriteriaRight, $aCriteriaOverride);
+	}
+}
+
+
+class UnaryExpression extends Expression
+{
+	protected $m_value;
+
+	public function __construct($value)
+	{
+		$this->m_value = $value;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return ($this->m_value == 1);
+	}
+
+	public function GetValue()
+	{
+		return $this->m_value;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return CMDBSource::Quote($this->m_value);
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return clone $this;
+	}
+
+	public function ListRequiredFields()
+	{
+		return array();
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+	}
+
+	public function ListConstantFields()
+	{
+		return array();
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		// Do nothing
+		// really ? what about :param{$iParamIndex} ??
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		// Do nothing
+	}
+}
+
+class ScalarExpression extends UnaryExpression
+{
+	public function __construct($value)
+	{
+		if (!is_scalar($value) && !is_null($value) && (!$value instanceof OqlHexValue))
+		{
+			throw new CoreException('Attempt to create a scalar expression from a non scalar', array('var_type'=>gettype($value)));
+		}
+		parent::__construct($value);
+	}
+
+	/**
+	 * @param array $oSearch
+	 * @param array $aArgs
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @param array $aCtx
+	 *
+	 * @return array|string
+	 * @throws \Exception
+	 */
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		if (!is_null($oAttDef))
+		{
+			if ($oAttDef->IsExternalKey())
+			{
+				try
+				{
+					/** @var AttributeExternalKey $oAttDef */
+					$sTarget = $oAttDef->GetTargetClass();
+					$oObj = MetaModel::GetObject($sTarget, $this->m_value, false);
+					if (empty($oObj))
+					{
+						return Dict::S('Enum:Undefined');
+					}
+
+					return $oObj->Get("friendlyname");
+				} catch (CoreException $e)
+				{
+				}
+			}
+
+			if (!($oAttDef instanceof AttributeDateTime))
+			{
+				return $oAttDef->GetAsPlainText($this->m_value);
+			}
+		}
+
+		if (strpos($this->m_value, '%') === 0)
+		{
+			return '';
+		}
+
+		if (isset($aCtx['date_display']))
+		{
+			return $aCtx['date_display']->MakeValueLabel($oSearch, $this->m_value, $this->m_value);
+		}
+
+		return $this->Render($aArgs);
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		if (is_null($this->m_value))
+		{
+			$sRet = 'NULL';
+		}
+		else
+		{
+			$sRet = CMDBSource::Quote($this->m_value);
+		}
+		return $sRet;
+	}
+
+	public function GetAsScalar($aArgs)
+	{
+		return clone $this;
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aCriteria = array();
+		switch ((string)($this->m_value))
+		{
+			case '%Y-%m-%d':
+				$aCriteria['unit'] = 'DAY';
+				break;
+			case '%Y-%m':
+				$aCriteria['unit'] = 'MONTH';
+				break;
+			case '%w':
+				$aCriteria['unit'] = 'WEEKDAY';
+				break;
+			case '%H':
+				$aCriteria['unit'] = 'HOUR';
+				break;
+			default:
+				$aValue = array('value' => $this->GetValue());
+				if (!is_null($oAttDef))
+				{
+					switch (true)
+					{
+						case ($oAttDef instanceof AttributeExternalField):
+							try
+							{
+								$oFinalAttDef = $oAttDef->GetFinalAttDef();
+								if($oFinalAttDef instanceof  AttributeExternalKey)
+								{								
+									if ($this->GetValue() !== 0)
+									{
+										/** @var AttributeExternalKey $oFinalAttDef */
+										$sTarget = $oFinalAttDef->GetTargetClass();
+										$oObj = MetaModel::GetObject($sTarget, $this->GetValue());
+										$aValue['label'] = $oObj->Get("friendlyname");
+										$aValue['value'] = $this->GetValue();
+									}
+									else
+									{
+										$aValue['label'] = Dict::S('Enum:Undefined');
+										$aValue['value'] = $this->GetValue();
+									}
+								}
+								else
+								{
+									$aValue['label'] = $this->GetValue();
+									$aValue['value'] = $this->GetValue();
+								}
+								$aCriterion['values'] = array($aValue);
+							}
+							catch (Exception $e)
+							{
+								IssueLog::Error($e->getMessage());
+							}
+							break;
+						case $oAttDef->IsExternalKey():
+							try
+							{
+								if ($this->GetValue() == 0)
+								{
+									$aValue['label'] = Dict::S('UI:UndefinedObject');
+								}
+								else
+								{
+									/** @var AttributeExternalKey $oAttDef */
+									$sTarget = $oAttDef->GetTargetClass();
+									$oObj = MetaModel::GetObject($sTarget, $this->GetValue(), true, true);
+									$aValue['label'] = $oObj->Get("friendlyname");
+								}
+							}
+							catch (Exception $e)
+							{
+								IssueLog::Error($e->getMessage());
+							}
+							break;
+						default:
+							try
+							{
+								$aValue['label'] = $oAttDef->GetAsPlainText($this->GetValue());
+							} catch (Exception $e)
+							{
+								$aValue['label'] = $this->GetValue();
+							}
+							break;
+					}
+				}
+				$aCriteria['values'] = array($aValue);
+				break;
+		}
+		$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
+		return $aCriteria;
+	}
+
+}
+
+class TrueExpression extends ScalarExpression
+{
+	public function __construct()
+	{
+		parent::__construct(1);
+	}
+
+	public function IsTrue()
+	{
+		return true;
+	}
+}
+
+class FalseExpression extends ScalarExpression
+{
+	public function __construct()
+	{
+		parent::__construct(0);
+	}
+
+	public function IsTrue()
+	{
+		return false;
+	}
+}
+
+class FieldExpression extends UnaryExpression
+{
+	protected $m_sParent;
+	protected $m_sName;
+
+	public function __construct($sName, $sParent = '')
+	{
+		parent::__construct("$sParent.$sName");
+
+		$this->m_sParent = $sParent;
+		$this->m_sName = $sName;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+
+	public function GetParent() {return $this->m_sParent;}
+	public function GetName() {return $this->m_sName;}
+
+	public function SetParent($sParent)
+	{
+		$this->m_sParent = $sParent;
+		$this->m_value = $sParent.'.'.$this->m_sName;
+	}
+
+	private function GetClassName($aClasses = array())
+	{
+		if (isset($aClasses[$this->m_sParent]))
+		{
+			return $aClasses[$this->m_sParent];
+		}
+		else
+		{
+			return $this->m_sParent;
+		}
+	}
+
+	/**
+	 * @param DBObjectSearch $oSearch
+	 * @param array $aArgs
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @param array $aCtx
+	 *
+	 * @return array|string
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		if (empty($this->m_sParent))
+		{
+			return "`{$this->m_sName}`";
+		}
+		if (method_exists($oSearch, 'GetJoinedClasses'))
+		{
+			$aClasses = $oSearch->GetJoinedClasses();
+		}
+		else
+		{
+			$aClasses = array($oSearch->GetClass());
+		}
+		$sClass = $this->GetClassName($aClasses);
+		$sAttName = MetaModel::GetLabel($sClass, $this->m_sName);
+		if ($sClass != $oSearch->GetClass())
+		{
+			$sAttName = MetaModel::GetName($sClass).':'.$sAttName;
+		}
+
+		return $sAttName;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		if (empty($this->m_sParent))
+		{
+			return "`{$this->m_sName}`";
+		}
+		return "`{$this->m_sParent}`.`{$this->m_sName}`";
+	}
+
+	public function GetAttDef($aClasses = array())
+	{
+		if (!empty($this->m_sParent))
+		{
+			$sClass = $this->GetClassName($aClasses);
+			$aAttDefs = MetaModel::ListAttributeDefs($sClass);
+			if (isset($aAttDefs[$this->m_sName]))
+			{
+				return $aAttDefs[$this->m_sName];
+			}
+			else
+			{
+				if ($this->m_sName == 'id')
+				{
+					$aParams = array(
+						'default_value' => 0,
+						'is_null_allowed' => false,
+						'allowed_values' => null,
+						'depends_on' => null,
+						'sql' => 'id',
+					);
+
+					return new AttributeInteger($this->m_sName, $aParams);
+				}
+			}
+		}
+
+		return null;
+	}
+
+
+	public function ListRequiredFields()
+	{
+		return array($this->m_sParent.'.'.$this->m_sName);
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+		$aTable[$this->m_sParent] = true;
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		if ($this->m_sParent == $sAlias)
+		{
+			// Add a reference to the field
+			$aUnresolved[$this->m_sName] = $this;
+		}
+		elseif ($sAlias == '')
+		{
+			// An empty alias means "any alias"
+			// In such a case, the results are indexed differently
+			$aUnresolved[$this->m_sParent][$this->m_sName] = $this;
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		if (!array_key_exists($this->m_sParent, $aTranslationData))
+		{
+			if ($bMatchAll) throw new CoreException('Unknown parent id in translation table', array('parent_id' => $this->m_sParent, 'translation_table' => array_keys($aTranslationData)));
+
+			return clone $this;
+		}
+		if (!array_key_exists($this->m_sName, $aTranslationData[$this->m_sParent]))
+		{
+			if (!array_key_exists('*', $aTranslationData[$this->m_sParent]))
+			{
+				// #@# debug - if ($bMatchAll) MyHelpers::var_dump_html($aTranslationData, true);
+				if ($bMatchAll) throw new CoreException('Unknown name in translation table', array('name' => $this->m_sName, 'parent_id' => $this->m_sParent, 'translation_table' => array_keys($aTranslationData[$this->m_sParent])));
+				return clone $this;
+			}
+			$sNewParent = $aTranslationData[$this->m_sParent]['*'];
+			$sNewName = $this->m_sName;
+			if ($bMarkFieldsAsResolved)
+			{
+				$oRet = new FieldExpressionResolved($sNewName, $sNewParent);
+			}
+			else
+			{
+				$oRet = new FieldExpression($sNewName, $sNewParent);
+			}
+		}
+		else
+		{
+			$oRet = $aTranslationData[$this->m_sParent][$this->m_sName];
+		}
+		return $oRet;
+	}
+
+	/**
+	 * Make the most relevant label, given the value of the expression
+	 *
+	 * @param DBSearch oFilter The context in which this expression has been used
+	 * @param string sValue The value returned by the query, for this expression
+	 * @param string sDefault The default value if no relevant label could be computed
+	 *
+	 * @return The label
+	 * @throws \CoreException
+	 */
+	public function MakeValueLabel($oFilter, $sValue, $sDefault)
+	{
+		$sAttCode = $this->GetName();
+		$sParentAlias = $this->GetParent();
+
+		$aSelectedClasses = $oFilter->GetSelectedClasses();
+		$sClass = $aSelectedClasses[$sParentAlias];
+
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		// Set a default value for the general case
+		$sRes = $oAttDef->GetAsHtml($sValue);
+
+		// Exceptions...
+		if ($oAttDef->IsExternalKey())
+		{
+			/** @var AttributeExternalKey $oAttDef */
+			$sObjClass = $oAttDef->GetTargetClass();
+			$iObjKey = (int)$sValue;
+			if ($iObjKey > 0)
+			{
+				$oObject = MetaModel::GetObjectWithArchive($sObjClass, $iObjKey, true, true);
+				$sRes = $oObject->GetHyperlink();
+			}
+			else
+			{
+				// Undefined
+				$sRes = DBObject::MakeHyperLink($sObjClass, 0);
+			}
+		}
+		elseif ($oAttDef->IsExternalField())
+		{
+			if (is_null($sValue))
+			{
+				$sRes = Dict::S('UI:UndefinedObject');
+			}
+		}
+		return $sRes;
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		if ($this->m_sParent == $sOldName)
+		{
+			$this->m_sParent = $sNewName;
+		}
+	}
+
+	private function GetJoinedFilters($oSearch, $iOperatorCodeTarget)
+	{
+		$aFilters = array();
+		$aPointingToByKey = $oSearch->GetCriteria_PointingTo();
+		foreach ($aPointingToByKey as $sExtKey => $aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				if ($iOperatorCode == $iOperatorCodeTarget)
+				{
+					foreach($aFilter as $oExtFilter)
+					{
+						$aFilters[$sExtKey] = $oExtFilter;
+					}
+				}
+			}
+		}
+		return $aFilters;
+	}
+
+	/**
+	 * @param DBObjectSearch $oSearch
+	 * @param null $aArgs
+	 * @param bool $bRetrofitParams
+	 * @param AttributeDefinition $oAttDef
+	 *
+	 * @return array
+	 */
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aCriteria = array();
+		$aCriteria['is_hierarchical'] = false;
+		// Replace BELOW joins by the corresponding external key for the search
+		// Try to detect hierarchical links
+		if ($this->m_sName == 'id')
+		{
+			if (method_exists($oSearch, 'GetCriteria_PointingTo'))
+			{
+				$aFilters = $this->GetJoinedFilters($oSearch, TREE_OPERATOR_EQUALS);
+				if (!empty($aFilters))
+				{
+					foreach($aFilters as $sExtKey => $oFilter)
+					{
+						$aSubFilters = $this->GetJoinedFilters($oFilter, TREE_OPERATOR_BELOW);
+						foreach($aSubFilters as $oSubFilter)
+						{
+							/** @var \DBObjectSearch $oSubFilter */
+							$sClassAlias = $oSubFilter->GetClassAlias();
+							if ($sClassAlias == $this->m_sParent)
+							{
+								// Hierarchical link detected
+								// replace current field with the corresponding external key
+								$this->m_sName = $sExtKey;
+								$this->m_sParent = $oSearch->GetClassAlias();
+								$aCriteria['is_hierarchical'] = true;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (method_exists($oSearch, 'GetJoinedClasses'))
+		{
+			$oAttDef = $this->GetAttDef($oSearch->GetJoinedClasses());
+		}
+		else
+		{
+			$oAttDef = $this->GetAttDef($oSearch->GetSelectedClasses());
+		}
+		if (!is_null($oAttDef))
+		{
+			$sSearchType = $oAttDef->GetSearchType();
+			try
+			{
+				if ($sSearchType == AttributeDefinition::SEARCH_WIDGET_TYPE_EXTERNAL_KEY)
+				{
+					if (MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass()))
+					{
+						$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
+					}
+				}
+			}
+			catch (CoreException $e)
+			{
+			}
+		}
+		else
+		{
+			$sSearchType = AttributeDefinition::SEARCH_WIDGET_TYPE;
+		}
+
+		$aCriteria['widget'] = $sSearchType;
+		$aCriteria['ref'] = $this->GetParent().'.'.$this->GetName();
+		$aCriteria['class_alias'] = $this->GetParent();
+
+		return $aCriteria;
+	}
+}
+
+// Has been resolved into an SQL expression
+class FieldExpressionResolved extends FieldExpression
+{
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return clone $this;
+	}
+}
+
+class VariableExpression extends UnaryExpression
+{
+	protected $m_sName;
+
+	public function __construct($sName)
+	{
+		parent::__construct($sName);
+
+		$this->m_sName = $sName;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+
+	public function GetName()
+	{
+		return $this->m_sName;
+	}
+
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		$sValue = $this->m_value;
+		if (!is_null($aArgs) && (array_key_exists($this->m_sName, $aArgs)))
+		{
+			$sValue = $aArgs[$this->m_sName];
+		}
+		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
+		{
+			$sParamName = substr($this->m_sName, 0, $iPos);
+			$oObj = null;
+			$sAttCode = 'id';
+			if (array_key_exists($sParamName.'->object()', $aArgs))
+			{
+				$sAttCode = substr($this->m_sName, $iPos + 2);
+				$oObj = $aArgs[$sParamName.'->object()'];
+			}
+			elseif (array_key_exists($sParamName, $aArgs))
+			{
+				$sAttCode = substr($this->m_sName, $iPos + 2);
+				$oObj = $aArgs[$sParamName];
+			}
+			if (!is_null($oObj))
+			{
+				if ($sAttCode == 'id')
+				{
+					$sValue = $oObj->Get("friendlyname");
+				}
+				else
+				{
+					$sValue = $oObj->Get($sAttCode);
+				}
+
+				return $sValue;
+			}
+		}
+		if (!is_null($oAttDef))
+		{
+			if ($oAttDef->IsExternalKey())
+			{
+				try
+				{
+					/** @var AttributeExternalKey $oAttDef */
+					$sTarget = $oAttDef->GetTargetClass();
+					$oObj = MetaModel::GetObject($sTarget, $sValue);
+
+					return $oObj->Get("friendlyname");
+				} catch (CoreException $e)
+				{
+				}
+			}
+
+			return $oAttDef->GetAsPlainText($sValue);
+		}
+
+		return $this->Render($aArgs);
+	}
+
+	// recursive rendering
+
+	/**
+	 * @param null $aArgs
+	 * @param bool $bRetrofitParams
+	 *
+	 * @return array|string
+	 * @throws \MissingQueryArgument
+	 */
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		if (is_null($aArgs))
+		{
+			return ':'.$this->m_sName;
+		}
+		elseif (array_key_exists($this->m_sName, $aArgs))
+		{
+			$res = CMDBSource::Quote($aArgs[$this->m_sName]);
+			if (is_array($res))
+			{
+				$res = implode(', ', $res);
+			}
+			return $res;
+		}
+		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
+		{
+			$sParamName = substr($this->m_sName, 0, $iPos);
+			if (array_key_exists($sParamName.'->object()', $aArgs))
+			{
+				$sAttCode = substr($this->m_sName, $iPos + 2);
+				$oObj = $aArgs[$sParamName.'->object()'];
+				if ($sAttCode == 'id')
+				{
+					return CMDBSource::Quote($oObj->GetKey());
+				}
+				return CMDBSource::Quote($oObj->Get($sAttCode));
+			}
+		}
+
+		if ($bRetrofitParams)
+		{
+			$aArgs[$this->m_sName] = null;
+			return ':'.$this->m_sName;
+		}
+		else
+		{
+			throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>array_keys($aArgs)));
+		}
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		if ($this->m_sName == $sOldName)
+		{
+			$this->m_sName = $sNewName;
+		}
+	}
+
+	public function GetAsScalar($aArgs)
+	{
+		$oRet = null;
+		if (array_key_exists($this->m_sName, $aArgs))
+		{
+			$oRet = new ScalarExpression($aArgs[$this->m_sName]);
+		}
+		elseif (($iPos = strpos($this->m_sName, '->')) !== false)
+		{
+			$sParamName = substr($this->m_sName, 0, $iPos);
+			if (array_key_exists($sParamName.'->object()', $aArgs))
+			{
+				$sAttCode = substr($this->m_sName, $iPos + 2);
+				$oObj = $aArgs[$sParamName.'->object()'];
+				if ($sAttCode == 'id')
+				{
+					$oRet = new ScalarExpression($oObj->GetKey());
+				}
+				elseif (MetaModel::IsValidAttCode(get_class($oObj), $sAttCode))
+				{
+					$oRet = new ScalarExpression($oObj->Get($sAttCode));
+				}
+				else
+				{
+					throw new CoreException("Query argument {$this->m_sName} not matching any attribute of class ".get_class($oObj));
+				}
+			}
+		}
+		if (is_null($oRet))
+		{
+			throw new MissingQueryArgument('Missing query argument', array('expecting'=>$this->m_sName, 'available'=>array_keys($aArgs)));
+		}
+		return $oRet;
+	}
+}
+
+// Temporary, until we implement functions and expression casting!
+// ... or until we implement a real full text search based in the MATCH() expression
+class ListExpression extends Expression
+{
+	protected $m_aExpressions;
+
+	public function __construct($aExpressions)
+	{
+		$this->m_aExpressions = $aExpressions;
+	}
+
+	public static function FromScalars($aScalars)
+	{
+		$aExpressions = array();
+		foreach($aScalars as $value)
+		{
+			$aExpressions[] = new ScalarExpression($value);
+		}
+		return new ListExpression($aExpressions);
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+
+	public function GetItems()
+	{
+		return $this->m_aExpressions;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes[] = $oExpr->Render($aArgs, $bRetrofitParams);
+		}
+		return '('.implode(', ', $aRes).')';
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->Browse($callback);
+		}
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $idx => $oExpr)
+		{
+			if ($oExpr instanceof VariableExpression)
+			{
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
+			}
+			else
+			{
+				$oExpr->ApplyParameters($aArgs);
+			}
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		return new ListExpression($aRes);
+	}
+
+	public function ListRequiredFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
+		}
+		return $aRes;
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->CollectUsedParents($aTable);
+		}
+	}
+
+	public function ListConstantFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
+		}
+		return $aRes;
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $key => $oExpr)
+		{
+			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $key => $oExpr)
+		{
+			$oExpr->RenameAlias($sOldName, $sNewName);
+		}
+	}
+
+	public function GetAttDef($aClasses = array())
+	{
+		foreach($this->m_aExpressions as $oExpression)
+		{
+			$oAttDef = $oExpression->GetAttDef($aClasses);
+			if (!is_null($oAttDef)) return $oAttDef;
+		}
+
+		return null;
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aValues = array();
+
+		foreach($this->m_aExpressions as $oExpression)
+		{
+			$aCrit = $oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+			if (array_key_exists('values', $aCrit))
+			{
+				$aValues = array_merge($aValues, $aCrit['values']);
+			}
+		}
+
+		return array('values' => $aValues);
+	}
+}
+
+
+class FunctionExpression extends Expression
+{
+	protected $m_sVerb;
+	protected $m_aArgs; // array of expressions
+
+	public function __construct($sVerb, $aArgExpressions)
+	{
+		$this->m_sVerb = $sVerb;
+		$this->m_aArgs = $aArgExpressions;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+
+	public function GetVerb()
+	{
+		return $this->m_sVerb;
+	}
+
+	public function GetArgs()
+	{
+		return $this->m_aArgs;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $iPos => $oExpr)
+		{
+			$aRes[] = $oExpr->Render($aArgs, $bRetrofitParams);
+		}
+		return $this->m_sVerb.'('.implode(', ', $aRes).')';
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		foreach ($this->m_aArgs as $iPos => $oExpr)
+		{
+			$oExpr->Browse($callback);
+		}
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $idx => $oExpr)
+		{
+			if ($oExpr instanceof VariableExpression)
+			{
+				$this->m_aArgs[$idx] = $oExpr->GetAsScalar($aArgs);
+			}
+			else
+			{
+				$oExpr->ApplyParameters($aArgs);
+			}
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		return new FunctionExpression($this->m_sVerb, $aRes);
+	}
+
+	public function ListRequiredFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
+		}
+		return $aRes;
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$oExpr->CollectUsedParents($aTable);
+		}
+	}
+
+	public function ListConstantFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aArgs as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
+		}
+		return $aRes;
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		foreach ($this->m_aArgs as $key => $oExpr)
+		{
+			$this->m_aArgs[$key] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		foreach ($this->m_aArgs as $key => $oExpr)
+		{
+			$oExpr->RenameAlias($sOldName, $sNewName);
+		}
+	}
+
+	public function GetAttDef($aClasses = array())
+	{
+		foreach($this->m_aArgs as $oExpression)
+		{
+			$oAttDef = $oExpression->GetAttDef($aClasses);
+			if (!is_null($oAttDef)) return $oAttDef;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Make the most relevant label, given the value of the expression
+	 *
+	 * @param DBSearch oFilter The context in which this expression has been used
+	 * @param string sValue The value returned by the query, for this expression
+	 * @param string sDefault The default value if no relevant label could be computed
+	 *
+	 * @return The label
+	 */
+	public function MakeValueLabel($oFilter, $sValue, $sDefault)
+	{
+		static $aWeekDayToString = null;
+		if (is_null($aWeekDayToString))
+		{
+			// Init the correspondance table
+			$aWeekDayToString = array(
+				0 => Dict::S('DayOfWeek-Sunday'),
+				1 => Dict::S('DayOfWeek-Monday'),
+				2 => Dict::S('DayOfWeek-Tuesday'),
+				3 => Dict::S('DayOfWeek-Wednesday'),
+				4 => Dict::S('DayOfWeek-Thursday'),
+				5 => Dict::S('DayOfWeek-Friday'),
+				6 => Dict::S('DayOfWeek-Saturday')
+			);
+		}
+		static $aMonthToString = null;
+		if (is_null($aMonthToString))
+		{
+			// Init the correspondance table
+			$aMonthToString = array(
+				1 => Dict::S('Month-01'),
+				2 => Dict::S('Month-02'),
+				3 => Dict::S('Month-03'),
+				4 => Dict::S('Month-04'),
+				5 => Dict::S('Month-05'),
+				6 => Dict::S('Month-06'),
+				7 => Dict::S('Month-07'),
+				8 => Dict::S('Month-08'),
+				9 => Dict::S('Month-09'),
+				10 => Dict::S('Month-10'),
+				11 => Dict::S('Month-11'),
+				12 => Dict::S('Month-12'),
+			);
+		}
+
+		$sRes = $sDefault;
+		if (strtolower($this->m_sVerb) == 'date_format')
+		{
+			$oFormatExpr = $this->m_aArgs[1];
+			if ($oFormatExpr->Render() == "'%w'")
+			{
+				if (isset($aWeekDayToString[(int)$sValue]))
+				{
+					$sRes = $aWeekDayToString[(int)$sValue];
+				}
+			}
+			elseif ($oFormatExpr->Render() == "'%Y-%m'")
+			{
+				// yyyy-mm => "yyyy month"
+				$iMonth = (int) substr($sValue, -2); // the two last chars
+				$sRes = substr($sValue, 0, 4).' '.$aMonthToString[$iMonth];
+			}
+			elseif ($oFormatExpr->Render() == "'%Y-%m-%d'")
+			{
+				// yyyy-mm-dd => "month d"
+				$iMonth = (int) substr($sValue, 5, 2);
+				$sRes = $aMonthToString[$iMonth].' '.(int)substr($sValue, -2);
+			}
+			elseif ($oFormatExpr->Render() == "'%H'")
+			{
+				// H => "H Hour(s)"
+				$sRes = $sValue.':00';
+			}
+		}
+		return $sRes;
+	}
+
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		$sOperation = '';
+		$sVerb = '';
+		switch ($this->m_sVerb)
+		{
+			case 'NOW':
+				$sVerb = $this->VerbToNaturalLanguage();
+				break;
+			case 'DATE_SUB':
+				$sVerb = ' -';
+				break;
+			case 'DATE_ADD':
+				$sVerb = ' +';
+				break;
+			case 'DATE_FORMAT':
+				$aCtx['date_display'] = $this;
+				break;
+			default:
+				return $this->Render($aArgs);
+		}
+
+		foreach($this->m_aArgs as $oExpression)
+		{
+			if ($oExpression instanceof IntervalExpression)
+			{
+				$sOperation .= $sVerb;
+				$sVerb = '';
+			}
+			$sOperation .= $oExpression->Display($oSearch, $aArgs, $oAttDef, $aCtx);
+		}
+
+		if (!empty($sVerb))
+		{
+			$sOperation .= $sVerb;
+		}
+		return $sOperation;
+	}
+
+	private function VerbToNaturalLanguage()
+	{
+		return Dict::S('Expression:Verb:'.$this->m_sVerb, " {$this->m_sVerb} ");
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aCriteria = array();
+		switch ($this->m_sVerb)
+		{
+			case 'ISNULL':
+				$aCriteria['operator'] = $this->m_sVerb;
+				foreach($this->m_aArgs as $oExpression)
+				{
+					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
+				}
+				$aCriteria['has_undefined'] = true;
+				$aCriteria['oql'] = $this->Render($aArgs, $bRetrofitParams);
+				break;
+
+			case 'NOW':
+				$aCriteria = array('widget' => 'date_time');
+				$aCriteria['is_relative'] = true;
+				$aCriteria['verb'] = $this->m_sVerb;
+				break;
+
+			case 'DATE_ADD':
+			case 'DATE_SUB':
+			case 'DATE_FORMAT':
+				$aCriteria = array('widget' => 'date_time');
+				foreach($this->m_aArgs as $oExpression)
+				{
+					$aCriteria = array_merge($oExpression->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef), $aCriteria);
+				}
+				$aCriteria['verb'] = $this->m_sVerb;
+				break;
+
+			default:
+				return parent::GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		}
+
+		return $aCriteria;
+	}
+}
+
+class IntervalExpression extends Expression
+{
+	protected $m_oValue; // expression
+	protected $m_sUnit;
+
+	public function __construct($oValue, $sUnit)
+	{
+		$this->m_oValue = $oValue;
+		$this->m_sUnit = $sUnit;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+
+	public function GetValue()
+	{
+		return $this->m_oValue;
+	}
+
+	public function GetUnit()
+	{
+		return $this->m_sUnit;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		return 'INTERVAL '.$this->m_oValue->Render($aArgs, $bRetrofitParams).' '.$this->m_sUnit;
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		$this->m_oValue->Browse($callback);
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+		if ($this->m_oValue instanceof VariableExpression)
+		{
+			$this->m_oValue = $this->m_oValue->GetAsScalar($aArgs);
+		}
+		else
+		{
+			$this->m_oValue->ApplyParameters($aArgs);
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->m_oValue->GetUnresolvedFields($sAlias, $aUnresolved);
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		return new IntervalExpression($this->m_oValue->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved), $this->m_sUnit);
+	}
+
+	public function ListRequiredFields()
+	{
+		return array();
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+	}
+
+	public function ListConstantFields()
+	{
+		return array();
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oValue->RenameParam($sOldName, $sNewName);
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		$this->m_oValue->RenameAlias($sOldName, $sNewName);
+	}
+
+	public function GetCriterion($oSearch, &$aArgs = null, $bRetrofitParams = false, $oAttDef = null)
+	{
+		$aCriteria = $this->m_oValue->GetCriterion($oSearch, $aArgs, $bRetrofitParams, $oAttDef);
+		$aCriteria['unit'] = $this->m_sUnit;
+
+		return $aCriteria;
+	}
+
+	public function Display($oSearch, &$aArgs = null, $oAttDef = null, &$aCtx = array())
+	{
+		return $this->m_oValue->Render($aArgs).' '.Dict::S('Expression:Unit:Long:'.$this->m_sUnit, $this->m_sUnit);
+	}
+}
+
+class CharConcatExpression extends Expression
+{
+	protected $m_aExpressions;
+
+	public function __construct($aExpressions)
+	{
+		$this->m_aExpressions = $aExpressions;
+	}
+
+	public function IsTrue()
+	{
+		// return true if we are certain that it will be true
+		return false;
+	}
+
+	public function GetItems()
+	{
+		return $this->m_aExpressions;
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
+			// Concat will be globally NULL if one single argument is null !
+			$aRes[] = "COALESCE($sCol, '')";
+		}
+		return "CAST(CONCAT(".implode(', ', $aRes).") AS CHAR)";
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->Browse($callback);
+		}
+	}
+
+	public function ApplyParameters($aArgs)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $idx => $oExpr)
+		{
+			if ($oExpr instanceof VariableExpression)
+			{
+				$this->m_aExpressions[$idx] = $oExpr->GetAsScalar();
+			}
+			else
+			{
+				$this->m_aExpressions->ApplyParameters($aArgs);
+			}
+		}
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		return new CharConcatExpression($aRes);
+	}
+
+	public function ListRequiredFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListRequiredFields());
+		}
+		return $aRes;
+	}
+
+	public function CollectUsedParents(&$aTable)
+	{
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->CollectUsedParents($aTable);
+		}
+	}
+
+	public function ListConstantFields()
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes = array_merge($aRes, $oExpr->ListConstantFields());
+		}
+		return $aRes;
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		foreach ($this->m_aExpressions as $key => $oExpr)
+		{
+			$this->m_aExpressions[$key] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+	}
+
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		foreach ($this->m_aExpressions as $key => $oExpr)
+		{
+			$oExpr->RenameAlias($sOldName, $sNewName);
+		}
+	}
+}
+
+
+class CharConcatWSExpression extends CharConcatExpression
+{
+	protected $m_separator;
+
+	public function __construct($separator, $aExpressions)
+	{
+		$this->m_separator = $separator;
+		parent::__construct($aExpressions);
+	}
+
+	// recursive rendering
+	public function Render(&$aArgs = null, $bRetrofitParams = false)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$sCol = $oExpr->Render($aArgs, $bRetrofitParams);
+			// Concat will be globally NULL if one single argument is null !
+			$aRes[] = "COALESCE($sCol, '')";
+		}
+		$sSep = CMDBSource::Quote($this->m_separator);
+		return "CAST(CONCAT_WS($sSep, ".implode(', ', $aRes).") AS CHAR)";
+	}
+
+	public function Browse(Closure $callback)
+	{
+		$callback($this);
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$oExpr->Browse($callback);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$aRes = array();
+		foreach ($this->m_aExpressions as $oExpr)
+		{
+			$aRes[] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		return new CharConcatWSExpression($this->m_separator, $aRes);
+	}
+}
+
+
+class QueryBuilderExpressions
+{
+	/**
+	 * @var Expression
+	 */
+	protected $m_oConditionExpr;
+	/**
+	 * @var Expression[]
+	 */
+	protected $m_aSelectExpr;
+	/**
+	 * @var Expression[]
+	 */
+	protected $m_aGroupByExpr;
+	/**
+	 * @var Expression[]
+	 */
+	protected $m_aJoinFields;
+	/**
+	 * @var string[]
+	 */
+	protected $m_aClassIds;
+
+	public function __construct(DBObjectSearch $oSearch, $aGroupByExpr = null, $aSelectExpr = null)
+	{
+		$this->m_oConditionExpr = $oSearch->GetCriteria();
+		if (!$oSearch->GetShowObsoleteData())
+		{
+			foreach ($oSearch->GetSelectedClasses() as $sAlias => $sClass)
+			{
+				if (MetaModel::IsObsoletable($sClass))
+				{
+					$oNotObsolete = new BinaryExpression(new FieldExpression('obsolescence_flag', $sAlias), '=', new ScalarExpression(0));
+					$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oNotObsolete);
+				}
+			}
+		}
+		$this->m_aSelectExpr = is_null($aSelectExpr) ? array() : $aSelectExpr;
+		$this->m_aGroupByExpr = $aGroupByExpr;
+		$this->m_aJoinFields = array();
+
+		$this->m_aClassIds = array();
+		foreach($oSearch->GetJoinedClasses() as $sClassAlias => $sClass)
+		{
+			$this->m_aClassIds[$sClassAlias] = new FieldExpression('id', $sClassAlias);
+		}
+	}
+
+	public function GetSelect()
+	{
+		return $this->m_aSelectExpr;
+	}
+
+	public function GetGroupBy()
+	{
+		return $this->m_aGroupByExpr;
+	}
+
+	public function GetCondition()
+	{
+		return $this->m_oConditionExpr;
+	}
+
+	/**
+	 * @return Expression|mixed
+	 */
+	public function PopJoinField()
+	{
+		return array_pop($this->m_aJoinFields);
+	}
+
+	/**
+	 * @param string $sAttAlias
+	 * @param Expression $oExpression
+	 */
+	public function AddSelect($sAttAlias, Expression $oExpression)
+	{
+		$this->m_aSelectExpr[$sAttAlias] = $oExpression;
+	}
+
+	/**
+	 * @param Expression $oExpression
+	 */
+	public function AddCondition(Expression $oExpression)
+	{
+		$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oExpression);
+	}
+
+	/**
+	 * @param Expression $oExpression
+	 */
+	public function PushJoinField(Expression $oExpression)
+	{
+		array_push($this->m_aJoinFields, $oExpression);
+	}
+
+	/**
+	 * Get tables representing the queried objects
+	 * Could be further optimized: when the first join is an outer join, then the rest can be omitted
+	 * @param array $aTables
+	 * @return array
+	 */
+	public function GetMandatoryTables(&$aTables = null)
+	{
+		if (is_null($aTables)) $aTables = array();
+
+		foreach($this->m_aClassIds as $sClass => $oExpression)
+		{
+			$oExpression->CollectUsedParents($aTables);
+		}
+
+		return $aTables;
+	}
+
+	public function GetUnresolvedFields($sAlias, &$aUnresolved)
+	{
+		$this->m_oConditionExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+		if ($this->m_aGroupByExpr)
+		{
+			foreach($this->m_aGroupByExpr as $sColAlias => $oExpr)
+			{
+				$oExpr->GetUnresolvedFields($sAlias, $aUnresolved);
+			}
+		}
+		foreach($this->m_aJoinFields as $oExpression)
+		{
+			$oExpression->GetUnresolvedFields($sAlias, $aUnresolved);
+		}
+	}
+
+	public function Translate($aTranslationData, $bMatchAll = true, $bMarkFieldsAsResolved = true)
+	{
+		$this->m_oConditionExpr = $this->m_oConditionExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$this->m_aSelectExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+		if ($this->m_aGroupByExpr)
+		{
+			foreach($this->m_aGroupByExpr as $sColAlias => $oExpr)
+			{
+				$this->m_aGroupByExpr[$sColAlias] = $oExpr->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+			}
+		}
+		foreach($this->m_aJoinFields as $index => $oExpression)
+		{
+			$this->m_aJoinFields[$index] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+
+		foreach($this->m_aClassIds as $sClass => $oExpression)
+		{
+			$this->m_aClassIds[$sClass] = $oExpression->Translate($aTranslationData, $bMatchAll, $bMarkFieldsAsResolved);
+		}
+	}
+
+	public function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oConditionExpr->RenameParam($sOldName, $sNewName);
+		foreach($this->m_aSelectExpr as $sColAlias => $oExpr)
+		{
+			$this->m_aSelectExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
+		}
+		if ($this->m_aGroupByExpr)
+		{
+			foreach($this->m_aGroupByExpr as $sColAlias => $oExpr)
+			{
+				$this->m_aGroupByExpr[$sColAlias] = $oExpr->RenameParam($sOldName, $sNewName);
+			}
+		}
+		foreach($this->m_aJoinFields as $index => $oExpression)
+		{
+			$this->m_aJoinFields[$index] = $oExpression->RenameParam($sOldName, $sNewName);
+		}
+	}
 }
\ No newline at end of file

From fe9ca2b9ccc6dc18b19c5cfdda2a402944f178e7 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 10 Oct 2018 14:38:18 +0200
Subject: [PATCH 09/13] Update readme.txt for iTop 2.5.1

---
 readme.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index 4dbc2628f..50d6bde0b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
-iTop - version 2.5.0 - 27-jun-2018
+iTop - version 2.5.1 - 10-Oct-2018
 Readme file
 
-iTop 2.5.0 is the 33rd release of iTop.
+iTop 2.5.1 is the 34th release of iTop.
 
 Changes since the previous version
 -------------------------------------------------------------------

From 215786d74017c4402778701bd36f359473459b62 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 10 Oct 2018 14:40:08 +0200
Subject: [PATCH 10/13] Update readme.txt for iTop 2.5.1

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 50d6bde0b..cdea4e5ce 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,7 +1,7 @@
 iTop - version 2.5.1 - 10-Oct-2018
 Readme file
 
-iTop 2.5.1 is the 34th release of iTop.
+iTop 2.5.1 is the 35th release of iTop.
 
 Changes since the previous version
 -------------------------------------------------------------------

From 11ba459d1bdb980302164e704a796426c5fdc1e1 Mon Sep 17 00:00:00 2001
From: steffunky <stephen.abello@combodo.com>
Date: Fri, 12 Oct 2018 10:48:32 +0200
Subject: [PATCH 11/13] =?UTF-8?q?N=C2=B01590:=20Advanced=20search:=20fixed?=
 =?UTF-8?q?=20a=20bug=20when=20selecting=20foreign=20keys=20would=20not=20?=
 =?UTF-8?q?add=20items=20(selectionMode=20is=20mandatory)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/utils.inc.php   | 3900 +++++++++++++++++------------------
 js/searchformforeignkeys.js |  682 +++---
 2 files changed, 2291 insertions(+), 2291 deletions(-)

diff --git a/application/utils.inc.php b/application/utils.inc.php
index 68b3c165d..8ea14beac 100644
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -1,1950 +1,1950 @@
-<?php
-use Html2Text\Html2Text;
-use Leafo\ScssPhp\Compiler;
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Static class utils
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/core/config.class.inc.php');
-require_once(APPROOT.'/application/transaction.class.inc.php');
-require_once(APPROOT.'application/Html2Text.php');
-require_once(APPROOT.'application/Html2TextException.php');
-
-define('ITOP_CONFIG_FILE', 'config-itop.php');
-define('ITOP_DEFAULT_CONFIG_FILE', APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE);
-
-define('SERVER_NAME_PLACEHOLDER', '$SERVER_NAME$');
-
-define('SERVER_MAX_URL_LENGTH', 2048);
-
-class FileUploadException extends Exception
-{
-}
-
-
-/**
- * Helper functions to interact with forms: read parameters, upload files...
- * @package     iTop
- */
-class utils
-{
-	private static $oConfig = null;
-	private static $m_bCASClient = false;
-
-	// Parameters loaded from a file, parameters of the page/command line still have precedence
-	private static $m_aParamsFromFile = null;
-	private static $m_aParamSource = array();
-
-	protected static function LoadParamFile($sParamFile)
-	{
-		if (!file_exists($sParamFile))
-		{
-			throw new Exception("Could not find the parameter file: '$sParamFile'");
-		}
-		if (!is_readable($sParamFile))
-		{
-			throw new Exception("Could not load parameter file: '$sParamFile'");
-		}
-		$sParams = file_get_contents($sParamFile);
-
-		if (is_null(self::$m_aParamsFromFile))
-		{
-			self::$m_aParamsFromFile = array();
-		}
-
-		$aParamLines = explode("\n", $sParams);
-		foreach ($aParamLines as $sLine)
-		{
-			$sLine = trim($sLine);
-
-			// Ignore the line after a '#'
-			if (($iCommentPos = strpos($sLine, '#')) !== false)
-			{
-				$sLine = substr($sLine, 0, $iCommentPos);
-				$sLine = trim($sLine);
-			}
-
-			// Note: the line is supposed to be already trimmed
-			if (preg_match('/^(\S*)\s*=(.*)$/', $sLine, $aMatches))
-			{
-				$sParam = $aMatches[1];
-				$value = trim($aMatches[2]);
-				self::$m_aParamsFromFile[$sParam] = $value;
-				self::$m_aParamSource[$sParam] = $sParamFile;
-			}
-		}
-	}
-
-	public static function UseParamFile($sParamFileArgName = 'param_file', $bAllowCLI = true)
-	{
-		$sFileSpec = self::ReadParam($sParamFileArgName, '', $bAllowCLI, 'raw_data');
-		foreach(explode(',', $sFileSpec) as $sFile)
-		{
-			$sFile = trim($sFile);
-			if (!empty($sFile))
-			{
-				self::LoadParamFile($sFile);
-			}
-		}
-	}
-
-	/**
-	 * Return the source file from which the parameter has been found,
-	 * usefull when it comes to pass user credential to a process executed
-	 * in the background	 
-	 * @param $sName Parameter name
-	 * @return The file name if any, or null
-	 */
-	public static function GetParamSourceFile($sName)
-	{
-		if (array_key_exists($sName, self::$m_aParamSource))
-		{
-			return self::$m_aParamSource[$sName];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	public static function IsModeCLI()
-	{
-		$sSAPIName = php_sapi_name();
-		$sCleanName = strtolower(trim($sSAPIName));
-		if ($sCleanName == 'cli')
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	protected static $bPageMode = null;
-	/**
-	 * @var boolean[]
-	 */
-	protected static $aModes = array();
-
-	public static function InitArchiveMode()
-	{
-		if (isset($_SESSION['archive_mode']))
-		{
-			$iDefault = $_SESSION['archive_mode'];
-		}
-		else
-		{
-			$iDefault = 0;
-		}
-		// Read and record the value for switching the archive mode
-		$iCurrent = self::ReadParam('with-archive', $iDefault);
-		if (isset($_SESSION))
-		{
-			$_SESSION['archive_mode'] = $iCurrent;
-		}
-		// Read and use the value for the current page (web services)
-		$iCurrent = self::ReadParam('with_archive', $iCurrent, true);
-		self::$bPageMode = ($iCurrent == 1);
-	}
-
-	/**
-	 * @param boolean $bMode if true then activate archive mode (archived objects are visible), otherwise archived objects are
-	 *     hidden (archive = "soft deletion")
-	 */
-	public static function PushArchiveMode($bMode)
-	{
-		array_push(self::$aModes, $bMode);
-	}
-
-	public static function PopArchiveMode()
-	{
-		array_pop(self::$aModes);
-	}
-
-	/**
-	 * @return boolean true if archive mode is enabled
-	 */
-	public static function IsArchiveMode()
-	{
-		if (count(self::$aModes) > 0)
-		{
-			$bRet = end(self::$aModes);
-		}
-		else
-		{
-			if (self::$bPageMode === null)
-			{
-				self::InitArchiveMode();
-			}
-			$bRet = self::$bPageMode;
-		}
-		return $bRet;
-	}
-
-	/**
-	 * Helper to be called by the GUI and define if the user will see obsolete data (otherwise, the user will have to dig further)
-	 * @return bool
-	 */
-	public static function ShowObsoleteData()
-	{
-		$bDefault = MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'); // default is false
-		$bShow = appUserPreferences::GetPref('show_obsolete_data', $bDefault);
-		if (static::IsArchiveMode())
-		{
-			$bShow = true;
-		}
-		return $bShow;
-	}
-
-	public static function ReadParam($sName, $defaultValue = "", $bAllowCLI = false, $sSanitizationFilter = 'parameter')
-	{
-		global $argv;
-		$retValue = $defaultValue;
-
-		if (!is_null(self::$m_aParamsFromFile))
-		{
-			if (isset(self::$m_aParamsFromFile[$sName]))
-			{
-				$retValue = self::$m_aParamsFromFile[$sName];
-			}
-		}
-
-		if (isset($_REQUEST[$sName]))
-		{
-			$retValue = $_REQUEST[$sName];
-		}
-		elseif ($bAllowCLI && isset($argv))
-		{
-			foreach($argv as $iArg => $sArg)
-			{
-				if (preg_match('/^--'.$sName.'=(.*)$/', $sArg, $aMatches))
-				{
-					$retValue = $aMatches[1];
-				}
-			}
-		}
-		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
-	}
-	
-	public static function ReadPostedParam($sName, $defaultValue = '', $sSanitizationFilter = 'parameter')
-	{
-		$retValue = isset($_POST[$sName]) ? $_POST[$sName] : $defaultValue;
-		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
-	}
-	
-	public static function Sanitize($value, $defaultValue, $sSanitizationFilter)
-	{
-		if ($value === $defaultValue)
-		{
-			// Preserve the real default value (can be used to detect missing mandatory parameters)
-			$retValue = $value;
-		}
-		else
-		{
-			$retValue = self::Sanitize_Internal($value, $sSanitizationFilter);
-			if ($retValue === false)
-			{
-				$retValue = $defaultValue;
-			}
-		}
-		return $retValue;		
-	}
-	
-	protected static function Sanitize_Internal($value, $sSanitizationFilter)
-	{
-		switch($sSanitizationFilter)
-		{
-			case 'integer':
-			$retValue = filter_var($value, FILTER_SANITIZE_NUMBER_INT);
-			break;
-			
-			case 'class':
-			$retValue = $value;
-			if (!MetaModel::IsValidClass($value))
-			{
-				$retValue = false;
-			}
-			break;
-
-			case 'string':
-			$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
-			break;
-			
-			case 'context_param':
-			case 'parameter':
-			case 'field_name':
-			if (is_array($value))
-			{
-				$retValue = array();
-				foreach($value as $key => $val)
-				{
-					$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
-					if ($retValue[$key] === false)
-					{
-						$retValue = false;
-						break;
-					}
-				}
-			}
-			else
-			{
-				switch($sSanitizationFilter)
-				{
-					case 'parameter':
-					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^([ A-Za-z0-9_=-]|%3D|%2B|%2F)*$/'))); // the '=', '%3D, '%2B', '%2F' characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
-					break;
-					
-					case 'field_name':
-					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
-					break;
-					
-					case 'context_param':
-					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=%:+-]*$/')));
-					break;
-						
-				}
-			}
-			break;
-						
-			default:
-			case 'raw_data':
-			$retValue = $value;
-			// Do nothing
-		}
-		return $retValue;		
-	}
-	
-	/**
-	 * Reads an uploaded file and turns it into an ormDocument object - Triggers an exception in case of error
-	 * @param string $sName Name of the input used from uploading the file	 
-	 * @param string $sIndex If Name is an array of posted files, then the index must be used to point out the file	 
-	 * @return ormDocument The uploaded file (can be 'empty' if nothing was uploaded)
-	 */	 	 
-	public static function  ReadPostedDocument($sName, $sIndex = null)
-	{
-		$oDocument = new ormDocument(); // an empty document
-		if(isset($_FILES[$sName]))
-		{
-			$aFileInfo = $_FILES[$sName];
-
-			$sError = is_null($sIndex) ? $aFileInfo['error'] : $aFileInfo['error'][$sIndex];
-			switch($sError)
-			{
-				case UPLOAD_ERR_OK:
-				$sTmpName = is_null($sIndex) ? $aFileInfo['tmp_name'] : $aFileInfo['tmp_name'][$sIndex];
-				$sMimeType = is_null($sIndex) ? $aFileInfo['type'] : $aFileInfo['type'][$sIndex];
-				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
-
-				$doc_content = file_get_contents($sTmpName);
-				if (function_exists('finfo_file'))
-				{
-					// as of PHP 5.3 the fileinfo extension is bundled within PHP
-					// in which case we don't trust the mime type provided by the browser
-					$rInfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
-					if ($rInfo !== false)
-					{
-					   $sType = @finfo_file($rInfo, $sTmpName);
-					   if ( ($sType !== false)
-					        && is_string($sType)
-					        && (strlen($sType)>0))
-					   {
-					        $sMimeType = $sType;
-					   }
-					}
-					@finfo_close($rInfo);
-				}
-				$oDocument = new ormDocument($doc_content, $sMimeType, $sName);
-				break;
-				
-				case UPLOAD_ERR_NO_FILE:
-				// no file to load, it's a normal case, just return an empty document
-				break;
-				
-				case UPLOAD_ERR_FORM_SIZE:
-				case UPLOAD_ERR_INI_SIZE:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadedFileTooBig', ini_get('upload_max_filesize')));
-				break;
-
-				case UPLOAD_ERR_PARTIAL:
-				throw new FileUploadException(Dict::S('UI:Error:UploadedFileTruncated.'));
-				break;
-				
-				case UPLOAD_ERR_NO_TMP_DIR:
-				throw new FileUploadException(Dict::S('UI:Error:NoTmpDir'));
-				break;
-
-				case UPLOAD_ERR_CANT_WRITE:
-				throw new FileUploadException(Dict::Format('UI:Error:CannotWriteToTmp_Dir', ini_get('upload_tmp_dir')));
-				break;
-
-				case UPLOAD_ERR_EXTENSION:
-				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
-				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $sName));
-				break;
-				
-				default:
-				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $sError));
-				break;
-
-			}
-		}
-		return $oDocument;
-	}
-	
-	/**
-	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
-	 *
-	 * @param $oFullSetFilter DBSearch The criteria defining the whole sets of objects being selected
-	 *
-	 * @return Array An array of object IDs corresponding to the objects selected in the set
-	 */	
-	public static function ReadMultipleSelection($oFullSetFilter)
-	{
-		$aSelectedObj = utils::ReadParam('selectObject', array());
-		$sSelectionMode = utils::ReadParam('selectionMode', '');
-		if ($sSelectionMode != '')
-		{
-			// Paginated selection
-			$aExceptions = utils::ReadParam('storedSelection', array());
-			if ($sSelectionMode == 'positive')
-			{
-				// Only the explicitely listed items are selected
-				$aSelectedObj = $aExceptions;
-			}
-			else
-			{
-				// All items of the set are selected, except the one explicitely listed
-				$aSelectedObj = array();
-				$oFullSet = new DBObjectSet($oFullSetFilter);
-				$sClassAlias = $oFullSetFilter->GetClassAlias();
-				$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
-				while($oObj = $oFullSet->Fetch())
-				{
-					if (!in_array($oObj->GetKey(), $aExceptions))
-					{
-						$aSelectedObj[] = $oObj->GetKey();
-					}
-				}
-			}
-		}
-		return $aSelectedObj;
-	}
-
-	/**
-	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
-	 *
-	 * @param DBSearch $oFullSetFilter The criteria defining the whole sets of objects being selected
-	 *
-	 * @return Array An array of object IDs:friendlyname corresponding to the objects selected in the set
-	 * @throws \CoreException
-	 */
-	public static function ReadMultipleSelectionWithFriendlyname($oFullSetFilter)
-	{
-		$sSelectionMode = utils::ReadParam('selectionMode', '');
-
-		if ($sSelectionMode === '')
-		{
-			throw new CoreException('selectionMode is mandatory');
-		}
-
-		// Paginated selection
-		$aSelectedIds = utils::ReadParam('storedSelection', array());
-		if (count($aSelectedIds) > 0 )
-		{
-			if ($sSelectionMode == 'positive')
-			{
-				// Only the explicitly listed items are selected
-				$oFullSetFilter->AddCondition('id', $aSelectedIds, 'IN');
-			}
-			else
-			{
-				// All items of the set are selected, except the one explicitly listed
-				$oFullSetFilter->AddCondition('id', $aSelectedIds, 'NOTIN');
-			}
-		}
-
-		$aSelectedObj = array();
-		$oFullSet = new DBObjectSet($oFullSetFilter);
-		$sClassAlias = $oFullSetFilter->GetClassAlias();
-		$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
-		while ($oObj = $oFullSet->Fetch())
-		{
-			$aSelectedObj[$oObj->GetKey()] = $oObj->Get('friendlyname');
-		}
-
-		return $aSelectedObj;
-	}
-	
-	public static function GetNewTransactionId()
-	{
-		return privUITransaction::GetNewTransactionId();
-	}
-	
-	public static function IsTransactionValid($sId, $bRemoveTransaction = true)
-	{
-		return privUITransaction::IsTransactionValid($sId, $bRemoveTransaction);
-	}
-	
-	public static function RemoveTransaction($sId)
-	{
-		return privUITransaction::RemoveTransaction($sId);
-	}
-
-	/**
-	 * Returns a unique tmp id for the current upload based on the transaction system (db).
-	 *
-	 * Build as session_id() . '_' . static::GetNewTransactionId()
-	 *
-	 * @return string
-	 */
-	public static function GetUploadTempId($sTransactionId = null)
-	{
-		if ($sTransactionId === null)
-		{
-			$sTransactionId = static::GetNewTransactionId();
-		}
-		return session_id() . '_' . $sTransactionId;
-	}
-
-	public static function ReadFromFile($sFileName)
-	{
-		if (!file_exists($sFileName)) return false;
-		return file_get_contents($sFileName);
-	}
-
-	/**
-	 * Helper function to convert a value expressed in a 'user friendly format'
-	 * as in php.ini, e.g. 256k, 2M, 1G etc. Into a number of bytes
-	 * @param mixed $value The value as read from php.ini
-	 * @return number
-	 */	 	  
-	public static function ConvertToBytes( $value )
-	{
-		$iReturn = $value;
-	    if ( !is_numeric( $value ) )
-		{
-	        $iLength = strlen( $value );
-	        $iReturn = substr( $value, 0, $iLength - 1 );
-	        $sUnit = strtoupper( substr( $value, $iLength - 1 ) );
-	        switch ( $sUnit )
-			{
-	            case 'G':
-	                $iReturn *= 1024;
-	            case 'M':
-	                $iReturn *= 1024;
-	            case 'K':
-	                $iReturn *= 1024;
-	        }
-	    }
-        return $iReturn;
-    }
-
-	/**
-	 * Format a value into a more friendly format (KB, MB, GB, TB) instead a juste a Bytes amount.
-	 *
-	 * @param type $value
-	 * @return string
-	 */
-	public static function BytesToFriendlyFormat($value)
-	{
-		$sReturn = '';
-		// Kilobytes
-		if ($value >= 1024)
-		{
-			$sReturn = 'K';
-			$value = $value / 1024;
-		}
-		// Megabytes
-		if ($value >= 1024)
-		{
-			$sReturn = 'M';
-			$value = $value / 1024;
-		}
-		// Gigabytes
-		if ($value >= 1024)
-		{
-			$sReturn = 'G';
-			$value = $value / 1024;
-		}
-		// Terabytes
-		if ($value >= 1024)
-		{
-			$sReturn = 'T';
-			$value = $value / 1024;
-		}
-
-		$value = round($value, 1);
-
-		return $value . '' . $sReturn . 'B';
-	}
-
-	/**
-	 * Helper function to convert a string to a date, given a format specification. It replaces strtotime which does not allow for specifying a date in a french format (for instance)
-	 * Example: StringToTime('01/05/11 12:03:45', '%d/%m/%y %H:%i:%s')
-	 * @param string $sDate
-	 * @param string $sFormat
-	 * @return timestamp or false if the input format is not correct
-	 */	 	  
-	public static function StringToTime($sDate, $sFormat)
-	{
-	   // Source: http://php.net/manual/fr/function.strftime.php
-		// (alternative: http://www.php.net/manual/fr/datetime.formats.date.php)
-		static $aDateTokens = null;
-		static $aDateRegexps = null;
-		if (is_null($aDateTokens))
-		{
-		   $aSpec = array(
-				'%d' =>'(?<day>[0-9]{2})',
-				'%m' => '(?<month>[0-9]{2})',
-				'%y' => '(?<year>[0-9]{2})',
-				'%Y' => '(?<year>[0-9]{4})',
-				'%H' => '(?<hour>[0-2][0-9])',
-				'%i' => '(?<minute>[0-5][0-9])',
-				'%s' => '(?<second>[0-5][0-9])',
-				);
-			$aDateTokens = array_keys($aSpec);
-			$aDateRegexps = array_values($aSpec);
-		}
-	   
-	   $sDateRegexp = str_replace($aDateTokens, $aDateRegexps, $sFormat);
-	   
-	   if (preg_match('!^(?<head>)'.$sDateRegexp.'(?<tail>)$!', $sDate, $aMatches))
-	   {
-			$sYear = isset($aMatches['year']) ? $aMatches['year'] : 0;
-			$sMonth = isset($aMatches['month']) ? $aMatches['month'] : 1;
-			$sDay = isset($aMatches['day']) ? $aMatches['day'] : 1;
-			$sHour = isset($aMatches['hour']) ? $aMatches['hour'] : 0;
-			$sMinute = isset($aMatches['minute']) ? $aMatches['minute'] : 0;
-			$sSecond = isset($aMatches['second']) ? $aMatches['second'] : 0;
-			return strtotime("$sYear-$sMonth-$sDay $sHour:$sMinute:$sSecond");
-		}
-	   else
-	   {
-	   	return false;
-	   }
-	   // http://www.spaweditor.com/scripts/regex/index.php
-	}
-	
-	/**
-	 * Convert an old date/time format specifciation (using % placeholders)
-	 * to a format compatible with DateTime::createFromFormat
-	 * @param string $sOldDateTimeFormat
-	 * @return string
-	 */
-	static public function DateTimeFormatToPHP($sOldDateTimeFormat)
-	{
-		$aSearch = array('%d', '%m', '%y', '%Y', '%H', '%i', '%s');
-		$aReplacement = array('d', 'm', 'y', 'Y', 'H', 'i', 's');
-		return str_replace($aSearch, $aReplacement, $sOldDateTimeFormat);
-	}
-
-	/**
-	 * @return \Config from the current environement, or if not existing from the production env, else new Config made from scratch
-	 * @uses \MetaModel::GetConfig() don't forget to add the needed <code>require_once(APPROOT.'core/metamodel.class.php');</code>
-	 */
-	static public function GetConfig()
-	{
-		if (self::$oConfig == null)
-		{
-		    self::$oConfig = MetaModel::GetConfig();
-
-		    if (self::$oConfig == null)
-		    {
-    			$sConfigFile = self::GetConfigFilePath();
-    			if (!file_exists($sConfigFile))
-    			{
-				    $sConfigFile = self::GetConfigFilePath('production');
-				    if (!file_exists($sConfigFile))
-				    {
-				    	$sConfigFile = null;
-				    }
-    			}
-
-			    self::$oConfig = new Config($sConfigFile);
-		    }
-		}
-		return self::$oConfig;
-	}
-
-	public static function InitTimeZone() {
-		$oConfig = self::GetConfig();
-		$sItopTimeZone = $oConfig->Get('timezone');
-
-		if (!empty($sItopTimeZone))
-		{
-			date_default_timezone_set($sItopTimeZone);
-		}
-		else
-		{
-			// Leave as is... up to the admin to set a value somewhere...
-			// see http://php.net/manual/en/datetime.configuration.php#ini.date.timezone
-		}
-	}
-
-    /**
-     * Returns the absolute URL to the application root path
-     * @return string The absolute URL to the application root, without the first slash
-     */                   
-	static public function GetAbsoluteUrlAppRoot()
-	{
-		static $sUrl = null;
-		if ($sUrl === null)
-		{
-			$sUrl = self::GetConfig()->Get('app_root_url');
-			if ($sUrl == '')
-			{
-				$sUrl = self::GetDefaultUrlAppRoot();
-			}
-			elseif (strpos($sUrl, SERVER_NAME_PLACEHOLDER) > -1)
-			{
-				if (isset($_SERVER['SERVER_NAME']))
-				{
-					$sServerName = $_SERVER['SERVER_NAME'];
-				}
-				else
-				{
-					// CLI mode ?
-					$sServerName = php_uname('n');
-				}
-				$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
-			}
-		}
-		return $sUrl;
-	}
-
-	static public function GetDefaultUrlAppRoot()
-	{
-		// Build an absolute URL to this page on this server/port
-		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-		$sProtocol = self::IsConnectionSecure() ? 'https' : 'http';
-		$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
-		if ($sProtocol == 'http')
-		{
-			$sPort = ($iPort == 80) ? '' : ':'.$iPort;
-		}
-		else
-		{
-			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
-		}
-		// $_SERVER['REQUEST_URI'] is empty when running on IIS
-		// Let's use Ivan Tcholakov's fix (found on www.dokeos.com)
-		if (!empty($_SERVER['REQUEST_URI']))
-		{
-			$sPath = $_SERVER['REQUEST_URI'];
-		}
-		else
-		{
-			$sPath = $_SERVER['SCRIPT_NAME'];
-			if (!empty($_SERVER['QUERY_STRING']))
-			{
-				$sPath .= '?'.$_SERVER['QUERY_STRING'];
-			}
-			$_SERVER['REQUEST_URI'] = $sPath;
-		}
-		$sPath = $_SERVER['REQUEST_URI'];
-
-		// remove all the parameters from the query string
-		$iQuestionMarkPos = strpos($sPath, '?');
-		if ($iQuestionMarkPos !== false)
-		{
-			$sPath = substr($sPath, 0, $iQuestionMarkPos);
-		}
-		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
-
-		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
-		$sCurrentScript = str_replace('\\', '/', $sCurrentScript); // canonical path
-		$sAppRoot = str_replace('\\', '/', APPROOT); // canonical path
-		$sCurrentRelativePath = str_replace($sAppRoot, '', $sCurrentScript);
-	
-		$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
-		if ($sAppRootPos !== false)
-		{
-			$sAppRootUrl = substr($sAbsoluteUrl, 0, $sAppRootPos); // remove the current page and path
-		}
-		else
-		{
-			// Second attempt without index.php at the end...
-			$sCurrentRelativePath = str_replace('index.php', '', $sCurrentRelativePath);
-			$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
-			if ($sAppRootPos !== false)
-			{
-				$sAppRootUrl = substr($sAbsoluteUrl, 0, $sAppRootPos); // remove the current page and path
-			}
-			else
-			{
-				// No luck...
-				throw new Exception("Failed to determine application root path $sAbsoluteUrl ($sCurrentRelativePath) APPROOT:'$sAppRoot'");
-			}			
-		}
-		return $sAppRootUrl;
-	}
-
-	/**
-	 * Helper to handle the variety of HTTP servers
-	 * See #286 (fixed in [896]), and #634 (this fix)
-	 * 	 
-	 * Though the official specs says 'a non empty string', some servers like IIS do set it to 'off' !
-	 * nginx set it to an empty string
-	 * Others might leave it unset (no array entry)	 
-	 */	 	
-	static public function IsConnectionSecure()
-	{
-		$bSecured = false;
-
-		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off'))
-		{
-			$bSecured = true;
-		}
-		return $bSecured;
-	}
-
-	/**
-	 * Tells whether or not log off operation is supported.
-	 * Actually in only one case:
-	 * 1) iTop is using an internal authentication
-	 * 2) the user did not log-in using the "basic" mode (i.e basic authentication) or by passing credentials in the URL
-	 * @return boolean True if logoff is supported, false otherwise
-	 */
-	static function CanLogOff()
-	{
-		$bResult = false;
-		if(isset($_SESSION['login_mode']))
-		{
-			$sLoginMode = $_SESSION['login_mode'];
-			switch($sLoginMode)
-			{
-				case 'external':
-				$bResult = false;
-				break;
-	
-				case 'form':
-				case 'basic':
-				case 'url':
-				case 'cas':
-				default:
-				$bResult = true;
-				
-			}			
-		}
-		return $bResult;
-	}
-
-	/**
-	 * Initializes the CAS client
-	 */
-	 static function InitCASClient()
-	 {
-		$sCASIncludePath =  self::GetConfig()->Get('cas_include_path');
-		include_once($sCASIncludePath.'/CAS.php');
-		
-		$bCASDebug = self::GetConfig()->Get('cas_debug');
-		if ($bCASDebug)
-		{
-			phpCAS::setDebug(APPROOT.'log/error.log');
-		}
-		
-		if (!self::$m_bCASClient)
-		{
-			// Initialize phpCAS
-			$sCASVersion = self::GetConfig()->Get('cas_version');
-			$sCASHost = self::GetConfig()->Get('cas_host');
-			$iCASPort = self::GetConfig()->Get('cas_port');
-			$sCASContext = self::GetConfig()->Get('cas_context');
-			phpCAS::client($sCASVersion, $sCASHost, $iCASPort, $sCASContext, false /* session already started */);
-			self::$m_bCASClient = true;
-			$sCASCACertPath = self::GetConfig()->Get('cas_server_ca_cert_path');
-			if (empty($sCASCACertPath))
-			{
-				// If no certificate authority is provided, do not attempt to validate
-				// the server's certificate
-				// THIS SETTING IS NOT RECOMMENDED FOR PRODUCTION. 
-				// VALIDATING THE CAS SERVER IS CRUCIAL TO THE SECURITY OF THE CAS PROTOCOL! 
-				phpCAS::setNoCasServerValidation();
-			}
-			else
-			{
-				phpCAS::setCasServerCACert($sCASCACertPath);
-			}			
-		}
-	 }
-	 
-	 static function DebugBacktrace($iLimit = 5)
-	 {
-		$aFullTrace = debug_backtrace();
-		$aLightTrace = array();
-		for($i=1; ($i<=$iLimit && $i < count($aFullTrace)); $i++) // Skip the last function call... which is the call to this function !
-		{
-			$aLightTrace[$i] = $aFullTrace[$i]['function'].'(), called from line '.$aFullTrace[$i]['line'].' in '.$aFullTrace[$i]['file'];
-		}
-		echo "<p><pre>".print_r($aLightTrace, true)."</pre></p>\n";
-	 }
-
-	/**
-	 * Execute the given iTop PHP script, passing it the current credentials
-	 * Only CLI mode is supported, because of the need to hand the credentials over to the next process
-	 * Throws an exception if the execution fails or could not be attempted (config issue)
-	 * @param string $sScript Name and relative path to the file (relative to the iTop root dir)
-	 * @param hash $aArguments Associative array of 'arg' => 'value'
-	 * @return array(iCode, array(output lines))
-	 */	 	  
-	/**
-	 */
-	static function ExecITopScript($sScriptName, $aArguments)
-	{
-		$aDisabled = explode(', ', ini_get('disable_functions'));
-		if (in_array('exec', $aDisabled))
-		{
-			throw new Exception("The PHP exec() function has been disabled on this server");
-		}
-
-		$sPHPExec = trim(self::GetConfig()->Get('php_path'));
-		if (strlen($sPHPExec) == 0)
-		{
-			throw new Exception("The path to php must not be empty. Please set a value for 'php_path' in your configuration file.");
-		}
-
-		$sAuthUser = self::ReadParam('auth_user', '', 'raw_data');
-		$sAuthPwd = self::ReadParam('auth_pwd', '', 'raw_data');
-		$sParamFile = self::GetParamSourceFile('auth_user');
-		if (is_null($sParamFile))
-		{
-			$aArguments['auth_user'] = $sAuthUser;
-			$aArguments['auth_pwd'] = $sAuthPwd;
-		}
-		else
-		{
-			$aArguments['param_file'] = $sParamFile;
-		}
-		
-		$aArgs = array();
-		foreach($aArguments as $sName => $value)
-		{
-			// Note: See comment from the 23-Apr-2004 03:30 in the PHP documentation
-			//    It suggests to rely on pctnl_* function instead of using escapeshellargs
-			$aArgs[] = "--$sName=".escapeshellarg($value);
-		}
-		$sArgs = implode(' ', $aArgs);
-		
-		$sScript = realpath(APPROOT.$sScriptName);
-		if (!file_exists($sScript))
-		{
-			throw new Exception("Could not find the script file '$sScriptName' from the directory '".APPROOT."'");
-		}
-
-		$sCommand = '"'.$sPHPExec.'" '.escapeshellarg($sScript).' -- '.$sArgs;
-
-		if (version_compare(phpversion(), '5.3.0', '<'))
-		{
-			if (substr(PHP_OS,0,3) == 'WIN')
-			{
-				// Under Windows, and for PHP 5.2.x, the whole command has to be quoted
-				// Cf PHP doc: http://php.net/manual/fr/function.exec.php, comment from the 27-Dec-2010
-				$sCommand = '"'.$sCommand.'"';
-			}
-		}
-
-		$sLastLine = exec($sCommand, $aOutput, $iRes);
-		if ($iRes == 1)
-		{
-			throw new Exception(Dict::S('Core:ExecProcess:Code1')." - ".$sCommand);
-		}
-		elseif ($iRes == 255)
-		{
-			$sErrors = implode("\n", $aOutput);
-			throw new Exception(Dict::S('Core:ExecProcess:Code255')." - ".$sCommand.":\n".$sErrors);
-		}
-
-		//$aOutput[] = $sCommand;
-		return array($iRes, $aOutput);
-	}
-
-	/**
-	 * Get the current environment
-	 */
-	public static function GetCurrentEnvironment()
-	{
-		if (isset($_SESSION['itop_env']))
-		{
-			return $_SESSION['itop_env'];
-		}
-		else
-		{
-			return ITOP_DEFAULT_ENV;
-		}
-	}
-
-	/**
-	 * Returns a path to a folder into which any module can store cache data
-	 * The corresponding folder is created or cleaned upon code compilation
-	 * @return string
-	 */
-	public static function GetCachePath()
-	{
-		return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
-	}
-	/**
-	 * Merge standard menu items with plugin provided menus items
-	 */
-	public static function GetPopupMenuItems($oPage, $iMenuId, $param, &$aActions, $sTableId = null, $sDataTableId = null)
-	{
-		// 1st - add standard built-in menu items
-		// 
-		switch($iMenuId)
-		{
-			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
-			// $param is a DBObjectSet
-			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink();
-			$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
-			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($param->GetFilter()->GetClass());
-			$sOQL = addslashes($param->GetFilter()->ToOQL(true));
-			$sFilter = urlencode($param->GetFilter()->serialize());
-			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
-			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
-
-			$aResult = array();
-			if (strlen($sUrl) < SERVER_MAX_URL_LENGTH)
-			{
-				$aResult[] = new SeparatorPopupMenuItem();
-				// Static menus: Email this page, CSV Export & Add to Dashboard
-				$aResult[] = new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'),
-						"mailto:?body=".urlencode($sUrl).' ' // Add an extra space to make it work in Outlook
-				);
-			}
-			
-			if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) != UR_ALLOWED_NO)
-			{
-				// Bulk export actions
-				$aResult[] = new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '$sDataTableId', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")");
-				$aResult[] = new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '$sDataTableId', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")");
-				if (extension_loaded('gd'))
-				{
-					// PDF export requires GD
-					$aResult[] = new JSPopupMenuItem('UI:Menu:ExportPDF', Dict::S('UI:Menu:ExportPDF'), "ExportListDlg('$sOQL', '$sDataTableId', 'pdf', ".json_encode(Dict::S('UI:Menu:ExportPDF')).")");
-				}
-			}
-			$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
-			$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
-				
-			break;
-
-			case iPopupMenuExtension::MENU_OBJDETAILS_ACTIONS:
-			// $param is a DBObject
-			$oObj = $param;
-			$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
-			$oFilter = DBObjectSearch::FromOQL($sOQL);
-			$sFilter = $oFilter->serialize();
-			$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
-			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage(get_class($oObj));
-			$oAppContext = new ApplicationContext();
-			$sContext = $oAppContext->GetForLink();
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
-			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
-			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
-			
-			$aResult = array(
-				new SeparatorPopupMenuItem(),
-				// Static menus: Email this page & CSV Export
-				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?subject=".urlencode($oObj->GetRawName())."&body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
-				new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")"),
-				new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")"),
-				new SeparatorPopupMenuItem(),
-				new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $sUrl.'&printable=1', '_blank'),
-			);
-			break;
-
-			case iPopupMenuExtension::MENU_DASHBOARD_ACTIONS:
-			// $param is a Dashboard
-			$oAppContext = new ApplicationContext();
-			$aParams = $oAppContext->GetAsHash();
-			$sMenuId = ApplicationMenu::GetActiveNodeId();
-			$sDlgTitle = addslashes(Dict::S('UI:ImportDashboardTitle'));
-			$sDlgText = addslashes(Dict::S('UI:ImportDashboardText'));
-			$sCloseBtn = addslashes(Dict::S('UI:Button:Cancel'));
-			$aResult = array(
-				new SeparatorPopupMenuItem(),
-				new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sMenuId),
-				new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sMenuId', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn' })"),
-			);
-			break;
-
-			default:
-			// Unknown type of menu, do nothing
-			$aResult = array();
-		}
-		foreach($aResult as $oMenuItem)
-		{
-			$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
-		}
-
-		// Invoke the plugins
-		//
-		foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
-		{
-			if (is_object($param) && !($param instanceof DBObject))
-			{
-				$tmpParam = clone $param; // In case the parameter is an DBObjectSet, clone it to prevent alterations
-			}
-			else
-			{
-				$tmpParam = $param;
-			}
-			foreach($oExtensionInstance->EnumItems($iMenuId, $tmpParam) as $oMenuItem)
-			{
-				if (is_object($oMenuItem))
-				{
-					$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
-					
-					foreach($oMenuItem->GetLinkedScripts() as $sLinkedScript)
-					{
-						$oPage->add_linked_script($sLinkedScript);
-					}
-				}
-			}
-		}
-	}
-	/**
-	 * Get target configuration file name (including full path)
-	 */
-	public static function GetConfigFilePath($sEnvironment = null)
-	{
-		if (is_null($sEnvironment))
-		{
-			$sEnvironment = self::GetCurrentEnvironment();
-		}
-		return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
-	}
-
-    /**
-     * @return string the absolute URL to the modules root path
-     */                   
-	static public function GetAbsoluteUrlModulesRoot()
-	{
-		$sUrl = self::GetAbsoluteUrlAppRoot().'env-'.self::GetCurrentEnvironment().'/';
-		return $sUrl;
-	}
-
-	/**
-	 * To be compatible with this mechanism, the called page must include approot with an absolute path OR not include
-	 * it at all (losing the direct access to the page) :
-	 *
-	 * ```php
-	 * if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-	 * require_once(__DIR__.'/../../approot.inc.php');
-	 * ```
-	 *
-	 * @param string $sModule
-	 * @param string $sPage
-	 * @param string[] $aArguments
-	 * @param string $sEnvironment
-	 *
-	 * @return string the URL to a page that will execute the requested module page, with query string values url encoded
-	 *
-	 * @see GetExecPageArguments can be used to submit using the GET method (see bug in N.1108)
-	 * @see GetAbsoluteUrlExecPage
-	 */
-	static public function GetAbsoluteUrlModulePage($sModule, $sPage, $aArguments = array(), $sEnvironment = null)
-	{
-		$aArgs = self::GetExecPageArguments($sModule, $sPage, $aArguments, $sEnvironment);
-		$sArgs = http_build_query($aArgs);
-
-		return self::GetAbsoluteUrlExecPage()."?".$sArgs;
-	}
-
-	/**
-	 * @param string $sModule
-	 * @param string $sPage
-	 * @param string[] $aArguments
-	 * @param string $sEnvironment
-	 *
-	 * @return string[] key/value pair for the exec page query string. <b>Warning</b> : values are not url encoded !
-	 * @throws \Exception if one of the argument has a reserved name
-	 */
-	static public function GetExecPageArguments($sModule, $sPage, $aArguments = array(), $sEnvironment = null)
-	{
-		$sEnvironment = is_null($sEnvironment) ? self::GetCurrentEnvironment() : $sEnvironment;
-		$aArgs = array();
-		$aArgs['exec_module'] = $sModule;
-		$aArgs['exec_page'] = $sPage;
-		$aArgs['exec_env'] = $sEnvironment;
-		foreach($aArguments as $sName => $sValue)
-		{
-			if (($sName == 'exec_module') || ($sName == 'exec_page') || ($sName == 'exec_env'))
-			{
-				throw new Exception("Module page: $sName is a reserved page argument name");
-			}
-			$aArgs[$sName] = $sValue;
-		}
-
-		return $aArgs;
-	}
-
-	/**
-	 * @return string
-	 */
-	static public function GetAbsoluteUrlExecPage()
-	{
-		return self::GetAbsoluteUrlAppRoot().'pages/exec.php';
-	}
-
-	/**
-	 * Returns a name unique amongst the given list
-	 * @param string $sProposed The default value
-	 * @param array  $aExisting An array of existing values (strings)	 	 
-	 */
-	static public function MakeUniqueName($sProposed, $aExisting)
-	{
-		if (in_array($sProposed, $aExisting))
-		{
-			$i = 1;
-			while (in_array($sProposed.$i, $aExisting) && ($i < 50))
-			{
-				$i++;
-			}
-			return $sProposed.$i;
-		}
-		else
-		{
-			return $sProposed;
-		}
-	}
-	
-	/**
-	 * Some characters cause troubles with jQuery when used inside DOM IDs, so let's replace them by the safe _ (underscore)
-	 * @param string $sId The ID to sanitize
-	 * @return string The sanitized ID
-	 */
-	static public function GetSafeId($sId)
-	{
-		return str_replace(array(':', '[', ']', '+', '-'), '_', $sId);
-	}
-	
-	/**
-	 * Helper to execute an HTTP POST request
-	 * Source: http://netevil.org/blog/2006/nov/http-post-from-php-without-curl
-	 *         originaly named after do_post_request
-	 * Does not require cUrl but requires openssl for performing https POSTs.
-	 * 
-	 * @param string $sUrl The URL to POST the data to
-	 * @param hash $aData The data to POST as an array('param_name' => value)
-	 * @param string $sOptionnalHeaders Additional HTTP headers as a string with newlines between headers
-	 * @param hash	$aResponseHeaders An array to be filled with reponse headers: WARNING: the actual content of the array depends on the library used: cURL or fopen, test with both !! See: http://fr.php.net/manual/en/function.curl-getinfo.php
-	 * @param hash $aCurlOptions An (optional) array of options to pass to curl_init. The format is 'option_code' => 'value'. These values have precedence over the default ones. Example: CURLOPT_SSLVERSION => CURL_SSLVERSION_SSLv3
-	 * @return string The result of the POST request
-	 * @throws Exception
-	 */ 
-	static public function DoPostRequest($sUrl, $aData, $sOptionnalHeaders = null, &$aResponseHeaders = null, $aCurlOptions = array())
-	{
-		// $sOptionnalHeaders is a string containing additional HTTP headers that you would like to send in your request.
-	
-		if (function_exists('curl_init'))
-		{
-			// If cURL is available, let's use it, since it provides a greater control over the various HTTP/SSL options
-			// For instance fopen does not allow to work around the bug: http://stackoverflow.com/questions/18191672/php-curl-ssl-routinesssl23-get-server-helloreason1112
-			// by setting the SSLVERSION to 3 as done below.
-			$aHeaders = explode("\n", $sOptionnalHeaders);
-			$aHTTPHeaders = array();
-			foreach($aHeaders as $sHeaderString)
-			{
-				if(preg_match('/^([^:]): (.+)$/', $sHeaderString, $aMatches))
-				{
-					$aHTTPHeaders[$aMatches[1]] = $aMatches[2];
-				}
-			}
-			// Default options, can be overloaded/extended with the 4th parameter of this method, see above $aCurlOptions
-			$aOptions = array(
-				CURLOPT_RETURNTRANSFER	=> true,     // return the content of the request
-				CURLOPT_HEADER			=> false,    // don't return the headers in the output
-				CURLOPT_FOLLOWLOCATION	=> true,     // follow redirects
-				CURLOPT_ENCODING		=> "",       // handle all encodings
-				CURLOPT_USERAGENT		=> "spider", // who am i
-				CURLOPT_AUTOREFERER		=> true,     // set referer on redirect
-				CURLOPT_CONNECTTIMEOUT	=> 120,      // timeout on connect
-				CURLOPT_TIMEOUT			=> 120,      // timeout on response
-				CURLOPT_MAXREDIRS		=> 10,       // stop after 10 redirects
-				CURLOPT_SSL_VERIFYPEER	=> false,    // Disabled SSL Cert checks
-				// SSLV3 (CURL_SSLVERSION_SSLv3 = 3) is now considered as obsolete/dangerous: http://disablessl3.com/#why
-				// but it used to be a MUST to prevent a strange SSL error: http://stackoverflow.com/questions/18191672/php-curl-ssl-routinesssl23-get-server-helloreason1112
-				// CURLOPT_SSLVERSION		=> 3,
-				CURLOPT_POST			=> count($aData),
-				CURLOPT_POSTFIELDS		=> http_build_query($aData),
-				CURLOPT_HTTPHEADER		=> $aHTTPHeaders,
-			);
-			
-			$aAllOptions = $aCurlOptions + $aOptions;
-			$ch = curl_init($sUrl);
-			curl_setopt_array($ch, $aAllOptions);
-			$response = curl_exec($ch);
-			$iErr = curl_errno($ch);
-			$sErrMsg = curl_error( $ch );
-			$aHeaders = curl_getinfo( $ch );
-			if ($iErr !== 0)
-			{
-				throw new Exception("Problem opening URL: $sUrl, $sErrMsg");
-			}
-			if (is_array($aResponseHeaders))
-			{
-				$aHeaders = curl_getinfo($ch);
-				foreach($aHeaders as $sCode => $sValue)
-				{
-					$sName = str_replace(' ' , '-', ucwords(str_replace('_', ' ', $sCode))); // Transform "content_type" into "Content-Type"
-					$aResponseHeaders[$sName] = $sValue;
-				}
-			}
-			curl_close( $ch );
-		}
-		else
-		{
-			// cURL is not available let's try with streams and fopen...
-			
-			$sData = http_build_query($aData);
-			$aParams = array('http' => array(
-									'method' => 'POST',
-									'content' => $sData,
-									'header'=> "Content-type: application/x-www-form-urlencoded\r\nContent-Length: ".strlen($sData)."\r\n",
-									));
-			if ($sOptionnalHeaders !== null)
-			{
-				$aParams['http']['header'] .= $sOptionnalHeaders;
-			}
-			$ctx = stream_context_create($aParams);
-		
-			$fp = @fopen($sUrl, 'rb', false, $ctx);
-			if (!$fp)
-			{
-				global $php_errormsg;
-				if (isset($php_errormsg))
-				{
-					throw new Exception("Wrong URL: $sUrl, $php_errormsg");
-				}
-				elseif ((strtolower(substr($sUrl, 0, 5)) == 'https') && !extension_loaded('openssl'))
-				{
-					throw new Exception("Cannot connect to $sUrl: missing module 'openssl'");
-				}
-				else
-				{
-					throw new Exception("Wrong URL: $sUrl");
-				}
-			}
-			$response = @stream_get_contents($fp);
-			if ($response === false)
-			{
-				throw new Exception("Problem reading data from $sUrl, $php_errormsg");
-			}
-			if (is_array($aResponseHeaders))
-			{
-				$aMeta = stream_get_meta_data($fp);
-				$aHeaders = $aMeta['wrapper_data'];
-				foreach($aHeaders as $sHeaderString)
-				{
-					if(preg_match('/^([^:]+): (.+)$/', $sHeaderString, $aMatches))
-					{
-						$aResponseHeaders[$aMatches[1]] = trim($aMatches[2]);
-					}
-				}
-			}
-		}
-		return $response;
-	}
-
-	/**
-	 * Get a standard list of character sets
-	 *	 
- 	 * @param array $aAdditionalEncodings Additional values
-	 * @return array of iconv code => english label, sorted by label
-	 */
-	public static function GetPossibleEncodings($aAdditionalEncodings = array())
-	{
-		// Encodings supported:
-		// ICONV_CODE => Display Name
-		// Each iconv installation supports different encodings
-		// Some reasonably common and useful encodings are listed here
-		$aPossibleEncodings = array(
-			'UTF-8' => 'Unicode (UTF-8)',
-			'ISO-8859-1' => 'Western (ISO-8859-1)',
-			'WINDOWS-1251' => 'Cyrilic (Windows 1251)',
-			'WINDOWS-1252' => 'Western (Windows 1252)',
-			'ISO-8859-15' => 'Western (ISO-8859-15)',
-		);
-		$aPossibleEncodings = array_merge($aPossibleEncodings, $aAdditionalEncodings);
-		asort($aPossibleEncodings);
-		return $aPossibleEncodings;
-	}
-	
-	/**
-	 * Convert a string containing some (valid) HTML markup to plain text
-	 * @param string $sHtml
-	 * @return string
-	 */
-	public static function HtmlToText($sHtml)
-	{
-		try
-		{
-			//return '<?xml encoding="UTF-8">'.$sHtml;
-			return \Html2Text\Html2Text::convert('<?xml encoding="UTF-8">'.$sHtml);
-		}
-		catch(Exception $e)
-		{
-			return $e->getMessage();
-		}
-	}
-	
-	/**
-	 * Convert (?) plain text to some HTML markup by replacing newlines by <br/> tags
-	 * and escaping HTML entities
-	 * @param string $sText
-	 * @return string
-	 */
-	public static function TextToHtml($sText)
-	{
-		$sText = str_replace("\r\n", "\n", $sText);
-		$sText = str_replace("\r", "\n", $sText);
-		return str_replace("\n", '<br/>', htmlentities($sText, ENT_QUOTES, 'UTF-8'));
-	}
-	
-	/**
-	 * Eventually compiles the SASS (.scss) file into the CSS (.css) file
-	 *
-	 * @param string $sSassRelPath Relative path to the SCSS file (must have the extension .scss)
-	 * @param array $aImportPaths Array of absolute paths to load imports from
-	 * @return string Relative path to the CSS file (<name>.css)
-	 */
-	static public function GetCSSFromSASS($sSassRelPath, $aImportPaths = null)
-	{
-		// Avoiding compilation if file is already a css file.
-		if (preg_match('/\.css$/', $sSassRelPath))
-		{
-			return $sSassRelPath;
-		}
-
-		// Setting import paths
-		if ($aImportPaths === null)
-		{
-			$aImportPaths = array();
-		}
-		$aImportPaths[] = APPROOT . '/css';
-
-		$sSassPath = APPROOT.$sSassRelPath;
-		$sCssRelPath = preg_replace('/\.scss$/', '.css', $sSassRelPath);
-		$sCssPath = APPROOT.$sCssRelPath;
-		clearstatcache();
-		if (!file_exists($sCssPath) || (is_writable($sCssPath) && (filemtime($sCssPath) < filemtime($sSassPath))))
-		{
-			require_once(APPROOT.'lib/scssphp/scss.inc.php');
-			$oScss = new Compiler();
-			$oScss->setImportPaths($aImportPaths);
-			$oScss->setFormatter('Leafo\\ScssPhp\\Formatter\\Expanded');
-			// Temporary disabling max exec time while compiling
-			$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
-			set_time_limit(0);
-			$sCss = $oScss->compile(file_get_contents($sSassPath));
-			set_time_limit($iCurrentMaxExecTime);
-			file_put_contents($sCssPath, $sCss);
-		}
-		return $sCssRelPath;
-	}
-	
-	static public function GetImageSize($sImageData)
-	{
-		if (function_exists('getimagesizefromstring')) // PHP 5.4.0 or higher
-		{
-			$aRet = @getimagesizefromstring($sImageData);
-		}
-		else if(ini_get('allow_url_fopen'))
-		{
-			// work around to avoid creating a tmp file
-			$sUri = 'data://application/octet-stream;base64,'.base64_encode($sImageData);
-			$aRet = @getimagesize($sUri);
-		}
-		else
-		{
-			// Damned, need to create a tmp file
-			$sTempFile = tempnam(SetupUtils::GetTmpDir(), 'img-');
-			@file_put_contents($sTempFile, $sImageData);
-			$aRet = @getimagesize($sTempFile);
-			@unlink($sTempFile);
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Resize an image attachment so that it fits in the given dimensions
-	 * @param ormDocument $oImage The original image stored as an ormDocument
-	 * @param int $iWidth Image's original width
-	 * @param int $iHeight Image's original height
-	 * @param int $iMaxImageWidth Maximum width for the resized image
-	 * @param int $iMaxImageHeight Maximum height for the resized image
-	 * @return ormDocument The resampled image
-	 */
-	public static function ResizeImageToFit(ormDocument $oImage, $iWidth, $iHeight, $iMaxImageWidth, $iMaxImageHeight)
-	{
-		// If image size smaller than maximums, we do nothing
-		if (($iWidth <= $iMaxImageWidth) && ($iHeight <= $iMaxImageHeight))
-		{
-			return $oImage;
-		}
-
-
-		// If gd extension is not loaded, we put a warning in the log and return the image as is
-		if (extension_loaded('gd') === false)
-		{
-			IssueLog::Warning('Image could not be resized as the "gd" extension does not seem to be loaded. It will remain as ' . $iWidth . 'x' . $iHeight . ' instead of ' . $iMaxImageWidth . 'x' . $iMaxImageHeight);
-			return $oImage;
-		}
-
-
-		switch($oImage->GetMimeType())
-		{
-			case 'image/gif':
-			case 'image/jpeg':
-			case 'image/png':
-			$img = @imagecreatefromstring($oImage->GetData());
-			break;
-			
-			default:
-			// Unsupported image type, return the image as-is
-			//throw new Exception("Unsupported image type: '".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
-			return $oImage;
-		}
-		if ($img === false)
-		{
-			//throw new Exception("Warning: corrupted image: '".$oImage->GetFileName()." / ".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
-			return $oImage;
-		}
-		else
-		{
-			// Let's scale the image, preserving the transparency for GIFs and PNGs
-			
-			$fScale = min($iMaxImageWidth / $iWidth, $iMaxImageHeight / $iHeight);
-
-			$iNewWidth = $iWidth * $fScale;
-			$iNewHeight = $iHeight * $fScale;
-			
-			$new = imagecreatetruecolor($iNewWidth, $iNewHeight);
-			
-			// Preserve transparency
-			if(($oImage->GetMimeType() == "image/gif") || ($oImage->GetMimeType() == "image/png"))
-			{
-				imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
-				imagealphablending($new, false);
-				imagesavealpha($new, true);
-			}
-			
-			imagecopyresampled($new, $img, 0, 0, 0, 0, $iNewWidth, $iNewHeight, $iWidth, $iHeight);
-			
-			ob_start();
-			switch ($oImage->GetMimeType())
-			{
-				case 'image/gif':
-				imagegif($new); // send image to output buffer
-				break;
-				
-				case 'image/jpeg':
-				imagejpeg($new, null, 80); // null = send image to output buffer, 80 = good quality
-				break;
-				 
-				case 'image/png':
-				imagepng($new, null, 5); // null = send image to output buffer, 5 = medium compression
-				break;
-			}
-			$oResampledImage = new ormDocument(ob_get_contents(), $oImage->GetMimeType(), $oImage->GetFileName());
-			@ob_end_clean();
-			
-			imagedestroy($img);
-			imagedestroy($new);
-							
-			return $oResampledImage;
-		}
-				
-	}
-	
-	/**
-	 * Create a 128 bit UUID in the format: {########-####-####-####-############}
-	 * 
-	 * Note: this method can be run from the command line as well as from the web server.
-	 * Note2: this method is not cryptographically secure! If you need a cryptographically secure value
-	 * consider using open_ssl or PHP 7 methods.
-	 * @param string $sPrefix
-	 * @return string
-	 */
-	static public function CreateUUID($sPrefix = '')
-	{
-		$uid = uniqid("", true);
-		$data = $sPrefix;
-		$data .= __FILE__;
-		$data .= mt_rand();
-		$hash = strtoupper(hash('ripemd128', $uid . md5($data)));
-		$sUUID = '{' .
-				substr($hash,  0,  8) .
-				'-' .
-				substr($hash,  8,  4) .
-				'-' .
-				substr($hash, 12,  4) .
-				'-' .
-				substr($hash, 16,  4) .
-				'-' .
-				substr($hash, 20, 12) .
-				'}';
-		return $sUUID;
-	}
-
-	/**
-	 * Returns the name of the module containing the file where the call to this function is made
-	 * or an empty string if no such module is found (or not called within a module file)
-	 * @param number $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
-	 * @return string
-	 */
-	static public function GetCurrentModuleName($iCallDepth = 0)
-	{
-		$sCurrentModuleName = '';
-		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
-		
-		foreach(GetModulesInfo() as $sModuleName => $aInfo)
-		{
-			if ($aInfo['root_dir'] !== '')
-			{
-				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
-				
-				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
-				{
-					$sCurrentModuleName = $sModuleName;
-					break;
-				}
-			}
-		}
-		return $sCurrentModuleName;
-	}
-	
-	/**
-	 * Returns the relative (to APPROOT) path of the root directory of the module containing the file where the call to this function is made
-	 * or an empty string if no such module is found (or not called within a module file)
-	 * @param number $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
-	 * @return string
-	 */
-	static public function GetCurrentModuleDir($iCallDepth)
-	{
-		$sCurrentModuleDir = '';
-		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
-	
-		foreach(GetModulesInfo() as $sModuleName => $aInfo)
-		{
-			if ($aInfo['root_dir'] !== '')
-			{
-				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
-	
-				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
-				{
-					$sCurrentModuleDir = basename($sRootDir);
-					break;
-				}
-			}
-		}
-		return $sCurrentModuleDir;
-	}
-	
-	/**
-	 * Returns the base URL for all files in the current module from which this method is called
-	 * or an empty string if no such module is found (or not called within a module file)
-	 * @return string
-	 */
-	static public function GetCurrentModuleUrl()
-	{
-		$sDir = static::GetCurrentModuleDir(1);
-		if ( $sDir !== '')
-		{
-			return static::GetAbsoluteUrlModulesRoot().'/'.$sDir;
-		}
-		return '';
-	}
-	
-	/**
-	 * Get the value of a given setting for the current module
-	 * @param string $sProperty The name of the property to retrieve
-	 * @param mixed $defaultvalue
-	 * @return mixed
-	 */
-	static public function GetCurrentModuleSetting($sProperty, $defaultvalue = null)
-	{
-		$sModuleName = static::GetCurrentModuleName(1);
-		return MetaModel::GetModuleSetting($sModuleName, $sProperty, $defaultvalue);
-	}
-	
-	/**
-	 * Get the compiled version of a given module, as it was seen by the compiler
-	 * @param string $sModuleName
-	 * @return string|NULL
-	 */
-	static public function GetCompiledModuleVersion($sModuleName)
-	{
-		$aModulesInfo = GetModulesInfo();
-		if (array_key_exists($sModuleName, $aModulesInfo))
-		{
-			return $aModulesInfo[$sModuleName]['version'];
-		}
-		return null;
-	}
-	
-	/**
-	 * Check if the given path/url is an http(s) URL
-	 * @param string $sPath
-	 * @return boolean
-	 */
-	public static function IsURL($sPath)
-	{
-		$bRet = false;
-		if ((substr($sPath, 0, 7) == 'http://') || (substr($sPath, 0, 8) == 'https://') || (substr($sPath, 0, 8) == 'ftp://'))
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-	
-	/**
-	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
-	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
-	 * @param string $sPath
-	 * @return false|ormDocument
-	 * @throws Exception
-	 */
-	public static function IsSelfURL($sPath)
-	{
-		$result = false;
-		$sPageUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php';
-		if (substr($sPath, 0, strlen($sPageUrl)) == $sPageUrl)
-		{
-			// If the URL is an URL pointing to this instance of iTop, then
-			// extract the "query" part of the URL and analyze it
-			$sQuery = parse_url($sPath, PHP_URL_QUERY);
-			if ($sQuery !== null)
-			{
-				$aParams = array();
-				foreach(explode('&', $sQuery) as $sChunk)
-				{
-					$aParts = explode('=', $sChunk);
-					if (count($aParts) != 2) continue;
-					$aParams[$aParts[0]] = urldecode($aParts[1]);
-				}
-				$result = array_key_exists('operation', $aParams) && array_key_exists('class', $aParams) && array_key_exists('id', $aParams) && array_key_exists('field', $aParams) && ($aParams['operation'] == 'download_document');
-				if ($result)
-				{
-					// This is a 'download_document' operation, let's retrieve the document directly from the database
-					$sClass = $aParams['class'];
-					$iKey = $aParams['id'];
-					$sAttCode = $aParams['field'];
-
-					$oObj = MetaModel::GetObject($sClass, $iKey, false /* must exist */); // Users rights apply here !!
-					if ($oObj)
-					{
-						/**
-						 * @var ormDocument $result
-						 */
-						$result = clone $oObj->Get($sAttCode);
-						return $result;
-					}
-				}
-			}
-			throw new Exception('Invalid URL. This iTop URL is not pointing to a valid Document/Image.');
-		}
-		return $result;
-	}
-	
-	/**
-	 * Read the content of a file (and retrieve its MIME type) from either:
-	 * - an URL pointing to a blob (image/document) on the current iTop server
-	 * - an http(s) URL
-	 * - the local file system (but only if you are an administrator)
-	 * @param string $sPath
-	 * @return ormDocument|null
-	 * @throws Exception
-	 */
-	public static function FileGetContentsAndMIMEType($sPath)
-	{
-		$oUploadedDoc = null;
-		$aKnownExtensions = array(
-				'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-				'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-				'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-				'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-				'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-				'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-				'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-				'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-				'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
-				'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-				'jpg' => 'image/jpeg',
-				'jpeg' => 'image/jpeg',
-				'gif' => 'image/gif',
-				'png' => 'image/png',
-				'pdf' => 'application/pdf',
-				'doc' => 'application/msword',
-				'dot' => 'application/msword',
-				'xls' => 'application/vnd.ms-excel',
-				'ppt' => 'application/vnd.ms-powerpoint',
-				'vsd' => 'application/x-visio',
-				'vdx' => 'application/visio.drawing',
-				'odt' => 'application/vnd.oasis.opendocument.text',
-				'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-				'odp' => 'application/vnd.oasis.opendocument.presentation',
-				'zip' => 'application/zip',
-				'txt' => 'text/plain',
-				'htm' => 'text/html',
-				'html' => 'text/html',
-				'exe' => 'application/octet-stream'
-		);
-	
-		$sData = null;
-		$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
-		$sFileName = 'uploaded-file'; // Default name for downloaded-files
-		$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
-
-		if(empty($sPath))
-		{
-			// Empty path (NULL or '') means that there is no input, making an empty document.
-			$oUploadedDoc = new ormDocument('', '', '');
-		}
-		elseif (static::IsURL($sPath))
-		{
-			if ($oUploadedDoc = static::IsSelfURL($sPath))
-			{
-				// Nothing more to do, we've got it !!
-			}
-			else
-			{
-				// Remote file, let's use the HTTP headers to find the MIME Type
-				$sData = @file_get_contents($sPath);
-				if ($sData === false)
-				{
-					throw new Exception("Failed to load the file from the URL '$sPath'.");
-				}
-				else
-				{
-					if (isset($http_response_header))
-					{
-						$aHeaders = static::ParseHeaders($http_response_header);
-						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
-						// Compute the file extension from the MIME Type
-						foreach($aKnownExtensions as $sExtValue => $sMime)
-						{
-							if ($sMime === $sMimeType)
-							{
-								$sExtension = '.'.$sExtValue;
-								break;
-							}
-						}
-					}
-					$sFileName .= $sExtension;
-				}
-				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
-			}
-		}
-		else if (UserRights::IsAdministrator())
-		{
-			// Only administrators are allowed to read local files
-			$sData = @file_get_contents($sPath);
-			if ($sData === false)
-			{
-				throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
-			}
-			$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
-			$sFileName = basename($sPath);
-				
-			if (array_key_exists($sExtension, $aKnownExtensions))
-			{
-				$sMimeType = $aKnownExtensions[$sExtension];
-			}
-			else if (extension_loaded('fileinfo'))
-			{
-				$finfo = new finfo(FILEINFO_MIME);
-				$sMimeType = $finfo->file($sPath);
-			}
-			$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
-		}
-		return $oUploadedDoc;
-	}
-	
-	protected static function ParseHeaders($aHeaders)
-	{
-		$aCleanHeaders = array();
-		foreach( $aHeaders as $sKey => $sValue )
-		{
-			$aTokens = explode(':', $sValue, 2);
-			if(isset($aTokens[1]))
-			{
-				$aCleanHeaders[trim($aTokens[0])] = trim($aTokens[1]);
-			}
-			else
-			{
-				// The header is not in the form Header-Code: Value
-				$aCleanHeaders[] = $sValue; // Store the value as-is
-				$aMatches = array();
-				// Check if it's not the HTTP response code
-				if( preg_match("|HTTP/[0-9\.]+\s+([0-9]+)|", $sValue, $aMatches) )
-				{
-					$aCleanHeaders['reponse_code'] = intval($aMatches[1]);
-				}
-			}
-		}
-		return $aCleanHeaders;
-	}
-	
-	/**
-	 * Return a string based on compilation time or (if not available because the datamodel has not been loaded)
-	 * the version of iTop. This string is useful to prevent browser side caching of content that may vary at each
-	 * (re)installation of iTop (especially during development). 
-	 * @return string
-	 */
-	public static function GetCacheBusterTimestamp()
-	{
-		if(!defined('COMPILATION_TIMESTAMP'))
-		{
-			return ITOP_VERSION;
-		}
-		return COMPILATION_TIMESTAMP;
-	}
-
-	/**
-	 * Check if the given class if configured as a high cardinality class.
-	 *
-	 * @param $sClass
-	 *
-	 * @return bool
-	 */
-	public static function IsHighCardinality($sClass)
-	{
-		if (utils::GetConfig()->Get('search_manual_submit'))
-		{
-			return true;
-		}
-		$aHugeClasses = MetaModel::GetConfig()->Get('high_cardinality_classes');
-		return in_array($sClass, $aHugeClasses);
-	}
-}
+<?php
+use Html2Text\Html2Text;
+use Leafo\ScssPhp\Compiler;
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Static class utils
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/core/config.class.inc.php');
+require_once(APPROOT.'/application/transaction.class.inc.php');
+require_once(APPROOT.'application/Html2Text.php');
+require_once(APPROOT.'application/Html2TextException.php');
+
+define('ITOP_CONFIG_FILE', 'config-itop.php');
+define('ITOP_DEFAULT_CONFIG_FILE', APPCONF.ITOP_DEFAULT_ENV.'/'.ITOP_CONFIG_FILE);
+
+define('SERVER_NAME_PLACEHOLDER', '$SERVER_NAME$');
+
+define('SERVER_MAX_URL_LENGTH', 2048);
+
+class FileUploadException extends Exception
+{
+}
+
+
+/**
+ * Helper functions to interact with forms: read parameters, upload files...
+ * @package     iTop
+ */
+class utils
+{
+	private static $oConfig = null;
+	private static $m_bCASClient = false;
+
+	// Parameters loaded from a file, parameters of the page/command line still have precedence
+	private static $m_aParamsFromFile = null;
+	private static $m_aParamSource = array();
+
+	protected static function LoadParamFile($sParamFile)
+	{
+		if (!file_exists($sParamFile))
+		{
+			throw new Exception("Could not find the parameter file: '$sParamFile'");
+		}
+		if (!is_readable($sParamFile))
+		{
+			throw new Exception("Could not load parameter file: '$sParamFile'");
+		}
+		$sParams = file_get_contents($sParamFile);
+
+		if (is_null(self::$m_aParamsFromFile))
+		{
+			self::$m_aParamsFromFile = array();
+		}
+
+		$aParamLines = explode("\n", $sParams);
+		foreach ($aParamLines as $sLine)
+		{
+			$sLine = trim($sLine);
+
+			// Ignore the line after a '#'
+			if (($iCommentPos = strpos($sLine, '#')) !== false)
+			{
+				$sLine = substr($sLine, 0, $iCommentPos);
+				$sLine = trim($sLine);
+			}
+
+			// Note: the line is supposed to be already trimmed
+			if (preg_match('/^(\S*)\s*=(.*)$/', $sLine, $aMatches))
+			{
+				$sParam = $aMatches[1];
+				$value = trim($aMatches[2]);
+				self::$m_aParamsFromFile[$sParam] = $value;
+				self::$m_aParamSource[$sParam] = $sParamFile;
+			}
+		}
+	}
+
+	public static function UseParamFile($sParamFileArgName = 'param_file', $bAllowCLI = true)
+	{
+		$sFileSpec = self::ReadParam($sParamFileArgName, '', $bAllowCLI, 'raw_data');
+		foreach(explode(',', $sFileSpec) as $sFile)
+		{
+			$sFile = trim($sFile);
+			if (!empty($sFile))
+			{
+				self::LoadParamFile($sFile);
+			}
+		}
+	}
+
+	/**
+	 * Return the source file from which the parameter has been found,
+	 * usefull when it comes to pass user credential to a process executed
+	 * in the background	 
+	 * @param $sName Parameter name
+	 * @return The file name if any, or null
+	 */
+	public static function GetParamSourceFile($sName)
+	{
+		if (array_key_exists($sName, self::$m_aParamSource))
+		{
+			return self::$m_aParamSource[$sName];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public static function IsModeCLI()
+	{
+		$sSAPIName = php_sapi_name();
+		$sCleanName = strtolower(trim($sSAPIName));
+		if ($sCleanName == 'cli')
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	protected static $bPageMode = null;
+	/**
+	 * @var boolean[]
+	 */
+	protected static $aModes = array();
+
+	public static function InitArchiveMode()
+	{
+		if (isset($_SESSION['archive_mode']))
+		{
+			$iDefault = $_SESSION['archive_mode'];
+		}
+		else
+		{
+			$iDefault = 0;
+		}
+		// Read and record the value for switching the archive mode
+		$iCurrent = self::ReadParam('with-archive', $iDefault);
+		if (isset($_SESSION))
+		{
+			$_SESSION['archive_mode'] = $iCurrent;
+		}
+		// Read and use the value for the current page (web services)
+		$iCurrent = self::ReadParam('with_archive', $iCurrent, true);
+		self::$bPageMode = ($iCurrent == 1);
+	}
+
+	/**
+	 * @param boolean $bMode if true then activate archive mode (archived objects are visible), otherwise archived objects are
+	 *     hidden (archive = "soft deletion")
+	 */
+	public static function PushArchiveMode($bMode)
+	{
+		array_push(self::$aModes, $bMode);
+	}
+
+	public static function PopArchiveMode()
+	{
+		array_pop(self::$aModes);
+	}
+
+	/**
+	 * @return boolean true if archive mode is enabled
+	 */
+	public static function IsArchiveMode()
+	{
+		if (count(self::$aModes) > 0)
+		{
+			$bRet = end(self::$aModes);
+		}
+		else
+		{
+			if (self::$bPageMode === null)
+			{
+				self::InitArchiveMode();
+			}
+			$bRet = self::$bPageMode;
+		}
+		return $bRet;
+	}
+
+	/**
+	 * Helper to be called by the GUI and define if the user will see obsolete data (otherwise, the user will have to dig further)
+	 * @return bool
+	 */
+	public static function ShowObsoleteData()
+	{
+		$bDefault = MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'); // default is false
+		$bShow = appUserPreferences::GetPref('show_obsolete_data', $bDefault);
+		if (static::IsArchiveMode())
+		{
+			$bShow = true;
+		}
+		return $bShow;
+	}
+
+	public static function ReadParam($sName, $defaultValue = "", $bAllowCLI = false, $sSanitizationFilter = 'parameter')
+	{
+		global $argv;
+		$retValue = $defaultValue;
+
+		if (!is_null(self::$m_aParamsFromFile))
+		{
+			if (isset(self::$m_aParamsFromFile[$sName]))
+			{
+				$retValue = self::$m_aParamsFromFile[$sName];
+			}
+		}
+
+		if (isset($_REQUEST[$sName]))
+		{
+			$retValue = $_REQUEST[$sName];
+		}
+		elseif ($bAllowCLI && isset($argv))
+		{
+			foreach($argv as $iArg => $sArg)
+			{
+				if (preg_match('/^--'.$sName.'=(.*)$/', $sArg, $aMatches))
+				{
+					$retValue = $aMatches[1];
+				}
+			}
+		}
+		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
+	}
+	
+	public static function ReadPostedParam($sName, $defaultValue = '', $sSanitizationFilter = 'parameter')
+	{
+		$retValue = isset($_POST[$sName]) ? $_POST[$sName] : $defaultValue;
+		return self::Sanitize($retValue, $defaultValue, $sSanitizationFilter);
+	}
+	
+	public static function Sanitize($value, $defaultValue, $sSanitizationFilter)
+	{
+		if ($value === $defaultValue)
+		{
+			// Preserve the real default value (can be used to detect missing mandatory parameters)
+			$retValue = $value;
+		}
+		else
+		{
+			$retValue = self::Sanitize_Internal($value, $sSanitizationFilter);
+			if ($retValue === false)
+			{
+				$retValue = $defaultValue;
+			}
+		}
+		return $retValue;		
+	}
+	
+	protected static function Sanitize_Internal($value, $sSanitizationFilter)
+	{
+		switch($sSanitizationFilter)
+		{
+			case 'integer':
+			$retValue = filter_var($value, FILTER_SANITIZE_NUMBER_INT);
+			break;
+			
+			case 'class':
+			$retValue = $value;
+			if (!MetaModel::IsValidClass($value))
+			{
+				$retValue = false;
+			}
+			break;
+
+			case 'string':
+			$retValue = filter_var($value, FILTER_SANITIZE_SPECIAL_CHARS);
+			break;
+			
+			case 'context_param':
+			case 'parameter':
+			case 'field_name':
+			if (is_array($value))
+			{
+				$retValue = array();
+				foreach($value as $key => $val)
+				{
+					$retValue[$key] = self::Sanitize_Internal($val, $sSanitizationFilter); // recursively check arrays
+					if ($retValue[$key] === false)
+					{
+						$retValue = false;
+						break;
+					}
+				}
+			}
+			else
+			{
+				switch($sSanitizationFilter)
+				{
+					case 'parameter':
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^([ A-Za-z0-9_=-]|%3D|%2B|%2F)*$/'))); // the '=', '%3D, '%2B', '%2F' characters are used in serialized filters (starting 2.5, only the url encoded versions are presents, but the "=" is kept for BC)
+					break;
+					
+					case 'field_name':
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[A-Za-z0-9_]+(->[A-Za-z0-9_]+)*$/'))); // att_code or att_code->name or AttCode->Name or AttCode->Key2->Name
+					break;
+					
+					case 'context_param':
+					$retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=%:+-]*$/')));
+					break;
+						
+				}
+			}
+			break;
+						
+			default:
+			case 'raw_data':
+			$retValue = $value;
+			// Do nothing
+		}
+		return $retValue;		
+	}
+	
+	/**
+	 * Reads an uploaded file and turns it into an ormDocument object - Triggers an exception in case of error
+	 * @param string $sName Name of the input used from uploading the file	 
+	 * @param string $sIndex If Name is an array of posted files, then the index must be used to point out the file	 
+	 * @return ormDocument The uploaded file (can be 'empty' if nothing was uploaded)
+	 */	 	 
+	public static function  ReadPostedDocument($sName, $sIndex = null)
+	{
+		$oDocument = new ormDocument(); // an empty document
+		if(isset($_FILES[$sName]))
+		{
+			$aFileInfo = $_FILES[$sName];
+
+			$sError = is_null($sIndex) ? $aFileInfo['error'] : $aFileInfo['error'][$sIndex];
+			switch($sError)
+			{
+				case UPLOAD_ERR_OK:
+				$sTmpName = is_null($sIndex) ? $aFileInfo['tmp_name'] : $aFileInfo['tmp_name'][$sIndex];
+				$sMimeType = is_null($sIndex) ? $aFileInfo['type'] : $aFileInfo['type'][$sIndex];
+				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
+
+				$doc_content = file_get_contents($sTmpName);
+				if (function_exists('finfo_file'))
+				{
+					// as of PHP 5.3 the fileinfo extension is bundled within PHP
+					// in which case we don't trust the mime type provided by the browser
+					$rInfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
+					if ($rInfo !== false)
+					{
+					   $sType = @finfo_file($rInfo, $sTmpName);
+					   if ( ($sType !== false)
+					        && is_string($sType)
+					        && (strlen($sType)>0))
+					   {
+					        $sMimeType = $sType;
+					   }
+					}
+					@finfo_close($rInfo);
+				}
+				$oDocument = new ormDocument($doc_content, $sMimeType, $sName);
+				break;
+				
+				case UPLOAD_ERR_NO_FILE:
+				// no file to load, it's a normal case, just return an empty document
+				break;
+				
+				case UPLOAD_ERR_FORM_SIZE:
+				case UPLOAD_ERR_INI_SIZE:
+				throw new FileUploadException(Dict::Format('UI:Error:UploadedFileTooBig', ini_get('upload_max_filesize')));
+				break;
+
+				case UPLOAD_ERR_PARTIAL:
+				throw new FileUploadException(Dict::S('UI:Error:UploadedFileTruncated.'));
+				break;
+				
+				case UPLOAD_ERR_NO_TMP_DIR:
+				throw new FileUploadException(Dict::S('UI:Error:NoTmpDir'));
+				break;
+
+				case UPLOAD_ERR_CANT_WRITE:
+				throw new FileUploadException(Dict::Format('UI:Error:CannotWriteToTmp_Dir', ini_get('upload_tmp_dir')));
+				break;
+
+				case UPLOAD_ERR_EXTENSION:
+				$sName = is_null($sIndex) ? $aFileInfo['name'] : $aFileInfo['name'][$sIndex];
+				throw new FileUploadException(Dict::Format('UI:Error:UploadStoppedByExtension_FileName', $sName));
+				break;
+				
+				default:
+				throw new FileUploadException(Dict::Format('UI:Error:UploadFailedUnknownCause_Code', $sError));
+				break;
+
+			}
+		}
+		return $oDocument;
+	}
+	
+	/**
+	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 *
+	 * @param $oFullSetFilter DBSearch The criteria defining the whole sets of objects being selected
+	 *
+	 * @return Array An array of object IDs corresponding to the objects selected in the set
+	 */	
+	public static function ReadMultipleSelection($oFullSetFilter)
+	{
+		$aSelectedObj = utils::ReadParam('selectObject', array());
+		$sSelectionMode = utils::ReadParam('selectionMode', '');
+		if ($sSelectionMode != '')
+		{
+			// Paginated selection
+			$aExceptions = utils::ReadParam('storedSelection', array());
+			if ($sSelectionMode == 'positive')
+			{
+				// Only the explicitely listed items are selected
+				$aSelectedObj = $aExceptions;
+			}
+			else
+			{
+				// All items of the set are selected, except the one explicitely listed
+				$aSelectedObj = array();
+				$oFullSet = new DBObjectSet($oFullSetFilter);
+				$sClassAlias = $oFullSetFilter->GetClassAlias();
+				$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
+				while($oObj = $oFullSet->Fetch())
+				{
+					if (!in_array($oObj->GetKey(), $aExceptions))
+					{
+						$aSelectedObj[] = $oObj->GetKey();
+					}
+				}
+			}
+		}
+		return $aSelectedObj;
+	}
+
+	/**
+	 * Interprets the results posted by a normal or paginated list (in multiple selection mode)
+	 *
+	 * @param DBSearch $oFullSetFilter The criteria defining the whole sets of objects being selected
+	 *
+	 * @return Array An array of object IDs:friendlyname corresponding to the objects selected in the set
+	 * @throws \CoreException
+	 */
+	public static function ReadMultipleSelectionWithFriendlyname($oFullSetFilter)
+	{
+		$sSelectionMode = utils::ReadParam('selectionMode', '');
+
+		if ($sSelectionMode != 'positive' && $sSelectionMode != 'negative')
+		{
+			throw new CoreException('selectionMode must be either positive or negative');
+		}
+
+		// Paginated selection
+		$aSelectedIds = utils::ReadParam('storedSelection', array());
+		if (count($aSelectedIds) > 0 )
+		{
+			if ($sSelectionMode == 'positive')
+			{
+				// Only the explicitly listed items are selected
+				$oFullSetFilter->AddCondition('id', $aSelectedIds, 'IN');
+			}
+			else
+			{
+				// All items of the set are selected, except the one explicitly listed
+				$oFullSetFilter->AddCondition('id', $aSelectedIds, 'NOTIN');
+			}
+		}
+
+		$aSelectedObj = array();
+		$oFullSet = new DBObjectSet($oFullSetFilter);
+		$sClassAlias = $oFullSetFilter->GetClassAlias();
+		$oFullSet->OptimizeColumnLoad(array($sClassAlias => array('friendlyname'))); // We really need only the IDs but it does not work since id is not a real field
+		while ($oObj = $oFullSet->Fetch())
+		{
+			$aSelectedObj[$oObj->GetKey()] = $oObj->Get('friendlyname');
+		}
+
+		return $aSelectedObj;
+	}
+	
+	public static function GetNewTransactionId()
+	{
+		return privUITransaction::GetNewTransactionId();
+	}
+	
+	public static function IsTransactionValid($sId, $bRemoveTransaction = true)
+	{
+		return privUITransaction::IsTransactionValid($sId, $bRemoveTransaction);
+	}
+	
+	public static function RemoveTransaction($sId)
+	{
+		return privUITransaction::RemoveTransaction($sId);
+	}
+
+	/**
+	 * Returns a unique tmp id for the current upload based on the transaction system (db).
+	 *
+	 * Build as session_id() . '_' . static::GetNewTransactionId()
+	 *
+	 * @return string
+	 */
+	public static function GetUploadTempId($sTransactionId = null)
+	{
+		if ($sTransactionId === null)
+		{
+			$sTransactionId = static::GetNewTransactionId();
+		}
+		return session_id() . '_' . $sTransactionId;
+	}
+
+	public static function ReadFromFile($sFileName)
+	{
+		if (!file_exists($sFileName)) return false;
+		return file_get_contents($sFileName);
+	}
+
+	/**
+	 * Helper function to convert a value expressed in a 'user friendly format'
+	 * as in php.ini, e.g. 256k, 2M, 1G etc. Into a number of bytes
+	 * @param mixed $value The value as read from php.ini
+	 * @return number
+	 */	 	  
+	public static function ConvertToBytes( $value )
+	{
+		$iReturn = $value;
+	    if ( !is_numeric( $value ) )
+		{
+	        $iLength = strlen( $value );
+	        $iReturn = substr( $value, 0, $iLength - 1 );
+	        $sUnit = strtoupper( substr( $value, $iLength - 1 ) );
+	        switch ( $sUnit )
+			{
+	            case 'G':
+	                $iReturn *= 1024;
+	            case 'M':
+	                $iReturn *= 1024;
+	            case 'K':
+	                $iReturn *= 1024;
+	        }
+	    }
+        return $iReturn;
+    }
+
+	/**
+	 * Format a value into a more friendly format (KB, MB, GB, TB) instead a juste a Bytes amount.
+	 *
+	 * @param type $value
+	 * @return string
+	 */
+	public static function BytesToFriendlyFormat($value)
+	{
+		$sReturn = '';
+		// Kilobytes
+		if ($value >= 1024)
+		{
+			$sReturn = 'K';
+			$value = $value / 1024;
+		}
+		// Megabytes
+		if ($value >= 1024)
+		{
+			$sReturn = 'M';
+			$value = $value / 1024;
+		}
+		// Gigabytes
+		if ($value >= 1024)
+		{
+			$sReturn = 'G';
+			$value = $value / 1024;
+		}
+		// Terabytes
+		if ($value >= 1024)
+		{
+			$sReturn = 'T';
+			$value = $value / 1024;
+		}
+
+		$value = round($value, 1);
+
+		return $value . '' . $sReturn . 'B';
+	}
+
+	/**
+	 * Helper function to convert a string to a date, given a format specification. It replaces strtotime which does not allow for specifying a date in a french format (for instance)
+	 * Example: StringToTime('01/05/11 12:03:45', '%d/%m/%y %H:%i:%s')
+	 * @param string $sDate
+	 * @param string $sFormat
+	 * @return timestamp or false if the input format is not correct
+	 */	 	  
+	public static function StringToTime($sDate, $sFormat)
+	{
+	   // Source: http://php.net/manual/fr/function.strftime.php
+		// (alternative: http://www.php.net/manual/fr/datetime.formats.date.php)
+		static $aDateTokens = null;
+		static $aDateRegexps = null;
+		if (is_null($aDateTokens))
+		{
+		   $aSpec = array(
+				'%d' =>'(?<day>[0-9]{2})',
+				'%m' => '(?<month>[0-9]{2})',
+				'%y' => '(?<year>[0-9]{2})',
+				'%Y' => '(?<year>[0-9]{4})',
+				'%H' => '(?<hour>[0-2][0-9])',
+				'%i' => '(?<minute>[0-5][0-9])',
+				'%s' => '(?<second>[0-5][0-9])',
+				);
+			$aDateTokens = array_keys($aSpec);
+			$aDateRegexps = array_values($aSpec);
+		}
+	   
+	   $sDateRegexp = str_replace($aDateTokens, $aDateRegexps, $sFormat);
+	   
+	   if (preg_match('!^(?<head>)'.$sDateRegexp.'(?<tail>)$!', $sDate, $aMatches))
+	   {
+			$sYear = isset($aMatches['year']) ? $aMatches['year'] : 0;
+			$sMonth = isset($aMatches['month']) ? $aMatches['month'] : 1;
+			$sDay = isset($aMatches['day']) ? $aMatches['day'] : 1;
+			$sHour = isset($aMatches['hour']) ? $aMatches['hour'] : 0;
+			$sMinute = isset($aMatches['minute']) ? $aMatches['minute'] : 0;
+			$sSecond = isset($aMatches['second']) ? $aMatches['second'] : 0;
+			return strtotime("$sYear-$sMonth-$sDay $sHour:$sMinute:$sSecond");
+		}
+	   else
+	   {
+	   	return false;
+	   }
+	   // http://www.spaweditor.com/scripts/regex/index.php
+	}
+	
+	/**
+	 * Convert an old date/time format specifciation (using % placeholders)
+	 * to a format compatible with DateTime::createFromFormat
+	 * @param string $sOldDateTimeFormat
+	 * @return string
+	 */
+	static public function DateTimeFormatToPHP($sOldDateTimeFormat)
+	{
+		$aSearch = array('%d', '%m', '%y', '%Y', '%H', '%i', '%s');
+		$aReplacement = array('d', 'm', 'y', 'Y', 'H', 'i', 's');
+		return str_replace($aSearch, $aReplacement, $sOldDateTimeFormat);
+	}
+
+	/**
+	 * @return \Config from the current environement, or if not existing from the production env, else new Config made from scratch
+	 * @uses \MetaModel::GetConfig() don't forget to add the needed <code>require_once(APPROOT.'core/metamodel.class.php');</code>
+	 */
+	static public function GetConfig()
+	{
+		if (self::$oConfig == null)
+		{
+		    self::$oConfig = MetaModel::GetConfig();
+
+		    if (self::$oConfig == null)
+		    {
+    			$sConfigFile = self::GetConfigFilePath();
+    			if (!file_exists($sConfigFile))
+    			{
+				    $sConfigFile = self::GetConfigFilePath('production');
+				    if (!file_exists($sConfigFile))
+				    {
+				    	$sConfigFile = null;
+				    }
+    			}
+
+			    self::$oConfig = new Config($sConfigFile);
+		    }
+		}
+		return self::$oConfig;
+	}
+
+	public static function InitTimeZone() {
+		$oConfig = self::GetConfig();
+		$sItopTimeZone = $oConfig->Get('timezone');
+
+		if (!empty($sItopTimeZone))
+		{
+			date_default_timezone_set($sItopTimeZone);
+		}
+		else
+		{
+			// Leave as is... up to the admin to set a value somewhere...
+			// see http://php.net/manual/en/datetime.configuration.php#ini.date.timezone
+		}
+	}
+
+    /**
+     * Returns the absolute URL to the application root path
+     * @return string The absolute URL to the application root, without the first slash
+     */                   
+	static public function GetAbsoluteUrlAppRoot()
+	{
+		static $sUrl = null;
+		if ($sUrl === null)
+		{
+			$sUrl = self::GetConfig()->Get('app_root_url');
+			if ($sUrl == '')
+			{
+				$sUrl = self::GetDefaultUrlAppRoot();
+			}
+			elseif (strpos($sUrl, SERVER_NAME_PLACEHOLDER) > -1)
+			{
+				if (isset($_SERVER['SERVER_NAME']))
+				{
+					$sServerName = $_SERVER['SERVER_NAME'];
+				}
+				else
+				{
+					// CLI mode ?
+					$sServerName = php_uname('n');
+				}
+				$sUrl = str_replace(SERVER_NAME_PLACEHOLDER, $sServerName, $sUrl);
+			}
+		}
+		return $sUrl;
+	}
+
+	static public function GetDefaultUrlAppRoot()
+	{
+		// Build an absolute URL to this page on this server/port
+		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
+		$sProtocol = self::IsConnectionSecure() ? 'https' : 'http';
+		$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
+		if ($sProtocol == 'http')
+		{
+			$sPort = ($iPort == 80) ? '' : ':'.$iPort;
+		}
+		else
+		{
+			$sPort = ($iPort == 443) ? '' : ':'.$iPort;
+		}
+		// $_SERVER['REQUEST_URI'] is empty when running on IIS
+		// Let's use Ivan Tcholakov's fix (found on www.dokeos.com)
+		if (!empty($_SERVER['REQUEST_URI']))
+		{
+			$sPath = $_SERVER['REQUEST_URI'];
+		}
+		else
+		{
+			$sPath = $_SERVER['SCRIPT_NAME'];
+			if (!empty($_SERVER['QUERY_STRING']))
+			{
+				$sPath .= '?'.$_SERVER['QUERY_STRING'];
+			}
+			$_SERVER['REQUEST_URI'] = $sPath;
+		}
+		$sPath = $_SERVER['REQUEST_URI'];
+
+		// remove all the parameters from the query string
+		$iQuestionMarkPos = strpos($sPath, '?');
+		if ($iQuestionMarkPos !== false)
+		{
+			$sPath = substr($sPath, 0, $iQuestionMarkPos);
+		}
+		$sAbsoluteUrl = "$sProtocol://{$sServerName}{$sPort}{$sPath}";
+
+		$sCurrentScript = realpath($_SERVER['SCRIPT_FILENAME']);
+		$sCurrentScript = str_replace('\\', '/', $sCurrentScript); // canonical path
+		$sAppRoot = str_replace('\\', '/', APPROOT); // canonical path
+		$sCurrentRelativePath = str_replace($sAppRoot, '', $sCurrentScript);
+	
+		$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
+		if ($sAppRootPos !== false)
+		{
+			$sAppRootUrl = substr($sAbsoluteUrl, 0, $sAppRootPos); // remove the current page and path
+		}
+		else
+		{
+			// Second attempt without index.php at the end...
+			$sCurrentRelativePath = str_replace('index.php', '', $sCurrentRelativePath);
+			$sAppRootPos = strpos($sAbsoluteUrl, $sCurrentRelativePath);
+			if ($sAppRootPos !== false)
+			{
+				$sAppRootUrl = substr($sAbsoluteUrl, 0, $sAppRootPos); // remove the current page and path
+			}
+			else
+			{
+				// No luck...
+				throw new Exception("Failed to determine application root path $sAbsoluteUrl ($sCurrentRelativePath) APPROOT:'$sAppRoot'");
+			}			
+		}
+		return $sAppRootUrl;
+	}
+
+	/**
+	 * Helper to handle the variety of HTTP servers
+	 * See #286 (fixed in [896]), and #634 (this fix)
+	 * 	 
+	 * Though the official specs says 'a non empty string', some servers like IIS do set it to 'off' !
+	 * nginx set it to an empty string
+	 * Others might leave it unset (no array entry)	 
+	 */	 	
+	static public function IsConnectionSecure()
+	{
+		$bSecured = false;
+
+		if (!empty($_SERVER['HTTPS']) && (strtolower($_SERVER['HTTPS']) != 'off'))
+		{
+			$bSecured = true;
+		}
+		return $bSecured;
+	}
+
+	/**
+	 * Tells whether or not log off operation is supported.
+	 * Actually in only one case:
+	 * 1) iTop is using an internal authentication
+	 * 2) the user did not log-in using the "basic" mode (i.e basic authentication) or by passing credentials in the URL
+	 * @return boolean True if logoff is supported, false otherwise
+	 */
+	static function CanLogOff()
+	{
+		$bResult = false;
+		if(isset($_SESSION['login_mode']))
+		{
+			$sLoginMode = $_SESSION['login_mode'];
+			switch($sLoginMode)
+			{
+				case 'external':
+				$bResult = false;
+				break;
+	
+				case 'form':
+				case 'basic':
+				case 'url':
+				case 'cas':
+				default:
+				$bResult = true;
+				
+			}			
+		}
+		return $bResult;
+	}
+
+	/**
+	 * Initializes the CAS client
+	 */
+	 static function InitCASClient()
+	 {
+		$sCASIncludePath =  self::GetConfig()->Get('cas_include_path');
+		include_once($sCASIncludePath.'/CAS.php');
+		
+		$bCASDebug = self::GetConfig()->Get('cas_debug');
+		if ($bCASDebug)
+		{
+			phpCAS::setDebug(APPROOT.'log/error.log');
+		}
+		
+		if (!self::$m_bCASClient)
+		{
+			// Initialize phpCAS
+			$sCASVersion = self::GetConfig()->Get('cas_version');
+			$sCASHost = self::GetConfig()->Get('cas_host');
+			$iCASPort = self::GetConfig()->Get('cas_port');
+			$sCASContext = self::GetConfig()->Get('cas_context');
+			phpCAS::client($sCASVersion, $sCASHost, $iCASPort, $sCASContext, false /* session already started */);
+			self::$m_bCASClient = true;
+			$sCASCACertPath = self::GetConfig()->Get('cas_server_ca_cert_path');
+			if (empty($sCASCACertPath))
+			{
+				// If no certificate authority is provided, do not attempt to validate
+				// the server's certificate
+				// THIS SETTING IS NOT RECOMMENDED FOR PRODUCTION. 
+				// VALIDATING THE CAS SERVER IS CRUCIAL TO THE SECURITY OF THE CAS PROTOCOL! 
+				phpCAS::setNoCasServerValidation();
+			}
+			else
+			{
+				phpCAS::setCasServerCACert($sCASCACertPath);
+			}			
+		}
+	 }
+	 
+	 static function DebugBacktrace($iLimit = 5)
+	 {
+		$aFullTrace = debug_backtrace();
+		$aLightTrace = array();
+		for($i=1; ($i<=$iLimit && $i < count($aFullTrace)); $i++) // Skip the last function call... which is the call to this function !
+		{
+			$aLightTrace[$i] = $aFullTrace[$i]['function'].'(), called from line '.$aFullTrace[$i]['line'].' in '.$aFullTrace[$i]['file'];
+		}
+		echo "<p><pre>".print_r($aLightTrace, true)."</pre></p>\n";
+	 }
+
+	/**
+	 * Execute the given iTop PHP script, passing it the current credentials
+	 * Only CLI mode is supported, because of the need to hand the credentials over to the next process
+	 * Throws an exception if the execution fails or could not be attempted (config issue)
+	 * @param string $sScript Name and relative path to the file (relative to the iTop root dir)
+	 * @param hash $aArguments Associative array of 'arg' => 'value'
+	 * @return array(iCode, array(output lines))
+	 */	 	  
+	/**
+	 */
+	static function ExecITopScript($sScriptName, $aArguments)
+	{
+		$aDisabled = explode(', ', ini_get('disable_functions'));
+		if (in_array('exec', $aDisabled))
+		{
+			throw new Exception("The PHP exec() function has been disabled on this server");
+		}
+
+		$sPHPExec = trim(self::GetConfig()->Get('php_path'));
+		if (strlen($sPHPExec) == 0)
+		{
+			throw new Exception("The path to php must not be empty. Please set a value for 'php_path' in your configuration file.");
+		}
+
+		$sAuthUser = self::ReadParam('auth_user', '', 'raw_data');
+		$sAuthPwd = self::ReadParam('auth_pwd', '', 'raw_data');
+		$sParamFile = self::GetParamSourceFile('auth_user');
+		if (is_null($sParamFile))
+		{
+			$aArguments['auth_user'] = $sAuthUser;
+			$aArguments['auth_pwd'] = $sAuthPwd;
+		}
+		else
+		{
+			$aArguments['param_file'] = $sParamFile;
+		}
+		
+		$aArgs = array();
+		foreach($aArguments as $sName => $value)
+		{
+			// Note: See comment from the 23-Apr-2004 03:30 in the PHP documentation
+			//    It suggests to rely on pctnl_* function instead of using escapeshellargs
+			$aArgs[] = "--$sName=".escapeshellarg($value);
+		}
+		$sArgs = implode(' ', $aArgs);
+		
+		$sScript = realpath(APPROOT.$sScriptName);
+		if (!file_exists($sScript))
+		{
+			throw new Exception("Could not find the script file '$sScriptName' from the directory '".APPROOT."'");
+		}
+
+		$sCommand = '"'.$sPHPExec.'" '.escapeshellarg($sScript).' -- '.$sArgs;
+
+		if (version_compare(phpversion(), '5.3.0', '<'))
+		{
+			if (substr(PHP_OS,0,3) == 'WIN')
+			{
+				// Under Windows, and for PHP 5.2.x, the whole command has to be quoted
+				// Cf PHP doc: http://php.net/manual/fr/function.exec.php, comment from the 27-Dec-2010
+				$sCommand = '"'.$sCommand.'"';
+			}
+		}
+
+		$sLastLine = exec($sCommand, $aOutput, $iRes);
+		if ($iRes == 1)
+		{
+			throw new Exception(Dict::S('Core:ExecProcess:Code1')." - ".$sCommand);
+		}
+		elseif ($iRes == 255)
+		{
+			$sErrors = implode("\n", $aOutput);
+			throw new Exception(Dict::S('Core:ExecProcess:Code255')." - ".$sCommand.":\n".$sErrors);
+		}
+
+		//$aOutput[] = $sCommand;
+		return array($iRes, $aOutput);
+	}
+
+	/**
+	 * Get the current environment
+	 */
+	public static function GetCurrentEnvironment()
+	{
+		if (isset($_SESSION['itop_env']))
+		{
+			return $_SESSION['itop_env'];
+		}
+		else
+		{
+			return ITOP_DEFAULT_ENV;
+		}
+	}
+
+	/**
+	 * Returns a path to a folder into which any module can store cache data
+	 * The corresponding folder is created or cleaned upon code compilation
+	 * @return string
+	 */
+	public static function GetCachePath()
+	{
+		return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
+	}
+	/**
+	 * Merge standard menu items with plugin provided menus items
+	 */
+	public static function GetPopupMenuItems($oPage, $iMenuId, $param, &$aActions, $sTableId = null, $sDataTableId = null)
+	{
+		// 1st - add standard built-in menu items
+		// 
+		switch($iMenuId)
+		{
+			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
+			// $param is a DBObjectSet
+			$oAppContext = new ApplicationContext();
+			$sContext = $oAppContext->GetForLink();
+			$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
+			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($param->GetFilter()->GetClass());
+			$sOQL = addslashes($param->GetFilter()->ToOQL(true));
+			$sFilter = urlencode($param->GetFilter()->serialize());
+			$sUrl = utils::GetAbsoluteUrlAppRoot()."pages/$sUIPage?operation=search&filter=".$sFilter."&{$sContext}";
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
+			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
+
+			$aResult = array();
+			if (strlen($sUrl) < SERVER_MAX_URL_LENGTH)
+			{
+				$aResult[] = new SeparatorPopupMenuItem();
+				// Static menus: Email this page, CSV Export & Add to Dashboard
+				$aResult[] = new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'),
+						"mailto:?body=".urlencode($sUrl).' ' // Add an extra space to make it work in Outlook
+				);
+			}
+			
+			if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_BULK_READ, $param) != UR_ALLOWED_NO)
+			{
+				// Bulk export actions
+				$aResult[] = new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '$sDataTableId', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")");
+				$aResult[] = new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '$sDataTableId', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")");
+				if (extension_loaded('gd'))
+				{
+					// PDF export requires GD
+					$aResult[] = new JSPopupMenuItem('UI:Menu:ExportPDF', Dict::S('UI:Menu:ExportPDF'), "ExportListDlg('$sOQL', '$sDataTableId', 'pdf', ".json_encode(Dict::S('UI:Menu:ExportPDF')).")");
+				}
+			}
+			$aResult[] = new JSPopupMenuItem('UI:Menu:AddToDashboard', Dict::S('UI:Menu:AddToDashboard'), "DashletCreationDlg('$sOQL', '$sContext')");
+			$aResult[] = new JSPopupMenuItem('UI:Menu:ShortcutList', Dict::S('UI:Menu:ShortcutList'), "ShortcutListDlg('$sOQL', '$sDataTableId', '$sContext')");
+				
+			break;
+
+			case iPopupMenuExtension::MENU_OBJDETAILS_ACTIONS:
+			// $param is a DBObject
+			$oObj = $param;
+			$sOQL = "SELECT ".get_class($oObj)." WHERE id=".$oObj->GetKey();
+			$oFilter = DBObjectSearch::FromOQL($sOQL);
+			$sFilter = $oFilter->serialize();
+			$sUrl = ApplicationContext::MakeObjectUrl(get_class($oObj), $oObj->GetKey());
+			$sUIPage = cmdbAbstractObject::ComputeStandardUIPage(get_class($oObj));
+			$oAppContext = new ApplicationContext();
+			$sContext = $oAppContext->GetForLink();
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
+			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
+			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');
+			
+			$aResult = array(
+				new SeparatorPopupMenuItem(),
+				// Static menus: Email this page & CSV Export
+				new URLPopupMenuItem('UI:Menu:EMail', Dict::S('UI:Menu:EMail'), "mailto:?subject=".urlencode($oObj->GetRawName())."&body=".urlencode($sUrl).' '), // Add an extra space to make it work in Outlook
+				new JSPopupMenuItem('UI:Menu:CSVExport', Dict::S('UI:Menu:CSVExport'), "ExportListDlg('$sOQL', '', 'csv', ".json_encode(Dict::S('UI:Menu:CSVExport')).")"),
+				new JSPopupMenuItem('UI:Menu:ExportXLSX', Dict::S('ExcelExporter:ExportMenu'), "ExportListDlg('$sOQL', '', 'xlsx', ".json_encode(Dict::S('ExcelExporter:ExportMenu')).")"),
+				new SeparatorPopupMenuItem(),
+				new URLPopupMenuItem('UI:Menu:PrintableVersion', Dict::S('UI:Menu:PrintableVersion'), $sUrl.'&printable=1', '_blank'),
+			);
+			break;
+
+			case iPopupMenuExtension::MENU_DASHBOARD_ACTIONS:
+			// $param is a Dashboard
+			$oAppContext = new ApplicationContext();
+			$aParams = $oAppContext->GetAsHash();
+			$sMenuId = ApplicationMenu::GetActiveNodeId();
+			$sDlgTitle = addslashes(Dict::S('UI:ImportDashboardTitle'));
+			$sDlgText = addslashes(Dict::S('UI:ImportDashboardText'));
+			$sCloseBtn = addslashes(Dict::S('UI:Button:Cancel'));
+			$aResult = array(
+				new SeparatorPopupMenuItem(),
+				new URLPopupMenuItem('UI:ExportDashboard', Dict::S('UI:ExportDashBoard'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=export_dashboard&id='.$sMenuId),
+				new JSPopupMenuItem('UI:ImportDashboard', Dict::S('UI:ImportDashBoard'), "UploadDashboard({dashboard_id: '$sMenuId', title: '$sDlgTitle', text: '$sDlgText', close_btn: '$sCloseBtn' })"),
+			);
+			break;
+
+			default:
+			// Unknown type of menu, do nothing
+			$aResult = array();
+		}
+		foreach($aResult as $oMenuItem)
+		{
+			$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
+		}
+
+		// Invoke the plugins
+		//
+		foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
+		{
+			if (is_object($param) && !($param instanceof DBObject))
+			{
+				$tmpParam = clone $param; // In case the parameter is an DBObjectSet, clone it to prevent alterations
+			}
+			else
+			{
+				$tmpParam = $param;
+			}
+			foreach($oExtensionInstance->EnumItems($iMenuId, $tmpParam) as $oMenuItem)
+			{
+				if (is_object($oMenuItem))
+				{
+					$aActions[$oMenuItem->GetUID()] = $oMenuItem->GetMenuItem();
+					
+					foreach($oMenuItem->GetLinkedScripts() as $sLinkedScript)
+					{
+						$oPage->add_linked_script($sLinkedScript);
+					}
+				}
+			}
+		}
+	}
+	/**
+	 * Get target configuration file name (including full path)
+	 */
+	public static function GetConfigFilePath($sEnvironment = null)
+	{
+		if (is_null($sEnvironment))
+		{
+			$sEnvironment = self::GetCurrentEnvironment();
+		}
+		return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
+	}
+
+    /**
+     * @return string the absolute URL to the modules root path
+     */                   
+	static public function GetAbsoluteUrlModulesRoot()
+	{
+		$sUrl = self::GetAbsoluteUrlAppRoot().'env-'.self::GetCurrentEnvironment().'/';
+		return $sUrl;
+	}
+
+	/**
+	 * To be compatible with this mechanism, the called page must include approot with an absolute path OR not include
+	 * it at all (losing the direct access to the page) :
+	 *
+	 * ```php
+	 * if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+	 * require_once(__DIR__.'/../../approot.inc.php');
+	 * ```
+	 *
+	 * @param string $sModule
+	 * @param string $sPage
+	 * @param string[] $aArguments
+	 * @param string $sEnvironment
+	 *
+	 * @return string the URL to a page that will execute the requested module page, with query string values url encoded
+	 *
+	 * @see GetExecPageArguments can be used to submit using the GET method (see bug in N.1108)
+	 * @see GetAbsoluteUrlExecPage
+	 */
+	static public function GetAbsoluteUrlModulePage($sModule, $sPage, $aArguments = array(), $sEnvironment = null)
+	{
+		$aArgs = self::GetExecPageArguments($sModule, $sPage, $aArguments, $sEnvironment);
+		$sArgs = http_build_query($aArgs);
+
+		return self::GetAbsoluteUrlExecPage()."?".$sArgs;
+	}
+
+	/**
+	 * @param string $sModule
+	 * @param string $sPage
+	 * @param string[] $aArguments
+	 * @param string $sEnvironment
+	 *
+	 * @return string[] key/value pair for the exec page query string. <b>Warning</b> : values are not url encoded !
+	 * @throws \Exception if one of the argument has a reserved name
+	 */
+	static public function GetExecPageArguments($sModule, $sPage, $aArguments = array(), $sEnvironment = null)
+	{
+		$sEnvironment = is_null($sEnvironment) ? self::GetCurrentEnvironment() : $sEnvironment;
+		$aArgs = array();
+		$aArgs['exec_module'] = $sModule;
+		$aArgs['exec_page'] = $sPage;
+		$aArgs['exec_env'] = $sEnvironment;
+		foreach($aArguments as $sName => $sValue)
+		{
+			if (($sName == 'exec_module') || ($sName == 'exec_page') || ($sName == 'exec_env'))
+			{
+				throw new Exception("Module page: $sName is a reserved page argument name");
+			}
+			$aArgs[$sName] = $sValue;
+		}
+
+		return $aArgs;
+	}
+
+	/**
+	 * @return string
+	 */
+	static public function GetAbsoluteUrlExecPage()
+	{
+		return self::GetAbsoluteUrlAppRoot().'pages/exec.php';
+	}
+
+	/**
+	 * Returns a name unique amongst the given list
+	 * @param string $sProposed The default value
+	 * @param array  $aExisting An array of existing values (strings)	 	 
+	 */
+	static public function MakeUniqueName($sProposed, $aExisting)
+	{
+		if (in_array($sProposed, $aExisting))
+		{
+			$i = 1;
+			while (in_array($sProposed.$i, $aExisting) && ($i < 50))
+			{
+				$i++;
+			}
+			return $sProposed.$i;
+		}
+		else
+		{
+			return $sProposed;
+		}
+	}
+	
+	/**
+	 * Some characters cause troubles with jQuery when used inside DOM IDs, so let's replace them by the safe _ (underscore)
+	 * @param string $sId The ID to sanitize
+	 * @return string The sanitized ID
+	 */
+	static public function GetSafeId($sId)
+	{
+		return str_replace(array(':', '[', ']', '+', '-'), '_', $sId);
+	}
+	
+	/**
+	 * Helper to execute an HTTP POST request
+	 * Source: http://netevil.org/blog/2006/nov/http-post-from-php-without-curl
+	 *         originaly named after do_post_request
+	 * Does not require cUrl but requires openssl for performing https POSTs.
+	 * 
+	 * @param string $sUrl The URL to POST the data to
+	 * @param hash $aData The data to POST as an array('param_name' => value)
+	 * @param string $sOptionnalHeaders Additional HTTP headers as a string with newlines between headers
+	 * @param hash	$aResponseHeaders An array to be filled with reponse headers: WARNING: the actual content of the array depends on the library used: cURL or fopen, test with both !! See: http://fr.php.net/manual/en/function.curl-getinfo.php
+	 * @param hash $aCurlOptions An (optional) array of options to pass to curl_init. The format is 'option_code' => 'value'. These values have precedence over the default ones. Example: CURLOPT_SSLVERSION => CURL_SSLVERSION_SSLv3
+	 * @return string The result of the POST request
+	 * @throws Exception
+	 */ 
+	static public function DoPostRequest($sUrl, $aData, $sOptionnalHeaders = null, &$aResponseHeaders = null, $aCurlOptions = array())
+	{
+		// $sOptionnalHeaders is a string containing additional HTTP headers that you would like to send in your request.
+	
+		if (function_exists('curl_init'))
+		{
+			// If cURL is available, let's use it, since it provides a greater control over the various HTTP/SSL options
+			// For instance fopen does not allow to work around the bug: http://stackoverflow.com/questions/18191672/php-curl-ssl-routinesssl23-get-server-helloreason1112
+			// by setting the SSLVERSION to 3 as done below.
+			$aHeaders = explode("\n", $sOptionnalHeaders);
+			$aHTTPHeaders = array();
+			foreach($aHeaders as $sHeaderString)
+			{
+				if(preg_match('/^([^:]): (.+)$/', $sHeaderString, $aMatches))
+				{
+					$aHTTPHeaders[$aMatches[1]] = $aMatches[2];
+				}
+			}
+			// Default options, can be overloaded/extended with the 4th parameter of this method, see above $aCurlOptions
+			$aOptions = array(
+				CURLOPT_RETURNTRANSFER	=> true,     // return the content of the request
+				CURLOPT_HEADER			=> false,    // don't return the headers in the output
+				CURLOPT_FOLLOWLOCATION	=> true,     // follow redirects
+				CURLOPT_ENCODING		=> "",       // handle all encodings
+				CURLOPT_USERAGENT		=> "spider", // who am i
+				CURLOPT_AUTOREFERER		=> true,     // set referer on redirect
+				CURLOPT_CONNECTTIMEOUT	=> 120,      // timeout on connect
+				CURLOPT_TIMEOUT			=> 120,      // timeout on response
+				CURLOPT_MAXREDIRS		=> 10,       // stop after 10 redirects
+				CURLOPT_SSL_VERIFYPEER	=> false,    // Disabled SSL Cert checks
+				// SSLV3 (CURL_SSLVERSION_SSLv3 = 3) is now considered as obsolete/dangerous: http://disablessl3.com/#why
+				// but it used to be a MUST to prevent a strange SSL error: http://stackoverflow.com/questions/18191672/php-curl-ssl-routinesssl23-get-server-helloreason1112
+				// CURLOPT_SSLVERSION		=> 3,
+				CURLOPT_POST			=> count($aData),
+				CURLOPT_POSTFIELDS		=> http_build_query($aData),
+				CURLOPT_HTTPHEADER		=> $aHTTPHeaders,
+			);
+			
+			$aAllOptions = $aCurlOptions + $aOptions;
+			$ch = curl_init($sUrl);
+			curl_setopt_array($ch, $aAllOptions);
+			$response = curl_exec($ch);
+			$iErr = curl_errno($ch);
+			$sErrMsg = curl_error( $ch );
+			$aHeaders = curl_getinfo( $ch );
+			if ($iErr !== 0)
+			{
+				throw new Exception("Problem opening URL: $sUrl, $sErrMsg");
+			}
+			if (is_array($aResponseHeaders))
+			{
+				$aHeaders = curl_getinfo($ch);
+				foreach($aHeaders as $sCode => $sValue)
+				{
+					$sName = str_replace(' ' , '-', ucwords(str_replace('_', ' ', $sCode))); // Transform "content_type" into "Content-Type"
+					$aResponseHeaders[$sName] = $sValue;
+				}
+			}
+			curl_close( $ch );
+		}
+		else
+		{
+			// cURL is not available let's try with streams and fopen...
+			
+			$sData = http_build_query($aData);
+			$aParams = array('http' => array(
+									'method' => 'POST',
+									'content' => $sData,
+									'header'=> "Content-type: application/x-www-form-urlencoded\r\nContent-Length: ".strlen($sData)."\r\n",
+									));
+			if ($sOptionnalHeaders !== null)
+			{
+				$aParams['http']['header'] .= $sOptionnalHeaders;
+			}
+			$ctx = stream_context_create($aParams);
+		
+			$fp = @fopen($sUrl, 'rb', false, $ctx);
+			if (!$fp)
+			{
+				global $php_errormsg;
+				if (isset($php_errormsg))
+				{
+					throw new Exception("Wrong URL: $sUrl, $php_errormsg");
+				}
+				elseif ((strtolower(substr($sUrl, 0, 5)) == 'https') && !extension_loaded('openssl'))
+				{
+					throw new Exception("Cannot connect to $sUrl: missing module 'openssl'");
+				}
+				else
+				{
+					throw new Exception("Wrong URL: $sUrl");
+				}
+			}
+			$response = @stream_get_contents($fp);
+			if ($response === false)
+			{
+				throw new Exception("Problem reading data from $sUrl, $php_errormsg");
+			}
+			if (is_array($aResponseHeaders))
+			{
+				$aMeta = stream_get_meta_data($fp);
+				$aHeaders = $aMeta['wrapper_data'];
+				foreach($aHeaders as $sHeaderString)
+				{
+					if(preg_match('/^([^:]+): (.+)$/', $sHeaderString, $aMatches))
+					{
+						$aResponseHeaders[$aMatches[1]] = trim($aMatches[2]);
+					}
+				}
+			}
+		}
+		return $response;
+	}
+
+	/**
+	 * Get a standard list of character sets
+	 *	 
+ 	 * @param array $aAdditionalEncodings Additional values
+	 * @return array of iconv code => english label, sorted by label
+	 */
+	public static function GetPossibleEncodings($aAdditionalEncodings = array())
+	{
+		// Encodings supported:
+		// ICONV_CODE => Display Name
+		// Each iconv installation supports different encodings
+		// Some reasonably common and useful encodings are listed here
+		$aPossibleEncodings = array(
+			'UTF-8' => 'Unicode (UTF-8)',
+			'ISO-8859-1' => 'Western (ISO-8859-1)',
+			'WINDOWS-1251' => 'Cyrilic (Windows 1251)',
+			'WINDOWS-1252' => 'Western (Windows 1252)',
+			'ISO-8859-15' => 'Western (ISO-8859-15)',
+		);
+		$aPossibleEncodings = array_merge($aPossibleEncodings, $aAdditionalEncodings);
+		asort($aPossibleEncodings);
+		return $aPossibleEncodings;
+	}
+	
+	/**
+	 * Convert a string containing some (valid) HTML markup to plain text
+	 * @param string $sHtml
+	 * @return string
+	 */
+	public static function HtmlToText($sHtml)
+	{
+		try
+		{
+			//return '<?xml encoding="UTF-8">'.$sHtml;
+			return \Html2Text\Html2Text::convert('<?xml encoding="UTF-8">'.$sHtml);
+		}
+		catch(Exception $e)
+		{
+			return $e->getMessage();
+		}
+	}
+	
+	/**
+	 * Convert (?) plain text to some HTML markup by replacing newlines by <br/> tags
+	 * and escaping HTML entities
+	 * @param string $sText
+	 * @return string
+	 */
+	public static function TextToHtml($sText)
+	{
+		$sText = str_replace("\r\n", "\n", $sText);
+		$sText = str_replace("\r", "\n", $sText);
+		return str_replace("\n", '<br/>', htmlentities($sText, ENT_QUOTES, 'UTF-8'));
+	}
+	
+	/**
+	 * Eventually compiles the SASS (.scss) file into the CSS (.css) file
+	 *
+	 * @param string $sSassRelPath Relative path to the SCSS file (must have the extension .scss)
+	 * @param array $aImportPaths Array of absolute paths to load imports from
+	 * @return string Relative path to the CSS file (<name>.css)
+	 */
+	static public function GetCSSFromSASS($sSassRelPath, $aImportPaths = null)
+	{
+		// Avoiding compilation if file is already a css file.
+		if (preg_match('/\.css$/', $sSassRelPath))
+		{
+			return $sSassRelPath;
+		}
+
+		// Setting import paths
+		if ($aImportPaths === null)
+		{
+			$aImportPaths = array();
+		}
+		$aImportPaths[] = APPROOT . '/css';
+
+		$sSassPath = APPROOT.$sSassRelPath;
+		$sCssRelPath = preg_replace('/\.scss$/', '.css', $sSassRelPath);
+		$sCssPath = APPROOT.$sCssRelPath;
+		clearstatcache();
+		if (!file_exists($sCssPath) || (is_writable($sCssPath) && (filemtime($sCssPath) < filemtime($sSassPath))))
+		{
+			require_once(APPROOT.'lib/scssphp/scss.inc.php');
+			$oScss = new Compiler();
+			$oScss->setImportPaths($aImportPaths);
+			$oScss->setFormatter('Leafo\\ScssPhp\\Formatter\\Expanded');
+			// Temporary disabling max exec time while compiling
+			$iCurrentMaxExecTime = (int) ini_get('max_execution_time');
+			set_time_limit(0);
+			$sCss = $oScss->compile(file_get_contents($sSassPath));
+			set_time_limit($iCurrentMaxExecTime);
+			file_put_contents($sCssPath, $sCss);
+		}
+		return $sCssRelPath;
+	}
+	
+	static public function GetImageSize($sImageData)
+	{
+		if (function_exists('getimagesizefromstring')) // PHP 5.4.0 or higher
+		{
+			$aRet = @getimagesizefromstring($sImageData);
+		}
+		else if(ini_get('allow_url_fopen'))
+		{
+			// work around to avoid creating a tmp file
+			$sUri = 'data://application/octet-stream;base64,'.base64_encode($sImageData);
+			$aRet = @getimagesize($sUri);
+		}
+		else
+		{
+			// Damned, need to create a tmp file
+			$sTempFile = tempnam(SetupUtils::GetTmpDir(), 'img-');
+			@file_put_contents($sTempFile, $sImageData);
+			$aRet = @getimagesize($sTempFile);
+			@unlink($sTempFile);
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Resize an image attachment so that it fits in the given dimensions
+	 * @param ormDocument $oImage The original image stored as an ormDocument
+	 * @param int $iWidth Image's original width
+	 * @param int $iHeight Image's original height
+	 * @param int $iMaxImageWidth Maximum width for the resized image
+	 * @param int $iMaxImageHeight Maximum height for the resized image
+	 * @return ormDocument The resampled image
+	 */
+	public static function ResizeImageToFit(ormDocument $oImage, $iWidth, $iHeight, $iMaxImageWidth, $iMaxImageHeight)
+	{
+		// If image size smaller than maximums, we do nothing
+		if (($iWidth <= $iMaxImageWidth) && ($iHeight <= $iMaxImageHeight))
+		{
+			return $oImage;
+		}
+
+
+		// If gd extension is not loaded, we put a warning in the log and return the image as is
+		if (extension_loaded('gd') === false)
+		{
+			IssueLog::Warning('Image could not be resized as the "gd" extension does not seem to be loaded. It will remain as ' . $iWidth . 'x' . $iHeight . ' instead of ' . $iMaxImageWidth . 'x' . $iMaxImageHeight);
+			return $oImage;
+		}
+
+
+		switch($oImage->GetMimeType())
+		{
+			case 'image/gif':
+			case 'image/jpeg':
+			case 'image/png':
+			$img = @imagecreatefromstring($oImage->GetData());
+			break;
+			
+			default:
+			// Unsupported image type, return the image as-is
+			//throw new Exception("Unsupported image type: '".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
+			return $oImage;
+		}
+		if ($img === false)
+		{
+			//throw new Exception("Warning: corrupted image: '".$oImage->GetFileName()." / ".$oImage->GetMimeType()."'. Cannot resize the image, original image will be used.");
+			return $oImage;
+		}
+		else
+		{
+			// Let's scale the image, preserving the transparency for GIFs and PNGs
+			
+			$fScale = min($iMaxImageWidth / $iWidth, $iMaxImageHeight / $iHeight);
+
+			$iNewWidth = $iWidth * $fScale;
+			$iNewHeight = $iHeight * $fScale;
+			
+			$new = imagecreatetruecolor($iNewWidth, $iNewHeight);
+			
+			// Preserve transparency
+			if(($oImage->GetMimeType() == "image/gif") || ($oImage->GetMimeType() == "image/png"))
+			{
+				imagecolortransparent($new, imagecolorallocatealpha($new, 0, 0, 0, 127));
+				imagealphablending($new, false);
+				imagesavealpha($new, true);
+			}
+			
+			imagecopyresampled($new, $img, 0, 0, 0, 0, $iNewWidth, $iNewHeight, $iWidth, $iHeight);
+			
+			ob_start();
+			switch ($oImage->GetMimeType())
+			{
+				case 'image/gif':
+				imagegif($new); // send image to output buffer
+				break;
+				
+				case 'image/jpeg':
+				imagejpeg($new, null, 80); // null = send image to output buffer, 80 = good quality
+				break;
+				 
+				case 'image/png':
+				imagepng($new, null, 5); // null = send image to output buffer, 5 = medium compression
+				break;
+			}
+			$oResampledImage = new ormDocument(ob_get_contents(), $oImage->GetMimeType(), $oImage->GetFileName());
+			@ob_end_clean();
+			
+			imagedestroy($img);
+			imagedestroy($new);
+							
+			return $oResampledImage;
+		}
+				
+	}
+	
+	/**
+	 * Create a 128 bit UUID in the format: {########-####-####-####-############}
+	 * 
+	 * Note: this method can be run from the command line as well as from the web server.
+	 * Note2: this method is not cryptographically secure! If you need a cryptographically secure value
+	 * consider using open_ssl or PHP 7 methods.
+	 * @param string $sPrefix
+	 * @return string
+	 */
+	static public function CreateUUID($sPrefix = '')
+	{
+		$uid = uniqid("", true);
+		$data = $sPrefix;
+		$data .= __FILE__;
+		$data .= mt_rand();
+		$hash = strtoupper(hash('ripemd128', $uid . md5($data)));
+		$sUUID = '{' .
+				substr($hash,  0,  8) .
+				'-' .
+				substr($hash,  8,  4) .
+				'-' .
+				substr($hash, 12,  4) .
+				'-' .
+				substr($hash, 16,  4) .
+				'-' .
+				substr($hash, 20, 12) .
+				'}';
+		return $sUUID;
+	}
+
+	/**
+	 * Returns the name of the module containing the file where the call to this function is made
+	 * or an empty string if no such module is found (or not called within a module file)
+	 * @param number $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
+	 * @return string
+	 */
+	static public function GetCurrentModuleName($iCallDepth = 0)
+	{
+		$sCurrentModuleName = '';
+		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
+		
+		foreach(GetModulesInfo() as $sModuleName => $aInfo)
+		{
+			if ($aInfo['root_dir'] !== '')
+			{
+				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
+				
+				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
+				{
+					$sCurrentModuleName = $sModuleName;
+					break;
+				}
+			}
+		}
+		return $sCurrentModuleName;
+	}
+	
+	/**
+	 * Returns the relative (to APPROOT) path of the root directory of the module containing the file where the call to this function is made
+	 * or an empty string if no such module is found (or not called within a module file)
+	 * @param number $iCallDepth The depth of the module in the callstack. Zero when called directly from within the module
+	 * @return string
+	 */
+	static public function GetCurrentModuleDir($iCallDepth)
+	{
+		$sCurrentModuleDir = '';
+		$aCallStack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+		$sCallerFile = realpath($aCallStack[$iCallDepth]['file']);
+	
+		foreach(GetModulesInfo() as $sModuleName => $aInfo)
+		{
+			if ($aInfo['root_dir'] !== '')
+			{
+				$sRootDir = realpath(APPROOT.$aInfo['root_dir']);
+	
+				if(substr($sCallerFile, 0, strlen($sRootDir)) === $sRootDir)
+				{
+					$sCurrentModuleDir = basename($sRootDir);
+					break;
+				}
+			}
+		}
+		return $sCurrentModuleDir;
+	}
+	
+	/**
+	 * Returns the base URL for all files in the current module from which this method is called
+	 * or an empty string if no such module is found (or not called within a module file)
+	 * @return string
+	 */
+	static public function GetCurrentModuleUrl()
+	{
+		$sDir = static::GetCurrentModuleDir(1);
+		if ( $sDir !== '')
+		{
+			return static::GetAbsoluteUrlModulesRoot().'/'.$sDir;
+		}
+		return '';
+	}
+	
+	/**
+	 * Get the value of a given setting for the current module
+	 * @param string $sProperty The name of the property to retrieve
+	 * @param mixed $defaultvalue
+	 * @return mixed
+	 */
+	static public function GetCurrentModuleSetting($sProperty, $defaultvalue = null)
+	{
+		$sModuleName = static::GetCurrentModuleName(1);
+		return MetaModel::GetModuleSetting($sModuleName, $sProperty, $defaultvalue);
+	}
+	
+	/**
+	 * Get the compiled version of a given module, as it was seen by the compiler
+	 * @param string $sModuleName
+	 * @return string|NULL
+	 */
+	static public function GetCompiledModuleVersion($sModuleName)
+	{
+		$aModulesInfo = GetModulesInfo();
+		if (array_key_exists($sModuleName, $aModulesInfo))
+		{
+			return $aModulesInfo[$sModuleName]['version'];
+		}
+		return null;
+	}
+	
+	/**
+	 * Check if the given path/url is an http(s) URL
+	 * @param string $sPath
+	 * @return boolean
+	 */
+	public static function IsURL($sPath)
+	{
+		$bRet = false;
+		if ((substr($sPath, 0, 7) == 'http://') || (substr($sPath, 0, 8) == 'https://') || (substr($sPath, 0, 8) == 'ftp://'))
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+	
+	/**
+	 * Check if the given URL is a link to download a document/image on the CURRENT iTop
+	 * In such a case we can read the content of the file directly in the database (if the users rights allow) and return the ormDocument
+	 * @param string $sPath
+	 * @return false|ormDocument
+	 * @throws Exception
+	 */
+	public static function IsSelfURL($sPath)
+	{
+		$result = false;
+		$sPageUrl = utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php';
+		if (substr($sPath, 0, strlen($sPageUrl)) == $sPageUrl)
+		{
+			// If the URL is an URL pointing to this instance of iTop, then
+			// extract the "query" part of the URL and analyze it
+			$sQuery = parse_url($sPath, PHP_URL_QUERY);
+			if ($sQuery !== null)
+			{
+				$aParams = array();
+				foreach(explode('&', $sQuery) as $sChunk)
+				{
+					$aParts = explode('=', $sChunk);
+					if (count($aParts) != 2) continue;
+					$aParams[$aParts[0]] = urldecode($aParts[1]);
+				}
+				$result = array_key_exists('operation', $aParams) && array_key_exists('class', $aParams) && array_key_exists('id', $aParams) && array_key_exists('field', $aParams) && ($aParams['operation'] == 'download_document');
+				if ($result)
+				{
+					// This is a 'download_document' operation, let's retrieve the document directly from the database
+					$sClass = $aParams['class'];
+					$iKey = $aParams['id'];
+					$sAttCode = $aParams['field'];
+
+					$oObj = MetaModel::GetObject($sClass, $iKey, false /* must exist */); // Users rights apply here !!
+					if ($oObj)
+					{
+						/**
+						 * @var ormDocument $result
+						 */
+						$result = clone $oObj->Get($sAttCode);
+						return $result;
+					}
+				}
+			}
+			throw new Exception('Invalid URL. This iTop URL is not pointing to a valid Document/Image.');
+		}
+		return $result;
+	}
+	
+	/**
+	 * Read the content of a file (and retrieve its MIME type) from either:
+	 * - an URL pointing to a blob (image/document) on the current iTop server
+	 * - an http(s) URL
+	 * - the local file system (but only if you are an administrator)
+	 * @param string $sPath
+	 * @return ormDocument|null
+	 * @throws Exception
+	 */
+	public static function FileGetContentsAndMIMEType($sPath)
+	{
+		$oUploadedDoc = null;
+		$aKnownExtensions = array(
+				'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+				'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+				'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+				'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+				'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+				'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+				'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+				'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+				'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+				'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+				'jpg' => 'image/jpeg',
+				'jpeg' => 'image/jpeg',
+				'gif' => 'image/gif',
+				'png' => 'image/png',
+				'pdf' => 'application/pdf',
+				'doc' => 'application/msword',
+				'dot' => 'application/msword',
+				'xls' => 'application/vnd.ms-excel',
+				'ppt' => 'application/vnd.ms-powerpoint',
+				'vsd' => 'application/x-visio',
+				'vdx' => 'application/visio.drawing',
+				'odt' => 'application/vnd.oasis.opendocument.text',
+				'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+				'odp' => 'application/vnd.oasis.opendocument.presentation',
+				'zip' => 'application/zip',
+				'txt' => 'text/plain',
+				'htm' => 'text/html',
+				'html' => 'text/html',
+				'exe' => 'application/octet-stream'
+		);
+	
+		$sData = null;
+		$sMimeType = 'text/plain'; // Default MIME Type: treat the file as a bunch a characters...
+		$sFileName = 'uploaded-file'; // Default name for downloaded-files
+		$sExtension = '.txt'; // Default file extension in case we don't know the MIME Type
+
+		if(empty($sPath))
+		{
+			// Empty path (NULL or '') means that there is no input, making an empty document.
+			$oUploadedDoc = new ormDocument('', '', '');
+		}
+		elseif (static::IsURL($sPath))
+		{
+			if ($oUploadedDoc = static::IsSelfURL($sPath))
+			{
+				// Nothing more to do, we've got it !!
+			}
+			else
+			{
+				// Remote file, let's use the HTTP headers to find the MIME Type
+				$sData = @file_get_contents($sPath);
+				if ($sData === false)
+				{
+					throw new Exception("Failed to load the file from the URL '$sPath'.");
+				}
+				else
+				{
+					if (isset($http_response_header))
+					{
+						$aHeaders = static::ParseHeaders($http_response_header);
+						$sMimeType = array_key_exists('Content-Type', $aHeaders) ? strtolower($aHeaders['Content-Type']) : 'application/x-octet-stream';
+						// Compute the file extension from the MIME Type
+						foreach($aKnownExtensions as $sExtValue => $sMime)
+						{
+							if ($sMime === $sMimeType)
+							{
+								$sExtension = '.'.$sExtValue;
+								break;
+							}
+						}
+					}
+					$sFileName .= $sExtension;
+				}
+				$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
+			}
+		}
+		else if (UserRights::IsAdministrator())
+		{
+			// Only administrators are allowed to read local files
+			$sData = @file_get_contents($sPath);
+			if ($sData === false)
+			{
+				throw new Exception("Failed to load the file '$sPath'. The file does not exist or the current process is not allowed to access it.");
+			}
+			$sExtension = strtolower(pathinfo($sPath, PATHINFO_EXTENSION));
+			$sFileName = basename($sPath);
+				
+			if (array_key_exists($sExtension, $aKnownExtensions))
+			{
+				$sMimeType = $aKnownExtensions[$sExtension];
+			}
+			else if (extension_loaded('fileinfo'))
+			{
+				$finfo = new finfo(FILEINFO_MIME);
+				$sMimeType = $finfo->file($sPath);
+			}
+			$oUploadedDoc = new ormDocument($sData, $sMimeType, $sFileName);
+		}
+		return $oUploadedDoc;
+	}
+	
+	protected static function ParseHeaders($aHeaders)
+	{
+		$aCleanHeaders = array();
+		foreach( $aHeaders as $sKey => $sValue )
+		{
+			$aTokens = explode(':', $sValue, 2);
+			if(isset($aTokens[1]))
+			{
+				$aCleanHeaders[trim($aTokens[0])] = trim($aTokens[1]);
+			}
+			else
+			{
+				// The header is not in the form Header-Code: Value
+				$aCleanHeaders[] = $sValue; // Store the value as-is
+				$aMatches = array();
+				// Check if it's not the HTTP response code
+				if( preg_match("|HTTP/[0-9\.]+\s+([0-9]+)|", $sValue, $aMatches) )
+				{
+					$aCleanHeaders['reponse_code'] = intval($aMatches[1]);
+				}
+			}
+		}
+		return $aCleanHeaders;
+	}
+	
+	/**
+	 * Return a string based on compilation time or (if not available because the datamodel has not been loaded)
+	 * the version of iTop. This string is useful to prevent browser side caching of content that may vary at each
+	 * (re)installation of iTop (especially during development). 
+	 * @return string
+	 */
+	public static function GetCacheBusterTimestamp()
+	{
+		if(!defined('COMPILATION_TIMESTAMP'))
+		{
+			return ITOP_VERSION;
+		}
+		return COMPILATION_TIMESTAMP;
+	}
+
+	/**
+	 * Check if the given class if configured as a high cardinality class.
+	 *
+	 * @param $sClass
+	 *
+	 * @return bool
+	 */
+	public static function IsHighCardinality($sClass)
+	{
+		if (utils::GetConfig()->Get('search_manual_submit'))
+		{
+			return true;
+		}
+		$aHugeClasses = MetaModel::GetConfig()->Get('high_cardinality_classes');
+		return in_array($sClass, $aHugeClasses);
+	}
+}
diff --git a/js/searchformforeignkeys.js b/js/searchformforeignkeys.js
index d5dc8474b..544361b39 100644
--- a/js/searchformforeignkeys.js
+++ b/js/searchformforeignkeys.js
@@ -1,342 +1,342 @@
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- *
- * @param id String the dom identifier of the source input
- * @param sTargetClass
- * @param sAttCode
- * @param oSearchWidgetElmt
- * @param sFilter
- * @param sTitle
- * @constructor
- */
-function SearchFormForeignKeys(id, sTargetClass, sAttCode, oSearchWidgetElmt, sFilter, sTitle)
-{
-	this.id = id;
-	//this.sOriginalTargetClass = sTargetClass;
-	this.sTargetClass = sTargetClass;
-	this.sFilter = sFilter;
-	this.sTitle = sTitle;
-	this.sAttCode = sAttCode;
-	this.oSearchWidgetElmt = oSearchWidgetElmt;
-	this.emptyHtml = ''; // content to be displayed when the search results are empty (when opening the dialog)
-	this.emptyOnClose = true; // Workaround for the JQuery dialog being very slow when opening and closing if the content contains many INPUT tags
-	this.ajax_request = null;
-	// this.bSelectMode = bSelectMode; // true if the edited field is a SELECT, false if it's an autocomplete
-	// this.bSearchMode = bSearchMode; // true if selecting a value in the context of a search form
-	var me = this;
-
-	this.Init = function()
-	{
-		// make sure that the form is clean
-		$('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; });
-		$('#'+this.id+'_btnRemove').prop('disabled', false);
-
-
-		$('<div id="dlg_'+me.id+'"></div>').appendTo(document.body);
-
-		// me.trace(dialog);
-
-		//TODO : check and remove all unneded code bellow this line!!
-
-		$('#'+this.id+'_linksToRemove').val('');
-
-		$('#linkedset_'+me.id).on('remove', function() {
-			// prevent having the dlg div twice
-			$('#dlg_'+me.id).remove();
-		});
-
-		$('#'+this.iInputId).closest('form').submit(function() {
-			return me.OnFormSubmit();
-		});
-	};
-
-	this.StopPendingRequest = function()
-	{
-		if (me.ajax_request)
-		{
-			me.ajax_request.abort();
-			me.ajax_request = null;
-		}
-	};
-
-	this.ShowModalSearchForeignKeys = function()
-	{
-		// // Query the server to get the form to search for target objects
-		// if (me.bSelectMode)
-		// {
-		// 	$('#fstatus_'+me.id).html('<img src="../images/indicator.gif" />');
-		// }
-		// else
-		// {
-		// 	$('#label_'+me.id).addClass('dlg_loading');
-		// }
-		$('#label_'+me.id).addClass('dlg_loading');
-		var theMap = {
-			sAttCode: me.sAttCode,
-			iInputId: me.id,
-			sTitle: me.sTitle,
-			sTargetClass: me.sTargetClass,
-			// bSearchMode: me.bSearchMode,
-			operation: 'ShowModalSearchForeignKeys'
-		};
-
-
-
-		// Make sure that we cancel any pending request before issuing another
-		// since responses may arrive in arbitrary order
-		me.StopPendingRequest();
-
-		// Run the query and get the result back directly in HTML
-		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
-			function(data)
-			{
-				// $('#dlg_'+me.id).html(data);
-				$('#dlg_'+me.id).empty().append($(data)); // $(data).filter(':not(script)'));
-				$('#dlg_'+me.id).dialog('open');
-				me.UpdateSizes();
-				me.UpdateButtons();
-				me.ajax_request = null;
-				me.ListResultsSearchForeignKeys();
-			},
-			'html'
-		);
-	};
-
-	this.UpdateSizes = function()
-	{
-		var dlg = $('#dlg_'+me.id);
-		// Adjust the dialog's size to fit into the screen
-		if (dlg.width() > ($(window).width()-40))
-		{
-			dlg.width($(window).width()-40);
-		}
-		if (dlg.height() > ($(window).height()-70))
-		{
-			dlg.height($(window).height()-70);
-		}
-		var searchForm = dlg.find('div.display_block:first'); // Top search form, enclosing display_block
-		var results = $('#SearchResultsToAdd_'+me.id);
-		var oPadding = {};
-		var aKeys = ['top', 'right', 'bottom', 'left'];
-		for(k in aKeys)
-		{
-			oPadding[aKeys[k]] = 0;
-			if (dlg.css('padding-'+aKeys[k]))
-			{
-				oPadding[aKeys[k]] = parseInt(dlg.css('padding-'+aKeys[k]).replace('px', ''));
-			}
-		}
-		//var width = dlg.innerWidth() - oPadding['right'] - oPadding['left'] - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
-		var height = dlg.innerHeight()-oPadding['top']-oPadding['bottom']-22;
-		var form_height = searchForm.outerHeight();
-		results.height(height - form_height - 40); // Leave some space for the buttons
-	};
-
-	this.UpdateButtons = function()
-	{
-		var okBtn = $('#btn_ok_'+me.id);
-		if ($('#count_'+me.id).val() > 0)
-		{
-			okBtn.removeAttr('disabled');
-		}
-		else
-		{
-			okBtn.prop('disabled', 'disabled');
-		}
-	};
-
-	/**
-	 * @return {boolean}
-	 */
-	this.ListResultsSearchForeignKeys = function ()
-	{
-		var theMap = {
-			sTargetClass: me.sTargetClass,
-			iInputId: me.id,
-			sFilter: me.sFilter
-			// bSearchMode: me.bSearchMode
-		};
-
-		// Gather the parameters from the search form
-		$('#fs_'+me.id+' :input').each( function() {
-			if (this.name !== '')
-			{
-				var val = $(this).val(); // supports multiselect as well
-				if (val !== null)
-				{
-					theMap[this.name] = val;
-				}
-			}
-		});
-
-
-
-		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
-		theMap.operation = 'ListResultsSearchForeignKeys'; // Override what is defined in the form itself
-		theMap.sAttCode = me.sAttCode;
-		var sSearchAreaId = '#SearchResultsToAdd_'+me.id;
-		//$(sSearchAreaId).html('<div style="text-align:center;width:100%;height:24px;vertical-align:middle;"><img src="../images/indicator.gif" /></div>');
-		$(sSearchAreaId).block();
-		me.UpdateButtons();
-
-		// Make sure that we cancel any pending request before issuing another
-		// since responses may arrive in arbitrary order
-		me.StopPendingRequest();
-
-		// Run the query and display the results
-		me.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
-			function(data)
-			{
-				$(sSearchAreaId).html(data);
-				$(sSearchAreaId+' .listResults').tableHover();
-				$('#fr_'+me.id+' input:radio').click(function() { me.UpdateButtons(); });
-				me.UpdateButtons();
-				me.ajax_request = null;
-				$('#count_'+me.id).change(function(){
-					me.UpdateButtons();
-				});
-				me.UpdateSizes();
-			},
-			'html'
-		);
-
-		return false; // Don't submit the form, stay in the current page !
-	};
-
-	/**
-	 * @return {boolean}
-	 */
-	this.DoAddObjects = function () {
-		// Gather the parameters from the search form
-		var theMap = {};
-		var context = $('#SearchResultsToAdd_'+me.id);
-		var selectionMode = $(':input[name="selectionMode"]', context);
-		if (selectionMode.length > 0) {
-			// Paginated table retrieve the mode and the exceptions
-			theMap['selectionMode'] = selectionMode.val();
-			$('#fs_SearchFormToAdd_'+me.id+' :input').each(function () {
-				theMap[this.name] = this.value;
-			});
-
-			$(':input[name="storedSelection[]"]', context).each(function () {
-				if (typeof theMap[this.name] === "undefined") {
-					theMap[this.name] = [];
-				}
-				theMap[this.name].push(this.value);
-				$(this).remove(); // Remove the selection for the next time the dialog re-opens
-			});
-		}
-
-		// Normal table, retrieve all the checked check-boxes
-		$(':checked[name="selectObject[]"]', context).each(
-			function () {
-				if ((this.name !== '') && ((this.type !== 'checkbox') || (this.checked))) {
-					var arrayExpr = /\[\]$/;
-					if (arrayExpr.test(this.name)) {
-						// Array
-						if (typeof theMap[this.name] === "undefined") {
-							theMap[this.name] = [];
-						}
-						theMap[this.name].push(this.value);
-					}
-					else {
-						theMap[this.name] = this.value;
-					}
-				}
-				$(this).parents('tr:first').remove(); // Remove the whole line, so that, next time the dialog gets displayed it's no longer there
-			}
-		);
-		theMap["class"] = me.sTargetClass;
-		theMap['operation'] = 'GetFullListForeignKeysFromSelection';
-		$('#busy_'+me.iInputId).html('&nbsp;<img src="../images/indicator.gif"/>');
-		// Run the query and display the results
-		$.ajax(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {
-				"data": theMap,
-				"method": "POST"
-			})
-			.done(function (data) {
-				if (Object.keys(data).length > 0) {
-					me.oSearchWidgetElmt.trigger("itop.search.criteria_enum.add_selected_values", data);
-				}
-			})
-			.fail(function (data) {
-				try {
-					console.error(data);
-				} catch (e) {
-				}
-			})
-		;
-
-		$('#dlg_'+me.id).dialog('close');
-
-		return false;
-	};
-
-
-	// Workaround for a ui.jquery limitation: if the content of
-	// the dialog contains many INPUTs, closing and opening the
-	// dialog is very slow. So empty it each time.
-	this.OnClose = function()
-	{
-		me.StopPendingRequest();
-		// called by the dialog, so in the context 'this' points to the jQueryObject
-		if (me.emptyOnClose)
-		{
-			$('#SearchResultsToAdd_'+me.id).html(me.emptyHtml);
-		}
-		$('#label_'+me.id).removeClass('dlg_loading');
-		$('#label_'+me.id).focus();
-		me.ajax_request = null;
-	};
-
-	this.DoSelectObjectClass = function()
-	{
-		// Retrieving selected value
-		var oSelectedClass = $('#ac_create_'+me.id+' select');
-		if(oSelectedClass.length !== 1) return;
-
-		// Setting new target class
-		me.sTargetClass = oSelectedClass.val();
-
-		// Opening real creation form
-		$('#ac_create_'+me.id).dialog('close');
-		me.CreateObject();
-	};
-
-	this.Update = function()
-	{
-		if ($('#'+me.id).prop('disabled'))
-		{
-			$('#v_'+me.id).html('');
-			$('#label_'+me.id).prop('disabled', 'disabled');
-			$('#label_'+me.id).css({'background': 'transparent'});
-			$('#mini_add_'+me.id).hide();
-			$('#mini_tree_'+me.id).hide();
-			$('#mini_search_'+me.id).hide();
-		}
-		else
-		{
-			$('#label_'+me.id).removeAttr('disabled');
-			$('#label_'+me.id).css({'background': '#fff url(../images/ac-background.gif) no-repeat right'});
-			$('#mini_add_'+me.id).show();
-			$('#mini_tree_'+me.id).show();
-			$('#mini_search_'+me.id).show();
-		}
-	};
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ *
+ * @param id String the dom identifier of the source input
+ * @param sTargetClass
+ * @param sAttCode
+ * @param oSearchWidgetElmt
+ * @param sFilter
+ * @param sTitle
+ * @constructor
+ */
+function SearchFormForeignKeys(id, sTargetClass, sAttCode, oSearchWidgetElmt, sFilter, sTitle)
+{
+	this.id = id;
+	//this.sOriginalTargetClass = sTargetClass;
+	this.sTargetClass = sTargetClass;
+	this.sFilter = sFilter;
+	this.sTitle = sTitle;
+	this.sAttCode = sAttCode;
+	this.oSearchWidgetElmt = oSearchWidgetElmt;
+	this.emptyHtml = ''; // content to be displayed when the search results are empty (when opening the dialog)
+	this.emptyOnClose = true; // Workaround for the JQuery dialog being very slow when opening and closing if the content contains many INPUT tags
+	this.ajax_request = null;
+	// this.bSelectMode = bSelectMode; // true if the edited field is a SELECT, false if it's an autocomplete
+	// this.bSearchMode = bSearchMode; // true if selecting a value in the context of a search form
+	var me = this;
+
+	this.Init = function()
+	{
+		// make sure that the form is clean
+		$('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; });
+		$('#'+this.id+'_btnRemove').prop('disabled', false);
+
+
+		$('<div id="dlg_'+me.id+'"></div>').appendTo(document.body);
+
+		// me.trace(dialog);
+
+		//TODO : check and remove all unneded code bellow this line!!
+
+		$('#'+this.id+'_linksToRemove').val('');
+
+		$('#linkedset_'+me.id).on('remove', function() {
+			// prevent having the dlg div twice
+			$('#dlg_'+me.id).remove();
+		});
+
+		$('#'+this.iInputId).closest('form').submit(function() {
+			return me.OnFormSubmit();
+		});
+	};
+
+	this.StopPendingRequest = function()
+	{
+		if (me.ajax_request)
+		{
+			me.ajax_request.abort();
+			me.ajax_request = null;
+		}
+	};
+
+	this.ShowModalSearchForeignKeys = function()
+	{
+		// // Query the server to get the form to search for target objects
+		// if (me.bSelectMode)
+		// {
+		// 	$('#fstatus_'+me.id).html('<img src="../images/indicator.gif" />');
+		// }
+		// else
+		// {
+		// 	$('#label_'+me.id).addClass('dlg_loading');
+		// }
+		$('#label_'+me.id).addClass('dlg_loading');
+		var theMap = {
+			sAttCode: me.sAttCode,
+			iInputId: me.id,
+			sTitle: me.sTitle,
+			sTargetClass: me.sTargetClass,
+			// bSearchMode: me.bSearchMode,
+			operation: 'ShowModalSearchForeignKeys'
+		};
+
+
+
+		// Make sure that we cancel any pending request before issuing another
+		// since responses may arrive in arbitrary order
+		me.StopPendingRequest();
+
+		// Run the query and get the result back directly in HTML
+		me.ajax_request = $.post( AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+			function(data)
+			{
+				// $('#dlg_'+me.id).html(data);
+				$('#dlg_'+me.id).empty().append($(data)); // $(data).filter(':not(script)'));
+				$('#dlg_'+me.id).dialog('open');
+				me.UpdateSizes();
+				me.UpdateButtons();
+				me.ajax_request = null;
+				me.ListResultsSearchForeignKeys();
+			},
+			'html'
+		);
+	};
+
+	this.UpdateSizes = function()
+	{
+		var dlg = $('#dlg_'+me.id);
+		// Adjust the dialog's size to fit into the screen
+		if (dlg.width() > ($(window).width()-40))
+		{
+			dlg.width($(window).width()-40);
+		}
+		if (dlg.height() > ($(window).height()-70))
+		{
+			dlg.height($(window).height()-70);
+		}
+		var searchForm = dlg.find('div.display_block:first'); // Top search form, enclosing display_block
+		var results = $('#SearchResultsToAdd_'+me.id);
+		var oPadding = {};
+		var aKeys = ['top', 'right', 'bottom', 'left'];
+		for(k in aKeys)
+		{
+			oPadding[aKeys[k]] = 0;
+			if (dlg.css('padding-'+aKeys[k]))
+			{
+				oPadding[aKeys[k]] = parseInt(dlg.css('padding-'+aKeys[k]).replace('px', ''));
+			}
+		}
+		//var width = dlg.innerWidth() - oPadding['right'] - oPadding['left'] - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
+		var height = dlg.innerHeight()-oPadding['top']-oPadding['bottom']-22;
+		var form_height = searchForm.outerHeight();
+		results.height(height - form_height - 40); // Leave some space for the buttons
+	};
+
+	this.UpdateButtons = function()
+	{
+		var okBtn = $('#btn_ok_'+me.id);
+		if ($('#count_'+me.id).val() > 0)
+		{
+			okBtn.removeAttr('disabled');
+		}
+		else
+		{
+			okBtn.prop('disabled', 'disabled');
+		}
+	};
+
+	/**
+	 * @return {boolean}
+	 */
+	this.ListResultsSearchForeignKeys = function ()
+	{
+		var theMap = {
+			sTargetClass: me.sTargetClass,
+			iInputId: me.id,
+			sFilter: me.sFilter
+			// bSearchMode: me.bSearchMode
+		};
+
+		// Gather the parameters from the search form
+		$('#fs_'+me.id+' :input').each( function() {
+			if (this.name !== '')
+			{
+				var val = $(this).val(); // supports multiselect as well
+				if (val !== null)
+				{
+					theMap[this.name] = val;
+				}
+			}
+		});
+
+
+
+		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
+		theMap.operation = 'ListResultsSearchForeignKeys'; // Override what is defined in the form itself
+		theMap.sAttCode = me.sAttCode;
+		var sSearchAreaId = '#SearchResultsToAdd_'+me.id;
+		//$(sSearchAreaId).html('<div style="text-align:center;width:100%;height:24px;vertical-align:middle;"><img src="../images/indicator.gif" /></div>');
+		$(sSearchAreaId).block();
+		me.UpdateButtons();
+
+		// Make sure that we cancel any pending request before issuing another
+		// since responses may arrive in arbitrary order
+		me.StopPendingRequest();
+
+		// Run the query and display the results
+		me.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php'), theMap,
+			function(data)
+			{
+				$(sSearchAreaId).html(data);
+				$(sSearchAreaId+' .listResults').tableHover();
+				$('#fr_'+me.id+' input:radio').click(function() { me.UpdateButtons(); });
+				me.UpdateButtons();
+				me.ajax_request = null;
+				$('#count_'+me.id).change(function(){
+					me.UpdateButtons();
+				});
+				me.UpdateSizes();
+			},
+			'html'
+		);
+
+		return false; // Don't submit the form, stay in the current page !
+	};
+
+	/**
+	 * @return {boolean}
+	 */
+	this.DoAddObjects = function () {
+		// Gather the parameters from the search form
+		var theMap = {};
+		var context = $('#SearchResultsToAdd_'+me.id);
+		var selectionMode = $(':input[name="selectionMode"]', context);
+		if (selectionMode.length > 0) {
+			// Paginated table retrieve the mode and the exceptions
+			theMap['selectionMode'] = (selectionMode.val() == 'negative') ? 'negative' : 'positive';
+			$('#fs_SearchFormToAdd_'+me.id+' :input').each(function () {
+				theMap[this.name] = this.value;
+			});
+
+			$(':input[name="storedSelection[]"]', context).each(function () {
+				if (typeof theMap[this.name] === "undefined") {
+					theMap[this.name] = [];
+				}
+				theMap[this.name].push(this.value);
+				$(this).remove(); // Remove the selection for the next time the dialog re-opens
+			});
+		}
+
+		// Normal table, retrieve all the checked check-boxes
+		$(':checked[name="selectObject[]"]', context).each(
+			function () {
+				if ((this.name !== '') && ((this.type !== 'checkbox') || (this.checked))) {
+					var arrayExpr = /\[\]$/;
+					if (arrayExpr.test(this.name)) {
+						// Array
+						if (typeof theMap[this.name] === "undefined") {
+							theMap[this.name] = [];
+						}
+						theMap[this.name].push(this.value);
+					}
+					else {
+						theMap[this.name] = this.value;
+					}
+				}
+				$(this).parents('tr:first').remove(); // Remove the whole line, so that, next time the dialog gets displayed it's no longer there
+			}
+		);
+		theMap["class"] = me.sTargetClass;
+		theMap['operation'] = 'GetFullListForeignKeysFromSelection';
+		$('#busy_'+me.iInputId).html('&nbsp;<img src="../images/indicator.gif"/>');
+		// Run the query and display the results
+		$.ajax(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {
+				"data": theMap,
+				"method": "POST"
+			})
+			.done(function (data) {
+				if (Object.keys(data).length > 0) {
+					me.oSearchWidgetElmt.trigger("itop.search.criteria_enum.add_selected_values", data);
+				}
+			})
+			.fail(function (data) {
+				try {
+					console.error(data);
+				} catch (e) {
+				}
+			})
+		;
+
+		$('#dlg_'+me.id).dialog('close');
+
+		return false;
+	};
+
+
+	// Workaround for a ui.jquery limitation: if the content of
+	// the dialog contains many INPUTs, closing and opening the
+	// dialog is very slow. So empty it each time.
+	this.OnClose = function()
+	{
+		me.StopPendingRequest();
+		// called by the dialog, so in the context 'this' points to the jQueryObject
+		if (me.emptyOnClose)
+		{
+			$('#SearchResultsToAdd_'+me.id).html(me.emptyHtml);
+		}
+		$('#label_'+me.id).removeClass('dlg_loading');
+		$('#label_'+me.id).focus();
+		me.ajax_request = null;
+	};
+
+	this.DoSelectObjectClass = function()
+	{
+		// Retrieving selected value
+		var oSelectedClass = $('#ac_create_'+me.id+' select');
+		if(oSelectedClass.length !== 1) return;
+
+		// Setting new target class
+		me.sTargetClass = oSelectedClass.val();
+
+		// Opening real creation form
+		$('#ac_create_'+me.id).dialog('close');
+		me.CreateObject();
+	};
+
+	this.Update = function()
+	{
+		if ($('#'+me.id).prop('disabled'))
+		{
+			$('#v_'+me.id).html('');
+			$('#label_'+me.id).prop('disabled', 'disabled');
+			$('#label_'+me.id).css({'background': 'transparent'});
+			$('#mini_add_'+me.id).hide();
+			$('#mini_tree_'+me.id).hide();
+			$('#mini_search_'+me.id).hide();
+		}
+		else
+		{
+			$('#label_'+me.id).removeAttr('disabled');
+			$('#label_'+me.id).css({'background': '#fff url(../images/ac-background.gif) no-repeat right'});
+			$('#mini_add_'+me.id).show();
+			$('#mini_tree_'+me.id).show();
+			$('#mini_search_'+me.id).show();
+		}
+	};
 }
\ No newline at end of file

From a37698a9def06030abc55e3f5c00f5bd7573ef87 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 17 Oct 2018 13:04:57 +0200
Subject: [PATCH 12/13] Fix regression introduced in commit 10b7fa6 (Web
 queries have issue with line breaks in cell value)

---
 core/spreadsheetbulkexport.class.inc.php | 1 -
 webservices/export-v2.php                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/spreadsheetbulkexport.class.inc.php b/core/spreadsheetbulkexport.class.inc.php
index f84695f83..cf96ac161 100644
--- a/core/spreadsheetbulkexport.class.inc.php
+++ b/core/spreadsheetbulkexport.class.inc.php
@@ -234,7 +234,6 @@ EOF
 			}
 		}
 		$sData = '';
-		$sData .= '<style>table br {mso-data-placement:same-cell;}</style>'; // Trick for Excel: keep line breaks inside the same cell !
 		$sData .= "<table border=\"1\">\n";
 		$sData .= "<tr>\n";
 		foreach($aData as $sLabel)
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index ef7a70fa6..ae5857aff 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -740,6 +740,7 @@ try
 			else
 			{
 				$oP = new WebPage('iTop export');
+                $oP->add_style("table br { mso-data-placement:same-cell; }"); // Trick for Excel: keep line breaks inside the same cell !
 			}
 			$oP->add_style("body { overflow: auto; }");
 		}

From 588899db6363306ff34ef7d633ff42f71d149ff8 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 18 Oct 2018 14:20:40 +0200
Subject: [PATCH 13/13] Convert all files from CrLf to Lf (preparing merge to
 develop)

---
 .../userrights/userrightsmatrix.class.inc.php |   736 +-
 .../userrights/userrightsnull.class.inc.php   |   156 +-
 .../userrightsprofile.class.inc.php           |  1740 +-
 .../userrightsprofile.db.class.inc.php        |  2182 +--
 .../userrightsprojection.class.inc.php        |  2506 +--
 application/ajaxwebpage.class.inc.php         |   782 +-
 application/application.inc.php               |    80 +-
 application/applicationextension.inc.php      |  2456 +--
 application/audit.category.class.inc.php      |   120 +-
 application/audit.rule.class.inc.php          |   128 +-
 application/capturewebpage.class.inc.php      |   168 +-
 application/clipage.class.inc.php             |   194 +-
 application/csvpage.class.inc.php             |   222 +-
 application/iotask.class.inc.php              |   138 +-
 application/itopwebpage.class.inc.php         |  2778 +--
 application/itopwizardwebpage.class.inc.php   |   114 +-
 application/loginwebpage.class.inc.php        |  1754 +-
 application/menunode.class.inc.php            |  2846 +--
 application/nicewebpage.class.inc.php         |   500 +-
 application/query.class.inc.php               |   282 +-
 application/shortcut.class.inc.php            |   676 +-
 application/template.class.inc.php            |   854 +-
 application/templates/audit_category.html     |    24 +-
 application/ui.linkswidget.class.inc.php      |  1216 +-
 application/uiwizard.class.inc.php            |   662 +-
 application/webpage.class.inc.php             |  2484 +--
 application/wizardhelper.class.inc.php        |   692 +-
 application/xmlpage.class.inc.php             |   212 +-
 core/MyHelpers.class.inc.php                  |  1056 +-
 core/action.class.inc.php                     |   854 +-
 core/apc-emulation.php                        |   666 +-
 core/archive.class.inc.php                    |   670 +-
 core/asynctask.class.inc.php                  |   770 +-
 core/attributedef.class.inc.php               | 16266 ++++++++--------
 core/background.inc.php                       |   110 +-
 core/backgroundprocess.inc.php                |   176 +-
 core/bulkchange.class.inc.php                 |  2700 +--
 core/cmdbchange.class.inc.php                 |   174 +-
 core/cmdbchangeop.class.inc.php               |  2084 +-
 core/cmdbobject.class.inc.php                 |  1388 +-
 core/cmdbsource.class.inc.php                 |  2428 +--
 core/computing.inc.php                        |   278 +-
 core/config.class.inc.php                     |  4200 ++--
 core/coreexception.class.inc.php              |   258 +-
 core/csvparser.class.inc.php                  |   542 +-
 core/data.generator.class.inc.php             |   748 +-
 core/dbobject.class.php                       |  7466 +++----
 core/dbobjectiterator.php                     |   126 +-
 core/dbobjectsearch.class.php                 |  4792 ++---
 core/dbobjectset.class.php                    |  3090 +--
 core/dbproperty.class.inc.php                 |   320 +-
 core/dbunionsearch.class.php                  |  1202 +-
 core/deletionplan.class.inc.php               |   596 +-
 core/designdocument.class.inc.php             |   564 +-
 core/email.class.inc.php                      |  1078 +-
 core/event.class.inc.php                      |   874 +-
 core/expression.class.inc.php                 |     8 +-
 core/expressioncache.class.inc.php            |   220 +-
 core/filterdef.class.inc.php                  |   424 +-
 core/kpi.class.inc.php                        |   794 +-
 core/metamodelmodifier.inc.php                |    64 +-
 core/modelreflection.class.inc.php            |   576 +-
 core/moduledesign.class.inc.php               |   238 +-
 core/modulehandler.class.inc.php              |    76 +-
 core/oql/build/build.cmd                      |    10 +-
 core/oql/oql-lexer.plex                       |   888 +-
 core/oql/oql-parser.y                         |   606 +-
 core/oql/oqlinterpreter.class.inc.php         |   224 +-
 core/oql/oqlquery.class.inc.php               |  1492 +-
 core/ormcustomfieldsvalue.class.inc.php       |   206 +-
 core/ormdocument.class.inc.php                |   396 +-
 core/ormlinkset.class.inc.php                 |  1498 +-
 core/ormpassword.class.inc.php                |   238 +-
 core/ormstopwatch.class.inc.php               |  1170 +-
 core/querymodifier.class.inc.php              |    68 +-
 core/restservices.class.inc.php               |  1554 +-
 core/sqlobjectquery.class.inc.php             |  1354 +-
 core/sqlquery.class.inc.php                   |   402 +-
 core/sqlunionquery.class.inc.php              |   416 +-
 core/stimulus.class.inc.php                   |   276 +-
 core/templatestring.class.inc.php             |   354 +-
 core/trigger.class.inc.php                    |   786 +-
 core/userrights.class.inc.php                 |  3680 ++--
 core/valuesetdef.class.inc.php                |   924 +-
 css/blue_green.css                            |   444 +-
 css/date.picker.css                           |   232 +-
 css/default.css                               |   330 +-
 css/font-combodo/glyphs/0.svg                 |    52 +-
 css/font-combodo/glyphs/1.svg                 |    26 +-
 css/font-combodo/glyphs/2.svg                 |    36 +-
 css/font-combodo/glyphs/3.svg                 |    34 +-
 css/font-combodo/glyphs/4.svg                 |    40 +-
 css/font-combodo/glyphs/C.svg                 |   130 +-
 css/font-combodo/glyphs/D.svg                 |    46 +-
 css/font-combodo/glyphs/I.svg                 |    72 +-
 css/font-combodo/test.html                    |   166 +-
 css/jqModal.css                               |    78 +-
 css/jquery-ui-timepicker-addon.css            |    58 +-
 css/jquery.tabs.css                           |   150 +-
 css/jquery.treeview.css                       |    90 +-
 css/light-grey.scss                           |  6464 +++---
 data/.htaccess                                |    26 +-
 data/index.php                                |     4 +-
 data/web.config                               |    14 +-
 .../en.dict.authent-external.php              |    96 +-
 .../fr.dict.authent-external.php              |    54 +-
 .../it.dict.authent-external.php              |    96 +-
 .../model.authent-external.php                |   180 +-
 .../module.authent-external.php               |   130 +-
 .../tr.dict.authent-external.php              |   100 +-
 .../zh.dict.authent-external.php              |    98 +-
 .../2.x/authent-ldap/en.dict.authent-ldap.php |   100 +-
 .../2.x/authent-ldap/fr.dict.authent-ldap.php |    58 +-
 .../2.x/authent-ldap/it.dict.authent-ldap.php |   100 +-
 .../2.x/authent-ldap/model.authent-ldap.php   |   412 +-
 .../2.x/authent-ldap/module.authent-ldap.php  |   130 +-
 .../2.x/authent-ldap/tr.dict.authent-ldap.php |   102 +-
 .../2.x/authent-ldap/zh.dict.authent-ldap.php |   102 +-
 .../authent-local/en.dict.authent-local.php   |   100 +-
 .../authent-local/fr.dict.authent-local.php   |    58 +-
 .../authent-local/it.dict.authent-local.php   |   100 +-
 .../2.x/authent-local/model.authent-local.php |   266 +-
 .../authent-local/module.authent-local.php    |    84 +-
 .../authent-local/tr.dict.authent-local.php   |   102 +-
 .../authent-local/zh.dict.authent-local.php   |   102 +-
 .../2.x/itop-attachments/ajax.attachment.php  |   224 +-
 .../en.dict.itop-attachments.php              |    84 +-
 .../2.x/itop-attachments/main.attachments.php |  1622 +-
 .../itop-attachments/module.attachments.php   |   294 +-
 .../nl.dict.itop-attachments.php              |    96 +-
 .../pt_br.dict.itop-attachments.php           |    84 +-
 .../2.x/itop-backup/dbrestore.class.inc.php   |   406 +-
 .../2.x/itop-backup/module.itop-backup.php    |   116 +-
 datamodels/2.x/itop-backup/status.php         |   796 +-
 ...ule.itop-bridge-virtualization-storage.php |    90 +-
 .../en.dict.itop-change-mgmt-itil.php         |   598 +-
 .../it.dict.itop-change-mgmt-itil.php         |   640 +-
 .../module.itop-change-mgmt-itil.php          |    88 +-
 .../pt_br.dict.itop-change-mgmt-itil.php      |   598 +-
 .../tr.dict.itop-change-mgmt-itil.php         |   742 +-
 .../zh.dict.itop-change-mgmt-itil.php         |   740 +-
 .../en.dict.itop-change-mgmt.php              |   290 +-
 .../module.itop-change-mgmt.php               |   186 +-
 .../nl.dict.itop-change-mgmt.php              |   296 +-
 .../pt_br.dict.itop-change-mgmt.php           |   284 +-
 .../en.dict.itop-config-mgmt.php              |  3794 ++--
 .../it.dict.itop-config-mgmt.php              |  2562 +--
 .../main.itop-config-mgmt.php                 |    50 +-
 .../module.itop-config-mgmt.php               |   234 +-
 .../nl.dict.itop-config-mgmt.php              |  3788 ++--
 .../pt_br.dict.itop-config-mgmt.php           |  3774 ++--
 .../tr.dict.itop-config-mgmt.php              |  3264 ++--
 .../zh.dict.itop-config-mgmt.php              |  3268 ++--
 datamodels/2.x/itop-config/config.php         |   664 +-
 datamodels/2.x/itop-config/js/ace.js          |    26 +-
 .../2.x/itop-config/js/ext-searchbox.js       |     8 +-
 .../2.x/itop-config/js/theme-eclipse.js       |     2 +-
 .../2.x/itop-config/license.itop-config.xml   |    68 +-
 .../2.x/itop-config/module.itop-config.php    |    82 +-
 .../datamodel.itop-full-itil.xml              |   148 +-
 .../itop-full-itil/module.itop-full-itil.php  |    94 +-
 .../en.dict.itop-incident-mgmt-itil.php       |   480 +-
 .../module.itop-incident-mgmt-itil.php        |    94 +-
 .../pt_br.dict.itop-incident-mgmt-itil.php    |   490 +-
 .../de.dict.itop-knownerror-mgmt.php          |   178 +-
 .../en.dict.itop-knownerror-mgmt.php          |   384 +-
 .../it.dict.itop-knownerror-mgmt.php          |   370 +-
 .../module.itop-knownerror-mgmt.php           |   172 +-
 .../nl.dict.itop-knownerror-mgmt.php          |   386 +-
 .../pt_br.dict.itop-knownerror-mgmt.php       |   386 +-
 .../tr.dict.itop-knownerror-mgmt.php          |   372 +-
 .../zh.dict.itop-knownerror-mgmt.php          |   372 +-
 .../module.itop-portal-base.php               |    84 +-
 .../abstractcontroller.class.inc.php          |    68 +-
 .../controllers/brickcontroller.class.inc.php |    58 +-
 .../browsebrickcontroller.class.inc.php       |  1508 +-
 .../createbrickcontroller.class.inc.php       |   188 +-
 .../defaultcontroller.class.inc.php           |   122 +-
 .../managebrickcontroller.class.inc.php       |  1892 +-
 .../objectcontroller.class.inc.php            |  3294 ++--
 .../userprofilebrickcontroller.class.inc.php  |   604 +-
 .../src/routers/abstractrouter.class.inc.php  |   274 +-
 .../routers/browsebrickrouter.class.inc.php   |   130 +-
 .../routers/createbrickrouter.class.inc.php   |    64 +-
 .../src/routers/defaultrouter.class.inc.php   |    78 +-
 .../routers/managebrickrouter.class.inc.php   |   136 +-
 .../src/routers/objectrouter.class.inc.php    |   232 +-
 .../userprofilebrickrouter.class.inc.php      |    74 +-
 .../js/TreeListFilter.js                      |   166 +-
 .../2.x/itop-portal/datamodel.itop-portal.xml |    28 +-
 .../2.x/itop-portal/module.itop-portal.php    |    74 +-
 .../en.dict.itop-problem-mgmt.php             |   316 +-
 .../it.dict.itop-problem-mgmt.php             |   274 +-
 .../module.itop-problem-mgmt.php              |    88 +-
 .../nl.dict.itop-problem-mgmt.php             |   340 +-
 .../pt_br.dict.itop-problem-mgmt.php          |   316 +-
 .../zh.dict.itop-problem-mgmt.php             |   354 +-
 .../module.itop-profiles-itil.php             |   128 +-
 .../en.dict.itop-request-mgmt-itil.php        |   534 +-
 .../module.itop-request-mgmt-itil.php         |    90 +-
 .../nl.dict.itop-request-mgmt-itil.php        |   534 +-
 .../pt_br.dict.itop-request-mgmt-itil.php     |   540 +-
 .../en.dict.itop-request-mgmt.php             |   594 +-
 .../module.itop-request-mgmt.php              |    90 +-
 .../nl.dict.itop-request-mgmt.php             |   602 +-
 .../pt_br.dict.itop-request-mgmt.php          |   594 +-
 .../en.dict.itop-service-mgmt-provider.php    |  1056 +-
 .../main.itop-service-mgmt-provider.php       |    40 +-
 .../module.itop-service-mgmt-provider.php     |   194 +-
 .../nl.dict.itop-service-mgmt-provider.php    |  1084 +-
 .../pt_br.dict.itop-service-mgmt-provider.php |  1070 +-
 .../en.dict.itop-service-mgmt.php             |  1056 +-
 .../it.dict.itop-service-mgmt.php             |  1240 +-
 .../main.itop-service-mgmt.php                |    40 +-
 .../module.itop-service-mgmt.php              |   188 +-
 .../pt_br.dict.itop-service-mgmt.php          |  1056 +-
 .../tr.dict.itop-service-mgmt.php             |  1220 +-
 .../zh.dict.itop-service-mgmt.php             |  1242 +-
 .../itop-tickets/data.struct.ta-actions.xml   |   136 +-
 .../2.x/itop-tickets/en.dict.itop-tickets.php |   512 +-
 .../2.x/itop-tickets/it.dict.itop-tickets.php |   436 +-
 .../2.x/itop-tickets/main.itop-tickets.php    |   570 +-
 .../2.x/itop-tickets/module.itop-tickets.php  |   144 +-
 .../2.x/itop-tickets/nl.dict.itop-tickets.php |   508 +-
 .../itop-tickets/pt_br.dict.itop-tickets.php  |   488 +-
 .../2.x/itop-tickets/zh.dict.itop-tickets.php |   536 +-
 .../main.itop-welcome-itil.php                |   122 +-
 .../module.itop-welcome-itil.php              |    96 +-
 dictionaries/da.dictionary.itop.core.php      |  5032 ++---
 dictionaries/da.dictionary.itop.ui.php        |  2266 +--
 dictionaries/en.dictionary.itop.core.php      |  1798 +-
 dictionaries/en.dictionary.itop.model.php     |    54 +-
 dictionaries/en.dictionary.itop.ui.php        |  3060 +--
 dictionaries/fr.dictionary.itop.core.php      |  1520 +-
 dictionaries/hu.dictionary.itop.core.php      |  1260 +-
 dictionaries/it.dictionary.itop.core.php      |  1756 +-
 dictionaries/it.dictionary.itop.ui.php        |  2496 +--
 dictionaries/ja.dictionary.itop.ui.php        |  2254 +--
 dictionaries/nl.dictionary.itop.core.php      |  1768 +-
 dictionaries/nl.dictionary.itop.ui.php        |  2632 +--
 dictionaries/pt_br.dictionary.itop.core.php   |  1754 +-
 dictionaries/pt_br.dictionary.itop.ui.php     |  2614 +--
 dictionaries/tr.dictionary.itop.core.php      |  1604 +-
 dictionaries/tr.dictionary.itop.ui.php        |  2548 +--
 dictionaries/zh.dictionary.itop.core.php      |  1602 +-
 dictionaries/zh.dictionary.itop.ui.php        |  2556 +--
 images/logo-itop-dark-bg.svg                  |   118 +-
 index.php                                     |    64 +-
 js/ajaxfileupload.js                          |   410 +-
 js/ckeditor/CHANGES.md                        |  2608 +--
 js/ckeditor/LICENSE.md                        |  2840 +--
 js/ckeditor/contents.css                      |   426 +-
 js/ckeditor/lang/de.js                        |     6 +-
 js/ckeditor/lang/en.js                        |     6 +-
 js/ckeditor/lang/es.js                        |     6 +-
 js/ckeditor/lang/fr.js                        |     6 +-
 js/ckeditor/lang/it.js                        |     6 +-
 js/ckeditor/lang/pt-br.js                     |     6 +-
 .../dialogs/lang/_translationstatus.txt       |    50 +-
 .../colordialog/dialogs/colordialog.css       |    40 +-
 .../plugins/confighelper/docs/install.html    |   248 +-
 .../plugins/confighelper/docs/styles.css      |   118 +-
 js/ckeditor/plugins/scayt/CHANGELOG.md        |    40 +-
 js/ckeditor/plugins/scayt/LICENSE.md          |    56 +-
 js/ckeditor/plugins/scayt/README.md           |    50 +-
 js/ckeditor/plugins/scayt/dialogs/dialog.css  |    46 +-
 js/ckeditor/plugins/scayt/dialogs/toolbar.css |   142 +-
 .../plugins/scayt/skins/moono-lisa/scayt.css  |    50 +-
 .../dialogs/lang/_translationstatus.txt       |    40 +-
 js/ckeditor/plugins/wsc/LICENSE.md            |    56 +-
 js/ckeditor/plugins/wsc/README.md             |    50 +-
 js/ckeditor/plugins/wsc/dialogs/ciframe.html  |   132 +-
 .../plugins/wsc/dialogs/tmpFrameset.html      |   104 +-
 js/ckeditor/plugins/wsc/dialogs/wsc.css       |   164 +-
 .../plugins/wsc/skins/moono-lisa/wsc.css      |    86 +-
 js/ckeditor/skins/flat/dialog.css             |     8 +-
 js/ckeditor/skins/flat/dialog_ie.css          |     8 +-
 js/ckeditor/skins/flat/dialog_ie7.css         |     8 +-
 js/ckeditor/skins/flat/dialog_ie8.css         |     8 +-
 js/ckeditor/skins/flat/dialog_iequirks.css    |     8 +-
 js/ckeditor/skins/flat/editor.css             |     8 +-
 js/ckeditor/skins/flat/editor_gecko.css       |     8 +-
 js/ckeditor/skins/flat/editor_ie.css          |     8 +-
 js/ckeditor/skins/flat/editor_ie7.css         |     8 +-
 js/ckeditor/skins/flat/editor_ie8.css         |     8 +-
 js/ckeditor/skins/flat/editor_iequirks.css    |     8 +-
 js/ckeditor/skins/flat/readme.md              |    16 +-
 js/ckeditor/styles.js                         |   278 +-
 js/forms-json-utils.js                        |  1024 +-
 js/jquery-migrate-1.4.1.min.js                |  1504 +-
 js/jquery-ui-timepicker-addon.js              |  4538 ++---
 js/jquery.layout.js                           | 11876 +++++------
 js/jquery.layout.min.js                       |   282 +-
 js/jquery.tablehover.js                       |   852 +-
 js/jquery.tablesorter.js                      |  2064 +-
 js/jquery.tablesorter.pager.js                |  1060 +-
 js/json.js                                    |   946 +-
 js/linkswidget.js                             |   942 +-
 js/themes/flora/flora.accordion.css           |    22 +-
 js/themes/flora/flora.all.css                 |    18 +-
 js/themes/flora/flora.calendar.css            |   334 +-
 js/themes/flora/flora.css                     |     2 +-
 js/themes/flora/flora.dialog.css              |   172 +-
 js/themes/flora/flora.resizable.css           |    38 +-
 js/themes/flora/flora.shadow.css              |    66 +-
 js/themes/flora/flora.slider.css              |    14 +-
 js/themes/flora/flora.tablesorter.css         |    80 +-
 js/utils.js                                   |  1434 +-
 js/wizard.utils.js                            |   294 +-
 js/wizardhelper.js                            |   522 +-
 license.txt                                   |  1322 +-
 log/.htaccess                                 |    26 +-
 log/index.php                                 |     4 +-
 log/web.config                                |    14 +-
 pages/UniversalSearch.php                     |   270 +-
 pages/audit.php                               |   868 +-
 pages/exec.php                                |   154 +-
 pages/graphviz.php                            |   326 +-
 pages/index.php                               |     6 +-
 pages/navigator.php                           |   162 +-
 pages/notifications.php                       |   210 +-
 pages/opensearch.xml.php                      |    90 +-
 pages/run_query.php                           |   550 +-
 pages/schema.php                              |  2242 +--
 portal/index.php                              |  2946 +--
 portal/readme.txt                             |   144 +-
 readme.txt                                    |    36 +-
 setup/ajax.dataloader.php                     |   364 +-
 setup/email.test.php                          |   570 +-
 setup/modulediscovery.class.inc.php           |  1064 +-
 setup/moduleinstallation.class.inc.php        |   204 +-
 setup/moduleinstaller.class.inc.php           |   454 +-
 setup/runtimeenv.class.inc.php                |  2496 +--
 setup/setuppage.class.inc.php                 |   610 +-
 setup/tar.php                                 |  4724 ++---
 setup/xmldataloader.class.inc.php             |   898 +-
 .../bssubformfieldrenderer.class.inc.php      |   136 +-
 .../console/consoleformrenderer.class.inc.php |    90 +-
 ...oleselectobjectfieldrenderer.class.inc.php |   506 +-
 .../consolesimplefieldrenderer.class.inc.php  |   776 +-
 .../consolesubformfieldrenderer.class.inc.php |   102 +-
 synchro/synchro_import.php                    |  1606 +-
 synchro/synchrodatasource.class.inc.php       |  5912 +++---
 test/GroupByAndFunctions.php                  |   684 +-
 test/ItopDataTestCase.php                     |  1152 +-
 test/ItopTestCase.php                         |   116 +-
 test/benchmark.php                            |  1742 +-
 test/config-test-farm.php                     |    76 +-
 test/core/DBObjectTest.php                    |   178 +-
 test/core/DBSearchTest.php                    |  1042 +-
 test/core/UserRightsTest.php                  |   472 +-
 test/core/apcEmulationTest.php                |   388 +-
 test/core/dictTest.php                        |   114 +-
 test/core/mockApcEmulation.incphp             |   102 +-
 test/core/mockDict.incphp                     |    50 +-
 test/core/ormLinkSetTest.php                  |   490 +-
 test/display_cache_content.php                |   208 +-
 test/itop-tickets/itopTicketTest.php          |  1856 +-
 test/phpunit.xml.dist                         |   128 +-
 test/test.php                                 |   338 +-
 test/unittestautoload.php                     |    12 +-
 web.config                                    |    30 +-
 webservices/backoffice.dataloader.php         |   340 +-
 webservices/cron.cmd                          |    36 +-
 webservices/cron.distrib                      |    10 +-
 webservices/export.php                        |   730 +-
 webservices/import.php                        |  1818 +-
 webservices/itoprest.examples.php             |   638 +-
 webservices/itopsoap.examples.php             |   290 +-
 webservices/itopsoaptypes.class.inc.php       |   376 +-
 webservices/rest.php                          |   582 +-
 webservices/soapserver.php                    |   218 +-
 webservices/webservices.basic.php             |   590 +-
 webservices/webservices.class.inc.php         |  1188 +-
 374 files changed, 147179 insertions(+), 147179 deletions(-)

diff --git a/addons/userrights/userrightsmatrix.class.inc.php b/addons/userrights/userrightsmatrix.class.inc.php
index f8e05ba2a..f9949477a 100644
--- a/addons/userrights/userrightsmatrix.class.inc.php
+++ b/addons/userrights/userrightsmatrix.class.inc.php
@@ -1,368 +1,368 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsMatrix (User management Module)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class UserRightsMatrixClassGrant extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_ur_matrixclasses",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-}
-
-class UserRightsMatrixClassStimulusGrant extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_ur_matrixclassesstimulus",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-}
-
-class UserRightsMatrixAttributeGrant extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_ur_matrixattributes",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-}
-
-
-
-
-class UserRightsMatrix extends UserRightsAddOnAPI
-{
-	static public $m_aActionCodes = array(
-		UR_ACTION_READ => 'read',
-		UR_ACTION_MODIFY => 'modify',
-		UR_ACTION_DELETE => 'delete',
-		UR_ACTION_BULK_READ => 'bulk read',
-		UR_ACTION_BULK_MODIFY => 'bulk modify',
-		UR_ACTION_BULK_DELETE => 'bulk delete',
-	);
-
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		// Maybe we should check that no other user with userid == 0 exists
-		$oUser = new UserLocal();
-		$oUser->Set('login', $sAdminUser);
-		$oUser->Set('password', $sAdminPwd);
-		$oUser->Set('contactid', 1); // one is for root !
-		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
-
-		// Create a change to record the history of the User object
-		$oChange = MetaModel::NewObject("CMDBChange");
-		$oChange->Set("date", time());
-		$oChange->Set("userinfo", "Initialization");
-		$iChangeId = $oChange->DBInsert();
-
-		// Now record the admin user object
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		$this->SetupUser($iUserId, true);
-		return true;
-	}
-
-	public function IsAdministrator($oUser)
-	{
-		return ($oUser->GetKey() == 1);
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		return ($oUser->GetKey() == 1);
-	}
-
-	// Deprecated - create a new module !
-	public function Setup()
-	{
-		// Users must be added manually
-		// This procedure will then update the matrix when a new user is found or a new class/attribute appears
-		$oUserSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT User"));
-		while ($oUser = $oUserSet->Fetch())
-		{
-			$this->SetupUser($oUser->GetKey());
-		}
-		return true;
-	}
-
-	protected function SetupUser($iUserId, $bNewUser = false)
-	{
-		foreach(array('bizmodel', 'application', 'gui', 'core/cmdb') as $sCategory)
-		{
-			foreach (MetaModel::GetClasses($sCategory) as $sClass)
-			{
-				foreach (self::$m_aActionCodes as $iActionCode => $sAction)
-				{
-					if ($bNewUser)
-					{
-						$bAddCell = true;
-					}
-					else
-					{
-						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = $iUserId"));
-						$bAddCell = ($oSet->Count() < 1);
-					}
-					if ($bAddCell)
-					{
-						// Create a new entry
-						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassGrant");
-						$oMyClassGrant->Set("userid", $iUserId);
-						$oMyClassGrant->Set("class", $sClass);
-						$oMyClassGrant->Set("action", $sAction);
-						$oMyClassGrant->Set("permission", "yes");
-						$iId = $oMyClassGrant->DBInsertNoReload();
-					}
-				}
-				foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
-				{
-					if ($bNewUser)
-					{
-						$bAddCell = true;
-					}
-					else
-					{
-						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = $iUserId"));
-						$bAddCell = ($oSet->Count() < 1);
-					}
-					if ($bAddCell)
-					{
-						// Create a new entry
-						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassStimulusGrant");
-						$oMyClassGrant->Set("userid", $iUserId);
-						$oMyClassGrant->Set("class", $sClass);
-						$oMyClassGrant->Set("stimulus", $sStimulusCode);
-						$oMyClassGrant->Set("permission", "yes");
-						$iId = $oMyClassGrant->DBInsertNoReload();
-					}
-				}
-				foreach (MetaModel::GetAttributesList($sClass) as $sAttCode)
-				{
-					if ($bNewUser)
-					{
-						$bAddCell = true;
-					}
-					else
-					{
-						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND userid = $iUserId"));
-						$bAddCell = ($oSet->Count() < 1);
-					}
-					if ($bAddCell)
-					{
-						foreach (array('read', 'modify') as $sAction)
-						{
-							// Create a new entry
-							$oMyAttGrant = MetaModel::NewObject("UserRightsMatrixAttributeGrant");
-							$oMyAttGrant->Set("userid", $iUserId);
-							$oMyAttGrant->Set("class", $sClass);
-							$oMyAttGrant->Set("attcode", $sAttCode);
-							$oMyAttGrant->Set("action", $sAction);
-							$oMyAttGrant->Set("permission", "yes");
-							$iId = $oMyAttGrant->DBInsertNoReload();
-						}
-					}
-				}
-			}
-		}
-		/*
-		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
-		if ($bNewUser)
-		{
-			$bAddMenu = true;
-		}
-		else
-		{
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT menuNode WHERE type = 'user' AND parent_id = 0 AND user_id = $iUserId"));
-			$bAddMenu = ($oSet->Count() < 1);
-		}
-		if ($bAddMenu)
-		{
-			$oMenu = MetaModel::NewObject('menuNode');
-			$oMenu->Set('type', 'user');
-			$oMenu->Set('parent_id', 0);	// It's a toplevel entry
-			$oMenu->Set('rank', 6);			// Located just above the Admin Tools section (=7)
-			$oMenu->Set('name', 'My Bookmarks');
-			$oMenu->Set('label', 'My Favorite Items');
-			$oMenu->Set('hyperlink', 'UI.php');
-			$oMenu->Set('template', '<p></p><p></p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:32px;">My bookmarks</p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:14px;"><i>This section contains my most favorite search results</i></p>');
-			$oMenu->Set('user_id', $iUserId);
-			$oMenu->DBInsert();
-		}
-		*/
-	}
-
-
-	public function Init()
-	{
-		// Could be loaded in a shared memory (?)
-		return true;
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$oNullFilter  = new DBObjectSearch($sClass);
-		return $oNullFilter;
-	}
-
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
-		{
-			return UR_ALLOWED_NO;
-		}
-		$sAction = self::$m_aActionCodes[$iActionCode];
-
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
-		if ($oSet->Count() < 1)
-		{
-			return UR_ALLOWED_NO;
-		}
-
-		$oGrantRecord = $oSet->Fetch();
-		switch ($oGrantRecord->Get('permission'))
-		{
-			case 'yes':
-				$iRetCode = UR_ALLOWED_YES;
-				break;
-			case 'no':
-			default:
-				$iRetCode = UR_ALLOWED_NO;
-				break;
-		}
-		return $iRetCode;
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
-		{
-			return UR_ALLOWED_NO;
-		}
-		$sAction = self::$m_aActionCodes[$iActionCode];
-
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
-		if ($oSet->Count() < 1)
-		{
-			return UR_ALLOWED_NO;
-		}
-
-		$oGrantRecord = $oSet->Fetch();
-		switch ($oGrantRecord->Get('permission'))
-		{
-			case 'yes':
-				$iRetCode = UR_ALLOWED_YES;
-				break;
-			case 'no':
-			default:
-				$iRetCode = UR_ALLOWED_NO;
-				break;
-		}
-		return $iRetCode;
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
-		if ($oSet->Count() < 1)
-		{
-			return UR_ALLOWED_NO;
-		}
-
-		$oGrantRecord = $oSet->Fetch();
-		switch ($oGrantRecord->Get('permission'))
-		{
-			case 'yes':
-				$iRetCode = UR_ALLOWED_YES;
-				break;
-			case 'no':
-			default:
-				$iRetCode = UR_ALLOWED_NO;
-				break;
-		}
-		return $iRetCode;
-	}
-
-	public function FlushPrivileges()
-	{
-	}
-}
-
-UserRights::SelectModule('UserRightsMatrix');
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsMatrix (User management Module)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserRightsMatrixClassGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclasses",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+class UserRightsMatrixClassStimulusGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixclassesstimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+class UserRightsMatrixAttributeGrant extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_ur_matrixattributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("login", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+		MetaModel::Init_AddAttribute(new AttributeString("class", array("allowed_values"=>null, "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+
+
+
+class UserRightsMatrix extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'read',
+		UR_ACTION_MODIFY => 'modify',
+		UR_ACTION_DELETE => 'delete',
+		UR_ACTION_BULK_READ => 'bulk read',
+		UR_ACTION_BULK_MODIFY => 'bulk modify',
+		UR_ACTION_BULK_DELETE => 'bulk delete',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		// Maybe we should check that no other user with userid == 0 exists
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		$oUser->Set('contactid', 1); // one is for root !
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+
+		// Create a change to record the history of the User object
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
+
+		// Now record the admin user object
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		$this->SetupUser($iUserId, true);
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return ($oUser->GetKey() == 1);
+	}
+
+	// Deprecated - create a new module !
+	public function Setup()
+	{
+		// Users must be added manually
+		// This procedure will then update the matrix when a new user is found or a new class/attribute appears
+		$oUserSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT User"));
+		while ($oUser = $oUserSet->Fetch())
+		{
+			$this->SetupUser($oUser->GetKey());
+		}
+		return true;
+	}
+
+	protected function SetupUser($iUserId, $bNewUser = false)
+	{
+		foreach(array('bizmodel', 'application', 'gui', 'core/cmdb') as $sCategory)
+		{
+			foreach (MetaModel::GetClasses($sCategory) as $sClass)
+			{
+				foreach (self::$m_aActionCodes as $iActionCode => $sAction)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("action", $sAction);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						// Create a new entry
+						$oMyClassGrant = MetaModel::NewObject("UserRightsMatrixClassStimulusGrant");
+						$oMyClassGrant->Set("userid", $iUserId);
+						$oMyClassGrant->Set("class", $sClass);
+						$oMyClassGrant->Set("stimulus", $sStimulusCode);
+						$oMyClassGrant->Set("permission", "yes");
+						$iId = $oMyClassGrant->DBInsertNoReload();
+					}
+				}
+				foreach (MetaModel::GetAttributesList($sClass) as $sAttCode)
+				{
+					if ($bNewUser)
+					{
+						$bAddCell = true;
+					}
+					else
+					{
+						$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND userid = $iUserId"));
+						$bAddCell = ($oSet->Count() < 1);
+					}
+					if ($bAddCell)
+					{
+						foreach (array('read', 'modify') as $sAction)
+						{
+							// Create a new entry
+							$oMyAttGrant = MetaModel::NewObject("UserRightsMatrixAttributeGrant");
+							$oMyAttGrant->Set("userid", $iUserId);
+							$oMyAttGrant->Set("class", $sClass);
+							$oMyAttGrant->Set("attcode", $sAttCode);
+							$oMyAttGrant->Set("action", $sAction);
+							$oMyAttGrant->Set("permission", "yes");
+							$iId = $oMyAttGrant->DBInsertNoReload();
+						}
+					}
+				}
+			}
+		}
+		/*
+		// Create the "My Bookmarks" menu item (parent_id = 0, rank = 6)
+		if ($bNewUser)
+		{
+			$bAddMenu = true;
+		}
+		else
+		{
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT menuNode WHERE type = 'user' AND parent_id = 0 AND user_id = $iUserId"));
+			$bAddMenu = ($oSet->Count() < 1);
+		}
+		if ($bAddMenu)
+		{
+			$oMenu = MetaModel::NewObject('menuNode');
+			$oMenu->Set('type', 'user');
+			$oMenu->Set('parent_id', 0);	// It's a toplevel entry
+			$oMenu->Set('rank', 6);			// Located just above the Admin Tools section (=7)
+			$oMenu->Set('name', 'My Bookmarks');
+			$oMenu->Set('label', 'My Favorite Items');
+			$oMenu->Set('hyperlink', 'UI.php');
+			$oMenu->Set('template', '<p></p><p></p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:32px;">My bookmarks</p><p style="text-align:center; font-family:Georgia, Times, serif; font-size:14px;"><i>This section contains my most favorite search results</i></p>');
+			$oMenu->Set('user_id', $iUserId);
+			$oMenu->DBInsert();
+		}
+		*/
+	}
+
+
+	public function Init()
+	{
+		// Could be loaded in a shared memory (?)
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassGrant WHERE class = '$sClass' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		if (!array_key_exists($iActionCode, self::$m_aActionCodes))
+		{
+			return UR_ALLOWED_NO;
+		}
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixAttributeGrant WHERE class = '$sClass' AND attcode = '$sAttCode' AND action = '$sAction' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT UserRightsMatrixClassStimulusGrant WHERE class = '$sClass' AND stimulus = '$sStimulusCode' AND userid = '{$oUser->GetKey()}'"));
+		if ($oSet->Count() < 1)
+		{
+			return UR_ALLOWED_NO;
+		}
+
+		$oGrantRecord = $oSet->Fetch();
+		switch ($oGrantRecord->Get('permission'))
+		{
+			case 'yes':
+				$iRetCode = UR_ALLOWED_YES;
+				break;
+			case 'no':
+			default:
+				$iRetCode = UR_ALLOWED_NO;
+				break;
+		}
+		return $iRetCode;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsMatrix');
+
+?>
diff --git a/addons/userrights/userrightsnull.class.inc.php b/addons/userrights/userrightsnull.class.inc.php
index 1549456c8..a94aa1d9e 100644
--- a/addons/userrights/userrightsnull.class.inc.php
+++ b/addons/userrights/userrightsnull.class.inc.php
@@ -1,78 +1,78 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsNull
- * User management Module - say Yeah! to everything
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class UserRightsNull extends UserRightsAddOnAPI
-{
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		return true;
-	}
-
-	public function IsAdministrator($oUser)
-	{
-		return true;
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		return true;
-	}
-
-	public function Init()
-	{
-		return true;
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$oNullFilter  = new DBObjectSearch($sClass);
-		return $oNullFilter;
-	}
-
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		return UR_ALLOWED_YES;
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		return UR_ALLOWED_YES;
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		return UR_ALLOWED_YES;
-	}
-
-	public function FlushPrivileges()
-	{
-	}
-}
-
-UserRights::SelectModule('UserRightsNull');
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsNull
+ * User management Module - say Yeah! to everything
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UserRightsNull extends UserRightsAddOnAPI
+{
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		return true;
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return true;
+	}
+
+	public function Init()
+	{
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$oNullFilter  = new DBObjectSearch($sClass);
+		return $oNullFilter;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		return UR_ALLOWED_YES;
+	}
+
+	public function FlushPrivileges()
+	{
+	}
+}
+
+UserRights::SelectModule('UserRightsNull');
+
+?>
diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php
index cf943fb5d..a4cee533f 100644
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -1,870 +1,870 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsProfile
- * User management Module, basing the right on profiles and a matrix (similar to UserRightsMatrix, but profiles and other decorations have been added) 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-define('ADMIN_PROFILE_NAME', 'Administrator');
-define('PORTAL_PROFILE_NAME', 'Portal user');
-
-class UserRightsBaseClassGUI extends cmdbAbstractObject
-{
-	// Whenever something changes, reload the privileges
-	
-	protected function AfterInsert()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterUpdate()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterDelete()
-	{
-		UserRights::FlushPrivileges();
-	}
-}
-
-
-class URP_Profiles extends UserRightsBaseClassGUI
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_profiles",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name','description'));
-	}
-
-	protected static $m_aCacheProfiles = null;
-	
-	public static function DoCreateProfile($sName, $sDescription)
-	{
-		if (is_null(self::$m_aCacheProfiles))
-		{
-			self::$m_aCacheProfiles = array();
-			$oFilterAll = new DBObjectSearch('URP_Profiles');
-			$oSet = new DBObjectSet($oFilterAll);
-			while ($oProfile = $oSet->Fetch())
-			{
-				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
-			}
-		}	
-
-		$sCacheKey = $sName;
-		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
-		{
-			return self::$m_aCacheProfiles[$sCacheKey];
-		}
-		$oNewObj = MetaModel::NewObject("URP_Profiles");
-		$oNewObj->Set('name', $sName);
-		$oNewObj->Set('description', $sDescription);
-		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
-		return $iId;
-	}
-	
-	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
-	{
-		$bGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
-		if (is_null($bGrant))
-		{
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-		}
-		elseif ($bGrant)
-		{
-			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
-		}
-		else
-		{
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-		}
-	}
-	
-	function DoShowGrantSumary($oPage)
-	{
-		if ($this->GetRawName() == "Administrator")
-		{
-			// Looks dirty, but ok that's THE ONE
-			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
-			return;
-		}
-
-		// Note: for sure, we assume that the instance is derived from UserRightsProfile
-		$oUserRights = UserRights::GetModuleInstance();
-	
-		$aDisplayData = array();
-		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass)
-		{
-			$aStimuli = array();
-			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
-			{
-				$bGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
-				if ($bGrant === true)
-				{ 
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
-				}
-			}
-			$sStimuli = implode(', ', $aStimuli);
-			
-			$aDisplayData[] = array(
-				'class' => MetaModel::GetName($sClass),
-				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'r'),
-				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'br'),
-				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'w'),
-				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'bw'),
-				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'd'),
-				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'bd'),
-				'stimuli' => $sStimuli,
-			);
-		}
-	
-		$aDisplayConfig = array();
-		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
-		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
-		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
-		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
-		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
-		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
-		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
-		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
-		$oPage->table($aDisplayConfig, $aDisplayData);
-	}
-
-	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage);
-		}
-	}
-
-	public static function GetReadOnlyAttributes()
-	{
-		return array('name', 'description');
-	}
-
-
-	// returns an array of id => array of column => php value(so-called "real value")
-	public static function GetPredefinedObjects()
-	{
-		return ProfilesConfig::GetProfilesValues();
-	}
-
-	// Before deleting a profile,
-	// preserve DB integrity by deleting links to users
-	protected function OnDelete()
-	{
-		// Don't remove admin profile
-		if ($this->Get('name') === ADMIN_PROFILE_NAME)
-		{
-			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
-		}
-
-		// Note: this may break the rule that says: "a user must have at least ONE profile" !
-		$oLnkSet = $this->Get('user_list');
-		while($oLnk = $oLnkSet->Fetch())
-		{
-			$oLnk->DBDelete();
-		}
-	}
-
-	/**
-	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
-	 * for the given attribute in the current state of the object
-	 * @param $sAttCode string $sAttCode The code of the attribute
-	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
-	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
-	 * @return integer Flags: the binary combination of the flags applicable to this attribute
-	 */	 	  	 	
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			$aReasons[] = 'Sorry, profiles are read-only in the demonstration mode!';
-			$iFlags |= OPT_ATT_READONLY;
-		}
-		return $iFlags;
-	}
-}
-
-
-
-class URP_UserProfile extends UserRightsBaseClassGUI
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "userid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_userprofile",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
-	}
-
-	public function GetName()
-	{
-		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
-	}
-
-	public function CheckToDelete(&$oDeletionPlan)
-	{
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			// Users deletion is NOT allowed in demo mode
-			$oDeletionPlan->AddToDelete($this, null);
-			$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
-			$oDeletionPlan->ComputeResults();
-			return false;
-		}
-		return parent::CheckToDelete($oDeletionPlan);
-	}
-
-	protected function OnInsert()
-	{
-		$this->CheckIfProfileIsAllowed(UR_ACTION_CREATE);
-	}
-
-	protected function OnUpdate()
-	{
-		$this->CheckIfProfileIsAllowed(UR_ACTION_MODIFY);
-	}
-
-	protected function OnDelete()
-	{
-		$this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
-	}
-
-	/**
-	 * @param $iActionCode
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \SecurityException
-	 */
-	protected function CheckIfProfileIsAllowed($iActionCode)
-	{
-		// When initializing or admin, we need to let everything pass trough
-		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
-
-		// Only administrators can manage administrators
-		$iOrigUserId = $this->GetOriginal('userid');
-		if (!empty($iOrigUserId))
-		{
-			$oUser = MetaModel::GetObject('User', $iOrigUserId, true, true);
-			if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
-			{
-				throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
-			}
-		}
-		$oUser = MetaModel::GetObject('User', $this->Get('userid'), true, true);
-		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
-		{
-			throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
-		}
-		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, DBObjectSet::FromObject($this)))
-		{
-			throw new SecurityException(Dict::Format('UI:Error:ObjectCannotBeUpdated'));
-		}
-		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME))
-		{
-			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
-		}
-	}
-
-}
-
-class URP_UserOrg extends UserRightsBaseClassGUI
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "userid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_userorg",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", array("targetclass"=>"Organization", "jointype"=> "", "allowed_values"=>null, "sql"=>"allowed_org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", array("allowed_values"=>null, "extkey_attcode"=> 'allowed_org_id', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"reason", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'allowed_org_id', 'reason')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('allowed_org_id', 'reason')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
-	}
-
-	public function GetName()
-	{
-		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
-	}
-
-
-	protected function OnInsert()
-	{
-		$this->CheckIfOrgIsAllowed();
-	}
-
-	protected function OnUpdate()
-	{
-		$this->CheckIfOrgIsAllowed();
-	}
-
-	protected function OnDelete()
-	{
-		$this->CheckIfOrgIsAllowed();
-	}
-
-	/**
-	 * @throws \CoreException
-	 */
-	protected function CheckIfOrgIsAllowed()
-	{
-		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
-
-		$oUser = UserRights::GetUserObject();		
-		$oAddon = UserRights::GetModuleInstance();
-		$aOrgs = $oAddon->GetUserOrgs($oUser, '');
-		if (count($aOrgs) > 0)
-		{
-			$iOrigOrgId = $this->GetOriginal('allowed_org_id');
-			if ((!empty($iOrigOrgId) && !in_array($iOrigOrgId, $aOrgs)) || !in_array($this->Get('allowed_org_id'), $aOrgs))
-			{
-				throw new SecurityException(Dict::Format('Class:User/Error:OrganizationNotAllowed'));
-			}
-		}
-	}
-}
-
-
-
-
-class UserRightsProfile extends UserRightsAddOnAPI
-{
-	static public $m_aActionCodes = array(
-		UR_ACTION_READ => 'r',
-		UR_ACTION_MODIFY => 'w',
-		UR_ACTION_DELETE => 'd',
-		UR_ACTION_BULK_READ => 'br',
-		UR_ACTION_BULK_MODIFY => 'bw',
-		UR_ACTION_BULK_DELETE => 'bd',
-	);
-
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		CMDBObject::SetTrackInfo('Initialization');
-
-		$oChange = CMDBObject::GetCurrentChange();
-
-		$iContactId = 0;
-		// Support drastic data model changes: no organization class (or not writable)!
-		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
-		{
-			$oOrg = new Organization();
-			$oOrg->Set('name', 'My Company/Department');
-			$oOrg->Set('code', 'SOMECODE');
-			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
-
-			// Support drastic data model changes: no Person class  (or not writable)!
-			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
-			{
-				$oContact = new Person();
-				$oContact->Set('name', 'My last name');
-				$oContact->Set('first_name', 'My first name');
-				if (MetaModel::IsValidAttCode('Person', 'org_id'))
-				{
-					$oContact->Set('org_id', $iOrgId);
-				}
-				if (MetaModel::IsValidAttCode('Person', 'phone'))
-				{
-					$oContact->Set('phone', '+00 000 000 000');
-				}
-				$oContact->Set('email', 'my.email@foo.org');
-				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
-			}
-		}
-
-
-		$oUser = new UserLocal();
-		$oUser->Set('login', $sAdminUser);
-		$oUser->Set('password', $sAdminPwd);
-		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
-		{
-			$oUser->Set('contactid', $iContactId);
-		}
-		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
-
-		// Add this user to the very specific 'admin' profile
-		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => ADMIN_PROFILE_NAME), true /*all data*/);
-		if (is_object($oAdminProfile))
-		{
-			$oUserProfile = new URP_UserProfile();
-			//$oUserProfile->Set('userid', $iUserId);
-			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
-			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
-			$oSet = DBObjectSet::FromObject($oUserProfile);
-			$oUser->Set('profile_list', $oSet);
-		}
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		return true;
-	}
-
-	public function Init()
-	{
-	}
-
-	protected $m_aUserOrgs = array(); // userid -> array of orgid
-
-	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
-	protected $m_aObjectActionGrants = array();
-
-	/**
-	 * Read and cache organizations allowed to the given user
-	 *
-	 * @param $oUser
-	 * @param $sClass (not used here but can be used in overloads)
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public function GetUserOrgs($oUser, $sClass)
-	{
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aUserOrgs))
-		{
-			$this->m_aUserOrgs[$iUser] = array();
-
-			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
-			if ($sHierarchicalKeyCode !== false)
-			{
-				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
-				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), array(), array('userid' => $iUser));
-				while ($aRow = $oUserOrgSet->FetchAssoc())
-				{
-					$oOrg = $aRow['Org'];
-					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
-				}
-			}
-			else
-			{
-				$oSearch = new DBObjectSearch('URP_UserOrg');
-				$oSearch->AllowAllData();
-				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
-				$oSearch->AddConditionExpression($oCondition);
-				
-				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
-				while ($oUserOrg = $oUserOrgSet->Fetch())
-				{
-					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
-				}
-			}
-		}
-		return $this->m_aUserOrgs[$iUser];
-	}
-
-	public function ResetCache()
-	{
-		// Loaded by Load cache
-		$this->m_aUserOrgs = array();
-
-		// Cache
-		$this->m_aObjectActionGrants = array();
-	}
-
-	public function LoadCache()
-	{
-		static $bSharedObjectInitialized = false;
-		if (!$bSharedObjectInitialized)
-		{
-			$bSharedObjectInitialized = true;
-			if (self::HasSharing())
-			{
-				SharedObject::InitSharedClassProperties();
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @param $oUser User
-	 * @return array
-	 */
-	public function IsAdministrator($oUser)
-	{
-		// UserRights caches the list for us
-		return UserRights::HasProfile(ADMIN_PROFILE_NAME, $oUser);
-	}
-
-	/**
-	 * @param $oUser User
-	 * @return array
-	 */
-	public function IsPortalUser($oUser)
-	{
-		// UserRights caches the list for us
-		return UserRights::HasProfile(PORTAL_PROFILE_NAME, $oUser);
-	}
-	/**
-	 * @param $oUser User
-	 * @return bool
-	 */
-	public function ListProfiles($oUser)
-	{
-		$aRet = array();
-		$oSearch = new DBObjectSearch('URP_UserProfile');
-		$oSearch->AllowAllData();
-		$oSearch->NoContextParameters();
-		$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
-		$oProfiles = new DBObjectSet($oSearch);
-		while ($oUserProfile = $oProfiles->Fetch())
-		{
-			$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
-		}
-		return $aRet;
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$this->LoadCache();
-
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
-		if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
-		{
-			return false;
-		}
-
-		// Determine how to position the objects of this class
-		//
-		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
-		if (is_null($sAttCode))
-		{
-			// No filtering for this object
-			return true;
-		}
-		// Position the user
-		//
-		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-		if (count($aUserOrgs) == 0)
-		{
-			// No org means 'any org'
-			return true;
-		}
-
-		return $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
-	}
-
-
-	// This verb has been made public to allow the development of an accurate feedback for the current configuration
-	public function GetProfileActionGrant($iProfile, $sClass, $sAction)
-	{
-		// Note: action is forced lowercase to be more flexible (historical bug)
-		$sAction = strtolower($sAction);
-
-		return ProfilesConfig::GetProfileActionGrant($iProfile, $sClass, $sAction);
-	}
-
-	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
-	{
-		$this->LoadCache();
-
-		// load and cache permissions for the current user on the given class
-		//
-		$iUser = $oUser->GetKey();
-		$aTest = @$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
-		if (is_array($aTest)) return $aTest;
-
-		$sAction = self::$m_aActionCodes[$iActionCode];
-
-		$bStatus = null;
-		// Call the API of UserRights because it caches the list for us
-		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
-		{
-			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
-			if (!is_null($bGrant))
-			{
-				if ($bGrant)
-				{
-					if (is_null($bStatus))
-					{
-						$bStatus = true;
-					}
-				}
-				else
-				{
-					$bStatus = false;
-				}
-			}
-		}
-
-		$iPermission = $bStatus ? UR_ALLOWED_YES : UR_ALLOWED_NO;
-
-		$aRes = array(
-			'permission' => $iPermission,
-		);
-		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
-		return $aRes;
-	}
-
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		$this->LoadCache();
-
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
-		$iPermission = $aObjectPermissions['permission'];
-
-		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
-		//       and acceptable to consider only the root class of the object set
-
-		if ($iPermission != UR_ALLOWED_YES)
-		{
-			// It is already NO for everyone... that's the final word!
-		}
-		elseif ($iActionCode == UR_ACTION_READ)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
-		elseif ($iActionCode == UR_ACTION_BULK_READ)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
-		elseif ($oInstanceSet)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-			// We have to answer NO for objects shared for reading purposes
-			if (self::HasSharing())
-			{
-				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
-				if ($aClassProps)
-				{
-					// This class is shared, GetSelectFilter may allow some objects for read only
-					// But currently we are checking wether the objects might be written...
-					// Let's exclude the objects based on the relevant criteria
-
-					$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
-					if (!is_null($sOrgAttCode))
-					{
-						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
-						{
-							$iCountNO = 0;
-							$iCountYES = 0;
-							$oInstanceSet->Rewind();
-							while($oObject = $oInstanceSet->Fetch())
-							{
-								$iOrg = $oObject->Get($sOrgAttCode);
-								if (in_array($iOrg, $aUserOrgs))
-								{
-									$iCountYES++;
-								}
-								else
-								{
-									$iCountNO++;
-								}
-							}
-							if ($iCountNO == 0)
-							{
-								$iPermission = UR_ALLOWED_YES;
-							}
-							elseif ($iCountYES == 0)
-							{
-								$iPermission = UR_ALLOWED_NO;
-							}
-							else
-							{
-								$iPermission = UR_ALLOWED_DEPENDS;
-							}
-						}
-					}
-				}
-			}
-		}
-		return $iPermission;
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		$this->LoadCache();
-
-		// Note: The object set is ignored because it was interesting to optimize for huge data sets
-		//       and acceptable to consider only the root class of the object set
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
-		return $aObjectPermissions['permission'];
-	}
-
-	// This verb has been made public to allow the development of an accurate feedback for the current configuration
-	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
-	{
-		return ProfilesConfig::GetProfileStimulusGrant($iProfile, $sClass, $sStimulusCode);
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		$this->LoadCache();
-		// Note: this code is VERY close to the code of IsActionAllowed()
-		$iUser = $oUser->GetKey();
-
-		// Note: The object set is ignored because it was interesting to optimize for huge data sets
-		//       and acceptable to consider only the root class of the object set
-		$bStatus = null;
-		// Call the API of UserRights because it caches the list for us
-		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
-		{
-			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
-			if (!is_null($bGrant))
-			{
-				if ($bGrant)
-				{
-					if (is_null($bStatus))
-					{
-						$bStatus = true;
-					}
-				}
-				else
-				{
-					$bStatus = false;
-				}
-			}
-		}
-
-		$iPermission = $bStatus ? UR_ALLOWED_YES : UR_ALLOWED_NO;
-		return $iPermission;
-	}
-
-	public function FlushPrivileges()
-	{
-		$this->ResetCache();
-	}
-
-	/**
-	 * Find out which attribute is corresponding the the dimension 'owner org'
-	 * returns null if no such attribute has been found (no filtering should occur)	 
-	 */	 	
-	public static function GetOwnerOrganizationAttCode($sClass)
-	{
-		$sAttCode = null;
-
-		$aCallSpec = array($sClass, 'MapContextParam');
-		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
-		{
-			$sAttCode = 'id';
-		}
-		elseif (is_callable($aCallSpec))
-		{
-			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				// Skip silently. The data model checker will tell you something about this...
-				$sAttCode = null;
-			}
-		}
-		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
-		{
-			$sAttCode = 'org_id';
-		}
-
-		return $sAttCode;
-	}
-
-	/**
-	 * Determine wether the objects can be shared by the mean of a class SharedObject
-	 **/
-	protected static function HasSharing()
-	{
-		static $bHasSharing;
-		if (!isset($bHasSharing))
-		{
-			$bHasSharing = class_exists('SharedObject');
-		}
-		return $bHasSharing;
-	}
-}
-
-
-UserRights::SelectModule('UserRightsProfile');
-
-?>
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsProfile
+ * User management Module, basing the right on profiles and a matrix (similar to UserRightsMatrix, but profiles and other decorations have been added) 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+define('ADMIN_PROFILE_NAME', 'Administrator');
+define('PORTAL_PROFILE_NAME', 'Portal user');
+
+class UserRightsBaseClassGUI extends cmdbAbstractObject
+{
+	// Whenever something changes, reload the privileges
+	
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+
+class URP_Profiles extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_profiles",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name','description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array ('name','description'));
+	}
+
+	protected static $m_aCacheProfiles = null;
+	
+	public static function DoCreateProfile($sName, $sDescription)
+	{
+		if (is_null(self::$m_aCacheProfiles))
+		{
+			self::$m_aCacheProfiles = array();
+			$oFilterAll = new DBObjectSearch('URP_Profiles');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oProfile = $oSet->Fetch())
+			{
+				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
+			}
+		}	
+
+		$sCacheKey = $sName;
+		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
+		{
+			return self::$m_aCacheProfiles[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_Profiles");
+		$oNewObj->Set('name', $sName);
+		$oNewObj->Set('description', $sDescription);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
+	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
+	{
+		$bGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
+		if (is_null($bGrant))
+		{
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		}
+		elseif ($bGrant)
+		{
+			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+		}
+		else
+		{
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		}
+	}
+	
+	function DoShowGrantSumary($oPage)
+	{
+		if ($this->GetRawName() == "Administrator")
+		{
+			// Looks dirty, but ok that's THE ONE
+			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
+			return;
+		}
+
+		// Note: for sure, we assume that the instance is derived from UserRightsProfile
+		$oUserRights = UserRights::GetModuleInstance();
+	
+		$aDisplayData = array();
+		foreach (MetaModel::GetClasses('bizmodel,grant_by_profile') as $sClass)
+		{
+			$aStimuli = array();
+			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+			{
+				$bGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
+				if ($bGrant === true)
+				{ 
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
+				}
+			}
+			$sStimuli = implode(', ', $aStimuli);
+			
+			$aDisplayData[] = array(
+				'class' => MetaModel::GetName($sClass),
+				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'r'),
+				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'br'),
+				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'w'),
+				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'bw'),
+				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'd'),
+				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'bd'),
+				'stimuli' => $sStimuli,
+			);
+		}
+	
+		$aDisplayConfig = array();
+		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
+		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
+		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
+		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
+		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
+		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
+		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
+		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
+		$oPage->table($aDisplayConfig, $aDisplayData);
+	}
+
+	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, $bEditMode);
+		if (!$bEditMode)
+		{
+			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$this->DoShowGrantSumary($oPage);
+		}
+	}
+
+	public static function GetReadOnlyAttributes()
+	{
+		return array('name', 'description');
+	}
+
+
+	// returns an array of id => array of column => php value(so-called "real value")
+	public static function GetPredefinedObjects()
+	{
+		return ProfilesConfig::GetProfilesValues();
+	}
+
+	// Before deleting a profile,
+	// preserve DB integrity by deleting links to users
+	protected function OnDelete()
+	{
+		// Don't remove admin profile
+		if ($this->Get('name') === ADMIN_PROFILE_NAME)
+		{
+			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
+		}
+
+		// Note: this may break the rule that says: "a user must have at least ONE profile" !
+		$oLnkSet = $this->Get('user_list');
+		while($oLnk = $oLnkSet->Fetch())
+		{
+			$oLnk->DBDelete();
+		}
+	}
+
+	/**
+	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
+	 * for the given attribute in the current state of the object
+	 * @param $sAttCode string $sAttCode The code of the attribute
+	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
+	 * @return integer Flags: the binary combination of the flags applicable to this attribute
+	 */	 	  	 	
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			$aReasons[] = 'Sorry, profiles are read-only in the demonstration mode!';
+			$iFlags |= OPT_ATT_READONLY;
+		}
+		return $iFlags;
+	}
+}
+
+
+
+class URP_UserProfile extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "userid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_userprofile",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
+	}
+
+	public function GetName()
+	{
+		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
+	}
+
+	public function CheckToDelete(&$oDeletionPlan)
+	{
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			// Users deletion is NOT allowed in demo mode
+			$oDeletionPlan->AddToDelete($this, null);
+			$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
+			$oDeletionPlan->ComputeResults();
+			return false;
+		}
+		return parent::CheckToDelete($oDeletionPlan);
+	}
+
+	protected function OnInsert()
+	{
+		$this->CheckIfProfileIsAllowed(UR_ACTION_CREATE);
+	}
+
+	protected function OnUpdate()
+	{
+		$this->CheckIfProfileIsAllowed(UR_ACTION_MODIFY);
+	}
+
+	protected function OnDelete()
+	{
+		$this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
+	}
+
+	/**
+	 * @param $iActionCode
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \SecurityException
+	 */
+	protected function CheckIfProfileIsAllowed($iActionCode)
+	{
+		// When initializing or admin, we need to let everything pass trough
+		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
+
+		// Only administrators can manage administrators
+		$iOrigUserId = $this->GetOriginal('userid');
+		if (!empty($iOrigUserId))
+		{
+			$oUser = MetaModel::GetObject('User', $iOrigUserId, true, true);
+			if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
+			{
+				throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
+			}
+		}
+		$oUser = MetaModel::GetObject('User', $this->Get('userid'), true, true);
+		if (UserRights::IsAdministrator($oUser) && !UserRights::IsAdministrator())
+		{
+			throw new SecurityException(Dict::Format('UI:Login:Error:AccessRestricted'));
+		}
+		if (!UserRights::IsActionAllowed(get_class($this), $iActionCode, DBObjectSet::FromObject($this)))
+		{
+			throw new SecurityException(Dict::Format('UI:Error:ObjectCannotBeUpdated'));
+		}
+		if (!UserRights::IsAdministrator() && ($this->Get('profile') === ADMIN_PROFILE_NAME))
+		{
+			throw new SecurityException(Dict::Format('UI:Login:Error:AccessAdmin'));
+		}
+	}
+
+}
+
+class URP_UserOrg extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "userid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_userorg",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", array("targetclass"=>"Organization", "jointype"=> "", "allowed_values"=>null, "sql"=>"allowed_org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", array("allowed_values"=>null, "extkey_attcode"=> 'allowed_org_id', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"reason", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('userid', 'allowed_org_id', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('allowed_org_id', 'reason')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
+	}
+
+	public function GetName()
+	{
+		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
+	}
+
+
+	protected function OnInsert()
+	{
+		$this->CheckIfOrgIsAllowed();
+	}
+
+	protected function OnUpdate()
+	{
+		$this->CheckIfOrgIsAllowed();
+	}
+
+	protected function OnDelete()
+	{
+		$this->CheckIfOrgIsAllowed();
+	}
+
+	/**
+	 * @throws \CoreException
+	 */
+	protected function CheckIfOrgIsAllowed()
+	{
+		if (!UserRights::IsLoggedIn() || UserRights::IsAdministrator()) { return; }
+
+		$oUser = UserRights::GetUserObject();		
+		$oAddon = UserRights::GetModuleInstance();
+		$aOrgs = $oAddon->GetUserOrgs($oUser, '');
+		if (count($aOrgs) > 0)
+		{
+			$iOrigOrgId = $this->GetOriginal('allowed_org_id');
+			if ((!empty($iOrigOrgId) && !in_array($iOrigOrgId, $aOrgs)) || !in_array($this->Get('allowed_org_id'), $aOrgs))
+			{
+				throw new SecurityException(Dict::Format('Class:User/Error:OrganizationNotAllowed'));
+			}
+		}
+	}
+}
+
+
+
+
+class UserRightsProfile extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'r',
+		UR_ACTION_MODIFY => 'w',
+		UR_ACTION_DELETE => 'd',
+		UR_ACTION_BULK_READ => 'br',
+		UR_ACTION_BULK_MODIFY => 'bw',
+		UR_ACTION_BULK_DELETE => 'bd',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		CMDBObject::SetTrackInfo('Initialization');
+
+		$oChange = CMDBObject::GetCurrentChange();
+
+		$iContactId = 0;
+		// Support drastic data model changes: no organization class (or not writable)!
+		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
+		{
+			$oOrg = new Organization();
+			$oOrg->Set('name', 'My Company/Department');
+			$oOrg->Set('code', 'SOMECODE');
+			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
+
+			// Support drastic data model changes: no Person class  (or not writable)!
+			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
+			{
+				$oContact = new Person();
+				$oContact->Set('name', 'My last name');
+				$oContact->Set('first_name', 'My first name');
+				if (MetaModel::IsValidAttCode('Person', 'org_id'))
+				{
+					$oContact->Set('org_id', $iOrgId);
+				}
+				if (MetaModel::IsValidAttCode('Person', 'phone'))
+				{
+					$oContact->Set('phone', '+00 000 000 000');
+				}
+				$oContact->Set('email', 'my.email@foo.org');
+				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			}
+		}
+
+
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
+		{
+			$oUser->Set('contactid', $iContactId);
+		}
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+
+		// Add this user to the very specific 'admin' profile
+		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => ADMIN_PROFILE_NAME), true /*all data*/);
+		if (is_object($oAdminProfile))
+		{
+			$oUserProfile = new URP_UserProfile();
+			//$oUserProfile->Set('userid', $iUserId);
+			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
+			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			$oSet = DBObjectSet::FromObject($oUserProfile);
+			$oUser->Set('profile_list', $oSet);
+		}
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		return true;
+	}
+
+	public function Init()
+	{
+	}
+
+	protected $m_aUserOrgs = array(); // userid -> array of orgid
+
+	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
+	protected $m_aObjectActionGrants = array();
+
+	/**
+	 * Read and cache organizations allowed to the given user
+	 *
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public function GetUserOrgs($oUser, $sClass)
+	{
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aUserOrgs))
+		{
+			$this->m_aUserOrgs[$iUser] = array();
+
+			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
+			if ($sHierarchicalKeyCode !== false)
+			{
+				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
+				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), array(), array('userid' => $iUser));
+				while ($aRow = $oUserOrgSet->FetchAssoc())
+				{
+					$oOrg = $aRow['Org'];
+					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
+				}
+			}
+			else
+			{
+				$oSearch = new DBObjectSearch('URP_UserOrg');
+				$oSearch->AllowAllData();
+				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
+				$oSearch->AddConditionExpression($oCondition);
+				
+				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
+				while ($oUserOrg = $oUserOrgSet->Fetch())
+				{
+					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
+				}
+			}
+		}
+		return $this->m_aUserOrgs[$iUser];
+	}
+
+	public function ResetCache()
+	{
+		// Loaded by Load cache
+		$this->m_aUserOrgs = array();
+
+		// Cache
+		$this->m_aObjectActionGrants = array();
+	}
+
+	public function LoadCache()
+	{
+		static $bSharedObjectInitialized = false;
+		if (!$bSharedObjectInitialized)
+		{
+			$bSharedObjectInitialized = true;
+			if (self::HasSharing())
+			{
+				SharedObject::InitSharedClassProperties();
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @param $oUser User
+	 * @return array
+	 */
+	public function IsAdministrator($oUser)
+	{
+		// UserRights caches the list for us
+		return UserRights::HasProfile(ADMIN_PROFILE_NAME, $oUser);
+	}
+
+	/**
+	 * @param $oUser User
+	 * @return array
+	 */
+	public function IsPortalUser($oUser)
+	{
+		// UserRights caches the list for us
+		return UserRights::HasProfile(PORTAL_PROFILE_NAME, $oUser);
+	}
+	/**
+	 * @param $oUser User
+	 * @return bool
+	 */
+	public function ListProfiles($oUser)
+	{
+		$aRet = array();
+		$oSearch = new DBObjectSearch('URP_UserProfile');
+		$oSearch->AllowAllData();
+		$oSearch->NoContextParameters();
+		$oSearch->Addcondition('userid', $oUser->GetKey(), '=');
+		$oProfiles = new DBObjectSet($oSearch);
+		while ($oUserProfile = $oProfiles->Fetch())
+		{
+			$aRet[$oUserProfile->Get('profileid')] = $oUserProfile->Get('profileid_friendlyname');
+		}
+		return $aRet;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$this->LoadCache();
+
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
+		if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
+		{
+			return false;
+		}
+
+		// Determine how to position the objects of this class
+		//
+		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
+		if (is_null($sAttCode))
+		{
+			// No filtering for this object
+			return true;
+		}
+		// Position the user
+		//
+		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+		if (count($aUserOrgs) == 0)
+		{
+			// No org means 'any org'
+			return true;
+		}
+
+		return $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
+	}
+
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetProfileActionGrant($iProfile, $sClass, $sAction)
+	{
+		// Note: action is forced lowercase to be more flexible (historical bug)
+		$sAction = strtolower($sAction);
+
+		return ProfilesConfig::GetProfileActionGrant($iProfile, $sClass, $sAction);
+	}
+
+	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
+	{
+		$this->LoadCache();
+
+		// load and cache permissions for the current user on the given class
+		//
+		$iUser = $oUser->GetKey();
+		$aTest = @$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+		if (is_array($aTest)) return $aTest;
+
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$bStatus = null;
+		// Call the API of UserRights because it caches the list for us
+		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
+		{
+			$bGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
+			if (!is_null($bGrant))
+			{
+				if ($bGrant)
+				{
+					if (is_null($bStatus))
+					{
+						$bStatus = true;
+					}
+				}
+				else
+				{
+					$bStatus = false;
+				}
+			}
+		}
+
+		$iPermission = $bStatus ? UR_ALLOWED_YES : UR_ALLOWED_NO;
+
+		$aRes = array(
+			'permission' => $iPermission,
+		);
+		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
+		return $aRes;
+	}
+
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		$iPermission = $aObjectPermissions['permission'];
+
+		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+
+		if ($iPermission != UR_ALLOWED_YES)
+		{
+			// It is already NO for everyone... that's the final word!
+		}
+		elseif ($iActionCode == UR_ACTION_READ)
+		{
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+		}
+		elseif ($iActionCode == UR_ACTION_BULK_READ)
+		{
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+		}
+		elseif ($oInstanceSet)
+		{
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+			// We have to answer NO for objects shared for reading purposes
+			if (self::HasSharing())
+			{
+				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
+				if ($aClassProps)
+				{
+					// This class is shared, GetSelectFilter may allow some objects for read only
+					// But currently we are checking wether the objects might be written...
+					// Let's exclude the objects based on the relevant criteria
+
+					$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
+					if (!is_null($sOrgAttCode))
+					{
+						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
+						{
+							$iCountNO = 0;
+							$iCountYES = 0;
+							$oInstanceSet->Rewind();
+							while($oObject = $oInstanceSet->Fetch())
+							{
+								$iOrg = $oObject->Get($sOrgAttCode);
+								if (in_array($iOrg, $aUserOrgs))
+								{
+									$iCountYES++;
+								}
+								else
+								{
+									$iCountNO++;
+								}
+							}
+							if ($iCountNO == 0)
+							{
+								$iPermission = UR_ALLOWED_YES;
+							}
+							elseif ($iCountYES == 0)
+							{
+								$iPermission = UR_ALLOWED_NO;
+							}
+							else
+							{
+								$iPermission = UR_ALLOWED_DEPENDS;
+							}
+						}
+					}
+				}
+			}
+		}
+		return $iPermission;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		return $aObjectPermissions['permission'];
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
+	{
+		return ProfilesConfig::GetProfileStimulusGrant($iProfile, $sClass, $sStimulusCode);
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+		// Note: this code is VERY close to the code of IsActionAllowed()
+		$iUser = $oUser->GetKey();
+
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+		$bStatus = null;
+		// Call the API of UserRights because it caches the list for us
+		foreach(UserRights::ListProfiles($oUser) as $iProfile => $oProfile)
+		{
+			$bGrant = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
+			if (!is_null($bGrant))
+			{
+				if ($bGrant)
+				{
+					if (is_null($bStatus))
+					{
+						$bStatus = true;
+					}
+				}
+				else
+				{
+					$bStatus = false;
+				}
+			}
+		}
+
+		$iPermission = $bStatus ? UR_ALLOWED_YES : UR_ALLOWED_NO;
+		return $iPermission;
+	}
+
+	public function FlushPrivileges()
+	{
+		$this->ResetCache();
+	}
+
+	/**
+	 * Find out which attribute is corresponding the the dimension 'owner org'
+	 * returns null if no such attribute has been found (no filtering should occur)	 
+	 */	 	
+	public static function GetOwnerOrganizationAttCode($sClass)
+	{
+		$sAttCode = null;
+
+		$aCallSpec = array($sClass, 'MapContextParam');
+		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
+		{
+			$sAttCode = 'id';
+		}
+		elseif (is_callable($aCallSpec))
+		{
+			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				// Skip silently. The data model checker will tell you something about this...
+				$sAttCode = null;
+			}
+		}
+		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
+		{
+			$sAttCode = 'org_id';
+		}
+
+		return $sAttCode;
+	}
+
+	/**
+	 * Determine wether the objects can be shared by the mean of a class SharedObject
+	 **/
+	protected static function HasSharing()
+	{
+		static $bHasSharing;
+		if (!isset($bHasSharing))
+		{
+			$bHasSharing = class_exists('SharedObject');
+		}
+		return $bHasSharing;
+	}
+}
+
+
+UserRights::SelectModule('UserRightsProfile');
+
+?>
diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php
index a1293a272..5183fa1f4 100644
--- a/addons/userrights/userrightsprofile.db.class.inc.php
+++ b/addons/userrights/userrightsprofile.db.class.inc.php
@@ -1,1091 +1,1091 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsProfile
- * User management Module, basing the right on profiles and a matrix (similar to UserRightsMatrix, but profiles and other decorations have been added) 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-define('ADMIN_PROFILE_NAME', 'Administrator');
-define('PORTAL_PROFILE_NAME', 'Portal user');
-
-class UserRightsBaseClassGUI extends cmdbAbstractObject
-{
-	// Whenever something changes, reload the privileges
-	
-	protected function AfterInsert()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterUpdate()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterDelete()
-	{
-		UserRights::FlushPrivileges();
-	}
-}
-
-class UserRightsBaseClass extends DBObject
-{
-	// Whenever something changes, reload the privileges
-	
-	protected function AfterInsert()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterUpdate()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterDelete()
-	{
-		UserRights::FlushPrivileges();
-	}
-}
-
-
-
-
-class URP_Profiles extends UserRightsBaseClassGUI
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_profiles",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
-	}
-
-	protected $m_bCheckReservedNames = true;
-	protected function DisableCheckOnReservedNames()
-	{
-		$this->m_bCheckReservedNames = false;
-	}
-
-	
-	protected static $m_aActions = array(
-		UR_ACTION_READ => 'Read',
-		UR_ACTION_MODIFY => 'Modify',
-		UR_ACTION_DELETE => 'Delete',
-		UR_ACTION_BULK_READ => 'Bulk Read',
-		UR_ACTION_BULK_MODIFY => 'Bulk Modify',
-		UR_ACTION_BULK_DELETE => 'Bulk Delete',
-	);
-
-	protected static $m_aCacheActionGrants = null;
-	protected static $m_aCacheStimulusGrants = null;
-	protected static $m_aCacheProfiles = null;
-	
-	public static function DoCreateProfile($sName, $sDescription, $bReservedName = false)
-	{
-		if (is_null(self::$m_aCacheProfiles))
-		{
-			self::$m_aCacheProfiles = array();
-			$oFilterAll = new DBObjectSearch('URP_Profiles');
-			$oSet = new DBObjectSet($oFilterAll);
-			while ($oProfile = $oSet->Fetch())
-			{
-				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
-			}
-		}	
-
-		$sCacheKey = $sName;
-		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
-		{
-			return self::$m_aCacheProfiles[$sCacheKey];
-		}
-		$oNewObj = MetaModel::NewObject("URP_Profiles");
-		$oNewObj->Set('name', $sName);
-		$oNewObj->Set('description', $sDescription);
-		if ($bReservedName)
-		{
-			$oNewObj->DisableCheckOnReservedNames();			
-		}
-		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
-		return $iId;
-	}
-	
-	public static function DoCreateActionGrant($iProfile, $iAction, $sClass, $bPermission = true)
-	{
-		$sAction = self::$m_aActions[$iAction];
-	
-		if (is_null(self::$m_aCacheActionGrants))
-		{
-			self::$m_aCacheActionGrants = array();
-			$oFilterAll = new DBObjectSearch('URP_ActionGrant');
-			$oSet = new DBObjectSet($oFilterAll);
-			while ($oGrant = $oSet->Fetch())
-			{
-				self::$m_aCacheActionGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('action').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
-			}
-		}	
-
-		$sCacheKey = "$iProfile-$sAction-$sClass";
-		if (isset(self::$m_aCacheActionGrants[$sCacheKey]))
-		{
-			return self::$m_aCacheActionGrants[$sCacheKey];
-		}
-
-		$oNewObj = MetaModel::NewObject("URP_ActionGrant");
-		$oNewObj->Set('profileid', $iProfile);
-		$oNewObj->Set('permission', $bPermission ? 'yes' : 'no');
-		$oNewObj->Set('class', $sClass);
-		$oNewObj->Set('action', $sAction);
-		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheActionGrants[$sCacheKey] = $iId;	
-		return $iId;
-	}
-	
-	public static function DoCreateStimulusGrant($iProfile, $sStimulusCode, $sClass)
-	{
-		if (is_null(self::$m_aCacheStimulusGrants))
-		{
-			self::$m_aCacheStimulusGrants = array();
-			$oFilterAll = new DBObjectSearch('URP_StimulusGrant');
-			$oSet = new DBObjectSet($oFilterAll);
-			while ($oGrant = $oSet->Fetch())
-			{
-				self::$m_aCacheStimulusGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('stimulus').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
-			}
-		}	
-
-		$sCacheKey = "$iProfile-$sStimulusCode-$sClass";
-		if (isset(self::$m_aCacheStimulusGrants[$sCacheKey]))
-		{
-			return self::$m_aCacheStimulusGrants[$sCacheKey];
-		}
-		$oNewObj = MetaModel::NewObject("URP_StimulusGrant");
-		$oNewObj->Set('profileid', $iProfile);
-		$oNewObj->Set('permission', 'yes');
-		$oNewObj->Set('class', $sClass);
-		$oNewObj->Set('stimulus', $sStimulusCode);
-		$iId = $oNewObj->DBInsertNoReload();
-		self::$m_aCacheStimulusGrants[$sCacheKey] = $iId;	
-		return $iId;
-	}
-	
-	/*
-	* Create the built-in Administrator profile with its reserved name
-	*/	
-	public static function DoCreateAdminProfile()
-	{
-		self::DoCreateProfile(ADMIN_PROFILE_NAME, 'Has the rights on everything (bypassing any control)', true /* reserved name */);
-	}
-
-	/*
-	* Overload the standard behavior to preserve reserved names
-	*/	
-	public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-
-		if ($this->m_bCheckReservedNames)
-		{
-			$aChanges = $this->ListChanges();
-			if (array_key_exists('name', $aChanges))
-			{
-				if ($this->GetOriginal('name') == ADMIN_PROFILE_NAME)
-				{
-					$this->m_aCheckIssues[] = "The name of the Administrator profile must not be changed";
-				}
-				elseif ($this->Get('name') == ADMIN_PROFILE_NAME)
-				{
-					$this->m_aCheckIssues[] = ADMIN_PROFILE_NAME." is a reserved to the built-in Administrator profile";
-				}
-				elseif ($this->GetOriginal('name') == PORTAL_PROFILE_NAME)
-				{
-					$this->m_aCheckIssues[] = "The name of the User Portal profile must not be changed";
-				}
-				elseif ($this->Get('name') == PORTAL_PROFILE_NAME)
-				{
-					$this->m_aCheckIssues[] = PORTAL_PROFILE_NAME." is a reserved to the built-in User Portal profile";
-				}
-			}
-		}
-	}
-
-	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
-	{
-		$iGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
-		if (!is_null($iGrant))
-		{
-			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
-		}
-		else
-		{
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-		}
-	}
-	
-	function DoShowGrantSumary($oPage)
-	{
-		if ($this->GetRawName() == "Administrator")
-		{
-			// Looks dirty, but ok that's THE ONE
-			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
-			return;
-		}
-
-		// Note: for sure, we assume that the instance is derived from UserRightsProfile
-		$oUserRights = UserRights::GetModuleInstance();
-	
-		$aDisplayData = array();
-		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
-		{
-			// Skip non instantiable classes
-			if (MetaModel::IsAbstract($sClass)) continue;
-
-			$aStimuli = array();
-			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
-			{
-				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
-				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
-				{ 
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
-				}
-			}
-			$sStimuli = implode(', ', $aStimuli);
-			
-			$aDisplayData[] = array(
-				'class' => MetaModel::GetName($sClass),
-				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
-				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Read'),
-				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Modify'),
-				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Modify'),
-				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Delete'),
-				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Delete'),
-				'stimuli' => $sStimuli,
-			);
-		}
-	
-		$aDisplayConfig = array();
-		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
-		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
-		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
-		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
-		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
-		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
-		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
-		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
-		$oPage->table($aDisplayConfig, $aDisplayData);
-	}
-
-	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage);		
-		}
-	}
-}
-
-
-
-class URP_UserProfile extends UserRightsBaseClassGUI
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "userid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_userprofile",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
-	}
-
-	public function GetName()
-	{
-		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
-	}
-}
-
-class URP_UserOrg extends UserRightsBaseClassGUI
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "userid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_userorg",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", array("targetclass"=>"Organization", "jointype"=> "", "allowed_values"=>null, "sql"=>"allowed_org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", array("allowed_values"=>null, "extkey_attcode"=> 'allowed_org_id', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"reason", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'allowed_org_id', 'reason')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('allowed_org_id', 'reason')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
-	}
-
-	public function GetName()
-	{
-		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
-	}
-}
-
-
-class URP_ActionGrant extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "profileid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_grant_actions",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'action')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the advanced search form
-	}
-}
-
-
-class URP_StimulusGrant extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "profileid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_grant_stimulus",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'stimulus')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the advanced search form
-	}
-}
-
-
-class URP_AttributeGrant extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "actiongrantid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_grant_attributes",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('attcode')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('actiongrantid', 'attcode')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('actiongrantid', 'attcode')); // Criteria of the advanced search form
-	}
-}
-
-
-
-
-class UserRightsProfile extends UserRightsAddOnAPI
-{
-	static public $m_aActionCodes = array(
-		UR_ACTION_READ => 'read',
-		UR_ACTION_MODIFY => 'modify',
-		UR_ACTION_DELETE => 'delete',
-		UR_ACTION_BULK_READ => 'bulk read',
-		UR_ACTION_BULK_MODIFY => 'bulk modify',
-		UR_ACTION_BULK_DELETE => 'bulk delete',
-	);
-
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		// Create a change to record the history of the User object
-		$oChange = MetaModel::NewObject("CMDBChange");
-		$oChange->Set("date", time());
-		$oChange->Set("userinfo", "Initialization");
-		$iChangeId = $oChange->DBInsert();
-
-		$iContactId = 0;
-		// Support drastic data model changes: no organization class (or not writable)!
-		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
-		{
-			$oOrg = new Organization();
-			$oOrg->Set('name', 'My Company/Department');
-			$oOrg->Set('code', 'SOMECODE');
-			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
-
-			// Support drastic data model changes: no Person class  (or not writable)!
-			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
-			{
-				$oContact = new Person();
-				$oContact->Set('name', 'My last name');
-				$oContact->Set('first_name', 'My first name');
-				if (MetaModel::IsValidAttCode('Person', 'org_id'))
-				{
-					$oContact->Set('org_id', $iOrgId);
-				}
-				if (MetaModel::IsValidAttCode('Person', 'phone'))
-				{
-					$oContact->Set('phone', '+00 000 000 000');
-				}
-				$oContact->Set('email', 'my.email@foo.org');
-				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
-			}
-		}
-
-
-		$oUser = new UserLocal();
-		$oUser->Set('login', $sAdminUser);
-		$oUser->Set('password', $sAdminPwd);
-		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
-		{
-			$oUser->Set('contactid', $iContactId);
-		}
-		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
-
-		// Add this user to the very specific 'admin' profile
-		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => ADMIN_PROFILE_NAME), true /*all data*/);
-		if (is_object($oAdminProfile))
-		{
-			$oUserProfile = new URP_UserProfile();
-			//$oUserProfile->Set('userid', $iUserId);
-			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
-			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
-			$oSet = DBObjectSet::FromObject($oUserProfile);
-			$oUser->Set('profile_list', $oSet);
-		}
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		return true;
-	}
-
-	public function Init()
-	{
-	}
-
-
-	protected $m_aAdmins = array(); // id -> bool, true if the user has the well-known admin profile
-	protected $m_aPortalUsers = array(); // id -> bool, true if the user has the well-known portal user profile
-
-	protected $m_aProfiles; // id -> object
-	protected $m_aUserProfiles = array(); // userid,profileid -> object
-	protected $m_aUserOrgs = array(); // userid -> array of orgid
-
-	// Those arrays could be completed on demand (inheriting parent permissions)
-	protected $m_aClassActionGrants = null; // profile, class, action -> actiongrantid (or false if NO, or null/missing if undefined)
-	protected $m_aClassStimulusGrants = array(); // profile, class, stimulus -> permission
-
-	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
-	protected $m_aObjectActionGrants = array();
-
-	/**
-	 * Read and cache organizations allowed to the given user
-	 *
-	 * @param $oUser
-	 * @param $sClass (not used here but can be used in overloads)
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public function GetUserOrgs($oUser, $sClass)
-	{
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aUserOrgs))
-		{
-			$this->m_aUserOrgs[$iUser] = array();
-
-			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
-			if ($sHierarchicalKeyCode !== false)
-			{
-				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
-				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), array(), array('userid' => $iUser));
-				while ($aRow = $oUserOrgSet->FetchAssoc())
-				{
-					$oOrg = $aRow['Org'];
-					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
-				}
-			}
-			else
-			{
-				$oSearch = new DBObjectSearch('URP_UserOrg');
-				$oSearch->AllowAllData();
-				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
-				$oSearch->AddConditionExpression($oCondition);
-				
-				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
-				while ($oUserOrg = $oUserOrgSet->Fetch())
-				{
-					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
-				}
-			}
-		}
-		return $this->m_aUserOrgs[$iUser];
-	}
-
-	/**
-	 * Read and cache profiles of the given user
-	 */
-	protected function GetUserProfiles($iUser)
-	{
-		if (!array_key_exists($iUser, $this->m_aUserProfiles))
-		{
-			$oSearch = new DBObjectSearch('URP_UserProfile');
-			$oSearch->AllowAllData();
-			$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
-			$oSearch->AddConditionExpression($oCondition);
-			
-			$this->m_aUserProfiles[$iUser] = array();
-			$oUserProfileSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
-			while ($oUserProfile = $oUserProfileSet->Fetch())
-			{
-				$this->m_aUserProfiles[$iUser][$oUserProfile->Get('profileid')] = $oUserProfile;
-			}
-		}
-		return $this->m_aUserProfiles[$iUser];
-
-	}
-
-	public function ResetCache()
-	{
-		// Loaded by Load cache
-		$this->m_aProfiles = null; 
-		$this->m_aUserProfiles = array();
-		$this->m_aUserOrgs = array();
-
-		$this->m_aAdmins = array();
-		$this->m_aPortalUsers = array();
-
-		// Loaded on demand (time consuming as compared to the others)
-		$this->m_aClassActionGrants = null;
-		$this->m_aClassStimulusGrants = null;
-		
-		$this->m_aObjectActionGrants = array();
-	}
-
-	// Separate load: this cache is much more time consuming while loading
-	// Thus it is loaded iif required
-	// Could be improved by specifying the profile id
-	public function LoadActionGrantCache()
-	{
-		if (!is_null($this->m_aClassActionGrants)) return;
-
-		$oKPI = new ExecutionKPI();
-
-		$oFilter = DBObjectSearch::FromOQL_AllData("SELECT URP_ActionGrant AS p WHERE p.permission = 'yes'");
-		$aGrants = $oFilter->ToDataArray();
-		foreach($aGrants as $aGrant)
-		{
-			$this->m_aClassActionGrants[$aGrant['profileid']][$aGrant['class']][strtolower($aGrant['action'])] = $aGrant['id'];
-		}
-
-		$oKPI->ComputeAndReport('Load of action grants');
-	}
-
-	public function LoadCache()
-	{
-		if (!is_null($this->m_aProfiles)) return;
-		// Could be loaded in a shared memory (?)
-
-		$oKPI = new ExecutionKPI();
-
-		if (self::HasSharing())
-		{
-			SharedObject::InitSharedClassProperties();
-		}
-
-		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
-		$this->m_aProfiles = array(); 
-		while ($oProfile = $oProfileSet->Fetch())
-		{
-			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
-		}
-
-		$this->m_aClassStimulusGrants = array();
-		$oStimGrantSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_StimulusGrant"));
-		$this->m_aStimGrants = array();
-		while ($oStimGrant = $oStimGrantSet->Fetch())
-		{
-			$this->m_aClassStimulusGrants[$oStimGrant->Get('profileid')][$oStimGrant->Get('class')][$oStimGrant->Get('stimulus')] = $oStimGrant;
-		}
-
-		$oKPI->ComputeAndReport('Load of user management cache (excepted Action Grants)');
-
-/*
-		echo "<pre>\n";
-		print_r($this->m_aProfiles);
-		print_r($this->m_aUserProfiles);
-		print_r($this->m_aUserOrgs);
-		print_r($this->m_aClassActionGrants);
-		print_r($this->m_aClassStimulusGrants);
-		echo "</pre>\n";
-exit;
-*/
-
-		return true;
-	}
-
-	public function IsAdministrator($oUser)
-	{
-		//$this->LoadCache();
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aAdmins))
-		{
-			$bIsAdmin = false;
-			foreach($this->GetUserProfiles($iUser) as $oUserProfile)
-		{
-				if ($oUserProfile->Get('profile') == ADMIN_PROFILE_NAME)
-				{
-					$bIsAdmin = true;
-					break;
-		}
-	}
-			$this->m_aAdmins[$iUser] = $bIsAdmin;
-		}
-		return $this->m_aAdmins[$iUser];
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		//$this->LoadCache();
-		$iUser = $oUser->GetKey();
-		if (!array_key_exists($iUser, $this->m_aPortalUsers))
-		{
-			$bIsPortalUser = false;
-			foreach($this->GetUserProfiles($iUser) as $oUserProfile)
-		{
-				if ($oUserProfile->Get('profile') == PORTAL_PROFILE_NAME)
-				{
-					$bIsPortalUser = true;
-					break;
-		}
-	}
-			$this->m_aPortalUsers[$iUser] = $bIsPortalUser;
-		}
-		return $this->m_aPortalUsers[$iUser];
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$this->LoadCache();
-
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
-		if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
-		{
-			return false;
-		}
-
-		// Determine how to position the objects of this class
-		//
-		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
-		if (is_null($sAttCode))
-		{
-			// No filtering for this object
-			return true;
-		}
-		// Position the user
-		//
-		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-		if (count($aUserOrgs) == 0)
-		{
-			// No org means 'any org'
-			return true;
-		}
-
-		return $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
-	}
-
-	// This verb has been made public to allow the development of an accurate feedback for the current configuration
-	public function GetProfileActionGrant($iProfile, $sClass, $sAction)
-	{
-		$this->LoadActionGrantCache();
-
-		// Note: action is forced lowercase to be more flexible (historical bug)
-		$sAction = strtolower($sAction);
-		if (isset($this->m_aClassActionGrants[$iProfile][$sClass][$sAction]))
-		{
-			return $this->m_aClassActionGrants[$iProfile][$sClass][$sAction];
-		}
-
-		// Recursively look for the grant record in the class hierarchy
-		$sParentClass = MetaModel::GetParentPersistentClass($sClass);
-		if (empty($sParentClass))
-		{
-			$iGrant = null;
-		}
-		else
-		{
-			// Recursively look for the grant record in the class hierarchy
-			$iGrant = $this->GetProfileActionGrant($iProfile, $sParentClass, $sAction);
-		}
-
-		$this->m_aClassActionGrants[$iProfile][$sClass][$sAction] = $iGrant;
-		return $iGrant;
-	}
-
-	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
-	{
-		$this->LoadCache();
-
-		// load and cache permissions for the current user on the given class
-		//
-		$iUser = $oUser->GetKey();
-		$aTest = @$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
-		if (is_array($aTest)) return $aTest;
-
-		$sAction = self::$m_aActionCodes[$iActionCode];
-
-		$iPermission = UR_ALLOWED_NO;
-		$aAttributes = array();
-		foreach($this->GetUserProfiles($iUser) as $iProfile => $oProfile)
-		{
-				$iGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
-				if (is_null($iGrant) || !$iGrant)
-				{
-					continue; // loop to the next profile
-				}
-				else
-				{
-					$iPermission = UR_ALLOWED_YES;
-
-					// update the list of attributes with those allowed for this profile
-					//
-					$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_AttributeGrant WHERE actiongrantid = :actiongrantid");
-					$oSet = new DBObjectSet($oSearch, array(), array('actiongrantid' => $iGrant));
-					$aProfileAttributes = $oSet->GetColumnAsArray('attcode', false);
-					if (count($aProfileAttributes) == 0)
-					{
-						$aAllAttributes = array_keys(MetaModel::ListAttributeDefs($sClass));
-						$aAttributes = array_merge($aAttributes, $aAllAttributes);
-					}
-					else
-					{
-						$aAttributes = array_merge($aAttributes, $aProfileAttributes);
-					}
-				}
-			}
-
-		$aRes = array(
-			'permission' => $iPermission,
-			'attributes' => $aAttributes,
-		);
-		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
-		return $aRes;
-	}
-	
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		$this->LoadCache();
-
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
-		$iPermission = $aObjectPermissions['permission'];
-
-		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
-		//       and acceptable to consider only the root class of the object set
-
-		if ($iPermission != UR_ALLOWED_YES)
-		{
-			// It is already NO for everyone... that's the final word!
-		}
-		elseif ($iActionCode == UR_ACTION_READ)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
-		elseif ($iActionCode == UR_ACTION_BULK_READ)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-		}
-		elseif ($oInstanceSet)
-		{
-			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
-			// We have to answer NO for objects shared for reading purposes
-			if (self::HasSharing())
-			{
-				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
-				if ($aClassProps)
-				{
-					// This class is shared, GetSelectFilter may allow some objects for read only
-					// But currently we are checking wether the objects might be written...
-					// Let's exclude the objects based on the relevant criteria
-
-					$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
-					if (!is_null($sOrgAttCode))
-					{
-						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
-						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
-						{
-							$iCountNO = 0;
-							$iCountYES = 0;
-							$oInstanceSet->Rewind();
-							while($oObject = $oInstanceSet->Fetch())
-							{
-								$iOrg = $oObject->Get($sOrgAttCode);
-								if (in_array($iOrg, $aUserOrgs))
-								{
-									$iCountYES++;
-								}
-								else
-								{
-									$iCountNO++;
-								}
-							}
-							if ($iCountNO == 0)
-							{
-								$iPermission = UR_ALLOWED_YES;
-							}
-							elseif ($iCountYES == 0)
-							{
-								$iPermission = UR_ALLOWED_NO;
-							}
-							else
-							{
-								$iPermission = UR_ALLOWED_DEPENDS;
-							}
-						}
-					}
-				}
-			}
-		}
-		return $iPermission;
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		$this->LoadCache();
-
-		// Note: The object set is ignored because it was interesting to optimize for huge data sets
-		//       and acceptable to consider only the root class of the object set
-		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
-		$aAttributes = $aObjectPermissions['attributes'];
-		if (in_array($sAttCode, $aAttributes))
-		{
-			return $aObjectPermissions['permission'];
-		}
-		else
-		{
-			return UR_ALLOWED_NO;
-		}
-	}
-
-	// This verb has been made public to allow the development of an accurate feedback for the current configuration
-	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
-	{
-		$this->LoadCache();
-
-		if (isset($this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode]))
-		{
-			return $this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		$this->LoadCache();
-		// Note: this code is VERY close to the code of IsActionAllowed()
-		$iUser = $oUser->GetKey();
-
-		// Note: The object set is ignored because it was interesting to optimize for huge data sets
-		//       and acceptable to consider only the root class of the object set
-		$iPermission = UR_ALLOWED_NO;
-		foreach($this->GetUserProfiles($iUser) as $iProfile => $oProfile)
-		{
-				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
-				if (!is_null($oGrantRecord))
-				{
-					// no need to fetch the record, we've requested the records having permission = 'yes'
-					$iPermission = UR_ALLOWED_YES;
-				}
-			}
-		return $iPermission;
-	}
-
-	public function FlushPrivileges()
-	{
-		$this->ResetCache();
-	}
-
-	/**
-	 * Find out which attribute is corresponding the the dimension 'owner org'
-	 * returns null if no such attribute has been found (no filtering should occur)	 
-	 */	 	
-	public static function GetOwnerOrganizationAttCode($sClass)
-	{
-		$sAttCode = null;
-
-		$aCallSpec = array($sClass, 'MapContextParam');
-		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
-		{
-			$sAttCode = 'id';
-		}
-		elseif (is_callable($aCallSpec))
-		{
-			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				// Skip silently. The data model checker will tell you something about this...
-				$sAttCode = null;
-			}
-		}
-		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
-		{
-			$sAttCode = 'org_id';
-		}
-
-		return $sAttCode;
-	}
-
-	/**
-	 * Determine wether the objects can be shared by the mean of a class SharedObject
-	 **/
-	protected static function HasSharing()
-	{
-		static $bHasSharing;
-		if (!isset($bHasSharing))
-		{
-			$bHasSharing = class_exists('SharedObject');
-		}
-		return $bHasSharing;
-	}
-}
-
-
-UserRights::SelectModule('UserRightsProfile');
-
-?>
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsProfile
+ * User management Module, basing the right on profiles and a matrix (similar to UserRightsMatrix, but profiles and other decorations have been added) 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+define('ADMIN_PROFILE_NAME', 'Administrator');
+define('PORTAL_PROFILE_NAME', 'Portal user');
+
+class UserRightsBaseClassGUI extends cmdbAbstractObject
+{
+	// Whenever something changes, reload the privileges
+	
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+class UserRightsBaseClass extends DBObject
+{
+	// Whenever something changes, reload the privileges
+	
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+
+
+
+class URP_Profiles extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_profiles",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
+	}
+
+	protected $m_bCheckReservedNames = true;
+	protected function DisableCheckOnReservedNames()
+	{
+		$this->m_bCheckReservedNames = false;
+	}
+
+	
+	protected static $m_aActions = array(
+		UR_ACTION_READ => 'Read',
+		UR_ACTION_MODIFY => 'Modify',
+		UR_ACTION_DELETE => 'Delete',
+		UR_ACTION_BULK_READ => 'Bulk Read',
+		UR_ACTION_BULK_MODIFY => 'Bulk Modify',
+		UR_ACTION_BULK_DELETE => 'Bulk Delete',
+	);
+
+	protected static $m_aCacheActionGrants = null;
+	protected static $m_aCacheStimulusGrants = null;
+	protected static $m_aCacheProfiles = null;
+	
+	public static function DoCreateProfile($sName, $sDescription, $bReservedName = false)
+	{
+		if (is_null(self::$m_aCacheProfiles))
+		{
+			self::$m_aCacheProfiles = array();
+			$oFilterAll = new DBObjectSearch('URP_Profiles');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oProfile = $oSet->Fetch())
+			{
+				self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey();
+			}
+		}	
+
+		$sCacheKey = $sName;
+		if (isset(self::$m_aCacheProfiles[$sCacheKey]))
+		{
+			return self::$m_aCacheProfiles[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_Profiles");
+		$oNewObj->Set('name', $sName);
+		$oNewObj->Set('description', $sDescription);
+		if ($bReservedName)
+		{
+			$oNewObj->DisableCheckOnReservedNames();			
+		}
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheProfiles[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
+	public static function DoCreateActionGrant($iProfile, $iAction, $sClass, $bPermission = true)
+	{
+		$sAction = self::$m_aActions[$iAction];
+	
+		if (is_null(self::$m_aCacheActionGrants))
+		{
+			self::$m_aCacheActionGrants = array();
+			$oFilterAll = new DBObjectSearch('URP_ActionGrant');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oGrant = $oSet->Fetch())
+			{
+				self::$m_aCacheActionGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('action').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
+			}
+		}	
+
+		$sCacheKey = "$iProfile-$sAction-$sClass";
+		if (isset(self::$m_aCacheActionGrants[$sCacheKey]))
+		{
+			return self::$m_aCacheActionGrants[$sCacheKey];
+		}
+
+		$oNewObj = MetaModel::NewObject("URP_ActionGrant");
+		$oNewObj->Set('profileid', $iProfile);
+		$oNewObj->Set('permission', $bPermission ? 'yes' : 'no');
+		$oNewObj->Set('class', $sClass);
+		$oNewObj->Set('action', $sAction);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheActionGrants[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
+	public static function DoCreateStimulusGrant($iProfile, $sStimulusCode, $sClass)
+	{
+		if (is_null(self::$m_aCacheStimulusGrants))
+		{
+			self::$m_aCacheStimulusGrants = array();
+			$oFilterAll = new DBObjectSearch('URP_StimulusGrant');
+			$oSet = new DBObjectSet($oFilterAll);
+			while ($oGrant = $oSet->Fetch())
+			{
+				self::$m_aCacheStimulusGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('stimulus').'-'.$oGrant->Get('class')] = $oGrant->GetKey();
+			}
+		}	
+
+		$sCacheKey = "$iProfile-$sStimulusCode-$sClass";
+		if (isset(self::$m_aCacheStimulusGrants[$sCacheKey]))
+		{
+			return self::$m_aCacheStimulusGrants[$sCacheKey];
+		}
+		$oNewObj = MetaModel::NewObject("URP_StimulusGrant");
+		$oNewObj->Set('profileid', $iProfile);
+		$oNewObj->Set('permission', 'yes');
+		$oNewObj->Set('class', $sClass);
+		$oNewObj->Set('stimulus', $sStimulusCode);
+		$iId = $oNewObj->DBInsertNoReload();
+		self::$m_aCacheStimulusGrants[$sCacheKey] = $iId;	
+		return $iId;
+	}
+	
+	/*
+	* Create the built-in Administrator profile with its reserved name
+	*/	
+	public static function DoCreateAdminProfile()
+	{
+		self::DoCreateProfile(ADMIN_PROFILE_NAME, 'Has the rights on everything (bypassing any control)', true /* reserved name */);
+	}
+
+	/*
+	* Overload the standard behavior to preserve reserved names
+	*/	
+	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		if ($this->m_bCheckReservedNames)
+		{
+			$aChanges = $this->ListChanges();
+			if (array_key_exists('name', $aChanges))
+			{
+				if ($this->GetOriginal('name') == ADMIN_PROFILE_NAME)
+				{
+					$this->m_aCheckIssues[] = "The name of the Administrator profile must not be changed";
+				}
+				elseif ($this->Get('name') == ADMIN_PROFILE_NAME)
+				{
+					$this->m_aCheckIssues[] = ADMIN_PROFILE_NAME." is a reserved to the built-in Administrator profile";
+				}
+				elseif ($this->GetOriginal('name') == PORTAL_PROFILE_NAME)
+				{
+					$this->m_aCheckIssues[] = "The name of the User Portal profile must not be changed";
+				}
+				elseif ($this->Get('name') == PORTAL_PROFILE_NAME)
+				{
+					$this->m_aCheckIssues[] = PORTAL_PROFILE_NAME." is a reserved to the built-in User Portal profile";
+				}
+			}
+		}
+	}
+
+	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
+	{
+		$iGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
+		if (!is_null($iGrant))
+		{
+			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+		}
+		else
+		{
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		}
+	}
+	
+	function DoShowGrantSumary($oPage)
+	{
+		if ($this->GetRawName() == "Administrator")
+		{
+			// Looks dirty, but ok that's THE ONE
+			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
+			return;
+		}
+
+		// Note: for sure, we assume that the instance is derived from UserRightsProfile
+		$oUserRights = UserRights::GetModuleInstance();
+	
+		$aDisplayData = array();
+		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
+		{
+			// Skip non instantiable classes
+			if (MetaModel::IsAbstract($sClass)) continue;
+
+			$aStimuli = array();
+			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+			{
+				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
+				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
+				{ 
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
+				}
+			}
+			$sStimuli = implode(', ', $aStimuli);
+			
+			$aDisplayData[] = array(
+				'class' => MetaModel::GetName($sClass),
+				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
+				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Read'),
+				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Modify'),
+				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Modify'),
+				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Delete'),
+				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Delete'),
+				'stimuli' => $sStimuli,
+			);
+		}
+	
+		$aDisplayConfig = array();
+		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
+		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
+		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
+		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
+		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
+		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
+		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
+		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
+		$oPage->table($aDisplayConfig, $aDisplayData);
+	}
+
+	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, $bEditMode);
+		if (!$bEditMode)
+		{
+			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$this->DoShowGrantSumary($oPage);		
+		}
+	}
+}
+
+
+
+class URP_UserProfile extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "userid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_userprofile",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('userid', 'profileid', 'reason')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
+	}
+
+	public function GetName()
+	{
+		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
+	}
+}
+
+class URP_UserOrg extends UserRightsBaseClassGUI
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "userid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_userorg",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("allowed_org_id", array("targetclass"=>"Organization", "jointype"=> "", "allowed_values"=>null, "sql"=>"allowed_org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("allowed_org_name", array("allowed_values"=>null, "extkey_attcode"=> 'allowed_org_id', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"reason", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('userid', 'allowed_org_id', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('allowed_org_id', 'reason')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
+	}
+
+	public function GetName()
+	{
+		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
+	}
+}
+
+
+class URP_ActionGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_grant_actions",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'action')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the advanced search form
+	}
+}
+
+
+class URP_StimulusGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_grant_stimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'stimulus')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the advanced search form
+	}
+}
+
+
+class URP_AttributeGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "actiongrantid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_grant_attributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('attcode')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('actiongrantid', 'attcode')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('actiongrantid', 'attcode')); // Criteria of the advanced search form
+	}
+}
+
+
+
+
+class UserRightsProfile extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'read',
+		UR_ACTION_MODIFY => 'modify',
+		UR_ACTION_DELETE => 'delete',
+		UR_ACTION_BULK_READ => 'bulk read',
+		UR_ACTION_BULK_MODIFY => 'bulk modify',
+		UR_ACTION_BULK_DELETE => 'bulk delete',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		// Create a change to record the history of the User object
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
+
+		$iContactId = 0;
+		// Support drastic data model changes: no organization class (or not writable)!
+		if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
+		{
+			$oOrg = new Organization();
+			$oOrg->Set('name', 'My Company/Department');
+			$oOrg->Set('code', 'SOMECODE');
+			$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip security */);
+
+			// Support drastic data model changes: no Person class  (or not writable)!
+			if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
+			{
+				$oContact = new Person();
+				$oContact->Set('name', 'My last name');
+				$oContact->Set('first_name', 'My first name');
+				if (MetaModel::IsValidAttCode('Person', 'org_id'))
+				{
+					$oContact->Set('org_id', $iOrgId);
+				}
+				if (MetaModel::IsValidAttCode('Person', 'phone'))
+				{
+					$oContact->Set('phone', '+00 000 000 000');
+				}
+				$oContact->Set('email', 'my.email@foo.org');
+				$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			}
+		}
+
+
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		if (MetaModel::IsValidAttCode('UserLocal', 'contactid') && ($iContactId != 0))
+		{
+			$oUser->Set('contactid', $iContactId);
+		}
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+
+		// Add this user to the very specific 'admin' profile
+		$oAdminProfile = MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => ADMIN_PROFILE_NAME), true /*all data*/);
+		if (is_object($oAdminProfile))
+		{
+			$oUserProfile = new URP_UserProfile();
+			//$oUserProfile->Set('userid', $iUserId);
+			$oUserProfile->Set('profileid', $oAdminProfile->GetKey());
+			$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+			//$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
+			$oSet = DBObjectSet::FromObject($oUserProfile);
+			$oUser->Set('profile_list', $oSet);
+		}
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		return true;
+	}
+
+	public function Init()
+	{
+	}
+
+
+	protected $m_aAdmins = array(); // id -> bool, true if the user has the well-known admin profile
+	protected $m_aPortalUsers = array(); // id -> bool, true if the user has the well-known portal user profile
+
+	protected $m_aProfiles; // id -> object
+	protected $m_aUserProfiles = array(); // userid,profileid -> object
+	protected $m_aUserOrgs = array(); // userid -> array of orgid
+
+	// Those arrays could be completed on demand (inheriting parent permissions)
+	protected $m_aClassActionGrants = null; // profile, class, action -> actiongrantid (or false if NO, or null/missing if undefined)
+	protected $m_aClassStimulusGrants = array(); // profile, class, stimulus -> permission
+
+	// Built on demand, could be optimized if necessary (doing a query for each attribute that needs to be read)
+	protected $m_aObjectActionGrants = array();
+
+	/**
+	 * Read and cache organizations allowed to the given user
+	 *
+	 * @param $oUser
+	 * @param $sClass (not used here but can be used in overloads)
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public function GetUserOrgs($oUser, $sClass)
+	{
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aUserOrgs))
+		{
+			$this->m_aUserOrgs[$iUser] = array();
+
+			$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
+			if ($sHierarchicalKeyCode !== false)
+			{
+				$sUserOrgQuery = 'SELECT UserOrg, Org FROM Organization AS Org JOIN Organization AS Root ON Org.'.$sHierarchicalKeyCode.' BELOW Root.id JOIN URP_UserOrg AS UserOrg ON UserOrg.allowed_org_id = Root.id WHERE UserOrg.userid = :userid';
+				$oUserOrgSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData($sUserOrgQuery), array(), array('userid' => $iUser));
+				while ($aRow = $oUserOrgSet->FetchAssoc())
+				{
+					$oOrg = $aRow['Org'];
+					$this->m_aUserOrgs[$iUser][] = $oOrg->GetKey();
+				}
+			}
+			else
+			{
+				$oSearch = new DBObjectSearch('URP_UserOrg');
+				$oSearch->AllowAllData();
+				$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
+				$oSearch->AddConditionExpression($oCondition);
+				
+				$oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
+				while ($oUserOrg = $oUserOrgSet->Fetch())
+				{
+					$this->m_aUserOrgs[$iUser][] = $oUserOrg->Get('allowed_org_id');
+				}
+			}
+		}
+		return $this->m_aUserOrgs[$iUser];
+	}
+
+	/**
+	 * Read and cache profiles of the given user
+	 */
+	protected function GetUserProfiles($iUser)
+	{
+		if (!array_key_exists($iUser, $this->m_aUserProfiles))
+		{
+			$oSearch = new DBObjectSearch('URP_UserProfile');
+			$oSearch->AllowAllData();
+			$oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid'));
+			$oSearch->AddConditionExpression($oCondition);
+			
+			$this->m_aUserProfiles[$iUser] = array();
+			$oUserProfileSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser));
+			while ($oUserProfile = $oUserProfileSet->Fetch())
+			{
+				$this->m_aUserProfiles[$iUser][$oUserProfile->Get('profileid')] = $oUserProfile;
+			}
+		}
+		return $this->m_aUserProfiles[$iUser];
+
+	}
+
+	public function ResetCache()
+	{
+		// Loaded by Load cache
+		$this->m_aProfiles = null; 
+		$this->m_aUserProfiles = array();
+		$this->m_aUserOrgs = array();
+
+		$this->m_aAdmins = array();
+		$this->m_aPortalUsers = array();
+
+		// Loaded on demand (time consuming as compared to the others)
+		$this->m_aClassActionGrants = null;
+		$this->m_aClassStimulusGrants = null;
+		
+		$this->m_aObjectActionGrants = array();
+	}
+
+	// Separate load: this cache is much more time consuming while loading
+	// Thus it is loaded iif required
+	// Could be improved by specifying the profile id
+	public function LoadActionGrantCache()
+	{
+		if (!is_null($this->m_aClassActionGrants)) return;
+
+		$oKPI = new ExecutionKPI();
+
+		$oFilter = DBObjectSearch::FromOQL_AllData("SELECT URP_ActionGrant AS p WHERE p.permission = 'yes'");
+		$aGrants = $oFilter->ToDataArray();
+		foreach($aGrants as $aGrant)
+		{
+			$this->m_aClassActionGrants[$aGrant['profileid']][$aGrant['class']][strtolower($aGrant['action'])] = $aGrant['id'];
+		}
+
+		$oKPI->ComputeAndReport('Load of action grants');
+	}
+
+	public function LoadCache()
+	{
+		if (!is_null($this->m_aProfiles)) return;
+		// Could be loaded in a shared memory (?)
+
+		$oKPI = new ExecutionKPI();
+
+		if (self::HasSharing())
+		{
+			SharedObject::InitSharedClassProperties();
+		}
+
+		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
+		$this->m_aProfiles = array(); 
+		while ($oProfile = $oProfileSet->Fetch())
+		{
+			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
+		}
+
+		$this->m_aClassStimulusGrants = array();
+		$oStimGrantSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_StimulusGrant"));
+		$this->m_aStimGrants = array();
+		while ($oStimGrant = $oStimGrantSet->Fetch())
+		{
+			$this->m_aClassStimulusGrants[$oStimGrant->Get('profileid')][$oStimGrant->Get('class')][$oStimGrant->Get('stimulus')] = $oStimGrant;
+		}
+
+		$oKPI->ComputeAndReport('Load of user management cache (excepted Action Grants)');
+
+/*
+		echo "<pre>\n";
+		print_r($this->m_aProfiles);
+		print_r($this->m_aUserProfiles);
+		print_r($this->m_aUserOrgs);
+		print_r($this->m_aClassActionGrants);
+		print_r($this->m_aClassStimulusGrants);
+		echo "</pre>\n";
+exit;
+*/
+
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		//$this->LoadCache();
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aAdmins))
+		{
+			$bIsAdmin = false;
+			foreach($this->GetUserProfiles($iUser) as $oUserProfile)
+		{
+				if ($oUserProfile->Get('profile') == ADMIN_PROFILE_NAME)
+				{
+					$bIsAdmin = true;
+					break;
+		}
+	}
+			$this->m_aAdmins[$iUser] = $bIsAdmin;
+		}
+		return $this->m_aAdmins[$iUser];
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		//$this->LoadCache();
+		$iUser = $oUser->GetKey();
+		if (!array_key_exists($iUser, $this->m_aPortalUsers))
+		{
+			$bIsPortalUser = false;
+			foreach($this->GetUserProfiles($iUser) as $oUserProfile)
+		{
+				if ($oUserProfile->Get('profile') == PORTAL_PROFILE_NAME)
+				{
+					$bIsPortalUser = true;
+					break;
+		}
+	}
+			$this->m_aPortalUsers[$iUser] = $bIsPortalUser;
+		}
+		return $this->m_aPortalUsers[$iUser];
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$this->LoadCache();
+
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
+		if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
+		{
+			return false;
+		}
+
+		// Determine how to position the objects of this class
+		//
+		$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
+		if (is_null($sAttCode))
+		{
+			// No filtering for this object
+			return true;
+		}
+		// Position the user
+		//
+		$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+		if (count($aUserOrgs) == 0)
+		{
+			// No org means 'any org'
+			return true;
+		}
+
+		return $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetProfileActionGrant($iProfile, $sClass, $sAction)
+	{
+		$this->LoadActionGrantCache();
+
+		// Note: action is forced lowercase to be more flexible (historical bug)
+		$sAction = strtolower($sAction);
+		if (isset($this->m_aClassActionGrants[$iProfile][$sClass][$sAction]))
+		{
+			return $this->m_aClassActionGrants[$iProfile][$sClass][$sAction];
+		}
+
+		// Recursively look for the grant record in the class hierarchy
+		$sParentClass = MetaModel::GetParentPersistentClass($sClass);
+		if (empty($sParentClass))
+		{
+			$iGrant = null;
+		}
+		else
+		{
+			// Recursively look for the grant record in the class hierarchy
+			$iGrant = $this->GetProfileActionGrant($iProfile, $sParentClass, $sAction);
+		}
+
+		$this->m_aClassActionGrants[$iProfile][$sClass][$sAction] = $iGrant;
+		return $iGrant;
+	}
+
+	protected function GetUserActionGrant($oUser, $sClass, $iActionCode)
+	{
+		$this->LoadCache();
+
+		// load and cache permissions for the current user on the given class
+		//
+		$iUser = $oUser->GetKey();
+		$aTest = @$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode];
+		if (is_array($aTest)) return $aTest;
+
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$iPermission = UR_ALLOWED_NO;
+		$aAttributes = array();
+		foreach($this->GetUserProfiles($iUser) as $iProfile => $oProfile)
+		{
+				$iGrant = $this->GetProfileActionGrant($iProfile, $sClass, $sAction);
+				if (is_null($iGrant) || !$iGrant)
+				{
+					continue; // loop to the next profile
+				}
+				else
+				{
+					$iPermission = UR_ALLOWED_YES;
+
+					// update the list of attributes with those allowed for this profile
+					//
+					$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_AttributeGrant WHERE actiongrantid = :actiongrantid");
+					$oSet = new DBObjectSet($oSearch, array(), array('actiongrantid' => $iGrant));
+					$aProfileAttributes = $oSet->GetColumnAsArray('attcode', false);
+					if (count($aProfileAttributes) == 0)
+					{
+						$aAllAttributes = array_keys(MetaModel::ListAttributeDefs($sClass));
+						$aAttributes = array_merge($aAttributes, $aAllAttributes);
+					}
+					else
+					{
+						$aAttributes = array_merge($aAttributes, $aProfileAttributes);
+					}
+				}
+			}
+
+		$aRes = array(
+			'permission' => $iPermission,
+			'attributes' => $aAttributes,
+		);
+		$this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes;
+		return $aRes;
+	}
+	
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		$iPermission = $aObjectPermissions['permission'];
+
+		// Note: In most cases the object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+
+		if ($iPermission != UR_ALLOWED_YES)
+		{
+			// It is already NO for everyone... that's the final word!
+		}
+		elseif ($iActionCode == UR_ACTION_READ)
+		{
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+		}
+		elseif ($iActionCode == UR_ACTION_BULK_READ)
+		{
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+		}
+		elseif ($oInstanceSet)
+		{
+			// We are protected by GetSelectFilter: the object set contains objects allowed or shared for reading
+			// We have to answer NO for objects shared for reading purposes
+			if (self::HasSharing())
+			{
+				$aClassProps = SharedObject::GetSharedClassProperties($sClass);
+				if ($aClassProps)
+				{
+					// This class is shared, GetSelectFilter may allow some objects for read only
+					// But currently we are checking wether the objects might be written...
+					// Let's exclude the objects based on the relevant criteria
+
+					$sOrgAttCode = self::GetOwnerOrganizationAttCode($sClass);
+					if (!is_null($sOrgAttCode))
+					{
+						$aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+						if (!is_null($aUserOrgs) && count($aUserOrgs) > 0)
+						{
+							$iCountNO = 0;
+							$iCountYES = 0;
+							$oInstanceSet->Rewind();
+							while($oObject = $oInstanceSet->Fetch())
+							{
+								$iOrg = $oObject->Get($sOrgAttCode);
+								if (in_array($iOrg, $aUserOrgs))
+								{
+									$iCountYES++;
+								}
+								else
+								{
+									$iCountNO++;
+								}
+							}
+							if ($iCountNO == 0)
+							{
+								$iPermission = UR_ALLOWED_YES;
+							}
+							elseif ($iCountYES == 0)
+							{
+								$iPermission = UR_ALLOWED_NO;
+							}
+							else
+							{
+								$iPermission = UR_ALLOWED_DEPENDS;
+							}
+						}
+					}
+				}
+			}
+		}
+		return $iPermission;
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+		$aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, $iActionCode);
+		$aAttributes = $aObjectPermissions['attributes'];
+		if (in_array($sAttCode, $aAttributes))
+		{
+			return $aObjectPermissions['permission'];
+		}
+		else
+		{
+			return UR_ALLOWED_NO;
+		}
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
+	{
+		$this->LoadCache();
+
+		if (isset($this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode]))
+		{
+			return $this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		$this->LoadCache();
+		// Note: this code is VERY close to the code of IsActionAllowed()
+		$iUser = $oUser->GetKey();
+
+		// Note: The object set is ignored because it was interesting to optimize for huge data sets
+		//       and acceptable to consider only the root class of the object set
+		$iPermission = UR_ALLOWED_NO;
+		foreach($this->GetUserProfiles($iUser) as $iProfile => $oProfile)
+		{
+				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
+				if (!is_null($oGrantRecord))
+				{
+					// no need to fetch the record, we've requested the records having permission = 'yes'
+					$iPermission = UR_ALLOWED_YES;
+				}
+			}
+		return $iPermission;
+	}
+
+	public function FlushPrivileges()
+	{
+		$this->ResetCache();
+	}
+
+	/**
+	 * Find out which attribute is corresponding the the dimension 'owner org'
+	 * returns null if no such attribute has been found (no filtering should occur)	 
+	 */	 	
+	public static function GetOwnerOrganizationAttCode($sClass)
+	{
+		$sAttCode = null;
+
+		$aCallSpec = array($sClass, 'MapContextParam');
+		if (($sClass == 'Organization') || is_subclass_of($sClass, 'Organization'))
+		{
+			$sAttCode = 'id';
+		}
+		elseif (is_callable($aCallSpec))
+		{
+			$sAttCode = call_user_func($aCallSpec, 'org_id'); // Returns null when there is no mapping for this parameter
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				// Skip silently. The data model checker will tell you something about this...
+				$sAttCode = null;
+			}
+		}
+		elseif(MetaModel::IsValidAttCode($sClass, 'org_id'))
+		{
+			$sAttCode = 'org_id';
+		}
+
+		return $sAttCode;
+	}
+
+	/**
+	 * Determine wether the objects can be shared by the mean of a class SharedObject
+	 **/
+	protected static function HasSharing()
+	{
+		static $bHasSharing;
+		if (!isset($bHasSharing))
+		{
+			$bHasSharing = class_exists('SharedObject');
+		}
+		return $bHasSharing;
+	}
+}
+
+
+UserRights::SelectModule('UserRightsProfile');
+
+?>
diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php
index 4ff9aeff3..4e3fc0fa2 100644
--- a/addons/userrights/userrightsprojection.class.inc.php
+++ b/addons/userrights/userrightsprojection.class.inc.php
@@ -1,1253 +1,1253 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * UserRightsProjection
- * User management Module, basing the right on profiles and a matrix (similar to UserRightsProfile, but enhanced with dimensions and projection of classes and profile over the dimensions) 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-define('ADMIN_PROFILE_ID', 1);
-
-class UserRightsBaseClass extends cmdbAbstractObject
-{
-	// Whenever something changes, reload the privileges
-	
-	// Whenever something changes, reload the privileges
-	
-	protected function AfterInsert()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterUpdate()
-	{
-		UserRights::FlushPrivileges();
-	}
-
-	protected function AfterDelete()
-	{
-		UserRights::FlushPrivileges();
-	}
-}
-
-
-
-
-class URP_Profiles extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_profiles",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
-	}
-
-	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
-	{
-		$oGrant = $oUserRights->GetClassActionGrant($this->GetKey(), $sClass, $sAction);
-		if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes')) 
-		{
-			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
-		}
-		else
-		{
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-		}
-	}
-	
-	function DoShowGrantSumary($oPage)
-	{
-		if ($this->GetRawName() == "Administrator")
-		{
-			// Looks dirty, but ok that's THE ONE
-			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
-			return;
-		}
-
-		// Note: for sure, we assume that the instance is derived from UserRightsProjection
-		$oUserRights = UserRights::GetModuleInstance();
-	
-		$aDisplayData = array();
-		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
-		{
-			// Skip non instantiable classes
-			if (MetaModel::IsAbstract($sClass)) continue;
-
-			$aStimuli = array();
-			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
-			{
-				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
-				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
-				{ 
-					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
-				}
-			}
-			$sStimuli = implode(', ', $aStimuli);
-			
-			$aDisplayData[] = array(
-				'class' => MetaModel::GetName($sClass),
-				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
-				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Read'),
-				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Modify'),
-				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Modify'),
-				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Delete'),
-				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Delete'),
-				'stimuli' => $sStimuli,
-			);
-		}
-	
-		$aDisplayConfig = array();
-		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
-		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
-		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
-		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
-		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
-		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
-		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
-		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
-		$oPage->table($aDisplayConfig, $aDisplayData);
-	}
-
-	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage);		
-		}
-	}
-}
-
-
-class URP_Dimensions extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_dimensions",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("type", array("class_category"=>"bizmodel", "more_values"=>"String,Integer", "sql"=>"type", "default_value"=>'String', "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'type')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	public function CheckProjectionSpec($oProjectionSpec, $sProjectedClass)
-	{
-		$sExpression = $oProjectionSpec->Get('value');
-		$sAttribute = $oProjectionSpec->Get('attribute');
-
-		// Shortcut: "any value" or "no value" means no projection
-		if (empty($sExpression)) return;
-		if ($sExpression == '<any>') return;
-
-		// 1st - compute the data type for the dimension
-		//
-		$sType = $this->Get('type');
-		if (MetaModel::IsValidClass($sType))
-		{
-			$sExpectedType = $sType;
-		}
-		else
-		{
-			$sExpectedType = '_scalar_';
-		}
-
-		// 2nd - compute the data type for the projection
-		//
-		$sTargetClass = '';
-		if (($sExpression == '<this>') || ($sExpression == '<user>'))
-		{
-			$sTargetClass = $sProjectedClass;
-		}
-		elseif ($sExpression == '<any>')
-		{
-			$sTargetClass = '';
-		}
-		else
-		{
-			// Evaluate wether it is a constant or not
-			try
-			{
-				$oObjectSearch = DBObjectSearch::FromOQL_AllData($sExpression);
-
-				$sTargetClass = $oObjectSearch->GetClass();
-			}
-			catch (OqlException $e)
-			{
-			}
-		}
-
-		if (empty($sTargetClass))
-		{
-			$sFoundType = '_void_';
-		}
-		else
-		{
-			if (empty($sAttribute))
-			{
-				$sFoundType = $sTargetClass;
-			}
-			else
-			{
-				if (!MetaModel::IsValidAttCode($sTargetClass, $sAttribute))
-				{
-					throw new CoreException('Unkown attribute code in projection specification', array('found' => $sAttribute, 'expecting' => MetaModel::GetAttributesList($sTargetClass), 'class' => $sTargetClass, 'projection' => $oProjectionSpec));
-				}
-				$oAttDef = MetaModel::GetAttributeDef($sTargetClass, $sAttribute);
-				if ($oAttDef->IsExternalKey())
-				{
-					$sFoundType = $oAttDef->GetTargetClass();
-				}
-				else
-				{
-					$sFoundType = '_scalar_';
-				}
-			}
-		}
-
-		// Compare the dimension type and projection type
-		if (($sFoundType != '_void_') && ($sFoundType != $sExpectedType))
-		{
-			throw new CoreException('Wrong type in projection specification', array('found' => $sFoundType, 'expecting' => $sExpectedType, 'expression' => $sExpression, 'attribute' => $sAttribute, 'projection' => $oProjectionSpec));
-		}
-	}
-}
-
-
-class URP_UserProfile extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "userid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_userprofile",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('profileid', 'reason')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
-	}
-
-	public function GetName()
-	{
-		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
-	}
-}
-
-
-class URP_ProfileProjection extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "profileid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_profileprojection",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("dimensionid", array("targetclass"=>"URP_Dimensions", "jointype"=> "", "allowed_values"=>null, "sql"=>"dimensionid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("dimension", array("allowed_values"=>null, "extkey_attcode"=> 'dimensionid', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('profileid', 'value', 'attribute')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'profileid')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'profileid')); // Criteria of the advanced search form
-	}
-
-	protected $m_aUserProjections; // cache
-
-	public function ProjectUser(User $oUser)
-	{
-		if (is_array($this->m_aUserProjections))
-		{
-			// Hit!
-			return $this->m_aUserProjections;
-		}
-
-		$sExpr = $this->Get('value');
-		if ($sExpr == '<user>')
-		{
-			$sColumn = $this->Get('attribute');
-			if (empty($sColumn))
-			{
-				$aRes = array($oUser->GetKey());
-			}
-			else
-			{
-				$aRes = array($oUser->Get($sColumn));
-			}
-			
-		}
-		elseif (($sExpr == '<any>') || ($sExpr == ''))
-		{
-			$aRes = null;
-		}
-		elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
-		{
-			$sColumn = $this->Get('attribute');
-			// SELECT...
-			$oValueSetDef = new ValueSetObjects($sExpr, $sColumn, array(), true /*allow all data*/);
-			$aRes = $oValueSetDef->GetValues(array('user' => $oUser), '');
-		}
-		else
-		{
-			// Constant value(s)
-			$aRes = explode(';', trim($sExpr));
-		}
-		$this->m_aUserProjections = $aRes;
-		return $aRes;
-	}
-}
-
-
-class URP_ClassProjection extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "dimensionid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_classprojection",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("dimensionid", array("targetclass"=>"URP_Dimensions", "jointype"=> "", "allowed_values"=>null, "sql"=>"dimensionid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("dimension", array("allowed_values"=>null, "extkey_attcode"=> 'dimensionid', "target_attcode"=>"name")));
-
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('class', 'value', 'attribute')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'class')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'class')); // Criteria of the advanced search form
-	}
-
-	public function ProjectObject($oObject)
-	{
-		$sExpr = $this->Get('value');
-		if ($sExpr == '<this>')
-		{
-			$sColumn = $this->Get('attribute');
-			if (empty($sColumn))
-			{
-				$aRes = array($oObject->GetKey());
-			}
-			else
-			{
-				$aRes = array($oObject->Get($sColumn));
-			}
-			
-		}
-		elseif (($sExpr == '<any>') || ($sExpr == ''))
-		{
-			$aRes = null;
-		}
-		elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
-		{ 
-			$sColumn = $this->Get('attribute');
-			// SELECT...
-			$oValueSetDef = new ValueSetObjects($sExpr, $sColumn, array(), true /*allow all data*/);
-			$aRes = $oValueSetDef->GetValues(array('this' => $oObject), '');
-		}
-		else
-		{
-			// Constant value(s)
-			$aRes = explode(';', trim($sExpr));
-		}
-		return $aRes;
-	}
-
-}
-
-
-class URP_ActionGrant extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "profileid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_grant_actions",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'action')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the advanced search form
-	}
-}
-
-
-class URP_StimulusGrant extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "profileid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_grant_stimulus",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'stimulus')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the advanced search form
-	}
-}
-
-
-class URP_AttributeGrant extends UserRightsBaseClass
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/userrights",
-			"key_type" => "autoincrement",
-			"name_attcode" => "actiongrantid",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_urp_grant_attributes",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('attcode')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('actiongrantid', 'attcode')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('actiongrantid', 'attcode')); // Criteria of the advanced search form
-	}
-}
-
-
-
-
-class UserRightsProjection extends UserRightsAddOnAPI
-{
-	static public $m_aActionCodes = array(
-		UR_ACTION_READ => 'read',
-		UR_ACTION_MODIFY => 'modify',
-		UR_ACTION_DELETE => 'delete',
-		UR_ACTION_BULK_READ => 'bulk read',
-		UR_ACTION_BULK_MODIFY => 'bulk modify',
-		UR_ACTION_BULK_DELETE => 'bulk delete',
-	);
-
-	// Installation: create the very first user
-	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		// Create a change to record the history of the User object
-		$oChange = MetaModel::NewObject("CMDBChange");
-		$oChange->Set("date", time());
-		$oChange->Set("userinfo", "Initialization");
-		$iChangeId = $oChange->DBInsert();
-
-		$oOrg = new Organization();
-		$oOrg->Set('name', 'My Company/Department');
-		$oOrg->Set('code', 'SOMECODE');
-//		$oOrg->Set('status', 'implementation');
-		//$oOrg->Set('parent_id', xxx);
-		$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip strong security */);
-
-		// Location : optional
-		//$oLocation = new bizLocation();
-		//$oLocation->Set('name', 'MyOffice');
-		//$oLocation->Set('status', 'implementation');
-		//$oLocation->Set('org_id', $iOrgId);
-		//$oLocation->Set('severity', 'high');
-		//$oLocation->Set('address', 'my building in my city');
-		//$oLocation->Set('country', 'my country');
-		//$oLocation->Set('parent_location_id', xxx);
-		//$iLocationId = $oLocation->DBInsertNoReload();
-
-		$oContact = new Person();
-		$oContact->Set('name', 'My last name');
-		$oContact->Set('first_name', 'My first name');
-		//$oContact->Set('status', 'available');
-		$oContact->Set('org_id', $iOrgId);
-		$oContact->Set('email', 'my.email@foo.org');
-		//$oContact->Set('phone', '');
-		//$oContact->Set('location_id', $iLocationId);
-		//$oContact->Set('employee_number', '');
-		$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		
-		$oUser = new UserLocal();
-		$oUser->Set('login', $sAdminUser);
-		$oUser->Set('password', $sAdminPwd);
-		$oUser->Set('contactid', $iContactId);
-		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
-		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		
-		// Add this user to the very specific 'admin' profile
-		$oUserProfile = new URP_UserProfile();
-		$oUserProfile->Set('userid', $iUserId);
-		$oUserProfile->Set('profileid', ADMIN_PROFILE_ID);
-		$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
-		$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
-		return true;
-	}
-
-	public function IsAdministrator($oUser)
-	{
-		if (in_array($oUser->GetKey(), $this->m_aAdmins))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	public function IsPortalUser($oUser)
-	{
-		return true;
-		// See implementation of userrightsprofile
-	}
-
-	public function Init()
-	{
-		// CacheData to be invoked in a module extension
-		//MetaModel::RegisterPlugin('userrights', 'ACbyProfile', array($this, 'CacheData'));
-	}
-
-	protected $m_aDimensions = array(); // id -> object
-	protected $m_aClassProj = array(); // class,dimensionid -> object
-	protected $m_aProfiles = array(); // id -> object
-	protected $m_aUserProfiles = array(); // userid,profileid -> object
-	protected $m_aProPro = array(); // profileid,dimensionid -> object
-
-	protected $m_aAdmins = array(); // id of users being linked to the well-known admin profile
-
-	protected $m_aClassActionGrants = array(); // profile, class, action -> permission
-	protected $m_aClassStimulusGrants = array(); // profile, class, stimulus -> permission
-	protected $m_aObjectActionGrants = array(); // userid, class, id, action -> permission, list of attributes
-
-	public function CacheData()
-	{
-		// Could be loaded in a shared memory (?)
-
-		$oDimensionSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Dimensions"));
-		$this->m_aDimensions = array(); 
-		while ($oDimension = $oDimensionSet->Fetch())
-		{
-			$this->m_aDimensions[$oDimension->GetKey()] = $oDimension; 
-		}
-		
-		$oClassProjSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ClassProjection"));
-		$this->m_aClassProjs = array(); 
-		while ($oClassProj = $oClassProjSet->Fetch())
-		{
-			$this->m_aClassProjs[$oClassProj->Get('class')][$oClassProj->Get('dimensionid')] = $oClassProj; 
-		}
-
-		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
-		$this->m_aProfiles = array(); 
-		while ($oProfile = $oProfileSet->Fetch())
-		{
-			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
-		}
-
-		$oUserProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_UserProfile"));
-		$this->m_aUserProfiles = array();
-		$this->m_aAdmins = array();
-		while ($oUserProfile = $oUserProfileSet->Fetch())
-		{
-			$this->m_aUserProfiles[$oUserProfile->Get('userid')][$oUserProfile->Get('profileid')] = $oUserProfile;
-			if ($oUserProfile->Get('profileid') == ADMIN_PROFILE_ID)
-			{
-				$this->m_aAdmins[] = $oUserProfile->Get('userid');
-			}
-		}
-
-		$oProProSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ProfileProjection"));
-		$this->m_aProPros = array(); 
-		while ($oProPro = $oProProSet->Fetch())
-		{
-			$this->m_aProPros[$oProPro->Get('profileid')][$oProPro->Get('dimensionid')] = $oProPro; 
-		}
-
-/*
-		echo "<pre>\n";
-		print_r($this->m_aDimensions);
-		print_r($this->m_aClassProjs);
-		print_r($this->m_aProfiles);
-		print_r($this->m_aUserProfiles);
-		print_r($this->m_aProPros);
-		echo "</pre>\n";
-exit;
-*/
-
-		return true;
-	}
-
-	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
-	{
-		$aConditions = array();
-		foreach ($this->m_aDimensions as $iDimension => $oDimension)
-		{
-			$oClassProj = @$this->m_aClassProjs[$sClass][$iDimension];
-			if (is_null($oClassProj))
-			{
-				// Authorize any for this dimension, then no additional criteria is required
-				continue;
-			}
- 
-			// 1 - Get class projection info
-			//
-			$oExpression = null;
-			$sExpr = $oClassProj->Get('value');
-			if ($sExpr == '<this>')
-			{
-				$sColumn = $oClassProj->Get('attribute');
-				if (empty($sColumn))
-				{
-					$oExpression = new FieldExpression('id', $sClass);
-				}
-				else
-				{
-					$oExpression = new FieldExpression($sColumn, $sClass);
-				}
-			}
-			elseif (($sExpr == '<any>') || ($sExpr == ''))
-			{
-				// Authorize any for this dimension, then no additional criteria is required
-				continue;
-			}
-			elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
-			{
-				throw new CoreException('Sorry, projections by the mean of OQL are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); 
-			}
-			else
-			{
-				// Constant value(s)
-				// unsupported
-				throw new CoreException('Sorry, constant projections are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); 
-//				$aRes = explode(';', trim($sExpr));
-			}
-
-			// 2 - Get profile projection info and use it if needed
-			//
-			$aProjections = self::GetReadableProjectionsByDim($oUser, $sClass, $oDimension);
-			if (is_null($aProjections))
-			{
-				// Authorize any for this dimension, then no additional criteria is required
-				continue;
-			}
-			elseif (count($aProjections) == 0)
-			{
-				// Authorize none, then exit as quickly as possible
-				return false;
-			}
-			else
-			{
-				// Authorize the given set of values
-				$oListExpr = ListExpression::FromScalars($aProjections);
-				$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
-				$aConditions[] = $oCondition;
-			}
-		}
-
-		if (count($aConditions) == 0)
-		{
-			// allow all
-			return true;
-		}
-		else
-		{
-			$oFilter  = new DBObjectSearch($sClass);
-			foreach($aConditions as $oCondition)
-			{
-				$oFilter->AddConditionExpression($oCondition);
-			}
-			//return true;
-			return $oFilter;
-		}
-	}
-
-	// This verb has been made public to allow the development of an accurate feedback for the current configuration
-	public function GetClassActionGrant($iProfile, $sClass, $sAction)
-	{
-		if (isset($this->m_aClassActionGrants[$iProfile][$sClass][$sAction]))
-		{
-			return $this->m_aClassActionGrants[$iProfile][$sClass][$sAction];
-		}
-
-		// Get the permission for this profile/class/action
-		$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_ActionGrant WHERE class = :class AND action = :action AND profileid = :profile AND permission = 'yes'");
-		$oSet = new DBObjectSet($oSearch, array(), array('class'=>$sClass, 'action'=>$sAction, 'profile'=>$iProfile));
-		if ($oSet->Count() >= 1)
-		{
-			$oGrantRecord = $oSet->Fetch();
-		}
-		else
-		{
-			$sParentClass = MetaModel::GetParentPersistentClass($sClass);
-			if (empty($sParentClass))
-			{
-				$oGrantRecord = null;
-			}
-			else
-			{
-				$oGrantRecord = $this->GetClassActionGrant($iProfile, $sParentClass, $sAction);
-			}
-		}
-
-		$this->m_aClassActionGrants[$iProfile][$sClass][$sAction] = $oGrantRecord;
-		return $oGrantRecord;
-	}
-
-	protected function GetObjectActionGrant($oUser, $sClass, $iActionCode, /*DBObject*/ $oObject = null)
-	{
-		if(is_null($oObject))
-		{
-			$iObjectRef = -999;
-		}
-		else
-		{
-			$iObjectRef = $oObject->GetKey();
-		}
-		// load and cache permissions for the current user on the given object
-		//
-		$aTest = @$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iObjectRef][$iActionCode];
-		if (is_array($aTest)) return $aTest;
-
-		$sAction = self::$m_aActionCodes[$iActionCode];
-
-		$iInstancePermission = UR_ALLOWED_NO;
-		$aAttributes = array();
-		foreach($this->GetMatchingProfiles($oUser, $sClass, $oObject) as $iProfile)
-		{
-			$oGrantRecord = $this->GetClassActionGrant($iProfile, $sClass, $sAction);
-			if (is_null($oGrantRecord))
-			{
-				continue; // loop to the next profile
-			}
-			else
-			{
-				$iInstancePermission = UR_ALLOWED_YES;
-
-				// update the list of attributes with those allowed for this profile
-				//
-				$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_AttributeGrant WHERE actiongrantid = :actiongrantid");
-				$oSet = new DBObjectSet($oSearch, array(), array('actiongrantid' => $oGrantRecord->GetKey()));
-				$aProfileAttributes = $oSet->GetColumnAsArray('attcode', false);
-				if (count($aProfileAttributes) == 0)
-				{
-					$aAllAttributes = array_keys(MetaModel::ListAttributeDefs($sClass));
-					$aAttributes = array_merge($aAttributes, $aAllAttributes);
-				}
-				else
-				{
-					$aAttributes = array_merge($aAttributes, $aProfileAttributes);
-				}
-			}
-		}
-
-		$aRes = array(
-			'permission' => $iInstancePermission,
-			'attributes' => $aAttributes,
-		);
-		$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iObjectRef][$iActionCode] = $aRes;
-		return $aRes;
-	}
-	
-	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
-	{
-		if (is_null($oInstanceSet))
-		{
-			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode);
-			return $aObjectPermissions['permission'];
-		}
-
-		$oInstanceSet->Rewind();
-		while($oObject = $oInstanceSet->Fetch())
-		{
-			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode, $oObject);
-
-			$iInstancePermission = $aObjectPermissions['permission'];
-			if (isset($iGlobalPermission))
-			{
-				if ($iInstancePermission != $iGlobalPermission)
-				{
-					$iGlobalPermission = UR_ALLOWED_DEPENDS;
-					break;
-				}
-			}
-			else
-			{
-				$iGlobalPermission = $iInstancePermission;
-			}
-		}
-		$oInstanceSet->Rewind();
-
-		if (isset($iGlobalPermission))
-		{
-			return $iGlobalPermission;
-		}
-		else
-		{
-			return UR_ALLOWED_NO;
-		}
-	}
-
-	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
-	{
-		if (is_null($oInstanceSet))
-		{
-			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode);
-			$aAttributes = $aObjectPermissions['attributes'];
-			if (in_array($sAttCode, $aAttributes))
-			{
-				return $aObjectPermissions['permission'];
-			}
-			else
-			{
-				return UR_ALLOWED_NO;
-			}
-		}
-
-		$oInstanceSet->Rewind();
-		while($oObject = $oInstanceSet->Fetch())
-		{
-			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode, $oObject);
-
-			$aAttributes = $aObjectPermissions['attributes'];
-			if (in_array($sAttCode, $aAttributes))
-			{
-				$iInstancePermission = $aObjectPermissions['permission'];
-			}
-			else
-			{
-				$iInstancePermission = UR_ALLOWED_NO; 
-			}
-
-			if (isset($iGlobalPermission))
-			{
-				if ($iInstancePermission != $iGlobalPermission)
-				{
-					$iGlobalPermission = UR_ALLOWED_DEPENDS;
-				}
-			}
-			else
-			{
-				$iGlobalPermission = $iInstancePermission;
-			}
-		}
-		$oInstanceSet->Rewind();
-
-		if (isset($iGlobalPermission))
-		{
-			return $iGlobalPermission;
-		}
-		else
-		{
-			return UR_ALLOWED_NO;
-		}
-	}
-
-	// This verb has been made public to allow the development of an accurate feedback for the current configuration
-	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
-	{
-		if (isset($this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode]))
-		{
-			return $this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode];
-		}
-
-		// Get the permission for this profile/class/stimulus
-		$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_StimulusGrant WHERE class = :class AND stimulus = :stimulus AND profileid = :profile AND permission = 'yes'");
-		$oSet = new DBObjectSet($oSearch, array(), array('class'=>$sClass, 'stimulus'=>$sStimulusCode, 'profile'=>$iProfile));
-		if ($oSet->Count() >= 1)
-		{
-			$oGrantRecord = $oSet->Fetch();
-		}
-		else
-		{
-			$oGrantRecord = null;
-		}
-
-		$this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode] = $oGrantRecord;
-		return $oGrantRecord;
-	}
-
-	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
-	{
-		// Note: this code is VERY close to the code of IsActionAllowed()
-
-		if (is_null($oInstanceSet))
-		{
-			$iInstancePermission = UR_ALLOWED_NO;
-			foreach($this->GetMatchingProfiles($oUser, $sClass) as $iProfile)
-			{
-				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
-				if (!is_null($oGrantRecord))
-				{
-					// no need to fetch the record, we've requested the records having permission = 'yes'
-					$iInstancePermission = UR_ALLOWED_YES;
-				}
-			}
-			return $iInstancePermission;
-		}
-
-		$oInstanceSet->Rewind();
-		while($oObject = $oInstanceSet->Fetch())
-		{
-			$iInstancePermission = UR_ALLOWED_NO;
-			foreach($this->GetMatchingProfiles($oUser, $sClass, $oObject) as $iProfile)
-			{
-				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
-				if (!is_null($oGrantRecord))
-				{
-					// no need to fetch the record, we've requested the records having permission = 'yes'
-					$iInstancePermission = UR_ALLOWED_YES;
-				}
-			}
-			if (isset($iGlobalPermission))
-			{
-				if ($iInstancePermission != $iGlobalPermission)
-				{
-					$iGlobalPermission = UR_ALLOWED_DEPENDS;
-				}
-			}
-			else
-			{
-				$iGlobalPermission = $iInstancePermission;
-			}
-		}
-		$oInstanceSet->Rewind();
-
-		if (isset($iGlobalPermission))
-		{
-			return $iGlobalPermission;
-		}
-		else
-		{
-			return UR_ALLOWED_NO;
-		}
-	}
-
-	// Copied from GetMatchingProfilesByDim()
-	// adapted to the optimized implementation of GetSelectFilter()
-	// Note: shares the cache m_aProPros with GetMatchingProfilesByDim()
-	// Returns   null if any object is readable
-	//           an array of allowed projections otherwise (could be an empty array if none is allowed)
-	protected function GetReadableProjectionsByDim($oUser, $sClass, $oDimension)
-	{
-		//
-		// Given a dimension, lists the values for which the user will be allowed to read the objects
-		//
-		$iUser = $oUser->GetKey();
-		$iDimension = $oDimension->GetKey();
-
-		$aRes = array();
-		if (array_key_exists($iUser, $this->m_aUserProfiles))
-		{
-			foreach ($this->m_aUserProfiles[$iUser] as $iProfile => $oProfile)
-			{
-				// user projection to be cached on a given page !
-				if (!isset($this->m_aProPros[$iProfile][$iDimension]))
-				{
-					// No projection for a given profile: default to 'any'
-					return null;
-				}
-
-				$aUserProjection = $this->m_aProPros[$iProfile][$iDimension]->ProjectUser($oUser);
-				if (is_null($aUserProjection))
-				{
-					// No projection for a given profile: default to 'any'
-					return null;
-				}
-				$aRes = array_unique(array_merge($aRes, $aUserProjection));
-			}
-		}
-		return $aRes;
-	}
-
-	// Note: shares the cache m_aProPros with GetReadableProjectionsByDim()
-	protected function GetMatchingProfilesByDim($oUser, $oObject, $oDimension)
-	{
-		//
-		// List profiles for which the user projection overlaps the object projection in the given dimension
-		//
-		$iUser = $oUser->GetKey();
-		$sClass = get_class($oObject);
-		$iPKey = $oObject->GetKey();
-		$iDimension = $oDimension->GetKey();
-
-		if (isset($this->m_aClassProjs[$sClass][$iDimension]))
-		{
-			$aObjectProjection = $this->m_aClassProjs[$sClass][$iDimension]->ProjectObject($oObject);
-		}
-		else
-		{
-			// No projection for a given class: default to 'any'
-			$aObjectProjection = null;
-		}
-
-		$aRes = array();
-		if (array_key_exists($iUser, $this->m_aUserProfiles))
-		{
-			foreach ($this->m_aUserProfiles[$iUser] as $iProfile => $oProfile)
-			{
-				if (is_null($aObjectProjection))
-				{
-					$aRes[] = $iProfile;
-				}
-				else
-				{
-					// user projection to be cached on a given page !
-					if (isset($this->m_aProPros[$iProfile][$iDimension]))
-					{
-						$aUserProjection = $this->m_aProPros[$iProfile][$iDimension]->ProjectUser($oUser);
-					}
-					else
-					{
-						// No projection for a given profile: default to 'any'
-						$aUserProjection = null;
-					}
-
-					if (is_null($aUserProjection))
-					{
-						$aRes[] = $iProfile;
-					}
-					else
-					{
-						$aMatchingValues = array_intersect($aObjectProjection, $aUserProjection);
-						if (count($aMatchingValues) > 0)
-						{
-							$aRes[] = $iProfile;
-						}
-					}
-				}
-			}
-		}
-		return $aRes;
-	}
-
-	protected $m_aMatchingProfiles = array(); // cache of the matching profiles for a given user/object
-	
-	protected function GetMatchingProfiles($oUser, $sClass, /*DBObject*/ $oObject = null)
-	{
-		$iUser = $oUser->GetKey();
-
-		if(is_null($oObject))
-		{
-			$iObjectRef = -999;
-		}
-		else
-		{
-			$iObjectRef = $oObject->GetKey();
-		}
-
-		//
-		// List profiles for which the user projection overlaps the object projection in each and every dimension
-		// Caches the result
-		//
-		$aTest = @$this->m_aMatchingProfiles[$iUser][$sClass][$iObjectRef];
-		if (is_array($aTest))
-		{
-			return $aTest;
-		}
-
-		if (is_null($oObject))
-		{
-			if (array_key_exists($iUser, $this->m_aUserProfiles))
-			{
-				$aRes = array_keys($this->m_aUserProfiles[$iUser]);
-			}
-			else
-			{
-				// no profile has been defined for this user
-				$aRes = array();
-			}
-		}
-		else
-		{
-			$aProfileRes = array();
-			foreach ($this->m_aDimensions as $iDimension => $oDimension)
-			{
-				foreach ($this->GetMatchingProfilesByDim($oUser, $oObject, $oDimension) as $iProfile)
-				{
-					@$aProfileRes[$iProfile] += 1;
-				}
-			}
-	
-			$aRes = array();
-			$iDimCount = count($this->m_aDimensions);
-			foreach ($aProfileRes as $iProfile => $iMatches)
-			{
-				if ($iMatches == $iDimCount)
-				{
-					$aRes[] = $iProfile;
-				}
-			}
-		}
-
-		// store into the cache
-		$this->m_aMatchingProfiles[$iUser][$sClass][$iObjectRef] = $aRes;
-		return $aRes; 
-	}
-
-	public function FlushPrivileges()
-	{
-		$this->CacheData();
-	}
-}
-
-
-UserRights::SelectModule('UserRightsProjection');
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * UserRightsProjection
+ * User management Module, basing the right on profiles and a matrix (similar to UserRightsProfile, but enhanced with dimensions and projection of classes and profile over the dimensions) 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+define('ADMIN_PROFILE_ID', 1);
+
+class UserRightsBaseClass extends cmdbAbstractObject
+{
+	// Whenever something changes, reload the privileges
+	
+	// Whenever something changes, reload the privileges
+	
+	protected function AfterInsert()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterUpdate()
+	{
+		UserRights::FlushPrivileges();
+	}
+
+	protected function AfterDelete()
+	{
+		UserRights::FlushPrivileges();
+	}
+}
+
+
+
+
+class URP_Profiles extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_profiles",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("user_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"profileid", "ext_key_to_remote"=>"userid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'user_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array ('name', 'description'));
+	}
+
+	function GetGrantAsHtml($oUserRights, $sClass, $sAction)
+	{
+		$oGrant = $oUserRights->GetClassActionGrant($this->GetKey(), $sClass, $sAction);
+		if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes')) 
+		{
+			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+		}
+		else
+		{
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		}
+	}
+	
+	function DoShowGrantSumary($oPage)
+	{
+		if ($this->GetRawName() == "Administrator")
+		{
+			// Looks dirty, but ok that's THE ONE
+			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
+			return;
+		}
+
+		// Note: for sure, we assume that the instance is derived from UserRightsProjection
+		$oUserRights = UserRights::GetModuleInstance();
+	
+		$aDisplayData = array();
+		foreach (MetaModel::GetClasses('bizmodel') as $sClass)
+		{
+			// Skip non instantiable classes
+			if (MetaModel::IsAbstract($sClass)) continue;
+
+			$aStimuli = array();
+			foreach (MetaModel::EnumStimuli($sClass) as $sStimulusCode => $oStimulus)
+			{
+				$oGrant = $oUserRights->GetClassStimulusGrant($this->GetKey(), $sClass, $sStimulusCode);
+				if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes'))
+				{ 
+					$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
+				}
+			}
+			$sStimuli = implode(', ', $aStimuli);
+			
+			$aDisplayData[] = array(
+				'class' => MetaModel::GetName($sClass),
+				'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'),
+				'bulkread' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Read'),
+				'write' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Modify'),
+				'bulkwrite' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Modify'),
+				'delete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Delete'),
+				'bulkdelete' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Bulk Delete'),
+				'stimuli' => $sStimuli,
+			);
+		}
+	
+		$aDisplayConfig = array();
+		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
+		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
+		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
+		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
+		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
+		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
+		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
+		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
+		$oPage->table($aDisplayConfig, $aDisplayData);
+	}
+
+	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, $bEditMode);
+		if (!$bEditMode)
+		{
+			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$this->DoShowGrantSumary($oPage);		
+		}
+	}
+}
+
+
+class URP_Dimensions extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_dimensions",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("type", array("class_category"=>"bizmodel", "more_values"=>"String,Integer", "sql"=>"type", "default_value"=>'String', "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'type')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	public function CheckProjectionSpec($oProjectionSpec, $sProjectedClass)
+	{
+		$sExpression = $oProjectionSpec->Get('value');
+		$sAttribute = $oProjectionSpec->Get('attribute');
+
+		// Shortcut: "any value" or "no value" means no projection
+		if (empty($sExpression)) return;
+		if ($sExpression == '<any>') return;
+
+		// 1st - compute the data type for the dimension
+		//
+		$sType = $this->Get('type');
+		if (MetaModel::IsValidClass($sType))
+		{
+			$sExpectedType = $sType;
+		}
+		else
+		{
+			$sExpectedType = '_scalar_';
+		}
+
+		// 2nd - compute the data type for the projection
+		//
+		$sTargetClass = '';
+		if (($sExpression == '<this>') || ($sExpression == '<user>'))
+		{
+			$sTargetClass = $sProjectedClass;
+		}
+		elseif ($sExpression == '<any>')
+		{
+			$sTargetClass = '';
+		}
+		else
+		{
+			// Evaluate wether it is a constant or not
+			try
+			{
+				$oObjectSearch = DBObjectSearch::FromOQL_AllData($sExpression);
+
+				$sTargetClass = $oObjectSearch->GetClass();
+			}
+			catch (OqlException $e)
+			{
+			}
+		}
+
+		if (empty($sTargetClass))
+		{
+			$sFoundType = '_void_';
+		}
+		else
+		{
+			if (empty($sAttribute))
+			{
+				$sFoundType = $sTargetClass;
+			}
+			else
+			{
+				if (!MetaModel::IsValidAttCode($sTargetClass, $sAttribute))
+				{
+					throw new CoreException('Unkown attribute code in projection specification', array('found' => $sAttribute, 'expecting' => MetaModel::GetAttributesList($sTargetClass), 'class' => $sTargetClass, 'projection' => $oProjectionSpec));
+				}
+				$oAttDef = MetaModel::GetAttributeDef($sTargetClass, $sAttribute);
+				if ($oAttDef->IsExternalKey())
+				{
+					$sFoundType = $oAttDef->GetTargetClass();
+				}
+				else
+				{
+					$sFoundType = '_scalar_';
+				}
+			}
+		}
+
+		// Compare the dimension type and projection type
+		if (($sFoundType != '_void_') && ($sFoundType != $sExpectedType))
+		{
+			throw new CoreException('Wrong type in projection specification', array('found' => $sFoundType, 'expecting' => $sExpectedType, 'expression' => $sExpression, 'attribute' => $sAttribute, 'projection' => $oProjectionSpec));
+		}
+	}
+}
+
+
+class URP_UserProfile extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "userid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_userprofile",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("userid", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"userid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userlogin", array("allowed_values"=>null, "extkey_attcode"=> 'userid', "target_attcode"=>"login")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("reason", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('userid', 'profileid', 'reason')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('profileid', 'reason')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
+	}
+
+	public function GetName()
+	{
+		return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
+	}
+}
+
+
+class URP_ProfileProjection extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_profileprojection",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("dimensionid", array("targetclass"=>"URP_Dimensions", "jointype"=> "", "allowed_values"=>null, "sql"=>"dimensionid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("dimension", array("allowed_values"=>null, "extkey_attcode"=> 'dimensionid', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('dimensionid', 'profileid', 'value', 'attribute')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('profileid', 'value', 'attribute')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'profileid')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'profileid')); // Criteria of the advanced search form
+	}
+
+	protected $m_aUserProjections; // cache
+
+	public function ProjectUser(User $oUser)
+	{
+		if (is_array($this->m_aUserProjections))
+		{
+			// Hit!
+			return $this->m_aUserProjections;
+		}
+
+		$sExpr = $this->Get('value');
+		if ($sExpr == '<user>')
+		{
+			$sColumn = $this->Get('attribute');
+			if (empty($sColumn))
+			{
+				$aRes = array($oUser->GetKey());
+			}
+			else
+			{
+				$aRes = array($oUser->Get($sColumn));
+			}
+			
+		}
+		elseif (($sExpr == '<any>') || ($sExpr == ''))
+		{
+			$aRes = null;
+		}
+		elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
+		{
+			$sColumn = $this->Get('attribute');
+			// SELECT...
+			$oValueSetDef = new ValueSetObjects($sExpr, $sColumn, array(), true /*allow all data*/);
+			$aRes = $oValueSetDef->GetValues(array('user' => $oUser), '');
+		}
+		else
+		{
+			// Constant value(s)
+			$aRes = explode(';', trim($sExpr));
+		}
+		$this->m_aUserProjections = $aRes;
+		return $aRes;
+	}
+}
+
+
+class URP_ClassProjection extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "dimensionid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_classprojection",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("dimensionid", array("targetclass"=>"URP_Dimensions", "jointype"=> "", "allowed_values"=>null, "sql"=>"dimensionid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("dimension", array("allowed_values"=>null, "extkey_attcode"=> 'dimensionid', "target_attcode"=>"name")));
+
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attribute", array("allowed_values"=>null, "sql"=>"attribute", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('dimensionid', 'class', 'value', 'attribute')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('class', 'value', 'attribute')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('dimensionid', 'class')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('dimensionid', 'class')); // Criteria of the advanced search form
+	}
+
+	public function ProjectObject($oObject)
+	{
+		$sExpr = $this->Get('value');
+		if ($sExpr == '<this>')
+		{
+			$sColumn = $this->Get('attribute');
+			if (empty($sColumn))
+			{
+				$aRes = array($oObject->GetKey());
+			}
+			else
+			{
+				$aRes = array($oObject->Get($sColumn));
+			}
+			
+		}
+		elseif (($sExpr == '<any>') || ($sExpr == ''))
+		{
+			$aRes = null;
+		}
+		elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
+		{ 
+			$sColumn = $this->Get('attribute');
+			// SELECT...
+			$oValueSetDef = new ValueSetObjects($sExpr, $sColumn, array(), true /*allow all data*/);
+			$aRes = $oValueSetDef->GetValues(array('this' => $oObject), '');
+		}
+		else
+		{
+			// Constant value(s)
+			$aRes = explode(';', trim($sExpr));
+		}
+		return $aRes;
+	}
+
+}
+
+
+class URP_ActionGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_grant_actions",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("action", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'action')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'action')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'action')); // Criteria of the advanced search form
+	}
+}
+
+
+class URP_StimulusGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "profileid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_grant_stimulus",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		// Common to all grant classes (could be factorized by class inheritence, but this has to be benchmarked)
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("profileid", array("targetclass"=>"URP_Profiles", "jointype"=> "", "allowed_values"=>null, "sql"=>"profileid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("profile", array("allowed_values"=>null, "extkey_attcode"=> 'profileid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeClass("class", array("class_category"=>"", "more_values"=>"", "sql"=>"class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("permission", array("allowed_values"=>new ValueSetEnum('yes,no'), "sql"=>"permission", "default_value"=>"yes", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("stimulus", array("allowed_values"=>null, "sql"=>"action", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('profileid', 'class', 'permission', 'stimulus')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('class', 'permission', 'stimulus')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('profileid', 'class', 'permission', 'stimulus')); // Criteria of the advanced search form
+	}
+}
+
+
+class URP_AttributeGrant extends UserRightsBaseClass
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/userrights",
+			"key_type" => "autoincrement",
+			"name_attcode" => "actiongrantid",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_urp_grant_attributes",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("actiongrantid", array("targetclass"=>"URP_ActionGrant", "jointype"=> "", "allowed_values"=>null, "sql"=>"actiongrantid", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('actiongrantid', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('attcode')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('actiongrantid', 'attcode')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('actiongrantid', 'attcode')); // Criteria of the advanced search form
+	}
+}
+
+
+
+
+class UserRightsProjection extends UserRightsAddOnAPI
+{
+	static public $m_aActionCodes = array(
+		UR_ACTION_READ => 'read',
+		UR_ACTION_MODIFY => 'modify',
+		UR_ACTION_DELETE => 'delete',
+		UR_ACTION_BULK_READ => 'bulk read',
+		UR_ACTION_BULK_MODIFY => 'bulk modify',
+		UR_ACTION_BULK_DELETE => 'bulk delete',
+	);
+
+	// Installation: create the very first user
+	public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		// Create a change to record the history of the User object
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$oChange->Set("userinfo", "Initialization");
+		$iChangeId = $oChange->DBInsert();
+
+		$oOrg = new Organization();
+		$oOrg->Set('name', 'My Company/Department');
+		$oOrg->Set('code', 'SOMECODE');
+//		$oOrg->Set('status', 'implementation');
+		//$oOrg->Set('parent_id', xxx);
+		$iOrgId = $oOrg->DBInsertTrackedNoReload($oChange, true /* skip strong security */);
+
+		// Location : optional
+		//$oLocation = new bizLocation();
+		//$oLocation->Set('name', 'MyOffice');
+		//$oLocation->Set('status', 'implementation');
+		//$oLocation->Set('org_id', $iOrgId);
+		//$oLocation->Set('severity', 'high');
+		//$oLocation->Set('address', 'my building in my city');
+		//$oLocation->Set('country', 'my country');
+		//$oLocation->Set('parent_location_id', xxx);
+		//$iLocationId = $oLocation->DBInsertNoReload();
+
+		$oContact = new Person();
+		$oContact->Set('name', 'My last name');
+		$oContact->Set('first_name', 'My first name');
+		//$oContact->Set('status', 'available');
+		$oContact->Set('org_id', $iOrgId);
+		$oContact->Set('email', 'my.email@foo.org');
+		//$oContact->Set('phone', '');
+		//$oContact->Set('location_id', $iLocationId);
+		//$oContact->Set('employee_number', '');
+		$iContactId = $oContact->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		
+		$oUser = new UserLocal();
+		$oUser->Set('login', $sAdminUser);
+		$oUser->Set('password', $sAdminPwd);
+		$oUser->Set('contactid', $iContactId);
+		$oUser->Set('language', $sLanguage); // Language was chosen during the installation
+		$iUserId = $oUser->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		
+		// Add this user to the very specific 'admin' profile
+		$oUserProfile = new URP_UserProfile();
+		$oUserProfile->Set('userid', $iUserId);
+		$oUserProfile->Set('profileid', ADMIN_PROFILE_ID);
+		$oUserProfile->Set('reason', 'By definition, the administrator must have the administrator profile');
+		$oUserProfile->DBInsertTrackedNoReload($oChange, true /* skip security */);
+		return true;
+	}
+
+	public function IsAdministrator($oUser)
+	{
+		if (in_array($oUser->GetKey(), $this->m_aAdmins))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public function IsPortalUser($oUser)
+	{
+		return true;
+		// See implementation of userrightsprofile
+	}
+
+	public function Init()
+	{
+		// CacheData to be invoked in a module extension
+		//MetaModel::RegisterPlugin('userrights', 'ACbyProfile', array($this, 'CacheData'));
+	}
+
+	protected $m_aDimensions = array(); // id -> object
+	protected $m_aClassProj = array(); // class,dimensionid -> object
+	protected $m_aProfiles = array(); // id -> object
+	protected $m_aUserProfiles = array(); // userid,profileid -> object
+	protected $m_aProPro = array(); // profileid,dimensionid -> object
+
+	protected $m_aAdmins = array(); // id of users being linked to the well-known admin profile
+
+	protected $m_aClassActionGrants = array(); // profile, class, action -> permission
+	protected $m_aClassStimulusGrants = array(); // profile, class, stimulus -> permission
+	protected $m_aObjectActionGrants = array(); // userid, class, id, action -> permission, list of attributes
+
+	public function CacheData()
+	{
+		// Could be loaded in a shared memory (?)
+
+		$oDimensionSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Dimensions"));
+		$this->m_aDimensions = array(); 
+		while ($oDimension = $oDimensionSet->Fetch())
+		{
+			$this->m_aDimensions[$oDimension->GetKey()] = $oDimension; 
+		}
+		
+		$oClassProjSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ClassProjection"));
+		$this->m_aClassProjs = array(); 
+		while ($oClassProj = $oClassProjSet->Fetch())
+		{
+			$this->m_aClassProjs[$oClassProj->Get('class')][$oClassProj->Get('dimensionid')] = $oClassProj; 
+		}
+
+		$oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles"));
+		$this->m_aProfiles = array(); 
+		while ($oProfile = $oProfileSet->Fetch())
+		{
+			$this->m_aProfiles[$oProfile->GetKey()] = $oProfile; 
+		}
+
+		$oUserProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_UserProfile"));
+		$this->m_aUserProfiles = array();
+		$this->m_aAdmins = array();
+		while ($oUserProfile = $oUserProfileSet->Fetch())
+		{
+			$this->m_aUserProfiles[$oUserProfile->Get('userid')][$oUserProfile->Get('profileid')] = $oUserProfile;
+			if ($oUserProfile->Get('profileid') == ADMIN_PROFILE_ID)
+			{
+				$this->m_aAdmins[] = $oUserProfile->Get('userid');
+			}
+		}
+
+		$oProProSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ProfileProjection"));
+		$this->m_aProPros = array(); 
+		while ($oProPro = $oProProSet->Fetch())
+		{
+			$this->m_aProPros[$oProPro->Get('profileid')][$oProPro->Get('dimensionid')] = $oProPro; 
+		}
+
+/*
+		echo "<pre>\n";
+		print_r($this->m_aDimensions);
+		print_r($this->m_aClassProjs);
+		print_r($this->m_aProfiles);
+		print_r($this->m_aUserProfiles);
+		print_r($this->m_aProPros);
+		echo "</pre>\n";
+exit;
+*/
+
+		return true;
+	}
+
+	public function GetSelectFilter($oUser, $sClass, $aSettings = array())
+	{
+		$aConditions = array();
+		foreach ($this->m_aDimensions as $iDimension => $oDimension)
+		{
+			$oClassProj = @$this->m_aClassProjs[$sClass][$iDimension];
+			if (is_null($oClassProj))
+			{
+				// Authorize any for this dimension, then no additional criteria is required
+				continue;
+			}
+ 
+			// 1 - Get class projection info
+			//
+			$oExpression = null;
+			$sExpr = $oClassProj->Get('value');
+			if ($sExpr == '<this>')
+			{
+				$sColumn = $oClassProj->Get('attribute');
+				if (empty($sColumn))
+				{
+					$oExpression = new FieldExpression('id', $sClass);
+				}
+				else
+				{
+					$oExpression = new FieldExpression($sColumn, $sClass);
+				}
+			}
+			elseif (($sExpr == '<any>') || ($sExpr == ''))
+			{
+				// Authorize any for this dimension, then no additional criteria is required
+				continue;
+			}
+			elseif (strtolower(substr($sExpr, 0, 6)) == 'select')
+			{
+				throw new CoreException('Sorry, projections by the mean of OQL are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); 
+			}
+			else
+			{
+				// Constant value(s)
+				// unsupported
+				throw new CoreException('Sorry, constant projections are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); 
+//				$aRes = explode(';', trim($sExpr));
+			}
+
+			// 2 - Get profile projection info and use it if needed
+			//
+			$aProjections = self::GetReadableProjectionsByDim($oUser, $sClass, $oDimension);
+			if (is_null($aProjections))
+			{
+				// Authorize any for this dimension, then no additional criteria is required
+				continue;
+			}
+			elseif (count($aProjections) == 0)
+			{
+				// Authorize none, then exit as quickly as possible
+				return false;
+			}
+			else
+			{
+				// Authorize the given set of values
+				$oListExpr = ListExpression::FromScalars($aProjections);
+				$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
+				$aConditions[] = $oCondition;
+			}
+		}
+
+		if (count($aConditions) == 0)
+		{
+			// allow all
+			return true;
+		}
+		else
+		{
+			$oFilter  = new DBObjectSearch($sClass);
+			foreach($aConditions as $oCondition)
+			{
+				$oFilter->AddConditionExpression($oCondition);
+			}
+			//return true;
+			return $oFilter;
+		}
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetClassActionGrant($iProfile, $sClass, $sAction)
+	{
+		if (isset($this->m_aClassActionGrants[$iProfile][$sClass][$sAction]))
+		{
+			return $this->m_aClassActionGrants[$iProfile][$sClass][$sAction];
+		}
+
+		// Get the permission for this profile/class/action
+		$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_ActionGrant WHERE class = :class AND action = :action AND profileid = :profile AND permission = 'yes'");
+		$oSet = new DBObjectSet($oSearch, array(), array('class'=>$sClass, 'action'=>$sAction, 'profile'=>$iProfile));
+		if ($oSet->Count() >= 1)
+		{
+			$oGrantRecord = $oSet->Fetch();
+		}
+		else
+		{
+			$sParentClass = MetaModel::GetParentPersistentClass($sClass);
+			if (empty($sParentClass))
+			{
+				$oGrantRecord = null;
+			}
+			else
+			{
+				$oGrantRecord = $this->GetClassActionGrant($iProfile, $sParentClass, $sAction);
+			}
+		}
+
+		$this->m_aClassActionGrants[$iProfile][$sClass][$sAction] = $oGrantRecord;
+		return $oGrantRecord;
+	}
+
+	protected function GetObjectActionGrant($oUser, $sClass, $iActionCode, /*DBObject*/ $oObject = null)
+	{
+		if(is_null($oObject))
+		{
+			$iObjectRef = -999;
+		}
+		else
+		{
+			$iObjectRef = $oObject->GetKey();
+		}
+		// load and cache permissions for the current user on the given object
+		//
+		$aTest = @$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iObjectRef][$iActionCode];
+		if (is_array($aTest)) return $aTest;
+
+		$sAction = self::$m_aActionCodes[$iActionCode];
+
+		$iInstancePermission = UR_ALLOWED_NO;
+		$aAttributes = array();
+		foreach($this->GetMatchingProfiles($oUser, $sClass, $oObject) as $iProfile)
+		{
+			$oGrantRecord = $this->GetClassActionGrant($iProfile, $sClass, $sAction);
+			if (is_null($oGrantRecord))
+			{
+				continue; // loop to the next profile
+			}
+			else
+			{
+				$iInstancePermission = UR_ALLOWED_YES;
+
+				// update the list of attributes with those allowed for this profile
+				//
+				$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_AttributeGrant WHERE actiongrantid = :actiongrantid");
+				$oSet = new DBObjectSet($oSearch, array(), array('actiongrantid' => $oGrantRecord->GetKey()));
+				$aProfileAttributes = $oSet->GetColumnAsArray('attcode', false);
+				if (count($aProfileAttributes) == 0)
+				{
+					$aAllAttributes = array_keys(MetaModel::ListAttributeDefs($sClass));
+					$aAttributes = array_merge($aAttributes, $aAllAttributes);
+				}
+				else
+				{
+					$aAttributes = array_merge($aAttributes, $aProfileAttributes);
+				}
+			}
+		}
+
+		$aRes = array(
+			'permission' => $iInstancePermission,
+			'attributes' => $aAttributes,
+		);
+		$this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iObjectRef][$iActionCode] = $aRes;
+		return $aRes;
+	}
+	
+	public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null)
+	{
+		if (is_null($oInstanceSet))
+		{
+			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode);
+			return $aObjectPermissions['permission'];
+		}
+
+		$oInstanceSet->Rewind();
+		while($oObject = $oInstanceSet->Fetch())
+		{
+			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode, $oObject);
+
+			$iInstancePermission = $aObjectPermissions['permission'];
+			if (isset($iGlobalPermission))
+			{
+				if ($iInstancePermission != $iGlobalPermission)
+				{
+					$iGlobalPermission = UR_ALLOWED_DEPENDS;
+					break;
+				}
+			}
+			else
+			{
+				$iGlobalPermission = $iInstancePermission;
+			}
+		}
+		$oInstanceSet->Rewind();
+
+		if (isset($iGlobalPermission))
+		{
+			return $iGlobalPermission;
+		}
+		else
+		{
+			return UR_ALLOWED_NO;
+		}
+	}
+
+	public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet = null)
+	{
+		if (is_null($oInstanceSet))
+		{
+			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode);
+			$aAttributes = $aObjectPermissions['attributes'];
+			if (in_array($sAttCode, $aAttributes))
+			{
+				return $aObjectPermissions['permission'];
+			}
+			else
+			{
+				return UR_ALLOWED_NO;
+			}
+		}
+
+		$oInstanceSet->Rewind();
+		while($oObject = $oInstanceSet->Fetch())
+		{
+			$aObjectPermissions = $this->GetObjectActionGrant($oUser, $sClass, $iActionCode, $oObject);
+
+			$aAttributes = $aObjectPermissions['attributes'];
+			if (in_array($sAttCode, $aAttributes))
+			{
+				$iInstancePermission = $aObjectPermissions['permission'];
+			}
+			else
+			{
+				$iInstancePermission = UR_ALLOWED_NO; 
+			}
+
+			if (isset($iGlobalPermission))
+			{
+				if ($iInstancePermission != $iGlobalPermission)
+				{
+					$iGlobalPermission = UR_ALLOWED_DEPENDS;
+				}
+			}
+			else
+			{
+				$iGlobalPermission = $iInstancePermission;
+			}
+		}
+		$oInstanceSet->Rewind();
+
+		if (isset($iGlobalPermission))
+		{
+			return $iGlobalPermission;
+		}
+		else
+		{
+			return UR_ALLOWED_NO;
+		}
+	}
+
+	// This verb has been made public to allow the development of an accurate feedback for the current configuration
+	public function GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode)
+	{
+		if (isset($this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode]))
+		{
+			return $this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode];
+		}
+
+		// Get the permission for this profile/class/stimulus
+		$oSearch = DBObjectSearch::FromOQL_AllData("SELECT URP_StimulusGrant WHERE class = :class AND stimulus = :stimulus AND profileid = :profile AND permission = 'yes'");
+		$oSet = new DBObjectSet($oSearch, array(), array('class'=>$sClass, 'stimulus'=>$sStimulusCode, 'profile'=>$iProfile));
+		if ($oSet->Count() >= 1)
+		{
+			$oGrantRecord = $oSet->Fetch();
+		}
+		else
+		{
+			$oGrantRecord = null;
+		}
+
+		$this->m_aClassStimulusGrants[$iProfile][$sClass][$sStimulusCode] = $oGrantRecord;
+		return $oGrantRecord;
+	}
+
+	public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet = null)
+	{
+		// Note: this code is VERY close to the code of IsActionAllowed()
+
+		if (is_null($oInstanceSet))
+		{
+			$iInstancePermission = UR_ALLOWED_NO;
+			foreach($this->GetMatchingProfiles($oUser, $sClass) as $iProfile)
+			{
+				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
+				if (!is_null($oGrantRecord))
+				{
+					// no need to fetch the record, we've requested the records having permission = 'yes'
+					$iInstancePermission = UR_ALLOWED_YES;
+				}
+			}
+			return $iInstancePermission;
+		}
+
+		$oInstanceSet->Rewind();
+		while($oObject = $oInstanceSet->Fetch())
+		{
+			$iInstancePermission = UR_ALLOWED_NO;
+			foreach($this->GetMatchingProfiles($oUser, $sClass, $oObject) as $iProfile)
+			{
+				$oGrantRecord = $this->GetClassStimulusGrant($iProfile, $sClass, $sStimulusCode);
+				if (!is_null($oGrantRecord))
+				{
+					// no need to fetch the record, we've requested the records having permission = 'yes'
+					$iInstancePermission = UR_ALLOWED_YES;
+				}
+			}
+			if (isset($iGlobalPermission))
+			{
+				if ($iInstancePermission != $iGlobalPermission)
+				{
+					$iGlobalPermission = UR_ALLOWED_DEPENDS;
+				}
+			}
+			else
+			{
+				$iGlobalPermission = $iInstancePermission;
+			}
+		}
+		$oInstanceSet->Rewind();
+
+		if (isset($iGlobalPermission))
+		{
+			return $iGlobalPermission;
+		}
+		else
+		{
+			return UR_ALLOWED_NO;
+		}
+	}
+
+	// Copied from GetMatchingProfilesByDim()
+	// adapted to the optimized implementation of GetSelectFilter()
+	// Note: shares the cache m_aProPros with GetMatchingProfilesByDim()
+	// Returns   null if any object is readable
+	//           an array of allowed projections otherwise (could be an empty array if none is allowed)
+	protected function GetReadableProjectionsByDim($oUser, $sClass, $oDimension)
+	{
+		//
+		// Given a dimension, lists the values for which the user will be allowed to read the objects
+		//
+		$iUser = $oUser->GetKey();
+		$iDimension = $oDimension->GetKey();
+
+		$aRes = array();
+		if (array_key_exists($iUser, $this->m_aUserProfiles))
+		{
+			foreach ($this->m_aUserProfiles[$iUser] as $iProfile => $oProfile)
+			{
+				// user projection to be cached on a given page !
+				if (!isset($this->m_aProPros[$iProfile][$iDimension]))
+				{
+					// No projection for a given profile: default to 'any'
+					return null;
+				}
+
+				$aUserProjection = $this->m_aProPros[$iProfile][$iDimension]->ProjectUser($oUser);
+				if (is_null($aUserProjection))
+				{
+					// No projection for a given profile: default to 'any'
+					return null;
+				}
+				$aRes = array_unique(array_merge($aRes, $aUserProjection));
+			}
+		}
+		return $aRes;
+	}
+
+	// Note: shares the cache m_aProPros with GetReadableProjectionsByDim()
+	protected function GetMatchingProfilesByDim($oUser, $oObject, $oDimension)
+	{
+		//
+		// List profiles for which the user projection overlaps the object projection in the given dimension
+		//
+		$iUser = $oUser->GetKey();
+		$sClass = get_class($oObject);
+		$iPKey = $oObject->GetKey();
+		$iDimension = $oDimension->GetKey();
+
+		if (isset($this->m_aClassProjs[$sClass][$iDimension]))
+		{
+			$aObjectProjection = $this->m_aClassProjs[$sClass][$iDimension]->ProjectObject($oObject);
+		}
+		else
+		{
+			// No projection for a given class: default to 'any'
+			$aObjectProjection = null;
+		}
+
+		$aRes = array();
+		if (array_key_exists($iUser, $this->m_aUserProfiles))
+		{
+			foreach ($this->m_aUserProfiles[$iUser] as $iProfile => $oProfile)
+			{
+				if (is_null($aObjectProjection))
+				{
+					$aRes[] = $iProfile;
+				}
+				else
+				{
+					// user projection to be cached on a given page !
+					if (isset($this->m_aProPros[$iProfile][$iDimension]))
+					{
+						$aUserProjection = $this->m_aProPros[$iProfile][$iDimension]->ProjectUser($oUser);
+					}
+					else
+					{
+						// No projection for a given profile: default to 'any'
+						$aUserProjection = null;
+					}
+
+					if (is_null($aUserProjection))
+					{
+						$aRes[] = $iProfile;
+					}
+					else
+					{
+						$aMatchingValues = array_intersect($aObjectProjection, $aUserProjection);
+						if (count($aMatchingValues) > 0)
+						{
+							$aRes[] = $iProfile;
+						}
+					}
+				}
+			}
+		}
+		return $aRes;
+	}
+
+	protected $m_aMatchingProfiles = array(); // cache of the matching profiles for a given user/object
+	
+	protected function GetMatchingProfiles($oUser, $sClass, /*DBObject*/ $oObject = null)
+	{
+		$iUser = $oUser->GetKey();
+
+		if(is_null($oObject))
+		{
+			$iObjectRef = -999;
+		}
+		else
+		{
+			$iObjectRef = $oObject->GetKey();
+		}
+
+		//
+		// List profiles for which the user projection overlaps the object projection in each and every dimension
+		// Caches the result
+		//
+		$aTest = @$this->m_aMatchingProfiles[$iUser][$sClass][$iObjectRef];
+		if (is_array($aTest))
+		{
+			return $aTest;
+		}
+
+		if (is_null($oObject))
+		{
+			if (array_key_exists($iUser, $this->m_aUserProfiles))
+			{
+				$aRes = array_keys($this->m_aUserProfiles[$iUser]);
+			}
+			else
+			{
+				// no profile has been defined for this user
+				$aRes = array();
+			}
+		}
+		else
+		{
+			$aProfileRes = array();
+			foreach ($this->m_aDimensions as $iDimension => $oDimension)
+			{
+				foreach ($this->GetMatchingProfilesByDim($oUser, $oObject, $oDimension) as $iProfile)
+				{
+					@$aProfileRes[$iProfile] += 1;
+				}
+			}
+	
+			$aRes = array();
+			$iDimCount = count($this->m_aDimensions);
+			foreach ($aProfileRes as $iProfile => $iMatches)
+			{
+				if ($iMatches == $iDimCount)
+				{
+					$aRes[] = $iProfile;
+				}
+			}
+		}
+
+		// store into the cache
+		$this->m_aMatchingProfiles[$iUser][$sClass][$iObjectRef] = $aRes;
+		return $aRes; 
+	}
+
+	public function FlushPrivileges()
+	{
+		$this->CacheData();
+	}
+}
+
+
+UserRights::SelectModule('UserRightsProjection');
+
+?>
diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index f1e9a8c1e..05124e473 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -1,391 +1,391 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Simple web page with no includes, header or fancy formatting, useful to
- * generate HTML fragments when called by an AJAX method
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
- 
-class ajax_page extends WebPage implements iTabbedPage
-{
-    /**
-     * Jquery style ready script
-     * @var Hash     
-     */	  
-	protected $m_sReadyScript;
-	protected $m_oTabs;
-	private $m_sMenu; // If set, then the menu will be updated
-	
-    /**
-     * constructor for the web page
-     * @param string $s_title Not used
-     */	  
-	function __construct($s_title)
-    {
-		$sPrintable = utils::ReadParam('printable', '0');
-		$bPrintable = ($sPrintable == '1');
-
-        parent::__construct($s_title, $bPrintable);
-        $this->m_sReadyScript = "";
-		//$this->add_header("Content-type: text/html; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
-		$this->m_oTabs = new TabManager();
-		$this->sContentType = 'text/html';
-		$this->sContentDisposition = 'inline';
-		$this->m_sMenu = "";
-
-		utils::InitArchiveMode();
-    }
-
-	public function AddTabContainer($sTabContainer, $sPrefix = '')
-	{
-		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
-	}
-
-	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
-	{
-		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
-	}
-
-	public function SetCurrentTabContainer($sTabContainer = '')
-	{
-		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
-	}
-
-	public function SetCurrentTab($sTabLabel = '')
-	{
-		return $this->m_oTabs->SetCurrentTab($sTabLabel);
-	}
-	
-	/**
-	 * Add a tab which content will be loaded asynchronously via the supplied URL
-	 * 
-	 * Limitations:
-	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
-	 * Static content cannot be added inside such tabs.
-	 * 
-	 * @param string $sTabLabel The (localised) label of the tab
-	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
-	 * @since 2.0.3
-	 */
-	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
-	{
-		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
-	}
-	
-	public function GetCurrentTab()
-	{
-		return $this->m_oTabs->GetCurrentTab();
-	}
-
-	public function RemoveTab($sTabLabel, $sTabContainer = null)
-	{
-		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
-	}
-
-	/**
-	 * Finds the tab whose title matches a given pattern
-	 * @return mixed The name of the tab as a string or false if not found
-	 */
-	public function FindTab($sPattern, $sTabContainer = null)
-	{
-		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
-	}
-
-	/**
-	 * Make the given tab the active one, as if it were clicked
-	 * DOES NOT WORK: apparently in the *old* version of jquery
-	 * that we are using this is not supported... TO DO upgrade
-	 * the whole jquery bundle...
-	 */
-	public function SelectTab($sTabContainer, $sTabLabel)
-	{
-		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
-	}
-	
-	public function AddToMenu($sHtml)
-	{
-		$this->m_sMenu .= $sHtml;
-	}
-
-    /**
-     * Echoes the content of the whole page
-     * @return void
-     */	  
-    public function output()
-    {
-    	if (!empty($this->sContentType))
-    	{
-			$this->add_header('Content-type: '.$this->sContentType);
-    	}
-    	if (!empty($this->sContentDisposition))
-    	{
-			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
-    	}
-        foreach($this->a_headers as $s_header)
-        {
-            header($s_header);
-        }
-		if ($this->m_oTabs->TabsContainerCount() > 0)
-		{
-			$this->add_ready_script(
-<<<EOF
-			// The "tab widgets" to handle.
-			var tabs = $('div[id^=tabbedContent]');
-			  
-			// Ugly patch for a change in the behavior of jQuery UI:
-			// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
-			// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
-			// is taken into account and causes "local" tabs to be considered as Ajax
-			// unless their URL is equal to the URL of the page...
-			if ($('base').length > 0)
-			{
-				$('div[id^=tabbedContent] > ul > li > a').each(function() {
-					var sHash = location.hash;
-					var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
-		    		$(this).attr("href", sCleanLocation+$(this).attr("href"));
-				});
-			}
-			if ($.bbq)
-			{
-				// This selector will be reused when selecting actual tab widget A elements.
-				var tab_a_selector = 'ul.ui-tabs-nav a';
-				  
-				// Enable tabs on all tab widgets. The `event` property must be overridden so
-				// that the tabs aren't changed on click, and any custom event name can be
-				// specified. Note that if you define a callback for the 'select' event, it
-				// will be executed for the selected tab whenever the hash changes.
-				tabs.tabs({ event: 'change' });
-				  
-				// Define our own click handler for the tabs, overriding the default.
-				tabs.find( tab_a_selector ).click(function()
-				{
-					var state = {};
-							  
-					// Get the id of this tab widget.
-					var id = $(this).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
-					  
-					// Get the index of this tab.
-					var idx = $(this).parent().prevAll().length;
-					
-					// Set the state!
-					state[ id ] = idx;
-					$.bbq.pushState( state );
-				});
-			}
-			else
-			{
-				tabs.tabs();
-			}
-EOF
-);
-		}
-		// Render the tabs in the page (if any)
-		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
-		
-		// Additional UI widgets to be activated inside the ajax fragment
-		// Important: Testing the content type is not enough because some ajax handlers have not correctly positionned the flag (e.g json response corrupted by the script)
-		if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content)) )
-		{
-			$this->add_ready_script(
-<<<EOF
-PrepareWidgets();
-EOF
-			);
-		}
-        $s_captured_output = $this->ob_get_clean_safe();
-		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
-        {
-        	// inline content != attachment && html => filter all scripts for malicious XSS scripts
-        	echo self::FilterXSS($this->s_content);
-        }
-        else
-        {
-        	echo $this->s_content;
-        }
-        if (!empty($this->m_sMenu))
-        {
-           $uid = time();
-           echo "<div id=\"accordion_temp_$uid\">\n";
-           echo "<div id=\"accordion\">\n";
-           echo "<!-- Beginning of the accordion menu -->\n";
-           echo self::FilterXSS($this->m_sMenu);
-           echo "<!-- End of the accordion menu-->\n";
-           echo "</div>\n";
-           echo "</div>\n";
-
-	        echo "<script type=\"text/javascript\">\n";
-	        echo "$('#inner_menu').html($('#accordion_temp_$uid').html());\n";
-	        echo "$('#accordion_temp_$uid').remove();\n";
-	        echo "\n</script>\n";
-        }
-
-        //echo $this->s_deferred_content;
-        if (count($this->a_scripts) > 0)
-        {
-        	echo "<script type=\"text/javascript\">\n";
-        	echo implode("\n", $this->a_scripts);
-        	echo "\n</script>\n";
-        }
-        if (count($this->a_linked_scripts) > 0)
-        {
-        	echo "<script type=\"text/javascript\">\n";
-        	foreach($this->a_linked_scripts as $sScriptUrl)
-        	{
-        		echo '$.getScript('.json_encode($sScriptUrl).");\n";
-        	}
-        	echo "\n</script>\n";
-        }
-        if (!empty($this->s_deferred_content))
-        {
-            echo "<script type=\"text/javascript\">\n";
-            echo "\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');\n";
-            echo "\n</script>\n";
-        }
-        if (!empty($this->m_sReadyScript))
-        {
-	        echo "<script type=\"text/javascript\">\n";
-	        echo $this->m_sReadyScript; // Ready Scripts are output as simple scripts
-	        echo "\n</script>\n";
-        }
-        
-		if (trim($s_captured_output) != "")
-        {
-        	echo self::FilterXSS($s_captured_output);
-        }
-
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-    }
-
-    /**
-     * Adds a paragraph with a smaller font into the page
-     * NOT implemented (i.e does nothing)
-     * @param string $sText Content of the (small) paragraph     
-     * @return void
-     */	 	      
-    public function small_p($sText)
-    {
-	}
-
-    public function add($sHtml)
-    {
-        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
-        {
-            $this->m_oTabs->AddToTab($this->m_oTabs->GetCurrentTabContainer(), $this->m_oTabs->GetCurrentTab(), $sHtml);
-        }
-        else
-        {
-            parent::add($sHtml);
-        }
-    }
-
-	/**
-	 * Records the current state of the 'html' part of the page output
-	 * @return mixed The current state of the 'html' output
-	 */    
-    public function start_capture()
-    {
-    	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
-		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
-		
-		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
-		{
-			$iOffset = $this->m_oTabs->GetCurrentTabLength();
-			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
-		}
-		else
-		{
-			return parent::start_capture();
-		}
-    }
-
-    /**
-     * Returns the part of the html output that occurred since the call to start_capture
-     * and removes this part from the current html output
-     * @param $offset mixed The value returned by start_capture
-     * @return string The part of the html output that was added since the call to start_capture
-     */    
-    public function end_capture($offset)
-    {
-		if (is_array($offset))
-		{
-			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
-			{
-				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
-			}
-			else
-			{
-				$sCaptured = '';
-			}
-		}
-		else
-		{
-			$sCaptured = parent::end_capture($offset);
-		}
-		return $sCaptured;
-    }
-
-	/**
-	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
-	 * This is useful to add hidden content, DIVs or FORMs that should not
-	 * be embedded into each other.	 	 
-	 */
-    public function add_at_the_end($s_html, $sId = '')
-    {
-    	if ($sId != '')
-    	{
-	    	$this->add_script("$('#{$sId}').remove();"); // Remove any previous instance of the same Id
-    	}
-        $this->s_deferred_content .= $s_html;
-    }
-	
-	/**
-	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
-	 * NOT implemented in this version of the class.
-	 * @return void	 
-	 */	 	 	
-	public function add_ready_script($sScript)
-	{
-		$this->m_sReadyScript .= $sScript."\n";
-	}
-	
-	/**
-	 * Cannot be called in this context, since Ajax pages do not share
-	 * any context with the calling page !!
-	 */
-	public function GetUniqueId()
-	{
-		assert(false);
-		return 0;
-	}
-	
-	public static function FilterXSS($sHTML)
-	{
-		return str_ireplace(array('<script', '</script>'), array('<!-- <removed-script', '</removed-script> -->'), $sHTML);
-	}
-}
-
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Simple web page with no includes, header or fancy formatting, useful to
+ * generate HTML fragments when called by an AJAX method
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+ 
+class ajax_page extends WebPage implements iTabbedPage
+{
+    /**
+     * Jquery style ready script
+     * @var Hash     
+     */	  
+	protected $m_sReadyScript;
+	protected $m_oTabs;
+	private $m_sMenu; // If set, then the menu will be updated
+	
+    /**
+     * constructor for the web page
+     * @param string $s_title Not used
+     */	  
+	function __construct($s_title)
+    {
+		$sPrintable = utils::ReadParam('printable', '0');
+		$bPrintable = ($sPrintable == '1');
+
+        parent::__construct($s_title, $bPrintable);
+        $this->m_sReadyScript = "";
+		//$this->add_header("Content-type: text/html; charset=utf-8");
+		$this->add_header("Cache-control: no-cache");
+		$this->m_oTabs = new TabManager();
+		$this->sContentType = 'text/html';
+		$this->sContentDisposition = 'inline';
+		$this->m_sMenu = "";
+
+		utils::InitArchiveMode();
+    }
+
+	public function AddTabContainer($sTabContainer, $sPrefix = '')
+	{
+		$this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
+	}
+
+	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+	{
+		$this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
+	}
+
+	public function SetCurrentTabContainer($sTabContainer = '')
+	{
+		return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
+	}
+
+	public function SetCurrentTab($sTabLabel = '')
+	{
+		return $this->m_oTabs->SetCurrentTab($sTabLabel);
+	}
+	
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 * 
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+	 * Static content cannot be added inside such tabs.
+	 * 
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	{
+		$this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
+	}
+	
+	public function GetCurrentTab()
+	{
+		return $this->m_oTabs->GetCurrentTab();
+	}
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	{
+		$this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
+	}
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 * @return mixed The name of the tab as a string or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null)
+	{
+		return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
+	}
+
+	/**
+	 * Make the given tab the active one, as if it were clicked
+	 * DOES NOT WORK: apparently in the *old* version of jquery
+	 * that we are using this is not supported... TO DO upgrade
+	 * the whole jquery bundle...
+	 */
+	public function SelectTab($sTabContainer, $sTabLabel)
+	{
+		$this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
+	}
+	
+	public function AddToMenu($sHtml)
+	{
+		$this->m_sMenu .= $sHtml;
+	}
+
+    /**
+     * Echoes the content of the whole page
+     * @return void
+     */	  
+    public function output()
+    {
+    	if (!empty($this->sContentType))
+    	{
+			$this->add_header('Content-type: '.$this->sContentType);
+    	}
+    	if (!empty($this->sContentDisposition))
+    	{
+			$this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
+    	}
+        foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+		if ($this->m_oTabs->TabsContainerCount() > 0)
+		{
+			$this->add_ready_script(
+<<<EOF
+			// The "tab widgets" to handle.
+			var tabs = $('div[id^=tabbedContent]');
+			  
+			// Ugly patch for a change in the behavior of jQuery UI:
+			// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
+			// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
+			// is taken into account and causes "local" tabs to be considered as Ajax
+			// unless their URL is equal to the URL of the page...
+			if ($('base').length > 0)
+			{
+				$('div[id^=tabbedContent] > ul > li > a').each(function() {
+					var sHash = location.hash;
+					var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
+		    		$(this).attr("href", sCleanLocation+$(this).attr("href"));
+				});
+			}
+			if ($.bbq)
+			{
+				// This selector will be reused when selecting actual tab widget A elements.
+				var tab_a_selector = 'ul.ui-tabs-nav a';
+				  
+				// Enable tabs on all tab widgets. The `event` property must be overridden so
+				// that the tabs aren't changed on click, and any custom event name can be
+				// specified. Note that if you define a callback for the 'select' event, it
+				// will be executed for the selected tab whenever the hash changes.
+				tabs.tabs({ event: 'change' });
+				  
+				// Define our own click handler for the tabs, overriding the default.
+				tabs.find( tab_a_selector ).click(function()
+				{
+					var state = {};
+							  
+					// Get the id of this tab widget.
+					var id = $(this).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
+					  
+					// Get the index of this tab.
+					var idx = $(this).parent().prevAll().length;
+					
+					// Set the state!
+					state[ id ] = idx;
+					$.bbq.pushState( state );
+				});
+			}
+			else
+			{
+				tabs.tabs();
+			}
+EOF
+);
+		}
+		// Render the tabs in the page (if any)
+		$this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
+		
+		// Additional UI widgets to be activated inside the ajax fragment
+		// Important: Testing the content type is not enough because some ajax handlers have not correctly positionned the flag (e.g json response corrupted by the script)
+		if (($this->sContentType == 'text/html') && (preg_match('/class="date-pick"/', $this->s_content) || preg_match('/class="datetime-pick"/', $this->s_content)) )
+		{
+			$this->add_ready_script(
+<<<EOF
+PrepareWidgets();
+EOF
+			);
+		}
+        $s_captured_output = $this->ob_get_clean_safe();
+		  if (($this->sContentType == 'text/html') &&  ($this->sContentDisposition == 'inline'))
+        {
+        	// inline content != attachment && html => filter all scripts for malicious XSS scripts
+        	echo self::FilterXSS($this->s_content);
+        }
+        else
+        {
+        	echo $this->s_content;
+        }
+        if (!empty($this->m_sMenu))
+        {
+           $uid = time();
+           echo "<div id=\"accordion_temp_$uid\">\n";
+           echo "<div id=\"accordion\">\n";
+           echo "<!-- Beginning of the accordion menu -->\n";
+           echo self::FilterXSS($this->m_sMenu);
+           echo "<!-- End of the accordion menu-->\n";
+           echo "</div>\n";
+           echo "</div>\n";
+
+	        echo "<script type=\"text/javascript\">\n";
+	        echo "$('#inner_menu').html($('#accordion_temp_$uid').html());\n";
+	        echo "$('#accordion_temp_$uid').remove();\n";
+	        echo "\n</script>\n";
+        }
+
+        //echo $this->s_deferred_content;
+        if (count($this->a_scripts) > 0)
+        {
+        	echo "<script type=\"text/javascript\">\n";
+        	echo implode("\n", $this->a_scripts);
+        	echo "\n</script>\n";
+        }
+        if (count($this->a_linked_scripts) > 0)
+        {
+        	echo "<script type=\"text/javascript\">\n";
+        	foreach($this->a_linked_scripts as $sScriptUrl)
+        	{
+        		echo '$.getScript('.json_encode($sScriptUrl).");\n";
+        	}
+        	echo "\n</script>\n";
+        }
+        if (!empty($this->s_deferred_content))
+        {
+            echo "<script type=\"text/javascript\">\n";
+            echo "\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');\n";
+            echo "\n</script>\n";
+        }
+        if (!empty($this->m_sReadyScript))
+        {
+	        echo "<script type=\"text/javascript\">\n";
+	        echo $this->m_sReadyScript; // Ready Scripts are output as simple scripts
+	        echo "\n</script>\n";
+        }
+        
+		if (trim($s_captured_output) != "")
+        {
+        	echo self::FilterXSS($s_captured_output);
+        }
+
+        if (class_exists('DBSearch'))
+        {
+            DBSearch::RecordQueryTrace();
+        }
+    }
+
+    /**
+     * Adds a paragraph with a smaller font into the page
+     * NOT implemented (i.e does nothing)
+     * @param string $sText Content of the (small) paragraph     
+     * @return void
+     */	 	      
+    public function small_p($sText)
+    {
+	}
+
+    public function add($sHtml)
+    {
+        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != ''))
+        {
+            $this->m_oTabs->AddToTab($this->m_oTabs->GetCurrentTabContainer(), $this->m_oTabs->GetCurrentTab(), $sHtml);
+        }
+        else
+        {
+            parent::add($sHtml);
+        }
+    }
+
+	/**
+	 * Records the current state of the 'html' part of the page output
+	 * @return mixed The current state of the 'html' output
+	 */    
+    public function start_capture()
+    {
+    	$sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
+		$sCurrentTab = $this->m_oTabs->GetCurrentTab();
+		
+		if (!empty($sCurrentTabContainer) && !empty($sCurrentTab))
+		{
+			$iOffset = $this->m_oTabs->GetCurrentTabLength();
+			return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
+		}
+		else
+		{
+			return parent::start_capture();
+		}
+    }
+
+    /**
+     * Returns the part of the html output that occurred since the call to start_capture
+     * and removes this part from the current html output
+     * @param $offset mixed The value returned by start_capture
+     * @return string The part of the html output that was added since the call to start_capture
+     */    
+    public function end_capture($offset)
+    {
+		if (is_array($offset))
+		{
+			if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab']))
+			{
+				$sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
+			}
+			else
+			{
+				$sCaptured = '';
+			}
+		}
+		else
+		{
+			$sCaptured = parent::end_capture($offset);
+		}
+		return $sCaptured;
+    }
+
+	/**
+	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
+	 * This is useful to add hidden content, DIVs or FORMs that should not
+	 * be embedded into each other.	 	 
+	 */
+    public function add_at_the_end($s_html, $sId = '')
+    {
+    	if ($sId != '')
+    	{
+	    	$this->add_script("$('#{$sId}').remove();"); // Remove any previous instance of the same Id
+    	}
+        $this->s_deferred_content .= $s_html;
+    }
+	
+	/**
+	 * Adds a script to be executed when the DOM is ready (typical JQuery use)
+	 * NOT implemented in this version of the class.
+	 * @return void	 
+	 */	 	 	
+	public function add_ready_script($sScript)
+	{
+		$this->m_sReadyScript .= $sScript."\n";
+	}
+	
+	/**
+	 * Cannot be called in this context, since Ajax pages do not share
+	 * any context with the calling page !!
+	 */
+	public function GetUniqueId()
+	{
+		assert(false);
+		return 0;
+	}
+	
+	public static function FilterXSS($sHTML)
+	{
+		return str_ireplace(array('<script', '</script>'), array('<!-- <removed-script', '</removed-script> -->'), $sHTML);
+	}
+}
+
diff --git a/application/application.inc.php b/application/application.inc.php
index e75e44fd3..a41b19712 100644
--- a/application/application.inc.php
+++ b/application/application.inc.php
@@ -1,40 +1,40 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Includes all the classes to have the application up and running
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/applicationcontext.class.inc.php');
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-require_once(APPROOT.'/application/displayblock.class.inc.php');
-require_once(APPROOT.'/application/audit.category.class.inc.php');
-require_once(APPROOT.'/application/audit.rule.class.inc.php');
-require_once(APPROOT.'/application/query.class.inc.php');
-require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
-//require_once(APPROOT.'/application/menunode.class.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-
-class ApplicationException extends CoreException
-{
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Includes all the classes to have the application up and running
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/applicationcontext.class.inc.php');
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+require_once(APPROOT.'/application/audit.category.class.inc.php');
+require_once(APPROOT.'/application/audit.rule.class.inc.php');
+require_once(APPROOT.'/application/query.class.inc.php');
+require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
+//require_once(APPROOT.'/application/menunode.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+
+class ApplicationException extends CoreException
+{
+}
+?>
diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php
index 6f6d1dc53..015e80ce8 100644
--- a/application/applicationextension.inc.php
+++ b/application/applicationextension.inc.php
@@ -1,1228 +1,1228 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Management of application plugins
- * 
- * Definition of interfaces that can be implemented to customize iTop.
- * You may implement such interfaces in a module file (e.g. main.mymodule.php) 
- *
- * @package     Extensibility
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @api
- */
-
-/**
- * Implement this interface to change the behavior of the GUI for some objects.
- *
- * All methods are invoked by iTop for a given object. There are basically two usages:
- * 
- * 1) To tweak the form of an object, you will have to implement a specific behavior within:
- *  
- * * OnDisplayProperties (bEditMode = true)
- * * OnFormSubmit
- * * OnFormCancel
- * 
- * 2) To tune the display of the object details, you can use:
- *  
- * * OnDisplayProperties
- * * OnDisplayRelations
- * * GetIcon
- * * GetHilightClass
- *   
- * Please note that some of the APIs can be called several times for a single page displayed.
- * Therefore it is not recommended to perform too many operations, such as querying the database.
- * A recommended pattern is to cache data by the mean of static members. 
- *
- * @package     Extensibility
- * @api
- */
-interface iApplicationUIExtension
-{
-	/**
-	 *	Invoked when an object is being displayed (wiew or edit)
-	 *	
-	 * The method is called right after the main tab has been displayed.
-	 * You can add output to the page, either to change the display, or to add a form input
-	 * 
-	 * Example:
-	 * <code>
-	 * if ($bEditMode)
-	 * {
-	 * 	$oPage->p('Age of the captain: &lt;input type="text" name="captain_age"/&gt;');
-	 * }
-	 * else
-	 * {
-	 * 	$oPage->p('Age of the captain: '.$iCaptainAge);
-	 * }	 
-	 * </code>
-	 * 
-	 * @param DBObject $oObject The object being displayed
-	 * @param WebPage $oPage The output context
-	 * @param boolean $bEditMode True if the edition form is being displayed
-	 * @return void
-	 */	
-	public function OnDisplayProperties($oObject, WebPage $oPage, $bEditMode = false);
-
-	/**
-	 *	Invoked when an object is being displayed (wiew or edit)
-	 *	
-	 * The method is called rigth after all the tabs have been displayed 
-	 * 
-	 * @param DBObject $oObject The object being displayed
-	 * @param WebPage $oPage The output context
-	 * @param boolean $bEditMode True if the edition form is being displayed
-	 * @return void
-	 */	
-	public function OnDisplayRelations($oObject, WebPage $oPage, $bEditMode = false);
-
-	/**
-	 *	Invoked when the end-user clicks on Modify from the object edition form
-	 *	
-	 * The method is called after the changes from the standard form have been
-	 * taken into account, and before saving the changes into the database.	 
-	 * 
-	 * @param DBObject $oObject The object being edited
-	 * @param string $sFormPrefix Prefix given to the HTML form inputs
-	 * @return void
-	 */	
-	public function OnFormSubmit($oObject, $sFormPrefix = '');
-
-	/**
-	 *	Invoked when the end-user clicks on Cancel from the object edition form
-	 *	
-	 * Implement here any cleanup. This is necessary when you have injected some
-	 * javascript into the edition form, and if that code requires to store temporary data
-	 * (this is the case when a file must be uploaded).
-	 * 
-	 * @param string $sTempId Unique temporary identifier made of session_id and transaction_id. It identifies the object in a unique way.
-	 * @return void
-	 */	
-	public function OnFormCancel($sTempId);
-
-	/**
-	 *	Not yet called by the framework!
-	 *	
-	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
-	 * 
-	 * @param DBObject $oObject The object being displayed
-	 * @return type desc
-	 */	
-	public function EnumUsedAttributes($oObject); // Not yet implemented
-
-	/**
-	 *	Not yet called by the framework!
-	 *	
-	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
-	 * 
-	 * @param DBObject $oObject The object being displayed
-	 * @return string Path of the icon, relative to the modules directory.
-	 */	
-	public function GetIcon($oObject); // Not yet implemented
-
-	/**
-	 *	Invoked when the object is displayed alone or within a list
-	 *	
-	 * Returns a value influencing the appearance of the object depending on its
-	 * state.
-	 * 
-	 * Possible values are:
-	 *
-	 * * HILIGHT_CLASS_CRITICAL
- 	 * * HILIGHT_CLASS_WARNING
-	 * * HILIGHT_CLASS_OK
-	 * * HILIGHT_CLASS_NONE	
-	 * 
-	 * @param DBObject $oObject The object being displayed
-	 * @return integer The value representing the mood of the object
-	 */	
-	public function GetHilightClass($oObject);
-
-	/**
-	 *	Called when building the Actions menu for a single object or a list of objects
-	 *
-	 * Use this to add items to the Actions menu. You will have to specify a label and an URL.
-	 *
-	 * Example:
-	 * <code>
-	 * $oObject = $oSet->fetch();	 
-	 * if ($oObject instanceof Sheep)
-	 * {	 
-	 * 	return array('View in my app' => 'http://myserver/view_sheeps?id='.$oObject->Get('name'));
-	 * }
-	 * else
-	 * {
-	 * 	return array();
-	 * }
-	 * </code>
-	 *
-	 * See also iPopupMenuExtension for greater flexibility
-	 * 
-	 * @param DBObjectSet $oSet A set of persistent objects (DBObject)
-	 * @return string[string]
-	 */	
-	public function EnumAllowedActions(DBObjectSet $oSet);
-}
-
-/**
- * Implement this interface to perform specific things when objects are manipulated
- *
- * Note that those methods will be called when objects are manipulated, either in a programmatic way
- * or through the GUI. 
- *  
- * @package     Extensibility
- * @api
- */ 
-interface iApplicationObjectExtension
-{
-	/**
-	 *	Invoked to determine wether an object has been modified in memory
-	 *
-	 *	The GUI calls this verb to determine the message that will be displayed to the end-user.
-	 *	Anyhow, this API can be called in other contexts such as the CSV import tool.
-	 *	
-	 * If the extension returns false, then the framework will perform the usual evaluation.
-	 * Otherwise, the answer is definitively "yes, the object has changed".	 	 	 
-	 *	 
-	 * @param DBObject $oObject The target object
-	 * @return boolean True if something has changed for the target object
-	 */	
-	public function OnIsModified($oObject);
-
-	/**
-	 *	Invoked to determine wether an object can be written to the database 
-	 *	
-	 *	The GUI calls this verb and reports any issue.
-	 *	Anyhow, this API can be called in other contexts such as the CSV import tool.
-	 * 
-	 * @param DBObject $oObject The target object
-	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
-	 */	
-	public function OnCheckToWrite($oObject);
-
-	/**
-	 *	Invoked to determine wether an object can be deleted from the database
-	 *	
-	 * The GUI calls this verb and stops the deletion process if any issue is reported.
-	 * 	 
-	 * Please not that it is not possible to cascade deletion by this mean: only stopper issues can be handled. 	 
-	 * 
-	 * @param DBObject $oObject The target object
-	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
-	 */	
-	public function OnCheckToDelete($oObject);
-
-	/**
-	 *	Invoked when an object is updated into the database
-	 *	
-	 * The method is called right <b>after</b> the object has been written to the database.
-	 * 
-	 * @param DBObject $oObject The target object
-	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information once for all the changes made within the current page
-	 * @return void
-	 */	
-	public function OnDBUpdate($oObject, $oChange = null);
-
-	/**
-	 *	Invoked when an object is created into the database
-	 *	
-	 * The method is called right <b>after</b> the object has been written to the database.
-	 * 
-	 * @param DBObject $oObject The target object
-	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information once for all the changes made within the current page
-	 * @return void
-	 */	
-	public function OnDBInsert($oObject, $oChange = null);
-
-	/**
-	 *	Invoked when an object is deleted from the database
-	 *	
-	 * The method is called right <b>before</b> the object will be deleted from the database.
-	 * 
-	 * @param DBObject $oObject The target object
-	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information once for all the changes made within the current page
-	 * @return void
-	 */	
-	public function OnDBDelete($oObject, $oChange = null);
-}
-
-/**
- * New extension to add menu items in the "popup" menus inside iTop. Provides a greater flexibility than
- * iApplicationUIExtension::EnumAllowedActions.
- * 
- * To add some menus into iTop, declare a class that implements this interface, it will be called automatically
- * by the application, as long as the class definition is included somewhere in the code
- * 
- * @package     Extensibility
- * @api
- * @since 2.0  
- */
-interface iPopupMenuExtension
-{
-	/**
-	 * Insert an item into the Actions menu of a list
-	 *
-	 * $param is a DBObjectSet containing the list of objects	
-	 */	
-	const MENU_OBJLIST_ACTIONS = 1;
-	/**
-	 * Insert an item into the Toolkit menu of a list
-	 *
-	 * $param is a DBObjectSet containing the list of objects
-	 */	
-	const MENU_OBJLIST_TOOLKIT = 2;
-	/**
-	 * Insert an item into the Actions menu on an object details page
-	 *
-	 * $param is a DBObject instance: the object currently displayed
-	 */	
-	const MENU_OBJDETAILS_ACTIONS = 3;
-	/**
-	 * Insert an item into the Dashboard menu
-	 *
-	 * The dashboad menu is shown on the top right corner when a dashboard
-	 * is being displayed.
-	 * 
-	 * $param is a Dashboard instance: the dashboard currently displayed
-	 */	
-	const MENU_DASHBOARD_ACTIONS = 4;
-	/**
-	 * Insert an item into the User menu (upper right corner)
-	 *
-	 * $param is null
-	 */
-	const MENU_USER_ACTIONS = 5;
-    /**
-     * Insert an item into the Action menu on an object item in an objects list in the portal
-     *
-     * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object on the current line)
-     */
-    const PORTAL_OBJLISTITEM_ACTIONS = 7;
-    /**
-     * Insert an item into the Action menu on an object details page in the portal
-     *
-     * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object currently displayed)
-     */
-	const PORTAL_OBJDETAILS_ACTIONS = 8;
-
-    /**
-     * Insert an item into the Actions menu of a list in the portal
-     * Note: This is not implemented yet !
-     *
-     * $param is an array('portal_id' => $sPortalId, 'object_set' => $oSet) containing DBObjectSet containing the list of objects
-     * @todo
-     */
-    const PORTAL_OBJLIST_ACTIONS = 6;
-    /**
-     * Insert an item into the user menu of the portal
-     * Note: This is not implemented yet !
-     *
-     * $param is the portal id
-     * @todo
-     */
-    const PORTAL_USER_ACTIONS = 9;
-    /**
-     * Insert an item into the navigation menu of the portal
-     * Note: This is not implemented yet !
-     *
-     * $param is the portal id
-     * @todo
-     */
-    const PORTAL_MENU_ACTIONS = 10;
-
-	/**
-	 * Get the list of items to be added to a menu.
-	 *
-	 * This method is called by the framework for each menu.
-	 * The items will be inserted in the menu in the order of the returned array.
-	 * @param int $iMenuId The identifier of the type of menu, as listed by the constants MENU_xxx
-	 * @param mixed $param Depends on $iMenuId, see the constants defined above
-	 * @return object[] An array of ApplicationPopupMenuItem or an empty array if no action is to be added to the menu
-	 */
-	public static function EnumItems($iMenuId, $param);
-}
-
-/**
- * Base class for the various types of custom menus
- * 
- * @package     Extensibility
- * @internal
- * @since 2.0
- */
-abstract class ApplicationPopupMenuItem
-{
-	/** @ignore */
-	protected $sUID;
-	/** @ignore */
-	protected $sLabel;
-	/** @ignore */
-	protected $aCssClasses;
-	
-	/**
-	 *	Constructor
-	 *	
-	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
-     * @param string $sLabel The display label of the menu (must be localized)
-     * @param array $aCssClasses The CSS classes to add to the menu
-	 */
-	public function __construct($sUID, $sLabel)
-	{
-		$this->sUID = $sUID;
-		$this->sLabel = $sLabel;
-		$this->aCssClasses = array();
-	}
-	
-	/**
-	 *	Get the UID
-	 *	
-	 * @return string The unique identifier	 
-	 * @ignore	 	 
-	 */	
-	public function GetUID()
-	{
-		return $this->sUID;
-	}
-	
-	/**
-	 *	Get the label
-	 *	
-	 * @return string The label
-	 * @ignore	 	 
-	 */	
-	public function GetLabel()
-	{
-		return $this->sLabel;
-	}
-
-    /**
-     * Get the CSS classes
-     *
-     * @return array
-     * @ignore
-     */
-	public function GetCssClasses()
-    {
-        return $this->aCssClasses;
-    }
-
-    /**
-     * @param $aCssClasses
-     */
-    public function SetCssClasses($aCssClasses)
-    {
-        $this->aCssClasses = $aCssClasses;
-    }
-
-    /**
-     * Adds a CSS class to the CSS classes that will be put on the menu item
-     *
-     * @param $sCssClass
-     */
-	public function AddCssClass($sCssClass)
-    {
-        $this->aCssClasses[] = $sCssClass;
-    }
-	
-	/**
-	 * Returns the components to create a popup menu item in HTML
-	 * @return Hash A hash array: array('label' => , 'url' => , 'target' => , 'onclick' => )
-	 * @ignore	 	 
-	 */
-	abstract public function GetMenuItem();
-
-	/** @ignore */
-	public function GetLinkedScripts()
-	{
-		return array();
-	}
-}
-
-/**
- * Class for adding an item into a popup menu that browses to the given URL
- *  
- * @package     Extensibility
- * @api
- * @since 2.0  
- */
-class URLPopupMenuItem extends ApplicationPopupMenuItem
-{
-	/** @ignore */
-	protected $sURL;
-	/** @ignore */
-	protected $sTarget;
-	
-	/**
-	 * Constructor
-	 * 	 
-	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
-	 * @param string $sLabel The display label of the menu (must be localized)
-	 * @param string $sURL If the menu is an hyperlink, provide the absolute hyperlink here
-	 * @param string $sTarget In case the menu is an hyperlink and a specific target is needed (_blank for example), pass it here
-	 */
-	public function __construct($sUID, $sLabel, $sURL, $sTarget = '_top')
-	{
-		parent::__construct($sUID, $sLabel);
-		$this->sURL = $sURL;
-		$this->sTarget = $sTarget;
-	}
-	
-	/** @ignore */
-	public function GetMenuItem()
-	{
-		return array ('label' => $this->GetLabel(), 'url' => $this->sURL, 'target' => $this->sTarget, 'css_classes' => $this->aCssClasses);
-	}
-}
-
-/**
- * Class for adding an item into a popup menu that triggers some Javascript code
- * 
- * @package     Extensibility
- * @api
- * @since 2.0  
- */
-class JSPopupMenuItem extends ApplicationPopupMenuItem
-{
-	/** @ignore */
-	protected $sJSCode;
-	/** @ignore */
-	protected $aIncludeJSFiles;
-	
-	/**
-	 * Class for adding an item that triggers some Javascript code
-	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
-	 * @param string $sLabel The display label of the menu (must be localized)
-	 * @param string $sJSCode In case the menu consists in executing some havascript code inside the page, pass it here. If supplied $sURL ans $sTarget will be ignored
-	 * @param array $aIncludeJSFiles An array of file URLs to be included (once) to provide some JS libraries for the page.
-	 */
-	public function __construct($sUID, $sLabel, $sJSCode, $aIncludeJSFiles = array())
-	{
-		parent::__construct($sUID, $sLabel);
-		$this->sJSCode = $sJSCode;
-		$this->aIncludeJSFiles = $aIncludeJSFiles;
-	}
-	
-	/** @ignore */
-	public function GetMenuItem()
-	{
-		// Note: the semicolumn is a must here!
-		return array ('label' => $this->GetLabel(), 'onclick' => $this->sJSCode.'; return false;', 'url' => '#', 'css_classes' => $this->aCssClasses);
-	}
-	
-	/** @ignore */
-	public function GetLinkedScripts()
-	{
-		return $this->aIncludeJSFiles;
-	}
-}
-
-/**
- * Class for adding a separator (horizontal line, not selectable) the output
- * will automatically reduce several consecutive separators to just one
- * 
- * @package     Extensibility
- * @api
- * @since 2.0  
- */
-class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
-{
-	static $idx = 0;
-	/**
-	 * Constructor	
-	 */
-	public function __construct()
-	{
-		parent::__construct('_separator_'.(self::$idx++), '');
-	}
-	
-	/** @ignore */
-	public function GetMenuItem()
-	{
-		return array ('label' => '<hr class="menu-separator">', 'url' => '', 'css_classes' => $this->aCssClasses);
-	}
-}
-
-/**
- * Class for adding an item as a button that browses to the given URL
- *
- * @package     Extensibility
- * @api
- * @since 2.0
- */
-class URLButtonItem extends URLPopupMenuItem
-{
-
-}
-
-/**
- * Class for adding an item as a button that runs some JS code
- *
- * @package     Extensibility
- * @api
- * @since 2.0
- */
-class JSButtonItem extends JSPopupMenuItem
-{
-
-}
-
-/**
- * Implement this interface to add content to any iTopWebPage
- * 
- * There are 3 places where content can be added:
- * 
- * * The north pane: (normaly empty/hidden) at the top of the page, spanning the whole
- *   width of the page
- * * The south pane: (normaly empty/hidden) at the bottom of the page, spanning the whole
- *   width of the page
- * * The admin banner (two tones gray background) at the left of the global search.
- *   Limited space, use it for short messages
- * 
- * Each of the methods of this interface is supposed to return the HTML to be inserted at
- * the specified place and can use the passed iTopWebPage object to add javascript or CSS definitions
- *
- * @package     Extensibility
- * @api
- * @since 2.0  
- */
-interface iPageUIExtension
-{
-	/**
-	 * Add content to the North pane
-	 * @param iTopWebPage $oPage The page to insert stuff into.
-	 * @return string The HTML content to add into the page
-	 */
-	public function GetNorthPaneHtml(iTopWebPage $oPage);
-	/**
-	 * Add content to the South pane
-	 * @param iTopWebPage $oPage The page to insert stuff into.
-	 * @return string The HTML content to add into the page
-	 */
-	public function GetSouthPaneHtml(iTopWebPage $oPage);
-	/**
-	 * Add content to the "admin banner"
-	 * @param iTopWebPage $oPage The page to insert stuff into.
-	 * @return string The HTML content to add into the page
-	 */
-	public function GetBannerHtml(iTopWebPage $oPage);
-}
-
-/**
- * Implement this interface to add content to any enhanced portal page
- *
- * IMPORTANT! Experimental API, may be removed at anytime, we don't recommend to use it just now!
- *
- * @package     Extensibility
- * @api
- * @since 2.4
- */
-interface iPortalUIExtension
-{
-    const ENUM_PORTAL_EXT_UI_BODY = 'Body';
-    const ENUM_PORTAL_EXT_UI_NAVIGATION_MENU = 'NavigationMenu';
-    const ENUM_PORTAL_EXT_UI_MAIN_CONTENT = 'MainContent';
-
-    /**
-     * Returns an array of CSS file urls
-     *
-     * @param \Silex\Application $oApp
-     * @return array
-     */
-    public function GetCSSFiles(\Silex\Application $oApp);
-    /**
-     * Returns inline (raw) CSS
-     *
-     * @param \Silex\Application $oApp
-     * @return string
-     */
-    public function GetCSSInline(\Silex\Application $oApp);
-    /**
-     * Returns an array of JS file urls
-     *
-     * @param \Silex\Application $oApp
-     * @return array
-     */
-    public function GetJSFiles(\Silex\Application $oApp);
-    /**
-     * Returns raw JS code
-     *
-     * @param \Silex\Application $oApp
-     * @return string
-     */
-    public function GetJSInline(\Silex\Application $oApp);
-    /**
-     * Returns raw HTML code to put at the end of the <body> tag
-     *
-     * @param \Silex\Application $oApp
-     * @return string
-     */
-    public function GetBodyHTML(\Silex\Application $oApp);
-    /**
-     * Returns raw HTML code to put at the end of the #main-wrapper element
-     *
-     * @param \Silex\Application $oApp
-     * @return string
-     */
-    public function GetMainContentHTML(\Silex\Application $oApp);
-    /**
-     * Returns raw HTML code to put at the end of the #topbar and #sidebar elements
-     *
-     * @param \Silex\Application $oApp
-     * @return string
-     */
-    public function GetNavigationMenuHTML(\Silex\Application $oApp);
-}
-
-/**
- * IMPORTANT! Experimental API, may be removed at anytime, we don't recommend to use it just now!
- */
-abstract class AbstractPortalUIExtension implements iPortalUIExtension
-{
-    /**
-     * @inheritDoc
-     */
-    public function GetCSSFiles(\Silex\Application $oApp)
-    {
-        return array();
-    }
-    /**
-     * @inheritDoc
-     */
-    public function GetCSSInline(\Silex\Application $oApp)
-    {
-        return null;
-    }
-    /**
-     * @inheritDoc
-     */
-    public function GetJSFiles(\Silex\Application $oApp)
-    {
-        return array();
-    }
-    /**
-     * @inheritDoc
-     */
-    public function GetJSInline(\Silex\Application $oApp)
-    {
-        return null;
-    }
-    /**
-     * @inheritDoc
-     */
-    public function GetBodyHTML(\Silex\Application $oApp)
-    {
-        return null;
-    }
-    /**
-     * @inheritDoc
-     */
-    public function GetMainContentHTML(\Silex\Application $oApp)
-    {
-        return null;
-    }
-    /**
-     * @inheritDoc
-     */
-    public function GetNavigationMenuHTML(\Silex\Application $oApp)
-    {
-        return null;
-    }
-}
-
-/**
- * Implement this interface to add new operations to the REST/JSON web service
- *  
- * @package     Extensibility
- * @api
- * @since 2.0.1  
- */
-interface iRestServiceProvider
-{
-	/**
-	 * Enumerate services delivered by this class
-	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 * @return array An array of hash 'verb' => verb, 'description' => description
-	 */
-	public function ListOperations($sVersion);
-	/**
-	 * Enumerate services delivered by this class
-	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 * @return RestResult The standardized result structure (at least a message)
-	 * @throws Exception in case of internal failure.	 
-	 */
-	public function ExecOperation($sVersion, $sVerb, $aParams);
-}
-
-/**
- * Minimal REST response structure. Derive this structure to add response data and error codes.
- *
- * @package     Extensibility
- * @api
- * @since 2.0.1  
- */
-class RestResult
-{
-	/**
-	 * Result: no issue has been encountered
-	 */
-	const OK = 0;
-	/**
-	 * Result: missing/wrong credentials or the user does not have enough rights to perform the requested operation 
-	 */
-	const UNAUTHORIZED = 1;
-	/**
-	 * Result: the parameter 'version' is missing
-	 */
-	const MISSING_VERSION = 2;
-	/**
-	 * Result: the parameter 'json_data' is missing
-	 */
-	const MISSING_JSON = 3;
-	/**
-	 * Result: the input structure is not a valid JSON string
-	 */
-	const INVALID_JSON = 4;
-	/**
-	 * Result: the parameter 'auth_user' is missing, authentication aborted
-	 */
-	const MISSING_AUTH_USER = 5;
-	/**
-	 * Result: the parameter 'auth_pwd' is missing, authentication aborted
-	 */
-	const MISSING_AUTH_PWD = 6;
-	/**
-	 * Result: no operation is available for the specified version
-	 */
-	const UNSUPPORTED_VERSION = 10;
-	/**
-	 * Result: the requested operation is not valid for the specified version
-	 */
-	const UNKNOWN_OPERATION = 11;
-	/**
-	 * Result: the requested operation cannot be performed because it can cause data (integrity) loss 
-	 */
-	const UNSAFE = 12;
-	/**
-	 * Result: the operation could not be performed, see the message for troubleshooting
-	 */
-	const INTERNAL_ERROR = 100;
-
-	/**
-	 * Default constructor - ok!
-	 * 	 
-	 * @param DBObject $oObject The object being reported
-	 * @param string $sAttCode The attribute code (must be valid)
-	 * @return string A scalar representation of the value
-	 */
-	public function __construct()
-	{
-		$this->code = RestResult::OK;
-	}
-
-	public $code;
-	public $message;
-}
-
-/**
- * Helpers for implementing REST services
- *
- * @package     Extensibility
- * @api
- */
-class RestUtils
-{
-	/**
-	 * Registering tracking information. Any further object modification be associated with the given comment, when the modification gets recorded into the DB
-	 * 	 
-	 * @param StdClass $oData Structured input data. Must contain 'comment'.
-	 * @return void
-	 * @throws Exception
-	 * @api
-	 */
-	public static function InitTrackingComment($oData)
-	{
-		$sComment = self::GetMandatoryParam($oData, 'comment');
-		CMDBObject::SetTrackInfo($sComment);
-	}
-
-	/**
-	 * Read a mandatory parameter from  from a Rest/Json structure.
-	 * 	 
-	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @return void
-	 * @throws Exception If the parameter is missing
-	 * @api
-	 */
-	public static function GetMandatoryParam($oData, $sParamName)
-	{
-		if (isset($oData->$sParamName))
-		{
-			return $oData->$sParamName;
-		}
-		else
-		{
-			throw new Exception("Missing parameter '$sParamName'");
-		}
-	}
-
-
-	/**
-	 * Read an optional parameter from  from a Rest/Json structure.
-	 * 	 
-	 * @param StdClass $oData Structured input data.
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @param mixed $default Default value if the parameter is not found in the input data
-	 * @return void
-	 * @throws Exception
-	 * @api
-	 */
-	public static function GetOptionalParam($oData, $sParamName, $default)
-	{
-		if (isset($oData->$sParamName))
-		{
-			return $oData->$sParamName;
-		}
-		else
-		{
-			return $default;
-		}
-	}
-
-
-	/**
-	 * Read a class  from a Rest/Json structure.
-	 *
-	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @return void
-	 * @throws Exception If the parameter is missing or the class is unknown
-	 * @api
-	 */
-	public static function GetClass($oData, $sParamName)
-	{
-		$sClass = self::GetMandatoryParam($oData, $sParamName);
-		if (!MetaModel::IsValidClass($sClass))
-		{
-			throw new Exception("$sParamName: '$sClass' is not a valid class'");
-		}
-		return $sClass;
-	}
-
-
-	/**
-	 * Read a list of attribute codes from a Rest/Json structure.
-	 * 	 
-	 * @param string $sClass Name of the class
-	 * @param StdClass $oData Structured input data.
-	 * @param string $sParamName Name of the parameter to fetch from the input data
-	 * @return An array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
-	 * @throws Exception
-	 * @api
-	 */
-	public static function GetFieldList($sClass, $oData, $sParamName)
-	{
-		$sFields = self::GetOptionalParam($oData, $sParamName, '*');
-		$aShowFields = array();
-		if ($sFields == '*')
-		{
-			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-			{
-				$aShowFields[$sClass][] = $sAttCode;
-			}
-		}
-		elseif ($sFields == '*+')
-		{
-			foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass)
-			{
-				foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef)
-				{
-					$aShowFields[$sRefClass][] = $sAttCode;
-				}
-			}
-		}
-		else
-		{
-			foreach(explode(',', $sFields) as $sAttCode)
-			{
-				$sAttCode = trim($sAttCode);
-				if (($sAttCode != 'id') && (!MetaModel::IsValidAttCode($sClass, $sAttCode)))
-				{
-					throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
-				}
-				$aShowFields[$sClass][] = $sAttCode;
-			}
-		}
-		return $aShowFields;
-	}
-
-	/**
-	 * Read and interpret object search criteria from a Rest/Json structure
-	 * 	  	 
-	 * @param string $sClass Name of the class
-	 * @param StdClass $oCriteria Hash of attribute code => value (can be a substructure or a scalar, depending on the nature of the attriute)
-	 * @return object The object found
-	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 */
-	protected static function FindObjectFromCriteria($sClass, $oCriteria)
-	{
-		$aCriteriaReport = array();
-		if (isset($oCriteria->finalclass))
-		{
-			if (!MetaModel::IsValidClass($oCriteria->finalclass))
-			{
-				throw new Exception("finalclass: Unknown class '".$oCriteria->finalclass."'");
-			}
-			if (!MetaModel::IsParentClass($sClass, $oCriteria->finalclass))
-			{
-				throw new Exception("finalclass: '".$oCriteria->finalclass."' is not a child class of '$sClass'");
-			}
-			$sClass = $oCriteria->finalclass;
-		}
-		$oSearch = new DBObjectSearch($sClass);
-		foreach ($oCriteria as $sAttCode => $value)
-		{
-			$realValue = static::MakeValue($sClass, $sAttCode, $value);
-			$oSearch->AddCondition($sAttCode, $realValue, '=');
-			if (is_object($value) || is_array($value))
-			{
-				$value = json_encode($value);
-			}
-			$aCriteriaReport[] = "$sAttCode: $value ($realValue)";
-		}
-		$oSet = new DBObjectSet($oSearch);
-		$iCount = $oSet->Count();
-		if ($iCount == 0)
-		{
-			throw new Exception("No item found with criteria: ".implode(', ', $aCriteriaReport));
-		}
-		elseif ($iCount > 1)
-		{
-			throw new Exception("Several items found ($iCount) with criteria: ".implode(', ', $aCriteriaReport));
-		}
-		$res = $oSet->Fetch();
-		return $res;
-	}
-
-
-	/**
-	 * Find an object from a polymorph search specification (Rest/Json)
-	 * 	 
-	 * @param string $sClass Name of the class
-	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
-	 * @param bool $bAllowNullValue Allow the cases such as key = 0 or key = {null} and return null then
-	 * @return DBObject The object found
-	 * @throws Exception If the input structure is not valid or it could not find exactly one object
-	 * @api
-	 */
-	public static function FindObjectFromKey($sClass, $key, $bAllowNullValue = false)
-	{
-		if (is_object($key))
-		{
-			$res = static::FindObjectFromCriteria($sClass, $key);
-		}
-		elseif (is_numeric($key))
-		{
-			if ($bAllowNullValue && ($key == 0))
-			{
-				$res = null;
-			}
-			else
-			{
-				$res = MetaModel::GetObject($sClass, $key, false);
-				if (is_null($res))
-				{
-					throw new Exception("Invalid object $sClass::$key");
-				}
-			}
-		}
-		elseif (is_string($key))
-		{
-			// OQL
-			$oSearch = DBObjectSearch::FromOQL($key);
-			$oSet = new DBObjectSet($oSearch);
-			$iCount = $oSet->Count();
-			if ($iCount == 0)
-			{
-				throw new Exception("No item found for query: $key");
-			}
-			elseif ($iCount > 1)
-			{
-				throw new Exception("Several items found ($iCount) for query: $key");
-			}
-			$res = $oSet->Fetch();
-		}
-		else
-		{
-			throw new Exception("Wrong format for key");
-		}
-		return $res;
-	}
-
-	/**
-	 * Search objects from a polymorph search specification (Rest/Json)
-	 * 	 
-	 * @param string $sClass Name of the class
-	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
-	 * @return DBObjectSet The search result set
-	 * @throws Exception If the input structure is not valid
-	 */
-	public static function GetObjectSetFromKey($sClass, $key)
-	{
-		if (is_object($key))
-		{
-			if (isset($key->finalclass))
-			{
-				$sClass = $key->finalclass;
-				if (!MetaModel::IsValidClass($sClass))
-				{
-					throw new Exception("finalclass: Unknown class '$sClass'");
-				}
-			}
-		
-			$oSearch = new DBObjectSearch($sClass);
-			foreach ($key as $sAttCode => $value)
-			{
-				$realValue = static::MakeValue($sClass, $sAttCode, $value);
-				$oSearch->AddCondition($sAttCode, $realValue, '=');
-			}
-		}
-		elseif (is_numeric($key))
-		{
-			$oSearch = new DBObjectSearch($sClass);
-			$oSearch->AddCondition('id', $key);
-		}
-		elseif (is_string($key))
-		{
-			// OQL
-			$oSearch = DBObjectSearch::FromOQL($key);
-			$oObjectSet = new DBObjectSet($oSearch);
-		}
-		else
-		{
-			throw new Exception("Wrong format for key");
-		}
-		$oObjectSet = new DBObjectSet($oSearch);
-		return $oObjectSet;
-	}
-
-	/**
-	 * Interpret the Rest/Json value and get a valid attribute value
-	 * 	 
-	 * @param string $sClass Name of the class
-	 * @param string $sAttCode Attribute code
-	 * @param mixed $value Depending on the type of attribute (a scalar, or search criteria, or list of related objects...)
-	 * @return mixed The value that can be used with DBObject::Set()
-	 * @throws Exception If the specification of the value is not valid.
-	 * @api
-	 */
-	public static function MakeValue($sClass, $sAttCode, $value)
-	{
-		try
-		{
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				throw new Exception("Unknown attribute");
-			}
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			if ($oAttDef instanceof AttributeExternalKey)
-			{
-				$oExtKeyObject = static::FindObjectFromKey($oAttDef->GetTargetClass(), $value, true /* allow null */);
-				$value = ($oExtKeyObject != null) ? $oExtKeyObject->GetKey() : 0;
-			}
-			elseif ($oAttDef instanceof AttributeLinkedSet)
-			{
-				if (!is_array($value))
-				{
-					throw new Exception("A link set must be defined by an array of objects");
-				}
-				$sLnkClass = $oAttDef->GetLinkedClass();
-				$aLinks = array();
-				foreach($value as $oValues)
-				{
-					$oLnk = static::MakeObjectFromFields($sLnkClass, $oValues);
-					$aLinks[] = $oLnk;
-				}
-				$value = DBObjectSet::FromArray($sLnkClass, $aLinks);
-			}
-			else
-			{
-				$value = $oAttDef->FromJSONToValue($value);
-			}
-		}
-		catch (Exception $e)
-		{
-			throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
-		}
-		return $value;
-	}
-
-	/**
-	 * Interpret a Rest/Json structure that defines attribute values, and build an object
-	 * 	 
-	 * @param string $sClass Name of the class
-	 * @param array $aFields A hash of attribute code => value specification.
-	 * @return DBObject The newly created object
-	 * @throws Exception If the specification of the values is not valid
-	 * @api
-	 */
-	public static function MakeObjectFromFields($sClass, $aFields)
-	{
-		$oObject = MetaModel::NewObject($sClass);
-		foreach ($aFields as $sAttCode => $value)
-		{
-			$realValue = static::MakeValue($sClass, $sAttCode, $value);
-			try
-			{
-				$oObject->Set($sAttCode, $realValue);
-			}
-			catch (Exception $e)
-			{
-				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
-			}
-		}
-		return $oObject;
-	}
-
-	/**
-	 * Interpret a Rest/Json structure that defines attribute values, and update the given object
-	 * 	 
-	 * @param DBObject $oObject The object being modified
-	 * @param array $aFields A hash of attribute code => value specification.
-	 * @return DBObject The object modified
-	 * @throws Exception If the specification of the values is not valid
-	 * @api
-	 */
-	public static function UpdateObjectFromFields($oObject, $aFields)
-	{
-		$sClass = get_class($oObject);
-		foreach ($aFields as $sAttCode => $value)
-		{
-			$realValue = static::MakeValue($sClass, $sAttCode, $value);
-			try
-			{
-				$oObject->Set($sAttCode, $realValue);
-			}
-			catch (Exception $e)
-			{
-				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
-			}
-		}
-		return $oObject;
-	}
-}
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Management of application plugins
+ * 
+ * Definition of interfaces that can be implemented to customize iTop.
+ * You may implement such interfaces in a module file (e.g. main.mymodule.php) 
+ *
+ * @package     Extensibility
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @api
+ */
+
+/**
+ * Implement this interface to change the behavior of the GUI for some objects.
+ *
+ * All methods are invoked by iTop for a given object. There are basically two usages:
+ * 
+ * 1) To tweak the form of an object, you will have to implement a specific behavior within:
+ *  
+ * * OnDisplayProperties (bEditMode = true)
+ * * OnFormSubmit
+ * * OnFormCancel
+ * 
+ * 2) To tune the display of the object details, you can use:
+ *  
+ * * OnDisplayProperties
+ * * OnDisplayRelations
+ * * GetIcon
+ * * GetHilightClass
+ *   
+ * Please note that some of the APIs can be called several times for a single page displayed.
+ * Therefore it is not recommended to perform too many operations, such as querying the database.
+ * A recommended pattern is to cache data by the mean of static members. 
+ *
+ * @package     Extensibility
+ * @api
+ */
+interface iApplicationUIExtension
+{
+	/**
+	 *	Invoked when an object is being displayed (wiew or edit)
+	 *	
+	 * The method is called right after the main tab has been displayed.
+	 * You can add output to the page, either to change the display, or to add a form input
+	 * 
+	 * Example:
+	 * <code>
+	 * if ($bEditMode)
+	 * {
+	 * 	$oPage->p('Age of the captain: &lt;input type="text" name="captain_age"/&gt;');
+	 * }
+	 * else
+	 * {
+	 * 	$oPage->p('Age of the captain: '.$iCaptainAge);
+	 * }	 
+	 * </code>
+	 * 
+	 * @param DBObject $oObject The object being displayed
+	 * @param WebPage $oPage The output context
+	 * @param boolean $bEditMode True if the edition form is being displayed
+	 * @return void
+	 */	
+	public function OnDisplayProperties($oObject, WebPage $oPage, $bEditMode = false);
+
+	/**
+	 *	Invoked when an object is being displayed (wiew or edit)
+	 *	
+	 * The method is called rigth after all the tabs have been displayed 
+	 * 
+	 * @param DBObject $oObject The object being displayed
+	 * @param WebPage $oPage The output context
+	 * @param boolean $bEditMode True if the edition form is being displayed
+	 * @return void
+	 */	
+	public function OnDisplayRelations($oObject, WebPage $oPage, $bEditMode = false);
+
+	/**
+	 *	Invoked when the end-user clicks on Modify from the object edition form
+	 *	
+	 * The method is called after the changes from the standard form have been
+	 * taken into account, and before saving the changes into the database.	 
+	 * 
+	 * @param DBObject $oObject The object being edited
+	 * @param string $sFormPrefix Prefix given to the HTML form inputs
+	 * @return void
+	 */	
+	public function OnFormSubmit($oObject, $sFormPrefix = '');
+
+	/**
+	 *	Invoked when the end-user clicks on Cancel from the object edition form
+	 *	
+	 * Implement here any cleanup. This is necessary when you have injected some
+	 * javascript into the edition form, and if that code requires to store temporary data
+	 * (this is the case when a file must be uploaded).
+	 * 
+	 * @param string $sTempId Unique temporary identifier made of session_id and transaction_id. It identifies the object in a unique way.
+	 * @return void
+	 */	
+	public function OnFormCancel($sTempId);
+
+	/**
+	 *	Not yet called by the framework!
+	 *	
+	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
+	 * 
+	 * @param DBObject $oObject The object being displayed
+	 * @return type desc
+	 */	
+	public function EnumUsedAttributes($oObject); // Not yet implemented
+
+	/**
+	 *	Not yet called by the framework!
+	 *	
+	 * Sorry, the verb has been reserved. You must implement it, but it is not called as of now.
+	 * 
+	 * @param DBObject $oObject The object being displayed
+	 * @return string Path of the icon, relative to the modules directory.
+	 */	
+	public function GetIcon($oObject); // Not yet implemented
+
+	/**
+	 *	Invoked when the object is displayed alone or within a list
+	 *	
+	 * Returns a value influencing the appearance of the object depending on its
+	 * state.
+	 * 
+	 * Possible values are:
+	 *
+	 * * HILIGHT_CLASS_CRITICAL
+ 	 * * HILIGHT_CLASS_WARNING
+	 * * HILIGHT_CLASS_OK
+	 * * HILIGHT_CLASS_NONE	
+	 * 
+	 * @param DBObject $oObject The object being displayed
+	 * @return integer The value representing the mood of the object
+	 */	
+	public function GetHilightClass($oObject);
+
+	/**
+	 *	Called when building the Actions menu for a single object or a list of objects
+	 *
+	 * Use this to add items to the Actions menu. You will have to specify a label and an URL.
+	 *
+	 * Example:
+	 * <code>
+	 * $oObject = $oSet->fetch();	 
+	 * if ($oObject instanceof Sheep)
+	 * {	 
+	 * 	return array('View in my app' => 'http://myserver/view_sheeps?id='.$oObject->Get('name'));
+	 * }
+	 * else
+	 * {
+	 * 	return array();
+	 * }
+	 * </code>
+	 *
+	 * See also iPopupMenuExtension for greater flexibility
+	 * 
+	 * @param DBObjectSet $oSet A set of persistent objects (DBObject)
+	 * @return string[string]
+	 */	
+	public function EnumAllowedActions(DBObjectSet $oSet);
+}
+
+/**
+ * Implement this interface to perform specific things when objects are manipulated
+ *
+ * Note that those methods will be called when objects are manipulated, either in a programmatic way
+ * or through the GUI. 
+ *  
+ * @package     Extensibility
+ * @api
+ */ 
+interface iApplicationObjectExtension
+{
+	/**
+	 *	Invoked to determine wether an object has been modified in memory
+	 *
+	 *	The GUI calls this verb to determine the message that will be displayed to the end-user.
+	 *	Anyhow, this API can be called in other contexts such as the CSV import tool.
+	 *	
+	 * If the extension returns false, then the framework will perform the usual evaluation.
+	 * Otherwise, the answer is definitively "yes, the object has changed".	 	 	 
+	 *	 
+	 * @param DBObject $oObject The target object
+	 * @return boolean True if something has changed for the target object
+	 */	
+	public function OnIsModified($oObject);
+
+	/**
+	 *	Invoked to determine wether an object can be written to the database 
+	 *	
+	 *	The GUI calls this verb and reports any issue.
+	 *	Anyhow, this API can be called in other contexts such as the CSV import tool.
+	 * 
+	 * @param DBObject $oObject The target object
+	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
+	 */	
+	public function OnCheckToWrite($oObject);
+
+	/**
+	 *	Invoked to determine wether an object can be deleted from the database
+	 *	
+	 * The GUI calls this verb and stops the deletion process if any issue is reported.
+	 * 	 
+	 * Please not that it is not possible to cascade deletion by this mean: only stopper issues can be handled. 	 
+	 * 
+	 * @param DBObject $oObject The target object
+	 * @return string[] A list of errors message. An error message is made of one line and it can be displayed to the end-user.
+	 */	
+	public function OnCheckToDelete($oObject);
+
+	/**
+	 *	Invoked when an object is updated into the database
+	 *	
+	 * The method is called right <b>after</b> the object has been written to the database.
+	 * 
+	 * @param DBObject $oObject The target object
+	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information once for all the changes made within the current page
+	 * @return void
+	 */	
+	public function OnDBUpdate($oObject, $oChange = null);
+
+	/**
+	 *	Invoked when an object is created into the database
+	 *	
+	 * The method is called right <b>after</b> the object has been written to the database.
+	 * 
+	 * @param DBObject $oObject The target object
+	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information once for all the changes made within the current page
+	 * @return void
+	 */	
+	public function OnDBInsert($oObject, $oChange = null);
+
+	/**
+	 *	Invoked when an object is deleted from the database
+	 *	
+	 * The method is called right <b>before</b> the object will be deleted from the database.
+	 * 
+	 * @param DBObject $oObject The target object
+	 * @param CMDBChange|null $oChange A change context. Since 2.0 it is fine to ignore it, as the framework does maintain this information once for all the changes made within the current page
+	 * @return void
+	 */	
+	public function OnDBDelete($oObject, $oChange = null);
+}
+
+/**
+ * New extension to add menu items in the "popup" menus inside iTop. Provides a greater flexibility than
+ * iApplicationUIExtension::EnumAllowedActions.
+ * 
+ * To add some menus into iTop, declare a class that implements this interface, it will be called automatically
+ * by the application, as long as the class definition is included somewhere in the code
+ * 
+ * @package     Extensibility
+ * @api
+ * @since 2.0  
+ */
+interface iPopupMenuExtension
+{
+	/**
+	 * Insert an item into the Actions menu of a list
+	 *
+	 * $param is a DBObjectSet containing the list of objects	
+	 */	
+	const MENU_OBJLIST_ACTIONS = 1;
+	/**
+	 * Insert an item into the Toolkit menu of a list
+	 *
+	 * $param is a DBObjectSet containing the list of objects
+	 */	
+	const MENU_OBJLIST_TOOLKIT = 2;
+	/**
+	 * Insert an item into the Actions menu on an object details page
+	 *
+	 * $param is a DBObject instance: the object currently displayed
+	 */	
+	const MENU_OBJDETAILS_ACTIONS = 3;
+	/**
+	 * Insert an item into the Dashboard menu
+	 *
+	 * The dashboad menu is shown on the top right corner when a dashboard
+	 * is being displayed.
+	 * 
+	 * $param is a Dashboard instance: the dashboard currently displayed
+	 */	
+	const MENU_DASHBOARD_ACTIONS = 4;
+	/**
+	 * Insert an item into the User menu (upper right corner)
+	 *
+	 * $param is null
+	 */
+	const MENU_USER_ACTIONS = 5;
+    /**
+     * Insert an item into the Action menu on an object item in an objects list in the portal
+     *
+     * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object on the current line)
+     */
+    const PORTAL_OBJLISTITEM_ACTIONS = 7;
+    /**
+     * Insert an item into the Action menu on an object details page in the portal
+     *
+     * $param is an array('portal_id' => $sPortalId, 'object' => $oObject) containing the portal id and a DBObject instance (the object currently displayed)
+     */
+	const PORTAL_OBJDETAILS_ACTIONS = 8;
+
+    /**
+     * Insert an item into the Actions menu of a list in the portal
+     * Note: This is not implemented yet !
+     *
+     * $param is an array('portal_id' => $sPortalId, 'object_set' => $oSet) containing DBObjectSet containing the list of objects
+     * @todo
+     */
+    const PORTAL_OBJLIST_ACTIONS = 6;
+    /**
+     * Insert an item into the user menu of the portal
+     * Note: This is not implemented yet !
+     *
+     * $param is the portal id
+     * @todo
+     */
+    const PORTAL_USER_ACTIONS = 9;
+    /**
+     * Insert an item into the navigation menu of the portal
+     * Note: This is not implemented yet !
+     *
+     * $param is the portal id
+     * @todo
+     */
+    const PORTAL_MENU_ACTIONS = 10;
+
+	/**
+	 * Get the list of items to be added to a menu.
+	 *
+	 * This method is called by the framework for each menu.
+	 * The items will be inserted in the menu in the order of the returned array.
+	 * @param int $iMenuId The identifier of the type of menu, as listed by the constants MENU_xxx
+	 * @param mixed $param Depends on $iMenuId, see the constants defined above
+	 * @return object[] An array of ApplicationPopupMenuItem or an empty array if no action is to be added to the menu
+	 */
+	public static function EnumItems($iMenuId, $param);
+}
+
+/**
+ * Base class for the various types of custom menus
+ * 
+ * @package     Extensibility
+ * @internal
+ * @since 2.0
+ */
+abstract class ApplicationPopupMenuItem
+{
+	/** @ignore */
+	protected $sUID;
+	/** @ignore */
+	protected $sLabel;
+	/** @ignore */
+	protected $aCssClasses;
+	
+	/**
+	 *	Constructor
+	 *	
+	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
+     * @param string $sLabel The display label of the menu (must be localized)
+     * @param array $aCssClasses The CSS classes to add to the menu
+	 */
+	public function __construct($sUID, $sLabel)
+	{
+		$this->sUID = $sUID;
+		$this->sLabel = $sLabel;
+		$this->aCssClasses = array();
+	}
+	
+	/**
+	 *	Get the UID
+	 *	
+	 * @return string The unique identifier	 
+	 * @ignore	 	 
+	 */	
+	public function GetUID()
+	{
+		return $this->sUID;
+	}
+	
+	/**
+	 *	Get the label
+	 *	
+	 * @return string The label
+	 * @ignore	 	 
+	 */	
+	public function GetLabel()
+	{
+		return $this->sLabel;
+	}
+
+    /**
+     * Get the CSS classes
+     *
+     * @return array
+     * @ignore
+     */
+	public function GetCssClasses()
+    {
+        return $this->aCssClasses;
+    }
+
+    /**
+     * @param $aCssClasses
+     */
+    public function SetCssClasses($aCssClasses)
+    {
+        $this->aCssClasses = $aCssClasses;
+    }
+
+    /**
+     * Adds a CSS class to the CSS classes that will be put on the menu item
+     *
+     * @param $sCssClass
+     */
+	public function AddCssClass($sCssClass)
+    {
+        $this->aCssClasses[] = $sCssClass;
+    }
+	
+	/**
+	 * Returns the components to create a popup menu item in HTML
+	 * @return Hash A hash array: array('label' => , 'url' => , 'target' => , 'onclick' => )
+	 * @ignore	 	 
+	 */
+	abstract public function GetMenuItem();
+
+	/** @ignore */
+	public function GetLinkedScripts()
+	{
+		return array();
+	}
+}
+
+/**
+ * Class for adding an item into a popup menu that browses to the given URL
+ *  
+ * @package     Extensibility
+ * @api
+ * @since 2.0  
+ */
+class URLPopupMenuItem extends ApplicationPopupMenuItem
+{
+	/** @ignore */
+	protected $sURL;
+	/** @ignore */
+	protected $sTarget;
+	
+	/**
+	 * Constructor
+	 * 	 
+	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
+	 * @param string $sLabel The display label of the menu (must be localized)
+	 * @param string $sURL If the menu is an hyperlink, provide the absolute hyperlink here
+	 * @param string $sTarget In case the menu is an hyperlink and a specific target is needed (_blank for example), pass it here
+	 */
+	public function __construct($sUID, $sLabel, $sURL, $sTarget = '_top')
+	{
+		parent::__construct($sUID, $sLabel);
+		$this->sURL = $sURL;
+		$this->sTarget = $sTarget;
+	}
+	
+	/** @ignore */
+	public function GetMenuItem()
+	{
+		return array ('label' => $this->GetLabel(), 'url' => $this->sURL, 'target' => $this->sTarget, 'css_classes' => $this->aCssClasses);
+	}
+}
+
+/**
+ * Class for adding an item into a popup menu that triggers some Javascript code
+ * 
+ * @package     Extensibility
+ * @api
+ * @since 2.0  
+ */
+class JSPopupMenuItem extends ApplicationPopupMenuItem
+{
+	/** @ignore */
+	protected $sJSCode;
+	/** @ignore */
+	protected $aIncludeJSFiles;
+	
+	/**
+	 * Class for adding an item that triggers some Javascript code
+	 * @param string $sUID The unique identifier of this menu in iTop... make sure you pass something unique enough
+	 * @param string $sLabel The display label of the menu (must be localized)
+	 * @param string $sJSCode In case the menu consists in executing some havascript code inside the page, pass it here. If supplied $sURL ans $sTarget will be ignored
+	 * @param array $aIncludeJSFiles An array of file URLs to be included (once) to provide some JS libraries for the page.
+	 */
+	public function __construct($sUID, $sLabel, $sJSCode, $aIncludeJSFiles = array())
+	{
+		parent::__construct($sUID, $sLabel);
+		$this->sJSCode = $sJSCode;
+		$this->aIncludeJSFiles = $aIncludeJSFiles;
+	}
+	
+	/** @ignore */
+	public function GetMenuItem()
+	{
+		// Note: the semicolumn is a must here!
+		return array ('label' => $this->GetLabel(), 'onclick' => $this->sJSCode.'; return false;', 'url' => '#', 'css_classes' => $this->aCssClasses);
+	}
+	
+	/** @ignore */
+	public function GetLinkedScripts()
+	{
+		return $this->aIncludeJSFiles;
+	}
+}
+
+/**
+ * Class for adding a separator (horizontal line, not selectable) the output
+ * will automatically reduce several consecutive separators to just one
+ * 
+ * @package     Extensibility
+ * @api
+ * @since 2.0  
+ */
+class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
+{
+	static $idx = 0;
+	/**
+	 * Constructor	
+	 */
+	public function __construct()
+	{
+		parent::__construct('_separator_'.(self::$idx++), '');
+	}
+	
+	/** @ignore */
+	public function GetMenuItem()
+	{
+		return array ('label' => '<hr class="menu-separator">', 'url' => '', 'css_classes' => $this->aCssClasses);
+	}
+}
+
+/**
+ * Class for adding an item as a button that browses to the given URL
+ *
+ * @package     Extensibility
+ * @api
+ * @since 2.0
+ */
+class URLButtonItem extends URLPopupMenuItem
+{
+
+}
+
+/**
+ * Class for adding an item as a button that runs some JS code
+ *
+ * @package     Extensibility
+ * @api
+ * @since 2.0
+ */
+class JSButtonItem extends JSPopupMenuItem
+{
+
+}
+
+/**
+ * Implement this interface to add content to any iTopWebPage
+ * 
+ * There are 3 places where content can be added:
+ * 
+ * * The north pane: (normaly empty/hidden) at the top of the page, spanning the whole
+ *   width of the page
+ * * The south pane: (normaly empty/hidden) at the bottom of the page, spanning the whole
+ *   width of the page
+ * * The admin banner (two tones gray background) at the left of the global search.
+ *   Limited space, use it for short messages
+ * 
+ * Each of the methods of this interface is supposed to return the HTML to be inserted at
+ * the specified place and can use the passed iTopWebPage object to add javascript or CSS definitions
+ *
+ * @package     Extensibility
+ * @api
+ * @since 2.0  
+ */
+interface iPageUIExtension
+{
+	/**
+	 * Add content to the North pane
+	 * @param iTopWebPage $oPage The page to insert stuff into.
+	 * @return string The HTML content to add into the page
+	 */
+	public function GetNorthPaneHtml(iTopWebPage $oPage);
+	/**
+	 * Add content to the South pane
+	 * @param iTopWebPage $oPage The page to insert stuff into.
+	 * @return string The HTML content to add into the page
+	 */
+	public function GetSouthPaneHtml(iTopWebPage $oPage);
+	/**
+	 * Add content to the "admin banner"
+	 * @param iTopWebPage $oPage The page to insert stuff into.
+	 * @return string The HTML content to add into the page
+	 */
+	public function GetBannerHtml(iTopWebPage $oPage);
+}
+
+/**
+ * Implement this interface to add content to any enhanced portal page
+ *
+ * IMPORTANT! Experimental API, may be removed at anytime, we don't recommend to use it just now!
+ *
+ * @package     Extensibility
+ * @api
+ * @since 2.4
+ */
+interface iPortalUIExtension
+{
+    const ENUM_PORTAL_EXT_UI_BODY = 'Body';
+    const ENUM_PORTAL_EXT_UI_NAVIGATION_MENU = 'NavigationMenu';
+    const ENUM_PORTAL_EXT_UI_MAIN_CONTENT = 'MainContent';
+
+    /**
+     * Returns an array of CSS file urls
+     *
+     * @param \Silex\Application $oApp
+     * @return array
+     */
+    public function GetCSSFiles(\Silex\Application $oApp);
+    /**
+     * Returns inline (raw) CSS
+     *
+     * @param \Silex\Application $oApp
+     * @return string
+     */
+    public function GetCSSInline(\Silex\Application $oApp);
+    /**
+     * Returns an array of JS file urls
+     *
+     * @param \Silex\Application $oApp
+     * @return array
+     */
+    public function GetJSFiles(\Silex\Application $oApp);
+    /**
+     * Returns raw JS code
+     *
+     * @param \Silex\Application $oApp
+     * @return string
+     */
+    public function GetJSInline(\Silex\Application $oApp);
+    /**
+     * Returns raw HTML code to put at the end of the <body> tag
+     *
+     * @param \Silex\Application $oApp
+     * @return string
+     */
+    public function GetBodyHTML(\Silex\Application $oApp);
+    /**
+     * Returns raw HTML code to put at the end of the #main-wrapper element
+     *
+     * @param \Silex\Application $oApp
+     * @return string
+     */
+    public function GetMainContentHTML(\Silex\Application $oApp);
+    /**
+     * Returns raw HTML code to put at the end of the #topbar and #sidebar elements
+     *
+     * @param \Silex\Application $oApp
+     * @return string
+     */
+    public function GetNavigationMenuHTML(\Silex\Application $oApp);
+}
+
+/**
+ * IMPORTANT! Experimental API, may be removed at anytime, we don't recommend to use it just now!
+ */
+abstract class AbstractPortalUIExtension implements iPortalUIExtension
+{
+    /**
+     * @inheritDoc
+     */
+    public function GetCSSFiles(\Silex\Application $oApp)
+    {
+        return array();
+    }
+    /**
+     * @inheritDoc
+     */
+    public function GetCSSInline(\Silex\Application $oApp)
+    {
+        return null;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function GetJSFiles(\Silex\Application $oApp)
+    {
+        return array();
+    }
+    /**
+     * @inheritDoc
+     */
+    public function GetJSInline(\Silex\Application $oApp)
+    {
+        return null;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function GetBodyHTML(\Silex\Application $oApp)
+    {
+        return null;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function GetMainContentHTML(\Silex\Application $oApp)
+    {
+        return null;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function GetNavigationMenuHTML(\Silex\Application $oApp)
+    {
+        return null;
+    }
+}
+
+/**
+ * Implement this interface to add new operations to the REST/JSON web service
+ *  
+ * @package     Extensibility
+ * @api
+ * @since 2.0.1  
+ */
+interface iRestServiceProvider
+{
+	/**
+	 * Enumerate services delivered by this class
+	 * @param string $sVersion The version (e.g. 1.0) supported by the services
+	 * @return array An array of hash 'verb' => verb, 'description' => description
+	 */
+	public function ListOperations($sVersion);
+	/**
+	 * Enumerate services delivered by this class
+	 * @param string $sVersion The version (e.g. 1.0) supported by the services
+	 * @return RestResult The standardized result structure (at least a message)
+	 * @throws Exception in case of internal failure.	 
+	 */
+	public function ExecOperation($sVersion, $sVerb, $aParams);
+}
+
+/**
+ * Minimal REST response structure. Derive this structure to add response data and error codes.
+ *
+ * @package     Extensibility
+ * @api
+ * @since 2.0.1  
+ */
+class RestResult
+{
+	/**
+	 * Result: no issue has been encountered
+	 */
+	const OK = 0;
+	/**
+	 * Result: missing/wrong credentials or the user does not have enough rights to perform the requested operation 
+	 */
+	const UNAUTHORIZED = 1;
+	/**
+	 * Result: the parameter 'version' is missing
+	 */
+	const MISSING_VERSION = 2;
+	/**
+	 * Result: the parameter 'json_data' is missing
+	 */
+	const MISSING_JSON = 3;
+	/**
+	 * Result: the input structure is not a valid JSON string
+	 */
+	const INVALID_JSON = 4;
+	/**
+	 * Result: the parameter 'auth_user' is missing, authentication aborted
+	 */
+	const MISSING_AUTH_USER = 5;
+	/**
+	 * Result: the parameter 'auth_pwd' is missing, authentication aborted
+	 */
+	const MISSING_AUTH_PWD = 6;
+	/**
+	 * Result: no operation is available for the specified version
+	 */
+	const UNSUPPORTED_VERSION = 10;
+	/**
+	 * Result: the requested operation is not valid for the specified version
+	 */
+	const UNKNOWN_OPERATION = 11;
+	/**
+	 * Result: the requested operation cannot be performed because it can cause data (integrity) loss 
+	 */
+	const UNSAFE = 12;
+	/**
+	 * Result: the operation could not be performed, see the message for troubleshooting
+	 */
+	const INTERNAL_ERROR = 100;
+
+	/**
+	 * Default constructor - ok!
+	 * 	 
+	 * @param DBObject $oObject The object being reported
+	 * @param string $sAttCode The attribute code (must be valid)
+	 * @return string A scalar representation of the value
+	 */
+	public function __construct()
+	{
+		$this->code = RestResult::OK;
+	}
+
+	public $code;
+	public $message;
+}
+
+/**
+ * Helpers for implementing REST services
+ *
+ * @package     Extensibility
+ * @api
+ */
+class RestUtils
+{
+	/**
+	 * Registering tracking information. Any further object modification be associated with the given comment, when the modification gets recorded into the DB
+	 * 	 
+	 * @param StdClass $oData Structured input data. Must contain 'comment'.
+	 * @return void
+	 * @throws Exception
+	 * @api
+	 */
+	public static function InitTrackingComment($oData)
+	{
+		$sComment = self::GetMandatoryParam($oData, 'comment');
+		CMDBObject::SetTrackInfo($sComment);
+	}
+
+	/**
+	 * Read a mandatory parameter from  from a Rest/Json structure.
+	 * 	 
+	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
+	 * @param string $sParamName Name of the parameter to fetch from the input data
+	 * @return void
+	 * @throws Exception If the parameter is missing
+	 * @api
+	 */
+	public static function GetMandatoryParam($oData, $sParamName)
+	{
+		if (isset($oData->$sParamName))
+		{
+			return $oData->$sParamName;
+		}
+		else
+		{
+			throw new Exception("Missing parameter '$sParamName'");
+		}
+	}
+
+
+	/**
+	 * Read an optional parameter from  from a Rest/Json structure.
+	 * 	 
+	 * @param StdClass $oData Structured input data.
+	 * @param string $sParamName Name of the parameter to fetch from the input data
+	 * @param mixed $default Default value if the parameter is not found in the input data
+	 * @return void
+	 * @throws Exception
+	 * @api
+	 */
+	public static function GetOptionalParam($oData, $sParamName, $default)
+	{
+		if (isset($oData->$sParamName))
+		{
+			return $oData->$sParamName;
+		}
+		else
+		{
+			return $default;
+		}
+	}
+
+
+	/**
+	 * Read a class  from a Rest/Json structure.
+	 *
+	 * @param StdClass $oData Structured input data. Must contain the entry defined by sParamName.
+	 * @param string $sParamName Name of the parameter to fetch from the input data
+	 * @return void
+	 * @throws Exception If the parameter is missing or the class is unknown
+	 * @api
+	 */
+	public static function GetClass($oData, $sParamName)
+	{
+		$sClass = self::GetMandatoryParam($oData, $sParamName);
+		if (!MetaModel::IsValidClass($sClass))
+		{
+			throw new Exception("$sParamName: '$sClass' is not a valid class'");
+		}
+		return $sClass;
+	}
+
+
+	/**
+	 * Read a list of attribute codes from a Rest/Json structure.
+	 * 	 
+	 * @param string $sClass Name of the class
+	 * @param StdClass $oData Structured input data.
+	 * @param string $sParamName Name of the parameter to fetch from the input data
+	 * @return An array of class => list of attributes (see RestResultWithObjects::AddObject that uses it)
+	 * @throws Exception
+	 * @api
+	 */
+	public static function GetFieldList($sClass, $oData, $sParamName)
+	{
+		$sFields = self::GetOptionalParam($oData, $sParamName, '*');
+		$aShowFields = array();
+		if ($sFields == '*')
+		{
+			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+			{
+				$aShowFields[$sClass][] = $sAttCode;
+			}
+		}
+		elseif ($sFields == '*+')
+		{
+			foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sRefClass)
+			{
+				foreach (MetaModel::ListAttributeDefs($sRefClass) as $sAttCode => $oAttDef)
+				{
+					$aShowFields[$sRefClass][] = $sAttCode;
+				}
+			}
+		}
+		else
+		{
+			foreach(explode(',', $sFields) as $sAttCode)
+			{
+				$sAttCode = trim($sAttCode);
+				if (($sAttCode != 'id') && (!MetaModel::IsValidAttCode($sClass, $sAttCode)))
+				{
+					throw new Exception("$sParamName: invalid attribute code '$sAttCode'");
+				}
+				$aShowFields[$sClass][] = $sAttCode;
+			}
+		}
+		return $aShowFields;
+	}
+
+	/**
+	 * Read and interpret object search criteria from a Rest/Json structure
+	 * 	  	 
+	 * @param string $sClass Name of the class
+	 * @param StdClass $oCriteria Hash of attribute code => value (can be a substructure or a scalar, depending on the nature of the attriute)
+	 * @return object The object found
+	 * @throws Exception If the input structure is not valid or it could not find exactly one object
+	 */
+	protected static function FindObjectFromCriteria($sClass, $oCriteria)
+	{
+		$aCriteriaReport = array();
+		if (isset($oCriteria->finalclass))
+		{
+			if (!MetaModel::IsValidClass($oCriteria->finalclass))
+			{
+				throw new Exception("finalclass: Unknown class '".$oCriteria->finalclass."'");
+			}
+			if (!MetaModel::IsParentClass($sClass, $oCriteria->finalclass))
+			{
+				throw new Exception("finalclass: '".$oCriteria->finalclass."' is not a child class of '$sClass'");
+			}
+			$sClass = $oCriteria->finalclass;
+		}
+		$oSearch = new DBObjectSearch($sClass);
+		foreach ($oCriteria as $sAttCode => $value)
+		{
+			$realValue = static::MakeValue($sClass, $sAttCode, $value);
+			$oSearch->AddCondition($sAttCode, $realValue, '=');
+			if (is_object($value) || is_array($value))
+			{
+				$value = json_encode($value);
+			}
+			$aCriteriaReport[] = "$sAttCode: $value ($realValue)";
+		}
+		$oSet = new DBObjectSet($oSearch);
+		$iCount = $oSet->Count();
+		if ($iCount == 0)
+		{
+			throw new Exception("No item found with criteria: ".implode(', ', $aCriteriaReport));
+		}
+		elseif ($iCount > 1)
+		{
+			throw new Exception("Several items found ($iCount) with criteria: ".implode(', ', $aCriteriaReport));
+		}
+		$res = $oSet->Fetch();
+		return $res;
+	}
+
+
+	/**
+	 * Find an object from a polymorph search specification (Rest/Json)
+	 * 	 
+	 * @param string $sClass Name of the class
+	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
+	 * @param bool $bAllowNullValue Allow the cases such as key = 0 or key = {null} and return null then
+	 * @return DBObject The object found
+	 * @throws Exception If the input structure is not valid or it could not find exactly one object
+	 * @api
+	 */
+	public static function FindObjectFromKey($sClass, $key, $bAllowNullValue = false)
+	{
+		if (is_object($key))
+		{
+			$res = static::FindObjectFromCriteria($sClass, $key);
+		}
+		elseif (is_numeric($key))
+		{
+			if ($bAllowNullValue && ($key == 0))
+			{
+				$res = null;
+			}
+			else
+			{
+				$res = MetaModel::GetObject($sClass, $key, false);
+				if (is_null($res))
+				{
+					throw new Exception("Invalid object $sClass::$key");
+				}
+			}
+		}
+		elseif (is_string($key))
+		{
+			// OQL
+			$oSearch = DBObjectSearch::FromOQL($key);
+			$oSet = new DBObjectSet($oSearch);
+			$iCount = $oSet->Count();
+			if ($iCount == 0)
+			{
+				throw new Exception("No item found for query: $key");
+			}
+			elseif ($iCount > 1)
+			{
+				throw new Exception("Several items found ($iCount) for query: $key");
+			}
+			$res = $oSet->Fetch();
+		}
+		else
+		{
+			throw new Exception("Wrong format for key");
+		}
+		return $res;
+	}
+
+	/**
+	 * Search objects from a polymorph search specification (Rest/Json)
+	 * 	 
+	 * @param string $sClass Name of the class
+	 * @param mixed $key Either search criteria (substructure), or an object or an OQL string.
+	 * @return DBObjectSet The search result set
+	 * @throws Exception If the input structure is not valid
+	 */
+	public static function GetObjectSetFromKey($sClass, $key)
+	{
+		if (is_object($key))
+		{
+			if (isset($key->finalclass))
+			{
+				$sClass = $key->finalclass;
+				if (!MetaModel::IsValidClass($sClass))
+				{
+					throw new Exception("finalclass: Unknown class '$sClass'");
+				}
+			}
+		
+			$oSearch = new DBObjectSearch($sClass);
+			foreach ($key as $sAttCode => $value)
+			{
+				$realValue = static::MakeValue($sClass, $sAttCode, $value);
+				$oSearch->AddCondition($sAttCode, $realValue, '=');
+			}
+		}
+		elseif (is_numeric($key))
+		{
+			$oSearch = new DBObjectSearch($sClass);
+			$oSearch->AddCondition('id', $key);
+		}
+		elseif (is_string($key))
+		{
+			// OQL
+			$oSearch = DBObjectSearch::FromOQL($key);
+			$oObjectSet = new DBObjectSet($oSearch);
+		}
+		else
+		{
+			throw new Exception("Wrong format for key");
+		}
+		$oObjectSet = new DBObjectSet($oSearch);
+		return $oObjectSet;
+	}
+
+	/**
+	 * Interpret the Rest/Json value and get a valid attribute value
+	 * 	 
+	 * @param string $sClass Name of the class
+	 * @param string $sAttCode Attribute code
+	 * @param mixed $value Depending on the type of attribute (a scalar, or search criteria, or list of related objects...)
+	 * @return mixed The value that can be used with DBObject::Set()
+	 * @throws Exception If the specification of the value is not valid.
+	 * @api
+	 */
+	public static function MakeValue($sClass, $sAttCode, $value)
+	{
+		try
+		{
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				throw new Exception("Unknown attribute");
+			}
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef instanceof AttributeExternalKey)
+			{
+				$oExtKeyObject = static::FindObjectFromKey($oAttDef->GetTargetClass(), $value, true /* allow null */);
+				$value = ($oExtKeyObject != null) ? $oExtKeyObject->GetKey() : 0;
+			}
+			elseif ($oAttDef instanceof AttributeLinkedSet)
+			{
+				if (!is_array($value))
+				{
+					throw new Exception("A link set must be defined by an array of objects");
+				}
+				$sLnkClass = $oAttDef->GetLinkedClass();
+				$aLinks = array();
+				foreach($value as $oValues)
+				{
+					$oLnk = static::MakeObjectFromFields($sLnkClass, $oValues);
+					$aLinks[] = $oLnk;
+				}
+				$value = DBObjectSet::FromArray($sLnkClass, $aLinks);
+			}
+			else
+			{
+				$value = $oAttDef->FromJSONToValue($value);
+			}
+		}
+		catch (Exception $e)
+		{
+			throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
+		}
+		return $value;
+	}
+
+	/**
+	 * Interpret a Rest/Json structure that defines attribute values, and build an object
+	 * 	 
+	 * @param string $sClass Name of the class
+	 * @param array $aFields A hash of attribute code => value specification.
+	 * @return DBObject The newly created object
+	 * @throws Exception If the specification of the values is not valid
+	 * @api
+	 */
+	public static function MakeObjectFromFields($sClass, $aFields)
+	{
+		$oObject = MetaModel::NewObject($sClass);
+		foreach ($aFields as $sAttCode => $value)
+		{
+			$realValue = static::MakeValue($sClass, $sAttCode, $value);
+			try
+			{
+				$oObject->Set($sAttCode, $realValue);
+			}
+			catch (Exception $e)
+			{
+				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
+			}
+		}
+		return $oObject;
+	}
+
+	/**
+	 * Interpret a Rest/Json structure that defines attribute values, and update the given object
+	 * 	 
+	 * @param DBObject $oObject The object being modified
+	 * @param array $aFields A hash of attribute code => value specification.
+	 * @return DBObject The object modified
+	 * @throws Exception If the specification of the values is not valid
+	 * @api
+	 */
+	public static function UpdateObjectFromFields($oObject, $aFields)
+	{
+		$sClass = get_class($oObject);
+		foreach ($aFields as $sAttCode => $value)
+		{
+			$realValue = static::MakeValue($sClass, $sAttCode, $value);
+			try
+			{
+				$oObject->Set($sAttCode, $realValue);
+			}
+			catch (Exception $e)
+			{
+				throw new Exception("$sAttCode: ".$e->getMessage(), $e->getCode());
+			}
+		}
+		return $oObject;
+	}
+}
diff --git a/application/audit.category.class.inc.php b/application/audit.category.class.inc.php
index 40f15f9d1..14d80f0ec 100644
--- a/application/audit.category.class.inc.php
+++ b/application/audit.category.class.inc.php
@@ -1,60 +1,60 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * This class manages the audit "categories". Each category defines a set of objects
- * to check and is linked to a set of rules that determine the valid or invalid objects
- * inside the set 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-
-class AuditCategory extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application, grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_auditcategory",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("definition_set", array("allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", array("linked_class"=>"AuditRule", "ext_key_to_me"=>"category_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'rules_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * This class manages the audit "categories". Each category defines a set of objects
+ * to check and is linked to a set of rules that determine the valid or invalid objects
+ * inside the set 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+
+class AuditCategory extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditcategory",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("description"=>"Short name for this category", "allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("definition_set", array("allowed_values"=>null, "sql"=>"definition_set", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSet("rules_list", array("linked_class"=>"AuditRule", "ext_key_to_me"=>"category_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), "edit_mode" => LINKSET_EDITMODE_INPLACE, "tracking_level" => LINKSET_TRACKING_ALL)));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'definition_set', 'rules_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description', )); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'definition_set')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+	}
+}
+?>
diff --git a/application/audit.rule.class.inc.php b/application/audit.rule.class.inc.php
index 11796a49a..8d67dd471 100644
--- a/application/audit.rule.class.inc.php
+++ b/application/audit.rule.class.inc.php
@@ -1,64 +1,64 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * This class manages the audit "rule" linked to a given audit category.
- * Each rule is based on an OQL expression that returns either the "good" objects
- * or the "bad" ones. The core audit engines computes the complement to the definition
- * set when needed to obtain either the valid objects, or the ones with an error
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/audit.category.class.inc.php');
-
-class AuditRule extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application, grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_auditrule",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("query", array("allowed_values"=>null, "sql"=>"query", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("allowed_values"=>new ValueSetEnum('true,false'), "sql"=>"valid_flag", "default_value"=>"true", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values"=>null, "sql"=>"category_id", "targetclass"=>"AuditCategory", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values"=>null, "extkey_attcode"=> 'category_id', "target_attcode"=>"name")));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('category_id', 'description', 'valid_flag')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * This class manages the audit "rule" linked to a given audit category.
+ * Each rule is based on an OQL expression that returns either the "good" objects
+ * or the "bad" ones. The core audit engines computes the complement to the definition
+ * set when needed to obtain either the valid objects, or the ones with an error
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/audit.category.class.inc.php');
+
+class AuditRule extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application, grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_auditrule",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("query", array("allowed_values"=>null, "sql"=>"query", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("valid_flag", array("allowed_values"=>new ValueSetEnum('true,false'), "sql"=>"valid_flag", "default_value"=>"true", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("category_id", array("allowed_values"=>null, "sql"=>"category_id", "targetclass"=>"AuditCategory", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("category_name", array("allowed_values"=>null, "extkey_attcode"=> 'category_id', "target_attcode"=>"name")));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('category_id', 'name', 'description', 'query', 'valid_flag')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('category_id', 'description', 'valid_flag')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('category_id', 'name', 'description', 'valid_flag', 'query')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'category_id')); // Criteria of the advanced search form
+	}
+}
+?>
diff --git a/application/capturewebpage.class.inc.php b/application/capturewebpage.class.inc.php
index fff7d1f2c..287345167 100644
--- a/application/capturewebpage.class.inc.php
+++ b/application/capturewebpage.class.inc.php
@@ -1,84 +1,84 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Adapter class: when an API requires WebPage and you want to produce something else
- *
- * @copyright   Copyright (C) 2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CaptureWebPage extends WebPage
-{
-	protected $aReadyScripts;
-
-	function __construct()
-	{
-		parent::__construct('capture web page');
-		$this->aReadyScripts = array();
-	}
-
-	public function GetHtml()
-	{
-		$trash = $this->ob_get_clean_safe();
-		return $this->s_content;
-	}
-
-	public function GetJS()
-	{
-		$sRet = implode("\n", $this->a_scripts);
-		if (!empty($this->s_deferred_content))
-		{
-			$sRet .= "\n\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');";
-		}
-		return $sRet;
-	}
-
-	public function GetReadyJS()
-	{
-		return "\$(document).ready(function() {\n".implode("\n", $this->aReadyScripts)."\n});";
-	}
-
-	public function GetCSS()
-	{
-		return $this->a_styles;
-	}
-
-	public function GetJSFiles()
-	{
-		return $this->a_linked_scripts;
-	}
-
-	public function GetCSSFiles()
-	{
-		return $this->a_linked_stylesheets;
-	}
-
-	public function output()
-	{
-		throw new Exception(__method__.' should not be called');
-	}
-
-	public function add_ready_script($sScript)
-	{
-		$this->aReadyScripts[] = $sScript;
-	}
-}
-
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Adapter class: when an API requires WebPage and you want to produce something else
+ *
+ * @copyright   Copyright (C) 2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+
+class CaptureWebPage extends WebPage
+{
+	protected $aReadyScripts;
+
+	function __construct()
+	{
+		parent::__construct('capture web page');
+		$this->aReadyScripts = array();
+	}
+
+	public function GetHtml()
+	{
+		$trash = $this->ob_get_clean_safe();
+		return $this->s_content;
+	}
+
+	public function GetJS()
+	{
+		$sRet = implode("\n", $this->a_scripts);
+		if (!empty($this->s_deferred_content))
+		{
+			$sRet .= "\n\$('body').append('".addslashes(str_replace("\n", '', $this->s_deferred_content))."');";
+		}
+		return $sRet;
+	}
+
+	public function GetReadyJS()
+	{
+		return "\$(document).ready(function() {\n".implode("\n", $this->aReadyScripts)."\n});";
+	}
+
+	public function GetCSS()
+	{
+		return $this->a_styles;
+	}
+
+	public function GetJSFiles()
+	{
+		return $this->a_linked_scripts;
+	}
+
+	public function GetCSSFiles()
+	{
+		return $this->a_linked_stylesheets;
+	}
+
+	public function output()
+	{
+		throw new Exception(__method__.' should not be called');
+	}
+
+	public function add_ready_script($sScript)
+	{
+		$this->aReadyScripts[] = $sScript;
+	}
+}
+
diff --git a/application/clipage.class.inc.php b/application/clipage.class.inc.php
index 89f43b3db..25153d17e 100644
--- a/application/clipage.class.inc.php
+++ b/application/clipage.class.inc.php
@@ -1,97 +1,97 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * CLI page 
- * The page adds the content-type text/XML and the encoding into the headers
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CLIPage implements Page
-{
-    function __construct($s_title)
-    {
-    }	
-
-    public function output()
-    {
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-        if (class_exists('ExecutionKPI'))
-        {
-            ExecutionKPI::ReportStats();
-        }
-    }
-
-	public function add($sText)
-	{
-		echo $sText;
-	}	
-
-	public function p($sText)
-	{
-		echo $sText."\n";
-	}	
-
-	public function pre($sText)
-	{
-		echo $sText."\n";
-	}	
-
-	public function add_comment($sText)
-	{
-		echo "#".$sText."\n";
-	}	
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-		$aCells = array();
-		foreach($aConfig as $sName=>$aDef)
-		{
-			if (strlen($aDef['description']) > 0)
-			{
-				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
-			}
-			else
-			{
-				$aCells[] = $aDef['label'];
-			}
-		}
-		echo implode(';', $aCells)."\n";
-
-		foreach($aData as $aRow)
-		{
-			$aCells = array();
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$sValue = $aRow["$sName"];
-				$aCells[] = $sValue;
-			}
-			echo implode(';', $aCells)."\n";
-		}
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * CLI page 
+ * The page adds the content-type text/XML and the encoding into the headers
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+
+class CLIPage implements Page
+{
+    function __construct($s_title)
+    {
+    }	
+
+    public function output()
+    {
+        if (class_exists('DBSearch'))
+        {
+            DBSearch::RecordQueryTrace();
+        }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
+    }
+
+	public function add($sText)
+	{
+		echo $sText;
+	}	
+
+	public function p($sText)
+	{
+		echo $sText."\n";
+	}	
+
+	public function pre($sText)
+	{
+		echo $sText."\n";
+	}	
+
+	public function add_comment($sText)
+	{
+		echo "#".$sText."\n";
+	}	
+
+	public function table($aConfig, $aData, $aParams = array())
+	{
+		$aCells = array();
+		foreach($aConfig as $sName=>$aDef)
+		{
+			if (strlen($aDef['description']) > 0)
+			{
+				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
+			}
+			else
+			{
+				$aCells[] = $aDef['label'];
+			}
+		}
+		echo implode(';', $aCells)."\n";
+
+		foreach($aData as $aRow)
+		{
+			$aCells = array();
+			foreach($aConfig as $sName=>$aAttribs)
+			{
+				$sValue = $aRow["$sName"];
+				$aCells[] = $sValue;
+			}
+			echo implode(';', $aCells)."\n";
+		}
+	}
+}
+
+?>
diff --git a/application/csvpage.class.inc.php b/application/csvpage.class.inc.php
index a39ec60a9..e16113408 100644
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -1,111 +1,111 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Simple web page with no includes or fancy formatting, useful to generateXML documents
- * The page adds the content-type text/XML and the encoding into the headers
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-
-class CSVPage extends WebPage
-{
-    function __construct($s_title)
-    {
-        parent::__construct($s_title);
-		$this->add_header("Content-type: text/plain; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
-		//$this->add_header("Content-Transfer-Encoding: binary");
-    }	
-
-    public function output()
-    {
-			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
-
-			// Get the unexpected output but do nothing with it
-			$sTrash = $this->ob_get_clean_safe();
-
-        foreach($this->a_headers as $s_header)
-        {
-            header($s_header);
-        }
-        echo trim($this->s_content);
-        echo "\n";
-
-        if (class_exists('DBSearch'))
-        {
-            DBSearch::RecordQueryTrace();
-        }
-        if (class_exists('ExecutionKPI'))
-        {
-            ExecutionKPI::ReportStats();
-        }
-    }
-
-	public function small_p($sText)
-	{
-	}
-
-	public function add($sText)
-	{
-		$this->s_content .= $sText;
-	}	
-
-	public function p($sText)
-	{
-		$this->s_content .= $sText."\n";
-	}	
-
-	public function add_comment($sText)
-	{
-		$this->s_content .= "#".$sText."\n";
-	}	
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-		$aCells = array();
-		foreach($aConfig as $sName=>$aDef)
-		{
-			if (strlen($aDef['description']) > 0)
-			{
-				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
-			}
-			else
-			{
-				$aCells[] = $aDef['label'];
-			}
-		}
-		$this->s_content .= implode(';', $aCells)."\n";
-
-		foreach($aData as $aRow)
-		{
-			$aCells = array();
-			foreach($aConfig as $sName=>$aAttribs)
-			{
-				$sValue = $aRow["$sName"];
-				$aCells[] = $sValue;
-			}
-			$this->s_content .= implode(';', $aCells)."\n";
-		}
-	}
-}
-
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Simple web page with no includes or fancy formatting, useful to generateXML documents
+ * The page adds the content-type text/XML and the encoding into the headers
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+
+class CSVPage extends WebPage
+{
+    function __construct($s_title)
+    {
+        parent::__construct($s_title);
+		$this->add_header("Content-type: text/plain; charset=utf-8");
+		$this->add_header("Cache-control: no-cache");
+		//$this->add_header("Content-Transfer-Encoding: binary");
+    }	
+
+    public function output()
+    {
+			$this->add_header("Content-Length: ".strlen(trim($this->s_content)));
+
+			// Get the unexpected output but do nothing with it
+			$sTrash = $this->ob_get_clean_safe();
+
+        foreach($this->a_headers as $s_header)
+        {
+            header($s_header);
+        }
+        echo trim($this->s_content);
+        echo "\n";
+
+        if (class_exists('DBSearch'))
+        {
+            DBSearch::RecordQueryTrace();
+        }
+        if (class_exists('ExecutionKPI'))
+        {
+            ExecutionKPI::ReportStats();
+        }
+    }
+
+	public function small_p($sText)
+	{
+	}
+
+	public function add($sText)
+	{
+		$this->s_content .= $sText;
+	}	
+
+	public function p($sText)
+	{
+		$this->s_content .= $sText."\n";
+	}	
+
+	public function add_comment($sText)
+	{
+		$this->s_content .= "#".$sText."\n";
+	}	
+
+	public function table($aConfig, $aData, $aParams = array())
+	{
+		$aCells = array();
+		foreach($aConfig as $sName=>$aDef)
+		{
+			if (strlen($aDef['description']) > 0)
+			{
+				$aCells[] = $aDef['label'].' ('.$aDef['description'].')';
+			}
+			else
+			{
+				$aCells[] = $aDef['label'];
+			}
+		}
+		$this->s_content .= implode(';', $aCells)."\n";
+
+		foreach($aData as $aRow)
+		{
+			$aCells = array();
+			foreach($aConfig as $sName=>$aAttribs)
+			{
+				$sValue = $aRow["$sName"];
+				$aCells[] = $sValue;
+			}
+			$this->s_content .= implode(';', $aCells)."\n";
+		}
+	}
+}
+
diff --git a/application/iotask.class.inc.php b/application/iotask.class.inc.php
index 59b647419..647340aa8 100644
--- a/application/iotask.class.inc.php
+++ b/application/iotask.class.inc.php
@@ -1,69 +1,69 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class InputOutputTask
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-
-/**
- * This class manages the input/output tasks
- * for synchronizing information with external data sources 
- */
-class InputOutputTask extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_iotask",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values"=>new ValueSetEnum('Input, Ouput'), "sql"=>"category", "default_value"=>"Input", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values"=>new ValueSetEnum('File, Database, Web Service'), "sql"=>"source_type", "default_value"=>"File", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", array("allowed_values"=>new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql"=>"source_subtype", "default_value"=>"CSV", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values"=>null, "sql"=>"source_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category"=>"", "more_values"=>"", "sql"=>"objects_class", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"test_mode", "default_value"=>'No', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the advanced search form
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class InputOutputTask
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+
+/**
+ * This class manages the input/output tasks
+ * for synchronizing information with external data sources 
+ */
+class InputOutputTask extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_iotask",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("category", array("allowed_values"=>new ValueSetEnum('Input, Ouput'), "sql"=>"category", "default_value"=>"Input", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_type", array("allowed_values"=>new ValueSetEnum('File, Database, Web Service'), "sql"=>"source_type", "default_value"=>"File", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("source_subtype", array("allowed_values"=>new ValueSetEnum('Oracle, MySQL, Postgress, MSSQL, SOAP, HTTP-Get, HTTP-Post, XML/RPC, CSV, XML, Excel'), "sql"=>"source_subtype", "default_value"=>"CSV", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("source_path", array("allowed_values"=>null, "sql"=>"source_path", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("objects_class", array("class_category"=>"", "more_values"=>"", "sql"=>"objects_class", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("test_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"test_mode", "default_value"=>'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("verbose_mode", array("allowed_values"=>new ValueSetEnum('Yes,No'), "sql"=>"verbose_mode", "default_value" => 'No', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("options", array("allowed_values"=>new ValueSetEnum('Full, Update Only, Creation Only'), "sql"=>"options", "default_value"=> 'Full', "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype', 'source_path' , 'options', 'test_mode', 'verbose_mode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description', 'category', 'objects_class', 'source_type', 'source_subtype', 'options')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'description', 'category', 'objects_class', 'source_type', 'source_subtype')); // Criteria of the advanced search form
+	}
+}
+?>
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index ca4563f56..bd7635156 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -1,1389 +1,1389 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class iTopWebPage
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT . "/application/nicewebpage.class.inc.php");
-require_once(APPROOT . "/application/applicationcontext.class.inc.php");
-require_once(APPROOT . "/application/user.preferences.class.inc.php");
-
-/**
- * Web page with some associated CSS and scripts (jquery) for a fancier display
- */
-class iTopWebPage extends NiceWebPage implements iTabbedPage
-{
-    private $m_sMenu;
-    //	private $m_currentOrganization;
-    private $m_aMessages;
-    private $m_aInitScript = array();
-    protected $m_oTabs;
-    protected $bBreadCrumbEnabled;
-    protected $sBreadCrumbEntryId;
-    protected $sBreadCrumbEntryLabel;
-    protected $sBreadCrumbEntryDescription;
-    protected $sBreadCrumbEntryUrl;
-    protected $sBreadCrumbEntryIcon;
-    protected $oCtx;
-
-    protected $bHasCollapsibleSection = false;
-
-    public function __construct($sTitle, $bPrintable = false)
-    {
-        parent::__construct($sTitle, $bPrintable);
-        $this->m_oTabs = new TabManager();
-        $this->oCtx = new ContextTag('GUI:Console');
-
-        ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
-
-        if ((count($_POST) == 0) || (array_key_exists('loginop', $_POST))) {
-            // Create a breadcrumb entry for the current page, but get its title as late as possible (page title could be changed later)
-            $this->bBreadCrumbEnabled = true;
-        } else {
-            $this->bBreadCrumbEnabled = false;
-        }
-
-        utils::InitArchiveMode();
-
-        $this->m_sMenu = "";
-        $this->m_aMessages = array();
-        $this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
-        $this->add_header("Content-type: text/html; charset=utf-8");
-        $this->add_header("Cache-control: no-cache");
-        $this->add_linked_stylesheet("../css/jquery.treeview.css");
-        $this->add_linked_stylesheet("../css/jquery.autocomplete.css");
-        $this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");
-        $this->add_linked_stylesheet("../css/fg.menu.css");
-        $this->add_linked_stylesheet("../css/jquery.multiselect.css");
-        $this->add_linked_stylesheet("../css/magnific-popup.css");
-        $this->add_linked_stylesheet("../css/c3.min.css");
-        $this->add_linked_stylesheet("../css/font-awesome/css/font-awesome.min.css");
-
-        $this->add_linked_script('../js/jquery.layout.min.js');
-        $this->add_linked_script('../js/jquery.ba-bbq.min.js');
-        $this->add_linked_script("../js/jquery.treeview.js");
-        $this->add_linked_script("../js/jquery.autocomplete.js");
-        $this->add_linked_script("../js/date.js");
-        $this->add_linked_script("../js/jquery-ui-timepicker-addon.js");
-        $this->add_linked_script("../js/jquery-ui-timepicker-addon-i18n.min.js");
-        $this->add_linked_script("../js/jquery.blockUI.js");
-        $this->add_linked_script("../js/utils.js");
-        $this->add_linked_script("../js/swfobject.js");
-        $this->add_linked_script("../js/ckeditor/ckeditor.js");
-        $this->add_linked_script("../js/ckeditor/adapters/jquery.js");
-        $this->add_linked_script("../js/jquery.qtip-1.0.min.js");
-        $this->add_linked_script('../js/property_field.js');
-        $this->add_linked_script('../js/fg.menu.js');
-        $this->add_linked_script('../js/icon_select.js');
-        $this->add_linked_script('../js/raphael-min.js');
-        $this->add_linked_script('../js/d3.js');
-        $this->add_linked_script('../js/c3.js');
-        $this->add_linked_script('../js/jquery.multiselect.js');
-        $this->add_linked_script('../js/ajaxfileupload.js');
-        $this->add_linked_script('../js/jquery.mousewheel.js');
-        $this->add_linked_script('../js/jquery.magnific-popup.min.js');
-        $this->add_linked_script('../js/breadcrumb.js');
-        $this->add_linked_script('../js/moment.min.js');
-
-
-        $sSearchAny = addslashes(Dict::S('UI:SearchValue:Any'));
-        $sSearchNbSelected = addslashes(Dict::S('UI:SearchValue:NbSelected'));
-        $this->add_dict_entry('UI:FillAllMandatoryFields');
-
-        $this->add_dict_entries('Error:');
-        $this->add_dict_entries('UI:Button:');
-        $this->add_dict_entries('UI:Search:');
-        $this->add_dict_entry('UI:UndefinedObject');
-        $this->add_dict_entries('Enum:Undefined');
-
-
-        if (!$this->IsPrintableVersion()) {
-            $this->PrepareLayout();
-            $this->add_script(
-                <<<EOF
-function ShowAboutBox()
-{
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'about_box'}, function(data){
-		$('body').append(data);
-	});
-	return false;
-}
-function ArchiveMode(bEnable)
-{
-	var sPrevUrl = StripArchiveArgument(window.location.search);
-	if (bEnable)
-	{
-		window.location.search = sPrevUrl + '&with-archive=1';
-	}
-	else
-	{
-		window.location.search = sPrevUrl + '&with-archive=0';
-	}
-}
-function StripArchiveArgument(sUrl)
-{
-	var res = sUrl.replace(/&with-archive=[01]/g, '');
-	return res;
-}
-EOF
-            );
-        }
-    }
-
-    protected function IsMenuPaneVisible()
-    {
-        $bLeftPaneOpen = true;
-        if (MetaModel::GetConfig()->Get('demo_mode')) {
-            // Leave the pane opened
-        } else {
-            if (utils::ReadParam('force_menu_pane', null) === 0) {
-                $bLeftPaneOpen = false;
-            } elseif (appUserPreferences::GetPref('menu_pane', 'open') == 'closed') {
-                $bLeftPaneOpen = false;
-            }
-        }
-        return $bLeftPaneOpen;
-    }
-
-    protected function PrepareLayout()
-    {
-        if (MetaModel::GetConfig()->Get('demo_mode')) {
-            // No pin button
-            $sConfigureWestPane = '';
-        } else {
-            $sConfigureWestPane =
-                <<<EOF
-                if (typeof myLayout !== "undefined")
-                {
-                    myLayout.addPinBtn( "#tPinMenu", "west" );
-                }
-EOF;
-        }
-        $sInitClosed = $this->IsMenuPaneVisible() ? '' : 'initClosed: true,';
-
-        $sJSDisconnectedMessage = json_encode(Dict::S('UI:DisconnectedDlgMessage'));
-        $sJSTitle = json_encode(Dict::S('UI:DisconnectedDlgTitle'));
-        $sJSLoginAgain = json_encode(Dict::S('UI:LoginAgain'));
-        $sJSStayOnThePage = json_encode(Dict::S('UI:StayOnThePage'));
-        $aDaysMin = array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
-            Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min'));
-        $aMonthsShort = array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'),
-            Dict::S('Month-07-Short'), Dict::S('Month-08-Short'), Dict::S('Month-09-Short'), Dict::S('Month-10-Short'), Dict::S('Month-11-Short'), Dict::S('Month-12-Short'));
-        $sTimeFormat = AttributeDateTime::GetFormat()->ToTimeFormat();
-        $oTimeFormat = new DateTimeFormat($sTimeFormat);
-        $sJSLangShort = json_encode(strtolower(substr(Dict::GetUserLanguage(), 0, 2)));
-
-        // Date picker options
-        $aPickerOptions = array(
-            'showOn' => 'button',
-            'buttonImage' => '../images/calendar.png',
-            'buttonImageOnly' => true,
-            'dateFormat' => AttributeDate::GetFormat()->ToDatePicker(),
-            'constrainInput' => false,
-            'changeMonth' => true,
-            'changeYear' => true,
-            'dayNamesMin' => $aDaysMin,
-            'monthNamesShort' => $aMonthsShort,
-            'firstDay' => (int)Dict::S('Calendar-FirstDayOfWeek'),
-        );
-        $sJSDatePickerOptions = json_encode($aPickerOptions);
-
-        // Time picker additional options
-        $aPickerOptions['showOn'] = '';
-        $aPickerOptions['buttonImage'] = null;
-        $aPickerOptions['timeFormat'] = $oTimeFormat->ToDatePicker();
-        $aPickerOptions['controlType'] = 'select';
-        $aPickerOptions['closeText'] = Dict::S('UI:Button:Ok');
-        $sJSDateTimePickerOptions = json_encode($aPickerOptions);
-        if ($sJSLangShort != '"en"') {
-            // More options that cannot be passed via json_encode since they must be evaluated client-side
-            $aMoreJSOptions = ",
-				'timeText': $.timepicker.regional[$sJSLangShort].timeText,
-				'hourText': $.timepicker.regional[$sJSLangShort].hourText,
-				'minuteText': $.timepicker.regional[$sJSLangShort].minuteText,
-				'secondText': $.timepicker.regional[$sJSLangShort].secondText,
-				'currentText': $.timepicker.regional[$sJSLangShort].currentText
-			}";
-            $sJSDateTimePickerOptions = substr($sJSDateTimePickerOptions, 0, -1) . $aMoreJSOptions;
-        }
-        $this->add_script(
-            <<< EOF
-	function PrepareWidgets()
-	{
-		// note: each action implemented here must be idempotent,
-		//       because this helper function might be called several times on a given page 
-	
-	    // Note: Trigger image is wrapped in a span so we can display it we want 
-		$(".date-pick").datepicker($sJSDatePickerOptions)
-		    .next("img").wrap("<span>");
-	
-		// Hack for the date and time picker addon issue on Chrome (see #1305)
-		// The workaround is to instantiate the widget on demand
-		// It relies on the same markup, thus reverting to the original implementation should be straightforward
-		$(".datetime-pick:not(.is-widget-ready)").each(function(){
-			var oInput = this;
-			$(oInput).addClass('is-widget-ready');
-			$('<span><img class="datetime-pick-button" src="../images/calendar.png"></span>')
-				.insertAfter($(this))
-				.on('click', function(){
-					$(oInput)
-						.datetimepicker($sJSDateTimePickerOptions)
-						.datetimepicker('show')
-						.datetimepicker('option', 'onClose', function(dateText,inst){
-							$(oInput).datetimepicker('destroy');
-						})
-						.on('click keypress', function(){
-							$(oInput).datetimepicker('hide');
-						});
-				});
-		});
-	}
-EOF
-        );
-
-        $this->add_init_script(
-            <<< EOF
-	try
-	{
-		var myLayout; // a var is required because this page utilizes: myLayout.allowOverflow() method
-	
-		// Layout
-		paneSize = GetUserPreference('menu_size', 300);
-		if ($('body').length > 0)
-		{
-            myLayout = $('body').layout({
-                west :	{
-                            $sInitClosed minSize: 200, size: paneSize, spacing_open: 16, spacing_close: 16, slideTrigger_open: "click", hideTogglerOnSlide: true, enableCursorHotkey: false,
-                            onclose_end: function(name, elt, state, options, layout)
-                            {
-                                    if (state.isSliding == false)
-                                    {
-                                        $('.menu-pane-exclusive').show();
-                                        SetUserPreference('menu_pane', 'closed', true);
-                                    }
-                            },
-                            onresize_end: function(name, elt, state, options, layout)
-                            {
-                                    if (state.isSliding == false)
-                                    {
-                                        SetUserPreference('menu_size', state.size, true);
-                                    }
-                            },
-                                        
-                            onopen_end: function(name, elt, state, options, layout)
-                            {
-                                if (state.isSliding == false)
-                                {
-                                    $('.menu-pane-exclusive').hide();
-                                    SetUserPreference('menu_pane', 'open', true);
-                                }
-                            }
-                        },
-                center: {
-                            onresize_end: function(name, elt, state, options, layout)
-                            {
-                                    $('.v-resizable').each( function() {
-                                        var fixedWidth = $(this).parent().innerWidth() - 6;
-                                        $(this).width(fixedWidth);
-                                        // Make sure it cannot be resized horizontally
-                                        $(this).resizable('options', { minWidth: fixedWidth, maxWidth:	fixedWidth });
-                                        // Now adjust all the child 'items'
-                                        var innerWidth = $(this).innerWidth() - 10;
-                                        $(this).find('.item').width(innerWidth);
-                                    });
-                                    $('.panel-resized').trigger('resized');
-                            }
-                    
-                        }
-            });
-        }
-		window.clearTimeout(iPaneVisWatchDog);
-		//myLayout.open( "west" );
-		$('.ui-layout-resizer-west .ui-layout-toggler').css({background: 'transparent'});
-		$sConfigureWestPane
-		if ($('#left-pane').length > 0)
-		{
-		    $('#left-pane').layout({ resizable: false, spacing_open: 0, south: { size: 94 }, enableCursorHotkey: false });
-		}
-		// Tabs, using JQuery BBQ to store the history
-		// The "tab widgets" to handle.
-		var tabs = $('div[id^=tabbedContent]');
-			
-		// This selector will be reused when selecting actual tab widget A elements.
-		var tab_a_selector = 'ul.ui-tabs-nav a';
-		
-		// Ugly patch for a change in the behavior of jQuery UI:
-		// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
-		// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
-		// is taken into account and causes "local" tabs to be considered as Ajax
-		// unless their URL is equal to the URL of the page...
-		$('div[id^=tabbedContent] > ul > li > a').each(function() {
-			var sHash = location.hash;
-			var sHref = $(this).attr("href");
-			if (sHref.match(/^#/))
-			{
-				var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
-				$(this).attr("href", sCleanLocation+$(this).attr("href"));
-			}
-		});
-
-		// Enable tabs on all tab widgets. The `event` property must be overridden so
-		// that the tabs aren't changed on click, and any custom event name can be
-		// specified. Note that if you define a callback for the 'select' event, it
-		// will be executed for the selected tab whenever the hash changes.
-		tabs.tabs({
-			event: 'change', 'show': function(event, ui) {
-				$('.resizable', ui.panel).resizable(); // Make resizable everything that claims to be resizable !
-			},
-			beforeLoad: function( event, ui ) {
-				if ( ui.tab.data('loaded') && (ui.tab.attr('data-cache') == 'true')) {
-					event.preventDefault();
-					return;
-				}
-				ui.panel.html('<div><img src="../images/indicator.gif"></div>');
-				ui.jqXHR.success(function() {
-					ui.tab.data( "loaded", true );
-				});
-			}
-		});
-	}
-	catch(err)
-	{
-		// Do something with the error !
-		alert(err);
-	}
-EOF
-    );
-
-        $this->add_ready_script(
-            <<< EOF
-	
-	// Adjust initial size
-	$('.v-resizable').each( function()
-		{
-			var parent_id = $(this).parent().id;
-			// Restore the saved height
-			var iHeight = GetUserPreference(parent_id+'_'+this.id+'_height', undefined);
-			if (iHeight != undefined)
-			{
-				$(this).height(parseInt(iHeight, 10)); // Parse in base 10 !);
-			}
-			// Adjust the child 'item''s height and width to fit
-			var container = $(this);
-			var fixedWidth = container.parent().innerWidth() - 6;
-			// Set the width to fit the parent
-			$(this).width(fixedWidth);
-			var headerHeight = $(this).find('.drag_handle').height();
-			// Now adjust the width and height of the child 'item'
-			container.find('.item').height(container.innerHeight() - headerHeight - 12).width(fixedWidth - 10);
-		}
-	);
-	// Make resizable, vertically only everything that claims to be v-resizable !
-	$('.v-resizable').resizable( { handles: 's', minHeight: $(this).find('.drag_handle').height(), minWidth: $(this).parent().innerWidth() - 6, maxWidth: $(this).parent().innerWidth() - 6, stop: function()
-		{
-			// Adjust the content
-			var container = $(this);
-			var headerHeight = $(this).find('.drag_handle').height();
-			container.find('.item').height(container.innerHeight() - headerHeight - 12);//.width(container.innerWidth());
-			var parent_id = $(this).parent().id;
-			SetUserPreference(parent_id+'_'+this.id+'_height', $(this).height(), true); // true => persistent
-		}
-	} );
-		
-	// Tabs, using JQuery BBQ to store the history
-	// The "tab widgets" to handle.
-	var tabs = $('div[id^=tabbedContent]');
-		
-	// This selector will be reused when selecting actual tab widget A elements.
-	var tab_a_selector = 'ul.ui-tabs-nav a';
-	  
-	// Define our own click handler for the tabs, overriding the default.
-	tabs.find( tab_a_selector ).click(function()
-	{
-		var state = {};
-				  
-		// Get the id of this tab widget.
-		var id = $(this).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
-		  
-		// Get the index of this tab.
-		var idx = $(this).parent().prevAll().length;
-		
-		// Set the state!
-		state[ id ] = idx;
-		$.bbq.pushState( state );
-	});
-	
-	// refresh the hash when the tab is changed (from a JS script)
-	$('body').on( 'tabsactivate', '.ui-tabs', function(event, ui) {
-		var state = {};
-			
-		// Get the id of this tab widget.
-		var id = $(ui.newTab).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
-		
-		// Get the index of this tab.
-		var idx = $(ui.newTab).prevAll().length;
-			
-		// Set the state!
-		state[ id ] = idx;
-		$.bbq.pushState( state );
-	});
-	
-	// Bind an event to window.onhashchange that, when the history state changes,
-	// iterates over all tab widgets, changing the current tab as necessary.
-	$(window).bind( 'hashchange', function(e)
-	{
-		// Iterate over all tab widgets.
-		tabs.each(function()
-		{  
-			// Get the index for this tab widget from the hash, based on the
-			// appropriate id property. In jQuery 1.4, you should use e.getState()
-			// instead of $.bbq.getState(). The second, 'true' argument coerces the
-			// string value to a number.
-			var idx = $.bbq.getState( this.id, true ) || 0;
-			  
-			// Select the appropriate tab for this tab widget by triggering the custom
-			// event specified in the .tabs() init above (you could keep track of what
-			// tab each widget is on using .data, and only select a tab if it has
-			// changed).
-			$(this).find( tab_a_selector ).eq( idx ).triggerHandler( 'change' );
-		});
-
-		// Iterate over all truncated lists to find whether they are expanded or not
-		$('a.truncated').each(function()
-		{
-			var state = $.bbq.getState( this.id, true ) || 'close';
-			if (state == 'open')
-			{
-				$(this).trigger('open');
-			}
-			else
-			{
-				$(this).trigger('close');	
-			}
-		});
-	});
-	
-	// Shortcut menu actions
-	$('.actions_button a').click( function() {
-		aMatches = /#(.*)$/.exec(window.location.href);
-		if (aMatches != null)
-		{
-			currentHash = aMatches[1];
-			if ( /#(.*)$/.test(this.href))
-			{
-				this.href = this.href.replace(/#(.*)$/, '#'+currentHash);
-			}
-		}
-	});
-
-	// End of Tabs handling
-
-	PrepareWidgets();
-
-	// Make sortable, everything that claims to be sortable
-	$('.sortable').sortable( {axis: 'y', cursor: 'move', handle: '.drag_handle', stop: function()
-		{
-			if ($(this).hasClass('persistent'))
-			{
-				// remember the sort order for next time the page is loaded...
-				sSerialized = $(this).sortable('serialize', {key: 'menu'});
-				var sTemp = sSerialized.replace(/menu=/g, '');
-				SetUserPreference(this.id+'_order', sTemp.replace(/&/g, ','), true); // true => persistent !
-			}
-		}
-	});
-	docWidth = $(document).width();
-	$('#ModalDlg').dialog({ autoOpen: false, modal: true, width: 0.8*docWidth, height: 'auto', maxHeight: $(window).height() - 50 }); // JQuery UI dialogs
-	ShowDebug();
-	$('#logOffBtn>ul').popupmenu();
-	
-	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry,.caselog_entry_html').toggle(); });
-	
-	$(document).ajaxSend(function(event, jqxhr, options) {
-		jqxhr.setRequestHeader('X-Combodo-Ajax', 'true');
-	});
-	$(document).ajaxError(function(event, jqxhr, options) {
-		if (jqxhr.status == 401)
-		{
-			$('<div>'+$sJSDisconnectedMessage+'</div>').dialog({
-				modal:true,
-				title: $sJSTitle,
-				close: function() { $(this).remove(); },
-				minWidth: 400,
-				buttons: [
-					{ text: $sJSLoginAgain, click: function() { window.location.href= GetAbsoluteUrlAppRoot()+'pages/UI.php' } },
-					{ text: $sJSStayOnThePage, click: function() { $(this).dialog('close'); } }
-				]
-			});
-		}
-	});
-EOF
-        );
-        $this->add_ready_script(InlineImage::FixImagesWidth());
-        /*
-         * Not used since the sorting of the tables is always performed server-side
-        AttributeDateTime::InitTableSorter($this, 'custom_date_time');
-        AttributeDate::InitTableSorter($this, 'custom_date');
-        */
-
-        $sUserPrefs = appUserPreferences::GetAsJSON();
-        $this->add_script(
-            <<<EOF
-//		// for JQuery history
-//		function history_callback(hash)
-//		{
-//			// do stuff that loads page content based on hash variable
-//			var aMatches = /^tab_(.*)$/.exec(hash);
-//			if (aMatches != null)
-//			{
-//				var tab = $('#'+hash);
-//				tab.parents('div[id^=tabbedContent]:first').tabs('select', aMatches[1]);
-//			}
-//		}
-
-		function goBack()
-		{
-			window.history.back();
-		}
-		
-		function BackToDetails(sClass, id, sDefaultUrl, sOwnershipToken)
-		{
-			window.bInCancel = true;
-			if (id > 0)
-			{
-				sToken = '';
-				if (sOwnershipToken != undefined)
-				{
-					sToken = '&token='+sOwnershipToken;
-				}
-				window.location.href = AddAppContext(GetAbsoluteUrlAppRoot()+'pages/UI.php?operation=release_lock_and_details&class='+sClass+'&id='+id+sToken);
-			}
-			else
-			{
-				window.location.href = sDefaultUrl; // Already contains the context...				
-			}
-		}
-
-		function BackToList(sClass)
-		{
-			window.location.href = AddAppContext(GetAbsoluteUrlAppRoot()+'pages/UI.php?operation=search_oql&oql_class='+sClass+'&oql_clause=WHERE id=0');
-		}
-		
-		function ShowDebug()
-		{
-			if ($('#rawOutput > div').html() != '')
-			{
-				$('#rawOutput').dialog( {autoOpen: true, modal:false, width: '80%'});
-			}
-		}
-		
-		var oUserPreferences = $sUserPrefs;
-
-		// For disabling the CKEditor at init time when the corresponding textarea is disabled !
-		CKEDITOR.plugins.add( 'disabler',
-		{
-			init : function( editor )
-			{
-				editor.on( 'instanceReady', function(e)
-				{
-					e.removeListener();
-					$('#'+ editor.name).trigger('update');
-				});
-			}
-			
-		});
-
-		
-		function FixPaneVis()
-		{
-			$('.ui-layout-center, .ui-layout-north, .ui-layout-south').css({display: 'block'});
-		}
-EOF
-        );
-    }
-
-
-    /**
-     * @param string $sId          Identifies the item, to search after it in the current breadcrumb
-     * @param string $sLabel       Label of the breadcrumb item
-     * @param string $sDescription More information, displayed as a tooltip
-     * @param string $sUrl         Specify a URL if the current URL as perceived on the browser side is not relevant
-     * @param string $sIcon        Icon (relative or absolute) path that will be displayed next to the label
-     */
-    public function SetBreadCrumbEntry($sId, $sLabel, $sDescription, $sUrl = '', $sIcon = '')
-    {
-        $this->bBreadCrumbEnabled = true;
-        $this->sBreadCrumbEntryId = $sId;
-        $this->sBreadCrumbEntryLabel = $sLabel;
-        $this->sBreadCrumbEntryDescription = $sDescription;
-        $this->sBreadCrumbEntryUrl = $sUrl;
-        $this->sBreadCrumbEntryIcon = $sIcon;
-    }
-
-    /**
-     * State that there will be no breadcrumb item for the current page
-     */
-    public function DisableBreadCrumb()
-    {
-        $this->bBreadCrumbEnabled = false;
-        $this->sBreadCrumbEntryId = null;
-        $this->sBreadCrumbEntryLabel = null;
-        $this->sBreadCrumbEntryDescription = null;
-        $this->sBreadCrumbEntryUrl = null;
-        $this->sBreadCrumbEntryIcon = null;
-    }
-
-    public function AddToMenu($sHtml)
-    {
-        $this->m_sMenu .= $sHtml;
-    }
-
-    public function GetSiloSelectionForm()
-    {
-        // List of visible Organizations
-        $iCount = 0;
-        $oSet = null;
-        if (MetaModel::IsValidClass('Organization')) {
-            // Display the list of *favorite* organizations... but keeping in mind what is the real number of organizations
-            $aFavoriteOrgs = appUserPreferences::GetPref('favorite_orgs', null);
-            $oSearchFilter = new DBObjectSearch('Organization');
-            $oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-            $oSet = new CMDBObjectSet($oSearchFilter);
-            $iCount = $oSet->Count(); // total number of existing Orgs
-
-            // Now get the list of Orgs to be displayed in the menu
-            $oSearchFilter = DBObjectSearch::FromOQL(ApplicationMenu::GetFavoriteSiloQuery());
-            $oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-            if (!empty($aFavoriteOrgs)) {
-                $oSearchFilter->AddCondition('id', $aFavoriteOrgs, 'IN');
-            }
-            $oSet = new CMDBObjectSet($oSearchFilter); // List of favorite orgs
-        }
-        switch ($iCount) {
-            case 0:
-                // No such dimension/silo => nothing to select
-                $sHtml = '<div id="SiloSelection"><!-- nothing to select --></div>';
-                break;
-
-            case 1:
-                // Only one possible choice... no selection, but display the value
-                $oOrg = $oSet->Fetch();
-                $sHtml = '<div id="SiloSelection">' . $oOrg->GetName() . '</div>';
-                $sHtml .= '';
-                break;
-
-            default:
-                $sHtml = '';
-                $oAppContext = new ApplicationContext();
-                $iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
-                $sHtml = '<div id="SiloSelection">';
-                $sHtml .= '<form style="display:inline" action="' . utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php">'; //<select class="org_combo" name="c[org_id]" title="Pick an organization" onChange="this.form.submit();">';
-
-                $sFavoriteOrgs = '';
-                $oWidget = new UIExtKeyWidget('Organization', 'org_id', '', true /* search mode */);
-                $sHtml .= $oWidget->Display($this, 50, false, '', $oSet, $iCurrentOrganization, 'org_id', false, 'c[org_id]', '',
-                    array('iFieldSize' => 20, 'iMinChars' => MetaModel::GetConfig()->Get('min_autocomplete_chars'), 'sDefaultValue' => Dict::S('UI:AllOrganizations')),
-                    null, 'select', false /* bSearchMultiple */);
-                $this->add_ready_script('$("#org_id").bind("extkeychange", function() { $("#SiloSelection form").submit(); } )');
-                $this->add_ready_script("$('#label_org_id').click( function() { if ($('#org_id').val() == '') { $(this).val(''); } } );\n");
-                // Add other dimensions/context information to this form
-                $oAppContext->Reset('org_id'); // org_id is handled above and we want to be able to change it here !
-                $oAppContext->Reset('menu'); // don't pass the menu, since a menu may expect more parameters
-                $sHtml .= $oAppContext->GetForForm(); // Pass what remains, if anything...
-                $sHtml .= '</form>';
-                $sHtml .= '</div>';
-        }
-        return $sHtml;
-    }
-
-    public function DisplayMenu()
-    {
-        // Display the menu
-        $oAppContext = new ApplicationContext();
-        $iAccordionIndex = 0;
-
-        ApplicationMenu::DisplayMenu($this, $oAppContext->GetAsHash());
-    }
-
-    /**
-     * Outputs (via some echo) the complete HTML page by assembling all its elements
-     */
-    public function output()
-    {
-        $sAbsURLAppRoot = addslashes($this->m_sRootUrl);
-
-        //$this->set_base($this->m_sRootUrl.'pages/');
-        $sForm = $this->GetSiloSelectionForm();
-        $this->DisplayMenu(); // Compute the menu
-
-        // Call the extensions to add content to the page, so that they can also add styles or scripts
-        $sBannerExtraHtml = '';
-        foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance) {
-            $sBannerExtraHtml .= $oExtensionInstance->GetBannerHtml($this);
-        }
-
-        $sNorthPane = '';
-        foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance) {
-            $sNorthPane .= $oExtensionInstance->GetNorthPaneHtml($this);
-        }
-
-        if (UserRights::IsAdministrator() && ExecutionKPI::IsEnabled()) {
-            $sNorthPane .= '<div class="app-message"><span style="padding:5px;">' . ExecutionKPI::GetDescription() . '<span></div>';
-        }
-
-        //$sSouthPane = '<p>Peak memory Usage: '.sprintf('%.3f MB', memory_get_peak_usage(true) / (1024*1024)).'</p>';
-        $sSouthPane = '';
-        foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance) {
-            $sSouthPane .= $oExtensionInstance->GetSouthPaneHtml($this);
-        }
-
-        // Render the tabs in the page (if any)
-        $this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
-
-        // Put here the 'ready scripts' that must be executed after all others
-        $aMultiselectOptions = array(
-            'header' => true,
-            'checkAllText' => Dict::S('UI:SearchValue:CheckAll'),
-            'uncheckAllText' => Dict::S('UI:SearchValue:UncheckAll'),
-            'noneSelectedText' => Dict::S('UI:SearchValue:Any'),
-            'selectedText' => Dict::S('UI:SearchValue:NbSelected'),
-            'selectedList' => 1,
-        );
-        $sJSMultiselectOptions = json_encode($aMultiselectOptions);
-        $this->add_ready_script(
-            <<<EOF
-		// Since the event is only triggered when the hash changes, we need to trigger
-		// the event now, to handle the hash the page may have loaded with.
-		$(window).trigger( 'hashchange' );
-		
-		// Some table are sort-able, some are not, let's fix this
-		$('table.listResults').each( function() { FixTableSorter($(this)); } );
-		
-		$('.multiselect').multiselect($sJSMultiselectOptions);
-EOF
-        );
-
-        $iBreadCrumbMaxCount = utils::GetConfig()->Get('breadcrumb.max_count');
-        if ($iBreadCrumbMaxCount > 1) {
-            $oConfig = MetaModel::GetConfig();
-            $siTopInstanceId = json_encode($oConfig->GetItopInstanceid());
-            if ($this->bBreadCrumbEnabled) {
-                if (is_null($this->sBreadCrumbEntryId)) {
-                    $this->sBreadCrumbEntryId = $this->s_title;
-                    $this->sBreadCrumbEntryLabel = $this->s_title;
-                    $this->sBreadCrumbEntryDescription = $this->s_title;
-                    $this->sBreadCrumbEntryUrl = '';
-                    $this->sBreadCrumbEntryIcon = utils::GetAbsoluteUrlAppRoot() . 'images/wrench.png';
-                }
-                $sNewEntry = json_encode(array('id' => $this->sBreadCrumbEntryId, 'url' => $this->sBreadCrumbEntryUrl, 'label' => htmlentities($this->sBreadCrumbEntryLabel, ENT_QUOTES, 'UTF-8'), 'description' => htmlentities($this->sBreadCrumbEntryDescription, ENT_QUOTES, 'UTF-8'), 'icon' => $this->sBreadCrumbEntryIcon));
-            } else {
-                $sNewEntry = 'null';
-            }
-
-            $this->add_ready_script(
-                <<<EOF
-		$('#itop-breadcrumb').breadcrumb({itop_instance_id: $siTopInstanceId, new_entry: $sNewEntry, max_count: $iBreadCrumbMaxCount});
-EOF
-            );
-        }
-
-        $this->outputCollapsibleSectionInit();
-
-        if ($this->GetOutputFormat() == 'html') {
-            foreach ($this->a_headers as $s_header) {
-                header($s_header);
-            }
-        }
-        $s_captured_output = $this->ob_get_clean_safe();
-        $sHtml = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
-        $sHtml .= "<html>\n";
-        $sHtml .= "<head>\n";
-        // Make sure that Internet Explorer renders the page using its latest/highest/greatest standards !
-        $sHtml .= "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n";
-        $sHtml .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-        $sHtml .= "<title>" . htmlentities($this->s_title, ENT_QUOTES, 'UTF-8') . "</title>\n";
-        $sHtml .= $this->get_base_tag();
-        // Stylesheets MUST be loaded before any scripts otherwise
-        // jQuery scripts may face some spurious problems (like failing on a 'reload')
-        foreach ($this->a_linked_stylesheets as $a_stylesheet) {
-            if (strpos($a_stylesheet['link'], '?') === false) {
-                $s_stylesheet = $a_stylesheet['link'] . "?t=".utils::GetCacheBusterTimestamp();
-            } else {
-                $s_stylesheet = $a_stylesheet['link'] . "&t=".utils::GetCacheBusterTimestamp();
-            }
-            if ($a_stylesheet['condition'] != "") {
-                $sHtml .= "<!--[if {$a_stylesheet['condition']}]>\n";
-            }
-            $sHtml .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$s_stylesheet}\" />\n";
-            if ($a_stylesheet['condition'] != "") {
-                $sHtml .= "<![endif]-->\n";
-            }
-        }
-        // special stylesheet for printing, hides the navigation gadgets
-        $sHtml .= "<link rel=\"stylesheet\" media=\"print\" type=\"text/css\" href=\"../css/print.css?t=".utils::GetCacheBusterTimestamp() . "\" />\n";
-
-        if ($this->GetOutputFormat() == 'html') {
-            $sHtml .= $this->output_dict_entries(true); // before any script so that they can benefit from the translations
-            foreach ($this->a_linked_scripts as $s_script) {
-                // Make sure that the URL to the script contains the application's version number
-                // so that the new script do NOT get reloaded from the cache when the application is upgraded
-                if (strpos($s_script, '?') === false) {
-                    $s_script .= "?t=".utils::GetCacheBusterTimestamp();
-                } else {
-                    $s_script .= "&t=".utils::GetCacheBusterTimestamp();
-                }
-                $sHtml .= "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
-            }
-            if (!$this->IsPrintableVersion()) {
-                $this->add_script("var iPaneVisWatchDog  = window.setTimeout('FixPaneVis()',5000);");
-            }
-	        $sInitScripts = "";
-	        if (count($this->m_aInitScript) > 0) {
-		        foreach ($this->m_aInitScript as $m_sInitScript) {
-			        $sInitScripts .= "$m_sInitScript\n";
-		        }
-	        }
-            $this->add_script("\$(document).ready(function() {\n{$sInitScripts};\nwindow.setTimeout('onDelayedReady()',10)\n});");
-            if ($this->IsPrintableVersion()) {
-                $this->add_ready_script(
-                    <<<EOF
-var sHiddeableChapters = '<div class="light ui-tabs ui-widget ui-widget-content ui-corner-all">';
-sHiddeableChapters += '<ul role="tablist" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">';
-for (sId in oHiddeableChapters)
-{
-	sHiddeableChapters += '<li tabindex="-1" role="tab" class="ui-state-default ui-corner-top hideable-chapter" chapter-id="'+sId+'"><span class="tab ui-tabs-anchor">' + oHiddeableChapters[sId] + '</span></li>';
-	//alert(oHiddeableChapters[sId]);
-}
-sHiddeableChapters += '</ul></div>';
-$('#hiddeable_chapters').html(sHiddeableChapters);
-$('.hideable-chapter').click(function(){
-	var sChapterId = $(this).attr('chapter-id');
-	$('#'+sChapterId).toggle();
-	$(this).toggleClass('strikethrough');
-});
-$('fieldset').each(function() {
-	var jLegend = $(this).find('legend');
-	jLegend.remove();
-	$(this).wrapInner('<span></span>').prepend(jLegend);
-});
-$('legend').css('cursor', 'pointer').click(function(){
-		$(this).parent('fieldset').toggleClass('not-printable strikethrough');
-	});
-EOF
-                );
-            }
-            if (count($this->m_aReadyScripts) > 0) {
-                $this->add_script("\nonDelayedReady = function() {\n" . implode("\n", $this->m_aReadyScripts) . "\n}\n");
-            }
-            if (count($this->a_scripts) > 0) {
-                $sHtml .= "<script type=\"text/javascript\">\n";
-                foreach ($this->a_scripts as $s_script) {
-                    $sHtml .= "$s_script\n";
-                }
-                $sHtml .= "</script>\n";
-            }
-        }
-
-        if (count($this->a_styles) > 0) {
-            $sHtml .= "<style>\n";
-            foreach ($this->a_styles as $s_style) {
-                $sHtml .= "$s_style\n";
-            }
-            $sHtml .= "</style>\n";
-        }
-        $sHtml .= "<link rel=\"search\" type=\"application/opensearchdescription+xml\" title=\"iTop\" href=\"" . utils::GetAbsoluteUrlAppRoot() . "pages/opensearch.xml.php\" />\n";
-        $sHtml .= "<link rel=\"shortcut icon\" href=\"" . utils::GetAbsoluteUrlAppRoot() . "images/favicon.ico?t=".utils::GetCacheBusterTimestamp(). "\" />\n";
-
-        $sHtml .= "</head>\n";
-        $sBodyClass = "";
-        if ($this->IsPrintableVersion()) {
-            $sBodyClass = 'printable-version';
-        }
-        $sHtml .= "<body class=\"$sBodyClass\">\n";
-        if ($this->IsPrintableVersion()) {
-            $sHtml .= "<div class=\"explain-printable not-printable\">";
-            $sHtml .= '<p>' . Dict::Format('UI:ExplainPrintable', '<img src="../images/eye-open-555.png" style="vertical-align:middle">') . '</p>';
-            $sHtml .= "<div id=\"hiddeable_chapters\"></div>";
-            $sHtml .= '<button onclick="window.print()">' . htmlentities(Dict::S('UI:Button:GoPrint'), ENT_QUOTES, 'UTF-8') . '</button>';
-            $sHtml .= '&nbsp;';
-            $sHtml .= '<button onclick="window.close()">' . htmlentities(Dict::S('UI:Button:Cancel'), ENT_QUOTES, 'UTF-8') . '</button>';
-            $sHtml .= "</div>";
-        }
-
-        // Render the revision number
-        if (ITOP_REVISION == '$WCREV$') {
-            // This is NOT a version built using the buil system, just display the main version
-            $sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
-        } else {
-            // This is a build made from SVN, let display the full information
-            $sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
-        }
-
-        // Render the text of the global search form
-        $sText = htmlentities(utils::ReadParam('text', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8');
-        $sOnClick = " onclick=\"if ($('#global-search-input').val() != '') { $('#global-search form').submit();  } \"";
-        $sDefaultPlaceHolder = Dict::S("UI:YourSearch");
-
-        if ($this->IsPrintableVersion()) {
-            $sHtml .= ' <!-- Beginning of page content -->';
-            $sHtml .= self::FilterXSS($this->s_content);
-            $sHtml .= ' <!-- End of page content -->';
-        } elseif ($this->GetOutputFormat() == 'html') {
-            $oAppContext = new ApplicationContext();
-
-            $sUserName = UserRights::GetUser();
-            $sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
-            if (UserRights::IsAdministrator()) {
-                $sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
-            } else {
-                $sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);
-            }
-            $sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/on-off-menu.png\"><ul>";
-            $sLogOffMenu .= "<li><span>$sLogonMessage</span></li>\n";
-            $aActions = array();
-
-            $aAllowedPortals = UserRights::GetAllowedPortals();
-            if (count($aAllowedPortals) > 1) {
-                // Adding portals
-                foreach ($aAllowedPortals as $aAllowedPortal) {
-                    if ($aAllowedPortal['id'] !== 'backoffice') {
-                        $oPortalMenuItem = new URLPopupMenuItem('portal:' . $aAllowedPortal['id'], Dict::S($aAllowedPortal['label']), $aAllowedPortal['url'], '_blank');
-                        $aActions[$oPortalMenuItem->GetUID()] = $oPortalMenuItem->GetMenuItem();
-                    }
-                }
-                // Adding a separator
-                $oPortalSeparatorMenuItem = new SeparatorPopupMenuItem();
-                $aActions[$oPortalSeparatorMenuItem->GetUID()] = $oPortalSeparatorMenuItem->GetMenuItem();
-            }
-
-            $oPrefs = new URLPopupMenuItem('UI:Preferences', Dict::S('UI:Preferences'), utils::GetAbsoluteUrlAppRoot() . "pages/preferences.php?" . $oAppContext->GetForLink());
-            $aActions[$oPrefs->GetUID()] = $oPrefs->GetMenuItem();
-
-            if (utils::IsArchiveMode()) {
-                $oExitArchive = new JSPopupMenuItem('UI:ArchiveModeOff', Dict::S('UI:ArchiveModeOff'), 'return ArchiveMode(false);');
-                $aActions[$oExitArchive->GetUID()] = $oExitArchive->GetMenuItem();
-
-                $sIcon = '<span class="fa fa-lock fa-1x"></span>';
-                $this->AddApplicationMessage(Dict::S('UI:ArchiveMode:Banner'), $sIcon, Dict::S('UI:ArchiveMode:Banner+'));
-            } elseif (UserRights::CanBrowseArchive()) {
-                $oBrowseArchive = new JSPopupMenuItem('UI:ArchiveModeOn', Dict::S('UI:ArchiveModeOn'), 'return ArchiveMode(true);');
-                $aActions[$oBrowseArchive->GetUID()] = $oBrowseArchive->GetMenuItem();
-            }
-            if (utils::CanLogOff()) {
-                $oLogOff = new URLPopupMenuItem('UI:LogOffMenu', Dict::S('UI:LogOffMenu'), utils::GetAbsoluteUrlAppRoot() . 'pages/logoff.php?operation=do_logoff');
-                $aActions[$oLogOff->GetUID()] = $oLogOff->GetMenuItem();
-            }
-            if (UserRights::CanChangePassword()) {
-                $oChangePwd = new URLPopupMenuItem('UI:ChangePwdMenu', Dict::S('UI:ChangePwdMenu'), utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=change_pwd');
-                $aActions[$oChangePwd->GetUID()] = $oChangePwd->GetMenuItem();
-            }
-            utils::GetPopupMenuItems($this, iPopupMenuExtension::MENU_USER_ACTIONS, null, $aActions);
-
-            $oAbout = new JSPopupMenuItem('UI:AboutBox', Dict::S('UI:AboutBox'), 'return ShowAboutBox();');
-            $aActions[$oAbout->GetUID()] = $oAbout->GetMenuItem();
-
-            $sLogOffMenu .= $this->RenderPopupMenuItems($aActions);
-
-
-            $sRestrictions = '';
-            if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE)) {
-                if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE)) {
-                    $sRestrictions = Dict::S('UI:AccessRO-All');
-                }
-            } elseif (!MetaModel::DBHasAccess(ACCESS_USER_WRITE)) {
-                $sRestrictions = Dict::S('UI:AccessRO-Users');
-            }
-
-            if (strlen($sRestrictions) > 0) {
-                $sIcon =
-                    <<<EOF
-<span class="fa-stack fa-sm">
-  <i class="fa fa-pencil fa-flip-horizontal fa-stack-1x"></i>
-  <i class="fa fa-ban fa-stack-2x text-danger"></i>
-</span>
-EOF;
-
-                $sAdminMessage = trim(MetaModel::GetConfig()->Get('access_message'));
-                if (strlen($sAdminMessage) > 0) {
-                    $sRestrictions .= '&nbsp;' . $sAdminMessage;
-                }
-                $this->AddApplicationMessage($sRestrictions, $sIcon);
-            }
-
-            $sApplicationMessages = '';
-            foreach ($this->m_aMessages as $aMessage) {
-                $sHtmlIcon = $aMessage['icon'] ? $aMessage['icon'] : '';
-                $sHtmlMessage = $aMessage['message'];
-                $sTitleAttr = $aMessage['tip'] ? 'title="' . htmlentities($aMessage['tip'], ENT_QUOTES, 'UTF-8') . '"' : '';
-                $sApplicationMessages .= '<div class="app-message" ' . $sTitleAttr . '><span class="app-message-icon">' . $sHtmlIcon . '</span><span class="app-message-body">' . $sHtmlMessage . '</div></span>';
-            }
-
-            $sApplicationBanner = "<div class=\"app-banner ui-helper-clearfix\">$sApplicationMessages$sBannerExtraHtml</div>";
-
-            if (!empty($sNorthPane)) {
-                $sNorthPane = '<div id="top-pane" class="ui-layout-north">' . $sNorthPane . '</div>';
-            }
-
-            if (!empty($sSouthPane)) {
-                $sSouthPane = '<div id="bottom-pane" class="ui-layout-south">' . $sSouthPane . '</div>';
-            }
-
-            $sIconUrl = Utils::GetConfig()->Get('app_icon_url');
-            $sOnlineHelpUrl = MetaModel::GetConfig()->Get('online_help');
-            //$sLogOffMenu = "<span id=\"logOffBtn\" style=\"height:55px;padding:0;margin:0;\"><img src=\"../images/onOffBtn.png\"></span>";
-
-            $sDisplayIcon = utils::GetAbsoluteUrlAppRoot() . 'images/itop-logo.png?t=' . utils::GetCacheBusterTimestamp();
-            if (file_exists(MODULESROOT . 'branding/main-logo.png')) {
-                $sDisplayIcon = utils::GetAbsoluteUrlModulesRoot() . 'branding/main-logo.png?t=' . utils::GetCacheBusterTimestamp();
-            }
-
-            $sHtml .= $sNorthPane;
-            $sHtml .= '<div id="left-pane" class="ui-layout-west">';
-            $sHtml .= '<!-- Beginning of the left pane -->';
-            $sHtml .= ' <div class="ui-layout-north">';
-            $sHtml .= ' <div id="header-logo">';
-            $sHtml .= ' <div id="top-left"></div><div id="logo"><a href="' . htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8') . '"><img src="' . $sDisplayIcon . '" title="' . htmlentities($sVersionString, ENT_QUOTES, 'UTF-8') . '" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
-            $sHtml .= ' </div>';
-            $sHtml .= ' <div class="header-menu">';
-            if (!MetaModel::GetConfig()->Get('demo_mode')) {
-                $sHtml .= '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
-            }
-            $sHtml .= '		<div style="text-align:center;">' . self::FilterXSS($sForm) . '</div>';
-            $sHtml .= ' </div>';
-            $sHtml .= ' </div>';
-            $sHtml .= ' <div id="menu" class="ui-layout-center">';
-            $sHtml .= '		<div id="inner_menu">';
-            $sHtml .= '			<div id="accordion">';
-            $sHtml .= self::FilterXSS($this->m_sMenu);
-            $sHtml .= '			<!-- Beginning of the accordion menu -->';
-            $sHtml .= '			<!-- End of the accordion menu-->';
-            $sHtml .= '			</div>';
-            $sHtml .= '		</div> <!-- /inner menu -->';
-            $sHtml .= ' </div> <!-- /menu -->';
-            $sHtml .= ' <div class="footer ui-layout-south"><div id="combodo_logo"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png?t=' . utils::GetCacheBusterTimestamp() . '"/></a></div></div>';
-            $sHtml .= '<!-- End of the left pane -->';
-            $sHtml .= '</div>';
-
-            $sHtml .= '<div class="ui-layout-center">';
-            $sHtml .= ' <div id="top-bar" class="ui-helper-clearfix" style="width:100%">';
-            $sHtml .= self::FilterXSS($sApplicationBanner);
-
-            $GoHomeInitialStyle = $this->IsMenuPaneVisible() ? 'display: none;' : '';
-
-            $sHtml .= ' <table id="top-bar-table">';
-            $sHtml .= ' <tr>';
-            $sHtml .= ' <td id="open-left-pane"  class="menu-pane-exclusive" style="' . $GoHomeInitialStyle . '" onclick="$(\'body\').layout().open(\'west\');">';
-            $sHtml .= ' <img src="../images/menu.png">';
-            $sHtml .= ' </td>';
-            $sHtml .= ' <td id="go-home" class="menu-pane-exclusive" style="' . $GoHomeInitialStyle . '">';
-            $sHtml .= ' <a href="' . utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php"><img src="../images/home.png"></a>';
-            $sHtml .= ' </td>';
-            $sHtml .= ' <td class="top-bar-spacer menu-pane-exclusive" style="' . $GoHomeInitialStyle . '">';
-            $sHtml .= ' </td>';
-            $sHtml .= ' <td id="top-bar-table-breadcrumb">';
-            $sHtml .= ' <div id="itop-breadcrumb"></div>';
-            $sHtml .= ' </td>';
-            $sHtml .= ' <td id="top-bar-table-search">';
-            $sHtml .= '		<div id="global-search"><form action="' . utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php">';
-            $sHtml .= '		<table id="top-left-buttons-area"><tr>';
-            $sHtml .= '			<td id="top-left-global-search-cell"><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="' . $sDefaultPlaceHolder . '" value="'. $sText . '"></input><div ' . $sOnClick . ' id="global-search-image"><input type="hidden" name="operation" value="full_text"/></div></div></td>';
-            $sHtml .= '     	<td id="top-left-help-cell"><a id="help-link" href="' . $sOnlineHelpUrl . '" target="_blank"><img title="' . Dict::S('UI:Help') . '" src="../images/help.png?t=' . utils::GetCacheBusterTimestamp() . '"/></td>';
-            $sHtml .= '     	<td id="top-left-logoff-cell">' . self::FilterXSS($sLogOffMenu) . '</td>';
-            $sHtml .= '     </tr></table></form></div>';
-            $sHtml .= ' </td>';
-            $sHtml .= ' </tr>';
-            $sHtml .= ' </table>';
-
-//			$sHtml .= '		<div id="global-search"><form action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><table><tr><td></td><td><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="'.$sText.'"></input><div '.$sOnClick.' id="global-search-image"></div></div></td>';
-//			$sHtml .= '<td><a id="help-link" href="'.$sOnlineHelpUrl.'" target="_blank"><img title="'.Dict::S('UI:Help').'" src="../images/help.png?t='.utils::GetCacheBusterTimestamp().'"/></td>';
-//			$sHtml .= '<td>'.self::FilterXSS($sLogOffMenu).'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
-//			$sHtml .= ' <div id="itop-breadcrumb"></div>';
-
-            $sHtml .= ' </div>';
-            $sHtml .= ' <div class="ui-layout-content" style="overflow:auto;">';
-            $sHtml .= ' <!-- Beginning of page content -->';
-            $sHtml .= self::FilterXSS($this->s_content);
-            $sHtml .= ' <!-- End of page content -->';
-            $sHtml .= ' </div>';
-            $sHtml .= '</div>';
-            $sHtml .= $sSouthPane;
-
-            // Add the captured output
-            if (trim($s_captured_output) != "") {
-                $sHtml .= "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">" . self::FilterXSS($s_captured_output) . "</div></div>\n";
-            }
-            $sHtml .= "<div id=\"at_the_end\">" . self::FilterXSS($this->s_deferred_content) . "</div>";
-            $sHtml .= "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
-            $sHtml .= "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
-            $sHtml .= "<div style=\"display:none\" id=\"ajax_content\"></div>";
-        } else {
-            $sHtml .= self::FilterXSS($this->s_content);
-        }
-
-        $sHtml .= "</body>\n";
-        $sHtml .= "</html>\n";
-
-        if ($this->GetOutputFormat() == 'html') {
-            $oKPI = new ExecutionKPI();
-            echo $sHtml;
-            $oKPI->ComputeAndReport('Echoing (' . round(strlen($sHtml) / 1024) . ' Kb)');
-        } else if ($this->GetOutputFormat() == 'pdf' && $this->IsOutputFormatAvailable('pdf')) {
-            if (@is_readable(APPROOT . 'lib/MPDF/mpdf.php')) {
-                require_once(APPROOT . 'lib/MPDF/mpdf.php');
-                $oMPDF = new mPDF('c');
-                $oMPDF->mirroMargins = false;
-                if ($this->a_base['href'] != '') {
-                    $oMPDF->setBasePath($this->a_base['href']); // Seems that the <BASE> tag is not recognized by mPDF...
-                }
-                $oMPDF->showWatermarkText = true;
-                if ($this->GetOutputOption('pdf', 'template_path')) {
-                    $oMPDF->setImportUse(); // Allow templates
-                    $oMPDF->SetDocTemplate($this->GetOutputOption('pdf', 'template_path'), 1);
-                }
-                $oMPDF->WriteHTML($sHtml);
-                $sOutputName = $this->s_title . '.pdf';
-                if ($this->GetOutputOption('pdf', 'output_name')) {
-                    $sOutputName = $this->GetOutputOption('pdf', 'output_name');
-                }
-                $oMPDF->Output($sOutputName, 'I');
-            }
-        }
-        DBSearch::RecordQueryTrace();
-        ExecutionKPI::ReportStats();
-    }
-
-    /**
-     * Adds init scripts for the collapsible sections
-     */
-    private function outputCollapsibleSectionInit()
-    {
-        if (!$this->bHasCollapsibleSection) {
-            return;
-        }
-
-        $this->add_script(<<<'EOD'
-function initCollapsibleSection(iSectionId, bOpenedByDefault, sSectionStateStorageKey)
-{
-var bStoredSectionState = JSON.parse(localStorage.getItem(sSectionStateStorageKey));
-var bIsSectionOpenedInitially = (bStoredSectionState == null) ? bOpenedByDefault : bStoredSectionState;
-
-if (bIsSectionOpenedInitially) {
-	$("#LnkCollapse_"+iSectionId).toggleClass("open");
-	$("#Collapse_"+iSectionId).toggle();
-}
-
-$("#LnkCollapse_"+iSectionId).click(function(e) {
-	localStorage.setItem(sSectionStateStorageKey, !($("#Collapse_"+iSectionId).is(":visible")));
-	$("#LnkCollapse_"+iSectionId).toggleClass("open");
-	$("#Collapse_"+iSectionId).slideToggle("normal");
-	e.preventDefault(); // we don't want to do anything more (see #1030 : a non wanted tab switching was triggered)
-});
-}
-EOD
-        );
-    }
-
-    public function AddTabContainer($sTabContainer, $sPrefix = '')
-    {
-        $this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
-    }
-
-    public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
-    {
-        $this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
-    }
-
-    public function SetCurrentTabContainer($sTabContainer = '')
-    {
-        return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
-    }
-
-    public function SetCurrentTab($sTabLabel = '')
-    {
-        return $this->m_oTabs->SetCurrentTab($sTabLabel);
-    }
-
-    /**
-     * Add a tab which content will be loaded asynchronously via the supplied URL
-     *
-     * Limitations:
-     * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
-     * Static content cannot be added inside such tabs.
-     *
-     * @param string  $sTabLabel The (localised) label of the tab
-     * @param string  $sUrl      The URL to load (on the same server)
-     * @param boolean $bCache    Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
-     *
-     * @since 2.0.3
-     */
-    public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
-    {
-        $this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
-    }
-
-    public function GetCurrentTab()
-    {
-        return $this->m_oTabs->GetCurrentTab();
-    }
-
-    public function RemoveTab($sTabLabel, $sTabContainer = null)
-    {
-        $this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
-    }
-
-    /**
-     * Finds the tab whose title matches a given pattern
-     * @return mixed The name of the tab as a string or false if not found
-     */
-    public function FindTab($sPattern, $sTabContainer = null)
-    {
-        return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
-    }
-
-    /**
-     * Make the given tab the active one, as if it were clicked
-     * DOES NOT WORK: apparently in the *old* version of jquery
-     * that we are using this is not supported... TO DO upgrade
-     * the whole jquery bundle...
-     */
-    public function SelectTab($sTabContainer, $sTabLabel)
-    {
-        $this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
-    }
-
-    public function StartCollapsibleSection(
-        $sSectionLabel, $bOpenedByDefault = false, $sSectionStateStorageBusinessKey = ''
-    )
-    {
-        $this->add($this->GetStartCollapsibleSection($sSectionLabel, $bOpenedByDefault,
-            $sSectionStateStorageBusinessKey));
-    }
-
-    private function GetStartCollapsibleSection(
-        $sSectionLabel, $bOpenedByDefault = false, $sSectionStateStorageBusinessKey = ''
-    )
-    {
-        $this->bHasCollapsibleSection = true;
-        $sHtml = '';
-        static $iSectionId = 0;
-        $sHtml .= '<a id="LnkCollapse_' . $iSectionId . '" class="CollapsibleLabel" href="#">' . $sSectionLabel . '</a></br>' . "\n";
-        $sHtml .= '<div id="Collapse_' . $iSectionId . '" style="display:none">' . "\n";
-
-        $oConfig = MetaModel::GetConfig();
-        $sSectionStateStorageKey = $oConfig->GetItopInstanceid() . '/' . $sSectionStateStorageBusinessKey . '/collapsible-' . $iSectionId;
-        $sSectionStateStorageKey = json_encode($sSectionStateStorageKey);
-        $sOpenedByDefault = ($bOpenedByDefault) ? 'true' : 'false';
-        $this->add_ready_script("initCollapsibleSection($iSectionId, $sOpenedByDefault, '$sSectionStateStorageKey');");
-
-        $iSectionId++;
-        return $sHtml;
-    }
-
-    public function EndCollapsibleSection()
-    {
-        $this->add($this->GetEndCollapsibleSection());
-    }
-
-    public function GetEndCollapsibleSection()
-    {
-        return "</div>";
-    }
-
-    public function add($sHtml)
-    {
-        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != '')) {
-            $this->m_oTabs->AddToCurrentTab($sHtml);
-        } else {
-            parent::add($sHtml);
-        }
-    }
-
-    /**
-     * Records the current state of the 'html' part of the page output
-     * @return mixed The current state of the 'html' output
-     */
-    public function start_capture()
-    {
-        $sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
-        $sCurrentTab = $this->m_oTabs->GetCurrentTab();
-
-        if (!empty($sCurrentTabContainer) && !empty($sCurrentTab)) {
-            $iOffset = $this->m_oTabs->GetCurrentTabLength();
-            return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
-        } else {
-            return parent::start_capture();
-        }
-    }
-
-    /**
-     * Returns the part of the html output that occurred since the call to start_capture
-     * and removes this part from the current html output
-     *
-     * @param $offset mixed The value returned by start_capture
-     *
-     * @return string The part of the html output that was added since the call to start_capture
-     */
-    public function end_capture($offset)
-    {
-        if (is_array($offset)) {
-            if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab'])) {
-                $sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
-            } else {
-                $sCaptured = '';
-            }
-        } else {
-            $sCaptured = parent::end_capture($offset);
-        }
-        return $sCaptured;
-    }
-
-    /**
-     * Set the message to be displayed in the 'app-banner' section at the top of the page
-     */
-    public function SetMessage($sHtmlMessage)
-    {
-        $sHtmlIcon = '<span class="fa fa-comment fa-1x"></span>';
-        $this->AddApplicationMessage($sHtmlMessage, $sHtmlIcon);
-    }
-
-    /**
-     * Add message to be displayed in the 'app-banner' section at the top of the page
-     */
-    public function AddApplicationMessage($sHtmlMessage, $sHtmlIcon = null, $sTip = null)
-    {
-        if (strlen($sHtmlMessage)) {
-            $this->m_aMessages[] = array(
-                'icon' => $sHtmlIcon,
-                'message' => $sHtmlMessage,
-                'tip' => $sTip
-            );
-        }
-    }
-	/**
-	 * Adds a script to be executed when the DOM is ready (typical JQuery use), right before add_ready_script
-	 * @return void
-	 */
-	public function add_init_script($sScript){
-	    $this->m_aInitScript[] = $sScript;
-    }
-}
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class iTopWebPage
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT . "/application/nicewebpage.class.inc.php");
+require_once(APPROOT . "/application/applicationcontext.class.inc.php");
+require_once(APPROOT . "/application/user.preferences.class.inc.php");
+
+/**
+ * Web page with some associated CSS and scripts (jquery) for a fancier display
+ */
+class iTopWebPage extends NiceWebPage implements iTabbedPage
+{
+    private $m_sMenu;
+    //	private $m_currentOrganization;
+    private $m_aMessages;
+    private $m_aInitScript = array();
+    protected $m_oTabs;
+    protected $bBreadCrumbEnabled;
+    protected $sBreadCrumbEntryId;
+    protected $sBreadCrumbEntryLabel;
+    protected $sBreadCrumbEntryDescription;
+    protected $sBreadCrumbEntryUrl;
+    protected $sBreadCrumbEntryIcon;
+    protected $oCtx;
+
+    protected $bHasCollapsibleSection = false;
+
+    public function __construct($sTitle, $bPrintable = false)
+    {
+        parent::__construct($sTitle, $bPrintable);
+        $this->m_oTabs = new TabManager();
+        $this->oCtx = new ContextTag('GUI:Console');
+
+        ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
+
+        if ((count($_POST) == 0) || (array_key_exists('loginop', $_POST))) {
+            // Create a breadcrumb entry for the current page, but get its title as late as possible (page title could be changed later)
+            $this->bBreadCrumbEnabled = true;
+        } else {
+            $this->bBreadCrumbEnabled = false;
+        }
+
+        utils::InitArchiveMode();
+
+        $this->m_sMenu = "";
+        $this->m_aMessages = array();
+        $this->SetRootUrl(utils::GetAbsoluteUrlAppRoot());
+        $this->add_header("Content-type: text/html; charset=utf-8");
+        $this->add_header("Cache-control: no-cache");
+        $this->add_linked_stylesheet("../css/jquery.treeview.css");
+        $this->add_linked_stylesheet("../css/jquery.autocomplete.css");
+        $this->add_linked_stylesheet("../css/jquery-ui-timepicker-addon.css");
+        $this->add_linked_stylesheet("../css/fg.menu.css");
+        $this->add_linked_stylesheet("../css/jquery.multiselect.css");
+        $this->add_linked_stylesheet("../css/magnific-popup.css");
+        $this->add_linked_stylesheet("../css/c3.min.css");
+        $this->add_linked_stylesheet("../css/font-awesome/css/font-awesome.min.css");
+
+        $this->add_linked_script('../js/jquery.layout.min.js');
+        $this->add_linked_script('../js/jquery.ba-bbq.min.js');
+        $this->add_linked_script("../js/jquery.treeview.js");
+        $this->add_linked_script("../js/jquery.autocomplete.js");
+        $this->add_linked_script("../js/date.js");
+        $this->add_linked_script("../js/jquery-ui-timepicker-addon.js");
+        $this->add_linked_script("../js/jquery-ui-timepicker-addon-i18n.min.js");
+        $this->add_linked_script("../js/jquery.blockUI.js");
+        $this->add_linked_script("../js/utils.js");
+        $this->add_linked_script("../js/swfobject.js");
+        $this->add_linked_script("../js/ckeditor/ckeditor.js");
+        $this->add_linked_script("../js/ckeditor/adapters/jquery.js");
+        $this->add_linked_script("../js/jquery.qtip-1.0.min.js");
+        $this->add_linked_script('../js/property_field.js');
+        $this->add_linked_script('../js/fg.menu.js');
+        $this->add_linked_script('../js/icon_select.js');
+        $this->add_linked_script('../js/raphael-min.js');
+        $this->add_linked_script('../js/d3.js');
+        $this->add_linked_script('../js/c3.js');
+        $this->add_linked_script('../js/jquery.multiselect.js');
+        $this->add_linked_script('../js/ajaxfileupload.js');
+        $this->add_linked_script('../js/jquery.mousewheel.js');
+        $this->add_linked_script('../js/jquery.magnific-popup.min.js');
+        $this->add_linked_script('../js/breadcrumb.js');
+        $this->add_linked_script('../js/moment.min.js');
+
+
+        $sSearchAny = addslashes(Dict::S('UI:SearchValue:Any'));
+        $sSearchNbSelected = addslashes(Dict::S('UI:SearchValue:NbSelected'));
+        $this->add_dict_entry('UI:FillAllMandatoryFields');
+
+        $this->add_dict_entries('Error:');
+        $this->add_dict_entries('UI:Button:');
+        $this->add_dict_entries('UI:Search:');
+        $this->add_dict_entry('UI:UndefinedObject');
+        $this->add_dict_entries('Enum:Undefined');
+
+
+        if (!$this->IsPrintableVersion()) {
+            $this->PrepareLayout();
+            $this->add_script(
+                <<<EOF
+function ShowAboutBox()
+{
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', {operation: 'about_box'}, function(data){
+		$('body').append(data);
+	});
+	return false;
+}
+function ArchiveMode(bEnable)
+{
+	var sPrevUrl = StripArchiveArgument(window.location.search);
+	if (bEnable)
+	{
+		window.location.search = sPrevUrl + '&with-archive=1';
+	}
+	else
+	{
+		window.location.search = sPrevUrl + '&with-archive=0';
+	}
+}
+function StripArchiveArgument(sUrl)
+{
+	var res = sUrl.replace(/&with-archive=[01]/g, '');
+	return res;
+}
+EOF
+            );
+        }
+    }
+
+    protected function IsMenuPaneVisible()
+    {
+        $bLeftPaneOpen = true;
+        if (MetaModel::GetConfig()->Get('demo_mode')) {
+            // Leave the pane opened
+        } else {
+            if (utils::ReadParam('force_menu_pane', null) === 0) {
+                $bLeftPaneOpen = false;
+            } elseif (appUserPreferences::GetPref('menu_pane', 'open') == 'closed') {
+                $bLeftPaneOpen = false;
+            }
+        }
+        return $bLeftPaneOpen;
+    }
+
+    protected function PrepareLayout()
+    {
+        if (MetaModel::GetConfig()->Get('demo_mode')) {
+            // No pin button
+            $sConfigureWestPane = '';
+        } else {
+            $sConfigureWestPane =
+                <<<EOF
+                if (typeof myLayout !== "undefined")
+                {
+                    myLayout.addPinBtn( "#tPinMenu", "west" );
+                }
+EOF;
+        }
+        $sInitClosed = $this->IsMenuPaneVisible() ? '' : 'initClosed: true,';
+
+        $sJSDisconnectedMessage = json_encode(Dict::S('UI:DisconnectedDlgMessage'));
+        $sJSTitle = json_encode(Dict::S('UI:DisconnectedDlgTitle'));
+        $sJSLoginAgain = json_encode(Dict::S('UI:LoginAgain'));
+        $sJSStayOnThePage = json_encode(Dict::S('UI:StayOnThePage'));
+        $aDaysMin = array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
+            Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min'));
+        $aMonthsShort = array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'),
+            Dict::S('Month-07-Short'), Dict::S('Month-08-Short'), Dict::S('Month-09-Short'), Dict::S('Month-10-Short'), Dict::S('Month-11-Short'), Dict::S('Month-12-Short'));
+        $sTimeFormat = AttributeDateTime::GetFormat()->ToTimeFormat();
+        $oTimeFormat = new DateTimeFormat($sTimeFormat);
+        $sJSLangShort = json_encode(strtolower(substr(Dict::GetUserLanguage(), 0, 2)));
+
+        // Date picker options
+        $aPickerOptions = array(
+            'showOn' => 'button',
+            'buttonImage' => '../images/calendar.png',
+            'buttonImageOnly' => true,
+            'dateFormat' => AttributeDate::GetFormat()->ToDatePicker(),
+            'constrainInput' => false,
+            'changeMonth' => true,
+            'changeYear' => true,
+            'dayNamesMin' => $aDaysMin,
+            'monthNamesShort' => $aMonthsShort,
+            'firstDay' => (int)Dict::S('Calendar-FirstDayOfWeek'),
+        );
+        $sJSDatePickerOptions = json_encode($aPickerOptions);
+
+        // Time picker additional options
+        $aPickerOptions['showOn'] = '';
+        $aPickerOptions['buttonImage'] = null;
+        $aPickerOptions['timeFormat'] = $oTimeFormat->ToDatePicker();
+        $aPickerOptions['controlType'] = 'select';
+        $aPickerOptions['closeText'] = Dict::S('UI:Button:Ok');
+        $sJSDateTimePickerOptions = json_encode($aPickerOptions);
+        if ($sJSLangShort != '"en"') {
+            // More options that cannot be passed via json_encode since they must be evaluated client-side
+            $aMoreJSOptions = ",
+				'timeText': $.timepicker.regional[$sJSLangShort].timeText,
+				'hourText': $.timepicker.regional[$sJSLangShort].hourText,
+				'minuteText': $.timepicker.regional[$sJSLangShort].minuteText,
+				'secondText': $.timepicker.regional[$sJSLangShort].secondText,
+				'currentText': $.timepicker.regional[$sJSLangShort].currentText
+			}";
+            $sJSDateTimePickerOptions = substr($sJSDateTimePickerOptions, 0, -1) . $aMoreJSOptions;
+        }
+        $this->add_script(
+            <<< EOF
+	function PrepareWidgets()
+	{
+		// note: each action implemented here must be idempotent,
+		//       because this helper function might be called several times on a given page 
+	
+	    // Note: Trigger image is wrapped in a span so we can display it we want 
+		$(".date-pick").datepicker($sJSDatePickerOptions)
+		    .next("img").wrap("<span>");
+	
+		// Hack for the date and time picker addon issue on Chrome (see #1305)
+		// The workaround is to instantiate the widget on demand
+		// It relies on the same markup, thus reverting to the original implementation should be straightforward
+		$(".datetime-pick:not(.is-widget-ready)").each(function(){
+			var oInput = this;
+			$(oInput).addClass('is-widget-ready');
+			$('<span><img class="datetime-pick-button" src="../images/calendar.png"></span>')
+				.insertAfter($(this))
+				.on('click', function(){
+					$(oInput)
+						.datetimepicker($sJSDateTimePickerOptions)
+						.datetimepicker('show')
+						.datetimepicker('option', 'onClose', function(dateText,inst){
+							$(oInput).datetimepicker('destroy');
+						})
+						.on('click keypress', function(){
+							$(oInput).datetimepicker('hide');
+						});
+				});
+		});
+	}
+EOF
+        );
+
+        $this->add_init_script(
+            <<< EOF
+	try
+	{
+		var myLayout; // a var is required because this page utilizes: myLayout.allowOverflow() method
+	
+		// Layout
+		paneSize = GetUserPreference('menu_size', 300);
+		if ($('body').length > 0)
+		{
+            myLayout = $('body').layout({
+                west :	{
+                            $sInitClosed minSize: 200, size: paneSize, spacing_open: 16, spacing_close: 16, slideTrigger_open: "click", hideTogglerOnSlide: true, enableCursorHotkey: false,
+                            onclose_end: function(name, elt, state, options, layout)
+                            {
+                                    if (state.isSliding == false)
+                                    {
+                                        $('.menu-pane-exclusive').show();
+                                        SetUserPreference('menu_pane', 'closed', true);
+                                    }
+                            },
+                            onresize_end: function(name, elt, state, options, layout)
+                            {
+                                    if (state.isSliding == false)
+                                    {
+                                        SetUserPreference('menu_size', state.size, true);
+                                    }
+                            },
+                                        
+                            onopen_end: function(name, elt, state, options, layout)
+                            {
+                                if (state.isSliding == false)
+                                {
+                                    $('.menu-pane-exclusive').hide();
+                                    SetUserPreference('menu_pane', 'open', true);
+                                }
+                            }
+                        },
+                center: {
+                            onresize_end: function(name, elt, state, options, layout)
+                            {
+                                    $('.v-resizable').each( function() {
+                                        var fixedWidth = $(this).parent().innerWidth() - 6;
+                                        $(this).width(fixedWidth);
+                                        // Make sure it cannot be resized horizontally
+                                        $(this).resizable('options', { minWidth: fixedWidth, maxWidth:	fixedWidth });
+                                        // Now adjust all the child 'items'
+                                        var innerWidth = $(this).innerWidth() - 10;
+                                        $(this).find('.item').width(innerWidth);
+                                    });
+                                    $('.panel-resized').trigger('resized');
+                            }
+                    
+                        }
+            });
+        }
+		window.clearTimeout(iPaneVisWatchDog);
+		//myLayout.open( "west" );
+		$('.ui-layout-resizer-west .ui-layout-toggler').css({background: 'transparent'});
+		$sConfigureWestPane
+		if ($('#left-pane').length > 0)
+		{
+		    $('#left-pane').layout({ resizable: false, spacing_open: 0, south: { size: 94 }, enableCursorHotkey: false });
+		}
+		// Tabs, using JQuery BBQ to store the history
+		// The "tab widgets" to handle.
+		var tabs = $('div[id^=tabbedContent]');
+			
+		// This selector will be reused when selecting actual tab widget A elements.
+		var tab_a_selector = 'ul.ui-tabs-nav a';
+		
+		// Ugly patch for a change in the behavior of jQuery UI:
+		// Before jQuery UI 1.9, tabs were always considered as "local" (opposed to Ajax)
+		// when their href was beginning by #. Starting with 1.9, a <base> tag in the page
+		// is taken into account and causes "local" tabs to be considered as Ajax
+		// unless their URL is equal to the URL of the page...
+		$('div[id^=tabbedContent] > ul > li > a').each(function() {
+			var sHash = location.hash;
+			var sHref = $(this).attr("href");
+			if (sHref.match(/^#/))
+			{
+				var sCleanLocation = location.href.toString().replace(sHash, '').replace(/#$/, '');
+				$(this).attr("href", sCleanLocation+$(this).attr("href"));
+			}
+		});
+
+		// Enable tabs on all tab widgets. The `event` property must be overridden so
+		// that the tabs aren't changed on click, and any custom event name can be
+		// specified. Note that if you define a callback for the 'select' event, it
+		// will be executed for the selected tab whenever the hash changes.
+		tabs.tabs({
+			event: 'change', 'show': function(event, ui) {
+				$('.resizable', ui.panel).resizable(); // Make resizable everything that claims to be resizable !
+			},
+			beforeLoad: function( event, ui ) {
+				if ( ui.tab.data('loaded') && (ui.tab.attr('data-cache') == 'true')) {
+					event.preventDefault();
+					return;
+				}
+				ui.panel.html('<div><img src="../images/indicator.gif"></div>');
+				ui.jqXHR.success(function() {
+					ui.tab.data( "loaded", true );
+				});
+			}
+		});
+	}
+	catch(err)
+	{
+		// Do something with the error !
+		alert(err);
+	}
+EOF
+    );
+
+        $this->add_ready_script(
+            <<< EOF
+	
+	// Adjust initial size
+	$('.v-resizable').each( function()
+		{
+			var parent_id = $(this).parent().id;
+			// Restore the saved height
+			var iHeight = GetUserPreference(parent_id+'_'+this.id+'_height', undefined);
+			if (iHeight != undefined)
+			{
+				$(this).height(parseInt(iHeight, 10)); // Parse in base 10 !);
+			}
+			// Adjust the child 'item''s height and width to fit
+			var container = $(this);
+			var fixedWidth = container.parent().innerWidth() - 6;
+			// Set the width to fit the parent
+			$(this).width(fixedWidth);
+			var headerHeight = $(this).find('.drag_handle').height();
+			// Now adjust the width and height of the child 'item'
+			container.find('.item').height(container.innerHeight() - headerHeight - 12).width(fixedWidth - 10);
+		}
+	);
+	// Make resizable, vertically only everything that claims to be v-resizable !
+	$('.v-resizable').resizable( { handles: 's', minHeight: $(this).find('.drag_handle').height(), minWidth: $(this).parent().innerWidth() - 6, maxWidth: $(this).parent().innerWidth() - 6, stop: function()
+		{
+			// Adjust the content
+			var container = $(this);
+			var headerHeight = $(this).find('.drag_handle').height();
+			container.find('.item').height(container.innerHeight() - headerHeight - 12);//.width(container.innerWidth());
+			var parent_id = $(this).parent().id;
+			SetUserPreference(parent_id+'_'+this.id+'_height', $(this).height(), true); // true => persistent
+		}
+	} );
+		
+	// Tabs, using JQuery BBQ to store the history
+	// The "tab widgets" to handle.
+	var tabs = $('div[id^=tabbedContent]');
+		
+	// This selector will be reused when selecting actual tab widget A elements.
+	var tab_a_selector = 'ul.ui-tabs-nav a';
+	  
+	// Define our own click handler for the tabs, overriding the default.
+	tabs.find( tab_a_selector ).click(function()
+	{
+		var state = {};
+				  
+		// Get the id of this tab widget.
+		var id = $(this).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
+		  
+		// Get the index of this tab.
+		var idx = $(this).parent().prevAll().length;
+		
+		// Set the state!
+		state[ id ] = idx;
+		$.bbq.pushState( state );
+	});
+	
+	// refresh the hash when the tab is changed (from a JS script)
+	$('body').on( 'tabsactivate', '.ui-tabs', function(event, ui) {
+		var state = {};
+			
+		// Get the id of this tab widget.
+		var id = $(ui.newTab).closest( 'div[id^=tabbedContent]' ).attr( 'id' );
+		
+		// Get the index of this tab.
+		var idx = $(ui.newTab).prevAll().length;
+			
+		// Set the state!
+		state[ id ] = idx;
+		$.bbq.pushState( state );
+	});
+	
+	// Bind an event to window.onhashchange that, when the history state changes,
+	// iterates over all tab widgets, changing the current tab as necessary.
+	$(window).bind( 'hashchange', function(e)
+	{
+		// Iterate over all tab widgets.
+		tabs.each(function()
+		{  
+			// Get the index for this tab widget from the hash, based on the
+			// appropriate id property. In jQuery 1.4, you should use e.getState()
+			// instead of $.bbq.getState(). The second, 'true' argument coerces the
+			// string value to a number.
+			var idx = $.bbq.getState( this.id, true ) || 0;
+			  
+			// Select the appropriate tab for this tab widget by triggering the custom
+			// event specified in the .tabs() init above (you could keep track of what
+			// tab each widget is on using .data, and only select a tab if it has
+			// changed).
+			$(this).find( tab_a_selector ).eq( idx ).triggerHandler( 'change' );
+		});
+
+		// Iterate over all truncated lists to find whether they are expanded or not
+		$('a.truncated').each(function()
+		{
+			var state = $.bbq.getState( this.id, true ) || 'close';
+			if (state == 'open')
+			{
+				$(this).trigger('open');
+			}
+			else
+			{
+				$(this).trigger('close');	
+			}
+		});
+	});
+	
+	// Shortcut menu actions
+	$('.actions_button a').click( function() {
+		aMatches = /#(.*)$/.exec(window.location.href);
+		if (aMatches != null)
+		{
+			currentHash = aMatches[1];
+			if ( /#(.*)$/.test(this.href))
+			{
+				this.href = this.href.replace(/#(.*)$/, '#'+currentHash);
+			}
+		}
+	});
+
+	// End of Tabs handling
+
+	PrepareWidgets();
+
+	// Make sortable, everything that claims to be sortable
+	$('.sortable').sortable( {axis: 'y', cursor: 'move', handle: '.drag_handle', stop: function()
+		{
+			if ($(this).hasClass('persistent'))
+			{
+				// remember the sort order for next time the page is loaded...
+				sSerialized = $(this).sortable('serialize', {key: 'menu'});
+				var sTemp = sSerialized.replace(/menu=/g, '');
+				SetUserPreference(this.id+'_order', sTemp.replace(/&/g, ','), true); // true => persistent !
+			}
+		}
+	});
+	docWidth = $(document).width();
+	$('#ModalDlg').dialog({ autoOpen: false, modal: true, width: 0.8*docWidth, height: 'auto', maxHeight: $(window).height() - 50 }); // JQuery UI dialogs
+	ShowDebug();
+	$('#logOffBtn>ul').popupmenu();
+	
+	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry,.caselog_entry_html').toggle(); });
+	
+	$(document).ajaxSend(function(event, jqxhr, options) {
+		jqxhr.setRequestHeader('X-Combodo-Ajax', 'true');
+	});
+	$(document).ajaxError(function(event, jqxhr, options) {
+		if (jqxhr.status == 401)
+		{
+			$('<div>'+$sJSDisconnectedMessage+'</div>').dialog({
+				modal:true,
+				title: $sJSTitle,
+				close: function() { $(this).remove(); },
+				minWidth: 400,
+				buttons: [
+					{ text: $sJSLoginAgain, click: function() { window.location.href= GetAbsoluteUrlAppRoot()+'pages/UI.php' } },
+					{ text: $sJSStayOnThePage, click: function() { $(this).dialog('close'); } }
+				]
+			});
+		}
+	});
+EOF
+        );
+        $this->add_ready_script(InlineImage::FixImagesWidth());
+        /*
+         * Not used since the sorting of the tables is always performed server-side
+        AttributeDateTime::InitTableSorter($this, 'custom_date_time');
+        AttributeDate::InitTableSorter($this, 'custom_date');
+        */
+
+        $sUserPrefs = appUserPreferences::GetAsJSON();
+        $this->add_script(
+            <<<EOF
+//		// for JQuery history
+//		function history_callback(hash)
+//		{
+//			// do stuff that loads page content based on hash variable
+//			var aMatches = /^tab_(.*)$/.exec(hash);
+//			if (aMatches != null)
+//			{
+//				var tab = $('#'+hash);
+//				tab.parents('div[id^=tabbedContent]:first').tabs('select', aMatches[1]);
+//			}
+//		}
+
+		function goBack()
+		{
+			window.history.back();
+		}
+		
+		function BackToDetails(sClass, id, sDefaultUrl, sOwnershipToken)
+		{
+			window.bInCancel = true;
+			if (id > 0)
+			{
+				sToken = '';
+				if (sOwnershipToken != undefined)
+				{
+					sToken = '&token='+sOwnershipToken;
+				}
+				window.location.href = AddAppContext(GetAbsoluteUrlAppRoot()+'pages/UI.php?operation=release_lock_and_details&class='+sClass+'&id='+id+sToken);
+			}
+			else
+			{
+				window.location.href = sDefaultUrl; // Already contains the context...				
+			}
+		}
+
+		function BackToList(sClass)
+		{
+			window.location.href = AddAppContext(GetAbsoluteUrlAppRoot()+'pages/UI.php?operation=search_oql&oql_class='+sClass+'&oql_clause=WHERE id=0');
+		}
+		
+		function ShowDebug()
+		{
+			if ($('#rawOutput > div').html() != '')
+			{
+				$('#rawOutput').dialog( {autoOpen: true, modal:false, width: '80%'});
+			}
+		}
+		
+		var oUserPreferences = $sUserPrefs;
+
+		// For disabling the CKEditor at init time when the corresponding textarea is disabled !
+		CKEDITOR.plugins.add( 'disabler',
+		{
+			init : function( editor )
+			{
+				editor.on( 'instanceReady', function(e)
+				{
+					e.removeListener();
+					$('#'+ editor.name).trigger('update');
+				});
+			}
+			
+		});
+
+		
+		function FixPaneVis()
+		{
+			$('.ui-layout-center, .ui-layout-north, .ui-layout-south').css({display: 'block'});
+		}
+EOF
+        );
+    }
+
+
+    /**
+     * @param string $sId          Identifies the item, to search after it in the current breadcrumb
+     * @param string $sLabel       Label of the breadcrumb item
+     * @param string $sDescription More information, displayed as a tooltip
+     * @param string $sUrl         Specify a URL if the current URL as perceived on the browser side is not relevant
+     * @param string $sIcon        Icon (relative or absolute) path that will be displayed next to the label
+     */
+    public function SetBreadCrumbEntry($sId, $sLabel, $sDescription, $sUrl = '', $sIcon = '')
+    {
+        $this->bBreadCrumbEnabled = true;
+        $this->sBreadCrumbEntryId = $sId;
+        $this->sBreadCrumbEntryLabel = $sLabel;
+        $this->sBreadCrumbEntryDescription = $sDescription;
+        $this->sBreadCrumbEntryUrl = $sUrl;
+        $this->sBreadCrumbEntryIcon = $sIcon;
+    }
+
+    /**
+     * State that there will be no breadcrumb item for the current page
+     */
+    public function DisableBreadCrumb()
+    {
+        $this->bBreadCrumbEnabled = false;
+        $this->sBreadCrumbEntryId = null;
+        $this->sBreadCrumbEntryLabel = null;
+        $this->sBreadCrumbEntryDescription = null;
+        $this->sBreadCrumbEntryUrl = null;
+        $this->sBreadCrumbEntryIcon = null;
+    }
+
+    public function AddToMenu($sHtml)
+    {
+        $this->m_sMenu .= $sHtml;
+    }
+
+    public function GetSiloSelectionForm()
+    {
+        // List of visible Organizations
+        $iCount = 0;
+        $oSet = null;
+        if (MetaModel::IsValidClass('Organization')) {
+            // Display the list of *favorite* organizations... but keeping in mind what is the real number of organizations
+            $aFavoriteOrgs = appUserPreferences::GetPref('favorite_orgs', null);
+            $oSearchFilter = new DBObjectSearch('Organization');
+            $oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
+            $oSet = new CMDBObjectSet($oSearchFilter);
+            $iCount = $oSet->Count(); // total number of existing Orgs
+
+            // Now get the list of Orgs to be displayed in the menu
+            $oSearchFilter = DBObjectSearch::FromOQL(ApplicationMenu::GetFavoriteSiloQuery());
+            $oSearchFilter->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
+            if (!empty($aFavoriteOrgs)) {
+                $oSearchFilter->AddCondition('id', $aFavoriteOrgs, 'IN');
+            }
+            $oSet = new CMDBObjectSet($oSearchFilter); // List of favorite orgs
+        }
+        switch ($iCount) {
+            case 0:
+                // No such dimension/silo => nothing to select
+                $sHtml = '<div id="SiloSelection"><!-- nothing to select --></div>';
+                break;
+
+            case 1:
+                // Only one possible choice... no selection, but display the value
+                $oOrg = $oSet->Fetch();
+                $sHtml = '<div id="SiloSelection">' . $oOrg->GetName() . '</div>';
+                $sHtml .= '';
+                break;
+
+            default:
+                $sHtml = '';
+                $oAppContext = new ApplicationContext();
+                $iCurrentOrganization = $oAppContext->GetCurrentValue('org_id');
+                $sHtml = '<div id="SiloSelection">';
+                $sHtml .= '<form style="display:inline" action="' . utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php">'; //<select class="org_combo" name="c[org_id]" title="Pick an organization" onChange="this.form.submit();">';
+
+                $sFavoriteOrgs = '';
+                $oWidget = new UIExtKeyWidget('Organization', 'org_id', '', true /* search mode */);
+                $sHtml .= $oWidget->Display($this, 50, false, '', $oSet, $iCurrentOrganization, 'org_id', false, 'c[org_id]', '',
+                    array('iFieldSize' => 20, 'iMinChars' => MetaModel::GetConfig()->Get('min_autocomplete_chars'), 'sDefaultValue' => Dict::S('UI:AllOrganizations')),
+                    null, 'select', false /* bSearchMultiple */);
+                $this->add_ready_script('$("#org_id").bind("extkeychange", function() { $("#SiloSelection form").submit(); } )');
+                $this->add_ready_script("$('#label_org_id').click( function() { if ($('#org_id').val() == '') { $(this).val(''); } } );\n");
+                // Add other dimensions/context information to this form
+                $oAppContext->Reset('org_id'); // org_id is handled above and we want to be able to change it here !
+                $oAppContext->Reset('menu'); // don't pass the menu, since a menu may expect more parameters
+                $sHtml .= $oAppContext->GetForForm(); // Pass what remains, if anything...
+                $sHtml .= '</form>';
+                $sHtml .= '</div>';
+        }
+        return $sHtml;
+    }
+
+    public function DisplayMenu()
+    {
+        // Display the menu
+        $oAppContext = new ApplicationContext();
+        $iAccordionIndex = 0;
+
+        ApplicationMenu::DisplayMenu($this, $oAppContext->GetAsHash());
+    }
+
+    /**
+     * Outputs (via some echo) the complete HTML page by assembling all its elements
+     */
+    public function output()
+    {
+        $sAbsURLAppRoot = addslashes($this->m_sRootUrl);
+
+        //$this->set_base($this->m_sRootUrl.'pages/');
+        $sForm = $this->GetSiloSelectionForm();
+        $this->DisplayMenu(); // Compute the menu
+
+        // Call the extensions to add content to the page, so that they can also add styles or scripts
+        $sBannerExtraHtml = '';
+        foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance) {
+            $sBannerExtraHtml .= $oExtensionInstance->GetBannerHtml($this);
+        }
+
+        $sNorthPane = '';
+        foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance) {
+            $sNorthPane .= $oExtensionInstance->GetNorthPaneHtml($this);
+        }
+
+        if (UserRights::IsAdministrator() && ExecutionKPI::IsEnabled()) {
+            $sNorthPane .= '<div class="app-message"><span style="padding:5px;">' . ExecutionKPI::GetDescription() . '<span></div>';
+        }
+
+        //$sSouthPane = '<p>Peak memory Usage: '.sprintf('%.3f MB', memory_get_peak_usage(true) / (1024*1024)).'</p>';
+        $sSouthPane = '';
+        foreach (MetaModel::EnumPlugins('iPageUIExtension') as $oExtensionInstance) {
+            $sSouthPane .= $oExtensionInstance->GetSouthPaneHtml($this);
+        }
+
+        // Render the tabs in the page (if any)
+        $this->s_content = $this->m_oTabs->RenderIntoContent($this->s_content, $this);
+
+        // Put here the 'ready scripts' that must be executed after all others
+        $aMultiselectOptions = array(
+            'header' => true,
+            'checkAllText' => Dict::S('UI:SearchValue:CheckAll'),
+            'uncheckAllText' => Dict::S('UI:SearchValue:UncheckAll'),
+            'noneSelectedText' => Dict::S('UI:SearchValue:Any'),
+            'selectedText' => Dict::S('UI:SearchValue:NbSelected'),
+            'selectedList' => 1,
+        );
+        $sJSMultiselectOptions = json_encode($aMultiselectOptions);
+        $this->add_ready_script(
+            <<<EOF
+		// Since the event is only triggered when the hash changes, we need to trigger
+		// the event now, to handle the hash the page may have loaded with.
+		$(window).trigger( 'hashchange' );
+		
+		// Some table are sort-able, some are not, let's fix this
+		$('table.listResults').each( function() { FixTableSorter($(this)); } );
+		
+		$('.multiselect').multiselect($sJSMultiselectOptions);
+EOF
+        );
+
+        $iBreadCrumbMaxCount = utils::GetConfig()->Get('breadcrumb.max_count');
+        if ($iBreadCrumbMaxCount > 1) {
+            $oConfig = MetaModel::GetConfig();
+            $siTopInstanceId = json_encode($oConfig->GetItopInstanceid());
+            if ($this->bBreadCrumbEnabled) {
+                if (is_null($this->sBreadCrumbEntryId)) {
+                    $this->sBreadCrumbEntryId = $this->s_title;
+                    $this->sBreadCrumbEntryLabel = $this->s_title;
+                    $this->sBreadCrumbEntryDescription = $this->s_title;
+                    $this->sBreadCrumbEntryUrl = '';
+                    $this->sBreadCrumbEntryIcon = utils::GetAbsoluteUrlAppRoot() . 'images/wrench.png';
+                }
+                $sNewEntry = json_encode(array('id' => $this->sBreadCrumbEntryId, 'url' => $this->sBreadCrumbEntryUrl, 'label' => htmlentities($this->sBreadCrumbEntryLabel, ENT_QUOTES, 'UTF-8'), 'description' => htmlentities($this->sBreadCrumbEntryDescription, ENT_QUOTES, 'UTF-8'), 'icon' => $this->sBreadCrumbEntryIcon));
+            } else {
+                $sNewEntry = 'null';
+            }
+
+            $this->add_ready_script(
+                <<<EOF
+		$('#itop-breadcrumb').breadcrumb({itop_instance_id: $siTopInstanceId, new_entry: $sNewEntry, max_count: $iBreadCrumbMaxCount});
+EOF
+            );
+        }
+
+        $this->outputCollapsibleSectionInit();
+
+        if ($this->GetOutputFormat() == 'html') {
+            foreach ($this->a_headers as $s_header) {
+                header($s_header);
+            }
+        }
+        $s_captured_output = $this->ob_get_clean_safe();
+        $sHtml = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+        $sHtml .= "<html>\n";
+        $sHtml .= "<head>\n";
+        // Make sure that Internet Explorer renders the page using its latest/highest/greatest standards !
+        $sHtml .= "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge\" />\n";
+        $sHtml .= "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
+        $sHtml .= "<title>" . htmlentities($this->s_title, ENT_QUOTES, 'UTF-8') . "</title>\n";
+        $sHtml .= $this->get_base_tag();
+        // Stylesheets MUST be loaded before any scripts otherwise
+        // jQuery scripts may face some spurious problems (like failing on a 'reload')
+        foreach ($this->a_linked_stylesheets as $a_stylesheet) {
+            if (strpos($a_stylesheet['link'], '?') === false) {
+                $s_stylesheet = $a_stylesheet['link'] . "?t=".utils::GetCacheBusterTimestamp();
+            } else {
+                $s_stylesheet = $a_stylesheet['link'] . "&t=".utils::GetCacheBusterTimestamp();
+            }
+            if ($a_stylesheet['condition'] != "") {
+                $sHtml .= "<!--[if {$a_stylesheet['condition']}]>\n";
+            }
+            $sHtml .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$s_stylesheet}\" />\n";
+            if ($a_stylesheet['condition'] != "") {
+                $sHtml .= "<![endif]-->\n";
+            }
+        }
+        // special stylesheet for printing, hides the navigation gadgets
+        $sHtml .= "<link rel=\"stylesheet\" media=\"print\" type=\"text/css\" href=\"../css/print.css?t=".utils::GetCacheBusterTimestamp() . "\" />\n";
+
+        if ($this->GetOutputFormat() == 'html') {
+            $sHtml .= $this->output_dict_entries(true); // before any script so that they can benefit from the translations
+            foreach ($this->a_linked_scripts as $s_script) {
+                // Make sure that the URL to the script contains the application's version number
+                // so that the new script do NOT get reloaded from the cache when the application is upgraded
+                if (strpos($s_script, '?') === false) {
+                    $s_script .= "?t=".utils::GetCacheBusterTimestamp();
+                } else {
+                    $s_script .= "&t=".utils::GetCacheBusterTimestamp();
+                }
+                $sHtml .= "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
+            }
+            if (!$this->IsPrintableVersion()) {
+                $this->add_script("var iPaneVisWatchDog  = window.setTimeout('FixPaneVis()',5000);");
+            }
+	        $sInitScripts = "";
+	        if (count($this->m_aInitScript) > 0) {
+		        foreach ($this->m_aInitScript as $m_sInitScript) {
+			        $sInitScripts .= "$m_sInitScript\n";
+		        }
+	        }
+            $this->add_script("\$(document).ready(function() {\n{$sInitScripts};\nwindow.setTimeout('onDelayedReady()',10)\n});");
+            if ($this->IsPrintableVersion()) {
+                $this->add_ready_script(
+                    <<<EOF
+var sHiddeableChapters = '<div class="light ui-tabs ui-widget ui-widget-content ui-corner-all">';
+sHiddeableChapters += '<ul role="tablist" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">';
+for (sId in oHiddeableChapters)
+{
+	sHiddeableChapters += '<li tabindex="-1" role="tab" class="ui-state-default ui-corner-top hideable-chapter" chapter-id="'+sId+'"><span class="tab ui-tabs-anchor">' + oHiddeableChapters[sId] + '</span></li>';
+	//alert(oHiddeableChapters[sId]);
+}
+sHiddeableChapters += '</ul></div>';
+$('#hiddeable_chapters').html(sHiddeableChapters);
+$('.hideable-chapter').click(function(){
+	var sChapterId = $(this).attr('chapter-id');
+	$('#'+sChapterId).toggle();
+	$(this).toggleClass('strikethrough');
+});
+$('fieldset').each(function() {
+	var jLegend = $(this).find('legend');
+	jLegend.remove();
+	$(this).wrapInner('<span></span>').prepend(jLegend);
+});
+$('legend').css('cursor', 'pointer').click(function(){
+		$(this).parent('fieldset').toggleClass('not-printable strikethrough');
+	});
+EOF
+                );
+            }
+            if (count($this->m_aReadyScripts) > 0) {
+                $this->add_script("\nonDelayedReady = function() {\n" . implode("\n", $this->m_aReadyScripts) . "\n}\n");
+            }
+            if (count($this->a_scripts) > 0) {
+                $sHtml .= "<script type=\"text/javascript\">\n";
+                foreach ($this->a_scripts as $s_script) {
+                    $sHtml .= "$s_script\n";
+                }
+                $sHtml .= "</script>\n";
+            }
+        }
+
+        if (count($this->a_styles) > 0) {
+            $sHtml .= "<style>\n";
+            foreach ($this->a_styles as $s_style) {
+                $sHtml .= "$s_style\n";
+            }
+            $sHtml .= "</style>\n";
+        }
+        $sHtml .= "<link rel=\"search\" type=\"application/opensearchdescription+xml\" title=\"iTop\" href=\"" . utils::GetAbsoluteUrlAppRoot() . "pages/opensearch.xml.php\" />\n";
+        $sHtml .= "<link rel=\"shortcut icon\" href=\"" . utils::GetAbsoluteUrlAppRoot() . "images/favicon.ico?t=".utils::GetCacheBusterTimestamp(). "\" />\n";
+
+        $sHtml .= "</head>\n";
+        $sBodyClass = "";
+        if ($this->IsPrintableVersion()) {
+            $sBodyClass = 'printable-version';
+        }
+        $sHtml .= "<body class=\"$sBodyClass\">\n";
+        if ($this->IsPrintableVersion()) {
+            $sHtml .= "<div class=\"explain-printable not-printable\">";
+            $sHtml .= '<p>' . Dict::Format('UI:ExplainPrintable', '<img src="../images/eye-open-555.png" style="vertical-align:middle">') . '</p>';
+            $sHtml .= "<div id=\"hiddeable_chapters\"></div>";
+            $sHtml .= '<button onclick="window.print()">' . htmlentities(Dict::S('UI:Button:GoPrint'), ENT_QUOTES, 'UTF-8') . '</button>';
+            $sHtml .= '&nbsp;';
+            $sHtml .= '<button onclick="window.close()">' . htmlentities(Dict::S('UI:Button:Cancel'), ENT_QUOTES, 'UTF-8') . '</button>';
+            $sHtml .= "</div>";
+        }
+
+        // Render the revision number
+        if (ITOP_REVISION == '$WCREV$') {
+            // This is NOT a version built using the buil system, just display the main version
+            $sVersionString = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
+        } else {
+            // This is a build made from SVN, let display the full information
+            $sVersionString = Dict::Format('UI:iTopVersion:Long', ITOP_APPLICATION, ITOP_VERSION, ITOP_REVISION, ITOP_BUILD_DATE);
+        }
+
+        // Render the text of the global search form
+        $sText = htmlentities(utils::ReadParam('text', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8');
+        $sOnClick = " onclick=\"if ($('#global-search-input').val() != '') { $('#global-search form').submit();  } \"";
+        $sDefaultPlaceHolder = Dict::S("UI:YourSearch");
+
+        if ($this->IsPrintableVersion()) {
+            $sHtml .= ' <!-- Beginning of page content -->';
+            $sHtml .= self::FilterXSS($this->s_content);
+            $sHtml .= ' <!-- End of page content -->';
+        } elseif ($this->GetOutputFormat() == 'html') {
+            $oAppContext = new ApplicationContext();
+
+            $sUserName = UserRights::GetUser();
+            $sIsAdmin = UserRights::IsAdministrator() ? '(Administrator)' : '';
+            if (UserRights::IsAdministrator()) {
+                $sLogonMessage = Dict::Format('UI:LoggedAsMessage+Admin', $sUserName);
+            } else {
+                $sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);
+            }
+            $sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/on-off-menu.png\"><ul>";
+            $sLogOffMenu .= "<li><span>$sLogonMessage</span></li>\n";
+            $aActions = array();
+
+            $aAllowedPortals = UserRights::GetAllowedPortals();
+            if (count($aAllowedPortals) > 1) {
+                // Adding portals
+                foreach ($aAllowedPortals as $aAllowedPortal) {
+                    if ($aAllowedPortal['id'] !== 'backoffice') {
+                        $oPortalMenuItem = new URLPopupMenuItem('portal:' . $aAllowedPortal['id'], Dict::S($aAllowedPortal['label']), $aAllowedPortal['url'], '_blank');
+                        $aActions[$oPortalMenuItem->GetUID()] = $oPortalMenuItem->GetMenuItem();
+                    }
+                }
+                // Adding a separator
+                $oPortalSeparatorMenuItem = new SeparatorPopupMenuItem();
+                $aActions[$oPortalSeparatorMenuItem->GetUID()] = $oPortalSeparatorMenuItem->GetMenuItem();
+            }
+
+            $oPrefs = new URLPopupMenuItem('UI:Preferences', Dict::S('UI:Preferences'), utils::GetAbsoluteUrlAppRoot() . "pages/preferences.php?" . $oAppContext->GetForLink());
+            $aActions[$oPrefs->GetUID()] = $oPrefs->GetMenuItem();
+
+            if (utils::IsArchiveMode()) {
+                $oExitArchive = new JSPopupMenuItem('UI:ArchiveModeOff', Dict::S('UI:ArchiveModeOff'), 'return ArchiveMode(false);');
+                $aActions[$oExitArchive->GetUID()] = $oExitArchive->GetMenuItem();
+
+                $sIcon = '<span class="fa fa-lock fa-1x"></span>';
+                $this->AddApplicationMessage(Dict::S('UI:ArchiveMode:Banner'), $sIcon, Dict::S('UI:ArchiveMode:Banner+'));
+            } elseif (UserRights::CanBrowseArchive()) {
+                $oBrowseArchive = new JSPopupMenuItem('UI:ArchiveModeOn', Dict::S('UI:ArchiveModeOn'), 'return ArchiveMode(true);');
+                $aActions[$oBrowseArchive->GetUID()] = $oBrowseArchive->GetMenuItem();
+            }
+            if (utils::CanLogOff()) {
+                $oLogOff = new URLPopupMenuItem('UI:LogOffMenu', Dict::S('UI:LogOffMenu'), utils::GetAbsoluteUrlAppRoot() . 'pages/logoff.php?operation=do_logoff');
+                $aActions[$oLogOff->GetUID()] = $oLogOff->GetMenuItem();
+            }
+            if (UserRights::CanChangePassword()) {
+                $oChangePwd = new URLPopupMenuItem('UI:ChangePwdMenu', Dict::S('UI:ChangePwdMenu'), utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=change_pwd');
+                $aActions[$oChangePwd->GetUID()] = $oChangePwd->GetMenuItem();
+            }
+            utils::GetPopupMenuItems($this, iPopupMenuExtension::MENU_USER_ACTIONS, null, $aActions);
+
+            $oAbout = new JSPopupMenuItem('UI:AboutBox', Dict::S('UI:AboutBox'), 'return ShowAboutBox();');
+            $aActions[$oAbout->GetUID()] = $oAbout->GetMenuItem();
+
+            $sLogOffMenu .= $this->RenderPopupMenuItems($aActions);
+
+
+            $sRestrictions = '';
+            if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE)) {
+                if (!MetaModel::DBHasAccess(ACCESS_ADMIN_WRITE)) {
+                    $sRestrictions = Dict::S('UI:AccessRO-All');
+                }
+            } elseif (!MetaModel::DBHasAccess(ACCESS_USER_WRITE)) {
+                $sRestrictions = Dict::S('UI:AccessRO-Users');
+            }
+
+            if (strlen($sRestrictions) > 0) {
+                $sIcon =
+                    <<<EOF
+<span class="fa-stack fa-sm">
+  <i class="fa fa-pencil fa-flip-horizontal fa-stack-1x"></i>
+  <i class="fa fa-ban fa-stack-2x text-danger"></i>
+</span>
+EOF;
+
+                $sAdminMessage = trim(MetaModel::GetConfig()->Get('access_message'));
+                if (strlen($sAdminMessage) > 0) {
+                    $sRestrictions .= '&nbsp;' . $sAdminMessage;
+                }
+                $this->AddApplicationMessage($sRestrictions, $sIcon);
+            }
+
+            $sApplicationMessages = '';
+            foreach ($this->m_aMessages as $aMessage) {
+                $sHtmlIcon = $aMessage['icon'] ? $aMessage['icon'] : '';
+                $sHtmlMessage = $aMessage['message'];
+                $sTitleAttr = $aMessage['tip'] ? 'title="' . htmlentities($aMessage['tip'], ENT_QUOTES, 'UTF-8') . '"' : '';
+                $sApplicationMessages .= '<div class="app-message" ' . $sTitleAttr . '><span class="app-message-icon">' . $sHtmlIcon . '</span><span class="app-message-body">' . $sHtmlMessage . '</div></span>';
+            }
+
+            $sApplicationBanner = "<div class=\"app-banner ui-helper-clearfix\">$sApplicationMessages$sBannerExtraHtml</div>";
+
+            if (!empty($sNorthPane)) {
+                $sNorthPane = '<div id="top-pane" class="ui-layout-north">' . $sNorthPane . '</div>';
+            }
+
+            if (!empty($sSouthPane)) {
+                $sSouthPane = '<div id="bottom-pane" class="ui-layout-south">' . $sSouthPane . '</div>';
+            }
+
+            $sIconUrl = Utils::GetConfig()->Get('app_icon_url');
+            $sOnlineHelpUrl = MetaModel::GetConfig()->Get('online_help');
+            //$sLogOffMenu = "<span id=\"logOffBtn\" style=\"height:55px;padding:0;margin:0;\"><img src=\"../images/onOffBtn.png\"></span>";
+
+            $sDisplayIcon = utils::GetAbsoluteUrlAppRoot() . 'images/itop-logo.png?t=' . utils::GetCacheBusterTimestamp();
+            if (file_exists(MODULESROOT . 'branding/main-logo.png')) {
+                $sDisplayIcon = utils::GetAbsoluteUrlModulesRoot() . 'branding/main-logo.png?t=' . utils::GetCacheBusterTimestamp();
+            }
+
+            $sHtml .= $sNorthPane;
+            $sHtml .= '<div id="left-pane" class="ui-layout-west">';
+            $sHtml .= '<!-- Beginning of the left pane -->';
+            $sHtml .= ' <div class="ui-layout-north">';
+            $sHtml .= ' <div id="header-logo">';
+            $sHtml .= ' <div id="top-left"></div><div id="logo"><a href="' . htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8') . '"><img src="' . $sDisplayIcon . '" title="' . htmlentities($sVersionString, ENT_QUOTES, 'UTF-8') . '" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
+            $sHtml .= ' </div>';
+            $sHtml .= ' <div class="header-menu">';
+            if (!MetaModel::GetConfig()->Get('demo_mode')) {
+                $sHtml .= '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
+            }
+            $sHtml .= '		<div style="text-align:center;">' . self::FilterXSS($sForm) . '</div>';
+            $sHtml .= ' </div>';
+            $sHtml .= ' </div>';
+            $sHtml .= ' <div id="menu" class="ui-layout-center">';
+            $sHtml .= '		<div id="inner_menu">';
+            $sHtml .= '			<div id="accordion">';
+            $sHtml .= self::FilterXSS($this->m_sMenu);
+            $sHtml .= '			<!-- Beginning of the accordion menu -->';
+            $sHtml .= '			<!-- End of the accordion menu-->';
+            $sHtml .= '			</div>';
+            $sHtml .= '		</div> <!-- /inner menu -->';
+            $sHtml .= ' </div> <!-- /menu -->';
+            $sHtml .= ' <div class="footer ui-layout-south"><div id="combodo_logo"><a href="http://www.combodo.com" title="www.combodo.com" target="_blank"><img src="../images/logo-combodo.png?t=' . utils::GetCacheBusterTimestamp() . '"/></a></div></div>';
+            $sHtml .= '<!-- End of the left pane -->';
+            $sHtml .= '</div>';
+
+            $sHtml .= '<div class="ui-layout-center">';
+            $sHtml .= ' <div id="top-bar" class="ui-helper-clearfix" style="width:100%">';
+            $sHtml .= self::FilterXSS($sApplicationBanner);
+
+            $GoHomeInitialStyle = $this->IsMenuPaneVisible() ? 'display: none;' : '';
+
+            $sHtml .= ' <table id="top-bar-table">';
+            $sHtml .= ' <tr>';
+            $sHtml .= ' <td id="open-left-pane"  class="menu-pane-exclusive" style="' . $GoHomeInitialStyle . '" onclick="$(\'body\').layout().open(\'west\');">';
+            $sHtml .= ' <img src="../images/menu.png">';
+            $sHtml .= ' </td>';
+            $sHtml .= ' <td id="go-home" class="menu-pane-exclusive" style="' . $GoHomeInitialStyle . '">';
+            $sHtml .= ' <a href="' . utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php"><img src="../images/home.png"></a>';
+            $sHtml .= ' </td>';
+            $sHtml .= ' <td class="top-bar-spacer menu-pane-exclusive" style="' . $GoHomeInitialStyle . '">';
+            $sHtml .= ' </td>';
+            $sHtml .= ' <td id="top-bar-table-breadcrumb">';
+            $sHtml .= ' <div id="itop-breadcrumb"></div>';
+            $sHtml .= ' </td>';
+            $sHtml .= ' <td id="top-bar-table-search">';
+            $sHtml .= '		<div id="global-search"><form action="' . utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php">';
+            $sHtml .= '		<table id="top-left-buttons-area"><tr>';
+            $sHtml .= '			<td id="top-left-global-search-cell"><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="' . $sDefaultPlaceHolder . '" value="'. $sText . '"></input><div ' . $sOnClick . ' id="global-search-image"><input type="hidden" name="operation" value="full_text"/></div></div></td>';
+            $sHtml .= '     	<td id="top-left-help-cell"><a id="help-link" href="' . $sOnlineHelpUrl . '" target="_blank"><img title="' . Dict::S('UI:Help') . '" src="../images/help.png?t=' . utils::GetCacheBusterTimestamp() . '"/></td>';
+            $sHtml .= '     	<td id="top-left-logoff-cell">' . self::FilterXSS($sLogOffMenu) . '</td>';
+            $sHtml .= '     </tr></table></form></div>';
+            $sHtml .= ' </td>';
+            $sHtml .= ' </tr>';
+            $sHtml .= ' </table>';
+
+//			$sHtml .= '		<div id="global-search"><form action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><table><tr><td></td><td><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="'.$sText.'"></input><div '.$sOnClick.' id="global-search-image"></div></div></td>';
+//			$sHtml .= '<td><a id="help-link" href="'.$sOnlineHelpUrl.'" target="_blank"><img title="'.Dict::S('UI:Help').'" src="../images/help.png?t='.utils::GetCacheBusterTimestamp().'"/></td>';
+//			$sHtml .= '<td>'.self::FilterXSS($sLogOffMenu).'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
+//			$sHtml .= ' <div id="itop-breadcrumb"></div>';
+
+            $sHtml .= ' </div>';
+            $sHtml .= ' <div class="ui-layout-content" style="overflow:auto;">';
+            $sHtml .= ' <!-- Beginning of page content -->';
+            $sHtml .= self::FilterXSS($this->s_content);
+            $sHtml .= ' <!-- End of page content -->';
+            $sHtml .= ' </div>';
+            $sHtml .= '</div>';
+            $sHtml .= $sSouthPane;
+
+            // Add the captured output
+            if (trim($s_captured_output) != "") {
+                $sHtml .= "<div id=\"rawOutput\" title=\"Debug Output\"><div style=\"height:500px; overflow-y:auto;\">" . self::FilterXSS($s_captured_output) . "</div></div>\n";
+            }
+            $sHtml .= "<div id=\"at_the_end\">" . self::FilterXSS($this->s_deferred_content) . "</div>";
+            $sHtml .= "<div style=\"display:none\" title=\"ex2\" id=\"ex2\">Please wait...</div>\n"; // jqModal Window
+            $sHtml .= "<div style=\"display:none\" title=\"dialog\" id=\"ModalDlg\"></div>";
+            $sHtml .= "<div style=\"display:none\" id=\"ajax_content\"></div>";
+        } else {
+            $sHtml .= self::FilterXSS($this->s_content);
+        }
+
+        $sHtml .= "</body>\n";
+        $sHtml .= "</html>\n";
+
+        if ($this->GetOutputFormat() == 'html') {
+            $oKPI = new ExecutionKPI();
+            echo $sHtml;
+            $oKPI->ComputeAndReport('Echoing (' . round(strlen($sHtml) / 1024) . ' Kb)');
+        } else if ($this->GetOutputFormat() == 'pdf' && $this->IsOutputFormatAvailable('pdf')) {
+            if (@is_readable(APPROOT . 'lib/MPDF/mpdf.php')) {
+                require_once(APPROOT . 'lib/MPDF/mpdf.php');
+                $oMPDF = new mPDF('c');
+                $oMPDF->mirroMargins = false;
+                if ($this->a_base['href'] != '') {
+                    $oMPDF->setBasePath($this->a_base['href']); // Seems that the <BASE> tag is not recognized by mPDF...
+                }
+                $oMPDF->showWatermarkText = true;
+                if ($this->GetOutputOption('pdf', 'template_path')) {
+                    $oMPDF->setImportUse(); // Allow templates
+                    $oMPDF->SetDocTemplate($this->GetOutputOption('pdf', 'template_path'), 1);
+                }
+                $oMPDF->WriteHTML($sHtml);
+                $sOutputName = $this->s_title . '.pdf';
+                if ($this->GetOutputOption('pdf', 'output_name')) {
+                    $sOutputName = $this->GetOutputOption('pdf', 'output_name');
+                }
+                $oMPDF->Output($sOutputName, 'I');
+            }
+        }
+        DBSearch::RecordQueryTrace();
+        ExecutionKPI::ReportStats();
+    }
+
+    /**
+     * Adds init scripts for the collapsible sections
+     */
+    private function outputCollapsibleSectionInit()
+    {
+        if (!$this->bHasCollapsibleSection) {
+            return;
+        }
+
+        $this->add_script(<<<'EOD'
+function initCollapsibleSection(iSectionId, bOpenedByDefault, sSectionStateStorageKey)
+{
+var bStoredSectionState = JSON.parse(localStorage.getItem(sSectionStateStorageKey));
+var bIsSectionOpenedInitially = (bStoredSectionState == null) ? bOpenedByDefault : bStoredSectionState;
+
+if (bIsSectionOpenedInitially) {
+	$("#LnkCollapse_"+iSectionId).toggleClass("open");
+	$("#Collapse_"+iSectionId).toggle();
+}
+
+$("#LnkCollapse_"+iSectionId).click(function(e) {
+	localStorage.setItem(sSectionStateStorageKey, !($("#Collapse_"+iSectionId).is(":visible")));
+	$("#LnkCollapse_"+iSectionId).toggleClass("open");
+	$("#Collapse_"+iSectionId).slideToggle("normal");
+	e.preventDefault(); // we don't want to do anything more (see #1030 : a non wanted tab switching was triggered)
+});
+}
+EOD
+        );
+    }
+
+    public function AddTabContainer($sTabContainer, $sPrefix = '')
+    {
+        $this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
+    }
+
+    public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+    {
+        $this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabLabel, $sHtml));
+    }
+
+    public function SetCurrentTabContainer($sTabContainer = '')
+    {
+        return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
+    }
+
+    public function SetCurrentTab($sTabLabel = '')
+    {
+        return $this->m_oTabs->SetCurrentTab($sTabLabel);
+    }
+
+    /**
+     * Add a tab which content will be loaded asynchronously via the supplied URL
+     *
+     * Limitations:
+     * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to pull content from another server.
+     * Static content cannot be added inside such tabs.
+     *
+     * @param string  $sTabLabel The (localised) label of the tab
+     * @param string  $sUrl      The URL to load (on the same server)
+     * @param boolean $bCache    Whether or not to cache the content of the tab once it has been loaded. flase will cause the tab to be reloaded upon each activation.
+     *
+     * @since 2.0.3
+     */
+    public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+    {
+        $this->add($this->m_oTabs->AddAjaxTab($sTabLabel, $sUrl, $bCache));
+    }
+
+    public function GetCurrentTab()
+    {
+        return $this->m_oTabs->GetCurrentTab();
+    }
+
+    public function RemoveTab($sTabLabel, $sTabContainer = null)
+    {
+        $this->m_oTabs->RemoveTab($sTabLabel, $sTabContainer);
+    }
+
+    /**
+     * Finds the tab whose title matches a given pattern
+     * @return mixed The name of the tab as a string or false if not found
+     */
+    public function FindTab($sPattern, $sTabContainer = null)
+    {
+        return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
+    }
+
+    /**
+     * Make the given tab the active one, as if it were clicked
+     * DOES NOT WORK: apparently in the *old* version of jquery
+     * that we are using this is not supported... TO DO upgrade
+     * the whole jquery bundle...
+     */
+    public function SelectTab($sTabContainer, $sTabLabel)
+    {
+        $this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabLabel));
+    }
+
+    public function StartCollapsibleSection(
+        $sSectionLabel, $bOpenedByDefault = false, $sSectionStateStorageBusinessKey = ''
+    )
+    {
+        $this->add($this->GetStartCollapsibleSection($sSectionLabel, $bOpenedByDefault,
+            $sSectionStateStorageBusinessKey));
+    }
+
+    private function GetStartCollapsibleSection(
+        $sSectionLabel, $bOpenedByDefault = false, $sSectionStateStorageBusinessKey = ''
+    )
+    {
+        $this->bHasCollapsibleSection = true;
+        $sHtml = '';
+        static $iSectionId = 0;
+        $sHtml .= '<a id="LnkCollapse_' . $iSectionId . '" class="CollapsibleLabel" href="#">' . $sSectionLabel . '</a></br>' . "\n";
+        $sHtml .= '<div id="Collapse_' . $iSectionId . '" style="display:none">' . "\n";
+
+        $oConfig = MetaModel::GetConfig();
+        $sSectionStateStorageKey = $oConfig->GetItopInstanceid() . '/' . $sSectionStateStorageBusinessKey . '/collapsible-' . $iSectionId;
+        $sSectionStateStorageKey = json_encode($sSectionStateStorageKey);
+        $sOpenedByDefault = ($bOpenedByDefault) ? 'true' : 'false';
+        $this->add_ready_script("initCollapsibleSection($iSectionId, $sOpenedByDefault, '$sSectionStateStorageKey');");
+
+        $iSectionId++;
+        return $sHtml;
+    }
+
+    public function EndCollapsibleSection()
+    {
+        $this->add($this->GetEndCollapsibleSection());
+    }
+
+    public function GetEndCollapsibleSection()
+    {
+        return "</div>";
+    }
+
+    public function add($sHtml)
+    {
+        if (($this->m_oTabs->GetCurrentTabContainer() != '') && ($this->m_oTabs->GetCurrentTab() != '')) {
+            $this->m_oTabs->AddToCurrentTab($sHtml);
+        } else {
+            parent::add($sHtml);
+        }
+    }
+
+    /**
+     * Records the current state of the 'html' part of the page output
+     * @return mixed The current state of the 'html' output
+     */
+    public function start_capture()
+    {
+        $sCurrentTabContainer = $this->m_oTabs->GetCurrentTabContainer();
+        $sCurrentTab = $this->m_oTabs->GetCurrentTab();
+
+        if (!empty($sCurrentTabContainer) && !empty($sCurrentTab)) {
+            $iOffset = $this->m_oTabs->GetCurrentTabLength();
+            return array('tc' => $sCurrentTabContainer, 'tab' => $sCurrentTab, 'offset' => $iOffset);
+        } else {
+            return parent::start_capture();
+        }
+    }
+
+    /**
+     * Returns the part of the html output that occurred since the call to start_capture
+     * and removes this part from the current html output
+     *
+     * @param $offset mixed The value returned by start_capture
+     *
+     * @return string The part of the html output that was added since the call to start_capture
+     */
+    public function end_capture($offset)
+    {
+        if (is_array($offset)) {
+            if ($this->m_oTabs->TabExists($offset['tc'], $offset['tab'])) {
+                $sCaptured = $this->m_oTabs->TruncateTab($offset['tc'], $offset['tab'], $offset['offset']);
+            } else {
+                $sCaptured = '';
+            }
+        } else {
+            $sCaptured = parent::end_capture($offset);
+        }
+        return $sCaptured;
+    }
+
+    /**
+     * Set the message to be displayed in the 'app-banner' section at the top of the page
+     */
+    public function SetMessage($sHtmlMessage)
+    {
+        $sHtmlIcon = '<span class="fa fa-comment fa-1x"></span>';
+        $this->AddApplicationMessage($sHtmlMessage, $sHtmlIcon);
+    }
+
+    /**
+     * Add message to be displayed in the 'app-banner' section at the top of the page
+     */
+    public function AddApplicationMessage($sHtmlMessage, $sHtmlIcon = null, $sTip = null)
+    {
+        if (strlen($sHtmlMessage)) {
+            $this->m_aMessages[] = array(
+                'icon' => $sHtmlIcon,
+                'message' => $sHtmlMessage,
+                'tip' => $sTip
+            );
+        }
+    }
+	/**
+	 * Adds a script to be executed when the DOM is ready (typical JQuery use), right before add_ready_script
+	 * @return void
+	 */
+	public function add_init_script($sScript){
+	    $this->m_aInitScript[] = $sScript;
+    }
+}
diff --git a/application/itopwizardwebpage.class.inc.php b/application/itopwizardwebpage.class.inc.php
index 24512ab76..c11d5a98a 100644
--- a/application/itopwizardwebpage.class.inc.php
+++ b/application/itopwizardwebpage.class.inc.php
@@ -1,57 +1,57 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class iTopWizardWebPage
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('itopwebpage.class.inc.php');
-/**
- * Web page to display a wizard in the iTop framework
- */
-class iTopWizardWebPage extends iTopWebPage
-{
-	var $m_iCurrentStep;
-	var $m_aSteps;
-    public function __construct($sTitle, $currentOrganization, $iCurrentStep, $aSteps)
-    {
-    	parent::__construct($sTitle." - step $iCurrentStep of ".count($aSteps)." - ".$aSteps[$iCurrentStep - 1], $currentOrganization);
-		$this->m_iCurrentStep = $iCurrentStep;
-		$this->m_aSteps = $aSteps;
-    }
-    
-    public function output()
-    {
-    	$aSteps = array();
-    	$iIndex = 0;
-    	foreach($this->m_aSteps as $sStepTitle)
-    	{
-    		$iIndex++;
-    		$sStyle = ($iIndex == $this->m_iCurrentStep) ? 'wizActiveStep' : 'wizStep';
-    		$aSteps[] = "<div class=\"$sStyle\"><span>$sStepTitle</span></div>";
-    	}
-    	$sWizardHeader = "<div class=\"wizHeader\"><h1>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
-    	$this->s_content = "$sWizardHeader<div class=\"wizContainer\">".$this->s_content."</div>";
-    	parent::output();
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class iTopWizardWebPage
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('itopwebpage.class.inc.php');
+/**
+ * Web page to display a wizard in the iTop framework
+ */
+class iTopWizardWebPage extends iTopWebPage
+{
+	var $m_iCurrentStep;
+	var $m_aSteps;
+    public function __construct($sTitle, $currentOrganization, $iCurrentStep, $aSteps)
+    {
+    	parent::__construct($sTitle." - step $iCurrentStep of ".count($aSteps)." - ".$aSteps[$iCurrentStep - 1], $currentOrganization);
+		$this->m_iCurrentStep = $iCurrentStep;
+		$this->m_aSteps = $aSteps;
+    }
+    
+    public function output()
+    {
+    	$aSteps = array();
+    	$iIndex = 0;
+    	foreach($this->m_aSteps as $sStepTitle)
+    	{
+    		$iIndex++;
+    		$sStyle = ($iIndex == $this->m_iCurrentStep) ? 'wizActiveStep' : 'wizStep';
+    		$aSteps[] = "<div class=\"$sStyle\"><span>$sStepTitle</span></div>";
+    	}
+    	$sWizardHeader = "<div class=\"wizHeader\"><h1>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n".implode("<div class=\"wizSeparator\"><img align=\"bottom\" src=\"../images/wizArrow.gif\"></div>", $aSteps)."<br style=\"clear:both;\"/></div>\n";
+    	$this->s_content = "$sWizardHeader<div class=\"wizContainer\">".$this->s_content."</div>";
+    	parent::output();
+	}
+}
+?>
diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 8b7b3a95a..71c1cb72d 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -1,877 +1,877 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class LoginWebPage
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/nicewebpage.class.inc.php");
-require_once(APPROOT.'/application/portaldispatcher.class.inc.php');
-/**
- * Web page used for displaying the login form
- */
-
-class LoginWebPage extends NiceWebPage
-{
-	const EXIT_PROMPT = 0;
-	const EXIT_HTTP_401 = 1;
-	const EXIT_RETURN = 2;
-	
-	const EXIT_CODE_OK = 0;
-	const EXIT_CODE_MISSINGLOGIN = 1;
-	const EXIT_CODE_MISSINGPASSWORD = 2;
-	const EXIT_CODE_WRONGCREDENTIALS = 3;
-	const EXIT_CODE_MUSTBEADMIN = 4;
-	const EXIT_CODE_PORTALUSERNOTAUTHORIZED = 5;
-	const EXIT_CODE_NOTAUTHORIZED = 6;
-	
-	protected static $sHandlerClass = __class__;
-	public static function RegisterHandler($sClass)
-	{
-		self::$sHandlerClass = $sClass;
-	}
-
-	public static function NewLoginWebPage()
-	{
-		return new self::$sHandlerClass;
-	}
-
-	protected static $m_sLoginFailedMessage = '';
-	
-	public function __construct($sTitle = null)
-	{
-	    if($sTitle === null)
-        {
-            $sTitle = Dict::S('UI:Login:Title');
-        }
-
-		parent::__construct($sTitle);
-		$this->SetStyleSheet();
-		$this->add_header("Cache-control: no-cache");
-	}
-	
-	public function SetStyleSheet()
-	{
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css');
-	}
-
-	public static function SetLoginFailedMessage($sMessage)
-	{
-		self::$m_sLoginFailedMessage = $sMessage;
-	}
-
-	public function EnableResetPassword()
-	{
-		return MetaModel::GetConfig()->Get('forgot_password');
-	}
-
-	public function DisplayLoginHeader($bMainAppLogo = false)
-	{
-		if ($bMainAppLogo)
-		{
-			$sLogo = 'itop-logo.png';
-			$sBrandingLogo = 'main-logo.png';
-		}
-		else
-		{
-			$sLogo = 'itop-logo-external.png';
-			$sBrandingLogo = 'login-logo.png';
-		}
-		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
-		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
-		$sDisplayIcon = utils::GetAbsoluteUrlAppRoot().'images/'.$sLogo.'?t='.utils::GetCacheBusterTimestamp();
-		if (file_exists(MODULESROOT.'branding/'.$sBrandingLogo))
-		{
-			$sDisplayIcon = utils::GetAbsoluteUrlModulesRoot().'branding/'.$sBrandingLogo.'?t='.utils::GetCacheBusterTimestamp();
-		}
-		$this->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8')."\"><img title=\"$sVersionShort\" src=\"$sDisplayIcon\"></a></div>\n");
-	}
-
-	public function DisplayLoginForm($sLoginType, $bFailedLogin = false)
-	{
-		switch($sLoginType)
-		{
-			case 'cas':
-			utils::InitCASClient();					
-			// force CAS authentication
-			phpCAS::forceAuthentication(); // Will redirect the user and exit since the user is not yet authenticated
-			break;
-			
-			case 'basic':
-			case 'url':
-			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
-			$this->add_header('HTTP/1.0 401 Unauthorized');
-			$this->add_header('Content-type: text/html; charset=iso-8859-1');
-			// Note: displayed when the user will click on Cancel
-			$this->add('<p><strong>'.Dict::S('UI:Login:Error:AccessRestricted').'</strong></p>');
-			break;
-			
-			case 'external':
-			case 'form':
-			default: // In case the settings get messed up...
-			$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
-			$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
-	
-			$this->DisplayLoginHeader();
-			$this->add("<div id=\"login\">\n");
-			$this->add("<h1>".Dict::S('UI:Login:Welcome')."</h1>\n");
-			if ($bFailedLogin)
-			{
-				if (self::$m_sLoginFailedMessage != '')
-				{
-					$this->add("<p class=\"hilite\">".self::$m_sLoginFailedMessage."</p>\n");
-				}
-				else
-				{
-					$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectLoginPassword')."</p>\n");
-				}
-			}
-			else
-			{
-				$this->add("<p>".Dict::S('UI:Login:IdentifyYourself')."</p>\n");
-			}
-			$this->add("<form method=\"post\">\n");
-			$this->add("<table>\n");
-			$sForgotPwd = $this->EnableResetPassword() ? $this->ForgotPwdLink() : '';
-			$this->add("<tr><td style=\"text-align:right\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label></td><td style=\"text-align:left\"><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
-			$this->add("<tr><td style=\"text-align:right\"><label for=\"pwd\">".Dict::S('UI:Login:PasswordPrompt').":</label></td><td style=\"text-align:left\"><input id=\"pwd\" type=\"password\" name=\"auth_pwd\" value=\"".htmlentities($sAuthPwd, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
-			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Login')."\" /></span></td></tr>\n");
-			if (strlen($sForgotPwd) > 0)
-			{
-				$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\">$sForgotPwd</td></tr>\n");
-			}
-			$this->add("</table>\n");
-			$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
-
-			$this->add_ready_script('$("#user").focus();');
-						
-			// Keep the OTHER parameters posted
-			foreach($_POST as $sPostedKey => $postedValue)
-			{
-				if (!in_array($sPostedKey, array('auth_user', 'auth_pwd')))
-				{
-					if (is_array($postedValue))
-					{
-						foreach($postedValue as $sKey => $sValue)
-						{
-							$this->add("<input type=\"hidden\" name=\"".htmlentities($sPostedKey, ENT_QUOTES, 'UTF-8')."[".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n");
-						}
-					}
-					else
-					{
-						$this->add("<input type=\"hidden\" name=\"".htmlentities($sPostedKey, ENT_QUOTES, 'UTF-8')."\" value=\"".htmlentities($postedValue, ENT_QUOTES, 'UTF-8')."\" />\n");
-					}
-				}	
-			}
-			
-			$this->add("</form>\n");
-			$this->add(Dict::S('UI:Login:About'));
-			$this->add("</div>\n");
-			break;
-		}
-	}
-
-	/**
-	 * Return '' to disable this feature	
-	 */	
-	public function ForgotPwdLink()
-	{
-		$sUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
-		$sHtml = "<a href=\"$sUrl\" target=\"_blank\">".Dict::S('UI:Login:ForgotPwd')."</a>";
-		return $sHtml;
-	}
-
-	public function DisplayForgotPwdForm($bFailedToReset = false, $sFailureReason = null)
-	{
-		$this->DisplayLoginHeader();
-		$this->add("<div id=\"login\">\n");
-		$this->add("<h1>".Dict::S('UI:Login:ForgotPwdForm')."</h1>\n");
-		$this->add("<p>".Dict::S('UI:Login:ForgotPwdForm+')."</p>\n");
-		if ($bFailedToReset)
-		{
-			$this->add("<p class=\"hilite\">".Dict::Format('UI:Login:ResetPwdFailed', htmlentities($sFailureReason, ENT_QUOTES, 'UTF-8'))."</p>\n");
-		}
-		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
-		$this->add("<form method=\"post\">\n");
-		$this->add("<table>\n");
-		$this->add("<tr><td colspan=\"2\" class=\"center\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
-		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"button\" onClick=\"window.close();\" value=\"".Dict::S('UI:Button:Cancel')."\" /></span>&nbsp;&nbsp;<span class=\"btn_border\"><input type=\"submit\" value=\"".Dict::S('UI:Login:ResetPassword')."\" /></span></td></tr>\n");
-		$this->add("</table>\n");
-		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"forgot_pwd_go\" />\n");
-		$this->add("</form>\n");
-		$this->add("</div>\n");
-
-		$this->add_ready_script('$("#user").focus();');
-	}
-
-	protected function ForgotPwdGo()
-	{
-		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
-
-		try
-		{
-			UserRights::Login($sAuthUser); // Set the user's language (if possible!)
-            /** @var UserInternal $oUser */
-            $oUser = UserRights::GetUserObject();
-			if ($oUser == null)
-			{
-				throw new Exception(Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser));
-			}
-			if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token'))
-			{
-				throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
-			}
-			if (!$oUser->CanChangePassword())
-			{
-				throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
-			}
-			
-			$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
-			if ($sTo == '')
-			{
-				throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
-			}
-
-			// This token allows the user to change the password without knowing the previous one
-			$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
-			$oUser->Set('reset_pwd_token', $sToken);
-			CMDBObject::SetTrackInfo('Reset password');
-			$oUser->AllowWrite(true);
-			$oUser->DBUpdate();
-
-			$oEmail = new Email();
-			$oEmail->SetRecipientTO($sTo);
-			$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
-			$oEmail->SetRecipientFrom($sFrom);
-			$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject'));
-			$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
-			$oEmail->SetBody(Dict::Format('UI:ResetPwd-EmailBody', $sResetUrl));
-			$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
-			switch ($iRes)
-			{
-				//case EMAIL_SEND_PENDING:
-				case EMAIL_SEND_OK:
-					break;
-		
-				case EMAIL_SEND_ERROR:
-				default:
-					IssueLog::Error('Failed to send the email with the NEW password for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
-					throw new Exception(Dict::S('UI:ResetPwd-Error-Send'));
-			}
-
-			$this->DisplayLoginHeader();
-			$this->add("<div id=\"login\">\n");
-			$this->add("<h1>".Dict::S('UI:Login:ForgotPwdForm')."</h1>\n");
-			$this->add("<p>".Dict::S('UI:ResetPwd-EmailSent')."</p>");
-			$this->add("<form method=\"post\">\n");
-			$this->add("<table>\n");
-			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><input type=\"button\" onClick=\"window.close();\" value=\"".Dict::S('UI:Button:Done')."\" /></td></tr>\n");
-			$this->add("</table>\n");
-			$this->add("</form>\n");
-			$this->add("</div\n");
-		}
-		catch(Exception $e)
-		{
-			$this->DisplayForgotPwdForm(true, $e->getMessage());
-		}
-	}
-
-	public function DisplayResetPwdForm()
-	{
-		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-		$sToken = utils::ReadParam('token', '', false, 'raw_data');
-
-		UserRights::Login($sAuthUser); // Set the user's language
-		$oUser = UserRights::GetUserObject();
-
-		$this->DisplayLoginHeader();
-		$this->add("<div id=\"login\">\n");
-		$this->add("<h1>".Dict::S('UI:ResetPwd-Title')."</h1>\n");
-		if ($oUser == null)
-		{
-			$this->add("<p>".Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser)."</p>\n");
-		}
-		else
-		{
-			$oEncryptedToken = $oUser->Get('reset_pwd_token');
-			
-			if (!$oEncryptedToken->CheckPassword($sToken))
-			{
-				$this->add("<p>".Dict::S('UI:ResetPwd-Error-InvalidToken')."</p>\n");
-			}
-			else
-			{
-				$this->add("<p>".Dict::Format('UI:ResetPwd-Error-EnterPassword', $oUser->GetFriendlyName())."</p>\n");
-	
-				$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
-				$this->add_script(
-<<<EOF
-function DoCheckPwd()
-{
-	if ($('#new_pwd').val() != $('#retype_new_pwd').val())
-	{
-		alert('$sInconsistenPwdMsg');
-		return false;
-	}
-	return true;
-}
-EOF
-				);
-				$this->add("<form method=\"post\">\n");
-				$this->add("<table>\n");
-				$this->add("<tr><td style=\"text-align:right\"><label for=\"new_pwd\">".Dict::S('UI:Login:NewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"new_pwd\" name=\"new_pwd\" value=\"\" /></td></tr>\n");
-				$this->add("<tr><td style=\"text-align:right\"><label for=\"retype_new_pwd\">".Dict::S('UI:Login:RetypeNewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"retype_new_pwd\" name=\"retype_new_pwd\" value=\"\" /></td></tr>\n");
-				$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"submit\" onClick=\"return DoCheckPwd();\" value=\"".Dict::S('UI:Button:ChangePassword')."\" /></span></td></tr>\n");
-				$this->add("</table>\n");
-				$this->add("<input type=\"hidden\" name=\"loginop\" value=\"do_reset_pwd\" />\n");
-				$this->add("<input type=\"hidden\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" />\n");
-				$this->add("<input type=\"hidden\" name=\"token\" value=\"".htmlentities($sToken, ENT_QUOTES, 'UTF-8')."\" />\n");
-				$this->add("</form>\n");
-				$this->add("</div\n");
-			}
-		}
-	}
-
-	public function DoResetPassword()
-	{
-		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-		$sToken = utils::ReadParam('token', '', false, 'raw_data');
-		$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
-
-		UserRights::Login($sAuthUser); // Set the user's language
-		$oUser = UserRights::GetUserObject();
-
-		$this->DisplayLoginHeader();
-		$this->add("<div id=\"login\">\n");
-		$this->add("<h1>".Dict::S('UI:ResetPwd-Title')."</h1>\n");
-		if ($oUser == null)
-		{
-			$this->add("<p>".Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser)."</p>\n");
-		}
-		else
-		{
-			$oEncryptedPassword = $oUser->Get('reset_pwd_token');
-			if (!$oEncryptedPassword->CheckPassword($sToken))
-			{
-				$this->add("<p>".Dict::S('UI:ResetPwd-Error-InvalidToken')."</p>\n");
-			}
-			else
-			{
-				// Trash the token and change the password
-				$oUser->Set('reset_pwd_token', '');
-				$oUser->SetPassword($sNewPwd); // Does record the change into the DB
-	
-				$this->add("<p>".Dict::S('UI:ResetPwd-Ready')."</p>");
-				$sUrl = utils::GetAbsoluteUrlAppRoot();
-				$this->add("<p><a href=\"$sUrl\">".Dict::S('UI:ResetPwd-Login')."</a></p>");
-			}
-			$this->add("</div\n");
-		}
-	}
-
-	public function DisplayChangePwdForm($bFailedLogin = false)
-	{
-		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-
-		$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
-		$this->add_script(<<<EOF
-function GoBack()
-{
-	window.history.back();
-}
-
-function DoCheckPwd()
-{
-	if ($('#new_pwd').val() != $('#retype_new_pwd').val())
-	{
-		alert('$sInconsistenPwdMsg');
-		return false;
-	}
-	return true;
-}
-EOF
-);
-		$this->DisplayLoginHeader();
-		$this->add("<div id=\"login\">\n");
-		$this->add("<h1>".Dict::S('UI:Login:ChangeYourPassword')."</h1>\n");
-		if ($bFailedLogin)
-		{
-			$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectOldPassword')."</p>\n");
-		}
-		$this->add("<form method=\"post\">\n");
-		$this->add("<table>\n");
-		$this->add("<tr><td style=\"text-align:right\"><label for=\"old_pwd\">".Dict::S('UI:Login:OldPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"old_pwd\" name=\"old_pwd\" value=\"\" /></td></tr>\n");
-		$this->add("<tr><td style=\"text-align:right\"><label for=\"new_pwd\">".Dict::S('UI:Login:NewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"new_pwd\" name=\"new_pwd\" value=\"\" /></td></tr>\n");
-		$this->add("<tr><td style=\"text-align:right\"><label for=\"retype_new_pwd\">".Dict::S('UI:Login:RetypeNewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"retype_new_pwd\" name=\"retype_new_pwd\" value=\"\" /></td></tr>\n");
-		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"button\" onClick=\"GoBack();\" value=\"".Dict::S('UI:Button:Cancel')."\" /></span>&nbsp;&nbsp;<span class=\"btn_border\"><input type=\"submit\" onClick=\"return DoCheckPwd();\" value=\"".Dict::S('UI:Button:ChangePassword')."\" /></span></td></tr>\n");
-		$this->add("</table>\n");
-		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"do_change_pwd\" />\n");
-		$this->add("</form>\n");
-		$this->add("</div>\n");
-	}
-
-	static function ResetSession()
-	{
-		// Unset all of the session variables.
-		unset($_SESSION['auth_user']);
-		unset($_SESSION['login_mode']);
-		unset($_SESSION['archive_mode']);
-		unset($_SESSION['impersonate_user']);
-		UserRights::_ResetSessionCache();
-		// If it's desired to kill the session, also delete the session cookie.
-		// Note: This will destroy the session, and not just the session data!
-	}
-
-	static function SecureConnectionRequired()
-	{
-		return MetaModel::GetConfig()->GetSecureConnectionRequired();
-	}
-
-	/**
-	 * Guess if a string looks like an UTF-8 string based on some ranges of multi-bytes encoding
-	 * @param string $sString
-	 * @return bool True if the string contains some typical UTF-8 multi-byte sequences
-	 */
-	static function LooksLikeUTF8($sString)
-	{
-		return preg_match('%(?:
-        			[\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
-        			|\xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
-        			|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
-        			|\xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
-        			|\xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
-        			|[\xF1-\xF3][\x80-\xBF]{3}         # planes 4-15
-        			|\xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
-        	)+%xs', $sString);
-	}
-
-	/**
-	 * Attempt a login
-	 * 	 	
-	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
-	 * @return int One of the class constants EXIT_CODE_...
-	 */	
-	protected static function Login($iOnExit)
-	{
-		if (self::SecureConnectionRequired() && !utils::IsConnectionSecure())
-		{
-			// Non secured URL... request for a secure connection
-			throw new Exception('Secure connection required!');			
-		}
-
-		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
-
-		if (isset($_SESSION['auth_user']))
-		{
-			//echo "User: ".$_SESSION['auth_user']."\n";
-			// Already authentified
-			$bRet = UserRights::Login($_SESSION['auth_user']); // Login & set the user's language
-			if ($bRet)
-			{
-				return self::EXIT_CODE_OK;
-			}
-			// The user account is no longer valid/enabled
-			 static::ResetSession();
-		}
-		
-		$index = 0;
-		$sLoginMode = '';
-		$sAuthentication = 'internal';
-		while(($sLoginMode == '') && ($index < count($aAllowedLoginTypes)))
-		{
-			$sLoginType = $aAllowedLoginTypes[$index];
-			switch($sLoginType)
-			{
-				case 'cas':
-				utils::InitCASClient();					
-				// check CAS authentication
-				if (phpCAS::isAuthenticated())
-				{
-					$sAuthUser = phpCAS::getUser();
-					$sAuthPwd = '';
-					$sLoginMode = 'cas';
-					$sAuthentication = 'external';
-				}
-				break;
-				
-				case 'form':
-				// iTop standard mode: form based authentication
-				$sAuthUser = utils::ReadPostedParam('auth_user', '', false, 'raw_data');
-				$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, false, 'raw_data');
-				if (($sAuthUser != '') && ($sAuthPwd !== null))
-				{
-					$sLoginMode = 'form';
-				}
-				break;
-				
-				case 'basic':
-				// Standard PHP authentication method, works with Apache...
-				// Case 1) Apache running in CGI mode + rewrite rules in .htaccess
-				if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
-				{
-					list($sAuthUser, $sAuthPwd) = explode(':' , base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
-					$sLoginMode = 'basic';
-				}
-				else if (isset($_SERVER['PHP_AUTH_USER']))
-				{
-					$sAuthUser = $_SERVER['PHP_AUTH_USER'];
-					// Unfortunately, the RFC is not clear about the encoding...
-					// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
-					// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
-					if (!self::LooksLikeUTF8($sAuthUser))
-					{
-						// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
-						// Supposed to be harmless in case of a plain ASCII string...
-						$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
-					}
-					$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
-					if (!self::LooksLikeUTF8($sAuthPwd))
-					{
-						// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
-						// Supposed to be harmless in case of a plain ASCII string...
-						$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
-					}
-					$sLoginMode = 'basic';
-				}
-				break;
-
-				case 'external':
-				// Web server supplied authentication
-				$bExternalAuth = false;
-				$sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
-				eval('$sAuthUser = isset('.$sExtAuthVar.') ? '.$sExtAuthVar.' : false;'); // Retrieve the value
-				if ($sAuthUser && (strlen($sAuthUser) > 0))
-				{
-					$sAuthPwd = ''; // No password in this case the web server already authentified the user...
-					$sLoginMode = 'external';
-					$sAuthentication = 'external';
-				}
-				break;
-
-				case 'url':
-				// Credentials passed directly in the url
-				$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
-				$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
-				if (($sAuthUser != '') && ($sAuthPwd !== null))
-				{
-					$sLoginMode = 'url';
-				}		
-				break;	
-			}
-			$index++;
-		}
-		//echo "\nsLoginMode: $sLoginMode (user: $sAuthUser / pwd: $sAuthPwd\n)";
-		if ($sLoginMode == '')
-		{
-			// First connection
-			$sDesiredLoginMode = utils::ReadParam('login_mode');
-			if (in_array($sDesiredLoginMode, $aAllowedLoginTypes))
-			{
-				$sLoginMode = $sDesiredLoginMode;
-			}
-			else
-			{
-				$sLoginMode = $aAllowedLoginTypes[0]; // First in the list...
-			}
-			if (array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER))
-			{
-				// X-Combodo-Ajax is a special header automatically added to all ajax requests
-				// Let's reply that we're currently logged-out
-				header('HTTP/1.0 401 Unauthorized');
-				exit;
-			}
-			if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
-			{
-				header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
-				header('HTTP/1.0 401 Unauthorized');
-				header('Content-type: text/html; charset=iso-8859-1');
-				exit;
-			}
-			else if($iOnExit == self::EXIT_RETURN)
-			{
-				if (($sAuthUser !== '') && ($sAuthPwd === null))
-				{
-					return self::EXIT_CODE_MISSINGPASSWORD;
-				}
-				else
-				{
-					return self::EXIT_CODE_MISSINGLOGIN;
-				}
-			}
-			else
-			{
-				$oPage = self::NewLoginWebPage();
-				$oPage->DisplayLoginForm( $sLoginMode, false /* no previous failed attempt */);
-				$oPage->output();
-				exit;
-			}
-		}
-		else
-		{
-			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sLoginMode, $sAuthentication))
-			{
-				//echo "Check Credentials returned false for user $sAuthUser!";
-				self::ResetSession();
-				if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
-				{
-					header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
-					header('HTTP/1.0 401 Unauthorized');
-					header('Content-type: text/html; charset=iso-8859-1');
-					exit;
-				}
-				else if($iOnExit == self::EXIT_RETURN)
-				{
-					return self::EXIT_CODE_WRONGCREDENTIALS;
-				}
-				else
-				{
-					$oPage = self::NewLoginWebPage();
-					$oPage->DisplayLoginForm( $sLoginMode, true /* failed attempt */);
-					$oPage->output();
-					exit;
-				}
-			}
-			else
-			{
-				// User is Ok, let's save it in the session and proceed with normal login
-				UserRights::Login($sAuthUser, $sAuthentication); // Login & set the user's language
-				
-				if (MetaModel::GetConfig()->Get('log_usage'))
-				{
-					$oLog = new EventLoginUsage();
-					$oLog->Set('userinfo', UserRights::GetUser());
-					$oLog->Set('user_id', UserRights::GetUserObject()->GetKey());
-					$oLog->Set('message', 'Successful login');
-					$oLog->DBInsertNoReload();
-				}
-				
-				$_SESSION['auth_user'] = $sAuthUser;
-				$_SESSION['login_mode'] = $sLoginMode;
-				UserRights::_InitSessionCache();
-			}
-		}
-		return self::EXIT_CODE_OK;
-	}
-	
-	/**
-	 * Overridable: depending on the user, head toward a dedicated portal
-	 * @param string|null $sRequestedPortalId
-	 * @param int $iOnExit How to complete the call: redirect or return a code
-	 */	 
-	protected static function ChangeLocation($sRequestedPortalId = null, $iOnExit = self::EXIT_PROMPT)
-	{
-		$fStart = microtime(true);
-		$ret = call_user_func(array(self::$sHandlerClass, 'Dispatch'), $sRequestedPortalId);
-		if ($ret === true)
-		{
-			return self::EXIT_CODE_OK;
-		}
-		else if($ret === false)
-		{
-			throw new Exception('Nowhere to go??');
-		}
-		else
-		{
-			if ($iOnExit == self::EXIT_RETURN)
-			{
-				return self::EXIT_CODE_PORTALUSERNOTAUTHORIZED;
-			}
-			else
-			{
-				// No rights to be here, redirect to the portal
-				header('Location: '.$ret);
-			}
-		}
-	}
-
-	/**
-	 * Check if the user is already authentified, if yes, then performs some additional validations:
-	 * - if $bMustBeAdmin is true, then the user must be an administrator, otherwise an error is displayed
-	 * - if $bIsAllowedToPortalUsers is false and the user has only access to the portal, then the user is redirected
-	 * to the portal
-	 *
-	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
-	 * @param bool $bIsAllowedToPortalUsers Whether or not the current page is considered as part of the portal
-	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
-	 *
-	 * @return int|mixed|string
-	 * @throws \Exception
-	 */
-	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false, $iOnExit = self::EXIT_PROMPT)
-	{
-		$sRequestedPortalId = $bIsAllowedToPortalUsers ? 'legacy_portal' : 'backoffice';
-		return self::DoLoginEx($sRequestedPortalId, $bMustBeAdmin, $iOnExit);
-	}
-
-	/**
-	 * Check if the user is already authentified, if yes, then performs some additional validations to redirect towards
-	 * the desired "portal"
-	 *
-	 * @param string|null $sRequestedPortalId The requested "portal" interface, null for any
-	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
-	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
-	 *
-	 * @return int|mixed|string
-	 * @throws \Exception
-	 */
-	static function DoLoginEx($sRequestedPortalId = null, $bMustBeAdmin = false, $iOnExit = self::EXIT_PROMPT)
-	{
-		$operation = utils::ReadParam('loginop', '');
-	
-		$sMessage = self::HandleOperations($operation); // May exit directly
-	
-		$iRet = self::Login($iOnExit);
-	
-		if ($iRet == self::EXIT_CODE_OK)
-		{
-			if ($bMustBeAdmin && !UserRights::IsAdministrator())
-			{
-				if ($iOnExit == self::EXIT_RETURN)
-				{
-					return self::EXIT_CODE_MUSTBEADMIN;
-				}
-				else
-				{
-					require_once(APPROOT.'/setup/setuppage.class.inc.php');
-					$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-					$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");
-					$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
-					$oP->output();
-					exit;
-				}
-			}
-			$iRet = call_user_func(array(self::$sHandlerClass, 'ChangeLocation'), $sRequestedPortalId, $iOnExit);
-		}
-		if ($iOnExit == self::EXIT_RETURN)
-		{
-			return $iRet;
-		}
-		else
-		{
-			return $sMessage;
-		}
-	}	
-	protected static function HandleOperations($operation)
-	{
-		$sMessage = ''; // most of the operations never return, but some can return a message to be displayed
-		if ($operation == 'logoff')
-		{
-			if (isset($_SESSION['login_mode']))
-			{
-				$sLoginMode = $_SESSION['login_mode'];
-			}
-			else
-			{
-				$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
-				if (count($aAllowedLoginTypes) > 0)
-				{
-					$sLoginMode = $aAllowedLoginTypes[0];
-				}
-				else
-				{
-					$sLoginMode = 'form';
-				}
-			}
-			self::ResetSession();
-			$oPage = self::NewLoginWebPage();
-			$oPage->DisplayLoginForm( $sLoginMode, false /* not a failed attempt */);
-			$oPage->output();
-			exit;
-		}
-		else if ($operation == 'forgot_pwd')
-		{
-			$oPage = self::NewLoginWebPage();
-			$oPage->DisplayForgotPwdForm();
-			$oPage->output();
-			exit;
-		}
-		else if ($operation == 'forgot_pwd_go')
-		{
-			$oPage = self::NewLoginWebPage();
-			$oPage->ForgotPwdGo();
-			$oPage->output();
-			exit;
-		}
-		else if ($operation == 'reset_pwd')
-		{
-			$oPage = self::NewLoginWebPage();
-			$oPage->DisplayResetPwdForm();
-			$oPage->output();
-			exit;
-		}
-		else if ($operation == 'do_reset_pwd')
-		{
-			$oPage = self::NewLoginWebPage();
-			$oPage->DoResetPassword();
-			$oPage->output();
-			exit;
-		}
-		else if ($operation == 'change_pwd')
-		{
-			$sAuthUser = $_SESSION['auth_user'];
-			UserRights::Login($sAuthUser); // Set the user's language
-			$oPage = self::NewLoginWebPage();
-			$oPage->DisplayChangePwdForm();
-			$oPage->output();
-			exit;
-		}
-		if ($operation == 'do_change_pwd')
-		{
-			$sAuthUser = $_SESSION['auth_user'];
-			UserRights::Login($sAuthUser); // Set the user's language
-			$sOldPwd = utils::ReadPostedParam('old_pwd', '', false, 'raw_data');
-			$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
-			if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
-			{
-				$oPage = self::NewLoginWebPage();
-				$oPage->DisplayChangePwdForm(true); // old pwd was wrong
-				$oPage->output();
-				exit;
-			}
-			$sMessage = Dict::S('UI:Login:PasswordChanged');
-		}
-		return $sMessage;
-	}
-	
-	protected static function Dispatch($sRequestedPortalId)
-	{
-		if ($sRequestedPortalId === null) return true; // allowed to any portal => return true
-		
-		$aPortalsConf = PortalDispatcherData::GetData();
-		$aDispatchers = array();
-		foreach($aPortalsConf as $sPortalId => $aConf)
-		{
-			$sHandlerClass = $aConf['handler'];
-			$aDispatchers[$sPortalId] = new $sHandlerClass($sPortalId);
-		}
-		
-		if (array_key_exists($sRequestedPortalId, $aDispatchers) && $aDispatchers[$sRequestedPortalId]->IsUserAllowed())
-		{
-			return true;
-		}
-		foreach($aDispatchers as $sPortalId => $oDispatcher)
-		{
-			if ($oDispatcher->IsUserAllowed()) return $oDispatcher->GetUrl();
-		}
-		return false; // nothing matched !!
-	}
-} // End of class
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class LoginWebPage
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/nicewebpage.class.inc.php");
+require_once(APPROOT.'/application/portaldispatcher.class.inc.php');
+/**
+ * Web page used for displaying the login form
+ */
+
+class LoginWebPage extends NiceWebPage
+{
+	const EXIT_PROMPT = 0;
+	const EXIT_HTTP_401 = 1;
+	const EXIT_RETURN = 2;
+	
+	const EXIT_CODE_OK = 0;
+	const EXIT_CODE_MISSINGLOGIN = 1;
+	const EXIT_CODE_MISSINGPASSWORD = 2;
+	const EXIT_CODE_WRONGCREDENTIALS = 3;
+	const EXIT_CODE_MUSTBEADMIN = 4;
+	const EXIT_CODE_PORTALUSERNOTAUTHORIZED = 5;
+	const EXIT_CODE_NOTAUTHORIZED = 6;
+	
+	protected static $sHandlerClass = __class__;
+	public static function RegisterHandler($sClass)
+	{
+		self::$sHandlerClass = $sClass;
+	}
+
+	public static function NewLoginWebPage()
+	{
+		return new self::$sHandlerClass;
+	}
+
+	protected static $m_sLoginFailedMessage = '';
+	
+	public function __construct($sTitle = null)
+	{
+	    if($sTitle === null)
+        {
+            $sTitle = Dict::S('UI:Login:Title');
+        }
+
+		parent::__construct($sTitle);
+		$this->SetStyleSheet();
+		$this->add_header("Cache-control: no-cache");
+	}
+	
+	public function SetStyleSheet()
+	{
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/login.css');
+	}
+
+	public static function SetLoginFailedMessage($sMessage)
+	{
+		self::$m_sLoginFailedMessage = $sMessage;
+	}
+
+	public function EnableResetPassword()
+	{
+		return MetaModel::GetConfig()->Get('forgot_password');
+	}
+
+	public function DisplayLoginHeader($bMainAppLogo = false)
+	{
+		if ($bMainAppLogo)
+		{
+			$sLogo = 'itop-logo.png';
+			$sBrandingLogo = 'main-logo.png';
+		}
+		else
+		{
+			$sLogo = 'itop-logo-external.png';
+			$sBrandingLogo = 'login-logo.png';
+		}
+		$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION);
+		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
+		$sDisplayIcon = utils::GetAbsoluteUrlAppRoot().'images/'.$sLogo.'?t='.utils::GetCacheBusterTimestamp();
+		if (file_exists(MODULESROOT.'branding/'.$sBrandingLogo))
+		{
+			$sDisplayIcon = utils::GetAbsoluteUrlModulesRoot().'branding/'.$sBrandingLogo.'?t='.utils::GetCacheBusterTimestamp();
+		}
+		$this->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8')."\"><img title=\"$sVersionShort\" src=\"$sDisplayIcon\"></a></div>\n");
+	}
+
+	public function DisplayLoginForm($sLoginType, $bFailedLogin = false)
+	{
+		switch($sLoginType)
+		{
+			case 'cas':
+			utils::InitCASClient();					
+			// force CAS authentication
+			phpCAS::forceAuthentication(); // Will redirect the user and exit since the user is not yet authenticated
+			break;
+			
+			case 'basic':
+			case 'url':
+			$this->add_header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
+			$this->add_header('HTTP/1.0 401 Unauthorized');
+			$this->add_header('Content-type: text/html; charset=iso-8859-1');
+			// Note: displayed when the user will click on Cancel
+			$this->add('<p><strong>'.Dict::S('UI:Login:Error:AccessRestricted').'</strong></p>');
+			break;
+			
+			case 'external':
+			case 'form':
+			default: // In case the settings get messed up...
+			$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
+			$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
+	
+			$this->DisplayLoginHeader();
+			$this->add("<div id=\"login\">\n");
+			$this->add("<h1>".Dict::S('UI:Login:Welcome')."</h1>\n");
+			if ($bFailedLogin)
+			{
+				if (self::$m_sLoginFailedMessage != '')
+				{
+					$this->add("<p class=\"hilite\">".self::$m_sLoginFailedMessage."</p>\n");
+				}
+				else
+				{
+					$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectLoginPassword')."</p>\n");
+				}
+			}
+			else
+			{
+				$this->add("<p>".Dict::S('UI:Login:IdentifyYourself')."</p>\n");
+			}
+			$this->add("<form method=\"post\">\n");
+			$this->add("<table>\n");
+			$sForgotPwd = $this->EnableResetPassword() ? $this->ForgotPwdLink() : '';
+			$this->add("<tr><td style=\"text-align:right\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label></td><td style=\"text-align:left\"><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
+			$this->add("<tr><td style=\"text-align:right\"><label for=\"pwd\">".Dict::S('UI:Login:PasswordPrompt').":</label></td><td style=\"text-align:left\"><input id=\"pwd\" type=\"password\" name=\"auth_pwd\" value=\"".htmlentities($sAuthPwd, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
+			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Login')."\" /></span></td></tr>\n");
+			if (strlen($sForgotPwd) > 0)
+			{
+				$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\">$sForgotPwd</td></tr>\n");
+			}
+			$this->add("</table>\n");
+			$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
+
+			$this->add_ready_script('$("#user").focus();');
+						
+			// Keep the OTHER parameters posted
+			foreach($_POST as $sPostedKey => $postedValue)
+			{
+				if (!in_array($sPostedKey, array('auth_user', 'auth_pwd')))
+				{
+					if (is_array($postedValue))
+					{
+						foreach($postedValue as $sKey => $sValue)
+						{
+							$this->add("<input type=\"hidden\" name=\"".htmlentities($sPostedKey, ENT_QUOTES, 'UTF-8')."[".htmlentities($sKey, ENT_QUOTES, 'UTF-8')."]\" value=\"".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."\" />\n");
+						}
+					}
+					else
+					{
+						$this->add("<input type=\"hidden\" name=\"".htmlentities($sPostedKey, ENT_QUOTES, 'UTF-8')."\" value=\"".htmlentities($postedValue, ENT_QUOTES, 'UTF-8')."\" />\n");
+					}
+				}	
+			}
+			
+			$this->add("</form>\n");
+			$this->add(Dict::S('UI:Login:About'));
+			$this->add("</div>\n");
+			break;
+		}
+	}
+
+	/**
+	 * Return '' to disable this feature	
+	 */	
+	public function ForgotPwdLink()
+	{
+		$sUrl = utils::GetAbsoluteUrlAppRoot() . 'pages/UI.php?loginop=forgot_pwd';
+		$sHtml = "<a href=\"$sUrl\" target=\"_blank\">".Dict::S('UI:Login:ForgotPwd')."</a>";
+		return $sHtml;
+	}
+
+	public function DisplayForgotPwdForm($bFailedToReset = false, $sFailureReason = null)
+	{
+		$this->DisplayLoginHeader();
+		$this->add("<div id=\"login\">\n");
+		$this->add("<h1>".Dict::S('UI:Login:ForgotPwdForm')."</h1>\n");
+		$this->add("<p>".Dict::S('UI:Login:ForgotPwdForm+')."</p>\n");
+		if ($bFailedToReset)
+		{
+			$this->add("<p class=\"hilite\">".Dict::Format('UI:Login:ResetPwdFailed', htmlentities($sFailureReason, ENT_QUOTES, 'UTF-8'))."</p>\n");
+		}
+		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
+		$this->add("<form method=\"post\">\n");
+		$this->add("<table>\n");
+		$this->add("<tr><td colspan=\"2\" class=\"center\"><label for=\"user\">".Dict::S('UI:Login:UserNamePrompt').":</label><input id=\"user\" type=\"text\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" /></td></tr>\n");
+		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"button\" onClick=\"window.close();\" value=\"".Dict::S('UI:Button:Cancel')."\" /></span>&nbsp;&nbsp;<span class=\"btn_border\"><input type=\"submit\" value=\"".Dict::S('UI:Login:ResetPassword')."\" /></span></td></tr>\n");
+		$this->add("</table>\n");
+		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"forgot_pwd_go\" />\n");
+		$this->add("</form>\n");
+		$this->add("</div>\n");
+
+		$this->add_ready_script('$("#user").focus();');
+	}
+
+	protected function ForgotPwdGo()
+	{
+		$sAuthUser = utils::ReadParam('auth_user', '', true, 'raw_data');
+
+		try
+		{
+			UserRights::Login($sAuthUser); // Set the user's language (if possible!)
+            /** @var UserInternal $oUser */
+            $oUser = UserRights::GetUserObject();
+			if ($oUser == null)
+			{
+				throw new Exception(Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser));
+			}
+			if (!MetaModel::IsValidAttCode(get_class($oUser), 'reset_pwd_token'))
+			{
+				throw new Exception(Dict::S('UI:ResetPwd-Error-NotPossible'));
+			}
+			if (!$oUser->CanChangePassword())
+			{
+				throw new Exception(Dict::S('UI:ResetPwd-Error-FixedPwd'));
+			}
+			
+			$sTo = $oUser->GetResetPasswordEmail(); // throws Exceptions if not allowed
+			if ($sTo == '')
+			{
+				throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmail'));
+			}
+
+			// This token allows the user to change the password without knowing the previous one
+			$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
+			$oUser->Set('reset_pwd_token', $sToken);
+			CMDBObject::SetTrackInfo('Reset password');
+			$oUser->AllowWrite(true);
+			$oUser->DBUpdate();
+
+			$oEmail = new Email();
+			$oEmail->SetRecipientTO($sTo);
+			$sFrom = MetaModel::GetConfig()->Get('forgot_password_from');
+			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetSubject(Dict::S('UI:ResetPwd-EmailSubject'));
+			$sResetUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?loginop=reset_pwd&auth_user='.urlencode($oUser->Get('login')).'&token='.urlencode($sToken);
+			$oEmail->SetBody(Dict::Format('UI:ResetPwd-EmailBody', $sResetUrl));
+			$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
+			switch ($iRes)
+			{
+				//case EMAIL_SEND_PENDING:
+				case EMAIL_SEND_OK:
+					break;
+		
+				case EMAIL_SEND_ERROR:
+				default:
+					IssueLog::Error('Failed to send the email with the NEW password for '.$oUser->Get('friendlyname').': '.implode(', ', $aIssues));
+					throw new Exception(Dict::S('UI:ResetPwd-Error-Send'));
+			}
+
+			$this->DisplayLoginHeader();
+			$this->add("<div id=\"login\">\n");
+			$this->add("<h1>".Dict::S('UI:Login:ForgotPwdForm')."</h1>\n");
+			$this->add("<p>".Dict::S('UI:ResetPwd-EmailSent')."</p>");
+			$this->add("<form method=\"post\">\n");
+			$this->add("<table>\n");
+			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><input type=\"button\" onClick=\"window.close();\" value=\"".Dict::S('UI:Button:Done')."\" /></td></tr>\n");
+			$this->add("</table>\n");
+			$this->add("</form>\n");
+			$this->add("</div\n");
+		}
+		catch(Exception $e)
+		{
+			$this->DisplayForgotPwdForm(true, $e->getMessage());
+		}
+	}
+
+	public function DisplayResetPwdForm()
+	{
+		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+		$sToken = utils::ReadParam('token', '', false, 'raw_data');
+
+		UserRights::Login($sAuthUser); // Set the user's language
+		$oUser = UserRights::GetUserObject();
+
+		$this->DisplayLoginHeader();
+		$this->add("<div id=\"login\">\n");
+		$this->add("<h1>".Dict::S('UI:ResetPwd-Title')."</h1>\n");
+		if ($oUser == null)
+		{
+			$this->add("<p>".Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser)."</p>\n");
+		}
+		else
+		{
+			$oEncryptedToken = $oUser->Get('reset_pwd_token');
+			
+			if (!$oEncryptedToken->CheckPassword($sToken))
+			{
+				$this->add("<p>".Dict::S('UI:ResetPwd-Error-InvalidToken')."</p>\n");
+			}
+			else
+			{
+				$this->add("<p>".Dict::Format('UI:ResetPwd-Error-EnterPassword', $oUser->GetFriendlyName())."</p>\n");
+	
+				$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
+				$this->add_script(
+<<<EOF
+function DoCheckPwd()
+{
+	if ($('#new_pwd').val() != $('#retype_new_pwd').val())
+	{
+		alert('$sInconsistenPwdMsg');
+		return false;
+	}
+	return true;
+}
+EOF
+				);
+				$this->add("<form method=\"post\">\n");
+				$this->add("<table>\n");
+				$this->add("<tr><td style=\"text-align:right\"><label for=\"new_pwd\">".Dict::S('UI:Login:NewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"new_pwd\" name=\"new_pwd\" value=\"\" /></td></tr>\n");
+				$this->add("<tr><td style=\"text-align:right\"><label for=\"retype_new_pwd\">".Dict::S('UI:Login:RetypeNewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"retype_new_pwd\" name=\"retype_new_pwd\" value=\"\" /></td></tr>\n");
+				$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"submit\" onClick=\"return DoCheckPwd();\" value=\"".Dict::S('UI:Button:ChangePassword')."\" /></span></td></tr>\n");
+				$this->add("</table>\n");
+				$this->add("<input type=\"hidden\" name=\"loginop\" value=\"do_reset_pwd\" />\n");
+				$this->add("<input type=\"hidden\" name=\"auth_user\" value=\"".htmlentities($sAuthUser, ENT_QUOTES, 'UTF-8')."\" />\n");
+				$this->add("<input type=\"hidden\" name=\"token\" value=\"".htmlentities($sToken, ENT_QUOTES, 'UTF-8')."\" />\n");
+				$this->add("</form>\n");
+				$this->add("</div\n");
+			}
+		}
+	}
+
+	public function DoResetPassword()
+	{
+		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+		$sToken = utils::ReadParam('token', '', false, 'raw_data');
+		$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
+
+		UserRights::Login($sAuthUser); // Set the user's language
+		$oUser = UserRights::GetUserObject();
+
+		$this->DisplayLoginHeader();
+		$this->add("<div id=\"login\">\n");
+		$this->add("<h1>".Dict::S('UI:ResetPwd-Title')."</h1>\n");
+		if ($oUser == null)
+		{
+			$this->add("<p>".Dict::Format('UI:ResetPwd-Error-WrongLogin', $sAuthUser)."</p>\n");
+		}
+		else
+		{
+			$oEncryptedPassword = $oUser->Get('reset_pwd_token');
+			if (!$oEncryptedPassword->CheckPassword($sToken))
+			{
+				$this->add("<p>".Dict::S('UI:ResetPwd-Error-InvalidToken')."</p>\n");
+			}
+			else
+			{
+				// Trash the token and change the password
+				$oUser->Set('reset_pwd_token', '');
+				$oUser->SetPassword($sNewPwd); // Does record the change into the DB
+	
+				$this->add("<p>".Dict::S('UI:ResetPwd-Ready')."</p>");
+				$sUrl = utils::GetAbsoluteUrlAppRoot();
+				$this->add("<p><a href=\"$sUrl\">".Dict::S('UI:ResetPwd-Login')."</a></p>");
+			}
+			$this->add("</div\n");
+		}
+	}
+
+	public function DisplayChangePwdForm($bFailedLogin = false)
+	{
+		$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+
+		$sInconsistenPwdMsg = Dict::S('UI:Login:RetypePwdDoesNotMatch');
+		$this->add_script(<<<EOF
+function GoBack()
+{
+	window.history.back();
+}
+
+function DoCheckPwd()
+{
+	if ($('#new_pwd').val() != $('#retype_new_pwd').val())
+	{
+		alert('$sInconsistenPwdMsg');
+		return false;
+	}
+	return true;
+}
+EOF
+);
+		$this->DisplayLoginHeader();
+		$this->add("<div id=\"login\">\n");
+		$this->add("<h1>".Dict::S('UI:Login:ChangeYourPassword')."</h1>\n");
+		if ($bFailedLogin)
+		{
+			$this->add("<p class=\"hilite\">".Dict::S('UI:Login:IncorrectOldPassword')."</p>\n");
+		}
+		$this->add("<form method=\"post\">\n");
+		$this->add("<table>\n");
+		$this->add("<tr><td style=\"text-align:right\"><label for=\"old_pwd\">".Dict::S('UI:Login:OldPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"old_pwd\" name=\"old_pwd\" value=\"\" /></td></tr>\n");
+		$this->add("<tr><td style=\"text-align:right\"><label for=\"new_pwd\">".Dict::S('UI:Login:NewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"new_pwd\" name=\"new_pwd\" value=\"\" /></td></tr>\n");
+		$this->add("<tr><td style=\"text-align:right\"><label for=\"retype_new_pwd\">".Dict::S('UI:Login:RetypeNewPasswordPrompt').":</label></td><td style=\"text-align:left\"><input type=\"password\" id=\"retype_new_pwd\" name=\"retype_new_pwd\" value=\"\" /></td></tr>\n");
+		$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"><span class=\"btn_border\"><input type=\"button\" onClick=\"GoBack();\" value=\"".Dict::S('UI:Button:Cancel')."\" /></span>&nbsp;&nbsp;<span class=\"btn_border\"><input type=\"submit\" onClick=\"return DoCheckPwd();\" value=\"".Dict::S('UI:Button:ChangePassword')."\" /></span></td></tr>\n");
+		$this->add("</table>\n");
+		$this->add("<input type=\"hidden\" name=\"loginop\" value=\"do_change_pwd\" />\n");
+		$this->add("</form>\n");
+		$this->add("</div>\n");
+	}
+
+	static function ResetSession()
+	{
+		// Unset all of the session variables.
+		unset($_SESSION['auth_user']);
+		unset($_SESSION['login_mode']);
+		unset($_SESSION['archive_mode']);
+		unset($_SESSION['impersonate_user']);
+		UserRights::_ResetSessionCache();
+		// If it's desired to kill the session, also delete the session cookie.
+		// Note: This will destroy the session, and not just the session data!
+	}
+
+	static function SecureConnectionRequired()
+	{
+		return MetaModel::GetConfig()->GetSecureConnectionRequired();
+	}
+
+	/**
+	 * Guess if a string looks like an UTF-8 string based on some ranges of multi-bytes encoding
+	 * @param string $sString
+	 * @return bool True if the string contains some typical UTF-8 multi-byte sequences
+	 */
+	static function LooksLikeUTF8($sString)
+	{
+		return preg_match('%(?:
+        			[\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+        			|\xE0[\xA0-\xBF][\x80-\xBF]        # excluding overlongs
+        			|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
+        			|\xED[\x80-\x9F][\x80-\xBF]        # excluding surrogates
+        			|\xF0[\x90-\xBF][\x80-\xBF]{2}     # planes 1-3
+        			|[\xF1-\xF3][\x80-\xBF]{3}         # planes 4-15
+        			|\xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
+        	)+%xs', $sString);
+	}
+
+	/**
+	 * Attempt a login
+	 * 	 	
+	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
+	 * @return int One of the class constants EXIT_CODE_...
+	 */	
+	protected static function Login($iOnExit)
+	{
+		if (self::SecureConnectionRequired() && !utils::IsConnectionSecure())
+		{
+			// Non secured URL... request for a secure connection
+			throw new Exception('Secure connection required!');			
+		}
+
+		$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
+
+		if (isset($_SESSION['auth_user']))
+		{
+			//echo "User: ".$_SESSION['auth_user']."\n";
+			// Already authentified
+			$bRet = UserRights::Login($_SESSION['auth_user']); // Login & set the user's language
+			if ($bRet)
+			{
+				return self::EXIT_CODE_OK;
+			}
+			// The user account is no longer valid/enabled
+			 static::ResetSession();
+		}
+		
+		$index = 0;
+		$sLoginMode = '';
+		$sAuthentication = 'internal';
+		while(($sLoginMode == '') && ($index < count($aAllowedLoginTypes)))
+		{
+			$sLoginType = $aAllowedLoginTypes[$index];
+			switch($sLoginType)
+			{
+				case 'cas':
+				utils::InitCASClient();					
+				// check CAS authentication
+				if (phpCAS::isAuthenticated())
+				{
+					$sAuthUser = phpCAS::getUser();
+					$sAuthPwd = '';
+					$sLoginMode = 'cas';
+					$sAuthentication = 'external';
+				}
+				break;
+				
+				case 'form':
+				// iTop standard mode: form based authentication
+				$sAuthUser = utils::ReadPostedParam('auth_user', '', false, 'raw_data');
+				$sAuthPwd = utils::ReadPostedParam('auth_pwd', null, false, 'raw_data');
+				if (($sAuthUser != '') && ($sAuthPwd !== null))
+				{
+					$sLoginMode = 'form';
+				}
+				break;
+				
+				case 'basic':
+				// Standard PHP authentication method, works with Apache...
+				// Case 1) Apache running in CGI mode + rewrite rules in .htaccess
+				if (isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION']))
+				{
+					list($sAuthUser, $sAuthPwd) = explode(':' , base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
+					$sLoginMode = 'basic';
+				}
+				else if (isset($_SERVER['PHP_AUTH_USER']))
+				{
+					$sAuthUser = $_SERVER['PHP_AUTH_USER'];
+					// Unfortunately, the RFC is not clear about the encoding...
+					// IE and FF supply the user and password encoded in ISO-8859-1 whereas Chrome provides them encoded in UTF-8
+					// So let's try to guess if it's an UTF-8 string or not... fortunately all encodings share the same ASCII base
+					if (!self::LooksLikeUTF8($sAuthUser))
+					{
+						// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
+						// Supposed to be harmless in case of a plain ASCII string...
+						$sAuthUser = iconv('iso-8859-1', 'utf-8', $sAuthUser);
+					}
+					$sAuthPwd = $_SERVER['PHP_AUTH_PW'];
+					if (!self::LooksLikeUTF8($sAuthPwd))
+					{
+						// Does not look like and UTF-8 string, try to convert it from iso-8859-1 to UTF-8
+						// Supposed to be harmless in case of a plain ASCII string...
+						$sAuthPwd = iconv('iso-8859-1', 'utf-8', $sAuthPwd);
+					}
+					$sLoginMode = 'basic';
+				}
+				break;
+
+				case 'external':
+				// Web server supplied authentication
+				$bExternalAuth = false;
+				$sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
+				eval('$sAuthUser = isset('.$sExtAuthVar.') ? '.$sExtAuthVar.' : false;'); // Retrieve the value
+				if ($sAuthUser && (strlen($sAuthUser) > 0))
+				{
+					$sAuthPwd = ''; // No password in this case the web server already authentified the user...
+					$sLoginMode = 'external';
+					$sAuthentication = 'external';
+				}
+				break;
+
+				case 'url':
+				// Credentials passed directly in the url
+				$sAuthUser = utils::ReadParam('auth_user', '', false, 'raw_data');
+				$sAuthPwd = utils::ReadParam('auth_pwd', null, false, 'raw_data');
+				if (($sAuthUser != '') && ($sAuthPwd !== null))
+				{
+					$sLoginMode = 'url';
+				}		
+				break;	
+			}
+			$index++;
+		}
+		//echo "\nsLoginMode: $sLoginMode (user: $sAuthUser / pwd: $sAuthPwd\n)";
+		if ($sLoginMode == '')
+		{
+			// First connection
+			$sDesiredLoginMode = utils::ReadParam('login_mode');
+			if (in_array($sDesiredLoginMode, $aAllowedLoginTypes))
+			{
+				$sLoginMode = $sDesiredLoginMode;
+			}
+			else
+			{
+				$sLoginMode = $aAllowedLoginTypes[0]; // First in the list...
+			}
+			if (array_key_exists('HTTP_X_COMBODO_AJAX', $_SERVER))
+			{
+				// X-Combodo-Ajax is a special header automatically added to all ajax requests
+				// Let's reply that we're currently logged-out
+				header('HTTP/1.0 401 Unauthorized');
+				exit;
+			}
+			if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
+			{
+				header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
+				header('HTTP/1.0 401 Unauthorized');
+				header('Content-type: text/html; charset=iso-8859-1');
+				exit;
+			}
+			else if($iOnExit == self::EXIT_RETURN)
+			{
+				if (($sAuthUser !== '') && ($sAuthPwd === null))
+				{
+					return self::EXIT_CODE_MISSINGPASSWORD;
+				}
+				else
+				{
+					return self::EXIT_CODE_MISSINGLOGIN;
+				}
+			}
+			else
+			{
+				$oPage = self::NewLoginWebPage();
+				$oPage->DisplayLoginForm( $sLoginMode, false /* no previous failed attempt */);
+				$oPage->output();
+				exit;
+			}
+		}
+		else
+		{
+			if (!UserRights::CheckCredentials($sAuthUser, $sAuthPwd, $sLoginMode, $sAuthentication))
+			{
+				//echo "Check Credentials returned false for user $sAuthUser!";
+				self::ResetSession();
+				if (($iOnExit == self::EXIT_HTTP_401) || ($sLoginMode == 'basic'))
+				{
+					header('WWW-Authenticate: Basic realm="'.Dict::Format('UI:iTopVersion:Short', ITOP_APPLICATION, ITOP_VERSION));
+					header('HTTP/1.0 401 Unauthorized');
+					header('Content-type: text/html; charset=iso-8859-1');
+					exit;
+				}
+				else if($iOnExit == self::EXIT_RETURN)
+				{
+					return self::EXIT_CODE_WRONGCREDENTIALS;
+				}
+				else
+				{
+					$oPage = self::NewLoginWebPage();
+					$oPage->DisplayLoginForm( $sLoginMode, true /* failed attempt */);
+					$oPage->output();
+					exit;
+				}
+			}
+			else
+			{
+				// User is Ok, let's save it in the session and proceed with normal login
+				UserRights::Login($sAuthUser, $sAuthentication); // Login & set the user's language
+				
+				if (MetaModel::GetConfig()->Get('log_usage'))
+				{
+					$oLog = new EventLoginUsage();
+					$oLog->Set('userinfo', UserRights::GetUser());
+					$oLog->Set('user_id', UserRights::GetUserObject()->GetKey());
+					$oLog->Set('message', 'Successful login');
+					$oLog->DBInsertNoReload();
+				}
+				
+				$_SESSION['auth_user'] = $sAuthUser;
+				$_SESSION['login_mode'] = $sLoginMode;
+				UserRights::_InitSessionCache();
+			}
+		}
+		return self::EXIT_CODE_OK;
+	}
+	
+	/**
+	 * Overridable: depending on the user, head toward a dedicated portal
+	 * @param string|null $sRequestedPortalId
+	 * @param int $iOnExit How to complete the call: redirect or return a code
+	 */	 
+	protected static function ChangeLocation($sRequestedPortalId = null, $iOnExit = self::EXIT_PROMPT)
+	{
+		$fStart = microtime(true);
+		$ret = call_user_func(array(self::$sHandlerClass, 'Dispatch'), $sRequestedPortalId);
+		if ($ret === true)
+		{
+			return self::EXIT_CODE_OK;
+		}
+		else if($ret === false)
+		{
+			throw new Exception('Nowhere to go??');
+		}
+		else
+		{
+			if ($iOnExit == self::EXIT_RETURN)
+			{
+				return self::EXIT_CODE_PORTALUSERNOTAUTHORIZED;
+			}
+			else
+			{
+				// No rights to be here, redirect to the portal
+				header('Location: '.$ret);
+			}
+		}
+	}
+
+	/**
+	 * Check if the user is already authentified, if yes, then performs some additional validations:
+	 * - if $bMustBeAdmin is true, then the user must be an administrator, otherwise an error is displayed
+	 * - if $bIsAllowedToPortalUsers is false and the user has only access to the portal, then the user is redirected
+	 * to the portal
+	 *
+	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
+	 * @param bool $bIsAllowedToPortalUsers Whether or not the current page is considered as part of the portal
+	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
+	 *
+	 * @return int|mixed|string
+	 * @throws \Exception
+	 */
+	static function DoLogin($bMustBeAdmin = false, $bIsAllowedToPortalUsers = false, $iOnExit = self::EXIT_PROMPT)
+	{
+		$sRequestedPortalId = $bIsAllowedToPortalUsers ? 'legacy_portal' : 'backoffice';
+		return self::DoLoginEx($sRequestedPortalId, $bMustBeAdmin, $iOnExit);
+	}
+
+	/**
+	 * Check if the user is already authentified, if yes, then performs some additional validations to redirect towards
+	 * the desired "portal"
+	 *
+	 * @param string|null $sRequestedPortalId The requested "portal" interface, null for any
+	 * @param bool $bMustBeAdmin Whether or not the user must be an admin to access the current page
+	 * @param int iOnExit What action to take if the user is not logged on (one of the class constants EXIT_...)
+	 *
+	 * @return int|mixed|string
+	 * @throws \Exception
+	 */
+	static function DoLoginEx($sRequestedPortalId = null, $bMustBeAdmin = false, $iOnExit = self::EXIT_PROMPT)
+	{
+		$operation = utils::ReadParam('loginop', '');
+	
+		$sMessage = self::HandleOperations($operation); // May exit directly
+	
+		$iRet = self::Login($iOnExit);
+	
+		if ($iRet == self::EXIT_CODE_OK)
+		{
+			if ($bMustBeAdmin && !UserRights::IsAdministrator())
+			{
+				if ($iOnExit == self::EXIT_RETURN)
+				{
+					return self::EXIT_CODE_MUSTBEADMIN;
+				}
+				else
+				{
+					require_once(APPROOT.'/setup/setuppage.class.inc.php');
+					$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+					$oP->add("<h1>".Dict::S('UI:Login:Error:AccessAdmin')."</h1>\n");
+					$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
+					$oP->output();
+					exit;
+				}
+			}
+			$iRet = call_user_func(array(self::$sHandlerClass, 'ChangeLocation'), $sRequestedPortalId, $iOnExit);
+		}
+		if ($iOnExit == self::EXIT_RETURN)
+		{
+			return $iRet;
+		}
+		else
+		{
+			return $sMessage;
+		}
+	}	
+	protected static function HandleOperations($operation)
+	{
+		$sMessage = ''; // most of the operations never return, but some can return a message to be displayed
+		if ($operation == 'logoff')
+		{
+			if (isset($_SESSION['login_mode']))
+			{
+				$sLoginMode = $_SESSION['login_mode'];
+			}
+			else
+			{
+				$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
+				if (count($aAllowedLoginTypes) > 0)
+				{
+					$sLoginMode = $aAllowedLoginTypes[0];
+				}
+				else
+				{
+					$sLoginMode = 'form';
+				}
+			}
+			self::ResetSession();
+			$oPage = self::NewLoginWebPage();
+			$oPage->DisplayLoginForm( $sLoginMode, false /* not a failed attempt */);
+			$oPage->output();
+			exit;
+		}
+		else if ($operation == 'forgot_pwd')
+		{
+			$oPage = self::NewLoginWebPage();
+			$oPage->DisplayForgotPwdForm();
+			$oPage->output();
+			exit;
+		}
+		else if ($operation == 'forgot_pwd_go')
+		{
+			$oPage = self::NewLoginWebPage();
+			$oPage->ForgotPwdGo();
+			$oPage->output();
+			exit;
+		}
+		else if ($operation == 'reset_pwd')
+		{
+			$oPage = self::NewLoginWebPage();
+			$oPage->DisplayResetPwdForm();
+			$oPage->output();
+			exit;
+		}
+		else if ($operation == 'do_reset_pwd')
+		{
+			$oPage = self::NewLoginWebPage();
+			$oPage->DoResetPassword();
+			$oPage->output();
+			exit;
+		}
+		else if ($operation == 'change_pwd')
+		{
+			$sAuthUser = $_SESSION['auth_user'];
+			UserRights::Login($sAuthUser); // Set the user's language
+			$oPage = self::NewLoginWebPage();
+			$oPage->DisplayChangePwdForm();
+			$oPage->output();
+			exit;
+		}
+		if ($operation == 'do_change_pwd')
+		{
+			$sAuthUser = $_SESSION['auth_user'];
+			UserRights::Login($sAuthUser); // Set the user's language
+			$sOldPwd = utils::ReadPostedParam('old_pwd', '', false, 'raw_data');
+			$sNewPwd = utils::ReadPostedParam('new_pwd', '', false, 'raw_data');
+			if (UserRights::CanChangePassword() && ((!UserRights::CheckCredentials($sAuthUser, $sOldPwd)) || (!UserRights::ChangePassword($sOldPwd, $sNewPwd))))
+			{
+				$oPage = self::NewLoginWebPage();
+				$oPage->DisplayChangePwdForm(true); // old pwd was wrong
+				$oPage->output();
+				exit;
+			}
+			$sMessage = Dict::S('UI:Login:PasswordChanged');
+		}
+		return $sMessage;
+	}
+	
+	protected static function Dispatch($sRequestedPortalId)
+	{
+		if ($sRequestedPortalId === null) return true; // allowed to any portal => return true
+		
+		$aPortalsConf = PortalDispatcherData::GetData();
+		$aDispatchers = array();
+		foreach($aPortalsConf as $sPortalId => $aConf)
+		{
+			$sHandlerClass = $aConf['handler'];
+			$aDispatchers[$sPortalId] = new $sHandlerClass($sPortalId);
+		}
+		
+		if (array_key_exists($sRequestedPortalId, $aDispatchers) && $aDispatchers[$sRequestedPortalId]->IsUserAllowed())
+		{
+			return true;
+		}
+		foreach($aDispatchers as $sPortalId => $oDispatcher)
+		{
+			if ($oDispatcher->IsUserAllowed()) return $oDispatcher->GetUrl();
+		}
+		return false; // nothing matched !!
+	}
+} // End of class
diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index 612c2c5e5..4b90b9d87 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -1,1423 +1,1423 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Construction and display of the application's main menu
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/application/template.class.inc.php');
-require_once(APPROOT."/application/user.dashboard.class.inc.php");
-
-
-/**
- * This class manipulates, stores and displays the navigation menu used in the application
- * In order to improve the modularity of the data model and to ease the update/migration
- * between evolving data models, the menus are no longer stored in the database, but are instead
- * built on the fly each time a page is loaded.
- * The application's menu is organized into top-level groups with, inside each group, a tree of menu items.
- * Top level groups do not display any content, they just expand/collapse.
- * Sub-items drive the actual content of the page, they are based either on templates, OQL queries or full (external?) web pages.
- *
- * Example:
- * Here is how to insert the following items in the application's menu:
- *   +----------------------------------------+
- *   | Configuration Management Group         | >> Top level group
- *   +----------------------------------------+
- *		+ Configuration Management Overview     >> Template based menu item
- *		+ Contacts								>> Template based menu item
- *			+ Persons							>> Plain list (OQL based)
- *			+ Teams								>> Plain list (OQL based)
- *
- * // Create the top-level group. fRank = 1, means it will be inserted after the group '0', which is usually 'Welcome'
- * $oConfigMgmtMenu = new MenuGroup('ConfigurationManagementMenu', 1);
- * // Create an entry, based on a custom template, for the Configuration management overview, under the top-level group
- * new TemplateMenuNode('ConfigurationManagementMenu', '../somedirectory/configuration_management_menu.html', $oConfigMgmtMenu->GetIndex(), 0);
- * // Create an entry (template based) for the overview of contacts
- * $oContactsMenu = new TemplateMenuNode('ContactsMenu', '../somedirectory/configuration_management_menu.html',$oConfigMgmtMenu->GetIndex(), 1);
- * // Plain list of persons
- * new OQLMenuNode('PersonsMenu', 'SELECT bizPerson', $oContactsMenu->GetIndex(), 0);
- *
- */
- 
-class ApplicationMenu
-{
-	/**
-	 * @var bool
-	 */
-	static $bAdditionalMenusLoaded = false;
-	/**
-	 * @var array
-	 */
-	static $aRootMenus = array();
-	/**
-	 * @var array
-	 */
-	static $aMenusIndex = array();
-	/**
-	 * @var string
-	 */
-	static $sFavoriteSiloQuery = 'SELECT Organization';
-
-	static public function LoadAdditionalMenus()
-	{
-		if (!self::$bAdditionalMenusLoaded)
-		{
-			// Build menus from module handlers
-			//
-			foreach(get_declared_classes() as $sPHPClass)
-			{
-				if (is_subclass_of($sPHPClass, 'ModuleHandlerAPI'))
-				{
-					$aCallSpec = array($sPHPClass, 'OnMenuCreation');
-					call_user_func($aCallSpec);
-				}
-			}
-
-			// Build menus from the menus themselves (e.g. the ShortcutContainerMenuNode will do that)
-			//
-			foreach(self::$aRootMenus as $aMenu)
-			{
-				$oMenuNode = self::GetMenuNode($aMenu['index']);
-				$oMenuNode->PopulateChildMenus();
-			}
-
-			self::$bAdditionalMenusLoaded = true;
-		}
-	}
-
-	/**
-	 * Set the query used to limit the list of displayed organizations in the drop-down menu
-	 * @param $sOQL string The OQL query returning a list of Organization objects
-	 * @return void
-	 */
-	static public function SetFavoriteSiloQuery($sOQL)
-	{
-		self::$sFavoriteSiloQuery = $sOQL;
-	}
-	
-	/**
-	 * Get the query used to limit the list of displayed organizations in the drop-down menu
-	 * @return string The OQL query returning a list of Organization objects
-	 */
-	static public function GetFavoriteSiloQuery()
-	{
-		return self::$sFavoriteSiloQuery;
-	}
-
-	/**
-	 * Check wether a menu Id is enabled or not
-	 * @param $sMenuId
-	 * @throws DictExceptionMissingString
-	 */
-	static public function CheckMenuIdEnabled($sMenuId)
-	{
-		self::LoadAdditionalMenus();
-		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
-		if (is_null($oMenuNode) || !$oMenuNode->IsEnabled())
-		{
-			require_once(APPROOT.'/setup/setuppage.class.inc.php');
-			$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessRestricted')."</h1>\n");
-			$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
-			$oP->output();
-			exit;
-		}
-	}
-
-	/**
-	 * Main function to add a menu entry into the application, can be called during the definition
-	 * of the data model objects
-	 * @param MenuNode $oMenuNode
-	 * @param $iParentIndex
-	 * @param $fRank
-	 * @return int
-	 */
-	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
-	{
-		$index = self::GetMenuIndexById($oMenuNode->GetMenuId());
-		if ($index == -1)
-		{
-			// The menu does not already exist, insert it
-			$index = count(self::$aMenusIndex);
-
-			if ($iParentIndex == -1)
-			{
-				$sParentId = '';
-				self::$aRootMenus[] = array ('rank' => $fRank, 'index' => $index);
-			}
-			else
-			{
-				$sParentId = self::$aMenusIndex[$iParentIndex]['node']->GetMenuId();
-				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
-			}
-
-			// Note: At the time when 'parent', 'rank' and 'source_file' have been added for the reflection API,
-			//       they were not used to display the menus (redundant or unused)
-			//
-			$aBacktrace = debug_backtrace();
-			$sFile = isset($aBacktrace[2]["file"]) ? $aBacktrace[2]["file"] : $aBacktrace[1]["file"];
-			self::$aMenusIndex[$index] = array('node' => $oMenuNode, 'children' => array(), 'parent' => $sParentId, 'rank' => $fRank, 'source_file' => $sFile);
-		}
-		else
-		{
-			// the menu already exists, let's combine the conditions that make it visible
-			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
-		}
-
-		return $index;
-	}
-
-	/**
-	 * Reflection API - Get menu entries
-	 */
-	static public function ReflectionMenuNodes()
-	{
-		self::LoadAdditionalMenus();
-		return self::$aMenusIndex;
-	}
-
-	/**
-	 * Entry point to display the whole menu into the web page, used by iTopWebPage
-	 * @param $oPage
-	 * @param $aExtraParams
-	 * @throws DictExceptionMissingString
-	 */
-	static public function DisplayMenu($oPage, $aExtraParams)
-	{
-		self::LoadAdditionalMenus();
-		// Sort the root menu based on the rank
-		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
-		$iAccordion = 0;
-		$iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
-		foreach(self::$aRootMenus as $aMenu)
-		{
-			if (!self::CanDisplayMenu($aMenu)) { continue; }
-			$oMenuNode = self::GetMenuNode($aMenu['index']);
-			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'">'.$oMenuNode->GetTitle().'</h3>');
-			$oPage->AddToMenu('<div>');
-			$oPage->AddToMenu('<ul>');
-			$aChildren = self::GetChildren($aMenu['index']);
-			$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
-			$oPage->AddToMenu('</ul>');
-			if ($bActive)
-			{
-$oPage->add_ready_script(
-<<<EOF
-	// Accordion Menu
-	$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
-EOF
-				);
-			}
-			$oPage->AddToMenu('</div>');
-			$iAccordion++;
-		}
-	}
-
-	/**
-	 * Recursively check if the menu and at least one of his sub-menu is enabled
-	 * @param array $aMenu menu entry
-	 * @return bool true if at least one menu is enabled
-	 */
-	static private function CanDisplayMenu($aMenu)
-	{
-		$oMenuNode = self::GetMenuNode($aMenu['index']);
-		if ($oMenuNode->IsEnabled())
-		{
-			$aChildren = self::GetChildren($aMenu['index']);
-			if (count($aChildren) > 0)
-			{
-				foreach($aChildren as $aSubMenu)
-				{
-					if (self::CanDisplayMenu($aSubMenu))
-					{
-						return true;
-					}
-				}
-			}
-			else
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Handles the display of the sub-menus (called recursively if necessary)
-	 * @param WebPage $oPage
-	 * @param array $aMenus
-	 * @param array $aExtraParams
-	 * @param int $iActiveMenu
-	 * @return true if the currently selected menu is one of the submenus
-	 * @throws DictExceptionMissingString
-	 */
-	static protected function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
-	{
-		// Sort the menu based on the rank
-		$bActive = false;
-		usort($aMenus, array('ApplicationMenu', 'CompareOnRank'));
-		foreach($aMenus as $aMenu)
-		{
-			$index = $aMenu['index'];
-			$oMenu = self::GetMenuNode($index);
-			if ($oMenu->IsEnabled())
-			{
-				$aChildren = self::GetChildren($index);
-				$sCSSClass = (count($aChildren) > 0) ? ' class="submenu"' : '';
-				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
-				if ($sHyperlink != '')
-				{
-					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'><a href="'.$oMenu->GetHyperlink($aExtraParams).'">'.$oMenu->GetTitle().'</a></li>');
-				}
-				else
-				{
-					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'>'.$oMenu->GetTitle().'</li>');
-				}
-				if ($iActiveMenu == $index)
-				{
-					$bActive = true;
-				}
-				if (count($aChildren) > 0)
-				{
-					$oPage->AddToMenu('<ul>');
-					$bActive |= self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
-					$oPage->AddToMenu('</ul>');
-				}
-			}
-		}
-		return $bActive;
-	}
-
-	/**
-	 * Helper function to sort the menus based on their rank
-	 * @param $a
-	 * @param $b
-	 * @return int
-	 */
-	static public function CompareOnRank($a, $b)
-	{
-		$result = 1;
-		if ($a['rank'] == $b['rank'])
-		{
-			$result = 0;
-		}
-		if ($a['rank'] < $b['rank'])
-		{
-			$result = -1;
-		}
-		return $result;
-	}
-
-	/**
-	 * Helper function to retrieve the MenuNode Object based on its ID
-	 * @param int $index
-	 * @return MenuNode|null
-	 */
-	static public function GetMenuNode($index)
-	{
-		return isset(self::$aMenusIndex[$index]) ? self::$aMenusIndex[$index]['node'] : null;
-	}
-
-	/**
-	 * Helper function to get the list of child(ren) of a menu
-	 * @param int $index
-	 * @return array
-	 */
-	static public function GetChildren($index)
-	{
-		return self::$aMenusIndex[$index]['children'];
-	}
-
-	/**
-	 * Helper function to get the ID of a menu based on its name
-	 * @param string $sTitle Title of the menu (as passed when creating the menu)
-	 * @return integer ID of the menu, or -1 if not found
-	 */
-	static public function GetMenuIndexById($sTitle)
-	{
-		$index = -1;
-		foreach(self::$aMenusIndex as $aMenu)
-		{
-			if ($aMenu['node']->GetMenuId() == $sTitle)
-			{
-				$index = $aMenu['node']->GetIndex();
-				break;
-			}
-		}
-		return $index;
-	}
-	
-	/**
-	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
-	 * @return string The Id of the currently active menu
-	 */
-	static public function GetActiveNodeId()
-	{
-		$oAppContext = new ApplicationContext();
-		$sMenuId = $oAppContext->GetCurrentValue('menu', null);		
-		if ($sMenuId  === null)
-		{
-			$sMenuId = self::GetDefaultMenuId();
-		}
-		return $sMenuId;
-	}
-
-	/**
-	 * @return null|string
-	 */
-	static public function GetDefaultMenuId()
-	{
-		static $sDefaultMenuId = null;
-		if (is_null($sDefaultMenuId))
-		{
-			// Make sure the root menu is sorted on 'rank'
-			usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
-			$oFirstGroup = self::GetMenuNode(self::$aRootMenus[0]['index']);
-			$aChildren = self::$aMenusIndex[$oFirstGroup->GetIndex()]['children'];
-			usort($aChildren, array('ApplicationMenu', 'CompareOnRank'));
-			$oMenuNode = self::GetMenuNode($aChildren[0]['index']);
-			$sDefaultMenuId = $oMenuNode->GetMenuId();
-		}
-		return $sDefaultMenuId;
-	}
-
-	/**
-	 * @param $sMenuId
-	 * @return string
-	 */
-	static public function GetRootMenuId($sMenuId)
-	{
-		$iMenuIndex = self::GetMenuIndexById($sMenuId);
-		if ($iMenuIndex == -1)
-		{
-			return '';
-		}
-		$oMenu = ApplicationMenu::GetMenuNode($iMenuIndex);
-		while ($oMenu->GetParentIndex() != -1)
-		{
-			$oMenu = ApplicationMenu::GetMenuNode($oMenu->GetParentIndex());
-		}
-		return $oMenu->GetMenuId();
-	}
-}
-
-/**
- * Root class for all the kind of node in the menu tree, data model providers are responsible for instantiating
- * MenuNodes (i.e instances from derived classes) in order to populate the application's menu. Creating an objet
- * derived from MenuNode is enough to have it inserted in the application's main menu.
- * The class iTopWebPage, takes care of 3 items:
- * +--------------------+
- * | Welcome            |
- * +--------------------+
- * 		Welcome To iTop
- * +--------------------+
- * | Tools              |
- * +--------------------+
- * 		CSV Import
- * +--------------------+
- * | Admin Tools        |
- * +--------------------+
- *		User Accounts
- *		Profiles
- *		Notifications
- *		Run Queries
- *		Export
- *		Data Model
- *		Universal Search
- *
- * All the other menu items must constructed along with the various data model modules
- */
-abstract class MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sMenuId;
-	/**
-	 * @var int
-	 */
-	protected $index;
-	/**
-	 * @var int
-	 */
-	protected $iParentIndex;
-
-	/**
-	 * Properties reflecting how the node has been declared
-	 */
-	protected $aReflectionProperties;
-
-	/**
-	 * Class of objects to check if the menu is enabled, null if none
-	 */
-	protected $m_aEnableClasses;
-
-	/**
-	 * User Rights Action code to check if the menu is enabled, null if none
-	 */
-	protected $m_aEnableActions;
-
-	/**
-	 * User Rights allowed results (actually a bitmask) to check if the menu is enabled, null if none
-	 */
-	protected $m_aEnableActionResults;
-
-	/**
-	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
-	 */	
-	protected $m_aEnableStimuli;
-
-	/**
-	 * Create a menu item, sets the condition to have it displayed and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param integer $iParentIndex ID of the parent menu, pass -1 for top level (group) items
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param string $sEnableClass Name of class of object
-	 * @param mixed $iActionCode UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus The user can see this menu if she/he has enough rights to apply this stimulus
-	 */
-	public function __construct($sMenuId, $iParentIndex = -1, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		$this->sMenuId = $sMenuId;
-		$this->iParentIndex = $iParentIndex;
-		$this->aReflectionProperties = array();
-		if (strlen($sEnableClass) > 0)
-		{
-			$this->aReflectionProperties['enable_class'] = $sEnableClass;
-			$this->aReflectionProperties['enable_action'] = $iActionCode;
-			$this->aReflectionProperties['enable_permission'] = $iAllowedResults;
-			$this->aReflectionProperties['enable_stimulus'] = $sEnableStimulus;
-		}
-		$this->m_aEnableClasses = array($sEnableClass);
-		$this->m_aEnableActions = array($iActionCode);
-		$this->m_aEnableActionResults = array($iAllowedResults);
-		$this->m_aEnableStimuli = array($sEnableStimulus);
-		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function ReflectionProperties()
-	{
-		return $this->aReflectionProperties;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function GetMenuId()
-	{
-		return $this->sMenuId;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function GetParentIndex()
-	{
-		return $this->iParentIndex;
-	}
-
-	/**
-	 * @return string
-	 * @throws DictExceptionMissingString
-	 */
-	public function GetTitle()
-	{
-		return Dict::S("Menu:$this->sMenuId", str_replace('_', ' ', $this->sMenuId));
-	}
-
-	/**
-	 * @return string
-	 * @throws DictExceptionMissingString
-	 */
-	public function GetLabel()
-	{
-		$sRet = Dict::S("Menu:$this->sMenuId+", "");
-		if ($sRet === '')
-		{
-			if ($this->iParentIndex != -1)
-			{
-				$oParentMenu = ApplicationMenu::GetMenuNode($this->iParentIndex);
-				$sRet = $oParentMenu->GetTitle().' / '.$this->GetTitle();
-			}
-			else
-			{
-				$sRet = $this->GetTitle();
-			}
-			//$sRet = $this->GetTitle();
-		}
-		return $sRet;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function GetIndex()
-	{
-		return $this->index;
-	}
-	
-	public function PopulateChildMenus()
-	{
-		foreach (ApplicationMenu::GetChildren($this->GetIndex()) as $aMenu)
-		{
-			$index = $aMenu['index'];
-			$oMenu = ApplicationMenu::GetMenuNode($index);
-			$oMenu->PopulateChildMenus();
-		}
-	}
-
-	/**
-	 * @param $aExtraParams
-	 * @return string
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		$aExtraParams['c[menu]'] = $this->GetMenuId();
-		return $this->AddParams(utils::GetAbsoluteUrlAppRoot().'pages/UI.php', $aExtraParams);
-	}
-	
-	/**
-	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
-	 * @param $oMenuNode MenuNode Another definition of the same menu node, with potentially different access restriction
-	 * @return void
-	 */
-	public function AddCondition(MenuNode $oMenuNode)
-	{
-		foreach($oMenuNode->m_aEnableClasses as $index => $sClass )
-		{
-			$this->m_aEnableClasses[] = $sClass;
-			$this->m_aEnableActions[] = $oMenuNode->m_aEnableActions[$index];
-			$this->m_aEnableActionResults[] = $oMenuNode->m_aEnableActionResults[$index];
-			$this->m_aEnableStimuli[] = $oMenuNode->m_aEnableStimuli[$index];
-		}
-	}
-	/**
-	 * Tells whether the menu is enabled (i.e. displayed) for the current user
-	 * @return bool True if enabled, false otherwise
-	 */
-	public function IsEnabled()
-	{
-		foreach($this->m_aEnableClasses as $index => $sClass)
-		{
-			if ($sClass != null)
-			{
-				if (MetaModel::IsValidClass($sClass))
-				{
-					if ($this->m_aEnableStimuli[$index] != null)
-					{
-						if (!UserRights::IsStimulusAllowed($sClass, $this->m_aEnableStimuli[$index]))
-						{
-							return false;
-						}
-					}
-					if ($this->m_aEnableActions[$index] != null)
-					{
-						// Menus access rights ignore the archive mode
-						utils::PushArchiveMode(false);
-						$iResult = UserRights::IsActionAllowed($sClass, $this->m_aEnableActions[$index]);
-						utils::PopArchiveMode();
-						if (!($iResult & $this->m_aEnableActionResults[$index]))
-						{
-							return false;
-						}
-					}
-				}
-				else
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 * @return mixed
-	 */
-	public abstract function RenderContent(WebPage $oPage, $aExtraParams = array());
-
-	/**
-	 * @param $sHyperlink
-	 * @param $aExtraParams
-	 * @return string
-	 */
-	protected function AddParams($sHyperlink, $aExtraParams)
-	{
-		if (count($aExtraParams) > 0)
-		{
-			$aQuery = array();
-			$sSeparator = '?';
-			if (strpos($sHyperlink, '?') !== false)
-			{
-				$sSeparator = '&';
-			}
-			foreach($aExtraParams as $sName => $sValue)
-			{
-				$aQuery[] = urlencode($sName).'='.urlencode($sValue);
-			}
-			$sHyperlink .= $sSeparator.implode('&', $aQuery);
-		}
-		return $sHyperlink;
-	}
-}
-
-/**
- * This class implements a top-level menu group. A group is just a container for sub-items
- * it does not display a page by itself
- */
-class MenuGroup extends MenuNode
-{
-	/**
-	 * Create a top-level menu group and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param float $fRank Number used to order the list, the groups are sorted based on this value
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $fRank, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, -1 /* no parent, groups are at root level */, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		assert(false); // Shall never be called, groups do not display any content
-	}
-}
-
-/**
- * This class defines a menu item which content is based on a custom template.
- * Note the template can be either a local file or an URL !
- */
-class TemplateMenuNode extends MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sTemplateFile;
-	
-	/**
-	 * Create a menu item based on a custom template and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sTemplateFile Path (or URL) to the file that will be used as a template for displaying the page's content
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $sTemplateFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->sTemplateFile = $sTemplateFile;
-		$this->aReflectionProperties['template_file'] = $sTemplateFile;
-	}
-
-	/**
-	 * @param $aExtraParams
-	 * @return string
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		if ($this->sTemplateFile == '') return '';
-		return parent::GetHyperlink($aExtraParams);
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 * @return mixed|void
-	 * @throws DictExceptionMissingString
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		$sTemplate = @file_get_contents($this->sTemplateFile);
-		if ($sTemplate !== false)
-		{
-			$aExtraParams['table_id'] = 'Menu_'.$this->GetMenuId();
-			$oTemplate = new DisplayTemplate($sTemplate);
-			$oTemplate->Render($oPage, $aExtraParams);
-		}
-		else
-		{
-			$oPage->p("Error: failed to load template file: '{$this->sTemplateFile}'"); // No need to translate ?
-		}
-	}
-}
-
-/**
- * This class defines a menu item that uses a standard template to display a list of items therefore it allows
- * only two parameters: the page's title and the OQL expression defining the list of items to be displayed
- */
-class OQLMenuNode extends MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sPageTitle;
-	/**
-	 * @var string
-	 */
-	protected $sOQL;
-	/**
-	 * @var bool
-	 */
-	protected $bSearch;
-	/**
-	 * @var bool|null
-	 */
-	protected $bSearchFormOpen;
-	
-	/**
-	 * Extra parameters to be passed to the display block to fine tune its appearence
-	 */
-	protected $m_aParams;
-
-
-	/**
-	 * Create a menu item based on an OQL query and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sOQL OQL query defining the set of objects to be displayed
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param bool $bSearch Whether or not to display a (collapsed) search frame at the top of the page
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus
-	 * @param bool $bSearchFormOpen
-	 */
-	public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0.0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bSearchFormOpen = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->sPageTitle = "Menu:$sMenuId+";
-		$this->sOQL = $sOQL;
-		$this->bSearch = $bSearch;
-		$this->bSearchFormOpen = $bSearchFormOpen;
-		$this->m_aParams = array();
-		$this->aReflectionProperties['oql'] = $sOQL;
-		$this->aReflectionProperties['do_search'] = $bSearch;
-		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
-		// of the class specified by the OQL...
-	}
-	
-	/**
-	 * Set some extra parameters to be passed to the display block to fine tune its appearence
-	 * @param Hash $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
-	 */
-	public function SetParameters($aParams)
-	{
-		$this->m_aParams = $aParams;
-		foreach($aParams as $sKey => $value)
-		{
-			$this->aReflectionProperties[$sKey] = $value;
-		}
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 * @return mixed|void
-	 * @throws CoreException
-	 * @throws DictExceptionMissingString
-	 * @throws OQLException
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		OQLMenuNode::RenderOQLSearch
-		(
-			$this->sOQL,
-			Dict::S($this->sPageTitle),
-			'Menu_'.$this->GetMenuId(),
-			$this->bSearch, // Search pane
-			$this->bSearchFormOpen, // Search open
-			$oPage, 
-			array_merge($this->m_aParams, $aExtraParams),
-			true
-		);
-	}
-
-	/**
-	 * @param $sOql
-	 * @param $sTitle
-	 * @param $sUsageId
-	 * @param $bSearchPane
-	 * @param $bSearchOpen
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 * @param bool $bEnableBreadcrumb
-	 * @throws CoreException
-	 * @throws DictExceptionMissingString
-	 * @throws OQLException
-	 */
-	public static function RenderOQLSearch($sOql, $sTitle, $sUsageId, $bSearchPane, $bSearchOpen, WebPage $oPage, $aExtraParams = array(), $bEnableBreadcrumb = false)
-	{
-		$sUsageId = utils::GetSafeId($sUsageId);
-		$oSearch = DBObjectSearch::FromOQL($sOql);
-		$sIcon = MetaModel::GetClassIcon($oSearch->GetClass());
-
-		if ($bSearchPane)
-		{
-			$aParams = array_merge(array('open' => $bSearchOpen, 'table_id' => $sUsageId), $aExtraParams);
-			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
-			$oBlock->Display($oPage, 0);
-		}
-		
-		$oPage->add("<p class=\"page-header\">$sIcon ".Dict::S($sTitle)."</p>");
-		
-		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
-		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
-		$oBlock->Display($oPage, $sUsageId);
-
-		if ($bEnableBreadcrumb && ($oPage instanceof iTopWebPage))
-		{
-			// Breadcrumb
-			//$iCount = $oBlock->GetDisplayedCount();
-			$sPageId = "ui-search-".$oSearch->GetClass();
-			$sLabel = MetaModel::GetName($oSearch->GetClass());
-			$oPage->SetBreadCrumbEntry($sPageId, $sLabel, $sTitle, '', '../images/breadcrumb-search.png');
-		}
-	}
-}
-
-/**
- * This class defines a menu item that displays a search form for the given class of objects
- */
-class SearchMenuNode extends MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sPageTitle;
-	/**
-	 * @var string
-	 */
-	protected $sClass;
-
-	/**
-	 * Create a menu item based on an OQL query and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sClass The class of objects to search for
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param bool $bSearch (not used)
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0.0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->sPageTitle = "Menu:$sMenuId+";
-		$this->sClass = $sClass;
-		$this->aReflectionProperties['class'] = $sClass;
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 * @return mixed|void
-	 * @throws DictExceptionMissingString
-	 * @throws Exception
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/search.png');
-
-		$oSearch = new DBObjectSearch($this->sClass);
-		$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
-		$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
-		$oBlock->Display($oPage, 0);
-	}
-}
-
-/**
- * This class defines a menu that points to any web page. It takes only two parameters:
- * - The hyperlink to point to
- * - The name of the menu
- * Note: the parameter menu=xxx (where xxx is the id of the menu itself) will be added to the hyperlink
- * in order to make it the active one, if the target page is based on iTopWebPage and therefore displays the menu
- */
-class WebPageMenuNode extends MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sHyperlink;
-
-	/**
-	 * Create a menu item that points to any web page (not only UI.php)
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sHyperlink URL to the page to load. Use relative URL if you want to keep the application portable !
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $sHyperlink, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->sHyperlink = $sHyperlink;
-		$this->aReflectionProperties['url'] = $sHyperlink;
-	}
-
-	/**
-	 * @param array $aExtraParams
-	 * @return string
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		$aExtraParams['c[menu]'] = $this->GetMenuId();
-		return $this->AddParams( $this->sHyperlink, $aExtraParams);
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param array $aExtraParams
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		assert(false); // Shall never be called, the external web page will handle the display by itself
-	}
-}
-
-/**
- * This class defines a menu that points to the page for creating a new object of the specified class.
- * It take only one parameter: the name of the class
- * Note: the parameter menu=xxx (where xxx is the id of the menu itself) will be added to the hyperlink
- * in order to make it the active one
- */
-class NewObjectMenuNode extends MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sClass;
-
-	/**
-	 * Create a menu item that points to the URL for creating a new object, the menu will be added only if the current user has enough
-	 * rights to create such an object (or an object of a child class)
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sClass URL to the page to load. Use relative URL if you want to keep the application portable !
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param string $sEnableClass
-	 * @param int|null $iActionCode
-	 * @param int $iAllowedResults
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->sClass = $sClass;
-		$this->aReflectionProperties['class'] = $sClass;
-	}
-
-	/**
-	 * @param string[] $aExtraParams
-	 * @return string
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$this->sClass;
-		$aExtraParams['c[menu]'] = $this->GetMenuId();
-		return $this->AddParams($sHyperlink, $aExtraParams);
-	}
-
-	/**
-	 * Overload the check of the "enable" state of this menu to take into account
-	 * derived classes of objects
-	 * @throws CoreException
-	 */
-	public function IsEnabled()
-	{
-		// Enable this menu, only if the current user has enough rights to create such an object, or an object of
-		// any child class
-	
-		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
-		$bActionIsAllowed = false;
-	
-		foreach($aSubClasses as $sCandidateClass)
-		{
-			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
-			{
-				$bActionIsAllowed = true;
-				break; // Enough for now
-			}
-		}
-		return $bActionIsAllowed;		
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param string[] $aExtraParams
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		assert(false); // Shall never be called, the external web page will handle the display by itself
-	}
-}
-
-require_once(APPROOT.'application/dashboard.class.inc.php');
-/**
- * This class defines a menu item which content is based on XML dashboard.
- */
-class DashboardMenuNode extends MenuNode
-{
-	/**
-	 * @var string
-	 */
-	protected $sDashboardFile;
-
-	/**
-	 * Create a menu item based on a custom template and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param string $sDashboardFile
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $sDashboardFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->sDashboardFile = $sDashboardFile;
-		$this->aReflectionProperties['definition_file'] = $sDashboardFile;
-	}
-
-	/**
-	 * @param string[] $aExtraParams
-	 * @return string
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		if ($this->sDashboardFile == '') return '';
-		return parent::GetHyperlink($aExtraParams);
-	}
-
-	/**
-	 * @return null|RuntimeDashboard
-	 * @throws CoreException
-	 * @throws Exception
-	 */
-	public function GetDashboard()
-	{
-		$sDashboardDefinition = @file_get_contents($this->sDashboardFile);		
-		if ($sDashboardDefinition !== false)
-		{
-			$bCustomized = false;
-			
-			// Search for an eventual user defined dashboard, overloading the existing one
-			$oUDSearch = new DBObjectSearch('UserDashboard');
-			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-			$oUDSearch->AddCondition('menu_code', $this->sMenuId, '=');
-			$oUDSet = new DBObjectSet($oUDSearch);
-			if ($oUDSet->Count() > 0)
-			{
-				// Assuming there is at most one couple {user, menu}!
-				$oUserDashboard = $oUDSet->Fetch();
-				$sDashboardDefinition = $oUserDashboard->Get('contents');
-				$bCustomized = true;
-				
-			}
-			$oDashboard = new RuntimeDashboard($this->sMenuId);
-			$oDashboard->FromXml($sDashboardDefinition);
-			$oDashboard->SetCustomFlag($bCustomized);
-		}
-		else
-		{
-			$oDashboard = null;
-		}
-		return $oDashboard;
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param string[] $aExtraParams
-	 * @throws CoreException
-	 * @throws Exception
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null)
-		{
-			$sDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $this->sMenuId);
-			$oPage->add('<div class="dashboard_contents" id="'.$sDivId.'">');
-			$oDashboard->Render($oPage, false, $aExtraParams);
-			$oPage->add('</div>');
-			$oDashboard->RenderEditionTools($oPage);
-
-			if ($oDashboard->GetAutoReload())
-			{
-				$sId = $this->sMenuId;
-				$sExtraParams = json_encode($aExtraParams);
-				$iReloadInterval = 1000 * $oDashboard->GetAutoReloadInterval();
-				$oPage->add_script(
-<<<EOF
-					setInterval("ReloadDashboard('$sDivId');", $iReloadInterval);
-
-					function ReloadDashboard(sDivId)
-					{
-						var oExtraParams = $sExtraParams;
-						// Do not reload when a dialog box is active
-						if (!($('.ui-dialog:visible').length > 0))
-						{
-							$('.dashboard_contents#'+sDivId).block();
-							$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-							   { operation: 'reload_dashboard', dashboard_id: '$sId', extra_params: oExtraParams},
-							   function(data){
-								 $('.dashboard_contents#'+sDivId).html(data);
-								 $('.dashboard_contents#'+sDivId).unblock();
-								}
-							 );
-						}
-					}
-EOF
-				);
-			}
-
-			$bEdit = utils::ReadParam('edit', false);
-			if ($bEdit)
-			{
-				$sId = addslashes($this->sMenuId);
-				$oPage->add_ready_script("EditDashboard('$sId');");
-			}
-			else
-			{
-				$oParentMenu = ApplicationMenu::GetMenuNode($this->iParentIndex);
-				$sParentTitle = $oParentMenu->GetTitle();
-				$sThisTitle = $this->GetTitle();
-				if ($sParentTitle != $sThisTitle)
-				{
-					$sDescription = $sParentTitle.' / '.$sThisTitle;
-				}
-				else
-				{
-					$sDescription = $sThisTitle;
-				}
-				if ($this->sMenuId == ApplicationMenu::GetDefaultMenuId())
-				{
-					$sIcon = '../images/breadcrumb_home.png';
-				}
-				else
-				{
-					$sIcon = '../images/breadcrumb-dashboard.png';
-				}
-				$oPage->SetBreadCrumbEntry("ui-dashboard-".$this->sMenuId, $this->GetTitle(), $sDescription, '', $sIcon);
-			}
-		}
-		else
-		{
-			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @throws CoreException
-	 * @throws Exception
-	 */
-	public function RenderEditor(WebPage $oPage)
-	{
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null)
-		{
-			$oDashboard->RenderEditor($oPage);
-		}
-		else
-		{
-			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-
-	/**
-	 * @param $oDashlet
-	 * @throws Exception
-	 */
-	public function AddDashlet($oDashlet)
-	{
-		$oDashboard = $this->GetDashboard();
-		if ($oDashboard != null)
-		{
-			$oDashboard->AddDashlet($oDashlet);
-			$oDashboard->Save();
-		}
-		else
-		{
-			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
-		}
-	}
-	
-}
-
-/**
- * A shortcut container is the preferred destination of newly created shortcuts
- */
-class ShortcutContainerMenuNode extends MenuNode
-{
-	/**
-	 * @param string[] $aExtraParams
-	 * @return string
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		return '';
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param string[] $aExtraParams
-	 * @return mixed|void
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-	}
-
-	/**
-	 * @throws CoreException
-	 * @throws Exception
-	 */
-	public function PopulateChildMenus()
-	{
-		// Load user shortcuts in DB
-		//
-		$oBMSearch = new DBObjectSearch('Shortcut');
-		$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-		$oBMSet = new DBObjectSet($oBMSearch, array('friendlyname' => true)); // ascending on friendlyname
-		$fRank = 1;
-		while ($oShortcut = $oBMSet->Fetch())
-		{
-			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
-			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
-		}
-	
-		// Complete the tree
-		//
-		parent::PopulateChildMenus();
-	}
-}
-
-
-require_once(APPROOT.'application/shortcut.class.inc.php');
-/**
- * This class defines a menu item which content is a shortcut.
- */
-class ShortcutMenuNode extends MenuNode
-{
-	/**
-	 * @var Shortcut
-	 */
-	protected $oShortcut;
-
-	/**
-	 * Create a menu item based on a custom template and inserts it into the application's main menu
-	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
-	 * @param object $oShortcut Shortcut object
-	 * @param integer $iParentIndex ID of the parent menu
-	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
-	 * @param string $sEnableClass Name of class of object
-	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
-	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
-	 * @param string $sEnableStimulus
-	 */
-	public function __construct($sMenuId, $oShortcut, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
-	{
-		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
-		$this->oShortcut = $oShortcut;
-		$this->aReflectionProperties['shortcut'] = $oShortcut->GetKey();
-	}
-
-	/**
-	 * @param string[] $aExtraParams
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		$sContext = $this->oShortcut->Get('context');
-		$aContext = unserialize($sContext);
-		if (isset($aContext['menu']))
-		{
-			unset($aContext['menu']);
-		}
-		foreach ($aContext as $sArgName => $sArgValue)
-		{
-			$aExtraParams[$sArgName] = $sArgValue;
-		}
-		return parent::GetHyperlink($aExtraParams);
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param string[] $aExtraParams
-	 * @return mixed|void
-	 * @throws DictExceptionMissingString
-	 */
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
-		$this->oShortcut->RenderContent($oPage, $aExtraParams);
-	}
-
-	/**
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function GetTitle()
-	{
-		return $this->oShortcut->Get('name');
-	}
-
-	/**
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function GetLabel()
-	{
-		return $this->oShortcut->Get('name');
-	}
-}
-
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Construction and display of the application's main menu
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/application/template.class.inc.php');
+require_once(APPROOT."/application/user.dashboard.class.inc.php");
+
+
+/**
+ * This class manipulates, stores and displays the navigation menu used in the application
+ * In order to improve the modularity of the data model and to ease the update/migration
+ * between evolving data models, the menus are no longer stored in the database, but are instead
+ * built on the fly each time a page is loaded.
+ * The application's menu is organized into top-level groups with, inside each group, a tree of menu items.
+ * Top level groups do not display any content, they just expand/collapse.
+ * Sub-items drive the actual content of the page, they are based either on templates, OQL queries or full (external?) web pages.
+ *
+ * Example:
+ * Here is how to insert the following items in the application's menu:
+ *   +----------------------------------------+
+ *   | Configuration Management Group         | >> Top level group
+ *   +----------------------------------------+
+ *		+ Configuration Management Overview     >> Template based menu item
+ *		+ Contacts								>> Template based menu item
+ *			+ Persons							>> Plain list (OQL based)
+ *			+ Teams								>> Plain list (OQL based)
+ *
+ * // Create the top-level group. fRank = 1, means it will be inserted after the group '0', which is usually 'Welcome'
+ * $oConfigMgmtMenu = new MenuGroup('ConfigurationManagementMenu', 1);
+ * // Create an entry, based on a custom template, for the Configuration management overview, under the top-level group
+ * new TemplateMenuNode('ConfigurationManagementMenu', '../somedirectory/configuration_management_menu.html', $oConfigMgmtMenu->GetIndex(), 0);
+ * // Create an entry (template based) for the overview of contacts
+ * $oContactsMenu = new TemplateMenuNode('ContactsMenu', '../somedirectory/configuration_management_menu.html',$oConfigMgmtMenu->GetIndex(), 1);
+ * // Plain list of persons
+ * new OQLMenuNode('PersonsMenu', 'SELECT bizPerson', $oContactsMenu->GetIndex(), 0);
+ *
+ */
+ 
+class ApplicationMenu
+{
+	/**
+	 * @var bool
+	 */
+	static $bAdditionalMenusLoaded = false;
+	/**
+	 * @var array
+	 */
+	static $aRootMenus = array();
+	/**
+	 * @var array
+	 */
+	static $aMenusIndex = array();
+	/**
+	 * @var string
+	 */
+	static $sFavoriteSiloQuery = 'SELECT Organization';
+
+	static public function LoadAdditionalMenus()
+	{
+		if (!self::$bAdditionalMenusLoaded)
+		{
+			// Build menus from module handlers
+			//
+			foreach(get_declared_classes() as $sPHPClass)
+			{
+				if (is_subclass_of($sPHPClass, 'ModuleHandlerAPI'))
+				{
+					$aCallSpec = array($sPHPClass, 'OnMenuCreation');
+					call_user_func($aCallSpec);
+				}
+			}
+
+			// Build menus from the menus themselves (e.g. the ShortcutContainerMenuNode will do that)
+			//
+			foreach(self::$aRootMenus as $aMenu)
+			{
+				$oMenuNode = self::GetMenuNode($aMenu['index']);
+				$oMenuNode->PopulateChildMenus();
+			}
+
+			self::$bAdditionalMenusLoaded = true;
+		}
+	}
+
+	/**
+	 * Set the query used to limit the list of displayed organizations in the drop-down menu
+	 * @param $sOQL string The OQL query returning a list of Organization objects
+	 * @return void
+	 */
+	static public function SetFavoriteSiloQuery($sOQL)
+	{
+		self::$sFavoriteSiloQuery = $sOQL;
+	}
+	
+	/**
+	 * Get the query used to limit the list of displayed organizations in the drop-down menu
+	 * @return string The OQL query returning a list of Organization objects
+	 */
+	static public function GetFavoriteSiloQuery()
+	{
+		return self::$sFavoriteSiloQuery;
+	}
+
+	/**
+	 * Check wether a menu Id is enabled or not
+	 * @param $sMenuId
+	 * @throws DictExceptionMissingString
+	 */
+	static public function CheckMenuIdEnabled($sMenuId)
+	{
+		self::LoadAdditionalMenus();
+		$oMenuNode = self::GetMenuNode(self::GetMenuIndexById($sMenuId));
+		if (is_null($oMenuNode) || !$oMenuNode->IsEnabled())
+		{
+			require_once(APPROOT.'/setup/setuppage.class.inc.php');
+			$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+			$oP->add("<h1>".Dict::S('UI:Login:Error:AccessRestricted')."</h1>\n");
+			$oP->p("<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/logoff.php\">".Dict::S('UI:LogOffMenu')."</a>");
+			$oP->output();
+			exit;
+		}
+	}
+
+	/**
+	 * Main function to add a menu entry into the application, can be called during the definition
+	 * of the data model objects
+	 * @param MenuNode $oMenuNode
+	 * @param $iParentIndex
+	 * @param $fRank
+	 * @return int
+	 */
+	static public function InsertMenu(MenuNode $oMenuNode, $iParentIndex, $fRank)
+	{
+		$index = self::GetMenuIndexById($oMenuNode->GetMenuId());
+		if ($index == -1)
+		{
+			// The menu does not already exist, insert it
+			$index = count(self::$aMenusIndex);
+
+			if ($iParentIndex == -1)
+			{
+				$sParentId = '';
+				self::$aRootMenus[] = array ('rank' => $fRank, 'index' => $index);
+			}
+			else
+			{
+				$sParentId = self::$aMenusIndex[$iParentIndex]['node']->GetMenuId();
+				self::$aMenusIndex[$iParentIndex]['children'][] = array ('rank' => $fRank, 'index' => $index);
+			}
+
+			// Note: At the time when 'parent', 'rank' and 'source_file' have been added for the reflection API,
+			//       they were not used to display the menus (redundant or unused)
+			//
+			$aBacktrace = debug_backtrace();
+			$sFile = isset($aBacktrace[2]["file"]) ? $aBacktrace[2]["file"] : $aBacktrace[1]["file"];
+			self::$aMenusIndex[$index] = array('node' => $oMenuNode, 'children' => array(), 'parent' => $sParentId, 'rank' => $fRank, 'source_file' => $sFile);
+		}
+		else
+		{
+			// the menu already exists, let's combine the conditions that make it visible
+			self::$aMenusIndex[$index]['node']->AddCondition($oMenuNode);
+		}
+
+		return $index;
+	}
+
+	/**
+	 * Reflection API - Get menu entries
+	 */
+	static public function ReflectionMenuNodes()
+	{
+		self::LoadAdditionalMenus();
+		return self::$aMenusIndex;
+	}
+
+	/**
+	 * Entry point to display the whole menu into the web page, used by iTopWebPage
+	 * @param $oPage
+	 * @param $aExtraParams
+	 * @throws DictExceptionMissingString
+	 */
+	static public function DisplayMenu($oPage, $aExtraParams)
+	{
+		self::LoadAdditionalMenus();
+		// Sort the root menu based on the rank
+		usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
+		$iAccordion = 0;
+		$iActiveMenu = self::GetMenuIndexById(self::GetActiveNodeId());
+		foreach(self::$aRootMenus as $aMenu)
+		{
+			if (!self::CanDisplayMenu($aMenu)) { continue; }
+			$oMenuNode = self::GetMenuNode($aMenu['index']);
+			$oPage->AddToMenu('<h3 id="'.utils::GetSafeId('AccordionMenu_'.$oMenuNode->GetMenuID()).'">'.$oMenuNode->GetTitle().'</h3>');
+			$oPage->AddToMenu('<div>');
+			$oPage->AddToMenu('<ul>');
+			$aChildren = self::GetChildren($aMenu['index']);
+			$bActive = self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+			$oPage->AddToMenu('</ul>');
+			if ($bActive)
+			{
+$oPage->add_ready_script(
+<<<EOF
+	// Accordion Menu
+	$("#accordion").css({display:'block'}).accordion({ header: "h3", navigation: true, heightStyle: "content", collapsible: true,  active: $iAccordion, icons: false, animate:true }); // collapsible will be enabled once the item will be selected
+EOF
+				);
+			}
+			$oPage->AddToMenu('</div>');
+			$iAccordion++;
+		}
+	}
+
+	/**
+	 * Recursively check if the menu and at least one of his sub-menu is enabled
+	 * @param array $aMenu menu entry
+	 * @return bool true if at least one menu is enabled
+	 */
+	static private function CanDisplayMenu($aMenu)
+	{
+		$oMenuNode = self::GetMenuNode($aMenu['index']);
+		if ($oMenuNode->IsEnabled())
+		{
+			$aChildren = self::GetChildren($aMenu['index']);
+			if (count($aChildren) > 0)
+			{
+				foreach($aChildren as $aSubMenu)
+				{
+					if (self::CanDisplayMenu($aSubMenu))
+					{
+						return true;
+					}
+				}
+			}
+			else
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Handles the display of the sub-menus (called recursively if necessary)
+	 * @param WebPage $oPage
+	 * @param array $aMenus
+	 * @param array $aExtraParams
+	 * @param int $iActiveMenu
+	 * @return true if the currently selected menu is one of the submenus
+	 * @throws DictExceptionMissingString
+	 */
+	static protected function DisplaySubMenu($oPage, $aMenus, $aExtraParams, $iActiveMenu = -1)
+	{
+		// Sort the menu based on the rank
+		$bActive = false;
+		usort($aMenus, array('ApplicationMenu', 'CompareOnRank'));
+		foreach($aMenus as $aMenu)
+		{
+			$index = $aMenu['index'];
+			$oMenu = self::GetMenuNode($index);
+			if ($oMenu->IsEnabled())
+			{
+				$aChildren = self::GetChildren($index);
+				$sCSSClass = (count($aChildren) > 0) ? ' class="submenu"' : '';
+				$sHyperlink = $oMenu->GetHyperlink($aExtraParams);
+				if ($sHyperlink != '')
+				{
+					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'><a href="'.$oMenu->GetHyperlink($aExtraParams).'">'.$oMenu->GetTitle().'</a></li>');
+				}
+				else
+				{
+					$oPage->AddToMenu('<li id="'.utils::GetSafeId('AccordionMenu_'.$oMenu->GetMenuID()).'" '.$sCSSClass.'>'.$oMenu->GetTitle().'</li>');
+				}
+				if ($iActiveMenu == $index)
+				{
+					$bActive = true;
+				}
+				if (count($aChildren) > 0)
+				{
+					$oPage->AddToMenu('<ul>');
+					$bActive |= self::DisplaySubMenu($oPage, $aChildren, $aExtraParams, $iActiveMenu);
+					$oPage->AddToMenu('</ul>');
+				}
+			}
+		}
+		return $bActive;
+	}
+
+	/**
+	 * Helper function to sort the menus based on their rank
+	 * @param $a
+	 * @param $b
+	 * @return int
+	 */
+	static public function CompareOnRank($a, $b)
+	{
+		$result = 1;
+		if ($a['rank'] == $b['rank'])
+		{
+			$result = 0;
+		}
+		if ($a['rank'] < $b['rank'])
+		{
+			$result = -1;
+		}
+		return $result;
+	}
+
+	/**
+	 * Helper function to retrieve the MenuNode Object based on its ID
+	 * @param int $index
+	 * @return MenuNode|null
+	 */
+	static public function GetMenuNode($index)
+	{
+		return isset(self::$aMenusIndex[$index]) ? self::$aMenusIndex[$index]['node'] : null;
+	}
+
+	/**
+	 * Helper function to get the list of child(ren) of a menu
+	 * @param int $index
+	 * @return array
+	 */
+	static public function GetChildren($index)
+	{
+		return self::$aMenusIndex[$index]['children'];
+	}
+
+	/**
+	 * Helper function to get the ID of a menu based on its name
+	 * @param string $sTitle Title of the menu (as passed when creating the menu)
+	 * @return integer ID of the menu, or -1 if not found
+	 */
+	static public function GetMenuIndexById($sTitle)
+	{
+		$index = -1;
+		foreach(self::$aMenusIndex as $aMenu)
+		{
+			if ($aMenu['node']->GetMenuId() == $sTitle)
+			{
+				$index = $aMenu['node']->GetIndex();
+				break;
+			}
+		}
+		return $index;
+	}
+	
+	/**
+	 * Retrieves the currently active menu (if any, otherwise the first menu is the default)
+	 * @return string The Id of the currently active menu
+	 */
+	static public function GetActiveNodeId()
+	{
+		$oAppContext = new ApplicationContext();
+		$sMenuId = $oAppContext->GetCurrentValue('menu', null);		
+		if ($sMenuId  === null)
+		{
+			$sMenuId = self::GetDefaultMenuId();
+		}
+		return $sMenuId;
+	}
+
+	/**
+	 * @return null|string
+	 */
+	static public function GetDefaultMenuId()
+	{
+		static $sDefaultMenuId = null;
+		if (is_null($sDefaultMenuId))
+		{
+			// Make sure the root menu is sorted on 'rank'
+			usort(self::$aRootMenus, array('ApplicationMenu', 'CompareOnRank'));
+			$oFirstGroup = self::GetMenuNode(self::$aRootMenus[0]['index']);
+			$aChildren = self::$aMenusIndex[$oFirstGroup->GetIndex()]['children'];
+			usort($aChildren, array('ApplicationMenu', 'CompareOnRank'));
+			$oMenuNode = self::GetMenuNode($aChildren[0]['index']);
+			$sDefaultMenuId = $oMenuNode->GetMenuId();
+		}
+		return $sDefaultMenuId;
+	}
+
+	/**
+	 * @param $sMenuId
+	 * @return string
+	 */
+	static public function GetRootMenuId($sMenuId)
+	{
+		$iMenuIndex = self::GetMenuIndexById($sMenuId);
+		if ($iMenuIndex == -1)
+		{
+			return '';
+		}
+		$oMenu = ApplicationMenu::GetMenuNode($iMenuIndex);
+		while ($oMenu->GetParentIndex() != -1)
+		{
+			$oMenu = ApplicationMenu::GetMenuNode($oMenu->GetParentIndex());
+		}
+		return $oMenu->GetMenuId();
+	}
+}
+
+/**
+ * Root class for all the kind of node in the menu tree, data model providers are responsible for instantiating
+ * MenuNodes (i.e instances from derived classes) in order to populate the application's menu. Creating an objet
+ * derived from MenuNode is enough to have it inserted in the application's main menu.
+ * The class iTopWebPage, takes care of 3 items:
+ * +--------------------+
+ * | Welcome            |
+ * +--------------------+
+ * 		Welcome To iTop
+ * +--------------------+
+ * | Tools              |
+ * +--------------------+
+ * 		CSV Import
+ * +--------------------+
+ * | Admin Tools        |
+ * +--------------------+
+ *		User Accounts
+ *		Profiles
+ *		Notifications
+ *		Run Queries
+ *		Export
+ *		Data Model
+ *		Universal Search
+ *
+ * All the other menu items must constructed along with the various data model modules
+ */
+abstract class MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sMenuId;
+	/**
+	 * @var int
+	 */
+	protected $index;
+	/**
+	 * @var int
+	 */
+	protected $iParentIndex;
+
+	/**
+	 * Properties reflecting how the node has been declared
+	 */
+	protected $aReflectionProperties;
+
+	/**
+	 * Class of objects to check if the menu is enabled, null if none
+	 */
+	protected $m_aEnableClasses;
+
+	/**
+	 * User Rights Action code to check if the menu is enabled, null if none
+	 */
+	protected $m_aEnableActions;
+
+	/**
+	 * User Rights allowed results (actually a bitmask) to check if the menu is enabled, null if none
+	 */
+	protected $m_aEnableActionResults;
+
+	/**
+	 * Stimulus to check: if the user can 'apply' this stimulus, then she/he can see this menu
+	 */	
+	protected $m_aEnableStimuli;
+
+	/**
+	 * Create a menu item, sets the condition to have it displayed and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param integer $iParentIndex ID of the parent menu, pass -1 for top level (group) items
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param string $sEnableClass Name of class of object
+	 * @param mixed $iActionCode UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus The user can see this menu if she/he has enough rights to apply this stimulus
+	 */
+	public function __construct($sMenuId, $iParentIndex = -1, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		$this->sMenuId = $sMenuId;
+		$this->iParentIndex = $iParentIndex;
+		$this->aReflectionProperties = array();
+		if (strlen($sEnableClass) > 0)
+		{
+			$this->aReflectionProperties['enable_class'] = $sEnableClass;
+			$this->aReflectionProperties['enable_action'] = $iActionCode;
+			$this->aReflectionProperties['enable_permission'] = $iAllowedResults;
+			$this->aReflectionProperties['enable_stimulus'] = $sEnableStimulus;
+		}
+		$this->m_aEnableClasses = array($sEnableClass);
+		$this->m_aEnableActions = array($iActionCode);
+		$this->m_aEnableActionResults = array($iAllowedResults);
+		$this->m_aEnableStimuli = array($sEnableStimulus);
+		$this->index = ApplicationMenu::InsertMenu($this, $iParentIndex, $fRank);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function ReflectionProperties()
+	{
+		return $this->aReflectionProperties;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function GetMenuId()
+	{
+		return $this->sMenuId;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function GetParentIndex()
+	{
+		return $this->iParentIndex;
+	}
+
+	/**
+	 * @return string
+	 * @throws DictExceptionMissingString
+	 */
+	public function GetTitle()
+	{
+		return Dict::S("Menu:$this->sMenuId", str_replace('_', ' ', $this->sMenuId));
+	}
+
+	/**
+	 * @return string
+	 * @throws DictExceptionMissingString
+	 */
+	public function GetLabel()
+	{
+		$sRet = Dict::S("Menu:$this->sMenuId+", "");
+		if ($sRet === '')
+		{
+			if ($this->iParentIndex != -1)
+			{
+				$oParentMenu = ApplicationMenu::GetMenuNode($this->iParentIndex);
+				$sRet = $oParentMenu->GetTitle().' / '.$this->GetTitle();
+			}
+			else
+			{
+				$sRet = $this->GetTitle();
+			}
+			//$sRet = $this->GetTitle();
+		}
+		return $sRet;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function GetIndex()
+	{
+		return $this->index;
+	}
+	
+	public function PopulateChildMenus()
+	{
+		foreach (ApplicationMenu::GetChildren($this->GetIndex()) as $aMenu)
+		{
+			$index = $aMenu['index'];
+			$oMenu = ApplicationMenu::GetMenuNode($index);
+			$oMenu->PopulateChildMenus();
+		}
+	}
+
+	/**
+	 * @param $aExtraParams
+	 * @return string
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		$aExtraParams['c[menu]'] = $this->GetMenuId();
+		return $this->AddParams(utils::GetAbsoluteUrlAppRoot().'pages/UI.php', $aExtraParams);
+	}
+	
+	/**
+	 * Add a limiting display condition for the same menu node. The conditions will be combined with a AND
+	 * @param $oMenuNode MenuNode Another definition of the same menu node, with potentially different access restriction
+	 * @return void
+	 */
+	public function AddCondition(MenuNode $oMenuNode)
+	{
+		foreach($oMenuNode->m_aEnableClasses as $index => $sClass )
+		{
+			$this->m_aEnableClasses[] = $sClass;
+			$this->m_aEnableActions[] = $oMenuNode->m_aEnableActions[$index];
+			$this->m_aEnableActionResults[] = $oMenuNode->m_aEnableActionResults[$index];
+			$this->m_aEnableStimuli[] = $oMenuNode->m_aEnableStimuli[$index];
+		}
+	}
+	/**
+	 * Tells whether the menu is enabled (i.e. displayed) for the current user
+	 * @return bool True if enabled, false otherwise
+	 */
+	public function IsEnabled()
+	{
+		foreach($this->m_aEnableClasses as $index => $sClass)
+		{
+			if ($sClass != null)
+			{
+				if (MetaModel::IsValidClass($sClass))
+				{
+					if ($this->m_aEnableStimuli[$index] != null)
+					{
+						if (!UserRights::IsStimulusAllowed($sClass, $this->m_aEnableStimuli[$index]))
+						{
+							return false;
+						}
+					}
+					if ($this->m_aEnableActions[$index] != null)
+					{
+						// Menus access rights ignore the archive mode
+						utils::PushArchiveMode(false);
+						$iResult = UserRights::IsActionAllowed($sClass, $this->m_aEnableActions[$index]);
+						utils::PopArchiveMode();
+						if (!($iResult & $this->m_aEnableActionResults[$index]))
+						{
+							return false;
+						}
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed
+	 */
+	public abstract function RenderContent(WebPage $oPage, $aExtraParams = array());
+
+	/**
+	 * @param $sHyperlink
+	 * @param $aExtraParams
+	 * @return string
+	 */
+	protected function AddParams($sHyperlink, $aExtraParams)
+	{
+		if (count($aExtraParams) > 0)
+		{
+			$aQuery = array();
+			$sSeparator = '?';
+			if (strpos($sHyperlink, '?') !== false)
+			{
+				$sSeparator = '&';
+			}
+			foreach($aExtraParams as $sName => $sValue)
+			{
+				$aQuery[] = urlencode($sName).'='.urlencode($sValue);
+			}
+			$sHyperlink .= $sSeparator.implode('&', $aQuery);
+		}
+		return $sHyperlink;
+	}
+}
+
+/**
+ * This class implements a top-level menu group. A group is just a container for sub-items
+ * it does not display a page by itself
+ */
+class MenuGroup extends MenuNode
+{
+	/**
+	 * Create a top-level menu group and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param float $fRank Number used to order the list, the groups are sorted based on this value
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $fRank, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, -1 /* no parent, groups are at root level */, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		assert(false); // Shall never be called, groups do not display any content
+	}
+}
+
+/**
+ * This class defines a menu item which content is based on a custom template.
+ * Note the template can be either a local file or an URL !
+ */
+class TemplateMenuNode extends MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sTemplateFile;
+	
+	/**
+	 * Create a menu item based on a custom template and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param string $sTemplateFile Path (or URL) to the file that will be used as a template for displaying the page's content
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $sTemplateFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sTemplateFile = $sTemplateFile;
+		$this->aReflectionProperties['template_file'] = $sTemplateFile;
+	}
+
+	/**
+	 * @param $aExtraParams
+	 * @return string
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		if ($this->sTemplateFile == '') return '';
+		return parent::GetHyperlink($aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed|void
+	 * @throws DictExceptionMissingString
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
+		$sTemplate = @file_get_contents($this->sTemplateFile);
+		if ($sTemplate !== false)
+		{
+			$aExtraParams['table_id'] = 'Menu_'.$this->GetMenuId();
+			$oTemplate = new DisplayTemplate($sTemplate);
+			$oTemplate->Render($oPage, $aExtraParams);
+		}
+		else
+		{
+			$oPage->p("Error: failed to load template file: '{$this->sTemplateFile}'"); // No need to translate ?
+		}
+	}
+}
+
+/**
+ * This class defines a menu item that uses a standard template to display a list of items therefore it allows
+ * only two parameters: the page's title and the OQL expression defining the list of items to be displayed
+ */
+class OQLMenuNode extends MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sPageTitle;
+	/**
+	 * @var string
+	 */
+	protected $sOQL;
+	/**
+	 * @var bool
+	 */
+	protected $bSearch;
+	/**
+	 * @var bool|null
+	 */
+	protected $bSearchFormOpen;
+	
+	/**
+	 * Extra parameters to be passed to the display block to fine tune its appearence
+	 */
+	protected $m_aParams;
+
+
+	/**
+	 * Create a menu item based on an OQL query and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param string $sOQL OQL query defining the set of objects to be displayed
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param bool $bSearch Whether or not to display a (collapsed) search frame at the top of the page
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus
+	 * @param bool $bSearchFormOpen
+	 */
+	public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0.0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bSearchFormOpen = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sPageTitle = "Menu:$sMenuId+";
+		$this->sOQL = $sOQL;
+		$this->bSearch = $bSearch;
+		$this->bSearchFormOpen = $bSearchFormOpen;
+		$this->m_aParams = array();
+		$this->aReflectionProperties['oql'] = $sOQL;
+		$this->aReflectionProperties['do_search'] = $bSearch;
+		// Enhancement: we could set as the "enable" condition that the user has enough rights to "read" the objects
+		// of the class specified by the OQL...
+	}
+	
+	/**
+	 * Set some extra parameters to be passed to the display block to fine tune its appearence
+	 * @param Hash $aParams paramCode => value. See DisplayBlock::GetDisplay for the meaning of the parameters
+	 */
+	public function SetParameters($aParams)
+	{
+		$this->m_aParams = $aParams;
+		foreach($aParams as $sKey => $value)
+		{
+			$this->aReflectionProperties[$sKey] = $value;
+		}
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed|void
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 * @throws OQLException
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
+		OQLMenuNode::RenderOQLSearch
+		(
+			$this->sOQL,
+			Dict::S($this->sPageTitle),
+			'Menu_'.$this->GetMenuId(),
+			$this->bSearch, // Search pane
+			$this->bSearchFormOpen, // Search open
+			$oPage, 
+			array_merge($this->m_aParams, $aExtraParams),
+			true
+		);
+	}
+
+	/**
+	 * @param $sOql
+	 * @param $sTitle
+	 * @param $sUsageId
+	 * @param $bSearchPane
+	 * @param $bSearchOpen
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @param bool $bEnableBreadcrumb
+	 * @throws CoreException
+	 * @throws DictExceptionMissingString
+	 * @throws OQLException
+	 */
+	public static function RenderOQLSearch($sOql, $sTitle, $sUsageId, $bSearchPane, $bSearchOpen, WebPage $oPage, $aExtraParams = array(), $bEnableBreadcrumb = false)
+	{
+		$sUsageId = utils::GetSafeId($sUsageId);
+		$oSearch = DBObjectSearch::FromOQL($sOql);
+		$sIcon = MetaModel::GetClassIcon($oSearch->GetClass());
+
+		if ($bSearchPane)
+		{
+			$aParams = array_merge(array('open' => $bSearchOpen, 'table_id' => $sUsageId), $aExtraParams);
+			$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
+			$oBlock->Display($oPage, 0);
+		}
+		
+		$oPage->add("<p class=\"page-header\">$sIcon ".Dict::S($sTitle)."</p>");
+		
+		$aParams = array_merge(array('table_id' => $sUsageId), $aExtraParams);
+		$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
+		$oBlock->Display($oPage, $sUsageId);
+
+		if ($bEnableBreadcrumb && ($oPage instanceof iTopWebPage))
+		{
+			// Breadcrumb
+			//$iCount = $oBlock->GetDisplayedCount();
+			$sPageId = "ui-search-".$oSearch->GetClass();
+			$sLabel = MetaModel::GetName($oSearch->GetClass());
+			$oPage->SetBreadCrumbEntry($sPageId, $sLabel, $sTitle, '', '../images/breadcrumb-search.png');
+		}
+	}
+}
+
+/**
+ * This class defines a menu item that displays a search form for the given class of objects
+ */
+class SearchMenuNode extends MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sPageTitle;
+	/**
+	 * @var string
+	 */
+	protected $sClass;
+
+	/**
+	 * Create a menu item based on an OQL query and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param string $sClass The class of objects to search for
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param bool $bSearch (not used)
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0.0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sPageTitle = "Menu:$sMenuId+";
+		$this->sClass = $sClass;
+		$this->aReflectionProperties['class'] = $sClass;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 * @return mixed|void
+	 * @throws DictExceptionMissingString
+	 * @throws Exception
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
+		$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', utils::GetAbsoluteUrlAppRoot().'images/search.png');
+
+		$oSearch = new DBObjectSearch($this->sClass);
+		$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
+		$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
+		$oBlock->Display($oPage, 0);
+	}
+}
+
+/**
+ * This class defines a menu that points to any web page. It takes only two parameters:
+ * - The hyperlink to point to
+ * - The name of the menu
+ * Note: the parameter menu=xxx (where xxx is the id of the menu itself) will be added to the hyperlink
+ * in order to make it the active one, if the target page is based on iTopWebPage and therefore displays the menu
+ */
+class WebPageMenuNode extends MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sHyperlink;
+
+	/**
+	 * Create a menu item that points to any web page (not only UI.php)
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param string $sHyperlink URL to the page to load. Use relative URL if you want to keep the application portable !
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $sHyperlink, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sHyperlink = $sHyperlink;
+		$this->aReflectionProperties['url'] = $sHyperlink;
+	}
+
+	/**
+	 * @param array $aExtraParams
+	 * @return string
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		$aExtraParams['c[menu]'] = $this->GetMenuId();
+		return $this->AddParams( $this->sHyperlink, $aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param array $aExtraParams
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		assert(false); // Shall never be called, the external web page will handle the display by itself
+	}
+}
+
+/**
+ * This class defines a menu that points to the page for creating a new object of the specified class.
+ * It take only one parameter: the name of the class
+ * Note: the parameter menu=xxx (where xxx is the id of the menu itself) will be added to the hyperlink
+ * in order to make it the active one
+ */
+class NewObjectMenuNode extends MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sClass;
+
+	/**
+	 * Create a menu item that points to the URL for creating a new object, the menu will be added only if the current user has enough
+	 * rights to create such an object (or an object of a child class)
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param string $sClass URL to the page to load. Use relative URL if you want to keep the application portable !
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param string $sEnableClass
+	 * @param int|null $iActionCode
+	 * @param int $iAllowedResults
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $sClass, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sClass = $sClass;
+		$this->aReflectionProperties['class'] = $sClass;
+	}
+
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		$sHyperlink = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$this->sClass;
+		$aExtraParams['c[menu]'] = $this->GetMenuId();
+		return $this->AddParams($sHyperlink, $aExtraParams);
+	}
+
+	/**
+	 * Overload the check of the "enable" state of this menu to take into account
+	 * derived classes of objects
+	 * @throws CoreException
+	 */
+	public function IsEnabled()
+	{
+		// Enable this menu, only if the current user has enough rights to create such an object, or an object of
+		// any child class
+	
+		$aSubClasses = MetaModel::EnumChildClasses($this->sClass, ENUM_CHILD_CLASSES_ALL); // Including the specified class itself
+		$bActionIsAllowed = false;
+	
+		foreach($aSubClasses as $sCandidateClass)
+		{
+			if (!MetaModel::IsAbstract($sCandidateClass) && (UserRights::IsActionAllowed($sCandidateClass, UR_ACTION_MODIFY) == UR_ALLOWED_YES))
+			{
+				$bActionIsAllowed = true;
+				break; // Enough for now
+			}
+		}
+		return $bActionIsAllowed;		
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		assert(false); // Shall never be called, the external web page will handle the display by itself
+	}
+}
+
+require_once(APPROOT.'application/dashboard.class.inc.php');
+/**
+ * This class defines a menu item which content is based on XML dashboard.
+ */
+class DashboardMenuNode extends MenuNode
+{
+	/**
+	 * @var string
+	 */
+	protected $sDashboardFile;
+
+	/**
+	 * Create a menu item based on a custom template and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param string $sDashboardFile
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $sDashboardFile, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->sDashboardFile = $sDashboardFile;
+		$this->aReflectionProperties['definition_file'] = $sDashboardFile;
+	}
+
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		if ($this->sDashboardFile == '') return '';
+		return parent::GetHyperlink($aExtraParams);
+	}
+
+	/**
+	 * @return null|RuntimeDashboard
+	 * @throws CoreException
+	 * @throws Exception
+	 */
+	public function GetDashboard()
+	{
+		$sDashboardDefinition = @file_get_contents($this->sDashboardFile);		
+		if ($sDashboardDefinition !== false)
+		{
+			$bCustomized = false;
+			
+			// Search for an eventual user defined dashboard, overloading the existing one
+			$oUDSearch = new DBObjectSearch('UserDashboard');
+			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+			$oUDSearch->AddCondition('menu_code', $this->sMenuId, '=');
+			$oUDSet = new DBObjectSet($oUDSearch);
+			if ($oUDSet->Count() > 0)
+			{
+				// Assuming there is at most one couple {user, menu}!
+				$oUserDashboard = $oUDSet->Fetch();
+				$sDashboardDefinition = $oUserDashboard->Get('contents');
+				$bCustomized = true;
+				
+			}
+			$oDashboard = new RuntimeDashboard($this->sMenuId);
+			$oDashboard->FromXml($sDashboardDefinition);
+			$oDashboard->SetCustomFlag($bCustomized);
+		}
+		else
+		{
+			$oDashboard = null;
+		}
+		return $oDashboard;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 * @throws CoreException
+	 * @throws Exception
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
+		$oDashboard = $this->GetDashboard();
+		if ($oDashboard != null)
+		{
+			$sDivId = preg_replace('/[^a-zA-Z0-9_]/', '', $this->sMenuId);
+			$oPage->add('<div class="dashboard_contents" id="'.$sDivId.'">');
+			$oDashboard->Render($oPage, false, $aExtraParams);
+			$oPage->add('</div>');
+			$oDashboard->RenderEditionTools($oPage);
+
+			if ($oDashboard->GetAutoReload())
+			{
+				$sId = $this->sMenuId;
+				$sExtraParams = json_encode($aExtraParams);
+				$iReloadInterval = 1000 * $oDashboard->GetAutoReloadInterval();
+				$oPage->add_script(
+<<<EOF
+					setInterval("ReloadDashboard('$sDivId');", $iReloadInterval);
+
+					function ReloadDashboard(sDivId)
+					{
+						var oExtraParams = $sExtraParams;
+						// Do not reload when a dialog box is active
+						if (!($('.ui-dialog:visible').length > 0))
+						{
+							$('.dashboard_contents#'+sDivId).block();
+							$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+							   { operation: 'reload_dashboard', dashboard_id: '$sId', extra_params: oExtraParams},
+							   function(data){
+								 $('.dashboard_contents#'+sDivId).html(data);
+								 $('.dashboard_contents#'+sDivId).unblock();
+								}
+							 );
+						}
+					}
+EOF
+				);
+			}
+
+			$bEdit = utils::ReadParam('edit', false);
+			if ($bEdit)
+			{
+				$sId = addslashes($this->sMenuId);
+				$oPage->add_ready_script("EditDashboard('$sId');");
+			}
+			else
+			{
+				$oParentMenu = ApplicationMenu::GetMenuNode($this->iParentIndex);
+				$sParentTitle = $oParentMenu->GetTitle();
+				$sThisTitle = $this->GetTitle();
+				if ($sParentTitle != $sThisTitle)
+				{
+					$sDescription = $sParentTitle.' / '.$sThisTitle;
+				}
+				else
+				{
+					$sDescription = $sThisTitle;
+				}
+				if ($this->sMenuId == ApplicationMenu::GetDefaultMenuId())
+				{
+					$sIcon = '../images/breadcrumb_home.png';
+				}
+				else
+				{
+					$sIcon = '../images/breadcrumb-dashboard.png';
+				}
+				$oPage->SetBreadCrumbEntry("ui-dashboard-".$this->sMenuId, $this->GetTitle(), $sDescription, '', $sIcon);
+			}
+		}
+		else
+		{
+			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
+		}
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @throws CoreException
+	 * @throws Exception
+	 */
+	public function RenderEditor(WebPage $oPage)
+	{
+		$oDashboard = $this->GetDashboard();
+		if ($oDashboard != null)
+		{
+			$oDashboard->RenderEditor($oPage);
+		}
+		else
+		{
+			$oPage->p("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
+		}
+	}
+
+	/**
+	 * @param $oDashlet
+	 * @throws Exception
+	 */
+	public function AddDashlet($oDashlet)
+	{
+		$oDashboard = $this->GetDashboard();
+		if ($oDashboard != null)
+		{
+			$oDashboard->AddDashlet($oDashlet);
+			$oDashboard->Save();
+		}
+		else
+		{
+			throw new Exception("Error: failed to load dashboard file: '{$this->sDashboardFile}'");
+		}
+	}
+	
+}
+
+/**
+ * A shortcut container is the preferred destination of newly created shortcuts
+ */
+class ShortcutContainerMenuNode extends MenuNode
+{
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		return '';
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 * @return mixed|void
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+	}
+
+	/**
+	 * @throws CoreException
+	 * @throws Exception
+	 */
+	public function PopulateChildMenus()
+	{
+		// Load user shortcuts in DB
+		//
+		$oBMSearch = new DBObjectSearch('Shortcut');
+		$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+		$oBMSet = new DBObjectSet($oBMSearch, array('friendlyname' => true)); // ascending on friendlyname
+		$fRank = 1;
+		while ($oShortcut = $oBMSet->Fetch())
+		{
+			$sName = $this->GetMenuId().'_'.$oShortcut->GetKey();
+			new ShortcutMenuNode($sName, $oShortcut, $this->GetIndex(), $fRank++);
+		}
+	
+		// Complete the tree
+		//
+		parent::PopulateChildMenus();
+	}
+}
+
+
+require_once(APPROOT.'application/shortcut.class.inc.php');
+/**
+ * This class defines a menu item which content is a shortcut.
+ */
+class ShortcutMenuNode extends MenuNode
+{
+	/**
+	 * @var Shortcut
+	 */
+	protected $oShortcut;
+
+	/**
+	 * Create a menu item based on a custom template and inserts it into the application's main menu
+	 * @param string $sMenuId Unique identifier of the menu (used to identify the menu for bookmarking, and for getting the labels from the dictionary)
+	 * @param object $oShortcut Shortcut object
+	 * @param integer $iParentIndex ID of the parent menu
+	 * @param float $fRank Number used to order the list, any number will do, but for a given level (i.e same parent) all menus are sorted based on this value
+	 * @param string $sEnableClass Name of class of object
+	 * @param integer $iActionCode Either UR_ACTION_READ, UR_ACTION_MODIFY, UR_ACTION_DELETE, UR_ACTION_BULKREAD, UR_ACTION_BULKMODIFY or UR_ACTION_BULKDELETE
+	 * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them...
+	 * @param string $sEnableStimulus
+	 */
+	public function __construct($sMenuId, $oShortcut, $iParentIndex, $fRank = 0.0, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null)
+	{
+		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
+		$this->oShortcut = $oShortcut;
+		$this->aReflectionProperties['shortcut'] = $oShortcut->GetKey();
+	}
+
+	/**
+	 * @param string[] $aExtraParams
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function GetHyperlink($aExtraParams)
+	{
+		$sContext = $this->oShortcut->Get('context');
+		$aContext = unserialize($sContext);
+		if (isset($aContext['menu']))
+		{
+			unset($aContext['menu']);
+		}
+		foreach ($aContext as $sArgName => $sArgValue)
+		{
+			$aExtraParams[$sArgName] = $sArgValue;
+		}
+		return parent::GetHyperlink($aExtraParams);
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param string[] $aExtraParams
+	 * @return mixed|void
+	 * @throws DictExceptionMissingString
+	 */
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		ApplicationMenu::CheckMenuIdEnabled($this->GetMenuId());
+		$this->oShortcut->RenderContent($oPage, $aExtraParams);
+	}
+
+	/**
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function GetTitle()
+	{
+		return $this->oShortcut->Get('name');
+	}
+
+	/**
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function GetLabel()
+	{
+		return $this->oShortcut->Get('name');
+	}
+}
+
diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index b3c023aaf..35ad08e5a 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -1,250 +1,250 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class NiceWebPage
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-/**
- * Web page with some associated CSS and scripts (jquery) for a fancier display
- */
-class NiceWebPage extends WebPage
-{
-	var $m_aReadyScripts;
-	var $m_sRootUrl;
-	
-    public function __construct($s_title, $bPrintable = false)
-    {
-        parent::__construct($s_title, $bPrintable);
-		$this->m_aReadyScripts = array();
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.12.4.min.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
-		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
-		// table sorting
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
-		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/latinise/latinise.min.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
-	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
-
-	    $this->add_dict_entries('UI:Combo');
-
-	    $this->add_ready_script(
-<<< EOF
-	//add new widget called TruncatedList to properly display truncated lists when they are sorted
-	$.tablesorter.addWidget({ 
-		// give the widget a id 
-		id: "truncatedList", 
-		// format is called when the on init and when a sorting has finished 
-		format: function(table)
-		{ 
-			// Check if there is a "truncated" line
-			this.truncatedList = false;  
-			if ($("tr td.truncated",table).length > 0)
-			{
-				this.truncatedList = true;
-			}
-			if (this.truncatedList)
-			{
-				$("tr td",table).removeClass('truncated');
-				$("tr:last td",table).addClass('truncated');
-			}
-		} 
-	});
-	
-	$.tablesorter.addWidget({ 
-		// give the widget a id 
-		id: "myZebra", 
-		// format is called when the on init and when a sorting has finished 
-		format: function(table)
-		{
-			// Replace the 'red even' lines by 'red_even' since most browser do not support 2 classes selector in CSS, etc..
-			$("tbody tr:even",table).addClass('even');
-			$("tbody tr.red:even",table).removeClass('red').removeClass('even').addClass('red_even');
-			$("tbody tr.orange:even",table).removeClass('orange').removeClass('even').addClass('orange_even');
-			$("tbody tr.green:even",table).removeClass('green').removeClass('even').addClass('green_even');
-			// In case we sort again the table, we need to remove the added 'even' classes on odd rows
-			$("tbody tr:odd",table).removeClass('even');
-			$("tbody tr.red_even:odd",table).removeClass('even').removeClass('red_even').addClass('red');
-			$("tbody tr.orange_even:odd",table).removeClass('even').removeClass('orange_even').addClass('orange');
-			$("tbody tr.green_even:odd",table).removeClass('even').removeClass('green_even').addClass('green');
-		} 
-	});
-	$("table.listResults").tableHover(); // hover tables
-EOF
-		);
-		$this->add_saas("css/light-grey.scss");
-
-		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
-     	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
-    	$sAbsURLModulesRoot = addslashes($this->GetAbsoluteUrlModulesRoot());
-    	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
-
-		$sAppContext = addslashes($this->GetApplicationContext());
-
-		$this->add_script(
-<<<EOF
-function GetAbsoluteUrlAppRoot()
-{
-	return '$sAbsURLAppRoot';
-}
-
-function GetAbsoluteUrlModulesRoot()
-{
-	return '$sAbsURLModulesRoot';
-}
-
-function GetAbsoluteUrlModulePage(sModule, sPage, aArguments)
-{
-	// aArguments is optional, it default to an empty hash
-	aArguments = typeof aArguments !== 'undefined' ? aArguments : {};
-
-	var sUrl = '$sAbsURLAppRoot'+'pages/exec.php?exec_module='+sModule+'&exec_page='+sPage+'&exec_env='+'$sEnvironment';
-	for (var sArgName in aArguments)
-	{
-		if (aArguments.hasOwnProperty(sArgName))
-		{
-			sUrl = sUrl + '&'+sArgName+'='+aArguments[sArgname];
-		}
-	}
-	return sUrl;
-}
-
-function AddAppContext(sURL)
-{
-	var sContext = '$sAppContext';
-	if (sContext.length > 0)
-	{
-		if (sURL.indexOf('?') == -1)
-		{
-			return sURL+'?'+sContext;
-		}				
-		return sURL+'&'+sContext;
-	}
-	return sURL;
-}
-EOF
-		);
-	}
-	
-    public function SetRootUrl($sRootUrl)
-    {
-    	$this->m_sRootUrl = $sRootUrl;
-    }
-    
-	public function small_p($sText)
-	{
-		$this->add("<p style=\"font-size:smaller\">$sText</p>\n");
-	}
-
-	public function GetAbsoluteUrlAppRoot()
-	{
-		return utils::GetAbsoluteUrlAppRoot();
-	}
-
-	public function GetAbsoluteUrlModulesRoot()
-	{
-		return utils::GetAbsoluteUrlModulesRoot();
-	}
-
-	function GetApplicationContext()
-	{
-		$oAppContext = new ApplicationContext();
-		return $oAppContext->GetForLink();
-	}
-
-	// By Rom, used by CSVImport and Advanced search
-	public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
-	{
-		// $aTopLevelClasses = array('bizService', 'bizContact', 'logInfra', 'bizDocument');
-		// These are classes wich root class is cmdbAbstractObject ! 
-		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
-		$aValidClasses = array();
-		foreach(MetaModel::GetClasses('bizmodel') as $sClassName)
-		{
-			if (is_null($iActionCode) || UserRights::IsActionAllowed($sClassName, $iActionCode))
-			{
-				$sSelected = ($sClassName == $sDefaultValue) ? " SELECTED" : "";
-				$sDescription = MetaModel::GetClassDescription($sClassName);
-				$sDisplayName = MetaModel::GetName($sClassName);
-				$aValidClasses[$sDisplayName] = "<option style=\"width: ".$iWidthPx." px;\" title=\"$sDescription\" value=\"$sClassName\"$sSelected>$sDisplayName</option>";
-			}
-		}
-		ksort($aValidClasses);
-		$this->add(implode("\n", $aValidClasses));
-		
-		$this->add("</select>");
-	}
-
-	// By Rom, used by Advanced search
-	public function add_select($aChoices, $sName, $sDefaultValue, $iWidthPx)
-	{
-		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
-		foreach($aChoices as $sKey => $sValue)
-		{
-			$sSelected = ($sKey == $sDefaultValue) ? " SELECTED" : "";
-			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."</option>");
-		}
-		$this->add("</select>");
-	}
-	
-	public function add_ready_script($sScript)
-	{
-		$this->m_aReadyScripts[] = $sScript;
-	}
-	
-		/**
-	 * Outputs (via some echo) the complete HTML page by assembling all its elements
-	 */
-    public function output()
-    {
-		//$this->set_base($this->m_sRootUrl.'pages/');
-        if (count($this->m_aReadyScripts)>0)
-        {
-			$this->add_script("\$(document).ready(function() {\n".implode("\n", $this->m_aReadyScripts)."\n});");
-		}
-		parent::output();
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class NiceWebPage
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+/**
+ * Web page with some associated CSS and scripts (jquery) for a fancier display
+ */
+class NiceWebPage extends WebPage
+{
+	var $m_aReadyScripts;
+	var $m_sRootUrl;
+	
+    public function __construct($s_title, $bPrintable = false)
+    {
+        parent::__construct($s_title, $bPrintable);
+		$this->m_aReadyScripts = array();
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-1.12.4.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate-1.4.1.min.js'); // Needed since many other plugins still rely on oldies like $.browser
+		$this->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/ui-lightness/jquery-ui-1.11.4.custom.css');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui-1.11.4.custom.min.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
+		// table sorting
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablesorter.pager.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.tablehover.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/datatable.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.positionBy.js');
+		$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.popupmenu.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/searchformforeignkeys.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/latinise/latinise.min.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_handler_history.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_raw.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_string.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_field.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_numeric.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_enum.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_external_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_hierarchical_key.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_abstract.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date.js');
+	    $this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/search/search_form_criteria_date_time.js');
+
+	    $this->add_dict_entries('UI:Combo');
+
+	    $this->add_ready_script(
+<<< EOF
+	//add new widget called TruncatedList to properly display truncated lists when they are sorted
+	$.tablesorter.addWidget({ 
+		// give the widget a id 
+		id: "truncatedList", 
+		// format is called when the on init and when a sorting has finished 
+		format: function(table)
+		{ 
+			// Check if there is a "truncated" line
+			this.truncatedList = false;  
+			if ($("tr td.truncated",table).length > 0)
+			{
+				this.truncatedList = true;
+			}
+			if (this.truncatedList)
+			{
+				$("tr td",table).removeClass('truncated');
+				$("tr:last td",table).addClass('truncated');
+			}
+		} 
+	});
+	
+	$.tablesorter.addWidget({ 
+		// give the widget a id 
+		id: "myZebra", 
+		// format is called when the on init and when a sorting has finished 
+		format: function(table)
+		{
+			// Replace the 'red even' lines by 'red_even' since most browser do not support 2 classes selector in CSS, etc..
+			$("tbody tr:even",table).addClass('even');
+			$("tbody tr.red:even",table).removeClass('red').removeClass('even').addClass('red_even');
+			$("tbody tr.orange:even",table).removeClass('orange').removeClass('even').addClass('orange_even');
+			$("tbody tr.green:even",table).removeClass('green').removeClass('even').addClass('green_even');
+			// In case we sort again the table, we need to remove the added 'even' classes on odd rows
+			$("tbody tr:odd",table).removeClass('even');
+			$("tbody tr.red_even:odd",table).removeClass('even').removeClass('red_even').addClass('red');
+			$("tbody tr.orange_even:odd",table).removeClass('even').removeClass('orange_even').addClass('orange');
+			$("tbody tr.green_even:odd",table).removeClass('even').removeClass('green_even').addClass('green');
+		} 
+	});
+	$("table.listResults").tableHover(); // hover tables
+EOF
+		);
+		$this->add_saas("css/light-grey.scss");
+
+		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
+     	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
+    	$sAbsURLModulesRoot = addslashes($this->GetAbsoluteUrlModulesRoot());
+    	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
+
+		$sAppContext = addslashes($this->GetApplicationContext());
+
+		$this->add_script(
+<<<EOF
+function GetAbsoluteUrlAppRoot()
+{
+	return '$sAbsURLAppRoot';
+}
+
+function GetAbsoluteUrlModulesRoot()
+{
+	return '$sAbsURLModulesRoot';
+}
+
+function GetAbsoluteUrlModulePage(sModule, sPage, aArguments)
+{
+	// aArguments is optional, it default to an empty hash
+	aArguments = typeof aArguments !== 'undefined' ? aArguments : {};
+
+	var sUrl = '$sAbsURLAppRoot'+'pages/exec.php?exec_module='+sModule+'&exec_page='+sPage+'&exec_env='+'$sEnvironment';
+	for (var sArgName in aArguments)
+	{
+		if (aArguments.hasOwnProperty(sArgName))
+		{
+			sUrl = sUrl + '&'+sArgName+'='+aArguments[sArgname];
+		}
+	}
+	return sUrl;
+}
+
+function AddAppContext(sURL)
+{
+	var sContext = '$sAppContext';
+	if (sContext.length > 0)
+	{
+		if (sURL.indexOf('?') == -1)
+		{
+			return sURL+'?'+sContext;
+		}				
+		return sURL+'&'+sContext;
+	}
+	return sURL;
+}
+EOF
+		);
+	}
+	
+    public function SetRootUrl($sRootUrl)
+    {
+    	$this->m_sRootUrl = $sRootUrl;
+    }
+    
+	public function small_p($sText)
+	{
+		$this->add("<p style=\"font-size:smaller\">$sText</p>\n");
+	}
+
+	public function GetAbsoluteUrlAppRoot()
+	{
+		return utils::GetAbsoluteUrlAppRoot();
+	}
+
+	public function GetAbsoluteUrlModulesRoot()
+	{
+		return utils::GetAbsoluteUrlModulesRoot();
+	}
+
+	function GetApplicationContext()
+	{
+		$oAppContext = new ApplicationContext();
+		return $oAppContext->GetForLink();
+	}
+
+	// By Rom, used by CSVImport and Advanced search
+	public function MakeClassesSelect($sName, $sDefaultValue, $iWidthPx, $iActionCode = null)
+	{
+		// $aTopLevelClasses = array('bizService', 'bizContact', 'logInfra', 'bizDocument');
+		// These are classes wich root class is cmdbAbstractObject ! 
+		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
+		$aValidClasses = array();
+		foreach(MetaModel::GetClasses('bizmodel') as $sClassName)
+		{
+			if (is_null($iActionCode) || UserRights::IsActionAllowed($sClassName, $iActionCode))
+			{
+				$sSelected = ($sClassName == $sDefaultValue) ? " SELECTED" : "";
+				$sDescription = MetaModel::GetClassDescription($sClassName);
+				$sDisplayName = MetaModel::GetName($sClassName);
+				$aValidClasses[$sDisplayName] = "<option style=\"width: ".$iWidthPx." px;\" title=\"$sDescription\" value=\"$sClassName\"$sSelected>$sDisplayName</option>";
+			}
+		}
+		ksort($aValidClasses);
+		$this->add(implode("\n", $aValidClasses));
+		
+		$this->add("</select>");
+	}
+
+	// By Rom, used by Advanced search
+	public function add_select($aChoices, $sName, $sDefaultValue, $iWidthPx)
+	{
+		$this->add("<select id=\"select_$sName\" name=\"$sName\">");
+		foreach($aChoices as $sKey => $sValue)
+		{
+			$sSelected = ($sKey == $sDefaultValue) ? " SELECTED" : "";
+			$this->add("<option style=\"width: ".$iWidthPx." px;\" value=\"".htmlspecialchars($sKey)."\"$sSelected>".htmlentities($sValue, ENT_QUOTES, 'UTF-8')."</option>");
+		}
+		$this->add("</select>");
+	}
+	
+	public function add_ready_script($sScript)
+	{
+		$this->m_aReadyScripts[] = $sScript;
+	}
+	
+		/**
+	 * Outputs (via some echo) the complete HTML page by assembling all its elements
+	 */
+    public function output()
+    {
+		//$this->set_base($this->m_sRootUrl.'pages/');
+        if (count($this->m_aReadyScripts)>0)
+        {
+			$this->add_script("\$(document).ready(function() {\n".implode("\n", $this->m_aReadyScripts)."\n});");
+		}
+		parent::output();
+	}
+}
+
+?>
diff --git a/application/query.class.inc.php b/application/query.class.inc.php
index 91cc08d0b..cfe8f640b 100644
--- a/application/query.class.inc.php
+++ b/application/query.class.inc.php
@@ -1,141 +1,141 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Event and derived
- * Application internal events
- * There is also a file log 
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-abstract class Query extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_query",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
-		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class QueryOQL extends Query
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_query_oql",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
-	}
-
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
-		
-		if (!$bEditMode)
-		{
-			$sFields = trim($this->Get('fields'));
-			$bExportV1Recommended = ($sFields == '');
-			if ($bExportV1Recommended)
-			{
-				$oFieldAttDef = MetaModel::GetAttributeDef('QueryOQL', 'fields');
-				$oPage->add('<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:Query:UrlV1', $oFieldAttDef->GetLabel()).'</div></div>');
-				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
-			}
-			else 
-			{
-				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
-			}
-			$sOql = $this->Get('oql');
-			$sMessage = null;
-			try
-			{
-				$oSearch = DBObjectSearch::FromOQL($sOql);
-				$aParameters = $oSearch->GetQueryParams();
-				foreach($aParameters as $sParam => $val)
-				{
-					$sUrl .= '&arg_'.$sParam.'=["'.$sParam.'"]';
-				}
-
-				$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');
-
-				if (count($aParameters) == 0)
-				{
-					$oBlock = new DisplayBlock($oSearch, 'list');
-					$aExtraParams = array(
-						//'menu' => $sShowMenu,
-						'table_id' => 'query_preview_'.$this->getKey(),
-					);
-					$sBlockId = 'block_query_preview_'.$this->GetKey(); // make a unique id (edition occuring in the same DOM)
-					$oBlock->Display($oPage, $sBlockId, $aExtraParams);
-				}
-			}
-			catch (OQLException $e)
-			{
-				$sMessage = '<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</div></div>';
-				$oPage->p($sMessage);
-			}
-		}
-		return $aFieldsMap;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Event and derived
+ * Application internal events
+ * There is also a file log 
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+abstract class Query extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_query",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeText("fields", array("allowed_values"=>null, "sql"=>"fields", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'fields')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description')); // Criteria of the default search form
+		// MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class QueryOQL extends Query
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,application,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_query_oql",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'oql', 'fields')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'fields', 'oql')); // Criteria of the std search form
+	}
+
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		
+		if (!$bEditMode)
+		{
+			$sFields = trim($this->Get('fields'));
+			$bExportV1Recommended = ($sFields == '');
+			if ($bExportV1Recommended)
+			{
+				$oFieldAttDef = MetaModel::GetAttributeDef('QueryOQL', 'fields');
+				$oPage->add('<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:Query:UrlV1', $oFieldAttDef->GetLabel()).'</div></div>');
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?format=spreadsheet&login_mode=basic&query='.$this->GetKey();
+			}
+			else 
+			{
+				$sUrl = utils::GetAbsoluteUrlAppRoot().'webservices/export-v2.php?format=spreadsheet&login_mode=basic&date_format='.urlencode((string)AttributeDateTime::GetFormat()).'&query='.$this->GetKey();
+			}
+			$sOql = $this->Get('oql');
+			$sMessage = null;
+			try
+			{
+				$oSearch = DBObjectSearch::FromOQL($sOql);
+				$aParameters = $oSearch->GetQueryParams();
+				foreach($aParameters as $sParam => $val)
+				{
+					$sUrl .= '&arg_'.$sParam.'=["'.$sParam.'"]';
+				}
+
+				$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');
+
+				if (count($aParameters) == 0)
+				{
+					$oBlock = new DisplayBlock($oSearch, 'list');
+					$aExtraParams = array(
+						//'menu' => $sShowMenu,
+						'table_id' => 'query_preview_'.$this->getKey(),
+					);
+					$sBlockId = 'block_query_preview_'.$this->GetKey(); // make a unique id (edition occuring in the same DOM)
+					$oBlock->Display($oPage, $sBlockId, $aExtraParams);
+				}
+			}
+			catch (OQLException $e)
+			{
+				$sMessage = '<div class="message message_error" style="padding-left: 30px;"><div style="padding: 10px;">'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</div></div>';
+				$oPage->p($sMessage);
+			}
+		}
+		return $aFieldsMap;
+	}
+}
+
+?>
diff --git a/application/shortcut.class.inc.php b/application/shortcut.class.inc.php
index 282fae897..a92e6ba75 100644
--- a/application/shortcut.class.inc.php
+++ b/application/shortcut.class.inc.php
@@ -1,338 +1,338 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Shortcut and derived
- * Shortcuts of any kind
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-abstract class Shortcut extends DBObject implements iDisplay
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "gui,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_shortcut",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("context", array("allowed_values"=>null, "sql"=>"context", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'context')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	abstract public function RenderContent(WebPage $oPage, $aExtraParams = array());
-
-	protected function OnInsert()
-	{
-		$this->Set('user_id', UserRights::GetUserId());
-	}
-
-	public function StartRenameDialog($oPage)
-	{
-		$oPage->add('<div id="shortcut_rename_dlg">');
-
-		$oForm = new DesignerForm();
-		$sDefault = $this->Get('name');
-		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
-		$oField->SetMandatory(true);
-		$oForm->AddField($oField);
-		$oForm->Render($oPage);
-		$oPage->add('</div>');
-		
-		$sDialogTitle = Dict::S('UI:ShortcutRenameDlg:Title');
-		$sOkButtonLabel = Dict::S('UI:Button:Ok');
-		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-		$iShortcut = $this->GetKey();
-		
-		$oPage->add_ready_script(
-<<<EOF
-function ShortcutRenameOK() 
-{
-	var oForm = $(this).find('form');
-	var sFormId = oForm.attr('id');
-	var oParams = null;
-	var aErrors = ValidateForm(sFormId, false);
-	if (aErrors.length == 0)
-	{
-		oParams = ReadFormParams(sFormId);
-	}
-	oParams.operation = 'shortcut_rename_go';
-	oParams.id = $iShortcut;
-	var me = $(this);
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
-		me.dialog( "close" );
-		me.remove();
-		$('body').append(data);
-	});
-}
-
-$('#shortcut_rename_dlg form').bind('submit', function() { return false; });
-
-$('#shortcut_rename_dlg').dialog({
-	width: 400,
-	modal: true,
-	title: '$sDialogTitle',
-	buttons: [
-	{ text: "$sOkButtonLabel", click: ShortcutRenameOK},
-	{ text: "$sCancelButtonLabel", click: function() {
-		$(this).dialog( "close" ); $(this).remove();
-	} },
-	],
-	close: function() { $(this).remove(); }
-});
-EOF
-		);
-	}
-
-	// Minimual implementation of iDisplay: to make the shortcut be listable
-	//
-	public static function MapContextParam($sContextParam)
-	{
-		return (($sContextParam == 'menu') ? null : $sContextParam);
-	}
-
-	public function GetHilightClass()
-	{
-		return HILIGHT_CLASS_NONE;
-	}
-
-	public static function GetUIPage()
-	{
-		return '';
-	}
-
-	function DisplayDetails(WebPage $oPage, $bEditMode = false)
-	{
-	}
-
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		return array();
-	}
-	// End of the minimal implementation of iDisplay
-}
-
-class ShortcutOQL extends Shortcut
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "gui,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_shortcut_oql",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("auto_reload", array("allowed_values"=>new ValueSetEnum('none,custom'), "sql"=>"auto_reload", "default_value"=>"none", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("auto_reload_sec", array("allowed_values"=>null, "sql"=>"auto_reload_sec", "default_value"=>60, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'context', 'oql')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	public function RenderContent(WebPage $oPage, $aExtraParams = array())
-	{
-		$oPage->set_title($this->Get('name'));
-
-		switch($this->Get('auto_reload'))
-		{
-		case 'custom':
-			$iRate = (int)$this->Get('auto_reload_sec');
-			if ($iRate > 0)
-			{
-				// Must a string otherwise it can be evaluated to 'true' and defaults to "standard" refresh rate!
-				$aExtraParams['auto_reload'] = (string)$iRate;
-			}
-			break;
-
-		default:
-		case 'none':
-		}
-
-		$bSearchPane = true;
-		$bSearchOpen = true;
-		try
-		{
-			OQLMenuNode::RenderOQLSearch($this->Get('oql'), $this->Get('name'), 'shortcut_'.$this->GetKey(), $bSearchPane, $bSearchOpen, $oPage, $aExtraParams, true);
-		}
-		catch (Exception $e)
-		{
-			throw new Exception("The OQL shortcut '".$this->Get('name')."' (id: ".$this->GetKey().") could not be displayed: ".$e->getMessage());
-		}
-			
-	}
-
-	public function CloneTableSettings($sTableSettings)
-	{
-		$aTableSettings = json_decode($sTableSettings, true);
-
-		$oFilter = DBObjectSearch::FromOQL($this->Get('oql'));
-		$oCustomSettings = new DataTableSettings($oFilter->GetSelectedClasses());
-		$oCustomSettings->iDefaultPageSize = $aTableSettings['iPageSize'];
-		$oCustomSettings->aColumns = $aTableSettings['oColumns'];
-		$oCustomSettings->Save('shortcut_'.$this->GetKey());
-	}
-
-	public static function GetCreationForm($sOQL = null, $sTableSettings = null)
-	{
-		$oForm = new DesignerForm();
-
-		// Find a unique default name
-		// -> The class of the query + an index if necessary
-		if ($sOQL == null)
-		{
-			$sDefault = '';
-		}
-		else
-		{
-			$oBMSearch = new DBObjectSearch('Shortcut');
-			$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
-			$oBMSet = new DBObjectSet($oBMSearch);
-			$aNames = $oBMSet->GetColumnAsArray('name');
-	 		$oSearch = DBObjectSearch::FromOQL($sOQL);
-			$sDefault = utils::MakeUniqueName($oSearch->GetClass(), $aNames);
-		}
-
-		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
-		$oField->SetMandatory(true);
-		$oForm->AddField($oField);
-
-		/*
-		$oField = new DesignerComboField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), 'none');
-		$oAttDef = MetaModel::GetAttributeDef(__class__, 'auto_reload');
-		$oField->SetAllowedValues($oAttDef->GetAllowedValues());
-		$oField->SetMandatory(true);
-		$oForm->AddField($oField);
-		*/
-		$oField = new DesignerBooleanField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), false);
-		$oForm->AddField($oField);
-
-		$oField = new DesignerIntegerField('auto_reload_sec', Dict::S('Class:ShortcutOQL/Attribute:auto_reload_sec'), MetaModel::GetConfig()->GetStandardReloadInterval());
-		$oField->SetBoundaries(MetaModel::GetConfig()->Get('min_reload_interval'), null); // no upper limit
-		$oField->SetMandatory(false);
-		$oForm->AddField($oField);
-
-		$oField = new DesignerHiddenField('oql', '', $sOQL);
-		$oForm->AddField($oField);
-
-		$oField = new DesignerHiddenField('table_settings', '', $sTableSettings);
-		$oForm->AddField($oField);
-
-		return $oForm;
-	}
-
-	public static function GetCreationDlgFromOQL($oPage, $sOQL, $sTableSettings)
-	{
-		$oPage->add('<div id="shortcut_creation_dlg">');
-
-		$oForm = self::GetCreationForm($sOQL, $sTableSettings);
-
-		$oForm->Render($oPage);
-		$oPage->add('</div>');
-		
-		$sDialogTitle = Dict::S('UI:ShortcutListDlg:Title');
-		$sOkButtonLabel = Dict::S('UI:Button:Ok');
-		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-		
-		$oAppContext = new ApplicationContext();
-		$sContext = $oAppContext->GetForLink();
-
-		$sRateTitle = addslashes(Dict::Format('Class:ShortcutOQL/Attribute:auto_reload_sec/tip', MetaModel::GetConfig()->Get('min_reload_interval')));
-
-		$oPage->add_ready_script(
-<<<EOF
-
-// Note: the title gets deleted by the validation mechanism
-$("#attr_auto_reload_sec").tooltip({items: 'input', content: '$sRateTitle'});
-$("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
-
-$('#attr_auto_reload').change( function(ev) {
-	$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
-} );
-
-function ShortcutCreationOK() 
-{
-	var oForm = $('#shortcut_creation_dlg form');
-	var sFormId = oForm.attr('id');
-	var oParams = null;
-	var aErrors = ValidateForm(sFormId, false);
-	if (aErrors.length == 0)
-	{
-		oParams = ReadFormParams(sFormId);
-	}
-	oParams.operation = 'shortcut_list_create';
-	var me = $('#shortcut_creation_dlg');
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?$sContext', oParams, function(data) {
-		me.dialog( "close" );
-		me.remove();
-		$('body').append(data);
-	});
-}
-
-$('#shortcut_creation_dlg form').bind('submit', function() { ShortcutCreationOK(); return false; });
-
-$('#shortcut_creation_dlg').dialog({
-	width: 400,
-	modal: true,
-	title: '$sDialogTitle',
-	buttons: [
-	{ text: "$sOkButtonLabel", click: ShortcutCreationOK },
-	{ text: "$sCancelButtonLabel", click: function() {
-		$(this).dialog( "close" ); $(this).remove();
-	} },
-	],
-	close: function() { $(this).remove(); }
-});
-EOF
-		);
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Shortcut and derived
+ * Shortcuts of any kind
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+abstract class Shortcut extends DBObject implements iDisplay
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "gui,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_shortcut",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("context", array("allowed_values"=>null, "sql"=>"context", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'context')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	abstract public function RenderContent(WebPage $oPage, $aExtraParams = array());
+
+	protected function OnInsert()
+	{
+		$this->Set('user_id', UserRights::GetUserId());
+	}
+
+	public function StartRenameDialog($oPage)
+	{
+		$oPage->add('<div id="shortcut_rename_dlg">');
+
+		$oForm = new DesignerForm();
+		$sDefault = $this->Get('name');
+		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
+		$oField->SetMandatory(true);
+		$oForm->AddField($oField);
+		$oForm->Render($oPage);
+		$oPage->add('</div>');
+		
+		$sDialogTitle = Dict::S('UI:ShortcutRenameDlg:Title');
+		$sOkButtonLabel = Dict::S('UI:Button:Ok');
+		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
+		$iShortcut = $this->GetKey();
+		
+		$oPage->add_ready_script(
+<<<EOF
+function ShortcutRenameOK() 
+{
+	var oForm = $(this).find('form');
+	var sFormId = oForm.attr('id');
+	var oParams = null;
+	var aErrors = ValidateForm(sFormId, false);
+	if (aErrors.length == 0)
+	{
+		oParams = ReadFormParams(sFormId);
+	}
+	oParams.operation = 'shortcut_rename_go';
+	oParams.id = $iShortcut;
+	var me = $(this);
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function(data) {
+		me.dialog( "close" );
+		me.remove();
+		$('body').append(data);
+	});
+}
+
+$('#shortcut_rename_dlg form').bind('submit', function() { return false; });
+
+$('#shortcut_rename_dlg').dialog({
+	width: 400,
+	modal: true,
+	title: '$sDialogTitle',
+	buttons: [
+	{ text: "$sOkButtonLabel", click: ShortcutRenameOK},
+	{ text: "$sCancelButtonLabel", click: function() {
+		$(this).dialog( "close" ); $(this).remove();
+	} },
+	],
+	close: function() { $(this).remove(); }
+});
+EOF
+		);
+	}
+
+	// Minimual implementation of iDisplay: to make the shortcut be listable
+	//
+	public static function MapContextParam($sContextParam)
+	{
+		return (($sContextParam == 'menu') ? null : $sContextParam);
+	}
+
+	public function GetHilightClass()
+	{
+		return HILIGHT_CLASS_NONE;
+	}
+
+	public static function GetUIPage()
+	{
+		return '';
+	}
+
+	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+	}
+
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		return array();
+	}
+	// End of the minimal implementation of iDisplay
+}
+
+class ShortcutOQL extends Shortcut
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "gui,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_shortcut_oql",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeOQL("oql", array("allowed_values"=>null, "sql"=>"oql", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("auto_reload", array("allowed_values"=>new ValueSetEnum('none,custom'), "sql"=>"auto_reload", "default_value"=>"none", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("auto_reload_sec", array("allowed_values"=>null, "sql"=>"auto_reload_sec", "default_value"=>60, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'context', 'oql')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	public function RenderContent(WebPage $oPage, $aExtraParams = array())
+	{
+		$oPage->set_title($this->Get('name'));
+
+		switch($this->Get('auto_reload'))
+		{
+		case 'custom':
+			$iRate = (int)$this->Get('auto_reload_sec');
+			if ($iRate > 0)
+			{
+				// Must a string otherwise it can be evaluated to 'true' and defaults to "standard" refresh rate!
+				$aExtraParams['auto_reload'] = (string)$iRate;
+			}
+			break;
+
+		default:
+		case 'none':
+		}
+
+		$bSearchPane = true;
+		$bSearchOpen = true;
+		try
+		{
+			OQLMenuNode::RenderOQLSearch($this->Get('oql'), $this->Get('name'), 'shortcut_'.$this->GetKey(), $bSearchPane, $bSearchOpen, $oPage, $aExtraParams, true);
+		}
+		catch (Exception $e)
+		{
+			throw new Exception("The OQL shortcut '".$this->Get('name')."' (id: ".$this->GetKey().") could not be displayed: ".$e->getMessage());
+		}
+			
+	}
+
+	public function CloneTableSettings($sTableSettings)
+	{
+		$aTableSettings = json_decode($sTableSettings, true);
+
+		$oFilter = DBObjectSearch::FromOQL($this->Get('oql'));
+		$oCustomSettings = new DataTableSettings($oFilter->GetSelectedClasses());
+		$oCustomSettings->iDefaultPageSize = $aTableSettings['iPageSize'];
+		$oCustomSettings->aColumns = $aTableSettings['oColumns'];
+		$oCustomSettings->Save('shortcut_'.$this->GetKey());
+	}
+
+	public static function GetCreationForm($sOQL = null, $sTableSettings = null)
+	{
+		$oForm = new DesignerForm();
+
+		// Find a unique default name
+		// -> The class of the query + an index if necessary
+		if ($sOQL == null)
+		{
+			$sDefault = '';
+		}
+		else
+		{
+			$oBMSearch = new DBObjectSearch('Shortcut');
+			$oBMSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
+			$oBMSet = new DBObjectSet($oBMSearch);
+			$aNames = $oBMSet->GetColumnAsArray('name');
+	 		$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$sDefault = utils::MakeUniqueName($oSearch->GetClass(), $aNames);
+		}
+
+		$oField = new DesignerTextField('name', Dict::S('Class:Shortcut/Attribute:name'), $sDefault);
+		$oField->SetMandatory(true);
+		$oForm->AddField($oField);
+
+		/*
+		$oField = new DesignerComboField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), 'none');
+		$oAttDef = MetaModel::GetAttributeDef(__class__, 'auto_reload');
+		$oField->SetAllowedValues($oAttDef->GetAllowedValues());
+		$oField->SetMandatory(true);
+		$oForm->AddField($oField);
+		*/
+		$oField = new DesignerBooleanField('auto_reload', Dict::S('Class:ShortcutOQL/Attribute:auto_reload'), false);
+		$oForm->AddField($oField);
+
+		$oField = new DesignerIntegerField('auto_reload_sec', Dict::S('Class:ShortcutOQL/Attribute:auto_reload_sec'), MetaModel::GetConfig()->GetStandardReloadInterval());
+		$oField->SetBoundaries(MetaModel::GetConfig()->Get('min_reload_interval'), null); // no upper limit
+		$oField->SetMandatory(false);
+		$oForm->AddField($oField);
+
+		$oField = new DesignerHiddenField('oql', '', $sOQL);
+		$oForm->AddField($oField);
+
+		$oField = new DesignerHiddenField('table_settings', '', $sTableSettings);
+		$oForm->AddField($oField);
+
+		return $oForm;
+	}
+
+	public static function GetCreationDlgFromOQL($oPage, $sOQL, $sTableSettings)
+	{
+		$oPage->add('<div id="shortcut_creation_dlg">');
+
+		$oForm = self::GetCreationForm($sOQL, $sTableSettings);
+
+		$oForm->Render($oPage);
+		$oPage->add('</div>');
+		
+		$sDialogTitle = Dict::S('UI:ShortcutListDlg:Title');
+		$sOkButtonLabel = Dict::S('UI:Button:Ok');
+		$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
+		
+		$oAppContext = new ApplicationContext();
+		$sContext = $oAppContext->GetForLink();
+
+		$sRateTitle = addslashes(Dict::Format('Class:ShortcutOQL/Attribute:auto_reload_sec/tip', MetaModel::GetConfig()->Get('min_reload_interval')));
+
+		$oPage->add_ready_script(
+<<<EOF
+
+// Note: the title gets deleted by the validation mechanism
+$("#attr_auto_reload_sec").tooltip({items: 'input', content: '$sRateTitle'});
+$("#attr_auto_reload_sec").prop('disabled', !$('#attr_auto_reload').is(':checked'));
+
+$('#attr_auto_reload').change( function(ev) {
+	$("#attr_auto_reload_sec").prop('disabled', !$(this).is(':checked'));
+} );
+
+function ShortcutCreationOK() 
+{
+	var oForm = $('#shortcut_creation_dlg form');
+	var sFormId = oForm.attr('id');
+	var oParams = null;
+	var aErrors = ValidateForm(sFormId, false);
+	if (aErrors.length == 0)
+	{
+		oParams = ReadFormParams(sFormId);
+	}
+	oParams.operation = 'shortcut_list_create';
+	var me = $('#shortcut_creation_dlg');
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?$sContext', oParams, function(data) {
+		me.dialog( "close" );
+		me.remove();
+		$('body').append(data);
+	});
+}
+
+$('#shortcut_creation_dlg form').bind('submit', function() { ShortcutCreationOK(); return false; });
+
+$('#shortcut_creation_dlg').dialog({
+	width: 400,
+	modal: true,
+	title: '$sDialogTitle',
+	buttons: [
+	{ text: "$sOkButtonLabel", click: ShortcutCreationOK },
+	{ text: "$sCancelButtonLabel", click: function() {
+		$(this).dialog( "close" ); $(this).remove();
+	} },
+	],
+	close: function() { $(this).remove(); }
+});
+EOF
+		);
+	}
+}
+
+?>
diff --git a/application/template.class.inc.php b/application/template.class.inc.php
index 6c15355b4..99544644b 100644
--- a/application/template.class.inc.php
+++ b/application/template.class.inc.php
@@ -1,427 +1,427 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class DisplayTemplate
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/displayblock.class.inc.php');
-/**
- * This class manages the special template format used internally to build the iTop web pages
- */
-class DisplayTemplate
-{
-	protected $m_sTemplate;
-	protected $m_aTags;
-	static protected $iBlockCount = 0;
-	
-	public function __construct($sTemplate)
-	{
-		$this->m_aTags = array (
-			'itopblock',
-			'itopcheck',
-			'itoptabs',
-			'itoptab',
-			'itoptoggle',
-			'itopstring',
-			'sqlblock'
-		);
-		$this->m_sTemplate = $sTemplate;
-	}
-	
-	public function Render(WebPage $oPage, $aParams = array())
-	{
-		$this->m_sTemplate = MetaModel::ApplyParams($this->m_sTemplate, $aParams);
-		$iStart = 0;
-		$iEnd = strlen($this->m_sTemplate);
-		$iCount = 0;
-		$iBeforeTagPos = $iStart;
-		$iAfterTagPos = $iStart;
-		while($sTag = $this->GetNextTag($iStart, $iEnd))
-		{
-			$sContent = $this->GetTagContent($sTag, $iStart, $iEnd);
-			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
-			$sOuterTag = substr($this->m_sTemplate, $iStart, $iAfterTagPos - $iStart);
-			$oPage->add(substr($this->m_sTemplate, $iBeforeTagPos, $iStart - $iBeforeTagPos));
-			if ($sTag == DisplayBlock::TAG_BLOCK)
-			{
-				try
-				{
-					$oBlock = DisplayBlock::FromTemplate($sOuterTag);
-					if (is_object($oBlock))
-					{
-						$oBlock->Display($oPage, 'block_'.self::$iBlockCount, $aParams);
-					}
-				}
-				catch(OQLException $e)
-				{
-					$oPage->p('Error in template (please contact your administrator) - Invalid query<!--'.$sOuterTag.'-->');
-				}
-				catch(Exception $e)
-				{
-					$oPage->p('Error in template (please contact your administrator)<!--'.$e->getMessage().'--><!--'.$sOuterTag.'-->');
-				}
-				
-				self::$iBlockCount++;
-			}
-			else
-			{
-				$aAttributes = $this->GetTagAttributes($sTag, $iStart, $iEnd);
-				//$oPage->p("Tag: $sTag - ($iStart, $iEnd)");
-				$this->RenderTag($oPage, $sTag, $aAttributes, $sContent);
-	
-			}
-			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
-			$iBeforeTagPos = $iAfterTagPos;
-			$iStart = $iEnd;
-			$iEnd = strlen($this->m_sTemplate); 
-			$iCount++;
-		}
-		$oPage->add(substr($this->m_sTemplate, $iAfterTagPos));
-	}
-	
-	public function GetNextTag(&$iStartPos, &$iEndPos)
-	{
-		$iChunkStartPos = $iStartPos;
-		$sNextTag = null;
-		$iStartPos = $iEndPos;
-		foreach($this->m_aTags as $sTag)
-		{
-			// Search for the opening tag
-			$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.' ', $iChunkStartPos);
-			if ($iOpeningPos === false)
-			{
-				$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.'>', $iChunkStartPos);
-			}
-			if ($iOpeningPos !== false)
-			{
-				$iClosingPos = stripos($this->m_sTemplate, '</'.$sTag.'>', $iOpeningPos);
-			}
-			if ( ($iOpeningPos !== false) && ($iClosingPos !== false))
-			{
-				if ($iOpeningPos < $iStartPos)
-				{
-					// This is the next tag
-					$iStartPos = $iOpeningPos;
-					$iEndPos = $iClosingPos;
-					$sNextTag = $sTag;
-				}
-			}
-		}
-		return $sNextTag;
-	}
-	
-	public function GetTagContent($sTag, $iStartPos, $iEndPos)
-	{
-		$sContent  = "";
-		$iContentStart = strpos($this->m_sTemplate, '>', $iStartPos); // Content of tag start immediatly after the first closing bracket
-		if ($iContentStart !== false)
-		{
-			$sContent = substr($this->m_sTemplate, 1+$iContentStart, $iEndPos - $iContentStart - 1);
-		}
-		return $sContent;
-	}
-
-	public function GetTagAttributes($sTag, $iStartPos, $iEndPos)
-	{
-		$aAttr  = array();
-		$iAttrStart = strpos($this->m_sTemplate, ' ', $iStartPos); // Attributes start just after the first space
-		$iAttrEnd = strpos($this->m_sTemplate, '>', $iStartPos); // Attributes end just before the first closing bracket
-		if ( ($iAttrStart !== false) && ($iAttrEnd !== false) && ($iAttrEnd > $iAttrStart))
-		{
-			$sAttributes = substr($this->m_sTemplate, 1+$iAttrStart, $iAttrEnd - $iAttrStart - 1);
-			$aAttributes = explode(' ', $sAttributes);
-			foreach($aAttributes as $sAttr)
-			{
-				if ( preg_match('/(.+) *= *"(.+)"$/', $sAttr, $aMatches) )
-				{
-					$aAttr[strtolower($aMatches[1])] = $aMatches[2];
-				}
-			}
-		}
-		return $aAttr;
-	}
-	
-	protected function RenderTag($oPage, $sTag, $aAttributes, $sContent)
-	{
-		static $iTabContainerCount = 0;
-		switch($sTag)
-		{
-			case 'itoptabs':
-				$oPage->AddTabContainer('Tabs_'.$iTabContainerCount);
-				$oPage->SetCurrentTabContainer('Tabs_'.$iTabContainerCount);
-				$iTabContainerCount++;
-				//$oPage->p('Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
-				$oTemplate = new DisplayTemplate($sContent);
-				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				$oPage->SetCurrentTabContainer('');
-			break;
-			
-			case 'itopcheck':
-				$sClassName = $aAttributes['class'];
-				if (MetaModel::IsValidClass($sClassName) && UserRights::IsActionAllowed($sClassName, UR_ACTION_READ))
-				{
-					$oTemplate = new DisplayTemplate($sContent);
-					$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				}
-				else
-				{
-					// Leave a trace for those who'd like to understand why nothing is displayed
-					$oPage->add("<!-- class $sClassName does not exist, skipping some part of the template -->\n");
-				}
-			break;
-			
-			case 'itoptab':
-				$oPage->SetCurrentTab(Dict::S(str_replace('_', ' ', $aAttributes['name'])));
-				$oTemplate = new DisplayTemplate($sContent);
-				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
-				$oPage->SetCurrentTab('');
-			break;
-			
-			case 'itoptoggle':
-				$sName = isset($aAttributes['name']) ? $aAttributes['name'] : 'Tagada';
-				$bOpen = isset($aAttributes['open']) ? $aAttributes['open'] : true;
-				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
-				$oTemplate = new DisplayTemplate($sContent);
-				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
-				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
-				$oPage->EndCollapsibleSection();
-			break;
-			
-			case 'itopstring':
-				$oPage->add(Dict::S($sContent));
-			break;
-			
-			case 'sqlblock':
-				$oBlock = SqlBlock::FromTemplate($sContent);
-				$oBlock->RenderContent($oPage);
-			break;
-			
-			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
-				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
-			break;
-			
-			default:
-				// Unknown tag, just ignore it or now -- output an HTML comment
-				$oPage->add("<!-- unsupported tag: $sTag -->");
-		}
-	}
-	
-	/**
-	 * Unit test
-	 */
-	static public function UnitTest()
-	{
-		require_once(APPROOT.'/application/startup.inc.php');
-		require_once(APPROOT."/application/itopwebpage.class.inc.php");
-		
-		$sTemplate = '<div class="page_header">
-		<div class="actions_details"><a href="#"><span>Actions</span></a></div>
-		<h1>$class$: <span class="hilite">$name$</span></h1>
-		<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = \'$class$\'</itopblock>
-		</div>
-		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
-		<itoptabs>
-			<itoptab name="Interfaces">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</itopblock>
-			</itoptab>
-			<itoptab name="Contacts">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Contact AS c JOIN lnkContactToCI AS l ON l.contact_id = c.id WHERE l.ci_id = $id$</itopblock>
-			</itoptab>
-			<itoptab name="Documents">
-				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Document AS d JOIN lnkDocumentToCI as l ON l.document_id = d.id WHERE l.ci_id = $id$)</itopblock>
-			</itoptab>
-		</itoptabs>';
-		
-		$oPage = new iTopWebPage('Unit Test');
-		//$oPage->add("Template content: <pre>".htmlentities($sTemplate, ENT_QUOTES, 'UTF-8')."</pre>\n");
-		$oTemplate = new DisplayTemplate($sTemplate);
-		$oTemplate->Render($oPage, array('class'=>'Network device','pkey'=> 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3));
-		$oPage->output();
-	}
-}
-
-/**
- * Special type of template for displaying the details of an object
- * On top of the defaut 'blocks' managed by the parent class, the following placeholders
- * are available in such a template:
- * $attribute_code$ An attribute of the object (in edit mode this is the input for the attribute)
- * $attribute_code->label()$ The label of an attribute
- * $PlugIn:plugInClass->properties()$ The ouput of OnDisplayProperties of the specified plugInClass
- */
-class ObjectDetailsTemplate extends DisplayTemplate
-{
-	public function __construct($sTemplate, $oObj, $sFormPrefix = '')
-	{
-		parent::__construct($sTemplate);
-		$this->m_oObj = $oObj;
-		$this->m_sPrefix = $sFormPrefix;
-	}
-	
-	public function Render(WebPage $oPage, $aParams = array(), $bEditMode = false)
-	{
-		$sStateAttCode = MetaModel :: GetStateAttributeCode(get_class($this->m_oObj));
-		$aTemplateFields = array();
-		preg_match_all('/\\$this->([a-z0-9_]+)\\$/', $this->m_sTemplate, $aMatches);
-		foreach ($aMatches[1] as $sAttCode)
-		{
-			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
-			{
-				$aTemplateFields[] = $sAttCode;
-			}
-			else
-			{
-				$aParams['this->'.$sAttCode] = "<!--Unknown attribute: $sAttCode-->";					
-			}
-		}
-		preg_match_all('/\\$this->field\\(([a-z0-9_]+)\\)\\$/', $this->m_sTemplate, $aMatches);
-		foreach ($aMatches[1] as $sAttCode)
-		{
-			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
-			{
-				$aTemplateFields[] = $sAttCode;
-			}
-			else
-			{
-				$aParams['this->field('.$sAttCode.')'] = "<!--Unknown attribute: $sAttCode-->";
-			}
-		}
-		$aFieldsComments = (isset($aParams['fieldsComments'])) ? $aParams['fieldsComments'] : array();
-		$aFieldsMap = array();
-
-		$sClass = get_class($this->m_oObj);
-		// Renders the fields used in the template
-		foreach(MetaModel::ListAttributeDefs(get_class($this->m_oObj)) as $sAttCode => $oAttDef)
-		{
-			$aParams['this->label('.$sAttCode.')'] = $oAttDef->GetLabel();
-			$aParams['this->comments('.$sAttCode.')'] = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
-			$iInputId = '2_'.$sAttCode; // TODO: generate a real/unique prefix...
-			if (in_array($sAttCode, $aTemplateFields))
-			{
-				if ($this->m_oObj->IsNew())
-				{
-					$iFlags = $this->m_oObj->GetInitialStateAttributeFlags($sAttCode);
-				}
-				else
-				{
-				$iFlags = $this->m_oObj->GetAttributeFlags($sAttCode);
-				}
-				if (($iFlags & OPT_ATT_MANDATORY) && $this->m_oObj->IsNew())
-				{
-					$iFlags = $iFlags & ~OPT_ATT_READONLY; // Mandatory fields cannot be read-only when creating an object
-				}
-				
-				if ((!$oAttDef->IsWritable()) || ($sStateAttCode == $sAttCode))
-				{
-					$iFlags = $iFlags | OPT_ATT_READONLY;
-				}
-
-				if ($iFlags & OPT_ATT_HIDDEN)
-				{
-					$aParams['this->label('.$sAttCode.')'] = '';
-					$aParams['this->field('.$sAttCode.')'] = '';
-					$aParams['this->comments('.$sAttCode.')'] = '';
-					$aParams['this->'.$sAttCode] = '';
-				}
-				else
-				{
-					if ($bEditMode && ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE)))
-					{
-						// Check if the attribute is not read-only because of a synchro...
-						$aReasons = array();
-						$sSynchroIcon = '';
-						if ($iFlags & OPT_ATT_SLAVE)
-						{
-							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
-							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
-							$sTip = '';
-							foreach($aReasons as $aRow)
-							{
-								$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
-								$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
-								$sTip .= "<div class='synchro-source'>";
-								$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
-								$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
-							}
-							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
-						}
-	
-						// Attribute is read-only
-						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
-						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.htmlentities($this->m_oObj->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/></span>';
-						$aFieldsMap[$sAttCode] = $iInputId;
-						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
-					}
-	
-					if ($bEditMode && !($iFlags & OPT_ATT_READONLY)) //TODO: check the data synchro status...
-					{
-						$aParams['this->field('.$sAttCode.')'] = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
-						$this->m_oObj->Get($sAttCode),
-						$this->m_oObj->GetEditValue($sAttCode),
-						$iInputId, // InputID
-						'',
-						$iFlags,
-						array('this' => $this->m_oObj) // aArgs
-					).'</span>';
-					$aFieldsMap[$sAttCode] = $iInputId;
-				}
-				else 
-				{
-						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
-					}
-					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
-				}
-			}
-		}
-		
-		// Renders the PlugIns used in the template
-		preg_match_all('/\\$PlugIn:([A-Za-z0-9_]+)->properties\\(\\)\\$/', $this->m_sTemplate, $aMatches);
-		$aPlugInProperties = $aMatches[1];
-		foreach($aPlugInProperties as $sPlugInClass)
-		{
-			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
-			if ($oInstance != null) // Safety check...
-			{
-				$offset = $oPage->start_capture();
-				$oInstance->OnDisplayProperties($this->m_oObj, $oPage, $bEditMode);
-				$sContent = $oPage->end_capture($offset);
-				$aParams["PlugIn:{$sPlugInClass}->properties()"]= $sContent;			
-			}
-			else
-			{
-				$aParams["PlugIn:{$sPlugInClass}->properties()"]= "Missing PlugIn: $sPlugInClass";				
-			}			
-		}
-
-		$offset = $oPage->start_capture();
-		parent::Render($oPage, $aParams);
-		$sContent = $oPage->end_capture($offset);
-		// Remove empty table rows in case some attributes are hidden...
-		$sContent = preg_replace('/<tr[^>]*>\s*(<td[^>]*>\s*<\\/td>)+\s*<\\/tr>/im', '', $sContent);
-		$oPage->add($sContent);
-		return $aFieldsMap;
-	}
-}
-
-//DisplayTemplate::UnitTest();
-?>
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class DisplayTemplate
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/displayblock.class.inc.php');
+/**
+ * This class manages the special template format used internally to build the iTop web pages
+ */
+class DisplayTemplate
+{
+	protected $m_sTemplate;
+	protected $m_aTags;
+	static protected $iBlockCount = 0;
+	
+	public function __construct($sTemplate)
+	{
+		$this->m_aTags = array (
+			'itopblock',
+			'itopcheck',
+			'itoptabs',
+			'itoptab',
+			'itoptoggle',
+			'itopstring',
+			'sqlblock'
+		);
+		$this->m_sTemplate = $sTemplate;
+	}
+	
+	public function Render(WebPage $oPage, $aParams = array())
+	{
+		$this->m_sTemplate = MetaModel::ApplyParams($this->m_sTemplate, $aParams);
+		$iStart = 0;
+		$iEnd = strlen($this->m_sTemplate);
+		$iCount = 0;
+		$iBeforeTagPos = $iStart;
+		$iAfterTagPos = $iStart;
+		while($sTag = $this->GetNextTag($iStart, $iEnd))
+		{
+			$sContent = $this->GetTagContent($sTag, $iStart, $iEnd);
+			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
+			$sOuterTag = substr($this->m_sTemplate, $iStart, $iAfterTagPos - $iStart);
+			$oPage->add(substr($this->m_sTemplate, $iBeforeTagPos, $iStart - $iBeforeTagPos));
+			if ($sTag == DisplayBlock::TAG_BLOCK)
+			{
+				try
+				{
+					$oBlock = DisplayBlock::FromTemplate($sOuterTag);
+					if (is_object($oBlock))
+					{
+						$oBlock->Display($oPage, 'block_'.self::$iBlockCount, $aParams);
+					}
+				}
+				catch(OQLException $e)
+				{
+					$oPage->p('Error in template (please contact your administrator) - Invalid query<!--'.$sOuterTag.'-->');
+				}
+				catch(Exception $e)
+				{
+					$oPage->p('Error in template (please contact your administrator)<!--'.$e->getMessage().'--><!--'.$sOuterTag.'-->');
+				}
+				
+				self::$iBlockCount++;
+			}
+			else
+			{
+				$aAttributes = $this->GetTagAttributes($sTag, $iStart, $iEnd);
+				//$oPage->p("Tag: $sTag - ($iStart, $iEnd)");
+				$this->RenderTag($oPage, $sTag, $aAttributes, $sContent);
+	
+			}
+			$iAfterTagPos = $iEnd + strlen('</'.$sTag.'>');
+			$iBeforeTagPos = $iAfterTagPos;
+			$iStart = $iEnd;
+			$iEnd = strlen($this->m_sTemplate); 
+			$iCount++;
+		}
+		$oPage->add(substr($this->m_sTemplate, $iAfterTagPos));
+	}
+	
+	public function GetNextTag(&$iStartPos, &$iEndPos)
+	{
+		$iChunkStartPos = $iStartPos;
+		$sNextTag = null;
+		$iStartPos = $iEndPos;
+		foreach($this->m_aTags as $sTag)
+		{
+			// Search for the opening tag
+			$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.' ', $iChunkStartPos);
+			if ($iOpeningPos === false)
+			{
+				$iOpeningPos = stripos($this->m_sTemplate, '<'.$sTag.'>', $iChunkStartPos);
+			}
+			if ($iOpeningPos !== false)
+			{
+				$iClosingPos = stripos($this->m_sTemplate, '</'.$sTag.'>', $iOpeningPos);
+			}
+			if ( ($iOpeningPos !== false) && ($iClosingPos !== false))
+			{
+				if ($iOpeningPos < $iStartPos)
+				{
+					// This is the next tag
+					$iStartPos = $iOpeningPos;
+					$iEndPos = $iClosingPos;
+					$sNextTag = $sTag;
+				}
+			}
+		}
+		return $sNextTag;
+	}
+	
+	public function GetTagContent($sTag, $iStartPos, $iEndPos)
+	{
+		$sContent  = "";
+		$iContentStart = strpos($this->m_sTemplate, '>', $iStartPos); // Content of tag start immediatly after the first closing bracket
+		if ($iContentStart !== false)
+		{
+			$sContent = substr($this->m_sTemplate, 1+$iContentStart, $iEndPos - $iContentStart - 1);
+		}
+		return $sContent;
+	}
+
+	public function GetTagAttributes($sTag, $iStartPos, $iEndPos)
+	{
+		$aAttr  = array();
+		$iAttrStart = strpos($this->m_sTemplate, ' ', $iStartPos); // Attributes start just after the first space
+		$iAttrEnd = strpos($this->m_sTemplate, '>', $iStartPos); // Attributes end just before the first closing bracket
+		if ( ($iAttrStart !== false) && ($iAttrEnd !== false) && ($iAttrEnd > $iAttrStart))
+		{
+			$sAttributes = substr($this->m_sTemplate, 1+$iAttrStart, $iAttrEnd - $iAttrStart - 1);
+			$aAttributes = explode(' ', $sAttributes);
+			foreach($aAttributes as $sAttr)
+			{
+				if ( preg_match('/(.+) *= *"(.+)"$/', $sAttr, $aMatches) )
+				{
+					$aAttr[strtolower($aMatches[1])] = $aMatches[2];
+				}
+			}
+		}
+		return $aAttr;
+	}
+	
+	protected function RenderTag($oPage, $sTag, $aAttributes, $sContent)
+	{
+		static $iTabContainerCount = 0;
+		switch($sTag)
+		{
+			case 'itoptabs':
+				$oPage->AddTabContainer('Tabs_'.$iTabContainerCount);
+				$oPage->SetCurrentTabContainer('Tabs_'.$iTabContainerCount);
+				$iTabContainerCount++;
+				//$oPage->p('Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
+				$oPage->SetCurrentTabContainer('');
+			break;
+			
+			case 'itopcheck':
+				$sClassName = $aAttributes['class'];
+				if (MetaModel::IsValidClass($sClassName) && UserRights::IsActionAllowed($sClassName, UR_ACTION_READ))
+				{
+					$oTemplate = new DisplayTemplate($sContent);
+					$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
+				}
+				else
+				{
+					// Leave a trace for those who'd like to understand why nothing is displayed
+					$oPage->add("<!-- class $sClassName does not exist, skipping some part of the template -->\n");
+				}
+			break;
+			
+			case 'itoptab':
+				$oPage->SetCurrentTab(Dict::S(str_replace('_', ' ', $aAttributes['name'])));
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oPage->SetCurrentTab('');
+			break;
+			
+			case 'itoptoggle':
+				$sName = isset($aAttributes['name']) ? $aAttributes['name'] : 'Tagada';
+				$bOpen = isset($aAttributes['open']) ? $aAttributes['open'] : true;
+				$oPage->StartCollapsibleSection(Dict::S($sName), $bOpen);
+				$oTemplate = new DisplayTemplate($sContent);
+				$oTemplate->Render($oPage, array()); // no params to apply, they have already been applied
+				//$oPage->p('iTop Tab Content:<pre>'.htmlentities($sContent, ENT_QUOTES, 'UTF-8').'</pre>');
+				$oPage->EndCollapsibleSection();
+			break;
+			
+			case 'itopstring':
+				$oPage->add(Dict::S($sContent));
+			break;
+			
+			case 'sqlblock':
+				$oBlock = SqlBlock::FromTemplate($sContent);
+				$oBlock->RenderContent($oPage);
+			break;
+			
+			case 'itopblock': // No longer used, handled by DisplayBlock::FromTemplate see above
+				$oPage->add("<!-- Application Error: should be handled by DisplayBlock::FromTemplate -->");
+			break;
+			
+			default:
+				// Unknown tag, just ignore it or now -- output an HTML comment
+				$oPage->add("<!-- unsupported tag: $sTag -->");
+		}
+	}
+	
+	/**
+	 * Unit test
+	 */
+	static public function UnitTest()
+	{
+		require_once(APPROOT.'/application/startup.inc.php');
+		require_once(APPROOT."/application/itopwebpage.class.inc.php");
+		
+		$sTemplate = '<div class="page_header">
+		<div class="actions_details"><a href="#"><span>Actions</span></a></div>
+		<h1>$class$: <span class="hilite">$name$</span></h1>
+		<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = \'$class$\'</itopblock>
+		</div>
+		<img src="../../images/connect_to_network.png" style="margin-top:-10px; margin-right:10px; float:right">
+		<itoptabs>
+			<itoptab name="Interfaces">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Interface AS i WHERE i.device_id = $id$</itopblock>
+			</itoptab>
+			<itoptab name="Contacts">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Contact AS c JOIN lnkContactToCI AS l ON l.contact_id = c.id WHERE l.ci_id = $id$</itopblock>
+			</itoptab>
+			<itoptab name="Documents">
+				<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT Document AS d JOIN lnkDocumentToCI as l ON l.document_id = d.id WHERE l.ci_id = $id$)</itopblock>
+			</itoptab>
+		</itoptabs>';
+		
+		$oPage = new iTopWebPage('Unit Test');
+		//$oPage->add("Template content: <pre>".htmlentities($sTemplate, ENT_QUOTES, 'UTF-8')."</pre>\n");
+		$oTemplate = new DisplayTemplate($sTemplate);
+		$oTemplate->Render($oPage, array('class'=>'Network device','pkey'=> 271, 'name' => 'deliversw01.mecanorama.fr', 'org_id' => 3));
+		$oPage->output();
+	}
+}
+
+/**
+ * Special type of template for displaying the details of an object
+ * On top of the defaut 'blocks' managed by the parent class, the following placeholders
+ * are available in such a template:
+ * $attribute_code$ An attribute of the object (in edit mode this is the input for the attribute)
+ * $attribute_code->label()$ The label of an attribute
+ * $PlugIn:plugInClass->properties()$ The ouput of OnDisplayProperties of the specified plugInClass
+ */
+class ObjectDetailsTemplate extends DisplayTemplate
+{
+	public function __construct($sTemplate, $oObj, $sFormPrefix = '')
+	{
+		parent::__construct($sTemplate);
+		$this->m_oObj = $oObj;
+		$this->m_sPrefix = $sFormPrefix;
+	}
+	
+	public function Render(WebPage $oPage, $aParams = array(), $bEditMode = false)
+	{
+		$sStateAttCode = MetaModel :: GetStateAttributeCode(get_class($this->m_oObj));
+		$aTemplateFields = array();
+		preg_match_all('/\\$this->([a-z0-9_]+)\\$/', $this->m_sTemplate, $aMatches);
+		foreach ($aMatches[1] as $sAttCode)
+		{
+			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
+			{
+				$aTemplateFields[] = $sAttCode;
+			}
+			else
+			{
+				$aParams['this->'.$sAttCode] = "<!--Unknown attribute: $sAttCode-->";					
+			}
+		}
+		preg_match_all('/\\$this->field\\(([a-z0-9_]+)\\)\\$/', $this->m_sTemplate, $aMatches);
+		foreach ($aMatches[1] as $sAttCode)
+		{
+			if (MetaModel::IsValidAttCode(get_class($this->m_oObj), $sAttCode))
+			{
+				$aTemplateFields[] = $sAttCode;
+			}
+			else
+			{
+				$aParams['this->field('.$sAttCode.')'] = "<!--Unknown attribute: $sAttCode-->";
+			}
+		}
+		$aFieldsComments = (isset($aParams['fieldsComments'])) ? $aParams['fieldsComments'] : array();
+		$aFieldsMap = array();
+
+		$sClass = get_class($this->m_oObj);
+		// Renders the fields used in the template
+		foreach(MetaModel::ListAttributeDefs(get_class($this->m_oObj)) as $sAttCode => $oAttDef)
+		{
+			$aParams['this->label('.$sAttCode.')'] = $oAttDef->GetLabel();
+			$aParams['this->comments('.$sAttCode.')'] = isset($aFieldsComments[$sAttCode]) ? $aFieldsComments[$sAttCode] : '';
+			$iInputId = '2_'.$sAttCode; // TODO: generate a real/unique prefix...
+			if (in_array($sAttCode, $aTemplateFields))
+			{
+				if ($this->m_oObj->IsNew())
+				{
+					$iFlags = $this->m_oObj->GetInitialStateAttributeFlags($sAttCode);
+				}
+				else
+				{
+				$iFlags = $this->m_oObj->GetAttributeFlags($sAttCode);
+				}
+				if (($iFlags & OPT_ATT_MANDATORY) && $this->m_oObj->IsNew())
+				{
+					$iFlags = $iFlags & ~OPT_ATT_READONLY; // Mandatory fields cannot be read-only when creating an object
+				}
+				
+				if ((!$oAttDef->IsWritable()) || ($sStateAttCode == $sAttCode))
+				{
+					$iFlags = $iFlags | OPT_ATT_READONLY;
+				}
+
+				if ($iFlags & OPT_ATT_HIDDEN)
+				{
+					$aParams['this->label('.$sAttCode.')'] = '';
+					$aParams['this->field('.$sAttCode.')'] = '';
+					$aParams['this->comments('.$sAttCode.')'] = '';
+					$aParams['this->'.$sAttCode] = '';
+				}
+				else
+				{
+					if ($bEditMode && ($iFlags & (OPT_ATT_READONLY|OPT_ATT_SLAVE)))
+					{
+						// Check if the attribute is not read-only because of a synchro...
+						$aReasons = array();
+						$sSynchroIcon = '';
+						if ($iFlags & OPT_ATT_SLAVE)
+						{
+							$iSynchroFlags = $this->m_oObj->GetSynchroReplicaFlags($sAttCode, $aReasons);
+							$sSynchroIcon = "&nbsp;<img id=\"synchro_$iInputId\" src=\"../images/transp-lock.png\" style=\"vertical-align:middle\"/>";
+							$sTip = '';
+							foreach($aReasons as $aRow)
+							{
+								$sDescription = htmlentities($aRow['description'], ENT_QUOTES, 'UTF-8');
+								$sDescription = str_replace(array("\r\n", "\n"), "<br/>", $sDescription);
+								$sTip .= "<div class='synchro-source'>";
+								$sTip .= "<div class='synchro-source-title'>Synchronized with {$aRow['name']}</div>";
+								$sTip .= "<div class='synchro-source-description'>$sDescription</div>";
+							}
+							$oPage->add_ready_script("$('#synchro_$iInputId').qtip( { content: '$sTip', show: 'mouseover', hide: 'mouseout', style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );");
+						}
+	
+						// Attribute is read-only
+						$sHTMLValue = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetAsHTML($sAttCode);
+						$sHTMLValue .= '<input type="hidden" id="'.$iInputId.'" name="attr_'.$sAttCode.'" value="'.htmlentities($this->m_oObj->Get($sAttCode), ENT_QUOTES, 'UTF-8').'"/></span>';
+						$aFieldsMap[$sAttCode] = $iInputId;
+						$aParams['this->comments('.$sAttCode.')'] = $sSynchroIcon;
+					}
+	
+					if ($bEditMode && !($iFlags & OPT_ATT_READONLY)) //TODO: check the data synchro status...
+					{
+						$aParams['this->field('.$sAttCode.')'] = "<span id=\"field_{$iInputId}\">".$this->m_oObj->GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef,
+						$this->m_oObj->Get($sAttCode),
+						$this->m_oObj->GetEditValue($sAttCode),
+						$iInputId, // InputID
+						'',
+						$iFlags,
+						array('this' => $this->m_oObj) // aArgs
+					).'</span>';
+					$aFieldsMap[$sAttCode] = $iInputId;
+				}
+				else 
+				{
+						$aParams['this->field('.$sAttCode.')'] = $this->m_oObj->GetAsHTML($sAttCode);
+					}
+					$aParams['this->'.$sAttCode] = "<table class=\"field\"><tr><td class=\"label\">".$aParams['this->label('.$sAttCode.')'].":</td><td>".$aParams['this->field('.$sAttCode.')']."</td><td>".$aParams['this->comments('.$sAttCode.')']."</td></tr></table>";					
+				}
+			}
+		}
+		
+		// Renders the PlugIns used in the template
+		preg_match_all('/\\$PlugIn:([A-Za-z0-9_]+)->properties\\(\\)\\$/', $this->m_sTemplate, $aMatches);
+		$aPlugInProperties = $aMatches[1];
+		foreach($aPlugInProperties as $sPlugInClass)
+		{
+			$oInstance = MetaModel::GetPlugins('iApplicationUIExtension', $sPlugInClass);
+			if ($oInstance != null) // Safety check...
+			{
+				$offset = $oPage->start_capture();
+				$oInstance->OnDisplayProperties($this->m_oObj, $oPage, $bEditMode);
+				$sContent = $oPage->end_capture($offset);
+				$aParams["PlugIn:{$sPlugInClass}->properties()"]= $sContent;			
+			}
+			else
+			{
+				$aParams["PlugIn:{$sPlugInClass}->properties()"]= "Missing PlugIn: $sPlugInClass";				
+			}			
+		}
+
+		$offset = $oPage->start_capture();
+		parent::Render($oPage, $aParams);
+		$sContent = $oPage->end_capture($offset);
+		// Remove empty table rows in case some attributes are hidden...
+		$sContent = preg_replace('/<tr[^>]*>\s*(<td[^>]*>\s*<\\/td>)+\s*<\\/tr>/im', '', $sContent);
+		$oPage->add($sContent);
+		return $aFieldsMap;
+	}
+}
+
+//DisplayTemplate::UnitTest();
+?>
diff --git a/application/templates/audit_category.html b/application/templates/audit_category.html
index 415555402..379c506c2 100644
--- a/application/templates/audit_category.html
+++ b/application/templates/audit_category.html
@@ -1,12 +1,12 @@
-<div class="page_header">
-	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $id$</itopblock>
-	<h1>$class$: <span class="hilite">$name$</span></h1>
-	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'</itopblock>
-</div>
-<img src="../../images/clean.png" style="margin-top:-20px; margin-right:10px; float:right">
-<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $id$</itopblock>
-<itoptabs>
-	<itoptab name="Rules">
-		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT AuditRule WHERE category_id = $id$</itopblock>
-	</itoptab>
-</itoptabs>
+<div class="page_header">
+	<itopblock blockclass="MenuBlock" type="popup" encoding="text/oql" label="Actions">SELECT $class$ WHERE id = $id$</itopblock>
+	<h1>$class$: <span class="hilite">$name$</span></h1>
+	<itopblock blockclass="HistoryBlock" type="toggle" encoding="text/oql">SELECT CMDBChangeOp WHERE objkey = $id$ AND objclass = '$class$'</itopblock>
+</div>
+<img src="../../images/clean.png" style="margin-top:-20px; margin-right:10px; float:right">
+<itopblock blockclass="DisplayBlock" asynchronous="false" type="bare_details" encoding="text/oql">SELECT $class$ WHERE id = $id$</itopblock>
+<itoptabs>
+	<itoptab name="Rules">
+		<itopblock blockclass="DisplayBlock" type="list" encoding="text/oql">SELECT AuditRule WHERE category_id = $id$</itopblock>
+	</itoptab>
+</itoptabs>
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index ff7ca2e36..6ad11c308 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -1,608 +1,608 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class UILinksWidget
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'application/webpage.class.inc.php');
-require_once(APPROOT.'application/displayblock.class.inc.php');
-
-class UILinksWidget 
-{
-	protected $m_sClass;
-	protected $m_sAttCode;
-	protected $m_sNameSuffix;
-	protected $m_iInputId;
-	protected $m_aAttributes;
-	protected $m_sExtKeyToRemote;
-	protected $m_sExtKeyToMe;
-	protected $m_sLinkedClass;
-	protected $m_sRemoteClass;
-	protected $m_bDuplicatesAllowed;
-	protected $m_aEditableFields;
-	protected $m_aTableConfig;
-
-	/**
-	 * UILinksWidget constructor.
-	 *
-	 * @param string $sClass
-	 * @param string $sAttCode
-	 * @param int $iInputId
-	 * @param string $sNameSuffix
-	 * @param bool $bDuplicatesAllowed
-	 *
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @throws \Exception
-	 */
-	public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '', $bDuplicatesAllowed = false)
-	{
-		$this->m_sClass = $sClass;
-		$this->m_sAttCode = $sAttCode;
-		$this->m_sNameSuffix = $sNameSuffix;
-		$this->m_iInputId = $iInputId;
-		$this->m_bDuplicatesAllowed = $bDuplicatesAllowed;
-		$this->m_aEditableFields = array();
-
-		/** @var AttributeLinkedSetIndirect $oAttDef */
-		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
-		$this->m_sLinkedClass = $oAttDef->GetLinkedClass();
-		$this->m_sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
-		$this->m_sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-
-		/** @var AttributeExternalKey $oLinkingAttDef */
-		$oLinkingAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
-		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
-		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
-		$sDefaultState = MetaModel::GetDefaultState($this->m_sClass);		
-
-		$this->m_aEditableFields = array();
-		$this->m_aTableConfig = array();
-		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_iInputId.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
-
-		foreach(MetaModel::FlattenZList(MetaModel::GetZListItems($this->m_sLinkedClass, 'list')) as $sAttCode)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sAttCode);
-			if ($sStateAttCode == $sAttCode)
-			{
-				// State attribute is always hidden from the UI
-			}
-			else if ($oAttDef->IsWritable() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
-			{
-				$iFlags = MetaModel::GetAttributeFlags($this->m_sLinkedClass, $sDefaultState, $sAttCode);				
-				if ( !($iFlags & OPT_ATT_HIDDEN) && !($iFlags & OPT_ATT_READONLY) )
-				{
-					$this->m_aEditableFields[] = $sAttCode;
-					$this->m_aTableConfig[$sAttCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());				
-				}
-			}
-		}
-		
-		$this->m_aTableConfig['static::key'] = array( 'label' => MetaModel::GetName($this->m_sRemoteClass), 'description' => MetaModel::GetClassDescription($this->m_sRemoteClass));
-		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
-		{
-			// TO DO: check the state of the attribute: hidden or visible ?
-			if ($sFieldCode != 'finalclass')
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sRemoteClass, $sFieldCode);
-				$this->m_aTableConfig['static::'.$sFieldCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
-			}
-		}
-	}
-
-	/**
-	 * A one-row form for editing a link record
-	 *
-	 * @param WebPage $oP Web page used for the ouput
-	 * @param DBObject $oLinkedObj Remote object
-	 * @param mixed $linkObjOrId Either the object linked or a unique number for new link records to add
-	 * @param array $aArgs Extra context arguments
-	 * @param DBObject $oCurrentObj The object to which all the elements of the linked set refer to
-	 * @param int $iUniqueId A unique identifier of new links
-	 * @param boolean $bReadOnly Display link as editable or read-only. Default is false (editable)
-	 *
-	 * @return array The HTML fragment of the one-row form
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 * @throws \Exception
-	 */
-	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId, $aArgs, $oCurrentObj, $iUniqueId, $bReadOnly = false)
-	{
-		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
-		$aRow = array();
-		$aFieldsMap = array();
-		if(is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
-		{
-			$key = $linkObjOrId->GetKey();
-			$iRemoteObjKey =  $linkObjOrId->Get($this->m_sExtKeyToRemote);
-			$sPrefix .= "[$key][";
-			$sNameSuffix = "]"; // To make a tabular form
-			$aArgs['prefix'] = $sPrefix;
-			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$key}";
-			$aArgs['this'] = $linkObjOrId;
-
-			if($bReadOnly)
-            {
-                $aRow['form::checkbox'] = "";
-                foreach($this->m_aEditableFields as $sFieldCode)
-                {
-                    $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
-                    $aRow[$sFieldCode] = $sDisplayValue;
-                }
-            }
-            else
-            {
-                $aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$key\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$key\">";
-                foreach($this->m_aEditableFields as $sFieldCode)
-                {
-                    $sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId->GetKey().']';
-                    $sSafeId = utils::GetSafeId($sFieldId);
-                    $sValue = $linkObjOrId->Get($sFieldCode);
-                    $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
-                    $oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-                    $aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
-                        cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId, $sNameSuffix, 0, $aArgs).
-	                    '</div></div></div>';
-                    $aFieldsMap[$sFieldCode] = $sSafeId;
-                }
-            }
-
-			$sState = $linkObjOrId->GetState();
-		}
-		else
-		{
-			// form for creating a new record
-			if (is_object($linkObjOrId))
-			{
-				// New link existing only in memory
-				$oNewLinkObj = $linkObjOrId;
-				$iRemoteObjKey = $oNewLinkObj->Get($this->m_sExtKeyToRemote);
-				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
-			}
-			else
-			{
-				$iRemoteObjKey = $linkObjOrId;
-				$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
-				$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, $iRemoteObjKey);
-				$oNewLinkObj->Set($this->m_sExtKeyToRemote, $oRemoteObj); // Setting the extkey with the object alsoo fills the related external fields
-				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
-			}
-			$sPrefix .= "[-$iUniqueId][";
-			$sNameSuffix = "]"; // To make a tabular form
-			$aArgs['prefix'] = $sPrefix;
-			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".($iUniqueId < 0 ? -$iUniqueId : $iUniqueId);
-			$aArgs['this'] = $oNewLinkObj;
-			$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"-$iUniqueId\">";
-			foreach($this->m_aEditableFields as $sFieldCode)
-			{
-				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.-$iUniqueId.']';
-				$sSafeId = utils::GetSafeId($sFieldId);
-				$sValue = $oNewLinkObj->Get($sFieldCode);
-				$sDisplayValue = $oNewLinkObj->GetEditValue($sFieldCode);
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
-				$aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
-					cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId /* id */, $sNameSuffix, 0, $aArgs).
-					'</div></div></div>';
-				$aFieldsMap[$sFieldCode] = $sSafeId;
-			}
-			$sState = '';
-
-			// Rows created with ajax call need OnLinkAdded call.
-			// Rows added before loading the form cannot call OnLinkAdded.
-			if ($iUniqueId > 0)
-			{
-				$oP->add_script(
-					<<<EOF
-PrepareWidgets();
-oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
-EOF
-				);
-			}
-		}
-
-		if(!$bReadOnly)
-        {
-            $sExtKeyToMeId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToMe);
-            $aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
-            $aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
-
-            $sExtKeyToRemoteId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToRemote);
-            $aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
-            $aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";
-        }
-
-		$iFieldsCount = count($aFieldsMap);
-		$sJsonFieldsMap = json_encode($aFieldsMap);
-		
-		$oP->add_script(
-<<<EOF
-var {$aArgs['wizHelper']} = new WizardHelper('{$this->m_sLinkedClass}', '', '$sState');
-{$aArgs['wizHelper']}.SetFieldsMap($sJsonFieldsMap);
-{$aArgs['wizHelper']}.SetFieldsCount($iFieldsCount);
-EOF
-		);
-		$aRow['static::key'] = $oLinkedObj->GetHyperLink();
-		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
-		{
-			$aRow['static::'.$sFieldCode] = $oLinkedObj->GetAsHTML($sFieldCode);
-		}
-		return $aRow;
-	}
-
-	/**
-	 * Display one row of the whole form
-	 * @param WebPage $oP
-	 * @param array $aConfig
-	 * @param array $aRow
-	 * @param int $iRowId
-	 * @return string
-	 */
-	protected function DisplayFormRow(WebPage $oP, $aConfig, $aRow, $iRowId)
-	{
-		$sHtml = '';
-		$sHtml .= "<tr id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_row_$iRowId\">\n";
-		foreach($aConfig as $sName=>$void)
-		{
-			$sHtml .= "<td>".$aRow[$sName]."</td>\n";
-		}
-		$sHtml .= "</tr>\n";
-		
-		return $sHtml;
-	}
-	
-	/**
-	 * Display the table with the form for editing all the links at once
-	 * @param WebPage $oP The web page used for the output
-	 * @param array $aConfig The table's header configuration
-	 * @param array $aData The tabular data to be displayed
-	 * @return string Html fragment representing the form table
-	 */
-	protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
-	{
-		$sHtml = "<input type=\"hidden\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\">";
-		$sHtml .= "<table class=\"listResults\">\n";
-		// Header
-		$sHtml .= "<thead>\n";
-		$sHtml .= "<tr>\n";
-		foreach($aConfig as $sName=>$aDef)
-		{
-			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
-		}
-		$sHtml .= "</tr>\n";
-		$sHtml .= "</thead>\n";
-		
-		// Content
-		$sHtml .= "</tbody>\n";
-		$sEmptyRowStyle = '';
-		if (count($aData) != 0)
-		{
-			$sEmptyRowStyle = 'style="display:none;"';
-		}
-
-		foreach($aData as $iRowId => $aRow)
-		{
-			$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
-		}		
-		$sHtml .= "<tr $sEmptyRowStyle id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."</td></tr>";
-		$sHtml .= "</tbody>\n";
-		
-		// Footer
-		$sHtml .= "</table>\n";
-		
-		return $sHtml;
-	}
-
-
-	/**
-	 * Get the HTML fragment corresponding to the linkset editing widget
-	 *
-	 * @param WebPage $oPage
-	 * @param DBObject|ormLinkSet $oValue
-	 * @param array $aArgs Extra context arguments
-	 * @param string $sFormPrefix prefix of the fields in the current form
-	 * @param DBObject $oCurrentObj the current object to which the linkset is related
-	 *
-	 * @return string The HTML fragment to be inserted into the page
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 */
-	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
-	{
-		$sHtmlValue = '';
-		$sHtmlValue .= "<div id=\"linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
-		$sHtmlValue .= "<input type=\"hidden\" id=\"{$sFormPrefix}{$this->m_iInputId}\">\n";
-		$oValue->Rewind();
-		$aForm = array();
-		$iAddedId = 1; // Unique id for new links
-		while($oCurrentLink = $oValue->Fetch())
-		{
-		    // We try to retrieve the remote object as usual
-			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote), false /* Must not be found */);
-			// If successful, it means that we can edit its link
-			if($oLinkedObj !== null)
-            {
-                $bReadOnly = false;
-            }
-            // Else we retrieve it without restrictions (silos) and will display its link as readonly
-            else
-            {
-                $bReadOnly = true;
-                $oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote), false /* Must not be found */, true);
-            }
-
-            if ($oCurrentLink->IsNew())
-            {
-                $key = -($iAddedId++);
-            }
-            else
-            {
-                $key = $oCurrentLink->GetKey();
-            }
-            $aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj, $key, $bReadOnly);
-		}
-		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
-		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
-		// Don't automatically launch the search if the table is huge
-		$bDoSearch = !utils::IsHighCardinality($this->m_sRemoteClass);
-		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
-		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
-		$oPage->add_ready_script(<<<EOF
-		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}', $sJSDoSearch);
-		oWidget{$this->m_iInputId}.Init();
-EOF
-);
-		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget{$this->m_iInputId}.RemoveSelected();\" >";
-		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"><span id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></span>\n";
-		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
-		$sHtmlValue .= "</div>\n";
-		$oPage->add_at_the_end("<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\"></div>"); // To prevent adding forms inside the main form
-        return $sHtmlValue;
-	}
-
-	/**
-	 * @param string $sClass
-	 * @param string $sAttCode
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	protected static function GetTargetClass($sClass, $sAttCode)
-	{
-		/** @var AttributeLinkedSet $oAttDef */
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		$sLinkedClass = $oAttDef->GetLinkedClass();
-		$sTargetClass = '';
-		switch(get_class($oAttDef))
-		{
-			case 'AttributeLinkedSetIndirect':
-			/** @var AttributeExternalKey $oLinkingAttDef */
-			/** @var AttributeLinkedSetIndirect $oAttDef */
-			$oLinkingAttDef = 	MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
-			$sTargetClass = $oLinkingAttDef->GetTargetClass();
-			break;
-
-			case 'AttributeLinkedSet':
-			$sTargetClass = $sLinkedClass;
-			break;
-		}
-		
-		return $sTargetClass;
-	}
-
-	/**
-	 * @param WebPage $oPage
-	 * @param DBObject $oCurrentObj
-	 * @param $sJson
-	 * @param array $aAlreadyLinkedIds
-	 *
-	 * @throws DictExceptionMissingString
-	 * @throws Exception
-	 */
-	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPrefillFormParam = array())
-	{
-		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
-
-		$oAlreadyLinkedFilter = new DBObjectSearch($this->m_sRemoteClass);
-		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
-		{
-			$oAlreadyLinkedFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
-			$oAlreadyLinkedExpression = $oAlreadyLinkedFilter->GetCriteria();
-			$sAlreadyLinkedExpression = $oAlreadyLinkedExpression->Render();
-		}
-		else
-		{
-			$sAlreadyLinkedExpression = '';
-		}
-
-		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
-
-		if(!empty($oCurrentObj))
-		{
-			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
-			$aPrefillFormParam['filter'] = $oFilter;
-			$aPrefillFormParam['dest_class'] = $this->m_sRemoteClass;
-			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
-		}
-		$oBlock = new DisplayBlock($oFilter, 'search', false);
-		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-			array(
-				'menu' => false,
-				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-				'table_id' => 'add_'.$this->m_sAttCode,
-				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
-				'selection_mode' => true,
-				'json' => $sJson,
-				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
-				'query_params' => $oFilter->GetInternalParams(),
-				'hidden_criteria' => $sAlreadyLinkedExpression,
-			));
-		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
-		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
-		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
-		$sHtml .= "</div>\n";
-		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
-		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
-		$sHtml .= "</div>\n";
-		$sHtml .= "</form>\n";
-		$oPage->add($sHtml);
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
-		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
-		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
-	}
-
-	/**
-	 * Search for objects to be linked to the current object (i.e "remote" objects)
-	 *
-	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
-	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of
-	 *     m_sRemoteClass
-	 * @param array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of
-	 *     the search
-	 *
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array(), $oCurrentObj = null)
-	{
-		if ($sRemoteClass != '')
-		{
-			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
-			$oFilter = new DBObjectSearch($sRemoteClass);
-		}
-		else
-		{
-			// No remote class specified use the one defined in the linkedset
-			$oFilter = new DBObjectSearch($this->m_sRemoteClass);		
-		}
-		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
-		{
-			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
-		}
-		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
-		$oBlock = new DisplayBlock($oFilter, 'list', false);
-		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", array('menu' => false, 'cssCount'=> '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode)); // Don't display the 'Actions' menu on the results
-	}
-
-	/**
-	 * @param WebPage $oP
-	 * @param int $iMaxAddedId
-	 * @param $oFullSetFilter
-	 * @param DBObject $oCurrentObj
-	 *
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 */
-	public function DoAddObjects(WebPage $oP, $iMaxAddedId, $oFullSetFilter, $oCurrentObj)
-	{
-		$aLinkedObjectIds = utils::ReadMultipleSelection($oFullSetFilter);
-
-		$iAdditionId = $iMaxAddedId + 1;
-		foreach($aLinkedObjectIds as $iObjectId)
-		{
-			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
-			if (is_object($oLinkedObj))
-			{
-				$aRow = $this->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
-				$oP->add($this->DisplayFormRow($oP, $this->m_aTableConfig, $aRow, -$iAdditionId));
-				$iAdditionId++;
-			}
-			else
-			{
-				$oP->p(Dict::Format('UI:Error:Object_Class_Id_NotFound', $this->m_sLinkedClass, $iObjectId));
-			}
-		}
-	}
-
-	/**
-	 * Initializes the default search parameters based on 1) a 'current' object and 2) the silos defined by the context
-	 *
-	 * @param DBObject $oSourceObj
-	 * @param DBSearch|DBObjectSearch $oSearch
-	 *
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	protected function SetSearchDefaultFromContext($oSourceObj, &$oSearch)
-	{
-		$oAppContext = new ApplicationContext();
-		$sSrcClass = get_class($oSourceObj);
-		$sDestClass = $oSearch->GetClass();
-		foreach($oAppContext->GetNames() as $key)
-		{
-			// Find the value of the object corresponding to each 'context' parameter
-			$aCallSpec = array($sSrcClass, 'MapContextParam');
-			$sAttCode = '';
-			if (is_callable($aCallSpec))
-			{
-				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
-			}
-
-			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode))
-			{
-				$defaultValue = $oSourceObj->Get($sAttCode);
-
-				// Find the attcode for the same 'context' parameter in the destination class
-				// and sets its value as the default value for the search condition
-				$aCallSpec = array($sDestClass, 'MapContextParam');
-				$sAttCode = '';
-				if (is_callable($aCallSpec))
-				{
-					$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
-				}
-	
-				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue))
-				{
-					// Add Hierarchical condition if hierarchical key
-					$oAttDef = MetaModel::GetAttributeDef($sDestClass, $sAttCode);
-					if (isset($oAttDef) && ($oAttDef->IsExternalKey()))
-					{
-						try
-						{
-							/** @var AttributeExternalKey $oAttDef */
-							$sTargetClass = $oAttDef->GetTargetClass();
-							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sTargetClass);
-							if ($sHierarchicalKeyCode !== false)
-							{
-								$oFilter = new DBObjectSearch($sTargetClass);
-								$oFilter->AddCondition('id', $defaultValue);
-								$oHKFilter = new DBObjectSearch($sTargetClass);
-								$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
-								$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
-							}
-						} catch (Exception $e)
-						{
-						}
-					}
-					else
-					{
-						$oSearch->AddCondition($sAttCode, $defaultValue);
-					}
-				}
-			}
-		}
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class UILinksWidget
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'application/webpage.class.inc.php');
+require_once(APPROOT.'application/displayblock.class.inc.php');
+
+class UILinksWidget 
+{
+	protected $m_sClass;
+	protected $m_sAttCode;
+	protected $m_sNameSuffix;
+	protected $m_iInputId;
+	protected $m_aAttributes;
+	protected $m_sExtKeyToRemote;
+	protected $m_sExtKeyToMe;
+	protected $m_sLinkedClass;
+	protected $m_sRemoteClass;
+	protected $m_bDuplicatesAllowed;
+	protected $m_aEditableFields;
+	protected $m_aTableConfig;
+
+	/**
+	 * UILinksWidget constructor.
+	 *
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 * @param int $iInputId
+	 * @param string $sNameSuffix
+	 * @param bool $bDuplicatesAllowed
+	 *
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 */
+	public function __construct($sClass, $sAttCode, $iInputId, $sNameSuffix = '', $bDuplicatesAllowed = false)
+	{
+		$this->m_sClass = $sClass;
+		$this->m_sAttCode = $sAttCode;
+		$this->m_sNameSuffix = $sNameSuffix;
+		$this->m_iInputId = $iInputId;
+		$this->m_bDuplicatesAllowed = $bDuplicatesAllowed;
+		$this->m_aEditableFields = array();
+
+		/** @var AttributeLinkedSetIndirect $oAttDef */
+		$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $this->m_sAttCode);
+		$this->m_sLinkedClass = $oAttDef->GetLinkedClass();
+		$this->m_sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+		$this->m_sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+
+		/** @var AttributeExternalKey $oLinkingAttDef */
+		$oLinkingAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $this->m_sExtKeyToRemote);
+		$this->m_sRemoteClass = $oLinkingAttDef->GetTargetClass();
+		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
+		$sDefaultState = MetaModel::GetDefaultState($this->m_sClass);		
+
+		$this->m_aEditableFields = array();
+		$this->m_aTableConfig = array();
+		$this->m_aTableConfig['form::checkbox'] = array( 'label' => "<input class=\"select_all\" type=\"checkbox\" value=\"1\" onClick=\"CheckAll('#linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix} .selection', this.checked); oWidget".$this->m_iInputId.".OnSelectChange();\">", 'description' => Dict::S('UI:SelectAllToggle+'));
+
+		foreach(MetaModel::FlattenZList(MetaModel::GetZListItems($this->m_sLinkedClass, 'list')) as $sAttCode)
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sAttCode);
+			if ($sStateAttCode == $sAttCode)
+			{
+				// State attribute is always hidden from the UI
+			}
+			else if ($oAttDef->IsWritable() && ($sAttCode != $sExtKeyToMe) && ($sAttCode != $this->m_sExtKeyToRemote) && ($sAttCode != 'finalclass'))
+			{
+				$iFlags = MetaModel::GetAttributeFlags($this->m_sLinkedClass, $sDefaultState, $sAttCode);				
+				if ( !($iFlags & OPT_ATT_HIDDEN) && !($iFlags & OPT_ATT_READONLY) )
+				{
+					$this->m_aEditableFields[] = $sAttCode;
+					$this->m_aTableConfig[$sAttCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());				
+				}
+			}
+		}
+		
+		$this->m_aTableConfig['static::key'] = array( 'label' => MetaModel::GetName($this->m_sRemoteClass), 'description' => MetaModel::GetClassDescription($this->m_sRemoteClass));
+		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		{
+			// TO DO: check the state of the attribute: hidden or visible ?
+			if ($sFieldCode != 'finalclass')
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sRemoteClass, $sFieldCode);
+				$this->m_aTableConfig['static::'.$sFieldCode] = array( 'label' => $oAttDef->GetLabel(), 'description' => $oAttDef->GetDescription());
+			}
+		}
+	}
+
+	/**
+	 * A one-row form for editing a link record
+	 *
+	 * @param WebPage $oP Web page used for the ouput
+	 * @param DBObject $oLinkedObj Remote object
+	 * @param mixed $linkObjOrId Either the object linked or a unique number for new link records to add
+	 * @param array $aArgs Extra context arguments
+	 * @param DBObject $oCurrentObj The object to which all the elements of the linked set refer to
+	 * @param int $iUniqueId A unique identifier of new links
+	 * @param boolean $bReadOnly Display link as editable or read-only. Default is false (editable)
+	 *
+	 * @return array The HTML fragment of the one-row form
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 * @throws \Exception
+	 */
+	protected function GetFormRow(WebPage $oP, DBObject $oLinkedObj, $linkObjOrId, $aArgs, $oCurrentObj, $iUniqueId, $bReadOnly = false)
+	{
+		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
+		$aRow = array();
+		$aFieldsMap = array();
+		if(is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
+		{
+			$key = $linkObjOrId->GetKey();
+			$iRemoteObjKey =  $linkObjOrId->Get($this->m_sExtKeyToRemote);
+			$sPrefix .= "[$key][";
+			$sNameSuffix = "]"; // To make a tabular form
+			$aArgs['prefix'] = $sPrefix;
+			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}{$key}";
+			$aArgs['this'] = $linkObjOrId;
+
+			if($bReadOnly)
+            {
+                $aRow['form::checkbox'] = "";
+                foreach($this->m_aEditableFields as $sFieldCode)
+                {
+                    $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
+                    $aRow[$sFieldCode] = $sDisplayValue;
+                }
+            }
+            else
+            {
+                $aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"$key\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"$key\">";
+                foreach($this->m_aEditableFields as $sFieldCode)
+                {
+                    $sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId->GetKey().']';
+                    $sSafeId = utils::GetSafeId($sFieldId);
+                    $sValue = $linkObjOrId->Get($sFieldCode);
+                    $sDisplayValue = $linkObjOrId->GetEditValue($sFieldCode);
+                    $oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
+                    $aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
+                        cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId, $sNameSuffix, 0, $aArgs).
+	                    '</div></div></div>';
+                    $aFieldsMap[$sFieldCode] = $sSafeId;
+                }
+            }
+
+			$sState = $linkObjOrId->GetState();
+		}
+		else
+		{
+			// form for creating a new record
+			if (is_object($linkObjOrId))
+			{
+				// New link existing only in memory
+				$oNewLinkObj = $linkObjOrId;
+				$iRemoteObjKey = $oNewLinkObj->Get($this->m_sExtKeyToRemote);
+				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
+			}
+			else
+			{
+				$iRemoteObjKey = $linkObjOrId;
+				$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
+				$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, $iRemoteObjKey);
+				$oNewLinkObj->Set($this->m_sExtKeyToRemote, $oRemoteObj); // Setting the extkey with the object alsoo fills the related external fields
+				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
+			}
+			$sPrefix .= "[-$iUniqueId][";
+			$sNameSuffix = "]"; // To make a tabular form
+			$aArgs['prefix'] = $sPrefix;
+			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".($iUniqueId < 0 ? -$iUniqueId : $iUniqueId);
+			$aArgs['this'] = $oNewLinkObj;
+			$aRow['form::checkbox'] = "<input class=\"selection\" data-remote-id=\"$iRemoteObjKey\" data-link-id=\"\" data-unique-id=\"$iUniqueId\" type=\"checkbox\" onClick=\"oWidget".$this->m_iInputId.".OnSelectChange();\" value=\"-$iUniqueId\">";
+			foreach($this->m_aEditableFields as $sFieldCode)
+			{
+				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.-$iUniqueId.']';
+				$sSafeId = utils::GetSafeId($sFieldId);
+				$sValue = $oNewLinkObj->Get($sFieldCode);
+				$sDisplayValue = $oNewLinkObj->GetEditValue($sFieldCode);
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
+				$aRow[$sFieldCode] = '<div class="field_container" style="border:none;"><div class="field_data"><div class="field_value">'.
+					cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $sValue, $sDisplayValue, $sSafeId /* id */, $sNameSuffix, 0, $aArgs).
+					'</div></div></div>';
+				$aFieldsMap[$sFieldCode] = $sSafeId;
+			}
+			$sState = '';
+
+			// Rows created with ajax call need OnLinkAdded call.
+			// Rows added before loading the form cannot call OnLinkAdded.
+			if ($iUniqueId > 0)
+			{
+				$oP->add_script(
+					<<<EOF
+PrepareWidgets();
+oWidget{$this->m_iInputId}.OnLinkAdded($iUniqueId, $iRemoteObjKey);
+EOF
+				);
+			}
+		}
+
+		if(!$bReadOnly)
+        {
+            $sExtKeyToMeId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToMe);
+            $aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
+            $aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
+
+            $sExtKeyToRemoteId = utils::GetSafeId($sPrefix.$this->m_sExtKeyToRemote);
+            $aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
+            $aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";
+        }
+
+		$iFieldsCount = count($aFieldsMap);
+		$sJsonFieldsMap = json_encode($aFieldsMap);
+		
+		$oP->add_script(
+<<<EOF
+var {$aArgs['wizHelper']} = new WizardHelper('{$this->m_sLinkedClass}', '', '$sState');
+{$aArgs['wizHelper']}.SetFieldsMap($sJsonFieldsMap);
+{$aArgs['wizHelper']}.SetFieldsCount($iFieldsCount);
+EOF
+		);
+		$aRow['static::key'] = $oLinkedObj->GetHyperLink();
+		foreach(MetaModel::GetZListItems($this->m_sRemoteClass, 'list') as $sFieldCode)
+		{
+			$aRow['static::'.$sFieldCode] = $oLinkedObj->GetAsHTML($sFieldCode);
+		}
+		return $aRow;
+	}
+
+	/**
+	 * Display one row of the whole form
+	 * @param WebPage $oP
+	 * @param array $aConfig
+	 * @param array $aRow
+	 * @param int $iRowId
+	 * @return string
+	 */
+	protected function DisplayFormRow(WebPage $oP, $aConfig, $aRow, $iRowId)
+	{
+		$sHtml = '';
+		$sHtml .= "<tr id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_row_$iRowId\">\n";
+		foreach($aConfig as $sName=>$void)
+		{
+			$sHtml .= "<td>".$aRow[$sName]."</td>\n";
+		}
+		$sHtml .= "</tr>\n";
+		
+		return $sHtml;
+	}
+	
+	/**
+	 * Display the table with the form for editing all the links at once
+	 * @param WebPage $oP The web page used for the output
+	 * @param array $aConfig The table's header configuration
+	 * @param array $aData The tabular data to be displayed
+	 * @return string Html fragment representing the form table
+	 */
+	protected function DisplayFormTable(WebPage $oP, $aConfig, $aData)
+	{
+		$sHtml = "<input type=\"hidden\" name=\"attr_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"\">";
+		$sHtml .= "<table class=\"listResults\">\n";
+		// Header
+		$sHtml .= "<thead>\n";
+		$sHtml .= "<tr>\n";
+		foreach($aConfig as $sName=>$aDef)
+		{
+			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
+		}
+		$sHtml .= "</tr>\n";
+		$sHtml .= "</thead>\n";
+		
+		// Content
+		$sHtml .= "</tbody>\n";
+		$sEmptyRowStyle = '';
+		if (count($aData) != 0)
+		{
+			$sEmptyRowStyle = 'style="display:none;"';
+		}
+
+		foreach($aData as $iRowId => $aRow)
+		{
+			$sHtml .= $this->DisplayFormRow($oP, $aConfig, $aRow, $iRowId);
+		}		
+		$sHtml .= "<tr $sEmptyRowStyle id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_empty_row\"><td colspan=\"".count($aConfig)."\" style=\"text-align:center;\">".Dict::S('UI:Message:EmptyList:UseAdd')."</td></tr>";
+		$sHtml .= "</tbody>\n";
+		
+		// Footer
+		$sHtml .= "</table>\n";
+		
+		return $sHtml;
+	}
+
+
+	/**
+	 * Get the HTML fragment corresponding to the linkset editing widget
+	 *
+	 * @param WebPage $oPage
+	 * @param DBObject|ormLinkSet $oValue
+	 * @param array $aArgs Extra context arguments
+	 * @param string $sFormPrefix prefix of the fields in the current form
+	 * @param DBObject $oCurrentObj the current object to which the linkset is related
+	 *
+	 * @return string The HTML fragment to be inserted into the page
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 */
+	public function Display(WebPage $oPage, $oValue, $aArgs = array(), $sFormPrefix, $oCurrentObj)
+	{
+		$sHtmlValue = '';
+		$sHtmlValue .= "<div id=\"linkedset_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
+		$sHtmlValue .= "<input type=\"hidden\" id=\"{$sFormPrefix}{$this->m_iInputId}\">\n";
+		$oValue->Rewind();
+		$aForm = array();
+		$iAddedId = 1; // Unique id for new links
+		while($oCurrentLink = $oValue->Fetch())
+		{
+		    // We try to retrieve the remote object as usual
+			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote), false /* Must not be found */);
+			// If successful, it means that we can edit its link
+			if($oLinkedObj !== null)
+            {
+                $bReadOnly = false;
+            }
+            // Else we retrieve it without restrictions (silos) and will display its link as readonly
+            else
+            {
+                $bReadOnly = true;
+                $oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $oCurrentLink->Get($this->m_sExtKeyToRemote), false /* Must not be found */, true);
+            }
+
+            if ($oCurrentLink->IsNew())
+            {
+                $key = -($iAddedId++);
+            }
+            else
+            {
+                $key = $oCurrentLink->GetKey();
+            }
+            $aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj, $key, $bReadOnly);
+		}
+		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
+		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
+		// Don't automatically launch the search if the table is huge
+		$bDoSearch = !utils::IsHighCardinality($this->m_sRemoteClass);
+		$sJSDoSearch = $bDoSearch ? 'true' : 'false';
+		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
+		$oPage->add_ready_script(<<<EOF
+		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper, '{$this->m_sExtKeyToRemote}', $sJSDoSearch);
+		oWidget{$this->m_iInputId}.Init();
+EOF
+);
+		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget{$this->m_iInputId}.RemoveSelected();\" >";
+		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"><span id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></span>\n";
+		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
+		$sHtmlValue .= "</div>\n";
+		$oPage->add_at_the_end("<div id=\"dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}\"></div>"); // To prevent adding forms inside the main form
+        return $sHtmlValue;
+	}
+
+	/**
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	protected static function GetTargetClass($sClass, $sAttCode)
+	{
+		/** @var AttributeLinkedSet $oAttDef */
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		$sLinkedClass = $oAttDef->GetLinkedClass();
+		$sTargetClass = '';
+		switch(get_class($oAttDef))
+		{
+			case 'AttributeLinkedSetIndirect':
+			/** @var AttributeExternalKey $oLinkingAttDef */
+			/** @var AttributeLinkedSetIndirect $oAttDef */
+			$oLinkingAttDef = 	MetaModel::GetAttributeDef($sLinkedClass, $oAttDef->GetExtKeyToRemote());
+			$sTargetClass = $oLinkingAttDef->GetTargetClass();
+			break;
+
+			case 'AttributeLinkedSet':
+			$sTargetClass = $sLinkedClass;
+			break;
+		}
+		
+		return $sTargetClass;
+	}
+
+	/**
+	 * @param WebPage $oPage
+	 * @param DBObject $oCurrentObj
+	 * @param $sJson
+	 * @param array $aAlreadyLinkedIds
+	 *
+	 * @throws DictExceptionMissingString
+	 * @throws Exception
+	 */
+	public function GetObjectPickerDialog($oPage, $oCurrentObj, $sJson, $aAlreadyLinkedIds = array(), $aPrefillFormParam = array())
+	{
+		$sHtml = "<div class=\"wizContainer\" style=\"vertical-align:top;\">\n";
+
+		$oAlreadyLinkedFilter = new DBObjectSearch($this->m_sRemoteClass);
+		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
+		{
+			$oAlreadyLinkedFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
+			$oAlreadyLinkedExpression = $oAlreadyLinkedFilter->GetCriteria();
+			$sAlreadyLinkedExpression = $oAlreadyLinkedExpression->Render();
+		}
+		else
+		{
+			$sAlreadyLinkedExpression = '';
+		}
+
+		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+
+		if(!empty($oCurrentObj))
+		{
+			$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+			$aPrefillFormParam['filter'] = $oFilter;
+			$aPrefillFormParam['dest_class'] = $this->m_sRemoteClass;
+			$oCurrentObj->PrefillForm('search', $aPrefillFormParam);
+		}
+		$oBlock = new DisplayBlock($oFilter, 'search', false);
+		$sHtml .= $oBlock->GetDisplay($oPage, "SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+			array(
+				'menu' => false,
+				'result_list_outer_selector' => "SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'table_id' => 'add_'.$this->m_sAttCode,
+				'table_inner_id' => "ResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}",
+				'selection_mode' => true,
+				'json' => $sJson,
+				'cssCount' => '#count_'.$this->m_sAttCode.$this->m_sNameSuffix,
+				'query_params' => $oFilter->GetInternalParams(),
+				'hidden_criteria' => $sAlreadyLinkedExpression,
+			));
+		$sHtml .= "<form id=\"ObjectsAddForm_{$this->m_sAttCode}{$this->m_sNameSuffix}\">\n";
+		$sHtml .= "<div id=\"SearchResultsToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}\" style=\"vertical-align:top;background: #fff;height:100%;overflow:auto;padding:0;border:0;\">\n";
+		$sHtml .= "<div style=\"background: #fff; border:0; text-align:center; vertical-align:middle;\"><p>".Dict::S('UI:Message:EmptyList:UseSearchForm')."</p></div>\n";
+		$sHtml .= "</div>\n";
+		$sHtml .= "<input type=\"hidden\" id=\"count_{$this->m_sAttCode}{$this->m_sNameSuffix}\" value=\"0\"/>";
+		$sHtml .= "<input type=\"button\" value=\"".Dict::S('UI:Button:Cancel')."\" onClick=\"$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('close');\">&nbsp;&nbsp;<input id=\"btn_ok_{$this->m_sAttCode}{$this->m_sNameSuffix}\" disabled=\"disabled\" type=\"button\" onclick=\"return oWidget{$this->m_iInputId}.DoAddObjects(this.id);\" value=\"".Dict::S('UI:Button:Add')."\">";
+		$sHtml .= "</div>\n";
+		$sHtml .= "</form>\n";
+		$oPage->add($sHtml);
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog({ width: $(window).width()*0.8, height: $(window).height()*0.8, autoOpen: false, modal: true, resizeStop: oWidget{$this->m_iInputId}.UpdateSizes });");
+		$oPage->add_ready_script("$('#dlg_{$this->m_sAttCode}{$this->m_sNameSuffix}').dialog('option', {title:'".addslashes(Dict::Format('UI:AddObjectsOf_Class_LinkedWith_Class', MetaModel::GetName($this->m_sLinkedClass), MetaModel::GetName($this->m_sClass)))."'});");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix} form').bind('submit.uilinksWizard', oWidget{$this->m_iInputId}.SearchObjectsToAdd);");
+		$oPage->add_ready_script("$('#SearchFormToAdd_{$this->m_sAttCode}{$this->m_sNameSuffix}').resize(oWidget{$this->m_iInputId}.UpdateSizes);");
+	}
+
+	/**
+	 * Search for objects to be linked to the current object (i.e "remote" objects)
+	 *
+	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of
+	 *     m_sRemoteClass
+	 * @param array $aAlreadyLinkedIds List of IDs of objects of "remote" class already linked, to be filtered out of
+	 *     the search
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public function SearchObjectsToAdd(WebPage $oP, $sRemoteClass = '', $aAlreadyLinkedIds = array(), $oCurrentObj = null)
+	{
+		if ($sRemoteClass != '')
+		{
+			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
+			$oFilter = new DBObjectSearch($sRemoteClass);
+		}
+		else
+		{
+			// No remote class specified use the one defined in the linkedset
+			$oFilter = new DBObjectSearch($this->m_sRemoteClass);		
+		}
+		if (!$this->m_bDuplicatesAllowed && count($aAlreadyLinkedIds) > 0)
+		{
+			$oFilter->AddCondition('id', $aAlreadyLinkedIds, 'NOTIN');
+		}
+		$this->SetSearchDefaultFromContext($oCurrentObj, $oFilter);
+		$oBlock = new DisplayBlock($oFilter, 'list', false);
+		$oBlock->Display($oP, "ResultsToAdd_{$this->m_sAttCode}", array('menu' => false, 'cssCount'=> '#count_'.$this->m_sAttCode.$this->m_sNameSuffix , 'selection_mode' => true, 'table_id' => 'add_'.$this->m_sAttCode)); // Don't display the 'Actions' menu on the results
+	}
+
+	/**
+	 * @param WebPage $oP
+	 * @param int $iMaxAddedId
+	 * @param $oFullSetFilter
+	 * @param DBObject $oCurrentObj
+	 *
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 */
+	public function DoAddObjects(WebPage $oP, $iMaxAddedId, $oFullSetFilter, $oCurrentObj)
+	{
+		$aLinkedObjectIds = utils::ReadMultipleSelection($oFullSetFilter);
+
+		$iAdditionId = $iMaxAddedId + 1;
+		foreach($aLinkedObjectIds as $iObjectId)
+		{
+			$oLinkedObj = MetaModel::GetObject($this->m_sRemoteClass, $iObjectId, false);
+			if (is_object($oLinkedObj))
+			{
+				$aRow = $this->GetFormRow($oP, $oLinkedObj, $iObjectId, array(), $oCurrentObj, $iAdditionId); // Not yet created link get negative Ids
+				$oP->add($this->DisplayFormRow($oP, $this->m_aTableConfig, $aRow, -$iAdditionId));
+				$iAdditionId++;
+			}
+			else
+			{
+				$oP->p(Dict::Format('UI:Error:Object_Class_Id_NotFound', $this->m_sLinkedClass, $iObjectId));
+			}
+		}
+	}
+
+	/**
+	 * Initializes the default search parameters based on 1) a 'current' object and 2) the silos defined by the context
+	 *
+	 * @param DBObject $oSourceObj
+	 * @param DBSearch|DBObjectSearch $oSearch
+	 *
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	protected function SetSearchDefaultFromContext($oSourceObj, &$oSearch)
+	{
+		$oAppContext = new ApplicationContext();
+		$sSrcClass = get_class($oSourceObj);
+		$sDestClass = $oSearch->GetClass();
+		foreach($oAppContext->GetNames() as $key)
+		{
+			// Find the value of the object corresponding to each 'context' parameter
+			$aCallSpec = array($sSrcClass, 'MapContextParam');
+			$sAttCode = '';
+			if (is_callable($aCallSpec))
+			{
+				$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
+			}
+
+			if (MetaModel::IsValidAttCode($sSrcClass, $sAttCode))
+			{
+				$defaultValue = $oSourceObj->Get($sAttCode);
+
+				// Find the attcode for the same 'context' parameter in the destination class
+				// and sets its value as the default value for the search condition
+				$aCallSpec = array($sDestClass, 'MapContextParam');
+				$sAttCode = '';
+				if (is_callable($aCallSpec))
+				{
+					$sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter					
+				}
+	
+				if (MetaModel::IsValidAttCode($sDestClass, $sAttCode) && !empty($defaultValue))
+				{
+					// Add Hierarchical condition if hierarchical key
+					$oAttDef = MetaModel::GetAttributeDef($sDestClass, $sAttCode);
+					if (isset($oAttDef) && ($oAttDef->IsExternalKey()))
+					{
+						try
+						{
+							/** @var AttributeExternalKey $oAttDef */
+							$sTargetClass = $oAttDef->GetTargetClass();
+							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sTargetClass);
+							if ($sHierarchicalKeyCode !== false)
+							{
+								$oFilter = new DBObjectSearch($sTargetClass);
+								$oFilter->AddCondition('id', $defaultValue);
+								$oHKFilter = new DBObjectSearch($sTargetClass);
+								$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
+								$oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
+							}
+						} catch (Exception $e)
+						{
+						}
+					}
+					else
+					{
+						$oSearch->AddCondition($sAttCode, $defaultValue);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/application/uiwizard.class.inc.php b/application/uiwizard.class.inc.php
index b57948449..14bc90e06 100644
--- a/application/uiwizard.class.inc.php
+++ b/application/uiwizard.class.inc.php
@@ -1,331 +1,331 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class UIWizard
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class UIWizard
-{
-	protected $m_oPage;
-	protected $m_sClass;
-	protected $m_sTargetState;
-	protected $m_aWizardSteps;
-	
-	public function __construct($oPage, $sClass, $sTargetState = '')
-	{
-		$this->m_oPage = $oPage;
-		$this->m_sClass = $sClass;
-		if (empty($sTargetState))
-		{
-			$sTargetState = MetaModel::GetDefaultState($sClass);
-		}
-		$this->m_sTargetState = $sTargetState;
-		$this->m_aWizardSteps = $this->ComputeWizardStructure();
-	}
-	
-	public function GetObjectClass() { return $this->m_sClass; }
-	public function GetTargetState() { return $this->m_sTargetState; }
-	public function GetWizardStructure() { return $this->m_aWizardSteps; }
-	
-	/**
-	 * Displays one step of the wizard
-	 */	 
-	public function DisplayWizardStep($aStep, $iStepIndex, &$iMaxInputId, &$aFieldsMap, $bFinishEnabled = false, $aArgs = array())
-	{
-		if ($iStepIndex == 1) // one big form that contains everything, to make sure that the uploaded files are posted too
-		{
-			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php\">\n");
-		}
-		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
-		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
-		$aStates = MetaModel::EnumStates($this->m_sClass);
-		$aDetails = array();
-		$sJSHandlerCode = ''; // Javascript code to be executed each time this step of the wizard is entered
-		foreach($aStep as $sAttCode)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-			if ($oAttDef->IsWritable())
-			{
-				$sAttLabel = $oAttDef->GetLabel();
-				$iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
-		
-				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
-				{
-					$aFields[$sAttCode] = array();
-					foreach($aPrerequisites as $sCode)
-					{
-						$aFields[$sAttCode][$sCode] = '';
-					}
-				}
-				if (count($aPrerequisites) > 0)
-				{
-					$aOptions[] = 'Prerequisites: '.implode(', ', $aPrerequisites);
-				}
-				
-				$sFieldFlag = (($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) || (!$oAttDef->IsNullAllowed()) )? ' <span class="hilite">*</span>' : '';
-				$oDefaultValuesSet = $oAttDef->GetDefaultValue(/* $oObject->ToArgs() */); // @@@ TO DO: get the object's current value if the object exists
-				$sHTMLValue = cmdbAbstractObject::GetFormElementForField($this->m_oPage, $this->m_sClass, $sAttCode, $oAttDef, $oDefaultValuesSet, '', "att_$iMaxInputId", '', $iOptions, $aArgs);
-				$aFieldsMap["att_$iMaxInputId"] = $sAttCode;
-				$aDetails[] = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().$sFieldFlag.'</span>', 'value' => "<span id=\"field_att_$iMaxInputId\">$sHTMLValue</span>");
-				if ($oAttDef->GetValuesDef() != null)
-				{
-					$sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
-				}
-				if ($oAttDef->GetDefaultValue() != null)
-				{
-					$sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
-				}
-				if ($oAttDef->IsLinkSet())
-				{
-					$sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
-				}
-				$iMaxInputId++;
-			}
-		}
-		//$aDetails[] = array('label' => '', 'value' => '<input type="button" value="Next &gt;&gt;">');
-		$this->m_oPage->details($aDetails);
-		$sBackButtonDisabled = ($iStepIndex <= 1) ? 'disabled' : '';
-		$sDisabled = $bFinishEnabled ? '' : 'disabled';
-		$nbSteps = count($this->m_aWizardSteps['mandatory']) + count($this->m_aWizardSteps['optional']);
-		$this->m_oPage->add("<div style=\"text-align:center\">
-		<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" $sBackButtonDisabled onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />
-		<input type=\"button\" value=\"".Dict::S('UI:Button:Next')."\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
-		<input type=\"button\" value=\"".Dict::S('UI:Button:Finish')."\" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
-		</div>\n");
-		$this->m_oPage->add_script("
-function OnEnterStep{$iStepIndex}()
-{
-	oWizardHelper.ResetQuery();
-	oWizardHelper.UpdateWizard();
-	
-$sJSHandlerCode
-
-	oWizardHelper.AjaxQueryServer();
-}
-");
-		$this->m_oPage->add("</div>\n\n");
-	}	
-
-	/**
-	 * Display the final step of the wizard: a confirmation screen
-	 */	 	
-	public function DisplayFinalStep($iStepIndex, $aFieldsMap)
-	{
-		$oAppContext = new ApplicationContext();
-		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
-		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
-		$this->m_oPage->P(Dict::S('UI:Wizard:FinalStepTitle'));
-		$this->m_oPage->add("<input type=\"hidden\" name=\"operation\" value=\"wizard_apply_new\" />\n");
-		$this->m_oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\" />\n");
-		$this->m_oPage->add("<input type=\"hidden\" id=\"wizard_json_obj\" name=\"json_obj\" value=\"\" />\n");
-		$sScript = "function OnEnterStep$iStepIndex() {\n";
-		foreach($aFieldsMap as $iInputId => $sAttCode)
-		{
-			$sScript .= "\toWizardHelper.UpdateCurrentValue('$sAttCode');\n";		
-		}
-		$sScript .= "\toWizardHelper.Preview('object_preview');\n";		
-		$sScript .= "\t$('#wizard_json_obj').val(oWizardHelper.ToJSON());\n";		
-		$sScript .= "}\n";
-		$this->m_oPage->add_script($sScript);
-		$this->m_oPage->add("<div id=\"object_preview\">\n");
-		$this->m_oPage->add("</div>\n");
-		$this->m_oPage->add($oAppContext->GetForForm());		
-		$this->m_oPage->add("<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />");
-		$this->m_oPage->add("<input type=\"submit\" value=\"Create ".MetaModel::GetName($this->m_sClass)."\" />\n");
-		$this->m_oPage->add("</div>\n");
-		$this->m_oPage->add("</form>\n");
-	}	
-	/**
-	 * Compute the order of the fields & pages in the wizard
-	 * @param $oPage iTopWebPage The current page (used to display error messages) 
-	 * @param $sClass string Name of the class
-	 * @param $sStateCode string Code of the target state of the object
-	 * @return hash Two dimensional array: each element represents the list of fields for a given page   
-	 */
-	protected function ComputeWizardStructure()
-	{
-		$aWizardSteps = array( 'mandatory' => array(), 'optional' => array());
-		$aFieldsDone = array(); // Store all the fields that are already covered by a previous step of the wizard
-	
-		$aStates = MetaModel::EnumStates($this->m_sClass);
-		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
-		
-		$aMandatoryAttributes = array();
-		// Some attributes are always mandatory independently of the state machine (if any)
-        foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
-        {
-            $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-            if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() && 
-			    $oAttDef->IsWritable() && ($sAttCode != $sStateAttCode) )
-            {
-                $aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY;
-            }
-        }
-
-        // Now check the attributes that are mandatory in the specified state
-		if ( (!empty($this->m_sTargetState)) && (count($aStates[$this->m_sTargetState]['attribute_list']) > 0) )
-		{
-			// Check all the fields that *must* be included in the wizard for this
-			// particular target state
-			$aFields = array();
-			foreach($aStates[$this->m_sTargetState]['attribute_list'] as $sAttCode => $iOptions)
-			{
-				if ( (isset($aMandatoryAttributes[$sAttCode])) && 
-					 ($aMandatoryAttributes[$sAttCode] & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) )
-				{
-					$aMandatoryAttributes[$sAttCode] |= $iOptions;
-				}
-				else
-				{
-					$aMandatoryAttributes[$sAttCode] = $iOptions;
-				}
-			}
-		}
-        
-		// Check all the fields that *must* be included in the wizard
-		// i.e. all mandatory, must-change or must-prompt fields that are
-		// not also read-only or hidden.
-		// Some fields may be required (null not allowed) from the database
-		// perspective, but hidden or read-only from the user interface perspective 
-		$aFields = array();
-		foreach($aMandatoryAttributes as $sAttCode => $iOptions)
-		{
-			if ( ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) &&
-				 !($iOptions & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) )
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				$aFields[$sAttCode] = array();
-				foreach($aPrerequisites as $sCode)
-				{
-					$aFields[$sAttCode][$sCode] = '';
-				}
-			}
-		}
-			
-		// Now use the dependencies between the fields to order them
-		// Start from the order of the 'details'
-		$aList = MetaModel::FlattenZlist(MetaModel::GetZListItems($this->m_sClass, 'details'));
-		$index = 0;
-		$aOrder = array();
-		foreach($aFields as $sAttCode => $void)
-		{
-				$aOrder[$sAttCode] = 999; // At the end of the list...
-		}
-		foreach($aList as $sAttCode)
-		{
-			if (array_key_exists($sAttCode, $aFields))
-			{
-				$aOrder[$sAttCode] = $index;
-			}
-			$index++;
-		}
-		foreach($aFields as $sAttCode => $aDependencies)
-		{
-			// All fields with no remaining dependencies can be entered at this
-			// step of the wizard
-			if (count($aDependencies) > 0)
-			{
-				$iMaxPos = 0;
-				// Remove this field from the dependencies of the other fields
-				foreach($aDependencies as $sDependentAttCode => $void)
-				{
-					// position the current field after the ones it depends on
-					$iMaxPos = max($iMaxPos, 1+$aOrder[$sDependentAttCode]);
-				}
-			}
-		}
-		asort($aOrder);
-		$aCurrentStep = array();
-		foreach($aOrder as $sAttCode => $rank)
-		{
-			$aCurrentStep[] = $sAttCode;
-			$aFieldsDone[$sAttCode] = '';
-		}
-		$aWizardSteps['mandatory'][] = $aCurrentStep;
-
-
-		// Now computes the steps to fill the optional fields
-		$aFields = array(); // reset
-		foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
-		{
-			$iOptions = (isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode])) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;				
-			if ( ($sStateAttCode != $sAttCode) &&
-				 (!$oAttDef->IsExternalField()) &&
-				 (($iOptions & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)) == 0) &&
-				 (!isset($aFieldsDone[$sAttCode])) )
-				 
-			{
-				// 'State', external fields, read-only and hidden fields
-				// and fields that are already listed in the wizard
-				// are removed from the 'optional' part of the wizard
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
-				$aFields[$sAttCode] = array();
-				foreach($aPrerequisites as $sCode)
-				{
-					if (!isset($aFieldsDone[$sCode]))
-					{
-						// retain only the dependencies that were not covered
-						// in the 'mandatory' part of the wizard
-						$aFields[$sAttCode][$sCode] = '';
-					}
-				}
-			}
-		}
-		// Now use the dependencies between the fields to order them
-		while(count($aFields) > 0)
-		{
-			$aCurrentStep = array();
-			foreach($aFields as $sAttCode => $aDependencies)
-			{
-				// All fields with no remaining dependencies can be entered at this
-				// step of the wizard
-				if (count($aDependencies) == 0)
-				{
-					$aCurrentStep[] = $sAttCode;
-					$aFieldsDone[$sAttCode] = '';
-					unset($aFields[$sAttCode]);
-					// Remove this field from the dependencies of the other fields
-					foreach($aFields as $sUpdatedCode => $aDummy)
-					{
-						// remove the dependency
-						unset($aFields[$sUpdatedCode][$sAttCode]);
-					}
-				}
-			}
-			if (count($aCurrentStep) == 0)
-			{
-				// This step of the wizard would contain NO field !
-				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
-				print_r($aFields);
-				break;
-			}
-			$aWizardSteps['optional'][] = $aCurrentStep;
-		}
-		return $aWizardSteps;
-	
-	} 
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class UIWizard
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class UIWizard
+{
+	protected $m_oPage;
+	protected $m_sClass;
+	protected $m_sTargetState;
+	protected $m_aWizardSteps;
+	
+	public function __construct($oPage, $sClass, $sTargetState = '')
+	{
+		$this->m_oPage = $oPage;
+		$this->m_sClass = $sClass;
+		if (empty($sTargetState))
+		{
+			$sTargetState = MetaModel::GetDefaultState($sClass);
+		}
+		$this->m_sTargetState = $sTargetState;
+		$this->m_aWizardSteps = $this->ComputeWizardStructure();
+	}
+	
+	public function GetObjectClass() { return $this->m_sClass; }
+	public function GetTargetState() { return $this->m_sTargetState; }
+	public function GetWizardStructure() { return $this->m_aWizardSteps; }
+	
+	/**
+	 * Displays one step of the wizard
+	 */	 
+	public function DisplayWizardStep($aStep, $iStepIndex, &$iMaxInputId, &$aFieldsMap, $bFinishEnabled = false, $aArgs = array())
+	{
+		if ($iStepIndex == 1) // one big form that contains everything, to make sure that the uploaded files are posted too
+		{
+			$this->m_oPage->add("<form method=\"post\" enctype=\"multipart/form-data\" action=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php\">\n");
+		}
+		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
+		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
+		$aStates = MetaModel::EnumStates($this->m_sClass);
+		$aDetails = array();
+		$sJSHandlerCode = ''; // Javascript code to be executed each time this step of the wizard is entered
+		foreach($aStep as $sAttCode)
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+			if ($oAttDef->IsWritable())
+			{
+				$sAttLabel = $oAttDef->GetLabel();
+				$iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
+		
+				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+				if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
+				{
+					$aFields[$sAttCode] = array();
+					foreach($aPrerequisites as $sCode)
+					{
+						$aFields[$sAttCode][$sCode] = '';
+					}
+				}
+				if (count($aPrerequisites) > 0)
+				{
+					$aOptions[] = 'Prerequisites: '.implode(', ', $aPrerequisites);
+				}
+				
+				$sFieldFlag = (($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) || (!$oAttDef->IsNullAllowed()) )? ' <span class="hilite">*</span>' : '';
+				$oDefaultValuesSet = $oAttDef->GetDefaultValue(/* $oObject->ToArgs() */); // @@@ TO DO: get the object's current value if the object exists
+				$sHTMLValue = cmdbAbstractObject::GetFormElementForField($this->m_oPage, $this->m_sClass, $sAttCode, $oAttDef, $oDefaultValuesSet, '', "att_$iMaxInputId", '', $iOptions, $aArgs);
+				$aFieldsMap["att_$iMaxInputId"] = $sAttCode;
+				$aDetails[] = array('label' => '<span title="'.$oAttDef->GetDescription().'">'.$oAttDef->GetLabel().$sFieldFlag.'</span>', 'value' => "<span id=\"field_att_$iMaxInputId\">$sHTMLValue</span>");
+				if ($oAttDef->GetValuesDef() != null)
+				{
+					$sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
+				}
+				if ($oAttDef->GetDefaultValue() != null)
+				{
+					$sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
+				}
+				if ($oAttDef->IsLinkSet())
+				{
+					$sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
+				}
+				$iMaxInputId++;
+			}
+		}
+		//$aDetails[] = array('label' => '', 'value' => '<input type="button" value="Next &gt;&gt;">');
+		$this->m_oPage->details($aDetails);
+		$sBackButtonDisabled = ($iStepIndex <= 1) ? 'disabled' : '';
+		$sDisabled = $bFinishEnabled ? '' : 'disabled';
+		$nbSteps = count($this->m_aWizardSteps['mandatory']) + count($this->m_aWizardSteps['optional']);
+		$this->m_oPage->add("<div style=\"text-align:center\">
+		<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" $sBackButtonDisabled onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />
+		<input type=\"button\" value=\"".Dict::S('UI:Button:Next')."\" onClick=\"GoToStep($iStepIndex, 1+$iStepIndex)\" />
+		<input type=\"button\" value=\"".Dict::S('UI:Button:Finish')."\" $sDisabled onClick=\"GoToStep($iStepIndex, 1+$nbSteps)\" />
+		</div>\n");
+		$this->m_oPage->add_script("
+function OnEnterStep{$iStepIndex}()
+{
+	oWizardHelper.ResetQuery();
+	oWizardHelper.UpdateWizard();
+	
+$sJSHandlerCode
+
+	oWizardHelper.AjaxQueryServer();
+}
+");
+		$this->m_oPage->add("</div>\n\n");
+	}	
+
+	/**
+	 * Display the final step of the wizard: a confirmation screen
+	 */	 	
+	public function DisplayFinalStep($iStepIndex, $aFieldsMap)
+	{
+		$oAppContext = new ApplicationContext();
+		$this->m_oPage->add("<div class=\"wizContainer\" id=\"wizStep$iStepIndex\" style=\"display:none;\">\n");
+		$this->m_oPage->add("<a name=\"step$iStepIndex\" />\n");
+		$this->m_oPage->P(Dict::S('UI:Wizard:FinalStepTitle'));
+		$this->m_oPage->add("<input type=\"hidden\" name=\"operation\" value=\"wizard_apply_new\" />\n");
+		$this->m_oPage->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\" />\n");
+		$this->m_oPage->add("<input type=\"hidden\" id=\"wizard_json_obj\" name=\"json_obj\" value=\"\" />\n");
+		$sScript = "function OnEnterStep$iStepIndex() {\n";
+		foreach($aFieldsMap as $iInputId => $sAttCode)
+		{
+			$sScript .= "\toWizardHelper.UpdateCurrentValue('$sAttCode');\n";		
+		}
+		$sScript .= "\toWizardHelper.Preview('object_preview');\n";		
+		$sScript .= "\t$('#wizard_json_obj').val(oWizardHelper.ToJSON());\n";		
+		$sScript .= "}\n";
+		$this->m_oPage->add_script($sScript);
+		$this->m_oPage->add("<div id=\"object_preview\">\n");
+		$this->m_oPage->add("</div>\n");
+		$this->m_oPage->add($oAppContext->GetForForm());		
+		$this->m_oPage->add("<input type=\"button\" value=\"".Dict::S('UI:Button:Back')."\" onClick=\"GoToStep($iStepIndex, $iStepIndex - 1)\" />");
+		$this->m_oPage->add("<input type=\"submit\" value=\"Create ".MetaModel::GetName($this->m_sClass)."\" />\n");
+		$this->m_oPage->add("</div>\n");
+		$this->m_oPage->add("</form>\n");
+	}	
+	/**
+	 * Compute the order of the fields & pages in the wizard
+	 * @param $oPage iTopWebPage The current page (used to display error messages) 
+	 * @param $sClass string Name of the class
+	 * @param $sStateCode string Code of the target state of the object
+	 * @return hash Two dimensional array: each element represents the list of fields for a given page   
+	 */
+	protected function ComputeWizardStructure()
+	{
+		$aWizardSteps = array( 'mandatory' => array(), 'optional' => array());
+		$aFieldsDone = array(); // Store all the fields that are already covered by a previous step of the wizard
+	
+		$aStates = MetaModel::EnumStates($this->m_sClass);
+		$sStateAttCode = MetaModel::GetStateAttributeCode($this->m_sClass);
+		
+		$aMandatoryAttributes = array();
+		// Some attributes are always mandatory independently of the state machine (if any)
+        foreach(MetaModel::GetAttributesList($this->m_sClass) as $sAttCode)
+        {
+            $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+            if (!$oAttDef->IsExternalField() && !$oAttDef->IsNullAllowed() && 
+			    $oAttDef->IsWritable() && ($sAttCode != $sStateAttCode) )
+            {
+                $aMandatoryAttributes[$sAttCode] = OPT_ATT_MANDATORY;
+            }
+        }
+
+        // Now check the attributes that are mandatory in the specified state
+		if ( (!empty($this->m_sTargetState)) && (count($aStates[$this->m_sTargetState]['attribute_list']) > 0) )
+		{
+			// Check all the fields that *must* be included in the wizard for this
+			// particular target state
+			$aFields = array();
+			foreach($aStates[$this->m_sTargetState]['attribute_list'] as $sAttCode => $iOptions)
+			{
+				if ( (isset($aMandatoryAttributes[$sAttCode])) && 
+					 ($aMandatoryAttributes[$sAttCode] & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) )
+				{
+					$aMandatoryAttributes[$sAttCode] |= $iOptions;
+				}
+				else
+				{
+					$aMandatoryAttributes[$sAttCode] = $iOptions;
+				}
+			}
+		}
+        
+		// Check all the fields that *must* be included in the wizard
+		// i.e. all mandatory, must-change or must-prompt fields that are
+		// not also read-only or hidden.
+		// Some fields may be required (null not allowed) from the database
+		// perspective, but hidden or read-only from the user interface perspective 
+		$aFields = array();
+		foreach($aMandatoryAttributes as $sAttCode => $iOptions)
+		{
+			if ( ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT)) &&
+				 !($iOptions & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) )
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+				$aFields[$sAttCode] = array();
+				foreach($aPrerequisites as $sCode)
+				{
+					$aFields[$sAttCode][$sCode] = '';
+				}
+			}
+		}
+			
+		// Now use the dependencies between the fields to order them
+		// Start from the order of the 'details'
+		$aList = MetaModel::FlattenZlist(MetaModel::GetZListItems($this->m_sClass, 'details'));
+		$index = 0;
+		$aOrder = array();
+		foreach($aFields as $sAttCode => $void)
+		{
+				$aOrder[$sAttCode] = 999; // At the end of the list...
+		}
+		foreach($aList as $sAttCode)
+		{
+			if (array_key_exists($sAttCode, $aFields))
+			{
+				$aOrder[$sAttCode] = $index;
+			}
+			$index++;
+		}
+		foreach($aFields as $sAttCode => $aDependencies)
+		{
+			// All fields with no remaining dependencies can be entered at this
+			// step of the wizard
+			if (count($aDependencies) > 0)
+			{
+				$iMaxPos = 0;
+				// Remove this field from the dependencies of the other fields
+				foreach($aDependencies as $sDependentAttCode => $void)
+				{
+					// position the current field after the ones it depends on
+					$iMaxPos = max($iMaxPos, 1+$aOrder[$sDependentAttCode]);
+				}
+			}
+		}
+		asort($aOrder);
+		$aCurrentStep = array();
+		foreach($aOrder as $sAttCode => $rank)
+		{
+			$aCurrentStep[] = $sAttCode;
+			$aFieldsDone[$sAttCode] = '';
+		}
+		$aWizardSteps['mandatory'][] = $aCurrentStep;
+
+
+		// Now computes the steps to fill the optional fields
+		$aFields = array(); // reset
+		foreach(MetaModel::ListAttributeDefs($this->m_sClass) as $sAttCode=>$oAttDef)
+		{
+			$iOptions = (isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode])) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;				
+			if ( ($sStateAttCode != $sAttCode) &&
+				 (!$oAttDef->IsExternalField()) &&
+				 (($iOptions & (OPT_ATT_HIDDEN | OPT_ATT_READONLY)) == 0) &&
+				 (!isset($aFieldsDone[$sAttCode])) )
+				 
+			{
+				// 'State', external fields, read-only and hidden fields
+				// and fields that are already listed in the wizard
+				// are removed from the 'optional' part of the wizard
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+				$aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+				$aFields[$sAttCode] = array();
+				foreach($aPrerequisites as $sCode)
+				{
+					if (!isset($aFieldsDone[$sCode]))
+					{
+						// retain only the dependencies that were not covered
+						// in the 'mandatory' part of the wizard
+						$aFields[$sAttCode][$sCode] = '';
+					}
+				}
+			}
+		}
+		// Now use the dependencies between the fields to order them
+		while(count($aFields) > 0)
+		{
+			$aCurrentStep = array();
+			foreach($aFields as $sAttCode => $aDependencies)
+			{
+				// All fields with no remaining dependencies can be entered at this
+				// step of the wizard
+				if (count($aDependencies) == 0)
+				{
+					$aCurrentStep[] = $sAttCode;
+					$aFieldsDone[$sAttCode] = '';
+					unset($aFields[$sAttCode]);
+					// Remove this field from the dependencies of the other fields
+					foreach($aFields as $sUpdatedCode => $aDummy)
+					{
+						// remove the dependency
+						unset($aFields[$sUpdatedCode][$sAttCode]);
+					}
+				}
+			}
+			if (count($aCurrentStep) == 0)
+			{
+				// This step of the wizard would contain NO field !
+				$this->m_oPage->add(Dict::S('UI:Error:WizardCircularReferenceInDependencies'));
+				print_r($aFields);
+				break;
+			}
+			$aWizardSteps['optional'][] = $aCurrentStep;
+		}
+		return $aWizardSteps;
+	
+	} 
+}
+?>
diff --git a/application/webpage.class.inc.php b/application/webpage.class.inc.php
index 8a7cd06e7..b7224ca4b 100644
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -1,1243 +1,1243 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class WebPage
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * Generic interface common to CLI and Web pages
- */
-Interface Page
-{
-	public function output();
-
-	public function add($sText);
-
-	public function p($sText);
-
-	public function pre($sText);
-
-	public function add_comment($sText);
-
-	public function table($aConfig, $aData, $aParams = array());
-}
-
-
-/**
- * <p>Simple helper class to ease the production of HTML pages
- *
- * <p>This class provide methods to add content, scripts, includes... to a web page
- * and renders the full web page by putting the elements in the proper place & order
- * when the output() method is called.
- *
- * <p>Usage:
- * ```php
- *    $oPage = new WebPage("Title of my page");
- *    $oPage->p("Hello World !");
- *    $oPage->output();
- * ```
- */
-class WebPage implements Page
-{
-	protected $s_title;
-	protected $s_content;
-	protected $s_deferred_content;
-	protected $a_scripts;
-	protected $a_dict_entries;
-	protected $a_dict_entries_prefixes;
-	protected $a_styles;
-	protected $a_linked_scripts;
-	protected $a_linked_stylesheets;
-	protected $a_headers;
-	protected $a_base;
-	protected $iNextId;
-	protected $iTransactionId;
-	protected $sContentType;
-	protected $sContentDisposition;
-	protected $sContentFileName;
-	protected $bTrashUnexpectedOutput;
-	protected $s_sOutputFormat;
-	protected $a_OutputOptions;
-	protected $bPrintable;
-
-	public function __construct($s_title, $bPrintable = false)
-	{
-		$this->s_title = $s_title;
-		$this->s_content = "";
-		$this->s_deferred_content = '';
-		$this->a_scripts = array();
-		$this->a_dict_entries = array();
-		$this->a_dict_entries_prefixes = array();
-		$this->a_styles = array();
-		$this->a_linked_scripts = array();
-		$this->a_linked_stylesheets = array();
-		$this->a_headers = array();
-		$this->a_base = array('href' => '', 'target' => '');
-		$this->iNextId = 0;
-		$this->iTransactionId = 0;
-		$this->sContentType = '';
-		$this->sContentDisposition = '';
-		$this->sContentFileName = '';
-		$this->bTrashUnexpectedOutput = false;
-		$this->s_OutputFormat = utils::ReadParam('output_format', 'html');
-		$this->a_OutputOptions = array();
-		$this->bPrintable = $bPrintable;
-		ob_start(); // Start capturing the output
-	}
-
-	/**
-	 * Change the title of the page after its creation
-	 */
-	public function set_title($s_title)
-	{
-		$this->s_title = $s_title;
-	}
-
-	/**
-	 * Specify a default URL and a default target for all links on a page
-	 */
-	public function set_base($s_href = '', $s_target = '')
-	{
-		$this->a_base['href'] = $s_href;
-		$this->a_base['target'] = $s_target;
-	}
-
-	/**
-	 * Add any text or HTML fragment to the body of the page
-	 */
-	public function add($s_html)
-	{
-		$this->s_content .= $s_html;
-	}
-
-	/**
-	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
-	 * This is useful to add hidden content, DIVs or FORMs that should not
-	 * be embedded into each other.
-	 */
-	public function add_at_the_end($s_html, $sId = '')
-	{
-		$this->s_deferred_content .= $s_html;
-	}
-
-	/**
-	 * Add a paragraph to the body of the page
-	 */
-	public function p($s_html)
-	{
-		$this->add($this->GetP($s_html));
-	}
-
-	/**
-	 * Add a pre-formatted text to the body of the page
-	 */
-	public function pre($s_html)
-	{
-		$this->add('<pre>'.$s_html.'</pre>');
-	}
-
-	/**
-	 * Add a comment
-	 */
-	public function add_comment($sText)
-	{
-		$this->add('<!--'.$sText.'-->');
-	}
-
-	/**
-	 * Add a paragraph to the body of the page
-	 */
-	public function GetP($s_html)
-	{
-		return "<p>$s_html</p>\n";
-	}
-
-	/**
-	 * Adds a tabular content to the web page
-	 *
-	 * @param string[] $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
-	 * @param string[] $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A
-	 *     column 'pkey' is expected for each row
-	 * @param array $aParams Hash array. Extra parameters for the table.
-	 *
-	 * @return void
-	 */
-	public function table($aConfig, $aData, $aParams = array())
-	{
-		$this->add($this->GetTable($aConfig, $aData, $aParams));
-	}
-
-	public function GetTable($aConfig, $aData, $aParams = array())
-	{
-		$oAppContext = new ApplicationContext();
-
-		static $iNbTables = 0;
-		$iNbTables++;
-		$sHtml = "";
-		$sHtml .= "<table class=\"listResults\">\n";
-		$sHtml .= "<thead>\n";
-		$sHtml .= "<tr>\n";
-		foreach ($aConfig as $sName => $aDef)
-		{
-			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
-		}
-		$sHtml .= "</tr>\n";
-		$sHtml .= "</thead>\n";
-		$sHtml .= "<tbody>\n";
-		foreach ($aData as $aRow)
-		{
-			$sHtml .= $this->GetTableRow($aRow, $aConfig);
-		}
-		$sHtml .= "</tbody>\n";
-		$sHtml .= "</table>\n";
-
-		return $sHtml;
-	}
-
-	public function GetTableRow($aRow, $aConfig)
-	{
-		$sHtml = '';
-		if (isset($aRow['@class'])) // Row specific class, for hilighting certain rows
-		{
-			$sHtml .= "<tr class=\"{$aRow['@class']}\">";
-		}
-		else
-		{
-			$sHtml .= "<tr>";
-		}
-		foreach ($aConfig as $sName => $aAttribs)
-		{
-			$sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : '';
-			$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
-			$sHtml .= "<td $sClass>$sValue</td>";
-		}
-		$sHtml .= "</tr>";
-
-		return $sHtml;
-	}
-
-	/**
-	 * Add some Javascript to the header of the page
-	 */
-	public function add_script($s_script)
-	{
-		$this->a_scripts[] = $s_script;
-	}
-
-	/**
-	 * Add some Javascript to the header of the page
-	 */
-	public function add_ready_script($s_script)
-	{
-		// Do nothing silently... this is not supported by this type of page...
-	}
-
-	/**
-	 * Allow a dictionnary entry to be used client side with Dict.S()
-	 *
-	 * @param string $s_entryId a translation label key
-	 *
-	 * @see \WebPage::add_dict_entries()
-	 * @see utils.js
-	 */
-	public function add_dict_entry($s_entryId)
-	{
-		$this->a_dict_entries[] = $s_entryId;
-	}
-
-	/**
-	 * Add a set of dictionary entries (based on the given prefix) for the Javascript side
-	 *
-	 * @param string $s_entriesPrefix translation label prefix (eg 'UI:Button:' to add all keys beginning with this)
-	 *
-	 * @see \WebPage::add_dict_entry()
-	 * @see utils.js
-	 */
-	public function add_dict_entries($s_entriesPrefix)
-	{
-		$this->a_dict_entries_prefixes[] = $s_entriesPrefix;
-	}
-
-	protected function get_dict_signature()
-	{
-		return str_replace('_', '', Dict::GetUserLanguage()).'-'.md5(implode(',',
-					$this->a_dict_entries).'|'.implode(',', $this->a_dict_entries_prefixes));
-	}
-
-	protected function get_dict_file_content()
-	{
-		$aEntries = array();
-		foreach ($this->a_dict_entries as $sCode)
-		{
-			$aEntries[$sCode] = Dict::S($sCode);
-		}
-		foreach ($this->a_dict_entries_prefixes as $sPrefix)
-		{
-			$aEntries = array_merge($aEntries, Dict::ExportEntries($sPrefix));
-		}
-		$sJSFile = 'var aDictEntries = '.json_encode($aEntries);
-
-		return $sJSFile;
-	}
-
-
-	/**
-	 * Add some CSS definitions to the header of the page
-	 */
-	public function add_style($s_style)
-	{
-		$this->a_styles[] = $s_style;
-	}
-
-	/**
-	 * Add a script (as an include, i.e. link) to the header of the page
-	 */
-	public function add_linked_script($s_linked_script)
-	{
-		$this->a_linked_scripts[$s_linked_script] = $s_linked_script;
-	}
-
-	/**
-	 * Add a CSS stylesheet (as an include, i.e. link) to the header of the page
-	 */
-	public function add_linked_stylesheet($s_linked_stylesheet, $s_condition = "")
-	{
-		$this->a_linked_stylesheets[] = array('link' => $s_linked_stylesheet, 'condition' => $s_condition);
-	}
-
-	public function add_saas($sSaasRelPath)
-	{
-		$sCssRelPath = utils::GetCSSFromSASS($sSaasRelPath);
-		$sRootUrl = utils::GetAbsoluteUrlAppRoot();
-		if ($sRootUrl === '')
-		{
-			// We're running the setup of the first install...
-			$sRootUrl = '../';
-		}
-		$sCSSUrl = $sRootUrl.$sCssRelPath;
-		$this->add_linked_stylesheet($sCSSUrl);
-	}
-
-	/**
-	 * Add some custom header to the page
-	 */
-	public function add_header($s_header)
-	{
-		$this->a_headers[] = $s_header;
-	}
-
-	/**
-	 * Add needed headers to the page so that it will no be cached
-	 */
-	public function no_cache()
-	{
-		$this->add_header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
-		$this->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
-	}
-
-	/**
-	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
-	 */
-	public function details($aFields)
-	{
-
-		$this->add($this->GetDetails($aFields));
-	}
-
-	/**
-	 * Whether or not the page is a PDF page
-	 *
-	 * @return boolean
-	 */
-	public function is_pdf()
-	{
-		return false;
-	}
-
-	/**
-	 * Records the current state of the 'html' part of the page output
-	 *
-	 * @return mixed The current state of the 'html' output
-	 */
-	public function start_capture()
-	{
-		return strlen($this->s_content);
-	}
-
-	/**
-	 * Returns the part of the html output that occurred since the call to start_capture
-	 * and removes this part from the current html output
-	 *
-	 * @param $offset mixed The value returned by start_capture
-	 *
-	 * @return string The part of the html output that was added since the call to start_capture
-	 */
-	public function end_capture($offset)
-	{
-		$sCaptured = substr($this->s_content, $offset);
-		$this->s_content = substr($this->s_content, 0, $offset);
-
-		return $sCaptured;
-	}
-
-	/**
-	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
-	 */
-	public function GetDetails($aFields)
-	{
-		$sHtml = "<div class=\"details\" id='search-widget-results-outer'>\n";
-		foreach ($aFields as $aAttrib)
-		{
-			$sDataAttCode = isset($aAttrib['attcode']) ? "data-attcode=\"{$aAttrib['attcode']}\"" : '';
-			$sLayout = isset($aAttrib['layout']) ? $aAttrib['layout'] : 'small';
-			$sHtml .= "<div class=\"field_container field_{$sLayout}\" $sDataAttCode>\n";
-			$sHtml .= "<div class=\"field_label label\">{$aAttrib['label']}</div>\n";
-
-			$sHtml .= "<div class=\"field_data\">\n";
-			// By Rom, for csv import, proposed to show several values for column selection
-			if (is_array($aAttrib['value']))
-			{
-				$sHtml .= "<div class=\"field_value\">".implode("</div><div>", $aAttrib['value'])."</div>\n";
-			}
-			else
-			{
-				$sHtml .= "<div class=\"field_value\">".$aAttrib['value']."</div>\n";
-			}
-			// Checking if we should add comments & infos
-			$sComment = (isset($aAttrib['comments'])) ? $aAttrib['comments'] : '';
-			$sInfo = (isset($aAttrib['infos'])) ? $aAttrib['infos'] : '';
-			if ($sComment !== '')
-			{
-				$sHtml .= "<div class=\"field_comments\">$sComment</div>\n";
-			}
-			if ($sInfo !== '')
-			{
-				$sHtml .= "<div class=\"field_infos\">$sInfo</div>\n";
-			}
-			$sHtml .= "</div>\n";
-
-			$sHtml .= "</div>\n";
-		}
-		$sHtml .= "</div>\n";
-
-		return $sHtml;
-	}
-
-	/**
-	 * Build a set of radio buttons suitable for editing a field/attribute of an object (including its validation)
-	 *
-	 * @param $aAllowedValues hash Array of value => display_value
-	 * @param $value mixed Current value for the field/attribute
-	 * @param $iId mixed Unique Id for the input control in the page
-	 * @param $sFieldName string The name of the field, attr_<$sFieldName> will hold the value for the field
-	 * @param $bMandatory bool Whether or not the field is mandatory
-	 * @param $bVertical bool Disposition of the radio buttons vertical or horizontal
-	 * @param $sValidationField string HTML fragment holding the validation field (exclamation icon...)
-	 *
-	 * @return string The HTML fragment corresponding to the radio buttons
-	 */
-	public function GetRadioButtons(
-		$aAllowedValues, $value, $iId, $sFieldName, $bMandatory, $bVertical, $sValidationField
-	) {
-		$idx = 0;
-		$sHTMLValue = '';
-		foreach ($aAllowedValues as $key => $display_value)
-		{
-			if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
-			{
-				// When there is only once choice, select it by default
-				$sSelected = ' checked';
-			}
-			else
-			{
-				$sSelected = ($value == $key) ? ' checked' : '';
-			}
-			$sHTMLValue .= "<input type=\"radio\" id=\"{$iId}_{$key}\" name=\"radio_$sFieldName\" onChange=\"$('#{$iId}').val(this.value).trigger('change');\" value=\"$key\"$sSelected><label class=\"radio\" for=\"{$iId}_{$key}\">&nbsp;$display_value</label>&nbsp;";
-			if ($bVertical)
-			{
-				if ($idx == 0)
-				{
-					// Validation icon at the end of the first line
-					$sHTMLValue .= "&nbsp;{$sValidationField}\n";
-				}
-				$sHTMLValue .= "<br>\n";
-			}
-			$idx++;
-		}
-		$sHTMLValue .= "<input type=\"hidden\" id=\"$iId\" name=\"$sFieldName\" value=\"$value\"/>";
-		if (!$bVertical)
-		{
-			// Validation icon at the end of the line
-			$sHTMLValue .= "&nbsp;{$sValidationField}\n";
-		}
-
-		return $sHTMLValue;
-	}
-
-	/**
-	 * Discard unexpected output data (such as PHP warnings)
-	 * This is a MUST when the Page output is DATA (download of a document, download CSV export, download ...)
-	 */
-	public function TrashUnexpectedOutput()
-	{
-		$this->bTrashUnexpectedOutput = true;
-	}
-
-	/**
-	 * Read the output buffer and deal with its contents:
-	 * - trash unexpected output if the flag has been set
-	 * - report unexpected behaviors such as the output buffering being stopped
-	 *
-	 * Possible improvement: I've noticed that several output buffers are stacked,
-	 * if they are not empty, the output will be corrupted. The solution would
-	 * consist in unstacking all of them (and concatenate the contents).
-	 */
-	protected function ob_get_clean_safe()
-	{
-		$sOutput = ob_get_contents();
-		if ($sOutput === false)
-		{
-			$sMsg = "Design/integration issue: No output buffer. Some piece of code has called ob_get_clean() or ob_end_clean() without calling ob_start()";
-			if ($this->bTrashUnexpectedOutput)
-			{
-				IssueLog::Error($sMsg);
-				$sOutput = '';
-			}
-			else
-			{
-				$sOutput = $sMsg;
-			}
-		}
-		else
-		{
-			ob_end_clean(); // on some versions of PHP doing so when the output buffering is stopped can cause a notice
-			if ($this->bTrashUnexpectedOutput)
-			{
-				if (trim($sOutput) != '')
-				{
-					if (Utils::GetConfig() && Utils::GetConfig()->Get('debug_report_spurious_chars'))
-					{
-						IssueLog::Error("Trashing unexpected output:'$sOutput'\n");
-					}
-				}
-				$sOutput = '';
-			}
-		}
-
-		return $sOutput;
-	}
-
-	/**
-	 * Outputs (via some echo) the complete HTML page by assembling all its elements
-	 */
-	public function output()
-	{
-		foreach ($this->a_headers as $s_header)
-		{
-			header($s_header);
-		}
-
-		$s_captured_output = $this->ob_get_clean_safe();
-		echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
-		echo "<html>\n";
-		echo "<head>\n";
-		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-		echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, shrink-to-fit=no\" />";
-		echo "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
-		echo $this->get_base_tag();
-
-		$this->output_dict_entries();
-
-		foreach ($this->a_linked_scripts as $s_script)
-		{
-			// Make sure that the URL to the script contains the application's version number
-			// so that the new script do NOT get reloaded from the cache when the application is upgraded
-			if (strpos($s_script, '?') === false)
-			{
-				$s_script .= "?t=".utils::GetCacheBusterTimestamp();
-			}
-			else
-			{
-				$s_script .= "&t=".utils::GetCacheBusterTimestamp();
-			}
-			echo "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
-		}
-		if (count($this->a_scripts) > 0)
-		{
-			echo "<script type=\"text/javascript\">\n";
-			foreach ($this->a_scripts as $s_script)
-			{
-				echo "$s_script\n";
-			}
-			echo "</script>\n";
-		}
-		foreach ($this->a_linked_stylesheets as $a_stylesheet)
-		{
-			if (strpos($a_stylesheet['link'], '?') === false)
-			{
-				$s_stylesheet = $a_stylesheet['link']."?t=".utils::GetCacheBusterTimestamp();
-			}
-			else
-			{
-				$s_stylesheet = $a_stylesheet['link']."&t=".utils::GetCacheBusterTimestamp();
-			}
-			if ($a_stylesheet['condition'] != "")
-			{
-				echo "<!--[if {$a_stylesheet['condition']}]>\n";
-			}
-			echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$s_stylesheet}\" />\n";
-			if ($a_stylesheet['condition'] != "")
-			{
-				echo "<![endif]-->\n";
-			}
-		}
-
-		if (count($this->a_styles) > 0)
-		{
-			echo "<style>\n";
-			foreach ($this->a_styles as $s_style)
-			{
-				echo "$s_style\n";
-			}
-			echo "</style>\n";
-		}
-		if (class_exists('MetaModel') && MetaModel::GetConfig())
-		{
-			echo "<link rel=\"shortcut icon\" href=\"".utils::GetAbsoluteUrlAppRoot()."images/favicon.ico?t=".utils::GetCacheBusterTimestamp()."\" />\n";
-		}
-		echo "</head>\n";
-		echo "<body>\n";
-		echo self::FilterXSS($this->s_content);
-		if (trim($s_captured_output) != "")
-		{
-			echo "<div class=\"raw_output\">".self::FilterXSS($s_captured_output)."</div>\n";
-		}
-		echo '<div id="at_the_end">'.self::FilterXSS($this->s_deferred_content).'</div>';
-		echo "</body>\n";
-		echo "</html>\n";
-
-		if (class_exists('DBSearch'))
-		{
-			DBSearch::RecordQueryTrace();
-		}
-		if (class_exists('ExecutionKPI'))
-		{
-			ExecutionKPI::ReportStats();
-		}
-	}
-
-	/**
-	 * Build a series of hidden field[s] from an array
-	 */
-	public function add_input_hidden($sLabel, $aData)
-	{
-		foreach ($aData as $sKey => $sValue)
-		{
-			// Note: protection added to protect against the Notice 'array to string conversion' that appeared with PHP 5.4
-			// (this function seems unused though!)
-			if (is_scalar($sValue))
-			{
-				$this->add("<input type=\"hidden\" name=\"".$sLabel."[$sKey]\" value=\"$sValue\">");
-			}
-		}
-	}
-
-	protected function get_base_tag()
-	{
-		$sTag = '';
-		if (($this->a_base['href'] != '') || ($this->a_base['target'] != ''))
-		{
-			$sTag = '<base ';
-			if (($this->a_base['href'] != ''))
-			{
-				$sTag .= "href =\"{$this->a_base['href']}\" ";
-			}
-			if (($this->a_base['target'] != ''))
-			{
-				$sTag .= "target =\"{$this->a_base['target']}\" ";
-			}
-			$sTag .= " />\n";
-		}
-
-		return $sTag;
-	}
-
-	/**
-	 * Get an ID (for any kind of HTML tag) that is guaranteed unique in this page
-	 *
-	 * @return int The unique ID (in this page)
-	 */
-	public function GetUniqueId()
-	{
-		return $this->iNextId++;
-	}
-
-	/**
-	 * Set the content-type (mime type) for the page's content
-	 *
-	 * @param $sContentType string
-	 *
-	 * @return void
-	 */
-	public function SetContentType($sContentType)
-	{
-		$this->sContentType = $sContentType;
-	}
-
-	/**
-	 * Set the content-disposition (mime type) for the page's content
-	 *
-	 * @param $sDisposition string The disposition: 'inline' or 'attachment'
-	 * @param $sFileName string The original name of the file
-	 *
-	 * @return void
-	 */
-	public function SetContentDisposition($sDisposition, $sFileName)
-	{
-		$this->sContentDisposition = $sDisposition;
-		$this->sContentFileName = $sFileName;
-	}
-
-	/**
-	 * Set the transactionId of the current form
-	 *
-	 * @param $iTransactionId integer
-	 *
-	 * @return void
-	 */
-	public function SetTransactionId($iTransactionId)
-	{
-		$this->iTransactionId = $iTransactionId;
-	}
-
-	/**
-	 * Returns the transactionId of the current form
-	 *
-	 * @return integer The current transactionID
-	 */
-	public function GetTransactionId()
-	{
-		return $this->iTransactionId;
-	}
-
-	public static function FilterXSS($sHTML)
-	{
-		return str_ireplace('<script', '&lt;script', $sHTML);
-	}
-
-	/**
-	 * What is the currently selected output format
-	 *
-	 * @return string The selected output format: html, pdf...
-	 */
-	public function GetOutputFormat()
-	{
-		return $this->s_OutputFormat;
-	}
-
-	/**
-	 * Check whether the desired output format is possible or not
-	 *
-	 * @param string $sOutputFormat The desired output format: html, pdf...
-	 *
-	 * @return bool True if the format is Ok, false otherwise
-	 */
-	function IsOutputFormatAvailable($sOutputFormat)
-	{
-		$bResult = false;
-		switch ($sOutputFormat)
-		{
-			case 'html':
-				$bResult = true; // Always supported
-				break;
-
-			case 'pdf':
-				$bResult = @is_readable(APPROOT.'lib/MPDF/mpdf.php');
-				break;
-		}
-
-		return $bResult;
-	}
-
-	/**
-	 * Check whether the output must be printable (using print.css, for sure!)
-	 *
-	 * @return bool ...
-	 */
-	public function IsPrintableVersion()
-	{
-		return $this->bPrintable;
-	}
-
-	/**
-	 * Retrieves the value of a named output option for the given format
-	 *
-	 * @param string $sFormat The format: html or pdf
-	 * @param string $sOptionName The name of the option
-	 *
-	 * @return mixed false if the option was never set or the options's value
-	 */
-	public function GetOutputOption($sFormat, $sOptionName)
-	{
-		if (isset($this->a_OutputOptions[$sFormat][$sOptionName]))
-		{
-			return $this->a_OutputOptions[$sFormat][$sOptionName];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Sets a named output option for the given format
-	 *
-	 * @param string $sFormat The format for which to set the option: html or pdf
-	 * @param string $sOptionName the name of the option
-	 * @param mixed $sValue The value of the option
-	 */
-	public function SetOutputOption($sFormat, $sOptionName, $sValue)
-	{
-		if (!isset($this->a_OutputOptions[$sFormat]))
-		{
-			$this->a_OutputOptions[$sFormat] = array($sOptionName => $sValue);
-		}
-		else
-		{
-			$this->a_OutputOptions[$sFormat][$sOptionName] = $sValue;
-		}
-	}
-
-	public function RenderPopupMenuItems($aActions, $aFavoriteActions = array())
-	{
-		$sPrevUrl = '';
-		$sHtml = '';
-		if (!$this->IsPrintableVersion())
-		{
-			foreach ($aActions as $aAction)
-			{
-				$sClass = isset($aAction['css_classes']) ? ' class="'.implode(' ', $aAction['css_classes']).'"' : '';
-				$sOnClick = isset($aAction['onclick']) ? ' onclick="'.htmlspecialchars($aAction['onclick'], ENT_QUOTES,
-						"UTF-8").'"' : '';
-				$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
-				if (empty($aAction['url']))
-				{
-					if ($sPrevUrl != '') // Don't output consecutively two separators...
-					{
-						$sHtml .= "<li>{$aAction['label']}</li>";
-					}
-					$sPrevUrl = '';
-				}
-				else
-				{
-					$sHtml .= "<li><a $sTarget href=\"{$aAction['url']}\"$sClass $sOnClick>{$aAction['label']}</a></li>";
-					$sPrevUrl = $aAction['url'];
-				}
-			}
-			$sHtml .= "</ul></li></ul></div>";
-			foreach (array_reverse($aFavoriteActions) as $aAction)
-			{
-				$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
-				$sHtml .= "<div class=\"actions_button\"><a $sTarget href='{$aAction['url']}'>{$aAction['label']}</a></div>";
-			}
-		}
-
-		return $sHtml;
-	}
-
-	protected function output_dict_entries($bReturnOutput = false)
-	{
-		if ((count($this->a_dict_entries) > 0) || (count($this->a_dict_entries_prefixes) > 0))
-		{
-			if (class_exists('Dict'))
-			{
-				// The dictionary may not be available for example during the setup...
-				// Create a specific dictionary file and load it as a JS script
-				$sSignature = $this->get_dict_signature();
-				$sJSFileName = utils::GetCachePath().$sSignature.'.js';
-				if (!file_exists($sJSFileName) && is_writable(utils::GetCachePath()))
-				{
-					file_put_contents($sJSFileName, $this->get_dict_file_content());
-				}
-				// Load the dictionary as the first javascript file, so that other JS file benefit from the translations
-				array_unshift($this->a_linked_scripts,
-					utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php?operation=dict&s='.$sSignature);
-			}
-		}
-	}
-}
-
-
-interface iTabbedPage
-{
-	public function AddTabContainer($sTabContainer, $sPrefix = '');
-
-	public function AddToTab($sTabContainer, $sTabLabel, $sHtml);
-
-	public function SetCurrentTabContainer($sTabContainer = '');
-
-	public function SetCurrentTab($sTabLabel = '');
-
-	/**
-	 * Add a tab which content will be loaded asynchronously via the supplied URL
-	 *
-	 * Limitations:
-	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to
-	 * pull content from another server. Static content cannot be added inside such tabs.
-	 *
-	 * @param string $sTabLabel The (localised) label of the tab
-	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause
-	 *     the tab to be reloaded upon each activation.
-	 *
-	 * @since 2.0.3
-	 */
-	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true);
-
-	public function GetCurrentTab();
-
-	public function RemoveTab($sTabLabel, $sTabContainer = null);
-
-	/**
-	 * Finds the tab whose title matches a given pattern
-	 *
-	 * @return mixed The name of the tab as a string or false if not found
-	 */
-	public function FindTab($sPattern, $sTabContainer = null);
-}
-
-/**
- * Helper class to implement JQueryUI tabs inside a page
- */
-class TabManager
-{
-	protected $m_aTabs;
-	protected $m_sCurrentTabContainer;
-	protected $m_sCurrentTab;
-
-	public function __construct()
-	{
-		$this->m_aTabs = array();
-		$this->m_sCurrentTabContainer = '';
-		$this->m_sCurrentTab = '';
-	}
-
-	public function AddTabContainer($sTabContainer, $sPrefix = '')
-	{
-		$this->m_aTabs[$sTabContainer] = array('prefix' => $sPrefix, 'tabs' => array());
-
-		return "\$Tabs:$sTabContainer\$";
-	}
-
-	public function AddToCurrentTab($sHtml)
-	{
-		$this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
-	}
-
-	public function GetCurrentTabLength($sHtml)
-	{
-		$iLength = isset($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) ? strlen($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) : 0;
-
-		return $iLength;
-	}
-
-	/**
-	 * Truncates the given tab to the specifed length and returns the truncated part
-	 *
-	 * @param string $sTabContainer The tab container in which to truncate the tab
-	 * @param string $sTab The name/identifier of the tab to truncate
-	 * @param integer $iLength The length/offset at which to truncate the tab
-	 *
-	 * @return string The truncated part
-	 */
-	public function TruncateTab($sTabContainer, $sTab, $iLength)
-	{
-		$sResult = substr($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'],
-			$iLength);
-		$this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'] = substr($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'],
-			0, $iLength);
-
-		return $sResult;
-	}
-
-	public function TabExists($sTabContainer, $sTab)
-	{
-		return isset($this->m_aTabs[$sTabContainer]['tabs'][$sTab]);
-	}
-
-	public function TabsContainerCount()
-	{
-		return count($this->m_aTabs);
-	}
-
-	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
-	{
-		if (!isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
-		{
-			// Set the content of the tab
-			$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel] = array(
-				'type' => 'html',
-				'html' => $sHtml,
-			);
-		}
-		else
-		{
-			if ($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['type'] != 'html')
-			{
-				throw new Exception("Cannot add HTML content to the tab '$sTabLabel' of type '{$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['type']}'");
-			}
-			// Append to the content of the tab
-			$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['html'] .= $sHtml;
-		}
-
-		return ''; // Nothing to add to the page for now
-	}
-
-	public function SetCurrentTabContainer($sTabContainer = '')
-	{
-		$sPreviousTabContainer = $this->m_sCurrentTabContainer;
-		$this->m_sCurrentTabContainer = $sTabContainer;
-
-		return $sPreviousTabContainer;
-	}
-
-	public function SetCurrentTab($sTabLabel = '')
-	{
-		$sPreviousTab = $this->m_sCurrentTab;
-		$this->m_sCurrentTab = $sTabLabel;
-
-		return $sPreviousTab;
-	}
-
-	/**
-	 * Add a tab which content will be loaded asynchronously via the supplied URL
-	 *
-	 * Limitations:
-	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to
-	 * pull content from another server. Static content cannot be added inside such tabs.
-	 *
-	 * @param string $sTabLabel The (localised) label of the tab
-	 * @param string $sUrl The URL to load (on the same server)
-	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause
-	 *     the tab to be reloaded upon each activation.
-	 *
-	 * @since 2.0.3
-	 */
-	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
-	{
-		// Set the content of the tab
-		$this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$sTabLabel] = array(
-			'type' => 'ajax',
-			'url' => $sUrl,
-			'cache' => $bCache,
-		);
-
-		return ''; // Nothing to add to the page for now
-	}
-
-
-	public function GetCurrentTabContainer()
-	{
-		return $this->m_sCurrentTabContainer;
-	}
-
-	public function GetCurrentTab()
-	{
-		return $this->m_sCurrentTab;
-	}
-
-	public function RemoveTab($sTabLabel, $sTabContainer = null)
-	{
-		if ($sTabContainer == null)
-		{
-			$sTabContainer = $this->m_sCurrentTabContainer;
-		}
-		if (isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
-		{
-			// Delete the content of the tab
-			unset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]);
-
-			// If we just removed the active tab, let's reset the active tab
-			if (($this->m_sCurrentTabContainer == $sTabContainer) && ($this->m_sCurrentTab == $sTabLabel))
-			{
-				$this->m_sCurrentTab = '';
-			}
-		}
-	}
-
-	/**
-	 * Finds the tab whose title matches a given pattern
-	 *
-	 * @return mixed The actual name of the tab (as a string) or false if not found
-	 */
-	public function FindTab($sPattern, $sTabContainer = null)
-	{
-		$result = false;
-		if ($sTabContainer == null)
-		{
-			$sTabContainer = $this->m_sCurrentTabContainer;
-		}
-		foreach ($this->m_aTabs[$sTabContainer]['tabs'] as $sTabLabel => $void)
-		{
-			if (preg_match($sPattern, $sTabLabel))
-			{
-				$result = $sTabLabel;
-				break;
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Make the given tab the active one, as if it were clicked
-	 * DOES NOT WORK: apparently in the *old* version of jquery
-	 * that we are using this is not supported... TO DO upgrade
-	 * the whole jquery bundle...
-	 */
-	public function SelectTab($sTabContainer, $sTabLabel)
-	{
-		$container_index = 0;
-		$tab_index = 0;
-		foreach ($this->m_aTabs as $sCurrentTabContainerName => $aTabs)
-		{
-			if ($sTabContainer == $sCurrentTabContainerName)
-			{
-				foreach ($aTabs['tabs'] as $sCurrentTabLabel => $void)
-				{
-					if ($sCurrentTabLabel == $sTabLabel)
-					{
-						break;
-					}
-					$tab_index++;
-				}
-				break;
-			}
-			$container_index++;
-		}
-		$sSelector = '#tabbedContent_'.$container_index.' > ul';
-
-		return "window.setTimeout(\"$('$sSelector').tabs('select', $tab_index);\", 100);"; // Let the time to the tabs widget to initialize
-	}
-
-	public function RenderIntoContent($sContent, WebPage $oPage)
-	{
-		// Render the tabs in the page (if any)
-		foreach ($this->m_aTabs as $sTabContainerName => $aTabs)
-		{
-			$sTabs = '';
-			$sPrefix = $aTabs['prefix'];
-			$container_index = 0;
-			if (count($aTabs['tabs']) > 0)
-			{
-				if ($oPage->IsPrintableVersion())
-				{
-					$oPage->add_ready_script(
-						<<< EOF
-oHiddeableChapters = {};
-EOF
-					);
-					$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$sPrefix}{$container_index}\" class=\"light\">\n";
-					$i = 0;
-					foreach ($aTabs['tabs'] as $sTabName => $aTabData)
-					{
-						$sTabNameEsc = addslashes($sTabName);
-						$sTabId = "tab_{$sPrefix}{$container_index}$i";
-						switch ($aTabData['type'])
-						{
-							case 'ajax':
-								$sTabHtml = '';
-								$sUrl = $aTabData['url'];
-								$oPage->add_ready_script(
-									<<< EOF
-$.post('$sUrl', {printable: '1'}, function(data){
-	$('#$sTabId > .printable-tab-content').append(data);
-});
-EOF
-								);
-								break;
-
-							case 'html':
-							default:
-								$sTabHtml = $aTabData['html'];
-						}
-						$sTabs .= "<div class=\"printable-tab\" id=\"$sTabId\"><h2 class=\"printable-tab-title\">".htmlentities($sTabName,
-								ENT_QUOTES,
-								'UTF-8')."</h2><div class=\"printable-tab-content\">".$sTabHtml."</div></div>\n";
-						$oPage->add_ready_script(
-							<<< EOF
-oHiddeableChapters['$sTabId'] = '$sTabNameEsc';
-EOF
-						);
-						$i++;
-					}
-					$sTabs .= "</div>\n<!-- end of tabs-->\n";
-				}
-				else
-				{
-					$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$sPrefix}{$container_index}\" class=\"light\">\n";
-					$sTabs .= "<ul>\n";
-					// Display the unordered list that will be rendered as the tabs
-					$i = 0;
-					foreach ($aTabs['tabs'] as $sTabName => $aTabData)
-					{
-						switch ($aTabData['type'])
-						{
-							case 'ajax':
-								$sTabs .= "<li data-cache=\"".($aTabData['cache'] ? 'true' : 'false')."\"><a href=\"{$aTabData['url']}\" class=\"tab\"><span>".htmlentities($sTabName,
-										ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
-								break;
-
-							case 'html':
-							default:
-								$sTabs .= "<li><a href=\"#tab_{$sPrefix}{$container_index}$i\" class=\"tab\"><span>".htmlentities($sTabName,
-										ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
-						}
-						$i++;
-					}
-					$sTabs .= "</ul>\n";
-					// Now add the content of the tabs themselves
-					$i = 0;
-					foreach ($aTabs['tabs'] as $sTabName => $aTabData)
-					{
-						switch ($aTabData['type'])
-						{
-							case 'ajax':
-								// Nothing to add
-								break;
-
-							case 'html':
-							default:
-								$sTabs .= "<div id=\"tab_{$sPrefix}{$container_index}$i\">".$aTabData['html']."</div>\n";
-						}
-						$i++;
-					}
-					$sTabs .= "</div>\n<!-- end of tabs-->\n";
-				}
-			}
-			$sContent = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $sContent);
-			$container_index++;
-		}
-
-		return $sContent;
-	}
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class WebPage
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * Generic interface common to CLI and Web pages
+ */
+Interface Page
+{
+	public function output();
+
+	public function add($sText);
+
+	public function p($sText);
+
+	public function pre($sText);
+
+	public function add_comment($sText);
+
+	public function table($aConfig, $aData, $aParams = array());
+}
+
+
+/**
+ * <p>Simple helper class to ease the production of HTML pages
+ *
+ * <p>This class provide methods to add content, scripts, includes... to a web page
+ * and renders the full web page by putting the elements in the proper place & order
+ * when the output() method is called.
+ *
+ * <p>Usage:
+ * ```php
+ *    $oPage = new WebPage("Title of my page");
+ *    $oPage->p("Hello World !");
+ *    $oPage->output();
+ * ```
+ */
+class WebPage implements Page
+{
+	protected $s_title;
+	protected $s_content;
+	protected $s_deferred_content;
+	protected $a_scripts;
+	protected $a_dict_entries;
+	protected $a_dict_entries_prefixes;
+	protected $a_styles;
+	protected $a_linked_scripts;
+	protected $a_linked_stylesheets;
+	protected $a_headers;
+	protected $a_base;
+	protected $iNextId;
+	protected $iTransactionId;
+	protected $sContentType;
+	protected $sContentDisposition;
+	protected $sContentFileName;
+	protected $bTrashUnexpectedOutput;
+	protected $s_sOutputFormat;
+	protected $a_OutputOptions;
+	protected $bPrintable;
+
+	public function __construct($s_title, $bPrintable = false)
+	{
+		$this->s_title = $s_title;
+		$this->s_content = "";
+		$this->s_deferred_content = '';
+		$this->a_scripts = array();
+		$this->a_dict_entries = array();
+		$this->a_dict_entries_prefixes = array();
+		$this->a_styles = array();
+		$this->a_linked_scripts = array();
+		$this->a_linked_stylesheets = array();
+		$this->a_headers = array();
+		$this->a_base = array('href' => '', 'target' => '');
+		$this->iNextId = 0;
+		$this->iTransactionId = 0;
+		$this->sContentType = '';
+		$this->sContentDisposition = '';
+		$this->sContentFileName = '';
+		$this->bTrashUnexpectedOutput = false;
+		$this->s_OutputFormat = utils::ReadParam('output_format', 'html');
+		$this->a_OutputOptions = array();
+		$this->bPrintable = $bPrintable;
+		ob_start(); // Start capturing the output
+	}
+
+	/**
+	 * Change the title of the page after its creation
+	 */
+	public function set_title($s_title)
+	{
+		$this->s_title = $s_title;
+	}
+
+	/**
+	 * Specify a default URL and a default target for all links on a page
+	 */
+	public function set_base($s_href = '', $s_target = '')
+	{
+		$this->a_base['href'] = $s_href;
+		$this->a_base['target'] = $s_target;
+	}
+
+	/**
+	 * Add any text or HTML fragment to the body of the page
+	 */
+	public function add($s_html)
+	{
+		$this->s_content .= $s_html;
+	}
+
+	/**
+	 * Add any text or HTML fragment (identified by an ID) at the end of the body of the page
+	 * This is useful to add hidden content, DIVs or FORMs that should not
+	 * be embedded into each other.
+	 */
+	public function add_at_the_end($s_html, $sId = '')
+	{
+		$this->s_deferred_content .= $s_html;
+	}
+
+	/**
+	 * Add a paragraph to the body of the page
+	 */
+	public function p($s_html)
+	{
+		$this->add($this->GetP($s_html));
+	}
+
+	/**
+	 * Add a pre-formatted text to the body of the page
+	 */
+	public function pre($s_html)
+	{
+		$this->add('<pre>'.$s_html.'</pre>');
+	}
+
+	/**
+	 * Add a comment
+	 */
+	public function add_comment($sText)
+	{
+		$this->add('<!--'.$sText.'-->');
+	}
+
+	/**
+	 * Add a paragraph to the body of the page
+	 */
+	public function GetP($s_html)
+	{
+		return "<p>$s_html</p>\n";
+	}
+
+	/**
+	 * Adds a tabular content to the web page
+	 *
+	 * @param string[] $aConfig Configuration of the table: hash array of 'column_id' => 'Column Label'
+	 * @param string[] $aData Hash array. Data to display in the table: each row is made of 'column_id' => Data. A
+	 *     column 'pkey' is expected for each row
+	 * @param array $aParams Hash array. Extra parameters for the table.
+	 *
+	 * @return void
+	 */
+	public function table($aConfig, $aData, $aParams = array())
+	{
+		$this->add($this->GetTable($aConfig, $aData, $aParams));
+	}
+
+	public function GetTable($aConfig, $aData, $aParams = array())
+	{
+		$oAppContext = new ApplicationContext();
+
+		static $iNbTables = 0;
+		$iNbTables++;
+		$sHtml = "";
+		$sHtml .= "<table class=\"listResults\">\n";
+		$sHtml .= "<thead>\n";
+		$sHtml .= "<tr>\n";
+		foreach ($aConfig as $sName => $aDef)
+		{
+			$sHtml .= "<th title=\"".$aDef['description']."\">".$aDef['label']."</th>\n";
+		}
+		$sHtml .= "</tr>\n";
+		$sHtml .= "</thead>\n";
+		$sHtml .= "<tbody>\n";
+		foreach ($aData as $aRow)
+		{
+			$sHtml .= $this->GetTableRow($aRow, $aConfig);
+		}
+		$sHtml .= "</tbody>\n";
+		$sHtml .= "</table>\n";
+
+		return $sHtml;
+	}
+
+	public function GetTableRow($aRow, $aConfig)
+	{
+		$sHtml = '';
+		if (isset($aRow['@class'])) // Row specific class, for hilighting certain rows
+		{
+			$sHtml .= "<tr class=\"{$aRow['@class']}\">";
+		}
+		else
+		{
+			$sHtml .= "<tr>";
+		}
+		foreach ($aConfig as $sName => $aAttribs)
+		{
+			$sClass = isset($aAttribs['class']) ? 'class="'.$aAttribs['class'].'"' : '';
+			$sValue = ($aRow[$sName] === '') ? '&nbsp;' : $aRow[$sName];
+			$sHtml .= "<td $sClass>$sValue</td>";
+		}
+		$sHtml .= "</tr>";
+
+		return $sHtml;
+	}
+
+	/**
+	 * Add some Javascript to the header of the page
+	 */
+	public function add_script($s_script)
+	{
+		$this->a_scripts[] = $s_script;
+	}
+
+	/**
+	 * Add some Javascript to the header of the page
+	 */
+	public function add_ready_script($s_script)
+	{
+		// Do nothing silently... this is not supported by this type of page...
+	}
+
+	/**
+	 * Allow a dictionnary entry to be used client side with Dict.S()
+	 *
+	 * @param string $s_entryId a translation label key
+	 *
+	 * @see \WebPage::add_dict_entries()
+	 * @see utils.js
+	 */
+	public function add_dict_entry($s_entryId)
+	{
+		$this->a_dict_entries[] = $s_entryId;
+	}
+
+	/**
+	 * Add a set of dictionary entries (based on the given prefix) for the Javascript side
+	 *
+	 * @param string $s_entriesPrefix translation label prefix (eg 'UI:Button:' to add all keys beginning with this)
+	 *
+	 * @see \WebPage::add_dict_entry()
+	 * @see utils.js
+	 */
+	public function add_dict_entries($s_entriesPrefix)
+	{
+		$this->a_dict_entries_prefixes[] = $s_entriesPrefix;
+	}
+
+	protected function get_dict_signature()
+	{
+		return str_replace('_', '', Dict::GetUserLanguage()).'-'.md5(implode(',',
+					$this->a_dict_entries).'|'.implode(',', $this->a_dict_entries_prefixes));
+	}
+
+	protected function get_dict_file_content()
+	{
+		$aEntries = array();
+		foreach ($this->a_dict_entries as $sCode)
+		{
+			$aEntries[$sCode] = Dict::S($sCode);
+		}
+		foreach ($this->a_dict_entries_prefixes as $sPrefix)
+		{
+			$aEntries = array_merge($aEntries, Dict::ExportEntries($sPrefix));
+		}
+		$sJSFile = 'var aDictEntries = '.json_encode($aEntries);
+
+		return $sJSFile;
+	}
+
+
+	/**
+	 * Add some CSS definitions to the header of the page
+	 */
+	public function add_style($s_style)
+	{
+		$this->a_styles[] = $s_style;
+	}
+
+	/**
+	 * Add a script (as an include, i.e. link) to the header of the page
+	 */
+	public function add_linked_script($s_linked_script)
+	{
+		$this->a_linked_scripts[$s_linked_script] = $s_linked_script;
+	}
+
+	/**
+	 * Add a CSS stylesheet (as an include, i.e. link) to the header of the page
+	 */
+	public function add_linked_stylesheet($s_linked_stylesheet, $s_condition = "")
+	{
+		$this->a_linked_stylesheets[] = array('link' => $s_linked_stylesheet, 'condition' => $s_condition);
+	}
+
+	public function add_saas($sSaasRelPath)
+	{
+		$sCssRelPath = utils::GetCSSFromSASS($sSaasRelPath);
+		$sRootUrl = utils::GetAbsoluteUrlAppRoot();
+		if ($sRootUrl === '')
+		{
+			// We're running the setup of the first install...
+			$sRootUrl = '../';
+		}
+		$sCSSUrl = $sRootUrl.$sCssRelPath;
+		$this->add_linked_stylesheet($sCSSUrl);
+	}
+
+	/**
+	 * Add some custom header to the page
+	 */
+	public function add_header($s_header)
+	{
+		$this->a_headers[] = $s_header;
+	}
+
+	/**
+	 * Add needed headers to the page so that it will no be cached
+	 */
+	public function no_cache()
+	{
+		$this->add_header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
+		$this->add_header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+	}
+
+	/**
+	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
+	 */
+	public function details($aFields)
+	{
+
+		$this->add($this->GetDetails($aFields));
+	}
+
+	/**
+	 * Whether or not the page is a PDF page
+	 *
+	 * @return boolean
+	 */
+	public function is_pdf()
+	{
+		return false;
+	}
+
+	/**
+	 * Records the current state of the 'html' part of the page output
+	 *
+	 * @return mixed The current state of the 'html' output
+	 */
+	public function start_capture()
+	{
+		return strlen($this->s_content);
+	}
+
+	/**
+	 * Returns the part of the html output that occurred since the call to start_capture
+	 * and removes this part from the current html output
+	 *
+	 * @param $offset mixed The value returned by start_capture
+	 *
+	 * @return string The part of the html output that was added since the call to start_capture
+	 */
+	public function end_capture($offset)
+	{
+		$sCaptured = substr($this->s_content, $offset);
+		$this->s_content = substr($this->s_content, 0, $offset);
+
+		return $sCaptured;
+	}
+
+	/**
+	 * Build a special kind of TABLE useful for displaying the details of an object from a hash array of data
+	 */
+	public function GetDetails($aFields)
+	{
+		$sHtml = "<div class=\"details\" id='search-widget-results-outer'>\n";
+		foreach ($aFields as $aAttrib)
+		{
+			$sDataAttCode = isset($aAttrib['attcode']) ? "data-attcode=\"{$aAttrib['attcode']}\"" : '';
+			$sLayout = isset($aAttrib['layout']) ? $aAttrib['layout'] : 'small';
+			$sHtml .= "<div class=\"field_container field_{$sLayout}\" $sDataAttCode>\n";
+			$sHtml .= "<div class=\"field_label label\">{$aAttrib['label']}</div>\n";
+
+			$sHtml .= "<div class=\"field_data\">\n";
+			// By Rom, for csv import, proposed to show several values for column selection
+			if (is_array($aAttrib['value']))
+			{
+				$sHtml .= "<div class=\"field_value\">".implode("</div><div>", $aAttrib['value'])."</div>\n";
+			}
+			else
+			{
+				$sHtml .= "<div class=\"field_value\">".$aAttrib['value']."</div>\n";
+			}
+			// Checking if we should add comments & infos
+			$sComment = (isset($aAttrib['comments'])) ? $aAttrib['comments'] : '';
+			$sInfo = (isset($aAttrib['infos'])) ? $aAttrib['infos'] : '';
+			if ($sComment !== '')
+			{
+				$sHtml .= "<div class=\"field_comments\">$sComment</div>\n";
+			}
+			if ($sInfo !== '')
+			{
+				$sHtml .= "<div class=\"field_infos\">$sInfo</div>\n";
+			}
+			$sHtml .= "</div>\n";
+
+			$sHtml .= "</div>\n";
+		}
+		$sHtml .= "</div>\n";
+
+		return $sHtml;
+	}
+
+	/**
+	 * Build a set of radio buttons suitable for editing a field/attribute of an object (including its validation)
+	 *
+	 * @param $aAllowedValues hash Array of value => display_value
+	 * @param $value mixed Current value for the field/attribute
+	 * @param $iId mixed Unique Id for the input control in the page
+	 * @param $sFieldName string The name of the field, attr_<$sFieldName> will hold the value for the field
+	 * @param $bMandatory bool Whether or not the field is mandatory
+	 * @param $bVertical bool Disposition of the radio buttons vertical or horizontal
+	 * @param $sValidationField string HTML fragment holding the validation field (exclamation icon...)
+	 *
+	 * @return string The HTML fragment corresponding to the radio buttons
+	 */
+	public function GetRadioButtons(
+		$aAllowedValues, $value, $iId, $sFieldName, $bMandatory, $bVertical, $sValidationField
+	) {
+		$idx = 0;
+		$sHTMLValue = '';
+		foreach ($aAllowedValues as $key => $display_value)
+		{
+			if ((count($aAllowedValues) == 1) && ($bMandatory == 'true'))
+			{
+				// When there is only once choice, select it by default
+				$sSelected = ' checked';
+			}
+			else
+			{
+				$sSelected = ($value == $key) ? ' checked' : '';
+			}
+			$sHTMLValue .= "<input type=\"radio\" id=\"{$iId}_{$key}\" name=\"radio_$sFieldName\" onChange=\"$('#{$iId}').val(this.value).trigger('change');\" value=\"$key\"$sSelected><label class=\"radio\" for=\"{$iId}_{$key}\">&nbsp;$display_value</label>&nbsp;";
+			if ($bVertical)
+			{
+				if ($idx == 0)
+				{
+					// Validation icon at the end of the first line
+					$sHTMLValue .= "&nbsp;{$sValidationField}\n";
+				}
+				$sHTMLValue .= "<br>\n";
+			}
+			$idx++;
+		}
+		$sHTMLValue .= "<input type=\"hidden\" id=\"$iId\" name=\"$sFieldName\" value=\"$value\"/>";
+		if (!$bVertical)
+		{
+			// Validation icon at the end of the line
+			$sHTMLValue .= "&nbsp;{$sValidationField}\n";
+		}
+
+		return $sHTMLValue;
+	}
+
+	/**
+	 * Discard unexpected output data (such as PHP warnings)
+	 * This is a MUST when the Page output is DATA (download of a document, download CSV export, download ...)
+	 */
+	public function TrashUnexpectedOutput()
+	{
+		$this->bTrashUnexpectedOutput = true;
+	}
+
+	/**
+	 * Read the output buffer and deal with its contents:
+	 * - trash unexpected output if the flag has been set
+	 * - report unexpected behaviors such as the output buffering being stopped
+	 *
+	 * Possible improvement: I've noticed that several output buffers are stacked,
+	 * if they are not empty, the output will be corrupted. The solution would
+	 * consist in unstacking all of them (and concatenate the contents).
+	 */
+	protected function ob_get_clean_safe()
+	{
+		$sOutput = ob_get_contents();
+		if ($sOutput === false)
+		{
+			$sMsg = "Design/integration issue: No output buffer. Some piece of code has called ob_get_clean() or ob_end_clean() without calling ob_start()";
+			if ($this->bTrashUnexpectedOutput)
+			{
+				IssueLog::Error($sMsg);
+				$sOutput = '';
+			}
+			else
+			{
+				$sOutput = $sMsg;
+			}
+		}
+		else
+		{
+			ob_end_clean(); // on some versions of PHP doing so when the output buffering is stopped can cause a notice
+			if ($this->bTrashUnexpectedOutput)
+			{
+				if (trim($sOutput) != '')
+				{
+					if (Utils::GetConfig() && Utils::GetConfig()->Get('debug_report_spurious_chars'))
+					{
+						IssueLog::Error("Trashing unexpected output:'$sOutput'\n");
+					}
+				}
+				$sOutput = '';
+			}
+		}
+
+		return $sOutput;
+	}
+
+	/**
+	 * Outputs (via some echo) the complete HTML page by assembling all its elements
+	 */
+	public function output()
+	{
+		foreach ($this->a_headers as $s_header)
+		{
+			header($s_header);
+		}
+
+		$s_captured_output = $this->ob_get_clean_safe();
+		echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+		echo "<html>\n";
+		echo "<head>\n";
+		echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
+		echo "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0, shrink-to-fit=no\" />";
+		echo "<title>".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</title>\n";
+		echo $this->get_base_tag();
+
+		$this->output_dict_entries();
+
+		foreach ($this->a_linked_scripts as $s_script)
+		{
+			// Make sure that the URL to the script contains the application's version number
+			// so that the new script do NOT get reloaded from the cache when the application is upgraded
+			if (strpos($s_script, '?') === false)
+			{
+				$s_script .= "?t=".utils::GetCacheBusterTimestamp();
+			}
+			else
+			{
+				$s_script .= "&t=".utils::GetCacheBusterTimestamp();
+			}
+			echo "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
+		}
+		if (count($this->a_scripts) > 0)
+		{
+			echo "<script type=\"text/javascript\">\n";
+			foreach ($this->a_scripts as $s_script)
+			{
+				echo "$s_script\n";
+			}
+			echo "</script>\n";
+		}
+		foreach ($this->a_linked_stylesheets as $a_stylesheet)
+		{
+			if (strpos($a_stylesheet['link'], '?') === false)
+			{
+				$s_stylesheet = $a_stylesheet['link']."?t=".utils::GetCacheBusterTimestamp();
+			}
+			else
+			{
+				$s_stylesheet = $a_stylesheet['link']."&t=".utils::GetCacheBusterTimestamp();
+			}
+			if ($a_stylesheet['condition'] != "")
+			{
+				echo "<!--[if {$a_stylesheet['condition']}]>\n";
+			}
+			echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"{$s_stylesheet}\" />\n";
+			if ($a_stylesheet['condition'] != "")
+			{
+				echo "<![endif]-->\n";
+			}
+		}
+
+		if (count($this->a_styles) > 0)
+		{
+			echo "<style>\n";
+			foreach ($this->a_styles as $s_style)
+			{
+				echo "$s_style\n";
+			}
+			echo "</style>\n";
+		}
+		if (class_exists('MetaModel') && MetaModel::GetConfig())
+		{
+			echo "<link rel=\"shortcut icon\" href=\"".utils::GetAbsoluteUrlAppRoot()."images/favicon.ico?t=".utils::GetCacheBusterTimestamp()."\" />\n";
+		}
+		echo "</head>\n";
+		echo "<body>\n";
+		echo self::FilterXSS($this->s_content);
+		if (trim($s_captured_output) != "")
+		{
+			echo "<div class=\"raw_output\">".self::FilterXSS($s_captured_output)."</div>\n";
+		}
+		echo '<div id="at_the_end">'.self::FilterXSS($this->s_deferred_content).'</div>';
+		echo "</body>\n";
+		echo "</html>\n";
+
+		if (class_exists('DBSearch'))
+		{
+			DBSearch::RecordQueryTrace();
+		}
+		if (class_exists('ExecutionKPI'))
+		{
+			ExecutionKPI::ReportStats();
+		}
+	}
+
+	/**
+	 * Build a series of hidden field[s] from an array
+	 */
+	public function add_input_hidden($sLabel, $aData)
+	{
+		foreach ($aData as $sKey => $sValue)
+		{
+			// Note: protection added to protect against the Notice 'array to string conversion' that appeared with PHP 5.4
+			// (this function seems unused though!)
+			if (is_scalar($sValue))
+			{
+				$this->add("<input type=\"hidden\" name=\"".$sLabel."[$sKey]\" value=\"$sValue\">");
+			}
+		}
+	}
+
+	protected function get_base_tag()
+	{
+		$sTag = '';
+		if (($this->a_base['href'] != '') || ($this->a_base['target'] != ''))
+		{
+			$sTag = '<base ';
+			if (($this->a_base['href'] != ''))
+			{
+				$sTag .= "href =\"{$this->a_base['href']}\" ";
+			}
+			if (($this->a_base['target'] != ''))
+			{
+				$sTag .= "target =\"{$this->a_base['target']}\" ";
+			}
+			$sTag .= " />\n";
+		}
+
+		return $sTag;
+	}
+
+	/**
+	 * Get an ID (for any kind of HTML tag) that is guaranteed unique in this page
+	 *
+	 * @return int The unique ID (in this page)
+	 */
+	public function GetUniqueId()
+	{
+		return $this->iNextId++;
+	}
+
+	/**
+	 * Set the content-type (mime type) for the page's content
+	 *
+	 * @param $sContentType string
+	 *
+	 * @return void
+	 */
+	public function SetContentType($sContentType)
+	{
+		$this->sContentType = $sContentType;
+	}
+
+	/**
+	 * Set the content-disposition (mime type) for the page's content
+	 *
+	 * @param $sDisposition string The disposition: 'inline' or 'attachment'
+	 * @param $sFileName string The original name of the file
+	 *
+	 * @return void
+	 */
+	public function SetContentDisposition($sDisposition, $sFileName)
+	{
+		$this->sContentDisposition = $sDisposition;
+		$this->sContentFileName = $sFileName;
+	}
+
+	/**
+	 * Set the transactionId of the current form
+	 *
+	 * @param $iTransactionId integer
+	 *
+	 * @return void
+	 */
+	public function SetTransactionId($iTransactionId)
+	{
+		$this->iTransactionId = $iTransactionId;
+	}
+
+	/**
+	 * Returns the transactionId of the current form
+	 *
+	 * @return integer The current transactionID
+	 */
+	public function GetTransactionId()
+	{
+		return $this->iTransactionId;
+	}
+
+	public static function FilterXSS($sHTML)
+	{
+		return str_ireplace('<script', '&lt;script', $sHTML);
+	}
+
+	/**
+	 * What is the currently selected output format
+	 *
+	 * @return string The selected output format: html, pdf...
+	 */
+	public function GetOutputFormat()
+	{
+		return $this->s_OutputFormat;
+	}
+
+	/**
+	 * Check whether the desired output format is possible or not
+	 *
+	 * @param string $sOutputFormat The desired output format: html, pdf...
+	 *
+	 * @return bool True if the format is Ok, false otherwise
+	 */
+	function IsOutputFormatAvailable($sOutputFormat)
+	{
+		$bResult = false;
+		switch ($sOutputFormat)
+		{
+			case 'html':
+				$bResult = true; // Always supported
+				break;
+
+			case 'pdf':
+				$bResult = @is_readable(APPROOT.'lib/MPDF/mpdf.php');
+				break;
+		}
+
+		return $bResult;
+	}
+
+	/**
+	 * Check whether the output must be printable (using print.css, for sure!)
+	 *
+	 * @return bool ...
+	 */
+	public function IsPrintableVersion()
+	{
+		return $this->bPrintable;
+	}
+
+	/**
+	 * Retrieves the value of a named output option for the given format
+	 *
+	 * @param string $sFormat The format: html or pdf
+	 * @param string $sOptionName The name of the option
+	 *
+	 * @return mixed false if the option was never set or the options's value
+	 */
+	public function GetOutputOption($sFormat, $sOptionName)
+	{
+		if (isset($this->a_OutputOptions[$sFormat][$sOptionName]))
+		{
+			return $this->a_OutputOptions[$sFormat][$sOptionName];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Sets a named output option for the given format
+	 *
+	 * @param string $sFormat The format for which to set the option: html or pdf
+	 * @param string $sOptionName the name of the option
+	 * @param mixed $sValue The value of the option
+	 */
+	public function SetOutputOption($sFormat, $sOptionName, $sValue)
+	{
+		if (!isset($this->a_OutputOptions[$sFormat]))
+		{
+			$this->a_OutputOptions[$sFormat] = array($sOptionName => $sValue);
+		}
+		else
+		{
+			$this->a_OutputOptions[$sFormat][$sOptionName] = $sValue;
+		}
+	}
+
+	public function RenderPopupMenuItems($aActions, $aFavoriteActions = array())
+	{
+		$sPrevUrl = '';
+		$sHtml = '';
+		if (!$this->IsPrintableVersion())
+		{
+			foreach ($aActions as $aAction)
+			{
+				$sClass = isset($aAction['css_classes']) ? ' class="'.implode(' ', $aAction['css_classes']).'"' : '';
+				$sOnClick = isset($aAction['onclick']) ? ' onclick="'.htmlspecialchars($aAction['onclick'], ENT_QUOTES,
+						"UTF-8").'"' : '';
+				$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
+				if (empty($aAction['url']))
+				{
+					if ($sPrevUrl != '') // Don't output consecutively two separators...
+					{
+						$sHtml .= "<li>{$aAction['label']}</li>";
+					}
+					$sPrevUrl = '';
+				}
+				else
+				{
+					$sHtml .= "<li><a $sTarget href=\"{$aAction['url']}\"$sClass $sOnClick>{$aAction['label']}</a></li>";
+					$sPrevUrl = $aAction['url'];
+				}
+			}
+			$sHtml .= "</ul></li></ul></div>";
+			foreach (array_reverse($aFavoriteActions) as $aAction)
+			{
+				$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
+				$sHtml .= "<div class=\"actions_button\"><a $sTarget href='{$aAction['url']}'>{$aAction['label']}</a></div>";
+			}
+		}
+
+		return $sHtml;
+	}
+
+	protected function output_dict_entries($bReturnOutput = false)
+	{
+		if ((count($this->a_dict_entries) > 0) || (count($this->a_dict_entries_prefixes) > 0))
+		{
+			if (class_exists('Dict'))
+			{
+				// The dictionary may not be available for example during the setup...
+				// Create a specific dictionary file and load it as a JS script
+				$sSignature = $this->get_dict_signature();
+				$sJSFileName = utils::GetCachePath().$sSignature.'.js';
+				if (!file_exists($sJSFileName) && is_writable(utils::GetCachePath()))
+				{
+					file_put_contents($sJSFileName, $this->get_dict_file_content());
+				}
+				// Load the dictionary as the first javascript file, so that other JS file benefit from the translations
+				array_unshift($this->a_linked_scripts,
+					utils::GetAbsoluteUrlAppRoot().'pages/ajax.document.php?operation=dict&s='.$sSignature);
+			}
+		}
+	}
+}
+
+
+interface iTabbedPage
+{
+	public function AddTabContainer($sTabContainer, $sPrefix = '');
+
+	public function AddToTab($sTabContainer, $sTabLabel, $sHtml);
+
+	public function SetCurrentTabContainer($sTabContainer = '');
+
+	public function SetCurrentTab($sTabLabel = '');
+
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 *
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to
+	 * pull content from another server. Static content cannot be added inside such tabs.
+	 *
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause
+	 *     the tab to be reloaded upon each activation.
+	 *
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true);
+
+	public function GetCurrentTab();
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null);
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 *
+	 * @return mixed The name of the tab as a string or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null);
+}
+
+/**
+ * Helper class to implement JQueryUI tabs inside a page
+ */
+class TabManager
+{
+	protected $m_aTabs;
+	protected $m_sCurrentTabContainer;
+	protected $m_sCurrentTab;
+
+	public function __construct()
+	{
+		$this->m_aTabs = array();
+		$this->m_sCurrentTabContainer = '';
+		$this->m_sCurrentTab = '';
+	}
+
+	public function AddTabContainer($sTabContainer, $sPrefix = '')
+	{
+		$this->m_aTabs[$sTabContainer] = array('prefix' => $sPrefix, 'tabs' => array());
+
+		return "\$Tabs:$sTabContainer\$";
+	}
+
+	public function AddToCurrentTab($sHtml)
+	{
+		$this->AddToTab($this->m_sCurrentTabContainer, $this->m_sCurrentTab, $sHtml);
+	}
+
+	public function GetCurrentTabLength($sHtml)
+	{
+		$iLength = isset($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) ? strlen($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html']) : 0;
+
+		return $iLength;
+	}
+
+	/**
+	 * Truncates the given tab to the specifed length and returns the truncated part
+	 *
+	 * @param string $sTabContainer The tab container in which to truncate the tab
+	 * @param string $sTab The name/identifier of the tab to truncate
+	 * @param integer $iLength The length/offset at which to truncate the tab
+	 *
+	 * @return string The truncated part
+	 */
+	public function TruncateTab($sTabContainer, $sTab, $iLength)
+	{
+		$sResult = substr($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'],
+			$iLength);
+		$this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'] = substr($this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$this->m_sCurrentTab]['html'],
+			0, $iLength);
+
+		return $sResult;
+	}
+
+	public function TabExists($sTabContainer, $sTab)
+	{
+		return isset($this->m_aTabs[$sTabContainer]['tabs'][$sTab]);
+	}
+
+	public function TabsContainerCount()
+	{
+		return count($this->m_aTabs);
+	}
+
+	public function AddToTab($sTabContainer, $sTabLabel, $sHtml)
+	{
+		if (!isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
+		{
+			// Set the content of the tab
+			$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel] = array(
+				'type' => 'html',
+				'html' => $sHtml,
+			);
+		}
+		else
+		{
+			if ($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['type'] != 'html')
+			{
+				throw new Exception("Cannot add HTML content to the tab '$sTabLabel' of type '{$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['type']}'");
+			}
+			// Append to the content of the tab
+			$this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]['html'] .= $sHtml;
+		}
+
+		return ''; // Nothing to add to the page for now
+	}
+
+	public function SetCurrentTabContainer($sTabContainer = '')
+	{
+		$sPreviousTabContainer = $this->m_sCurrentTabContainer;
+		$this->m_sCurrentTabContainer = $sTabContainer;
+
+		return $sPreviousTabContainer;
+	}
+
+	public function SetCurrentTab($sTabLabel = '')
+	{
+		$sPreviousTab = $this->m_sCurrentTab;
+		$this->m_sCurrentTab = $sTabLabel;
+
+		return $sPreviousTab;
+	}
+
+	/**
+	 * Add a tab which content will be loaded asynchronously via the supplied URL
+	 *
+	 * Limitations:
+	 * Cross site scripting is not not allowed for security reasons. Use a normal tab with an IFRAME if you want to
+	 * pull content from another server. Static content cannot be added inside such tabs.
+	 *
+	 * @param string $sTabLabel The (localised) label of the tab
+	 * @param string $sUrl The URL to load (on the same server)
+	 * @param boolean $bCache Whether or not to cache the content of the tab once it has been loaded. flase will cause
+	 *     the tab to be reloaded upon each activation.
+	 *
+	 * @since 2.0.3
+	 */
+	public function AddAjaxTab($sTabLabel, $sUrl, $bCache = true)
+	{
+		// Set the content of the tab
+		$this->m_aTabs[$this->m_sCurrentTabContainer]['tabs'][$sTabLabel] = array(
+			'type' => 'ajax',
+			'url' => $sUrl,
+			'cache' => $bCache,
+		);
+
+		return ''; // Nothing to add to the page for now
+	}
+
+
+	public function GetCurrentTabContainer()
+	{
+		return $this->m_sCurrentTabContainer;
+	}
+
+	public function GetCurrentTab()
+	{
+		return $this->m_sCurrentTab;
+	}
+
+	public function RemoveTab($sTabLabel, $sTabContainer = null)
+	{
+		if ($sTabContainer == null)
+		{
+			$sTabContainer = $this->m_sCurrentTabContainer;
+		}
+		if (isset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]))
+		{
+			// Delete the content of the tab
+			unset($this->m_aTabs[$sTabContainer]['tabs'][$sTabLabel]);
+
+			// If we just removed the active tab, let's reset the active tab
+			if (($this->m_sCurrentTabContainer == $sTabContainer) && ($this->m_sCurrentTab == $sTabLabel))
+			{
+				$this->m_sCurrentTab = '';
+			}
+		}
+	}
+
+	/**
+	 * Finds the tab whose title matches a given pattern
+	 *
+	 * @return mixed The actual name of the tab (as a string) or false if not found
+	 */
+	public function FindTab($sPattern, $sTabContainer = null)
+	{
+		$result = false;
+		if ($sTabContainer == null)
+		{
+			$sTabContainer = $this->m_sCurrentTabContainer;
+		}
+		foreach ($this->m_aTabs[$sTabContainer]['tabs'] as $sTabLabel => $void)
+		{
+			if (preg_match($sPattern, $sTabLabel))
+			{
+				$result = $sTabLabel;
+				break;
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Make the given tab the active one, as if it were clicked
+	 * DOES NOT WORK: apparently in the *old* version of jquery
+	 * that we are using this is not supported... TO DO upgrade
+	 * the whole jquery bundle...
+	 */
+	public function SelectTab($sTabContainer, $sTabLabel)
+	{
+		$container_index = 0;
+		$tab_index = 0;
+		foreach ($this->m_aTabs as $sCurrentTabContainerName => $aTabs)
+		{
+			if ($sTabContainer == $sCurrentTabContainerName)
+			{
+				foreach ($aTabs['tabs'] as $sCurrentTabLabel => $void)
+				{
+					if ($sCurrentTabLabel == $sTabLabel)
+					{
+						break;
+					}
+					$tab_index++;
+				}
+				break;
+			}
+			$container_index++;
+		}
+		$sSelector = '#tabbedContent_'.$container_index.' > ul';
+
+		return "window.setTimeout(\"$('$sSelector').tabs('select', $tab_index);\", 100);"; // Let the time to the tabs widget to initialize
+	}
+
+	public function RenderIntoContent($sContent, WebPage $oPage)
+	{
+		// Render the tabs in the page (if any)
+		foreach ($this->m_aTabs as $sTabContainerName => $aTabs)
+		{
+			$sTabs = '';
+			$sPrefix = $aTabs['prefix'];
+			$container_index = 0;
+			if (count($aTabs['tabs']) > 0)
+			{
+				if ($oPage->IsPrintableVersion())
+				{
+					$oPage->add_ready_script(
+						<<< EOF
+oHiddeableChapters = {};
+EOF
+					);
+					$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$sPrefix}{$container_index}\" class=\"light\">\n";
+					$i = 0;
+					foreach ($aTabs['tabs'] as $sTabName => $aTabData)
+					{
+						$sTabNameEsc = addslashes($sTabName);
+						$sTabId = "tab_{$sPrefix}{$container_index}$i";
+						switch ($aTabData['type'])
+						{
+							case 'ajax':
+								$sTabHtml = '';
+								$sUrl = $aTabData['url'];
+								$oPage->add_ready_script(
+									<<< EOF
+$.post('$sUrl', {printable: '1'}, function(data){
+	$('#$sTabId > .printable-tab-content').append(data);
+});
+EOF
+								);
+								break;
+
+							case 'html':
+							default:
+								$sTabHtml = $aTabData['html'];
+						}
+						$sTabs .= "<div class=\"printable-tab\" id=\"$sTabId\"><h2 class=\"printable-tab-title\">".htmlentities($sTabName,
+								ENT_QUOTES,
+								'UTF-8')."</h2><div class=\"printable-tab-content\">".$sTabHtml."</div></div>\n";
+						$oPage->add_ready_script(
+							<<< EOF
+oHiddeableChapters['$sTabId'] = '$sTabNameEsc';
+EOF
+						);
+						$i++;
+					}
+					$sTabs .= "</div>\n<!-- end of tabs-->\n";
+				}
+				else
+				{
+					$sTabs = "<!-- tabs -->\n<div id=\"tabbedContent_{$sPrefix}{$container_index}\" class=\"light\">\n";
+					$sTabs .= "<ul>\n";
+					// Display the unordered list that will be rendered as the tabs
+					$i = 0;
+					foreach ($aTabs['tabs'] as $sTabName => $aTabData)
+					{
+						switch ($aTabData['type'])
+						{
+							case 'ajax':
+								$sTabs .= "<li data-cache=\"".($aTabData['cache'] ? 'true' : 'false')."\"><a href=\"{$aTabData['url']}\" class=\"tab\"><span>".htmlentities($sTabName,
+										ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
+								break;
+
+							case 'html':
+							default:
+								$sTabs .= "<li><a href=\"#tab_{$sPrefix}{$container_index}$i\" class=\"tab\"><span>".htmlentities($sTabName,
+										ENT_QUOTES, 'UTF-8')."</span></a></li>\n";
+						}
+						$i++;
+					}
+					$sTabs .= "</ul>\n";
+					// Now add the content of the tabs themselves
+					$i = 0;
+					foreach ($aTabs['tabs'] as $sTabName => $aTabData)
+					{
+						switch ($aTabData['type'])
+						{
+							case 'ajax':
+								// Nothing to add
+								break;
+
+							case 'html':
+							default:
+								$sTabs .= "<div id=\"tab_{$sPrefix}{$container_index}$i\">".$aTabData['html']."</div>\n";
+						}
+						$i++;
+					}
+					$sTabs .= "</div>\n<!-- end of tabs-->\n";
+				}
+			}
+			$sContent = str_replace("\$Tabs:$sTabContainerName\$", $sTabs, $sContent);
+			$container_index++;
+		}
+
+		return $sContent;
+	}
 }
\ No newline at end of file
diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php
index f9c078361..379cd58a2 100644
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -1,346 +1,346 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class WizardHelper
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/application/uiwizard.class.inc.php');
-
-class WizardHelper
-{
-	protected $m_aData;
-	
-	public function __construct()
-	{
-	}
-	/**
-	 * Constructs the PHP target object from the parameters sent to the web page by the wizard
-	 * @param boolean $bReadUploadedFiles True to also read any uploaded file (for blob/document fields)
-	 * @return object
-	 */	 	 	 	
-	public function GetTargetObject($bReadUploadedFiles = false)
-	{
-		if (isset($this->m_aData['m_oCurrentValues']['id']))
-		{
-			$oObj = MetaModel::GetObject($this->m_aData['m_sClass'], $this->m_aData['m_oCurrentValues']['id']);
-		}
-		else
-		{
-			$oObj = MetaModel::NewObject($this->m_aData['m_sClass']);
-		}
-		foreach($this->m_aData['m_oCurrentValues'] as $sAttCode => $value)
-		{
-			// Because this is stored in a Javascript array, unused indexes
-			// are filled with null values and unused keys (stored as strings) contain $$NULL$$
-			if ( ($sAttCode !='id') && ($value !== '$$NULL$$'))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
-				if (($oAttDef->IsLinkSet()) && ($value != '') )
-				{
-					// special handling for lists
-					// assumes this is handled as an array of objects
-					// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
-					$aData = json_decode($value, true); // true means decode as a hash array (not an object)
-					// Check what are the meaningful attributes
-					$aFields = $this->GetLinkedWizardStructure($oAttDef);
-					$sLinkedClass = $oAttDef->GetLinkedClass();
-					$aLinkedObjectsArray = array();
-					if (!is_array($aData))
-					{
-						echo ("aData: '$aData' (value: '$value')\n");
-					}
-					foreach($aData as $aLinkedObject)
-					{
-						$oLinkedObj = MetaModel::NewObject($sLinkedClass);
-						foreach($aFields as $sLinkedAttCode)
-						{
-							if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) )
-							{
-								$sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode);
-								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] > 0) )
-								{
-									// For external keys: load the target object so that external fields
-									// get filled too
-									$oTargetObj = MetaModel::GetObject($sLinkedAttDef->GetTargetClass(), $aLinkedObject[$sLinkedAttCode]);
-									$oLinkedObj->Set($sLinkedAttCode, $oTargetObj);
-								}
-								elseif($sLinkedAttDef instanceof AttributeDateTime)
-                                {
-                                    $sDateClass = get_class($sLinkedAttDef);
-                                    $sDate = $aLinkedObject[$sLinkedAttCode];
-                                    if($sDate !== null && $sDate !== '')
-                                    {
-                                        $oDateTimeFormat = $sDateClass::GetFormat();
-                                        $oDate = $oDateTimeFormat->Parse($sDate);
-                                        if ($sDateClass == "AttributeDate")
-                                        {
-                                            $sDate = $oDate->format('Y-m-d');
-                                        }
-                                        else
-                                        {
-                                            $sDate = $oDate->format('Y-m-d H:i:s');
-                                        }
-                                    }
-
-                                    $oLinkedObj->Set($sLinkedAttCode, $sDate);
-                                }
-								else
-								{
-									$oLinkedObj->Set($sLinkedAttCode, $aLinkedObject[$sLinkedAttCode]);
-								}
-							}
-						}
-						$aLinkedObjectsArray[] = $oLinkedObj;
-					}
-					$oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
-					$oObj->Set($sAttCode, $oSet);
-				}
-				else if ( $oAttDef->GetEditClass() == 'Document' )
-				{
-					if ($bReadUploadedFiles)
-					{
-						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
-						$oObj->Set($sAttCode, $oDocument);
-					}
-					else
-					{
-						// Create a new empty document, just for displaying the file name
-						$oDocument = new ormDocument(null, '', $value);
-						$oObj->Set($sAttCode, $oDocument);
-					}
-				}
-				else if ( $oAttDef->GetEditClass() == 'Image' )
-				{
-					if ($bReadUploadedFiles)
-					{
-						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
-						$oObj->Set($sAttCode, $oDocument);
-					}
-					else
-					{
-						// Create a new empty document, just for displaying the file name
-						$oDocument = new ormDocument(null, '', $value);
-						$oObj->Set($sAttCode, $oDocument);
-					}
-				}
-				else if (($oAttDef->IsExternalKey()) && (!empty($value)) && ($value > 0) )
-				{
-					// For external keys: load the target object so that external fields
-					// get filled too
-					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value, false);
-					if ($oTargetObj)
-					{
-						$oObj->Set($sAttCode, $oTargetObj);
-					}
-					else
-					{
-						// May happen for security reasons (portal, see ticket #1074)
-						$oObj->Set($sAttCode, $value);
-					}
-				}
-				else if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
-				{
-					if ($value != null)
-					{
-						$oDate = $oAttDef->GetFormat()->Parse($value);
-						if ($oDate instanceof DateTime)
-						{
-							$value = $oDate->format($oAttDef->GetInternalFormat());
-						}
-						else
-						{
-							$value = null;
-						}
-					}
-					$oObj->Set($sAttCode, $value);
-				}
-				else
-				{
-					$oObj->Set($sAttCode, $value);
-				}	
-			}
-		}
-		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
-		{
-			$oObj->Set(MetaModel::GetStateAttributeCode($this->m_aData['m_sClass']), $this->m_aData['m_sState']);
-		}
-		$oObj->DoComputeValues();
-		return $oObj;
-	}
-	
-	public function GetFieldsForDefaultValue()
-	{
-		return $this->m_aData['m_aDefaultValueRequested'];
-	}
-	
-	public function SetDefaultValue($sAttCode, $value)
-	{
-		// Protect against a request for a non existing field
-		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
-			if ($oAttDef->GetEditClass() == 'List')
-			{
-				// special handling for lists
-				// this as to be handled as an array of objects
-				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
-				// NOT YET IMPLEMENTED !!
-				$sLinkedClass = $oAttDef->GetLinkedClass();
-				$oSet = $value;
-				$aData = array();
-				$aFields = $this->GetLinkedWizardStructure($oAttDef);
-				while($oSet->fetch())
-				{
-					foreach($aFields as $sLinkedAttCode)
-					{
-						$aRow[$sAttCode] = $oLinkedObj->Get($sLinkedAttCode);
-					}
-					$aData[] = $aRow;
-				}
-				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
-				
-			}
-			else
-			{
-				// Normal handling for all other scalar attributes
-				$this->m_aData['m_oDefaultValue'][$sAttCode] = $value;
-			}
-		}
-	}
-	
-	public function GetFieldsForAllowedValues()
-	{
-		return $this->m_aData['m_aAllowedValuesRequested'];
-	}
-	
-	public function SetAllowedValuesHtml($sAttCode, $sHtml)
-	{
-		// Protect against a request for a non existing field
-		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
-		{
-			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
-		}
-	}
-	
-	public function ToJSON()
-	{
-		return json_encode($this->m_aData);
-	}
-	
-	static public function FromJSON($sJSON)
-	{
-		$oWizHelper = new WizardHelper();
-		if (get_magic_quotes_gpc())
-		{
-			$sJSON = stripslashes($sJSON);
-		}
-		$aData = json_decode($sJSON, true); // true means hash array instead of object
-		$oWizHelper->m_aData = $aData;
-		return $oWizHelper;
-	}
-	
-	protected function GetLinkedWizardStructure($oAttDef)
-	{
-		$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
-		$aWizardSteps = $oWizard->GetWizardStructure();
-		$aFields = array();
-		$sExtKeyToMeCode = $oAttDef->GetExtKeyToMe();
-		// Retrieve as a flat list, all the attributes that are needed to create
-		// an object of the linked class and put them into a flat array, except
-		// the attribute 'ext_key_to_me' which is a constant in our case
-		foreach($aWizardSteps as $sDummy => $aMainSteps)
-		{
-			// 2 entries: 'mandatory' and 'optional'
-			foreach($aMainSteps as $aSteps)
-			{
-				// One entry for each step of the wizard
-				foreach($aSteps as $sAttCode)
-				{
-					if ($sAttCode != $sExtKeyToMeCode)
-					{
-						$aFields[] = $sAttCode;
-					}
-				}
-			}
-		}
-		return $aFields;
-	}
-	
-	public function GetTargetClass()
-	{
-		return $this->m_aData['m_sClass'];
-	}
-
-    public function GetFormPrefix()
-    {
-        return $this->m_aData['m_sFormPrefix'];
-    }
-
-    public function GetInitialState()
-    {
-        return isset($this->m_aData['m_sInitialState']) ? $this->m_aData['m_sInitialState'] : null;
-    }
-
-    public function GetStimulus()
-    {
-        return isset($this->m_aData['m_sStimulus']) ? $this->m_aData['m_sStimulus'] : null;
-    }
-	
-	public function GetIdForField($sFieldName)
-	{
-		$sResult = '';
-		// It may happen that the field we'd like to update does not
-		// exist in the form. For example, if the field should be hidden/read-only
-		// in the current state of the object
-		if (isset($this->m_aData['m_oFieldsMap'][$sFieldName]))
-		{
-			$sResult = $this->m_aData['m_oFieldsMap'][$sFieldName];
-		}
-		return $sResult;
-	}
-	
-	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
-	{
-		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
-		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
-		foreach($aSet as $aLinkObj)
-		{
-			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach($aLinkObj as $sAttCode => $value)
-			{
-				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
-				if (($oAttDef->IsExternalKey()) && ($value != '')  && ($value > 0))
-				{
-					// For external keys: load the target object so that external fields
-					// get filled too
-					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
-					$oLink->Set($sAttCode, $oTargetObj);
-				}
-				$oLink->Set($sAttCode, $value);
-			}
-			$oLink->Set($sExtKeyToMe, $oMe->GetKey());
-			$oSet->AddObject($oLink);
-		}
-		return $oSet;
-	}
-}
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class WizardHelper
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/application/uiwizard.class.inc.php');
+
+class WizardHelper
+{
+	protected $m_aData;
+	
+	public function __construct()
+	{
+	}
+	/**
+	 * Constructs the PHP target object from the parameters sent to the web page by the wizard
+	 * @param boolean $bReadUploadedFiles True to also read any uploaded file (for blob/document fields)
+	 * @return object
+	 */	 	 	 	
+	public function GetTargetObject($bReadUploadedFiles = false)
+	{
+		if (isset($this->m_aData['m_oCurrentValues']['id']))
+		{
+			$oObj = MetaModel::GetObject($this->m_aData['m_sClass'], $this->m_aData['m_oCurrentValues']['id']);
+		}
+		else
+		{
+			$oObj = MetaModel::NewObject($this->m_aData['m_sClass']);
+		}
+		foreach($this->m_aData['m_oCurrentValues'] as $sAttCode => $value)
+		{
+			// Because this is stored in a Javascript array, unused indexes
+			// are filled with null values and unused keys (stored as strings) contain $$NULL$$
+			if ( ($sAttCode !='id') && ($value !== '$$NULL$$'))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
+				if (($oAttDef->IsLinkSet()) && ($value != '') )
+				{
+					// special handling for lists
+					// assumes this is handled as an array of objects
+					// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
+					$aData = json_decode($value, true); // true means decode as a hash array (not an object)
+					// Check what are the meaningful attributes
+					$aFields = $this->GetLinkedWizardStructure($oAttDef);
+					$sLinkedClass = $oAttDef->GetLinkedClass();
+					$aLinkedObjectsArray = array();
+					if (!is_array($aData))
+					{
+						echo ("aData: '$aData' (value: '$value')\n");
+					}
+					foreach($aData as $aLinkedObject)
+					{
+						$oLinkedObj = MetaModel::NewObject($sLinkedClass);
+						foreach($aFields as $sLinkedAttCode)
+						{
+							if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) )
+							{
+								$sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode);
+								if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] > 0) )
+								{
+									// For external keys: load the target object so that external fields
+									// get filled too
+									$oTargetObj = MetaModel::GetObject($sLinkedAttDef->GetTargetClass(), $aLinkedObject[$sLinkedAttCode]);
+									$oLinkedObj->Set($sLinkedAttCode, $oTargetObj);
+								}
+								elseif($sLinkedAttDef instanceof AttributeDateTime)
+                                {
+                                    $sDateClass = get_class($sLinkedAttDef);
+                                    $sDate = $aLinkedObject[$sLinkedAttCode];
+                                    if($sDate !== null && $sDate !== '')
+                                    {
+                                        $oDateTimeFormat = $sDateClass::GetFormat();
+                                        $oDate = $oDateTimeFormat->Parse($sDate);
+                                        if ($sDateClass == "AttributeDate")
+                                        {
+                                            $sDate = $oDate->format('Y-m-d');
+                                        }
+                                        else
+                                        {
+                                            $sDate = $oDate->format('Y-m-d H:i:s');
+                                        }
+                                    }
+
+                                    $oLinkedObj->Set($sLinkedAttCode, $sDate);
+                                }
+								else
+								{
+									$oLinkedObj->Set($sLinkedAttCode, $aLinkedObject[$sLinkedAttCode]);
+								}
+							}
+						}
+						$aLinkedObjectsArray[] = $oLinkedObj;
+					}
+					$oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
+					$oObj->Set($sAttCode, $oSet);
+				}
+				else if ( $oAttDef->GetEditClass() == 'Document' )
+				{
+					if ($bReadUploadedFiles)
+					{
+						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
+						$oObj->Set($sAttCode, $oDocument);
+					}
+					else
+					{
+						// Create a new empty document, just for displaying the file name
+						$oDocument = new ormDocument(null, '', $value);
+						$oObj->Set($sAttCode, $oDocument);
+					}
+				}
+				else if ( $oAttDef->GetEditClass() == 'Image' )
+				{
+					if ($bReadUploadedFiles)
+					{
+						$oDocument = utils::ReadPostedDocument('attr_'.$sAttCode, 'fcontents');
+						$oObj->Set($sAttCode, $oDocument);
+					}
+					else
+					{
+						// Create a new empty document, just for displaying the file name
+						$oDocument = new ormDocument(null, '', $value);
+						$oObj->Set($sAttCode, $oDocument);
+					}
+				}
+				else if (($oAttDef->IsExternalKey()) && (!empty($value)) && ($value > 0) )
+				{
+					// For external keys: load the target object so that external fields
+					// get filled too
+					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value, false);
+					if ($oTargetObj)
+					{
+						$oObj->Set($sAttCode, $oTargetObj);
+					}
+					else
+					{
+						// May happen for security reasons (portal, see ticket #1074)
+						$oObj->Set($sAttCode, $value);
+					}
+				}
+				else if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
+				{
+					if ($value != null)
+					{
+						$oDate = $oAttDef->GetFormat()->Parse($value);
+						if ($oDate instanceof DateTime)
+						{
+							$value = $oDate->format($oAttDef->GetInternalFormat());
+						}
+						else
+						{
+							$value = null;
+						}
+					}
+					$oObj->Set($sAttCode, $value);
+				}
+				else
+				{
+					$oObj->Set($sAttCode, $value);
+				}	
+			}
+		}
+		if (isset($this->m_aData['m_sState']) && !empty($this->m_aData['m_sState']))
+		{
+			$oObj->Set(MetaModel::GetStateAttributeCode($this->m_aData['m_sClass']), $this->m_aData['m_sState']);
+		}
+		$oObj->DoComputeValues();
+		return $oObj;
+	}
+	
+	public function GetFieldsForDefaultValue()
+	{
+		return $this->m_aData['m_aDefaultValueRequested'];
+	}
+	
+	public function SetDefaultValue($sAttCode, $value)
+	{
+		// Protect against a request for a non existing field
+		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->m_aData['m_sClass'], $sAttCode);
+			if ($oAttDef->GetEditClass() == 'List')
+			{
+				// special handling for lists
+				// this as to be handled as an array of objects
+				// thus encoded in json like: [ { name:'link1', 'id': 123}, { name:'link2', 'id': 124}...]
+				// NOT YET IMPLEMENTED !!
+				$sLinkedClass = $oAttDef->GetLinkedClass();
+				$oSet = $value;
+				$aData = array();
+				$aFields = $this->GetLinkedWizardStructure($oAttDef);
+				while($oSet->fetch())
+				{
+					foreach($aFields as $sLinkedAttCode)
+					{
+						$aRow[$sAttCode] = $oLinkedObj->Get($sLinkedAttCode);
+					}
+					$aData[] = $aRow;
+				}
+				$this->m_aData['m_oDefaultValue'][$sAttCode] = json_encode($aData);
+				
+			}
+			else
+			{
+				// Normal handling for all other scalar attributes
+				$this->m_aData['m_oDefaultValue'][$sAttCode] = $value;
+			}
+		}
+	}
+	
+	public function GetFieldsForAllowedValues()
+	{
+		return $this->m_aData['m_aAllowedValuesRequested'];
+	}
+	
+	public function SetAllowedValuesHtml($sAttCode, $sHtml)
+	{
+		// Protect against a request for a non existing field
+		if (isset($this->m_aData['m_oFieldsMap'][$sAttCode]))
+		{
+			$this->m_aData['m_oAllowedValues'][$sAttCode] = $sHtml;
+		}
+	}
+	
+	public function ToJSON()
+	{
+		return json_encode($this->m_aData);
+	}
+	
+	static public function FromJSON($sJSON)
+	{
+		$oWizHelper = new WizardHelper();
+		if (get_magic_quotes_gpc())
+		{
+			$sJSON = stripslashes($sJSON);
+		}
+		$aData = json_decode($sJSON, true); // true means hash array instead of object
+		$oWizHelper->m_aData = $aData;
+		return $oWizHelper;
+	}
+	
+	protected function GetLinkedWizardStructure($oAttDef)
+	{
+		$oWizard = new UIWizard(null, $oAttDef->GetLinkedClass());
+		$aWizardSteps = $oWizard->GetWizardStructure();
+		$aFields = array();
+		$sExtKeyToMeCode = $oAttDef->GetExtKeyToMe();
+		// Retrieve as a flat list, all the attributes that are needed to create
+		// an object of the linked class and put them into a flat array, except
+		// the attribute 'ext_key_to_me' which is a constant in our case
+		foreach($aWizardSteps as $sDummy => $aMainSteps)
+		{
+			// 2 entries: 'mandatory' and 'optional'
+			foreach($aMainSteps as $aSteps)
+			{
+				// One entry for each step of the wizard
+				foreach($aSteps as $sAttCode)
+				{
+					if ($sAttCode != $sExtKeyToMeCode)
+					{
+						$aFields[] = $sAttCode;
+					}
+				}
+			}
+		}
+		return $aFields;
+	}
+	
+	public function GetTargetClass()
+	{
+		return $this->m_aData['m_sClass'];
+	}
+
+    public function GetFormPrefix()
+    {
+        return $this->m_aData['m_sFormPrefix'];
+    }
+
+    public function GetInitialState()
+    {
+        return isset($this->m_aData['m_sInitialState']) ? $this->m_aData['m_sInitialState'] : null;
+    }
+
+    public function GetStimulus()
+    {
+        return isset($this->m_aData['m_sStimulus']) ? $this->m_aData['m_sStimulus'] : null;
+    }
+	
+	public function GetIdForField($sFieldName)
+	{
+		$sResult = '';
+		// It may happen that the field we'd like to update does not
+		// exist in the form. For example, if the field should be hidden/read-only
+		// in the current state of the object
+		if (isset($this->m_aData['m_oFieldsMap'][$sFieldName]))
+		{
+			$sResult = $this->m_aData['m_oFieldsMap'][$sFieldName];
+		}
+		return $sResult;
+	}
+	
+	static function ParseJsonSet($oMe, $sLinkClass, $sExtKeyToMe, $sJsonSet)
+	{
+		$aSet = json_decode($sJsonSet, true); // true means hash array instead of object
+		$oSet = CMDBObjectSet::FromScratch($sLinkClass);
+		foreach($aSet as $aLinkObj)
+		{
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach($aLinkObj as $sAttCode => $value)
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sLinkClass, $sAttCode);
+				if (($oAttDef->IsExternalKey()) && ($value != '')  && ($value > 0))
+				{
+					// For external keys: load the target object so that external fields
+					// get filled too
+					$oTargetObj = MetaModel::GetObject($oAttDef->GetTargetClass(), $value);
+					$oLink->Set($sAttCode, $oTargetObj);
+				}
+				$oLink->Set($sAttCode, $value);
+			}
+			$oLink->Set($sExtKeyToMe, $oMe->GetKey());
+			$oSet->AddObject($oLink);
+		}
+		return $oSet;
+	}
+}
diff --git a/application/xmlpage.class.inc.php b/application/xmlpage.class.inc.php
index 0c6f749b5..bb2341248 100644
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -1,106 +1,106 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class XMLPage
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/webpage.class.inc.php");
-/**
- * Simple web page with no includes or fancy formatting, useful to generateXML documents
- * The page adds the content-type text/XML and the encoding into the headers
- */
-class XMLPage extends WebPage
-{
-	/**
-	 * For big XML files, it's better NOT to store everything in memory and output the XML piece by piece
-	 */
-	var $m_bPassThrough;
-	var $m_bHeaderSent;
-	
-	function __construct($s_title, $bPassThrough = false)
-	{
-		parent::__construct($s_title);
-		$this->m_bPassThrough = $bPassThrough;
-		$this->m_bHeaderSent = false;
-		$this->add_header("Content-type: text/xml; charset=utf-8");
-		$this->add_header("Cache-control: no-cache");
-		$this->add_header("Content-location: export.xml");
-	}	
-
-	public function output()
-	{
-		if (!$this->m_bPassThrough)
-		{
-			// Get the unexpected output but do nothing with it
-			$sTrash = $this->ob_get_clean_safe();
-					
-			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
-			$this->add_header("Content-Length: ".strlen($this->s_content));
-			foreach($this->a_headers as $s_header)
-			{
-				header($s_header);
-			}
-			echo $this->s_content;
-		}
-		if (class_exists('DBSearch'))
-		{
-			DBSearch::RecordQueryTrace();
-		}
-	}
-
-	public function add($sText)
-	{
-		if (!$this->m_bPassThrough)
-		{
-			parent::add($sText);
-		}
-		else
-		{
-			if ($this->m_bHeaderSent)
-			{
-				echo $sText;
-			}
-			else
-			{
-				$s_captured_output = $this->ob_get_clean_safe();
-				foreach($this->a_headers as $s_header)
-				{
-					header($s_header);
-				}
-				echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n";
-				echo trim($s_captured_output);
-				echo trim($this->s_content);
-				echo $sText;
-				$this->m_bHeaderSent = true;
-			}
-		}
-	}
-
-	public function small_p($sText)
-	{
-	}
-
-	public function table($aConfig, $aData, $aParams = array())
-	{
-	}
-}
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class XMLPage
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/webpage.class.inc.php");
+/**
+ * Simple web page with no includes or fancy formatting, useful to generateXML documents
+ * The page adds the content-type text/XML and the encoding into the headers
+ */
+class XMLPage extends WebPage
+{
+	/**
+	 * For big XML files, it's better NOT to store everything in memory and output the XML piece by piece
+	 */
+	var $m_bPassThrough;
+	var $m_bHeaderSent;
+	
+	function __construct($s_title, $bPassThrough = false)
+	{
+		parent::__construct($s_title);
+		$this->m_bPassThrough = $bPassThrough;
+		$this->m_bHeaderSent = false;
+		$this->add_header("Content-type: text/xml; charset=utf-8");
+		$this->add_header("Cache-control: no-cache");
+		$this->add_header("Content-location: export.xml");
+	}	
+
+	public function output()
+	{
+		if (!$this->m_bPassThrough)
+		{
+			// Get the unexpected output but do nothing with it
+			$sTrash = $this->ob_get_clean_safe();
+					
+			$this->s_content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n".trim($this->s_content);
+			$this->add_header("Content-Length: ".strlen($this->s_content));
+			foreach($this->a_headers as $s_header)
+			{
+				header($s_header);
+			}
+			echo $this->s_content;
+		}
+		if (class_exists('DBSearch'))
+		{
+			DBSearch::RecordQueryTrace();
+		}
+	}
+
+	public function add($sText)
+	{
+		if (!$this->m_bPassThrough)
+		{
+			parent::add($sText);
+		}
+		else
+		{
+			if ($this->m_bHeaderSent)
+			{
+				echo $sText;
+			}
+			else
+			{
+				$s_captured_output = $this->ob_get_clean_safe();
+				foreach($this->a_headers as $s_header)
+				{
+					header($s_header);
+				}
+				echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">\n";
+				echo trim($s_captured_output);
+				echo trim($this->s_content);
+				echo $sText;
+				$this->m_bHeaderSent = true;
+			}
+		}
+	}
+
+	public function small_p($sText)
+	{
+	}
+
+	public function table($aConfig, $aData, $aParams = array())
+	{
+	}
+}
diff --git a/core/MyHelpers.class.inc.php b/core/MyHelpers.class.inc.php
index 43a2d2cd2..a1cdeb832 100644
--- a/core/MyHelpers.class.inc.php
+++ b/core/MyHelpers.class.inc.php
@@ -1,528 +1,528 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Various dev/debug helpers
- * TODO: cleanup or at least re-organize
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * MyHelpers
- *
- * @package     iTopORM
- */
-class MyHelpers
-{
-	public static function CheckValueInArray($sDescription, $value, $aData)
-	{
-		if (!in_array($value, $aData))
-		{
-			self::HandleWrongValue($sDescription, $value, $aData);
-		}
-	}
-
-	public static function CheckKeyInArray($sDescription, $key, $aData)
-	{
-		if (!array_key_exists($key, $aData))
-		{
-			self::HandleWrongValue($sDescription, $key, array_keys($aData));
-		}
-	}
-
-	public static function HandleWrongValue($sDescription, $value, $aData)
-	{
-		if (count($aData) == 0)
-		{
-			$sArrayDesc = "{}";
-		}
-		else
-		{
-			$sArrayDesc = "{".implode(", ", $aData)."}";
-		}
-		// exit!
-		throw new CoreException("Wrong value for $sDescription, found '$value' while expecting a value in $sArrayDesc");
-	}
-
-	// getmicrotime()
-	// format sss.mmmuuupppnnn 
-	public static function getmicrotime()
-	{ 
-		list($usec, $sec) = explode(" ",microtime()); 
-		return ((float)$usec + (float)$sec); 
-	}
-
-	/*
-	 * MakeSQLComment
-	 * converts hash into text comment which we can use in a (mySQL) query
-	 */
-	public static function MakeSQLComment ($aHash)
-	{
-		if (empty($aHash)) return "";
-		$sComment = "";
-		{
-			foreach($aHash as $sKey=>$sValue)
-			{
-				$sComment .= "\n-- ". $sKey ."=>" . $sValue;
-			}
-		}
-		return $sComment;
-	}
-
-	public static function var_dump_html($aWords, $bFullDisplay = false)
-	{
-		echo "<pre>\n";
-		if ($bFullDisplay)
-		{
-			print_r($aWords); // full dump!
-		}
-		else
-		{
-			var_dump($aWords); // truncate things when they are too big
-		}
-		echo "\n</pre>\n";
-	}
-
-	public static function arg_dump_html()
-	{
-		echo "<pre>\n";
-		echo "GET:\n";
-		var_dump($_GET);
-		echo "POST:\n";
-		var_dump($_POST);
-		echo "\n</pre>\n";
-	}
-
-	public static function var_dump_string($var)
-	{
-		ob_start();
-		print_r($var);
-		$sRet = ob_get_clean();
-		return $sRet;
-	}
-
-	protected static function first_diff_line($s1, $s2)
-	{
-		$aLines1 = explode("\n", $s1);
-		$aLines2 = explode("\n", $s2);
-		for ($i = 0 ; $i < min(count($aLines1), count($aLines2)) ; $i++)
-		{
-			if ($aLines1[$i] != $aLines2[$i]) return $i;
-		}
-		return false;
-	}
-
-	protected static function highlight_line($sMultiline, $iLine, $sHighlightStart = '<b>', $sHightlightEnd = '</b>')
-	{
-		$aLines = explode("\n", $sMultiline);
-		$aLines[$iLine] = $sHighlightStart.$aLines[$iLine].$sHightlightEnd;
-		return implode("\n", $aLines);
-	}
-
-	protected static function first_diff($s1, $s2)
-	{
-		// do not work fine with multiline strings
-		$iLen1 = strlen($s1);
-		$iLen2 = strlen($s2);
-		for ($i = 0 ; $i < min($iLen1, $iLen2) ; $i++)
-		{
-			if ($s1[$i] !== $s2[$i]) return $i;
-		}
-		return false;
-	}
-
-	protected static function last_diff($s1, $s2)
-	{
-		// do not work fine with multiline strings
-		$iLen1 = strlen($s1);
-		$iLen2 = strlen($s2);
-		for ($i = 0 ; $i < min(strlen($s1), strlen($s2)) ; $i++)
-		{
-			if ($s1[$iLen1 - $i - 1] !== $s2[$iLen2 - $i - 1]) return array($iLen1 - $i, $iLen2 - $i);
-		}
-		return false;
-	}
-
-	protected static function text_cmp_html($sText1, $sText2, $sHighlight)
-	{
-		$iDiffPos = self::first_diff_line($sText1, $sText2);
-		$sDisp1 = self::highlight_line($sText1, $iDiffPos, '<div style="'.$sHighlight.'">', '</div>');
-		$sDisp2 = self::highlight_line($sText2, $iDiffPos, '<div style="'.$sHighlight.'">', '</div>');
-		echo "<table style=\"valign=top;\">\n";
-		echo "<tr>\n";
-		echo "<td><pre>$sDisp1</pre></td>\n";
-		echo "<td><pre>$sDisp2</pre></td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
-	}
-
-	protected static function string_cmp_html($s1, $s2, $sHighlight)
-	{
-		$iDiffPos = self::first_diff($s1, $s2);
-		if ($iDiffPos === false)
-		{
-			echo "strings are identical";
-			return;
-		}
-		$sStart = substr($s1, 0, $iDiffPos);
-
-		$aLastDiff = self::last_diff($s1, $s2);
-		$sEnd = substr($s1, $aLastDiff[0]);
-
-		$sMiddle1 = substr($s1, $iDiffPos, $aLastDiff[0] - $iDiffPos);
-		$sMiddle2 = substr($s2, $iDiffPos, $aLastDiff[1] - $iDiffPos);
-		
-		echo "<p>$sStart<span style=\"$sHighlight\">$sMiddle1</span>$sEnd</p>\n";
-		echo "<p>$sStart<span style=\"$sHighlight\">$sMiddle2</span>$sEnd</p>\n";
-	}
-
-	protected static function object_cmp_html($oObj1, $oObj2, $sHighlight)
-	{
-		$sObj1 = self::var_dump_string($oObj1);
-		$sObj2 = self::var_dump_string($oObj2);
-		return self::text_cmp_html($sObj1, $sObj2, $sHighlight);
-	}
-
-	public static function var_cmp_html($var1, $var2, $sHighlight = 'color:red; font-weight:bold;')
-	{
-		if (is_object($var1))
-		{
-			return self::object_cmp_html($var1, $var2, $sHighlight);
-		}
-		else if (count(explode("\n", $var1)) > 1)
-		{
-			// multiline string
-			return self::text_cmp_html($var1, $var2, $sHighlight);
-		}
-		else
-		{
-			return self::string_cmp_html($var1, $var2, $sHighlight);
-		}
-	}
-
-	public static function get_callstack($iLevelsToIgnore = 0, $aCallStack = null)
-	{
-		if ($aCallStack == null) $aCallStack = debug_backtrace();
-		
-		$aCallStack = array_slice($aCallStack, $iLevelsToIgnore);
-	
-		$aDigestCallStack = array();
-		$bFirstLine = true;		
-		foreach ($aCallStack as $aCallInfo)
-		{
-			$sLine = empty($aCallInfo['line']) ? "" : $aCallInfo['line'];
-			$sFile = empty($aCallInfo['file']) ? "" : $aCallInfo['file'];
-			if ($sFile != '')
-			{
-				$sFile = str_replace('\\', '/', $sFile);
-				$sAppRoot = str_replace('\\', '/', APPROOT);
-				$iPos = strpos($sFile, $sAppRoot);
-				if ($iPos !== false)
-				{
-					$sFile = substr($sFile, strlen($sAppRoot));
-				}
-			}
-			$sClass = empty($aCallInfo['class']) ? "" : $aCallInfo['class'];
-			$sType = empty($aCallInfo['type']) ? "" : $aCallInfo['type'];
-			$sFunction = empty($aCallInfo['function']) ? "" : $aCallInfo['function'];
-
-			if ($bFirstLine)
-			{
-				$bFirstLine = false;
-				// For this line do not display the "function name" because
-				// that will be the name of our error handler for sure !
-				$sFunctionInfo = "N/A";
-			}
-			else
-			{
-				$args = '';
-				if (empty($aCallInfo['args'])) $aCallInfo['args'] = array();
-				foreach ($aCallInfo['args'] as $a)
-				{
-					if (!empty($args))
-					{
-						$args .= ', ';
-					}
-					switch (gettype($a))
-					{
-						case 'integer':
-						case 'double':
-						$args .= $a;
-					break;
-						case 'string':
-						$a = Str::pure2html(self::beautifulstr($a, 64, true, false));
-						$args .= "\"$a\"";
-						break;
-					case 'array':
-						$args .= 'array('.count($a).')';
-						break;
-					case 'object':
-						$args .= 'Object('.get_class($a).')';
-						break;
-					case 'resource':
-						$args .= 'Resource('.strstr($a, '#').')';
-						break;
-					case 'boolean':
-						$args .= $a ? 'true' : 'false';
-						break;
-					case 'NULL':
-						$args .= 'null';
-						break;
-					default:
-						$args .= 'Unknown';
-					}
-				}
-				$sFunctionInfo = "$sClass$sType$sFunction($args)";
-			}
-			$aDigestCallStack[] = array('File'=>$sFile, 'Line'=>$sLine, 'Function'=>$sFunctionInfo);
-		}
-		return $aDigestCallStack;
-	}
-
-	public static function get_callstack_html($iLevelsToIgnore = 0, $aCallStack = null)
-	{
-		$aDigestCallStack = self::get_callstack($iLevelsToIgnore, $aCallStack);
-		return self::make_table_from_assoc_array($aDigestCallStack);
-	}
-
-	public static function dump_callstack($iLevelsToIgnore = 0, $aCallStack = null)
-	{
-		return self::get_callstack_html($iLevelsToIgnore, $aCallStack);
-	}
-
-	public static function get_callstack_text($iLevelsToIgnore = 0, $aCallStack = null)
-	{
-		$aDigestCallStack = self::get_callstack($iLevelsToIgnore, $aCallStack);
-		$aRes = array();
-		foreach ($aDigestCallStack as $aCall)
-		{
-			$aRes[] = $aCall['File'].' at '.$aCall['Line'].', '.$aCall['Function'];
-		}
-		return implode("\n", $aRes);
-	}
-
-	///////////////////////////////////////////////////////////////////////////////
-	// Source: New
-	// Last modif: 2004/12/20 RQU
-	///////////////////////////////////////////////////////////////////////////////
-	public static function make_table_from_assoc_array(&$aData)
-	{
-		if (!is_array($aData)) throw new CoreException("make_table_from_assoc_array: Error - the passed argument is not an array");
-		$aFirstRow = reset($aData);
-		if (count($aData) == 0) return '';
-		if (!is_array($aFirstRow)) throw new CoreException("make_table_from_assoc_array: Error - the passed argument is not a bi-dimensional array");
-		$sOutput = "";
-		$sOutput .= "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"1\">\n";
-	
-		// Table header
-		//
-		$sOutput .= "   <TR CLASS=celltitle>\n";
-		foreach ($aFirstRow as $fieldname=>$trash) {
-			$sOutput .= "      <TD><B>".$fieldname."</B></TD>\n";
-		}
-		$sOutput .= "   </TR>\n";
-	
-		// Table contents
-		//
-		$iCount = 0;
-		foreach ($aData as $aRow) {
-			$sStyle = ($iCount++ % 2 ? "STYLE=\"background-color : #eeeeee\"" : "");
-			$sOutput .= "   <TR $sStyle CLASS=cell>\n";
-			foreach ($aRow as $data) {
-				if (strlen($data) == 0) {
-					$data = "&nbsp;";
-				}
-				$sOutput .= "      <TD>".$data."</TD>\n";
-			}
-			$sOutput .= "   </TR>\n";
-		}
-		
-		$sOutput .= "</TABLE>\n";
-		return $sOutput;
-	}
-
-	public static function debug_breakpoint($arg)
-	{
-		echo "<H1> Debug breakpoint </H1>\n";
-		MyHelpers::var_dump_html($arg);
-		MyHelpers::dump_callstack();
-		exit;
-	}
-	public static function debug_breakpoint_notempty($arg)
-	{
-		if (empty($arg)) return;
-		echo "<H1> Debug breakpoint (triggered on non-empty value) </H1>\n";
-		MyHelpers::var_dump_html($arg);
-		MyHelpers::dump_callstack();
-		exit;
-	}
-
-	/**
-	* xmlentities()
-	* ... same as htmlentities, but designed for xml !
-	*/
-	public static function xmlentities($string)
-	{
-		return str_replace( array( '&', '"', "'", '<', '>' ), array ( '&amp;' , '&quot;', '&apos;' , '&lt;' , '&gt;' ), $string );
-	}
-
-	/**
-	* xmlencode()
-	* Encodes a string so that for sure it can be output as an xml data string
-	*/
-	public static function xmlencode($string)
-	{
-		return xmlentities(iconv("UTF-8", "UTF-8//IGNORE",$string));
-	}
-
-	///////////////////////////////////////////////////////////////////////////////
-	// Source: New - format strings for output
-	// Last modif: 2005/01/18 RQU
-	///////////////////////////////////////////////////////////////////////////////
-	public static function beautifulstr($sLongString, $iMaxLen, $bShowLen=false, $bShowTooltip=true)
-	{
-		if (!is_string($sLongString)) throw new CoreException("beautifulstr: expect a string as 1st argument");
-	
-		// Nothing to do if the string is short
-		if (strlen($sLongString) <= $iMaxLen) return $sLongString;
-	
-		// Truncate the string
-		$sSuffix = "...";
-		if ($bShowLen) {
-			$sSuffix .= "(".strlen($sLongString)." chars)...";
-		}
-		$sOutput = substr($sLongString, 0, $iMaxLen - strlen($sSuffix)).$sSuffix;
-		$sOutput = htmlspecialchars($sOutput);
-	
-		// Add tooltip if required
-		//if ($bShowTooltip) {
-		//	$oTooltip = new gui_tooltip($sLongString);
-		//	$sOutput = "<SPAN ".$oTooltip->get_mouseOver_code().">".$sOutput."</SPAN>";
-		//}
-		return $sOutput;
-	}
-}
-
-/**
-Utility class: static methods for cleaning & escaping untrusted (i.e.
-user-supplied) strings.
-Any string can (usually) be thought of as being in one of these 'modes':
-pure = what the user actually typed / what you want to see on the page /
-      what is actually stored in the DB
-gpc  = incoming GET, POST or COOKIE data
-sql  = escaped for passing safely to RDBMS via SQL (also, data from DB
-      queries and file reads if you have magic_quotes_runtime on--which
-      is rare)
-html = safe for html display (htmlentities applied)
-Always knowing what mode your string is in--using these methods to
-convert between modes--will prevent SQL injection and cross-site scripting.
-This class refers to its own namespace (so it can work in PHP 4--there is no
-self keyword until PHP 5). Do not change the name of the class w/o changing
-all the internal references.
-Example usage: a POST value that you want to query with:
-$username = Str::gpc2sql($_POST['username']);
-*/
-//This sets SQL escaping to use slashes; for Sybase(/MSSQL)-style escaping
-// ( ' --> '' ), set to true.
-define('STR_SYBASE', false);
-class Str
-{
-	public static function gpc2sql($gpc, $maxLength = false)
-	{
-		return self::pure2sql(self::gpc2pure($gpc), $maxLength);
-	}
-	public static function gpc2html($gpc, $maxLength = false)
-	{
-		return self::pure2html(self::gpc2pure($gpc), $maxLength);
-	}
-	public static function gpc2pure($gpc)
-	{
-		if (ini_get('magic_quotes_sybase')) $pure = str_replace("''", "'", $gpc);
-		else                                $pure = get_magic_quotes_gpc() ? stripslashes($gpc) : $gpc;
-		return $pure;
-	}
-	public static function html2pure($html)
-	{
-		return html_entity_decode($html);
-	}
-	public static function html2sql($html, $maxLength = false)
-	{
-		return self::pure2sql(self::html2pure($html), $maxLength);
-	}
-	public static function pure2html($pure, $maxLength = false)
-	{
-		// Check for HTML entities, but be careful the DB is in UTF-8
-		return $maxLength                                         
-			? htmlentities(substr($pure, 0, $maxLength), ENT_QUOTES, 'UTF-8')
-			: htmlentities($pure, ENT_QUOTES, 'UTF-8');
-	}
-	public static function pure2sql($pure, $maxLength = false)
-	{
-		if ($maxLength) $pure = substr($pure, 0, $maxLength);
-		return (STR_SYBASE)
-			? str_replace("'", "''", $pure)
-			: addslashes($pure);
-	}
-	public static function sql2html($sql, $maxLength = false)
-	{
-		$pure = self::sql2pure($sql);
-		if ($maxLength) $pure = substr($pure, 0, $maxLength);
-		return self::pure2html($pure);
-	}
-	public static function sql2pure($sql)
-	{
-		return (STR_SYBASE)
-			? str_replace("''", "'", $sql)
-			: stripslashes($sql);
-	}
-
-	public static function xml2pure($xml)
-	{
-		// #@# - not implemented
-		return $xml;
-	}
-	public static function pure2xml($pure)
-	{
-		return self::xmlencode($pure);
-	}
-
-	protected static function xmlentities($string)
-	{
-		return str_replace( array( '&', '"', "'", '<', '>' ), array ( '&amp;' , '&quot;', '&apos;' , '&lt;' , '&gt;' ), $string );
-	}
-
-	/**
-	* xmlencode()
-	* Encodes a string so that for sure it can be output as an xml data string
-	*/
-	protected static function xmlencode($string)
-	{
-		return self::xmlentities(iconv("UTF-8", "UTF-8//IGNORE",$string));
-	}
-
-	public static function islowcase($sString)
-	{
-		return (strtolower($sString) == $sString);
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Various dev/debug helpers
+ * TODO: cleanup or at least re-organize
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * MyHelpers
+ *
+ * @package     iTopORM
+ */
+class MyHelpers
+{
+	public static function CheckValueInArray($sDescription, $value, $aData)
+	{
+		if (!in_array($value, $aData))
+		{
+			self::HandleWrongValue($sDescription, $value, $aData);
+		}
+	}
+
+	public static function CheckKeyInArray($sDescription, $key, $aData)
+	{
+		if (!array_key_exists($key, $aData))
+		{
+			self::HandleWrongValue($sDescription, $key, array_keys($aData));
+		}
+	}
+
+	public static function HandleWrongValue($sDescription, $value, $aData)
+	{
+		if (count($aData) == 0)
+		{
+			$sArrayDesc = "{}";
+		}
+		else
+		{
+			$sArrayDesc = "{".implode(", ", $aData)."}";
+		}
+		// exit!
+		throw new CoreException("Wrong value for $sDescription, found '$value' while expecting a value in $sArrayDesc");
+	}
+
+	// getmicrotime()
+	// format sss.mmmuuupppnnn 
+	public static function getmicrotime()
+	{ 
+		list($usec, $sec) = explode(" ",microtime()); 
+		return ((float)$usec + (float)$sec); 
+	}
+
+	/*
+	 * MakeSQLComment
+	 * converts hash into text comment which we can use in a (mySQL) query
+	 */
+	public static function MakeSQLComment ($aHash)
+	{
+		if (empty($aHash)) return "";
+		$sComment = "";
+		{
+			foreach($aHash as $sKey=>$sValue)
+			{
+				$sComment .= "\n-- ". $sKey ."=>" . $sValue;
+			}
+		}
+		return $sComment;
+	}
+
+	public static function var_dump_html($aWords, $bFullDisplay = false)
+	{
+		echo "<pre>\n";
+		if ($bFullDisplay)
+		{
+			print_r($aWords); // full dump!
+		}
+		else
+		{
+			var_dump($aWords); // truncate things when they are too big
+		}
+		echo "\n</pre>\n";
+	}
+
+	public static function arg_dump_html()
+	{
+		echo "<pre>\n";
+		echo "GET:\n";
+		var_dump($_GET);
+		echo "POST:\n";
+		var_dump($_POST);
+		echo "\n</pre>\n";
+	}
+
+	public static function var_dump_string($var)
+	{
+		ob_start();
+		print_r($var);
+		$sRet = ob_get_clean();
+		return $sRet;
+	}
+
+	protected static function first_diff_line($s1, $s2)
+	{
+		$aLines1 = explode("\n", $s1);
+		$aLines2 = explode("\n", $s2);
+		for ($i = 0 ; $i < min(count($aLines1), count($aLines2)) ; $i++)
+		{
+			if ($aLines1[$i] != $aLines2[$i]) return $i;
+		}
+		return false;
+	}
+
+	protected static function highlight_line($sMultiline, $iLine, $sHighlightStart = '<b>', $sHightlightEnd = '</b>')
+	{
+		$aLines = explode("\n", $sMultiline);
+		$aLines[$iLine] = $sHighlightStart.$aLines[$iLine].$sHightlightEnd;
+		return implode("\n", $aLines);
+	}
+
+	protected static function first_diff($s1, $s2)
+	{
+		// do not work fine with multiline strings
+		$iLen1 = strlen($s1);
+		$iLen2 = strlen($s2);
+		for ($i = 0 ; $i < min($iLen1, $iLen2) ; $i++)
+		{
+			if ($s1[$i] !== $s2[$i]) return $i;
+		}
+		return false;
+	}
+
+	protected static function last_diff($s1, $s2)
+	{
+		// do not work fine with multiline strings
+		$iLen1 = strlen($s1);
+		$iLen2 = strlen($s2);
+		for ($i = 0 ; $i < min(strlen($s1), strlen($s2)) ; $i++)
+		{
+			if ($s1[$iLen1 - $i - 1] !== $s2[$iLen2 - $i - 1]) return array($iLen1 - $i, $iLen2 - $i);
+		}
+		return false;
+	}
+
+	protected static function text_cmp_html($sText1, $sText2, $sHighlight)
+	{
+		$iDiffPos = self::first_diff_line($sText1, $sText2);
+		$sDisp1 = self::highlight_line($sText1, $iDiffPos, '<div style="'.$sHighlight.'">', '</div>');
+		$sDisp2 = self::highlight_line($sText2, $iDiffPos, '<div style="'.$sHighlight.'">', '</div>');
+		echo "<table style=\"valign=top;\">\n";
+		echo "<tr>\n";
+		echo "<td><pre>$sDisp1</pre></td>\n";
+		echo "<td><pre>$sDisp2</pre></td>\n";
+		echo "</tr>\n";
+		echo "</table>\n";
+	}
+
+	protected static function string_cmp_html($s1, $s2, $sHighlight)
+	{
+		$iDiffPos = self::first_diff($s1, $s2);
+		if ($iDiffPos === false)
+		{
+			echo "strings are identical";
+			return;
+		}
+		$sStart = substr($s1, 0, $iDiffPos);
+
+		$aLastDiff = self::last_diff($s1, $s2);
+		$sEnd = substr($s1, $aLastDiff[0]);
+
+		$sMiddle1 = substr($s1, $iDiffPos, $aLastDiff[0] - $iDiffPos);
+		$sMiddle2 = substr($s2, $iDiffPos, $aLastDiff[1] - $iDiffPos);
+		
+		echo "<p>$sStart<span style=\"$sHighlight\">$sMiddle1</span>$sEnd</p>\n";
+		echo "<p>$sStart<span style=\"$sHighlight\">$sMiddle2</span>$sEnd</p>\n";
+	}
+
+	protected static function object_cmp_html($oObj1, $oObj2, $sHighlight)
+	{
+		$sObj1 = self::var_dump_string($oObj1);
+		$sObj2 = self::var_dump_string($oObj2);
+		return self::text_cmp_html($sObj1, $sObj2, $sHighlight);
+	}
+
+	public static function var_cmp_html($var1, $var2, $sHighlight = 'color:red; font-weight:bold;')
+	{
+		if (is_object($var1))
+		{
+			return self::object_cmp_html($var1, $var2, $sHighlight);
+		}
+		else if (count(explode("\n", $var1)) > 1)
+		{
+			// multiline string
+			return self::text_cmp_html($var1, $var2, $sHighlight);
+		}
+		else
+		{
+			return self::string_cmp_html($var1, $var2, $sHighlight);
+		}
+	}
+
+	public static function get_callstack($iLevelsToIgnore = 0, $aCallStack = null)
+	{
+		if ($aCallStack == null) $aCallStack = debug_backtrace();
+		
+		$aCallStack = array_slice($aCallStack, $iLevelsToIgnore);
+	
+		$aDigestCallStack = array();
+		$bFirstLine = true;		
+		foreach ($aCallStack as $aCallInfo)
+		{
+			$sLine = empty($aCallInfo['line']) ? "" : $aCallInfo['line'];
+			$sFile = empty($aCallInfo['file']) ? "" : $aCallInfo['file'];
+			if ($sFile != '')
+			{
+				$sFile = str_replace('\\', '/', $sFile);
+				$sAppRoot = str_replace('\\', '/', APPROOT);
+				$iPos = strpos($sFile, $sAppRoot);
+				if ($iPos !== false)
+				{
+					$sFile = substr($sFile, strlen($sAppRoot));
+				}
+			}
+			$sClass = empty($aCallInfo['class']) ? "" : $aCallInfo['class'];
+			$sType = empty($aCallInfo['type']) ? "" : $aCallInfo['type'];
+			$sFunction = empty($aCallInfo['function']) ? "" : $aCallInfo['function'];
+
+			if ($bFirstLine)
+			{
+				$bFirstLine = false;
+				// For this line do not display the "function name" because
+				// that will be the name of our error handler for sure !
+				$sFunctionInfo = "N/A";
+			}
+			else
+			{
+				$args = '';
+				if (empty($aCallInfo['args'])) $aCallInfo['args'] = array();
+				foreach ($aCallInfo['args'] as $a)
+				{
+					if (!empty($args))
+					{
+						$args .= ', ';
+					}
+					switch (gettype($a))
+					{
+						case 'integer':
+						case 'double':
+						$args .= $a;
+					break;
+						case 'string':
+						$a = Str::pure2html(self::beautifulstr($a, 64, true, false));
+						$args .= "\"$a\"";
+						break;
+					case 'array':
+						$args .= 'array('.count($a).')';
+						break;
+					case 'object':
+						$args .= 'Object('.get_class($a).')';
+						break;
+					case 'resource':
+						$args .= 'Resource('.strstr($a, '#').')';
+						break;
+					case 'boolean':
+						$args .= $a ? 'true' : 'false';
+						break;
+					case 'NULL':
+						$args .= 'null';
+						break;
+					default:
+						$args .= 'Unknown';
+					}
+				}
+				$sFunctionInfo = "$sClass$sType$sFunction($args)";
+			}
+			$aDigestCallStack[] = array('File'=>$sFile, 'Line'=>$sLine, 'Function'=>$sFunctionInfo);
+		}
+		return $aDigestCallStack;
+	}
+
+	public static function get_callstack_html($iLevelsToIgnore = 0, $aCallStack = null)
+	{
+		$aDigestCallStack = self::get_callstack($iLevelsToIgnore, $aCallStack);
+		return self::make_table_from_assoc_array($aDigestCallStack);
+	}
+
+	public static function dump_callstack($iLevelsToIgnore = 0, $aCallStack = null)
+	{
+		return self::get_callstack_html($iLevelsToIgnore, $aCallStack);
+	}
+
+	public static function get_callstack_text($iLevelsToIgnore = 0, $aCallStack = null)
+	{
+		$aDigestCallStack = self::get_callstack($iLevelsToIgnore, $aCallStack);
+		$aRes = array();
+		foreach ($aDigestCallStack as $aCall)
+		{
+			$aRes[] = $aCall['File'].' at '.$aCall['Line'].', '.$aCall['Function'];
+		}
+		return implode("\n", $aRes);
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	// Source: New
+	// Last modif: 2004/12/20 RQU
+	///////////////////////////////////////////////////////////////////////////////
+	public static function make_table_from_assoc_array(&$aData)
+	{
+		if (!is_array($aData)) throw new CoreException("make_table_from_assoc_array: Error - the passed argument is not an array");
+		$aFirstRow = reset($aData);
+		if (count($aData) == 0) return '';
+		if (!is_array($aFirstRow)) throw new CoreException("make_table_from_assoc_array: Error - the passed argument is not a bi-dimensional array");
+		$sOutput = "";
+		$sOutput .= "<TABLE WIDTH=\"100%\" BORDER=\"0\" CELLSPACING=\"1\" CELLPADDING=\"1\">\n";
+	
+		// Table header
+		//
+		$sOutput .= "   <TR CLASS=celltitle>\n";
+		foreach ($aFirstRow as $fieldname=>$trash) {
+			$sOutput .= "      <TD><B>".$fieldname."</B></TD>\n";
+		}
+		$sOutput .= "   </TR>\n";
+	
+		// Table contents
+		//
+		$iCount = 0;
+		foreach ($aData as $aRow) {
+			$sStyle = ($iCount++ % 2 ? "STYLE=\"background-color : #eeeeee\"" : "");
+			$sOutput .= "   <TR $sStyle CLASS=cell>\n";
+			foreach ($aRow as $data) {
+				if (strlen($data) == 0) {
+					$data = "&nbsp;";
+				}
+				$sOutput .= "      <TD>".$data."</TD>\n";
+			}
+			$sOutput .= "   </TR>\n";
+		}
+		
+		$sOutput .= "</TABLE>\n";
+		return $sOutput;
+	}
+
+	public static function debug_breakpoint($arg)
+	{
+		echo "<H1> Debug breakpoint </H1>\n";
+		MyHelpers::var_dump_html($arg);
+		MyHelpers::dump_callstack();
+		exit;
+	}
+	public static function debug_breakpoint_notempty($arg)
+	{
+		if (empty($arg)) return;
+		echo "<H1> Debug breakpoint (triggered on non-empty value) </H1>\n";
+		MyHelpers::var_dump_html($arg);
+		MyHelpers::dump_callstack();
+		exit;
+	}
+
+	/**
+	* xmlentities()
+	* ... same as htmlentities, but designed for xml !
+	*/
+	public static function xmlentities($string)
+	{
+		return str_replace( array( '&', '"', "'", '<', '>' ), array ( '&amp;' , '&quot;', '&apos;' , '&lt;' , '&gt;' ), $string );
+	}
+
+	/**
+	* xmlencode()
+	* Encodes a string so that for sure it can be output as an xml data string
+	*/
+	public static function xmlencode($string)
+	{
+		return xmlentities(iconv("UTF-8", "UTF-8//IGNORE",$string));
+	}
+
+	///////////////////////////////////////////////////////////////////////////////
+	// Source: New - format strings for output
+	// Last modif: 2005/01/18 RQU
+	///////////////////////////////////////////////////////////////////////////////
+	public static function beautifulstr($sLongString, $iMaxLen, $bShowLen=false, $bShowTooltip=true)
+	{
+		if (!is_string($sLongString)) throw new CoreException("beautifulstr: expect a string as 1st argument");
+	
+		// Nothing to do if the string is short
+		if (strlen($sLongString) <= $iMaxLen) return $sLongString;
+	
+		// Truncate the string
+		$sSuffix = "...";
+		if ($bShowLen) {
+			$sSuffix .= "(".strlen($sLongString)." chars)...";
+		}
+		$sOutput = substr($sLongString, 0, $iMaxLen - strlen($sSuffix)).$sSuffix;
+		$sOutput = htmlspecialchars($sOutput);
+	
+		// Add tooltip if required
+		//if ($bShowTooltip) {
+		//	$oTooltip = new gui_tooltip($sLongString);
+		//	$sOutput = "<SPAN ".$oTooltip->get_mouseOver_code().">".$sOutput."</SPAN>";
+		//}
+		return $sOutput;
+	}
+}
+
+/**
+Utility class: static methods for cleaning & escaping untrusted (i.e.
+user-supplied) strings.
+Any string can (usually) be thought of as being in one of these 'modes':
+pure = what the user actually typed / what you want to see on the page /
+      what is actually stored in the DB
+gpc  = incoming GET, POST or COOKIE data
+sql  = escaped for passing safely to RDBMS via SQL (also, data from DB
+      queries and file reads if you have magic_quotes_runtime on--which
+      is rare)
+html = safe for html display (htmlentities applied)
+Always knowing what mode your string is in--using these methods to
+convert between modes--will prevent SQL injection and cross-site scripting.
+This class refers to its own namespace (so it can work in PHP 4--there is no
+self keyword until PHP 5). Do not change the name of the class w/o changing
+all the internal references.
+Example usage: a POST value that you want to query with:
+$username = Str::gpc2sql($_POST['username']);
+*/
+//This sets SQL escaping to use slashes; for Sybase(/MSSQL)-style escaping
+// ( ' --> '' ), set to true.
+define('STR_SYBASE', false);
+class Str
+{
+	public static function gpc2sql($gpc, $maxLength = false)
+	{
+		return self::pure2sql(self::gpc2pure($gpc), $maxLength);
+	}
+	public static function gpc2html($gpc, $maxLength = false)
+	{
+		return self::pure2html(self::gpc2pure($gpc), $maxLength);
+	}
+	public static function gpc2pure($gpc)
+	{
+		if (ini_get('magic_quotes_sybase')) $pure = str_replace("''", "'", $gpc);
+		else                                $pure = get_magic_quotes_gpc() ? stripslashes($gpc) : $gpc;
+		return $pure;
+	}
+	public static function html2pure($html)
+	{
+		return html_entity_decode($html);
+	}
+	public static function html2sql($html, $maxLength = false)
+	{
+		return self::pure2sql(self::html2pure($html), $maxLength);
+	}
+	public static function pure2html($pure, $maxLength = false)
+	{
+		// Check for HTML entities, but be careful the DB is in UTF-8
+		return $maxLength                                         
+			? htmlentities(substr($pure, 0, $maxLength), ENT_QUOTES, 'UTF-8')
+			: htmlentities($pure, ENT_QUOTES, 'UTF-8');
+	}
+	public static function pure2sql($pure, $maxLength = false)
+	{
+		if ($maxLength) $pure = substr($pure, 0, $maxLength);
+		return (STR_SYBASE)
+			? str_replace("'", "''", $pure)
+			: addslashes($pure);
+	}
+	public static function sql2html($sql, $maxLength = false)
+	{
+		$pure = self::sql2pure($sql);
+		if ($maxLength) $pure = substr($pure, 0, $maxLength);
+		return self::pure2html($pure);
+	}
+	public static function sql2pure($sql)
+	{
+		return (STR_SYBASE)
+			? str_replace("''", "'", $sql)
+			: stripslashes($sql);
+	}
+
+	public static function xml2pure($xml)
+	{
+		// #@# - not implemented
+		return $xml;
+	}
+	public static function pure2xml($pure)
+	{
+		return self::xmlencode($pure);
+	}
+
+	protected static function xmlentities($string)
+	{
+		return str_replace( array( '&', '"', "'", '<', '>' ), array ( '&amp;' , '&quot;', '&apos;' , '&lt;' , '&gt;' ), $string );
+	}
+
+	/**
+	* xmlencode()
+	* Encodes a string so that for sure it can be output as an xml data string
+	*/
+	protected static function xmlencode($string)
+	{
+		return self::xmlentities(iconv("UTF-8", "UTF-8//IGNORE",$string));
+	}
+
+	public static function islowcase($sString)
+	{
+		return (strtolower($sString) == $sString);
+	}
+}
+
+?>
diff --git a/core/action.class.inc.php b/core/action.class.inc.php
index 55a96fcda..277995f3d 100644
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -1,427 +1,427 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent classes (internal): user defined actions
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-require_once(APPROOT.'/core/asynctask.class.inc.php');
-require_once(APPROOT.'/core/email.class.inc.php');
-
-/**
- * A user defined action, to customize the application  
- *
- * @package     iTopORM
- */
-abstract class Action extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum(array('test'=>'Being tested' ,'enabled'=>'In production', 'disabled'=>'Inactive')), "sql"=>"status", "default_value"=>"test", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	abstract public function DoExecute($oTrigger, $aContextArgs);
-
-	public function IsActive()
-	{
-		switch($this->Get('status'))
-		{
-			case 'enabled':
-			case 'test':
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
-	public function IsBeingTested()
-	{
-		switch($this->Get('status'))
-		{
-			case 'test':
-				return true;
-
-			default:
-				return false;
-		}
-	}
-}
-
-/**
- * A notification  
- *
- * @package     iTopORM
- */
-abstract class ActionNotification extends Action
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action_notification",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-/**
- * An email notification  
- *
- * @package     iTopORM
- */
-class ActionEmail extends ActionNotification
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array('name'),
-			"db_table" => "priv_action_email",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	// count the recipients found
-	protected $m_iRecipients;
-
-	// Errors management : not that simple because we need that function to be
-	// executed in the background, while making sure that any issue would be reported clearly
-	protected $m_aMailErrors; //array of strings explaining the issue
-
-	// returns a the list of emails as a string, or a detailed error description
-	protected function FindRecipients($sRecipAttCode, $aArgs)
-	{
-		$sOQL = $this->Get($sRecipAttCode);
-		if (strlen($sOQL) == '') return '';
-
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			$oSearch->AllowAllData();
-		}
-		catch (OQLException $e)
-		{
-			$this->m_aMailErrors[] = "query syntax error for recipient '$sRecipAttCode'";
-			return $e->getMessage();
-		}
-
-		$sClass = $oSearch->GetClass();
-		// Determine the email attribute (the first one will be our choice)
-		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeEmailAddress)
-			{
-				$sEmailAttCode = $sAttCode;
-				// we've got one, exit the loop
-				break;
-			}
-		}
-		if (!isset($sEmailAttCode))
-		{
-			$this->m_aMailErrors[] = "wrong target for recipient '$sRecipAttCode'";
-			return "The objects of the class '$sClass' do not have any email attribute";
-		}
-
-		$oSet = new DBObjectSet($oSearch, array() /* order */, $aArgs);
-		$aRecipients = array();
-		while ($oObj = $oSet->Fetch())
-		{
-			$sAddress = trim($oObj->Get($sEmailAttCode));
-			if (strlen($sAddress) > 0)
-			{
-				$aRecipients[] = $sAddress;
-				$this->m_iRecipients++;
-			}
-		}
-		return implode(', ', $aRecipients);
-	}
-
-
-	public function DoExecute($oTrigger, $aContextArgs)
-	{
-		if (MetaModel::IsLogEnabledNotification())
-		{
-			$oLog = new EventNotificationEmail();
-			if ($this->IsBeingTested())
-			{
-				$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
-			}
-			else
-			{
-				$oLog->Set('message', 'Notification pending');
-			}
-			$oLog->Set('userinfo', UserRights::GetUser());
-			$oLog->Set('trigger_id', $oTrigger->GetKey());
-			$oLog->Set('action_id', $this->GetKey());
-			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
-			// Must be inserted now so that it gets a valid id that will make the link
-			// between an eventual asynchronous task (queued) and the log
-			$oLog->DBInsertNoReload();
-		}
-		else
-		{
-			$oLog = null;
-		}
-
-		try
-		{
-			$sRes = $this->_DoExecute($oTrigger, $aContextArgs, $oLog);
-
-			if ($this->IsBeingTested())
-			{
-				$sPrefix = 'TEST ('.$this->Get('test_recipient').') - ';
-			}
-			else
-			{
-				$sPrefix = '';
-			}
-
-			if ($oLog)
-			{
-				$oLog->Set('message', $sPrefix . $sRes);
-                $oLog->DBUpdate();
-            }
-
-		}
-		catch (Exception $e)
-		{
-			if ($oLog)
-			{
-				$oLog->Set('message', 'Error: '.$e->getMessage());
-
-				try
-				{
-                    $oLog->DBUpdate();
-				}
-				catch (Exception $eSecondTryUpdate)
-				{
-                    IssueLog::Error("Failed to process email ".$oLog->GetKey()." - reason: ".$e->getMessage()."\nTrace:\n".$e->getTraceAsString());
-
-                    $oLog->Set('message', 'Error: more details in the log for email "'.$oLog->GetKey().'"');
-                    $oLog->DBUpdate();
-                }
-			}
-		}
-
-	}
-
-	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
-	{
-		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
-		try
-		{
-			$this->m_iRecipients = 0;
-			$this->m_aMailErrors = array();
-			$bRes = false; // until we do succeed in sending the email
-	
-			// Determine recicipients
-			//
-			$sTo = $this->FindRecipients('to', $aContextArgs);
-			$sCC = $this->FindRecipients('cc', $aContextArgs);
-			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
-	
-			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
-			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
-	
-			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
-			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
-			
-			$oObj = $aContextArgs['this->object()'];
-			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetEnvironmentId());
-			$sReference = '<'.$sMessageId.'>';
-		}
-		catch(Exception $e)
-		{
-  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-  			throw $e;
-  		}
-		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-		
-		if (!is_null($oLog))
-		{
-			// Note: we have to secure this because those values are calculated
-			// inside the try statement, and we would like to keep track of as
-			// many data as we could while some variables may still be undefined
-			if (isset($sTo))       $oLog->Set('to', $sTo);
-			if (isset($sCC))       $oLog->Set('cc', $sCC);
-			if (isset($sBCC))      $oLog->Set('bcc', $sBCC);
-			if (isset($sFrom))     $oLog->Set('from', $sFrom);
-			if (isset($sSubject))  $oLog->Set('subject', $sSubject);
-			if (isset($sBody))     $oLog->Set('body', $sBody);
-		}
-		$sStyles = file_get_contents(APPROOT.'css/email.css');
-		$sStyles .= MetaModel::GetConfig()->Get('email_css');
-
-		$oEmail = new EMail();
-
-		if ($this->IsBeingTested())
-		{
-			$oEmail->SetSubject('TEST['.$sSubject.']');
-			$sTestBody = $sBody;
-			$sTestBody .= "<div style=\"border: dashed;\">\n";
-			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
-			$sTestBody .= "<p>The email should be sent with the following properties\n";
-			$sTestBody .= "<ul>\n";
-			$sTestBody .= "<li>TO: $sTo</li>\n";
-			$sTestBody .= "<li>CC: $sCC</li>\n";
-			$sTestBody .= "<li>BCC: $sBCC</li>\n";
-			$sTestBody .= "<li>From: $sFrom</li>\n";
-			$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
-			$sTestBody .= "<li>References: $sReference</li>\n";
-			$sTestBody .= "</ul>\n";
-			$sTestBody .= "</p>\n";
-			$sTestBody .= "</div>\n";
-			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
-			$oEmail->SetRecipientTO($this->Get('test_recipient'));
-			$oEmail->SetRecipientFrom($sFrom);
-			$oEmail->SetReferences($sReference);
-			$oEmail->SetMessageId($sMessageId);
-		}
-		else
-		{
-			$oEmail->SetSubject($sSubject);
-			$oEmail->SetBody($sBody, 'text/html', $sStyles);
-			$oEmail->SetRecipientTO($sTo);
-			$oEmail->SetRecipientCC($sCC);
-			$oEmail->SetRecipientBCC($sBCC);
-			$oEmail->SetRecipientFrom($sFrom);
-			$oEmail->SetRecipientReplyTo($sReplyTo);
-			$oEmail->SetReferences($sReference);
-			$oEmail->SetMessageId($sMessageId);
-		}
-
-		if (isset($aContextArgs['attachments']))
-		{
-			$aAttachmentReport = array();
-			foreach($aContextArgs['attachments'] as $oDocument)
-			{
-				$oEmail->AddAttachment($oDocument->GetData(), $oDocument->GetFileName(), $oDocument->GetMimeType());
-				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
-			}
-			$oLog->Set('attachments', $aAttachmentReport);
-		}
-
-		if (empty($this->m_aMailErrors))
-		{
-			if ($this->m_iRecipients == 0)
-			{
-				return 'No recipient';
-			}
-			else
-			{
-				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
-				switch ($iRes)
-				{
-					case EMAIL_SEND_OK:
-						return "Sent";
-	
-					case EMAIL_SEND_PENDING:
-						return "Pending";
-	
-					case EMAIL_SEND_ERROR:
-						return "Errors: ".implode(', ', $aErrors);
-				}
-			}
-		}
-		else
-		{
-			if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
-			{
-				$sError = implode(', ', $this->m_aMailErrors);
-			}
-			else
-			{
-				$sError = 'Unknown reason';
-			}
-			return 'Notification was not sent: '.$sError;
-		}
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent classes (internal): user defined actions
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+require_once(APPROOT.'/core/asynctask.class.inc.php');
+require_once(APPROOT.'/core/email.class.inc.php');
+
+/**
+ * A user defined action, to customize the application  
+ *
+ * @package     iTopORM
+ */
+abstract class Action extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum(array('test'=>'Being tested' ,'enabled'=>'In production', 'disabled'=>'Inactive')), "sql"=>"status", "default_value"=>"test", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"action_id", "ext_key_to_remote"=>"trigger_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('default_search', array('name', 'description', 'status')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	abstract public function DoExecute($oTrigger, $aContextArgs);
+
+	public function IsActive()
+	{
+		switch($this->Get('status'))
+		{
+			case 'enabled':
+			case 'test':
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
+	public function IsBeingTested()
+	{
+		switch($this->Get('status'))
+		{
+			case 'test':
+				return true;
+
+			default:
+				return false;
+		}
+	}
+}
+
+/**
+ * A notification  
+ *
+ * @package     iTopORM
+ */
+abstract class ActionNotification extends Action
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action_notification",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'name', 'description', 'status')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+/**
+ * An email notification  
+ *
+ * @package     iTopORM
+ */
+class ActionEmail extends ActionNotification
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array('name'),
+			"db_table" => "priv_action_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	// count the recipients found
+	protected $m_iRecipients;
+
+	// Errors management : not that simple because we need that function to be
+	// executed in the background, while making sure that any issue would be reported clearly
+	protected $m_aMailErrors; //array of strings explaining the issue
+
+	// returns a the list of emails as a string, or a detailed error description
+	protected function FindRecipients($sRecipAttCode, $aArgs)
+	{
+		$sOQL = $this->Get($sRecipAttCode);
+		if (strlen($sOQL) == '') return '';
+
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$oSearch->AllowAllData();
+		}
+		catch (OQLException $e)
+		{
+			$this->m_aMailErrors[] = "query syntax error for recipient '$sRecipAttCode'";
+			return $e->getMessage();
+		}
+
+		$sClass = $oSearch->GetClass();
+		// Determine the email attribute (the first one will be our choice)
+		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeEmailAddress)
+			{
+				$sEmailAttCode = $sAttCode;
+				// we've got one, exit the loop
+				break;
+			}
+		}
+		if (!isset($sEmailAttCode))
+		{
+			$this->m_aMailErrors[] = "wrong target for recipient '$sRecipAttCode'";
+			return "The objects of the class '$sClass' do not have any email attribute";
+		}
+
+		$oSet = new DBObjectSet($oSearch, array() /* order */, $aArgs);
+		$aRecipients = array();
+		while ($oObj = $oSet->Fetch())
+		{
+			$sAddress = trim($oObj->Get($sEmailAttCode));
+			if (strlen($sAddress) > 0)
+			{
+				$aRecipients[] = $sAddress;
+				$this->m_iRecipients++;
+			}
+		}
+		return implode(', ', $aRecipients);
+	}
+
+
+	public function DoExecute($oTrigger, $aContextArgs)
+	{
+		if (MetaModel::IsLogEnabledNotification())
+		{
+			$oLog = new EventNotificationEmail();
+			if ($this->IsBeingTested())
+			{
+				$oLog->Set('message', 'TEST - Notification sent ('.$this->Get('test_recipient').')');
+			}
+			else
+			{
+				$oLog->Set('message', 'Notification pending');
+			}
+			$oLog->Set('userinfo', UserRights::GetUser());
+			$oLog->Set('trigger_id', $oTrigger->GetKey());
+			$oLog->Set('action_id', $this->GetKey());
+			$oLog->Set('object_id', $aContextArgs['this->object()']->GetKey());
+			// Must be inserted now so that it gets a valid id that will make the link
+			// between an eventual asynchronous task (queued) and the log
+			$oLog->DBInsertNoReload();
+		}
+		else
+		{
+			$oLog = null;
+		}
+
+		try
+		{
+			$sRes = $this->_DoExecute($oTrigger, $aContextArgs, $oLog);
+
+			if ($this->IsBeingTested())
+			{
+				$sPrefix = 'TEST ('.$this->Get('test_recipient').') - ';
+			}
+			else
+			{
+				$sPrefix = '';
+			}
+
+			if ($oLog)
+			{
+				$oLog->Set('message', $sPrefix . $sRes);
+                $oLog->DBUpdate();
+            }
+
+		}
+		catch (Exception $e)
+		{
+			if ($oLog)
+			{
+				$oLog->Set('message', 'Error: '.$e->getMessage());
+
+				try
+				{
+                    $oLog->DBUpdate();
+				}
+				catch (Exception $eSecondTryUpdate)
+				{
+                    IssueLog::Error("Failed to process email ".$oLog->GetKey()." - reason: ".$e->getMessage()."\nTrace:\n".$e->getTraceAsString());
+
+                    $oLog->Set('message', 'Error: more details in the log for email "'.$oLog->GetKey().'"');
+                    $oLog->DBUpdate();
+                }
+			}
+		}
+
+	}
+
+	protected function _DoExecute($oTrigger, $aContextArgs, &$oLog)
+	{
+		$sPreviousUrlMaker = ApplicationContext::SetUrlMakerClass();
+		try
+		{
+			$this->m_iRecipients = 0;
+			$this->m_aMailErrors = array();
+			$bRes = false; // until we do succeed in sending the email
+	
+			// Determine recicipients
+			//
+			$sTo = $this->FindRecipients('to', $aContextArgs);
+			$sCC = $this->FindRecipients('cc', $aContextArgs);
+			$sBCC = $this->FindRecipients('bcc', $aContextArgs);
+	
+			$sFrom = MetaModel::ApplyParams($this->Get('from'), $aContextArgs);
+			$sReplyTo = MetaModel::ApplyParams($this->Get('reply_to'), $aContextArgs);
+	
+			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
+			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
+			
+			$oObj = $aContextArgs['this->object()'];
+			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetEnvironmentId());
+			$sReference = '<'.$sMessageId.'>';
+		}
+		catch(Exception $e)
+		{
+  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+  			throw $e;
+  		}
+		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+		
+		if (!is_null($oLog))
+		{
+			// Note: we have to secure this because those values are calculated
+			// inside the try statement, and we would like to keep track of as
+			// many data as we could while some variables may still be undefined
+			if (isset($sTo))       $oLog->Set('to', $sTo);
+			if (isset($sCC))       $oLog->Set('cc', $sCC);
+			if (isset($sBCC))      $oLog->Set('bcc', $sBCC);
+			if (isset($sFrom))     $oLog->Set('from', $sFrom);
+			if (isset($sSubject))  $oLog->Set('subject', $sSubject);
+			if (isset($sBody))     $oLog->Set('body', $sBody);
+		}
+		$sStyles = file_get_contents(APPROOT.'css/email.css');
+		$sStyles .= MetaModel::GetConfig()->Get('email_css');
+
+		$oEmail = new EMail();
+
+		if ($this->IsBeingTested())
+		{
+			$oEmail->SetSubject('TEST['.$sSubject.']');
+			$sTestBody = $sBody;
+			$sTestBody .= "<div style=\"border: dashed;\">\n";
+			$sTestBody .= "<h1>Testing email notification ".$this->GetHyperlink()."</h1>\n";
+			$sTestBody .= "<p>The email should be sent with the following properties\n";
+			$sTestBody .= "<ul>\n";
+			$sTestBody .= "<li>TO: $sTo</li>\n";
+			$sTestBody .= "<li>CC: $sCC</li>\n";
+			$sTestBody .= "<li>BCC: $sBCC</li>\n";
+			$sTestBody .= "<li>From: $sFrom</li>\n";
+			$sTestBody .= "<li>Reply-To: $sReplyTo</li>\n";
+			$sTestBody .= "<li>References: $sReference</li>\n";
+			$sTestBody .= "</ul>\n";
+			$sTestBody .= "</p>\n";
+			$sTestBody .= "</div>\n";
+			$oEmail->SetBody($sTestBody, 'text/html', $sStyles);
+			$oEmail->SetRecipientTO($this->Get('test_recipient'));
+			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
+		}
+		else
+		{
+			$oEmail->SetSubject($sSubject);
+			$oEmail->SetBody($sBody, 'text/html', $sStyles);
+			$oEmail->SetRecipientTO($sTo);
+			$oEmail->SetRecipientCC($sCC);
+			$oEmail->SetRecipientBCC($sBCC);
+			$oEmail->SetRecipientFrom($sFrom);
+			$oEmail->SetRecipientReplyTo($sReplyTo);
+			$oEmail->SetReferences($sReference);
+			$oEmail->SetMessageId($sMessageId);
+		}
+
+		if (isset($aContextArgs['attachments']))
+		{
+			$aAttachmentReport = array();
+			foreach($aContextArgs['attachments'] as $oDocument)
+			{
+				$oEmail->AddAttachment($oDocument->GetData(), $oDocument->GetFileName(), $oDocument->GetMimeType());
+				$aAttachmentReport[] = array($oDocument->GetFileName(), $oDocument->GetMimeType(), strlen($oDocument->GetData()));
+			}
+			$oLog->Set('attachments', $aAttachmentReport);
+		}
+
+		if (empty($this->m_aMailErrors))
+		{
+			if ($this->m_iRecipients == 0)
+			{
+				return 'No recipient';
+			}
+			else
+			{
+				$iRes = $oEmail->Send($aErrors, false, $oLog); // allow asynchronous mode
+				switch ($iRes)
+				{
+					case EMAIL_SEND_OK:
+						return "Sent";
+	
+					case EMAIL_SEND_PENDING:
+						return "Pending";
+	
+					case EMAIL_SEND_ERROR:
+						return "Errors: ".implode(', ', $aErrors);
+				}
+			}
+		}
+		else
+		{
+			if (is_array($this->m_aMailErrors) && count($this->m_aMailErrors) > 0)
+			{
+				$sError = implode(', ', $this->m_aMailErrors);
+			}
+			else
+			{
+				$sError = 'Unknown reason';
+			}
+			return 'Notification was not sent: '.$sError;
+		}
+	}
+}
+?>
diff --git a/core/apc-emulation.php b/core/apc-emulation.php
index 44163cc49..aff084307 100644
--- a/core/apc-emulation.php
+++ b/core/apc-emulation.php
@@ -1,333 +1,333 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Date: 27/09/2017
- */
-
-/**
- * @param string $cache_type
- * @param bool $limited
- * @return array|bool
- */
-function apc_cache_info($cache_type = '', $limited = false)
-{
-	$aInfo = array();
-	$sRootCacheDir = apcFile::GetCacheFileName();
-	$aInfo['cache_list'] = apcFile::GetCacheEntries($sRootCacheDir);
-	return $aInfo;
-}
-
-/**
- * @param array|string $key
- * @param $var
- * @param int $ttl
- * @return array|bool
- */
-function apc_store($key, $var = NULL, $ttl = 0)
-{
-	if (is_array($key))
-	{
-		$aResult = array();
-		foreach($key as $sKey => $value)
-		{
-			$aResult[] = apcFile::StoreOneFile($sKey, $value, $ttl);
-		}
-		return $aResult;
-	}
-	return apcFile::StoreOneFile($key, $var, $ttl);
-}
-
-/**
- * @param $key string|array
- * @return mixed
- */
-function apc_fetch($key)
-{
-	if (is_array($key))
-	{
-		$aResult = array();
-		foreach($key as $sKey)
-		{
-			$aResult[$sKey] = apcFile::FetchOneFile($sKey);
-		}
-		return $aResult;
-	}
-	return apcFile::FetchOneFile($key);
-}
-
-/**
- * @param string $cache_type
- * @return bool
- */
-function apc_clear_cache($cache_type = '')
-{
-	apcFile::DeleteEntry(utils::GetCachePath());
-	return true;
-}
-
-/**
- * @param $key
- * @return bool|string[]
- */
-function apc_delete($key)
-{
-	if (empty($key))
-	{
-		return false;
-	}
-	$bRet1 = apcFile::DeleteEntry(apcFile::GetCacheFileName($key));
-	$bRet2 = apcFile::DeleteEntry(apcFile::GetCacheFileName('-'.$key));
-	return $bRet1 || $bRet2;
-}
-
-class apcFile
-{
-	// Check only once per request
-	static public $aFilesByTime = null;
-	static public $iFileCount = 0;
-
-	/** Get the file name corresponding to the cache entry.
-	 * If an empty key is provided, the root of the cache is returned.
-	 * @param $sKey
-	 * @return string
-	 */
-	static public function GetCacheFileName($sKey = '')
-	{
-		$sPath = str_replace(array(' ', '/', '\\', '.'), '-', $sKey);
-		return utils::GetCachePath().'apc-emul/'.$sPath;
-	}
-
-	/** Get the list of entries from a starting folder.
-	 * @param $sEntry string starting folder.
-	 * @return array list of entries stored into array of key 'info'
-	 */
-	static public function GetCacheEntries($sEntry)
-	{
-		$aResult = array();
-		if (is_dir($sEntry))
-		{
-			$aFiles = array_diff(scandir($sEntry), array('.', '..'));
-			foreach($aFiles as $sFile)
-			{
-				$sSubFile = $sEntry.'/'.$sFile;
-				$aResult = array_merge($aResult, self::GetCacheEntries($sSubFile));
-			}
-		}
-		else
-		{
-			$sKey = basename($sEntry);
-			if (strpos($sKey, '-') === 0)
-			{
-				$sKey = substr($sKey, 1);
-			}
-			$aResult[] = array('info' => $sKey);
-		}
-		return $aResult;
-	}
-
-	/** Delete one cache entry.
-	 * @param $sCache
-	 * @return bool true if the entry was deleted false if error occurs (like entry did not exist).
-	 */
-	static public function DeleteEntry($sCache)
-	{
-		if (is_dir($sCache))
-		{
-			$aFiles = array_diff(scandir($sCache), array('.', '..'));
-			foreach($aFiles as $sFile)
-			{
-				$sSubFile = $sCache.'/'.$sFile;
-				if (!self::DeleteEntry($sSubFile))
-				{
-					return false;
-				}
-			}
-			if (!@rmdir($sCache))
-			{
-				return false;
-			}
-		}
-		else
-		{
-			if (!@unlink($sCache))
-			{
-				return false;
-			}
-		}
-
-		self::ResetFileCount();
-		return true;
-	}
-
-	/** Get one cache entry content.
-	 * @param $sKey
-	 * @return bool|mixed
-	 */
-	static public function FetchOneFile($sKey)
-	{
-		// Try the 'TTLed' version
-		$sValue = self::ReadCacheLocked(self::GetCacheFileName('-'.$sKey));
-		if ($sValue === false)
-		{
-			$sValue = self::ReadCacheLocked(self::GetCacheFileName($sKey));
-			if ($sValue === false)
-			{
-				return false;
-			}
-		}
-		$oRes = @unserialize($sValue);
-		return $oRes;
-	}
-
-	/** Add one cache entry.
-	 * @param string $sKey
-	 * @param $value
-	 * @param int $iTTL time to live
-	 * @return bool
-	 */
-	static public function StoreOneFile($sKey, $value, $iTTL)
-	{
-		if (empty($sKey))
-		{
-			return false;
-		}
-
-		@unlink(self::GetCacheFileName($sKey));
-		@unlink(self::GetCacheFileName('-'.$sKey));
-		if ($iTTL > 0)
-		{
-			// hint for ttl management
-			$sKey = '-'.$sKey;
-		}
-
-		$sFilename = self::GetCacheFileName($sKey);
-		// try to create the folder
-		$sDirname = dirname($sFilename);
-		if (!file_exists($sDirname))
-		{
-			if (!@mkdir($sDirname, 0755, true))
-			{
-				return false;
-			}
-		}
-		$bRes = !(@file_put_contents($sFilename, serialize($value), LOCK_EX) === false);
-		self::AddFile($sFilename);
-		return $bRes;
-	}
-
-	/** Manage the cache files when adding a new cache entry:
-	 * remove older files if the mamximum is reached.
-	 * @param $sNewFilename
-	 */
-	static protected function AddFile($sNewFilename)
-	{
-		if (strpos(basename($sNewFilename), '-') !== 0)
-		{
-			return;
-		}
-
-		$iMaxFiles = MetaModel::GetConfig()->Get('apc_cache_emulation.max_entries');
-		if ($iMaxFiles == 0)
-		{
-			return;
-		}
-		if (!self::$aFilesByTime)
-		{
-			self::ListFilesByTime();
-			self::$iFileCount = count(self::$aFilesByTime);
-			if ($iMaxFiles !== 0)
-			{
-				asort(self::$aFilesByTime);
-			}
-		}
-		else
-		{
-			self::$aFilesByTime[$sNewFilename] = time();
-			self::$iFileCount++;
-		}
-		if (self::$iFileCount > $iMaxFiles)
-		{
-			$iFileNbToRemove = self::$iFileCount - $iMaxFiles;
-			foreach(self::$aFilesByTime as $sFileToRemove => $iTime)
-			{
-				@unlink($sFileToRemove);
-				if (--$iFileNbToRemove === 0)
-				{
-					break;
-				}
-			}
-			self::$aFilesByTime = array_slice(self::$aFilesByTime, self::$iFileCount - $iMaxFiles, null, true);
-			self::$iFileCount = $iMaxFiles;
-		}
-	}
-
-	/** Get the list of files with their associated access time
-	 * @param string $sCheck Directory to scan
-	 */
-	static protected function ListFilesByTime($sCheck = null)
-	{
-		if (empty($sCheck))
-		{
-			$sCheck = self::GetCacheFileName();
-		}
-		// Garbage collection
-		$aFiles = array_diff(@scandir($sCheck), array('.', '..'));
-		foreach($aFiles as $sFile)
-		{
-			$sSubFile = $sCheck.'/'.$sFile;
-			if (is_dir($sSubFile))
-			{
-				self::ListFilesByTime($sSubFile);
-			}
-			else
-			{
-				if (strpos(basename($sSubFile), '-') === 0)
-				{
-					self::$aFilesByTime[$sSubFile] = @fileatime($sSubFile);
-				}
-			}
-		}
-	}
-
-	/** Read the content of one cache file under lock protection
-	 * @param $sFilename
-	 * @return bool|string the content of the cache entry or false if error
-	 */
-	static protected function ReadCacheLocked($sFilename)
-	{
-		$file = @fopen($sFilename, 'r');
-		if ($file === false)
-		{
-			return false;
-		}
-		flock($file, LOCK_SH);
-		$sContent = @fread($file, @filesize($sFilename));
-		flock($file, LOCK_UN);
-		fclose($file);
-		return $sContent;
-	}
-
-	static protected function ResetFileCount()
-	{
-		self::$aFilesByTime = null;
-		self::$iFileCount = 0;
-	}
-
-}
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Date: 27/09/2017
+ */
+
+/**
+ * @param string $cache_type
+ * @param bool $limited
+ * @return array|bool
+ */
+function apc_cache_info($cache_type = '', $limited = false)
+{
+	$aInfo = array();
+	$sRootCacheDir = apcFile::GetCacheFileName();
+	$aInfo['cache_list'] = apcFile::GetCacheEntries($sRootCacheDir);
+	return $aInfo;
+}
+
+/**
+ * @param array|string $key
+ * @param $var
+ * @param int $ttl
+ * @return array|bool
+ */
+function apc_store($key, $var = NULL, $ttl = 0)
+{
+	if (is_array($key))
+	{
+		$aResult = array();
+		foreach($key as $sKey => $value)
+		{
+			$aResult[] = apcFile::StoreOneFile($sKey, $value, $ttl);
+		}
+		return $aResult;
+	}
+	return apcFile::StoreOneFile($key, $var, $ttl);
+}
+
+/**
+ * @param $key string|array
+ * @return mixed
+ */
+function apc_fetch($key)
+{
+	if (is_array($key))
+	{
+		$aResult = array();
+		foreach($key as $sKey)
+		{
+			$aResult[$sKey] = apcFile::FetchOneFile($sKey);
+		}
+		return $aResult;
+	}
+	return apcFile::FetchOneFile($key);
+}
+
+/**
+ * @param string $cache_type
+ * @return bool
+ */
+function apc_clear_cache($cache_type = '')
+{
+	apcFile::DeleteEntry(utils::GetCachePath());
+	return true;
+}
+
+/**
+ * @param $key
+ * @return bool|string[]
+ */
+function apc_delete($key)
+{
+	if (empty($key))
+	{
+		return false;
+	}
+	$bRet1 = apcFile::DeleteEntry(apcFile::GetCacheFileName($key));
+	$bRet2 = apcFile::DeleteEntry(apcFile::GetCacheFileName('-'.$key));
+	return $bRet1 || $bRet2;
+}
+
+class apcFile
+{
+	// Check only once per request
+	static public $aFilesByTime = null;
+	static public $iFileCount = 0;
+
+	/** Get the file name corresponding to the cache entry.
+	 * If an empty key is provided, the root of the cache is returned.
+	 * @param $sKey
+	 * @return string
+	 */
+	static public function GetCacheFileName($sKey = '')
+	{
+		$sPath = str_replace(array(' ', '/', '\\', '.'), '-', $sKey);
+		return utils::GetCachePath().'apc-emul/'.$sPath;
+	}
+
+	/** Get the list of entries from a starting folder.
+	 * @param $sEntry string starting folder.
+	 * @return array list of entries stored into array of key 'info'
+	 */
+	static public function GetCacheEntries($sEntry)
+	{
+		$aResult = array();
+		if (is_dir($sEntry))
+		{
+			$aFiles = array_diff(scandir($sEntry), array('.', '..'));
+			foreach($aFiles as $sFile)
+			{
+				$sSubFile = $sEntry.'/'.$sFile;
+				$aResult = array_merge($aResult, self::GetCacheEntries($sSubFile));
+			}
+		}
+		else
+		{
+			$sKey = basename($sEntry);
+			if (strpos($sKey, '-') === 0)
+			{
+				$sKey = substr($sKey, 1);
+			}
+			$aResult[] = array('info' => $sKey);
+		}
+		return $aResult;
+	}
+
+	/** Delete one cache entry.
+	 * @param $sCache
+	 * @return bool true if the entry was deleted false if error occurs (like entry did not exist).
+	 */
+	static public function DeleteEntry($sCache)
+	{
+		if (is_dir($sCache))
+		{
+			$aFiles = array_diff(scandir($sCache), array('.', '..'));
+			foreach($aFiles as $sFile)
+			{
+				$sSubFile = $sCache.'/'.$sFile;
+				if (!self::DeleteEntry($sSubFile))
+				{
+					return false;
+				}
+			}
+			if (!@rmdir($sCache))
+			{
+				return false;
+			}
+		}
+		else
+		{
+			if (!@unlink($sCache))
+			{
+				return false;
+			}
+		}
+
+		self::ResetFileCount();
+		return true;
+	}
+
+	/** Get one cache entry content.
+	 * @param $sKey
+	 * @return bool|mixed
+	 */
+	static public function FetchOneFile($sKey)
+	{
+		// Try the 'TTLed' version
+		$sValue = self::ReadCacheLocked(self::GetCacheFileName('-'.$sKey));
+		if ($sValue === false)
+		{
+			$sValue = self::ReadCacheLocked(self::GetCacheFileName($sKey));
+			if ($sValue === false)
+			{
+				return false;
+			}
+		}
+		$oRes = @unserialize($sValue);
+		return $oRes;
+	}
+
+	/** Add one cache entry.
+	 * @param string $sKey
+	 * @param $value
+	 * @param int $iTTL time to live
+	 * @return bool
+	 */
+	static public function StoreOneFile($sKey, $value, $iTTL)
+	{
+		if (empty($sKey))
+		{
+			return false;
+		}
+
+		@unlink(self::GetCacheFileName($sKey));
+		@unlink(self::GetCacheFileName('-'.$sKey));
+		if ($iTTL > 0)
+		{
+			// hint for ttl management
+			$sKey = '-'.$sKey;
+		}
+
+		$sFilename = self::GetCacheFileName($sKey);
+		// try to create the folder
+		$sDirname = dirname($sFilename);
+		if (!file_exists($sDirname))
+		{
+			if (!@mkdir($sDirname, 0755, true))
+			{
+				return false;
+			}
+		}
+		$bRes = !(@file_put_contents($sFilename, serialize($value), LOCK_EX) === false);
+		self::AddFile($sFilename);
+		return $bRes;
+	}
+
+	/** Manage the cache files when adding a new cache entry:
+	 * remove older files if the mamximum is reached.
+	 * @param $sNewFilename
+	 */
+	static protected function AddFile($sNewFilename)
+	{
+		if (strpos(basename($sNewFilename), '-') !== 0)
+		{
+			return;
+		}
+
+		$iMaxFiles = MetaModel::GetConfig()->Get('apc_cache_emulation.max_entries');
+		if ($iMaxFiles == 0)
+		{
+			return;
+		}
+		if (!self::$aFilesByTime)
+		{
+			self::ListFilesByTime();
+			self::$iFileCount = count(self::$aFilesByTime);
+			if ($iMaxFiles !== 0)
+			{
+				asort(self::$aFilesByTime);
+			}
+		}
+		else
+		{
+			self::$aFilesByTime[$sNewFilename] = time();
+			self::$iFileCount++;
+		}
+		if (self::$iFileCount > $iMaxFiles)
+		{
+			$iFileNbToRemove = self::$iFileCount - $iMaxFiles;
+			foreach(self::$aFilesByTime as $sFileToRemove => $iTime)
+			{
+				@unlink($sFileToRemove);
+				if (--$iFileNbToRemove === 0)
+				{
+					break;
+				}
+			}
+			self::$aFilesByTime = array_slice(self::$aFilesByTime, self::$iFileCount - $iMaxFiles, null, true);
+			self::$iFileCount = $iMaxFiles;
+		}
+	}
+
+	/** Get the list of files with their associated access time
+	 * @param string $sCheck Directory to scan
+	 */
+	static protected function ListFilesByTime($sCheck = null)
+	{
+		if (empty($sCheck))
+		{
+			$sCheck = self::GetCacheFileName();
+		}
+		// Garbage collection
+		$aFiles = array_diff(@scandir($sCheck), array('.', '..'));
+		foreach($aFiles as $sFile)
+		{
+			$sSubFile = $sCheck.'/'.$sFile;
+			if (is_dir($sSubFile))
+			{
+				self::ListFilesByTime($sSubFile);
+			}
+			else
+			{
+				if (strpos(basename($sSubFile), '-') === 0)
+				{
+					self::$aFilesByTime[$sSubFile] = @fileatime($sSubFile);
+				}
+			}
+		}
+	}
+
+	/** Read the content of one cache file under lock protection
+	 * @param $sFilename
+	 * @return bool|string the content of the cache entry or false if error
+	 */
+	static protected function ReadCacheLocked($sFilename)
+	{
+		$file = @fopen($sFilename, 'r');
+		if ($file === false)
+		{
+			return false;
+		}
+		flock($file, LOCK_SH);
+		$sContent = @fread($file, @filesize($sFilename));
+		flock($file, LOCK_UN);
+		fclose($file);
+		return $sContent;
+	}
+
+	static protected function ResetFileCount()
+	{
+		self::$aFilesByTime = null;
+		self::$iFileCount = 0;
+	}
+
+}
diff --git a/core/archive.class.inc.php b/core/archive.class.inc.php
index 82c34a554..94cb891e5 100644
--- a/core/archive.class.inc.php
+++ b/core/archive.class.inc.php
@@ -1,335 +1,335 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Utility to import/export the DB from/to a ZIP file
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * iTopArchive a class to manipulate (read/write) iTop archives with their catalog
- * Each iTop archive is a zip file that contains (at the root of the archive)
- * a file called catalog.xml holding the description of the archive
- */
-class iTopArchive
-{
-	const read = 0;
-	const create = ZipArchive::CREATE;
-	
-	protected $m_sZipPath;
-	protected $m_oZip;
-	protected $m_sVersion;
-	protected $m_sTitle;
-	protected $m_sDescription;
-	protected $m_aPackages;
-	protected $m_aErrorMessages;
-
-	/**
-	 * Construct an iTopArchive object
-	 * @param $sArchivePath string The full path the archive file
-	 * @param $iMode integrer Either iTopArchive::read for reading an existing archive or iTopArchive::create for creating a new one. Updating is not supported (yet)
-	 */
-	public function __construct($sArchivePath, $iMode = iTopArchive::read)
-	{
-		$this->m_sZipPath = $sArchivePath;
-		$this->m_oZip = new ZipArchive();
-		$this->m_oZip->open($this->m_sZipPath, $iMode);
-		$this->m_aErrorMessages = array();
-		$this->m_sVersion = '1.0';
-		$this->m_sTitle = '';
-		$this->m_sDescription = '';
-		$this->m_aPackages = array();
-	}
-
-	public function SetTitle($sTitle)
-	{
-		$this->m_sTitle = $sTitle;
-	}
-	
-	public function SetDescription($sDescription)
-	{
-		$this->m_sDescription = $sDescription;
-	}
-	
-	public function GetTitle()
-	{
-		return $this->m_sTitle;
-	}
-	
-	public function GetDescription()
-	{
-		return $this->m_sDescription;
-	}
-	
-	public function GetPackages()
-	{
-		return $this->m_aPackages;
-	}
-	
-	public function __destruct()
-	{
-		$this->m_oZip->close();
-	}
-	
-	/**
-	 * Get the error message explaining the latest error encountered
-	 * @return array All the error messages encountered during the validation
-	 */
-	public function GetErrors()
-	{
-		return $this->m_aErrorMessages;
-	}
-	
-	/**
-	 * Read the catalog from the archive (zip) file
-	 * @param sPath string Path the the zip file
-	 * @return boolean True in case of success, false otherwise
-	 */
-	public function ReadCatalog()
-	{
-		if ($this->IsValid())
-		{
-			$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
-			$oParser = xml_parser_create();
-			xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
-			xml_parser_free($oParser);
-			
-			$iIndex = $aIndexes['ARCHIVE'][0];
-			$this->m_sVersion = $aValues[$iIndex]['attributes']['VERSION'];
-			$iIndex = $aIndexes['TITLE'][0];
-			$this->m_sTitle = $aValues[$iIndex]['value'];
-			$iIndex = $aIndexes['DESCRIPTION'][0];
-			if (array_key_exists('value', $aValues[$iIndex]))
-			{
-				// #@# implement a get_array_value(array, key, default) ?
-				$this->m_sDescription = $aValues[$iIndex]['value'];
-			}
-			
-			foreach($aIndexes['PACKAGE'] as $iIndex)
-			{
-				$this->m_aPackages[$aValues[$iIndex]['attributes']['HREF']] = array( 'type' => $aValues[$iIndex]['attributes']['TYPE'], 'title'=> $aValues[$iIndex]['attributes']['TITLE'], 'description' => $aValues[$iIndex]['value']);
-			}
-			
-			//echo "Archive path: {$this->m_sZipPath}<br/>\n";
-			//echo "Archive format version: {$this->m_sVersion}<br/>\n";
-			//echo "Title: {$this->m_sTitle}<br/>\n";
-			//echo "Description: {$this->m_sDescription}<br/>\n";
-			//foreach($this->m_aPackages as $aFile)
-			//{
-			//	echo "{$aFile['title']} ({$aFile['type']}): {$aFile['description']}<br/>\n";
-			//}
-		}
-		return true;
-	}
-	
-	public function WriteCatalog()
-	{
-		$sXml  = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">\n"; // split the XML closing tag that disturbs PSPad's syntax coloring
-		$sXml .= "<archive version=\"1.0\">\n";
-		$sXml .= "<title>{$this->m_sTitle}</title>\n";
-		$sXml .= "<description>{$this->m_sDescription}</description>\n";
-		foreach($this->m_aPackages as $sFileName => $aFile)
-		{
-			$sXml .= "<package title=\"{$aFile['title']}\" type=\"{$aFile['type']}\" href=\"$sFileName\">{$aFile['description']}</package>\n";
-		}
-		$sXml .= "</archive>";
-		$this->m_oZip->addFromString('catalog.xml', $sXml);
-	}
-	
-   /**
-	* Add a package to the archive
-	* @param string $sExternalFilePath The path to the file to be added to the archive as a package (directories are not yet implemented)
-	* @param string $sFilePath The name of the file inside the archive
-	* @param string $sTitle A short title for this package
-	* @param string $sType Type of the package. SQL scripts must be of type 'text/sql'
-	* @param string $sDescription A longer description of the purpose of this package
-	* @return none
-	*/
-	public function AddPackage($sExternalFilePath, $sFilePath, $sTitle, $sType, $sDescription)
-	{
-		$this->m_aPackages[$sFilePath] = array('title' => $sTitle, 'type' => $sType, 'description' => $sDescription);
-		$this->m_oZip->addFile($sExternalFilePath, $sFilePath);
-	}
-	 
-   /**
-	* Reads the contents of the given file from the archive
-	* @param string $sFileName The path to the file inside the archive
-	* @return string The content of the file read from the archive
-	*/
-	public function GetFileContents($sFileName)
-	{
-		return $this->m_oZip->getFromName($sFileName);
-	}
-	 
-   /**
-	* Extracts the contents of the given file from the archive
-	* @param string $sFileName The path to the file inside the archive
-	* @param string $sDestinationFileName The path of the file to write
-	* @return none
-	*/
-	 public function ExtractToFile($sFileName, $sDestinationFileName)
-	 {
-	 	$iBufferSize = 64 * 1024; // Read 64K at a time
-		$oZipStream = $this->m_oZip->getStream($sFileName);
-		$oDestinationStream = fopen($sDestinationFileName, 'wb');
-		while (!feof($oZipStream)) {
-			$sContents = fread($oZipStream, $iBufferSize);
-			fwrite($oDestinationStream, $sContents);
-		}
-		fclose($oZipStream);
-		fclose($oDestinationStream);
-	 }
-	 
-	 /**
-	  * Apply a SQL script taken from the archive. The package must be listed in the catalog and of type text/sql
-	  * @param string $sFileName The path to the SQL package inside the archive
-	  * @return boolean false in case of error, true otherwise
-	  */
-	 public function ImportSql($sFileName, $sDatabase = 'itop')
-	 {
-		if ( ($this->m_oZip->locateName($sFileName) == false) || (!isset($this->m_aPackages[$sFileName])) || ($this->m_aPackages[$sFileName]['type'] != 'text/sql'))
-		{
-			// invalid type or not listed in the catalog
-			return false;
-		}
-		$sTempName = tempnam("../tmp/", "sql");
-		//echo "Extracting to: '$sTempName'<br/>\n";
-		$this->ExtractToFile($sFileName, $sTempName);
-		// Note: the command line below works on Windows with the right path to mysql !!!
-		$sCommandLine = 'type "'.$sTempName.'" | "/iTop/MySQL Server 5.0/bin/mysql.exe" -u root '.$sDatabase;
-		//echo "Executing: '$sCommandLine'<br/>\n";
-		exec($sCommandLine, $aOutput, $iRet);
-		//echo "Return code: $iRet<br/>\n";
-		//echo "Output:<br/><pre>\n";
-		//print_r($aOutput);
-		//echo "</pre><br/>\n";
-		unlink($sTempName);
-		return ($iRet == 0);
-	 }
-	 
-	 /**
-	  * Dumps some part of the specified MySQL database into the archive as a text/sql package
-	  * @param $sTitle string A short title for this SQL script
-	  * @param $sDescription string A longer description of the purpose of this SQL script
-	  * @param $sFileName string The name of the package inside the archive
-	  * @param $sDatabase string name of the database
-	  * @param $aTables array array or table names. If empty, all tables are dumped
-	  * @param $bStructureOnly boolean Whether or not to dump the data or just the schema
-	  * @return boolean False in case of error, true otherwise
-	  */
-	 public function AddDatabaseDump($sTitle, $sDescription, $sFileName, $sDatabase = 'itop', $aTables = array(), $bStructureOnly = true)
-	 {
-		$sTempName = tempnam("../tmp/", "sql");
-		$sNoData = $bStructureOnly ? "--no-data" : "";
-		$sCommandLine = "\"/iTop/MySQL Server 5.0/bin/mysqldump.exe\" --user=root --opt $sNoData --result-file=$sTempName $sDatabase ".implode(" ", $aTables);
-		//echo "Executing command: '$sCommandLine'<br/>\n";
-		exec($sCommandLine, $aOutput, $iRet);
-		//echo "Return code: $iRet<br/>\n";
-		//echo "Output:<br/><pre>\n";
-		//print_r($aOutput);
-		//echo "</pre><br/>\n";
-		if ($iRet == 0)
-		{
-			$this->AddPackage($sTempName, $sFileName, $sTitle, 'text/sql', $sDescription);
-		}
-		//unlink($sTempName);
-		return ($iRet == 0);
-	 }
-
-	/**
-	 * Check the consistency of the archive
-	 * @return boolean True if the archive file is consistent
-	 */
-	 public function IsValid()
-	 {
-	 	// TO DO: use a DTD to validate the XML instead of this hand-made validation
-	 	$bResult = true;
-		$aMandatoryTags = array('ARCHIVE' => array('VERSION'),
-								'TITLE' => array(),
-								'DESCRIPTION' => array(),
-								'PACKAGE'  => array('TYPE', 'HREF', 'TITLE'));
-		
-		$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
-		$oParser = xml_parser_create();
-		xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
-		xml_parser_free($oParser);
-		
-		foreach($aMandatoryTags as $sTag => $aAttributes)
-		{
-			// Check that all the required tags are present
-			if (!isset($aIndexes[$sTag]))
-			{
-				$this->m_aErrorMessages[] = "The XML catalog does not contain the mandatory tag $sTag.";
-				$bResult = false; 
-			}
-			else
-			{
-				foreach($aIndexes[$sTag] as $iIndex)
-				{
-					switch($aValues[$iIndex]['type'])
-					{
-						case 'complete':
-						case 'open':
-							// Check that all the required attributes are present
-							foreach($aAttributes as $sAttribute)
-							{
-								if (!isset($aValues[$iIndex]['attributes'][$sAttribute]))
-								{
-									$this->m_aErrorMessages[] = "The tag $sTag ($iIndex) does not contain the required attribute $sAttribute.";
-								}
-							}
-						break;
-						
-						default:
-							// ignore other type of tags: close or cdata
-					}
-				}
-			}
-		}
-		return $bResult;
-	 }
-}
-/*
-// Unit test - reading an archive
-$sArchivePath = '../tmp/archive.zip';
-$oArchive = new iTopArchive($sArchivePath, iTopArchive::read);
-$oArchive->ReadCatalog();
-$oArchive->ImportSql('full_backup.sql');
-
-// Writing an archive --
-
-$sArchivePath = '../tmp/archive2.zip';
-$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
-$oArchive->SetTitle('First Archive !');
-$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
-$oArchive->AddPackage('../tmp/schema.sql', 'test.sql', 'this is just a test', 'text/sql', 'My first attempt at creating an archive from PHP...');
-$oArchive->WriteCatalog();
-
-
-$sArchivePath = '../tmp/archive2.zip';
-$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
-$oArchive->SetTitle('First Archive !');
-$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
-$oArchive->AddDatabaseDump('Test', 'This is my first automatic dump', 'schema.sql', 'itop', array('objects'));
-$oArchive->WriteCatalog();
-*/
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Utility to import/export the DB from/to a ZIP file
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * iTopArchive a class to manipulate (read/write) iTop archives with their catalog
+ * Each iTop archive is a zip file that contains (at the root of the archive)
+ * a file called catalog.xml holding the description of the archive
+ */
+class iTopArchive
+{
+	const read = 0;
+	const create = ZipArchive::CREATE;
+	
+	protected $m_sZipPath;
+	protected $m_oZip;
+	protected $m_sVersion;
+	protected $m_sTitle;
+	protected $m_sDescription;
+	protected $m_aPackages;
+	protected $m_aErrorMessages;
+
+	/**
+	 * Construct an iTopArchive object
+	 * @param $sArchivePath string The full path the archive file
+	 * @param $iMode integrer Either iTopArchive::read for reading an existing archive or iTopArchive::create for creating a new one. Updating is not supported (yet)
+	 */
+	public function __construct($sArchivePath, $iMode = iTopArchive::read)
+	{
+		$this->m_sZipPath = $sArchivePath;
+		$this->m_oZip = new ZipArchive();
+		$this->m_oZip->open($this->m_sZipPath, $iMode);
+		$this->m_aErrorMessages = array();
+		$this->m_sVersion = '1.0';
+		$this->m_sTitle = '';
+		$this->m_sDescription = '';
+		$this->m_aPackages = array();
+	}
+
+	public function SetTitle($sTitle)
+	{
+		$this->m_sTitle = $sTitle;
+	}
+	
+	public function SetDescription($sDescription)
+	{
+		$this->m_sDescription = $sDescription;
+	}
+	
+	public function GetTitle()
+	{
+		return $this->m_sTitle;
+	}
+	
+	public function GetDescription()
+	{
+		return $this->m_sDescription;
+	}
+	
+	public function GetPackages()
+	{
+		return $this->m_aPackages;
+	}
+	
+	public function __destruct()
+	{
+		$this->m_oZip->close();
+	}
+	
+	/**
+	 * Get the error message explaining the latest error encountered
+	 * @return array All the error messages encountered during the validation
+	 */
+	public function GetErrors()
+	{
+		return $this->m_aErrorMessages;
+	}
+	
+	/**
+	 * Read the catalog from the archive (zip) file
+	 * @param sPath string Path the the zip file
+	 * @return boolean True in case of success, false otherwise
+	 */
+	public function ReadCatalog()
+	{
+		if ($this->IsValid())
+		{
+			$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
+			$oParser = xml_parser_create();
+			xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
+			xml_parser_free($oParser);
+			
+			$iIndex = $aIndexes['ARCHIVE'][0];
+			$this->m_sVersion = $aValues[$iIndex]['attributes']['VERSION'];
+			$iIndex = $aIndexes['TITLE'][0];
+			$this->m_sTitle = $aValues[$iIndex]['value'];
+			$iIndex = $aIndexes['DESCRIPTION'][0];
+			if (array_key_exists('value', $aValues[$iIndex]))
+			{
+				// #@# implement a get_array_value(array, key, default) ?
+				$this->m_sDescription = $aValues[$iIndex]['value'];
+			}
+			
+			foreach($aIndexes['PACKAGE'] as $iIndex)
+			{
+				$this->m_aPackages[$aValues[$iIndex]['attributes']['HREF']] = array( 'type' => $aValues[$iIndex]['attributes']['TYPE'], 'title'=> $aValues[$iIndex]['attributes']['TITLE'], 'description' => $aValues[$iIndex]['value']);
+			}
+			
+			//echo "Archive path: {$this->m_sZipPath}<br/>\n";
+			//echo "Archive format version: {$this->m_sVersion}<br/>\n";
+			//echo "Title: {$this->m_sTitle}<br/>\n";
+			//echo "Description: {$this->m_sDescription}<br/>\n";
+			//foreach($this->m_aPackages as $aFile)
+			//{
+			//	echo "{$aFile['title']} ({$aFile['type']}): {$aFile['description']}<br/>\n";
+			//}
+		}
+		return true;
+	}
+	
+	public function WriteCatalog()
+	{
+		$sXml  = "<?xml version=\"1.0\" encoding=\"utf-8\"?".">\n"; // split the XML closing tag that disturbs PSPad's syntax coloring
+		$sXml .= "<archive version=\"1.0\">\n";
+		$sXml .= "<title>{$this->m_sTitle}</title>\n";
+		$sXml .= "<description>{$this->m_sDescription}</description>\n";
+		foreach($this->m_aPackages as $sFileName => $aFile)
+		{
+			$sXml .= "<package title=\"{$aFile['title']}\" type=\"{$aFile['type']}\" href=\"$sFileName\">{$aFile['description']}</package>\n";
+		}
+		$sXml .= "</archive>";
+		$this->m_oZip->addFromString('catalog.xml', $sXml);
+	}
+	
+   /**
+	* Add a package to the archive
+	* @param string $sExternalFilePath The path to the file to be added to the archive as a package (directories are not yet implemented)
+	* @param string $sFilePath The name of the file inside the archive
+	* @param string $sTitle A short title for this package
+	* @param string $sType Type of the package. SQL scripts must be of type 'text/sql'
+	* @param string $sDescription A longer description of the purpose of this package
+	* @return none
+	*/
+	public function AddPackage($sExternalFilePath, $sFilePath, $sTitle, $sType, $sDescription)
+	{
+		$this->m_aPackages[$sFilePath] = array('title' => $sTitle, 'type' => $sType, 'description' => $sDescription);
+		$this->m_oZip->addFile($sExternalFilePath, $sFilePath);
+	}
+	 
+   /**
+	* Reads the contents of the given file from the archive
+	* @param string $sFileName The path to the file inside the archive
+	* @return string The content of the file read from the archive
+	*/
+	public function GetFileContents($sFileName)
+	{
+		return $this->m_oZip->getFromName($sFileName);
+	}
+	 
+   /**
+	* Extracts the contents of the given file from the archive
+	* @param string $sFileName The path to the file inside the archive
+	* @param string $sDestinationFileName The path of the file to write
+	* @return none
+	*/
+	 public function ExtractToFile($sFileName, $sDestinationFileName)
+	 {
+	 	$iBufferSize = 64 * 1024; // Read 64K at a time
+		$oZipStream = $this->m_oZip->getStream($sFileName);
+		$oDestinationStream = fopen($sDestinationFileName, 'wb');
+		while (!feof($oZipStream)) {
+			$sContents = fread($oZipStream, $iBufferSize);
+			fwrite($oDestinationStream, $sContents);
+		}
+		fclose($oZipStream);
+		fclose($oDestinationStream);
+	 }
+	 
+	 /**
+	  * Apply a SQL script taken from the archive. The package must be listed in the catalog and of type text/sql
+	  * @param string $sFileName The path to the SQL package inside the archive
+	  * @return boolean false in case of error, true otherwise
+	  */
+	 public function ImportSql($sFileName, $sDatabase = 'itop')
+	 {
+		if ( ($this->m_oZip->locateName($sFileName) == false) || (!isset($this->m_aPackages[$sFileName])) || ($this->m_aPackages[$sFileName]['type'] != 'text/sql'))
+		{
+			// invalid type or not listed in the catalog
+			return false;
+		}
+		$sTempName = tempnam("../tmp/", "sql");
+		//echo "Extracting to: '$sTempName'<br/>\n";
+		$this->ExtractToFile($sFileName, $sTempName);
+		// Note: the command line below works on Windows with the right path to mysql !!!
+		$sCommandLine = 'type "'.$sTempName.'" | "/iTop/MySQL Server 5.0/bin/mysql.exe" -u root '.$sDatabase;
+		//echo "Executing: '$sCommandLine'<br/>\n";
+		exec($sCommandLine, $aOutput, $iRet);
+		//echo "Return code: $iRet<br/>\n";
+		//echo "Output:<br/><pre>\n";
+		//print_r($aOutput);
+		//echo "</pre><br/>\n";
+		unlink($sTempName);
+		return ($iRet == 0);
+	 }
+	 
+	 /**
+	  * Dumps some part of the specified MySQL database into the archive as a text/sql package
+	  * @param $sTitle string A short title for this SQL script
+	  * @param $sDescription string A longer description of the purpose of this SQL script
+	  * @param $sFileName string The name of the package inside the archive
+	  * @param $sDatabase string name of the database
+	  * @param $aTables array array or table names. If empty, all tables are dumped
+	  * @param $bStructureOnly boolean Whether or not to dump the data or just the schema
+	  * @return boolean False in case of error, true otherwise
+	  */
+	 public function AddDatabaseDump($sTitle, $sDescription, $sFileName, $sDatabase = 'itop', $aTables = array(), $bStructureOnly = true)
+	 {
+		$sTempName = tempnam("../tmp/", "sql");
+		$sNoData = $bStructureOnly ? "--no-data" : "";
+		$sCommandLine = "\"/iTop/MySQL Server 5.0/bin/mysqldump.exe\" --user=root --opt $sNoData --result-file=$sTempName $sDatabase ".implode(" ", $aTables);
+		//echo "Executing command: '$sCommandLine'<br/>\n";
+		exec($sCommandLine, $aOutput, $iRet);
+		//echo "Return code: $iRet<br/>\n";
+		//echo "Output:<br/><pre>\n";
+		//print_r($aOutput);
+		//echo "</pre><br/>\n";
+		if ($iRet == 0)
+		{
+			$this->AddPackage($sTempName, $sFileName, $sTitle, 'text/sql', $sDescription);
+		}
+		//unlink($sTempName);
+		return ($iRet == 0);
+	 }
+
+	/**
+	 * Check the consistency of the archive
+	 * @return boolean True if the archive file is consistent
+	 */
+	 public function IsValid()
+	 {
+	 	// TO DO: use a DTD to validate the XML instead of this hand-made validation
+	 	$bResult = true;
+		$aMandatoryTags = array('ARCHIVE' => array('VERSION'),
+								'TITLE' => array(),
+								'DESCRIPTION' => array(),
+								'PACKAGE'  => array('TYPE', 'HREF', 'TITLE'));
+		
+		$sXmlCatalog = $this->m_oZip->getFromName('catalog.xml');
+		$oParser = xml_parser_create();
+		xml_parse_into_struct($oParser, $sXmlCatalog, $aValues, $aIndexes);
+		xml_parser_free($oParser);
+		
+		foreach($aMandatoryTags as $sTag => $aAttributes)
+		{
+			// Check that all the required tags are present
+			if (!isset($aIndexes[$sTag]))
+			{
+				$this->m_aErrorMessages[] = "The XML catalog does not contain the mandatory tag $sTag.";
+				$bResult = false; 
+			}
+			else
+			{
+				foreach($aIndexes[$sTag] as $iIndex)
+				{
+					switch($aValues[$iIndex]['type'])
+					{
+						case 'complete':
+						case 'open':
+							// Check that all the required attributes are present
+							foreach($aAttributes as $sAttribute)
+							{
+								if (!isset($aValues[$iIndex]['attributes'][$sAttribute]))
+								{
+									$this->m_aErrorMessages[] = "The tag $sTag ($iIndex) does not contain the required attribute $sAttribute.";
+								}
+							}
+						break;
+						
+						default:
+							// ignore other type of tags: close or cdata
+					}
+				}
+			}
+		}
+		return $bResult;
+	 }
+}
+/*
+// Unit test - reading an archive
+$sArchivePath = '../tmp/archive.zip';
+$oArchive = new iTopArchive($sArchivePath, iTopArchive::read);
+$oArchive->ReadCatalog();
+$oArchive->ImportSql('full_backup.sql');
+
+// Writing an archive --
+
+$sArchivePath = '../tmp/archive2.zip';
+$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
+$oArchive->SetTitle('First Archive !');
+$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
+$oArchive->AddPackage('../tmp/schema.sql', 'test.sql', 'this is just a test', 'text/sql', 'My first attempt at creating an archive from PHP...');
+$oArchive->WriteCatalog();
+
+
+$sArchivePath = '../tmp/archive2.zip';
+$oArchive = new iTopArchive($sArchivePath, iTopArchive::create);
+$oArchive->SetTitle('First Archive !');
+$oArchive->SetDescription('This is just a test. Does not contain a lot of useful data.');
+$oArchive->AddDatabaseDump('Test', 'This is my first automatic dump', 'schema.sql', 'itop', array('objects'));
+$oArchive->WriteCatalog();
+*/
+?>
diff --git a/core/asynctask.class.inc.php b/core/asynctask.class.inc.php
index 0ca20d8ea..5c7d8d2c6 100644
--- a/core/asynctask.class.inc.php
+++ b/core/asynctask.class.inc.php
@@ -1,385 +1,385 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent classes (internal): user defined actions
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class ExecAsyncTask implements iBackgroundProcess
-{
-	public function GetPeriodicity()
-	{	
-		return 2; // seconds
-	}
-
-	public function Process($iTimeLimit)
-	{
-		$sNow = date(AttributeDateTime::GetSQLFormat());
-		// Criteria: planned, and expected to occur... ASAP or in the past
-		$sOQL = "SELECT AsyncTask WHERE (status = 'planned') AND (ISNULL(planned) OR (planned < '$sNow'))";
-		$iProcessed = 0;
-		while (time() < $iTimeLimit)
-		{
-			// Next one ?
-			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array(), null, 1 /* limit count */);
-			$oTask = $oSet->Fetch();
-			if (is_null($oTask))
-			{
-				// Nothing to be done
-				break;
-			}
-			$iProcessed++;
-			if ($oTask->Process())
-			{
-				$oTask->DBDelete();
-			}
-		}
-		return "processed $iProcessed tasks";
-	}
-}
-
-/**
- * A   
- *
- * @package     iTopORM
- */
-abstract class AsyncTask extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => array('created'),
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_async_task",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-
-		// Null is allowed to ease the migration from iTop 2.0.2 and earlier, when the status did not exist, and because the default value is not taken into account in the SQL definition
-		// The value is set from null to planned in the setup program
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('planned,running,idle,error'), "sql"=>"status", "default_value"=>"planned", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("started", array("allowed_values"=>null, "sql"=>"started", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("planned", array("allowed_values"=>null, "sql"=>"planned", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("event_id", array("targetclass"=>"Event", "jointype"=> "", "allowed_values"=>null, "sql"=>"event_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("remaining_retries", array("allowed_values"=>null, "sql"=>"remaining_retries", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("last_error_code", array("allowed_values"=>null, "sql"=>"last_error_code", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("last_attempt", array("allowed_values"=>null, "sql"=>"last_attempt", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	/**
-	 * Every is fine
-	 */
-	const OK = 0;
-	/**
-	 * The task no longer exists
-	 */
-	const DELETED = 1;
-	/**
-	 * The task is already being executed
-	 */
-	const ALREADY_RUNNING = 2;
-
-	/**
-	 *	The current process requests the ownership on the task.
-	 *	In case the task can be accessed concurrently, this function can be overloaded to add a critical section.
-	 *	The function must not block the caller if another process is already owning the task	 
-	 *		 
-	 *	@return integer A code among OK/DELETED/ALREADY_RUNNING.	  	 
-	 */	
-	public function MarkAsRunning()
-	{
-		try
-		{
-			if ($this->Get('status') == 'running')
-			{
-				return self::ALREADY_RUNNING;
-			}
-			else
-			{
-				$this->Set('status', 'running');
-				$this->Set('started', time());
-				$this->DBUpdate();
-				return self::OK;
-			}
-		}
-		catch(Exception $e)
-		{
-			// Corrupted task !! (for example: "Failed to reload object")
-			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$e->getMessage().' - fatal error, deleting the task.');
-	   	if ($this->Get('event_id') != 0)
-	   	{
-	   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-	   		$oEventLog->Set('message', 'Failed, corrupted data: '.$e->getMessage());
-	   		$oEventLog->DBUpdate();
-			}
-			$this->DBDelete();
-			return self::DELETED;
-		}
-	}
-
-	public function GetRetryDelay($iErrorCode = null)
-	{
-		$iRetryDelay = 600;
-		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
-		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
-		{
-			$aConfig = $aRetries[get_class($this)];
-			$iRetryDelay = $aConfig['retry_delay'];
-		}
-		return $iRetryDelay;
-	}
-
-	public function GetMaxRetries($iErrorCode = null)
-	{
-		$iMaxRetries = 0;
-		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
-		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
-		{
-			$aConfig = $aRetries[get_class($this)];
-			$iMaxRetries = $aConfig['max_retries'];
-		}
-	}
-
-	/**
-	 * Override to notify people that a task cannot be performed
-	 */
-	protected function OnDefinitiveFailure()
-	{
-	}
-
-  	protected function OnInsert()
-	{
-		$this->Set('created', time());
-	}
-
-   /**
-    * @return boolean True if the task record can be deleted
-    */
-	public function Process()
-	{
-		// By default: consider that the task is not completed
-		$bRet = false;
-
-		// Attempt to take the ownership
-		$iStatus = $this->MarkAsRunning();
-		if ($iStatus == self::OK)
-		{
-			try
-			{
-				$sStatus = $this->DoProcess();
-				if ($this->Get('event_id') != 0)
-				{
-					$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-					$oEventLog->Set('message', $sStatus);
-					$oEventLog->DBUpdate();
-				}
-				$bRet = true;
-			} catch (Exception $e)
-			{
-				$this->HandleError($e->getMessage(), $e->getCode());
-			}
-		}
-		else
-		{
-			// Already done or being handled by another process... skip...
-			$bRet = false;
-		}
-
-		return $bRet;
-	}
-
-	/**
-	 * Overridable to extend the behavior in case of error (logging)
-	 */
-	protected function HandleError($sErrorMessage, $iErrorCode)
-	{
-		if ($this->Get('last_attempt') == '')
-		{
-			// First attempt
-			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
-		}
-
-		$this->Set('last_error', $sErrorMessage);
-		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
-		$this->Set('last_attempt', time());
-
-		$iRemaining = $this->Get('remaining_retries');
-		if ($iRemaining > 0)
-		{
-			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
-			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
-			if ($this->Get('event_id') != 0)
-			{
-				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s'");
-                try
-                {
-                    $oEventLog->DBUpdate();
-                }
-                catch (Exception $e)
-                {
-                    $oEventLog->Set('message', "Failed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s', more details in the log");
-                    $oEventLog->DBUpdate();
-                }
-			}
-			$this->Set('remaining_retries', $iRemaining - 1);
-			$this->Set('status', 'planned');
-			$this->Set('started', null);
-			$this->Set('planned', time() + $iRetryDelay);
-		}
-		else
-		{
-			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
-			if ($this->Get('event_id') != 0)
-			{
-				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
-				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task.");
-				try
-				{
-                    $oEventLog->DBUpdate();
-				}
-				catch (Exception $e)
-				{
-                    $oEventLog->Set('message', 'Failed to process async task, more details in the log');
-                    $oEventLog->DBUpdate();
-				}
-			}
-			$this->Set('status', 'error');
-			$this->Set('started', null);
-			$this->Set('planned', null);
-			$this->OnDefinitiveFailure();
-		}
-		$this->DBUpdate();
-	}
-
-	/**
-	 * Throws an exception (message and code)
-	 */	 	
-	abstract public function DoProcess();
-
-	/**
-	 * Describes the error codes that DoProcess can return by the mean of exceptions	
-	 */	
-	static public function EnumErrorCodes()
-	{
-		return array();
-	}
-}
-
-/**
- * An email notification  
- *
- * @package     iTopORM
- */
-class AsyncSendEmail extends AsyncTask
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "created",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_async_send_email",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>Email::ORIGINAL_FORMAT, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLongText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-//		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
-//		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	static public function AddToQueue(EMail $oEMail, $oLog)
-	{
-		$oNew = MetaModel::NewObject(__class__);
-		if ($oLog)
-		{
-			$oNew->Set('event_id', $oLog->GetKey());
-		}
-		$oNew->Set('to', $oEMail->GetRecipientTO(true /* string */));
-		$oNew->Set('subject', $oEMail->GetSubject());
-
-//		$oNew->Set('version', 1);
-//		$sMessage = serialize($oEMail);
-		$oNew->Set('version', 2);
-		$sMessage = $oEMail->SerializeV2();
-		$oNew->Set('message', $sMessage);
-		$oNew->DBInsert();
-	}
-
-	public function DoProcess()
-	{
-		$sMessage = $this->Get('message');
-		$iVersion = (int) $this->Get('version');
-		switch($iVersion)
-		{
-			case Email::FORMAT_V2:
-			$oEMail = Email::UnSerializeV2($sMessage);				
-			break;
-			
-			case Email::ORIGINAL_FORMAT:
-			$oEMail = unserialize($sMessage);				
-			break;
-			
-			default:
-			return 'Unknown version of the serialization format: '.$iVersion;				
-		}
-		$iRes = $oEMail->Send($aIssues, true /* force synchro !!!!! */);
-		switch ($iRes)
-		{
-		case EMAIL_SEND_OK:
-			return "Sent";
-
-		case EMAIL_SEND_PENDING:
-			return "Bug - the email should be sent in synchronous mode";
-
-		case EMAIL_SEND_ERROR:
-			return "Failed: ".implode(', ', $aIssues);
-		}
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent classes (internal): user defined actions
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class ExecAsyncTask implements iBackgroundProcess
+{
+	public function GetPeriodicity()
+	{	
+		return 2; // seconds
+	}
+
+	public function Process($iTimeLimit)
+	{
+		$sNow = date(AttributeDateTime::GetSQLFormat());
+		// Criteria: planned, and expected to occur... ASAP or in the past
+		$sOQL = "SELECT AsyncTask WHERE (status = 'planned') AND (ISNULL(planned) OR (planned < '$sNow'))";
+		$iProcessed = 0;
+		while (time() < $iTimeLimit)
+		{
+			// Next one ?
+			$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL($sOQL), array('created' => true) /* order by*/, array(), null, 1 /* limit count */);
+			$oTask = $oSet->Fetch();
+			if (is_null($oTask))
+			{
+				// Nothing to be done
+				break;
+			}
+			$iProcessed++;
+			if ($oTask->Process())
+			{
+				$oTask->DBDelete();
+			}
+		}
+		return "processed $iProcessed tasks";
+	}
+}
+
+/**
+ * A   
+ *
+ * @package     iTopORM
+ */
+abstract class AsyncTask extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => array('created'),
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_task",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+
+		// Null is allowed to ease the migration from iTop 2.0.2 and earlier, when the status did not exist, and because the default value is not taken into account in the SQL definition
+		// The value is set from null to planned in the setup program
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('planned,running,idle,error'), "sql"=>"status", "default_value"=>"planned", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDateTime("created", array("allowed_values"=>null, "sql"=>"created", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("started", array("allowed_values"=>null, "sql"=>"started", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("planned", array("allowed_values"=>null, "sql"=>"planned", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("event_id", array("targetclass"=>"Event", "jointype"=> "", "allowed_values"=>null, "sql"=>"event_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("remaining_retries", array("allowed_values"=>null, "sql"=>"remaining_retries", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("last_error_code", array("allowed_values"=>null, "sql"=>"last_error_code", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("last_attempt", array("allowed_values"=>null, "sql"=>"last_attempt", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	/**
+	 * Every is fine
+	 */
+	const OK = 0;
+	/**
+	 * The task no longer exists
+	 */
+	const DELETED = 1;
+	/**
+	 * The task is already being executed
+	 */
+	const ALREADY_RUNNING = 2;
+
+	/**
+	 *	The current process requests the ownership on the task.
+	 *	In case the task can be accessed concurrently, this function can be overloaded to add a critical section.
+	 *	The function must not block the caller if another process is already owning the task	 
+	 *		 
+	 *	@return integer A code among OK/DELETED/ALREADY_RUNNING.	  	 
+	 */	
+	public function MarkAsRunning()
+	{
+		try
+		{
+			if ($this->Get('status') == 'running')
+			{
+				return self::ALREADY_RUNNING;
+			}
+			else
+			{
+				$this->Set('status', 'running');
+				$this->Set('started', time());
+				$this->DBUpdate();
+				return self::OK;
+			}
+		}
+		catch(Exception $e)
+		{
+			// Corrupted task !! (for example: "Failed to reload object")
+			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$e->getMessage().' - fatal error, deleting the task.');
+	   	if ($this->Get('event_id') != 0)
+	   	{
+	   		$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+	   		$oEventLog->Set('message', 'Failed, corrupted data: '.$e->getMessage());
+	   		$oEventLog->DBUpdate();
+			}
+			$this->DBDelete();
+			return self::DELETED;
+		}
+	}
+
+	public function GetRetryDelay($iErrorCode = null)
+	{
+		$iRetryDelay = 600;
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
+		{
+			$aConfig = $aRetries[get_class($this)];
+			$iRetryDelay = $aConfig['retry_delay'];
+		}
+		return $iRetryDelay;
+	}
+
+	public function GetMaxRetries($iErrorCode = null)
+	{
+		$iMaxRetries = 0;
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
+		{
+			$aConfig = $aRetries[get_class($this)];
+			$iMaxRetries = $aConfig['max_retries'];
+		}
+	}
+
+	/**
+	 * Override to notify people that a task cannot be performed
+	 */
+	protected function OnDefinitiveFailure()
+	{
+	}
+
+  	protected function OnInsert()
+	{
+		$this->Set('created', time());
+	}
+
+   /**
+    * @return boolean True if the task record can be deleted
+    */
+	public function Process()
+	{
+		// By default: consider that the task is not completed
+		$bRet = false;
+
+		// Attempt to take the ownership
+		$iStatus = $this->MarkAsRunning();
+		if ($iStatus == self::OK)
+		{
+			try
+			{
+				$sStatus = $this->DoProcess();
+				if ($this->Get('event_id') != 0)
+				{
+					$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+					$oEventLog->Set('message', $sStatus);
+					$oEventLog->DBUpdate();
+				}
+				$bRet = true;
+			} catch (Exception $e)
+			{
+				$this->HandleError($e->getMessage(), $e->getCode());
+			}
+		}
+		else
+		{
+			// Already done or being handled by another process... skip...
+			$bRet = false;
+		}
+
+		return $bRet;
+	}
+
+	/**
+	 * Overridable to extend the behavior in case of error (logging)
+	 */
+	protected function HandleError($sErrorMessage, $iErrorCode)
+	{
+		if ($this->Get('last_attempt') == '')
+		{
+			// First attempt
+			$this->Set('remaining_retries', $this->GetMaxRetries($iErrorCode));
+		}
+
+		$this->Set('last_error', $sErrorMessage);
+		$this->Set('last_error_code', $iErrorCode); // Note: can be ZERO !!!
+		$this->Set('last_attempt', time());
+
+		$iRemaining = $this->Get('remaining_retries');
+		if ($iRemaining > 0)
+		{
+			$iRetryDelay = $this->GetRetryDelay($iErrorCode);
+			IssueLog::Info('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage.' - remaining retries: '.$iRemaining.' - next retry in '.$iRetryDelay.'s');
+			if ($this->Get('event_id') != 0)
+			{
+				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s'");
+                try
+                {
+                    $oEventLog->DBUpdate();
+                }
+                catch (Exception $e)
+                {
+                    $oEventLog->Set('message', "Failed to process async task. Remaining retries: '.$iRemaining.'. Next retry in '.$iRetryDelay.'s', more details in the log");
+                    $oEventLog->DBUpdate();
+                }
+			}
+			$this->Set('remaining_retries', $iRemaining - 1);
+			$this->Set('status', 'planned');
+			$this->Set('started', null);
+			$this->Set('planned', time() + $iRetryDelay);
+		}
+		else
+		{
+			IssueLog::Error('Failed to process async task #'.$this->GetKey().' - reason: '.$sErrorMessage);
+			if ($this->Get('event_id') != 0)
+			{
+				$oEventLog = MetaModel::GetObject('Event', $this->Get('event_id'));
+				$oEventLog->Set('message', "$sErrorMessage\nFailed to process async task.");
+				try
+				{
+                    $oEventLog->DBUpdate();
+				}
+				catch (Exception $e)
+				{
+                    $oEventLog->Set('message', 'Failed to process async task, more details in the log');
+                    $oEventLog->DBUpdate();
+				}
+			}
+			$this->Set('status', 'error');
+			$this->Set('started', null);
+			$this->Set('planned', null);
+			$this->OnDefinitiveFailure();
+		}
+		$this->DBUpdate();
+	}
+
+	/**
+	 * Throws an exception (message and code)
+	 */	 	
+	abstract public function DoProcess();
+
+	/**
+	 * Describes the error codes that DoProcess can return by the mean of exceptions	
+	 */	
+	static public function EnumErrorCodes()
+	{
+		return array();
+	}
+}
+
+/**
+ * An email notification  
+ *
+ * @package     iTopORM
+ */
+class AsyncSendEmail extends AsyncTask
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "created",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_async_send_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>Email::ORIGINAL_FORMAT, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLongText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+//		MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'reply_to', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); // Attributes to be displayed for the complete details
+//		MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	static public function AddToQueue(EMail $oEMail, $oLog)
+	{
+		$oNew = MetaModel::NewObject(__class__);
+		if ($oLog)
+		{
+			$oNew->Set('event_id', $oLog->GetKey());
+		}
+		$oNew->Set('to', $oEMail->GetRecipientTO(true /* string */));
+		$oNew->Set('subject', $oEMail->GetSubject());
+
+//		$oNew->Set('version', 1);
+//		$sMessage = serialize($oEMail);
+		$oNew->Set('version', 2);
+		$sMessage = $oEMail->SerializeV2();
+		$oNew->Set('message', $sMessage);
+		$oNew->DBInsert();
+	}
+
+	public function DoProcess()
+	{
+		$sMessage = $this->Get('message');
+		$iVersion = (int) $this->Get('version');
+		switch($iVersion)
+		{
+			case Email::FORMAT_V2:
+			$oEMail = Email::UnSerializeV2($sMessage);				
+			break;
+			
+			case Email::ORIGINAL_FORMAT:
+			$oEMail = unserialize($sMessage);				
+			break;
+			
+			default:
+			return 'Unknown version of the serialization format: '.$iVersion;				
+		}
+		$iRes = $oEMail->Send($aIssues, true /* force synchro !!!!! */);
+		switch ($iRes)
+		{
+		case EMAIL_SEND_OK:
+			return "Sent";
+
+		case EMAIL_SEND_PENDING:
+			return "Bug - the email should be sent in synchronous mode";
+
+		case EMAIL_SEND_ERROR:
+			return "Failed: ".implode(', ', $aIssues);
+		}
+	}
+}
+?>
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 732faf2d1..205e45901 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -1,8133 +1,8133 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Typology for the attributes
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license	 http://opensource.org/licenses/AGPL-3.0
- */
-
-
-require_once('MyHelpers.class.inc.php');
-require_once('ormdocument.class.inc.php');
-require_once('ormstopwatch.class.inc.php');
-require_once('ormpassword.class.inc.php');
-require_once('ormcaselog.class.inc.php');
-require_once('ormlinkset.class.inc.php');
-require_once('htmlsanitizer.class.inc.php');
-require_once(APPROOT.'sources/autoload.php');
-require_once('customfieldshandler.class.inc.php');
-require_once('ormcustomfieldsvalue.class.inc.php');
-require_once('datetimeformat.class.inc.php');
-// This should be changed to a use when we go full-namespace
-require_once(APPROOT . 'sources/form/validator/validator.class.inc.php');
-require_once(APPROOT . 'sources/form/validator/notemptyextkeyvalidator.class.inc.php');
-
-/**
- * MissingColumnException - sent if an attribute is being created but the column is missing in the row 
- *
- * @package	 iTopORM
- */
-class MissingColumnException extends Exception
-{}
-
-/**
- * add some description here... 
- *
- * @package	 iTopORM
- */
-define('EXTKEY_RELATIVE', 1);
-
-/**
- * add some description here... 
- *
- * @package	 iTopORM
- */
-define('EXTKEY_ABSOLUTE', 2);
-
-/**
- * Propagation of the deletion through an external key - ask the user to delete the referencing object 
- *
- * @package	 iTopORM
- */
-define('DEL_MANUAL', 1);
-
-/**
- * Propagation of the deletion through an external key - ask the user to delete the referencing object 
- *
- * @package	 iTopORM
- */
-define('DEL_AUTO', 2);
-/**
- * Fully silent delete... not yet implemented
- */
-define('DEL_SILENT', 2);
-/**
- * For HierarchicalKeys only: move all the children up one level automatically
- */
-define('DEL_MOVEUP', 3);
-
-
-/**
- * For Link sets: tracking_level
- *
- * @package	 iTopORM
- */
-define('ATTRIBUTE_TRACKING_NONE', 0); // Do not track changes of the attribute
-define('ATTRIBUTE_TRACKING_ALL', 3); // Do track all changes of the attribute
-define('LINKSET_TRACKING_NONE', 0); // Do not track changes in the link set
-define('LINKSET_TRACKING_LIST', 1); // Do track added/removed items
-define('LINKSET_TRACKING_DETAILS', 2); // Do track modified items
-define('LINKSET_TRACKING_ALL', 3); // Do track added/removed/modified items
-
-define('LINKSET_EDITMODE_NONE', 0); // The linkset cannot be edited at all from inside this object
-define('LINKSET_EDITMODE_ADDONLY', 1); // The only possible action is to open a new window to create a new object
-define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
-define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
-define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
-
-
-/**
- * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.) 
- *
- * @package	 iTopORM
- */
-abstract class AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE_RAW = 'raw';
-	const SEARCH_WIDGET_TYPE_STRING = 'string';
-	const SEARCH_WIDGET_TYPE_NUMERIC = 'numeric';
-	const SEARCH_WIDGET_TYPE_ENUM = 'enum';
-	const SEARCH_WIDGET_TYPE_EXTERNAL_KEY = 'external_key';
-	const SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY = 'hierarchical_key';
-	const SEARCH_WIDGET_TYPE_EXTERNAL_FIELD = 'external_field';
-	const SEARCH_WIDGET_TYPE_DATE_TIME = 'date_time';
-	const SEARCH_WIDGET_TYPE_DATE = 'date';
-
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	const INDEX_LENGTH = 95;
-
-	public function GetType()
-	{
-		return Dict::S('Core:'.get_class($this));
-	}
-	public function GetTypeDesc()
-	{
-		return Dict::S('Core:'.get_class($this).'+');
-	}
-
-	abstract public function GetEditClass();
-
-	/**
-	 * Return the search widget type corresponding to this attribute
-	 *
-	 * @return string
-	 */
-	public function GetSearchType()
-	{
-		return static::SEARCH_WIDGET_TYPE;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function IsSearchable()
-	{
-		return static::SEARCH_WIDGET_TYPE != static::SEARCH_WIDGET_TYPE_RAW;
-	}
-
-	protected $m_sCode;
-	private $m_aParams = array();
-	protected $m_sHostClass = '!undefined!';
-	public function Get($sParamName) {return $this->m_aParams[$sParamName];}
-
-	public function GetIndexLength() {
-		$iMaxLength = $this->GetMaxSize();
-		if (is_null($iMaxLength))
-		{
-			return null;
-		}
-		if ($iMaxLength > static::INDEX_LENGTH)
-		{
-			return static::INDEX_LENGTH;
-		}
-		return $iMaxLength;
-	}
-
-	public function IsParam($sParamName) {return (array_key_exists($sParamName, $this->m_aParams));}
-
-	protected function GetOptional($sParamName, $default)
-	{
-		if (array_key_exists($sParamName, $this->m_aParams))
-		{
-			return $this->m_aParams[$sParamName];
-		}
-		else
-		{
-			return $default;
-		}
-	}
-	
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$this->m_aParams = $aParams;
-		$this->ConsistencyCheck();
-	}
-
-	public function GetParams()
-	{
-		return $this->m_aParams;
-	}
-
-	public function HasParam($sParam)
-	{
-		return array_key_exists($sParam, $this->m_aParams);
-	}
-
-	public function SetHostClass($sHostClass)
-	{
-		$this->m_sHostClass = $sHostClass;
-	}
-	public function GetHostClass()
-	{
-		return $this->m_sHostClass;
-	}
-
-	public function ListSubItems()
-	{
-		$aSubItems = array();
-		foreach(MetaModel::ListAttributeDefs($this->m_sHostClass) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeSubItem)
-			{
-				if ($oAttDef->Get('target_attcode') == $this->m_sCode)
-				{
-					$aSubItems[$sAttCode] = $oAttDef;
-				}
-			}
-		}
-		return $aSubItems;
-	}
-
-	// Note: I could factorize this code with the parameter management made for the AttributeDef class
-	// to be overloaded
-	static public function ListExpectedParams()
-	{
-		return array();
-	}
-
-	private function ConsistencyCheck()
-	{
-		// Check that any mandatory param has been specified
-		//
-		$aExpectedParams = $this->ListExpectedParams();
-		foreach($aExpectedParams as $sParamName)
-		{
-			if (!array_key_exists($sParamName, $this->m_aParams))
-			{
-				$aBacktrace = debug_backtrace();
-				$sTargetClass = $aBacktrace[2]["class"];
-				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
-				throw new Exception("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
-			}
-		}
-	}
-
-	/**
-	 * Check the validity of the given value
-	 *
-	 * @param DBObject $oHostObject
-	 * @param string An error if any, null otherwise
-	 *
-	 * @return bool
-	 */
-	public function CheckValue(DBObject $oHostObject, $value)
-	{
-		// todo: factorize here the cases implemented into DBObject
-		return true;
-	}
-
-	// table, key field, name field
-	public function ListDBJoins()
-	{
-		return "";
-		// e.g: return array("Site", "infrid", "name");
-	}
-
-	public function GetFinalAttDef()
-	{
-		return $this;
-	}
-
-	/**
-	 * Deprecated - use IsBasedOnDBColumns instead
-	 * @return bool
-	 */
-	public function IsDirectField() {return static::IsBasedOnDBColumns();}
-
-	/**
-	 * Returns true if the attribute value is built after DB columns
-	 * @return bool
-	 */
-	static public function IsBasedOnDBColumns() {return false;}
-	/**
-	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
-	 * @return bool
-	 */
-	static public function IsBasedOnOQLExpression() {return false;}
-	/**
-	 * Returns true if the attribute value can be shown as a string
-	 * @return bool
-	 */
-	static public function IsScalar() {return false;}
-	/**
-	 * Returns true if the attribute value is a set of related objects (1-N or N-N)
-	 * @return bool
-	 */
-	static public function IsLinkSet() {return false;}
-	/**
-	 * Returns true if the attribute is an external key, either directly (RELATIVE to the host class), or indirectly (ABSOLUTELY)
-	 * @return bool
-	 */
-	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return false;}
-	/**
-	 * Returns true if the attribute value is an external key, pointing to the host class
-	 * @return bool
-	 */
-	static public function IsHierarchicalKey() {return false;}
-	/**
-	 * Returns true if the attribute value is stored on an object pointed to be an external key
-	 * @return bool
-	 */
-	static public function IsExternalField() {return false;}
-	/**
-	 * Returns true if the attribute can be written (by essence : metamodel field option)
-	 *
-	 * @return bool
-	 * @see \DBObject::IsAttributeReadOnlyForCurrentState() for a specific object instance (depending on its workflow)
-	 */
-	public function IsWritable() {return false;}
-	/**
-	 * Returns true if the attribute has been added automatically by the framework
-	 * @return bool
-	 */
-	public function IsMagic() {return $this->GetOptional('magic', false);}
-	/**
-	 * Returns true if the attribute value is kept in the loaded object (in memory)
-	 * @return bool
-	 */
-	static public function LoadInObject() {return true;}
-	/**
-	 * Returns true if the attribute value comes from the database in one way or another
-	 * @return bool
-	 */
-	static public function LoadFromDB() {return true;}
-	/**
-	 * Returns true if the attribute should be loaded anytime (in addition to the column selected by the user)
-	 * @return bool
-	 */
-	public function AlwaysLoadInTables() {return $this->GetOptional('always_load_in_tables', false);}
-	/**
-	 * Must return the value if LoadInObject returns false
-	 * @return mixed
-	 */
-	public function GetValue($oHostObject){return null;}
-	/**
-	 * Returns true if the attribute must not be stored if its current value is "null" (Cf. IsNull())
-	 * @return bool
-	 */
-	public function IsNullAllowed() {return true;}
-	/**
-	 * Returns the attribute code (identifies the attribute in the host class)
-	 * @return string
-	 */
-	public function GetCode() {return $this->m_sCode;}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute() {return null;}
-
-	/**
-	 * Helper to browse the hierarchy of classes, searching for a label
-	 */	 	
-	protected function SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly)
-	{
-		$sLabel = Dict::S('Class:'.$this->m_sHostClass.$sDictEntrySuffix, '', $bUserLanguageOnly);
-		if (strlen($sLabel) == 0)
-		{
-			// Nothing found: go higher in the hierarchy (if possible)
-			//
-			$sLabel = $sDefault;
-			$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
-			if ($sParentClass)
-			{
-				if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
-					$sLabel = $oAttDef->SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly);
-				}
-			}
-		}
-		return $sLabel;
-	}
-
-	public function GetLabel($sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = str_replace('_', ' ', $this->m_sCode);
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, $sDefault, false);
-		}
-		return $sLabel;
-	}
-
-	/**
-	 * Get the label corresponding to the given value (in plain text)
-	 * To be overloaded for localized enums
-	 */
-	public function GetValueLabel($sValue)
-	{
-		return $sValue;
-	}
-
-	/**
-	 * Get the value from a given string (plain text, CSV import)
-	 * Return null if no match could be found	 
-	 */
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		return $this->MakeRealValue($sProposedValue, null);
-	}
-
-	/**
-	 * Parses a search string coming from user input
-	 * @param string $sSearchString
-	 * @return string
-	 */
-	public function ParseSearchString($sSearchString)
-	{
-		return $sSearchString;
-	}
-	public function GetLabel_Obsolete()
-	{
-		// Written for compatibility with a data model written prior to version 0.9.1
-		if (array_key_exists('label', $this->m_aParams))
-		{
-			return $this->m_aParams['label'];
-		}
-		else
-		{
-			return $this->GetLabel();
-		}
-	}
-
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = '';
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', $sDefault, false);
-		}
-		return $sLabel;
-	}
-
-	public function GetHelpOnEdition($sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = '';
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', $sDefault, false);
-		}
-		return $sLabel;
-	} 
-
-	public function GetHelpOnSmartSearch()
-	{
-		$aParents = array_merge(array(get_class($this) => get_class($this)), class_parents($this));
-		foreach ($aParents as $sClass)
-		{
-			$sHelp = Dict::S("Core:$sClass?SmartSearch", '-missing-');
-			if ($sHelp != '-missing-')
-			{
-				return $sHelp;
-			}
-		} 
-		return '';
-	} 
-
-	public function GetDescription_Obsolete()
-	{
-		// Written for compatibility with a data model written prior to version 0.9.1
-		if (array_key_exists('description', $this->m_aParams))
-		{
-			return $this->m_aParams['description'];
-		}
-		else
-		{
-			return $this->GetDescription();
-		}
-	}
-
-	public function GetTrackingLevel()
-	{
-		return $this->GetOptional('tracking_level', ATTRIBUTE_TRACKING_ALL);
-	}
-
-	public function GetValuesDef() {return null;} 
-	public function GetPrerequisiteAttributes($sClass = null) {return array();}
-
-	public function GetNullValue() {return null;} 
-	public function IsNull($proposedValue) {return is_null($proposedValue);} 
-
-	public function MakeRealValue($proposedValue, $oHostObj) {return $proposedValue;} // force an allowed value (type conversion and possibly forces a value as mySQL would do upon writing!)
-	public function Equals($val1, $val2) {return ($val1 == $val2);}
-
-	public function GetSQLExpressions($sPrefix = '') {return array();} // returns suffix/expression pairs (1 in most of the cases), for READING (Select)
-	public function FromSQLToValue($aCols, $sPrefix = '') {return null;} // returns a value out of suffix/value pairs, for SELECT result interpretation
-
-	/**
-	 * @param bool $bFullSpec
-	 *
-	 * @return array column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
-	 * @see \CMDBSource::GetFieldSpec()
-	 */
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		return array();
-	}
-
-	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
-	public function RequiresIndex() {return false;}
-	public function CopyOnAllTables() {return false;}
-
-	public function GetOrderBySQLExpressions($sClassAlias)
-	{
-		// Note: This is the responsibility of this function to place backticks around column aliases
-		return array('`'.$sClassAlias.$this->GetCode().'`');
-	}
-	
-	public function GetOrderByHint()
-	{
-		return '';
-	}
-
-   // Import - differs slightly from SQL input, but identical in most cases
-   //
-	public function GetImportColumns() {return $this->GetSQLColumns();}
-	public function FromImportToValue($aCols, $sPrefix = '')
-	{
-		$aValues = array();
-		foreach ($this->GetSQLExpressions($sPrefix) as $sAlias => $sExpr)
-		{
-			// This is working, based on the assumption that importable fields
-			// are not computed fields => the expression is the name of a column
-			$aValues[$sPrefix.$sAlias] = $aCols[$sExpr];
-		}
-		return $this->FromSQLToValue($aValues, $sPrefix);
-	}
-
-	public function GetValidationPattern()
-	{
-		return '';
-	}
-	
-	public function CheckFormat($value)
-	{
-		return true;
-	}
-	 
-	public function GetMaxSize()
-	{
-		return null;
-	}
-	 
-	public function MakeValue()
-	{
-		$sComputeFunc = $this->Get("compute_func");
-		if (empty($sComputeFunc)) return null;
-
-		return call_user_func($sComputeFunc);
-	}
-	
-	abstract public function GetDefaultValue(DBObject $oHostObject = null);
-
-	//
-	// To be overloaded in subclasses
-	//
-	
-	abstract public function GetBasicFilterOperators(); // returns an array of "opCode"=>"description"
-	abstract public function GetBasicFilterLooseOperator(); // returns an "opCode"
-	//abstract protected GetBasicFilterHTMLInput();
-	abstract public function GetBasicFilterSQLExpr($sOpCode, $value); 
-
-	public function GetFilterDefinitions()
-	{
-		return array();
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return (string)$sValue;
-	}
-	
-	/**
-	 * For fields containing a potential markup, return the value without this markup
-	 * @return string
-	 */
-	public function GetAsPlainText($sValue, $oHostObj = null)
-	{
-		return (string) $this->GetEditValue($sValue, $oHostObj);
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		// In most of the cases, that will be the expected behavior...
-		return $this->GetEditValue($value);
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		// Passthrough in most of the cases
-		return $json;
-	}
-
-	/**
-	 * Override to display the value in the GUI
-	 */	
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html((string)$sValue);
-	}
-
-	/**
-	 * Override to export the value in XML	
-	 */	
-	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2xml((string)$sValue);
-	}
-
-	/**
-	 * Override to escape the value when read by DBObject::GetAsCSV()	
-	 */	
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		return (string)$sValue;
-	}
-
-	/**
-	 * Override to differentiate a value displayed in the UI or in the history
-	 */	
-	public function GetAsHTMLForHistory($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return $this->GetAsHTML($sValue, $oHostObject, $bLocalize);
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\StringField';
-	}
-
-	/**
-	 * Override to specify Field class
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		// This is a fallback in case the AttributeDefinition subclass has no overloading of this function.
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-			//$oFormField->SetReadOnly(true);
-		}
-
-		$oFormField->SetLabel($this->GetLabel());
-
-		// Attributes flags
-		// - Retrieving flags for the current object
-		if ($oObject->IsNew())
-		{
-			$iFlags = $oObject->GetInitialStateAttributeFlags($this->GetCode());
-		}
-		else
-		{
-			$iFlags = $oObject->GetAttributeFlags($this->GetCode());
-		}
-
-		// - Comparing flags
-		if ($this->IsWritable() && (!$this->IsNullAllowed() || (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY)))
-		{
-			$oFormField->SetMandatory(true);
-		}
-		if ((!$oObject->IsNew() || !$oFormField->GetMandatory()) && (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY))
-		{
-			$oFormField->SetReadOnly(true);
-		}
-		
-		// CurrentValue
-		$oFormField->SetCurrentValue($oObject->Get($this->GetCode()));
-
-		// Validation pattern
-		if ($this->GetValidationPattern() !== '')
-		{
-			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\Validator($this->GetValidationPattern()));
-		}
-
-		return $oFormField;
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */	 
-	public function EnumTemplateVerbs()
-	{
-		return array(
-			'' => 'Plain text (unlocalized) representation',
-			'html' => 'HTML representation',
-			'label' => 'Localized representation',
-			'text' => 'Plain text representation (without any markup)',
-		);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 *
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 *
-	 * @return mixed|null|string
-	 * @throws \Exception
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		if ($this->IsScalar())
-		{
-			switch ($sVerb)
-			{
-				case '':
-				return $value;
-				
-				case 'html':
-				return $this->GetAsHtml($value, $oHostObject, $bLocalize);
-				
-				case 'label':
-				return $this->GetEditValue($value);
-				
-				case 'text':
-				return $this->GetAsPlainText($value);
-				break;
-				
-				default:
-				throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
-			}
-		}
-		return null;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oValSetDef = $this->GetValuesDef();
-		if (!$oValSetDef) return null;
-		return $oValSetDef->GetValues($aArgs, $sContains);
-	}
-
-	/**
-	 * Explain the change of the attribute (history)
-	 */	
-	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
-	{
-		if (is_null($sLabel))
-		{
-			$sLabel = $this->GetLabel();
-		}
-
-		$sNewValueHtml = $this->GetAsHTMLForHistory($sNewValue);
-		$sOldValueHtml = $this->GetAsHTMLForHistory($sOldValue);
-
-		if($this->IsExternalKey())
-		{
-			$sTargetClass = $this->GetTargetClass();
-			$sOldValueHtml = (int)$sOldValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sOldValue) : null;
-			$sNewValueHtml = (int)$sNewValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sNewValue) : null;
-		}
-		if ( (($this->GetType() == 'String') || ($this->GetType() == 'Text')) &&
-			 (strlen($sNewValue) > strlen($sOldValue)) )
-		{
-			// Check if some text was not appended to the field
-			if (substr($sNewValue,0, strlen($sOldValue)) == $sOldValue) // Text added at the end
-			{
-				$sDelta = $this->GetAsHTML(substr($sNewValue, strlen($sOldValue)));
-				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
-			}
-			else if (substr($sNewValue, -strlen($sOldValue)) == $sOldValue)   // Text added at the beginning
-			{
-				$sDelta = $this->GetAsHTML(substr($sNewValue, 0, strlen($sNewValue) - strlen($sOldValue)));
-				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
-			}
-			else
-			{
-				if (strlen($sOldValue) == 0)
-				{
-					$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
-				}
-				else
-				{
-					if (is_null($sNewValue))
-					{
-						$sNewValueHtml = Dict::S('UI:UndefinedObject');
-					}
-					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
-				}
-			}
-		}
-		else
-		{
-			if (strlen($sOldValue) == 0)
-			{
-				$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
-			}
-			else
-			{
-				if (is_null($sNewValue))
-				{
-					$sNewValueHtml = Dict::S('UI:UndefinedObject');
-				}
-				$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
-			}
-		}
-		return $sResult;
-	}
-
-
-	/**
-	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
-	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
-	 * does nothing special, and just calls the default (loose) operator
-	 * @param string $sSearchText The search string to analyze for smart patterns
-	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
-	 * @param array $aParams Values of the query parameters
-	 * @return Expression The search condition to be added (AND) to the current search
-	 */
-	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams)
-	{
-		$sParamName = $oField->GetParent().'_'.$oField->GetName();
-		$oRightExpr = new VariableExpression($sParamName);
-		$sOperator = $this->GetBasicFilterLooseOperator();
-		switch ($sOperator)
-		{
-			case 'Contains':
-			$aParams[$sParamName] = "%$sSearchText%";
-			$sSQLOperator = 'LIKE';
-			break;
-			
-			default:
-			$sSQLOperator = $sOperator;
-			$aParams[$sParamName] = $sSearchText;
-		}
-		$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
-		return $oNewCondition;
-	}
-	
-	/**
-	 * Tells if an attribute is part of the unique fingerprint of the object (used for comparing two objects)
-	 * All attributes which value is not based on a value from the object itself (like ExternalFields or LinkedSet)
-	 * must be excluded from the object's signature
-	 * @return boolean
-	 */
-	public function IsPartOfFingerprint()
-	{
-		return true;
-	}
-	
-	/**
-	 * The part of the current attribute in the object's signature, for the supplied value
-	 * @param mixed $value The value of this attribute for the object
-	 * @return string The "signature" for this field/attribute
-	 */
-	public function Fingerprint($value)
-	{
-		return (string)$value;
-	}
-}
-
-/**
- * Set of objects directly linked to an object, and being part of its definition  
- *
- * @package	 iTopORM
- */
-class AttributeLinkedSet extends AttributeDefinition
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "linked_class", "ext_key_to_me", "count_min", "count_max"));
-	}
-
-	public function GetEditClass() {return "LinkedSet";}
-
-	public function IsWritable() {return true;}
-	static public function IsLinkSet() {return true;}
-	public function IsIndirect() {return false;} 
-
-	public function GetValuesDef() {return $this->Get("allowed_values");} 
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$sLinkClass = $this->GetLinkedClass();
-		$sExtKeyToMe = $this->GetExtKeyToMe();
-
-		// The class to target is not the current class, because if this is a derived class,
-		// it may differ from the target class, then things start to become confusing
-		$oRemoteExtKeyAtt = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToMe);
-		$sMyClass = $oRemoteExtKeyAtt->GetTargetClass();
-
-		$oMyselfSearch = new DBObjectSearch($sMyClass);
-		if ($oHostObject !== null)
-		{
-			$oMyselfSearch->AddCondition('id', $oHostObject->GetKey(), '=');
-		}
-
-		$oLinkSearch = new DBObjectSearch($sLinkClass);
-		$oLinkSearch->AddCondition_PointingTo($oMyselfSearch, $sExtKeyToMe);
-		if ($this->IsIndirect())
-		{
-			// Join the remote class so that the archive flag will be taken into account
-			$sExtKeyToRemote = $this->GetExtKeyToRemote();
-			$oExtKeyToRemote = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToRemote);
-			$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-			if (MetaModel::IsArchivable($sRemoteClass))
-			{
-				$oRemoteSearch = new DBObjectSearch($sRemoteClass);
-				$oLinkSearch->AddCondition_PointingTo($oRemoteSearch, $this->GetExtKeyToRemote());
-			}
-		}
-		$oLinks = new DBObjectSet($oLinkSearch);
-		$oLinkSet = new ormLinkSet($this->GetHostClass(), $this->GetCode(), $oLinks);
-		return $oLinkSet;
-	}
-
-	public function GetTrackingLevel()
-	{
-		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_default'));
-	}
-
-	public function GetEditMode()
-	{
-		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}
-	
-	public function GetLinkedClass() {return $this->Get('linked_class');}
-	public function GetExtKeyToMe() {return $this->Get('ext_key_to_me');}
-
-	public function GetBasicFilterOperators() {return array();}
-	public function GetBasicFilterLooseOperator() {return '';}
-	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
-		{
-			$sValue->Rewind();
-			$aItems = array();
-			while ($oObj = $sValue->Fetch())
-			{
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($this->GetLinkedClass()) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField()) continue;
-					$sAttValue = $oObj->GetAsHTML($sAttCode);
-					if (strlen($sAttValue) > 0)
-					{
-						$aAttributes[] = $sAttValue;
-					}
-				}
-				$sAttributes = implode(', ', $aAttributes);
-				$aItems[] = $sAttributes;
-			}
-			return implode('<br/>', $aItems);
-		}
-		return null;
-	}
-
-	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
-		{
-			$sValue->Rewind();
-			$sRes = "<Set>\n";
-			while ($oObj = $sValue->Fetch())
-			{
-				$sObjClass = get_class($oObj);
-				$sRes .= "<$sObjClass id=\"".$oObj->GetKey()."\">\n";
-				// Show only relevant information (hide the external key to the current object)
-				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == 'finalclass')
-					{
-						if ($sObjClass == $this->GetLinkedClass())
-						{
-							// Simplify the output if the exact class could be determined implicitely
-							continue;
-						}
-					}
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField())
-					{
-						if ($oAttDef->GetKeyAttCode() == $this->GetExtKeyToMe()) continue;
-						if ($oAttDef->IsFriendlyName()) continue;
-					}
-					if ($oAttDef instanceof AttributeFriendlyName) continue;
-					if (!$oAttDef->IsScalar()) continue;
-					$sAttValue = $oObj->GetAsXML($sAttCode, $bLocalize);
-					$sRes .= "<$sAttCode>$sAttValue</$sAttCode>\n";
-				}
-				$sRes .= "</$sObjClass>\n";
-			}
-			$sRes .= "</Set>\n";
-		}
-		else
-		{
-			$sRes = '';
-		}
-		return $sRes;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
-		$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
-		$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
-		$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
-
-		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
-		{
-			$sValue->Rewind();
-			$aItems = array();
-			while ($oObj = $sValue->Fetch())
-			{
-				$sObjClass = get_class($oObj);
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == 'finalclass')
-					{
-						if ($sObjClass == $this->GetLinkedClass())
-						{
-							// Simplify the output if the exact class could be determined implicitely 
-							continue;
-						}
-					}
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField()) continue;
-					if (!$oAttDef->IsBasedOnDBColumns()) continue;
-					if (!$oAttDef->IsScalar()) continue;
-					$sAttValue = $oObj->GetAsCSV($sAttCode, $sSepValue, '', $bLocalize);
-					if (strlen($sAttValue) > 0)
-					{
-						$sAttributeData = str_replace($sAttributeQualifier, $sAttributeQualifier.$sAttributeQualifier, $sAttCode.$sSepValue.$sAttValue);
-						$aAttributes[] = $sAttributeQualifier.$sAttributeData.$sAttributeQualifier;
-					}
-				}
-				$sAttributes = implode($sSepAttribute, $aAttributes);
-				$aItems[] = $sAttributes;
-			}
-			$sRes = implode($sSepItem, $aItems);
-		}
-		else
-		{
-			$sRes = '';
-		}
-		$sRes = str_replace($sTextQualifier, $sTextQualifier.$sTextQualifier, $sRes);
-		$sRes = $sTextQualifier.$sRes.$sTextQualifier;
-		return $sRes;
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */	 
-	public function EnumTemplateVerbs()
-	{
-		return array(
-			'' => 'Plain text (unlocalized) representation',
-			'html' => 'HTML representation (unordered list)',
-		);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 *
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		$sRemoteName = $this->IsIndirect() ? $this->GetExtKeyToRemote().'_friendlyname' : 'friendlyname';
-		
-		$oLinkSet = clone $value; // Workaround/Safety net for Trac #887
-		$iLimit = MetaModel::GetConfig()->Get('max_linkset_output');
-		$iCount = 0;
-		$aNames = array();
-		foreach($oLinkSet as $oItem)
-		{
-			if (($iLimit > 0) && ($iCount == $iLimit))
-			{
-				$iTotal = $oLinkSet->Count();
-				$aNames[] = '... '.Dict::Format('UI:TruncatedResults', $iCount, $iTotal);
-				break;
-			}
-			$aNames[] = $oItem->Get($sRemoteName);
-			$iCount++;
-		}
-
-		switch($sVerb)
-		{
-			case '':
-			return implode("\n", $aNames);
-					
-			case 'html':
-			return '<ul><li>'.implode("</li><li>", $aNames).'</li></ul>';
-			
-			default:
-			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
-		}
-	}
-
-	public function DuplicatesAllowed() {return false;} // No duplicates for 1:n links, never
-
-	public function GetImportColumns()
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'TEXT';
-		return $aColumns;
-	}
-
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		if (is_null($sSepItem) || empty($sSepItem))
-		{
-			$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
-		}
-		if (is_null($sSepAttribute) || empty($sSepAttribute))
-		{
-			$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
-		}
-		if (is_null($sSepValue) || empty($sSepValue))
-		{
-			$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
-		}
-		if (is_null($sAttributeQualifier) || empty($sAttributeQualifier))
-		{
-			$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
-		}
-
-		$sTargetClass = $this->Get('linked_class');
-
-		$sInput = str_replace($sSepItem, "\n", $sProposedValue);
-		$oCSVParser = new CSVParser($sInput, $sSepAttribute, $sAttributeQualifier);
-
-		$aInput = $oCSVParser->ToArray(0 /* do not skip lines */);
-
-		$aLinks = array();
-		foreach($aInput as $aRow)
-		{
-			// 1st - get the values, split the extkey->searchkey specs, and eventually get the finalclass value
-			$aExtKeys = array();
-			$aValues = array();
-			foreach($aRow as $sCell)
-			{
-				$iSepPos = strpos($sCell, $sSepValue);
-				if ($iSepPos === false)
-				{
-					// Houston...
-					throw new CoreException('Wrong format for link attribute specification', array('value' => $sCell));
-				}
-
-				$sAttCode = trim(substr($sCell, 0, $iSepPos));
-				$sValue = substr($sCell, $iSepPos + strlen($sSepValue));
-
-				if (preg_match('/^(.+)->(.+)$/', $sAttCode, $aMatches))
-				{
-					$sKeyAttCode = $aMatches[1];
-					$sRemoteAttCode = $aMatches[2];
-					$aExtKeys[$sKeyAttCode][$sRemoteAttCode] = $sValue;
-					if (!MetaModel::IsValidAttCode($sTargetClass, $sKeyAttCode))
-					{
-						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sKeyAttCode));
-					}
-					$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
-					$sRemoteClass = $oKeyAttDef->GetTargetClass();
-					if (!MetaModel::IsValidAttCode($sRemoteClass, $sRemoteAttCode))
-					{
-						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sRemoteClass, 'attcode' => $sRemoteAttCode));
-					}
-				}
-				else
-				{
-					if(!MetaModel::IsValidAttCode($sTargetClass, $sAttCode))
-					{
-						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sAttCode));
-					}
-					$oAttDef = MetaModel::GetAttributeDef($sTargetClass, $sAttCode);
-					$aValues[$sAttCode] = $oAttDef->MakeValueFromString($sValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
-				}
-			}
-
-			// 2nd - Instanciate the object and set the value
-			if (isset($aValues['finalclass']))
-			{
-				$sLinkClass = $aValues['finalclass'];
-				if (!is_subclass_of($sLinkClass, $sTargetClass))
-				{
-					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
-				}
-			}
-			elseif (MetaModel::IsAbstract($sTargetClass))
-			{
-					throw new CoreException('Missing finalclass for link attribute specification');
-			}
-			else
-			{
-				$sLinkClass = $sTargetClass;
-			}
-
-			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach ($aValues as $sAttCode => $sValue)
-			{
-				$oLink->Set($sAttCode, $sValue);
-			}
-
-			// 3rd - Set external keys from search conditions
-			foreach ($aExtKeys as $sKeyAttCode => $aReconciliation)
-			{
-				$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
-				$sKeyClass = $oKeyAttDef->GetTargetClass();
-				$oExtKeyFilter = new DBObjectSearch($sKeyClass);
-				$aReconciliationDesc = array();
-				foreach($aReconciliation as $sRemoteAttCode => $sValue)
-				{
-					$oExtKeyFilter->AddCondition($sRemoteAttCode, $sValue, '=');
-					$aReconciliationDesc[] = "$sRemoteAttCode=$sValue";
-				}
-				$oExtKeySet = new DBObjectSet($oExtKeyFilter);
-				switch($oExtKeySet->Count())
-				{
-				case 0:
-					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
-					throw new CoreException("Found no match", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
-					break;
-				case 1:
-					$oRemoteObj = $oExtKeySet->Fetch();
-					$oLink->Set($sKeyAttCode, $oRemoteObj->GetKey());
-					break;
-				default:
-					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
-					throw new CoreException("Found several matches", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
-					// Found several matches, ambiguous
-				}
-			}
-
-			// Check (roughly) if such a link is valid
-			$aErrors = array();
-			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsExternalKey())
-				{
-					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
-					{
-						continue; // Don't check the key to self
-					}
-				}
-				
-				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
-				{
-					$aErrors[] = $sAttCode;
-				}
-			}
-			if (count($aErrors) > 0)
-			{
-				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
-			}
-
-			$aLinks[] = $oLink;
-		}
-		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
-		return $oSet;
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		$aRet = array();
-		if (is_object($value) && ($value instanceof ormLinkSet))
-		{
-			$value->Rewind();
-			while ($oObj = $value->Fetch())
-			{
-				$sObjClass = get_class($oObj);
-				// Show only relevant information (hide the external key to the current object)
-				$aAttributes = array();
-				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
-				{
-					if ($sAttCode == 'finalclass')
-					{
-						if ($sObjClass == $this->GetLinkedClass())
-						{
-							// Simplify the output if the exact class could be determined implicitely 
-							continue;
-						}
-					}
-					if ($sAttCode == $this->GetExtKeyToMe()) continue;
-					if ($oAttDef->IsExternalField()) continue;
-					if (!$oAttDef->IsBasedOnDBColumns()) continue;
-					if (!$oAttDef->IsScalar()) continue;
-					$attValue = $oObj->Get($sAttCode);
-					$aAttributes[$sAttCode] = $oAttDef->GetForJSON($attValue);
-				}
-				$aRet[] = $aAttributes;
-			}
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		$sTargetClass = $this->Get('linked_class');
-
-		$aLinks = array();
-		foreach($json as $aValues)
-		{
-			if (isset($aValues['finalclass']))
-			{
-				$sLinkClass = $aValues['finalclass'];
-				if (!is_subclass_of($sLinkClass, $sTargetClass))
-				{
-					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
-				}
-			}
-			elseif (MetaModel::IsAbstract($sTargetClass))
-			{
-					throw new CoreException('Missing finalclass for link attribute specification');
-			}
-			else
-			{
-				$sLinkClass = $sTargetClass;
-			}
-
-			$oLink = MetaModel::NewObject($sLinkClass);
-			foreach ($aValues as $sAttCode => $sValue)
-			{
-				$oLink->Set($sAttCode, $sValue);
-			}
-
-			// Check (roughly) if such a link is valid
-			$aErrors = array();
-			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsExternalKey())
-				{
-					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
-					{
-						continue; // Don't check the key to self
-					}
-				}
-				
-				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
-				{
-					$aErrors[] = $sAttCode;
-				}
-			}
-			if (count($aErrors) > 0)
-			{
-				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
-			}
-
-			$aLinks[] = $oLink;
-		}
-		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
-		return $oSet;
-	}
-
-	/**
-	 * @param $proposedValue
-	 * @param $oHostObj
-	 *
-	 * @return mixed
-	 * @throws \Exception
-	 */
-    public function MakeRealValue($proposedValue, $oHostObj){
-        if($proposedValue === null)
-        {
-            $sLinkedClass = $this->GetLinkedClass();
-            $aLinkedObjectsArray = array();
-            $oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
-
-            return new ormLinkSet(
-                get_class($oHostObj),
-                $this->GetCode(),
-                $oSet
-            );
-        }
-
-        return $proposedValue;
-    }
-
-	/**
-	 * @param ormLinkSet $val1
-	 * @param ormLinkSet $val2
-	 * @return bool
-	 */
-	public function Equals($val1, $val2)
-	{
-		if ($val1 === $val2)
-		{
-			$bAreEquivalent = true;
-		}
-		else
-		{
-            $bAreEquivalent = ($val2->HasDelta() === false);
-		}
-		return $bAreEquivalent;
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 *
-	 * @return null | AttributeDefinition
-	 * @throws \Exception
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		$oRemoteAtt = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToMe());
-		return $oRemoteAtt;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\LinkedSetField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		
-		// Setting target class
-		if (!$this->IsIndirect())
-		{
-			$sTargetClass = $this->GetLinkedClass();
-		}
-		else
-		{
-			$oRemoteAttDef = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
-			$sTargetClass = $oRemoteAttDef->GetTargetClass();
-
-			$oFormField->SetExtKeyToRemote($this->GetExtKeyToRemote());
-		}
-		$oFormField->SetTargetClass($sTargetClass);
-		$oFormField->SetIndirect($this->IsIndirect());
-		// Setting attcodes to display
-		$aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
-		// - Adding friendlyname attribute to the list is not already in it
-		$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
-		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay))
-		{
-			$aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
-		}
-		// - Adding attribute labels
-		$aAttributesToDisplay = array();
-		foreach ($aAttCodesToDisplay as $sAttCodeToDisplay)
-		{
-			$oAttDefToDisplay = MetaModel::GetAttributeDef($sTargetClass, $sAttCodeToDisplay);
-			$aAttributesToDisplay[$sAttCodeToDisplay] = $oAttDefToDisplay->GetLabel();
-		}
-		$oFormField->SetAttributesToDisplay($aAttributesToDisplay);
-		
-		parent::MakeFormField($oObject, $oFormField);
-		
-		return $oFormField;
-	}
-
-	public function IsPartOfFingerprint() { return false; }
-}
-
-/**
- * Set of objects linked to an object (n-n), and being part of its definition  
- *
- * @package	 iTopORM
- */
-class AttributeLinkedSetIndirect extends AttributeLinkedSet
-{
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("ext_key_to_remote"));
-	}
-	public function IsIndirect() {return true;} 
-	public function GetExtKeyToRemote() { return $this->Get('ext_key_to_remote'); }
-	public function GetEditClass() {return "LinkedSet";}
-	public function DuplicatesAllowed() {return $this->GetOptional("duplicates", false);} // The same object may be linked several times... or not...
-
-	public function GetTrackingLevel()
-	{
-		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_indirect_default'));
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 * @throws \CoreException
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		$oRet = null;
-		$oExtKeyToRemote = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
-		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
-		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		{
-			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect) continue;
-			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass()) continue;
-			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote()) continue;
-			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe()) continue;
-			$oRet = $oRemoteAttDef;
-			break;
-		}
-		return $oRet;
-	}
-}
-
-/**
- * Abstract class implementing default filters for a DB column  
- *
- * @package	 iTopORM
- */
-class AttributeDBFieldVoid extends AttributeDefinition
-{	
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "sql"));
-	}
-
-	// To be overriden, used in GetSQLColumns
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return 'VARCHAR(255)'
-			.CMDBSource::GetSqlStringColumnDefinition()
-			.($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-	protected function GetSQLColSpec()
-	{
-		$default = $this->ScalarToSQL($this->GetDefaultValue());
-		if (is_null($default))
-		{
-			$sRet = '';
-		}
-		else
-		{
-			if (is_numeric($default))
-			{
-				// Though it is a string in PHP, it will be considered as a numeric value in MySQL
-				// Then it must not be quoted here, to preserve the compatibility with the value returned by CMDBSource::GetFieldSpec
-				$sRet = " DEFAULT $default";
-			}
-			else
-			{
-				$sRet = " DEFAULT ".CMDBSource::Quote($default);
-			}
-		}
-		return $sRet;
-	}
-
-	public function GetEditClass() {return "String";}
-	
-	public function GetValuesDef() {return $this->Get("allowed_values");} 
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return !$this->IsMagic();}
-	public function GetSQLExpr()
-	{
-		return $this->Get("sql");
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
-	public function IsNullAllowed() {return false;}
-
-	// 
-	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $this->Get("sql");
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
-		return $value;
-	}
-	public function GetSQLValues($value)
-	{
-		$aValues = array();
-		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get("sql")] = $this->GetSQLCol($bFullSpec);
-		return $aColumns;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array("="=>"equals", "!="=>"differs from");
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = $sQValue";
-		}
-	} 
-}
-
-/**
- * Base class for all kind of DB attributes, with the exception of external keys 
- *
- * @package	 iTopORM
- */
-class AttributeDBField extends AttributeDBFieldVoid
-{	
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed"));
-	}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue($this->Get("default_value"), $oHostObject);}
-	public function IsNullAllowed() {return $this->Get("is_null_allowed");}
-}
-
-/**
- * Map an integer column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeInteger extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-	
-	public function GetValidationPattern()
-	{
-		return "^[0-9]+$";
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"!="=>"differs from",
-			"="=>"equals",
-			">"=>"greater (strict) than",
-			">="=>"greater than",
-			"<"=>"less (strict) than",
-			"<="=>"less than",
-			"in"=>"in"
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		// Unless we implement an "equals approximately..." or "same order of magnitude"
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '>':
-			return $this->GetSQLExpr()." > $sQValue";
-			break;
-		case '>=':
-			return $this->GetSQLExpr()." >= $sQValue";
-			break;
-		case '<':
-			return $this->GetSQLExpr()." < $sQValue";
-			break;
-		case '<=':
-			return $this->GetSQLExpr()." <= $sQValue";
-			break;
-		case 'in':
-			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
-			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
-			break;
-
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = \"$value\"";
-		}
-	} 
-
-	public function GetNullValue()
-	{
-		return null;
-	} 
-	public function IsNull($proposedValue)
-	{
-		return is_null($proposedValue);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if ($proposedValue === '') return null; // 0 is transformed into '' !
-		return (int)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		assert(is_numeric($value) || is_null($value));
-		return $value; // supposed to be an int
-	}
-}
-
-/**
- * An external key for which the class is defined as the value of another attribute 
- *
- * @package	 iTopORM
- */
-class AttributeObjectKey extends AttributeDBFieldVoid
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array('class_attcode', 'is_null_allowed'));
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
-	public function IsNullAllowed()
-	{
-		return $this->Get("is_null_allowed");
-	}
-
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return parent::GetBasicFilterLooseOperator();
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	public function GetNullValue()
-	{
-		return 0;
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == 0);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return 0;
-		if ($proposedValue === '') return 0;
-		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
-		return (int)$proposedValue;
-	}
-}
-
-/**
- * Display an integer between 0 and 100 as a percentage / horizontal bar graph 
- *
- * @package	 iTopORM
- */
-class AttributePercentage extends AttributeInteger
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$iWidth = 5; // Total width of the percentage bar graph, in em...
-		$iValue = (int)$sValue;
-		if ($iValue > 100)
-		{
-			$iValue = 100;
-		}
-		else if ($iValue < 0)
-		{
-			$iValue = 0;
-		}
-		if ($iValue > 90)
-		{
-			$sColor = "#cc3300";
-		}
-		else if ($iValue > 50)
-		{
-			$sColor = "#cccc00";
-		}
-		else
-		{
-			$sColor = "#33cc00";
-		}
-		$iPercentWidth = ($iWidth * $iValue) / 100;
-		return "<div style=\"width:{$iWidth}em;-moz-border-radius: 3px;-webkit-border-radius: 3px;border-radius: 3px;display:inline-block;border: 1px #ccc solid;\"><div style=\"width:{$iPercentWidth}em; display:inline-block;background-color:$sColor;\">&nbsp;</div></div>&nbsp;$sValue %";
-	}
-}
-
-/**
- * Map a decimal value column (suitable for financial computations) to an attribute
- * internally in PHP such numbers are represented as string. Should you want to perform
- * a calculation on them, it is recommended to use the BC Math functions in order to
- * retain the precision
- *
- * @package	 iTopORM
- */
-class AttributeDecimal extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array('digits', 'decimals' /* including precision */));
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "DECIMAL(".$this->Get('digits').",".$this->Get('decimals').")".($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-	
-	public function GetValidationPattern()
-	{
-		$iNbDigits = $this->Get('digits');
-		$iPrecision = $this->Get('decimals');
-		$iNbIntegerDigits = $iNbDigits - $iPrecision - 1; // -1 because the first digit is treated separately in the pattern below
-		return "^[-+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"!="=>"differs from",
-			"="=>"equals",
-			">"=>"greater (strict) than",
-			">="=>"greater than",
-			"<"=>"less (strict) than",
-			"<="=>"less than",
-			"in"=>"in"
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		// Unless we implement an "equals approximately..." or "same order of magnitude"
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '>':
-			return $this->GetSQLExpr()." > $sQValue";
-			break;
-		case '>=':
-			return $this->GetSQLExpr()." >= $sQValue";
-			break;
-		case '<':
-			return $this->GetSQLExpr()." < $sQValue";
-			break;
-		case '<=':
-			return $this->GetSQLExpr()." <= $sQValue";
-			break;
-		case 'in':
-			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
-			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
-			break;
-
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = \"$value\"";
-		}
-	} 
-
-	public function GetNullValue()
-	{
-		return null;
-	} 
-	public function IsNull($proposedValue)
-	{
-		return is_null($proposedValue);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if ($proposedValue === '') return null;
-		return (string)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		assert(is_null($value) || preg_match('/'.$this->GetValidationPattern().'/', $value));
-		return $value; // null or string
-	}
-}
-
-/**
- * Map a boolean column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeBoolean extends AttributeInteger
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "Integer";}
-	protected function GetSQLCol($bFullSpec = false) {return "TINYINT(1)".($bFullSpec ? $this->GetSQLColSpec() : '');}
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if ($proposedValue === '') return null;
-		if ((int)$proposedValue) return true;
-		return false;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if ($value) return 1;
-		return 0;
-	}
-
-	public function GetValueLabel($bValue)
-	{
-		if (is_null($bValue))
-		{
-			$sLabel = Dict::S('Core:'.get_class($this).'/Value:null');
-		}
-		else
-		{
-			$sValue = $bValue ? 'yes' : 'no';
-			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue);
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, true /*user lang*/);
-		}
-		return $sLabel;
-	}
-
-	public function GetValueDescription($bValue)
-	{
-		if (is_null($bValue))
-		{
-			$sDescription = Dict::S('Core:'.get_class($this).'/Value:null+');
-		}
-		else
-		{
-			$sValue = $bValue ? 'yes' : 'no';
-			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue.'+');
-			$sDescription = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue.'+', $sDefault, true /*user lang*/);
-		}
-		return $sDescription;
-	}
-
-	public function GetAsHTML($bValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_null($bValue))
-		{
-			$sRes = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sLabel = $this->GetValueLabel($bValue);
-			$sDescription = $this->GetValueDescription($bValue);
-			// later, we could imagine a detailed description in the title
-			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
-		}
-		else
-		{
-			$sRes = $bValue ? 'yes' : 'no';
-		}
-		return $sRes;
-	}
-
-	public function GetAsXML($bValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_null($bValue))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($bValue);
-		}
-		else
-		{
-			$sFinalValue = $bValue ? 'yes' : 'no';
-		}
-		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	public function GetAsCSV($bValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (is_null($bValue))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($bValue);
-		}
-		else
-		{
-			$sFinalValue = $bValue ? 'yes' : 'no';
-		}
-		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-
-		$oFormField->SetChoices(array('yes' => $this->GetValueLabel(true), 'no' => $this->GetValueLabel(false)));
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		if (is_null($value))
-		{
-			return '';
-		}
-		else
-		{
-			return $this->GetValueLabel($value);
-		}
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue
-	 */
-	public function GetForJSON($value)
-	{
-		return (bool)$value;
-	}
-
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		$sInput = strtolower(trim($sProposedValue));
-		if ($bLocalizedValue)
-		{
-			switch ($sInput)
-			{
-				case '1': // backward compatibility
-				case $this->GetValueLabel(true):
-					$value = true;
-					break;
-				case '0': // backward compatibility
-				case 'no':
-				case $this->GetValueLabel(false):
-					$value = false;
-					break;
-				default:
-					$value = null;
-			}
-		}
-		else
-		{
-			switch ($sInput)
-			{
-				case '1': // backward compatibility
-				case 'yes':
-					$value = true;
-					break;
-				case '0': // backward compatibility
-				case 'no':
-					$value = false;
-					break;
-				default:
-					$value = null;
-			}
-		}
-		return $value;
-	}
-}
-
-/**
- * Map a varchar column (size < ?) to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeString extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "String";}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return 'VARCHAR(255)'
-			.CMDBSource::GetSqlStringColumnDefinition()
-			.($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-
-	public function GetValidationPattern()
-	{
-		$sPattern = $this->GetOptional('validation_pattern', '');
-		if (empty($sPattern))
-		{
-			return parent::GetValidationPattern();
-		}
-		else
-		{
-			return $sPattern;
-		}
-	}
-
-	public function CheckFormat($value)
-	{
-		$sRegExp = $this->GetValidationPattern();
-		if (empty($sRegExp))
-		{
-			return true;
-		}
-		else
-		{
-			$sRegExp = str_replace('/', '\\/', $sRegExp);
-			return preg_match("/$sRegExp/", $value);
-		}
-	}
-
-	public function GetMaxSize()
-	{
-		return 255;
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"="=>"equals",
-			"!="=>"differs from",
-			"Like"=>"equals (no case)",
-			"NotLike"=>"differs from (no case)",
-			"Contains"=>"contains",
-			"Begins with"=>"begins with",
-			"Finishes with"=>"finishes with"
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return "Contains";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '=':
-		case '!=':
-			return $this->GetSQLExpr()." $sOpCode $sQValue";
-		case 'Begins with':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("$value%");
-		case 'Finishes with':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value");
-		case 'Contains':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
-		case 'NotLike':
-			return $this->GetSQLExpr()." NOT LIKE $sQValue";
-		case 'Like':
-		default:
-			return $this->GetSQLExpr()." LIKE $sQValue";
-		}
-	} 
-
-	public function GetNullValue()
-	{
-		return '';
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == '');
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return '';
-		return (string)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (!is_string($value) && !is_null($value))
-		{
-			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
-		}
-		return $value;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	public function GetDisplayStyle()
-	{
-		return $this->GetOptional('display_style', 'select');
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\StringField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * An attibute that matches an object class 
- *
- * @package	 iTopORM
- */
-class AttributeClass extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("class_category", "more_values"));
-	}
-
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$aParams["allowed_values"] = new ValueSetEnumClasses($aParams['class_category'], $aParams['more_values']);
-		parent::__construct($sCode, $aParams);
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$sDefault = parent::GetDefaultValue($oHostObject);
-		if (!$this->IsNullAllowed() && $this->IsNull($sDefault))
-		{
-			// For this kind of attribute specifying null as default value
-			// is authorized even if null is not allowed
-			
-			// Pick the first one...
-			$aClasses = $this->GetAllowedValues();
-			$sDefault = key($aClasses);
-		}
-		return $sDefault;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($sValue)) return '';
-		return MetaModel::GetName($sValue);
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-	
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-	
-}
-
-/**
- * An attibute that matches one of the language codes availables in the dictionnary 
- *
- * @package	 iTopORM
- */
-class AttributeApplicationLanguage extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-	}
-
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$aAvailableLanguages = Dict::GetLanguages();
-		$aLanguageCodes = array();
-		foreach($aAvailableLanguages as $sLangCode => $aInfo)
-		{
-			$aLanguageCodes[$sLangCode] = $aInfo['description'].' ('.$aInfo['localized_description'].')';
-		}
-		$aParams["allowed_values"] = new ValueSetEnum($aLanguageCodes);
-		parent::__construct($sCode, $aParams);
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-	
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-}
-
-/**
- * The attribute dedicated to the finalclass automatic attribute 
- *
- * @package	 iTopORM
- */
-class AttributeFinalClass extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-	public $m_sValue;
-
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$aParams["allowed_values"] = null;
-		parent::__construct($sCode, $aParams);
-
-		$this->m_sValue = $this->Get("default_value");
-	}
-
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	public function SetFixedValue($sValue)
-	{
-		$this->m_sValue = $sValue;
-	}
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return $this->m_sValue;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($sValue)) return '';
-		if ($bLocalize)
-		{
-			return MetaModel::GetName($sValue);
-		}
-		else
-		{
-			return $sValue;
-		}
-	}
-
-	/**
-	 * An enum can be localized
-	 */
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		if ($bLocalizedValue)
-		{
-			// Lookup for the value matching the input
-			//
-			$sFoundValue = null;
-			$aRawValues = self::GetAllowedValues();
-			if (!is_null($aRawValues))
-			{
-				foreach ($aRawValues as $sKey => $sValue)
-				{
-					if ($sProposedValue == $sValue)
-					{
-						$sFoundValue = $sKey;
-						break;
-					}
-				}
-			}
-			if (is_null($sFoundValue))
-			{
-				return null;
-			}
-			return $this->MakeRealValue($sFoundValue, null);
-		}
-		else
-		{
-			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
-		}
-	}
-
-
-	// Because this is sometimes used to get a localized/string version of an attribute...
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if (empty($sValue)) return '';
-		return MetaModel::GetName($sValue);
-	}
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue
-	 */
-	public function GetForJSON($value)
-	{
-		// JSON values are NOT localized
-		return $value;
-	}
-	
- 	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if ($bLocalize && $value != '')
-		{
-			$sRawValue = MetaModel::GetName($value);
-		}
-		else
-		{
-			$sRawValue = $value;
-		}
-		return parent::GetAsCSV($sRawValue, $sSeparator, $sTextQualifier, null, false, $bConvertToPlainText);
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($value)) return '';
-		if ($bLocalize)
-		{
-			$sRawValue = MetaModel::GetName($value);
-		}
-		else
-		{
-			$sRawValue = $value;
-		}
-		return Str::pure2xml($sRawValue);
-	}
-
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-	
-	public function GetValueLabel($sValue)
-	{
-		if (empty($sValue)) return '';
-		return MetaModel::GetName($sValue);
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$aRawValues = MetaModel::EnumChildClasses($this->GetHostClass(), ENUM_CHILD_CLASSES_ALL);
-		$aLocalizedValues = array();
-		foreach ($aRawValues as $sClass)
-		{
-			$aLocalizedValues[$sClass] = MetaModel::GetName($sClass);
-		}
-  		return $aLocalizedValues;
-  	}
-}
-
-
-/**
- * Map a varchar column (size < ?) to an attribute that must never be shown to the user 
- *
- * @package	 iTopORM
- */
-class AttributePassword extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "Password";}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "VARCHAR(64)"
-			.CMDBSource::GetSqlStringColumnDefinition()
-			.($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-
-	public function GetMaxSize()
-	{
-		return 64;
-	}
-
-	public function GetFilterDefinitions()
-	{
-	// Note: due to this, you will get an error if a password is being declared as a search criteria (see ZLists)
-		// not allowed to search on passwords!
-		return array();
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (strlen($sValue) == 0)
-		{
-			return '';
-		}
-		else
-		{
-			return '******';
-		}
-	}
-	
-	public function IsPartOfFingerprint() { return false; } // Cannot reliably compare two encrypted passwords since the same password will be encrypted in diffferent manners depending on the random 'salt'
-}
-
-/**
- * Map a text column (size < 255) to an attribute that is encrypted in the database
- * The encryption is based on a key set per iTop instance. Thus if you export your
- * database (in SQL) to someone else without providing the key at the same time
- * the encrypted fields will remain encrypted
- *
- * @package	 iTopORM
- */
-class AttributeEncryptedString extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static $sKey = null; // Encryption key used for all encrypted fields
-
-	public function __construct($sCode, $aParams)
-	{
-		parent::__construct($sCode, $aParams);
-		if (self::$sKey == null)
-		{
-			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
-		}
-	}
-	/**
-	 * When the attribute definitions are stored in APC cache:
-	 * 1) The static class variable $sKey is NOT serialized
-	 * 2) The object's constructor is NOT called upon wakeup
-	 * 3) mcrypt may crash the server if passed an empty key !!
-	 * 
-	 * So let's restore the key (if needed) when waking up
-	 **/
-	public function __wakeup()
-	{
-		if (self::$sKey == null)
-		{
-			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
-		}
-	}
-	
-
-	protected function GetSQLCol($bFullSpec = false) {return "TINYBLOB";}	
-
-	public function GetMaxSize()
-	{
-		return 255;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		// Note: due to this, you will get an error if a an encrypted field is declared as a search criteria (see ZLists)
-		// not allowed to search on encrypted fields !
-		return array();
-	}
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		return (string)$proposedValue;
-	}
-
-	/**
-	 * Decrypt the value when reading from the database
-	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
- 		$oSimpleCrypt = new SimpleCrypt();
- 		$sValue = $oSimpleCrypt->Decrypt(self::$sKey, $aCols[$sPrefix]);
-		return $sValue;
-	}
-
-	/**
-	 * Encrypt the value before storing it in the database
-	 */
-	public function GetSQLValues($value)
-	{
- 		$oSimpleCrypt = new SimpleCrypt();
- 		$encryptedValue = $oSimpleCrypt->Encrypt(self::$sKey, $value);
-
-		$aValues = array();
-		$aValues[$this->Get("sql")] = $encryptedValue;
-		return $aValues;
-	}
-}
-
-
-// Wiki formatting - experimental
-//
-// [[<objClass>:<objName>]]
-// Example: [[Server:db1.tnut.com]]
-define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)\]\]/U');
-
-
-/**
- * Map a text column (size > ?) to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeText extends AttributeString
-{
-	public function GetEditClass() {return ($this->GetFormat() == 'text') ? 'Text' : "HTML";}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "TEXT".CMDBSource::GetSqlStringColumnDefinition();
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get('sql')] = $this->GetSQLCol($bFullSpec);
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')".CMDBSource::GetSqlStringColumnDefinition();
-			if ($bFullSpec)
-			{
-				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'text'"; // default 'text' is for migrating old records
-			}
-		}
-		return $aColumns;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->Get('sql');
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix;
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns['_format'] = $sPrefix.'_format';
-		}
-		return $aColumns;
-	}
-	
-	public function GetMaxSize()
-	{
-		// Is there a way to know the current limitation for mysql?
-		// See mysql_field_len()
-		return 65535;
-	}
-
-	static public function RenderWikiHtml($sText, $bWikiOnly = false)
-	{
-		if (!$bWikiOnly)
-		{
-			$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
-			if (preg_match_all($sPattern, $sText, $aAllMatches, PREG_SET_ORDER /* important !*/ |PREG_OFFSET_CAPTURE /* important ! */))
-			{
-				$i = count($aAllMatches);
-				// Replace the URLs by an actual hyperlink <a href="...">...</a>
-				// Let's do it backwards so that the initial positions are not modified by the replacement
-				// This works if the matches are captured: in the order they occur in the string  AND
-				// with their offset (i.e. position) inside the string
-				while($i > 0)
-				{
-					$i--;
-					$sUrl = $aAllMatches[$i][0][0]; // String corresponding to the main pattern
-					$iPos = $aAllMatches[$i][0][1]; // Position of the main pattern
-					$sText = substr_replace($sText, "<a href=\"$sUrl\">$sUrl</a>", $iPos, strlen($sUrl));
-					
-				}
-			}
-		}
-		if (preg_match_all(WIKI_OBJECT_REGEXP, $sText, $aAllMatches, PREG_SET_ORDER))
-		{
-			foreach($aAllMatches as $iPos => $aMatches)
-			{
-				$sClass = trim($aMatches[1]);
-				$sName = trim($aMatches[2]);
-				
-				if (MetaModel::IsValidClass($sClass))
-				{
-					$oObj = MetaModel::GetObjectByName($sClass, $sName, false /* MustBeFound */);
-					if (is_object($oObj))
-					{
-						// Propose a std link to the object
-						$sText = str_replace($aMatches[0], $oObj->GetHyperlink(), $sText);
-					}
-					else
-					{
-						// Propose a std link to the object
-						$sClassLabel = MetaModel::GetName($sClass);
-						$sText = str_replace($aMatches[0], "<span class=\"wiki_broken_link\">$sClassLabel:$sName</span>", $sText);
-						// Later: propose a link to create a new object
-						// Anyhow... there is no easy way to suggest default values based on the given FRIENDLY name
-						//$sText = preg_replace('/\[\[(.+):(.+)\]\]/', '<a href="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&default[att1]=xxx&default[att2]=yyy">'.$sName.'</a>', $sText);
-					}
-				}
-			}
-		}
-		return $sText;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$aStyles = array();
-		if ($this->GetWidth() != '')
-		{
-			$aStyles[] = 'width:'.$this->GetWidth();
-		}
-		if ($this->GetHeight() != '')
-		{
-			$aStyles[] = 'height:'.$this->GetHeight();
-		}
-		$sStyle = '';
-		if (count($aStyles) > 0)
-		{
-			$aStyles[] = 'overflow:auto';
-			$sStyle = 'style="'.implode(';', $aStyles).'"';
-		}
-		
-		if ($this->GetFormat() == 'text')
-		{
-			$sValue = parent::GetAsHTML($sValue, $oHostObject, $bLocalize);
-			$sValue = self::RenderWikiHtml($sValue);
-			return "<div $sStyle>".str_replace("\n", "<br>\n", $sValue).'</div>';			
-		}
-		else
-		{
-			$sValue = self::RenderWikiHtml($sValue, true /* wiki only */);
-			return "<div class=\"HTML\" $sStyle>".InlineImage::FixUrls($sValue).'</div>';
-		}
-		
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if ($this->GetFormat() == 'text')
-		{
-			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
-			{
-				foreach($aAllMatches as $iPos => $aMatches)
-				{
-					$sClass = $aMatches[1];
-					$sName = $aMatches[2];
-
-					if (MetaModel::IsValidClass($sClass))
-					{
-						$sClassLabel = MetaModel::GetName($sClass);
-						$sValue = str_replace($aMatches[0], "[[$sClassLabel:$sName]]", $sValue);
-					}
-				}
-			}
-		}
-		else
-		{
-			$sValue = str_replace('&', '&amp;', $sValue);
-		}
-		return $sValue;
-	}
-
-	/**
-	 * For fields containing a potential markup, return the value without this markup
-	 * @return string
-	 */
-	public function GetAsPlainText($sValue, $oHostObj = null)
-	{
-		if ($this->GetFormat() == 'html')
-		{
-			return (string) utils::HtmlToText($this->GetEditValue($sValue, $oHostObj));
-		}
-		else
-		{
-			return parent::GetAsPlainText($sValue, $oHostObj);
-		}
-	}
-	
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$sValue = $proposedValue;
-		switch ($this->GetFormat())
-		{
-			case 'html':
-			if (($sValue !== null) && ($sValue !== ''))
-			{
-				$sValue = HTMLSanitizer::Sanitize($sValue);
-			}
-			break;
-			
-			case 'text':
-			default:
-			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
-			{
-				foreach($aAllMatches as $iPos => $aMatches)
-				{
-					$sClassLabel = $aMatches[1];
-					$sName = $aMatches[2];
-
-					if (!MetaModel::IsValidClass($sClassLabel))
-					{
-						$sClass = MetaModel::GetClassFromLabel($sClassLabel);
-						if ($sClass)
-						{
-							$sValue = str_replace($aMatches[0], "[[$sClass:$sName]]", $sValue);
-						}
-					}
-				}
-			}
-		}
-		return $sValue;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2xml($value);
-	}
-	
-	public function GetWidth()
-	{
-		return $this->GetOptional('width', '');		
-	}
-	
-	public function GetHeight()
-	{
-		return $this->GetOptional('height', '');		
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\TextAreaField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode(), null, $oObject);
-			$oFormField->SetFormat($this->GetFormat());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	/**
-	 * The actual formatting of the field: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'text');
-	}
-	
-	/**
-	 * Read the value from the row returned by the SQL query and transorms it to the appropriate
-	 * internal format (either text or html)
-	 * @see AttributeDBFieldVoid::FromSQLToValue()
-	 */
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$value = $aCols[$sPrefix.''];
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Read from the extra column only if the property 'format' is specified for the attribute
-			$sFormat = $aCols[$sPrefix.'_format'];
-		}
-		else
-		{
-			$sFormat = $this->GetFormat();
-		}
-		
-		switch($sFormat)
-		{
-			case 'text':
-			if ($this->GetFormat() == 'html')
-			{
-				$value = utils::TextToHtml($value);
-			}
-			break;
-			
-			case 'html':
-			if ($this->GetFormat() == 'text')
-			{
-				$value = utils::HtmlToText($value);
-			}
-			else
-			{
-				$value = InlineImage::FixUrls((string)$value);
-			}
-			break;
-			
-			default:
-			// unknown format ??
-		}
-		return $value;
-	}
-	
-	public function GetSQLValues($value)
-	{
-		$aValues = array();
-		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aValues[$this->Get("sql").'_format'] = $this->GetFormat();
-		}
-		return $aValues;
-	}	
-	
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		switch($this->GetFormat())
-		{
-			case 'html':
-			if ($bConvertToPlainText)
-			{
-				$sValue = utils::HtmlToText((string)$sValue);
-			}
-			$sFrom = array("\r\n", $sTextQualifier);
-			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-			$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-			return $sTextQualifier.$sEscaped.$sTextQualifier;
-			break;
-			
-			case 'text':
-			default:
-			return parent::GetAsCSV($sValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
-		}
-	}
-}
-
-/**
- * Map a log to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeLongText extends AttributeText
-{
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "LONGTEXT".CMDBSource::GetSqlStringColumnDefinition();
-	}
-
-	public function GetMaxSize()
-	{
-		// Is there a way to know the current limitation for mysql?
-		// See mysql_field_len()
-		return 65535*1024; // Limited... still 64 Mb!
-	}
-}
-
-/**
- * An attibute that stores a case log (i.e journal) 
- *
- * @package	 iTopORM
- */
-class AttributeCaseLog extends AttributeLongText
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-
-	public function GetNullValue()
-	{
-		return '';
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		if (!($proposedValue instanceof ormCaseLog))
-		{
-			return ($proposedValue == '');
-		}
-		return ($proposedValue->GetText() == '');
-	} 
-
-	public function ScalarToSQL($value)
-	{
-		if (!is_string($value) && !is_null($value))
-		{
-			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetCode(), 'attribute' => $this->GetHostClass()));
-		}
-		return $value;
-	}
-	public function GetEditClass() {return "CaseLog";}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if (!($sValue instanceOf ormCaseLog))
-		{
-			return '';
-		}
-		return $sValue->GetModifiedEntry();
-	}
-
-	/**
-	 * For fields containing a potential markup, return the value without this markup
-	 * @return string
-	 */
-	public function GetAsPlainText($value, $oHostObj = null)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-
-			return $value->GetAsPlainText();
-		}
-		else
-		{
-			return (string) $value;
-		}
-	}
-	
-	public function GetDefaultValue(DBObject $oHostObject = null) {return new ormCaseLog();}
-	public function Equals($val1, $val2) {return ($val1->GetText() == $val2->GetText());}
-	
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if ($proposedValue instanceof ormCaseLog)
-		{
-			// Passthrough
-			$ret = clone $proposedValue;
-		}
-		else
-		{
-			// Append the new value if an instance of the object is supplied
-			//
-			$oPreviousLog = null;
-			if ($oHostObj != null)
-			{
-				$oPreviousLog = $oHostObj->Get($this->GetCode());
-				if (!is_object($oPreviousLog))
-				{
-					$oPreviousLog = $oHostObj->GetOriginal($this->GetCode());;
-				}
-				
-			}
-			if (is_object($oPreviousLog))
-			{
-				$oCaseLog = clone($oPreviousLog);
-			}
-			else
-			{
-				$oCaseLog = new ormCaseLog();
-			}
-
-			if ($proposedValue instanceof stdClass)
-			{
-				$oCaseLog->AddLogEntryFromJSON($proposedValue);
-			}
-			else
-			{
-				if (strlen($proposedValue) > 0)
-				{
-					$oCaseLog->AddLogEntry($proposedValue);
-				}
-			}
-			$ret = $oCaseLog;
-		}
-		return $ret;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->Get('sql');
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix;
-		$aColumns['_index'] = $sPrefix.'_index';
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		if (!array_key_exists($sPrefix, $aCols))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$sLog = $aCols[$sPrefix];
-
-		if (isset($aCols[$sPrefix.'_index'])) 
-		{
-			$sIndex = $aCols[$sPrefix.'_index'];
-		}
-		else
-		{
-			// For backward compatibility, allow the current state to be: 1 log, no index
-			$sIndex = '';
-		}
-
-		if (strlen($sIndex) > 0)
-		{ 
-			$aIndex = unserialize($sIndex);
-			$value = new ormCaseLog($sLog, $aIndex);
-		}
-		else
-		{
-			$value = new ormCaseLog($sLog);
-		}
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		if (!($value instanceOf ormCaseLog))
-		{
-			$value = new ormCaseLog('');
-		}
-		$aValues = array();
-		$aValues[$this->GetCode()] = $value->GetText();
-		$aValues[$this->GetCode().'_index'] = serialize($value->GetIndex());
-
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'LONGTEXT' // 2^32 (4 Gb)
-			.CMDBSource::GetSqlStringColumnDefinition();
-		$aColumns[$this->GetCode().'_index'] = 'BLOB';
-		return $aColumns;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-			$sContent = $value->GetAsHTML(null, false, array(__class__, 'RenderWikiHtml'));
-		}
-		else
-		{
-			$sContent = '';
-		}
-		$aStyles = array();
-		if ($this->GetWidth() != '')
-		{
-			$aStyles[] = 'width:'.$this->GetWidth();
-		}
-		if ($this->GetHeight() != '')
-		{
-			$aStyles[] = 'height:'.$this->GetHeight();
-		}
-		$sStyle = '';
-		if (count($aStyles) > 0)
-		{
-			$sStyle = 'style="'.implode(';', $aStyles).'"';
-		}
-		return "<div class=\"caselog\" $sStyle>".$sContent.'</div>';	}
-
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-			return parent::GetAsCSV($value->GetText($bConvertToPlainText), $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
-		}
-		else
-		{
-			return '';
-		}
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if ($value instanceOf ormCaseLog)
-		{
-			return parent::GetAsXML($value->GetText(), $oHostObject, $bLocalize);
-		}
-		else
-		{
-			return '';
-		}
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */	 
-	public function EnumTemplateVerbs()
-	{
-		return array(
-			'' => 'Plain text representation of all the log entries',
-			'head' => 'Plain text representation of the latest entry',
-			'head_html' => 'HTML representation of the latest entry',
-			'html' => 'HTML representation of all the log entries',
-		);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 *
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 *
-	 * @return mixed
-	 * @throws \Exception
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		switch($sVerb)
-		{
-			case '':
-			return $value->GetText(true);
-			
-			case 'head':
-			return $value->GetLatestEntry('text');
-
-			case 'head_html':
-			return $value->GetLatestEntry('html');
-			
-			case 'html':
-			return $value->GetAsEmailHtml();
-	
-			default:
-			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
-		}
-	}
-	
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		return $value->GetForJSON();
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		if (is_string($json))
-		{
-			// Will be correctly handled in MakeRealValue
-			$ret = $json;
-		}
-		else
-		{
-			if (isset($json->add_item))
-			{
-				// Will be correctly handled in MakeRealValue
-				$ret = $json->add_item;
-				if (!isset($ret->message))
-				{
-					throw new Exception("Missing mandatory entry: 'message'");
-				}
-			}
-			else
-			{
-				$ret = ormCaseLog::FromJSON($json);
-			}
-		}
-		return $ret;
-	}
-	
-	public function Fingerprint($value)
-	{
-		$sFingerprint = '';
-		if ($value instanceOf ormCaseLog)
-		{
-			$sFingerprint = $value->GetText();
-		}
-		return $sFingerprint;
-	}
-	
-	/**
-	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'html'); // default format for case logs is now HTML
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\CaseLogField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		// First we call the parent so the field is build
-		$oFormField = parent::MakeFormField($oObject, $oFormField);
-		// Then only we set the value
-		$oFormField->SetCurrentValue($this->GetEditValue($oObject->Get($this->GetCode())));
-		// And we set the entries
-		$oFormField->SetEntries($oObject->Get($this->GetCode())->GetAsArray());
-
-		return $oFormField;
-	}
-}
-
-/**
- * Map a text column (size > ?), containing HTML code, to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeHTML extends AttributeLongText
-{
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
-			if ($bFullSpec)
-			{
-				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
-			}
-		}
-		return $aColumns;
-	}
-
-	/**
-	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'html'); // Defaults to HTML
-	}
-}
-
-/**
- * Specialization of a string: email 
- *
- * @package	 iTopORM
- */
-class AttributeEmailAddress extends AttributeString
-{
-	public function GetValidationPattern()
-	{
-		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('email_validation_pattern').'$');
-	}
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\EmailField';
-    }
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if (empty($sValue)) return '';
-
-		$sUrlDecorationClass = utils::GetConfig()->Get('email_decoration_class');
-
-		return '<a class="mailto" href="mailto:'.$sValue.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
-	}
-}
-
-/**
- * Specialization of a string: IP address 
- *
- * @package	 iTopORM
- */
-class AttributeIPAddress extends AttributeString
-{
-	public function GetValidationPattern()
-	{
-		$sNum = '(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])';
-		return "^($sNum\\.$sNum\\.$sNum\\.$sNum)$";
-	}
-
-	public function GetOrderBySQLExpressions($sClassAlias)
-	{
-		// Note: This is the responsibility of this function to place backticks around column aliases
-		return array('INET_ATON(`'.$sClassAlias.$this->GetCode().'`)');
-	}
-}
-
-/**
- * Specialization of a string: phone number
- *
- * @package	 iTopORM
- */
-class AttributePhoneNumber extends AttributeString
-{
-    public function GetValidationPattern()
-    {
-        return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('phone_number_validation_pattern').'$');
-    }
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\PhoneField';
-    }
-
-    public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-    {
-        if (empty($sValue)) return '';
-
-        $sUrlDecorationClass = utils::GetConfig()->Get('phone_number_decoration_class');
-        $sUrlPattern = utils::GetConfig()->Get('phone_number_url_pattern');
-        $sUrl = sprintf($sUrlPattern, $sValue);
-
-        return '<a class="tel" href="'.$sUrl.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
-    }
-}
-
-/**
- * Specialization of a string: OQL expression 
- *
- * @package	 iTopORM
- */
-class AttributeOQL extends AttributeText
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-
-	public function GetEditClass() {return "OQLExpression";}
-}
-
-/**
- * Specialization of a string: template (contains iTop placeholders like $current_contact_id$ or $this->name$) 
- *
- * @package	 iTopORM
- */
-class AttributeTemplateString extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-}
-
-/**
- * Specialization of a text: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
- *
- * @package	 iTopORM
- */
-class AttributeTemplateText extends AttributeText
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-}
-
-/**
- * Specialization of a HTML: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
- *
- * @package	 iTopORM
- */
-class AttributeTemplateHTML extends AttributeText
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
-		if ($this->GetOptional('format', null) != null )
-		{
-			// Add the extra column only if the property 'format' is specified for the attribute
-			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
-			if ($bFullSpec)
-			{
-				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
-			}
-		}
-		return $aColumns;
-	}
-
-	/**
-	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
-	 * @return string
-	 */
-	public function GetFormat()
-	{
-		return $this->GetOptional('format', 'html'); // Defaults to HTML
-	}
-}
-
-
-/**
- * Map a enum column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeEnum extends AttributeString
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "String";}
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		$oValDef = $this->GetValuesDef();
-		if ($oValDef)
-		{
-			$aValues = CMDBSource::Quote(array_keys($oValDef->GetValues(array(), "")), true);
-		}
-		else
-		{
-			$aValues = array();
-		}
-		if (count($aValues) > 0)
-		{
-			// The syntax used here do matters
-			// In particular, I had to remove unnecessary spaces to
-			// make sure that this string will match the field type returned by the DB
-			// (used to perform a comparison between the current DB format and the data model)
-			return "ENUM(".implode(",", $aValues).")"
-				.CMDBSource::GetSqlStringColumnDefinition()
-				.($bFullSpec ? $this->GetSQLColSpec() : '');
-		}
-		else
-		{
-			return "VARCHAR(255)"
-				.CMDBSource::GetSqlStringColumnDefinition()
-				.($bFullSpec ? " DEFAULT ''" : ""); // ENUM() is not an allowed syntax!
-		}
-	}
-	
-	protected function GetSQLColSpec()
-	{
-		$default = $this->ScalarToSQL($this->GetDefaultValue());
-		if (is_null($default))
-		{
-			$sRet = '';
-		}
-		else
-		{
-			// ENUMs values are strings so the default value must be a string as well,
-			// otherwise MySQL interprets the number as the zero-based index of the value in the list (i.e. the nth value in the list)
-			$sRet = " DEFAULT ".CMDBSource::Quote($default);
-		}
-		return $sRet;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		// Note: for strings, the null value is an empty string and it is recorded as such in the DB
-		//	   but that wasn't working for enums, because '' is NOT one of the allowed values
-		//	   that's why a null value must be forced to a real null
-		$value = parent::ScalarToSQL($value);
-		if ($this->IsNull($value))
-		{
-			return null;
-		}
-		else
-		{
-			return $value;
-		}
-	}
-
-	public function RequiresIndex()
-	{
-		return false;
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	public function GetValueLabel($sValue)
-	{
-		if (is_null($sValue))
-		{
-			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
-			$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, Dict::S('Enum:Undefined'));
-		}
-		else
-		{
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, null, true /*user lang*/);
-			if (is_null($sLabel))
-			{
-				$sDefault = str_replace('_', ' ', $sValue);
-				// Browse the hierarchy again, accepting default (english) translations
-				$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, false);
-			}
-		}
-		return $sLabel;
-	}
-
-	public function GetValueDescription($sValue)
-	{
-		if (is_null($sValue))
-		{
-			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
-			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', Dict::S('Enum:Undefined'));
-		}
-		else
-		{
-			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', '', true /* user language only */);
-			if (strlen($sDescription) == 0)
-			{
-				$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
-				if ($sParentClass)
-				{
-					if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
-					{
-						$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
-						$sDescription = $oAttDef->GetValueDescription($sValue);
-					}
-				}
-			}
-		}
-		return $sDescription;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		if ($bLocalize)
-		{
-			$sLabel = $this->GetValueLabel($sValue);
-			$sDescription = $this->GetValueDescription($sValue);
-			// later, we could imagine a detailed description in the title
-			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
-		}
-		else
-		{
-			$sRes = parent::GetAsHtml($sValue, $oHostObject, $bLocalize);
-		}
-		return $sRes;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_null($value))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($value);
-		}
-		else
-		{
-			$sFinalValue = $value;
-		}
-		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (is_null($sValue))
-		{
-			$sFinalValue = '';
-		}
-		elseif ($bLocalize)
-		{
-			$sFinalValue = $this->GetValueLabel($sValue);
-		}
-		else
-		{
-			$sFinalValue = $sValue;
-		}
-		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
-		return $sRes;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-
-		$oFormField->SetChoices($this->GetAllowedValues($oObject->ToArgsForQuery()));
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		if (is_null($sValue))
-		{
-			return '';
-		}
-		else
-		{
-			return $this->GetValueLabel($sValue);
-		}
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		return $value;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$aRawValues = parent::GetAllowedValues($aArgs, $sContains);
-		if (is_null($aRawValues)) return null;
-		$aLocalizedValues = array();
-		foreach ($aRawValues as $sKey => $sValue)
-		{
-			$aLocalizedValues[$sKey] = $this->GetValueLabel($sKey);
-		}
-  		return $aLocalizedValues;
-  	}
-
-  	public function GetMaxSize()
-    {
-	    return null;
-    }
-
-	/**
-	 * An enum can be localized
-	 */	 	
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		if ($bLocalizedValue)
-		{
-			// Lookup for the value matching the input
-			//
-			$sFoundValue = null;
-			$aRawValues = parent::GetAllowedValues();
-			if (!is_null($aRawValues))
-			{
-				foreach ($aRawValues as $sKey => $sValue)
-				{
-					$sRefValue = $this->GetValueLabel($sKey);
-					if ($sProposedValue == $sRefValue)
-					{
-						$sFoundValue = $sKey;
-						break;
-					}
-				}
-			}
-			if (is_null($sFoundValue))
-			{
-				return null;
-			}
-	  		return $this->MakeRealValue($sFoundValue, null);
-		}
-		else
-		{
-			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
-		}
-	}
-
-  	/**
-  	 * Processes the input value to align it with the values supported
-  	 * by this type of attribute. In this case: turns empty strings into nulls
-  	 * @param mixed $proposedValue The value to be set for the attribute
-  	 * @return mixed The actual value that will be set
-  	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if ($proposedValue == '') return null;
-		return parent::MakeRealValue($proposedValue, $oHostObj);
-	}
-	
-	public function GetOrderByHint()
-	{
-		$aValues = $this->GetAllowedValues();
-	
-		return Dict::Format('UI:OrderByHint_Values', implode(', ', $aValues));
-	}
-}
-
-/**
- * A meta enum is an aggregation of enum from subclasses into an enum of a base class
- * It has been designed is to cope with the fact that statuses must be defined in leaf classes, while it makes sense to
- * have a superstatus available on the root classe(s)
- *
- * @package	 iTopORM
- */
-class AttributeMetaEnum extends AttributeEnum
-{
-	static public function ListExpectedParams()
-	{
-		return array('allowed_values', 'sql', 'default_value', 'mapping');
-	}
-
-	public function IsNullAllowed()
-	{
-		return false; // Well... this actually depends on the mapping
-	}
-
-	public function IsWritable()
-	{
-		return false;
-	}
-
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	public function GetPrerequisiteAttributes($sClass = null)
-	{
-		if (is_null($sClass))
-		{
-			$sClass = $this->GetHostClass();
-		}
-		$aMappingData = $this->GetMapRule($sClass);
-		if ($aMappingData == null)
-		{
-			$aRet = array();
-		}
-		else
-		{
-			$aRet = array($aMappingData['attcode']);
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Overload the standard so as to leave the data unsorted
-	 *
-	 * @param array $aArgs
-	 * @param string $sContains
-	 * @return array|null
-	 */
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oValSetDef = $this->GetValuesDef();
-		if (!$oValSetDef) return null;
-		$aRawValues = $oValSetDef->GetValueList();
-
-		if (is_null($aRawValues)) return null;
-		$aLocalizedValues = array();
-		foreach ($aRawValues as $sKey => $sValue)
-		{
-			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
-		}
-		return $aLocalizedValues;
-	}
-
-	/**
-	 * Returns the meta value for the given object.
-	 * See also MetaModel::RebuildMetaEnums() that must be maintained when MapValue changes
-	 *
-	 * @param $oObject
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function MapValue($oObject)
-	{
-		$aMappingData = $this->GetMapRule(get_class($oObject));
-		if ($aMappingData == null)
-		{
-			$sRet = $this->GetDefaultValue();
-		}
-		else
-		{
-			$sAttCode = $aMappingData['attcode'];
-			$value = $oObject->Get($sAttCode);
-			if (array_key_exists($value, $aMappingData['values']))
-			{
-				$sRet = $aMappingData['values'][$value];
-			}
-			elseif ($this->GetDefaultValue() != '')
-			{
-				$sRet = $this->GetDefaultValue();
-			}
-			else
-			{
-				throw new Exception('AttributeMetaEnum::MapValue(): mapping not found for value "'.$value.'" in '.get_class($oObject).', on attribute '.MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()).'::'.$this->GetCode());
-			}
-		}
-		return $sRet;
-	}
-
-	public function GetMapRule($sClass)
-	{
-		$aMappings = $this->Get('mapping');
-		if (array_key_exists($sClass, $aMappings))
-		{
-			$aMappingData = $aMappings[$sClass];
-		}
-		else
-		{
-			$sParent = MetaModel::GetParentClass($sClass);
-			if (is_null($sParent))
-			{
-				$aMappingData = null;
-			}
-			else
-			{
-				$aMappingData = $this->GetMapRule($sParent);
-			}
-		}
-
-		return $aMappingData;
-	}
-}
-/**
- * Map a date+time column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeDateTime extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DATE_TIME;
-
-	static $oFormat = null;
-
-	/**
-	 *
-	 * @return DateTimeFormat
-	 */
-	static public function GetFormat()
-	{
-		if (self::$oFormat == null)
-		{
-			static::LoadFormatFromConfig();		
-		}
-		return self::$oFormat;
-	}	
-	
-	/**
-	 * Load the 3 settings: date format, time format and data_time format from the configuration
-	 */
-	protected static function LoadFormatFromConfig()
-	{
-		$aFormats = MetaModel::GetConfig()->Get('date_and_time_format');
-		$sLang = Dict::GetUserLanguage();
-		$sDateFormat = isset($aFormats[$sLang]['date']) ? $aFormats[$sLang]['date'] : (isset($aFormats['default']['date']) ? $aFormats['default']['date'] : 'Y-m-d');
-		$sTimeFormat = isset($aFormats[$sLang]['time']) ? $aFormats[$sLang]['time'] : (isset($aFormats['default']['time']) ? $aFormats['default']['time'] : 'H:i:s');
-		$sDateAndTimeFormat = isset($aFormats[$sLang]['date_time']) ? $aFormats[$sLang]['date_time'] : (isset($aFormats['default']['date_time']) ? $aFormats['default']['date_time'] : '$date $time');
-		
-		$sFullFormat = str_replace(array('$date', '$time'), array($sDateFormat, $sTimeFormat), $sDateAndTimeFormat);
-		
-		self::SetFormat(new DateTimeFormat($sFullFormat));
-		AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));		
-	}
-	
-	/**
-	 * Returns the format string used for the date & time stored in memory
-	 * @return string
-	 */
-	static public function GetInternalFormat()
-	{
-		return 'Y-m-d H:i:s';
-	}
-
-	/**
-	 * Returns the format string used for the date & time written to MySQL
-	 * @return string
-	 */
-	static public function GetSQLFormat()
-	{
-		return 'Y-m-d H:i:s';
-	}
-	
-	static public function SetFormat(DateTimeFormat $oDateTimeFormat)
-	{
-		self::$oFormat = $oDateTimeFormat;
-	}
-	
-	static public function GetSQLTimeFormat()
-	{
-		return 'H:i:s';
-	}
-	
-	/**
-	 * Parses a search string coming from user input
-	 * @param string $sSearchString
-	 * @return string
-	 */
-	public function ParseSearchString($sSearchString)
-	{
-		try
-		{
-			$oDateTime = $this->GetFormat()->Parse($sSearchString);
-			$sSearchString = $oDateTime->format($this->GetInternalFormat());
-		}
-		catch(Exception $e)
-		{
-			$sFormatString = '!'.(string)AttributeDate::GetFormat(); // BEWARE: ! is needed to set non-parsed fields to zero !!!
-			$oDateTime = DateTime::createFromFormat($sFormatString, $sSearchString); 
-			if ($oDateTime !== false)
-			{
-				$sSearchString = $oDateTime->format($this->GetInternalFormat());
-			}
-		}
-		return $sSearchString;
-	}
-	
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\DateTimeField';
-	}
-	
-	/**
-	 * Override to specify Field class
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		$oFormField->SetPHPDateTimeFormat((string) $this->GetFormat());
-		$oFormField->SetJSDateTimeFormat($this->GetFormat()->ToMomentJS());
-
-		$oFormField = parent::MakeFormField($oObject, $oFormField);
-
-		// After call to the parent as it sets the current value
-		$oFormField->SetCurrentValue($this->GetFormat()->Format($oObject->Get($this->GetCode())));
-
-		return $oFormField;
-	}
-
-    /**
-     * @inheritdoc
-     */
-    public function EnumTemplateVerbs()
-    {
-        return array(
-            '' => 'Formatted representation',
-            'raw' => 'Not formatted representation',
-        );
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-    {
-        switch ($sVerb)
-        {
-            case '':
-            case 'text':
-                return static::GetFormat()->format($value);
-                break;
-            case 'html':
-                // Note: Not passing formatted value as the method will format it.
-                return $this->GetAsHTML($value);
-                break;
-            case 'raw':
-                return $value;
-                break;
-            default:
-                return parent::GetForTemplate($value, $sVerb, $oHostObject, $bLocalize);
-                break;
-        }
-    }
-
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "DateTime";}
-
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return (string)static::GetFormat()->format($sValue);
-	}	
-	public function GetValueLabel($sValue, $oHostObj = null)
-	{
-		return (string)static::GetFormat()->format($sValue);
-	}	
-	
-	protected function GetSQLCol($bFullSpec = false) {return "DATETIME";}
-
-	public function GetImportColumns()
-	{
-		// Allow an empty string to be a valid value (synonym for "reset")
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'VARCHAR(19)';
-		return $aColumns;
-	}
-
-	public static function GetAsUnixSeconds($value)
-	{
-		$oDeadlineDateTime = new DateTime($value);
-		$iUnixSeconds = $oDeadlineDateTime->format('U');
-		return $iUnixSeconds;
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		// null value will be replaced by the current date, if not already set, in DoComputeValues
-		return $this->GetNullValue();
-	}
-
-	public function GetValidationPattern()
-	{
-		return static::GetFormat()->ToRegExpr();
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array(
-			"="=>"equals",
-			"!="=>"differs from",
-			"<"=>"before",
-			"<="=>"before",
-			">"=>"after (strictly)",
-			">="=>"after",
-			"SameDay"=>"same day (strip time)",
-			"SameMonth"=>"same year/month",
-			"SameYear"=>"same year",
-			"Today"=>"today",
-			">|"=>"after today + N days",
-			"<|"=>"before today + N days",
-			"=|"=>"equals today + N days",
-		);
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		// Unless we implement a "same xxx, depending on given precision" !
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-
-		switch ($sOpCode)
-		{
-		case '=':
-		case '!=':
-		case '<':
-		case '<=':
-		case '>':
-		case '>=':
-			return $this->GetSQLExpr()." $sOpCode $sQValue";
-		case 'SameDay':
-			return "DATE(".$this->GetSQLExpr().") = DATE($sQValue)";
-		case 'SameMonth':
-			return "DATE_FORMAT(".$this->GetSQLExpr().", '%Y-%m') = DATE_FORMAT($sQValue, '%Y-%m')";
-		case 'SameYear':
-			return "MONTH(".$this->GetSQLExpr().") = MONTH($sQValue)";
-		case 'Today':
-			return "DATE(".$this->GetSQLExpr().") = CURRENT_DATE()";
-		case '>|':
-			return "DATE(".$this->GetSQLExpr().") > DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
-		case '<|':
-			return "DATE(".$this->GetSQLExpr().") < DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
-		case '=|':
-			return "DATE(".$this->GetSQLExpr().") = DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
-		default:
-			return $this->GetSQLExpr()." = $sQValue";
-		}
-	}
-	
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue))
-		{
-			return null;
-		}
-		if (is_string($proposedValue) && ($proposedValue == "") && $this->IsNullAllowed())
-		{
-			return null;
-		}
-		if (!is_numeric($proposedValue))
-		{
-			// Check the format
-			try
-			{
-				$oFormat = new DateTimeFormat($this->GetInternalFormat());
-				$oFormat->Parse($proposedValue);
-			}
-			catch (Exception $e)
-			{
-				throw new Exception('Wrong format for date attribute '.$this->GetCode().', expecting "'.$this->GetInternalFormat().'" and got "'.$proposedValue.'"');
-			}
-
-			return $proposedValue;
-		}
-
-		return date(static::GetInternalFormat(), $proposedValue);
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (empty($value))
-		{	
-			return null;
-		}
-		return $value;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html(static::GetFormat()->format($value));
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2xml($value);
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (empty($sValue) || ($sValue === '0000-00-00 00:00:00') || ($sValue === '0000-00-00'))
-		{
-			return '';
-		}
-		else if ((string)static::GetFormat() !== static::GetInternalFormat())
-		{
-			// Format conversion
-			$oDate = new DateTime($sValue);
-			if ($oDate !== false)
-			{
-				$sValue = static::GetFormat()->format($oDate);
-			}
-		}
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-	
-	/**
-	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
-	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
-	 * does nothing special, and just calls the default (loose) operator
-	 * @param string $sSearchText The search string to analyze for smart patterns
-	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
-	 * @param array $aParams Values of the query parameters
-	 * @return Expression The search condition to be added (AND) to the current search
-	 */
-	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams, $bParseSearchString = false)
-	{
-		// Possible smart patterns
-		$aPatterns = array(
-			'between' => array('pattern' => '/^\[(.*),(.*)\]$/', 'operator' => 'n/a'),
-			'greater than or equal' => array('pattern' => '/^>=(.*)$/', 'operator' => '>='),
-			'greater than' => array('pattern' => '/^>(.*)$/', 'operator' => '>'),
-			'less than or equal' => array('pattern' => '/^<=(.*)$/', 'operator' => '<='),
-			'less than' =>  array('pattern' => '/^<(.*)$/', 'operator' => '<'),
-		);
-		
-		$sPatternFound = '';
-		$aMatches = array();
-		foreach($aPatterns as $sPatName => $sPattern)
-		{
-			if (preg_match($sPattern['pattern'], $sSearchText, $aMatches))
-			{
-				$sPatternFound = $sPatName;
-				break;
-			}			
-		}
-		
-		switch($sPatternFound)
-		{
-			case 'between':
-			
-			$sParamName1 = $oField->GetParent().'_'.$oField->GetName().'_1';
-			$oRightExpr = new VariableExpression($sParamName1);
-			if ($bParseSearchString)
-			{
-				$aParams[$sParamName1] = $this->ParseSearchString($aMatches[1]);
-			}
-			else
-			{
-			$aParams[$sParamName1] = $aMatches[1];
-			}
-			$oCondition1 = new BinaryExpression($oField, '>=', $oRightExpr);
-
-			$sParamName2 = $oField->GetParent().'_'.$oField->GetName().'_2';
-			$oRightExpr = new VariableExpression($sParamName2);
-			if ($bParseSearchString)
-			{
-				$aParams[$sParamName2] = $this->ParseSearchString($aMatches[2]);
-			}
-			else
-			{
-			$aParams[$sParamName2] = $aMatches[2];
-			}
-			$oCondition2 = new BinaryExpression($oField, '<=', $oRightExpr);
-			
-			$oNewCondition = new BinaryExpression($oCondition1, 'AND', $oCondition2);
-			break;
-			
-			case 'greater than':
-			case 'greater than or equal':
-			case 'less than':
-			case 'less than or equal':
-			$sSQLOperator = $aPatterns[$sPatternFound]['operator'];
-			$sParamName = $oField->GetParent().'_'.$oField->GetName();
-			$oRightExpr = new VariableExpression($sParamName);
-			if ($bParseSearchString)
-			{
-				$aParams[$sParamName] = $this->ParseSearchString($aMatches[1]);
-			}
-			else
-			{
-			$aParams[$sParamName] = $aMatches[1];
-			}
-			$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
-			
-			break;
-						
-			default:
-			$oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams);
-
-		}
-
-		return $oNewCondition;
-	}
-
-
-	public function GetHelpOnSmartSearch()
-	{
-		$sDict = parent::GetHelpOnSmartSearch();
-		
-		$oFormat = static::GetFormat();
-		$sExample = $oFormat->Format(new DateTime('2015-07-19 18:40:00'));
-		return vsprintf($sDict, array($oFormat->ToPlaceholder(), $sExample));
-	}	
-}
-
-/**
- * Store a duration as a number of seconds 
- *
- * @package	 iTopORM
- */
-class AttributeDuration extends AttributeInteger
-{
-	public function GetEditClass() {return "Duration";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11) UNSIGNED";}
-
-	public function GetNullValue() {return '0';}
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return null;
-		if (!is_numeric($proposedValue)) return null;
-		if ( ((int)$proposedValue) < 0) return null;
-
-		return (int)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (is_null($value))
-		{	
-			return null;
-		}
-		return $value;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html(self::FormatDuration($value));
-	}
-
-	public static function FormatDuration($duration)
-	{
-		$aDuration = self::SplitDuration($duration);
-
-		if ($duration < 60)
-		{
-			// Less than 1 min
-			$sResult = Dict::Format('Core:Duration_Seconds', $aDuration['seconds']);			
-		}
-		else if ($duration < 3600)
-		{
-			// less than 1 hour, display it in minutes/seconds
-			$sResult = Dict::Format('Core:Duration_Minutes_Seconds', $aDuration['minutes'], $aDuration['seconds']);			
-		}
-		else if ($duration < 86400)
-		{
-			// Less than 1 day, display it in hours/minutes/seconds	
-			$sResult = Dict::Format('Core:Duration_Hours_Minutes_Seconds', $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
-		}
-		else
-		{
-			// more than 1 day, display it in days/hours/minutes/seconds
-			$sResult = Dict::Format('Core:Duration_Days_Hours_Minutes_Seconds', $aDuration['days'], $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
-		}
-		return $sResult;
-	}
-	
-	static function SplitDuration($duration)
-	{
-		$duration = (int) $duration;
-		$days = floor($duration / 86400);
-		$hours = floor(($duration - (86400*$days)) / 3600);
-		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
-		$seconds = ($duration % 60); // modulo
-		return array( 'days' => $days, 'hours' => $hours, 'minutes' => $minutes, 'seconds' => $seconds );		
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\DurationField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
-		$sAttCode = $this->GetCode();
-		$oFormField->SetCurrentValue($oObject->Get($sAttCode));
-		$oFormField->SetReadOnly(true);
-
-		return $oFormField;
-	}
-
-}
-/**
- * Map a date+time column to an attribute 
- *
- * @package	 iTopORM
- */
-class AttributeDate extends AttributeDateTime
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DATE;
-
-	static $oDateFormat = null;
-	
-	static public function GetFormat()
-	{
-		if (self::$oDateFormat == null)
-		{			
-			AttributeDateTime::LoadFormatFromConfig();		
-		}
-		return self::$oDateFormat;
-	}
-
-	static public function SetFormat(DateTimeFormat $oDateFormat)
-	{
-		self::$oDateFormat = $oDateFormat;
-	}
-
-	/**
-	 * Returns the format string used for the date & time stored in memory
-	 * @return string
-	 */
-	static public function GetInternalFormat()
-	{
-		return 'Y-m-d';
-	}
-
-	/**
-	 * Returns the format string used for the date & time written to MySQL
-	 * @return string
-	 */
-	static public function GetSQLFormat()
-	{
-		return 'Y-m-d';
-	}
-	
-	static public function ListExpectedParams()
-	{
-		return parent::ListExpectedParams();
-		//return array_merge(parent::ListExpectedParams(), array());
-	}
-
-	public function GetEditClass() {return "Date";}
-	protected function GetSQLCol($bFullSpec = false) {return "DATE";}
-	public function GetImportColumns()
-	{
-		// Allow an empty string to be a valid value (synonym for "reset")
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'VARCHAR(10)';
-		return $aColumns;
-	}
-
-
-	/**
-	 * Override to specify Field class
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		$oFormField = parent::MakeFormField($oObject, $oFormField);
-		$oFormField->SetDateOnly(true);
-		
-		return $oFormField;
-	}
-	
-}
-
-/**
- * A dead line stored as a date & time
- * The only difference with the DateTime attribute is the display:
- * relative to the current time
- */
-class AttributeDeadline extends AttributeDateTime
-{
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$sResult = self::FormatDeadline($value);
-		return $sResult;
-	}
-
-	public static function FormatDeadline($value)
-	{
-		$sResult = '';
-		if ($value !== null)
-		{
-			$iValue = AttributeDateTime::GetAsUnixSeconds($value);
-			$sDate = AttributeDateTime::GetFormat()->Format($value);
-			$difference = $iValue - time();
-	
-			if ($difference >= 0)
-			{
-				$sDifference = self::FormatDuration($difference);
-			}
-			else
-			{
-				$sDifference = Dict::Format('UI:DeadlineMissedBy_duration', self::FormatDuration(-$difference));
-			}
-			$sFormat = MetaModel::GetConfig()->Get('deadline_format');
-			$sResult = str_replace(array('$date$', '$difference$'), array($sDate, $sDifference), $sFormat);
-		}
-
-		return $sResult;
-	}
-
-	static function FormatDuration($duration)
-	{
-		$days = floor($duration / 86400);
-		$hours = floor(($duration - (86400*$days)) / 3600);
-		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
-
-		if ($duration < 60)
-		{
-			// Less than 1 min
-			$sResult =Dict::S('UI:Deadline_LessThan1Min');			
-		}
-		else if ($duration < 3600)
-		{
-			// less than 1 hour, display it in minutes
-			$sResult =Dict::Format('UI:Deadline_Minutes', $minutes);			
-		}
-		else if ($duration < 86400)
-		{
-			// Less that 1 day, display it in hours/minutes	
-			$sResult =Dict::Format('UI:Deadline_Hours_Minutes', $hours, $minutes);			
-		}
-		else
-		{
-			// Less that 1 day, display it in hours/minutes	
-			$sResult =Dict::Format('UI:Deadline_Days_Hours_Minutes', $days, $hours, $minutes);			
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Map a foreign key to an attribute 
- *  AttributeExternalKey and AttributeExternalField may be an external key
- *  the difference is that AttributeExternalKey corresponds to a column into the defined table
- *  where an AttributeExternalField corresponds to a column into another table (class)
- *
- * @package	 iTopORM
- */
-class AttributeExternalKey extends AttributeDBFieldVoid
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
-
-
-	/**
-	 * Return the search widget type corresponding to this attribute
-	 *
-	 * @return string
-	 */
-	public function GetSearchType()
-	{
-		try
-		{
-			$oRemoteAtt = $this->GetFinalAttDef();
-			$sTargetClass = $oRemoteAtt->GetTargetClass();
-			if (MetaModel::IsHierarchicalClass($sTargetClass))
-			{
-				return self::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
-			}
-			return self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
-		}
-		catch (CoreException $e)
-		{
-		}
-
-		return self::SEARCH_WIDGET_TYPE_RAW;
-	}
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("targetclass", "is_null_allowed", "on_target_delete"));
-	}
-
-	public function GetEditClass() {return "ExtKey";}
-	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return true;}
-	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->Get("targetclass");}
-	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
-	public function GetKeyAttCode() {return $this->GetCode();} 
-	public function GetDisplayStyle() { return $this->GetOptional('display_style', 'select'); }
-	
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
-	public function IsNullAllowed()
-	{
-		if (MetaModel::GetConfig()->Get('disable_mandatory_ext_keys'))
-		{
-			return true;
-		}
-		return $this->Get("is_null_allowed");
-	}
-
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return parent::GetBasicFilterLooseOperator();
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	// overloaded here so that an ext key always have the answer to
-	// "what are your possible values?"
-	public function GetValuesDef()
-	{
-		$oValSetDef = $this->Get("allowed_values");
-		if (!$oValSetDef)
-		{
-			// Let's propose every existing value
-			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
-		}
-		return $oValSetDef;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		//throw new Exception("GetAllowedValues on ext key has been deprecated");
-		try
-		{
-			return parent::GetAllowedValues($aArgs, $sContains);
-		}
-		catch (MissingQueryArgument $e)
-		{
-			// Some required arguments could not be found, enlarge to any existing value
-			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
-			return $oValSetDef->GetValues($aArgs, $sContains);
-		}
-	}
-
-	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		$oValSetDef = $this->GetValuesDef();
-		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
-		return $oSet;
-	}
-
-	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		return DBObjectSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
-	}
-
-	public function GetDeletionPropagationOption()
-	{
-		return $this->Get("on_target_delete");
-	}
-
-	public function GetNullValue()
-	{
-		return 0;
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == 0);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return 0;
-		if ($proposedValue === '') return 0;
-		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
-		return (int)$proposedValue;
-	}
-	
-	public function GetMaximumComboLength()
-	{
-		return $this->GetOptional('max_combo_length', MetaModel::GetConfig()->Get('max_combo_length'));
-	}
-	
-	public function GetMinAutoCompleteChars()
-	{
-		return $this->GetOptional('min_autocomplete_chars', MetaModel::GetConfig()->Get('min_autocomplete_chars'));
-	}
-	
-	public function AllowTargetCreation()
-	{
-		return $this->GetOptional('allow_target_creation', MetaModel::GetConfig()->Get('allow_target_creation'));
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 * @throws \CoreException
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		$oRet = null;
-		$sRemoteClass = $this->GetTargetClass();
-		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		{
-			if (!$oRemoteAttDef->IsLinkSet()) continue;
-			if (!is_subclass_of($this->GetHostClass(), $oRemoteAttDef->GetLinkedClass()) && $oRemoteAttDef->GetLinkedClass() != $this->GetHostClass()) continue;
-			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetCode()) continue;
-			$oRet = $oRemoteAttDef;
-			break;
-		}
-		return $oRet;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SelectObjectField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		
-		// Setting params
-		$oFormField->SetMaximumComboLength($this->GetMaximumComboLength());
-		$oFormField->SetMinAutoCompleteChars($this->GetMinAutoCompleteChars());
-		$oFormField->SetHierarchical(MetaModel::IsHierarchicalClass($this->GetTargetClass()));
-		// Setting choices regarding the field dependencies
-		$aFieldDependencies = $this->GetPrerequisiteAttributes();
-		if (!empty($aFieldDependencies))
-		{
-			$oTmpAttDef = $this;
-			$oTmpField = $oFormField;
-			$oFormField->SetOnFinalizeCallback(function() use ($oTmpField, $oTmpAttDef, $oObject)
-			{
-			    /** @var $oTmpField \Combodo\iTop\Form\Field\Field */
-			    /** @var $oTmpAttDef \AttributeDefinition */
-			    /** @var $oObject \DBObject */
-
-				// We set search object only if it has not already been set (overrided)
-				if ($oTmpField->GetSearch() === null)
-				{
-					$oSearch = DBSearch::FromOQL($oTmpAttDef->GetValuesDef()->GetFilterExpression());
-					$oSearch->SetInternalParams(array('this' => $oObject));
-					$oTmpField->SetSearch($oSearch);
-				}
-			});
-		}
-		else
-		{
-			$oSearch = DBSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
-			$oSearch->SetInternalParams(array('this' => $oObject));
-			$oFormField->SetSearch($oSearch);
-		}
-
-		// If ExtKey is mandatory, we add a validator to ensure that the value 0 is not selected
-		if ($oObject->GetAttributeFlags($this->GetCode()) & OPT_ATT_MANDATORY)
-		{
-			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator());
-		}
-
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * Special kind of External Key to manage a hierarchy of objects
- */
-class AttributeHierarchicalKey extends AttributeExternalKey
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
-
-	protected $m_sTargetClass;
-
-	static public function ListExpectedParams()
-	{
-		$aParams = parent::ListExpectedParams();
-		$idx = array_search('targetclass', $aParams);
-		unset($aParams[$idx]);
-		$idx = array_search('jointype', $aParams);
-		unset($aParams[$idx]);
-		return $aParams; // TODO: mettre les bons parametres ici !!
-	}
-
-	public function GetEditClass() {return "ExtKey";}
-	public function RequiresIndex()
-	{
-		return true;
-	}
-
-	/*
-	*  The target class is the class for which the attribute has been defined first
-	*/	
-	public function SetHostClass($sHostClass)
-	{
-		if (!isset($this->m_sTargetClass))
-		{
-			$this->m_sTargetClass = $sHostClass;
-		}
-		parent::SetHostClass($sHostClass);
-	}
-
-	static public function IsHierarchicalKey() {return true;}
-	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->m_sTargetClass;}
-	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
-	public function GetKeyAttCode() {return $this->GetCode();}
-
-	public function GetBasicFilterOperators()
-	{
-		return parent::GetBasicFilterOperators();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return parent::GetBasicFilterLooseOperator();
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
-		$aColumns[$this->GetSQLLeft()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
-		$aColumns[$this->GetSQLRight()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
-		return $aColumns;
-	}
-	public function GetSQLRight()
-	{
-		return $this->GetCode().'_right';
-	}
-	public function GetSQLLeft()
-	{
-		return $this->GetCode().'_left';
-	}
-
-	public function GetSQLValues($value)
-	{
-		if (!is_array($value))
-		{
-			$aValues[$this->GetCode()] = $value;
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode()] = $value[$this->GetCode()];
-			$aValues[$this->GetSQLRight()] = $value[$this->GetSQLRight()];
-			$aValues[$this->GetSQLLeft()] = $value[$this->GetSQLLeft()];
-		}
-		return $aValues;
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains);
-		if ($oFilter)
-		{
-			$oValSetDef = $this->GetValuesDef();
-			$oValSetDef->AddCondition($oFilter);
-			return $oValSetDef->GetValues($aArgs, $sContains);
-		}
-		else
-		{
-			return parent::GetAllowedValues($aArgs, $sContains);
-		}
-	}
-
-	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		$oValSetDef = $this->GetValuesDef();
-		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
-		if ($oFilter)
-		{
-			$oValSetDef->AddCondition($oFilter);
-		}
-		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
-		return $oSet;
-	}
-
-	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
-		if ($oFilter)
-		{
-			return $oFilter;
-		}
-		return parent::GetAllowedValuesAsFilter($aArgs, $sContains, $iAdditionalValue);
-	}
-
-	private function GetHierachicalFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		if (array_key_exists('this', $aArgs))
-		{
-			// Hierarchical keys have one more constraint: the "parent value" cannot be
-			// "under" themselves
-			$iRootId = $aArgs['this']->GetKey();
-			if ($iRootId > 0) // ignore objects that do no exist in the database...
-			{
-				$sClass = $this->m_sTargetClass;
-				return DBObjectSearch::FromOQL("SELECT $sClass AS node JOIN $sClass AS root ON node.".$this->GetCode()." NOT BELOW root.id WHERE root.id = $iRootId");
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Find the corresponding "link" attribute on the target class, if any
-	 * @return null | AttributeDefinition
-	 */
-	public function GetMirrorLinkAttribute()
-	{
-		return null;
-	}
-}
-
-/**
- * An attribute which corresponds to an external key (direct or indirect) 
- *
- * @package	 iTopORM
- */
-class AttributeExternalField extends AttributeDefinition
-{
-	/**
-	 * Return the search widget type corresponding to this attribute
-	 *
-	 * @return string
-	 */
-	public function GetSearchType()
-	{
-		// Not necessary the external key is already present
-		if ($this->IsFriendlyName())
-		{
-			return self::SEARCH_WIDGET_TYPE_RAW;
-		}
-
-		try
-		{
-			$oRemoteAtt = $this->GetFinalAttDef();
-			switch (true)
-			{
-				case ($oRemoteAtt instanceof AttributeString):
-					return self::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD;
-				case ($oRemoteAtt instanceof AttributeExternalKey):
-					return self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
-			}
-		}
-		catch (CoreException $e)
-		{
-		}
-
-		return self::SEARCH_WIDGET_TYPE_RAW;
-	}
-
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("extkey_attcode", "target_attcode"));
-	}
-
-	public function GetEditClass() {return "ExtField";}
-
-	public function GetFinalAttDef()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetFinalAttDef(); 
-	}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		// throw new CoreException("external attribute: does it make any sense to request its type ?");  
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetSQLCol($bFullSpec); 
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			return array('' => $this->GetCode()); // Warning: Use GetCode() since AttributeExternalField does not have any 'sql' property
-		}
-		else
-		{
-			return $sPrefix;
-		} 
-	}
-
-	public function GetLabel($sDefault = null)
-	{
-		if ($this->IsFriendlyName())
-		{
-			$sKeyAttCode = $this->Get("extkey_attcode");
-			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
-			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
-		}
-		else
-		{
-			$sLabel = parent::GetLabel('');
-			if (strlen($sLabel) == 0)
-			{
-				$oRemoteAtt = $this->GetExtAttDef();
-				$sLabel = $oRemoteAtt->GetLabel($this->m_sCode);
-			}
-		}
-		return $sLabel;
-	}
-
-	public function GetLabelForSearchField()
-	{
-		$sLabel = parent::GetLabel('');
-		if (strlen($sLabel) == 0)
-		{
-			$sKeyAttCode = $this->Get("extkey_attcode");
-			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
-			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
-
-			$oRemoteAtt = $this->GetExtAttDef();
-			$sLabel .= '->'.$oRemoteAtt->GetLabel($this->m_sCode);
-		}
-
-		return $sLabel;
-	}
-
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = parent::GetDescription('');
-		if (strlen($sLabel) == 0)
-		{
-			$oRemoteAtt = $this->GetExtAttDef();
-			$sLabel = $oRemoteAtt->GetDescription('');
-		}
-		return $sLabel;
-	} 
-	public function GetHelpOnEdition($sDefault = null)
-	{
-		$sLabel = parent::GetHelpOnEdition('');
-		if (strlen($sLabel) == 0)
-		{
-			$oRemoteAtt = $this->GetExtAttDef();
-			$sLabel = $oRemoteAtt->GetHelpOnEdition('');
-		}
-		return $sLabel;
-	} 
-
-	public function IsExternalKey($iType = EXTKEY_RELATIVE)
-	{
-		switch($iType)
-		{
-		case EXTKEY_ABSOLUTE:
-			// see further
-			$oRemoteAtt = $this->GetExtAttDef();
-			return $oRemoteAtt->IsExternalKey($iType);
-
-		case EXTKEY_RELATIVE:
-			return false;
-
-		default:
-			throw new CoreException("Unexpected value for argument iType: '$iType'");
-		}
-	}
-
-	/**
-	 * @return bool
-	 * @throws \CoreException
-	 */
-	public function IsFriendlyName()
-	{
-		$oRemoteAtt = $this->GetExtAttDef();
-		if ($oRemoteAtt instanceof AttributeExternalField)
-		{
-			$bRet = $oRemoteAtt->IsFriendlyName();
-		}
-		elseif ($oRemoteAtt instanceof  AttributeFriendlyName)
-		{
-			$bRet = true;
-		}
-		else
-		{
-			$bRet = false;
-		}
-		return $bRet;
-	}
-
-	public function GetTargetClass($iType = EXTKEY_RELATIVE)
-	{
-		return $this->GetKeyAttDef($iType)->GetTargetClass();
-	}
-
-	static public function IsExternalField() {return true;}
-	public function GetKeyAttCode() {return $this->Get("extkey_attcode");} 
-	public function GetExtAttCode() {return $this->Get("target_attcode");} 
-
-	public function GetKeyAttDef($iType = EXTKEY_RELATIVE)
-	{
-		switch($iType)
-		{
-		case EXTKEY_ABSOLUTE:
-			// see further
-			$oRemoteAtt = $this->GetExtAttDef();
-			if ($oRemoteAtt->IsExternalField())
-			{
-				return $oRemoteAtt->GetKeyAttDef(EXTKEY_ABSOLUTE);
-			}
-			else if ($oRemoteAtt->IsExternalKey())
-			{
-				return $oRemoteAtt;
-			}
-			return $this->GetKeyAttDef(EXTKEY_RELATIVE); // which corresponds to the code hereafter !
-
-		case EXTKEY_RELATIVE:
-			return MetaModel::GetAttributeDef($this->GetHostClass(), $this->Get("extkey_attcode"));
-
-		default:
-			throw new CoreException("Unexpected value for argument iType: '$iType'");
-		}
-	}
-	
-	public function GetPrerequisiteAttributes($sClass = null)
-	{
-		return array($this->Get("extkey_attcode"));
-	} 
-	
-
-	public function GetExtAttDef()
-	{
-		$oKeyAttDef = $this->GetKeyAttDef();
-		$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $this->Get("target_attcode"));
-		if (!is_object($oExtAttDef)) throw new CoreException("Invalid external field ".$this->GetCode()." in class ".$this->GetHostClass().". The class ".$oKeyAttDef->GetTargetClass()." has no attribute ".$this->Get("target_attcode"));
-		return $oExtAttDef;
-	}
-
-	public function GetSQLExpr()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetSQLExpr(); 
-	} 
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetDefaultValue();
-	}
-	public function IsNullAllowed()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->IsNullAllowed(); 
-	}
-
-	static public function IsScalar()
-	{
-		return true;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetBasicFilterOperators(); 
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetBasicFilterLooseOperator(); 
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetBasicFilterSQLExpr($sOpCode, $value);
-	} 
-
-	public function GetNullValue()
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetNullValue();
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->IsNull($proposedValue);
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->MakeRealValue($proposedValue, $oHostObj);
-	}
-
-	public function ScalarToSQL($value)
-	{
-		// This one could be used in case of filtering only
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->ScalarToSQL($value);
-	}
-
-
-	// Do not overload GetSQLExpression here because this is handled in the joins
-	//public function GetSQLExpressions($sPrefix = '') {return array();}
-
-	// Here, we get the data...
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->FromSQLToValue($aCols, $sPrefix);
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetAsHTML($value, null, $bLocalize);
-	}
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetAsXML($value, null, $bLocalize);
-	}
-	public function GetAsCSV($value, $sSeparator = ',', $sTestQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$oExtAttDef = $this->GetExtAttDef();
-		return $oExtAttDef->GetAsCSV($value, $sSeparator, $sTestQualifier, null, $bLocalize, $bConvertToPlainText);
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-	    // Retrieving AttDef from the remote attribute
-        $oRemoteAttDef = $this->GetExtAttDef();
-
-        if ($oFormField === null)
-		{
-		    // ExternalField's FormField are actually based on the FormField from the target attribute.
-            // Except for the AttributeExternalKey because we have no OQL and stuff
-            if($oRemoteAttDef instanceof AttributeExternalKey)
-            {
-                $sFormFieldClass = static::GetFormFieldClass();
-            }
-            else
-            {
-                $sFormFieldClass = $oRemoteAttDef::GetFormFieldClass();
-            }
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-        // Manually setting for remote ExternalKey, otherwise, the id would be displayed.
-		if($oRemoteAttDef instanceof AttributeExternalKey)
-        {
-            $oFormField->SetCurrentValue($oObject->Get($this->GetCode().'_friendlyname'));
-        }
-
-		// Readonly field because we can't update external fields
-		$oFormField->SetReadOnly(true);
-
-		return $oFormField;
-	}
-
-	public function IsPartOfFingerprint()
-	{
-		return false;
-	}
-
-}
-
-/**
- * Map a varchar column to an URL (formats the ouput in HMTL) 
- *
- * @package	 iTopORM
- */
-class AttributeURL extends AttributeString
-{
-	static public function ListExpectedParams()
-	{
-		//return parent::ListExpectedParams();
-		return array_merge(parent::ListExpectedParams(), array("target"));
-	}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "VARCHAR(2048)"
-			.CMDBSource::GetSqlStringColumnDefinition()
-			.($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-
-	public function GetMaxSize()
-	{
-		return 2048;
-	}
-	
-	public function GetEditClass() {return "String";}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$sTarget = $this->Get("target");
-		if (empty($sTarget)) $sTarget = "_blank";
-		$sLabel = Str::pure2html($sValue);
-		if (strlen($sLabel) > 128)
-		{
-			// Truncate the length to 128 characters, by removing the middle
-			$sLabel = substr($sLabel, 0, 100).'.....'.substr($sLabel, -20);
-		}
-		return "<a target=\"$sTarget\" href=\"$sValue\">$sLabel</a>";
-	}
-
-	public function GetValidationPattern()
-	{
-		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('url_validation_pattern').'$');
-	}
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\UrlField';
-    }
-
-    public function MakeFormField(DBObject $oObject, $oFormField = null)
-    {
-        if ($oFormField === null)
-        {
-            $sFormFieldClass = static::GetFormFieldClass();
-            $oFormField = new $sFormFieldClass($this->GetCode());
-        }
-        parent::MakeFormField($oObject, $oFormField);
-
-        $oFormField->SetTarget($this->Get('target'));
-
-        return $oFormField;
-    }
-}
-
-/**
- * A blob is an ormDocument, it is stored as several columns in the database  
- *
- * @package	 iTopORM
- */
-class AttributeBlob extends AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("depends_on"));
-	}
-
-	public function GetEditClass() {return "Document";}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return true;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
-	public function IsNullAllowed(DBObject $oHostObject = null) {return $this->GetOptional("is_null_allowed", false);}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return '';
-	}
-	
-	/**
-	 * 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}
-	 * @see AttributeDefinition::MakeRealValue()
-	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if ($proposedValue === null) return null;
-		
-		if (is_object($proposedValue))
-		{
-			$proposedValue = clone $proposedValue;
-		}
-		else
-		{
-			try
-			{
-				// Read the file from iTop, an URL (or the local file system - for admins only)
-				$proposedValue = Utils::FileGetContentsAndMIMEType($proposedValue);
-			}
-			catch(Exception $e)
-			{
-				IssueLog::Warning(get_class($this)."::MakeRealValue - ".$e->getMessage());
-				// Not a real document !! store is as text !!! (This was the default behavior before)
-				$proposedValue = new ormDocument($e->getMessage()." \n".$proposedValue, 'text/plain');
-			}	
-		}
-		return $proposedValue;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode();
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix.'_mimetype';
-		$aColumns['_data'] = $sPrefix.'_data';
-		$aColumns['_filename'] = $sPrefix.'_filename';
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		if (!array_key_exists($sPrefix, $aCols))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$sMimeType = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
-
-		if (!array_key_exists($sPrefix.'_data', $aCols)) 
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '".$sPrefix."_data' from {$sAvailable}");
-		} 
-		$data = isset($aCols[$sPrefix.'_data']) ? $aCols[$sPrefix.'_data'] : null;
-
-		if (!array_key_exists($sPrefix.'_filename', $aCols)) 
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '".$sPrefix."_filename' from {$sAvailable}");
-		} 
-		$sFileName =  isset($aCols[$sPrefix.'_filename']) ? $aCols[$sPrefix.'_filename'] : '';
-
-		$value = new ormDocument($data, $sMimeType, $sFileName);
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		// #@# Optimization: do not load blobs anytime
-		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
-		//	 using memory in case a temporary table has to be created
-		//	 (temporary tables created on disk)
-		//	 We will have to remove the blobs from the list of attributes when doing the select
-		//	 then the use of Get() should finalize the load
-		if ($value instanceOf ormDocument && !$value->IsEmpty())
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_data'] = $value->GetData();
-			$aValues[$this->GetCode().'_mimetype'] = $value->GetMimeType();
-			$aValues[$this->GetCode().'_filename'] = $value->GetFileName();
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_data'] = '';
-			$aValues[$this->GetCode().'_mimetype'] = '';
-			$aValues[$this->GetCode().'_filename'] = '';
-		}
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode().'_data'] = 'LONGBLOB'; // 2^32 (4 Gb)
-		$aColumns[$this->GetCode().'_mimetype'] = 'VARCHAR(255)'.CMDBSource::GetSqlStringColumnDefinition();
-		$aColumns[$this->GetCode().'_filename'] = 'VARCHAR(255)'.CMDBSource::GetSqlStringColumnDefinition();
-		return $aColumns;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array();
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return 'true';
-	} 
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($value))
-		{
-			return $value->GetAsHTML();
-		}
-		return '';
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sAttCode = $this->GetCode();
-		if ($sValue instanceof ormDocument && !$sValue->IsEmpty())
-		{
-			return $sValue->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $sAttCode);
-		}
-		return ''; // Not exportable in CSV !
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$sRet = '';
-		if (is_object($value))
-		{
-			if (!$value->IsEmpty())
-			{
-				$sRet = '<mimetype>'.$value->GetMimeType().'</mimetype>';
-				$sRet .= '<filename>'.$value->GetFileName().'</filename>';
-				$sRet .= '<data>'.base64_encode($value->GetData()).'</data>';
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue	 
-	 */	 	
-	public function GetForJSON($value)
-	{
-		if ($value instanceOf ormDocument)
-		{
-			$aValues = array();
-			$aValues['data'] = base64_encode($value->GetData());
-			$aValues['mimetype'] = $value->GetMimeType();
-			$aValues['filename'] = $value->GetFileName();
-		}
-		else
-		{
-			$aValues = null;
-		}
-		return $aValues;
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON	 
-	 */	 	
-	public function FromJSONToValue($json)
-	{
-		if (isset($json->data))
-		{
-			$data = base64_decode($json->data);
-			$value = new ormDocument($data, $json->mimetype, $json->filename);
-		}
-		else
-		{
-			$value = null;
-		}
-		return $value;
-	}
-	
-	public function Fingerprint($value)
-	{
-		$sFingerprint = '';
-		if ($value instanceOf ormDocument)
-		{
-			$sFingerprint = md5($value->GetData());
-		}
-		return $sFingerprint;		
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\BlobField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-
-		// Note: As of today we want this field to always be read-only
-		$oFormField->SetReadOnly(true);
-
-		// Generating urls
-		$value = $oObject->Get($this->GetCode());
-		$oFormField->SetDownloadUrl($value->GetDownloadURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
-		$oFormField->SetDisplayUrl($value->GetDisplayURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
-
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * An image is a specific type of document, it is stored as several columns in the database
- *
- * @package	 iTopORM
- */
-class AttributeImage extends AttributeBlob
-{
-	public function GetEditClass() {return "Image";}
-
-	/**
-	 * {@inheritDoc}
-	 * @see AttributeBlob::MakeRealValue()
-	 */
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oDoc = parent::MakeRealValue($proposedValue, $oHostObj);
-		// The validation of the MIME Type is done by CheckFormat below
-		return $oDoc;
-	}
-	
-	/**
-	 * Check that the supplied ormDocument actually contains an image
-	 * {@inheritDoc}
-	 * @see AttributeDefinition::CheckFormat()
-	 */
-	public function CheckFormat($value)
-	{
-		if ($value instanceof ormDocument && !$value->IsEmpty())
-		{
-			return ($value->GetMainMimeType() == 'image');
-		}
-		return true;
-	}
-	
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$iMaxWidthPx = $this->Get('display_max_width').'px';
-		$iMaxHeightPx = $this->Get('display_max_height').'px';
-		$sUrl = $this->Get('default_image');
-		$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'; max-height: '.$iMaxHeightPx.'">' : '';
-		if (is_object($value) && !$value->IsEmpty())
-		{
-			if ($oHostObject->IsNew() || ($oHostObject->IsModified() && (array_key_exists($this->GetCode(), $oHostObject->ListChanges()))))
-			{
-				// If the object is modified (or not yet stored in the database) we must serve the content of the image directly inline
-				// otherwise (if we just give an URL) the browser will be given the wrong content... and may cache it
-				$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
-			}
-			else
-			{
-				$sUrl = $value->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $this->GetCode());
-			}
-			$sRet = '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'; max-height: '.$iMaxHeightPx.'">';
-		}
-		return '<div class="view-image" style="width: '.$iMaxWidthPx.'; height: '.$iMaxHeightPx.';"><span class="helper-middle"></span>'.$sRet.'</div>';
-	}
-
-    static public function GetFormFieldClass()
-    {
-        return '\\Combodo\\iTop\\Form\\Field\\ImageField';
-    }
-
-    public function MakeFormField(DBObject $oObject, $oFormField = null)
-    {
-        if ($oFormField === null)
-        {
-            $sFormFieldClass = static::GetFormFieldClass();
-            $oFormField = new $sFormFieldClass($this->GetCode());
-        }
-
-        parent::MakeFormField($oObject, $oFormField);
-
-        // Generating urls
-        $value = $oObject->Get($this->GetCode());
-        if (is_object($value) && !$value->IsEmpty())
-        {
-            $oFormField->SetDownloadUrl($value->GetDownloadURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
-            $oFormField->SetDisplayUrl($value->GetDisplayURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
-        }
-        else
-        {
-            $oFormField->SetDownloadUrl($this->Get('default_image'));
-            $oFormField->SetDisplayUrl($this->Get('default_image'));
-        }
-
-        return $oFormField;
-    }
-}
-/**
- * A stop watch is an ormStopWatch object, it is stored as several columns in the database  
- *
- * @package	 iTopORM
- */
-class AttributeStopWatch extends AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		// The list of thresholds must be an array of iPercent => array of 'option' => value
-		return array_merge(parent::ListExpectedParams(), array("states", "goal_computing", "working_time_computing", "thresholds"));
-	}
-
-	public function GetEditClass() {return "StopWatch";}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return true;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->NewStopWatch();}
-
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		return $value->GetTimeSpent();
-	}
-
-	public function GetStates()
-	{
-		return $this->Get('states');
-	}
-
-	public function AlwaysLoadInTables()
-	{
-		// Each and every stop watch is accessed for computing the highlight code (DBObject::GetHighlightCode())
-		return true;
-	}
-
-	/**
-	 * Construct a brand new (but configured) stop watch
-	 */	 	
-	public function NewStopWatch()
-	{
-		$oSW = new ormStopWatch();
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$oSW->DefineThreshold($iThreshold);
-		}
-		return $oSW;
-	}
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (!$proposedValue instanceof ormStopWatch)
-		{
-			return $this->NewStopWatch();
-		}
-		return $proposedValue;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning: a stopwatch does not have any 'sql' property, so its SQL column is equal to its attribute code !!
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix.'_timespent';
-		$aColumns['_started'] = $sPrefix.'_started';
-		$aColumns['_laststart'] = $sPrefix.'_laststart';
-		$aColumns['_stopped'] = $sPrefix.'_stopped';
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = '_'.$iThreshold;
-			$aColumns[$sThPrefix.'_deadline'] = $sPrefix.$sThPrefix.'_deadline';
-			$aColumns[$sThPrefix.'_passed'] = $sPrefix.$sThPrefix.'_passed';
-			$aColumns[$sThPrefix.'_triggered'] = $sPrefix.$sThPrefix.'_triggered';
-			$aColumns[$sThPrefix.'_overrun'] = $sPrefix.$sThPrefix.'_overrun';
-		}
-		return $aColumns;
-	}
-
-	public static function DateToSeconds($sDate)
-	{
-		if (is_null($sDate))
-		{
-			return null;
-		}
-		$oDateTime = new DateTime($sDate);
-		$iSeconds = $oDateTime->format('U');
-		return $iSeconds;
-	}
-
-	public static function SecondsToDate($iSeconds)
-	{
-		if (is_null($iSeconds))
-		{
-			return null;
-		}
-		return date("Y-m-d H:i:s", $iSeconds);
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		$aExpectedCols = array($sPrefix, $sPrefix.'_started', $sPrefix.'_laststart', $sPrefix.'_stopped');
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = '_'.$iThreshold;
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_deadline';
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_passed';
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_triggered';
-			$aExpectedCols[] = $sPrefix.$sThPrefix.'_overrun';
-		}
-		foreach ($aExpectedCols as $sExpectedCol)
-		{
-			if (!array_key_exists($sExpectedCol, $aCols))
-			{
-				$sAvailable = implode(', ', array_keys($aCols));
-				throw new MissingColumnException("Missing column '$sExpectedCol' from {$sAvailable}");
-			} 
-		}
-
-		$value = new ormStopWatch(
-			$aCols[$sPrefix],
-			self::DateToSeconds($aCols[$sPrefix.'_started']),
-			self::DateToSeconds($aCols[$sPrefix.'_laststart']),
-			self::DateToSeconds($aCols[$sPrefix.'_stopped'])
-		);
-
-		foreach ($this->ListThresholds() as $iThreshold => $aDefinition)
-		{
-			$sThPrefix = '_'.$iThreshold;
-			$value->DefineThreshold(
-				$iThreshold,
-				self::DateToSeconds($aCols[$sPrefix.$sThPrefix.'_deadline']),
-				(bool)($aCols[$sPrefix.$sThPrefix.'_passed'] == 1),
-				(bool)($aCols[$sPrefix.$sThPrefix.'_triggered'] == 1),
-				$aCols[$sPrefix.$sThPrefix.'_overrun'],
-				array_key_exists('highlight', $aDefinition) ? $aDefinition['highlight'] : null
-			);
-		}
-
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		if ($value instanceOf ormStopWatch)
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_timespent'] = $value->GetTimeSpent();
-			$aValues[$this->GetCode().'_started'] = self::SecondsToDate($value->GetStartDate());
-			$aValues[$this->GetCode().'_laststart'] = self::SecondsToDate($value->GetLastStartDate());
-			$aValues[$this->GetCode().'_stopped'] = self::SecondsToDate($value->GetStopDate());
-
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sPrefix = $this->GetCode().'_'.$iThreshold;
-				$aValues[$sPrefix.'_deadline'] = self::SecondsToDate($value->GetThresholdDate($iThreshold));
-				$aValues[$sPrefix.'_passed'] = $value->IsThresholdPassed($iThreshold) ? '1' : '0';
-				$aValues[$sPrefix.'_triggered'] = $value->IsThresholdTriggered($iThreshold) ? '1' : '0';
-				$aValues[$sPrefix.'_overrun'] = $value->GetOverrun($iThreshold);
-			}
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_timespent'] = '';
-			$aValues[$this->GetCode().'_started'] = '';
-			$aValues[$this->GetCode().'_laststart'] = '';
-			$aValues[$this->GetCode().'_stopped'] = '';
-		}
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode().'_timespent'] = 'INT(11) UNSIGNED';
-		$aColumns[$this->GetCode().'_started'] = 'DATETIME';
-		$aColumns[$this->GetCode().'_laststart'] = 'DATETIME';
-		$aColumns[$this->GetCode().'_stopped'] = 'DATETIME';
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sPrefix = $this->GetCode().'_'.$iThreshold;
-			$aColumns[$sPrefix.'_deadline'] = 'DATETIME';
-			$aColumns[$sPrefix.'_passed'] = 'TINYINT(1) UNSIGNED';
-			$aColumns[$sPrefix.'_triggered'] = 'TINYINT(1)';
-			$aColumns[$sPrefix.'_overrun'] = 'INT(11) UNSIGNED';
-		}
-		return $aColumns;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		$aRes = array(
-			$this->GetCode() => new FilterFromAttribute($this),
-			$this->GetCode().'_started' => new FilterFromAttribute($this, '_started'),
-			$this->GetCode().'_laststart' => new FilterFromAttribute($this, '_laststart'),
-			$this->GetCode().'_stopped' => new FilterFromAttribute($this, '_stopped')
-		);
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sPrefix = $this->GetCode().'_'.$iThreshold;
-			$aRes[$sPrefix.'_deadline'] = new FilterFromAttribute($this, '_deadline');
-			$aRes[$sPrefix.'_passed'] = new FilterFromAttribute($this, '_passed');
-			$aRes[$sPrefix.'_triggered'] = new FilterFromAttribute($this, '_triggered');
-			$aRes[$sPrefix.'_overrun'] = new FilterFromAttribute($this, '_overrun');
-		}
-		return $aRes;
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return 'true';
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($value))
-		{
-			return $value->GetAsHTML($this, $oHostObject);
-		}
-		return '';
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		return $value->GetTimeSpent();
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return $value->GetTimeSpent();
-	}
-
-	public function ListThresholds()
-	{
-		return $this->Get('thresholds');
-	}
-	
-	public function Fingerprint($value)
-	{
-		$sFingerprint = '';
-		if (is_object($value))
-		{
-			$sFingerprint = $value->GetAsHTML($this);
-		}
-		return $sFingerprint;
-	}
-
-	/**
-	 * To expose internal values: Declare an attribute AttributeSubItem
-	 * and implement the GetSubItemXXXX verbs
-	 */	 	
-	public function GetSubItemSQLExpression($sItemCode)
-	{
-		$sPrefix = $this->GetCode();
-		switch($sItemCode)
-		{
-		case 'timespent':
-			return array('' => $sPrefix.'_timespent');
-		case 'started':
-			return array('' => $sPrefix.'_started');
-		case 'laststart':
-			return array('' => $sPrefix.'_laststart');
-		case 'stopped':
-			return array('' => $sPrefix.'_stopped');
-		}
-
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = $iThreshold.'_';
-			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-			{
-				// The current threshold is concerned
-				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-				switch($sThresholdCode)
-				{
-				case 'deadline':
-					return array('' => $sPrefix.'_'.$iThreshold.'_deadline');
-				case 'passed':
-					return array('' => $sPrefix.'_'.$iThreshold.'_passed');
-				case 'triggered':
-					return array('' => $sPrefix.'_'.$iThreshold.'_triggered');
-				case 'overrun':
-					return array('' => $sPrefix.'_'.$iThreshold.'_overrun');
-				}
-			}
-		}
-		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
-	}
-
-	public function GetSubItemValue($sItemCode, $value, $oHostObject = null)
-	{
-		$oStopWatch = $value;
-		switch($sItemCode)
-		{
-		case 'timespent':
-			return $oStopWatch->GetTimeSpent();
-		case 'started':
-			return $oStopWatch->GetStartDate();
-		case 'laststart':
-			return $oStopWatch->GetLastStartDate();
-		case 'stopped':
-			return $oStopWatch->GetStopDate();
-		}
-
-		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-		{
-			$sThPrefix = $iThreshold.'_';
-			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-			{
-				// The current threshold is concerned
-				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-				switch($sThresholdCode)
-				{
-				case 'deadline':
-					return $oStopWatch->GetThresholdDate($iThreshold);
-				case 'passed':
-					return $oStopWatch->IsThresholdPassed($iThreshold);
-				case 'triggered':
-					return $oStopWatch->IsThresholdTriggered($iThreshold);
-				case 'overrun':
-					return $oStopWatch->GetOverrun($iThreshold);
-				}
-			}
-		}
-
-		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
-	}
-
-	protected function GetBooleanLabel($bValue)
-	{
-		$sDictKey = $bValue ? 'yes' : 'no';
-		return Dict::S('BooleanLabel:'.$sDictKey, 'def:'.$sDictKey);
-	}
-
-	public function GetSubItemAsHTMLForHistory($sItemCode, $sValue)
-	{
-		switch($sItemCode)
-		{
-		case 'timespent':
-			$sHtml = (int)$sValue ? Str::pure2html(AttributeDuration::FormatDuration($sValue)) : null;
-			break;
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-			$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
-			break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-					case 'deadline':
-						$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
-						break;
-					case 'passed':
-						$sHtml = $this->GetBooleanLabel((int)$sValue);
-						break;
-					case 'triggered':
-						$sHtml = $this->GetBooleanLabel((int)$sValue);
-						break;
-					case 'overrun':
-						$sHtml = (int)$sValue > 0 ? Str::pure2html(AttributeDuration::FormatDuration((int)$sValue)) : '';
-					}
-				}
-			}
-		}
-		return $sHtml;
-	}
-
-	public function GetSubItemAsPlainText($sItemCode, $value)
-	{
-		$sRet = $value;
-
-		switch ($sItemCode)
-		{
-			case 'timespent':
-				$sRet = AttributeDuration::FormatDuration($value);
-				break;
-			case 'started':
-			case 'laststart':
-			case 'stopped':
-				if (is_null($value))
-				{
-					$sRet = ''; // Undefined
-				}
-				else
-				{
-					$oDateTime = new DateTime();
-					$oDateTime->setTimestamp($value);
-					$oDateTimeFormat = AttributeDateTime::GetFormat();
-					$sRet = $oDateTimeFormat->Format($oDateTime);
-				}
-				break;
-
-			default:
-				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-				{
-					$sThPrefix = $iThreshold . '_';
-					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-					{
-						// The current threshold is concerned
-						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-						switch ($sThresholdCode)
-						{
-							case 'deadline':
-								if ($value)
-								{
-									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-									$sRet = AttributeDeadline::FormatDeadline($sDate);
-								}
-								else
-								{
-									$sRet = '';
-								}
-								break;
-							case 'passed':
-							case 'triggered':
-								$sRet = $this->GetBooleanLabel($value);
-								break;
-							case 'overrun':
-								$sRet = AttributeDuration::FormatDuration($value);
-								break;
-						}
-					}
-				}
-		}
-		return $sRet;
-	}
-
-	public function GetSubItemAsHTML($sItemCode, $value)
-	{
-		$sHtml = $value;
-
-		switch ($sItemCode)
-		{
-			case 'timespent':
-				$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
-				break;
-			case 'started':
-			case 'laststart':
-			case 'stopped':
-				if (is_null($value))
-				{
-					$sHtml = ''; // Undefined
-				}
-				else
-				{
-					$oDateTime = new DateTime();
-					$oDateTime->setTimestamp($value);
-					$oDateTimeFormat = AttributeDateTime::GetFormat();
-					$sHtml = Str::pure2html($oDateTimeFormat->Format($oDateTime));
-				}
-				break;
-
-			default:
-				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-				{
-					$sThPrefix = $iThreshold . '_';
-					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-					{
-						// The current threshold is concerned
-						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-						switch ($sThresholdCode)
-						{
-							case 'deadline':
-								if ($value)
-								{
-									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-									$sHtml = Str::pure2html(AttributeDeadline::FormatDeadline($sDate));
-								}
-								else
-								{
-									$sHtml = '';
-								}
-								break;
-							case 'passed':
-							case 'triggered':
-								$sHtml = $this->GetBooleanLabel($value);
-								break;
-							case 'overrun':
-								$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
-								break;
-						}
-					}
-				}
-		}
-		return $sHtml;
-	}
-
-	public function GetSubItemAsCSV($sItemCode, $value, $sSeparator = ',', $sTextQualifier = '"', $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$value);
-		$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
-
-		switch($sItemCode)
-		{
-		case 'timespent':
-				$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
-				break;
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-				if ($value !== null)
-				{
-					$oDateTime = new DateTime();
-					$oDateTime->setTimestamp($value);
-					$oDateTimeFormat = AttributeDateTime::GetFormat();
-					$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
-				}
-				break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-						case 'deadline':
-								if ($value != '')
-								{
-									$oDateTime = new DateTime();
-									$oDateTime->setTimestamp($value);
-									$oDateTimeFormat = AttributeDateTime::GetFormat();
-									$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
-								}
-								break;
-
-							case 'passed':
-							case 'triggered':
-								$sRet = $sTextQualifier . $this->GetBooleanLabel($value) . $sTextQualifier;
-								break;
-
-							case 'overrun':
-								$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
-								break;
-						}
-				}
-			}
-		}
-		return $sRet;
-	}
-
-	public function GetSubItemAsXML($sItemCode, $value)
-	{
-		$sRet = Str::pure2xml((string)$value);
-
-		switch($sItemCode)
-		{
-		case 'timespent':
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-				break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-					case 'deadline':
-						break;
-
-					case 'passed':
-					case 'triggered':
-						$sRet = $this->GetBooleanLabel($value);
-						break;
-
-					case 'overrun':
-						break;
-					}
-				}
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Implemented for the HTML spreadsheet format!	
-	 */	
-	public function GetSubItemAsEditValue($sItemCode, $value)
-	{
-		$sRet = $value;
-
-		switch($sItemCode)
-		{
-		case 'timespent':
-			break;
-
-		case 'started':
-		case 'laststart':
-		case 'stopped':
-			if (is_null($value))
-			{
-				$sRet = ''; // Undefined
-			}
-			else
-			{
-				$sRet = date((string)AttributeDateTime::GetFormat(), $value);
-			}
-			break;
-
-		default:
-			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
-			{
-				$sThPrefix = $iThreshold.'_';
-				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
-				{
-					// The current threshold is concerned
-					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
-					switch($sThresholdCode)
-					{
-					case 'deadline':
-						if ($value)
-						{
-							$sRet = date((string)AttributeDateTime::GetFormat(), $value);
-						}
-						else
-						{
-							$sRet = '';
-						}
-						break;
-					case 'passed':
-					case 'triggered':
-						$sRet = $this->GetBooleanLabel($value);
-						break;
-					case 'overrun':
-						break;
-					}
-				}
-			}
-		}
-		return $sRet;
-	}
-}
-
-/**
- * View of a subvalue of another attribute
- * If an attribute implements the verbs GetSubItem.... then it can expose
- * internal values, each of them being an attribute and therefore they
- * can be displayed at different times in the object lifecycle, and used for
- * reporting (as a condition in OQL, or as an additional column in an export)  
- * Known usages: Stop Watches can expose threshold statuses
- */
-class AttributeSubItem extends AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array('target_attcode', 'item_code'));
-	}
-
-	public function GetParentAttCode() {return $this->Get("target_attcode");} 
-
-	/**
-	 * Helper : get the attribute definition to which the execution will be forwarded	
-	 */	
-	public function GetTargetAttDef()
-	{
-		$sClass = $this->GetHostClass();
-		$oParentAttDef = MetaModel::GetAttributeDef($sClass, $this->Get('target_attcode'));
-		return $oParentAttDef;
-	}
-
-	public function GetEditClass() {return "";}
-	
-	public function GetValuesDef() {return null;}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return false;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return null;}
-//	public function IsNullAllowed() {return false;}
-
-	static public function LoadInObject() {return false;} // if this verb returns false, then GetValue must be implemented
-
-	/**
-	 * Used by DBOBject::Get()
-	 */
-	public function GetValue($oHostObject)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$parentValue = $oHostObject->GetStrict($oParent->GetCode());
-		$res = $oParent->GetSubItemValue($this->Get('item_code'), $parentValue, $oHostObject);
-		return $res;
-	}
-
-	// 
-//	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		return array();
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return "=";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '!=':
-			return $this->GetSQLExpr()." != $sQValue";
-			break;
-		case '=':
-		default:
-			return $this->GetSQLExpr()." = $sQValue";
-		}
-	} 
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemSQLExpression($this->Get('item_code'));
-		return $res;
-	}
-
-	public function GetAsPlainText($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsPlainText($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsHTML($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	public function GetAsHTMLForHistory($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsHTMLForHistory($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsCSV($this->Get('item_code'), $value, $sSeparator, $sTextQualifier, $bConvertToPlainText);
-		return $res;
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsXML($this->Get('item_code'), $value);
-		return $res;
-	}
-
-	/**
-	 * As of now, this function must be implemented to have the value in spreadsheet format
-	 */	 	
-	public function GetEditValue($value, $oHostObj = null)
-	{
-		$oParent = $this->GetTargetAttDef();
-		$res = $oParent->GetSubItemAsEditValue($this->Get('item_code'), $value);
-		return $res;
-	}
-	
-	public function IsPartOfFingerprint()
-	{
-		return false;
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		parent::MakeFormField($oObject, $oFormField);
-
-		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
-		$sAttCode = $this->GetCode();
-		$oFormField->SetCurrentValue(html_entity_decode($oObject->GetAsHTML($sAttCode), ENT_QUOTES, 'UTF-8'));
-		$oFormField->SetReadOnly(true);
-
-		return $oFormField;
-	}
-
-}
-
-/**
- * One way encrypted (hashed) password
- */
-class AttributeOneWayPassword extends AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("depends_on"));
-	}
-
-	public function GetEditClass() {return "One Way Password";}
-
-	static public function IsBasedOnDBColumns() {return true;}
-	static public function IsScalar() {return true;}
-	public function IsWritable() {return true;}
-	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
-	public function IsNullAllowed() {return $this->GetOptional("is_null_allowed", false);}
-
-	// Facilitate things: allow the user to Set the value from a string or from an ormPassword (already encrypted)
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		$oPassword = $proposedValue;
-		if (is_object($oPassword))
-		{
-			$oPassword = clone $proposedValue;
-		}
-		else
-		{
-			$oPassword = new ormPassword('', '');
-			$oPassword->SetPassword($proposedValue);
-		}
-		return $oPassword;
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning: AttributeOneWayPassword does not have any sql property so code = sql !
-		}
-		$aColumns = array();
-		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
-		$aColumns[''] = $sPrefix.'_hash';
-		$aColumns['_salt'] = $sPrefix.'_salt';
-		return $aColumns;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		if (!array_key_exists($sPrefix, $aCols))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$hashed = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
-
-		if (!array_key_exists($sPrefix.'_salt', $aCols)) 
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '".$sPrefix."_salt' from {$sAvailable}");
-		} 
-		$sSalt = isset($aCols[$sPrefix.'_salt']) ? $aCols[$sPrefix.'_salt'] : '';
-
-		$value = new ormPassword($hashed, $sSalt);
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		// #@# Optimization: do not load blobs anytime
-		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
-		//	 using memory in case a temporary table has to be created
-		//	 (temporary tables created on disk)
-		//	 We will have to remove the blobs from the list of attributes when doing the select
-		//	 then the use of Get() should finalize the load
-		if ($value instanceOf ormPassword)
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_hash'] = $value->GetHash();
-			$aValues[$this->GetCode().'_salt'] = $value->GetSalt();
-		}
-		else
-		{
-			$aValues = array();
-			$aValues[$this->GetCode().'_hash'] = '';
-			$aValues[$this->GetCode().'_salt'] = '';
-		}
-		return $aValues;
-	}
-
-	public function GetSQLColumns($bFullSpec = false)
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode().'_hash'] = 'TINYBLOB';
-		$aColumns[$this->GetCode().'_salt'] = 'TINYBLOB';
-		return $aColumns;
-	}
-
-	public function GetImportColumns()
-	{
-		$aColumns = array();
-		$aColumns[$this->GetCode()] = 'TINYTEXT'.CMDBSource::GetSqlStringColumnDefinition();
-		return $aColumns;
-	}
-
-	public function FromImportToValue($aCols, $sPrefix = '')
-	{
-		if (!isset($aCols[$sPrefix]))
-		{
-			$sAvailable = implode(', ', array_keys($aCols));
-			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
-		} 
-		$sClearPwd = $aCols[$sPrefix];
-
-		$oPassword = new ormPassword('', '');
-		$oPassword->SetPassword($sClearPwd);
-		return $oPassword;
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array();
-		// still not working... see later...
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array();
-	}
-	public function GetBasicFilterLooseOperator()
-	{
-		return '=';
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		return 'true';
-	} 
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (is_object($value))
-		{
-			return $value->GetAsHTML();
-		}
-		return '';
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		return ''; // Not exportable in CSV
-	}
-	
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		return ''; // Not exportable in XML
-	}
-	
-	public function GetValueLabel($sValue, $oHostObj = null)
-	{
-		// Don't display anything in "group by" reports
-		return '*****';
-	}
-	
-}
-
-// Indexed array having two dimensions
-class AttributeTable extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	public function GetEditClass() {return "Table";}
-
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "LONGTEXT".CMDBSource::GetSqlStringColumnDefinition();
-	}
-
-	public function GetMaxSize()
-	{
-		return null;
-	}
-
-	public function GetNullValue()
-	{
-		return array();
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return (count($proposedValue) == 0);
-	} 
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return '';
-	}
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue))
-		{
-			return array();
-		}
-		else if (!is_array($proposedValue))
-		{
-			return array(0 => array(0 => $proposedValue));
-		}
-		return $proposedValue;
-	}
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
-		try
-		{
-			$value = @unserialize($aCols[$sPrefix.'']);
-			if ($value === false)
-			{
-				$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
-			}
-		}
-		catch(Exception $e)
-		{
-			$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
-		}
-
-		return $value;
-	}
-
-	public function GetSQLValues($value)
-	{
-		$aValues = array();
-		$aValues[$this->Get("sql")] = serialize($value);
-		return $aValues;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (!is_array($value))
-		{
-			throw new CoreException('Expecting an array', array('found' => get_class($value)));
-		}
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "<TABLE class=\"listResults\">";
-		$sRes .= "<TBODY>";
-		foreach($value as $iRow => $aRawData)
-		{
-			$sRes .= "<TR>";
-			foreach ($aRawData as $iCol => $cell)
-			{
-				// Note: avoid the warning in case the cell is made of an array
-				$sCell = @Str::pure2html((string)$cell);
-				$sCell = str_replace("\n", "<br>\n", $sCell);
-				$sRes .= "<TD>$sCell</TD>";
-			}
-			$sRes .= "</TR>";
-		}
-		$sRes .= "</TBODY>";
-		$sRes .= "</TABLE>";
-		return $sRes;
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		// Not implemented
-		return '';
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "";
-		foreach($value as $iRow => $aRawData)
-		{
-			$sRes .= "<row>";
-			foreach ($aRawData as $iCol => $cell)
-			{
-				$sCell = Str::pure2xml((string)$cell);
-				$sRes .= "<cell icol=\"$iCol\">$sCell</cell>";
-			}
-			$sRes .= "</row>";
-		}
-		return $sRes;
-	}
-}
-
-// The PHP value is a hash array, it is stored as a TEXT column
-class AttributePropertySet extends AttributeTable
-{
-	public function GetEditClass() {return "PropertySet";}
-
-	// Facilitate things: allow the user to Set the value from a string
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (!is_array($proposedValue))
-		{
-			return array('?' => (string)$proposedValue);
-		}
-		return $proposedValue;
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (!is_array($value))
-		{
-			throw new CoreException('Expecting an array', array('found' => get_class($value)));
-		}
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "<TABLE class=\"listResults\">";
-		$sRes .= "<TBODY>";
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sRes .= "<TR>";
-			$sCell = str_replace("\n", "<br>\n", Str::pure2html((string)$sValue));
-			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
-			$sRes .= "</TR>";
-		}
-		$sRes .= "</TBODY>";
-		$sRes .= "</TABLE>";
-		return $sRes;
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$aRes = array();
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sFrom = array(',', '=');
-			$sTo = array('\,', '\=');
-			$aRes[] = $sProperty.'='.str_replace($sFrom, $sTo, (string)$sValue);
-		}
-		$sRaw = implode(',', $aRes);
-
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, $sRaw);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		if (count($value) == 0)
-		{
-			return "";
-		}
-
-		$sRes = "";
-		foreach($value as $sProperty => $sValue)
-		{
-			if ($sProperty == 'auth_pwd')
-			{
-				$sValue = '*****';
-			}
-			$sRes .= "<property id=\"$sProperty\">";
-			$sRes .= Str::pure2xml((string)$sValue);
-			$sRes .= "</property>";
-		}
-		return $sRes;
-	}
-}
-
-/**
- * The attribute dedicated to the friendly name automatic attribute (not written) 
- *
- * @package	 iTopORM
- */
-
-/**
- * The attribute dedicated to the friendly name automatic attribute (not written) 
- *
- * @package	 iTopORM
- */
-class AttributeFriendlyName extends AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
-	public $m_sValue;
-
-	public function __construct($sCode)
-	{
-		$this->m_sCode = $sCode;
-		$aParams = array();
-		$aParams["default_value"] = '';
-		parent::__construct($sCode, $aParams);
-
-		$this->m_sValue = $this->Get("default_value");
-	}
-
-
-	public function GetEditClass() {return "";}
-
-	public function GetValuesDef() {return null;}
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
-
-	static public function IsScalar() {return true;}
-	public function IsNullAllowed() {return false;}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		if ($sPrefix == '')
-		{
-			$sPrefix = $this->GetCode(); // Warning AttributeComputedFieldVoid does not have any sql property
-		}
-		return array('' => $sPrefix);
-	}
-
-	static public function IsBasedOnOQLExpression() {return true;}
-	public function GetOQLExpression()
-	{
-		return MetaModel::GetNameExpression($this->GetHostClass());
-	}
-
-	public function GetLabel($sDefault = null)
-	{
-		$sLabel = parent::GetLabel('');
-		if (strlen($sLabel) == 0)
-		{
-			$sLabel = Dict::S('Core:FriendlyName-Label');
-		}
-		return $sLabel;
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sLabel = parent::GetDescription('');
-		if (strlen($sLabel) == 0)
-		{
-			$sLabel = Dict::S('Core:FriendlyName-Description');
-		}
-		return $sLabel;
-	} 
-
-	public function FromSQLToValue($aCols, $sPrefix = '')
-	{
- 		$sValue = $aCols[$sPrefix];
-		return $sValue;
-	}
-
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-
-	static public function IsBasedOnDBColumns()
-	{
-		return false;
-	}
-
-	public function SetFixedValue($sValue)
-	{
-		$this->m_sValue = $sValue;
-	}
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return $this->m_sValue;
-	}
-
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		return Str::pure2html((string)$sValue);
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	static function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\StringField';
-	}
-
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-		}
-		$oFormField->SetReadOnly(true);
-		parent::MakeFormField($oObject, $oFormField);
-
-		return $oFormField;
-	}
-
-	// Do not display friendly names in the history of change
-	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
-	{
-		return '';
-	}
-
-	public function GetFilterDefinitions()
-	{
-		return array($this->GetCode() => new FilterFromAttribute($this));
-	}
-
-	public function GetBasicFilterOperators()
-	{
-		return array("="=>"equals", "!="=>"differs from");
-	}
-
-	public function GetBasicFilterLooseOperator()
-	{
-		return "Contains";
-	}
-
-	public function GetBasicFilterSQLExpr($sOpCode, $value)
-	{
-		$sQValue = CMDBSource::Quote($value);
-		switch ($sOpCode)
-		{
-		case '=':
-		case '!=':
-			return $this->GetSQLExpr()." $sOpCode $sQValue";
-		case 'Contains':
-			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
-		case 'NotLike':
-			return $this->GetSQLExpr()." NOT LIKE $sQValue";
-		case 'Like':
-		default:
-			return $this->GetSQLExpr()." LIKE $sQValue";
-		}
-	}
-	
-	public function IsPartOfFingerprint() { return false; }
-}
-
-/**
- * Holds the setting for the redundancy on a specific relation
- * Its value is a string, containing either:
- * - 'disabled'
- * - 'n', where n is a positive integer value giving the minimum count of items upstream
- * - 'n%', where n is a positive integer value, giving the minimum as a percentage of the total count of items upstream
- *
- * @package	 iTopORM
- */
-class AttributeRedundancySettings extends AttributeDBField
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return array('sql', 'relation_code', 'from_class', 'neighbour_id', 'enabled', 'enabled_mode', 'min_up', 'min_up_type', 'min_up_mode');
-	}
-
-	public function GetValuesDef() {return null;} 
-	public function GetPrerequisiteAttributes($sClass = null) {return array();}
-
-	public function GetEditClass() {return "RedundancySetting";}
-	protected function GetSQLCol($bFullSpec = false)
-	{
-		return "VARCHAR(20)"
-			.CMDBSource::GetSqlStringColumnDefinition()
-			.($bFullSpec ? $this->GetSQLColSpec() : '');
-	}
-
-
-	public function GetValidationPattern()
-	{
-		return "^[0-9]{1,3}|[0-9]{1,2}%|disabled$";
-	}
-
-	public function GetMaxSize()
-	{
-		return 20;
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		$sRet = 'disabled';
-		if ($this->Get('enabled'))
-		{
-			if ($this->Get('min_up_type') == 'count')
-			{
-				$sRet = (string) $this->Get('min_up');
-			}
-			else // percent
-			{
-				$sRet = $this->Get('min_up').'%';
-			}
-		}
-		return $sRet;
-	}
-
-	public function IsNullAllowed()
-	{
-		return false;
-	} 
-
-	public function GetNullValue()
-	{
-		return '';
-	} 
-
-	public function IsNull($proposedValue)
-	{
-		return ($proposedValue == '');
-	} 
-
-	public function MakeRealValue($proposedValue, $oHostObj)
-	{
-		if (is_null($proposedValue)) return '';
-		return (string)$proposedValue;
-	}
-
-	public function ScalarToSQL($value)
-	{
-		if (!is_string($value))
-		{
-			throw new CoreException('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
-		}
-		return $value;
-	}
-
-	public function GetRelationQueryData()
-	{
-		foreach (MetaModel::EnumRelationQueries($this->GetHostClass(), $this->Get('relation_code'), false) as $sDummy => $aQueryInfo)
-		{
-			if ($aQueryInfo['sFromClass'] == $this->Get('from_class'))
-			{
-				if ($aQueryInfo['sNeighbour'] == $this->Get('neighbour_id'))
-				{
-					return $aQueryInfo;
-				}
-			}
-		}
-		return array();
-	}
-
-	/**
-	 * Find the user option label
-	 *
-	 * @param user option : disabled|cout|percent
-	 *
-	 * @return string
-	 */
-	public function GetUserOptionFormat($sUserOption, $sDefault = null)
-	{
-		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, null, true /*user lang*/);
-		if (is_null($sLabel))
-		{
-			// If no default value is specified, let's define the most relevant one for developping purposes
-			if (is_null($sDefault))
-			{
-				$sDefault = str_replace('_', ' ', $this->m_sCode.':'.$sUserOption.'(%1$s)');
-			}
-			// Browse the hierarchy again, accepting default (english) translations
-			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, $sDefault, false);
-		}
-		return $sLabel;
-	}
-
-	/**
-	 * Override to display the value in the GUI
-	 */	
-	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
-	{
-		$sCurrentOption = $this->GetCurrentOption($sValue);
-		$sClass = $oHostObject ? get_class($oHostObject) : $this->m_sHostClass;
-		return sprintf($this->GetUserOptionFormat($sCurrentOption), $this->GetMinUpValue($sValue), MetaModel::GetName($sClass));
-	}
-
-	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$sFrom = array("\r\n", $sTextQualifier);
-		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
-		return $sTextQualifier.$sEscaped.$sTextQualifier;
-	}
-
-	/**
-	 * Helper to interpret the value, given the current settings and string representation of the attribute	
-	 */	
-	public function IsEnabled($sValue)
-	{
-		if ($this->get('enabled_mode') == 'fixed')
-		{
-			$bRet = $this->get('enabled');
-		}
-		else
-		{
-			$bRet = ($sValue != 'disabled');
-		}
-		return $bRet;
-	}
-
-	/**
-	 * Helper to interpret the value, given the current settings and string representation of the attribute	
-	 */	
-	public function GetMinUpType($sValue)
-	{
-		if ($this->get('min_up_mode') == 'fixed')
-		{
-			$sRet = $this->get('min_up_type');
-		}
-		else
-		{
-			$sRet = 'count';
-			if (substr(trim($sValue), -1, 1) == '%')
-			{
-				$sRet = 'percent';
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Helper to interpret the value, given the current settings and string representation of the attribute	
-	 */	
-	public function GetMinUpValue($sValue)
-	{
-		if ($this->get('min_up_mode') == 'fixed')
-		{
-			$iRet = (int) $this->Get('min_up');
-		}
-		else
-		{
-			$sRefValue = $sValue;
-			if (substr(trim($sValue), -1, 1) == '%')
-			{
-				$sRefValue = substr(trim($sValue), 0, -1);
-			}
-			$iRet = (int) trim($sRefValue);
-		}
-		return $iRet;
-	}
-
-	/**
-	 * Helper to determine if the redundancy can be viewed/edited by the end-user
-	 */	
-	public function IsVisible()
-	{
-		$bRet = false;
-		if ($this->Get('enabled_mode') == 'fixed')
-		{
-			$bRet = $this->Get('enabled');
-		}
-		elseif ($this->Get('enabled_mode') == 'user')
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-
-	public function IsWritable()
-	{
-		if (($this->Get('enabled_mode') == 'fixed') && ($this->Get('min_up_mode') == 'fixed'))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Returns an HTML form that can be read by ReadValueFromPostedForm
-	 */	
-	public function GetDisplayForm($sCurrentValue, $oPage, $bEditMode = false, $sFormPrefix = '')
-	{
-		$sRet = '';
-		$aUserOptions = $this->GetUserOptions($sCurrentValue);
-		if (count($aUserOptions) < 2)
-		{
-			$bEditOption = false;
-		}
-		else
-		{
-			$bEditOption = $bEditMode;
-		}
-		$sCurrentOption = $this->GetCurrentOption($sCurrentValue);
-		foreach($aUserOptions as $sUserOption)
-		{
-			$bSelected = ($sUserOption == $sCurrentOption);
-			$sRet .= '<div>';
-			$sRet .= $this->GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditOption, $sUserOption, $bSelected);
-			$sRet .= '</div>';
-		}
-		return $sRet;
-	}
-
-	const USER_OPTION_DISABLED = 'disabled';
-	const USER_OPTION_ENABLED_COUNT = 'count';
-	const USER_OPTION_ENABLED_PERCENT = 'percent';
-
-	/**
-	 * Depending on the xxx_mode parameters, build the list of options that are allowed to the end-user
-	 */	 	
-	protected function GetUserOptions($sValue)
-	{
-		$aRet = array();
-		if ($this->Get('enabled_mode') == 'user')
-		{
-			$aRet[] = self::USER_OPTION_DISABLED;
-		}
-		
-		if ($this->Get('min_up_mode') == 'user')
-		{
-			$aRet[] = self::USER_OPTION_ENABLED_COUNT;
-			$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
-		}
-		else
-		{
-			if ($this->GetMinUpType($sValue) == 'count')
-			{
-				$aRet[] = self::USER_OPTION_ENABLED_COUNT;
-			}
-			else
-			{
-				$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
-			}
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Convert the string representation into one of the existing options	
-	 */	
-	protected function GetCurrentOption($sValue)
-	{
-		$sRet = self::USER_OPTION_DISABLED;
-		if ($this->IsEnabled($sValue))
-		{
-			if ($this->GetMinUpType($sValue) == 'count')
-			{
-				$sRet = self::USER_OPTION_ENABLED_COUNT;
-			}
-			else
-			{
-				$sRet = self::USER_OPTION_ENABLED_PERCENT;
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Display an option (form, or current value)
-	 */	 	
-	protected function GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditMode, $sUserOption, $bSelected = true)
-	{
-		$sRet = '';
-
-		$iCurrentValue = $this->GetMinUpValue($sCurrentValue);
-		if ($bEditMode)
-		{
-			$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
-			switch ($sUserOption)
-			{
-			case self::USER_OPTION_DISABLED:
-				$sValue = ''; // Empty placeholder
-				break;
-	
-			case self::USER_OPTION_ENABLED_COUNT:
-				if ($bEditMode)
-				{
-					$sName = $sHtmlNamesPrefix.'_min_up_count';
-					$sEditValue = $bSelected ? $iCurrentValue : '';
-					$sValue = '<input class="redundancy-min-up-count" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
-					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
-					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
-				}
-				else
-				{
-					$sValue = $iCurrentValue;
-				}
-				break;
-	
-			case self::USER_OPTION_ENABLED_PERCENT:
-				if ($bEditMode)
-				{
-					$sName = $sHtmlNamesPrefix.'_min_up_percent';
-					$sEditValue = $bSelected ? $iCurrentValue : '';
-					$sValue = '<input class="redundancy-min-up-percent" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
-					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
-					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
-				}
-				else
-				{
-					$sValue = $iCurrentValue;
-				}
-				break;
-			}
-			$sLabel = sprintf($this->GetUserOptionFormat($sUserOption), $sValue, MetaModel::GetName($this->GetHostClass()));
-
-			$sOptionName = $sHtmlNamesPrefix.'_user_option';
-			$sOptionId = $sOptionName.'_'.$sUserOption;
-			$sChecked = $bSelected ? 'checked' : '';
-			$sRet = '<input type="radio" name="'.$sOptionName.'" id="'.$sOptionId.'" value="'.$sUserOption.'" '.$sChecked.'> <label for="'.$sOptionId.'">'.$sLabel.'</label>';
-		}
-		else
-		{
-			// Read-only: display only the currently selected option
-			if ($bSelected)
-			{
-				$sRet = sprintf($this->GetUserOptionFormat($sUserOption), $iCurrentValue, MetaModel::GetName($this->GetHostClass()));
-			}
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Makes the string representation out of the values given by the form defined in GetDisplayForm	
-	 */	
-	public function ReadValueFromPostedForm($sFormPrefix)
-	{
-		$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
-
-		$iMinUpCount = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_count', null, 'raw_data');
-		$iMinUpPercent = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_percent', null, 'raw_data');
-		$sSelectedOption = utils::ReadPostedParam($sHtmlNamesPrefix.'_user_option', null, 'raw_data');
-		switch ($sSelectedOption)
-		{
-		case self::USER_OPTION_ENABLED_COUNT:
-			$sRet = $iMinUpCount;
-			break;
-
-		case self::USER_OPTION_ENABLED_PERCENT:
-			$sRet = $iMinUpPercent.'%';
-			break;
-
-		case self::USER_OPTION_DISABLED:
-		default:
-			$sRet = 'disabled';
-			break;
-		}
-		return $sRet;
-	}
-}
-
-/**
- * Custom fields managed by an external implementation
- *
- * @package     iTopORM
- */
-class AttributeCustomFields extends AttributeDefinition
-{
-	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
-
-	static public function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("handler_class"));
-	}
-
-	public function GetEditClass() {return "CustomFields";}
-	public function IsWritable() {return true;}
-	static public function LoadFromDB() {return false;} // See ReadValue...
-
-	public function GetDefaultValue(DBObject $oHostObject = null)
-	{
-		return new ormCustomFieldsValue($oHostObject, $this->GetCode());
-	}
-
-	public function GetBasicFilterOperators() {return array();}
-	public function GetBasicFilterLooseOperator() {return '';}
-	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
-
-	/**
-	 * @param DBObject $oHostObject
-	 * @param array|null $aValues
-	 * @return CustomFieldsHandler
-	 */
-	public function GetHandler($aValues = null)
-	{
-		$sHandlerClass = $this->Get('handler_class');
-		$oHandler = new $sHandlerClass($this->GetCode());
-		if (!is_null($aValues))
-		{
-			$oHandler->SetCurrentValues($aValues);
-		}
-		return $oHandler;
-	}
-
-	public function GetPrerequisiteAttributes($sClass = null)
-	{
-		$sHandlerClass = $this->Get('handler_class');
-		return $sHandlerClass::GetPrerequisiteAttributes($sClass);
-	}
-
-	public function GetEditValue($sValue, $oHostObj = null)
-	{
-		return $this->GetForTemplate($sValue, '', $oHostObj, true);
-	}
-
-	/**
-	 * Makes the string representation out of the values given by the form defined in GetDisplayForm
-	 */
-	public function ReadValueFromPostedForm($oHostObject, $sFormPrefix)
-	{
-		$aRawData = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$this->GetCode()}", '{}', 'raw_data'), true);
-		return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRawData);
-	}
-
-	public function MakeRealValue($proposedValue, $oHostObject)
-	{
-		if (is_object($proposedValue) && ($proposedValue instanceof ormCustomFieldsValue))
-		{
-			return $proposedValue;
-		}
-		elseif (is_string($proposedValue))
-		{
-			$aValues = json_decode($proposedValue, true);
-			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
-		}
-		elseif (is_array($proposedValue))
-		{
-			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $proposedValue);
-		}
-		elseif (is_null($proposedValue))
-		{
-			return new ormCustomFieldsValue($oHostObject, $this->GetCode());
-		}
-		throw new Exception('Unexpected type for the value of a custom fields attribute: '.gettype($proposedValue));
-	}
-
-	static public function GetFormFieldClass()
-	{
-		return '\\Combodo\\iTop\\Form\\Field\\SubFormField';
-	}
-
-	/**
-	 * Override to build the relevant form field
-	 *
-	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behaves more like a Prepare.
-	 */
-	public function MakeFormField(DBObject $oObject, $oFormField = null)
-	{
-		if ($oFormField === null)
-		{
-			$sFormFieldClass = static::GetFormFieldClass();
-			$oFormField = new $sFormFieldClass($this->GetCode());
-			$oFormField->SetForm($this->GetForm($oObject));
-		}
-		parent::MakeFormField($oObject, $oFormField);
-		
-		return $oFormField;
-	}
-
-	/**
-	 * @param DBObject $oHostObject
-	 * @param null $sFormPrefix
-	 * @return Combodo\iTop\Form\Form
-	 * @throws \Exception
-	 */
-	public function GetForm(DBObject $oHostObject, $sFormPrefix = null)
-	{
-		try
-		{
-			$oValue = $oHostObject->Get($this->GetCode());
-			$oHandler = $this->GetHandler($oValue->GetValues());
-			$sFormId = is_null($sFormPrefix) ? 'cf_'.$this->GetCode() : $sFormPrefix.'_cf_'.$this->GetCode();
-			$oHandler->BuildForm($oHostObject, $sFormId);
-			$oForm = $oHandler->GetForm();
-		}
-		catch (Exception $e)
-		{
-			$oForm = new \Combodo\iTop\Form\Form('');
-			$oField = new \Combodo\iTop\Form\Field\LabelField('');
-			$oField->SetLabel('Custom field error: '.$e->getMessage());
-			$oForm->AddField($oField);
-			$oForm->Finalize();
-		}
-		return $oForm;
-	}
-
-	/**
-	 * Read the data from where it has been stored. This verb must be implemented as soon as LoadFromDB returns false and LoadInObject returns true
-	 * @param $oHostObject
-	 * @return ormCustomFieldsValue
-	 */
-	public function ReadValue($oHostObject)
-	{
-		try
-		{
-			$oHandler = $this->GetHandler();
-			$aValues = $oHandler->ReadValues($oHostObject);
-			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
-		}
-		catch (Exception $e)
-		{
-			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode());
-		}
-		return $oRet;
-	}
-
-	/**
-	 * Record the data (currently in the processing of recording the host object)
-	 * It is assumed that the data has been checked prior to calling Write()
-	 * @param DBObject $oHostObject
-	 * @param ormCustomFieldsValue|null $oValue (null is the default value)
-	 */
-	public function WriteValue(DBObject $oHostObject, ormCustomFieldsValue $oValue = null)
-	{
-		if (is_null($oValue))
-		{
-			$oHandler = $this->GetHandler();
-			$aValues = array();
-		}
-		else
-		{
-			// Pass the values through the form to make sure that they are correct
-			$oHandler = $this->GetHandler($oValue->GetValues());
-			$oHandler->BuildForm($oHostObject, '');
-			$oForm = $oHandler->GetForm();
-			$aValues = $oForm->GetCurrentValues();
-		}
-		return $oHandler->WriteValues($oHostObject, $aValues);
-	}
-
-	/**
-	 * The part of the current attribute in the object's signature, for the supplied value
-	 * @param ormCustomFieldsValue $value The value of this attribute for the object
-	 * @return string The "signature" for this field/attribute
-	 */
-	public function Fingerprint($value)
-	{
-		$oHandler = $this->GetHandler($value->GetValues());
-		return $oHandler->GetValueFingerprint();
-	}
-
-	/**
-	 * Check the validity of the data
-	 * @param DBObject $oHostObject
-	 * @param $value
-	 * @return bool|string true or error message
-	 */
-	public function CheckValue(DBObject $oHostObject, $value)
-	{
-		try
-		{
-			$oHandler = $this->GetHandler($value->GetValues());
-			$oHandler->BuildForm($oHostObject, '');
-			$oForm = $oHandler->GetForm();
-			$oForm->Validate();
-			if ($oForm->GetValid())
-			{
-				$ret = true;
-			}
-			else
-			{
-				$aMessages = array();
-				foreach ($oForm->GetErrorMessages() as $sFieldId => $aFieldMessages)
-				{
-					$aMessages[] = $sFieldId.': '.implode(', ', $aFieldMessages);
-				}
-				$ret = 'Invalid value: '.implode(', ', $aMessages);
-			}
-		}
-		catch (Exception $e)
-		{
-			$ret = $e->getMessage();
-		}
-		return $ret;
-	}
-
-	/**
-	 * Cleanup data upon object deletion (object id still available here)
-	 * @param DBObject $oHostObject
-	 * @return
-	 * @throws \CoreException
-	 */
-	public function DeleteValue(DBObject $oHostObject)
-	{
-		$oValue = $oHostObject->Get($this->GetCode());
-		$oHandler = $this->GetHandler($oValue->GetValues());
-		return $oHandler->DeleteValues($oHostObject);
-	}
-
-	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
-	{
-		try
-		{
-			$sRet = $value->GetAsHTML($bLocalize);
-		}
-		catch (Exception $e)
-		{
-			$sRet = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
-		}
-		return $sRet;
-	}
-
-	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
-	{
-		try
-		{
-			$sRet = $value->GetAsXML($bLocalize);
-		}
-		catch (Exception $e)
-		{
-			$sRet = Str::pure2xml('Custom field error: '.$e->getMessage());
-		}
-		return $sRet;
-	}
-
-	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
-	{
-		try
-		{
-			$sRet = $value->GetAsCSV($sSeparator, $sTextQualifier, $bLocalize, $bConvertToPlainText);
-		}
-		catch (Exception $e)
-		{
-			$sFrom = array("\r\n", $sTextQualifier);
-			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
-			$sEscaped = str_replace($sFrom, $sTo, 'Custom field error: '.$e->getMessage());
-			$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
-		}
-		return $sRet;
-	}
-
-	/**
-	 * List the available verbs for 'GetForTemplate'
-	 */
-	public function EnumTemplateVerbs()
-	{
-		$sHandlerClass = $this->Get('handler_class');
-		return $sHandlerClass::EnumTemplateVerbs();
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 *
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $oHostObject DBObject The object
-	 * @param $bLocalize bool Whether or not to localize the value
-	 *
-	 * @return string
-	 */
-	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
-	{
-		try
-		{
-			$sRet = $value->GetForTemplate($sVerb, $bLocalize);
-		}
-		catch (Exception $e)
-		{
-			$sRet = 'Custom field error: '.$e->getMessage();
-		}
-		return $sRet;
-	}
-
-	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
-	{
-		return null;
-	}
-
-	/**
-	 * Helper to get a value that will be JSON encoded
-	 * The operation is the opposite to FromJSONToValue
-	 */
-	public function GetForJSON($value)
-	{
-		return null;
-	}
-
-	/**
-	 * Helper to form a value, given JSON decoded data
-	 * The operation is the opposite to GetForJSON
-	 */
-	public function FromJSONToValue($json)
-	{
-		return null;
-	}
-
-	public function Equals($val1, $val2)
-	{
-		try
-		{
-			$bEquals = $val1->Equals($val2);
-		}
-		catch (Exception $e)
-		{
-			false;
-		}
-		return $bEquals;
-	}
-}
-
-class AttributeArchiveFlag extends AttributeBoolean
-{
-	public function __construct($sCode)
-	{
-		parent::__construct($sCode, array("allowed_values" => null, "sql" => $sCode, "default_value" => false, "is_null_allowed" => false, "depends_on" => array()));
-	}
-	public function RequiresIndex()
-	{
-		return true;
-	}
-	public function CopyOnAllTables()
-	{
-		return true;
-	}
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
-class AttributeArchiveDate extends AttributeDate
-{
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveDate/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeArchiveDate/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
-
-class AttributeObsolescenceFlag extends AttributeBoolean
-{
-	public function __construct($sCode)
-	{
-		parent::__construct($sCode, array("allowed_values"=>null, "sql"=>$sCode, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()));
-	}
-	public function IsWritable()
-	{
-		return false;
-	}
-	public function IsMagic()
-	{
-		return true;
-	}
-
-	static public function IsBasedOnDBColumns() {return false;}
-	/**
-	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
-	 * @return bool
-	 */
-	static public function IsBasedOnOQLExpression() {return true;}
-	public function GetOQLExpression()
-	{
-		return MetaModel::GetObsolescenceExpression($this->GetHostClass());
-	}
-
-	public function GetSQLExpressions($sPrefix = '')
-	{
-		return array();
-	}
-	public function GetSQLColumns($bFullSpec = false) {return array();} // returns column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
-	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
-
-	public function GetEditClass() {return "";}
-
-	public function GetValuesDef() {return null;}
-	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
-
-	public function IsDirectField() {return true;}
-	static public function IsScalar() {return true;}
-	public function GetSQLExpr()
-	{
-		return null;
-	}
-
-	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
-	public function IsNullAllowed() {return false;}
-
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
-
-class AttributeObsolescenceDate extends AttributeDate
-{
-	public function GetLabel($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label', $sDefault);
-		return parent::GetLabel($sDefault);
-	}
-	public function GetDescription($sDefault = null)
-	{
-		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label+', $sDefault);
-		return parent::GetDescription($sDefault);
-	}
-}
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Typology for the attributes
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license	 http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+require_once('MyHelpers.class.inc.php');
+require_once('ormdocument.class.inc.php');
+require_once('ormstopwatch.class.inc.php');
+require_once('ormpassword.class.inc.php');
+require_once('ormcaselog.class.inc.php');
+require_once('ormlinkset.class.inc.php');
+require_once('htmlsanitizer.class.inc.php');
+require_once(APPROOT.'sources/autoload.php');
+require_once('customfieldshandler.class.inc.php');
+require_once('ormcustomfieldsvalue.class.inc.php');
+require_once('datetimeformat.class.inc.php');
+// This should be changed to a use when we go full-namespace
+require_once(APPROOT . 'sources/form/validator/validator.class.inc.php');
+require_once(APPROOT . 'sources/form/validator/notemptyextkeyvalidator.class.inc.php');
+
+/**
+ * MissingColumnException - sent if an attribute is being created but the column is missing in the row 
+ *
+ * @package	 iTopORM
+ */
+class MissingColumnException extends Exception
+{}
+
+/**
+ * add some description here... 
+ *
+ * @package	 iTopORM
+ */
+define('EXTKEY_RELATIVE', 1);
+
+/**
+ * add some description here... 
+ *
+ * @package	 iTopORM
+ */
+define('EXTKEY_ABSOLUTE', 2);
+
+/**
+ * Propagation of the deletion through an external key - ask the user to delete the referencing object 
+ *
+ * @package	 iTopORM
+ */
+define('DEL_MANUAL', 1);
+
+/**
+ * Propagation of the deletion through an external key - ask the user to delete the referencing object 
+ *
+ * @package	 iTopORM
+ */
+define('DEL_AUTO', 2);
+/**
+ * Fully silent delete... not yet implemented
+ */
+define('DEL_SILENT', 2);
+/**
+ * For HierarchicalKeys only: move all the children up one level automatically
+ */
+define('DEL_MOVEUP', 3);
+
+
+/**
+ * For Link sets: tracking_level
+ *
+ * @package	 iTopORM
+ */
+define('ATTRIBUTE_TRACKING_NONE', 0); // Do not track changes of the attribute
+define('ATTRIBUTE_TRACKING_ALL', 3); // Do track all changes of the attribute
+define('LINKSET_TRACKING_NONE', 0); // Do not track changes in the link set
+define('LINKSET_TRACKING_LIST', 1); // Do track added/removed items
+define('LINKSET_TRACKING_DETAILS', 2); // Do track modified items
+define('LINKSET_TRACKING_ALL', 3); // Do track added/removed/modified items
+
+define('LINKSET_EDITMODE_NONE', 0); // The linkset cannot be edited at all from inside this object
+define('LINKSET_EDITMODE_ADDONLY', 1); // The only possible action is to open a new window to create a new object
+define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
+define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
+define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
+
+
+/**
+ * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.) 
+ *
+ * @package	 iTopORM
+ */
+abstract class AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE_RAW = 'raw';
+	const SEARCH_WIDGET_TYPE_STRING = 'string';
+	const SEARCH_WIDGET_TYPE_NUMERIC = 'numeric';
+	const SEARCH_WIDGET_TYPE_ENUM = 'enum';
+	const SEARCH_WIDGET_TYPE_EXTERNAL_KEY = 'external_key';
+	const SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY = 'hierarchical_key';
+	const SEARCH_WIDGET_TYPE_EXTERNAL_FIELD = 'external_field';
+	const SEARCH_WIDGET_TYPE_DATE_TIME = 'date_time';
+	const SEARCH_WIDGET_TYPE_DATE = 'date';
+
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	const INDEX_LENGTH = 95;
+
+	public function GetType()
+	{
+		return Dict::S('Core:'.get_class($this));
+	}
+	public function GetTypeDesc()
+	{
+		return Dict::S('Core:'.get_class($this).'+');
+	}
+
+	abstract public function GetEditClass();
+
+	/**
+	 * Return the search widget type corresponding to this attribute
+	 *
+	 * @return string
+	 */
+	public function GetSearchType()
+	{
+		return static::SEARCH_WIDGET_TYPE;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsSearchable()
+	{
+		return static::SEARCH_WIDGET_TYPE != static::SEARCH_WIDGET_TYPE_RAW;
+	}
+
+	protected $m_sCode;
+	private $m_aParams = array();
+	protected $m_sHostClass = '!undefined!';
+	public function Get($sParamName) {return $this->m_aParams[$sParamName];}
+
+	public function GetIndexLength() {
+		$iMaxLength = $this->GetMaxSize();
+		if (is_null($iMaxLength))
+		{
+			return null;
+		}
+		if ($iMaxLength > static::INDEX_LENGTH)
+		{
+			return static::INDEX_LENGTH;
+		}
+		return $iMaxLength;
+	}
+
+	public function IsParam($sParamName) {return (array_key_exists($sParamName, $this->m_aParams));}
+
+	protected function GetOptional($sParamName, $default)
+	{
+		if (array_key_exists($sParamName, $this->m_aParams))
+		{
+			return $this->m_aParams[$sParamName];
+		}
+		else
+		{
+			return $default;
+		}
+	}
+	
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$this->m_aParams = $aParams;
+		$this->ConsistencyCheck();
+	}
+
+	public function GetParams()
+	{
+		return $this->m_aParams;
+	}
+
+	public function HasParam($sParam)
+	{
+		return array_key_exists($sParam, $this->m_aParams);
+	}
+
+	public function SetHostClass($sHostClass)
+	{
+		$this->m_sHostClass = $sHostClass;
+	}
+	public function GetHostClass()
+	{
+		return $this->m_sHostClass;
+	}
+
+	public function ListSubItems()
+	{
+		$aSubItems = array();
+		foreach(MetaModel::ListAttributeDefs($this->m_sHostClass) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeSubItem)
+			{
+				if ($oAttDef->Get('target_attcode') == $this->m_sCode)
+				{
+					$aSubItems[$sAttCode] = $oAttDef;
+				}
+			}
+		}
+		return $aSubItems;
+	}
+
+	// Note: I could factorize this code with the parameter management made for the AttributeDef class
+	// to be overloaded
+	static public function ListExpectedParams()
+	{
+		return array();
+	}
+
+	private function ConsistencyCheck()
+	{
+		// Check that any mandatory param has been specified
+		//
+		$aExpectedParams = $this->ListExpectedParams();
+		foreach($aExpectedParams as $sParamName)
+		{
+			if (!array_key_exists($sParamName, $this->m_aParams))
+			{
+				$aBacktrace = debug_backtrace();
+				$sTargetClass = $aBacktrace[2]["class"];
+				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
+				throw new Exception("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
+			}
+		}
+	}
+
+	/**
+	 * Check the validity of the given value
+	 *
+	 * @param DBObject $oHostObject
+	 * @param string An error if any, null otherwise
+	 *
+	 * @return bool
+	 */
+	public function CheckValue(DBObject $oHostObject, $value)
+	{
+		// todo: factorize here the cases implemented into DBObject
+		return true;
+	}
+
+	// table, key field, name field
+	public function ListDBJoins()
+	{
+		return "";
+		// e.g: return array("Site", "infrid", "name");
+	}
+
+	public function GetFinalAttDef()
+	{
+		return $this;
+	}
+
+	/**
+	 * Deprecated - use IsBasedOnDBColumns instead
+	 * @return bool
+	 */
+	public function IsDirectField() {return static::IsBasedOnDBColumns();}
+
+	/**
+	 * Returns true if the attribute value is built after DB columns
+	 * @return bool
+	 */
+	static public function IsBasedOnDBColumns() {return false;}
+	/**
+	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
+	 * @return bool
+	 */
+	static public function IsBasedOnOQLExpression() {return false;}
+	/**
+	 * Returns true if the attribute value can be shown as a string
+	 * @return bool
+	 */
+	static public function IsScalar() {return false;}
+	/**
+	 * Returns true if the attribute value is a set of related objects (1-N or N-N)
+	 * @return bool
+	 */
+	static public function IsLinkSet() {return false;}
+	/**
+	 * Returns true if the attribute is an external key, either directly (RELATIVE to the host class), or indirectly (ABSOLUTELY)
+	 * @return bool
+	 */
+	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return false;}
+	/**
+	 * Returns true if the attribute value is an external key, pointing to the host class
+	 * @return bool
+	 */
+	static public function IsHierarchicalKey() {return false;}
+	/**
+	 * Returns true if the attribute value is stored on an object pointed to be an external key
+	 * @return bool
+	 */
+	static public function IsExternalField() {return false;}
+	/**
+	 * Returns true if the attribute can be written (by essence : metamodel field option)
+	 *
+	 * @return bool
+	 * @see \DBObject::IsAttributeReadOnlyForCurrentState() for a specific object instance (depending on its workflow)
+	 */
+	public function IsWritable() {return false;}
+	/**
+	 * Returns true if the attribute has been added automatically by the framework
+	 * @return bool
+	 */
+	public function IsMagic() {return $this->GetOptional('magic', false);}
+	/**
+	 * Returns true if the attribute value is kept in the loaded object (in memory)
+	 * @return bool
+	 */
+	static public function LoadInObject() {return true;}
+	/**
+	 * Returns true if the attribute value comes from the database in one way or another
+	 * @return bool
+	 */
+	static public function LoadFromDB() {return true;}
+	/**
+	 * Returns true if the attribute should be loaded anytime (in addition to the column selected by the user)
+	 * @return bool
+	 */
+	public function AlwaysLoadInTables() {return $this->GetOptional('always_load_in_tables', false);}
+	/**
+	 * Must return the value if LoadInObject returns false
+	 * @return mixed
+	 */
+	public function GetValue($oHostObject){return null;}
+	/**
+	 * Returns true if the attribute must not be stored if its current value is "null" (Cf. IsNull())
+	 * @return bool
+	 */
+	public function IsNullAllowed() {return true;}
+	/**
+	 * Returns the attribute code (identifies the attribute in the host class)
+	 * @return string
+	 */
+	public function GetCode() {return $this->m_sCode;}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute() {return null;}
+
+	/**
+	 * Helper to browse the hierarchy of classes, searching for a label
+	 */	 	
+	protected function SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly)
+	{
+		$sLabel = Dict::S('Class:'.$this->m_sHostClass.$sDictEntrySuffix, '', $bUserLanguageOnly);
+		if (strlen($sLabel) == 0)
+		{
+			// Nothing found: go higher in the hierarchy (if possible)
+			//
+			$sLabel = $sDefault;
+			$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
+			if ($sParentClass)
+			{
+				if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
+					$sLabel = $oAttDef->SearchLabel($sDictEntrySuffix, $sDefault, $bUserLanguageOnly);
+				}
+			}
+		}
+		return $sLabel;
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = str_replace('_', ' ', $this->m_sCode);
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode, $sDefault, false);
+		}
+		return $sLabel;
+	}
+
+	/**
+	 * Get the label corresponding to the given value (in plain text)
+	 * To be overloaded for localized enums
+	 */
+	public function GetValueLabel($sValue)
+	{
+		return $sValue;
+	}
+
+	/**
+	 * Get the value from a given string (plain text, CSV import)
+	 * Return null if no match could be found	 
+	 */
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		return $this->MakeRealValue($sProposedValue, null);
+	}
+
+	/**
+	 * Parses a search string coming from user input
+	 * @param string $sSearchString
+	 * @return string
+	 */
+	public function ParseSearchString($sSearchString)
+	{
+		return $sSearchString;
+	}
+	public function GetLabel_Obsolete()
+	{
+		// Written for compatibility with a data model written prior to version 0.9.1
+		if (array_key_exists('label', $this->m_aParams))
+		{
+			return $this->m_aParams['label'];
+		}
+		else
+		{
+			return $this->GetLabel();
+		}
+	}
+
+	public function GetDescription($sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = '';
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'+', $sDefault, false);
+		}
+		return $sLabel;
+	}
+
+	public function GetHelpOnEdition($sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = '';
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'?', $sDefault, false);
+		}
+		return $sLabel;
+	} 
+
+	public function GetHelpOnSmartSearch()
+	{
+		$aParents = array_merge(array(get_class($this) => get_class($this)), class_parents($this));
+		foreach ($aParents as $sClass)
+		{
+			$sHelp = Dict::S("Core:$sClass?SmartSearch", '-missing-');
+			if ($sHelp != '-missing-')
+			{
+				return $sHelp;
+			}
+		} 
+		return '';
+	} 
+
+	public function GetDescription_Obsolete()
+	{
+		// Written for compatibility with a data model written prior to version 0.9.1
+		if (array_key_exists('description', $this->m_aParams))
+		{
+			return $this->m_aParams['description'];
+		}
+		else
+		{
+			return $this->GetDescription();
+		}
+	}
+
+	public function GetTrackingLevel()
+	{
+		return $this->GetOptional('tracking_level', ATTRIBUTE_TRACKING_ALL);
+	}
+
+	public function GetValuesDef() {return null;} 
+	public function GetPrerequisiteAttributes($sClass = null) {return array();}
+
+	public function GetNullValue() {return null;} 
+	public function IsNull($proposedValue) {return is_null($proposedValue);} 
+
+	public function MakeRealValue($proposedValue, $oHostObj) {return $proposedValue;} // force an allowed value (type conversion and possibly forces a value as mySQL would do upon writing!)
+	public function Equals($val1, $val2) {return ($val1 == $val2);}
+
+	public function GetSQLExpressions($sPrefix = '') {return array();} // returns suffix/expression pairs (1 in most of the cases), for READING (Select)
+	public function FromSQLToValue($aCols, $sPrefix = '') {return null;} // returns a value out of suffix/value pairs, for SELECT result interpretation
+
+	/**
+	 * @param bool $bFullSpec
+	 *
+	 * @return array column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
+	 * @see \CMDBSource::GetFieldSpec()
+	 */
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		return array();
+	}
+
+	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
+	public function RequiresIndex() {return false;}
+	public function CopyOnAllTables() {return false;}
+
+	public function GetOrderBySQLExpressions($sClassAlias)
+	{
+		// Note: This is the responsibility of this function to place backticks around column aliases
+		return array('`'.$sClassAlias.$this->GetCode().'`');
+	}
+	
+	public function GetOrderByHint()
+	{
+		return '';
+	}
+
+   // Import - differs slightly from SQL input, but identical in most cases
+   //
+	public function GetImportColumns() {return $this->GetSQLColumns();}
+	public function FromImportToValue($aCols, $sPrefix = '')
+	{
+		$aValues = array();
+		foreach ($this->GetSQLExpressions($sPrefix) as $sAlias => $sExpr)
+		{
+			// This is working, based on the assumption that importable fields
+			// are not computed fields => the expression is the name of a column
+			$aValues[$sPrefix.$sAlias] = $aCols[$sExpr];
+		}
+		return $this->FromSQLToValue($aValues, $sPrefix);
+	}
+
+	public function GetValidationPattern()
+	{
+		return '';
+	}
+	
+	public function CheckFormat($value)
+	{
+		return true;
+	}
+	 
+	public function GetMaxSize()
+	{
+		return null;
+	}
+	 
+	public function MakeValue()
+	{
+		$sComputeFunc = $this->Get("compute_func");
+		if (empty($sComputeFunc)) return null;
+
+		return call_user_func($sComputeFunc);
+	}
+	
+	abstract public function GetDefaultValue(DBObject $oHostObject = null);
+
+	//
+	// To be overloaded in subclasses
+	//
+	
+	abstract public function GetBasicFilterOperators(); // returns an array of "opCode"=>"description"
+	abstract public function GetBasicFilterLooseOperator(); // returns an "opCode"
+	//abstract protected GetBasicFilterHTMLInput();
+	abstract public function GetBasicFilterSQLExpr($sOpCode, $value); 
+
+	public function GetFilterDefinitions()
+	{
+		return array();
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return (string)$sValue;
+	}
+	
+	/**
+	 * For fields containing a potential markup, return the value without this markup
+	 * @return string
+	 */
+	public function GetAsPlainText($sValue, $oHostObj = null)
+	{
+		return (string) $this->GetEditValue($sValue, $oHostObj);
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		// In most of the cases, that will be the expected behavior...
+		return $this->GetEditValue($value);
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		// Passthrough in most of the cases
+		return $json;
+	}
+
+	/**
+	 * Override to display the value in the GUI
+	 */	
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html((string)$sValue);
+	}
+
+	/**
+	 * Override to export the value in XML	
+	 */	
+	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2xml((string)$sValue);
+	}
+
+	/**
+	 * Override to escape the value when read by DBObject::GetAsCSV()	
+	 */	
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		return (string)$sValue;
+	}
+
+	/**
+	 * Override to differentiate a value displayed in the UI or in the history
+	 */	
+	public function GetAsHTMLForHistory($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return $this->GetAsHTML($sValue, $oHostObject, $bLocalize);
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\StringField';
+	}
+
+	/**
+	 * Override to specify Field class
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		// This is a fallback in case the AttributeDefinition subclass has no overloading of this function.
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+			//$oFormField->SetReadOnly(true);
+		}
+
+		$oFormField->SetLabel($this->GetLabel());
+
+		// Attributes flags
+		// - Retrieving flags for the current object
+		if ($oObject->IsNew())
+		{
+			$iFlags = $oObject->GetInitialStateAttributeFlags($this->GetCode());
+		}
+		else
+		{
+			$iFlags = $oObject->GetAttributeFlags($this->GetCode());
+		}
+
+		// - Comparing flags
+		if ($this->IsWritable() && (!$this->IsNullAllowed() || (($iFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY)))
+		{
+			$oFormField->SetMandatory(true);
+		}
+		if ((!$oObject->IsNew() || !$oFormField->GetMandatory()) && (($iFlags & OPT_ATT_READONLY) === OPT_ATT_READONLY))
+		{
+			$oFormField->SetReadOnly(true);
+		}
+		
+		// CurrentValue
+		$oFormField->SetCurrentValue($oObject->Get($this->GetCode()));
+
+		// Validation pattern
+		if ($this->GetValidationPattern() !== '')
+		{
+			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\Validator($this->GetValidationPattern()));
+		}
+
+		return $oFormField;
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */	 
+	public function EnumTemplateVerbs()
+	{
+		return array(
+			'' => 'Plain text (unlocalized) representation',
+			'html' => 'HTML representation',
+			'label' => 'Localized representation',
+			'text' => 'Plain text representation (without any markup)',
+		);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 *
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 *
+	 * @return mixed|null|string
+	 * @throws \Exception
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		if ($this->IsScalar())
+		{
+			switch ($sVerb)
+			{
+				case '':
+				return $value;
+				
+				case 'html':
+				return $this->GetAsHtml($value, $oHostObject, $bLocalize);
+				
+				case 'label':
+				return $this->GetEditValue($value);
+				
+				case 'text':
+				return $this->GetAsPlainText($value);
+				break;
+				
+				default:
+				throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
+			}
+		}
+		return null;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oValSetDef = $this->GetValuesDef();
+		if (!$oValSetDef) return null;
+		return $oValSetDef->GetValues($aArgs, $sContains);
+	}
+
+	/**
+	 * Explain the change of the attribute (history)
+	 */	
+	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
+	{
+		if (is_null($sLabel))
+		{
+			$sLabel = $this->GetLabel();
+		}
+
+		$sNewValueHtml = $this->GetAsHTMLForHistory($sNewValue);
+		$sOldValueHtml = $this->GetAsHTMLForHistory($sOldValue);
+
+		if($this->IsExternalKey())
+		{
+			$sTargetClass = $this->GetTargetClass();
+			$sOldValueHtml = (int)$sOldValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sOldValue) : null;
+			$sNewValueHtml = (int)$sNewValue ? MetaModel::GetHyperLink($sTargetClass, (int)$sNewValue) : null;
+		}
+		if ( (($this->GetType() == 'String') || ($this->GetType() == 'Text')) &&
+			 (strlen($sNewValue) > strlen($sOldValue)) )
+		{
+			// Check if some text was not appended to the field
+			if (substr($sNewValue,0, strlen($sOldValue)) == $sOldValue) // Text added at the end
+			{
+				$sDelta = $this->GetAsHTML(substr($sNewValue, strlen($sOldValue)));
+				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
+			}
+			else if (substr($sNewValue, -strlen($sOldValue)) == $sOldValue)   // Text added at the beginning
+			{
+				$sDelta = $this->GetAsHTML(substr($sNewValue, 0, strlen($sNewValue) - strlen($sOldValue)));
+				$sResult = Dict::Format('Change:Text_AppendedTo_AttName', $sDelta, $sLabel);
+			}
+			else
+			{
+				if (strlen($sOldValue) == 0)
+				{
+					$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
+				}
+				else
+				{
+					if (is_null($sNewValue))
+					{
+						$sNewValueHtml = Dict::S('UI:UndefinedObject');
+					}
+					$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
+				}
+			}
+		}
+		else
+		{
+			if (strlen($sOldValue) == 0)
+			{
+				$sResult = Dict::Format('Change:AttName_SetTo', $sLabel, $sNewValueHtml);
+			}
+			else
+			{
+				if (is_null($sNewValue))
+				{
+					$sNewValueHtml = Dict::S('UI:UndefinedObject');
+				}
+				$sResult = Dict::Format('Change:AttName_SetTo_NewValue_PreviousValue_OldValue', $sLabel, $sNewValueHtml, $sOldValueHtml);
+			}
+		}
+		return $sResult;
+	}
+
+
+	/**
+	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
+	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
+	 * does nothing special, and just calls the default (loose) operator
+	 * @param string $sSearchText The search string to analyze for smart patterns
+	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
+	 * @param array $aParams Values of the query parameters
+	 * @return Expression The search condition to be added (AND) to the current search
+	 */
+	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams)
+	{
+		$sParamName = $oField->GetParent().'_'.$oField->GetName();
+		$oRightExpr = new VariableExpression($sParamName);
+		$sOperator = $this->GetBasicFilterLooseOperator();
+		switch ($sOperator)
+		{
+			case 'Contains':
+			$aParams[$sParamName] = "%$sSearchText%";
+			$sSQLOperator = 'LIKE';
+			break;
+			
+			default:
+			$sSQLOperator = $sOperator;
+			$aParams[$sParamName] = $sSearchText;
+		}
+		$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
+		return $oNewCondition;
+	}
+	
+	/**
+	 * Tells if an attribute is part of the unique fingerprint of the object (used for comparing two objects)
+	 * All attributes which value is not based on a value from the object itself (like ExternalFields or LinkedSet)
+	 * must be excluded from the object's signature
+	 * @return boolean
+	 */
+	public function IsPartOfFingerprint()
+	{
+		return true;
+	}
+	
+	/**
+	 * The part of the current attribute in the object's signature, for the supplied value
+	 * @param mixed $value The value of this attribute for the object
+	 * @return string The "signature" for this field/attribute
+	 */
+	public function Fingerprint($value)
+	{
+		return (string)$value;
+	}
+}
+
+/**
+ * Set of objects directly linked to an object, and being part of its definition  
+ *
+ * @package	 iTopORM
+ */
+class AttributeLinkedSet extends AttributeDefinition
+{
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "linked_class", "ext_key_to_me", "count_min", "count_max"));
+	}
+
+	public function GetEditClass() {return "LinkedSet";}
+
+	public function IsWritable() {return true;}
+	static public function IsLinkSet() {return true;}
+	public function IsIndirect() {return false;} 
+
+	public function GetValuesDef() {return $this->Get("allowed_values");} 
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$sLinkClass = $this->GetLinkedClass();
+		$sExtKeyToMe = $this->GetExtKeyToMe();
+
+		// The class to target is not the current class, because if this is a derived class,
+		// it may differ from the target class, then things start to become confusing
+		$oRemoteExtKeyAtt = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToMe);
+		$sMyClass = $oRemoteExtKeyAtt->GetTargetClass();
+
+		$oMyselfSearch = new DBObjectSearch($sMyClass);
+		if ($oHostObject !== null)
+		{
+			$oMyselfSearch->AddCondition('id', $oHostObject->GetKey(), '=');
+		}
+
+		$oLinkSearch = new DBObjectSearch($sLinkClass);
+		$oLinkSearch->AddCondition_PointingTo($oMyselfSearch, $sExtKeyToMe);
+		if ($this->IsIndirect())
+		{
+			// Join the remote class so that the archive flag will be taken into account
+			$sExtKeyToRemote = $this->GetExtKeyToRemote();
+			$oExtKeyToRemote = MetaModel::GetAttributeDef($sLinkClass, $sExtKeyToRemote);
+			$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
+			if (MetaModel::IsArchivable($sRemoteClass))
+			{
+				$oRemoteSearch = new DBObjectSearch($sRemoteClass);
+				$oLinkSearch->AddCondition_PointingTo($oRemoteSearch, $this->GetExtKeyToRemote());
+			}
+		}
+		$oLinks = new DBObjectSet($oLinkSearch);
+		$oLinkSet = new ormLinkSet($this->GetHostClass(), $this->GetCode(), $oLinks);
+		return $oLinkSet;
+	}
+
+	public function GetTrackingLevel()
+	{
+		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_default'));
+	}
+
+	public function GetEditMode()
+	{
+		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
+	}
+	
+	public function GetLinkedClass() {return $this->Get('linked_class');}
+	public function GetExtKeyToMe() {return $this->Get('ext_key_to_me');}
+
+	public function GetBasicFilterOperators() {return array();}
+	public function GetBasicFilterLooseOperator() {return '';}
+	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$aItems = array();
+			while ($oObj = $sValue->Fetch())
+			{
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($this->GetLinkedClass()) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField()) continue;
+					$sAttValue = $oObj->GetAsHTML($sAttCode);
+					if (strlen($sAttValue) > 0)
+					{
+						$aAttributes[] = $sAttValue;
+					}
+				}
+				$sAttributes = implode(', ', $aAttributes);
+				$aItems[] = $sAttributes;
+			}
+			return implode('<br/>', $aItems);
+		}
+		return null;
+	}
+
+	public function GetAsXML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$sRes = "<Set>\n";
+			while ($oObj = $sValue->Fetch())
+			{
+				$sObjClass = get_class($oObj);
+				$sRes .= "<$sObjClass id=\"".$oObj->GetKey()."\">\n";
+				// Show only relevant information (hide the external key to the current object)
+				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == 'finalclass')
+					{
+						if ($sObjClass == $this->GetLinkedClass())
+						{
+							// Simplify the output if the exact class could be determined implicitely
+							continue;
+						}
+					}
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField())
+					{
+						if ($oAttDef->GetKeyAttCode() == $this->GetExtKeyToMe()) continue;
+						if ($oAttDef->IsFriendlyName()) continue;
+					}
+					if ($oAttDef instanceof AttributeFriendlyName) continue;
+					if (!$oAttDef->IsScalar()) continue;
+					$sAttValue = $oObj->GetAsXML($sAttCode, $bLocalize);
+					$sRes .= "<$sAttCode>$sAttValue</$sAttCode>\n";
+				}
+				$sRes .= "</$sObjClass>\n";
+			}
+			$sRes .= "</Set>\n";
+		}
+		else
+		{
+			$sRes = '';
+		}
+		return $sRes;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
+		$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
+		$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
+		$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
+
+		if (is_object($sValue) && ($sValue instanceof ormLinkSet))
+		{
+			$sValue->Rewind();
+			$aItems = array();
+			while ($oObj = $sValue->Fetch())
+			{
+				$sObjClass = get_class($oObj);
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == 'finalclass')
+					{
+						if ($sObjClass == $this->GetLinkedClass())
+						{
+							// Simplify the output if the exact class could be determined implicitely 
+							continue;
+						}
+					}
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField()) continue;
+					if (!$oAttDef->IsBasedOnDBColumns()) continue;
+					if (!$oAttDef->IsScalar()) continue;
+					$sAttValue = $oObj->GetAsCSV($sAttCode, $sSepValue, '', $bLocalize);
+					if (strlen($sAttValue) > 0)
+					{
+						$sAttributeData = str_replace($sAttributeQualifier, $sAttributeQualifier.$sAttributeQualifier, $sAttCode.$sSepValue.$sAttValue);
+						$aAttributes[] = $sAttributeQualifier.$sAttributeData.$sAttributeQualifier;
+					}
+				}
+				$sAttributes = implode($sSepAttribute, $aAttributes);
+				$aItems[] = $sAttributes;
+			}
+			$sRes = implode($sSepItem, $aItems);
+		}
+		else
+		{
+			$sRes = '';
+		}
+		$sRes = str_replace($sTextQualifier, $sTextQualifier.$sTextQualifier, $sRes);
+		$sRes = $sTextQualifier.$sRes.$sTextQualifier;
+		return $sRes;
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */	 
+	public function EnumTemplateVerbs()
+	{
+		return array(
+			'' => 'Plain text (unlocalized) representation',
+			'html' => 'HTML representation (unordered list)',
+		);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 *
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		$sRemoteName = $this->IsIndirect() ? $this->GetExtKeyToRemote().'_friendlyname' : 'friendlyname';
+		
+		$oLinkSet = clone $value; // Workaround/Safety net for Trac #887
+		$iLimit = MetaModel::GetConfig()->Get('max_linkset_output');
+		$iCount = 0;
+		$aNames = array();
+		foreach($oLinkSet as $oItem)
+		{
+			if (($iLimit > 0) && ($iCount == $iLimit))
+			{
+				$iTotal = $oLinkSet->Count();
+				$aNames[] = '... '.Dict::Format('UI:TruncatedResults', $iCount, $iTotal);
+				break;
+			}
+			$aNames[] = $oItem->Get($sRemoteName);
+			$iCount++;
+		}
+
+		switch($sVerb)
+		{
+			case '':
+			return implode("\n", $aNames);
+					
+			case 'html':
+			return '<ul><li>'.implode("</li><li>", $aNames).'</li></ul>';
+			
+			default:
+			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
+		}
+	}
+
+	public function DuplicatesAllowed() {return false;} // No duplicates for 1:n links, never
+
+	public function GetImportColumns()
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'TEXT';
+		return $aColumns;
+	}
+
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		if (is_null($sSepItem) || empty($sSepItem))
+		{
+			$sSepItem = MetaModel::GetConfig()->Get('link_set_item_separator');
+		}
+		if (is_null($sSepAttribute) || empty($sSepAttribute))
+		{
+			$sSepAttribute = MetaModel::GetConfig()->Get('link_set_attribute_separator');
+		}
+		if (is_null($sSepValue) || empty($sSepValue))
+		{
+			$sSepValue = MetaModel::GetConfig()->Get('link_set_value_separator');
+		}
+		if (is_null($sAttributeQualifier) || empty($sAttributeQualifier))
+		{
+			$sAttributeQualifier = MetaModel::GetConfig()->Get('link_set_attribute_qualifier');
+		}
+
+		$sTargetClass = $this->Get('linked_class');
+
+		$sInput = str_replace($sSepItem, "\n", $sProposedValue);
+		$oCSVParser = new CSVParser($sInput, $sSepAttribute, $sAttributeQualifier);
+
+		$aInput = $oCSVParser->ToArray(0 /* do not skip lines */);
+
+		$aLinks = array();
+		foreach($aInput as $aRow)
+		{
+			// 1st - get the values, split the extkey->searchkey specs, and eventually get the finalclass value
+			$aExtKeys = array();
+			$aValues = array();
+			foreach($aRow as $sCell)
+			{
+				$iSepPos = strpos($sCell, $sSepValue);
+				if ($iSepPos === false)
+				{
+					// Houston...
+					throw new CoreException('Wrong format for link attribute specification', array('value' => $sCell));
+				}
+
+				$sAttCode = trim(substr($sCell, 0, $iSepPos));
+				$sValue = substr($sCell, $iSepPos + strlen($sSepValue));
+
+				if (preg_match('/^(.+)->(.+)$/', $sAttCode, $aMatches))
+				{
+					$sKeyAttCode = $aMatches[1];
+					$sRemoteAttCode = $aMatches[2];
+					$aExtKeys[$sKeyAttCode][$sRemoteAttCode] = $sValue;
+					if (!MetaModel::IsValidAttCode($sTargetClass, $sKeyAttCode))
+					{
+						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sKeyAttCode));
+					}
+					$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
+					$sRemoteClass = $oKeyAttDef->GetTargetClass();
+					if (!MetaModel::IsValidAttCode($sRemoteClass, $sRemoteAttCode))
+					{
+						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sRemoteClass, 'attcode' => $sRemoteAttCode));
+					}
+				}
+				else
+				{
+					if(!MetaModel::IsValidAttCode($sTargetClass, $sAttCode))
+					{
+						throw new CoreException('Wrong attribute code for link attribute specification', array('class' => $sTargetClass, 'attcode' => $sAttCode));
+					}
+					$oAttDef = MetaModel::GetAttributeDef($sTargetClass, $sAttCode);
+					$aValues[$sAttCode] = $oAttDef->MakeValueFromString($sValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
+				}
+			}
+
+			// 2nd - Instanciate the object and set the value
+			if (isset($aValues['finalclass']))
+			{
+				$sLinkClass = $aValues['finalclass'];
+				if (!is_subclass_of($sLinkClass, $sTargetClass))
+				{
+					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
+				}
+			}
+			elseif (MetaModel::IsAbstract($sTargetClass))
+			{
+					throw new CoreException('Missing finalclass for link attribute specification');
+			}
+			else
+			{
+				$sLinkClass = $sTargetClass;
+			}
+
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach ($aValues as $sAttCode => $sValue)
+			{
+				$oLink->Set($sAttCode, $sValue);
+			}
+
+			// 3rd - Set external keys from search conditions
+			foreach ($aExtKeys as $sKeyAttCode => $aReconciliation)
+			{
+				$oKeyAttDef = MetaModel::GetAttributeDef($sTargetClass, $sKeyAttCode);
+				$sKeyClass = $oKeyAttDef->GetTargetClass();
+				$oExtKeyFilter = new DBObjectSearch($sKeyClass);
+				$aReconciliationDesc = array();
+				foreach($aReconciliation as $sRemoteAttCode => $sValue)
+				{
+					$oExtKeyFilter->AddCondition($sRemoteAttCode, $sValue, '=');
+					$aReconciliationDesc[] = "$sRemoteAttCode=$sValue";
+				}
+				$oExtKeySet = new DBObjectSet($oExtKeyFilter);
+				switch($oExtKeySet->Count())
+				{
+				case 0:
+					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
+					throw new CoreException("Found no match", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
+					break;
+				case 1:
+					$oRemoteObj = $oExtKeySet->Fetch();
+					$oLink->Set($sKeyAttCode, $oRemoteObj->GetKey());
+					break;
+				default:
+					$sReconciliationDesc = implode(', ', $aReconciliationDesc);
+					throw new CoreException("Found several matches", array('ext_key' => $sKeyAttCode, 'reconciliation' => $sReconciliationDesc));
+					// Found several matches, ambiguous
+				}
+			}
+
+			// Check (roughly) if such a link is valid
+			$aErrors = array();
+			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsExternalKey())
+				{
+					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
+					{
+						continue; // Don't check the key to self
+					}
+				}
+				
+				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
+				{
+					$aErrors[] = $sAttCode;
+				}
+			}
+			if (count($aErrors) > 0)
+			{
+				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
+			}
+
+			$aLinks[] = $oLink;
+		}
+		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
+		return $oSet;
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		$aRet = array();
+		if (is_object($value) && ($value instanceof ormLinkSet))
+		{
+			$value->Rewind();
+			while ($oObj = $value->Fetch())
+			{
+				$sObjClass = get_class($oObj);
+				// Show only relevant information (hide the external key to the current object)
+				$aAttributes = array();
+				foreach(MetaModel::ListAttributeDefs($sObjClass) as $sAttCode => $oAttDef)
+				{
+					if ($sAttCode == 'finalclass')
+					{
+						if ($sObjClass == $this->GetLinkedClass())
+						{
+							// Simplify the output if the exact class could be determined implicitely 
+							continue;
+						}
+					}
+					if ($sAttCode == $this->GetExtKeyToMe()) continue;
+					if ($oAttDef->IsExternalField()) continue;
+					if (!$oAttDef->IsBasedOnDBColumns()) continue;
+					if (!$oAttDef->IsScalar()) continue;
+					$attValue = $oObj->Get($sAttCode);
+					$aAttributes[$sAttCode] = $oAttDef->GetForJSON($attValue);
+				}
+				$aRet[] = $aAttributes;
+			}
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		$sTargetClass = $this->Get('linked_class');
+
+		$aLinks = array();
+		foreach($json as $aValues)
+		{
+			if (isset($aValues['finalclass']))
+			{
+				$sLinkClass = $aValues['finalclass'];
+				if (!is_subclass_of($sLinkClass, $sTargetClass))
+				{
+					throw new CoreException('Wrong class for link attribute specification', array('requested_class' => $sLinkClass, 'expected_class' => $sTargetClass));
+				}
+			}
+			elseif (MetaModel::IsAbstract($sTargetClass))
+			{
+					throw new CoreException('Missing finalclass for link attribute specification');
+			}
+			else
+			{
+				$sLinkClass = $sTargetClass;
+			}
+
+			$oLink = MetaModel::NewObject($sLinkClass);
+			foreach ($aValues as $sAttCode => $sValue)
+			{
+				$oLink->Set($sAttCode, $sValue);
+			}
+
+			// Check (roughly) if such a link is valid
+			$aErrors = array();
+			foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsExternalKey())
+				{
+					if (($oAttDef->GetTargetClass() == $this->GetHostClass()) || (is_subclass_of($this->GetHostClass(), $oAttDef->GetTargetClass())))
+					{
+						continue; // Don't check the key to self
+					}
+				}
+				
+				if ($oAttDef->IsWritable() && $oAttDef->IsNull($oLink->Get($sAttCode)) && !$oAttDef->IsNullAllowed())
+				{
+					$aErrors[] = $sAttCode;
+				}
+			}
+			if (count($aErrors) > 0)
+			{
+				throw new CoreException("Missing value for mandatory attribute(s): ".implode(', ', $aErrors));
+			}
+
+			$aLinks[] = $oLink;
+		}
+		$oSet = DBObjectSet::FromArray($sTargetClass, $aLinks);
+		return $oSet;
+	}
+
+	/**
+	 * @param $proposedValue
+	 * @param $oHostObj
+	 *
+	 * @return mixed
+	 * @throws \Exception
+	 */
+    public function MakeRealValue($proposedValue, $oHostObj){
+        if($proposedValue === null)
+        {
+            $sLinkedClass = $this->GetLinkedClass();
+            $aLinkedObjectsArray = array();
+            $oSet = DBObjectSet::FromArray($sLinkedClass, $aLinkedObjectsArray);
+
+            return new ormLinkSet(
+                get_class($oHostObj),
+                $this->GetCode(),
+                $oSet
+            );
+        }
+
+        return $proposedValue;
+    }
+
+	/**
+	 * @param ormLinkSet $val1
+	 * @param ormLinkSet $val2
+	 * @return bool
+	 */
+	public function Equals($val1, $val2)
+	{
+		if ($val1 === $val2)
+		{
+			$bAreEquivalent = true;
+		}
+		else
+		{
+            $bAreEquivalent = ($val2->HasDelta() === false);
+		}
+		return $bAreEquivalent;
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 *
+	 * @return null | AttributeDefinition
+	 * @throws \Exception
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		$oRemoteAtt = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToMe());
+		return $oRemoteAtt;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\LinkedSetField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		
+		// Setting target class
+		if (!$this->IsIndirect())
+		{
+			$sTargetClass = $this->GetLinkedClass();
+		}
+		else
+		{
+			$oRemoteAttDef = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
+			$sTargetClass = $oRemoteAttDef->GetTargetClass();
+
+			$oFormField->SetExtKeyToRemote($this->GetExtKeyToRemote());
+		}
+		$oFormField->SetTargetClass($sTargetClass);
+		$oFormField->SetIndirect($this->IsIndirect());
+		// Setting attcodes to display
+		$aAttCodesToDisplay = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetClass, 'list'));
+		// - Adding friendlyname attribute to the list is not already in it
+		$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetClass);
+		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodesToDisplay))
+		{
+			$aAttCodesToDisplay = array_merge(array($sTitleAttCode), $aAttCodesToDisplay);
+		}
+		// - Adding attribute labels
+		$aAttributesToDisplay = array();
+		foreach ($aAttCodesToDisplay as $sAttCodeToDisplay)
+		{
+			$oAttDefToDisplay = MetaModel::GetAttributeDef($sTargetClass, $sAttCodeToDisplay);
+			$aAttributesToDisplay[$sAttCodeToDisplay] = $oAttDefToDisplay->GetLabel();
+		}
+		$oFormField->SetAttributesToDisplay($aAttributesToDisplay);
+		
+		parent::MakeFormField($oObject, $oFormField);
+		
+		return $oFormField;
+	}
+
+	public function IsPartOfFingerprint() { return false; }
+}
+
+/**
+ * Set of objects linked to an object (n-n), and being part of its definition  
+ *
+ * @package	 iTopORM
+ */
+class AttributeLinkedSetIndirect extends AttributeLinkedSet
+{
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("ext_key_to_remote"));
+	}
+	public function IsIndirect() {return true;} 
+	public function GetExtKeyToRemote() { return $this->Get('ext_key_to_remote'); }
+	public function GetEditClass() {return "LinkedSet";}
+	public function DuplicatesAllowed() {return $this->GetOptional("duplicates", false);} // The same object may be linked several times... or not...
+
+	public function GetTrackingLevel()
+	{
+		return $this->GetOptional('tracking_level', MetaModel::GetConfig()->Get('tracking_level_linked_set_indirect_default'));
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 * @throws \CoreException
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		$oRet = null;
+		$oExtKeyToRemote = MetaModel::GetAttributeDef($this->GetLinkedClass(), $this->GetExtKeyToRemote());
+		$sRemoteClass = $oExtKeyToRemote->GetTargetClass();
+		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
+		{
+			if (!$oRemoteAttDef instanceof AttributeLinkedSetIndirect) continue;
+			if ($oRemoteAttDef->GetLinkedClass() != $this->GetLinkedClass()) continue;
+			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetExtKeyToRemote()) continue;
+			if ($oRemoteAttDef->GetExtKeyToRemote() != $this->GetExtKeyToMe()) continue;
+			$oRet = $oRemoteAttDef;
+			break;
+		}
+		return $oRet;
+	}
+}
+
+/**
+ * Abstract class implementing default filters for a DB column  
+ *
+ * @package	 iTopORM
+ */
+class AttributeDBFieldVoid extends AttributeDefinition
+{	
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("allowed_values", "depends_on", "sql"));
+	}
+
+	// To be overriden, used in GetSQLColumns
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return 'VARCHAR(255)'
+			.CMDBSource::GetSqlStringColumnDefinition()
+			.($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+	protected function GetSQLColSpec()
+	{
+		$default = $this->ScalarToSQL($this->GetDefaultValue());
+		if (is_null($default))
+		{
+			$sRet = '';
+		}
+		else
+		{
+			if (is_numeric($default))
+			{
+				// Though it is a string in PHP, it will be considered as a numeric value in MySQL
+				// Then it must not be quoted here, to preserve the compatibility with the value returned by CMDBSource::GetFieldSpec
+				$sRet = " DEFAULT $default";
+			}
+			else
+			{
+				$sRet = " DEFAULT ".CMDBSource::Quote($default);
+			}
+		}
+		return $sRet;
+	}
+
+	public function GetEditClass() {return "String";}
+	
+	public function GetValuesDef() {return $this->Get("allowed_values");} 
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->Get("depends_on");}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return !$this->IsMagic();}
+	public function GetSQLExpr()
+	{
+		return $this->Get("sql");
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
+	public function IsNullAllowed() {return false;}
+
+	// 
+	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $this->Get("sql");
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+		return $value;
+	}
+	public function GetSQLValues($value)
+	{
+		$aValues = array();
+		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get("sql")] = $this->GetSQLCol($bFullSpec);
+		return $aColumns;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array("="=>"equals", "!="=>"differs from");
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = $sQValue";
+		}
+	} 
+}
+
+/**
+ * Base class for all kind of DB attributes, with the exception of external keys 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDBField extends AttributeDBFieldVoid
+{	
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("default_value", "is_null_allowed"));
+	}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue($this->Get("default_value"), $oHostObject);}
+	public function IsNullAllowed() {return $this->Get("is_null_allowed");}
+}
+
+/**
+ * Map an integer column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeInteger extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+	
+	public function GetValidationPattern()
+	{
+		return "^[0-9]+$";
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"!="=>"differs from",
+			"="=>"equals",
+			">"=>"greater (strict) than",
+			">="=>"greater than",
+			"<"=>"less (strict) than",
+			"<="=>"less than",
+			"in"=>"in"
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		// Unless we implement an "equals approximately..." or "same order of magnitude"
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '>':
+			return $this->GetSQLExpr()." > $sQValue";
+			break;
+		case '>=':
+			return $this->GetSQLExpr()." >= $sQValue";
+			break;
+		case '<':
+			return $this->GetSQLExpr()." < $sQValue";
+			break;
+		case '<=':
+			return $this->GetSQLExpr()." <= $sQValue";
+			break;
+		case 'in':
+			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
+			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
+			break;
+
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = \"$value\"";
+		}
+	} 
+
+	public function GetNullValue()
+	{
+		return null;
+	} 
+	public function IsNull($proposedValue)
+	{
+		return is_null($proposedValue);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if ($proposedValue === '') return null; // 0 is transformed into '' !
+		return (int)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		assert(is_numeric($value) || is_null($value));
+		return $value; // supposed to be an int
+	}
+}
+
+/**
+ * An external key for which the class is defined as the value of another attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeObjectKey extends AttributeDBFieldVoid
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array('class_attcode', 'is_null_allowed'));
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
+	public function IsNullAllowed()
+	{
+		return $this->Get("is_null_allowed");
+	}
+
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return parent::GetBasicFilterLooseOperator();
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	public function GetNullValue()
+	{
+		return 0;
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == 0);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return 0;
+		if ($proposedValue === '') return 0;
+		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
+		return (int)$proposedValue;
+	}
+}
+
+/**
+ * Display an integer between 0 and 100 as a percentage / horizontal bar graph 
+ *
+ * @package	 iTopORM
+ */
+class AttributePercentage extends AttributeInteger
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$iWidth = 5; // Total width of the percentage bar graph, in em...
+		$iValue = (int)$sValue;
+		if ($iValue > 100)
+		{
+			$iValue = 100;
+		}
+		else if ($iValue < 0)
+		{
+			$iValue = 0;
+		}
+		if ($iValue > 90)
+		{
+			$sColor = "#cc3300";
+		}
+		else if ($iValue > 50)
+		{
+			$sColor = "#cccc00";
+		}
+		else
+		{
+			$sColor = "#33cc00";
+		}
+		$iPercentWidth = ($iWidth * $iValue) / 100;
+		return "<div style=\"width:{$iWidth}em;-moz-border-radius: 3px;-webkit-border-radius: 3px;border-radius: 3px;display:inline-block;border: 1px #ccc solid;\"><div style=\"width:{$iPercentWidth}em; display:inline-block;background-color:$sColor;\">&nbsp;</div></div>&nbsp;$sValue %";
+	}
+}
+
+/**
+ * Map a decimal value column (suitable for financial computations) to an attribute
+ * internally in PHP such numbers are represented as string. Should you want to perform
+ * a calculation on them, it is recommended to use the BC Math functions in order to
+ * retain the precision
+ *
+ * @package	 iTopORM
+ */
+class AttributeDecimal extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_NUMERIC;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array('digits', 'decimals' /* including precision */));
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "DECIMAL(".$this->Get('digits').",".$this->Get('decimals').")".($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+	
+	public function GetValidationPattern()
+	{
+		$iNbDigits = $this->Get('digits');
+		$iPrecision = $this->Get('decimals');
+		$iNbIntegerDigits = $iNbDigits - $iPrecision - 1; // -1 because the first digit is treated separately in the pattern below
+		return "^[-+]?[0-9]\d{0,$iNbIntegerDigits}(\.\d{0,$iPrecision})?$";
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"!="=>"differs from",
+			"="=>"equals",
+			">"=>"greater (strict) than",
+			">="=>"greater than",
+			"<"=>"less (strict) than",
+			"<="=>"less than",
+			"in"=>"in"
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		// Unless we implement an "equals approximately..." or "same order of magnitude"
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '>':
+			return $this->GetSQLExpr()." > $sQValue";
+			break;
+		case '>=':
+			return $this->GetSQLExpr()." >= $sQValue";
+			break;
+		case '<':
+			return $this->GetSQLExpr()." < $sQValue";
+			break;
+		case '<=':
+			return $this->GetSQLExpr()." <= $sQValue";
+			break;
+		case 'in':
+			if (!is_array($value)) throw new CoreException("Expected an array for argument value (sOpCode='$sOpCode')");
+			return $this->GetSQLExpr()." IN ('".implode("', '", $value)."')"; 
+			break;
+
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = \"$value\"";
+		}
+	} 
+
+	public function GetNullValue()
+	{
+		return null;
+	} 
+	public function IsNull($proposedValue)
+	{
+		return is_null($proposedValue);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if ($proposedValue === '') return null;
+		return (string)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		assert(is_null($value) || preg_match('/'.$this->GetValidationPattern().'/', $value));
+		return $value; // null or string
+	}
+}
+
+/**
+ * Map a boolean column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeBoolean extends AttributeInteger
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "Integer";}
+	protected function GetSQLCol($bFullSpec = false) {return "TINYINT(1)".($bFullSpec ? $this->GetSQLColSpec() : '');}
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if ($proposedValue === '') return null;
+		if ((int)$proposedValue) return true;
+		return false;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if ($value) return 1;
+		return 0;
+	}
+
+	public function GetValueLabel($bValue)
+	{
+		if (is_null($bValue))
+		{
+			$sLabel = Dict::S('Core:'.get_class($this).'/Value:null');
+		}
+		else
+		{
+			$sValue = $bValue ? 'yes' : 'no';
+			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue);
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, true /*user lang*/);
+		}
+		return $sLabel;
+	}
+
+	public function GetValueDescription($bValue)
+	{
+		if (is_null($bValue))
+		{
+			$sDescription = Dict::S('Core:'.get_class($this).'/Value:null+');
+		}
+		else
+		{
+			$sValue = $bValue ? 'yes' : 'no';
+			$sDefault = Dict::S('Core:'.get_class($this).'/Value:'.$sValue.'+');
+			$sDescription = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue.'+', $sDefault, true /*user lang*/);
+		}
+		return $sDescription;
+	}
+
+	public function GetAsHTML($bValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_null($bValue))
+		{
+			$sRes = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sLabel = $this->GetValueLabel($bValue);
+			$sDescription = $this->GetValueDescription($bValue);
+			// later, we could imagine a detailed description in the title
+			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
+		}
+		else
+		{
+			$sRes = $bValue ? 'yes' : 'no';
+		}
+		return $sRes;
+	}
+
+	public function GetAsXML($bValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_null($bValue))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($bValue);
+		}
+		else
+		{
+			$sFinalValue = $bValue ? 'yes' : 'no';
+		}
+		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	public function GetAsCSV($bValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (is_null($bValue))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($bValue);
+		}
+		else
+		{
+			$sFinalValue = $bValue ? 'yes' : 'no';
+		}
+		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+
+		$oFormField->SetChoices(array('yes' => $this->GetValueLabel(true), 'no' => $this->GetValueLabel(false)));
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	public function GetEditValue($value, $oHostObj = null)
+	{
+		if (is_null($value))
+		{
+			return '';
+		}
+		else
+		{
+			return $this->GetValueLabel($value);
+		}
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue
+	 */
+	public function GetForJSON($value)
+	{
+		return (bool)$value;
+	}
+
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		$sInput = strtolower(trim($sProposedValue));
+		if ($bLocalizedValue)
+		{
+			switch ($sInput)
+			{
+				case '1': // backward compatibility
+				case $this->GetValueLabel(true):
+					$value = true;
+					break;
+				case '0': // backward compatibility
+				case 'no':
+				case $this->GetValueLabel(false):
+					$value = false;
+					break;
+				default:
+					$value = null;
+			}
+		}
+		else
+		{
+			switch ($sInput)
+			{
+				case '1': // backward compatibility
+				case 'yes':
+					$value = true;
+					break;
+				case '0': // backward compatibility
+				case 'no':
+					$value = false;
+					break;
+				default:
+					$value = null;
+			}
+		}
+		return $value;
+	}
+}
+
+/**
+ * Map a varchar column (size < ?) to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeString extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "String";}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return 'VARCHAR(255)'
+			.CMDBSource::GetSqlStringColumnDefinition()
+			.($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+
+	public function GetValidationPattern()
+	{
+		$sPattern = $this->GetOptional('validation_pattern', '');
+		if (empty($sPattern))
+		{
+			return parent::GetValidationPattern();
+		}
+		else
+		{
+			return $sPattern;
+		}
+	}
+
+	public function CheckFormat($value)
+	{
+		$sRegExp = $this->GetValidationPattern();
+		if (empty($sRegExp))
+		{
+			return true;
+		}
+		else
+		{
+			$sRegExp = str_replace('/', '\\/', $sRegExp);
+			return preg_match("/$sRegExp/", $value);
+		}
+	}
+
+	public function GetMaxSize()
+	{
+		return 255;
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"="=>"equals",
+			"!="=>"differs from",
+			"Like"=>"equals (no case)",
+			"NotLike"=>"differs from (no case)",
+			"Contains"=>"contains",
+			"Begins with"=>"begins with",
+			"Finishes with"=>"finishes with"
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return "Contains";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '=':
+		case '!=':
+			return $this->GetSQLExpr()." $sOpCode $sQValue";
+		case 'Begins with':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("$value%");
+		case 'Finishes with':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value");
+		case 'Contains':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
+		case 'NotLike':
+			return $this->GetSQLExpr()." NOT LIKE $sQValue";
+		case 'Like':
+		default:
+			return $this->GetSQLExpr()." LIKE $sQValue";
+		}
+	} 
+
+	public function GetNullValue()
+	{
+		return '';
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == '');
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return '';
+		return (string)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (!is_string($value) && !is_null($value))
+		{
+			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
+		}
+		return $value;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	public function GetDisplayStyle()
+	{
+		return $this->GetOptional('display_style', 'select');
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\StringField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * An attibute that matches an object class 
+ *
+ * @package	 iTopORM
+ */
+class AttributeClass extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("class_category", "more_values"));
+	}
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aParams["allowed_values"] = new ValueSetEnumClasses($aParams['class_category'], $aParams['more_values']);
+		parent::__construct($sCode, $aParams);
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$sDefault = parent::GetDefaultValue($oHostObject);
+		if (!$this->IsNullAllowed() && $this->IsNull($sDefault))
+		{
+			// For this kind of attribute specifying null as default value
+			// is authorized even if null is not allowed
+			
+			// Pick the first one...
+			$aClasses = $this->GetAllowedValues();
+			$sDefault = key($aClasses);
+		}
+		return $sDefault;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($sValue)) return '';
+		return MetaModel::GetName($sValue);
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+	
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+	
+}
+
+/**
+ * An attibute that matches one of the language codes availables in the dictionnary 
+ *
+ * @package	 iTopORM
+ */
+class AttributeApplicationLanguage extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+	}
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aAvailableLanguages = Dict::GetLanguages();
+		$aLanguageCodes = array();
+		foreach($aAvailableLanguages as $sLangCode => $aInfo)
+		{
+			$aLanguageCodes[$sLangCode] = $aInfo['description'].' ('.$aInfo['localized_description'].')';
+		}
+		$aParams["allowed_values"] = new ValueSetEnum($aLanguageCodes);
+		parent::__construct($sCode, $aParams);
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+	
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+}
+
+/**
+ * The attribute dedicated to the finalclass automatic attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeFinalClass extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+	public $m_sValue;
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$aParams["allowed_values"] = null;
+		parent::__construct($sCode, $aParams);
+
+		$this->m_sValue = $this->Get("default_value");
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function SetFixedValue($sValue)
+	{
+		$this->m_sValue = $sValue;
+	}
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		return $this->m_sValue;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($sValue)) return '';
+		if ($bLocalize)
+		{
+			return MetaModel::GetName($sValue);
+		}
+		else
+		{
+			return $sValue;
+		}
+	}
+
+	/**
+	 * An enum can be localized
+	 */
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		if ($bLocalizedValue)
+		{
+			// Lookup for the value matching the input
+			//
+			$sFoundValue = null;
+			$aRawValues = self::GetAllowedValues();
+			if (!is_null($aRawValues))
+			{
+				foreach ($aRawValues as $sKey => $sValue)
+				{
+					if ($sProposedValue == $sValue)
+					{
+						$sFoundValue = $sKey;
+						break;
+					}
+				}
+			}
+			if (is_null($sFoundValue))
+			{
+				return null;
+			}
+			return $this->MakeRealValue($sFoundValue, null);
+		}
+		else
+		{
+			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
+		}
+	}
+
+
+	// Because this is sometimes used to get a localized/string version of an attribute...
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if (empty($sValue)) return '';
+		return MetaModel::GetName($sValue);
+	}
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue
+	 */
+	public function GetForJSON($value)
+	{
+		// JSON values are NOT localized
+		return $value;
+	}
+	
+ 	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if ($bLocalize && $value != '')
+		{
+			$sRawValue = MetaModel::GetName($value);
+		}
+		else
+		{
+			$sRawValue = $value;
+		}
+		return parent::GetAsCSV($sRawValue, $sSeparator, $sTextQualifier, null, false, $bConvertToPlainText);
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($value)) return '';
+		if ($bLocalize)
+		{
+			$sRawValue = MetaModel::GetName($value);
+		}
+		else
+		{
+			$sRawValue = $value;
+		}
+		return Str::pure2xml($sRawValue);
+	}
+
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+	
+	public function GetValueLabel($sValue)
+	{
+		if (empty($sValue)) return '';
+		return MetaModel::GetName($sValue);
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$aRawValues = MetaModel::EnumChildClasses($this->GetHostClass(), ENUM_CHILD_CLASSES_ALL);
+		$aLocalizedValues = array();
+		foreach ($aRawValues as $sClass)
+		{
+			$aLocalizedValues[$sClass] = MetaModel::GetName($sClass);
+		}
+  		return $aLocalizedValues;
+  	}
+}
+
+
+/**
+ * Map a varchar column (size < ?) to an attribute that must never be shown to the user 
+ *
+ * @package	 iTopORM
+ */
+class AttributePassword extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "Password";}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "VARCHAR(64)"
+			.CMDBSource::GetSqlStringColumnDefinition()
+			.($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+
+	public function GetMaxSize()
+	{
+		return 64;
+	}
+
+	public function GetFilterDefinitions()
+	{
+	// Note: due to this, you will get an error if a password is being declared as a search criteria (see ZLists)
+		// not allowed to search on passwords!
+		return array();
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (strlen($sValue) == 0)
+		{
+			return '';
+		}
+		else
+		{
+			return '******';
+		}
+	}
+	
+	public function IsPartOfFingerprint() { return false; } // Cannot reliably compare two encrypted passwords since the same password will be encrypted in diffferent manners depending on the random 'salt'
+}
+
+/**
+ * Map a text column (size < 255) to an attribute that is encrypted in the database
+ * The encryption is based on a key set per iTop instance. Thus if you export your
+ * database (in SQL) to someone else without providing the key at the same time
+ * the encrypted fields will remain encrypted
+ *
+ * @package	 iTopORM
+ */
+class AttributeEncryptedString extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static $sKey = null; // Encryption key used for all encrypted fields
+
+	public function __construct($sCode, $aParams)
+	{
+		parent::__construct($sCode, $aParams);
+		if (self::$sKey == null)
+		{
+			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
+		}
+	}
+	/**
+	 * When the attribute definitions are stored in APC cache:
+	 * 1) The static class variable $sKey is NOT serialized
+	 * 2) The object's constructor is NOT called upon wakeup
+	 * 3) mcrypt may crash the server if passed an empty key !!
+	 * 
+	 * So let's restore the key (if needed) when waking up
+	 **/
+	public function __wakeup()
+	{
+		if (self::$sKey == null)
+		{
+			self::$sKey = MetaModel::GetConfig()->GetEncryptionKey();
+		}
+	}
+	
+
+	protected function GetSQLCol($bFullSpec = false) {return "TINYBLOB";}	
+
+	public function GetMaxSize()
+	{
+		return 255;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		// Note: due to this, you will get an error if a an encrypted field is declared as a search criteria (see ZLists)
+		// not allowed to search on encrypted fields !
+		return array();
+	}
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		return (string)$proposedValue;
+	}
+
+	/**
+	 * Decrypt the value when reading from the database
+	 */
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+ 		$oSimpleCrypt = new SimpleCrypt();
+ 		$sValue = $oSimpleCrypt->Decrypt(self::$sKey, $aCols[$sPrefix]);
+		return $sValue;
+	}
+
+	/**
+	 * Encrypt the value before storing it in the database
+	 */
+	public function GetSQLValues($value)
+	{
+ 		$oSimpleCrypt = new SimpleCrypt();
+ 		$encryptedValue = $oSimpleCrypt->Encrypt(self::$sKey, $value);
+
+		$aValues = array();
+		$aValues[$this->Get("sql")] = $encryptedValue;
+		return $aValues;
+	}
+}
+
+
+// Wiki formatting - experimental
+//
+// [[<objClass>:<objName>]]
+// Example: [[Server:db1.tnut.com]]
+define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)\]\]/U');
+
+
+/**
+ * Map a text column (size > ?) to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeText extends AttributeString
+{
+	public function GetEditClass() {return ($this->GetFormat() == 'text') ? 'Text' : "HTML";}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "TEXT".CMDBSource::GetSqlStringColumnDefinition();
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get('sql')] = $this->GetSQLCol($bFullSpec);
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')".CMDBSource::GetSqlStringColumnDefinition();
+			if ($bFullSpec)
+			{
+				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'text'"; // default 'text' is for migrating old records
+			}
+		}
+		return $aColumns;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->Get('sql');
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix;
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns['_format'] = $sPrefix.'_format';
+		}
+		return $aColumns;
+	}
+	
+	public function GetMaxSize()
+	{
+		// Is there a way to know the current limitation for mysql?
+		// See mysql_field_len()
+		return 65535;
+	}
+
+	static public function RenderWikiHtml($sText, $bWikiOnly = false)
+	{
+		if (!$bWikiOnly)
+		{
+			$sPattern = '/'.str_replace('/', '\/', utils::GetConfig()->Get('url_validation_pattern')).'/i';
+			if (preg_match_all($sPattern, $sText, $aAllMatches, PREG_SET_ORDER /* important !*/ |PREG_OFFSET_CAPTURE /* important ! */))
+			{
+				$i = count($aAllMatches);
+				// Replace the URLs by an actual hyperlink <a href="...">...</a>
+				// Let's do it backwards so that the initial positions are not modified by the replacement
+				// This works if the matches are captured: in the order they occur in the string  AND
+				// with their offset (i.e. position) inside the string
+				while($i > 0)
+				{
+					$i--;
+					$sUrl = $aAllMatches[$i][0][0]; // String corresponding to the main pattern
+					$iPos = $aAllMatches[$i][0][1]; // Position of the main pattern
+					$sText = substr_replace($sText, "<a href=\"$sUrl\">$sUrl</a>", $iPos, strlen($sUrl));
+					
+				}
+			}
+		}
+		if (preg_match_all(WIKI_OBJECT_REGEXP, $sText, $aAllMatches, PREG_SET_ORDER))
+		{
+			foreach($aAllMatches as $iPos => $aMatches)
+			{
+				$sClass = trim($aMatches[1]);
+				$sName = trim($aMatches[2]);
+				
+				if (MetaModel::IsValidClass($sClass))
+				{
+					$oObj = MetaModel::GetObjectByName($sClass, $sName, false /* MustBeFound */);
+					if (is_object($oObj))
+					{
+						// Propose a std link to the object
+						$sText = str_replace($aMatches[0], $oObj->GetHyperlink(), $sText);
+					}
+					else
+					{
+						// Propose a std link to the object
+						$sClassLabel = MetaModel::GetName($sClass);
+						$sText = str_replace($aMatches[0], "<span class=\"wiki_broken_link\">$sClassLabel:$sName</span>", $sText);
+						// Later: propose a link to create a new object
+						// Anyhow... there is no easy way to suggest default values based on the given FRIENDLY name
+						//$sText = preg_replace('/\[\[(.+):(.+)\]\]/', '<a href="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.'&default[att1]=xxx&default[att2]=yyy">'.$sName.'</a>', $sText);
+					}
+				}
+			}
+		}
+		return $sText;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$aStyles = array();
+		if ($this->GetWidth() != '')
+		{
+			$aStyles[] = 'width:'.$this->GetWidth();
+		}
+		if ($this->GetHeight() != '')
+		{
+			$aStyles[] = 'height:'.$this->GetHeight();
+		}
+		$sStyle = '';
+		if (count($aStyles) > 0)
+		{
+			$aStyles[] = 'overflow:auto';
+			$sStyle = 'style="'.implode(';', $aStyles).'"';
+		}
+		
+		if ($this->GetFormat() == 'text')
+		{
+			$sValue = parent::GetAsHTML($sValue, $oHostObject, $bLocalize);
+			$sValue = self::RenderWikiHtml($sValue);
+			return "<div $sStyle>".str_replace("\n", "<br>\n", $sValue).'</div>';			
+		}
+		else
+		{
+			$sValue = self::RenderWikiHtml($sValue, true /* wiki only */);
+			return "<div class=\"HTML\" $sStyle>".InlineImage::FixUrls($sValue).'</div>';
+		}
+		
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if ($this->GetFormat() == 'text')
+		{
+			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
+			{
+				foreach($aAllMatches as $iPos => $aMatches)
+				{
+					$sClass = $aMatches[1];
+					$sName = $aMatches[2];
+
+					if (MetaModel::IsValidClass($sClass))
+					{
+						$sClassLabel = MetaModel::GetName($sClass);
+						$sValue = str_replace($aMatches[0], "[[$sClassLabel:$sName]]", $sValue);
+					}
+				}
+			}
+		}
+		else
+		{
+			$sValue = str_replace('&', '&amp;', $sValue);
+		}
+		return $sValue;
+	}
+
+	/**
+	 * For fields containing a potential markup, return the value without this markup
+	 * @return string
+	 */
+	public function GetAsPlainText($sValue, $oHostObj = null)
+	{
+		if ($this->GetFormat() == 'html')
+		{
+			return (string) utils::HtmlToText($this->GetEditValue($sValue, $oHostObj));
+		}
+		else
+		{
+			return parent::GetAsPlainText($sValue, $oHostObj);
+		}
+	}
+	
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$sValue = $proposedValue;
+		switch ($this->GetFormat())
+		{
+			case 'html':
+			if (($sValue !== null) && ($sValue !== ''))
+			{
+				$sValue = HTMLSanitizer::Sanitize($sValue);
+			}
+			break;
+			
+			case 'text':
+			default:
+			if (preg_match_all(WIKI_OBJECT_REGEXP, $sValue, $aAllMatches, PREG_SET_ORDER))
+			{
+				foreach($aAllMatches as $iPos => $aMatches)
+				{
+					$sClassLabel = $aMatches[1];
+					$sName = $aMatches[2];
+
+					if (!MetaModel::IsValidClass($sClassLabel))
+					{
+						$sClass = MetaModel::GetClassFromLabel($sClassLabel);
+						if ($sClass)
+						{
+							$sValue = str_replace($aMatches[0], "[[$sClass:$sName]]", $sValue);
+						}
+					}
+				}
+			}
+		}
+		return $sValue;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2xml($value);
+	}
+	
+	public function GetWidth()
+	{
+		return $this->GetOptional('width', '');		
+	}
+	
+	public function GetHeight()
+	{
+		return $this->GetOptional('height', '');		
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\TextAreaField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode(), null, $oObject);
+			$oFormField->SetFormat($this->GetFormat());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	/**
+	 * The actual formatting of the field: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'text');
+	}
+	
+	/**
+	 * Read the value from the row returned by the SQL query and transorms it to the appropriate
+	 * internal format (either text or html)
+	 * @see AttributeDBFieldVoid::FromSQLToValue()
+	 */
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$value = $aCols[$sPrefix.''];
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Read from the extra column only if the property 'format' is specified for the attribute
+			$sFormat = $aCols[$sPrefix.'_format'];
+		}
+		else
+		{
+			$sFormat = $this->GetFormat();
+		}
+		
+		switch($sFormat)
+		{
+			case 'text':
+			if ($this->GetFormat() == 'html')
+			{
+				$value = utils::TextToHtml($value);
+			}
+			break;
+			
+			case 'html':
+			if ($this->GetFormat() == 'text')
+			{
+				$value = utils::HtmlToText($value);
+			}
+			else
+			{
+				$value = InlineImage::FixUrls((string)$value);
+			}
+			break;
+			
+			default:
+			// unknown format ??
+		}
+		return $value;
+	}
+	
+	public function GetSQLValues($value)
+	{
+		$aValues = array();
+		$aValues[$this->Get("sql")] = $this->ScalarToSQL($value);
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aValues[$this->Get("sql").'_format'] = $this->GetFormat();
+		}
+		return $aValues;
+	}	
+	
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		switch($this->GetFormat())
+		{
+			case 'html':
+			if ($bConvertToPlainText)
+			{
+				$sValue = utils::HtmlToText((string)$sValue);
+			}
+			$sFrom = array("\r\n", $sTextQualifier);
+			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+			$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+			return $sTextQualifier.$sEscaped.$sTextQualifier;
+			break;
+			
+			case 'text':
+			default:
+			return parent::GetAsCSV($sValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
+		}
+	}
+}
+
+/**
+ * Map a log to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeLongText extends AttributeText
+{
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "LONGTEXT".CMDBSource::GetSqlStringColumnDefinition();
+	}
+
+	public function GetMaxSize()
+	{
+		// Is there a way to know the current limitation for mysql?
+		// See mysql_field_len()
+		return 65535*1024; // Limited... still 64 Mb!
+	}
+}
+
+/**
+ * An attibute that stores a case log (i.e journal) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeCaseLog extends AttributeLongText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	public function GetNullValue()
+	{
+		return '';
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		if (!($proposedValue instanceof ormCaseLog))
+		{
+			return ($proposedValue == '');
+		}
+		return ($proposedValue->GetText() == '');
+	} 
+
+	public function ScalarToSQL($value)
+	{
+		if (!is_string($value) && !is_null($value))
+		{
+			throw new CoreWarning('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetCode(), 'attribute' => $this->GetHostClass()));
+		}
+		return $value;
+	}
+	public function GetEditClass() {return "CaseLog";}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if (!($sValue instanceOf ormCaseLog))
+		{
+			return '';
+		}
+		return $sValue->GetModifiedEntry();
+	}
+
+	/**
+	 * For fields containing a potential markup, return the value without this markup
+	 * @return string
+	 */
+	public function GetAsPlainText($value, $oHostObj = null)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+
+			return $value->GetAsPlainText();
+		}
+		else
+		{
+			return (string) $value;
+		}
+	}
+	
+	public function GetDefaultValue(DBObject $oHostObject = null) {return new ormCaseLog();}
+	public function Equals($val1, $val2) {return ($val1->GetText() == $val2->GetText());}
+	
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if ($proposedValue instanceof ormCaseLog)
+		{
+			// Passthrough
+			$ret = clone $proposedValue;
+		}
+		else
+		{
+			// Append the new value if an instance of the object is supplied
+			//
+			$oPreviousLog = null;
+			if ($oHostObj != null)
+			{
+				$oPreviousLog = $oHostObj->Get($this->GetCode());
+				if (!is_object($oPreviousLog))
+				{
+					$oPreviousLog = $oHostObj->GetOriginal($this->GetCode());;
+				}
+				
+			}
+			if (is_object($oPreviousLog))
+			{
+				$oCaseLog = clone($oPreviousLog);
+			}
+			else
+			{
+				$oCaseLog = new ormCaseLog();
+			}
+
+			if ($proposedValue instanceof stdClass)
+			{
+				$oCaseLog->AddLogEntryFromJSON($proposedValue);
+			}
+			else
+			{
+				if (strlen($proposedValue) > 0)
+				{
+					$oCaseLog->AddLogEntry($proposedValue);
+				}
+			}
+			$ret = $oCaseLog;
+		}
+		return $ret;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->Get('sql');
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix;
+		$aColumns['_index'] = $sPrefix.'_index';
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		if (!array_key_exists($sPrefix, $aCols))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$sLog = $aCols[$sPrefix];
+
+		if (isset($aCols[$sPrefix.'_index'])) 
+		{
+			$sIndex = $aCols[$sPrefix.'_index'];
+		}
+		else
+		{
+			// For backward compatibility, allow the current state to be: 1 log, no index
+			$sIndex = '';
+		}
+
+		if (strlen($sIndex) > 0)
+		{ 
+			$aIndex = unserialize($sIndex);
+			$value = new ormCaseLog($sLog, $aIndex);
+		}
+		else
+		{
+			$value = new ormCaseLog($sLog);
+		}
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		if (!($value instanceOf ormCaseLog))
+		{
+			$value = new ormCaseLog('');
+		}
+		$aValues = array();
+		$aValues[$this->GetCode()] = $value->GetText();
+		$aValues[$this->GetCode().'_index'] = serialize($value->GetIndex());
+
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'LONGTEXT' // 2^32 (4 Gb)
+			.CMDBSource::GetSqlStringColumnDefinition();
+		$aColumns[$this->GetCode().'_index'] = 'BLOB';
+		return $aColumns;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+			$sContent = $value->GetAsHTML(null, false, array(__class__, 'RenderWikiHtml'));
+		}
+		else
+		{
+			$sContent = '';
+		}
+		$aStyles = array();
+		if ($this->GetWidth() != '')
+		{
+			$aStyles[] = 'width:'.$this->GetWidth();
+		}
+		if ($this->GetHeight() != '')
+		{
+			$aStyles[] = 'height:'.$this->GetHeight();
+		}
+		$sStyle = '';
+		if (count($aStyles) > 0)
+		{
+			$sStyle = 'style="'.implode(';', $aStyles).'"';
+		}
+		return "<div class=\"caselog\" $sStyle>".$sContent.'</div>';	}
+
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+			return parent::GetAsCSV($value->GetText($bConvertToPlainText), $sSeparator, $sTextQualifier, $oHostObject, $bLocalize, $bConvertToPlainText);
+		}
+		else
+		{
+			return '';
+		}
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if ($value instanceOf ormCaseLog)
+		{
+			return parent::GetAsXML($value->GetText(), $oHostObject, $bLocalize);
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */	 
+	public function EnumTemplateVerbs()
+	{
+		return array(
+			'' => 'Plain text representation of all the log entries',
+			'head' => 'Plain text representation of the latest entry',
+			'head_html' => 'HTML representation of the latest entry',
+			'html' => 'HTML representation of all the log entries',
+		);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 *
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 *
+	 * @return mixed
+	 * @throws \Exception
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		switch($sVerb)
+		{
+			case '':
+			return $value->GetText(true);
+			
+			case 'head':
+			return $value->GetLatestEntry('text');
+
+			case 'head_html':
+			return $value->GetLatestEntry('html');
+			
+			case 'html':
+			return $value->GetAsEmailHtml();
+	
+			default:
+			throw new Exception("Unknown verb '$sVerb' for attribute ".$this->GetCode().' in class '.get_class($oHostObject));
+		}
+	}
+	
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value->GetForJSON();
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		if (is_string($json))
+		{
+			// Will be correctly handled in MakeRealValue
+			$ret = $json;
+		}
+		else
+		{
+			if (isset($json->add_item))
+			{
+				// Will be correctly handled in MakeRealValue
+				$ret = $json->add_item;
+				if (!isset($ret->message))
+				{
+					throw new Exception("Missing mandatory entry: 'message'");
+				}
+			}
+			else
+			{
+				$ret = ormCaseLog::FromJSON($json);
+			}
+		}
+		return $ret;
+	}
+	
+	public function Fingerprint($value)
+	{
+		$sFingerprint = '';
+		if ($value instanceOf ormCaseLog)
+		{
+			$sFingerprint = $value->GetText();
+		}
+		return $sFingerprint;
+	}
+	
+	/**
+	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'html'); // default format for case logs is now HTML
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\CaseLogField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		// First we call the parent so the field is build
+		$oFormField = parent::MakeFormField($oObject, $oFormField);
+		// Then only we set the value
+		$oFormField->SetCurrentValue($this->GetEditValue($oObject->Get($this->GetCode())));
+		// And we set the entries
+		$oFormField->SetEntries($oObject->Get($this->GetCode())->GetAsArray());
+
+		return $oFormField;
+	}
+}
+
+/**
+ * Map a text column (size > ?), containing HTML code, to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeHTML extends AttributeLongText
+{
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
+			if ($bFullSpec)
+			{
+				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
+			}
+		}
+		return $aColumns;
+	}
+
+	/**
+	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'html'); // Defaults to HTML
+	}
+}
+
+/**
+ * Specialization of a string: email 
+ *
+ * @package	 iTopORM
+ */
+class AttributeEmailAddress extends AttributeString
+{
+	public function GetValidationPattern()
+	{
+		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('email_validation_pattern').'$');
+	}
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\EmailField';
+    }
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if (empty($sValue)) return '';
+
+		$sUrlDecorationClass = utils::GetConfig()->Get('email_decoration_class');
+
+		return '<a class="mailto" href="mailto:'.$sValue.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
+	}
+}
+
+/**
+ * Specialization of a string: IP address 
+ *
+ * @package	 iTopORM
+ */
+class AttributeIPAddress extends AttributeString
+{
+	public function GetValidationPattern()
+	{
+		$sNum = '(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])';
+		return "^($sNum\\.$sNum\\.$sNum\\.$sNum)$";
+	}
+
+	public function GetOrderBySQLExpressions($sClassAlias)
+	{
+		// Note: This is the responsibility of this function to place backticks around column aliases
+		return array('INET_ATON(`'.$sClassAlias.$this->GetCode().'`)');
+	}
+}
+
+/**
+ * Specialization of a string: phone number
+ *
+ * @package	 iTopORM
+ */
+class AttributePhoneNumber extends AttributeString
+{
+    public function GetValidationPattern()
+    {
+        return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('phone_number_validation_pattern').'$');
+    }
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\PhoneField';
+    }
+
+    public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+    {
+        if (empty($sValue)) return '';
+
+        $sUrlDecorationClass = utils::GetConfig()->Get('phone_number_decoration_class');
+        $sUrlPattern = utils::GetConfig()->Get('phone_number_url_pattern');
+        $sUrl = sprintf($sUrlPattern, $sValue);
+
+        return '<a class="tel" href="'.$sUrl.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
+    }
+}
+
+/**
+ * Specialization of a string: OQL expression 
+ *
+ * @package	 iTopORM
+ */
+class AttributeOQL extends AttributeText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	public function GetEditClass() {return "OQLExpression";}
+}
+
+/**
+ * Specialization of a string: template (contains iTop placeholders like $current_contact_id$ or $this->name$) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeTemplateString extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+}
+
+/**
+ * Specialization of a text: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
+ *
+ * @package	 iTopORM
+ */
+class AttributeTemplateText extends AttributeText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+}
+
+/**
+ * Specialization of a HTML: template (contains iTop placeholders like $current_contact_id$ or $this->name$)
+ *
+ * @package	 iTopORM
+ */
+class AttributeTemplateHTML extends AttributeText
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->Get('sql')] = $this->GetSQLCol();
+		if ($this->GetOptional('format', null) != null )
+		{
+			// Add the extra column only if the property 'format' is specified for the attribute
+			$aColumns[$this->Get('sql').'_format'] = "ENUM('text','html')";
+			if ($bFullSpec)
+			{
+				$aColumns[$this->Get('sql').'_format'].= " DEFAULT 'html'"; // default 'html' is for migrating old records
+			}
+		}
+		return $aColumns;
+	}
+
+	/**
+	 * The actual formatting of the text: either text (=plain text) or html (= text with HTML markup)
+	 * @return string
+	 */
+	public function GetFormat()
+	{
+		return $this->GetOptional('format', 'html'); // Defaults to HTML
+	}
+}
+
+
+/**
+ * Map a enum column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeEnum extends AttributeString
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_ENUM;
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "String";}
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		$oValDef = $this->GetValuesDef();
+		if ($oValDef)
+		{
+			$aValues = CMDBSource::Quote(array_keys($oValDef->GetValues(array(), "")), true);
+		}
+		else
+		{
+			$aValues = array();
+		}
+		if (count($aValues) > 0)
+		{
+			// The syntax used here do matters
+			// In particular, I had to remove unnecessary spaces to
+			// make sure that this string will match the field type returned by the DB
+			// (used to perform a comparison between the current DB format and the data model)
+			return "ENUM(".implode(",", $aValues).")"
+				.CMDBSource::GetSqlStringColumnDefinition()
+				.($bFullSpec ? $this->GetSQLColSpec() : '');
+		}
+		else
+		{
+			return "VARCHAR(255)"
+				.CMDBSource::GetSqlStringColumnDefinition()
+				.($bFullSpec ? " DEFAULT ''" : ""); // ENUM() is not an allowed syntax!
+		}
+	}
+	
+	protected function GetSQLColSpec()
+	{
+		$default = $this->ScalarToSQL($this->GetDefaultValue());
+		if (is_null($default))
+		{
+			$sRet = '';
+		}
+		else
+		{
+			// ENUMs values are strings so the default value must be a string as well,
+			// otherwise MySQL interprets the number as the zero-based index of the value in the list (i.e. the nth value in the list)
+			$sRet = " DEFAULT ".CMDBSource::Quote($default);
+		}
+		return $sRet;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		// Note: for strings, the null value is an empty string and it is recorded as such in the DB
+		//	   but that wasn't working for enums, because '' is NOT one of the allowed values
+		//	   that's why a null value must be forced to a real null
+		$value = parent::ScalarToSQL($value);
+		if ($this->IsNull($value))
+		{
+			return null;
+		}
+		else
+		{
+			return $value;
+		}
+	}
+
+	public function RequiresIndex()
+	{
+		return false;
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	public function GetValueLabel($sValue)
+	{
+		if (is_null($sValue))
+		{
+			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
+			$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, Dict::S('Enum:Undefined'));
+		}
+		else
+		{
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, null, true /*user lang*/);
+			if (is_null($sLabel))
+			{
+				$sDefault = str_replace('_', ' ', $sValue);
+				// Browse the hierarchy again, accepting default (english) translations
+				$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/Value:'.$sValue, $sDefault, false);
+			}
+		}
+		return $sLabel;
+	}
+
+	public function GetValueDescription($sValue)
+	{
+		if (is_null($sValue))
+		{
+			// Unless a specific label is defined for the null value of this enum, use a generic "undefined" label		
+			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', Dict::S('Enum:Undefined'));
+		}
+		else
+		{
+			$sDescription = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue.'+', '', true /* user language only */);
+			if (strlen($sDescription) == 0)
+			{
+				$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
+				if ($sParentClass)
+				{
+					if (MetaModel::IsValidAttCode($sParentClass, $this->m_sCode))
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sParentClass, $this->m_sCode);
+						$sDescription = $oAttDef->GetValueDescription($sValue);
+					}
+				}
+			}
+		}
+		return $sDescription;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		if ($bLocalize)
+		{
+			$sLabel = $this->GetValueLabel($sValue);
+			$sDescription = $this->GetValueDescription($sValue);
+			// later, we could imagine a detailed description in the title
+			$sRes = "<span title=\"$sDescription\">".parent::GetAsHtml($sLabel)."</span>";
+		}
+		else
+		{
+			$sRes = parent::GetAsHtml($sValue, $oHostObject, $bLocalize);
+		}
+		return $sRes;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_null($value))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($value);
+		}
+		else
+		{
+			$sFinalValue = $value;
+		}
+		$sRes = parent::GetAsXML($sFinalValue, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (is_null($sValue))
+		{
+			$sFinalValue = '';
+		}
+		elseif ($bLocalize)
+		{
+			$sFinalValue = $this->GetValueLabel($sValue);
+		}
+		else
+		{
+			$sFinalValue = $sValue;
+		}
+		$sRes = parent::GetAsCSV($sFinalValue, $sSeparator, $sTextQualifier, $oHostObject, $bLocalize);
+		return $sRes;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SelectField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+
+		$oFormField->SetChoices($this->GetAllowedValues($oObject->ToArgsForQuery()));
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		if (is_null($sValue))
+		{
+			return '';
+		}
+		else
+		{
+			return $this->GetValueLabel($sValue);
+		}
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		return $value;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$aRawValues = parent::GetAllowedValues($aArgs, $sContains);
+		if (is_null($aRawValues)) return null;
+		$aLocalizedValues = array();
+		foreach ($aRawValues as $sKey => $sValue)
+		{
+			$aLocalizedValues[$sKey] = $this->GetValueLabel($sKey);
+		}
+  		return $aLocalizedValues;
+  	}
+
+  	public function GetMaxSize()
+    {
+	    return null;
+    }
+
+	/**
+	 * An enum can be localized
+	 */	 	
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		if ($bLocalizedValue)
+		{
+			// Lookup for the value matching the input
+			//
+			$sFoundValue = null;
+			$aRawValues = parent::GetAllowedValues();
+			if (!is_null($aRawValues))
+			{
+				foreach ($aRawValues as $sKey => $sValue)
+				{
+					$sRefValue = $this->GetValueLabel($sKey);
+					if ($sProposedValue == $sRefValue)
+					{
+						$sFoundValue = $sKey;
+						break;
+					}
+				}
+			}
+			if (is_null($sFoundValue))
+			{
+				return null;
+			}
+	  		return $this->MakeRealValue($sFoundValue, null);
+		}
+		else
+		{
+			return parent::MakeValueFromString($sProposedValue, $bLocalizedValue, $sSepItem, $sSepAttribute, $sSepValue, $sAttributeQualifier);
+		}
+	}
+
+  	/**
+  	 * Processes the input value to align it with the values supported
+  	 * by this type of attribute. In this case: turns empty strings into nulls
+  	 * @param mixed $proposedValue The value to be set for the attribute
+  	 * @return mixed The actual value that will be set
+  	 */
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if ($proposedValue == '') return null;
+		return parent::MakeRealValue($proposedValue, $oHostObj);
+	}
+	
+	public function GetOrderByHint()
+	{
+		$aValues = $this->GetAllowedValues();
+	
+		return Dict::Format('UI:OrderByHint_Values', implode(', ', $aValues));
+	}
+}
+
+/**
+ * A meta enum is an aggregation of enum from subclasses into an enum of a base class
+ * It has been designed is to cope with the fact that statuses must be defined in leaf classes, while it makes sense to
+ * have a superstatus available on the root classe(s)
+ *
+ * @package	 iTopORM
+ */
+class AttributeMetaEnum extends AttributeEnum
+{
+	static public function ListExpectedParams()
+	{
+		return array('allowed_values', 'sql', 'default_value', 'mapping');
+	}
+
+	public function IsNullAllowed()
+	{
+		return false; // Well... this actually depends on the mapping
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		if (is_null($sClass))
+		{
+			$sClass = $this->GetHostClass();
+		}
+		$aMappingData = $this->GetMapRule($sClass);
+		if ($aMappingData == null)
+		{
+			$aRet = array();
+		}
+		else
+		{
+			$aRet = array($aMappingData['attcode']);
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Overload the standard so as to leave the data unsorted
+	 *
+	 * @param array $aArgs
+	 * @param string $sContains
+	 * @return array|null
+	 */
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oValSetDef = $this->GetValuesDef();
+		if (!$oValSetDef) return null;
+		$aRawValues = $oValSetDef->GetValueList();
+
+		if (is_null($aRawValues)) return null;
+		$aLocalizedValues = array();
+		foreach ($aRawValues as $sKey => $sValue)
+		{
+			$aLocalizedValues[$sKey] = Str::pure2html($this->GetValueLabel($sKey));
+		}
+		return $aLocalizedValues;
+	}
+
+	/**
+	 * Returns the meta value for the given object.
+	 * See also MetaModel::RebuildMetaEnums() that must be maintained when MapValue changes
+	 *
+	 * @param $oObject
+	 * @return mixed
+	 * @throws Exception
+	 */
+	public function MapValue($oObject)
+	{
+		$aMappingData = $this->GetMapRule(get_class($oObject));
+		if ($aMappingData == null)
+		{
+			$sRet = $this->GetDefaultValue();
+		}
+		else
+		{
+			$sAttCode = $aMappingData['attcode'];
+			$value = $oObject->Get($sAttCode);
+			if (array_key_exists($value, $aMappingData['values']))
+			{
+				$sRet = $aMappingData['values'][$value];
+			}
+			elseif ($this->GetDefaultValue() != '')
+			{
+				$sRet = $this->GetDefaultValue();
+			}
+			else
+			{
+				throw new Exception('AttributeMetaEnum::MapValue(): mapping not found for value "'.$value.'" in '.get_class($oObject).', on attribute '.MetaModel::GetAttributeOrigin($this->GetHostClass(), $this->GetCode()).'::'.$this->GetCode());
+			}
+		}
+		return $sRet;
+	}
+
+	public function GetMapRule($sClass)
+	{
+		$aMappings = $this->Get('mapping');
+		if (array_key_exists($sClass, $aMappings))
+		{
+			$aMappingData = $aMappings[$sClass];
+		}
+		else
+		{
+			$sParent = MetaModel::GetParentClass($sClass);
+			if (is_null($sParent))
+			{
+				$aMappingData = null;
+			}
+			else
+			{
+				$aMappingData = $this->GetMapRule($sParent);
+			}
+		}
+
+		return $aMappingData;
+	}
+}
+/**
+ * Map a date+time column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDateTime extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DATE_TIME;
+
+	static $oFormat = null;
+
+	/**
+	 *
+	 * @return DateTimeFormat
+	 */
+	static public function GetFormat()
+	{
+		if (self::$oFormat == null)
+		{
+			static::LoadFormatFromConfig();		
+		}
+		return self::$oFormat;
+	}	
+	
+	/**
+	 * Load the 3 settings: date format, time format and data_time format from the configuration
+	 */
+	protected static function LoadFormatFromConfig()
+	{
+		$aFormats = MetaModel::GetConfig()->Get('date_and_time_format');
+		$sLang = Dict::GetUserLanguage();
+		$sDateFormat = isset($aFormats[$sLang]['date']) ? $aFormats[$sLang]['date'] : (isset($aFormats['default']['date']) ? $aFormats['default']['date'] : 'Y-m-d');
+		$sTimeFormat = isset($aFormats[$sLang]['time']) ? $aFormats[$sLang]['time'] : (isset($aFormats['default']['time']) ? $aFormats['default']['time'] : 'H:i:s');
+		$sDateAndTimeFormat = isset($aFormats[$sLang]['date_time']) ? $aFormats[$sLang]['date_time'] : (isset($aFormats['default']['date_time']) ? $aFormats['default']['date_time'] : '$date $time');
+		
+		$sFullFormat = str_replace(array('$date', '$time'), array($sDateFormat, $sTimeFormat), $sDateAndTimeFormat);
+		
+		self::SetFormat(new DateTimeFormat($sFullFormat));
+		AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));		
+	}
+	
+	/**
+	 * Returns the format string used for the date & time stored in memory
+	 * @return string
+	 */
+	static public function GetInternalFormat()
+	{
+		return 'Y-m-d H:i:s';
+	}
+
+	/**
+	 * Returns the format string used for the date & time written to MySQL
+	 * @return string
+	 */
+	static public function GetSQLFormat()
+	{
+		return 'Y-m-d H:i:s';
+	}
+	
+	static public function SetFormat(DateTimeFormat $oDateTimeFormat)
+	{
+		self::$oFormat = $oDateTimeFormat;
+	}
+	
+	static public function GetSQLTimeFormat()
+	{
+		return 'H:i:s';
+	}
+	
+	/**
+	 * Parses a search string coming from user input
+	 * @param string $sSearchString
+	 * @return string
+	 */
+	public function ParseSearchString($sSearchString)
+	{
+		try
+		{
+			$oDateTime = $this->GetFormat()->Parse($sSearchString);
+			$sSearchString = $oDateTime->format($this->GetInternalFormat());
+		}
+		catch(Exception $e)
+		{
+			$sFormatString = '!'.(string)AttributeDate::GetFormat(); // BEWARE: ! is needed to set non-parsed fields to zero !!!
+			$oDateTime = DateTime::createFromFormat($sFormatString, $sSearchString); 
+			if ($oDateTime !== false)
+			{
+				$sSearchString = $oDateTime->format($this->GetInternalFormat());
+			}
+		}
+		return $sSearchString;
+	}
+	
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\DateTimeField';
+	}
+	
+	/**
+	 * Override to specify Field class
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		$oFormField->SetPHPDateTimeFormat((string) $this->GetFormat());
+		$oFormField->SetJSDateTimeFormat($this->GetFormat()->ToMomentJS());
+
+		$oFormField = parent::MakeFormField($oObject, $oFormField);
+
+		// After call to the parent as it sets the current value
+		$oFormField->SetCurrentValue($this->GetFormat()->Format($oObject->Get($this->GetCode())));
+
+		return $oFormField;
+	}
+
+    /**
+     * @inheritdoc
+     */
+    public function EnumTemplateVerbs()
+    {
+        return array(
+            '' => 'Formatted representation',
+            'raw' => 'Not formatted representation',
+        );
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+    {
+        switch ($sVerb)
+        {
+            case '':
+            case 'text':
+                return static::GetFormat()->format($value);
+                break;
+            case 'html':
+                // Note: Not passing formatted value as the method will format it.
+                return $this->GetAsHTML($value);
+                break;
+            case 'raw':
+                return $value;
+                break;
+            default:
+                return parent::GetForTemplate($value, $sVerb, $oHostObject, $bLocalize);
+                break;
+        }
+    }
+
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "DateTime";}
+
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return (string)static::GetFormat()->format($sValue);
+	}	
+	public function GetValueLabel($sValue, $oHostObj = null)
+	{
+		return (string)static::GetFormat()->format($sValue);
+	}	
+	
+	protected function GetSQLCol($bFullSpec = false) {return "DATETIME";}
+
+	public function GetImportColumns()
+	{
+		// Allow an empty string to be a valid value (synonym for "reset")
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'VARCHAR(19)';
+		return $aColumns;
+	}
+
+	public static function GetAsUnixSeconds($value)
+	{
+		$oDeadlineDateTime = new DateTime($value);
+		$iUnixSeconds = $oDeadlineDateTime->format('U');
+		return $iUnixSeconds;
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		// null value will be replaced by the current date, if not already set, in DoComputeValues
+		return $this->GetNullValue();
+	}
+
+	public function GetValidationPattern()
+	{
+		return static::GetFormat()->ToRegExpr();
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array(
+			"="=>"equals",
+			"!="=>"differs from",
+			"<"=>"before",
+			"<="=>"before",
+			">"=>"after (strictly)",
+			">="=>"after",
+			"SameDay"=>"same day (strip time)",
+			"SameMonth"=>"same year/month",
+			"SameYear"=>"same year",
+			"Today"=>"today",
+			">|"=>"after today + N days",
+			"<|"=>"before today + N days",
+			"=|"=>"equals today + N days",
+		);
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		// Unless we implement a "same xxx, depending on given precision" !
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+
+		switch ($sOpCode)
+		{
+		case '=':
+		case '!=':
+		case '<':
+		case '<=':
+		case '>':
+		case '>=':
+			return $this->GetSQLExpr()." $sOpCode $sQValue";
+		case 'SameDay':
+			return "DATE(".$this->GetSQLExpr().") = DATE($sQValue)";
+		case 'SameMonth':
+			return "DATE_FORMAT(".$this->GetSQLExpr().", '%Y-%m') = DATE_FORMAT($sQValue, '%Y-%m')";
+		case 'SameYear':
+			return "MONTH(".$this->GetSQLExpr().") = MONTH($sQValue)";
+		case 'Today':
+			return "DATE(".$this->GetSQLExpr().") = CURRENT_DATE()";
+		case '>|':
+			return "DATE(".$this->GetSQLExpr().") > DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
+		case '<|':
+			return "DATE(".$this->GetSQLExpr().") < DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
+		case '=|':
+			return "DATE(".$this->GetSQLExpr().") = DATE_ADD(CURRENT_DATE(), INTERVAL $sQValue DAY)";
+		default:
+			return $this->GetSQLExpr()." = $sQValue";
+		}
+	}
+	
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue))
+		{
+			return null;
+		}
+		if (is_string($proposedValue) && ($proposedValue == "") && $this->IsNullAllowed())
+		{
+			return null;
+		}
+		if (!is_numeric($proposedValue))
+		{
+			// Check the format
+			try
+			{
+				$oFormat = new DateTimeFormat($this->GetInternalFormat());
+				$oFormat->Parse($proposedValue);
+			}
+			catch (Exception $e)
+			{
+				throw new Exception('Wrong format for date attribute '.$this->GetCode().', expecting "'.$this->GetInternalFormat().'" and got "'.$proposedValue.'"');
+			}
+
+			return $proposedValue;
+		}
+
+		return date(static::GetInternalFormat(), $proposedValue);
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (empty($value))
+		{	
+			return null;
+		}
+		return $value;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html(static::GetFormat()->format($value));
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2xml($value);
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (empty($sValue) || ($sValue === '0000-00-00 00:00:00') || ($sValue === '0000-00-00'))
+		{
+			return '';
+		}
+		else if ((string)static::GetFormat() !== static::GetInternalFormat())
+		{
+			// Format conversion
+			$oDate = new DateTime($sValue);
+			if ($oDate !== false)
+			{
+				$sValue = static::GetFormat()->format($oDate);
+			}
+		}
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+	
+	/**
+	 * Parses a string to find some smart search patterns and build the corresponding search/OQL condition
+	 * Each derived class is reponsible for defining and processing their own smart patterns, the base class
+	 * does nothing special, and just calls the default (loose) operator
+	 * @param string $sSearchText The search string to analyze for smart patterns
+	 * @param FieldExpression The FieldExpression representing the atttribute code in this OQL query
+	 * @param array $aParams Values of the query parameters
+	 * @return Expression The search condition to be added (AND) to the current search
+	 */
+	public function GetSmartConditionExpression($sSearchText, FieldExpression $oField, &$aParams, $bParseSearchString = false)
+	{
+		// Possible smart patterns
+		$aPatterns = array(
+			'between' => array('pattern' => '/^\[(.*),(.*)\]$/', 'operator' => 'n/a'),
+			'greater than or equal' => array('pattern' => '/^>=(.*)$/', 'operator' => '>='),
+			'greater than' => array('pattern' => '/^>(.*)$/', 'operator' => '>'),
+			'less than or equal' => array('pattern' => '/^<=(.*)$/', 'operator' => '<='),
+			'less than' =>  array('pattern' => '/^<(.*)$/', 'operator' => '<'),
+		);
+		
+		$sPatternFound = '';
+		$aMatches = array();
+		foreach($aPatterns as $sPatName => $sPattern)
+		{
+			if (preg_match($sPattern['pattern'], $sSearchText, $aMatches))
+			{
+				$sPatternFound = $sPatName;
+				break;
+			}			
+		}
+		
+		switch($sPatternFound)
+		{
+			case 'between':
+			
+			$sParamName1 = $oField->GetParent().'_'.$oField->GetName().'_1';
+			$oRightExpr = new VariableExpression($sParamName1);
+			if ($bParseSearchString)
+			{
+				$aParams[$sParamName1] = $this->ParseSearchString($aMatches[1]);
+			}
+			else
+			{
+			$aParams[$sParamName1] = $aMatches[1];
+			}
+			$oCondition1 = new BinaryExpression($oField, '>=', $oRightExpr);
+
+			$sParamName2 = $oField->GetParent().'_'.$oField->GetName().'_2';
+			$oRightExpr = new VariableExpression($sParamName2);
+			if ($bParseSearchString)
+			{
+				$aParams[$sParamName2] = $this->ParseSearchString($aMatches[2]);
+			}
+			else
+			{
+			$aParams[$sParamName2] = $aMatches[2];
+			}
+			$oCondition2 = new BinaryExpression($oField, '<=', $oRightExpr);
+			
+			$oNewCondition = new BinaryExpression($oCondition1, 'AND', $oCondition2);
+			break;
+			
+			case 'greater than':
+			case 'greater than or equal':
+			case 'less than':
+			case 'less than or equal':
+			$sSQLOperator = $aPatterns[$sPatternFound]['operator'];
+			$sParamName = $oField->GetParent().'_'.$oField->GetName();
+			$oRightExpr = new VariableExpression($sParamName);
+			if ($bParseSearchString)
+			{
+				$aParams[$sParamName] = $this->ParseSearchString($aMatches[1]);
+			}
+			else
+			{
+			$aParams[$sParamName] = $aMatches[1];
+			}
+			$oNewCondition = new BinaryExpression($oField, $sSQLOperator, $oRightExpr);
+			
+			break;
+						
+			default:
+			$oNewCondition = parent::GetSmartConditionExpression($sSearchText, $oField, $aParams);
+
+		}
+
+		return $oNewCondition;
+	}
+
+
+	public function GetHelpOnSmartSearch()
+	{
+		$sDict = parent::GetHelpOnSmartSearch();
+		
+		$oFormat = static::GetFormat();
+		$sExample = $oFormat->Format(new DateTime('2015-07-19 18:40:00'));
+		return vsprintf($sDict, array($oFormat->ToPlaceholder(), $sExample));
+	}	
+}
+
+/**
+ * Store a duration as a number of seconds 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDuration extends AttributeInteger
+{
+	public function GetEditClass() {return "Duration";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11) UNSIGNED";}
+
+	public function GetNullValue() {return '0';}
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return null;
+		if (!is_numeric($proposedValue)) return null;
+		if ( ((int)$proposedValue) < 0) return null;
+
+		return (int)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (is_null($value))
+		{	
+			return null;
+		}
+		return $value;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html(self::FormatDuration($value));
+	}
+
+	public static function FormatDuration($duration)
+	{
+		$aDuration = self::SplitDuration($duration);
+
+		if ($duration < 60)
+		{
+			// Less than 1 min
+			$sResult = Dict::Format('Core:Duration_Seconds', $aDuration['seconds']);			
+		}
+		else if ($duration < 3600)
+		{
+			// less than 1 hour, display it in minutes/seconds
+			$sResult = Dict::Format('Core:Duration_Minutes_Seconds', $aDuration['minutes'], $aDuration['seconds']);			
+		}
+		else if ($duration < 86400)
+		{
+			// Less than 1 day, display it in hours/minutes/seconds	
+			$sResult = Dict::Format('Core:Duration_Hours_Minutes_Seconds', $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
+		}
+		else
+		{
+			// more than 1 day, display it in days/hours/minutes/seconds
+			$sResult = Dict::Format('Core:Duration_Days_Hours_Minutes_Seconds', $aDuration['days'], $aDuration['hours'], $aDuration['minutes'], $aDuration['seconds']);			
+		}
+		return $sResult;
+	}
+	
+	static function SplitDuration($duration)
+	{
+		$duration = (int) $duration;
+		$days = floor($duration / 86400);
+		$hours = floor(($duration - (86400*$days)) / 3600);
+		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
+		$seconds = ($duration % 60); // modulo
+		return array( 'days' => $days, 'hours' => $hours, 'minutes' => $minutes, 'seconds' => $seconds );		
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\DurationField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
+		$sAttCode = $this->GetCode();
+		$oFormField->SetCurrentValue($oObject->Get($sAttCode));
+		$oFormField->SetReadOnly(true);
+
+		return $oFormField;
+	}
+
+}
+/**
+ * Map a date+time column to an attribute 
+ *
+ * @package	 iTopORM
+ */
+class AttributeDate extends AttributeDateTime
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_DATE;
+
+	static $oDateFormat = null;
+	
+	static public function GetFormat()
+	{
+		if (self::$oDateFormat == null)
+		{			
+			AttributeDateTime::LoadFormatFromConfig();		
+		}
+		return self::$oDateFormat;
+	}
+
+	static public function SetFormat(DateTimeFormat $oDateFormat)
+	{
+		self::$oDateFormat = $oDateFormat;
+	}
+
+	/**
+	 * Returns the format string used for the date & time stored in memory
+	 * @return string
+	 */
+	static public function GetInternalFormat()
+	{
+		return 'Y-m-d';
+	}
+
+	/**
+	 * Returns the format string used for the date & time written to MySQL
+	 * @return string
+	 */
+	static public function GetSQLFormat()
+	{
+		return 'Y-m-d';
+	}
+	
+	static public function ListExpectedParams()
+	{
+		return parent::ListExpectedParams();
+		//return array_merge(parent::ListExpectedParams(), array());
+	}
+
+	public function GetEditClass() {return "Date";}
+	protected function GetSQLCol($bFullSpec = false) {return "DATE";}
+	public function GetImportColumns()
+	{
+		// Allow an empty string to be a valid value (synonym for "reset")
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'VARCHAR(10)';
+		return $aColumns;
+	}
+
+
+	/**
+	 * Override to specify Field class
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behave more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		$oFormField = parent::MakeFormField($oObject, $oFormField);
+		$oFormField->SetDateOnly(true);
+		
+		return $oFormField;
+	}
+	
+}
+
+/**
+ * A dead line stored as a date & time
+ * The only difference with the DateTime attribute is the display:
+ * relative to the current time
+ */
+class AttributeDeadline extends AttributeDateTime
+{
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$sResult = self::FormatDeadline($value);
+		return $sResult;
+	}
+
+	public static function FormatDeadline($value)
+	{
+		$sResult = '';
+		if ($value !== null)
+		{
+			$iValue = AttributeDateTime::GetAsUnixSeconds($value);
+			$sDate = AttributeDateTime::GetFormat()->Format($value);
+			$difference = $iValue - time();
+	
+			if ($difference >= 0)
+			{
+				$sDifference = self::FormatDuration($difference);
+			}
+			else
+			{
+				$sDifference = Dict::Format('UI:DeadlineMissedBy_duration', self::FormatDuration(-$difference));
+			}
+			$sFormat = MetaModel::GetConfig()->Get('deadline_format');
+			$sResult = str_replace(array('$date$', '$difference$'), array($sDate, $sDifference), $sFormat);
+		}
+
+		return $sResult;
+	}
+
+	static function FormatDuration($duration)
+	{
+		$days = floor($duration / 86400);
+		$hours = floor(($duration - (86400*$days)) / 3600);
+		$minutes = floor(($duration - (86400*$days + 3600*$hours)) / 60);
+
+		if ($duration < 60)
+		{
+			// Less than 1 min
+			$sResult =Dict::S('UI:Deadline_LessThan1Min');			
+		}
+		else if ($duration < 3600)
+		{
+			// less than 1 hour, display it in minutes
+			$sResult =Dict::Format('UI:Deadline_Minutes', $minutes);			
+		}
+		else if ($duration < 86400)
+		{
+			// Less that 1 day, display it in hours/minutes	
+			$sResult =Dict::Format('UI:Deadline_Hours_Minutes', $hours, $minutes);			
+		}
+		else
+		{
+			// Less that 1 day, display it in hours/minutes	
+			$sResult =Dict::Format('UI:Deadline_Days_Hours_Minutes', $days, $hours, $minutes);			
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Map a foreign key to an attribute 
+ *  AttributeExternalKey and AttributeExternalField may be an external key
+ *  the difference is that AttributeExternalKey corresponds to a column into the defined table
+ *  where an AttributeExternalField corresponds to a column into another table (class)
+ *
+ * @package	 iTopORM
+ */
+class AttributeExternalKey extends AttributeDBFieldVoid
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
+
+
+	/**
+	 * Return the search widget type corresponding to this attribute
+	 *
+	 * @return string
+	 */
+	public function GetSearchType()
+	{
+		try
+		{
+			$oRemoteAtt = $this->GetFinalAttDef();
+			$sTargetClass = $oRemoteAtt->GetTargetClass();
+			if (MetaModel::IsHierarchicalClass($sTargetClass))
+			{
+				return self::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
+			}
+			return self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
+		}
+		catch (CoreException $e)
+		{
+		}
+
+		return self::SEARCH_WIDGET_TYPE_RAW;
+	}
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("targetclass", "is_null_allowed", "on_target_delete"));
+	}
+
+	public function GetEditClass() {return "ExtKey";}
+	protected function GetSQLCol($bFullSpec = false) {return "INT(11)".($bFullSpec ? " DEFAULT 0" : "");}
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	public function IsExternalKey($iType = EXTKEY_RELATIVE) {return true;}
+	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->Get("targetclass");}
+	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
+	public function GetKeyAttCode() {return $this->GetCode();} 
+	public function GetDisplayStyle() { return $this->GetOptional('display_style', 'select'); }
+	
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return 0;}
+	public function IsNullAllowed()
+	{
+		if (MetaModel::GetConfig()->Get('disable_mandatory_ext_keys'))
+		{
+			return true;
+		}
+		return $this->Get("is_null_allowed");
+	}
+
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return parent::GetBasicFilterLooseOperator();
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return parent::GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	// overloaded here so that an ext key always have the answer to
+	// "what are your possible values?"
+	public function GetValuesDef()
+	{
+		$oValSetDef = $this->Get("allowed_values");
+		if (!$oValSetDef)
+		{
+			// Let's propose every existing value
+			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
+		}
+		return $oValSetDef;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		//throw new Exception("GetAllowedValues on ext key has been deprecated");
+		try
+		{
+			return parent::GetAllowedValues($aArgs, $sContains);
+		}
+		catch (MissingQueryArgument $e)
+		{
+			// Some required arguments could not be found, enlarge to any existing value
+			$oValSetDef = new ValueSetObjects('SELECT '.$this->GetTargetClass());
+			return $oValSetDef->GetValues($aArgs, $sContains);
+		}
+	}
+
+	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		$oValSetDef = $this->GetValuesDef();
+		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
+		return $oSet;
+	}
+
+	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		return DBObjectSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
+	}
+
+	public function GetDeletionPropagationOption()
+	{
+		return $this->Get("on_target_delete");
+	}
+
+	public function GetNullValue()
+	{
+		return 0;
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == 0);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return 0;
+		if ($proposedValue === '') return 0;
+		if (MetaModel::IsValidObject($proposedValue)) return $proposedValue->GetKey();
+		return (int)$proposedValue;
+	}
+	
+	public function GetMaximumComboLength()
+	{
+		return $this->GetOptional('max_combo_length', MetaModel::GetConfig()->Get('max_combo_length'));
+	}
+	
+	public function GetMinAutoCompleteChars()
+	{
+		return $this->GetOptional('min_autocomplete_chars', MetaModel::GetConfig()->Get('min_autocomplete_chars'));
+	}
+	
+	public function AllowTargetCreation()
+	{
+		return $this->GetOptional('allow_target_creation', MetaModel::GetConfig()->Get('allow_target_creation'));
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 * @throws \CoreException
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		$oRet = null;
+		$sRemoteClass = $this->GetTargetClass();
+		foreach (MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
+		{
+			if (!$oRemoteAttDef->IsLinkSet()) continue;
+			if (!is_subclass_of($this->GetHostClass(), $oRemoteAttDef->GetLinkedClass()) && $oRemoteAttDef->GetLinkedClass() != $this->GetHostClass()) continue;
+			if ($oRemoteAttDef->GetExtKeyToMe() != $this->GetCode()) continue;
+			$oRet = $oRemoteAttDef;
+			break;
+		}
+		return $oRet;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SelectObjectField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			// TODO : We should check $this->Get('display_style') and create a Radio / Select / ... regarding its value
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		
+		// Setting params
+		$oFormField->SetMaximumComboLength($this->GetMaximumComboLength());
+		$oFormField->SetMinAutoCompleteChars($this->GetMinAutoCompleteChars());
+		$oFormField->SetHierarchical(MetaModel::IsHierarchicalClass($this->GetTargetClass()));
+		// Setting choices regarding the field dependencies
+		$aFieldDependencies = $this->GetPrerequisiteAttributes();
+		if (!empty($aFieldDependencies))
+		{
+			$oTmpAttDef = $this;
+			$oTmpField = $oFormField;
+			$oFormField->SetOnFinalizeCallback(function() use ($oTmpField, $oTmpAttDef, $oObject)
+			{
+			    /** @var $oTmpField \Combodo\iTop\Form\Field\Field */
+			    /** @var $oTmpAttDef \AttributeDefinition */
+			    /** @var $oObject \DBObject */
+
+				// We set search object only if it has not already been set (overrided)
+				if ($oTmpField->GetSearch() === null)
+				{
+					$oSearch = DBSearch::FromOQL($oTmpAttDef->GetValuesDef()->GetFilterExpression());
+					$oSearch->SetInternalParams(array('this' => $oObject));
+					$oTmpField->SetSearch($oSearch);
+				}
+			});
+		}
+		else
+		{
+			$oSearch = DBSearch::FromOQL($this->GetValuesDef()->GetFilterExpression());
+			$oSearch->SetInternalParams(array('this' => $oObject));
+			$oFormField->SetSearch($oSearch);
+		}
+
+		// If ExtKey is mandatory, we add a validator to ensure that the value 0 is not selected
+		if ($oObject->GetAttributeFlags($this->GetCode()) & OPT_ATT_MANDATORY)
+		{
+			$oFormField->AddValidator(new \Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator());
+		}
+
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * Special kind of External Key to manage a hierarchy of objects
+ */
+class AttributeHierarchicalKey extends AttributeExternalKey
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_HIERARCHICAL_KEY;
+
+	protected $m_sTargetClass;
+
+	static public function ListExpectedParams()
+	{
+		$aParams = parent::ListExpectedParams();
+		$idx = array_search('targetclass', $aParams);
+		unset($aParams[$idx]);
+		$idx = array_search('jointype', $aParams);
+		unset($aParams[$idx]);
+		return $aParams; // TODO: mettre les bons parametres ici !!
+	}
+
+	public function GetEditClass() {return "ExtKey";}
+	public function RequiresIndex()
+	{
+		return true;
+	}
+
+	/*
+	*  The target class is the class for which the attribute has been defined first
+	*/	
+	public function SetHostClass($sHostClass)
+	{
+		if (!isset($this->m_sTargetClass))
+		{
+			$this->m_sTargetClass = $sHostClass;
+		}
+		parent::SetHostClass($sHostClass);
+	}
+
+	static public function IsHierarchicalKey() {return true;}
+	public function GetTargetClass($iType = EXTKEY_RELATIVE) {return $this->m_sTargetClass;}
+	public function GetKeyAttDef($iType = EXTKEY_RELATIVE){return $this;}
+	public function GetKeyAttCode() {return $this->GetCode();}
+
+	public function GetBasicFilterOperators()
+	{
+		return parent::GetBasicFilterOperators();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return parent::GetBasicFilterLooseOperator();
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
+		$aColumns[$this->GetSQLLeft()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
+		$aColumns[$this->GetSQLRight()] = 'INT(11)'.($bFullSpec ? ' DEFAULT 0' : '');
+		return $aColumns;
+	}
+	public function GetSQLRight()
+	{
+		return $this->GetCode().'_right';
+	}
+	public function GetSQLLeft()
+	{
+		return $this->GetCode().'_left';
+	}
+
+	public function GetSQLValues($value)
+	{
+		if (!is_array($value))
+		{
+			$aValues[$this->GetCode()] = $value;
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode()] = $value[$this->GetCode()];
+			$aValues[$this->GetSQLRight()] = $value[$this->GetSQLRight()];
+			$aValues[$this->GetSQLLeft()] = $value[$this->GetSQLLeft()];
+		}
+		return $aValues;
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains);
+		if ($oFilter)
+		{
+			$oValSetDef = $this->GetValuesDef();
+			$oValSetDef->AddCondition($oFilter);
+			return $oValSetDef->GetValues($aArgs, $sContains);
+		}
+		else
+		{
+			return parent::GetAllowedValues($aArgs, $sContains);
+		}
+	}
+
+	public function GetAllowedValuesAsObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		$oValSetDef = $this->GetValuesDef();
+		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
+		if ($oFilter)
+		{
+			$oValSetDef->AddCondition($oFilter);
+		}
+		$oSet = $oValSetDef->ToObjectSet($aArgs, $sContains, $iAdditionalValue);
+		return $oSet;
+	}
+
+	public function GetAllowedValuesAsFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		$oFilter = $this->GetHierachicalFilter($aArgs, $sContains, $iAdditionalValue);
+		if ($oFilter)
+		{
+			return $oFilter;
+		}
+		return parent::GetAllowedValuesAsFilter($aArgs, $sContains, $iAdditionalValue);
+	}
+
+	private function GetHierachicalFilter($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		if (array_key_exists('this', $aArgs))
+		{
+			// Hierarchical keys have one more constraint: the "parent value" cannot be
+			// "under" themselves
+			$iRootId = $aArgs['this']->GetKey();
+			if ($iRootId > 0) // ignore objects that do no exist in the database...
+			{
+				$sClass = $this->m_sTargetClass;
+				return DBObjectSearch::FromOQL("SELECT $sClass AS node JOIN $sClass AS root ON node.".$this->GetCode()." NOT BELOW root.id WHERE root.id = $iRootId");
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Find the corresponding "link" attribute on the target class, if any
+	 * @return null | AttributeDefinition
+	 */
+	public function GetMirrorLinkAttribute()
+	{
+		return null;
+	}
+}
+
+/**
+ * An attribute which corresponds to an external key (direct or indirect) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeExternalField extends AttributeDefinition
+{
+	/**
+	 * Return the search widget type corresponding to this attribute
+	 *
+	 * @return string
+	 */
+	public function GetSearchType()
+	{
+		// Not necessary the external key is already present
+		if ($this->IsFriendlyName())
+		{
+			return self::SEARCH_WIDGET_TYPE_RAW;
+		}
+
+		try
+		{
+			$oRemoteAtt = $this->GetFinalAttDef();
+			switch (true)
+			{
+				case ($oRemoteAtt instanceof AttributeString):
+					return self::SEARCH_WIDGET_TYPE_EXTERNAL_FIELD;
+				case ($oRemoteAtt instanceof AttributeExternalKey):
+					return self::SEARCH_WIDGET_TYPE_EXTERNAL_KEY;
+			}
+		}
+		catch (CoreException $e)
+		{
+		}
+
+		return self::SEARCH_WIDGET_TYPE_RAW;
+	}
+
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("extkey_attcode", "target_attcode"));
+	}
+
+	public function GetEditClass() {return "ExtField";}
+
+	public function GetFinalAttDef()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetFinalAttDef(); 
+	}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		// throw new CoreException("external attribute: does it make any sense to request its type ?");  
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetSQLCol($bFullSpec); 
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			return array('' => $this->GetCode()); // Warning: Use GetCode() since AttributeExternalField does not have any 'sql' property
+		}
+		else
+		{
+			return $sPrefix;
+		} 
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		if ($this->IsFriendlyName())
+		{
+			$sKeyAttCode = $this->Get("extkey_attcode");
+			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
+			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
+		}
+		else
+		{
+			$sLabel = parent::GetLabel('');
+			if (strlen($sLabel) == 0)
+			{
+				$oRemoteAtt = $this->GetExtAttDef();
+				$sLabel = $oRemoteAtt->GetLabel($this->m_sCode);
+			}
+		}
+		return $sLabel;
+	}
+
+	public function GetLabelForSearchField()
+	{
+		$sLabel = parent::GetLabel('');
+		if (strlen($sLabel) == 0)
+		{
+			$sKeyAttCode = $this->Get("extkey_attcode");
+			$oExtKeyAttDef = MetaModel::GetAttributeDef($this->GetHostClass(), $sKeyAttCode);
+			$sLabel = $oExtKeyAttDef->GetLabel($this->m_sCode);
+
+			$oRemoteAtt = $this->GetExtAttDef();
+			$sLabel .= '->'.$oRemoteAtt->GetLabel($this->m_sCode);
+		}
+
+		return $sLabel;
+	}
+
+	public function GetDescription($sDefault = null)
+	{
+		$sLabel = parent::GetDescription('');
+		if (strlen($sLabel) == 0)
+		{
+			$oRemoteAtt = $this->GetExtAttDef();
+			$sLabel = $oRemoteAtt->GetDescription('');
+		}
+		return $sLabel;
+	} 
+	public function GetHelpOnEdition($sDefault = null)
+	{
+		$sLabel = parent::GetHelpOnEdition('');
+		if (strlen($sLabel) == 0)
+		{
+			$oRemoteAtt = $this->GetExtAttDef();
+			$sLabel = $oRemoteAtt->GetHelpOnEdition('');
+		}
+		return $sLabel;
+	} 
+
+	public function IsExternalKey($iType = EXTKEY_RELATIVE)
+	{
+		switch($iType)
+		{
+		case EXTKEY_ABSOLUTE:
+			// see further
+			$oRemoteAtt = $this->GetExtAttDef();
+			return $oRemoteAtt->IsExternalKey($iType);
+
+		case EXTKEY_RELATIVE:
+			return false;
+
+		default:
+			throw new CoreException("Unexpected value for argument iType: '$iType'");
+		}
+	}
+
+	/**
+	 * @return bool
+	 * @throws \CoreException
+	 */
+	public function IsFriendlyName()
+	{
+		$oRemoteAtt = $this->GetExtAttDef();
+		if ($oRemoteAtt instanceof AttributeExternalField)
+		{
+			$bRet = $oRemoteAtt->IsFriendlyName();
+		}
+		elseif ($oRemoteAtt instanceof  AttributeFriendlyName)
+		{
+			$bRet = true;
+		}
+		else
+		{
+			$bRet = false;
+		}
+		return $bRet;
+	}
+
+	public function GetTargetClass($iType = EXTKEY_RELATIVE)
+	{
+		return $this->GetKeyAttDef($iType)->GetTargetClass();
+	}
+
+	static public function IsExternalField() {return true;}
+	public function GetKeyAttCode() {return $this->Get("extkey_attcode");} 
+	public function GetExtAttCode() {return $this->Get("target_attcode");} 
+
+	public function GetKeyAttDef($iType = EXTKEY_RELATIVE)
+	{
+		switch($iType)
+		{
+		case EXTKEY_ABSOLUTE:
+			// see further
+			$oRemoteAtt = $this->GetExtAttDef();
+			if ($oRemoteAtt->IsExternalField())
+			{
+				return $oRemoteAtt->GetKeyAttDef(EXTKEY_ABSOLUTE);
+			}
+			else if ($oRemoteAtt->IsExternalKey())
+			{
+				return $oRemoteAtt;
+			}
+			return $this->GetKeyAttDef(EXTKEY_RELATIVE); // which corresponds to the code hereafter !
+
+		case EXTKEY_RELATIVE:
+			return MetaModel::GetAttributeDef($this->GetHostClass(), $this->Get("extkey_attcode"));
+
+		default:
+			throw new CoreException("Unexpected value for argument iType: '$iType'");
+		}
+	}
+	
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		return array($this->Get("extkey_attcode"));
+	} 
+	
+
+	public function GetExtAttDef()
+	{
+		$oKeyAttDef = $this->GetKeyAttDef();
+		$oExtAttDef = MetaModel::GetAttributeDef($oKeyAttDef->GetTargetClass(), $this->Get("target_attcode"));
+		if (!is_object($oExtAttDef)) throw new CoreException("Invalid external field ".$this->GetCode()." in class ".$this->GetHostClass().". The class ".$oKeyAttDef->GetTargetClass()." has no attribute ".$this->Get("target_attcode"));
+		return $oExtAttDef;
+	}
+
+	public function GetSQLExpr()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetSQLExpr(); 
+	} 
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetDefaultValue();
+	}
+	public function IsNullAllowed()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->IsNullAllowed(); 
+	}
+
+	static public function IsScalar()
+	{
+		return true;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetBasicFilterOperators(); 
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetBasicFilterLooseOperator(); 
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetBasicFilterSQLExpr($sOpCode, $value);
+	} 
+
+	public function GetNullValue()
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetNullValue();
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->IsNull($proposedValue);
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->MakeRealValue($proposedValue, $oHostObj);
+	}
+
+	public function ScalarToSQL($value)
+	{
+		// This one could be used in case of filtering only
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->ScalarToSQL($value);
+	}
+
+
+	// Do not overload GetSQLExpression here because this is handled in the joins
+	//public function GetSQLExpressions($sPrefix = '') {return array();}
+
+	// Here, we get the data...
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->FromSQLToValue($aCols, $sPrefix);
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetAsHTML($value, null, $bLocalize);
+	}
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetAsXML($value, null, $bLocalize);
+	}
+	public function GetAsCSV($value, $sSeparator = ',', $sTestQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$oExtAttDef = $this->GetExtAttDef();
+		return $oExtAttDef->GetAsCSV($value, $sSeparator, $sTestQualifier, null, $bLocalize, $bConvertToPlainText);
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+	    // Retrieving AttDef from the remote attribute
+        $oRemoteAttDef = $this->GetExtAttDef();
+
+        if ($oFormField === null)
+		{
+		    // ExternalField's FormField are actually based on the FormField from the target attribute.
+            // Except for the AttributeExternalKey because we have no OQL and stuff
+            if($oRemoteAttDef instanceof AttributeExternalKey)
+            {
+                $sFormFieldClass = static::GetFormFieldClass();
+            }
+            else
+            {
+                $sFormFieldClass = $oRemoteAttDef::GetFormFieldClass();
+            }
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+        // Manually setting for remote ExternalKey, otherwise, the id would be displayed.
+		if($oRemoteAttDef instanceof AttributeExternalKey)
+        {
+            $oFormField->SetCurrentValue($oObject->Get($this->GetCode().'_friendlyname'));
+        }
+
+		// Readonly field because we can't update external fields
+		$oFormField->SetReadOnly(true);
+
+		return $oFormField;
+	}
+
+	public function IsPartOfFingerprint()
+	{
+		return false;
+	}
+
+}
+
+/**
+ * Map a varchar column to an URL (formats the ouput in HMTL) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeURL extends AttributeString
+{
+	static public function ListExpectedParams()
+	{
+		//return parent::ListExpectedParams();
+		return array_merge(parent::ListExpectedParams(), array("target"));
+	}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "VARCHAR(2048)"
+			.CMDBSource::GetSqlStringColumnDefinition()
+			.($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+
+	public function GetMaxSize()
+	{
+		return 2048;
+	}
+	
+	public function GetEditClass() {return "String";}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$sTarget = $this->Get("target");
+		if (empty($sTarget)) $sTarget = "_blank";
+		$sLabel = Str::pure2html($sValue);
+		if (strlen($sLabel) > 128)
+		{
+			// Truncate the length to 128 characters, by removing the middle
+			$sLabel = substr($sLabel, 0, 100).'.....'.substr($sLabel, -20);
+		}
+		return "<a target=\"$sTarget\" href=\"$sValue\">$sLabel</a>";
+	}
+
+	public function GetValidationPattern()
+	{
+		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('url_validation_pattern').'$');
+	}
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\UrlField';
+    }
+
+    public function MakeFormField(DBObject $oObject, $oFormField = null)
+    {
+        if ($oFormField === null)
+        {
+            $sFormFieldClass = static::GetFormFieldClass();
+            $oFormField = new $sFormFieldClass($this->GetCode());
+        }
+        parent::MakeFormField($oObject, $oFormField);
+
+        $oFormField->SetTarget($this->Get('target'));
+
+        return $oFormField;
+    }
+}
+
+/**
+ * A blob is an ormDocument, it is stored as several columns in the database  
+ *
+ * @package	 iTopORM
+ */
+class AttributeBlob extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("depends_on"));
+	}
+
+	public function GetEditClass() {return "Document";}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return true;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
+	public function IsNullAllowed(DBObject $oHostObject = null) {return $this->GetOptional("is_null_allowed", false);}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return '';
+	}
+	
+	/**
+	 * 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}
+	 * @see AttributeDefinition::MakeRealValue()
+	 */
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if ($proposedValue === null) return null;
+		
+		if (is_object($proposedValue))
+		{
+			$proposedValue = clone $proposedValue;
+		}
+		else
+		{
+			try
+			{
+				// Read the file from iTop, an URL (or the local file system - for admins only)
+				$proposedValue = Utils::FileGetContentsAndMIMEType($proposedValue);
+			}
+			catch(Exception $e)
+			{
+				IssueLog::Warning(get_class($this)."::MakeRealValue - ".$e->getMessage());
+				// Not a real document !! store is as text !!! (This was the default behavior before)
+				$proposedValue = new ormDocument($e->getMessage()." \n".$proposedValue, 'text/plain');
+			}	
+		}
+		return $proposedValue;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode();
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix.'_mimetype';
+		$aColumns['_data'] = $sPrefix.'_data';
+		$aColumns['_filename'] = $sPrefix.'_filename';
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		if (!array_key_exists($sPrefix, $aCols))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$sMimeType = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
+
+		if (!array_key_exists($sPrefix.'_data', $aCols)) 
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '".$sPrefix."_data' from {$sAvailable}");
+		} 
+		$data = isset($aCols[$sPrefix.'_data']) ? $aCols[$sPrefix.'_data'] : null;
+
+		if (!array_key_exists($sPrefix.'_filename', $aCols)) 
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '".$sPrefix."_filename' from {$sAvailable}");
+		} 
+		$sFileName =  isset($aCols[$sPrefix.'_filename']) ? $aCols[$sPrefix.'_filename'] : '';
+
+		$value = new ormDocument($data, $sMimeType, $sFileName);
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		// #@# Optimization: do not load blobs anytime
+		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
+		//	 using memory in case a temporary table has to be created
+		//	 (temporary tables created on disk)
+		//	 We will have to remove the blobs from the list of attributes when doing the select
+		//	 then the use of Get() should finalize the load
+		if ($value instanceOf ormDocument && !$value->IsEmpty())
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_data'] = $value->GetData();
+			$aValues[$this->GetCode().'_mimetype'] = $value->GetMimeType();
+			$aValues[$this->GetCode().'_filename'] = $value->GetFileName();
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_data'] = '';
+			$aValues[$this->GetCode().'_mimetype'] = '';
+			$aValues[$this->GetCode().'_filename'] = '';
+		}
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode().'_data'] = 'LONGBLOB'; // 2^32 (4 Gb)
+		$aColumns[$this->GetCode().'_mimetype'] = 'VARCHAR(255)'.CMDBSource::GetSqlStringColumnDefinition();
+		$aColumns[$this->GetCode().'_filename'] = 'VARCHAR(255)'.CMDBSource::GetSqlStringColumnDefinition();
+		return $aColumns;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array();
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return 'true';
+	} 
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($value))
+		{
+			return $value->GetAsHTML();
+		}
+		return '';
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sAttCode = $this->GetCode();
+		if ($sValue instanceof ormDocument && !$sValue->IsEmpty())
+		{
+			return $sValue->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $sAttCode);
+		}
+		return ''; // Not exportable in CSV !
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$sRet = '';
+		if (is_object($value))
+		{
+			if (!$value->IsEmpty())
+			{
+				$sRet = '<mimetype>'.$value->GetMimeType().'</mimetype>';
+				$sRet .= '<filename>'.$value->GetFileName().'</filename>';
+				$sRet .= '<data>'.base64_encode($value->GetData()).'</data>';
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue	 
+	 */	 	
+	public function GetForJSON($value)
+	{
+		if ($value instanceOf ormDocument)
+		{
+			$aValues = array();
+			$aValues['data'] = base64_encode($value->GetData());
+			$aValues['mimetype'] = $value->GetMimeType();
+			$aValues['filename'] = $value->GetFileName();
+		}
+		else
+		{
+			$aValues = null;
+		}
+		return $aValues;
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON	 
+	 */	 	
+	public function FromJSONToValue($json)
+	{
+		if (isset($json->data))
+		{
+			$data = base64_decode($json->data);
+			$value = new ormDocument($data, $json->mimetype, $json->filename);
+		}
+		else
+		{
+			$value = null;
+		}
+		return $value;
+	}
+	
+	public function Fingerprint($value)
+	{
+		$sFingerprint = '';
+		if ($value instanceOf ormDocument)
+		{
+			$sFingerprint = md5($value->GetData());
+		}
+		return $sFingerprint;		
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\BlobField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+
+		// Note: As of today we want this field to always be read-only
+		$oFormField->SetReadOnly(true);
+
+		// Generating urls
+		$value = $oObject->Get($this->GetCode());
+		$oFormField->SetDownloadUrl($value->GetDownloadURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
+		$oFormField->SetDisplayUrl($value->GetDisplayURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
+
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * An image is a specific type of document, it is stored as several columns in the database
+ *
+ * @package	 iTopORM
+ */
+class AttributeImage extends AttributeBlob
+{
+	public function GetEditClass() {return "Image";}
+
+	/**
+	 * {@inheritDoc}
+	 * @see AttributeBlob::MakeRealValue()
+	 */
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$oDoc = parent::MakeRealValue($proposedValue, $oHostObj);
+		// The validation of the MIME Type is done by CheckFormat below
+		return $oDoc;
+	}
+	
+	/**
+	 * Check that the supplied ormDocument actually contains an image
+	 * {@inheritDoc}
+	 * @see AttributeDefinition::CheckFormat()
+	 */
+	public function CheckFormat($value)
+	{
+		if ($value instanceof ormDocument && !$value->IsEmpty())
+		{
+			return ($value->GetMainMimeType() == 'image');
+		}
+		return true;
+	}
+	
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$iMaxWidthPx = $this->Get('display_max_width').'px';
+		$iMaxHeightPx = $this->Get('display_max_height').'px';
+		$sUrl = $this->Get('default_image');
+		$sRet = ($sUrl !== null) ? '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'; max-height: '.$iMaxHeightPx.'">' : '';
+		if (is_object($value) && !$value->IsEmpty())
+		{
+			if ($oHostObject->IsNew() || ($oHostObject->IsModified() && (array_key_exists($this->GetCode(), $oHostObject->ListChanges()))))
+			{
+				// If the object is modified (or not yet stored in the database) we must serve the content of the image directly inline
+				// otherwise (if we just give an URL) the browser will be given the wrong content... and may cache it
+				$sUrl = 'data:'.$value->GetMimeType().';base64,'.base64_encode($value->GetData());
+			}
+			else
+			{
+				$sUrl = $value->GetDownloadURL(get_class($oHostObject), $oHostObject->GetKey(), $this->GetCode());
+			}
+			$sRet = '<img src="'.$sUrl.'" style="max-width: '.$iMaxWidthPx.'; max-height: '.$iMaxHeightPx.'">';
+		}
+		return '<div class="view-image" style="width: '.$iMaxWidthPx.'; height: '.$iMaxHeightPx.';"><span class="helper-middle"></span>'.$sRet.'</div>';
+	}
+
+    static public function GetFormFieldClass()
+    {
+        return '\\Combodo\\iTop\\Form\\Field\\ImageField';
+    }
+
+    public function MakeFormField(DBObject $oObject, $oFormField = null)
+    {
+        if ($oFormField === null)
+        {
+            $sFormFieldClass = static::GetFormFieldClass();
+            $oFormField = new $sFormFieldClass($this->GetCode());
+        }
+
+        parent::MakeFormField($oObject, $oFormField);
+
+        // Generating urls
+        $value = $oObject->Get($this->GetCode());
+        if (is_object($value) && !$value->IsEmpty())
+        {
+            $oFormField->SetDownloadUrl($value->GetDownloadURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
+            $oFormField->SetDisplayUrl($value->GetDisplayURL(get_class($oObject), $oObject->GetKey(), $this->GetCode()));
+        }
+        else
+        {
+            $oFormField->SetDownloadUrl($this->Get('default_image'));
+            $oFormField->SetDisplayUrl($this->Get('default_image'));
+        }
+
+        return $oFormField;
+    }
+}
+/**
+ * A stop watch is an ormStopWatch object, it is stored as several columns in the database  
+ *
+ * @package	 iTopORM
+ */
+class AttributeStopWatch extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		// The list of thresholds must be an array of iPercent => array of 'option' => value
+		return array_merge(parent::ListExpectedParams(), array("states", "goal_computing", "working_time_computing", "thresholds"));
+	}
+
+	public function GetEditClass() {return "StopWatch";}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return true;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->NewStopWatch();}
+
+	public function GetEditValue($value, $oHostObj = null)
+	{
+		return $value->GetTimeSpent();
+	}
+
+	public function GetStates()
+	{
+		return $this->Get('states');
+	}
+
+	public function AlwaysLoadInTables()
+	{
+		// Each and every stop watch is accessed for computing the highlight code (DBObject::GetHighlightCode())
+		return true;
+	}
+
+	/**
+	 * Construct a brand new (but configured) stop watch
+	 */	 	
+	public function NewStopWatch()
+	{
+		$oSW = new ormStopWatch();
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$oSW->DefineThreshold($iThreshold);
+		}
+		return $oSW;
+	}
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (!$proposedValue instanceof ormStopWatch)
+		{
+			return $this->NewStopWatch();
+		}
+		return $proposedValue;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning: a stopwatch does not have any 'sql' property, so its SQL column is equal to its attribute code !!
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix.'_timespent';
+		$aColumns['_started'] = $sPrefix.'_started';
+		$aColumns['_laststart'] = $sPrefix.'_laststart';
+		$aColumns['_stopped'] = $sPrefix.'_stopped';
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = '_'.$iThreshold;
+			$aColumns[$sThPrefix.'_deadline'] = $sPrefix.$sThPrefix.'_deadline';
+			$aColumns[$sThPrefix.'_passed'] = $sPrefix.$sThPrefix.'_passed';
+			$aColumns[$sThPrefix.'_triggered'] = $sPrefix.$sThPrefix.'_triggered';
+			$aColumns[$sThPrefix.'_overrun'] = $sPrefix.$sThPrefix.'_overrun';
+		}
+		return $aColumns;
+	}
+
+	public static function DateToSeconds($sDate)
+	{
+		if (is_null($sDate))
+		{
+			return null;
+		}
+		$oDateTime = new DateTime($sDate);
+		$iSeconds = $oDateTime->format('U');
+		return $iSeconds;
+	}
+
+	public static function SecondsToDate($iSeconds)
+	{
+		if (is_null($iSeconds))
+		{
+			return null;
+		}
+		return date("Y-m-d H:i:s", $iSeconds);
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		$aExpectedCols = array($sPrefix, $sPrefix.'_started', $sPrefix.'_laststart', $sPrefix.'_stopped');
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = '_'.$iThreshold;
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_deadline';
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_passed';
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_triggered';
+			$aExpectedCols[] = $sPrefix.$sThPrefix.'_overrun';
+		}
+		foreach ($aExpectedCols as $sExpectedCol)
+		{
+			if (!array_key_exists($sExpectedCol, $aCols))
+			{
+				$sAvailable = implode(', ', array_keys($aCols));
+				throw new MissingColumnException("Missing column '$sExpectedCol' from {$sAvailable}");
+			} 
+		}
+
+		$value = new ormStopWatch(
+			$aCols[$sPrefix],
+			self::DateToSeconds($aCols[$sPrefix.'_started']),
+			self::DateToSeconds($aCols[$sPrefix.'_laststart']),
+			self::DateToSeconds($aCols[$sPrefix.'_stopped'])
+		);
+
+		foreach ($this->ListThresholds() as $iThreshold => $aDefinition)
+		{
+			$sThPrefix = '_'.$iThreshold;
+			$value->DefineThreshold(
+				$iThreshold,
+				self::DateToSeconds($aCols[$sPrefix.$sThPrefix.'_deadline']),
+				(bool)($aCols[$sPrefix.$sThPrefix.'_passed'] == 1),
+				(bool)($aCols[$sPrefix.$sThPrefix.'_triggered'] == 1),
+				$aCols[$sPrefix.$sThPrefix.'_overrun'],
+				array_key_exists('highlight', $aDefinition) ? $aDefinition['highlight'] : null
+			);
+		}
+
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		if ($value instanceOf ormStopWatch)
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_timespent'] = $value->GetTimeSpent();
+			$aValues[$this->GetCode().'_started'] = self::SecondsToDate($value->GetStartDate());
+			$aValues[$this->GetCode().'_laststart'] = self::SecondsToDate($value->GetLastStartDate());
+			$aValues[$this->GetCode().'_stopped'] = self::SecondsToDate($value->GetStopDate());
+
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sPrefix = $this->GetCode().'_'.$iThreshold;
+				$aValues[$sPrefix.'_deadline'] = self::SecondsToDate($value->GetThresholdDate($iThreshold));
+				$aValues[$sPrefix.'_passed'] = $value->IsThresholdPassed($iThreshold) ? '1' : '0';
+				$aValues[$sPrefix.'_triggered'] = $value->IsThresholdTriggered($iThreshold) ? '1' : '0';
+				$aValues[$sPrefix.'_overrun'] = $value->GetOverrun($iThreshold);
+			}
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_timespent'] = '';
+			$aValues[$this->GetCode().'_started'] = '';
+			$aValues[$this->GetCode().'_laststart'] = '';
+			$aValues[$this->GetCode().'_stopped'] = '';
+		}
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode().'_timespent'] = 'INT(11) UNSIGNED';
+		$aColumns[$this->GetCode().'_started'] = 'DATETIME';
+		$aColumns[$this->GetCode().'_laststart'] = 'DATETIME';
+		$aColumns[$this->GetCode().'_stopped'] = 'DATETIME';
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sPrefix = $this->GetCode().'_'.$iThreshold;
+			$aColumns[$sPrefix.'_deadline'] = 'DATETIME';
+			$aColumns[$sPrefix.'_passed'] = 'TINYINT(1) UNSIGNED';
+			$aColumns[$sPrefix.'_triggered'] = 'TINYINT(1)';
+			$aColumns[$sPrefix.'_overrun'] = 'INT(11) UNSIGNED';
+		}
+		return $aColumns;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		$aRes = array(
+			$this->GetCode() => new FilterFromAttribute($this),
+			$this->GetCode().'_started' => new FilterFromAttribute($this, '_started'),
+			$this->GetCode().'_laststart' => new FilterFromAttribute($this, '_laststart'),
+			$this->GetCode().'_stopped' => new FilterFromAttribute($this, '_stopped')
+		);
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sPrefix = $this->GetCode().'_'.$iThreshold;
+			$aRes[$sPrefix.'_deadline'] = new FilterFromAttribute($this, '_deadline');
+			$aRes[$sPrefix.'_passed'] = new FilterFromAttribute($this, '_passed');
+			$aRes[$sPrefix.'_triggered'] = new FilterFromAttribute($this, '_triggered');
+			$aRes[$sPrefix.'_overrun'] = new FilterFromAttribute($this, '_overrun');
+		}
+		return $aRes;
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return 'true';
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($value))
+		{
+			return $value->GetAsHTML($this, $oHostObject);
+		}
+		return '';
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		return $value->GetTimeSpent();
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return $value->GetTimeSpent();
+	}
+
+	public function ListThresholds()
+	{
+		return $this->Get('thresholds');
+	}
+	
+	public function Fingerprint($value)
+	{
+		$sFingerprint = '';
+		if (is_object($value))
+		{
+			$sFingerprint = $value->GetAsHTML($this);
+		}
+		return $sFingerprint;
+	}
+
+	/**
+	 * To expose internal values: Declare an attribute AttributeSubItem
+	 * and implement the GetSubItemXXXX verbs
+	 */	 	
+	public function GetSubItemSQLExpression($sItemCode)
+	{
+		$sPrefix = $this->GetCode();
+		switch($sItemCode)
+		{
+		case 'timespent':
+			return array('' => $sPrefix.'_timespent');
+		case 'started':
+			return array('' => $sPrefix.'_started');
+		case 'laststart':
+			return array('' => $sPrefix.'_laststart');
+		case 'stopped':
+			return array('' => $sPrefix.'_stopped');
+		}
+
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = $iThreshold.'_';
+			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+			{
+				// The current threshold is concerned
+				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+				switch($sThresholdCode)
+				{
+				case 'deadline':
+					return array('' => $sPrefix.'_'.$iThreshold.'_deadline');
+				case 'passed':
+					return array('' => $sPrefix.'_'.$iThreshold.'_passed');
+				case 'triggered':
+					return array('' => $sPrefix.'_'.$iThreshold.'_triggered');
+				case 'overrun':
+					return array('' => $sPrefix.'_'.$iThreshold.'_overrun');
+				}
+			}
+		}
+		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
+	}
+
+	public function GetSubItemValue($sItemCode, $value, $oHostObject = null)
+	{
+		$oStopWatch = $value;
+		switch($sItemCode)
+		{
+		case 'timespent':
+			return $oStopWatch->GetTimeSpent();
+		case 'started':
+			return $oStopWatch->GetStartDate();
+		case 'laststart':
+			return $oStopWatch->GetLastStartDate();
+		case 'stopped':
+			return $oStopWatch->GetStopDate();
+		}
+
+		foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+		{
+			$sThPrefix = $iThreshold.'_';
+			if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+			{
+				// The current threshold is concerned
+				$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+				switch($sThresholdCode)
+				{
+				case 'deadline':
+					return $oStopWatch->GetThresholdDate($iThreshold);
+				case 'passed':
+					return $oStopWatch->IsThresholdPassed($iThreshold);
+				case 'triggered':
+					return $oStopWatch->IsThresholdTriggered($iThreshold);
+				case 'overrun':
+					return $oStopWatch->GetOverrun($iThreshold);
+				}
+			}
+		}
+
+		throw new CoreException("Unknown item code '$sItemCode' for attribute ".$this->GetHostClass().'::'.$this->GetCode());
+	}
+
+	protected function GetBooleanLabel($bValue)
+	{
+		$sDictKey = $bValue ? 'yes' : 'no';
+		return Dict::S('BooleanLabel:'.$sDictKey, 'def:'.$sDictKey);
+	}
+
+	public function GetSubItemAsHTMLForHistory($sItemCode, $sValue)
+	{
+		switch($sItemCode)
+		{
+		case 'timespent':
+			$sHtml = (int)$sValue ? Str::pure2html(AttributeDuration::FormatDuration($sValue)) : null;
+			break;
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+			$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
+			break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+					case 'deadline':
+						$sHtml = (int)$sValue ? date((string)AttributeDateTime::GetFormat(), (int)$sValue) : null;
+						break;
+					case 'passed':
+						$sHtml = $this->GetBooleanLabel((int)$sValue);
+						break;
+					case 'triggered':
+						$sHtml = $this->GetBooleanLabel((int)$sValue);
+						break;
+					case 'overrun':
+						$sHtml = (int)$sValue > 0 ? Str::pure2html(AttributeDuration::FormatDuration((int)$sValue)) : '';
+					}
+				}
+			}
+		}
+		return $sHtml;
+	}
+
+	public function GetSubItemAsPlainText($sItemCode, $value)
+	{
+		$sRet = $value;
+
+		switch ($sItemCode)
+		{
+			case 'timespent':
+				$sRet = AttributeDuration::FormatDuration($value);
+				break;
+			case 'started':
+			case 'laststart':
+			case 'stopped':
+				if (is_null($value))
+				{
+					$sRet = ''; // Undefined
+				}
+				else
+				{
+					$oDateTime = new DateTime();
+					$oDateTime->setTimestamp($value);
+					$oDateTimeFormat = AttributeDateTime::GetFormat();
+					$sRet = $oDateTimeFormat->Format($oDateTime);
+				}
+				break;
+
+			default:
+				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+				{
+					$sThPrefix = $iThreshold . '_';
+					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+					{
+						// The current threshold is concerned
+						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+						switch ($sThresholdCode)
+						{
+							case 'deadline':
+								if ($value)
+								{
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+									$sRet = AttributeDeadline::FormatDeadline($sDate);
+								}
+								else
+								{
+									$sRet = '';
+								}
+								break;
+							case 'passed':
+							case 'triggered':
+								$sRet = $this->GetBooleanLabel($value);
+								break;
+							case 'overrun':
+								$sRet = AttributeDuration::FormatDuration($value);
+								break;
+						}
+					}
+				}
+		}
+		return $sRet;
+	}
+
+	public function GetSubItemAsHTML($sItemCode, $value)
+	{
+		$sHtml = $value;
+
+		switch ($sItemCode)
+		{
+			case 'timespent':
+				$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
+				break;
+			case 'started':
+			case 'laststart':
+			case 'stopped':
+				if (is_null($value))
+				{
+					$sHtml = ''; // Undefined
+				}
+				else
+				{
+					$oDateTime = new DateTime();
+					$oDateTime->setTimestamp($value);
+					$oDateTimeFormat = AttributeDateTime::GetFormat();
+					$sHtml = Str::pure2html($oDateTimeFormat->Format($oDateTime));
+				}
+				break;
+
+			default:
+				foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+				{
+					$sThPrefix = $iThreshold . '_';
+					if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+					{
+						// The current threshold is concerned
+						$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+						switch ($sThresholdCode)
+						{
+							case 'deadline':
+								if ($value)
+								{
+									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+									$sHtml = Str::pure2html(AttributeDeadline::FormatDeadline($sDate));
+								}
+								else
+								{
+									$sHtml = '';
+								}
+								break;
+							case 'passed':
+							case 'triggered':
+								$sHtml = $this->GetBooleanLabel($value);
+								break;
+							case 'overrun':
+								$sHtml = Str::pure2html(AttributeDuration::FormatDuration($value));
+								break;
+						}
+					}
+				}
+		}
+		return $sHtml;
+	}
+
+	public function GetSubItemAsCSV($sItemCode, $value, $sSeparator = ',', $sTextQualifier = '"', $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$value);
+		$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
+
+		switch($sItemCode)
+		{
+		case 'timespent':
+				$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
+				break;
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+				if ($value !== null)
+				{
+					$oDateTime = new DateTime();
+					$oDateTime->setTimestamp($value);
+					$oDateTimeFormat = AttributeDateTime::GetFormat();
+					$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
+				}
+				break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+						case 'deadline':
+								if ($value != '')
+								{
+									$oDateTime = new DateTime();
+									$oDateTime->setTimestamp($value);
+									$oDateTimeFormat = AttributeDateTime::GetFormat();
+									$sRet = $sTextQualifier . $oDateTimeFormat->Format($oDateTime) . $sTextQualifier;
+								}
+								break;
+
+							case 'passed':
+							case 'triggered':
+								$sRet = $sTextQualifier . $this->GetBooleanLabel($value) . $sTextQualifier;
+								break;
+
+							case 'overrun':
+								$sRet = $sTextQualifier . AttributeDuration::FormatDuration($value) . $sTextQualifier;
+								break;
+						}
+				}
+			}
+		}
+		return $sRet;
+	}
+
+	public function GetSubItemAsXML($sItemCode, $value)
+	{
+		$sRet = Str::pure2xml((string)$value);
+
+		switch($sItemCode)
+		{
+		case 'timespent':
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+				break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+					case 'deadline':
+						break;
+
+					case 'passed':
+					case 'triggered':
+						$sRet = $this->GetBooleanLabel($value);
+						break;
+
+					case 'overrun':
+						break;
+					}
+				}
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Implemented for the HTML spreadsheet format!	
+	 */	
+	public function GetSubItemAsEditValue($sItemCode, $value)
+	{
+		$sRet = $value;
+
+		switch($sItemCode)
+		{
+		case 'timespent':
+			break;
+
+		case 'started':
+		case 'laststart':
+		case 'stopped':
+			if (is_null($value))
+			{
+				$sRet = ''; // Undefined
+			}
+			else
+			{
+				$sRet = date((string)AttributeDateTime::GetFormat(), $value);
+			}
+			break;
+
+		default:
+			foreach ($this->ListThresholds() as $iThreshold => $aFoo)
+			{
+				$sThPrefix = $iThreshold.'_';
+				if (substr($sItemCode, 0, strlen($sThPrefix)) == $sThPrefix)
+				{
+					// The current threshold is concerned
+					$sThresholdCode = substr($sItemCode, strlen($sThPrefix));
+					switch($sThresholdCode)
+					{
+					case 'deadline':
+						if ($value)
+						{
+							$sRet = date((string)AttributeDateTime::GetFormat(), $value);
+						}
+						else
+						{
+							$sRet = '';
+						}
+						break;
+					case 'passed':
+					case 'triggered':
+						$sRet = $this->GetBooleanLabel($value);
+						break;
+					case 'overrun':
+						break;
+					}
+				}
+			}
+		}
+		return $sRet;
+	}
+}
+
+/**
+ * View of a subvalue of another attribute
+ * If an attribute implements the verbs GetSubItem.... then it can expose
+ * internal values, each of them being an attribute and therefore they
+ * can be displayed at different times in the object lifecycle, and used for
+ * reporting (as a condition in OQL, or as an additional column in an export)  
+ * Known usages: Stop Watches can expose threshold statuses
+ */
+class AttributeSubItem extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array('target_attcode', 'item_code'));
+	}
+
+	public function GetParentAttCode() {return $this->Get("target_attcode");} 
+
+	/**
+	 * Helper : get the attribute definition to which the execution will be forwarded	
+	 */	
+	public function GetTargetAttDef()
+	{
+		$sClass = $this->GetHostClass();
+		$oParentAttDef = MetaModel::GetAttributeDef($sClass, $this->Get('target_attcode'));
+		return $oParentAttDef;
+	}
+
+	public function GetEditClass() {return "";}
+	
+	public function GetValuesDef() {return null;}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return false;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return null;}
+//	public function IsNullAllowed() {return false;}
+
+	static public function LoadInObject() {return false;} // if this verb returns false, then GetValue must be implemented
+
+	/**
+	 * Used by DBOBject::Get()
+	 */
+	public function GetValue($oHostObject)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$parentValue = $oHostObject->GetStrict($oParent->GetCode());
+		$res = $oParent->GetSubItemValue($this->Get('item_code'), $parentValue, $oHostObject);
+		return $res;
+	}
+
+	// 
+//	protected function ScalarToSQL($value) {return $value;} // format value as a valuable SQL literal (quoted outside)
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		return array();
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return "=";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '!=':
+			return $this->GetSQLExpr()." != $sQValue";
+			break;
+		case '=':
+		default:
+			return $this->GetSQLExpr()." = $sQValue";
+		}
+	} 
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemSQLExpression($this->Get('item_code'));
+		return $res;
+	}
+
+	public function GetAsPlainText($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsPlainText($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsHTML($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	public function GetAsHTMLForHistory($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsHTMLForHistory($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsCSV($this->Get('item_code'), $value, $sSeparator, $sTextQualifier, $bConvertToPlainText);
+		return $res;
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsXML($this->Get('item_code'), $value);
+		return $res;
+	}
+
+	/**
+	 * As of now, this function must be implemented to have the value in spreadsheet format
+	 */	 	
+	public function GetEditValue($value, $oHostObj = null)
+	{
+		$oParent = $this->GetTargetAttDef();
+		$res = $oParent->GetSubItemAsEditValue($this->Get('item_code'), $value);
+		return $res;
+	}
+	
+	public function IsPartOfFingerprint()
+	{
+		return false;
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\LabelField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		parent::MakeFormField($oObject, $oFormField);
+
+		// Note : As of today, this attribute is -by nature- only supported in readonly mode, not edition
+		$sAttCode = $this->GetCode();
+		$oFormField->SetCurrentValue(html_entity_decode($oObject->GetAsHTML($sAttCode), ENT_QUOTES, 'UTF-8'));
+		$oFormField->SetReadOnly(true);
+
+		return $oFormField;
+	}
+
+}
+
+/**
+ * One way encrypted (hashed) password
+ */
+class AttributeOneWayPassword extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("depends_on"));
+	}
+
+	public function GetEditClass() {return "One Way Password";}
+
+	static public function IsBasedOnDBColumns() {return true;}
+	static public function IsScalar() {return true;}
+	public function IsWritable() {return true;}
+	public function GetDefaultValue(DBObject $oHostObject = null) {return "";}
+	public function IsNullAllowed() {return $this->GetOptional("is_null_allowed", false);}
+
+	// Facilitate things: allow the user to Set the value from a string or from an ormPassword (already encrypted)
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		$oPassword = $proposedValue;
+		if (is_object($oPassword))
+		{
+			$oPassword = clone $proposedValue;
+		}
+		else
+		{
+			$oPassword = new ormPassword('', '');
+			$oPassword->SetPassword($proposedValue);
+		}
+		return $oPassword;
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning: AttributeOneWayPassword does not have any sql property so code = sql !
+		}
+		$aColumns = array();
+		// Note: to optimize things, the existence of the attribute is determined by the existence of one column with an empty suffix
+		$aColumns[''] = $sPrefix.'_hash';
+		$aColumns['_salt'] = $sPrefix.'_salt';
+		return $aColumns;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		if (!array_key_exists($sPrefix, $aCols))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$hashed = isset($aCols[$sPrefix]) ? $aCols[$sPrefix] : '';
+
+		if (!array_key_exists($sPrefix.'_salt', $aCols)) 
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '".$sPrefix."_salt' from {$sAvailable}");
+		} 
+		$sSalt = isset($aCols[$sPrefix.'_salt']) ? $aCols[$sPrefix.'_salt'] : '';
+
+		$value = new ormPassword($hashed, $sSalt);
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		// #@# Optimization: do not load blobs anytime
+		//	 As per mySQL doc, selecting blob columns will prevent mySQL from
+		//	 using memory in case a temporary table has to be created
+		//	 (temporary tables created on disk)
+		//	 We will have to remove the blobs from the list of attributes when doing the select
+		//	 then the use of Get() should finalize the load
+		if ($value instanceOf ormPassword)
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_hash'] = $value->GetHash();
+			$aValues[$this->GetCode().'_salt'] = $value->GetSalt();
+		}
+		else
+		{
+			$aValues = array();
+			$aValues[$this->GetCode().'_hash'] = '';
+			$aValues[$this->GetCode().'_salt'] = '';
+		}
+		return $aValues;
+	}
+
+	public function GetSQLColumns($bFullSpec = false)
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode().'_hash'] = 'TINYBLOB';
+		$aColumns[$this->GetCode().'_salt'] = 'TINYBLOB';
+		return $aColumns;
+	}
+
+	public function GetImportColumns()
+	{
+		$aColumns = array();
+		$aColumns[$this->GetCode()] = 'TINYTEXT'.CMDBSource::GetSqlStringColumnDefinition();
+		return $aColumns;
+	}
+
+	public function FromImportToValue($aCols, $sPrefix = '')
+	{
+		if (!isset($aCols[$sPrefix]))
+		{
+			$sAvailable = implode(', ', array_keys($aCols));
+			throw new MissingColumnException("Missing column '$sPrefix' from {$sAvailable}");
+		} 
+		$sClearPwd = $aCols[$sPrefix];
+
+		$oPassword = new ormPassword('', '');
+		$oPassword->SetPassword($sClearPwd);
+		return $oPassword;
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array();
+		// still not working... see later...
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array();
+	}
+	public function GetBasicFilterLooseOperator()
+	{
+		return '=';
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		return 'true';
+	} 
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (is_object($value))
+		{
+			return $value->GetAsHTML();
+		}
+		return '';
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		return ''; // Not exportable in CSV
+	}
+	
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		return ''; // Not exportable in XML
+	}
+	
+	public function GetValueLabel($sValue, $oHostObj = null)
+	{
+		// Don't display anything in "group by" reports
+		return '*****';
+	}
+	
+}
+
+// Indexed array having two dimensions
+class AttributeTable extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	public function GetEditClass() {return "Table";}
+
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "LONGTEXT".CMDBSource::GetSqlStringColumnDefinition();
+	}
+
+	public function GetMaxSize()
+	{
+		return null;
+	}
+
+	public function GetNullValue()
+	{
+		return array();
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return (count($proposedValue) == 0);
+	} 
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return '';
+	}
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue))
+		{
+			return array();
+		}
+		else if (!is_array($proposedValue))
+		{
+			return array(0 => array(0 => $proposedValue));
+		}
+		return $proposedValue;
+	}
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+		try
+		{
+			$value = @unserialize($aCols[$sPrefix.'']);
+			if ($value === false)
+			{
+				$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+			}
+		}
+		catch(Exception $e)
+		{
+			$value = $this->MakeRealValue($aCols[$sPrefix.''], null);
+		}
+
+		return $value;
+	}
+
+	public function GetSQLValues($value)
+	{
+		$aValues = array();
+		$aValues[$this->Get("sql")] = serialize($value);
+		return $aValues;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (!is_array($value))
+		{
+			throw new CoreException('Expecting an array', array('found' => get_class($value)));
+		}
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "<TABLE class=\"listResults\">";
+		$sRes .= "<TBODY>";
+		foreach($value as $iRow => $aRawData)
+		{
+			$sRes .= "<TR>";
+			foreach ($aRawData as $iCol => $cell)
+			{
+				// Note: avoid the warning in case the cell is made of an array
+				$sCell = @Str::pure2html((string)$cell);
+				$sCell = str_replace("\n", "<br>\n", $sCell);
+				$sRes .= "<TD>$sCell</TD>";
+			}
+			$sRes .= "</TR>";
+		}
+		$sRes .= "</TBODY>";
+		$sRes .= "</TABLE>";
+		return $sRes;
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		// Not implemented
+		return '';
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "";
+		foreach($value as $iRow => $aRawData)
+		{
+			$sRes .= "<row>";
+			foreach ($aRawData as $iCol => $cell)
+			{
+				$sCell = Str::pure2xml((string)$cell);
+				$sRes .= "<cell icol=\"$iCol\">$sCell</cell>";
+			}
+			$sRes .= "</row>";
+		}
+		return $sRes;
+	}
+}
+
+// The PHP value is a hash array, it is stored as a TEXT column
+class AttributePropertySet extends AttributeTable
+{
+	public function GetEditClass() {return "PropertySet";}
+
+	// Facilitate things: allow the user to Set the value from a string
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (!is_array($proposedValue))
+		{
+			return array('?' => (string)$proposedValue);
+		}
+		return $proposedValue;
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (!is_array($value))
+		{
+			throw new CoreException('Expecting an array', array('found' => get_class($value)));
+		}
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "<TABLE class=\"listResults\">";
+		$sRes .= "<TBODY>";
+		foreach($value as $sProperty => $sValue)
+		{
+			if ($sProperty == 'auth_pwd')
+			{
+				$sValue = '*****';
+			}
+			$sRes .= "<TR>";
+			$sCell = str_replace("\n", "<br>\n", Str::pure2html((string)$sValue));
+			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
+			$sRes .= "</TR>";
+		}
+		$sRes .= "</TBODY>";
+		$sRes .= "</TABLE>";
+		return $sRes;
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$aRes = array();
+		foreach($value as $sProperty => $sValue)
+		{
+			if ($sProperty == 'auth_pwd')
+			{
+				$sValue = '*****';
+			}
+			$sFrom = array(',', '=');
+			$sTo = array('\,', '\=');
+			$aRes[] = $sProperty.'='.str_replace($sFrom, $sTo, (string)$sValue);
+		}
+		$sRaw = implode(',', $aRes);
+
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, $sRaw);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		if (count($value) == 0)
+		{
+			return "";
+		}
+
+		$sRes = "";
+		foreach($value as $sProperty => $sValue)
+		{
+			if ($sProperty == 'auth_pwd')
+			{
+				$sValue = '*****';
+			}
+			$sRes .= "<property id=\"$sProperty\">";
+			$sRes .= Str::pure2xml((string)$sValue);
+			$sRes .= "</property>";
+		}
+		return $sRes;
+	}
+}
+
+/**
+ * The attribute dedicated to the friendly name automatic attribute (not written) 
+ *
+ * @package	 iTopORM
+ */
+
+/**
+ * The attribute dedicated to the friendly name automatic attribute (not written) 
+ *
+ * @package	 iTopORM
+ */
+class AttributeFriendlyName extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_STRING;
+	public $m_sValue;
+
+	public function __construct($sCode)
+	{
+		$this->m_sCode = $sCode;
+		$aParams = array();
+		$aParams["default_value"] = '';
+		parent::__construct($sCode, $aParams);
+
+		$this->m_sValue = $this->Get("default_value");
+	}
+
+
+	public function GetEditClass() {return "";}
+
+	public function GetValuesDef() {return null;}
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
+
+	static public function IsScalar() {return true;}
+	public function IsNullAllowed() {return false;}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		if ($sPrefix == '')
+		{
+			$sPrefix = $this->GetCode(); // Warning AttributeComputedFieldVoid does not have any sql property
+		}
+		return array('' => $sPrefix);
+	}
+
+	static public function IsBasedOnOQLExpression() {return true;}
+	public function GetOQLExpression()
+	{
+		return MetaModel::GetNameExpression($this->GetHostClass());
+	}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sLabel = parent::GetLabel('');
+		if (strlen($sLabel) == 0)
+		{
+			$sLabel = Dict::S('Core:FriendlyName-Label');
+		}
+		return $sLabel;
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sLabel = parent::GetDescription('');
+		if (strlen($sLabel) == 0)
+		{
+			$sLabel = Dict::S('Core:FriendlyName-Description');
+		}
+		return $sLabel;
+	} 
+
+	public function FromSQLToValue($aCols, $sPrefix = '')
+	{
+ 		$sValue = $aCols[$sPrefix];
+		return $sValue;
+	}
+
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	static public function IsBasedOnDBColumns()
+	{
+		return false;
+	}
+
+	public function SetFixedValue($sValue)
+	{
+		$this->m_sValue = $sValue;
+	}
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		return $this->m_sValue;
+	}
+
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		return Str::pure2html((string)$sValue);
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	static function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\StringField';
+	}
+
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+		}
+		$oFormField->SetReadOnly(true);
+		parent::MakeFormField($oObject, $oFormField);
+
+		return $oFormField;
+	}
+
+	// Do not display friendly names in the history of change
+	public function DescribeChangeAsHTML($sOldValue, $sNewValue, $sLabel = null)
+	{
+		return '';
+	}
+
+	public function GetFilterDefinitions()
+	{
+		return array($this->GetCode() => new FilterFromAttribute($this));
+	}
+
+	public function GetBasicFilterOperators()
+	{
+		return array("="=>"equals", "!="=>"differs from");
+	}
+
+	public function GetBasicFilterLooseOperator()
+	{
+		return "Contains";
+	}
+
+	public function GetBasicFilterSQLExpr($sOpCode, $value)
+	{
+		$sQValue = CMDBSource::Quote($value);
+		switch ($sOpCode)
+		{
+		case '=':
+		case '!=':
+			return $this->GetSQLExpr()." $sOpCode $sQValue";
+		case 'Contains':
+			return $this->GetSQLExpr()." LIKE ".CMDBSource::Quote("%$value%");
+		case 'NotLike':
+			return $this->GetSQLExpr()." NOT LIKE $sQValue";
+		case 'Like':
+		default:
+			return $this->GetSQLExpr()." LIKE $sQValue";
+		}
+	}
+	
+	public function IsPartOfFingerprint() { return false; }
+}
+
+/**
+ * Holds the setting for the redundancy on a specific relation
+ * Its value is a string, containing either:
+ * - 'disabled'
+ * - 'n', where n is a positive integer value giving the minimum count of items upstream
+ * - 'n%', where n is a positive integer value, giving the minimum as a percentage of the total count of items upstream
+ *
+ * @package	 iTopORM
+ */
+class AttributeRedundancySettings extends AttributeDBField
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array('sql', 'relation_code', 'from_class', 'neighbour_id', 'enabled', 'enabled_mode', 'min_up', 'min_up_type', 'min_up_mode');
+	}
+
+	public function GetValuesDef() {return null;} 
+	public function GetPrerequisiteAttributes($sClass = null) {return array();}
+
+	public function GetEditClass() {return "RedundancySetting";}
+	protected function GetSQLCol($bFullSpec = false)
+	{
+		return "VARCHAR(20)"
+			.CMDBSource::GetSqlStringColumnDefinition()
+			.($bFullSpec ? $this->GetSQLColSpec() : '');
+	}
+
+
+	public function GetValidationPattern()
+	{
+		return "^[0-9]{1,3}|[0-9]{1,2}%|disabled$";
+	}
+
+	public function GetMaxSize()
+	{
+		return 20;
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		$sRet = 'disabled';
+		if ($this->Get('enabled'))
+		{
+			if ($this->Get('min_up_type') == 'count')
+			{
+				$sRet = (string) $this->Get('min_up');
+			}
+			else // percent
+			{
+				$sRet = $this->Get('min_up').'%';
+			}
+		}
+		return $sRet;
+	}
+
+	public function IsNullAllowed()
+	{
+		return false;
+	} 
+
+	public function GetNullValue()
+	{
+		return '';
+	} 
+
+	public function IsNull($proposedValue)
+	{
+		return ($proposedValue == '');
+	} 
+
+	public function MakeRealValue($proposedValue, $oHostObj)
+	{
+		if (is_null($proposedValue)) return '';
+		return (string)$proposedValue;
+	}
+
+	public function ScalarToSQL($value)
+	{
+		if (!is_string($value))
+		{
+			throw new CoreException('Expected the attribute value to be a string', array('found_type' => gettype($value), 'value' => $value, 'class' => $this->GetHostClass(), 'attribute' => $this->GetCode()));
+		}
+		return $value;
+	}
+
+	public function GetRelationQueryData()
+	{
+		foreach (MetaModel::EnumRelationQueries($this->GetHostClass(), $this->Get('relation_code'), false) as $sDummy => $aQueryInfo)
+		{
+			if ($aQueryInfo['sFromClass'] == $this->Get('from_class'))
+			{
+				if ($aQueryInfo['sNeighbour'] == $this->Get('neighbour_id'))
+				{
+					return $aQueryInfo;
+				}
+			}
+		}
+		return array();
+	}
+
+	/**
+	 * Find the user option label
+	 *
+	 * @param user option : disabled|cout|percent
+	 *
+	 * @return string
+	 */
+	public function GetUserOptionFormat($sUserOption, $sDefault = null)
+	{
+		$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, null, true /*user lang*/);
+		if (is_null($sLabel))
+		{
+			// If no default value is specified, let's define the most relevant one for developping purposes
+			if (is_null($sDefault))
+			{
+				$sDefault = str_replace('_', ' ', $this->m_sCode.':'.$sUserOption.'(%1$s)');
+			}
+			// Browse the hierarchy again, accepting default (english) translations
+			$sLabel = $this->SearchLabel('/Attribute:'.$this->m_sCode.'/'.$sUserOption, $sDefault, false);
+		}
+		return $sLabel;
+	}
+
+	/**
+	 * Override to display the value in the GUI
+	 */	
+	public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
+	{
+		$sCurrentOption = $this->GetCurrentOption($sValue);
+		$sClass = $oHostObject ? get_class($oHostObject) : $this->m_sHostClass;
+		return sprintf($this->GetUserOptionFormat($sCurrentOption), $this->GetMinUpValue($sValue), MetaModel::GetName($sClass));
+	}
+
+	public function GetAsCSV($sValue, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$sFrom = array("\r\n", $sTextQualifier);
+		$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+		$sEscaped = str_replace($sFrom, $sTo, (string)$sValue);
+		return $sTextQualifier.$sEscaped.$sTextQualifier;
+	}
+
+	/**
+	 * Helper to interpret the value, given the current settings and string representation of the attribute	
+	 */	
+	public function IsEnabled($sValue)
+	{
+		if ($this->get('enabled_mode') == 'fixed')
+		{
+			$bRet = $this->get('enabled');
+		}
+		else
+		{
+			$bRet = ($sValue != 'disabled');
+		}
+		return $bRet;
+	}
+
+	/**
+	 * Helper to interpret the value, given the current settings and string representation of the attribute	
+	 */	
+	public function GetMinUpType($sValue)
+	{
+		if ($this->get('min_up_mode') == 'fixed')
+		{
+			$sRet = $this->get('min_up_type');
+		}
+		else
+		{
+			$sRet = 'count';
+			if (substr(trim($sValue), -1, 1) == '%')
+			{
+				$sRet = 'percent';
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Helper to interpret the value, given the current settings and string representation of the attribute	
+	 */	
+	public function GetMinUpValue($sValue)
+	{
+		if ($this->get('min_up_mode') == 'fixed')
+		{
+			$iRet = (int) $this->Get('min_up');
+		}
+		else
+		{
+			$sRefValue = $sValue;
+			if (substr(trim($sValue), -1, 1) == '%')
+			{
+				$sRefValue = substr(trim($sValue), 0, -1);
+			}
+			$iRet = (int) trim($sRefValue);
+		}
+		return $iRet;
+	}
+
+	/**
+	 * Helper to determine if the redundancy can be viewed/edited by the end-user
+	 */	
+	public function IsVisible()
+	{
+		$bRet = false;
+		if ($this->Get('enabled_mode') == 'fixed')
+		{
+			$bRet = $this->Get('enabled');
+		}
+		elseif ($this->Get('enabled_mode') == 'user')
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+
+	public function IsWritable()
+	{
+		if (($this->Get('enabled_mode') == 'fixed') && ($this->Get('min_up_mode') == 'fixed'))
+		{
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns an HTML form that can be read by ReadValueFromPostedForm
+	 */	
+	public function GetDisplayForm($sCurrentValue, $oPage, $bEditMode = false, $sFormPrefix = '')
+	{
+		$sRet = '';
+		$aUserOptions = $this->GetUserOptions($sCurrentValue);
+		if (count($aUserOptions) < 2)
+		{
+			$bEditOption = false;
+		}
+		else
+		{
+			$bEditOption = $bEditMode;
+		}
+		$sCurrentOption = $this->GetCurrentOption($sCurrentValue);
+		foreach($aUserOptions as $sUserOption)
+		{
+			$bSelected = ($sUserOption == $sCurrentOption);
+			$sRet .= '<div>';
+			$sRet .= $this->GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditOption, $sUserOption, $bSelected);
+			$sRet .= '</div>';
+		}
+		return $sRet;
+	}
+
+	const USER_OPTION_DISABLED = 'disabled';
+	const USER_OPTION_ENABLED_COUNT = 'count';
+	const USER_OPTION_ENABLED_PERCENT = 'percent';
+
+	/**
+	 * Depending on the xxx_mode parameters, build the list of options that are allowed to the end-user
+	 */	 	
+	protected function GetUserOptions($sValue)
+	{
+		$aRet = array();
+		if ($this->Get('enabled_mode') == 'user')
+		{
+			$aRet[] = self::USER_OPTION_DISABLED;
+		}
+		
+		if ($this->Get('min_up_mode') == 'user')
+		{
+			$aRet[] = self::USER_OPTION_ENABLED_COUNT;
+			$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
+		}
+		else
+		{
+			if ($this->GetMinUpType($sValue) == 'count')
+			{
+				$aRet[] = self::USER_OPTION_ENABLED_COUNT;
+			}
+			else
+			{
+				$aRet[] = self::USER_OPTION_ENABLED_PERCENT;
+			}
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Convert the string representation into one of the existing options	
+	 */	
+	protected function GetCurrentOption($sValue)
+	{
+		$sRet = self::USER_OPTION_DISABLED;
+		if ($this->IsEnabled($sValue))
+		{
+			if ($this->GetMinUpType($sValue) == 'count')
+			{
+				$sRet = self::USER_OPTION_ENABLED_COUNT;
+			}
+			else
+			{
+				$sRet = self::USER_OPTION_ENABLED_PERCENT;
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Display an option (form, or current value)
+	 */	 	
+	protected function GetDisplayOption($sCurrentValue, $oPage, $sFormPrefix, $bEditMode, $sUserOption, $bSelected = true)
+	{
+		$sRet = '';
+
+		$iCurrentValue = $this->GetMinUpValue($sCurrentValue);
+		if ($bEditMode)
+		{
+			$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
+			switch ($sUserOption)
+			{
+			case self::USER_OPTION_DISABLED:
+				$sValue = ''; // Empty placeholder
+				break;
+	
+			case self::USER_OPTION_ENABLED_COUNT:
+				if ($bEditMode)
+				{
+					$sName = $sHtmlNamesPrefix.'_min_up_count';
+					$sEditValue = $bSelected ? $iCurrentValue : '';
+					$sValue = '<input class="redundancy-min-up-count" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
+					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
+					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
+				}
+				else
+				{
+					$sValue = $iCurrentValue;
+				}
+				break;
+	
+			case self::USER_OPTION_ENABLED_PERCENT:
+				if ($bEditMode)
+				{
+					$sName = $sHtmlNamesPrefix.'_min_up_percent';
+					$sEditValue = $bSelected ? $iCurrentValue : '';
+					$sValue = '<input class="redundancy-min-up-percent" type="string" size="3" name="'.$sName.'" value="'.$sEditValue.'">';
+					// To fix an issue on Firefox: focus set to the option (because the input is within the label for the option)
+					$oPage->add_ready_script("\$('[name=\"$sName\"]').click(function(){var me=this; setTimeout(function(){\$(me).focus();}, 100);});");
+				}
+				else
+				{
+					$sValue = $iCurrentValue;
+				}
+				break;
+			}
+			$sLabel = sprintf($this->GetUserOptionFormat($sUserOption), $sValue, MetaModel::GetName($this->GetHostClass()));
+
+			$sOptionName = $sHtmlNamesPrefix.'_user_option';
+			$sOptionId = $sOptionName.'_'.$sUserOption;
+			$sChecked = $bSelected ? 'checked' : '';
+			$sRet = '<input type="radio" name="'.$sOptionName.'" id="'.$sOptionId.'" value="'.$sUserOption.'" '.$sChecked.'> <label for="'.$sOptionId.'">'.$sLabel.'</label>';
+		}
+		else
+		{
+			// Read-only: display only the currently selected option
+			if ($bSelected)
+			{
+				$sRet = sprintf($this->GetUserOptionFormat($sUserOption), $iCurrentValue, MetaModel::GetName($this->GetHostClass()));
+			}
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Makes the string representation out of the values given by the form defined in GetDisplayForm	
+	 */	
+	public function ReadValueFromPostedForm($sFormPrefix)
+	{
+		$sHtmlNamesPrefix = 'rddcy_'.$this->Get('relation_code').'_'.$this->Get('from_class').'_'.$this->Get('neighbour_id');
+
+		$iMinUpCount = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_count', null, 'raw_data');
+		$iMinUpPercent = (int) utils::ReadPostedParam($sHtmlNamesPrefix.'_min_up_percent', null, 'raw_data');
+		$sSelectedOption = utils::ReadPostedParam($sHtmlNamesPrefix.'_user_option', null, 'raw_data');
+		switch ($sSelectedOption)
+		{
+		case self::USER_OPTION_ENABLED_COUNT:
+			$sRet = $iMinUpCount;
+			break;
+
+		case self::USER_OPTION_ENABLED_PERCENT:
+			$sRet = $iMinUpPercent.'%';
+			break;
+
+		case self::USER_OPTION_DISABLED:
+		default:
+			$sRet = 'disabled';
+			break;
+		}
+		return $sRet;
+	}
+}
+
+/**
+ * Custom fields managed by an external implementation
+ *
+ * @package     iTopORM
+ */
+class AttributeCustomFields extends AttributeDefinition
+{
+	const SEARCH_WIDGET_TYPE = self::SEARCH_WIDGET_TYPE_RAW;
+
+	static public function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("handler_class"));
+	}
+
+	public function GetEditClass() {return "CustomFields";}
+	public function IsWritable() {return true;}
+	static public function LoadFromDB() {return false;} // See ReadValue...
+
+	public function GetDefaultValue(DBObject $oHostObject = null)
+	{
+		return new ormCustomFieldsValue($oHostObject, $this->GetCode());
+	}
+
+	public function GetBasicFilterOperators() {return array();}
+	public function GetBasicFilterLooseOperator() {return '';}
+	public function GetBasicFilterSQLExpr($sOpCode, $value) {return '';}
+
+	/**
+	 * @param DBObject $oHostObject
+	 * @param array|null $aValues
+	 * @return CustomFieldsHandler
+	 */
+	public function GetHandler($aValues = null)
+	{
+		$sHandlerClass = $this->Get('handler_class');
+		$oHandler = new $sHandlerClass($this->GetCode());
+		if (!is_null($aValues))
+		{
+			$oHandler->SetCurrentValues($aValues);
+		}
+		return $oHandler;
+	}
+
+	public function GetPrerequisiteAttributes($sClass = null)
+	{
+		$sHandlerClass = $this->Get('handler_class');
+		return $sHandlerClass::GetPrerequisiteAttributes($sClass);
+	}
+
+	public function GetEditValue($sValue, $oHostObj = null)
+	{
+		return $this->GetForTemplate($sValue, '', $oHostObj, true);
+	}
+
+	/**
+	 * Makes the string representation out of the values given by the form defined in GetDisplayForm
+	 */
+	public function ReadValueFromPostedForm($oHostObject, $sFormPrefix)
+	{
+		$aRawData = json_decode(utils::ReadPostedParam("attr_{$sFormPrefix}{$this->GetCode()}", '{}', 'raw_data'), true);
+		return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aRawData);
+	}
+
+	public function MakeRealValue($proposedValue, $oHostObject)
+	{
+		if (is_object($proposedValue) && ($proposedValue instanceof ormCustomFieldsValue))
+		{
+			return $proposedValue;
+		}
+		elseif (is_string($proposedValue))
+		{
+			$aValues = json_decode($proposedValue, true);
+			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
+		}
+		elseif (is_array($proposedValue))
+		{
+			return new ormCustomFieldsValue($oHostObject, $this->GetCode(), $proposedValue);
+		}
+		elseif (is_null($proposedValue))
+		{
+			return new ormCustomFieldsValue($oHostObject, $this->GetCode());
+		}
+		throw new Exception('Unexpected type for the value of a custom fields attribute: '.gettype($proposedValue));
+	}
+
+	static public function GetFormFieldClass()
+	{
+		return '\\Combodo\\iTop\\Form\\Field\\SubFormField';
+	}
+
+	/**
+	 * Override to build the relevant form field
+	 *
+	 * When called first, $oFormField is null and will be created (eg. Make). Then when the ::parent is called and the $oFormField is passed, MakeFormField behaves more like a Prepare.
+	 */
+	public function MakeFormField(DBObject $oObject, $oFormField = null)
+	{
+		if ($oFormField === null)
+		{
+			$sFormFieldClass = static::GetFormFieldClass();
+			$oFormField = new $sFormFieldClass($this->GetCode());
+			$oFormField->SetForm($this->GetForm($oObject));
+		}
+		parent::MakeFormField($oObject, $oFormField);
+		
+		return $oFormField;
+	}
+
+	/**
+	 * @param DBObject $oHostObject
+	 * @param null $sFormPrefix
+	 * @return Combodo\iTop\Form\Form
+	 * @throws \Exception
+	 */
+	public function GetForm(DBObject $oHostObject, $sFormPrefix = null)
+	{
+		try
+		{
+			$oValue = $oHostObject->Get($this->GetCode());
+			$oHandler = $this->GetHandler($oValue->GetValues());
+			$sFormId = is_null($sFormPrefix) ? 'cf_'.$this->GetCode() : $sFormPrefix.'_cf_'.$this->GetCode();
+			$oHandler->BuildForm($oHostObject, $sFormId);
+			$oForm = $oHandler->GetForm();
+		}
+		catch (Exception $e)
+		{
+			$oForm = new \Combodo\iTop\Form\Form('');
+			$oField = new \Combodo\iTop\Form\Field\LabelField('');
+			$oField->SetLabel('Custom field error: '.$e->getMessage());
+			$oForm->AddField($oField);
+			$oForm->Finalize();
+		}
+		return $oForm;
+	}
+
+	/**
+	 * Read the data from where it has been stored. This verb must be implemented as soon as LoadFromDB returns false and LoadInObject returns true
+	 * @param $oHostObject
+	 * @return ormCustomFieldsValue
+	 */
+	public function ReadValue($oHostObject)
+	{
+		try
+		{
+			$oHandler = $this->GetHandler();
+			$aValues = $oHandler->ReadValues($oHostObject);
+			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode(), $aValues);
+		}
+		catch (Exception $e)
+		{
+			$oRet = new ormCustomFieldsValue($oHostObject, $this->GetCode());
+		}
+		return $oRet;
+	}
+
+	/**
+	 * Record the data (currently in the processing of recording the host object)
+	 * It is assumed that the data has been checked prior to calling Write()
+	 * @param DBObject $oHostObject
+	 * @param ormCustomFieldsValue|null $oValue (null is the default value)
+	 */
+	public function WriteValue(DBObject $oHostObject, ormCustomFieldsValue $oValue = null)
+	{
+		if (is_null($oValue))
+		{
+			$oHandler = $this->GetHandler();
+			$aValues = array();
+		}
+		else
+		{
+			// Pass the values through the form to make sure that they are correct
+			$oHandler = $this->GetHandler($oValue->GetValues());
+			$oHandler->BuildForm($oHostObject, '');
+			$oForm = $oHandler->GetForm();
+			$aValues = $oForm->GetCurrentValues();
+		}
+		return $oHandler->WriteValues($oHostObject, $aValues);
+	}
+
+	/**
+	 * The part of the current attribute in the object's signature, for the supplied value
+	 * @param ormCustomFieldsValue $value The value of this attribute for the object
+	 * @return string The "signature" for this field/attribute
+	 */
+	public function Fingerprint($value)
+	{
+		$oHandler = $this->GetHandler($value->GetValues());
+		return $oHandler->GetValueFingerprint();
+	}
+
+	/**
+	 * Check the validity of the data
+	 * @param DBObject $oHostObject
+	 * @param $value
+	 * @return bool|string true or error message
+	 */
+	public function CheckValue(DBObject $oHostObject, $value)
+	{
+		try
+		{
+			$oHandler = $this->GetHandler($value->GetValues());
+			$oHandler->BuildForm($oHostObject, '');
+			$oForm = $oHandler->GetForm();
+			$oForm->Validate();
+			if ($oForm->GetValid())
+			{
+				$ret = true;
+			}
+			else
+			{
+				$aMessages = array();
+				foreach ($oForm->GetErrorMessages() as $sFieldId => $aFieldMessages)
+				{
+					$aMessages[] = $sFieldId.': '.implode(', ', $aFieldMessages);
+				}
+				$ret = 'Invalid value: '.implode(', ', $aMessages);
+			}
+		}
+		catch (Exception $e)
+		{
+			$ret = $e->getMessage();
+		}
+		return $ret;
+	}
+
+	/**
+	 * Cleanup data upon object deletion (object id still available here)
+	 * @param DBObject $oHostObject
+	 * @return
+	 * @throws \CoreException
+	 */
+	public function DeleteValue(DBObject $oHostObject)
+	{
+		$oValue = $oHostObject->Get($this->GetCode());
+		$oHandler = $this->GetHandler($oValue->GetValues());
+		return $oHandler->DeleteValues($oHostObject);
+	}
+
+	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
+	{
+		try
+		{
+			$sRet = $value->GetAsHTML($bLocalize);
+		}
+		catch (Exception $e)
+		{
+			$sRet = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
+		}
+		return $sRet;
+	}
+
+	public function GetAsXML($value, $oHostObject = null, $bLocalize = true)
+	{
+		try
+		{
+			$sRet = $value->GetAsXML($bLocalize);
+		}
+		catch (Exception $e)
+		{
+			$sRet = Str::pure2xml('Custom field error: '.$e->getMessage());
+		}
+		return $sRet;
+	}
+
+	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
+	{
+		try
+		{
+			$sRet = $value->GetAsCSV($sSeparator, $sTextQualifier, $bLocalize, $bConvertToPlainText);
+		}
+		catch (Exception $e)
+		{
+			$sFrom = array("\r\n", $sTextQualifier);
+			$sTo = array("\n", $sTextQualifier.$sTextQualifier);
+			$sEscaped = str_replace($sFrom, $sTo, 'Custom field error: '.$e->getMessage());
+			$sRet = $sTextQualifier.$sEscaped.$sTextQualifier;
+		}
+		return $sRet;
+	}
+
+	/**
+	 * List the available verbs for 'GetForTemplate'
+	 */
+	public function EnumTemplateVerbs()
+	{
+		$sHandlerClass = $this->Get('handler_class');
+		return $sHandlerClass::EnumTemplateVerbs();
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 *
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $oHostObject DBObject The object
+	 * @param $bLocalize bool Whether or not to localize the value
+	 *
+	 * @return string
+	 */
+	public function GetForTemplate($value, $sVerb, $oHostObject = null, $bLocalize = true)
+	{
+		try
+		{
+			$sRet = $value->GetForTemplate($sVerb, $bLocalize);
+		}
+		catch (Exception $e)
+		{
+			$sRet = 'Custom field error: '.$e->getMessage();
+		}
+		return $sRet;
+	}
+
+	public function MakeValueFromString($sProposedValue, $bLocalizedValue = false, $sSepItem = null, $sSepAttribute = null, $sSepValue = null, $sAttributeQualifier = null)
+	{
+		return null;
+	}
+
+	/**
+	 * Helper to get a value that will be JSON encoded
+	 * The operation is the opposite to FromJSONToValue
+	 */
+	public function GetForJSON($value)
+	{
+		return null;
+	}
+
+	/**
+	 * Helper to form a value, given JSON decoded data
+	 * The operation is the opposite to GetForJSON
+	 */
+	public function FromJSONToValue($json)
+	{
+		return null;
+	}
+
+	public function Equals($val1, $val2)
+	{
+		try
+		{
+			$bEquals = $val1->Equals($val2);
+		}
+		catch (Exception $e)
+		{
+			false;
+		}
+		return $bEquals;
+	}
+}
+
+class AttributeArchiveFlag extends AttributeBoolean
+{
+	public function __construct($sCode)
+	{
+		parent::__construct($sCode, array("allowed_values" => null, "sql" => $sCode, "default_value" => false, "is_null_allowed" => false, "depends_on" => array()));
+	}
+	public function RequiresIndex()
+	{
+		return true;
+	}
+	public function CopyOnAllTables()
+	{
+		return true;
+	}
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveFlag/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
+class AttributeArchiveDate extends AttributeDate
+{
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveDate/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeArchiveDate/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
+
+class AttributeObsolescenceFlag extends AttributeBoolean
+{
+	public function __construct($sCode)
+	{
+		parent::__construct($sCode, array("allowed_values"=>null, "sql"=>$sCode, "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array()));
+	}
+	public function IsWritable()
+	{
+		return false;
+	}
+	public function IsMagic()
+	{
+		return true;
+	}
+
+	static public function IsBasedOnDBColumns() {return false;}
+	/**
+	 * Returns true if the attribute value is built after other attributes by the mean of an expression (obtained via GetOQLExpression)
+	 * @return bool
+	 */
+	static public function IsBasedOnOQLExpression() {return true;}
+	public function GetOQLExpression()
+	{
+		return MetaModel::GetObsolescenceExpression($this->GetHostClass());
+	}
+
+	public function GetSQLExpressions($sPrefix = '')
+	{
+		return array();
+	}
+	public function GetSQLColumns($bFullSpec = false) {return array();} // returns column/spec pairs (1 in most of the cases), for STRUCTURING (DB creation)
+	public function GetSQLValues($value) {return array();} // returns column/value pairs (1 in most of the cases), for WRITING (Insert, Update)
+
+	public function GetEditClass() {return "";}
+
+	public function GetValuesDef() {return null;}
+	public function GetPrerequisiteAttributes($sClass = null) {return $this->GetOptional("depends_on", array());}
+
+	public function IsDirectField() {return true;}
+	static public function IsScalar() {return true;}
+	public function GetSQLExpr()
+	{
+		return null;
+	}
+
+	public function GetDefaultValue(DBObject $oHostObject = null) {return $this->MakeRealValue("", $oHostObject);}
+	public function IsNullAllowed() {return false;}
+
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceFlag/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
+
+class AttributeObsolescenceDate extends AttributeDate
+{
+	public function GetLabel($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label', $sDefault);
+		return parent::GetLabel($sDefault);
+	}
+	public function GetDescription($sDefault = null)
+	{
+		$sDefault = Dict::S('Core:AttributeObsolescenceDate/Label+', $sDefault);
+		return parent::GetDescription($sDefault);
+	}
+}
diff --git a/core/background.inc.php b/core/background.inc.php
index 4dacf6d34..d03ee6646 100644
--- a/core/background.inc.php
+++ b/core/background.inc.php
@@ -1,55 +1,55 @@
-<?php
-// Copyright (C) 2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Tasks performed in the background
- *
- * @copyright   Copyright (C) 2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class ObsolescenceDateUpdater implements iBackgroundProcess
-{
-	public function GetPeriodicity()
-	{
-		return MetaModel::GetConfig()->Get('obsolescence.date_update_interval'); // 10 mn
-	}
-
-	public function Process($iUnixTimeLimit)
-	{
-		$iCountSet = 0;
-		$iCountReset = 0;
-		$iClasses = 0;
-		foreach (MetaModel::EnumObsoletableClasses() as $sClass)
-		{
-			$oObsoletedToday = new DBObjectSearch($sClass);
-			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '=');
-			$oObsoletedToday->AddCondition('obsolescence_date', null, '=');
-			$sToday = date(AttributeDate::GetSQLFormat());
-			$iCountSet += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => $sToday));
-
-			$oObsoletedToday = new DBObjectSearch($sClass);
-			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '!=');
-			$oObsoletedToday->AddCondition('obsolescence_date', null, '!=');
-			$iCountReset += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => null));
-		}
-		return "Obsolescence date updated (classes: $iClasses ; set: $iCountSet ; reset: $iCountReset)\n";
-	}
-}
+<?php
+// Copyright (C) 2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Tasks performed in the background
+ *
+ * @copyright   Copyright (C) 2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class ObsolescenceDateUpdater implements iBackgroundProcess
+{
+	public function GetPeriodicity()
+	{
+		return MetaModel::GetConfig()->Get('obsolescence.date_update_interval'); // 10 mn
+	}
+
+	public function Process($iUnixTimeLimit)
+	{
+		$iCountSet = 0;
+		$iCountReset = 0;
+		$iClasses = 0;
+		foreach (MetaModel::EnumObsoletableClasses() as $sClass)
+		{
+			$oObsoletedToday = new DBObjectSearch($sClass);
+			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '=');
+			$oObsoletedToday->AddCondition('obsolescence_date', null, '=');
+			$sToday = date(AttributeDate::GetSQLFormat());
+			$iCountSet += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => $sToday));
+
+			$oObsoletedToday = new DBObjectSearch($sClass);
+			$oObsoletedToday->AddCondition('obsolescence_flag', 1, '!=');
+			$oObsoletedToday->AddCondition('obsolescence_date', null, '!=');
+			$iCountReset += MetaModel::BulkUpdate($oObsoletedToday, array('obsolescence_date' => null));
+		}
+		return "Obsolescence date updated (classes: $iClasses ; set: $iCountSet ; reset: $iCountReset)\n";
+	}
+}
diff --git a/core/backgroundprocess.inc.php b/core/backgroundprocess.inc.php
index f10282933..625385f59 100644
--- a/core/backgroundprocess.inc.php
+++ b/core/backgroundprocess.inc.php
@@ -1,88 +1,88 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * interface iProcess
- * Something that can be executed 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-interface iProcess
-{
-	/**
-	 * @param int $iUnixTimeLimit
-	 *
-	 * @return string status message
-	 * @throws \ProcessException
-	 * @throws \ProcessFatalException
-	 * @throws MySQLHasGoneAwayException
-	 */
-	public function Process($iUnixTimeLimit);
-}
-
-/**
- * interface iBackgroundProcess
- * Any extension that must be called regularly to be executed in the background 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-interface iBackgroundProcess extends iProcess
-{
-	/**
-	 * @return int repetition rate in seconds
-	 */
-	public function GetPeriodicity();
-}
-
-/**
- * interface iScheduledProcess
- * A variant of process that must be called at specific times
- *
- * @copyright   Copyright (C) 2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-interface iScheduledProcess extends iProcess
-{
-	/**
-	 * @return DateTime exact time at which the process must be run next time
-	 */
-	public function GetNextOccurrence();
-}
-
-/**
- * Class ProcessException
- * Exception for iProcess implementations.<br>
- * An error happened during the processing but we can go on with the next implementations.
- */
-class ProcessException extends CoreException
-{
-
-}
-
-/**
- * Class ProcessFatalException
- * Exception for iProcess implementations.<br>
- * A big error occurred, we have to stop the iProcess processing.
- */
-class ProcessFatalException extends CoreException
-{
-
-}
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * interface iProcess
+ * Something that can be executed 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iProcess
+{
+	/**
+	 * @param int $iUnixTimeLimit
+	 *
+	 * @return string status message
+	 * @throws \ProcessException
+	 * @throws \ProcessFatalException
+	 * @throws MySQLHasGoneAwayException
+	 */
+	public function Process($iUnixTimeLimit);
+}
+
+/**
+ * interface iBackgroundProcess
+ * Any extension that must be called regularly to be executed in the background 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iBackgroundProcess extends iProcess
+{
+	/**
+	 * @return int repetition rate in seconds
+	 */
+	public function GetPeriodicity();
+}
+
+/**
+ * interface iScheduledProcess
+ * A variant of process that must be called at specific times
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iScheduledProcess extends iProcess
+{
+	/**
+	 * @return DateTime exact time at which the process must be run next time
+	 */
+	public function GetNextOccurrence();
+}
+
+/**
+ * Class ProcessException
+ * Exception for iProcess implementations.<br>
+ * An error happened during the processing but we can go on with the next implementations.
+ */
+class ProcessException extends CoreException
+{
+
+}
+
+/**
+ * Class ProcessFatalException
+ * Exception for iProcess implementations.<br>
+ * A big error occurred, we have to stop the iProcess processing.
+ */
+class ProcessFatalException extends CoreException
+{
+
+}
diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php
index d2f05523a..64f78ae54 100644
--- a/core/bulkchange.class.inc.php
+++ b/core/bulkchange.class.inc.php
@@ -1,1350 +1,1350 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Bulk change facility (common to interactive and batch usages)
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-// The BOM is added at the head of exported UTF-8 CSV data, and removed (if present) from input UTF-8 data.
-// This helps MS-Excel (Version > 2007, Windows only) in changing its interpretation of a CSV file (by default Excel reads data as ISO-8859-1 -not 100% sure!)
-define('UTF8_BOM', chr(239).chr(187).chr(191)); // 0xEF, 0xBB, 0xBF
-
-/**
- * BulkChange
- * Interpret a given data set and update the DB accordingly (fake mode avail.) 
- *
- * @package     iTopORM
- */
-
-class BulkChangeException extends CoreException
-{
-}
-
-/**
- * CellChangeSpec
- * A series of classes, keeping the information about a given cell: could it be changed or not (and why)?  
- *
- * @package     iTopORM
- */
-abstract class CellChangeSpec
-{
-	protected $m_proposedValue;
-	protected $m_sOql; // in case of ambiguity
-
-	public function __construct($proposedValue, $sOql = '')
-	{
-		$this->m_proposedValue = $proposedValue;
-		$this->m_sOql = $sOql;
-	}
-
-	public function GetPureValue()
-	{
-		// Todo - distinguish both values
-		return $this->m_proposedValue;
-	}
-
-	public function GetDisplayableValue()
-	{
-		return $this->m_proposedValue;
-	}
-
-	public function GetOql()
-	{
-		return $this->m_sOql;
-	}
-
-	abstract public function GetDescription();
-}
-
-
-class CellStatus_Void extends CellChangeSpec
-{
-	public function GetDescription()
-	{
-		return '';
-	}
-}
-
-class CellStatus_Modify extends CellChangeSpec
-{
-	protected $m_previousValue;
-
-	public function __construct($proposedValue, $previousValue = null)
-	{
-		// Unused (could be costly to know -see the case of reconciliation on ext keys)
-		//$this->m_previousValue = $previousValue;
-		parent::__construct($proposedValue);
-	}
-
-	public function GetDescription()
-	{
-		return Dict::S('UI:CSVReport-Value-Modified');
-	}
-
-	//public function GetPreviousValue()
-	//{
-	//	return $this->m_previousValue;
-	//}
-}
-
-class CellStatus_Issue extends CellStatus_Modify
-{
-	protected $m_sReason;
-
-	public function __construct($proposedValue, $previousValue, $sReason)
-	{
-		$this->m_sReason = $sReason;
-		parent::__construct($proposedValue, $previousValue);
-	}
-
-	public function GetDescription()
-	{
-		if (is_null($this->m_proposedValue))
-		{
-			return Dict::Format('UI:CSVReport-Value-SetIssue', $this->m_sReason);
-		}
-		return Dict::Format('UI:CSVReport-Value-ChangeIssue', $this->m_proposedValue, $this->m_sReason);
-	}
-}
-
-class CellStatus_SearchIssue extends CellStatus_Issue
-{
-	public function __construct()
-	{
-		parent::__construct(null, null, null);
-	}
-
-	public function GetDescription()
-	{
-		return Dict::S('UI:CSVReport-Value-NoMatch');
-	}
-}
-
-class CellStatus_NullIssue extends CellStatus_Issue
-{
-	public function __construct()
-	{
-		parent::__construct(null, null, null);
-	}
-
-	public function GetDescription()
-	{
-		return Dict::S('UI:CSVReport-Value-Missing');
-	}
-}
-
-
-class CellStatus_Ambiguous extends CellStatus_Issue
-{
-	protected $m_iCount;
-
-	public function __construct($previousValue, $iCount, $sOql)
-	{
-		$this->m_iCount = $iCount;
-		$this->m_sQuery = $sOql;
-		parent::__construct(null, $previousValue, '');
-	}
-
-	public function GetDescription()
-	{
-		$sCount = $this->m_iCount;
-		return Dict::Format('UI:CSVReport-Value-Ambiguous', $sCount);
-	}
-}
-
-
-/**
- * RowStatus
- * A series of classes, keeping the information about a given row: could it be changed or not (and why)?  
- *
- * @package     iTopORM
- */
-abstract class RowStatus
-{
-	public function __construct()
-	{
-	}
-
-	abstract public function GetDescription();
-}
-
-class RowStatus_NoChange extends RowStatus
-{
-	public function GetDescription()
-	{
-		return Dict::S('UI:CSVReport-Row-Unchanged');
-	}
-}
-
-class RowStatus_NewObj extends RowStatus
-{
-	public function GetDescription()
-	{
-		return Dict::S('UI:CSVReport-Row-Created');
-	}
-}
-
-class RowStatus_Modify extends RowStatus
-{
-	protected $m_iChanged;
-
-	public function __construct($iChanged)
-	{
-		$this->m_iChanged = $iChanged;
-	}
-
-	public function GetDescription()
-	{
-		return Dict::Format('UI:CSVReport-Row-Updated', $this->m_iChanged);
-	}
-}
-
-class RowStatus_Disappeared extends RowStatus_Modify
-{
-	public function GetDescription()
-	{
-		return Dict::Format('UI:CSVReport-Row-Disappeared', $this->m_iChanged);
-	}
-}
-
-class RowStatus_Issue extends RowStatus
-{
-	protected $m_sReason;
-
-	public function __construct($sReason)
-	{
-		$this->m_sReason = $sReason;
-	}
-
-	public function GetDescription()
-	{
-		return Dict::Format('UI:CSVReport-Row-Issue', $this->m_sReason);
-	}
-}
-
-
-/**
- * BulkChange
- *
- * @package iTopORM
- */
-class BulkChange
-{
-	protected $m_sClass; 
-	protected $m_aData; // Note: hereafter, iCol maybe actually be any acceptable key (string)
-	// #@# todo: rename the variables to sColIndex
-	protected $m_aAttList; // attcode => iCol
-	protected $m_aExtKeys; // aExtKeys[sExtKeyAttCode][sExtReconcKeyAttCode] = iCol;
-	protected $m_aReconcilKeys; // attcode (attcode = 'id' for the pkey)
-	protected $m_sSynchroScope; // OQL - if specified, then the missing items will be reported
-	protected $m_aOnDisappear; // array of attcode => value, values to be set when an object gets out of scope (ignored if no scope has been defined)
-	protected $m_sDateFormat; // Date format specification, see DateTime::createFromFormat
-	protected $m_bLocalizedValues; // Values in the data set are localized (see AttributeEnum)
-	protected $m_aExtKeysMappingCache; // Cache for resolving external keys based on the given search criterias
-
-	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null, $bLocalize = false)
-	{
-		$this->m_sClass = $sClass;
-		$this->m_aData = $aData;
-		$this->m_aAttList = $aAttList;
-		$this->m_aReconcilKeys = $aReconcilKeys;
-		$this->m_aExtKeys = $aExtKeys;
-		$this->m_sSynchroScope = $sSynchroScope;
-		$this->m_aOnDisappear = $aOnDisappear;
-		$this->m_sDateFormat = $sDateFormat;
-		$this->m_bLocalizedValues = $bLocalize;
-		$this->m_aExtKeysMappingCache = array();
-	}
-
-	protected $m_bReportHtml = false;
-	protected $m_sReportCsvSep = ',';
-	protected $m_sReportCsvDelimiter = '"';
-
-	public function SetReportHtml()
-	{
-		$this->m_bReportHtml = true;
-	}
-
-	public function SetReportCsv($sSeparator = ',', $sDelimiter = '"')
-	{
-		$this->m_bReportHtml = false;
-		$this->m_sReportCsvSep = $sSeparator;
-		$this->m_sReportCsvDelimiter = $sDelimiter;
-	}
-   
-	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
-	{
-		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-		$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
-		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
-		{
-			if ($sForeignAttCode == 'id')
-			{
-				$value = (int) $aRowData[$iCol];
-			}
-			else
-			{
-				// The foreign attribute is one of our reconciliation key
-				$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
-				$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
-			}
-			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
-			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
-		}
-
-		$oExtObjects = new CMDBObjectSet($oReconFilter);
-		$aKeys = $oExtObjects->ToArray();
-		return array($oReconFilter->ToOql(), $aKeys);
-	}
-
-	// Returns true if the CSV data specifies that the external key must be left undefined
-	protected function IsNullExternalKeySpec($aRowData, $sAttCode)
-	{
-		//$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
-		{
-			// The foreign attribute is one of our reconciliation key
-			if (strlen($aRowData[$iCol]) > 0)
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	protected function PrepareObject(&$oTargetObj, $aRowData, &$aErrors)
-	{
-		$aResults = array();
-		$aErrors = array();
-	
-		// External keys reconciliation
-		//
-		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
-		{
-			// Skip external keys used for the reconciliation process
-			// if (!array_key_exists($sAttCode, $this->m_aAttList)) continue;
-
-			$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
-
-			if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
-			{
-				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-				{
-					// Default reporting
-					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
-				}
-				if ($oExtKey->IsNullAllowed())
-				{
-					$oTargetObj->Set($sAttCode, $oExtKey->GetNullValue());
-					$aResults[$sAttCode]= new CellStatus_Void($oExtKey->GetNullValue());
-				}
-				else
-				{
-					$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-Null');
-					$aResults[$sAttCode]= new CellStatus_Issue(null, $oTargetObj->Get($sAttCode), Dict::S('UI:CSVReport-Value-Issue-Null'));
-				}
-			}
-			else
-			{
-				$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
-
-				$aCacheKeys = array();
-				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-				{
-					// The foreign attribute is one of our reconciliation key
-					if ($sForeignAttCode == 'id')
-					{
-						$value = $aRowData[$iCol];
-					}
-					else
-					{
-						$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
-						$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
-					}
-					$aCacheKeys[] = $value;
-					$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
-					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
-				}
-				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
-				$iForeignKey = null;
-				$sOQL = '';
-				// TODO: check if *too long* keys can lead to collisions... and skip the cache in such a case...
-				if (!array_key_exists($sAttCode, $this->m_aExtKeysMappingCache))
-				{
-					$this->m_aExtKeysMappingCache[$sAttCode] = array();
-				}
-				if (array_key_exists($sCacheKey, $this->m_aExtKeysMappingCache[$sAttCode]))
-				{
-					// Cache hit
-					$iCount = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['c'];
-					$iForeignKey = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['k'];
-					$sOQL = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['oql'];
-					// Record the hit
-					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['h']++;
-				}
-				else
-				{
-					// Cache miss, let's initialize it
-					$oExtObjects = new CMDBObjectSet($oReconFilter);
-					$iCount = $oExtObjects->Count();
-					if ($iCount == 1)
-					{
-						$oForeignObj = $oExtObjects->Fetch();
-						$iForeignKey = $oForeignObj->GetKey();
-					}
-					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
-						'c' => $iCount,
-						'k' => $iForeignKey,
-						'oql' => $oReconFilter->ToOql(),
-						'h' => 0, // number of hits on this cache entry
-					);
-				}
-				switch($iCount)
-				{
-					case 0:
-					$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-NotFound');
-					$aResults[$sAttCode]= new CellStatus_SearchIssue();
-					break;
-					
-					case 1:
-					// Do change the external key attribute
-					$oTargetObj->Set($sAttCode, $iForeignKey);
-					break;
-					
-					default:
-					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-FoundMany', $iCount);
-					$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $iCount, $sOQL);
-				}
-			}
-
-			// Report
-			if (!array_key_exists($sAttCode, $aResults))
-			{
-				$iForeignObj = $oTargetObj->Get($sAttCode);
-				if (array_key_exists($sAttCode, $oTargetObj->ListChanges()))
-				{
-					if ($oTargetObj->IsNew())
-					{
-						$aResults[$sAttCode]= new CellStatus_Void($iForeignObj);
-					}
-					else
-					{
-						$aResults[$sAttCode]= new CellStatus_Modify($iForeignObj, $oTargetObj->GetOriginal($sAttCode));
-						foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-						{
-							// Report the change on reconciliation values as well
-							$aResults[$iCol] = new CellStatus_Modify($aRowData[$iCol]);
-						}
-					}
-				}
-				else
-				{
-					$aResults[$sAttCode]= new CellStatus_Void($iForeignObj);
-				}
-			}
-		}
-	
-		// Set the object attributes
-		//
-		foreach ($this->m_aAttList as $sAttCode => $iCol)
-		{
-			// skip the private key, if any
-			if ($sAttCode == 'id') continue;
-
-			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-
-			// skip reconciliation keys
-			if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ continue; }
-
-			$aReasons = array();
-			$iFlags = $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
-			if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) )
-			{
-					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Readonly', $sAttCode, $oTargetObj->Get($sAttCode), $aRowData[$iCol]);
-			}
-			else if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
-			{
-				try
-				{
-					$oSet = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
-					$oTargetObj->Set($sAttCode, $oSet);
-				}
-				catch(CoreException $e)
-				{
-					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Format', $e->getMessage());
-				}
-			}
-			else
-			{
-				$value = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
-				if (is_null($value) && (strlen($aRowData[$iCol]) > 0))
-				{
-					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-NoMatch', $sAttCode);
-				}
-				else
-				{
-					$res = $oTargetObj->CheckValue($sAttCode, $value);
-					if ($res === true)
-					{
-						$oTargetObj->Set($sAttCode, $value);
-					}
-					else
-					{
-						// $res is a string with the error description
-						$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Unknown', $sAttCode, $res);
-					}
-				}
-			}
-		}
-	
-		// Reporting on fields
-		//
-		$aChangedFields = $oTargetObj->ListChanges();
-		foreach ($this->m_aAttList as $sAttCode => $iCol)
-		{
-			if ($sAttCode == 'id')
-			{
-				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
-			}
-			else
-			{
-				if ($this->m_bReportHtml)
-				{
-					$sCurValue = $oTargetObj->GetAsHTML($sAttCode, $this->m_bLocalizedValues);
-					$sOrigValue = $oTargetObj->GetOriginalAsHTML($sAttCode, $this->m_bLocalizedValues);
-				}
-				else
-				{
-					$sCurValue = $oTargetObj->GetAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
-					$sOrigValue = $oTargetObj->GetOriginalAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
-				}
-				if (isset($aErrors[$sAttCode]))
-				{
-					$aResults[$iCol]= new CellStatus_Issue($aRowData[$iCol], $sOrigValue, $aErrors[$sAttCode]);
-				}
-				elseif (array_key_exists($sAttCode, $aChangedFields))
-				{
-					if ($oTargetObj->IsNew())
-					{
-						$aResults[$iCol]= new CellStatus_Void($sCurValue);
-					}
-					else
-					{
-						$aResults[$iCol]= new CellStatus_Modify($sCurValue, $sOrigValue);
-					}
-				}
-				else
-				{
-					// By default... nothing happens
-					$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-					if ($oAttDef instanceof AttributeDateTime)
-					{
-						$aResults[$iCol]= new CellStatus_Void($oAttDef->GetFormat()->Format($aRowData[$iCol]));
-					}
-					else
-					{
-						$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
-					}
-				}
-			}
-		}
-	
-		// Checks
-		//
-		$res = $oTargetObj->CheckConsistency();
-		if ($res !== true)
-		{
-			// $res contains the error description
-			$aErrors["GLOBAL"] = Dict::Format('UI:CSVReport-Row-Issue-Inconsistent', $res);
-		}
-		return $aResults;
-	}
-	
-	protected function PrepareMissingObject(&$oTargetObj, &$aErrors)
-	{
-		$aResults = array();
-		$aErrors = array();
-	
-		// External keys
-		//
-		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
-		{
-			//$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
-			$aResults[$sAttCode]= new CellStatus_Void($oTargetObj->Get($sAttCode));
-
-			foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-			{
-				$aResults[$iCol] = new CellStatus_Void('?');
-			}
-		}
-	
-		// Update attributes
-		//
-		foreach($this->m_aOnDisappear as $sAttCode => $value)
-		{
-			if (!MetaModel::IsValidAttCode(get_class($oTargetObj), $sAttCode))
-			{
-				throw new BulkChangeException('Invalid attribute code', array('class' => get_class($oTargetObj), 'attcode' => $sAttCode));
-			}
-			$oTargetObj->Set($sAttCode, $value);
-		}
-	
-		// Reporting on fields
-		//
-		$aChangedFields = $oTargetObj->ListChanges();
-		foreach ($this->m_aAttList as $sAttCode => $iCol)
-		{
-			if ($sAttCode == 'id')
-			{
-				$aResults[$iCol]= new CellStatus_Void($oTargetObj->GetKey());
-			}
-			if (array_key_exists($sAttCode, $aChangedFields))
-			{
-				$aResults[$iCol]= new CellStatus_Modify($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode));
-			}
-			else
-			{
-				// By default... nothing happens
-				$aResults[$iCol]= new CellStatus_Void($oTargetObj->Get($sAttCode));
-			}
-		}
-	
-		// Checks
-		//
-		$res = $oTargetObj->CheckConsistency();
-		if ($res !== true)
-		{
-			// $res contains the error description
-			$aErrors["GLOBAL"] = Dict::Format('UI:CSVReport-Row-Issue-Inconsistent', $res);
-		}
-		return $aResults;
-	}
-
-	
-	protected function CreateObject(&$aResult, $iRow, $aRowData, CMDBChange $oChange = null)
-	{
-		$oTargetObj = MetaModel::NewObject($this->m_sClass);
-
-		// Populate the cache for hierarchical keys (only if in verify mode)
-		if (is_null($oChange))
-		{
-			// 1. determine if a hierarchical key exists
-			foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
-			{
-				$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
-				if (!$this->IsNullExternalKeySpec($aRowData, $sAttCode) && MetaModel::IsParentClass(get_class($oTargetObj), $this->m_sClass))
-				{
-					// 2. Populate the cache for further checks
-					$aCacheKeys = array();
-					foreach ($aKeyConfig as $sForeignAttCode => $iCol)
-					{
-						// The foreign attribute is one of our reconciliation key
-						if ($sForeignAttCode == 'id')
-						{
-							$value = $aRowData[$iCol];
-						}
-						else
-						{
-							if (!isset($this->m_aAttList[$sForeignAttCode]) || !isset($aRowData[$this->m_aAttList[$sForeignAttCode]]))
-							{
-								// the key is not in the import
-								break 2;
-							}
-							$value = $aRowData[$this->m_aAttList[$sForeignAttCode]];
-						}
-						$aCacheKeys[] = $value;
-					}
-					$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
-					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
-						'c' => 1,
-						'k' => -1,
-						'oql' => '',
-						'h' => 0, // number of hits on this cache entry
-					);
-				}
-			}
-		}
-
-		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
-	
-		if (count($aErrors) > 0)
-		{
-			$sErrors = implode(', ', $aErrors);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
-			return $oTargetObj;
-		}
-	
-		// Check that any external key will have a value proposed
-		$aMissingKeys = array();
-		foreach (MetaModel::GetExternalKeys($this->m_sClass) as $sExtKeyAttCode => $oExtKey)
-		{
-			if (!$oExtKey->IsNullAllowed())
-			{
-				if (!array_key_exists($sExtKeyAttCode, $this->m_aExtKeys) && !array_key_exists($sExtKeyAttCode, $this->m_aAttList))
-				{ 
-					$aMissingKeys[] = $oExtKey->GetLabel();
-				}
-			}
-		}
-		if (count($aMissingKeys) > 0)
-		{
-			$sMissingKeys = implode(', ', $aMissingKeys);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-MissingExtKey', $sMissingKeys));
-			return $oTargetObj;
-		}
-	
-		// Optionaly record the results
-		//
-		if ($oChange)
-		{
-			$newID = $oTargetObj->DBInsertTrackedNoReload($oChange);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
-			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-			$aResult[$iRow]["id"] = new CellStatus_Void($newID);
-		}
-		else
-		{
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
-			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-			$aResult[$iRow]["id"] = new CellStatus_Void(0);
-		}
-		return $oTargetObj;
-	}
-	
-	protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, CMDBChange $oChange = null)
-	{
-		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
-
-		// Reporting
-		//
-		$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-		$aResult[$iRow]["id"] = new CellStatus_Void($oTargetObj->GetKey());
-
-		if (count($aErrors) > 0)
-		{
-			$sErrors = implode(', ', $aErrors);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
-			return;
-		}
-	
-		$aChangedFields = $oTargetObj->ListChanges();
-		if (count($aChangedFields) > 0)
-		{
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Modify(count($aChangedFields));
-	
-			// Optionaly record the results
-			//
-			if ($oChange)
-			{
-				try
-				{
-					$oTargetObj->DBUpdateTracked($oChange);
-				}
-				catch(CoreException $e)
-				{
-					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue($e->getMessage());
-				}
-			}
-		}
-		else
-		{
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_NoChange();
-		}
-	}
-
-	protected function UpdateMissingObject(&$aResult, $iRow, $oTargetObj, CMDBChange $oChange = null)
-	{
-		$aResult[$iRow] = $this->PrepareMissingObject($oTargetObj, $aErrors);
-
-		// Reporting
-		//
-		$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
-		$aResult[$iRow]["id"] = new CellStatus_Void($oTargetObj->GetKey());
-
-		if (count($aErrors) > 0)
-		{
-			$sErrors = implode(', ', $aErrors);
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
-			return;
-		}
-	
-		$aChangedFields = $oTargetObj->ListChanges();
-		if (count($aChangedFields) > 0)
-		{
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Disappeared(count($aChangedFields));
-
-			// Optionaly record the results
-			//
-			if ($oChange)
-			{
-				try
-				{
-					$oTargetObj->DBUpdateTracked($oChange);
-				}
-				catch(CoreException $e)
-				{
-					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue($e->getMessage());
-				}
-			}
-		}
-		else
-		{
-			$aResult[$iRow]["__STATUS__"] = new RowStatus_Disappeared(0);
-		}
-	}
-	
-	public function Process(CMDBChange $oChange = null)
-	{
-		// Note: $oChange can be null, in which case the aim is to check what would be done
-
-		// Debug...
-		//
-		if (false)
-		{
-			echo "<pre>\n";
-			echo "Attributes:\n";
-			print_r($this->m_aAttList);
-			echo "ExtKeys:\n";
-			print_r($this->m_aExtKeys);
-			echo "Reconciliation:\n";
-			print_r($this->m_aReconcilKeys);
-			echo "Synchro scope:\n";
-			print_r($this->m_sSynchroScope);
-			echo "Synchro changes:\n";
-			print_r($this->m_aOnDisappear);
-			//echo "Data:\n";
-			//print_r($this->m_aData);
-			echo "</pre>\n";
-			exit;
-		}
-
-		$aResult = array();
-
-		if (!is_null($this->m_sDateFormat) && (strlen($this->m_sDateFormat) > 0))
-		{
-			$sDateTimeFormat = $this->m_sDateFormat; // the specified format is actually the date AND time format
-			$oDateTimeFormat = new DateTimeFormat($sDateTimeFormat);
-			$sDateFormat = $oDateTimeFormat->ToDateFormat();
-			AttributeDateTime::SetFormat($oDateTimeFormat);
-			AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));
-			// Translate dates from the source data
-			//
-			foreach ($this->m_aAttList as $sAttCode => $iCol)
-			{
-				if ($sAttCode == 'id') continue;
-				
-				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-				if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
-				{
-					foreach($this->m_aData as $iRow => $aRowData)
-					{
-						$sFormat = $sDateTimeFormat;
-						$sValue = $this->m_aData[$iRow][$iCol];
-						if (!empty($sValue))
-						{
-							if ($oAttDef instanceof AttributeDate)
-							{
-								$sFormat = $sDateFormat;
-							}
-							$oFormat = new DateTimeFormat($sFormat);
-							$sRegExp = $oFormat->ToRegExpr('/');
-							if (!preg_match($sRegExp, $this->m_aData[$iRow][$iCol]))
-							{
-								$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-							}
-							else
-							{
-								$oDate = DateTime::createFromFormat($sFormat, $this->m_aData[$iRow][$iCol]);
-								if ($oDate !== false)
-								{
-									$sNewDate = $oDate->format($oAttDef->GetInternalFormat());
-									$this->m_aData[$iRow][$iCol] = $sNewDate;
-								}
-								else
-								{
-									// Leave the cell unchanged
-									$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-									$aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, $this->m_aData[$iRow][$iCol], Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
-								}
-							}
-						}
-						else
-						{
-							$this->m_aData[$iRow][$iCol] = '';
-						}
-					}
-				}
-			}
-		}
-
-		// Compute the results
-		//
-		if (!is_null($this->m_sSynchroScope))
-		{
-			$aVisited = array();
-		}
-		$iPreviousTimeLimit = ini_get('max_execution_time');
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		foreach($this->m_aData as $iRow => $aRowData)
-		{
-			set_time_limit($iLoopTimeLimit);
-			if (isset($aResult[$iRow]["__STATUS__"]))
-			{
-				// An issue at the earlier steps - skip the rest
-				continue;
-			}
-			try
-			{
-				$oReconciliationFilter = new DBObjectSearch($this->m_sClass);
-				$bSkipQuery = false;
-				foreach($this->m_aReconcilKeys as $sAttCode)
-				{
-					$valuecondition = null;
-					if (array_key_exists($sAttCode, $this->m_aExtKeys))
-					{
-						if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
-						{
-							$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-							if ($oExtKey->IsNullAllowed())
-							{
-								$valuecondition = $oExtKey->GetNullValue();
-								$aResult[$iRow][$sAttCode] = new CellStatus_Void($oExtKey->GetNullValue());
-							}
-							else
-							{
-								$aResult[$iRow][$sAttCode] = new CellStatus_NullIssue();
-							}
-						}
-						else
-						{
-							// The value has to be found or verified
-							list($sQuery, $aMatches) = $this->ResolveExternalKey($aRowData, $sAttCode, $aResult[$iRow]);
-		
-							if (count($aMatches) == 1)
-							{
-								$oRemoteObj = reset($aMatches); // first item
-								$valuecondition = $oRemoteObj->GetKey();
-								$aResult[$iRow][$sAttCode] = new CellStatus_Void($oRemoteObj->GetKey());
-							} 					
-							elseif (count($aMatches) == 0)
-							{
-								$aResult[$iRow][$sAttCode] = new CellStatus_SearchIssue();
-							} 					
-							else
-							{
-								$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $sQuery);
-							}
-						} 					
-					}
-					else
-					{
-						// The value is given in the data row
-						$iCol = $this->m_aAttList[$sAttCode];
-						if ($sAttCode == 'id')
-						{
-							$valuecondition = $aRowData[$iCol];
-						}
-						else
-						{
-							$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
-							$valuecondition = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
-						}
-					}
-					if (is_null($valuecondition))
-					{
-						$bSkipQuery = true;
-					}
-					else
-					{
-						$oReconciliationFilter->AddCondition($sAttCode, $valuecondition, '=');
-					}
-				}
-				if ($bSkipQuery)
-				{
-					$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Reconciliation'));
-				}
-				else
-				{
-					$oReconciliationSet = new CMDBObjectSet($oReconciliationFilter);
-					switch($oReconciliationSet->Count())
-					{
-					case 0:
-						$oTargetObj = $this->CreateObject($aResult, $iRow, $aRowData, $oChange);
-						// $aResult[$iRow]["__STATUS__"]=> set in CreateObject
-						$aVisited[] = $oTargetObj->GetKey();
-						break;
-					case 1:
-						$oTargetObj = $oReconciliationSet->Fetch();
-						$this->UpdateObject($aResult, $iRow, $oTargetObj, $aRowData, $oChange);
-						// $aResult[$iRow]["__STATUS__"]=> set in UpdateObject
-						if (!is_null($this->m_sSynchroScope))
-						{
-							$aVisited[] = $oTargetObj->GetKey();
-						}
-						break;
-					default:
-						// Found several matches, ambiguous
-						$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Ambiguous'));
-						$aResult[$iRow]["id"]= new CellStatus_Ambiguous(0, $oReconciliationSet->Count(), $oReconciliationFilter->ToOql());
-						$aResult[$iRow]["finalclass"]= 'n/a';
-					}
-				}
-			}
-			catch (Exception $e)
-			{
-				$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-Internal', get_class($e), $e->getMessage()));
-			}
-		}
-
-		if (!is_null($this->m_sSynchroScope))
-		{
-			// Compute the delta between the scope and visited objects
-			$oScopeSearch = DBObjectSearch::FromOQL($this->m_sSynchroScope);
-			$oScopeSet = new DBObjectSet($oScopeSearch);
-			while ($oObj = $oScopeSet->Fetch())
-			{
-				$iObj = $oObj->GetKey();
-				if (!in_array($iObj, $aVisited))
-				{
-					set_time_limit($iLoopTimeLimit);
-					$iRow++;
-					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
-				}
-			}
-		}
-		set_time_limit($iPreviousTimeLimit);
-
-		// Fill in the blanks - the result matrix is expected to be 100% complete
-		//
-		foreach($this->m_aData as $iRow => $aRowData)
-		{
-			foreach($this->m_aAttList as $iCol)
-			{
-				if (!array_key_exists($iCol, $aResult[$iRow]))
-				{
-					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
-				}
-			}
-			foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts)
-			{
-				if (!array_key_exists($sAttCode, $aResult[$iRow]))
-				{
-					$aResult[$iRow][$sAttCode] = new CellStatus_Void('n/a');
-				}
-				foreach ($aForeignAtts as $sForeignAttCode => $iCol)
-				{
-					if (!array_key_exists($iCol, $aResult[$iRow]))
-					{
-						// The foreign attribute is one of our reconciliation key
-						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
-					}
-				}
-			}
-		}
-
-		return $aResult;
-	}
-
-	/**
-	 * Display the history of bulk imports
-	 */
-	static function DisplayImportHistory(WebPage $oPage, $bFromAjax = false, $bShowAll = false)
-	{
-		$sAjaxDivId = "CSVImportHistory";
-		if (!$bFromAjax)
-		{
-			$oPage->add('<div id="'.$sAjaxDivId.'">');
-		}
-
-		$oPage->p(Dict::S('UI:History:BulkImports+').' <span id="csv_history_reload"></span>');
-
-		$oBulkChangeSearch = DBObjectSearch::FromOQL("SELECT CMDBChange WHERE origin IN ('csv-interactive', 'csv-import.php')");
-
-		$iQueryLimit = $bShowAll ? 0 : appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
-		$oBulkChanges = new DBObjectSet($oBulkChangeSearch, array('date' => false), array(), null, $iQueryLimit);
-
-		$oAppContext = new ApplicationContext();
-
-		$bLimitExceeded = false;
-		if ($oBulkChanges->Count() > (appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit())))
-		{
-			$bLimitExceeded = true;
-			if (!$bShowAll)
-			{
-				$iMaxObjects = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
-				$oBulkChanges->SetLimit($iMaxObjects);
-			}
-		}
-		$oBulkChanges->Seek(0);
-	
-		$aDetails = array();
-		while ($oChange = $oBulkChanges->Fetch())
-		{
-			$sDate = '<a href="csvimport.php?step=10&changeid='.$oChange->GetKey().'&'.$oAppContext->GetForLink().'">'.$oChange->Get('date').'</a>';
-			$sUser = $oChange->GetUserName();
-			if (preg_match('/^(.*)\\(CSV\\)$/i', $oChange->Get('userinfo'), $aMatches))
-			{
-				$sUser = $aMatches[1];
-			}
-			else
-			{
-				$sUser = $oChange->Get('userinfo');
-			}
-
-			$oOpSearch = DBObjectSearch::FromOQL("SELECT CMDBChangeOpCreate WHERE change = :change_id");
-			$oOpSet = new DBObjectSet($oOpSearch, array(), array('change_id' => $oChange->GetKey()));
-			$iCreated = $oOpSet->Count();
-
-			// Get the class from the first item found (assumption: a CSV load is done for a single class)
-			if ($oCreateOp = $oOpSet->Fetch())
-			{
-				$sClass = $oCreateOp->Get('objclass');
-			}
-
-			$oOpSearch = DBObjectSearch::FromOQL("SELECT CMDBChangeOpSetAttribute WHERE change = :change_id");
-			$oOpSet = new DBObjectSet($oOpSearch, array(), array('change_id' => $oChange->GetKey()));
-
-			$aModified = array();
-			$aAttList = array();
-			while ($oModified = $oOpSet->Fetch())
-			{
-				// Get the class (if not done earlier on object creation)
-				$sClass = $oModified->Get('objclass');
-				$iKey = $oModified->Get('objkey');
-				$sAttCode = $oModified->Get('attcode');
-
-				$aAttList[$sClass][$sAttCode] = true;
-				$aModified["$sClass::$iKey"] = true;
-			}
-			$iModified = count($aModified);
-
-			// Assumption: there is only one class of objects being loaded
-			// Then the last class found gives us the class for every object
-			if ( ($iModified > 0) || ($iCreated > 0))
-			{
-				$aDetails[] = array('date' => $sDate, 'user' => $sUser, 'class' => $sClass, 'created' => $iCreated, 'modified' => $iModified);
-			}
-		}
-
-		$aConfig = array( 'date' => array('label' => Dict::S('UI:History:Date'), 'description' => Dict::S('UI:History:Date+')),
-					'user' => array('label' => Dict::S('UI:History:User'), 'description' => Dict::S('UI:History:User+')),
-					'class' => array('label' => Dict::S('Core:AttributeClass'), 'description' => Dict::S('Core:AttributeClass+')),
-					'created' => array('label' => Dict::S('UI:History:StatsCreations'), 'description' => Dict::S('UI:History:StatsCreations+')),
-					'modified' => array('label' => Dict::S('UI:History:StatsModifs'), 'description' => Dict::S('UI:History:StatsModifs+')),
-		);
-
-		if ($bLimitExceeded)
-		{
-			if ($bShowAll)
-			{
-				// Collapsible list
-				$oPage->add('<p>'.Dict::Format('UI:CountOfResults', $oBulkChanges->Count()).'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(false);">'.Dict::S('UI:CollapseList').'</a></p>');
-			}
-			else
-			{
-				// Truncated list
-				$iMinDisplayLimit = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
-				$sCollapsedLabel = Dict::Format('UI:TruncatedResults', $iMinDisplayLimit, $oBulkChanges->Count());
-				$sLinkLabel = Dict::S('UI:DisplayAll');
-				$oPage->add('<p>'.$sCollapsedLabel.'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(true);">'.$sLinkLabel.'</p>');
-
-				$oPage->add_ready_script(
-<<<EOF
-	$('#$sAjaxDivId table.listResults').addClass('truncated');
-	$('#$sAjaxDivId table.listResults tr:last td').addClass('truncated');
-EOF
-				);
-
-				
-				$sAppContext = $oAppContext->GetForLink();
-				$oPage->add_script(
-<<<EOF
-	function OnTruncatedHistoryToggle(bShowAll)
-	{
-		$('#csv_history_reload').html('<img src="../images/indicator.gif"/>');
-		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
-			{
-				$('#$sAjaxDivId').html(data);
-				var table = $('#$sAjaxDivId .listResults');
-				table.tableHover(); // hover tables
-				table.tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
-			}
-		);
-	}
-EOF
-				);
-			}
-		}
-		else
-		{
-			// Normal display - full list without any decoration
-		}
-
-		$oPage->table($aConfig, $aDetails);
-
-		if (!$bFromAjax)
-		{
-			$oPage->add('</div>');
-		}
-	}
-
-	/**
-	 * Display the details of an import
-	 * @param iTopWebPage $oPage
-	 * @param $iChange
-	 * @throws Exception
-	 */
-	static function DisplayImportHistoryDetails(iTopWebPage $oPage, $iChange)
-	{
-		if ($iChange == 0)
-		{
-			throw new Exception("Missing parameter changeid");
-		}
-		$oChange = MetaModel::GetObject('CMDBChange', $iChange, false);
-		if (is_null($oChange))
-		{
-			throw new Exception("Unknown change: $iChange");
-		}
-		$oPage->add("<div><p><h1>".Dict::Format('UI:History:BulkImportDetails', $oChange->Get('date'), $oChange->GetUserName())."</h1></p></div>\n");
-
-		// Assumption : change made one single class of objects
-		$aObjects = array();
-		$aAttributes = array(); // array of attcode => occurences
-
-		$oOpSearch = DBObjectSearch::FromOQL("SELECT CMDBChangeOp WHERE change = :change_id");
-		$oOpSet = new DBObjectSet($oOpSearch, array(), array('change_id' => $iChange));
-		while ($oOperation = $oOpSet->Fetch())
-		{
-			$sClass = $oOperation->Get('objclass');
-			$iKey = $oOperation->Get('objkey');
-			$iObjId = "$sClass::$iKey";
-			if (!isset($aObjects[$iObjId]))
-			{
-				$aObjects[$iObjId] = array();
-				$aObjects[$iObjId]['__class__'] = $sClass;
-				$aObjects[$iObjId]['__id__'] = $iKey;
-			}
-			if (get_class($oOperation) == 'CMDBChangeOpCreate')
-			{
-				$aObjects[$iObjId]['__created__'] = true;
-			}
-			elseif ($oOperation instanceof CMDBChangeOpSetAttribute)
-			{
-				$sAttCode = $oOperation->Get('attcode');
-
-				if ((get_class($oOperation) == 'CMDBChangeOpSetAttributeScalar') || (get_class($oOperation) == 'CMDBChangeOpSetAttributeURL'))
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-					if ($oAttDef->IsExternalKey())
-					{
-						$sOldValue = Dict::S('UI:UndefinedObject');
-						if ($oOperation->Get('oldvalue') != 0)
-						{
-							$oOldTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('oldvalue'));
-							$sOldValue = $oOldTarget->GetHyperlink();
-						}
-						
-						$sNewValue = Dict::S('UI:UndefinedObject');
-						if ($oOperation->Get('newvalue') != 0)
-						{
-							$oNewTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('newvalue'));
-							$sNewValue = $oNewTarget->GetHyperlink();
-						}
-					}
-					else
-					{
-						$sOldValue = $oOperation->GetAsHTML('oldvalue');
-						$sNewValue = $oOperation->GetAsHTML('newvalue');
-					}
-					$aObjects[$iObjId][$sAttCode] = $sOldValue.' -&gt; '.$sNewValue;
-				}
-				else
-				{
-					$aObjects[$iObjId][$sAttCode] = 'n/a';
-				}
-
-				if (isset($aAttributes[$sAttCode]))
-				{
-					$aAttributes[$sAttCode]++;
-				}
-				else
-				{
-					$aAttributes[$sAttCode] = 1;				
-				}
-			}
-		}
-		
-		$aDetails = array();
-		foreach($aObjects as $iUId => $aObjData)
-		{
-			$aRow = array();
-			$oObject = MetaModel::GetObject($aObjData['__class__'], $aObjData['__id__'], false);
-			if (is_null($oObject))
-			{
-				$aRow['object'] = $aObjData['__class__'].'::'.$aObjData['__id__'].' (deleted)';
-			}
-			else
-			{
-				$aRow['object'] = $oObject->GetHyperlink();
-			}
-			if (isset($aObjData['__created__']))
-			{
-				$aRow['operation'] = Dict::S('Change:ObjectCreated');
-			}
-			else
-			{
-				$aRow['operation'] = Dict::S('Change:ObjectModified');
-			}
-			foreach ($aAttributes as $sAttCode => $iOccurences)
-			{
-				if (isset($aObjData[$sAttCode]))
-				{
-					$aRow[$sAttCode] = $aObjData[$sAttCode];
-				}
-				elseif (!is_null($oObject))
-				{
-					// This is the current vaslue: $oObject->GetAsHtml($sAttCode)
-					// whereas we are displaying the value that was set at the time
-					// the object was created
-					// This requires addtional coding...let's do that later
-					$aRow[$sAttCode] = '';
-				}
-				else
-				{
-					$aRow[$sAttCode] = '';
-				}
-			}
-			$aDetails[] = $aRow;
-		}
-
-		$aConfig = array();
-		$aConfig['object'] = array('label' => MetaModel::GetName($sClass), 'description' => MetaModel::GetClassDescription($sClass));
-		$aConfig['operation'] = array('label' => Dict::S('UI:History:Changes'), 'description' => Dict::S('UI:History:Changes+'));
-		foreach ($aAttributes as $sAttCode => $iOccurences)
-		{
-			$aConfig[$sAttCode] = array('label' => MetaModel::GetLabel($sClass, $sAttCode), 'description' => MetaModel::GetDescription($sClass, $sAttCode));
-		}
-		$oPage->table($aConfig, $aDetails);
-	}	
-}
-
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Bulk change facility (common to interactive and batch usages)
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+// The BOM is added at the head of exported UTF-8 CSV data, and removed (if present) from input UTF-8 data.
+// This helps MS-Excel (Version > 2007, Windows only) in changing its interpretation of a CSV file (by default Excel reads data as ISO-8859-1 -not 100% sure!)
+define('UTF8_BOM', chr(239).chr(187).chr(191)); // 0xEF, 0xBB, 0xBF
+
+/**
+ * BulkChange
+ * Interpret a given data set and update the DB accordingly (fake mode avail.) 
+ *
+ * @package     iTopORM
+ */
+
+class BulkChangeException extends CoreException
+{
+}
+
+/**
+ * CellChangeSpec
+ * A series of classes, keeping the information about a given cell: could it be changed or not (and why)?  
+ *
+ * @package     iTopORM
+ */
+abstract class CellChangeSpec
+{
+	protected $m_proposedValue;
+	protected $m_sOql; // in case of ambiguity
+
+	public function __construct($proposedValue, $sOql = '')
+	{
+		$this->m_proposedValue = $proposedValue;
+		$this->m_sOql = $sOql;
+	}
+
+	public function GetPureValue()
+	{
+		// Todo - distinguish both values
+		return $this->m_proposedValue;
+	}
+
+	public function GetDisplayableValue()
+	{
+		return $this->m_proposedValue;
+	}
+
+	public function GetOql()
+	{
+		return $this->m_sOql;
+	}
+
+	abstract public function GetDescription();
+}
+
+
+class CellStatus_Void extends CellChangeSpec
+{
+	public function GetDescription()
+	{
+		return '';
+	}
+}
+
+class CellStatus_Modify extends CellChangeSpec
+{
+	protected $m_previousValue;
+
+	public function __construct($proposedValue, $previousValue = null)
+	{
+		// Unused (could be costly to know -see the case of reconciliation on ext keys)
+		//$this->m_previousValue = $previousValue;
+		parent::__construct($proposedValue);
+	}
+
+	public function GetDescription()
+	{
+		return Dict::S('UI:CSVReport-Value-Modified');
+	}
+
+	//public function GetPreviousValue()
+	//{
+	//	return $this->m_previousValue;
+	//}
+}
+
+class CellStatus_Issue extends CellStatus_Modify
+{
+	protected $m_sReason;
+
+	public function __construct($proposedValue, $previousValue, $sReason)
+	{
+		$this->m_sReason = $sReason;
+		parent::__construct($proposedValue, $previousValue);
+	}
+
+	public function GetDescription()
+	{
+		if (is_null($this->m_proposedValue))
+		{
+			return Dict::Format('UI:CSVReport-Value-SetIssue', $this->m_sReason);
+		}
+		return Dict::Format('UI:CSVReport-Value-ChangeIssue', $this->m_proposedValue, $this->m_sReason);
+	}
+}
+
+class CellStatus_SearchIssue extends CellStatus_Issue
+{
+	public function __construct()
+	{
+		parent::__construct(null, null, null);
+	}
+
+	public function GetDescription()
+	{
+		return Dict::S('UI:CSVReport-Value-NoMatch');
+	}
+}
+
+class CellStatus_NullIssue extends CellStatus_Issue
+{
+	public function __construct()
+	{
+		parent::__construct(null, null, null);
+	}
+
+	public function GetDescription()
+	{
+		return Dict::S('UI:CSVReport-Value-Missing');
+	}
+}
+
+
+class CellStatus_Ambiguous extends CellStatus_Issue
+{
+	protected $m_iCount;
+
+	public function __construct($previousValue, $iCount, $sOql)
+	{
+		$this->m_iCount = $iCount;
+		$this->m_sQuery = $sOql;
+		parent::__construct(null, $previousValue, '');
+	}
+
+	public function GetDescription()
+	{
+		$sCount = $this->m_iCount;
+		return Dict::Format('UI:CSVReport-Value-Ambiguous', $sCount);
+	}
+}
+
+
+/**
+ * RowStatus
+ * A series of classes, keeping the information about a given row: could it be changed or not (and why)?  
+ *
+ * @package     iTopORM
+ */
+abstract class RowStatus
+{
+	public function __construct()
+	{
+	}
+
+	abstract public function GetDescription();
+}
+
+class RowStatus_NoChange extends RowStatus
+{
+	public function GetDescription()
+	{
+		return Dict::S('UI:CSVReport-Row-Unchanged');
+	}
+}
+
+class RowStatus_NewObj extends RowStatus
+{
+	public function GetDescription()
+	{
+		return Dict::S('UI:CSVReport-Row-Created');
+	}
+}
+
+class RowStatus_Modify extends RowStatus
+{
+	protected $m_iChanged;
+
+	public function __construct($iChanged)
+	{
+		$this->m_iChanged = $iChanged;
+	}
+
+	public function GetDescription()
+	{
+		return Dict::Format('UI:CSVReport-Row-Updated', $this->m_iChanged);
+	}
+}
+
+class RowStatus_Disappeared extends RowStatus_Modify
+{
+	public function GetDescription()
+	{
+		return Dict::Format('UI:CSVReport-Row-Disappeared', $this->m_iChanged);
+	}
+}
+
+class RowStatus_Issue extends RowStatus
+{
+	protected $m_sReason;
+
+	public function __construct($sReason)
+	{
+		$this->m_sReason = $sReason;
+	}
+
+	public function GetDescription()
+	{
+		return Dict::Format('UI:CSVReport-Row-Issue', $this->m_sReason);
+	}
+}
+
+
+/**
+ * BulkChange
+ *
+ * @package iTopORM
+ */
+class BulkChange
+{
+	protected $m_sClass; 
+	protected $m_aData; // Note: hereafter, iCol maybe actually be any acceptable key (string)
+	// #@# todo: rename the variables to sColIndex
+	protected $m_aAttList; // attcode => iCol
+	protected $m_aExtKeys; // aExtKeys[sExtKeyAttCode][sExtReconcKeyAttCode] = iCol;
+	protected $m_aReconcilKeys; // attcode (attcode = 'id' for the pkey)
+	protected $m_sSynchroScope; // OQL - if specified, then the missing items will be reported
+	protected $m_aOnDisappear; // array of attcode => value, values to be set when an object gets out of scope (ignored if no scope has been defined)
+	protected $m_sDateFormat; // Date format specification, see DateTime::createFromFormat
+	protected $m_bLocalizedValues; // Values in the data set are localized (see AttributeEnum)
+	protected $m_aExtKeysMappingCache; // Cache for resolving external keys based on the given search criterias
+
+	public function __construct($sClass, $aData, $aAttList, $aExtKeys, $aReconcilKeys, $sSynchroScope = null, $aOnDisappear = null, $sDateFormat = null, $bLocalize = false)
+	{
+		$this->m_sClass = $sClass;
+		$this->m_aData = $aData;
+		$this->m_aAttList = $aAttList;
+		$this->m_aReconcilKeys = $aReconcilKeys;
+		$this->m_aExtKeys = $aExtKeys;
+		$this->m_sSynchroScope = $sSynchroScope;
+		$this->m_aOnDisappear = $aOnDisappear;
+		$this->m_sDateFormat = $sDateFormat;
+		$this->m_bLocalizedValues = $bLocalize;
+		$this->m_aExtKeysMappingCache = array();
+	}
+
+	protected $m_bReportHtml = false;
+	protected $m_sReportCsvSep = ',';
+	protected $m_sReportCsvDelimiter = '"';
+
+	public function SetReportHtml()
+	{
+		$this->m_bReportHtml = true;
+	}
+
+	public function SetReportCsv($sSeparator = ',', $sDelimiter = '"')
+	{
+		$this->m_bReportHtml = false;
+		$this->m_sReportCsvSep = $sSeparator;
+		$this->m_sReportCsvDelimiter = $sDelimiter;
+	}
+   
+	protected function ResolveExternalKey($aRowData, $sAttCode, &$aResults)
+	{
+		$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+		$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
+		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
+		{
+			if ($sForeignAttCode == 'id')
+			{
+				$value = (int) $aRowData[$iCol];
+			}
+			else
+			{
+				// The foreign attribute is one of our reconciliation key
+				$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
+				$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
+			}
+			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
+			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+		}
+
+		$oExtObjects = new CMDBObjectSet($oReconFilter);
+		$aKeys = $oExtObjects->ToArray();
+		return array($oReconFilter->ToOql(), $aKeys);
+	}
+
+	// Returns true if the CSV data specifies that the external key must be left undefined
+	protected function IsNullExternalKeySpec($aRowData, $sAttCode)
+	{
+		//$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+		foreach ($this->m_aExtKeys[$sAttCode] as $sForeignAttCode => $iCol)
+		{
+			// The foreign attribute is one of our reconciliation key
+			if (strlen($aRowData[$iCol]) > 0)
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	protected function PrepareObject(&$oTargetObj, $aRowData, &$aErrors)
+	{
+		$aResults = array();
+		$aErrors = array();
+	
+		// External keys reconciliation
+		//
+		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
+		{
+			// Skip external keys used for the reconciliation process
+			// if (!array_key_exists($sAttCode, $this->m_aAttList)) continue;
+
+			$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
+
+			if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
+			{
+				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
+				{
+					// Default reporting
+					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+				}
+				if ($oExtKey->IsNullAllowed())
+				{
+					$oTargetObj->Set($sAttCode, $oExtKey->GetNullValue());
+					$aResults[$sAttCode]= new CellStatus_Void($oExtKey->GetNullValue());
+				}
+				else
+				{
+					$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-Null');
+					$aResults[$sAttCode]= new CellStatus_Issue(null, $oTargetObj->Get($sAttCode), Dict::S('UI:CSVReport-Value-Issue-Null'));
+				}
+			}
+			else
+			{
+				$oReconFilter = new DBObjectSearch($oExtKey->GetTargetClass());
+
+				$aCacheKeys = array();
+				foreach ($aKeyConfig as $sForeignAttCode => $iCol)
+				{
+					// The foreign attribute is one of our reconciliation key
+					if ($sForeignAttCode == 'id')
+					{
+						$value = $aRowData[$iCol];
+					}
+					else
+					{
+						$oForeignAtt = MetaModel::GetAttributeDef($oExtKey->GetTargetClass(), $sForeignAttCode);
+						$value = $oForeignAtt->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
+					}
+					$aCacheKeys[] = $value;
+					$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
+					$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
+				}
+				$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
+				$iForeignKey = null;
+				$sOQL = '';
+				// TODO: check if *too long* keys can lead to collisions... and skip the cache in such a case...
+				if (!array_key_exists($sAttCode, $this->m_aExtKeysMappingCache))
+				{
+					$this->m_aExtKeysMappingCache[$sAttCode] = array();
+				}
+				if (array_key_exists($sCacheKey, $this->m_aExtKeysMappingCache[$sAttCode]))
+				{
+					// Cache hit
+					$iCount = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['c'];
+					$iForeignKey = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['k'];
+					$sOQL = $this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['oql'];
+					// Record the hit
+					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey]['h']++;
+				}
+				else
+				{
+					// Cache miss, let's initialize it
+					$oExtObjects = new CMDBObjectSet($oReconFilter);
+					$iCount = $oExtObjects->Count();
+					if ($iCount == 1)
+					{
+						$oForeignObj = $oExtObjects->Fetch();
+						$iForeignKey = $oForeignObj->GetKey();
+					}
+					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
+						'c' => $iCount,
+						'k' => $iForeignKey,
+						'oql' => $oReconFilter->ToOql(),
+						'h' => 0, // number of hits on this cache entry
+					);
+				}
+				switch($iCount)
+				{
+					case 0:
+					$aErrors[$sAttCode] = Dict::S('UI:CSVReport-Value-Issue-NotFound');
+					$aResults[$sAttCode]= new CellStatus_SearchIssue();
+					break;
+					
+					case 1:
+					// Do change the external key attribute
+					$oTargetObj->Set($sAttCode, $iForeignKey);
+					break;
+					
+					default:
+					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-FoundMany', $iCount);
+					$aResults[$sAttCode]= new CellStatus_Ambiguous($oTargetObj->Get($sAttCode), $iCount, $sOQL);
+				}
+			}
+
+			// Report
+			if (!array_key_exists($sAttCode, $aResults))
+			{
+				$iForeignObj = $oTargetObj->Get($sAttCode);
+				if (array_key_exists($sAttCode, $oTargetObj->ListChanges()))
+				{
+					if ($oTargetObj->IsNew())
+					{
+						$aResults[$sAttCode]= new CellStatus_Void($iForeignObj);
+					}
+					else
+					{
+						$aResults[$sAttCode]= new CellStatus_Modify($iForeignObj, $oTargetObj->GetOriginal($sAttCode));
+						foreach ($aKeyConfig as $sForeignAttCode => $iCol)
+						{
+							// Report the change on reconciliation values as well
+							$aResults[$iCol] = new CellStatus_Modify($aRowData[$iCol]);
+						}
+					}
+				}
+				else
+				{
+					$aResults[$sAttCode]= new CellStatus_Void($iForeignObj);
+				}
+			}
+		}
+	
+		// Set the object attributes
+		//
+		foreach ($this->m_aAttList as $sAttCode => $iCol)
+		{
+			// skip the private key, if any
+			if ($sAttCode == 'id') continue;
+
+			$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+
+			// skip reconciliation keys
+			if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ continue; }
+
+			$aReasons = array();
+			$iFlags = $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
+			if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) )
+			{
+					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Readonly', $sAttCode, $oTargetObj->Get($sAttCode), $aRowData[$iCol]);
+			}
+			else if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
+			{
+				try
+				{
+					$oSet = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
+					$oTargetObj->Set($sAttCode, $oSet);
+				}
+				catch(CoreException $e)
+				{
+					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Format', $e->getMessage());
+				}
+			}
+			else
+			{
+				$value = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
+				if (is_null($value) && (strlen($aRowData[$iCol]) > 0))
+				{
+					$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-NoMatch', $sAttCode);
+				}
+				else
+				{
+					$res = $oTargetObj->CheckValue($sAttCode, $value);
+					if ($res === true)
+					{
+						$oTargetObj->Set($sAttCode, $value);
+					}
+					else
+					{
+						// $res is a string with the error description
+						$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Unknown', $sAttCode, $res);
+					}
+				}
+			}
+		}
+	
+		// Reporting on fields
+		//
+		$aChangedFields = $oTargetObj->ListChanges();
+		foreach ($this->m_aAttList as $sAttCode => $iCol)
+		{
+			if ($sAttCode == 'id')
+			{
+				$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+			}
+			else
+			{
+				if ($this->m_bReportHtml)
+				{
+					$sCurValue = $oTargetObj->GetAsHTML($sAttCode, $this->m_bLocalizedValues);
+					$sOrigValue = $oTargetObj->GetOriginalAsHTML($sAttCode, $this->m_bLocalizedValues);
+				}
+				else
+				{
+					$sCurValue = $oTargetObj->GetAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
+					$sOrigValue = $oTargetObj->GetOriginalAsCSV($sAttCode, $this->m_sReportCsvSep, $this->m_sReportCsvDelimiter, $this->m_bLocalizedValues);
+				}
+				if (isset($aErrors[$sAttCode]))
+				{
+					$aResults[$iCol]= new CellStatus_Issue($aRowData[$iCol], $sOrigValue, $aErrors[$sAttCode]);
+				}
+				elseif (array_key_exists($sAttCode, $aChangedFields))
+				{
+					if ($oTargetObj->IsNew())
+					{
+						$aResults[$iCol]= new CellStatus_Void($sCurValue);
+					}
+					else
+					{
+						$aResults[$iCol]= new CellStatus_Modify($sCurValue, $sOrigValue);
+					}
+				}
+				else
+				{
+					// By default... nothing happens
+					$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+					if ($oAttDef instanceof AttributeDateTime)
+					{
+						$aResults[$iCol]= new CellStatus_Void($oAttDef->GetFormat()->Format($aRowData[$iCol]));
+					}
+					else
+					{
+						$aResults[$iCol]= new CellStatus_Void($aRowData[$iCol]);
+					}
+				}
+			}
+		}
+	
+		// Checks
+		//
+		$res = $oTargetObj->CheckConsistency();
+		if ($res !== true)
+		{
+			// $res contains the error description
+			$aErrors["GLOBAL"] = Dict::Format('UI:CSVReport-Row-Issue-Inconsistent', $res);
+		}
+		return $aResults;
+	}
+	
+	protected function PrepareMissingObject(&$oTargetObj, &$aErrors)
+	{
+		$aResults = array();
+		$aErrors = array();
+	
+		// External keys
+		//
+		foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
+		{
+			//$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
+			$aResults[$sAttCode]= new CellStatus_Void($oTargetObj->Get($sAttCode));
+
+			foreach ($aKeyConfig as $sForeignAttCode => $iCol)
+			{
+				$aResults[$iCol] = new CellStatus_Void('?');
+			}
+		}
+	
+		// Update attributes
+		//
+		foreach($this->m_aOnDisappear as $sAttCode => $value)
+		{
+			if (!MetaModel::IsValidAttCode(get_class($oTargetObj), $sAttCode))
+			{
+				throw new BulkChangeException('Invalid attribute code', array('class' => get_class($oTargetObj), 'attcode' => $sAttCode));
+			}
+			$oTargetObj->Set($sAttCode, $value);
+		}
+	
+		// Reporting on fields
+		//
+		$aChangedFields = $oTargetObj->ListChanges();
+		foreach ($this->m_aAttList as $sAttCode => $iCol)
+		{
+			if ($sAttCode == 'id')
+			{
+				$aResults[$iCol]= new CellStatus_Void($oTargetObj->GetKey());
+			}
+			if (array_key_exists($sAttCode, $aChangedFields))
+			{
+				$aResults[$iCol]= new CellStatus_Modify($oTargetObj->Get($sAttCode), $oTargetObj->GetOriginal($sAttCode));
+			}
+			else
+			{
+				// By default... nothing happens
+				$aResults[$iCol]= new CellStatus_Void($oTargetObj->Get($sAttCode));
+			}
+		}
+	
+		// Checks
+		//
+		$res = $oTargetObj->CheckConsistency();
+		if ($res !== true)
+		{
+			// $res contains the error description
+			$aErrors["GLOBAL"] = Dict::Format('UI:CSVReport-Row-Issue-Inconsistent', $res);
+		}
+		return $aResults;
+	}
+
+	
+	protected function CreateObject(&$aResult, $iRow, $aRowData, CMDBChange $oChange = null)
+	{
+		$oTargetObj = MetaModel::NewObject($this->m_sClass);
+
+		// Populate the cache for hierarchical keys (only if in verify mode)
+		if (is_null($oChange))
+		{
+			// 1. determine if a hierarchical key exists
+			foreach($this->m_aExtKeys as $sAttCode => $aKeyConfig)
+			{
+				$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
+				if (!$this->IsNullExternalKeySpec($aRowData, $sAttCode) && MetaModel::IsParentClass(get_class($oTargetObj), $this->m_sClass))
+				{
+					// 2. Populate the cache for further checks
+					$aCacheKeys = array();
+					foreach ($aKeyConfig as $sForeignAttCode => $iCol)
+					{
+						// The foreign attribute is one of our reconciliation key
+						if ($sForeignAttCode == 'id')
+						{
+							$value = $aRowData[$iCol];
+						}
+						else
+						{
+							if (!isset($this->m_aAttList[$sForeignAttCode]) || !isset($aRowData[$this->m_aAttList[$sForeignAttCode]]))
+							{
+								// the key is not in the import
+								break 2;
+							}
+							$value = $aRowData[$this->m_aAttList[$sForeignAttCode]];
+						}
+						$aCacheKeys[] = $value;
+					}
+					$sCacheKey = implode('_|_', $aCacheKeys); // Unique key for this query...
+					$this->m_aExtKeysMappingCache[$sAttCode][$sCacheKey] = array(
+						'c' => 1,
+						'k' => -1,
+						'oql' => '',
+						'h' => 0, // number of hits on this cache entry
+					);
+				}
+			}
+		}
+
+		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
+	
+		if (count($aErrors) > 0)
+		{
+			$sErrors = implode(', ', $aErrors);
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
+			return $oTargetObj;
+		}
+	
+		// Check that any external key will have a value proposed
+		$aMissingKeys = array();
+		foreach (MetaModel::GetExternalKeys($this->m_sClass) as $sExtKeyAttCode => $oExtKey)
+		{
+			if (!$oExtKey->IsNullAllowed())
+			{
+				if (!array_key_exists($sExtKeyAttCode, $this->m_aExtKeys) && !array_key_exists($sExtKeyAttCode, $this->m_aAttList))
+				{ 
+					$aMissingKeys[] = $oExtKey->GetLabel();
+				}
+			}
+		}
+		if (count($aMissingKeys) > 0)
+		{
+			$sMissingKeys = implode(', ', $aMissingKeys);
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-MissingExtKey', $sMissingKeys));
+			return $oTargetObj;
+		}
+	
+		// Optionaly record the results
+		//
+		if ($oChange)
+		{
+			$newID = $oTargetObj->DBInsertTrackedNoReload($oChange);
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
+			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
+			$aResult[$iRow]["id"] = new CellStatus_Void($newID);
+		}
+		else
+		{
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_NewObj();
+			$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
+			$aResult[$iRow]["id"] = new CellStatus_Void(0);
+		}
+		return $oTargetObj;
+	}
+	
+	protected function UpdateObject(&$aResult, $iRow, $oTargetObj, $aRowData, CMDBChange $oChange = null)
+	{
+		$aResult[$iRow] = $this->PrepareObject($oTargetObj, $aRowData, $aErrors);
+
+		// Reporting
+		//
+		$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
+		$aResult[$iRow]["id"] = new CellStatus_Void($oTargetObj->GetKey());
+
+		if (count($aErrors) > 0)
+		{
+			$sErrors = implode(', ', $aErrors);
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
+			return;
+		}
+	
+		$aChangedFields = $oTargetObj->ListChanges();
+		if (count($aChangedFields) > 0)
+		{
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Modify(count($aChangedFields));
+	
+			// Optionaly record the results
+			//
+			if ($oChange)
+			{
+				try
+				{
+					$oTargetObj->DBUpdateTracked($oChange);
+				}
+				catch(CoreException $e)
+				{
+					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue($e->getMessage());
+				}
+			}
+		}
+		else
+		{
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_NoChange();
+		}
+	}
+
+	protected function UpdateMissingObject(&$aResult, $iRow, $oTargetObj, CMDBChange $oChange = null)
+	{
+		$aResult[$iRow] = $this->PrepareMissingObject($oTargetObj, $aErrors);
+
+		// Reporting
+		//
+		$aResult[$iRow]["finalclass"] = get_class($oTargetObj);
+		$aResult[$iRow]["id"] = new CellStatus_Void($oTargetObj->GetKey());
+
+		if (count($aErrors) > 0)
+		{
+			$sErrors = implode(', ', $aErrors);
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Attribute'));
+			return;
+		}
+	
+		$aChangedFields = $oTargetObj->ListChanges();
+		if (count($aChangedFields) > 0)
+		{
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Disappeared(count($aChangedFields));
+
+			// Optionaly record the results
+			//
+			if ($oChange)
+			{
+				try
+				{
+					$oTargetObj->DBUpdateTracked($oChange);
+				}
+				catch(CoreException $e)
+				{
+					$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue($e->getMessage());
+				}
+			}
+		}
+		else
+		{
+			$aResult[$iRow]["__STATUS__"] = new RowStatus_Disappeared(0);
+		}
+	}
+	
+	public function Process(CMDBChange $oChange = null)
+	{
+		// Note: $oChange can be null, in which case the aim is to check what would be done
+
+		// Debug...
+		//
+		if (false)
+		{
+			echo "<pre>\n";
+			echo "Attributes:\n";
+			print_r($this->m_aAttList);
+			echo "ExtKeys:\n";
+			print_r($this->m_aExtKeys);
+			echo "Reconciliation:\n";
+			print_r($this->m_aReconcilKeys);
+			echo "Synchro scope:\n";
+			print_r($this->m_sSynchroScope);
+			echo "Synchro changes:\n";
+			print_r($this->m_aOnDisappear);
+			//echo "Data:\n";
+			//print_r($this->m_aData);
+			echo "</pre>\n";
+			exit;
+		}
+
+		$aResult = array();
+
+		if (!is_null($this->m_sDateFormat) && (strlen($this->m_sDateFormat) > 0))
+		{
+			$sDateTimeFormat = $this->m_sDateFormat; // the specified format is actually the date AND time format
+			$oDateTimeFormat = new DateTimeFormat($sDateTimeFormat);
+			$sDateFormat = $oDateTimeFormat->ToDateFormat();
+			AttributeDateTime::SetFormat($oDateTimeFormat);
+			AttributeDate::SetFormat(new DateTimeFormat($sDateFormat));
+			// Translate dates from the source data
+			//
+			foreach ($this->m_aAttList as $sAttCode => $iCol)
+			{
+				if ($sAttCode == 'id') continue;
+				
+				$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+				if ($oAttDef instanceof AttributeDateTime) // AttributeDate is derived from AttributeDateTime
+				{
+					foreach($this->m_aData as $iRow => $aRowData)
+					{
+						$sFormat = $sDateTimeFormat;
+						$sValue = $this->m_aData[$iRow][$iCol];
+						if (!empty($sValue))
+						{
+							if ($oAttDef instanceof AttributeDate)
+							{
+								$sFormat = $sDateFormat;
+							}
+							$oFormat = new DateTimeFormat($sFormat);
+							$sRegExp = $oFormat->ToRegExpr('/');
+							if (!preg_match($sRegExp, $this->m_aData[$iRow][$iCol]))
+							{
+								$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+							}
+							else
+							{
+								$oDate = DateTime::createFromFormat($sFormat, $this->m_aData[$iRow][$iCol]);
+								if ($oDate !== false)
+								{
+									$sNewDate = $oDate->format($oAttDef->GetInternalFormat());
+									$this->m_aData[$iRow][$iCol] = $sNewDate;
+								}
+								else
+								{
+									// Leave the cell unchanged
+									$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+									$aResult[$iRow][$sAttCode] = new CellStatus_Issue(null, $this->m_aData[$iRow][$iCol], Dict::S('UI:CSVReport-Row-Issue-DateFormat'));
+								}
+							}
+						}
+						else
+						{
+							$this->m_aData[$iRow][$iCol] = '';
+						}
+					}
+				}
+			}
+		}
+
+		// Compute the results
+		//
+		if (!is_null($this->m_sSynchroScope))
+		{
+			$aVisited = array();
+		}
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		foreach($this->m_aData as $iRow => $aRowData)
+		{
+			set_time_limit($iLoopTimeLimit);
+			if (isset($aResult[$iRow]["__STATUS__"]))
+			{
+				// An issue at the earlier steps - skip the rest
+				continue;
+			}
+			try
+			{
+				$oReconciliationFilter = new DBObjectSearch($this->m_sClass);
+				$bSkipQuery = false;
+				foreach($this->m_aReconcilKeys as $sAttCode)
+				{
+					$valuecondition = null;
+					if (array_key_exists($sAttCode, $this->m_aExtKeys))
+					{
+						if ($this->IsNullExternalKeySpec($aRowData, $sAttCode))
+						{
+							$oExtKey = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+							if ($oExtKey->IsNullAllowed())
+							{
+								$valuecondition = $oExtKey->GetNullValue();
+								$aResult[$iRow][$sAttCode] = new CellStatus_Void($oExtKey->GetNullValue());
+							}
+							else
+							{
+								$aResult[$iRow][$sAttCode] = new CellStatus_NullIssue();
+							}
+						}
+						else
+						{
+							// The value has to be found or verified
+							list($sQuery, $aMatches) = $this->ResolveExternalKey($aRowData, $sAttCode, $aResult[$iRow]);
+		
+							if (count($aMatches) == 1)
+							{
+								$oRemoteObj = reset($aMatches); // first item
+								$valuecondition = $oRemoteObj->GetKey();
+								$aResult[$iRow][$sAttCode] = new CellStatus_Void($oRemoteObj->GetKey());
+							} 					
+							elseif (count($aMatches) == 0)
+							{
+								$aResult[$iRow][$sAttCode] = new CellStatus_SearchIssue();
+							} 					
+							else
+							{
+								$aResult[$iRow][$sAttCode] = new CellStatus_Ambiguous(null, count($aMatches), $sQuery);
+							}
+						} 					
+					}
+					else
+					{
+						// The value is given in the data row
+						$iCol = $this->m_aAttList[$sAttCode];
+						if ($sAttCode == 'id')
+						{
+							$valuecondition = $aRowData[$iCol];
+						}
+						else
+						{
+							$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+							$valuecondition = $oAttDef->MakeValueFromString($aRowData[$iCol], $this->m_bLocalizedValues);
+						}
+					}
+					if (is_null($valuecondition))
+					{
+						$bSkipQuery = true;
+					}
+					else
+					{
+						$oReconciliationFilter->AddCondition($sAttCode, $valuecondition, '=');
+					}
+				}
+				if ($bSkipQuery)
+				{
+					$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Reconciliation'));
+				}
+				else
+				{
+					$oReconciliationSet = new CMDBObjectSet($oReconciliationFilter);
+					switch($oReconciliationSet->Count())
+					{
+					case 0:
+						$oTargetObj = $this->CreateObject($aResult, $iRow, $aRowData, $oChange);
+						// $aResult[$iRow]["__STATUS__"]=> set in CreateObject
+						$aVisited[] = $oTargetObj->GetKey();
+						break;
+					case 1:
+						$oTargetObj = $oReconciliationSet->Fetch();
+						$this->UpdateObject($aResult, $iRow, $oTargetObj, $aRowData, $oChange);
+						// $aResult[$iRow]["__STATUS__"]=> set in UpdateObject
+						if (!is_null($this->m_sSynchroScope))
+						{
+							$aVisited[] = $oTargetObj->GetKey();
+						}
+						break;
+					default:
+						// Found several matches, ambiguous
+						$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::S('UI:CSVReport-Row-Issue-Ambiguous'));
+						$aResult[$iRow]["id"]= new CellStatus_Ambiguous(0, $oReconciliationSet->Count(), $oReconciliationFilter->ToOql());
+						$aResult[$iRow]["finalclass"]= 'n/a';
+					}
+				}
+			}
+			catch (Exception $e)
+			{
+				$aResult[$iRow]["__STATUS__"]= new RowStatus_Issue(Dict::Format('UI:CSVReport-Row-Issue-Internal', get_class($e), $e->getMessage()));
+			}
+		}
+
+		if (!is_null($this->m_sSynchroScope))
+		{
+			// Compute the delta between the scope and visited objects
+			$oScopeSearch = DBObjectSearch::FromOQL($this->m_sSynchroScope);
+			$oScopeSet = new DBObjectSet($oScopeSearch);
+			while ($oObj = $oScopeSet->Fetch())
+			{
+				$iObj = $oObj->GetKey();
+				if (!in_array($iObj, $aVisited))
+				{
+					set_time_limit($iLoopTimeLimit);
+					$iRow++;
+					$this->UpdateMissingObject($aResult, $iRow, $oObj, $oChange);
+				}
+			}
+		}
+		set_time_limit($iPreviousTimeLimit);
+
+		// Fill in the blanks - the result matrix is expected to be 100% complete
+		//
+		foreach($this->m_aData as $iRow => $aRowData)
+		{
+			foreach($this->m_aAttList as $iCol)
+			{
+				if (!array_key_exists($iCol, $aResult[$iRow]))
+				{
+					$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
+				}
+			}
+			foreach($this->m_aExtKeys as $sAttCode => $aForeignAtts)
+			{
+				if (!array_key_exists($sAttCode, $aResult[$iRow]))
+				{
+					$aResult[$iRow][$sAttCode] = new CellStatus_Void('n/a');
+				}
+				foreach ($aForeignAtts as $sForeignAttCode => $iCol)
+				{
+					if (!array_key_exists($iCol, $aResult[$iRow]))
+					{
+						// The foreign attribute is one of our reconciliation key
+						$aResult[$iRow][$iCol] = new CellStatus_Void($aRowData[$iCol]);
+					}
+				}
+			}
+		}
+
+		return $aResult;
+	}
+
+	/**
+	 * Display the history of bulk imports
+	 */
+	static function DisplayImportHistory(WebPage $oPage, $bFromAjax = false, $bShowAll = false)
+	{
+		$sAjaxDivId = "CSVImportHistory";
+		if (!$bFromAjax)
+		{
+			$oPage->add('<div id="'.$sAjaxDivId.'">');
+		}
+
+		$oPage->p(Dict::S('UI:History:BulkImports+').' <span id="csv_history_reload"></span>');
+
+		$oBulkChangeSearch = DBObjectSearch::FromOQL("SELECT CMDBChange WHERE origin IN ('csv-interactive', 'csv-import.php')");
+
+		$iQueryLimit = $bShowAll ? 0 : appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
+		$oBulkChanges = new DBObjectSet($oBulkChangeSearch, array('date' => false), array(), null, $iQueryLimit);
+
+		$oAppContext = new ApplicationContext();
+
+		$bLimitExceeded = false;
+		if ($oBulkChanges->Count() > (appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit())))
+		{
+			$bLimitExceeded = true;
+			if (!$bShowAll)
+			{
+				$iMaxObjects = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
+				$oBulkChanges->SetLimit($iMaxObjects);
+			}
+		}
+		$oBulkChanges->Seek(0);
+	
+		$aDetails = array();
+		while ($oChange = $oBulkChanges->Fetch())
+		{
+			$sDate = '<a href="csvimport.php?step=10&changeid='.$oChange->GetKey().'&'.$oAppContext->GetForLink().'">'.$oChange->Get('date').'</a>';
+			$sUser = $oChange->GetUserName();
+			if (preg_match('/^(.*)\\(CSV\\)$/i', $oChange->Get('userinfo'), $aMatches))
+			{
+				$sUser = $aMatches[1];
+			}
+			else
+			{
+				$sUser = $oChange->Get('userinfo');
+			}
+
+			$oOpSearch = DBObjectSearch::FromOQL("SELECT CMDBChangeOpCreate WHERE change = :change_id");
+			$oOpSet = new DBObjectSet($oOpSearch, array(), array('change_id' => $oChange->GetKey()));
+			$iCreated = $oOpSet->Count();
+
+			// Get the class from the first item found (assumption: a CSV load is done for a single class)
+			if ($oCreateOp = $oOpSet->Fetch())
+			{
+				$sClass = $oCreateOp->Get('objclass');
+			}
+
+			$oOpSearch = DBObjectSearch::FromOQL("SELECT CMDBChangeOpSetAttribute WHERE change = :change_id");
+			$oOpSet = new DBObjectSet($oOpSearch, array(), array('change_id' => $oChange->GetKey()));
+
+			$aModified = array();
+			$aAttList = array();
+			while ($oModified = $oOpSet->Fetch())
+			{
+				// Get the class (if not done earlier on object creation)
+				$sClass = $oModified->Get('objclass');
+				$iKey = $oModified->Get('objkey');
+				$sAttCode = $oModified->Get('attcode');
+
+				$aAttList[$sClass][$sAttCode] = true;
+				$aModified["$sClass::$iKey"] = true;
+			}
+			$iModified = count($aModified);
+
+			// Assumption: there is only one class of objects being loaded
+			// Then the last class found gives us the class for every object
+			if ( ($iModified > 0) || ($iCreated > 0))
+			{
+				$aDetails[] = array('date' => $sDate, 'user' => $sUser, 'class' => $sClass, 'created' => $iCreated, 'modified' => $iModified);
+			}
+		}
+
+		$aConfig = array( 'date' => array('label' => Dict::S('UI:History:Date'), 'description' => Dict::S('UI:History:Date+')),
+					'user' => array('label' => Dict::S('UI:History:User'), 'description' => Dict::S('UI:History:User+')),
+					'class' => array('label' => Dict::S('Core:AttributeClass'), 'description' => Dict::S('Core:AttributeClass+')),
+					'created' => array('label' => Dict::S('UI:History:StatsCreations'), 'description' => Dict::S('UI:History:StatsCreations+')),
+					'modified' => array('label' => Dict::S('UI:History:StatsModifs'), 'description' => Dict::S('UI:History:StatsModifs+')),
+		);
+
+		if ($bLimitExceeded)
+		{
+			if ($bShowAll)
+			{
+				// Collapsible list
+				$oPage->add('<p>'.Dict::Format('UI:CountOfResults', $oBulkChanges->Count()).'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(false);">'.Dict::S('UI:CollapseList').'</a></p>');
+			}
+			else
+			{
+				// Truncated list
+				$iMinDisplayLimit = appUserPreferences::GetPref('default_page_size', MetaModel::GetConfig()->GetMinDisplayLimit());
+				$sCollapsedLabel = Dict::Format('UI:TruncatedResults', $iMinDisplayLimit, $oBulkChanges->Count());
+				$sLinkLabel = Dict::S('UI:DisplayAll');
+				$oPage->add('<p>'.$sCollapsedLabel.'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(true);">'.$sLinkLabel.'</p>');
+
+				$oPage->add_ready_script(
+<<<EOF
+	$('#$sAjaxDivId table.listResults').addClass('truncated');
+	$('#$sAjaxDivId table.listResults tr:last td').addClass('truncated');
+EOF
+				);
+
+				
+				$sAppContext = $oAppContext->GetForLink();
+				$oPage->add_script(
+<<<EOF
+	function OnTruncatedHistoryToggle(bShowAll)
+	{
+		$('#csv_history_reload').html('<img src="../images/indicator.gif"/>');
+		$.get(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?{$sAppContext}', {operation: 'displayCSVHistory', showall: bShowAll}, function(data)
+			{
+				$('#$sAjaxDivId').html(data);
+				var table = $('#$sAjaxDivId .listResults');
+				table.tableHover(); // hover tables
+				table.tablesorter( { widgets: ['myZebra', 'truncatedList']} ); // sortable and zebra tables
+			}
+		);
+	}
+EOF
+				);
+			}
+		}
+		else
+		{
+			// Normal display - full list without any decoration
+		}
+
+		$oPage->table($aConfig, $aDetails);
+
+		if (!$bFromAjax)
+		{
+			$oPage->add('</div>');
+		}
+	}
+
+	/**
+	 * Display the details of an import
+	 * @param iTopWebPage $oPage
+	 * @param $iChange
+	 * @throws Exception
+	 */
+	static function DisplayImportHistoryDetails(iTopWebPage $oPage, $iChange)
+	{
+		if ($iChange == 0)
+		{
+			throw new Exception("Missing parameter changeid");
+		}
+		$oChange = MetaModel::GetObject('CMDBChange', $iChange, false);
+		if (is_null($oChange))
+		{
+			throw new Exception("Unknown change: $iChange");
+		}
+		$oPage->add("<div><p><h1>".Dict::Format('UI:History:BulkImportDetails', $oChange->Get('date'), $oChange->GetUserName())."</h1></p></div>\n");
+
+		// Assumption : change made one single class of objects
+		$aObjects = array();
+		$aAttributes = array(); // array of attcode => occurences
+
+		$oOpSearch = DBObjectSearch::FromOQL("SELECT CMDBChangeOp WHERE change = :change_id");
+		$oOpSet = new DBObjectSet($oOpSearch, array(), array('change_id' => $iChange));
+		while ($oOperation = $oOpSet->Fetch())
+		{
+			$sClass = $oOperation->Get('objclass');
+			$iKey = $oOperation->Get('objkey');
+			$iObjId = "$sClass::$iKey";
+			if (!isset($aObjects[$iObjId]))
+			{
+				$aObjects[$iObjId] = array();
+				$aObjects[$iObjId]['__class__'] = $sClass;
+				$aObjects[$iObjId]['__id__'] = $iKey;
+			}
+			if (get_class($oOperation) == 'CMDBChangeOpCreate')
+			{
+				$aObjects[$iObjId]['__created__'] = true;
+			}
+			elseif ($oOperation instanceof CMDBChangeOpSetAttribute)
+			{
+				$sAttCode = $oOperation->Get('attcode');
+
+				if ((get_class($oOperation) == 'CMDBChangeOpSetAttributeScalar') || (get_class($oOperation) == 'CMDBChangeOpSetAttributeURL'))
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+					if ($oAttDef->IsExternalKey())
+					{
+						$sOldValue = Dict::S('UI:UndefinedObject');
+						if ($oOperation->Get('oldvalue') != 0)
+						{
+							$oOldTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('oldvalue'));
+							$sOldValue = $oOldTarget->GetHyperlink();
+						}
+						
+						$sNewValue = Dict::S('UI:UndefinedObject');
+						if ($oOperation->Get('newvalue') != 0)
+						{
+							$oNewTarget = MetaModel::GetObject($oAttDef->GetTargetClass(), $oOperation->Get('newvalue'));
+							$sNewValue = $oNewTarget->GetHyperlink();
+						}
+					}
+					else
+					{
+						$sOldValue = $oOperation->GetAsHTML('oldvalue');
+						$sNewValue = $oOperation->GetAsHTML('newvalue');
+					}
+					$aObjects[$iObjId][$sAttCode] = $sOldValue.' -&gt; '.$sNewValue;
+				}
+				else
+				{
+					$aObjects[$iObjId][$sAttCode] = 'n/a';
+				}
+
+				if (isset($aAttributes[$sAttCode]))
+				{
+					$aAttributes[$sAttCode]++;
+				}
+				else
+				{
+					$aAttributes[$sAttCode] = 1;				
+				}
+			}
+		}
+		
+		$aDetails = array();
+		foreach($aObjects as $iUId => $aObjData)
+		{
+			$aRow = array();
+			$oObject = MetaModel::GetObject($aObjData['__class__'], $aObjData['__id__'], false);
+			if (is_null($oObject))
+			{
+				$aRow['object'] = $aObjData['__class__'].'::'.$aObjData['__id__'].' (deleted)';
+			}
+			else
+			{
+				$aRow['object'] = $oObject->GetHyperlink();
+			}
+			if (isset($aObjData['__created__']))
+			{
+				$aRow['operation'] = Dict::S('Change:ObjectCreated');
+			}
+			else
+			{
+				$aRow['operation'] = Dict::S('Change:ObjectModified');
+			}
+			foreach ($aAttributes as $sAttCode => $iOccurences)
+			{
+				if (isset($aObjData[$sAttCode]))
+				{
+					$aRow[$sAttCode] = $aObjData[$sAttCode];
+				}
+				elseif (!is_null($oObject))
+				{
+					// This is the current vaslue: $oObject->GetAsHtml($sAttCode)
+					// whereas we are displaying the value that was set at the time
+					// the object was created
+					// This requires addtional coding...let's do that later
+					$aRow[$sAttCode] = '';
+				}
+				else
+				{
+					$aRow[$sAttCode] = '';
+				}
+			}
+			$aDetails[] = $aRow;
+		}
+
+		$aConfig = array();
+		$aConfig['object'] = array('label' => MetaModel::GetName($sClass), 'description' => MetaModel::GetClassDescription($sClass));
+		$aConfig['operation'] = array('label' => Dict::S('UI:History:Changes'), 'description' => Dict::S('UI:History:Changes+'));
+		foreach ($aAttributes as $sAttCode => $iOccurences)
+		{
+			$aConfig[$sAttCode] = array('label' => MetaModel::GetLabel($sClass, $sAttCode), 'description' => MetaModel::GetDescription($sClass, $sAttCode));
+		}
+		$oPage->table($aConfig, $aDetails);
+	}	
+}
+
diff --git a/core/cmdbchange.class.inc.php b/core/cmdbchange.class.inc.php
index 7304db99c..e0e9dfc65 100644
--- a/core/cmdbchange.class.inc.php
+++ b/core/cmdbchange.class.inc.php
@@ -1,87 +1,87 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class (internal) cmdbChange
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A change as requested/validated at once by user, may groups many atomic changes 
- *
- * @package     iTopORM
- */
-class CMDBChange extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "date",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_change",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			'indexes' => array(
-				array('origin'),
-			)
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum('interactive,csv-interactive,csv-import.php,webservice-soap,webservice-rest,synchro-data-source,email-processing,custom-extension'), "sql"=>"origin", "default_value"=>"interactive", "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	// Helper to keep track of the author of a given change,
-	// taking into account a variety of cases (contact attached or not, impersonation)
-	static public function GetCurrentUserName()
-	{
-		if (UserRights::IsImpersonated())
-		{
-			$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUserFriendlyName(), UserRights::GetUserFriendlyName());
-		}
-		else
-		{
-			$sUserString = UserRights::GetUserFriendlyName();
-		}
-		return $sUserString;
-	}
-
-	public function GetUserName()
-	{
-		if (preg_match('/^(.*)\\(CSV\\)$/i', $this->Get('userinfo'), $aMatches))
-		{
-			$sUser = $aMatches[1];
-		}
-		else
-		{
-			$sUser = $this->Get('userinfo');
-		}
-		return $sUser;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class (internal) cmdbChange
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A change as requested/validated at once by user, may groups many atomic changes 
+ *
+ * @package     iTopORM
+ */
+class CMDBChange extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "date",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_change",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			'indexes' => array(
+				array('origin'),
+			)
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("origin", array("allowed_values"=>new ValueSetEnum('interactive,csv-interactive,csv-import.php,webservice-soap,webservice-rest,synchro-data-source,email-processing,custom-extension'), "sql"=>"origin", "default_value"=>"interactive", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	// Helper to keep track of the author of a given change,
+	// taking into account a variety of cases (contact attached or not, impersonation)
+	static public function GetCurrentUserName()
+	{
+		if (UserRights::IsImpersonated())
+		{
+			$sUserString = Dict::Format('UI:Archive_User_OnBehalfOf_User', UserRights::GetRealUserFriendlyName(), UserRights::GetUserFriendlyName());
+		}
+		else
+		{
+			$sUserString = UserRights::GetUserFriendlyName();
+		}
+		return $sUserString;
+	}
+
+	public function GetUserName()
+	{
+		if (preg_match('/^(.*)\\(CSV\\)$/i', $this->Get('userinfo'), $aMatches))
+		{
+			$sUser = $aMatches[1];
+		}
+		else
+		{
+			$sUser = $this->Get('userinfo');
+		}
+		return $sUser;
+	}
+}
+
+?>
diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php
index f6145083d..3588dd931 100644
--- a/core/cmdbchangeop.class.inc.php
+++ b/core/cmdbchangeop.class.inc.php
@@ -1,1042 +1,1042 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent classes (internal) : cmdbChangeOp and derived
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * Various atomic change operations, to be tracked 
- *
- * @package     iTopORM
- */
-
-class CMDBChangeOp extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "optype",
-			'indexes' => array(
-				array('objclass', 'objkey'),
-			)
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("change", array("allowed_values"=>null, "sql"=>"changeid", "targetclass"=>"CMDBChange", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("date", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"date")));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("userinfo", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"userinfo")));
-		MetaModel::Init_AddAttribute(new AttributeString("objclass", array("allowed_values"=>null, "sql"=>"objclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeObjectKey("objkey", array("allowed_values"=>null, "class_attcode"=>"objclass", "sql"=>"objkey", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_SetZListItems('details', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details
-	}
-
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		return '';
-	}
-
-	/**
-	 * Safety net: in case the change is not given, let's guarantee that it will
-	 * be set to the current ongoing change (or create a new one)	
-	 */	
-	protected function OnInsert()
-	{
-		if ($this->Get('change') <= 0)
-		{
-			$this->Set('change', CMDBObject::GetCurrentChange());
-		}
-		parent::OnInsert();
-	}
-}
-
-
-
-/**
- * Record the creation of an object  
- *
- * @package     iTopORM
- */
-class CMDBChangeOpCreate extends CMDBChangeOp
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_create",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		return Dict::S('Change:ObjectCreated');
-	}
-}
-
-
-/**
- * Record the deletion of an object 
- *
- * @package     iTopORM
- */
-class CMDBChangeOpDelete extends CMDBChangeOp
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_delete",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Final class of the object (objclass must be set to the root class for efficiency purposes)
-		MetaModel::Init_AddAttribute(new AttributeString("fclass", array("allowed_values"=>null, "sql"=>"fclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		// Last friendly name of the object
-		MetaModel::Init_AddAttribute(new AttributeString("fname", array("allowed_values"=>null, "sql"=>"fname", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		return Dict::S('Change:ObjectDeleted');
-	}
-}
-
-
-/**
- * Record the modification of an attribute (abstract)
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttribute extends CMDBChangeOp
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-}
-
-/**
- * Record the modification of a scalar attribute 
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_scalar",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
-
-			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-			$sAttName = $oAttDef->GetLabel();
-			$sNewValue = $this->Get('newvalue');
-			$sOldValue = $this->Get('oldvalue');
-			$sResult = $oAttDef->DescribeChangeAsHTML($sOldValue, $sNewValue);
-		}
-		return $sResult;
-	}
-}
-/**
- * Record the modification of an URL 
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_url",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeURL("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeURL("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
-
-			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-			$sAttName = $oAttDef->GetLabel();
-			$sNewValue = $this->Get('newvalue');
-			$sOldValue = $this->Get('oldvalue');
-			$sResult = $oAttDef->DescribeChangeAsHTML($sOldValue, $sNewValue);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Record the modification of a blob
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_data",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeBlob("prevdata", array("depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$oPrevDoc = $this->Get('prevdata');
-			if ($oPrevDoc->IsEmpty())
-			{
-				$sPrevious = '';
-				$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevious);
-			}
-			else
-			{
-				$sDocView = $oPrevDoc->GetAsHtml();
-				$sDocView .= "<br/>".Dict::Format('UI:OpenDocumentInNewWindow_', $oPrevDoc->GetDisplayLink(get_class($this), $this->GetKey(), 'prevdata')).", \n";
-				$sDocView .= Dict::Format('UI:DownloadDocument_', $oPrevDoc->GetDownloadLink(get_class($this), $this->GetKey(), 'prevdata'))."\n";
-				//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
-				$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sDocView);
-			}
-		}
-		return $sResult;
-	}
-}
-/**
- * Safely record the modification of one way encrypted password
- */
-class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_pwd",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("prev_pwd", array("sql" => 'data', "default_value" => '', "is_null_allowed"=> true, "allowed_values" => null, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$sResult = Dict::Format('Change:AttName_Changed', $sAttName);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Safely record the modification of an encrypted field
- */
-class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_encrypted",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeEncryptedString("prevstring", array("sql" => 'data', "default_value" => '', "is_null_allowed"=> true, "allowed_values" => null, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$sPrevString = $this->Get('prevstring');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevString);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Record the modification of a multiline string (text)
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_text",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$sTextView = '<div>'.$this->GetAsHtml('prevdata').'</div>';
-
-			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Record the modification of a multiline string (text)
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeLongText extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_longtext",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeLongText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$sTextView = '<div>'.$this->GetAsHtml('prevdata').'</div>';
-
-			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Record the modification of a multiline string (text) containing some HTML markup
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeHTML extends CMDBChangeOpSetAttributeLongText
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_html",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */
-	public function GetDescription()
-	{
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-	
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$sTextView = '<div class="history_entry history_entry_truncated"><div class="history_html_content">'.$this->Get('prevdata').'</div></div>';
-	
-			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
-			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
-		}
-		return $sResult;
-	}	
-}
-
-/**
- * Record the modification of a caselog (text)
- * since the caselog itself stores the history
- * of its entries, there is no need to duplicate
- * the text here
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_log",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeInteger("lastentry", array("allowed_values"=>null, "sql"=>"lastentry", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-			}
-			else
-			{
-				// The attribute was renamed or removed from the object ?
-				$sAttName = $this->Get('attcode');
-			}
-			$oObj = $oMonoObjectSet->Fetch();
-			$oCaseLog = $oObj->Get($this->Get('attcode'));
-			$iMaxVisibleLength = MetaModel::getConfig()->Get('max_history_case_log_entry_length', 0);
-			$sTextEntry = '<div class="history_entry history_entry_truncated"><div class="history_html_content">'.$oCaseLog->GetEntryAt($this->Get('lastentry')).'</div></div>';
-
-			$sResult = Dict::Format('Change:AttName_EntryAdded', $sAttName, $sTextEntry);
-		}
-		return $sResult;
-	}
-	
-	protected function ToHtml($sRawText)
-	{
-		return str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sRawText, ENT_QUOTES, 'UTF-8'));
-	}
-}
-
-/**
- * Record an action made by a plug-in  
- *
- * @package     iTopORM
- */
-class CMDBChangeOpPlugin extends CMDBChangeOp
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_plugin",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
-		/* May be used later when implementing an extension mechanism that will allow the plug-ins to store some extra information and still degrades gracefully when the plug-in is desinstalled
-		MetaModel::Init_AddAttribute(new AttributeString("extension_class", array("allowed_values"=>null, "sql"=>"extension_class", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("extension_id", array("allowed_values"=>null, "sql"=>"extension_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		*/
-		MetaModel::Init_InheritAttributes();
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		return $this->Get('description');
-	}
-}
-
-/**
- * Record added/removed objects from within a link set 
- *
- * @package     iTopORM
- */
-abstract class CMDBChangeOpSetAttributeLinks extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_links",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Note: item class/id points to the link class itself in case of a direct link set (e.g. Server::interface_list => Interface)
-		//       item class/id points to the remote class in case of a indirect link set (e.g. Server::contract_list => Contract)
-		MetaModel::Init_AddAttribute(new AttributeString("item_class", array("allowed_values"=>null, "sql"=>"item_class", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("item_id", array("allowed_values"=>null, "sql"=>"item_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-}
-
-/**
- * Record added/removed objects from within a link set 
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeLinksAddRemove extends CMDBChangeOpSetAttributeLinks
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_links_addremove",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('added,removed'), "sql"=>"type", "default_value"=>"added", "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
-
-			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-			$sAttName = $oAttDef->GetLabel();
-
-			$sItemDesc = MetaModel::GetHyperLink($this->Get('item_class'), $this->Get('item_id'));
-
-			$sResult = $sAttName.' - ';
-			switch ($this->Get('type'))
-			{
-			case 'added':
-				$sResult .= Dict::Format('Change:LinkSet:Added', $sItemDesc);
-				break;
-
-			case 'removed':
-				$sResult .= Dict::Format('Change:LinkSet:Removed', $sItemDesc);
-				break;
-			}
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Record attribute changes from within a link set
- * A single record redirects to the modifications made within the same change  
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_links_tune",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("link_id", array("allowed_values"=>null, "sql"=>"link_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		$sResult = '';
-		$oTargetObjectClass = $this->Get('objclass');
-		$oTargetObjectKey = $this->Get('objkey');
-		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-		{
-			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
-
-			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-			$sAttName = $oAttDef->GetLabel();
-
-			$sLinkClass = $oAttDef->GetLinkedClass();
-			$aLinkClasses = MetaModel::EnumChildClasses($sLinkClass, ENUM_CHILD_CLASSES_ALL);
-
-			// Search for changes on the corresponding link
-			//
-			$oSearch = new DBObjectSearch('CMDBChangeOpSetAttribute');
-			$oSearch->AddCondition('change', $this->Get('change'), '=');
-			$oSearch->AddCondition('objkey', $this->Get('link_id'), '=');
-			if (count($aLinkClasses) == 1)
-			{
-				// Faster than the whole building of the expression below for just one value ??
-				$oSearch->AddCondition('objclass', $sLinkClass, '=');
-			}
-			else
-			{
-				$oField = new FieldExpression('objclass',  $oSearch->GetClassAlias());
-				$sListExpr = '('.implode(', ', CMDBSource::Quote($aLinkClasses)).')';
-				$sOQLCondition = $oField->Render()." IN $sListExpr";
-				$oNewCondition = Expression::FromOQL($sOQLCondition);
-				$oSearch->AddConditionExpression($oNewCondition);
-			}
-			$oSet = new DBObjectSet($oSearch);
-			$aChanges = array();
-			while ($oChangeOp = $oSet->Fetch())
-			{
-				$aChanges[] = $oChangeOp->GetDescription();
-			}
-			if (count($aChanges) == 0)
-			{
-				return '';
-			}
-
-			$sItemDesc = MetaModel::GetHyperLink($this->Get('item_class'), $this->Get('item_id'));
-
-			$sResult = $sAttName.' - ';
-			$sResult .= Dict::Format('Change:LinkSet:Modified', $sItemDesc);
-			$sResult .= ' : '.implode(', ', $aChanges);
-		}
-		return $sResult;
-	}
-}
-
-/**
- * Record the modification of custom fields
- *
- * @package     iTopORM
- */
-class CMDBChangeOpSetAttributeCustomFields extends CMDBChangeOpSetAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_setatt_custfields",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeLongText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
-	}
-
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */
-	public function GetDescription()
-	{
-		$sResult = '';
-		if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
-		{
-			$oTargetObjectClass = $this->Get('objclass');
-			$oTargetObjectKey = $this->Get('objkey');
-			$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
-			$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
-
-			$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-			if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
-			{
-				$aValues = json_decode($this->Get('prevdata'), true);
-				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
-				$sAttName = $oAttDef->GetLabel();
-
-				try
-				{
-					$oHandler = $oAttDef->GetHandler($aValues);
-					$sValueDesc = $oHandler->GetAsHTML($aValues);
-				}
-				catch (Exception $e)
-				{
-					$sValueDesc = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
-				}
-				$sTextView = '<div>'.$sValueDesc.'</div>';
-
-				$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
-			}
-		}
-		return $sResult;
-	}
-}
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent classes (internal) : cmdbChangeOp and derived
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * Various atomic change operations, to be tracked 
+ *
+ * @package     iTopORM
+ */
+
+class CMDBChangeOp extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "optype",
+			'indexes' => array(
+				array('objclass', 'objkey'),
+			)
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("change", array("allowed_values"=>null, "sql"=>"changeid", "targetclass"=>"CMDBChange", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("date", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"date")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("userinfo", array("allowed_values"=>null, "extkey_attcode"=>"change", "target_attcode"=>"userinfo")));
+		MetaModel::Init_AddAttribute(new AttributeString("objclass", array("allowed_values"=>null, "sql"=>"objclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeObjectKey("objkey", array("allowed_values"=>null, "class_attcode"=>"objclass", "sql"=>"objkey", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_SetZListItems('details', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('change', 'date', 'userinfo')); // Attributes to be displayed for the complete details
+	}
+
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		return '';
+	}
+
+	/**
+	 * Safety net: in case the change is not given, let's guarantee that it will
+	 * be set to the current ongoing change (or create a new one)	
+	 */	
+	protected function OnInsert()
+	{
+		if ($this->Get('change') <= 0)
+		{
+			$this->Set('change', CMDBObject::GetCurrentChange());
+		}
+		parent::OnInsert();
+	}
+}
+
+
+
+/**
+ * Record the creation of an object  
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpCreate extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_create",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		return Dict::S('Change:ObjectCreated');
+	}
+}
+
+
+/**
+ * Record the deletion of an object 
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpDelete extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_delete",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Final class of the object (objclass must be set to the root class for efficiency purposes)
+		MetaModel::Init_AddAttribute(new AttributeString("fclass", array("allowed_values"=>null, "sql"=>"fclass", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		// Last friendly name of the object
+		MetaModel::Init_AddAttribute(new AttributeString("fname", array("allowed_values"=>null, "sql"=>"fname", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		return Dict::S('Change:ObjectDeleted');
+	}
+}
+
+
+/**
+ * Record the modification of an attribute (abstract)
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttribute extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+}
+
+/**
+ * Record the modification of a scalar attribute 
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeScalar extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_scalar",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
+
+			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+			$sAttName = $oAttDef->GetLabel();
+			$sNewValue = $this->Get('newvalue');
+			$sOldValue = $this->Get('oldvalue');
+			$sResult = $oAttDef->DescribeChangeAsHTML($sOldValue, $sNewValue);
+		}
+		return $sResult;
+	}
+}
+/**
+ * Record the modification of an URL 
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeURL extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_url",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeURL("oldvalue", array("allowed_values"=>null, "sql"=>"oldvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeURL("newvalue", array("allowed_values"=>null, "sql"=>"newvalue", "target" => '_blank', "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode', 'oldvalue', 'newvalue')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
+
+			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+			$sAttName = $oAttDef->GetLabel();
+			$sNewValue = $this->Get('newvalue');
+			$sOldValue = $this->Get('oldvalue');
+			$sResult = $oAttDef->DescribeChangeAsHTML($sOldValue, $sNewValue);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record the modification of a blob
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_data",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeBlob("prevdata", array("depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$oPrevDoc = $this->Get('prevdata');
+			if ($oPrevDoc->IsEmpty())
+			{
+				$sPrevious = '';
+				$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevious);
+			}
+			else
+			{
+				$sDocView = $oPrevDoc->GetAsHtml();
+				$sDocView .= "<br/>".Dict::Format('UI:OpenDocumentInNewWindow_', $oPrevDoc->GetDisplayLink(get_class($this), $this->GetKey(), 'prevdata')).", \n";
+				$sDocView .= Dict::Format('UI:DownloadDocument_', $oPrevDoc->GetDownloadLink(get_class($this), $this->GetKey(), 'prevdata'))."\n";
+				//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
+				$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sDocView);
+			}
+		}
+		return $sResult;
+	}
+}
+/**
+ * Safely record the modification of one way encrypted password
+ */
+class CMDBChangeOpSetAttributeOneWayPassword extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_pwd",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("prev_pwd", array("sql" => 'data', "default_value" => '', "is_null_allowed"=> true, "allowed_values" => null, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$sResult = Dict::Format('Change:AttName_Changed', $sAttName);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Safely record the modification of an encrypted field
+ */
+class CMDBChangeOpSetAttributeEncrypted extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_encrypted",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeEncryptedString("prevstring", array("sql" => 'data', "default_value" => '', "is_null_allowed"=> true, "allowed_values" => null, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$sPrevString = $this->Get('prevstring');
+			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevString);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record the modification of a multiline string (text)
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeText extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_text",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$sTextView = '<div>'.$this->GetAsHtml('prevdata').'</div>';
+
+			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
+			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record the modification of a multiline string (text)
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeLongText extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_longtext",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeLongText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$sTextView = '<div>'.$this->GetAsHtml('prevdata').'</div>';
+
+			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
+			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record the modification of a multiline string (text) containing some HTML markup
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeHTML extends CMDBChangeOpSetAttributeLongText
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_html",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */
+	public function GetDescription()
+	{
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+	
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$sTextView = '<div class="history_entry history_entry_truncated"><div class="history_html_content">'.$this->Get('prevdata').'</div></div>';
+	
+			//$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata');
+			$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
+		}
+		return $sResult;
+	}	
+}
+
+/**
+ * Record the modification of a caselog (text)
+ * since the caselog itself stores the history
+ * of its entries, there is no need to duplicate
+ * the text here
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeCaseLog extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_log",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeInteger("lastentry", array("allowed_values"=>null, "sql"=>"lastentry", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+			}
+			else
+			{
+				// The attribute was renamed or removed from the object ?
+				$sAttName = $this->Get('attcode');
+			}
+			$oObj = $oMonoObjectSet->Fetch();
+			$oCaseLog = $oObj->Get($this->Get('attcode'));
+			$iMaxVisibleLength = MetaModel::getConfig()->Get('max_history_case_log_entry_length', 0);
+			$sTextEntry = '<div class="history_entry history_entry_truncated"><div class="history_html_content">'.$oCaseLog->GetEntryAt($this->Get('lastentry')).'</div></div>';
+
+			$sResult = Dict::Format('Change:AttName_EntryAdded', $sAttName, $sTextEntry);
+		}
+		return $sResult;
+	}
+	
+	protected function ToHtml($sRawText)
+	{
+		return str_replace(array("\r\n", "\n", "\r"), "<br/>", htmlentities($sRawText, ENT_QUOTES, 'UTF-8'));
+	}
+}
+
+/**
+ * Record an action made by a plug-in  
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpPlugin extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_plugin",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+		/* May be used later when implementing an extension mechanism that will allow the plug-ins to store some extra information and still degrades gracefully when the plug-in is desinstalled
+		MetaModel::Init_AddAttribute(new AttributeString("extension_class", array("allowed_values"=>null, "sql"=>"extension_class", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("extension_id", array("allowed_values"=>null, "sql"=>"extension_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		*/
+		MetaModel::Init_InheritAttributes();
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		return $this->Get('description');
+	}
+}
+
+/**
+ * Record added/removed objects from within a link set 
+ *
+ * @package     iTopORM
+ */
+abstract class CMDBChangeOpSetAttributeLinks extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_links",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Note: item class/id points to the link class itself in case of a direct link set (e.g. Server::interface_list => Interface)
+		//       item class/id points to the remote class in case of a indirect link set (e.g. Server::contract_list => Contract)
+		MetaModel::Init_AddAttribute(new AttributeString("item_class", array("allowed_values"=>null, "sql"=>"item_class", "default_value"=>'', "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("item_id", array("allowed_values"=>null, "sql"=>"item_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+}
+
+/**
+ * Record added/removed objects from within a link set 
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeLinksAddRemove extends CMDBChangeOpSetAttributeLinks
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_links_addremove",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('added,removed'), "sql"=>"type", "default_value"=>"added", "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
+
+			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+			$sAttName = $oAttDef->GetLabel();
+
+			$sItemDesc = MetaModel::GetHyperLink($this->Get('item_class'), $this->Get('item_id'));
+
+			$sResult = $sAttName.' - ';
+			switch ($this->Get('type'))
+			{
+			case 'added':
+				$sResult .= Dict::Format('Change:LinkSet:Added', $sItemDesc);
+				break;
+
+			case 'removed':
+				$sResult .= Dict::Format('Change:LinkSet:Removed', $sItemDesc);
+				break;
+			}
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record attribute changes from within a link set
+ * A single record redirects to the modifications made within the same change  
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeLinksTune extends CMDBChangeOpSetAttributeLinks
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_links_tune",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("link_id", array("allowed_values"=>null, "sql"=>"link_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+	}
+
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		$sResult = '';
+		$oTargetObjectClass = $this->Get('objclass');
+		$oTargetObjectKey = $this->Get('objkey');
+		$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+		{
+			if (!MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode'))) return ''; // Protects against renamed attributes...
+
+			$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+			$sAttName = $oAttDef->GetLabel();
+
+			$sLinkClass = $oAttDef->GetLinkedClass();
+			$aLinkClasses = MetaModel::EnumChildClasses($sLinkClass, ENUM_CHILD_CLASSES_ALL);
+
+			// Search for changes on the corresponding link
+			//
+			$oSearch = new DBObjectSearch('CMDBChangeOpSetAttribute');
+			$oSearch->AddCondition('change', $this->Get('change'), '=');
+			$oSearch->AddCondition('objkey', $this->Get('link_id'), '=');
+			if (count($aLinkClasses) == 1)
+			{
+				// Faster than the whole building of the expression below for just one value ??
+				$oSearch->AddCondition('objclass', $sLinkClass, '=');
+			}
+			else
+			{
+				$oField = new FieldExpression('objclass',  $oSearch->GetClassAlias());
+				$sListExpr = '('.implode(', ', CMDBSource::Quote($aLinkClasses)).')';
+				$sOQLCondition = $oField->Render()." IN $sListExpr";
+				$oNewCondition = Expression::FromOQL($sOQLCondition);
+				$oSearch->AddConditionExpression($oNewCondition);
+			}
+			$oSet = new DBObjectSet($oSearch);
+			$aChanges = array();
+			while ($oChangeOp = $oSet->Fetch())
+			{
+				$aChanges[] = $oChangeOp->GetDescription();
+			}
+			if (count($aChanges) == 0)
+			{
+				return '';
+			}
+
+			$sItemDesc = MetaModel::GetHyperLink($this->Get('item_class'), $this->Get('item_id'));
+
+			$sResult = $sAttName.' - ';
+			$sResult .= Dict::Format('Change:LinkSet:Modified', $sItemDesc);
+			$sResult .= ' : '.implode(', ', $aChanges);
+		}
+		return $sResult;
+	}
+}
+
+/**
+ * Record the modification of custom fields
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpSetAttributeCustomFields extends CMDBChangeOpSetAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_setatt_custfields",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeLongText("prevdata", array("allowed_values"=>null, "sql"=>"prevdata", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'attcode')); // Attributes to be displayed for a list
+	}
+
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */
+	public function GetDescription()
+	{
+		$sResult = '';
+		if (MetaModel::IsValidAttCode($this->Get('objclass'), $this->Get('attcode')))
+		{
+			$oTargetObjectClass = $this->Get('objclass');
+			$oTargetObjectKey = $this->Get('objkey');
+			$oTargetSearch = new DBObjectSearch($oTargetObjectClass);
+			$oTargetSearch->AddCondition('id', $oTargetObjectKey, '=');
+
+			$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+			if (UserRights::IsActionAllowedOnAttribute($this->Get('objclass'), $this->Get('attcode'), UR_ACTION_READ, $oMonoObjectSet) == UR_ALLOWED_YES)
+			{
+				$aValues = json_decode($this->Get('prevdata'), true);
+				$oAttDef = MetaModel::GetAttributeDef($this->Get('objclass'), $this->Get('attcode'));
+				$sAttName = $oAttDef->GetLabel();
+
+				try
+				{
+					$oHandler = $oAttDef->GetHandler($aValues);
+					$sValueDesc = $oHandler->GetAsHTML($aValues);
+				}
+				catch (Exception $e)
+				{
+					$sValueDesc = 'Custom field error: '.htmlentities($e->getMessage(), ENT_QUOTES, 'UTF-8');
+				}
+				$sTextView = '<div>'.$sValueDesc.'</div>';
+
+				$sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sTextView);
+			}
+		}
+		return $sResult;
+	}
+}
diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php
index 7089057bf..5e6144163 100644
--- a/core/cmdbobject.class.inc.php
+++ b/core/cmdbobject.class.inc.php
@@ -1,694 +1,694 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class cmdbObject
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * cmdbObjectClass
- * the file to include, then the core is yours
- *
- * @package     iTopORM
- */
-
-require_once('coreexception.class.inc.php');
-
-require_once('config.class.inc.php');
-require_once('log.class.inc.php');
-require_once('kpi.class.inc.php');
-
-require_once('dict.class.inc.php');
-
-require_once('attributedef.class.inc.php');
-require_once('filterdef.class.inc.php');
-require_once('stimulus.class.inc.php');
-require_once('valuesetdef.class.inc.php');
-require_once('MyHelpers.class.inc.php');
-
-require_once('oql/expression.class.inc.php');
-require_once('oql/oqlquery.class.inc.php');
-require_once('oql/oqlexception.class.inc.php');
-require_once('oql/oql-parser.php');
-require_once('oql/oql-lexer.php');
-require_once('oql/oqlinterpreter.class.inc.php');
-
-require_once('cmdbsource.class.inc.php');
-require_once('sqlquery.class.inc.php');
-require_once('sqlobjectquery.class.inc.php');
-require_once('sqlunionquery.class.inc.php');
-
-require_once('dbobject.class.php');
-require_once('dbsearch.class.php');
-require_once('dbobjectset.class.php');
-
-require_once('backgroundprocess.inc.php');
-require_once('asynctask.class.inc.php');
-require_once('dbproperty.class.inc.php');
-
-// db change tracking data model
-require_once('cmdbchange.class.inc.php');
-require_once('cmdbchangeop.class.inc.php');
-
-// customization data model
-// Romain: temporary moved into application.inc.php (see explanations there)
-//require_once('trigger.class.inc.php');
-//require_once('action.class.inc.php');
-
-// application log
-// Romain: temporary moved into application.inc.php (see explanations there)
-//require_once('event.class.inc.php');
-
-require_once('templatestring.class.inc.php');
-require_once('csvparser.class.inc.php');
-require_once('bulkchange.class.inc.php');
-
-/**
- * A persistent object, which changes are accurately recorded
- *
- * @package     iTopORM
- */
-abstract class CMDBObject extends DBObject
-{
-	protected $m_datCreated;
-	protected $m_datUpdated;
-	// Note: this value is static, but that could be changed because it is sometimes a real issue (see update of interfaces / connected_to
-	protected static $m_oCurrChange = null;
-	protected static $m_sInfo = null; // null => the information is built in a standard way
-	protected static $m_sOrigin = null; // null => the origin is 'interactive'
-	
-	/**
-	 * Specify another change (this is mainly for backward compatibility)
-	 */
-	public static function SetCurrentChange(CMDBChange $oChange)
-	{
-		self::$m_oCurrChange = $oChange;
-	}
-
-	//
-	// Todo: simplify the APIs and do not pass the current change as an argument anymore
-	//       SetTrackInfo to be invoked in very few cases (UI.php, CSV import, Data synchro)
-	//       SetCurrentChange is an alternative to SetTrackInfo (csv ?)
-	//			GetCurrentChange to be called ONCE (!) by CMDBChangeOp::OnInsert ($this->Set('change', ..GetCurrentChange())
-	//			GetCurrentChange to create a default change if not already done in the current context
-	//
-	/**
-	 * Get a change record (create it if not existing)	 
-	 */
-	public static function GetCurrentChange($bAutoCreate = true)
-	{
-		if ($bAutoCreate && is_null(self::$m_oCurrChange))
-		{
-			self::CreateChange();
-		}
-		return self::$m_oCurrChange;
-	}
-
-	/**
-	 * Override the additional information (defaulting to user name)
-	 * A call to this verb should replace every occurence of
-	 *    $oMyChange = MetaModel::NewObject("CMDBChange");	  	 
-	 *    $oMyChange->Set("date", time());
-	 *    $oMyChange->Set("userinfo", 'this is done by ... for ...');
-	 *    $iChangeId = $oMyChange->DBInsert();
-	 */	 	
-	public static function SetTrackInfo($sInfo)
-	{
-		self::$m_sInfo = $sInfo;
-	}
-
-	/**
-	 * Provides information about the origin of the change
-	 * @param $sOrigin String: one of: interactive, csv-interactive, csv-import.php, webservice-soap, webservice-rest, syncho-data-source, email-processing, custom-extension
-	 */	 	
-	public static function SetTrackOrigin($sOrigin)
-	{
-		self::$m_sOrigin = $sOrigin;
-	}
-	
-	/**
-	 * Get the additional information (defaulting to user name)
-	 */	 	
-	protected static function GetTrackInfo()
-	{
-		if (is_null(self::$m_sInfo))
-		{
-			return CMDBChange::GetCurrentUserName();
-		}
-		else
-		{
-			return self::$m_sInfo;
-		}
-	}
-	
-	/**
-	 * Get the 'origin' information (defaulting to 'interactive')
-	 */	 	
-	protected static function GetTrackOrigin()
-	{
-		if (is_null(self::$m_sOrigin))
-		{
-			return 'interactive';
-		}
-		else
-		{
-			return self::$m_sOrigin;
-		}
-	}
-	
-	/**
-	 * Create a standard change record (done here 99% of the time, and nearly once per page)
-	 */	 	
-	protected static function CreateChange()
-	{
-		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");
-		self::$m_oCurrChange->Set("date", time());
-		self::$m_oCurrChange->Set("userinfo", self::GetTrackInfo());
-		self::$m_oCurrChange->Set("origin", self::GetTrackOrigin());
-		self::$m_oCurrChange->DBInsert();
-	}
-
-	protected function RecordObjCreation()
-	{
-		// Delete any existing change tracking about the current object (IDs can be reused due to InnoDb bug; see TRAC #886)
-		//
-		// 1 - remove the deletion record(s)
-		// Note that objclass contain the ROOT class
-		$oFilter = new DBObjectSearch('CMDBChangeOpDelete');
-		$oFilter->AddCondition('objclass', MetaModel::GetRootClass(get_class($this)), '=');
-		$oFilter->AddCondition('objkey', $this->GetKey(), '=');
-		MetaModel::PurgeData($oFilter);
-		// 2 - any other change tracking information left prior to 2.0.3 (when the purge of the history has been implemented in RecordObjDeletion
-		// In that case, objclass is the final class of the object
-		$oFilter = new DBObjectSearch('CMDBChangeOp');
-		$oFilter->AddCondition('objclass', get_class($this), '=');
-		$oFilter->AddCondition('objkey', $this->GetKey(), '=');
-		MetaModel::PurgeData($oFilter);
-
-		parent::RecordObjCreation();
-		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpCreate");
-		$oMyChangeOp->Set("objclass", get_class($this));
-		$oMyChangeOp->Set("objkey", $this->GetKey());
-		$iId = $oMyChangeOp->DBInsertNoReload();
-	}
-
-	protected function RecordObjDeletion($objkey)
-	{
-		$sRootClass = MetaModel::GetRootClass(get_class($this));
-
-		// Delete any existing change tracking about the current object
-		$oFilter = new DBObjectSearch('CMDBChangeOp');
-		$oFilter->AddCondition('objclass', get_class($this), '=');
-		$oFilter->AddCondition('objkey', $objkey, '=');
-		MetaModel::PurgeData($oFilter);
-
-		parent::RecordObjDeletion($objkey);
-		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpDelete");
-		$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
-		$iId = $oMyChangeOp->DBInsertNoReload();
-	}
-
-	/**
-	 * @param $sAttCode
-	 * @param $original Original value
-	 * @param $value Current value
-	 */
-	protected function RecordAttChange($sAttCode, $original, $value)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if ($oAttDef->IsExternalField()) return;
-		if ($oAttDef->IsLinkSet()) return;
-		if ($oAttDef->GetTrackingLevel() == ATTRIBUTE_TRACKING_NONE) return;
-
-		if ($oAttDef instanceOf AttributeOneWayPassword)
-		{
-			// One Way encrypted passwords' history is stored -one way- encrypted
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeOneWayPassword");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-
-			if (is_null($original))
-			{
-				$original = '';
-			}
-			$oMyChangeOp->Set("prev_pwd", $original);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeEncryptedString)
-		{
-			// Encrypted string history is stored encrypted
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeEncrypted");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-
-			if (is_null($original))
-			{
-				$original = '';
-			}
-			$oMyChangeOp->Set("prevstring", $original);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeBlob)
-		{
-			// Data blobs
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeBlob");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-
-			if (is_null($original))
-			{
-				$original = new ormDocument();
-			}
-			$oMyChangeOp->Set("prevdata", $original);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeStopWatch)
-		{
-			// Stop watches - record changes for sub items only (they are visible, the rest is not visible)
-			//
-			foreach ($oAttDef->ListSubItems() as $sSubItemAttCode => $oSubItemAttDef)
-			{
-				$item_value = $oAttDef->GetSubItemValue($oSubItemAttDef->Get('item_code'), $value, $this);
-				$item_original = $oAttDef->GetSubItemValue($oSubItemAttDef->Get('item_code'), $original, $this);
-
-				if ($item_value != $item_original)
-				{
-					$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
-					$oMyChangeOp->Set("objclass", get_class($this));
-					$oMyChangeOp->Set("objkey", $this->GetKey());
-					$oMyChangeOp->Set("attcode", $sSubItemAttCode);
-
-					$oMyChangeOp->Set("oldvalue", $item_original);
-					$oMyChangeOp->Set("newvalue", $item_value);
-					$iId = $oMyChangeOp->DBInsertNoReload();
-				}
-			}
-		}
-		elseif ($oAttDef instanceOf AttributeCaseLog)
-		{
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeCaseLog");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-
-			$oMyChangeOp->Set("lastentry", $value->GetLatestEntryIndex());
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeLongText)
-		{
-			// Data blobs
-			if ($oAttDef->GetFormat() == 'html')
-			{
-				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeHTML");
-			}
-			else
-			{
-				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeLongText");
-			}
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-
-			if (!is_null($original) && ($original instanceof ormCaseLog))
-			{
-				$original = $original->GetText();
-			}
-			$oMyChangeOp->Set("prevdata", $original);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeText)
-		{
-			// Data blobs
-			if ($oAttDef->GetFormat() == 'html')
-			{
-				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeHTML");
-			}
-			else
-			{
-				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeText");
-			}
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-
-			if (!is_null($original) && ($original instanceof ormCaseLog))
-			{
-				$original = $original->GetText();
-			}
-			$oMyChangeOp->Set("prevdata", $original);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeBoolean)
-		{
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-			$oMyChangeOp->Set("oldvalue", $original ? 1 : 0);
-			$oMyChangeOp->Set("newvalue", $value ? 1 : 0);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeHierarchicalKey)
-		{
-			// Hierarchical keys
-			//
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-			$oMyChangeOp->Set("oldvalue", $original);
-			$oMyChangeOp->Set("newvalue", $value[$sAttCode]);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeCustomFields)
-		{
-			// Custom fields
-			//
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeCustomFields");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-			$oMyChangeOp->Set("prevdata", json_encode($original->GetValues()));
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		elseif ($oAttDef instanceOf AttributeURL)
-		{
-			// URLs
-			//
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeURL");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-			$oMyChangeOp->Set("oldvalue", $original);
-			$oMyChangeOp->Set("newvalue", $value);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-		else
-		{
-			// Scalars
-			//
-			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
-			$oMyChangeOp->Set("objclass", get_class($this));
-			$oMyChangeOp->Set("objkey", $this->GetKey());
-			$oMyChangeOp->Set("attcode", $sAttCode);
-			$oMyChangeOp->Set("oldvalue", $original);
-			$oMyChangeOp->Set("newvalue", $value);
-			$iId = $oMyChangeOp->DBInsertNoReload();
-		}
-	}
-
-	/**
-	 * @param array $aValues
-	 * @param array $aOrigValues
-	 */
-	protected function RecordAttChanges(array $aValues, array $aOrigValues)
-	{
-		parent::RecordAttChanges($aValues, $aOrigValues);
-
-		// $aValues is an array of $sAttCode => $value
-		//
-		foreach ($aValues as $sAttCode=> $value)
-		{
-			if (array_key_exists($sAttCode, $aOrigValues))
-			{
-				$original = $aOrigValues[$sAttCode];
-			}
-			else
-			{
-				$original = null;
-			}
-			$this->RecordAttChange($sAttCode, $original, $value);
-		}
-	}
-
-	/**
-	 * Helper to ultimately check user rights before writing (Insert, Update or Delete)
-	 * The check should never fail, because the UI should prevent from such a usage
-	 * Anyhow, if the user has found a workaround... the security gets enforced here	 	 
-	 */
-	protected function CheckUserRights($bSkipStrongSecurity, $iActionCode)
-	{
-		if (is_null($bSkipStrongSecurity))
-		{
-			// This is temporary
-			// We have implemented this safety net right before releasing iTop 1.0
-			// and we decided that it was too risky to activate it
-			// Anyhow, users willing to have a very strong security could set
-			// skip_strong_security = 0, in the config file
-			$bSkipStrongSecurity = MetaModel::GetConfig()->Get('skip_strong_security');
-		}
-		if (!$bSkipStrongSecurity)
-		{
-			$sClass = get_class($this);
-			$oSet = DBObjectSet::FromObject($this);
-			if (!UserRights::IsActionAllowed($sClass, $iActionCode, $oSet))
-			{
-				// Intrusion detected
-				throw new SecurityException('You are not allowed to modify objects of class: '.$sClass);
-			}
-		}
-	}
-
-
-	public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$ret = $this->DBInsertTracked_Internal();
-		return $ret;
-	}
-	
-	public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$ret = $this->DBInsertTracked_Internal(true);
-		return $ret;
-	}
-	
-	/**
-	 * To Be Obsoleted: DO NOT rely on an overload of this method since
-	 * DBInsertTracked (resp. DBInsertTrackedNoReload) may call directly
-	 * DBInsert (resp. DBInsertNoReload) in future versions of iTop.
-	 * @param bool $bDoNotReload
-	 * @return integer Identifier of the created object
-	 */
-	protected function DBInsertTracked_Internal($bDoNotReload = false)
-	{
-		if ($bDoNotReload)
-		{
-			$ret = $this->DBInsertNoReload();
-		}
-		else
-		{
-			$ret = $this->DBInsert();
-		}
-		return $ret;
-	}
-
-	public function DBClone($newKey = null)
-	{
-		return $this->DBCloneTracked_Internal();
-	}
-
-	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->DBCloneTracked_Internal($newKey);
-	}
-
-	protected function DBCloneTracked_Internal($newKey = null)
-	{
-		$newKey = parent::DBClone($newKey);
-		$oClone = MetaModel::GetObject(get_class($this), $newKey); 
-
-		return $newKey;
-	}
-
-	public function DBUpdate()
-	{
-		// Copy the changes list before the update (the list should be reset afterwards)
-		$aChanges = $this->ListChanges();
-		if (count($aChanges) == 0)
-		{
-			return;
-		}
-		
-		$ret = parent::DBUpdate();
-		return $ret;
-	}
-
-	public function DBUpdateTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
-		$this->DBUpdate();
-	}
-
-	public function DBDelete(&$oDeletionPlan = null)
-	{
-		return $this->DBDeleteTracked_Internal($oDeletionPlan);
-	}
-
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
-	{
-		self::SetCurrentChange($oChange);
-		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE);
-		$this->DBDeleteTracked_Internal($oDeletionPlan);
-	}
-
-	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
-	{
-		$prevkey = $this->GetKey();
-		$ret = parent::DBDelete($oDeletionPlan);
-		return $ret;
-	}
-
-	public static function BulkUpdate(DBSearch $oFilter, array $aValues)
-	{
-		return static::BulkUpdateTracked_Internal($oFilter, $aValues);
-	}
-
-	public static function BulkUpdateTracked(CMDBChange $oChange, DBSearch $oFilter, array $aValues)
-	{
-		self::SetCurrentChange($oChange);
-		static::BulkUpdateTracked_Internal($oFilter, $aValues);
-	}
-
-	protected static function BulkUpdateTracked_Internal(DBSearch $oFilter, array $aValues)
-	{
-		// $aValues is an array of $sAttCode => $value
-
-		// Get the list of objects to update (and load it before doing the change)
-		$oObjSet = new CMDBObjectSet($oFilter);
-		$oObjSet->Load();
-
-		// Keep track of the previous values (will be overwritten when the objects are synchronized with the DB)
-		$aOriginalValues = array();
-		$oObjSet->Rewind();
-		while ($oItem = $oObjSet->Fetch())
-		{
-			$aOriginalValues[$oItem->GetKey()] = $oItem->m_aOrigValues;
-		}
-
-		// Update in one single efficient query
-		$ret = parent::BulkUpdate($oFilter, $aValues);
-
-		// Record... in many queries !!!
-		$oObjSet->Rewind();
-		while ($oItem = $oObjSet->Fetch())
-		{
-			$aChangedValues = $oItem->ListChangedValues($aValues);
-			$oItem->RecordAttChanges($aChangedValues, $aOriginalValues[$oItem->GetKey()]);
-		}
-		return $ret;
-	}
-
-	public function DBArchive()
-	{
-		// Note: do the job anyway, so as to repair any DB discrepancy
-		$bOriginal = $this->Get('archive_flag');
-		parent::DBArchive();
-
-		if (!$bOriginal)
-		{
-			utils::PushArchiveMode(false);
-			$this->RecordAttChange('archive_flag', false, true);
-			utils::PopArchiveMode();
-		}
-	}
-
-	public function DBUnarchive()
-	{
-		// Note: do the job anyway, so as to repair any DB discrepancy
-		$bOriginal = $this->Get('archive_flag');
-		parent::DBUnarchive();
-
-		if ($bOriginal)
-		{
-			utils::PushArchiveMode(false);
-			$this->RecordAttChange('archive_flag', true, false);
-			utils::PopArchiveMode();
-		}
-	}
-}
-
-
-
-/**
- * TODO: investigate how to get rid of this class that was made to workaround some language limitation... or a poor design!
- *
- * @package     iTopORM
- */
-class CMDBObjectSet extends DBObjectSet
-{
-	// this is the public interface (?)
-	
-	// I have to define those constructors here... :-(
-	// just to get the right object class in return.
-	// I have to think again to those things: maybe it will work fine if a have a constructor define here (?)
-	
-	static public function FromScratch($sClass)
-	{
-		$oFilter = new DBObjectSearch($sClass);
-		$oFilter->AddConditionExpression(new FalseExpression());
-		$oRetSet = new self($oFilter);
-		// NOTE: THIS DOES NOT WORK IF m_bLoaded is private in the base class (and you will not get any error message)
-		$oRetSet->m_bLoaded = true; // no DB load
-		return $oRetSet;
-	} 
-
-	// create an object set ex nihilo
-	// input = array of objects
-	static public function FromArray($sClass, $aObjects)
-	{
-		$oRetSet = self::FromScratch($sClass);
-		$oRetSet->AddObjectArray($aObjects, $sClass);
-		return $oRetSet;
-	} 
-
-	static public function FromArrayAssoc($aClasses, $aObjects)
-	{
-		// In a perfect world, we should create a complete tree of DBObjectSearch,
-		// but as we lack most of the information related to the objects,
-		// let's create one search definition
-		$sClass = reset($aClasses);
-		$sAlias = key($aClasses);
-		$oFilter = new DBObjectSearch($sClass, $sAlias);
-
-		$oRetSet = new CMDBObjectSet($oFilter);
-		$oRetSet->m_bLoaded = true; // no DB load
-
-		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
-		{
-			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
-		}
-		return $oRetSet;
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class cmdbObject
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * cmdbObjectClass
+ * the file to include, then the core is yours
+ *
+ * @package     iTopORM
+ */
+
+require_once('coreexception.class.inc.php');
+
+require_once('config.class.inc.php');
+require_once('log.class.inc.php');
+require_once('kpi.class.inc.php');
+
+require_once('dict.class.inc.php');
+
+require_once('attributedef.class.inc.php');
+require_once('filterdef.class.inc.php');
+require_once('stimulus.class.inc.php');
+require_once('valuesetdef.class.inc.php');
+require_once('MyHelpers.class.inc.php');
+
+require_once('oql/expression.class.inc.php');
+require_once('oql/oqlquery.class.inc.php');
+require_once('oql/oqlexception.class.inc.php');
+require_once('oql/oql-parser.php');
+require_once('oql/oql-lexer.php');
+require_once('oql/oqlinterpreter.class.inc.php');
+
+require_once('cmdbsource.class.inc.php');
+require_once('sqlquery.class.inc.php');
+require_once('sqlobjectquery.class.inc.php');
+require_once('sqlunionquery.class.inc.php');
+
+require_once('dbobject.class.php');
+require_once('dbsearch.class.php');
+require_once('dbobjectset.class.php');
+
+require_once('backgroundprocess.inc.php');
+require_once('asynctask.class.inc.php');
+require_once('dbproperty.class.inc.php');
+
+// db change tracking data model
+require_once('cmdbchange.class.inc.php');
+require_once('cmdbchangeop.class.inc.php');
+
+// customization data model
+// Romain: temporary moved into application.inc.php (see explanations there)
+//require_once('trigger.class.inc.php');
+//require_once('action.class.inc.php');
+
+// application log
+// Romain: temporary moved into application.inc.php (see explanations there)
+//require_once('event.class.inc.php');
+
+require_once('templatestring.class.inc.php');
+require_once('csvparser.class.inc.php');
+require_once('bulkchange.class.inc.php');
+
+/**
+ * A persistent object, which changes are accurately recorded
+ *
+ * @package     iTopORM
+ */
+abstract class CMDBObject extends DBObject
+{
+	protected $m_datCreated;
+	protected $m_datUpdated;
+	// Note: this value is static, but that could be changed because it is sometimes a real issue (see update of interfaces / connected_to
+	protected static $m_oCurrChange = null;
+	protected static $m_sInfo = null; // null => the information is built in a standard way
+	protected static $m_sOrigin = null; // null => the origin is 'interactive'
+	
+	/**
+	 * Specify another change (this is mainly for backward compatibility)
+	 */
+	public static function SetCurrentChange(CMDBChange $oChange)
+	{
+		self::$m_oCurrChange = $oChange;
+	}
+
+	//
+	// Todo: simplify the APIs and do not pass the current change as an argument anymore
+	//       SetTrackInfo to be invoked in very few cases (UI.php, CSV import, Data synchro)
+	//       SetCurrentChange is an alternative to SetTrackInfo (csv ?)
+	//			GetCurrentChange to be called ONCE (!) by CMDBChangeOp::OnInsert ($this->Set('change', ..GetCurrentChange())
+	//			GetCurrentChange to create a default change if not already done in the current context
+	//
+	/**
+	 * Get a change record (create it if not existing)	 
+	 */
+	public static function GetCurrentChange($bAutoCreate = true)
+	{
+		if ($bAutoCreate && is_null(self::$m_oCurrChange))
+		{
+			self::CreateChange();
+		}
+		return self::$m_oCurrChange;
+	}
+
+	/**
+	 * Override the additional information (defaulting to user name)
+	 * A call to this verb should replace every occurence of
+	 *    $oMyChange = MetaModel::NewObject("CMDBChange");	  	 
+	 *    $oMyChange->Set("date", time());
+	 *    $oMyChange->Set("userinfo", 'this is done by ... for ...');
+	 *    $iChangeId = $oMyChange->DBInsert();
+	 */	 	
+	public static function SetTrackInfo($sInfo)
+	{
+		self::$m_sInfo = $sInfo;
+	}
+
+	/**
+	 * Provides information about the origin of the change
+	 * @param $sOrigin String: one of: interactive, csv-interactive, csv-import.php, webservice-soap, webservice-rest, syncho-data-source, email-processing, custom-extension
+	 */	 	
+	public static function SetTrackOrigin($sOrigin)
+	{
+		self::$m_sOrigin = $sOrigin;
+	}
+	
+	/**
+	 * Get the additional information (defaulting to user name)
+	 */	 	
+	protected static function GetTrackInfo()
+	{
+		if (is_null(self::$m_sInfo))
+		{
+			return CMDBChange::GetCurrentUserName();
+		}
+		else
+		{
+			return self::$m_sInfo;
+		}
+	}
+	
+	/**
+	 * Get the 'origin' information (defaulting to 'interactive')
+	 */	 	
+	protected static function GetTrackOrigin()
+	{
+		if (is_null(self::$m_sOrigin))
+		{
+			return 'interactive';
+		}
+		else
+		{
+			return self::$m_sOrigin;
+		}
+	}
+	
+	/**
+	 * Create a standard change record (done here 99% of the time, and nearly once per page)
+	 */	 	
+	protected static function CreateChange()
+	{
+		self::$m_oCurrChange = MetaModel::NewObject("CMDBChange");
+		self::$m_oCurrChange->Set("date", time());
+		self::$m_oCurrChange->Set("userinfo", self::GetTrackInfo());
+		self::$m_oCurrChange->Set("origin", self::GetTrackOrigin());
+		self::$m_oCurrChange->DBInsert();
+	}
+
+	protected function RecordObjCreation()
+	{
+		// Delete any existing change tracking about the current object (IDs can be reused due to InnoDb bug; see TRAC #886)
+		//
+		// 1 - remove the deletion record(s)
+		// Note that objclass contain the ROOT class
+		$oFilter = new DBObjectSearch('CMDBChangeOpDelete');
+		$oFilter->AddCondition('objclass', MetaModel::GetRootClass(get_class($this)), '=');
+		$oFilter->AddCondition('objkey', $this->GetKey(), '=');
+		MetaModel::PurgeData($oFilter);
+		// 2 - any other change tracking information left prior to 2.0.3 (when the purge of the history has been implemented in RecordObjDeletion
+		// In that case, objclass is the final class of the object
+		$oFilter = new DBObjectSearch('CMDBChangeOp');
+		$oFilter->AddCondition('objclass', get_class($this), '=');
+		$oFilter->AddCondition('objkey', $this->GetKey(), '=');
+		MetaModel::PurgeData($oFilter);
+
+		parent::RecordObjCreation();
+		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpCreate");
+		$oMyChangeOp->Set("objclass", get_class($this));
+		$oMyChangeOp->Set("objkey", $this->GetKey());
+		$iId = $oMyChangeOp->DBInsertNoReload();
+	}
+
+	protected function RecordObjDeletion($objkey)
+	{
+		$sRootClass = MetaModel::GetRootClass(get_class($this));
+
+		// Delete any existing change tracking about the current object
+		$oFilter = new DBObjectSearch('CMDBChangeOp');
+		$oFilter->AddCondition('objclass', get_class($this), '=');
+		$oFilter->AddCondition('objkey', $objkey, '=');
+		MetaModel::PurgeData($oFilter);
+
+		parent::RecordObjDeletion($objkey);
+		$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpDelete");
+		$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
+		$iId = $oMyChangeOp->DBInsertNoReload();
+	}
+
+	/**
+	 * @param $sAttCode
+	 * @param $original Original value
+	 * @param $value Current value
+	 */
+	protected function RecordAttChange($sAttCode, $original, $value)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		if ($oAttDef->IsExternalField()) return;
+		if ($oAttDef->IsLinkSet()) return;
+		if ($oAttDef->GetTrackingLevel() == ATTRIBUTE_TRACKING_NONE) return;
+
+		if ($oAttDef instanceOf AttributeOneWayPassword)
+		{
+			// One Way encrypted passwords' history is stored -one way- encrypted
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeOneWayPassword");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+
+			if (is_null($original))
+			{
+				$original = '';
+			}
+			$oMyChangeOp->Set("prev_pwd", $original);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeEncryptedString)
+		{
+			// Encrypted string history is stored encrypted
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeEncrypted");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+
+			if (is_null($original))
+			{
+				$original = '';
+			}
+			$oMyChangeOp->Set("prevstring", $original);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeBlob)
+		{
+			// Data blobs
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeBlob");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+
+			if (is_null($original))
+			{
+				$original = new ormDocument();
+			}
+			$oMyChangeOp->Set("prevdata", $original);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeStopWatch)
+		{
+			// Stop watches - record changes for sub items only (they are visible, the rest is not visible)
+			//
+			foreach ($oAttDef->ListSubItems() as $sSubItemAttCode => $oSubItemAttDef)
+			{
+				$item_value = $oAttDef->GetSubItemValue($oSubItemAttDef->Get('item_code'), $value, $this);
+				$item_original = $oAttDef->GetSubItemValue($oSubItemAttDef->Get('item_code'), $original, $this);
+
+				if ($item_value != $item_original)
+				{
+					$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
+					$oMyChangeOp->Set("objclass", get_class($this));
+					$oMyChangeOp->Set("objkey", $this->GetKey());
+					$oMyChangeOp->Set("attcode", $sSubItemAttCode);
+
+					$oMyChangeOp->Set("oldvalue", $item_original);
+					$oMyChangeOp->Set("newvalue", $item_value);
+					$iId = $oMyChangeOp->DBInsertNoReload();
+				}
+			}
+		}
+		elseif ($oAttDef instanceOf AttributeCaseLog)
+		{
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeCaseLog");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+
+			$oMyChangeOp->Set("lastentry", $value->GetLatestEntryIndex());
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeLongText)
+		{
+			// Data blobs
+			if ($oAttDef->GetFormat() == 'html')
+			{
+				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeHTML");
+			}
+			else
+			{
+				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeLongText");
+			}
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+
+			if (!is_null($original) && ($original instanceof ormCaseLog))
+			{
+				$original = $original->GetText();
+			}
+			$oMyChangeOp->Set("prevdata", $original);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeText)
+		{
+			// Data blobs
+			if ($oAttDef->GetFormat() == 'html')
+			{
+				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeHTML");
+			}
+			else
+			{
+				$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeText");
+			}
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+
+			if (!is_null($original) && ($original instanceof ormCaseLog))
+			{
+				$original = $original->GetText();
+			}
+			$oMyChangeOp->Set("prevdata", $original);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeBoolean)
+		{
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+			$oMyChangeOp->Set("oldvalue", $original ? 1 : 0);
+			$oMyChangeOp->Set("newvalue", $value ? 1 : 0);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeHierarchicalKey)
+		{
+			// Hierarchical keys
+			//
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+			$oMyChangeOp->Set("oldvalue", $original);
+			$oMyChangeOp->Set("newvalue", $value[$sAttCode]);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeCustomFields)
+		{
+			// Custom fields
+			//
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeCustomFields");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+			$oMyChangeOp->Set("prevdata", json_encode($original->GetValues()));
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		elseif ($oAttDef instanceOf AttributeURL)
+		{
+			// URLs
+			//
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeURL");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+			$oMyChangeOp->Set("oldvalue", $original);
+			$oMyChangeOp->Set("newvalue", $value);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+		else
+		{
+			// Scalars
+			//
+			$oMyChangeOp = MetaModel::NewObject("CMDBChangeOpSetAttributeScalar");
+			$oMyChangeOp->Set("objclass", get_class($this));
+			$oMyChangeOp->Set("objkey", $this->GetKey());
+			$oMyChangeOp->Set("attcode", $sAttCode);
+			$oMyChangeOp->Set("oldvalue", $original);
+			$oMyChangeOp->Set("newvalue", $value);
+			$iId = $oMyChangeOp->DBInsertNoReload();
+		}
+	}
+
+	/**
+	 * @param array $aValues
+	 * @param array $aOrigValues
+	 */
+	protected function RecordAttChanges(array $aValues, array $aOrigValues)
+	{
+		parent::RecordAttChanges($aValues, $aOrigValues);
+
+		// $aValues is an array of $sAttCode => $value
+		//
+		foreach ($aValues as $sAttCode=> $value)
+		{
+			if (array_key_exists($sAttCode, $aOrigValues))
+			{
+				$original = $aOrigValues[$sAttCode];
+			}
+			else
+			{
+				$original = null;
+			}
+			$this->RecordAttChange($sAttCode, $original, $value);
+		}
+	}
+
+	/**
+	 * Helper to ultimately check user rights before writing (Insert, Update or Delete)
+	 * The check should never fail, because the UI should prevent from such a usage
+	 * Anyhow, if the user has found a workaround... the security gets enforced here	 	 
+	 */
+	protected function CheckUserRights($bSkipStrongSecurity, $iActionCode)
+	{
+		if (is_null($bSkipStrongSecurity))
+		{
+			// This is temporary
+			// We have implemented this safety net right before releasing iTop 1.0
+			// and we decided that it was too risky to activate it
+			// Anyhow, users willing to have a very strong security could set
+			// skip_strong_security = 0, in the config file
+			$bSkipStrongSecurity = MetaModel::GetConfig()->Get('skip_strong_security');
+		}
+		if (!$bSkipStrongSecurity)
+		{
+			$sClass = get_class($this);
+			$oSet = DBObjectSet::FromObject($this);
+			if (!UserRights::IsActionAllowed($sClass, $iActionCode, $oSet))
+			{
+				// Intrusion detected
+				throw new SecurityException('You are not allowed to modify objects of class: '.$sClass);
+			}
+		}
+	}
+
+
+	public function DBInsertTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	{
+		self::SetCurrentChange($oChange);
+		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
+		$ret = $this->DBInsertTracked_Internal();
+		return $ret;
+	}
+	
+	public function DBInsertTrackedNoReload(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	{
+		self::SetCurrentChange($oChange);
+		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
+		$ret = $this->DBInsertTracked_Internal(true);
+		return $ret;
+	}
+	
+	/**
+	 * To Be Obsoleted: DO NOT rely on an overload of this method since
+	 * DBInsertTracked (resp. DBInsertTrackedNoReload) may call directly
+	 * DBInsert (resp. DBInsertNoReload) in future versions of iTop.
+	 * @param bool $bDoNotReload
+	 * @return integer Identifier of the created object
+	 */
+	protected function DBInsertTracked_Internal($bDoNotReload = false)
+	{
+		if ($bDoNotReload)
+		{
+			$ret = $this->DBInsertNoReload();
+		}
+		else
+		{
+			$ret = $this->DBInsert();
+		}
+		return $ret;
+	}
+
+	public function DBClone($newKey = null)
+	{
+		return $this->DBCloneTracked_Internal();
+	}
+
+	public function DBCloneTracked(CMDBChange $oChange, $newKey = null)
+	{
+		self::SetCurrentChange($oChange);
+		$this->DBCloneTracked_Internal($newKey);
+	}
+
+	protected function DBCloneTracked_Internal($newKey = null)
+	{
+		$newKey = parent::DBClone($newKey);
+		$oClone = MetaModel::GetObject(get_class($this), $newKey); 
+
+		return $newKey;
+	}
+
+	public function DBUpdate()
+	{
+		// Copy the changes list before the update (the list should be reset afterwards)
+		$aChanges = $this->ListChanges();
+		if (count($aChanges) == 0)
+		{
+			return;
+		}
+		
+		$ret = parent::DBUpdate();
+		return $ret;
+	}
+
+	public function DBUpdateTracked(CMDBChange $oChange, $bSkipStrongSecurity = null)
+	{
+		self::SetCurrentChange($oChange);
+		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_MODIFY);
+		$this->DBUpdate();
+	}
+
+	public function DBDelete(&$oDeletionPlan = null)
+	{
+		return $this->DBDeleteTracked_Internal($oDeletionPlan);
+	}
+
+	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
+	{
+		self::SetCurrentChange($oChange);
+		$this->CheckUserRights($bSkipStrongSecurity, UR_ACTION_DELETE);
+		$this->DBDeleteTracked_Internal($oDeletionPlan);
+	}
+
+	protected function DBDeleteTracked_Internal(&$oDeletionPlan = null)
+	{
+		$prevkey = $this->GetKey();
+		$ret = parent::DBDelete($oDeletionPlan);
+		return $ret;
+	}
+
+	public static function BulkUpdate(DBSearch $oFilter, array $aValues)
+	{
+		return static::BulkUpdateTracked_Internal($oFilter, $aValues);
+	}
+
+	public static function BulkUpdateTracked(CMDBChange $oChange, DBSearch $oFilter, array $aValues)
+	{
+		self::SetCurrentChange($oChange);
+		static::BulkUpdateTracked_Internal($oFilter, $aValues);
+	}
+
+	protected static function BulkUpdateTracked_Internal(DBSearch $oFilter, array $aValues)
+	{
+		// $aValues is an array of $sAttCode => $value
+
+		// Get the list of objects to update (and load it before doing the change)
+		$oObjSet = new CMDBObjectSet($oFilter);
+		$oObjSet->Load();
+
+		// Keep track of the previous values (will be overwritten when the objects are synchronized with the DB)
+		$aOriginalValues = array();
+		$oObjSet->Rewind();
+		while ($oItem = $oObjSet->Fetch())
+		{
+			$aOriginalValues[$oItem->GetKey()] = $oItem->m_aOrigValues;
+		}
+
+		// Update in one single efficient query
+		$ret = parent::BulkUpdate($oFilter, $aValues);
+
+		// Record... in many queries !!!
+		$oObjSet->Rewind();
+		while ($oItem = $oObjSet->Fetch())
+		{
+			$aChangedValues = $oItem->ListChangedValues($aValues);
+			$oItem->RecordAttChanges($aChangedValues, $aOriginalValues[$oItem->GetKey()]);
+		}
+		return $ret;
+	}
+
+	public function DBArchive()
+	{
+		// Note: do the job anyway, so as to repair any DB discrepancy
+		$bOriginal = $this->Get('archive_flag');
+		parent::DBArchive();
+
+		if (!$bOriginal)
+		{
+			utils::PushArchiveMode(false);
+			$this->RecordAttChange('archive_flag', false, true);
+			utils::PopArchiveMode();
+		}
+	}
+
+	public function DBUnarchive()
+	{
+		// Note: do the job anyway, so as to repair any DB discrepancy
+		$bOriginal = $this->Get('archive_flag');
+		parent::DBUnarchive();
+
+		if ($bOriginal)
+		{
+			utils::PushArchiveMode(false);
+			$this->RecordAttChange('archive_flag', true, false);
+			utils::PopArchiveMode();
+		}
+	}
+}
+
+
+
+/**
+ * TODO: investigate how to get rid of this class that was made to workaround some language limitation... or a poor design!
+ *
+ * @package     iTopORM
+ */
+class CMDBObjectSet extends DBObjectSet
+{
+	// this is the public interface (?)
+	
+	// I have to define those constructors here... :-(
+	// just to get the right object class in return.
+	// I have to think again to those things: maybe it will work fine if a have a constructor define here (?)
+	
+	static public function FromScratch($sClass)
+	{
+		$oFilter = new DBObjectSearch($sClass);
+		$oFilter->AddConditionExpression(new FalseExpression());
+		$oRetSet = new self($oFilter);
+		// NOTE: THIS DOES NOT WORK IF m_bLoaded is private in the base class (and you will not get any error message)
+		$oRetSet->m_bLoaded = true; // no DB load
+		return $oRetSet;
+	} 
+
+	// create an object set ex nihilo
+	// input = array of objects
+	static public function FromArray($sClass, $aObjects)
+	{
+		$oRetSet = self::FromScratch($sClass);
+		$oRetSet->AddObjectArray($aObjects, $sClass);
+		return $oRetSet;
+	} 
+
+	static public function FromArrayAssoc($aClasses, $aObjects)
+	{
+		// In a perfect world, we should create a complete tree of DBObjectSearch,
+		// but as we lack most of the information related to the objects,
+		// let's create one search definition
+		$sClass = reset($aClasses);
+		$sAlias = key($aClasses);
+		$oFilter = new DBObjectSearch($sClass, $sAlias);
+
+		$oRetSet = new CMDBObjectSet($oFilter);
+		$oRetSet->m_bLoaded = true; // no DB load
+
+		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
+		{
+			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
+		}
+		return $oRetSet;
+	}
+}
diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php
index 0bdeab500..c7d47ef3b 100644
--- a/core/cmdbsource.class.inc.php
+++ b/core/cmdbsource.class.inc.php
@@ -1,1214 +1,1214 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * DB Server abstraction
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('MyHelpers.class.inc.php');
-require_once(APPROOT.'core/kpi.class.inc.php');
-
-class MySQLException extends CoreException
-{
-	/**
-	 * MySQLException constructor.
-	 *
-	 * @param string $sIssue
-	 * @param array $aContext
-	 * @param \Exception $oException
-	 * @param \mysqli $oMysqli to use when working with a custom mysqli instance
-	 */
-	public function __construct($sIssue, $aContext, $oException = null, $oMysqli = null)
-	{
-		if ($oException != null)
-		{
-			$aContext['mysql_errno'] = $oException->getCode();
-			$this->code = $oException->getCode();
-			$aContext['mysql_error'] = $oException->getMessage();
-		}
-		else if ($oMysqli != null)
-		{
-			$aContext['mysql_errno'] = $oMysqli->errno;
-			$this->code = $oMysqli->errno;
-			$aContext['mysql_error'] = $oMysqli->error;
-		}
-		else
-		{
-			$aContext['mysql_errno'] = CMDBSource::GetErrNo();
-			$this->code = CMDBSource::GetErrNo();
-			$aContext['mysql_error'] = CMDBSource::GetError();
-		}
-		parent::__construct($sIssue, $aContext);
-	}
-}
-
-/**
- * Class MySQLQueryHasNoResultException
- *
- * @since 2.5
- */
-class MySQLQueryHasNoResultException extends MySQLException
-{
-
-}
-
-/**
- * Class MySQLHasGoneAwayException
- *
- * @since 2.5
- * @see itop bug 1195
- * @see https://dev.mysql.com/doc/refman/5.7/en/gone-away.html
- */
-class MySQLHasGoneAwayException extends MySQLException
-{
-	/**
-	 * can not be a constant before PHP 5.6 (http://php.net/manual/fr/language.oop5.constants.php)
-	 *
-	 * @return int[]
-	 */
-	public static function getErrorCodes()
-	{
-		return array(
-			2006,
-			2013
-		);
-	}
-
-	public function __construct($sIssue, $aContext)
-	{
-		parent::__construct($sIssue, $aContext, null);
-	}
-}
-
-
-/**
- * CMDBSource
- * database access wrapper 
- *
- * @package     iTopORM
- */
-class CMDBSource
-{
-	protected static $m_sDBHost;
-	protected static $m_sDBUser;
-	protected static $m_sDBPwd;
-	protected static $m_sDBName;
-	/**
-	 * @var boolean
-	 * @since 2.5 #1260 MySQL TLS first implementation
-	 */
-	protected static $m_bDBTlsEnabled;
-	/**
-	 * @var string
-	 * @since 2.5 #1260 MySQL TLS first implementation
-	 */
-	protected static $m_sDBTlsCA;
-
-	/** @var mysqli $m_oMysqli */
-	protected static $m_oMysqli;
-
-	/**
-	 * SQL charset & collation declaration for text columns
-	 *
-	 * Using a function instead of a constant or attribute to avoid crash in the setup for older PHP versions (cannot
-	 * use expression as value)
-	 *
-	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html
-	 * @since 2.5 #1001 switch to utf8mb4
-	 */
-	public static function GetSqlStringColumnDefinition()
-	{
-		return ' CHARACTER SET '.DEFAULT_CHARACTER_SET.' COLLATE '.DEFAULT_COLLATION;
-	}
-
-	/**
-	 * @param Config $oConfig
-	 *
-	 * @throws \MySQLException
-	 * @uses \CMDBSource::Init()
-	 * @uses \CMDBSource::SetCharacterSet()
-	 */
-	public static function InitFromConfig($oConfig)
-	{
-		$sServer = $oConfig->Get('db_host');
-		$sUser = $oConfig->Get('db_user');
-		$sPwd = $oConfig->Get('db_pwd');
-		$sSource = $oConfig->Get('db_name');
-		$bTlsEnabled = $oConfig->Get('db_tls.enabled');
-		$sTlsCA = $oConfig->Get('db_tls.ca');
-
-		self::Init($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA);
-
-		$sCharacterSet = DEFAULT_CHARACTER_SET;
-		$sCollation = DEFAULT_COLLATION;
-		self::SetCharacterSet($sCharacterSet, $sCollation);
-	}
-
-	/**
-	 * @param string $sServer
-	 * @param string $sUser
-	 * @param string $sPwd
-	 * @param string $sSource database to use
-	 * @param bool $bTlsEnabled
-	 * @param string $sTlsCA
-	 *
-	 * @throws \MySQLException
-	 */
-	public static function Init(
-		$sServer, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCA = null
-	)
-	{
-		self::$m_sDBHost = $sServer;
-		self::$m_sDBUser = $sUser;
-		self::$m_sDBPwd = $sPwd;
-		self::$m_sDBName = $sSource;
-		self::$m_bDBTlsEnabled = empty($bTlsEnabled) ? false : $bTlsEnabled;
-		self::$m_sDBTlsCA = empty($sTlsCA) ? null : $sTlsCA;
-
-		self::$m_oMysqli = self::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA, true);
-	}
-
-	/**
-	 * @param string $sDbHost
-	 * @param string $sUser
-	 * @param string $sPwd
-	 * @param string $sSource database to use
-	 * @param bool $bTlsEnabled
-	 * @param string $sTlsCa
-	 * @param bool $bCheckTlsAfterConnection If true then verify after connection if it is encrypted
-	 *
-	 * @return \mysqli
-	 * @throws \MySQLException
-	 */
-	public static function GetMysqliInstance(
-		$sDbHost, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCa = null, $bCheckTlsAfterConnection = false
-	) {
-		$oMysqli = null;
-
-		$sServer = null;
-		$iPort = null;
-		self::InitServerAndPort($sDbHost, $sServer, $iPort);
-
-		$iFlags = null;
-
-		// *some* errors (like connection errors) will throw mysqli_sql_exception instead of generating warnings printed to the output
-		// but some other errors will still cause the query() method to return false !!!
-		mysqli_report(MYSQLI_REPORT_STRICT);
-
-		try
-		{
-			$oMysqli = new mysqli();
-			$oMysqli->init();
-
-			if ($bTlsEnabled)
-			{
-				$iFlags = (empty($sTlsCa))
-					? MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
-					: MYSQLI_CLIENT_SSL;
-				$sTlsCert = null; // not implemented
-				$sTlsCaPath = null; // not implemented
-				$sTlsCipher = null; // not implemented
-				$oMysqli->ssl_set($bTlsEnabled, $sTlsCert, $sTlsCa, $sTlsCaPath, $sTlsCipher);
-			}
-			$oMysqli->real_connect($sServer, $sUser, $sPwd, '', $iPort, ini_get("mysqli.default_socket"), $iFlags);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			throw new MySQLException('Could not connect to the DB server', array('host' => $sServer, 'user' => $sUser), $e);
-		}
-
-		if ($bTlsEnabled
-			&& $bCheckTlsAfterConnection
-			&& !self::IsOpenedDbConnectionUsingTls($oMysqli))
-		{
-			throw new MySQLException("Connection to the database is not encrypted whereas it was opened using TLS parameters",
-				null, null, $oMysqli);
-		}
-
-		if (!empty($sSource))
-		{
-			try
-			{
-				mysqli_report(MYSQLI_REPORT_STRICT); // Errors, in the next query, will throw mysqli_sql_exception
-				$oMysqli->query("USE `$sSource`");
-			}
-			catch(mysqli_sql_exception $e)
-			{
-				throw new MySQLException('Could not select DB',
-					array('host' => $sServer, 'user' => $sUser, 'db_name' => $sSource), $e);
-			}
-		}
-
-		return $oMysqli;
-	}
-
-	/**
-	 * @param string $sDbHost initial value ("p:domain:port" syntax)
-	 * @param string $sServer server variable to update
-	 * @param int $iPort port variable to update
-	 */
-	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
-	{
-		$aConnectInfo = explode(':', $sDbHost);
-
-		$bUsePersistentConnection = false;
-		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];
-		}
-		else
-		{
-			$sServer = $aConnectInfo[0];
-		}
-
-		$iConnectInfoCount = count($aConnectInfo);
-		if ($bUsePersistentConnection && ($iConnectInfoCount == 3))
-		{
-			$iPort = $aConnectInfo[2];
-		}
-		else if (!$bUsePersistentConnection && ($iConnectInfoCount == 2))
-		{
-			$iPort = $aConnectInfo[1];
-		}
-		else
-		{
-			$iPort = 3306;
-		}
-	}
-
-	/**
-	 * <p>A DB connection can be opened transparently (no errors thrown) without being encrypted, whereas the TLS
-	 * parameters were used.<br>
-	 * This method can be called to ensure that the DB connection really uses TLS.
-	 *
-	 * <p>We're using this object connection : {@link self::$m_oMysqli}
-	 *
-	 * @param \mysqli $oMysqli
-	 *
-	 * @return boolean true if the connection was really established using TLS
-	 * @throws \MySQLException
-	 *
-	 * @uses IsMySqlVarNonEmpty
-	 */
-	private static function IsOpenedDbConnectionUsingTls($oMysqli)
-	{
-		if (self::$m_oMysqli == null)
-		{
-			self::$m_oMysqli = $oMysqli;
-		}
-
-		$bNonEmptySslVersionVar = self::IsMySqlVarNonEmpty('ssl_version');
-		$bNonEmptySslCipherVar = self::IsMySqlVarNonEmpty('ssl_cipher');
-
-		return ($bNonEmptySslVersionVar && $bNonEmptySslCipherVar);
-	}
-
-	/**
-	 * @param string $sVarName
-	 *
-	 * @return bool
-	 * @throws \MySQLException
-	 *
-	 * @uses SHOW STATUS queries
-	 */
-	private static function IsMySqlVarNonEmpty($sVarName)
-	{
-		try
-		{
-			$sResult = self::QueryToScalar("SHOW SESSION STATUS LIKE '$sVarName'", 1);
-		}
-		catch (MySQLQueryHasNoResultException $e)
-		{
-			$sResult = null;
-		}
-
-		return (!empty($sResult));
-	}
-
-	public static function SetCharacterSet($sCharset = DEFAULT_CHARACTER_SET, $sCollation = DEFAULT_COLLATION)
-	{
-		if (strlen($sCharset) > 0)
-		{
-			if (strlen($sCollation) > 0)
-			{
-				self::Query("SET NAMES '$sCharset' COLLATE '$sCollation'");
-			}
-			else
-			{
-				self::Query("SET NAMES '$sCharset'");
-			}
-		}
-	}
-
-	public static function SetTimezone($sTimezone = null)
-	{
-		// Note: requires the installation of MySQL special tables,
-		//       otherwise, only 'SYSTEM' or "+10:00' may be specified which is NOT sufficient because of day light saving times
-		if (!is_null($sTimezone))
-		{
-			$sQuotedTimezone = self::Quote($sTimezone);
-			self::Query("SET time_zone = $sQuotedTimezone");
-		}
-	}
-
-	public static function ListDB()
-	{
-		$aDBs = self::QueryToCol('SHOW DATABASES', 'Database');
-		// Show Database does return the DB names in lower case
-		return $aDBs;
-	}
-
-	public static function IsDB($sSource)
-	{
-		try
-		{
-			$aDBs = self::ListDB();
-			foreach($aDBs as $sDBName)
-			{
-			// perform a case insensitive test because on Windows the table names become lowercase :-(
-				if (strtolower($sDBName) == strtolower($sSource)) return true;
-			}
-			return false;
-		}
-		catch(Exception $e)
-		{
-			// In case we don't have rights to enumerate the databases
-			// Let's try to connect directly
-			return @((bool)self::$m_oMysqli->query("USE `$sSource`"));
-		}
-
-	}
-
-	public static function GetDBVersion()
-	{
-		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
-		return $aVersions[0];
-	}
-
-	/**
-	 * @param string $sSource
-	 *
-	 * @throws \MySQLException
-	 */
-	public static function SelectDB($sSource)
-	{
-		if (!((bool)self::$m_oMysqli->query("USE `$sSource`")))
-		{
-			throw new MySQLException('Could not select DB', array('db_name'=>$sSource));
-		}
-		self::$m_sDBName = $sSource;
-	}
-
-	/**
-	 * @param string $sSource
-	 *
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public static function CreateDB($sSource)
-	{
-		self::Query("CREATE DATABASE `$sSource` CHARACTER SET ".DEFAULT_CHARACTER_SET." COLLATE ".DEFAULT_COLLATION);
-		self::SelectDB($sSource);
-	}
-
-	public static function DropDB($sDBToDrop = '')
-	{
-		if (empty($sDBToDrop))
-		{
-			$sDBToDrop = self::$m_sDBName;
-		}
-		self::Query("DROP DATABASE `$sDBToDrop`");
-		if ($sDBToDrop == self::$m_sDBName)
-		{
-			self::$m_sDBName = '';
-		}
-	}
-
-	public static function CreateTable($sQuery)
-	{
-		$res = self::Query($sQuery);
-		self::_TablesInfoCacheReset(); // reset the table info cache!
-		return $res;
-	}
-
-	public static function DropTable($sTable)
-	{
-		$res = self::Query("DROP TABLE `$sTable`");
-		self::_TablesInfoCacheReset(true); // reset the table info cache!
-		return $res;
-	}
-
-	/**
-	 * @return \mysqli
-	 */
-	public static function GetMysqli()
-	{
-		return self::$m_oMysqli;
-	}
-
-	public static function GetErrNo()
-	{
-		if (self::$m_oMysqli->errno != 0)
-		{
-			return self::$m_oMysqli->errno;
-		}
-		else
-		{
-			return self::$m_oMysqli->connect_errno;
-		}
-	}
-
-	public static function GetError()
-	{
-		if (self::$m_oMysqli->error != '')
-		{
-			return self::$m_oMysqli->error;
-		}
-		else
-		{
-			return self::$m_oMysqli->connect_error;
-		}
-	}
-
-	public static function DBHost() {return self::$m_sDBHost;}
-	public static function DBUser() {return self::$m_sDBUser;}
-	public static function DBPwd() {return self::$m_sDBPwd;}
-	public static function DBName() {return self::$m_sDBName;}
-
-	/**
-	 * Quote variable and protect against SQL injection attacks
-	 * Code found in the PHP documentation: quote_smart($value)
-	 *
-	 * @param mixed $value
-	 * @param bool $bAlways should be set to true when the purpose is to create a IN clause,
-	 *                      otherwise and if there is a mix of strings and numbers, the clause would always be false
-	 * @param string $cQuoteStyle
-	 *
-	 * @return array|string
-	 */
-	public static function Quote($value, $bAlways = false, $cQuoteStyle = "'")
-	{
-		if (is_null($value))
-		{
-			return 'NULL';
-		}
-
-		if (is_array($value))
-		{
-			$aRes = array();
-			foreach ($value as $key => $itemvalue)
-			{
-				$aRes[$key] = self::Quote($itemvalue, $bAlways, $cQuoteStyle);
-			}
-			return $aRes;
-		}
-
-		// Stripslashes
-		if (get_magic_quotes_gpc())
-		{
-			$value = stripslashes($value);
-		}
-		// Quote if not a number or a numeric string
-		if ($bAlways || is_string($value))
-		{
-			$value = $cQuoteStyle . self::$m_oMysqli->real_escape_string($value) . $cQuoteStyle;
-		}
-		return $value;
-	}
-
-	/**
-	 * @param string $sSQLQuery
-	 *
-	 * @return \mysqli_result
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public static function Query($sSQLQuery)
-	{
-		$oKPI = new ExecutionKPI();
-		try
-		{
-			$oResult = self::$m_oMysqli->query($sSQLQuery);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSQLQuery, $e));
-		}
-		$oKPI->ComputeStats('Query exec (mySQL)', $sSQLQuery);
-		if ($oResult === false)
-		{
-			$aContext = array('query' => $sSQLQuery);
-
-			$iMySqlErrorNo = self::$m_oMysqli->errno;
-			$aMySqlHasGoneAwayErrorCodes = MySQLHasGoneAwayException::getErrorCodes();
-			if (in_array($iMySqlErrorNo, $aMySqlHasGoneAwayErrorCodes))
-			{
-				throw new MySQLHasGoneAwayException(self::GetError(), $aContext);
-			}
-
-			throw new MySQLException('Failed to issue SQL query', $aContext);
-		}
-	
-		return $oResult;
-	}
-
-	/**
-	 * @param string $sTable
-	 *
-	 * @return int
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public static function GetNextInsertId($sTable)
-	{
-		$sSQL = "SHOW TABLE STATUS LIKE '$sTable'";
-		$oResult = self::Query($sSQL);
-		$aRow = $oResult->fetch_assoc();
-
-		return $aRow['Auto_increment'];
-	}
-
-	public static function GetInsertId()
-	{
-		$iRes = self::$m_oMysqli->insert_id;
-		if (is_null($iRes))
-		{
-			return 0;
-		}
-		return $iRes;
-	}
-
-	public static function InsertInto($sSQLQuery)
-	{
-		if (self::Query($sSQLQuery))
-		{
-			return self::GetInsertId();
-		}
-		return false;
-	}
-
-	public static function DeleteFrom($sSQLQuery)
-	{
-		self::Query($sSQLQuery);
-	}
-
-	/**
-	 * @param string $sSql
-	 * @param int $iCol beginning at 0
-	 *
-	 * @return string corresponding cell content on the first line
-	 * @throws \MySQLException
-	 * @throws \MySQLQueryHasNoResultException
-	 */
-	public static function QueryToScalar($sSql, $iCol = 0)
-	{
-		$oKPI = new ExecutionKPI();
-		try
-		{
-			$oResult = self::$m_oMysqli->query($sSql);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
-		}
-		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-		if ($oResult === false)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
-		}
-
-		if ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
-		{
-			$res = $aRow[$iCol];
-		}
-		else
-		{
-			$oResult->free();
-			throw new MySQLQueryHasNoResultException('Found no result for query', array('query' => $sSql));
-		}
-		$oResult->free();
-
-		return $res;
-	}
-
-
-	/**
-	 * @param string $sSql
-	 *
-	 * @return array
-	 * @throws \MySQLException if query cannot be processed
-	 */
-	public static function QueryToArray($sSql)
-	{
-		$aData = array();
-		$oKPI = new ExecutionKPI();
-		try
-		{
-			$oResult = self::$m_oMysqli->query($sSql);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
-		}
-		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
-		if ($oResult === false)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
-		}
-				
-		while ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
-		{
-			$aData[] = $aRow;
-		}
-		$oResult->free();
-		return $aData;
-	}
-
-	/**
-	 * @param string $sSql
-	 * @param int $col
-	 *
-	 * @return array
-	 * @throws \MySQLException
-	 */
-	public static function QueryToCol($sSql, $col)
-	{
-		$aColumn = array();
-		$aData = self::QueryToArray($sSql);
-		foreach($aData as $aRow)
-		{
-			@$aColumn[] = $aRow[$col];
-		}
-		return $aColumn;
-	}
-
-	/**
-	 * @param string $sSql
-	 *
-	 * @return array
-	 * @throws \MySQLException if query cannot be processed
-	 */
-	public static function ExplainQuery($sSql)
-	{
-		$aData = array();
-		try
-		{
-			$oResult = self::$m_oMysqli->query($sSql);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
-		}
-		if ($oResult === false)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
-		}
-
-		$aNames = self::GetColumns($oResult, $sSql);
-
-		$aData[] = $aNames;
-		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
-		{
-			$aData[] = $aRow;
-		}
-		$oResult->free();
-		return $aData;
-	}
-
-	/**
-	 * @param string $sSql
-	 *
-	 * @return string
-	 * @throws \MySQLException if query cannot be processed
-	 */
-	public static function TestQuery($sSql)
-	{
-		try
-		{
-			$oResult = self::$m_oMysqli->query($sSql);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
-		}
-		if ($oResult === false)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
-		}
-
-		if (is_object($oResult))
-		{
-			$oResult->free();
-		}
-		return '';
-	}
-
-	public static function NbRows($oResult)
-	{
-		return $oResult->num_rows;
-	}
-
-	public static function AffectedRows()
-	{
-		return self::$m_oMysqli->affected_rows;
-	}
-
-	public static function FetchArray($oResult)
-	{
-		return $oResult->fetch_array(MYSQLI_ASSOC);
-	}
-
-	/**
-	 * @param mysqli_result $oResult
-	 * @param string $sSql
-	 *
-	 * @return string[]
-	 * @throws \MySQLException
-	 */
-	public static function GetColumns($oResult, $sSql)
-	{
-		$aNames = array();
-		for ($i = 0; $i < (($___mysqli_tmp = $oResult->field_count) ? $___mysqli_tmp : 0) ; $i++)
-		{
-			$meta = $oResult->fetch_field_direct($i);
-			if (!$meta)
-			{
-				throw new MySQLException('mysql_fetch_field: No information available', array('query'=>$sSql, 'i'=>$i));
-			}
-			else
-			{
-				$aNames[] = $meta->name;
-			}
-		}
-		return $aNames;
-	}
-
-	public static function Seek($oResult, $iRow)
-	{
-		return $oResult->data_seek($iRow);
-	}
-
-	public static function FreeResult($oResult)
-	{
-		$oResult->free(); /* returns void */
-		return true;
-	}
-
-	public static function IsTable($sTable)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		return (!empty($aTableInfo));
-	}
-
-	public static function IsKey($sTable, $iKey)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
-		$aFieldData = $aTableInfo["Fields"][$iKey];
-		if (!array_key_exists("Key", $aFieldData)) return false;
-		return ($aFieldData["Key"] == "PRI"); 
-	}
-
-	public static function IsAutoIncrement($sTable, $sField)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
-		$aFieldData = $aTableInfo["Fields"][$sField];
-		if (!array_key_exists("Extra", $aFieldData)) return false;
-		//MyHelpers::debug_breakpoint($aFieldData);
-		return (strstr($aFieldData["Extra"], "auto_increment")); 
-	}
-
-	public static function IsField($sTable, $sField)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
-		return true;
-	}
-
-	public static function IsNullAllowed($sTable, $sField)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
-		$aFieldData = $aTableInfo["Fields"][$sField];
-		return (strtolower($aFieldData["Null"]) == "yes");
-	}
-
-	public static function GetFieldType($sTable, $sField)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
-		$aFieldData = $aTableInfo["Fields"][$sField];
-		return ($aFieldData["Type"]);
-	}
-
-	/**
-	 * @param string $sTable
-	 * @param string $sField
-	 *
-	 * @return bool|string
-	 * @see \AttributeDefinition::GetSQLColumns()
-	 */
-	public static function GetFieldSpec($sTable, $sField)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
-		$aFieldData = $aTableInfo["Fields"][$sField];
-
-		$sRet = $aFieldData["Type"];
-
-		$sColumnCharset = $aFieldData["Charset"];
-		$sColumnCollation = $aFieldData["Collation"];
-		if (!empty($sColumnCharset))
-		{
-			$sRet .= ' CHARACTER SET '.$sColumnCharset;
-			$sRet .= ' COLLATE '.$sColumnCollation;
-		}
-
-		if ($aFieldData["Null"] == 'NO')
-		{
-			$sRet .= ' NOT NULL';
-		}
-
-		if (is_numeric($aFieldData["Default"]))
-		{
-			if (strtolower(substr($aFieldData["Type"], 0, 5)) == 'enum(')
-			{
-				// Force quotes to match the column declaration statement
-				$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"], true);
-			}
-			else
-			{
-				$default = $aFieldData["Default"] + 0; // Coerce to a numeric variable
-				$sRet .= ' DEFAULT '.self::Quote($default);
-			}
-		}
-		elseif (is_string($aFieldData["Default"]) == 'string')
-		{
-			$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"]);
-		}
-
-		return $sRet;
-	}
-
-	public static function HasIndex($sTable, $sIndexId, $aFields = null, $aLength = null)
-	{
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return false;
-		if (!array_key_exists($sIndexId, $aTableInfo['Indexes'])) return false;
-
-		if ($aFields == null)
-		{
-			// Just searching for the name
-			return true;
-		}
-
-		// Compare the columns
-		$sSearchedIndex = implode(',', $aFields);
-		$aColumnNames = array();
-		$aSubParts = array();
-		foreach($aTableInfo['Indexes'][$sIndexId] as $aIndexDef)
-		{
-			$aColumnNames[] = $aIndexDef['Column_name'];
-			$aSubParts[] = $aIndexDef['Sub_part'];
-		}
-		$sExistingIndex = implode(',', $aColumnNames);
-
-		if (is_null($aLength))
-		{
-			return ($sSearchedIndex == $sExistingIndex);
-		}
-
-		$sSearchedLength = implode(',', $aLength);
-		$sExistingLength = implode(',', $aSubParts);
-
-		return ($sSearchedIndex == $sExistingIndex) && ($sSearchedLength == $sExistingLength);
-	}
-
-	// Returns an array of (fieldname => array of field info)
-	public static function GetTableFieldsList($sTable)
-	{
-		assert(!empty($sTable));
-		
-		$aTableInfo = self::GetTableInfo($sTable);
-		if (empty($aTableInfo)) return array(); // #@# or an error ?
-
-		return array_keys($aTableInfo["Fields"]);
-	}
-	
-	// Cache the information about existing tables, and their fields
-	private static $m_aTablesInfo = array();
-	private static function _TablesInfoCacheReset()
-	{
-		self::$m_aTablesInfo = array();
-	}
-
-	/**
-	 * @param $sTableName
-	 *
-	 * @throws \MySQLException
-	 */
-	private static function _TableInfoCacheInit($sTableName)
-	{
-		if (isset(self::$m_aTablesInfo[strtolower($sTableName)])
-			&& (self::$m_aTablesInfo[strtolower($sTableName)] != null))
-		{
-			return;
-		}
-
-		// Create array entry, if table does not exist / has no columns
-		self::$m_aTablesInfo[strtolower($sTableName)] = null;
-
-		// Get table informations
-		//   We were using SHOW COLUMNS FROM... but this don't return charset and collation info !
-		//   so since 2.5 and #1001 (switch to utf8mb4) we're using INFORMATION_SCHEMA !
-		$aMapping = array(
-			"Name" => "COLUMN_NAME",
-			"Type" => "COLUMN_TYPE",
-			"Null" => "IS_NULLABLE",
-			"Key" => "COLUMN_KEY",
-			"Default" => "COLUMN_DEFAULT",
-			"Extra" => "EXTRA",
-			"Charset" => "CHARACTER_SET_NAME",
-			"Collation" => "COLLATION_NAME",
-			"CharMaxLength" => "CHARACTER_MAXIMUM_LENGTH",
-		);
-		$sColumns = implode(', ', $aMapping);
-		$sDBName = self::$m_sDBName;
-		$aFields = self::QueryToArray("SELECT $sColumns FROM information_schema.`COLUMNS` WHERE table_schema = '$sDBName' AND table_name = '$sTableName';");
-		foreach ($aFields as $aFieldData)
-		{
-			$aFields = array();
-			foreach($aMapping as $sKey => $sColumn)
-			{
-				$aFields[$sKey] = $aFieldData[$sColumn];
-			}
-			$sFieldName = $aFieldData["COLUMN_NAME"];
-			self::$m_aTablesInfo[strtolower($sTableName)]["Fields"][$sFieldName] = $aFields;
-		}
-
-		if (!is_null(self::$m_aTablesInfo[strtolower($sTableName)]))
-		{
-			$aIndexes = self::QueryToArray("SHOW INDEXES FROM `$sTableName`");
-			$aMyIndexes = array();
-			foreach ($aIndexes as $aIndexColumn)
-			{
-				$aMyIndexes[$aIndexColumn['Key_name']][$aIndexColumn['Seq_in_index']-1] = $aIndexColumn;
-			}
-			self::$m_aTablesInfo[strtolower($sTableName)]["Indexes"] = $aMyIndexes;
-		}
-	}
-
-	public static function GetTableInfo($sTable)
-	{
-		self::_TableInfoCacheInit($sTable);
-
-		// perform a case insensitive match because on Windows the table names become lowercase :-(
-		return self::$m_aTablesInfo[strtolower($sTable)];
-	}
-
-	/**
-	 * @param string $sTableName
-	 *
-	 * @return string query to upgrade table charset and collation if needed, null if not
-	 * @throws \MySQLException
-	 *
-	 * @since 2.5 #1001 switch to utf8mb4
-	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-table.html
-	 */
-	public static function DBCheckTableCharsetAndCollation($sTableName)
-	{
-		$sDBName = self::DBName();
-		$sTableInfoQuery = "SELECT C.character_set_name, T.table_collation
-			FROM information_schema.`TABLES` T inner join information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` C
-				ON T.table_collation = C.collation_name
-			WHERE T.table_schema = '$sDBName'
-  			AND T.table_name = '$sTableName';";
-		$aTableInfo = self::QueryToArray($sTableInfoQuery);
-		$sTableCharset = $aTableInfo[0]['character_set_name'];
-		$sTableCollation = $aTableInfo[0]['table_collation'];
-
-		if ((DEFAULT_CHARACTER_SET == $sTableCharset) && (DEFAULT_COLLATION == $sTableCollation))
-		{
-			return null;
-		}
-
-
-		return 'ALTER TABLE `'.$sTableName.'` '.self::GetSqlStringColumnDefinition().';';
-
-	}
-
-	/**
-	 * @param string $sTable
-	 *
-	 * @return array
-	 * @throws \MySQLException if query cannot be processed
-	 */
-	public static function DumpTable($sTable)
-	{
-		$sSql = "SELECT * FROM `$sTable`";
-		try
-		{
-			$oResult = self::$m_oMysqli->query($sSql);
-		}
-		catch(mysqli_sql_exception $e)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql), $e);
-		}
-		if ($oResult === false)
-		{
-			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
-		}
-		
-		$aRows = array();
-		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
-		{
-			$aRows[] = $aRow;
-		}
-		$oResult->free();
-		return $aRows;
-	}
-	
-	/**
-	 * Returns the value of the specified server variable
-	 * @param string $sVarName Name of the server variable
-	 * @return mixed Current value of the variable
-	 */	   	
-	public static function GetServerVariable($sVarName)
-	{
-		$result = '';
-		$sSql = "SELECT @@$sVarName as theVar";
-		$aRows = self::QueryToArray($sSql);
-		if (count($aRows) > 0)
-		{
-			$result = $aRows[0]['theVar'];
-		}
-		return $result;
-	}
-
-
-	/**
-	 * Returns the privileges of the current user
-	 * @return string privileges in a raw format
-	 */	   	
-	public static function GetRawPrivileges()
-	{
-		try
-		{
-			$oResult = self::Query('SHOW GRANTS'); // [ FOR CURRENT_USER()]
-		}
-		catch(MySQLException $e)
-		{
-			$iCode = self::GetErrNo();
-			return "Current user not allowed to see his own privileges (could not access to the database 'mysql' - $iCode)";
-		}
-
-		$aRes = array();
-		while ($aRow = $oResult->fetch_array(MYSQLI_NUM))
-		{
-			// so far, only one column...
-			$aRes[] = implode('/', $aRow);
-		}
-		$oResult->free();
-		// so far, only one line...
-		return implode(', ', $aRes);
-	}
-
-	/**
-	 * Determine the slave status of the server
-	 * @return bool true if the server is slave 
-	 */	   	
-	public static function IsSlaveServer()
-	{
-		try
-		{
-			$oResult = self::Query('SHOW SLAVE STATUS');
-		}
-		catch(MySQLException $e)
-		{
-			throw new CoreException("Current user not allowed to check the status", array('mysql_error' => $e->getMessage()));
-		}
-
-		if ($oResult->num_rows == 0)
-		{
-			return false;
-		}
-
-		// Returns one single row anytime
-		$aRow = $oResult->fetch_array(MYSQLI_ASSOC);
-		$oResult->free();
-
-		if (!isset($aRow['Slave_IO_Running']))
-		{
-			return false;
-		}
-		if (!isset($aRow['Slave_SQL_Running']))
-		{
-			return false;
-		}
-
-		// If at least one slave thread is running, then we consider that the slave is enabled
-		if ($aRow['Slave_IO_Running'] == 'Yes')
-		{
-			return true;
-		}
-		if ($aRow['Slave_SQL_Running'] == 'Yes')
-		{
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @return string query to upgrade database charset and collation if needed, null if not
-	 * @throws \MySQLException
-	 *
-	 * @since 2.5 #1001 switch to utf8mb4
-	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html
-	 */
-	public static function DBCheckCharsetAndCollation()
-	{
-		$sDBName = CMDBSource::DBName();
-		$sDBInfoQuery = "SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
-			FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$sDBName';";
-		$aDBInfo = CMDBSource::QueryToArray($sDBInfoQuery);
-		$sDBCharset = $aDBInfo[0]['DEFAULT_CHARACTER_SET_NAME'];
-		$sDBCollation = $aDBInfo[0]['DEFAULT_COLLATION_NAME'];
-
-		if ((DEFAULT_CHARACTER_SET == $sDBCharset) && (DEFAULT_COLLATION == $sDBCollation))
-		{
-			return null;
-		}
-
-		return 'ALTER DATABASE'.CMDBSource::GetSqlStringColumnDefinition().';';
-	}
-}
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * DB Server abstraction
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('MyHelpers.class.inc.php');
+require_once(APPROOT.'core/kpi.class.inc.php');
+
+class MySQLException extends CoreException
+{
+	/**
+	 * MySQLException constructor.
+	 *
+	 * @param string $sIssue
+	 * @param array $aContext
+	 * @param \Exception $oException
+	 * @param \mysqli $oMysqli to use when working with a custom mysqli instance
+	 */
+	public function __construct($sIssue, $aContext, $oException = null, $oMysqli = null)
+	{
+		if ($oException != null)
+		{
+			$aContext['mysql_errno'] = $oException->getCode();
+			$this->code = $oException->getCode();
+			$aContext['mysql_error'] = $oException->getMessage();
+		}
+		else if ($oMysqli != null)
+		{
+			$aContext['mysql_errno'] = $oMysqli->errno;
+			$this->code = $oMysqli->errno;
+			$aContext['mysql_error'] = $oMysqli->error;
+		}
+		else
+		{
+			$aContext['mysql_errno'] = CMDBSource::GetErrNo();
+			$this->code = CMDBSource::GetErrNo();
+			$aContext['mysql_error'] = CMDBSource::GetError();
+		}
+		parent::__construct($sIssue, $aContext);
+	}
+}
+
+/**
+ * Class MySQLQueryHasNoResultException
+ *
+ * @since 2.5
+ */
+class MySQLQueryHasNoResultException extends MySQLException
+{
+
+}
+
+/**
+ * Class MySQLHasGoneAwayException
+ *
+ * @since 2.5
+ * @see itop bug 1195
+ * @see https://dev.mysql.com/doc/refman/5.7/en/gone-away.html
+ */
+class MySQLHasGoneAwayException extends MySQLException
+{
+	/**
+	 * can not be a constant before PHP 5.6 (http://php.net/manual/fr/language.oop5.constants.php)
+	 *
+	 * @return int[]
+	 */
+	public static function getErrorCodes()
+	{
+		return array(
+			2006,
+			2013
+		);
+	}
+
+	public function __construct($sIssue, $aContext)
+	{
+		parent::__construct($sIssue, $aContext, null);
+	}
+}
+
+
+/**
+ * CMDBSource
+ * database access wrapper 
+ *
+ * @package     iTopORM
+ */
+class CMDBSource
+{
+	protected static $m_sDBHost;
+	protected static $m_sDBUser;
+	protected static $m_sDBPwd;
+	protected static $m_sDBName;
+	/**
+	 * @var boolean
+	 * @since 2.5 #1260 MySQL TLS first implementation
+	 */
+	protected static $m_bDBTlsEnabled;
+	/**
+	 * @var string
+	 * @since 2.5 #1260 MySQL TLS first implementation
+	 */
+	protected static $m_sDBTlsCA;
+
+	/** @var mysqli $m_oMysqli */
+	protected static $m_oMysqli;
+
+	/**
+	 * SQL charset & collation declaration for text columns
+	 *
+	 * Using a function instead of a constant or attribute to avoid crash in the setup for older PHP versions (cannot
+	 * use expression as value)
+	 *
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-column.html
+	 * @since 2.5 #1001 switch to utf8mb4
+	 */
+	public static function GetSqlStringColumnDefinition()
+	{
+		return ' CHARACTER SET '.DEFAULT_CHARACTER_SET.' COLLATE '.DEFAULT_COLLATION;
+	}
+
+	/**
+	 * @param Config $oConfig
+	 *
+	 * @throws \MySQLException
+	 * @uses \CMDBSource::Init()
+	 * @uses \CMDBSource::SetCharacterSet()
+	 */
+	public static function InitFromConfig($oConfig)
+	{
+		$sServer = $oConfig->Get('db_host');
+		$sUser = $oConfig->Get('db_user');
+		$sPwd = $oConfig->Get('db_pwd');
+		$sSource = $oConfig->Get('db_name');
+		$bTlsEnabled = $oConfig->Get('db_tls.enabled');
+		$sTlsCA = $oConfig->Get('db_tls.ca');
+
+		self::Init($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA);
+
+		$sCharacterSet = DEFAULT_CHARACTER_SET;
+		$sCollation = DEFAULT_COLLATION;
+		self::SetCharacterSet($sCharacterSet, $sCollation);
+	}
+
+	/**
+	 * @param string $sServer
+	 * @param string $sUser
+	 * @param string $sPwd
+	 * @param string $sSource database to use
+	 * @param bool $bTlsEnabled
+	 * @param string $sTlsCA
+	 *
+	 * @throws \MySQLException
+	 */
+	public static function Init(
+		$sServer, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCA = null
+	)
+	{
+		self::$m_sDBHost = $sServer;
+		self::$m_sDBUser = $sUser;
+		self::$m_sDBPwd = $sPwd;
+		self::$m_sDBName = $sSource;
+		self::$m_bDBTlsEnabled = empty($bTlsEnabled) ? false : $bTlsEnabled;
+		self::$m_sDBTlsCA = empty($sTlsCA) ? null : $sTlsCA;
+
+		self::$m_oMysqli = self::GetMysqliInstance($sServer, $sUser, $sPwd, $sSource, $bTlsEnabled, $sTlsCA, true);
+	}
+
+	/**
+	 * @param string $sDbHost
+	 * @param string $sUser
+	 * @param string $sPwd
+	 * @param string $sSource database to use
+	 * @param bool $bTlsEnabled
+	 * @param string $sTlsCa
+	 * @param bool $bCheckTlsAfterConnection If true then verify after connection if it is encrypted
+	 *
+	 * @return \mysqli
+	 * @throws \MySQLException
+	 */
+	public static function GetMysqliInstance(
+		$sDbHost, $sUser, $sPwd, $sSource = '', $bTlsEnabled = false, $sTlsCa = null, $bCheckTlsAfterConnection = false
+	) {
+		$oMysqli = null;
+
+		$sServer = null;
+		$iPort = null;
+		self::InitServerAndPort($sDbHost, $sServer, $iPort);
+
+		$iFlags = null;
+
+		// *some* errors (like connection errors) will throw mysqli_sql_exception instead of generating warnings printed to the output
+		// but some other errors will still cause the query() method to return false !!!
+		mysqli_report(MYSQLI_REPORT_STRICT);
+
+		try
+		{
+			$oMysqli = new mysqli();
+			$oMysqli->init();
+
+			if ($bTlsEnabled)
+			{
+				$iFlags = (empty($sTlsCa))
+					? MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
+					: MYSQLI_CLIENT_SSL;
+				$sTlsCert = null; // not implemented
+				$sTlsCaPath = null; // not implemented
+				$sTlsCipher = null; // not implemented
+				$oMysqli->ssl_set($bTlsEnabled, $sTlsCert, $sTlsCa, $sTlsCaPath, $sTlsCipher);
+			}
+			$oMysqli->real_connect($sServer, $sUser, $sPwd, '', $iPort, ini_get("mysqli.default_socket"), $iFlags);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Could not connect to the DB server', array('host' => $sServer, 'user' => $sUser), $e);
+		}
+
+		if ($bTlsEnabled
+			&& $bCheckTlsAfterConnection
+			&& !self::IsOpenedDbConnectionUsingTls($oMysqli))
+		{
+			throw new MySQLException("Connection to the database is not encrypted whereas it was opened using TLS parameters",
+				null, null, $oMysqli);
+		}
+
+		if (!empty($sSource))
+		{
+			try
+			{
+				mysqli_report(MYSQLI_REPORT_STRICT); // Errors, in the next query, will throw mysqli_sql_exception
+				$oMysqli->query("USE `$sSource`");
+			}
+			catch(mysqli_sql_exception $e)
+			{
+				throw new MySQLException('Could not select DB',
+					array('host' => $sServer, 'user' => $sUser, 'db_name' => $sSource), $e);
+			}
+		}
+
+		return $oMysqli;
+	}
+
+	/**
+	 * @param string $sDbHost initial value ("p:domain:port" syntax)
+	 * @param string $sServer server variable to update
+	 * @param int $iPort port variable to update
+	 */
+	public static function InitServerAndPort($sDbHost, &$sServer, &$iPort)
+	{
+		$aConnectInfo = explode(':', $sDbHost);
+
+		$bUsePersistentConnection = false;
+		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];
+		}
+		else
+		{
+			$sServer = $aConnectInfo[0];
+		}
+
+		$iConnectInfoCount = count($aConnectInfo);
+		if ($bUsePersistentConnection && ($iConnectInfoCount == 3))
+		{
+			$iPort = $aConnectInfo[2];
+		}
+		else if (!$bUsePersistentConnection && ($iConnectInfoCount == 2))
+		{
+			$iPort = $aConnectInfo[1];
+		}
+		else
+		{
+			$iPort = 3306;
+		}
+	}
+
+	/**
+	 * <p>A DB connection can be opened transparently (no errors thrown) without being encrypted, whereas the TLS
+	 * parameters were used.<br>
+	 * This method can be called to ensure that the DB connection really uses TLS.
+	 *
+	 * <p>We're using this object connection : {@link self::$m_oMysqli}
+	 *
+	 * @param \mysqli $oMysqli
+	 *
+	 * @return boolean true if the connection was really established using TLS
+	 * @throws \MySQLException
+	 *
+	 * @uses IsMySqlVarNonEmpty
+	 */
+	private static function IsOpenedDbConnectionUsingTls($oMysqli)
+	{
+		if (self::$m_oMysqli == null)
+		{
+			self::$m_oMysqli = $oMysqli;
+		}
+
+		$bNonEmptySslVersionVar = self::IsMySqlVarNonEmpty('ssl_version');
+		$bNonEmptySslCipherVar = self::IsMySqlVarNonEmpty('ssl_cipher');
+
+		return ($bNonEmptySslVersionVar && $bNonEmptySslCipherVar);
+	}
+
+	/**
+	 * @param string $sVarName
+	 *
+	 * @return bool
+	 * @throws \MySQLException
+	 *
+	 * @uses SHOW STATUS queries
+	 */
+	private static function IsMySqlVarNonEmpty($sVarName)
+	{
+		try
+		{
+			$sResult = self::QueryToScalar("SHOW SESSION STATUS LIKE '$sVarName'", 1);
+		}
+		catch (MySQLQueryHasNoResultException $e)
+		{
+			$sResult = null;
+		}
+
+		return (!empty($sResult));
+	}
+
+	public static function SetCharacterSet($sCharset = DEFAULT_CHARACTER_SET, $sCollation = DEFAULT_COLLATION)
+	{
+		if (strlen($sCharset) > 0)
+		{
+			if (strlen($sCollation) > 0)
+			{
+				self::Query("SET NAMES '$sCharset' COLLATE '$sCollation'");
+			}
+			else
+			{
+				self::Query("SET NAMES '$sCharset'");
+			}
+		}
+	}
+
+	public static function SetTimezone($sTimezone = null)
+	{
+		// Note: requires the installation of MySQL special tables,
+		//       otherwise, only 'SYSTEM' or "+10:00' may be specified which is NOT sufficient because of day light saving times
+		if (!is_null($sTimezone))
+		{
+			$sQuotedTimezone = self::Quote($sTimezone);
+			self::Query("SET time_zone = $sQuotedTimezone");
+		}
+	}
+
+	public static function ListDB()
+	{
+		$aDBs = self::QueryToCol('SHOW DATABASES', 'Database');
+		// Show Database does return the DB names in lower case
+		return $aDBs;
+	}
+
+	public static function IsDB($sSource)
+	{
+		try
+		{
+			$aDBs = self::ListDB();
+			foreach($aDBs as $sDBName)
+			{
+			// perform a case insensitive test because on Windows the table names become lowercase :-(
+				if (strtolower($sDBName) == strtolower($sSource)) return true;
+			}
+			return false;
+		}
+		catch(Exception $e)
+		{
+			// In case we don't have rights to enumerate the databases
+			// Let's try to connect directly
+			return @((bool)self::$m_oMysqli->query("USE `$sSource`"));
+		}
+
+	}
+
+	public static function GetDBVersion()
+	{
+		$aVersions = self::QueryToCol('SELECT Version() as version', 'version');
+		return $aVersions[0];
+	}
+
+	/**
+	 * @param string $sSource
+	 *
+	 * @throws \MySQLException
+	 */
+	public static function SelectDB($sSource)
+	{
+		if (!((bool)self::$m_oMysqli->query("USE `$sSource`")))
+		{
+			throw new MySQLException('Could not select DB', array('db_name'=>$sSource));
+		}
+		self::$m_sDBName = $sSource;
+	}
+
+	/**
+	 * @param string $sSource
+	 *
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public static function CreateDB($sSource)
+	{
+		self::Query("CREATE DATABASE `$sSource` CHARACTER SET ".DEFAULT_CHARACTER_SET." COLLATE ".DEFAULT_COLLATION);
+		self::SelectDB($sSource);
+	}
+
+	public static function DropDB($sDBToDrop = '')
+	{
+		if (empty($sDBToDrop))
+		{
+			$sDBToDrop = self::$m_sDBName;
+		}
+		self::Query("DROP DATABASE `$sDBToDrop`");
+		if ($sDBToDrop == self::$m_sDBName)
+		{
+			self::$m_sDBName = '';
+		}
+	}
+
+	public static function CreateTable($sQuery)
+	{
+		$res = self::Query($sQuery);
+		self::_TablesInfoCacheReset(); // reset the table info cache!
+		return $res;
+	}
+
+	public static function DropTable($sTable)
+	{
+		$res = self::Query("DROP TABLE `$sTable`");
+		self::_TablesInfoCacheReset(true); // reset the table info cache!
+		return $res;
+	}
+
+	/**
+	 * @return \mysqli
+	 */
+	public static function GetMysqli()
+	{
+		return self::$m_oMysqli;
+	}
+
+	public static function GetErrNo()
+	{
+		if (self::$m_oMysqli->errno != 0)
+		{
+			return self::$m_oMysqli->errno;
+		}
+		else
+		{
+			return self::$m_oMysqli->connect_errno;
+		}
+	}
+
+	public static function GetError()
+	{
+		if (self::$m_oMysqli->error != '')
+		{
+			return self::$m_oMysqli->error;
+		}
+		else
+		{
+			return self::$m_oMysqli->connect_error;
+		}
+	}
+
+	public static function DBHost() {return self::$m_sDBHost;}
+	public static function DBUser() {return self::$m_sDBUser;}
+	public static function DBPwd() {return self::$m_sDBPwd;}
+	public static function DBName() {return self::$m_sDBName;}
+
+	/**
+	 * Quote variable and protect against SQL injection attacks
+	 * Code found in the PHP documentation: quote_smart($value)
+	 *
+	 * @param mixed $value
+	 * @param bool $bAlways should be set to true when the purpose is to create a IN clause,
+	 *                      otherwise and if there is a mix of strings and numbers, the clause would always be false
+	 * @param string $cQuoteStyle
+	 *
+	 * @return array|string
+	 */
+	public static function Quote($value, $bAlways = false, $cQuoteStyle = "'")
+	{
+		if (is_null($value))
+		{
+			return 'NULL';
+		}
+
+		if (is_array($value))
+		{
+			$aRes = array();
+			foreach ($value as $key => $itemvalue)
+			{
+				$aRes[$key] = self::Quote($itemvalue, $bAlways, $cQuoteStyle);
+			}
+			return $aRes;
+		}
+
+		// Stripslashes
+		if (get_magic_quotes_gpc())
+		{
+			$value = stripslashes($value);
+		}
+		// Quote if not a number or a numeric string
+		if ($bAlways || is_string($value))
+		{
+			$value = $cQuoteStyle . self::$m_oMysqli->real_escape_string($value) . $cQuoteStyle;
+		}
+		return $value;
+	}
+
+	/**
+	 * @param string $sSQLQuery
+	 *
+	 * @return \mysqli_result
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public static function Query($sSQLQuery)
+	{
+		$oKPI = new ExecutionKPI();
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSQLQuery);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSQLQuery, $e));
+		}
+		$oKPI->ComputeStats('Query exec (mySQL)', $sSQLQuery);
+		if ($oResult === false)
+		{
+			$aContext = array('query' => $sSQLQuery);
+
+			$iMySqlErrorNo = self::$m_oMysqli->errno;
+			$aMySqlHasGoneAwayErrorCodes = MySQLHasGoneAwayException::getErrorCodes();
+			if (in_array($iMySqlErrorNo, $aMySqlHasGoneAwayErrorCodes))
+			{
+				throw new MySQLHasGoneAwayException(self::GetError(), $aContext);
+			}
+
+			throw new MySQLException('Failed to issue SQL query', $aContext);
+		}
+	
+		return $oResult;
+	}
+
+	/**
+	 * @param string $sTable
+	 *
+	 * @return int
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public static function GetNextInsertId($sTable)
+	{
+		$sSQL = "SHOW TABLE STATUS LIKE '$sTable'";
+		$oResult = self::Query($sSQL);
+		$aRow = $oResult->fetch_assoc();
+
+		return $aRow['Auto_increment'];
+	}
+
+	public static function GetInsertId()
+	{
+		$iRes = self::$m_oMysqli->insert_id;
+		if (is_null($iRes))
+		{
+			return 0;
+		}
+		return $iRes;
+	}
+
+	public static function InsertInto($sSQLQuery)
+	{
+		if (self::Query($sSQLQuery))
+		{
+			return self::GetInsertId();
+		}
+		return false;
+	}
+
+	public static function DeleteFrom($sSQLQuery)
+	{
+		self::Query($sSQLQuery);
+	}
+
+	/**
+	 * @param string $sSql
+	 * @param int $iCol beginning at 0
+	 *
+	 * @return string corresponding cell content on the first line
+	 * @throws \MySQLException
+	 * @throws \MySQLQueryHasNoResultException
+	 */
+	public static function QueryToScalar($sSql, $iCol = 0)
+	{
+		$oKPI = new ExecutionKPI();
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
+		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
+		if ($oResult === false)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
+		}
+
+		if ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
+		{
+			$res = $aRow[$iCol];
+		}
+		else
+		{
+			$oResult->free();
+			throw new MySQLQueryHasNoResultException('Found no result for query', array('query' => $sSql));
+		}
+		$oResult->free();
+
+		return $res;
+	}
+
+
+	/**
+	 * @param string $sSql
+	 *
+	 * @return array
+	 * @throws \MySQLException if query cannot be processed
+	 */
+	public static function QueryToArray($sSql)
+	{
+		$aData = array();
+		$oKPI = new ExecutionKPI();
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
+		$oKPI->ComputeStats('Query exec (mySQL)', $sSql);
+		if ($oResult === false)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
+		}
+				
+		while ($aRow = $oResult->fetch_array(MYSQLI_BOTH))
+		{
+			$aData[] = $aRow;
+		}
+		$oResult->free();
+		return $aData;
+	}
+
+	/**
+	 * @param string $sSql
+	 * @param int $col
+	 *
+	 * @return array
+	 * @throws \MySQLException
+	 */
+	public static function QueryToCol($sSql, $col)
+	{
+		$aColumn = array();
+		$aData = self::QueryToArray($sSql);
+		foreach($aData as $aRow)
+		{
+			@$aColumn[] = $aRow[$col];
+		}
+		return $aColumn;
+	}
+
+	/**
+	 * @param string $sSql
+	 *
+	 * @return array
+	 * @throws \MySQLException if query cannot be processed
+	 */
+	public static function ExplainQuery($sSql)
+	{
+		$aData = array();
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
+		if ($oResult === false)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
+		}
+
+		$aNames = self::GetColumns($oResult, $sSql);
+
+		$aData[] = $aNames;
+		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
+		{
+			$aData[] = $aRow;
+		}
+		$oResult->free();
+		return $aData;
+	}
+
+	/**
+	 * @param string $sSql
+	 *
+	 * @return string
+	 * @throws \MySQLException if query cannot be processed
+	 */
+	public static function TestQuery($sSql)
+	{
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql, $e));
+		}
+		if ($oResult === false)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
+		}
+
+		if (is_object($oResult))
+		{
+			$oResult->free();
+		}
+		return '';
+	}
+
+	public static function NbRows($oResult)
+	{
+		return $oResult->num_rows;
+	}
+
+	public static function AffectedRows()
+	{
+		return self::$m_oMysqli->affected_rows;
+	}
+
+	public static function FetchArray($oResult)
+	{
+		return $oResult->fetch_array(MYSQLI_ASSOC);
+	}
+
+	/**
+	 * @param mysqli_result $oResult
+	 * @param string $sSql
+	 *
+	 * @return string[]
+	 * @throws \MySQLException
+	 */
+	public static function GetColumns($oResult, $sSql)
+	{
+		$aNames = array();
+		for ($i = 0; $i < (($___mysqli_tmp = $oResult->field_count) ? $___mysqli_tmp : 0) ; $i++)
+		{
+			$meta = $oResult->fetch_field_direct($i);
+			if (!$meta)
+			{
+				throw new MySQLException('mysql_fetch_field: No information available', array('query'=>$sSql, 'i'=>$i));
+			}
+			else
+			{
+				$aNames[] = $meta->name;
+			}
+		}
+		return $aNames;
+	}
+
+	public static function Seek($oResult, $iRow)
+	{
+		return $oResult->data_seek($iRow);
+	}
+
+	public static function FreeResult($oResult)
+	{
+		$oResult->free(); /* returns void */
+		return true;
+	}
+
+	public static function IsTable($sTable)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		return (!empty($aTableInfo));
+	}
+
+	public static function IsKey($sTable, $iKey)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($iKey, $aTableInfo["Fields"])) return false;
+		$aFieldData = $aTableInfo["Fields"][$iKey];
+		if (!array_key_exists("Key", $aFieldData)) return false;
+		return ($aFieldData["Key"] == "PRI"); 
+	}
+
+	public static function IsAutoIncrement($sTable, $sField)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
+		$aFieldData = $aTableInfo["Fields"][$sField];
+		if (!array_key_exists("Extra", $aFieldData)) return false;
+		//MyHelpers::debug_breakpoint($aFieldData);
+		return (strstr($aFieldData["Extra"], "auto_increment")); 
+	}
+
+	public static function IsField($sTable, $sField)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
+		return true;
+	}
+
+	public static function IsNullAllowed($sTable, $sField)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
+		$aFieldData = $aTableInfo["Fields"][$sField];
+		return (strtolower($aFieldData["Null"]) == "yes");
+	}
+
+	public static function GetFieldType($sTable, $sField)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
+		$aFieldData = $aTableInfo["Fields"][$sField];
+		return ($aFieldData["Type"]);
+	}
+
+	/**
+	 * @param string $sTable
+	 * @param string $sField
+	 *
+	 * @return bool|string
+	 * @see \AttributeDefinition::GetSQLColumns()
+	 */
+	public static function GetFieldSpec($sTable, $sField)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($sField, $aTableInfo["Fields"])) return false;
+		$aFieldData = $aTableInfo["Fields"][$sField];
+
+		$sRet = $aFieldData["Type"];
+
+		$sColumnCharset = $aFieldData["Charset"];
+		$sColumnCollation = $aFieldData["Collation"];
+		if (!empty($sColumnCharset))
+		{
+			$sRet .= ' CHARACTER SET '.$sColumnCharset;
+			$sRet .= ' COLLATE '.$sColumnCollation;
+		}
+
+		if ($aFieldData["Null"] == 'NO')
+		{
+			$sRet .= ' NOT NULL';
+		}
+
+		if (is_numeric($aFieldData["Default"]))
+		{
+			if (strtolower(substr($aFieldData["Type"], 0, 5)) == 'enum(')
+			{
+				// Force quotes to match the column declaration statement
+				$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"], true);
+			}
+			else
+			{
+				$default = $aFieldData["Default"] + 0; // Coerce to a numeric variable
+				$sRet .= ' DEFAULT '.self::Quote($default);
+			}
+		}
+		elseif (is_string($aFieldData["Default"]) == 'string')
+		{
+			$sRet .= ' DEFAULT '.self::Quote($aFieldData["Default"]);
+		}
+
+		return $sRet;
+	}
+
+	public static function HasIndex($sTable, $sIndexId, $aFields = null, $aLength = null)
+	{
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return false;
+		if (!array_key_exists($sIndexId, $aTableInfo['Indexes'])) return false;
+
+		if ($aFields == null)
+		{
+			// Just searching for the name
+			return true;
+		}
+
+		// Compare the columns
+		$sSearchedIndex = implode(',', $aFields);
+		$aColumnNames = array();
+		$aSubParts = array();
+		foreach($aTableInfo['Indexes'][$sIndexId] as $aIndexDef)
+		{
+			$aColumnNames[] = $aIndexDef['Column_name'];
+			$aSubParts[] = $aIndexDef['Sub_part'];
+		}
+		$sExistingIndex = implode(',', $aColumnNames);
+
+		if (is_null($aLength))
+		{
+			return ($sSearchedIndex == $sExistingIndex);
+		}
+
+		$sSearchedLength = implode(',', $aLength);
+		$sExistingLength = implode(',', $aSubParts);
+
+		return ($sSearchedIndex == $sExistingIndex) && ($sSearchedLength == $sExistingLength);
+	}
+
+	// Returns an array of (fieldname => array of field info)
+	public static function GetTableFieldsList($sTable)
+	{
+		assert(!empty($sTable));
+		
+		$aTableInfo = self::GetTableInfo($sTable);
+		if (empty($aTableInfo)) return array(); // #@# or an error ?
+
+		return array_keys($aTableInfo["Fields"]);
+	}
+	
+	// Cache the information about existing tables, and their fields
+	private static $m_aTablesInfo = array();
+	private static function _TablesInfoCacheReset()
+	{
+		self::$m_aTablesInfo = array();
+	}
+
+	/**
+	 * @param $sTableName
+	 *
+	 * @throws \MySQLException
+	 */
+	private static function _TableInfoCacheInit($sTableName)
+	{
+		if (isset(self::$m_aTablesInfo[strtolower($sTableName)])
+			&& (self::$m_aTablesInfo[strtolower($sTableName)] != null))
+		{
+			return;
+		}
+
+		// Create array entry, if table does not exist / has no columns
+		self::$m_aTablesInfo[strtolower($sTableName)] = null;
+
+		// Get table informations
+		//   We were using SHOW COLUMNS FROM... but this don't return charset and collation info !
+		//   so since 2.5 and #1001 (switch to utf8mb4) we're using INFORMATION_SCHEMA !
+		$aMapping = array(
+			"Name" => "COLUMN_NAME",
+			"Type" => "COLUMN_TYPE",
+			"Null" => "IS_NULLABLE",
+			"Key" => "COLUMN_KEY",
+			"Default" => "COLUMN_DEFAULT",
+			"Extra" => "EXTRA",
+			"Charset" => "CHARACTER_SET_NAME",
+			"Collation" => "COLLATION_NAME",
+			"CharMaxLength" => "CHARACTER_MAXIMUM_LENGTH",
+		);
+		$sColumns = implode(', ', $aMapping);
+		$sDBName = self::$m_sDBName;
+		$aFields = self::QueryToArray("SELECT $sColumns FROM information_schema.`COLUMNS` WHERE table_schema = '$sDBName' AND table_name = '$sTableName';");
+		foreach ($aFields as $aFieldData)
+		{
+			$aFields = array();
+			foreach($aMapping as $sKey => $sColumn)
+			{
+				$aFields[$sKey] = $aFieldData[$sColumn];
+			}
+			$sFieldName = $aFieldData["COLUMN_NAME"];
+			self::$m_aTablesInfo[strtolower($sTableName)]["Fields"][$sFieldName] = $aFields;
+		}
+
+		if (!is_null(self::$m_aTablesInfo[strtolower($sTableName)]))
+		{
+			$aIndexes = self::QueryToArray("SHOW INDEXES FROM `$sTableName`");
+			$aMyIndexes = array();
+			foreach ($aIndexes as $aIndexColumn)
+			{
+				$aMyIndexes[$aIndexColumn['Key_name']][$aIndexColumn['Seq_in_index']-1] = $aIndexColumn;
+			}
+			self::$m_aTablesInfo[strtolower($sTableName)]["Indexes"] = $aMyIndexes;
+		}
+	}
+
+	public static function GetTableInfo($sTable)
+	{
+		self::_TableInfoCacheInit($sTable);
+
+		// perform a case insensitive match because on Windows the table names become lowercase :-(
+		return self::$m_aTablesInfo[strtolower($sTable)];
+	}
+
+	/**
+	 * @param string $sTableName
+	 *
+	 * @return string query to upgrade table charset and collation if needed, null if not
+	 * @throws \MySQLException
+	 *
+	 * @since 2.5 #1001 switch to utf8mb4
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-table.html
+	 */
+	public static function DBCheckTableCharsetAndCollation($sTableName)
+	{
+		$sDBName = self::DBName();
+		$sTableInfoQuery = "SELECT C.character_set_name, T.table_collation
+			FROM information_schema.`TABLES` T inner join information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` C
+				ON T.table_collation = C.collation_name
+			WHERE T.table_schema = '$sDBName'
+  			AND T.table_name = '$sTableName';";
+		$aTableInfo = self::QueryToArray($sTableInfoQuery);
+		$sTableCharset = $aTableInfo[0]['character_set_name'];
+		$sTableCollation = $aTableInfo[0]['table_collation'];
+
+		if ((DEFAULT_CHARACTER_SET == $sTableCharset) && (DEFAULT_COLLATION == $sTableCollation))
+		{
+			return null;
+		}
+
+
+		return 'ALTER TABLE `'.$sTableName.'` '.self::GetSqlStringColumnDefinition().';';
+
+	}
+
+	/**
+	 * @param string $sTable
+	 *
+	 * @return array
+	 * @throws \MySQLException if query cannot be processed
+	 */
+	public static function DumpTable($sTable)
+	{
+		$sSql = "SELECT * FROM `$sTable`";
+		try
+		{
+			$oResult = self::$m_oMysqli->query($sSql);
+		}
+		catch(mysqli_sql_exception $e)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql), $e);
+		}
+		if ($oResult === false)
+		{
+			throw new MySQLException('Failed to issue SQL query', array('query' => $sSql));
+		}
+		
+		$aRows = array();
+		while ($aRow = $oResult->fetch_array(MYSQLI_ASSOC))
+		{
+			$aRows[] = $aRow;
+		}
+		$oResult->free();
+		return $aRows;
+	}
+	
+	/**
+	 * Returns the value of the specified server variable
+	 * @param string $sVarName Name of the server variable
+	 * @return mixed Current value of the variable
+	 */	   	
+	public static function GetServerVariable($sVarName)
+	{
+		$result = '';
+		$sSql = "SELECT @@$sVarName as theVar";
+		$aRows = self::QueryToArray($sSql);
+		if (count($aRows) > 0)
+		{
+			$result = $aRows[0]['theVar'];
+		}
+		return $result;
+	}
+
+
+	/**
+	 * Returns the privileges of the current user
+	 * @return string privileges in a raw format
+	 */	   	
+	public static function GetRawPrivileges()
+	{
+		try
+		{
+			$oResult = self::Query('SHOW GRANTS'); // [ FOR CURRENT_USER()]
+		}
+		catch(MySQLException $e)
+		{
+			$iCode = self::GetErrNo();
+			return "Current user not allowed to see his own privileges (could not access to the database 'mysql' - $iCode)";
+		}
+
+		$aRes = array();
+		while ($aRow = $oResult->fetch_array(MYSQLI_NUM))
+		{
+			// so far, only one column...
+			$aRes[] = implode('/', $aRow);
+		}
+		$oResult->free();
+		// so far, only one line...
+		return implode(', ', $aRes);
+	}
+
+	/**
+	 * Determine the slave status of the server
+	 * @return bool true if the server is slave 
+	 */	   	
+	public static function IsSlaveServer()
+	{
+		try
+		{
+			$oResult = self::Query('SHOW SLAVE STATUS');
+		}
+		catch(MySQLException $e)
+		{
+			throw new CoreException("Current user not allowed to check the status", array('mysql_error' => $e->getMessage()));
+		}
+
+		if ($oResult->num_rows == 0)
+		{
+			return false;
+		}
+
+		// Returns one single row anytime
+		$aRow = $oResult->fetch_array(MYSQLI_ASSOC);
+		$oResult->free();
+
+		if (!isset($aRow['Slave_IO_Running']))
+		{
+			return false;
+		}
+		if (!isset($aRow['Slave_SQL_Running']))
+		{
+			return false;
+		}
+
+		// If at least one slave thread is running, then we consider that the slave is enabled
+		if ($aRow['Slave_IO_Running'] == 'Yes')
+		{
+			return true;
+		}
+		if ($aRow['Slave_SQL_Running'] == 'Yes')
+		{
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @return string query to upgrade database charset and collation if needed, null if not
+	 * @throws \MySQLException
+	 *
+	 * @since 2.5 #1001 switch to utf8mb4
+	 * @see https://dev.mysql.com/doc/refman/5.7/en/charset-database.html
+	 */
+	public static function DBCheckCharsetAndCollation()
+	{
+		$sDBName = CMDBSource::DBName();
+		$sDBInfoQuery = "SELECT DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME
+			FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$sDBName';";
+		$aDBInfo = CMDBSource::QueryToArray($sDBInfoQuery);
+		$sDBCharset = $aDBInfo[0]['DEFAULT_CHARACTER_SET_NAME'];
+		$sDBCollation = $aDBInfo[0]['DEFAULT_COLLATION_NAME'];
+
+		if ((DEFAULT_CHARACTER_SET == $sDBCharset) && (DEFAULT_COLLATION == $sDBCollation))
+		{
+			return null;
+		}
+
+		return 'ALTER DATABASE'.CMDBSource::GetSqlStringColumnDefinition().';';
+	}
+}
diff --git a/core/computing.inc.php b/core/computing.inc.php
index 7bb37daf6..17d813f7d 100644
--- a/core/computing.inc.php
+++ b/core/computing.inc.php
@@ -1,139 +1,139 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Any extension to compute things like a stop watch deadline or working hours 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Metric computing for stop watches
- */ 
-interface iMetricComputer
-{
-	public static function GetDescription();
-	public function ComputeMetric($oObject);
-}
-
-/**
- * Working time computing for stop watches
- */ 
-interface iWorkingTimeComputer
-{
-	public static function GetDescription();
-
-	/**
-	 * Get the date/time corresponding to a given delay in the future from the present
-	 * considering only the valid (open) hours for a specified object
-	 * @param $oObject DBObject The object for which to compute the deadline
-	 * @param $iDuration integer The duration (in seconds) in the future
-	 * @param $oStartDate DateTime The starting point for the computation
-	 * @return DateTime The date/time for the deadline
-	 */
-	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate);
-	
-	/**
-	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
-	 * @param $oObject DBObject The object for which to compute the duration
-	 * @param $oStartDate DateTime The starting point for the computation (default = now)
-	 * @param $oEndDate DateTime The ending point for the computation (default = now)
-	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
-	 */
-	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate);
-}
-
-/**
- * Default implementation oof deadline computing: NO deadline
- */
-class DefaultMetricComputer implements iMetricComputer
-{
-	public static function GetDescription()
-	{
-		return "Null";
-	}
-
-	public function ComputeMetric($oObject)
-	{
-		return null;
-	}
-}
-
-/**
- * Default implementation of working time computing
- */ 
-class DefaultWorkingTimeComputer implements iWorkingTimeComputer
-{
-	public static function GetDescription()
-	{
-		return "24x7, no holidays";
-	}
-
-	/**
-	 * Get the date/time corresponding to a given delay in the future from the present
-	 * considering only the valid (open) hours for a specified object
-	 * @param $oObject DBObject The object for which to compute the deadline
-	 * @param $iDuration integer The duration (in seconds) in the future
-	 * @param $oStartDate DateTime The starting point for the computation
-	 * @return DateTime The date/time for the deadline
-	 */
-	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate)
-	{
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
-		}
-		//echo "GetDeadline - default: ".$oStartDate->format('Y-m-d H:i:s')." + $iDuration<br/>\n";
-		// Default implementation: 24x7, no holidays: to compute the deadline, just add
-		// the specified duration to the given date/time
-		$oResult = clone $oStartDate;
-		$oResult->modify('+'.$iDuration.' seconds');
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oResult->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_END);
-		}
-		return $oResult;
-	}
-	
-	/**
-	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
-	 * @param $oObject DBObject The object for which to compute the duration
-	 * @param $oStartDate DateTime The starting point for the computation (default = now)
-	 * @param $oEndDate DateTime The ending point for the computation (default = now)
-	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
-	 */
-	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
-	{
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
-		}
-		//echo "GetOpenDuration - default: ".$oStartDate->format('Y-m-d H:i:s')." to ".$oEndDate->format('Y-m-d H:i:s')."<br/>\n";
-		$iDuration = abs($oEndDate->format('U') - $oStartDate->format('U'));
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oEndDate->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_DURATION);
-		}
-		return $iDuration;
-	}
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Any extension to compute things like a stop watch deadline or working hours 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Metric computing for stop watches
+ */ 
+interface iMetricComputer
+{
+	public static function GetDescription();
+	public function ComputeMetric($oObject);
+}
+
+/**
+ * Working time computing for stop watches
+ */ 
+interface iWorkingTimeComputer
+{
+	public static function GetDescription();
+
+	/**
+	 * Get the date/time corresponding to a given delay in the future from the present
+	 * considering only the valid (open) hours for a specified object
+	 * @param $oObject DBObject The object for which to compute the deadline
+	 * @param $iDuration integer The duration (in seconds) in the future
+	 * @param $oStartDate DateTime The starting point for the computation
+	 * @return DateTime The date/time for the deadline
+	 */
+	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate);
+	
+	/**
+	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
+	 * @param $oObject DBObject The object for which to compute the duration
+	 * @param $oStartDate DateTime The starting point for the computation (default = now)
+	 * @param $oEndDate DateTime The ending point for the computation (default = now)
+	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
+	 */
+	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate);
+}
+
+/**
+ * Default implementation oof deadline computing: NO deadline
+ */
+class DefaultMetricComputer implements iMetricComputer
+{
+	public static function GetDescription()
+	{
+		return "Null";
+	}
+
+	public function ComputeMetric($oObject)
+	{
+		return null;
+	}
+}
+
+/**
+ * Default implementation of working time computing
+ */ 
+class DefaultWorkingTimeComputer implements iWorkingTimeComputer
+{
+	public static function GetDescription()
+	{
+		return "24x7, no holidays";
+	}
+
+	/**
+	 * Get the date/time corresponding to a given delay in the future from the present
+	 * considering only the valid (open) hours for a specified object
+	 * @param $oObject DBObject The object for which to compute the deadline
+	 * @param $iDuration integer The duration (in seconds) in the future
+	 * @param $oStartDate DateTime The starting point for the computation
+	 * @return DateTime The date/time for the deadline
+	 */
+	public function GetDeadline($oObject, $iDuration, DateTime $oStartDate)
+	{
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
+		}
+		//echo "GetDeadline - default: ".$oStartDate->format('Y-m-d H:i:s')." + $iDuration<br/>\n";
+		// Default implementation: 24x7, no holidays: to compute the deadline, just add
+		// the specified duration to the given date/time
+		$oResult = clone $oStartDate;
+		$oResult->modify('+'.$iDuration.' seconds');
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oResult->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_END);
+		}
+		return $oResult;
+	}
+	
+	/**
+	 * Get duration (considering only open hours) elapsed bewteen two given DateTimes
+	 * @param $oObject DBObject The object for which to compute the duration
+	 * @param $oStartDate DateTime The starting point for the computation (default = now)
+	 * @param $oEndDate DateTime The ending point for the computation (default = now)
+	 * @return integer The duration (number of seconds) of open hours elapsed between the two dates
+	 */
+	public function GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
+	{
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::Trace(WorkingTimeRecorder::TRACE_DEBUG, __class__.'::'.__function__);
+		}
+		//echo "GetOpenDuration - default: ".$oStartDate->format('Y-m-d H:i:s')." to ".$oEndDate->format('Y-m-d H:i:s')."<br/>\n";
+		$iDuration = abs($oEndDate->format('U') - $oStartDate->format('U'));
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::SetValues($oStartDate->format('U'), $oEndDate->format('U'), $iDuration, WorkingTimeRecorder::COMPUTED_DURATION);
+		}
+		return $iDuration;
+	}
+}
+
+
+?>
diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index cadf36fc5..2ea43bf53 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1,2100 +1,2100 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-define('ITOP_APPLICATION', 'iTop');
-define('ITOP_APPLICATION_SHORT', 'iTop');
-define('ITOP_VERSION', '2.5.0-beta');
-define('ITOP_REVISION', 'svn');
-define('ITOP_BUILD_DATE', '$WCNOW$');
-
-define('ACCESS_USER_WRITE', 1);
-define('ACCESS_ADMIN_WRITE', 2);
-define('ACCESS_FULL', ACCESS_USER_WRITE | ACCESS_ADMIN_WRITE);
-define('ACCESS_READONLY', 0);
-
-/**
- * Configuration read/write
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('coreexception.class.inc.php');
-require_once('attributedef.class.inc.php'); // For the defines
-
-class ConfigException extends CoreException
-{
-}
-
-// was utf8 but it only supports BMP chars (https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html)
-// so we switched to utf8mb4 in iTop 2.5, adding dependency to MySQL 5.5.3
-// The config params db_character_set and db_collation were introduced as a temporary workaround and removed in iTop 2.5
-// now everything uses those fixed value !
-define('DEFAULT_CHARACTER_SET', 'utf8mb4');
-define('DEFAULT_COLLATION', 'utf8mb4_unicode_ci');
-
-define('DEFAULT_LOG_GLOBAL', true);
-define('DEFAULT_LOG_NOTIFICATION', true);
-define('DEFAULT_LOG_ISSUE', true);
-define('DEFAULT_LOG_WEB_SERVICE', true);
-
-define('DEFAULT_QUERY_CACHE_ENABLED', true);
-
-
-define('DEFAULT_MIN_DISPLAY_LIMIT', 10);
-define('DEFAULT_MAX_DISPLAY_LIMIT', 15);
-define('DEFAULT_STANDARD_RELOAD_INTERVAL', 5 * 60);
-define('DEFAULT_FAST_RELOAD_INTERVAL', 1 * 60);
-define('DEFAULT_SECURE_CONNECTION_REQUIRED', false);
-define('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|basic|external');
-define('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
-define('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random value, later...
-
-/**
- * Config
- * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
- *
- * @package     iTopORM
- */
-class Config
-{
-	//protected $m_bIsLoaded = false;
-	protected $m_sFile = '';
-
-	protected $m_aAppModules;
-	protected $m_aDataModels;
-	protected $m_aWebServiceCategories;
-	protected $m_aAddons;
-
-	protected $m_aModuleSettings;
-
-	/**
-	 * New way to store the settings !
-	 *
-	 * @var array
-	 * @since 2.5 db* variables
-	 */
-	protected $m_aSettings = array(
-		'app_env_label' => array(
-			'type' => 'string',
-			'description' => 'Label displayed to describe the current application environnment, defaults to the environment name (e.g. "production")',
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'app_root_url' => array(
-			'type' => 'string',
-			'description' => 'Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server\'s name)',
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'app_icon_url' => array(
-			'type' => 'string',
-			'description' => 'Hyperlink to redirect the user when clicking on the application icon (in the main window, or login/logoff pages)',
-			'default' => 'http://www.combodo.com/itop',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'db_host' => array(
-			'type' => 'string',
-			'default' => null,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'db_user' => array(
-			'type' => 'string',
-			'default' => null,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'db_pwd' => array(
-			'type' => 'string',
-			'default' => null,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'db_name' => array(
-			'type' => 'string',
-			'default' => null,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'db_subname' => array(
-			'type' => 'string',
-			'default' => null,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'db_tls.enabled' => array(
-			'type' => 'bool',
-			'description' => 'If true then the connection to the DB will be encrypted',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'db_tls.ca' => array(
-			'type' => 'string',
-			'description' => 'Path to certificate authority file for SSL',
-			'default' => null,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'db_character_set' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
-			'type' => 'string',
-			'description' => 'Deprecated since iTop 2.5 : now using utf8mb4',
-			'default' => 'DEPRECATED_2.5',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'db_collation' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
-			'type' => 'string',
-			'description' => 'Deprecated since iTop 2.5 : now using utf8mb4_unicode_ci',
-			'default' => 'DEPRECATED_2.5',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'skip_check_to_write' => array(
-			'type' => 'bool',
-			'description' => 'Disable data format and integrity checks to boost up data load (insert or update)',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'skip_check_ext_keys' => array(
-			'type' => 'bool',
-			'description' => 'Disable external key check when checking the value of attributes',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'skip_strong_security' => array(
-			'type' => 'bool',
-			'description' => 'Disable strong security - TEMPORY: this flag should be removed when we are more confident in the recent change in security',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'query_optimization_enabled' => array(
-			'type' => 'bool',
-			'description' => 'The queries are optimized based on the assumption that the DB integrity has been preserved. By disabling the optimization one can ensure that the fetched data is clean... but this can be really slower or not usable at all (some queries will exceed the allowed number of joins in MySQL: 61!)',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'query_indentation_enabled' => array(
-			'type' => 'bool',
-			'description' => 'For developpers: format the SQL queries for human analysis',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'disable_mandatory_ext_keys' => array(
-			'type' => 'bool',
-			'description' => 'For developpers: allow every external keys to be undefined',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'graphviz_path' => array(
-			'type' => 'string',
-			'description' => 'Path to the Graphviz "dot" executable for graphing objects lifecycle',
-			'default' => '/usr/bin/dot',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'php_path' => array(
-			'type' => 'string',
-			'description' => 'Path to the php executable in CLI mode',
-			'default' => 'php',
-			'value' => 'php',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'session_name' => array(
-			'type' => 'string',
-			'description' => 'The name of the cookie used to store the PHP session id',
-			'default' => 'iTop',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'max_combo_length' => array(
-			'type' => 'integer',
-			'description' => 'The maximum number of elements in a drop-down list. If more then an autocomplete will be used',
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'min_autocomplete_chars' => array(
-			'type' => 'integer',
-			'description' => 'The minimum number of characters to type in order to trigger the "autocomplete" behavior',
-			'default' => 2,
-			'value' => 2,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'allow_menu_on_linkset' => array(
-			'type' => 'bool',
-			'description' => 'Display Action menus in view mode on any LinkedSet with edit_mode != none',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'allow_target_creation' => array(
-			'type' => 'bool',
-			'description' => 'Displays the + button on external keys to create target objects',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		// Levels that trigger a confirmation in the CSV import/synchro wizard
-		'csv_import_min_object_confirmation' => array(
-			'type' => 'integer',
-			'description' => 'Minimum number of objects to check for the confirmation percentages',
-			'default' => 3,
-			'value' => 3,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'csv_import_errors_percentage' => array(
-			'type' => 'integer',
-			'description' => 'Percentage of errors that trigger a confirmation in the CSV import',
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'csv_import_modifications_percentage' => array(
-			'type' => 'integer',
-			'description' => 'Percentage of modifications that trigger a confirmation in the CSV import',
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'csv_import_creations_percentage' => array(
-			'type' => 'integer',
-			'description' => 'Percentage of creations that trigger a confirmation in the CSV import',
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'csv_import_history_display' => array(
-			'type' => 'bool',
-			'description' => 'Display the history tab in the import wizard',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'access_mode' => array(
-			'type' => 'integer',
-			'description' => 'Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3',
-			'default' => ACCESS_FULL,
-			'value' => ACCESS_FULL,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'access_message' => array(
-			'type' => 'string',
-			'description' => 'Message displayed to the users when there is any access restriction',
-			'default' => 'iTop is temporarily frozen, please wait... (the admin team)',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'online_help' => array(
-			'type' => 'string',
-			'description' => 'Hyperlink to the online-help web page',
-			'default' => 'http://www.combodo.com/itop-help',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'log_usage' => array(
-			'type' => 'bool',
-			'description' => 'Log the usage of the application (i.e. the date/time and the user name of each login)',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'log_rest_service' => array(
-			'type' => 'bool',
-			'description' => 'Log the usage of the REST/JSON service',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'synchro_trace' => array(
-			'type' => 'string',
-			'description' => 'Synchronization details: none, display, save (includes \'display\')',
-			'default' => 'none',
-			'value' => 'none',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'link_set_item_separator' => array(
-			'type' => 'string',
-			'description' => 'Link set from string: line separator',
-			'default' => '|',
-			'value' => '|',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'link_set_attribute_separator' => array(
-			'type' => 'string',
-			'description' => 'Link set from string: attribute separator',
-			'default' => ';',
-			'value' => ';',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'link_set_value_separator' => array(
-			'type' => 'string',
-			'description' => 'Link set from string: value separator (between the attcode and the value itself',
-			'default' => ':',
-			'value' => ':',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'link_set_attribute_qualifier' => array(
-			'type' => 'string',
-			'description' => 'Link set from string: attribute qualifier (encloses both the attcode and the value)',
-			'default' => "'",
-			'value' => "'",
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'cron_max_execution_time' => array(
-			'type' => 'integer',
-			'description' => 'Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout',
-			'default' => 600,
-			'value' => 600,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'cron_sleep' => array(
-			'type' => 'integer',
-			'description' => 'Duration (seconds) before cron.php checks again if something must be done',
-			'default' => 2,
-			'value' => 2,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'async_task_retries' => array(
-			'type' => 'array',
-			'description' => 'Automatic retries of asynchronous tasks in case of failure (per class)',
-			'default' => array('AsyncSendEmail' => array('max_retries' => 0, 'retry_delay' => 600)),
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_asynchronous' => array(
-			'type' => 'bool',
-			'description' => 'If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode',
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'email_transport' => array(
-			'type' => 'string',
-			'description' => 'Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocole)',
-			'default' => "PHPMail",
-			'value' => "PHPMail",
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'email_transport_smtp.host' => array(
-			'type' => 'string',
-			'description' => 'host name or IP address (optional)',
-			'default' => "localhost",
-			'value' => "localhost",
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_transport_smtp.port' => array(
-			'type' => 'integer',
-			'description' => 'port number (optional)',
-			'default' => 25,
-			'value' => 25,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_transport_smtp.encryption' => array(
-			'type' => 'string',
-			'description' => 'tls or ssl (optional)',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_transport_smtp.username' => array(
-			'type' => 'string',
-			'description' => 'Authentication user (optional)',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_transport_smtp.password' => array(
-			'type' => 'string',
-			'description' => 'Authentication password (optional)',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_css' => array(
-			'type' => 'string',
-			'description' => 'CSS that will override the standard stylesheet used for the notifications',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'email_default_sender_address' => array(
-			'type' => 'string',
-			'description' => 'Default address provided in the email from header field.',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'email_default_sender_label' => array(
-			'type' => 'string',
-			'description' => 'Default label provided in the email from header field.',
-			'default' => "",
-			'value' => "",
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'apc_cache.enabled' => array(
-			'type' => 'bool',
-			'description' => 'If set, the APC cache is allowed (the PHP extension must also be active)',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'apc_cache.query_ttl' => array(
-			'type' => 'integer',
-			'description' => 'Time to live set in APC for the prepared queries (seconds - 0 means no timeout)',
-			'default' => 3600,
-			'value' => 3600,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'apc_cache_emulation.max_entries' => array(
-			'type' => 'integer',
-			'description' => 'Maximum number of cache entries (0 means no limit)',
-			'default' => 1000,
-			'value' => 1000,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'timezone' => array(
-			'type' => 'string',
-			'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitely configured in PHP',
-			// examples... not used (nor 'description')
-			'examples' => array(
-				'America/Sao_Paulo',
-				'America/New_York (standing for EDT)',
-				'America/Los_Angeles (standing for PDT)',
-				'Asia/Istanbul',
-				'Asia/Singapore',
-				'Africa/Casablanca',
-				'Australia/Sydney'
-			),
-			'default' => 'Europe/Paris',
-			'value' => 'Europe/Paris',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'cas_include_path' => array(
-			'type' => 'string',
-			'description' => 'The path where to find the phpCAS library',
-			// examples... not used (nor 'description')
-			'default' => '/usr/share/php',
-			'value' => '/usr/share/php',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'cas_version' => array(
-			'type' => 'string',
-			'description' => 'The CAS protocol version to use: "1.0" (CAS v1), "2.0" (CAS v2) or "S1" (SAML V1) )',
-			// examples... not used (nor 'description')
-			'default' => '2.0',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_host' => array(
-			'type' => 'string',
-			'description' => 'The name of the CAS host',
-			// examples... not used (nor 'description')
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_port' => array(
-			'type' => 'integer',
-			'description' => 'The port used by the CAS server',
-			// examples... not used (nor 'description')
-			'default' => 443,
-			'value' => 443,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_context' => array(
-			'type' => 'string',
-			'description' => 'The CAS context',
-			// examples... not used (nor 'description')
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_server_ca_cert_path' => array(
-			'type' => 'string',
-			'description' => 'The path where to find the certificate of the CA for validating the certificate of the CAS server',
-			// examples... not used (nor 'description')
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_logout_redirect_service' => array(
-			'type' => 'string',
-			'description' => 'The redirect service (URL) to use when logging-out with CAS',
-			// examples... not used (nor 'description')
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_memberof' => array(
-			'type' => 'string',
-			'description' => 'A semicolon separated list of group names that the user must be member of (works only with SAML - e.g. cas_version=> "S1")',
-			// examples... not used (nor 'description')
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_user_synchro' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not to synchronize users with CAS/LDAP',
-			// examples... not used (nor 'description')
-			'default' => 0,
-			'value' => 0,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_update_profiles' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not to update the profiles of an existing user from the CAS information',
-			// examples... not used (nor 'description')
-			'default' => 0,
-			'value' => 0,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_profile_pattern' => array(
-			'type' => 'string',
-			'description' => 'A regular expression pattern to extract the name of the iTop profile from the name of an LDAP/CAS group',
-			// examples... not used (nor 'description')
-			'default' => '/^cn=([^,]+),/',
-			'value' => '/^cn=([^,]+),/',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_default_profiles' => array(
-			'type' => 'string',
-			'description' => 'A semi-colon separated list of iTop Profiles to use when creating a new user if no profile is retrieved from CAS',
-			// examples... not used (nor 'description')
-			'default' => 'Portal user',
-			'value' => 'Portal user',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'cas_debug' => array(
-			'type' => 'bool',
-			'description' => 'Activate the CAS debug',
-			// examples... not used (nor 'description')
-			'default' => false,
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'forgot_password' => array(
-			'type' => 'bool',
-			'description' => 'Enable the "Forgot password" feature',
-			// examples... not used (nor 'description')
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'forgot_password_from' => array(
-			'type' => 'string',
-			'description' => 'Sender email address for the "forgot password" feature. If empty, defaults to the recipient\'s  email address.',
-			// examples... not used (nor 'description')
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'deadline_format' => array(
-			'type' => 'string',
-			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
-			// examples... $date$ ($deadline$)
-			'default' => '$difference$',
-			'value' => '$difference$',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'buttons_position' => array(
-			'type' => 'string',
-			'description' => 'Position of the forms buttons: bottom | top | both',
-			// examples... not used
-			'default' => 'both',
-			'value' => 'both',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'shortcut_actions' => array(
-			'type' => 'string',
-			'description' => 'Actions that are available as direct buttons next to the "Actions" menu',
-			// examples... not used
-			'default' => 'UI:Menu:Modify,UI:Menu:New',
-			'value' => 'UI:Menu:Modify',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'complex_actions_limit' => array(
-			'type' => 'integer',
-			'description' => 'Display the "actions" menu items that require long computation only if the list of objects is contains less objects than this number (0 means no limit)',
-			// examples... not used
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'synchro_prevent_delete_all' => array(
-			'type' => 'bool',
-			'description' => 'Stop the synchro if all the replicas of a data source become obsolete at the same time.',
-			// examples... not used
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'source_dir' => array(
-			'type' => 'string',
-			'description' => 'Source directory for the datamodel files. (which gets compiled to env-production).',
-			// examples... not used
-			'default' => '',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'csv_file_default_charset' => array(
-			'type' => 'string',
-			'description' => 'Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).',
-			// examples... not used
-			'default' => 'ISO-8859-1',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'debug_report_spurious_chars' => array(
-			'type' => 'bool',
-			'description' => 'Report, in the error log, the characters found in the output buffer, echoed by mistake in the loaded modules, and potentially corrupting the output',
-			// examples... not used
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'impact_analysis_first_tab' => array(
-			'type' => 'string',
-			'description' => 'Which tab to display first in the impact analysis view: list or graphics. Graphics are nicer but slower to display when there are many objects',
-			// examples... not used
-			'default' => 'graphics',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'url_validation_pattern' => array(
-			'type' => 'string',
-			'description' => 'Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)',
-			'default' => '(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\$_.-]*)?',
-			//            SHEME.......... USER....................... PASSWORD.......................... HOST/IP........... PORT.......... PATH........................ GET............................................ ANCHOR............................
-			// Example: http://User:passWord@127.0.0.1:8888/patH/Page.php?arrayArgument[2]=something:blah20#myAnchor
-			// Origin of this regexp: http://www.php.net/manual/fr/function.preg-match.php#93824
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-        'email_validation_pattern' => array(
-            'type' => 'string',
-            'description' => 'Regular expression to validate/detect the format of an eMail address',
-            'default' => "[a-zA-Z0-9._&'-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}",
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => true,
-        ),
-        'email_decoration_class' => array(
-            'type' => 'string',
-            'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fa fa-envelope" will put a mail icon.',
-            'default' => 'fa fa-envelope',
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-        'phone_number_validation_pattern' => array(
-            'type' => 'string',
-            'description' => 'Regular expression to validate/detect the format of a phone number',
-            'default' => "[0-9.\-\ \+\(\)]+",
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-        'phone_number_url_pattern' => array(
-            'type' => 'string',
-            'description' => 'Format for phone number url, use %1$s as a placeholder for the value. eg. "tel:%1$s" for regular phone applications or "callto:%1$s" for Skype. Default is "tel:%1$s".',
-            'default' => 'tel:%1$s',
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-        'phone_number_decoration_class' => array(
-            'type' => 'string',
-            'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fa fa-phone" will put a phone icon.',
-            'default' => 'fa fa-phone',
-            'value' => '',
-            'source_of_value' => '',
-            'show_in_conf_sample' => false,
-        ),
-		'log_kpi_duration' => array(
-			'type' => 'integer',
-			'description' => 'Level of logging for troubleshooting performance issues (1 to enable, 2 +blame callers)',
-			// examples... not used
-			'default' => 0,
-			'value' => 0,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'log_kpi_memory' => array(
-			'type' => 'integer',
-			'description' => 'Level of logging for troubleshooting memory limit issues',
-			// examples... not used
-			'default' => 0,
-			'value' => 0,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'log_kpi_user_id' => array(
-			'type' => 'string',
-			'description' => 'Limit the scope of users to the given user id (* means no limit)',
-			// examples... not used
-			'default' => '*',
-			'value' => '*',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'max_linkset_output' => array(
-			'type' => 'integer',
-			'description' => 'Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.',
-			'default' => 100,
-			'value' => 100,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'demo_mode' => array(
-			'type' => 'bool',
-			'description' => 'Set to true to prevent users from changing passwords/languages',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'portal_tickets' => array(
-			'type' => 'string',
-			'description' => 'CSV list of classes supported in the portal',
-			// examples... not used
-			'default' => 'UserRequest',
-			'value' => 'UserRequest',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'portal_dispatch_urls' => array(
-			'type' => 'array',
-			'description' => 'Associative array of sPortalId => Home page URL (relatively to the application root)',
-			// examples... not used
-			'default' => array(),
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'max_execution_time_per_loop' => array(
-			'type' => 'integer',
-			'description' => 'Maximum execution time requested, per loop, during bulk operations. Zero means no limit.',
-			// examples... not used
-			'default' => 30,
-			'value' => 30,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'max_history_length' => array(
-			'type' => 'integer',
-			'description' => 'Maximum length of the history table (in the "History" tab on each object) before it gets truncated. Latest modifications are displayed first.',
-			// examples... not used
-			'default' => 50,
-			'value' => 50,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'max_history_case_log_entry_length' => array(
-			'type' => 'integer',
-			'description' => 'The length (in number of characters) at which to truncate the (expandable) display (in the history) of a case log entry. If zero, the display in the history is not truncated.',
-			// examples... not used
-			'default' => 60,
-			'value' => 60,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'full_text_chunk_duration' => array(
-			'type' => 'integer',
-			'description' => 'Delay after which the results are displayed.',
-			// examples... not used
-			'default' => 2,
-			'value' => 2,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'full_text_accelerators' => array(
-			'type' => 'array',
-			'description' => 'Specifies classes to be searched at first (and the subset of data) when running the full text search.',
-			'default' => array(),
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'full_text_needle_min' => array(
-			'type' => 'integer',
-			'description' => 'Minimum size of the full text needle.',
-			'default' => 3,
-			'value' => 3,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'tracking_level_linked_set_default' => array(
-			'type' => 'integer',
-			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)',
-			'default' => LINKSET_TRACKING_LIST,
-			'value' => LINKSET_TRACKING_LIST,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'tracking_level_linked_set_indirect_default' => array(
-			'type' => 'integer',
-			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSetIndirect',
-			'default' => LINKSET_TRACKING_ALL,
-			'value' => LINKSET_TRACKING_ALL,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'user_rights_legacy' => array(
-			'type' => 'bool',
-			'description' => 'Set to true to restore the buggy algorithm for the computation of user rights (within the same profile, ALLOW on the class itself has precedence on DENY of a parent class)',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'xlsx_exporter_memory_limit' => array(
-			'type' => 'string',
-			'description' => 'Memory limit to use when (interactively) exporting data to Excel',
-			'default' => '2048M', // Huuuuuuge 2GB!
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'min_reload_interval' => array(
-			'type' => 'integer',
-			'description' => 'Minimum refresh interval (seconds) for dashboards, shortcuts, etc. Even if the interval is set programmatically, it is forced to that minimum',
-			'default' => 5, // In iTop 2.0.3, this was the hardcoded value
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'relations_max_depth' => array(
-			'type' => 'integer',
-			'description' => 'Maximum number of successive levels (depth) to explore when displaying the impact/depends on relations.',
-			'default' => 20, // In iTop 2.0.3, this was the hardcoded value
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'transaction_storage' => array(
-			'type' => 'string',
-			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',
-			'default' => 'Session',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'transactions_enabled' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not the whole mechanism to prevent multiple submissions of a page is enabled.',
-			'default' => true,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'log_transactions' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not to enable the debug log for the transactions.',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'concurrent_lock_enabled' => array(
-			'type' => 'bool',
-			'description' => 'Whether or not to activate the locking mechanism in order to prevent concurrent edition of the same object.',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'concurrent_lock_expiration_delay' => array(
-			'type' => 'integer',
-			'description' => 'Delay (in seconds) for a concurrent lock to expire',
-			'default' => 120,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'concurrent_lock_override_profiles' => array(
-			'type' => 'array',
-			'description' => 'The list of profiles allowed to "kill" a lock',
-			'default' => array('Administrator'),
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'html_sanitizer' => array(
-			'type' => 'string',
-			'description' => 'The class to use for HTML sanitization: HTMLDOMSanitizer, HTMLPurifierSanitizer or HTMLNullSanitizer',
-			'default' => 'HTMLDOMSanitizer',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'inline_image_max_display_width' => array(
-			'type' => 'integer',
-			'description' => 'The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.',
-			'default' => '250',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'inline_image_max_storage_width' => array(
-			'type' => 'integer',
-			'description' => 'The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.',
-			'default' => '1600',
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'draft_attachments_lifetime' => array(
-			'type' => 'integer',
-			'description' => 'Lifetime (in seconds) of drafts\' attachments and inline images: after this duration, the garbage collector will delete them.',
-			'default' => 3600,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'date_and_time_format' => array(
-			'type' => 'array',
-			'description' => 'Format for date and time display (per language)',
-			'default' => array('default' => array('date' => 'Y-m-d', 'time' => 'H:i:s', 'date_time' => '$date $time')),
-			'value' => false,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'breadcrumb.max_count' => array(
-			'type' => 'integer',
-			'description' => 'Maximum number of items kept in the history breadcrumb. Set it to 0 to entirely disable the breadcrumb.',
-			'default' => 8,
-			'value' => 8,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'obsolescence.show_obsolete_data' => array(
-			'type' => 'bool',
-			'description' => 'Default value for the user preference "show obsolete data"',
-			'default' => false,
-			'value' => '',
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'obsolescence.date_update_interval' => array(
-			'type' => 'integer',
-			'description' => 'Delay in seconds between two refreshes of the obsolescence dates.',
-			'default' => 600,
-			'value' => 600,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'disable_attachments_download_legacy_portal' => array(
-			'type' => 'bool',
-			'description' => 'Disable attachments download from legacy portal',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'secure_rest_services' => array(
-			'type' => 'bool',
-			'description' => 'When set to true, only the users with the profile "REST Services User" are allowed to use the REST web services.',
-			'default' => true,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => false,
-		),
-		'search_manual_submit' => array(
-			'type' => 'array',
-			'description' => 'Force manual submit of search all requests',
-			'default' => false,
-			'value' => true,
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-		'high_cardinality_classes' => array(
-			'type' => 'array',
-			'description' => 'List of classes with high cardinality (Force manual submit of search)',
-			'default' => array(),
-			'value' => array(),
-			'source_of_value' => '',
-			'show_in_conf_sample' => true,
-		),
-	);
-
-	public function IsProperty($sPropCode)
-	{
-		return (array_key_exists($sPropCode, $this->m_aSettings));
-	}
-
-	/**
-	 * @return string identifier that can be used for example to name WebStorage/SessionStorage keys (they
-	 *     are related to a whole domain, and a domain can host multiple itop)
-	 *     Beware: do not expose server side information to the client !
-	 */
-	public function GetItopInstanceid()
-	{
-		return md5(utils::GetAbsoluteUrlAppRoot()
-			.'==='.$this->Get('db_host')
-			.'/'.$this->Get('db_name')
-			.'/'.$this->Get('db_subname'));
-	}
-
-	public function GetDescription($sPropCode)
-	{
-		return $this->m_aSettings[$sPropCode];
-	}
-
-	/**
-	 * @param string $sPropCode
-	 * @param mixed $value
-	 * @param string $sSourceDesc mandatory for variables with show_in_conf_sample=false
-	 *
-	 * @throws \CoreException
-	 */
-	public function Set($sPropCode, $value, $sSourceDesc = 'unknown')
-	{
-		$sType = $this->m_aSettings[$sPropCode]['type'];
-		switch ($sType)
-		{
-			case 'bool':
-				$value = (bool)$value;
-				break;
-			case 'string':
-				$value = (string)$value;
-				break;
-			case 'integer':
-				$value = (integer)$value;
-				break;
-			case 'float':
-				$value = (float)$value;
-				break;
-			case 'array':
-				break;
-			default:
-				throw new CoreException('Unknown type for setting', array('property' => $sPropCode, 'type' => $sType));
-		}
-		$this->m_aSettings[$sPropCode]['value'] = $value;
-		$this->m_aSettings[$sPropCode]['source_of_value'] = $sSourceDesc;
-
-	}
-
-    public function Get($sPropCode)
-    {
-        return $this->m_aSettings[$sPropCode]['value'];
-    }
-
-	/**
-	 * Event log options (see LOG_... definition)
-	 */
-	// Those variables will be deprecated later, when the transition to ...Get('my_setting') will be done
-	protected $m_bLogGlobal;
-	protected $m_bLogNotification;
-	protected $m_bLogIssue;
-	protected $m_bLogWebService;
-	protected $m_bQueryCacheEnabled; // private setting
-
-	/**
-	 * @var integer Number of elements to be displayed when there are more than m_iMaxDisplayLimit elements
-	 */
-	protected $m_iMinDisplayLimit;
-	/**
-	 * @var integer Max number of elements before truncating the display
-	 */
-	protected $m_iMaxDisplayLimit;
-
-	/**
-	 * @var integer Number of seconds between two reloads of the display (standard)
-	 */
-	protected $m_iStandardReloadInterval;
-	/**
-	 * @var integer Number of seconds between two reloads of the display (fast)
-	 */
-	protected $m_iFastReloadInterval;
-
-	/**
-	 * @var boolean Whether or not a secure connection is required for using the application.
-	 *              If set, any attempt to connect to an iTop page with http:// will be redirected
-	 *              to https://
-	 */
-	protected $m_bSecureConnectionRequired;
-
-	/**
-	 * @var string Langage code, default if the user language is undefined
-	 */
-	protected $m_sDefaultLanguage;
-
-	/**
-	 * @var string Type of login process allowed: form|basic|url|external
-	 */
-	protected $m_sAllowedLoginTypes;
-
-	/**
-	 * @var string Name of the PHP variable in which external authentication information is passed by the web server
-	 */
-	protected $m_sExtAuthVariable;
-
-	/**
-	 * @var string Encryption key used for all attributes of type "encrypted string". Can be set to a random value
-	 *             unless you want to import a database from another iTop instance, in which case you must use
-	 *             the same encryption key in order to properly decode the encrypted fields
-	 */
-	protected $m_sEncryptionKey;
-
-	/**
-	 * @var array Additional character sets to be supported by the interactive CSV import
-	 *            'iconv_code' => 'display name'
-	 */
-	protected $m_aCharsets;
-
-	public function __construct($sConfigFile = null, $bLoadConfig = true)
-	{
-		$this->m_sFile = $sConfigFile;
-		if (is_null($sConfigFile))
-		{
-			$bLoadConfig = false;
-		}
-
-		$this->m_aAddons = array(
-			// Default AddOn, always present can be moved to an official iTop Module later if needed
-			'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
-		);
-
-		foreach ($this->m_aSettings as $sPropCode => $aSettingInfo)
-		{
-			$this->m_aSettings[$sPropCode]['value'] = $aSettingInfo['default'];
-		}
-
-		$this->m_bLogGlobal = DEFAULT_LOG_GLOBAL;
-		$this->m_bLogNotification = DEFAULT_LOG_NOTIFICATION;
-		$this->m_bLogIssue = DEFAULT_LOG_ISSUE;
-		$this->m_bLogWebService = DEFAULT_LOG_WEB_SERVICE;
-		$this->m_iMinDisplayLimit = DEFAULT_MIN_DISPLAY_LIMIT;
-		$this->m_iMaxDisplayLimit = DEFAULT_MAX_DISPLAY_LIMIT;
-		$this->m_iStandardReloadInterval = DEFAULT_STANDARD_RELOAD_INTERVAL;
-		$this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL;
-		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
-		$this->m_sDefaultLanguage = 'EN US';
-		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
-		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
-		$this->m_sEncryptionKey = DEFAULT_ENCRYPTION_KEY;
-		$this->m_aCharsets = array();
-		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
-
-		$this->m_aModuleSettings = array();
-
-		if ($bLoadConfig)
-		{
-			$this->Load($sConfigFile);
-			$this->Verify();
-		}
-
-		// Application root url: set a default value, then normalize it
-		/*
-		 * Does not work in CLI/unattended mode
-				$sAppRootUrl = trim($this->Get('app_root_url'));
-				if (strlen($sAppRootUrl) == 0)
-				{
-					$sAppRootUrl = utils::GetDefaultUrlAppRoot();
-				}
-				if (substr($sAppRootUrl, -1, 1) != '/')
-				{
-					$sAppRootUrl .= '/';
-				}
-				$this->Set('app_root_url', $sAppRootUrl);
-		 */
-	}
-
-	protected function CheckFile($sPurpose, $sFileName)
-	{
-		if (!file_exists($sFileName))
-		{
-			throw new ConfigException("Could not find $sPurpose file", array('file' => $sFileName));
-		}
-		if (!is_readable($sFileName))
-		{
-			throw new ConfigException("Could not read $sPurpose file (the file exists but cannot be read). Do you have the rights to access this file?",
-				array('file' => $sFileName));
-		}
-	}
-
-	/**
-	 * @param string $sConfigFile
-	 *
-	 * @throws \ConfigException
-	 * @throws \CoreException
-	 */
-	protected function Load($sConfigFile)
-	{
-		$this->CheckFile('configuration', $sConfigFile);
-
-		$sConfigCode = trim(file_get_contents($sConfigFile));
-
-		// Variables created when doing an eval() on the config file
-		/** @var array $MySettings */
-		$MySettings = null;
-		/** @var array $MyModuleSettings */
-		$MyModuleSettings = null;
-		/** @var array $MyModules */
-		$MyModules = null;
-
-		// This does not work on several lines
-		// preg_match('/^<\\?php(.*)\\?'.'>$/', $sConfigCode, $aMatches)...
-		// So, I've implemented a solution suggested in the PHP doc (search for phpWrapper)
-		try
-		{
-			ob_start();
-			eval('?'.'>'.trim($sConfigCode));
-			$sNoise = trim(ob_get_contents());
-			ob_end_clean();
-		}
-		catch (Exception $e)
-		{
-			// well, never reach in case of parsing error :-(
-			// will be improved in PHP 6 ?
-			throw new ConfigException('Error in configuration file',
-				array('file' => $sConfigFile, 'error' => $e->getMessage()));
-		}
-		catch(Error $e)
-		{
-		    // PHP 7
-		    throw new ConfigException('Error in configuration file',
-		        array('file' => $sConfigFile, 'error' => $e->getMessage().' at line '.$e->getLine()));
-		}
-		if (strlen($sNoise) > 0)
-		{
-			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
-			throw new ConfigException('Syntax error in configuration file',
-				array('file' => $sConfigFile, 'error' => '<tt>'.htmlentities($sNoise, ENT_QUOTES, 'UTF-8').'</tt>'));
-		}
-
-		if (!isset($MySettings) || !is_array($MySettings))
-		{
-			throw new ConfigException('Missing array in configuration file',
-				array('file' => $sConfigFile, 'expected' => '$MySettings'));
-		}
-
-		if (!array_key_exists('addons', $MyModules))
-		{
-			throw new ConfigException('Missing item in configuration file',
-				array('file' => $sConfigFile, 'expected' => '$MyModules[\'addons\']'));
-		}
-		if (!array_key_exists('user rights', $MyModules['addons']))
-		{
-			// Add one, by default
-			$MyModules['addons']['user rights'] = '/addons/userrights/userrightsnull.class.inc.php';
-		}
-
-		$this->m_aAddons = $MyModules['addons'];
-
-		foreach ($MySettings as $sPropCode => $rawvalue)
-		{
-			if ($this->IsProperty($sPropCode))
-			{
-				if (is_string($rawvalue))
-				{
-					$value = trim($rawvalue);
-				}
-				else
-				{
-					$value = $rawvalue;
-				}
-				$this->Set($sPropCode, $value, $sConfigFile);
-			}
-		}
-
-		$this->m_bLogGlobal = isset($MySettings['log_global']) ? (bool)trim($MySettings['log_global']) : DEFAULT_LOG_GLOBAL;
-		$this->m_bLogNotification = isset($MySettings['log_notification']) ? (bool)trim($MySettings['log_notification']) : DEFAULT_LOG_NOTIFICATION;
-		$this->m_bLogIssue = isset($MySettings['log_issue']) ? (bool)trim($MySettings['log_issue']) : DEFAULT_LOG_ISSUE;
-		$this->m_bLogWebService = isset($MySettings['log_web_service']) ? (bool)trim($MySettings['log_web_service']) : DEFAULT_LOG_WEB_SERVICE;
-		$this->m_bQueryCacheEnabled = isset($MySettings['query_cache_enabled']) ? (bool)trim($MySettings['query_cache_enabled']) : DEFAULT_QUERY_CACHE_ENABLED;
-
-		$this->m_iMinDisplayLimit = isset($MySettings['min_display_limit']) ? trim($MySettings['min_display_limit']) : DEFAULT_MIN_DISPLAY_LIMIT;
-		$this->m_iMaxDisplayLimit = isset($MySettings['max_display_limit']) ? trim($MySettings['max_display_limit']) : DEFAULT_MAX_DISPLAY_LIMIT;
-		$this->m_iStandardReloadInterval = isset($MySettings['standard_reload_interval']) ? trim($MySettings['standard_reload_interval']) : DEFAULT_STANDARD_RELOAD_INTERVAL;
-		$this->m_iFastReloadInterval = isset($MySettings['fast_reload_interval']) ? trim($MySettings['fast_reload_interval']) : DEFAULT_FAST_RELOAD_INTERVAL;
-		$this->m_bSecureConnectionRequired = isset($MySettings['secure_connection_required']) ? (bool)trim($MySettings['secure_connection_required']) : DEFAULT_SECURE_CONNECTION_REQUIRED;
-
-		$this->m_aModuleSettings = isset($MyModuleSettings) ? $MyModuleSettings : array();
-
-		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
-		$this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES;
-		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
-		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : DEFAULT_ENCRYPTION_KEY;
-		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
-	}
-
-	protected function Verify()
-	{
-		// Files are verified later on, just before using them -see MetaModel::Plugin()
-		// (we have their final path at that point)
-	}
-
-	public function GetModuleSetting($sModule, $sProperty, $defaultvalue = null)
-	{
-		if (isset($this->m_aModuleSettings[$sModule][$sProperty]))
-		{
-			return $this->m_aModuleSettings[$sModule][$sProperty];
-		}
-
-		// Fall back to the predefined XML parameter, if any
-		return $this->GetModuleParameter($sModule, $sProperty, $defaultvalue);
-	}
-
-	public function GetModuleParameter($sModule, $sProperty, $defaultvalue = null)
-	{
-		$ret = $defaultvalue;
-		if (class_exists('ModulesXMLParameters'))
-		{
-			$aAllParams = ModulesXMLParameters::GetData($sModule);
-			if (array_key_exists($sProperty, $aAllParams))
-			{
-				$ret = $aAllParams[$sProperty];
-			}
-		}
-
-		return $ret;
-	}
-
-	public function SetModuleSetting($sModule, $sProperty, $value)
-	{
-		$this->m_aModuleSettings[$sModule][$sProperty] = $value;
-	}
-
-	public function GetAddons()
-	{
-		return $this->m_aAddons;
-	}
-
-	public function SetAddons($aAddons)
-	{
-		$this->m_aAddons = $aAddons;
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6
-	 * @see Config::Get() as a replacement
-	 */
-	public function GetDBHost()
-	{
-		return $this->Get('db_host');
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6
-	 * @see Config::Get() as a replacement
-	 */
-	public function GetDBName()
-	{
-		return $this->Get('db_name');
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6
-	 * @see Config::Get() as a replacement
-	 */
-	public function GetDBSubname()
-	{
-		return $this->Get('db_subname');
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
-	 * @see Config::DEFAULT_CHARACTER_SET
-	 */
-	public function GetDBCharacterSet()
-	{
-		return DEFAULT_CHARACTER_SET;
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
-	 * @see Config::DEFAULT_COLLATION
-	 */
-	public function GetDBCollation()
-	{
-		return DEFAULT_COLLATION;
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6
-	 * @see Config::Get() as a replacement
-	 */
-	public function GetDBUser()
-	{
-		return $this->Get('db_user');
-	}
-
-	/**
-	 * @return string
-	 * @deprecated 2.5 will be removed in 2.6
-	 * @see Config::Get() as a replacement
-	 */
-	public function GetDBPwd()
-	{
-		return $this->Get('db_pwd');
-	}
-
-	public function GetLogGlobal()
-	{
-		return $this->m_bLogGlobal;
-	}
-
-	public function GetLogNotification()
-	{
-		return $this->m_bLogNotification;
-	}
-
-	public function GetLogIssue()
-	{
-		return $this->m_bLogIssue;
-	}
-
-	public function GetLogWebService()
-	{
-		return $this->m_bLogWebService;
-	}
-
-	public function GetLogQueries()
-	{
-		return false;
-	}
-
-	public function GetQueryCacheEnabled()
-	{
-		return $this->m_bQueryCacheEnabled;
-	}
-
-	public function GetMinDisplayLimit()
-	{
-		return $this->m_iMinDisplayLimit;
-	}
-
-	public function GetMaxDisplayLimit()
-	{
-		return $this->m_iMaxDisplayLimit;
-	}
-
-	public function GetStandardReloadInterval()
-	{
-		return $this->m_iStandardReloadInterval;
-	}
-
-	public function GetFastReloadInterval()
-	{
-		return $this->m_iFastReloadInterval;
-	}
-
-	public function GetSecureConnectionRequired()
-	{
-		return $this->m_bSecureConnectionRequired;
-	}
-
-	public function GetDefaultLanguage()
-	{
-		return $this->m_sDefaultLanguage;
-	}
-
-	public function GetEncryptionKey()
-	{
-		return $this->m_sEncryptionKey;
-	}
-
-	public function GetAllowedLoginTypes()
-	{
-		return explode('|', $this->m_sAllowedLoginTypes);
-	}
-
-	public function GetExternalAuthenticationVariable()
-	{
-		return $this->m_sExtAuthVariable;
-	}
-
-	public function GetCSVImportCharsets()
-	{
-		return $this->m_aCharsets;
-	}
-
-	public function SetLogGlobal($iLogGlobal)
-	{
-		$this->m_iLogGlobal = $iLogGlobal;
-	}
-
-	public function SetLogNotification($iLogNotification)
-	{
-		$this->m_iLogNotification = $iLogNotification;
-	}
-
-	public function SetLogIssue($iLogIssue)
-	{
-		$this->m_iLogIssue = $iLogIssue;
-	}
-
-	public function SetLogWebService($iLogWebService)
-	{
-		$this->m_iLogWebService = $iLogWebService;
-	}
-
-	public function SetMinDisplayLimit($iMinDisplayLimit)
-	{
-		$this->m_iMinDisplayLimit = $iMinDisplayLimit;
-	}
-
-	public function SetMaxDisplayLimit($iMaxDisplayLimit)
-	{
-		$this->m_iMaxDisplayLimit = $iMaxDisplayLimit;
-	}
-
-	public function SetStandardReloadInterval($iStandardReloadInterval)
-	{
-		$this->m_iStandardReloadInterval = $iStandardReloadInterval;
-	}
-
-	public function SetFastReloadInterval($iFastReloadInterval)
-	{
-		$this->m_iFastReloadInterval = $iFastReloadInterval;
-	}
-
-	public function SetSecureConnectionRequired($bSecureConnectionRequired)
-	{
-		$this->m_bSecureConnectionRequired = $bSecureConnectionRequired;
-	}
-
-	public function SetDefaultLanguage($sLanguageCode)
-	{
-		$this->m_sDefaultLanguage = $sLanguageCode;
-	}
-
-	public function SetAllowedLoginTypes($aAllowedLoginTypes)
-	{
-		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
-	}
-
-	public function SetExternalAuthenticationVariable($sExtAuthVariable)
-	{
-		$this->m_sExtAuthVariable = $sExtAuthVariable;
-	}
-
-	public function SetEncryptionKey($sKey)
-	{
-		$this->m_sEncryptionKey = $sKey;
-	}
-
-	public function SetCSVImportCharsets($aCharsets)
-	{
-		$this->m_aCharsets = $aCharsets;
-	}
-
-	public function AddCSVImportCharset($sIconvCode, $sDisplayName)
-	{
-		$this->m_aCharsets[$sIconvCode] = $sDisplayName;
-	}
-
-	public function GetLoadedFile()
-	{
-		if (is_null($this->m_sFile))
-		{
-			return '';
-		}
-		else
-		{
-			return $this->m_sFile;
-		}
-	}
-
-	/**
-	 * Render the configuration as an associative array
-	 *
-	 * @return array
-	 */
-	public function ToArray()
-	{
-		$aSettings = array();
-		foreach ($this->m_aSettings as $sPropCode => $aSettingInfo)
-		{
-			$aSettings[$sPropCode] = $aSettingInfo['value'];
-		}
-		$aSettings['log_global'] = $this->m_bLogGlobal;
-		$aSettings['log_notification'] = $this->m_bLogNotification;
-		$aSettings['log_issue'] = $this->m_bLogIssue;
-		$aSettings['log_web_service'] = $this->m_bLogWebService;
-		$aSettings['query_cache_enabled'] = $this->m_bQueryCacheEnabled;
-		$aSettings['min_display_limit'] = $this->m_iMinDisplayLimit;
-		$aSettings['max_display_limit'] = $this->m_iMaxDisplayLimit;
-		$aSettings['standard_reload_interval'] = $this->m_iStandardReloadInterval;
-		$aSettings['fast_reload_interval'] = $this->m_iFastReloadInterval;
-		$aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired;
-		$aSettings['default_language'] = $this->m_sDefaultLanguage;
-		$aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes;
-		$aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable;
-		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
-		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
-
-		foreach ($this->m_aModuleSettings as $sModule => $aProperties)
-		{
-			foreach ($aProperties as $sProperty => $value)
-			{
-				$aSettings['module_settings'][$sModule][$sProperty] = $value;
-			}
-		}
-		foreach ($this->m_aAddons as $sKey => $sFile)
-		{
-			$aSettings['addon_list'][] = $sFile;
-		}
-
-		return $aSettings;
-	}
-
-	/**
-	 * Write the configuration to a file (php format) that can be reloaded later
-	 * By default write to the same file that was specified when constructing the object
-	 *
-	 * @param $sFileName string Name of the file to write to (emtpy to write to the same file)
-	 *
-	 * @return boolean True otherwise throws an Exception
-	 */
-	public function WriteToFile($sFileName = '')
-	{
-		if (empty($sFileName))
-		{
-			$sFileName = $this->m_sFile;
-		}
-		$hFile = @fopen($sFileName, 'w');
-		if ($hFile !== false)
-		{
-			fwrite($hFile, "<?php\n");
-			fwrite($hFile, "\n/**\n");
-			fwrite($hFile, " *\n");
-			fwrite($hFile, " * Configuration file, generated by the ".ITOP_APPLICATION." configuration wizard\n");
-			fwrite($hFile, " *\n");
-			fwrite($hFile,
-				" * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job\n");
-			fwrite($hFile, " *\n");
-			fwrite($hFile, " */\n");
-
-			$aConfigSettings = $this->m_aSettings;
-
-			// Old fashioned boolean settings
-			$aBoolValues = array(
-				'log_global' => $this->m_bLogGlobal,
-				'log_notification' => $this->m_bLogNotification,
-				'log_issue' => $this->m_bLogIssue,
-				'log_web_service' => $this->m_bLogWebService,
-				'query_cache_enabled' => $this->m_bQueryCacheEnabled,
-				'secure_connection_required' => $this->m_bSecureConnectionRequired,
-			);
-			foreach ($aBoolValues as $sKey => $bValue)
-			{
-				$aConfigSettings[$sKey] = array(
-					'show_in_conf_sample' => true,
-					'type' => 'bool',
-					'value' => $bValue,
-				);
-			}
-
-			// Old fashioned integer settings
-			$aIntValues = array(
-				'fast_reload_interval' => $this->m_iFastReloadInterval,
-				'max_display_limit' => $this->m_iMaxDisplayLimit,
-				'min_display_limit' => $this->m_iMinDisplayLimit,
-				'standard_reload_interval' => $this->m_iStandardReloadInterval,
-			);
-			foreach ($aIntValues as $sKey => $iValue)
-			{
-				$aConfigSettings[$sKey] = array(
-					'show_in_conf_sample' => true,
-					'type' => 'integer',
-					'value' => $iValue,
-				);
-			}
-
-			// Old fashioned remaining values
-			$aOtherValues = array(
-				'default_language' => $this->m_sDefaultLanguage,
-				'allowed_login_types' => $this->m_sAllowedLoginTypes,
-				'ext_auth_variable' => $this->m_sExtAuthVariable,
-				'encryption_key' => $this->m_sEncryptionKey,
-				'csv_import_charsets' => $this->m_aCharsets,
-			);
-			foreach ($aOtherValues as $sKey => $value)
-			{
-				$aConfigSettings[$sKey] = array(
-					'show_in_conf_sample' => true,
-					'type' => is_string($value) ? 'string' : 'mixed',
-					'value' => $value,
-				);
-			}
-
-			ksort($aConfigSettings);
-			fwrite($hFile, "\$MySettings = array(\n");
-			foreach ($aConfigSettings as $sPropCode => $aSettingInfo)
-			{
-				// Write all values that are either always visible or present in the cloned config file
-				if ($aSettingInfo['show_in_conf_sample'] || (!empty($aSettingInfo['source_of_value']) && ($aSettingInfo['source_of_value'] != 'unknown')))
-				{
-					$sType = $aSettingInfo['type'];
-					switch ($sType)
-					{
-						case 'bool':
-							$sSeenAs = $aSettingInfo['value'] ? 'true' : 'false';
-							break;
-						default:
-							$sSeenAs = self::PrettyVarExport($aSettingInfo['value'], "\t");
-					}
-					fwrite($hFile, "\n");
-					if (isset($aSettingInfo['description']))
-					{
-						fwrite($hFile, "\t// $sPropCode: {$aSettingInfo['description']}\n");
-					}
-					if (isset($aSettingInfo['default']))
-					{
-						$default = $aSettingInfo['default'];
-						if ($aSettingInfo['type'] == 'bool')
-						{
-							$default = $default ? 'true' : 'false';
-						}
-						fwrite($hFile,
-							"\t//\tdefault: ".self::PrettyVarExport($aSettingInfo['default'], "\t//\t\t", true)."\n");
-					}
-					fwrite($hFile, "\t'$sPropCode' => $sSeenAs,\n");
-				}
-			}
-			fwrite($hFile, ");\n");
-
-			fwrite($hFile, "\n");
-			fwrite($hFile, "/**\n *\n * Modules specific settings\n *\n */\n");
-			fwrite($hFile, "\$MyModuleSettings = array(\n");
-			foreach ($this->m_aModuleSettings as $sModule => $aProperties)
-			{
-				fwrite($hFile, "\t'$sModule' => array (\n");
-				foreach ($aProperties as $sProperty => $value)
-				{
-					$sNiceExport = self::PrettyVarExport($value, "\t\t");
-					fwrite($hFile, "\t\t'$sProperty' => $sNiceExport,\n");
-				}
-				fwrite($hFile, "\t),\n");
-			}
-			fwrite($hFile, ");\n");
-
-			fwrite($hFile, "\n/**\n");
-			fwrite($hFile, " *\n");
-			fwrite($hFile, " * Data model modules to be loaded. Names are specified as relative paths\n");
-			fwrite($hFile, " *\n");
-			fwrite($hFile, " */\n");
-			fwrite($hFile, "\$MyModules = array(\n");
-			fwrite($hFile, "\t'addons' => array (\n");
-			foreach ($this->m_aAddons as $sKey => $sFile)
-			{
-				fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
-			}
-			fwrite($hFile, "\t),\n");
-			fwrite($hFile, ");\n");
-			fwrite($hFile, '?'.'>'); // Avoid perturbing the syntax highlighting !
-
-			return fclose($hFile);
-		}
-		else
-		{
-			throw new ConfigException("Could not write to configuration file", array('file' => $sFileName));
-		}
-	}
-
-	/**
-	 * Helper function to initialize a configuration from the page arguments
-	 */
-	public function UpdateFromParams($aParamValues, $sModulesDir = null, $bPreserveModuleSettings = false)
-	{
-		if (isset($aParamValues['application_path']))
-		{
-			$this->Set('app_root_url', $aParamValues['application_path']);
-		}
-		if (isset($aParamValues['graphviz_path']))
-		{
-			$this->Set('graphviz_path', $aParamValues['graphviz_path']);
-		}
-		if (isset($aParamValues['mode']) && isset($aParamValues['language']))
-		{
-			if (($aParamValues['mode'] == 'install') || $this->GetDefaultLanguage() == '')
-			{
-				$this->SetDefaultLanguage($aParamValues['language']);
-			}
-		}
-		if (isset($aParamValues['db_server']))
-		{
-			$this->Set('db_host', $aParamValues['db_server']);
-			$this->Set('db_user', $aParamValues['db_user']);
-			$this->Set('db_pwd', $aParamValues['db_pwd']);
-			$sDBName = $aParamValues['db_name'];
-			if ($sDBName == '')
-			{
-				// Todo - obsolete after the transition to the new setup (2.0) is complete (WARNING: used by the designer)
-				if (isset($aParamValues['new_db_name']))
-				{
-					$sDBName = $aParamValues['new_db_name'];
-				}
-			}
-			$this->Set('db_name', $sDBName);
-			$this->Set('db_subname', $aParamValues['db_prefix']);
-
-			$bDbTlsEnabled = (bool) $aParamValues['db_tls_enabled'];
-			if ($bDbTlsEnabled)
-			{
-				$this->Set('db_tls.enabled', $bDbTlsEnabled, 'UpdateFromParams');
-			}
-			else
-			{
-				// disabled : we don't want parameter in the file
-				$this->Set('db_tls.enabled', $bDbTlsEnabled, null);
-			}
-			$sDbTlsCa = $bDbTlsEnabled ? $aParamValues['db_tls_ca'] : null;
-			if (isset($sDbTlsCa) && !empty($sDbTlsCa)) {
-				$this->Set('db_tls.ca', $sDbTlsCa, 'UpdateFromParams');
-			} else {
-				// empty parameter : we don't want it in the file
-				$this->Set('db_tls.ca', null, null);
-			}
-		}
-
-		if (isset($aParamValues['selected_modules']))
-		{
-			$aSelectedModules = explode(',', $aParamValues['selected_modules']);
-		}
-		else
-		{
-			$aSelectedModules = null;
-		}
-		$this->UpdateIncludes($sModulesDir, $aSelectedModules);
-
-		if (isset($aParamValues['source_dir']))
-		{
-			$this->Set('source_dir', $aParamValues['source_dir']);
-		}
-	}
-
-	/**
-	 * Helper function to rebuild the default configuration and the list of includes from a directory and a list of
-	 * selected modules
-	 *
-	 * @param string $sModulesDir The relative path to the directory to scan for modules (typically the 'env-xxx'
-	 *     directory resulting from the compilation)
-	 * @param array $aSelectedModules An array of selected modules' identifiers. If null all modules found will be
-	 *     considered as installed
-	 *
-	 * @throws Exception
-	 */
-	public function UpdateIncludes($sModulesDir, $aSelectedModules = null)
-	{
-		if (!is_null($sModulesDir))
-		{
-			// Initialize the arrays below with default values for the application...
-			$oEmptyConfig = new Config('dummy_file', false); // Do NOT load any config file, just set the default values
-			$aAddOns = $oEmptyConfig->GetAddOns();
-
-			$aModules = ModuleDiscovery::GetAvailableModules(array(APPROOT.$sModulesDir));
-			foreach ($aModules as $sModuleId => $aModuleInfo)
-			{
-				list ($sModuleName, $sModuleVersion) = ModuleDiscovery::GetModuleName($sModuleId);
-				if (is_null($aSelectedModules) || in_array($sModuleName, $aSelectedModules))
-				{
-					if (isset($aModuleInfo['settings']))
-					{
-						list ($sName, $sVersion) = ModuleDiscovery::GetModuleName($sModuleId);
-						foreach ($aModuleInfo['settings'] as $sProperty => $value)
-						{
-							if (isset($this->m_aModuleSettings[$sName][$sProperty]))
-							{
-								// Do nothing keep the original value
-							}
-							else
-							{
-								$this->SetModuleSetting($sName, $sProperty, $value);
-							}
-						}
-					}
-					if (isset($aModuleInfo['installer']))
-					{
-						$sModuleInstallerClass = $aModuleInfo['installer'];
-						if (!class_exists($sModuleInstallerClass))
-						{
-							throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not a PHP class - Module: ".$aModuleInfo['label']);
-						}
-						if (!is_subclass_of($sModuleInstallerClass, 'ModuleInstallerAPI'))
-						{
-							throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not derived from 'ModuleInstallerAPI' - Module: ".$aModuleInfo['label']);
-						}
-						$aCallSpec = array($sModuleInstallerClass, 'BeforeWritingConfig');
-						call_user_func_array($aCallSpec, array($this));
-					}
-				}
-			}
-			$this->SetAddOns($aAddOns);
-		}
-	}
-
-	/**
-	 * Helper: for an array of string, change the prefix when found
-	 */
-	protected static function ChangePrefix(&$aStrings, $sSearchPrefix, $sNewPrefix)
-	{
-		foreach ($aStrings as &$sFile)
-		{
-			if (substr($sFile, 0, strlen($sSearchPrefix)) == $sSearchPrefix)
-			{
-				$sFile = $sNewPrefix.substr($sFile, strlen($sSearchPrefix));
-			}
-		}
-	}
-
-	/**
-	 * Obsolete: kept only for backward compatibility of the Toolkit
-	 * Quick and dirty way to clone a config file into another environment
-	 */
-	public function ChangeModulesPath($sSourceEnv, $sTargetEnv)
-	{
-		// Now does nothing since the includes are built into the environment itself
-	}
-
-	/**
-	 * Pretty format a var_export'ed value so that (if possible) the identation is preserved on every line
-	 *
-	 * @param mixed $value The value to export
-	 * @param string $sIndentation The string to use to indent the text
-	 * @param bool $bForceIndentation Forces the identation (enven if it breaks/changes an eval, for example to ouput a
-	 *     value inside a comment)
-	 *
-	 * @return string The indented export string
-	 */
-	protected static function PrettyVarExport($value, $sIndentation, $bForceIndentation = false)
-	{
-		$sExport = var_export($value, true);
-		$sNiceExport = str_replace(array("\r\n", "\n", "\r"), "\n".$sIndentation, trim($sExport));
-		if (!$bForceIndentation)
-		{
-			/** @var array $aImported */
-			$aImported = null;
-			eval('$aImported='.$sNiceExport.';');
-			// Check if adding the identations at the beginning of each line
-			// did not modify the values (in case of a string containing a line break)
-			if ($aImported != $value)
-			{
-				$sNiceExport = $sExport;
-			}
-		}
-
-		return $sNiceExport;
-	}
-
-}
-
-?>
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+define('ITOP_APPLICATION', 'iTop');
+define('ITOP_APPLICATION_SHORT', 'iTop');
+define('ITOP_VERSION', '2.5.0-beta');
+define('ITOP_REVISION', 'svn');
+define('ITOP_BUILD_DATE', '$WCNOW$');
+
+define('ACCESS_USER_WRITE', 1);
+define('ACCESS_ADMIN_WRITE', 2);
+define('ACCESS_FULL', ACCESS_USER_WRITE | ACCESS_ADMIN_WRITE);
+define('ACCESS_READONLY', 0);
+
+/**
+ * Configuration read/write
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('coreexception.class.inc.php');
+require_once('attributedef.class.inc.php'); // For the defines
+
+class ConfigException extends CoreException
+{
+}
+
+// was utf8 but it only supports BMP chars (https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html)
+// so we switched to utf8mb4 in iTop 2.5, adding dependency to MySQL 5.5.3
+// The config params db_character_set and db_collation were introduced as a temporary workaround and removed in iTop 2.5
+// now everything uses those fixed value !
+define('DEFAULT_CHARACTER_SET', 'utf8mb4');
+define('DEFAULT_COLLATION', 'utf8mb4_unicode_ci');
+
+define('DEFAULT_LOG_GLOBAL', true);
+define('DEFAULT_LOG_NOTIFICATION', true);
+define('DEFAULT_LOG_ISSUE', true);
+define('DEFAULT_LOG_WEB_SERVICE', true);
+
+define('DEFAULT_QUERY_CACHE_ENABLED', true);
+
+
+define('DEFAULT_MIN_DISPLAY_LIMIT', 10);
+define('DEFAULT_MAX_DISPLAY_LIMIT', 15);
+define('DEFAULT_STANDARD_RELOAD_INTERVAL', 5 * 60);
+define('DEFAULT_FAST_RELOAD_INTERVAL', 1 * 60);
+define('DEFAULT_SECURE_CONNECTION_REQUIRED', false);
+define('DEFAULT_ALLOWED_LOGIN_TYPES', 'form|basic|external');
+define('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
+define('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random value, later...
+
+/**
+ * Config
+ * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
+ *
+ * @package     iTopORM
+ */
+class Config
+{
+	//protected $m_bIsLoaded = false;
+	protected $m_sFile = '';
+
+	protected $m_aAppModules;
+	protected $m_aDataModels;
+	protected $m_aWebServiceCategories;
+	protected $m_aAddons;
+
+	protected $m_aModuleSettings;
+
+	/**
+	 * New way to store the settings !
+	 *
+	 * @var array
+	 * @since 2.5 db* variables
+	 */
+	protected $m_aSettings = array(
+		'app_env_label' => array(
+			'type' => 'string',
+			'description' => 'Label displayed to describe the current application environnment, defaults to the environment name (e.g. "production")',
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'app_root_url' => array(
+			'type' => 'string',
+			'description' => 'Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server\'s name)',
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'app_icon_url' => array(
+			'type' => 'string',
+			'description' => 'Hyperlink to redirect the user when clicking on the application icon (in the main window, or login/logoff pages)',
+			'default' => 'http://www.combodo.com/itop',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'db_host' => array(
+			'type' => 'string',
+			'default' => null,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'db_user' => array(
+			'type' => 'string',
+			'default' => null,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'db_pwd' => array(
+			'type' => 'string',
+			'default' => null,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'db_name' => array(
+			'type' => 'string',
+			'default' => null,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'db_subname' => array(
+			'type' => 'string',
+			'default' => null,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'db_tls.enabled' => array(
+			'type' => 'bool',
+			'description' => 'If true then the connection to the DB will be encrypted',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'db_tls.ca' => array(
+			'type' => 'string',
+			'description' => 'Path to certificate authority file for SSL',
+			'default' => null,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'db_character_set' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
+			'type' => 'string',
+			'description' => 'Deprecated since iTop 2.5 : now using utf8mb4',
+			'default' => 'DEPRECATED_2.5',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'db_collation' => array( // @deprecated to remove in 2.7 ? #1001 utf8mb4 switch
+			'type' => 'string',
+			'description' => 'Deprecated since iTop 2.5 : now using utf8mb4_unicode_ci',
+			'default' => 'DEPRECATED_2.5',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'skip_check_to_write' => array(
+			'type' => 'bool',
+			'description' => 'Disable data format and integrity checks to boost up data load (insert or update)',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'skip_check_ext_keys' => array(
+			'type' => 'bool',
+			'description' => 'Disable external key check when checking the value of attributes',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'skip_strong_security' => array(
+			'type' => 'bool',
+			'description' => 'Disable strong security - TEMPORY: this flag should be removed when we are more confident in the recent change in security',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'query_optimization_enabled' => array(
+			'type' => 'bool',
+			'description' => 'The queries are optimized based on the assumption that the DB integrity has been preserved. By disabling the optimization one can ensure that the fetched data is clean... but this can be really slower or not usable at all (some queries will exceed the allowed number of joins in MySQL: 61!)',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'query_indentation_enabled' => array(
+			'type' => 'bool',
+			'description' => 'For developpers: format the SQL queries for human analysis',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'disable_mandatory_ext_keys' => array(
+			'type' => 'bool',
+			'description' => 'For developpers: allow every external keys to be undefined',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'graphviz_path' => array(
+			'type' => 'string',
+			'description' => 'Path to the Graphviz "dot" executable for graphing objects lifecycle',
+			'default' => '/usr/bin/dot',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'php_path' => array(
+			'type' => 'string',
+			'description' => 'Path to the php executable in CLI mode',
+			'default' => 'php',
+			'value' => 'php',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'session_name' => array(
+			'type' => 'string',
+			'description' => 'The name of the cookie used to store the PHP session id',
+			'default' => 'iTop',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'max_combo_length' => array(
+			'type' => 'integer',
+			'description' => 'The maximum number of elements in a drop-down list. If more then an autocomplete will be used',
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'min_autocomplete_chars' => array(
+			'type' => 'integer',
+			'description' => 'The minimum number of characters to type in order to trigger the "autocomplete" behavior',
+			'default' => 2,
+			'value' => 2,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'allow_menu_on_linkset' => array(
+			'type' => 'bool',
+			'description' => 'Display Action menus in view mode on any LinkedSet with edit_mode != none',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'allow_target_creation' => array(
+			'type' => 'bool',
+			'description' => 'Displays the + button on external keys to create target objects',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		// Levels that trigger a confirmation in the CSV import/synchro wizard
+		'csv_import_min_object_confirmation' => array(
+			'type' => 'integer',
+			'description' => 'Minimum number of objects to check for the confirmation percentages',
+			'default' => 3,
+			'value' => 3,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'csv_import_errors_percentage' => array(
+			'type' => 'integer',
+			'description' => 'Percentage of errors that trigger a confirmation in the CSV import',
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'csv_import_modifications_percentage' => array(
+			'type' => 'integer',
+			'description' => 'Percentage of modifications that trigger a confirmation in the CSV import',
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'csv_import_creations_percentage' => array(
+			'type' => 'integer',
+			'description' => 'Percentage of creations that trigger a confirmation in the CSV import',
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'csv_import_history_display' => array(
+			'type' => 'bool',
+			'description' => 'Display the history tab in the import wizard',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'access_mode' => array(
+			'type' => 'integer',
+			'description' => 'Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3',
+			'default' => ACCESS_FULL,
+			'value' => ACCESS_FULL,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'access_message' => array(
+			'type' => 'string',
+			'description' => 'Message displayed to the users when there is any access restriction',
+			'default' => 'iTop is temporarily frozen, please wait... (the admin team)',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'online_help' => array(
+			'type' => 'string',
+			'description' => 'Hyperlink to the online-help web page',
+			'default' => 'http://www.combodo.com/itop-help',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'log_usage' => array(
+			'type' => 'bool',
+			'description' => 'Log the usage of the application (i.e. the date/time and the user name of each login)',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'log_rest_service' => array(
+			'type' => 'bool',
+			'description' => 'Log the usage of the REST/JSON service',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'synchro_trace' => array(
+			'type' => 'string',
+			'description' => 'Synchronization details: none, display, save (includes \'display\')',
+			'default' => 'none',
+			'value' => 'none',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_item_separator' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: line separator',
+			'default' => '|',
+			'value' => '|',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_attribute_separator' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: attribute separator',
+			'default' => ';',
+			'value' => ';',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_value_separator' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: value separator (between the attcode and the value itself',
+			'default' => ':',
+			'value' => ':',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'link_set_attribute_qualifier' => array(
+			'type' => 'string',
+			'description' => 'Link set from string: attribute qualifier (encloses both the attcode and the value)',
+			'default' => "'",
+			'value' => "'",
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cron_max_execution_time' => array(
+			'type' => 'integer',
+			'description' => 'Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout',
+			'default' => 600,
+			'value' => 600,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cron_sleep' => array(
+			'type' => 'integer',
+			'description' => 'Duration (seconds) before cron.php checks again if something must be done',
+			'default' => 2,
+			'value' => 2,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'async_task_retries' => array(
+			'type' => 'array',
+			'description' => 'Automatic retries of asynchronous tasks in case of failure (per class)',
+			'default' => array('AsyncSendEmail' => array('max_retries' => 0, 'retry_delay' => 600)),
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_asynchronous' => array(
+			'type' => 'bool',
+			'description' => 'If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode',
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'email_transport' => array(
+			'type' => 'string',
+			'description' => 'Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocole)',
+			'default' => "PHPMail",
+			'value' => "PHPMail",
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'email_transport_smtp.host' => array(
+			'type' => 'string',
+			'description' => 'host name or IP address (optional)',
+			'default' => "localhost",
+			'value' => "localhost",
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_transport_smtp.port' => array(
+			'type' => 'integer',
+			'description' => 'port number (optional)',
+			'default' => 25,
+			'value' => 25,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_transport_smtp.encryption' => array(
+			'type' => 'string',
+			'description' => 'tls or ssl (optional)',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_transport_smtp.username' => array(
+			'type' => 'string',
+			'description' => 'Authentication user (optional)',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_transport_smtp.password' => array(
+			'type' => 'string',
+			'description' => 'Authentication password (optional)',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_css' => array(
+			'type' => 'string',
+			'description' => 'CSS that will override the standard stylesheet used for the notifications',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'email_default_sender_address' => array(
+			'type' => 'string',
+			'description' => 'Default address provided in the email from header field.',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'email_default_sender_label' => array(
+			'type' => 'string',
+			'description' => 'Default label provided in the email from header field.',
+			'default' => "",
+			'value' => "",
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'apc_cache.enabled' => array(
+			'type' => 'bool',
+			'description' => 'If set, the APC cache is allowed (the PHP extension must also be active)',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'apc_cache.query_ttl' => array(
+			'type' => 'integer',
+			'description' => 'Time to live set in APC for the prepared queries (seconds - 0 means no timeout)',
+			'default' => 3600,
+			'value' => 3600,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'apc_cache_emulation.max_entries' => array(
+			'type' => 'integer',
+			'description' => 'Maximum number of cache entries (0 means no limit)',
+			'default' => 1000,
+			'value' => 1000,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'timezone' => array(
+			'type' => 'string',
+			'description' => 'Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitely configured in PHP',
+			// examples... not used (nor 'description')
+			'examples' => array(
+				'America/Sao_Paulo',
+				'America/New_York (standing for EDT)',
+				'America/Los_Angeles (standing for PDT)',
+				'Asia/Istanbul',
+				'Asia/Singapore',
+				'Africa/Casablanca',
+				'Australia/Sydney'
+			),
+			'default' => 'Europe/Paris',
+			'value' => 'Europe/Paris',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_include_path' => array(
+			'type' => 'string',
+			'description' => 'The path where to find the phpCAS library',
+			// examples... not used (nor 'description')
+			'default' => '/usr/share/php',
+			'value' => '/usr/share/php',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'cas_version' => array(
+			'type' => 'string',
+			'description' => 'The CAS protocol version to use: "1.0" (CAS v1), "2.0" (CAS v2) or "S1" (SAML V1) )',
+			// examples... not used (nor 'description')
+			'default' => '2.0',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_host' => array(
+			'type' => 'string',
+			'description' => 'The name of the CAS host',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_port' => array(
+			'type' => 'integer',
+			'description' => 'The port used by the CAS server',
+			// examples... not used (nor 'description')
+			'default' => 443,
+			'value' => 443,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_context' => array(
+			'type' => 'string',
+			'description' => 'The CAS context',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_server_ca_cert_path' => array(
+			'type' => 'string',
+			'description' => 'The path where to find the certificate of the CA for validating the certificate of the CAS server',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_logout_redirect_service' => array(
+			'type' => 'string',
+			'description' => 'The redirect service (URL) to use when logging-out with CAS',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_memberof' => array(
+			'type' => 'string',
+			'description' => 'A semicolon separated list of group names that the user must be member of (works only with SAML - e.g. cas_version=> "S1")',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_user_synchro' => array(
+			'type' => 'bool',
+			'description' => 'Whether or not to synchronize users with CAS/LDAP',
+			// examples... not used (nor 'description')
+			'default' => 0,
+			'value' => 0,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_update_profiles' => array(
+			'type' => 'bool',
+			'description' => 'Whether or not to update the profiles of an existing user from the CAS information',
+			// examples... not used (nor 'description')
+			'default' => 0,
+			'value' => 0,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_profile_pattern' => array(
+			'type' => 'string',
+			'description' => 'A regular expression pattern to extract the name of the iTop profile from the name of an LDAP/CAS group',
+			// examples... not used (nor 'description')
+			'default' => '/^cn=([^,]+),/',
+			'value' => '/^cn=([^,]+),/',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_default_profiles' => array(
+			'type' => 'string',
+			'description' => 'A semi-colon separated list of iTop Profiles to use when creating a new user if no profile is retrieved from CAS',
+			// examples... not used (nor 'description')
+			'default' => 'Portal user',
+			'value' => 'Portal user',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'cas_debug' => array(
+			'type' => 'bool',
+			'description' => 'Activate the CAS debug',
+			// examples... not used (nor 'description')
+			'default' => false,
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'forgot_password' => array(
+			'type' => 'bool',
+			'description' => 'Enable the "Forgot password" feature',
+			// examples... not used (nor 'description')
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'forgot_password_from' => array(
+			'type' => 'string',
+			'description' => 'Sender email address for the "forgot password" feature. If empty, defaults to the recipient\'s  email address.',
+			// examples... not used (nor 'description')
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'deadline_format' => array(
+			'type' => 'string',
+			'description' => 'The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$',
+			// examples... $date$ ($deadline$)
+			'default' => '$difference$',
+			'value' => '$difference$',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'buttons_position' => array(
+			'type' => 'string',
+			'description' => 'Position of the forms buttons: bottom | top | both',
+			// examples... not used
+			'default' => 'both',
+			'value' => 'both',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'shortcut_actions' => array(
+			'type' => 'string',
+			'description' => 'Actions that are available as direct buttons next to the "Actions" menu',
+			// examples... not used
+			'default' => 'UI:Menu:Modify,UI:Menu:New',
+			'value' => 'UI:Menu:Modify',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'complex_actions_limit' => array(
+			'type' => 'integer',
+			'description' => 'Display the "actions" menu items that require long computation only if the list of objects is contains less objects than this number (0 means no limit)',
+			// examples... not used
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'synchro_prevent_delete_all' => array(
+			'type' => 'bool',
+			'description' => 'Stop the synchro if all the replicas of a data source become obsolete at the same time.',
+			// examples... not used
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'source_dir' => array(
+			'type' => 'string',
+			'description' => 'Source directory for the datamodel files. (which gets compiled to env-production).',
+			// examples... not used
+			'default' => '',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'csv_file_default_charset' => array(
+			'type' => 'string',
+			'description' => 'Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).',
+			// examples... not used
+			'default' => 'ISO-8859-1',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'debug_report_spurious_chars' => array(
+			'type' => 'bool',
+			'description' => 'Report, in the error log, the characters found in the output buffer, echoed by mistake in the loaded modules, and potentially corrupting the output',
+			// examples... not used
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'impact_analysis_first_tab' => array(
+			'type' => 'string',
+			'description' => 'Which tab to display first in the impact analysis view: list or graphics. Graphics are nicer but slower to display when there are many objects',
+			// examples... not used
+			'default' => 'graphics',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'url_validation_pattern' => array(
+			'type' => 'string',
+			'description' => 'Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)',
+			'default' => '(https?|ftp)\://([a-zA-Z0-9+!*(),;?&=\$_.-]+(\:[a-zA-Z0-9+!*(),;?&=\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\:[0-9]{2,5})?(/([a-zA-Z0-9%+\$_-]\.?)+)*/?(\?[a-zA-Z+&\$_.-][a-zA-Z0-9;:[\]@&%=+/\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\$_.-]*)?',
+			//            SHEME.......... USER....................... PASSWORD.......................... HOST/IP........... PORT.......... PATH........................ GET............................................ ANCHOR............................
+			// Example: http://User:passWord@127.0.0.1:8888/patH/Page.php?arrayArgument[2]=something:blah20#myAnchor
+			// Origin of this regexp: http://www.php.net/manual/fr/function.preg-match.php#93824
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+        'email_validation_pattern' => array(
+            'type' => 'string',
+            'description' => 'Regular expression to validate/detect the format of an eMail address',
+            'default' => "[a-zA-Z0-9._&'-]+@[a-zA-Z0-9.-]+\.[a-zA-Z0-9-]{2,}",
+            'value' => '',
+            'source_of_value' => '',
+            'show_in_conf_sample' => true,
+        ),
+        'email_decoration_class' => array(
+            'type' => 'string',
+            'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fa fa-envelope" will put a mail icon.',
+            'default' => 'fa fa-envelope',
+            'value' => '',
+            'source_of_value' => '',
+            'show_in_conf_sample' => false,
+        ),
+        'phone_number_validation_pattern' => array(
+            'type' => 'string',
+            'description' => 'Regular expression to validate/detect the format of a phone number',
+            'default' => "[0-9.\-\ \+\(\)]+",
+            'value' => '',
+            'source_of_value' => '',
+            'show_in_conf_sample' => false,
+        ),
+        'phone_number_url_pattern' => array(
+            'type' => 'string',
+            'description' => 'Format for phone number url, use %1$s as a placeholder for the value. eg. "tel:%1$s" for regular phone applications or "callto:%1$s" for Skype. Default is "tel:%1$s".',
+            'default' => 'tel:%1$s',
+            'value' => '',
+            'source_of_value' => '',
+            'show_in_conf_sample' => false,
+        ),
+        'phone_number_decoration_class' => array(
+            'type' => 'string',
+            'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fa fa-phone" will put a phone icon.',
+            'default' => 'fa fa-phone',
+            'value' => '',
+            'source_of_value' => '',
+            'show_in_conf_sample' => false,
+        ),
+		'log_kpi_duration' => array(
+			'type' => 'integer',
+			'description' => 'Level of logging for troubleshooting performance issues (1 to enable, 2 +blame callers)',
+			// examples... not used
+			'default' => 0,
+			'value' => 0,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'log_kpi_memory' => array(
+			'type' => 'integer',
+			'description' => 'Level of logging for troubleshooting memory limit issues',
+			// examples... not used
+			'default' => 0,
+			'value' => 0,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'log_kpi_user_id' => array(
+			'type' => 'string',
+			'description' => 'Limit the scope of users to the given user id (* means no limit)',
+			// examples... not used
+			'default' => '*',
+			'value' => '*',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'max_linkset_output' => array(
+			'type' => 'integer',
+			'description' => 'Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.',
+			'default' => 100,
+			'value' => 100,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'demo_mode' => array(
+			'type' => 'bool',
+			'description' => 'Set to true to prevent users from changing passwords/languages',
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'portal_tickets' => array(
+			'type' => 'string',
+			'description' => 'CSV list of classes supported in the portal',
+			// examples... not used
+			'default' => 'UserRequest',
+			'value' => 'UserRequest',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'portal_dispatch_urls' => array(
+			'type' => 'array',
+			'description' => 'Associative array of sPortalId => Home page URL (relatively to the application root)',
+			// examples... not used
+			'default' => array(),
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'max_execution_time_per_loop' => array(
+			'type' => 'integer',
+			'description' => 'Maximum execution time requested, per loop, during bulk operations. Zero means no limit.',
+			// examples... not used
+			'default' => 30,
+			'value' => 30,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'max_history_length' => array(
+			'type' => 'integer',
+			'description' => 'Maximum length of the history table (in the "History" tab on each object) before it gets truncated. Latest modifications are displayed first.',
+			// examples... not used
+			'default' => 50,
+			'value' => 50,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'max_history_case_log_entry_length' => array(
+			'type' => 'integer',
+			'description' => 'The length (in number of characters) at which to truncate the (expandable) display (in the history) of a case log entry. If zero, the display in the history is not truncated.',
+			// examples... not used
+			'default' => 60,
+			'value' => 60,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'full_text_chunk_duration' => array(
+			'type' => 'integer',
+			'description' => 'Delay after which the results are displayed.',
+			// examples... not used
+			'default' => 2,
+			'value' => 2,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'full_text_accelerators' => array(
+			'type' => 'array',
+			'description' => 'Specifies classes to be searched at first (and the subset of data) when running the full text search.',
+			'default' => array(),
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'full_text_needle_min' => array(
+			'type' => 'integer',
+			'description' => 'Minimum size of the full text needle.',
+			'default' => 3,
+			'value' => 3,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'tracking_level_linked_set_default' => array(
+			'type' => 'integer',
+			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)',
+			'default' => LINKSET_TRACKING_LIST,
+			'value' => LINKSET_TRACKING_LIST,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'tracking_level_linked_set_indirect_default' => array(
+			'type' => 'integer',
+			'description' => 'Default tracking level if not explicitely set at the attribute level, for AttributeLinkedSetIndirect',
+			'default' => LINKSET_TRACKING_ALL,
+			'value' => LINKSET_TRACKING_ALL,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'user_rights_legacy' => array(
+			'type' => 'bool',
+			'description' => 'Set to true to restore the buggy algorithm for the computation of user rights (within the same profile, ALLOW on the class itself has precedence on DENY of a parent class)',
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'xlsx_exporter_memory_limit' => array(
+			'type' => 'string',
+			'description' => 'Memory limit to use when (interactively) exporting data to Excel',
+			'default' => '2048M', // Huuuuuuge 2GB!
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'min_reload_interval' => array(
+			'type' => 'integer',
+			'description' => 'Minimum refresh interval (seconds) for dashboards, shortcuts, etc. Even if the interval is set programmatically, it is forced to that minimum',
+			'default' => 5, // In iTop 2.0.3, this was the hardcoded value
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'relations_max_depth' => array(
+			'type' => 'integer',
+			'description' => 'Maximum number of successive levels (depth) to explore when displaying the impact/depends on relations.',
+			'default' => 20, // In iTop 2.0.3, this was the hardcoded value
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'transaction_storage' => array(
+			'type' => 'string',
+			'description' => 'The type of mechanism to use for storing the unique identifiers for transactions (Session|File).',
+			'default' => 'Session',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'transactions_enabled' => array(
+			'type' => 'bool',
+			'description' => 'Whether or not the whole mechanism to prevent multiple submissions of a page is enabled.',
+			'default' => true,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'log_transactions' => array(
+			'type' => 'bool',
+			'description' => 'Whether or not to enable the debug log for the transactions.',
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'concurrent_lock_enabled' => array(
+			'type' => 'bool',
+			'description' => 'Whether or not to activate the locking mechanism in order to prevent concurrent edition of the same object.',
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'concurrent_lock_expiration_delay' => array(
+			'type' => 'integer',
+			'description' => 'Delay (in seconds) for a concurrent lock to expire',
+			'default' => 120,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'concurrent_lock_override_profiles' => array(
+			'type' => 'array',
+			'description' => 'The list of profiles allowed to "kill" a lock',
+			'default' => array('Administrator'),
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'html_sanitizer' => array(
+			'type' => 'string',
+			'description' => 'The class to use for HTML sanitization: HTMLDOMSanitizer, HTMLPurifierSanitizer or HTMLNullSanitizer',
+			'default' => 'HTMLDOMSanitizer',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'inline_image_max_display_width' => array(
+			'type' => 'integer',
+			'description' => 'The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.',
+			'default' => '250',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'inline_image_max_storage_width' => array(
+			'type' => 'integer',
+			'description' => 'The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.',
+			'default' => '1600',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'draft_attachments_lifetime' => array(
+			'type' => 'integer',
+			'description' => 'Lifetime (in seconds) of drafts\' attachments and inline images: after this duration, the garbage collector will delete them.',
+			'default' => 3600,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'date_and_time_format' => array(
+			'type' => 'array',
+			'description' => 'Format for date and time display (per language)',
+			'default' => array('default' => array('date' => 'Y-m-d', 'time' => 'H:i:s', 'date_time' => '$date $time')),
+			'value' => false,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'breadcrumb.max_count' => array(
+			'type' => 'integer',
+			'description' => 'Maximum number of items kept in the history breadcrumb. Set it to 0 to entirely disable the breadcrumb.',
+			'default' => 8,
+			'value' => 8,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'obsolescence.show_obsolete_data' => array(
+			'type' => 'bool',
+			'description' => 'Default value for the user preference "show obsolete data"',
+			'default' => false,
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'obsolescence.date_update_interval' => array(
+			'type' => 'integer',
+			'description' => 'Delay in seconds between two refreshes of the obsolescence dates.',
+			'default' => 600,
+			'value' => 600,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'disable_attachments_download_legacy_portal' => array(
+			'type' => 'bool',
+			'description' => 'Disable attachments download from legacy portal',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'secure_rest_services' => array(
+			'type' => 'bool',
+			'description' => 'When set to true, only the users with the profile "REST Services User" are allowed to use the REST web services.',
+			'default' => true,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
+		'search_manual_submit' => array(
+			'type' => 'array',
+			'description' => 'Force manual submit of search all requests',
+			'default' => false,
+			'value' => true,
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+		'high_cardinality_classes' => array(
+			'type' => 'array',
+			'description' => 'List of classes with high cardinality (Force manual submit of search)',
+			'default' => array(),
+			'value' => array(),
+			'source_of_value' => '',
+			'show_in_conf_sample' => true,
+		),
+	);
+
+	public function IsProperty($sPropCode)
+	{
+		return (array_key_exists($sPropCode, $this->m_aSettings));
+	}
+
+	/**
+	 * @return string identifier that can be used for example to name WebStorage/SessionStorage keys (they
+	 *     are related to a whole domain, and a domain can host multiple itop)
+	 *     Beware: do not expose server side information to the client !
+	 */
+	public function GetItopInstanceid()
+	{
+		return md5(utils::GetAbsoluteUrlAppRoot()
+			.'==='.$this->Get('db_host')
+			.'/'.$this->Get('db_name')
+			.'/'.$this->Get('db_subname'));
+	}
+
+	public function GetDescription($sPropCode)
+	{
+		return $this->m_aSettings[$sPropCode];
+	}
+
+	/**
+	 * @param string $sPropCode
+	 * @param mixed $value
+	 * @param string $sSourceDesc mandatory for variables with show_in_conf_sample=false
+	 *
+	 * @throws \CoreException
+	 */
+	public function Set($sPropCode, $value, $sSourceDesc = 'unknown')
+	{
+		$sType = $this->m_aSettings[$sPropCode]['type'];
+		switch ($sType)
+		{
+			case 'bool':
+				$value = (bool)$value;
+				break;
+			case 'string':
+				$value = (string)$value;
+				break;
+			case 'integer':
+				$value = (integer)$value;
+				break;
+			case 'float':
+				$value = (float)$value;
+				break;
+			case 'array':
+				break;
+			default:
+				throw new CoreException('Unknown type for setting', array('property' => $sPropCode, 'type' => $sType));
+		}
+		$this->m_aSettings[$sPropCode]['value'] = $value;
+		$this->m_aSettings[$sPropCode]['source_of_value'] = $sSourceDesc;
+
+	}
+
+    public function Get($sPropCode)
+    {
+        return $this->m_aSettings[$sPropCode]['value'];
+    }
+
+	/**
+	 * Event log options (see LOG_... definition)
+	 */
+	// Those variables will be deprecated later, when the transition to ...Get('my_setting') will be done
+	protected $m_bLogGlobal;
+	protected $m_bLogNotification;
+	protected $m_bLogIssue;
+	protected $m_bLogWebService;
+	protected $m_bQueryCacheEnabled; // private setting
+
+	/**
+	 * @var integer Number of elements to be displayed when there are more than m_iMaxDisplayLimit elements
+	 */
+	protected $m_iMinDisplayLimit;
+	/**
+	 * @var integer Max number of elements before truncating the display
+	 */
+	protected $m_iMaxDisplayLimit;
+
+	/**
+	 * @var integer Number of seconds between two reloads of the display (standard)
+	 */
+	protected $m_iStandardReloadInterval;
+	/**
+	 * @var integer Number of seconds between two reloads of the display (fast)
+	 */
+	protected $m_iFastReloadInterval;
+
+	/**
+	 * @var boolean Whether or not a secure connection is required for using the application.
+	 *              If set, any attempt to connect to an iTop page with http:// will be redirected
+	 *              to https://
+	 */
+	protected $m_bSecureConnectionRequired;
+
+	/**
+	 * @var string Langage code, default if the user language is undefined
+	 */
+	protected $m_sDefaultLanguage;
+
+	/**
+	 * @var string Type of login process allowed: form|basic|url|external
+	 */
+	protected $m_sAllowedLoginTypes;
+
+	/**
+	 * @var string Name of the PHP variable in which external authentication information is passed by the web server
+	 */
+	protected $m_sExtAuthVariable;
+
+	/**
+	 * @var string Encryption key used for all attributes of type "encrypted string". Can be set to a random value
+	 *             unless you want to import a database from another iTop instance, in which case you must use
+	 *             the same encryption key in order to properly decode the encrypted fields
+	 */
+	protected $m_sEncryptionKey;
+
+	/**
+	 * @var array Additional character sets to be supported by the interactive CSV import
+	 *            'iconv_code' => 'display name'
+	 */
+	protected $m_aCharsets;
+
+	public function __construct($sConfigFile = null, $bLoadConfig = true)
+	{
+		$this->m_sFile = $sConfigFile;
+		if (is_null($sConfigFile))
+		{
+			$bLoadConfig = false;
+		}
+
+		$this->m_aAddons = array(
+			// Default AddOn, always present can be moved to an official iTop Module later if needed
+			'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+		);
+
+		foreach ($this->m_aSettings as $sPropCode => $aSettingInfo)
+		{
+			$this->m_aSettings[$sPropCode]['value'] = $aSettingInfo['default'];
+		}
+
+		$this->m_bLogGlobal = DEFAULT_LOG_GLOBAL;
+		$this->m_bLogNotification = DEFAULT_LOG_NOTIFICATION;
+		$this->m_bLogIssue = DEFAULT_LOG_ISSUE;
+		$this->m_bLogWebService = DEFAULT_LOG_WEB_SERVICE;
+		$this->m_iMinDisplayLimit = DEFAULT_MIN_DISPLAY_LIMIT;
+		$this->m_iMaxDisplayLimit = DEFAULT_MAX_DISPLAY_LIMIT;
+		$this->m_iStandardReloadInterval = DEFAULT_STANDARD_RELOAD_INTERVAL;
+		$this->m_iFastReloadInterval = DEFAULT_FAST_RELOAD_INTERVAL;
+		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
+		$this->m_sDefaultLanguage = 'EN US';
+		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
+		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
+		$this->m_sEncryptionKey = DEFAULT_ENCRYPTION_KEY;
+		$this->m_aCharsets = array();
+		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
+
+		$this->m_aModuleSettings = array();
+
+		if ($bLoadConfig)
+		{
+			$this->Load($sConfigFile);
+			$this->Verify();
+		}
+
+		// Application root url: set a default value, then normalize it
+		/*
+		 * Does not work in CLI/unattended mode
+				$sAppRootUrl = trim($this->Get('app_root_url'));
+				if (strlen($sAppRootUrl) == 0)
+				{
+					$sAppRootUrl = utils::GetDefaultUrlAppRoot();
+				}
+				if (substr($sAppRootUrl, -1, 1) != '/')
+				{
+					$sAppRootUrl .= '/';
+				}
+				$this->Set('app_root_url', $sAppRootUrl);
+		 */
+	}
+
+	protected function CheckFile($sPurpose, $sFileName)
+	{
+		if (!file_exists($sFileName))
+		{
+			throw new ConfigException("Could not find $sPurpose file", array('file' => $sFileName));
+		}
+		if (!is_readable($sFileName))
+		{
+			throw new ConfigException("Could not read $sPurpose file (the file exists but cannot be read). Do you have the rights to access this file?",
+				array('file' => $sFileName));
+		}
+	}
+
+	/**
+	 * @param string $sConfigFile
+	 *
+	 * @throws \ConfigException
+	 * @throws \CoreException
+	 */
+	protected function Load($sConfigFile)
+	{
+		$this->CheckFile('configuration', $sConfigFile);
+
+		$sConfigCode = trim(file_get_contents($sConfigFile));
+
+		// Variables created when doing an eval() on the config file
+		/** @var array $MySettings */
+		$MySettings = null;
+		/** @var array $MyModuleSettings */
+		$MyModuleSettings = null;
+		/** @var array $MyModules */
+		$MyModules = null;
+
+		// This does not work on several lines
+		// preg_match('/^<\\?php(.*)\\?'.'>$/', $sConfigCode, $aMatches)...
+		// So, I've implemented a solution suggested in the PHP doc (search for phpWrapper)
+		try
+		{
+			ob_start();
+			eval('?'.'>'.trim($sConfigCode));
+			$sNoise = trim(ob_get_contents());
+			ob_end_clean();
+		}
+		catch (Exception $e)
+		{
+			// well, never reach in case of parsing error :-(
+			// will be improved in PHP 6 ?
+			throw new ConfigException('Error in configuration file',
+				array('file' => $sConfigFile, 'error' => $e->getMessage()));
+		}
+		catch(Error $e)
+		{
+		    // PHP 7
+		    throw new ConfigException('Error in configuration file',
+		        array('file' => $sConfigFile, 'error' => $e->getMessage().' at line '.$e->getLine()));
+		}
+		if (strlen($sNoise) > 0)
+		{
+			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
+			throw new ConfigException('Syntax error in configuration file',
+				array('file' => $sConfigFile, 'error' => '<tt>'.htmlentities($sNoise, ENT_QUOTES, 'UTF-8').'</tt>'));
+		}
+
+		if (!isset($MySettings) || !is_array($MySettings))
+		{
+			throw new ConfigException('Missing array in configuration file',
+				array('file' => $sConfigFile, 'expected' => '$MySettings'));
+		}
+
+		if (!array_key_exists('addons', $MyModules))
+		{
+			throw new ConfigException('Missing item in configuration file',
+				array('file' => $sConfigFile, 'expected' => '$MyModules[\'addons\']'));
+		}
+		if (!array_key_exists('user rights', $MyModules['addons']))
+		{
+			// Add one, by default
+			$MyModules['addons']['user rights'] = '/addons/userrights/userrightsnull.class.inc.php';
+		}
+
+		$this->m_aAddons = $MyModules['addons'];
+
+		foreach ($MySettings as $sPropCode => $rawvalue)
+		{
+			if ($this->IsProperty($sPropCode))
+			{
+				if (is_string($rawvalue))
+				{
+					$value = trim($rawvalue);
+				}
+				else
+				{
+					$value = $rawvalue;
+				}
+				$this->Set($sPropCode, $value, $sConfigFile);
+			}
+		}
+
+		$this->m_bLogGlobal = isset($MySettings['log_global']) ? (bool)trim($MySettings['log_global']) : DEFAULT_LOG_GLOBAL;
+		$this->m_bLogNotification = isset($MySettings['log_notification']) ? (bool)trim($MySettings['log_notification']) : DEFAULT_LOG_NOTIFICATION;
+		$this->m_bLogIssue = isset($MySettings['log_issue']) ? (bool)trim($MySettings['log_issue']) : DEFAULT_LOG_ISSUE;
+		$this->m_bLogWebService = isset($MySettings['log_web_service']) ? (bool)trim($MySettings['log_web_service']) : DEFAULT_LOG_WEB_SERVICE;
+		$this->m_bQueryCacheEnabled = isset($MySettings['query_cache_enabled']) ? (bool)trim($MySettings['query_cache_enabled']) : DEFAULT_QUERY_CACHE_ENABLED;
+
+		$this->m_iMinDisplayLimit = isset($MySettings['min_display_limit']) ? trim($MySettings['min_display_limit']) : DEFAULT_MIN_DISPLAY_LIMIT;
+		$this->m_iMaxDisplayLimit = isset($MySettings['max_display_limit']) ? trim($MySettings['max_display_limit']) : DEFAULT_MAX_DISPLAY_LIMIT;
+		$this->m_iStandardReloadInterval = isset($MySettings['standard_reload_interval']) ? trim($MySettings['standard_reload_interval']) : DEFAULT_STANDARD_RELOAD_INTERVAL;
+		$this->m_iFastReloadInterval = isset($MySettings['fast_reload_interval']) ? trim($MySettings['fast_reload_interval']) : DEFAULT_FAST_RELOAD_INTERVAL;
+		$this->m_bSecureConnectionRequired = isset($MySettings['secure_connection_required']) ? (bool)trim($MySettings['secure_connection_required']) : DEFAULT_SECURE_CONNECTION_REQUIRED;
+
+		$this->m_aModuleSettings = isset($MyModuleSettings) ? $MyModuleSettings : array();
+
+		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
+		$this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES;
+		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
+		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : DEFAULT_ENCRYPTION_KEY;
+		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
+	}
+
+	protected function Verify()
+	{
+		// Files are verified later on, just before using them -see MetaModel::Plugin()
+		// (we have their final path at that point)
+	}
+
+	public function GetModuleSetting($sModule, $sProperty, $defaultvalue = null)
+	{
+		if (isset($this->m_aModuleSettings[$sModule][$sProperty]))
+		{
+			return $this->m_aModuleSettings[$sModule][$sProperty];
+		}
+
+		// Fall back to the predefined XML parameter, if any
+		return $this->GetModuleParameter($sModule, $sProperty, $defaultvalue);
+	}
+
+	public function GetModuleParameter($sModule, $sProperty, $defaultvalue = null)
+	{
+		$ret = $defaultvalue;
+		if (class_exists('ModulesXMLParameters'))
+		{
+			$aAllParams = ModulesXMLParameters::GetData($sModule);
+			if (array_key_exists($sProperty, $aAllParams))
+			{
+				$ret = $aAllParams[$sProperty];
+			}
+		}
+
+		return $ret;
+	}
+
+	public function SetModuleSetting($sModule, $sProperty, $value)
+	{
+		$this->m_aModuleSettings[$sModule][$sProperty] = $value;
+	}
+
+	public function GetAddons()
+	{
+		return $this->m_aAddons;
+	}
+
+	public function SetAddons($aAddons)
+	{
+		$this->m_aAddons = $aAddons;
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6
+	 * @see Config::Get() as a replacement
+	 */
+	public function GetDBHost()
+	{
+		return $this->Get('db_host');
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6
+	 * @see Config::Get() as a replacement
+	 */
+	public function GetDBName()
+	{
+		return $this->Get('db_name');
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6
+	 * @see Config::Get() as a replacement
+	 */
+	public function GetDBSubname()
+	{
+		return $this->Get('db_subname');
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
+	 * @see Config::DEFAULT_CHARACTER_SET
+	 */
+	public function GetDBCharacterSet()
+	{
+		return DEFAULT_CHARACTER_SET;
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6 #1001 utf8mb4 switch
+	 * @see Config::DEFAULT_COLLATION
+	 */
+	public function GetDBCollation()
+	{
+		return DEFAULT_COLLATION;
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6
+	 * @see Config::Get() as a replacement
+	 */
+	public function GetDBUser()
+	{
+		return $this->Get('db_user');
+	}
+
+	/**
+	 * @return string
+	 * @deprecated 2.5 will be removed in 2.6
+	 * @see Config::Get() as a replacement
+	 */
+	public function GetDBPwd()
+	{
+		return $this->Get('db_pwd');
+	}
+
+	public function GetLogGlobal()
+	{
+		return $this->m_bLogGlobal;
+	}
+
+	public function GetLogNotification()
+	{
+		return $this->m_bLogNotification;
+	}
+
+	public function GetLogIssue()
+	{
+		return $this->m_bLogIssue;
+	}
+
+	public function GetLogWebService()
+	{
+		return $this->m_bLogWebService;
+	}
+
+	public function GetLogQueries()
+	{
+		return false;
+	}
+
+	public function GetQueryCacheEnabled()
+	{
+		return $this->m_bQueryCacheEnabled;
+	}
+
+	public function GetMinDisplayLimit()
+	{
+		return $this->m_iMinDisplayLimit;
+	}
+
+	public function GetMaxDisplayLimit()
+	{
+		return $this->m_iMaxDisplayLimit;
+	}
+
+	public function GetStandardReloadInterval()
+	{
+		return $this->m_iStandardReloadInterval;
+	}
+
+	public function GetFastReloadInterval()
+	{
+		return $this->m_iFastReloadInterval;
+	}
+
+	public function GetSecureConnectionRequired()
+	{
+		return $this->m_bSecureConnectionRequired;
+	}
+
+	public function GetDefaultLanguage()
+	{
+		return $this->m_sDefaultLanguage;
+	}
+
+	public function GetEncryptionKey()
+	{
+		return $this->m_sEncryptionKey;
+	}
+
+	public function GetAllowedLoginTypes()
+	{
+		return explode('|', $this->m_sAllowedLoginTypes);
+	}
+
+	public function GetExternalAuthenticationVariable()
+	{
+		return $this->m_sExtAuthVariable;
+	}
+
+	public function GetCSVImportCharsets()
+	{
+		return $this->m_aCharsets;
+	}
+
+	public function SetLogGlobal($iLogGlobal)
+	{
+		$this->m_iLogGlobal = $iLogGlobal;
+	}
+
+	public function SetLogNotification($iLogNotification)
+	{
+		$this->m_iLogNotification = $iLogNotification;
+	}
+
+	public function SetLogIssue($iLogIssue)
+	{
+		$this->m_iLogIssue = $iLogIssue;
+	}
+
+	public function SetLogWebService($iLogWebService)
+	{
+		$this->m_iLogWebService = $iLogWebService;
+	}
+
+	public function SetMinDisplayLimit($iMinDisplayLimit)
+	{
+		$this->m_iMinDisplayLimit = $iMinDisplayLimit;
+	}
+
+	public function SetMaxDisplayLimit($iMaxDisplayLimit)
+	{
+		$this->m_iMaxDisplayLimit = $iMaxDisplayLimit;
+	}
+
+	public function SetStandardReloadInterval($iStandardReloadInterval)
+	{
+		$this->m_iStandardReloadInterval = $iStandardReloadInterval;
+	}
+
+	public function SetFastReloadInterval($iFastReloadInterval)
+	{
+		$this->m_iFastReloadInterval = $iFastReloadInterval;
+	}
+
+	public function SetSecureConnectionRequired($bSecureConnectionRequired)
+	{
+		$this->m_bSecureConnectionRequired = $bSecureConnectionRequired;
+	}
+
+	public function SetDefaultLanguage($sLanguageCode)
+	{
+		$this->m_sDefaultLanguage = $sLanguageCode;
+	}
+
+	public function SetAllowedLoginTypes($aAllowedLoginTypes)
+	{
+		$this->m_sAllowedLoginTypes = implode('|', $aAllowedLoginTypes);
+	}
+
+	public function SetExternalAuthenticationVariable($sExtAuthVariable)
+	{
+		$this->m_sExtAuthVariable = $sExtAuthVariable;
+	}
+
+	public function SetEncryptionKey($sKey)
+	{
+		$this->m_sEncryptionKey = $sKey;
+	}
+
+	public function SetCSVImportCharsets($aCharsets)
+	{
+		$this->m_aCharsets = $aCharsets;
+	}
+
+	public function AddCSVImportCharset($sIconvCode, $sDisplayName)
+	{
+		$this->m_aCharsets[$sIconvCode] = $sDisplayName;
+	}
+
+	public function GetLoadedFile()
+	{
+		if (is_null($this->m_sFile))
+		{
+			return '';
+		}
+		else
+		{
+			return $this->m_sFile;
+		}
+	}
+
+	/**
+	 * Render the configuration as an associative array
+	 *
+	 * @return array
+	 */
+	public function ToArray()
+	{
+		$aSettings = array();
+		foreach ($this->m_aSettings as $sPropCode => $aSettingInfo)
+		{
+			$aSettings[$sPropCode] = $aSettingInfo['value'];
+		}
+		$aSettings['log_global'] = $this->m_bLogGlobal;
+		$aSettings['log_notification'] = $this->m_bLogNotification;
+		$aSettings['log_issue'] = $this->m_bLogIssue;
+		$aSettings['log_web_service'] = $this->m_bLogWebService;
+		$aSettings['query_cache_enabled'] = $this->m_bQueryCacheEnabled;
+		$aSettings['min_display_limit'] = $this->m_iMinDisplayLimit;
+		$aSettings['max_display_limit'] = $this->m_iMaxDisplayLimit;
+		$aSettings['standard_reload_interval'] = $this->m_iStandardReloadInterval;
+		$aSettings['fast_reload_interval'] = $this->m_iFastReloadInterval;
+		$aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired;
+		$aSettings['default_language'] = $this->m_sDefaultLanguage;
+		$aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes;
+		$aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable;
+		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
+		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
+
+		foreach ($this->m_aModuleSettings as $sModule => $aProperties)
+		{
+			foreach ($aProperties as $sProperty => $value)
+			{
+				$aSettings['module_settings'][$sModule][$sProperty] = $value;
+			}
+		}
+		foreach ($this->m_aAddons as $sKey => $sFile)
+		{
+			$aSettings['addon_list'][] = $sFile;
+		}
+
+		return $aSettings;
+	}
+
+	/**
+	 * Write the configuration to a file (php format) that can be reloaded later
+	 * By default write to the same file that was specified when constructing the object
+	 *
+	 * @param $sFileName string Name of the file to write to (emtpy to write to the same file)
+	 *
+	 * @return boolean True otherwise throws an Exception
+	 */
+	public function WriteToFile($sFileName = '')
+	{
+		if (empty($sFileName))
+		{
+			$sFileName = $this->m_sFile;
+		}
+		$hFile = @fopen($sFileName, 'w');
+		if ($hFile !== false)
+		{
+			fwrite($hFile, "<?php\n");
+			fwrite($hFile, "\n/**\n");
+			fwrite($hFile, " *\n");
+			fwrite($hFile, " * Configuration file, generated by the ".ITOP_APPLICATION." configuration wizard\n");
+			fwrite($hFile, " *\n");
+			fwrite($hFile,
+				" * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job\n");
+			fwrite($hFile, " *\n");
+			fwrite($hFile, " */\n");
+
+			$aConfigSettings = $this->m_aSettings;
+
+			// Old fashioned boolean settings
+			$aBoolValues = array(
+				'log_global' => $this->m_bLogGlobal,
+				'log_notification' => $this->m_bLogNotification,
+				'log_issue' => $this->m_bLogIssue,
+				'log_web_service' => $this->m_bLogWebService,
+				'query_cache_enabled' => $this->m_bQueryCacheEnabled,
+				'secure_connection_required' => $this->m_bSecureConnectionRequired,
+			);
+			foreach ($aBoolValues as $sKey => $bValue)
+			{
+				$aConfigSettings[$sKey] = array(
+					'show_in_conf_sample' => true,
+					'type' => 'bool',
+					'value' => $bValue,
+				);
+			}
+
+			// Old fashioned integer settings
+			$aIntValues = array(
+				'fast_reload_interval' => $this->m_iFastReloadInterval,
+				'max_display_limit' => $this->m_iMaxDisplayLimit,
+				'min_display_limit' => $this->m_iMinDisplayLimit,
+				'standard_reload_interval' => $this->m_iStandardReloadInterval,
+			);
+			foreach ($aIntValues as $sKey => $iValue)
+			{
+				$aConfigSettings[$sKey] = array(
+					'show_in_conf_sample' => true,
+					'type' => 'integer',
+					'value' => $iValue,
+				);
+			}
+
+			// Old fashioned remaining values
+			$aOtherValues = array(
+				'default_language' => $this->m_sDefaultLanguage,
+				'allowed_login_types' => $this->m_sAllowedLoginTypes,
+				'ext_auth_variable' => $this->m_sExtAuthVariable,
+				'encryption_key' => $this->m_sEncryptionKey,
+				'csv_import_charsets' => $this->m_aCharsets,
+			);
+			foreach ($aOtherValues as $sKey => $value)
+			{
+				$aConfigSettings[$sKey] = array(
+					'show_in_conf_sample' => true,
+					'type' => is_string($value) ? 'string' : 'mixed',
+					'value' => $value,
+				);
+			}
+
+			ksort($aConfigSettings);
+			fwrite($hFile, "\$MySettings = array(\n");
+			foreach ($aConfigSettings as $sPropCode => $aSettingInfo)
+			{
+				// Write all values that are either always visible or present in the cloned config file
+				if ($aSettingInfo['show_in_conf_sample'] || (!empty($aSettingInfo['source_of_value']) && ($aSettingInfo['source_of_value'] != 'unknown')))
+				{
+					$sType = $aSettingInfo['type'];
+					switch ($sType)
+					{
+						case 'bool':
+							$sSeenAs = $aSettingInfo['value'] ? 'true' : 'false';
+							break;
+						default:
+							$sSeenAs = self::PrettyVarExport($aSettingInfo['value'], "\t");
+					}
+					fwrite($hFile, "\n");
+					if (isset($aSettingInfo['description']))
+					{
+						fwrite($hFile, "\t// $sPropCode: {$aSettingInfo['description']}\n");
+					}
+					if (isset($aSettingInfo['default']))
+					{
+						$default = $aSettingInfo['default'];
+						if ($aSettingInfo['type'] == 'bool')
+						{
+							$default = $default ? 'true' : 'false';
+						}
+						fwrite($hFile,
+							"\t//\tdefault: ".self::PrettyVarExport($aSettingInfo['default'], "\t//\t\t", true)."\n");
+					}
+					fwrite($hFile, "\t'$sPropCode' => $sSeenAs,\n");
+				}
+			}
+			fwrite($hFile, ");\n");
+
+			fwrite($hFile, "\n");
+			fwrite($hFile, "/**\n *\n * Modules specific settings\n *\n */\n");
+			fwrite($hFile, "\$MyModuleSettings = array(\n");
+			foreach ($this->m_aModuleSettings as $sModule => $aProperties)
+			{
+				fwrite($hFile, "\t'$sModule' => array (\n");
+				foreach ($aProperties as $sProperty => $value)
+				{
+					$sNiceExport = self::PrettyVarExport($value, "\t\t");
+					fwrite($hFile, "\t\t'$sProperty' => $sNiceExport,\n");
+				}
+				fwrite($hFile, "\t),\n");
+			}
+			fwrite($hFile, ");\n");
+
+			fwrite($hFile, "\n/**\n");
+			fwrite($hFile, " *\n");
+			fwrite($hFile, " * Data model modules to be loaded. Names are specified as relative paths\n");
+			fwrite($hFile, " *\n");
+			fwrite($hFile, " */\n");
+			fwrite($hFile, "\$MyModules = array(\n");
+			fwrite($hFile, "\t'addons' => array (\n");
+			foreach ($this->m_aAddons as $sKey => $sFile)
+			{
+				fwrite($hFile, "\t\t'$sKey' => '$sFile',\n");
+			}
+			fwrite($hFile, "\t),\n");
+			fwrite($hFile, ");\n");
+			fwrite($hFile, '?'.'>'); // Avoid perturbing the syntax highlighting !
+
+			return fclose($hFile);
+		}
+		else
+		{
+			throw new ConfigException("Could not write to configuration file", array('file' => $sFileName));
+		}
+	}
+
+	/**
+	 * Helper function to initialize a configuration from the page arguments
+	 */
+	public function UpdateFromParams($aParamValues, $sModulesDir = null, $bPreserveModuleSettings = false)
+	{
+		if (isset($aParamValues['application_path']))
+		{
+			$this->Set('app_root_url', $aParamValues['application_path']);
+		}
+		if (isset($aParamValues['graphviz_path']))
+		{
+			$this->Set('graphviz_path', $aParamValues['graphviz_path']);
+		}
+		if (isset($aParamValues['mode']) && isset($aParamValues['language']))
+		{
+			if (($aParamValues['mode'] == 'install') || $this->GetDefaultLanguage() == '')
+			{
+				$this->SetDefaultLanguage($aParamValues['language']);
+			}
+		}
+		if (isset($aParamValues['db_server']))
+		{
+			$this->Set('db_host', $aParamValues['db_server']);
+			$this->Set('db_user', $aParamValues['db_user']);
+			$this->Set('db_pwd', $aParamValues['db_pwd']);
+			$sDBName = $aParamValues['db_name'];
+			if ($sDBName == '')
+			{
+				// Todo - obsolete after the transition to the new setup (2.0) is complete (WARNING: used by the designer)
+				if (isset($aParamValues['new_db_name']))
+				{
+					$sDBName = $aParamValues['new_db_name'];
+				}
+			}
+			$this->Set('db_name', $sDBName);
+			$this->Set('db_subname', $aParamValues['db_prefix']);
+
+			$bDbTlsEnabled = (bool) $aParamValues['db_tls_enabled'];
+			if ($bDbTlsEnabled)
+			{
+				$this->Set('db_tls.enabled', $bDbTlsEnabled, 'UpdateFromParams');
+			}
+			else
+			{
+				// disabled : we don't want parameter in the file
+				$this->Set('db_tls.enabled', $bDbTlsEnabled, null);
+			}
+			$sDbTlsCa = $bDbTlsEnabled ? $aParamValues['db_tls_ca'] : null;
+			if (isset($sDbTlsCa) && !empty($sDbTlsCa)) {
+				$this->Set('db_tls.ca', $sDbTlsCa, 'UpdateFromParams');
+			} else {
+				// empty parameter : we don't want it in the file
+				$this->Set('db_tls.ca', null, null);
+			}
+		}
+
+		if (isset($aParamValues['selected_modules']))
+		{
+			$aSelectedModules = explode(',', $aParamValues['selected_modules']);
+		}
+		else
+		{
+			$aSelectedModules = null;
+		}
+		$this->UpdateIncludes($sModulesDir, $aSelectedModules);
+
+		if (isset($aParamValues['source_dir']))
+		{
+			$this->Set('source_dir', $aParamValues['source_dir']);
+		}
+	}
+
+	/**
+	 * Helper function to rebuild the default configuration and the list of includes from a directory and a list of
+	 * selected modules
+	 *
+	 * @param string $sModulesDir The relative path to the directory to scan for modules (typically the 'env-xxx'
+	 *     directory resulting from the compilation)
+	 * @param array $aSelectedModules An array of selected modules' identifiers. If null all modules found will be
+	 *     considered as installed
+	 *
+	 * @throws Exception
+	 */
+	public function UpdateIncludes($sModulesDir, $aSelectedModules = null)
+	{
+		if (!is_null($sModulesDir))
+		{
+			// Initialize the arrays below with default values for the application...
+			$oEmptyConfig = new Config('dummy_file', false); // Do NOT load any config file, just set the default values
+			$aAddOns = $oEmptyConfig->GetAddOns();
+
+			$aModules = ModuleDiscovery::GetAvailableModules(array(APPROOT.$sModulesDir));
+			foreach ($aModules as $sModuleId => $aModuleInfo)
+			{
+				list ($sModuleName, $sModuleVersion) = ModuleDiscovery::GetModuleName($sModuleId);
+				if (is_null($aSelectedModules) || in_array($sModuleName, $aSelectedModules))
+				{
+					if (isset($aModuleInfo['settings']))
+					{
+						list ($sName, $sVersion) = ModuleDiscovery::GetModuleName($sModuleId);
+						foreach ($aModuleInfo['settings'] as $sProperty => $value)
+						{
+							if (isset($this->m_aModuleSettings[$sName][$sProperty]))
+							{
+								// Do nothing keep the original value
+							}
+							else
+							{
+								$this->SetModuleSetting($sName, $sProperty, $value);
+							}
+						}
+					}
+					if (isset($aModuleInfo['installer']))
+					{
+						$sModuleInstallerClass = $aModuleInfo['installer'];
+						if (!class_exists($sModuleInstallerClass))
+						{
+							throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not a PHP class - Module: ".$aModuleInfo['label']);
+						}
+						if (!is_subclass_of($sModuleInstallerClass, 'ModuleInstallerAPI'))
+						{
+							throw new Exception("Wrong installer class: '$sModuleInstallerClass' is not derived from 'ModuleInstallerAPI' - Module: ".$aModuleInfo['label']);
+						}
+						$aCallSpec = array($sModuleInstallerClass, 'BeforeWritingConfig');
+						call_user_func_array($aCallSpec, array($this));
+					}
+				}
+			}
+			$this->SetAddOns($aAddOns);
+		}
+	}
+
+	/**
+	 * Helper: for an array of string, change the prefix when found
+	 */
+	protected static function ChangePrefix(&$aStrings, $sSearchPrefix, $sNewPrefix)
+	{
+		foreach ($aStrings as &$sFile)
+		{
+			if (substr($sFile, 0, strlen($sSearchPrefix)) == $sSearchPrefix)
+			{
+				$sFile = $sNewPrefix.substr($sFile, strlen($sSearchPrefix));
+			}
+		}
+	}
+
+	/**
+	 * Obsolete: kept only for backward compatibility of the Toolkit
+	 * Quick and dirty way to clone a config file into another environment
+	 */
+	public function ChangeModulesPath($sSourceEnv, $sTargetEnv)
+	{
+		// Now does nothing since the includes are built into the environment itself
+	}
+
+	/**
+	 * Pretty format a var_export'ed value so that (if possible) the identation is preserved on every line
+	 *
+	 * @param mixed $value The value to export
+	 * @param string $sIndentation The string to use to indent the text
+	 * @param bool $bForceIndentation Forces the identation (enven if it breaks/changes an eval, for example to ouput a
+	 *     value inside a comment)
+	 *
+	 * @return string The indented export string
+	 */
+	protected static function PrettyVarExport($value, $sIndentation, $bForceIndentation = false)
+	{
+		$sExport = var_export($value, true);
+		$sNiceExport = str_replace(array("\r\n", "\n", "\r"), "\n".$sIndentation, trim($sExport));
+		if (!$bForceIndentation)
+		{
+			/** @var array $aImported */
+			$aImported = null;
+			eval('$aImported='.$sNiceExport.';');
+			// Check if adding the identations at the beginning of each line
+			// did not modify the values (in case of a string containing a line break)
+			if ($aImported != $value)
+			{
+				$sNiceExport = $sExport;
+			}
+		}
+
+		return $sNiceExport;
+	}
+
+}
+
+?>
diff --git a/core/coreexception.class.inc.php b/core/coreexception.class.inc.php
index ae1a18af8..f0ffbd229 100644
--- a/core/coreexception.class.inc.php
+++ b/core/coreexception.class.inc.php
@@ -1,129 +1,129 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Exception management
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-
-class CoreException extends Exception
-{
-	public function __construct($sIssue, $aContextData = null, $sImpact = '')
-	{
-		$this->m_sIssue = $sIssue;
-		$this->m_sImpact = $sImpact;
-		$this->m_aContextData = $aContextData ? $aContextData : array();
-		
-		$sMessage = $sIssue;
-		if (!empty($sImpact)) $sMessage .= "($sImpact)";
-		if (count($this->m_aContextData) > 0)
-		{
-			$sMessage .= ": ";
-			$aContextItems = array();
-			foreach($this->m_aContextData as $sKey => $value)
-			{
-				if (is_array($value))
-				{
-					$aPairs = array();
-					foreach($value as $key => $val)
-					{
-						if (is_array($val))
-						{
-							$aPairs[] = $key.'=>('.implode(', ', $val).')';
-						}
-						else
-						{
-							$aPairs[] = $key.'=>'.$val;
-						}
-					}
-					$sValue = '{'.implode('; ', $aPairs).'}';
-				}
-				else
-				{
-					$sValue = $value;
-				}
-				$aContextItems[] = "$sKey = $sValue";
-			}
-			$sMessage .= implode(', ', $aContextItems);
-		}
-		parent::__construct($sMessage, 0);
-	}
-
-	/**
-	 * @return string code and message for log purposes
-	 */
-	public function getInfoLog()
-	{
-		return 'error_code='.$this->getCode().', message="'.$this->getMessage().'"';
-	}
-	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
-	{
-		return $this->getMessage();
-	}
-
-	public function getTraceAsHtml()
-	{
-		$aBackTrace = $this->getTrace();
-		return MyHelpers::get_callstack_html(0, $this->getTrace());
-		// return "<pre>\n".$this->getTraceAsString()."</pre>\n";
-	}
-
-	public function addInfo($sKey, $value)
-	{
-		$this->m_aContextData[$sKey] = $value;
-	}
-
-	public function getIssue()
-	{
-		return $this->m_sIssue;
-	}
-	public function getImpact()
-	{
-		return $this->m_sImpact;
-	}
-	public function getContextData()
-	{
-		return $this->m_aContextData;
-	}
-}
-
-class CoreWarning extends CoreException
-{
-}
-
-class CoreUnexpectedValue extends CoreException
-{
-}
-
-class SecurityException extends CoreException
-{
-}
-
-/**
- * Throwned when querying on an object that exists in the database but is archived
- *
- * @see N.1108
- */
-class ArchivedObjectException extends CoreException
-{
-}
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Exception management
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+
+class CoreException extends Exception
+{
+	public function __construct($sIssue, $aContextData = null, $sImpact = '')
+	{
+		$this->m_sIssue = $sIssue;
+		$this->m_sImpact = $sImpact;
+		$this->m_aContextData = $aContextData ? $aContextData : array();
+		
+		$sMessage = $sIssue;
+		if (!empty($sImpact)) $sMessage .= "($sImpact)";
+		if (count($this->m_aContextData) > 0)
+		{
+			$sMessage .= ": ";
+			$aContextItems = array();
+			foreach($this->m_aContextData as $sKey => $value)
+			{
+				if (is_array($value))
+				{
+					$aPairs = array();
+					foreach($value as $key => $val)
+					{
+						if (is_array($val))
+						{
+							$aPairs[] = $key.'=>('.implode(', ', $val).')';
+						}
+						else
+						{
+							$aPairs[] = $key.'=>'.$val;
+						}
+					}
+					$sValue = '{'.implode('; ', $aPairs).'}';
+				}
+				else
+				{
+					$sValue = $value;
+				}
+				$aContextItems[] = "$sKey = $sValue";
+			}
+			$sMessage .= implode(', ', $aContextItems);
+		}
+		parent::__construct($sMessage, 0);
+	}
+
+	/**
+	 * @return string code and message for log purposes
+	 */
+	public function getInfoLog()
+	{
+		return 'error_code='.$this->getCode().', message="'.$this->getMessage().'"';
+	}
+	public function getHtmlDesc($sHighlightHtmlBegin = '<b>', $sHighlightHtmlEnd = '</b>')
+	{
+		return $this->getMessage();
+	}
+
+	public function getTraceAsHtml()
+	{
+		$aBackTrace = $this->getTrace();
+		return MyHelpers::get_callstack_html(0, $this->getTrace());
+		// return "<pre>\n".$this->getTraceAsString()."</pre>\n";
+	}
+
+	public function addInfo($sKey, $value)
+	{
+		$this->m_aContextData[$sKey] = $value;
+	}
+
+	public function getIssue()
+	{
+		return $this->m_sIssue;
+	}
+	public function getImpact()
+	{
+		return $this->m_sImpact;
+	}
+	public function getContextData()
+	{
+		return $this->m_aContextData;
+	}
+}
+
+class CoreWarning extends CoreException
+{
+}
+
+class CoreUnexpectedValue extends CoreException
+{
+}
+
+class SecurityException extends CoreException
+{
+}
+
+/**
+ * Throwned when querying on an object that exists in the database but is archived
+ *
+ * @see N.1108
+ */
+class ArchivedObjectException extends CoreException
+{
+}
diff --git a/core/csvparser.class.inc.php b/core/csvparser.class.inc.php
index 3912a37e7..fae9af6d1 100644
--- a/core/csvparser.class.inc.php
+++ b/core/csvparser.class.inc.php
@@ -1,271 +1,271 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * CSV parser
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class CSVParserException extends CoreException
-{
-}
-
-define('stSTARTING', 1); //grey zone: the type is undetermined
-define('stRAW', 2); //building a non-qualified string
-define('stQUALIFIED', 3); //building qualified string
-define('stESCAPED', 4); //just encountered an escape char
-
-define('evBLANK', 0);
-define('evSEPARATOR', 1);
-define('evNEWLINE', 2);
-define('evTEXTQUAL', 3); // used for escaping as well
-define('evOTHERCHAR', 4);
-define('evEND', 5);
-
-define('NULL_VALUE', '<NULL>');
-
-
-/**
- * CSVParser
- *
- * @package     iTopORM
- */
-class CSVParser
-{
-	private $m_sCSVData;
-	private $m_sSep;
-	private $m_sTextQualifier;
-	private $m_iTimeLimitPerRow;
-
-	public function __construct($sTxt, $sSep = ',', $sTextQualifier = '"', $iTimeLimitPerRow = null)
-	{
-		$this->m_sCSVData = str_replace("\r\n", "\n", $sTxt);
-		$this->m_sSep = $sSep;
-		$this->m_sTextQualifier = $sTextQualifier;
-		$this->m_iTimeLimitPerRow = $iTimeLimitPerRow;
-	}
-
-	protected $m_sCurrCell = '';
-	protected $m_aCurrRow = array();
-	protected $m_iToSkip = 0;
-	protected $m_aDataSet = array();
-
-	protected function __AddChar($c)
-	{
-		$this->m_sCurrCell .= $c;
-	}
-	protected function __ClearCell()
-	{
-		$this->m_sCurrCell = '';
-	}
-	protected function __AddCell($c = null, $aFieldMap = null, $bTrimSpaces = false)
-	{
-		if ($bTrimSpaces)
-		{
-			$sCell = trim($this->m_sCurrCell);
-		}
-		else
-		{
-			$sCell = $this->m_sCurrCell;
-		}
-		if ($sCell == NULL_VALUE)
-		{
-			$sCell = null;
-		}
-
-		if (!is_null($aFieldMap))
-		{
-			$iNextCol = count($this->m_aCurrRow);
-			$iNextName = $aFieldMap[$iNextCol];
-			$this->m_aCurrRow[$iNextName] = $sCell;
-		}
-		else
-		{
-			$this->m_aCurrRow[] = $sCell;
-		}
-		$this->m_sCurrCell = '';
-	}
-	protected function __AddRow($c = null, $aFieldMap = null, $bTrimSpaces = false)
-	{
-		$this->__AddCell($c, $aFieldMap, $bTrimSpaces);
-
-		if ($this->m_iToSkip > 0)
-		{
-			$this->m_iToSkip--;
-		}
-		elseif (count($this->m_aCurrRow) > 1)
-		{
-			$this->m_aDataSet[] = $this->m_aCurrRow;
-		}
-		elseif (count($this->m_aCurrRow) == 1)
-		{
-			// Get the unique value
-			$aValues = array_values($this->m_aCurrRow);
-			$sValue = $aValues[0]; 
-			if (strlen($sValue) > 0)
-			{
-				$this->m_aDataSet[] = $this->m_aCurrRow;
-			}
-		}
-		else
-		{
-			// blank line, skip silently
-		}
-		$this->m_aCurrRow = array();
-		
-		// More time for the next row
-		if ($this->m_iTimeLimitPerRow !== null)
-		{
-			set_time_limit($this->m_iTimeLimitPerRow);
-		}
-	}
-	protected function __AddCellTrimmed($c = null, $aFieldMap = null)
-	{
-		$this->__AddCell($c, $aFieldMap, true);
-	}
-
-	protected function __AddRowTrimmed($c = null, $aFieldMap = null)
-	{
-		$this->__AddRow($c, $aFieldMap, true);
-	}
-
-	function ToArray($iToSkip = 1, $aFieldMap = null, $iMax = 0)
-	{
-		$aTransitions = array();
-
-		$aTransitions[stSTARTING][evBLANK] = array('', stSTARTING);
-		$aTransitions[stSTARTING][evSEPARATOR] = array('__AddCell', stSTARTING);
-		$aTransitions[stSTARTING][evNEWLINE] = array('__AddRow', stSTARTING);
-		$aTransitions[stSTARTING][evTEXTQUAL] = array('', stQUALIFIED);
-		$aTransitions[stSTARTING][evOTHERCHAR] = array('__AddChar', stRAW);
-		$aTransitions[stSTARTING][evEND] = array('__AddRow', stSTARTING);
-
-		$aTransitions[stRAW][evBLANK] = array('__AddChar', stRAW);
-		$aTransitions[stRAW][evSEPARATOR] = array('__AddCellTrimmed', stSTARTING);
-		$aTransitions[stRAW][evNEWLINE] = array('__AddRowTrimmed', stSTARTING);
-		$aTransitions[stRAW][evTEXTQUAL] = array('__AddChar', stRAW);
-		$aTransitions[stRAW][evOTHERCHAR] = array('__AddChar', stRAW);
-		$aTransitions[stRAW][evEND] = array('__AddRowTrimmed', stSTARTING);
-
-		$aTransitions[stQUALIFIED][evBLANK] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evSEPARATOR] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evNEWLINE] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evTEXTQUAL] = array('', stESCAPED);
-		$aTransitions[stQUALIFIED][evOTHERCHAR] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stQUALIFIED][evEND] = array('__AddRow', stSTARTING);
-
-		$aTransitions[stESCAPED][evBLANK] = array('', stESCAPED);
-		$aTransitions[stESCAPED][evSEPARATOR] = array('__AddCell', stSTARTING);
-		$aTransitions[stESCAPED][evNEWLINE] = array('__AddRow', stSTARTING);
-		$aTransitions[stESCAPED][evTEXTQUAL] = array('__AddChar', stQUALIFIED);
-		$aTransitions[stESCAPED][evOTHERCHAR] = array('__AddChar', stSTARTING);
-		$aTransitions[stESCAPED][evEND] = array('__AddRow', stSTARTING);
-
-		// Reset parser variables
-		$this->m_sCurrCell = '';
-		$this->m_aCurrRow = array();
-		$this->m_iToSkip = $iToSkip;
-		$this->m_aDataSet = array();
-
-		$iDataLength = strlen($this->m_sCSVData);
-
-		$iState = stSTARTING;
-		$iTimeLimit = null;
-		if ($this->m_iTimeLimitPerRow !== null)
-		{
-			// Give some time for the first row
-			$iTimeLimit = ini_get('max_execution_time');
-			set_time_limit($this->m_iTimeLimitPerRow);
-		}
-		for($i = 0; $i <= $iDataLength ; $i++)
-		{
-			if ($i == $iDataLength)
-			{
-				$c = null;
-				$iEvent = evEND;
-			}
-			else
-			{
-				$c = $this->m_sCSVData[$i];
-
-				if ($c == $this->m_sSep)
-				{
-					$iEvent = evSEPARATOR;
-				}
-				elseif ($c == ' ')
-				{
-					$iEvent = evBLANK;
-				}
-				elseif ($c == "\t")
-				{
-					$iEvent = evBLANK;
-				}
-				elseif ($c == "\n")
-				{
-					$iEvent = evNEWLINE;
-				}
-				elseif ($c == $this->m_sTextQualifier)
-				{
-					$iEvent = evTEXTQUAL;
-				}
-				else
-				{
-					$iEvent = evOTHERCHAR;
-				}
-			}
-
-			$sAction = $aTransitions[$iState][$iEvent][0];
-			$iState = $aTransitions[$iState][$iEvent][1];
-
-			if (!empty($sAction))
-			{
-				$aCallSpec = array($this, $sAction);
-				if (is_callable($aCallSpec))
-				{
-					call_user_func($aCallSpec, $c, $aFieldMap);
-				}
-				else
-				{
-					throw new CSVParserException("CSVParser: unknown verb '$sAction'");
-				}
-			}
-
-			$iLineCount = count($this->m_aDataSet);
-			if (($iMax > 0) && ($iLineCount >= $iMax)) break;
-		}
-		if ($iTimeLimit !== null)
-		{
-			// Restore the previous time limit
-			set_time_limit($iTimeLimit);
-		}
-		return $this->m_aDataSet;
-	}
-
-	public function ListFields()
-	{
-		$aHeader = $this->ToArray(0, null, 1);
-		return $aHeader[0];
-	}
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * CSV parser
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class CSVParserException extends CoreException
+{
+}
+
+define('stSTARTING', 1); //grey zone: the type is undetermined
+define('stRAW', 2); //building a non-qualified string
+define('stQUALIFIED', 3); //building qualified string
+define('stESCAPED', 4); //just encountered an escape char
+
+define('evBLANK', 0);
+define('evSEPARATOR', 1);
+define('evNEWLINE', 2);
+define('evTEXTQUAL', 3); // used for escaping as well
+define('evOTHERCHAR', 4);
+define('evEND', 5);
+
+define('NULL_VALUE', '<NULL>');
+
+
+/**
+ * CSVParser
+ *
+ * @package     iTopORM
+ */
+class CSVParser
+{
+	private $m_sCSVData;
+	private $m_sSep;
+	private $m_sTextQualifier;
+	private $m_iTimeLimitPerRow;
+
+	public function __construct($sTxt, $sSep = ',', $sTextQualifier = '"', $iTimeLimitPerRow = null)
+	{
+		$this->m_sCSVData = str_replace("\r\n", "\n", $sTxt);
+		$this->m_sSep = $sSep;
+		$this->m_sTextQualifier = $sTextQualifier;
+		$this->m_iTimeLimitPerRow = $iTimeLimitPerRow;
+	}
+
+	protected $m_sCurrCell = '';
+	protected $m_aCurrRow = array();
+	protected $m_iToSkip = 0;
+	protected $m_aDataSet = array();
+
+	protected function __AddChar($c)
+	{
+		$this->m_sCurrCell .= $c;
+	}
+	protected function __ClearCell()
+	{
+		$this->m_sCurrCell = '';
+	}
+	protected function __AddCell($c = null, $aFieldMap = null, $bTrimSpaces = false)
+	{
+		if ($bTrimSpaces)
+		{
+			$sCell = trim($this->m_sCurrCell);
+		}
+		else
+		{
+			$sCell = $this->m_sCurrCell;
+		}
+		if ($sCell == NULL_VALUE)
+		{
+			$sCell = null;
+		}
+
+		if (!is_null($aFieldMap))
+		{
+			$iNextCol = count($this->m_aCurrRow);
+			$iNextName = $aFieldMap[$iNextCol];
+			$this->m_aCurrRow[$iNextName] = $sCell;
+		}
+		else
+		{
+			$this->m_aCurrRow[] = $sCell;
+		}
+		$this->m_sCurrCell = '';
+	}
+	protected function __AddRow($c = null, $aFieldMap = null, $bTrimSpaces = false)
+	{
+		$this->__AddCell($c, $aFieldMap, $bTrimSpaces);
+
+		if ($this->m_iToSkip > 0)
+		{
+			$this->m_iToSkip--;
+		}
+		elseif (count($this->m_aCurrRow) > 1)
+		{
+			$this->m_aDataSet[] = $this->m_aCurrRow;
+		}
+		elseif (count($this->m_aCurrRow) == 1)
+		{
+			// Get the unique value
+			$aValues = array_values($this->m_aCurrRow);
+			$sValue = $aValues[0]; 
+			if (strlen($sValue) > 0)
+			{
+				$this->m_aDataSet[] = $this->m_aCurrRow;
+			}
+		}
+		else
+		{
+			// blank line, skip silently
+		}
+		$this->m_aCurrRow = array();
+		
+		// More time for the next row
+		if ($this->m_iTimeLimitPerRow !== null)
+		{
+			set_time_limit($this->m_iTimeLimitPerRow);
+		}
+	}
+	protected function __AddCellTrimmed($c = null, $aFieldMap = null)
+	{
+		$this->__AddCell($c, $aFieldMap, true);
+	}
+
+	protected function __AddRowTrimmed($c = null, $aFieldMap = null)
+	{
+		$this->__AddRow($c, $aFieldMap, true);
+	}
+
+	function ToArray($iToSkip = 1, $aFieldMap = null, $iMax = 0)
+	{
+		$aTransitions = array();
+
+		$aTransitions[stSTARTING][evBLANK] = array('', stSTARTING);
+		$aTransitions[stSTARTING][evSEPARATOR] = array('__AddCell', stSTARTING);
+		$aTransitions[stSTARTING][evNEWLINE] = array('__AddRow', stSTARTING);
+		$aTransitions[stSTARTING][evTEXTQUAL] = array('', stQUALIFIED);
+		$aTransitions[stSTARTING][evOTHERCHAR] = array('__AddChar', stRAW);
+		$aTransitions[stSTARTING][evEND] = array('__AddRow', stSTARTING);
+
+		$aTransitions[stRAW][evBLANK] = array('__AddChar', stRAW);
+		$aTransitions[stRAW][evSEPARATOR] = array('__AddCellTrimmed', stSTARTING);
+		$aTransitions[stRAW][evNEWLINE] = array('__AddRowTrimmed', stSTARTING);
+		$aTransitions[stRAW][evTEXTQUAL] = array('__AddChar', stRAW);
+		$aTransitions[stRAW][evOTHERCHAR] = array('__AddChar', stRAW);
+		$aTransitions[stRAW][evEND] = array('__AddRowTrimmed', stSTARTING);
+
+		$aTransitions[stQUALIFIED][evBLANK] = array('__AddChar', stQUALIFIED);
+		$aTransitions[stQUALIFIED][evSEPARATOR] = array('__AddChar', stQUALIFIED);
+		$aTransitions[stQUALIFIED][evNEWLINE] = array('__AddChar', stQUALIFIED);
+		$aTransitions[stQUALIFIED][evTEXTQUAL] = array('', stESCAPED);
+		$aTransitions[stQUALIFIED][evOTHERCHAR] = array('__AddChar', stQUALIFIED);
+		$aTransitions[stQUALIFIED][evEND] = array('__AddRow', stSTARTING);
+
+		$aTransitions[stESCAPED][evBLANK] = array('', stESCAPED);
+		$aTransitions[stESCAPED][evSEPARATOR] = array('__AddCell', stSTARTING);
+		$aTransitions[stESCAPED][evNEWLINE] = array('__AddRow', stSTARTING);
+		$aTransitions[stESCAPED][evTEXTQUAL] = array('__AddChar', stQUALIFIED);
+		$aTransitions[stESCAPED][evOTHERCHAR] = array('__AddChar', stSTARTING);
+		$aTransitions[stESCAPED][evEND] = array('__AddRow', stSTARTING);
+
+		// Reset parser variables
+		$this->m_sCurrCell = '';
+		$this->m_aCurrRow = array();
+		$this->m_iToSkip = $iToSkip;
+		$this->m_aDataSet = array();
+
+		$iDataLength = strlen($this->m_sCSVData);
+
+		$iState = stSTARTING;
+		$iTimeLimit = null;
+		if ($this->m_iTimeLimitPerRow !== null)
+		{
+			// Give some time for the first row
+			$iTimeLimit = ini_get('max_execution_time');
+			set_time_limit($this->m_iTimeLimitPerRow);
+		}
+		for($i = 0; $i <= $iDataLength ; $i++)
+		{
+			if ($i == $iDataLength)
+			{
+				$c = null;
+				$iEvent = evEND;
+			}
+			else
+			{
+				$c = $this->m_sCSVData[$i];
+
+				if ($c == $this->m_sSep)
+				{
+					$iEvent = evSEPARATOR;
+				}
+				elseif ($c == ' ')
+				{
+					$iEvent = evBLANK;
+				}
+				elseif ($c == "\t")
+				{
+					$iEvent = evBLANK;
+				}
+				elseif ($c == "\n")
+				{
+					$iEvent = evNEWLINE;
+				}
+				elseif ($c == $this->m_sTextQualifier)
+				{
+					$iEvent = evTEXTQUAL;
+				}
+				else
+				{
+					$iEvent = evOTHERCHAR;
+				}
+			}
+
+			$sAction = $aTransitions[$iState][$iEvent][0];
+			$iState = $aTransitions[$iState][$iEvent][1];
+
+			if (!empty($sAction))
+			{
+				$aCallSpec = array($this, $sAction);
+				if (is_callable($aCallSpec))
+				{
+					call_user_func($aCallSpec, $c, $aFieldMap);
+				}
+				else
+				{
+					throw new CSVParserException("CSVParser: unknown verb '$sAction'");
+				}
+			}
+
+			$iLineCount = count($this->m_aDataSet);
+			if (($iMax > 0) && ($iLineCount >= $iMax)) break;
+		}
+		if ($iTimeLimit !== null)
+		{
+			// Restore the previous time limit
+			set_time_limit($iTimeLimit);
+		}
+		return $this->m_aDataSet;
+	}
+
+	public function ListFields()
+	{
+		$aHeader = $this->ToArray(0, null, 1);
+		return $aHeader[0];
+	}
+}
+
+
+?>
diff --git a/core/data.generator.class.inc.php b/core/data.generator.class.inc.php
index ca5260363..1b095366d 100644
--- a/core/data.generator.class.inc.php
+++ b/core/data.generator.class.inc.php
@@ -1,374 +1,374 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * data generator
- * helps the consultants in creating dummy data sets, for various test purposes (validation, usability, scalability) 
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Data Generator helper class
- *
- * This class is useful to generate a lot of sample data that look consistent
- * for a given organization in order to simulate a real CMDB
- */
-class cmdbDataGenerator
-{
-	protected $m_sOrganizationKey;
-	protected $m_sOrganizationCode;
-	protected $m_sOrganizationName;
-	protected $m_OrganizationDomains;
-	
-	/**
-	 * Constructor
-	 */
-	public function __construct($sOrganizationId = "")
-	{
-		global $aCompanies, $aCompaniesCode;
-		if ($sOrganizationId == '')
-		{
-			// No organization provided, pick a random and unused one from our predefined list
-			$retries = 5*count($aCompanies);
-			while ( ($retries > 0) && !isset($this->m_sOrganizationCode)) // Stupid algorithm, but I'm too lazy to do something bulletproof tonight
-			{
-				$index = rand(0, count($aCompanies) - 1);
-				if (!$this->OrganizationExists($aCompanies[$index]['code']))
-				{
-					$this->m_sOrganizationCode = $aCompanies[$index]['code'];
-					$this->m_sOrganizationName = $aCompanies[$index]['name'];
-					$this->m_OrganizationDomains = $aCompanies[$index]['domain'];
-				}
-				$retries--;
-			}
-		}
-		else
-		{
-			// A code has been provided, let's take the information we need from the organization itself
-			$this->m_sOrganizationId = $sOrganizationId;
-			$oOrg = $this->GetOrganization($sOrganizationId);
-			if ($oOrg == null)
-			{
-				echo "Unable to find the organization '$sOrganisationCode' in the database... can not add objects into this organization.<br/>\n";
-				exit();
-			}
-			$this->m_sOrganizationCode = $oOrg->Get('code');
-			$this->m_sOrganizationName = $oOrg->Get('name');
-			if (!isset($aCompaniesCode[$this->m_sOrganizationCode]['domain']))
-			{
-				// Generate some probable domain names for this organization
-				$this->m_OrganizationDomains = array(strtolower($this->m_sOrganizationCode).".com", strtolower($this->m_sOrganizationCode).".org", strtolower($this->m_sOrganizationCode)."corp.net",);
-			}
-			else
-			{
-				// Pick the domain names for this organization from the predefined list
-				$this->m_OrganizationDomains = $aCompaniesCode[$this->m_sOrganizationCode]['domain'];
-			}
-		}
-		
-		if (!isset($this->m_sOrganizationCode))
-		{
-			echo "Unable to find an organization code which is not already used... can not create a new organization. Enhance the list of fake organizations (\$aCompanies in data_sample.inc.php).<br/>\n";
-			exit();
-		}
-	}
-	
-	/**
-	 * Get the current organization id used by the generator
-	 *
-	 * @return string The organization id
-	 */
-	public function GetOrganizationId()
-	{
-		return $this->m_sOrganizationId;
-	}
-	
-	/**
-	 * Get the current organization id used by the generator
-	 *
-	 * @param string The organization id
-	 * @return none
-	 */
-	public function SetOrganizationId($sId)
-	{
-		$this->m_sOrganizationId = $sId;
-	}
-	
-	/**
-	 * Get the current organization code used by the generator
-	 *
-	 * @return string The organization code
-	 */
-	public function GetOrganizationCode()
-	{
-		return $this->m_sOrganizationCode;
-	}
-
-	/**
-	 * Get the current organization name used by the generator
-	 *
-	 * @return string The organization name
-	 */
-	function GetOrganizationName()
-	{
-		return $this->m_sOrganizationName;
-	}
-	
-	/**
-	 * Get a pseudo random first name taken from a (big) prefedined list
-	 *
-	 * @return string A random first name
-	 */
-	function GenerateFirstName()
-	{
-		global $aFirstNames;
-		return $aFirstNames[rand(0, count($aFirstNames) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random last name taken from a (big) prefedined list
-	 *
-	 * @return string A random last name
-	 */
-	function GenerateLastName()
-	{
-		global $aNames;
-		return $aNames[rand(0, count($aNames) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random country name taken from a prefedined list
-	 *
-	 * @return string A random city name
-	 */
-	function GenerateCountryName()
-	{
-		global $aCountries;
-		return $aCountries[rand(0, count($aCountries) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random city name taken from a (big) prefedined list
-	 *
-	 * @return string A random city name
-	 */
-	function GenerateCityName()
-	{
-		global $aCities;
-		return $aCities[rand(0, count($aCities) - 1)];
-	}
-	
-	/**
-	 * Get a pseudo random email address made of the first name, last name and organization's domain
-	 *
-	 * @return string A random email address
-	 */
-	function GenerateEmail($sFirstName, $sLastName)
-	{
-		if (rand(1, 20) > 18)
-		{
-			// some people (let's say 5~10%) have an irregular email address
-			$sEmail = strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
-		}
-		else
-		{
-			$sEmail = strtolower($this->CleanForEmail($sFirstName)).".".strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
-		}
-		return $sEmail;
-	}
-
-	/**
-	 * Generate (pseudo) random strings that follow a given pattern
-	 *
-	 *	The template is made of any number of 'parts' separated by pipes '|'
-	 *  Each part is either:
-	 *  - domain() => returns a domain name for the current organization
-	 *  - enum(aaa,bb,c,dddd) => returns randomly one of aaa,bb,c or dddd with the same
-	 *    probability of occurence. If you want to change the probability you can repeat some values
-	 *    i.e enum(most probable,most probable,most probable,most probable,most probable,rare) 
-	 *	- number(xxx-yyy) => a random number between xxx and yyy (bounds included)
-	 *   note that if the first number (xxx) begins with a zero, then the result will zero padded
-	 *   to the same number of digits as xxx.
-	 *  All other 'part' that does not follow one of the above mentioned pattern is returned as is
-	 *
-	 * Example: GenerateString("enum(sw,rtr,gw)|number(00-99)|.|domain()")
-	 *          will produce strings like "sw01.netcmdb.com" or "rtr45.itop.org"
-	 *
-	 * @param string $sTemplate The template used for generating the string
-	 * @return string The generated pseudo random the string
-	 */
-	function GenerateString($sTemplate)
-	{
-		$sResult = "";
-		$aParts = explode("\|", $sTemplate);
-		foreach($aParts as $sPart)
-		{
-			if (preg_match("/domain\(\)/", $sPart, $aMatches))
-			{
-				$sResult .= strtolower($this->GenerateDomain());
-			}
-			elseif (preg_match("/enum\((.+)\)/", $sPart, $aMatches))
-			{
-				$sEnumValues = $aMatches[1];
-				$aEnumValues = explode(",", $sEnumValues);
-				$sResult .= $aEnumValues[rand(0, count($aEnumValues) - 1)];
-			}
-			elseif (preg_match("/number\((\d+)-(\d+)\)/", $sPart, $aMatches))
-			{
-				$sStartNumber = $aMatches[1];
-				if ($sStartNumber[0] == '0')
-				{
-					// number must be zero padded
-					$sFormat = "%0".strlen($sStartNumber)."d";
-				}
-				else
-				{
-					$sFormat = "%d";
-				}
-				$sEndNumber = $aMatches[2];
-				$sResult .= sprintf($sFormat, rand($sStartNumber, $sEndNumber));
-			}
-			else
-			{
-				$sResult .= $sPart;
-			}
-		}
-		return $sResult;
-	}
-
-	/**
-	 * Generate a foreign key by picking a random element of the given class in a set limited by the given search criteria
-	 *
-	 * Example: GenerateKey("bizLocation", array('org_id', $oGenerator->GetOrganizationId());
-	 *          will produce the foreign key of a Location object picked at random in the same organization
-	 *
-	 * @param string $sClass The name of the class to search for
-	 * @param string $aFilterCriteria A hash array of filterCOde => FilterValue (the strict operator '=' is used )
-	 * @return mixed The key to an object of the given class, or null if none are found
-	 */
-	function GenerateKey($sClass, $aFilterCriteria)
-	{
-		$retKey = null;
-		$oFilter = new DBObjectSearch($sClass);
-		foreach($aFilterCriteria as $sFilterCode => $filterValue)
-		{
-			$oFilter->AddCondition($sFilterCode, $filterValue, '=');
-		}
-		$oSet = new CMDBObjectSet($oFilter);
-		if ($oSet->Count() > 0)
-		{
-			$max_count = $index = rand(1, $oSet->Count());
-			do
-			{
-				$oObj = $oSet->Fetch();
-				$index--;
-			}
-			while($index > 0);
-			
-			if (!is_object($oObj))
-			{
-				echo "<pre>";
-				echo "ERROR: non empty set, but invalid object picked! class='$sClass'\n";
-				echo "Index chosen: $max_count\n";
-				echo "The set is supposed to contain ".$oSet->Count()." object(s)\n";
-				echo "Filter criteria:\n";
-				print_r($aFilterCriteria);
-				echo "</pre>";
-			}
-			else
-			{
-				$retKey = $oObj->GetKey();
-			}
-		}
-		return $retKey;
-	}
-	///////////////////////////////////////////////////////////////////////////////
-	//
-	//  Protected methods
-	//
-	///////////////////////////////////////////////////////////////////////////////
-		
-	/**
-	 * Generate a (random) domain name consistent with the organization name & code
-	 *
-	 * The values are pulled from a (limited) predefined list. Note that a given
-	 * organization may have several domain names, so the result may be random
-	 *
-	 * @return string A domain name (like netcnmdb.com)
-	 */
-	protected function GenerateDomain()
-	{
-		if (is_array($this->m_OrganizationDomains))
-		{
-			$sDomain = $this->m_OrganizationDomains[rand(0, count($this->m_OrganizationDomains)-1)];
-		}
-		else
-		{
-			$sDomain = $this->m_OrganizationDomains;
-		}
-		return $sDomain;
-	}
-	
-	/**
-	 * Strips accented characters from a string in order to produce a suitable email address
-	 *
-	 * @param string The text string to clean
-	 * @return string The cleanified text string
-	 */
-	protected function CleanForEmail($sText)
-	{
-		return str_replace(array("'", "�", "�", "�", "�", "�", "�", "�", "�", "�"), array("", "e", "e", "e", "c", "a", "a", "n", "oe", "ae"), $sText);
-	}
-
-	/**
-	 * Check if an organization with the given code already exists in the database
-	 *
-	 * @param string $sCode The code to look for
-	 * @return boolean true if the given organization exists, false otherwise
-	 */
-	protected function OrganizationExists($sCode)
-	{
-		$oFilter = new DBObjectSearch('Organization');
-		$oFilter->AddCondition('code', $sCode, '=');
-		$oSet = new CMDBObjectSet($oFilter);
-		return ($oSet->Count() > 0);
-	}
-
-	/**
-	 * Search for an organization with the given code in the database
-	 *
-	 * @param string $Id The organization Id to look for
-	 * @return cmdbOrganization the organization if it exists, null otherwise
-	 */
-	protected function GetOrganization($sId)
-	{
-		$oOrg = null;
-		$oFilter = new DBObjectSearch('Organization');
-		$oFilter->AddCondition('id', $sId, '=');
-		$oSet = new CMDBObjectSet($oFilter);
-		if ($oSet->Count() > 0)
-		{
-			$oOrg = $oSet->Fetch(); // Let's take the first one found
-		}
-		return $oOrg;
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * data generator
+ * helps the consultants in creating dummy data sets, for various test purposes (validation, usability, scalability) 
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Data Generator helper class
+ *
+ * This class is useful to generate a lot of sample data that look consistent
+ * for a given organization in order to simulate a real CMDB
+ */
+class cmdbDataGenerator
+{
+	protected $m_sOrganizationKey;
+	protected $m_sOrganizationCode;
+	protected $m_sOrganizationName;
+	protected $m_OrganizationDomains;
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct($sOrganizationId = "")
+	{
+		global $aCompanies, $aCompaniesCode;
+		if ($sOrganizationId == '')
+		{
+			// No organization provided, pick a random and unused one from our predefined list
+			$retries = 5*count($aCompanies);
+			while ( ($retries > 0) && !isset($this->m_sOrganizationCode)) // Stupid algorithm, but I'm too lazy to do something bulletproof tonight
+			{
+				$index = rand(0, count($aCompanies) - 1);
+				if (!$this->OrganizationExists($aCompanies[$index]['code']))
+				{
+					$this->m_sOrganizationCode = $aCompanies[$index]['code'];
+					$this->m_sOrganizationName = $aCompanies[$index]['name'];
+					$this->m_OrganizationDomains = $aCompanies[$index]['domain'];
+				}
+				$retries--;
+			}
+		}
+		else
+		{
+			// A code has been provided, let's take the information we need from the organization itself
+			$this->m_sOrganizationId = $sOrganizationId;
+			$oOrg = $this->GetOrganization($sOrganizationId);
+			if ($oOrg == null)
+			{
+				echo "Unable to find the organization '$sOrganisationCode' in the database... can not add objects into this organization.<br/>\n";
+				exit();
+			}
+			$this->m_sOrganizationCode = $oOrg->Get('code');
+			$this->m_sOrganizationName = $oOrg->Get('name');
+			if (!isset($aCompaniesCode[$this->m_sOrganizationCode]['domain']))
+			{
+				// Generate some probable domain names for this organization
+				$this->m_OrganizationDomains = array(strtolower($this->m_sOrganizationCode).".com", strtolower($this->m_sOrganizationCode).".org", strtolower($this->m_sOrganizationCode)."corp.net",);
+			}
+			else
+			{
+				// Pick the domain names for this organization from the predefined list
+				$this->m_OrganizationDomains = $aCompaniesCode[$this->m_sOrganizationCode]['domain'];
+			}
+		}
+		
+		if (!isset($this->m_sOrganizationCode))
+		{
+			echo "Unable to find an organization code which is not already used... can not create a new organization. Enhance the list of fake organizations (\$aCompanies in data_sample.inc.php).<br/>\n";
+			exit();
+		}
+	}
+	
+	/**
+	 * Get the current organization id used by the generator
+	 *
+	 * @return string The organization id
+	 */
+	public function GetOrganizationId()
+	{
+		return $this->m_sOrganizationId;
+	}
+	
+	/**
+	 * Get the current organization id used by the generator
+	 *
+	 * @param string The organization id
+	 * @return none
+	 */
+	public function SetOrganizationId($sId)
+	{
+		$this->m_sOrganizationId = $sId;
+	}
+	
+	/**
+	 * Get the current organization code used by the generator
+	 *
+	 * @return string The organization code
+	 */
+	public function GetOrganizationCode()
+	{
+		return $this->m_sOrganizationCode;
+	}
+
+	/**
+	 * Get the current organization name used by the generator
+	 *
+	 * @return string The organization name
+	 */
+	function GetOrganizationName()
+	{
+		return $this->m_sOrganizationName;
+	}
+	
+	/**
+	 * Get a pseudo random first name taken from a (big) prefedined list
+	 *
+	 * @return string A random first name
+	 */
+	function GenerateFirstName()
+	{
+		global $aFirstNames;
+		return $aFirstNames[rand(0, count($aFirstNames) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random last name taken from a (big) prefedined list
+	 *
+	 * @return string A random last name
+	 */
+	function GenerateLastName()
+	{
+		global $aNames;
+		return $aNames[rand(0, count($aNames) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random country name taken from a prefedined list
+	 *
+	 * @return string A random city name
+	 */
+	function GenerateCountryName()
+	{
+		global $aCountries;
+		return $aCountries[rand(0, count($aCountries) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random city name taken from a (big) prefedined list
+	 *
+	 * @return string A random city name
+	 */
+	function GenerateCityName()
+	{
+		global $aCities;
+		return $aCities[rand(0, count($aCities) - 1)];
+	}
+	
+	/**
+	 * Get a pseudo random email address made of the first name, last name and organization's domain
+	 *
+	 * @return string A random email address
+	 */
+	function GenerateEmail($sFirstName, $sLastName)
+	{
+		if (rand(1, 20) > 18)
+		{
+			// some people (let's say 5~10%) have an irregular email address
+			$sEmail = strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
+		}
+		else
+		{
+			$sEmail = strtolower($this->CleanForEmail($sFirstName)).".".strtolower($this->CleanForEmail($sLastName))."@".strtolower($this->GenerateDomain());
+		}
+		return $sEmail;
+	}
+
+	/**
+	 * Generate (pseudo) random strings that follow a given pattern
+	 *
+	 *	The template is made of any number of 'parts' separated by pipes '|'
+	 *  Each part is either:
+	 *  - domain() => returns a domain name for the current organization
+	 *  - enum(aaa,bb,c,dddd) => returns randomly one of aaa,bb,c or dddd with the same
+	 *    probability of occurence. If you want to change the probability you can repeat some values
+	 *    i.e enum(most probable,most probable,most probable,most probable,most probable,rare) 
+	 *	- number(xxx-yyy) => a random number between xxx and yyy (bounds included)
+	 *   note that if the first number (xxx) begins with a zero, then the result will zero padded
+	 *   to the same number of digits as xxx.
+	 *  All other 'part' that does not follow one of the above mentioned pattern is returned as is
+	 *
+	 * Example: GenerateString("enum(sw,rtr,gw)|number(00-99)|.|domain()")
+	 *          will produce strings like "sw01.netcmdb.com" or "rtr45.itop.org"
+	 *
+	 * @param string $sTemplate The template used for generating the string
+	 * @return string The generated pseudo random the string
+	 */
+	function GenerateString($sTemplate)
+	{
+		$sResult = "";
+		$aParts = explode("\|", $sTemplate);
+		foreach($aParts as $sPart)
+		{
+			if (preg_match("/domain\(\)/", $sPart, $aMatches))
+			{
+				$sResult .= strtolower($this->GenerateDomain());
+			}
+			elseif (preg_match("/enum\((.+)\)/", $sPart, $aMatches))
+			{
+				$sEnumValues = $aMatches[1];
+				$aEnumValues = explode(",", $sEnumValues);
+				$sResult .= $aEnumValues[rand(0, count($aEnumValues) - 1)];
+			}
+			elseif (preg_match("/number\((\d+)-(\d+)\)/", $sPart, $aMatches))
+			{
+				$sStartNumber = $aMatches[1];
+				if ($sStartNumber[0] == '0')
+				{
+					// number must be zero padded
+					$sFormat = "%0".strlen($sStartNumber)."d";
+				}
+				else
+				{
+					$sFormat = "%d";
+				}
+				$sEndNumber = $aMatches[2];
+				$sResult .= sprintf($sFormat, rand($sStartNumber, $sEndNumber));
+			}
+			else
+			{
+				$sResult .= $sPart;
+			}
+		}
+		return $sResult;
+	}
+
+	/**
+	 * Generate a foreign key by picking a random element of the given class in a set limited by the given search criteria
+	 *
+	 * Example: GenerateKey("bizLocation", array('org_id', $oGenerator->GetOrganizationId());
+	 *          will produce the foreign key of a Location object picked at random in the same organization
+	 *
+	 * @param string $sClass The name of the class to search for
+	 * @param string $aFilterCriteria A hash array of filterCOde => FilterValue (the strict operator '=' is used )
+	 * @return mixed The key to an object of the given class, or null if none are found
+	 */
+	function GenerateKey($sClass, $aFilterCriteria)
+	{
+		$retKey = null;
+		$oFilter = new DBObjectSearch($sClass);
+		foreach($aFilterCriteria as $sFilterCode => $filterValue)
+		{
+			$oFilter->AddCondition($sFilterCode, $filterValue, '=');
+		}
+		$oSet = new CMDBObjectSet($oFilter);
+		if ($oSet->Count() > 0)
+		{
+			$max_count = $index = rand(1, $oSet->Count());
+			do
+			{
+				$oObj = $oSet->Fetch();
+				$index--;
+			}
+			while($index > 0);
+			
+			if (!is_object($oObj))
+			{
+				echo "<pre>";
+				echo "ERROR: non empty set, but invalid object picked! class='$sClass'\n";
+				echo "Index chosen: $max_count\n";
+				echo "The set is supposed to contain ".$oSet->Count()." object(s)\n";
+				echo "Filter criteria:\n";
+				print_r($aFilterCriteria);
+				echo "</pre>";
+			}
+			else
+			{
+				$retKey = $oObj->GetKey();
+			}
+		}
+		return $retKey;
+	}
+	///////////////////////////////////////////////////////////////////////////////
+	//
+	//  Protected methods
+	//
+	///////////////////////////////////////////////////////////////////////////////
+		
+	/**
+	 * Generate a (random) domain name consistent with the organization name & code
+	 *
+	 * The values are pulled from a (limited) predefined list. Note that a given
+	 * organization may have several domain names, so the result may be random
+	 *
+	 * @return string A domain name (like netcnmdb.com)
+	 */
+	protected function GenerateDomain()
+	{
+		if (is_array($this->m_OrganizationDomains))
+		{
+			$sDomain = $this->m_OrganizationDomains[rand(0, count($this->m_OrganizationDomains)-1)];
+		}
+		else
+		{
+			$sDomain = $this->m_OrganizationDomains;
+		}
+		return $sDomain;
+	}
+	
+	/**
+	 * Strips accented characters from a string in order to produce a suitable email address
+	 *
+	 * @param string The text string to clean
+	 * @return string The cleanified text string
+	 */
+	protected function CleanForEmail($sText)
+	{
+		return str_replace(array("'", "�", "�", "�", "�", "�", "�", "�", "�", "�"), array("", "e", "e", "e", "c", "a", "a", "n", "oe", "ae"), $sText);
+	}
+
+	/**
+	 * Check if an organization with the given code already exists in the database
+	 *
+	 * @param string $sCode The code to look for
+	 * @return boolean true if the given organization exists, false otherwise
+	 */
+	protected function OrganizationExists($sCode)
+	{
+		$oFilter = new DBObjectSearch('Organization');
+		$oFilter->AddCondition('code', $sCode, '=');
+		$oSet = new CMDBObjectSet($oFilter);
+		return ($oSet->Count() > 0);
+	}
+
+	/**
+	 * Search for an organization with the given code in the database
+	 *
+	 * @param string $Id The organization Id to look for
+	 * @return cmdbOrganization the organization if it exists, null otherwise
+	 */
+	protected function GetOrganization($sId)
+	{
+		$oOrg = null;
+		$oFilter = new DBObjectSearch('Organization');
+		$oFilter->AddCondition('id', $sId, '=');
+		$oSet = new CMDBObjectSet($oFilter);
+		if ($oSet->Count() > 0)
+		{
+			$oOrg = $oSet->Fetch(); // Let's take the first one found
+		}
+		return $oOrg;
+	}
+}
+?>
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 79bce7ff8..413d98fda 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -1,3733 +1,3733 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * All objects to be displayed in the application (either as a list or as details)
- * must implement this interface.
- */
-interface iDisplay
-{
-
-	/**
-	 * Maps the given context parameter name to the appropriate filter/search code for this class
-	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
-	 * @return string Filter code, i.e. 'customer_id'
-	 */
-	public static function MapContextParam($sContextParam);
-	/**
-	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
-	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
-	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
-	 * To Be overridden by derived classes
-	 * @param void
-	 * @return String The desired higlight class for the object/row
-	 */
-	public function GetHilightClass();
-	/**
-	 * Returns the relative path to the page that handles the display of the object
-	 * @return string
-	 */
-	public static function GetUIPage();
-	/**
-	 * Displays the details of the object
-	 */
-	public function DisplayDetails(WebPage $oPage, $bEditMode = false);
-}
-
-/**
- * Class dbObject: the root of persistent classes
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('metamodel.class.php');
-require_once('deletionplan.class.inc.php');
-require_once('mutex.class.inc.php');
-
-
-/**
- * A persistent object, as defined by the metamodel 
- *
- * @package     iTopORM
- */
-abstract class DBObject implements iDisplay
-{
-	private static $m_aMemoryObjectsByClass = array();
-
-  	private static $m_aBulkInsertItems = array(); // class => array of ('table' => array of (array of <sql_value>))
-  	private static $m_aBulkInsertCols = array(); // class => array of ('table' => array of <sql_column>)
-  	private static $m_bBulkInsert = false;
-
-	protected $m_bIsInDB = false; // true IIF the object is mapped to a DB record
-	protected $m_iKey = null;
-	private $m_aCurrValues = array();
-	protected $m_aOrigValues = array();
-
-	protected $m_aExtendedData = null;
-
-	private $m_bDirty = false; // Means: "a modification is ongoing"
-										// The object may have incorrect external keys, then any attempt of reload must be avoided
-	private $m_bCheckStatus = null; // Means: the object has been verified and is consistent with integrity rules
-													//        if null, then the check has to be performed again to know the status
-	protected $m_bSecurityIssue = null;
-	protected $m_aCheckIssues = null;
-	protected $m_aDeleteIssues = null;
-
-	private $m_bFullyLoaded = false; // Compound objects can be partially loaded
-	private $m_aLoadedAtt = array(); // Compound objects can be partially loaded, array of sAttCode
-	protected $m_aTouchedAtt = array(); // list of (potentially) modified sAttCodes
-	protected $m_aModifiedAtt = array(); // real modification status: for each attCode can be: unset => don't know, true => modified, false => not modified (the same value as the original value was set)
-	protected $m_aSynchroData = null; // Set of Synch data related to this object
-	protected $m_sHighlightCode = null;
-	protected $m_aCallbacks = array();
-
-	// Use the MetaModel::NewObject to build an object (do we have to force it?)
-	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
-	{
-		if (!empty($aRow))
-		{
-			$this->FromRow($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
-			$this->m_bFullyLoaded = $this->IsFullyLoaded();
-			$this->m_aTouchedAtt = array();
-			$this->m_aModifiedAtt = array();
-			return;
-		}
-		// Creation of a brand new object
-		//
-
-		$this->m_iKey = self::GetNextTempId(get_class($this));
-
-		// set default values
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
-		{
-			$this->m_aCurrValues[$sAttCode] = $this->GetDefaultValue($sAttCode);
-			$this->m_aOrigValues[$sAttCode] = null;
-			if ($oAttDef->IsExternalField() || ($oAttDef instanceof AttributeFriendlyName))
-			{
-				// This field has to be read from the DB
-				// Leave the flag unset (optimization) 
-			}
-			else
-			{
-				// No need to trigger a reload for that attribute
-				// Let's consider it as being already fully loaded
-				$this->m_aLoadedAtt[$sAttCode] = true;
-			}
-		}
-	}
-
-	// Read-only <=> Written once (archive)
-	public function RegisterAsDirty()
-	{
-		// While the object may be written to the DB, it is NOT possible to reload it
-		// or at least not possible to reload it the same way
-		$this->m_bDirty = true;	
-	}
-
-	public function IsNew()
-	{
-		return (!$this->m_bIsInDB);
-	}
-
-	// Returns an Id for memory objects
-	static protected function GetNextTempId($sClass)
-	{
-		$sRootClass = MetaModel::GetRootClass($sClass);
-		if (!array_key_exists($sRootClass, self::$m_aMemoryObjectsByClass))
-		{
-			self::$m_aMemoryObjectsByClass[$sRootClass] = 0;
-		}
-		self::$m_aMemoryObjectsByClass[$sRootClass]++;
-		return (- self::$m_aMemoryObjectsByClass[$sRootClass]);
-	}
-
-	public function __toString()
-	{
-        $sRet = '';
-        $sClass = get_class($this);
-        $sRootClass = MetaModel::GetRootClass($sClass);
-        $iPKey = $this->GetKey();
-        $sFriendlyname = $this->Get('friendlyname');
-        $sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey ($sFriendlyname)<br/>\n";
-        return $sRet;
-	}
-	
-	// Restore initial values... mmmm, to be discussed
-	public function DBRevert()
-	{
-		$this->Reload();
-	}
-
-	protected function IsFullyLoaded()
-	{
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
-		{
-			if (!$oAttDef->LoadInObject()) continue;
-			if (!isset($this->m_aLoadedAtt[$sAttCode]) || !$this->m_aLoadedAtt[$sAttCode])
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @param bool $bAllowAllData DEPRECATED: the reload must never fail!
-	 * @throws CoreException
-	 */
-	public function Reload($bAllowAllData = false)
-	{
-		assert($this->m_bIsInDB);
-		$aRow = MetaModel::MakeSingleRow(get_class($this), $this->m_iKey, false /* must be found */, true /* AllowAllData */);
-		if (empty($aRow))
-		{
-			throw new CoreException("Failed to reload object of class '".get_class($this)."', id = ".$this->m_iKey);
-		}
-		$this->FromRow($aRow);
-
-		// Process linked set attributes
-		//
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
-		{
-			if (!$oAttDef->IsLinkSet()) continue;
-
-			$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue($this);
-			$this->m_aOrigValues[$sAttCode] = clone $this->m_aCurrValues[$sAttCode];
-			$this->m_aLoadedAtt[$sAttCode] = true;
-		}
-
-		$this->m_bFullyLoaded = true;
-		$this->m_aTouchedAtt = array();
-		$this->m_aModifiedAtt = array();
-	}
-
-	protected function FromRow($aRow, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
-	{
-		if (strlen($sClassAlias) == 0)
-		{
-			// Default to the current class
-			$sClassAlias = get_class($this);
-		}
-
-		$this->m_iKey = null;
-		$this->m_bIsInDB = true;
-		$this->m_aCurrValues = array();
-		$this->m_aOrigValues = array();
-		$this->m_aLoadedAtt = array();
-		$this->m_bCheckStatus = true;
-
-		// Get the key
-		//
-		$sKeyField = $sClassAlias."id";
-		if (!array_key_exists($sKeyField, $aRow))
-		{
-			// #@# Bug ?
-			throw new CoreException("Missing key for class '".get_class($this)."'");
-		}
-
-		$iPKey = $aRow[$sKeyField];
-		if (!self::IsValidPKey($iPKey))
-		{
-			if (is_null($iPKey))
-			{
-				throw new CoreException("Missing object id in query result (found null)");
-			}
-			else
-			{
-				throw new CoreException("An object id must be an integer value ($iPKey)");
-			}
-		}
-		$this->m_iKey = $iPKey;
-
-		// Build the object from an array of "attCode"=>"value")
-		//
-		$bFullyLoaded = true; // ... set to false if any attribute is not found
-		if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
-		{
-			$aAttList = MetaModel::ListAttributeDefs(get_class($this));
-		}
-		else
-		{
-			$aAttList = $aAttToLoad[$sClassAlias];
-		}
-		
-		foreach($aAttList as $sAttCode=>$oAttDef)
-		{
-			// Skip links (could not be loaded by the mean of this query)
-			if ($oAttDef->IsLinkSet()) continue;
-
-			if (!$oAttDef->LoadInObject()) continue;
-
-			unset($value);
-			$bIsDefined = false;
-			if ($oAttDef->LoadFromDB())
-			{
-				// Note: we assume that, for a given attribute, if it can be loaded,
-				// then one column will be found with an empty suffix, the others have a suffix
-				// Take care: the function isset will return false in case the value is null,
-				// which is something that could happen on open joins
-				$sAttRef = $sClassAlias.$sAttCode;
-
-				if (array_key_exists($sAttRef, $aRow))
-				{
-					$value = $oAttDef->FromSQLToValue($aRow, $sAttRef);
-					$bIsDefined = true;
-				}
-			}
-			else
-			{
-				$value = $oAttDef->ReadValue($this);
-				$bIsDefined = true;
-			}
-
-			if ($bIsDefined)
-			{
-				$this->m_aCurrValues[$sAttCode] = $value;
-				if (is_object($value))
-				{
-					$this->m_aOrigValues[$sAttCode] = clone $value;
-				}
-				else
-				{
-					$this->m_aOrigValues[$sAttCode] = $value;
-				}
-				$this->m_aLoadedAtt[$sAttCode] = true;
-			}
-			else
-			{
-				// This attribute was expected and not found in the query columns
-				$bFullyLoaded = false;
-			}
-		}
-		
-		// Load extended data
-		if ($aExtendedDataSpec != null)
-		{
-			$aExtendedDataSpec['table'];
-			foreach($aExtendedDataSpec['fields'] as $sColumn)
-			{
-				$sColRef = $sClassAlias.'_extdata_'.$sColumn;
-				if (array_key_exists($sColRef, $aRow))
-				{
-					$this->m_aExtendedData[$sColumn] = $aRow[$sColRef];
-				}
-			}
-		}
-		return $bFullyLoaded;
-	}
-
-	protected function _Set($sAttCode, $value)
-	{
-		$this->m_aCurrValues[$sAttCode] = $value;
-		$this->m_aTouchedAtt[$sAttCode] = true;
-		unset($this->m_aModifiedAtt[$sAttCode]);
-	}
-
-	public function Set($sAttCode, $value)
-	{
-		if ($sAttCode == 'finalclass')
-		{
-			// Ignore it - this attribute is set upon object creation and that's it
-			return false;
-		}
-
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-
-		if (!$oAttDef->IsWritable())
-		{
-			$sClass = get_class($this);
-			throw new Exception("Attempting to set the value on the read-only attribute $sClass::$sAttCode");
-		}
-
-		if ($this->m_bIsInDB && !$this->m_bFullyLoaded && !$this->m_bDirty)
-		{
-			// First time Set is called... ensure that the object gets fully loaded
-			// Otherwise we would lose the values on a further Reload
-			//           + consistency does not make sense !
-			$this->Reload();
-		}
-
-		if ($oAttDef->IsExternalKey())
-		{
-			if (is_object($value))
-			{
-				// Setting an external key with a whole object (instead of just an ID)
-				// let's initialize also the external fields that depend on it
-				// (useful when building objects in memory and not from a query)
-				if ( (get_class($value) != $oAttDef->GetTargetClass()) && (!is_subclass_of($value, $oAttDef->GetTargetClass())))
-				{
-					throw new CoreUnexpectedValue("Trying to set the value of '$sAttCode', to an object of class '".get_class($value)."', whereas it's an ExtKey to '".$oAttDef->GetTargetClass()."'. Ignored");
-				}
-
-				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
-				{
-					if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sAttCode))
-					{
-						$this->m_aCurrValues[$sCode] = $value->Get($oDef->GetExtAttCode());
-						$this->m_aLoadedAtt[$sCode] = true;
-					}
-				}
-			}
-			else if ($this->m_aCurrValues[$sAttCode] != $value)
-			{
-				// Setting an external key, but no any other information is available...
-				// Invalidate the corresponding fields so that they get reloaded in case they are needed (See Get())
-				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
-				{
-					if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sAttCode))
-					{
-						$this->m_aCurrValues[$sCode] = $this->GetDefaultValue($sCode);
-						unset($this->m_aLoadedAtt[$sCode]);
-					}
-				}
-			}
-		}
-		if ($oAttDef->IsLinkSet() && ($value != null))
-		{
-			$realvalue = clone $this->m_aCurrValues[$sAttCode];
-			$realvalue->UpdateFromCompleteList($value);
-		}
-		else
-		{
-			$realvalue = $oAttDef->MakeRealValue($value, $this);
-		}
-		$this->_Set($sAttCode, $realvalue);
-
-		foreach (MetaModel::ListMetaAttributes(get_class($this), $sAttCode) as $sMetaAttCode => $oMetaAttDef)
-		{
-			$this->_Set($sMetaAttCode, $oMetaAttDef->MapValue($this));
-		}
-
-		// The object has changed, reset caches
-		$this->m_bCheckStatus = null;
-
-		// Make sure we do not reload it anymore... before saving it
-		$this->RegisterAsDirty();
-
-		// This function is eligible as a lifecycle action: returning true upon success is a must
-		return true;
-	}
-
-	public function SetTrim($sAttCode, $sValue)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		$iMaxSize = $oAttDef->GetMaxSize();
-		if ($iMaxSize && (strlen($sValue) > $iMaxSize))
-		{
-			$sValue = substr($sValue, 0, $iMaxSize);
-		}
-		$this->Set($sAttCode, $sValue);
-	}
-
-	public function GetLabel($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAttDef->GetLabel();
-	}
-
-	public function Get($sAttCode)
-	{
-		if (($iPos = strpos($sAttCode, '->')) === false)
-		{
-			return $this->GetStrict($sAttCode);
-		}
-		else
-		{
-			$sExtKeyAttCode = substr($sAttCode, 0, $iPos);
-			$sRemoteAttCode = substr($sAttCode, $iPos + 2);
-			if (!MetaModel::IsValidAttCode(get_class($this), $sExtKeyAttCode))
-			{
-				throw new CoreException("Unknown external key '$sExtKeyAttCode' for the class ".get_class($this));
-			}
-
-			$oExtFieldAtt = MetaModel::FindExternalField(get_class($this), $sExtKeyAttCode, $sRemoteAttCode);
-			if (!is_null($oExtFieldAtt))
-			{
-				return $this->GetStrict($oExtFieldAtt->GetCode());
-			}
-			else
-			{
-				$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
-				$sRemoteClass = $oKeyAttDef->GetTargetClass();
-				$oRemoteObj = MetaModel::GetObject($sRemoteClass, $this->GetStrict($sExtKeyAttCode), false);
-				if (is_null($oRemoteObj))
-				{
-					return '';
-				}
-				else
-				{
-					return $oRemoteObj->Get($sRemoteAttCode);
-				}
-			}
-		}
-	}
-
-	public function GetStrict($sAttCode)
-	{
-		if ($sAttCode == 'id')
-		{
-			return $this->m_iKey;
-		}
-
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-
-		if (!$oAttDef->LoadInObject())
-		{
-			$value = $oAttDef->GetValue($this);
-		}
-		else
-		{
-			if (isset($this->m_aLoadedAtt[$sAttCode]))
-			{
-				// Standard case... we have the information directly
-			}
-			elseif ($this->m_bIsInDB && !$this->m_bDirty)
-			{
-				// Lazy load (polymorphism): complete by reloading the entire object
-				// #@# non-scalar attributes.... handle that differently?
-				$oKPI = new ExecutionKPI();
-				$this->Reload();
-				$oKPI->ComputeStats('Reload', get_class($this).'/'.$sAttCode);
-			}
-			elseif ($sAttCode == 'friendlyname')
-			{
-				// The friendly name is not computed and the object is dirty
-				// Todo: implement the computation of the friendly name based on sprintf()
-				// 
-				$this->m_aCurrValues[$sAttCode] = '';
-			}
-			else
-			{
-				// Not loaded... is it related to an external key?
-				if ($oAttDef->IsExternalField())
-				{
-					// Let's get the object and compute all of the corresponding attributes
-					// (i.e not only the requested attribute)
-					//
-					$sExtKeyAttCode = $oAttDef->GetKeyAttCode();
-	
-					if (($iRemote = $this->Get($sExtKeyAttCode)) && ($iRemote > 0)) // Objects in memory have negative IDs
-					{
-						$oExtKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
-						// Note: "allow all data" must be enabled because the external fields are always visible
-						//       to the current user even if this is not the case for the remote object
-						//       This is consistent with the behavior of the lists
-						$oRemote = MetaModel::GetObject($oExtKeyAttDef->GetTargetClass(), $iRemote, true, true);
-					}
-					else
-					{
-						$oRemote = null;
-					}
-	
-					foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
-					{
-						if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sExtKeyAttCode))
-						{
-							if ($oRemote)
-							{
-								$this->m_aCurrValues[$sCode] = $oRemote->Get($oDef->GetExtAttCode());
-							}
-							else
-							{
-								$this->m_aCurrValues[$sCode] = $this->GetDefaultValue($sCode);
-							}
-							$this->m_aLoadedAtt[$sCode] = true;
-						}
-					}
-				}
-			}
-			$value = $this->m_aCurrValues[$sAttCode];
-		}
-
-		if ($value instanceof ormLinkSet)
-		{
-			$value->Rewind();
-		}
-		return $value; 
-	}
-
-	public function GetOriginal($sAttCode)
-	{
-		if (!array_key_exists($sAttCode, MetaModel::ListAttributeDefs(get_class($this))))
-		{
-			throw new CoreException("Unknown attribute code '$sAttCode' for the class ".get_class($this));
-		}
-		$aOrigValues = $this->m_aOrigValues;
-		return isset($aOrigValues[$sAttCode]) ? $aOrigValues[$sAttCode] : null;
-	}
-
-    /**
-     * Returns the default value of the $sAttCode. By default, returns the default value of the AttributeDefinition.
-     * Overridable.
-     *
-     * @param $sAttCode
-     * @return mixed
-     */
-	public function GetDefaultValue($sAttCode)
-    {
-        $oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-        return $oAttDef->GetDefaultValue($this);
-    }
-
-	/**
-	 * Returns data loaded by the mean of a dynamic and explicit JOIN
-	 */	 
-	public function GetExtendedData()
-	{
-		return $this->m_aExtendedData;
-	}
-	
-	/**
-	 * Set the HighlightCode if the given code has a greater rank than the current HilightCode
-	 * @param string $sCode
-	 * @return void
-	 */
-	protected function SetHighlightCode($sCode)
-	{
-		$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
-		$fCurrentRank = 0.0;
-		if (($this->m_sHighlightCode !== null) && array_key_exists($this->m_sHighlightCode, $aHighlightScale))
-		{
-			$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
-		}
-				
-		if (array_key_exists($sCode, $aHighlightScale))
-		{
-			$fRank = $aHighlightScale[$sCode]['rank'];
-			if ($fRank > $fCurrentRank)
-			{
-				$this->m_sHighlightCode = $sCode;
-			}
-		}
-	}
-	
-	/**
-	 * Get the current HighlightCode
-	 * @return string The Hightlight code (null if none set, meaning rank = 0)
-	 */
-	protected function GetHighlightCode()
-	{
-		return $this->m_sHighlightCode;
-	}
-	
-	protected function ComputeHighlightCode()
-	{
-		// First if the state defines a HiglightCode, apply it
-		$sState = $this->GetState();
-		if ($sState != '')
-		{
-			$sCode = MetaModel::GetHighlightCode(get_class($this), $sState);
-			$this->SetHighlightCode($sCode);
-		}
-		// The check for each StopWatch if a HighlightCode is effective
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeStopWatch)
-			{
-				$oStopWatch = $this->Get($sAttCode);
-				$sCode = $oStopWatch->GetHighlightCode();
-				if ($sCode !== '')
-				{
-					$this->SetHighlightCode($sCode);
-				}
-			}
-		}
-		return $this->GetHighlightCode();
-	}
-
-	/**
-	 * Updates the value of an external field by (re)loading the object
-	 * corresponding to the external key and getting the value from it
-	 * 	 
-	 * UNUSED ?
-	 * 	 
-	 * @param string $sAttCode Attribute code of the external field to update
-	 * @return void
-	 */
-	protected function UpdateExternalField($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if ($oAttDef->IsExternalField())
-		{
-			$sTargetClass = $oAttDef->GetTargetClass();
-			$objkey = $this->Get($oAttDef->GetKeyAttCode());
-			// Note: "allow all data" must be enabled because the external fields are always visible
-			//       to the current user even if this is not the case for the remote object
-			//       This is consistent with the behavior of the lists
-			$oObj = MetaModel::GetObject($sTargetClass, $objkey, true, true);
-			if (is_object($oObj))
-			{
-				$value = $oObj->Get($oAttDef->GetExtAttCode());
-				$this->Set($sAttCode, $value);
-			}
-		}
-	}
-	
-	public function ComputeValues()
-	{
-	}
-
-	// Compute scalar attributes that depend on any other type of attribute
-	final public function DoComputeValues()
-	{
-		// TODO - use a flag rather than checking the call stack -> this will certainly accelerate things
-
-		// First check that we are not currently computing the fields
-		// (yes, we need to do some things like Set/Get to compute the fields which will in turn trigger the update...)
-		foreach (debug_backtrace() as $aCallInfo)
-		{
-			if (!array_key_exists("class", $aCallInfo)) continue;
-			if ($aCallInfo["class"] != get_class($this)) continue;
-			if ($aCallInfo["function"] != "ComputeValues") continue;
-			return; //skip!
-		}
-		
-		// Set the "null-not-allowed" datetimes (and dates) whose value is not initialized
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-		{
-			// AttributeDate is derived from AttributeDateTime
-			if (($oAttDef instanceof AttributeDateTime) && (!$oAttDef->IsNullAllowed()) && ($this->Get($sAttCode) == $oAttDef->GetNullValue()))
-			{
-				$this->Set($sAttCode, date($oAttDef->GetInternalFormat()));
-			}
-		}
-		
-		$this->ComputeValues();
-	}
-
-	public function GetAsHTML($sAttCode, $bLocalize = true)
-	{
-		$sClass = get_class($this);
-		$oAtt = MetaModel::GetAttributeDef($sClass, $sAttCode);
-
-		if ($oAtt->IsExternalKey(EXTKEY_ABSOLUTE))
-		{
-			//return $this->Get($sAttCode.'_friendlyname');
-			$sTargetClass = $oAtt->GetTargetClass(EXTKEY_ABSOLUTE);
-			$iTargetKey = $this->Get($sAttCode);
-			if ($iTargetKey < 0)
-			{
-				// the key points to an object that exists only in memory... no hyperlink points to it yet
-				return '';
-			}
-			else
-			{
-				$sHtmlLabel = htmlentities($this->Get($sAttCode.'_friendlyname'), ENT_QUOTES, 'UTF-8');
-				$bArchived = $this->IsArchived($sAttCode);
-				$bObsolete = $this->IsObsolete($sAttCode);
-				return $this->MakeHyperLink($sTargetClass, $iTargetKey, $sHtmlLabel, null, true, $bArchived, $bObsolete);
-			}
-		}
-
-		// That's a standard attribute (might be an ext field or a direct field, etc.)
-		return $oAtt->GetAsHTML($this->Get($sAttCode), $this, $bLocalize);
-	}
-
-	public function GetEditValue($sAttCode)
-	{
-		$sClass = get_class($this);
-		$oAtt = MetaModel::GetAttributeDef($sClass, $sAttCode);
-
-		if ($oAtt->IsExternalKey())
-		{
-			$sTargetClass = $oAtt->GetTargetClass();
-			if ($this->IsNew())
-			{
-				// The current object exists only in memory, don't try to query it in the DB !
-				// instead let's query for the object pointed by the external key, and get its name
-				$targetObjId = $this->Get($sAttCode);
-				$oTargetObj = MetaModel::GetObject($sTargetClass, $targetObjId, false); // false => not sure it exists
-				if (is_object($oTargetObj))
-				{
-					$sEditValue = $oTargetObj->GetName();
-				}
-				else
-				{
-					$sEditValue = 0;
-				}					
-			}
-			else
-			{
-				$sEditValue = $this->Get($sAttCode.'_friendlyname');
-			}
-		}
-		else
-		{
-			$sEditValue = $oAtt->GetEditValue($this->Get($sAttCode), $this);
-		}
-		return $sEditValue;
-	}
-
-	public function GetAsXML($sAttCode, $bLocalize = true)
-	{
-		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAtt->GetAsXML($this->Get($sAttCode), $this, $bLocalize);
-	}
-
-	public function GetAsCSV($sAttCode, $sSeparator = ',', $sTextQualifier = '"', $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAtt->GetAsCSV($this->Get($sAttCode), $sSeparator, $sTextQualifier, $this, $bLocalize, $bConvertToPlainText);
-	}
-
-	public function GetOriginalAsHTML($sAttCode, $bLocalize = true)
-	{
-		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAtt->GetAsHTML($this->GetOriginal($sAttCode), $this, $bLocalize);
-	}
-
-	public function GetOriginalAsXML($sAttCode, $bLocalize = true)
-	{
-		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAtt->GetAsXML($this->GetOriginal($sAttCode), $this, $bLocalize);
-	}
-
-	public function GetOriginalAsCSV($sAttCode, $sSeparator = ',', $sTextQualifier = '"', $bLocalize = true, $bConvertToPlainText = false)
-	{
-		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		return $oAtt->GetAsCSV($this->GetOriginal($sAttCode), $sSeparator, $sTextQualifier, $this, $bLocalize, $bConvertToPlainText);
-	}
-
-	/**
-	 * @param $sObjClass
-	 * @param $sObjKey
-	 * @param string $sHtmlLabel Label with HTML entities escaped (< escaped as &lt;)
-	 * @param null $sUrlMakerClass
-	 * @param bool|true $bWithNavigationContext
-	 * @param bool|false $bArchived
-	 * @param bool|false $bObsolete
-	 * @return string
-	 * @throws DictExceptionMissingString
-	 */
-	public static function MakeHyperLink($sObjClass, $sObjKey, $sHtmlLabel = '', $sUrlMakerClass = null, $bWithNavigationContext = true, $bArchived = false, $bObsolete = false)
-	{
-		if ($sObjKey <= 0) return '<em>'.Dict::S('UI:UndefinedObject').'</em>'; // Objects built in memory have negative IDs
-
-		// Safety net
-		//
-		if (empty($sHtmlLabel))
-		{
-			// If the object if not issued from a query but constructed programmatically
-			// the label may be empty. In this case run a query to get the object's friendly name
-			$oTmpObj = MetaModel::GetObject($sObjClass, $sObjKey, false);
-			if (is_object($oTmpObj))
-			{
-				$sHtmlLabel = $oTmpObj->GetName();
-			}
-			else
-			{
-				// May happen in case the target object is not in the list of allowed values for this attribute
-				$sHtmlLabel = "<em>$sObjClass::$sObjKey</em>";
-			}
-		}
-		$sHint = MetaModel::GetName($sObjClass)."::$sObjKey";
-		$sUrl = ApplicationContext::MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass, $bWithNavigationContext);
-
-		$bClickable = !$bArchived || utils::IsArchiveMode();
-		if ($bArchived)
-		{
-			$sSpanClass = 'archived';
-			$sFA = 'fa-archive object-archived';
-			$sHint = Dict::S('ObjectRef:Archived');
-		}
-		elseif ($bObsolete)
-		{
-			$sSpanClass = 'obsolete';
-			$sFA = 'fa-eye-slash object-obsolete';
-			$sHint = Dict::S('ObjectRef:Obsolete');
-		}
-		else
-		{
-			$sSpanClass = '';
-			$sFA = '';
-		}
-		if ($sFA == '')
-		{
-			$sIcon = '';
-		}
-		else
-		{
-			if ($bClickable)
-			{
-				$sIcon = "<span class=\"object-ref-icon fa $sFA fa-1x fa-fw\"></span>";
-			}
-			else
-			{
-				$sIcon = "<span class=\"object-ref-icon-disabled fa $sFA fa-1x fa-fw\"></span>";
-			}
-		}
-
-		if ($bClickable && (strlen($sUrl) > 0))
-		{
-			$sHLink = "<a class=\"object-ref-link\" href=\"$sUrl\">$sIcon$sHtmlLabel</a>";
-		}
-		else
-		{
-			$sHLink = $sIcon.$sHtmlLabel;
-		}
-		$sRet = "<span class=\"object-ref $sSpanClass\" title=\"$sHint\">$sHLink</span>";
-		return $sRet;
-	}
-
-	public function GetHyperlink($sUrlMakerClass = null, $bWithNavigationContext = true)
-	{
-		$bArchived = $this->IsArchived();
-		$bObsolete = $this->IsObsolete();
-		return self::MakeHyperLink(get_class($this), $this->GetKey(), $this->GetName(), $sUrlMakerClass, $bWithNavigationContext, $bArchived, $bObsolete);
-	}
-	
-	public static function ComputeStandardUIPage($sClass)
-	{
-		static $aUIPagesCache = array(); // Cache to store the php page used to display each class of object
-		if (!isset($aUIPagesCache[$sClass]))
-		{
-			$UIPage = false;
-			if (is_callable("$sClass::GetUIPage"))
-			{
-				$UIPage = eval("return $sClass::GetUIPage();"); // May return false in case of error
-			}
-			$aUIPagesCache[$sClass] = $UIPage === false ? './UI.php' : $UIPage;
-		}
-		$sPage = $aUIPagesCache[$sClass];
-		return $sPage;
-	}
-
-	public static function GetUIPage()
-	{
-		return 'UI.php';
-	}
-
-
-	// could be in the metamodel ?
-	public static function IsValidPKey($value)
-	{
-		return ((string)$value === (string)(int)$value);
-	}
-
-	public function GetKey()
-	{
-		return $this->m_iKey;
-	}
-	public function SetKey($iNewKey)
-	{
-		if (!self::IsValidPKey($iNewKey))
-		{
-			throw new CoreException("An object id must be an integer value ($iNewKey)");
-		}
-		
-		if ($this->m_bIsInDB && !empty($this->m_iKey) && ($this->m_iKey != $iNewKey))
-		{
-			throw new CoreException("Changing the key ({$this->m_iKey} to $iNewKey) on an object (class {".get_class($this).") wich already exists in the Database");
-		}
-		$this->m_iKey = $iNewKey;
-	}
-	/**
-	 * Get the icon representing this object
-	 * @param boolean $bImgTag If true the result is a full IMG tag (or an emtpy string if no icon is defined)
-	 * @return string Either the full IMG tag ($bImgTag == true) or just the URL to the icon file
-	 */
-	public function GetIcon($bImgTag = true)
-	{
-		$sCode = $this->ComputeHighlightCode();
-		if($sCode != '')
-		{
-			$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
-			if (array_key_exists($sCode, $aHighlightScale))
-			{
-				$sIconUrl = $aHighlightScale[$sCode]['icon'];
-				if($bImgTag)
-				{
-					return "<img src=\"$sIconUrl\" style=\"vertical-align:middle\"/>";
-				}
-				else
-				{
-					return $sIconUrl;
-				}
-			}
-		}		
-		return MetaModel::GetClassIcon(get_class($this), $bImgTag);
-	}
-
-	/**
-	 * Gets the name of an object in a safe manner for displaying inside a web page
-	 * @return string
-	 */
-	public function GetName()
-	{
-		return htmlentities($this->GetRawName(), ENT_QUOTES, 'UTF-8');
-	}
-
-	/**
-	 * Gets the raw name of an object, this is not safe for displaying inside a web page
-	 * since the " < > characters are not escaped and the name may contain some XSS script
-	 * instructions.
-	 * Use this function only for internal computations or for an output to a non-HTML destination
-	 * @return string
-	 */
-	public function GetRawName()
-	{
-		return $this->Get('friendlyname');
-	}
-
-	public function GetState()
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode))
-		{
-			return '';
-		}
-		else
-		{
-			return $this->Get($sStateAttCode);
-		}
-	}
-
-	public function GetStateLabel()
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode))
-		{
-			return '';
-		}
-		else
-		{
-			$sStateValue = $this->Get($sStateAttCode);
-			return MetaModel::GetStateLabel(get_class($this), $sStateValue);
-		}
-	}
-
-	public function GetStateDescription()
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode))
-		{
-			return '';
-		}
-		else
-		{
-			$sStateValue = $this->Get($sStateAttCode);
-			return MetaModel::GetStateDescription(get_class($this), $sStateValue);
-		}
-	}
-
-	/**
-	 * Overridable - Define attributes read-only from the end-user perspective
-	 * 	 
-	 * @return array List of attcodes
-	 */	 	  	 	
-	public static function GetReadOnlyAttributes()
-	{
-		return null;
-	}
-
-
-	/**
-	 * Overridable - Get predefined objects (could be hardcoded)
-	 * The predefined objects will be synchronized with the DB at each install/upgrade
-	 * As soon as a class has predefined objects, then nobody can create nor delete objects	 
-	 * @return array An array of id => array of attcode => php value(so-called "real value": integer, string, ormDocument, DBObjectSet, etc.)
-	 */	 	  	 	
-	public static function GetPredefinedObjects()
-	{
-		return null;
-	}
-
-	/**
-	 *
-	 * @param string $sAttCode $sAttCode The code of the attribute
-	 * @param array $aReasons To store the reasons why the attribute is read-only (info about the synchro replicas)
-	 * @param string $sTargetState The target state in which to evalutate the flags, if empty the current state will be
-	 *     used
-	 *
-	 * @return integer the binary combination of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...) for the
-	 *     given attribute in the given state of the object
-	 * @throws \CoreException
-	 */
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		$iFlags = 0; // By default (if no life cycle) no flag at all
-
-		$aReadOnlyAtts = $this->GetReadOnlyAttributes();
-		if (($aReadOnlyAtts != null) && (in_array($sAttCode, $aReadOnlyAtts)))
-		{
-			return OPT_ATT_READONLY;
-		}
-
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (!empty($sStateAttCode))
-		{
-			if ($sTargetState != '')
-			{
-				$iFlags = MetaModel::GetAttributeFlags(get_class($this), $sTargetState, $sAttCode);			
-			}
-			else
-			{
-				$iFlags = MetaModel::GetAttributeFlags(get_class($this), $this->Get($sStateAttCode), $sAttCode);
-			}
-		}
-		$aReasons = array();
-		$iSynchroFlags = 0;
-		if ($this->InSyncScope())
-		{
-			$iSynchroFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
-		}
-		return $iFlags | $iSynchroFlags; // Combine both sets of flags
-	}
-
-	/**
-	 * @param string $sAttCode
-	 * @param array $aReasons To store the reasons why the attribute is read-only (info about the synchro replicas)
-	 *
-	 * @throws \CoreException
-	 */
-	public function IsAttributeReadOnlyForCurrentState($sAttCode, &$aReasons = array())
-	{
-		$iAttFlags = $this->GetAttributeFlags($sAttCode, $aReasons);
-
-		return ($iAttFlags & OPT_ATT_READONLY);
-	}
-
-    /**
-     * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
-     * for the given attribute in a transition
-     * @param $sAttCode string $sAttCode The code of the attribute
-     * @param $sStimulus string The stimulus code to apply
-     * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
-     * @param $sOriginState string The state from which to apply $sStimulus, if empty current state will be used
-     * @return integer Flags: the binary combination of the flags applicable to this attribute
-     */
-    public function GetTransitionFlags($sAttCode, $sStimulus, &$aReasons = array(), $sOriginState = '')
-    {
-        $iFlags = 0; // By default (if no lifecycle) no flag at all
-
-        $sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-        // If no state attribute, there is no lifecycle
-        if (empty($sStateAttCode))
-        {
-            return $iFlags;
-        }
-
-        // Retrieving current state if necessary
-        if ($sOriginState === '')
-        {
-            $sOriginState = $this->Get($sStateAttCode);
-        }
-
-        // Retrieving attribute flags
-        $iAttributeFlags = $this->GetAttributeFlags($sAttCode, $aReasons, $sOriginState);
-
-        // Retrieving transition flags
-        $iTransitionFlags = MetaModel::GetTransitionFlags(get_class($this), $sOriginState, $sStimulus, $sAttCode);
-
-        // Merging transition flags with attribute flags
-        $iFlags = $iTransitionFlags | $iAttributeFlags;
-
-        return $iFlags;
-    }
-
-    /**
-     * Returns an array of attribute codes (with their flags) when $sStimulus is applied on the object in the $sOriginState state.
-     * Note: Attributes (and flags) from the target state and the transition are combined.
-     *
-     * @param $sStimulus string
-     * @param $sOriginState string Default is current state
-     * @return array
-     */
-    public function GetTransitionAttributes($sStimulus, $sOriginState = null)
-    {
-        $sObjClass = get_class($this);
-
-        // Defining current state as origin state if not specified
-        if($sOriginState === null)
-        {
-            $sOriginState = $this->GetState();
-        }
-
-        $aAttributes = MetaModel::GetTransitionAttributes($sObjClass, $sStimulus, $sOriginState);
-
-        return $aAttributes;
-    }
-
-	/**
-	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
-	 * for the given attribute for the current state of the object considered as an INITIAL state
-	 * @param string $sAttCode The code of the attribute
-	 * @return integer Flags: the binary combination of the flags applicable to this attribute
-	 */	 	  	 	
-	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
-	{
-		$iFlags = 0;
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (!empty($sStateAttCode))
-		{
-			$iFlags = MetaModel::GetInitialStateAttributeFlags(get_class($this), $this->Get($sStateAttCode), $sAttCode);
-		}
-		return $iFlags; // No need to care about the synchro flags since we'll be creating a new object anyway
-	}
-
-	// check if the given (or current) value is suitable for the attribute
-	// return true if successfull
-	// return the error desciption otherwise
-	public function CheckValue($sAttCode, $value = null)
-	{
-		if (!is_null($value))
-		{
-			$toCheck = $value;
-		}
-		else
-		{
-			$toCheck = $this->Get($sAttCode);
-		}
-
-		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if (!$oAtt->IsWritable())
-		{
-			return true;
-		}
-		elseif ($oAtt->IsNull($toCheck))
-		{
-			if ($oAtt->IsNullAllowed())
-			{
-				return true;
-			}
-			else
-			{
-				return "Null not allowed";
-			}
-		}
-		elseif ($oAtt->IsExternalKey())
-		{
-			if (!MetaModel::SkipCheckExtKeys())
-			{
-				$sTargetClass = $oAtt->GetTargetClass();
-				$oTargetObj = MetaModel::GetObject($sTargetClass, $toCheck, false /*must be found*/, true /*allow all data*/);
-				if (is_null($oTargetObj))
-				{
-					return "Target object not found ($sTargetClass::$toCheck)";
-				}
-			}
-			if ($oAtt->IsHierarchicalKey())
-			{
-				// This check cannot be deactivated since otherwise the user may break things by a CSV import of a bulk modify
-				$aValues = $oAtt->GetAllowedValues(array('this' => $this));
-				if (!array_key_exists($toCheck, $aValues))
-				{
-					return "Value not allowed [$toCheck]";
-				}
-			}
-		}
-		elseif ($oAtt->IsScalar())
-		{
-			$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
-			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)
-				{
-					return "String too long (found $iLen, limited to $iMaxSize)";
-				}
-			}
-			if (!$oAtt->CheckFormat($toCheck))
-			{
-				return "Wrong format [$toCheck]";
-			}
-		}
-		else
-		{
-			return $oAtt->CheckValue($this, $toCheck);
-		}
-		return true;
-	}
-	
-	// check attributes together
-	public function CheckConsistency()
-	{
-		return true;
-	}
-	
-	// check integrity rules (before inserting or updating the object)
-	// a displayable error is returned
-	public function DoCheckToWrite()
-	{
-		$this->DoComputeValues();
-
-		$aChanges = $this->ListChanges();
-
-		foreach($aChanges as $sAttCode => $value)
-		{
-			$res = $this->CheckValue($sAttCode);
-			if ($res !== true)
-			{
-				// $res contains the error description
-				$this->m_aCheckIssues[] = "Unexpected value for attribute '$sAttCode': $res";
-			}
-		}
-		if (count($this->m_aCheckIssues) > 0)
-		{
-			// No need to check consistency between attributes if any of them has
-			// an unexpected value
-			return;
-		}
-		$res = $this->CheckConsistency();
-		if ($res !== true)
-		{
-			// $res contains the error description
-			$this->m_aCheckIssues[] = "Consistency rules not followed: $res";
-		}
-
-		// Synchronization: are we attempting to modify an attribute for which an external source is master?
-		//
-		if ($this->m_bIsInDB && $this->InSyncScope() && (count($aChanges) > 0))
-		{
-			foreach($aChanges as $sAttCode => $value)
-			{
-				$iFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
-				if ($iFlags & OPT_ATT_SLAVE)
-				{
-					// Note: $aReasonInfo['name'] could be reported (the task owning the attribute)
-					$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-					$sAttLabel = $oAttDef->GetLabel();
-					foreach($aReasons as $aReasonInfo)
-					{
-						// Todo: associate the attribute code with the error
-						$this->m_aCheckIssues[] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $sAttLabel);
-					}
-				}
-			}
-		}
-	}
-
-	final public function CheckToWrite()
-	{
-		if (MetaModel::SkipCheckToWrite())
-		{
-			return array(true, array());
-		}
-		if (is_null($this->m_bCheckStatus))
-		{
-			$this->m_aCheckIssues = array();
-
-			$oKPI = new ExecutionKPI();
-			$this->DoCheckToWrite();
-			$oKPI->ComputeStats('CheckToWrite', get_class($this));
-			if (count($this->m_aCheckIssues) == 0)
-			{
-				$this->m_bCheckStatus = true;
-			}
-			else
-			{
-				$this->m_bCheckStatus = false;
-			}
-		}
-		return array($this->m_bCheckStatus, $this->m_aCheckIssues, $this->m_bSecurityIssue);
-	}
-
-	// check if it is allowed to delete the existing object from the database
-	// a displayable error is returned
-	protected function DoCheckToDelete(&$oDeletionPlan)
-	{
-		$this->m_aDeleteIssues = array(); // Ok
-
-		if ($this->InSyncScope())
-		{
-
-			foreach ($this->GetSynchroData() as $iSourceId => $aSourceData)
-			{
-				foreach ($aSourceData['replica'] as $oReplica)
-				{
-					$oDeletionPlan->AddToDelete($oReplica, DEL_SILENT);
-				}
-				$oDataSource = $aSourceData['source'];
-				if ($oDataSource->GetKey() == SynchroExecution::GetCurrentTaskId())
-				{
-					// The current task has the right to delete the object
-					continue;
-				}
-				$oReplica = reset($aSourceData['replica']); // Take the first one
-				if ($oReplica->Get('status_dest_creator') != 1)
-				{
-					// The object is not owned by the task
-					continue;
-				}
-
-				$sLink = $oDataSource->GetName();
-				$sUserDeletePolicy = $oDataSource->Get('user_delete_policy');
-				switch($sUserDeletePolicy)
-				{
-				case 'nobody':
-					$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
-					break;
-
-				case 'administrators':
-					if (!UserRights::IsAdministrator())
-					{
-						$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
-					}
-					break;
-
-				case 'everybody':
-				default:
-					// Ok
-					break;
-				}
-			}
-		}
-	}
-
-  	public function CheckToDelete(&$oDeletionPlan)
-  	{
-		$this->MakeDeletionPlan($oDeletionPlan);
-		$oDeletionPlan->ComputeResults();
-		return (!$oDeletionPlan->FoundStopper());
-	} 
-
-	protected function ListChangedValues(array $aProposal)
-	{
-		$aDelta = array();
-		foreach ($aProposal as $sAtt => $proposedValue)
-		{
-			if (!array_key_exists($sAtt, $this->m_aOrigValues))
-			{
-				// The value was not set
-				$aDelta[$sAtt] = $proposedValue;
-			}
-			elseif(!array_key_exists($sAtt, $this->m_aTouchedAtt) || (array_key_exists($sAtt, $this->m_aModifiedAtt) && $this->m_aModifiedAtt[$sAtt] == false))
-			{
-				// This attCode was never set, cannot be modified
-				// or the same value - as the original value - was set, and has been verified as equivalent to the original value
-				continue;
-			}
-			else if (array_key_exists($sAtt, $this->m_aModifiedAtt) && $this->m_aModifiedAtt[$sAtt] == true)
-			{
-				// We already know that the value is really modified
-				$aDelta[$sAtt] = $proposedValue;
-			}
-			elseif(is_object($proposedValue))
-			{
-				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAtt);
-				// The value is an object, the comparison is not strict
-				if (!$oAttDef->Equals($this->m_aOrigValues[$sAtt], $proposedValue))
-				{
-					$aDelta[$sAtt] = $proposedValue;
-					$this->m_aModifiedAtt[$sAtt] = true; // Really modified
-				}
-				else
-				{
-					$this->m_aModifiedAtt[$sAtt] = false; // Not really modified
-				}
-			}
-			else
-			{
-				// The value is a scalar, the comparison must be 100% strict
-				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
-				{	
-					//echo "$sAtt:<pre>\n";
-					//var_dump($this->m_aOrigValues[$sAtt]);
-					//var_dump($proposedValue);
-					//echo "</pre>\n";
-					$aDelta[$sAtt] = $proposedValue;
-					$this->m_aModifiedAtt[$sAtt] = true; // Really modified
-				}
-				else
-				{
-					$this->m_aModifiedAtt[$sAtt] = false; // Not really modified
-				}
-			}
-		}
-		return $aDelta;
-	} 
-
-	// List the attributes that have been changed
-	// Returns an array of attname => currentvalue
-	public function ListChanges()
-	{
-		if ($this->m_bIsInDB)
-		{
-			return $this->ListChangedValues($this->m_aCurrValues);
-		}
-		else
-		{
-			return $this->m_aCurrValues;
-		}
-	}
-
-	// Tells whether or not an object was modified since last read (ie: does it differ from the DB ?)
-	public function IsModified()
-	{
-		$aChanges = $this->ListChanges();
-		return (count($aChanges) != 0);
-	}
-
-	public function Equals($oSibling)
-	{
-		if (get_class($oSibling) != get_class($this))
-		{
-			return false;
-		}
-		if ($this->GetKey() != $oSibling->GetKey())
-		{
-			return false;
-		}
-		if ($this->m_bIsInDB)
-		{
-			// If one has changed, then consider them as being different
-			if ($this->IsModified() || $oSibling->IsModified())
-			{
-				return false;
-			}
-		}
-		else
-		{
-			// Todo - implement this case (loop on every attribute)
-			//foreach(MetaModel::ListAttributeDefs(get_class($this) as $sAttCode => $oAttDef)
-			//{
-					//if (!isset($this->m_CurrentValues[$sAttCode])) continue;
-					//if (!isset($this->m_CurrentValues[$sAttCode])) continue;
-					//if (!$oAttDef->Equals($this->m_CurrentValues[$sAttCode], $oSibling->m_CurrentValues[$sAttCode]))
-					//{
-						//return false;
-					//}
-			//}
-			return false;
-		}
-		return true;
-	}
-
-	// used only by insert
-	protected function OnObjectKeyReady()
-    {
-        // Meant to be overloaded
-    }
-
-	// used both by insert/update
-	private function DBWriteLinks()
-	{
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-		{
-			if (!$oAttDef->IsLinkSet()) continue;
-			if (!array_key_exists($sAttCode, $this->m_aTouchedAtt)) continue;
-			if (array_key_exists($sAttCode, $this->m_aModifiedAtt) && ($this->m_aModifiedAtt[$sAttCode] == false)) continue;
-
-			$oLinkSet = $this->m_aCurrValues[$sAttCode];
-			$oLinkSet->DBWrite($this);
-		}
-	}
-
-	// used both by insert/update
-	private function WriteExternalAttributes()
-	{
-		foreach (MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-		{
-			if (!$oAttDef->LoadInObject()) continue;
-			if ($oAttDef->LoadFromDB()) continue;
-			if (!array_key_exists($sAttCode, $this->m_aTouchedAtt)) continue;
-			if (array_key_exists($sAttCode, $this->m_aModifiedAtt) && ($this->m_aModifiedAtt[$sAttCode] == false)) continue;
-			$oAttDef->WriteValue($this, $this->m_aCurrValues[$sAttCode]);
-		}
-	}
-
-	// Note: this is experimental - it was designed to speed up the setup of iTop
-	// Known limitations:
-	//   - does not work with multi-table classes (issue with the unique id to maintain in several tables)
-	//   - the id of the object is not updated
-	static public final function BulkInsertStart()
-	{
-		self::$m_bBulkInsert = true;
-	} 
-
-	static public final function BulkInsertFlush()
-	{
-		if (!self::$m_bBulkInsert) return;
-
-		foreach(self::$m_aBulkInsertCols as $sClass => $aTables)
-		{
-			foreach ($aTables as $sTable => $sColumns)
-			{
-				$sValues = implode(', ', self::$m_aBulkInsertItems[$sClass][$sTable]);
-				$sInsertSQL = "INSERT INTO `$sTable` ($sColumns) VALUES $sValues";
-				$iNewKey = CMDBSource::InsertInto($sInsertSQL);
-			}
-		}
-
-		// Reset
-		self::$m_aBulkInsertItems = array();
-		self::$m_aBulkInsertCols = array();
-		self::$m_bBulkInsert = false;
-	} 
-
-	private function DBInsertSingleTable($sTableClass)
-	{
-		$sTable = MetaModel::DBGetTable($sTableClass);
-		// Abstract classes or classes having no specific attribute do not have an associated table
-		if ($sTable == '') return;
-
-		$sClass = get_class($this);
-
-		// fields in first array, values in the second
-		$aFieldsToWrite = array();
-		$aValuesToWrite = array();
-		
-		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
-		{
-			// Add it to the list of fields to write
-			$aFieldsToWrite[] = '`'.MetaModel::DBGetKey($sTableClass).'`';
-			$aValuesToWrite[] = CMDBSource::Quote($this->m_iKey);
-		}
-
-		$aHierarchicalKeys = array();
-		
-		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if (!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode)) continue;
-			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
-			foreach($aAttColumns as $sColumn => $sValue)
-			{
-				$aFieldsToWrite[] = "`$sColumn`"; 
-				$aValuesToWrite[] = CMDBSource::Quote($sValue);
-			}
-			if ($oAttDef->IsHierarchicalKey())
-			{
-				$aHierarchicalKeys[$sAttCode] = $oAttDef;
-			}
-		}
-
-		if (count($aValuesToWrite) == 0) return false;
-
-		if (MetaModel::DBIsReadOnly())
-		{
-			$iNewKey = -1;
-		}
-		else
-		{
-			if (self::$m_bBulkInsert)
-			{
-				if (!isset(self::$m_aBulkInsertCols[$sClass][$sTable]))
-				{
-					self::$m_aBulkInsertCols[$sClass][$sTable] = implode(', ', $aFieldsToWrite);
-				}
-				self::$m_aBulkInsertItems[$sClass][$sTable][] = '('.implode (', ', $aValuesToWrite).')';
-				
-				$iNewKey = 999999; // TODO - compute next id....
-			}
-			else
-			{
-				if (count($aHierarchicalKeys) > 0)
-				{
-					foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
-					{
-						$aValues = MetaModel::HKInsertChildUnder($this->m_aCurrValues[$sAttCode], $oAttDef, $sTable);
-						$aFieldsToWrite[] = '`'.$oAttDef->GetSQLRight().'`';
-						$aValuesToWrite[] = $aValues[$oAttDef->GetSQLRight()];
-						$aFieldsToWrite[] = '`'.$oAttDef->GetSQLLeft().'`';
-						$aValuesToWrite[] = $aValues[$oAttDef->GetSQLLeft()];
-					}
-				}
-				$sInsertSQL = "INSERT INTO `$sTable` (".join(",", $aFieldsToWrite).") VALUES (".join(", ", $aValuesToWrite).")";
-				$iNewKey = CMDBSource::InsertInto($sInsertSQL);
-			}
-		}
-		// Note that it is possible to have a key defined here, and the autoincrement expected, this is acceptable in a non root class
-		if (empty($this->m_iKey))
-		{
-			// Take the autonumber
-			$this->m_iKey = $iNewKey;
-		}
-		return $this->m_iKey;
-	}
-
-	// Insert of record for the new object into the database
-	// Returns the key of the newly created object
-	public function DBInsertNoReload()
-	{
-		if ($this->m_bIsInDB)
-		{
-			throw new CoreException("The object already exists into the Database, you may want to use the clone function");
-		}
-
-		$sClass = get_class($this);
-		$sRootClass = MetaModel::GetRootClass($sClass);
-
-		// Ensure the update of the values (we are accessing the data directly)
-		$this->DoComputeValues();
-		$this->OnInsert();
-
-		if ($this->m_iKey < 0)
-		{
-			// This was a temporary "memory" key: discard it so that DBInsertSingleTable will not try to use it!
-			$this->m_iKey = null; 
-		}
-
-		// If not automatically computed, then check that the key is given by the caller
-		if (!MetaModel::IsAutoIncrementKey($sRootClass))
-		{
-			if (empty($this->m_iKey))
-			{
-				throw new CoreWarning("Missing key for the object to write - This class is supposed to have a user defined key, not an autonumber", array('class' => $sRootClass));
-			}
-		}
-
-		// Ultimate check - ensure DB integrity
-		list($bRes, $aIssues) = $this->CheckToWrite();
-		if (!$bRes)
-		{
-			$sIssues = implode(', ', $aIssues);
-			throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
-		}
-
-		// Stop watches
-		$sState = $this->GetState();
-		if ($sState != '')
-		{
-			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef instanceof AttributeStopWatch)
-				{
-					if (in_array($sState, $oAttDef->GetStates()))
-					{
-						// Start the stop watch and compute the deadlines
-						$oSW = $this->Get($sAttCode);
-						$oSW->Start($this, $oAttDef);
-						$oSW->ComputeDeadlines($this, $oAttDef);
-						$this->Set($sAttCode, $oSW);
-					}
-				}
-			}
-		}
-
-		// First query built upon on the root class, because the ID must be created first
-		$this->m_iKey = $this->DBInsertSingleTable($sRootClass);
-
-		// Then do the leaf class, if different from the root class
-		if ($sClass != $sRootClass)
-		{
-			$this->DBInsertSingleTable($sClass);
-		}
-
-		// Then do the other classes
-		foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
-		{
-			if ($sParentClass == $sRootClass) continue;
-			$this->DBInsertSingleTable($sParentClass);
-		}
-
-		$this->OnObjectKeyReady();
-
-        $this->DBWriteLinks();
-		$this->WriteExternalAttributes();
-
-		$this->m_bIsInDB = true;
-		$this->m_bDirty = false;
-		foreach ($this->m_aCurrValues as $sAttCode => $value)
-		{
-			if (is_object($value))
-			{
-				$value = clone $value;
-			}
-			$this->m_aOrigValues[$sAttCode] = $value;
-		}
-
-		$this->AfterInsert();
-
-		// Activate any existing trigger 
-		$sClass = get_class($this);
-		$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectCreate AS t WHERE t.target_class IN ('$sClassList')"));
-		while ($oTrigger = $oSet->Fetch())
-		{
-			$oTrigger->DoActivate($this->ToArgs('this'));
-		}
-
-		// Callbacks registered with RegisterCallback
-		if (isset($this->m_aCallbacks[self::CALLBACK_AFTERINSERT]))
-		{
-			foreach ($this->m_aCallbacks[self::CALLBACK_AFTERINSERT] as $aCallBackData)
-			{
-				call_user_func_array($aCallBackData['callback'], $aCallBackData['params']);
-			}
-		}
-
-		$this->RecordObjCreation();
-
-		return $this->m_iKey;
-	}
-
-	protected function MakeInsertStatementSingleTable($aAuthorizedExtKeys, &$aStatements, $sTableClass)
-	{
-		$sTable = MetaModel::DBGetTable($sTableClass);
-		// Abstract classes or classes having no specific attribute do not have an associated table
-		if ($sTable == '') return;
-
-		$sClass = get_class($this);
-
-		// fields in first array, values in the second
-		$aFieldsToWrite = array();
-		$aValuesToWrite = array();
-		
-		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
-		{
-			// Add it to the list of fields to write
-			$aFieldsToWrite[] = '`'.MetaModel::DBGetKey($sTableClass).'`';
-			$aValuesToWrite[] = CMDBSource::Quote($this->m_iKey);
-		}
-
-		$aHierarchicalKeys = array();
-		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if (!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode)) continue;
-			// Skip link set that can still be undefined though the object is 100% loaded
-			if ($oAttDef->IsLinkSet()) continue;
-
-			$value = $this->m_aCurrValues[$sAttCode];
-			if ($oAttDef->IsExternalKey())
-			{
-				$sTargetClass = $oAttDef->GetTargetClass();
-				if (is_array($aAuthorizedExtKeys))
-				{
-					if (!array_key_exists($sTargetClass, $aAuthorizedExtKeys) || !array_key_exists($value, $aAuthorizedExtKeys[$sTargetClass]))
-					{
-						$value = 0;
-					}
-				}
-			}
-			$aAttColumns = $oAttDef->GetSQLValues($value);
-			foreach($aAttColumns as $sColumn => $sValue)
-			{
-				$aFieldsToWrite[] = "`$sColumn`"; 
-				$aValuesToWrite[] = CMDBSource::Quote($sValue);
-			}
-			if ($oAttDef->IsHierarchicalKey())
-			{
-				$aHierarchicalKeys[$sAttCode] = $oAttDef;
-			}
-		}
-
-		if (count($aValuesToWrite) == 0) return false;
-
-		if (count($aHierarchicalKeys) > 0)
-		{
-			foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
-			{
-				$aValues = MetaModel::HKInsertChildUnder($this->m_aCurrValues[$sAttCode], $oAttDef, $sTable);
-				$aFieldsToWrite[] = '`'.$oAttDef->GetSQLRight().'`';
-				$aValuesToWrite[] = $aValues[$oAttDef->GetSQLRight()];
-				$aFieldsToWrite[] = '`'.$oAttDef->GetSQLLeft().'`';
-				$aValuesToWrite[] = $aValues[$oAttDef->GetSQLLeft()];
-			}
-		}
-		$aStatements[] = "INSERT INTO `$sTable` (".join(",", $aFieldsToWrite).") VALUES (".join(", ", $aValuesToWrite).");";
-	}
-
-	public function MakeInsertStatements($aAuthorizedExtKeys, &$aStatements)
-	{
-		$sClass = get_class($this);
-		$sRootClass = MetaModel::GetRootClass($sClass);
-
-		// First query built upon on the root class, because the ID must be created first
-		$this->MakeInsertStatementSingleTable($aAuthorizedExtKeys, $aStatements, $sRootClass);
-
-		// Then do the leaf class, if different from the root class
-		if ($sClass != $sRootClass)
-		{
-			$this->MakeInsertStatementSingleTable($aAuthorizedExtKeys, $aStatements, $sClass);
-		}
-
-		// Then do the other classes
-		foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
-		{
-			if ($sParentClass == $sRootClass) continue;
-			$this->MakeInsertStatementSingleTable($aAuthorizedExtKeys, $aStatements, $sParentClass);
-		}
-	}
-
-	public function DBInsert()
-	{
-		$this->DBInsertNoReload();
-		$this->Reload();
-		return $this->m_iKey;
-	}
-	
-	public function DBInsertTracked(CMDBChange $oChange)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		return $this->DBInsert();
-	}
-
-	public function DBInsertTrackedNoReload(CMDBChange $oChange)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		return $this->DBInsertNoReload();
-	}
-
-	// Creates a copy of the current object into the database
-	// Returns the id of the newly created object
-	public function DBClone($iNewKey = null)
-	{
-		$this->m_bIsInDB = false;
-		$this->m_iKey = $iNewKey;
-		$ret = $this->DBInsert();
-		$this->RecordObjCreation();
-		return $ret;
-	}
-	
-	/**
-	 * This function is automatically called after cloning an object with the "clone" PHP language construct
-	 * The purpose of this method is to reset the appropriate attributes of the object in
-	 * order to make sure that the newly cloned object is really distinct from its clone
-	 */
-	public function __clone()
-	{
-		$this->m_bIsInDB = false;
-		$this->m_bDirty = true;
-		$this->m_iKey = self::GetNextTempId(get_class($this));
-	}
-
-	// Update a record
-	public function DBUpdate()
-	{
-		if (!$this->m_bIsInDB)
-		{
-			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
-		}
-
-		// Protect against reentrance (e.g. cascading the update of ticket logs)
-		static $aUpdateReentrance = array();
-		$sKey = get_class($this).'::'.$this->GetKey();
-		if (array_key_exists($sKey, $aUpdateReentrance))
-		{
-			return;
-		}
-		$aUpdateReentrance[$sKey] = true;
-
-		try
-		{
-			// Stop watches
-			$sState = $this->GetState();
-			if ($sState != '')
-			{
-				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-				{
-					if ($oAttDef instanceof AttributeStopWatch)
-					{
-						if (in_array($sState, $oAttDef->GetStates()))
-						{
-							// Compute or recompute the deadlines
-							$oSW = $this->Get($sAttCode);
-							$oSW->ComputeDeadlines($this, $oAttDef);
-							$this->Set($sAttCode, $oSW);
-						}
-					}
-				}
-			}
-
-			$this->DoComputeValues();
-			$this->OnUpdate();
-
-			$aChanges = $this->ListChanges();
-			if (count($aChanges) == 0)
-			{
-				// Attempting to update an unchanged object
-				unset($aUpdateReentrance[$sKey]);
-				return $this->m_iKey;
-			}
-
-			// Ultimate check - ensure DB integrity
-			list($bRes, $aIssues) = $this->CheckToWrite();
-			if (!$bRes)
-			{
-				$sIssues = implode(', ', $aIssues);
-				throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
-			}
-
-			// Save the original values (will be reset to the new values when the object get written to the DB)
-			$aOriginalValues = $this->m_aOrigValues;
-
-			$bHasANewExternalKeyValue = false;
-			$aHierarchicalKeys = array();
-			$aDBChanges = array();
-			foreach($aChanges as $sAttCode => $valuecurr)
-			{
-				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-				if ($oAttDef->IsExternalKey()) $bHasANewExternalKeyValue = true;
-				if ($oAttDef->IsBasedOnDBColumns())
-				{
-					$aDBChanges[$sAttCode] = $aChanges[$sAttCode];
-				}
-				if ($oAttDef->IsHierarchicalKey())
-				{
-					$aHierarchicalKeys[$sAttCode] = $oAttDef;
-				}
-			}
-
-			if (!MetaModel::DBIsReadOnly())
-			{
-				// Update the left & right indexes for each hierarchical key
-				foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
-				{
-					$sTable = $sTable = MetaModel::DBGetTable(get_class($this), $sAttCode);
-					$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".$this->GetKey();
-					$aRes = CMDBSource::QueryToArray($sSQL);
-					$iMyLeft = $aRes[0]['left'];
-					$iMyRight = $aRes[0]['right'];
-					$iDelta =$iMyRight - $iMyLeft + 1;
-					MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
-					
-					if ($aDBChanges[$sAttCode] == 0)
-					{
-						// No new parent, insert completely at the right of the tree
-						$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
-						$aRes = CMDBSource::QueryToArray($sSQL);
-						if (count($aRes) == 0)
-						{
-							$iNewLeft = 1;
-						}
-						else
-						{
-							$iNewLeft = $aRes[0]['max']+1;
-						}
-					}
-					else
-					{
-						// Insert at the right of the specified parent
-						$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` FROM `$sTable` WHERE id=".((int)$aDBChanges[$sAttCode]);
-						$iNewLeft = CMDBSource::QueryToScalar($sSQL);
-					}
-
-					MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
-
-					$aHKChanges = array();
-					$aHKChanges[$sAttCode] = $aDBChanges[$sAttCode];
-					$aHKChanges[$oAttDef->GetSQLLeft()] = $iNewLeft;
-					$aHKChanges[$oAttDef->GetSQLRight()] = $iNewLeft + $iDelta - 1;
-					$aDBChanges[$sAttCode] = $aHKChanges; // the 3 values will be stored by MakeUpdateQuery below
-				}
-				
-				// Update scalar attributes
-				if (count($aDBChanges) != 0)
-				{
-					$oFilter = new DBObjectSearch(get_class($this));
-					$oFilter->AddCondition('id', $this->m_iKey, '=');
-					$oFilter->AllowAllData();
-			
-					$sSQL = $oFilter->MakeUpdateQuery($aDBChanges);
-					CMDBSource::Query($sSQL);
-				}
-			}
-
-			$this->DBWriteLinks();
-			$this->WriteExternalAttributes();
-
-			$this->m_bDirty = false;
-			$this->m_aTouchedAtt = array();
-			$this->m_aModifiedAtt = array();
-
-			$this->AfterUpdate();
-
-			// Reload to get the external attributes
-			if ($bHasANewExternalKeyValue)
-			{
-				$this->Reload(true /* AllowAllData */);
-			}
-			else
-			{
-				// Reset original values although the object has not been reloaded
-				foreach ($this->m_aLoadedAtt as $sAttCode => $bLoaded)
-				{
-					if ($bLoaded)
-					{
-						$value = $this->m_aCurrValues[$sAttCode];
-						$this->m_aOrigValues[$sAttCode] = is_object($value) ? clone $value : $value;
-					}
-				}
-			}
-
-			if (count($aChanges) != 0)
-			{
-				$this->RecordAttChanges($aChanges, $aOriginalValues);
-			}
-		}
-		catch (Exception $e)
-		{
-			unset($aUpdateReentrance[$sKey]);
-			throw $e;
-		}
-
-		unset($aUpdateReentrance[$sKey]);
-		return $this->m_iKey;
-	}
-	
-	public function DBUpdateTracked(CMDBChange $oChange)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		return $this->DBUpdate();
-	}
-
-	// Make the current changes persistent - clever wrapper for Insert or Update
-	public function DBWrite()
-	{
-		if ($this->m_bIsInDB)
-		{
-			return $this->DBUpdate();
-		}
-		else
-		{
-			return $this->DBInsert();
-		}
-	}
-
-	private function DBDeleteSingleTable($sTableClass)
-	{
-		$sTable = MetaModel::DBGetTable($sTableClass);
-		// Abstract classes or classes having no specific attribute do not have an associated table
-		if ($sTable == '') return;
-
-		$sPKField = '`'.MetaModel::DBGetKey($sTableClass).'`';
-		$sKey = CMDBSource::Quote($this->m_iKey);
-
-		$sDeleteSQL = "DELETE FROM `$sTable` WHERE $sPKField = $sKey";
-		CMDBSource::DeleteFrom($sDeleteSQL);
-	}
-
-	protected function DBDeleteSingleObject()
-	{
-		if (!MetaModel::DBIsReadOnly())
-		{
-			$this->OnDelete();
-			$this->RecordObjDeletion($this->m_iKey); // May cause a reload for storing history information
-			
-			foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsHierarchicalKey())
-				{
-					// Update the left & right indexes for each hierarchical key
-					$sTable = $sTable = MetaModel::DBGetTable(get_class($this), $sAttCode);
-					$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".CMDBSource::Quote($this->m_iKey);
-					$aRes = CMDBSource::QueryToArray($sSQL);
-					$iMyLeft = $aRes[0]['left'];
-					$iMyRight = $aRes[0]['right'];
-					$iDelta =$iMyRight - $iMyLeft + 1;
-					MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
-
-					// No new parent for now, insert completely at the right of the tree
-					$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
-					$aRes = CMDBSource::QueryToArray($sSQL);
-					if (count($aRes) == 0)
-					{
-						$iNewLeft = 1;
-					}
-					else
-					{
-						$iNewLeft = $aRes[0]['max']+1;
-					}
-					MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
-				}
-				elseif (!$oAttDef->LoadFromDB())
-				{
-					$oAttDef->DeleteValue($this);
-				}
-			}
-
-			foreach(MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL) as $sParentClass)
-			{
-				$this->DBDeleteSingleTable($sParentClass);
-			}
-			
-			$this->AfterDelete();
-
-			$this->m_bIsInDB = false;
-			// Fix for #926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete objects, reported as bug #926)
-			// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
-		}
-	}
-
-	// Delete an object... and guarantee data integrity
-	//
-	public function DBDelete(&$oDeletionPlan = null)
-	{
-		static $iLoopTimeLimit = null;
-		if ($iLoopTimeLimit == null)
-		{
-			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		}
-		if (is_null($oDeletionPlan))
-		{
-			$oDeletionPlan = new DeletionPlan();
-		}
-		$this->MakeDeletionPlan($oDeletionPlan);
-		$oDeletionPlan->ComputeResults();
-
-		if ($oDeletionPlan->FoundStopper())
-		{
-			$aIssues = $oDeletionPlan->GetIssues();
-			throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));	
-		}
-		else
-		{
-			// Getting and setting time limit are not symetric:
-			// www.php.net/manual/fr/function.set-time-limit.php#72305
-			$iPreviousTimeLimit = ini_get('max_execution_time');
-
-			foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete)
-			{
-				foreach ($aToDelete as $iId => $aData)
-				{
-					$oToDelete = $aData['to_delete'];
-					// The deletion based on a deletion plan should not be done for each oject if the deletion plan is common (Trac #457)
-					// because for each object we would try to update all the preceding ones... that are already deleted
-					// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
-					// As a temporary fix: delete only the objects that are still to be deleted...
-					if ($oToDelete->m_bIsInDB)
-					{
-						set_time_limit($iLoopTimeLimit);
-						$oToDelete->DBDeleteSingleObject();
-					}
-				}
-			}
-
-			foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate)
-			{
-				foreach ($aToUpdate as $iId => $aData)
-				{
-					$oToUpdate = $aData['to_reset'];
-					foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
-					{
-						$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-						set_time_limit($iLoopTimeLimit);
-						$oToUpdate->DBUpdate();
-					}
-				}
-			}
-
-			set_time_limit($iPreviousTimeLimit);
-		}
-
-		return $oDeletionPlan;
-	}
-
-	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
-	{
-		CMDBObject::SetCurrentChange($oChange);
-		$this->DBDelete($oDeletionPlan);
-	}
-
-	public function EnumTransitions()
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode)) return array();
-
-		$sState = $this->Get(MetaModel::GetStateAttributeCode(get_class($this)));
-		return MetaModel::EnumTransitions(get_class($this), $sState);
-	}
-
-	/**
-	 * Designed as an action to be called when a stop watch threshold times out
-	 * or from within the framework
-	 * @param $sStimulusCode
-	 * @param bool|false $bDoNotWrite
-	 * @return bool
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 */
-	public function ApplyStimulus($sStimulusCode, $bDoNotWrite = false)
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
-		if (empty($sStateAttCode))
-		{
-			throw new CoreException('No lifecycle for the class '.get_class($this));
-		}
-
-		MyHelpers::CheckKeyInArray('object lifecycle stimulus', $sStimulusCode, MetaModel::EnumStimuli(get_class($this)));
-
-		$aStateTransitions = $this->EnumTransitions();
-		if (!array_key_exists($sStimulusCode, $aStateTransitions))
-		{
-			// This simulus has no effect in the current state... do nothing
-			return true;
-		}
-		$aTransitionDef = $aStateTransitions[$sStimulusCode];
-
-		// Change the state before proceeding to the actions, this is necessary because an action might
-		// trigger another stimuli (alternative: push the stimuli into a queue)
-		$sPreviousState = $this->Get($sStateAttCode);
-		$sNewState = $aTransitionDef['target_state'];
-		$this->Set($sStateAttCode, $sNewState);
-
-		// $aTransitionDef is an
-		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
-
-		$bSuccess = true;
-		foreach ($aTransitionDef['actions'] as $actionHandler)
-		{
-			if (is_string($actionHandler))
-			{
-				// Old (pre-2.1.0 modules) action definition without any parameter
-				$aActionCallSpec = array($this, $actionHandler);
-				$sActionDesc = get_class($this).'::'.$actionHandler;
-	
-				if (!is_callable($aActionCallSpec))
-				{
-					throw new CoreException("Unable to call action: ".get_class($this)."::$actionHandler");
-				}
-				$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
-			}
-			else // if (is_array($actionHandler))
-			{
-				// New syntax: 'verb' and typed parameters
-				$sAction = $actionHandler['verb'];
-				$sActionDesc = get_class($this).'::'.$sAction;
-				$aParams = array();
-				foreach($actionHandler['params'] as $aDefinition)
-				{
-					$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
-					switch($sParamType)
-					{
-						case 'int':
-						$value = (int)$aDefinition['value'];
-						break;
-						
-						case 'float':
-						$value = (float)$aDefinition['value'];
-						break;
-						
-						case 'bool':
-						$value = (bool)$aDefinition['value'];
-						break;
-						
-						case 'reference':
-						$value = ${$aDefinition['value']};
-						break;
-						
-						case 'string':
-						default:
-						$value = (string)$aDefinition['value'];
-					}
-					$aParams[] = $value;
-				}
-				$aCallSpec = array($this, $sAction);
-				$bRet = call_user_func_array($aCallSpec, $aParams);
-			}
-			// if one call fails, the whole is considered as failed
-			// (in case there is no returned value, null is obtained and means "ok")
-			if ($bRet === false)
-			{
-				IssueLog::Info("Lifecycle action $sActionDesc returned false on object #".$this->GetKey());
-				$bSuccess = false;
-			}
-		}
-		if ($bSuccess)
-		{
-			$sClass = get_class($this);
-
-			// Stop watches
-			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef instanceof AttributeStopWatch)
-				{
-					$oSW = $this->Get($sAttCode);
-					if (in_array($sNewState, $oAttDef->GetStates()))
-					{
-						$oSW->Start($this, $oAttDef);
-					}
-					else
-					{
-						$oSW->Stop($this, $oAttDef);
-					}
-					$this->Set($sAttCode, $oSW);
-				}
-			}
-			
-			if (!$bDoNotWrite)
-			{
-				$this->DBWrite();
-			}
-
-			// Change state triggers...
-			$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class IN ('$sClassList') AND t.state='$sPreviousState'"));
-			while ($oTrigger = $oSet->Fetch())
-			{
-				$oTrigger->DoActivate($this->ToArgs('this'));
-			}
-	
-			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN ('$sClassList') AND t.state='$sNewState'"));
-			while ($oTrigger = $oSet->Fetch())
-			{
-				$oTrigger->DoActivate($this->ToArgs('this'));
-			}
-		}
-
-		return $bSuccess;
-	}
-
-	/**
-	* Designed as an action to be called when a stop watch threshold times out
-	*/	
-	public function ResetStopWatch($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if (!$oAttDef instanceof AttributeStopWatch)
-		{
-			throw new CoreException("Invalid stop watch id: '$sAttCode'");
-		}
-		$oSW = $this->Get($sAttCode);
-		$oSW->Reset($this, $oAttDef);
-		$this->Set($sAttCode, $oSW);
-		return true;
-	}
-
-	/**
-	 * Lifecycle action: Recover the default value (aka when an object is being created)
-	 */	 	
-	public function Reset($sAttCode)
-	{
-		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
-		return true;
-	}
-
-	/**
-	 * Lifecycle action: Copy an attribute to another
-	 */	 	
-	public function Copy($sDestAttCode, $sSourceAttCode)
-	{
-		$this->Set($sDestAttCode, $this->Get($sSourceAttCode));
-		return true;
-	}
-
-	/**
-	 * Lifecycle action: Set the current date/time for the given attribute
-	 */	 	
-	public function SetCurrentDate($sAttCode)
-	{
-		$this->Set($sAttCode, time());
-		return true;
-	}
-
-	/**
-	 * Lifecycle action: Set the current logged in user for the given attribute
-	 */	 	
-	public function SetCurrentUser($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if ($oAttDef instanceof AttributeString)
-		{
-			// Note: the user friendly name is the contact friendly name if a contact is attached to the logged in user
-			$this->Set($sAttCode, UserRights::GetUserFriendlyName());
-		}
-		else
-		{
-			if ($oAttDef->IsExternalKey())
-			{
-				if ($oAttDef->GetTargetClass() != 'User')
-				{
-					throw new Exception("SetCurrentUser: the attribute $sAttCode must be an external key to 'User', found '".$oAttDef->GetTargetClass()."'");
-				}
-			}
-			$this->Set($sAttCode, UserRights::GetUserId());
-		}
-		return true;
-	}
-
-	/**
-	 * Lifecycle action: Set the current logged in CONTACT for the given attribute
-	 */	 	
-	public function SetCurrentPerson($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		if ($oAttDef instanceof AttributeString)
-		{
-			$iPerson = UserRights::GetContactId();
-			if ($iPerson == 0)
-			{
-				$this->Set($sAttCode, '');
-			}
-			else
-			{
-				$oPerson = MetaModel::GetObject('Person', $iPerson);
-				$this->Set($sAttCode, $oPerson->Get('friendlyname'));
-			}
-		}
-		else
-		{
-			if ($oAttDef->IsExternalKey())
-			{
-				if (!MetaModel::IsParentClass($oAttDef->GetTargetClass(), 'Person'))
-				{
-					throw new Exception("SetCurrentContact: the attribute $sAttCode must be an external key to 'Person' or any other class above 'Person', found '".$oAttDef->GetTargetClass()."'");
-				}
-			}
-			$this->Set($sAttCode, UserRights::GetContactId());
-		}
-		return true;
-	}
-
-	/**
-	 * Lifecycle action: Set the time elapsed since a reference point
-	 */	 	
-	public function SetElapsedTime($sAttCode, $sRefAttCode, $sWorkingTimeComputer = null)
-	{
-		if (is_null($sWorkingTimeComputer))
-		{
-			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
-		}
-		$oComputer = new $sWorkingTimeComputer();
-		$aCallSpec = array($oComputer, 'GetOpenDuration');
-		if (!is_callable($aCallSpec))
-		{
-			throw new CoreException("Unknown class/verb '$sWorkingTimeComputer/GetOpenDuration'");
-		}
-
-		$iStartTime = AttributeDateTime::GetAsUnixSeconds($this->Get($sRefAttCode));
-		$oStartDate = new DateTime('@'.$iStartTime); // setTimestamp not available in PHP 5.2
-		$oEndDate = new DateTime(); // now
-
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			$sClass = get_class($this);
-			WorkingTimeRecorder::Start($this, time(), "DBObject-SetElapsedTime-$sAttCode-$sRefAttCode", 'Core:ExplainWTC:ElapsedTime', array("Class:$sClass/Attribute:$sAttCode"));
-		}
-		$iElapsed = call_user_func($aCallSpec, $this, $oStartDate, $oEndDate);
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::End();
-		}
-
-		$this->Set($sAttCode, $iElapsed);
-		return true;
-	}
-
-
-
-   	/**
-	 * Create query parameters (SELECT ... WHERE service = :this->service_id)
-	 * to be used with the APIs DBObjectSearch/DBObjectSet
-	 * 		
-	 * Starting 2.0.2 the parameters are computed on demand, at the lowest level,
-	 * in VariableExpression::Render()		
-	 */	
-	public function ToArgsForQuery($sArgName = 'this')
-	{
-		return array($sArgName.'->object()' => $this);
-	}
-
-	/**
- 	 * Create template placeholders: now equivalent to ToArgsForQuery since the actual
-	 * template placeholders are computed on demand.	
-	 */
-	public function ToArgs($sArgName = 'this')
-	{
-		return $this->ToArgsForQuery($sArgName);
-	}
-
-	public function GetForTemplate($sPlaceholderAttCode)
-	{
-		$ret = null;
-		if (preg_match('/^([^-]+)-(>|&gt;)(.+)$/', $sPlaceholderAttCode, $aMatches)) // Support both syntaxes: this->xxx or this-&gt;xxx for HTML compatibility
-		{
-			$sExtKeyAttCode = $aMatches[1];
-			$sRemoteAttCode = $aMatches[3];
-			if (!MetaModel::IsValidAttCode(get_class($this), $sExtKeyAttCode))
-			{
-				throw new CoreException("Unknown attribute '$sExtKeyAttCode' for the class ".get_class($this));
-			}
-			
-			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
-			if (!$oKeyAttDef instanceof AttributeExternalKey)
-			{
-				throw new CoreException("'$sExtKeyAttCode' is not an external key of the class ".get_class($this));
-			}
-			$sRemoteClass = $oKeyAttDef->GetTargetClass();
-			$oRemoteObj = MetaModel::GetObject($sRemoteClass, $this->GetStrict($sExtKeyAttCode), false);
-			if (is_null($oRemoteObj))
-			{
-				$ret = Dict::S('UI:UndefinedObject');
-			}
-			else
-			{
-				// Recurse
-				$ret  = $oRemoteObj->GetForTemplate($sRemoteAttCode);
-			}
-		}
-		else 
-		{
-			switch($sPlaceholderAttCode)
-			{
-				case 'id':
-				$ret = $this->GetKey();
-				break;
-				
-				case 'name()':
-				$ret = $this->GetName();
-				break;
-
-				default:
-				if (preg_match('/^([^(]+)\\((.*)\\)$/', $sPlaceholderAttCode, $aMatches))
-				{
-					$sVerb = $aMatches[1];
-					$sAttCode = $aMatches[2];
-				}
-				else
-				{
-					$sVerb = '';
-					$sAttCode = $sPlaceholderAttCode;
-				}
-
-				if ($sVerb == 'hyperlink')
-				{
-					$sPortalId = ($sAttCode === '') ? 'console' : $sAttCode;
-					if (!array_key_exists($sPortalId, self::$aPortalToURLMaker))
-					{
-						throw new Exception("Unknown portal id '$sPortalId' in placeholder '$sPlaceholderAttCode''");
-					}
-					$ret = $this->GetHyperlink(self::$aPortalToURLMaker[$sPortalId], false);
-				}
-				else
-				{
-					$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-					$ret = $oAttDef->GetForTemplate($this->Get($sAttCode), $sVerb, $this);
-				}
-			}
-			if ($ret === null)
-			{
-				$ret = '';
-			}
-		}
-		return $ret;
-	}
-
-	static protected $aPortalToURLMaker = array('console' => 'iTopStandardURLMaker', 'portal' => 'PortalURLMaker');
-
-	/**
-	 * Associate a portal to a class that implements iDBObjectURLMaker,
-	 * and which will be invoked with placeholders like $this->org_id->hyperlink(portal)$
-	 *
-	 * @param $sPortalId Identifies the portal. Conventions: the main portal is 'console', The user requests portal is 'portal'.
-	 * @param $sUrlMakerClass
-	 */
-	static public function RegisterURLMakerClass($sPortalId, $sUrlMakerClass)
-	{
-		self::$aPortalToURLMaker[$sPortalId] = $sUrlMakerClass;
-	}
-
-	// To be optionaly overloaded
-	protected function OnInsert()
-	{
-	}
-	
-	// To be optionaly overloaded
-	protected function AfterInsert()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function OnUpdate()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function AfterUpdate()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function OnDelete()
-	{
-	}
-
-	// To be optionaly overloaded
-	protected function AfterDelete()
-	{
-	}
-
-
-	/**
-	 * Common to the recording of link set changes (add/remove/modify)	
-	 */	
-	private function PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, $sChangeOpClass, $aOriginalValues = null)
-	{
-		if ($iLinkSetOwnerId <= 0)
-		{
-			return null;
-		}
-
-		if (!is_subclass_of($oLinkSet->GetHostClass(), 'CMDBObject'))
-		{
-			// The link set owner class does not keep track of its history
-			return null;
-		}
-
-		// Determine the linked item class and id
-		//
-		if ($oLinkSet->IsIndirect())
-		{
-			// The "item" is on the other end (N-N links)
-			$sExtKeyToRemote = $oLinkSet->GetExtKeyToRemote();
-			$oExtKeyToRemote = MetaModel::GetAttributeDef(get_class($this), $sExtKeyToRemote);
-			$sItemClass = $oExtKeyToRemote->GetTargetClass();
-			if ($aOriginalValues)
-			{
-				// Get the value from the original values
-				$iItemId = $aOriginalValues[$sExtKeyToRemote];
-			}
-			else
-			{
-				$iItemId = $this->Get($sExtKeyToRemote);
-			}
-		}
-		else
-		{
-			// I am the "item" (1-N links)
-			$sItemClass = get_class($this);
-			$iItemId = $this->GetKey();
-		}
-
-		// Get the remote object, to determine its exact class
-		// Possible optimization: implement a tool in MetaModel, to get the final class of an object (not always querying + query reduced to a select on the root table!
-		$oOwner = MetaModel::GetObject($oLinkSet->GetHostClass(), $iLinkSetOwnerId, false);
-		if ($oOwner)
-		{
-			$sLinkSetOwnerClass = get_class($oOwner);
-			
-			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
-			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
-			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
-			$oMyChangeOp->Set("attcode", $oLinkSet->GetCode());
-			$oMyChangeOp->Set("item_class", $sItemClass);
-			$oMyChangeOp->Set("item_id", $iItemId);
-			return $oMyChangeOp;
-		}
-		else
-		{
-			// Depending on the deletion order, it may happen that the id is already invalid... ignore
-			return null;
-		}
-	}
-
-	/**
-	 *  This object has been created/deleted, record that as a change in link sets pointing to this (if any)
-	 */	
-	private function RecordLinkSetListChange($bAdd = true)
-	{
-		$aForwardChangeTracking = MetaModel::GetTrackForwardExternalKeys(get_class($this));
-		foreach(MetaModel::GetTrackForwardExternalKeys(get_class($this)) as $sExtKeyAttCode => $oLinkSet)
-		{
-			if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
-			
-			$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
-			$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
-			if ($oMyChangeOp)
-			{
-				if ($bAdd)
-				{
-					$oMyChangeOp->Set("type", "added");
-				}
-				else
-				{
-					$oMyChangeOp->Set("type", "removed");
-				}
-				$iId = $oMyChangeOp->DBInsertNoReload();
-			}
-		}
-	}
-
-	protected function RecordObjCreation()
-	{
-		$this->RecordLinkSetListChange(true);
-	}
-
-	protected function RecordObjDeletion($objkey)
-	{
-		$this->RecordLinkSetListChange(false);
-	}
-
-	protected function RecordAttChanges(array $aValues, array $aOrigValues)
-	{
-		$aForwardChangeTracking = MetaModel::GetTrackForwardExternalKeys(get_class($this));
-		foreach(MetaModel::GetTrackForwardExternalKeys(get_class($this)) as $sExtKeyAttCode => $oLinkSet)
-		{
-
-			if (array_key_exists($sExtKeyAttCode, $aValues))
-			{
-				if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
-
-				// Keep track of link added/removed
-				//
-				$iLinkSetOwnerNext = $aValues[$sExtKeyAttCode];
-				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerNext, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
-				if ($oMyChangeOp)
-				{
-					$oMyChangeOp->Set("type", "added");
-					$oMyChangeOp->DBInsertNoReload();
-				}
-
-				$iLinkSetOwnerPrevious = $aOrigValues[$sExtKeyAttCode];
-				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerPrevious, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove', $aOrigValues);
-				if ($oMyChangeOp)
-				{
-					$oMyChangeOp->Set("type", "removed");
-					$oMyChangeOp->DBInsertNoReload();
-				}
-			}
-			else
-			{
-				// Keep track of link changes
-				//
-				if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_DETAILS) == 0) continue;
-				
-				$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
-				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksTune');
-				if ($oMyChangeOp)
-				{
-					$oMyChangeOp->Set("link_id", $this->GetKey());
-					$iId = $oMyChangeOp->DBInsertNoReload();
-				}
-			}
-		}
-	}
-
-	// Return an empty set for the parent of all
-	// May be overloaded.
-	// Anyhow, this way of implementing the relations suffers limitations (not handling the redundancy)
-	// and you should consider defining those things in XML.
-	public static function GetRelationQueries($sRelCode)
-	{
-		return array();
-	}
-	
-	// Reserved: do not overload
-	public static function GetRelationQueriesEx($sRelCode)
-	{
-		return array();
-	}
-
-	/**
-	 * Will be deprecated soon - use GetRelatedObjectsDown/Up instead to take redundancy into account
-	 */
-	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99, &$aResults = array())
-	{
-		// Temporary patch: until the impact analysis GUI gets rewritten,
-		// let's consider that "depends on" is equivalent to "impacts/up"
-		// The current patch has been implemented in DBObject and MetaModel
-		$sHackedRelCode = $sRelCode;
-		$bDown = true;
-		if ($sRelCode == 'depends on')
-		{
-			$sHackedRelCode = 'impacts';
-			$bDown = false;
-		}
-		foreach (MetaModel::EnumRelationQueries(get_class($this), $sHackedRelCode, $bDown) as $sDummy => $aQueryInfo)
-		{
-			$sQuery = $bDown ? $aQueryInfo['sQueryDown'] : $aQueryInfo['sQueryUp'];
-			//$bPropagate = $aQueryInfo["bPropagate"];
-			//$iDepth = $bPropagate ? $iMaxDepth - 1 : 0;
-			$iDepth = $iMaxDepth - 1;
-
-			// Note: the loop over the result set has been written in an unusual way for error reporting purposes
-			// In the case of a wrong query parameter name, the error occurs on the first call to Fetch,
-			// thus we need to have this first call into the try/catch, but
-			// we do NOT want to nest the try/catch for the error message to be clear
-			try
-			{
-				$oFlt = DBObjectSearch::FromOQL($sQuery);
-				$oObjSet = new DBObjectSet($oFlt, array(), $this->ToArgsForQuery());
-				$oObj = $oObjSet->Fetch();
-			}
-			catch (Exception $e)
-			{
-				$sClassOfDefinition = $aQueryInfo['_legacy_'] ? get_class($this).'(or a parent)::GetRelationQueries()' : $aQueryInfo['sDefinedInClass'];
-				throw new Exception("Wrong query for the relation $sRelCode/$sClassOfDefinition/{$aQueryInfo['sNeighbour']}: ".$e->getMessage());
-			}
-			if ($oObj)
-			{
-				do
-				{
-					$sRootClass = MetaModel::GetRootClass(get_class($oObj));
-					$sObjKey = $oObj->GetKey();
-					if (array_key_exists($sRootClass, $aResults))
-					{
-						if (array_key_exists($sObjKey, $aResults[$sRootClass]))
-						{
-							continue; // already visited, skip
-						}
-					}
-	
-					$aResults[$sRootClass][$sObjKey] = $oObj;
-					if ($iDepth > 0)
-					{
-						$oObj->GetRelatedObjects($sRelCode, $iDepth, $aResults);
-					}
-				}
-				while ($oObj = $oObjSet->Fetch());
-			}
-		}
-		return $aResults;
-	}
-	
-	/**
-	 * Compute the "RelatedObjects" (forward or "down" direction) for the object
-	 * for the specified relation
-	 *
-	 * @param string $sRelCode The code of the relation to use for the computation
-	 * @param int $iMaxDepth Maximum recursion depth
-	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
-	 *
-	 * @return RelationGraph The graph of all the related objects
-	 */
-	public function GetRelatedObjectsDown($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
-	{
-		$oGraph = new RelationGraph();
-		$oGraph->AddSourceObject($this);
-		$oGraph->ComputeRelatedObjectsDown($sRelCode, $iMaxDepth, $bEnableRedundancy);
-		return $oGraph;
-	}
-	
-	/**
-	 * Compute the "RelatedObjects" (reverse or "up" direction) for the object
-	 * for the specified relation
-	 *
-	 * @param string $sRelCode The code of the relation to use for the computation
-	 * @param int $iMaxDepth Maximum recursion depth
-	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
-	 *
-	 * @return RelationGraph The graph of all the related objects
-	 */
-	public function GetRelatedObjectsUp($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
-	{
-		$oGraph = new RelationGraph();
-		$oGraph->AddSourceObject($this);
-		$oGraph->ComputeRelatedObjectsUp($sRelCode, $iMaxDepth, $bEnableRedundancy);
-		return $oGraph;
-	}
-	
-	public function GetReferencingObjects($bAllowAllData = false)
-	{
-		$aDependentObjects = array();
-		$aRererencingMe = MetaModel::EnumReferencingClasses(get_class($this));
-		foreach($aRererencingMe as $sRemoteClass => $aExtKeys)
-		{
-			foreach($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef)
-			{
-				// skip if this external key is behind an external field
-				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) continue;
-
-				$oSearch = new DBObjectSearch($sRemoteClass);
-				$oSearch->AddCondition($sExtKeyAttCode, $this->GetKey(), '=');
-				if ($bAllowAllData)
-				{
-					$oSearch->AllowAllData();
-				}
-				$oSet = new CMDBObjectSet($oSearch);
-				if ($oSet->CountExceeds(0))
-				{
-					$aDependentObjects[$sRemoteClass][$sExtKeyAttCode] = array(
-						'attribute' => $oExtKeyAttDef,
-						'objects' => $oSet,
-					);
-				}
-			}
-		}
-		return $aDependentObjects;
-	}
-
-	private function MakeDeletionPlan(&$oDeletionPlan, $aVisited = array(), $iDeleteOption = null)
-	{
-		static $iLoopTimeLimit = null;
-		if ($iLoopTimeLimit == null)
-		{
-			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		}
-		$sClass = get_class($this);
-		$iThisId = $this->GetKey();
-
-		$iDeleteOption = $oDeletionPlan->AddToDelete($this, $iDeleteOption);
-
-		if (array_key_exists($sClass, $aVisited))
-		{
-			if (in_array($iThisId, $aVisited[$sClass]))
-			{
-				return;
-			}
-		}
-		$aVisited[$sClass] = $iThisId;
-
-		if ($iDeleteOption == DEL_MANUAL)
-		{
-			// Stop the recursion here
-			return;
-		}
-		// Check the node itself
-		$this->DoCheckToDelete($oDeletionPlan);
-		$oDeletionPlan->SetDeletionIssues($this, $this->m_aDeleteIssues, $this->m_bSecurityIssue);
-	
-		$aDependentObjects = $this->GetReferencingObjects(true /* allow all data */);
-
-		// Getting and setting time limit are not symetric:
-		// www.php.net/manual/fr/function.set-time-limit.php#72305
-		$iPreviousTimeLimit = ini_get('max_execution_time');
-
-		foreach ($aDependentObjects as $sRemoteClass => $aPotentialDeletes)
-		{
-			foreach ($aPotentialDeletes as $sRemoteExtKey => $aData)
-			{
-				set_time_limit($iLoopTimeLimit);
-
-				$oAttDef = $aData['attribute'];
-				$iDeletePropagationOption = $oAttDef->GetDeletionPropagationOption();
-				$oDepSet = $aData['objects'];
-				$oDepSet->Rewind();
-				while ($oDependentObj = $oDepSet->fetch())
-				{
-					$iId = $oDependentObj->GetKey();
-					if ($oAttDef->IsNullAllowed())
-					{
-						// Optional external key, list to reset
-						if (($iDeletePropagationOption == DEL_MOVEUP) && ($oAttDef->IsHierarchicalKey()))
-						{
-							// Move the child up one level i.e. set the same parent as the current object
-							$iParentId = $this->Get($oAttDef->GetCode());
-							$oDeletionPlan->AddToUpdate($oDependentObj, $oAttDef, $iParentId);
-						}
-						else
-						{
-							$oDeletionPlan->AddToUpdate($oDependentObj, $oAttDef);
-						}
-					}
-					else
-					{
-						// Mandatory external key, list to delete
-						$oDependentObj->MakeDeletionPlan($oDeletionPlan, $aVisited, $iDeletePropagationOption);
-					}
-				}
-			}
-		}
-		set_time_limit($iPreviousTimeLimit);
-	}
-
-	/**
-	 * WILL DEPRECATED SOON
-	 * Caching relying on an object set is not efficient since 2.0.3
-	 * Use GetSynchroData instead
-	 * 	 
-	 * Get all the synchro replica related to this object
-	 * @param none
-	 * @return DBObjectSet Set with two columns: R=SynchroReplica S=SynchroDataSource
-	 */
-	public function GetMasterReplica()
-	{
-		$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
-		$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
-		return $oReplicaSet;
-	}
-
-	/**
-	 * Get all the synchro data related to this object
-	 * @param none
-	 * @return array of data_source_id => array
-	 * 	'source' => $oSource,
-	 * 	'attributes' => array of $oSynchroAttribute
-	 * 	'replica' => array of $oReplica (though only one should exist, misuse of the data sync can have this consequence)
-	 */
-	public function GetSynchroData()
-	{
-		if (is_null($this->m_aSynchroData))
-		{
-			$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
-			$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
-			$this->m_aSynchroData = array();
-			while($aData = $oReplicaSet->FetchAssoc())
-			{
-				$iSourceId = $aData['datasource']->GetKey();
-				if (!array_key_exists($iSourceId, $this->m_aSynchroData))
-				{
-					$aAttributes = array();
-					$oAttrSet = $aData['datasource']->Get('attribute_list');
-					while($oSyncAttr = $oAttrSet->Fetch())
-					{
-						$aAttributes[$oSyncAttr->Get('attcode')] = $oSyncAttr;
-					}
-					$this->m_aSynchroData[$iSourceId] = array(
-						'source' => $aData['datasource'],
-						'attributes' => $aAttributes,
-						'replica' => array()
-					);
-				}
-				// Assumption: $aData['datasource'] will not be null because the data source id is always set...
-				$this->m_aSynchroData[$iSourceId]['replica'][] = $aData['replica'];
-			}
-		}
-		return $this->m_aSynchroData;
-	}
-	
-	public function GetSynchroReplicaFlags($sAttCode, &$aReason)
-	{
-		$iFlags = OPT_ATT_NORMAL;
-		foreach ($this->GetSynchroData() as $iSourceId => $aSourceData)
-		{
-			if ($iSourceId == SynchroExecution::GetCurrentTaskId())
-			{
-				// Ignore the current task (check to write => ok)
-				continue;
-			}
-			// Assumption: one replica - take the first one!
-			$oReplica = reset($aSourceData['replica']);
-			$oSource = $aSourceData['source'];
-			if (array_key_exists($sAttCode, $aSourceData['attributes']))
-			{
-				$oSyncAttr = $aSourceData['attributes'][$sAttCode];
-				if (($oSyncAttr->Get('update') == 1) && ($oSyncAttr->Get('update_policy') == 'master_locked'))
-				{
-					$iFlags |= OPT_ATT_SLAVE;
-					$sUrl = $oSource->GetApplicationUrl($this, $oReplica);
-					$aReason[] = array('name' => $oSource->GetName(), 'description' => $oSource->Get('description'), 'url_application' => $sUrl);
-				}
-			}
-		}
-		return $iFlags;
-	}
-
-	public function InSyncScope()
-	{
-		//
-		// Optimization: cache the list of Data Sources and classes candidates for synchro
-		//
-		static $aSynchroClasses = null;
-		if (is_null($aSynchroClasses))
-		{
-			$aSynchroClasses = array();
-			$sOQL = "SELECT SynchroDataSource AS datasource";
-			$oSourceSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array());
-			while($oSource = $oSourceSet->Fetch())
-			{
-				$sTarget = $oSource->Get('scope_class');
-				$aSynchroClasses[] = $sTarget;
-			}
-		}
-		
-		foreach($aSynchroClasses as $sClass)
-		{
-			if ($this instanceof $sClass)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	/////////////////////////////////////////////////////////////////////////
-	//
-	// Experimental iDisplay implementation
-	//
-	/////////////////////////////////////////////////////////////////////////
-	
-	public static function MapContextParam($sContextParam)
-	{
-		return null;
-	}
-	
-	public function GetHilightClass()
-	{
-		$sCode = $this->ComputeHighlightCode();
-		if($sCode != '')
-		{
-			$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
-			if (array_key_exists($sCode, $aHighlightScale))
-			{
-				return $aHighlightScale[$sCode]['color'];
-			}
-		}
-		return HILIGHT_CLASS_NONE;
-	}
-
-	public function DisplayDetails(WebPage $oPage, $bEditMode = false)
-	{
-		$oPage->add('<h1>'.MetaModel::GetName(get_class($this)).': '.$this->GetName().'</h1>');
-		$aValues = array();
-		$aList = MetaModel::FlattenZList(MetaModel::GetZListItems(get_class($this), 'details'));
-		if (empty($aList))
-		{
-			$aList = array_keys(MetaModel::ListAttributeDefs(get_class($this)));
-		}
-		foreach($aList as $sAttCode)
-		{
-			$aValues[$sAttCode] = array('label' => MetaModel::GetLabel(get_class($this), $sAttCode), 'value' => $this->GetAsHTML($sAttCode));
-		}
-		$oPage->details($aValues);
-	}
-
-
-	const CALLBACK_AFTERINSERT = 0;
-
-	/**
-	 * Register a call back that will be called when some internal event happens
-	 *	 
-	 * @param $iType string Any of the CALLBACK_x constants
-	 * @param $callback callable Call specification like a function name, or array('<class>', '<method>') or array($object, '<method>')
-	 * @param $aParameters Array Values that will be passed to the callback, after $this
-	 */	 	
-	public function RegisterCallback($iType, $callback, $aParameters = array())
-	{
-		$sCallBackName = '';
-		if (!is_callable($callback, false, $sCallBackName))
-		{
-			throw new Exception('Registering an unknown/protected function or wrong syntax for the call spec: '.$sCallBackName);
-		}
-		$this->m_aCallbacks[$iType][] = array(
-			'callback' => $callback,
-			'params' => $aParameters
-		);
-	}
-
-	/**
-	 * Computes a text-like fingerprint identifying the content of the object
-	 * but excluding the specified columns
-	 * @param $aExcludedColumns array The list of columns to exclude
-	 * @return string
-	 */
-	public function Fingerprint($aExcludedColumns = array())
-	{
-		$sFingerprint = '';
-		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-		{
-			if (!in_array($sAttCode, $aExcludedColumns))
-			{
-				if ($oAttDef->IsPartOfFingerprint())
-				{
-					$sFingerprint .= chr(0).$oAttDef->Fingerprint($this->Get($sAttCode));
-				}
-			}
-		}
-		return $sFingerprint;
-	}
-
-	/**
-	 * Execute a set of scripted actions onto the current object
-	 * See ExecAction for the syntax and features of the scripted actions
-	 *
-	 * @param $aActions array of statements (e.g. "set(name, Made after $source->name$)")
-	 * @param $aSourceObjects Array of Alias => Context objects (Convention: some statements require the 'source' element
-	 * @throws Exception
-	 */
-	public function ExecActions($aActions, $aSourceObjects)
-	{
-		foreach($aActions as $sAction)
-		{
-			try
-			{
-				if (preg_match('/^(\S*)\s*\((.*)\)$/ms', $sAction, $aMatches)) // multiline and newline matched by a dot
-				{
-					$sVerb = trim($aMatches[1]);
-					$sParams = $aMatches[2];
-
-					// the coma is the separator for the parameters
-					// comas can be escaped: \,
-					$sParams = str_replace(array("\\\\", "\\,"), array("__backslash__", "__coma__"), $sParams);
-					$sParams = trim($sParams);
-
-					if (strlen($sParams) == 0)
-					{
-						$aParams = array();
-					}
-					else
-					{
-						$aParams = explode(',', $sParams);
-						foreach ($aParams as &$sParam)
-						{
-							$sParam = str_replace(array("__backslash__", "__coma__"), array("\\", ","), $sParam);
-							$sParam = trim($sParam);
-						}
-					}
-					$this->ExecAction($sVerb, $aParams, $aSourceObjects);
-				}
-				else
-				{
-					throw new Exception("Invalid syntax");
-				}
-			}
-			catch(Exception $e)
-			{
-				throw new Exception('Action: '.$sAction.' - '.$e->getMessage());
-			}
-		}
-	}
-
-	/**
-	 * Helper to copy an attribute between two objects (in memory)
-	 * Originally designed for ExecAction()
-	 */
-	public function CopyAttribute($oSourceObject, $sSourceAttCode, $sDestAttCode)
-	{
-		if ($sSourceAttCode == 'id')
-		{
-			$oSourceAttDef = null;
-		}
-		else
-		{
-			if (!MetaModel::IsValidAttCode(get_class($this), $sDestAttCode))
-			{
-				throw new Exception("Unknown attribute ".get_class($this)."::".$sDestAttCode);
-			}
-			if (!MetaModel::IsValidAttCode(get_class($oSourceObject), $sSourceAttCode))
-			{
-				throw new Exception("Unknown attribute ".get_class($oSourceObject)."::".$sSourceAttCode);
-			}
-
-			$oSourceAttDef = MetaModel::GetAttributeDef(get_class($oSourceObject), $sSourceAttCode);
-		}
-		if (is_object($oSourceAttDef) && $oSourceAttDef->IsLinkSet())
-		{
-			// The copy requires that we create a new object set (the semantic of DBObject::Set is unclear about link sets)
-			$oDestSet = DBObjectSet::FromScratch($oSourceAttDef->GetLinkedClass());
-			$oSourceSet = $oSourceObject->Get($sSourceAttCode);
-			$oSourceSet->Rewind();
-			while ($oSourceLink = $oSourceSet->Fetch())
-			{
-				// Clone the link
-				$sLinkClass = get_class($oSourceLink);
-				$oLinkClone = MetaModel::NewObject($sLinkClass);
-				foreach(MetaModel::ListAttributeDefs($sLinkClass) as $sAttCode => $oAttDef)
-				{
-					// As of now, ignore other attribute (do not attempt to recurse!)
-					if ($oAttDef->IsScalar())
-					{
-						$oLinkClone->Set($sAttCode, $oSourceLink->Get($sAttCode));
-					}
-				}
-
-				// Not necessary - this will be handled by DBObject
-				// $oLinkClone->Set($oSourceAttDef->GetExtKeyToMe(), 0);
-				$oDestSet->AddObject($oLinkClone);
-			}
-			$this->Set($sDestAttCode, $oDestSet);
-		}
-		else
-		{
-			$this->Set($sDestAttCode, $oSourceObject->Get($sSourceAttCode));
-		}
-	}
-
-	/**
-	 * Execute a scripted action onto the current object
-	 *    - clone (att1, att2, att3, ...)
-	 *    - clone_scalars ()
-	 *    - copy (source_att, dest_att)
-	 *    - reset (att)
-	 *    - nullify (att)
-	 *    - set (att, value (placeholders $source->att$ or $current_date$, or $current_contact_id$, ...))
-	 *    - append (att, value (placeholders $source->att$ or $current_date$, or $current_contact_id$, ...))
-	 *    - add_to_list (source_key_att, dest_att)
-	 *    - add_to_list (source_key_att, dest_att, lnk_att, lnk_att_value)
-	 *    - apply_stimulus (stimulus)
-	 *    - call_method (method_name)
-	 *
-	 * @param $sVerb string Any of the verb listed above (e.g. "set")
-	 * @param $aParams array of strings (e.g. array('name', 'copied from $source->name$')
-	 * @param $aSourceObjects Array of Alias => Context objects (Convention: some statements require the 'source' element
-	 * @throws CoreException
-	 * @throws CoreUnexpectedValue
-	 * @throws Exception
-	 */
-	public function ExecAction($sVerb, $aParams, $aSourceObjects)
-	{
-		switch($sVerb)
-		{
-			case 'clone':
-				if (!array_key_exists('source', $aSourceObjects))
-				{
-					throw new Exception('Missing conventional "source" object');
-				}
-				$oObjectToRead = $aSourceObjects['source'];
-				foreach($aParams as $sAttCode)
-				{
-					$this->CopyAttribute($oObjectToRead, $sAttCode, $sAttCode);
-				}
-				break;
-
-			case 'clone_scalars':
-				if (!array_key_exists('source', $aSourceObjects))
-				{
-					throw new Exception('Missing conventional "source" object');
-				}
-				$oObjectToRead = $aSourceObjects['source'];
-				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
-				{
-					if ($oAttDef->IsScalar())
-					{
-						$this->CopyAttribute($oObjectToRead, $sAttCode, $sAttCode);
-					}
-				}
-				break;
-
-			case 'copy':
-				if (!array_key_exists('source', $aSourceObjects))
-				{
-					throw new Exception('Missing conventional "source" object');
-				}
-				$oObjectToRead = $aSourceObjects['source'];
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: source attribute');
-				}
-				$sSourceAttCode = $aParams[0];
-				if (!array_key_exists(1, $aParams))
-				{
-					throw new Exception('Missing argument #2: target attribute');
-				}
-				$sDestAttCode = $aParams[1];
-				$this->CopyAttribute($oObjectToRead, $sSourceAttCode, $sDestAttCode);
-				break;
-
-			case 'reset':
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: target attribute');
-				}
-				$sAttCode = $aParams[0];
-				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
-				{
-					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
-				}
-				$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
-				break;
-
-			case 'nullify':
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: target attribute');
-				}
-				$sAttCode = $aParams[0];
-				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
-				{
-					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
-				}
-				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-				$this->Set($sAttCode, $oAttDef->GetNullValue());
-				break;
-
-			case 'set':
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: target attribute');
-				}
-				$sAttCode = $aParams[0];
-				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
-				{
-					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
-				}
-				if (!array_key_exists(1, $aParams))
-				{
-					throw new Exception('Missing argument #2: value to set');
-				}
-				$sRawValue = $aParams[1];
-				$aContext = array();
-				foreach ($aSourceObjects as $sAlias => $oObject)
-				{
-					$aContext = array_merge($aContext, $oObject->ToArgs($sAlias));
-				}
-				$aContext['current_contact_id'] = UserRights::GetContactId();
-				$aContext['current_contact_friendlyname'] = UserRights::GetUserFriendlyName();
-				$aContext['current_date'] = date(AttributeDate::GetSQLFormat());
-				$aContext['current_time'] = date(AttributeDateTime::GetSQLTimeFormat());
-				$sValue = MetaModel::ApplyParams($sRawValue, $aContext);
-				$this->Set($sAttCode, $sValue);
-				break;
-
-			case 'append':
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: target attribute');
-				}
-				$sAttCode = $aParams[0];
-				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
-				{
-					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
-				}
-				if (!array_key_exists(1, $aParams))
-				{
-					throw new Exception('Missing argument #2: value to append');
-				}
-				$sRawAddendum = $aParams[1];
-				$aContext = array();
-				foreach ($aSourceObjects as $sAlias => $oObject)
-				{
-					$aContext = array_merge($aContext, $oObject->ToArgs($sAlias));
-				}
-				$aContext['current_contact_id'] = UserRights::GetContactId();
-				$aContext['current_contact_friendlyname'] = UserRights::GetUserFriendlyName();
-				$aContext['current_date'] = date(AttributeDate::GetSQLFormat());
-				$aContext['current_time'] = date(AttributeDateTime::GetSQLTimeFormat());
-				$sAddendum = MetaModel::ApplyParams($sRawAddendum, $aContext);
-				$this->Set($sAttCode, $this->Get($sAttCode).$sAddendum);
-				break;
-
-			case 'add_to_list':
-				if (!array_key_exists('source', $aSourceObjects))
-				{
-					throw new Exception('Missing conventional "source" object');
-				}
-				$oObjectToRead = $aSourceObjects['source'];
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: source attribute');
-				}
-				$sSourceKeyAttCode = $aParams[0];
-				if (($sSourceKeyAttCode != 'id') && !MetaModel::IsValidAttCode(get_class($oObjectToRead), $sSourceKeyAttCode))
-				{
-					throw new Exception("Unknown attribute ".get_class($oObjectToRead)."::".$sSourceKeyAttCode);
-				}
-				if (!array_key_exists(1, $aParams))
-				{
-					throw new Exception('Missing argument #2: target attribute (link set)');
-				}
-				$sTargetListAttCode = $aParams[1]; // indirect !!!
-				if (!MetaModel::IsValidAttCode(get_class($this), $sTargetListAttCode))
-				{
-					throw new Exception("Unknown attribute ".get_class($this)."::".$sTargetListAttCode);
-				}
-				if (isset($aParams[2]) && isset($aParams[3]))
-				{
-					$sRoleAttCode = $aParams[2];
-					$sRoleValue = $aParams[3];
-				}
-
-				$iObjKey = $oObjectToRead->Get($sSourceKeyAttCode);
-				if ($iObjKey > 0)
-				{
-					$oLinkSet = $this->Get($sTargetListAttCode);
-
-					$oListAttDef = MetaModel::GetAttributeDef(get_class($this), $sTargetListAttCode);
-					$oLnk = MetaModel::NewObject($oListAttDef->GetLinkedClass());
-					$oLnk->Set($oListAttDef->GetExtKeyToRemote(), $iObjKey);
-					if (isset($sRoleAttCode))
-					{
-						if (!MetaModel::IsValidAttCode(get_class($oLnk), $sRoleAttCode))
-						{
-							throw new Exception("Unknown attribute ".get_class($oLnk)."::".$sRoleAttCode);
-						}
-						$oLnk->Set($sRoleAttCode, $sRoleValue);
-					}
-					$oLinkSet->AddObject($oLnk);
-					$this->Set($sTargetListAttCode, $oLinkSet);
-				}
-				break;
-
-			case 'apply_stimulus':
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: stimulus');
-				}
-				$sStimulus = $aParams[0];
-				if (!in_array($sStimulus, MetaModel::EnumStimuli(get_class($this))))
-				{
-					throw new Exception("Unknown stimulus ".get_class($this)."::".$sStimulus);
-				}
-				$this->ApplyStimulus($sStimulus);
-				break;
-
-			case 'call_method':
-				if (!array_key_exists('source', $aSourceObjects))
-				{
-					throw new Exception('Missing conventional "source" object');
-				}
-				$oObjectToRead = $aSourceObjects['source'];
-				if (!array_key_exists(0, $aParams))
-				{
-					throw new Exception('Missing argument #1: method name');
-				}
-				$sMethod = $aParams[0];
-				$aCallSpec = array($this, $sMethod);
-				if (!is_callable($aCallSpec))
-				{
-					throw new Exception("Unknown method ".get_class($this)."::".$sMethod.'()');
-				}
-				// Note: $oObjectToRead has been preserved when adding $aSourceObjects, so as to remain backward compatible with methods having only 1 parameter ($oObjectToRead�
-				call_user_func($aCallSpec, $oObjectToRead, $aSourceObjects);
-				break;
-
-			default:
-				throw new Exception("Invalid verb");
-		}
-	}
-
-	public function IsArchived($sKeyAttCode = null)
-	{
-		$bRet = false;
-		$sFlagAttCode = is_null($sKeyAttCode) ? 'archive_flag' : $sKeyAttCode.'_archive_flag';
-		if (MetaModel::IsValidAttCode(get_class($this), $sFlagAttCode) && $this->Get($sFlagAttCode))
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-
-	public function IsObsolete($sKeyAttCode = null)
-	{
-		$bRet = false;
-		$sFlagAttCode = is_null($sKeyAttCode) ? 'obsolescence_flag' : $sKeyAttCode.'_obsolescence_flag';
-		if (MetaModel::IsValidAttCode(get_class($this), $sFlagAttCode) && $this->Get($sFlagAttCode))
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-
-	/**
-	 * @param $bArchive
-	 * @throws Exception
-	 */
-	protected function DBWriteArchiveFlag($bArchive)
-	{
-		if (!MetaModel::IsArchivable(get_class($this)))
-		{
-			throw new Exception(get_class($this).' is not an archivable class');
-		}
-
-		$iFlag = $bArchive ? 1 : 0;
-		$sDate = $bArchive ? '"'.date(AttributeDate::GetSQLFormat()).'"' : 'null';
-
-		$sClass = get_class($this);
-		$sArchiveRoot = MetaModel::GetAttributeOrigin($sClass, 'archive_flag');
-		$sRootTable = MetaModel::DBGetTable($sArchiveRoot);
-		$sRootKey = MetaModel::DBGetKey($sArchiveRoot);
-		$aJoins = array("`$sRootTable`");
-		$aUpdates = array();
-		foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL) as $sParentClass)
-		{
-			if (!MetaModel::IsValidAttCode($sParentClass, 'archive_flag')) continue;
-
-			$sTable = MetaModel::DBGetTable($sParentClass);
-			$aUpdates[] = "`$sTable`.`archive_flag` = $iFlag";
-			if ($sParentClass == $sArchiveRoot)
-			{
-				if (!$bArchive || $this->Get('archive_date') == '')
-				{
-					// Erase or set the date (do not change it)
-					$aUpdates[] = "`$sTable`.`archive_date` = $sDate";
-				}
-			}
-			else
-			{
-				$sKey = MetaModel::DBGetKey($sParentClass);
-				$aJoins[] = "`$sTable` ON `$sTable`.`$sKey` = `$sRootTable`.`$sRootKey`";
-			}
-		}
-		$sJoins = implode(' INNER JOIN ', $aJoins);
-		$sValues = implode(', ', $aUpdates);
-		$sUpdateQuery = "UPDATE $sJoins SET $sValues WHERE `$sRootTable`.`$sRootKey` = ".$this->GetKey();
-		CMDBSource::Query($sUpdateQuery);
-	}
-
-	/**
-	 * Can be called to repair the database (tables consistency)
-	 * The archive_date will be preserved
-	 * @throws Exception
-	 */
-	public function DBArchive()
-	{
-		$this->DBWriteArchiveFlag(true);
-		$this->m_aCurrValues['archive_flag'] = true;
-		$this->m_aOrigValues['archive_flag'] = true;
-	}
-
-	public function DBUnarchive()
-	{
-		$this->DBWriteArchiveFlag(false);
-		$this->m_aCurrValues['archive_flag'] = false;
-		$this->m_aOrigValues['archive_flag'] = false;
-		$this->m_aCurrValues['archive_date'] = null;
-		$this->m_aOrigValues['archive_date'] = null;
-	}
-
-
-
-	/**
-	 * @param string $sClass Needs to be an instanciable class
-	 * @returns $oObj
-	 **/
-	public static function MakeDefaultInstance($sClass)
-	{
-		$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-		$oObj = MetaModel::NewObject($sClass);
-		if (!empty($sStateAttCode))
-		{
-			$sTargetState = MetaModel::GetDefaultState($sClass);
-			$oObj->Set($sStateAttCode, $sTargetState);
-		}
-		return $oObj;
-	}
-
-	/**
-	 * Complete a new object with data from context
-	 * @param array $aContextParam Context used for creation form prefilling
-	 *
-	 */
-	public function PrefillCreationForm(&$aContextParam)
-	{
-	}
-
-	/**
-	 * Complete an object after a state transition with data from context
-	 * @param array $aContextParam Context used for creation form prefilling
-	 *
-	 */
-	public function PrefillTransitionForm(&$aContextParam)
-	{
-	}
-
-	/**
-	 * Complete a filter ($aContextParam['filter']) data from context
-	 * (Called on source object)
-	 * @param array $aContextParam Context used for creation form prefilling
-	 *
-	 */
-	public function PrefillSearchForm(&$aContextParam)
-	{
-	}
-
-	/**
-	 * Prefill a creation / stimulus change / search form according to context, current state of an object, stimulus.. $sOperation
-	 * @param string $sOperation Operation identifier
-	 * @param array $aContextParam Context used for creation form prefilling
-	 *
-	 */
-	public function PrefillForm($sOperation, &$aContextParam)
-	{
-		switch($sOperation){
-			case 'creation_from_0':
-			case 'creation_from_extkey':
-			case 'creation_from_editinplace':
-				$this->PrefillCreationForm($aContextParam);
-				break;
-			case 'state_change':
-				$this->PrefillTransitionForm($aContextParam);
-				break;
-			case 'search':
-				$this->PrefillSearchForm($aContextParam);
-				break;
-			default:
-				break;
-		}
-	}
-}
-
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * All objects to be displayed in the application (either as a list or as details)
+ * must implement this interface.
+ */
+interface iDisplay
+{
+
+	/**
+	 * Maps the given context parameter name to the appropriate filter/search code for this class
+	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
+	 * @return string Filter code, i.e. 'customer_id'
+	 */
+	public static function MapContextParam($sContextParam);
+	/**
+	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
+	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
+	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+	 * To Be overridden by derived classes
+	 * @param void
+	 * @return String The desired higlight class for the object/row
+	 */
+	public function GetHilightClass();
+	/**
+	 * Returns the relative path to the page that handles the display of the object
+	 * @return string
+	 */
+	public static function GetUIPage();
+	/**
+	 * Displays the details of the object
+	 */
+	public function DisplayDetails(WebPage $oPage, $bEditMode = false);
+}
+
+/**
+ * Class dbObject: the root of persistent classes
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('metamodel.class.php');
+require_once('deletionplan.class.inc.php');
+require_once('mutex.class.inc.php');
+
+
+/**
+ * A persistent object, as defined by the metamodel 
+ *
+ * @package     iTopORM
+ */
+abstract class DBObject implements iDisplay
+{
+	private static $m_aMemoryObjectsByClass = array();
+
+  	private static $m_aBulkInsertItems = array(); // class => array of ('table' => array of (array of <sql_value>))
+  	private static $m_aBulkInsertCols = array(); // class => array of ('table' => array of <sql_column>)
+  	private static $m_bBulkInsert = false;
+
+	protected $m_bIsInDB = false; // true IIF the object is mapped to a DB record
+	protected $m_iKey = null;
+	private $m_aCurrValues = array();
+	protected $m_aOrigValues = array();
+
+	protected $m_aExtendedData = null;
+
+	private $m_bDirty = false; // Means: "a modification is ongoing"
+										// The object may have incorrect external keys, then any attempt of reload must be avoided
+	private $m_bCheckStatus = null; // Means: the object has been verified and is consistent with integrity rules
+													//        if null, then the check has to be performed again to know the status
+	protected $m_bSecurityIssue = null;
+	protected $m_aCheckIssues = null;
+	protected $m_aDeleteIssues = null;
+
+	private $m_bFullyLoaded = false; // Compound objects can be partially loaded
+	private $m_aLoadedAtt = array(); // Compound objects can be partially loaded, array of sAttCode
+	protected $m_aTouchedAtt = array(); // list of (potentially) modified sAttCodes
+	protected $m_aModifiedAtt = array(); // real modification status: for each attCode can be: unset => don't know, true => modified, false => not modified (the same value as the original value was set)
+	protected $m_aSynchroData = null; // Set of Synch data related to this object
+	protected $m_sHighlightCode = null;
+	protected $m_aCallbacks = array();
+
+	// Use the MetaModel::NewObject to build an object (do we have to force it?)
+	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
+	{
+		if (!empty($aRow))
+		{
+			$this->FromRow($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
+			$this->m_bFullyLoaded = $this->IsFullyLoaded();
+			$this->m_aTouchedAtt = array();
+			$this->m_aModifiedAtt = array();
+			return;
+		}
+		// Creation of a brand new object
+		//
+
+		$this->m_iKey = self::GetNextTempId(get_class($this));
+
+		// set default values
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
+		{
+			$this->m_aCurrValues[$sAttCode] = $this->GetDefaultValue($sAttCode);
+			$this->m_aOrigValues[$sAttCode] = null;
+			if ($oAttDef->IsExternalField() || ($oAttDef instanceof AttributeFriendlyName))
+			{
+				// This field has to be read from the DB
+				// Leave the flag unset (optimization) 
+			}
+			else
+			{
+				// No need to trigger a reload for that attribute
+				// Let's consider it as being already fully loaded
+				$this->m_aLoadedAtt[$sAttCode] = true;
+			}
+		}
+	}
+
+	// Read-only <=> Written once (archive)
+	public function RegisterAsDirty()
+	{
+		// While the object may be written to the DB, it is NOT possible to reload it
+		// or at least not possible to reload it the same way
+		$this->m_bDirty = true;	
+	}
+
+	public function IsNew()
+	{
+		return (!$this->m_bIsInDB);
+	}
+
+	// Returns an Id for memory objects
+	static protected function GetNextTempId($sClass)
+	{
+		$sRootClass = MetaModel::GetRootClass($sClass);
+		if (!array_key_exists($sRootClass, self::$m_aMemoryObjectsByClass))
+		{
+			self::$m_aMemoryObjectsByClass[$sRootClass] = 0;
+		}
+		self::$m_aMemoryObjectsByClass[$sRootClass]++;
+		return (- self::$m_aMemoryObjectsByClass[$sRootClass]);
+	}
+
+	public function __toString()
+	{
+        $sRet = '';
+        $sClass = get_class($this);
+        $sRootClass = MetaModel::GetRootClass($sClass);
+        $iPKey = $this->GetKey();
+        $sFriendlyname = $this->Get('friendlyname');
+        $sRet .= "<b title=\"$sRootClass\">$sClass</b>::$iPKey ($sFriendlyname)<br/>\n";
+        return $sRet;
+	}
+	
+	// Restore initial values... mmmm, to be discussed
+	public function DBRevert()
+	{
+		$this->Reload();
+	}
+
+	protected function IsFullyLoaded()
+	{
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
+		{
+			if (!$oAttDef->LoadInObject()) continue;
+			if (!isset($this->m_aLoadedAtt[$sAttCode]) || !$this->m_aLoadedAtt[$sAttCode])
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @param bool $bAllowAllData DEPRECATED: the reload must never fail!
+	 * @throws CoreException
+	 */
+	public function Reload($bAllowAllData = false)
+	{
+		assert($this->m_bIsInDB);
+		$aRow = MetaModel::MakeSingleRow(get_class($this), $this->m_iKey, false /* must be found */, true /* AllowAllData */);
+		if (empty($aRow))
+		{
+			throw new CoreException("Failed to reload object of class '".get_class($this)."', id = ".$this->m_iKey);
+		}
+		$this->FromRow($aRow);
+
+		// Process linked set attributes
+		//
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode=>$oAttDef)
+		{
+			if (!$oAttDef->IsLinkSet()) continue;
+
+			$this->m_aCurrValues[$sAttCode] = $oAttDef->GetDefaultValue($this);
+			$this->m_aOrigValues[$sAttCode] = clone $this->m_aCurrValues[$sAttCode];
+			$this->m_aLoadedAtt[$sAttCode] = true;
+		}
+
+		$this->m_bFullyLoaded = true;
+		$this->m_aTouchedAtt = array();
+		$this->m_aModifiedAtt = array();
+	}
+
+	protected function FromRow($aRow, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
+	{
+		if (strlen($sClassAlias) == 0)
+		{
+			// Default to the current class
+			$sClassAlias = get_class($this);
+		}
+
+		$this->m_iKey = null;
+		$this->m_bIsInDB = true;
+		$this->m_aCurrValues = array();
+		$this->m_aOrigValues = array();
+		$this->m_aLoadedAtt = array();
+		$this->m_bCheckStatus = true;
+
+		// Get the key
+		//
+		$sKeyField = $sClassAlias."id";
+		if (!array_key_exists($sKeyField, $aRow))
+		{
+			// #@# Bug ?
+			throw new CoreException("Missing key for class '".get_class($this)."'");
+		}
+
+		$iPKey = $aRow[$sKeyField];
+		if (!self::IsValidPKey($iPKey))
+		{
+			if (is_null($iPKey))
+			{
+				throw new CoreException("Missing object id in query result (found null)");
+			}
+			else
+			{
+				throw new CoreException("An object id must be an integer value ($iPKey)");
+			}
+		}
+		$this->m_iKey = $iPKey;
+
+		// Build the object from an array of "attCode"=>"value")
+		//
+		$bFullyLoaded = true; // ... set to false if any attribute is not found
+		if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
+		{
+			$aAttList = MetaModel::ListAttributeDefs(get_class($this));
+		}
+		else
+		{
+			$aAttList = $aAttToLoad[$sClassAlias];
+		}
+		
+		foreach($aAttList as $sAttCode=>$oAttDef)
+		{
+			// Skip links (could not be loaded by the mean of this query)
+			if ($oAttDef->IsLinkSet()) continue;
+
+			if (!$oAttDef->LoadInObject()) continue;
+
+			unset($value);
+			$bIsDefined = false;
+			if ($oAttDef->LoadFromDB())
+			{
+				// Note: we assume that, for a given attribute, if it can be loaded,
+				// then one column will be found with an empty suffix, the others have a suffix
+				// Take care: the function isset will return false in case the value is null,
+				// which is something that could happen on open joins
+				$sAttRef = $sClassAlias.$sAttCode;
+
+				if (array_key_exists($sAttRef, $aRow))
+				{
+					$value = $oAttDef->FromSQLToValue($aRow, $sAttRef);
+					$bIsDefined = true;
+				}
+			}
+			else
+			{
+				$value = $oAttDef->ReadValue($this);
+				$bIsDefined = true;
+			}
+
+			if ($bIsDefined)
+			{
+				$this->m_aCurrValues[$sAttCode] = $value;
+				if (is_object($value))
+				{
+					$this->m_aOrigValues[$sAttCode] = clone $value;
+				}
+				else
+				{
+					$this->m_aOrigValues[$sAttCode] = $value;
+				}
+				$this->m_aLoadedAtt[$sAttCode] = true;
+			}
+			else
+			{
+				// This attribute was expected and not found in the query columns
+				$bFullyLoaded = false;
+			}
+		}
+		
+		// Load extended data
+		if ($aExtendedDataSpec != null)
+		{
+			$aExtendedDataSpec['table'];
+			foreach($aExtendedDataSpec['fields'] as $sColumn)
+			{
+				$sColRef = $sClassAlias.'_extdata_'.$sColumn;
+				if (array_key_exists($sColRef, $aRow))
+				{
+					$this->m_aExtendedData[$sColumn] = $aRow[$sColRef];
+				}
+			}
+		}
+		return $bFullyLoaded;
+	}
+
+	protected function _Set($sAttCode, $value)
+	{
+		$this->m_aCurrValues[$sAttCode] = $value;
+		$this->m_aTouchedAtt[$sAttCode] = true;
+		unset($this->m_aModifiedAtt[$sAttCode]);
+	}
+
+	public function Set($sAttCode, $value)
+	{
+		if ($sAttCode == 'finalclass')
+		{
+			// Ignore it - this attribute is set upon object creation and that's it
+			return false;
+		}
+
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+
+		if (!$oAttDef->IsWritable())
+		{
+			$sClass = get_class($this);
+			throw new Exception("Attempting to set the value on the read-only attribute $sClass::$sAttCode");
+		}
+
+		if ($this->m_bIsInDB && !$this->m_bFullyLoaded && !$this->m_bDirty)
+		{
+			// First time Set is called... ensure that the object gets fully loaded
+			// Otherwise we would lose the values on a further Reload
+			//           + consistency does not make sense !
+			$this->Reload();
+		}
+
+		if ($oAttDef->IsExternalKey())
+		{
+			if (is_object($value))
+			{
+				// Setting an external key with a whole object (instead of just an ID)
+				// let's initialize also the external fields that depend on it
+				// (useful when building objects in memory and not from a query)
+				if ( (get_class($value) != $oAttDef->GetTargetClass()) && (!is_subclass_of($value, $oAttDef->GetTargetClass())))
+				{
+					throw new CoreUnexpectedValue("Trying to set the value of '$sAttCode', to an object of class '".get_class($value)."', whereas it's an ExtKey to '".$oAttDef->GetTargetClass()."'. Ignored");
+				}
+
+				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
+				{
+					if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sAttCode))
+					{
+						$this->m_aCurrValues[$sCode] = $value->Get($oDef->GetExtAttCode());
+						$this->m_aLoadedAtt[$sCode] = true;
+					}
+				}
+			}
+			else if ($this->m_aCurrValues[$sAttCode] != $value)
+			{
+				// Setting an external key, but no any other information is available...
+				// Invalidate the corresponding fields so that they get reloaded in case they are needed (See Get())
+				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
+				{
+					if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sAttCode))
+					{
+						$this->m_aCurrValues[$sCode] = $this->GetDefaultValue($sCode);
+						unset($this->m_aLoadedAtt[$sCode]);
+					}
+				}
+			}
+		}
+		if ($oAttDef->IsLinkSet() && ($value != null))
+		{
+			$realvalue = clone $this->m_aCurrValues[$sAttCode];
+			$realvalue->UpdateFromCompleteList($value);
+		}
+		else
+		{
+			$realvalue = $oAttDef->MakeRealValue($value, $this);
+		}
+		$this->_Set($sAttCode, $realvalue);
+
+		foreach (MetaModel::ListMetaAttributes(get_class($this), $sAttCode) as $sMetaAttCode => $oMetaAttDef)
+		{
+			$this->_Set($sMetaAttCode, $oMetaAttDef->MapValue($this));
+		}
+
+		// The object has changed, reset caches
+		$this->m_bCheckStatus = null;
+
+		// Make sure we do not reload it anymore... before saving it
+		$this->RegisterAsDirty();
+
+		// This function is eligible as a lifecycle action: returning true upon success is a must
+		return true;
+	}
+
+	public function SetTrim($sAttCode, $sValue)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		$iMaxSize = $oAttDef->GetMaxSize();
+		if ($iMaxSize && (strlen($sValue) > $iMaxSize))
+		{
+			$sValue = substr($sValue, 0, $iMaxSize);
+		}
+		$this->Set($sAttCode, $sValue);
+	}
+
+	public function GetLabel($sAttCode)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		return $oAttDef->GetLabel();
+	}
+
+	public function Get($sAttCode)
+	{
+		if (($iPos = strpos($sAttCode, '->')) === false)
+		{
+			return $this->GetStrict($sAttCode);
+		}
+		else
+		{
+			$sExtKeyAttCode = substr($sAttCode, 0, $iPos);
+			$sRemoteAttCode = substr($sAttCode, $iPos + 2);
+			if (!MetaModel::IsValidAttCode(get_class($this), $sExtKeyAttCode))
+			{
+				throw new CoreException("Unknown external key '$sExtKeyAttCode' for the class ".get_class($this));
+			}
+
+			$oExtFieldAtt = MetaModel::FindExternalField(get_class($this), $sExtKeyAttCode, $sRemoteAttCode);
+			if (!is_null($oExtFieldAtt))
+			{
+				return $this->GetStrict($oExtFieldAtt->GetCode());
+			}
+			else
+			{
+				$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
+				$sRemoteClass = $oKeyAttDef->GetTargetClass();
+				$oRemoteObj = MetaModel::GetObject($sRemoteClass, $this->GetStrict($sExtKeyAttCode), false);
+				if (is_null($oRemoteObj))
+				{
+					return '';
+				}
+				else
+				{
+					return $oRemoteObj->Get($sRemoteAttCode);
+				}
+			}
+		}
+	}
+
+	public function GetStrict($sAttCode)
+	{
+		if ($sAttCode == 'id')
+		{
+			return $this->m_iKey;
+		}
+
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+
+		if (!$oAttDef->LoadInObject())
+		{
+			$value = $oAttDef->GetValue($this);
+		}
+		else
+		{
+			if (isset($this->m_aLoadedAtt[$sAttCode]))
+			{
+				// Standard case... we have the information directly
+			}
+			elseif ($this->m_bIsInDB && !$this->m_bDirty)
+			{
+				// Lazy load (polymorphism): complete by reloading the entire object
+				// #@# non-scalar attributes.... handle that differently?
+				$oKPI = new ExecutionKPI();
+				$this->Reload();
+				$oKPI->ComputeStats('Reload', get_class($this).'/'.$sAttCode);
+			}
+			elseif ($sAttCode == 'friendlyname')
+			{
+				// The friendly name is not computed and the object is dirty
+				// Todo: implement the computation of the friendly name based on sprintf()
+				// 
+				$this->m_aCurrValues[$sAttCode] = '';
+			}
+			else
+			{
+				// Not loaded... is it related to an external key?
+				if ($oAttDef->IsExternalField())
+				{
+					// Let's get the object and compute all of the corresponding attributes
+					// (i.e not only the requested attribute)
+					//
+					$sExtKeyAttCode = $oAttDef->GetKeyAttCode();
+	
+					if (($iRemote = $this->Get($sExtKeyAttCode)) && ($iRemote > 0)) // Objects in memory have negative IDs
+					{
+						$oExtKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
+						// Note: "allow all data" must be enabled because the external fields are always visible
+						//       to the current user even if this is not the case for the remote object
+						//       This is consistent with the behavior of the lists
+						$oRemote = MetaModel::GetObject($oExtKeyAttDef->GetTargetClass(), $iRemote, true, true);
+					}
+					else
+					{
+						$oRemote = null;
+					}
+	
+					foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sCode => $oDef)
+					{
+						if ($oDef->IsExternalField() && ($oDef->GetKeyAttCode() == $sExtKeyAttCode))
+						{
+							if ($oRemote)
+							{
+								$this->m_aCurrValues[$sCode] = $oRemote->Get($oDef->GetExtAttCode());
+							}
+							else
+							{
+								$this->m_aCurrValues[$sCode] = $this->GetDefaultValue($sCode);
+							}
+							$this->m_aLoadedAtt[$sCode] = true;
+						}
+					}
+				}
+			}
+			$value = $this->m_aCurrValues[$sAttCode];
+		}
+
+		if ($value instanceof ormLinkSet)
+		{
+			$value->Rewind();
+		}
+		return $value; 
+	}
+
+	public function GetOriginal($sAttCode)
+	{
+		if (!array_key_exists($sAttCode, MetaModel::ListAttributeDefs(get_class($this))))
+		{
+			throw new CoreException("Unknown attribute code '$sAttCode' for the class ".get_class($this));
+		}
+		$aOrigValues = $this->m_aOrigValues;
+		return isset($aOrigValues[$sAttCode]) ? $aOrigValues[$sAttCode] : null;
+	}
+
+    /**
+     * Returns the default value of the $sAttCode. By default, returns the default value of the AttributeDefinition.
+     * Overridable.
+     *
+     * @param $sAttCode
+     * @return mixed
+     */
+	public function GetDefaultValue($sAttCode)
+    {
+        $oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+        return $oAttDef->GetDefaultValue($this);
+    }
+
+	/**
+	 * Returns data loaded by the mean of a dynamic and explicit JOIN
+	 */	 
+	public function GetExtendedData()
+	{
+		return $this->m_aExtendedData;
+	}
+	
+	/**
+	 * Set the HighlightCode if the given code has a greater rank than the current HilightCode
+	 * @param string $sCode
+	 * @return void
+	 */
+	protected function SetHighlightCode($sCode)
+	{
+		$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
+		$fCurrentRank = 0.0;
+		if (($this->m_sHighlightCode !== null) && array_key_exists($this->m_sHighlightCode, $aHighlightScale))
+		{
+			$fCurrentRank = $aHighlightScale[$this->m_sHighlightCode]['rank'];
+		}
+				
+		if (array_key_exists($sCode, $aHighlightScale))
+		{
+			$fRank = $aHighlightScale[$sCode]['rank'];
+			if ($fRank > $fCurrentRank)
+			{
+				$this->m_sHighlightCode = $sCode;
+			}
+		}
+	}
+	
+	/**
+	 * Get the current HighlightCode
+	 * @return string The Hightlight code (null if none set, meaning rank = 0)
+	 */
+	protected function GetHighlightCode()
+	{
+		return $this->m_sHighlightCode;
+	}
+	
+	protected function ComputeHighlightCode()
+	{
+		// First if the state defines a HiglightCode, apply it
+		$sState = $this->GetState();
+		if ($sState != '')
+		{
+			$sCode = MetaModel::GetHighlightCode(get_class($this), $sState);
+			$this->SetHighlightCode($sCode);
+		}
+		// The check for each StopWatch if a HighlightCode is effective
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeStopWatch)
+			{
+				$oStopWatch = $this->Get($sAttCode);
+				$sCode = $oStopWatch->GetHighlightCode();
+				if ($sCode !== '')
+				{
+					$this->SetHighlightCode($sCode);
+				}
+			}
+		}
+		return $this->GetHighlightCode();
+	}
+
+	/**
+	 * Updates the value of an external field by (re)loading the object
+	 * corresponding to the external key and getting the value from it
+	 * 	 
+	 * UNUSED ?
+	 * 	 
+	 * @param string $sAttCode Attribute code of the external field to update
+	 * @return void
+	 */
+	protected function UpdateExternalField($sAttCode)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		if ($oAttDef->IsExternalField())
+		{
+			$sTargetClass = $oAttDef->GetTargetClass();
+			$objkey = $this->Get($oAttDef->GetKeyAttCode());
+			// Note: "allow all data" must be enabled because the external fields are always visible
+			//       to the current user even if this is not the case for the remote object
+			//       This is consistent with the behavior of the lists
+			$oObj = MetaModel::GetObject($sTargetClass, $objkey, true, true);
+			if (is_object($oObj))
+			{
+				$value = $oObj->Get($oAttDef->GetExtAttCode());
+				$this->Set($sAttCode, $value);
+			}
+		}
+	}
+	
+	public function ComputeValues()
+	{
+	}
+
+	// Compute scalar attributes that depend on any other type of attribute
+	final public function DoComputeValues()
+	{
+		// TODO - use a flag rather than checking the call stack -> this will certainly accelerate things
+
+		// First check that we are not currently computing the fields
+		// (yes, we need to do some things like Set/Get to compute the fields which will in turn trigger the update...)
+		foreach (debug_backtrace() as $aCallInfo)
+		{
+			if (!array_key_exists("class", $aCallInfo)) continue;
+			if ($aCallInfo["class"] != get_class($this)) continue;
+			if ($aCallInfo["function"] != "ComputeValues") continue;
+			return; //skip!
+		}
+		
+		// Set the "null-not-allowed" datetimes (and dates) whose value is not initialized
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+		{
+			// AttributeDate is derived from AttributeDateTime
+			if (($oAttDef instanceof AttributeDateTime) && (!$oAttDef->IsNullAllowed()) && ($this->Get($sAttCode) == $oAttDef->GetNullValue()))
+			{
+				$this->Set($sAttCode, date($oAttDef->GetInternalFormat()));
+			}
+		}
+		
+		$this->ComputeValues();
+	}
+
+	public function GetAsHTML($sAttCode, $bLocalize = true)
+	{
+		$sClass = get_class($this);
+		$oAtt = MetaModel::GetAttributeDef($sClass, $sAttCode);
+
+		if ($oAtt->IsExternalKey(EXTKEY_ABSOLUTE))
+		{
+			//return $this->Get($sAttCode.'_friendlyname');
+			$sTargetClass = $oAtt->GetTargetClass(EXTKEY_ABSOLUTE);
+			$iTargetKey = $this->Get($sAttCode);
+			if ($iTargetKey < 0)
+			{
+				// the key points to an object that exists only in memory... no hyperlink points to it yet
+				return '';
+			}
+			else
+			{
+				$sHtmlLabel = htmlentities($this->Get($sAttCode.'_friendlyname'), ENT_QUOTES, 'UTF-8');
+				$bArchived = $this->IsArchived($sAttCode);
+				$bObsolete = $this->IsObsolete($sAttCode);
+				return $this->MakeHyperLink($sTargetClass, $iTargetKey, $sHtmlLabel, null, true, $bArchived, $bObsolete);
+			}
+		}
+
+		// That's a standard attribute (might be an ext field or a direct field, etc.)
+		return $oAtt->GetAsHTML($this->Get($sAttCode), $this, $bLocalize);
+	}
+
+	public function GetEditValue($sAttCode)
+	{
+		$sClass = get_class($this);
+		$oAtt = MetaModel::GetAttributeDef($sClass, $sAttCode);
+
+		if ($oAtt->IsExternalKey())
+		{
+			$sTargetClass = $oAtt->GetTargetClass();
+			if ($this->IsNew())
+			{
+				// The current object exists only in memory, don't try to query it in the DB !
+				// instead let's query for the object pointed by the external key, and get its name
+				$targetObjId = $this->Get($sAttCode);
+				$oTargetObj = MetaModel::GetObject($sTargetClass, $targetObjId, false); // false => not sure it exists
+				if (is_object($oTargetObj))
+				{
+					$sEditValue = $oTargetObj->GetName();
+				}
+				else
+				{
+					$sEditValue = 0;
+				}					
+			}
+			else
+			{
+				$sEditValue = $this->Get($sAttCode.'_friendlyname');
+			}
+		}
+		else
+		{
+			$sEditValue = $oAtt->GetEditValue($this->Get($sAttCode), $this);
+		}
+		return $sEditValue;
+	}
+
+	public function GetAsXML($sAttCode, $bLocalize = true)
+	{
+		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		return $oAtt->GetAsXML($this->Get($sAttCode), $this, $bLocalize);
+	}
+
+	public function GetAsCSV($sAttCode, $sSeparator = ',', $sTextQualifier = '"', $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		return $oAtt->GetAsCSV($this->Get($sAttCode), $sSeparator, $sTextQualifier, $this, $bLocalize, $bConvertToPlainText);
+	}
+
+	public function GetOriginalAsHTML($sAttCode, $bLocalize = true)
+	{
+		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		return $oAtt->GetAsHTML($this->GetOriginal($sAttCode), $this, $bLocalize);
+	}
+
+	public function GetOriginalAsXML($sAttCode, $bLocalize = true)
+	{
+		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		return $oAtt->GetAsXML($this->GetOriginal($sAttCode), $this, $bLocalize);
+	}
+
+	public function GetOriginalAsCSV($sAttCode, $sSeparator = ',', $sTextQualifier = '"', $bLocalize = true, $bConvertToPlainText = false)
+	{
+		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		return $oAtt->GetAsCSV($this->GetOriginal($sAttCode), $sSeparator, $sTextQualifier, $this, $bLocalize, $bConvertToPlainText);
+	}
+
+	/**
+	 * @param $sObjClass
+	 * @param $sObjKey
+	 * @param string $sHtmlLabel Label with HTML entities escaped (< escaped as &lt;)
+	 * @param null $sUrlMakerClass
+	 * @param bool|true $bWithNavigationContext
+	 * @param bool|false $bArchived
+	 * @param bool|false $bObsolete
+	 * @return string
+	 * @throws DictExceptionMissingString
+	 */
+	public static function MakeHyperLink($sObjClass, $sObjKey, $sHtmlLabel = '', $sUrlMakerClass = null, $bWithNavigationContext = true, $bArchived = false, $bObsolete = false)
+	{
+		if ($sObjKey <= 0) return '<em>'.Dict::S('UI:UndefinedObject').'</em>'; // Objects built in memory have negative IDs
+
+		// Safety net
+		//
+		if (empty($sHtmlLabel))
+		{
+			// If the object if not issued from a query but constructed programmatically
+			// the label may be empty. In this case run a query to get the object's friendly name
+			$oTmpObj = MetaModel::GetObject($sObjClass, $sObjKey, false);
+			if (is_object($oTmpObj))
+			{
+				$sHtmlLabel = $oTmpObj->GetName();
+			}
+			else
+			{
+				// May happen in case the target object is not in the list of allowed values for this attribute
+				$sHtmlLabel = "<em>$sObjClass::$sObjKey</em>";
+			}
+		}
+		$sHint = MetaModel::GetName($sObjClass)."::$sObjKey";
+		$sUrl = ApplicationContext::MakeObjectUrl($sObjClass, $sObjKey, $sUrlMakerClass, $bWithNavigationContext);
+
+		$bClickable = !$bArchived || utils::IsArchiveMode();
+		if ($bArchived)
+		{
+			$sSpanClass = 'archived';
+			$sFA = 'fa-archive object-archived';
+			$sHint = Dict::S('ObjectRef:Archived');
+		}
+		elseif ($bObsolete)
+		{
+			$sSpanClass = 'obsolete';
+			$sFA = 'fa-eye-slash object-obsolete';
+			$sHint = Dict::S('ObjectRef:Obsolete');
+		}
+		else
+		{
+			$sSpanClass = '';
+			$sFA = '';
+		}
+		if ($sFA == '')
+		{
+			$sIcon = '';
+		}
+		else
+		{
+			if ($bClickable)
+			{
+				$sIcon = "<span class=\"object-ref-icon fa $sFA fa-1x fa-fw\"></span>";
+			}
+			else
+			{
+				$sIcon = "<span class=\"object-ref-icon-disabled fa $sFA fa-1x fa-fw\"></span>";
+			}
+		}
+
+		if ($bClickable && (strlen($sUrl) > 0))
+		{
+			$sHLink = "<a class=\"object-ref-link\" href=\"$sUrl\">$sIcon$sHtmlLabel</a>";
+		}
+		else
+		{
+			$sHLink = $sIcon.$sHtmlLabel;
+		}
+		$sRet = "<span class=\"object-ref $sSpanClass\" title=\"$sHint\">$sHLink</span>";
+		return $sRet;
+	}
+
+	public function GetHyperlink($sUrlMakerClass = null, $bWithNavigationContext = true)
+	{
+		$bArchived = $this->IsArchived();
+		$bObsolete = $this->IsObsolete();
+		return self::MakeHyperLink(get_class($this), $this->GetKey(), $this->GetName(), $sUrlMakerClass, $bWithNavigationContext, $bArchived, $bObsolete);
+	}
+	
+	public static function ComputeStandardUIPage($sClass)
+	{
+		static $aUIPagesCache = array(); // Cache to store the php page used to display each class of object
+		if (!isset($aUIPagesCache[$sClass]))
+		{
+			$UIPage = false;
+			if (is_callable("$sClass::GetUIPage"))
+			{
+				$UIPage = eval("return $sClass::GetUIPage();"); // May return false in case of error
+			}
+			$aUIPagesCache[$sClass] = $UIPage === false ? './UI.php' : $UIPage;
+		}
+		$sPage = $aUIPagesCache[$sClass];
+		return $sPage;
+	}
+
+	public static function GetUIPage()
+	{
+		return 'UI.php';
+	}
+
+
+	// could be in the metamodel ?
+	public static function IsValidPKey($value)
+	{
+		return ((string)$value === (string)(int)$value);
+	}
+
+	public function GetKey()
+	{
+		return $this->m_iKey;
+	}
+	public function SetKey($iNewKey)
+	{
+		if (!self::IsValidPKey($iNewKey))
+		{
+			throw new CoreException("An object id must be an integer value ($iNewKey)");
+		}
+		
+		if ($this->m_bIsInDB && !empty($this->m_iKey) && ($this->m_iKey != $iNewKey))
+		{
+			throw new CoreException("Changing the key ({$this->m_iKey} to $iNewKey) on an object (class {".get_class($this).") wich already exists in the Database");
+		}
+		$this->m_iKey = $iNewKey;
+	}
+	/**
+	 * Get the icon representing this object
+	 * @param boolean $bImgTag If true the result is a full IMG tag (or an emtpy string if no icon is defined)
+	 * @return string Either the full IMG tag ($bImgTag == true) or just the URL to the icon file
+	 */
+	public function GetIcon($bImgTag = true)
+	{
+		$sCode = $this->ComputeHighlightCode();
+		if($sCode != '')
+		{
+			$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
+			if (array_key_exists($sCode, $aHighlightScale))
+			{
+				$sIconUrl = $aHighlightScale[$sCode]['icon'];
+				if($bImgTag)
+				{
+					return "<img src=\"$sIconUrl\" style=\"vertical-align:middle\"/>";
+				}
+				else
+				{
+					return $sIconUrl;
+				}
+			}
+		}		
+		return MetaModel::GetClassIcon(get_class($this), $bImgTag);
+	}
+
+	/**
+	 * Gets the name of an object in a safe manner for displaying inside a web page
+	 * @return string
+	 */
+	public function GetName()
+	{
+		return htmlentities($this->GetRawName(), ENT_QUOTES, 'UTF-8');
+	}
+
+	/**
+	 * Gets the raw name of an object, this is not safe for displaying inside a web page
+	 * since the " < > characters are not escaped and the name may contain some XSS script
+	 * instructions.
+	 * Use this function only for internal computations or for an output to a non-HTML destination
+	 * @return string
+	 */
+	public function GetRawName()
+	{
+		return $this->Get('friendlyname');
+	}
+
+	public function GetState()
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (empty($sStateAttCode))
+		{
+			return '';
+		}
+		else
+		{
+			return $this->Get($sStateAttCode);
+		}
+	}
+
+	public function GetStateLabel()
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (empty($sStateAttCode))
+		{
+			return '';
+		}
+		else
+		{
+			$sStateValue = $this->Get($sStateAttCode);
+			return MetaModel::GetStateLabel(get_class($this), $sStateValue);
+		}
+	}
+
+	public function GetStateDescription()
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (empty($sStateAttCode))
+		{
+			return '';
+		}
+		else
+		{
+			$sStateValue = $this->Get($sStateAttCode);
+			return MetaModel::GetStateDescription(get_class($this), $sStateValue);
+		}
+	}
+
+	/**
+	 * Overridable - Define attributes read-only from the end-user perspective
+	 * 	 
+	 * @return array List of attcodes
+	 */	 	  	 	
+	public static function GetReadOnlyAttributes()
+	{
+		return null;
+	}
+
+
+	/**
+	 * Overridable - Get predefined objects (could be hardcoded)
+	 * The predefined objects will be synchronized with the DB at each install/upgrade
+	 * As soon as a class has predefined objects, then nobody can create nor delete objects	 
+	 * @return array An array of id => array of attcode => php value(so-called "real value": integer, string, ormDocument, DBObjectSet, etc.)
+	 */	 	  	 	
+	public static function GetPredefinedObjects()
+	{
+		return null;
+	}
+
+	/**
+	 *
+	 * @param string $sAttCode $sAttCode The code of the attribute
+	 * @param array $aReasons To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 * @param string $sTargetState The target state in which to evalutate the flags, if empty the current state will be
+	 *     used
+	 *
+	 * @return integer the binary combination of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...) for the
+	 *     given attribute in the given state of the object
+	 * @throws \CoreException
+	 */
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		$iFlags = 0; // By default (if no life cycle) no flag at all
+
+		$aReadOnlyAtts = $this->GetReadOnlyAttributes();
+		if (($aReadOnlyAtts != null) && (in_array($sAttCode, $aReadOnlyAtts)))
+		{
+			return OPT_ATT_READONLY;
+		}
+
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (!empty($sStateAttCode))
+		{
+			if ($sTargetState != '')
+			{
+				$iFlags = MetaModel::GetAttributeFlags(get_class($this), $sTargetState, $sAttCode);			
+			}
+			else
+			{
+				$iFlags = MetaModel::GetAttributeFlags(get_class($this), $this->Get($sStateAttCode), $sAttCode);
+			}
+		}
+		$aReasons = array();
+		$iSynchroFlags = 0;
+		if ($this->InSyncScope())
+		{
+			$iSynchroFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
+		}
+		return $iFlags | $iSynchroFlags; // Combine both sets of flags
+	}
+
+	/**
+	 * @param string $sAttCode
+	 * @param array $aReasons To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 *
+	 * @throws \CoreException
+	 */
+	public function IsAttributeReadOnlyForCurrentState($sAttCode, &$aReasons = array())
+	{
+		$iAttFlags = $this->GetAttributeFlags($sAttCode, $aReasons);
+
+		return ($iAttFlags & OPT_ATT_READONLY);
+	}
+
+    /**
+     * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
+     * for the given attribute in a transition
+     * @param $sAttCode string $sAttCode The code of the attribute
+     * @param $sStimulus string The stimulus code to apply
+     * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
+     * @param $sOriginState string The state from which to apply $sStimulus, if empty current state will be used
+     * @return integer Flags: the binary combination of the flags applicable to this attribute
+     */
+    public function GetTransitionFlags($sAttCode, $sStimulus, &$aReasons = array(), $sOriginState = '')
+    {
+        $iFlags = 0; // By default (if no lifecycle) no flag at all
+
+        $sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+        // If no state attribute, there is no lifecycle
+        if (empty($sStateAttCode))
+        {
+            return $iFlags;
+        }
+
+        // Retrieving current state if necessary
+        if ($sOriginState === '')
+        {
+            $sOriginState = $this->Get($sStateAttCode);
+        }
+
+        // Retrieving attribute flags
+        $iAttributeFlags = $this->GetAttributeFlags($sAttCode, $aReasons, $sOriginState);
+
+        // Retrieving transition flags
+        $iTransitionFlags = MetaModel::GetTransitionFlags(get_class($this), $sOriginState, $sStimulus, $sAttCode);
+
+        // Merging transition flags with attribute flags
+        $iFlags = $iTransitionFlags | $iAttributeFlags;
+
+        return $iFlags;
+    }
+
+    /**
+     * Returns an array of attribute codes (with their flags) when $sStimulus is applied on the object in the $sOriginState state.
+     * Note: Attributes (and flags) from the target state and the transition are combined.
+     *
+     * @param $sStimulus string
+     * @param $sOriginState string Default is current state
+     * @return array
+     */
+    public function GetTransitionAttributes($sStimulus, $sOriginState = null)
+    {
+        $sObjClass = get_class($this);
+
+        // Defining current state as origin state if not specified
+        if($sOriginState === null)
+        {
+            $sOriginState = $this->GetState();
+        }
+
+        $aAttributes = MetaModel::GetTransitionAttributes($sObjClass, $sStimulus, $sOriginState);
+
+        return $aAttributes;
+    }
+
+	/**
+	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
+	 * for the given attribute for the current state of the object considered as an INITIAL state
+	 * @param string $sAttCode The code of the attribute
+	 * @return integer Flags: the binary combination of the flags applicable to this attribute
+	 */	 	  	 	
+	public function GetInitialStateAttributeFlags($sAttCode, &$aReasons = array())
+	{
+		$iFlags = 0;
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (!empty($sStateAttCode))
+		{
+			$iFlags = MetaModel::GetInitialStateAttributeFlags(get_class($this), $this->Get($sStateAttCode), $sAttCode);
+		}
+		return $iFlags; // No need to care about the synchro flags since we'll be creating a new object anyway
+	}
+
+	// check if the given (or current) value is suitable for the attribute
+	// return true if successfull
+	// return the error desciption otherwise
+	public function CheckValue($sAttCode, $value = null)
+	{
+		if (!is_null($value))
+		{
+			$toCheck = $value;
+		}
+		else
+		{
+			$toCheck = $this->Get($sAttCode);
+		}
+
+		$oAtt = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		if (!$oAtt->IsWritable())
+		{
+			return true;
+		}
+		elseif ($oAtt->IsNull($toCheck))
+		{
+			if ($oAtt->IsNullAllowed())
+			{
+				return true;
+			}
+			else
+			{
+				return "Null not allowed";
+			}
+		}
+		elseif ($oAtt->IsExternalKey())
+		{
+			if (!MetaModel::SkipCheckExtKeys())
+			{
+				$sTargetClass = $oAtt->GetTargetClass();
+				$oTargetObj = MetaModel::GetObject($sTargetClass, $toCheck, false /*must be found*/, true /*allow all data*/);
+				if (is_null($oTargetObj))
+				{
+					return "Target object not found ($sTargetClass::$toCheck)";
+				}
+			}
+			if ($oAtt->IsHierarchicalKey())
+			{
+				// This check cannot be deactivated since otherwise the user may break things by a CSV import of a bulk modify
+				$aValues = $oAtt->GetAllowedValues(array('this' => $this));
+				if (!array_key_exists($toCheck, $aValues))
+				{
+					return "Value not allowed [$toCheck]";
+				}
+			}
+		}
+		elseif ($oAtt->IsScalar())
+		{
+			$aValues = $oAtt->GetAllowedValues($this->ToArgsForQuery());
+			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)
+				{
+					return "String too long (found $iLen, limited to $iMaxSize)";
+				}
+			}
+			if (!$oAtt->CheckFormat($toCheck))
+			{
+				return "Wrong format [$toCheck]";
+			}
+		}
+		else
+		{
+			return $oAtt->CheckValue($this, $toCheck);
+		}
+		return true;
+	}
+	
+	// check attributes together
+	public function CheckConsistency()
+	{
+		return true;
+	}
+	
+	// check integrity rules (before inserting or updating the object)
+	// a displayable error is returned
+	public function DoCheckToWrite()
+	{
+		$this->DoComputeValues();
+
+		$aChanges = $this->ListChanges();
+
+		foreach($aChanges as $sAttCode => $value)
+		{
+			$res = $this->CheckValue($sAttCode);
+			if ($res !== true)
+			{
+				// $res contains the error description
+				$this->m_aCheckIssues[] = "Unexpected value for attribute '$sAttCode': $res";
+			}
+		}
+		if (count($this->m_aCheckIssues) > 0)
+		{
+			// No need to check consistency between attributes if any of them has
+			// an unexpected value
+			return;
+		}
+		$res = $this->CheckConsistency();
+		if ($res !== true)
+		{
+			// $res contains the error description
+			$this->m_aCheckIssues[] = "Consistency rules not followed: $res";
+		}
+
+		// Synchronization: are we attempting to modify an attribute for which an external source is master?
+		//
+		if ($this->m_bIsInDB && $this->InSyncScope() && (count($aChanges) > 0))
+		{
+			foreach($aChanges as $sAttCode => $value)
+			{
+				$iFlags = $this->GetSynchroReplicaFlags($sAttCode, $aReasons);
+				if ($iFlags & OPT_ATT_SLAVE)
+				{
+					// Note: $aReasonInfo['name'] could be reported (the task owning the attribute)
+					$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+					$sAttLabel = $oAttDef->GetLabel();
+					foreach($aReasons as $aReasonInfo)
+					{
+						// Todo: associate the attribute code with the error
+						$this->m_aCheckIssues[] = Dict::Format('UI:AttemptingToSetASlaveAttribute_Name', $sAttLabel);
+					}
+				}
+			}
+		}
+	}
+
+	final public function CheckToWrite()
+	{
+		if (MetaModel::SkipCheckToWrite())
+		{
+			return array(true, array());
+		}
+		if (is_null($this->m_bCheckStatus))
+		{
+			$this->m_aCheckIssues = array();
+
+			$oKPI = new ExecutionKPI();
+			$this->DoCheckToWrite();
+			$oKPI->ComputeStats('CheckToWrite', get_class($this));
+			if (count($this->m_aCheckIssues) == 0)
+			{
+				$this->m_bCheckStatus = true;
+			}
+			else
+			{
+				$this->m_bCheckStatus = false;
+			}
+		}
+		return array($this->m_bCheckStatus, $this->m_aCheckIssues, $this->m_bSecurityIssue);
+	}
+
+	// check if it is allowed to delete the existing object from the database
+	// a displayable error is returned
+	protected function DoCheckToDelete(&$oDeletionPlan)
+	{
+		$this->m_aDeleteIssues = array(); // Ok
+
+		if ($this->InSyncScope())
+		{
+
+			foreach ($this->GetSynchroData() as $iSourceId => $aSourceData)
+			{
+				foreach ($aSourceData['replica'] as $oReplica)
+				{
+					$oDeletionPlan->AddToDelete($oReplica, DEL_SILENT);
+				}
+				$oDataSource = $aSourceData['source'];
+				if ($oDataSource->GetKey() == SynchroExecution::GetCurrentTaskId())
+				{
+					// The current task has the right to delete the object
+					continue;
+				}
+				$oReplica = reset($aSourceData['replica']); // Take the first one
+				if ($oReplica->Get('status_dest_creator') != 1)
+				{
+					// The object is not owned by the task
+					continue;
+				}
+
+				$sLink = $oDataSource->GetName();
+				$sUserDeletePolicy = $oDataSource->Get('user_delete_policy');
+				switch($sUserDeletePolicy)
+				{
+				case 'nobody':
+					$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
+					break;
+
+				case 'administrators':
+					if (!UserRights::IsAdministrator())
+					{
+						$this->m_aDeleteIssues[] = Dict::Format('Core:Synchro:TheObjectCannotBeDeletedByUser_Source', $sLink);
+					}
+					break;
+
+				case 'everybody':
+				default:
+					// Ok
+					break;
+				}
+			}
+		}
+	}
+
+  	public function CheckToDelete(&$oDeletionPlan)
+  	{
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
+		return (!$oDeletionPlan->FoundStopper());
+	} 
+
+	protected function ListChangedValues(array $aProposal)
+	{
+		$aDelta = array();
+		foreach ($aProposal as $sAtt => $proposedValue)
+		{
+			if (!array_key_exists($sAtt, $this->m_aOrigValues))
+			{
+				// The value was not set
+				$aDelta[$sAtt] = $proposedValue;
+			}
+			elseif(!array_key_exists($sAtt, $this->m_aTouchedAtt) || (array_key_exists($sAtt, $this->m_aModifiedAtt) && $this->m_aModifiedAtt[$sAtt] == false))
+			{
+				// This attCode was never set, cannot be modified
+				// or the same value - as the original value - was set, and has been verified as equivalent to the original value
+				continue;
+			}
+			else if (array_key_exists($sAtt, $this->m_aModifiedAtt) && $this->m_aModifiedAtt[$sAtt] == true)
+			{
+				// We already know that the value is really modified
+				$aDelta[$sAtt] = $proposedValue;
+			}
+			elseif(is_object($proposedValue))
+			{
+				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAtt);
+				// The value is an object, the comparison is not strict
+				if (!$oAttDef->Equals($this->m_aOrigValues[$sAtt], $proposedValue))
+				{
+					$aDelta[$sAtt] = $proposedValue;
+					$this->m_aModifiedAtt[$sAtt] = true; // Really modified
+				}
+				else
+				{
+					$this->m_aModifiedAtt[$sAtt] = false; // Not really modified
+				}
+			}
+			else
+			{
+				// The value is a scalar, the comparison must be 100% strict
+				if($this->m_aOrigValues[$sAtt] !== $proposedValue)
+				{	
+					//echo "$sAtt:<pre>\n";
+					//var_dump($this->m_aOrigValues[$sAtt]);
+					//var_dump($proposedValue);
+					//echo "</pre>\n";
+					$aDelta[$sAtt] = $proposedValue;
+					$this->m_aModifiedAtt[$sAtt] = true; // Really modified
+				}
+				else
+				{
+					$this->m_aModifiedAtt[$sAtt] = false; // Not really modified
+				}
+			}
+		}
+		return $aDelta;
+	} 
+
+	// List the attributes that have been changed
+	// Returns an array of attname => currentvalue
+	public function ListChanges()
+	{
+		if ($this->m_bIsInDB)
+		{
+			return $this->ListChangedValues($this->m_aCurrValues);
+		}
+		else
+		{
+			return $this->m_aCurrValues;
+		}
+	}
+
+	// Tells whether or not an object was modified since last read (ie: does it differ from the DB ?)
+	public function IsModified()
+	{
+		$aChanges = $this->ListChanges();
+		return (count($aChanges) != 0);
+	}
+
+	public function Equals($oSibling)
+	{
+		if (get_class($oSibling) != get_class($this))
+		{
+			return false;
+		}
+		if ($this->GetKey() != $oSibling->GetKey())
+		{
+			return false;
+		}
+		if ($this->m_bIsInDB)
+		{
+			// If one has changed, then consider them as being different
+			if ($this->IsModified() || $oSibling->IsModified())
+			{
+				return false;
+			}
+		}
+		else
+		{
+			// Todo - implement this case (loop on every attribute)
+			//foreach(MetaModel::ListAttributeDefs(get_class($this) as $sAttCode => $oAttDef)
+			//{
+					//if (!isset($this->m_CurrentValues[$sAttCode])) continue;
+					//if (!isset($this->m_CurrentValues[$sAttCode])) continue;
+					//if (!$oAttDef->Equals($this->m_CurrentValues[$sAttCode], $oSibling->m_CurrentValues[$sAttCode]))
+					//{
+						//return false;
+					//}
+			//}
+			return false;
+		}
+		return true;
+	}
+
+	// used only by insert
+	protected function OnObjectKeyReady()
+    {
+        // Meant to be overloaded
+    }
+
+	// used both by insert/update
+	private function DBWriteLinks()
+	{
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+		{
+			if (!$oAttDef->IsLinkSet()) continue;
+			if (!array_key_exists($sAttCode, $this->m_aTouchedAtt)) continue;
+			if (array_key_exists($sAttCode, $this->m_aModifiedAtt) && ($this->m_aModifiedAtt[$sAttCode] == false)) continue;
+
+			$oLinkSet = $this->m_aCurrValues[$sAttCode];
+			$oLinkSet->DBWrite($this);
+		}
+	}
+
+	// used both by insert/update
+	private function WriteExternalAttributes()
+	{
+		foreach (MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+		{
+			if (!$oAttDef->LoadInObject()) continue;
+			if ($oAttDef->LoadFromDB()) continue;
+			if (!array_key_exists($sAttCode, $this->m_aTouchedAtt)) continue;
+			if (array_key_exists($sAttCode, $this->m_aModifiedAtt) && ($this->m_aModifiedAtt[$sAttCode] == false)) continue;
+			$oAttDef->WriteValue($this, $this->m_aCurrValues[$sAttCode]);
+		}
+	}
+
+	// Note: this is experimental - it was designed to speed up the setup of iTop
+	// Known limitations:
+	//   - does not work with multi-table classes (issue with the unique id to maintain in several tables)
+	//   - the id of the object is not updated
+	static public final function BulkInsertStart()
+	{
+		self::$m_bBulkInsert = true;
+	} 
+
+	static public final function BulkInsertFlush()
+	{
+		if (!self::$m_bBulkInsert) return;
+
+		foreach(self::$m_aBulkInsertCols as $sClass => $aTables)
+		{
+			foreach ($aTables as $sTable => $sColumns)
+			{
+				$sValues = implode(', ', self::$m_aBulkInsertItems[$sClass][$sTable]);
+				$sInsertSQL = "INSERT INTO `$sTable` ($sColumns) VALUES $sValues";
+				$iNewKey = CMDBSource::InsertInto($sInsertSQL);
+			}
+		}
+
+		// Reset
+		self::$m_aBulkInsertItems = array();
+		self::$m_aBulkInsertCols = array();
+		self::$m_bBulkInsert = false;
+	} 
+
+	private function DBInsertSingleTable($sTableClass)
+	{
+		$sTable = MetaModel::DBGetTable($sTableClass);
+		// Abstract classes or classes having no specific attribute do not have an associated table
+		if ($sTable == '') return;
+
+		$sClass = get_class($this);
+
+		// fields in first array, values in the second
+		$aFieldsToWrite = array();
+		$aValuesToWrite = array();
+		
+		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
+		{
+			// Add it to the list of fields to write
+			$aFieldsToWrite[] = '`'.MetaModel::DBGetKey($sTableClass).'`';
+			$aValuesToWrite[] = CMDBSource::Quote($this->m_iKey);
+		}
+
+		$aHierarchicalKeys = array();
+		
+		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
+		{
+			// Skip this attribute if not defined in this table
+			if (!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode)) continue;
+			$aAttColumns = $oAttDef->GetSQLValues($this->m_aCurrValues[$sAttCode]);
+			foreach($aAttColumns as $sColumn => $sValue)
+			{
+				$aFieldsToWrite[] = "`$sColumn`"; 
+				$aValuesToWrite[] = CMDBSource::Quote($sValue);
+			}
+			if ($oAttDef->IsHierarchicalKey())
+			{
+				$aHierarchicalKeys[$sAttCode] = $oAttDef;
+			}
+		}
+
+		if (count($aValuesToWrite) == 0) return false;
+
+		if (MetaModel::DBIsReadOnly())
+		{
+			$iNewKey = -1;
+		}
+		else
+		{
+			if (self::$m_bBulkInsert)
+			{
+				if (!isset(self::$m_aBulkInsertCols[$sClass][$sTable]))
+				{
+					self::$m_aBulkInsertCols[$sClass][$sTable] = implode(', ', $aFieldsToWrite);
+				}
+				self::$m_aBulkInsertItems[$sClass][$sTable][] = '('.implode (', ', $aValuesToWrite).')';
+				
+				$iNewKey = 999999; // TODO - compute next id....
+			}
+			else
+			{
+				if (count($aHierarchicalKeys) > 0)
+				{
+					foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
+					{
+						$aValues = MetaModel::HKInsertChildUnder($this->m_aCurrValues[$sAttCode], $oAttDef, $sTable);
+						$aFieldsToWrite[] = '`'.$oAttDef->GetSQLRight().'`';
+						$aValuesToWrite[] = $aValues[$oAttDef->GetSQLRight()];
+						$aFieldsToWrite[] = '`'.$oAttDef->GetSQLLeft().'`';
+						$aValuesToWrite[] = $aValues[$oAttDef->GetSQLLeft()];
+					}
+				}
+				$sInsertSQL = "INSERT INTO `$sTable` (".join(",", $aFieldsToWrite).") VALUES (".join(", ", $aValuesToWrite).")";
+				$iNewKey = CMDBSource::InsertInto($sInsertSQL);
+			}
+		}
+		// Note that it is possible to have a key defined here, and the autoincrement expected, this is acceptable in a non root class
+		if (empty($this->m_iKey))
+		{
+			// Take the autonumber
+			$this->m_iKey = $iNewKey;
+		}
+		return $this->m_iKey;
+	}
+
+	// Insert of record for the new object into the database
+	// Returns the key of the newly created object
+	public function DBInsertNoReload()
+	{
+		if ($this->m_bIsInDB)
+		{
+			throw new CoreException("The object already exists into the Database, you may want to use the clone function");
+		}
+
+		$sClass = get_class($this);
+		$sRootClass = MetaModel::GetRootClass($sClass);
+
+		// Ensure the update of the values (we are accessing the data directly)
+		$this->DoComputeValues();
+		$this->OnInsert();
+
+		if ($this->m_iKey < 0)
+		{
+			// This was a temporary "memory" key: discard it so that DBInsertSingleTable will not try to use it!
+			$this->m_iKey = null; 
+		}
+
+		// If not automatically computed, then check that the key is given by the caller
+		if (!MetaModel::IsAutoIncrementKey($sRootClass))
+		{
+			if (empty($this->m_iKey))
+			{
+				throw new CoreWarning("Missing key for the object to write - This class is supposed to have a user defined key, not an autonumber", array('class' => $sRootClass));
+			}
+		}
+
+		// Ultimate check - ensure DB integrity
+		list($bRes, $aIssues) = $this->CheckToWrite();
+		if (!$bRes)
+		{
+			$sIssues = implode(', ', $aIssues);
+			throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
+		}
+
+		// Stop watches
+		$sState = $this->GetState();
+		if ($sState != '')
+		{
+			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef instanceof AttributeStopWatch)
+				{
+					if (in_array($sState, $oAttDef->GetStates()))
+					{
+						// Start the stop watch and compute the deadlines
+						$oSW = $this->Get($sAttCode);
+						$oSW->Start($this, $oAttDef);
+						$oSW->ComputeDeadlines($this, $oAttDef);
+						$this->Set($sAttCode, $oSW);
+					}
+				}
+			}
+		}
+
+		// First query built upon on the root class, because the ID must be created first
+		$this->m_iKey = $this->DBInsertSingleTable($sRootClass);
+
+		// Then do the leaf class, if different from the root class
+		if ($sClass != $sRootClass)
+		{
+			$this->DBInsertSingleTable($sClass);
+		}
+
+		// Then do the other classes
+		foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
+		{
+			if ($sParentClass == $sRootClass) continue;
+			$this->DBInsertSingleTable($sParentClass);
+		}
+
+		$this->OnObjectKeyReady();
+
+        $this->DBWriteLinks();
+		$this->WriteExternalAttributes();
+
+		$this->m_bIsInDB = true;
+		$this->m_bDirty = false;
+		foreach ($this->m_aCurrValues as $sAttCode => $value)
+		{
+			if (is_object($value))
+			{
+				$value = clone $value;
+			}
+			$this->m_aOrigValues[$sAttCode] = $value;
+		}
+
+		$this->AfterInsert();
+
+		// Activate any existing trigger 
+		$sClass = get_class($this);
+		$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObjectCreate AS t WHERE t.target_class IN ('$sClassList')"));
+		while ($oTrigger = $oSet->Fetch())
+		{
+			$oTrigger->DoActivate($this->ToArgs('this'));
+		}
+
+		// Callbacks registered with RegisterCallback
+		if (isset($this->m_aCallbacks[self::CALLBACK_AFTERINSERT]))
+		{
+			foreach ($this->m_aCallbacks[self::CALLBACK_AFTERINSERT] as $aCallBackData)
+			{
+				call_user_func_array($aCallBackData['callback'], $aCallBackData['params']);
+			}
+		}
+
+		$this->RecordObjCreation();
+
+		return $this->m_iKey;
+	}
+
+	protected function MakeInsertStatementSingleTable($aAuthorizedExtKeys, &$aStatements, $sTableClass)
+	{
+		$sTable = MetaModel::DBGetTable($sTableClass);
+		// Abstract classes or classes having no specific attribute do not have an associated table
+		if ($sTable == '') return;
+
+		$sClass = get_class($this);
+
+		// fields in first array, values in the second
+		$aFieldsToWrite = array();
+		$aValuesToWrite = array();
+		
+		if (!empty($this->m_iKey) && ($this->m_iKey >= 0))
+		{
+			// Add it to the list of fields to write
+			$aFieldsToWrite[] = '`'.MetaModel::DBGetKey($sTableClass).'`';
+			$aValuesToWrite[] = CMDBSource::Quote($this->m_iKey);
+		}
+
+		$aHierarchicalKeys = array();
+		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
+		{
+			// Skip this attribute if not defined in this table
+			if (!MetaModel::IsAttributeOrigin($sTableClass, $sAttCode)) continue;
+			// Skip link set that can still be undefined though the object is 100% loaded
+			if ($oAttDef->IsLinkSet()) continue;
+
+			$value = $this->m_aCurrValues[$sAttCode];
+			if ($oAttDef->IsExternalKey())
+			{
+				$sTargetClass = $oAttDef->GetTargetClass();
+				if (is_array($aAuthorizedExtKeys))
+				{
+					if (!array_key_exists($sTargetClass, $aAuthorizedExtKeys) || !array_key_exists($value, $aAuthorizedExtKeys[$sTargetClass]))
+					{
+						$value = 0;
+					}
+				}
+			}
+			$aAttColumns = $oAttDef->GetSQLValues($value);
+			foreach($aAttColumns as $sColumn => $sValue)
+			{
+				$aFieldsToWrite[] = "`$sColumn`"; 
+				$aValuesToWrite[] = CMDBSource::Quote($sValue);
+			}
+			if ($oAttDef->IsHierarchicalKey())
+			{
+				$aHierarchicalKeys[$sAttCode] = $oAttDef;
+			}
+		}
+
+		if (count($aValuesToWrite) == 0) return false;
+
+		if (count($aHierarchicalKeys) > 0)
+		{
+			foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
+			{
+				$aValues = MetaModel::HKInsertChildUnder($this->m_aCurrValues[$sAttCode], $oAttDef, $sTable);
+				$aFieldsToWrite[] = '`'.$oAttDef->GetSQLRight().'`';
+				$aValuesToWrite[] = $aValues[$oAttDef->GetSQLRight()];
+				$aFieldsToWrite[] = '`'.$oAttDef->GetSQLLeft().'`';
+				$aValuesToWrite[] = $aValues[$oAttDef->GetSQLLeft()];
+			}
+		}
+		$aStatements[] = "INSERT INTO `$sTable` (".join(",", $aFieldsToWrite).") VALUES (".join(", ", $aValuesToWrite).");";
+	}
+
+	public function MakeInsertStatements($aAuthorizedExtKeys, &$aStatements)
+	{
+		$sClass = get_class($this);
+		$sRootClass = MetaModel::GetRootClass($sClass);
+
+		// First query built upon on the root class, because the ID must be created first
+		$this->MakeInsertStatementSingleTable($aAuthorizedExtKeys, $aStatements, $sRootClass);
+
+		// Then do the leaf class, if different from the root class
+		if ($sClass != $sRootClass)
+		{
+			$this->MakeInsertStatementSingleTable($aAuthorizedExtKeys, $aStatements, $sClass);
+		}
+
+		// Then do the other classes
+		foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
+		{
+			if ($sParentClass == $sRootClass) continue;
+			$this->MakeInsertStatementSingleTable($aAuthorizedExtKeys, $aStatements, $sParentClass);
+		}
+	}
+
+	public function DBInsert()
+	{
+		$this->DBInsertNoReload();
+		$this->Reload();
+		return $this->m_iKey;
+	}
+	
+	public function DBInsertTracked(CMDBChange $oChange)
+	{
+		CMDBObject::SetCurrentChange($oChange);
+		return $this->DBInsert();
+	}
+
+	public function DBInsertTrackedNoReload(CMDBChange $oChange)
+	{
+		CMDBObject::SetCurrentChange($oChange);
+		return $this->DBInsertNoReload();
+	}
+
+	// Creates a copy of the current object into the database
+	// Returns the id of the newly created object
+	public function DBClone($iNewKey = null)
+	{
+		$this->m_bIsInDB = false;
+		$this->m_iKey = $iNewKey;
+		$ret = $this->DBInsert();
+		$this->RecordObjCreation();
+		return $ret;
+	}
+	
+	/**
+	 * This function is automatically called after cloning an object with the "clone" PHP language construct
+	 * The purpose of this method is to reset the appropriate attributes of the object in
+	 * order to make sure that the newly cloned object is really distinct from its clone
+	 */
+	public function __clone()
+	{
+		$this->m_bIsInDB = false;
+		$this->m_bDirty = true;
+		$this->m_iKey = self::GetNextTempId(get_class($this));
+	}
+
+	// Update a record
+	public function DBUpdate()
+	{
+		if (!$this->m_bIsInDB)
+		{
+			throw new CoreException("DBUpdate: could not update a newly created object, please call DBInsert instead");
+		}
+
+		// Protect against reentrance (e.g. cascading the update of ticket logs)
+		static $aUpdateReentrance = array();
+		$sKey = get_class($this).'::'.$this->GetKey();
+		if (array_key_exists($sKey, $aUpdateReentrance))
+		{
+			return;
+		}
+		$aUpdateReentrance[$sKey] = true;
+
+		try
+		{
+			// Stop watches
+			$sState = $this->GetState();
+			if ($sState != '')
+			{
+				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+				{
+					if ($oAttDef instanceof AttributeStopWatch)
+					{
+						if (in_array($sState, $oAttDef->GetStates()))
+						{
+							// Compute or recompute the deadlines
+							$oSW = $this->Get($sAttCode);
+							$oSW->ComputeDeadlines($this, $oAttDef);
+							$this->Set($sAttCode, $oSW);
+						}
+					}
+				}
+			}
+
+			$this->DoComputeValues();
+			$this->OnUpdate();
+
+			$aChanges = $this->ListChanges();
+			if (count($aChanges) == 0)
+			{
+				// Attempting to update an unchanged object
+				unset($aUpdateReentrance[$sKey]);
+				return $this->m_iKey;
+			}
+
+			// Ultimate check - ensure DB integrity
+			list($bRes, $aIssues) = $this->CheckToWrite();
+			if (!$bRes)
+			{
+				$sIssues = implode(', ', $aIssues);
+				throw new CoreException("Object not following integrity rules", array('issues' => $sIssues, 'class' => get_class($this), 'id' => $this->GetKey()));
+			}
+
+			// Save the original values (will be reset to the new values when the object get written to the DB)
+			$aOriginalValues = $this->m_aOrigValues;
+
+			$bHasANewExternalKeyValue = false;
+			$aHierarchicalKeys = array();
+			$aDBChanges = array();
+			foreach($aChanges as $sAttCode => $valuecurr)
+			{
+				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+				if ($oAttDef->IsExternalKey()) $bHasANewExternalKeyValue = true;
+				if ($oAttDef->IsBasedOnDBColumns())
+				{
+					$aDBChanges[$sAttCode] = $aChanges[$sAttCode];
+				}
+				if ($oAttDef->IsHierarchicalKey())
+				{
+					$aHierarchicalKeys[$sAttCode] = $oAttDef;
+				}
+			}
+
+			if (!MetaModel::DBIsReadOnly())
+			{
+				// Update the left & right indexes for each hierarchical key
+				foreach($aHierarchicalKeys as $sAttCode => $oAttDef)
+				{
+					$sTable = $sTable = MetaModel::DBGetTable(get_class($this), $sAttCode);
+					$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".$this->GetKey();
+					$aRes = CMDBSource::QueryToArray($sSQL);
+					$iMyLeft = $aRes[0]['left'];
+					$iMyRight = $aRes[0]['right'];
+					$iDelta =$iMyRight - $iMyLeft + 1;
+					MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
+					
+					if ($aDBChanges[$sAttCode] == 0)
+					{
+						// No new parent, insert completely at the right of the tree
+						$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
+						$aRes = CMDBSource::QueryToArray($sSQL);
+						if (count($aRes) == 0)
+						{
+							$iNewLeft = 1;
+						}
+						else
+						{
+							$iNewLeft = $aRes[0]['max']+1;
+						}
+					}
+					else
+					{
+						// Insert at the right of the specified parent
+						$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` FROM `$sTable` WHERE id=".((int)$aDBChanges[$sAttCode]);
+						$iNewLeft = CMDBSource::QueryToScalar($sSQL);
+					}
+
+					MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
+
+					$aHKChanges = array();
+					$aHKChanges[$sAttCode] = $aDBChanges[$sAttCode];
+					$aHKChanges[$oAttDef->GetSQLLeft()] = $iNewLeft;
+					$aHKChanges[$oAttDef->GetSQLRight()] = $iNewLeft + $iDelta - 1;
+					$aDBChanges[$sAttCode] = $aHKChanges; // the 3 values will be stored by MakeUpdateQuery below
+				}
+				
+				// Update scalar attributes
+				if (count($aDBChanges) != 0)
+				{
+					$oFilter = new DBObjectSearch(get_class($this));
+					$oFilter->AddCondition('id', $this->m_iKey, '=');
+					$oFilter->AllowAllData();
+			
+					$sSQL = $oFilter->MakeUpdateQuery($aDBChanges);
+					CMDBSource::Query($sSQL);
+				}
+			}
+
+			$this->DBWriteLinks();
+			$this->WriteExternalAttributes();
+
+			$this->m_bDirty = false;
+			$this->m_aTouchedAtt = array();
+			$this->m_aModifiedAtt = array();
+
+			$this->AfterUpdate();
+
+			// Reload to get the external attributes
+			if ($bHasANewExternalKeyValue)
+			{
+				$this->Reload(true /* AllowAllData */);
+			}
+			else
+			{
+				// Reset original values although the object has not been reloaded
+				foreach ($this->m_aLoadedAtt as $sAttCode => $bLoaded)
+				{
+					if ($bLoaded)
+					{
+						$value = $this->m_aCurrValues[$sAttCode];
+						$this->m_aOrigValues[$sAttCode] = is_object($value) ? clone $value : $value;
+					}
+				}
+			}
+
+			if (count($aChanges) != 0)
+			{
+				$this->RecordAttChanges($aChanges, $aOriginalValues);
+			}
+		}
+		catch (Exception $e)
+		{
+			unset($aUpdateReentrance[$sKey]);
+			throw $e;
+		}
+
+		unset($aUpdateReentrance[$sKey]);
+		return $this->m_iKey;
+	}
+	
+	public function DBUpdateTracked(CMDBChange $oChange)
+	{
+		CMDBObject::SetCurrentChange($oChange);
+		return $this->DBUpdate();
+	}
+
+	// Make the current changes persistent - clever wrapper for Insert or Update
+	public function DBWrite()
+	{
+		if ($this->m_bIsInDB)
+		{
+			return $this->DBUpdate();
+		}
+		else
+		{
+			return $this->DBInsert();
+		}
+	}
+
+	private function DBDeleteSingleTable($sTableClass)
+	{
+		$sTable = MetaModel::DBGetTable($sTableClass);
+		// Abstract classes or classes having no specific attribute do not have an associated table
+		if ($sTable == '') return;
+
+		$sPKField = '`'.MetaModel::DBGetKey($sTableClass).'`';
+		$sKey = CMDBSource::Quote($this->m_iKey);
+
+		$sDeleteSQL = "DELETE FROM `$sTable` WHERE $sPKField = $sKey";
+		CMDBSource::DeleteFrom($sDeleteSQL);
+	}
+
+	protected function DBDeleteSingleObject()
+	{
+		if (!MetaModel::DBIsReadOnly())
+		{
+			$this->OnDelete();
+			$this->RecordObjDeletion($this->m_iKey); // May cause a reload for storing history information
+			
+			foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsHierarchicalKey())
+				{
+					// Update the left & right indexes for each hierarchical key
+					$sTable = $sTable = MetaModel::DBGetTable(get_class($this), $sAttCode);
+					$sSQL = "SELECT `".$oAttDef->GetSQLRight()."` AS `right`, `".$oAttDef->GetSQLLeft()."` AS `left` FROM `$sTable` WHERE id=".CMDBSource::Quote($this->m_iKey);
+					$aRes = CMDBSource::QueryToArray($sSQL);
+					$iMyLeft = $aRes[0]['left'];
+					$iMyRight = $aRes[0]['right'];
+					$iDelta =$iMyRight - $iMyLeft + 1;
+					MetaModel::HKTemporaryCutBranch($iMyLeft, $iMyRight, $oAttDef, $sTable);
+
+					// No new parent for now, insert completely at the right of the tree
+					$sSQL = "SELECT max(`".$oAttDef->GetSQLRight()."`) AS max FROM `$sTable`";
+					$aRes = CMDBSource::QueryToArray($sSQL);
+					if (count($aRes) == 0)
+					{
+						$iNewLeft = 1;
+					}
+					else
+					{
+						$iNewLeft = $aRes[0]['max']+1;
+					}
+					MetaModel::HKReplugBranch($iNewLeft, $iNewLeft + $iDelta - 1, $oAttDef, $sTable);
+				}
+				elseif (!$oAttDef->LoadFromDB())
+				{
+					$oAttDef->DeleteValue($this);
+				}
+			}
+
+			foreach(MetaModel::EnumParentClasses(get_class($this), ENUM_PARENT_CLASSES_ALL) as $sParentClass)
+			{
+				$this->DBDeleteSingleTable($sParentClass);
+			}
+			
+			$this->AfterDelete();
+
+			$this->m_bIsInDB = false;
+			// Fix for #926: do NOT reset m_iKey as it can be used to have it for reporting purposes (see the REST service to delete objects, reported as bug #926)
+			// Thought the key is not reset, using DBInsert or DBWrite will create an object having the same characteristics and a new ID. DBUpdate is protected
+		}
+	}
+
+	// Delete an object... and guarantee data integrity
+	//
+	public function DBDelete(&$oDeletionPlan = null)
+	{
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
+		if (is_null($oDeletionPlan))
+		{
+			$oDeletionPlan = new DeletionPlan();
+		}
+		$this->MakeDeletionPlan($oDeletionPlan);
+		$oDeletionPlan->ComputeResults();
+
+		if ($oDeletionPlan->FoundStopper())
+		{
+			$aIssues = $oDeletionPlan->GetIssues();
+			throw new DeleteException('Found issue(s)', array('target_class' => get_class($this), 'target_id' => $this->GetKey(), 'issues' => implode(', ', $aIssues)));	
+		}
+		else
+		{
+			// Getting and setting time limit are not symetric:
+			// www.php.net/manual/fr/function.set-time-limit.php#72305
+			$iPreviousTimeLimit = ini_get('max_execution_time');
+
+			foreach ($oDeletionPlan->ListDeletes() as $sClass => $aToDelete)
+			{
+				foreach ($aToDelete as $iId => $aData)
+				{
+					$oToDelete = $aData['to_delete'];
+					// The deletion based on a deletion plan should not be done for each oject if the deletion plan is common (Trac #457)
+					// because for each object we would try to update all the preceding ones... that are already deleted
+					// A better approach would be to change the API to apply the DBDelete on the deletion plan itself... just once
+					// As a temporary fix: delete only the objects that are still to be deleted...
+					if ($oToDelete->m_bIsInDB)
+					{
+						set_time_limit($iLoopTimeLimit);
+						$oToDelete->DBDeleteSingleObject();
+					}
+				}
+			}
+
+			foreach ($oDeletionPlan->ListUpdates() as $sClass => $aToUpdate)
+			{
+				foreach ($aToUpdate as $iId => $aData)
+				{
+					$oToUpdate = $aData['to_reset'];
+					foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+					{
+						$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+						set_time_limit($iLoopTimeLimit);
+						$oToUpdate->DBUpdate();
+					}
+				}
+			}
+
+			set_time_limit($iPreviousTimeLimit);
+		}
+
+		return $oDeletionPlan;
+	}
+
+	public function DBDeleteTracked(CMDBChange $oChange, $bSkipStrongSecurity = null, &$oDeletionPlan = null)
+	{
+		CMDBObject::SetCurrentChange($oChange);
+		$this->DBDelete($oDeletionPlan);
+	}
+
+	public function EnumTransitions()
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (empty($sStateAttCode)) return array();
+
+		$sState = $this->Get(MetaModel::GetStateAttributeCode(get_class($this)));
+		return MetaModel::EnumTransitions(get_class($this), $sState);
+	}
+
+	/**
+	 * Designed as an action to be called when a stop watch threshold times out
+	 * or from within the framework
+	 * @param $sStimulusCode
+	 * @param bool|false $bDoNotWrite
+	 * @return bool
+	 * @throws CoreException
+	 * @throws CoreUnexpectedValue
+	 */
+	public function ApplyStimulus($sStimulusCode, $bDoNotWrite = false)
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode(get_class($this));
+		if (empty($sStateAttCode))
+		{
+			throw new CoreException('No lifecycle for the class '.get_class($this));
+		}
+
+		MyHelpers::CheckKeyInArray('object lifecycle stimulus', $sStimulusCode, MetaModel::EnumStimuli(get_class($this)));
+
+		$aStateTransitions = $this->EnumTransitions();
+		if (!array_key_exists($sStimulusCode, $aStateTransitions))
+		{
+			// This simulus has no effect in the current state... do nothing
+			return true;
+		}
+		$aTransitionDef = $aStateTransitions[$sStimulusCode];
+
+		// Change the state before proceeding to the actions, this is necessary because an action might
+		// trigger another stimuli (alternative: push the stimuli into a queue)
+		$sPreviousState = $this->Get($sStateAttCode);
+		$sNewState = $aTransitionDef['target_state'];
+		$this->Set($sStateAttCode, $sNewState);
+
+		// $aTransitionDef is an
+		//    array('target_state'=>..., 'actions'=>array of handlers procs, 'user_restriction'=>TBD
+
+		$bSuccess = true;
+		foreach ($aTransitionDef['actions'] as $actionHandler)
+		{
+			if (is_string($actionHandler))
+			{
+				// Old (pre-2.1.0 modules) action definition without any parameter
+				$aActionCallSpec = array($this, $actionHandler);
+				$sActionDesc = get_class($this).'::'.$actionHandler;
+	
+				if (!is_callable($aActionCallSpec))
+				{
+					throw new CoreException("Unable to call action: ".get_class($this)."::$actionHandler");
+				}
+				$bRet = call_user_func($aActionCallSpec, $sStimulusCode);
+			}
+			else // if (is_array($actionHandler))
+			{
+				// New syntax: 'verb' and typed parameters
+				$sAction = $actionHandler['verb'];
+				$sActionDesc = get_class($this).'::'.$sAction;
+				$aParams = array();
+				foreach($actionHandler['params'] as $aDefinition)
+				{
+					$sParamType = array_key_exists('type', $aDefinition) ? $aDefinition['type'] : 'string';
+					switch($sParamType)
+					{
+						case 'int':
+						$value = (int)$aDefinition['value'];
+						break;
+						
+						case 'float':
+						$value = (float)$aDefinition['value'];
+						break;
+						
+						case 'bool':
+						$value = (bool)$aDefinition['value'];
+						break;
+						
+						case 'reference':
+						$value = ${$aDefinition['value']};
+						break;
+						
+						case 'string':
+						default:
+						$value = (string)$aDefinition['value'];
+					}
+					$aParams[] = $value;
+				}
+				$aCallSpec = array($this, $sAction);
+				$bRet = call_user_func_array($aCallSpec, $aParams);
+			}
+			// if one call fails, the whole is considered as failed
+			// (in case there is no returned value, null is obtained and means "ok")
+			if ($bRet === false)
+			{
+				IssueLog::Info("Lifecycle action $sActionDesc returned false on object #".$this->GetKey());
+				$bSuccess = false;
+			}
+		}
+		if ($bSuccess)
+		{
+			$sClass = get_class($this);
+
+			// Stop watches
+			foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef instanceof AttributeStopWatch)
+				{
+					$oSW = $this->Get($sAttCode);
+					if (in_array($sNewState, $oAttDef->GetStates()))
+					{
+						$oSW->Start($this, $oAttDef);
+					}
+					else
+					{
+						$oSW->Stop($this, $oAttDef);
+					}
+					$this->Set($sAttCode, $oSW);
+				}
+			}
+			
+			if (!$bDoNotWrite)
+			{
+				$this->DBWrite();
+			}
+
+			// Change state triggers...
+			$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateLeave AS t WHERE t.target_class IN ('$sClassList') AND t.state='$sPreviousState'"));
+			while ($oTrigger = $oSet->Fetch())
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+	
+			$oSet = new DBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnStateEnter AS t WHERE t.target_class IN ('$sClassList') AND t.state='$sNewState'"));
+			while ($oTrigger = $oSet->Fetch())
+			{
+				$oTrigger->DoActivate($this->ToArgs('this'));
+			}
+		}
+
+		return $bSuccess;
+	}
+
+	/**
+	* Designed as an action to be called when a stop watch threshold times out
+	*/	
+	public function ResetStopWatch($sAttCode)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		if (!$oAttDef instanceof AttributeStopWatch)
+		{
+			throw new CoreException("Invalid stop watch id: '$sAttCode'");
+		}
+		$oSW = $this->Get($sAttCode);
+		$oSW->Reset($this, $oAttDef);
+		$this->Set($sAttCode, $oSW);
+		return true;
+	}
+
+	/**
+	 * Lifecycle action: Recover the default value (aka when an object is being created)
+	 */	 	
+	public function Reset($sAttCode)
+	{
+		$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
+		return true;
+	}
+
+	/**
+	 * Lifecycle action: Copy an attribute to another
+	 */	 	
+	public function Copy($sDestAttCode, $sSourceAttCode)
+	{
+		$this->Set($sDestAttCode, $this->Get($sSourceAttCode));
+		return true;
+	}
+
+	/**
+	 * Lifecycle action: Set the current date/time for the given attribute
+	 */	 	
+	public function SetCurrentDate($sAttCode)
+	{
+		$this->Set($sAttCode, time());
+		return true;
+	}
+
+	/**
+	 * Lifecycle action: Set the current logged in user for the given attribute
+	 */	 	
+	public function SetCurrentUser($sAttCode)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		if ($oAttDef instanceof AttributeString)
+		{
+			// Note: the user friendly name is the contact friendly name if a contact is attached to the logged in user
+			$this->Set($sAttCode, UserRights::GetUserFriendlyName());
+		}
+		else
+		{
+			if ($oAttDef->IsExternalKey())
+			{
+				if ($oAttDef->GetTargetClass() != 'User')
+				{
+					throw new Exception("SetCurrentUser: the attribute $sAttCode must be an external key to 'User', found '".$oAttDef->GetTargetClass()."'");
+				}
+			}
+			$this->Set($sAttCode, UserRights::GetUserId());
+		}
+		return true;
+	}
+
+	/**
+	 * Lifecycle action: Set the current logged in CONTACT for the given attribute
+	 */	 	
+	public function SetCurrentPerson($sAttCode)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+		if ($oAttDef instanceof AttributeString)
+		{
+			$iPerson = UserRights::GetContactId();
+			if ($iPerson == 0)
+			{
+				$this->Set($sAttCode, '');
+			}
+			else
+			{
+				$oPerson = MetaModel::GetObject('Person', $iPerson);
+				$this->Set($sAttCode, $oPerson->Get('friendlyname'));
+			}
+		}
+		else
+		{
+			if ($oAttDef->IsExternalKey())
+			{
+				if (!MetaModel::IsParentClass($oAttDef->GetTargetClass(), 'Person'))
+				{
+					throw new Exception("SetCurrentContact: the attribute $sAttCode must be an external key to 'Person' or any other class above 'Person', found '".$oAttDef->GetTargetClass()."'");
+				}
+			}
+			$this->Set($sAttCode, UserRights::GetContactId());
+		}
+		return true;
+	}
+
+	/**
+	 * Lifecycle action: Set the time elapsed since a reference point
+	 */	 	
+	public function SetElapsedTime($sAttCode, $sRefAttCode, $sWorkingTimeComputer = null)
+	{
+		if (is_null($sWorkingTimeComputer))
+		{
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
+		}
+		$oComputer = new $sWorkingTimeComputer();
+		$aCallSpec = array($oComputer, 'GetOpenDuration');
+		if (!is_callable($aCallSpec))
+		{
+			throw new CoreException("Unknown class/verb '$sWorkingTimeComputer/GetOpenDuration'");
+		}
+
+		$iStartTime = AttributeDateTime::GetAsUnixSeconds($this->Get($sRefAttCode));
+		$oStartDate = new DateTime('@'.$iStartTime); // setTimestamp not available in PHP 5.2
+		$oEndDate = new DateTime(); // now
+
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			$sClass = get_class($this);
+			WorkingTimeRecorder::Start($this, time(), "DBObject-SetElapsedTime-$sAttCode-$sRefAttCode", 'Core:ExplainWTC:ElapsedTime', array("Class:$sClass/Attribute:$sAttCode"));
+		}
+		$iElapsed = call_user_func($aCallSpec, $this, $oStartDate, $oEndDate);
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::End();
+		}
+
+		$this->Set($sAttCode, $iElapsed);
+		return true;
+	}
+
+
+
+   	/**
+	 * Create query parameters (SELECT ... WHERE service = :this->service_id)
+	 * to be used with the APIs DBObjectSearch/DBObjectSet
+	 * 		
+	 * Starting 2.0.2 the parameters are computed on demand, at the lowest level,
+	 * in VariableExpression::Render()		
+	 */	
+	public function ToArgsForQuery($sArgName = 'this')
+	{
+		return array($sArgName.'->object()' => $this);
+	}
+
+	/**
+ 	 * Create template placeholders: now equivalent to ToArgsForQuery since the actual
+	 * template placeholders are computed on demand.	
+	 */
+	public function ToArgs($sArgName = 'this')
+	{
+		return $this->ToArgsForQuery($sArgName);
+	}
+
+	public function GetForTemplate($sPlaceholderAttCode)
+	{
+		$ret = null;
+		if (preg_match('/^([^-]+)-(>|&gt;)(.+)$/', $sPlaceholderAttCode, $aMatches)) // Support both syntaxes: this->xxx or this-&gt;xxx for HTML compatibility
+		{
+			$sExtKeyAttCode = $aMatches[1];
+			$sRemoteAttCode = $aMatches[3];
+			if (!MetaModel::IsValidAttCode(get_class($this), $sExtKeyAttCode))
+			{
+				throw new CoreException("Unknown attribute '$sExtKeyAttCode' for the class ".get_class($this));
+			}
+			
+			$oKeyAttDef = MetaModel::GetAttributeDef(get_class($this), $sExtKeyAttCode);
+			if (!$oKeyAttDef instanceof AttributeExternalKey)
+			{
+				throw new CoreException("'$sExtKeyAttCode' is not an external key of the class ".get_class($this));
+			}
+			$sRemoteClass = $oKeyAttDef->GetTargetClass();
+			$oRemoteObj = MetaModel::GetObject($sRemoteClass, $this->GetStrict($sExtKeyAttCode), false);
+			if (is_null($oRemoteObj))
+			{
+				$ret = Dict::S('UI:UndefinedObject');
+			}
+			else
+			{
+				// Recurse
+				$ret  = $oRemoteObj->GetForTemplate($sRemoteAttCode);
+			}
+		}
+		else 
+		{
+			switch($sPlaceholderAttCode)
+			{
+				case 'id':
+				$ret = $this->GetKey();
+				break;
+				
+				case 'name()':
+				$ret = $this->GetName();
+				break;
+
+				default:
+				if (preg_match('/^([^(]+)\\((.*)\\)$/', $sPlaceholderAttCode, $aMatches))
+				{
+					$sVerb = $aMatches[1];
+					$sAttCode = $aMatches[2];
+				}
+				else
+				{
+					$sVerb = '';
+					$sAttCode = $sPlaceholderAttCode;
+				}
+
+				if ($sVerb == 'hyperlink')
+				{
+					$sPortalId = ($sAttCode === '') ? 'console' : $sAttCode;
+					if (!array_key_exists($sPortalId, self::$aPortalToURLMaker))
+					{
+						throw new Exception("Unknown portal id '$sPortalId' in placeholder '$sPlaceholderAttCode''");
+					}
+					$ret = $this->GetHyperlink(self::$aPortalToURLMaker[$sPortalId], false);
+				}
+				else
+				{
+					$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+					$ret = $oAttDef->GetForTemplate($this->Get($sAttCode), $sVerb, $this);
+				}
+			}
+			if ($ret === null)
+			{
+				$ret = '';
+			}
+		}
+		return $ret;
+	}
+
+	static protected $aPortalToURLMaker = array('console' => 'iTopStandardURLMaker', 'portal' => 'PortalURLMaker');
+
+	/**
+	 * Associate a portal to a class that implements iDBObjectURLMaker,
+	 * and which will be invoked with placeholders like $this->org_id->hyperlink(portal)$
+	 *
+	 * @param $sPortalId Identifies the portal. Conventions: the main portal is 'console', The user requests portal is 'portal'.
+	 * @param $sUrlMakerClass
+	 */
+	static public function RegisterURLMakerClass($sPortalId, $sUrlMakerClass)
+	{
+		self::$aPortalToURLMaker[$sPortalId] = $sUrlMakerClass;
+	}
+
+	// To be optionaly overloaded
+	protected function OnInsert()
+	{
+	}
+	
+	// To be optionaly overloaded
+	protected function AfterInsert()
+	{
+	}
+
+	// To be optionaly overloaded
+	protected function OnUpdate()
+	{
+	}
+
+	// To be optionaly overloaded
+	protected function AfterUpdate()
+	{
+	}
+
+	// To be optionaly overloaded
+	protected function OnDelete()
+	{
+	}
+
+	// To be optionaly overloaded
+	protected function AfterDelete()
+	{
+	}
+
+
+	/**
+	 * Common to the recording of link set changes (add/remove/modify)	
+	 */	
+	private function PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, $sChangeOpClass, $aOriginalValues = null)
+	{
+		if ($iLinkSetOwnerId <= 0)
+		{
+			return null;
+		}
+
+		if (!is_subclass_of($oLinkSet->GetHostClass(), 'CMDBObject'))
+		{
+			// The link set owner class does not keep track of its history
+			return null;
+		}
+
+		// Determine the linked item class and id
+		//
+		if ($oLinkSet->IsIndirect())
+		{
+			// The "item" is on the other end (N-N links)
+			$sExtKeyToRemote = $oLinkSet->GetExtKeyToRemote();
+			$oExtKeyToRemote = MetaModel::GetAttributeDef(get_class($this), $sExtKeyToRemote);
+			$sItemClass = $oExtKeyToRemote->GetTargetClass();
+			if ($aOriginalValues)
+			{
+				// Get the value from the original values
+				$iItemId = $aOriginalValues[$sExtKeyToRemote];
+			}
+			else
+			{
+				$iItemId = $this->Get($sExtKeyToRemote);
+			}
+		}
+		else
+		{
+			// I am the "item" (1-N links)
+			$sItemClass = get_class($this);
+			$iItemId = $this->GetKey();
+		}
+
+		// Get the remote object, to determine its exact class
+		// Possible optimization: implement a tool in MetaModel, to get the final class of an object (not always querying + query reduced to a select on the root table!
+		$oOwner = MetaModel::GetObject($oLinkSet->GetHostClass(), $iLinkSetOwnerId, false);
+		if ($oOwner)
+		{
+			$sLinkSetOwnerClass = get_class($oOwner);
+			
+			$oMyChangeOp = MetaModel::NewObject($sChangeOpClass);
+			$oMyChangeOp->Set("objclass", $sLinkSetOwnerClass);
+			$oMyChangeOp->Set("objkey", $iLinkSetOwnerId);
+			$oMyChangeOp->Set("attcode", $oLinkSet->GetCode());
+			$oMyChangeOp->Set("item_class", $sItemClass);
+			$oMyChangeOp->Set("item_id", $iItemId);
+			return $oMyChangeOp;
+		}
+		else
+		{
+			// Depending on the deletion order, it may happen that the id is already invalid... ignore
+			return null;
+		}
+	}
+
+	/**
+	 *  This object has been created/deleted, record that as a change in link sets pointing to this (if any)
+	 */	
+	private function RecordLinkSetListChange($bAdd = true)
+	{
+		$aForwardChangeTracking = MetaModel::GetTrackForwardExternalKeys(get_class($this));
+		foreach(MetaModel::GetTrackForwardExternalKeys(get_class($this)) as $sExtKeyAttCode => $oLinkSet)
+		{
+			if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
+			
+			$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
+			$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
+			if ($oMyChangeOp)
+			{
+				if ($bAdd)
+				{
+					$oMyChangeOp->Set("type", "added");
+				}
+				else
+				{
+					$oMyChangeOp->Set("type", "removed");
+				}
+				$iId = $oMyChangeOp->DBInsertNoReload();
+			}
+		}
+	}
+
+	protected function RecordObjCreation()
+	{
+		$this->RecordLinkSetListChange(true);
+	}
+
+	protected function RecordObjDeletion($objkey)
+	{
+		$this->RecordLinkSetListChange(false);
+	}
+
+	protected function RecordAttChanges(array $aValues, array $aOrigValues)
+	{
+		$aForwardChangeTracking = MetaModel::GetTrackForwardExternalKeys(get_class($this));
+		foreach(MetaModel::GetTrackForwardExternalKeys(get_class($this)) as $sExtKeyAttCode => $oLinkSet)
+		{
+
+			if (array_key_exists($sExtKeyAttCode, $aValues))
+			{
+				if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_LIST) == 0) continue;
+
+				// Keep track of link added/removed
+				//
+				$iLinkSetOwnerNext = $aValues[$sExtKeyAttCode];
+				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerNext, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove');
+				if ($oMyChangeOp)
+				{
+					$oMyChangeOp->Set("type", "added");
+					$oMyChangeOp->DBInsertNoReload();
+				}
+
+				$iLinkSetOwnerPrevious = $aOrigValues[$sExtKeyAttCode];
+				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerPrevious, $oLinkSet, 'CMDBChangeOpSetAttributeLinksAddRemove', $aOrigValues);
+				if ($oMyChangeOp)
+				{
+					$oMyChangeOp->Set("type", "removed");
+					$oMyChangeOp->DBInsertNoReload();
+				}
+			}
+			else
+			{
+				// Keep track of link changes
+				//
+				if (($oLinkSet->GetTrackingLevel() & LINKSET_TRACKING_DETAILS) == 0) continue;
+				
+				$iLinkSetOwnerId  = $this->Get($sExtKeyAttCode);
+				$oMyChangeOp = $this->PrepareChangeOpLinkSet($iLinkSetOwnerId, $oLinkSet, 'CMDBChangeOpSetAttributeLinksTune');
+				if ($oMyChangeOp)
+				{
+					$oMyChangeOp->Set("link_id", $this->GetKey());
+					$iId = $oMyChangeOp->DBInsertNoReload();
+				}
+			}
+		}
+	}
+
+	// Return an empty set for the parent of all
+	// May be overloaded.
+	// Anyhow, this way of implementing the relations suffers limitations (not handling the redundancy)
+	// and you should consider defining those things in XML.
+	public static function GetRelationQueries($sRelCode)
+	{
+		return array();
+	}
+	
+	// Reserved: do not overload
+	public static function GetRelationQueriesEx($sRelCode)
+	{
+		return array();
+	}
+
+	/**
+	 * Will be deprecated soon - use GetRelatedObjectsDown/Up instead to take redundancy into account
+	 */
+	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99, &$aResults = array())
+	{
+		// Temporary patch: until the impact analysis GUI gets rewritten,
+		// let's consider that "depends on" is equivalent to "impacts/up"
+		// The current patch has been implemented in DBObject and MetaModel
+		$sHackedRelCode = $sRelCode;
+		$bDown = true;
+		if ($sRelCode == 'depends on')
+		{
+			$sHackedRelCode = 'impacts';
+			$bDown = false;
+		}
+		foreach (MetaModel::EnumRelationQueries(get_class($this), $sHackedRelCode, $bDown) as $sDummy => $aQueryInfo)
+		{
+			$sQuery = $bDown ? $aQueryInfo['sQueryDown'] : $aQueryInfo['sQueryUp'];
+			//$bPropagate = $aQueryInfo["bPropagate"];
+			//$iDepth = $bPropagate ? $iMaxDepth - 1 : 0;
+			$iDepth = $iMaxDepth - 1;
+
+			// Note: the loop over the result set has been written in an unusual way for error reporting purposes
+			// In the case of a wrong query parameter name, the error occurs on the first call to Fetch,
+			// thus we need to have this first call into the try/catch, but
+			// we do NOT want to nest the try/catch for the error message to be clear
+			try
+			{
+				$oFlt = DBObjectSearch::FromOQL($sQuery);
+				$oObjSet = new DBObjectSet($oFlt, array(), $this->ToArgsForQuery());
+				$oObj = $oObjSet->Fetch();
+			}
+			catch (Exception $e)
+			{
+				$sClassOfDefinition = $aQueryInfo['_legacy_'] ? get_class($this).'(or a parent)::GetRelationQueries()' : $aQueryInfo['sDefinedInClass'];
+				throw new Exception("Wrong query for the relation $sRelCode/$sClassOfDefinition/{$aQueryInfo['sNeighbour']}: ".$e->getMessage());
+			}
+			if ($oObj)
+			{
+				do
+				{
+					$sRootClass = MetaModel::GetRootClass(get_class($oObj));
+					$sObjKey = $oObj->GetKey();
+					if (array_key_exists($sRootClass, $aResults))
+					{
+						if (array_key_exists($sObjKey, $aResults[$sRootClass]))
+						{
+							continue; // already visited, skip
+						}
+					}
+	
+					$aResults[$sRootClass][$sObjKey] = $oObj;
+					if ($iDepth > 0)
+					{
+						$oObj->GetRelatedObjects($sRelCode, $iDepth, $aResults);
+					}
+				}
+				while ($oObj = $oObjSet->Fetch());
+			}
+		}
+		return $aResults;
+	}
+	
+	/**
+	 * Compute the "RelatedObjects" (forward or "down" direction) for the object
+	 * for the specified relation
+	 *
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Maximum recursion depth
+	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
+	 *
+	 * @return RelationGraph The graph of all the related objects
+	 */
+	public function GetRelatedObjectsDown($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
+	{
+		$oGraph = new RelationGraph();
+		$oGraph->AddSourceObject($this);
+		$oGraph->ComputeRelatedObjectsDown($sRelCode, $iMaxDepth, $bEnableRedundancy);
+		return $oGraph;
+	}
+	
+	/**
+	 * Compute the "RelatedObjects" (reverse or "up" direction) for the object
+	 * for the specified relation
+	 *
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Maximum recursion depth
+	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
+	 *
+	 * @return RelationGraph The graph of all the related objects
+	 */
+	public function GetRelatedObjectsUp($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
+	{
+		$oGraph = new RelationGraph();
+		$oGraph->AddSourceObject($this);
+		$oGraph->ComputeRelatedObjectsUp($sRelCode, $iMaxDepth, $bEnableRedundancy);
+		return $oGraph;
+	}
+	
+	public function GetReferencingObjects($bAllowAllData = false)
+	{
+		$aDependentObjects = array();
+		$aRererencingMe = MetaModel::EnumReferencingClasses(get_class($this));
+		foreach($aRererencingMe as $sRemoteClass => $aExtKeys)
+		{
+			foreach($aExtKeys as $sExtKeyAttCode => $oExtKeyAttDef)
+			{
+				// skip if this external key is behind an external field
+				if (!$oExtKeyAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) continue;
+
+				$oSearch = new DBObjectSearch($sRemoteClass);
+				$oSearch->AddCondition($sExtKeyAttCode, $this->GetKey(), '=');
+				if ($bAllowAllData)
+				{
+					$oSearch->AllowAllData();
+				}
+				$oSet = new CMDBObjectSet($oSearch);
+				if ($oSet->CountExceeds(0))
+				{
+					$aDependentObjects[$sRemoteClass][$sExtKeyAttCode] = array(
+						'attribute' => $oExtKeyAttDef,
+						'objects' => $oSet,
+					);
+				}
+			}
+		}
+		return $aDependentObjects;
+	}
+
+	private function MakeDeletionPlan(&$oDeletionPlan, $aVisited = array(), $iDeleteOption = null)
+	{
+		static $iLoopTimeLimit = null;
+		if ($iLoopTimeLimit == null)
+		{
+			$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		}
+		$sClass = get_class($this);
+		$iThisId = $this->GetKey();
+
+		$iDeleteOption = $oDeletionPlan->AddToDelete($this, $iDeleteOption);
+
+		if (array_key_exists($sClass, $aVisited))
+		{
+			if (in_array($iThisId, $aVisited[$sClass]))
+			{
+				return;
+			}
+		}
+		$aVisited[$sClass] = $iThisId;
+
+		if ($iDeleteOption == DEL_MANUAL)
+		{
+			// Stop the recursion here
+			return;
+		}
+		// Check the node itself
+		$this->DoCheckToDelete($oDeletionPlan);
+		$oDeletionPlan->SetDeletionIssues($this, $this->m_aDeleteIssues, $this->m_bSecurityIssue);
+	
+		$aDependentObjects = $this->GetReferencingObjects(true /* allow all data */);
+
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+
+		foreach ($aDependentObjects as $sRemoteClass => $aPotentialDeletes)
+		{
+			foreach ($aPotentialDeletes as $sRemoteExtKey => $aData)
+			{
+				set_time_limit($iLoopTimeLimit);
+
+				$oAttDef = $aData['attribute'];
+				$iDeletePropagationOption = $oAttDef->GetDeletionPropagationOption();
+				$oDepSet = $aData['objects'];
+				$oDepSet->Rewind();
+				while ($oDependentObj = $oDepSet->fetch())
+				{
+					$iId = $oDependentObj->GetKey();
+					if ($oAttDef->IsNullAllowed())
+					{
+						// Optional external key, list to reset
+						if (($iDeletePropagationOption == DEL_MOVEUP) && ($oAttDef->IsHierarchicalKey()))
+						{
+							// Move the child up one level i.e. set the same parent as the current object
+							$iParentId = $this->Get($oAttDef->GetCode());
+							$oDeletionPlan->AddToUpdate($oDependentObj, $oAttDef, $iParentId);
+						}
+						else
+						{
+							$oDeletionPlan->AddToUpdate($oDependentObj, $oAttDef);
+						}
+					}
+					else
+					{
+						// Mandatory external key, list to delete
+						$oDependentObj->MakeDeletionPlan($oDeletionPlan, $aVisited, $iDeletePropagationOption);
+					}
+				}
+			}
+		}
+		set_time_limit($iPreviousTimeLimit);
+	}
+
+	/**
+	 * WILL DEPRECATED SOON
+	 * Caching relying on an object set is not efficient since 2.0.3
+	 * Use GetSynchroData instead
+	 * 	 
+	 * Get all the synchro replica related to this object
+	 * @param none
+	 * @return DBObjectSet Set with two columns: R=SynchroReplica S=SynchroDataSource
+	 */
+	public function GetMasterReplica()
+	{
+		$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
+		$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
+		return $oReplicaSet;
+	}
+
+	/**
+	 * Get all the synchro data related to this object
+	 * @param none
+	 * @return array of data_source_id => array
+	 * 	'source' => $oSource,
+	 * 	'attributes' => array of $oSynchroAttribute
+	 * 	'replica' => array of $oReplica (though only one should exist, misuse of the data sync can have this consequence)
+	 */
+	public function GetSynchroData()
+	{
+		if (is_null($this->m_aSynchroData))
+		{
+			$sOQL = "SELECT replica,datasource FROM SynchroReplica AS replica JOIN SynchroDataSource AS datasource ON replica.sync_source_id=datasource.id WHERE replica.dest_class = :dest_class AND replica.dest_id = :dest_id";
+			$oReplicaSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array('dest_class' => get_class($this), 'dest_id' => $this->GetKey()));
+			$this->m_aSynchroData = array();
+			while($aData = $oReplicaSet->FetchAssoc())
+			{
+				$iSourceId = $aData['datasource']->GetKey();
+				if (!array_key_exists($iSourceId, $this->m_aSynchroData))
+				{
+					$aAttributes = array();
+					$oAttrSet = $aData['datasource']->Get('attribute_list');
+					while($oSyncAttr = $oAttrSet->Fetch())
+					{
+						$aAttributes[$oSyncAttr->Get('attcode')] = $oSyncAttr;
+					}
+					$this->m_aSynchroData[$iSourceId] = array(
+						'source' => $aData['datasource'],
+						'attributes' => $aAttributes,
+						'replica' => array()
+					);
+				}
+				// Assumption: $aData['datasource'] will not be null because the data source id is always set...
+				$this->m_aSynchroData[$iSourceId]['replica'][] = $aData['replica'];
+			}
+		}
+		return $this->m_aSynchroData;
+	}
+	
+	public function GetSynchroReplicaFlags($sAttCode, &$aReason)
+	{
+		$iFlags = OPT_ATT_NORMAL;
+		foreach ($this->GetSynchroData() as $iSourceId => $aSourceData)
+		{
+			if ($iSourceId == SynchroExecution::GetCurrentTaskId())
+			{
+				// Ignore the current task (check to write => ok)
+				continue;
+			}
+			// Assumption: one replica - take the first one!
+			$oReplica = reset($aSourceData['replica']);
+			$oSource = $aSourceData['source'];
+			if (array_key_exists($sAttCode, $aSourceData['attributes']))
+			{
+				$oSyncAttr = $aSourceData['attributes'][$sAttCode];
+				if (($oSyncAttr->Get('update') == 1) && ($oSyncAttr->Get('update_policy') == 'master_locked'))
+				{
+					$iFlags |= OPT_ATT_SLAVE;
+					$sUrl = $oSource->GetApplicationUrl($this, $oReplica);
+					$aReason[] = array('name' => $oSource->GetName(), 'description' => $oSource->Get('description'), 'url_application' => $sUrl);
+				}
+			}
+		}
+		return $iFlags;
+	}
+
+	public function InSyncScope()
+	{
+		//
+		// Optimization: cache the list of Data Sources and classes candidates for synchro
+		//
+		static $aSynchroClasses = null;
+		if (is_null($aSynchroClasses))
+		{
+			$aSynchroClasses = array();
+			$sOQL = "SELECT SynchroDataSource AS datasource";
+			$oSourceSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array() /* order by*/, array());
+			while($oSource = $oSourceSet->Fetch())
+			{
+				$sTarget = $oSource->Get('scope_class');
+				$aSynchroClasses[] = $sTarget;
+			}
+		}
+		
+		foreach($aSynchroClasses as $sClass)
+		{
+			if ($this instanceof $sClass)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	/////////////////////////////////////////////////////////////////////////
+	//
+	// Experimental iDisplay implementation
+	//
+	/////////////////////////////////////////////////////////////////////////
+	
+	public static function MapContextParam($sContextParam)
+	{
+		return null;
+	}
+	
+	public function GetHilightClass()
+	{
+		$sCode = $this->ComputeHighlightCode();
+		if($sCode != '')
+		{
+			$aHighlightScale = MetaModel::GetHighlightScale(get_class($this));
+			if (array_key_exists($sCode, $aHighlightScale))
+			{
+				return $aHighlightScale[$sCode]['color'];
+			}
+		}
+		return HILIGHT_CLASS_NONE;
+	}
+
+	public function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+		$oPage->add('<h1>'.MetaModel::GetName(get_class($this)).': '.$this->GetName().'</h1>');
+		$aValues = array();
+		$aList = MetaModel::FlattenZList(MetaModel::GetZListItems(get_class($this), 'details'));
+		if (empty($aList))
+		{
+			$aList = array_keys(MetaModel::ListAttributeDefs(get_class($this)));
+		}
+		foreach($aList as $sAttCode)
+		{
+			$aValues[$sAttCode] = array('label' => MetaModel::GetLabel(get_class($this), $sAttCode), 'value' => $this->GetAsHTML($sAttCode));
+		}
+		$oPage->details($aValues);
+	}
+
+
+	const CALLBACK_AFTERINSERT = 0;
+
+	/**
+	 * Register a call back that will be called when some internal event happens
+	 *	 
+	 * @param $iType string Any of the CALLBACK_x constants
+	 * @param $callback callable Call specification like a function name, or array('<class>', '<method>') or array($object, '<method>')
+	 * @param $aParameters Array Values that will be passed to the callback, after $this
+	 */	 	
+	public function RegisterCallback($iType, $callback, $aParameters = array())
+	{
+		$sCallBackName = '';
+		if (!is_callable($callback, false, $sCallBackName))
+		{
+			throw new Exception('Registering an unknown/protected function or wrong syntax for the call spec: '.$sCallBackName);
+		}
+		$this->m_aCallbacks[$iType][] = array(
+			'callback' => $callback,
+			'params' => $aParameters
+		);
+	}
+
+	/**
+	 * Computes a text-like fingerprint identifying the content of the object
+	 * but excluding the specified columns
+	 * @param $aExcludedColumns array The list of columns to exclude
+	 * @return string
+	 */
+	public function Fingerprint($aExcludedColumns = array())
+	{
+		$sFingerprint = '';
+		foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+		{
+			if (!in_array($sAttCode, $aExcludedColumns))
+			{
+				if ($oAttDef->IsPartOfFingerprint())
+				{
+					$sFingerprint .= chr(0).$oAttDef->Fingerprint($this->Get($sAttCode));
+				}
+			}
+		}
+		return $sFingerprint;
+	}
+
+	/**
+	 * Execute a set of scripted actions onto the current object
+	 * See ExecAction for the syntax and features of the scripted actions
+	 *
+	 * @param $aActions array of statements (e.g. "set(name, Made after $source->name$)")
+	 * @param $aSourceObjects Array of Alias => Context objects (Convention: some statements require the 'source' element
+	 * @throws Exception
+	 */
+	public function ExecActions($aActions, $aSourceObjects)
+	{
+		foreach($aActions as $sAction)
+		{
+			try
+			{
+				if (preg_match('/^(\S*)\s*\((.*)\)$/ms', $sAction, $aMatches)) // multiline and newline matched by a dot
+				{
+					$sVerb = trim($aMatches[1]);
+					$sParams = $aMatches[2];
+
+					// the coma is the separator for the parameters
+					// comas can be escaped: \,
+					$sParams = str_replace(array("\\\\", "\\,"), array("__backslash__", "__coma__"), $sParams);
+					$sParams = trim($sParams);
+
+					if (strlen($sParams) == 0)
+					{
+						$aParams = array();
+					}
+					else
+					{
+						$aParams = explode(',', $sParams);
+						foreach ($aParams as &$sParam)
+						{
+							$sParam = str_replace(array("__backslash__", "__coma__"), array("\\", ","), $sParam);
+							$sParam = trim($sParam);
+						}
+					}
+					$this->ExecAction($sVerb, $aParams, $aSourceObjects);
+				}
+				else
+				{
+					throw new Exception("Invalid syntax");
+				}
+			}
+			catch(Exception $e)
+			{
+				throw new Exception('Action: '.$sAction.' - '.$e->getMessage());
+			}
+		}
+	}
+
+	/**
+	 * Helper to copy an attribute between two objects (in memory)
+	 * Originally designed for ExecAction()
+	 */
+	public function CopyAttribute($oSourceObject, $sSourceAttCode, $sDestAttCode)
+	{
+		if ($sSourceAttCode == 'id')
+		{
+			$oSourceAttDef = null;
+		}
+		else
+		{
+			if (!MetaModel::IsValidAttCode(get_class($this), $sDestAttCode))
+			{
+				throw new Exception("Unknown attribute ".get_class($this)."::".$sDestAttCode);
+			}
+			if (!MetaModel::IsValidAttCode(get_class($oSourceObject), $sSourceAttCode))
+			{
+				throw new Exception("Unknown attribute ".get_class($oSourceObject)."::".$sSourceAttCode);
+			}
+
+			$oSourceAttDef = MetaModel::GetAttributeDef(get_class($oSourceObject), $sSourceAttCode);
+		}
+		if (is_object($oSourceAttDef) && $oSourceAttDef->IsLinkSet())
+		{
+			// The copy requires that we create a new object set (the semantic of DBObject::Set is unclear about link sets)
+			$oDestSet = DBObjectSet::FromScratch($oSourceAttDef->GetLinkedClass());
+			$oSourceSet = $oSourceObject->Get($sSourceAttCode);
+			$oSourceSet->Rewind();
+			while ($oSourceLink = $oSourceSet->Fetch())
+			{
+				// Clone the link
+				$sLinkClass = get_class($oSourceLink);
+				$oLinkClone = MetaModel::NewObject($sLinkClass);
+				foreach(MetaModel::ListAttributeDefs($sLinkClass) as $sAttCode => $oAttDef)
+				{
+					// As of now, ignore other attribute (do not attempt to recurse!)
+					if ($oAttDef->IsScalar())
+					{
+						$oLinkClone->Set($sAttCode, $oSourceLink->Get($sAttCode));
+					}
+				}
+
+				// Not necessary - this will be handled by DBObject
+				// $oLinkClone->Set($oSourceAttDef->GetExtKeyToMe(), 0);
+				$oDestSet->AddObject($oLinkClone);
+			}
+			$this->Set($sDestAttCode, $oDestSet);
+		}
+		else
+		{
+			$this->Set($sDestAttCode, $oSourceObject->Get($sSourceAttCode));
+		}
+	}
+
+	/**
+	 * Execute a scripted action onto the current object
+	 *    - clone (att1, att2, att3, ...)
+	 *    - clone_scalars ()
+	 *    - copy (source_att, dest_att)
+	 *    - reset (att)
+	 *    - nullify (att)
+	 *    - set (att, value (placeholders $source->att$ or $current_date$, or $current_contact_id$, ...))
+	 *    - append (att, value (placeholders $source->att$ or $current_date$, or $current_contact_id$, ...))
+	 *    - add_to_list (source_key_att, dest_att)
+	 *    - add_to_list (source_key_att, dest_att, lnk_att, lnk_att_value)
+	 *    - apply_stimulus (stimulus)
+	 *    - call_method (method_name)
+	 *
+	 * @param $sVerb string Any of the verb listed above (e.g. "set")
+	 * @param $aParams array of strings (e.g. array('name', 'copied from $source->name$')
+	 * @param $aSourceObjects Array of Alias => Context objects (Convention: some statements require the 'source' element
+	 * @throws CoreException
+	 * @throws CoreUnexpectedValue
+	 * @throws Exception
+	 */
+	public function ExecAction($sVerb, $aParams, $aSourceObjects)
+	{
+		switch($sVerb)
+		{
+			case 'clone':
+				if (!array_key_exists('source', $aSourceObjects))
+				{
+					throw new Exception('Missing conventional "source" object');
+				}
+				$oObjectToRead = $aSourceObjects['source'];
+				foreach($aParams as $sAttCode)
+				{
+					$this->CopyAttribute($oObjectToRead, $sAttCode, $sAttCode);
+				}
+				break;
+
+			case 'clone_scalars':
+				if (!array_key_exists('source', $aSourceObjects))
+				{
+					throw new Exception('Missing conventional "source" object');
+				}
+				$oObjectToRead = $aSourceObjects['source'];
+				foreach(MetaModel::ListAttributeDefs(get_class($this)) as $sAttCode => $oAttDef)
+				{
+					if ($oAttDef->IsScalar())
+					{
+						$this->CopyAttribute($oObjectToRead, $sAttCode, $sAttCode);
+					}
+				}
+				break;
+
+			case 'copy':
+				if (!array_key_exists('source', $aSourceObjects))
+				{
+					throw new Exception('Missing conventional "source" object');
+				}
+				$oObjectToRead = $aSourceObjects['source'];
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: source attribute');
+				}
+				$sSourceAttCode = $aParams[0];
+				if (!array_key_exists(1, $aParams))
+				{
+					throw new Exception('Missing argument #2: target attribute');
+				}
+				$sDestAttCode = $aParams[1];
+				$this->CopyAttribute($oObjectToRead, $sSourceAttCode, $sDestAttCode);
+				break;
+
+			case 'reset':
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: target attribute');
+				}
+				$sAttCode = $aParams[0];
+				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
+				{
+					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
+				}
+				$this->Set($sAttCode, $this->GetDefaultValue($sAttCode));
+				break;
+
+			case 'nullify':
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: target attribute');
+				}
+				$sAttCode = $aParams[0];
+				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
+				{
+					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
+				}
+				$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
+				$this->Set($sAttCode, $oAttDef->GetNullValue());
+				break;
+
+			case 'set':
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: target attribute');
+				}
+				$sAttCode = $aParams[0];
+				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
+				{
+					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
+				}
+				if (!array_key_exists(1, $aParams))
+				{
+					throw new Exception('Missing argument #2: value to set');
+				}
+				$sRawValue = $aParams[1];
+				$aContext = array();
+				foreach ($aSourceObjects as $sAlias => $oObject)
+				{
+					$aContext = array_merge($aContext, $oObject->ToArgs($sAlias));
+				}
+				$aContext['current_contact_id'] = UserRights::GetContactId();
+				$aContext['current_contact_friendlyname'] = UserRights::GetUserFriendlyName();
+				$aContext['current_date'] = date(AttributeDate::GetSQLFormat());
+				$aContext['current_time'] = date(AttributeDateTime::GetSQLTimeFormat());
+				$sValue = MetaModel::ApplyParams($sRawValue, $aContext);
+				$this->Set($sAttCode, $sValue);
+				break;
+
+			case 'append':
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: target attribute');
+				}
+				$sAttCode = $aParams[0];
+				if (!MetaModel::IsValidAttCode(get_class($this), $sAttCode))
+				{
+					throw new Exception("Unknown attribute ".get_class($this)."::".$sAttCode);
+				}
+				if (!array_key_exists(1, $aParams))
+				{
+					throw new Exception('Missing argument #2: value to append');
+				}
+				$sRawAddendum = $aParams[1];
+				$aContext = array();
+				foreach ($aSourceObjects as $sAlias => $oObject)
+				{
+					$aContext = array_merge($aContext, $oObject->ToArgs($sAlias));
+				}
+				$aContext['current_contact_id'] = UserRights::GetContactId();
+				$aContext['current_contact_friendlyname'] = UserRights::GetUserFriendlyName();
+				$aContext['current_date'] = date(AttributeDate::GetSQLFormat());
+				$aContext['current_time'] = date(AttributeDateTime::GetSQLTimeFormat());
+				$sAddendum = MetaModel::ApplyParams($sRawAddendum, $aContext);
+				$this->Set($sAttCode, $this->Get($sAttCode).$sAddendum);
+				break;
+
+			case 'add_to_list':
+				if (!array_key_exists('source', $aSourceObjects))
+				{
+					throw new Exception('Missing conventional "source" object');
+				}
+				$oObjectToRead = $aSourceObjects['source'];
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: source attribute');
+				}
+				$sSourceKeyAttCode = $aParams[0];
+				if (($sSourceKeyAttCode != 'id') && !MetaModel::IsValidAttCode(get_class($oObjectToRead), $sSourceKeyAttCode))
+				{
+					throw new Exception("Unknown attribute ".get_class($oObjectToRead)."::".$sSourceKeyAttCode);
+				}
+				if (!array_key_exists(1, $aParams))
+				{
+					throw new Exception('Missing argument #2: target attribute (link set)');
+				}
+				$sTargetListAttCode = $aParams[1]; // indirect !!!
+				if (!MetaModel::IsValidAttCode(get_class($this), $sTargetListAttCode))
+				{
+					throw new Exception("Unknown attribute ".get_class($this)."::".$sTargetListAttCode);
+				}
+				if (isset($aParams[2]) && isset($aParams[3]))
+				{
+					$sRoleAttCode = $aParams[2];
+					$sRoleValue = $aParams[3];
+				}
+
+				$iObjKey = $oObjectToRead->Get($sSourceKeyAttCode);
+				if ($iObjKey > 0)
+				{
+					$oLinkSet = $this->Get($sTargetListAttCode);
+
+					$oListAttDef = MetaModel::GetAttributeDef(get_class($this), $sTargetListAttCode);
+					$oLnk = MetaModel::NewObject($oListAttDef->GetLinkedClass());
+					$oLnk->Set($oListAttDef->GetExtKeyToRemote(), $iObjKey);
+					if (isset($sRoleAttCode))
+					{
+						if (!MetaModel::IsValidAttCode(get_class($oLnk), $sRoleAttCode))
+						{
+							throw new Exception("Unknown attribute ".get_class($oLnk)."::".$sRoleAttCode);
+						}
+						$oLnk->Set($sRoleAttCode, $sRoleValue);
+					}
+					$oLinkSet->AddObject($oLnk);
+					$this->Set($sTargetListAttCode, $oLinkSet);
+				}
+				break;
+
+			case 'apply_stimulus':
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: stimulus');
+				}
+				$sStimulus = $aParams[0];
+				if (!in_array($sStimulus, MetaModel::EnumStimuli(get_class($this))))
+				{
+					throw new Exception("Unknown stimulus ".get_class($this)."::".$sStimulus);
+				}
+				$this->ApplyStimulus($sStimulus);
+				break;
+
+			case 'call_method':
+				if (!array_key_exists('source', $aSourceObjects))
+				{
+					throw new Exception('Missing conventional "source" object');
+				}
+				$oObjectToRead = $aSourceObjects['source'];
+				if (!array_key_exists(0, $aParams))
+				{
+					throw new Exception('Missing argument #1: method name');
+				}
+				$sMethod = $aParams[0];
+				$aCallSpec = array($this, $sMethod);
+				if (!is_callable($aCallSpec))
+				{
+					throw new Exception("Unknown method ".get_class($this)."::".$sMethod.'()');
+				}
+				// Note: $oObjectToRead has been preserved when adding $aSourceObjects, so as to remain backward compatible with methods having only 1 parameter ($oObjectToRead�
+				call_user_func($aCallSpec, $oObjectToRead, $aSourceObjects);
+				break;
+
+			default:
+				throw new Exception("Invalid verb");
+		}
+	}
+
+	public function IsArchived($sKeyAttCode = null)
+	{
+		$bRet = false;
+		$sFlagAttCode = is_null($sKeyAttCode) ? 'archive_flag' : $sKeyAttCode.'_archive_flag';
+		if (MetaModel::IsValidAttCode(get_class($this), $sFlagAttCode) && $this->Get($sFlagAttCode))
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+
+	public function IsObsolete($sKeyAttCode = null)
+	{
+		$bRet = false;
+		$sFlagAttCode = is_null($sKeyAttCode) ? 'obsolescence_flag' : $sKeyAttCode.'_obsolescence_flag';
+		if (MetaModel::IsValidAttCode(get_class($this), $sFlagAttCode) && $this->Get($sFlagAttCode))
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+
+	/**
+	 * @param $bArchive
+	 * @throws Exception
+	 */
+	protected function DBWriteArchiveFlag($bArchive)
+	{
+		if (!MetaModel::IsArchivable(get_class($this)))
+		{
+			throw new Exception(get_class($this).' is not an archivable class');
+		}
+
+		$iFlag = $bArchive ? 1 : 0;
+		$sDate = $bArchive ? '"'.date(AttributeDate::GetSQLFormat()).'"' : 'null';
+
+		$sClass = get_class($this);
+		$sArchiveRoot = MetaModel::GetAttributeOrigin($sClass, 'archive_flag');
+		$sRootTable = MetaModel::DBGetTable($sArchiveRoot);
+		$sRootKey = MetaModel::DBGetKey($sArchiveRoot);
+		$aJoins = array("`$sRootTable`");
+		$aUpdates = array();
+		foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL) as $sParentClass)
+		{
+			if (!MetaModel::IsValidAttCode($sParentClass, 'archive_flag')) continue;
+
+			$sTable = MetaModel::DBGetTable($sParentClass);
+			$aUpdates[] = "`$sTable`.`archive_flag` = $iFlag";
+			if ($sParentClass == $sArchiveRoot)
+			{
+				if (!$bArchive || $this->Get('archive_date') == '')
+				{
+					// Erase or set the date (do not change it)
+					$aUpdates[] = "`$sTable`.`archive_date` = $sDate";
+				}
+			}
+			else
+			{
+				$sKey = MetaModel::DBGetKey($sParentClass);
+				$aJoins[] = "`$sTable` ON `$sTable`.`$sKey` = `$sRootTable`.`$sRootKey`";
+			}
+		}
+		$sJoins = implode(' INNER JOIN ', $aJoins);
+		$sValues = implode(', ', $aUpdates);
+		$sUpdateQuery = "UPDATE $sJoins SET $sValues WHERE `$sRootTable`.`$sRootKey` = ".$this->GetKey();
+		CMDBSource::Query($sUpdateQuery);
+	}
+
+	/**
+	 * Can be called to repair the database (tables consistency)
+	 * The archive_date will be preserved
+	 * @throws Exception
+	 */
+	public function DBArchive()
+	{
+		$this->DBWriteArchiveFlag(true);
+		$this->m_aCurrValues['archive_flag'] = true;
+		$this->m_aOrigValues['archive_flag'] = true;
+	}
+
+	public function DBUnarchive()
+	{
+		$this->DBWriteArchiveFlag(false);
+		$this->m_aCurrValues['archive_flag'] = false;
+		$this->m_aOrigValues['archive_flag'] = false;
+		$this->m_aCurrValues['archive_date'] = null;
+		$this->m_aOrigValues['archive_date'] = null;
+	}
+
+
+
+	/**
+	 * @param string $sClass Needs to be an instanciable class
+	 * @returns $oObj
+	 **/
+	public static function MakeDefaultInstance($sClass)
+	{
+		$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
+		$oObj = MetaModel::NewObject($sClass);
+		if (!empty($sStateAttCode))
+		{
+			$sTargetState = MetaModel::GetDefaultState($sClass);
+			$oObj->Set($sStateAttCode, $sTargetState);
+		}
+		return $oObj;
+	}
+
+	/**
+	 * Complete a new object with data from context
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillCreationForm(&$aContextParam)
+	{
+	}
+
+	/**
+	 * Complete an object after a state transition with data from context
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillTransitionForm(&$aContextParam)
+	{
+	}
+
+	/**
+	 * Complete a filter ($aContextParam['filter']) data from context
+	 * (Called on source object)
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillSearchForm(&$aContextParam)
+	{
+	}
+
+	/**
+	 * Prefill a creation / stimulus change / search form according to context, current state of an object, stimulus.. $sOperation
+	 * @param string $sOperation Operation identifier
+	 * @param array $aContextParam Context used for creation form prefilling
+	 *
+	 */
+	public function PrefillForm($sOperation, &$aContextParam)
+	{
+		switch($sOperation){
+			case 'creation_from_0':
+			case 'creation_from_extkey':
+			case 'creation_from_editinplace':
+				$this->PrefillCreationForm($aContextParam);
+				break;
+			case 'state_change':
+				$this->PrefillTransitionForm($aContextParam);
+				break;
+			case 'search':
+				$this->PrefillSearchForm($aContextParam);
+				break;
+			default:
+				break;
+		}
+	}
+}
+
diff --git a/core/dbobjectiterator.php b/core/dbobjectiterator.php
index 786c6c888..d1433a0b1 100644
--- a/core/dbobjectiterator.php
+++ b/core/dbobjectiterator.php
@@ -1,63 +1,63 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
- *
- * @package     iTopORM
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-interface iDBObjectSetIterator extends Countable
-{
-	/**
-	 * The class of the objects of the collection (at least a common ancestor)
-	 *
-	 * @return string
-	 */
-	public function GetClass();
-
-	/**
-	 * The total number of objects in the collection
-	 *
-	 * @return int
-	 */
-	public function Count();
-
-	/**
-	 * Reset the cursor to the first item in the collection. Equivalent to Seek(0)
-	 *
-	 * @return DBObject The fetched object or null when at the end
-	 */
-	public function Rewind();
-
-	/**
-	 * Position the cursor to the given 0-based position
-	 *
-	 * @param int $iRow
-	 */
-	public function Seek($iPosition);
-
-	/**
-	 * Fetch the object at the current position in the collection and move the cursor to the next position.
-	 *
-	 * @return DBObject The fetched object or null when at the end
-	 */
-	public function Fetch();
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
+ *
+ * @package     iTopORM
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+interface iDBObjectSetIterator extends Countable
+{
+	/**
+	 * The class of the objects of the collection (at least a common ancestor)
+	 *
+	 * @return string
+	 */
+	public function GetClass();
+
+	/**
+	 * The total number of objects in the collection
+	 *
+	 * @return int
+	 */
+	public function Count();
+
+	/**
+	 * Reset the cursor to the first item in the collection. Equivalent to Seek(0)
+	 *
+	 * @return DBObject The fetched object or null when at the end
+	 */
+	public function Rewind();
+
+	/**
+	 * Position the cursor to the given 0-based position
+	 *
+	 * @param int $iRow
+	 */
+	public function Seek($iPosition);
+
+	/**
+	 * Fetch the object at the current position in the collection and move the cursor to the next position.
+	 *
+	 * @return DBObject The fetched object or null when at the end
+	 */
+	public function Fetch();
+}
diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php
index ce6153aa4..39acb773c 100644
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -1,2396 +1,2396 @@
-<?php
-// Copyright (c) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-// Dev hack for disabling the some query build optimizations (Folding/Merging)
-define('ENABLE_OPT', true);
-
-class DBObjectSearch extends DBSearch
-{
-	private $m_aClasses; // queried classes (alias => class name), the first item is the class corresponding to this filter (the rest is coming from subfilters)
-	private $m_aSelectedClasses; // selected for the output (alias => class name)
-	private $m_oSearchCondition;
-	private $m_aParams;
-	private $m_aPointingTo;
-	private $m_aReferencedBy;
-
-	// By default, some information may be hidden to the current user
-	// But it may happen that we need to disable that feature
-	protected $m_bAllowAllData = false;
-	protected $m_bDataFiltered = false;
-
-	public function __construct($sClass, $sClassAlias = null)
-	{
-		parent::__construct();
-
-		if (is_null($sClassAlias)) $sClassAlias = $sClass;
-		if(!is_string($sClass)) throw new Exception('DBObjectSearch::__construct called with a non-string parameter: $sClass = '.print_r($sClass, true));
-		if(!MetaModel::IsValidClass($sClass)) throw new Exception('DBObjectSearch::__construct called for an invalid class: "'.$sClass.'"');
-
-		$this->m_aSelectedClasses = array($sClassAlias => $sClass);
-		$this->m_aClasses = array($sClassAlias => $sClass);
-		$this->m_oSearchCondition = new TrueExpression;
-		$this->m_aParams = array();
-		$this->m_aPointingTo = array();
-		$this->m_aReferencedBy = array();
-	}
-
-	public function AllowAllData($bAllowAllData = true) {$this->m_bAllowAllData = $bAllowAllData;}
-	public function IsAllDataAllowed() {return $this->m_bAllowAllData;}
-	protected function IsDataFiltered() {return $this->m_bDataFiltered; }
-	protected function SetDataFiltered() {$this->m_bDataFiltered = true;}
-
-	// Create a search definition that leads to 0 result, still a valid search object
-	static public function FromEmptySet($sClass)
-	{
-		$oResultFilter = new DBObjectSearch($sClass);
-		$oResultFilter->m_oSearchCondition = new FalseExpression;
-		return $oResultFilter;
-	}
-
-
-	public function GetJoinedClasses() {return $this->m_aClasses;}
-
-	public function GetClassName($sAlias)
-	{
-		if (array_key_exists($sAlias, $this->m_aSelectedClasses))
-		{
-			return $this->m_aSelectedClasses[$sAlias];
-		}
-		else
-		{
-			throw new CoreException("Invalid class alias '$sAlias'");
-		}
-	}
-
-	public function GetClass()
-	{
-		return reset($this->m_aSelectedClasses);
-	}
-	public function GetClassAlias()
-	{
-		reset($this->m_aSelectedClasses);
-		return key($this->m_aSelectedClasses);
-	}
-
-	public function GetFirstJoinedClass()
-	{
-		return reset($this->m_aClasses);
-	}
-	public function GetFirstJoinedClassAlias()
-	{
-		reset($this->m_aClasses);
-		return key($this->m_aClasses);
-	}
-
-	/**
-	 * Change the class (only subclasses are supported as of now, because the conditions must fit the new class)
-	 * Defaults to the first selected class (most of the time it is also the first joined class
-	 *
-	 * @param $sNewClass
-	 * @param null $sAlias
-	 *
-	 * @throws \CoreException
-	 */
-	public function ChangeClass($sNewClass, $sAlias = null)
-	{
-		if (is_null($sAlias))
-		{
-			$sAlias = $this->GetClassAlias();
-		}
-		else
-		{
-			if (!array_key_exists($sAlias, $this->m_aSelectedClasses))
-			{
-				// discard silently - necessary when recursing on the related nodes (see code below)
-				return;
-			}
-		}
-		$sCurrClass = $this->GetClassName($sAlias);
-		if ($sNewClass == $sCurrClass)
-		{
-			// Skip silently
-			return;
-		}
-		if (!MetaModel::IsParentClass($sCurrClass, $sNewClass))
-		{
-			throw new Exception("Could not change the search class from '$sCurrClass' to '$sNewClass'. Only child classes are permitted.");
-		}
-
-		// Change for this node
-		//
-		$this->m_aSelectedClasses[$sAlias] = $sNewClass;
-		$this->m_aClasses[$sAlias] = $sNewClass;
-
-		// Change for all the related node (yes, this was necessary with some queries - strange effects otherwise)
-		//
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oExtFilter)
-				{
-					$oExtFilter->ChangeClass($sNewClass, $sAlias);
-				}
-			}
-		}
-		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$oForeignFilter->ChangeClass($sNewClass, $sAlias);
-					}
-				}
-			}
-		}
-	}
-
-	public function GetSelectedClasses()
-	{
-		return $this->m_aSelectedClasses;
-	}
-
-	/**
-	 * @param array $aSelectedClasses array of aliases
-	 * @throws CoreException
-	 */
-	public function SetSelectedClasses($aSelectedClasses)
-	{
-		$this->m_aSelectedClasses = array();
-		foreach ($aSelectedClasses as $sAlias)
-		{
-			if (!array_key_exists($sAlias, $this->m_aClasses))
-			{
-				throw new CoreException("SetSelectedClasses: Invalid class alias $sAlias");
-			}
-			$this->m_aSelectedClasses[$sAlias] = $this->m_aClasses[$sAlias];
-		}
-	}
-
-	/**
-	 * Change any alias of the query tree
-	 *
-	 * @param $sOldName
-	 * @param $sNewName
-	 *
-	 * @return bool True if the alias has been found and changed
-	 * @throws \Exception
-	 */
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		$bFound = false;
-		if (array_key_exists($sOldName, $this->m_aClasses))
-		{
-			$bFound = true;
-		}
-		if (array_key_exists($sNewName, $this->m_aClasses))
-		{
-			throw new Exception("RenameAlias: alias '$sNewName' already used");
-		}
-
-		$aClasses = array();
-		foreach ($this->m_aClasses as $sAlias => $sClass)
-		{
-			if ($sAlias === $sOldName)
-			{
-				$aClasses[$sNewName] = $sClass;
-			}
-			else
-			{
-				$aClasses[$sAlias] = $sClass;
-			}
-		}
-		$this->m_aClasses = $aClasses;
-
-		$aSelectedClasses = array();
-		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
-		{
-			if ($sAlias === $sOldName)
-			{
-				$aSelectedClasses[$sNewName] = $sClass;
-			}
-			else
-			{
-				$aSelectedClasses[$sAlias] = $sClass;
-			}
-		}
-		$this->m_aSelectedClasses = $aSelectedClasses;
-
-		$this->m_oSearchCondition->RenameAlias($sOldName, $sNewName);
-
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oExtFilter)
-				{
-					$bFound = $oExtFilter->RenameAlias($sOldName, $sNewName) || $bFound;
-				}
-			}
-		}
-		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$bFound = $oForeignFilter->RenameAlias($sOldName, $sNewName) || $bFound;
-					}
-				}
-			}
-		}
-		return $bFound;
-	}
-
-	public function SetModifierProperty($sPluginClass, $sProperty, $value)
-	{
-		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
-	}
-
-	public function GetModifierProperties($sPluginClass)
-	{
-		if (array_key_exists($sPluginClass, $this->m_aModifierProperties))
-		{
-			return $this->m_aModifierProperties[$sPluginClass];
-		}
-		else
-		{
-			return array();
-		}
-	}
-
-	public function IsAny()
-	{
-		if (!$this->m_oSearchCondition->IsTrue()) return false;
-		if (count($this->m_aPointingTo) > 0) return false;
-		if (count($this->m_aReferencedBy) > 0) return false;
-		return true;
-	}
-
-	protected function TransferConditionExpression($oFilter, $aTranslation)
-	{
-		// Prevent collisions in the parameter names by renaming them if needed
-		foreach($this->m_aParams as $sParam => $value)
-		{
-			if (array_key_exists($sParam, $oFilter->m_aParams) && ($value != $oFilter->m_aParams[$sParam]))
-			{
-				// Generate a new and unique name for the collinding parameter
-				$index = 1;
-				while(array_key_exists($sParam.$index, $oFilter->m_aParams))
-				{
-					$index++;
-				}
-				$secondValue = $oFilter->m_aParams[$sParam];
-				$oFilter->RenameParam($sParam, $sParam.$index);
-				unset($oFilter->m_aParams[$sParam]);
-				$oFilter->m_aParams[$sParam.$index] = $secondValue;
-			}
-		}
-		$oTranslated = $oFilter->GetCriteria()->Translate($aTranslation, false, false /* leave unresolved fields */);
-		$this->AddConditionExpression($oTranslated);
-		$this->m_aParams = array_merge($this->m_aParams, $oFilter->m_aParams);
-	}
-
-	protected function RenameParam($sOldName, $sNewName)
-	{
-		$this->m_oSearchCondition->RenameParam($sOldName, $sNewName);
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oExtFilter)
-				{
-					$oExtFilter->RenameParam($sOldName, $sNewName);
-				}
-			}
-		}
-		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$oForeignFilter->RenameParam($sOldName, $sNewName);
-					}
-				}
-			}
-		}
-	}
-	
-	public function ResetCondition()
-	{
-		$this->m_oSearchCondition = new TrueExpression();
-		// ? is that usefull/enough, do I need to rebuild the list after the subqueries ?
-	}
-
-	public function MergeConditionExpression($oExpression)
-	{
-		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression); 
-	}
-
-	public function AddConditionExpression($oExpression)
-	{
-		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression); 
-	}
-
-  	public function AddNameCondition($sName)
-	{
-		$oValueExpr = new ScalarExpression($sName);
-		$oNameExpr = new FieldExpression('friendlyname', $this->GetClassAlias());
-		$oNewCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
-		$this->AddConditionExpression($oNewCondition);
-	}
-
-	/**
-	 * @param string $sFilterCode
-	 * @param mixed $value
-	 * @param string $sOpCode operator to use : 'IN', 'NOT IN', 'Contains',' Begins with', 'Finishes with', ...
-	 * @param bool $bParseSearchString
-	 *
-	 * @throws \CoreException
-	 *
-	 * @see AddConditionForInOperatorUsingParam for IN/NOT IN queries with lots of params
-	 */
-	public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSearchString = false)
-	{
-		MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
-
-		$oField = new FieldExpression($sFilterCode, $this->GetClassAlias());
-		if (empty($sOpCode))
-		{
-			if ($sFilterCode == 'id')
-			{
-				$sOpCode = '=';
-			}
-			else
-			{
-				$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
-				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
-				$this->AddConditionExpression($oNewCondition);
-				return;
-			}
-		}
-		// Parse search strings if needed and if the filter code corresponds to a valid attcode
-		if($bParseSearchString && MetaModel::IsValidAttCode($this->GetClass(), $sFilterCode))
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
-			$value = $oAttDef->ParseSearchString($value);
-		}
-
-		// Preserve backward compatibility - quick n'dirty way to change that API semantic
-		//
-		switch($sOpCode)
-		{
-		case 'SameDay':
-		case 'SameMonth':
-		case 'SameYear':
-		case 'Today':
-		case '>|':
-		case '<|':
-		case '=|':
-			throw new CoreException('Deprecated operator, please consider using OQL (SQL) expressions like "(TO_DAYS(NOW()) - TO_DAYS(x)) AS AgeDays"', array('operator' => $sOpCode));
-			break;
-
-		case 'IN':
-			if (!is_array($value)) $value = array($value);
-			if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
-			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
-			$sOQLCondition = $oField->Render()." IN $sListExpr";
-			break;
-
-		case 'NOTIN':
-			if (!is_array($value)) $value = array($value);
-            if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
-			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
-			$sOQLCondition = $oField->Render()." NOT IN $sListExpr";
-			break;
-
-		case 'Contains':
-			$this->m_aParams[$sFilterCode] = "%$value%";
-			$sOperator = 'LIKE';
-			break;
-
-		case 'Begins with':
-			$this->m_aParams[$sFilterCode] = "$value%";
-			$sOperator = 'LIKE';
-			break;
-
-		case 'Finishes with':
-			$this->m_aParams[$sFilterCode] = "%$value";
-			$sOperator = 'LIKE';
-			break;
-
-		default:
-			if ($value === null)
-			{
-				switch ($sOpCode)
-				{
-					case '=':
-						$sOpCode = '*Expression*';
-						$oExpression = new FunctionExpression('ISNULL', array($oField));
-						break;
-					case '!=':
-						$sOpCode = '*Expression*';
-						$oExpression = new FunctionExpression('ISNULL', array($oField));
-						$oExpression = new BinaryExpression($oExpression, '=', new ScalarExpression(0));
-						break;
-					default:
-						throw new Exception("AddCondition on null value: unsupported operator '$sOpCode''");
-				}
-			}
-			else
-			{
-				$this->m_aParams[$sFilterCode] = $value;
-				$sOperator = $sOpCode;
-			}
-		}
-
-		switch($sOpCode)
-		{
-			case '*Expression*':
-				$oNewCondition = $oExpression;
-				break;
-			case "IN":
-			case "NOTIN":
-				// this will parse all of the values... Can take forever if there are lots of them !
-				// In this case using a parameter is far better : WHERE ... IN (:my_param)
-				$oNewCondition = Expression::FromOQL($sOQLCondition);
-				break;
-
-			case 'Contains':
-			case 'Begins with':
-			case 'Finishes with':
-			default:
-				$oRightExpr = new VariableExpression($sFilterCode);
-				$oNewCondition = new BinaryExpression($oField, $sOperator, $oRightExpr);
-		}
-
-		$this->AddConditionExpression($oNewCondition);
-	}
-
-	/**
-	 * @param string $sFilterCode attribute code to use
-	 * @param array $aValues
-	 * @param bool $bPositiveMatch if true will add a IN filter, else a NOT IN
-	 *
-	 * @throws \CoreException
-	 *
-	 * @since 2.5 N°1418
-	 */
-	public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true)
-	{
-		$oFieldExpression = new FieldExpression($sFilterCode, $this->GetClassAlias());
-
-		$sOperator = $bPositiveMatch ? 'IN' : 'NOT IN';
-
-		$sInParamName = $this->GenerateUniqueParamName();
-		$oParamExpression = new VariableExpression($sInParamName);
-		$this->GetInternalParamsByRef()[$sInParamName] = $aValues;
-
-		$oListExpression = new ListExpression(array($oParamExpression));
-
-		$oInCondition = new BinaryExpression($oFieldExpression, $sOperator, $oListExpression);
-		$this->AddConditionExpression($oInCondition);
-	}
-
-	/**
-	 * @return string a unique param name
-	 */
-	private function GenerateUniqueParamName() {
-		$iExistingParamsNb = count($this->m_aParams);
-		$iCurrentArrayParamNb = $iExistingParamsNb + 1;
-		$sParamName = 'param'.$iCurrentArrayParamNb;
-
-		if (isset($this->m_aParams[$sParamName])) {
-			$sParamName .= '_'.microtime(true) . '_' .rand(0,100);
-		}
-
-		return $sParamName;
-	}
-
-	/**
-	 * Specify a condition on external keys or link sets
-	 * @param string $sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
-	 *                 Example: infra_list->ci_id->location_id->country
-	 * @param $value
-	 * @return void
-	 * @throws \CoreException
-	 * @throws \CoreWarning
-	 */
-	public function AddConditionAdvanced($sAttSpec, $value)
-	{
-		$sClass = $this->GetClass();
-
-		$iPos = strpos($sAttSpec, '->');
-		if ($iPos !== false)
-		{
-			$sAttCode = substr($sAttSpec, 0, $iPos);
-			$sSubSpec = substr($sAttSpec, $iPos + 2);
-
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				throw new Exception("Invalid attribute code '$sClass/$sAttCode' in condition specification '$sAttSpec'");
-			}
-
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			if ($oAttDef->IsLinkSet())
-			{
-				$sTargetClass = $oAttDef->GetLinkedClass();
-				$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-
-				$oNewFilter = new DBObjectSearch($sTargetClass);
-				$oNewFilter->AddConditionAdvanced($sSubSpec, $value);
-
-				$this->AddCondition_ReferencedBy($oNewFilter, $sExtKeyToMe);
-			}
-			elseif ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
-			{
-				$sTargetClass = $oAttDef->GetTargetClass(EXTKEY_ABSOLUTE);
-
-				$oNewFilter = new DBObjectSearch($sTargetClass);
-				$oNewFilter->AddConditionAdvanced($sSubSpec, $value);
-
-				$this->AddCondition_PointingTo($oNewFilter, $sAttCode);
-			}
-			else
-			{
-				throw new Exception("Attribute specification '$sAttSpec', '$sAttCode' should be either a link set or an external key");
-			}
-		}
-		else
-		{
-			// $sAttSpec is an attribute code
-			//
-			if (is_array($value))
-			{
-				$oField = new FieldExpression($sAttSpec, $this->GetClass());
-				$oListExpr = ListExpression::FromScalars($value);
-				$oInValues = new BinaryExpression($oField, 'IN', $oListExpr);
-
-				$this->AddConditionExpression($oInValues);
-			}
-			else
-			{
-				$this->AddCondition($sAttSpec, $value);
-			}
-		}
-	}
-
-	public function AddCondition_FullText($sNeedle)
-	{
-		// Transform the full text condition into additional condition expression
-		$aFullTextFields = array();
-		foreach (MetaModel::ListAttributeDefs($this->GetClass()) as $sAttCode => $oAttDef)
-		{
-			if (!$oAttDef->IsScalar()) continue;
-			if ($oAttDef->IsExternalKey()) continue;
-			$aFullTextFields[] = new FieldExpression($sAttCode, $this->GetClassAlias());
-		}
-		$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
-
-		$sQueryParam = 'needle';
-		$oFlexNeedle = new CharConcatExpression(array(new ScalarExpression('%'), new VariableExpression($sQueryParam), new ScalarExpression('%')));
-
-		$oNewCond = new BinaryExpression($oTextFields, 'LIKE', $oFlexNeedle);
-		$this->AddConditionExpression($oNewCond);
-		$this->m_aParams[$sQueryParam] = $sNeedle;
-	}
-
-	protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation, $bTranslateMainAlias = true)
-	{
-		if ($bTranslateMainAlias)
-		{
-			$sOrigAlias = $this->GetFirstJoinedClassAlias();
-			if (array_key_exists($sOrigAlias, $aClassAliases))
-			{
-				$sNewAlias = MetaModel::GenerateUniqueAlias($aClassAliases, $sOrigAlias, $this->GetFirstJoinedClass());
-				if (isset($this->m_aSelectedClasses[$sOrigAlias]))
-				{
-					$this->m_aSelectedClasses[$sNewAlias] = $this->GetFirstJoinedClass();
-					unset($this->m_aSelectedClasses[$sOrigAlias]);
-				}
-
-				// TEMPORARY ALGORITHM (m_aClasses is not correctly updated, it is not possible to add a subtree onto a subnode)
-				// Replace the element at the same position (unset + set is not enough because the hash array is ordered)
-				$aPrevList = $this->m_aClasses;
-				$this->m_aClasses = array();
-				foreach ($aPrevList as $sSomeAlias => $sSomeClass)
-				{
-					if ($sSomeAlias == $sOrigAlias)
-					{
-						$this->m_aClasses[$sNewAlias] = $sSomeClass; // note: GetFirstJoinedClass now returns '' !!!
-					}
-					else
-					{
-						$this->m_aClasses[$sSomeAlias] = $sSomeClass;
-					}
-				}
-	
-				// Translate the condition expression with the new alias
-				$aAliasTranslation[$sOrigAlias]['*'] = $sNewAlias;
-			}
-	
-			// add the alias into the filter aliases list
-			$aClassAliases[$this->GetFirstJoinedClassAlias()] = $this->GetFirstJoinedClass();
-		}
-		
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oFilter)
-				{
-					$oFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
-				}
-			}
-		}
-
-		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$oForeignFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
-					}
-				}
-			}
-		}
-	}
-
-
-	// Browse the tree nodes recursively
-	//
-	protected function GetNode($sAlias)
-	{
-		if ($this->GetFirstJoinedClassAlias() == $sAlias)
-		{
-			return $this;
-		}
-		else
-		{
-			foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-			{
-				foreach($aPointingTo as $iOperatorCode => $aFilter)
-				{
-					foreach($aFilter as $oFilter)
-					{
-						$ret = $oFilter->GetNode($sAlias);
-						if (is_object($ret))
-						{
-							return $ret;
-						}
-					}
-				}
-			}
-			foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
-			{
-				foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-				{
-					foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-					{
-						foreach ($aFilters as $oForeignFilter)
-						{
-							$ret = $oForeignFilter->GetNode($sAlias);
-							if (is_object($ret))
-							{
-								return $ret;
-							}
-						}
-					}
-				}
-			}
-		}
-		// Not found
-		return null;
-	}
-
-	/**
-	 * Helper to
-	 * - convert a translation table (format optimized for the translation in an expression tree) into simple hash
-	 * - compile over an eventually existing map
-	 *
-	 * @param array $aRealiasingMap Map to update
-	 * @param array $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
-	 * @return void of <old-alias> => <new-alias>
-	 */
-	protected function UpdateRealiasingMap(&$aRealiasingMap, $aAliasTranslation)
-	{
-		if ($aRealiasingMap !== null)
-		{
-			foreach ($aAliasTranslation as $sPrevAlias => $aRules)
-			{
-				if (isset($aRules['*']))
-				{
-					$sNewAlias = $aRules['*'];
-					$sOriginalAlias = array_search($sPrevAlias, $aRealiasingMap);
-					if ($sOriginalAlias !== false)
-					{
-						$aRealiasingMap[$sOriginalAlias] = $sNewAlias;
-					}
-					else
-					{
-						$aRealiasingMap[$sPrevAlias] = $sNewAlias;
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Completes the list of alias=>class by browsing the whole structure recursively
-	 * This a workaround to handle some cases in which the list of classes is not correctly updated.
-	 * This code should disappear as soon as DBObjectSearch get split between a container search class and a Node class
-	 *
-	 * @param array $aClasses List to be completed
-	 */
-	protected function RecomputeClassList(&$aClasses)
-	{
-		$aClasses[$this->GetFirstJoinedClassAlias()] = $this->GetFirstJoinedClass();
-
-		// Recurse in the query tree
-		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oFilter)
-				{
-					$oFilter->RecomputeClassList($aClasses);
-				}
-			}
-		}
-
-		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$oForeignFilter->RecomputeClassList($aClasses);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param DBObjectSearch $oFilter
-	 * @param $sExtKeyAttCode
-	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
-	 * @throws CoreException
-	 * @throws CoreWarning
-	 */
-	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
-	{
-		if (!MetaModel::IsValidKeyAttCode($this->GetClass(), $sExtKeyAttCode))
-		{
-			throw new CoreWarning("The attribute code '$sExtKeyAttCode' is not an external key of the class '{$this->GetClass()}'");
-		}
-		$oAttExtKey = MetaModel::GetAttributeDef($this->GetClass(), $sExtKeyAttCode);
-		if(!MetaModel::IsSameFamilyBranch($oFilter->GetClass(), $oAttExtKey->GetTargetClass()))
-		{
-			throw new CoreException("The specified filter (pointing to {$oFilter->GetClass()}) is not compatible with the key '{$this->GetClass()}::$sExtKeyAttCode', which is pointing to {$oAttExtKey->GetTargetClass()}");
-		}
-		if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !($oAttExtKey instanceof AttributeHierarchicalKey))
-		{
-			throw new CoreException("The specified tree operator $iOperatorCode is not applicable to the key '{$this->GetClass()}::$sExtKeyAttCode', which is not a HierarchicalKey");
-		}
-		// Note: though it seems to be a good practice to clone the given source filter
-		//       (as it was done and fixed an issue in Intersect())
-		//       this was not implemented here because it was causing a regression (login as admin, select an org, click on any badge)
-		//       root cause: FromOQL relies on the fact that the passed filter can be modified later 
-		// NO: $oFilter = $oFilter->DeepClone();
-		// See also: Trac #639, and self::AddCondition_ReferencedBy()
-		$aAliasTranslation = array();
-		$res = $this->AddCondition_PointingTo_InNameSpace($oFilter, $sExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
-		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
-		$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
-
-		if (ENABLE_OPT && ($oFilter->GetClass() == $oFilter->GetFirstJoinedClass()))
-		{
-			if (isset($oFilter->m_aReferencedBy[$this->GetClass()][$sExtKeyAttCode][$iOperatorCode]))
-			{
-				foreach ($oFilter->m_aReferencedBy[$this->GetClass()][$sExtKeyAttCode][$iOperatorCode] as $oRemoteFilter)
-				{
-					if ($this->GetClass() == $oRemoteFilter->GetClass())
-					{
-						// Optimization - fold sibling query
-						$aAliasTranslation = array();
-						$this->MergeWith_InNamespace($oRemoteFilter, $this->m_aClasses, $aAliasTranslation);
-						unset($oFilter->m_aReferencedBy[$this->GetClass()][$sExtKeyAttCode][$iOperatorCode]);
-						$this->m_oSearchCondition = $this->m_oSearchCondition->Translate($aAliasTranslation, false, false);
-						$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
-						break;
-					}
-				}
-			}
-		}
-		$this->RecomputeClassList($this->m_aClasses);
-		return $res;
-	}
-
-	protected function AddCondition_PointingTo_InNameSpace(DBObjectSearch $oFilter, $sExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
-	{
-		// Find the node on which the new tree must be attached (most of the time it is "this")
-		$oReceivingFilter = $this->GetNode($this->GetClassAlias());
-
-		$bMerged = false;
-		if (ENABLE_OPT && isset($oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode]))
-		{
-			foreach ($oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode] as $oExisting)
-			{
-				if ($oExisting->GetClass() == $oFilter->GetClass())
-				{
-					$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
-					$bMerged = true;
-					break;
-				}
-			}
-		}
-		if (!$bMerged)
-		{
-			$oFilter->AddToNamespace($aClassAliases, $aAliasTranslation);
-			$oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode][] = $oFilter;
-		}
-	}
-
-	/**
-	 * @param DBObjectSearch $oFilter
-	 * @param $sForeignExtKeyAttCode
-	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
-	 * @return void
-	 * @throws \CoreException
-	 */
-	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
-	{
-		$sForeignClass = $oFilter->GetClass();
-		if (!MetaModel::IsValidKeyAttCode($sForeignClass, $sForeignExtKeyAttCode))
-		{
-			throw new CoreException("The attribute code '$sForeignExtKeyAttCode' is not an external key of the class '{$sForeignClass}'");
-		}
-		$oAttExtKey = MetaModel::GetAttributeDef($sForeignClass, $sForeignExtKeyAttCode);
-		if(!MetaModel::IsSameFamilyBranch($this->GetClass(), $oAttExtKey->GetTargetClass()))
-		{
-			// à refaire en spécifique dans FromOQL
-			throw new CoreException("The specified filter (objects referencing an object of class {$this->GetClass()}) is not compatible with the key '{$sForeignClass}::$sForeignExtKeyAttCode', which is pointing to {$oAttExtKey->GetTargetClass()}");
-		}
-
-		// Note: though it seems to be a good practice to clone the given source filter
-		//       (as it was done and fixed an issue in Intersect())
-		//       this was not implemented here because it was causing a regression (login as admin, select an org, click on any badge)
-		//       root cause: FromOQL relies on the fact that the passed filter can be modified later 
-		// NO: $oFilter = $oFilter->DeepClone();
-		// See also: Trac #639, and self::AddCondition_PointingTo()
-		$aAliasTranslation = array();
-		$this->AddCondition_ReferencedBy_InNameSpace($oFilter, $sForeignExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
-		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
-		$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
-
-		if (ENABLE_OPT && ($oFilter->GetClass() == $oFilter->GetFirstJoinedClass()))
-		{
-			if (isset($oFilter->m_aPointingTo[$sForeignExtKeyAttCode][$iOperatorCode]))
-			{
-				foreach ($oFilter->m_aPointingTo[$sForeignExtKeyAttCode][$iOperatorCode] as $oRemoteFilter)
-				{
-					if ($this->GetClass() == $oRemoteFilter->GetClass())
-					{
-						// Optimization - fold sibling query
-						$aAliasTranslation = array();
-						$this->MergeWith_InNamespace($oRemoteFilter, $this->m_aClasses, $aAliasTranslation);
-						unset($oFilter->m_aPointingTo[$sForeignExtKeyAttCode][$iOperatorCode]);
-						$this->m_oSearchCondition  = $this->m_oSearchCondition->Translate($aAliasTranslation, false, false);
-						$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
-						break;
-					}
-				}
-			}
-		}
-		$this->RecomputeClassList($this->m_aClasses);
-	}
-
-	protected function AddCondition_ReferencedBy_InNameSpace(DBSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
-	{
-		$sForeignClass = $oFilter->GetClass();
-
-		// Find the node on which the new tree must be attached (most of the time it is "this")
-		$oReceivingFilter = $this->GetNode($this->GetClassAlias());
-
-		$bMerged = false;
-		if (ENABLE_OPT && isset($oReceivingFilter->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode]))
-		{
-			foreach ($oReceivingFilter->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode] as $oExisting)
-			{
-				if ($oExisting->GetClass() == $oFilter->GetClass())
-				{
-					$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
-					$bMerged = true;
-					break;
-				}
-			}
-		}
-		if (!$bMerged)
-		{
-			$oFilter->AddToNamespace($aClassAliases, $aAliasTranslation);
-			$oReceivingFilter->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode][] = $oFilter;
-		}
-	}
-
-	public function Intersect(DBSearch $oFilter)
-	{
-		if ($oFilter instanceof DBUnionSearch)
-		{
-			// Develop! 
-			$aFilters = $oFilter->GetSearches();
-		}
-		else
-		{
-			$aFilters = array($oFilter);
-		}
-
-		$aSearches = array();
-		foreach ($aFilters as $oRightFilter)
-		{
-			// Limitation: the queried class must be the first declared class
-			if ($this->GetFirstJoinedClassAlias() != $this->GetClassAlias())
-			{
-				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$this->GetClass()} AS {$this->GetClassAlias()}) is not the first joined class ({$this->GetFirstJoinedClass()} AS {$this->GetFirstJoinedClassAlias()})");
-			}
-			if ($oRightFilter->GetFirstJoinedClassAlias() != $oRightFilter->GetClassAlias())
-			{
-				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$oRightFilter->GetClass()} AS {$oRightFilter->GetClassAlias()}) is not the first joined class ({$oRightFilter->GetFirstJoinedClass()} AS {$oRightFilter->GetFirstJoinedClassAlias()})");
-			}
-
-			$oLeftFilter = $this->DeepClone();
-			$oRightFilter = $oRightFilter->DeepClone();
-
-			$bAllowAllData = ($oLeftFilter->IsAllDataAllowed() && $oRightFilter->IsAllDataAllowed());
-			if ($bAllowAllData)
-			{
-				$oLeftFilter->AllowAllData();
-			}
-
-			if ($oLeftFilter->GetClass() != $oRightFilter->GetClass())
-			{
-				if (MetaModel::IsParentClass($oLeftFilter->GetClass(), $oRightFilter->GetClass()))
-				{
-					// Specialize $oLeftFilter
-					$oLeftFilter->ChangeClass($oRightFilter->GetClass());
-				}
-				elseif (MetaModel::IsParentClass($oRightFilter->GetClass(), $oLeftFilter->GetClass()))
-				{
-					// Specialize $oRightFilter
-					$oRightFilter->ChangeClass($oLeftFilter->GetClass());
-				}
-				else
-				{
-					throw new CoreException("Attempting to merge a filter of class '{$oLeftFilter->GetClass()}' with a filter of class '{$oRightFilter->GetClass()}'");
-				}
-			}
-
-			$aAliasTranslation = array();
-			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $oLeftFilter->m_aClasses, $aAliasTranslation);
-			$oLeftFilter->TransferConditionExpression($oRightFilter, $aAliasTranslation);
-			$aSearches[] = $oLeftFilter;
-		}
-		if (count($aSearches) == 1)
-		{
-			// return a DBObjectSearch
-			return $aSearches[0];
-		}
-		else
-		{
-			return new DBUnionSearch($aSearches);
-		}
-	}
-
-	protected function MergeWith_InNamespace($oFilter, &$aClassAliases, &$aAliasTranslation)
-	{
-		if ($this->GetClass() != $oFilter->GetClass())
-		{
-			throw new CoreException("Attempting to merge a filter of class '{$this->GetClass()}' with a filter of class '{$oFilter->GetClass()}'");
-		}
-
-		// Translate search condition into our aliasing scheme
-		$aAliasTranslation[$oFilter->GetClassAlias()]['*'] = $this->GetClassAlias(); 
-
-		foreach($oFilter->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oExtFilter)
-				{
-					$this->AddCondition_PointingTo_InNamespace($oExtFilter, $sExtKeyAttCode, $aClassAliases, $aAliasTranslation, $iOperatorCode);
-				}
-			}
-		}
-		foreach($oFilter->m_aReferencedBy as $sForeignClass => $aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$this->AddCondition_ReferencedBy_InNamespace($oForeignFilter, $sForeignExtKeyAttCode, $aClassAliases, $aAliasTranslation, $iOperatorCode);
-					}
-				}
-			}
-		}
-	}
-
-	public function GetCriteria() {return $this->m_oSearchCondition;}
-	public function GetCriteria_FullText() {throw new Exception("Removed GetCriteria_FullText");}
-	public function GetCriteria_PointingTo($sKeyAttCode = "")
-	{
-		if (empty($sKeyAttCode))
-		{
-			return $this->m_aPointingTo;
-		}
-		if (!array_key_exists($sKeyAttCode, $this->m_aPointingTo)) return array();
-		return $this->m_aPointingTo[$sKeyAttCode];
-	}
-	protected function GetCriteria_ReferencedBy()
-	{
-		return $this->m_aReferencedBy;
-	}
-
-	public function SetInternalParams($aParams)
-	{
-		return $this->m_aParams = $aParams;
-	}
-
-	/**
-	 * @return array <strong>warning</strong> : array returned by value
-	 * @see self::GetInternalParamsByRef to get the attribute by reference
-	 */
-	public function GetInternalParams()
-	{
-		return $this->m_aParams;
-	}
-
-	/**
-	 * @return array
-	 * @see http://php.net/manual/en/language.references.return.php
-	 * @since 2.5.1 N°1582
-	 */
-	public function &GetInternalParamsByRef()
-	{
-		return $this->m_aParams;
-	}
-
-	/**
-	 * @param string $sKey
-	 * @param mixed $value
-	 * @param bool $bDoNotOverride
-	 *
-	 * @throws \CoreUnexpectedValue if $bDoNotOverride and $sKey already exists
-	 */
-	public function AddInternalParam($sKey, $value, $bDoNotOverride = false)
-	{
-		if ($bDoNotOverride)
-		{
-			if (array_key_exists($sKey, $this->m_aParams))
-			{
-				throw new CoreUnexpectedValue("The key $sKey already exists with value : ".$this->m_aParams[$sKey]);
-			}
-		}
-
-		$this->m_aParams[$sKey] = $value;
-	}
-
-	public function GetQueryParams($bExcludeMagicParams = true)
-	{
-		$aParams = array();
-		$this->m_oSearchCondition->Render($aParams, true);
-
-		if ($bExcludeMagicParams)
-		{
-			$aRet = array();
-
-			// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams($bExclude magic params)
-			$aNakedMagicArguments = array();
-			foreach (MetaModel::PrepareQueryArguments(array()) as $sArgName => $value)
-			{
-				$iPos = strpos($sArgName, '->object()');
-				if ($iPos === false)
-				{
-					$aNakedMagicArguments[$sArgName] = $value;
-				}
-				else
-				{
-					$aNakedMagicArguments[substr($sArgName, 0, $iPos)] = true;
-				}
-			}
-			foreach ($aParams as $sParam => $foo)
-			{
-				$iPos = strpos($sParam, '->');
-				if ($iPos === false)
-				{
-					$sRefName = $sParam;
-				}
-				else
-				{
-					$sRefName = substr($sParam, 0, $iPos);
-				}
-				if (!array_key_exists($sRefName, $aNakedMagicArguments))
-				{
-					$aRet[$sParam] = $foo;
-				}
-			}
-		}
-
-		return $aRet;
-	}
-
-	public function ListConstantFields()
-	{
-		return $this->m_oSearchCondition->ListConstantFields();
-	}
-
-	/**
-	 * Turn the parameters (:xxx) into scalar values in order to easily
-	 * serialize a search
-	 * @param $aArgs
-*/
-	public function ApplyParameters($aArgs)
-	{
-		$this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
-	}
-	
-	public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false)
-	{
-		// Currently unused, but could be useful later
-		$bRetrofitParams = false;
-
-		if ($bDevelopParams)
-		{
-			if (is_null($aContextParams))
-			{
-				$aParams = array_merge($this->m_aParams);
-			}
-			else
-			{
-				$aParams = array_merge($aContextParams, $this->m_aParams);
-			}
-			$aParams = MetaModel::PrepareQueryArguments($aParams);
-		}
-		else
-		{
-			// Leave it as is, the rendering will be made with parameters in clear
-			$aParams = null;
-		}
-
-		$aSelectedAliases = array();
-		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
-		{
-			$aSelectedAliases[] = '`' . $sAlias . '`';
-		}
-		$sSelectedClasses = implode(', ', $aSelectedAliases);
-		$sRes = 'SELECT '.$sSelectedClasses.' FROM';
-
-		$sRes .= ' ' . $this->GetFirstJoinedClass() . ' AS `' . $this->GetFirstJoinedClassAlias() . '`';
-		$sRes .= $this->ToOQL_Joins();
-		$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
-
-		if ($bWithAllowAllFlag && $this->m_bAllowAllData)
-		{
-			$sRes .= " ALLOW ALL DATA";
-		}
-		return $sRes;
-	}
-
-	protected function OperatorCodeToOQL($iOperatorCode)
-	{
-		switch($iOperatorCode)
-		{
-			case TREE_OPERATOR_EQUALS:
-				$sOperator = ' = ';
-				break;
-
-			case TREE_OPERATOR_BELOW:
-				$sOperator = ' BELOW ';
-				break;
-
-			case TREE_OPERATOR_BELOW_STRICT:
-				$sOperator = ' BELOW STRICT ';
-				break;
-
-			case TREE_OPERATOR_NOT_BELOW:
-				$sOperator = ' NOT BELOW ';
-				break;
-
-			case TREE_OPERATOR_NOT_BELOW_STRICT:
-				$sOperator = ' NOT BELOW STRICT ';
-				break;
-
-			case TREE_OPERATOR_ABOVE:
-				$sOperator = ' ABOVE ';
-				break;
-
-			case TREE_OPERATOR_ABOVE_STRICT:
-				$sOperator = ' ABOVE STRICT ';
-				break;
-
-			case TREE_OPERATOR_NOT_ABOVE:
-				$sOperator = ' NOT ABOVE ';
-				break;
-
-			case TREE_OPERATOR_NOT_ABOVE_STRICT:
-				$sOperator = ' NOT ABOVE STRICT ';
-				break;
-
-		}
-		return $sOperator;
-	}
-
-	protected function ToOQL_Joins()
-	{
-		$sRes = '';
-		foreach($this->m_aPointingTo as $sExtKey => $aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				$sOperator = $this->OperatorCodeToOQL($iOperatorCode);
-				foreach($aFilter as $oFilter)
-				{
-					$sRes .= ' JOIN ' . $oFilter->GetFirstJoinedClass() . ' AS `' . $oFilter->GetFirstJoinedClassAlias() . '` ON `' . $this->GetFirstJoinedClassAlias() . '`.' . $sExtKey . $sOperator . '`' . $oFilter->GetFirstJoinedClassAlias() . '`.id';
-					$sRes .= $oFilter->ToOQL_Joins();				
-				}
-			}
-		}
-		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					$sOperator = $this->OperatorCodeToOQL($iOperatorCode);
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$sRes .= ' JOIN ' . $oForeignFilter->GetFirstJoinedClass() . ' AS `' . $oForeignFilter->GetFirstJoinedClassAlias() . '` ON `' . $oForeignFilter->GetFirstJoinedClassAlias() . '`.' . $sForeignExtKeyAttCode . $sOperator . '`' . $this->GetFirstJoinedClassAlias() . '`.id';
-						$sRes .= $oForeignFilter->ToOQL_Joins();
-					}
-				}
-			}
-		}
-		return $sRes;
-	}
-
-	protected function OQLExpressionToCondition($sQuery, $oExpression, $aClassAliases)
-	{
-		if ($oExpression instanceof BinaryOqlExpression)
-		{
-			$sOperator = $oExpression->GetOperator();
-			$oLeft = $this->OQLExpressionToCondition($sQuery, $oExpression->GetLeftExpr(), $aClassAliases);
-			$oRight = $this->OQLExpressionToCondition($sQuery, $oExpression->GetRightExpr(), $aClassAliases);
-			return new BinaryExpression($oLeft, $sOperator, $oRight);
-		}
-		elseif ($oExpression instanceof FieldOqlExpression)
-		{
-			$sClassAlias = $oExpression->GetParent();
-			$sFltCode = $oExpression->GetName();
-			if (empty($sClassAlias))
-			{
-				// Need to find the right alias
-				// Build an array of field => array of aliases
-				$aFieldClasses = array();
-				foreach($aClassAliases as $sAlias => $sReal)
-				{
-					foreach(MetaModel::GetFiltersList($sReal) as $sAnFltCode)
-					{
-						$aFieldClasses[$sAnFltCode][] = $sAlias;
-					}
-				}
-				$sClassAlias = $aFieldClasses[$sFltCode][0];
-			}
-			return new FieldExpression($sFltCode, $sClassAlias);
-		}
-		elseif ($oExpression instanceof VariableOqlExpression)
-		{
-			return new VariableExpression($oExpression->GetName());
-		}
-		elseif ($oExpression instanceof TrueOqlExpression)
-		{
-			return new TrueExpression;
-		}
-		elseif ($oExpression instanceof ScalarOqlExpression)
-		{
-			return new ScalarExpression($oExpression->GetValue());
-		}
-		elseif ($oExpression instanceof ListOqlExpression)
-		{
-			$aItems = array();
-			foreach ($oExpression->GetItems() as $oItemExpression)
-			{
-				$aItems[] = $this->OQLExpressionToCondition($sQuery, $oItemExpression, $aClassAliases);
-			}
-			return new ListExpression($aItems);
-		}
-		elseif ($oExpression instanceof FunctionOqlExpression)
-		{
-			$aArgs = array();
-			foreach ($oExpression->GetArgs() as $oArgExpression)
-			{
-				$aArgs[] = $this->OQLExpressionToCondition($sQuery, $oArgExpression, $aClassAliases);
-			}
-			return new FunctionExpression($oExpression->GetVerb(), $aArgs);
-		}
-		elseif ($oExpression instanceof IntervalOqlExpression)
-		{
-			return new IntervalExpression($oExpression->GetValue(), $oExpression->GetUnit());
-		}
-		else
-		{
-			throw new CoreException('Unknown expression type', array('class'=>get_class($oExpression), 'query'=>$sQuery));
-		}
-	}
-
-	public function InitFromOqlQuery(OqlQuery $oOqlQuery, $sQuery)
-	{
-		$oModelReflection = new ModelReflectionRuntime();
-		$sClass = $oOqlQuery->GetClass($oModelReflection);
-		$sClassAlias = $oOqlQuery->GetClassAlias();
-
-		$aAliases = array($sClassAlias => $sClass);
-
-		// Note: the condition must be built here, it may be altered later on when optimizing some joins
-		$oConditionTree = $oOqlQuery->GetCondition();
-		if ($oConditionTree instanceof Expression)
-		{
-			$aRawAliases = array($sClassAlias => $sClass);
-			$aJoinSpecs = $oOqlQuery->GetJoins();
-			if (is_array($aJoinSpecs))
-			{
-				foreach ($aJoinSpecs as $oJoinSpec)
-				{
-					$aRawAliases[$oJoinSpec->GetClassAlias()] = $oJoinSpec->GetClass();
-				}
-			}
-			$this->m_oSearchCondition = $this->OQLExpressionToCondition($sQuery, $oConditionTree, $aRawAliases);
-		}
-
-		// Maintain an array of filters, because the flat list is in fact referring to a tree
-		// And this will be an easy way to dispatch the conditions
-		// $this will be referenced by the other filters, or the other way around...
-		$aJoinItems = array($sClassAlias => $this);
-
-		$aJoinSpecs = $oOqlQuery->GetJoins();
-		if (is_array($aJoinSpecs))
-		{
-			$aAliasTranslation = array();
-			foreach ($aJoinSpecs as $oJoinSpec)
-			{
-				$sJoinClass = $oJoinSpec->GetClass();
-				$sJoinClassAlias = $oJoinSpec->GetClassAlias();
-				if (isset($aAliasTranslation[$sJoinClassAlias]['*']))
-				{
-					$sJoinClassAlias = $aAliasTranslation[$sJoinClassAlias]['*'];
-				}
-
-				// Assumption: ext key on the left only !!!
-				// normalization should take care of this
-				$oLeftField = $oJoinSpec->GetLeftField();
-				$sFromClass = $oLeftField->GetParent();
-				if (isset($aAliasTranslation[$sFromClass]['*']))
-				{
-					$sFromClass = $aAliasTranslation[$sFromClass]['*'];
-				}
-				$sExtKeyAttCode = $oLeftField->GetName();
-
-				$oRightField = $oJoinSpec->GetRightField();
-				$sToClass = $oRightField->GetParent();
-				if (isset($aAliasTranslation[$sToClass]['*']))
-				{
-					$sToClass = $aAliasTranslation[$sToClass]['*'];
-				}
-
-				$aAliases[$sJoinClassAlias] = $sJoinClass;
-				$aJoinItems[$sJoinClassAlias] = new DBObjectSearch($sJoinClass, $sJoinClassAlias);
-
-				$sOperator = $oJoinSpec->GetOperator();
-				switch($sOperator)
-				{
-					case '=':
-					default:
-						$iOperatorCode = TREE_OPERATOR_EQUALS;
-						break;
-					case 'BELOW':
-						$iOperatorCode = TREE_OPERATOR_BELOW;
-						break;
-					case 'BELOW_STRICT':
-						$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
-						break;
-					case 'NOT_BELOW':
-						$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
-						break;
-					case 'NOT_BELOW_STRICT':
-						$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
-						break;
-					case 'ABOVE':
-						$iOperatorCode = TREE_OPERATOR_ABOVE;
-						break;
-					case 'ABOVE_STRICT':
-						$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
-						break;
-					case 'NOT_ABOVE':
-						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
-						break;
-					case 'NOT_ABOVE_STRICT':
-						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
-						break;
-				}
-
-				if ($sFromClass == $sJoinClassAlias)
-				{
-					$oReceiver = $aJoinItems[$sToClass];
-					$oNewComer = $aJoinItems[$sFromClass];
-					$oReceiver->AddCondition_ReferencedBy_InNameSpace($oNewComer, $sExtKeyAttCode, $oReceiver->m_aClasses, $aAliasTranslation, $iOperatorCode);
-				}
-				else
-				{
-					$oReceiver = $aJoinItems[$sFromClass];
-					$oNewComer = $aJoinItems[$sToClass];
-					$oReceiver->AddCondition_PointingTo_InNameSpace($oNewComer, $sExtKeyAttCode, $oReceiver->m_aClasses, $aAliasTranslation, $iOperatorCode);
-				}
-			}
-			$this->m_oSearchCondition = $this->m_oSearchCondition->Translate($aAliasTranslation, false, false /* leave unresolved fields */);
-		}
-
-		// Check and prepare the select information
-		$this->m_aSelectedClasses = array();
-		foreach ($oOqlQuery->GetSelectedClasses() as $oClassDetails)
-		{
-			$sClassToSelect = $oClassDetails->GetValue();
-			$this->m_aSelectedClasses[$sClassToSelect] = $aAliases[$sClassToSelect];
-		}
-		$this->m_aClasses = $aAliases;
-	}
-
-	////////////////////////////////////////////////////////////////////////////
-	//
-	// Construction of the SQL queries
-	//
-	////////////////////////////////////////////////////////////////////////////
-
-	public function MakeDeleteQuery($aArgs = array())
-	{
-		$aModifierProperties = MetaModel::MakeModifierProperties($this);
-		$oBuild = new QueryBuilderContext($this, $aModifierProperties);
-		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, array($this->GetClassAlias() => array()), array());
-		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
-		$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
-		$oSQLQuery->OptimizeJoins(array());
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
-		$sRet = $oSQLQuery->RenderDelete($aScalarArgs);
-		return $sRet;
-	}
-
-	public function MakeUpdateQuery($aValues, $aArgs = array())
-	{
-		// $aValues is an array of $sAttCode => $value
-		$aModifierProperties = MetaModel::MakeModifierProperties($this);
-		$oBuild = new QueryBuilderContext($this, $aModifierProperties);
-		$aRequested = array(); // Requested attributes are the updated attributes
-		foreach ($aValues as $sAttCode => $value)
-		{
-			$aRequested[$sAttCode] = MetaModel::GetAttributeDef($this->GetClass(), $sAttCode);
-		}
-		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, array($this->GetClassAlias() => $aRequested), $aValues);
-		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
-		$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
-		$oSQLQuery->OptimizeJoins(array());
-		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
-		$sRet = $oSQLQuery->RenderUpdate($aScalarArgs);
-		return $sRet;
-	}
-
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
-	{
-		// Hide objects that are not visible to the current user
-		//
-		$oSearch = $this;
-		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered())
-		{
-			$oVisibleObjects = UserRights::GetSelectFilter($this->GetClass(), $this->GetModifierProperties('UserRightsGetSelectFilter'));
-			if ($oVisibleObjects === false)
-			{
-				// Make sure this is a valid search object, saying NO for all
-				$oVisibleObjects = DBObjectSearch::FromEmptySet($this->GetClass());
-			}
-			if (is_object($oVisibleObjects))
-			{
-				$oVisibleObjects->AllowAllData();
-				$oSearch = $this->Intersect($oVisibleObjects);
-				$oSearch->SetDataFiltered();
-			}
-		}
-
-		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
-		//
-		$aModifierProperties = MetaModel::MakeModifierProperties($oSearch);
-
-		// Create a unique cache id
-		//
-		$aContextData = array();
-		$bCanCache = true;
-		if (self::$m_bQueryCacheEnabled || self::$m_bTraceQueries)
-		{
-			if (isset($_SERVER['REQUEST_URI']))
-			{
-				$aContextData['sRequestUri'] = $_SERVER['REQUEST_URI'];
-			}
-			else if (isset($_SERVER['SCRIPT_NAME']))
-			{
-				$aContextData['sRequestUri'] = $_SERVER['SCRIPT_NAME'];
-			}
-			else
-			{
-				$aContextData['sRequestUri'] = '';
-			}
-
-			// Need to identify the query
-			$sOqlQuery = $oSearch->ToOql(false, null, true);
-			if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false))
-			{
-				// Requests containing "id IN" are not worth caching
-				$bCanCache = false;
-			}
-
-			$aContextData['sOqlQuery'] = $sOqlQuery;
-
-			if (count($aModifierProperties))
-			{
-				array_multisort($aModifierProperties);
-				$sModifierProperties = json_encode($aModifierProperties);
-			}
-			else
-			{
-				$sModifierProperties = '';
-			}
-			$aContextData['sModifierProperties'] = $sModifierProperties;
-
-			$sRawId = $sOqlQuery.$sModifierProperties;
-			if (!is_null($aAttToLoad))
-			{
-				$sRawId .= json_encode($aAttToLoad);
-			}
-			$aContextData['aAttToLoad'] = $aAttToLoad;
-			if (!is_null($aGroupByExpr))
-			{
-				foreach($aGroupByExpr as $sAlias => $oExpr)
-				{
-					$sRawId .= 'g:'.$sAlias.'!'.$oExpr->Render();
-				}
-			}
-			if (!is_null($aSelectExpr))
-			{
-				foreach($aSelectExpr as $sAlias => $oExpr)
-				{
-					$sRawId .= 'se:'.$sAlias.'!'.$oExpr->Render();
-				}
-			}
-			$aContextData['aGroupByExpr'] = $aGroupByExpr;
-			$aContextData['aSelectExpr'] = $aSelectExpr;
-			$sRawId .= $bGetCount;
-			$aContextData['bGetCount'] = $bGetCount;
-			if (is_array($aSelectedClasses))
-			{
-				$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
-			}
-			$aContextData['aSelectedClasses'] = $aSelectedClasses;
-			$bIsArchiveMode = $oSearch->GetArchiveMode();
-			$sRawId .= $bIsArchiveMode ? '--arch' : '';
-			$bShowObsoleteData = $oSearch->GetShowObsoleteData();
-			$sRawId .= $bShowObsoleteData ? '--obso' : '';
-			$aContextData['bIsArchiveMode'] = $bIsArchiveMode;
-			$aContextData['bShowObsoleteData'] = $bShowObsoleteData;
-			$sOqlId = md5($sRawId);
-		}
-		else
-		{
-			$sOqlQuery = "SELECTING... ".$oSearch->GetClass();
-			$sOqlId = "query id ? n/a";
-		}
-
-
-		// Query caching
-		//
-		$sOqlAPCCacheId = null;
-		if (self::$m_bQueryCacheEnabled)
-		{
-			// Warning: using directly the query string as the key to the hash array can FAIL if the string
-			// is long and the differences are only near the end... so it's safer (but not bullet proof?)
-			// to use a hash (like md5) of the string as the key !
-			//
-			// Example of two queries that were found as similar by the hash array:
-			// SELECT SLT JOIN lnkSLTToSLA AS L1 ON L1.slt_id=SLT.id JOIN SLA ON L1.sla_id = SLA.id JOIN lnkContractToSLA AS L2 ON L2.sla_id = SLA.id JOIN CustomerContract ON L2.contract_id = CustomerContract.id WHERE SLT.ticket_priority = 1 AND SLA.service_id = 3 AND SLT.metric = 'TTO' AND CustomerContract.customer_id = 2
-			// and
-			// SELECT SLT JOIN lnkSLTToSLA AS L1 ON L1.slt_id=SLT.id JOIN SLA ON L1.sla_id = SLA.id JOIN lnkContractToSLA AS L2 ON L2.sla_id = SLA.id JOIN CustomerContract ON L2.contract_id = CustomerContract.id WHERE SLT.ticket_priority = 1 AND SLA.service_id = 3 AND SLT.metric = 'TTR' AND CustomerContract.customer_id = 2
-			// the only difference is R instead or O at position 285 (TTR instead of TTO)...
-			//
-			if (array_key_exists($sOqlId, self::$m_aQueryStructCache))
-			{
-				// hit!
-
-				$oSQLQuery = unserialize(serialize(self::$m_aQueryStructCache[$sOqlId]));
-				// Note: cloning is not enough because the subtree is made of objects
-			}
-			elseif (self::$m_bUseAPCCache)
-			{
-				// Note: For versions of APC older than 3.0.17, fetch() accepts only one parameter
-				//
-				$sOqlAPCCacheId = 'itop-'.MetaModel::GetEnvironmentId().'-query-cache-'.$sOqlId;
-				$oKPI = new ExecutionKPI();
-				$result = apc_fetch($sOqlAPCCacheId);
-				$oKPI->ComputeStats('Query APC (fetch)', $sOqlQuery);
-
-				if (is_object($result))
-				{
-					$oSQLQuery = $result;
-					self::$m_aQueryStructCache[$sOqlId] = $oSQLQuery;
-				}
-			}
-		}
-
-		if (!isset($oSQLQuery))
-		{
-			$oKPI = new ExecutionKPI();
-			$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
-			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
-
-			if (self::$m_bQueryCacheEnabled)
-			{
-				if ($bCanCache && self::$m_bUseAPCCache)
-				{
-					$oSQLQuery->m_aContextData = $aContextData;
-					$oKPI = new ExecutionKPI();
-					apc_store($sOqlAPCCacheId, $oSQLQuery, self::$m_iQueryCacheTTL);
-					$oKPI->ComputeStats('Query APC (store)', $sOqlQuery);
-				}
-
-				self::$m_aQueryStructCache[$sOqlId] = $oSQLQuery->DeepClone();
-			}
-		}
-		return $oSQLQuery;
-	}
-
-	/**
-	 * @param array $aAttToLoad
-	 * @param bool $bGetCount
-	 * @param array $aModifierProperties
-	 * @param array $aGroupByExpr
-	 * @param array $aSelectedClasses
-	 * @param array $aSelectExpr
-	 *
-	 * @return null|SQLObjectQuery
-	 * @throws \CoreException
-	 */
-	protected function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
-	{
-		$oBuild = new QueryBuilderContext($this, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
-
-		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, $aAttToLoad, array());
-		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
-		if (is_array($aGroupByExpr))
-		{
-			$aCols = $oBuild->m_oQBExpressions->GetGroupBy();
-			$oSQLQuery->SetGroupBy($aCols);
-			$oSQLQuery->SetSelect($aCols);
-		}
-		else
-		{
-			$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
-		}
-		if ($aSelectExpr)
-		{
-			// Get the fields corresponding to the select expressions
-			foreach($oBuild->m_oQBExpressions->GetSelect() as $sAlias => $oExpr)
-			{
-				if (key_exists($sAlias, $aSelectExpr))
-				{
-					$oSQLQuery->AddSelect($sAlias, $oExpr);
-				}
-			}
-		}
-
-		$aMandatoryTables = null;
-		if (self::$m_bOptimizeQueries)
-		{
-			if ($bGetCount)
-			{
-				// Simplify the query if just getting the count
-				$oSQLQuery->SetSelect(array());
-			}
-			$oBuild->m_oQBExpressions->GetMandatoryTables($aMandatoryTables);
-			$oSQLQuery->OptimizeJoins($aMandatoryTables);
-		}
-		// Filter tables as late as possible: do not interfere with the optimization process
-		foreach ($oBuild->GetFilteredTables() as $sTableAlias => $aConditions)
-		{
-			if ($aMandatoryTables && array_key_exists($sTableAlias, $aMandatoryTables))
-			{
-				foreach ($aConditions as $oCondition)
-				{
-					$oSQLQuery->AddCondition($oCondition);
-				}
-			}
-		}
-
-		return $oSQLQuery;
-	}
-
-
-	/**
-	 * @param $oBuild
-	 * @param null $aAttToLoad
-	 * @param array $aValues
-	 * @return null|SQLObjectQuery
-	 * @throws \CoreException
-	 */
-	protected function MakeSQLObjectQuery(&$oBuild, $aAttToLoad = null, $aValues = array())
-	{
-		// Note: query class might be different than the class of the filter
-		// -> this occurs when we are linking our class to an external class (referenced by, or pointing to)
-		$sClass = $this->GetFirstJoinedClass();
-		$sClassAlias = $this->GetFirstJoinedClassAlias();
-
-		$bIsOnQueriedClass = array_key_exists($sClassAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
-
-		//self::DbgTrace("Entering: ".$this->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
-
-		//$sRootClass = MetaModel::GetRootClass($sClass);
-		$sKeyField = MetaModel::DBGetKey($sClass);
-
-		if ($bIsOnQueriedClass)
-		{
-			// default to the whole list of attributes + the very std id/finalclass
-			$oBuild->m_oQBExpressions->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
-			if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
-			{
-				$sSelectedClass = $oBuild->GetSelectedClass($sClassAlias);
-				$aAttList = MetaModel::ListAttributeDefs($sSelectedClass);
-			}
-			else
-			{
-				$aAttList = $aAttToLoad[$sClassAlias];
-			}
-			foreach ($aAttList as $sAttCode => $oAttDef)
-			{
-				if (!$oAttDef->IsScalar()) continue;
-				// keep because it can be used for sorting - if (!$oAttDef->LoadInObject()) continue;
-
-				if ($oAttDef->IsBasedOnOQLExpression())
-				{
-					$oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode, new FieldExpression($sAttCode, $sClassAlias));
-				}
-				else
-				{
-					foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
-					{
-						$oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
-					}
-				}
-			}
-		}
-		//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
-		$aExpectedAtts = array(); // array of (attcode => fieldexpression)
-		//echo "<p>".__LINE__.": GetUnresolvedFields($sClassAlias, ...)</p>\n";
-		$oBuild->m_oQBExpressions->GetUnresolvedFields($sClassAlias, $aExpectedAtts);
-
-		// Compute a clear view of required joins (from the current class)
-		// Build the list of external keys:
-		// -> ext keys required by an explicit join
-		// -> ext keys mentionned in a 'pointing to' condition
-		// -> ext keys required for an external field
-		// -> ext keys required for a friendly name
-		//
-		$aExtKeys = array(); // array of sTableClass => array of (sAttCode (keys) => array of (sAttCode (fields)=> oAttDef))
-		//
-		// Optimization: could be partially computed once for all (cached) ?
-		//  
-
-		if ($bIsOnQueriedClass)
-		{
-			// Get all Ext keys for the queried class (??)
-			foreach(MetaModel::GetKeysList($sClass) as $sKeyAttCode)
-			{
-				$sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
-				$aExtKeys[$sKeyTableClass][$sKeyAttCode] = array();
-			}
-		}
-		// Get all Ext keys used by the filter
-		foreach ($this->GetCriteria_PointingTo() as $sKeyAttCode => $aPointingTo)
-		{
-			if (array_key_exists(TREE_OPERATOR_EQUALS, $aPointingTo))
-			{
-				$sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
-				$aExtKeys[$sKeyTableClass][$sKeyAttCode] = array();
-			}
-		}
-
-		$aFNJoinAlias = array(); // array of (subclass => alias)
-		foreach ($aExpectedAtts as $sExpectedAttCode => $oExpression)
-		{
-			if (!MetaModel::IsValidAttCode($sClass, $sExpectedAttCode)) continue;
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sExpectedAttCode);
-			if ($oAttDef->IsBasedOnOQLExpression())
-			{
-				// To optimize: detect a restriction on child classes in the condition expression
-				//    e.g. SELECT FunctionalCI WHERE finalclass IN ('Server', 'VirtualMachine')
-				$oExpression = static::GetPolymorphicExpression($sClass, $sExpectedAttCode);
-
-				$aRequiredFields = array();
-				$oExpression->GetUnresolvedFields('', $aRequiredFields);
-				$aTranslateFields = array();
-				foreach($aRequiredFields as $sSubClass => $aFields)
-				{
-					foreach($aFields as $sAttCode => $oField)
-					{
-						$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
-						if ($oAttDef->IsExternalKey())
-						{
-							$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
-							$aExtKeys[$sClassOfAttribute][$sAttCode] = array();
-						}
-						elseif ($oAttDef->IsExternalField())
-						{
-							$sKeyAttCode = $oAttDef->GetKeyAttCode();
-							$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sKeyAttCode);
-							$aExtKeys[$sClassOfAttribute][$sKeyAttCode][$sAttCode] = $oAttDef;
-						}
-						else
-						{
-							$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
-						}
-
-						if (MetaModel::IsParentClass($sClassOfAttribute, $sClass))
-						{
-							// The attribute is part of the standard query
-							//
-							$sAliasForAttribute = $sClassAlias;
-						}
-						else
-						{
-							// The attribute will be available from an additional outer join
-							// For each subclass (table) one single join is enough
-							//
-							if (!array_key_exists($sClassOfAttribute, $aFNJoinAlias))
-							{
-								$sAliasForAttribute = $oBuild->GenerateClassAlias($sClassAlias.'_fn_'.$sClassOfAttribute, $sClassOfAttribute);
-								$aFNJoinAlias[$sClassOfAttribute] = $sAliasForAttribute;
-							}
-							else
-							{
-								$sAliasForAttribute = $aFNJoinAlias[$sClassOfAttribute];
-							}
-						}
-
-						$aTranslateFields[$sSubClass][$sAttCode] = new FieldExpression($sAttCode, $sAliasForAttribute);
-					}
-				}
-				$oExpression = $oExpression->Translate($aTranslateFields, false);
-
-				$aTranslateNow = array();
-				$aTranslateNow[$sClassAlias][$sExpectedAttCode] = $oExpression;
-				$oBuild->m_oQBExpressions->Translate($aTranslateNow, false);
-			}
-		}
-
-		// Add the ext fields used in the select (eventually adds an external key)
-		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
-		{
-			if ($oAttDef->IsExternalField())
-			{
-				if (array_key_exists($sAttCode, $aExpectedAtts))
-				{
-					// Add the external attribute
-					$sKeyAttCode = $oAttDef->GetKeyAttCode();
-					$sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
-					$aExtKeys[$sKeyTableClass][$sKeyAttCode][$sAttCode] = $oAttDef;
-				}
-			}
-		}
-
-		// First query built from the root, adding all tables including the leaf
-		//   Before N.1065 we were joining from the leaf first, but this wasn't a good choice :
-		//   most of the time (obsolescence, friendlyname, ...) we want to get a root attribute !
-		//
-		$oSelectBase = null;
-		$aClassHierarchy = MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, true);
-		$bIsClassStandaloneClass = (count($aClassHierarchy) == 1);
-		foreach($aClassHierarchy as $sSomeClass)
-		{
-			if (!MetaModel::HasTable($sSomeClass))
-			{
-				continue;
-			}
-
-			self::DbgTrace("Adding join from root to leaf: $sSomeClass... let's call MakeSQLObjectQuerySingleTable()");
-			$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSomeClass, $aExtKeys, $aValues);
-			if (is_null($oSelectBase))
-			{
-				$oSelectBase = $oSelectParentTable;
-				if (!$bIsClassStandaloneClass && (MetaModel::IsRootClass($sSomeClass)))
-				{
-					// As we're linking to root class first, we're adding a where clause on the finalClass attribute :
-					//      COALESCE($sRootClassFinalClass IN ('$sExpectedClasses'), 1)
-					// If we don't, the child classes can be removed in the query optimisation phase, including the leaf that was queried
-					// So we still need to filter records to only those corresponding to the child classes !
-					// The coalesce is mandatory if we have a polymorphic query (left join)
-					$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
-					$sFinalClassSqlColumnName = MetaModel::DBGetClassField($sSomeClass);
-					$oClassExpr = new FieldExpression($sFinalClassSqlColumnName, $oSelectBase->GetTableAlias());
-					$oInExpression = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
-					$oTrueExpression = new TrueExpression();
-					$aCoalesceAttr = array($oInExpression, $oTrueExpression);
-					$oFinalClassRestriction = new FunctionExpression("COALESCE", $aCoalesceAttr);
-
-					$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
-				}
-			}
-			else
-			{
-				$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sSomeClass));
-			}
-		}
-
-		// Filter on objects referencing me
-		//
-		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
-		{
-			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
-			{
-				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
-				{
-					foreach ($aFilters as $oForeignFilter)
-					{
-						$oForeignKeyAttDef = MetaModel::GetAttributeDef($sForeignClass, $sForeignExtKeyAttCode);
-
-						self::DbgTrace("Referenced by foreign key: $sForeignExtKeyAttCode... let's call MakeSQLObjectQuery()");
-						//self::DbgTrace($oForeignFilter);
-						//self::DbgTrace($oForeignFilter->ToOQL());
-						//self::DbgTrace($oSelectForeign);
-						//self::DbgTrace($oSelectForeign->RenderSelect(array()));
-
-						$sForeignClassAlias = $oForeignFilter->GetFirstJoinedClassAlias();
-						$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression($sForeignExtKeyAttCode, $sForeignClassAlias));
-
-						if ($oForeignKeyAttDef instanceof AttributeObjectKey)
-						{
-							$sClassAttCode = $oForeignKeyAttDef->Get('class_attcode');
-
-							// Add the condition: `$sForeignClassAlias`.$sClassAttCode IN (subclasses of $sClass')
-							$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
-							$oClassExpr = new FieldExpression($sClassAttCode, $sForeignClassAlias);
-							$oClassRestriction = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
-							$oBuild->m_oQBExpressions->AddCondition($oClassRestriction);
-						}
-
-						$oSelectForeign = $oForeignFilter->MakeSQLObjectQuery($oBuild, $aAttToLoad);
-
-						$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
-						$sForeignKeyTable = $oJoinExpr->GetParent();
-						$sForeignKeyColumn = $oJoinExpr->GetName();
-
-						if ($iOperatorCode == TREE_OPERATOR_EQUALS)
-						{
-							$oSelectBase->AddInnerJoin($oSelectForeign, $sKeyField, $sForeignKeyColumn, $sForeignKeyTable);
-						}
-						else
-						{
-							// Hierarchical key
-							$KeyLeft = $oForeignKeyAttDef->GetSQLLeft();
-							$KeyRight = $oForeignKeyAttDef->GetSQLRight();
-
-							$oSelectBase->AddInnerJoinTree($oSelectForeign, $KeyLeft, $KeyRight, $KeyLeft, $KeyRight, $sForeignKeyTable, $iOperatorCode, true);
-						}
-					}
-				}
-			}
-		}
-
-		// Additional JOINS for Friendly names
-		//
-		foreach ($aFNJoinAlias as $sSubClass => $sSubClassAlias)
-		{
-			$oSubClassFilter = new DBObjectSearch($sSubClass, $sSubClassAlias);
-			$oSelectFN = $oSubClassFilter->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSubClass, $aExtKeys, array());
-			$oSelectBase->AddLeftJoin($oSelectFN, $sKeyField, MetaModel::DBGetKey($sSubClass));
-		}
-
-		// That's all... cross fingers and we'll get some working query
-
-		//MyHelpers::var_dump_html($oSelectBase, true);
-		//MyHelpers::var_dump_html($oSelectBase->RenderSelect(), true);
-		if (self::$m_bDebugQuery) $oSelectBase->DisplayHtml();
-		return $oSelectBase;
-	}
-
-	protected function MakeSQLObjectQuerySingleTable(&$oBuild, $aAttToLoad, $sTableClass, $aExtKeys, $aValues)
-	{
-		// $aExtKeys is an array of sTableClass => array of (sAttCode (keys) => array of sAttCode (fields))
-
-		// Prepare the query for a single table (compound objects)
-		// Ignores the items (attributes/filters) that are not on the target table
-		// Perform an (inner or left) join for every external key (and specify the expected fields)
-		//
-		// Returns an SQLQuery
-		//
-		$sTargetClass = $this->GetFirstJoinedClass();
-		$sTargetAlias = $this->GetFirstJoinedClassAlias();
-		$sTable = MetaModel::DBGetTable($sTableClass);
-		$sTableAlias = $oBuild->GenerateTableAlias($sTargetAlias.'_'.$sTable, $sTable);
-
-		$aTranslation = array();
-		$aExpectedAtts = array();
-		$oBuild->m_oQBExpressions->GetUnresolvedFields($sTargetAlias, $aExpectedAtts);
-		
-		$bIsOnQueriedClass = array_key_exists($sTargetAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
-
-		self::DbgTrace("Entering: tableclass=$sTableClass, filter=".$this->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
-
-		// 1 - SELECT and UPDATE
-		//
-		// Note: no need for any values nor fields for foreign Classes (ie not the queried Class)
-		//
-		$aUpdateValues = array();
-
-
-		// 1/a - Get the key and friendly name
-		//
-		// We need one pkey to be the key, let's take the first one available
-		$oSelectedIdField = null;
-		$oIdField = new FieldExpressionResolved(MetaModel::DBGetKey($sTableClass), $sTableAlias);
-		$aTranslation[$sTargetAlias]['id'] = $oIdField;
-
-		if ($bIsOnQueriedClass)
-		{
-			// Add this field to the list of queried fields (required for the COUNT to work fine)
-			$oSelectedIdField = $oIdField;
-		}
-
-		// 1/b - Get the other attributes
-		// 
-		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if (MetaModel::GetAttributeOrigin($sTargetClass, $sAttCode) != $sTableClass) continue;
-
-			// Skip this attribute if not made of SQL columns 
-			if (count($oAttDef->GetSQLExpressions()) == 0) continue;
-
-			// Update...
-			//
-			if ($bIsOnQueriedClass && array_key_exists($sAttCode, $aValues))
-			{
-				assert ($oAttDef->IsBasedOnDBColumns());
-				foreach ($oAttDef->GetSQLValues($aValues[$sAttCode]) as $sColumn => $sValue)
-				{
-					$aUpdateValues[$sColumn] = $sValue;
-				}
-			}
-		}
-
-		// 2 - The SQL query, for this table only
-		//
-		$oSelectBase = new SQLObjectQuery($sTable, $sTableAlias, array(), $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
-
-		// 3 - Resolve expected expressions (translation table: alias.attcode => table.column)
-		//
-		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if (MetaModel::GetAttributeOrigin($sTargetClass, $sAttCode) != $sTableClass) continue;
-
-			// Select...
-			//
-			if ($oAttDef->IsExternalField())
-			{
-				// skip, this will be handled in the joined tables (done hereabove)
-			}
-			else
-			{
-				// standard field, or external key
-				// add it to the output
-				foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
-				{
-					if (array_key_exists($sAttCode.$sColId, $aExpectedAtts))
-					{
-						$oFieldSQLExp = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
-						foreach (MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
-						{
-							$oFieldSQLExp = $oQueryModifier->GetFieldExpression($oBuild, $sTargetClass, $sAttCode, $sColId, $oFieldSQLExp, $oSelectBase);
-						}
-						$aTranslation[$sTargetAlias][$sAttCode.$sColId] = $oFieldSQLExp;
-					}
-				}
-			}
-		}
-
-		// 4 - The external keys -> joins...
-		//
-		$aAllPointingTo = $this->GetCriteria_PointingTo();
-
-		if (array_key_exists($sTableClass, $aExtKeys))
-		{
-			foreach ($aExtKeys[$sTableClass] as $sKeyAttCode => $aExtFields)
-			{
-				$oKeyAttDef = MetaModel::GetAttributeDef($sTableClass, $sKeyAttCode);
-
-				$aPointingTo = $this->GetCriteria_PointingTo($sKeyAttCode);
-				if (!array_key_exists(TREE_OPERATOR_EQUALS, $aPointingTo))
-				{
-					// The join was not explicitely defined in the filter,
-					// we need to do it now
-					$sKeyClass =  $oKeyAttDef->GetTargetClass();
-					$sKeyClassAlias = $oBuild->GenerateClassAlias($sKeyClass.'_'.$sKeyAttCode, $sKeyClass);
-					$oExtFilter = new DBObjectSearch($sKeyClass, $sKeyClassAlias);
-
-					$aAllPointingTo[$sKeyAttCode][TREE_OPERATOR_EQUALS][$sKeyClassAlias] = $oExtFilter;
-				}
-			}
-		}
-
-		foreach ($aAllPointingTo as $sKeyAttCode => $aPointingTo)
-		{
-			foreach($aPointingTo as $iOperatorCode => $aFilter)
-			{
-				foreach($aFilter as $oExtFilter)
-				{
-					if (!MetaModel::IsValidAttCode($sTableClass, $sKeyAttCode)) continue; // Not defined in the class, skip it
-					// The aliases should not conflict because normalization occured while building the filter
-					$oKeyAttDef = MetaModel::GetAttributeDef($sTableClass, $sKeyAttCode);
-					$sKeyClass =  $oExtFilter->GetFirstJoinedClass();
-					$sKeyClassAlias = $oExtFilter->GetFirstJoinedClassAlias();
-
-					// Note: there is no search condition in $oExtFilter, because normalization did merge the condition onto the top of the filter tree
-
-					if ($iOperatorCode == TREE_OPERATOR_EQUALS)
-					{
-						if (array_key_exists($sTableClass, $aExtKeys) && array_key_exists($sKeyAttCode, $aExtKeys[$sTableClass]))
-						{
-							// Specify expected attributes for the target class query
-							// ... and use the current alias !
-							$aTranslateNow = array(); // Translation for external fields - must be performed before the join is done (recursion...)
-							foreach($aExtKeys[$sTableClass][$sKeyAttCode] as $sAttCode => $oAtt)
-							{
-								$oExtAttDef = $oAtt->GetExtAttDef();
-								if ($oExtAttDef->IsBasedOnOQLExpression())
-								{
-									$aTranslateNow[$sTargetAlias][$sAttCode] = new FieldExpression($oExtAttDef->GetCode(), $sKeyClassAlias);
-								}
-								else
-								{
-									$sExtAttCode = $oAtt->GetExtAttCode();
-									// Translate mainclass.extfield => remoteclassalias.remotefieldcode
-									$oRemoteAttDef = MetaModel::GetAttributeDef($sKeyClass, $sExtAttCode);
-									foreach ($oRemoteAttDef->GetSQLExpressions() as $sColId => $sRemoteAttExpr)
-									{
-										$aTranslateNow[$sTargetAlias][$sAttCode.$sColId] = new FieldExpression($sExtAttCode, $sKeyClassAlias);
-									}
-								}
-							}
-
-							if ($oKeyAttDef instanceof AttributeObjectKey)
-							{
-								// Add the condition: `$sTargetAlias`.$sClassAttCode IN (subclasses of $sKeyClass')
-								$sClassAttCode = $oKeyAttDef->Get('class_attcode');
-								$oClassAttDef = MetaModel::GetAttributeDef($sTargetClass, $sClassAttCode);
-								foreach ($oClassAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
-								{
-									$aTranslateNow[$sTargetAlias][$sClassAttCode.$sColId] = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
-								}
-
-								$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sKeyClass, ENUM_CHILD_CLASSES_ALL));
-								$oClassExpr = new FieldExpression($sClassAttCode, $sTargetAlias);
-								$oClassRestriction = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
-								$oBuild->m_oQBExpressions->AddCondition($oClassRestriction);
-							}
-
-							// Translate prior to recursing
-							//
-							$oBuild->m_oQBExpressions->Translate($aTranslateNow, false);
-
-							self::DbgTrace("External key $sKeyAttCode (class: $sKeyClass), call MakeSQLObjectQuery()");
-							$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression('id', $sKeyClassAlias));
-			
-							$oSelectExtKey = $oExtFilter->MakeSQLObjectQuery($oBuild, $aAttToLoad);
-			
-							$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
-							$sExternalKeyTable = $oJoinExpr->GetParent();
-							$sExternalKeyField = $oJoinExpr->GetName();
-			
-							$aCols = $oKeyAttDef->GetSQLExpressions(); // Workaround a PHP bug: sometimes issuing a Notice if invoking current(somefunc())
-							$sLocalKeyField = current($aCols); // get the first column for an external key
-			
-							self::DbgTrace("External key $sKeyAttCode, Join on $sLocalKeyField = $sExternalKeyField");
-							if ($oKeyAttDef->IsNullAllowed())
-							{
-								$oSelectBase->AddLeftJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField);
-							}
-							else
-							{
-								$oSelectBase->AddInnerJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField, $sExternalKeyTable);
-							}
-						}
-					}
-					elseif(MetaModel::GetAttributeOrigin($sKeyClass, $sKeyAttCode) == $sTableClass)
-					{
-						$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression($sKeyAttCode, $sKeyClassAlias));
-						$oSelectExtKey = $oExtFilter->MakeSQLObjectQuery($oBuild, $aAttToLoad);
-						$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
-						$sExternalKeyTable = $oJoinExpr->GetParent();
-						$sExternalKeyField = $oJoinExpr->GetName();
-						$sLeftIndex = $sExternalKeyField.'_left'; // TODO use GetSQLLeft()
-						$sRightIndex = $sExternalKeyField.'_right'; // TODO use GetSQLRight()
-	
-						$LocalKeyLeft = $oKeyAttDef->GetSQLLeft();
-						$LocalKeyRight = $oKeyAttDef->GetSQLRight();
-	
-						$oSelectBase->AddInnerJoinTree($oSelectExtKey, $LocalKeyLeft, $LocalKeyRight, $sLeftIndex, $sRightIndex, $sExternalKeyTable, $iOperatorCode);
-					}
-				}
-			}
-		}
-
-		// Translate the selected columns
-		//
-		$oBuild->m_oQBExpressions->Translate($aTranslation, false);
-
-		// Filter out archived records
-		//
-		if (MetaModel::IsArchivable($sTableClass))
-		{
-			if (!$oBuild->GetRootFilter()->GetArchiveMode())
-			{
-				$bIsOnJoinedClass = array_key_exists($sTargetAlias, $oBuild->GetRootFilter()->GetJoinedClasses());
-				if ($bIsOnJoinedClass)
-				{
-					if (MetaModel::IsParentClass($sTableClass, $sTargetClass))
-					{
-						$oNotArchived = new BinaryExpression(new FieldExpressionResolved('archive_flag', $sTableAlias), '=', new ScalarExpression(0));
-						$oBuild->AddFilteredTable($sTableAlias, $oNotArchived);
-					}
-				}
-			}
-		}
-		return $oSelectBase;
-	}
-
-	/**
-	 *    Get the expression for the class and its subclasses (if finalclass = 'subclass' ...)
-	 *    Simplifies the final expression by grouping classes having the same expression
-	 * @param $sClass
-	 * @param $sAttCode
-	 * @return \FunctionExpression|mixed|null
-	 * @throws \CoreException
-*/
-	static public function GetPolymorphicExpression($sClass, $sAttCode)
-	{
-		$oExpression = ExpressionCache::GetCachedExpression($sClass, $sAttCode);
-		if (!empty($oExpression))
-		{
-			return $oExpression;
-		}
-
-		// 1st step - get all of the required expressions (instantiable classes)
-		//            and group them using their OQL representation
-		//
-		$aExpressions = array(); // signature => array('expression' => oExp, 'classes' => array of classes)
-		foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sSubClass)
-		{
-			if (($sSubClass != $sClass) && MetaModel::IsAbstract($sSubClass)) continue;
-
-			$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
-			$oSubClassExp = $oAttDef->GetOQLExpression($sSubClass);
-
-			// 3rd step - position the attributes in the hierarchy of classes
-			//
-			$oSubClassExp->Browse(function($oNode) use ($sSubClass) {
-				if ($oNode instanceof FieldExpression)
-				{
-					$sAttCode = $oNode->GetName();
-					$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
-					if ($oAttDef->IsExternalField())
-					{
-						$sKeyAttCode = $oAttDef->GetKeyAttCode();
-						$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sKeyAttCode);
-					}
-					else
-					{
-						$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
-					}
-					$sParent = MetaModel::GetAttributeOrigin($sClassOfAttribute, $oNode->GetName());
-					$oNode->SetParent($sParent);
-				}
-			});
-
-			$sSignature = $oSubClassExp->Render();
-			if (!array_key_exists($sSignature, $aExpressions))
-			{
-				$aExpressions[$sSignature] = array(
-					'expression' => $oSubClassExp,
-					'classes' => array(),
-				);
-			}
-			$aExpressions[$sSignature]['classes'][] = $sSubClass;
-		}
-
-		// 2nd step - build the final name expression depending on the finalclass
-		//
-		if (count($aExpressions) == 1)
-		{
-			$aExpData = reset($aExpressions);
-			$oExpression = $aExpData['expression'];
-		}
-		else
-		{
-			$oExpression = null;
-			foreach ($aExpressions as $sSignature => $aExpData)
-			{
-				$oClassListExpr = ListExpression::FromScalars($aExpData['classes']);
-				$oClassExpr = new FieldExpression('finalclass', $sClass);
-				$oClassInList = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
-
-				if (is_null($oExpression))
-				{
-					$oExpression = $aExpData['expression'];
-				}
-				else
-				{
-					$oExpression = new FunctionExpression('IF', array($oClassInList, $aExpData['expression'], $oExpression));
-				}
-			}
-		}
-		return $oExpression;
-	}
-}
+<?php
+// Copyright (c) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+// Dev hack for disabling the some query build optimizations (Folding/Merging)
+define('ENABLE_OPT', true);
+
+class DBObjectSearch extends DBSearch
+{
+	private $m_aClasses; // queried classes (alias => class name), the first item is the class corresponding to this filter (the rest is coming from subfilters)
+	private $m_aSelectedClasses; // selected for the output (alias => class name)
+	private $m_oSearchCondition;
+	private $m_aParams;
+	private $m_aPointingTo;
+	private $m_aReferencedBy;
+
+	// By default, some information may be hidden to the current user
+	// But it may happen that we need to disable that feature
+	protected $m_bAllowAllData = false;
+	protected $m_bDataFiltered = false;
+
+	public function __construct($sClass, $sClassAlias = null)
+	{
+		parent::__construct();
+
+		if (is_null($sClassAlias)) $sClassAlias = $sClass;
+		if(!is_string($sClass)) throw new Exception('DBObjectSearch::__construct called with a non-string parameter: $sClass = '.print_r($sClass, true));
+		if(!MetaModel::IsValidClass($sClass)) throw new Exception('DBObjectSearch::__construct called for an invalid class: "'.$sClass.'"');
+
+		$this->m_aSelectedClasses = array($sClassAlias => $sClass);
+		$this->m_aClasses = array($sClassAlias => $sClass);
+		$this->m_oSearchCondition = new TrueExpression;
+		$this->m_aParams = array();
+		$this->m_aPointingTo = array();
+		$this->m_aReferencedBy = array();
+	}
+
+	public function AllowAllData($bAllowAllData = true) {$this->m_bAllowAllData = $bAllowAllData;}
+	public function IsAllDataAllowed() {return $this->m_bAllowAllData;}
+	protected function IsDataFiltered() {return $this->m_bDataFiltered; }
+	protected function SetDataFiltered() {$this->m_bDataFiltered = true;}
+
+	// Create a search definition that leads to 0 result, still a valid search object
+	static public function FromEmptySet($sClass)
+	{
+		$oResultFilter = new DBObjectSearch($sClass);
+		$oResultFilter->m_oSearchCondition = new FalseExpression;
+		return $oResultFilter;
+	}
+
+
+	public function GetJoinedClasses() {return $this->m_aClasses;}
+
+	public function GetClassName($sAlias)
+	{
+		if (array_key_exists($sAlias, $this->m_aSelectedClasses))
+		{
+			return $this->m_aSelectedClasses[$sAlias];
+		}
+		else
+		{
+			throw new CoreException("Invalid class alias '$sAlias'");
+		}
+	}
+
+	public function GetClass()
+	{
+		return reset($this->m_aSelectedClasses);
+	}
+	public function GetClassAlias()
+	{
+		reset($this->m_aSelectedClasses);
+		return key($this->m_aSelectedClasses);
+	}
+
+	public function GetFirstJoinedClass()
+	{
+		return reset($this->m_aClasses);
+	}
+	public function GetFirstJoinedClassAlias()
+	{
+		reset($this->m_aClasses);
+		return key($this->m_aClasses);
+	}
+
+	/**
+	 * Change the class (only subclasses are supported as of now, because the conditions must fit the new class)
+	 * Defaults to the first selected class (most of the time it is also the first joined class
+	 *
+	 * @param $sNewClass
+	 * @param null $sAlias
+	 *
+	 * @throws \CoreException
+	 */
+	public function ChangeClass($sNewClass, $sAlias = null)
+	{
+		if (is_null($sAlias))
+		{
+			$sAlias = $this->GetClassAlias();
+		}
+		else
+		{
+			if (!array_key_exists($sAlias, $this->m_aSelectedClasses))
+			{
+				// discard silently - necessary when recursing on the related nodes (see code below)
+				return;
+			}
+		}
+		$sCurrClass = $this->GetClassName($sAlias);
+		if ($sNewClass == $sCurrClass)
+		{
+			// Skip silently
+			return;
+		}
+		if (!MetaModel::IsParentClass($sCurrClass, $sNewClass))
+		{
+			throw new Exception("Could not change the search class from '$sCurrClass' to '$sNewClass'. Only child classes are permitted.");
+		}
+
+		// Change for this node
+		//
+		$this->m_aSelectedClasses[$sAlias] = $sNewClass;
+		$this->m_aClasses[$sAlias] = $sNewClass;
+
+		// Change for all the related node (yes, this was necessary with some queries - strange effects otherwise)
+		//
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oExtFilter)
+				{
+					$oExtFilter->ChangeClass($sNewClass, $sAlias);
+				}
+			}
+		}
+		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$oForeignFilter->ChangeClass($sNewClass, $sAlias);
+					}
+				}
+			}
+		}
+	}
+
+	public function GetSelectedClasses()
+	{
+		return $this->m_aSelectedClasses;
+	}
+
+	/**
+	 * @param array $aSelectedClasses array of aliases
+	 * @throws CoreException
+	 */
+	public function SetSelectedClasses($aSelectedClasses)
+	{
+		$this->m_aSelectedClasses = array();
+		foreach ($aSelectedClasses as $sAlias)
+		{
+			if (!array_key_exists($sAlias, $this->m_aClasses))
+			{
+				throw new CoreException("SetSelectedClasses: Invalid class alias $sAlias");
+			}
+			$this->m_aSelectedClasses[$sAlias] = $this->m_aClasses[$sAlias];
+		}
+	}
+
+	/**
+	 * Change any alias of the query tree
+	 *
+	 * @param $sOldName
+	 * @param $sNewName
+	 *
+	 * @return bool True if the alias has been found and changed
+	 * @throws \Exception
+	 */
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		$bFound = false;
+		if (array_key_exists($sOldName, $this->m_aClasses))
+		{
+			$bFound = true;
+		}
+		if (array_key_exists($sNewName, $this->m_aClasses))
+		{
+			throw new Exception("RenameAlias: alias '$sNewName' already used");
+		}
+
+		$aClasses = array();
+		foreach ($this->m_aClasses as $sAlias => $sClass)
+		{
+			if ($sAlias === $sOldName)
+			{
+				$aClasses[$sNewName] = $sClass;
+			}
+			else
+			{
+				$aClasses[$sAlias] = $sClass;
+			}
+		}
+		$this->m_aClasses = $aClasses;
+
+		$aSelectedClasses = array();
+		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
+		{
+			if ($sAlias === $sOldName)
+			{
+				$aSelectedClasses[$sNewName] = $sClass;
+			}
+			else
+			{
+				$aSelectedClasses[$sAlias] = $sClass;
+			}
+		}
+		$this->m_aSelectedClasses = $aSelectedClasses;
+
+		$this->m_oSearchCondition->RenameAlias($sOldName, $sNewName);
+
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oExtFilter)
+				{
+					$bFound = $oExtFilter->RenameAlias($sOldName, $sNewName) || $bFound;
+				}
+			}
+		}
+		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$bFound = $oForeignFilter->RenameAlias($sOldName, $sNewName) || $bFound;
+					}
+				}
+			}
+		}
+		return $bFound;
+	}
+
+	public function SetModifierProperty($sPluginClass, $sProperty, $value)
+	{
+		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
+	}
+
+	public function GetModifierProperties($sPluginClass)
+	{
+		if (array_key_exists($sPluginClass, $this->m_aModifierProperties))
+		{
+			return $this->m_aModifierProperties[$sPluginClass];
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	public function IsAny()
+	{
+		if (!$this->m_oSearchCondition->IsTrue()) return false;
+		if (count($this->m_aPointingTo) > 0) return false;
+		if (count($this->m_aReferencedBy) > 0) return false;
+		return true;
+	}
+
+	protected function TransferConditionExpression($oFilter, $aTranslation)
+	{
+		// Prevent collisions in the parameter names by renaming them if needed
+		foreach($this->m_aParams as $sParam => $value)
+		{
+			if (array_key_exists($sParam, $oFilter->m_aParams) && ($value != $oFilter->m_aParams[$sParam]))
+			{
+				// Generate a new and unique name for the collinding parameter
+				$index = 1;
+				while(array_key_exists($sParam.$index, $oFilter->m_aParams))
+				{
+					$index++;
+				}
+				$secondValue = $oFilter->m_aParams[$sParam];
+				$oFilter->RenameParam($sParam, $sParam.$index);
+				unset($oFilter->m_aParams[$sParam]);
+				$oFilter->m_aParams[$sParam.$index] = $secondValue;
+			}
+		}
+		$oTranslated = $oFilter->GetCriteria()->Translate($aTranslation, false, false /* leave unresolved fields */);
+		$this->AddConditionExpression($oTranslated);
+		$this->m_aParams = array_merge($this->m_aParams, $oFilter->m_aParams);
+	}
+
+	protected function RenameParam($sOldName, $sNewName)
+	{
+		$this->m_oSearchCondition->RenameParam($sOldName, $sNewName);
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oExtFilter)
+				{
+					$oExtFilter->RenameParam($sOldName, $sNewName);
+				}
+			}
+		}
+		foreach($this->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$oForeignFilter->RenameParam($sOldName, $sNewName);
+					}
+				}
+			}
+		}
+	}
+	
+	public function ResetCondition()
+	{
+		$this->m_oSearchCondition = new TrueExpression();
+		// ? is that usefull/enough, do I need to rebuild the list after the subqueries ?
+	}
+
+	public function MergeConditionExpression($oExpression)
+	{
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogOr($oExpression); 
+	}
+
+	public function AddConditionExpression($oExpression)
+	{
+		$this->m_oSearchCondition = $this->m_oSearchCondition->LogAnd($oExpression); 
+	}
+
+  	public function AddNameCondition($sName)
+	{
+		$oValueExpr = new ScalarExpression($sName);
+		$oNameExpr = new FieldExpression('friendlyname', $this->GetClassAlias());
+		$oNewCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
+		$this->AddConditionExpression($oNewCondition);
+	}
+
+	/**
+	 * @param string $sFilterCode
+	 * @param mixed $value
+	 * @param string $sOpCode operator to use : 'IN', 'NOT IN', 'Contains',' Begins with', 'Finishes with', ...
+	 * @param bool $bParseSearchString
+	 *
+	 * @throws \CoreException
+	 *
+	 * @see AddConditionForInOperatorUsingParam for IN/NOT IN queries with lots of params
+	 */
+	public function AddCondition($sFilterCode, $value, $sOpCode = null, $bParseSearchString = false)
+	{
+		MyHelpers::CheckKeyInArray('filter code in class: '.$this->GetClass(), $sFilterCode, MetaModel::GetClassFilterDefs($this->GetClass()));
+
+		$oField = new FieldExpression($sFilterCode, $this->GetClassAlias());
+		if (empty($sOpCode))
+		{
+			if ($sFilterCode == 'id')
+			{
+				$sOpCode = '=';
+			}
+			else
+			{
+				$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
+				$oNewCondition = $oAttDef->GetSmartConditionExpression($value, $oField, $this->m_aParams);
+				$this->AddConditionExpression($oNewCondition);
+				return;
+			}
+		}
+		// Parse search strings if needed and if the filter code corresponds to a valid attcode
+		if($bParseSearchString && MetaModel::IsValidAttCode($this->GetClass(), $sFilterCode))
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->GetClass(), $sFilterCode);
+			$value = $oAttDef->ParseSearchString($value);
+		}
+
+		// Preserve backward compatibility - quick n'dirty way to change that API semantic
+		//
+		switch($sOpCode)
+		{
+		case 'SameDay':
+		case 'SameMonth':
+		case 'SameYear':
+		case 'Today':
+		case '>|':
+		case '<|':
+		case '=|':
+			throw new CoreException('Deprecated operator, please consider using OQL (SQL) expressions like "(TO_DAYS(NOW()) - TO_DAYS(x)) AS AgeDays"', array('operator' => $sOpCode));
+			break;
+
+		case 'IN':
+			if (!is_array($value)) $value = array($value);
+			if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
+			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
+			$sOQLCondition = $oField->Render()." IN $sListExpr";
+			break;
+
+		case 'NOTIN':
+			if (!is_array($value)) $value = array($value);
+            if (count($value) === 0) throw new Exception('AddCondition '.$sOpCode.': Value cannot be an empty array.');
+			$sListExpr = '('.implode(', ', CMDBSource::Quote($value)).')';
+			$sOQLCondition = $oField->Render()." NOT IN $sListExpr";
+			break;
+
+		case 'Contains':
+			$this->m_aParams[$sFilterCode] = "%$value%";
+			$sOperator = 'LIKE';
+			break;
+
+		case 'Begins with':
+			$this->m_aParams[$sFilterCode] = "$value%";
+			$sOperator = 'LIKE';
+			break;
+
+		case 'Finishes with':
+			$this->m_aParams[$sFilterCode] = "%$value";
+			$sOperator = 'LIKE';
+			break;
+
+		default:
+			if ($value === null)
+			{
+				switch ($sOpCode)
+				{
+					case '=':
+						$sOpCode = '*Expression*';
+						$oExpression = new FunctionExpression('ISNULL', array($oField));
+						break;
+					case '!=':
+						$sOpCode = '*Expression*';
+						$oExpression = new FunctionExpression('ISNULL', array($oField));
+						$oExpression = new BinaryExpression($oExpression, '=', new ScalarExpression(0));
+						break;
+					default:
+						throw new Exception("AddCondition on null value: unsupported operator '$sOpCode''");
+				}
+			}
+			else
+			{
+				$this->m_aParams[$sFilterCode] = $value;
+				$sOperator = $sOpCode;
+			}
+		}
+
+		switch($sOpCode)
+		{
+			case '*Expression*':
+				$oNewCondition = $oExpression;
+				break;
+			case "IN":
+			case "NOTIN":
+				// this will parse all of the values... Can take forever if there are lots of them !
+				// In this case using a parameter is far better : WHERE ... IN (:my_param)
+				$oNewCondition = Expression::FromOQL($sOQLCondition);
+				break;
+
+			case 'Contains':
+			case 'Begins with':
+			case 'Finishes with':
+			default:
+				$oRightExpr = new VariableExpression($sFilterCode);
+				$oNewCondition = new BinaryExpression($oField, $sOperator, $oRightExpr);
+		}
+
+		$this->AddConditionExpression($oNewCondition);
+	}
+
+	/**
+	 * @param string $sFilterCode attribute code to use
+	 * @param array $aValues
+	 * @param bool $bPositiveMatch if true will add a IN filter, else a NOT IN
+	 *
+	 * @throws \CoreException
+	 *
+	 * @since 2.5 N°1418
+	 */
+	public function AddConditionForInOperatorUsingParam($sFilterCode, $aValues, $bPositiveMatch = true)
+	{
+		$oFieldExpression = new FieldExpression($sFilterCode, $this->GetClassAlias());
+
+		$sOperator = $bPositiveMatch ? 'IN' : 'NOT IN';
+
+		$sInParamName = $this->GenerateUniqueParamName();
+		$oParamExpression = new VariableExpression($sInParamName);
+		$this->GetInternalParamsByRef()[$sInParamName] = $aValues;
+
+		$oListExpression = new ListExpression(array($oParamExpression));
+
+		$oInCondition = new BinaryExpression($oFieldExpression, $sOperator, $oListExpression);
+		$this->AddConditionExpression($oInCondition);
+	}
+
+	/**
+	 * @return string a unique param name
+	 */
+	private function GenerateUniqueParamName() {
+		$iExistingParamsNb = count($this->m_aParams);
+		$iCurrentArrayParamNb = $iExistingParamsNb + 1;
+		$sParamName = 'param'.$iCurrentArrayParamNb;
+
+		if (isset($this->m_aParams[$sParamName])) {
+			$sParamName .= '_'.microtime(true) . '_' .rand(0,100);
+		}
+
+		return $sParamName;
+	}
+
+	/**
+	 * Specify a condition on external keys or link sets
+	 * @param string $sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
+	 *                 Example: infra_list->ci_id->location_id->country
+	 * @param $value
+	 * @return void
+	 * @throws \CoreException
+	 * @throws \CoreWarning
+	 */
+	public function AddConditionAdvanced($sAttSpec, $value)
+	{
+		$sClass = $this->GetClass();
+
+		$iPos = strpos($sAttSpec, '->');
+		if ($iPos !== false)
+		{
+			$sAttCode = substr($sAttSpec, 0, $iPos);
+			$sSubSpec = substr($sAttSpec, $iPos + 2);
+
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				throw new Exception("Invalid attribute code '$sClass/$sAttCode' in condition specification '$sAttSpec'");
+			}
+
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef->IsLinkSet())
+			{
+				$sTargetClass = $oAttDef->GetLinkedClass();
+				$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+
+				$oNewFilter = new DBObjectSearch($sTargetClass);
+				$oNewFilter->AddConditionAdvanced($sSubSpec, $value);
+
+				$this->AddCondition_ReferencedBy($oNewFilter, $sExtKeyToMe);
+			}
+			elseif ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+			{
+				$sTargetClass = $oAttDef->GetTargetClass(EXTKEY_ABSOLUTE);
+
+				$oNewFilter = new DBObjectSearch($sTargetClass);
+				$oNewFilter->AddConditionAdvanced($sSubSpec, $value);
+
+				$this->AddCondition_PointingTo($oNewFilter, $sAttCode);
+			}
+			else
+			{
+				throw new Exception("Attribute specification '$sAttSpec', '$sAttCode' should be either a link set or an external key");
+			}
+		}
+		else
+		{
+			// $sAttSpec is an attribute code
+			//
+			if (is_array($value))
+			{
+				$oField = new FieldExpression($sAttSpec, $this->GetClass());
+				$oListExpr = ListExpression::FromScalars($value);
+				$oInValues = new BinaryExpression($oField, 'IN', $oListExpr);
+
+				$this->AddConditionExpression($oInValues);
+			}
+			else
+			{
+				$this->AddCondition($sAttSpec, $value);
+			}
+		}
+	}
+
+	public function AddCondition_FullText($sNeedle)
+	{
+		// Transform the full text condition into additional condition expression
+		$aFullTextFields = array();
+		foreach (MetaModel::ListAttributeDefs($this->GetClass()) as $sAttCode => $oAttDef)
+		{
+			if (!$oAttDef->IsScalar()) continue;
+			if ($oAttDef->IsExternalKey()) continue;
+			$aFullTextFields[] = new FieldExpression($sAttCode, $this->GetClassAlias());
+		}
+		$oTextFields = new CharConcatWSExpression(' ', $aFullTextFields);
+
+		$sQueryParam = 'needle';
+		$oFlexNeedle = new CharConcatExpression(array(new ScalarExpression('%'), new VariableExpression($sQueryParam), new ScalarExpression('%')));
+
+		$oNewCond = new BinaryExpression($oTextFields, 'LIKE', $oFlexNeedle);
+		$this->AddConditionExpression($oNewCond);
+		$this->m_aParams[$sQueryParam] = $sNeedle;
+	}
+
+	protected function AddToNameSpace(&$aClassAliases, &$aAliasTranslation, $bTranslateMainAlias = true)
+	{
+		if ($bTranslateMainAlias)
+		{
+			$sOrigAlias = $this->GetFirstJoinedClassAlias();
+			if (array_key_exists($sOrigAlias, $aClassAliases))
+			{
+				$sNewAlias = MetaModel::GenerateUniqueAlias($aClassAliases, $sOrigAlias, $this->GetFirstJoinedClass());
+				if (isset($this->m_aSelectedClasses[$sOrigAlias]))
+				{
+					$this->m_aSelectedClasses[$sNewAlias] = $this->GetFirstJoinedClass();
+					unset($this->m_aSelectedClasses[$sOrigAlias]);
+				}
+
+				// TEMPORARY ALGORITHM (m_aClasses is not correctly updated, it is not possible to add a subtree onto a subnode)
+				// Replace the element at the same position (unset + set is not enough because the hash array is ordered)
+				$aPrevList = $this->m_aClasses;
+				$this->m_aClasses = array();
+				foreach ($aPrevList as $sSomeAlias => $sSomeClass)
+				{
+					if ($sSomeAlias == $sOrigAlias)
+					{
+						$this->m_aClasses[$sNewAlias] = $sSomeClass; // note: GetFirstJoinedClass now returns '' !!!
+					}
+					else
+					{
+						$this->m_aClasses[$sSomeAlias] = $sSomeClass;
+					}
+				}
+	
+				// Translate the condition expression with the new alias
+				$aAliasTranslation[$sOrigAlias]['*'] = $sNewAlias;
+			}
+	
+			// add the alias into the filter aliases list
+			$aClassAliases[$this->GetFirstJoinedClassAlias()] = $this->GetFirstJoinedClass();
+		}
+		
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oFilter)
+				{
+					$oFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
+				}
+			}
+		}
+
+		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$oForeignFilter->AddToNameSpace($aClassAliases, $aAliasTranslation);
+					}
+				}
+			}
+		}
+	}
+
+
+	// Browse the tree nodes recursively
+	//
+	protected function GetNode($sAlias)
+	{
+		if ($this->GetFirstJoinedClassAlias() == $sAlias)
+		{
+			return $this;
+		}
+		else
+		{
+			foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+			{
+				foreach($aPointingTo as $iOperatorCode => $aFilter)
+				{
+					foreach($aFilter as $oFilter)
+					{
+						$ret = $oFilter->GetNode($sAlias);
+						if (is_object($ret))
+						{
+							return $ret;
+						}
+					}
+				}
+			}
+			foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
+			{
+				foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+				{
+					foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+					{
+						foreach ($aFilters as $oForeignFilter)
+						{
+							$ret = $oForeignFilter->GetNode($sAlias);
+							if (is_object($ret))
+							{
+								return $ret;
+							}
+						}
+					}
+				}
+			}
+		}
+		// Not found
+		return null;
+	}
+
+	/**
+	 * Helper to
+	 * - convert a translation table (format optimized for the translation in an expression tree) into simple hash
+	 * - compile over an eventually existing map
+	 *
+	 * @param array $aRealiasingMap Map to update
+	 * @param array $aAliasTranslation Translation table resulting from calls to MergeWith_InNamespace
+	 * @return void of <old-alias> => <new-alias>
+	 */
+	protected function UpdateRealiasingMap(&$aRealiasingMap, $aAliasTranslation)
+	{
+		if ($aRealiasingMap !== null)
+		{
+			foreach ($aAliasTranslation as $sPrevAlias => $aRules)
+			{
+				if (isset($aRules['*']))
+				{
+					$sNewAlias = $aRules['*'];
+					$sOriginalAlias = array_search($sPrevAlias, $aRealiasingMap);
+					if ($sOriginalAlias !== false)
+					{
+						$aRealiasingMap[$sOriginalAlias] = $sNewAlias;
+					}
+					else
+					{
+						$aRealiasingMap[$sPrevAlias] = $sNewAlias;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Completes the list of alias=>class by browsing the whole structure recursively
+	 * This a workaround to handle some cases in which the list of classes is not correctly updated.
+	 * This code should disappear as soon as DBObjectSearch get split between a container search class and a Node class
+	 *
+	 * @param array $aClasses List to be completed
+	 */
+	protected function RecomputeClassList(&$aClasses)
+	{
+		$aClasses[$this->GetFirstJoinedClassAlias()] = $this->GetFirstJoinedClass();
+
+		// Recurse in the query tree
+		foreach($this->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oFilter)
+				{
+					$oFilter->RecomputeClassList($aClasses);
+				}
+			}
+		}
+
+		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$oForeignFilter->RecomputeClassList($aClasses);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @param DBObjectSearch $oFilter
+	 * @param $sExtKeyAttCode
+	 * @param int $iOperatorCode
+	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 * @throws CoreException
+	 * @throws CoreWarning
+	 */
+	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
+	{
+		if (!MetaModel::IsValidKeyAttCode($this->GetClass(), $sExtKeyAttCode))
+		{
+			throw new CoreWarning("The attribute code '$sExtKeyAttCode' is not an external key of the class '{$this->GetClass()}'");
+		}
+		$oAttExtKey = MetaModel::GetAttributeDef($this->GetClass(), $sExtKeyAttCode);
+		if(!MetaModel::IsSameFamilyBranch($oFilter->GetClass(), $oAttExtKey->GetTargetClass()))
+		{
+			throw new CoreException("The specified filter (pointing to {$oFilter->GetClass()}) is not compatible with the key '{$this->GetClass()}::$sExtKeyAttCode', which is pointing to {$oAttExtKey->GetTargetClass()}");
+		}
+		if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !($oAttExtKey instanceof AttributeHierarchicalKey))
+		{
+			throw new CoreException("The specified tree operator $iOperatorCode is not applicable to the key '{$this->GetClass()}::$sExtKeyAttCode', which is not a HierarchicalKey");
+		}
+		// Note: though it seems to be a good practice to clone the given source filter
+		//       (as it was done and fixed an issue in Intersect())
+		//       this was not implemented here because it was causing a regression (login as admin, select an org, click on any badge)
+		//       root cause: FromOQL relies on the fact that the passed filter can be modified later 
+		// NO: $oFilter = $oFilter->DeepClone();
+		// See also: Trac #639, and self::AddCondition_ReferencedBy()
+		$aAliasTranslation = array();
+		$res = $this->AddCondition_PointingTo_InNameSpace($oFilter, $sExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
+		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
+		$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
+
+		if (ENABLE_OPT && ($oFilter->GetClass() == $oFilter->GetFirstJoinedClass()))
+		{
+			if (isset($oFilter->m_aReferencedBy[$this->GetClass()][$sExtKeyAttCode][$iOperatorCode]))
+			{
+				foreach ($oFilter->m_aReferencedBy[$this->GetClass()][$sExtKeyAttCode][$iOperatorCode] as $oRemoteFilter)
+				{
+					if ($this->GetClass() == $oRemoteFilter->GetClass())
+					{
+						// Optimization - fold sibling query
+						$aAliasTranslation = array();
+						$this->MergeWith_InNamespace($oRemoteFilter, $this->m_aClasses, $aAliasTranslation);
+						unset($oFilter->m_aReferencedBy[$this->GetClass()][$sExtKeyAttCode][$iOperatorCode]);
+						$this->m_oSearchCondition = $this->m_oSearchCondition->Translate($aAliasTranslation, false, false);
+						$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
+						break;
+					}
+				}
+			}
+		}
+		$this->RecomputeClassList($this->m_aClasses);
+		return $res;
+	}
+
+	protected function AddCondition_PointingTo_InNameSpace(DBObjectSearch $oFilter, $sExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
+	{
+		// Find the node on which the new tree must be attached (most of the time it is "this")
+		$oReceivingFilter = $this->GetNode($this->GetClassAlias());
+
+		$bMerged = false;
+		if (ENABLE_OPT && isset($oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode]))
+		{
+			foreach ($oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode] as $oExisting)
+			{
+				if ($oExisting->GetClass() == $oFilter->GetClass())
+				{
+					$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
+					$bMerged = true;
+					break;
+				}
+			}
+		}
+		if (!$bMerged)
+		{
+			$oFilter->AddToNamespace($aClassAliases, $aAliasTranslation);
+			$oReceivingFilter->m_aPointingTo[$sExtKeyAttCode][$iOperatorCode][] = $oFilter;
+		}
+	}
+
+	/**
+	 * @param DBObjectSearch $oFilter
+	 * @param $sForeignExtKeyAttCode
+	 * @param int $iOperatorCode
+	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 * @return void
+	 * @throws \CoreException
+	 */
+	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
+	{
+		$sForeignClass = $oFilter->GetClass();
+		if (!MetaModel::IsValidKeyAttCode($sForeignClass, $sForeignExtKeyAttCode))
+		{
+			throw new CoreException("The attribute code '$sForeignExtKeyAttCode' is not an external key of the class '{$sForeignClass}'");
+		}
+		$oAttExtKey = MetaModel::GetAttributeDef($sForeignClass, $sForeignExtKeyAttCode);
+		if(!MetaModel::IsSameFamilyBranch($this->GetClass(), $oAttExtKey->GetTargetClass()))
+		{
+			// à refaire en spécifique dans FromOQL
+			throw new CoreException("The specified filter (objects referencing an object of class {$this->GetClass()}) is not compatible with the key '{$sForeignClass}::$sForeignExtKeyAttCode', which is pointing to {$oAttExtKey->GetTargetClass()}");
+		}
+
+		// Note: though it seems to be a good practice to clone the given source filter
+		//       (as it was done and fixed an issue in Intersect())
+		//       this was not implemented here because it was causing a regression (login as admin, select an org, click on any badge)
+		//       root cause: FromOQL relies on the fact that the passed filter can be modified later 
+		// NO: $oFilter = $oFilter->DeepClone();
+		// See also: Trac #639, and self::AddCondition_PointingTo()
+		$aAliasTranslation = array();
+		$this->AddCondition_ReferencedBy_InNameSpace($oFilter, $sForeignExtKeyAttCode, $this->m_aClasses, $aAliasTranslation, $iOperatorCode);
+		$this->TransferConditionExpression($oFilter, $aAliasTranslation);
+		$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
+
+		if (ENABLE_OPT && ($oFilter->GetClass() == $oFilter->GetFirstJoinedClass()))
+		{
+			if (isset($oFilter->m_aPointingTo[$sForeignExtKeyAttCode][$iOperatorCode]))
+			{
+				foreach ($oFilter->m_aPointingTo[$sForeignExtKeyAttCode][$iOperatorCode] as $oRemoteFilter)
+				{
+					if ($this->GetClass() == $oRemoteFilter->GetClass())
+					{
+						// Optimization - fold sibling query
+						$aAliasTranslation = array();
+						$this->MergeWith_InNamespace($oRemoteFilter, $this->m_aClasses, $aAliasTranslation);
+						unset($oFilter->m_aPointingTo[$sForeignExtKeyAttCode][$iOperatorCode]);
+						$this->m_oSearchCondition  = $this->m_oSearchCondition->Translate($aAliasTranslation, false, false);
+						$this->UpdateRealiasingMap($aRealiasingMap, $aAliasTranslation);
+						break;
+					}
+				}
+			}
+		}
+		$this->RecomputeClassList($this->m_aClasses);
+	}
+
+	protected function AddCondition_ReferencedBy_InNameSpace(DBSearch $oFilter, $sForeignExtKeyAttCode, &$aClassAliases, &$aAliasTranslation, $iOperatorCode)
+	{
+		$sForeignClass = $oFilter->GetClass();
+
+		// Find the node on which the new tree must be attached (most of the time it is "this")
+		$oReceivingFilter = $this->GetNode($this->GetClassAlias());
+
+		$bMerged = false;
+		if (ENABLE_OPT && isset($oReceivingFilter->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode]))
+		{
+			foreach ($oReceivingFilter->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode] as $oExisting)
+			{
+				if ($oExisting->GetClass() == $oFilter->GetClass())
+				{
+					$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
+					$bMerged = true;
+					break;
+				}
+			}
+		}
+		if (!$bMerged)
+		{
+			$oFilter->AddToNamespace($aClassAliases, $aAliasTranslation);
+			$oReceivingFilter->m_aReferencedBy[$sForeignClass][$sForeignExtKeyAttCode][$iOperatorCode][] = $oFilter;
+		}
+	}
+
+	public function Intersect(DBSearch $oFilter)
+	{
+		if ($oFilter instanceof DBUnionSearch)
+		{
+			// Develop! 
+			$aFilters = $oFilter->GetSearches();
+		}
+		else
+		{
+			$aFilters = array($oFilter);
+		}
+
+		$aSearches = array();
+		foreach ($aFilters as $oRightFilter)
+		{
+			// Limitation: the queried class must be the first declared class
+			if ($this->GetFirstJoinedClassAlias() != $this->GetClassAlias())
+			{
+				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$this->GetClass()} AS {$this->GetClassAlias()}) is not the first joined class ({$this->GetFirstJoinedClass()} AS {$this->GetFirstJoinedClassAlias()})");
+			}
+			if ($oRightFilter->GetFirstJoinedClassAlias() != $oRightFilter->GetClassAlias())
+			{
+				throw new CoreException("Limitation: cannot merge two queries if the queried class ({$oRightFilter->GetClass()} AS {$oRightFilter->GetClassAlias()}) is not the first joined class ({$oRightFilter->GetFirstJoinedClass()} AS {$oRightFilter->GetFirstJoinedClassAlias()})");
+			}
+
+			$oLeftFilter = $this->DeepClone();
+			$oRightFilter = $oRightFilter->DeepClone();
+
+			$bAllowAllData = ($oLeftFilter->IsAllDataAllowed() && $oRightFilter->IsAllDataAllowed());
+			if ($bAllowAllData)
+			{
+				$oLeftFilter->AllowAllData();
+			}
+
+			if ($oLeftFilter->GetClass() != $oRightFilter->GetClass())
+			{
+				if (MetaModel::IsParentClass($oLeftFilter->GetClass(), $oRightFilter->GetClass()))
+				{
+					// Specialize $oLeftFilter
+					$oLeftFilter->ChangeClass($oRightFilter->GetClass());
+				}
+				elseif (MetaModel::IsParentClass($oRightFilter->GetClass(), $oLeftFilter->GetClass()))
+				{
+					// Specialize $oRightFilter
+					$oRightFilter->ChangeClass($oLeftFilter->GetClass());
+				}
+				else
+				{
+					throw new CoreException("Attempting to merge a filter of class '{$oLeftFilter->GetClass()}' with a filter of class '{$oRightFilter->GetClass()}'");
+				}
+			}
+
+			$aAliasTranslation = array();
+			$oLeftFilter->MergeWith_InNamespace($oRightFilter, $oLeftFilter->m_aClasses, $aAliasTranslation);
+			$oLeftFilter->TransferConditionExpression($oRightFilter, $aAliasTranslation);
+			$aSearches[] = $oLeftFilter;
+		}
+		if (count($aSearches) == 1)
+		{
+			// return a DBObjectSearch
+			return $aSearches[0];
+		}
+		else
+		{
+			return new DBUnionSearch($aSearches);
+		}
+	}
+
+	protected function MergeWith_InNamespace($oFilter, &$aClassAliases, &$aAliasTranslation)
+	{
+		if ($this->GetClass() != $oFilter->GetClass())
+		{
+			throw new CoreException("Attempting to merge a filter of class '{$this->GetClass()}' with a filter of class '{$oFilter->GetClass()}'");
+		}
+
+		// Translate search condition into our aliasing scheme
+		$aAliasTranslation[$oFilter->GetClassAlias()]['*'] = $this->GetClassAlias(); 
+
+		foreach($oFilter->m_aPointingTo as $sExtKeyAttCode=>$aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oExtFilter)
+				{
+					$this->AddCondition_PointingTo_InNamespace($oExtFilter, $sExtKeyAttCode, $aClassAliases, $aAliasTranslation, $iOperatorCode);
+				}
+			}
+		}
+		foreach($oFilter->m_aReferencedBy as $sForeignClass => $aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$this->AddCondition_ReferencedBy_InNamespace($oForeignFilter, $sForeignExtKeyAttCode, $aClassAliases, $aAliasTranslation, $iOperatorCode);
+					}
+				}
+			}
+		}
+	}
+
+	public function GetCriteria() {return $this->m_oSearchCondition;}
+	public function GetCriteria_FullText() {throw new Exception("Removed GetCriteria_FullText");}
+	public function GetCriteria_PointingTo($sKeyAttCode = "")
+	{
+		if (empty($sKeyAttCode))
+		{
+			return $this->m_aPointingTo;
+		}
+		if (!array_key_exists($sKeyAttCode, $this->m_aPointingTo)) return array();
+		return $this->m_aPointingTo[$sKeyAttCode];
+	}
+	protected function GetCriteria_ReferencedBy()
+	{
+		return $this->m_aReferencedBy;
+	}
+
+	public function SetInternalParams($aParams)
+	{
+		return $this->m_aParams = $aParams;
+	}
+
+	/**
+	 * @return array <strong>warning</strong> : array returned by value
+	 * @see self::GetInternalParamsByRef to get the attribute by reference
+	 */
+	public function GetInternalParams()
+	{
+		return $this->m_aParams;
+	}
+
+	/**
+	 * @return array
+	 * @see http://php.net/manual/en/language.references.return.php
+	 * @since 2.5.1 N°1582
+	 */
+	public function &GetInternalParamsByRef()
+	{
+		return $this->m_aParams;
+	}
+
+	/**
+	 * @param string $sKey
+	 * @param mixed $value
+	 * @param bool $bDoNotOverride
+	 *
+	 * @throws \CoreUnexpectedValue if $bDoNotOverride and $sKey already exists
+	 */
+	public function AddInternalParam($sKey, $value, $bDoNotOverride = false)
+	{
+		if ($bDoNotOverride)
+		{
+			if (array_key_exists($sKey, $this->m_aParams))
+			{
+				throw new CoreUnexpectedValue("The key $sKey already exists with value : ".$this->m_aParams[$sKey]);
+			}
+		}
+
+		$this->m_aParams[$sKey] = $value;
+	}
+
+	public function GetQueryParams($bExcludeMagicParams = true)
+	{
+		$aParams = array();
+		$this->m_oSearchCondition->Render($aParams, true);
+
+		if ($bExcludeMagicParams)
+		{
+			$aRet = array();
+
+			// Make the list of acceptable arguments... could be factorized with run_query, into oSearch->GetQueryParams($bExclude magic params)
+			$aNakedMagicArguments = array();
+			foreach (MetaModel::PrepareQueryArguments(array()) as $sArgName => $value)
+			{
+				$iPos = strpos($sArgName, '->object()');
+				if ($iPos === false)
+				{
+					$aNakedMagicArguments[$sArgName] = $value;
+				}
+				else
+				{
+					$aNakedMagicArguments[substr($sArgName, 0, $iPos)] = true;
+				}
+			}
+			foreach ($aParams as $sParam => $foo)
+			{
+				$iPos = strpos($sParam, '->');
+				if ($iPos === false)
+				{
+					$sRefName = $sParam;
+				}
+				else
+				{
+					$sRefName = substr($sParam, 0, $iPos);
+				}
+				if (!array_key_exists($sRefName, $aNakedMagicArguments))
+				{
+					$aRet[$sParam] = $foo;
+				}
+			}
+		}
+
+		return $aRet;
+	}
+
+	public function ListConstantFields()
+	{
+		return $this->m_oSearchCondition->ListConstantFields();
+	}
+
+	/**
+	 * Turn the parameters (:xxx) into scalar values in order to easily
+	 * serialize a search
+	 * @param $aArgs
+*/
+	public function ApplyParameters($aArgs)
+	{
+		$this->m_oSearchCondition->ApplyParameters(array_merge($this->m_aParams, $aArgs));
+	}
+	
+	public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false)
+	{
+		// Currently unused, but could be useful later
+		$bRetrofitParams = false;
+
+		if ($bDevelopParams)
+		{
+			if (is_null($aContextParams))
+			{
+				$aParams = array_merge($this->m_aParams);
+			}
+			else
+			{
+				$aParams = array_merge($aContextParams, $this->m_aParams);
+			}
+			$aParams = MetaModel::PrepareQueryArguments($aParams);
+		}
+		else
+		{
+			// Leave it as is, the rendering will be made with parameters in clear
+			$aParams = null;
+		}
+
+		$aSelectedAliases = array();
+		foreach ($this->m_aSelectedClasses as $sAlias => $sClass)
+		{
+			$aSelectedAliases[] = '`' . $sAlias . '`';
+		}
+		$sSelectedClasses = implode(', ', $aSelectedAliases);
+		$sRes = 'SELECT '.$sSelectedClasses.' FROM';
+
+		$sRes .= ' ' . $this->GetFirstJoinedClass() . ' AS `' . $this->GetFirstJoinedClassAlias() . '`';
+		$sRes .= $this->ToOQL_Joins();
+		$sRes .= " WHERE ".$this->m_oSearchCondition->Render($aParams, $bRetrofitParams);
+
+		if ($bWithAllowAllFlag && $this->m_bAllowAllData)
+		{
+			$sRes .= " ALLOW ALL DATA";
+		}
+		return $sRes;
+	}
+
+	protected function OperatorCodeToOQL($iOperatorCode)
+	{
+		switch($iOperatorCode)
+		{
+			case TREE_OPERATOR_EQUALS:
+				$sOperator = ' = ';
+				break;
+
+			case TREE_OPERATOR_BELOW:
+				$sOperator = ' BELOW ';
+				break;
+
+			case TREE_OPERATOR_BELOW_STRICT:
+				$sOperator = ' BELOW STRICT ';
+				break;
+
+			case TREE_OPERATOR_NOT_BELOW:
+				$sOperator = ' NOT BELOW ';
+				break;
+
+			case TREE_OPERATOR_NOT_BELOW_STRICT:
+				$sOperator = ' NOT BELOW STRICT ';
+				break;
+
+			case TREE_OPERATOR_ABOVE:
+				$sOperator = ' ABOVE ';
+				break;
+
+			case TREE_OPERATOR_ABOVE_STRICT:
+				$sOperator = ' ABOVE STRICT ';
+				break;
+
+			case TREE_OPERATOR_NOT_ABOVE:
+				$sOperator = ' NOT ABOVE ';
+				break;
+
+			case TREE_OPERATOR_NOT_ABOVE_STRICT:
+				$sOperator = ' NOT ABOVE STRICT ';
+				break;
+
+		}
+		return $sOperator;
+	}
+
+	protected function ToOQL_Joins()
+	{
+		$sRes = '';
+		foreach($this->m_aPointingTo as $sExtKey => $aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				$sOperator = $this->OperatorCodeToOQL($iOperatorCode);
+				foreach($aFilter as $oFilter)
+				{
+					$sRes .= ' JOIN ' . $oFilter->GetFirstJoinedClass() . ' AS `' . $oFilter->GetFirstJoinedClassAlias() . '` ON `' . $this->GetFirstJoinedClassAlias() . '`.' . $sExtKey . $sOperator . '`' . $oFilter->GetFirstJoinedClassAlias() . '`.id';
+					$sRes .= $oFilter->ToOQL_Joins();				
+				}
+			}
+		}
+		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					$sOperator = $this->OperatorCodeToOQL($iOperatorCode);
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$sRes .= ' JOIN ' . $oForeignFilter->GetFirstJoinedClass() . ' AS `' . $oForeignFilter->GetFirstJoinedClassAlias() . '` ON `' . $oForeignFilter->GetFirstJoinedClassAlias() . '`.' . $sForeignExtKeyAttCode . $sOperator . '`' . $this->GetFirstJoinedClassAlias() . '`.id';
+						$sRes .= $oForeignFilter->ToOQL_Joins();
+					}
+				}
+			}
+		}
+		return $sRes;
+	}
+
+	protected function OQLExpressionToCondition($sQuery, $oExpression, $aClassAliases)
+	{
+		if ($oExpression instanceof BinaryOqlExpression)
+		{
+			$sOperator = $oExpression->GetOperator();
+			$oLeft = $this->OQLExpressionToCondition($sQuery, $oExpression->GetLeftExpr(), $aClassAliases);
+			$oRight = $this->OQLExpressionToCondition($sQuery, $oExpression->GetRightExpr(), $aClassAliases);
+			return new BinaryExpression($oLeft, $sOperator, $oRight);
+		}
+		elseif ($oExpression instanceof FieldOqlExpression)
+		{
+			$sClassAlias = $oExpression->GetParent();
+			$sFltCode = $oExpression->GetName();
+			if (empty($sClassAlias))
+			{
+				// Need to find the right alias
+				// Build an array of field => array of aliases
+				$aFieldClasses = array();
+				foreach($aClassAliases as $sAlias => $sReal)
+				{
+					foreach(MetaModel::GetFiltersList($sReal) as $sAnFltCode)
+					{
+						$aFieldClasses[$sAnFltCode][] = $sAlias;
+					}
+				}
+				$sClassAlias = $aFieldClasses[$sFltCode][0];
+			}
+			return new FieldExpression($sFltCode, $sClassAlias);
+		}
+		elseif ($oExpression instanceof VariableOqlExpression)
+		{
+			return new VariableExpression($oExpression->GetName());
+		}
+		elseif ($oExpression instanceof TrueOqlExpression)
+		{
+			return new TrueExpression;
+		}
+		elseif ($oExpression instanceof ScalarOqlExpression)
+		{
+			return new ScalarExpression($oExpression->GetValue());
+		}
+		elseif ($oExpression instanceof ListOqlExpression)
+		{
+			$aItems = array();
+			foreach ($oExpression->GetItems() as $oItemExpression)
+			{
+				$aItems[] = $this->OQLExpressionToCondition($sQuery, $oItemExpression, $aClassAliases);
+			}
+			return new ListExpression($aItems);
+		}
+		elseif ($oExpression instanceof FunctionOqlExpression)
+		{
+			$aArgs = array();
+			foreach ($oExpression->GetArgs() as $oArgExpression)
+			{
+				$aArgs[] = $this->OQLExpressionToCondition($sQuery, $oArgExpression, $aClassAliases);
+			}
+			return new FunctionExpression($oExpression->GetVerb(), $aArgs);
+		}
+		elseif ($oExpression instanceof IntervalOqlExpression)
+		{
+			return new IntervalExpression($oExpression->GetValue(), $oExpression->GetUnit());
+		}
+		else
+		{
+			throw new CoreException('Unknown expression type', array('class'=>get_class($oExpression), 'query'=>$sQuery));
+		}
+	}
+
+	public function InitFromOqlQuery(OqlQuery $oOqlQuery, $sQuery)
+	{
+		$oModelReflection = new ModelReflectionRuntime();
+		$sClass = $oOqlQuery->GetClass($oModelReflection);
+		$sClassAlias = $oOqlQuery->GetClassAlias();
+
+		$aAliases = array($sClassAlias => $sClass);
+
+		// Note: the condition must be built here, it may be altered later on when optimizing some joins
+		$oConditionTree = $oOqlQuery->GetCondition();
+		if ($oConditionTree instanceof Expression)
+		{
+			$aRawAliases = array($sClassAlias => $sClass);
+			$aJoinSpecs = $oOqlQuery->GetJoins();
+			if (is_array($aJoinSpecs))
+			{
+				foreach ($aJoinSpecs as $oJoinSpec)
+				{
+					$aRawAliases[$oJoinSpec->GetClassAlias()] = $oJoinSpec->GetClass();
+				}
+			}
+			$this->m_oSearchCondition = $this->OQLExpressionToCondition($sQuery, $oConditionTree, $aRawAliases);
+		}
+
+		// Maintain an array of filters, because the flat list is in fact referring to a tree
+		// And this will be an easy way to dispatch the conditions
+		// $this will be referenced by the other filters, or the other way around...
+		$aJoinItems = array($sClassAlias => $this);
+
+		$aJoinSpecs = $oOqlQuery->GetJoins();
+		if (is_array($aJoinSpecs))
+		{
+			$aAliasTranslation = array();
+			foreach ($aJoinSpecs as $oJoinSpec)
+			{
+				$sJoinClass = $oJoinSpec->GetClass();
+				$sJoinClassAlias = $oJoinSpec->GetClassAlias();
+				if (isset($aAliasTranslation[$sJoinClassAlias]['*']))
+				{
+					$sJoinClassAlias = $aAliasTranslation[$sJoinClassAlias]['*'];
+				}
+
+				// Assumption: ext key on the left only !!!
+				// normalization should take care of this
+				$oLeftField = $oJoinSpec->GetLeftField();
+				$sFromClass = $oLeftField->GetParent();
+				if (isset($aAliasTranslation[$sFromClass]['*']))
+				{
+					$sFromClass = $aAliasTranslation[$sFromClass]['*'];
+				}
+				$sExtKeyAttCode = $oLeftField->GetName();
+
+				$oRightField = $oJoinSpec->GetRightField();
+				$sToClass = $oRightField->GetParent();
+				if (isset($aAliasTranslation[$sToClass]['*']))
+				{
+					$sToClass = $aAliasTranslation[$sToClass]['*'];
+				}
+
+				$aAliases[$sJoinClassAlias] = $sJoinClass;
+				$aJoinItems[$sJoinClassAlias] = new DBObjectSearch($sJoinClass, $sJoinClassAlias);
+
+				$sOperator = $oJoinSpec->GetOperator();
+				switch($sOperator)
+				{
+					case '=':
+					default:
+						$iOperatorCode = TREE_OPERATOR_EQUALS;
+						break;
+					case 'BELOW':
+						$iOperatorCode = TREE_OPERATOR_BELOW;
+						break;
+					case 'BELOW_STRICT':
+						$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
+						break;
+					case 'NOT_BELOW':
+						$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
+						break;
+					case 'NOT_BELOW_STRICT':
+						$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
+						break;
+					case 'ABOVE':
+						$iOperatorCode = TREE_OPERATOR_ABOVE;
+						break;
+					case 'ABOVE_STRICT':
+						$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
+						break;
+					case 'NOT_ABOVE':
+						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
+						break;
+					case 'NOT_ABOVE_STRICT':
+						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
+						break;
+				}
+
+				if ($sFromClass == $sJoinClassAlias)
+				{
+					$oReceiver = $aJoinItems[$sToClass];
+					$oNewComer = $aJoinItems[$sFromClass];
+					$oReceiver->AddCondition_ReferencedBy_InNameSpace($oNewComer, $sExtKeyAttCode, $oReceiver->m_aClasses, $aAliasTranslation, $iOperatorCode);
+				}
+				else
+				{
+					$oReceiver = $aJoinItems[$sFromClass];
+					$oNewComer = $aJoinItems[$sToClass];
+					$oReceiver->AddCondition_PointingTo_InNameSpace($oNewComer, $sExtKeyAttCode, $oReceiver->m_aClasses, $aAliasTranslation, $iOperatorCode);
+				}
+			}
+			$this->m_oSearchCondition = $this->m_oSearchCondition->Translate($aAliasTranslation, false, false /* leave unresolved fields */);
+		}
+
+		// Check and prepare the select information
+		$this->m_aSelectedClasses = array();
+		foreach ($oOqlQuery->GetSelectedClasses() as $oClassDetails)
+		{
+			$sClassToSelect = $oClassDetails->GetValue();
+			$this->m_aSelectedClasses[$sClassToSelect] = $aAliases[$sClassToSelect];
+		}
+		$this->m_aClasses = $aAliases;
+	}
+
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Construction of the SQL queries
+	//
+	////////////////////////////////////////////////////////////////////////////
+
+	public function MakeDeleteQuery($aArgs = array())
+	{
+		$aModifierProperties = MetaModel::MakeModifierProperties($this);
+		$oBuild = new QueryBuilderContext($this, $aModifierProperties);
+		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, array($this->GetClassAlias() => array()), array());
+		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
+		$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
+		$oSQLQuery->OptimizeJoins(array());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$sRet = $oSQLQuery->RenderDelete($aScalarArgs);
+		return $sRet;
+	}
+
+	public function MakeUpdateQuery($aValues, $aArgs = array())
+	{
+		// $aValues is an array of $sAttCode => $value
+		$aModifierProperties = MetaModel::MakeModifierProperties($this);
+		$oBuild = new QueryBuilderContext($this, $aModifierProperties);
+		$aRequested = array(); // Requested attributes are the updated attributes
+		foreach ($aValues as $sAttCode => $value)
+		{
+			$aRequested[$sAttCode] = MetaModel::GetAttributeDef($this->GetClass(), $sAttCode);
+		}
+		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, array($this->GetClassAlias() => $aRequested), $aValues);
+		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
+		$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
+		$oSQLQuery->OptimizeJoins(array());
+		$aScalarArgs = MetaModel::PrepareQueryArguments($aArgs, $this->GetInternalParams());
+		$sRet = $oSQLQuery->RenderUpdate($aScalarArgs);
+		return $sRet;
+	}
+
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
+	{
+		// Hide objects that are not visible to the current user
+		//
+		$oSearch = $this;
+		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered())
+		{
+			$oVisibleObjects = UserRights::GetSelectFilter($this->GetClass(), $this->GetModifierProperties('UserRightsGetSelectFilter'));
+			if ($oVisibleObjects === false)
+			{
+				// Make sure this is a valid search object, saying NO for all
+				$oVisibleObjects = DBObjectSearch::FromEmptySet($this->GetClass());
+			}
+			if (is_object($oVisibleObjects))
+			{
+				$oVisibleObjects->AllowAllData();
+				$oSearch = $this->Intersect($oVisibleObjects);
+				$oSearch->SetDataFiltered();
+			}
+		}
+
+		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
+		//
+		$aModifierProperties = MetaModel::MakeModifierProperties($oSearch);
+
+		// Create a unique cache id
+		//
+		$aContextData = array();
+		$bCanCache = true;
+		if (self::$m_bQueryCacheEnabled || self::$m_bTraceQueries)
+		{
+			if (isset($_SERVER['REQUEST_URI']))
+			{
+				$aContextData['sRequestUri'] = $_SERVER['REQUEST_URI'];
+			}
+			else if (isset($_SERVER['SCRIPT_NAME']))
+			{
+				$aContextData['sRequestUri'] = $_SERVER['SCRIPT_NAME'];
+			}
+			else
+			{
+				$aContextData['sRequestUri'] = '';
+			}
+
+			// Need to identify the query
+			$sOqlQuery = $oSearch->ToOql(false, null, true);
+			if ((strpos($sOqlQuery, '`id` IN (') !== false) || (strpos($sOqlQuery, '`id` NOT IN (') !== false))
+			{
+				// Requests containing "id IN" are not worth caching
+				$bCanCache = false;
+			}
+
+			$aContextData['sOqlQuery'] = $sOqlQuery;
+
+			if (count($aModifierProperties))
+			{
+				array_multisort($aModifierProperties);
+				$sModifierProperties = json_encode($aModifierProperties);
+			}
+			else
+			{
+				$sModifierProperties = '';
+			}
+			$aContextData['sModifierProperties'] = $sModifierProperties;
+
+			$sRawId = $sOqlQuery.$sModifierProperties;
+			if (!is_null($aAttToLoad))
+			{
+				$sRawId .= json_encode($aAttToLoad);
+			}
+			$aContextData['aAttToLoad'] = $aAttToLoad;
+			if (!is_null($aGroupByExpr))
+			{
+				foreach($aGroupByExpr as $sAlias => $oExpr)
+				{
+					$sRawId .= 'g:'.$sAlias.'!'.$oExpr->Render();
+				}
+			}
+			if (!is_null($aSelectExpr))
+			{
+				foreach($aSelectExpr as $sAlias => $oExpr)
+				{
+					$sRawId .= 'se:'.$sAlias.'!'.$oExpr->Render();
+				}
+			}
+			$aContextData['aGroupByExpr'] = $aGroupByExpr;
+			$aContextData['aSelectExpr'] = $aSelectExpr;
+			$sRawId .= $bGetCount;
+			$aContextData['bGetCount'] = $bGetCount;
+			if (is_array($aSelectedClasses))
+			{
+				$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
+			}
+			$aContextData['aSelectedClasses'] = $aSelectedClasses;
+			$bIsArchiveMode = $oSearch->GetArchiveMode();
+			$sRawId .= $bIsArchiveMode ? '--arch' : '';
+			$bShowObsoleteData = $oSearch->GetShowObsoleteData();
+			$sRawId .= $bShowObsoleteData ? '--obso' : '';
+			$aContextData['bIsArchiveMode'] = $bIsArchiveMode;
+			$aContextData['bShowObsoleteData'] = $bShowObsoleteData;
+			$sOqlId = md5($sRawId);
+		}
+		else
+		{
+			$sOqlQuery = "SELECTING... ".$oSearch->GetClass();
+			$sOqlId = "query id ? n/a";
+		}
+
+
+		// Query caching
+		//
+		$sOqlAPCCacheId = null;
+		if (self::$m_bQueryCacheEnabled)
+		{
+			// Warning: using directly the query string as the key to the hash array can FAIL if the string
+			// is long and the differences are only near the end... so it's safer (but not bullet proof?)
+			// to use a hash (like md5) of the string as the key !
+			//
+			// Example of two queries that were found as similar by the hash array:
+			// SELECT SLT JOIN lnkSLTToSLA AS L1 ON L1.slt_id=SLT.id JOIN SLA ON L1.sla_id = SLA.id JOIN lnkContractToSLA AS L2 ON L2.sla_id = SLA.id JOIN CustomerContract ON L2.contract_id = CustomerContract.id WHERE SLT.ticket_priority = 1 AND SLA.service_id = 3 AND SLT.metric = 'TTO' AND CustomerContract.customer_id = 2
+			// and
+			// SELECT SLT JOIN lnkSLTToSLA AS L1 ON L1.slt_id=SLT.id JOIN SLA ON L1.sla_id = SLA.id JOIN lnkContractToSLA AS L2 ON L2.sla_id = SLA.id JOIN CustomerContract ON L2.contract_id = CustomerContract.id WHERE SLT.ticket_priority = 1 AND SLA.service_id = 3 AND SLT.metric = 'TTR' AND CustomerContract.customer_id = 2
+			// the only difference is R instead or O at position 285 (TTR instead of TTO)...
+			//
+			if (array_key_exists($sOqlId, self::$m_aQueryStructCache))
+			{
+				// hit!
+
+				$oSQLQuery = unserialize(serialize(self::$m_aQueryStructCache[$sOqlId]));
+				// Note: cloning is not enough because the subtree is made of objects
+			}
+			elseif (self::$m_bUseAPCCache)
+			{
+				// Note: For versions of APC older than 3.0.17, fetch() accepts only one parameter
+				//
+				$sOqlAPCCacheId = 'itop-'.MetaModel::GetEnvironmentId().'-query-cache-'.$sOqlId;
+				$oKPI = new ExecutionKPI();
+				$result = apc_fetch($sOqlAPCCacheId);
+				$oKPI->ComputeStats('Query APC (fetch)', $sOqlQuery);
+
+				if (is_object($result))
+				{
+					$oSQLQuery = $result;
+					self::$m_aQueryStructCache[$sOqlId] = $oSQLQuery;
+				}
+			}
+		}
+
+		if (!isset($oSQLQuery))
+		{
+			$oKPI = new ExecutionKPI();
+			$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
+			$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
+
+			if (self::$m_bQueryCacheEnabled)
+			{
+				if ($bCanCache && self::$m_bUseAPCCache)
+				{
+					$oSQLQuery->m_aContextData = $aContextData;
+					$oKPI = new ExecutionKPI();
+					apc_store($sOqlAPCCacheId, $oSQLQuery, self::$m_iQueryCacheTTL);
+					$oKPI->ComputeStats('Query APC (store)', $sOqlQuery);
+				}
+
+				self::$m_aQueryStructCache[$sOqlId] = $oSQLQuery->DeepClone();
+			}
+		}
+		return $oSQLQuery;
+	}
+
+	/**
+	 * @param array $aAttToLoad
+	 * @param bool $bGetCount
+	 * @param array $aModifierProperties
+	 * @param array $aGroupByExpr
+	 * @param array $aSelectedClasses
+	 * @param array $aSelectExpr
+	 *
+	 * @return null|SQLObjectQuery
+	 * @throws \CoreException
+	 */
+	protected function BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
+	{
+		$oBuild = new QueryBuilderContext($this, $aModifierProperties, $aGroupByExpr, $aSelectedClasses, $aSelectExpr);
+
+		$oSQLQuery = $this->MakeSQLObjectQuery($oBuild, $aAttToLoad, array());
+		$oSQLQuery->SetCondition($oBuild->m_oQBExpressions->GetCondition());
+		if (is_array($aGroupByExpr))
+		{
+			$aCols = $oBuild->m_oQBExpressions->GetGroupBy();
+			$oSQLQuery->SetGroupBy($aCols);
+			$oSQLQuery->SetSelect($aCols);
+		}
+		else
+		{
+			$oSQLQuery->SetSelect($oBuild->m_oQBExpressions->GetSelect());
+		}
+		if ($aSelectExpr)
+		{
+			// Get the fields corresponding to the select expressions
+			foreach($oBuild->m_oQBExpressions->GetSelect() as $sAlias => $oExpr)
+			{
+				if (key_exists($sAlias, $aSelectExpr))
+				{
+					$oSQLQuery->AddSelect($sAlias, $oExpr);
+				}
+			}
+		}
+
+		$aMandatoryTables = null;
+		if (self::$m_bOptimizeQueries)
+		{
+			if ($bGetCount)
+			{
+				// Simplify the query if just getting the count
+				$oSQLQuery->SetSelect(array());
+			}
+			$oBuild->m_oQBExpressions->GetMandatoryTables($aMandatoryTables);
+			$oSQLQuery->OptimizeJoins($aMandatoryTables);
+		}
+		// Filter tables as late as possible: do not interfere with the optimization process
+		foreach ($oBuild->GetFilteredTables() as $sTableAlias => $aConditions)
+		{
+			if ($aMandatoryTables && array_key_exists($sTableAlias, $aMandatoryTables))
+			{
+				foreach ($aConditions as $oCondition)
+				{
+					$oSQLQuery->AddCondition($oCondition);
+				}
+			}
+		}
+
+		return $oSQLQuery;
+	}
+
+
+	/**
+	 * @param $oBuild
+	 * @param null $aAttToLoad
+	 * @param array $aValues
+	 * @return null|SQLObjectQuery
+	 * @throws \CoreException
+	 */
+	protected function MakeSQLObjectQuery(&$oBuild, $aAttToLoad = null, $aValues = array())
+	{
+		// Note: query class might be different than the class of the filter
+		// -> this occurs when we are linking our class to an external class (referenced by, or pointing to)
+		$sClass = $this->GetFirstJoinedClass();
+		$sClassAlias = $this->GetFirstJoinedClassAlias();
+
+		$bIsOnQueriedClass = array_key_exists($sClassAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
+
+		//self::DbgTrace("Entering: ".$this->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
+
+		//$sRootClass = MetaModel::GetRootClass($sClass);
+		$sKeyField = MetaModel::DBGetKey($sClass);
+
+		if ($bIsOnQueriedClass)
+		{
+			// default to the whole list of attributes + the very std id/finalclass
+			$oBuild->m_oQBExpressions->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
+			if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
+			{
+				$sSelectedClass = $oBuild->GetSelectedClass($sClassAlias);
+				$aAttList = MetaModel::ListAttributeDefs($sSelectedClass);
+			}
+			else
+			{
+				$aAttList = $aAttToLoad[$sClassAlias];
+			}
+			foreach ($aAttList as $sAttCode => $oAttDef)
+			{
+				if (!$oAttDef->IsScalar()) continue;
+				// keep because it can be used for sorting - if (!$oAttDef->LoadInObject()) continue;
+
+				if ($oAttDef->IsBasedOnOQLExpression())
+				{
+					$oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode, new FieldExpression($sAttCode, $sClassAlias));
+				}
+				else
+				{
+					foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
+					{
+						$oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
+					}
+				}
+			}
+		}
+		//echo "<p>oQBExpr ".__LINE__.": <pre>\n".print_r($oBuild->m_oQBExpressions, true)."</pre></p>\n";
+		$aExpectedAtts = array(); // array of (attcode => fieldexpression)
+		//echo "<p>".__LINE__.": GetUnresolvedFields($sClassAlias, ...)</p>\n";
+		$oBuild->m_oQBExpressions->GetUnresolvedFields($sClassAlias, $aExpectedAtts);
+
+		// Compute a clear view of required joins (from the current class)
+		// Build the list of external keys:
+		// -> ext keys required by an explicit join
+		// -> ext keys mentionned in a 'pointing to' condition
+		// -> ext keys required for an external field
+		// -> ext keys required for a friendly name
+		//
+		$aExtKeys = array(); // array of sTableClass => array of (sAttCode (keys) => array of (sAttCode (fields)=> oAttDef))
+		//
+		// Optimization: could be partially computed once for all (cached) ?
+		//  
+
+		if ($bIsOnQueriedClass)
+		{
+			// Get all Ext keys for the queried class (??)
+			foreach(MetaModel::GetKeysList($sClass) as $sKeyAttCode)
+			{
+				$sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
+				$aExtKeys[$sKeyTableClass][$sKeyAttCode] = array();
+			}
+		}
+		// Get all Ext keys used by the filter
+		foreach ($this->GetCriteria_PointingTo() as $sKeyAttCode => $aPointingTo)
+		{
+			if (array_key_exists(TREE_OPERATOR_EQUALS, $aPointingTo))
+			{
+				$sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
+				$aExtKeys[$sKeyTableClass][$sKeyAttCode] = array();
+			}
+		}
+
+		$aFNJoinAlias = array(); // array of (subclass => alias)
+		foreach ($aExpectedAtts as $sExpectedAttCode => $oExpression)
+		{
+			if (!MetaModel::IsValidAttCode($sClass, $sExpectedAttCode)) continue;
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sExpectedAttCode);
+			if ($oAttDef->IsBasedOnOQLExpression())
+			{
+				// To optimize: detect a restriction on child classes in the condition expression
+				//    e.g. SELECT FunctionalCI WHERE finalclass IN ('Server', 'VirtualMachine')
+				$oExpression = static::GetPolymorphicExpression($sClass, $sExpectedAttCode);
+
+				$aRequiredFields = array();
+				$oExpression->GetUnresolvedFields('', $aRequiredFields);
+				$aTranslateFields = array();
+				foreach($aRequiredFields as $sSubClass => $aFields)
+				{
+					foreach($aFields as $sAttCode => $oField)
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
+						if ($oAttDef->IsExternalKey())
+						{
+							$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
+							$aExtKeys[$sClassOfAttribute][$sAttCode] = array();
+						}
+						elseif ($oAttDef->IsExternalField())
+						{
+							$sKeyAttCode = $oAttDef->GetKeyAttCode();
+							$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sKeyAttCode);
+							$aExtKeys[$sClassOfAttribute][$sKeyAttCode][$sAttCode] = $oAttDef;
+						}
+						else
+						{
+							$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
+						}
+
+						if (MetaModel::IsParentClass($sClassOfAttribute, $sClass))
+						{
+							// The attribute is part of the standard query
+							//
+							$sAliasForAttribute = $sClassAlias;
+						}
+						else
+						{
+							// The attribute will be available from an additional outer join
+							// For each subclass (table) one single join is enough
+							//
+							if (!array_key_exists($sClassOfAttribute, $aFNJoinAlias))
+							{
+								$sAliasForAttribute = $oBuild->GenerateClassAlias($sClassAlias.'_fn_'.$sClassOfAttribute, $sClassOfAttribute);
+								$aFNJoinAlias[$sClassOfAttribute] = $sAliasForAttribute;
+							}
+							else
+							{
+								$sAliasForAttribute = $aFNJoinAlias[$sClassOfAttribute];
+							}
+						}
+
+						$aTranslateFields[$sSubClass][$sAttCode] = new FieldExpression($sAttCode, $sAliasForAttribute);
+					}
+				}
+				$oExpression = $oExpression->Translate($aTranslateFields, false);
+
+				$aTranslateNow = array();
+				$aTranslateNow[$sClassAlias][$sExpectedAttCode] = $oExpression;
+				$oBuild->m_oQBExpressions->Translate($aTranslateNow, false);
+			}
+		}
+
+		// Add the ext fields used in the select (eventually adds an external key)
+		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
+		{
+			if ($oAttDef->IsExternalField())
+			{
+				if (array_key_exists($sAttCode, $aExpectedAtts))
+				{
+					// Add the external attribute
+					$sKeyAttCode = $oAttDef->GetKeyAttCode();
+					$sKeyTableClass = MetaModel::GetAttributeOrigin($sClass, $sKeyAttCode);
+					$aExtKeys[$sKeyTableClass][$sKeyAttCode][$sAttCode] = $oAttDef;
+				}
+			}
+		}
+
+		// First query built from the root, adding all tables including the leaf
+		//   Before N.1065 we were joining from the leaf first, but this wasn't a good choice :
+		//   most of the time (obsolescence, friendlyname, ...) we want to get a root attribute !
+		//
+		$oSelectBase = null;
+		$aClassHierarchy = MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, true);
+		$bIsClassStandaloneClass = (count($aClassHierarchy) == 1);
+		foreach($aClassHierarchy as $sSomeClass)
+		{
+			if (!MetaModel::HasTable($sSomeClass))
+			{
+				continue;
+			}
+
+			self::DbgTrace("Adding join from root to leaf: $sSomeClass... let's call MakeSQLObjectQuerySingleTable()");
+			$oSelectParentTable = $this->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSomeClass, $aExtKeys, $aValues);
+			if (is_null($oSelectBase))
+			{
+				$oSelectBase = $oSelectParentTable;
+				if (!$bIsClassStandaloneClass && (MetaModel::IsRootClass($sSomeClass)))
+				{
+					// As we're linking to root class first, we're adding a where clause on the finalClass attribute :
+					//      COALESCE($sRootClassFinalClass IN ('$sExpectedClasses'), 1)
+					// If we don't, the child classes can be removed in the query optimisation phase, including the leaf that was queried
+					// So we still need to filter records to only those corresponding to the child classes !
+					// The coalesce is mandatory if we have a polymorphic query (left join)
+					$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
+					$sFinalClassSqlColumnName = MetaModel::DBGetClassField($sSomeClass);
+					$oClassExpr = new FieldExpression($sFinalClassSqlColumnName, $oSelectBase->GetTableAlias());
+					$oInExpression = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
+					$oTrueExpression = new TrueExpression();
+					$aCoalesceAttr = array($oInExpression, $oTrueExpression);
+					$oFinalClassRestriction = new FunctionExpression("COALESCE", $aCoalesceAttr);
+
+					$oBuild->m_oQBExpressions->AddCondition($oFinalClassRestriction);
+				}
+			}
+			else
+			{
+				$oSelectBase->AddInnerJoin($oSelectParentTable, $sKeyField, MetaModel::DBGetKey($sSomeClass));
+			}
+		}
+
+		// Filter on objects referencing me
+		//
+		foreach($this->m_aReferencedBy as $sForeignClass=>$aReferences)
+		{
+			foreach($aReferences as $sForeignExtKeyAttCode => $aFiltersByOperator)
+			{
+				foreach ($aFiltersByOperator as $iOperatorCode => $aFilters)
+				{
+					foreach ($aFilters as $oForeignFilter)
+					{
+						$oForeignKeyAttDef = MetaModel::GetAttributeDef($sForeignClass, $sForeignExtKeyAttCode);
+
+						self::DbgTrace("Referenced by foreign key: $sForeignExtKeyAttCode... let's call MakeSQLObjectQuery()");
+						//self::DbgTrace($oForeignFilter);
+						//self::DbgTrace($oForeignFilter->ToOQL());
+						//self::DbgTrace($oSelectForeign);
+						//self::DbgTrace($oSelectForeign->RenderSelect(array()));
+
+						$sForeignClassAlias = $oForeignFilter->GetFirstJoinedClassAlias();
+						$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression($sForeignExtKeyAttCode, $sForeignClassAlias));
+
+						if ($oForeignKeyAttDef instanceof AttributeObjectKey)
+						{
+							$sClassAttCode = $oForeignKeyAttDef->Get('class_attcode');
+
+							// Add the condition: `$sForeignClassAlias`.$sClassAttCode IN (subclasses of $sClass')
+							$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL));
+							$oClassExpr = new FieldExpression($sClassAttCode, $sForeignClassAlias);
+							$oClassRestriction = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
+							$oBuild->m_oQBExpressions->AddCondition($oClassRestriction);
+						}
+
+						$oSelectForeign = $oForeignFilter->MakeSQLObjectQuery($oBuild, $aAttToLoad);
+
+						$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
+						$sForeignKeyTable = $oJoinExpr->GetParent();
+						$sForeignKeyColumn = $oJoinExpr->GetName();
+
+						if ($iOperatorCode == TREE_OPERATOR_EQUALS)
+						{
+							$oSelectBase->AddInnerJoin($oSelectForeign, $sKeyField, $sForeignKeyColumn, $sForeignKeyTable);
+						}
+						else
+						{
+							// Hierarchical key
+							$KeyLeft = $oForeignKeyAttDef->GetSQLLeft();
+							$KeyRight = $oForeignKeyAttDef->GetSQLRight();
+
+							$oSelectBase->AddInnerJoinTree($oSelectForeign, $KeyLeft, $KeyRight, $KeyLeft, $KeyRight, $sForeignKeyTable, $iOperatorCode, true);
+						}
+					}
+				}
+			}
+		}
+
+		// Additional JOINS for Friendly names
+		//
+		foreach ($aFNJoinAlias as $sSubClass => $sSubClassAlias)
+		{
+			$oSubClassFilter = new DBObjectSearch($sSubClass, $sSubClassAlias);
+			$oSelectFN = $oSubClassFilter->MakeSQLObjectQuerySingleTable($oBuild, $aAttToLoad, $sSubClass, $aExtKeys, array());
+			$oSelectBase->AddLeftJoin($oSelectFN, $sKeyField, MetaModel::DBGetKey($sSubClass));
+		}
+
+		// That's all... cross fingers and we'll get some working query
+
+		//MyHelpers::var_dump_html($oSelectBase, true);
+		//MyHelpers::var_dump_html($oSelectBase->RenderSelect(), true);
+		if (self::$m_bDebugQuery) $oSelectBase->DisplayHtml();
+		return $oSelectBase;
+	}
+
+	protected function MakeSQLObjectQuerySingleTable(&$oBuild, $aAttToLoad, $sTableClass, $aExtKeys, $aValues)
+	{
+		// $aExtKeys is an array of sTableClass => array of (sAttCode (keys) => array of sAttCode (fields))
+
+		// Prepare the query for a single table (compound objects)
+		// Ignores the items (attributes/filters) that are not on the target table
+		// Perform an (inner or left) join for every external key (and specify the expected fields)
+		//
+		// Returns an SQLQuery
+		//
+		$sTargetClass = $this->GetFirstJoinedClass();
+		$sTargetAlias = $this->GetFirstJoinedClassAlias();
+		$sTable = MetaModel::DBGetTable($sTableClass);
+		$sTableAlias = $oBuild->GenerateTableAlias($sTargetAlias.'_'.$sTable, $sTable);
+
+		$aTranslation = array();
+		$aExpectedAtts = array();
+		$oBuild->m_oQBExpressions->GetUnresolvedFields($sTargetAlias, $aExpectedAtts);
+		
+		$bIsOnQueriedClass = array_key_exists($sTargetAlias, $oBuild->GetRootFilter()->GetSelectedClasses());
+
+		self::DbgTrace("Entering: tableclass=$sTableClass, filter=".$this->ToOQL().", ".($bIsOnQueriedClass ? "MAIN" : "SECONDARY"));
+
+		// 1 - SELECT and UPDATE
+		//
+		// Note: no need for any values nor fields for foreign Classes (ie not the queried Class)
+		//
+		$aUpdateValues = array();
+
+
+		// 1/a - Get the key and friendly name
+		//
+		// We need one pkey to be the key, let's take the first one available
+		$oSelectedIdField = null;
+		$oIdField = new FieldExpressionResolved(MetaModel::DBGetKey($sTableClass), $sTableAlias);
+		$aTranslation[$sTargetAlias]['id'] = $oIdField;
+
+		if ($bIsOnQueriedClass)
+		{
+			// Add this field to the list of queried fields (required for the COUNT to work fine)
+			$oSelectedIdField = $oIdField;
+		}
+
+		// 1/b - Get the other attributes
+		// 
+		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
+		{
+			// Skip this attribute if not defined in this table
+			if (MetaModel::GetAttributeOrigin($sTargetClass, $sAttCode) != $sTableClass) continue;
+
+			// Skip this attribute if not made of SQL columns 
+			if (count($oAttDef->GetSQLExpressions()) == 0) continue;
+
+			// Update...
+			//
+			if ($bIsOnQueriedClass && array_key_exists($sAttCode, $aValues))
+			{
+				assert ($oAttDef->IsBasedOnDBColumns());
+				foreach ($oAttDef->GetSQLValues($aValues[$sAttCode]) as $sColumn => $sValue)
+				{
+					$aUpdateValues[$sColumn] = $sValue;
+				}
+			}
+		}
+
+		// 2 - The SQL query, for this table only
+		//
+		$oSelectBase = new SQLObjectQuery($sTable, $sTableAlias, array(), $bIsOnQueriedClass, $aUpdateValues, $oSelectedIdField);
+
+		// 3 - Resolve expected expressions (translation table: alias.attcode => table.column)
+		//
+		foreach(MetaModel::ListAttributeDefs($sTableClass) as $sAttCode=>$oAttDef)
+		{
+			// Skip this attribute if not defined in this table
+			if (MetaModel::GetAttributeOrigin($sTargetClass, $sAttCode) != $sTableClass) continue;
+
+			// Select...
+			//
+			if ($oAttDef->IsExternalField())
+			{
+				// skip, this will be handled in the joined tables (done hereabove)
+			}
+			else
+			{
+				// standard field, or external key
+				// add it to the output
+				foreach ($oAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
+				{
+					if (array_key_exists($sAttCode.$sColId, $aExpectedAtts))
+					{
+						$oFieldSQLExp = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
+						foreach (MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
+						{
+							$oFieldSQLExp = $oQueryModifier->GetFieldExpression($oBuild, $sTargetClass, $sAttCode, $sColId, $oFieldSQLExp, $oSelectBase);
+						}
+						$aTranslation[$sTargetAlias][$sAttCode.$sColId] = $oFieldSQLExp;
+					}
+				}
+			}
+		}
+
+		// 4 - The external keys -> joins...
+		//
+		$aAllPointingTo = $this->GetCriteria_PointingTo();
+
+		if (array_key_exists($sTableClass, $aExtKeys))
+		{
+			foreach ($aExtKeys[$sTableClass] as $sKeyAttCode => $aExtFields)
+			{
+				$oKeyAttDef = MetaModel::GetAttributeDef($sTableClass, $sKeyAttCode);
+
+				$aPointingTo = $this->GetCriteria_PointingTo($sKeyAttCode);
+				if (!array_key_exists(TREE_OPERATOR_EQUALS, $aPointingTo))
+				{
+					// The join was not explicitely defined in the filter,
+					// we need to do it now
+					$sKeyClass =  $oKeyAttDef->GetTargetClass();
+					$sKeyClassAlias = $oBuild->GenerateClassAlias($sKeyClass.'_'.$sKeyAttCode, $sKeyClass);
+					$oExtFilter = new DBObjectSearch($sKeyClass, $sKeyClassAlias);
+
+					$aAllPointingTo[$sKeyAttCode][TREE_OPERATOR_EQUALS][$sKeyClassAlias] = $oExtFilter;
+				}
+			}
+		}
+
+		foreach ($aAllPointingTo as $sKeyAttCode => $aPointingTo)
+		{
+			foreach($aPointingTo as $iOperatorCode => $aFilter)
+			{
+				foreach($aFilter as $oExtFilter)
+				{
+					if (!MetaModel::IsValidAttCode($sTableClass, $sKeyAttCode)) continue; // Not defined in the class, skip it
+					// The aliases should not conflict because normalization occured while building the filter
+					$oKeyAttDef = MetaModel::GetAttributeDef($sTableClass, $sKeyAttCode);
+					$sKeyClass =  $oExtFilter->GetFirstJoinedClass();
+					$sKeyClassAlias = $oExtFilter->GetFirstJoinedClassAlias();
+
+					// Note: there is no search condition in $oExtFilter, because normalization did merge the condition onto the top of the filter tree
+
+					if ($iOperatorCode == TREE_OPERATOR_EQUALS)
+					{
+						if (array_key_exists($sTableClass, $aExtKeys) && array_key_exists($sKeyAttCode, $aExtKeys[$sTableClass]))
+						{
+							// Specify expected attributes for the target class query
+							// ... and use the current alias !
+							$aTranslateNow = array(); // Translation for external fields - must be performed before the join is done (recursion...)
+							foreach($aExtKeys[$sTableClass][$sKeyAttCode] as $sAttCode => $oAtt)
+							{
+								$oExtAttDef = $oAtt->GetExtAttDef();
+								if ($oExtAttDef->IsBasedOnOQLExpression())
+								{
+									$aTranslateNow[$sTargetAlias][$sAttCode] = new FieldExpression($oExtAttDef->GetCode(), $sKeyClassAlias);
+								}
+								else
+								{
+									$sExtAttCode = $oAtt->GetExtAttCode();
+									// Translate mainclass.extfield => remoteclassalias.remotefieldcode
+									$oRemoteAttDef = MetaModel::GetAttributeDef($sKeyClass, $sExtAttCode);
+									foreach ($oRemoteAttDef->GetSQLExpressions() as $sColId => $sRemoteAttExpr)
+									{
+										$aTranslateNow[$sTargetAlias][$sAttCode.$sColId] = new FieldExpression($sExtAttCode, $sKeyClassAlias);
+									}
+								}
+							}
+
+							if ($oKeyAttDef instanceof AttributeObjectKey)
+							{
+								// Add the condition: `$sTargetAlias`.$sClassAttCode IN (subclasses of $sKeyClass')
+								$sClassAttCode = $oKeyAttDef->Get('class_attcode');
+								$oClassAttDef = MetaModel::GetAttributeDef($sTargetClass, $sClassAttCode);
+								foreach ($oClassAttDef->GetSQLExpressions() as $sColId => $sSQLExpr)
+								{
+									$aTranslateNow[$sTargetAlias][$sClassAttCode.$sColId] = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
+								}
+
+								$oClassListExpr = ListExpression::FromScalars(MetaModel::EnumChildClasses($sKeyClass, ENUM_CHILD_CLASSES_ALL));
+								$oClassExpr = new FieldExpression($sClassAttCode, $sTargetAlias);
+								$oClassRestriction = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
+								$oBuild->m_oQBExpressions->AddCondition($oClassRestriction);
+							}
+
+							// Translate prior to recursing
+							//
+							$oBuild->m_oQBExpressions->Translate($aTranslateNow, false);
+
+							self::DbgTrace("External key $sKeyAttCode (class: $sKeyClass), call MakeSQLObjectQuery()");
+							$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression('id', $sKeyClassAlias));
+			
+							$oSelectExtKey = $oExtFilter->MakeSQLObjectQuery($oBuild, $aAttToLoad);
+			
+							$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
+							$sExternalKeyTable = $oJoinExpr->GetParent();
+							$sExternalKeyField = $oJoinExpr->GetName();
+			
+							$aCols = $oKeyAttDef->GetSQLExpressions(); // Workaround a PHP bug: sometimes issuing a Notice if invoking current(somefunc())
+							$sLocalKeyField = current($aCols); // get the first column for an external key
+			
+							self::DbgTrace("External key $sKeyAttCode, Join on $sLocalKeyField = $sExternalKeyField");
+							if ($oKeyAttDef->IsNullAllowed())
+							{
+								$oSelectBase->AddLeftJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField);
+							}
+							else
+							{
+								$oSelectBase->AddInnerJoin($oSelectExtKey, $sLocalKeyField, $sExternalKeyField, $sExternalKeyTable);
+							}
+						}
+					}
+					elseif(MetaModel::GetAttributeOrigin($sKeyClass, $sKeyAttCode) == $sTableClass)
+					{
+						$oBuild->m_oQBExpressions->PushJoinField(new FieldExpression($sKeyAttCode, $sKeyClassAlias));
+						$oSelectExtKey = $oExtFilter->MakeSQLObjectQuery($oBuild, $aAttToLoad);
+						$oJoinExpr = $oBuild->m_oQBExpressions->PopJoinField();
+						$sExternalKeyTable = $oJoinExpr->GetParent();
+						$sExternalKeyField = $oJoinExpr->GetName();
+						$sLeftIndex = $sExternalKeyField.'_left'; // TODO use GetSQLLeft()
+						$sRightIndex = $sExternalKeyField.'_right'; // TODO use GetSQLRight()
+	
+						$LocalKeyLeft = $oKeyAttDef->GetSQLLeft();
+						$LocalKeyRight = $oKeyAttDef->GetSQLRight();
+	
+						$oSelectBase->AddInnerJoinTree($oSelectExtKey, $LocalKeyLeft, $LocalKeyRight, $sLeftIndex, $sRightIndex, $sExternalKeyTable, $iOperatorCode);
+					}
+				}
+			}
+		}
+
+		// Translate the selected columns
+		//
+		$oBuild->m_oQBExpressions->Translate($aTranslation, false);
+
+		// Filter out archived records
+		//
+		if (MetaModel::IsArchivable($sTableClass))
+		{
+			if (!$oBuild->GetRootFilter()->GetArchiveMode())
+			{
+				$bIsOnJoinedClass = array_key_exists($sTargetAlias, $oBuild->GetRootFilter()->GetJoinedClasses());
+				if ($bIsOnJoinedClass)
+				{
+					if (MetaModel::IsParentClass($sTableClass, $sTargetClass))
+					{
+						$oNotArchived = new BinaryExpression(new FieldExpressionResolved('archive_flag', $sTableAlias), '=', new ScalarExpression(0));
+						$oBuild->AddFilteredTable($sTableAlias, $oNotArchived);
+					}
+				}
+			}
+		}
+		return $oSelectBase;
+	}
+
+	/**
+	 *    Get the expression for the class and its subclasses (if finalclass = 'subclass' ...)
+	 *    Simplifies the final expression by grouping classes having the same expression
+	 * @param $sClass
+	 * @param $sAttCode
+	 * @return \FunctionExpression|mixed|null
+	 * @throws \CoreException
+*/
+	static public function GetPolymorphicExpression($sClass, $sAttCode)
+	{
+		$oExpression = ExpressionCache::GetCachedExpression($sClass, $sAttCode);
+		if (!empty($oExpression))
+		{
+			return $oExpression;
+		}
+
+		// 1st step - get all of the required expressions (instantiable classes)
+		//            and group them using their OQL representation
+		//
+		$aExpressions = array(); // signature => array('expression' => oExp, 'classes' => array of classes)
+		foreach (MetaModel::EnumChildClasses($sClass, ENUM_CHILD_CLASSES_ALL) as $sSubClass)
+		{
+			if (($sSubClass != $sClass) && MetaModel::IsAbstract($sSubClass)) continue;
+
+			$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
+			$oSubClassExp = $oAttDef->GetOQLExpression($sSubClass);
+
+			// 3rd step - position the attributes in the hierarchy of classes
+			//
+			$oSubClassExp->Browse(function($oNode) use ($sSubClass) {
+				if ($oNode instanceof FieldExpression)
+				{
+					$sAttCode = $oNode->GetName();
+					$oAttDef = MetaModel::GetAttributeDef($sSubClass, $sAttCode);
+					if ($oAttDef->IsExternalField())
+					{
+						$sKeyAttCode = $oAttDef->GetKeyAttCode();
+						$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sKeyAttCode);
+					}
+					else
+					{
+						$sClassOfAttribute = MetaModel::GetAttributeOrigin($sSubClass, $sAttCode);
+					}
+					$sParent = MetaModel::GetAttributeOrigin($sClassOfAttribute, $oNode->GetName());
+					$oNode->SetParent($sParent);
+				}
+			});
+
+			$sSignature = $oSubClassExp->Render();
+			if (!array_key_exists($sSignature, $aExpressions))
+			{
+				$aExpressions[$sSignature] = array(
+					'expression' => $oSubClassExp,
+					'classes' => array(),
+				);
+			}
+			$aExpressions[$sSignature]['classes'][] = $sSubClass;
+		}
+
+		// 2nd step - build the final name expression depending on the finalclass
+		//
+		if (count($aExpressions) == 1)
+		{
+			$aExpData = reset($aExpressions);
+			$oExpression = $aExpData['expression'];
+		}
+		else
+		{
+			$oExpression = null;
+			foreach ($aExpressions as $sSignature => $aExpData)
+			{
+				$oClassListExpr = ListExpression::FromScalars($aExpData['classes']);
+				$oClassExpr = new FieldExpression('finalclass', $sClass);
+				$oClassInList = new BinaryExpression($oClassExpr, 'IN', $oClassListExpr);
+
+				if (is_null($oExpression))
+				{
+					$oExpression = $aExpData['expression'];
+				}
+				else
+				{
+					$oExpression = new FunctionExpression('IF', array($oClassInList, $aExpData['expression'], $oExpression));
+				}
+			}
+		}
+		return $oExpression;
+	}
+}
diff --git a/core/dbobjectset.class.php b/core/dbobjectset.class.php
index 3ebf48c50..0d8650048 100644
--- a/core/dbobjectset.class.php
+++ b/core/dbobjectset.class.php
@@ -1,1546 +1,1546 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-require_once('dbobjectiterator.php');
-
-/**
- * Object set management
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
- *
- * @package     iTopORM
- */
-class DBObjectSet implements iDBObjectSetIterator
-{
-	/**
-	 * @var array
-	 */
-	protected $m_aAddedIds; // Ids of objects added (discrete lists)
-	/**
-	 * @var hash array of (row => array of (classalias) => object/null) storing the objects added "in memory"
-	 */
-	protected $m_aAddedObjects;
-	/**
-	 * @var array
-	 */
-	protected $m_aArgs;
-	/**
-	 * @var array
-	 */
-	protected $m_aAttToLoad;
-	/**
-	 * @var array
-	 */
-	protected $m_aOrderBy;
-	/**
-	 * @var bool True when the filter has been used OR the set is built step by step (AddObject...)
-	 */
-	public $m_bLoaded;
-	/**
-	 * @var int Total number of rows for the query without LIMIT. null if unknown yet
-	 */
-	protected $m_iNumTotalDBRows;
-	/**
-	 * @var int Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
-	 */
-	protected $m_iNumLoadedDBRows;
-	/**
-	 * @var int
-	 */
-	protected $m_iCurrRow;
-	/**
-	 * @var DBSearch
-	 */
-	protected $m_oFilter;
-	/**
-	 * @var mysqli_result
-	 */
-	protected $m_oSQLResult;
-	protected $m_bSort;
-
-	/**
-	 * Create a new set based on a Search definition.
-	 * 
-	 * @param DBSearch $oFilter The search filter defining the objects which are part of the set (multiple columns/objects per row are supported)
-	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending
-	 * @param array $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
-	 * @param array $aExtendedDataSpec
-	 * @param int $iLimitCount Maximum number of rows to load (i.e. equivalent to MySQL's LIMIT start, count)
-	 * @param int $iLimitStart Index of the first row to load (i.e. equivalent to MySQL's LIMIT start, count)
-	 * @param bool $bSort if false no order by is done
-	 */
-	public function __construct(DBSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bSort = true)
-	{
-		$this->m_oFilter = $oFilter->DeepClone();
-		$this->m_aAddedIds = array();
-		$this->m_aOrderBy = $aOrderBy;
-		$this->m_aArgs = $aArgs;
-		$this->m_aAttToLoad = null;
-		$this->m_aExtendedDataSpec = $aExtendedDataSpec;
-		$this->m_iLimitCount = $iLimitCount;
-		$this->m_iLimitStart = $iLimitStart;
-		$this->m_bSort = $bSort;
-
-		$this->m_iNumTotalDBRows = null;
-		$this->m_iNumLoadedDBRows = 0;
-		$this->m_bLoaded = false;
-		$this->m_aAddedObjects = array();
-		$this->m_iCurrRow = 0;
-		$this->m_oSQLResult = null;
-	}
-
-	public function __destruct()
-	{
-		if (is_object($this->m_oSQLResult))
-		{
-			$this->m_oSQLResult->free();
-		}
-	}
-
-	public function __toString()
-	{
-		$sRet = '';
-		$this->Rewind();
-		$sRet .= "Set (".$this->m_oFilter->ToOQL().")<br/>\n";
-		$sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n";
-		
-		$sRet .= $this->Count()." records<br/>\n";
-		if ($this->Count() > 0)
-		{
-			$sRet .= "<ul class=\"treeview\">\n";
-			while ($oObj = $this->Fetch())
-			{
-				$sRet .= "<li>".$oObj->__toString()."</li>\n";
-			}
-			$sRet .= "</ul>\n";
-		}
-		return $sRet;
-	}
-
-	public function __clone()
-	{
-		$this->m_oFilter = $this->m_oFilter->DeepClone();
-
-		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
-		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
-		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
-		$this->m_iCurrRow = 0;
-		$this->m_oSQLResult = null;
-	}
-
-	/**
-	 * Called when unserializing a DBObjectSet
-	 */
-	public function __wakeup()
-	{
-		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
-		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
-		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
-		$this->m_iCurrRow = 0;
-		$this->m_oSQLResult = null;
-	}
-
-	public function SetShowObsoleteData($bShow)
-	{
-		$this->m_oFilter->SetShowObsoleteData($bShow);
-	}
-
-	public function GetShowObsoleteData()
-	{
-		return $this->m_oFilter->GetShowObsoleteData();
-	}
-
-	/**
-	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
-	 *
-	 * @param array $aAttToLoad Format: alias => array of attribute_codes
-	 * 
-	 * @return void
-	 */
-	public function OptimizeColumnLoad($aAttToLoad)
-	{
-		if (is_null($aAttToLoad))
-		{
-			$this->m_aAttToLoad = null;
-		}
-		else
-		{
-			// Complete the attribute list with the attribute codes
-			$aAttToLoadWithAttDef = array();
-			foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				$aAttToLoadWithAttDef[$sClassAlias] = array();
-				if (array_key_exists($sClassAlias, $aAttToLoad))
-				{
-					$aAttList = $aAttToLoad[$sClassAlias];
-					foreach($aAttList as $sAttToLoad)
-					{
-						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad);
-						$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad] = $oAttDef;
-						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
-						{
-							// Add the external key friendly name anytime
-							$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_friendlyname');
-							$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_friendlyname'] = $oFriendlyNameAttDef;
-
-							if (MetaModel::IsArchivable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
-							{
-								// Add the archive flag if necessary
-								$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_archive_flag');
-								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_archive_flag'] = $oArchiveFlagAttDef;
-							}
-
-							if (MetaModel::IsObsoletable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
-							{
-								// Add the obsolescence flag if necessary
-								$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_obsolescence_flag');
-								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_obsolescence_flag'] = $oObsoleteFlagAttDef;
-							}
-						}
-					}
-				}
-				// Add the friendly name anytime
-				$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
-				$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
-
-				if (MetaModel::IsArchivable($sClass))
-				{
-					// Add the archive flag if necessary
-					$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, 'archive_flag');
-					$aAttToLoadWithAttDef[$sClassAlias]['archive_flag'] = $oArchiveFlagAttDef;
-				}
-
-				if (MetaModel::IsObsoletable($sClass))
-				{
-					// Add the obsolescence flag if necessary
-					$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, 'obsolescence_flag');
-					$aAttToLoadWithAttDef[$sClassAlias]['obsolescence_flag'] = $oObsoleteFlagAttDef;
-				}
-
-				// Make sure that the final class is requested anytime, whatever the specification (needed for object construction!)
-				if (!MetaModel::IsStandaloneClass($sClass) && !array_key_exists('finalclass', $aAttToLoadWithAttDef[$sClassAlias]))
-				{
-					$aAttToLoadWithAttDef[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
-				}
-			}
-
-			$this->m_aAttToLoad = $aAttToLoadWithAttDef;
-		}
-	}
-
-	/**
-	 * Create a set (in-memory) containing just the given object
-	 * 
-	 * @param DBobject $oObject
-	 * 
-	 * @return DBObjectSet The singleton set
-	 */
-	static public function FromObject($oObject)
-	{
-		$oRetSet = self::FromScratch(get_class($oObject));
-		$oRetSet->AddObject($oObject);
-		return $oRetSet;
-	}
-
-	/**
-	 * Create an empty set (in-memory), for the given class (and its subclasses) of objects
-	 * 
-	 * @param string $sClass The class (or an ancestor) for the objects to be added in this set
-	 * 
-	 * @return DBObjectSet The empty set
-	 */
-	static public function FromScratch($sClass)
-	{
-		$oFilter = new DBObjectSearch($sClass);
-		$oFilter->AddConditionExpression(new FalseExpression());
-		$oRetSet = new self($oFilter);
-		$oRetSet->m_bLoaded = true; // no DB load
-		$oRetSet->m_iNumTotalDBRows = 0; // Nothing from the DB
-		return $oRetSet;
-	} 
-
-	/**
-	 * Create a set (in-memory) with just one column (i.e. one object per row) and filled with the given array of objects
-	 * 
-	 * @param string $sClass The class of the objects (must be a common ancestor to all objects in the set)
-	 * @param array $aObjects The list of objects to add into the set
-	 * 
-	 * @return DBObjectSet
-	 */
-	static public function FromArray($sClass, $aObjects)
-	{
-		$oRetSet = self::FromScratch($sClass);
-		$oRetSet->AddObjectArray($aObjects, $sClass);
-		return $oRetSet;
-	} 
-
-	/**
-	 * Create a set in-memory with several classes of objects per row (with one alias per "column")
-	 * 
-	 * Limitation:
-	 * The filter/OQL query representing such a set can not be rebuilt (only the first column will be taken into account)
-	 * 
-	 * @param hash $aClasses Format: array of (alias => class)
-	 * @param hash $aObjects Format: array of (array of (classalias => object))
-	 * 
-	 * @return DBObjectSet
-	 */
-	static public function FromArrayAssoc($aClasses, $aObjects)
-	{
-		// In a perfect world, we should create a complete tree of DBObjectSearch,
-		// but as we lack most of the information related to the objects,
-		// let's create one search definition corresponding only to the first column
-		$sClass = reset($aClasses);
-		$sAlias = key($aClasses);
-		$oFilter = new DBObjectSearch($sClass, $sAlias);
-
-		$oRetSet = new self($oFilter);
-		$oRetSet->m_bLoaded = true; // no DB load
-		$oRetSet->m_iNumTotalDBRows = 0; // Nothing from the DB
-		
-		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
-		{
-			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
-		}
-		return $oRetSet;
-	} 
-
-	static public function FromLinkSet($oObject, $sLinkSetAttCode, $sExtKeyToRemote)
-	{
-		$oLinkAttCode = MetaModel::GetAttributeDef(get_class($oObject), $sLinkSetAttCode);
-		$oExtKeyAttDef = MetaModel::GetAttributeDef($oLinkAttCode->GetLinkedClass(), $sExtKeyToRemote);
-		$sTargetClass = $oExtKeyAttDef->GetTargetClass();
-
-		$oLinkSet = $oObject->Get($sLinkSetAttCode);
-		$aTargets = array();
-		while ($oLink = $oLinkSet->Fetch())
-		{
-			$aTargets[] = MetaModel::GetObject($sTargetClass, $oLink->Get($sExtKeyToRemote));
-		}
-
-		return self::FromArray($sTargetClass, $aTargets);
-	}
-
-    /**
-     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
-     *
-     * @param bool $bWithId
-     * @return array
-     */
-	public function ToArray($bWithId = true)
-	{
-		$aRet = array();
-		$this->Rewind();
-		while ($oObject = $this->Fetch())
-		{
-			if ($bWithId)
-			{
-				$aRet[$oObject->GetKey()] = $oObject;
-			}
-			else
-			{
-				$aRet[] = $oObject;
-			}
-		}
-		return $aRet;
-	} 
-
-	public function ToArrayOfValues()
-	{
-		if (!$this->m_bLoaded) $this->Load();
-		$this->Rewind();
-
-		$aSelectedClasses = $this->m_oFilter->GetSelectedClasses();
-
-		$aRet = array();
-		$iRow = 0;
-		while($aObjects = $this->FetchAssoc())
-		{
-			foreach($aObjects as $sClassAlias => $oObject)
-			{
-				if (is_null($oObject))
-				{
-					$aRet[$iRow][$sClassAlias.'.'.'id'] = null;
-				}
-				else
-				{
-					$aRet[$iRow][$sClassAlias.'.'.'id'] = $oObject->GetKey();
-				} 
-				if (is_null($oObject))
-				{
-					$sClass = $aSelectedClasses[$sClassAlias];
-				}
-				else
-				{
-					$sClass = get_class($oObject);
-				}
-				foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-				{
-					if ($oAttDef->IsScalar())
-					{
-						$sAttName = $sClassAlias.'.'.$sAttCode;
-						if (is_null($oObject))
-						{
-							$aRet[$iRow][$sAttName] = null;
-						}
-						else
-						{
-							$aRet[$iRow][$sAttName] = $oObject->Get($sAttCode);
-						}
-					}
-				}
-			}
-			$iRow++;
-		}
-		return $aRet;
-	}
-
-    /**
-     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
-     *
-     * @param string $sAttCode
-     * @param bool $bWithId
-     * @return array
-     */
-	public function GetColumnAsArray($sAttCode, $bWithId = true)
-	{
-		$aRet = array();
-		$this->Rewind();
-		while ($oObject = $this->Fetch())
-		{
-			if ($bWithId)
-			{
-				$aRet[$oObject->GetKey()] = $oObject->Get($sAttCode);
-			}
-			else
-			{
-				$aRet[] = $oObject->Get($sAttCode);
-			}
-		}
-		return $aRet;
-	}
-
-	/**
-	 * Retrieve the DBSearch corresponding to the objects present in this set
-	 * 
-	 * Limitation:
-	 * This method will NOT work for sets with several columns (i.e. several objects per row)
-	 * 
-	 * @return DBObjectSearch
-	 */
-	public function GetFilter()
-	{
-		// Make sure that we carry on the parameters of the set with the filter
-		$oFilter = $this->m_oFilter->DeepClone();
-		$oFilter->SetShowObsoleteData(true);
-		// Note: the arguments found within a set can be object (but not in a filter)
-		// That's why PrepareQueryArguments must be invoked there
-		$oFilter->SetInternalParams(array_merge($oFilter->GetInternalParams(), $this->m_aArgs));
-		
-		if (count($this->m_aAddedIds) == 0)
-		{
-			return $oFilter;
-		}
-		else
-		{
-			$oIdListExpr = ListExpression::FromScalars(array_keys($this->m_aAddedIds));
-			$oIdExpr = new FieldExpression('id', $oFilter->GetClassAlias());
-			$oIdInList = new BinaryExpression($oIdExpr, 'IN', $oIdListExpr);
-			$oFilter->MergeConditionExpression($oIdInList);
-			return $oFilter;
-		}
-	}
-
-	/**
-	 * The (common ancestor) class of the objects in the first column of this set
-	 * 
-	 * @return string The class of the objects in the first column
-	 */
-	public function GetClass()
-	{
-		return $this->m_oFilter->GetClass();
-	}
-
-	/**
-	 * The alias for the class of the objects in the first column of this set
-	 * 
-	 * @return string The alias of the class in the first column
-	 */
-	public function GetClassAlias()
-	{
-		return $this->m_oFilter->GetClassAlias();
-	}
-
-	/**
-	 * The list of all classes (one per column) which are part of this set
-	 * 
-	 * @return hash Format: alias => class
-	 */
-	public function GetSelectedClasses()
-	{
-		return $this->m_oFilter->GetSelectedClasses();
-	}
-
-	/**
-	 * The root class (i.e. highest ancestor in the MeaModel class hierarchy) for the first column on this set
-	 * 
-	 * @return string The root class for the objects in the first column of the set
-	 */
-	public function GetRootClass()
-	{
-		return MetaModel::GetRootClass($this->GetClass());
-	}
-
-	/**
-	 * The arguments used for building this set
-	 * 
-	 * @return hash Format: parameter_name => value
-	 */
-	public function GetArgs()
-	{
-		return $this->m_aArgs;
-	}
-
-	/**
-	 * Sets the limits for loading the rows from the DB. Equivalent to MySQL's LIMIT start,count clause.
-	 * @param int $iLimitCount The number of rows to load
-	 * @param int $iLimitStart The index of the first row to load
-	 */
-	public function SetLimit($iLimitCount, $iLimitStart = 0)
-	{
-		$this->m_iLimitCount = $iLimitCount;
-		$this->m_iLimitStart = $iLimitStart;
-	}
-
-	/**
-	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
-	 *
-	 * @param hash $aOrderBy Format: [alias.]attcode => boolean (true = ascending, false = descending)
-	 */
-	public function SetOrderBy($aOrderBy)
-	{
-		if ($this->m_aOrderBy != $aOrderBy)
-		{
-			$this->m_aOrderBy = $aOrderBy;
-			if ($this->m_bLoaded)
-			{
-				$this->m_bLoaded = false;
-				$this->Load();
-			}
-		}
-	}
-
-	/**
-	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
-	 *
-	 * @param hash $aAliases Format: alias => boolean (true = ascending, false = descending). If omitted, then it defaults to all the selected classes
-	 */
-	public function SetOrderByClasses($aAliases = null)
-	{
-		if ($aAliases === null)
-		{
-			$aAliases = array();
-			foreach ($this->GetSelectedClasses() as $sAlias => $sClass)
-			{
-				$aAliases[$sAlias] = true;
-			}
-		}
-
-		$aAttributes = array();
-		foreach ($aAliases as $sAlias => $bClassDirection)
-		{
-			foreach (MetaModel::GetOrderByDefault($this->m_oFilter->GetClassName($sAlias)) as $sAttCode => $bAttributeDirection)
-			{
-				$bDirection = $bClassDirection ? $bAttributeDirection : !$bAttributeDirection;
-				$aAttributes[$sAlias.'.'.$sAttCode] = $bDirection;
-			}
-		}
-		$this->SetOrderBy($aAttributes);
-	}
-
-	/**
-	 * Returns the 'count' limit for loading the rows from the DB
-	 * 
-	 * @return int
-	 */
-	public function GetLimitCount()
-	{
-		return $this->m_iLimitCount;
-	}
-
-	/**
-	 * Returns the 'start' limit for loading the rows from the DB
-	 * 
-	 * @return int
-	 */
-	public function GetLimitStart()
-	{
-		return $this->m_iLimitStart;
-	}
-
-	/**
-	 * Get the sort order used for loading this set from the database
-	 * 
-	 * Limitation: the sort order has no effect on objects added in-memory
-	 * 
-	 * @return array Format: field_code => boolean (true = ascending, false = descending)
-	 */
-	public function GetRealSortOrder()
-	{
-		if (!$this->m_bSort)
-		{
-			// No order by
-			return array();
-		}
-		// Get the class default sort order if not specified with the API
-		//
-		if (empty($this->m_aOrderBy))
-		{
-			return MetaModel::GetOrderByDefault($this->m_oFilter->GetClass());
-		}
-		else
-		{
-			return $this->m_aOrderBy;
-		}
-	}
-
-	/**
-	 * Loads the set from the database. Actually performs the SQL query to retrieve the records from the DB. 
-	 */
-	public function Load()
-	{
-		if ($this->m_bLoaded) return;
-		// Note: it is mandatory to set this value now, to protect against reentrance
-		$this->m_bLoaded = true;
-
-		$sSQL = $this->_makeSelectQuery($this->m_aAttToLoad);
-		
-		if (is_object($this->m_oSQLResult))
-		{
-			// Free previous resultset if any
-			$this->m_oSQLResult->free();
-			$this->m_oSQLResult = null;
-		}
-
-		try
-		{
-			$this->m_oSQLResult = CMDBSource::Query($sSQL);
-		} catch (MySQLException $e)
-		{
-			// 1116 = ER_TOO_MANY_TABLES
-			// https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_too_many_tables
-			if ($e->getCode() != 1116)
-			{
-				throw $e;
-			}
-
-			// N.689 Workaround for the 61 max joins in MySQL : full lazy load !
-			$aAttToLoad = array();
-			foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				$aAttToLoad[$sClassAlias] = array();
-				$bIsAbstractClass = MetaModel::IsAbstract($sClass);
-				$bIsClassWithChildren = MetaModel::HasChildrenClasses($sClass);
-				if ($bIsAbstractClass || $bIsClassWithChildren)
-				{
-					// we need finalClass field at least to be able to instantiate the real corresponding object !
-					$aAttToLoad[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
-				}
-			}
-			$sSQL = $this->_makeSelectQuery($aAttToLoad);
-			$this->m_oSQLResult = CMDBSource::Query($sSQL); // may fail again
-		}
-
-		if ($this->m_oSQLResult === false) return;
-
-		if ((($this->m_iLimitCount == 0) || ($this->m_iLimitCount > $this->m_oSQLResult->num_rows)) && ($this->m_iLimitStart == 0))
-		{
-			$this->m_iNumTotalDBRows = $this->m_oSQLResult->num_rows;
-		}
-
-		$this->m_iNumLoadedDBRows = $this->m_oSQLResult->num_rows;
-	}
-
-	/**
-	 * @param string[] $aAttToLoad
-	 *
-	 * @return string SQL query
-	 */
-	private function _makeSelectQuery($aAttToLoad)
-	{
-		if ($this->m_iLimitCount > 0)
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $aAttToLoad,
-				$this->m_aExtendedDataSpec, $this->m_iLimitCount, $this->m_iLimitStart);
-		}
-		else
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $aAttToLoad,
-				$this->m_aExtendedDataSpec);
-		}
-
-		return $sSQL;
-	}
-
-	/**
-	 * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into
-	 * account the rows added in-memory.
-	 *
-	 * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a
-	 * SetLimit
-	 *
-	 * @return int The total number of rows for this set.
-	 */
-	public function Count()
-	{
-		if (is_null($this->m_iNumTotalDBRows))
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, 0, 0, true);
-			$resQuery = CMDBSource::Query($sSQL);
-			if (!$resQuery) return 0;
-
-			$aRow = CMDBSource::FetchArray($resQuery);
-			CMDBSource::FreeResult($resQuery);
-			$this->m_iNumTotalDBRows = intval($aRow['COUNT']);
-		}
-
-		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
-	}
-
-	/** Check if the count exceeds a given limit
-	 * @param $iLimit
-	 *
-	 * @return bool
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public function CountExceeds($iLimit)
-	{
-		if (is_null($this->m_iNumTotalDBRows))
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
-			$resQuery = CMDBSource::Query($sSQL);
-			if ($resQuery)
-			{
-				$aRow = CMDBSource::FetchArray($resQuery);
-				CMDBSource::FreeResult($resQuery);
-				$iCount = intval($aRow['COUNT']);
-			}
-			else
-			{
-				$iCount = 0;
-			}
-		}
-		else
-		{
-			$iCount = $this->m_iNumTotalDBRows;
-		}
-
-		return ($iCount > $iLimit);
-	}
-
-	/** Count only up to the given limit
-	 * @param $iLimit
-	 *
-	 * @return int
-	 * @throws \CoreException
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \MySQLHasGoneAwayException
-	 */
-	public function CountWithLimit($iLimit)
-	{
-		if (is_null($this->m_iNumTotalDBRows))
-		{
-			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
-			$resQuery = CMDBSource::Query($sSQL);
-			if ($resQuery)
-			{
-				$aRow = CMDBSource::FetchArray($resQuery);
-				CMDBSource::FreeResult($resQuery);
-				$iCount = intval($aRow['COUNT']);
-			}
-			else
-			{
-				$iCount = 0;
-			}
-		}
-		else
-		{
-			$iCount = $this->m_iNumTotalDBRows;
-		}
-
-		return $iCount;
-	}
-
-	/**
-	 * Number of rows available in memory (loaded from DB + added in memory)
-	 * 
-	 * @return number The number of rows available for Fetch'ing
-	 */
-	protected function CountLoaded()
-	{
-		return $this->m_iNumLoadedDBRows + count($this->m_aAddedObjects);
-	}
-
-	/**
-	 * Fetch the object (with the given class alias) at the current position in the set and move the cursor to the next position.
-	 * 
-	 * @param string $sRequestedClassAlias The class alias to fetch (if there are several objects/classes per row)
-	 * @return DBObject The fetched object or null when at the end
-	 */
-	public function Fetch($sRequestedClassAlias = '')
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		if ($this->m_iCurrRow >= $this->CountLoaded())
-		{
-			return null;
-		}
-	
-		if (strlen($sRequestedClassAlias) == 0)
-		{
-			$sRequestedClassAlias = $this->m_oFilter->GetClassAlias();
-		}
-
-		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
-		{
-			// Pick the row from the database
-			$aRow = CMDBSource::FetchArray($this->m_oSQLResult);
-			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				if ($sRequestedClassAlias == $sClassAlias)
-				{
-					if (is_null($aRow[$sClassAlias.'id']))
-					{
-						$oRetObj = null;
-					}
-					else
-					{
-						$oRetObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
-					}
-					break;
-				}
-			}
-		}
-		else
-		{
-			// Pick the row from the objects added *in memory*
-			$oRetObj = $this->m_aAddedObjects[$this->m_iCurrRow - $this->m_iNumLoadedDBRows][$sRequestedClassAlias];
-		}
-		$this->m_iCurrRow++;
-		return $oRetObj;
-	}
-
-	/**
-	 * Fetch the whole row of objects (if several classes have been specified in the query) and move the cursor to the next position
-	 * 
-	 * @return hash A hash with the format 'classAlias' => $oObj representing the current row of the set. Returns null when at the end.
-	 */
-	public function FetchAssoc()
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		if ($this->m_iCurrRow >= $this->CountLoaded())
-		{
-			return null;
-		}
-	
-		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
-		{
-			// Pick the row from the database
-			$aRow = CMDBSource::FetchArray($this->m_oSQLResult);
-			$aRetObjects = array();
-			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				if (is_null($aRow[$sClassAlias.'id']))
-				{
-					$oObj = null;
-				}
-				else
-				{
-					$oObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
-				}
-				$aRetObjects[$sClassAlias] = $oObj;
-			}
-		}
-		else
-		{
-			// Pick the row from the objects added *in memory*
-			$aRetObjects = array();
-			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
-			{
-				$aRetObjects[$sClassAlias] = $this->m_aAddedObjects[$this->m_iCurrRow - $this->m_iNumLoadedDBRows][$sClassAlias];
-			}
-		}
-		$this->m_iCurrRow++;
-		return $aRetObjects;
-	}
-
-	/**
-	 * Position the cursor (for iterating in the set) to the first position (equivalent to Seek(0))
-	 */
-	public function Rewind()
-	{
-		if ($this->m_bLoaded)
-		{
-			$this->Seek(0);
-		}
-	}
-
-	/**
-	 * Position the cursor (for iterating in the set) to the given position
-	 * 
-	 * @param int $iRow
-	 */
-	public function Seek($iRow)
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		$this->m_iCurrRow = min($iRow, $this->Count());
-		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
-		{
-			$this->m_oSQLResult->data_seek($this->m_iCurrRow);
-		}
-		return $this->m_iCurrRow;
-	}
-
-	/**
-	 * Add an object to the current set (in-memory only, nothing is written to the database)
-	 * 
-	 * Limitation:
-	 * Sets with several objects per row are NOT supported
-	 * 
-	 * @param DBObject $oObject The object to add
-	 * @param string $sClassAlias The alias for the class of the object
-	 */
-	public function AddObject($oObject, $sClassAlias = '')
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		if (strlen($sClassAlias) == 0)
-		{
-			$sClassAlias = $this->m_oFilter->GetClassAlias();
-		}
-
-		$iNextPos = count($this->m_aAddedObjects);
-		$this->m_aAddedObjects[$iNextPos][$sClassAlias] = $oObject;
-		if (!is_null($oObject))
-		{
-			$this->m_aAddedIds[$oObject->GetKey()] = true;
-		}
-	}
-
-	/**
-	 * Add a hash containig objects into the current set.
-	 * 
-	 * The expected format for the hash is: $aObjectArray[$idx][$sClassAlias] => $oObject
-	 * Limitation:
-	 * The aliases MUST match the ones used in the current set
-	 * Only the ID of the objects associated to the first alias (column) is remembered.. in case we have to rebuild a filter
-	 * 
-	 * @param hash $aObjectArray
-	 */
-	protected function AddObjectExtended($aObjectArray)
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		$iNextPos = count($this->m_aAddedObjects);
-		
-		$sFirstAlias = $this->m_oFilter->GetClassAlias();
-
-		foreach ($aObjectArray as $sClassAlias => $oObject)
-		{
-			$this->m_aAddedObjects[$iNextPos][$sClassAlias] = $oObject;
-			
-			if (!is_null($oObject) && ($sFirstAlias == $sClassAlias))
-			{
-				$this->m_aAddedIds[$oObject->GetKey()] = true;
-			}
-		}
-	}
-
-	/**
-	 * Add an array of objects into the current set
-	 * 
-	 * Limitation:
-	 * Sets with several classes per row are not supported (use AddObjectExtended instead)
-	 * 
-	 * @param array $aObjects The array of objects to add
-	 * @param string $sClassAlias The Alias of the class for the added objects
-	 */
-	public function AddObjectArray($aObjects, $sClassAlias = '')
-	{
-		if (!$this->m_bLoaded) $this->Load();
-
-		// #@# todo - add a check on the object class ?
-		foreach ($aObjects as $oObj)
-		{
-			$this->AddObject($oObj, $sClassAlias);
-		}
-	}
-
-	/**
-	 * Append a given set to the current object. (This method used to be named Merge)
-	 * 
-	 * Limitation:
-	 * The added objects are not checked for duplicates (i.e. one cann add several times the same object, or add an object already present in the set).
-	 * 
-	 * @param DBObjectSet $oObjectSet The set to append
-	 * @throws CoreException
-	 */
-	public function Append(DBObjectSet $oObjectSet)
-	{
-		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
-		{
-			throw new CoreException("Could not merge two objects sets if they don't have the same root class");
-		}
-		if (!$this->m_bLoaded) $this->Load();
-
-		$oObjectSet->Seek(0);
-		while ($oObject = $oObjectSet->Fetch())
-		{
-			$this->AddObject($oObject);
-		}
-	}
-
-	/**
-	 * Create a set containing the objects present in both the current set and another specified set
-	 * 
-	 * Limitations:
-	 * Will NOT work if only a subset of the sets was loaded with SetLimit.
-	 * Works only with sets made of objects loaded from the database since the comparison is based on the objects identifiers
-	 * 
-	 * @param DBObjectSet $oObjectSet The set to intersect with. The current position inside the set will be lost (= at the end)
-	 * @throws CoreException
-	 * @return DBObjectSet A new set of objects, containing the objects present in both sets (based on their identifier)
-	 */
-	public function CreateIntersect(DBObjectSet $oObjectSet)
-	{
-		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
-		{
-			throw new CoreException("Could not 'intersect' two objects sets if they don't have the same root class");
-		}
-		if (!$this->m_bLoaded) $this->Load();
-
-		$aId2Row = array();
-		$iCurrPos = $this->m_iCurrRow; // Save the cursor
-		$idx = 0;
-		while($oObj = $this->Fetch())
-		{
-			$aId2Row[$oObj->GetKey()] = $idx;
-			$idx++;
-		}
-		
-		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
-
-		$oObjectSet->Seek(0);
-		while ($oObject = $oObjectSet->Fetch())
-		{
-			if (array_key_exists($oObject->GetKey(), $aId2Row))
-			{
-				$oNewSet->AddObject($oObject);
-			}
-		}
-		$this->Seek($iCurrPos); // Restore the cursor
-		return $oNewSet;
-	}
-
-	/**
-	 * Compare two sets of objects to determine if their content is identical or not.
-	 * 
-	 * Limitation:
-	 * Works only for sets of 1 column (i.e. one class of object selected)
-	 * 
-	 * @param DBObjectSet $oObjectSet
-	 * @param array $aExcludeColumns The list of columns to exclude frop the comparison
-	 * @return boolean True if the sets are identical, false otherwise
-	 */
-	public function HasSameContents(DBObjectSet $oObjectSet, $aExcludeColumns = array())
-	{	
-		$oComparator = new DBObjectSetComparator($this, $oObjectSet, $aExcludeColumns);
-		return $oComparator->SetsAreEquivalent();
-	}
-
-	/**
-	 * Build a new set (in memory) made of objects of the given set which are NOT present in the current set
-	 * 
-	 * Limitations:
-	 * The objects inside the set must be written in the database since the comparison is based on their identifiers
-	 * Sets with several objects per row are NOT supported
-	 * 
-	 * @param DBObjectSet $oObjectSet
-	 * @throws CoreException
-	 * 
-	 * @return DBObjectSet The "delta" set.
-	 */
-	public function CreateDelta(DBObjectSet $oObjectSet)
-	{
-		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
-		{
-			throw new CoreException("Could not 'delta' two objects sets if they don't have the same root class");
-		}
-		if (!$this->m_bLoaded) $this->Load();
-
-		$aId2Row = array();
-		$iCurrPos = $this->m_iCurrRow; // Save the cursor
-		$idx = 0;
-		while($oObj = $this->Fetch())
-		{
-			$aId2Row[$oObj->GetKey()] = $idx;
-			$idx++;
-		}
-
-		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
-
-		$oObjectSet->Seek(0);
-		while ($oObject = $oObjectSet->Fetch())
-		{
-			if (!array_key_exists($oObject->GetKey(), $aId2Row))
-			{
-				$oNewSet->AddObject($oObject);
-			}
-		}
-		$this->Seek($iCurrPos); // Restore the cursor
-		return $oNewSet;
-	}
-
-	/**
-	 * Will be deprecated soon - use MetaModel::GetRelatedObjectsDown/Up instead to take redundancy into account
-	 */
-	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
-	{
-		$aRelatedObjs = array();
-
-		$aVisited = array(); // optimization for consecutive calls of MetaModel::GetRelatedObjects
-		$this->Seek(0);
-		while ($oObject = $this->Fetch())
-		{
-			$aMore = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
-			foreach ($aMore as $sClass => $aRelated)
-			{
-				foreach ($aRelated as $iObj => $oObj)
-				{
-					if (!isset($aRelatedObjs[$sClass][$iObj]))
-					{
-						$aRelatedObjs[$sClass][$iObj] = $oObj;
-					}
-				}
-			}
-		}
-		return $aRelatedObjs;
-	}
-
-	/**
-	 * Compute the "RelatedObjects" (forward or "down" direction) for the set
-	 * for the specified relation
-	 *
-	 * @param string $sRelCode The code of the relation to use for the computation
-	 * @param int $iMaxDepth Maximum recursion depth
-	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
-	 *
-	 * @return RelationGraph The graph of all the related objects
-	 */
-	public function GetRelatedObjectsDown($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
-	{
-		$oGraph = new RelationGraph();
-		$this->Rewind();
-		while($oObj = $this->Fetch())
-		{
-			$oGraph->AddSourceObject($oObj);
-		}
-		$oGraph->ComputeRelatedObjectsDown($sRelCode, $iMaxDepth, $bEnableRedundancy);
-		return $oGraph;
-	}
-	
-	/**
-	 * Compute the "RelatedObjects" (reverse or "up" direction) for the set
-	 * for the specified relation
-	 *
-	 * @param string $sRelCode The code of the relation to use for the computation
-	 * @param int $iMaxDepth Maximum recursion depth
-	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
-	 *
-	 * @return RelationGraph The graph of all the related objects
-	 */
-	public function GetRelatedObjectsUp($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
-	{
-		$oGraph = new RelationGraph();
-		$this->Rewind();
-		while($oObj = $this->Fetch())
-		{
-			$oGraph->AddSinkObject($oObj);
-		}
-		$oGraph->ComputeRelatedObjectsUp($sRelCode, $iMaxDepth, $bEnableRedundancy);
-		return $oGraph;
-	}
-	
-	/**
-	 * Builds an object that contains the values that are common to all the objects
-	 * in the set. If for a given attribute, objects in the set have various values
-	 * then the resulting object will contain null for this value.
-	 * @param $aValues Hash Output: the distribution of the values, in the set, for each attribute
-	 * @return DBObject The object with the common values
-	 */
-	public function ComputeCommonObject(&$aValues)
-	{
-		$sClass = $this->GetClass();
-		$aList = MetaModel::ListAttributeDefs($sClass);
-		$aValues = array();
-		foreach($aList as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef->IsScalar())
-			{
-				$aValues[$sAttCode] = array();
-			}
-		}
-		$this->Rewind();
-		while($oObj = $this->Fetch())
-		{
-			foreach($aList as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
-				{
-					$currValue = $oObj->Get($sAttCode);
-					if (is_object($currValue)) continue; // Skip non scalar values...
-					if(!array_key_exists($currValue, $aValues[$sAttCode]))
-					{
-						$aValues[$sAttCode][$currValue] = array('count' => 1, 'display' => $oObj->GetAsHTML($sAttCode)); 
-					}
-					else
-					{
-						$aValues[$sAttCode][$currValue]['count']++; 
-					}
-				}
-			}
-		}
-		
-		foreach($aValues as $sAttCode => $aMultiValues)
-		{
-			if (count($aMultiValues) > 1)
-			{
-				uasort($aValues[$sAttCode], 'HashCountComparison');
-			}
-		}
-						
-		
-		// Now create an object that has values for the homogenous values only				
-		$oCommonObj = new $sClass(); // @@ What if the class is abstract ?
-		$aComments = array();
-
-		$iFormId = cmdbAbstractObject::GetNextFormId(); // Identifier that prefixes all the form fields
-		$sReadyScript = '';
-		$aDependsOn = array();
-		$sFormPrefix = '2_';
-		foreach($aList as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
-			{
-				if ($oAttDef->GetEditClass() == 'One Way Password')
-				{
-					$oCommonObj->Set($sAttCode, null);
-				}
-				else
-				{
-					$iCount = count($aValues[$sAttCode]);
-					if ($iCount == 1)
-					{
-						// Homogenous value
-						reset($aValues[$sAttCode]);
-						$aKeys = array_keys($aValues[$sAttCode]);
-						$currValue = $aKeys[0]; // The only value is the first key
-						$oCommonObj->Set($sAttCode, $currValue);
-					}
-					else
-					{
-						// Non-homogenous value
-						$oCommonObj->Set($sAttCode, null);
-					}
-				}
-			}
-		}
-		$this->Rewind();
-		return $oCommonObj;
-	}
-
-	/**
-	 * List the constant fields (and their value) in the given query
-	 * @return Hash [Alias][AttCode] => value
-	 */
-	public function ListConstantFields()
-	{
-		// The complete list of arguments will include magic arguments (e.g. current_user->attcode)
-		$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
-		$aConst = $this->m_oFilter->ListConstantFields();
-				
-		foreach($aConst as $sClassAlias => $aVals)
-		{
-			foreach($aVals as $sCode => $oExpr)
-			{
-				if (is_object($oExpr)) // Array_merge_recursive creates an array when the same key is present multiple times... ignore them
-				{
-					$oScalarExpr = $oExpr->GetAsScalar($aScalarArgs);
-					$aConst[$sClassAlias][$sCode] = $oScalarExpr->GetValue();
-				}
-			}
-		}
-		return $aConst;		
-	}
-	
-	public function ApplyParameters()
-	{
-		$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
-		$this->m_oFilter->ApplyParameters($aAllArgs);
-	}
-}
-
-/**
- * Helper function to perform a custom sort of a hash array
- */
-function HashCountComparison($a, $b) // Sort descending on 'count'
-{
-    if ($a['count'] == $b['count'])
-    {
-        return 0;
-    }
-    return ($a['count'] > $b['count']) ? -1 : 1;
-}
-
-/**
- * Helper class to compare the content of two DBObjectSets based on the fingerprints of the contained objects
- * The FIRST SET MUST BE LOADED FROM THE DATABASE, the second one can be a set of objects in memory
- * When computing the actual differences, the algorithm tries to preserve as much as possible the EXISTING
- * objects (i.e. prefers 'modified' to 'removed' + 'added')
- * 
- * LIMITATIONS:
- *  - only DBObjectSets with one column (i.e. one class of object selected) are supported
- *  - the first set must be the one loaded from the database
- */
-class DBObjectSetComparator
-{
-	protected $aFingerprints1;
-	protected $aFingerprints2;
-	protected $aIDs1;
-	protected $aIDs2;
-	protected $aExcludedColumns;
-
-	/**
-	 * @var iDBObjectSetIterator
-	 */
-	protected $oSet1;
-	/**
-	 * @var iDBObjectSetIterator
-	 */
-	protected $oSet2;
-
-	protected $sAdditionalKeyColumn;
-	protected $aAdditionalKeys;
-	
-	/**
-	 * Initializes the comparator
-	 * @param iDBObjectSetIterator $oSet1 The first set of objects to compare, or null
-	 * @param iDBObjectSetIterator $oSet2 The second set of objects to compare, or null
-	 * @param array $aExcludedColumns The list of columns (= attribute codes) to exclude from the comparison
-	 * @param string $sAdditionalKeyColumn The attribute code of an additional column to be considered as a key indentifying the object (useful for n:n links)
-	 */
-	public function __construct(iDBObjectSetIterator $oSet1, iDBObjectSetIterator $oSet2, $aExcludedColumns = array(), $sAdditionalKeyColumn = null)
-	{
-		$this->aFingerprints1 = null;
-		$this->aFingerprints2 = null;
-		$this->aIDs1 = array();
-		$this->aIDs2 = array();
-		$this->aExcludedColumns = $aExcludedColumns;
-		$this->sAdditionalKeyColumn = $sAdditionalKeyColumn;
-		$this->aAdditionalKeys = null;
-		$this->oSet1 = $oSet1;
-		$this->oSet2 = $oSet2;		
-	}
-	
-	/**
-	 * Builds the lists of fingerprints and initializes internal structures, if it was not already done
-	 */
-	protected function ComputeFingerprints()
-	{
-		if ($this->aFingerprints1 === null)
-		{
-			$this->aFingerprints1 = array();
-			$this->aFingerprints2 = array();
-			$this->aAdditionalKeys = array();
-			
-			if ($this->oSet1 !== null)
-			{
-				$this->oSet1->Rewind();
-				while($oObj = $this->oSet1->Fetch())
-				{
-					$sFingerprint = $oObj->Fingerprint($this->aExcludedColumns);
-					$this->aFingerprints1[$sFingerprint] = $oObj;
-					if (!$oObj->IsNew())
-					{
-						$this->aIDs1[$oObj->GetKey()] = $oObj;
-					}
-				}
-				$this->oSet1->Rewind();
-			}
-				
-			if ($this->oSet2 !== null)
-			{
-				$this->oSet2->Rewind();
-				while($oObj = $this->oSet2->Fetch())
-				{
-					$sFingerprint = $oObj->Fingerprint($this->aExcludedColumns);
-					$this->aFingerprints2[$sFingerprint] = $oObj;
-					if (!$oObj->IsNew())
-					{
-						$this->aIDs2[$oObj->GetKey()] = $oObj;
-					}
-					
-					if ($this->sAdditionalKeyColumn !== null)
-					{
-						$this->aAdditionalKeys[$oObj->Get($this->sAdditionalKeyColumn)] = $oObj;
-					}
-				}
-				$this->oSet2->Rewind();
-			}
-		}
-	}
-	
-	/**
-	 * Tells if the sets are equivalent or not. Returns as soon as the first difference is found.
-	 * @return boolean true if the set have an equivalent content, false otherwise
-	 */
-	public function SetsAreEquivalent()
-	{
-		if (($this->oSet1 === null) && ($this->oSet2 === null))
-		{
-			// Both sets are empty, they are equal
-			return true;
-		}
-		else if (($this->oSet1 === null) || ($this->oSet2 === null))
-		{
-			// one of them is empty, they are different
-			return false;
-		}
-		
-		if (($this->oSet1->GetRootClass() != $this->oSet2->GetRootClass()) || ($this->oSet1->Count() != $this->oSet2->Count())) return false;
-		
-		$this->ComputeFingerprints();
-		
-		// Check that all objects in Set1 are also in Set2
-		foreach($this->aFingerprints1 as $sFingerprint => $oObj)
-		{
-			if (!array_key_exists($sFingerprint, $this->aFingerprints2))
-			{
-				return false;
-			}
-		}
-		
-		// Vice versa
-		// Check that all objects in Set2 are also in Set1
-		foreach($this->aFingerprints2 as $sFingerprint => $oObj)
-		{
-			if (!array_key_exists($sFingerprint, $this->aFingerprints1))
-			{
-				return false;
-			}
-		}
-		
-		return true;
-	}
-	
-	/**
-	 * Get the list of differences between the two sets. In ordeer to write back into the database only the minimum changes
-	 * THE FIRST SET MUST BE THE ONE LOADED FROM THE DATABASE
-	 * Returns a hash: 'added' => DBObject(s), 'removed' => DBObject(s), 'modified' => DBObjects(s)
-	 * @return Ambigous <int:DBObject: , unknown>
-	 */
-	public function GetDifferences()
-	{
-		$aResult = array('added' => array(), 'removed' => array(), 'modified' => array());
-		$this->ComputeFingerprints();
-		
-		// Check that all objects in Set1 are also in Set2
-		foreach($this->aFingerprints1 as $sFingerprint => $oObj)
-		{
-			// Beware: the elements from the first set MUST come from the database, otherwise the result will be irrelevant
-			if ($oObj->IsNew()) throw new Exception('Cannot compute differences when elements from the first set are NOT in the database');
-			if (array_key_exists($oObj->GetKey(), $this->aIDs2) && ($this->aIDs2[$oObj->GetKey()]->IsModified()))
-			{
-				// The very same object exists in both set, but was modified since its load
-				$aResult['modified'][$oObj->GetKey()] = $this->aIDs2[$oObj->GetKey()];
-			}
-			else if (($this->sAdditionalKeyColumn !== null) && array_key_exists($oObj->Get($this->sAdditionalKeyColumn), $this->aAdditionalKeys))
-			{
-				// Special case for n:n links where the link is recreated between the very same 2 objects, but some of its attributes are modified
-				// Let's consider this as a "modification" instead of "deletion" + "creation" in order to have a "clean" history for the objects
-				$oDestObj = $this->aAdditionalKeys[$oObj->Get($this->sAdditionalKeyColumn)];
-				$oCloneObj = $this->CopyFrom($oObj, $oDestObj);
-				$aResult['modified'][$oObj->GetKey()] = $oCloneObj;
-				// Mark this as processed, so that the pass on aFingerprints2 below ignores this object
-				$sNewFingerprint = $oDestObj->Fingerprint($this->aExcludedColumns);
-				$this->aFingerprints2[$sNewFingerprint] = $oCloneObj;
-			}
-			else if (!array_key_exists($sFingerprint, $this->aFingerprints2))
-			{
-				$aResult['removed'][] = $oObj;
-			}
-		}
-		
-		// Vice versa
-		// Check that all objects in Set2 are also in Set1
-		foreach($this->aFingerprints2 as $sFingerprint => $oObj)
-		{
-			if (array_key_exists($oObj->GetKey(), $this->aIDs1) && ($oObj->IsModified()))
-			{
-				// Already marked as modified above
-				//$aResult['modified'][$oObj->GetKey()] = $oObj;
-			}
-			else if (!array_key_exists($sFingerprint, $this->aFingerprints1))
-			{
-				$aResult['added'][] = $oObj;
-			}
-		}
-		return $aResult;
-	}
-	
-	/**
-	 * Helpr to clone (in memory) an object and to apply to it the values taken from a second object
-	 * @param DBObject $oObjToClone
-	 * @param DBObject $oObjWithValues
-	 * @return DBObject The modified clone
-	 */
-	protected function CopyFrom($oObjToClone, $oObjWithValues)
-	{
-		$oObj = MetaModel::GetObject(get_class($oObjToClone), $oObjToClone->GetKey());
-		foreach(MetaModel::ListAttributeDefs(get_class($oObj)) as $sAttCode => $oAttDef)
-		{
-			if (!in_array($sAttCode, $this->aExcludedColumns) && $oAttDef->IsWritable())
-			{
-				$oObj->Set($sAttCode, $oObjWithValues->Get($sAttCode));
-			}
-		}
-		return $oObj;
-	}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+require_once('dbobjectiterator.php');
+
+/**
+ * Object set management
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A set of persistent objects, could be heterogeneous as long as the objects in the set have a common ancestor class 
+ *
+ * @package     iTopORM
+ */
+class DBObjectSet implements iDBObjectSetIterator
+{
+	/**
+	 * @var array
+	 */
+	protected $m_aAddedIds; // Ids of objects added (discrete lists)
+	/**
+	 * @var hash array of (row => array of (classalias) => object/null) storing the objects added "in memory"
+	 */
+	protected $m_aAddedObjects;
+	/**
+	 * @var array
+	 */
+	protected $m_aArgs;
+	/**
+	 * @var array
+	 */
+	protected $m_aAttToLoad;
+	/**
+	 * @var array
+	 */
+	protected $m_aOrderBy;
+	/**
+	 * @var bool True when the filter has been used OR the set is built step by step (AddObject...)
+	 */
+	public $m_bLoaded;
+	/**
+	 * @var int Total number of rows for the query without LIMIT. null if unknown yet
+	 */
+	protected $m_iNumTotalDBRows;
+	/**
+	 * @var int Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
+	 */
+	protected $m_iNumLoadedDBRows;
+	/**
+	 * @var int
+	 */
+	protected $m_iCurrRow;
+	/**
+	 * @var DBSearch
+	 */
+	protected $m_oFilter;
+	/**
+	 * @var mysqli_result
+	 */
+	protected $m_oSQLResult;
+	protected $m_bSort;
+
+	/**
+	 * Create a new set based on a Search definition.
+	 * 
+	 * @param DBSearch $oFilter The search filter defining the objects which are part of the set (multiple columns/objects per row are supported)
+	 * @param array $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 * @param array $aArgs Values to substitute for the search/query parameters (if any). Format: param_name => value
+	 * @param array $aExtendedDataSpec
+	 * @param int $iLimitCount Maximum number of rows to load (i.e. equivalent to MySQL's LIMIT start, count)
+	 * @param int $iLimitStart Index of the first row to load (i.e. equivalent to MySQL's LIMIT start, count)
+	 * @param bool $bSort if false no order by is done
+	 */
+	public function __construct(DBSearch $oFilter, $aOrderBy = array(), $aArgs = array(), $aExtendedDataSpec = null, $iLimitCount = 0, $iLimitStart = 0, $bSort = true)
+	{
+		$this->m_oFilter = $oFilter->DeepClone();
+		$this->m_aAddedIds = array();
+		$this->m_aOrderBy = $aOrderBy;
+		$this->m_aArgs = $aArgs;
+		$this->m_aAttToLoad = null;
+		$this->m_aExtendedDataSpec = $aExtendedDataSpec;
+		$this->m_iLimitCount = $iLimitCount;
+		$this->m_iLimitStart = $iLimitStart;
+		$this->m_bSort = $bSort;
+
+		$this->m_iNumTotalDBRows = null;
+		$this->m_iNumLoadedDBRows = 0;
+		$this->m_bLoaded = false;
+		$this->m_aAddedObjects = array();
+		$this->m_iCurrRow = 0;
+		$this->m_oSQLResult = null;
+	}
+
+	public function __destruct()
+	{
+		if (is_object($this->m_oSQLResult))
+		{
+			$this->m_oSQLResult->free();
+		}
+	}
+
+	public function __toString()
+	{
+		$sRet = '';
+		$this->Rewind();
+		$sRet .= "Set (".$this->m_oFilter->ToOQL().")<br/>\n";
+		$sRet .= "Query: <pre style=\"font-size: smaller; display:inline;\">".$this->m_oFilter->MakeSelectQuery().")</pre>\n";
+		
+		$sRet .= $this->Count()." records<br/>\n";
+		if ($this->Count() > 0)
+		{
+			$sRet .= "<ul class=\"treeview\">\n";
+			while ($oObj = $this->Fetch())
+			{
+				$sRet .= "<li>".$oObj->__toString()."</li>\n";
+			}
+			$sRet .= "</ul>\n";
+		}
+		return $sRet;
+	}
+
+	public function __clone()
+	{
+		$this->m_oFilter = $this->m_oFilter->DeepClone();
+
+		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
+		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
+		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
+		$this->m_iCurrRow = 0;
+		$this->m_oSQLResult = null;
+	}
+
+	/**
+	 * Called when unserializing a DBObjectSet
+	 */
+	public function __wakeup()
+	{
+		$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
+		$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
+		$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
+		$this->m_iCurrRow = 0;
+		$this->m_oSQLResult = null;
+	}
+
+	public function SetShowObsoleteData($bShow)
+	{
+		$this->m_oFilter->SetShowObsoleteData($bShow);
+	}
+
+	public function GetShowObsoleteData()
+	{
+		return $this->m_oFilter->GetShowObsoleteData();
+	}
+
+	/**
+	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
+	 *
+	 * @param array $aAttToLoad Format: alias => array of attribute_codes
+	 * 
+	 * @return void
+	 */
+	public function OptimizeColumnLoad($aAttToLoad)
+	{
+		if (is_null($aAttToLoad))
+		{
+			$this->m_aAttToLoad = null;
+		}
+		else
+		{
+			// Complete the attribute list with the attribute codes
+			$aAttToLoadWithAttDef = array();
+			foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				$aAttToLoadWithAttDef[$sClassAlias] = array();
+				if (array_key_exists($sClassAlias, $aAttToLoad))
+				{
+					$aAttList = $aAttToLoad[$sClassAlias];
+					foreach($aAttList as $sAttToLoad)
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad);
+						$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad] = $oAttDef;
+						if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
+						{
+							// Add the external key friendly name anytime
+							$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_friendlyname');
+							$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_friendlyname'] = $oFriendlyNameAttDef;
+
+							if (MetaModel::IsArchivable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
+							{
+								// Add the archive flag if necessary
+								$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_archive_flag');
+								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_archive_flag'] = $oArchiveFlagAttDef;
+							}
+
+							if (MetaModel::IsObsoletable($oAttDef->GetTargetClass(EXTKEY_ABSOLUTE)))
+							{
+								// Add the obsolescence flag if necessary
+								$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, $sAttToLoad.'_obsolescence_flag');
+								$aAttToLoadWithAttDef[$sClassAlias][$sAttToLoad.'_obsolescence_flag'] = $oObsoleteFlagAttDef;
+							}
+						}
+					}
+				}
+				// Add the friendly name anytime
+				$oFriendlyNameAttDef = MetaModel::GetAttributeDef($sClass, 'friendlyname');
+				$aAttToLoadWithAttDef[$sClassAlias]['friendlyname'] = $oFriendlyNameAttDef;
+
+				if (MetaModel::IsArchivable($sClass))
+				{
+					// Add the archive flag if necessary
+					$oArchiveFlagAttDef = MetaModel::GetAttributeDef($sClass, 'archive_flag');
+					$aAttToLoadWithAttDef[$sClassAlias]['archive_flag'] = $oArchiveFlagAttDef;
+				}
+
+				if (MetaModel::IsObsoletable($sClass))
+				{
+					// Add the obsolescence flag if necessary
+					$oObsoleteFlagAttDef = MetaModel::GetAttributeDef($sClass, 'obsolescence_flag');
+					$aAttToLoadWithAttDef[$sClassAlias]['obsolescence_flag'] = $oObsoleteFlagAttDef;
+				}
+
+				// Make sure that the final class is requested anytime, whatever the specification (needed for object construction!)
+				if (!MetaModel::IsStandaloneClass($sClass) && !array_key_exists('finalclass', $aAttToLoadWithAttDef[$sClassAlias]))
+				{
+					$aAttToLoadWithAttDef[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
+				}
+			}
+
+			$this->m_aAttToLoad = $aAttToLoadWithAttDef;
+		}
+	}
+
+	/**
+	 * Create a set (in-memory) containing just the given object
+	 * 
+	 * @param DBobject $oObject
+	 * 
+	 * @return DBObjectSet The singleton set
+	 */
+	static public function FromObject($oObject)
+	{
+		$oRetSet = self::FromScratch(get_class($oObject));
+		$oRetSet->AddObject($oObject);
+		return $oRetSet;
+	}
+
+	/**
+	 * Create an empty set (in-memory), for the given class (and its subclasses) of objects
+	 * 
+	 * @param string $sClass The class (or an ancestor) for the objects to be added in this set
+	 * 
+	 * @return DBObjectSet The empty set
+	 */
+	static public function FromScratch($sClass)
+	{
+		$oFilter = new DBObjectSearch($sClass);
+		$oFilter->AddConditionExpression(new FalseExpression());
+		$oRetSet = new self($oFilter);
+		$oRetSet->m_bLoaded = true; // no DB load
+		$oRetSet->m_iNumTotalDBRows = 0; // Nothing from the DB
+		return $oRetSet;
+	} 
+
+	/**
+	 * Create a set (in-memory) with just one column (i.e. one object per row) and filled with the given array of objects
+	 * 
+	 * @param string $sClass The class of the objects (must be a common ancestor to all objects in the set)
+	 * @param array $aObjects The list of objects to add into the set
+	 * 
+	 * @return DBObjectSet
+	 */
+	static public function FromArray($sClass, $aObjects)
+	{
+		$oRetSet = self::FromScratch($sClass);
+		$oRetSet->AddObjectArray($aObjects, $sClass);
+		return $oRetSet;
+	} 
+
+	/**
+	 * Create a set in-memory with several classes of objects per row (with one alias per "column")
+	 * 
+	 * Limitation:
+	 * The filter/OQL query representing such a set can not be rebuilt (only the first column will be taken into account)
+	 * 
+	 * @param hash $aClasses Format: array of (alias => class)
+	 * @param hash $aObjects Format: array of (array of (classalias => object))
+	 * 
+	 * @return DBObjectSet
+	 */
+	static public function FromArrayAssoc($aClasses, $aObjects)
+	{
+		// In a perfect world, we should create a complete tree of DBObjectSearch,
+		// but as we lack most of the information related to the objects,
+		// let's create one search definition corresponding only to the first column
+		$sClass = reset($aClasses);
+		$sAlias = key($aClasses);
+		$oFilter = new DBObjectSearch($sClass, $sAlias);
+
+		$oRetSet = new self($oFilter);
+		$oRetSet->m_bLoaded = true; // no DB load
+		$oRetSet->m_iNumTotalDBRows = 0; // Nothing from the DB
+		
+		foreach($aObjects as $rowIndex => $aObjectsByClassAlias)
+		{
+			$oRetSet->AddObjectExtended($aObjectsByClassAlias);
+		}
+		return $oRetSet;
+	} 
+
+	static public function FromLinkSet($oObject, $sLinkSetAttCode, $sExtKeyToRemote)
+	{
+		$oLinkAttCode = MetaModel::GetAttributeDef(get_class($oObject), $sLinkSetAttCode);
+		$oExtKeyAttDef = MetaModel::GetAttributeDef($oLinkAttCode->GetLinkedClass(), $sExtKeyToRemote);
+		$sTargetClass = $oExtKeyAttDef->GetTargetClass();
+
+		$oLinkSet = $oObject->Get($sLinkSetAttCode);
+		$aTargets = array();
+		while ($oLink = $oLinkSet->Fetch())
+		{
+			$aTargets[] = MetaModel::GetObject($sTargetClass, $oLink->Get($sExtKeyToRemote));
+		}
+
+		return self::FromArray($sTargetClass, $aTargets);
+	}
+
+    /**
+     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
+     *
+     * @param bool $bWithId
+     * @return array
+     */
+	public function ToArray($bWithId = true)
+	{
+		$aRet = array();
+		$this->Rewind();
+		while ($oObject = $this->Fetch())
+		{
+			if ($bWithId)
+			{
+				$aRet[$oObject->GetKey()] = $oObject;
+			}
+			else
+			{
+				$aRet[] = $oObject;
+			}
+		}
+		return $aRet;
+	} 
+
+	public function ToArrayOfValues()
+	{
+		if (!$this->m_bLoaded) $this->Load();
+		$this->Rewind();
+
+		$aSelectedClasses = $this->m_oFilter->GetSelectedClasses();
+
+		$aRet = array();
+		$iRow = 0;
+		while($aObjects = $this->FetchAssoc())
+		{
+			foreach($aObjects as $sClassAlias => $oObject)
+			{
+				if (is_null($oObject))
+				{
+					$aRet[$iRow][$sClassAlias.'.'.'id'] = null;
+				}
+				else
+				{
+					$aRet[$iRow][$sClassAlias.'.'.'id'] = $oObject->GetKey();
+				} 
+				if (is_null($oObject))
+				{
+					$sClass = $aSelectedClasses[$sClassAlias];
+				}
+				else
+				{
+					$sClass = get_class($oObject);
+				}
+				foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+				{
+					if ($oAttDef->IsScalar())
+					{
+						$sAttName = $sClassAlias.'.'.$sAttCode;
+						if (is_null($oObject))
+						{
+							$aRet[$iRow][$sAttName] = null;
+						}
+						else
+						{
+							$aRet[$iRow][$sAttName] = $oObject->Get($sAttCode);
+						}
+					}
+				}
+			}
+			$iRow++;
+		}
+		return $aRet;
+	}
+
+    /**
+     * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
+     *
+     * @param string $sAttCode
+     * @param bool $bWithId
+     * @return array
+     */
+	public function GetColumnAsArray($sAttCode, $bWithId = true)
+	{
+		$aRet = array();
+		$this->Rewind();
+		while ($oObject = $this->Fetch())
+		{
+			if ($bWithId)
+			{
+				$aRet[$oObject->GetKey()] = $oObject->Get($sAttCode);
+			}
+			else
+			{
+				$aRet[] = $oObject->Get($sAttCode);
+			}
+		}
+		return $aRet;
+	}
+
+	/**
+	 * Retrieve the DBSearch corresponding to the objects present in this set
+	 * 
+	 * Limitation:
+	 * This method will NOT work for sets with several columns (i.e. several objects per row)
+	 * 
+	 * @return DBObjectSearch
+	 */
+	public function GetFilter()
+	{
+		// Make sure that we carry on the parameters of the set with the filter
+		$oFilter = $this->m_oFilter->DeepClone();
+		$oFilter->SetShowObsoleteData(true);
+		// Note: the arguments found within a set can be object (but not in a filter)
+		// That's why PrepareQueryArguments must be invoked there
+		$oFilter->SetInternalParams(array_merge($oFilter->GetInternalParams(), $this->m_aArgs));
+		
+		if (count($this->m_aAddedIds) == 0)
+		{
+			return $oFilter;
+		}
+		else
+		{
+			$oIdListExpr = ListExpression::FromScalars(array_keys($this->m_aAddedIds));
+			$oIdExpr = new FieldExpression('id', $oFilter->GetClassAlias());
+			$oIdInList = new BinaryExpression($oIdExpr, 'IN', $oIdListExpr);
+			$oFilter->MergeConditionExpression($oIdInList);
+			return $oFilter;
+		}
+	}
+
+	/**
+	 * The (common ancestor) class of the objects in the first column of this set
+	 * 
+	 * @return string The class of the objects in the first column
+	 */
+	public function GetClass()
+	{
+		return $this->m_oFilter->GetClass();
+	}
+
+	/**
+	 * The alias for the class of the objects in the first column of this set
+	 * 
+	 * @return string The alias of the class in the first column
+	 */
+	public function GetClassAlias()
+	{
+		return $this->m_oFilter->GetClassAlias();
+	}
+
+	/**
+	 * The list of all classes (one per column) which are part of this set
+	 * 
+	 * @return hash Format: alias => class
+	 */
+	public function GetSelectedClasses()
+	{
+		return $this->m_oFilter->GetSelectedClasses();
+	}
+
+	/**
+	 * The root class (i.e. highest ancestor in the MeaModel class hierarchy) for the first column on this set
+	 * 
+	 * @return string The root class for the objects in the first column of the set
+	 */
+	public function GetRootClass()
+	{
+		return MetaModel::GetRootClass($this->GetClass());
+	}
+
+	/**
+	 * The arguments used for building this set
+	 * 
+	 * @return hash Format: parameter_name => value
+	 */
+	public function GetArgs()
+	{
+		return $this->m_aArgs;
+	}
+
+	/**
+	 * Sets the limits for loading the rows from the DB. Equivalent to MySQL's LIMIT start,count clause.
+	 * @param int $iLimitCount The number of rows to load
+	 * @param int $iLimitStart The index of the first row to load
+	 */
+	public function SetLimit($iLimitCount, $iLimitStart = 0)
+	{
+		$this->m_iLimitCount = $iLimitCount;
+		$this->m_iLimitStart = $iLimitStart;
+	}
+
+	/**
+	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
+	 *
+	 * @param hash $aOrderBy Format: [alias.]attcode => boolean (true = ascending, false = descending)
+	 */
+	public function SetOrderBy($aOrderBy)
+	{
+		if ($this->m_aOrderBy != $aOrderBy)
+		{
+			$this->m_aOrderBy = $aOrderBy;
+			if ($this->m_bLoaded)
+			{
+				$this->m_bLoaded = false;
+				$this->Load();
+			}
+		}
+	}
+
+	/**
+	 * Sets the sort order for loading the rows from the DB. Changing the order by causes a Reload.
+	 *
+	 * @param hash $aAliases Format: alias => boolean (true = ascending, false = descending). If omitted, then it defaults to all the selected classes
+	 */
+	public function SetOrderByClasses($aAliases = null)
+	{
+		if ($aAliases === null)
+		{
+			$aAliases = array();
+			foreach ($this->GetSelectedClasses() as $sAlias => $sClass)
+			{
+				$aAliases[$sAlias] = true;
+			}
+		}
+
+		$aAttributes = array();
+		foreach ($aAliases as $sAlias => $bClassDirection)
+		{
+			foreach (MetaModel::GetOrderByDefault($this->m_oFilter->GetClassName($sAlias)) as $sAttCode => $bAttributeDirection)
+			{
+				$bDirection = $bClassDirection ? $bAttributeDirection : !$bAttributeDirection;
+				$aAttributes[$sAlias.'.'.$sAttCode] = $bDirection;
+			}
+		}
+		$this->SetOrderBy($aAttributes);
+	}
+
+	/**
+	 * Returns the 'count' limit for loading the rows from the DB
+	 * 
+	 * @return int
+	 */
+	public function GetLimitCount()
+	{
+		return $this->m_iLimitCount;
+	}
+
+	/**
+	 * Returns the 'start' limit for loading the rows from the DB
+	 * 
+	 * @return int
+	 */
+	public function GetLimitStart()
+	{
+		return $this->m_iLimitStart;
+	}
+
+	/**
+	 * Get the sort order used for loading this set from the database
+	 * 
+	 * Limitation: the sort order has no effect on objects added in-memory
+	 * 
+	 * @return array Format: field_code => boolean (true = ascending, false = descending)
+	 */
+	public function GetRealSortOrder()
+	{
+		if (!$this->m_bSort)
+		{
+			// No order by
+			return array();
+		}
+		// Get the class default sort order if not specified with the API
+		//
+		if (empty($this->m_aOrderBy))
+		{
+			return MetaModel::GetOrderByDefault($this->m_oFilter->GetClass());
+		}
+		else
+		{
+			return $this->m_aOrderBy;
+		}
+	}
+
+	/**
+	 * Loads the set from the database. Actually performs the SQL query to retrieve the records from the DB. 
+	 */
+	public function Load()
+	{
+		if ($this->m_bLoaded) return;
+		// Note: it is mandatory to set this value now, to protect against reentrance
+		$this->m_bLoaded = true;
+
+		$sSQL = $this->_makeSelectQuery($this->m_aAttToLoad);
+		
+		if (is_object($this->m_oSQLResult))
+		{
+			// Free previous resultset if any
+			$this->m_oSQLResult->free();
+			$this->m_oSQLResult = null;
+		}
+
+		try
+		{
+			$this->m_oSQLResult = CMDBSource::Query($sSQL);
+		} catch (MySQLException $e)
+		{
+			// 1116 = ER_TOO_MANY_TABLES
+			// https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_too_many_tables
+			if ($e->getCode() != 1116)
+			{
+				throw $e;
+			}
+
+			// N.689 Workaround for the 61 max joins in MySQL : full lazy load !
+			$aAttToLoad = array();
+			foreach($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				$aAttToLoad[$sClassAlias] = array();
+				$bIsAbstractClass = MetaModel::IsAbstract($sClass);
+				$bIsClassWithChildren = MetaModel::HasChildrenClasses($sClass);
+				if ($bIsAbstractClass || $bIsClassWithChildren)
+				{
+					// we need finalClass field at least to be able to instantiate the real corresponding object !
+					$aAttToLoad[$sClassAlias]['finalclass'] = MetaModel::GetAttributeDef($sClass, 'finalclass');
+				}
+			}
+			$sSQL = $this->_makeSelectQuery($aAttToLoad);
+			$this->m_oSQLResult = CMDBSource::Query($sSQL); // may fail again
+		}
+
+		if ($this->m_oSQLResult === false) return;
+
+		if ((($this->m_iLimitCount == 0) || ($this->m_iLimitCount > $this->m_oSQLResult->num_rows)) && ($this->m_iLimitStart == 0))
+		{
+			$this->m_iNumTotalDBRows = $this->m_oSQLResult->num_rows;
+		}
+
+		$this->m_iNumLoadedDBRows = $this->m_oSQLResult->num_rows;
+	}
+
+	/**
+	 * @param string[] $aAttToLoad
+	 *
+	 * @return string SQL query
+	 */
+	private function _makeSelectQuery($aAttToLoad)
+	{
+		if ($this->m_iLimitCount > 0)
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $aAttToLoad,
+				$this->m_aExtendedDataSpec, $this->m_iLimitCount, $this->m_iLimitStart);
+		}
+		else
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery($this->GetRealSortOrder(), $this->m_aArgs, $aAttToLoad,
+				$this->m_aExtendedDataSpec);
+		}
+
+		return $sSQL;
+	}
+
+	/**
+	 * The total number of rows in this set. Independently of the SetLimit used for loading the set and taking into
+	 * account the rows added in-memory.
+	 *
+	 * May actually perform the SQL query SELECT COUNT... if the set was not previously loaded, or loaded with a
+	 * SetLimit
+	 *
+	 * @return int The total number of rows for this set.
+	 */
+	public function Count()
+	{
+		if (is_null($this->m_iNumTotalDBRows))
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, 0, 0, true);
+			$resQuery = CMDBSource::Query($sSQL);
+			if (!$resQuery) return 0;
+
+			$aRow = CMDBSource::FetchArray($resQuery);
+			CMDBSource::FreeResult($resQuery);
+			$this->m_iNumTotalDBRows = intval($aRow['COUNT']);
+		}
+
+		return $this->m_iNumTotalDBRows + count($this->m_aAddedObjects); // Does it fix Trac #887 ??
+	}
+
+	/** Check if the count exceeds a given limit
+	 * @param $iLimit
+	 *
+	 * @return bool
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function CountExceeds($iLimit)
+	{
+		if (is_null($this->m_iNumTotalDBRows))
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
+			$resQuery = CMDBSource::Query($sSQL);
+			if ($resQuery)
+			{
+				$aRow = CMDBSource::FetchArray($resQuery);
+				CMDBSource::FreeResult($resQuery);
+				$iCount = intval($aRow['COUNT']);
+			}
+			else
+			{
+				$iCount = 0;
+			}
+		}
+		else
+		{
+			$iCount = $this->m_iNumTotalDBRows;
+		}
+
+		return ($iCount > $iLimit);
+	}
+
+	/** Count only up to the given limit
+	 * @param $iLimit
+	 *
+	 * @return int
+	 * @throws \CoreException
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \MySQLHasGoneAwayException
+	 */
+	public function CountWithLimit($iLimit)
+	{
+		if (is_null($this->m_iNumTotalDBRows))
+		{
+			$sSQL = $this->m_oFilter->MakeSelectQuery(array(), $this->m_aArgs, null, null, $iLimit + 2, 0, true);
+			$resQuery = CMDBSource::Query($sSQL);
+			if ($resQuery)
+			{
+				$aRow = CMDBSource::FetchArray($resQuery);
+				CMDBSource::FreeResult($resQuery);
+				$iCount = intval($aRow['COUNT']);
+			}
+			else
+			{
+				$iCount = 0;
+			}
+		}
+		else
+		{
+			$iCount = $this->m_iNumTotalDBRows;
+		}
+
+		return $iCount;
+	}
+
+	/**
+	 * Number of rows available in memory (loaded from DB + added in memory)
+	 * 
+	 * @return number The number of rows available for Fetch'ing
+	 */
+	protected function CountLoaded()
+	{
+		return $this->m_iNumLoadedDBRows + count($this->m_aAddedObjects);
+	}
+
+	/**
+	 * Fetch the object (with the given class alias) at the current position in the set and move the cursor to the next position.
+	 * 
+	 * @param string $sRequestedClassAlias The class alias to fetch (if there are several objects/classes per row)
+	 * @return DBObject The fetched object or null when at the end
+	 */
+	public function Fetch($sRequestedClassAlias = '')
+	{
+		if (!$this->m_bLoaded) $this->Load();
+
+		if ($this->m_iCurrRow >= $this->CountLoaded())
+		{
+			return null;
+		}
+	
+		if (strlen($sRequestedClassAlias) == 0)
+		{
+			$sRequestedClassAlias = $this->m_oFilter->GetClassAlias();
+		}
+
+		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
+		{
+			// Pick the row from the database
+			$aRow = CMDBSource::FetchArray($this->m_oSQLResult);
+			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				if ($sRequestedClassAlias == $sClassAlias)
+				{
+					if (is_null($aRow[$sClassAlias.'id']))
+					{
+						$oRetObj = null;
+					}
+					else
+					{
+						$oRetObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
+					}
+					break;
+				}
+			}
+		}
+		else
+		{
+			// Pick the row from the objects added *in memory*
+			$oRetObj = $this->m_aAddedObjects[$this->m_iCurrRow - $this->m_iNumLoadedDBRows][$sRequestedClassAlias];
+		}
+		$this->m_iCurrRow++;
+		return $oRetObj;
+	}
+
+	/**
+	 * Fetch the whole row of objects (if several classes have been specified in the query) and move the cursor to the next position
+	 * 
+	 * @return hash A hash with the format 'classAlias' => $oObj representing the current row of the set. Returns null when at the end.
+	 */
+	public function FetchAssoc()
+	{
+		if (!$this->m_bLoaded) $this->Load();
+
+		if ($this->m_iCurrRow >= $this->CountLoaded())
+		{
+			return null;
+		}
+	
+		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
+		{
+			// Pick the row from the database
+			$aRow = CMDBSource::FetchArray($this->m_oSQLResult);
+			$aRetObjects = array();
+			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				if (is_null($aRow[$sClassAlias.'id']))
+				{
+					$oObj = null;
+				}
+				else
+				{
+					$oObj = MetaModel::GetObjectByRow($sClass, $aRow, $sClassAlias, $this->m_aAttToLoad, $this->m_aExtendedDataSpec);
+				}
+				$aRetObjects[$sClassAlias] = $oObj;
+			}
+		}
+		else
+		{
+			// Pick the row from the objects added *in memory*
+			$aRetObjects = array();
+			foreach ($this->m_oFilter->GetSelectedClasses() as $sClassAlias => $sClass)
+			{
+				$aRetObjects[$sClassAlias] = $this->m_aAddedObjects[$this->m_iCurrRow - $this->m_iNumLoadedDBRows][$sClassAlias];
+			}
+		}
+		$this->m_iCurrRow++;
+		return $aRetObjects;
+	}
+
+	/**
+	 * Position the cursor (for iterating in the set) to the first position (equivalent to Seek(0))
+	 */
+	public function Rewind()
+	{
+		if ($this->m_bLoaded)
+		{
+			$this->Seek(0);
+		}
+	}
+
+	/**
+	 * Position the cursor (for iterating in the set) to the given position
+	 * 
+	 * @param int $iRow
+	 */
+	public function Seek($iRow)
+	{
+		if (!$this->m_bLoaded) $this->Load();
+
+		$this->m_iCurrRow = min($iRow, $this->Count());
+		if ($this->m_iCurrRow < $this->m_iNumLoadedDBRows)
+		{
+			$this->m_oSQLResult->data_seek($this->m_iCurrRow);
+		}
+		return $this->m_iCurrRow;
+	}
+
+	/**
+	 * Add an object to the current set (in-memory only, nothing is written to the database)
+	 * 
+	 * Limitation:
+	 * Sets with several objects per row are NOT supported
+	 * 
+	 * @param DBObject $oObject The object to add
+	 * @param string $sClassAlias The alias for the class of the object
+	 */
+	public function AddObject($oObject, $sClassAlias = '')
+	{
+		if (!$this->m_bLoaded) $this->Load();
+
+		if (strlen($sClassAlias) == 0)
+		{
+			$sClassAlias = $this->m_oFilter->GetClassAlias();
+		}
+
+		$iNextPos = count($this->m_aAddedObjects);
+		$this->m_aAddedObjects[$iNextPos][$sClassAlias] = $oObject;
+		if (!is_null($oObject))
+		{
+			$this->m_aAddedIds[$oObject->GetKey()] = true;
+		}
+	}
+
+	/**
+	 * Add a hash containig objects into the current set.
+	 * 
+	 * The expected format for the hash is: $aObjectArray[$idx][$sClassAlias] => $oObject
+	 * Limitation:
+	 * The aliases MUST match the ones used in the current set
+	 * Only the ID of the objects associated to the first alias (column) is remembered.. in case we have to rebuild a filter
+	 * 
+	 * @param hash $aObjectArray
+	 */
+	protected function AddObjectExtended($aObjectArray)
+	{
+		if (!$this->m_bLoaded) $this->Load();
+
+		$iNextPos = count($this->m_aAddedObjects);
+		
+		$sFirstAlias = $this->m_oFilter->GetClassAlias();
+
+		foreach ($aObjectArray as $sClassAlias => $oObject)
+		{
+			$this->m_aAddedObjects[$iNextPos][$sClassAlias] = $oObject;
+			
+			if (!is_null($oObject) && ($sFirstAlias == $sClassAlias))
+			{
+				$this->m_aAddedIds[$oObject->GetKey()] = true;
+			}
+		}
+	}
+
+	/**
+	 * Add an array of objects into the current set
+	 * 
+	 * Limitation:
+	 * Sets with several classes per row are not supported (use AddObjectExtended instead)
+	 * 
+	 * @param array $aObjects The array of objects to add
+	 * @param string $sClassAlias The Alias of the class for the added objects
+	 */
+	public function AddObjectArray($aObjects, $sClassAlias = '')
+	{
+		if (!$this->m_bLoaded) $this->Load();
+
+		// #@# todo - add a check on the object class ?
+		foreach ($aObjects as $oObj)
+		{
+			$this->AddObject($oObj, $sClassAlias);
+		}
+	}
+
+	/**
+	 * Append a given set to the current object. (This method used to be named Merge)
+	 * 
+	 * Limitation:
+	 * The added objects are not checked for duplicates (i.e. one cann add several times the same object, or add an object already present in the set).
+	 * 
+	 * @param DBObjectSet $oObjectSet The set to append
+	 * @throws CoreException
+	 */
+	public function Append(DBObjectSet $oObjectSet)
+	{
+		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
+		{
+			throw new CoreException("Could not merge two objects sets if they don't have the same root class");
+		}
+		if (!$this->m_bLoaded) $this->Load();
+
+		$oObjectSet->Seek(0);
+		while ($oObject = $oObjectSet->Fetch())
+		{
+			$this->AddObject($oObject);
+		}
+	}
+
+	/**
+	 * Create a set containing the objects present in both the current set and another specified set
+	 * 
+	 * Limitations:
+	 * Will NOT work if only a subset of the sets was loaded with SetLimit.
+	 * Works only with sets made of objects loaded from the database since the comparison is based on the objects identifiers
+	 * 
+	 * @param DBObjectSet $oObjectSet The set to intersect with. The current position inside the set will be lost (= at the end)
+	 * @throws CoreException
+	 * @return DBObjectSet A new set of objects, containing the objects present in both sets (based on their identifier)
+	 */
+	public function CreateIntersect(DBObjectSet $oObjectSet)
+	{
+		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
+		{
+			throw new CoreException("Could not 'intersect' two objects sets if they don't have the same root class");
+		}
+		if (!$this->m_bLoaded) $this->Load();
+
+		$aId2Row = array();
+		$iCurrPos = $this->m_iCurrRow; // Save the cursor
+		$idx = 0;
+		while($oObj = $this->Fetch())
+		{
+			$aId2Row[$oObj->GetKey()] = $idx;
+			$idx++;
+		}
+		
+		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
+
+		$oObjectSet->Seek(0);
+		while ($oObject = $oObjectSet->Fetch())
+		{
+			if (array_key_exists($oObject->GetKey(), $aId2Row))
+			{
+				$oNewSet->AddObject($oObject);
+			}
+		}
+		$this->Seek($iCurrPos); // Restore the cursor
+		return $oNewSet;
+	}
+
+	/**
+	 * Compare two sets of objects to determine if their content is identical or not.
+	 * 
+	 * Limitation:
+	 * Works only for sets of 1 column (i.e. one class of object selected)
+	 * 
+	 * @param DBObjectSet $oObjectSet
+	 * @param array $aExcludeColumns The list of columns to exclude frop the comparison
+	 * @return boolean True if the sets are identical, false otherwise
+	 */
+	public function HasSameContents(DBObjectSet $oObjectSet, $aExcludeColumns = array())
+	{	
+		$oComparator = new DBObjectSetComparator($this, $oObjectSet, $aExcludeColumns);
+		return $oComparator->SetsAreEquivalent();
+	}
+
+	/**
+	 * Build a new set (in memory) made of objects of the given set which are NOT present in the current set
+	 * 
+	 * Limitations:
+	 * The objects inside the set must be written in the database since the comparison is based on their identifiers
+	 * Sets with several objects per row are NOT supported
+	 * 
+	 * @param DBObjectSet $oObjectSet
+	 * @throws CoreException
+	 * 
+	 * @return DBObjectSet The "delta" set.
+	 */
+	public function CreateDelta(DBObjectSet $oObjectSet)
+	{
+		if ($this->GetRootClass() != $oObjectSet->GetRootClass())
+		{
+			throw new CoreException("Could not 'delta' two objects sets if they don't have the same root class");
+		}
+		if (!$this->m_bLoaded) $this->Load();
+
+		$aId2Row = array();
+		$iCurrPos = $this->m_iCurrRow; // Save the cursor
+		$idx = 0;
+		while($oObj = $this->Fetch())
+		{
+			$aId2Row[$oObj->GetKey()] = $idx;
+			$idx++;
+		}
+
+		$oNewSet = DBObjectSet::FromScratch($this->GetClass());
+
+		$oObjectSet->Seek(0);
+		while ($oObject = $oObjectSet->Fetch())
+		{
+			if (!array_key_exists($oObject->GetKey(), $aId2Row))
+			{
+				$oNewSet->AddObject($oObject);
+			}
+		}
+		$this->Seek($iCurrPos); // Restore the cursor
+		return $oNewSet;
+	}
+
+	/**
+	 * Will be deprecated soon - use MetaModel::GetRelatedObjectsDown/Up instead to take redundancy into account
+	 */
+	public function GetRelatedObjects($sRelCode, $iMaxDepth = 99)
+	{
+		$aRelatedObjs = array();
+
+		$aVisited = array(); // optimization for consecutive calls of MetaModel::GetRelatedObjects
+		$this->Seek(0);
+		while ($oObject = $this->Fetch())
+		{
+			$aMore = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
+			foreach ($aMore as $sClass => $aRelated)
+			{
+				foreach ($aRelated as $iObj => $oObj)
+				{
+					if (!isset($aRelatedObjs[$sClass][$iObj]))
+					{
+						$aRelatedObjs[$sClass][$iObj] = $oObj;
+					}
+				}
+			}
+		}
+		return $aRelatedObjs;
+	}
+
+	/**
+	 * Compute the "RelatedObjects" (forward or "down" direction) for the set
+	 * for the specified relation
+	 *
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Maximum recursion depth
+	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
+	 *
+	 * @return RelationGraph The graph of all the related objects
+	 */
+	public function GetRelatedObjectsDown($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
+	{
+		$oGraph = new RelationGraph();
+		$this->Rewind();
+		while($oObj = $this->Fetch())
+		{
+			$oGraph->AddSourceObject($oObj);
+		}
+		$oGraph->ComputeRelatedObjectsDown($sRelCode, $iMaxDepth, $bEnableRedundancy);
+		return $oGraph;
+	}
+	
+	/**
+	 * Compute the "RelatedObjects" (reverse or "up" direction) for the set
+	 * for the specified relation
+	 *
+	 * @param string $sRelCode The code of the relation to use for the computation
+	 * @param int $iMaxDepth Maximum recursion depth
+	 * @param boolean $bEnableReduncancy Whether or not to take into account the redundancy
+	 *
+	 * @return RelationGraph The graph of all the related objects
+	 */
+	public function GetRelatedObjectsUp($sRelCode, $iMaxDepth = 99, $bEnableRedundancy = true)
+	{
+		$oGraph = new RelationGraph();
+		$this->Rewind();
+		while($oObj = $this->Fetch())
+		{
+			$oGraph->AddSinkObject($oObj);
+		}
+		$oGraph->ComputeRelatedObjectsUp($sRelCode, $iMaxDepth, $bEnableRedundancy);
+		return $oGraph;
+	}
+	
+	/**
+	 * Builds an object that contains the values that are common to all the objects
+	 * in the set. If for a given attribute, objects in the set have various values
+	 * then the resulting object will contain null for this value.
+	 * @param $aValues Hash Output: the distribution of the values, in the set, for each attribute
+	 * @return DBObject The object with the common values
+	 */
+	public function ComputeCommonObject(&$aValues)
+	{
+		$sClass = $this->GetClass();
+		$aList = MetaModel::ListAttributeDefs($sClass);
+		$aValues = array();
+		foreach($aList as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef->IsScalar())
+			{
+				$aValues[$sAttCode] = array();
+			}
+		}
+		$this->Rewind();
+		while($oObj = $this->Fetch())
+		{
+			foreach($aList as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
+				{
+					$currValue = $oObj->Get($sAttCode);
+					if (is_object($currValue)) continue; // Skip non scalar values...
+					if(!array_key_exists($currValue, $aValues[$sAttCode]))
+					{
+						$aValues[$sAttCode][$currValue] = array('count' => 1, 'display' => $oObj->GetAsHTML($sAttCode)); 
+					}
+					else
+					{
+						$aValues[$sAttCode][$currValue]['count']++; 
+					}
+				}
+			}
+		}
+		
+		foreach($aValues as $sAttCode => $aMultiValues)
+		{
+			if (count($aMultiValues) > 1)
+			{
+				uasort($aValues[$sAttCode], 'HashCountComparison');
+			}
+		}
+						
+		
+		// Now create an object that has values for the homogenous values only				
+		$oCommonObj = new $sClass(); // @@ What if the class is abstract ?
+		$aComments = array();
+
+		$iFormId = cmdbAbstractObject::GetNextFormId(); // Identifier that prefixes all the form fields
+		$sReadyScript = '';
+		$aDependsOn = array();
+		$sFormPrefix = '2_';
+		foreach($aList as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
+			{
+				if ($oAttDef->GetEditClass() == 'One Way Password')
+				{
+					$oCommonObj->Set($sAttCode, null);
+				}
+				else
+				{
+					$iCount = count($aValues[$sAttCode]);
+					if ($iCount == 1)
+					{
+						// Homogenous value
+						reset($aValues[$sAttCode]);
+						$aKeys = array_keys($aValues[$sAttCode]);
+						$currValue = $aKeys[0]; // The only value is the first key
+						$oCommonObj->Set($sAttCode, $currValue);
+					}
+					else
+					{
+						// Non-homogenous value
+						$oCommonObj->Set($sAttCode, null);
+					}
+				}
+			}
+		}
+		$this->Rewind();
+		return $oCommonObj;
+	}
+
+	/**
+	 * List the constant fields (and their value) in the given query
+	 * @return Hash [Alias][AttCode] => value
+	 */
+	public function ListConstantFields()
+	{
+		// The complete list of arguments will include magic arguments (e.g. current_user->attcode)
+		$aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
+		$aConst = $this->m_oFilter->ListConstantFields();
+				
+		foreach($aConst as $sClassAlias => $aVals)
+		{
+			foreach($aVals as $sCode => $oExpr)
+			{
+				if (is_object($oExpr)) // Array_merge_recursive creates an array when the same key is present multiple times... ignore them
+				{
+					$oScalarExpr = $oExpr->GetAsScalar($aScalarArgs);
+					$aConst[$sClassAlias][$sCode] = $oScalarExpr->GetValue();
+				}
+			}
+		}
+		return $aConst;		
+	}
+	
+	public function ApplyParameters()
+	{
+		$aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs);
+		$this->m_oFilter->ApplyParameters($aAllArgs);
+	}
+}
+
+/**
+ * Helper function to perform a custom sort of a hash array
+ */
+function HashCountComparison($a, $b) // Sort descending on 'count'
+{
+    if ($a['count'] == $b['count'])
+    {
+        return 0;
+    }
+    return ($a['count'] > $b['count']) ? -1 : 1;
+}
+
+/**
+ * Helper class to compare the content of two DBObjectSets based on the fingerprints of the contained objects
+ * The FIRST SET MUST BE LOADED FROM THE DATABASE, the second one can be a set of objects in memory
+ * When computing the actual differences, the algorithm tries to preserve as much as possible the EXISTING
+ * objects (i.e. prefers 'modified' to 'removed' + 'added')
+ * 
+ * LIMITATIONS:
+ *  - only DBObjectSets with one column (i.e. one class of object selected) are supported
+ *  - the first set must be the one loaded from the database
+ */
+class DBObjectSetComparator
+{
+	protected $aFingerprints1;
+	protected $aFingerprints2;
+	protected $aIDs1;
+	protected $aIDs2;
+	protected $aExcludedColumns;
+
+	/**
+	 * @var iDBObjectSetIterator
+	 */
+	protected $oSet1;
+	/**
+	 * @var iDBObjectSetIterator
+	 */
+	protected $oSet2;
+
+	protected $sAdditionalKeyColumn;
+	protected $aAdditionalKeys;
+	
+	/**
+	 * Initializes the comparator
+	 * @param iDBObjectSetIterator $oSet1 The first set of objects to compare, or null
+	 * @param iDBObjectSetIterator $oSet2 The second set of objects to compare, or null
+	 * @param array $aExcludedColumns The list of columns (= attribute codes) to exclude from the comparison
+	 * @param string $sAdditionalKeyColumn The attribute code of an additional column to be considered as a key indentifying the object (useful for n:n links)
+	 */
+	public function __construct(iDBObjectSetIterator $oSet1, iDBObjectSetIterator $oSet2, $aExcludedColumns = array(), $sAdditionalKeyColumn = null)
+	{
+		$this->aFingerprints1 = null;
+		$this->aFingerprints2 = null;
+		$this->aIDs1 = array();
+		$this->aIDs2 = array();
+		$this->aExcludedColumns = $aExcludedColumns;
+		$this->sAdditionalKeyColumn = $sAdditionalKeyColumn;
+		$this->aAdditionalKeys = null;
+		$this->oSet1 = $oSet1;
+		$this->oSet2 = $oSet2;		
+	}
+	
+	/**
+	 * Builds the lists of fingerprints and initializes internal structures, if it was not already done
+	 */
+	protected function ComputeFingerprints()
+	{
+		if ($this->aFingerprints1 === null)
+		{
+			$this->aFingerprints1 = array();
+			$this->aFingerprints2 = array();
+			$this->aAdditionalKeys = array();
+			
+			if ($this->oSet1 !== null)
+			{
+				$this->oSet1->Rewind();
+				while($oObj = $this->oSet1->Fetch())
+				{
+					$sFingerprint = $oObj->Fingerprint($this->aExcludedColumns);
+					$this->aFingerprints1[$sFingerprint] = $oObj;
+					if (!$oObj->IsNew())
+					{
+						$this->aIDs1[$oObj->GetKey()] = $oObj;
+					}
+				}
+				$this->oSet1->Rewind();
+			}
+				
+			if ($this->oSet2 !== null)
+			{
+				$this->oSet2->Rewind();
+				while($oObj = $this->oSet2->Fetch())
+				{
+					$sFingerprint = $oObj->Fingerprint($this->aExcludedColumns);
+					$this->aFingerprints2[$sFingerprint] = $oObj;
+					if (!$oObj->IsNew())
+					{
+						$this->aIDs2[$oObj->GetKey()] = $oObj;
+					}
+					
+					if ($this->sAdditionalKeyColumn !== null)
+					{
+						$this->aAdditionalKeys[$oObj->Get($this->sAdditionalKeyColumn)] = $oObj;
+					}
+				}
+				$this->oSet2->Rewind();
+			}
+		}
+	}
+	
+	/**
+	 * Tells if the sets are equivalent or not. Returns as soon as the first difference is found.
+	 * @return boolean true if the set have an equivalent content, false otherwise
+	 */
+	public function SetsAreEquivalent()
+	{
+		if (($this->oSet1 === null) && ($this->oSet2 === null))
+		{
+			// Both sets are empty, they are equal
+			return true;
+		}
+		else if (($this->oSet1 === null) || ($this->oSet2 === null))
+		{
+			// one of them is empty, they are different
+			return false;
+		}
+		
+		if (($this->oSet1->GetRootClass() != $this->oSet2->GetRootClass()) || ($this->oSet1->Count() != $this->oSet2->Count())) return false;
+		
+		$this->ComputeFingerprints();
+		
+		// Check that all objects in Set1 are also in Set2
+		foreach($this->aFingerprints1 as $sFingerprint => $oObj)
+		{
+			if (!array_key_exists($sFingerprint, $this->aFingerprints2))
+			{
+				return false;
+			}
+		}
+		
+		// Vice versa
+		// Check that all objects in Set2 are also in Set1
+		foreach($this->aFingerprints2 as $sFingerprint => $oObj)
+		{
+			if (!array_key_exists($sFingerprint, $this->aFingerprints1))
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Get the list of differences between the two sets. In ordeer to write back into the database only the minimum changes
+	 * THE FIRST SET MUST BE THE ONE LOADED FROM THE DATABASE
+	 * Returns a hash: 'added' => DBObject(s), 'removed' => DBObject(s), 'modified' => DBObjects(s)
+	 * @return Ambigous <int:DBObject: , unknown>
+	 */
+	public function GetDifferences()
+	{
+		$aResult = array('added' => array(), 'removed' => array(), 'modified' => array());
+		$this->ComputeFingerprints();
+		
+		// Check that all objects in Set1 are also in Set2
+		foreach($this->aFingerprints1 as $sFingerprint => $oObj)
+		{
+			// Beware: the elements from the first set MUST come from the database, otherwise the result will be irrelevant
+			if ($oObj->IsNew()) throw new Exception('Cannot compute differences when elements from the first set are NOT in the database');
+			if (array_key_exists($oObj->GetKey(), $this->aIDs2) && ($this->aIDs2[$oObj->GetKey()]->IsModified()))
+			{
+				// The very same object exists in both set, but was modified since its load
+				$aResult['modified'][$oObj->GetKey()] = $this->aIDs2[$oObj->GetKey()];
+			}
+			else if (($this->sAdditionalKeyColumn !== null) && array_key_exists($oObj->Get($this->sAdditionalKeyColumn), $this->aAdditionalKeys))
+			{
+				// Special case for n:n links where the link is recreated between the very same 2 objects, but some of its attributes are modified
+				// Let's consider this as a "modification" instead of "deletion" + "creation" in order to have a "clean" history for the objects
+				$oDestObj = $this->aAdditionalKeys[$oObj->Get($this->sAdditionalKeyColumn)];
+				$oCloneObj = $this->CopyFrom($oObj, $oDestObj);
+				$aResult['modified'][$oObj->GetKey()] = $oCloneObj;
+				// Mark this as processed, so that the pass on aFingerprints2 below ignores this object
+				$sNewFingerprint = $oDestObj->Fingerprint($this->aExcludedColumns);
+				$this->aFingerprints2[$sNewFingerprint] = $oCloneObj;
+			}
+			else if (!array_key_exists($sFingerprint, $this->aFingerprints2))
+			{
+				$aResult['removed'][] = $oObj;
+			}
+		}
+		
+		// Vice versa
+		// Check that all objects in Set2 are also in Set1
+		foreach($this->aFingerprints2 as $sFingerprint => $oObj)
+		{
+			if (array_key_exists($oObj->GetKey(), $this->aIDs1) && ($oObj->IsModified()))
+			{
+				// Already marked as modified above
+				//$aResult['modified'][$oObj->GetKey()] = $oObj;
+			}
+			else if (!array_key_exists($sFingerprint, $this->aFingerprints1))
+			{
+				$aResult['added'][] = $oObj;
+			}
+		}
+		return $aResult;
+	}
+	
+	/**
+	 * Helpr to clone (in memory) an object and to apply to it the values taken from a second object
+	 * @param DBObject $oObjToClone
+	 * @param DBObject $oObjWithValues
+	 * @return DBObject The modified clone
+	 */
+	protected function CopyFrom($oObjToClone, $oObjWithValues)
+	{
+		$oObj = MetaModel::GetObject(get_class($oObjToClone), $oObjToClone->GetKey());
+		foreach(MetaModel::ListAttributeDefs(get_class($oObj)) as $sAttCode => $oAttDef)
+		{
+			if (!in_array($sAttCode, $this->aExcludedColumns) && $oAttDef->IsWritable())
+			{
+				$oObj->Set($sAttCode, $oObjWithValues->Get($sAttCode));
+			}
+		}
+		return $oObj;
+	}
 }
\ No newline at end of file
diff --git a/core/dbproperty.class.inc.php b/core/dbproperty.class.inc.php
index 6be724cae..3081e34fc 100644
--- a/core/dbproperty.class.inc.php
+++ b/core/dbproperty.class.inc.php
@@ -1,160 +1,160 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Database properties - manage database instances in a complex installation
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A database property 
- *
- * @package     iTopORM
- */
-class DBProperty extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "cloud",
-			"key_type" => "autoincrement",
-			"name_attcode" => "name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_db_properties",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeDateTime("change_date", array("allowed_values"=>null, "sql"=>"change_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("change_comment", array("allowed_values"=>null, "sql"=>"change_comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-	}
-
-	/**
-	 * Helper to check wether the table has been created into the DB 
-	 * (this table did not exist in 1.0.1 and older versions)
-	 */
-	public static function IsInstalled()
-	{
-		$sTable = MetaModel::DBGetTable(__CLASS__);
-		if (CMDBSource::IsTable($sTable))
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-		return false;
-	}
-
-	public static function SetProperty($sName, $sValue, $sComment = '', $sDescription = null)
-	{
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
-			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
-			if ($oSet->Count() == 0)
-			{
-				$oProp = new DBProperty();
-				$oProp->Set('name', $sName);
-				$oProp->Set('description', $sDescription);
-				$oProp->Set('value', $sValue);
-				$oProp->Set('change_date', time());
-				$oProp->Set('change_comment', $sComment);
-				$oProp->DBInsert();
-			}
-			elseif ($oSet->Count() == 1)
-			{
-				$oProp = $oSet->fetch();
-				if (!is_null($sDescription))
-				{
-					$oProp->Set('description', $sDescription);
-				}
-				$oProp->Set('value', $sValue);
-				$oProp->Set('change_date', time());
-				$oProp->Set('change_comment', $sComment);
-				$oProp->DBUpdate();
-			}
-			else
-			{
-				// Houston...
-				throw new CoreException('duplicate db property');
-			}
-		}
-		catch (MySQLException $e)
-		{
-			// This might be because the table could not be found,
-			// let's check it and discard silently if this is really the case
-			if (self::IsInstalled())
-			{
-				throw $e;
-			}
-			IssueLog::Error('Attempting to write a DBProperty while the module has not been installed');
-		}
-	}
-
-	public static function GetProperty($sName, $default = null)
-	{
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
-			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
-			$iCount = $oSet->Count();
-			if ($iCount == 0)
-			{
-				//throw new CoreException('unknown db property', array('name' => $sName));
-				$sValue = $default;
-			}
-			elseif ($iCount == 1)
-			{
-				$oProp = $oSet->fetch();
-				$sValue = $oProp->Get('value');
-			}
-			else
-			{
-				// $iCount > 1
-				// Houston...
-				throw new CoreException('duplicate db property', array('name' => $sName, 'count' => $iCount));
-			}
-		}
-		catch (MySQLException $e)
-		{
-			// This might be because the table could not be found,
-			// let's check it and discard silently if this is really the case
-			if (self::IsInstalled())
-			{
-				throw $e;
-			}
-			$sValue = $default;
-		}
-		return $sValue;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Database properties - manage database instances in a complex installation
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A database property 
+ *
+ * @package     iTopORM
+ */
+class DBProperty extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "cloud",
+			"key_type" => "autoincrement",
+			"name_attcode" => "name",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_db_properties",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("value", array("allowed_values"=>null, "sql"=>"value", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDateTime("change_date", array("allowed_values"=>null, "sql"=>"change_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("change_comment", array("allowed_values"=>null, "sql"=>"change_comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+	}
+
+	/**
+	 * Helper to check wether the table has been created into the DB 
+	 * (this table did not exist in 1.0.1 and older versions)
+	 */
+	public static function IsInstalled()
+	{
+		$sTable = MetaModel::DBGetTable(__CLASS__);
+		if (CMDBSource::IsTable($sTable))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+		return false;
+	}
+
+	public static function SetProperty($sName, $sValue, $sComment = '', $sDescription = null)
+	{
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
+			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
+			if ($oSet->Count() == 0)
+			{
+				$oProp = new DBProperty();
+				$oProp->Set('name', $sName);
+				$oProp->Set('description', $sDescription);
+				$oProp->Set('value', $sValue);
+				$oProp->Set('change_date', time());
+				$oProp->Set('change_comment', $sComment);
+				$oProp->DBInsert();
+			}
+			elseif ($oSet->Count() == 1)
+			{
+				$oProp = $oSet->fetch();
+				if (!is_null($sDescription))
+				{
+					$oProp->Set('description', $sDescription);
+				}
+				$oProp->Set('value', $sValue);
+				$oProp->Set('change_date', time());
+				$oProp->Set('change_comment', $sComment);
+				$oProp->DBUpdate();
+			}
+			else
+			{
+				// Houston...
+				throw new CoreException('duplicate db property');
+			}
+		}
+		catch (MySQLException $e)
+		{
+			// This might be because the table could not be found,
+			// let's check it and discard silently if this is really the case
+			if (self::IsInstalled())
+			{
+				throw $e;
+			}
+			IssueLog::Error('Attempting to write a DBProperty while the module has not been installed');
+		}
+	}
+
+	public static function GetProperty($sName, $default = null)
+	{
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL('SELECT DBProperty WHERE name = :name');
+			$oSet = new DBObjectSet($oSearch, array(), array('name' => $sName));
+			$iCount = $oSet->Count();
+			if ($iCount == 0)
+			{
+				//throw new CoreException('unknown db property', array('name' => $sName));
+				$sValue = $default;
+			}
+			elseif ($iCount == 1)
+			{
+				$oProp = $oSet->fetch();
+				$sValue = $oProp->Get('value');
+			}
+			else
+			{
+				// $iCount > 1
+				// Houston...
+				throw new CoreException('duplicate db property', array('name' => $sName, 'count' => $iCount));
+			}
+		}
+		catch (MySQLException $e)
+		{
+			// This might be because the table could not be found,
+			// let's check it and discard silently if this is really the case
+			if (self::IsInstalled())
+			{
+				throw $e;
+			}
+			$sValue = $default;
+		}
+		return $sValue;
+	}
+}
+
+?>
diff --git a/core/dbunionsearch.class.php b/core/dbunionsearch.class.php
index d0c967671..f45ff7fab 100644
--- a/core/dbunionsearch.class.php
+++ b/core/dbunionsearch.class.php
@@ -1,601 +1,601 @@
-<?php
-// Copyright (C) 2015-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * A union of DBObjectSearches 
- *
- * @copyright   Copyright (C) 2015-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
- 
-class DBUnionSearch extends DBSearch
-{
-	protected $aSearches; // source queries
-	protected $aSelectedClasses; // alias => classes (lowest common ancestors) computed at construction
-
-	public function __construct($aSearches)
-	{
-		if (count ($aSearches) == 0)
-		{
-			throw new CoreException('A DBUnionSearch must be made of at least one search');
-		}
-
-		$this->aSearches = array();
-		foreach ($aSearches as $oSearch)
-		{
-			if ($oSearch instanceof DBUnionSearch)
-			{
-				foreach ($oSearch->aSearches as $oSubSearch)
-				{
-					$this->aSearches[] = $oSubSearch->DeepClone();
-				}
-			}
-			else
-			{
-				$this->aSearches[] = $oSearch->DeepClone();
-			}
-		}
-
-		$this->ComputeSelectedClasses();
-	}
-
-	public function AllowAllData()
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AllowAllData();
-		}
-	}
-	public function IsAllDataAllowed()
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			if ($oSearch->IsAllDataAllowed() === false) return false;
-		}
-		return true;
-	}
-
-	public function SetArchiveMode($bEnable)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->SetArchiveMode($bEnable);
-		}
-		parent::SetArchiveMode($bEnable);
-	}
-
-	public function SetShowObsoleteData($bShow)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->SetShowObsoleteData($bShow);
-		}
-		parent::SetShowObsoleteData($bShow);
-	}
-
-	/**
-	 * Find the lowest common ancestor for each of the selected class
-	 */
-	protected function ComputeSelectedClasses()
-	{
-		// 1 - Collect all the column/classes
-		$aColumnToClasses = array();
-		foreach ($this->aSearches as $iPos => $oSearch)
-		{
-			$aSelected = array_values($oSearch->GetSelectedClasses());
-
-			if ($iPos != 0)
-			{
-				if (count($aSelected) < count($aColumnToClasses))
-				{
-					throw new Exception('Too few selected classes in the subquery #'.($iPos+1));
-				}
-				if (count($aSelected) > count($aColumnToClasses))
-				{
-					throw new Exception('Too many selected classes in the subquery #'.($iPos+1));
-				}
-			}
-
-			foreach ($aSelected as $iColumn => $sClass)
-			{
-				$aColumnToClasses[$iColumn][] = $sClass;
-			}
-		}
-
-		// 2 - Build the index column => alias
-		$oFirstSearch = $this->aSearches[0];
-		$aColumnToAlias = array_keys($oFirstSearch->GetSelectedClasses());
-
-		// 3 - Compute alias => lowest common ancestor
-		$this->aSelectedClasses = array();
-		foreach ($aColumnToClasses as $iColumn => $aClasses)
-		{
-			$sAlias = $aColumnToAlias[$iColumn];
-			$sAncestor = MetaModel::GetLowestCommonAncestor($aClasses);
-			if (is_null($sAncestor))
-			{
-				throw new Exception('Could not find a common ancestor for the column '.($iColumn+1).' (Classes: '.implode(', ', $aClasses).')');
-			}
-			$this->aSelectedClasses[$sAlias] = $sAncestor;
-		}
-	}
-
-	public function GetSearches()
-	{
-		return $this->aSearches;
-	}
-
-	/**
-	 * Limited to the selected classes
-	 */
-	public function GetClassName($sAlias)
-	{
-		if (array_key_exists($sAlias, $this->aSelectedClasses))
-		{
-			return $this->aSelectedClasses[$sAlias];
-		}
-		else
-		{
-			throw new CoreException("Invalid class alias '$sAlias'");
-		}
-	}
-
-	public function GetClass()
-	{
-		return reset($this->aSelectedClasses);
-	}
-
-	public function GetClassAlias()
-	{
-		reset($this->aSelectedClasses);
-		return key($this->aSelectedClasses);
-	}
-
-
-	/**
-	 * Change the class (only subclasses are supported as of now, because the conditions must fit the new class)
-	 * Defaults to the first selected class
-	 * Only the selected classes can be changed
-	 */	 	
-	public function ChangeClass($sNewClass, $sAlias = null)
-	{
-		if (is_null($sAlias))
-		{
-			$sAlias = $this->GetClassAlias();
-		}
-		elseif (!array_key_exists($sAlias, $this->aSelectedClasses))
-		{
-			// discard silently - necessary when recursing (??? copied from DBObjectSearch)
-			return;
-		}
-
-		// 1 - identify the impacted column
-		$iColumn = array_search($sAlias, array_keys($this->aSelectedClasses));
-
-		// 2 - change for each search
-		foreach ($this->aSearches as $oSearch)
-		{
-			$aSearchAliases = array_keys($oSearch->GetSelectedClasses());
-			$sSearchAlias = $aSearchAliases[$iColumn];
-			$oSearch->ChangeClass($sNewClass, $sSearchAlias);
-		}
-
-		// 3 - record the change
-		$this->aSelectedClasses[$sAlias] = $sNewClass;
-	}
-
-	public function GetSelectedClasses()
-	{
-		return $this->aSelectedClasses;
-	}
-
-	/**
-	 * @param array $aSelectedClasses array of aliases
-	 * @throws CoreException
-	 */
-	public function SetSelectedClasses($aSelectedClasses)
-	{
-		// 1 - change for each search
-		foreach ($this->aSearches as $oSearch)
-		{
-			// Throws an exception if not valid
-			$oSearch->SetSelectedClasses($aSelectedClasses);
-		}
-		// 2 - update the lowest common ancestors
-		$this->ComputeSelectedClasses();
-	}
-
-	/**
-	 * Change any alias of the query tree
-	 *
-	 * @param $sOldName
-	 * @param $sNewName
-	 * @return bool True if the alias has been found and changed
-	 */
-	public function RenameAlias($sOldName, $sNewName)
-	{
-		$bRet = false;
-		foreach ($this->aSearches as $oSearch)
-		{
-			$bRet = $oSearch->RenameAlias($sOldName, $sNewName) || $bRet;
-		}
-		return $bRet;
-	}
-
-	public function IsAny()
-	{
-		$bIsAny = true;
-		foreach ($this->aSearches as $oSearch)
-		{
-			if (!$oSearch->IsAny())
-			{
-				$bIsAny = false;
-				break;
-			}
-		}
-		return $bIsAny;
-	}
-
-	public function ResetCondition()
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->ResetCondition();
-		}
-	}
-
-	public function MergeConditionExpression($oExpression)
-	{
-		$aAliases = array_keys($this->aSelectedClasses);
-		foreach ($this->aSearches as $iSearchIndex => $oSearch)
-		{
-			$oClonedExpression = $oExpression->DeepClone();
-			if ($iSearchIndex != 0)
-			{
-				foreach (array_keys($oSearch->GetSelectedClasses()) as $iColumn => $sSearchAlias)
-				{
-					$oClonedExpression->RenameAlias($aAliases[$iColumn], $sSearchAlias);
-				}
-			}
-			$oSearch->MergeConditionExpression($oClonedExpression);
-		}
-	}
-
-	public function AddConditionExpression($oExpression)
-	{
-		$aAliases = array_keys($this->aSelectedClasses);
-		foreach ($this->aSearches as $iSearchIndex => $oSearch)
-		{
-			$oClonedExpression = $oExpression->DeepClone();
-			if ($iSearchIndex != 0)
-			{
-				foreach (array_keys($oSearch->GetSelectedClasses()) as $iColumn => $sSearchAlias)
-				{
-					$oClonedExpression->RenameAlias($aAliases[$iColumn], $sSearchAlias);
-				}
-			}
-			$oSearch->AddConditionExpression($oClonedExpression);
-		}
-	}
-
-  	public function AddNameCondition($sName)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AddNameCondition($sName);
-		}
-	}
-
-	public function AddCondition($sFilterCode, $value, $sOpCode = null)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AddCondition($sFilterCode, $value, $sOpCode);
-		}
-	}
-
-	/**
-	 * Specify a condition on external keys or link sets
-	 * @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
-	 *                 Example: infra_list->ci_id->location_id->country	 
-	 * @param value The value to match (can be an array => IN(val1, val2...)
-	 * @return void
-	 */
-	public function AddConditionAdvanced($sAttSpec, $value)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AddConditionAdvanced($sAttSpec, $value);
-		}
-	}
-
-	public function AddCondition_FullText($sFullText)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AddCondition_FullText($sFullText);
-		}
-	}
-
-	/**
-	 * @param DBObjectSearch $oFilter
-	 * @param $sExtKeyAttCode
-	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
-	 * @throws CoreException
-	 * @throws CoreWarning
-	 */
-	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AddCondition_PointingTo($oFilter, $sExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
-		}
-	}
-
-	/**
-	 * @param DBObjectSearch $oFilter
-	 * @param $sForeignExtKeyAttCode
-	 * @param int $iOperatorCode
-	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
-	 */
-	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->AddCondition_ReferencedBy($oFilter, $sForeignExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
-		}
-	}
-
-	public function Intersect(DBSearch $oFilter)
-	{
-		$aSearches = array();
-		foreach ($this->aSearches as $oSearch)
-		{
-			$aSearches[] = $oSearch->Intersect($oFilter);
-		}
-		return new DBUnionSearch($aSearches);
-	}
-
-	public function SetInternalParams($aParams)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->SetInternalParams($aParams);
-		}
-	}
-
-	public function GetInternalParams()
-	{
-		$aParams = array();
-		foreach ($this->aSearches as $oSearch)
-		{
-			$aParams = array_merge($oSearch->GetInternalParams(), $aParams);
-		}
-		return $aParams;
-	}
-
-	public function GetQueryParams($bExcludeMagicParams = true)
-	{
-		$aParams = array();
-		foreach ($this->aSearches as $oSearch)
-		{
-			$aParams = array_merge($oSearch->GetQueryParams($bExcludeMagicParams), $aParams);
-		}
-		return $aParams;
-	}
-
-	public function ListConstantFields()
-	{
-		// Somewhat complex to implement for unions, for a poor benefit
-		return array();
-	}
-
-	/**
-	 * Turn the parameters (:xxx) into scalar values in order to easily
-	 * serialize a search
-	 */
-	public function ApplyParameters($aArgs)
-	{
-		foreach ($this->aSearches as $oSearch)
-		{
-			$oSearch->ApplyParameters($aArgs);
-		}
-	}
-
-	/**
-	 * Overloads for query building
-	 */ 
-	public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false)
-	{
-		$aSubQueries = array();
-		foreach ($this->aSearches as $oSearch)
-		{
-			$aSubQueries[] = $oSearch->ToOQL($bDevelopParams, $aContextParams, $bWithAllowAllFlag);
-		}
-		$sRet = implode(' UNION ', $aSubQueries);
-		return $sRet;
-	}
-
-	/**
-	 * Returns a new DBUnionSearch object where duplicates queries have been removed based on their OQLs
-	 * 
-	 * @return \DBUnionSearch
-	 */
-	public function RemoveDuplicateQueries()
-	{
-		$aQueries = array();
-		$aSearches = array();
-
-		foreach ($this->GetSearches() as $oTmpSearch)
-		{
-			$sQuery = $oTmpSearch->ToOQL(true);
-			if (!in_array($sQuery, $aQueries))
-			{
-				$aQueries[] = $sQuery;
-				$aSearches[] = $oTmpSearch;
-			}
-		}
-
-		$oNewSearch = new DBUnionSearch($aSearches);
-		
-		return $oNewSearch;
-	}
-
-	////////////////////////////////////////////////////////////////////////////
-	//
-	// Construction of the SQL queries
-	//
-	////////////////////////////////////////////////////////////////////////////
-
-	public function MakeDeleteQuery($aArgs = array())
-	{
-		throw new Exception('MakeDeleteQuery is not implemented for the unions!');
-	}
-
-	public function MakeUpdateQuery($aValues, $aArgs = array())
-	{
-		throw new Exception('MakeUpdateQuery is not implemented for the unions!');
-	}
-
-	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
-	{
-		if (count($this->aSearches) == 1)
-		{
-			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectExpr);
-		}
-
-		$aSQLQueries = array();
-		$aAliases = array_keys($this->aSelectedClasses);
-		$aQueryAttToLoad = null;
-		$aUnionQuerySelectExpr = array();
-		foreach ($this->aSearches as $iSearch => $oSearch)
-		{
-			$aSearchAliases = array_keys($oSearch->GetSelectedClasses());
-
-			// The selected classes from the query build perspective are the lowest common ancestors amongst the various queries
-			// (used when it comes to determine which attributes must be selected)
-			$aSearchSelectedClasses = array();
-			foreach ($aSearchAliases as $iColumn => $sSearchAlias)
-			{
-				$sAlias = $aAliases[$iColumn];
-				$aSearchSelectedClasses[$sSearchAlias] = $this->aSelectedClasses[$sAlias];
-			}
-
-			if ($bGetCount)
-			{
-				// Select only ids for the count to allow optimization of joins
-				foreach($aSearchAliases as $sSearchAlias)
-				{
-					$aQueryAttToLoad[$sSearchAlias] = array();
-				}
-			}
-			else
-			{
-				if (is_null($aAttToLoad))
-				{
-					$aQueryAttToLoad = null;
-				}
-				else
-				{
-					// (Eventually) Transform the aliases
-					$aQueryAttToLoad = array();
-					foreach($aAttToLoad as $sAlias => $aAttributes)
-					{
-						$iColumn = array_search($sAlias, $aAliases);
-						$sQueryAlias = ($iColumn === false) ? $sAlias : $aSearchAliases[$iColumn];
-						$aQueryAttToLoad[$sQueryAlias] = $aAttributes;
-					}
-				}
-			}
-
-			if (is_null($aGroupByExpr))
-			{
-				$aQueryGroupByExpr = null;
-			}
-			else
-			{
-				// Clone (and eventually transform) the group by expressions
-				$aQueryGroupByExpr = array();
-				$aTranslationData = array();
-				$aQueryColumns = array_keys($oSearch->GetSelectedClasses());
-				foreach ($aAliases as $iColumn => $sAlias)
-				{
-					$sQueryAlias = $aQueryColumns[$iColumn];
-					$aTranslationData[$sAlias]['*'] = $sQueryAlias;
-					$aQueryGroupByExpr[$sAlias.'id'] = new FieldExpression('id', $sQueryAlias);
-				}
-				foreach ($aGroupByExpr as $sExpressionAlias => $oExpression)
-				{
-					$aQueryGroupByExpr[$sExpressionAlias] = $oExpression->Translate($aTranslationData, false, false);
-				}
-			}
-
-			if (is_null($aSelectExpr))
-			{
-				$aQuerySelectExpr = null;
-			}
-			else
-			{
-				$aQuerySelectExpr = array();
-				$aTranslationData = array();
-				$aQueryColumns = array_keys($oSearch->GetSelectedClasses());
-				foreach($aAliases as $iColumn => $sAlias)
-				{
-					$sQueryAlias = $aQueryColumns[$iColumn];
-					$aTranslationData[$sAlias]['*'] = $sQueryAlias;
-				}
-				foreach($aSelectExpr as $sExpressionAlias => $oExpression)
-				{
-					$oExpression->Browse(function ($oNode) use (&$aQuerySelectExpr, &$aTranslationData)
-					{
-						if ($oNode instanceof FieldExpression)
-						{
-							$sAlias = $oNode->GetParent()."__".$oNode->GetName();
-							if (!key_exists($sAlias, $aQuerySelectExpr))
-							{
-								$aQuerySelectExpr[$sAlias] = $oNode->Translate($aTranslationData, false, false);
-							}
-							$aTranslationData[$oNode->GetParent()][$oNode->GetName()] = new FieldExpression($sAlias);
-						}
-					});
-					// Only done for the first select as aliases are named after the first query
-					if (!array_key_exists($sExpressionAlias, $aUnionQuerySelectExpr))
-					{
-						$aUnionQuerySelectExpr[$sExpressionAlias] = $oExpression->Translate($aTranslationData, false, false);
-					}
-				}
-			}
-			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr);
-			if (count($aSearchAliases) > 1)
-			{
-				// Necessary to make sure that selected columns will match throughout all the queries
-				// (default order of selected fields depending on the order of JOINS)
-				$oSubQuery->SortSelectedFields();
-			}
-			$aSQLQueries[] = $oSubQuery;
-		}
-
-		$oSQLQuery = new SQLUnionQuery($aSQLQueries, $aGroupByExpr, $aUnionQuerySelectExpr);
-		//MyHelpers::var_dump_html($oSQLQuery, true);
-		//MyHelpers::var_dump_html($oSQLQuery->RenderSelect(), true);
-		if (self::$m_bDebugQuery) $oSQLQuery->DisplayHtml();
-		return $oSQLQuery;
-	}
-}
+<?php
+// Copyright (C) 2015-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * A union of DBObjectSearches 
+ *
+ * @copyright   Copyright (C) 2015-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+ 
+class DBUnionSearch extends DBSearch
+{
+	protected $aSearches; // source queries
+	protected $aSelectedClasses; // alias => classes (lowest common ancestors) computed at construction
+
+	public function __construct($aSearches)
+	{
+		if (count ($aSearches) == 0)
+		{
+			throw new CoreException('A DBUnionSearch must be made of at least one search');
+		}
+
+		$this->aSearches = array();
+		foreach ($aSearches as $oSearch)
+		{
+			if ($oSearch instanceof DBUnionSearch)
+			{
+				foreach ($oSearch->aSearches as $oSubSearch)
+				{
+					$this->aSearches[] = $oSubSearch->DeepClone();
+				}
+			}
+			else
+			{
+				$this->aSearches[] = $oSearch->DeepClone();
+			}
+		}
+
+		$this->ComputeSelectedClasses();
+	}
+
+	public function AllowAllData()
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AllowAllData();
+		}
+	}
+	public function IsAllDataAllowed()
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			if ($oSearch->IsAllDataAllowed() === false) return false;
+		}
+		return true;
+	}
+
+	public function SetArchiveMode($bEnable)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->SetArchiveMode($bEnable);
+		}
+		parent::SetArchiveMode($bEnable);
+	}
+
+	public function SetShowObsoleteData($bShow)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->SetShowObsoleteData($bShow);
+		}
+		parent::SetShowObsoleteData($bShow);
+	}
+
+	/**
+	 * Find the lowest common ancestor for each of the selected class
+	 */
+	protected function ComputeSelectedClasses()
+	{
+		// 1 - Collect all the column/classes
+		$aColumnToClasses = array();
+		foreach ($this->aSearches as $iPos => $oSearch)
+		{
+			$aSelected = array_values($oSearch->GetSelectedClasses());
+
+			if ($iPos != 0)
+			{
+				if (count($aSelected) < count($aColumnToClasses))
+				{
+					throw new Exception('Too few selected classes in the subquery #'.($iPos+1));
+				}
+				if (count($aSelected) > count($aColumnToClasses))
+				{
+					throw new Exception('Too many selected classes in the subquery #'.($iPos+1));
+				}
+			}
+
+			foreach ($aSelected as $iColumn => $sClass)
+			{
+				$aColumnToClasses[$iColumn][] = $sClass;
+			}
+		}
+
+		// 2 - Build the index column => alias
+		$oFirstSearch = $this->aSearches[0];
+		$aColumnToAlias = array_keys($oFirstSearch->GetSelectedClasses());
+
+		// 3 - Compute alias => lowest common ancestor
+		$this->aSelectedClasses = array();
+		foreach ($aColumnToClasses as $iColumn => $aClasses)
+		{
+			$sAlias = $aColumnToAlias[$iColumn];
+			$sAncestor = MetaModel::GetLowestCommonAncestor($aClasses);
+			if (is_null($sAncestor))
+			{
+				throw new Exception('Could not find a common ancestor for the column '.($iColumn+1).' (Classes: '.implode(', ', $aClasses).')');
+			}
+			$this->aSelectedClasses[$sAlias] = $sAncestor;
+		}
+	}
+
+	public function GetSearches()
+	{
+		return $this->aSearches;
+	}
+
+	/**
+	 * Limited to the selected classes
+	 */
+	public function GetClassName($sAlias)
+	{
+		if (array_key_exists($sAlias, $this->aSelectedClasses))
+		{
+			return $this->aSelectedClasses[$sAlias];
+		}
+		else
+		{
+			throw new CoreException("Invalid class alias '$sAlias'");
+		}
+	}
+
+	public function GetClass()
+	{
+		return reset($this->aSelectedClasses);
+	}
+
+	public function GetClassAlias()
+	{
+		reset($this->aSelectedClasses);
+		return key($this->aSelectedClasses);
+	}
+
+
+	/**
+	 * Change the class (only subclasses are supported as of now, because the conditions must fit the new class)
+	 * Defaults to the first selected class
+	 * Only the selected classes can be changed
+	 */	 	
+	public function ChangeClass($sNewClass, $sAlias = null)
+	{
+		if (is_null($sAlias))
+		{
+			$sAlias = $this->GetClassAlias();
+		}
+		elseif (!array_key_exists($sAlias, $this->aSelectedClasses))
+		{
+			// discard silently - necessary when recursing (??? copied from DBObjectSearch)
+			return;
+		}
+
+		// 1 - identify the impacted column
+		$iColumn = array_search($sAlias, array_keys($this->aSelectedClasses));
+
+		// 2 - change for each search
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aSearchAliases = array_keys($oSearch->GetSelectedClasses());
+			$sSearchAlias = $aSearchAliases[$iColumn];
+			$oSearch->ChangeClass($sNewClass, $sSearchAlias);
+		}
+
+		// 3 - record the change
+		$this->aSelectedClasses[$sAlias] = $sNewClass;
+	}
+
+	public function GetSelectedClasses()
+	{
+		return $this->aSelectedClasses;
+	}
+
+	/**
+	 * @param array $aSelectedClasses array of aliases
+	 * @throws CoreException
+	 */
+	public function SetSelectedClasses($aSelectedClasses)
+	{
+		// 1 - change for each search
+		foreach ($this->aSearches as $oSearch)
+		{
+			// Throws an exception if not valid
+			$oSearch->SetSelectedClasses($aSelectedClasses);
+		}
+		// 2 - update the lowest common ancestors
+		$this->ComputeSelectedClasses();
+	}
+
+	/**
+	 * Change any alias of the query tree
+	 *
+	 * @param $sOldName
+	 * @param $sNewName
+	 * @return bool True if the alias has been found and changed
+	 */
+	public function RenameAlias($sOldName, $sNewName)
+	{
+		$bRet = false;
+		foreach ($this->aSearches as $oSearch)
+		{
+			$bRet = $oSearch->RenameAlias($sOldName, $sNewName) || $bRet;
+		}
+		return $bRet;
+	}
+
+	public function IsAny()
+	{
+		$bIsAny = true;
+		foreach ($this->aSearches as $oSearch)
+		{
+			if (!$oSearch->IsAny())
+			{
+				$bIsAny = false;
+				break;
+			}
+		}
+		return $bIsAny;
+	}
+
+	public function ResetCondition()
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->ResetCondition();
+		}
+	}
+
+	public function MergeConditionExpression($oExpression)
+	{
+		$aAliases = array_keys($this->aSelectedClasses);
+		foreach ($this->aSearches as $iSearchIndex => $oSearch)
+		{
+			$oClonedExpression = $oExpression->DeepClone();
+			if ($iSearchIndex != 0)
+			{
+				foreach (array_keys($oSearch->GetSelectedClasses()) as $iColumn => $sSearchAlias)
+				{
+					$oClonedExpression->RenameAlias($aAliases[$iColumn], $sSearchAlias);
+				}
+			}
+			$oSearch->MergeConditionExpression($oClonedExpression);
+		}
+	}
+
+	public function AddConditionExpression($oExpression)
+	{
+		$aAliases = array_keys($this->aSelectedClasses);
+		foreach ($this->aSearches as $iSearchIndex => $oSearch)
+		{
+			$oClonedExpression = $oExpression->DeepClone();
+			if ($iSearchIndex != 0)
+			{
+				foreach (array_keys($oSearch->GetSelectedClasses()) as $iColumn => $sSearchAlias)
+				{
+					$oClonedExpression->RenameAlias($aAliases[$iColumn], $sSearchAlias);
+				}
+			}
+			$oSearch->AddConditionExpression($oClonedExpression);
+		}
+	}
+
+  	public function AddNameCondition($sName)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddNameCondition($sName);
+		}
+	}
+
+	public function AddCondition($sFilterCode, $value, $sOpCode = null)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddCondition($sFilterCode, $value, $sOpCode);
+		}
+	}
+
+	/**
+	 * Specify a condition on external keys or link sets
+	 * @param sAttSpec Can be either an attribute code or extkey->[sAttSpec] or linkset->[sAttSpec] and so on, recursively
+	 *                 Example: infra_list->ci_id->location_id->country	 
+	 * @param value The value to match (can be an array => IN(val1, val2...)
+	 * @return void
+	 */
+	public function AddConditionAdvanced($sAttSpec, $value)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddConditionAdvanced($sAttSpec, $value);
+		}
+	}
+
+	public function AddCondition_FullText($sFullText)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddCondition_FullText($sFullText);
+		}
+	}
+
+	/**
+	 * @param DBObjectSearch $oFilter
+	 * @param $sExtKeyAttCode
+	 * @param int $iOperatorCode
+	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 * @throws CoreException
+	 * @throws CoreWarning
+	 */
+	public function AddCondition_PointingTo(DBObjectSearch $oFilter, $sExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddCondition_PointingTo($oFilter, $sExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
+		}
+	}
+
+	/**
+	 * @param DBObjectSearch $oFilter
+	 * @param $sForeignExtKeyAttCode
+	 * @param int $iOperatorCode
+	 * @param null $aRealiasingMap array of <old-alias> => <new-alias>, for each alias that has changed
+	 */
+	public function AddCondition_ReferencedBy(DBObjectSearch $oFilter, $sForeignExtKeyAttCode, $iOperatorCode = TREE_OPERATOR_EQUALS, &$aRealiasingMap = null)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->AddCondition_ReferencedBy($oFilter, $sForeignExtKeyAttCode, $iOperatorCode, $aRealiasingMap);
+		}
+	}
+
+	public function Intersect(DBSearch $oFilter)
+	{
+		$aSearches = array();
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aSearches[] = $oSearch->Intersect($oFilter);
+		}
+		return new DBUnionSearch($aSearches);
+	}
+
+	public function SetInternalParams($aParams)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->SetInternalParams($aParams);
+		}
+	}
+
+	public function GetInternalParams()
+	{
+		$aParams = array();
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aParams = array_merge($oSearch->GetInternalParams(), $aParams);
+		}
+		return $aParams;
+	}
+
+	public function GetQueryParams($bExcludeMagicParams = true)
+	{
+		$aParams = array();
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aParams = array_merge($oSearch->GetQueryParams($bExcludeMagicParams), $aParams);
+		}
+		return $aParams;
+	}
+
+	public function ListConstantFields()
+	{
+		// Somewhat complex to implement for unions, for a poor benefit
+		return array();
+	}
+
+	/**
+	 * Turn the parameters (:xxx) into scalar values in order to easily
+	 * serialize a search
+	 */
+	public function ApplyParameters($aArgs)
+	{
+		foreach ($this->aSearches as $oSearch)
+		{
+			$oSearch->ApplyParameters($aArgs);
+		}
+	}
+
+	/**
+	 * Overloads for query building
+	 */ 
+	public function ToOQL($bDevelopParams = false, $aContextParams = null, $bWithAllowAllFlag = false)
+	{
+		$aSubQueries = array();
+		foreach ($this->aSearches as $oSearch)
+		{
+			$aSubQueries[] = $oSearch->ToOQL($bDevelopParams, $aContextParams, $bWithAllowAllFlag);
+		}
+		$sRet = implode(' UNION ', $aSubQueries);
+		return $sRet;
+	}
+
+	/**
+	 * Returns a new DBUnionSearch object where duplicates queries have been removed based on their OQLs
+	 * 
+	 * @return \DBUnionSearch
+	 */
+	public function RemoveDuplicateQueries()
+	{
+		$aQueries = array();
+		$aSearches = array();
+
+		foreach ($this->GetSearches() as $oTmpSearch)
+		{
+			$sQuery = $oTmpSearch->ToOQL(true);
+			if (!in_array($sQuery, $aQueries))
+			{
+				$aQueries[] = $sQuery;
+				$aSearches[] = $oTmpSearch;
+			}
+		}
+
+		$oNewSearch = new DBUnionSearch($aSearches);
+		
+		return $oNewSearch;
+	}
+
+	////////////////////////////////////////////////////////////////////////////
+	//
+	// Construction of the SQL queries
+	//
+	////////////////////////////////////////////////////////////////////////////
+
+	public function MakeDeleteQuery($aArgs = array())
+	{
+		throw new Exception('MakeDeleteQuery is not implemented for the unions!');
+	}
+
+	public function MakeUpdateQuery($aValues, $aArgs = array())
+	{
+		throw new Exception('MakeUpdateQuery is not implemented for the unions!');
+	}
+
+	public function GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr = null, $aSelectedClasses = null, $aSelectExpr = null)
+	{
+		if (count($this->aSearches) == 1)
+		{
+			return $this->aSearches[0]->GetSQLQueryStructure($aAttToLoad, $bGetCount, $aGroupByExpr, $aSelectExpr);
+		}
+
+		$aSQLQueries = array();
+		$aAliases = array_keys($this->aSelectedClasses);
+		$aQueryAttToLoad = null;
+		$aUnionQuerySelectExpr = array();
+		foreach ($this->aSearches as $iSearch => $oSearch)
+		{
+			$aSearchAliases = array_keys($oSearch->GetSelectedClasses());
+
+			// The selected classes from the query build perspective are the lowest common ancestors amongst the various queries
+			// (used when it comes to determine which attributes must be selected)
+			$aSearchSelectedClasses = array();
+			foreach ($aSearchAliases as $iColumn => $sSearchAlias)
+			{
+				$sAlias = $aAliases[$iColumn];
+				$aSearchSelectedClasses[$sSearchAlias] = $this->aSelectedClasses[$sAlias];
+			}
+
+			if ($bGetCount)
+			{
+				// Select only ids for the count to allow optimization of joins
+				foreach($aSearchAliases as $sSearchAlias)
+				{
+					$aQueryAttToLoad[$sSearchAlias] = array();
+				}
+			}
+			else
+			{
+				if (is_null($aAttToLoad))
+				{
+					$aQueryAttToLoad = null;
+				}
+				else
+				{
+					// (Eventually) Transform the aliases
+					$aQueryAttToLoad = array();
+					foreach($aAttToLoad as $sAlias => $aAttributes)
+					{
+						$iColumn = array_search($sAlias, $aAliases);
+						$sQueryAlias = ($iColumn === false) ? $sAlias : $aSearchAliases[$iColumn];
+						$aQueryAttToLoad[$sQueryAlias] = $aAttributes;
+					}
+				}
+			}
+
+			if (is_null($aGroupByExpr))
+			{
+				$aQueryGroupByExpr = null;
+			}
+			else
+			{
+				// Clone (and eventually transform) the group by expressions
+				$aQueryGroupByExpr = array();
+				$aTranslationData = array();
+				$aQueryColumns = array_keys($oSearch->GetSelectedClasses());
+				foreach ($aAliases as $iColumn => $sAlias)
+				{
+					$sQueryAlias = $aQueryColumns[$iColumn];
+					$aTranslationData[$sAlias]['*'] = $sQueryAlias;
+					$aQueryGroupByExpr[$sAlias.'id'] = new FieldExpression('id', $sQueryAlias);
+				}
+				foreach ($aGroupByExpr as $sExpressionAlias => $oExpression)
+				{
+					$aQueryGroupByExpr[$sExpressionAlias] = $oExpression->Translate($aTranslationData, false, false);
+				}
+			}
+
+			if (is_null($aSelectExpr))
+			{
+				$aQuerySelectExpr = null;
+			}
+			else
+			{
+				$aQuerySelectExpr = array();
+				$aTranslationData = array();
+				$aQueryColumns = array_keys($oSearch->GetSelectedClasses());
+				foreach($aAliases as $iColumn => $sAlias)
+				{
+					$sQueryAlias = $aQueryColumns[$iColumn];
+					$aTranslationData[$sAlias]['*'] = $sQueryAlias;
+				}
+				foreach($aSelectExpr as $sExpressionAlias => $oExpression)
+				{
+					$oExpression->Browse(function ($oNode) use (&$aQuerySelectExpr, &$aTranslationData)
+					{
+						if ($oNode instanceof FieldExpression)
+						{
+							$sAlias = $oNode->GetParent()."__".$oNode->GetName();
+							if (!key_exists($sAlias, $aQuerySelectExpr))
+							{
+								$aQuerySelectExpr[$sAlias] = $oNode->Translate($aTranslationData, false, false);
+							}
+							$aTranslationData[$oNode->GetParent()][$oNode->GetName()] = new FieldExpression($sAlias);
+						}
+					});
+					// Only done for the first select as aliases are named after the first query
+					if (!array_key_exists($sExpressionAlias, $aUnionQuerySelectExpr))
+					{
+						$aUnionQuerySelectExpr[$sExpressionAlias] = $oExpression->Translate($aTranslationData, false, false);
+					}
+				}
+			}
+			$oSubQuery = $oSearch->GetSQLQueryStructure($aQueryAttToLoad, false, $aQueryGroupByExpr, $aSearchSelectedClasses, $aQuerySelectExpr);
+			if (count($aSearchAliases) > 1)
+			{
+				// Necessary to make sure that selected columns will match throughout all the queries
+				// (default order of selected fields depending on the order of JOINS)
+				$oSubQuery->SortSelectedFields();
+			}
+			$aSQLQueries[] = $oSubQuery;
+		}
+
+		$oSQLQuery = new SQLUnionQuery($aSQLQueries, $aGroupByExpr, $aUnionQuerySelectExpr);
+		//MyHelpers::var_dump_html($oSQLQuery, true);
+		//MyHelpers::var_dump_html($oSQLQuery->RenderSelect(), true);
+		if (self::$m_bDebugQuery) $oSQLQuery->DisplayHtml();
+		return $oSQLQuery;
+	}
+}
diff --git a/core/deletionplan.class.inc.php b/core/deletionplan.class.inc.php
index 3f0d5d68d..447b458f1 100644
--- a/core/deletionplan.class.inc.php
+++ b/core/deletionplan.class.inc.php
@@ -1,298 +1,298 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Algorithm to delete object(s) and maintain data integrity
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class DeleteException extends CoreException
-{
-}
-
-/**
- * Deletion plan (other objects to be deleted/modified, eventual issues, etc.) 
- *
- * @package     iTopORM
- */
-class DeletionPlan
-{
-	//protected $m_aIssues;
-
-	protected $m_bFoundStopper;
-	protected $m_bFoundSecurityIssue;
-	protected $m_bFoundManualDelete;
-	protected $m_bFoundManualOperation;
-
-	protected $m_iToDelete;
-	protected $m_iToUpdate;
-
-  	protected $m_aToDelete;
-  	protected $m_aToUpdate;
-
-	protected static $m_aModeUpdate = array(
-		DEL_SILENT => array(
-			DEL_SILENT => DEL_SILENT,
-			DEL_AUTO => DEL_AUTO,
-			DEL_MANUAL => DEL_MANUAL
-		),
-		DEL_MANUAL => array(
-			DEL_SILENT => DEL_MANUAL,
-			DEL_AUTO => DEL_AUTO,
-			DEL_MANUAL => DEL_MANUAL
-		),
-		DEL_AUTO => array(
-			DEL_SILENT => DEL_AUTO,
-			DEL_AUTO => DEL_AUTO,
-			DEL_MANUAL => DEL_AUTO
-		)
-	);
-
-	public function __construct()
-	{
-		$this->m_iToDelete = 0;
-		$this->m_iToUpdate = 0;
-
-		$this->m_aToDelete = array();
-		$this->m_aToUpdate = array();
-
-		$this->m_bFoundStopper = false;
-		$this->m_bFoundSecurityIssue = false;
-		$this->m_bFoundManualDelete = false;
-		$this->m_bFoundManualOperation = false;
-	}
-
-	public function ComputeResults()
-	{
-		$this->m_iToDelete = 0;
-		$this->m_iToUpdate = 0;
-
-		foreach($this->m_aToDelete as $sClass => $aToDelete)
-		{
-			foreach($aToDelete as $iId => $aData)
-			{
-				$this->m_iToDelete++;
-				if (isset($aData['issue']))
-				{
-					$this->m_bFoundStopper = true;
-					$this->m_bFoundManualOperation = true;
-					if (isset($aData['issue_security']))
-					{
-						$this->m_bFoundSecurityIssue = true;
-					}
-				}
-				if ($aData['mode'] == DEL_MANUAL)
-				{
-					$this->m_aToDelete[$sClass][$iId]['issue'] = $sClass.'::'.$iId.' '.Dict::S('UI:Delete:MustBeDeletedManually');
-					$this->m_bFoundStopper = true;
-					$this->m_bFoundManualDelete = true;
-				}
-			}
-		}
-
-		// Getting and setting time limit are not symetric:
-		// www.php.net/manual/fr/function.set-time-limit.php#72305
-		$iPreviousTimeLimit = ini_get('max_execution_time');
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		foreach($this->m_aToUpdate as $sClass => $aToUpdate)
-		{
-			foreach($aToUpdate as $iId => $aData)
-			{
-				set_time_limit($iLoopTimeLimit);
-				$this->m_iToUpdate++;
-
-				$oObject = $aData['to_reset'];
-				$aExtKeyLabels = array();
-				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
-				{
-					$oObject->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
-					$aExtKeyLabels[] = $aRemoteAttDef->GetLabel();
-				}
-				$this->m_aToUpdate[$sClass][$iId]['attributes_list'] = implode(', ', $aExtKeyLabels); 
-
-				list($bRes, $aIssues, $bSecurityIssues) = $oObject->CheckToWrite();
-				if (!$bRes)
-				{
-					$this->m_aToUpdate[$sClass][$iId]['issue'] = implode(', ', $aIssues);
-					$this->m_bFoundStopper = true;
-
-					if ($bSecurityIssues)
-					{
-						$this->m_aToUpdate[$sClass][$iId]['issue_security'] = true;
-						$this->m_bFoundSecurityIssue = true;
-					}
-				}
-			}
-		}
-		set_time_limit($iPreviousTimeLimit);
-	}
-
-	public function GetIssues()
-	{
-		$aIssues = array();
-		foreach ($this->m_aToDelete as $sClass => $aToDelete)
-		{
-			foreach ($aToDelete as $iId => $aData)
-			{
-				if (isset($aData['issue']))
-				{
-					$aIssues[] = $aData['issue'];
-				}
-			}
-		}
-		foreach ($this->m_aToUpdate as $sClass => $aToUpdate)
-		{
-			foreach ($aToUpdate as $iId => $aData)
-			{
-				if (isset($aData['issue']))
-				{
-					$aIssues[] = $aData['issue'];
-				}
-			}
-		}
-		return $aIssues;
-	}
-
-	public function ListDeletes()
-	{
-		return $this->m_aToDelete;
-	}
-
-	public function ListUpdates()
-	{
-		return $this->m_aToUpdate;
-	}
-
-	public function GetTargetCount()
-	{
-		return $this->m_iToDelete + $this->m_iToUpdate;
-	}
-
-	public function FoundStopper()
-	{
-		return $this->m_bFoundStopper;
-	}
-
-	public function FoundSecurityIssue()
-	{
-		return $this->m_bFoundSecurityIssue;
-	}
-
-	public function FoundManualOperation()
-	{
-		return $this->m_bFoundManualOperation;
-	}
-
-	public function FoundManualDelete()
-	{
-		return $this->m_bFoundManualDelete;
-	}
-
-	public function FoundManualUpdate()
-	{
-	}
-
-	public function AddToDelete($oObject, $iDeletionMode = null)
-	{
-		if (is_null($iDeletionMode))
-		{
-			$bRequestedExplicitely = true;
-			$iDeletionMode = DEL_AUTO;
-		}
-		else
-		{
-			$bRequestedExplicitely = false;
-		}
-
-		$sClass = get_class($oObject);
-		$iId = $oObject->GetKey();
-
-		if (isset($this->m_aToUpdate[$sClass][$iId]))
-		{
-			unset($this->m_aToUpdate[$sClass][$iId]);
-		}
-
-		if (isset($this->m_aToDelete[$sClass][$iId]))
-		{
-			if ($this->m_aToDelete[$sClass][$iId]['requested_explicitely'])
-			{
-				// No change: let it in mode DEL_AUTO
-			}
-			else
-			{
-				$iPrevDeletionMode = $this->m_aToDelete[$sClass][$iId]['mode'];
-				$iNewDeletionMode = self::$m_aModeUpdate[$iPrevDeletionMode][$iDeletionMode];
-				$this->m_aToDelete[$sClass][$iId]['mode'] = $iNewDeletionMode;
-	
-				if ($bRequestedExplicitely)
-				{
-					// This object was in the root list
-					$this->m_aToDelete[$sClass][$iId]['requested_explicitely'] = true;
-					$this->m_aToDelete[$sClass][$iId]['mode'] = DEL_AUTO;
-				}
-			}
-		}
-		else
-		{
-			$this->m_aToDelete[$sClass][$iId] = array(
-				'to_delete' => $oObject,
-				'mode' => $iDeletionMode,
-				'requested_explicitely' => $bRequestedExplicitely,
-			);
-		}
-	}
-
-	public function SetDeletionIssues($oObject, $aIssues, $bSecurityIssue)
-	{
-		if (count($aIssues) > 0)
-		{
-			$sClass = get_class($oObject);
-			$iId = $oObject->GetKey();
-			$this->m_aToDelete[$sClass][$iId]['issue'] = implode(', ', $aIssues);
-			if ($bSecurityIssue)
-			{
-				$this->m_aToDelete[$sClass][$iId]['issue_security'] = true;
-			}
-		}
-	}
-
-	public function AddToUpdate($oObject, $oAttDef, $value = 0)
-	{
-		$sClass = get_class($oObject);
-		$iId = $oObject->GetKey();
-		if (isset($this->m_aToDelete[$sClass][$iId]))
-		{
-			// skip... it should be deleted anyhow !
-		}
-		else
-		{
-			if (!isset($this->m_aToUpdate[$sClass][$iId]))
-			{
-				$this->m_aToUpdate[$sClass][$iId] = array(
-					'to_reset' => $oObject,
-				);
-			}
-			$this->m_aToUpdate[$sClass][$iId]['attributes'][$oAttDef->GetCode()] = $oAttDef;
-			$this->m_aToUpdate[$sClass][$iId]['values'][$oAttDef->GetCode()] = $value;
-		}
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Algorithm to delete object(s) and maintain data integrity
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class DeleteException extends CoreException
+{
+}
+
+/**
+ * Deletion plan (other objects to be deleted/modified, eventual issues, etc.) 
+ *
+ * @package     iTopORM
+ */
+class DeletionPlan
+{
+	//protected $m_aIssues;
+
+	protected $m_bFoundStopper;
+	protected $m_bFoundSecurityIssue;
+	protected $m_bFoundManualDelete;
+	protected $m_bFoundManualOperation;
+
+	protected $m_iToDelete;
+	protected $m_iToUpdate;
+
+  	protected $m_aToDelete;
+  	protected $m_aToUpdate;
+
+	protected static $m_aModeUpdate = array(
+		DEL_SILENT => array(
+			DEL_SILENT => DEL_SILENT,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_MANUAL
+		),
+		DEL_MANUAL => array(
+			DEL_SILENT => DEL_MANUAL,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_MANUAL
+		),
+		DEL_AUTO => array(
+			DEL_SILENT => DEL_AUTO,
+			DEL_AUTO => DEL_AUTO,
+			DEL_MANUAL => DEL_AUTO
+		)
+	);
+
+	public function __construct()
+	{
+		$this->m_iToDelete = 0;
+		$this->m_iToUpdate = 0;
+
+		$this->m_aToDelete = array();
+		$this->m_aToUpdate = array();
+
+		$this->m_bFoundStopper = false;
+		$this->m_bFoundSecurityIssue = false;
+		$this->m_bFoundManualDelete = false;
+		$this->m_bFoundManualOperation = false;
+	}
+
+	public function ComputeResults()
+	{
+		$this->m_iToDelete = 0;
+		$this->m_iToUpdate = 0;
+
+		foreach($this->m_aToDelete as $sClass => $aToDelete)
+		{
+			foreach($aToDelete as $iId => $aData)
+			{
+				$this->m_iToDelete++;
+				if (isset($aData['issue']))
+				{
+					$this->m_bFoundStopper = true;
+					$this->m_bFoundManualOperation = true;
+					if (isset($aData['issue_security']))
+					{
+						$this->m_bFoundSecurityIssue = true;
+					}
+				}
+				if ($aData['mode'] == DEL_MANUAL)
+				{
+					$this->m_aToDelete[$sClass][$iId]['issue'] = $sClass.'::'.$iId.' '.Dict::S('UI:Delete:MustBeDeletedManually');
+					$this->m_bFoundStopper = true;
+					$this->m_bFoundManualDelete = true;
+				}
+			}
+		}
+
+		// Getting and setting time limit are not symetric:
+		// www.php.net/manual/fr/function.set-time-limit.php#72305
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		foreach($this->m_aToUpdate as $sClass => $aToUpdate)
+		{
+			foreach($aToUpdate as $iId => $aData)
+			{
+				set_time_limit($iLoopTimeLimit);
+				$this->m_iToUpdate++;
+
+				$oObject = $aData['to_reset'];
+				$aExtKeyLabels = array();
+				foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
+				{
+					$oObject->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
+					$aExtKeyLabels[] = $aRemoteAttDef->GetLabel();
+				}
+				$this->m_aToUpdate[$sClass][$iId]['attributes_list'] = implode(', ', $aExtKeyLabels); 
+
+				list($bRes, $aIssues, $bSecurityIssues) = $oObject->CheckToWrite();
+				if (!$bRes)
+				{
+					$this->m_aToUpdate[$sClass][$iId]['issue'] = implode(', ', $aIssues);
+					$this->m_bFoundStopper = true;
+
+					if ($bSecurityIssues)
+					{
+						$this->m_aToUpdate[$sClass][$iId]['issue_security'] = true;
+						$this->m_bFoundSecurityIssue = true;
+					}
+				}
+			}
+		}
+		set_time_limit($iPreviousTimeLimit);
+	}
+
+	public function GetIssues()
+	{
+		$aIssues = array();
+		foreach ($this->m_aToDelete as $sClass => $aToDelete)
+		{
+			foreach ($aToDelete as $iId => $aData)
+			{
+				if (isset($aData['issue']))
+				{
+					$aIssues[] = $aData['issue'];
+				}
+			}
+		}
+		foreach ($this->m_aToUpdate as $sClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $iId => $aData)
+			{
+				if (isset($aData['issue']))
+				{
+					$aIssues[] = $aData['issue'];
+				}
+			}
+		}
+		return $aIssues;
+	}
+
+	public function ListDeletes()
+	{
+		return $this->m_aToDelete;
+	}
+
+	public function ListUpdates()
+	{
+		return $this->m_aToUpdate;
+	}
+
+	public function GetTargetCount()
+	{
+		return $this->m_iToDelete + $this->m_iToUpdate;
+	}
+
+	public function FoundStopper()
+	{
+		return $this->m_bFoundStopper;
+	}
+
+	public function FoundSecurityIssue()
+	{
+		return $this->m_bFoundSecurityIssue;
+	}
+
+	public function FoundManualOperation()
+	{
+		return $this->m_bFoundManualOperation;
+	}
+
+	public function FoundManualDelete()
+	{
+		return $this->m_bFoundManualDelete;
+	}
+
+	public function FoundManualUpdate()
+	{
+	}
+
+	public function AddToDelete($oObject, $iDeletionMode = null)
+	{
+		if (is_null($iDeletionMode))
+		{
+			$bRequestedExplicitely = true;
+			$iDeletionMode = DEL_AUTO;
+		}
+		else
+		{
+			$bRequestedExplicitely = false;
+		}
+
+		$sClass = get_class($oObject);
+		$iId = $oObject->GetKey();
+
+		if (isset($this->m_aToUpdate[$sClass][$iId]))
+		{
+			unset($this->m_aToUpdate[$sClass][$iId]);
+		}
+
+		if (isset($this->m_aToDelete[$sClass][$iId]))
+		{
+			if ($this->m_aToDelete[$sClass][$iId]['requested_explicitely'])
+			{
+				// No change: let it in mode DEL_AUTO
+			}
+			else
+			{
+				$iPrevDeletionMode = $this->m_aToDelete[$sClass][$iId]['mode'];
+				$iNewDeletionMode = self::$m_aModeUpdate[$iPrevDeletionMode][$iDeletionMode];
+				$this->m_aToDelete[$sClass][$iId]['mode'] = $iNewDeletionMode;
+	
+				if ($bRequestedExplicitely)
+				{
+					// This object was in the root list
+					$this->m_aToDelete[$sClass][$iId]['requested_explicitely'] = true;
+					$this->m_aToDelete[$sClass][$iId]['mode'] = DEL_AUTO;
+				}
+			}
+		}
+		else
+		{
+			$this->m_aToDelete[$sClass][$iId] = array(
+				'to_delete' => $oObject,
+				'mode' => $iDeletionMode,
+				'requested_explicitely' => $bRequestedExplicitely,
+			);
+		}
+	}
+
+	public function SetDeletionIssues($oObject, $aIssues, $bSecurityIssue)
+	{
+		if (count($aIssues) > 0)
+		{
+			$sClass = get_class($oObject);
+			$iId = $oObject->GetKey();
+			$this->m_aToDelete[$sClass][$iId]['issue'] = implode(', ', $aIssues);
+			if ($bSecurityIssue)
+			{
+				$this->m_aToDelete[$sClass][$iId]['issue_security'] = true;
+			}
+		}
+	}
+
+	public function AddToUpdate($oObject, $oAttDef, $value = 0)
+	{
+		$sClass = get_class($oObject);
+		$iId = $oObject->GetKey();
+		if (isset($this->m_aToDelete[$sClass][$iId]))
+		{
+			// skip... it should be deleted anyhow !
+		}
+		else
+		{
+			if (!isset($this->m_aToUpdate[$sClass][$iId]))
+			{
+				$this->m_aToUpdate[$sClass][$iId] = array(
+					'to_reset' => $oObject,
+				);
+			}
+			$this->m_aToUpdate[$sClass][$iId]['attributes'][$oAttDef->GetCode()] = $oAttDef;
+			$this->m_aToUpdate[$sClass][$iId]['values'][$oAttDef->GetCode()] = $value;
+		}
+	}
+}
+?>
diff --git a/core/designdocument.class.inc.php b/core/designdocument.class.inc.php
index 2be363414..03ec5d5f1 100644
--- a/core/designdocument.class.inc.php
+++ b/core/designdocument.class.inc.php
@@ -1,282 +1,282 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with iTop. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-/**
- * Design document and associated nodes
- * @package Core
- */
-
-namespace Combodo\iTop;
-
-use \DOMDocument;
-use \DOMFormatException;
-
-/**
- * Class \Combodo\iTop\DesignDocument
- *
- * A design document is the DOM tree that modelize behaviors. One of its
- * characteristics is that it can be altered by the mean of the same kind of document.
- *
- */
-class DesignDocument extends DOMDocument
-{
-	/**
-	 * @throws \Exception
-	 */
-	public function __construct()
-	{
-		parent::__construct('1.0', 'UTF-8');
-		$this->Init();
-	}
-
-	/**
-	 * Overloadable. Called prior to data loading.
-	 */
-	protected function Init()
-	{
-		$this->registerNodeClass('DOMElement', '\Combodo\iTop\DesignElement');
-
-		$this->formatOutput = true; // indent (must be loaded with option LIBXML_NOBLANKS)
-		$this->preserveWhiteSpace = true; // otherwise the formatOutput option would have no effect
-	}
-
-	/**
-	 * Overload of the standard API
-	 *
-	 * @param $filename
-	 * @param int $options
-	 */
-	public function load($filename, $options = 0)
-	{
-		parent::load($filename, LIBXML_NOBLANKS);
-	}
-
-	/**
-	 * Overload of the standard API
-	 *
-	 * @param $filename
-	 * @param int $options
-	 *
-	 * @return int
-	 */
-	public function save($filename, $options = 0)
-	{
-		$this->documentElement->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
-		return parent::save($filename, LIBXML_NOBLANKS);
-	}
-
-	/**
-	 * Create an HTML representation of the DOM, for debugging purposes
-	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
-	 * @return mixed void or the HTML representation of the DOM
-	 */
-	public function Dump($bReturnRes = false)
-	{
-		$sXml = $this->saveXML();
-		if ($bReturnRes)
-		{
-			return $sXml;
-		}
-
-		echo "<pre>\n";
-		echo htmlentities($sXml);
-		echo "</pre>\n";
-
-		return '';
-	}
-
-	/**
-	 * Quote and escape strings for use within an XPath expression
-	 * Usage: DesignDocument::GetNodes('class[@id='.DesignDocument::XPathQuote($sId).']');
-	 * @param string $sValue The value to be quoted
-	 * @return string to be used within an XPath
-	 */
-	public static function XPathQuote($sValue)
-	{
-		if (strpos($sValue, '"') !== false)
-		{
-			$aParts = explode('"', $sValue);
-			$sRet = 'concat("'.implode('", \'"\', "', $aParts).'")';
-		}
-		else
-		{
-			$sRet = '"'.$sValue.'"';
-		}
-		return $sRet;
-	}
-
-	/**
-	 * Extracts some nodes from the DOM
-	 * @param string $sXPath A XPath expression
-	 * @param DesignElement $oContextNode The node to start the search from
-	 * @return \DOMNodeList
-	 */
-	public function GetNodes($sXPath, $oContextNode = null)
-	{
-		$oXPath = new \DOMXPath($this);
-		if (is_null($oContextNode))
-		{
-			$oResult = $oXPath->query($sXPath);
-		}
-		else
-		{
-			$oResult = $oXPath->query($sXPath, $oContextNode);
-		}
-		return $oResult;
-	}
-
-	/**
-	 * An alternative to getNodePath, that gives the id of nodes instead of the position within the children
-	 * @param DesignElement $oNode The node to describe
-	 * @return string
-	 */
-	public static function GetItopNodePath($oNode)
-	{
-		if ($oNode instanceof \DOMDocument) return '';
-		if (is_null($oNode)) return '';
-
-		$sId = $oNode->getAttribute('id');
-		$sNodeDesc = ($sId != '') ? $oNode->nodeName.'['.$sId.']' : $oNode->nodeName;
-		return self::GetItopNodePath($oNode->parentNode).'/'.$sNodeDesc;
-	}
-}
-
-/**
- * DesignElement: helper to read/change the DOM
- * @package ModelFactory
- */
-class DesignElement extends \DOMElement
-{
-	/**
-	 * Extracts some nodes from the DOM
-	 * @param string $sXPath A XPath expression
-	 * @return \DOMNodeList
-	 */
-	public function GetNodes($sXPath)
-	{
-		return $this->ownerDocument->GetNodes($sXPath, $this);
-	}
-
-	/**
-	 * Create an HTML representation of the DOM, for debugging purposes
-	 *
-	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
-	 *
-	 * @return mixed void or the HTML representation of the DOM
-	 * @throws \Exception
-	 */
-	public function Dump($bReturnRes = false)
-	{
-		$oDoc = new DesignDocument();
-		$oClone = $oDoc->importNode($this->cloneNode(true), true);
-		$oDoc->appendChild($oClone);
-
-		$sXml = $oDoc->saveXML($oClone);
-		if ($bReturnRes)
-		{
-			return $sXml;
-		}
-		echo "<pre>\n";
-		echo htmlentities($sXml);
-		echo "</pre>\n";
-		return '';
-	}
-	/**
-	 * Returns the node directly under the given node
-	 * @param $sTagName
-	 * @param bool|true $bMustExist
-	 * @return \MFElement
-	 * @throws DOMFormatException
-	 */
-	public function GetUniqueElement($sTagName, $bMustExist = true)
-	{
-		$oNode = null;
-		foreach($this->childNodes as $oChildNode)
-		{
-			if ($oChildNode->nodeName == $sTagName)
-			{
-				$oNode = $oChildNode;
-				break;
-			}
-		}
-		if ($bMustExist && is_null($oNode))
-		{
-			throw new DOMFormatException('Missing unique tag: '.$sTagName);
-		}
-		return $oNode;
-	}
-
-	/**
-	 * Returns the node directly under the current node, or null if missing
-	 * @param $sTagName
-	 * @return \MFElement
-	 * @throws DOMFormatException
-	 */
-	public function GetOptionalElement($sTagName)
-	{
-		return $this->GetUniqueElement($sTagName, false);
-	}
-
-	/**
-	 * Returns the TEXT of the current node (possibly from several child nodes)
-	 * @param null $sDefault
-	 * @return null|string
-	 */
-	public function GetText($sDefault = null)
-	{
-		$sText = null;
-		foreach($this->childNodes as $oChildNode)
-		{
-			if ($oChildNode instanceof \DOMText)
-			{
-				if (is_null($sText)) $sText = '';
-				$sText .= $oChildNode->wholeText;
-			}
-		}
-		if (is_null($sText))
-		{
-			return $sDefault;
-		}
-		else
-		{
-			return $sText;
-		}
-	}
-
-	/**
-	 * Get the TEXT value from a child node
-	 *
-	 * @param string $sTagName
-	 * @param string|null $sDefault
-	 *
-	 * @return string
-	 * @throws \DOMFormatException
-	 */
-	public function GetChildText($sTagName, $sDefault = null)
-	{
-		$sRet = $sDefault;
-		if ($oChild = $this->GetOptionalElement($sTagName))
-		{
-			$sRet = $oChild->GetText($sDefault);
-		}
-		return $sRet;
-	}
-}
+<?php
+/**
+ * Copyright (c) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/**
+ * Design document and associated nodes
+ * @package Core
+ */
+
+namespace Combodo\iTop;
+
+use \DOMDocument;
+use \DOMFormatException;
+
+/**
+ * Class \Combodo\iTop\DesignDocument
+ *
+ * A design document is the DOM tree that modelize behaviors. One of its
+ * characteristics is that it can be altered by the mean of the same kind of document.
+ *
+ */
+class DesignDocument extends DOMDocument
+{
+	/**
+	 * @throws \Exception
+	 */
+	public function __construct()
+	{
+		parent::__construct('1.0', 'UTF-8');
+		$this->Init();
+	}
+
+	/**
+	 * Overloadable. Called prior to data loading.
+	 */
+	protected function Init()
+	{
+		$this->registerNodeClass('DOMElement', '\Combodo\iTop\DesignElement');
+
+		$this->formatOutput = true; // indent (must be loaded with option LIBXML_NOBLANKS)
+		$this->preserveWhiteSpace = true; // otherwise the formatOutput option would have no effect
+	}
+
+	/**
+	 * Overload of the standard API
+	 *
+	 * @param $filename
+	 * @param int $options
+	 */
+	public function load($filename, $options = 0)
+	{
+		parent::load($filename, LIBXML_NOBLANKS);
+	}
+
+	/**
+	 * Overload of the standard API
+	 *
+	 * @param $filename
+	 * @param int $options
+	 *
+	 * @return int
+	 */
+	public function save($filename, $options = 0)
+	{
+		$this->documentElement->setAttribute('xmlns:xsi', "http://www.w3.org/2001/XMLSchema-instance");
+		return parent::save($filename, LIBXML_NOBLANKS);
+	}
+
+	/**
+	 * Create an HTML representation of the DOM, for debugging purposes
+	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
+	 * @return mixed void or the HTML representation of the DOM
+	 */
+	public function Dump($bReturnRes = false)
+	{
+		$sXml = $this->saveXML();
+		if ($bReturnRes)
+		{
+			return $sXml;
+		}
+
+		echo "<pre>\n";
+		echo htmlentities($sXml);
+		echo "</pre>\n";
+
+		return '';
+	}
+
+	/**
+	 * Quote and escape strings for use within an XPath expression
+	 * Usage: DesignDocument::GetNodes('class[@id='.DesignDocument::XPathQuote($sId).']');
+	 * @param string $sValue The value to be quoted
+	 * @return string to be used within an XPath
+	 */
+	public static function XPathQuote($sValue)
+	{
+		if (strpos($sValue, '"') !== false)
+		{
+			$aParts = explode('"', $sValue);
+			$sRet = 'concat("'.implode('", \'"\', "', $aParts).'")';
+		}
+		else
+		{
+			$sRet = '"'.$sValue.'"';
+		}
+		return $sRet;
+	}
+
+	/**
+	 * Extracts some nodes from the DOM
+	 * @param string $sXPath A XPath expression
+	 * @param DesignElement $oContextNode The node to start the search from
+	 * @return \DOMNodeList
+	 */
+	public function GetNodes($sXPath, $oContextNode = null)
+	{
+		$oXPath = new \DOMXPath($this);
+		if (is_null($oContextNode))
+		{
+			$oResult = $oXPath->query($sXPath);
+		}
+		else
+		{
+			$oResult = $oXPath->query($sXPath, $oContextNode);
+		}
+		return $oResult;
+	}
+
+	/**
+	 * An alternative to getNodePath, that gives the id of nodes instead of the position within the children
+	 * @param DesignElement $oNode The node to describe
+	 * @return string
+	 */
+	public static function GetItopNodePath($oNode)
+	{
+		if ($oNode instanceof \DOMDocument) return '';
+		if (is_null($oNode)) return '';
+
+		$sId = $oNode->getAttribute('id');
+		$sNodeDesc = ($sId != '') ? $oNode->nodeName.'['.$sId.']' : $oNode->nodeName;
+		return self::GetItopNodePath($oNode->parentNode).'/'.$sNodeDesc;
+	}
+}
+
+/**
+ * DesignElement: helper to read/change the DOM
+ * @package ModelFactory
+ */
+class DesignElement extends \DOMElement
+{
+	/**
+	 * Extracts some nodes from the DOM
+	 * @param string $sXPath A XPath expression
+	 * @return \DOMNodeList
+	 */
+	public function GetNodes($sXPath)
+	{
+		return $this->ownerDocument->GetNodes($sXPath, $this);
+	}
+
+	/**
+	 * Create an HTML representation of the DOM, for debugging purposes
+	 *
+	 * @param bool|false $bReturnRes Echoes or returns the HTML representation
+	 *
+	 * @return mixed void or the HTML representation of the DOM
+	 * @throws \Exception
+	 */
+	public function Dump($bReturnRes = false)
+	{
+		$oDoc = new DesignDocument();
+		$oClone = $oDoc->importNode($this->cloneNode(true), true);
+		$oDoc->appendChild($oClone);
+
+		$sXml = $oDoc->saveXML($oClone);
+		if ($bReturnRes)
+		{
+			return $sXml;
+		}
+		echo "<pre>\n";
+		echo htmlentities($sXml);
+		echo "</pre>\n";
+		return '';
+	}
+	/**
+	 * Returns the node directly under the given node
+	 * @param $sTagName
+	 * @param bool|true $bMustExist
+	 * @return \MFElement
+	 * @throws DOMFormatException
+	 */
+	public function GetUniqueElement($sTagName, $bMustExist = true)
+	{
+		$oNode = null;
+		foreach($this->childNodes as $oChildNode)
+		{
+			if ($oChildNode->nodeName == $sTagName)
+			{
+				$oNode = $oChildNode;
+				break;
+			}
+		}
+		if ($bMustExist && is_null($oNode))
+		{
+			throw new DOMFormatException('Missing unique tag: '.$sTagName);
+		}
+		return $oNode;
+	}
+
+	/**
+	 * Returns the node directly under the current node, or null if missing
+	 * @param $sTagName
+	 * @return \MFElement
+	 * @throws DOMFormatException
+	 */
+	public function GetOptionalElement($sTagName)
+	{
+		return $this->GetUniqueElement($sTagName, false);
+	}
+
+	/**
+	 * Returns the TEXT of the current node (possibly from several child nodes)
+	 * @param null $sDefault
+	 * @return null|string
+	 */
+	public function GetText($sDefault = null)
+	{
+		$sText = null;
+		foreach($this->childNodes as $oChildNode)
+		{
+			if ($oChildNode instanceof \DOMText)
+			{
+				if (is_null($sText)) $sText = '';
+				$sText .= $oChildNode->wholeText;
+			}
+		}
+		if (is_null($sText))
+		{
+			return $sDefault;
+		}
+		else
+		{
+			return $sText;
+		}
+	}
+
+	/**
+	 * Get the TEXT value from a child node
+	 *
+	 * @param string $sTagName
+	 * @param string|null $sDefault
+	 *
+	 * @return string
+	 * @throws \DOMFormatException
+	 */
+	public function GetChildText($sTagName, $sDefault = null)
+	{
+		$sRet = $sDefault;
+		if ($oChild = $this->GetOptionalElement($sTagName))
+		{
+			$sRet = $oChild->GetText($sDefault);
+		}
+		return $sRet;
+	}
+}
diff --git a/core/email.class.inc.php b/core/email.class.inc.php
index 9bc500385..3f6616f71 100644
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -1,540 +1,540 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Send an email (abstraction for synchronous/asynchronous modes)
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/lib/swiftmailer/lib/swift_required.php');
-
-Swift_Preferences::getInstance()->setCharset('UTF-8');
-
-
-define ('EMAIL_SEND_OK', 0);
-define ('EMAIL_SEND_PENDING', 1);
-define ('EMAIL_SEND_ERROR', 2);
-
-class EMail
-{
-	// Serialization formats
-	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
-							   // Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
-	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
-	
-	protected static $m_oConfig = null;
-	protected $m_aData; // For storing data to serialize
-
-	public function LoadConfig($sConfigFile = ITOP_DEFAULT_CONFIG_FILE)
-	{
-		if (is_null(self::$m_oConfig))
-		{
-			self::$m_oConfig = new Config($sConfigFile);
-		}
-	}
-
-	protected $m_oMessage;
-
-	public function __construct()
-	{
-		$this->m_aData = array();
-		$this->m_oMessage = Swift_Message::newInstance();
-		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
-	}
-
-	/**
-	 * Custom serialization method
-	 * No longer use the brute force "serialize" method since
-	 * 1) It does not work with binary attachments (since they cannot be stored in a UTF-8 text field)
-	 * 2) The size tends to be quite big (sometimes ten times the size of the email)
-	 */
-	public function SerializeV2()
-	{
-		return serialize($this->m_aData);
-	}
-	
-	/**
-	 * Custom de-serialization method
-	 * @param string $sSerializedMessage The serialized representation of the message
-	 */
-	static public function UnSerializeV2($sSerializedMessage)
-	{
-		$aData = unserialize($sSerializedMessage);
-		$oMessage = new Email();
-		
-		if (array_key_exists('body', $aData))
-		{
-			$oMessage->SetBody($aData['body']['body'], $aData['body']['mimeType']);
-		}
-		if (array_key_exists('message_id', $aData))
-		{
-			$oMessage->SetMessageId($aData['message_id']);
-		}
-		if (array_key_exists('bcc', $aData))
-		{
-			$oMessage->SetRecipientBCC($aData['bcc']);
-		}
-		if (array_key_exists('cc', $aData))
-		{
-			$oMessage->SetRecipientCC($aData['cc']);
-		}
-		if (array_key_exists('from', $aData))
-		{
-			$oMessage->SetRecipientFrom($aData['from']['address'], $aData['from']['label']);
-		}
-		if (array_key_exists('reply_to', $aData))
-		{
-			$oMessage->SetRecipientReplyTo($aData['reply_to']);
-		}
-		if (array_key_exists('to', $aData))
-		{
-			$oMessage->SetRecipientTO($aData['to']);
-		}
-		if (array_key_exists('subject', $aData))
-		{
-			$oMessage->SetSubject($aData['subject']);
-		}
-		
-		
-		if (array_key_exists('headers', $aData))
-		{
-			foreach($aData['headers'] as $sKey => $sValue)
-			{
-				$oMessage->AddToHeader($sKey, $sValue);
-			}
-		}
-		if (array_key_exists('parts', $aData))
-		{
-			foreach($aData['parts'] as $aPart)
-			{
-				$oMessage->AddPart($aPart['text'], $aPart['mimeType']);
-			}
-		}
-		if (array_key_exists('attachments', $aData))
-		{
-			foreach($aData['attachments'] as $aAttachment)
-			{
-				$oMessage->AddAttachment(base64_decode($aAttachment['data']), $aAttachment['filename'], $aAttachment['mimeType']);
-			}
-		}
-		return $oMessage;
-	}
-	
-  	protected function SendAsynchronous(&$aIssues, $oLog = null)
-	{
-		try
-		{
-			AsyncSendEmail::AddToQueue($this, $oLog);
-		}
-		catch(Exception $e)
-		{
-			$aIssues = array($e->GetMessage());
-			return EMAIL_SEND_ERROR;
-		}
-		$aIssues = array();
-		return EMAIL_SEND_PENDING;
-	}
-
-	protected function SendSynchronous(&$aIssues, $oLog = null)
-	{
-		// If the body of the message is in HTML, embed all images based on attachments
-		$this->EmbedInlineImages();
-		
-		$this->LoadConfig();
-
-		$sTransport = self::$m_oConfig->Get('email_transport');
-		switch ($sTransport)
-		{
-		case 'SMTP':
-			$sHost = self::$m_oConfig->Get('email_transport_smtp.host');
-			$sPort = self::$m_oConfig->Get('email_transport_smtp.port');
-			$sEncryption = self::$m_oConfig->Get('email_transport_smtp.encryption');
-			$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
-			$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
-
-			$oTransport = Swift_SmtpTransport::newInstance($sHost, $sPort, $sEncryption);
-			if (strlen($sUserName) > 0)
-			{
-				$oTransport->setUsername($sUserName);
-				$oTransport->setPassword($sPassword);
-			}
-			break;
-
-		case 'Null':
-			$oTransport = Swift_NullTransport::newInstance();
-			break;
-		
-		case 'LogFile':
-			$oTransport = Swift_LogFileTransport::newInstance();
-			$oTransport->setLogFile(APPROOT.'log/mail.log');
-			break;
-			
-		case 'PHPMail':
-		default:
-			$oTransport = Swift_MailTransport::newInstance();
-		}
-
-		$oMailer = Swift_Mailer::newInstance($oTransport);
-
-		$aFailedRecipients = array();
-		$this->m_oMessage->setMaxLineLength(0);
-		$oKPI = new ExecutionKPI();
-		try
-		{
-			$iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients);
-			if ($iSent === 0)
-			{
-				// Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!!
-				IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients));
-				$aIssues = array('Some recipients were invalid.');
-				$oKPI->ComputeStats('Email Sent', 'Error received');
-				return EMAIL_SEND_ERROR;
-			}
-			else
-			{
-				$aIssues = array();
-				$oKPI->ComputeStats('Email Sent', 'Succeded');
-				return EMAIL_SEND_OK;
-			}
-		}
-		catch (Exception $e)
-		{
-			$oKPI->ComputeStats('Email Sent', 'Error received');
-			throw $e;
-		}
-	}
-	
-	/**
-	 * Reprocess the body of the message (if it is an HTML message)
-	 * to replace the URL of images based on attachments by a link
-	 * to an embedded image (i.e. cid:....)
-	 */
-	protected function EmbedInlineImages()
-	{
-		if ($this->m_aData['body']['mimeType'] == 'text/html')
-		{
-			$oDOMDoc = new DOMDocument();
-			$oDOMDoc->preserveWhitespace = true;
-			@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$this->m_aData['body']['body']); // For loading HTML chunks where the character set is not specified
-			
-			$oXPath = new DOMXPath($oDOMDoc);
-			$sXPath = "//img[@data-img-id]";
-			$oImagesList = $oXPath->query($sXPath);
-			
-			if ($oImagesList->length != 0)
-			{
-				foreach($oImagesList as $oImg)
-				{
-					$iAttId = $oImg->getAttribute('data-img-id');
-					$oAttachment = MetaModel::GetObject('InlineImage', $iAttId, false, true /* Allow All Data */);
-					if ($oAttachment)
-					{
-						$oDoc = $oAttachment->Get('contents');
-						$oSwiftImage = new Swift_Image($oDoc->GetData(), $oDoc->GetFileName(), $oDoc->GetMimeType());
-						$sCid = $this->m_oMessage->embed($oSwiftImage);
-						$oImg->setAttribute('src', $sCid);
-					}
-				}
-			}
-			$sHtmlBody = $oDOMDoc->saveHTML();
-			$this->m_oMessage->setBody($sHtmlBody, 'text/html', 'UTF-8');
-		}
-	}
-
-	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
-	{
-		//select a default sender if none is provided.
-		if(empty($this->m_aData['from']['address']) && !empty($this->m_aData['to'])){
-			$this->SetRecipientFrom($this->m_aData['to']);
-		}
-
-		if ($bForceSynchronous)
-		{
-			return $this->SendSynchronous($aIssues, $oLog);
-		}
-		else
-		{
-			$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
-			if ($bConfigASYNC)
-			{
-				return $this->SendAsynchronous($aIssues, $oLog);
-			}
-			else
-			{
-				return $this->SendSynchronous($aIssues, $oLog);
-			}
-		}
-	}
-
-	public function AddToHeader($sKey, $sValue)
-	{
-		if (!array_key_exists('headers', $this->m_aData))
-		{
-			$this->m_aData['headers'] = array();
-		}
-		$this->m_aData['headers'][$sKey] = $sValue;
-		
-		if (strlen($sValue) > 0)
-		{
-			$oHeaders = $this->m_oMessage->getHeaders();
-			switch(strtolower($sKey))
-			{
-				default:
-				$oHeaders->addTextHeader($sKey, $sValue);
-			}
-		}
-	}
-
-	public function SetMessageId($sId)
-	{
-		$this->m_aData['message_id'] = $sId;
-		
-		// Note: Swift will add the angle brackets for you
-		// so let's remove the angle brackets if present, for historical reasons
-		$sId = str_replace(array('<', '>'), '', $sId);
-		
-		$oMsgId = $this->m_oMessage->getHeaders()->get('Message-ID');
-		$oMsgId->SetId($sId);
-	}
-	
-	public function SetReferences($sReferences)
-	{
-		$this->AddToHeader('References', $sReferences);
-	}
-
-	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)
-	{
-		if (($sMimeType === 'text/html') && ($sCustomStyles !== null))
-		{
-			require_once(APPROOT.'lib/emogrifier/Classes/Emogrifier.php');
-			$emogrifier = new \Pelago\Emogrifier($sBody, $sCustomStyles);
-			$sBody = $emogrifier->emogrify(); // Adds html/body tags if not already present
-		}
-		$this->m_aData['body'] = array('body' => $sBody, 'mimeType' => $sMimeType);
-		$this->m_oMessage->setBody($sBody, $sMimeType);
-	}
-
-	public function AddPart($sText, $sMimeType = 'text/html')
-	{
-		if (!array_key_exists('parts', $this->m_aData))
-		{
-			$this->m_aData['parts'] = array();
-		}
-		$this->m_aData['parts'][] = array('text' => $sText, 'mimeType' => $sMimeType);
-		$this->m_oMessage->addPart($sText, $sMimeType);
-	}
-
-	public function AddAttachment($data, $sFileName, $sMimeType)
-	{
-		if (!array_key_exists('attachments', $this->m_aData))
-		{
-			$this->m_aData['attachments'] = array();
-		}
-		$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
-		$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType));
-	}
-
-	public function SetSubject($sSubject)
-	{
-		$this->m_aData['subject'] = $sSubject;
-		$this->m_oMessage->setSubject($sSubject);
-	}
-
-	public function GetSubject()
-	{
-		return $this->m_oMessage->getSubject();
-	}
-
-	/**
-	 * Helper to transform and sanitize addresses
-	 * - get rid of empty addresses	 
-	 */	 	
-	protected function AddressStringToArray($sAddressCSVList)
-	{
-		$aAddresses = array();
-		foreach(explode(',', $sAddressCSVList) as $sAddress)
-		{
-			$sAddress = trim($sAddress);
-			if (strlen($sAddress) > 0)
-			{
-				$aAddresses[] = $sAddress;
-			}
-		}
-		return $aAddresses;
-	}
-	
-	public function SetRecipientTO($sAddress)
-	{
-		$this->m_aData['to'] = $sAddress;
-		if (!empty($sAddress))
-		{
-			$aAddresses = $this->AddressStringToArray($sAddress);
-			$this->m_oMessage->setTo($aAddresses);
-		}
-	}
-
-	public function GetRecipientTO($bAsString = false)
-	{
-		$aRes = $this->m_oMessage->getTo();
-		if ($aRes === null)
-		{
-			// There is no "To" header field
-			$aRes = array();
-		}
-		if ($bAsString)
-		{
-			$aStrings = array();
-			foreach ($aRes as $sEmail => $sName)
-			{
-				if (is_null($sName))
-				{
-					$aStrings[] = $sEmail;
-				}
-				else
-				{
-					$sName = str_replace(array('<', '>'), '', $sName);
-					$aStrings[] = "$sName <$sEmail>";
-				}
-			}
-			return implode(', ', $aStrings);
-		}
-		else
-		{
-			return $aRes;
-		}
-	}
-
-	public function SetRecipientCC($sAddress)
-	{
-		$this->m_aData['cc'] = $sAddress;
-		if (!empty($sAddress))
-		{
-			$aAddresses = $this->AddressStringToArray($sAddress);
-			$this->m_oMessage->setCc($aAddresses);
-		}
-	}
-
-	public function SetRecipientBCC($sAddress)
-	{
-		$this->m_aData['bcc'] = $sAddress;
-		if (!empty($sAddress))
-		{
-			$aAddresses = $this->AddressStringToArray($sAddress);
-			$this->m_oMessage->setBcc($aAddresses);
-		}
-	}
-
-	public function SetRecipientFrom($sAddress, $sLabel = '')
-	{
-		$this->m_aData['from'] = array('address' => $sAddress, 'label' => $sLabel);
-		if ($sLabel != '')
-		{
-			$this->m_oMessage->setFrom(array($sAddress => $sLabel));		
-		}
-		else if (!empty($sAddress))
-		{
-			$this->m_oMessage->setFrom($sAddress);
-		}
-	}
-
-	public function SetRecipientReplyTo($sAddress)
-	{
-		$this->m_aData['reply_to'] = $sAddress;
-		if (!empty($sAddress))
-		{
-			$this->m_oMessage->setReplyTo($sAddress);
-		}
-	}
-
-}
-
-/////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Extension to SwiftMailer: "debug" transport that pretends messages have been sent,
- * but just log them to a file.
- *
- * @package Swift
- * @author  Denis Flaven
- */
-class Swift_Transport_LogFileTransport extends Swift_Transport_NullTransport
-{
-	protected $sLogFile;
-	
-	/**
-	 * Sends the given message.
-	 *
-	 * @param Swift_Mime_Message $message
-	 * @param string[]           $failedRecipients An array of failures by-reference
-	 *
-	 * @return int     The number of sent emails
-	 */
-	public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-	{
-		$hFile = @fopen($this->sLogFile, 'a');
-		if ($hFile)
-		{
-			$sTxt = "================== ".date('Y-m-d H:i:s')." ==================\n";
-			$sTxt .= $message->toString()."\n";
-		
-			@fwrite($hFile, $sTxt);
-			@fclose($hFile);
-		}
-		
-		return parent::send($message, $failedRecipients);
-	}
-	
-	public function setLogFile($sFilename)
-	{
-		$this->sLogFile = $sFilename;
-	}
-}
-
-/**
- * Pretends messages have been sent, but just log them to a file.
- *
- * @package Swift
- * @author  Denis Flaven
- */
-class Swift_LogFileTransport extends Swift_Transport_LogFileTransport
-{
-	/**
-	 * Create a new LogFileTransport.
-	 */
-	public function __construct()
-	{
-		call_user_func_array(
-		array($this, 'Swift_Transport_LogFileTransport::__construct'),
-		Swift_DependencyContainer::getInstance()
-		->createDependenciesFor('transport.null')
-		);
-	}
-
-	/**
-	 * Create a new LogFileTransport instance.
-	 *
-	 * @return Swift_LogFileTransport
-	 */
-	public static function newInstance()
-	{
-		return new self();
-	}
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Send an email (abstraction for synchronous/asynchronous modes)
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/lib/swiftmailer/lib/swift_required.php');
+
+Swift_Preferences::getInstance()->setCharset('UTF-8');
+
+
+define ('EMAIL_SEND_OK', 0);
+define ('EMAIL_SEND_PENDING', 1);
+define ('EMAIL_SEND_ERROR', 2);
+
+class EMail
+{
+	// Serialization formats
+	const ORIGINAL_FORMAT = 1; // Original format, consisting in serializing the whole object, inculding the Swift Mailer's object.
+							   // Did not work with attachements since their binary representation cannot be stored as a valid UTF-8 string
+	const FORMAT_V2 = 2; // New format, only the raw data are serialized (base64 encoded if needed)
+	
+	protected static $m_oConfig = null;
+	protected $m_aData; // For storing data to serialize
+
+	public function LoadConfig($sConfigFile = ITOP_DEFAULT_CONFIG_FILE)
+	{
+		if (is_null(self::$m_oConfig))
+		{
+			self::$m_oConfig = new Config($sConfigFile);
+		}
+	}
+
+	protected $m_oMessage;
+
+	public function __construct()
+	{
+		$this->m_aData = array();
+		$this->m_oMessage = Swift_Message::newInstance();
+		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
+	}
+
+	/**
+	 * Custom serialization method
+	 * No longer use the brute force "serialize" method since
+	 * 1) It does not work with binary attachments (since they cannot be stored in a UTF-8 text field)
+	 * 2) The size tends to be quite big (sometimes ten times the size of the email)
+	 */
+	public function SerializeV2()
+	{
+		return serialize($this->m_aData);
+	}
+	
+	/**
+	 * Custom de-serialization method
+	 * @param string $sSerializedMessage The serialized representation of the message
+	 */
+	static public function UnSerializeV2($sSerializedMessage)
+	{
+		$aData = unserialize($sSerializedMessage);
+		$oMessage = new Email();
+		
+		if (array_key_exists('body', $aData))
+		{
+			$oMessage->SetBody($aData['body']['body'], $aData['body']['mimeType']);
+		}
+		if (array_key_exists('message_id', $aData))
+		{
+			$oMessage->SetMessageId($aData['message_id']);
+		}
+		if (array_key_exists('bcc', $aData))
+		{
+			$oMessage->SetRecipientBCC($aData['bcc']);
+		}
+		if (array_key_exists('cc', $aData))
+		{
+			$oMessage->SetRecipientCC($aData['cc']);
+		}
+		if (array_key_exists('from', $aData))
+		{
+			$oMessage->SetRecipientFrom($aData['from']['address'], $aData['from']['label']);
+		}
+		if (array_key_exists('reply_to', $aData))
+		{
+			$oMessage->SetRecipientReplyTo($aData['reply_to']);
+		}
+		if (array_key_exists('to', $aData))
+		{
+			$oMessage->SetRecipientTO($aData['to']);
+		}
+		if (array_key_exists('subject', $aData))
+		{
+			$oMessage->SetSubject($aData['subject']);
+		}
+		
+		
+		if (array_key_exists('headers', $aData))
+		{
+			foreach($aData['headers'] as $sKey => $sValue)
+			{
+				$oMessage->AddToHeader($sKey, $sValue);
+			}
+		}
+		if (array_key_exists('parts', $aData))
+		{
+			foreach($aData['parts'] as $aPart)
+			{
+				$oMessage->AddPart($aPart['text'], $aPart['mimeType']);
+			}
+		}
+		if (array_key_exists('attachments', $aData))
+		{
+			foreach($aData['attachments'] as $aAttachment)
+			{
+				$oMessage->AddAttachment(base64_decode($aAttachment['data']), $aAttachment['filename'], $aAttachment['mimeType']);
+			}
+		}
+		return $oMessage;
+	}
+	
+  	protected function SendAsynchronous(&$aIssues, $oLog = null)
+	{
+		try
+		{
+			AsyncSendEmail::AddToQueue($this, $oLog);
+		}
+		catch(Exception $e)
+		{
+			$aIssues = array($e->GetMessage());
+			return EMAIL_SEND_ERROR;
+		}
+		$aIssues = array();
+		return EMAIL_SEND_PENDING;
+	}
+
+	protected function SendSynchronous(&$aIssues, $oLog = null)
+	{
+		// If the body of the message is in HTML, embed all images based on attachments
+		$this->EmbedInlineImages();
+		
+		$this->LoadConfig();
+
+		$sTransport = self::$m_oConfig->Get('email_transport');
+		switch ($sTransport)
+		{
+		case 'SMTP':
+			$sHost = self::$m_oConfig->Get('email_transport_smtp.host');
+			$sPort = self::$m_oConfig->Get('email_transport_smtp.port');
+			$sEncryption = self::$m_oConfig->Get('email_transport_smtp.encryption');
+			$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
+			$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
+
+			$oTransport = Swift_SmtpTransport::newInstance($sHost, $sPort, $sEncryption);
+			if (strlen($sUserName) > 0)
+			{
+				$oTransport->setUsername($sUserName);
+				$oTransport->setPassword($sPassword);
+			}
+			break;
+
+		case 'Null':
+			$oTransport = Swift_NullTransport::newInstance();
+			break;
+		
+		case 'LogFile':
+			$oTransport = Swift_LogFileTransport::newInstance();
+			$oTransport->setLogFile(APPROOT.'log/mail.log');
+			break;
+			
+		case 'PHPMail':
+		default:
+			$oTransport = Swift_MailTransport::newInstance();
+		}
+
+		$oMailer = Swift_Mailer::newInstance($oTransport);
+
+		$aFailedRecipients = array();
+		$this->m_oMessage->setMaxLineLength(0);
+		$oKPI = new ExecutionKPI();
+		try
+		{
+			$iSent = $oMailer->send($this->m_oMessage, $aFailedRecipients);
+			if ($iSent === 0)
+			{
+				// Beware: it seems that $aFailedRecipients sometimes contains the recipients that actually received the message !!!
+				IssueLog::Warning('Email sending failed: Some recipients were invalid, aFailedRecipients contains: '.implode(', ', $aFailedRecipients));
+				$aIssues = array('Some recipients were invalid.');
+				$oKPI->ComputeStats('Email Sent', 'Error received');
+				return EMAIL_SEND_ERROR;
+			}
+			else
+			{
+				$aIssues = array();
+				$oKPI->ComputeStats('Email Sent', 'Succeded');
+				return EMAIL_SEND_OK;
+			}
+		}
+		catch (Exception $e)
+		{
+			$oKPI->ComputeStats('Email Sent', 'Error received');
+			throw $e;
+		}
+	}
+	
+	/**
+	 * Reprocess the body of the message (if it is an HTML message)
+	 * to replace the URL of images based on attachments by a link
+	 * to an embedded image (i.e. cid:....)
+	 */
+	protected function EmbedInlineImages()
+	{
+		if ($this->m_aData['body']['mimeType'] == 'text/html')
+		{
+			$oDOMDoc = new DOMDocument();
+			$oDOMDoc->preserveWhitespace = true;
+			@$oDOMDoc->loadHTML('<?xml encoding="UTF-8"?>'.$this->m_aData['body']['body']); // For loading HTML chunks where the character set is not specified
+			
+			$oXPath = new DOMXPath($oDOMDoc);
+			$sXPath = "//img[@data-img-id]";
+			$oImagesList = $oXPath->query($sXPath);
+			
+			if ($oImagesList->length != 0)
+			{
+				foreach($oImagesList as $oImg)
+				{
+					$iAttId = $oImg->getAttribute('data-img-id');
+					$oAttachment = MetaModel::GetObject('InlineImage', $iAttId, false, true /* Allow All Data */);
+					if ($oAttachment)
+					{
+						$oDoc = $oAttachment->Get('contents');
+						$oSwiftImage = new Swift_Image($oDoc->GetData(), $oDoc->GetFileName(), $oDoc->GetMimeType());
+						$sCid = $this->m_oMessage->embed($oSwiftImage);
+						$oImg->setAttribute('src', $sCid);
+					}
+				}
+			}
+			$sHtmlBody = $oDOMDoc->saveHTML();
+			$this->m_oMessage->setBody($sHtmlBody, 'text/html', 'UTF-8');
+		}
+	}
+
+	public function Send(&$aIssues, $bForceSynchronous = false, $oLog = null)
+	{
+		//select a default sender if none is provided.
+		if(empty($this->m_aData['from']['address']) && !empty($this->m_aData['to'])){
+			$this->SetRecipientFrom($this->m_aData['to']);
+		}
+
+		if ($bForceSynchronous)
+		{
+			return $this->SendSynchronous($aIssues, $oLog);
+		}
+		else
+		{
+			$bConfigASYNC = MetaModel::GetConfig()->Get('email_asynchronous');
+			if ($bConfigASYNC)
+			{
+				return $this->SendAsynchronous($aIssues, $oLog);
+			}
+			else
+			{
+				return $this->SendSynchronous($aIssues, $oLog);
+			}
+		}
+	}
+
+	public function AddToHeader($sKey, $sValue)
+	{
+		if (!array_key_exists('headers', $this->m_aData))
+		{
+			$this->m_aData['headers'] = array();
+		}
+		$this->m_aData['headers'][$sKey] = $sValue;
+		
+		if (strlen($sValue) > 0)
+		{
+			$oHeaders = $this->m_oMessage->getHeaders();
+			switch(strtolower($sKey))
+			{
+				default:
+				$oHeaders->addTextHeader($sKey, $sValue);
+			}
+		}
+	}
+
+	public function SetMessageId($sId)
+	{
+		$this->m_aData['message_id'] = $sId;
+		
+		// Note: Swift will add the angle brackets for you
+		// so let's remove the angle brackets if present, for historical reasons
+		$sId = str_replace(array('<', '>'), '', $sId);
+		
+		$oMsgId = $this->m_oMessage->getHeaders()->get('Message-ID');
+		$oMsgId->SetId($sId);
+	}
+	
+	public function SetReferences($sReferences)
+	{
+		$this->AddToHeader('References', $sReferences);
+	}
+
+	public function SetBody($sBody, $sMimeType = 'text/html', $sCustomStyles = null)
+	{
+		if (($sMimeType === 'text/html') && ($sCustomStyles !== null))
+		{
+			require_once(APPROOT.'lib/emogrifier/Classes/Emogrifier.php');
+			$emogrifier = new \Pelago\Emogrifier($sBody, $sCustomStyles);
+			$sBody = $emogrifier->emogrify(); // Adds html/body tags if not already present
+		}
+		$this->m_aData['body'] = array('body' => $sBody, 'mimeType' => $sMimeType);
+		$this->m_oMessage->setBody($sBody, $sMimeType);
+	}
+
+	public function AddPart($sText, $sMimeType = 'text/html')
+	{
+		if (!array_key_exists('parts', $this->m_aData))
+		{
+			$this->m_aData['parts'] = array();
+		}
+		$this->m_aData['parts'][] = array('text' => $sText, 'mimeType' => $sMimeType);
+		$this->m_oMessage->addPart($sText, $sMimeType);
+	}
+
+	public function AddAttachment($data, $sFileName, $sMimeType)
+	{
+		if (!array_key_exists('attachments', $this->m_aData))
+		{
+			$this->m_aData['attachments'] = array();
+		}
+		$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
+		$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType));
+	}
+
+	public function SetSubject($sSubject)
+	{
+		$this->m_aData['subject'] = $sSubject;
+		$this->m_oMessage->setSubject($sSubject);
+	}
+
+	public function GetSubject()
+	{
+		return $this->m_oMessage->getSubject();
+	}
+
+	/**
+	 * Helper to transform and sanitize addresses
+	 * - get rid of empty addresses	 
+	 */	 	
+	protected function AddressStringToArray($sAddressCSVList)
+	{
+		$aAddresses = array();
+		foreach(explode(',', $sAddressCSVList) as $sAddress)
+		{
+			$sAddress = trim($sAddress);
+			if (strlen($sAddress) > 0)
+			{
+				$aAddresses[] = $sAddress;
+			}
+		}
+		return $aAddresses;
+	}
+	
+	public function SetRecipientTO($sAddress)
+	{
+		$this->m_aData['to'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setTo($aAddresses);
+		}
+	}
+
+	public function GetRecipientTO($bAsString = false)
+	{
+		$aRes = $this->m_oMessage->getTo();
+		if ($aRes === null)
+		{
+			// There is no "To" header field
+			$aRes = array();
+		}
+		if ($bAsString)
+		{
+			$aStrings = array();
+			foreach ($aRes as $sEmail => $sName)
+			{
+				if (is_null($sName))
+				{
+					$aStrings[] = $sEmail;
+				}
+				else
+				{
+					$sName = str_replace(array('<', '>'), '', $sName);
+					$aStrings[] = "$sName <$sEmail>";
+				}
+			}
+			return implode(', ', $aStrings);
+		}
+		else
+		{
+			return $aRes;
+		}
+	}
+
+	public function SetRecipientCC($sAddress)
+	{
+		$this->m_aData['cc'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setCc($aAddresses);
+		}
+	}
+
+	public function SetRecipientBCC($sAddress)
+	{
+		$this->m_aData['bcc'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$aAddresses = $this->AddressStringToArray($sAddress);
+			$this->m_oMessage->setBcc($aAddresses);
+		}
+	}
+
+	public function SetRecipientFrom($sAddress, $sLabel = '')
+	{
+		$this->m_aData['from'] = array('address' => $sAddress, 'label' => $sLabel);
+		if ($sLabel != '')
+		{
+			$this->m_oMessage->setFrom(array($sAddress => $sLabel));		
+		}
+		else if (!empty($sAddress))
+		{
+			$this->m_oMessage->setFrom($sAddress);
+		}
+	}
+
+	public function SetRecipientReplyTo($sAddress)
+	{
+		$this->m_aData['reply_to'] = $sAddress;
+		if (!empty($sAddress))
+		{
+			$this->m_oMessage->setReplyTo($sAddress);
+		}
+	}
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Extension to SwiftMailer: "debug" transport that pretends messages have been sent,
+ * but just log them to a file.
+ *
+ * @package Swift
+ * @author  Denis Flaven
+ */
+class Swift_Transport_LogFileTransport extends Swift_Transport_NullTransport
+{
+	protected $sLogFile;
+	
+	/**
+	 * Sends the given message.
+	 *
+	 * @param Swift_Mime_Message $message
+	 * @param string[]           $failedRecipients An array of failures by-reference
+	 *
+	 * @return int     The number of sent emails
+	 */
+	public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+	{
+		$hFile = @fopen($this->sLogFile, 'a');
+		if ($hFile)
+		{
+			$sTxt = "================== ".date('Y-m-d H:i:s')." ==================\n";
+			$sTxt .= $message->toString()."\n";
+		
+			@fwrite($hFile, $sTxt);
+			@fclose($hFile);
+		}
+		
+		return parent::send($message, $failedRecipients);
+	}
+	
+	public function setLogFile($sFilename)
+	{
+		$this->sLogFile = $sFilename;
+	}
+}
+
+/**
+ * Pretends messages have been sent, but just log them to a file.
+ *
+ * @package Swift
+ * @author  Denis Flaven
+ */
+class Swift_LogFileTransport extends Swift_Transport_LogFileTransport
+{
+	/**
+	 * Create a new LogFileTransport.
+	 */
+	public function __construct()
+	{
+		call_user_func_array(
+		array($this, 'Swift_Transport_LogFileTransport::__construct'),
+		Swift_DependencyContainer::getInstance()
+		->createDependenciesFor('transport.null')
+		);
+	}
+
+	/**
+	 * Create a new LogFileTransport instance.
+	 *
+	 * @return Swift_LogFileTransport
+	 */
+	public static function newInstance()
+	{
+		return new self();
+	}
 }
\ No newline at end of file
diff --git a/core/event.class.inc.php b/core/event.class.inc.php
index cc126b3f2..fba748ca4 100644
--- a/core/event.class.inc.php
+++ b/core/event.class.inc.php
@@ -1,437 +1,437 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Event and derived
- * Application internal events
- * There is also a file log 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class Event extends DBObject implements iDisplay
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-//		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'finalclass', 'message')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	/**
-	 * Maps the given context parameter name to the appropriate filter/search code for this class
-	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
-	 * @return string Filter code, i.e. 'customer_id'
-	 */
-	public static function MapContextParam($sContextParam)
-	{
-		if ($sContextParam == 'menu')
-		{
-			return null;
-		}
-		else
-		{
-			return $sContextParam;
-		}
-	}
-
-	/**
-	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
-	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
-	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
-	 * To Be overridden by derived classes
-	 * @param void
-	 * @return String The desired higlight class for the object/row
-	 */
-	public function GetHilightClass()
-	{
-		// Possible return values are:
-		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
-		return HILIGHT_CLASS_NONE; // Not hilighted by default
-	}
-
-	public static function GetUIPage()
-	{
-		return 'UI.php';
-	}
-
-	function DisplayDetails(WebPage $oPage, $bEditMode = false)
-	{
-		// Object's details
-		//$this->DisplayBareHeader($oPage, $bEditMode);
-		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
-		$this->DisplayBareProperties($oPage, $bEditMode);
-	}
-	
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		if ($bEditMode) return array(); // Not editable
-		
-		$aDetails = array();
-		$sClass = get_class($this);
-		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
-		foreach( $aZList as $sAttCode)
-		{
-			$sDisplayValue = $this->GetAsHTML($sAttCode);	
-			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
-		}
-		$oPage->Details($aDetails);
-		return array();
-	}
-}
-
-class EventNotification extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_notification",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false),
-			'indexes' => array(
-				array('object_id'),
-			)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> "", "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> "", "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'message')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-}
-
-class EventNotificationEmail extends EventNotification
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_email",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTable("attachments", array("allowed_values"=>null, "sql"=>"attachments", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject', 'attachments')); // Attributes to be displayed for a list
-
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-}
-
-class EventIssue extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_issue",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("issue", array("allowed_values"=>null, "sql"=>"issue", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("page", array("allowed_values"=>null, "sql"=>"page", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("arguments_post", array("allowed_values"=>null, "sql"=>"arguments_post", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("arguments_get", array("allowed_values"=>null, "sql"=>"arguments_get", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeTable("callstack", array("allowed_values"=>null, "sql"=>"callstack", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributePropertySet("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'issue', 'impact', 'page', 'arguments_post', 'arguments_get', 'callstack', 'data')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'issue', 'impact')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	protected function OnInsert()
-	{
-		// Init page information: name, arguments
-		//
-		$this->Set('page', @$GLOBALS['_SERVER']['SCRIPT_NAME']);
-
-		if (array_key_exists('_GET', $GLOBALS) && is_array($GLOBALS['_GET']))
-		{
-			$this->Set('arguments_get', $GLOBALS['_GET']);
-		}
-		else
-		{
-			$this->Set('arguments_get', array());
-		}
-
-		if (array_key_exists('_POST', $GLOBALS) && is_array($GLOBALS['_POST']))
-		{
-			$aPost = array();
-			foreach($GLOBALS['_POST'] as $sKey => $sValue)
-			{
-				if (is_string($sValue))
-				{
-					if (strlen($sValue) < 256)
-					{
-						$aPost[$sKey] = $sValue;
-					}
-					else
-					{
-						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
-					}
-				}
-				else
-				{
-					// Not a string (avoid warnings in case the value cannot be easily casted into a string)
-					$aPost[$sKey] = @(string) $sValue;
-				}
-			}
-			$this->Set('arguments_post', $aPost);
-		}
-		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 = strlen($this->Get('impact'));
-		if ($sLength > 255)
-		{
-			$this->Set('impact', substr($this->Get('impact'), 0, 200)." -truncated ($sLength chars)");
-		}
-
-		$sLength = strlen($this->Get('page'));
-		if ($sLength > 255)
-		{
-			$this->Set('page', substr($this->Get('page'), 0, 200)." -truncated ($sLength chars)");
-		}
-	}
-}
-
-
-class EventWebService extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_webservice",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("verb", array("allowed_values"=>null, "sql"=>"verb", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		//MetaModel::Init_AddAttribute(new AttributeStructure("arguments", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeBoolean("result", array("allowed_values"=>null, "sql"=>"result", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("log_info", array("allowed_values"=>null, "sql"=>"log_info", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("log_warning", array("allowed_values"=>null, "sql"=>"log_warning", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("log_error", array("allowed_values"=>null, "sql"=>"log_error", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'verb', 'result', 'log_info', 'log_warning', 'log_error', 'data')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'verb', 'result')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class EventRestService extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_restservice",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("operation", array("allowed_values"=>null, "sql"=>"operation", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("json_input", array("allowed_values"=>null, "sql"=>"json_input", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("code", array("allowed_values"=>null, "sql"=>"code", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("json_output", array("allowed_values"=>null, "sql"=>"json_output", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("provider", array("allowed_values"=>null, "sql"=>"provider", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'operation', 'version', 'json_input', 'message', 'code', 'json_output', 'provider')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'operation', 'message')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class EventLoginUsage extends Event
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_event_loginusage",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"order_by_default" => array('date' => false)
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		$aZList = array('date', 'user_id');
-		if (MetaModel::IsValidAttCode('Contact', 'name'))
-		{
-			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_name", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"contactid", "is_null_allowed"=>true, "depends_on"=>array())));
-			$aZList[] = 'contact_name';
-		}
-		if (MetaModel::IsValidAttCode('Contact', 'email'))
-		{
-			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_email", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
-			$aZList[] = 'contact_email';
-		}
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array_merge($aZList, array('userinfo', 'message'))); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array_merge($aZList, array('userinfo'))); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', $aZList); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class EventOnObject extends Event
-{
-    public static function Init()
-    {
-        $aParams = array
-        (
-            "category" => "core/cmdb,view_in_gui",
-            "key_type" => "autoincrement",
-            "name_attcode" => "",
-            "state_attcode" => "",
-            "reconc_keys" => array(),
-            "db_table" => "priv_event_onobject",
-            "db_key_field" => "id",
-            "db_finalclass_field" => "",
-            "display_template" => "",
-            "order_by_default" => array('date' => false)
-        );
-        MetaModel::Init_Params($aParams);
-        MetaModel::Init_InheritAttributes();
-        MetaModel::Init_AddAttribute(new AttributeString("obj_class", array("allowed_values"=>null, "sql"=>"obj_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-        MetaModel::Init_AddAttribute(new AttributeInteger("obj_key", array("allowed_values"=>null, "sql"=>"obj_key", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-        // Display lists
-        MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for the complete details
-        MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for a list
-    }
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Event and derived
+ * Application internal events
+ * There is also a file log 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class Event extends DBObject implements iDisplay
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeText("message", array("allowed_values"=>null, "sql"=>"message", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("date", array("allowed_values"=>null, "sql"=>"date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+//		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'finalclass', 'message')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	/**
+	 * Maps the given context parameter name to the appropriate filter/search code for this class
+	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
+	 * @return string Filter code, i.e. 'customer_id'
+	 */
+	public static function MapContextParam($sContextParam)
+	{
+		if ($sContextParam == 'menu')
+		{
+			return null;
+		}
+		else
+		{
+			return $sContextParam;
+		}
+	}
+
+	/**
+	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
+	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
+	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+	 * To Be overridden by derived classes
+	 * @param void
+	 * @return String The desired higlight class for the object/row
+	 */
+	public function GetHilightClass()
+	{
+		// Possible return values are:
+		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
+		return HILIGHT_CLASS_NONE; // Not hilighted by default
+	}
+
+	public static function GetUIPage()
+	{
+		return 'UI.php';
+	}
+
+	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+		// Object's details
+		//$this->DisplayBareHeader($oPage, $bEditMode);
+		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$this->DisplayBareProperties($oPage, $bEditMode);
+	}
+	
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		if ($bEditMode) return array(); // Not editable
+		
+		$aDetails = array();
+		$sClass = get_class($this);
+		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
+		foreach( $aZList as $sAttCode)
+		{
+			$sDisplayValue = $this->GetAsHTML($sAttCode);	
+			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
+		}
+		$oPage->Details($aDetails);
+		return array();
+	}
+}
+
+class EventNotification extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_notification",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false),
+			'indexes' => array(
+				array('object_id'),
+			)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> "", "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> "", "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("object_id", array("allowed_values"=>null, "sql"=>"object_id", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'message', 'userinfo', 'trigger_id', 'action_id', 'object_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'message')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+}
+
+class EventNotificationEmail extends EventNotification
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_email",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeText("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTable("attachments", array("allowed_values"=>null, "sql"=>"attachments", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'message', 'to', 'subject', 'attachments')); // Attributes to be displayed for a list
+
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+}
+
+class EventIssue extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_issue",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("issue", array("allowed_values"=>null, "sql"=>"issue", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("impact", array("allowed_values"=>null, "sql"=>"impact", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("page", array("allowed_values"=>null, "sql"=>"page", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributePropertySet("arguments_post", array("allowed_values"=>null, "sql"=>"arguments_post", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributePropertySet("arguments_get", array("allowed_values"=>null, "sql"=>"arguments_get", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeTable("callstack", array("allowed_values"=>null, "sql"=>"callstack", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributePropertySet("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'issue', 'impact', 'page', 'arguments_post', 'arguments_get', 'callstack', 'data')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'issue', 'impact')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	protected function OnInsert()
+	{
+		// Init page information: name, arguments
+		//
+		$this->Set('page', @$GLOBALS['_SERVER']['SCRIPT_NAME']);
+
+		if (array_key_exists('_GET', $GLOBALS) && is_array($GLOBALS['_GET']))
+		{
+			$this->Set('arguments_get', $GLOBALS['_GET']);
+		}
+		else
+		{
+			$this->Set('arguments_get', array());
+		}
+
+		if (array_key_exists('_POST', $GLOBALS) && is_array($GLOBALS['_POST']))
+		{
+			$aPost = array();
+			foreach($GLOBALS['_POST'] as $sKey => $sValue)
+			{
+				if (is_string($sValue))
+				{
+					if (strlen($sValue) < 256)
+					{
+						$aPost[$sKey] = $sValue;
+					}
+					else
+					{
+						$aPost[$sKey] = "!long string: ".strlen($sValue). " chars";
+					}
+				}
+				else
+				{
+					// Not a string (avoid warnings in case the value cannot be easily casted into a string)
+					$aPost[$sKey] = @(string) $sValue;
+				}
+			}
+			$this->Set('arguments_post', $aPost);
+		}
+		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 = strlen($this->Get('impact'));
+		if ($sLength > 255)
+		{
+			$this->Set('impact', substr($this->Get('impact'), 0, 200)." -truncated ($sLength chars)");
+		}
+
+		$sLength = strlen($this->Get('page'));
+		if ($sLength > 255)
+		{
+			$this->Set('page', substr($this->Get('page'), 0, 200)." -truncated ($sLength chars)");
+		}
+	}
+}
+
+
+class EventWebService extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_webservice",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("verb", array("allowed_values"=>null, "sql"=>"verb", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		//MetaModel::Init_AddAttribute(new AttributeStructure("arguments", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBoolean("result", array("allowed_values"=>null, "sql"=>"result", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("log_info", array("allowed_values"=>null, "sql"=>"log_info", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("log_warning", array("allowed_values"=>null, "sql"=>"log_warning", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("log_error", array("allowed_values"=>null, "sql"=>"log_error", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("data", array("allowed_values"=>null, "sql"=>"data", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'verb', 'result', 'log_info', 'log_warning', 'log_error', 'data')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'verb', 'result')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class EventRestService extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_restservice",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("operation", array("allowed_values"=>null, "sql"=>"operation", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("json_input", array("allowed_values"=>null, "sql"=>"json_input", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("code", array("allowed_values"=>null, "sql"=>"code", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("json_output", array("allowed_values"=>null, "sql"=>"json_output", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("provider", array("allowed_values"=>null, "sql"=>"provider", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'operation', 'version', 'json_input', 'message', 'code', 'json_output', 'provider')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'operation', 'message')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class EventLoginUsage extends Event
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_event_loginusage",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"order_by_default" => array('date' => false)
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=> "", "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		$aZList = array('date', 'user_id');
+		if (MetaModel::IsValidAttCode('Contact', 'name'))
+		{
+			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_name", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"contactid", "is_null_allowed"=>true, "depends_on"=>array())));
+			$aZList[] = 'contact_name';
+		}
+		if (MetaModel::IsValidAttCode('Contact', 'email'))
+		{
+			MetaModel::Init_AddAttribute(new AttributeExternalField("contact_email", array("allowed_values"=>null, "extkey_attcode"=>"user_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array())));
+			$aZList[] = 'contact_email';
+		}
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array_merge($aZList, array('userinfo', 'message'))); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array_merge($aZList, array('userinfo'))); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', $aZList); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class EventOnObject extends Event
+{
+    public static function Init()
+    {
+        $aParams = array
+        (
+            "category" => "core/cmdb,view_in_gui",
+            "key_type" => "autoincrement",
+            "name_attcode" => "",
+            "state_attcode" => "",
+            "reconc_keys" => array(),
+            "db_table" => "priv_event_onobject",
+            "db_key_field" => "id",
+            "db_finalclass_field" => "",
+            "display_template" => "",
+            "order_by_default" => array('date' => false)
+        );
+        MetaModel::Init_Params($aParams);
+        MetaModel::Init_InheritAttributes();
+        MetaModel::Init_AddAttribute(new AttributeString("obj_class", array("allowed_values"=>null, "sql"=>"obj_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+        MetaModel::Init_AddAttribute(new AttributeInteger("obj_key", array("allowed_values"=>null, "sql"=>"obj_key", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+        // Display lists
+        MetaModel::Init_SetZListItems('details', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for the complete details
+        MetaModel::Init_SetZListItems('list', array('date', 'userinfo', 'obj_class', 'obj_key', 'message')); // Attributes to be displayed for a list
+    }
+}
diff --git a/core/expression.class.inc.php b/core/expression.class.inc.php
index 1e76b9bda..1135cff4c 100644
--- a/core/expression.class.inc.php
+++ b/core/expression.class.inc.php
@@ -1,4 +1,4 @@
-<?php
-// The file has been moved in iTop 2.2.0+ (revision 3803)
-// Preserve backward compatibility with some external tools (Cf. toolkit)
-require_once(APPROOT.'core/oql/expression.class.inc.php');
+<?php
+// The file has been moved in iTop 2.2.0+ (revision 3803)
+// Preserve backward compatibility with some external tools (Cf. toolkit)
+require_once(APPROOT.'core/oql/expression.class.inc.php');
diff --git a/core/expressioncache.class.inc.php b/core/expressioncache.class.inc.php
index 16731391f..d15d477c1 100644
--- a/core/expressioncache.class.inc.php
+++ b/core/expressioncache.class.inc.php
@@ -1,110 +1,110 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-class ExpressionCache
-{
-	static private $aCache = array();
-
-	static public function GetCachedExpression($sClass, $sAttCode)
-	{
-		// read current cache
-		@include_once (static::GetCacheFileName());
-
-		$oExpr = null;
-		$sKey = static::GetKey($sClass, $sAttCode);
-		if (array_key_exists($sKey, static::$aCache))
-		{
-			$oExpr =  static::$aCache[$sKey];
-		}
-		else
-		{
-			if (class_exists('ExpressionCacheData'))
-			{
-				if (array_key_exists($sKey, ExpressionCacheData::$aCache))
-				{
-					$sVal = ExpressionCacheData::$aCache[$sKey];
-					$oExpr = unserialize($sVal);
-					static::$aCache[$sKey] = $oExpr;
-				}
-			}
-		}
-		return $oExpr;
-	}
-
-
-	static public function Warmup()
-	{
-		$sFilePath = static::GetCacheFileName();
-
-		if (!is_file($sFilePath))
-		{
-			$content = <<<EOF
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-// Generated Expression Cache file
-
-class ExpressionCacheData
-{
-	static \$aCache =  array(
-EOF;
-
-			foreach(MetaModel::GetClasses() as $sClass)
-			{
-				$content .= static::GetSerializedExpression($sClass, 'friendlyname');
-				if (MetaModel::IsObsoletable($sClass))
-				{
-					$content .= static::GetSerializedExpression($sClass, 'obsolescence_flag');
-				}
-			}
-
-			$content .= <<<EOF
-	);
-}
-EOF;
-
-			file_put_contents($sFilePath, $content);
-		}
-	}
-
-	static private function GetSerializedExpression($sClass, $sAttCode)
-	{
-		$sKey = static::GetKey($sClass, $sAttCode);
-		$oExpr = DBObjectSearch::GetPolymorphicExpression($sClass, $sAttCode);
-		return "'".$sKey."' => '".serialize($oExpr)."',\n";
-	}
-
-	/**
-	 * @param $sClass
-	 * @param $sAttCode
-	 * @return string
-	 */
-	static private function GetKey($sClass, $sAttCode)
-	{
-		return $sClass.'::'.$sAttCode;
-	}
-
-	public static function GetCacheFileName()
-	{
-		return utils::GetCachePath().'expressioncache.php';
-	}
-
-}
-
-
-
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+class ExpressionCache
+{
+	static private $aCache = array();
+
+	static public function GetCachedExpression($sClass, $sAttCode)
+	{
+		// read current cache
+		@include_once (static::GetCacheFileName());
+
+		$oExpr = null;
+		$sKey = static::GetKey($sClass, $sAttCode);
+		if (array_key_exists($sKey, static::$aCache))
+		{
+			$oExpr =  static::$aCache[$sKey];
+		}
+		else
+		{
+			if (class_exists('ExpressionCacheData'))
+			{
+				if (array_key_exists($sKey, ExpressionCacheData::$aCache))
+				{
+					$sVal = ExpressionCacheData::$aCache[$sKey];
+					$oExpr = unserialize($sVal);
+					static::$aCache[$sKey] = $oExpr;
+				}
+			}
+		}
+		return $oExpr;
+	}
+
+
+	static public function Warmup()
+	{
+		$sFilePath = static::GetCacheFileName();
+
+		if (!is_file($sFilePath))
+		{
+			$content = <<<EOF
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+// Generated Expression Cache file
+
+class ExpressionCacheData
+{
+	static \$aCache =  array(
+EOF;
+
+			foreach(MetaModel::GetClasses() as $sClass)
+			{
+				$content .= static::GetSerializedExpression($sClass, 'friendlyname');
+				if (MetaModel::IsObsoletable($sClass))
+				{
+					$content .= static::GetSerializedExpression($sClass, 'obsolescence_flag');
+				}
+			}
+
+			$content .= <<<EOF
+	);
+}
+EOF;
+
+			file_put_contents($sFilePath, $content);
+		}
+	}
+
+	static private function GetSerializedExpression($sClass, $sAttCode)
+	{
+		$sKey = static::GetKey($sClass, $sAttCode);
+		$oExpr = DBObjectSearch::GetPolymorphicExpression($sClass, $sAttCode);
+		return "'".$sKey."' => '".serialize($oExpr)."',\n";
+	}
+
+	/**
+	 * @param $sClass
+	 * @param $sAttCode
+	 * @return string
+	 */
+	static private function GetKey($sClass, $sAttCode)
+	{
+		return $sClass.'::'.$sAttCode;
+	}
+
+	public static function GetCacheFileName()
+	{
+		return utils::GetCachePath().'expressioncache.php';
+	}
+
+}
+
+
+
diff --git a/core/filterdef.class.inc.php b/core/filterdef.class.inc.php
index 0465038aa..47ee1802e 100644
--- a/core/filterdef.class.inc.php
+++ b/core/filterdef.class.inc.php
@@ -1,212 +1,212 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Definition of a filter
- * Most of the time, a filter corresponds to an attribute, but we could imagine other search criteria
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-
-require_once('MyHelpers.class.inc.php');
-
-
-/**
- * Definition of a filter (could be made out of an existing attribute, or from an expression) 
- *
- * @package     iTopORM
- */
-abstract class FilterDefinition
-{
-	abstract public function GetType();
-	abstract public function GetTypeDesc();
-
-	protected $m_sCode;
-	private $m_aParams = array();
-	protected function Get($sParamName) {return $this->m_aParams[$sParamName];}
-	
-	public function __construct($sCode, $aParams = array())
-	{
-		$this->m_sCode = $sCode;
-		$this->m_aParams = $aParams;
-		$this->ConsistencyCheck();
-	}
-
-	// to be overloaded
-	static protected function ListExpectedParams()
-	{
-		return array();
-	}
-
-	private function ConsistencyCheck()
-	{
-		// Check that any mandatory param has been specified
-		//
-		$aExpectedParams = $this->ListExpectedParams();
-		foreach($aExpectedParams as $sParamName)
-		{
-			if (!array_key_exists($sParamName, $this->m_aParams))
-			{
-				$aBacktrace = debug_backtrace();
-				$sTargetClass = $aBacktrace[2]["class"];
-				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
-				throw new CoreException("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
-			}
-		}
-	} 
-
-	public function GetCode() {return $this->m_sCode;} 
-	abstract public function GetLabel(); 
-	abstract public function GetValuesDef(); 
-
-	// returns an array of opcode=>oplabel (e.g. "differs from")
-	abstract public function GetOperators();
-	// returns an opcode
-	abstract public function GetLooseOperator();
-	abstract public function GetSQLExpressions();
-
-	// Wrapper - no need for overloading this one
-	public function GetOpDescription($sOpCode)
-	{
-		$aOperators = $this->GetOperators();
-		if (!array_key_exists($sOpCode, $aOperators))
-		{
-			throw new CoreException("Unknown operator '$sOpCode'");
-		}
-		
-		return $aOperators[$sOpCode];
-	}
-}
-
-/**
- * Match against the object unique identifier 
- *
- * @package     iTopORM
- */
-class FilterPrivateKey extends FilterDefinition
-{
-	static protected function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("id_field"));
-	}
-
-	public function GetType() {return "PrivateKey";}
-	public function GetTypeDesc() {return "Match against object identifier";}
-
-	public function GetLabel()
-	{
-		return "Object Private Key";
-	} 
-
-	public function GetValuesDef()
-	{
-		return null;
-	}
-
-	public function GetOperators()
-	{
-		return array(
-			"="=>"equals",
-			"!="=>"differs from",
-			"IN"=>"in",
-			"NOTIN"=>"not in"
-		);
-	}
-	public function GetLooseOperator()
-	{
-		return "IN";
-	}
-
-	public function GetSQLExpressions()
-	{
-		return array(
-			'' => $this->Get("id_field"),
-		);
-	}
-}
-
-/**
- * Match against an existing attribute (the attribute type will determine the available operators) 
- *
- * @package     iTopORM
- */
-class FilterFromAttribute extends FilterDefinition
-{
-	static protected function ListExpectedParams()
-	{
-		return array_merge(parent::ListExpectedParams(), array("refattribute"));
-	}
-
-	public function __construct($oRefAttribute, $sSuffix = '')
-	{
-		// In this very specific case, the code is the one of the attribute
-		 // (this to get a very very simple syntax upon declaration)
-		$aParam = array();
-		$aParam["refattribute"] = $oRefAttribute;
-		parent::__construct($oRefAttribute->GetCode().$sSuffix, $aParam);
-	}
-
-	public function GetType() {return "Basic";}
-	public function GetTypeDesc() {return "Match against field contents";}
-
-	public function __GetRefAttribute() // for checking purposes only !!!
-	{
-		return $oAttDef = $this->Get("refattribute");
-	}
-
-	public function GetLabel()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetLabel();
-	} 
-
-	public function GetValuesDef()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetValuesDef();
-	}
-
-	public function GetAllowedValues($aArgs = array(), $sContains = '')
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetAllowedValues($aArgs, $sContains);
-	}
-
-	public function GetOperators()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetBasicFilterOperators();
-	}
-	public function GetLooseOperator()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetBasicFilterLooseOperator();
-	}
-
-	public function GetSQLExpressions()
-	{
-		$oAttDef = $this->Get("refattribute");
-		return $oAttDef->GetSQLExpressions();
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Definition of a filter
+ * Most of the time, a filter corresponds to an attribute, but we could imagine other search criteria
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+
+require_once('MyHelpers.class.inc.php');
+
+
+/**
+ * Definition of a filter (could be made out of an existing attribute, or from an expression) 
+ *
+ * @package     iTopORM
+ */
+abstract class FilterDefinition
+{
+	abstract public function GetType();
+	abstract public function GetTypeDesc();
+
+	protected $m_sCode;
+	private $m_aParams = array();
+	protected function Get($sParamName) {return $this->m_aParams[$sParamName];}
+	
+	public function __construct($sCode, $aParams = array())
+	{
+		$this->m_sCode = $sCode;
+		$this->m_aParams = $aParams;
+		$this->ConsistencyCheck();
+	}
+
+	// to be overloaded
+	static protected function ListExpectedParams()
+	{
+		return array();
+	}
+
+	private function ConsistencyCheck()
+	{
+		// Check that any mandatory param has been specified
+		//
+		$aExpectedParams = $this->ListExpectedParams();
+		foreach($aExpectedParams as $sParamName)
+		{
+			if (!array_key_exists($sParamName, $this->m_aParams))
+			{
+				$aBacktrace = debug_backtrace();
+				$sTargetClass = $aBacktrace[2]["class"];
+				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
+				throw new CoreException("ERROR missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
+			}
+		}
+	} 
+
+	public function GetCode() {return $this->m_sCode;} 
+	abstract public function GetLabel(); 
+	abstract public function GetValuesDef(); 
+
+	// returns an array of opcode=>oplabel (e.g. "differs from")
+	abstract public function GetOperators();
+	// returns an opcode
+	abstract public function GetLooseOperator();
+	abstract public function GetSQLExpressions();
+
+	// Wrapper - no need for overloading this one
+	public function GetOpDescription($sOpCode)
+	{
+		$aOperators = $this->GetOperators();
+		if (!array_key_exists($sOpCode, $aOperators))
+		{
+			throw new CoreException("Unknown operator '$sOpCode'");
+		}
+		
+		return $aOperators[$sOpCode];
+	}
+}
+
+/**
+ * Match against the object unique identifier 
+ *
+ * @package     iTopORM
+ */
+class FilterPrivateKey extends FilterDefinition
+{
+	static protected function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("id_field"));
+	}
+
+	public function GetType() {return "PrivateKey";}
+	public function GetTypeDesc() {return "Match against object identifier";}
+
+	public function GetLabel()
+	{
+		return "Object Private Key";
+	} 
+
+	public function GetValuesDef()
+	{
+		return null;
+	}
+
+	public function GetOperators()
+	{
+		return array(
+			"="=>"equals",
+			"!="=>"differs from",
+			"IN"=>"in",
+			"NOTIN"=>"not in"
+		);
+	}
+	public function GetLooseOperator()
+	{
+		return "IN";
+	}
+
+	public function GetSQLExpressions()
+	{
+		return array(
+			'' => $this->Get("id_field"),
+		);
+	}
+}
+
+/**
+ * Match against an existing attribute (the attribute type will determine the available operators) 
+ *
+ * @package     iTopORM
+ */
+class FilterFromAttribute extends FilterDefinition
+{
+	static protected function ListExpectedParams()
+	{
+		return array_merge(parent::ListExpectedParams(), array("refattribute"));
+	}
+
+	public function __construct($oRefAttribute, $sSuffix = '')
+	{
+		// In this very specific case, the code is the one of the attribute
+		 // (this to get a very very simple syntax upon declaration)
+		$aParam = array();
+		$aParam["refattribute"] = $oRefAttribute;
+		parent::__construct($oRefAttribute->GetCode().$sSuffix, $aParam);
+	}
+
+	public function GetType() {return "Basic";}
+	public function GetTypeDesc() {return "Match against field contents";}
+
+	public function __GetRefAttribute() // for checking purposes only !!!
+	{
+		return $oAttDef = $this->Get("refattribute");
+	}
+
+	public function GetLabel()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetLabel();
+	} 
+
+	public function GetValuesDef()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetValuesDef();
+	}
+
+	public function GetAllowedValues($aArgs = array(), $sContains = '')
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetAllowedValues($aArgs, $sContains);
+	}
+
+	public function GetOperators()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetBasicFilterOperators();
+	}
+	public function GetLooseOperator()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetBasicFilterLooseOperator();
+	}
+
+	public function GetSQLExpressions()
+	{
+		$oAttDef = $this->Get("refattribute");
+		return $oAttDef->GetSQLExpressions();
+	}
+}
+
+?>
diff --git a/core/kpi.class.inc.php b/core/kpi.class.inc.php
index 07af8977d..d4284f9e3 100644
--- a/core/kpi.class.inc.php
+++ b/core/kpi.class.inc.php
@@ -1,397 +1,397 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Measures operations duration, memory usage, etc. (and some other KPIs)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ExecutionKPI
-{
-	static protected $m_bEnabled_Duration = false;
-	static protected $m_bEnabled_Memory = false;
-	static protected $m_bBlameCaller = false;
-	static protected $m_sAllowedUser = '*';
-
-	static protected $m_aStats = array(); // Recurrent operations
-	static protected $m_aExecData = array(); // One shot operations
-
-	protected $m_fStarted = null;
-	protected $m_iInitialMemory = null;
-
-	static public function EnableDuration($iLevel)
-	{
-		if ($iLevel > 0)
-		{
-			self::$m_bEnabled_Duration = true;
-			if ($iLevel > 1)
-			{
-				self::$m_bBlameCaller = true;
-			}
-		}
-	}
-
-	static public function EnableMemory($iLevel)
-	{
-		if ($iLevel > 0)
-		{
-			self::$m_bEnabled_Memory = true;
-		}
-	}
-
-	/**
-	 * @param string sUser A user login or * for all users	
-	 */	
-	static public function SetAllowedUser($sUser)
-	{
-		self::$m_sAllowedUser = $sUser;
-	}
-
-	static public function IsEnabled()
-	{
-		if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory)
-		{
-			if ((self::$m_sAllowedUser == '*') || (UserRights::GetUser() == trim(self::$m_sAllowedUser)))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	static public function GetDescription()
-	{
-		$aFeatures = array();
-		if (self::$m_bEnabled_Duration) $aFeatures[] = 'Duration'; 
-		if (self::$m_bEnabled_Memory)   $aFeatures[] = 'Memory usage';
-		$sFeatures = implode(', ', $aFeatures);
-		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
-		return "KPI logging is active for $sFor. Measures: $sFeatures";
-	}
-
-	static public function ReportStats()
-	{
-		if (!self::IsEnabled()) return;
-
-		global $fItopStarted;
-		$sExecId = microtime(); // id to differentiate the hrefs!
-
-		$aBeginTimes = array();
-		foreach (self::$m_aExecData as $aOpStats)
-		{
-			$aBeginTimes[] = $aOpStats['time_begin'];
-		}
-		array_multisort($aBeginTimes, self::$m_aExecData);
-
-		$sTableStyle = 'background-color: #ccc; margin: 10px;';
-
-		self::Report("<hr/>");
-		self::Report("<div style=\"background-color: grey; padding: 10px;\">");
-		self::Report("<h3><a name=\"".md5($sExecId)."\">KPIs</a> - ".$_SERVER['REQUEST_URI']." (".$_SERVER['REQUEST_METHOD'].")</h3>");
-		self::Report("<p>".date('Y-m-d H:i:s', $fItopStarted)."</p>");
-		self::Report("<p>log_kpi_user_id: ".MetaModel::GetConfig()->Get('log_kpi_user_id')."</p>");
-		self::Report("<div>");
-		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
-		self::Report("<thead>");
-		self::Report("   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>");
-		self::Report("</thead>");
-		foreach (self::$m_aExecData as $aOpStats)
-		{
-			$sOperation = $aOpStats['op'];
-			$sBegin = $sEnd = $sDuration = $sMemBegin = $sMemEnd = $sMemPeak = '?';
-		
-			$sBegin = round($aOpStats['time_begin'], 3);
-			$sEnd = round($aOpStats['time_end'], 3);
-			$fDuration = $aOpStats['time_end'] - $aOpStats['time_begin'];
-			$sDuration = round($fDuration, 3);
-
-			if (isset($aOpStats['mem_begin']))
-			{
-				$sMemBegin = self::MemStr($aOpStats['mem_begin']);
-				$sMemEnd = self::MemStr($aOpStats['mem_end']);
-				if (isset($aOpStats['mem_peak']))
-				{
-					$sMemPeak = self::MemStr($aOpStats['mem_peak']);
-				}
-			}
-
-			self::Report("<tr>");
-			self::Report("   <td>$sOperation</td><td>$sBegin</td><td>$sEnd</td><td>$sDuration</td><td>$sMemBegin</td><td>$sMemEnd</td><td>$sMemPeak</td>");
-			self::Report("</tr>");
-		}
-		self::Report("</table>");
-		self::Report("</div>");
-
-		$aConsolidatedStats = array();
-		foreach (self::$m_aStats as $sOperation => $aOpStats)
-		{
-			$fTotalOp = 0;
-			$iTotalOp = 0;
-			$fMinOp = null;
-			$fMaxOp = 0;
-			$sMaxOpArguments = null;
-			foreach ($aOpStats as $sArguments => $aEvents)
-			{
-				foreach ($aEvents as $aEventData)
-				{
-					$fDuration = $aEventData['time'];
-					$fTotalOp += $fDuration;
-					$iTotalOp++;
-
-					$fMinOp = is_null($fMinOp) ? $fDuration : min($fMinOp, $fDuration);
-					if ($fDuration > $fMaxOp)
-					{
-						$sMaxOpArguments = $sArguments;
-						$fMaxOp = $fDuration;
-					}
-				}
-			}
-			$aConsolidatedStats[$sOperation] = array(
-				'count' => $iTotalOp,
-				'duration' => $fTotalOp,
-				'min' => $fMinOp,
-				'max' => $fMaxOp,
-				'avg' => $fTotalOp / $iTotalOp,
-				'max_args' => $sMaxOpArguments
-			);
-		}
-
-		self::Report("<div>");
-		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
-		self::Report("<thead>");
-		self::Report("   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>");
-		self::Report("</thead>");
-		foreach ($aConsolidatedStats as $sOperation => $aOpStats)
-		{
-			$sOperation = '<a href="#'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
-			$sCount = $aOpStats['count'];
-			$sDuration = round($aOpStats['duration'], 3);
-			$sMin = round($aOpStats['min'], 3);
-			$sMax = '<a href="#'.md5($sExecId.$aOpStats['max_args']).'">'.round($aOpStats['max'], 3).'</a>';
-			$sAvg = round($aOpStats['avg'], 3);
-
-			self::Report("<tr>");
-			self::Report("   <td>$sOperation</td><td>$sCount</td><td>$sDuration</td><td>$sMin</td><td>$sMax</td><td>$sAvg</td>");
-			self::Report("</tr>");
-		}
-		self::Report("</table>");
-		self::Report("</div>");
-
-		self::Report("</div>");
-
-		// Report operation details
-		foreach (self::$m_aStats as $sOperation => $aOpStats)
-		{
-			$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
-			self::Report("<h4>$sOperationHtml</h4>");
-			self::Report("<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>");
-			self::Report("<table border=\"1\" style=\"$sTableStyle\">");
-			self::Report("<thead>");
-			self::Report("   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>");
-			self::Report("</thead>");
-			foreach ($aOpStats as $sArguments => $aEvents)
-			{
-				$sHtmlArguments = '<a name="'.md5($sExecId.$sArguments).'"><div style="white-space: pre-wrap;">'.$sArguments.'</div></a>';
-				if ($aConsolidatedStats[$sOperation]['max_args'] == $sArguments)
-				{
-					$sHtmlArguments = '<span style="color: red;">'.$sHtmlArguments.'</span>';
-				}
-				if (isset($aEvents[0]['callers']))
-				{
-					$sHtmlArguments .= '<div style="padding: 10px;">';
-					$sHtmlArguments .= '<table border="1" bgcolor="#cfc">';
-					$sHtmlArguments .= '<tr><td colspan="2" bgcolor="#e9b96">Call stack for the <b>FIRST</b> caller</td></tr>';
-
-					foreach ($aEvents[0]['callers'] as $aCall)
-					{
-						$sHtmlArguments .= '<tr>';
-						$sHtmlArguments .= '<td>'.$aCall['Function'].'</td>';
-						$sHtmlArguments .= '<td>'.$aCall['File'].':'.$aCall['Line'].'</td>';
-						$sHtmlArguments .= '</tr>';
-					}
-					$sHtmlArguments .= '</table>';
-					$sHtmlArguments .= '</div>';
-				}
-
-				$fTotalInter = 0;
-				$fMinInter = null;
-				$fMaxInter = 0;
-				foreach ($aEvents as $aEventData)
-				{
-					$fDuration = $aEventData['time'];
-					$fTotalInter += $fDuration;
-					$fMinInter = is_null($fMinInter) ? $fDuration : min($fMinInter, $fDuration);
-					$fMaxInter = max($fMaxInter, $fDuration);
-				}
-
-				$iCountInter = count($aEvents);
-				$sTotalInter = round($fTotalInter, 3);
-				$sMinInter = round($fMinInter, 3);
-				$sMaxInter = round($fMaxInter, 3);
-				self::Report("<tr>");
-				self::Report("   <td>$sHtmlArguments</td><td>$iCountInter</td><td>$sTotalInter</td><td>$sMinInter</td><td>$sMaxInter</td>");
-				self::Report("</tr>");
-			}
-			self::Report("</table>");
-		}
-	}
-
-
-	public function __construct()
-	{
-		$this->ResetCounters();
-	}
-
-	// Get the duration since startup, and reset the counter for the next measure
-	//
-	public function ComputeAndReport($sOperationDesc)
-	{
-		global $fItopStarted;
-
-		$aNewEntry = null;
-
-		if (self::$m_bEnabled_Duration)
-		{
-			$fStopped = MyHelpers::getmicrotime();
-			$aNewEntry = array(
-				'op' => $sOperationDesc,
-				'time_begin' => $this->m_fStarted - $fItopStarted,
-				'time_end' => $fStopped - $fItopStarted,
-			);
-			// Reset for the next operation (if the object is recycled)
-			$this->m_fStarted = $fStopped;
-		}
-
-		if (self::$m_bEnabled_Memory)
-		{
-			$iCurrentMemory = self::memory_get_usage();
-			if (is_null($aNewEntry))
-			{
-				$aNewEntry = array('op' => $sOperationDesc);
-			}
-			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
-			$aNewEntry['mem_end'] = $iCurrentMemory;
-			if (function_exists('memory_get_peak_usage'))
-			{
-				$aNewEntry['mem_peak'] = memory_get_peak_usage();
-			}
-			// Reset for the next operation (if the object is recycled)
-			$this->m_iInitialMemory = $iCurrentMemory;
-		}
-
-		if (!is_null($aNewEntry))
-		{
-			self::$m_aExecData[] = $aNewEntry;
-		}
-		$this->ResetCounters();
-	}
-
-	public function ComputeStats($sOperation, $sArguments)
-	{
-		if (self::$m_bEnabled_Duration)
-		{
-			$fStopped = MyHelpers::getmicrotime();
-			$fDuration = $fStopped - $this->m_fStarted;
-			if (self::$m_bBlameCaller)
-			{
-				self::$m_aStats[$sOperation][$sArguments][] = array(
-					'time' => $fDuration,
-					'callers' => MyHelpers::get_callstack(1),
-				);
-			}
-			else
-			{
-				self::$m_aStats[$sOperation][$sArguments][] = array(
-					'time' => $fDuration
-				);
-			}
-		}
-	}
-
-	protected function ResetCounters()
-	{
-		if (self::$m_bEnabled_Duration)
-		{
-			$this->m_fStarted = MyHelpers::getmicrotime();
-		}
-
-		if (self::$m_bEnabled_Memory)
-		{
-			$this->m_iInitialMemory = self::memory_get_usage();
-		}
-	}
-
-	const HtmlReportFile = 'log/kpi.html';
-
-	static protected function Report($sText)
-	{
-		file_put_contents(APPROOT.self::HtmlReportFile, "$sText\n", FILE_APPEND | LOCK_EX);
-	}
-
-	static protected function MemStr($iMemory)
-	{
-		return round($iMemory / 1024).' Kb';
-	}
-
-	static protected function memory_get_usage()
-	{
-		if (function_exists('memory_get_usage'))
-		{
-			return memory_get_usage(true);
-		}
-
-		// Copied from the PHP manual
-		//
-		//If its Windows
-		//Tested on Win XP Pro SP2. Should work on Win 2003 Server too
-		//Doesn't work for 2000
-		//If you need it to work for 2000 look at http://us2.php.net/manual/en/function.memory-get-usage.php#54642
-		if (substr(PHP_OS,0,3) == 'WIN') 
-		{
-			$output = array();
-			exec('tasklist /FI "PID eq ' . getmypid() . '" /FO LIST', $output);
-
-			return preg_replace( '/[\D]/', '', $output[5] ) * 1024;
-		}
-		else
-		{
-			//We now assume the OS is UNIX
-			//Tested on Mac OS X 10.4.6 and Linux Red Hat Enterprise 4
-			//This should work on most UNIX systems
-			$pid = getmypid();
-			exec("ps -eo%mem,rss,pid | grep $pid", $output);
-			$output = explode("  ", $output[0]);
-			//rss is given in 1024 byte units
-			return $output[1] * 1024;
-		}
-	}
-
-	static public function memory_get_peak_usage($bRealUsage = false)
-	{
-		if (function_exists('memory_get_peak_usage'))
-		{
-			return memory_get_peak_usage($bRealUsage);
-		}
-		// PHP > 5.2.1 - this verb depends on a compilation option
-		return 0;
-	}
-}
-
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Measures operations duration, memory usage, etc. (and some other KPIs)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class ExecutionKPI
+{
+	static protected $m_bEnabled_Duration = false;
+	static protected $m_bEnabled_Memory = false;
+	static protected $m_bBlameCaller = false;
+	static protected $m_sAllowedUser = '*';
+
+	static protected $m_aStats = array(); // Recurrent operations
+	static protected $m_aExecData = array(); // One shot operations
+
+	protected $m_fStarted = null;
+	protected $m_iInitialMemory = null;
+
+	static public function EnableDuration($iLevel)
+	{
+		if ($iLevel > 0)
+		{
+			self::$m_bEnabled_Duration = true;
+			if ($iLevel > 1)
+			{
+				self::$m_bBlameCaller = true;
+			}
+		}
+	}
+
+	static public function EnableMemory($iLevel)
+	{
+		if ($iLevel > 0)
+		{
+			self::$m_bEnabled_Memory = true;
+		}
+	}
+
+	/**
+	 * @param string sUser A user login or * for all users	
+	 */	
+	static public function SetAllowedUser($sUser)
+	{
+		self::$m_sAllowedUser = $sUser;
+	}
+
+	static public function IsEnabled()
+	{
+		if (self::$m_bEnabled_Duration || self::$m_bEnabled_Memory)
+		{
+			if ((self::$m_sAllowedUser == '*') || (UserRights::GetUser() == trim(self::$m_sAllowedUser)))
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	static public function GetDescription()
+	{
+		$aFeatures = array();
+		if (self::$m_bEnabled_Duration) $aFeatures[] = 'Duration'; 
+		if (self::$m_bEnabled_Memory)   $aFeatures[] = 'Memory usage';
+		$sFeatures = implode(', ', $aFeatures);
+		$sFor = self::$m_sAllowedUser == '*' ? 'EVERYBODY' : "'".trim(self::$m_sAllowedUser)."'";
+		return "KPI logging is active for $sFor. Measures: $sFeatures";
+	}
+
+	static public function ReportStats()
+	{
+		if (!self::IsEnabled()) return;
+
+		global $fItopStarted;
+		$sExecId = microtime(); // id to differentiate the hrefs!
+
+		$aBeginTimes = array();
+		foreach (self::$m_aExecData as $aOpStats)
+		{
+			$aBeginTimes[] = $aOpStats['time_begin'];
+		}
+		array_multisort($aBeginTimes, self::$m_aExecData);
+
+		$sTableStyle = 'background-color: #ccc; margin: 10px;';
+
+		self::Report("<hr/>");
+		self::Report("<div style=\"background-color: grey; padding: 10px;\">");
+		self::Report("<h3><a name=\"".md5($sExecId)."\">KPIs</a> - ".$_SERVER['REQUEST_URI']." (".$_SERVER['REQUEST_METHOD'].")</h3>");
+		self::Report("<p>".date('Y-m-d H:i:s', $fItopStarted)."</p>");
+		self::Report("<p>log_kpi_user_id: ".MetaModel::GetConfig()->Get('log_kpi_user_id')."</p>");
+		self::Report("<div>");
+		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
+		self::Report("<thead>");
+		self::Report("   <th>Operation</th><th>Begin</th><th>End</th><th>Duration</th><th>Memory start</th><th>Memory end</th><th>Memory peak</th>");
+		self::Report("</thead>");
+		foreach (self::$m_aExecData as $aOpStats)
+		{
+			$sOperation = $aOpStats['op'];
+			$sBegin = $sEnd = $sDuration = $sMemBegin = $sMemEnd = $sMemPeak = '?';
+		
+			$sBegin = round($aOpStats['time_begin'], 3);
+			$sEnd = round($aOpStats['time_end'], 3);
+			$fDuration = $aOpStats['time_end'] - $aOpStats['time_begin'];
+			$sDuration = round($fDuration, 3);
+
+			if (isset($aOpStats['mem_begin']))
+			{
+				$sMemBegin = self::MemStr($aOpStats['mem_begin']);
+				$sMemEnd = self::MemStr($aOpStats['mem_end']);
+				if (isset($aOpStats['mem_peak']))
+				{
+					$sMemPeak = self::MemStr($aOpStats['mem_peak']);
+				}
+			}
+
+			self::Report("<tr>");
+			self::Report("   <td>$sOperation</td><td>$sBegin</td><td>$sEnd</td><td>$sDuration</td><td>$sMemBegin</td><td>$sMemEnd</td><td>$sMemPeak</td>");
+			self::Report("</tr>");
+		}
+		self::Report("</table>");
+		self::Report("</div>");
+
+		$aConsolidatedStats = array();
+		foreach (self::$m_aStats as $sOperation => $aOpStats)
+		{
+			$fTotalOp = 0;
+			$iTotalOp = 0;
+			$fMinOp = null;
+			$fMaxOp = 0;
+			$sMaxOpArguments = null;
+			foreach ($aOpStats as $sArguments => $aEvents)
+			{
+				foreach ($aEvents as $aEventData)
+				{
+					$fDuration = $aEventData['time'];
+					$fTotalOp += $fDuration;
+					$iTotalOp++;
+
+					$fMinOp = is_null($fMinOp) ? $fDuration : min($fMinOp, $fDuration);
+					if ($fDuration > $fMaxOp)
+					{
+						$sMaxOpArguments = $sArguments;
+						$fMaxOp = $fDuration;
+					}
+				}
+			}
+			$aConsolidatedStats[$sOperation] = array(
+				'count' => $iTotalOp,
+				'duration' => $fTotalOp,
+				'min' => $fMinOp,
+				'max' => $fMaxOp,
+				'avg' => $fTotalOp / $iTotalOp,
+				'max_args' => $sMaxOpArguments
+			);
+		}
+
+		self::Report("<div>");
+		self::Report("<table border=\"1\" style=\"$sTableStyle\">");
+		self::Report("<thead>");
+		self::Report("   <th>Operation</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th><th>Avg</th>");
+		self::Report("</thead>");
+		foreach ($aConsolidatedStats as $sOperation => $aOpStats)
+		{
+			$sOperation = '<a href="#'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
+			$sCount = $aOpStats['count'];
+			$sDuration = round($aOpStats['duration'], 3);
+			$sMin = round($aOpStats['min'], 3);
+			$sMax = '<a href="#'.md5($sExecId.$aOpStats['max_args']).'">'.round($aOpStats['max'], 3).'</a>';
+			$sAvg = round($aOpStats['avg'], 3);
+
+			self::Report("<tr>");
+			self::Report("   <td>$sOperation</td><td>$sCount</td><td>$sDuration</td><td>$sMin</td><td>$sMax</td><td>$sAvg</td>");
+			self::Report("</tr>");
+		}
+		self::Report("</table>");
+		self::Report("</div>");
+
+		self::Report("</div>");
+
+		// Report operation details
+		foreach (self::$m_aStats as $sOperation => $aOpStats)
+		{
+			$sOperationHtml = '<a name="'.md5($sExecId.$sOperation).'">'.$sOperation.'</a>';
+			self::Report("<h4>$sOperationHtml</h4>");
+			self::Report("<p><a href=\"#".md5($sExecId)."\">Back to page stats</a></p>");
+			self::Report("<table border=\"1\" style=\"$sTableStyle\">");
+			self::Report("<thead>");
+			self::Report("   <th>Operation details (+ blame caller if log_kpi_duration = 2)</th><th>Count</th><th>Duration</th><th>Min</th><th>Max</th>");
+			self::Report("</thead>");
+			foreach ($aOpStats as $sArguments => $aEvents)
+			{
+				$sHtmlArguments = '<a name="'.md5($sExecId.$sArguments).'"><div style="white-space: pre-wrap;">'.$sArguments.'</div></a>';
+				if ($aConsolidatedStats[$sOperation]['max_args'] == $sArguments)
+				{
+					$sHtmlArguments = '<span style="color: red;">'.$sHtmlArguments.'</span>';
+				}
+				if (isset($aEvents[0]['callers']))
+				{
+					$sHtmlArguments .= '<div style="padding: 10px;">';
+					$sHtmlArguments .= '<table border="1" bgcolor="#cfc">';
+					$sHtmlArguments .= '<tr><td colspan="2" bgcolor="#e9b96">Call stack for the <b>FIRST</b> caller</td></tr>';
+
+					foreach ($aEvents[0]['callers'] as $aCall)
+					{
+						$sHtmlArguments .= '<tr>';
+						$sHtmlArguments .= '<td>'.$aCall['Function'].'</td>';
+						$sHtmlArguments .= '<td>'.$aCall['File'].':'.$aCall['Line'].'</td>';
+						$sHtmlArguments .= '</tr>';
+					}
+					$sHtmlArguments .= '</table>';
+					$sHtmlArguments .= '</div>';
+				}
+
+				$fTotalInter = 0;
+				$fMinInter = null;
+				$fMaxInter = 0;
+				foreach ($aEvents as $aEventData)
+				{
+					$fDuration = $aEventData['time'];
+					$fTotalInter += $fDuration;
+					$fMinInter = is_null($fMinInter) ? $fDuration : min($fMinInter, $fDuration);
+					$fMaxInter = max($fMaxInter, $fDuration);
+				}
+
+				$iCountInter = count($aEvents);
+				$sTotalInter = round($fTotalInter, 3);
+				$sMinInter = round($fMinInter, 3);
+				$sMaxInter = round($fMaxInter, 3);
+				self::Report("<tr>");
+				self::Report("   <td>$sHtmlArguments</td><td>$iCountInter</td><td>$sTotalInter</td><td>$sMinInter</td><td>$sMaxInter</td>");
+				self::Report("</tr>");
+			}
+			self::Report("</table>");
+		}
+	}
+
+
+	public function __construct()
+	{
+		$this->ResetCounters();
+	}
+
+	// Get the duration since startup, and reset the counter for the next measure
+	//
+	public function ComputeAndReport($sOperationDesc)
+	{
+		global $fItopStarted;
+
+		$aNewEntry = null;
+
+		if (self::$m_bEnabled_Duration)
+		{
+			$fStopped = MyHelpers::getmicrotime();
+			$aNewEntry = array(
+				'op' => $sOperationDesc,
+				'time_begin' => $this->m_fStarted - $fItopStarted,
+				'time_end' => $fStopped - $fItopStarted,
+			);
+			// Reset for the next operation (if the object is recycled)
+			$this->m_fStarted = $fStopped;
+		}
+
+		if (self::$m_bEnabled_Memory)
+		{
+			$iCurrentMemory = self::memory_get_usage();
+			if (is_null($aNewEntry))
+			{
+				$aNewEntry = array('op' => $sOperationDesc);
+			}
+			$aNewEntry['mem_begin'] = $this->m_iInitialMemory;
+			$aNewEntry['mem_end'] = $iCurrentMemory;
+			if (function_exists('memory_get_peak_usage'))
+			{
+				$aNewEntry['mem_peak'] = memory_get_peak_usage();
+			}
+			// Reset for the next operation (if the object is recycled)
+			$this->m_iInitialMemory = $iCurrentMemory;
+		}
+
+		if (!is_null($aNewEntry))
+		{
+			self::$m_aExecData[] = $aNewEntry;
+		}
+		$this->ResetCounters();
+	}
+
+	public function ComputeStats($sOperation, $sArguments)
+	{
+		if (self::$m_bEnabled_Duration)
+		{
+			$fStopped = MyHelpers::getmicrotime();
+			$fDuration = $fStopped - $this->m_fStarted;
+			if (self::$m_bBlameCaller)
+			{
+				self::$m_aStats[$sOperation][$sArguments][] = array(
+					'time' => $fDuration,
+					'callers' => MyHelpers::get_callstack(1),
+				);
+			}
+			else
+			{
+				self::$m_aStats[$sOperation][$sArguments][] = array(
+					'time' => $fDuration
+				);
+			}
+		}
+	}
+
+	protected function ResetCounters()
+	{
+		if (self::$m_bEnabled_Duration)
+		{
+			$this->m_fStarted = MyHelpers::getmicrotime();
+		}
+
+		if (self::$m_bEnabled_Memory)
+		{
+			$this->m_iInitialMemory = self::memory_get_usage();
+		}
+	}
+
+	const HtmlReportFile = 'log/kpi.html';
+
+	static protected function Report($sText)
+	{
+		file_put_contents(APPROOT.self::HtmlReportFile, "$sText\n", FILE_APPEND | LOCK_EX);
+	}
+
+	static protected function MemStr($iMemory)
+	{
+		return round($iMemory / 1024).' Kb';
+	}
+
+	static protected function memory_get_usage()
+	{
+		if (function_exists('memory_get_usage'))
+		{
+			return memory_get_usage(true);
+		}
+
+		// Copied from the PHP manual
+		//
+		//If its Windows
+		//Tested on Win XP Pro SP2. Should work on Win 2003 Server too
+		//Doesn't work for 2000
+		//If you need it to work for 2000 look at http://us2.php.net/manual/en/function.memory-get-usage.php#54642
+		if (substr(PHP_OS,0,3) == 'WIN') 
+		{
+			$output = array();
+			exec('tasklist /FI "PID eq ' . getmypid() . '" /FO LIST', $output);
+
+			return preg_replace( '/[\D]/', '', $output[5] ) * 1024;
+		}
+		else
+		{
+			//We now assume the OS is UNIX
+			//Tested on Mac OS X 10.4.6 and Linux Red Hat Enterprise 4
+			//This should work on most UNIX systems
+			$pid = getmypid();
+			exec("ps -eo%mem,rss,pid | grep $pid", $output);
+			$output = explode("  ", $output[0]);
+			//rss is given in 1024 byte units
+			return $output[1] * 1024;
+		}
+	}
+
+	static public function memory_get_peak_usage($bRealUsage = false)
+	{
+		if (function_exists('memory_get_peak_usage'))
+		{
+			return memory_get_peak_usage($bRealUsage);
+		}
+		// PHP > 5.2.1 - this verb depends on a compilation option
+		return 0;
+	}
+}
+
diff --git a/core/metamodelmodifier.inc.php b/core/metamodelmodifier.inc.php
index f1da6b207..008eabcf2 100644
--- a/core/metamodelmodifier.inc.php
+++ b/core/metamodelmodifier.inc.php
@@ -1,32 +1,32 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Any extension to hook the initialization of the metamodel 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-interface iOnClassInitialization
-{
-	public function OnAfterClassInitialization($sClass);
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Any extension to hook the initialization of the metamodel 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+interface iOnClassInitialization
+{
+	public function OnAfterClassInitialization($sClass);
+}
+
+?>
diff --git a/core/modelreflection.class.inc.php b/core/modelreflection.class.inc.php
index cb7885d4b..c88352d8d 100644
--- a/core/modelreflection.class.inc.php
+++ b/core/modelreflection.class.inc.php
@@ -1,288 +1,288 @@
-<?php
-// Copyright (C) 2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Reflection API for the MetaModel (partial) 
- *
- * @copyright   Copyright (C) 2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Exclude the parent class from the list
- *
- * @package     iTopORM
- */
-define('ENUM_CHILD_CLASSES_EXCLUDETOP', 1);
-/**
- * Include the parent class in the list
- *
- * @package     iTopORM
-*/
-define('ENUM_CHILD_CLASSES_ALL', 2);
-
-
-abstract class ModelReflection
-{
-	abstract public function GetClassIcon($sClass, $bImgTag = true); 
-	abstract public function IsValidAttCode($sClass, $sAttCode);
-	abstract public function GetName($sClass);
-	abstract public function GetLabel($sClass, $sAttCodeEx);
-	abstract public function GetValueLabel($sClass, $sAttCode, $sValue);
-	abstract public function ListAttributes($sClass, $sScope = null);
-	abstract public function GetAttributeProperty($sClass, $sAttCode, $sPropName, $default = null);
-	abstract public function GetAllowedValues_att($sClass, $sAttCode);
-	abstract public function HasChildrenClasses($sClass);
-	abstract public function GetClasses($sCategories = '', $bExcludeLinks = false);
-	abstract public function IsValidClass($sClass);
-	abstract public function IsSameFamilyBranch($sClassA, $sClassB);
-	abstract public function GetParentClass($sClass);
-	abstract public function GetFiltersList($sClass);
-	abstract public function IsValidFilterCode($sClass, $sFilterCode);
-
-	abstract public function GetQuery($sOQL);
-
-	abstract public function DictString($sStringCode, $sDefault = null, $bUserLanguageOnly = false);
-
-	public function DictFormat($sFormatCode /*, ... arguments ....*/)
-	{
-		$sLocalizedFormat = $this->DictString($sFormatCode);
-		$aArguments = func_get_args();
-		array_shift($aArguments);
-		
-		if ($sLocalizedFormat == $sFormatCode)
-		{
-			// Make sure the information will be displayed (ex: an error occuring before the dictionary gets loaded)
-			return $sFormatCode.' - '.implode(', ', $aArguments);
-		}
-
-		return vsprintf($sLocalizedFormat, $aArguments);
-	}
-
-	abstract public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '');
-	
-	abstract public function GetRootClass($sClass);
-	abstract public function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP);
-}
-
-abstract class QueryReflection
-{
-	/**
-	 * Throws an exception in case of an invalid syntax
-	 */
-	abstract public function __construct($sOQL, ModelReflection $oModelReflection);
-
-	abstract public function GetClass();
-	abstract public function GetClassAlias();
-}
-
-
-class ModelReflectionRuntime extends ModelReflection
-{
-	public function __construct()
-	{
-	}
-
-	public function GetClassIcon($sClass, $bImgTag = true)
-	{
-		return MetaModel::GetClassIcon($sClass, $bImgTag);
-	}
- 
-	public function IsValidAttCode($sClass, $sAttCode)
-	{
-		return MetaModel::IsValidAttCode($sClass, $sAttCode);
-	}
- 
-	public function GetName($sClass)
-	{
-		return MetaModel::GetName($sClass);
-	}
- 
-	public function GetLabel($sClass, $sAttCodeEx)
-	{
-		return MetaModel::GetLabel($sClass, $sAttCodeEx);
-	}
- 
-	public function GetValueLabel($sClass, $sAttCode, $sValue)
-	{
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		return $oAttDef->GetValueLabel($sValue);
-	}
-
-	public function ListAttributes($sClass, $sScope = null)
-	{
-		$aScope = null;
-		if ($sScope != null)
-		{
-			$aScope = array();
-			foreach (explode(',', $sScope) as $sScopeClass)
-			{
-				$aScope[] = trim($sScopeClass);
-			}
-		}
-		$aAttributes = array();
-		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-		{
-			$sAttributeClass = get_class($oAttDef);
-			if ($aScope != null)
-			{
-				foreach ($aScope as $sScopeClass)
-				{
-					if (($sAttributeClass == $sScopeClass) || is_subclass_of($sAttributeClass, $sScopeClass))
-					{
-						$aAttributes[$sAttCode] = $sAttributeClass;
-						break;
-					}
-				}
-			}
-			else
-			{
-				$aAttributes[$sAttCode] = $sAttributeClass;
-			}
-		}
-		return $aAttributes;
-	}
- 
-	public function GetAttributeProperty($sClass, $sAttCode, $sPropName, $default = null)
-	{
-		$ret = $default;
-
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		$aParams = $oAttDef->GetParams();
-		if (array_key_exists($sPropName, $aParams))
-		{
-			$ret = $aParams[$sPropName];
-		}
-
-		if ($oAttDef instanceof AttributeHierarchicalKey)
-		{
-			if ($sPropName == 'targetclass')
-			{
-				$ret = $sClass;
-			}
-		}
-		return $ret;
-	}
-
-	public function GetAllowedValues_att($sClass, $sAttCode)
-	{
-		return MetaModel::GetAllowedValues_att($sClass, $sAttCode);
-	}
- 
-	public function HasChildrenClasses($sClass)
-	{
-		return MetaModel::HasChildrenClasses($sClass);
-	}
- 
-	public function GetClasses($sCategories = '', $bExcludeLinks = false)
-	{
-		$aClasses = MetaModel::GetClasses($sCategories);
-		if ($bExcludeLinks)
-		{
-			$aExcluded = MetaModel::GetLinkClasses();
-			$aRes = array();
-			foreach ($aClasses as $sClass)
-			{
-				if (!array_key_exists($sClass, $aExcluded))
-				{
-					$aRes[] = $sClass;
-				}
-			}
-		}
-		else
-		{
-			$aRes = $aClasses;
-		}
-		return $aRes;
-	}
-
-	public function IsValidClass($sClass)
-	{
-		return MetaModel::IsValidClass($sClass);
-	}
-
-	public function IsSameFamilyBranch($sClassA, $sClassB)
-	{
-		return MetaModel::IsSameFamilyBranch($sClassA, $sClassB);
-	}
-
-	public function GetParentClass($sClass)
-	{
-		return MetaModel::GetParentClass($sClass);
-	}
-
-	public function GetFiltersList($sClass)
-	{
-		return MetaModel::GetFiltersList($sClass);
-	}
-
-	public function IsValidFilterCode($sClass, $sFilterCode)
-	{
-		return MetaModel::IsValidFilterCode($sClass, $sFilterCode);
-	}
-
-	public function GetQuery($sOQL)
-	{
-		return new QueryReflectionRuntime($sOQL, $this);
-	}
-
-	public function DictString($sStringCode, $sDefault = null, $bUserLanguageOnly = false)
-	{
-		return Dict::S($sStringCode, $sDefault, $bUserLanguageOnly);
-	}
-
-	public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '')
-	{
-		return new RunTimeIconSelectionField($sCode, $sLabel, $defaultValue);
-	}
-	
-	public function GetRootClass($sClass)
-	{
-		return MetaModel::GetRootClass($sClass);
-	}
-	
-	public function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP)
-	{
-		return MetaModel::EnumChildClasses($sClass, $iOption);
-	}
-}
-
-
-class QueryReflectionRuntime extends QueryReflection
-{
-	protected $oFilter;
-
-	/**
-	 *	throws an exception in case of a wrong syntax
-	 */
-	public function __construct($sOQL, ModelReflection $oModelReflection)
-	{
-		$this->oFilter = DBObjectSearch::FromOQL($sOQL);
-	}
-
-	public function GetClass()
-	{
-		return $this->oFilter->GetClass();
-	}
-
-	public function GetClassAlias()
-	{
-		return $this->oFilter->GetClassAlias();
-	}
-}
+<?php
+// Copyright (C) 2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Reflection API for the MetaModel (partial) 
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Exclude the parent class from the list
+ *
+ * @package     iTopORM
+ */
+define('ENUM_CHILD_CLASSES_EXCLUDETOP', 1);
+/**
+ * Include the parent class in the list
+ *
+ * @package     iTopORM
+*/
+define('ENUM_CHILD_CLASSES_ALL', 2);
+
+
+abstract class ModelReflection
+{
+	abstract public function GetClassIcon($sClass, $bImgTag = true); 
+	abstract public function IsValidAttCode($sClass, $sAttCode);
+	abstract public function GetName($sClass);
+	abstract public function GetLabel($sClass, $sAttCodeEx);
+	abstract public function GetValueLabel($sClass, $sAttCode, $sValue);
+	abstract public function ListAttributes($sClass, $sScope = null);
+	abstract public function GetAttributeProperty($sClass, $sAttCode, $sPropName, $default = null);
+	abstract public function GetAllowedValues_att($sClass, $sAttCode);
+	abstract public function HasChildrenClasses($sClass);
+	abstract public function GetClasses($sCategories = '', $bExcludeLinks = false);
+	abstract public function IsValidClass($sClass);
+	abstract public function IsSameFamilyBranch($sClassA, $sClassB);
+	abstract public function GetParentClass($sClass);
+	abstract public function GetFiltersList($sClass);
+	abstract public function IsValidFilterCode($sClass, $sFilterCode);
+
+	abstract public function GetQuery($sOQL);
+
+	abstract public function DictString($sStringCode, $sDefault = null, $bUserLanguageOnly = false);
+
+	public function DictFormat($sFormatCode /*, ... arguments ....*/)
+	{
+		$sLocalizedFormat = $this->DictString($sFormatCode);
+		$aArguments = func_get_args();
+		array_shift($aArguments);
+		
+		if ($sLocalizedFormat == $sFormatCode)
+		{
+			// Make sure the information will be displayed (ex: an error occuring before the dictionary gets loaded)
+			return $sFormatCode.' - '.implode(', ', $aArguments);
+		}
+
+		return vsprintf($sLocalizedFormat, $aArguments);
+	}
+
+	abstract public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '');
+	
+	abstract public function GetRootClass($sClass);
+	abstract public function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP);
+}
+
+abstract class QueryReflection
+{
+	/**
+	 * Throws an exception in case of an invalid syntax
+	 */
+	abstract public function __construct($sOQL, ModelReflection $oModelReflection);
+
+	abstract public function GetClass();
+	abstract public function GetClassAlias();
+}
+
+
+class ModelReflectionRuntime extends ModelReflection
+{
+	public function __construct()
+	{
+	}
+
+	public function GetClassIcon($sClass, $bImgTag = true)
+	{
+		return MetaModel::GetClassIcon($sClass, $bImgTag);
+	}
+ 
+	public function IsValidAttCode($sClass, $sAttCode)
+	{
+		return MetaModel::IsValidAttCode($sClass, $sAttCode);
+	}
+ 
+	public function GetName($sClass)
+	{
+		return MetaModel::GetName($sClass);
+	}
+ 
+	public function GetLabel($sClass, $sAttCodeEx)
+	{
+		return MetaModel::GetLabel($sClass, $sAttCodeEx);
+	}
+ 
+	public function GetValueLabel($sClass, $sAttCode, $sValue)
+	{
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		return $oAttDef->GetValueLabel($sValue);
+	}
+
+	public function ListAttributes($sClass, $sScope = null)
+	{
+		$aScope = null;
+		if ($sScope != null)
+		{
+			$aScope = array();
+			foreach (explode(',', $sScope) as $sScopeClass)
+			{
+				$aScope[] = trim($sScopeClass);
+			}
+		}
+		$aAttributes = array();
+		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+		{
+			$sAttributeClass = get_class($oAttDef);
+			if ($aScope != null)
+			{
+				foreach ($aScope as $sScopeClass)
+				{
+					if (($sAttributeClass == $sScopeClass) || is_subclass_of($sAttributeClass, $sScopeClass))
+					{
+						$aAttributes[$sAttCode] = $sAttributeClass;
+						break;
+					}
+				}
+			}
+			else
+			{
+				$aAttributes[$sAttCode] = $sAttributeClass;
+			}
+		}
+		return $aAttributes;
+	}
+ 
+	public function GetAttributeProperty($sClass, $sAttCode, $sPropName, $default = null)
+	{
+		$ret = $default;
+
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		$aParams = $oAttDef->GetParams();
+		if (array_key_exists($sPropName, $aParams))
+		{
+			$ret = $aParams[$sPropName];
+		}
+
+		if ($oAttDef instanceof AttributeHierarchicalKey)
+		{
+			if ($sPropName == 'targetclass')
+			{
+				$ret = $sClass;
+			}
+		}
+		return $ret;
+	}
+
+	public function GetAllowedValues_att($sClass, $sAttCode)
+	{
+		return MetaModel::GetAllowedValues_att($sClass, $sAttCode);
+	}
+ 
+	public function HasChildrenClasses($sClass)
+	{
+		return MetaModel::HasChildrenClasses($sClass);
+	}
+ 
+	public function GetClasses($sCategories = '', $bExcludeLinks = false)
+	{
+		$aClasses = MetaModel::GetClasses($sCategories);
+		if ($bExcludeLinks)
+		{
+			$aExcluded = MetaModel::GetLinkClasses();
+			$aRes = array();
+			foreach ($aClasses as $sClass)
+			{
+				if (!array_key_exists($sClass, $aExcluded))
+				{
+					$aRes[] = $sClass;
+				}
+			}
+		}
+		else
+		{
+			$aRes = $aClasses;
+		}
+		return $aRes;
+	}
+
+	public function IsValidClass($sClass)
+	{
+		return MetaModel::IsValidClass($sClass);
+	}
+
+	public function IsSameFamilyBranch($sClassA, $sClassB)
+	{
+		return MetaModel::IsSameFamilyBranch($sClassA, $sClassB);
+	}
+
+	public function GetParentClass($sClass)
+	{
+		return MetaModel::GetParentClass($sClass);
+	}
+
+	public function GetFiltersList($sClass)
+	{
+		return MetaModel::GetFiltersList($sClass);
+	}
+
+	public function IsValidFilterCode($sClass, $sFilterCode)
+	{
+		return MetaModel::IsValidFilterCode($sClass, $sFilterCode);
+	}
+
+	public function GetQuery($sOQL)
+	{
+		return new QueryReflectionRuntime($sOQL, $this);
+	}
+
+	public function DictString($sStringCode, $sDefault = null, $bUserLanguageOnly = false)
+	{
+		return Dict::S($sStringCode, $sDefault, $bUserLanguageOnly);
+	}
+
+	public function GetIconSelectionField($sCode, $sLabel = '', $defaultValue = '')
+	{
+		return new RunTimeIconSelectionField($sCode, $sLabel, $defaultValue);
+	}
+	
+	public function GetRootClass($sClass)
+	{
+		return MetaModel::GetRootClass($sClass);
+	}
+	
+	public function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP)
+	{
+		return MetaModel::EnumChildClasses($sClass, $iOption);
+	}
+}
+
+
+class QueryReflectionRuntime extends QueryReflection
+{
+	protected $oFilter;
+
+	/**
+	 *	throws an exception in case of a wrong syntax
+	 */
+	public function __construct($sOQL, ModelReflection $oModelReflection)
+	{
+		$this->oFilter = DBObjectSearch::FromOQL($sOQL);
+	}
+
+	public function GetClass()
+	{
+		return $this->oFilter->GetClass();
+	}
+
+	public function GetClassAlias()
+	{
+		return $this->oFilter->GetClassAlias();
+	}
+}
diff --git a/core/moduledesign.class.inc.php b/core/moduledesign.class.inc.php
index 5da0a6274..6aff020d9 100644
--- a/core/moduledesign.class.inc.php
+++ b/core/moduledesign.class.inc.php
@@ -1,119 +1,119 @@
-<?php
-// Copyright (C) 2015-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Module specific customizations:
- * The customizations are done in XML, within a module_design section (itop_design/module_designs/module_design)
- * The module reads the cusomtizations by the mean of the ModuleDesign API
- * @package Core
- */
-
-require_once(APPROOT.'application/utils.inc.php');
-require_once(APPROOT.'core/designdocument.class.inc.php');
-
-
-/**
- * Class ModuleDesign
- *
- * Usage from within a module:
- *
- * // Fetch the design
- * $oDesign = new ModuleDesign('tagada');
- *
- * // Read data from the root node
- * $oRoot = $oDesign->documentElement;
- * $oProperties = $oRoot->GetUniqueElement('properties');
- * $prop1 = $oProperties->GetChildText('property1');
- * $prop2 = $oProperties->GetChildText('property2');
- *
- * // Read data by searching the entire DOM
- * foreach ($oDesign->GetNodes('/module_design/bricks/brick') as $oBrickNode)
- * {
- *   $sId = $oBrickNode->getAttribute('id');
- *   $sType = $oBrickNode->getAttribute('xsi:type');
- * }
- *
- * // Search starting a given node
- * $oBricks = $oDesign->documentElement->GetUniqueElement('bricks');
- * foreach ($oBricks->GetNodes('brick') as $oBrickNode)
- * {
- *   ...
- * }
- */
-class ModuleDesign extends \Combodo\iTop\DesignDocument
-{
-	/**
-	 * @param string|null $sDesignSourceId Identifier of the section module_design (generally a module name), null to build an empty design
-	 * @throws Exception
-	 */
-	public function __construct($sDesignSourceId = null)
-	{
-		parent::__construct();
-
-		if (!is_null($sDesignSourceId))
-		{
-			$this->LoadFromCompiledDesigns($sDesignSourceId);
-		}
-	}
-
-	/**
-	 * Gets the data where the compiler has left them...
-	 * @param $sDesignSourceId String Identifier of the section module_design (generally a module name)
-	 * @throws Exception
-	 */
-	protected function LoadFromCompiledDesigns($sDesignSourceId)
-	{
-		$sDesignDir = APPROOT.'env-'.utils::GetCurrentEnvironment().'/core/module_designs/';
-		$sFile = $sDesignDir.$sDesignSourceId.'.xml';
-		if (!file_exists($sFile))
-		{
-			$aFiles = glob($sDesignDir.'/*.xml');
-			if (count($aFiles) == 0)
-			{
-				$sAvailable = 'none!';
-			}
-			else
-			{
-			    $aAvailable = array();
-				foreach ($aFiles as $sFile)
-				{
-					$aAvailable[] = "'".basename($sFile, '.xml')."'";
-				}
-				$sAvailable = implode(', ', $aAvailable);
-			}
-			throw new Exception("Could not load module design '$sDesignSourceId'. Available designs: $sAvailable");
-		}
-
-		// Silently keep track of errors
-		libxml_use_internal_errors(true);
-		libxml_clear_errors();
-		$this->load($sFile);
-		//$bValidated = $oDocument->schemaValidate(APPROOT.'setup/itop_design.xsd');
-		$aErrors = libxml_get_errors();
-		if (count($aErrors) > 0)
-		{
-			$aDisplayErrors = array();
-			foreach($aErrors as $oXmlError)
-			{
-				$aDisplayErrors[] = 'Line '.$oXmlError->line.': '.$oXmlError->message;
-			}
-
-			throw new Exception("Invalid XML in '$sFile'. Errors: ".implode(', ', $aDisplayErrors));
-		}
-	}
-}
+<?php
+// Copyright (C) 2015-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Module specific customizations:
+ * The customizations are done in XML, within a module_design section (itop_design/module_designs/module_design)
+ * The module reads the cusomtizations by the mean of the ModuleDesign API
+ * @package Core
+ */
+
+require_once(APPROOT.'application/utils.inc.php');
+require_once(APPROOT.'core/designdocument.class.inc.php');
+
+
+/**
+ * Class ModuleDesign
+ *
+ * Usage from within a module:
+ *
+ * // Fetch the design
+ * $oDesign = new ModuleDesign('tagada');
+ *
+ * // Read data from the root node
+ * $oRoot = $oDesign->documentElement;
+ * $oProperties = $oRoot->GetUniqueElement('properties');
+ * $prop1 = $oProperties->GetChildText('property1');
+ * $prop2 = $oProperties->GetChildText('property2');
+ *
+ * // Read data by searching the entire DOM
+ * foreach ($oDesign->GetNodes('/module_design/bricks/brick') as $oBrickNode)
+ * {
+ *   $sId = $oBrickNode->getAttribute('id');
+ *   $sType = $oBrickNode->getAttribute('xsi:type');
+ * }
+ *
+ * // Search starting a given node
+ * $oBricks = $oDesign->documentElement->GetUniqueElement('bricks');
+ * foreach ($oBricks->GetNodes('brick') as $oBrickNode)
+ * {
+ *   ...
+ * }
+ */
+class ModuleDesign extends \Combodo\iTop\DesignDocument
+{
+	/**
+	 * @param string|null $sDesignSourceId Identifier of the section module_design (generally a module name), null to build an empty design
+	 * @throws Exception
+	 */
+	public function __construct($sDesignSourceId = null)
+	{
+		parent::__construct();
+
+		if (!is_null($sDesignSourceId))
+		{
+			$this->LoadFromCompiledDesigns($sDesignSourceId);
+		}
+	}
+
+	/**
+	 * Gets the data where the compiler has left them...
+	 * @param $sDesignSourceId String Identifier of the section module_design (generally a module name)
+	 * @throws Exception
+	 */
+	protected function LoadFromCompiledDesigns($sDesignSourceId)
+	{
+		$sDesignDir = APPROOT.'env-'.utils::GetCurrentEnvironment().'/core/module_designs/';
+		$sFile = $sDesignDir.$sDesignSourceId.'.xml';
+		if (!file_exists($sFile))
+		{
+			$aFiles = glob($sDesignDir.'/*.xml');
+			if (count($aFiles) == 0)
+			{
+				$sAvailable = 'none!';
+			}
+			else
+			{
+			    $aAvailable = array();
+				foreach ($aFiles as $sFile)
+				{
+					$aAvailable[] = "'".basename($sFile, '.xml')."'";
+				}
+				$sAvailable = implode(', ', $aAvailable);
+			}
+			throw new Exception("Could not load module design '$sDesignSourceId'. Available designs: $sAvailable");
+		}
+
+		// Silently keep track of errors
+		libxml_use_internal_errors(true);
+		libxml_clear_errors();
+		$this->load($sFile);
+		//$bValidated = $oDocument->schemaValidate(APPROOT.'setup/itop_design.xsd');
+		$aErrors = libxml_get_errors();
+		if (count($aErrors) > 0)
+		{
+			$aDisplayErrors = array();
+			foreach($aErrors as $oXmlError)
+			{
+				$aDisplayErrors[] = 'Line '.$oXmlError->line.': '.$oXmlError->message;
+			}
+
+			throw new Exception("Invalid XML in '$sFile'. Errors: ".implode(', ', $aDisplayErrors));
+		}
+	}
+}
diff --git a/core/modulehandler.class.inc.php b/core/modulehandler.class.inc.php
index 154bfc04b..4ac3c1094 100644
--- a/core/modulehandler.class.inc.php
+++ b/core/modulehandler.class.inc.php
@@ -1,38 +1,38 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Class ModuleHandler
- * Defines the API to implement module specific actions during page execution 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-abstract class ModuleHandlerAPI
-{
-	public static function OnMetaModelStarted()
-	{
-	}
-
-	public static function OnMenuCreation()
-	{
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Class ModuleHandler
+ * Defines the API to implement module specific actions during page execution 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+abstract class ModuleHandlerAPI
+{
+	public static function OnMetaModelStarted()
+	{
+	}
+
+	public static function OnMenuCreation()
+	{
+	}
+}
+?>
diff --git a/core/oql/build/build.cmd b/core/oql/build/build.cmd
index 9edd6d3d4..dea9c8781 100644
--- a/core/oql/build/build.cmd
+++ b/core/oql/build/build.cmd
@@ -1,6 +1,6 @@
-rem must be run with current directory = the directory of the batch
-rem PEAR is required to build
-php -d include_path=".;C:\iTop\PHP\PEAR" ".\PHP\LexerGenerator\cli.php" ..\oql-lexer.plex
-php ".\PHP\ParserGenerator\cli.php" ..\oql-parser.y
-php -r "echo date('Y-m-d');" > ..\version.txt
+rem must be run with current directory = the directory of the batch
+rem PEAR is required to build
+php -d include_path=".;C:\iTop\PHP\PEAR" ".\PHP\LexerGenerator\cli.php" ..\oql-lexer.plex
+php ".\PHP\ParserGenerator\cli.php" ..\oql-parser.y
+php -r "echo date('Y-m-d');" > ..\version.txt
 pause
\ No newline at end of file
diff --git a/core/oql/oql-lexer.plex b/core/oql/oql-lexer.plex
index fc0101b42..ebd811a2f 100644
--- a/core/oql/oql-lexer.plex
+++ b/core/oql/oql-lexer.plex
@@ -1,444 +1,444 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * OQL syntax analyzer, to be used prior to run the lexical analyzer
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Notes (from the source file: oql-lexer.plex) - Romain
-//
-// The strval rule is a little bit cryptic.
-// This is due to both a bug in the lexer generator and the complexity of our need
-// The rule means: either a quoted string with ", or a quoted string with '
-//                 literal " (resp. ') must be escaped by a \
-//                 \ must be escaped by an additional \
-// 
-// Here are the issues and limitation found in the lexer generator:
-// * Matching simple quotes is an issue, because regexp are not correctly escaped (and the ESC code is escaped itself)
-//    Workaround: insert '.chr(39).' which will be a real ' in the end
-// * Matching an alternate regexp is an issue because you must specify  "|^...."
-//   and the regexp parser will not accept that syntax
-//    Workaround: insert '.chr(94).' which will be a real ^
-//
-// Let's analyze an overview of the regexp, we have
-// 1) The strval rule in the lexer definition
-//     /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/
-// 2) Becomes the php expression in the lexer
-//    (note the escaped double quotes, hopefully having no effect, but showing where the issue is!)
-//     $myRegexp = '/^\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/';
-//
-// To be fixed in LexerGenerator/Parser.y, in doLongestMatch (doFirstMatch is ok)
-//
-//
-// Now, let's explain how the regexp has been designed.
-// Here is a simplified version, dealing with simple quotes, and based on the assumption that the lexer generator has been fixed!
-// The strval rule in the lexer definition
-//     /'([^\\']*(\\')*(\\\\)*)*'/
-// This means anything containing \\ or \' or any other char but a standalone ' or \
-// This means ' or \ could not be found without a preceding \
-//
-class OQLLexerRaw
-{
-    protected $data;  // input string
-    public $token;  // token id
-    public $value;  // token string representation
-    protected $line;  // current line
-    protected $count; // current column
-
-    function __construct($data)
-    {
-        $this->data  = $data;
-        $this->count = 0;
-        $this->line  = 1;
-    }
-
-/*!lex2php
-%input   $this->data
-%counter $this->count
-%token   $this->token
-%value   $this->value
-%line    $this->line
-%matchlongest 1
-whitespace = /[ \t\n\r]+/
-union      = "UNION"
-select     = "SELECT"
-from       = "FROM"
-as_alias   = "AS"
-where	     = "WHERE"
-join	     = "JOIN"
-on	        = "ON"
-coma       = ","
-par_open   = "("
-par_close  = ")"
-math_div   = "/"
-math_mult  = "*"
-math_plus  = "+"
-math_minus = "-"
-log_and    = "AND"
-log_or     = "OR"
-bitwise_and    = "&"
-bitwise_or     = "|"
-bitwise_xor     = "^"
-bitwise_leftshift     = "<<"
-bitwise_rightshift     = ">>"
-regexp     = "REGEXP"
-eq         = "="
-not_eq     = "!="
-gt         = ">"
-lt         = "<"
-ge         = ">="
-le         = "<="
-like       = "LIKE"
-not_like   = "NOT LIKE"
-in         = "IN"
-not_in     = "NOT IN"
-interval   = "INTERVAL"
-f_if       = "IF"
-f_elt      = "ELT"
-f_coalesce = "COALESCE"
-f_isnull   = "ISNULL"
-f_concat   = "CONCAT"
-f_substr   = "SUBSTR"
-f_trim     = "TRIM"
-f_date     = "DATE"
-f_date_format = "DATE_FORMAT"
-f_current_date = "CURRENT_DATE"
-f_now      = "NOW"
-f_time     = "TIME"
-f_to_days   = "TO_DAYS"
-f_from_days = "FROM_DAYS"
-f_year     = "YEAR"
-f_month    = "MONTH"
-f_day      = "DAY"
-f_hour     = "HOUR"
-f_minute   = "MINUTE"
-f_second   = "SECOND"
-f_date_add = "DATE_ADD"
-f_date_sub = "DATE_SUB"
-f_round    = "ROUND"
-f_floor    = "FLOOR"
-f_inet_aton = "INET_ATON"
-f_inet_ntoa = "INET_NTOA"
-below            = "BELOW"
-below_strict     = "BELOW STRICT"
-not_below        = "NOT BELOW"
-not_below_strict = "NOT BELOW STRICT"
-above            = "ABOVE"
-above_strict     = "ABOVE STRICT"
-not_above        = "NOT ABOVE"
-not_above_strict = "NOT ABOVE STRICT"
-//
-// WARNING: there seems to be a bug in the Lexer about matching the longest pattern
-//          when there are alternates in the regexp.
-//
-// For instance:
-// numval     = /[0-9]+|0x[0-9a-fA-F]+/
-// Does not work: SELECT Toto WHERE name = 'Text0xCTest' => Fails because 0xC is recongnized as a numval (inside the string) instead of a strval !!
-//
-// Inserting a ^ after the alternate (see comment at the top of this file) does not work either
-// numval     = /[0-9]+|'.chr(94).'0x[0-9a-fA-F]+/
-// SELECT Toto WHERE name = 'Text0xCTest' => works but
-// SELECT Toto WHERE id = 0xC => does not work, 'xC' is found as a name (apparently 0 is recognized as a numval and the remaining is a name !)
-//
-// numval     = /([0-9]+|0x[0-9a-fA-F]+)/
-// Does not work either, the hexadecimal numbers are not matched properly
-// Anyhow let's distinguish the hexadecimal values from decimal integers, hex numbers will be stored as strings
-// and passed as-is to MySQL which enables us to pass 64-bit values without messing with them in PHP
-//
-hexval     = /(0x[0-9a-fA-F]+)/
-numval     = /([0-9]+)/
-strval     = /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/
-name       = /([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/
-varname    = /:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/
-dot       = "."
-*/
-
-/*!lex2php
-whitespace {
-	return false;
-}
-union {
-	$this->token = OQLParser::UNION;
-}
-select {
-	$this->token = OQLParser::SELECT;
-}
-from {
-	$this->token = OQLParser::FROM;
-}
-as_alias {
-	$this->token = OQLParser::AS_ALIAS;
-}
-where {
-	$this->token = OQLParser::WHERE;
-}
-join {
-	$this->token = OQLParser::JOIN;
-}
-on {
-	$this->token = OQLParser::ON;
-}
-math_div {
-	$this->token = OQLParser::MATH_DIV;
-}
-math_mult {
-	$this->token = OQLParser::MATH_MULT;
-}
-math_plus {
-	$this->token = OQLParser::MATH_PLUS;
-}
-math_minus {
-	$this->token = OQLParser::MATH_MINUS;
-}
-log_and {
-	$this->token = OQLParser::LOG_AND;
-}
-log_or {
-	$this->token = OQLParser::LOG_OR;
-}
-bitwise_or {
-	$this->token = OQLParser::BITWISE_OR;
-}
-bitwise_and {
-	$this->token = OQLParser::BITWISE_AND;
-}
-bitwise_xor {
-	$this->token = OQLParser::BITWISE_XOR;
-}
-bitwise_leftshift {
-	$this->token = OQLParser::BITWISE_LEFT_SHIFT;
-}
-bitwise_rightshift {
-	$this->token = OQLParser::BITWISE_RIGHT_SHIFT;
-}
-coma {
-	$this->token = OQLParser::COMA;
-}
-par_open {
-	$this->token = OQLParser::PAR_OPEN;
-}
-par_close {
-	$this->token = OQLParser::PAR_CLOSE;
-}
-regexp {
-	$this->token = OQLParser::REGEXP;
-}
-eq {
-	$this->token = OQLParser::EQ;
-}
-not_eq {
-	$this->token = OQLParser::NOT_EQ;
-}
-gt {
-	$this->token = OQLParser::GT;
-}
-lt {
-	$this->token = OQLParser::LT;
-}
-ge {
-	$this->token = OQLParser::GE;
-}
-le {
-	$this->token = OQLParser::LE;
-}
-like {
-	$this->token = OQLParser::LIKE;
-}
-not_like {
-	$this->token = OQLParser::NOT_LIKE;
-}
-in {
-	$this->token = OQLParser::IN;
-}
-not_in {
-	$this->token = OQLParser::NOT_IN;
-}
-interval {
-	$this->token = OQLParser::INTERVAL;
-}
-f_if {
-	$this->token = OQLParser::F_IF;
-}
-f_elt {
-	$this->token = OQLParser::F_ELT;
-}
-f_coalesce {
-	$this->token = OQLParser::F_COALESCE;
-}
-f_isnull {
-	$this->token = OQLParser::F_ISNULL;
-}
-f_concat {
-	$this->token = OQLParser::F_CONCAT;
-}
-f_substr {
-	$this->token = OQLParser::F_SUBSTR;
-}
-f_trim {
-	$this->token = OQLParser::F_TRIM;
-}
-f_date {
-	$this->token = OQLParser::F_DATE;
-}
-f_date_format {
-	$this->token = OQLParser::F_DATE_FORMAT;
-}
-f_current_date {
-	$this->token = OQLParser::F_CURRENT_DATE;
-}
-f_now {
-	$this->token = OQLParser::F_NOW;
-}
-f_time {
-	$this->token = OQLParser::F_TIME;
-}
-f_to_days {
-	$this->token = OQLParser::F_TO_DAYS;
-}
-f_from_days {
-	$this->token = OQLParser::F_FROM_DAYS;
-}
-f_year {
-	$this->token = OQLParser::F_YEAR;
-}
-f_month {
-	$this->token = OQLParser::F_MONTH;
-}
-f_day {
-	$this->token = OQLParser::F_DAY;
-}
-f_hour {
-	$this->token = OQLParser::F_HOUR;
-}
-f_minute {
-	$this->token = OQLParser::F_MINUTE;
-}
-f_second {
-	$this->token = OQLParser::F_SECOND;
-}
-f_date_add {
-	$this->token = OQLParser::F_DATE_ADD;
-}
-f_date_sub {
-	$this->token = OQLParser::F_DATE_SUB;
-}
-f_round {
-	$this->token = OQLParser::F_ROUND;
-}
-f_floor {
-	$this->token = OQLParser::F_FLOOR;
-}
-f_inet_aton {
-	$this->token = OQLParser::F_INET_ATON;
-}
-f_inet_ntoa {
-	$this->token = OQLParser::F_INET_NTOA;
-}
-below {
-	$this->token = OQLParser::BELOW;
-}
-below_strict {
-	$this->token = OQLParser::BELOW_STRICT;
-}
-not_below {
-	$this->token = OQLParser::NOT_BELOW;
-}
-not_below_strict {
-	$this->token = OQLParser::NOT_BELOW_STRICT;
-}
-above {
-	$this->token = OQLParser::ABOVE;
-}
-above_strict {
-	$this->token = OQLParser::ABOVE_STRICT;
-}
-not_above {
-	$this->token = OQLParser::NOT_ABOVE;
-}
-not_above_strict {
-	$this->token = OQLParser::NOT_ABOVE_STRICT;
-}
-hexval {
-	$this->token = OQLParser::HEXVAL;
-}
-numval {
-	$this->token = OQLParser::NUMVAL;
-}
-strval {
-	$this->token = OQLParser::STRVAL;
-}
-name {
-	$this->token = OQLParser::NAME;
-}
-varname {
-	$this->token = OQLParser::VARNAME;
-}
-dot {
-	$this->token = OQLParser::DOT;
-}
-*/
-
-}
-
-define('UNEXPECTED_INPUT_AT_LINE', 'Unexpected input at line');
-
-class OQLLexerException extends OQLException
-{
-	public function __construct($sInput, $iLine, $iCol, $sUnexpected)
-	{
-		parent::__construct("Syntax error", $sInput, $iLine, $iCol, $sUnexpected);
-	}
-}
-
-class OQLLexer extends OQLLexerRaw 
-{
-	public function getTokenPos()
-	{
-		return max(0, $this->count - strlen($this->value));
-	}
-
-   function yylex()
-   {
-      try
-      {
-      	return parent::yylex();
-		}
-		catch (Exception $e)
-		{
-			$sMessage = $e->getMessage();
-			if (substr($sMessage, 0, strlen(UNEXPECTED_INPUT_AT_LINE)) == UNEXPECTED_INPUT_AT_LINE)
-			{
-				$sLineAndChar = substr($sMessage, strlen(UNEXPECTED_INPUT_AT_LINE));
-				if (preg_match('#^([0-9]+): (.+)$#', $sLineAndChar, $aMatches))
-				{
-					$iLine = $aMatches[1];
-					$sUnexpected = $aMatches[2];
-					throw new OQLLexerException($this->data, $iLine, $this->count, $sUnexpected);
-				}
-			}
-			// Default: forward the exception
-			throw $e;
-		}
-	}
-}
-?>
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * OQL syntax analyzer, to be used prior to run the lexical analyzer
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Notes (from the source file: oql-lexer.plex) - Romain
+//
+// The strval rule is a little bit cryptic.
+// This is due to both a bug in the lexer generator and the complexity of our need
+// The rule means: either a quoted string with ", or a quoted string with '
+//                 literal " (resp. ') must be escaped by a \
+//                 \ must be escaped by an additional \
+// 
+// Here are the issues and limitation found in the lexer generator:
+// * Matching simple quotes is an issue, because regexp are not correctly escaped (and the ESC code is escaped itself)
+//    Workaround: insert '.chr(39).' which will be a real ' in the end
+// * Matching an alternate regexp is an issue because you must specify  "|^...."
+//   and the regexp parser will not accept that syntax
+//    Workaround: insert '.chr(94).' which will be a real ^
+//
+// Let's analyze an overview of the regexp, we have
+// 1) The strval rule in the lexer definition
+//     /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/
+// 2) Becomes the php expression in the lexer
+//    (note the escaped double quotes, hopefully having no effect, but showing where the issue is!)
+//     $myRegexp = '/^\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/';
+//
+// To be fixed in LexerGenerator/Parser.y, in doLongestMatch (doFirstMatch is ok)
+//
+//
+// Now, let's explain how the regexp has been designed.
+// Here is a simplified version, dealing with simple quotes, and based on the assumption that the lexer generator has been fixed!
+// The strval rule in the lexer definition
+//     /'([^\\']*(\\')*(\\\\)*)*'/
+// This means anything containing \\ or \' or any other char but a standalone ' or \
+// This means ' or \ could not be found without a preceding \
+//
+class OQLLexerRaw
+{
+    protected $data;  // input string
+    public $token;  // token id
+    public $value;  // token string representation
+    protected $line;  // current line
+    protected $count; // current column
+
+    function __construct($data)
+    {
+        $this->data  = $data;
+        $this->count = 0;
+        $this->line  = 1;
+    }
+
+/*!lex2php
+%input   $this->data
+%counter $this->count
+%token   $this->token
+%value   $this->value
+%line    $this->line
+%matchlongest 1
+whitespace = /[ \t\n\r]+/
+union      = "UNION"
+select     = "SELECT"
+from       = "FROM"
+as_alias   = "AS"
+where	     = "WHERE"
+join	     = "JOIN"
+on	        = "ON"
+coma       = ","
+par_open   = "("
+par_close  = ")"
+math_div   = "/"
+math_mult  = "*"
+math_plus  = "+"
+math_minus = "-"
+log_and    = "AND"
+log_or     = "OR"
+bitwise_and    = "&"
+bitwise_or     = "|"
+bitwise_xor     = "^"
+bitwise_leftshift     = "<<"
+bitwise_rightshift     = ">>"
+regexp     = "REGEXP"
+eq         = "="
+not_eq     = "!="
+gt         = ">"
+lt         = "<"
+ge         = ">="
+le         = "<="
+like       = "LIKE"
+not_like   = "NOT LIKE"
+in         = "IN"
+not_in     = "NOT IN"
+interval   = "INTERVAL"
+f_if       = "IF"
+f_elt      = "ELT"
+f_coalesce = "COALESCE"
+f_isnull   = "ISNULL"
+f_concat   = "CONCAT"
+f_substr   = "SUBSTR"
+f_trim     = "TRIM"
+f_date     = "DATE"
+f_date_format = "DATE_FORMAT"
+f_current_date = "CURRENT_DATE"
+f_now      = "NOW"
+f_time     = "TIME"
+f_to_days   = "TO_DAYS"
+f_from_days = "FROM_DAYS"
+f_year     = "YEAR"
+f_month    = "MONTH"
+f_day      = "DAY"
+f_hour     = "HOUR"
+f_minute   = "MINUTE"
+f_second   = "SECOND"
+f_date_add = "DATE_ADD"
+f_date_sub = "DATE_SUB"
+f_round    = "ROUND"
+f_floor    = "FLOOR"
+f_inet_aton = "INET_ATON"
+f_inet_ntoa = "INET_NTOA"
+below            = "BELOW"
+below_strict     = "BELOW STRICT"
+not_below        = "NOT BELOW"
+not_below_strict = "NOT BELOW STRICT"
+above            = "ABOVE"
+above_strict     = "ABOVE STRICT"
+not_above        = "NOT ABOVE"
+not_above_strict = "NOT ABOVE STRICT"
+//
+// WARNING: there seems to be a bug in the Lexer about matching the longest pattern
+//          when there are alternates in the regexp.
+//
+// For instance:
+// numval     = /[0-9]+|0x[0-9a-fA-F]+/
+// Does not work: SELECT Toto WHERE name = 'Text0xCTest' => Fails because 0xC is recongnized as a numval (inside the string) instead of a strval !!
+//
+// Inserting a ^ after the alternate (see comment at the top of this file) does not work either
+// numval     = /[0-9]+|'.chr(94).'0x[0-9a-fA-F]+/
+// SELECT Toto WHERE name = 'Text0xCTest' => works but
+// SELECT Toto WHERE id = 0xC => does not work, 'xC' is found as a name (apparently 0 is recognized as a numval and the remaining is a name !)
+//
+// numval     = /([0-9]+|0x[0-9a-fA-F]+)/
+// Does not work either, the hexadecimal numbers are not matched properly
+// Anyhow let's distinguish the hexadecimal values from decimal integers, hex numbers will be stored as strings
+// and passed as-is to MySQL which enables us to pass 64-bit values without messing with them in PHP
+//
+hexval     = /(0x[0-9a-fA-F]+)/
+numval     = /([0-9]+)/
+strval     = /"([^\\"]|\\"|\\\\)*"|'.chr(94).chr(39).'([^\\'.chr(39).']|\\'.chr(39).'|\\\\)*'.chr(39).'/
+name       = /([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/
+varname    = /:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/
+dot       = "."
+*/
+
+/*!lex2php
+whitespace {
+	return false;
+}
+union {
+	$this->token = OQLParser::UNION;
+}
+select {
+	$this->token = OQLParser::SELECT;
+}
+from {
+	$this->token = OQLParser::FROM;
+}
+as_alias {
+	$this->token = OQLParser::AS_ALIAS;
+}
+where {
+	$this->token = OQLParser::WHERE;
+}
+join {
+	$this->token = OQLParser::JOIN;
+}
+on {
+	$this->token = OQLParser::ON;
+}
+math_div {
+	$this->token = OQLParser::MATH_DIV;
+}
+math_mult {
+	$this->token = OQLParser::MATH_MULT;
+}
+math_plus {
+	$this->token = OQLParser::MATH_PLUS;
+}
+math_minus {
+	$this->token = OQLParser::MATH_MINUS;
+}
+log_and {
+	$this->token = OQLParser::LOG_AND;
+}
+log_or {
+	$this->token = OQLParser::LOG_OR;
+}
+bitwise_or {
+	$this->token = OQLParser::BITWISE_OR;
+}
+bitwise_and {
+	$this->token = OQLParser::BITWISE_AND;
+}
+bitwise_xor {
+	$this->token = OQLParser::BITWISE_XOR;
+}
+bitwise_leftshift {
+	$this->token = OQLParser::BITWISE_LEFT_SHIFT;
+}
+bitwise_rightshift {
+	$this->token = OQLParser::BITWISE_RIGHT_SHIFT;
+}
+coma {
+	$this->token = OQLParser::COMA;
+}
+par_open {
+	$this->token = OQLParser::PAR_OPEN;
+}
+par_close {
+	$this->token = OQLParser::PAR_CLOSE;
+}
+regexp {
+	$this->token = OQLParser::REGEXP;
+}
+eq {
+	$this->token = OQLParser::EQ;
+}
+not_eq {
+	$this->token = OQLParser::NOT_EQ;
+}
+gt {
+	$this->token = OQLParser::GT;
+}
+lt {
+	$this->token = OQLParser::LT;
+}
+ge {
+	$this->token = OQLParser::GE;
+}
+le {
+	$this->token = OQLParser::LE;
+}
+like {
+	$this->token = OQLParser::LIKE;
+}
+not_like {
+	$this->token = OQLParser::NOT_LIKE;
+}
+in {
+	$this->token = OQLParser::IN;
+}
+not_in {
+	$this->token = OQLParser::NOT_IN;
+}
+interval {
+	$this->token = OQLParser::INTERVAL;
+}
+f_if {
+	$this->token = OQLParser::F_IF;
+}
+f_elt {
+	$this->token = OQLParser::F_ELT;
+}
+f_coalesce {
+	$this->token = OQLParser::F_COALESCE;
+}
+f_isnull {
+	$this->token = OQLParser::F_ISNULL;
+}
+f_concat {
+	$this->token = OQLParser::F_CONCAT;
+}
+f_substr {
+	$this->token = OQLParser::F_SUBSTR;
+}
+f_trim {
+	$this->token = OQLParser::F_TRIM;
+}
+f_date {
+	$this->token = OQLParser::F_DATE;
+}
+f_date_format {
+	$this->token = OQLParser::F_DATE_FORMAT;
+}
+f_current_date {
+	$this->token = OQLParser::F_CURRENT_DATE;
+}
+f_now {
+	$this->token = OQLParser::F_NOW;
+}
+f_time {
+	$this->token = OQLParser::F_TIME;
+}
+f_to_days {
+	$this->token = OQLParser::F_TO_DAYS;
+}
+f_from_days {
+	$this->token = OQLParser::F_FROM_DAYS;
+}
+f_year {
+	$this->token = OQLParser::F_YEAR;
+}
+f_month {
+	$this->token = OQLParser::F_MONTH;
+}
+f_day {
+	$this->token = OQLParser::F_DAY;
+}
+f_hour {
+	$this->token = OQLParser::F_HOUR;
+}
+f_minute {
+	$this->token = OQLParser::F_MINUTE;
+}
+f_second {
+	$this->token = OQLParser::F_SECOND;
+}
+f_date_add {
+	$this->token = OQLParser::F_DATE_ADD;
+}
+f_date_sub {
+	$this->token = OQLParser::F_DATE_SUB;
+}
+f_round {
+	$this->token = OQLParser::F_ROUND;
+}
+f_floor {
+	$this->token = OQLParser::F_FLOOR;
+}
+f_inet_aton {
+	$this->token = OQLParser::F_INET_ATON;
+}
+f_inet_ntoa {
+	$this->token = OQLParser::F_INET_NTOA;
+}
+below {
+	$this->token = OQLParser::BELOW;
+}
+below_strict {
+	$this->token = OQLParser::BELOW_STRICT;
+}
+not_below {
+	$this->token = OQLParser::NOT_BELOW;
+}
+not_below_strict {
+	$this->token = OQLParser::NOT_BELOW_STRICT;
+}
+above {
+	$this->token = OQLParser::ABOVE;
+}
+above_strict {
+	$this->token = OQLParser::ABOVE_STRICT;
+}
+not_above {
+	$this->token = OQLParser::NOT_ABOVE;
+}
+not_above_strict {
+	$this->token = OQLParser::NOT_ABOVE_STRICT;
+}
+hexval {
+	$this->token = OQLParser::HEXVAL;
+}
+numval {
+	$this->token = OQLParser::NUMVAL;
+}
+strval {
+	$this->token = OQLParser::STRVAL;
+}
+name {
+	$this->token = OQLParser::NAME;
+}
+varname {
+	$this->token = OQLParser::VARNAME;
+}
+dot {
+	$this->token = OQLParser::DOT;
+}
+*/
+
+}
+
+define('UNEXPECTED_INPUT_AT_LINE', 'Unexpected input at line');
+
+class OQLLexerException extends OQLException
+{
+	public function __construct($sInput, $iLine, $iCol, $sUnexpected)
+	{
+		parent::__construct("Syntax error", $sInput, $iLine, $iCol, $sUnexpected);
+	}
+}
+
+class OQLLexer extends OQLLexerRaw 
+{
+	public function getTokenPos()
+	{
+		return max(0, $this->count - strlen($this->value));
+	}
+
+   function yylex()
+   {
+      try
+      {
+      	return parent::yylex();
+		}
+		catch (Exception $e)
+		{
+			$sMessage = $e->getMessage();
+			if (substr($sMessage, 0, strlen(UNEXPECTED_INPUT_AT_LINE)) == UNEXPECTED_INPUT_AT_LINE)
+			{
+				$sLineAndChar = substr($sMessage, strlen(UNEXPECTED_INPUT_AT_LINE));
+				if (preg_match('#^([0-9]+): (.+)$#', $sLineAndChar, $aMatches))
+				{
+					$iLine = $aMatches[1];
+					$sUnexpected = $aMatches[2];
+					throw new OQLLexerException($this->data, $iLine, $this->count, $sUnexpected);
+				}
+			}
+			// Default: forward the exception
+			throw $e;
+		}
+	}
+}
+?>
diff --git a/core/oql/oql-parser.y b/core/oql/oql-parser.y
index 03bb3fe52..79dfb3139 100644
--- a/core/oql/oql-parser.y
+++ b/core/oql/oql-parser.y
@@ -1,303 +1,303 @@
-
-/*
-
-This is a LALR(1) grammar
-(seek for Lemon grammar to get some documentation from the Net)
-That doc was helpful: http://www.hwaci.com/sw/lemon/lemon.html
-
-To handle operators precedence we could have used the %left directive
-(we took another option, because that one was discovered right after...
-which option is the best for us?)
-Example:
-%left LOG_AND.
-%left LOG_OR.
-%nonassoc EQ NE GT GE LT LE.
-%left PLUS MINUS.
-%left TIMES DIVIDE MOD.
-%right EXP NOT.
-
-TODO : solve the 2 remaining shift-reduce conflicts (JOIN)
-
-*/
-
-%name OQLParser_
-%declare_class {class OQLParserRaw}
-%syntax_error { 
-throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol, $this->tokenName($yymajor), $TOKEN);
-}
-
-result ::= union(X). { $this->my_result = X; }
-result ::= query(X). { $this->my_result = X; }
-result ::= condition(X). { $this->my_result = X; }
-
-union(A) ::= query(X) UNION query(Y). {
-	A = new OqlUnionQuery(X, Y);
-}
-union(A) ::= query(X) UNION union(Y). {
-	A = new OqlUnionQuery(X, Y);
-}
-
-query(A) ::= SELECT class_name(X) join_statement(J) where_statement(W). {
-	A = new OqlObjectQuery(X, X, W, J, array(X));
-}
-query(A) ::= SELECT class_name(X) AS_ALIAS class_name(Y) join_statement(J) where_statement(W). {
-	A = new OqlObjectQuery(X, Y, W, J, array(Y));
-}
-
-query(A) ::= SELECT class_list(E) FROM class_name(X) join_statement(J) where_statement(W). {
-	A = new OqlObjectQuery(X, X, W, J, E);
-}
-query(A) ::= SELECT class_list(E) FROM class_name(X) AS_ALIAS class_name(Y) join_statement(J) where_statement(W). {
-	A = new OqlObjectQuery(X, Y, W, J, E);
-}
-
-
-class_list(A) ::= class_name(X). {
-	A = array(X);
-}
-class_list(A) ::= class_list(L) COMA class_name(X). {
-	array_push(L, X);
-	A = L;
-}
-
-where_statement(A) ::= WHERE condition(C). { A = C;}
-where_statement(A) ::= . { A = null;}
-
-join_statement(A) ::= join_item(J) join_statement(S). {
-	// insert the join statement on top of the existing list
-	array_unshift(S, J);
-	// and return the updated array
-	A = S;
-}
-join_statement(A) ::= join_item(J). {
-	A = Array(J);
-}
-join_statement(A) ::= . { A = null;}
-
-join_item(A) ::= JOIN class_name(X) AS_ALIAS class_name(Y) ON join_condition(C).
-{
-	// create an array with one single item
-	A = new OqlJoinSpec(X, Y, C);
-}
-join_item(A) ::= JOIN class_name(X) ON join_condition(C).
-{
-	// create an array with one single item
-	A = new OqlJoinSpec(X, X, C);
-}
-
-join_condition(A) ::= field_id(X) EQ field_id(Y). { A = new BinaryOqlExpression(X, '=', Y); }
-join_condition(A) ::= field_id(X) BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW', Y); }
-join_condition(A) ::= field_id(X) BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW_STRICT', Y); }
-join_condition(A) ::= field_id(X) NOT_BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_BELOW', Y); }
-join_condition(A) ::= field_id(X) NOT_BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_BELOW_STRICT', Y); }
-join_condition(A) ::= field_id(X) ABOVE field_id(Y). { A = new BinaryOqlExpression(X, 'ABOVE', Y); }
-join_condition(A) ::= field_id(X) ABOVE_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'ABOVE_STRICT', Y); }
-join_condition(A) ::= field_id(X) NOT_ABOVE field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_ABOVE', Y); }
-join_condition(A) ::= field_id(X) NOT_ABOVE_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_ABOVE_STRICT', Y); }
-
-condition(A) ::= expression_prio4(X). { A = X; }
-
-expression_basic(A) ::= scalar(X). { A = X; } 
-expression_basic(A) ::= field_id(X). { A = X; }
-expression_basic(A) ::= var_name(X). { A = X; }
-expression_basic(A) ::= func_name(X) PAR_OPEN arg_list(Y) PAR_CLOSE. { A = new FunctionOqlExpression(X, Y); }
-expression_basic(A) ::= PAR_OPEN expression_prio4(X) PAR_CLOSE. { A = X; }
-expression_basic(A) ::= expression_basic(X) list_operator(Y) list(Z). { A = new BinaryOqlExpression(X, Y, Z); }
-
-expression_prio1(A) ::= expression_basic(X). { A = X; }
-expression_prio1(A) ::= expression_prio1(X) operator1(Y) expression_basic(Z). { A = new BinaryOqlExpression(X, Y, Z); }
-
-expression_prio2(A) ::= expression_prio1(X). { A = X; }
-expression_prio2(A) ::= expression_prio2(X) operator2(Y) expression_prio1(Z). { A = new BinaryOqlExpression(X, Y, Z); }
-
-expression_prio3(A) ::= expression_prio2(X). { A = X; }
-expression_prio3(A) ::= expression_prio3(X) operator3(Y) expression_prio2(Z). { A = new BinaryOqlExpression(X, Y, Z); }
-
-expression_prio4(A) ::= expression_prio3(X). { A = X; }
-expression_prio4(A) ::= expression_prio4(X) operator4(Y) expression_prio3(Z). { A = new BinaryOqlExpression(X, Y, Z); }
-
-
-list(A) ::= PAR_OPEN list_items(X) PAR_CLOSE. {
-	A = new ListOqlExpression(X);
-}
-list_items(A) ::= expression_prio4(X). {
-	A = array(X);
-}
-list_items(A) ::= list_items(L) COMA expression_prio4(X). {
-	array_push(L, X);
-	A = L;
-}
-
-arg_list(A) ::= . {
-	A = array();
-}
-arg_list(A) ::= argument(X). {
-	A = array(X);
-}
-arg_list(A) ::= arg_list(L) COMA argument(X). {
-	array_push(L, X);
-	A = L;
-}
-argument(A) ::= expression_prio4(X). { A = X; }
-argument(A) ::= INTERVAL expression_prio4(X) interval_unit(Y). { A = new IntervalOqlExpression(X, Y); }
-
-interval_unit(A) ::= F_SECOND(X). { A = X; }
-interval_unit(A) ::= F_MINUTE(X). { A = X; }
-interval_unit(A) ::= F_HOUR(X). { A = X; }
-interval_unit(A) ::= F_DAY(X). { A = X; }
-interval_unit(A) ::= F_MONTH(X). { A = X; }
-interval_unit(A) ::= F_YEAR(X). { A = X; }
-
-scalar(A) ::= num_scalar(X). { A = X; }
-scalar(A) ::= str_scalar(X). { A = X; }
-
-num_scalar(A) ::= num_value(X). { A = new ScalarOqlExpression(X); }
-str_scalar(A) ::= str_value(X). { A = new ScalarOqlExpression(X); }
-
-field_id(A) ::= name(X). { A = new FieldOqlExpression(X); }
-field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); }
-class_name(A) ::= name(X). { A=X; }
-
-
-var_name(A) ::= VARNAME(X). { A = new VariableOqlExpression(substr(X, 1)); }
-
-name(A) ::= NAME(X). {
-	if (X[0] == '`')
-	{
-		$name = substr(X, 1, strlen(X) - 2);
-	}
-	else
-	{
-		$name = X;
-	}
-	A = new OqlName($name, $this->m_iColPrev);
-}
-num_value(A) ::= NUMVAL(X). {A=(int)X;}
-num_value(A) ::= MATH_MINUS NUMVAL(X). {A=(int)-X;}
-num_value(A) ::= HEXVAL(X). {A=new OqlHexValue(X);}
-str_value(A) ::= STRVAL(X). {A=stripslashes(substr(X, 1, strlen(X) - 2));}
-
-
-operator1(A) ::= num_operator1(X). {A=X;}
-operator1(A) ::= bitwise_operator1(X). {A=X;}
-operator2(A) ::= num_operator2(X). {A=X;}
-operator2(A) ::= str_operator(X). {A=X;}
-operator2(A) ::= REGEXP(X). {A=X;}
-operator2(A) ::= EQ(X). {A=X;}
-operator2(A) ::= NOT_EQ(X). {A=X;}
-operator3(A) ::= LOG_AND(X). {A=X;}
-operator3(A) ::= bitwise_operator3(X). {A=X;}
-operator4(A) ::= LOG_OR(X). {A=X;}
-operator4(A) ::= bitwise_operator4(X). {A=X;}
-
-num_operator1(A) ::= MATH_DIV(X). {A=X;}
-num_operator1(A) ::= MATH_MULT(X). {A=X;}
-num_operator2(A) ::= MATH_PLUS(X). {A=X;}
-num_operator2(A) ::= MATH_MINUS(X). {A=X;}
-num_operator2(A) ::= GT(X). {A=X;}
-num_operator2(A) ::= LT(X). {A=X;}
-num_operator2(A) ::= GE(X). {A=X;}
-num_operator2(A) ::= LE(X). {A=X;}
-
-str_operator(A) ::= LIKE(X). {A=X;}
-str_operator(A) ::= NOT_LIKE(X). {A=X;}
-
-bitwise_operator1(A) ::= BITWISE_LEFT_SHIFT(X). {A=X;}
-bitwise_operator1(A) ::= BITWISE_RIGHT_SHIFT(X). {A=X;}
-bitwise_operator3(A) ::= BITWISE_AND(X). {A=X;}
-bitwise_operator4(A) ::= BITWISE_OR(X). {A=X;}
-bitwise_operator4(A) ::= BITWISE_XOR(X). {A=X;}
-
-list_operator(A) ::= IN(X). {A=X;}
-list_operator(A) ::= NOT_IN(X). {A=X;}
-
-func_name(A) ::= F_IF(X). { A=X; }
-func_name(A) ::= F_ELT(X). { A=X; }
-func_name(A) ::= F_COALESCE(X). { A=X; }
-func_name(A) ::= F_ISNULL(X). { A=X; }
-func_name(A) ::= F_CONCAT(X). { A=X; }
-func_name(A) ::= F_SUBSTR(X). { A=X; }
-func_name(A) ::= F_TRIM(X). { A=X; }
-func_name(A) ::= F_DATE(X). { A=X; }
-func_name(A) ::= F_DATE_FORMAT(X). { A=X; }
-func_name(A) ::= F_CURRENT_DATE(X). { A=X; }
-func_name(A) ::= F_NOW(X). { A=X; }
-func_name(A) ::= F_TIME(X). { A=X; }
-func_name(A) ::= F_TO_DAYS(X). { A=X; }
-func_name(A) ::= F_FROM_DAYS(X). { A=X; }
-func_name(A) ::= F_YEAR(X). { A=X; }
-func_name(A) ::= F_MONTH(X). { A=X; }
-func_name(A) ::= F_DAY(X). { A=X; }
-func_name(A) ::= F_DATE_ADD(X). { A=X; }
-func_name(A) ::= F_DATE_SUB(X). { A=X; }
-func_name(A) ::= F_ROUND(X). { A=X; }
-func_name(A) ::= F_FLOOR(X). { A=X; }
-func_name(A) ::= F_INET_ATON(X). { A=X; }
-func_name(A) ::= F_INET_NTOA(X). { A=X; }
-
-
-%code {
-
-class OQLParserException extends OQLException
-{
-	public function __construct($sInput, $iLine, $iCol, $sTokenName, $sTokenValue)
-	{
-		$sIssue = "Unexpected token $sTokenName";
-	
-		parent::__construct($sIssue, $sInput, $iLine, $iCol, $sTokenValue);
-	}
-}
-
-class OQLParser extends OQLParserRaw
-{
-	// dirty, but working for us (no other mean to get the final result :-(
-   protected $my_result;
-
-	public function GetResult()
-	{
-		return $this->my_result;
-	}
-
-   // More info on the source query and the current position while parsing it
-   // Data used when an exception is raised
-	protected $m_iLine; // still not used
-	protected $m_iCol;
-	protected $m_iColPrev; // this is the interesting one, because the parser will reduce on the next token
-	protected $m_sSourceQuery;
-
-	public function __construct($sQuery)
-	{
-		$this->m_iLine = 0;
-		$this->m_iCol = 0;
-		$this->m_iColPrev = 0;
-		$this->m_sSourceQuery = $sQuery;
-		// no constructor - parent::__construct();
-	}
-	
-	public function doParse($token, $value, $iCurrPosition = 0)
-	{
-		$this->m_iColPrev = $this->m_iCol;
-		$this->m_iCol = $iCurrPosition;
-
-		return parent::DoParse($token, $value);
-	}
-
-	public function doFinish()
-	{
-		$this->doParse(0, 0);
-		return $this->my_result;
-	}
-	
-	public function __destruct()
-	{
-		// Bug in the original destructor, causing an infinite loop !
-		// This is a real issue when a fatal error occurs on the first token (the error could not be seen)
-		if (is_null($this->yyidx))
-		{
-			$this->yyidx = -1;
-		}
-		parent::__destruct();
-	}
-}
-
-}
+
+/*
+
+This is a LALR(1) grammar
+(seek for Lemon grammar to get some documentation from the Net)
+That doc was helpful: http://www.hwaci.com/sw/lemon/lemon.html
+
+To handle operators precedence we could have used the %left directive
+(we took another option, because that one was discovered right after...
+which option is the best for us?)
+Example:
+%left LOG_AND.
+%left LOG_OR.
+%nonassoc EQ NE GT GE LT LE.
+%left PLUS MINUS.
+%left TIMES DIVIDE MOD.
+%right EXP NOT.
+
+TODO : solve the 2 remaining shift-reduce conflicts (JOIN)
+
+*/
+
+%name OQLParser_
+%declare_class {class OQLParserRaw}
+%syntax_error { 
+throw new OQLParserException($this->m_sSourceQuery, $this->m_iLine, $this->m_iCol, $this->tokenName($yymajor), $TOKEN);
+}
+
+result ::= union(X). { $this->my_result = X; }
+result ::= query(X). { $this->my_result = X; }
+result ::= condition(X). { $this->my_result = X; }
+
+union(A) ::= query(X) UNION query(Y). {
+	A = new OqlUnionQuery(X, Y);
+}
+union(A) ::= query(X) UNION union(Y). {
+	A = new OqlUnionQuery(X, Y);
+}
+
+query(A) ::= SELECT class_name(X) join_statement(J) where_statement(W). {
+	A = new OqlObjectQuery(X, X, W, J, array(X));
+}
+query(A) ::= SELECT class_name(X) AS_ALIAS class_name(Y) join_statement(J) where_statement(W). {
+	A = new OqlObjectQuery(X, Y, W, J, array(Y));
+}
+
+query(A) ::= SELECT class_list(E) FROM class_name(X) join_statement(J) where_statement(W). {
+	A = new OqlObjectQuery(X, X, W, J, E);
+}
+query(A) ::= SELECT class_list(E) FROM class_name(X) AS_ALIAS class_name(Y) join_statement(J) where_statement(W). {
+	A = new OqlObjectQuery(X, Y, W, J, E);
+}
+
+
+class_list(A) ::= class_name(X). {
+	A = array(X);
+}
+class_list(A) ::= class_list(L) COMA class_name(X). {
+	array_push(L, X);
+	A = L;
+}
+
+where_statement(A) ::= WHERE condition(C). { A = C;}
+where_statement(A) ::= . { A = null;}
+
+join_statement(A) ::= join_item(J) join_statement(S). {
+	// insert the join statement on top of the existing list
+	array_unshift(S, J);
+	// and return the updated array
+	A = S;
+}
+join_statement(A) ::= join_item(J). {
+	A = Array(J);
+}
+join_statement(A) ::= . { A = null;}
+
+join_item(A) ::= JOIN class_name(X) AS_ALIAS class_name(Y) ON join_condition(C).
+{
+	// create an array with one single item
+	A = new OqlJoinSpec(X, Y, C);
+}
+join_item(A) ::= JOIN class_name(X) ON join_condition(C).
+{
+	// create an array with one single item
+	A = new OqlJoinSpec(X, X, C);
+}
+
+join_condition(A) ::= field_id(X) EQ field_id(Y). { A = new BinaryOqlExpression(X, '=', Y); }
+join_condition(A) ::= field_id(X) BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW', Y); }
+join_condition(A) ::= field_id(X) BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'BELOW_STRICT', Y); }
+join_condition(A) ::= field_id(X) NOT_BELOW field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_BELOW', Y); }
+join_condition(A) ::= field_id(X) NOT_BELOW_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_BELOW_STRICT', Y); }
+join_condition(A) ::= field_id(X) ABOVE field_id(Y). { A = new BinaryOqlExpression(X, 'ABOVE', Y); }
+join_condition(A) ::= field_id(X) ABOVE_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'ABOVE_STRICT', Y); }
+join_condition(A) ::= field_id(X) NOT_ABOVE field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_ABOVE', Y); }
+join_condition(A) ::= field_id(X) NOT_ABOVE_STRICT field_id(Y). { A = new BinaryOqlExpression(X, 'NOT_ABOVE_STRICT', Y); }
+
+condition(A) ::= expression_prio4(X). { A = X; }
+
+expression_basic(A) ::= scalar(X). { A = X; } 
+expression_basic(A) ::= field_id(X). { A = X; }
+expression_basic(A) ::= var_name(X). { A = X; }
+expression_basic(A) ::= func_name(X) PAR_OPEN arg_list(Y) PAR_CLOSE. { A = new FunctionOqlExpression(X, Y); }
+expression_basic(A) ::= PAR_OPEN expression_prio4(X) PAR_CLOSE. { A = X; }
+expression_basic(A) ::= expression_basic(X) list_operator(Y) list(Z). { A = new BinaryOqlExpression(X, Y, Z); }
+
+expression_prio1(A) ::= expression_basic(X). { A = X; }
+expression_prio1(A) ::= expression_prio1(X) operator1(Y) expression_basic(Z). { A = new BinaryOqlExpression(X, Y, Z); }
+
+expression_prio2(A) ::= expression_prio1(X). { A = X; }
+expression_prio2(A) ::= expression_prio2(X) operator2(Y) expression_prio1(Z). { A = new BinaryOqlExpression(X, Y, Z); }
+
+expression_prio3(A) ::= expression_prio2(X). { A = X; }
+expression_prio3(A) ::= expression_prio3(X) operator3(Y) expression_prio2(Z). { A = new BinaryOqlExpression(X, Y, Z); }
+
+expression_prio4(A) ::= expression_prio3(X). { A = X; }
+expression_prio4(A) ::= expression_prio4(X) operator4(Y) expression_prio3(Z). { A = new BinaryOqlExpression(X, Y, Z); }
+
+
+list(A) ::= PAR_OPEN list_items(X) PAR_CLOSE. {
+	A = new ListOqlExpression(X);
+}
+list_items(A) ::= expression_prio4(X). {
+	A = array(X);
+}
+list_items(A) ::= list_items(L) COMA expression_prio4(X). {
+	array_push(L, X);
+	A = L;
+}
+
+arg_list(A) ::= . {
+	A = array();
+}
+arg_list(A) ::= argument(X). {
+	A = array(X);
+}
+arg_list(A) ::= arg_list(L) COMA argument(X). {
+	array_push(L, X);
+	A = L;
+}
+argument(A) ::= expression_prio4(X). { A = X; }
+argument(A) ::= INTERVAL expression_prio4(X) interval_unit(Y). { A = new IntervalOqlExpression(X, Y); }
+
+interval_unit(A) ::= F_SECOND(X). { A = X; }
+interval_unit(A) ::= F_MINUTE(X). { A = X; }
+interval_unit(A) ::= F_HOUR(X). { A = X; }
+interval_unit(A) ::= F_DAY(X). { A = X; }
+interval_unit(A) ::= F_MONTH(X). { A = X; }
+interval_unit(A) ::= F_YEAR(X). { A = X; }
+
+scalar(A) ::= num_scalar(X). { A = X; }
+scalar(A) ::= str_scalar(X). { A = X; }
+
+num_scalar(A) ::= num_value(X). { A = new ScalarOqlExpression(X); }
+str_scalar(A) ::= str_value(X). { A = new ScalarOqlExpression(X); }
+
+field_id(A) ::= name(X). { A = new FieldOqlExpression(X); }
+field_id(A) ::= class_name(X) DOT name(Y). { A = new FieldOqlExpression(Y, X); }
+class_name(A) ::= name(X). { A=X; }
+
+
+var_name(A) ::= VARNAME(X). { A = new VariableOqlExpression(substr(X, 1)); }
+
+name(A) ::= NAME(X). {
+	if (X[0] == '`')
+	{
+		$name = substr(X, 1, strlen(X) - 2);
+	}
+	else
+	{
+		$name = X;
+	}
+	A = new OqlName($name, $this->m_iColPrev);
+}
+num_value(A) ::= NUMVAL(X). {A=(int)X;}
+num_value(A) ::= MATH_MINUS NUMVAL(X). {A=(int)-X;}
+num_value(A) ::= HEXVAL(X). {A=new OqlHexValue(X);}
+str_value(A) ::= STRVAL(X). {A=stripslashes(substr(X, 1, strlen(X) - 2));}
+
+
+operator1(A) ::= num_operator1(X). {A=X;}
+operator1(A) ::= bitwise_operator1(X). {A=X;}
+operator2(A) ::= num_operator2(X). {A=X;}
+operator2(A) ::= str_operator(X). {A=X;}
+operator2(A) ::= REGEXP(X). {A=X;}
+operator2(A) ::= EQ(X). {A=X;}
+operator2(A) ::= NOT_EQ(X). {A=X;}
+operator3(A) ::= LOG_AND(X). {A=X;}
+operator3(A) ::= bitwise_operator3(X). {A=X;}
+operator4(A) ::= LOG_OR(X). {A=X;}
+operator4(A) ::= bitwise_operator4(X). {A=X;}
+
+num_operator1(A) ::= MATH_DIV(X). {A=X;}
+num_operator1(A) ::= MATH_MULT(X). {A=X;}
+num_operator2(A) ::= MATH_PLUS(X). {A=X;}
+num_operator2(A) ::= MATH_MINUS(X). {A=X;}
+num_operator2(A) ::= GT(X). {A=X;}
+num_operator2(A) ::= LT(X). {A=X;}
+num_operator2(A) ::= GE(X). {A=X;}
+num_operator2(A) ::= LE(X). {A=X;}
+
+str_operator(A) ::= LIKE(X). {A=X;}
+str_operator(A) ::= NOT_LIKE(X). {A=X;}
+
+bitwise_operator1(A) ::= BITWISE_LEFT_SHIFT(X). {A=X;}
+bitwise_operator1(A) ::= BITWISE_RIGHT_SHIFT(X). {A=X;}
+bitwise_operator3(A) ::= BITWISE_AND(X). {A=X;}
+bitwise_operator4(A) ::= BITWISE_OR(X). {A=X;}
+bitwise_operator4(A) ::= BITWISE_XOR(X). {A=X;}
+
+list_operator(A) ::= IN(X). {A=X;}
+list_operator(A) ::= NOT_IN(X). {A=X;}
+
+func_name(A) ::= F_IF(X). { A=X; }
+func_name(A) ::= F_ELT(X). { A=X; }
+func_name(A) ::= F_COALESCE(X). { A=X; }
+func_name(A) ::= F_ISNULL(X). { A=X; }
+func_name(A) ::= F_CONCAT(X). { A=X; }
+func_name(A) ::= F_SUBSTR(X). { A=X; }
+func_name(A) ::= F_TRIM(X). { A=X; }
+func_name(A) ::= F_DATE(X). { A=X; }
+func_name(A) ::= F_DATE_FORMAT(X). { A=X; }
+func_name(A) ::= F_CURRENT_DATE(X). { A=X; }
+func_name(A) ::= F_NOW(X). { A=X; }
+func_name(A) ::= F_TIME(X). { A=X; }
+func_name(A) ::= F_TO_DAYS(X). { A=X; }
+func_name(A) ::= F_FROM_DAYS(X). { A=X; }
+func_name(A) ::= F_YEAR(X). { A=X; }
+func_name(A) ::= F_MONTH(X). { A=X; }
+func_name(A) ::= F_DAY(X). { A=X; }
+func_name(A) ::= F_DATE_ADD(X). { A=X; }
+func_name(A) ::= F_DATE_SUB(X). { A=X; }
+func_name(A) ::= F_ROUND(X). { A=X; }
+func_name(A) ::= F_FLOOR(X). { A=X; }
+func_name(A) ::= F_INET_ATON(X). { A=X; }
+func_name(A) ::= F_INET_NTOA(X). { A=X; }
+
+
+%code {
+
+class OQLParserException extends OQLException
+{
+	public function __construct($sInput, $iLine, $iCol, $sTokenName, $sTokenValue)
+	{
+		$sIssue = "Unexpected token $sTokenName";
+	
+		parent::__construct($sIssue, $sInput, $iLine, $iCol, $sTokenValue);
+	}
+}
+
+class OQLParser extends OQLParserRaw
+{
+	// dirty, but working for us (no other mean to get the final result :-(
+   protected $my_result;
+
+	public function GetResult()
+	{
+		return $this->my_result;
+	}
+
+   // More info on the source query and the current position while parsing it
+   // Data used when an exception is raised
+	protected $m_iLine; // still not used
+	protected $m_iCol;
+	protected $m_iColPrev; // this is the interesting one, because the parser will reduce on the next token
+	protected $m_sSourceQuery;
+
+	public function __construct($sQuery)
+	{
+		$this->m_iLine = 0;
+		$this->m_iCol = 0;
+		$this->m_iColPrev = 0;
+		$this->m_sSourceQuery = $sQuery;
+		// no constructor - parent::__construct();
+	}
+	
+	public function doParse($token, $value, $iCurrPosition = 0)
+	{
+		$this->m_iColPrev = $this->m_iCol;
+		$this->m_iCol = $iCurrPosition;
+
+		return parent::DoParse($token, $value);
+	}
+
+	public function doFinish()
+	{
+		$this->doParse(0, 0);
+		return $this->my_result;
+	}
+	
+	public function __destruct()
+	{
+		// Bug in the original destructor, causing an infinite loop !
+		// This is a real issue when a fatal error occurs on the first token (the error could not be seen)
+		if (is_null($this->yyidx))
+		{
+			$this->yyidx = -1;
+		}
+		parent::__destruct();
+	}
+}
+
+}
diff --git a/core/oql/oqlinterpreter.class.inc.php b/core/oql/oqlinterpreter.class.inc.php
index d59c4bb50..342dd8cd1 100644
--- a/core/oql/oqlinterpreter.class.inc.php
+++ b/core/oql/oqlinterpreter.class.inc.php
@@ -1,112 +1,112 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Wrapper to execute the parser, lexical analyzer and normalization of an OQL query
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class OqlNormalizeException extends OQLException
-{
-	public function __construct($sIssue, $sInput, OqlName $oName, $aExpecting = null)
-	{
-		parent::__construct($sIssue, $sInput, 0, $oName->GetPos(), $oName->GetValue(), $aExpecting);
-	}
-}
-class UnknownClassOqlException extends OqlNormalizeException
-{
-	public function __construct($sInput, OqlName $oName, $aExpecting = null)
-	{
-		parent::__construct('Unknown class', $sInput, $oName, $aExpecting);
-	}
-
-	public function GetUserFriendlyDescription()
-	{
-		$sWrongClass = $this->GetWrongWord();
-		$sSuggest = self::FindClosestString($sWrongClass, $this->GetSuggestions());
-
-		if ($sSuggest != '')
-		{
-			return Dict::Format('UI:OQL:UnknownClassAndFix', $sWrongClass, $sSuggest);
-		}
-		else
-		{
-			return Dict::Format('UI:OQL:UnknownClassNoFix', $sWrongClass);
-		}
-	}
-}
-
-class OqlInterpreterException extends OQLException
-{
-}
-
-
-class OqlInterpreter
-{
-	public $m_sQuery;
-
-	public function __construct($sQuery)
-	{
-		$this->m_sQuery = $sQuery;
-	}
-
-	// Note: this function is left public for unit test purposes
-	public function Parse()
-	{
-		$oLexer = new OQLLexer($this->m_sQuery);
-		$oParser = new OQLParser($this->m_sQuery);
-
-		while($oLexer->yylex())
-		{
-			$oParser->doParse($oLexer->token, $oLexer->value, $oLexer->getTokenPos());
-		}
-		$res = $oParser->doFinish();
-		return $res;
-	}
-
-	/**
-	 * @return OqlQuery
-	 * @throws \OQLException
-	 */
-	public function ParseQuery()
-	{
-		$oRes = $this->Parse();
-		if (!$oRes instanceof OqlQuery)
-		{
-			throw new OQLException('Expecting an OQL query', $this->m_sQuery, 0, 0, get_class($oRes));
-		}
-		return $oRes;
-	}
-
-	/**
-	 * @return Expression
-	 */
-	public function ParseExpression()
-	{
-		$oRes = $this->Parse();
-		if (!$oRes instanceof Expression)
-		{
-			throw new OQLException('Expecting an OQL expression', $this->m_sQuery, 0, 0, get_class($oRes), array('Expression'));
-		}
-		return $oRes;
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Wrapper to execute the parser, lexical analyzer and normalization of an OQL query
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class OqlNormalizeException extends OQLException
+{
+	public function __construct($sIssue, $sInput, OqlName $oName, $aExpecting = null)
+	{
+		parent::__construct($sIssue, $sInput, 0, $oName->GetPos(), $oName->GetValue(), $aExpecting);
+	}
+}
+class UnknownClassOqlException extends OqlNormalizeException
+{
+	public function __construct($sInput, OqlName $oName, $aExpecting = null)
+	{
+		parent::__construct('Unknown class', $sInput, $oName, $aExpecting);
+	}
+
+	public function GetUserFriendlyDescription()
+	{
+		$sWrongClass = $this->GetWrongWord();
+		$sSuggest = self::FindClosestString($sWrongClass, $this->GetSuggestions());
+
+		if ($sSuggest != '')
+		{
+			return Dict::Format('UI:OQL:UnknownClassAndFix', $sWrongClass, $sSuggest);
+		}
+		else
+		{
+			return Dict::Format('UI:OQL:UnknownClassNoFix', $sWrongClass);
+		}
+	}
+}
+
+class OqlInterpreterException extends OQLException
+{
+}
+
+
+class OqlInterpreter
+{
+	public $m_sQuery;
+
+	public function __construct($sQuery)
+	{
+		$this->m_sQuery = $sQuery;
+	}
+
+	// Note: this function is left public for unit test purposes
+	public function Parse()
+	{
+		$oLexer = new OQLLexer($this->m_sQuery);
+		$oParser = new OQLParser($this->m_sQuery);
+
+		while($oLexer->yylex())
+		{
+			$oParser->doParse($oLexer->token, $oLexer->value, $oLexer->getTokenPos());
+		}
+		$res = $oParser->doFinish();
+		return $res;
+	}
+
+	/**
+	 * @return OqlQuery
+	 * @throws \OQLException
+	 */
+	public function ParseQuery()
+	{
+		$oRes = $this->Parse();
+		if (!$oRes instanceof OqlQuery)
+		{
+			throw new OQLException('Expecting an OQL query', $this->m_sQuery, 0, 0, get_class($oRes));
+		}
+		return $oRes;
+	}
+
+	/**
+	 * @return Expression
+	 */
+	public function ParseExpression()
+	{
+		$oRes = $this->Parse();
+		if (!$oRes instanceof Expression)
+		{
+			throw new OQLException('Expecting an OQL expression', $this->m_sQuery, 0, 0, get_class($oRes), array('Expression'));
+		}
+		return $oRes;
+	}
+}
diff --git a/core/oql/oqlquery.class.inc.php b/core/oql/oqlquery.class.inc.php
index b0bff7db6..5fbcc8aed 100644
--- a/core/oql/oqlquery.class.inc.php
+++ b/core/oql/oqlquery.class.inc.php
@@ -1,747 +1,747 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Classes defined for lexical analyze (see oql-parser.y)
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-define('TREE_OPERATOR_EQUALS', 0);
-define('TREE_OPERATOR_BELOW', 1);
-define('TREE_OPERATOR_BELOW_STRICT', 2);
-define('TREE_OPERATOR_NOT_BELOW', 3);
-define('TREE_OPERATOR_NOT_BELOW_STRICT', 4);
-define('TREE_OPERATOR_ABOVE', 5);
-define('TREE_OPERATOR_ABOVE_STRICT', 6);
-define('TREE_OPERATOR_NOT_ABOVE', 7);
-define('TREE_OPERATOR_NOT_ABOVE_STRICT', 8);
-
-// Position a string within an OQL query
-// This is a must if we want to be able to pinpoint an error at any stage of the query interpretation
-// In particular, the normalization phase requires this
-class OqlName
-{
-	protected $m_sValue;
-	protected $m_iPos;
-
-	public function __construct($sValue, $iPos)
-	{
-		$this->m_iPos = $iPos;
-		$this->m_sValue = $sValue;
-	}
-
-	public function GetValue()
-	{
-		return $this->m_sValue;
-	}
-
-	public function GetPos()
-	{
-		return $this->m_iPos;
-	}
-	
-	public function __toString()
-	{
-		return $this->m_sValue;
-	} 
-}
-
-/**
- * 
- * Store hexadecimal values as strings so that we can support 64-bit values
- *
- */
-class OqlHexValue
-{
-	protected $m_sValue;
-
-	public function __construct($sValue)
-	{
-		$this->m_sValue = $sValue;
-	}
-	
-	public function __toString()
-	{
-		return $this->m_sValue;
-	}
-	
-}
-
-class OqlJoinSpec
-{
-	protected $m_oClass;
-	protected $m_oClassAlias;
-	protected $m_oLeftField;
-	protected $m_oRightField;
-	protected $m_sOperator;
-
-	protected $m_oNextJoinspec;
-
-	public function __construct($oClass, $oClassAlias, BinaryExpression $oExpression)
-	{
-		$this->m_oClass = $oClass;
-		$this->m_oClassAlias = $oClassAlias;
-		$this->m_oLeftField = $oExpression->GetLeftExpr();
-		$this->m_oRightField = $oExpression->GetRightExpr();
-		$this->m_oRightField = $oExpression->GetRightExpr();
-		$this->m_sOperator = $oExpression->GetOperator();
-	}
-
-	public function GetClass()
-	{
-		return $this->m_oClass->GetValue();
-	}
-	public function GetClassAlias()
-	{
-		return $this->m_oClassAlias->GetValue();
-	}
-
-	public function GetClassDetails()
-	{
-		return $this->m_oClass;
-	}
-	public function GetClassAliasDetails()
-	{
-		return $this->m_oClassAlias;
-	}
-
-	public function GetLeftField()
-	{
-		return $this->m_oLeftField;
-	}
-	public function GetRightField()
-	{
-		return $this->m_oRightField;
-	}
-	public function GetOperator()
-	{
-		return $this->m_sOperator;
-	}
-}
-
-interface CheckableExpression
-{
-	/**
-	 * Check the validity of the expression with regard to the data model
-	 * and the query in which it is used
-	 *
-	 * @param ModelReflection $oModelReflection MetaModel to consider
-	 * @param array $aAliases Aliases to class names (for the current query)
-	 * @param string $sSourceQuery For the reporting
-	 * @throws OqlNormalizeException
-	 */	 	
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery);
-}
-
-class BinaryOqlExpression extends BinaryExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		$this->m_oLeftExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
-		$this->m_oRightExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
-	}
-}
-
-class ScalarOqlExpression extends ScalarExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		// a scalar is always fine
-	}
-}
-
-class FieldOqlExpression extends FieldExpression implements CheckableExpression
-{
-	protected $m_oParent;
-	protected $m_oName;
-
-	public function __construct($oName, $oParent = null)
-	{
-		if (is_null($oParent))
-		{
-			$oParent = new OqlName('', 0);
-		}
-		$this->m_oParent = $oParent;
-		$this->m_oName = $oName;
-
-		parent::__construct($oName->GetValue(), $oParent->GetValue());
-	}
-
-	public function GetParentDetails()
-	{
-		return $this->m_oParent;
-	}
-
-	public function GetNameDetails()
-	{
-		return $this->m_oName;
-	}
-
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		$sClassAlias = $this->GetParent();
-		$sFltCode = $this->GetName();
-		if (empty($sClassAlias))
-		{
-			// Try to find an alias
-			// Build an array of field => array of aliases
-			$aFieldClasses = array();
-			foreach($aAliases as $sAlias => $sReal)
-			{
-				foreach($oModelReflection->GetFiltersList($sReal) as $sAnFltCode)
-				{
-					$aFieldClasses[$sAnFltCode][] = $sAlias;
-				}
-			}
-			if (!array_key_exists($sFltCode, $aFieldClasses))
-			{
-				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), array_keys($aFieldClasses));
-			}
-			if (count($aFieldClasses[$sFltCode]) > 1)
-			{
-				throw new OqlNormalizeException('Ambiguous filter code', $sSourceQuery, $this->GetNameDetails());
-			}
-			$sClassAlias = $aFieldClasses[$sFltCode][0];
-		}
-		else
-		{
-			if (!array_key_exists($sClassAlias, $aAliases))
-			{
-				throw new OqlNormalizeException('Unknown class [alias]', $sSourceQuery, $this->GetParentDetails(), array_keys($aAliases));
-			}
-			$sClass = $aAliases[$sClassAlias];
-			if (!$oModelReflection->IsValidFilterCode($sClass, $sFltCode))
-			{
-				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), $oModelReflection->GetFiltersList($sClass));
-			}
-		}
-	}
-}
-
-class VariableOqlExpression extends VariableExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		// a scalar is always fine
-	}
-}
-
-class ListOqlExpression extends ListExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		foreach ($this->GetItems() as $oItemExpression)
-		{
-			$oItemExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
-		}
-	}
-}
-
-class FunctionOqlExpression extends FunctionExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		foreach ($this->GetArgs() as $oArgExpression)
-		{
-			$oArgExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
-		}
-	}
-}
-
-class IntervalOqlExpression extends IntervalExpression implements CheckableExpression
-{
-	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
-	{
-		// an interval is always fine (made of a scalar and unit)
-	}
-}
-
-abstract class OqlQuery
-{
-	public function __construct()
-	{
-	}
-
-	/**
-	 * Check the validity of the expression with regard to the data model
-	 * and the query in which it is used
-	 *
-	 * @param ModelReflection $oModelReflection MetaModel to consider
-	 * @param string $sSourceQuery
-	 */
-	abstract public function Check(ModelReflection $oModelReflection, $sSourceQuery);
-
-	/**
-	 * Determine the class
-	 *
-	 * @param ModelReflection $oModelReflection MetaModel to consider
-	 * @return string
-	 * @throws Exception
-	 */
-	abstract public function GetClass(ModelReflection $oModelReflection);
-
-	/**
-	 * Determine the class alias
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	abstract public function GetClassAlias();
-}
-
-class OqlObjectQuery extends OqlQuery
-{
-	protected $m_aSelect; // array of selected classes
-	protected $m_oClass;
-	protected $m_oClassAlias;
-	protected $m_aJoins; // array of OqlJoinSpec
-	protected $m_oCondition; // condition tree (expressions)
-
-	public function __construct($oClass, $oClassAlias, $oCondition = null, $aJoins = null, $aSelect = null)
-	{
-		$this->m_aSelect = $aSelect;
-		$this->m_oClass = $oClass;
-		$this->m_oClassAlias = $oClassAlias;
-		$this->m_aJoins = $aJoins;
-		$this->m_oCondition = $oCondition;
-
-		parent::__construct();
-	}
-
-	public function GetSelectedClasses()
-	{
-		return $this->m_aSelect;
-	}
-
-	/**
-	 * Determine the class
-	 *
-	 * @param ModelReflection $oModelReflection MetaModel to consider
-	 * @return string
-	 * @throws Exception
-	 */
-	public function GetClass(ModelReflection $oModelReflection)
-	{
-		return $this->m_oClass->GetValue();
-	}
-
-	/**
-	 * Determine the class alias
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function GetClassAlias()
-	{
-		return $this->m_oClassAlias->GetValue();
-	}
-
-	public function GetClassDetails()
-	{
-		return $this->m_oClass;
-	}
-	public function GetClassAliasDetails()
-	{
-		return $this->m_oClassAlias;
-	}
-
-	public function GetJoins()
-	{
-		return $this->m_aJoins;
-	}
-	public function GetCondition()
-	{
-		return $this->m_oCondition;
-	}
-
-	/**
-	 * Recursively check the validity of the expression with regard to the data model
-	 * and the query in which it is used
-	 * 	 	 
-	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
-	 * @throws OqlNormalizeException
-	 */	 	
-	public function Check(ModelReflection $oModelReflection, $sSourceQuery)
-	{
-		$sClass = $this->GetClass($oModelReflection);
-		$sClassAlias = $this->GetClassAlias();
-
-		if (!$oModelReflection->IsValidClass($sClass))
-		{
-			throw new UnknownClassOqlException($sSourceQuery, $this->GetClassDetails(), $oModelReflection->GetClasses());
-		}
-
-		$aAliases = array($sClassAlias => $sClass);
-
-		$aJoinSpecs = $this->GetJoins();
-		if (is_array($aJoinSpecs))
-		{
-			foreach ($aJoinSpecs as $oJoinSpec)
-			{
-				$sJoinClass = $oJoinSpec->GetClass();
-				$sJoinClassAlias = $oJoinSpec->GetClassAlias();
-				if (!$oModelReflection->IsValidClass($sJoinClass))
-				{
-					throw new UnknownClassOqlException($sSourceQuery, $oJoinSpec->GetClassDetails(), $oModelReflection->GetClasses());
-				}
-				if (array_key_exists($sJoinClassAlias, $aAliases))
-				{
-					if ($sJoinClassAlias != $sJoinClass)
-					{
-						throw new OqlNormalizeException('Duplicate class alias', $sSourceQuery, $oJoinSpec->GetClassAliasDetails());
-					}
-					else
-					{
-						throw new OqlNormalizeException('Duplicate class name', $sSourceQuery, $oJoinSpec->GetClassDetails());
-					}
-				} 
-
-				// Assumption: ext key on the left only !!!
-				// normalization should take care of this
-				$oLeftField = $oJoinSpec->GetLeftField();
-				$sFromClass = $oLeftField->GetParent();
-				$sExtKeyAttCode = $oLeftField->GetName();
-
-				$oRightField = $oJoinSpec->GetRightField();
-				$sToClass = $oRightField->GetParent();
-				$sPKeyDescriptor = $oRightField->GetName();
-				if ($sPKeyDescriptor != 'id')
-				{
-					throw new OqlNormalizeException('Wrong format for Join clause (right hand), expecting an id', $sSourceQuery, $oRightField->GetNameDetails(), array('id'));
-				}
-
-				$aAliases[$sJoinClassAlias] = $sJoinClass;
-
-				if (!array_key_exists($sFromClass, $aAliases))
-				{
-					throw new OqlNormalizeException('Unknown class in join condition (left expression)', $sSourceQuery, $oLeftField->GetParentDetails(), array_keys($aAliases));
-				}
-				if (!array_key_exists($sToClass, $aAliases))
-				{
-					throw new OqlNormalizeException('Unknown class in join condition (right expression)', $sSourceQuery, $oRightField->GetParentDetails(), array_keys($aAliases));
-				}
-				$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeExternalKey');
-				$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeObjectKey');
-				$aAllKeys = array_merge($aExtKeys, $aObjKeys);
-				if (!array_key_exists($sExtKeyAttCode, $aAllKeys))
-				{
-					throw new OqlNormalizeException('Unknown key in join condition (left expression)', $sSourceQuery, $oLeftField->GetNameDetails(), array_keys($aAllKeys));
-				}
-
-				if ($sFromClass == $sJoinClassAlias)
-				{
-					if (array_key_exists($sExtKeyAttCode, $aExtKeys)) // Skip that check for object keys
-					{
-						$sTargetClass = $oModelReflection->GetAttributeProperty($aAliases[$sFromClass], $sExtKeyAttCode, 'targetclass');
-						if(!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass))
-						{
-							throw new OqlNormalizeException("The joined class ($aAliases[$sFromClass]) is not compatible with the external key, which is pointing to $sTargetClass", $sSourceQuery, $oLeftField->GetNameDetails());
-						}
-					}
-				}
-				else
-				{
-					$sOperator = $oJoinSpec->GetOperator();
-					switch($sOperator)
-					{
-						case '=':
-						$iOperatorCode = TREE_OPERATOR_EQUALS;
-						break;
-						case 'BELOW':
-						$iOperatorCode = TREE_OPERATOR_BELOW;
-						break;
-						case 'BELOW_STRICT':
-						$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
-						break;
-						case 'NOT_BELOW':
-						$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
-						break;
-						case 'NOT_BELOW_STRICT':
-						$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
-						break;
-						case 'ABOVE':
-						$iOperatorCode = TREE_OPERATOR_ABOVE;
-						break;
-						case 'ABOVE_STRICT':
-						$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
-						break;
-						case 'NOT_ABOVE':
-						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
-						break;
-						case 'NOT_ABOVE_STRICT':
-						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
-						break;
-					}
-					if (array_key_exists($sExtKeyAttCode, $aExtKeys)) // Skip that check for object keys
-					{
-						$sTargetClass = $oModelReflection->GetAttributeProperty($aAliases[$sFromClass], $sExtKeyAttCode, 'targetclass');
-						if(!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass))
-						{
-							throw new OqlNormalizeException("The joined class ($aAliases[$sToClass]) is not compatible with the external key, which is pointing to $sTargetClass", $sSourceQuery, $oLeftField->GetNameDetails());
-						}
-					}
-					$aAttList = $oModelReflection->ListAttributes($aAliases[$sFromClass]);
-					$sAttType = $aAttList[$sExtKeyAttCode];
-					if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, 'AttributeHierarchicalKey') && ($sAttType != 'AttributeHierarchicalKey'))
-					{
-						throw new OqlNormalizeException("The specified tree operator $sOperator is not applicable to the key", $sSourceQuery, $oLeftField->GetNameDetails());
-					}
-				}
-			}
-		}
-
-		// Check the select information
-		//
-		foreach ($this->GetSelectedClasses() as $oClassDetails)
-		{
-			$sClassToSelect = $oClassDetails->GetValue();
-			if (!array_key_exists($sClassToSelect, $aAliases))
-			{
-				throw new OqlNormalizeException('Unknown class [alias]', $sSourceQuery, $oClassDetails, array_keys($aAliases));
-			}
-		}
-
-		// Check the condition tree
-		//
-		if ($this->m_oCondition instanceof Expression)
-		{
-			$this->m_oCondition->Check($oModelReflection, $aAliases, $sSourceQuery);
-		}
-	}
-
-	/**
-	 * Make the relevant DBSearch instance (FromOQL)
-	 */	 	
-	public function ToDBSearch($sQuery)
-	{
-		$sClass = $this->GetClass(new ModelReflectionRuntime());
-		$sClassAlias = $this->GetClassAlias();
-
-		$oSearch = new DBObjectSearch($sClass, $sClassAlias);
-		$oSearch->InitFromOqlQuery($this, $sQuery);
-		return $oSearch;
-	}
-}
-
-class OqlUnionQuery extends OqlQuery
-{
-	protected $aQueries;
-
-	public function __construct(OqlObjectQuery $oLeftQuery, OqlQuery $oRightQueryOrUnion)
-	{
-		$this->aQueries[] = $oLeftQuery;
-		if ($oRightQueryOrUnion instanceof OqlUnionQuery)
-		{
-			foreach ($oRightQueryOrUnion->GetQueries() as $oSingleQuery)
-			{
-				$this->aQueries[] = $oSingleQuery;
-			}
-		}
-		else
-		{
-			$this->aQueries[] = $oRightQueryOrUnion;
-		}
-	}
-	
-	public function GetQueries()
-	{
-		return $this->aQueries;
-	}
-
-	/**
-	 * Check the validity of the expression with regard to the data model
-	 * and the query in which it is used
-	 * 	 	 
-	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
-	 * @throws OqlNormalizeException
-	 */	 	
-	public function Check(ModelReflection $oModelReflection, $sSourceQuery)
-	{
-		$aColumnToClasses = array();
-		foreach ($this->aQueries as $iQuery => $oQuery)
-		{
-			$oQuery->Check($oModelReflection, $sSourceQuery);
-
-			$aAliasToClass = array($oQuery->GetClassAlias() => $oQuery->GetClass($oModelReflection));
-			$aJoinSpecs = $oQuery->GetJoins();
-			if (is_array($aJoinSpecs))
-			{
-				foreach ($aJoinSpecs as $oJoinSpec)
-				{
-					$aAliasToClass[$oJoinSpec->GetClassAlias()] = $oJoinSpec->GetClass();
-				}
-			}
-
-			$aSelectedClasses = $oQuery->GetSelectedClasses();
-			if ($iQuery != 0)
-			{
-				if (count($aSelectedClasses) < count($aColumnToClasses))
-				{
-					$oLastClass = end($aSelectedClasses);
-					throw new OqlNormalizeException('Too few selected classes in the subquery', $sSourceQuery, $oLastClass);
-				}
-				if (count($aSelectedClasses) > count($aColumnToClasses))
-				{
-					$oLastClass = end($aSelectedClasses);
-					throw new OqlNormalizeException('Too many selected classes in the subquery', $sSourceQuery, $oLastClass);
-				}
-			}
-			foreach ($aSelectedClasses as $iColumn => $oClassDetails)
-			{
-				$sAlias = $oClassDetails->GetValue();
-				$sClass = $aAliasToClass[$sAlias];
-				$aColumnToClasses[$iColumn][] = array(
-					'alias' => $sAlias,
-					'class' => $sClass,
-					'class_name' => $oClassDetails,
-				);
-			}
-		}
-		foreach ($aColumnToClasses as $iColumn => $aClasses)
-		{
-			foreach ($aClasses as $iQuery => $aData)
-			{
-				if ($iQuery == 0)
-				{
-					// Establish the reference
-					$sRootClass = $oModelReflection->GetRootClass($aData['class']);
-				}
-				else
-				{
-					if ($oModelReflection->GetRootClass($aData['class']) != $sRootClass)
-					{
-						$aSubclasses = $oModelReflection->EnumChildClasses($sRootClass, ENUM_CHILD_CLASSES_ALL);
-						throw new OqlNormalizeException('Incompatible classes: could not find a common ancestor', $sSourceQuery, $aData['class_name'], $aSubclasses);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Determine the class
-	 *
-	 * @param ModelReflection $oModelReflection MetaModel to consider
-	 * @return string
-	 * @throws Exception
-	 */
-	public function GetClass(ModelReflection $oModelReflection)
-	{
-		$aFirstColClasses = array();
-		foreach ($this->aQueries as $iQuery => $oQuery)
-		{
-			$aFirstColClasses[] = $oQuery->GetClass($oModelReflection);
-		}
-		$sClass = self::GetLowestCommonAncestor($oModelReflection, $aFirstColClasses);
-		if (is_null($sClass))
-		{
-			throw new Exception('Could not determine the class of the union query. This issue should have been detected earlier by calling OqlQuery::Check()');
-		}
-		return $sClass;
-	}
-
-	/**
-	 * Determine the class alias
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function GetClassAlias()
-	{
-		$sAlias = $this->aQueries[0]->GetClassAlias();
-		return $sAlias;
-	}
-
-	/**
-	 * Check the validity of the expression with regard to the data model
-	 * and the query in which it is used
-	 *
-	 * @param ModelReflection $oModelReflection MetaModel to consider
-	 * @param array $aClasses Flat list of classes
-	 * @return string the lowest common ancestor amongst classes, null if none has been found
-	 * @throws Exception
-	 */
-	public static function GetLowestCommonAncestor(ModelReflection $oModelReflection, $aClasses)
-	{
-		$sAncestor = null;
-		foreach($aClasses as $sClass)
-		{
-			if (is_null($sAncestor))
-			{
-				// first loop
-				$sAncestor = $sClass;
-			}
-			elseif ($sClass == $sAncestor)
-			{
-				// remains the same
-			}
-			elseif ($oModelReflection->GetRootClass($sClass) != $oModelReflection->GetRootClass($sAncestor))
-			{
-				$sAncestor = null;
-				break;
-			}
-			else
-			{
-				$sAncestor = self::LowestCommonAncestor($oModelReflection, $sAncestor, $sClass);
-			}
-		}
-		return $sAncestor;
-	}
-
-	/**
-	 * Note: assumes that class A and B have a common ancestor
-	 */
-	protected static function LowestCommonAncestor(ModelReflection $oModelReflection, $sClassA, $sClassB)
-	{
-		if ($sClassA == $sClassB)
-		{
-			$sRet = $sClassA;
-		}
-		elseif (in_array($sClassA, $oModelReflection->EnumChildClasses($sClassB)))
-		{
-			$sRet = $sClassB;
-		}
-		elseif (in_array($sClassB, $oModelReflection->EnumChildClasses($sClassA)))
-		{
-			$sRet = $sClassA;
-		}
-		else
-		{
-			// Recurse
-			$sRet = self::LowestCommonAncestor($oModelReflection, $sClassA, $oModelReflection->GetParentClass($sClassB));
-		}
-		return $sRet;
-	}
-	/**
-	 * Make the relevant DBSearch instance (FromOQL)
-	 */	 	
-	public function ToDBSearch($sQuery)
-	{
-		$aSearches = array();
-		foreach ($this->aQueries as $oQuery)
-		{
-			$aSearches[] = $oQuery->ToDBSearch($sQuery);
-		}
-
-		$oSearch = new DBUnionSearch($aSearches);
-		return $oSearch;
-	}
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Classes defined for lexical analyze (see oql-parser.y)
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+define('TREE_OPERATOR_EQUALS', 0);
+define('TREE_OPERATOR_BELOW', 1);
+define('TREE_OPERATOR_BELOW_STRICT', 2);
+define('TREE_OPERATOR_NOT_BELOW', 3);
+define('TREE_OPERATOR_NOT_BELOW_STRICT', 4);
+define('TREE_OPERATOR_ABOVE', 5);
+define('TREE_OPERATOR_ABOVE_STRICT', 6);
+define('TREE_OPERATOR_NOT_ABOVE', 7);
+define('TREE_OPERATOR_NOT_ABOVE_STRICT', 8);
+
+// Position a string within an OQL query
+// This is a must if we want to be able to pinpoint an error at any stage of the query interpretation
+// In particular, the normalization phase requires this
+class OqlName
+{
+	protected $m_sValue;
+	protected $m_iPos;
+
+	public function __construct($sValue, $iPos)
+	{
+		$this->m_iPos = $iPos;
+		$this->m_sValue = $sValue;
+	}
+
+	public function GetValue()
+	{
+		return $this->m_sValue;
+	}
+
+	public function GetPos()
+	{
+		return $this->m_iPos;
+	}
+	
+	public function __toString()
+	{
+		return $this->m_sValue;
+	} 
+}
+
+/**
+ * 
+ * Store hexadecimal values as strings so that we can support 64-bit values
+ *
+ */
+class OqlHexValue
+{
+	protected $m_sValue;
+
+	public function __construct($sValue)
+	{
+		$this->m_sValue = $sValue;
+	}
+	
+	public function __toString()
+	{
+		return $this->m_sValue;
+	}
+	
+}
+
+class OqlJoinSpec
+{
+	protected $m_oClass;
+	protected $m_oClassAlias;
+	protected $m_oLeftField;
+	protected $m_oRightField;
+	protected $m_sOperator;
+
+	protected $m_oNextJoinspec;
+
+	public function __construct($oClass, $oClassAlias, BinaryExpression $oExpression)
+	{
+		$this->m_oClass = $oClass;
+		$this->m_oClassAlias = $oClassAlias;
+		$this->m_oLeftField = $oExpression->GetLeftExpr();
+		$this->m_oRightField = $oExpression->GetRightExpr();
+		$this->m_oRightField = $oExpression->GetRightExpr();
+		$this->m_sOperator = $oExpression->GetOperator();
+	}
+
+	public function GetClass()
+	{
+		return $this->m_oClass->GetValue();
+	}
+	public function GetClassAlias()
+	{
+		return $this->m_oClassAlias->GetValue();
+	}
+
+	public function GetClassDetails()
+	{
+		return $this->m_oClass;
+	}
+	public function GetClassAliasDetails()
+	{
+		return $this->m_oClassAlias;
+	}
+
+	public function GetLeftField()
+	{
+		return $this->m_oLeftField;
+	}
+	public function GetRightField()
+	{
+		return $this->m_oRightField;
+	}
+	public function GetOperator()
+	{
+		return $this->m_sOperator;
+	}
+}
+
+interface CheckableExpression
+{
+	/**
+	 * Check the validity of the expression with regard to the data model
+	 * and the query in which it is used
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @param array $aAliases Aliases to class names (for the current query)
+	 * @param string $sSourceQuery For the reporting
+	 * @throws OqlNormalizeException
+	 */	 	
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery);
+}
+
+class BinaryOqlExpression extends BinaryExpression implements CheckableExpression
+{
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		$this->m_oLeftExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
+		$this->m_oRightExpr->Check($oModelReflection, $aAliases, $sSourceQuery);
+	}
+}
+
+class ScalarOqlExpression extends ScalarExpression implements CheckableExpression
+{
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		// a scalar is always fine
+	}
+}
+
+class FieldOqlExpression extends FieldExpression implements CheckableExpression
+{
+	protected $m_oParent;
+	protected $m_oName;
+
+	public function __construct($oName, $oParent = null)
+	{
+		if (is_null($oParent))
+		{
+			$oParent = new OqlName('', 0);
+		}
+		$this->m_oParent = $oParent;
+		$this->m_oName = $oName;
+
+		parent::__construct($oName->GetValue(), $oParent->GetValue());
+	}
+
+	public function GetParentDetails()
+	{
+		return $this->m_oParent;
+	}
+
+	public function GetNameDetails()
+	{
+		return $this->m_oName;
+	}
+
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		$sClassAlias = $this->GetParent();
+		$sFltCode = $this->GetName();
+		if (empty($sClassAlias))
+		{
+			// Try to find an alias
+			// Build an array of field => array of aliases
+			$aFieldClasses = array();
+			foreach($aAliases as $sAlias => $sReal)
+			{
+				foreach($oModelReflection->GetFiltersList($sReal) as $sAnFltCode)
+				{
+					$aFieldClasses[$sAnFltCode][] = $sAlias;
+				}
+			}
+			if (!array_key_exists($sFltCode, $aFieldClasses))
+			{
+				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), array_keys($aFieldClasses));
+			}
+			if (count($aFieldClasses[$sFltCode]) > 1)
+			{
+				throw new OqlNormalizeException('Ambiguous filter code', $sSourceQuery, $this->GetNameDetails());
+			}
+			$sClassAlias = $aFieldClasses[$sFltCode][0];
+		}
+		else
+		{
+			if (!array_key_exists($sClassAlias, $aAliases))
+			{
+				throw new OqlNormalizeException('Unknown class [alias]', $sSourceQuery, $this->GetParentDetails(), array_keys($aAliases));
+			}
+			$sClass = $aAliases[$sClassAlias];
+			if (!$oModelReflection->IsValidFilterCode($sClass, $sFltCode))
+			{
+				throw new OqlNormalizeException('Unknown filter code', $sSourceQuery, $this->GetNameDetails(), $oModelReflection->GetFiltersList($sClass));
+			}
+		}
+	}
+}
+
+class VariableOqlExpression extends VariableExpression implements CheckableExpression
+{
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		// a scalar is always fine
+	}
+}
+
+class ListOqlExpression extends ListExpression implements CheckableExpression
+{
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		foreach ($this->GetItems() as $oItemExpression)
+		{
+			$oItemExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
+		}
+	}
+}
+
+class FunctionOqlExpression extends FunctionExpression implements CheckableExpression
+{
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		foreach ($this->GetArgs() as $oArgExpression)
+		{
+			$oArgExpression->Check($oModelReflection, $aAliases, $sSourceQuery);
+		}
+	}
+}
+
+class IntervalOqlExpression extends IntervalExpression implements CheckableExpression
+{
+	public function Check(ModelReflection $oModelReflection, $aAliases, $sSourceQuery)
+	{
+		// an interval is always fine (made of a scalar and unit)
+	}
+}
+
+abstract class OqlQuery
+{
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Check the validity of the expression with regard to the data model
+	 * and the query in which it is used
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @param string $sSourceQuery
+	 */
+	abstract public function Check(ModelReflection $oModelReflection, $sSourceQuery);
+
+	/**
+	 * Determine the class
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @return string
+	 * @throws Exception
+	 */
+	abstract public function GetClass(ModelReflection $oModelReflection);
+
+	/**
+	 * Determine the class alias
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	abstract public function GetClassAlias();
+}
+
+class OqlObjectQuery extends OqlQuery
+{
+	protected $m_aSelect; // array of selected classes
+	protected $m_oClass;
+	protected $m_oClassAlias;
+	protected $m_aJoins; // array of OqlJoinSpec
+	protected $m_oCondition; // condition tree (expressions)
+
+	public function __construct($oClass, $oClassAlias, $oCondition = null, $aJoins = null, $aSelect = null)
+	{
+		$this->m_aSelect = $aSelect;
+		$this->m_oClass = $oClass;
+		$this->m_oClassAlias = $oClassAlias;
+		$this->m_aJoins = $aJoins;
+		$this->m_oCondition = $oCondition;
+
+		parent::__construct();
+	}
+
+	public function GetSelectedClasses()
+	{
+		return $this->m_aSelect;
+	}
+
+	/**
+	 * Determine the class
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @return string
+	 * @throws Exception
+	 */
+	public function GetClass(ModelReflection $oModelReflection)
+	{
+		return $this->m_oClass->GetValue();
+	}
+
+	/**
+	 * Determine the class alias
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function GetClassAlias()
+	{
+		return $this->m_oClassAlias->GetValue();
+	}
+
+	public function GetClassDetails()
+	{
+		return $this->m_oClass;
+	}
+	public function GetClassAliasDetails()
+	{
+		return $this->m_oClassAlias;
+	}
+
+	public function GetJoins()
+	{
+		return $this->m_aJoins;
+	}
+	public function GetCondition()
+	{
+		return $this->m_oCondition;
+	}
+
+	/**
+	 * Recursively check the validity of the expression with regard to the data model
+	 * and the query in which it is used
+	 * 	 	 
+	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
+	 * @throws OqlNormalizeException
+	 */	 	
+	public function Check(ModelReflection $oModelReflection, $sSourceQuery)
+	{
+		$sClass = $this->GetClass($oModelReflection);
+		$sClassAlias = $this->GetClassAlias();
+
+		if (!$oModelReflection->IsValidClass($sClass))
+		{
+			throw new UnknownClassOqlException($sSourceQuery, $this->GetClassDetails(), $oModelReflection->GetClasses());
+		}
+
+		$aAliases = array($sClassAlias => $sClass);
+
+		$aJoinSpecs = $this->GetJoins();
+		if (is_array($aJoinSpecs))
+		{
+			foreach ($aJoinSpecs as $oJoinSpec)
+			{
+				$sJoinClass = $oJoinSpec->GetClass();
+				$sJoinClassAlias = $oJoinSpec->GetClassAlias();
+				if (!$oModelReflection->IsValidClass($sJoinClass))
+				{
+					throw new UnknownClassOqlException($sSourceQuery, $oJoinSpec->GetClassDetails(), $oModelReflection->GetClasses());
+				}
+				if (array_key_exists($sJoinClassAlias, $aAliases))
+				{
+					if ($sJoinClassAlias != $sJoinClass)
+					{
+						throw new OqlNormalizeException('Duplicate class alias', $sSourceQuery, $oJoinSpec->GetClassAliasDetails());
+					}
+					else
+					{
+						throw new OqlNormalizeException('Duplicate class name', $sSourceQuery, $oJoinSpec->GetClassDetails());
+					}
+				} 
+
+				// Assumption: ext key on the left only !!!
+				// normalization should take care of this
+				$oLeftField = $oJoinSpec->GetLeftField();
+				$sFromClass = $oLeftField->GetParent();
+				$sExtKeyAttCode = $oLeftField->GetName();
+
+				$oRightField = $oJoinSpec->GetRightField();
+				$sToClass = $oRightField->GetParent();
+				$sPKeyDescriptor = $oRightField->GetName();
+				if ($sPKeyDescriptor != 'id')
+				{
+					throw new OqlNormalizeException('Wrong format for Join clause (right hand), expecting an id', $sSourceQuery, $oRightField->GetNameDetails(), array('id'));
+				}
+
+				$aAliases[$sJoinClassAlias] = $sJoinClass;
+
+				if (!array_key_exists($sFromClass, $aAliases))
+				{
+					throw new OqlNormalizeException('Unknown class in join condition (left expression)', $sSourceQuery, $oLeftField->GetParentDetails(), array_keys($aAliases));
+				}
+				if (!array_key_exists($sToClass, $aAliases))
+				{
+					throw new OqlNormalizeException('Unknown class in join condition (right expression)', $sSourceQuery, $oRightField->GetParentDetails(), array_keys($aAliases));
+				}
+				$aExtKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeExternalKey');
+				$aObjKeys = $oModelReflection->ListAttributes($aAliases[$sFromClass], 'AttributeObjectKey');
+				$aAllKeys = array_merge($aExtKeys, $aObjKeys);
+				if (!array_key_exists($sExtKeyAttCode, $aAllKeys))
+				{
+					throw new OqlNormalizeException('Unknown key in join condition (left expression)', $sSourceQuery, $oLeftField->GetNameDetails(), array_keys($aAllKeys));
+				}
+
+				if ($sFromClass == $sJoinClassAlias)
+				{
+					if (array_key_exists($sExtKeyAttCode, $aExtKeys)) // Skip that check for object keys
+					{
+						$sTargetClass = $oModelReflection->GetAttributeProperty($aAliases[$sFromClass], $sExtKeyAttCode, 'targetclass');
+						if(!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass))
+						{
+							throw new OqlNormalizeException("The joined class ($aAliases[$sFromClass]) is not compatible with the external key, which is pointing to $sTargetClass", $sSourceQuery, $oLeftField->GetNameDetails());
+						}
+					}
+				}
+				else
+				{
+					$sOperator = $oJoinSpec->GetOperator();
+					switch($sOperator)
+					{
+						case '=':
+						$iOperatorCode = TREE_OPERATOR_EQUALS;
+						break;
+						case 'BELOW':
+						$iOperatorCode = TREE_OPERATOR_BELOW;
+						break;
+						case 'BELOW_STRICT':
+						$iOperatorCode = TREE_OPERATOR_BELOW_STRICT;
+						break;
+						case 'NOT_BELOW':
+						$iOperatorCode = TREE_OPERATOR_NOT_BELOW;
+						break;
+						case 'NOT_BELOW_STRICT':
+						$iOperatorCode = TREE_OPERATOR_NOT_BELOW_STRICT;
+						break;
+						case 'ABOVE':
+						$iOperatorCode = TREE_OPERATOR_ABOVE;
+						break;
+						case 'ABOVE_STRICT':
+						$iOperatorCode = TREE_OPERATOR_ABOVE_STRICT;
+						break;
+						case 'NOT_ABOVE':
+						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE;
+						break;
+						case 'NOT_ABOVE_STRICT':
+						$iOperatorCode = TREE_OPERATOR_NOT_ABOVE_STRICT;
+						break;
+					}
+					if (array_key_exists($sExtKeyAttCode, $aExtKeys)) // Skip that check for object keys
+					{
+						$sTargetClass = $oModelReflection->GetAttributeProperty($aAliases[$sFromClass], $sExtKeyAttCode, 'targetclass');
+						if(!$oModelReflection->IsSameFamilyBranch($aAliases[$sToClass], $sTargetClass))
+						{
+							throw new OqlNormalizeException("The joined class ($aAliases[$sToClass]) is not compatible with the external key, which is pointing to $sTargetClass", $sSourceQuery, $oLeftField->GetNameDetails());
+						}
+					}
+					$aAttList = $oModelReflection->ListAttributes($aAliases[$sFromClass]);
+					$sAttType = $aAttList[$sExtKeyAttCode];
+					if(($iOperatorCode != TREE_OPERATOR_EQUALS) && !is_subclass_of($sAttType, 'AttributeHierarchicalKey') && ($sAttType != 'AttributeHierarchicalKey'))
+					{
+						throw new OqlNormalizeException("The specified tree operator $sOperator is not applicable to the key", $sSourceQuery, $oLeftField->GetNameDetails());
+					}
+				}
+			}
+		}
+
+		// Check the select information
+		//
+		foreach ($this->GetSelectedClasses() as $oClassDetails)
+		{
+			$sClassToSelect = $oClassDetails->GetValue();
+			if (!array_key_exists($sClassToSelect, $aAliases))
+			{
+				throw new OqlNormalizeException('Unknown class [alias]', $sSourceQuery, $oClassDetails, array_keys($aAliases));
+			}
+		}
+
+		// Check the condition tree
+		//
+		if ($this->m_oCondition instanceof Expression)
+		{
+			$this->m_oCondition->Check($oModelReflection, $aAliases, $sSourceQuery);
+		}
+	}
+
+	/**
+	 * Make the relevant DBSearch instance (FromOQL)
+	 */	 	
+	public function ToDBSearch($sQuery)
+	{
+		$sClass = $this->GetClass(new ModelReflectionRuntime());
+		$sClassAlias = $this->GetClassAlias();
+
+		$oSearch = new DBObjectSearch($sClass, $sClassAlias);
+		$oSearch->InitFromOqlQuery($this, $sQuery);
+		return $oSearch;
+	}
+}
+
+class OqlUnionQuery extends OqlQuery
+{
+	protected $aQueries;
+
+	public function __construct(OqlObjectQuery $oLeftQuery, OqlQuery $oRightQueryOrUnion)
+	{
+		$this->aQueries[] = $oLeftQuery;
+		if ($oRightQueryOrUnion instanceof OqlUnionQuery)
+		{
+			foreach ($oRightQueryOrUnion->GetQueries() as $oSingleQuery)
+			{
+				$this->aQueries[] = $oSingleQuery;
+			}
+		}
+		else
+		{
+			$this->aQueries[] = $oRightQueryOrUnion;
+		}
+	}
+	
+	public function GetQueries()
+	{
+		return $this->aQueries;
+	}
+
+	/**
+	 * Check the validity of the expression with regard to the data model
+	 * and the query in which it is used
+	 * 	 	 
+	 * @param ModelReflection $oModelReflection MetaModel to consider	 	
+	 * @throws OqlNormalizeException
+	 */	 	
+	public function Check(ModelReflection $oModelReflection, $sSourceQuery)
+	{
+		$aColumnToClasses = array();
+		foreach ($this->aQueries as $iQuery => $oQuery)
+		{
+			$oQuery->Check($oModelReflection, $sSourceQuery);
+
+			$aAliasToClass = array($oQuery->GetClassAlias() => $oQuery->GetClass($oModelReflection));
+			$aJoinSpecs = $oQuery->GetJoins();
+			if (is_array($aJoinSpecs))
+			{
+				foreach ($aJoinSpecs as $oJoinSpec)
+				{
+					$aAliasToClass[$oJoinSpec->GetClassAlias()] = $oJoinSpec->GetClass();
+				}
+			}
+
+			$aSelectedClasses = $oQuery->GetSelectedClasses();
+			if ($iQuery != 0)
+			{
+				if (count($aSelectedClasses) < count($aColumnToClasses))
+				{
+					$oLastClass = end($aSelectedClasses);
+					throw new OqlNormalizeException('Too few selected classes in the subquery', $sSourceQuery, $oLastClass);
+				}
+				if (count($aSelectedClasses) > count($aColumnToClasses))
+				{
+					$oLastClass = end($aSelectedClasses);
+					throw new OqlNormalizeException('Too many selected classes in the subquery', $sSourceQuery, $oLastClass);
+				}
+			}
+			foreach ($aSelectedClasses as $iColumn => $oClassDetails)
+			{
+				$sAlias = $oClassDetails->GetValue();
+				$sClass = $aAliasToClass[$sAlias];
+				$aColumnToClasses[$iColumn][] = array(
+					'alias' => $sAlias,
+					'class' => $sClass,
+					'class_name' => $oClassDetails,
+				);
+			}
+		}
+		foreach ($aColumnToClasses as $iColumn => $aClasses)
+		{
+			foreach ($aClasses as $iQuery => $aData)
+			{
+				if ($iQuery == 0)
+				{
+					// Establish the reference
+					$sRootClass = $oModelReflection->GetRootClass($aData['class']);
+				}
+				else
+				{
+					if ($oModelReflection->GetRootClass($aData['class']) != $sRootClass)
+					{
+						$aSubclasses = $oModelReflection->EnumChildClasses($sRootClass, ENUM_CHILD_CLASSES_ALL);
+						throw new OqlNormalizeException('Incompatible classes: could not find a common ancestor', $sSourceQuery, $aData['class_name'], $aSubclasses);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Determine the class
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @return string
+	 * @throws Exception
+	 */
+	public function GetClass(ModelReflection $oModelReflection)
+	{
+		$aFirstColClasses = array();
+		foreach ($this->aQueries as $iQuery => $oQuery)
+		{
+			$aFirstColClasses[] = $oQuery->GetClass($oModelReflection);
+		}
+		$sClass = self::GetLowestCommonAncestor($oModelReflection, $aFirstColClasses);
+		if (is_null($sClass))
+		{
+			throw new Exception('Could not determine the class of the union query. This issue should have been detected earlier by calling OqlQuery::Check()');
+		}
+		return $sClass;
+	}
+
+	/**
+	 * Determine the class alias
+	 *
+	 * @return string
+	 * @throws Exception
+	 */
+	public function GetClassAlias()
+	{
+		$sAlias = $this->aQueries[0]->GetClassAlias();
+		return $sAlias;
+	}
+
+	/**
+	 * Check the validity of the expression with regard to the data model
+	 * and the query in which it is used
+	 *
+	 * @param ModelReflection $oModelReflection MetaModel to consider
+	 * @param array $aClasses Flat list of classes
+	 * @return string the lowest common ancestor amongst classes, null if none has been found
+	 * @throws Exception
+	 */
+	public static function GetLowestCommonAncestor(ModelReflection $oModelReflection, $aClasses)
+	{
+		$sAncestor = null;
+		foreach($aClasses as $sClass)
+		{
+			if (is_null($sAncestor))
+			{
+				// first loop
+				$sAncestor = $sClass;
+			}
+			elseif ($sClass == $sAncestor)
+			{
+				// remains the same
+			}
+			elseif ($oModelReflection->GetRootClass($sClass) != $oModelReflection->GetRootClass($sAncestor))
+			{
+				$sAncestor = null;
+				break;
+			}
+			else
+			{
+				$sAncestor = self::LowestCommonAncestor($oModelReflection, $sAncestor, $sClass);
+			}
+		}
+		return $sAncestor;
+	}
+
+	/**
+	 * Note: assumes that class A and B have a common ancestor
+	 */
+	protected static function LowestCommonAncestor(ModelReflection $oModelReflection, $sClassA, $sClassB)
+	{
+		if ($sClassA == $sClassB)
+		{
+			$sRet = $sClassA;
+		}
+		elseif (in_array($sClassA, $oModelReflection->EnumChildClasses($sClassB)))
+		{
+			$sRet = $sClassB;
+		}
+		elseif (in_array($sClassB, $oModelReflection->EnumChildClasses($sClassA)))
+		{
+			$sRet = $sClassA;
+		}
+		else
+		{
+			// Recurse
+			$sRet = self::LowestCommonAncestor($oModelReflection, $sClassA, $oModelReflection->GetParentClass($sClassB));
+		}
+		return $sRet;
+	}
+	/**
+	 * Make the relevant DBSearch instance (FromOQL)
+	 */	 	
+	public function ToDBSearch($sQuery)
+	{
+		$aSearches = array();
+		foreach ($this->aQueries as $oQuery)
+		{
+			$aSearches[] = $oQuery->ToDBSearch($sQuery);
+		}
+
+		$oSearch = new DBUnionSearch($aSearches);
+		return $oSearch;
+	}
 }
\ No newline at end of file
diff --git a/core/ormcustomfieldsvalue.class.inc.php b/core/ormcustomfieldsvalue.class.inc.php
index 0b896999d..f345ac53c 100644
--- a/core/ormcustomfieldsvalue.class.inc.php
+++ b/core/ormcustomfieldsvalue.class.inc.php
@@ -1,103 +1,103 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Base class to hold the value managed by CustomFieldsHandler
- *
- * @copyright   Copyright (C) 2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ormCustomFieldsValue
-{
-	protected $oHostObject;
-	protected $sAttCode;
-	protected $aCurrentValues;
-
-	/**
-	 * @param DBObject $oHostObject
-	 * @param $sAttCode
-	 */
-	public function __construct(DBObject $oHostObject, $sAttCode, $aCurrentValues = null)
-	{
-		$this->oHostObject = $oHostObject;
-		$this->sAttCode = $sAttCode;
-		$this->aCurrentValues = $aCurrentValues;
-	}
-
-	public function GetValues()
-	{
-		return $this->aCurrentValues;
-	}
-
-	/**
-	 * Wrapper used when the only thing you have is the value...
-	 * @return \Combodo\iTop\Form\Form
-	 */
-	public function GetForm()
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
-		return $oAttDef->GetForm($this->oHostObject);
-	}
-
-	public function GetAsHTML($bLocalize = true)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
-		$oHandler = $oAttDef->GetHandler($this->GetValues());
-		return $oHandler->GetAsHTML($this->aCurrentValues, $bLocalize);
-	}
-
-	public function GetAsXML($bLocalize = true)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
-		$oHandler = $oAttDef->GetHandler($this->GetValues());
-		return $oHandler->GetAsXML($this->aCurrentValues, $bLocalize);
-	}
-
-	public function GetAsCSV($sSeparator = ',', $sTextQualifier = '"', $bLocalize = true)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
-		$oHandler = $oAttDef->GetHandler($this->GetValues());
-		return $oHandler->GetAsCSV($this->aCurrentValues, $sSeparator, $sTextQualifier, $bLocalize);
-	}
-
-	/**
-	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
-	 * @param $value mixed The current value of the field
-	 * @param $sVerb string The verb specifying the representation of the value
-	 * @param $bLocalize bool Whether or not to localize the value
-	 */
-	public function GetForTemplate($sVerb, $bLocalize = true)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
-		$oHandler = $oAttDef->GetHandler($this->GetValues());
-		return $oHandler->GetForTemplate($this->aCurrentValues, $sVerb, $bLocalize);
-	}
-
-	/**
-	 * @param ormCustomFieldsValue $fellow
-	 * @return bool
-	 */
-	public function Equals(ormCustomFieldsValue $oReference)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
-		$oHandler = $oAttDef->GetHandler($this->GetValues());
-		return $oHandler->CompareValues($this->aCurrentValues, $oReference->aCurrentValues);
-	}
-}
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Base class to hold the value managed by CustomFieldsHandler
+ *
+ * @copyright   Copyright (C) 2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class ormCustomFieldsValue
+{
+	protected $oHostObject;
+	protected $sAttCode;
+	protected $aCurrentValues;
+
+	/**
+	 * @param DBObject $oHostObject
+	 * @param $sAttCode
+	 */
+	public function __construct(DBObject $oHostObject, $sAttCode, $aCurrentValues = null)
+	{
+		$this->oHostObject = $oHostObject;
+		$this->sAttCode = $sAttCode;
+		$this->aCurrentValues = $aCurrentValues;
+	}
+
+	public function GetValues()
+	{
+		return $this->aCurrentValues;
+	}
+
+	/**
+	 * Wrapper used when the only thing you have is the value...
+	 * @return \Combodo\iTop\Form\Form
+	 */
+	public function GetForm()
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
+		return $oAttDef->GetForm($this->oHostObject);
+	}
+
+	public function GetAsHTML($bLocalize = true)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
+		$oHandler = $oAttDef->GetHandler($this->GetValues());
+		return $oHandler->GetAsHTML($this->aCurrentValues, $bLocalize);
+	}
+
+	public function GetAsXML($bLocalize = true)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
+		$oHandler = $oAttDef->GetHandler($this->GetValues());
+		return $oHandler->GetAsXML($this->aCurrentValues, $bLocalize);
+	}
+
+	public function GetAsCSV($sSeparator = ',', $sTextQualifier = '"', $bLocalize = true)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
+		$oHandler = $oAttDef->GetHandler($this->GetValues());
+		return $oHandler->GetAsCSV($this->aCurrentValues, $sSeparator, $sTextQualifier, $bLocalize);
+	}
+
+	/**
+	 * Get various representations of the value, for insertion into a template (e.g. in Notifications)
+	 * @param $value mixed The current value of the field
+	 * @param $sVerb string The verb specifying the representation of the value
+	 * @param $bLocalize bool Whether or not to localize the value
+	 */
+	public function GetForTemplate($sVerb, $bLocalize = true)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
+		$oHandler = $oAttDef->GetHandler($this->GetValues());
+		return $oHandler->GetForTemplate($this->aCurrentValues, $sVerb, $bLocalize);
+	}
+
+	/**
+	 * @param ormCustomFieldsValue $fellow
+	 * @return bool
+	 */
+	public function Equals(ormCustomFieldsValue $oReference)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this->oHostObject), $this->sAttCode);
+		$oHandler = $oAttDef->GetHandler($this->GetValues());
+		return $oHandler->CompareValues($this->aCurrentValues, $oReference->aCurrentValues);
+	}
+}
diff --git a/core/ormdocument.class.inc.php b/core/ormdocument.class.inc.php
index 585c4a3d2..3ff796f8c 100644
--- a/core/ormdocument.class.inc.php
+++ b/core/ormdocument.class.inc.php
@@ -1,198 +1,198 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * ormDocument
- * encapsulate the behavior of a binary data set that will be stored an attribute of class AttributeBlob 
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * ormDocument
- * encapsulate the behavior of a binary data set that will be stored an attribute of class AttributeBlob 
- *
- * @package     itopORM
- */
-
-class ormDocument
-{
-	protected $m_data;
-	protected $m_sMimeType;
-	protected $m_sFileName;
-	
-	/**
-	 * Constructor
-	 */
-	public function __construct($data = null, $sMimeType = 'text/plain', $sFileName = '')
-	{
-		$this->m_data = $data;
-		$this->m_sMimeType = $sMimeType;
-		$this->m_sFileName = $sFileName;
-	}
-
-	public function __toString()
-	{
-	    if($this->IsEmpty()) return '';
-
-		return MyHelpers::beautifulstr($this->m_data, 100, true);
-	}
-
-	public function IsEmpty()
-	{
-		return ($this->m_data == null);
-	}
-	
-	public function GetMimeType()
-	{
-		return $this->m_sMimeType;
-	}
-	public function GetMainMimeType()
-	{
-		$iSeparatorPos = strpos($this->m_sMimeType, '/');
-		if ($iSeparatorPos > 0)
-		{
-			return substr($this->m_sMimeType, 0, $iSeparatorPos);
-		}
-		return $this->m_sMimeType;
-	}
-
-	public function GetData()
-	{
-		return $this->m_data;
-	}
-
-	public function GetFileName()
-	{
-		return $this->m_sFileName;
-	}
-
-	public function GetAsHTML()
-	{
-		$sResult = '';
-		if ($this->IsEmpty())
-		{
-			// If the filename is not empty, display it, this is used
-			// by the creation wizard while the file has not yet been uploaded
-			$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8');
-		}
-		else
-		{
-			$data = $this->GetData();
-			$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8').' [ '.$this->GetMimeType().', size: '.strlen($data).' byte(s) ]<br/>';
-		}
-		return $sResult;
-	}
-		
-	/**
-	 * Returns an hyperlink to display the document *inline*
-	 * @return string
-	 */	 	 	
-	public function GetDisplayLink($sClass, $Id, $sAttCode)
-	{
-		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode\" target=\"_blank\" >".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
-	}
-	
-	/**
-	 * Returns an hyperlink to download the document (content-disposition: attachment)
-	 * @return string
-	 */	 	 	
-	public function GetDownloadLink($sClass, $Id, $sAttCode)
-	{
-		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.document.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode\">".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
-	}
-
-	/**
-	 * Returns an URL to display a document like an image
-	 * @return string
-	 */
-	public function GetDisplayURL($sClass, $Id, $sAttCode)
-	{
-		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode";
-	}
-
-	/**
-	 * Returns an URL to download a document like an image (uses HTTP caching)
-	 * @return string
-	 */
-	public function GetDownloadURL($sClass, $Id, $sAttCode)
-	{
-		// Compute a signature to reset the cache anytime the data changes (this is acceptable if used only with icon files)
-		$sSignature = md5($this->GetData());
-		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.document.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode&s=$sSignature&cache=86400";
-	}
-
-	public function IsPreviewAvailable()
-	{
-		$bRet = false;
-		switch($this->GetMimeType())
-		{
-			case 'image/png':
-			case 'image/jpg':
-			case 'image/jpeg':
-			case 'image/gif':
-			$bRet = true;
-			break;
-		}
-		return $bRet;
-	}
-
-	/**
-	 * Downloads a document to the browser, either as 'inline' or 'attachment'
-	 *
-	 * @param WebPage $oPage The web page for the output
-	 * @param string $sClass Class name of the object
-	 * @param mixed $id Identifier of the object
-	 * @param string $sAttCode Name of the attribute containing the document to download
-	 * @param string $sContentDisposition Either 'inline' or 'attachment'
-	 * @param string $sSecretField The attcode of the field containing a "secret" to be provided in order to retrieve the file
-	 * @param string $sSecretValue The value of the secret to be compared with the value of the attribute $sSecretField
-	 * @return none
-	 */
-	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null)
-	{
-		try
-		{
-			$oObj = MetaModel::GetObject($sClass, $id, false, false);
-			if (!is_object($oObj))
-			{
-				throw new Exception("Invalid id ($id) for class '$sClass' - the object does not exist or you are not allowed to view it");
-			}
-			if (($sSecretField != null) && ($oObj->Get($sSecretField) != $sSecretValue))
-			{
-				usleep(200);
-				throw new Exception("Invalid secret for class '$sClass' - the object does not exist or you are not allowed to view it");
-			}
-			$oDocument = $oObj->Get($sAttCode);
-			if (is_object($oDocument))
-			{
-				$oPage->TrashUnexpectedOutput();
-				$oPage->SetContentType($oDocument->GetMimeType());
-				$oPage->SetContentDisposition($sContentDisposition,$oDocument->GetFileName());
-				$oPage->add($oDocument->GetData());
-			}
-		}
-		catch(Exception $e)
-		{
-			$oPage->p($e->getMessage());
-		}
-	}
-}
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * ormDocument
+ * encapsulate the behavior of a binary data set that will be stored an attribute of class AttributeBlob 
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * ormDocument
+ * encapsulate the behavior of a binary data set that will be stored an attribute of class AttributeBlob 
+ *
+ * @package     itopORM
+ */
+
+class ormDocument
+{
+	protected $m_data;
+	protected $m_sMimeType;
+	protected $m_sFileName;
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct($data = null, $sMimeType = 'text/plain', $sFileName = '')
+	{
+		$this->m_data = $data;
+		$this->m_sMimeType = $sMimeType;
+		$this->m_sFileName = $sFileName;
+	}
+
+	public function __toString()
+	{
+	    if($this->IsEmpty()) return '';
+
+		return MyHelpers::beautifulstr($this->m_data, 100, true);
+	}
+
+	public function IsEmpty()
+	{
+		return ($this->m_data == null);
+	}
+	
+	public function GetMimeType()
+	{
+		return $this->m_sMimeType;
+	}
+	public function GetMainMimeType()
+	{
+		$iSeparatorPos = strpos($this->m_sMimeType, '/');
+		if ($iSeparatorPos > 0)
+		{
+			return substr($this->m_sMimeType, 0, $iSeparatorPos);
+		}
+		return $this->m_sMimeType;
+	}
+
+	public function GetData()
+	{
+		return $this->m_data;
+	}
+
+	public function GetFileName()
+	{
+		return $this->m_sFileName;
+	}
+
+	public function GetAsHTML()
+	{
+		$sResult = '';
+		if ($this->IsEmpty())
+		{
+			// If the filename is not empty, display it, this is used
+			// by the creation wizard while the file has not yet been uploaded
+			$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8');
+		}
+		else
+		{
+			$data = $this->GetData();
+			$sResult = htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8').' [ '.$this->GetMimeType().', size: '.strlen($data).' byte(s) ]<br/>';
+		}
+		return $sResult;
+	}
+		
+	/**
+	 * Returns an hyperlink to display the document *inline*
+	 * @return string
+	 */	 	 	
+	public function GetDisplayLink($sClass, $Id, $sAttCode)
+	{
+		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode\" target=\"_blank\" >".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
+	}
+	
+	/**
+	 * Returns an hyperlink to download the document (content-disposition: attachment)
+	 * @return string
+	 */	 	 	
+	public function GetDownloadLink($sClass, $Id, $sAttCode)
+	{
+		return "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/ajax.document.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode\">".htmlentities($this->GetFileName(), ENT_QUOTES, 'UTF-8')."</a>\n";
+	}
+
+	/**
+	 * Returns an URL to display a document like an image
+	 * @return string
+	 */
+	public function GetDisplayURL($sClass, $Id, $sAttCode)
+	{
+		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.render.php?operation=display_document&class=$sClass&id=$Id&field=$sAttCode";
+	}
+
+	/**
+	 * Returns an URL to download a document like an image (uses HTTP caching)
+	 * @return string
+	 */
+	public function GetDownloadURL($sClass, $Id, $sAttCode)
+	{
+		// Compute a signature to reset the cache anytime the data changes (this is acceptable if used only with icon files)
+		$sSignature = md5($this->GetData());
+		return utils::GetAbsoluteUrlAppRoot() . "pages/ajax.document.php?operation=download_document&class=$sClass&id=$Id&field=$sAttCode&s=$sSignature&cache=86400";
+	}
+
+	public function IsPreviewAvailable()
+	{
+		$bRet = false;
+		switch($this->GetMimeType())
+		{
+			case 'image/png':
+			case 'image/jpg':
+			case 'image/jpeg':
+			case 'image/gif':
+			$bRet = true;
+			break;
+		}
+		return $bRet;
+	}
+
+	/**
+	 * Downloads a document to the browser, either as 'inline' or 'attachment'
+	 *
+	 * @param WebPage $oPage The web page for the output
+	 * @param string $sClass Class name of the object
+	 * @param mixed $id Identifier of the object
+	 * @param string $sAttCode Name of the attribute containing the document to download
+	 * @param string $sContentDisposition Either 'inline' or 'attachment'
+	 * @param string $sSecretField The attcode of the field containing a "secret" to be provided in order to retrieve the file
+	 * @param string $sSecretValue The value of the secret to be compared with the value of the attribute $sSecretField
+	 * @return none
+	 */
+	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null)
+	{
+		try
+		{
+			$oObj = MetaModel::GetObject($sClass, $id, false, false);
+			if (!is_object($oObj))
+			{
+				throw new Exception("Invalid id ($id) for class '$sClass' - the object does not exist or you are not allowed to view it");
+			}
+			if (($sSecretField != null) && ($oObj->Get($sSecretField) != $sSecretValue))
+			{
+				usleep(200);
+				throw new Exception("Invalid secret for class '$sClass' - the object does not exist or you are not allowed to view it");
+			}
+			$oDocument = $oObj->Get($sAttCode);
+			if (is_object($oDocument))
+			{
+				$oPage->TrashUnexpectedOutput();
+				$oPage->SetContentType($oDocument->GetMimeType());
+				$oPage->SetContentDisposition($sContentDisposition,$oDocument->GetFileName());
+				$oPage->add($oDocument->GetData());
+			}
+		}
+		catch(Exception $e)
+		{
+			$oPage->p($e->getMessage());
+		}
+	}
+}
diff --git a/core/ormlinkset.class.inc.php b/core/ormlinkset.class.inc.php
index 72fda32b5..ecd610124 100644
--- a/core/ormlinkset.class.inc.php
+++ b/core/ormlinkset.class.inc.php
@@ -1,750 +1,750 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-require_once('dbobjectiterator.php');
-
-
-/**
- * The value for an attribute representing a set of links between the host object and "remote" objects
- *
- * @package     iTopORM
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
-{
-	protected $sHostClass; // subclass of DBObject
-	protected $sAttCode; // xxxxxx_list
-	protected $sClass; // class of the links
-
-	/**
-	 * @var DBObjectSet
-	 */
-	protected $oOriginalSet;
-
-	/**
-	 * @var DBObject[] array of iObjectId => DBObject
-	 */
-	protected $aOriginalObjects = null;
-
-	/**
-	 * @var bool
-	 */
-	protected $bHasDelta = false;
-
-	/**
-	 * Object from the original set, minus the removed objects
-	 * @var DBObject[] array of iObjectId => DBObject
-	 */
-	protected $aPreserved = array();
-
-	/**
-	 * @var DBObject[] New items
-	 */
-	protected $aAdded = array();
-
-	/**
-	 * @var DBObject[] Modified items (could also be found in aPreserved)
-	 */
-	protected $aModified = array();
-
-	/**
-	 * @var int[] Removed items
-	 */
-	protected $aRemoved = array();
-
-	/**
-	 * @var int Position in the collection
-	 */
-	protected $iCursor = 0;
-
-	/**
-	 * __toString magical function overload.
-	 */
-	public function __toString()
-	{
-		return '';
-	}
-
-	/**
-	 * ormLinkSet constructor.
-	 * @param $sHostClass
-	 * @param $sAttCode
-	 * @param DBObjectSet|null $oOriginalSet
-	 * @throws Exception
-	 */
-	public function __construct($sHostClass, $sAttCode, DBObjectSet $oOriginalSet = null)
-	{
-		$this->sHostClass = $sHostClass;
-		$this->sAttCode = $sAttCode;
-		$this->oOriginalSet = $oOriginalSet ? clone $oOriginalSet : null;
-
-		$oAttDef = MetaModel::GetAttributeDef($sHostClass, $sAttCode);
-		if (!$oAttDef instanceof AttributeLinkedSet)
-		{
-			throw new Exception("ormLinkSet: $sAttCode is not a link set");
-		}
-		$this->sClass = $oAttDef->GetLinkedClass();
-		if ($oOriginalSet && ($oOriginalSet->GetClass() != $this->sClass))
-		{
-			throw new Exception("ormLinkSet: wrong class for the original set, found {$oOriginalSet->GetClass()} while expecting {$oAttDef->GetLinkedClass()}");
-		}
-	}
-
-	public function GetFilter()
-	{
-		return clone $this->oOriginalSet->GetFilter();
-	}
-
-	/**
-	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
-	 *
-	 * @param hash $aAttToLoad Format: alias => array of attribute_codes
-	 *
-	 * @return void
-	 */
-	public function OptimizeColumnLoad($aAttToLoad)
-	{
-		$this->oOriginalSet->OptimizeColumnLoad($aAttToLoad);
-	}
-
-	/**
-	 * @param DBObject $oLink
-	 */
-	public function AddItem(DBObject $oLink)
-	{
-		assert($oLink instanceof $this->sClass);
-		// No impact on the iteration algorithm
-        $iObjectId = $oLink->GetKey();
-		$this->aAdded[$iObjectId] = $oLink;
-		$this->bHasDelta = true;
-	}
-
-    /**
-     * @param DBObject $oObject
-     * @param string $sClassAlias
-     * @deprecated Since iTop 2.4, use ormLinkset->AddItem() instead.
-     */
-	public function AddObject(DBObject $oObject, $sClassAlias = '')
-    {
-        $this->AddItem($oObject);
-    }
-
-	/**
-	 * @param $iObjectId
-	 */
-	public function RemoveItem($iObjectId)
-	{
-		if (array_key_exists($iObjectId, $this->aPreserved))
-		{
-			unset($this->aPreserved[$iObjectId]);
-			$this->aRemoved[$iObjectId] = $iObjectId;
-			$this->bHasDelta = true;
-		}
-		else
-        {
-            if (array_key_exists($iObjectId, $this->aAdded))
-            {
-                unset($this->aAdded[$iObjectId]);
-            }
-        }
-	}
-
-	/**
-	 * @param DBObject $oLink
-	 */
-	public function ModifyItem(DBObject $oLink)
-	{
-		assert($oLink instanceof $this->sClass);
-
-		$iObjectId = $oLink->GetKey();
-        if (array_key_exists($iObjectId, $this->aPreserved))
-        {
-            unset($this->aPreserved[$iObjectId]);
-            $this->aModified[$iObjectId] = $oLink;
-            $this->bHasDelta = true;
-        }
-	}
-
-	protected function LoadOriginalIds()
-	{
-		if ($this->aOriginalObjects === null)
-		{
-			if ($this->oOriginalSet)
-			{
-				$this->aOriginalObjects = $this->GetArrayOfIndex();
-				$this->aPreserved = $this->aOriginalObjects; // Copy (not effective until aPreserved gets modified)
-                foreach ($this->aRemoved as $iObjectId)
-                {
-                    if (array_key_exists($iObjectId, $this->aPreserved))
-                    {
-                        unset($this->aPreserved[$iObjectId]);
-                    }
-                }
-                foreach ($this->aModified as $iObjectId => $oLink)
-                {
-                    if (array_key_exists($iObjectId, $this->aPreserved))
-                    {
-                        unset($this->aPreserved[$iObjectId]);
-                    }
-                }
-			}
-			else
-			{
-
-				// Nothing to load
-				$this->aOriginalObjects = array();
-				$this->aPreserved = array();
-			}
-		}
-	}
-
-	/**
-	 * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
-	 * @return array
-	 */
-	protected function GetArrayOfIndex()
-	{
-		$aRet = array();
-		$this->oOriginalSet->Rewind();
-		$iRow = 0;
-		while ($oObject = $this->oOriginalSet->Fetch())
-		{
-			$aRet[$oObject->GetKey()] = $iRow++;
-		}
-		return $aRet;
-	}
-
-    /**
-     * @param bool $bWithId
-     * @return array
-     * @deprecated Since iTop 2.4, use foreach($this as $oItem){} instead
-     */
-    public function ToArray($bWithId = true)
-    {
-        $aRet = array();
-        foreach($this as $oItem)
-        {
-            if ($bWithId)
-            {
-                $aRet[$oItem->GetKey()] = $oItem;
-            }
-            else
-            {
-                $aRet[] = $oItem;
-            }
-        }
-        return $aRet;
-    }
-
-    /**
-     * @param string $sAttCode
-     * @param bool $bWithId
-     * @return array
-     */
-    public function GetColumnAsArray($sAttCode, $bWithId = true)
-    {
-        $aRet = array();
-        foreach($this as $oItem)
-        {
-            if ($bWithId)
-            {
-                $aRet[$oItem->GetKey()] = $oItem->Get($sAttCode);
-            }
-            else
-            {
-                $aRet[] = $oItem->Get($sAttCode);
-            }
-        }
-        return $aRet;
-    }
-
-    /**
-	 * The class of the objects of the collection (at least a common ancestor)
-	 *
-	 * @return string
-	 */
-	public function GetClass()
-	{
-		return $this->sClass;
-	}
-
-	/**
-	 * The total number of objects in the collection
-	 *
-	 * @return int
-	 */
-	public function Count()
-	{
-		$this->LoadOriginalIds();
-		$iRet = count($this->aPreserved) + count($this->aAdded) + count($this->aModified);
-		return $iRet;
-	}
-
-	/**
-	 * Position the cursor to the given 0-based position
-	 *
-	 * @param $iPosition
-	 * @throws Exception
-	 * @internal param int $iRow
-	 */
-	public function Seek($iPosition)
-	{
-		$this->LoadOriginalIds();
-
-		$iCount = $this->Count();
-		if ($iPosition >= $iCount)
-		{
-			throw new Exception("Invalid position $iPosition: the link set is made of $iCount items.");
-		}
-		$this->rewind();
-		for($iPos = 0 ; $iPos < $iPosition ; $iPos++)
-		{
-			$this->next();
-		}
-	}
-
-	/**
-	 * Fetch the object at the current position in the collection and move the cursor to the next position.
-	 *
-	 * @return DBObject|null The fetched object or null when at the end
-	 */
-	public function Fetch()
-	{
-		$this->LoadOriginalIds();
-
-		$ret = $this->current();
-		if ($ret === false)
-		{
-			$ret = null;
-		}
-		$this->next();
-		return $ret;
-	}
-
-	/**
-	 * Return the current element
-	 * @link http://php.net/manual/en/iterator.current.php
-	 * @return mixed Can return any type.
-	 */
-	public function current()
-	{
-		$this->LoadOriginalIds();
-
-		$iPreservedCount = count($this->aPreserved);
-		if ($this->iCursor < $iPreservedCount)
-		{
-			$iRet = current($this->aPreserved);
-			$this->oOriginalSet->Seek($iRet);
-			$oRet = $this->oOriginalSet->Fetch();
-		}
-		else
-		{
-		    $iModifiedCount = count($this->aModified);
-		    if($this->iCursor < $iPreservedCount + $iModifiedCount)
-            {
-                $oRet = current($this->aModified);
-            }
-            else
-            {
-                $oRet = current($this->aAdded);
-            }
-		}
-		return $oRet;
-	}
-
-	/**
-	 * Move forward to next element
-	 * @link http://php.net/manual/en/iterator.next.php
-	 * @return void Any returned value is ignored.
-	 */
-	public function next()
-	{
-		$this->LoadOriginalIds();
-
-		$iPreservedCount = count($this->aPreserved);
-		if ($this->iCursor < $iPreservedCount)
-		{
-			next($this->aPreserved);
-		}
-		else
-		{
-		    $iModifiedCount = count($this->aModified);
-		    if($this->iCursor < $iPreservedCount + $iModifiedCount)
-            {
-                next($this->aModified);
-            }
-            else
-            {
-                next($this->aAdded);
-            }
-		}
-		// Increment AFTER moving the internal cursors because when starting aModified / aAdded, we must leave it intact
-		$this->iCursor++;
-	}
-
-	/**
-	 * Return the key of the current element
-	 * @link http://php.net/manual/en/iterator.key.php
-	 * @return mixed scalar on success, or null on failure.
-	 */
-	public function key()
-	{
-		return $this->iCursor;
-	}
-
-	/**
-	 * Checks if current position is valid
-	 * @link http://php.net/manual/en/iterator.valid.php
-	 * @return boolean The return value will be casted to boolean and then evaluated.
-	 * Returns true on success or false on failure.
-	 */
-	public function valid()
-	{
-		$this->LoadOriginalIds();
-
-		$iCount = $this->Count();
-		$bRet = ($this->iCursor < $iCount);
-		return $bRet;
-	}
-
-	/**
-	 * Rewind the Iterator to the first element
-	 * @link http://php.net/manual/en/iterator.rewind.php
-	 * @return void Any returned value is ignored.
-	 */
-	public function rewind()
-	{
-	    $this->LoadOriginalIds();
-
-	    $this->iCursor = 0;
-		reset($this->aPreserved);
-        reset($this->aAdded);
-        reset($this->aModified);
-	}
-
-	public function HasDelta()
-	{
-		return $this->bHasDelta;
-	}
-
-	/**
-	 * This method has been designed specifically for AttributeLinkedSet:Equals and as such it assumes that the passed argument is a clone of this.
-	 * @param ormLinkSet $oFellow
-	 * @return bool|null
-	 * @throws Exception
-	 */
-	public function Equals(ormLinkSet $oFellow)
-	{
-		$bRet = null;
-		if ($this === $oFellow)
-		{
-			$bRet = true;
-		}
-		else
-		{
-			if ( ($this->oOriginalSet !== $oFellow->oOriginalSet)
-			&& ($this->oOriginalSet->GetFilter()->ToOQL() != $oFellow->oOriginalSet->GetFilter()->ToOQL()) )
-			{
-				throw new Exception('ormLinkSet::Equals assumes that compared link sets have the same original scope');
-			}
-			if ($this->HasDelta())
-			{
-				throw new Exception('ormLinkSet::Equals assumes that left link set had no delta');
-			}
-			$bRet = !$oFellow->HasDelta();
-		}
-		return $bRet;
-	}
-
-	public function UpdateFromCompleteList(iDBObjectSetIterator $oFellow)
-	{
-		if ($oFellow === $this)
-		{
-			throw new Exception('ormLinkSet::UpdateFromCompleteList assumes that the passed link set is at least a clone of the current one');
-		}
-		$bUpdateFromDelta = false;
-		if ($oFellow instanceof ormLinkSet)
-		{
-			if ( ($this->oOriginalSet === $oFellow->oOriginalSet)
-				|| ($this->oOriginalSet->GetFilter()->ToOQL() == $oFellow->oOriginalSet->GetFilter()->ToOQL()) )
-			{
-				$bUpdateFromDelta = true;
-			}
-		}
-
-		if ($bUpdateFromDelta)
-		{
-			// Same original set -> simply update the delta
-			$this->iCursor = 0;
-			$this->aAdded = $oFellow->aAdded;
-			$this->aRemoved = $oFellow->aRemoved;
-			$this->aModified = $oFellow->aModified;
-			$this->aPreserved = $oFellow->aPreserved;
-			$this->bHasDelta = $oFellow->bHasDelta;
-		}
-		else
-		{
-			// For backward compatibility reasons, let's rebuild a delta...
-
-			// Reset the delta
-			$this->iCursor = 0;
-			$this->aAdded = array();
-			$this->aRemoved = array();
-			$this->aModified = array();
-			$this->aPreserved = ($this->aOriginalObjects === null) ? array() : $this->aOriginalObjects;
-			$this->bHasDelta = false;
-
-			/** @var AttributeLinkedSet $oAttDef */
-			$oAttDef = MetaModel::GetAttributeDef($this->sHostClass, $this->sAttCode);
-			$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-			$sAdditionalKey = null;
-			if ($oAttDef->IsIndirect() && !$oAttDef->DuplicatesAllowed())
-			{
-				$sAdditionalKey = $oAttDef->GetExtKeyToRemote();
-			}
-			// Compare both collections by iterating the whole sets, order them, a build a fingerprint based on meaningful data (what make the difference)
-			$oComparator = new DBObjectSetComparator($this, $oFellow, array($sExtKeyToMe), $sAdditionalKey);
-			$aChanges = $oComparator->GetDifferences();
-			foreach ($aChanges['added'] as $oLink)
-			{
-				$this->AddItem($oLink);
-			}
-
-			foreach ($aChanges['modified'] as $oLink)
-			{
-				$this->ModifyItem($oLink);
-			}
-
-			foreach ($aChanges['removed'] as $oLink)
-			{
-				$this->RemoveItem($oLink->GetKey());
-			}
-		}
-	}
-
-	/**
-	 * Get the list of all modified (added, modified and removed) links
-	 *
-	 * @return array of link objects
-	 * @throws \Exception
-	 */
-	public function ListModifiedLinks()
-	{
-		$aAdded = $this->aAdded;
-		$aModified = $this->aModified;
-		$aRemoved = array();
-		if (count($this->aRemoved) > 0)
-		{
-			$oSearch = new DBObjectSearch($this->sClass);
-			$oSearch->AddCondition('id', $this->aRemoved, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			$aRemoved = $oSet->ToArray();
-		}
-		return array_merge($aAdded, $aModified, $aRemoved);
-	}
-
-	/**
-	 * @param DBObject $oHostObject
-	 */
-	public function DBWrite(DBObject $oHostObject)
-	{
-		/** @var AttributeLinkedSet $oAttDef */
-		$oAttDef = MetaModel::GetAttributeDef(get_class($oHostObject), $this->sAttCode);
-		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
-		$sExtKeyToRemote = $oAttDef->IsIndirect() ? $oAttDef->GetExtKeyToRemote() : 'n/a';
-
-		$aCheckLinks = array();
-		$aCheckRemote = array();
-		foreach ($this->aAdded as $oLink)
-		{
-			if ($oLink->IsNew())
-			{
-				if ($oAttDef->IsIndirect() && !$oAttDef->DuplicatesAllowed())
-				{
-					//todo: faire un test qui passe dans cette branche !
-					$aCheckRemote[] = $oLink->Get($sExtKeyToRemote);
-				}
-			}
-			else
-			{
-				//todo: faire un test qui passe dans cette branche !
-				$aCheckLinks[] = $oLink->GetKey();
-			}
-		}
-		foreach ($this->aRemoved as $iLinkId)
-		{
-			$aCheckLinks[] = $iLinkId;
-		}
-		foreach ($this->aModified as $iLinkId => $oLink)
-		{
-			$aCheckLinks[] = $oLink->GetKey();
-		}
-
-		// Critical section : serialize any write access to these links
-		//
-		$oMtx = new iTopMutex('Write-'.$this->sClass);
-		$oMtx->Lock();
-
-		// Check for the existing links
-		//
-		/** @var DBObject[] $aExistingLinks */
-		$aExistingLinks = array();
-		/** @var Int[] $aExistingRemote */
-		$aExistingRemote = array();
-		if (count($aCheckLinks) > 0)
-		{
-			$oSearch = new DBObjectSearch($this->sClass);
-			$oSearch->AddCondition('id', $aCheckLinks, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			$aExistingLinks = $oSet->ToArray();
-		}
-
-		// Check for the existing remote objects
-		//
-		if (count($aCheckRemote) > 0)
-		{
-			$oSearch = new DBObjectSearch($this->sClass);
-			$oSearch->AddCondition($sExtKeyToMe, $oHostObject->GetKey(), '=');
-			$oSearch->AddCondition($sExtKeyToRemote, $aCheckRemote, 'IN');
-			$oSet = new DBObjectSet($oSearch);
-			$aExistingRemote = $oSet->GetColumnAsArray($sExtKeyToRemote, true);
-		}
-
-		// Write the links according to the existing links
-		//
-		foreach ($this->aAdded as $oLink)
-		{
-			// Make sure that the objects in the set point to "this"
-			$oLink->Set($sExtKeyToMe, $oHostObject->GetKey());
-
-			if ($oLink->IsNew())
-			{
-				if (count($aCheckRemote) > 0)
-				{
-				    $bIsDuplicate = false;
-				    foreach($aExistingRemote as $sLinkKey => $sExtKey)
-                    {
-                        if ($sExtKey == $oLink->Get($sExtKeyToRemote))
-                        {
-                            // Do not create a duplicate
-                            // + In the case of a remove action followed by an add action
-                            // of an existing link,
-                            // the final state to consider is add action,
-                            // so suppress the entry in the removed list.
-                            if (array_key_exists($sLinkKey, $this->aRemoved))
-                            {
-                                unset($this->aRemoved[$sLinkKey]);
-                            }
-                            $bIsDuplicate = true;
-                            break;
-                        }
-                    }
-                    if ($bIsDuplicate)
-                    {
-                        continue;
-                    }
-				}
-
-			}
-			else
-			{
-				if (!array_key_exists($oLink->GetKey(), $aExistingLinks))
-				{
-					$oLink->DBClone();
-				}
-			}
-			$oLink->DBWrite();
-		}
-		foreach ($this->aRemoved as $iLinkId)
-		{
-			if (array_key_exists($iLinkId, $aExistingLinks))
-			{
-				$oLink = $aExistingLinks[$iLinkId];
-				if ($oAttDef->IsIndirect())
-				{
-					$oLink->DBDelete();
-				}
-				else
-				{
-					$oExtKeyToRemote = MetaModel::GetAttributeDef($this->sClass, $sExtKeyToMe);
-					if ($oExtKeyToRemote->IsNullAllowed())
-					{
-						if ($oLink->Get($sExtKeyToMe) == $oHostObject->GetKey())
-						{
-							// Detach the link object from this
-							$oLink->Set($sExtKeyToMe, 0);
-							$oLink->DBUpdate();
-						}
-					}
-					else
-					{
-						$oLink->DBDelete();
-					}
-				}
-			}
-		}
-		// Note: process modifications at the end: if a link to remove has also been listed as modified, then it will be gracefully ignored
-		foreach ($this->aModified as $iLinkId => $oLink)
-		{
-			if (array_key_exists($oLink->GetKey(), $aExistingLinks))
-			{
-				$oLink->DBUpdate();
-			}
-			else
-			{
-				$oLink->DBClone();
-			}
-		}
-
-		// End of the critical section
-		//
-		$oMtx->Unlock();
-	}
-
-	public function ToDBObjectSet($bShowObsolete = true)
-	{
-		$oAttDef = MetaModel::GetAttributeDef($this->sHostClass, $this->sAttCode);
-		$oLinkSearch = $this->GetFilter();
-		if ($oAttDef->IsIndirect())
-		{
-			$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
-			$oLinkingAttDef = MetaModel::GetAttributeDef($this->sClass, $sExtKeyToRemote);
-			$sTargetClass = $oLinkingAttDef->GetTargetClass();
-			if (!$bShowObsolete && MetaModel::IsObsoletable($sTargetClass))
-			{
-				$oNotObsolete = new BinaryExpression(
-					new FieldExpression('obsolescence_flag', $sTargetClass),
-					'=',
-					new ScalarExpression(0)
-				);
-				$oNotObsoleteRemote = new DBObjectSearch($sTargetClass);
-				$oNotObsoleteRemote->AddConditionExpression($oNotObsolete);
-				$oLinkSearch->AddCondition_PointingTo($oNotObsoleteRemote, $sExtKeyToRemote);
-			}
-		}
-		$oLinkSet = new DBObjectSet($oLinkSearch);
-		$oLinkSet->SetShowObsoleteData($bShowObsolete);
-		if ($this->HasDelta())
-		{
-			$oLinkSet->AddObjectArray($this->aAdded);
-		}
-		return $oLinkSet;
-	}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+require_once('dbobjectiterator.php');
+
+
+/**
+ * The value for an attribute representing a set of links between the host object and "remote" objects
+ *
+ * @package     iTopORM
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
+{
+	protected $sHostClass; // subclass of DBObject
+	protected $sAttCode; // xxxxxx_list
+	protected $sClass; // class of the links
+
+	/**
+	 * @var DBObjectSet
+	 */
+	protected $oOriginalSet;
+
+	/**
+	 * @var DBObject[] array of iObjectId => DBObject
+	 */
+	protected $aOriginalObjects = null;
+
+	/**
+	 * @var bool
+	 */
+	protected $bHasDelta = false;
+
+	/**
+	 * Object from the original set, minus the removed objects
+	 * @var DBObject[] array of iObjectId => DBObject
+	 */
+	protected $aPreserved = array();
+
+	/**
+	 * @var DBObject[] New items
+	 */
+	protected $aAdded = array();
+
+	/**
+	 * @var DBObject[] Modified items (could also be found in aPreserved)
+	 */
+	protected $aModified = array();
+
+	/**
+	 * @var int[] Removed items
+	 */
+	protected $aRemoved = array();
+
+	/**
+	 * @var int Position in the collection
+	 */
+	protected $iCursor = 0;
+
+	/**
+	 * __toString magical function overload.
+	 */
+	public function __toString()
+	{
+		return '';
+	}
+
+	/**
+	 * ormLinkSet constructor.
+	 * @param $sHostClass
+	 * @param $sAttCode
+	 * @param DBObjectSet|null $oOriginalSet
+	 * @throws Exception
+	 */
+	public function __construct($sHostClass, $sAttCode, DBObjectSet $oOriginalSet = null)
+	{
+		$this->sHostClass = $sHostClass;
+		$this->sAttCode = $sAttCode;
+		$this->oOriginalSet = $oOriginalSet ? clone $oOriginalSet : null;
+
+		$oAttDef = MetaModel::GetAttributeDef($sHostClass, $sAttCode);
+		if (!$oAttDef instanceof AttributeLinkedSet)
+		{
+			throw new Exception("ormLinkSet: $sAttCode is not a link set");
+		}
+		$this->sClass = $oAttDef->GetLinkedClass();
+		if ($oOriginalSet && ($oOriginalSet->GetClass() != $this->sClass))
+		{
+			throw new Exception("ormLinkSet: wrong class for the original set, found {$oOriginalSet->GetClass()} while expecting {$oAttDef->GetLinkedClass()}");
+		}
+	}
+
+	public function GetFilter()
+	{
+		return clone $this->oOriginalSet->GetFilter();
+	}
+
+	/**
+	 * Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
+	 *
+	 * @param hash $aAttToLoad Format: alias => array of attribute_codes
+	 *
+	 * @return void
+	 */
+	public function OptimizeColumnLoad($aAttToLoad)
+	{
+		$this->oOriginalSet->OptimizeColumnLoad($aAttToLoad);
+	}
+
+	/**
+	 * @param DBObject $oLink
+	 */
+	public function AddItem(DBObject $oLink)
+	{
+		assert($oLink instanceof $this->sClass);
+		// No impact on the iteration algorithm
+        $iObjectId = $oLink->GetKey();
+		$this->aAdded[$iObjectId] = $oLink;
+		$this->bHasDelta = true;
+	}
+
+    /**
+     * @param DBObject $oObject
+     * @param string $sClassAlias
+     * @deprecated Since iTop 2.4, use ormLinkset->AddItem() instead.
+     */
+	public function AddObject(DBObject $oObject, $sClassAlias = '')
+    {
+        $this->AddItem($oObject);
+    }
+
+	/**
+	 * @param $iObjectId
+	 */
+	public function RemoveItem($iObjectId)
+	{
+		if (array_key_exists($iObjectId, $this->aPreserved))
+		{
+			unset($this->aPreserved[$iObjectId]);
+			$this->aRemoved[$iObjectId] = $iObjectId;
+			$this->bHasDelta = true;
+		}
+		else
+        {
+            if (array_key_exists($iObjectId, $this->aAdded))
+            {
+                unset($this->aAdded[$iObjectId]);
+            }
+        }
+	}
+
+	/**
+	 * @param DBObject $oLink
+	 */
+	public function ModifyItem(DBObject $oLink)
+	{
+		assert($oLink instanceof $this->sClass);
+
+		$iObjectId = $oLink->GetKey();
+        if (array_key_exists($iObjectId, $this->aPreserved))
+        {
+            unset($this->aPreserved[$iObjectId]);
+            $this->aModified[$iObjectId] = $oLink;
+            $this->bHasDelta = true;
+        }
+	}
+
+	protected function LoadOriginalIds()
+	{
+		if ($this->aOriginalObjects === null)
+		{
+			if ($this->oOriginalSet)
+			{
+				$this->aOriginalObjects = $this->GetArrayOfIndex();
+				$this->aPreserved = $this->aOriginalObjects; // Copy (not effective until aPreserved gets modified)
+                foreach ($this->aRemoved as $iObjectId)
+                {
+                    if (array_key_exists($iObjectId, $this->aPreserved))
+                    {
+                        unset($this->aPreserved[$iObjectId]);
+                    }
+                }
+                foreach ($this->aModified as $iObjectId => $oLink)
+                {
+                    if (array_key_exists($iObjectId, $this->aPreserved))
+                    {
+                        unset($this->aPreserved[$iObjectId]);
+                    }
+                }
+			}
+			else
+			{
+
+				// Nothing to load
+				$this->aOriginalObjects = array();
+				$this->aPreserved = array();
+			}
+		}
+	}
+
+	/**
+	 * Note: After calling this method, the set cursor will be at the end of the set. You might want to rewind it.
+	 * @return array
+	 */
+	protected function GetArrayOfIndex()
+	{
+		$aRet = array();
+		$this->oOriginalSet->Rewind();
+		$iRow = 0;
+		while ($oObject = $this->oOriginalSet->Fetch())
+		{
+			$aRet[$oObject->GetKey()] = $iRow++;
+		}
+		return $aRet;
+	}
+
+    /**
+     * @param bool $bWithId
+     * @return array
+     * @deprecated Since iTop 2.4, use foreach($this as $oItem){} instead
+     */
+    public function ToArray($bWithId = true)
+    {
+        $aRet = array();
+        foreach($this as $oItem)
+        {
+            if ($bWithId)
+            {
+                $aRet[$oItem->GetKey()] = $oItem;
+            }
+            else
+            {
+                $aRet[] = $oItem;
+            }
+        }
+        return $aRet;
+    }
+
+    /**
+     * @param string $sAttCode
+     * @param bool $bWithId
+     * @return array
+     */
+    public function GetColumnAsArray($sAttCode, $bWithId = true)
+    {
+        $aRet = array();
+        foreach($this as $oItem)
+        {
+            if ($bWithId)
+            {
+                $aRet[$oItem->GetKey()] = $oItem->Get($sAttCode);
+            }
+            else
+            {
+                $aRet[] = $oItem->Get($sAttCode);
+            }
+        }
+        return $aRet;
+    }
+
+    /**
+	 * The class of the objects of the collection (at least a common ancestor)
+	 *
+	 * @return string
+	 */
+	public function GetClass()
+	{
+		return $this->sClass;
+	}
+
+	/**
+	 * The total number of objects in the collection
+	 *
+	 * @return int
+	 */
+	public function Count()
+	{
+		$this->LoadOriginalIds();
+		$iRet = count($this->aPreserved) + count($this->aAdded) + count($this->aModified);
+		return $iRet;
+	}
+
+	/**
+	 * Position the cursor to the given 0-based position
+	 *
+	 * @param $iPosition
+	 * @throws Exception
+	 * @internal param int $iRow
+	 */
+	public function Seek($iPosition)
+	{
+		$this->LoadOriginalIds();
+
+		$iCount = $this->Count();
+		if ($iPosition >= $iCount)
+		{
+			throw new Exception("Invalid position $iPosition: the link set is made of $iCount items.");
+		}
+		$this->rewind();
+		for($iPos = 0 ; $iPos < $iPosition ; $iPos++)
+		{
+			$this->next();
+		}
+	}
+
+	/**
+	 * Fetch the object at the current position in the collection and move the cursor to the next position.
+	 *
+	 * @return DBObject|null The fetched object or null when at the end
+	 */
+	public function Fetch()
+	{
+		$this->LoadOriginalIds();
+
+		$ret = $this->current();
+		if ($ret === false)
+		{
+			$ret = null;
+		}
+		$this->next();
+		return $ret;
+	}
+
+	/**
+	 * Return the current element
+	 * @link http://php.net/manual/en/iterator.current.php
+	 * @return mixed Can return any type.
+	 */
+	public function current()
+	{
+		$this->LoadOriginalIds();
+
+		$iPreservedCount = count($this->aPreserved);
+		if ($this->iCursor < $iPreservedCount)
+		{
+			$iRet = current($this->aPreserved);
+			$this->oOriginalSet->Seek($iRet);
+			$oRet = $this->oOriginalSet->Fetch();
+		}
+		else
+		{
+		    $iModifiedCount = count($this->aModified);
+		    if($this->iCursor < $iPreservedCount + $iModifiedCount)
+            {
+                $oRet = current($this->aModified);
+            }
+            else
+            {
+                $oRet = current($this->aAdded);
+            }
+		}
+		return $oRet;
+	}
+
+	/**
+	 * Move forward to next element
+	 * @link http://php.net/manual/en/iterator.next.php
+	 * @return void Any returned value is ignored.
+	 */
+	public function next()
+	{
+		$this->LoadOriginalIds();
+
+		$iPreservedCount = count($this->aPreserved);
+		if ($this->iCursor < $iPreservedCount)
+		{
+			next($this->aPreserved);
+		}
+		else
+		{
+		    $iModifiedCount = count($this->aModified);
+		    if($this->iCursor < $iPreservedCount + $iModifiedCount)
+            {
+                next($this->aModified);
+            }
+            else
+            {
+                next($this->aAdded);
+            }
+		}
+		// Increment AFTER moving the internal cursors because when starting aModified / aAdded, we must leave it intact
+		$this->iCursor++;
+	}
+
+	/**
+	 * Return the key of the current element
+	 * @link http://php.net/manual/en/iterator.key.php
+	 * @return mixed scalar on success, or null on failure.
+	 */
+	public function key()
+	{
+		return $this->iCursor;
+	}
+
+	/**
+	 * Checks if current position is valid
+	 * @link http://php.net/manual/en/iterator.valid.php
+	 * @return boolean The return value will be casted to boolean and then evaluated.
+	 * Returns true on success or false on failure.
+	 */
+	public function valid()
+	{
+		$this->LoadOriginalIds();
+
+		$iCount = $this->Count();
+		$bRet = ($this->iCursor < $iCount);
+		return $bRet;
+	}
+
+	/**
+	 * Rewind the Iterator to the first element
+	 * @link http://php.net/manual/en/iterator.rewind.php
+	 * @return void Any returned value is ignored.
+	 */
+	public function rewind()
+	{
+	    $this->LoadOriginalIds();
+
+	    $this->iCursor = 0;
+		reset($this->aPreserved);
+        reset($this->aAdded);
+        reset($this->aModified);
+	}
+
+	public function HasDelta()
+	{
+		return $this->bHasDelta;
+	}
+
+	/**
+	 * This method has been designed specifically for AttributeLinkedSet:Equals and as such it assumes that the passed argument is a clone of this.
+	 * @param ormLinkSet $oFellow
+	 * @return bool|null
+	 * @throws Exception
+	 */
+	public function Equals(ormLinkSet $oFellow)
+	{
+		$bRet = null;
+		if ($this === $oFellow)
+		{
+			$bRet = true;
+		}
+		else
+		{
+			if ( ($this->oOriginalSet !== $oFellow->oOriginalSet)
+			&& ($this->oOriginalSet->GetFilter()->ToOQL() != $oFellow->oOriginalSet->GetFilter()->ToOQL()) )
+			{
+				throw new Exception('ormLinkSet::Equals assumes that compared link sets have the same original scope');
+			}
+			if ($this->HasDelta())
+			{
+				throw new Exception('ormLinkSet::Equals assumes that left link set had no delta');
+			}
+			$bRet = !$oFellow->HasDelta();
+		}
+		return $bRet;
+	}
+
+	public function UpdateFromCompleteList(iDBObjectSetIterator $oFellow)
+	{
+		if ($oFellow === $this)
+		{
+			throw new Exception('ormLinkSet::UpdateFromCompleteList assumes that the passed link set is at least a clone of the current one');
+		}
+		$bUpdateFromDelta = false;
+		if ($oFellow instanceof ormLinkSet)
+		{
+			if ( ($this->oOriginalSet === $oFellow->oOriginalSet)
+				|| ($this->oOriginalSet->GetFilter()->ToOQL() == $oFellow->oOriginalSet->GetFilter()->ToOQL()) )
+			{
+				$bUpdateFromDelta = true;
+			}
+		}
+
+		if ($bUpdateFromDelta)
+		{
+			// Same original set -> simply update the delta
+			$this->iCursor = 0;
+			$this->aAdded = $oFellow->aAdded;
+			$this->aRemoved = $oFellow->aRemoved;
+			$this->aModified = $oFellow->aModified;
+			$this->aPreserved = $oFellow->aPreserved;
+			$this->bHasDelta = $oFellow->bHasDelta;
+		}
+		else
+		{
+			// For backward compatibility reasons, let's rebuild a delta...
+
+			// Reset the delta
+			$this->iCursor = 0;
+			$this->aAdded = array();
+			$this->aRemoved = array();
+			$this->aModified = array();
+			$this->aPreserved = ($this->aOriginalObjects === null) ? array() : $this->aOriginalObjects;
+			$this->bHasDelta = false;
+
+			/** @var AttributeLinkedSet $oAttDef */
+			$oAttDef = MetaModel::GetAttributeDef($this->sHostClass, $this->sAttCode);
+			$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+			$sAdditionalKey = null;
+			if ($oAttDef->IsIndirect() && !$oAttDef->DuplicatesAllowed())
+			{
+				$sAdditionalKey = $oAttDef->GetExtKeyToRemote();
+			}
+			// Compare both collections by iterating the whole sets, order them, a build a fingerprint based on meaningful data (what make the difference)
+			$oComparator = new DBObjectSetComparator($this, $oFellow, array($sExtKeyToMe), $sAdditionalKey);
+			$aChanges = $oComparator->GetDifferences();
+			foreach ($aChanges['added'] as $oLink)
+			{
+				$this->AddItem($oLink);
+			}
+
+			foreach ($aChanges['modified'] as $oLink)
+			{
+				$this->ModifyItem($oLink);
+			}
+
+			foreach ($aChanges['removed'] as $oLink)
+			{
+				$this->RemoveItem($oLink->GetKey());
+			}
+		}
+	}
+
+	/**
+	 * Get the list of all modified (added, modified and removed) links
+	 *
+	 * @return array of link objects
+	 * @throws \Exception
+	 */
+	public function ListModifiedLinks()
+	{
+		$aAdded = $this->aAdded;
+		$aModified = $this->aModified;
+		$aRemoved = array();
+		if (count($this->aRemoved) > 0)
+		{
+			$oSearch = new DBObjectSearch($this->sClass);
+			$oSearch->AddCondition('id', $this->aRemoved, 'IN');
+			$oSet = new DBObjectSet($oSearch);
+			$aRemoved = $oSet->ToArray();
+		}
+		return array_merge($aAdded, $aModified, $aRemoved);
+	}
+
+	/**
+	 * @param DBObject $oHostObject
+	 */
+	public function DBWrite(DBObject $oHostObject)
+	{
+		/** @var AttributeLinkedSet $oAttDef */
+		$oAttDef = MetaModel::GetAttributeDef(get_class($oHostObject), $this->sAttCode);
+		$sExtKeyToMe = $oAttDef->GetExtKeyToMe();
+		$sExtKeyToRemote = $oAttDef->IsIndirect() ? $oAttDef->GetExtKeyToRemote() : 'n/a';
+
+		$aCheckLinks = array();
+		$aCheckRemote = array();
+		foreach ($this->aAdded as $oLink)
+		{
+			if ($oLink->IsNew())
+			{
+				if ($oAttDef->IsIndirect() && !$oAttDef->DuplicatesAllowed())
+				{
+					//todo: faire un test qui passe dans cette branche !
+					$aCheckRemote[] = $oLink->Get($sExtKeyToRemote);
+				}
+			}
+			else
+			{
+				//todo: faire un test qui passe dans cette branche !
+				$aCheckLinks[] = $oLink->GetKey();
+			}
+		}
+		foreach ($this->aRemoved as $iLinkId)
+		{
+			$aCheckLinks[] = $iLinkId;
+		}
+		foreach ($this->aModified as $iLinkId => $oLink)
+		{
+			$aCheckLinks[] = $oLink->GetKey();
+		}
+
+		// Critical section : serialize any write access to these links
+		//
+		$oMtx = new iTopMutex('Write-'.$this->sClass);
+		$oMtx->Lock();
+
+		// Check for the existing links
+		//
+		/** @var DBObject[] $aExistingLinks */
+		$aExistingLinks = array();
+		/** @var Int[] $aExistingRemote */
+		$aExistingRemote = array();
+		if (count($aCheckLinks) > 0)
+		{
+			$oSearch = new DBObjectSearch($this->sClass);
+			$oSearch->AddCondition('id', $aCheckLinks, 'IN');
+			$oSet = new DBObjectSet($oSearch);
+			$aExistingLinks = $oSet->ToArray();
+		}
+
+		// Check for the existing remote objects
+		//
+		if (count($aCheckRemote) > 0)
+		{
+			$oSearch = new DBObjectSearch($this->sClass);
+			$oSearch->AddCondition($sExtKeyToMe, $oHostObject->GetKey(), '=');
+			$oSearch->AddCondition($sExtKeyToRemote, $aCheckRemote, 'IN');
+			$oSet = new DBObjectSet($oSearch);
+			$aExistingRemote = $oSet->GetColumnAsArray($sExtKeyToRemote, true);
+		}
+
+		// Write the links according to the existing links
+		//
+		foreach ($this->aAdded as $oLink)
+		{
+			// Make sure that the objects in the set point to "this"
+			$oLink->Set($sExtKeyToMe, $oHostObject->GetKey());
+
+			if ($oLink->IsNew())
+			{
+				if (count($aCheckRemote) > 0)
+				{
+				    $bIsDuplicate = false;
+				    foreach($aExistingRemote as $sLinkKey => $sExtKey)
+                    {
+                        if ($sExtKey == $oLink->Get($sExtKeyToRemote))
+                        {
+                            // Do not create a duplicate
+                            // + In the case of a remove action followed by an add action
+                            // of an existing link,
+                            // the final state to consider is add action,
+                            // so suppress the entry in the removed list.
+                            if (array_key_exists($sLinkKey, $this->aRemoved))
+                            {
+                                unset($this->aRemoved[$sLinkKey]);
+                            }
+                            $bIsDuplicate = true;
+                            break;
+                        }
+                    }
+                    if ($bIsDuplicate)
+                    {
+                        continue;
+                    }
+				}
+
+			}
+			else
+			{
+				if (!array_key_exists($oLink->GetKey(), $aExistingLinks))
+				{
+					$oLink->DBClone();
+				}
+			}
+			$oLink->DBWrite();
+		}
+		foreach ($this->aRemoved as $iLinkId)
+		{
+			if (array_key_exists($iLinkId, $aExistingLinks))
+			{
+				$oLink = $aExistingLinks[$iLinkId];
+				if ($oAttDef->IsIndirect())
+				{
+					$oLink->DBDelete();
+				}
+				else
+				{
+					$oExtKeyToRemote = MetaModel::GetAttributeDef($this->sClass, $sExtKeyToMe);
+					if ($oExtKeyToRemote->IsNullAllowed())
+					{
+						if ($oLink->Get($sExtKeyToMe) == $oHostObject->GetKey())
+						{
+							// Detach the link object from this
+							$oLink->Set($sExtKeyToMe, 0);
+							$oLink->DBUpdate();
+						}
+					}
+					else
+					{
+						$oLink->DBDelete();
+					}
+				}
+			}
+		}
+		// Note: process modifications at the end: if a link to remove has also been listed as modified, then it will be gracefully ignored
+		foreach ($this->aModified as $iLinkId => $oLink)
+		{
+			if (array_key_exists($oLink->GetKey(), $aExistingLinks))
+			{
+				$oLink->DBUpdate();
+			}
+			else
+			{
+				$oLink->DBClone();
+			}
+		}
+
+		// End of the critical section
+		//
+		$oMtx->Unlock();
+	}
+
+	public function ToDBObjectSet($bShowObsolete = true)
+	{
+		$oAttDef = MetaModel::GetAttributeDef($this->sHostClass, $this->sAttCode);
+		$oLinkSearch = $this->GetFilter();
+		if ($oAttDef->IsIndirect())
+		{
+			$sExtKeyToRemote = $oAttDef->GetExtKeyToRemote();
+			$oLinkingAttDef = MetaModel::GetAttributeDef($this->sClass, $sExtKeyToRemote);
+			$sTargetClass = $oLinkingAttDef->GetTargetClass();
+			if (!$bShowObsolete && MetaModel::IsObsoletable($sTargetClass))
+			{
+				$oNotObsolete = new BinaryExpression(
+					new FieldExpression('obsolescence_flag', $sTargetClass),
+					'=',
+					new ScalarExpression(0)
+				);
+				$oNotObsoleteRemote = new DBObjectSearch($sTargetClass);
+				$oNotObsoleteRemote->AddConditionExpression($oNotObsolete);
+				$oLinkSearch->AddCondition_PointingTo($oNotObsoleteRemote, $sExtKeyToRemote);
+			}
+		}
+		$oLinkSet = new DBObjectSet($oLinkSearch);
+		$oLinkSet->SetShowObsoleteData($bShowObsolete);
+		if ($this->HasDelta())
+		{
+			$oLinkSet->AddObjectArray($this->aAdded);
+		}
+		return $oLinkSet;
+	}
 }
\ No newline at end of file
diff --git a/core/ormpassword.class.inc.php b/core/ormpassword.class.inc.php
index 4aa62205e..a1b066d3e 100644
--- a/core/ormpassword.class.inc.php
+++ b/core/ormpassword.class.inc.php
@@ -1,120 +1,120 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-require_once(APPROOT.'/core/simplecrypt.class.inc.php');
-
-/**
- * ormPassword
- * encapsulate the behavior of a one way encrypted password stored hashed
- * with a per password (as random as possible) salt, in order to prevent a "Rainbow table" hack.
- * If a cryptographic random number generator is available (on Linux or Windows)
- * it will be used for generating the salt.
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @package     itopORM
- */
-
-class ormPassword
-{
-	protected $m_sHashed;
-	protected $m_sSalt;
-	
-	/**
-	 * Constructor, initializes the password from the encrypted values
-	 */
-	public function __construct($sHash = '', $sSalt = '')
-	{
-		$this->m_sHashed = $sHash;
-		$this->m_sSalt = $sSalt;
-	}
-	
-	/**
-	 * Encrypts the clear text password, with a unique salt
-	 */
-	public function SetPassword($sClearTextPassword)
-	{
-		$this->m_sSalt = SimpleCrypt::GetNewSalt();
-		$this->m_sHashed = $this->ComputeHash($sClearTextPassword);
-	}
-	
-	/**
-	 * Print the password: displays some stars
-	 * @return string
-	 */
-	public function __toString()
-	{
-		return '*****'; // Password can not be read
-	}
-
-	public function IsEmpty()
-	{
-		return ($this->m_hashed == null);
-	}
-	
-	public function GetHash()
-	{
-		return $this->m_sHashed;
-	}
-	
-	public function GetSalt()
-	{
-		return $this->m_sSalt;
-	}
-	
-	/**
-	 * Displays the password: displays some stars
-	 * @return string
-	 */
-	public function GetAsHTML()
-	{
-		return '*****'; // Password can not be read
-	}
-
-	/**
-	 * Check if the supplied clear text password matches the encrypted one
-	 * @param string $sClearTextPassword
-	 * @return boolean True if it matches, false otherwise
-	 */
-	public function CheckPassword($sClearTextPassword)
-	{
-		$bResult = false;
-		$sHashedPwd = $this->ComputeHash($sClearTextPassword);
-		if ($this->m_sHashed == $sHashedPwd)
-		{
-			$bResult = true;
-		}
-		return $bResult;
-	}
-		
-	/**
-	 * Computes the hashed version of a password using a unique salt
-	 * for this password. A unique salt is generated if needed
-	 * @return string
-	 */
-	protected function ComputeHash($sClearTextPwd)
-	{
-		if ($this->m_sSalt == null)
-		{
-			$this->m_sSalt = SimpleCrypt::GetNewSalt();
-		}
-		return hash('sha256', $this->m_sSalt.$sClearTextPwd);
-	}
-}
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+require_once(APPROOT.'/core/simplecrypt.class.inc.php');
+
+/**
+ * ormPassword
+ * encapsulate the behavior of a one way encrypted password stored hashed
+ * with a per password (as random as possible) salt, in order to prevent a "Rainbow table" hack.
+ * If a cryptographic random number generator is available (on Linux or Windows)
+ * it will be used for generating the salt.
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @package     itopORM
+ */
+
+class ormPassword
+{
+	protected $m_sHashed;
+	protected $m_sSalt;
+	
+	/**
+	 * Constructor, initializes the password from the encrypted values
+	 */
+	public function __construct($sHash = '', $sSalt = '')
+	{
+		$this->m_sHashed = $sHash;
+		$this->m_sSalt = $sSalt;
+	}
+	
+	/**
+	 * Encrypts the clear text password, with a unique salt
+	 */
+	public function SetPassword($sClearTextPassword)
+	{
+		$this->m_sSalt = SimpleCrypt::GetNewSalt();
+		$this->m_sHashed = $this->ComputeHash($sClearTextPassword);
+	}
+	
+	/**
+	 * Print the password: displays some stars
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return '*****'; // Password can not be read
+	}
+
+	public function IsEmpty()
+	{
+		return ($this->m_hashed == null);
+	}
+	
+	public function GetHash()
+	{
+		return $this->m_sHashed;
+	}
+	
+	public function GetSalt()
+	{
+		return $this->m_sSalt;
+	}
+	
+	/**
+	 * Displays the password: displays some stars
+	 * @return string
+	 */
+	public function GetAsHTML()
+	{
+		return '*****'; // Password can not be read
+	}
+
+	/**
+	 * Check if the supplied clear text password matches the encrypted one
+	 * @param string $sClearTextPassword
+	 * @return boolean True if it matches, false otherwise
+	 */
+	public function CheckPassword($sClearTextPassword)
+	{
+		$bResult = false;
+		$sHashedPwd = $this->ComputeHash($sClearTextPassword);
+		if ($this->m_sHashed == $sHashedPwd)
+		{
+			$bResult = true;
+		}
+		return $bResult;
+	}
+		
+	/**
+	 * Computes the hashed version of a password using a unique salt
+	 * for this password. A unique salt is generated if needed
+	 * @return string
+	 */
+	protected function ComputeHash($sClearTextPwd)
+	{
+		if ($this->m_sSalt == null)
+		{
+			$this->m_sSalt = SimpleCrypt::GetNewSalt();
+		}
+		return hash('sha256', $this->m_sSalt.$sClearTextPwd);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/core/ormstopwatch.class.inc.php b/core/ormstopwatch.class.inc.php
index 956a2da63..751302e49 100644
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -1,585 +1,585 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-require_once('backgroundprocess.inc.php');
-
-/**
- * ormStopWatch
- * encapsulate the behavior of a stop watch that will be stored as an attribute of class AttributeStopWatch 
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * ormStopWatch
- * encapsulate the behavior of a stop watch that will be stored as an attribute of class AttributeStopWatch 
- *
- * @package     itopORM
- */
-class ormStopWatch
-{
-	protected $iTimeSpent; // seconds
-	protected $iStarted; // unix time (seconds)
-	protected $iLastStart; // unix time (seconds)
-	protected $iStopped; // unix time (seconds)
-	protected $aThresholds;
-	
-	/**
-	 * Constructor
-	 */
-	public function __construct($iTimeSpent = 0, $iStarted = null, $iLastStart = null, $iStopped = null)
-	{
-		$this->iTimeSpent = (int) $iTimeSpent;
-		$this->iStarted = $iStarted;
-		$this->iLastStart = $iLastStart;
-		$this->iStopped = $iStopped;
-
-		$this->aThresholds = array();
-	}
-
-	/**
-	 * Necessary for the triggers
-	 */	 	
-	public function __toString()
-	{
-		return (string) $this->iTimeSpent;
-	}
-
-	public function DefineThreshold($iPercent, $tDeadline = null, $bPassed = false, $bTriggered = false, $iOverrun = null, $aHighlightDef = null)
-	{
-		$this->aThresholds[$iPercent] = array(
-			'deadline' => $tDeadline, // unix time (seconds)
-			'triggered' => $bTriggered,
-			'overrun' => $iOverrun,
-			'highlight' => $aHighlightDef, // array('code' => string, 'persistent' => boolean)
-		);
-	}
-
-	public function MarkThresholdAsTriggered($iPercent)
-	{
-		$this->aThresholds[$iPercent]['triggered'] = true;
-	}
-
-	public function GetTimeSpent()
-	{
-		return $this->iTimeSpent;
-	}
-
-	/**
-	 * Get the working elapsed time since the start of the stop watch
-	 * even if it is currently running
-	 * @param oAttDef	AttributeDefinition Attribute hosting the stop watch
-	 * @param oObject	Hosting object (used for query parameters)
-	 */
-	public function GetElapsedTime($oAttDef, $oObject)
-	{
-		if (is_null($this->iLastStart))
-		{
-			return $this->GetTimeSpent();
-		}
-		else
-		{
-			$iElapsed = $this->ComputeDuration($oObject, $oAttDef, $this->iLastStart, time());
-			return $this->iTimeSpent + $iElapsed;
-		}
-	}
-
-
-	public function GetStartDate()
-	{
-		return $this->iStarted;
-	}
-
-	public function GetLastStartDate()
-	{
-		return $this->iLastStart;
-	}
-
-	public function GetStopDate()
-	{
-		return $this->iStopped;
-	}
-
-	public function GetThresholdDate($iPercent)
-	{
-		if (array_key_exists($iPercent, $this->aThresholds))
-		{
-			return $this->aThresholds[$iPercent]['deadline'];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	public function GetOverrun($iPercent)
-	{
-		if (array_key_exists($iPercent, $this->aThresholds))
-		{
-			return $this->aThresholds[$iPercent]['overrun'];
-		}
-		else
-		{
-			return null;
-		}
-	}
-	public function IsThresholdPassed($iPercent)
-	{
-		$bRet = false;
-		if (array_key_exists($iPercent, $this->aThresholds))
-		{
-			$aThresholdData = $this->aThresholds[$iPercent];
-			if (!is_null($aThresholdData['deadline']) && ($aThresholdData['deadline'] <= time()))
-			{
-				$bRet = true;
-			}
-			if (isset($aThresholdData['overrun']) && ($aThresholdData['overrun'] > 0))
-			{
-				$bRet = true;
-			}
-		}
-		return $bRet;
-	}
-	public function IsThresholdTriggered($iPercent)
-	{
-		if (array_key_exists($iPercent, $this->aThresholds))
-		{
-			return $this->aThresholds[$iPercent]['triggered'];
-		}
-		else
-		{
-			return false;
-		}
-	}
-	
-	public function GetHighlightCode()
-	{
-		$sCode = '';
-		// Process the thresholds in ascending order
-		$aPercents = array();
-		foreach($this->aThresholds as $iPercent => $aDefs)
-		{
-			$aPercents[] = $iPercent;
-		}
-		sort($aPercents, SORT_NUMERIC);
-		foreach($aPercents as $iPercent)
-		{
-			$aDefs = $this->aThresholds[$iPercent];
-			if (array_key_exists('highlight', $aDefs) && is_array($aDefs['highlight']) && $this->IsThresholdPassed($iPercent))
-			{
-				// If persistant or SW running...
-				if (($aDefs['highlight']['persistent'] == true) || (($aDefs['highlight']['persistent'] == false) && !is_null($this->iLastStart)))
-				{
-					$sCode = $aDefs['highlight']['code'];
-				}
-			}
-		}
-		return $sCode;
-	}
-
-	public function GetAsHTML($oAttDef, $oHostObject = null)
-	{
-		$aProperties = array();
-
-		$aProperties['States'] = implode(', ', $oAttDef->GetStates());
-
-		if (is_null($this->iLastStart))
-		{
-			if (is_null($this->iStarted))
-			{
-				$aProperties['Elapsed'] = 'never started';
-			}
-			else
-			{
-				$aProperties['Elapsed'] = $this->iTimeSpent.' s';
-			}
-		}
-		else
-		{
-			$aProperties['Elapsed'] = 'running <img src="../images/indicator.gif">';
-		}
-
-		$aProperties['Started'] = $oAttDef->SecondsToDate($this->iStarted);
-		$aProperties['LastStart'] = $oAttDef->SecondsToDate($this->iLastStart);
-		$aProperties['Stopped'] = $oAttDef->SecondsToDate($this->iStopped);
-
-		foreach ($this->aThresholds as $iPercent => $aThresholdData)
-		{
-			$sThresholdDesc = $oAttDef->SecondsToDate($aThresholdData['deadline']);
-			if ($aThresholdData['triggered'])
-			{
-				$sThresholdDesc .= " <b>TRIGGERED</b>";
-			}
-			if ($aThresholdData['overrun'])
-			{
-				$sThresholdDesc .= " Overrun:".(int) $aThresholdData['overrun']." sec.";
-			}
-			$aProperties[$iPercent.'%'] = $sThresholdDesc;
-		}
-		$sRes = "<TABLE>";
-		$sRes .= "<TBODY>";
-		foreach ($aProperties as $sProperty => $sValue)
-		{
-			$sRes .= "<TR>";
-			$sCell = str_replace("\n", "<br>\n", $sValue);
-			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
-			$sRes .= "</TR>";
-		}
-		$sRes .= "</TBODY>";
-		$sRes .= "</TABLE>";
-		return $sRes;
-	}
-
-	protected function ComputeGoal($oObject, $oAttDef)
-	{
-		$sMetricComputer = $oAttDef->Get('goal_computing');
-		$oComputer = new $sMetricComputer();
-		$aCallSpec = array($oComputer, 'ComputeMetric');
-		if (!is_callable($aCallSpec))
-		{
-			throw new CoreException("Unknown class/verb '$sMetricComputer/ComputeMetric'");
-		}
-		$iRet = call_user_func($aCallSpec, $oObject);
-		return $iRet;
-	}
-
-	protected function ComputeDeadline($oObject, $oAttDef, $iPercent, $iStartTime, $iDurationSec)
-	{
-		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
-		if ($sWorkingTimeComputer == '')
-		{
-			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
-		}
-		$aCallSpec = array($sWorkingTimeComputer, '__construct');
-		if (!is_callable($aCallSpec))
-		{
-			//throw new CoreException("Pas de constructeur pour $sWorkingTimeComputer!");
-		}
-		$oComputer = new $sWorkingTimeComputer();
-		$aCallSpec = array($oComputer, 'GetDeadline');
-		if (!is_callable($aCallSpec))
-		{
-			throw new CoreException("Unknown class/verb '$sWorkingTimeComputer/GetDeadline'");
-		}
-		// GetDeadline($oObject, $iDuration, DateTime $oStartDate)
-		$oStartDate = new DateTime('@'.$iStartTime); // setTimestamp not available in PHP 5.2
-		$oDeadline = call_user_func($aCallSpec, $oObject, $iDurationSec, $oStartDate, $iPercent);
-		$iRet = $oDeadline->format('U');
-		return $iRet;
-	}
-
-	protected function ComputeDuration($oObject, $oAttDef, $iStartTime, $iEndTime)
-	{
-		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
-		if ($sWorkingTimeComputer == '')
-		{
-			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
-		}
-		$oComputer = new $sWorkingTimeComputer();
-		$aCallSpec = array($oComputer, 'GetOpenDuration');
-		if (!is_callable($aCallSpec))
-		{
-			throw new CoreException("Unknown class/verb '$sWorkingTimeComputer/GetOpenDuration'");
-		}
-		// GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
-		$oStartDate = new DateTime('@'.$iStartTime); // setTimestamp not available in PHP 5.2
-		$oEndDate = new DateTime('@'.$iEndTime);
-		$iRet = call_user_func($aCallSpec, $oObject, $oStartDate, $oEndDate);
-		return $iRet;
-	}
-
-	public function Reset($oObject, $oAttDef)
-	{
-		$this->iTimeSpent = 0;
-		$this->iStopped = null;
-		$this->iStarted = null;
-
-		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
-		{
-			$aThresholdData['triggered'] = false;
-			$aThresholdData['overrun'] = null;
-		}
-
-		if (!is_null($this->iLastStart))
-		{
-			// Currently running... starting again from now!
-			$this->iStarted = time();
-			$this->iLastStart = time();
-			$this->ComputeDeadlines($oObject, $oAttDef);
-		}
-	}
-
-	/**
-	 * Start or continue
-	 * It is the responsibility of the caller to compute the deadlines
-	 * (to avoid computing twice for the same result) 	 
-	 */	 	 	
-	public function Start($oObject, $oAttDef, $iNow = null)
-	{
-		if (!is_null($this->iLastStart))
-		{
-			// Already started
-			return false;
-		}
-
-		if (is_null($iNow))
-		{
-			$iNow = time();
-		}
-
-		if (is_null($this->iStarted))
-		{
-			$this->iStarted = $iNow;
-		}
-		$this->iLastStart = $iNow;
-		$this->iStopped = null;
-
-		return true;
-	}
-
-	/**
-	 * Compute or recompute the goal and threshold deadlines
-	 */	 	 	
-	public function ComputeDeadlines($oObject, $oAttDef)
-	{
-		if (is_null($this->iLastStart))
-		{
-			// Currently stopped - do nothing
-			return false;
-		}
-
-		$iDurationGoal = $this->ComputeGoal($oObject, $oAttDef);
-		$iComputationRefTime = time();
-		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
-		{
-			if (is_null($iDurationGoal))
-			{
-				// No limit: leave null thresholds
-				$aThresholdData['deadline'] = null;
-			}
-			else
-			{
-				$iThresholdDuration = round($iPercent * $iDurationGoal / 100);
-
-				if (class_exists('WorkingTimeRecorder'))
-				{
-					$sClass = get_class($oObject);
-					$sAttCode = $oAttDef->GetCode();
-					WorkingTimeRecorder::Start($oObject, $iComputationRefTime, "ormStopWatch-Deadline-$iPercent-$sAttCode", 'Core:ExplainWTC:StopWatch-Deadline', array("Class:$sClass/Attribute:$sAttCode", $iPercent));
-				}
-				$aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iLastStart, $iThresholdDuration - $this->iTimeSpent);
-				// OR $aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iStarted, $iThresholdDuration);
-
-				if (class_exists('WorkingTimeRecorder'))
-				{
-					WorkingTimeRecorder::End();
-				}
-			}
-			if (is_null($aThresholdData['deadline']) || ($aThresholdData['deadline'] > time()))
-			{
-				// The threshold is in the future, reset
-				$aThresholdData['triggered'] = false;
-				$aThresholdData['overrun'] = null;
-			}
-			else
-			{
-				// The new threshold is in the past
-				// Note: the overrun can be wrong, but the correct algorithm to compute
-				// the overrun of a deadline in the past requires that the ormStopWatch keeps track of all its history!!!
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Stop counting if not already done
-	 */	 	 	
-	public function Stop($oObject, $oAttDef, $iNow = null)
-	{
-		if (is_null($this->iLastStart))
-		{
-			// Already stopped
-			return false;
-		}
-
-		if (is_null($iNow))
-		{
-			$iNow = time();
-		}
-
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			$sClass = get_class($oObject);
-			$sAttCode = $oAttDef->GetCode();
-			WorkingTimeRecorder::Start($oObject, $iNow, "ormStopWatch-TimeSpent-$sAttCode", 'Core:ExplainWTC:StopWatch-TimeSpent', array("Class:$sClass/Attribute:$sAttCode"), true /*cumulative*/);
-		}
-		$iElapsed = $this->ComputeDuration($oObject, $oAttDef, $this->iLastStart, $iNow);
-		$this->iTimeSpent = $this->iTimeSpent + $iElapsed;
-		if (class_exists('WorkingTimeRecorder'))
-		{
-			WorkingTimeRecorder::End();
-		}
-
-		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
-		{
-			if (!is_null($aThresholdData['deadline']) && ($iNow > $aThresholdData['deadline']))
-			{
-				if ($aThresholdData['overrun'] > 0)
-				{
-					// Accumulate from last start
-					$aThresholdData['overrun'] += $iElapsed;
-				}
-				else
-				{
-					// First stop after the deadline has been passed
-					$iOverrun = $this->ComputeDuration($oObject, $oAttDef, $aThresholdData['deadline'], $iNow);
-					$aThresholdData['overrun'] = $iOverrun;
-				}
-			}
-			$aThresholdData['deadline'] = null;
-		}
-
-		$this->iLastStart = null;
-		$this->iStopped = $iNow;
-
-		return true;
-	}
-}
-
-/**
- * CheckStopWatchThresholds
- * Implements the automatic actions 
- *
- * @package     itopORM
- */
-class CheckStopWatchThresholds implements iBackgroundProcess
-{
-	public function GetPeriodicity()
-	{	
-		return 10; // seconds
-	}
-
-	public function Process($iTimeLimit)
-	{
-		$aList = array();
-		foreach (MetaModel::GetClasses() as $sClass)
-		{
-			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-			{
-				if ($oAttDef instanceof AttributeStopWatch)
-				{
-					foreach ($oAttDef->ListThresholds() as $iThreshold => $aThresholdData)
-					{
-						$iPercent = $aThresholdData['percent']; // could be different than the index !
-		
-						$sNow = date(AttributeDateTime::GetSQLFormat());
-						$sExpression = "SELECT $sClass WHERE {$sAttCode}_laststart AND {$sAttCode}_{$iThreshold}_triggered = 0 AND {$sAttCode}_{$iThreshold}_deadline < '$sNow'";
-						$oFilter = DBObjectSearch::FromOQL($sExpression);
-						$oSet = new DBObjectSet($oFilter);
-						$oSet->OptimizeColumnLoad(array($sAttCode));
-						while ((time() < $iTimeLimit) && ($oObj = $oSet->Fetch()))
-						{
-							$sClass = get_class($oObj);
-
-							$aList[] = $sClass.'::'.$oObj->GetKey().' '.$sAttCode.' '.$iThreshold;
-
-							// Execute planned actions
-							//
-							foreach ($aThresholdData['actions'] as $aActionData)
-							{
-								$sVerb = $aActionData['verb'];
-								$aParams = $aActionData['params'];
-								$aValues = array();
-								foreach($aParams as $def)
-								{
-									if (is_string($def))
-									{
-										// Old method (pre-2.1.0) non typed parameters
-										$aValues[] = $def;
-									}
-									else // if(is_array($def))
-									{
-										$sParamType = array_key_exists('type', $def) ? $def['type'] : 'string';
-										switch($sParamType)
-										{
-											case 'int':
-												$value = (int)$def['value'];
-												break;
-										
-											case 'float':
-												$value = (float)$def['value'];
-												break;
-										
-											case 'bool':
-												$value = (bool)$def['value'];
-												break;
-										
-											case 'reference':
-												$value = ${$def['value']};
-												break;
-										
-											case 'string':
-											default:
-												$value = (string)$def['value'];
-										}
-										$aValues[] = $value;
-									}
-								}
-								$aCallSpec = array($oObj, $sVerb);
-								call_user_func_array($aCallSpec, $aValues);
-							}
-
-							// Mark the threshold as "triggered"
-							//
-							$oSW = $oObj->Get($sAttCode);
-							$oSW->MarkThresholdAsTriggered($iThreshold);
-							$oObj->Set($sAttCode, $oSW);
-		
-							if($oObj->IsModified())
-							{
-								CMDBObject::SetTrackInfo("Automatic - threshold triggered");
-					
-								$oMyChange = CMDBObject::GetCurrentChange();
-								$oObj->DBUpdateTracked($oMyChange, true /*skip security*/);
-							}
-
-							// Activate any existing trigger
-							// 
-							$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-							$oTriggerSet = new DBObjectSet(
-								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code=:stop_watch_code AND threshold_index = :threshold_index"),
-								array(), // order by
-								array('stop_watch_code' => $sAttCode, 'threshold_index' => $iThreshold)
-							);
-							while ($oTrigger = $oTriggerSet->Fetch())
-							{
-								$oTrigger->DoActivate($oObj->ToArgs('this'));
-							}
-						}
-					}
-				}
-			}
-		}
-
-		$iProcessed = count($aList);
-		return "Triggered $iProcessed threshold(s):".implode(", ", $aList);
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+require_once('backgroundprocess.inc.php');
+
+/**
+ * ormStopWatch
+ * encapsulate the behavior of a stop watch that will be stored as an attribute of class AttributeStopWatch 
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * ormStopWatch
+ * encapsulate the behavior of a stop watch that will be stored as an attribute of class AttributeStopWatch 
+ *
+ * @package     itopORM
+ */
+class ormStopWatch
+{
+	protected $iTimeSpent; // seconds
+	protected $iStarted; // unix time (seconds)
+	protected $iLastStart; // unix time (seconds)
+	protected $iStopped; // unix time (seconds)
+	protected $aThresholds;
+	
+	/**
+	 * Constructor
+	 */
+	public function __construct($iTimeSpent = 0, $iStarted = null, $iLastStart = null, $iStopped = null)
+	{
+		$this->iTimeSpent = (int) $iTimeSpent;
+		$this->iStarted = $iStarted;
+		$this->iLastStart = $iLastStart;
+		$this->iStopped = $iStopped;
+
+		$this->aThresholds = array();
+	}
+
+	/**
+	 * Necessary for the triggers
+	 */	 	
+	public function __toString()
+	{
+		return (string) $this->iTimeSpent;
+	}
+
+	public function DefineThreshold($iPercent, $tDeadline = null, $bPassed = false, $bTriggered = false, $iOverrun = null, $aHighlightDef = null)
+	{
+		$this->aThresholds[$iPercent] = array(
+			'deadline' => $tDeadline, // unix time (seconds)
+			'triggered' => $bTriggered,
+			'overrun' => $iOverrun,
+			'highlight' => $aHighlightDef, // array('code' => string, 'persistent' => boolean)
+		);
+	}
+
+	public function MarkThresholdAsTriggered($iPercent)
+	{
+		$this->aThresholds[$iPercent]['triggered'] = true;
+	}
+
+	public function GetTimeSpent()
+	{
+		return $this->iTimeSpent;
+	}
+
+	/**
+	 * Get the working elapsed time since the start of the stop watch
+	 * even if it is currently running
+	 * @param oAttDef	AttributeDefinition Attribute hosting the stop watch
+	 * @param oObject	Hosting object (used for query parameters)
+	 */
+	public function GetElapsedTime($oAttDef, $oObject)
+	{
+		if (is_null($this->iLastStart))
+		{
+			return $this->GetTimeSpent();
+		}
+		else
+		{
+			$iElapsed = $this->ComputeDuration($oObject, $oAttDef, $this->iLastStart, time());
+			return $this->iTimeSpent + $iElapsed;
+		}
+	}
+
+
+	public function GetStartDate()
+	{
+		return $this->iStarted;
+	}
+
+	public function GetLastStartDate()
+	{
+		return $this->iLastStart;
+	}
+
+	public function GetStopDate()
+	{
+		return $this->iStopped;
+	}
+
+	public function GetThresholdDate($iPercent)
+	{
+		if (array_key_exists($iPercent, $this->aThresholds))
+		{
+			return $this->aThresholds[$iPercent]['deadline'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function GetOverrun($iPercent)
+	{
+		if (array_key_exists($iPercent, $this->aThresholds))
+		{
+			return $this->aThresholds[$iPercent]['overrun'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+	public function IsThresholdPassed($iPercent)
+	{
+		$bRet = false;
+		if (array_key_exists($iPercent, $this->aThresholds))
+		{
+			$aThresholdData = $this->aThresholds[$iPercent];
+			if (!is_null($aThresholdData['deadline']) && ($aThresholdData['deadline'] <= time()))
+			{
+				$bRet = true;
+			}
+			if (isset($aThresholdData['overrun']) && ($aThresholdData['overrun'] > 0))
+			{
+				$bRet = true;
+			}
+		}
+		return $bRet;
+	}
+	public function IsThresholdTriggered($iPercent)
+	{
+		if (array_key_exists($iPercent, $this->aThresholds))
+		{
+			return $this->aThresholds[$iPercent]['triggered'];
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	public function GetHighlightCode()
+	{
+		$sCode = '';
+		// Process the thresholds in ascending order
+		$aPercents = array();
+		foreach($this->aThresholds as $iPercent => $aDefs)
+		{
+			$aPercents[] = $iPercent;
+		}
+		sort($aPercents, SORT_NUMERIC);
+		foreach($aPercents as $iPercent)
+		{
+			$aDefs = $this->aThresholds[$iPercent];
+			if (array_key_exists('highlight', $aDefs) && is_array($aDefs['highlight']) && $this->IsThresholdPassed($iPercent))
+			{
+				// If persistant or SW running...
+				if (($aDefs['highlight']['persistent'] == true) || (($aDefs['highlight']['persistent'] == false) && !is_null($this->iLastStart)))
+				{
+					$sCode = $aDefs['highlight']['code'];
+				}
+			}
+		}
+		return $sCode;
+	}
+
+	public function GetAsHTML($oAttDef, $oHostObject = null)
+	{
+		$aProperties = array();
+
+		$aProperties['States'] = implode(', ', $oAttDef->GetStates());
+
+		if (is_null($this->iLastStart))
+		{
+			if (is_null($this->iStarted))
+			{
+				$aProperties['Elapsed'] = 'never started';
+			}
+			else
+			{
+				$aProperties['Elapsed'] = $this->iTimeSpent.' s';
+			}
+		}
+		else
+		{
+			$aProperties['Elapsed'] = 'running <img src="../images/indicator.gif">';
+		}
+
+		$aProperties['Started'] = $oAttDef->SecondsToDate($this->iStarted);
+		$aProperties['LastStart'] = $oAttDef->SecondsToDate($this->iLastStart);
+		$aProperties['Stopped'] = $oAttDef->SecondsToDate($this->iStopped);
+
+		foreach ($this->aThresholds as $iPercent => $aThresholdData)
+		{
+			$sThresholdDesc = $oAttDef->SecondsToDate($aThresholdData['deadline']);
+			if ($aThresholdData['triggered'])
+			{
+				$sThresholdDesc .= " <b>TRIGGERED</b>";
+			}
+			if ($aThresholdData['overrun'])
+			{
+				$sThresholdDesc .= " Overrun:".(int) $aThresholdData['overrun']." sec.";
+			}
+			$aProperties[$iPercent.'%'] = $sThresholdDesc;
+		}
+		$sRes = "<TABLE>";
+		$sRes .= "<TBODY>";
+		foreach ($aProperties as $sProperty => $sValue)
+		{
+			$sRes .= "<TR>";
+			$sCell = str_replace("\n", "<br>\n", $sValue);
+			$sRes .= "<TD class=\"label\">$sProperty</TD><TD>$sCell</TD>";
+			$sRes .= "</TR>";
+		}
+		$sRes .= "</TBODY>";
+		$sRes .= "</TABLE>";
+		return $sRes;
+	}
+
+	protected function ComputeGoal($oObject, $oAttDef)
+	{
+		$sMetricComputer = $oAttDef->Get('goal_computing');
+		$oComputer = new $sMetricComputer();
+		$aCallSpec = array($oComputer, 'ComputeMetric');
+		if (!is_callable($aCallSpec))
+		{
+			throw new CoreException("Unknown class/verb '$sMetricComputer/ComputeMetric'");
+		}
+		$iRet = call_user_func($aCallSpec, $oObject);
+		return $iRet;
+	}
+
+	protected function ComputeDeadline($oObject, $oAttDef, $iPercent, $iStartTime, $iDurationSec)
+	{
+		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
+		if ($sWorkingTimeComputer == '')
+		{
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
+		}
+		$aCallSpec = array($sWorkingTimeComputer, '__construct');
+		if (!is_callable($aCallSpec))
+		{
+			//throw new CoreException("Pas de constructeur pour $sWorkingTimeComputer!");
+		}
+		$oComputer = new $sWorkingTimeComputer();
+		$aCallSpec = array($oComputer, 'GetDeadline');
+		if (!is_callable($aCallSpec))
+		{
+			throw new CoreException("Unknown class/verb '$sWorkingTimeComputer/GetDeadline'");
+		}
+		// GetDeadline($oObject, $iDuration, DateTime $oStartDate)
+		$oStartDate = new DateTime('@'.$iStartTime); // setTimestamp not available in PHP 5.2
+		$oDeadline = call_user_func($aCallSpec, $oObject, $iDurationSec, $oStartDate, $iPercent);
+		$iRet = $oDeadline->format('U');
+		return $iRet;
+	}
+
+	protected function ComputeDuration($oObject, $oAttDef, $iStartTime, $iEndTime)
+	{
+		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
+		if ($sWorkingTimeComputer == '')
+		{
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
+		}
+		$oComputer = new $sWorkingTimeComputer();
+		$aCallSpec = array($oComputer, 'GetOpenDuration');
+		if (!is_callable($aCallSpec))
+		{
+			throw new CoreException("Unknown class/verb '$sWorkingTimeComputer/GetOpenDuration'");
+		}
+		// GetOpenDuration($oObject, DateTime $oStartDate, DateTime $oEndDate)
+		$oStartDate = new DateTime('@'.$iStartTime); // setTimestamp not available in PHP 5.2
+		$oEndDate = new DateTime('@'.$iEndTime);
+		$iRet = call_user_func($aCallSpec, $oObject, $oStartDate, $oEndDate);
+		return $iRet;
+	}
+
+	public function Reset($oObject, $oAttDef)
+	{
+		$this->iTimeSpent = 0;
+		$this->iStopped = null;
+		$this->iStarted = null;
+
+		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
+		{
+			$aThresholdData['triggered'] = false;
+			$aThresholdData['overrun'] = null;
+		}
+
+		if (!is_null($this->iLastStart))
+		{
+			// Currently running... starting again from now!
+			$this->iStarted = time();
+			$this->iLastStart = time();
+			$this->ComputeDeadlines($oObject, $oAttDef);
+		}
+	}
+
+	/**
+	 * Start or continue
+	 * It is the responsibility of the caller to compute the deadlines
+	 * (to avoid computing twice for the same result) 	 
+	 */	 	 	
+	public function Start($oObject, $oAttDef, $iNow = null)
+	{
+		if (!is_null($this->iLastStart))
+		{
+			// Already started
+			return false;
+		}
+
+		if (is_null($iNow))
+		{
+			$iNow = time();
+		}
+
+		if (is_null($this->iStarted))
+		{
+			$this->iStarted = $iNow;
+		}
+		$this->iLastStart = $iNow;
+		$this->iStopped = null;
+
+		return true;
+	}
+
+	/**
+	 * Compute or recompute the goal and threshold deadlines
+	 */	 	 	
+	public function ComputeDeadlines($oObject, $oAttDef)
+	{
+		if (is_null($this->iLastStart))
+		{
+			// Currently stopped - do nothing
+			return false;
+		}
+
+		$iDurationGoal = $this->ComputeGoal($oObject, $oAttDef);
+		$iComputationRefTime = time();
+		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
+		{
+			if (is_null($iDurationGoal))
+			{
+				// No limit: leave null thresholds
+				$aThresholdData['deadline'] = null;
+			}
+			else
+			{
+				$iThresholdDuration = round($iPercent * $iDurationGoal / 100);
+
+				if (class_exists('WorkingTimeRecorder'))
+				{
+					$sClass = get_class($oObject);
+					$sAttCode = $oAttDef->GetCode();
+					WorkingTimeRecorder::Start($oObject, $iComputationRefTime, "ormStopWatch-Deadline-$iPercent-$sAttCode", 'Core:ExplainWTC:StopWatch-Deadline', array("Class:$sClass/Attribute:$sAttCode", $iPercent));
+				}
+				$aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iLastStart, $iThresholdDuration - $this->iTimeSpent);
+				// OR $aThresholdData['deadline'] = $this->ComputeDeadline($oObject, $oAttDef, $iPercent, $this->iStarted, $iThresholdDuration);
+
+				if (class_exists('WorkingTimeRecorder'))
+				{
+					WorkingTimeRecorder::End();
+				}
+			}
+			if (is_null($aThresholdData['deadline']) || ($aThresholdData['deadline'] > time()))
+			{
+				// The threshold is in the future, reset
+				$aThresholdData['triggered'] = false;
+				$aThresholdData['overrun'] = null;
+			}
+			else
+			{
+				// The new threshold is in the past
+				// Note: the overrun can be wrong, but the correct algorithm to compute
+				// the overrun of a deadline in the past requires that the ormStopWatch keeps track of all its history!!!
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Stop counting if not already done
+	 */	 	 	
+	public function Stop($oObject, $oAttDef, $iNow = null)
+	{
+		if (is_null($this->iLastStart))
+		{
+			// Already stopped
+			return false;
+		}
+
+		if (is_null($iNow))
+		{
+			$iNow = time();
+		}
+
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			$sClass = get_class($oObject);
+			$sAttCode = $oAttDef->GetCode();
+			WorkingTimeRecorder::Start($oObject, $iNow, "ormStopWatch-TimeSpent-$sAttCode", 'Core:ExplainWTC:StopWatch-TimeSpent', array("Class:$sClass/Attribute:$sAttCode"), true /*cumulative*/);
+		}
+		$iElapsed = $this->ComputeDuration($oObject, $oAttDef, $this->iLastStart, $iNow);
+		$this->iTimeSpent = $this->iTimeSpent + $iElapsed;
+		if (class_exists('WorkingTimeRecorder'))
+		{
+			WorkingTimeRecorder::End();
+		}
+
+		foreach ($this->aThresholds as $iPercent => &$aThresholdData)
+		{
+			if (!is_null($aThresholdData['deadline']) && ($iNow > $aThresholdData['deadline']))
+			{
+				if ($aThresholdData['overrun'] > 0)
+				{
+					// Accumulate from last start
+					$aThresholdData['overrun'] += $iElapsed;
+				}
+				else
+				{
+					// First stop after the deadline has been passed
+					$iOverrun = $this->ComputeDuration($oObject, $oAttDef, $aThresholdData['deadline'], $iNow);
+					$aThresholdData['overrun'] = $iOverrun;
+				}
+			}
+			$aThresholdData['deadline'] = null;
+		}
+
+		$this->iLastStart = null;
+		$this->iStopped = $iNow;
+
+		return true;
+	}
+}
+
+/**
+ * CheckStopWatchThresholds
+ * Implements the automatic actions 
+ *
+ * @package     itopORM
+ */
+class CheckStopWatchThresholds implements iBackgroundProcess
+{
+	public function GetPeriodicity()
+	{	
+		return 10; // seconds
+	}
+
+	public function Process($iTimeLimit)
+	{
+		$aList = array();
+		foreach (MetaModel::GetClasses() as $sClass)
+		{
+			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+			{
+				if ($oAttDef instanceof AttributeStopWatch)
+				{
+					foreach ($oAttDef->ListThresholds() as $iThreshold => $aThresholdData)
+					{
+						$iPercent = $aThresholdData['percent']; // could be different than the index !
+		
+						$sNow = date(AttributeDateTime::GetSQLFormat());
+						$sExpression = "SELECT $sClass WHERE {$sAttCode}_laststart AND {$sAttCode}_{$iThreshold}_triggered = 0 AND {$sAttCode}_{$iThreshold}_deadline < '$sNow'";
+						$oFilter = DBObjectSearch::FromOQL($sExpression);
+						$oSet = new DBObjectSet($oFilter);
+						$oSet->OptimizeColumnLoad(array($sAttCode));
+						while ((time() < $iTimeLimit) && ($oObj = $oSet->Fetch()))
+						{
+							$sClass = get_class($oObj);
+
+							$aList[] = $sClass.'::'.$oObj->GetKey().' '.$sAttCode.' '.$iThreshold;
+
+							// Execute planned actions
+							//
+							foreach ($aThresholdData['actions'] as $aActionData)
+							{
+								$sVerb = $aActionData['verb'];
+								$aParams = $aActionData['params'];
+								$aValues = array();
+								foreach($aParams as $def)
+								{
+									if (is_string($def))
+									{
+										// Old method (pre-2.1.0) non typed parameters
+										$aValues[] = $def;
+									}
+									else // if(is_array($def))
+									{
+										$sParamType = array_key_exists('type', $def) ? $def['type'] : 'string';
+										switch($sParamType)
+										{
+											case 'int':
+												$value = (int)$def['value'];
+												break;
+										
+											case 'float':
+												$value = (float)$def['value'];
+												break;
+										
+											case 'bool':
+												$value = (bool)$def['value'];
+												break;
+										
+											case 'reference':
+												$value = ${$def['value']};
+												break;
+										
+											case 'string':
+											default:
+												$value = (string)$def['value'];
+										}
+										$aValues[] = $value;
+									}
+								}
+								$aCallSpec = array($oObj, $sVerb);
+								call_user_func_array($aCallSpec, $aValues);
+							}
+
+							// Mark the threshold as "triggered"
+							//
+							$oSW = $oObj->Get($sAttCode);
+							$oSW->MarkThresholdAsTriggered($iThreshold);
+							$oObj->Set($sAttCode, $oSW);
+		
+							if($oObj->IsModified())
+							{
+								CMDBObject::SetTrackInfo("Automatic - threshold triggered");
+					
+								$oMyChange = CMDBObject::GetCurrentChange();
+								$oObj->DBUpdateTracked($oMyChange, true /*skip security*/);
+							}
+
+							// Activate any existing trigger
+							// 
+							$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+							$oTriggerSet = new DBObjectSet(
+								DBObjectSearch::FromOQL("SELECT TriggerOnThresholdReached AS t WHERE t.target_class IN ('$sClassList') AND stop_watch_code=:stop_watch_code AND threshold_index = :threshold_index"),
+								array(), // order by
+								array('stop_watch_code' => $sAttCode, 'threshold_index' => $iThreshold)
+							);
+							while ($oTrigger = $oTriggerSet->Fetch())
+							{
+								$oTrigger->DoActivate($oObj->ToArgs('this'));
+							}
+						}
+					}
+				}
+			}
+		}
+
+		$iProcessed = count($aList);
+		return "Triggered $iProcessed threshold(s):".implode(", ", $aList);
+	}
+}
diff --git a/core/querymodifier.class.inc.php b/core/querymodifier.class.inc.php
index 3085d97ea..b68a70362 100644
--- a/core/querymodifier.class.inc.php
+++ b/core/querymodifier.class.inc.php
@@ -1,34 +1,34 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Interface iQueryModifier
- * Defines the API to tweak queries (e.g. translate data on the fly) 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-interface iQueryModifier
-{
-	public function __construct();
-
-	public function GetFieldExpression(QueryBuilderContext &$oBuild, $sClass, $sAttCode, $sColId, Expression $oFieldSQLExp, SQLQuery &$oSelect);
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Interface iQueryModifier
+ * Defines the API to tweak queries (e.g. translate data on the fly) 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+interface iQueryModifier
+{
+	public function __construct();
+
+	public function GetFieldExpression(QueryBuilderContext &$oBuild, $sClass, $sAttCode, $sColId, Expression $oFieldSQLExp, SQLQuery &$oSelect);
+}
+?>
diff --git a/core/restservices.class.inc.php b/core/restservices.class.inc.php
index 1d1f3dcd8..916dd5f72 100644
--- a/core/restservices.class.inc.php
+++ b/core/restservices.class.inc.php
@@ -1,777 +1,777 @@
-<?php
-// Copyright (C) 2013-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * REST/json services
- * 
- * Definition of common structures + the very minimum service provider (manage objects)
- *
- * @package     REST Services
- * @copyright   Copyright (C) 2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- * @api
- */
-
-/**
- * Element of the response formed by RestResultWithObjects
- *
- * @package     REST Services
- */
-class ObjectResult
-{
-	public $code;
-	public $message;
-	public $class;
-	public $key;
-	public $fields;
-	
-	/**
-	 * Default constructor
-	 */
-	public function __construct($sClass = null, $iId = null)
-	{
-		$this->code = RestResult::OK;
-		$this->message = '';
-		$this->class = $sClass;
-		$this->key = $iId;
-		$this->fields = array();
-	}
-
-	/**
-	 * Helper to make an output value for a given attribute
-	 * 	 
-	 * @param DBObject $oObject The object being reported
-	 * @param string $sAttCode The attribute code (must be valid)
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 * @return string A scalar representation of the value
-	 */
-	protected function MakeResultValue(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
-	{
-		if ($sAttCode == 'id')
-		{
-			$value = $oObject->GetKey();
-		}
-		else
-		{
-			$sClass = get_class($oObject);
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			if ($oAttDef instanceof AttributeLinkedSet)
-			{
-				// Iterate on the set and build an array of array of attcode=>value
-				$oSet = $oObject->Get($sAttCode);
-				$value = array();
-				while ($oLnk = $oSet->Fetch())
-				{
-					$sLnkRefClass = $bExtendedOutput ? get_class($oLnk) : $oAttDef->GetLinkedClass();
-
-					$aLnkValues = array();
-					foreach (MetaModel::ListAttributeDefs($sLnkRefClass) as $sLnkAttCode => $oLnkAttDef)
-					{
-						// Skip attributes pointing to the current object (redundant data)
-						if ($sLnkAttCode == $oAttDef->GetExtKeyToMe())
-						{
-							continue;
-						}
-						// Skip any attribute of the link that points to the current object
-						$oLnkAttDef = MetaModel::GetAttributeDef($sLnkRefClass, $sLnkAttCode);
-						if (method_exists($oLnkAttDef, 'GetKeyAttCode'))
-						{
-							if ($oLnkAttDef->GetKeyAttCode() == $oAttDef->GetExtKeyToMe())
-							{
-								continue;
-							}
-						}
-						
-						$aLnkValues[$sLnkAttCode] = $this->MakeResultValue($oLnk, $sLnkAttCode, $bExtendedOutput);
-					}
-					$value[] = $aLnkValues;
-				}
-			}
-			else
-			{
-				$value = $oAttDef->GetForJSON($oObject->Get($sAttCode));
-			}
-		}
-		return $value;
-	}
-
-	/**
-	 * Report the value for the given object attribute
-	 * 	 
-	 * @param DBObject $oObject The object being reported
-	 * @param string $sAttCode The attribute code (must be valid)
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 * @return void
-	 */
-	public function AddField(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
-	{
-		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode, $bExtendedOutput);
-	}
-}
-
-
-
-/**
- * REST response for services managing objects. Derive this structure to add information and/or constants
- *
- * @package     Extensibility
- * @package     REST Services
- * @api
- */
-class RestResultWithObjects extends RestResult
-{
-	public $objects;
-
-	/**
-	 * Report the given object
-	 * 	 
-	 * @param int An error code (RestResult::OK is no issue has been found)
-	 * @param string $sMessage Description of the error if any, an empty string otherwise
-	 * @param DBObject $oObject The object being reported
-	 * @param array $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
-	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
-	 * @return void
-	 */
-	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
-	{
-		$sClass = get_class($oObject);
-		$oObjRes = new ObjectResult($sClass, $oObject->GetKey());
-		$oObjRes->code = $iCode;
-		$oObjRes->message = $sMessage;
-
-		$aFields = null;
-		if (!is_null($aFieldSpec))
-		{
-			// Enum all classes in the hierarchy, starting with the current one
-			foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
-			{
-				if (array_key_exists($sRefClass, $aFieldSpec))
-				{
-					$aFields = $aFieldSpec[$sRefClass];
-					break;
-				}
-			}
-		}
-		if (is_null($aFields))
-		{
-			// No fieldspec given, or not found...
-			$aFields = array('id', 'friendlyname');
-		}
-
-		foreach ($aFields as $sAttCode)
-		{
-			$oObjRes->AddField($oObject, $sAttCode, $bExtendedOutput);
-		}
-
-		$sObjKey = get_class($oObject).'::'.$oObject->GetKey();
-		$this->objects[$sObjKey] = $oObjRes;
-	}
-}
-
-class RestResultWithRelations extends RestResultWithObjects
-{
-	public $relations;
-	
-	public function __construct()
-	{
-		parent::__construct();
-		$this->relations = array();
-	}
-	
-	public function AddRelation($sSrcKey, $sDestKey)
-	{
-		if (!array_key_exists($sSrcKey, $this->relations))
-		{
-			$this->relations[$sSrcKey] = array();
-		}
-		$this->relations[$sSrcKey][] = array('key' => $sDestKey);
-	}
-}
-
-/**
- * Deletion result codes for a target object (either deleted or updated)
- *
- * @package     Extensibility
- * @api
- * @since 2.0.1  
- */
-class RestDelete
-{
-	/**
-	 * Result: Object deleted as per the initial request
-	 */
-	const OK = 0;
-	/**
-	 * Result: general issue (user rights or ... ?) 
-	 */
-	const ISSUE = 1;
-	/**
-	 * Result: Must be deleted to preserve database integrity 
-	 */
-	const AUTO_DELETE = 2;
-	/**
-	 * Result: Must be deleted to preserve database integrity, but that is NOT possible 
-	 */
-	const AUTO_DELETE_ISSUE = 3;
-	/**
-	 * Result: Must be deleted to preserve database integrity, but this must be requested explicitely 
-	 */
-	const REQUEST_EXPLICITELY = 4;
-	/**
-	 * Result: Must be updated to preserve database integrity
-	 */
-	const AUTO_UPDATE = 5;
-	/**
-	 * Result: Must be updated to preserve database integrity, but that is NOT possible
-	 */
-	const AUTO_UPDATE_ISSUE = 6;
-}
-
-/**
- * Implementation of core REST services (create/get/update... objects)
- *
- * @package     Core
- */
-class CoreServices implements iRestServiceProvider
-{
-	/**
-	 * Enumerate services delivered by this class
-	 * 	 
-	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 * @return array An array of hash 'verb' => verb, 'description' => description
-	 */
-	public function ListOperations($sVersion)
-	{
-		// 1.3 - iTop 2.2.0, Verb 'get_related': added the options 'redundancy' and 'direction' to take into account the redundancy in the impact analysis
-		// 1.2 - was documented in the wiki but never released ! Same as 1.3
-		// 1.1 - In the reply, objects have a 'key' entry so that it is no more necessary to split class::key programmaticaly
-		// 1.0 - Initial implementation in iTop 2.0.1
-		//
-		$aOps = array();
-		if (in_array($sVersion, array('1.0', '1.1', '1.2', '1.3'))) 
-		{
-			$aOps[] = array(
-				'verb' => 'core/create',
-				'description' => 'Create an object'
-			);
-			$aOps[] = array(
-				'verb' => 'core/update',
-				'description' => 'Update an object'
-			);
-			$aOps[] = array(
-				'verb' => 'core/apply_stimulus',
-				'description' => 'Apply a stimulus to change the state of an object'
-			);
-			$aOps[] = array(
-				'verb' => 'core/get',
-				'description' => 'Search for objects'
-			);
-			$aOps[] = array(
-				'verb' => 'core/delete',
-				'description' => 'Delete objects'
-			);
-			$aOps[] = array(
-				'verb' => 'core/get_related',
-				'description' => 'Get related objects through the specified relation'
-			);
-			$aOps[] = array(
-				'verb' => 'core/check_credentials',
-				'description' => 'Check user credentials'
-			);
-		}
-		return $aOps;
-	}
-
-	/**
-	 * Enumerate services delivered by this class
-	 * @param string $sVersion The version (e.g. 1.0) supported by the services
-	 * @return RestResult The standardized result structure (at least a message)
-	 * @throws Exception in case of internal failure.	 
-	 */
-	public function ExecOperation($sVersion, $sVerb, $aParams)
-	{
-		$oResult = new RestResultWithObjects();
-		switch ($sVerb)
-		{
-		case 'core/create':
-			RestUtils::InitTrackingComment($aParams);
-			$sClass = RestUtils::GetClass($aParams, 'class');
-			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
-			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
-			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
-
-			if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for creating data of class $sClass";
-			}
-			elseif (UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for massively creating data of class $sClass";
-			}
-			else
-			{
-				$oObject = RestUtils::MakeObjectFromFields($sClass, $aFields);
-				$oObject->DBInsert();
-				$oResult->AddObject(0, 'created', $oObject, $aShowFields, $bExtendedOutput);
-			}
-			break;
-	
-		case 'core/update':
-			RestUtils::InitTrackingComment($aParams);
-			$sClass = RestUtils::GetClass($aParams, 'class');
-			$key = RestUtils::GetMandatoryParam($aParams, 'key');
-			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
-			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
-			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
-	
-			// Note: the target class cannot be based on the result of FindObjectFromKey, because in case the user does not have read access, that function already fails with msg 'Nothing found'
-			$sTargetClass = RestUtils::GetObjectSetFromKey($sClass, $key)->GetFilter()->GetClass();
-			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for modifying data of class $sTargetClass";
-			}
-			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for massively modifying data of class $sTargetClass";
-			}
-			else
-			{
-				$oObject = RestUtils::FindObjectFromKey($sClass, $key);
-				RestUtils::UpdateObjectFromFields($oObject, $aFields);
-				$oObject->DBUpdate();
-				$oResult->AddObject(0, 'updated', $oObject, $aShowFields, $bExtendedOutput);
-			}
-			break;
-	
-		case 'core/apply_stimulus':
-			RestUtils::InitTrackingComment($aParams);
-			$sClass = RestUtils::GetClass($aParams, 'class');
-			$key = RestUtils::GetMandatoryParam($aParams, 'key');
-			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
-			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
-			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
-			$sStimulus = RestUtils::GetMandatoryParam($aParams, 'stimulus');
-	
-			// Note: the target class cannot be based on the result of FindObjectFromKey, because in case the user does not have read access, that function already fails with msg 'Nothing found'
-			$sTargetClass = RestUtils::GetObjectSetFromKey($sClass, $key)->GetFilter()->GetClass();
-			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for modifying data of class $sTargetClass";
-			}
-			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_BULK_MODIFY) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for massively modifying data of class $sTargetClass";
-			}
-			else
-			{
-				$oObject = RestUtils::FindObjectFromKey($sClass, $key);
-				RestUtils::UpdateObjectFromFields($oObject, $aFields);
-			
-				$aTransitions = $oObject->EnumTransitions();
-				$aStimuli = MetaModel::EnumStimuli(get_class($oObject));
-				if (!isset($aTransitions[$sStimulus]))
-				{
-					// Invalid stimulus
-					$oResult->code = RestResult::INTERNAL_ERROR;
-					$oResult->message = "Invalid stimulus: '$sStimulus' on the object ".$oObject->GetName()." in state '".$oObject->GetState()."'";
-				}
-				else
-				{
-					$aTransition = $aTransitions[$sStimulus];
-					$sTargetState = $aTransition['target_state'];
-					$aStates = MetaModel::EnumStates($sClass);
-					$aTargetStateDef = $aStates[$sTargetState];
-					$aExpectedAttributes = $aTargetStateDef['attribute_list'];
-					
-					$aMissingMandatory = array();
-					foreach($aExpectedAttributes as $sAttCode => $iExpectCode)
-					{
-						if ( ($iExpectCode & OPT_ATT_MANDATORY) && ($oObject->Get($sAttCode) == ''))
-						{
-							$aMissingMandatory[] = $sAttCode;
-						}
-					}				
-					if (count($aMissingMandatory) == 0)
-					{
-						// If all the mandatory fields are already present, just apply the transition silently...
-						if ($oObject->ApplyStimulus($sStimulus))
-						{
-							$oObject->DBUpdate();
-							$oResult->AddObject(0, 'updated', $oObject, $aShowFields, $bExtendedOutput);
-						}
-					}
-					else
-					{
-						// Missing mandatory attributes for the transition
-						$oResult->code = RestResult::INTERNAL_ERROR;
-						$oResult->message = 'Missing mandatory attribute(s) for applying the stimulus: '.implode(', ', $aMissingMandatory).'.';
-					}
-				}
-			}	
-			break;
-	
-		case 'core/get':
-			$sClass = RestUtils::GetClass($aParams, 'class');
-			$key = RestUtils::GetMandatoryParam($aParams, 'key');
-			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
-			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
-
-			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
-			$sTargetClass = $oObjectSet->GetFilter()->GetClass();
-	
-			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for reading data of class $sTargetClass";
-			}
-			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_BULK_READ) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for exporting data of class $sTargetClass";
-			}
-			else
-			{
-				while ($oObject = $oObjectSet->Fetch())
-				{
-					$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
-				}
-				$oResult->message = "Found: ".$oObjectSet->Count();
-			}
-			break;
-
-		case 'core/delete':
-			$sClass = RestUtils::GetClass($aParams, 'class');
-			$key = RestUtils::GetMandatoryParam($aParams, 'key');
-			$bSimulate = RestUtils::GetOptionalParam($aParams, 'simulate', false);
-	
-			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
-			$sTargetClass = $oObjectSet->GetFilter()->GetClass();
-	
-			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_DELETE) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for deleting data of class $sTargetClass";
-			}
-			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_DELETE) != UR_ALLOWED_YES)
-			{
-				$oResult->code = RestResult::UNAUTHORIZED;
-				$oResult->message = "The current user does not have enough permissions for massively deleting data of class $sTargetClass";
-			}
-			else
-			{
-				$aObjects = $oObjectSet->ToArray();
-				$this->DeleteObjects($oResult, $aObjects, $bSimulate);
-			}
-			break;
-
-		case 'core/get_related':
-			$oResult = new RestResultWithRelations();
-			$sClass = RestUtils::GetClass($aParams, 'class');
-			$key = RestUtils::GetMandatoryParam($aParams, 'key');
-			$sRelation = RestUtils::GetMandatoryParam($aParams, 'relation');
-			$iMaxRecursionDepth = RestUtils::GetOptionalParam($aParams, 'depth', 20 /* = MAX_RECURSION_DEPTH */);
-			$sDirection = RestUtils::GetOptionalParam($aParams, 'direction', null);
-			$bEnableRedundancy = RestUtils::GetOptionalParam($aParams, 'redundancy', false);
-			$bReverse = false;
-
-			if (is_null($sDirection) && ($sRelation == 'depends on'))
-			{
-				// Legacy behavior, consider "depends on" as a forward relation
-				$sRelation = 'impacts';
-				$sDirection = 'up'; 
-				$bReverse = true; // emulate the legacy behavior by returning the edges
-			}
-			else if(is_null($sDirection))
-			{
-				$sDirection = 'down';
-			}
-	
-			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
-			if ($sDirection == 'down')
-			{
-				$oRelationGraph = $oObjectSet->GetRelatedObjectsDown($sRelation, $iMaxRecursionDepth, $bEnableRedundancy);
-			}
-			else if ($sDirection == 'up')
-			{
-				$oRelationGraph = $oObjectSet->GetRelatedObjectsUp($sRelation, $iMaxRecursionDepth, $bEnableRedundancy);
-			}
-			else
-			{
-				$oResult->code = RestResult::INTERNAL_ERROR;
-				$oResult->message = "Invalid value: '$sDirection' for the parameter 'direction'. Valid values are 'up' and 'down'";
-				return $oResult;
-				
-			}
-			
-			if ($bEnableRedundancy)
-			{
-				// Remove the redundancy nodes from the output
-				$oIterator = new RelationTypeIterator($oRelationGraph, 'Node');
-				foreach($oIterator as $oNode)
-				{
-					if ($oNode instanceof RelationRedundancyNode)
-					{
-						$oRelationGraph->FilterNode($oNode);
-					}
-				}
-			}
-			
-			$aIndexByClass = array();
-			$oIterator = new RelationTypeIterator($oRelationGraph);
-			foreach($oIterator as $oElement)
-			{
-				if ($oElement instanceof RelationObjectNode)
-				{
-					$oObject = $oElement->GetProperty('object');
-					if ($oObject)
-					{
-						if ($bEnableRedundancy)
-						{
-							// Add only the "reached" objects
-							if ($oElement->GetProperty('is_reached'))
-							{
-								$aIndexByClass[get_class($oObject)][$oObject->GetKey()] = null;
-								$oResult->AddObject(0, '', $oObject);
-							}
-						}
-						else
-						{
-							$aIndexByClass[get_class($oObject)][$oObject->GetKey()] = null;
-							$oResult->AddObject(0, '', $oObject);
-						}
-					}
-				}
-				else if ($oElement instanceof RelationEdge)
-				{
-					$oSrcObj = $oElement->GetSourceNode()->GetProperty('object');
-					$oDestObj = $oElement->GetSinkNode()->GetProperty('object');
-					$sSrcKey = get_class($oSrcObj).'::'.$oSrcObj->GetKey();
-					$sDestKey = get_class($oDestObj).'::'.$oDestObj->GetKey();
-					if ($bEnableRedundancy)
-					{
-						// Add only the edges where both source and destination are "reached"
-						if ($oElement->GetSourceNode()->GetProperty('is_reached') && $oElement->GetSinkNode()->GetProperty('is_reached'))
-						{
-							if ($bReverse)
-							{
-								$oResult->AddRelation($sDestKey, $sSrcKey);
-							}
-							else
-							{
-								$oResult->AddRelation($sSrcKey, $sDestKey);
-							}
-						}
-					}
-					else
-					{
-						if ($bReverse)
-						{
-							$oResult->AddRelation($sDestKey, $sSrcKey);
-						}
-						else
-						{
-							$oResult->AddRelation($sSrcKey, $sDestKey);
-						}
-					}
-				}
-			}
-
-			if (count($aIndexByClass) > 0)
-			{
-				$aStats = array();
-				$aUnauthorizedClasses = array();
-				foreach ($aIndexByClass as $sClass => $aIds)
-				{
-					if (UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_READ) != UR_ALLOWED_YES)
-					{
-						$aUnauthorizedClasses[$sClass] = true;
-					}
-					$aStats[] = $sClass.'= '.count($aIds);
-				}
-				if (count($aUnauthorizedClasses) > 0)
-				{
-					$sClasses = implode(', ', array_keys($aUnauthorizedClasses));
-					$oResult = new RestResult();
-					$oResult->code = RestResult::UNAUTHORIZED;
-					$oResult->message = "The current user does not have enough permissions for exporting data of class(es): $sClasses";
-				}
-				else
-				{
-					$oResult->message = "Scope: ".$oObjectSet->Count()."; Related objects: ".implode(', ', $aStats);
-				}
-			}
-			else
-			{
-				$oResult->message = "Nothing found";
-			}
-			break;
-			
-		case 'core/check_credentials':
-			$oResult = new RestResult();
-			$sUser = RestUtils::GetMandatoryParam($aParams, 'user');
-			$sPassword = RestUtils::GetMandatoryParam($aParams, 'password');
-
-			if (UserRights::CheckCredentials($sUser, $sPassword) !== true)
-			{
-				$oResult->authorized = false;
-			}
-			else
-			{
-				$oResult->authorized = true;
-			}
-			break;
-	
-		default:
-			// unknown operation: handled at a higher level
-		}
-		return $oResult;
-	}
-
-	/**
-	 * Helper for object deletion	
-	 */
-	public function DeleteObjects($oResult, $aObjects, $bSimulate)
-	{
-		$oDeletionPlan = new DeletionPlan();
-		foreach($aObjects as $oObj)
-		{
-			if ($bSimulate)
-			{
-				$oObj->CheckToDelete($oDeletionPlan);
-			}
-			else
-			{
-				$oObj->DBDelete($oDeletionPlan);
-			}
-		}
-
-		foreach ($oDeletionPlan->ListDeletes() as $sTargetClass => $aDeletes)
-		{
-			foreach ($aDeletes as $iId => $aData)
-			{
-				$oToDelete = $aData['to_delete'];
-				$bAutoDel = (($aData['mode'] == DEL_SILENT) || ($aData['mode'] == DEL_AUTO));
-				if (array_key_exists('issue', $aData))
-				{
-					if ($bAutoDel)
-					{
-						if (isset($aData['requested_explicitely'])) // i.e. in the initial list of objects to delete
-						{
-							$iCode = RestDelete::ISSUE;
-							$sPlanned = 'Cannot be deleted: '.$aData['issue'];
-						}
-						else
-						{
-							$iCode = RestDelete::AUTO_DELETE_ISSUE;
-							$sPlanned = 'Should be deleted automatically... but: '.$aData['issue'];
-						}
-					}
-					else
-					{
-						$iCode = RestDelete::REQUEST_EXPLICITELY;
-						$sPlanned = 'Must be deleted explicitely... but: '.$aData['issue'];
-					}
-				}
-				else
-				{
-					if ($bAutoDel)
-					{
-						if (isset($aData['requested_explicitely']))
-						{
-							$iCode = RestDelete::OK;
-		               $sPlanned = '';
-						}
-						else
-						{
-							$iCode = RestDelete::AUTO_DELETE;
-							$sPlanned = 'Deleted automatically';
-						}
-					}
-					else
-					{
-						$iCode = RestDelete::REQUEST_EXPLICITELY;
-						$sPlanned = 'Must be deleted explicitely';
-					}
-				}
-				$oResult->AddObject($iCode, $sPlanned, $oToDelete);
-			}
-		}
-		foreach ($oDeletionPlan->ListUpdates() as $sRemoteClass => $aToUpdate)
-		{
-			foreach ($aToUpdate as $iId => $aData)
-			{
-				$oToUpdate = $aData['to_reset'];
-				if (array_key_exists('issue', $aData))
-				{
-					$iCode = RestDelete::AUTO_UPDATE_ISSUE;
-					$sPlanned = 'Should be updated automatically... but: '.$aData['issue'];
-				}
-				else
-				{
-					$iCode = RestDelete::AUTO_UPDATE;
-					$sPlanned = 'Reset external keys: '.$aData['attributes_list'];
-				}
-				$oResult->AddObject($iCode, $sPlanned, $oToUpdate);
-			}
-		}
-		
-		if ($oDeletionPlan->FoundStopper())
-		{
-			if ($oDeletionPlan->FoundSecurityIssue())
-			{
-				$iRes = RestResult::UNAUTHORIZED;
-				$sRes = 'Deletion not allowed on some objects';
-			}
-			elseif ($oDeletionPlan->FoundManualOperation())
-			{
-				$iRes = RestResult::UNSAFE; 
-				$sRes = 'The deletion requires that other objects be deleted/updated, and those operations must be requested explicitely';
-			}
-			else
-			{
-				$iRes = RestResult::INTERNAL_ERROR; 
-				$sRes = 'Some issues have been encountered. See the list of planned changes for more information about the issue(s).';
-			}		
-		}
-		else
-		{
-			$iRes = RestResult::OK; 
-			$sRes = 'Deleted: '.count($aObjects);
-			$iIndirect = $oDeletionPlan->GetTargetCount() - count($aObjects);
-			if ($iIndirect > 0)
-			{
-				$sRes .= ' plus (for DB integrity) '.$iIndirect;
-			}
-		}
-		$oResult->code = $iRes;
-		if ($bSimulate)
-		{
-			$oResult->message = 'SIMULATING: '.$sRes;
-		}
-		else
-		{
-			$oResult->message = $sRes;
-		}
-	}
-}
+<?php
+// Copyright (C) 2013-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * REST/json services
+ * 
+ * Definition of common structures + the very minimum service provider (manage objects)
+ *
+ * @package     REST Services
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @api
+ */
+
+/**
+ * Element of the response formed by RestResultWithObjects
+ *
+ * @package     REST Services
+ */
+class ObjectResult
+{
+	public $code;
+	public $message;
+	public $class;
+	public $key;
+	public $fields;
+	
+	/**
+	 * Default constructor
+	 */
+	public function __construct($sClass = null, $iId = null)
+	{
+		$this->code = RestResult::OK;
+		$this->message = '';
+		$this->class = $sClass;
+		$this->key = $iId;
+		$this->fields = array();
+	}
+
+	/**
+	 * Helper to make an output value for a given attribute
+	 * 	 
+	 * @param DBObject $oObject The object being reported
+	 * @param string $sAttCode The attribute code (must be valid)
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
+	 * @return string A scalar representation of the value
+	 */
+	protected function MakeResultValue(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
+	{
+		if ($sAttCode == 'id')
+		{
+			$value = $oObject->GetKey();
+		}
+		else
+		{
+			$sClass = get_class($oObject);
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef instanceof AttributeLinkedSet)
+			{
+				// Iterate on the set and build an array of array of attcode=>value
+				$oSet = $oObject->Get($sAttCode);
+				$value = array();
+				while ($oLnk = $oSet->Fetch())
+				{
+					$sLnkRefClass = $bExtendedOutput ? get_class($oLnk) : $oAttDef->GetLinkedClass();
+
+					$aLnkValues = array();
+					foreach (MetaModel::ListAttributeDefs($sLnkRefClass) as $sLnkAttCode => $oLnkAttDef)
+					{
+						// Skip attributes pointing to the current object (redundant data)
+						if ($sLnkAttCode == $oAttDef->GetExtKeyToMe())
+						{
+							continue;
+						}
+						// Skip any attribute of the link that points to the current object
+						$oLnkAttDef = MetaModel::GetAttributeDef($sLnkRefClass, $sLnkAttCode);
+						if (method_exists($oLnkAttDef, 'GetKeyAttCode'))
+						{
+							if ($oLnkAttDef->GetKeyAttCode() == $oAttDef->GetExtKeyToMe())
+							{
+								continue;
+							}
+						}
+						
+						$aLnkValues[$sLnkAttCode] = $this->MakeResultValue($oLnk, $sLnkAttCode, $bExtendedOutput);
+					}
+					$value[] = $aLnkValues;
+				}
+			}
+			else
+			{
+				$value = $oAttDef->GetForJSON($oObject->Get($sAttCode));
+			}
+		}
+		return $value;
+	}
+
+	/**
+	 * Report the value for the given object attribute
+	 * 	 
+	 * @param DBObject $oObject The object being reported
+	 * @param string $sAttCode The attribute code (must be valid)
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
+	 * @return void
+	 */
+	public function AddField(DBObject $oObject, $sAttCode, $bExtendedOutput = false)
+	{
+		$this->fields[$sAttCode] = $this->MakeResultValue($oObject, $sAttCode, $bExtendedOutput);
+	}
+}
+
+
+
+/**
+ * REST response for services managing objects. Derive this structure to add information and/or constants
+ *
+ * @package     Extensibility
+ * @package     REST Services
+ * @api
+ */
+class RestResultWithObjects extends RestResult
+{
+	public $objects;
+
+	/**
+	 * Report the given object
+	 * 	 
+	 * @param int An error code (RestResult::OK is no issue has been found)
+	 * @param string $sMessage Description of the error if any, an empty string otherwise
+	 * @param DBObject $oObject The object being reported
+	 * @param array $aFieldSpec An array of class => attribute codes (Cf. RestUtils::GetFieldList). List of the attributes to be reported.
+	 * @param boolean $bExtendedOutput Output all of the link set attributes ?
+	 * @return void
+	 */
+	public function AddObject($iCode, $sMessage, $oObject, $aFieldSpec = null, $bExtendedOutput = false)
+	{
+		$sClass = get_class($oObject);
+		$oObjRes = new ObjectResult($sClass, $oObject->GetKey());
+		$oObjRes->code = $iCode;
+		$oObjRes->message = $sMessage;
+
+		$aFields = null;
+		if (!is_null($aFieldSpec))
+		{
+			// Enum all classes in the hierarchy, starting with the current one
+			foreach (MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL, false) as $sRefClass)
+			{
+				if (array_key_exists($sRefClass, $aFieldSpec))
+				{
+					$aFields = $aFieldSpec[$sRefClass];
+					break;
+				}
+			}
+		}
+		if (is_null($aFields))
+		{
+			// No fieldspec given, or not found...
+			$aFields = array('id', 'friendlyname');
+		}
+
+		foreach ($aFields as $sAttCode)
+		{
+			$oObjRes->AddField($oObject, $sAttCode, $bExtendedOutput);
+		}
+
+		$sObjKey = get_class($oObject).'::'.$oObject->GetKey();
+		$this->objects[$sObjKey] = $oObjRes;
+	}
+}
+
+class RestResultWithRelations extends RestResultWithObjects
+{
+	public $relations;
+	
+	public function __construct()
+	{
+		parent::__construct();
+		$this->relations = array();
+	}
+	
+	public function AddRelation($sSrcKey, $sDestKey)
+	{
+		if (!array_key_exists($sSrcKey, $this->relations))
+		{
+			$this->relations[$sSrcKey] = array();
+		}
+		$this->relations[$sSrcKey][] = array('key' => $sDestKey);
+	}
+}
+
+/**
+ * Deletion result codes for a target object (either deleted or updated)
+ *
+ * @package     Extensibility
+ * @api
+ * @since 2.0.1  
+ */
+class RestDelete
+{
+	/**
+	 * Result: Object deleted as per the initial request
+	 */
+	const OK = 0;
+	/**
+	 * Result: general issue (user rights or ... ?) 
+	 */
+	const ISSUE = 1;
+	/**
+	 * Result: Must be deleted to preserve database integrity 
+	 */
+	const AUTO_DELETE = 2;
+	/**
+	 * Result: Must be deleted to preserve database integrity, but that is NOT possible 
+	 */
+	const AUTO_DELETE_ISSUE = 3;
+	/**
+	 * Result: Must be deleted to preserve database integrity, but this must be requested explicitely 
+	 */
+	const REQUEST_EXPLICITELY = 4;
+	/**
+	 * Result: Must be updated to preserve database integrity
+	 */
+	const AUTO_UPDATE = 5;
+	/**
+	 * Result: Must be updated to preserve database integrity, but that is NOT possible
+	 */
+	const AUTO_UPDATE_ISSUE = 6;
+}
+
+/**
+ * Implementation of core REST services (create/get/update... objects)
+ *
+ * @package     Core
+ */
+class CoreServices implements iRestServiceProvider
+{
+	/**
+	 * Enumerate services delivered by this class
+	 * 	 
+	 * @param string $sVersion The version (e.g. 1.0) supported by the services
+	 * @return array An array of hash 'verb' => verb, 'description' => description
+	 */
+	public function ListOperations($sVersion)
+	{
+		// 1.3 - iTop 2.2.0, Verb 'get_related': added the options 'redundancy' and 'direction' to take into account the redundancy in the impact analysis
+		// 1.2 - was documented in the wiki but never released ! Same as 1.3
+		// 1.1 - In the reply, objects have a 'key' entry so that it is no more necessary to split class::key programmaticaly
+		// 1.0 - Initial implementation in iTop 2.0.1
+		//
+		$aOps = array();
+		if (in_array($sVersion, array('1.0', '1.1', '1.2', '1.3'))) 
+		{
+			$aOps[] = array(
+				'verb' => 'core/create',
+				'description' => 'Create an object'
+			);
+			$aOps[] = array(
+				'verb' => 'core/update',
+				'description' => 'Update an object'
+			);
+			$aOps[] = array(
+				'verb' => 'core/apply_stimulus',
+				'description' => 'Apply a stimulus to change the state of an object'
+			);
+			$aOps[] = array(
+				'verb' => 'core/get',
+				'description' => 'Search for objects'
+			);
+			$aOps[] = array(
+				'verb' => 'core/delete',
+				'description' => 'Delete objects'
+			);
+			$aOps[] = array(
+				'verb' => 'core/get_related',
+				'description' => 'Get related objects through the specified relation'
+			);
+			$aOps[] = array(
+				'verb' => 'core/check_credentials',
+				'description' => 'Check user credentials'
+			);
+		}
+		return $aOps;
+	}
+
+	/**
+	 * Enumerate services delivered by this class
+	 * @param string $sVersion The version (e.g. 1.0) supported by the services
+	 * @return RestResult The standardized result structure (at least a message)
+	 * @throws Exception in case of internal failure.	 
+	 */
+	public function ExecOperation($sVersion, $sVerb, $aParams)
+	{
+		$oResult = new RestResultWithObjects();
+		switch ($sVerb)
+		{
+		case 'core/create':
+			RestUtils::InitTrackingComment($aParams);
+			$sClass = RestUtils::GetClass($aParams, 'class');
+			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
+			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
+
+			if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for creating data of class $sClass";
+			}
+			elseif (UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for massively creating data of class $sClass";
+			}
+			else
+			{
+				$oObject = RestUtils::MakeObjectFromFields($sClass, $aFields);
+				$oObject->DBInsert();
+				$oResult->AddObject(0, 'created', $oObject, $aShowFields, $bExtendedOutput);
+			}
+			break;
+	
+		case 'core/update':
+			RestUtils::InitTrackingComment($aParams);
+			$sClass = RestUtils::GetClass($aParams, 'class');
+			$key = RestUtils::GetMandatoryParam($aParams, 'key');
+			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
+			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
+	
+			// Note: the target class cannot be based on the result of FindObjectFromKey, because in case the user does not have read access, that function already fails with msg 'Nothing found'
+			$sTargetClass = RestUtils::GetObjectSetFromKey($sClass, $key)->GetFilter()->GetClass();
+			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for modifying data of class $sTargetClass";
+			}
+			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for massively modifying data of class $sTargetClass";
+			}
+			else
+			{
+				$oObject = RestUtils::FindObjectFromKey($sClass, $key);
+				RestUtils::UpdateObjectFromFields($oObject, $aFields);
+				$oObject->DBUpdate();
+				$oResult->AddObject(0, 'updated', $oObject, $aShowFields, $bExtendedOutput);
+			}
+			break;
+	
+		case 'core/apply_stimulus':
+			RestUtils::InitTrackingComment($aParams);
+			$sClass = RestUtils::GetClass($aParams, 'class');
+			$key = RestUtils::GetMandatoryParam($aParams, 'key');
+			$aFields = RestUtils::GetMandatoryParam($aParams, 'fields');
+			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
+			$sStimulus = RestUtils::GetMandatoryParam($aParams, 'stimulus');
+	
+			// Note: the target class cannot be based on the result of FindObjectFromKey, because in case the user does not have read access, that function already fails with msg 'Nothing found'
+			$sTargetClass = RestUtils::GetObjectSetFromKey($sClass, $key)->GetFilter()->GetClass();
+			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_MODIFY) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for modifying data of class $sTargetClass";
+			}
+			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_BULK_MODIFY) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for massively modifying data of class $sTargetClass";
+			}
+			else
+			{
+				$oObject = RestUtils::FindObjectFromKey($sClass, $key);
+				RestUtils::UpdateObjectFromFields($oObject, $aFields);
+			
+				$aTransitions = $oObject->EnumTransitions();
+				$aStimuli = MetaModel::EnumStimuli(get_class($oObject));
+				if (!isset($aTransitions[$sStimulus]))
+				{
+					// Invalid stimulus
+					$oResult->code = RestResult::INTERNAL_ERROR;
+					$oResult->message = "Invalid stimulus: '$sStimulus' on the object ".$oObject->GetName()." in state '".$oObject->GetState()."'";
+				}
+				else
+				{
+					$aTransition = $aTransitions[$sStimulus];
+					$sTargetState = $aTransition['target_state'];
+					$aStates = MetaModel::EnumStates($sClass);
+					$aTargetStateDef = $aStates[$sTargetState];
+					$aExpectedAttributes = $aTargetStateDef['attribute_list'];
+					
+					$aMissingMandatory = array();
+					foreach($aExpectedAttributes as $sAttCode => $iExpectCode)
+					{
+						if ( ($iExpectCode & OPT_ATT_MANDATORY) && ($oObject->Get($sAttCode) == ''))
+						{
+							$aMissingMandatory[] = $sAttCode;
+						}
+					}				
+					if (count($aMissingMandatory) == 0)
+					{
+						// If all the mandatory fields are already present, just apply the transition silently...
+						if ($oObject->ApplyStimulus($sStimulus))
+						{
+							$oObject->DBUpdate();
+							$oResult->AddObject(0, 'updated', $oObject, $aShowFields, $bExtendedOutput);
+						}
+					}
+					else
+					{
+						// Missing mandatory attributes for the transition
+						$oResult->code = RestResult::INTERNAL_ERROR;
+						$oResult->message = 'Missing mandatory attribute(s) for applying the stimulus: '.implode(', ', $aMissingMandatory).'.';
+					}
+				}
+			}	
+			break;
+	
+		case 'core/get':
+			$sClass = RestUtils::GetClass($aParams, 'class');
+			$key = RestUtils::GetMandatoryParam($aParams, 'key');
+			$aShowFields = RestUtils::GetFieldList($sClass, $aParams, 'output_fields');
+			$bExtendedOutput = (RestUtils::GetOptionalParam($aParams, 'output_fields', '*') == '*+');
+
+			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
+			$sTargetClass = $oObjectSet->GetFilter()->GetClass();
+	
+			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_READ) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for reading data of class $sTargetClass";
+			}
+			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_BULK_READ) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for exporting data of class $sTargetClass";
+			}
+			else
+			{
+				while ($oObject = $oObjectSet->Fetch())
+				{
+					$oResult->AddObject(0, '', $oObject, $aShowFields, $bExtendedOutput);
+				}
+				$oResult->message = "Found: ".$oObjectSet->Count();
+			}
+			break;
+
+		case 'core/delete':
+			$sClass = RestUtils::GetClass($aParams, 'class');
+			$key = RestUtils::GetMandatoryParam($aParams, 'key');
+			$bSimulate = RestUtils::GetOptionalParam($aParams, 'simulate', false);
+	
+			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
+			$sTargetClass = $oObjectSet->GetFilter()->GetClass();
+	
+			if (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_DELETE) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for deleting data of class $sTargetClass";
+			}
+			elseif (UserRights::IsActionAllowed($sTargetClass, UR_ACTION_DELETE) != UR_ALLOWED_YES)
+			{
+				$oResult->code = RestResult::UNAUTHORIZED;
+				$oResult->message = "The current user does not have enough permissions for massively deleting data of class $sTargetClass";
+			}
+			else
+			{
+				$aObjects = $oObjectSet->ToArray();
+				$this->DeleteObjects($oResult, $aObjects, $bSimulate);
+			}
+			break;
+
+		case 'core/get_related':
+			$oResult = new RestResultWithRelations();
+			$sClass = RestUtils::GetClass($aParams, 'class');
+			$key = RestUtils::GetMandatoryParam($aParams, 'key');
+			$sRelation = RestUtils::GetMandatoryParam($aParams, 'relation');
+			$iMaxRecursionDepth = RestUtils::GetOptionalParam($aParams, 'depth', 20 /* = MAX_RECURSION_DEPTH */);
+			$sDirection = RestUtils::GetOptionalParam($aParams, 'direction', null);
+			$bEnableRedundancy = RestUtils::GetOptionalParam($aParams, 'redundancy', false);
+			$bReverse = false;
+
+			if (is_null($sDirection) && ($sRelation == 'depends on'))
+			{
+				// Legacy behavior, consider "depends on" as a forward relation
+				$sRelation = 'impacts';
+				$sDirection = 'up'; 
+				$bReverse = true; // emulate the legacy behavior by returning the edges
+			}
+			else if(is_null($sDirection))
+			{
+				$sDirection = 'down';
+			}
+	
+			$oObjectSet = RestUtils::GetObjectSetFromKey($sClass, $key);
+			if ($sDirection == 'down')
+			{
+				$oRelationGraph = $oObjectSet->GetRelatedObjectsDown($sRelation, $iMaxRecursionDepth, $bEnableRedundancy);
+			}
+			else if ($sDirection == 'up')
+			{
+				$oRelationGraph = $oObjectSet->GetRelatedObjectsUp($sRelation, $iMaxRecursionDepth, $bEnableRedundancy);
+			}
+			else
+			{
+				$oResult->code = RestResult::INTERNAL_ERROR;
+				$oResult->message = "Invalid value: '$sDirection' for the parameter 'direction'. Valid values are 'up' and 'down'";
+				return $oResult;
+				
+			}
+			
+			if ($bEnableRedundancy)
+			{
+				// Remove the redundancy nodes from the output
+				$oIterator = new RelationTypeIterator($oRelationGraph, 'Node');
+				foreach($oIterator as $oNode)
+				{
+					if ($oNode instanceof RelationRedundancyNode)
+					{
+						$oRelationGraph->FilterNode($oNode);
+					}
+				}
+			}
+			
+			$aIndexByClass = array();
+			$oIterator = new RelationTypeIterator($oRelationGraph);
+			foreach($oIterator as $oElement)
+			{
+				if ($oElement instanceof RelationObjectNode)
+				{
+					$oObject = $oElement->GetProperty('object');
+					if ($oObject)
+					{
+						if ($bEnableRedundancy)
+						{
+							// Add only the "reached" objects
+							if ($oElement->GetProperty('is_reached'))
+							{
+								$aIndexByClass[get_class($oObject)][$oObject->GetKey()] = null;
+								$oResult->AddObject(0, '', $oObject);
+							}
+						}
+						else
+						{
+							$aIndexByClass[get_class($oObject)][$oObject->GetKey()] = null;
+							$oResult->AddObject(0, '', $oObject);
+						}
+					}
+				}
+				else if ($oElement instanceof RelationEdge)
+				{
+					$oSrcObj = $oElement->GetSourceNode()->GetProperty('object');
+					$oDestObj = $oElement->GetSinkNode()->GetProperty('object');
+					$sSrcKey = get_class($oSrcObj).'::'.$oSrcObj->GetKey();
+					$sDestKey = get_class($oDestObj).'::'.$oDestObj->GetKey();
+					if ($bEnableRedundancy)
+					{
+						// Add only the edges where both source and destination are "reached"
+						if ($oElement->GetSourceNode()->GetProperty('is_reached') && $oElement->GetSinkNode()->GetProperty('is_reached'))
+						{
+							if ($bReverse)
+							{
+								$oResult->AddRelation($sDestKey, $sSrcKey);
+							}
+							else
+							{
+								$oResult->AddRelation($sSrcKey, $sDestKey);
+							}
+						}
+					}
+					else
+					{
+						if ($bReverse)
+						{
+							$oResult->AddRelation($sDestKey, $sSrcKey);
+						}
+						else
+						{
+							$oResult->AddRelation($sSrcKey, $sDestKey);
+						}
+					}
+				}
+			}
+
+			if (count($aIndexByClass) > 0)
+			{
+				$aStats = array();
+				$aUnauthorizedClasses = array();
+				foreach ($aIndexByClass as $sClass => $aIds)
+				{
+					if (UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_READ) != UR_ALLOWED_YES)
+					{
+						$aUnauthorizedClasses[$sClass] = true;
+					}
+					$aStats[] = $sClass.'= '.count($aIds);
+				}
+				if (count($aUnauthorizedClasses) > 0)
+				{
+					$sClasses = implode(', ', array_keys($aUnauthorizedClasses));
+					$oResult = new RestResult();
+					$oResult->code = RestResult::UNAUTHORIZED;
+					$oResult->message = "The current user does not have enough permissions for exporting data of class(es): $sClasses";
+				}
+				else
+				{
+					$oResult->message = "Scope: ".$oObjectSet->Count()."; Related objects: ".implode(', ', $aStats);
+				}
+			}
+			else
+			{
+				$oResult->message = "Nothing found";
+			}
+			break;
+			
+		case 'core/check_credentials':
+			$oResult = new RestResult();
+			$sUser = RestUtils::GetMandatoryParam($aParams, 'user');
+			$sPassword = RestUtils::GetMandatoryParam($aParams, 'password');
+
+			if (UserRights::CheckCredentials($sUser, $sPassword) !== true)
+			{
+				$oResult->authorized = false;
+			}
+			else
+			{
+				$oResult->authorized = true;
+			}
+			break;
+	
+		default:
+			// unknown operation: handled at a higher level
+		}
+		return $oResult;
+	}
+
+	/**
+	 * Helper for object deletion	
+	 */
+	public function DeleteObjects($oResult, $aObjects, $bSimulate)
+	{
+		$oDeletionPlan = new DeletionPlan();
+		foreach($aObjects as $oObj)
+		{
+			if ($bSimulate)
+			{
+				$oObj->CheckToDelete($oDeletionPlan);
+			}
+			else
+			{
+				$oObj->DBDelete($oDeletionPlan);
+			}
+		}
+
+		foreach ($oDeletionPlan->ListDeletes() as $sTargetClass => $aDeletes)
+		{
+			foreach ($aDeletes as $iId => $aData)
+			{
+				$oToDelete = $aData['to_delete'];
+				$bAutoDel = (($aData['mode'] == DEL_SILENT) || ($aData['mode'] == DEL_AUTO));
+				if (array_key_exists('issue', $aData))
+				{
+					if ($bAutoDel)
+					{
+						if (isset($aData['requested_explicitely'])) // i.e. in the initial list of objects to delete
+						{
+							$iCode = RestDelete::ISSUE;
+							$sPlanned = 'Cannot be deleted: '.$aData['issue'];
+						}
+						else
+						{
+							$iCode = RestDelete::AUTO_DELETE_ISSUE;
+							$sPlanned = 'Should be deleted automatically... but: '.$aData['issue'];
+						}
+					}
+					else
+					{
+						$iCode = RestDelete::REQUEST_EXPLICITELY;
+						$sPlanned = 'Must be deleted explicitely... but: '.$aData['issue'];
+					}
+				}
+				else
+				{
+					if ($bAutoDel)
+					{
+						if (isset($aData['requested_explicitely']))
+						{
+							$iCode = RestDelete::OK;
+		               $sPlanned = '';
+						}
+						else
+						{
+							$iCode = RestDelete::AUTO_DELETE;
+							$sPlanned = 'Deleted automatically';
+						}
+					}
+					else
+					{
+						$iCode = RestDelete::REQUEST_EXPLICITELY;
+						$sPlanned = 'Must be deleted explicitely';
+					}
+				}
+				$oResult->AddObject($iCode, $sPlanned, $oToDelete);
+			}
+		}
+		foreach ($oDeletionPlan->ListUpdates() as $sRemoteClass => $aToUpdate)
+		{
+			foreach ($aToUpdate as $iId => $aData)
+			{
+				$oToUpdate = $aData['to_reset'];
+				if (array_key_exists('issue', $aData))
+				{
+					$iCode = RestDelete::AUTO_UPDATE_ISSUE;
+					$sPlanned = 'Should be updated automatically... but: '.$aData['issue'];
+				}
+				else
+				{
+					$iCode = RestDelete::AUTO_UPDATE;
+					$sPlanned = 'Reset external keys: '.$aData['attributes_list'];
+				}
+				$oResult->AddObject($iCode, $sPlanned, $oToUpdate);
+			}
+		}
+		
+		if ($oDeletionPlan->FoundStopper())
+		{
+			if ($oDeletionPlan->FoundSecurityIssue())
+			{
+				$iRes = RestResult::UNAUTHORIZED;
+				$sRes = 'Deletion not allowed on some objects';
+			}
+			elseif ($oDeletionPlan->FoundManualOperation())
+			{
+				$iRes = RestResult::UNSAFE; 
+				$sRes = 'The deletion requires that other objects be deleted/updated, and those operations must be requested explicitely';
+			}
+			else
+			{
+				$iRes = RestResult::INTERNAL_ERROR; 
+				$sRes = 'Some issues have been encountered. See the list of planned changes for more information about the issue(s).';
+			}		
+		}
+		else
+		{
+			$iRes = RestResult::OK; 
+			$sRes = 'Deleted: '.count($aObjects);
+			$iIndirect = $oDeletionPlan->GetTargetCount() - count($aObjects);
+			if ($iIndirect > 0)
+			{
+				$sRes .= ' plus (for DB integrity) '.$iIndirect;
+			}
+		}
+		$oResult->code = $iRes;
+		if ($bSimulate)
+		{
+			$oResult->message = 'SIMULATING: '.$sRes;
+		}
+		else
+		{
+			$oResult->message = $sRes;
+		}
+	}
+}
diff --git a/core/sqlobjectquery.class.inc.php b/core/sqlobjectquery.class.inc.php
index 821e76883..b4f39d400 100644
--- a/core/sqlobjectquery.class.inc.php
+++ b/core/sqlobjectquery.class.inc.php
@@ -1,677 +1,677 @@
-<?php
-// Copyright (C) 2015-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * SQLObjectQuery
- * build a mySQL compatible SQL query
- *
- * @copyright   Copyright (C) 2015-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * SQLObjectQuery
- * build a mySQL compatible SQL query
- *
- * @package     iTopORM
- */
-
-
-class SQLObjectQuery extends SQLQuery
-{
-	public $m_aContextData = null;
-	public $m_iOriginalTableCount = 0;
-	private $m_sTable = '';
-	private $m_sTableAlias = '';
-	private $m_aFields = array();
-	private $m_aGroupBy = array();
-	private $m_oConditionExpr = null;
-	private $m_bToDelete = true; // The current table must be listed for deletion ?
-	private $m_aValues = array(); // Values to set in case of an update query
-	private $m_oSelectedIdField = null;
-	private $m_aJoinSelects = array();
-	protected $m_bBeautifulQuery = false;
-
-	// Data set by PrepareRendering()
-	private $__aFrom;
-	private $__aFields;
-	private $__aGroupBy;
-	private $__aDelTables;
-	private $__aSetValues;
-	private $__aSelectedIdFields;
-
-
-	public function __construct($sTable, $sTableAlias, $aFields, $bToDelete = true, $aValues = array(), $oSelectedIdField = null)
-	{
-		parent::__construct();
-
-		// This check is not needed but for developping purposes
-		//if (!CMDBSource::IsTable($sTable))
-		//{
-		//	throw new CoreException("Unknown table '$sTable'");
-		//}
-
-		// $aFields must be an array of "alias"=>"expr"
-		// $oConditionExpr must be a condition tree
-		// $aValues is an array of "alias"=>value
-
-		$this->m_sTable = $sTable;
-		$this->m_sTableAlias = $sTableAlias;
-		$this->m_aFields = $aFields;
-		$this->m_aGroupBy = null;
-		$this->m_oConditionExpr = null;
-		$this->m_bToDelete = $bToDelete;
-		$this->m_aValues = $aValues;
-		$this->m_oSelectedIdField = $oSelectedIdField;
-	}
-
-	public function GetTableAlias()
-	{
-		return $this->m_sTableAlias;
-	}
-
-	public function DisplayHtml()
-	{
-		if (count($this->m_aFields) == 0) $sFields = "";
-		else
-		{
-			$aFieldDesc = array();
-			foreach ($this->m_aFields as $sAlias => $oExpression)
-			{
-				$aFieldDesc[] = $oExpression->Render()." as <em>$sAlias</em>";
-			}
-			$sFields = " =&gt; ".implode(', ', $aFieldDesc);
-		}
-		echo "<b>$this->m_sTable</b>$sFields<br/>\n";
-		// #@# todo - display html of an expression tree
-		//$this->m_oConditionExpr->DisplayHtml()
-		if (count($this->m_aJoinSelects) > 0)
-		{
-			echo "Joined to...<br/>\n";
-			echo "<ul class=\"treeview\">\n";
-			foreach ($this->m_aJoinSelects as $aJoinInfo)
-			{
-				$sJoinType = $aJoinInfo["jointype"];
-				$oSQLQuery = $aJoinInfo["select"];
-				if (isset($aJoinInfo["on_expression"]))
-				{
-					$sOnCondition = $aJoinInfo["on_expression"]->Render();
-
-					echo "<li>Join '$sJoinType', ON ($sOnCondition)".$oSQLQuery->DisplayHtml()."</li>\n";
-				}
-				else
-				{
-					$sLeftField = $aJoinInfo["leftfield"];
-					$sRightField = $aJoinInfo["rightfield"];
-					$sRightTableAlias = $aJoinInfo["righttablealias"];
-	
-					echo "<li>Join '$sJoinType', $sLeftField, $sRightTableAlias.$sRightField".$oSQLQuery->DisplayHtml()."</li>\n";
-				}
-			}
-			echo "</ul>";
-		}
-		$this->PrepareRendering();
-		echo "From ...<br/>\n";
-		echo "<pre style=\"font-size: smaller;\">\n";
-		print_r($this->__aFrom);
-		echo "</pre>";
-	}
-
-	public function SetSelect($aExpressions)
-	{
-		$this->m_aFields = $aExpressions;
-	}
-
-	public function SortSelectedFields()
-	{
-		ksort($this->m_aFields);
-	}
-
-	public function AddSelect($sAlias, $oExpression)
-	{
-		$this->m_aFields[$sAlias] = $oExpression;
-	}
-
-	public function SetGroupBy($aExpressions)
-	{
-		$this->m_aGroupBy = $aExpressions;
-	}
-
-	public function SetCondition($oConditionExpr)
-	{
-		$this->m_oConditionExpr = $oConditionExpr;
-	}
-
-	public function AddCondition($oConditionExpr)
-	{
-		if (is_null($this->m_oConditionExpr))
-		{
-			$this->m_oConditionExpr = $oConditionExpr;
-		}
-		else
-		{
-			$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oConditionExpr);
-		}
-	}
-
-	private function AddJoin($sJoinType, $oSQLQuery, $sLeftField, $sRightField, $sRightTableAlias = '')
-	{
-		assert((get_class($oSQLQuery) == __CLASS__) || is_subclass_of($oSQLQuery, __CLASS__));
-		// No need to check this here but for development purposes
-		//if (!CMDBSource::IsField($this->m_sTable, $sLeftField))
-		//{
-		//	throw new CoreException("Unknown field '$sLeftField' in table '".$this->m_sTable);
-		//}
-
-		if (empty($sRightTableAlias))
-		{
-			$sRightTableAlias = $oSQLQuery->m_sTableAlias;
-		}
-// #@# Could not be verified here because the namespace is unknown - do we need to check it there?
-//
-//		if (!CMDBSource::IsField($sRightTable, $sRightField))
-//		{
-//			throw new CoreException("Unknown field '$sRightField' in table '".$sRightTable."'");
-//		}
-		$this->m_aJoinSelects[] = array(
-			"jointype" => $sJoinType,
-			"select" => $oSQLQuery,
-			"leftfield" => $sLeftField,
-			"rightfield" => $sRightField,
-			"righttablealias" => $sRightTableAlias
-		);
-	}
-	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '')
-	{
-		$this->AddJoin("inner", $oSQLQuery, $sLeftField, $sRightField, $sRightTable);
-	}
-	public function AddInnerJoinTree($oSQLQuery, $sLeftFieldLeft, $sLeftFieldRight, $sRightFieldLeft, $sRightFieldRight, $sRightTableAlias = '', $iOperatorCode = TREE_OPERATOR_BELOW, $bInvertOnClause = false)
-	{
-		assert((get_class($oSQLQuery) == __CLASS__) || is_subclass_of($oSQLQuery, __CLASS__));
-		if (empty($sRightTableAlias))
-		{
-			$sRightTableAlias = $oSQLQuery->m_sTableAlias;
-		}
-		$this->m_aJoinSelects[] = array(
-			"jointype" => 'inner_tree',
-			"select" => $oSQLQuery,
-			"leftfield" => $sLeftFieldLeft,
-			"rightfield" => $sLeftFieldRight,
-			"rightfield_left" => $sRightFieldLeft,
-			"rightfield_right" => $sRightFieldRight,
-			"righttablealias" => $sRightTableAlias,
-			"tree_operator" => $iOperatorCode,
-			'invert_on_clause' => $bInvertOnClause
-		);
-	}
-	public function AddLeftJoin($oSQLQuery, $sLeftField, $sRightField)
-	{
-		return $this->AddJoin("left", $oSQLQuery, $sLeftField, $sRightField);
-	}
-
-	public function AddInnerJoinEx(SQLQuery $oSQLQuery, Expression $oOnExpression)
-	{
-		$this->m_aJoinSelects[] = array(
-			"jointype" => 'inner',
-			"select" => $oSQLQuery,
-			"on_expression" => $oOnExpression
-		);
-	}
-
-	public function AddLeftJoinEx(SQLQuery $oSQLQuery, Expression $oOnExpression)
-	{
-		$this->m_aJoinSelects[] = array(
-			"jointype" => 'left',
-			"select" => $oSQLQuery,
-			"on_expression" => $oOnExpression
-		);
-	}
-	
-	// Interface, build the SQL query
-
-	/**
-	 * @param array $aArgs
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function RenderDelete($aArgs = array())
-	{
-		$this->PrepareRendering();
-
-		// Target: DELETE myAlias1, myAlias2 FROM t1 as myAlias1, t2 as myAlias2, t3 as topreserve WHERE ...
-
-		$sDelete = self::ClauseDelete($this->__aDelTables);
-		$sFrom   = self::ClauseFrom($this->__aFrom);
-		// #@# safety net to redo ?
-		/*
-		if ($this->m_oConditionExpr->IsAny())
-		-- if (count($aConditions) == 0) --
-		{
-			throw new CoreException("Building a request wich will delete every object of a given table -looks suspicious- please use truncate instead...");
-		}
-		*/
-		if (is_null($this->m_oConditionExpr))
-		{
-			// Delete all !!!
-		}
-		else
-		{
-			$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
-			return "DELETE $sDelete FROM $sFrom WHERE $sWhere";
-		}
-		return '';
-	}
-
-	/**
-	 *	Needed for the unions
-	 */
-	public function RenderSelectClause()
-	{
-		$this->PrepareRendering();
-		$sSelect = self::ClauseSelect($this->__aFields);
-		return $sSelect;
-	}
-
-	/**
-	 *    Needed for the unions
-	 * @param $aOrderBy
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function RenderOrderByClause($aOrderBy)
-	{
-		$this->PrepareRendering();
-		$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
-		return $sOrderBy;
-	}
-
-	// Interface, build the SQL query
-
-	/**
-	 * @param array $aArgs
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function RenderUpdate($aArgs = array())
-	{
-		$this->PrepareRendering();
-		$sFrom   = self::ClauseFrom($this->__aFrom);
-		$sValues = self::ClauseValues($this->__aSetValues);
-		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
-		return "UPDATE $sFrom SET $sValues WHERE $sWhere";
-	}
-
-	// Interface, build the SQL query
-
-	/**
-	 * @param array $aOrderBy
-	 * @param array $aArgs
-	 * @param int $iLimitCount
-	 * @param int $iLimitStart
-	 * @param bool $bGetCount
-	 * @param bool $bBeautifulQuery
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false)
-	{
-		$this->m_bBeautifulQuery = $bBeautifulQuery;
-		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
-		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
-
-		$this->PrepareRendering();
-		$sFrom   = self::ClauseFrom($this->__aFrom, $sIndent);
-		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
-		if ($iLimitCount > 0)
-		{
-			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
-		}
-		else
-		{
-			$sLimit = '';
-		}
-		if ($bGetCount)
-		{
-			if (count($this->__aSelectedIdFields) > 0)
-			{
-				$aCountFields = array();
-				foreach ($this->__aSelectedIdFields as $sFieldExpr)
-				{
-					$aCountFields[] = "COALESCE($sFieldExpr, 0)"; // Null values are excluded from the count
-				}
-				$sCountFields = implode(', ', $aCountFields);
-				// Count can be limited for performance reason, in this case the total amount is not important,
-				// we only need to know if the number of entries is greater than a certain amount.
-				$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep DISTINCT $sCountFields $sLineSep FROM $sFrom$sLineSep WHERE $sWhere $sLimit) AS _tatooine_";
-			}
-			else
-			{
-				$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep WHERE $sWhere $sLimit) AS _tatooine_";
-			}
-		}
-		else
-		{
-			$sSelect = self::ClauseSelect($this->__aFields, $sLineSep);
-			$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
-			if (!empty($sOrderBy))
-			{
-				$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
-			}
-
-			$sSQL = "SELECT$sLineSep DISTINCT $sSelect$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep $sOrderBy $sLimit";
-		}
-		return $sSQL;
-	}
-
-	// Interface, build the SQL query
-
-	/**
-	 * @param array $aArgs
-	 * @param bool $bBeautifulQuery
-	 * @param array $aOrderBy
-	 * @param int $iLimitCount
-	 * @param int $iLimitStart
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false, $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0)
-	{
-		$this->m_bBeautifulQuery = $bBeautifulQuery;
-		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
-		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
-
-		$this->PrepareRendering();
-
-		$sSelect = self::ClauseSelect($this->__aFields);
-		$sFrom   = self::ClauseFrom($this->__aFrom, $sIndent);
-		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
-		$sGroupBy = self::ClauseGroupBy($this->__aGroupBy);
-		$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
-		if (!empty($sGroupBy))
-		{
-			$sGroupBy = "GROUP BY $sGroupBy$sLineSep";
-		}
-		if (!empty($sOrderBy))
-		{
-			$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
-		}
-		if ($iLimitCount > 0)
-		{
-			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
-		}
-		else
-		{
-			$sLimit = '';
-		}
-		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep $sGroupBy $sOrderBy$sLineSep $sLimit";
-		return $sSQL;
-	}
-
-	// Purpose: prepare the query data, once for all
-	private function PrepareRendering()
-	{
-		if (is_null($this->__aFrom))
-		{
-			$this->__aFrom = array();
-			$this->__aFields = array();
-			$this->__aGroupBy = array();
-			$this->__aDelTables = array();
-			$this->__aSetValues = array();
-			$this->__aSelectedIdFields = array();
-	
-			$this->PrepareSingleTable($this, $this->__aFrom, '', array('jointype' => 'first'));
-		}
-	}
-
-	private function PrepareSingleTable(SQLObjectQuery $oRootQuery, &$aFrom, $sCallerAlias = '', $aJoinData)
-	{
-		$aTranslationTable[$this->m_sTable]['*'] = $this->m_sTableAlias;
-		$sJoinCond = '';
-
-		// Handle the various kinds of join (or first table in the list)
-		//
-		if (empty($aJoinData['righttablealias']))
-		{
-			$sRightTableAlias = $this->m_sTableAlias;
-		}
-		else
-		{
-			$sRightTableAlias = $aJoinData['righttablealias'];
-		}
-		switch ($aJoinData['jointype'])
-		{
-			case "first":
-				$aFrom[$this->m_sTableAlias] = array("jointype"=>"first", "tablename"=>$this->m_sTable, "joincondition"=>"");
-				break;
-			case "inner":
-			case "left":
-				if (isset($aJoinData["on_expression"]))
-				{
-					$sJoinCond = $aJoinData["on_expression"]->Render();
-				}
-				else
-				{
-					$sJoinCond = "`$sCallerAlias`.`{$aJoinData['leftfield']}` = `$sRightTableAlias`.`{$aJoinData['rightfield']}`";
-				}
-				$aFrom[$this->m_sTableAlias] = array("jointype"=>$aJoinData['jointype'], "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
-				break;
-			case "inner_tree":
-				if ($aJoinData['invert_on_clause'])
-				{
-					$sRootLeft = "`$sCallerAlias`.`{$aJoinData['leftfield']}`";
-					$sRootRight = "`$sCallerAlias`.`{$aJoinData['rightfield']}`";
-					$sNodeLeft = "`$sRightTableAlias`.`{$aJoinData['rightfield_left']}`";
-					$sNodeRight = "`$sRightTableAlias`.`{$aJoinData['rightfield_right']}`";
-				}
-				else
-				{
-					$sNodeLeft = "`$sCallerAlias`.`{$aJoinData['leftfield']}`";
-					$sNodeRight = "`$sCallerAlias`.`{$aJoinData['rightfield']}`";
-					$sRootLeft = "`$sRightTableAlias`.`{$aJoinData['rightfield_left']}`";
-					$sRootRight = "`$sRightTableAlias`.`{$aJoinData['rightfield_right']}`";
-				}
-				switch($aJoinData['tree_operator'])
-				{
-					case TREE_OPERATOR_BELOW:
-					$sJoinCond = "$sNodeLeft >= $sRootLeft AND $sNodeLeft <= $sRootRight";
-					break;
-					
-					case TREE_OPERATOR_BELOW_STRICT:
-					$sJoinCond = "$sNodeLeft > $sRootLeft AND $sNodeLeft < $sRootRight";
-					break;
-					
-					case TREE_OPERATOR_NOT_BELOW: // Complementary of 'BELOW'
-					$sJoinCond = "$sNodeLeft < $sRootLeft OR $sNodeLeft > $sRootRight";
-					break;
-					
-					case TREE_OPERATOR_NOT_BELOW_STRICT: // Complementary of BELOW_STRICT
-					$sJoinCond = "$sNodeLeft <= $sRootLeft OR $sNodeLeft >= $sRootRight";
-					break;
-
-					case TREE_OPERATOR_ABOVE:
-					$sJoinCond = "$sNodeLeft <= $sRootLeft AND $sNodeRight >= $sRootRight";
-					break;
-					
-					case TREE_OPERATOR_ABOVE_STRICT:
-					$sJoinCond = "$sNodeLeft < $sRootLeft AND $sNodeRight > $sRootRight";
-					break;
-					
-					case TREE_OPERATOR_NOT_ABOVE: // Complementary of 'ABOVE'
-					$sJoinCond = "$sNodeLeft > $sRootLeft OR $sNodeRight < $sRootRight";
-					break;
-					
-					case TREE_OPERATOR_NOT_ABOVE_STRICT: // Complementary of ABOVE_STRICT
-					$sJoinCond = "$sNodeLeft >= $sRootLeft OR $sNodeRight <= $sRootRight";
-					break;
-					
-				}
-				$aFrom[$this->m_sTableAlias] = array("jointype"=>$aJoinData['jointype'], "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
-				break;
-		}
-
-		// Given the alias, modify the fields and conditions
-		// before adding them into the current lists
-		//
-		foreach($this->m_aFields as $sAlias => $oExpression)
-		{
-			$oRootQuery->__aFields["`$sAlias`"] = $oExpression->Render();
-		}
-		if ($this->m_aGroupBy)
-		{
-			foreach($this->m_aGroupBy as $sAlias => $oExpression)
-			{
-				$oRootQuery->__aGroupBy["`$sAlias`"] = $oExpression->Render();
-			}
-		}
-		if ($this->m_bToDelete)
-		{
-			$oRootQuery->__aDelTables[] = "`{$this->m_sTableAlias}`";
-		}
-		foreach($this->m_aValues as $sFieldName=>$value)
-		{
-			$oRootQuery->__aSetValues["`{$this->m_sTableAlias}`.`$sFieldName`"] = $value; // quoted further!
-		}
-
-  		if (!is_null($this->m_oSelectedIdField))
-  		{
-  			$oRootQuery->__aSelectedIdFields[] = $this->m_oSelectedIdField->Render();
-		}
-
-		// loop on joins, to complete the list of tables/fields/conditions
-		//
-		$aTempFrom = array(); // temporary subset of 'from' specs, to be grouped in the final query
-		foreach ($this->m_aJoinSelects as $aJoinData)
-		{
-			$oRightSelect = $aJoinData["select"];
-
-			$oRightSelect->PrepareSingleTable($oRootQuery, $aTempFrom, $this->m_sTableAlias, $aJoinData);
-		}
-		$aFrom[$this->m_sTableAlias]['subfrom'] = $aTempFrom;
-
-		return $this->m_sTableAlias;
-	}
-
-	public function OptimizeJoins($aUsedTables, $bTopCall = true)
-	{
-		$this->m_iOriginalTableCount = $this->CountTables();
-		if ($bTopCall)
-		{
-			// Top call: complete the list of tables absolutely required to perform the right query
-			$this->CollectUsedTables($aUsedTables);
-		}
-
-		$aToDiscard = array();
-		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
-		{
-			$oSQLQuery = $aJoinInfo["select"];
-			$sTableAlias = $oSQLQuery->GetTableAlias();
-			if ($oSQLQuery->OptimizeJoins($aUsedTables, false) && !array_key_exists($sTableAlias, $aUsedTables))
-			{
-				$aToDiscard[] = $i;
-			}
-		}
-		foreach ($aToDiscard as $i)
-		{
-			unset($this->m_aJoinSelects[$i]);
-		}
-
-		return (count($this->m_aJoinSelects) == 0);
-	}
-
-	public function CountTables()
-	{
-		$iRet = 1;
-		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
-		{
-			$oSQLQuery = $aJoinInfo["select"];
-			$iRet += $oSQLQuery->CountTables();
-		}
-		return $iRet;
-	}
-
-	public function CollectUsedTables(&$aTables)
-	{
-		$this->m_oConditionExpr->CollectUsedParents($aTables);
-		foreach($this->m_aFields as $sFieldAlias => $oField)
-		{
-			$oField->CollectUsedParents($aTables);
-		}
-		if ($this->m_aGroupBy)
-		{
-			foreach($this->m_aGroupBy as $sAlias => $oExpression)
-			{
-				$oExpression->CollectUsedParents($aTables);
-			}
-		}
-  		if (!is_null($this->m_oSelectedIdField))
-  		{
-  			$this->m_oSelectedIdField->CollectUsedParents($aTables);
-		}
-
-		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
-		{
-			$oSQLQuery = $aJoinInfo["select"];
-			if ($oSQLQuery->HasRequiredTables($aTables))
-			{
-				// There is something required in the branch, then this node is a MUST
-				if (isset($aJoinInfo['righttablealias']))
-				{
-					$aTables[$aJoinInfo['righttablealias']] = true;
-				}
-				if (isset($aJoinInfo["on_expression"]))
-				{
-					$aJoinInfo["on_expression"]->CollectUsedParents($aTables);
-				}
-			}
-		}
-
-		return $aTables;
-	}
-
-	// Is required in the JOIN, and therefore we must ensure that the join expression will be valid
-	protected function HasRequiredTables(&$aTables)
-	{
-		$bResult = false;
-		if (array_key_exists($this->m_sTableAlias, $aTables))
-		{
-			$bResult = true;
-		}
-		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
-		{
-			$oSQLQuery = $aJoinInfo["select"];
-			if ($oSQLQuery->HasRequiredTables($aTables))
-			{
-				// There is something required in the branch, then this node is a MUST
-				if (isset($aJoinInfo['righttablealias']))
-				{
-					$aTables[$aJoinInfo['righttablealias']] = true;
-				}
-				if (isset($aJoinInfo["on_expression"]))
-				{
-					$aJoinInfo["on_expression"]->CollectUsedParents($aTables);
-				}
-				$bResult = true;
-			}
-		}
-		// None of the tables is in the list of required tables
-		return $bResult;
-	}
-
-}
+<?php
+// Copyright (C) 2015-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * SQLObjectQuery
+ * build a mySQL compatible SQL query
+ *
+ * @copyright   Copyright (C) 2015-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * SQLObjectQuery
+ * build a mySQL compatible SQL query
+ *
+ * @package     iTopORM
+ */
+
+
+class SQLObjectQuery extends SQLQuery
+{
+	public $m_aContextData = null;
+	public $m_iOriginalTableCount = 0;
+	private $m_sTable = '';
+	private $m_sTableAlias = '';
+	private $m_aFields = array();
+	private $m_aGroupBy = array();
+	private $m_oConditionExpr = null;
+	private $m_bToDelete = true; // The current table must be listed for deletion ?
+	private $m_aValues = array(); // Values to set in case of an update query
+	private $m_oSelectedIdField = null;
+	private $m_aJoinSelects = array();
+	protected $m_bBeautifulQuery = false;
+
+	// Data set by PrepareRendering()
+	private $__aFrom;
+	private $__aFields;
+	private $__aGroupBy;
+	private $__aDelTables;
+	private $__aSetValues;
+	private $__aSelectedIdFields;
+
+
+	public function __construct($sTable, $sTableAlias, $aFields, $bToDelete = true, $aValues = array(), $oSelectedIdField = null)
+	{
+		parent::__construct();
+
+		// This check is not needed but for developping purposes
+		//if (!CMDBSource::IsTable($sTable))
+		//{
+		//	throw new CoreException("Unknown table '$sTable'");
+		//}
+
+		// $aFields must be an array of "alias"=>"expr"
+		// $oConditionExpr must be a condition tree
+		// $aValues is an array of "alias"=>value
+
+		$this->m_sTable = $sTable;
+		$this->m_sTableAlias = $sTableAlias;
+		$this->m_aFields = $aFields;
+		$this->m_aGroupBy = null;
+		$this->m_oConditionExpr = null;
+		$this->m_bToDelete = $bToDelete;
+		$this->m_aValues = $aValues;
+		$this->m_oSelectedIdField = $oSelectedIdField;
+	}
+
+	public function GetTableAlias()
+	{
+		return $this->m_sTableAlias;
+	}
+
+	public function DisplayHtml()
+	{
+		if (count($this->m_aFields) == 0) $sFields = "";
+		else
+		{
+			$aFieldDesc = array();
+			foreach ($this->m_aFields as $sAlias => $oExpression)
+			{
+				$aFieldDesc[] = $oExpression->Render()." as <em>$sAlias</em>";
+			}
+			$sFields = " =&gt; ".implode(', ', $aFieldDesc);
+		}
+		echo "<b>$this->m_sTable</b>$sFields<br/>\n";
+		// #@# todo - display html of an expression tree
+		//$this->m_oConditionExpr->DisplayHtml()
+		if (count($this->m_aJoinSelects) > 0)
+		{
+			echo "Joined to...<br/>\n";
+			echo "<ul class=\"treeview\">\n";
+			foreach ($this->m_aJoinSelects as $aJoinInfo)
+			{
+				$sJoinType = $aJoinInfo["jointype"];
+				$oSQLQuery = $aJoinInfo["select"];
+				if (isset($aJoinInfo["on_expression"]))
+				{
+					$sOnCondition = $aJoinInfo["on_expression"]->Render();
+
+					echo "<li>Join '$sJoinType', ON ($sOnCondition)".$oSQLQuery->DisplayHtml()."</li>\n";
+				}
+				else
+				{
+					$sLeftField = $aJoinInfo["leftfield"];
+					$sRightField = $aJoinInfo["rightfield"];
+					$sRightTableAlias = $aJoinInfo["righttablealias"];
+	
+					echo "<li>Join '$sJoinType', $sLeftField, $sRightTableAlias.$sRightField".$oSQLQuery->DisplayHtml()."</li>\n";
+				}
+			}
+			echo "</ul>";
+		}
+		$this->PrepareRendering();
+		echo "From ...<br/>\n";
+		echo "<pre style=\"font-size: smaller;\">\n";
+		print_r($this->__aFrom);
+		echo "</pre>";
+	}
+
+	public function SetSelect($aExpressions)
+	{
+		$this->m_aFields = $aExpressions;
+	}
+
+	public function SortSelectedFields()
+	{
+		ksort($this->m_aFields);
+	}
+
+	public function AddSelect($sAlias, $oExpression)
+	{
+		$this->m_aFields[$sAlias] = $oExpression;
+	}
+
+	public function SetGroupBy($aExpressions)
+	{
+		$this->m_aGroupBy = $aExpressions;
+	}
+
+	public function SetCondition($oConditionExpr)
+	{
+		$this->m_oConditionExpr = $oConditionExpr;
+	}
+
+	public function AddCondition($oConditionExpr)
+	{
+		if (is_null($this->m_oConditionExpr))
+		{
+			$this->m_oConditionExpr = $oConditionExpr;
+		}
+		else
+		{
+			$this->m_oConditionExpr = $this->m_oConditionExpr->LogAnd($oConditionExpr);
+		}
+	}
+
+	private function AddJoin($sJoinType, $oSQLQuery, $sLeftField, $sRightField, $sRightTableAlias = '')
+	{
+		assert((get_class($oSQLQuery) == __CLASS__) || is_subclass_of($oSQLQuery, __CLASS__));
+		// No need to check this here but for development purposes
+		//if (!CMDBSource::IsField($this->m_sTable, $sLeftField))
+		//{
+		//	throw new CoreException("Unknown field '$sLeftField' in table '".$this->m_sTable);
+		//}
+
+		if (empty($sRightTableAlias))
+		{
+			$sRightTableAlias = $oSQLQuery->m_sTableAlias;
+		}
+// #@# Could not be verified here because the namespace is unknown - do we need to check it there?
+//
+//		if (!CMDBSource::IsField($sRightTable, $sRightField))
+//		{
+//			throw new CoreException("Unknown field '$sRightField' in table '".$sRightTable."'");
+//		}
+		$this->m_aJoinSelects[] = array(
+			"jointype" => $sJoinType,
+			"select" => $oSQLQuery,
+			"leftfield" => $sLeftField,
+			"rightfield" => $sRightField,
+			"righttablealias" => $sRightTableAlias
+		);
+	}
+	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '')
+	{
+		$this->AddJoin("inner", $oSQLQuery, $sLeftField, $sRightField, $sRightTable);
+	}
+	public function AddInnerJoinTree($oSQLQuery, $sLeftFieldLeft, $sLeftFieldRight, $sRightFieldLeft, $sRightFieldRight, $sRightTableAlias = '', $iOperatorCode = TREE_OPERATOR_BELOW, $bInvertOnClause = false)
+	{
+		assert((get_class($oSQLQuery) == __CLASS__) || is_subclass_of($oSQLQuery, __CLASS__));
+		if (empty($sRightTableAlias))
+		{
+			$sRightTableAlias = $oSQLQuery->m_sTableAlias;
+		}
+		$this->m_aJoinSelects[] = array(
+			"jointype" => 'inner_tree',
+			"select" => $oSQLQuery,
+			"leftfield" => $sLeftFieldLeft,
+			"rightfield" => $sLeftFieldRight,
+			"rightfield_left" => $sRightFieldLeft,
+			"rightfield_right" => $sRightFieldRight,
+			"righttablealias" => $sRightTableAlias,
+			"tree_operator" => $iOperatorCode,
+			'invert_on_clause' => $bInvertOnClause
+		);
+	}
+	public function AddLeftJoin($oSQLQuery, $sLeftField, $sRightField)
+	{
+		return $this->AddJoin("left", $oSQLQuery, $sLeftField, $sRightField);
+	}
+
+	public function AddInnerJoinEx(SQLQuery $oSQLQuery, Expression $oOnExpression)
+	{
+		$this->m_aJoinSelects[] = array(
+			"jointype" => 'inner',
+			"select" => $oSQLQuery,
+			"on_expression" => $oOnExpression
+		);
+	}
+
+	public function AddLeftJoinEx(SQLQuery $oSQLQuery, Expression $oOnExpression)
+	{
+		$this->m_aJoinSelects[] = array(
+			"jointype" => 'left',
+			"select" => $oSQLQuery,
+			"on_expression" => $oOnExpression
+		);
+	}
+	
+	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderDelete($aArgs = array())
+	{
+		$this->PrepareRendering();
+
+		// Target: DELETE myAlias1, myAlias2 FROM t1 as myAlias1, t2 as myAlias2, t3 as topreserve WHERE ...
+
+		$sDelete = self::ClauseDelete($this->__aDelTables);
+		$sFrom   = self::ClauseFrom($this->__aFrom);
+		// #@# safety net to redo ?
+		/*
+		if ($this->m_oConditionExpr->IsAny())
+		-- if (count($aConditions) == 0) --
+		{
+			throw new CoreException("Building a request wich will delete every object of a given table -looks suspicious- please use truncate instead...");
+		}
+		*/
+		if (is_null($this->m_oConditionExpr))
+		{
+			// Delete all !!!
+		}
+		else
+		{
+			$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
+			return "DELETE $sDelete FROM $sFrom WHERE $sWhere";
+		}
+		return '';
+	}
+
+	/**
+	 *	Needed for the unions
+	 */
+	public function RenderSelectClause()
+	{
+		$this->PrepareRendering();
+		$sSelect = self::ClauseSelect($this->__aFields);
+		return $sSelect;
+	}
+
+	/**
+	 *    Needed for the unions
+	 * @param $aOrderBy
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderOrderByClause($aOrderBy)
+	{
+		$this->PrepareRendering();
+		$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
+		return $sOrderBy;
+	}
+
+	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderUpdate($aArgs = array())
+	{
+		$this->PrepareRendering();
+		$sFrom   = self::ClauseFrom($this->__aFrom);
+		$sValues = self::ClauseValues($this->__aSetValues);
+		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
+		return "UPDATE $sFrom SET $sValues WHERE $sWhere";
+	}
+
+	// Interface, build the SQL query
+
+	/**
+	 * @param array $aOrderBy
+	 * @param array $aArgs
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @param bool $bGetCount
+	 * @param bool $bBeautifulQuery
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false)
+	{
+		$this->m_bBeautifulQuery = $bBeautifulQuery;
+		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
+		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
+
+		$this->PrepareRendering();
+		$sFrom   = self::ClauseFrom($this->__aFrom, $sIndent);
+		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+		if ($bGetCount)
+		{
+			if (count($this->__aSelectedIdFields) > 0)
+			{
+				$aCountFields = array();
+				foreach ($this->__aSelectedIdFields as $sFieldExpr)
+				{
+					$aCountFields[] = "COALESCE($sFieldExpr, 0)"; // Null values are excluded from the count
+				}
+				$sCountFields = implode(', ', $aCountFields);
+				// Count can be limited for performance reason, in this case the total amount is not important,
+				// we only need to know if the number of entries is greater than a certain amount.
+				$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep DISTINCT $sCountFields $sLineSep FROM $sFrom$sLineSep WHERE $sWhere $sLimit) AS _tatooine_";
+			}
+			else
+			{
+				$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep WHERE $sWhere $sLimit) AS _tatooine_";
+			}
+		}
+		else
+		{
+			$sSelect = self::ClauseSelect($this->__aFields, $sLineSep);
+			$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
+			if (!empty($sOrderBy))
+			{
+				$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
+			}
+
+			$sSQL = "SELECT$sLineSep DISTINCT $sSelect$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep $sOrderBy $sLimit";
+		}
+		return $sSQL;
+	}
+
+	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @param bool $bBeautifulQuery
+	 * @param array $aOrderBy
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false, $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0)
+	{
+		$this->m_bBeautifulQuery = $bBeautifulQuery;
+		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
+		$sIndent = $this->m_bBeautifulQuery ? "   " : null;
+
+		$this->PrepareRendering();
+
+		$sSelect = self::ClauseSelect($this->__aFields);
+		$sFrom   = self::ClauseFrom($this->__aFrom, $sIndent);
+		$sWhere  = self::ClauseWhere($this->m_oConditionExpr, $aArgs);
+		$sGroupBy = self::ClauseGroupBy($this->__aGroupBy);
+		$sOrderBy = self::ClauseOrderBy($aOrderBy, $this->__aFields);
+		if (!empty($sGroupBy))
+		{
+			$sGroupBy = "GROUP BY $sGroupBy$sLineSep";
+		}
+		if (!empty($sOrderBy))
+		{
+			$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
+		}
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep WHERE $sWhere$sLineSep $sGroupBy $sOrderBy$sLineSep $sLimit";
+		return $sSQL;
+	}
+
+	// Purpose: prepare the query data, once for all
+	private function PrepareRendering()
+	{
+		if (is_null($this->__aFrom))
+		{
+			$this->__aFrom = array();
+			$this->__aFields = array();
+			$this->__aGroupBy = array();
+			$this->__aDelTables = array();
+			$this->__aSetValues = array();
+			$this->__aSelectedIdFields = array();
+	
+			$this->PrepareSingleTable($this, $this->__aFrom, '', array('jointype' => 'first'));
+		}
+	}
+
+	private function PrepareSingleTable(SQLObjectQuery $oRootQuery, &$aFrom, $sCallerAlias = '', $aJoinData)
+	{
+		$aTranslationTable[$this->m_sTable]['*'] = $this->m_sTableAlias;
+		$sJoinCond = '';
+
+		// Handle the various kinds of join (or first table in the list)
+		//
+		if (empty($aJoinData['righttablealias']))
+		{
+			$sRightTableAlias = $this->m_sTableAlias;
+		}
+		else
+		{
+			$sRightTableAlias = $aJoinData['righttablealias'];
+		}
+		switch ($aJoinData['jointype'])
+		{
+			case "first":
+				$aFrom[$this->m_sTableAlias] = array("jointype"=>"first", "tablename"=>$this->m_sTable, "joincondition"=>"");
+				break;
+			case "inner":
+			case "left":
+				if (isset($aJoinData["on_expression"]))
+				{
+					$sJoinCond = $aJoinData["on_expression"]->Render();
+				}
+				else
+				{
+					$sJoinCond = "`$sCallerAlias`.`{$aJoinData['leftfield']}` = `$sRightTableAlias`.`{$aJoinData['rightfield']}`";
+				}
+				$aFrom[$this->m_sTableAlias] = array("jointype"=>$aJoinData['jointype'], "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
+				break;
+			case "inner_tree":
+				if ($aJoinData['invert_on_clause'])
+				{
+					$sRootLeft = "`$sCallerAlias`.`{$aJoinData['leftfield']}`";
+					$sRootRight = "`$sCallerAlias`.`{$aJoinData['rightfield']}`";
+					$sNodeLeft = "`$sRightTableAlias`.`{$aJoinData['rightfield_left']}`";
+					$sNodeRight = "`$sRightTableAlias`.`{$aJoinData['rightfield_right']}`";
+				}
+				else
+				{
+					$sNodeLeft = "`$sCallerAlias`.`{$aJoinData['leftfield']}`";
+					$sNodeRight = "`$sCallerAlias`.`{$aJoinData['rightfield']}`";
+					$sRootLeft = "`$sRightTableAlias`.`{$aJoinData['rightfield_left']}`";
+					$sRootRight = "`$sRightTableAlias`.`{$aJoinData['rightfield_right']}`";
+				}
+				switch($aJoinData['tree_operator'])
+				{
+					case TREE_OPERATOR_BELOW:
+					$sJoinCond = "$sNodeLeft >= $sRootLeft AND $sNodeLeft <= $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_BELOW_STRICT:
+					$sJoinCond = "$sNodeLeft > $sRootLeft AND $sNodeLeft < $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_BELOW: // Complementary of 'BELOW'
+					$sJoinCond = "$sNodeLeft < $sRootLeft OR $sNodeLeft > $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_BELOW_STRICT: // Complementary of BELOW_STRICT
+					$sJoinCond = "$sNodeLeft <= $sRootLeft OR $sNodeLeft >= $sRootRight";
+					break;
+
+					case TREE_OPERATOR_ABOVE:
+					$sJoinCond = "$sNodeLeft <= $sRootLeft AND $sNodeRight >= $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_ABOVE_STRICT:
+					$sJoinCond = "$sNodeLeft < $sRootLeft AND $sNodeRight > $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_ABOVE: // Complementary of 'ABOVE'
+					$sJoinCond = "$sNodeLeft > $sRootLeft OR $sNodeRight < $sRootRight";
+					break;
+					
+					case TREE_OPERATOR_NOT_ABOVE_STRICT: // Complementary of ABOVE_STRICT
+					$sJoinCond = "$sNodeLeft >= $sRootLeft OR $sNodeRight <= $sRootRight";
+					break;
+					
+				}
+				$aFrom[$this->m_sTableAlias] = array("jointype"=>$aJoinData['jointype'], "tablename"=>$this->m_sTable, "joincondition"=>"$sJoinCond");
+				break;
+		}
+
+		// Given the alias, modify the fields and conditions
+		// before adding them into the current lists
+		//
+		foreach($this->m_aFields as $sAlias => $oExpression)
+		{
+			$oRootQuery->__aFields["`$sAlias`"] = $oExpression->Render();
+		}
+		if ($this->m_aGroupBy)
+		{
+			foreach($this->m_aGroupBy as $sAlias => $oExpression)
+			{
+				$oRootQuery->__aGroupBy["`$sAlias`"] = $oExpression->Render();
+			}
+		}
+		if ($this->m_bToDelete)
+		{
+			$oRootQuery->__aDelTables[] = "`{$this->m_sTableAlias}`";
+		}
+		foreach($this->m_aValues as $sFieldName=>$value)
+		{
+			$oRootQuery->__aSetValues["`{$this->m_sTableAlias}`.`$sFieldName`"] = $value; // quoted further!
+		}
+
+  		if (!is_null($this->m_oSelectedIdField))
+  		{
+  			$oRootQuery->__aSelectedIdFields[] = $this->m_oSelectedIdField->Render();
+		}
+
+		// loop on joins, to complete the list of tables/fields/conditions
+		//
+		$aTempFrom = array(); // temporary subset of 'from' specs, to be grouped in the final query
+		foreach ($this->m_aJoinSelects as $aJoinData)
+		{
+			$oRightSelect = $aJoinData["select"];
+
+			$oRightSelect->PrepareSingleTable($oRootQuery, $aTempFrom, $this->m_sTableAlias, $aJoinData);
+		}
+		$aFrom[$this->m_sTableAlias]['subfrom'] = $aTempFrom;
+
+		return $this->m_sTableAlias;
+	}
+
+	public function OptimizeJoins($aUsedTables, $bTopCall = true)
+	{
+		$this->m_iOriginalTableCount = $this->CountTables();
+		if ($bTopCall)
+		{
+			// Top call: complete the list of tables absolutely required to perform the right query
+			$this->CollectUsedTables($aUsedTables);
+		}
+
+		$aToDiscard = array();
+		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
+		{
+			$oSQLQuery = $aJoinInfo["select"];
+			$sTableAlias = $oSQLQuery->GetTableAlias();
+			if ($oSQLQuery->OptimizeJoins($aUsedTables, false) && !array_key_exists($sTableAlias, $aUsedTables))
+			{
+				$aToDiscard[] = $i;
+			}
+		}
+		foreach ($aToDiscard as $i)
+		{
+			unset($this->m_aJoinSelects[$i]);
+		}
+
+		return (count($this->m_aJoinSelects) == 0);
+	}
+
+	public function CountTables()
+	{
+		$iRet = 1;
+		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
+		{
+			$oSQLQuery = $aJoinInfo["select"];
+			$iRet += $oSQLQuery->CountTables();
+		}
+		return $iRet;
+	}
+
+	public function CollectUsedTables(&$aTables)
+	{
+		$this->m_oConditionExpr->CollectUsedParents($aTables);
+		foreach($this->m_aFields as $sFieldAlias => $oField)
+		{
+			$oField->CollectUsedParents($aTables);
+		}
+		if ($this->m_aGroupBy)
+		{
+			foreach($this->m_aGroupBy as $sAlias => $oExpression)
+			{
+				$oExpression->CollectUsedParents($aTables);
+			}
+		}
+  		if (!is_null($this->m_oSelectedIdField))
+  		{
+  			$this->m_oSelectedIdField->CollectUsedParents($aTables);
+		}
+
+		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
+		{
+			$oSQLQuery = $aJoinInfo["select"];
+			if ($oSQLQuery->HasRequiredTables($aTables))
+			{
+				// There is something required in the branch, then this node is a MUST
+				if (isset($aJoinInfo['righttablealias']))
+				{
+					$aTables[$aJoinInfo['righttablealias']] = true;
+				}
+				if (isset($aJoinInfo["on_expression"]))
+				{
+					$aJoinInfo["on_expression"]->CollectUsedParents($aTables);
+				}
+			}
+		}
+
+		return $aTables;
+	}
+
+	// Is required in the JOIN, and therefore we must ensure that the join expression will be valid
+	protected function HasRequiredTables(&$aTables)
+	{
+		$bResult = false;
+		if (array_key_exists($this->m_sTableAlias, $aTables))
+		{
+			$bResult = true;
+		}
+		foreach ($this->m_aJoinSelects as $i => $aJoinInfo)
+		{
+			$oSQLQuery = $aJoinInfo["select"];
+			if ($oSQLQuery->HasRequiredTables($aTables))
+			{
+				// There is something required in the branch, then this node is a MUST
+				if (isset($aJoinInfo['righttablealias']))
+				{
+					$aTables[$aJoinInfo['righttablealias']] = true;
+				}
+				if (isset($aJoinInfo["on_expression"]))
+				{
+					$aJoinInfo["on_expression"]->CollectUsedParents($aTables);
+				}
+				$bResult = true;
+			}
+		}
+		// None of the tables is in the list of required tables
+		return $bResult;
+	}
+
+}
diff --git a/core/sqlquery.class.inc.php b/core/sqlquery.class.inc.php
index f759b09be..cfea6997e 100644
--- a/core/sqlquery.class.inc.php
+++ b/core/sqlquery.class.inc.php
@@ -1,201 +1,201 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * SQLQuery
- * build an mySQL compatible SQL query
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * SQLQuery
- * build an mySQL compatible SQL query
- *
- * @package     iTopORM
- */
-
-require_once('cmdbsource.class.inc.php');
-
-
-abstract class SQLQuery
-{
-	private $m_SourceOQL = '';
-	protected $m_bBeautifulQuery = false;
-
-	public function __construct()
-	{
-	}
-
-	/**
-	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects
-	 **/	 	
-	public function DeepClone()
-	{
-		return unserialize(serialize($this));
-	}
-
-	public function SetSourceOQL($sOQL)
-	{
-		$this->m_SourceOQL = $sOQL;
-	}
-
-	public function GetSourceOQL()
-	{
-		return $this->m_SourceOQL;
-	}
-
-	abstract public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '');
-
-	abstract public function DisplayHtml();
-	abstract public function RenderDelete($aArgs = array());
-	abstract public function RenderUpdate($aArgs = array());
-	abstract public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false);
-	abstract public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false,  $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0);
-
-	abstract public function OptimizeJoins($aUsedTables, $bTopCall = true);
-
-	protected static function ClauseSelect($aFields, $sLineSep = '')
-	{
-		$aSelect = array();
-		foreach ($aFields as $sFieldAlias => $sSQLExpr)
-		{
-			$aSelect[] = "$sSQLExpr AS $sFieldAlias";
-		}
-		$sSelect = implode(",$sLineSep ", $aSelect);
-		return $sSelect;
-	}
-
-	protected static function ClauseGroupBy($aGroupBy)
-	{
-		$sRes = implode(', ', $aGroupBy);
-		return $sRes;
-	}
-
-	protected static function ClauseDelete($aDelTableAliases)
-	{
-		$aDelTables = array();
-		foreach ($aDelTableAliases as $sTableAlias)
-		{
-			$aDelTables[] = "$sTableAlias";
-		}
-		$sDelTables = implode(', ', $aDelTables);
-		return $sDelTables;
-	}
-
-	/**
-	 * @param $aFrom
-	 * @param null $sIndent
-	 * @param int $iIndentLevel
-	 * @return string
-	 * @throws CoreException
-	 */
-	protected static function ClauseFrom($aFrom, $sIndent = null, $iIndentLevel = 0)
-	{
-		$sLineBreakLong = $sIndent ? "\n".str_repeat($sIndent, $iIndentLevel + 1) : '';
-		$sLineBreak = $sIndent ? "\n".str_repeat($sIndent, $iIndentLevel) : '';
-
-		$sFrom = "";
-		foreach ($aFrom as $sTableAlias => $aJoinInfo)
-		{
-			switch ($aJoinInfo["jointype"])
-			{
-				case "first":
-					$sFrom .= $sLineBreakLong."`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
-					$sFrom .= self::ClauseFrom($aJoinInfo["subfrom"], $sIndent, $iIndentLevel + 1);
-					break;
-				case "inner":
-				case "inner_tree":
-					if (count($aJoinInfo["subfrom"]) > 0)
-					{
-						$sFrom .= $sLineBreak."INNER JOIN ($sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
-						$sFrom .= " ".self::ClauseFrom($aJoinInfo["subfrom"], $sIndent, $iIndentLevel + 1);
-						$sFrom .= $sLineBreak.") ON ".$aJoinInfo["joincondition"];
-					}
-					else
-					{
-						// Unions do not suffer parenthesis around the "table AS alias"
-						$sFrom .= $sLineBreak."INNER JOIN $sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
-						$sFrom .= $sLineBreak." ON ".$aJoinInfo["joincondition"];
-					}
-					break;
-				case "left":
-					if (count($aJoinInfo["subfrom"]) > 0)
-					{
-						$sFrom .= $sLineBreak."LEFT JOIN ($sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
-						$sFrom .= " ".self::ClauseFrom($aJoinInfo["subfrom"], $sIndent, $iIndentLevel + 1);
-						$sFrom .= $sLineBreak.") ON ".$aJoinInfo["joincondition"];
-					}
-					else
-					{
-						// Unions do not suffer parenthesis around the "table AS alias"
-						$sFrom .= $sLineBreak."LEFT JOIN $sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
-						$sFrom .= $sLineBreak." ON ".$aJoinInfo["joincondition"];
-					}
-					break;
-				default:
-					throw new CoreException("Unknown jointype: '".$aJoinInfo["jointype"]."'");
-			}
-		}
-		return $sFrom;
-	}
-
-	protected static function ClauseValues($aValues)
-	{
-		$aSetValues = array();
-		foreach ($aValues as $sFieldSpec => $value)
-		{
-			$aSetValues[] = "$sFieldSpec = ".CMDBSource::Quote($value);
-		}
-		$sSetValues = implode(', ', $aSetValues);
-		return $sSetValues;
-	}
-
-	protected static function ClauseWhere($oConditionExpr, $aArgs = array())
-	{
-		if (is_null($oConditionExpr))
-		{
-			return '1';
-		}
-		else
-		{
-			return $oConditionExpr->Render($aArgs);
-		}
-	}
-
-	/**
-	 * @param array $aOrderBy
-	 * @param array $aExistingFields
-	 * @return string
-	 * @throws CoreException
-	 */
-	protected static function ClauseOrderBy($aOrderBy, $aExistingFields)
-	{
-		$aOrderBySpec = array();
-		foreach($aOrderBy as $sFieldAlias => $bAscending)
-		{
-			// Note: sFieldAlias must have backticks around column aliases
-			$aOrderBySpec[] = $sFieldAlias.($bAscending ? " ASC" : " DESC");
-		}
-		$sOrderBy = implode(", ", $aOrderBySpec);
-		return $sOrderBy;
-	}
-}
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * SQLQuery
+ * build an mySQL compatible SQL query
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * SQLQuery
+ * build an mySQL compatible SQL query
+ *
+ * @package     iTopORM
+ */
+
+require_once('cmdbsource.class.inc.php');
+
+
+abstract class SQLQuery
+{
+	private $m_SourceOQL = '';
+	protected $m_bBeautifulQuery = false;
+
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects
+	 **/	 	
+	public function DeepClone()
+	{
+		return unserialize(serialize($this));
+	}
+
+	public function SetSourceOQL($sOQL)
+	{
+		$this->m_SourceOQL = $sOQL;
+	}
+
+	public function GetSourceOQL()
+	{
+		return $this->m_SourceOQL;
+	}
+
+	abstract public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '');
+
+	abstract public function DisplayHtml();
+	abstract public function RenderDelete($aArgs = array());
+	abstract public function RenderUpdate($aArgs = array());
+	abstract public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false);
+	abstract public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false,  $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0);
+
+	abstract public function OptimizeJoins($aUsedTables, $bTopCall = true);
+
+	protected static function ClauseSelect($aFields, $sLineSep = '')
+	{
+		$aSelect = array();
+		foreach ($aFields as $sFieldAlias => $sSQLExpr)
+		{
+			$aSelect[] = "$sSQLExpr AS $sFieldAlias";
+		}
+		$sSelect = implode(",$sLineSep ", $aSelect);
+		return $sSelect;
+	}
+
+	protected static function ClauseGroupBy($aGroupBy)
+	{
+		$sRes = implode(', ', $aGroupBy);
+		return $sRes;
+	}
+
+	protected static function ClauseDelete($aDelTableAliases)
+	{
+		$aDelTables = array();
+		foreach ($aDelTableAliases as $sTableAlias)
+		{
+			$aDelTables[] = "$sTableAlias";
+		}
+		$sDelTables = implode(', ', $aDelTables);
+		return $sDelTables;
+	}
+
+	/**
+	 * @param $aFrom
+	 * @param null $sIndent
+	 * @param int $iIndentLevel
+	 * @return string
+	 * @throws CoreException
+	 */
+	protected static function ClauseFrom($aFrom, $sIndent = null, $iIndentLevel = 0)
+	{
+		$sLineBreakLong = $sIndent ? "\n".str_repeat($sIndent, $iIndentLevel + 1) : '';
+		$sLineBreak = $sIndent ? "\n".str_repeat($sIndent, $iIndentLevel) : '';
+
+		$sFrom = "";
+		foreach ($aFrom as $sTableAlias => $aJoinInfo)
+		{
+			switch ($aJoinInfo["jointype"])
+			{
+				case "first":
+					$sFrom .= $sLineBreakLong."`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
+					$sFrom .= self::ClauseFrom($aJoinInfo["subfrom"], $sIndent, $iIndentLevel + 1);
+					break;
+				case "inner":
+				case "inner_tree":
+					if (count($aJoinInfo["subfrom"]) > 0)
+					{
+						$sFrom .= $sLineBreak."INNER JOIN ($sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
+						$sFrom .= " ".self::ClauseFrom($aJoinInfo["subfrom"], $sIndent, $iIndentLevel + 1);
+						$sFrom .= $sLineBreak.") ON ".$aJoinInfo["joincondition"];
+					}
+					else
+					{
+						// Unions do not suffer parenthesis around the "table AS alias"
+						$sFrom .= $sLineBreak."INNER JOIN $sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
+						$sFrom .= $sLineBreak." ON ".$aJoinInfo["joincondition"];
+					}
+					break;
+				case "left":
+					if (count($aJoinInfo["subfrom"]) > 0)
+					{
+						$sFrom .= $sLineBreak."LEFT JOIN ($sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
+						$sFrom .= " ".self::ClauseFrom($aJoinInfo["subfrom"], $sIndent, $iIndentLevel + 1);
+						$sFrom .= $sLineBreak.") ON ".$aJoinInfo["joincondition"];
+					}
+					else
+					{
+						// Unions do not suffer parenthesis around the "table AS alias"
+						$sFrom .= $sLineBreak."LEFT JOIN $sLineBreakLong`".$aJoinInfo["tablename"]."` AS `$sTableAlias`";
+						$sFrom .= $sLineBreak." ON ".$aJoinInfo["joincondition"];
+					}
+					break;
+				default:
+					throw new CoreException("Unknown jointype: '".$aJoinInfo["jointype"]."'");
+			}
+		}
+		return $sFrom;
+	}
+
+	protected static function ClauseValues($aValues)
+	{
+		$aSetValues = array();
+		foreach ($aValues as $sFieldSpec => $value)
+		{
+			$aSetValues[] = "$sFieldSpec = ".CMDBSource::Quote($value);
+		}
+		$sSetValues = implode(', ', $aSetValues);
+		return $sSetValues;
+	}
+
+	protected static function ClauseWhere($oConditionExpr, $aArgs = array())
+	{
+		if (is_null($oConditionExpr))
+		{
+			return '1';
+		}
+		else
+		{
+			return $oConditionExpr->Render($aArgs);
+		}
+	}
+
+	/**
+	 * @param array $aOrderBy
+	 * @param array $aExistingFields
+	 * @return string
+	 * @throws CoreException
+	 */
+	protected static function ClauseOrderBy($aOrderBy, $aExistingFields)
+	{
+		$aOrderBySpec = array();
+		foreach($aOrderBy as $sFieldAlias => $bAscending)
+		{
+			// Note: sFieldAlias must have backticks around column aliases
+			$aOrderBySpec[] = $sFieldAlias.($bAscending ? " ASC" : " DESC");
+		}
+		$sOrderBy = implode(", ", $aOrderBySpec);
+		return $sOrderBy;
+	}
+}
diff --git a/core/sqlunionquery.class.inc.php b/core/sqlunionquery.class.inc.php
index 6ff2bb1a0..db3cecd1b 100644
--- a/core/sqlunionquery.class.inc.php
+++ b/core/sqlunionquery.class.inc.php
@@ -1,208 +1,208 @@
-<?php
-// Copyright (C) 2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * SQLUnionQuery
- * build a mySQL compatible SQL query
- *
- * @copyright   Copyright (C) 2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * SQLUnionQuery
- * build a mySQL compatible SQL query
- *
- * @package     iTopORM
- */
-
-
-class SQLUnionQuery extends SQLQuery
-{
-	protected $aQueries;
-	protected $aGroupBy;
-	protected $aSelectExpr;
-
-	public function __construct($aQueries, $aGroupBy, $aSelectExpr = array())
-	{
-		parent::__construct();
-
-		$this->aQueries = array();
-		foreach ($aQueries as $oSQLQuery)
-		{
-			$this->aQueries[] = $oSQLQuery->DeepClone();
-		}
-		$this->aGroupBy = $aGroupBy;
-		$this->aSelectExpr = $aSelectExpr;
-	}
-
-	public function DisplayHtml()
-	{
-		$aQueriesHtml = array();
-		foreach ($this->aQueries as $oSQLQuery)
-		{
-			$aQueriesHtml[] = '<p>'.$oSQLQuery->DisplayHtml().'</p>';
-		}
-		echo implode('UNION', $aQueriesHtml);
-	}
-
-	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '')
-	{
-		foreach ($this->aQueries as $oSubSQLQuery)
-		{
-			$oSubSQLQuery->AddInnerJoin($oSQLQuery->DeepClone(), $sLeftField, $sRightField, $sRightTable = '');
-		}
-	}
-
-	/**
-	 * @param array $aArgs
-	 * @throws Exception
-	 */
-	public function RenderDelete($aArgs = array())
-	{
-		throw new Exception(__class__.'::'.__function__.'Not implemented !');
-	}
-
-	// Interface, build the SQL query
-
-	/**
-	 * @param array $aArgs
-	 * @throws Exception
-	 */
-	public function RenderUpdate($aArgs = array())
-	{
-		throw new Exception(__class__.'::'.__function__.'Not implemented !');
-	}
-
-	// Interface, build the SQL query
-	public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false)
-	{
-		$this->m_bBeautifulQuery = $bBeautifulQuery;
-		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
-
-		$aSelects = array();
-		foreach ($this->aQueries as $oSQLQuery)
-		{
-			// Render SELECTS without orderby/limit/count
-			$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
-		}
-		if ($iLimitCount > 0)
-		{
-			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
-		}
-		else
-		{
-			$sLimit = '';
-		}
-
-		if ($bGetCount)
-		{
-			$sSelects = '('.implode(" $sLimit)$sLineSep UNION$sLineSep(", $aSelects)." $sLimit)";
-			$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
-			$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep) AS _union_tatooine_";
-		}
-		else
-		{
-			$sOrderBy = $this->aQueries[0]->RenderOrderByClause($aOrderBy);
-			if (!empty($sOrderBy))
-			{
-				$sOrderBy = "ORDER BY $sOrderBy$sLineSep $sLimit";
-				$sSQL = '('.implode(")$sLineSep UNION$sLineSep (", $aSelects).')'.$sLineSep.$sOrderBy;
-			}
-			else
-			{
-				$sSQL = '('.implode(" $sLimit)$sLineSep UNION$sLineSep (", $aSelects)." $sLimit)";
-			}
-		}
-		return $sSQL;
-	}
-
-	// Interface, build the SQL query
-
-	/**
-	 * @param array $aArgs
-	 * @param bool $bBeautifulQuery
-	 * @param array $aOrderBy
-	 * @param int $iLimitCount
-	 * @param int $iLimitStart
-	 * @return string
-	 * @throws CoreException
-	 */
-	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false, $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0)
-	{
-		$this->m_bBeautifulQuery = $bBeautifulQuery;
-		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
-
-		$aSelects = array();
-		foreach ($this->aQueries as $oSQLQuery)
-		{
-			// Render SELECTS without orderby/limit/count
-			$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
-		}
-		$sSelects = '('.implode(")$sLineSep UNION$sLineSep(", $aSelects).')';
-		$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
-
-		$aSelectAliases = array();
-		$aGroupAliases = array();
-		foreach ($this->aGroupBy as $sGroupAlias => $trash)
-		{
-			$aSelectAliases[$sGroupAlias] = "`$sGroupAlias`";
-			$aGroupAliases[] = "`$sGroupAlias`";
-		}
-		foreach($this->aSelectExpr as $sSelectAlias => $oExpr)
-		{
-			$aSelectAliases[$sSelectAlias] = $oExpr->Render()." AS `$sSelectAlias`";
-		}
-
-		$sSelect = implode(",$sLineSep ", $aSelectAliases);
-		$sGroupBy = implode(', ', $aGroupAliases);
-
-		$sOrderBy = self::ClauseOrderBy($aOrderBy, $aSelectAliases);
-		if (!empty($sGroupBy))
-		{
-			$sGroupBy = "GROUP BY $sGroupBy$sLineSep";
-		}
-		if (!empty($sOrderBy))
-		{
-			$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
-		}
-		if ($iLimitCount > 0)
-		{
-			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
-		}
-		else
-		{
-			$sLimit = '';
-		}
-
-
-		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep $sGroupBy $sOrderBy$sLineSep $sLimit";
-		return $sSQL;
-	}
-
-
-	public function OptimizeJoins($aUsedTables, $bTopCall = true)
-	{
-		foreach ($this->aQueries as $oSQLQuery)
-		{
-			$oSQLQuery->OptimizeJoins($aUsedTables);
-		}
-	}
-}
+<?php
+// Copyright (C) 2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * SQLUnionQuery
+ * build a mySQL compatible SQL query
+ *
+ * @copyright   Copyright (C) 2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * SQLUnionQuery
+ * build a mySQL compatible SQL query
+ *
+ * @package     iTopORM
+ */
+
+
+class SQLUnionQuery extends SQLQuery
+{
+	protected $aQueries;
+	protected $aGroupBy;
+	protected $aSelectExpr;
+
+	public function __construct($aQueries, $aGroupBy, $aSelectExpr = array())
+	{
+		parent::__construct();
+
+		$this->aQueries = array();
+		foreach ($aQueries as $oSQLQuery)
+		{
+			$this->aQueries[] = $oSQLQuery->DeepClone();
+		}
+		$this->aGroupBy = $aGroupBy;
+		$this->aSelectExpr = $aSelectExpr;
+	}
+
+	public function DisplayHtml()
+	{
+		$aQueriesHtml = array();
+		foreach ($this->aQueries as $oSQLQuery)
+		{
+			$aQueriesHtml[] = '<p>'.$oSQLQuery->DisplayHtml().'</p>';
+		}
+		echo implode('UNION', $aQueriesHtml);
+	}
+
+	public function AddInnerJoin($oSQLQuery, $sLeftField, $sRightField, $sRightTable = '')
+	{
+		foreach ($this->aQueries as $oSubSQLQuery)
+		{
+			$oSubSQLQuery->AddInnerJoin($oSQLQuery->DeepClone(), $sLeftField, $sRightField, $sRightTable = '');
+		}
+	}
+
+	/**
+	 * @param array $aArgs
+	 * @throws Exception
+	 */
+	public function RenderDelete($aArgs = array())
+	{
+		throw new Exception(__class__.'::'.__function__.'Not implemented !');
+	}
+
+	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @throws Exception
+	 */
+	public function RenderUpdate($aArgs = array())
+	{
+		throw new Exception(__class__.'::'.__function__.'Not implemented !');
+	}
+
+	// Interface, build the SQL query
+	public function RenderSelect($aOrderBy = array(), $aArgs = array(), $iLimitCount = 0, $iLimitStart = 0, $bGetCount = false, $bBeautifulQuery = false)
+	{
+		$this->m_bBeautifulQuery = $bBeautifulQuery;
+		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
+
+		$aSelects = array();
+		foreach ($this->aQueries as $oSQLQuery)
+		{
+			// Render SELECTS without orderby/limit/count
+			$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
+		}
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+
+		if ($bGetCount)
+		{
+			$sSelects = '('.implode(" $sLimit)$sLineSep UNION$sLineSep(", $aSelects)." $sLimit)";
+			$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
+			$sSQL = "SELECT COUNT(*) AS COUNT FROM (SELECT$sLineSep 1 $sLineSep FROM $sFrom$sLineSep) AS _union_tatooine_";
+		}
+		else
+		{
+			$sOrderBy = $this->aQueries[0]->RenderOrderByClause($aOrderBy);
+			if (!empty($sOrderBy))
+			{
+				$sOrderBy = "ORDER BY $sOrderBy$sLineSep $sLimit";
+				$sSQL = '('.implode(")$sLineSep UNION$sLineSep (", $aSelects).')'.$sLineSep.$sOrderBy;
+			}
+			else
+			{
+				$sSQL = '('.implode(" $sLimit)$sLineSep UNION$sLineSep (", $aSelects)." $sLimit)";
+			}
+		}
+		return $sSQL;
+	}
+
+	// Interface, build the SQL query
+
+	/**
+	 * @param array $aArgs
+	 * @param bool $bBeautifulQuery
+	 * @param array $aOrderBy
+	 * @param int $iLimitCount
+	 * @param int $iLimitStart
+	 * @return string
+	 * @throws CoreException
+	 */
+	public function RenderGroupBy($aArgs = array(), $bBeautifulQuery = false, $aOrderBy = array(), $iLimitCount = 0, $iLimitStart = 0)
+	{
+		$this->m_bBeautifulQuery = $bBeautifulQuery;
+		$sLineSep = $this->m_bBeautifulQuery ? "\n" : '';
+
+		$aSelects = array();
+		foreach ($this->aQueries as $oSQLQuery)
+		{
+			// Render SELECTS without orderby/limit/count
+			$aSelects[] = $oSQLQuery->RenderSelect(array(), $aArgs, 0, 0, false, $bBeautifulQuery);
+		}
+		$sSelects = '('.implode(")$sLineSep UNION$sLineSep(", $aSelects).')';
+		$sFrom = "($sLineSep$sSelects$sLineSep) as __selects__";
+
+		$aSelectAliases = array();
+		$aGroupAliases = array();
+		foreach ($this->aGroupBy as $sGroupAlias => $trash)
+		{
+			$aSelectAliases[$sGroupAlias] = "`$sGroupAlias`";
+			$aGroupAliases[] = "`$sGroupAlias`";
+		}
+		foreach($this->aSelectExpr as $sSelectAlias => $oExpr)
+		{
+			$aSelectAliases[$sSelectAlias] = $oExpr->Render()." AS `$sSelectAlias`";
+		}
+
+		$sSelect = implode(",$sLineSep ", $aSelectAliases);
+		$sGroupBy = implode(', ', $aGroupAliases);
+
+		$sOrderBy = self::ClauseOrderBy($aOrderBy, $aSelectAliases);
+		if (!empty($sGroupBy))
+		{
+			$sGroupBy = "GROUP BY $sGroupBy$sLineSep";
+		}
+		if (!empty($sOrderBy))
+		{
+			$sOrderBy = "ORDER BY $sOrderBy$sLineSep";
+		}
+		if ($iLimitCount > 0)
+		{
+			$sLimit = 'LIMIT '.$iLimitStart.', '.$iLimitCount;
+		}
+		else
+		{
+			$sLimit = '';
+		}
+
+
+		$sSQL = "SELECT $sSelect,$sLineSep COUNT(*) AS _itop_count_$sLineSep FROM $sFrom$sLineSep $sGroupBy $sOrderBy$sLineSep $sLimit";
+		return $sSQL;
+	}
+
+
+	public function OptimizeJoins($aUsedTables, $bTopCall = true)
+	{
+		foreach ($this->aQueries as $oSQLQuery)
+		{
+			$oSQLQuery->OptimizeJoins($aUsedTables);
+		}
+	}
+}
diff --git a/core/stimulus.class.inc.php b/core/stimulus.class.inc.php
index 4b263b498..88cd7764b 100644
--- a/core/stimulus.class.inc.php
+++ b/core/stimulus.class.inc.php
@@ -1,138 +1,138 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Object lifecycle management: stimulus
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A stimulus is the trigger that makes the lifecycle go ahead (state machine) 
- *
- * @package     iTopORM
- */
-
-// #@# Really dirty !!!
-// #@# TO BE CLEANED -> ALIGN WITH OTHER METAMODEL DECLARATIONS
-
-class ObjectStimulus
-{
-	private $m_aParams = array();
-	private $m_sHostClass = null;
-	private $m_sCode = null;
-
-	public function __construct($sCode, $aParams)
-	{
-		$this->m_sCode = $sCode;
-		$this->m_aParams = $aParams;
-		$this->ConsistencyCheck();
-	}
-
-	public function SetHostClass($sHostClass)
-	{
-		$this->m_sHostClass = $sHostClass;
-	}
-	public function GetHostClass()
-	{
-		return $this->m_sHostClass;
-	}
-	public function GetCode()
-	{
-		return $this->m_sCode;
-	}
-
-	public function GetLabel()
-	{
-		return Dict::S('Class:'.$this->m_sHostClass.'/Stimulus:'.$this->m_sCode, $this->m_sCode); 
-	}
-	public function GetDescription()
-	{
-		return Dict::S('Class:'.$this->m_sHostClass.'/Stimulus:'.$this->m_sCode.'+', '');
-	}
-
-	public function GetLabel_Obsolete()
-	{
-		// Written for compatibility with a data model written prior to version 0.9.1
-		if (array_key_exists('label', $this->m_aParams))
-		{
-			return $this->m_aParams['label'];
-		}
-		else
-		{
-			return $this->GetLabel();
-		}
-	}
-
-	public function GetDescription_Obsolete()
-	{
-		// Written for compatibility with a data model written prior to version 0.9.1
-		if (array_key_exists('description', $this->m_aParams))
-		{
-			return $this->m_aParams['description'];
-		}
-		else
-		{
-			return $this->GetDescription();
-		}
-	}
-
-// obsolete-	public function Get($sParamName) {return $this->m_aParams[$sParamName];}
-
-	// Note: I could factorize this code with the parameter management made for the AttributeDef class
-	// to be overloaded
-	static protected function ListExpectedParams()
-	{
-		return array();
-	}
-
-	private function ConsistencyCheck()
-	{
-
-		// Check that any mandatory param has been specified
-		//
-		$aExpectedParams = $this->ListExpectedParams();
-		foreach($aExpectedParams as $sParamName)
-		{
-			if (!array_key_exists($sParamName, $this->m_aParams))
-			{
-				$aBacktrace = debug_backtrace();
-				$sTargetClass = $aBacktrace[2]["class"];
-				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
-				throw new CoreException("missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
-			}
-		}
-	}
-}
-
-
-
-class StimulusUserAction extends ObjectStimulus
-{
-	// Entry in the menus
-}
-
-class StimulusInternal extends ObjectStimulus
-{
-	// Applied from page xxxx
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Object lifecycle management: stimulus
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A stimulus is the trigger that makes the lifecycle go ahead (state machine) 
+ *
+ * @package     iTopORM
+ */
+
+// #@# Really dirty !!!
+// #@# TO BE CLEANED -> ALIGN WITH OTHER METAMODEL DECLARATIONS
+
+class ObjectStimulus
+{
+	private $m_aParams = array();
+	private $m_sHostClass = null;
+	private $m_sCode = null;
+
+	public function __construct($sCode, $aParams)
+	{
+		$this->m_sCode = $sCode;
+		$this->m_aParams = $aParams;
+		$this->ConsistencyCheck();
+	}
+
+	public function SetHostClass($sHostClass)
+	{
+		$this->m_sHostClass = $sHostClass;
+	}
+	public function GetHostClass()
+	{
+		return $this->m_sHostClass;
+	}
+	public function GetCode()
+	{
+		return $this->m_sCode;
+	}
+
+	public function GetLabel()
+	{
+		return Dict::S('Class:'.$this->m_sHostClass.'/Stimulus:'.$this->m_sCode, $this->m_sCode); 
+	}
+	public function GetDescription()
+	{
+		return Dict::S('Class:'.$this->m_sHostClass.'/Stimulus:'.$this->m_sCode.'+', '');
+	}
+
+	public function GetLabel_Obsolete()
+	{
+		// Written for compatibility with a data model written prior to version 0.9.1
+		if (array_key_exists('label', $this->m_aParams))
+		{
+			return $this->m_aParams['label'];
+		}
+		else
+		{
+			return $this->GetLabel();
+		}
+	}
+
+	public function GetDescription_Obsolete()
+	{
+		// Written for compatibility with a data model written prior to version 0.9.1
+		if (array_key_exists('description', $this->m_aParams))
+		{
+			return $this->m_aParams['description'];
+		}
+		else
+		{
+			return $this->GetDescription();
+		}
+	}
+
+// obsolete-	public function Get($sParamName) {return $this->m_aParams[$sParamName];}
+
+	// Note: I could factorize this code with the parameter management made for the AttributeDef class
+	// to be overloaded
+	static protected function ListExpectedParams()
+	{
+		return array();
+	}
+
+	private function ConsistencyCheck()
+	{
+
+		// Check that any mandatory param has been specified
+		//
+		$aExpectedParams = $this->ListExpectedParams();
+		foreach($aExpectedParams as $sParamName)
+		{
+			if (!array_key_exists($sParamName, $this->m_aParams))
+			{
+				$aBacktrace = debug_backtrace();
+				$sTargetClass = $aBacktrace[2]["class"];
+				$sCodeInfo = $aBacktrace[1]["file"]." - ".$aBacktrace[1]["line"];
+				throw new CoreException("missing parameter '$sParamName' in ".get_class($this)." declaration for class $sTargetClass ($sCodeInfo)");
+			}
+		}
+	}
+}
+
+
+
+class StimulusUserAction extends ObjectStimulus
+{
+	// Entry in the menus
+}
+
+class StimulusInternal extends ObjectStimulus
+{
+	// Applied from page xxxx
+}
+
+?>
diff --git a/core/templatestring.class.inc.php b/core/templatestring.class.inc.php
index c8d9a390e..59df9efdf 100644
--- a/core/templatestring.class.inc.php
+++ b/core/templatestring.class.inc.php
@@ -1,178 +1,178 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Simple helper class to interpret and transform a template string
- *
- * Usage:
- *     $oString = new TemplateString("Blah $this->friendlyname$ is in location $this->location_id->name$ ('$this->location_id->org_id->name$)");
- *     echo $oString->Render(array('this' => $oContact));
-
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Helper class
- */
-class TemplateStringPlaceholder
-{
-	public $sToken;
-	public $sAttCode;
-	public $sFunction;
-	public $sParamName;
-	public $bIsValid;
-
-	public function __construct($sToken)
-	{
-		$this->sToken = $sToken;
-		$this->sAttcode = '';
-		$this->sFunction = '';
-		$this->sParamName = '';
-		$this->bIsValid = false; // Validity may be false in general, but it can work anyway (thanks to specialization) when rendering
-	}
-}
-
-/**
- * Class TemplateString
- */
-class TemplateString
-{
-	protected $m_sRaw;
-	protected $m_aPlaceholders;
-	    
-	public function __construct($sRaw)
-	{
-		$this->m_sRaw = $sRaw;
-		$this->m_aPlaceholders = null;
-	}
-	
-	/**
-	* Split the string into placholders
-	* @param Hash $aParamTypes Class of the expected parameters: hash array of '<param_id>' => '<class_name>'
-	* @return void
-	*/	  
-	protected function Analyze($aParamTypes = array())
-	{
-		if (!is_null($this->m_aPlaceholders)) return;
-
-		$this->m_aPlaceholders = array();
-		if (preg_match_all('/\\$([a-z0-9_]+(->[a-z0-9_]+)*)\\$/', $this->m_sRaw, $aMatches))
-		{
-			foreach($aMatches[1] as $sPlaceholder)
-			{
-				$oPlaceholder = new TemplateStringPlaceholder($sPlaceholder);
-				$oPlaceholder->bIsValid = false;
-				foreach ($aParamTypes as $sParamName => $sClass)
-				{
-					$sParamPrefix = $sParamName.'->';
-					if (substr($sPlaceholder, 0, strlen($sParamPrefix)) == $sParamPrefix)
-					{
-						// Todo - detect functions (label...)
-						$oPlaceholder->sFunction = '';
-
-						$oPlaceholder->sParamName = $sParamName;
-						$sAttcode = substr($sPlaceholder, strlen($sParamPrefix));
-						$oPlaceholder->sAttcode = $sAttcode;
-						$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttcode, true /* extended */);
-					}
-				}
-
-				$this->m_aPlaceholders[] = $oPlaceholder;
-			}
-		}
-	}
-
-	/**
-	* Return the placeholders (for reporting purposes)
-	* @return void
-	*/	  
-	public function GetPlaceholders()
-	{
-		return $this->m_aPlaceholders;
-	}
-
-	/**
-	* Check the format when possible
-	* @param Hash $aParamTypes Class of the expected parameters: hash array of '<param_id>' => '<class_name>'
-	* @return void
-	*/	  
-	public function IsValid($aParamTypes = array())
-	{
-		$this->Analyze($aParamTypes);
-
-		foreach($this->m_aPlaceholders as $oPlaceholder)
-		{
-			if (!$oPlaceholder->bIsValid)
-			{
-				if (count($aParamTypes) == 0)
-				{
-					return false;
-				}
-				if (array_key_exists($oPlaceholder->sParamName, $aParamTypes))
-				{
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	* Apply the given parameters to replace the placeholders
-	* @param Hash $aParamValues Value of the expected parameters: hash array of '<param_id>' => '<value>'
-	* @return void
-	*/	  
-	public function Render($aParamValues = array())
-	{
-		$aParamTypes = array();
-		foreach($aParamValues as $sParamName => $value)
-		{
-			$aParamTypes[$sParamName] = get_class($value);
-		}
-		$this->Analyze($aParamTypes);
-
-		$aSearch = array();
-		$aReplace = array();
-		foreach($this->m_aPlaceholders as $oPlaceholder)
-		{
-			if (array_key_exists($oPlaceholder->sParamName, $aParamValues))
-			{
-				$oRef = $aParamValues[$oPlaceholder->sParamName];
-				try
-				{
-					$value = $oRef->Get($oPlaceholder->sAttcode);
-					$aSearch[] = '$'.$oPlaceholder->sToken.'$';
-					$aReplace[] = $value;
-					$oPlaceholder->bIsValid = true;
-				}
-				catch(Exception $e)
-				{
-					$oPlaceholder->bIsValid = false;
-				}
-			}
-			else
-			{
-				$oPlaceholder->bIsValid = false;
-			}
-		}
-		return str_replace($aSearch, $aReplace, $this->m_sRaw);
-	}
-}
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Simple helper class to interpret and transform a template string
+ *
+ * Usage:
+ *     $oString = new TemplateString("Blah $this->friendlyname$ is in location $this->location_id->name$ ('$this->location_id->org_id->name$)");
+ *     echo $oString->Render(array('this' => $oContact));
+
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Helper class
+ */
+class TemplateStringPlaceholder
+{
+	public $sToken;
+	public $sAttCode;
+	public $sFunction;
+	public $sParamName;
+	public $bIsValid;
+
+	public function __construct($sToken)
+	{
+		$this->sToken = $sToken;
+		$this->sAttcode = '';
+		$this->sFunction = '';
+		$this->sParamName = '';
+		$this->bIsValid = false; // Validity may be false in general, but it can work anyway (thanks to specialization) when rendering
+	}
+}
+
+/**
+ * Class TemplateString
+ */
+class TemplateString
+{
+	protected $m_sRaw;
+	protected $m_aPlaceholders;
+	    
+	public function __construct($sRaw)
+	{
+		$this->m_sRaw = $sRaw;
+		$this->m_aPlaceholders = null;
+	}
+	
+	/**
+	* Split the string into placholders
+	* @param Hash $aParamTypes Class of the expected parameters: hash array of '<param_id>' => '<class_name>'
+	* @return void
+	*/	  
+	protected function Analyze($aParamTypes = array())
+	{
+		if (!is_null($this->m_aPlaceholders)) return;
+
+		$this->m_aPlaceholders = array();
+		if (preg_match_all('/\\$([a-z0-9_]+(->[a-z0-9_]+)*)\\$/', $this->m_sRaw, $aMatches))
+		{
+			foreach($aMatches[1] as $sPlaceholder)
+			{
+				$oPlaceholder = new TemplateStringPlaceholder($sPlaceholder);
+				$oPlaceholder->bIsValid = false;
+				foreach ($aParamTypes as $sParamName => $sClass)
+				{
+					$sParamPrefix = $sParamName.'->';
+					if (substr($sPlaceholder, 0, strlen($sParamPrefix)) == $sParamPrefix)
+					{
+						// Todo - detect functions (label...)
+						$oPlaceholder->sFunction = '';
+
+						$oPlaceholder->sParamName = $sParamName;
+						$sAttcode = substr($sPlaceholder, strlen($sParamPrefix));
+						$oPlaceholder->sAttcode = $sAttcode;
+						$oPlaceholder->bIsValid = MetaModel::IsValidAttCode($sClass, $sAttcode, true /* extended */);
+					}
+				}
+
+				$this->m_aPlaceholders[] = $oPlaceholder;
+			}
+		}
+	}
+
+	/**
+	* Return the placeholders (for reporting purposes)
+	* @return void
+	*/	  
+	public function GetPlaceholders()
+	{
+		return $this->m_aPlaceholders;
+	}
+
+	/**
+	* Check the format when possible
+	* @param Hash $aParamTypes Class of the expected parameters: hash array of '<param_id>' => '<class_name>'
+	* @return void
+	*/	  
+	public function IsValid($aParamTypes = array())
+	{
+		$this->Analyze($aParamTypes);
+
+		foreach($this->m_aPlaceholders as $oPlaceholder)
+		{
+			if (!$oPlaceholder->bIsValid)
+			{
+				if (count($aParamTypes) == 0)
+				{
+					return false;
+				}
+				if (array_key_exists($oPlaceholder->sParamName, $aParamTypes))
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	* Apply the given parameters to replace the placeholders
+	* @param Hash $aParamValues Value of the expected parameters: hash array of '<param_id>' => '<value>'
+	* @return void
+	*/	  
+	public function Render($aParamValues = array())
+	{
+		$aParamTypes = array();
+		foreach($aParamValues as $sParamName => $value)
+		{
+			$aParamTypes[$sParamName] = get_class($value);
+		}
+		$this->Analyze($aParamTypes);
+
+		$aSearch = array();
+		$aReplace = array();
+		foreach($this->m_aPlaceholders as $oPlaceholder)
+		{
+			if (array_key_exists($oPlaceholder->sParamName, $aParamValues))
+			{
+				$oRef = $aParamValues[$oPlaceholder->sParamName];
+				try
+				{
+					$value = $oRef->Get($oPlaceholder->sAttcode);
+					$aSearch[] = '$'.$oPlaceholder->sToken.'$';
+					$aReplace[] = $value;
+					$oPlaceholder->bIsValid = true;
+				}
+				catch(Exception $e)
+				{
+					$oPlaceholder->bIsValid = false;
+				}
+			}
+			else
+			{
+				$oPlaceholder->bIsValid = false;
+			}
+		}
+		return str_replace($aSearch, $aReplace, $this->m_sRaw);
+	}
+}
 ?>
\ No newline at end of file
diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index b8e7693ec..971c3f8f7 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -1,393 +1,393 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class Trigger and derived
- * User defined triggers, that may be used in conjunction with user defined actions 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-/**
- * A user defined trigger, to customize the application 
- * A trigger will activate an action
- *
- * @package     iTopORM
- */
-abstract class Trigger extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("action_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"trigger_id", "ext_key_to_remote"=>"action_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	public function DoActivate($aContextArgs)
-	{
-		// Find the related actions
-		$oLinkedActions = $this->Get('action_list');
-		while ($oLink = $oLinkedActions->Fetch())
-		{
-			$iActionId = $oLink->Get('action_id');
-			$oAction = MetaModel::GetObject('Action', $iActionId);
-			if ($oAction->IsActive())
-			{
-				$oAction->DoExecute($this, $aContextArgs);
-			}
-		}
-	}
-	
-	/**
-	 * Check whether the given object is in the scope of this trigger
-	 * and can potentially be the subject of notifications
-	 * @param DBObject $oObject The object to check
-	 * @return bool
-	 */
-	public function IsInScope(DBObject $oObject)
-	{
-		// By default the answer is no
-		// Overload this function in your own derived class for a different behavior
-		return false;
-	}
-}
-
-abstract class TriggerOnObject extends Trigger
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_onobject",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>"User,UserExternal,UserInternal,UserLDAP,UserLocal", "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values"=>null, "sql"=>"filter", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('default_search', array('description', 'target_class'));  // Default criteria of the search banner
-//		MetaModel::Init_SetZListItems('standard_search', array('name', 'target_class', 'description')); // Criteria of the search form
-	}
-
-	public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-
-		$sFilter = trim($this->Get('filter'));
-		if (strlen($sFilter) > 0)
-		{
-			try
-			{
-				$oSearch = DBObjectSearch::FromOQL($sFilter);
-
-				if (!MetaModel::IsParentClass($this->Get('target_class'), $oSearch->GetClass()))
-				{
-					$this->m_aCheckIssues[] = Dict::Format('TriggerOnObject:WrongFilterClass', $this->Get('target_class'));
-				}
-			}
-			catch(OqlException $e)
-			{
-				$this->m_aCheckIssues[] = Dict::Format('TriggerOnObject:WrongFilterQuery', $e->getMessage());
-			}
-		}
-	}
-
-	/**
-	 * Check whether the given object is in the scope of this trigger
-	 * and can potentially be the subject of notifications
-	 * @param DBObject $oObject The object to check
-	 * @return bool
-	 */
-	public function IsInScope(DBObject $oObject)
-	{
-		$sRootClass = $this->Get('target_class');
-		return ($oObject instanceof $sRootClass);
-	}
-
-	public function DoActivate($aContextArgs)
-	{
-		$bGo = true;
-		if (isset($aContextArgs['this->object()']))
-		{
-			$bGo = $this->IsTargetObject($aContextArgs['this->object()']->GetKey());
-		}
-		if ($bGo)
-		{
-			parent::DoActivate($aContextArgs);
-		}
-	}
-
-	public function IsTargetObject($iObjectId)
-	{
-		$sFilter = trim($this->Get('filter'));
-		if (strlen($sFilter) > 0)
-		{
-			$oSearch = DBObjectSearch::FromOQL($sFilter);
-			$oSearch->AddCondition('id', $iObjectId, '=');
-			$oSet = new DBObjectSet($oSearch);
-			$bRet = ($oSet->Count() > 0);
-		}
-		else
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-}
-/**
- * To trigger notifications when a ticket is updated from the portal
- */
-class TriggerOnPortalUpdate extends TriggerOnObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_onportalupdate",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
-		// Search criteria
-	}
-}
-
-abstract class TriggerOnStateChange extends TriggerOnObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_onstatechange",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("state", array("allowed_values"=>null, "sql"=>"state", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class TriggerOnStateEnter extends TriggerOnStateChange
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_onstateenter",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class TriggerOnStateLeave extends TriggerOnStateChange
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_onstateleave",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('')); // Criteria of the advanced search form
-	}
-}
-
-class TriggerOnObjectCreate extends TriggerOnObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_onobjcreate",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class lnkTriggerAction extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array('action_id', 'trigger_id'),
-			"db_table" => "priv_link_action_trigger",
-			"db_key_field" => "link_id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"is_link" => true,
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> '', "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("action_name", array("allowed_values"=>null, "extkey_attcode"=> 'action_id', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> '', "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("trigger_name", array("allowed_values"=>null, "extkey_attcode"=> 'trigger_id', "target_attcode"=>"description")));
-		MetaModel::Init_AddAttribute(new AttributeInteger("order", array("allowed_values"=>null, "sql"=>"order", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('action_id', 'trigger_id', 'order')); // Attributes to be displayed for a list
-		MetaModel::Init_SetZListItems('list', array('action_id', 'trigger_id', 'order')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('action_id', 'trigger_id', 'order')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('action_id', 'trigger_id', 'order')); // Criteria of the advanced search form
-	}
-}
-
-class TriggerOnThresholdReached extends TriggerOnObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "grant_by_profile,core/cmdb,application",
-			"key_type" => "autoincrement",
-			"name_attcode" => "description",
-			"state_attcode" => "",
-			"reconc_keys" => array('description'),
-			"db_table" => "priv_trigger_threshold",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeString("stop_watch_code", array("allowed_values"=>null, "sql"=>"stop_watch_code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
-		MetaModel::Init_AddAttribute(new AttributeString("threshold_index", array("allowed_values"=>null, "sql"=>"threshold_index", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'stop_watch_code', 'threshold_index', 'filter', 'action_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('target_class', 'threshold_index', 'threshold_index')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class Trigger and derived
+ * User defined triggers, that may be used in conjunction with user defined actions 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+/**
+ * A user defined trigger, to customize the application 
+ * A trigger will activate an action
+ *
+ * @package     iTopORM
+ */
+abstract class Trigger extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("action_list", array("linked_class"=>"lnkTriggerAction", "ext_key_to_me"=>"trigger_id", "ext_key_to_remote"=>"action_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('finalclass', 'description', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	public function DoActivate($aContextArgs)
+	{
+		// Find the related actions
+		$oLinkedActions = $this->Get('action_list');
+		while ($oLink = $oLinkedActions->Fetch())
+		{
+			$iActionId = $oLink->Get('action_id');
+			$oAction = MetaModel::GetObject('Action', $iActionId);
+			if ($oAction->IsActive())
+			{
+				$oAction->DoExecute($this, $aContextArgs);
+			}
+		}
+	}
+	
+	/**
+	 * Check whether the given object is in the scope of this trigger
+	 * and can potentially be the subject of notifications
+	 * @param DBObject $oObject The object to check
+	 * @return bool
+	 */
+	public function IsInScope(DBObject $oObject)
+	{
+		// By default the answer is no
+		// Overload this function in your own derived class for a different behavior
+		return false;
+	}
+}
+
+abstract class TriggerOnObject extends Trigger
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onobject",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeClass("target_class", array("class_category"=>"bizmodel", "more_values"=>"User,UserExternal,UserInternal,UserLDAP,UserLocal", "sql"=>"target_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeOQL("filter", array("allowed_values"=>null, "sql"=>"filter", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('default_search', array('description', 'target_class'));  // Default criteria of the search banner
+//		MetaModel::Init_SetZListItems('standard_search', array('name', 'target_class', 'description')); // Criteria of the search form
+	}
+
+	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		$sFilter = trim($this->Get('filter'));
+		if (strlen($sFilter) > 0)
+		{
+			try
+			{
+				$oSearch = DBObjectSearch::FromOQL($sFilter);
+
+				if (!MetaModel::IsParentClass($this->Get('target_class'), $oSearch->GetClass()))
+				{
+					$this->m_aCheckIssues[] = Dict::Format('TriggerOnObject:WrongFilterClass', $this->Get('target_class'));
+				}
+			}
+			catch(OqlException $e)
+			{
+				$this->m_aCheckIssues[] = Dict::Format('TriggerOnObject:WrongFilterQuery', $e->getMessage());
+			}
+		}
+	}
+
+	/**
+	 * Check whether the given object is in the scope of this trigger
+	 * and can potentially be the subject of notifications
+	 * @param DBObject $oObject The object to check
+	 * @return bool
+	 */
+	public function IsInScope(DBObject $oObject)
+	{
+		$sRootClass = $this->Get('target_class');
+		return ($oObject instanceof $sRootClass);
+	}
+
+	public function DoActivate($aContextArgs)
+	{
+		$bGo = true;
+		if (isset($aContextArgs['this->object()']))
+		{
+			$bGo = $this->IsTargetObject($aContextArgs['this->object()']->GetKey());
+		}
+		if ($bGo)
+		{
+			parent::DoActivate($aContextArgs);
+		}
+	}
+
+	public function IsTargetObject($iObjectId)
+	{
+		$sFilter = trim($this->Get('filter'));
+		if (strlen($sFilter) > 0)
+		{
+			$oSearch = DBObjectSearch::FromOQL($sFilter);
+			$oSearch->AddCondition('id', $iObjectId, '=');
+			$oSet = new DBObjectSet($oSearch);
+			$bRet = ($oSet->Count() > 0);
+		}
+		else
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+}
+/**
+ * To trigger notifications when a ticket is updated from the portal
+ */
+class TriggerOnPortalUpdate extends TriggerOnObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onportalupdate",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'description')); // Attributes to be displayed for a list
+		// Search criteria
+	}
+}
+
+abstract class TriggerOnStateChange extends TriggerOnObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onstatechange",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("state", array("allowed_values"=>null, "sql"=>"state", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class', 'state')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class TriggerOnStateEnter extends TriggerOnStateChange
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onstateenter",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class TriggerOnStateLeave extends TriggerOnStateChange
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onstateleave",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'state', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('target_class', 'state')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class', 'state')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('')); // Criteria of the advanced search form
+	}
+}
+
+class TriggerOnObjectCreate extends TriggerOnObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_onobjcreate",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'target_class')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class lnkTriggerAction extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array('action_id', 'trigger_id'),
+			"db_table" => "priv_link_action_trigger",
+			"db_key_field" => "link_id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"is_link" => true,
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("action_id", array("targetclass"=>"Action", "jointype"=> '', "allowed_values"=>null, "sql"=>"action_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("action_name", array("allowed_values"=>null, "extkey_attcode"=> 'action_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("trigger_id", array("targetclass"=>"Trigger", "jointype"=> '', "allowed_values"=>null, "sql"=>"trigger_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("trigger_name", array("allowed_values"=>null, "extkey_attcode"=> 'trigger_id', "target_attcode"=>"description")));
+		MetaModel::Init_AddAttribute(new AttributeInteger("order", array("allowed_values"=>null, "sql"=>"order", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('action_id', 'trigger_id', 'order')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', array('action_id', 'trigger_id', 'order')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('action_id', 'trigger_id', 'order')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('action_id', 'trigger_id', 'order')); // Criteria of the advanced search form
+	}
+}
+
+class TriggerOnThresholdReached extends TriggerOnObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "grant_by_profile,core/cmdb,application",
+			"key_type" => "autoincrement",
+			"name_attcode" => "description",
+			"state_attcode" => "",
+			"reconc_keys" => array('description'),
+			"db_table" => "priv_trigger_threshold",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeString("stop_watch_code", array("allowed_values"=>null, "sql"=>"stop_watch_code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
+		MetaModel::Init_AddAttribute(new AttributeString("threshold_index", array("allowed_values"=>null, "sql"=>"threshold_index", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));	
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('description', 'target_class', 'stop_watch_code', 'threshold_index', 'filter', 'action_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('target_class', 'threshold_index', 'threshold_index')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('description', 'target_class')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+?>
diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index 26de51e02..8650625d8 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -1,1841 +1,1841 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * User rights management API
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class UserRightException extends CoreException
-{
-}
-
-
-define('UR_ALLOWED_NO', 0);
-define('UR_ALLOWED_YES', 1);
-define('UR_ALLOWED_DEPENDS', 2);
-
-define('UR_ACTION_READ', 1); // View an object
-define('UR_ACTION_MODIFY', 2); // Create/modify an object/attribute
-define('UR_ACTION_DELETE', 3); // Delete an object
-
-define('UR_ACTION_BULK_READ', 4); // Export multiple objects
-define('UR_ACTION_BULK_MODIFY', 5); // Create/modify multiple objects
-define('UR_ACTION_BULK_DELETE', 6); // Delete multiple objects
-
-define('UR_ACTION_CREATE', 7); // Instantiate an object
-
-define('UR_ACTION_APPLICATION_DEFINED', 10000); // Application specific actions (CSV import, View schema...)
-
-/**
- * User management module API  
- *
- * @package     iTopORM
- */
-abstract class UserRightsAddOnAPI
-{
-	abstract public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US'); // could be used during initial installation
-
-	abstract public function Init(); // loads data (possible optimizations)
-
-	// Used to build select queries showing only objects visible for the given user
-	abstract public function GetSelectFilter($sLogin, $sClass, $aSettings = array()); // returns a filter object
-
-	abstract public function IsActionAllowed($oUser, $sClass, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null);
-	abstract public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, /*dbObjectSet*/ $oInstanceSet = null);
-	abstract public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null);
-	abstract public function IsAdministrator($oUser);
-	abstract public function IsPortalUser($oUser);
-	abstract public function FlushPrivileges();
-
-
-	/**
-	 * Default behavior for addons that do not support profiles
-	 *
-	 * @param $oUser User
-	 * @return array
-	 */
-	public function ListProfiles($oUser)
-	{
-		return array();
-	}
-
-	/**
-	 *	...
-	 */
-	public function MakeSelectFilter($sClass, $aAllowedOrgs, $aSettings = array(), $sAttCode = null)
-	{
-		if ($sAttCode == null)
-		{
-			$sAttCode = $this->GetOwnerOrganizationAttCode($sClass);
-		}
-		if (empty($sAttCode))
-		{
-			return $oFilter  = new DBObjectSearch($sClass);
-		}
-
-		$oExpression = new FieldExpression($sAttCode, $sClass);
-		$oFilter  = new DBObjectSearch($sClass);
-		$oListExpr = ListExpression::FromScalars($aAllowedOrgs);
-		
-		$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
-		$oFilter->AddConditionExpression($oCondition);
-
-		if ($this->HasSharing())
-		{
-			if (($sAttCode == 'id') && isset($aSettings['bSearchMode']) && $aSettings['bSearchMode'])
-			{
-				// Querying organizations (or derived)
-				// and the expected list of organizations will be used as a search criteria
-				// Therefore the query can also return organization having objects shared with the allowed organizations
-				//
-				// 1) build the list of organizations sharing something with the allowed organizations
-				// Organization <== sharing_org_id == SharedObject having org_id IN {user orgs}
-				$oShareSearch = new DBObjectSearch('SharedObject');
-				$oOrgField = new FieldExpression('org_id', 'SharedObject');
-				$oShareSearch->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
-	
-				$oSearchSharers = new DBObjectSearch('Organization');
-				$oSearchSharers->AllowAllData();
-				$oSearchSharers->AddCondition_ReferencedBy($oShareSearch, 'sharing_org_id');
-				$aSharers = array();
-				foreach($oSearchSharers->ToDataArray(array('id')) as $aRow)
-				{
-					$aSharers[] = $aRow['id'];
-				}
-				// 2) Enlarge the overall results: ... OR id IN(id1, id2, id3)
-				if (count($aSharers) > 0)
-				{
-					$oSharersList = ListExpression::FromScalars($aSharers);
-					$oFilter->MergeConditionExpression(new BinaryExpression($oExpression, 'IN', $oSharersList));
-				}
-			}
-	
-			$aShareProperties = SharedObject::GetSharedClassProperties($sClass);
-			if ($aShareProperties)
-			{
-				$sShareClass = $aShareProperties['share_class'];
-				$sShareAttCode = $aShareProperties['attcode'];
-	
-				$oSearchShares = new DBObjectSearch($sShareClass);
-				$oSearchShares->AllowAllData();
-	
-				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
-				$oOrgField = new FieldExpression('org_id', $sShareClass);
-				$oSearchShares->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
-				$aShared = array();
-				foreach($oSearchShares->ToDataArray(array($sShareAttCode)) as $aRow)
-				{
-					$aShared[] = $aRow[$sShareAttCode];
-				}
-				if (count($aShared) > 0)
-				{
-					$oObjId = new FieldExpression('id', $sClass);
-					$oSharedIdList = ListExpression::FromScalars($aShared);
-					$oFilter->MergeConditionExpression(new BinaryExpression($oObjId, 'IN', $oSharedIdList));
-				}
-			}
-		} // if HasSharing
-
-		return $oFilter;
-	}
-}
-
-
-require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-abstract class User extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "login",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_user",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("contactid", array("targetclass"=>"Person", "allowed_values"=>null, "sql"=>"contactid", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("last_name", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("first_name", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"first_name")));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("email", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"email")));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"org_id")));
-
-		MetaModel::Init_AddAttribute(new AttributeString("login", array("allowed_values"=>null, "sql"=>"login", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>"EN US", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum('enabled,disabled'), "sql"=>"status", "default_value"=>"enabled", "is_null_allowed"=>false, "depends_on"=>array())));
-		
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"profileid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class"=>"URP_UserOrg", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"allowed_org_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Unused as it's an abstract class !
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'email', 'language', 'status', 'org_id')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('login', 'contactid', 'org_id')); // Default criteria of the search banner
-	}
-
-	abstract public function CheckCredentials($sPassword);
-	abstract public function TrustWebServerContext();
-	abstract public function CanChangePassword();
-	abstract public function ChangePassword($sOldPassword, $sNewPassword);
-
-	/*
-	* Compute a name in best effort mode
-	*/	
-	public function GetFriendlyName()
-	{
-		if (!MetaModel::IsValidAttCode(get_class($this), 'contactid'))
-		{
-			return $this->Get('login');
-		}
-		if ($this->Get('contactid') != 0)
-		{
-			$sFirstName = $this->Get('first_name');
-			$sLastName = $this->Get('last_name');
-			$sEmail = $this->Get('email');
-			if (strlen($sFirstName) > 0)
-			{
-				return "$sFirstName $sLastName";
-			}
-			elseif (strlen($sEmail) > 0)
-			{
-				return "$sLastName <$sEmail>";
-			}
-			else
-			{
-				return $sLastName;
-			}
-		}
-		return $this->Get('login');
-	}
-
-	protected $oContactObject;
-
-	/**
-	 * Fetch and memorize the associated contact (if any)
-	 */
-	public function GetContactObject()
-	{
-		if (is_null($this->oContactObject))
-		{
-			if (MetaModel::IsValidAttCode(get_class($this), 'contactid') && ($this->Get('contactid') != 0))
-			{
-				$this->oContactObject = MetaModel::GetObject('Contact', $this->Get('contactid'));
-			}
-		}
-		return $this->oContactObject;
-	}
-
-	/**
-	 * Overload the standard behavior.
-	 *
-	 * @throws \CoreException
-	 */
-	public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-
-		// Note: This MUST be factorized later: declare unique keys (set of columns) in the data model
-		$aChanges = $this->ListChanges();
-		if (array_key_exists('login', $aChanges))
-		{
-			if (strcasecmp($this->Get('login'), $this->GetOriginal('login')) !== 0)
-			{
-				$sNewLogin = $aChanges['login'];
-				$oSearch = DBObjectSearch::FromOQL_AllData("SELECT User WHERE login = :newlogin");
-				if (!$this->IsNew())
-				{
-					$oSearch->AddCondition('id', $this->GetKey(), '!=');
-				}
-				$oSet = new DBObjectSet($oSearch, array(), array('newlogin' => $sNewLogin));
-				if ($oSet->Count() > 0)
-				{
-					$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:LoginMustBeUnique', $sNewLogin);
-				}
-			}
-		}
-		// Check that this user has at least one profile assigned when profiles have changed
-		if (array_key_exists('profile_list', $aChanges))
-		{
-			$oSet = $this->Get('profile_list');
-			if ($oSet->Count() == 0)
-			{
-				$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneProfileIsNeeded');
-			}
-		}
-		// Only administrators can manage administrators
-		if (UserRights::IsAdministrator($this) && !UserRights::IsAdministrator())
-		{
-			$this->m_aCheckIssues[] = Dict::Format('UI:Login:Error:AccessRestricted');
-		}
-
-		if (!UserRights::IsAdministrator())
-		{
-			$oUser = UserRights::GetUserObject();
-			$oAddon = UserRights::GetModuleInstance();
-			if (!is_null($oUser) && method_exists($oAddon, 'GetUserOrgs'))
-			{
-				$aOrgs = $oAddon->GetUserOrgs($oUser, '');
-				if (count($aOrgs) > 0)
-				{
-					// Check that the modified User belongs to one of our organization
-					if (!in_array($this->GetOriginal('org_id'), $aOrgs) || !in_array($this->Get('org_id'), $aOrgs))
-					{
-						$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:UserOrganizationNotAllowed');
-					}
-					// Check users with restricted organizations when allowed organizations have changed
-					if ($this->IsNew() || array_key_exists('allowed_org_list', $aChanges))
-					{
-						$oSet = $this->get('allowed_org_list');
-						if ($oSet->Count() == 0)
-						{
-							$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneOrganizationIsNeeded');
-						}
-						else
-						{
-							$aModifiedLinks = $oSet->ListModifiedLinks();
-							foreach($aModifiedLinks as $oLink)
-							{
-								if (!in_array($oLink->Get('allowed_org_id'), $aOrgs))
-								{
-									$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:OrganizationNotAllowed');
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	function GetGrantAsHtml($sClass, $iAction)
-	{
-		if (UserRights::IsActionAllowed($sClass, $iAction, null, $this)) 
-		{
-			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
-		}
-		else
-		{
-			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
-		}
-	}
-	
-	function DoShowGrantSumary($oPage, $sClassCategory)
-	{
-		if (UserRights::IsAdministrator($this))
-		{
-			// Looks dirty, but ok that's THE ONE
-			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
-			return;
-		}
-
-		$oKPI = new ExecutionKPI();
-
-		$aDisplayData = array();
-		foreach (MetaModel::GetClasses($sClassCategory) as $sClass)
-		{
-			$aClassStimuli = MetaModel::EnumStimuli($sClass);
-			if (count($aClassStimuli) > 0)
-			{
-				$aStimuli = array();
-				foreach ($aClassStimuli as $sStimulusCode => $oStimulus)
-				{
-					if (UserRights::IsStimulusAllowed($sClass, $sStimulusCode, null, $this))
-					{
-						$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
-					}
-				}
-				$sStimuli = implode(', ', $aStimuli);
-			}
-			else
-			{
-				$sStimuli = '<em title="'.Dict::S('UI:UserManagement:NoLifeCycleApplicable+').'">'.Dict::S('UI:UserManagement:NoLifeCycleApplicable').'</em>';
-			}
-			
-			$aDisplayData[] = array(
-				'class' => MetaModel::GetName($sClass),
-				'read' => $this->GetGrantAsHtml($sClass, UR_ACTION_READ),
-				'bulkread' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_READ),
-				'write' => $this->GetGrantAsHtml($sClass, UR_ACTION_MODIFY),
-				'bulkwrite' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_MODIFY),
-				'delete' => $this->GetGrantAsHtml($sClass, UR_ACTION_DELETE),
-				'bulkdelete' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_DELETE),
-				'stimuli' => $sStimuli,
-			);
-		}
-
-		$oKPI->ComputeAndReport('Computation of user rights');
-	
-		$aDisplayConfig = array();
-		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
-		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
-		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
-		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
-		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
-		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
-		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
-		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
-		$oPage->table($aDisplayConfig, $aDisplayData);
-	}
-
-	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, $bEditMode);
-		if (!$bEditMode)
-		{
-			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
-			$this->DoShowGrantSumary($oPage, 'bizmodel,grant_by_profile');
-
-			// debug
-			if (false)
-			{
-				$oPage->SetCurrentTab('More on user rigths (dev only)');
-				$oPage->add("<h3>User rights</h3>\n");
-				$this->DoShowGrantSumary($oPage, 'addon/userrights');
-				$oPage->add("<h3>Change log</h3>\n");
-				$this->DoShowGrantSumary($oPage, 'core/cmdb');
-				$oPage->add("<h3>Application</h3>\n");
-				$this->DoShowGrantSumary($oPage, 'application');
-				$oPage->add("<h3>GUI</h3>\n");
-				$this->DoShowGrantSumary($oPage, 'gui');
-				
-			}					
-		}
-	}
-	
-  	public function CheckToDelete(&$oDeletionPlan)
-  	{
-  		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			// Users deletion is NOT allowed in demo mode
-			$oDeletionPlan->AddToDelete($this, null);
-			$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
-			$oDeletionPlan->ComputeResults();
-			return false;
-		}
-		return parent::CheckToDelete($oDeletionPlan);
-  	} 
-	
-	protected function DBDeleteSingleObject()
-	{
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			// Users deletion is NOT allowed in demo mode
-			return;
-		}
-		parent::DBDeleteSingleObject();
-	}
-}
-
-/**
- * Abstract class for all types of "internal" authentication i.e. users
- * for which the application is supplied a login and a password opposed
- * to "external" users for whom the authentication is performed outside
- * of the application (by the web server for example).
- * Note that "internal" users do not necessary correspond to a local authentication
- * they may be authenticated by a remote system, like in authent-ldap.
- */
-abstract class UserInternal extends User
-{
-	// Nothing special, just a base class to categorize this type of authenticated users	
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "login",
-			"state_attcode" => "",
-			"reconc_keys" => array('login'),
-			"db_table" => "priv_internaluser",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// When set, this token allows for password reset
-		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("reset_pwd_token", array("allowed_values"=>null, "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'status', 'language', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
-	}
-
-	/**
-	 * Use with care!
-	 */	 	
-	public function SetPassword($sNewPassword)
-	{
-	}
-
-	/**
-	 * The email recipient is the person who is allowed to regain control when the password gets lost	
-	 * Throws an exception if the feature cannot be available
-	 */	
-	public function GetResetPasswordEmail()
-	{
-		if (!MetaModel::IsValidAttCode(get_class($this), 'contactid'))
-		{
-			throw new Exception(Dict::S('UI:ResetPwd-Error-NoContact'));
-		}
-		$iContactId = $this->Get('contactid');
-		if ($iContactId == 0)
-		{
-			throw new Exception(Dict::S('UI:ResetPwd-Error-NoContact'));
-		}
-		$oContact = MetaModel::GetObject('Contact', $iContactId);
-		// Determine the email attribute (the first one will be our choice)
-		foreach (MetaModel::ListAttributeDefs(get_class($oContact)) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeEmailAddress)
-			{
-				$sEmailAttCode = $sAttCode;
-				// we've got one, exit the loop
-				break;
-			}
-		}
-		if (!isset($sEmailAttCode))
-		{
-			throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmailAtt'));
-		}
-		$sRes = trim($oContact->Get($sEmailAttCode));
-		return $sRes;
-	}
-}
-
-/**
- * Self register extension  
- *
- * @package     iTopORM
- */
-interface iSelfRegister
-{
-	/**
-	 * Called when no user is found in iTop for the corresponding 'name'. This method
-	 * can create/synchronize the User in iTop with an external source (such as AD/LDAP) on the fly
-	 * @param string $sName The typed-in user name
-	 * @param string $sPassword The typed-in password
-	 * @param string $sLoginMode The login method used (cas|form|basic|url)
-	 * @param string $sAuthentication The authentication method used (any|internal|external)
-	 * @return bool true if the user is a valid one, false otherwise
-	 */
-	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
-	
-	/**
-	 * Called after the user has been authenticated and found in iTop. This method can
-	 * Update the user's definition on the fly (profiles...) to keep it in sync with an external source 
-	 * @param User $oUser The user to update/synchronize
-	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
-	 * @param string $sAuthentication The authentication method used
-	 * @return void
-	 */
-	public static function UpdateUser(User $oUser, $sLoginMode, $sAuthentication);
-}
-
-/**
- * User management core API  
- *
- * @package     iTopORM
- */
-class UserRights
-{
-	/** @var UserRightsAddOnAPI $m_oAddOn */
-	protected static $m_oAddOn;
-	protected static $m_oUser;
-	protected static $m_oRealUser;
-	protected static $m_sSelfRegisterAddOn = null;
-
-	public static function SelectModule($sModuleName)
-	{
-		if (!class_exists($sModuleName))
-		{
-			throw new CoreException("Could not select this module, '$sModuleName' in not a valid class name");
-			return;
-		}
-		if (!is_subclass_of($sModuleName, 'UserRightsAddOnAPI'))
-		{
-			throw new CoreException("Could not select this module, the class '$sModuleName' is not derived from UserRightsAddOnAPI");
-			return;
-		}
-		self::$m_oAddOn = new $sModuleName;
-		self::$m_oAddOn->Init();
-		self::$m_oUser = null;
-		self::$m_oRealUser = null;
-	}
-
-	public static function SelectSelfRegister($sModuleName)
-	{
-		if (!class_exists($sModuleName))
-		{
-			throw new CoreException("Could not select the class, '$sModuleName' for self register, is not a valid class name");
-		}
-		self::$m_sSelfRegisterAddOn = $sModuleName;
-	}
-
-	public static function GetModuleInstance()
-	{
-		return self::$m_oAddOn;
-	}
-
-	// Installation: create the very first user
-	public static function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
-	{
-		$bRes = self::$m_oAddOn->CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage);
-		self::FlushPrivileges(true /* reset admin cache */);
-		return $bRes;
-	}
-	
-	public static function IsLoggedIn()
-	{
-		if (self::$m_oUser == null)
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}	
-	}
-
-	public static function Login($sName, $sAuthentication = 'any')
-	{
-		$oUser = self::FindUser($sName, $sAuthentication);
-		if (is_null($oUser))
-		{
-			return false;
-		}
-		self::$m_oUser = $oUser;
-
-		if (isset($_SESSION['impersonate_user']))
-		{
-			self::$m_oRealUser = self::$m_oUser;
-			self::$m_oUser = self::FindUser($_SESSION['impersonate_user']);
-		}
-
-		Dict::SetUserLanguage(self::GetUserLanguage());
-		return true;
-	}
-
-	public static function CheckCredentials($sName, $sPassword, $sLoginMode = 'form', $sAuthentication = 'any')
-	{
-		$oUser = self::FindUser($sName, $sAuthentication);
-		if (is_null($oUser))
-		{
-			// Check if the user does not exist at all or if it is just disabled
-			if (self::FindUser($sName, $sAuthentication, true) == null)
-			{
-				// User does not exist at all
-				return self::CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
-			}
-			else
-			{
-				// User is actually disabled
-				return  false;
-			}
-		}
-
-		if (!$oUser->CheckCredentials($sPassword))
-		{
-			return false;
-		}
-		self::UpdateUser($oUser, $sLoginMode, $sAuthentication);
-		return true;
-	}
-	
-	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication)
-	{
-		if (self::$m_sSelfRegisterAddOn != null)
-		{
-			return call_user_func(array(self::$m_sSelfRegisterAddOn, 'CheckCredentialsAndCreateUser'), $sName, $sPassword, $sLoginMode, $sAuthentication);
-		}
-	}
-
-	public static function UpdateUser($oUser, $sLoginMode, $sAuthentication)
-	{
-		if (self::$m_sSelfRegisterAddOn != null)
-		{
-			call_user_func(array(self::$m_sSelfRegisterAddOn, 'UpdateUser'), $oUser, $sLoginMode, $sAuthentication);
-		}
-	}
-	
-	public static function TrustWebServerContext()
-	{
-		if (!is_null(self::$m_oUser))
-		{
- 			return self::$m_oUser->TrustWebServerContext();
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Tells whether or not the archive mode is allowed to the current user
-	 * @return boolean
-	 */
-	static function CanBrowseArchive()
-	{
-		if (is_null(self::$m_oUser))
-		{
-			$bRet = false;
-		}
-		elseif (isset($_SESSION['archive_allowed']))
-		{
-			$bRet = $_SESSION['archive_allowed'];
-		}
-		else
-		{
-			// As of now, anybody can switch to the archive mode as soon as there is an archivable class
-			$bRet = (count(MetaModel::EnumArchivableClasses()) > 0);
-			$_SESSION['archive_allowed'] = $bRet;
-		}
-		return $bRet;
-	}
-
-	public static function CanChangePassword()
-	{
-		if (MetaModel::DBIsReadOnly())
-		{
-			return false;
-		}
-
-		if (!is_null(self::$m_oUser))
-		{
- 			return self::$m_oUser->CanChangePassword();
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	public static function ChangePassword($sOldPassword, $sNewPassword, $sName = '')
-	{
-		if (empty($sName))
-		{
-			$oUser = self::$m_oUser;
-		}
-		else
-		{
-			// find the id out of the login string
-			$oUser = self::FindUser($sName);
-		}
-		if (is_null($oUser))
-		{
-			return false;
-		}
-		else
-		{
-			$oUser->AllowWrite(true);
-			return $oUser->ChangePassword($sOldPassword, $sNewPassword);
-		}
-	}
-
-	/**
-	 * @param string $sName Login identifier of the user to impersonate
-	 * @return bool True if an impersonation occurred
-	 */
-	public static function Impersonate($sName)
-	{
-		if (!self::CheckLogin()) return false;
-
-		$bRet = false;
-		$oUser = self::FindUser($sName);
-		if ($oUser)
-		{
-			$bRet = true;
-			if (is_null(self::$m_oRealUser))
-			{
-				// First impersonation
-				self::$m_oRealUser = self::$m_oUser;
-			}
-			if (self::$m_oRealUser && (self::$m_oRealUser->GetKey() == $oUser->GetKey()))
-			{
-				// Equivalent to "Deimpersonate"
-				self::Deimpersonate();
-			}
-			else
-			{
-				// Do impersonate!
-				self::$m_oUser = $oUser;
-				Dict::SetUserLanguage(self::GetUserLanguage());
-				$_SESSION['impersonate_user'] = $sName;
-				self::_ResetSessionCache();
-			}
-		}
-		return $bRet;
-	}
-
-	public static function Deimpersonate()
-	{
-		if (!is_null(self::$m_oRealUser))
-		{
-			self::$m_oUser = self::$m_oRealUser;
-			Dict::SetUserLanguage(self::GetUserLanguage());
-			unset($_SESSION['impersonate_user']);
-			self::_ResetSessionCache();
-		}
-	}
-
-	public static function GetUser()
-	{
-		if (is_null(self::$m_oUser))
-		{
-			return '';
-		}
-		else
-		{
-			return self::$m_oUser->Get('login');
-		}
-	}
-
-	public static function GetUserObject()
-	{
-		if (is_null(self::$m_oUser))
-		{
-			return null;
-		}
-		else
-		{
-			return self::$m_oUser;
-		}
-	}
-	
-	public static function GetUserLanguage()
-	{
-		if (is_null(self::$m_oUser))
-		{
-			return 'EN US';
-		
-		}
-		else
-		{
-			return self::$m_oUser->Get('language');
-		}
-	}
-
-	public static function GetUserId($sName = '')
-	{
-		if (empty($sName))
-		{
-			// return current user id
-			if (is_null(self::$m_oUser))
-			{
-				return null;
-			}
-			return self::$m_oUser->GetKey();
-		}
-		else
-		{
-			// find the id out of the login string
-			$oUser = self::$m_oAddOn->FindUser($sName);
-			if (is_null($oUser))
-			{
-				return null;
-			}
-			return $oUser->GetKey();
-		}
-	}
-
-	public static function GetContactId($sName = '')
-	{
-		if (empty($sName))
-		{
-			$oUser = self::$m_oUser;
-		}
-		else
-		{
-			$oUser = FindUser($sName);
-		}
-		if (is_null($oUser))
-		{
-			return '';
-		}
-		if (!MetaModel::IsValidAttCode(get_class($oUser), 'contactid'))
-		{
-			return '';
-		}
-		return $oUser->Get('contactid');
-	}
-
-	public static function GetContactObject()
-	{
-		if (is_null(self::$m_oUser))
-		{
-			return null;
-		}
-		else
-		{
-			return self::$m_oUser->GetContactObject();
-		}
-	}
-
-	// Render the user name in best effort mode
-	public static function GetUserFriendlyName($sName = '')
-	{
-		if (empty($sName))
-		{
-			$oUser = self::$m_oUser;
-		}
-		else
-		{
-			$oUser = FindUser($sName);
-		}
-		if (is_null($oUser))
-		{
-			return '';
-		}
-		return $oUser->GetFriendlyName();
-	}
-
-	public static function IsImpersonated()
-	{
-		if (is_null(self::$m_oRealUser))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	public static function GetRealUser()
-	{
-		if (is_null(self::$m_oRealUser))
-		{
-			return '';
-		}
-		return self::$m_oRealUser->Get('login');
-	}
-
-	public static function GetRealUserObject()
-	{
-		return self::$m_oRealUser;
-	}
-
-	public static function GetRealUserId()
-	{
-		if (is_null(self::$m_oRealUser))
-		{
-			return '';
-		}
-		return self::$m_oRealUser->GetKey();
-	}
-
-	public static function GetRealUserFriendlyName()
-	{
-		if (is_null(self::$m_oRealUser))
-		{
-			return '';
-		}
-		return self::$m_oRealUser->GetFriendlyName();
-	}
-
-	protected static function CheckLogin()
-	{
-		if (!self::IsLoggedIn())
-		{
-			//throw new UserRightException('No user logged in', array());	
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Add additional filter for organization silos to all the requests.
-	 *
-	 * @param $sClass
-	 * @param array $aSettings
-	 *
-	 * @return bool|\Expression
-	 */
-	public static function GetSelectFilter($sClass, $aSettings = array())
-	{
-		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) {return true;}
-
-		if (self::IsAdministrator()) {return true;}
-
-		try
-		{
-			// Check Bug 1436 for details
-			if (MetaModel::HasCategory($sClass, 'bizmodel'))
-			{
-				return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings);
-			}
-			else
-			{
-				return true;
-			}
-		} catch (Exception $e)
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $sClass
-	 * @param int $iActionCode
-	 * @param DBObjectSet $oInstanceSet
-	 * @param User $oUser
-	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO|UR_ALLOWED_DEPENDS)
-	 */
-	public static function IsActionAllowed($sClass, $iActionCode, /*dbObjectSet*/$oInstanceSet = null, $oUser = null)
-	{
-		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) return UR_ALLOWED_YES;
-
-		if (MetaModel::DBIsReadOnly())
-		{
-			if ($iActionCode == UR_ACTION_CREATE) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
-		}
-
-		$aPredefinedObjects = call_user_func(array($sClass, 'GetPredefinedObjects'));
-		if ($aPredefinedObjects != null)
-		{
-			// As opposed to the read-only DB, modifying an object is allowed
-			// (the constant columns will be marked as read-only)
-			//
-			if ($iActionCode == UR_ACTION_CREATE) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
-		}
-
-		if (self::IsAdministrator($oUser)) return UR_ALLOWED_YES;
-
-		if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile'))
-		{
-			if (is_null($oUser))
-			{
-				$oUser = self::$m_oUser;
-			}
-			if ($iActionCode == UR_ACTION_CREATE)
-			{
-				// The addons currently DO NOT handle the case "CREATE"
-				// Therefore it is considered to be equivalent to "MODIFY"
-				$iActionCode = UR_ACTION_MODIFY;
-			}
-			return self::$m_oAddOn->IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet);
-		}
-		elseif(($iActionCode == UR_ACTION_READ) && MetaModel::HasCategory($sClass, 'view_in_gui'))
-		{
-			return UR_ALLOWED_YES;
-		}
-		else
-		{
-			// Other classes could be edited/listed by the administrators
-			return UR_ALLOWED_NO;
-		}
-	}
-
-	public static function IsStimulusAllowed($sClass, $sStimulusCode, /*dbObjectSet*/ $oInstanceSet = null, $oUser = null)
-	{
-		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) return true;
-
-		if (MetaModel::DBIsReadOnly())
-		{
-			return false;
-		}
-
-		if (self::IsAdministrator($oUser)) return true;
-
-		if (MetaModel::HasCategory($sClass, 'bizmodel'))
-		{
-			if (is_null($oUser))
-			{
-				$oUser = self::$m_oUser;
-			}
-			return self::$m_oAddOn->IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet);
-		}
-		else
-		{
-			// Other classes could be edited/listed by the administrators
-			return false;
-		}
-	}
-
-	/**
-	 * @param string $sClass
-	 * @param string $sAttCode
-	 * @param int $iActionCode
-	 * @param DBObjectSet $oInstanceSet
-	 * @param User $oUser
-	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO)
-	 */
-	public static function IsActionAllowedOnAttribute($sClass, $sAttCode, $iActionCode, /*dbObjectSet*/$oInstanceSet = null, $oUser = null)
-	{
-		// When initializing, we need to let everything pass trough
-		if (!self::CheckLogin()) return UR_ALLOWED_YES;
-
-		if (MetaModel::DBIsReadOnly())
-		{
-			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
-			if ($iActionCode == UR_ACTION_BULK_MODIFY) return falUR_ALLOWED_NOse;
-			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
-		}
-
-		if (self::IsAdministrator($oUser)) return UR_ALLOWED_YES;
-
-		if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile'))
-		{
-			if (is_null($oUser))
-			{
-				$oUser = self::$m_oUser;
-			}
-			return self::$m_oAddOn->IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet);
-		}
-
-		// this module is forbidden for non admins
-		if (MetaModel::HasCategory($sClass, 'addon/userrights')) return UR_ALLOWED_NO;
-
-		// the rest is allowed
-		return UR_ALLOWED_YES;
-
-
-	}
-
-	protected static $m_aAdmins = array();
-	public static function IsAdministrator($oUser = null)
-	{
-		if (!self::CheckLogin()) return false;
-
-		if (is_null($oUser))
-		{
-			$oUser = self::$m_oUser;
-		}
-		$iUser = $oUser->GetKey();
-		if (!isset(self::$m_aAdmins[$iUser]))
-		{
-			self::$m_aAdmins[$iUser] = self::$m_oAddOn->IsAdministrator($oUser);
-		}
-		return self::$m_aAdmins[$iUser];
-	}
-
-	protected static $m_aPortalUsers = array();
-	public static function IsPortalUser($oUser = null)
-	{
-		if (!self::CheckLogin()) return false;
-
-		if (is_null($oUser))
-		{
-			$oUser = self::$m_oUser;
-		}
-		$iUser = $oUser->GetKey();
-		if (!isset(self::$m_aPortalUsers[$iUser]))
-		{
-			self::$m_aPortalUsers[$iUser] = self::$m_oAddOn->IsPortalUser($oUser);
-		}
-		return self::$m_aPortalUsers[$iUser];
-	}
-
-	public static function GetAllowedPortals()
-    {
-        $aAllowedPortals = array();
-        $aPortalsConf = PortalDispatcherData::GetData();
-        $aDispatchers = array();
-        foreach ($aPortalsConf as $sPortalId => $aConf)
-        {
-            $sHandlerClass = $aConf['handler'];
-            $aDispatchers[$sPortalId] = new $sHandlerClass($sPortalId);
-        }
-
-        foreach ($aDispatchers as $sPortalId => $oDispatcher)
-        {
-            if ($oDispatcher->IsUserAllowed())
-            {
-                $aAllowedPortals[] = array(
-                    'id' => $sPortalId,
-                    'label' => $oDispatcher->GetLabel(),
-                    'url' => $oDispatcher->GetUrl(),
-                );
-            }
-        }
-        return $aAllowedPortals;
-    }
-
-    public static function ListProfiles($oUser = null)
-	{
-		if (is_null($oUser))
-		{
-			$oUser = self::$m_oUser;
-		}
-		if ($oUser === null)
-		{
-			// Not logged in: no profile at all
-			$aProfiles = array();
-		}
-		elseif ((self::$m_oUser !== null) && ($oUser->GetKey() == self::$m_oUser->GetKey()))
-		{
-			// Data about the current user can be found into the session data
-			if (array_key_exists('profile_list', $_SESSION))
-			{
-				$aProfiles = $_SESSION['profile_list'];
-			}
-		}
-
-		if (!isset($aProfiles))
-		{
-			$aProfiles = self::$m_oAddOn->ListProfiles($oUser);
-		}
-		return $aProfiles;
-	}
-
-	/**
-	 * @param $sProfileName Profile name to search for
-	 * @param $oUser User|null
-	 * @return bool
-	 */
-	public static function HasProfile($sProfileName, $oUser = null)
-	{
-		$bRet = in_array($sProfileName, self::ListProfiles($oUser));
-		return $bRet;
-	}
-
-	/**
-	 * Reset cached data
-	 * @param Bool Reset admin cache as well
-	 * @return void
-	 */
-	// Reset cached data
-	//
-	public static function FlushPrivileges($bResetAdminCache = false)
-	{
-		if ($bResetAdminCache)
-		{
-			self::$m_aAdmins = array();
-			self::$m_aPortalUsers = array();
-		}
-		if (!isset($_SESSION) && !utils::IsModeCLI())
-		{
-			session_name('itop-'.md5(APPROOT));
-			session_start();
-		}
-		self::_ResetSessionCache();
-		if (self::$m_oAddOn)
-		{
-			self::$m_oAddOn->FlushPrivileges();
-		}
-	}
-
-	static $m_aCacheUsers;
-	/**
-	 * Find a user based on its login and its type of authentication
-	 * @param string $sLogin Login/identifier of the user
-	 * @param string $sAuthentication Type of authentication used: internal|external|any
-	 * @param bool $bAllowDisabledUsers Whether or not to retrieve disabled users (status != enabled)
-	 * @return User The found user or null
-	 */
-	protected static function FindUser($sLogin, $sAuthentication = 'any', $bAllowDisabledUsers = false)
-	{
-		if ($sAuthentication == 'any')
-		{
-			$oUser = self::FindUser($sLogin, 'internal');
-			if ($oUser == null)
-			{
-				$oUser = self::FindUser($sLogin, 'external');
-			}
-		}
-		else
-		{
-			if (!isset(self::$m_aCacheUsers))
-			{
-				self::$m_aCacheUsers = array('internal' => array(), 'external' => array());
-			}
-			
-			if (!isset(self::$m_aCacheUsers[$sAuthentication][$sLogin]))
-			{
-				switch($sAuthentication)
-				{
-					case 'external':
-					$sBaseClass = 'UserExternal';
-					break;
-					
-					case 'internal':
-					$sBaseClass = 'UserInternal';
-					break;
-					
-					default:
-					echo "<p>sAuthentication = $sAuthentication</p>\n";
-					assert(false); // should never happen
-				}
-				$oSearch = DBObjectSearch::FromOQL("SELECT $sBaseClass WHERE login = :login");
-				if (!$bAllowDisabledUsers)
-				{
-					$oSearch->AddCondition('status', 'enabled');
-				}
-				$oSet = new DBObjectSet($oSearch, array(), array('login' => $sLogin));
-				$oUser = $oSet->fetch();
-				self::$m_aCacheUsers[$sAuthentication][$sLogin] = $oUser;
-			}
-			$oUser = self::$m_aCacheUsers[$sAuthentication][$sLogin];
-		}
-		return $oUser;
-	}
-
-	public static function MakeSelectFilter($sClass, $aAllowedOrgs, $aSettings = array(), $sAttCode = null)
-	{
-		return self::$m_oAddOn->MakeSelectFilter($sClass, $aAllowedOrgs, $aSettings, $sAttCode);
-	}
-
-	public static function _InitSessionCache()
-	{
-		// Cache data about the current user into the session
-		if (isset($_SESSION))
-		{
-			$_SESSION['profile_list'] = self::ListProfiles();
-		}
-	}
-
-	public static function _ResetSessionCache()
-	{
-		if (isset($_SESSION['profile_list']))
-		{
-			unset($_SESSION['profile_list']);
-		}
-		if (isset($_SESSION['archive_allowed']))
-		{
-			unset($_SESSION['archive_allowed']);
-		}
-	}
-}
-
-/**
- * Helper class to get the number/list of items for which a given action is allowed/possible
- */
-class ActionChecker
-{
-	var $oFilter;
-	var $iActionCode;
-	var $iAllowedCount = null;
-	var $aAllowedIDs = null;
-	
-	public function __construct(DBSearch $oFilter, $iActionCode)
-	{
-		$this->oFilter = $oFilter;
-		$this->iActionCode = $iActionCode;
-		$this->iAllowedCount = null;
-		$this->aAllowedIDs = null;
-	}
-	
-	/**
-	 * returns the number of objects for which the action is allowed
-	 * @return integer The number of "allowed" objects 0..N
-	 */
-	public function GetAllowedCount()
-	{
-		if ($this->iAllowedCount == null) $this->CheckObjects();
-		return $this->iAllowedCount;
-	}
-	
-	/**
-	 * If IsAllowed returned UR_ALLOWED_DEPENDS, this methods returns
-	 * an array of ObjKey => Status (true|false)
-	 * @return array
-	 */
-	public function GetAllowedIDs()
-	{
-		if ($this->aAllowedIDs == null) $this->IsAllowed();
-		return $this->aAllowedIDs;
-	}
-	
-	/**
-	 * Check if the speficied stimulus is allowed for the set of objects
-	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
-	 */
-	public function IsAllowed()
-	{
-		$sClass = $this->oFilter->GetClass();
-		$oSet = new DBObjectSet($this->oFilter);
-		$iActionAllowed = UserRights::IsActionAllowed($sClass, $this->iActionCode, $oSet);
-		if ($iActionAllowed == UR_ALLOWED_DEPENDS)
-		{
-			// Check for each object if the action is allowed or not
-			$this->aAllowedIDs = array();
-			$oSet->Rewind();
-			$this->iAllowedCount = 0;
-			while($oObj = $oSet->Fetch())
-			{
-				$oObjSet = DBObjectSet::FromArray($sClass, array($oObj));
-				if (UserRights::IsActionAllowed($sClass, $this->iActionCode, $oObjSet) == UR_ALLOWED_NO)
-				{
-					$this->aAllowedIDs[$oObj->GetKey()] = false;
-				}
-				else
-				{
-					// Assume UR_ALLOWED_YES, since there is just one object !
-					$this->aAllowedIDs[$oObj->GetKey()] = true;
-					$this->iAllowedCount++;
-				}
-			}
-		}
-		else if ($iActionAllowed == UR_ALLOWED_YES)
-		{
-			$this->iAllowedCount = $oSet->Count();
-			$this->aAllowedIDs = array(); // Optimization: not filled when Ok for all objects
-		}
-		else // UR_ALLOWED_NO
-		{
-			$this->iAllowedCount = 0;
-			$this->aAllowedIDs = array();
-		}
-		return $iActionAllowed;
-	}
-}
-
-/**
- * Helper class to get the number/list of items for which a given stimulus can be applied (allowed & possible)
- */
-class StimulusChecker extends ActionChecker
-{
-	var $sState = null;
-	
-	public function __construct(DBSearch $oFilter, $sState, $iStimulusCode)
-	{
-		parent::__construct($oFilter, $iStimulusCode);
-		$this->sState = $sState;
-	}
-
-	/**
-	 * Check if the speficied stimulus is allowed for the set of objects
-	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
-	 */
-	public function IsAllowed()
-	{
-		$sClass = $this->oFilter->GetClass();
-		if (MetaModel::IsAbstract($sClass)) return UR_ALLOWED_NO; // Safeguard, not implemented if the base class of the set is abstract !
-		
-		$oSet = new DBObjectSet($this->oFilter);
-		$iActionAllowed = UserRights::IsStimulusAllowed($sClass,  $this->iActionCode, $oSet);
-		if ($iActionAllowed == UR_ALLOWED_NO)
-		{
-			$this->iAllowedCount = 0;
-			$this->aAllowedIDs = array();
-		}
-		else // Even if UR_ALLOWED_YES, we need to check if each object is in the appropriate state
-		{
-			// Hmmm, may not be needed right now because we limit the "multiple" action to object in
-			// the same state... may be useful later on if we want to extend this behavior...
-			
-			// Check for each object if the action is allowed or not
-			$this->aAllowedIDs = array();
-			$oSet->Rewind();
-			$iAllowedCount = 0;
-			$iActionAllowed = UR_ALLOWED_DEPENDS;
-			while($oObj = $oSet->Fetch())
-			{
-				$aTransitions = $oObj->EnumTransitions();
-				if (array_key_exists($this->iActionCode, $aTransitions))
-				{
-					// Temporary optimization possible: since the current implementation
-					// of IsActionAllowed does not perform a 'per instance' check, we could
-					// skip this second validation phase and assume it would return UR_ALLOWED_YES
-					$oObjSet = DBObjectSet::FromArray($sClass, array($oObj));
-					if (!UserRights::IsStimulusAllowed($sClass, $this->iActionCode, $oObjSet))
-					{
-						$this->aAllowedIDs[$oObj->GetKey()] = false;
-					}
-					else
-					{
-						// Assume UR_ALLOWED_YES, since there is just one object !
-						$this->aAllowedIDs[$oObj->GetKey()] = true;
-						$this->iState = $oObj->GetState();
-						$this->iAllowedCount++;
-					}					
-				}
-				else
-				{
-					$this->aAllowedIDs[$oObj->GetKey()] = false;					
-				}				
-			}
-		}
-		
-		if ($this->iAllowedCount == $oSet->Count())
-		{
-			$iActionAllowed = UR_ALLOWED_YES;
-		}
-		if ($this->iAllowedCount == 0)
-		{
-			$iActionAllowed = UR_ALLOWED_NO;
-		}
-
-		return $iActionAllowed;
-	}
-	
-	public function GetState()
-	{
-		return $this->iState;
-	}		
-}
-
-/**
- * Self-register extension to allow the automatic creation & update of CAS users
- * 
- * @package iTopORM
- *
- */
-class CAS_SelfRegister implements iSelfRegister
-{
-	/**
-	 * Called when no user is found in iTop for the corresponding 'name'. This method
-	 * can create/synchronize the User in iTop with an external source (such as AD/LDAP) on the fly
-	 * @param string $sName The CAS authenticated user name
-	 * @param string $sPassword Ignored
-	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
-	 * @param string $sAuthentication The authentication method used
-	 * @return bool true if the user is a valid one, false otherwise
-	 */
-	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication)
-	{
-		$bOk = true;
-		if ($sLoginMode != 'cas') return false; // Must be authenticated via CAS
-
-		$sCASMemberships = MetaModel::GetConfig()->Get('cas_memberof');
-		$bFound =  false;
-		if (!empty($sCASMemberships))
-		{
-			if (phpCAS::hasAttribute('memberOf'))
-			{
-				// A list of groups is specified, the user must a be member of (at least) one of them to pass
-				$aCASMemberships = array();
-				$aTmp = explode(';', $sCASMemberships);
-				setlocale(LC_ALL, "en_US.utf8"); // !!! WARNING: this is needed to have  the iconv //TRANSLIT working fine below !!!
-				foreach($aTmp as $sGroupName)
-				{
-					$aCASMemberships[] = trim(iconv('UTF-8', 'ASCII//TRANSLIT', $sGroupName)); // Just in case remove accents and spaces...
-				}
-
-				$aMemberOf = phpCAS::getAttribute('memberOf');
-				if (!is_array($aMemberOf)) $aMemberOf = array($aMemberOf); // Just one entry, turn it into an array
-				$aFilteredGroupNames = array();
-				foreach($aMemberOf as $sGroupName)
-				{
-					phpCAS::log("Info: user if a member of the group: ".$sGroupName);
-					$sGroupName = trim(iconv('UTF-8', 'ASCII//TRANSLIT', $sGroupName)); // Remove accents and spaces as well
-					$aFilteredGroupNames[] = $sGroupName;
-					$bIsMember = false;
-					foreach($aCASMemberships as $sCASPattern)
-					{
-						if (self::IsPattern($sCASPattern))
-						{
-							if (preg_match($sCASPattern, $sGroupName))
-							{
-								$bIsMember = true;
-								break;
-							}
-						}
-						else if ($sCASPattern == $sGroupName)
-						{
-							$bIsMember = true;
-							break;
-						}
-					}
-					if ($bIsMember)
-					{
-						$bCASUserSynchro = MetaModel::GetConfig()->Get('cas_user_synchro');
-						if ($bCASUserSynchro)
-						{
-							// If needed create a new user for this email/profile
-							phpCAS::log('Info: cas_user_synchro is ON');
-							$bOk = self::CreateCASUser(phpCAS::getUser(), $aMemberOf);
-							if($bOk)
-							{
-								$bFound = true;
-							}
-							else
-							{
-								phpCAS::log("User ".phpCAS::getUser()." cannot be created in iTop. Logging off...");
-							}
-						}
-						else
-						{
-							phpCAS::log('Info: cas_user_synchro is OFF');
-							$bFound = true;
-						}
-						break;
-					}	
-				}
-				if($bOk && !$bFound)
-				{
-					phpCAS::log("User ".phpCAS::getUser().", none of his/her groups (".implode('; ', $aFilteredGroupNames).") match any of the required groups: ".implode('; ', $aCASMemberships));
-				}
-			}
-			else
-			{
-				// Too bad, the user is not part of any of the group => not allowed
-				phpCAS::log("No 'memberOf' attribute found for user ".phpCAS::getUser().". Are you using the SAML protocol (S1) ?");
-			}
-		}
-		else
-		{
-			// No membership: no way to create the user that should exist prior to authentication
-			phpCAS::log("User ".phpCAS::getUser().": missing user account in iTop (or iTop badly configured, Cf setting cas_memberof)");
-			$bFound = false;
-		}
-		
-		if (!$bFound)
-		{
-			// The user is not part of the allowed groups, => log out
-			$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
-			$sCASLogoutUrl = MetaModel::GetConfig()->Get('cas_logout_redirect_service');
-			if (empty($sCASLogoutUrl))
-			{
-				$sCASLogoutUrl = $sUrl;
-			}
-			phpCAS::logoutWithRedirectService($sCASLogoutUrl); // Redirects to the CAS logout page
-			// Will never return !			
-		}
-		return $bFound;
-	}
-	
-	/**
-	 * Called after the user has been authenticated and found in iTop. This method can
-	 * Update the user's definition (profiles...) on the fly to keep it in sync with an external source 
-	 * @param User $oUser The user to update/synchronize
-	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
-	 * @param string $sAuthentication The authentication method used
-	 * @return void
-	 */
-	public static function UpdateUser(User $oUser, $sLoginMode, $sAuthentication)
-	{
-		$bCASUpdateProfiles = MetaModel::GetConfig()->Get('cas_update_profiles');
-		if (($sLoginMode == 'cas') && $bCASUpdateProfiles && (phpCAS::hasAttribute('memberOf')))
-		{
-			$aMemberOf = phpCAS::getAttribute('memberOf');
-			if (!is_array($aMemberOf)) $aMemberOf = array($aMemberOf); // Just one entry, turn it into an array
-			
-			return self::SetProfilesFromCAS($oUser, $aMemberOf);
-		}
-		// No groups defined in CAS or not CAS at all: do nothing...
-		return true;
-	}
-	
-	/**
-	 * Helper method to create a CAS based user
-	 * @param string $sEmail
-	 * @param array $aGroups
-	 * @return bool true on success, false otherwise
-	 */
-	protected static function CreateCASUser($sEmail, $aGroups)
-	{
-		if (!MetaModel::IsValidClass('URP_Profiles'))
-		{
-			phpCAS::log("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
-			return false;
-		}
-				
-		$oUser = MetaModel::GetObjectByName('UserExternal', $sEmail, false);
-		if ($oUser == null)
-		{
-			// Create the user, link it to a contact
-			phpCAS::log("Info: the user '$sEmail' does not exist. A new UserExternal will be created.");
-			$oSearch = new DBObjectSearch('Person');
-			$oSearch->AddCondition('email', $sEmail);
-			$oSet = new DBObjectSet($oSearch);
-			$iContactId = 0;
-			switch($oSet->Count())
-			{
-				case 0:
-				phpCAS::log("Error: found no contact with the email: '$sEmail'. Cannot create the user in iTop.");
-				return false;
-
-				case 1:
-				$oContact = $oSet->Fetch();
-				$iContactId = $oContact->GetKey();
-				phpCAS::log("Info: Found 1 contact '".$oContact->GetName()."' (id=$iContactId) corresponding to the email '$sEmail'.");
-				break;
-
-				default:
-				phpCAS::log("Error: ".$oSet->Count()." contacts have the same email: '$sEmail'. Cannot create a user for this email.");
-				return false;
-			}
-			
-			$oUser = new UserExternal();
-			$oUser->Set('login', $sEmail);
-			$oUser->Set('contactid', $iContactId);
-			$oUser->Set('language', MetaModel::GetConfig()->GetDefaultLanguage());
-		}
-		else
-		{
-			phpCAS::log("Info: the user '$sEmail' already exists (id=".$oUser->GetKey().").");
-		}
-
-		// Now synchronize the profiles
-		if (!self::SetProfilesFromCAS($oUser, $aGroups))
-		{
-			return false;
-		}
-		else 
-		{
-			if ($oUser->IsNew() || $oUser->IsModified())
-			{
-				$oMyChange = MetaModel::NewObject("CMDBChange");
-				$oMyChange->Set("date", time());
-				$oMyChange->Set("userinfo", 'CAS/LDAP Synchro');
-				$oMyChange->DBInsert();
-				if ($oUser->IsNew())
-				{
-					$oUser->DBInsertTracked($oMyChange);
-				}
-				else
-				{
-					$oUser->DBUpdateTracked($oMyChange);
-				}
-			}
-			
-			return true;
-		}
-	}
-	
-	protected static function SetProfilesFromCAS($oUser, $aGroups)
-	{
-		if (!MetaModel::IsValidClass('URP_Profiles'))
-		{
-			phpCAS::log("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
-			return false;
-		}
-		
-		// read all the existing profiles
-		$oProfilesSearch = new DBObjectSearch('URP_Profiles');
-		$oProfilesSet = new DBObjectSet($oProfilesSearch);
-		$aAllProfiles = array();
-		while($oProfile = $oProfilesSet->Fetch())
-		{
-			$aAllProfiles[strtolower($oProfile->GetName())] = $oProfile->GetKey();
-		}
-		
-		// Translate the CAS/LDAP group names into iTop profile names
-		$aProfiles = array();
-		$sPattern = MetaModel::GetConfig()->Get('cas_profile_pattern');
-		foreach($aGroups as $sGroupName)
-		{
-			if (preg_match($sPattern, $sGroupName, $aMatches))
-			{
-				if (array_key_exists(strtolower($aMatches[1]), $aAllProfiles))
-				{
-					$aProfiles[] = $aAllProfiles[strtolower($aMatches[1])];
-					phpCAS::log("Info: Adding the profile '{$aMatches[1]}' from CAS.");
-				}
-				else
-				{
-					phpCAS::log("Warning: {$aMatches[1]} is not a valid iTop profile (extracted from group name: '$sGroupName'). Ignored.");
-				}
-			}
-			else
-			{
-				phpCAS::log("Info: The CAS group '$sGroupName' does not seem to match an iTop pattern. Ignored.");
-			}
-		}
-		if (count($aProfiles) == 0)
-		{
-			phpCAS::log("Info: The user '".$oUser->GetName()."' has no profiles retrieved from CAS. Default profile(s) will be used.");
-
-			// Second attempt: check if there is/are valid default profile(s)
-			$sCASDefaultProfiles = MetaModel::GetConfig()->Get('cas_default_profiles');
-			$aCASDefaultProfiles = explode(';', $sCASDefaultProfiles);
-			foreach($aCASDefaultProfiles as $sDefaultProfileName)
-			{
-				if (array_key_exists(strtolower($sDefaultProfileName), $aAllProfiles))
-				{
-					$aProfiles[] = $aAllProfiles[strtolower($sDefaultProfileName)];
-					phpCAS::log("Info: Adding the default profile '".$aAllProfiles[strtolower($sDefaultProfileName)]."' from CAS.");
-				}
-				else
-				{
-					phpCAS::log("Warning: the default profile {$sDefaultProfileName} is not a valid iTop profile. Ignored.");
-				}
-			}
-			
-			if (count($aProfiles) == 0)
-			{
-				phpCAS::log("Error: The user '".$oUser->GetName()."' has no profiles in iTop, and therefore cannot be created.");
-				return false;
-			}
-		}
-		
-		// Now synchronize the profiles
-		$oProfilesSet = DBObjectSet::FromScratch('URP_UserProfile');
-		foreach($aProfiles as $iProfileId)
-		{
-			$oLink = new URP_UserProfile();
-			$oLink->Set('profileid', $iProfileId);
-			$oLink->Set('reason', 'CAS/LDAP Synchro');
-			$oProfilesSet->AddObject($oLink);
-		}
-		$oUser->Set('profile_list', $oProfilesSet);
-		phpCAS::log("Info: the user '".$oUser->GetName()."' (id=".$oUser->GetKey().") now has the following profiles: '".implode("', '", $aProfiles)."'.");
-		if ($oUser->IsModified())
-		{
-			$oMyChange = MetaModel::NewObject("CMDBChange");
-			$oMyChange->Set("date", time());
-			$oMyChange->Set("userinfo", 'CAS/LDAP Synchro');
-			$oMyChange->DBInsert();
-			if ($oUser->IsNew())
-			{
-				$oUser->DBInsertTracked($oMyChange);
-			}
-			else
-			{
-				$oUser->DBUpdateTracked($oMyChange);
-			}
-		}
-		
-		return true;
-	}
-	/**
-	 * Helper function to check if the supplied string is a litteral string or a regular expression pattern
-	 * @param string $sCASPattern
-	 * @return bool True if it's a regular expression pattern, false otherwise
-	 */
-	protected static function IsPattern($sCASPattern)
-	{
-		if ((substr($sCASPattern, 0, 1) == '/') && (substr($sCASPattern, -1) == '/'))
-		{
-			// the string is enclosed by slashes, let's assume it's a pattern
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
-
-// By default enable the 'CAS_SelfRegister' defined above
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * User rights management API
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserRightException extends CoreException
+{
+}
+
+
+define('UR_ALLOWED_NO', 0);
+define('UR_ALLOWED_YES', 1);
+define('UR_ALLOWED_DEPENDS', 2);
+
+define('UR_ACTION_READ', 1); // View an object
+define('UR_ACTION_MODIFY', 2); // Create/modify an object/attribute
+define('UR_ACTION_DELETE', 3); // Delete an object
+
+define('UR_ACTION_BULK_READ', 4); // Export multiple objects
+define('UR_ACTION_BULK_MODIFY', 5); // Create/modify multiple objects
+define('UR_ACTION_BULK_DELETE', 6); // Delete multiple objects
+
+define('UR_ACTION_CREATE', 7); // Instantiate an object
+
+define('UR_ACTION_APPLICATION_DEFINED', 10000); // Application specific actions (CSV import, View schema...)
+
+/**
+ * User management module API  
+ *
+ * @package     iTopORM
+ */
+abstract class UserRightsAddOnAPI
+{
+	abstract public function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US'); // could be used during initial installation
+
+	abstract public function Init(); // loads data (possible optimizations)
+
+	// Used to build select queries showing only objects visible for the given user
+	abstract public function GetSelectFilter($sLogin, $sClass, $aSettings = array()); // returns a filter object
+
+	abstract public function IsActionAllowed($oUser, $sClass, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null);
+	abstract public function IsStimulusAllowed($oUser, $sClass, $sStimulusCode, /*dbObjectSet*/ $oInstanceSet = null);
+	abstract public function IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, /*dbObjectSet*/ $oInstanceSet = null);
+	abstract public function IsAdministrator($oUser);
+	abstract public function IsPortalUser($oUser);
+	abstract public function FlushPrivileges();
+
+
+	/**
+	 * Default behavior for addons that do not support profiles
+	 *
+	 * @param $oUser User
+	 * @return array
+	 */
+	public function ListProfiles($oUser)
+	{
+		return array();
+	}
+
+	/**
+	 *	...
+	 */
+	public function MakeSelectFilter($sClass, $aAllowedOrgs, $aSettings = array(), $sAttCode = null)
+	{
+		if ($sAttCode == null)
+		{
+			$sAttCode = $this->GetOwnerOrganizationAttCode($sClass);
+		}
+		if (empty($sAttCode))
+		{
+			return $oFilter  = new DBObjectSearch($sClass);
+		}
+
+		$oExpression = new FieldExpression($sAttCode, $sClass);
+		$oFilter  = new DBObjectSearch($sClass);
+		$oListExpr = ListExpression::FromScalars($aAllowedOrgs);
+		
+		$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
+		$oFilter->AddConditionExpression($oCondition);
+
+		if ($this->HasSharing())
+		{
+			if (($sAttCode == 'id') && isset($aSettings['bSearchMode']) && $aSettings['bSearchMode'])
+			{
+				// Querying organizations (or derived)
+				// and the expected list of organizations will be used as a search criteria
+				// Therefore the query can also return organization having objects shared with the allowed organizations
+				//
+				// 1) build the list of organizations sharing something with the allowed organizations
+				// Organization <== sharing_org_id == SharedObject having org_id IN {user orgs}
+				$oShareSearch = new DBObjectSearch('SharedObject');
+				$oOrgField = new FieldExpression('org_id', 'SharedObject');
+				$oShareSearch->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
+	
+				$oSearchSharers = new DBObjectSearch('Organization');
+				$oSearchSharers->AllowAllData();
+				$oSearchSharers->AddCondition_ReferencedBy($oShareSearch, 'sharing_org_id');
+				$aSharers = array();
+				foreach($oSearchSharers->ToDataArray(array('id')) as $aRow)
+				{
+					$aSharers[] = $aRow['id'];
+				}
+				// 2) Enlarge the overall results: ... OR id IN(id1, id2, id3)
+				if (count($aSharers) > 0)
+				{
+					$oSharersList = ListExpression::FromScalars($aSharers);
+					$oFilter->MergeConditionExpression(new BinaryExpression($oExpression, 'IN', $oSharersList));
+				}
+			}
+	
+			$aShareProperties = SharedObject::GetSharedClassProperties($sClass);
+			if ($aShareProperties)
+			{
+				$sShareClass = $aShareProperties['share_class'];
+				$sShareAttCode = $aShareProperties['attcode'];
+	
+				$oSearchShares = new DBObjectSearch($sShareClass);
+				$oSearchShares->AllowAllData();
+	
+				$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass('Organization');
+				$oOrgField = new FieldExpression('org_id', $sShareClass);
+				$oSearchShares->AddConditionExpression(new BinaryExpression($oOrgField, 'IN', $oListExpr));
+				$aShared = array();
+				foreach($oSearchShares->ToDataArray(array($sShareAttCode)) as $aRow)
+				{
+					$aShared[] = $aRow[$sShareAttCode];
+				}
+				if (count($aShared) > 0)
+				{
+					$oObjId = new FieldExpression('id', $sClass);
+					$oSharedIdList = ListExpression::FromScalars($aShared);
+					$oFilter->MergeConditionExpression(new BinaryExpression($oObjId, 'IN', $oSharedIdList));
+				}
+			}
+		} // if HasSharing
+
+		return $oFilter;
+	}
+}
+
+
+require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+abstract class User extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "login",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_user",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("contactid", array("targetclass"=>"Person", "allowed_values"=>null, "sql"=>"contactid", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("last_name", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("first_name", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"first_name")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("email", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"email")));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("org_id", array("allowed_values"=>null, "extkey_attcode"=> 'contactid', "target_attcode"=>"org_id")));
+
+		MetaModel::Init_AddAttribute(new AttributeString("login", array("allowed_values"=>null, "sql"=>"login", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeApplicationLanguage("language", array("sql"=>"language", "default_value"=>"EN US", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum('enabled,disabled'), "sql"=>"status", "default_value"=>"enabled", "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("profile_list", array("linked_class"=>"URP_UserProfile", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"profileid", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("allowed_org_list", array("linked_class"=>"URP_UserOrg", "ext_key_to_me"=>"userid", "ext_key_to_remote"=>"allowed_org_id", "allowed_values"=>null, "count_min"=>1, "count_max"=>0, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Unused as it's an abstract class !
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'email', 'language', 'status', 'org_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('login', 'contactid', 'org_id')); // Default criteria of the search banner
+	}
+
+	abstract public function CheckCredentials($sPassword);
+	abstract public function TrustWebServerContext();
+	abstract public function CanChangePassword();
+	abstract public function ChangePassword($sOldPassword, $sNewPassword);
+
+	/*
+	* Compute a name in best effort mode
+	*/	
+	public function GetFriendlyName()
+	{
+		if (!MetaModel::IsValidAttCode(get_class($this), 'contactid'))
+		{
+			return $this->Get('login');
+		}
+		if ($this->Get('contactid') != 0)
+		{
+			$sFirstName = $this->Get('first_name');
+			$sLastName = $this->Get('last_name');
+			$sEmail = $this->Get('email');
+			if (strlen($sFirstName) > 0)
+			{
+				return "$sFirstName $sLastName";
+			}
+			elseif (strlen($sEmail) > 0)
+			{
+				return "$sLastName <$sEmail>";
+			}
+			else
+			{
+				return $sLastName;
+			}
+		}
+		return $this->Get('login');
+	}
+
+	protected $oContactObject;
+
+	/**
+	 * Fetch and memorize the associated contact (if any)
+	 */
+	public function GetContactObject()
+	{
+		if (is_null($this->oContactObject))
+		{
+			if (MetaModel::IsValidAttCode(get_class($this), 'contactid') && ($this->Get('contactid') != 0))
+			{
+				$this->oContactObject = MetaModel::GetObject('Contact', $this->Get('contactid'));
+			}
+		}
+		return $this->oContactObject;
+	}
+
+	/**
+	 * Overload the standard behavior.
+	 *
+	 * @throws \CoreException
+	 */
+	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		// Note: This MUST be factorized later: declare unique keys (set of columns) in the data model
+		$aChanges = $this->ListChanges();
+		if (array_key_exists('login', $aChanges))
+		{
+			if (strcasecmp($this->Get('login'), $this->GetOriginal('login')) !== 0)
+			{
+				$sNewLogin = $aChanges['login'];
+				$oSearch = DBObjectSearch::FromOQL_AllData("SELECT User WHERE login = :newlogin");
+				if (!$this->IsNew())
+				{
+					$oSearch->AddCondition('id', $this->GetKey(), '!=');
+				}
+				$oSet = new DBObjectSet($oSearch, array(), array('newlogin' => $sNewLogin));
+				if ($oSet->Count() > 0)
+				{
+					$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:LoginMustBeUnique', $sNewLogin);
+				}
+			}
+		}
+		// Check that this user has at least one profile assigned when profiles have changed
+		if (array_key_exists('profile_list', $aChanges))
+		{
+			$oSet = $this->Get('profile_list');
+			if ($oSet->Count() == 0)
+			{
+				$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneProfileIsNeeded');
+			}
+		}
+		// Only administrators can manage administrators
+		if (UserRights::IsAdministrator($this) && !UserRights::IsAdministrator())
+		{
+			$this->m_aCheckIssues[] = Dict::Format('UI:Login:Error:AccessRestricted');
+		}
+
+		if (!UserRights::IsAdministrator())
+		{
+			$oUser = UserRights::GetUserObject();
+			$oAddon = UserRights::GetModuleInstance();
+			if (!is_null($oUser) && method_exists($oAddon, 'GetUserOrgs'))
+			{
+				$aOrgs = $oAddon->GetUserOrgs($oUser, '');
+				if (count($aOrgs) > 0)
+				{
+					// Check that the modified User belongs to one of our organization
+					if (!in_array($this->GetOriginal('org_id'), $aOrgs) || !in_array($this->Get('org_id'), $aOrgs))
+					{
+						$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:UserOrganizationNotAllowed');
+					}
+					// Check users with restricted organizations when allowed organizations have changed
+					if ($this->IsNew() || array_key_exists('allowed_org_list', $aChanges))
+					{
+						$oSet = $this->get('allowed_org_list');
+						if ($oSet->Count() == 0)
+						{
+							$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:AtLeastOneOrganizationIsNeeded');
+						}
+						else
+						{
+							$aModifiedLinks = $oSet->ListModifiedLinks();
+							foreach($aModifiedLinks as $oLink)
+							{
+								if (!in_array($oLink->Get('allowed_org_id'), $aOrgs))
+								{
+									$this->m_aCheckIssues[] = Dict::Format('Class:User/Error:OrganizationNotAllowed');
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	function GetGrantAsHtml($sClass, $iAction)
+	{
+		if (UserRights::IsActionAllowed($sClass, $iAction, null, $this)) 
+		{
+			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+		}
+		else
+		{
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+		}
+	}
+	
+	function DoShowGrantSumary($oPage, $sClassCategory)
+	{
+		if (UserRights::IsAdministrator($this))
+		{
+			// Looks dirty, but ok that's THE ONE
+			$oPage->p(Dict::S('UI:UserManagement:AdminProfile+'));
+			return;
+		}
+
+		$oKPI = new ExecutionKPI();
+
+		$aDisplayData = array();
+		foreach (MetaModel::GetClasses($sClassCategory) as $sClass)
+		{
+			$aClassStimuli = MetaModel::EnumStimuli($sClass);
+			if (count($aClassStimuli) > 0)
+			{
+				$aStimuli = array();
+				foreach ($aClassStimuli as $sStimulusCode => $oStimulus)
+				{
+					if (UserRights::IsStimulusAllowed($sClass, $sStimulusCode, null, $this))
+					{
+						$aStimuli[] = '<span title="'.$sStimulusCode.': '.htmlentities($oStimulus->GetDescription(), ENT_QUOTES, 'UTF-8').'">'.htmlentities($oStimulus->GetLabel(), ENT_QUOTES, 'UTF-8').'</span>';
+					}
+				}
+				$sStimuli = implode(', ', $aStimuli);
+			}
+			else
+			{
+				$sStimuli = '<em title="'.Dict::S('UI:UserManagement:NoLifeCycleApplicable+').'">'.Dict::S('UI:UserManagement:NoLifeCycleApplicable').'</em>';
+			}
+			
+			$aDisplayData[] = array(
+				'class' => MetaModel::GetName($sClass),
+				'read' => $this->GetGrantAsHtml($sClass, UR_ACTION_READ),
+				'bulkread' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_READ),
+				'write' => $this->GetGrantAsHtml($sClass, UR_ACTION_MODIFY),
+				'bulkwrite' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_MODIFY),
+				'delete' => $this->GetGrantAsHtml($sClass, UR_ACTION_DELETE),
+				'bulkdelete' => $this->GetGrantAsHtml($sClass, UR_ACTION_BULK_DELETE),
+				'stimuli' => $sStimuli,
+			);
+		}
+
+		$oKPI->ComputeAndReport('Computation of user rights');
+	
+		$aDisplayConfig = array();
+		$aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+'));
+		$aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+'));
+		$aDisplayConfig['bulkread'] = array('label' => Dict::S('UI:UserManagement:Action:BulkRead'), 'description' => Dict::S('UI:UserManagement:Action:BulkRead+'));
+		$aDisplayConfig['write'] = array('label' => Dict::S('UI:UserManagement:Action:Modify'), 'description' => Dict::S('UI:UserManagement:Action:Modify+'));
+		$aDisplayConfig['bulkwrite'] = array('label' => Dict::S('UI:UserManagement:Action:BulkModify'), 'description' => Dict::S('UI:UserManagement:Action:BulkModify+'));
+		$aDisplayConfig['delete'] = array('label' => Dict::S('UI:UserManagement:Action:Delete'), 'description' => Dict::S('UI:UserManagement:Action:Delete+'));
+		$aDisplayConfig['bulkdelete'] = array('label' => Dict::S('UI:UserManagement:Action:BulkDelete'), 'description' => Dict::S('UI:UserManagement:Action:BulkDelete+'));
+		$aDisplayConfig['stimuli'] = array('label' => Dict::S('UI:UserManagement:Action:Stimuli'), 'description' => Dict::S('UI:UserManagement:Action:Stimuli+'));
+		$oPage->table($aDisplayConfig, $aDisplayData);
+	}
+
+	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, $bEditMode);
+		if (!$bEditMode)
+		{
+			$oPage->SetCurrentTab(Dict::S('UI:UserManagement:GrantMatrix'));
+			$this->DoShowGrantSumary($oPage, 'bizmodel,grant_by_profile');
+
+			// debug
+			if (false)
+			{
+				$oPage->SetCurrentTab('More on user rigths (dev only)');
+				$oPage->add("<h3>User rights</h3>\n");
+				$this->DoShowGrantSumary($oPage, 'addon/userrights');
+				$oPage->add("<h3>Change log</h3>\n");
+				$this->DoShowGrantSumary($oPage, 'core/cmdb');
+				$oPage->add("<h3>Application</h3>\n");
+				$this->DoShowGrantSumary($oPage, 'application');
+				$oPage->add("<h3>GUI</h3>\n");
+				$this->DoShowGrantSumary($oPage, 'gui');
+				
+			}					
+		}
+	}
+	
+  	public function CheckToDelete(&$oDeletionPlan)
+  	{
+  		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			// Users deletion is NOT allowed in demo mode
+			$oDeletionPlan->AddToDelete($this, null);
+			$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
+			$oDeletionPlan->ComputeResults();
+			return false;
+		}
+		return parent::CheckToDelete($oDeletionPlan);
+  	} 
+	
+	protected function DBDeleteSingleObject()
+	{
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			// Users deletion is NOT allowed in demo mode
+			return;
+		}
+		parent::DBDeleteSingleObject();
+	}
+}
+
+/**
+ * Abstract class for all types of "internal" authentication i.e. users
+ * for which the application is supplied a login and a password opposed
+ * to "external" users for whom the authentication is performed outside
+ * of the application (by the web server for example).
+ * Note that "internal" users do not necessary correspond to a local authentication
+ * they may be authenticated by a remote system, like in authent-ldap.
+ */
+abstract class UserInternal extends User
+{
+	// Nothing special, just a base class to categorize this type of authenticated users	
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "login",
+			"state_attcode" => "",
+			"reconc_keys" => array('login'),
+			"db_table" => "priv_internaluser",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// When set, this token allows for password reset
+		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("reset_pwd_token", array("allowed_values"=>null, "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'status', 'language', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('finalclass', 'first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
+	}
+
+	/**
+	 * Use with care!
+	 */	 	
+	public function SetPassword($sNewPassword)
+	{
+	}
+
+	/**
+	 * The email recipient is the person who is allowed to regain control when the password gets lost	
+	 * Throws an exception if the feature cannot be available
+	 */	
+	public function GetResetPasswordEmail()
+	{
+		if (!MetaModel::IsValidAttCode(get_class($this), 'contactid'))
+		{
+			throw new Exception(Dict::S('UI:ResetPwd-Error-NoContact'));
+		}
+		$iContactId = $this->Get('contactid');
+		if ($iContactId == 0)
+		{
+			throw new Exception(Dict::S('UI:ResetPwd-Error-NoContact'));
+		}
+		$oContact = MetaModel::GetObject('Contact', $iContactId);
+		// Determine the email attribute (the first one will be our choice)
+		foreach (MetaModel::ListAttributeDefs(get_class($oContact)) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeEmailAddress)
+			{
+				$sEmailAttCode = $sAttCode;
+				// we've got one, exit the loop
+				break;
+			}
+		}
+		if (!isset($sEmailAttCode))
+		{
+			throw new Exception(Dict::S('UI:ResetPwd-Error-NoEmailAtt'));
+		}
+		$sRes = trim($oContact->Get($sEmailAttCode));
+		return $sRes;
+	}
+}
+
+/**
+ * Self register extension  
+ *
+ * @package     iTopORM
+ */
+interface iSelfRegister
+{
+	/**
+	 * Called when no user is found in iTop for the corresponding 'name'. This method
+	 * can create/synchronize the User in iTop with an external source (such as AD/LDAP) on the fly
+	 * @param string $sName The typed-in user name
+	 * @param string $sPassword The typed-in password
+	 * @param string $sLoginMode The login method used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used (any|internal|external)
+	 * @return bool true if the user is a valid one, false otherwise
+	 */
+	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
+	
+	/**
+	 * Called after the user has been authenticated and found in iTop. This method can
+	 * Update the user's definition on the fly (profiles...) to keep it in sync with an external source 
+	 * @param User $oUser The user to update/synchronize
+	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used
+	 * @return void
+	 */
+	public static function UpdateUser(User $oUser, $sLoginMode, $sAuthentication);
+}
+
+/**
+ * User management core API  
+ *
+ * @package     iTopORM
+ */
+class UserRights
+{
+	/** @var UserRightsAddOnAPI $m_oAddOn */
+	protected static $m_oAddOn;
+	protected static $m_oUser;
+	protected static $m_oRealUser;
+	protected static $m_sSelfRegisterAddOn = null;
+
+	public static function SelectModule($sModuleName)
+	{
+		if (!class_exists($sModuleName))
+		{
+			throw new CoreException("Could not select this module, '$sModuleName' in not a valid class name");
+			return;
+		}
+		if (!is_subclass_of($sModuleName, 'UserRightsAddOnAPI'))
+		{
+			throw new CoreException("Could not select this module, the class '$sModuleName' is not derived from UserRightsAddOnAPI");
+			return;
+		}
+		self::$m_oAddOn = new $sModuleName;
+		self::$m_oAddOn->Init();
+		self::$m_oUser = null;
+		self::$m_oRealUser = null;
+	}
+
+	public static function SelectSelfRegister($sModuleName)
+	{
+		if (!class_exists($sModuleName))
+		{
+			throw new CoreException("Could not select the class, '$sModuleName' for self register, is not a valid class name");
+		}
+		self::$m_sSelfRegisterAddOn = $sModuleName;
+	}
+
+	public static function GetModuleInstance()
+	{
+		return self::$m_oAddOn;
+	}
+
+	// Installation: create the very first user
+	public static function CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage = 'EN US')
+	{
+		$bRes = self::$m_oAddOn->CreateAdministrator($sAdminUser, $sAdminPwd, $sLanguage);
+		self::FlushPrivileges(true /* reset admin cache */);
+		return $bRes;
+	}
+	
+	public static function IsLoggedIn()
+	{
+		if (self::$m_oUser == null)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}	
+	}
+
+	public static function Login($sName, $sAuthentication = 'any')
+	{
+		$oUser = self::FindUser($sName, $sAuthentication);
+		if (is_null($oUser))
+		{
+			return false;
+		}
+		self::$m_oUser = $oUser;
+
+		if (isset($_SESSION['impersonate_user']))
+		{
+			self::$m_oRealUser = self::$m_oUser;
+			self::$m_oUser = self::FindUser($_SESSION['impersonate_user']);
+		}
+
+		Dict::SetUserLanguage(self::GetUserLanguage());
+		return true;
+	}
+
+	public static function CheckCredentials($sName, $sPassword, $sLoginMode = 'form', $sAuthentication = 'any')
+	{
+		$oUser = self::FindUser($sName, $sAuthentication);
+		if (is_null($oUser))
+		{
+			// Check if the user does not exist at all or if it is just disabled
+			if (self::FindUser($sName, $sAuthentication, true) == null)
+			{
+				// User does not exist at all
+				return self::CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication);
+			}
+			else
+			{
+				// User is actually disabled
+				return  false;
+			}
+		}
+
+		if (!$oUser->CheckCredentials($sPassword))
+		{
+			return false;
+		}
+		self::UpdateUser($oUser, $sLoginMode, $sAuthentication);
+		return true;
+	}
+	
+	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication)
+	{
+		if (self::$m_sSelfRegisterAddOn != null)
+		{
+			return call_user_func(array(self::$m_sSelfRegisterAddOn, 'CheckCredentialsAndCreateUser'), $sName, $sPassword, $sLoginMode, $sAuthentication);
+		}
+	}
+
+	public static function UpdateUser($oUser, $sLoginMode, $sAuthentication)
+	{
+		if (self::$m_sSelfRegisterAddOn != null)
+		{
+			call_user_func(array(self::$m_sSelfRegisterAddOn, 'UpdateUser'), $oUser, $sLoginMode, $sAuthentication);
+		}
+	}
+	
+	public static function TrustWebServerContext()
+	{
+		if (!is_null(self::$m_oUser))
+		{
+ 			return self::$m_oUser->TrustWebServerContext();
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Tells whether or not the archive mode is allowed to the current user
+	 * @return boolean
+	 */
+	static function CanBrowseArchive()
+	{
+		if (is_null(self::$m_oUser))
+		{
+			$bRet = false;
+		}
+		elseif (isset($_SESSION['archive_allowed']))
+		{
+			$bRet = $_SESSION['archive_allowed'];
+		}
+		else
+		{
+			// As of now, anybody can switch to the archive mode as soon as there is an archivable class
+			$bRet = (count(MetaModel::EnumArchivableClasses()) > 0);
+			$_SESSION['archive_allowed'] = $bRet;
+		}
+		return $bRet;
+	}
+
+	public static function CanChangePassword()
+	{
+		if (MetaModel::DBIsReadOnly())
+		{
+			return false;
+		}
+
+		if (!is_null(self::$m_oUser))
+		{
+ 			return self::$m_oUser->CanChangePassword();
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public static function ChangePassword($sOldPassword, $sNewPassword, $sName = '')
+	{
+		if (empty($sName))
+		{
+			$oUser = self::$m_oUser;
+		}
+		else
+		{
+			// find the id out of the login string
+			$oUser = self::FindUser($sName);
+		}
+		if (is_null($oUser))
+		{
+			return false;
+		}
+		else
+		{
+			$oUser->AllowWrite(true);
+			return $oUser->ChangePassword($sOldPassword, $sNewPassword);
+		}
+	}
+
+	/**
+	 * @param string $sName Login identifier of the user to impersonate
+	 * @return bool True if an impersonation occurred
+	 */
+	public static function Impersonate($sName)
+	{
+		if (!self::CheckLogin()) return false;
+
+		$bRet = false;
+		$oUser = self::FindUser($sName);
+		if ($oUser)
+		{
+			$bRet = true;
+			if (is_null(self::$m_oRealUser))
+			{
+				// First impersonation
+				self::$m_oRealUser = self::$m_oUser;
+			}
+			if (self::$m_oRealUser && (self::$m_oRealUser->GetKey() == $oUser->GetKey()))
+			{
+				// Equivalent to "Deimpersonate"
+				self::Deimpersonate();
+			}
+			else
+			{
+				// Do impersonate!
+				self::$m_oUser = $oUser;
+				Dict::SetUserLanguage(self::GetUserLanguage());
+				$_SESSION['impersonate_user'] = $sName;
+				self::_ResetSessionCache();
+			}
+		}
+		return $bRet;
+	}
+
+	public static function Deimpersonate()
+	{
+		if (!is_null(self::$m_oRealUser))
+		{
+			self::$m_oUser = self::$m_oRealUser;
+			Dict::SetUserLanguage(self::GetUserLanguage());
+			unset($_SESSION['impersonate_user']);
+			self::_ResetSessionCache();
+		}
+	}
+
+	public static function GetUser()
+	{
+		if (is_null(self::$m_oUser))
+		{
+			return '';
+		}
+		else
+		{
+			return self::$m_oUser->Get('login');
+		}
+	}
+
+	public static function GetUserObject()
+	{
+		if (is_null(self::$m_oUser))
+		{
+			return null;
+		}
+		else
+		{
+			return self::$m_oUser;
+		}
+	}
+	
+	public static function GetUserLanguage()
+	{
+		if (is_null(self::$m_oUser))
+		{
+			return 'EN US';
+		
+		}
+		else
+		{
+			return self::$m_oUser->Get('language');
+		}
+	}
+
+	public static function GetUserId($sName = '')
+	{
+		if (empty($sName))
+		{
+			// return current user id
+			if (is_null(self::$m_oUser))
+			{
+				return null;
+			}
+			return self::$m_oUser->GetKey();
+		}
+		else
+		{
+			// find the id out of the login string
+			$oUser = self::$m_oAddOn->FindUser($sName);
+			if (is_null($oUser))
+			{
+				return null;
+			}
+			return $oUser->GetKey();
+		}
+	}
+
+	public static function GetContactId($sName = '')
+	{
+		if (empty($sName))
+		{
+			$oUser = self::$m_oUser;
+		}
+		else
+		{
+			$oUser = FindUser($sName);
+		}
+		if (is_null($oUser))
+		{
+			return '';
+		}
+		if (!MetaModel::IsValidAttCode(get_class($oUser), 'contactid'))
+		{
+			return '';
+		}
+		return $oUser->Get('contactid');
+	}
+
+	public static function GetContactObject()
+	{
+		if (is_null(self::$m_oUser))
+		{
+			return null;
+		}
+		else
+		{
+			return self::$m_oUser->GetContactObject();
+		}
+	}
+
+	// Render the user name in best effort mode
+	public static function GetUserFriendlyName($sName = '')
+	{
+		if (empty($sName))
+		{
+			$oUser = self::$m_oUser;
+		}
+		else
+		{
+			$oUser = FindUser($sName);
+		}
+		if (is_null($oUser))
+		{
+			return '';
+		}
+		return $oUser->GetFriendlyName();
+	}
+
+	public static function IsImpersonated()
+	{
+		if (is_null(self::$m_oRealUser))
+		{
+			return false;
+		}
+		return true;
+	}
+
+	public static function GetRealUser()
+	{
+		if (is_null(self::$m_oRealUser))
+		{
+			return '';
+		}
+		return self::$m_oRealUser->Get('login');
+	}
+
+	public static function GetRealUserObject()
+	{
+		return self::$m_oRealUser;
+	}
+
+	public static function GetRealUserId()
+	{
+		if (is_null(self::$m_oRealUser))
+		{
+			return '';
+		}
+		return self::$m_oRealUser->GetKey();
+	}
+
+	public static function GetRealUserFriendlyName()
+	{
+		if (is_null(self::$m_oRealUser))
+		{
+			return '';
+		}
+		return self::$m_oRealUser->GetFriendlyName();
+	}
+
+	protected static function CheckLogin()
+	{
+		if (!self::IsLoggedIn())
+		{
+			//throw new UserRightException('No user logged in', array());	
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Add additional filter for organization silos to all the requests.
+	 *
+	 * @param $sClass
+	 * @param array $aSettings
+	 *
+	 * @return bool|\Expression
+	 */
+	public static function GetSelectFilter($sClass, $aSettings = array())
+	{
+		// When initializing, we need to let everything pass trough
+		if (!self::CheckLogin()) {return true;}
+
+		if (self::IsAdministrator()) {return true;}
+
+		try
+		{
+			// Check Bug 1436 for details
+			if (MetaModel::HasCategory($sClass, 'bizmodel'))
+			{
+				return self::$m_oAddOn->GetSelectFilter(self::$m_oUser, $sClass, $aSettings);
+			}
+			else
+			{
+				return true;
+			}
+		} catch (Exception $e)
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * @param string $sClass
+	 * @param int $iActionCode
+	 * @param DBObjectSet $oInstanceSet
+	 * @param User $oUser
+	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO|UR_ALLOWED_DEPENDS)
+	 */
+	public static function IsActionAllowed($sClass, $iActionCode, /*dbObjectSet*/$oInstanceSet = null, $oUser = null)
+	{
+		// When initializing, we need to let everything pass trough
+		if (!self::CheckLogin()) return UR_ALLOWED_YES;
+
+		if (MetaModel::DBIsReadOnly())
+		{
+			if ($iActionCode == UR_ACTION_CREATE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_MODIFY) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
+		}
+
+		$aPredefinedObjects = call_user_func(array($sClass, 'GetPredefinedObjects'));
+		if ($aPredefinedObjects != null)
+		{
+			// As opposed to the read-only DB, modifying an object is allowed
+			// (the constant columns will be marked as read-only)
+			//
+			if ($iActionCode == UR_ACTION_CREATE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
+		}
+
+		if (self::IsAdministrator($oUser)) return UR_ALLOWED_YES;
+
+		if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile'))
+		{
+			if (is_null($oUser))
+			{
+				$oUser = self::$m_oUser;
+			}
+			if ($iActionCode == UR_ACTION_CREATE)
+			{
+				// The addons currently DO NOT handle the case "CREATE"
+				// Therefore it is considered to be equivalent to "MODIFY"
+				$iActionCode = UR_ACTION_MODIFY;
+			}
+			return self::$m_oAddOn->IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet);
+		}
+		elseif(($iActionCode == UR_ACTION_READ) && MetaModel::HasCategory($sClass, 'view_in_gui'))
+		{
+			return UR_ALLOWED_YES;
+		}
+		else
+		{
+			// Other classes could be edited/listed by the administrators
+			return UR_ALLOWED_NO;
+		}
+	}
+
+	public static function IsStimulusAllowed($sClass, $sStimulusCode, /*dbObjectSet*/ $oInstanceSet = null, $oUser = null)
+	{
+		// When initializing, we need to let everything pass trough
+		if (!self::CheckLogin()) return true;
+
+		if (MetaModel::DBIsReadOnly())
+		{
+			return false;
+		}
+
+		if (self::IsAdministrator($oUser)) return true;
+
+		if (MetaModel::HasCategory($sClass, 'bizmodel'))
+		{
+			if (is_null($oUser))
+			{
+				$oUser = self::$m_oUser;
+			}
+			return self::$m_oAddOn->IsStimulusAllowed($oUser, $sClass, $sStimulusCode, $oInstanceSet);
+		}
+		else
+		{
+			// Other classes could be edited/listed by the administrators
+			return false;
+		}
+	}
+
+	/**
+	 * @param string $sClass
+	 * @param string $sAttCode
+	 * @param int $iActionCode
+	 * @param DBObjectSet $oInstanceSet
+	 * @param User $oUser
+	 * @return int (UR_ALLOWED_YES|UR_ALLOWED_NO)
+	 */
+	public static function IsActionAllowedOnAttribute($sClass, $sAttCode, $iActionCode, /*dbObjectSet*/$oInstanceSet = null, $oUser = null)
+	{
+		// When initializing, we need to let everything pass trough
+		if (!self::CheckLogin()) return UR_ALLOWED_YES;
+
+		if (MetaModel::DBIsReadOnly())
+		{
+			if ($iActionCode == UR_ACTION_MODIFY) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_DELETE) return UR_ALLOWED_NO;
+			if ($iActionCode == UR_ACTION_BULK_MODIFY) return falUR_ALLOWED_NOse;
+			if ($iActionCode == UR_ACTION_BULK_DELETE) return UR_ALLOWED_NO;
+		}
+
+		if (self::IsAdministrator($oUser)) return UR_ALLOWED_YES;
+
+		if (MetaModel::HasCategory($sClass, 'bizmodel') || MetaModel::HasCategory($sClass, 'grant_by_profile'))
+		{
+			if (is_null($oUser))
+			{
+				$oUser = self::$m_oUser;
+			}
+			return self::$m_oAddOn->IsActionAllowedOnAttribute($oUser, $sClass, $sAttCode, $iActionCode, $oInstanceSet);
+		}
+
+		// this module is forbidden for non admins
+		if (MetaModel::HasCategory($sClass, 'addon/userrights')) return UR_ALLOWED_NO;
+
+		// the rest is allowed
+		return UR_ALLOWED_YES;
+
+
+	}
+
+	protected static $m_aAdmins = array();
+	public static function IsAdministrator($oUser = null)
+	{
+		if (!self::CheckLogin()) return false;
+
+		if (is_null($oUser))
+		{
+			$oUser = self::$m_oUser;
+		}
+		$iUser = $oUser->GetKey();
+		if (!isset(self::$m_aAdmins[$iUser]))
+		{
+			self::$m_aAdmins[$iUser] = self::$m_oAddOn->IsAdministrator($oUser);
+		}
+		return self::$m_aAdmins[$iUser];
+	}
+
+	protected static $m_aPortalUsers = array();
+	public static function IsPortalUser($oUser = null)
+	{
+		if (!self::CheckLogin()) return false;
+
+		if (is_null($oUser))
+		{
+			$oUser = self::$m_oUser;
+		}
+		$iUser = $oUser->GetKey();
+		if (!isset(self::$m_aPortalUsers[$iUser]))
+		{
+			self::$m_aPortalUsers[$iUser] = self::$m_oAddOn->IsPortalUser($oUser);
+		}
+		return self::$m_aPortalUsers[$iUser];
+	}
+
+	public static function GetAllowedPortals()
+    {
+        $aAllowedPortals = array();
+        $aPortalsConf = PortalDispatcherData::GetData();
+        $aDispatchers = array();
+        foreach ($aPortalsConf as $sPortalId => $aConf)
+        {
+            $sHandlerClass = $aConf['handler'];
+            $aDispatchers[$sPortalId] = new $sHandlerClass($sPortalId);
+        }
+
+        foreach ($aDispatchers as $sPortalId => $oDispatcher)
+        {
+            if ($oDispatcher->IsUserAllowed())
+            {
+                $aAllowedPortals[] = array(
+                    'id' => $sPortalId,
+                    'label' => $oDispatcher->GetLabel(),
+                    'url' => $oDispatcher->GetUrl(),
+                );
+            }
+        }
+        return $aAllowedPortals;
+    }
+
+    public static function ListProfiles($oUser = null)
+	{
+		if (is_null($oUser))
+		{
+			$oUser = self::$m_oUser;
+		}
+		if ($oUser === null)
+		{
+			// Not logged in: no profile at all
+			$aProfiles = array();
+		}
+		elseif ((self::$m_oUser !== null) && ($oUser->GetKey() == self::$m_oUser->GetKey()))
+		{
+			// Data about the current user can be found into the session data
+			if (array_key_exists('profile_list', $_SESSION))
+			{
+				$aProfiles = $_SESSION['profile_list'];
+			}
+		}
+
+		if (!isset($aProfiles))
+		{
+			$aProfiles = self::$m_oAddOn->ListProfiles($oUser);
+		}
+		return $aProfiles;
+	}
+
+	/**
+	 * @param $sProfileName Profile name to search for
+	 * @param $oUser User|null
+	 * @return bool
+	 */
+	public static function HasProfile($sProfileName, $oUser = null)
+	{
+		$bRet = in_array($sProfileName, self::ListProfiles($oUser));
+		return $bRet;
+	}
+
+	/**
+	 * Reset cached data
+	 * @param Bool Reset admin cache as well
+	 * @return void
+	 */
+	// Reset cached data
+	//
+	public static function FlushPrivileges($bResetAdminCache = false)
+	{
+		if ($bResetAdminCache)
+		{
+			self::$m_aAdmins = array();
+			self::$m_aPortalUsers = array();
+		}
+		if (!isset($_SESSION) && !utils::IsModeCLI())
+		{
+			session_name('itop-'.md5(APPROOT));
+			session_start();
+		}
+		self::_ResetSessionCache();
+		if (self::$m_oAddOn)
+		{
+			self::$m_oAddOn->FlushPrivileges();
+		}
+	}
+
+	static $m_aCacheUsers;
+	/**
+	 * Find a user based on its login and its type of authentication
+	 * @param string $sLogin Login/identifier of the user
+	 * @param string $sAuthentication Type of authentication used: internal|external|any
+	 * @param bool $bAllowDisabledUsers Whether or not to retrieve disabled users (status != enabled)
+	 * @return User The found user or null
+	 */
+	protected static function FindUser($sLogin, $sAuthentication = 'any', $bAllowDisabledUsers = false)
+	{
+		if ($sAuthentication == 'any')
+		{
+			$oUser = self::FindUser($sLogin, 'internal');
+			if ($oUser == null)
+			{
+				$oUser = self::FindUser($sLogin, 'external');
+			}
+		}
+		else
+		{
+			if (!isset(self::$m_aCacheUsers))
+			{
+				self::$m_aCacheUsers = array('internal' => array(), 'external' => array());
+			}
+			
+			if (!isset(self::$m_aCacheUsers[$sAuthentication][$sLogin]))
+			{
+				switch($sAuthentication)
+				{
+					case 'external':
+					$sBaseClass = 'UserExternal';
+					break;
+					
+					case 'internal':
+					$sBaseClass = 'UserInternal';
+					break;
+					
+					default:
+					echo "<p>sAuthentication = $sAuthentication</p>\n";
+					assert(false); // should never happen
+				}
+				$oSearch = DBObjectSearch::FromOQL("SELECT $sBaseClass WHERE login = :login");
+				if (!$bAllowDisabledUsers)
+				{
+					$oSearch->AddCondition('status', 'enabled');
+				}
+				$oSet = new DBObjectSet($oSearch, array(), array('login' => $sLogin));
+				$oUser = $oSet->fetch();
+				self::$m_aCacheUsers[$sAuthentication][$sLogin] = $oUser;
+			}
+			$oUser = self::$m_aCacheUsers[$sAuthentication][$sLogin];
+		}
+		return $oUser;
+	}
+
+	public static function MakeSelectFilter($sClass, $aAllowedOrgs, $aSettings = array(), $sAttCode = null)
+	{
+		return self::$m_oAddOn->MakeSelectFilter($sClass, $aAllowedOrgs, $aSettings, $sAttCode);
+	}
+
+	public static function _InitSessionCache()
+	{
+		// Cache data about the current user into the session
+		if (isset($_SESSION))
+		{
+			$_SESSION['profile_list'] = self::ListProfiles();
+		}
+	}
+
+	public static function _ResetSessionCache()
+	{
+		if (isset($_SESSION['profile_list']))
+		{
+			unset($_SESSION['profile_list']);
+		}
+		if (isset($_SESSION['archive_allowed']))
+		{
+			unset($_SESSION['archive_allowed']);
+		}
+	}
+}
+
+/**
+ * Helper class to get the number/list of items for which a given action is allowed/possible
+ */
+class ActionChecker
+{
+	var $oFilter;
+	var $iActionCode;
+	var $iAllowedCount = null;
+	var $aAllowedIDs = null;
+	
+	public function __construct(DBSearch $oFilter, $iActionCode)
+	{
+		$this->oFilter = $oFilter;
+		$this->iActionCode = $iActionCode;
+		$this->iAllowedCount = null;
+		$this->aAllowedIDs = null;
+	}
+	
+	/**
+	 * returns the number of objects for which the action is allowed
+	 * @return integer The number of "allowed" objects 0..N
+	 */
+	public function GetAllowedCount()
+	{
+		if ($this->iAllowedCount == null) $this->CheckObjects();
+		return $this->iAllowedCount;
+	}
+	
+	/**
+	 * If IsAllowed returned UR_ALLOWED_DEPENDS, this methods returns
+	 * an array of ObjKey => Status (true|false)
+	 * @return array
+	 */
+	public function GetAllowedIDs()
+	{
+		if ($this->aAllowedIDs == null) $this->IsAllowed();
+		return $this->aAllowedIDs;
+	}
+	
+	/**
+	 * Check if the speficied stimulus is allowed for the set of objects
+	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
+	 */
+	public function IsAllowed()
+	{
+		$sClass = $this->oFilter->GetClass();
+		$oSet = new DBObjectSet($this->oFilter);
+		$iActionAllowed = UserRights::IsActionAllowed($sClass, $this->iActionCode, $oSet);
+		if ($iActionAllowed == UR_ALLOWED_DEPENDS)
+		{
+			// Check for each object if the action is allowed or not
+			$this->aAllowedIDs = array();
+			$oSet->Rewind();
+			$this->iAllowedCount = 0;
+			while($oObj = $oSet->Fetch())
+			{
+				$oObjSet = DBObjectSet::FromArray($sClass, array($oObj));
+				if (UserRights::IsActionAllowed($sClass, $this->iActionCode, $oObjSet) == UR_ALLOWED_NO)
+				{
+					$this->aAllowedIDs[$oObj->GetKey()] = false;
+				}
+				else
+				{
+					// Assume UR_ALLOWED_YES, since there is just one object !
+					$this->aAllowedIDs[$oObj->GetKey()] = true;
+					$this->iAllowedCount++;
+				}
+			}
+		}
+		else if ($iActionAllowed == UR_ALLOWED_YES)
+		{
+			$this->iAllowedCount = $oSet->Count();
+			$this->aAllowedIDs = array(); // Optimization: not filled when Ok for all objects
+		}
+		else // UR_ALLOWED_NO
+		{
+			$this->iAllowedCount = 0;
+			$this->aAllowedIDs = array();
+		}
+		return $iActionAllowed;
+	}
+}
+
+/**
+ * Helper class to get the number/list of items for which a given stimulus can be applied (allowed & possible)
+ */
+class StimulusChecker extends ActionChecker
+{
+	var $sState = null;
+	
+	public function __construct(DBSearch $oFilter, $sState, $iStimulusCode)
+	{
+		parent::__construct($oFilter, $iStimulusCode);
+		$this->sState = $sState;
+	}
+
+	/**
+	 * Check if the speficied stimulus is allowed for the set of objects
+	 * @return UR_ALLOWED_YES, UR_ALLOWED_NO or UR_ALLOWED_DEPENDS
+	 */
+	public function IsAllowed()
+	{
+		$sClass = $this->oFilter->GetClass();
+		if (MetaModel::IsAbstract($sClass)) return UR_ALLOWED_NO; // Safeguard, not implemented if the base class of the set is abstract !
+		
+		$oSet = new DBObjectSet($this->oFilter);
+		$iActionAllowed = UserRights::IsStimulusAllowed($sClass,  $this->iActionCode, $oSet);
+		if ($iActionAllowed == UR_ALLOWED_NO)
+		{
+			$this->iAllowedCount = 0;
+			$this->aAllowedIDs = array();
+		}
+		else // Even if UR_ALLOWED_YES, we need to check if each object is in the appropriate state
+		{
+			// Hmmm, may not be needed right now because we limit the "multiple" action to object in
+			// the same state... may be useful later on if we want to extend this behavior...
+			
+			// Check for each object if the action is allowed or not
+			$this->aAllowedIDs = array();
+			$oSet->Rewind();
+			$iAllowedCount = 0;
+			$iActionAllowed = UR_ALLOWED_DEPENDS;
+			while($oObj = $oSet->Fetch())
+			{
+				$aTransitions = $oObj->EnumTransitions();
+				if (array_key_exists($this->iActionCode, $aTransitions))
+				{
+					// Temporary optimization possible: since the current implementation
+					// of IsActionAllowed does not perform a 'per instance' check, we could
+					// skip this second validation phase and assume it would return UR_ALLOWED_YES
+					$oObjSet = DBObjectSet::FromArray($sClass, array($oObj));
+					if (!UserRights::IsStimulusAllowed($sClass, $this->iActionCode, $oObjSet))
+					{
+						$this->aAllowedIDs[$oObj->GetKey()] = false;
+					}
+					else
+					{
+						// Assume UR_ALLOWED_YES, since there is just one object !
+						$this->aAllowedIDs[$oObj->GetKey()] = true;
+						$this->iState = $oObj->GetState();
+						$this->iAllowedCount++;
+					}					
+				}
+				else
+				{
+					$this->aAllowedIDs[$oObj->GetKey()] = false;					
+				}				
+			}
+		}
+		
+		if ($this->iAllowedCount == $oSet->Count())
+		{
+			$iActionAllowed = UR_ALLOWED_YES;
+		}
+		if ($this->iAllowedCount == 0)
+		{
+			$iActionAllowed = UR_ALLOWED_NO;
+		}
+
+		return $iActionAllowed;
+	}
+	
+	public function GetState()
+	{
+		return $this->iState;
+	}		
+}
+
+/**
+ * Self-register extension to allow the automatic creation & update of CAS users
+ * 
+ * @package iTopORM
+ *
+ */
+class CAS_SelfRegister implements iSelfRegister
+{
+	/**
+	 * Called when no user is found in iTop for the corresponding 'name'. This method
+	 * can create/synchronize the User in iTop with an external source (such as AD/LDAP) on the fly
+	 * @param string $sName The CAS authenticated user name
+	 * @param string $sPassword Ignored
+	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used
+	 * @return bool true if the user is a valid one, false otherwise
+	 */
+	public static function CheckCredentialsAndCreateUser($sName, $sPassword, $sLoginMode, $sAuthentication)
+	{
+		$bOk = true;
+		if ($sLoginMode != 'cas') return false; // Must be authenticated via CAS
+
+		$sCASMemberships = MetaModel::GetConfig()->Get('cas_memberof');
+		$bFound =  false;
+		if (!empty($sCASMemberships))
+		{
+			if (phpCAS::hasAttribute('memberOf'))
+			{
+				// A list of groups is specified, the user must a be member of (at least) one of them to pass
+				$aCASMemberships = array();
+				$aTmp = explode(';', $sCASMemberships);
+				setlocale(LC_ALL, "en_US.utf8"); // !!! WARNING: this is needed to have  the iconv //TRANSLIT working fine below !!!
+				foreach($aTmp as $sGroupName)
+				{
+					$aCASMemberships[] = trim(iconv('UTF-8', 'ASCII//TRANSLIT', $sGroupName)); // Just in case remove accents and spaces...
+				}
+
+				$aMemberOf = phpCAS::getAttribute('memberOf');
+				if (!is_array($aMemberOf)) $aMemberOf = array($aMemberOf); // Just one entry, turn it into an array
+				$aFilteredGroupNames = array();
+				foreach($aMemberOf as $sGroupName)
+				{
+					phpCAS::log("Info: user if a member of the group: ".$sGroupName);
+					$sGroupName = trim(iconv('UTF-8', 'ASCII//TRANSLIT', $sGroupName)); // Remove accents and spaces as well
+					$aFilteredGroupNames[] = $sGroupName;
+					$bIsMember = false;
+					foreach($aCASMemberships as $sCASPattern)
+					{
+						if (self::IsPattern($sCASPattern))
+						{
+							if (preg_match($sCASPattern, $sGroupName))
+							{
+								$bIsMember = true;
+								break;
+							}
+						}
+						else if ($sCASPattern == $sGroupName)
+						{
+							$bIsMember = true;
+							break;
+						}
+					}
+					if ($bIsMember)
+					{
+						$bCASUserSynchro = MetaModel::GetConfig()->Get('cas_user_synchro');
+						if ($bCASUserSynchro)
+						{
+							// If needed create a new user for this email/profile
+							phpCAS::log('Info: cas_user_synchro is ON');
+							$bOk = self::CreateCASUser(phpCAS::getUser(), $aMemberOf);
+							if($bOk)
+							{
+								$bFound = true;
+							}
+							else
+							{
+								phpCAS::log("User ".phpCAS::getUser()." cannot be created in iTop. Logging off...");
+							}
+						}
+						else
+						{
+							phpCAS::log('Info: cas_user_synchro is OFF');
+							$bFound = true;
+						}
+						break;
+					}	
+				}
+				if($bOk && !$bFound)
+				{
+					phpCAS::log("User ".phpCAS::getUser().", none of his/her groups (".implode('; ', $aFilteredGroupNames).") match any of the required groups: ".implode('; ', $aCASMemberships));
+				}
+			}
+			else
+			{
+				// Too bad, the user is not part of any of the group => not allowed
+				phpCAS::log("No 'memberOf' attribute found for user ".phpCAS::getUser().". Are you using the SAML protocol (S1) ?");
+			}
+		}
+		else
+		{
+			// No membership: no way to create the user that should exist prior to authentication
+			phpCAS::log("User ".phpCAS::getUser().": missing user account in iTop (or iTop badly configured, Cf setting cas_memberof)");
+			$bFound = false;
+		}
+		
+		if (!$bFound)
+		{
+			// The user is not part of the allowed groups, => log out
+			$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
+			$sCASLogoutUrl = MetaModel::GetConfig()->Get('cas_logout_redirect_service');
+			if (empty($sCASLogoutUrl))
+			{
+				$sCASLogoutUrl = $sUrl;
+			}
+			phpCAS::logoutWithRedirectService($sCASLogoutUrl); // Redirects to the CAS logout page
+			// Will never return !			
+		}
+		return $bFound;
+	}
+	
+	/**
+	 * Called after the user has been authenticated and found in iTop. This method can
+	 * Update the user's definition (profiles...) on the fly to keep it in sync with an external source 
+	 * @param User $oUser The user to update/synchronize
+	 * @param string $sLoginMode The login mode used (cas|form|basic|url)
+	 * @param string $sAuthentication The authentication method used
+	 * @return void
+	 */
+	public static function UpdateUser(User $oUser, $sLoginMode, $sAuthentication)
+	{
+		$bCASUpdateProfiles = MetaModel::GetConfig()->Get('cas_update_profiles');
+		if (($sLoginMode == 'cas') && $bCASUpdateProfiles && (phpCAS::hasAttribute('memberOf')))
+		{
+			$aMemberOf = phpCAS::getAttribute('memberOf');
+			if (!is_array($aMemberOf)) $aMemberOf = array($aMemberOf); // Just one entry, turn it into an array
+			
+			return self::SetProfilesFromCAS($oUser, $aMemberOf);
+		}
+		// No groups defined in CAS or not CAS at all: do nothing...
+		return true;
+	}
+	
+	/**
+	 * Helper method to create a CAS based user
+	 * @param string $sEmail
+	 * @param array $aGroups
+	 * @return bool true on success, false otherwise
+	 */
+	protected static function CreateCASUser($sEmail, $aGroups)
+	{
+		if (!MetaModel::IsValidClass('URP_Profiles'))
+		{
+			phpCAS::log("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
+			return false;
+		}
+				
+		$oUser = MetaModel::GetObjectByName('UserExternal', $sEmail, false);
+		if ($oUser == null)
+		{
+			// Create the user, link it to a contact
+			phpCAS::log("Info: the user '$sEmail' does not exist. A new UserExternal will be created.");
+			$oSearch = new DBObjectSearch('Person');
+			$oSearch->AddCondition('email', $sEmail);
+			$oSet = new DBObjectSet($oSearch);
+			$iContactId = 0;
+			switch($oSet->Count())
+			{
+				case 0:
+				phpCAS::log("Error: found no contact with the email: '$sEmail'. Cannot create the user in iTop.");
+				return false;
+
+				case 1:
+				$oContact = $oSet->Fetch();
+				$iContactId = $oContact->GetKey();
+				phpCAS::log("Info: Found 1 contact '".$oContact->GetName()."' (id=$iContactId) corresponding to the email '$sEmail'.");
+				break;
+
+				default:
+				phpCAS::log("Error: ".$oSet->Count()." contacts have the same email: '$sEmail'. Cannot create a user for this email.");
+				return false;
+			}
+			
+			$oUser = new UserExternal();
+			$oUser->Set('login', $sEmail);
+			$oUser->Set('contactid', $iContactId);
+			$oUser->Set('language', MetaModel::GetConfig()->GetDefaultLanguage());
+		}
+		else
+		{
+			phpCAS::log("Info: the user '$sEmail' already exists (id=".$oUser->GetKey().").");
+		}
+
+		// Now synchronize the profiles
+		if (!self::SetProfilesFromCAS($oUser, $aGroups))
+		{
+			return false;
+		}
+		else 
+		{
+			if ($oUser->IsNew() || $oUser->IsModified())
+			{
+				$oMyChange = MetaModel::NewObject("CMDBChange");
+				$oMyChange->Set("date", time());
+				$oMyChange->Set("userinfo", 'CAS/LDAP Synchro');
+				$oMyChange->DBInsert();
+				if ($oUser->IsNew())
+				{
+					$oUser->DBInsertTracked($oMyChange);
+				}
+				else
+				{
+					$oUser->DBUpdateTracked($oMyChange);
+				}
+			}
+			
+			return true;
+		}
+	}
+	
+	protected static function SetProfilesFromCAS($oUser, $aGroups)
+	{
+		if (!MetaModel::IsValidClass('URP_Profiles'))
+		{
+			phpCAS::log("URP_Profiles is not a valid class. Automatic creation of Users is not supported in this context, sorry.");
+			return false;
+		}
+		
+		// read all the existing profiles
+		$oProfilesSearch = new DBObjectSearch('URP_Profiles');
+		$oProfilesSet = new DBObjectSet($oProfilesSearch);
+		$aAllProfiles = array();
+		while($oProfile = $oProfilesSet->Fetch())
+		{
+			$aAllProfiles[strtolower($oProfile->GetName())] = $oProfile->GetKey();
+		}
+		
+		// Translate the CAS/LDAP group names into iTop profile names
+		$aProfiles = array();
+		$sPattern = MetaModel::GetConfig()->Get('cas_profile_pattern');
+		foreach($aGroups as $sGroupName)
+		{
+			if (preg_match($sPattern, $sGroupName, $aMatches))
+			{
+				if (array_key_exists(strtolower($aMatches[1]), $aAllProfiles))
+				{
+					$aProfiles[] = $aAllProfiles[strtolower($aMatches[1])];
+					phpCAS::log("Info: Adding the profile '{$aMatches[1]}' from CAS.");
+				}
+				else
+				{
+					phpCAS::log("Warning: {$aMatches[1]} is not a valid iTop profile (extracted from group name: '$sGroupName'). Ignored.");
+				}
+			}
+			else
+			{
+				phpCAS::log("Info: The CAS group '$sGroupName' does not seem to match an iTop pattern. Ignored.");
+			}
+		}
+		if (count($aProfiles) == 0)
+		{
+			phpCAS::log("Info: The user '".$oUser->GetName()."' has no profiles retrieved from CAS. Default profile(s) will be used.");
+
+			// Second attempt: check if there is/are valid default profile(s)
+			$sCASDefaultProfiles = MetaModel::GetConfig()->Get('cas_default_profiles');
+			$aCASDefaultProfiles = explode(';', $sCASDefaultProfiles);
+			foreach($aCASDefaultProfiles as $sDefaultProfileName)
+			{
+				if (array_key_exists(strtolower($sDefaultProfileName), $aAllProfiles))
+				{
+					$aProfiles[] = $aAllProfiles[strtolower($sDefaultProfileName)];
+					phpCAS::log("Info: Adding the default profile '".$aAllProfiles[strtolower($sDefaultProfileName)]."' from CAS.");
+				}
+				else
+				{
+					phpCAS::log("Warning: the default profile {$sDefaultProfileName} is not a valid iTop profile. Ignored.");
+				}
+			}
+			
+			if (count($aProfiles) == 0)
+			{
+				phpCAS::log("Error: The user '".$oUser->GetName()."' has no profiles in iTop, and therefore cannot be created.");
+				return false;
+			}
+		}
+		
+		// Now synchronize the profiles
+		$oProfilesSet = DBObjectSet::FromScratch('URP_UserProfile');
+		foreach($aProfiles as $iProfileId)
+		{
+			$oLink = new URP_UserProfile();
+			$oLink->Set('profileid', $iProfileId);
+			$oLink->Set('reason', 'CAS/LDAP Synchro');
+			$oProfilesSet->AddObject($oLink);
+		}
+		$oUser->Set('profile_list', $oProfilesSet);
+		phpCAS::log("Info: the user '".$oUser->GetName()."' (id=".$oUser->GetKey().") now has the following profiles: '".implode("', '", $aProfiles)."'.");
+		if ($oUser->IsModified())
+		{
+			$oMyChange = MetaModel::NewObject("CMDBChange");
+			$oMyChange->Set("date", time());
+			$oMyChange->Set("userinfo", 'CAS/LDAP Synchro');
+			$oMyChange->DBInsert();
+			if ($oUser->IsNew())
+			{
+				$oUser->DBInsertTracked($oMyChange);
+			}
+			else
+			{
+				$oUser->DBUpdateTracked($oMyChange);
+			}
+		}
+		
+		return true;
+	}
+	/**
+	 * Helper function to check if the supplied string is a litteral string or a regular expression pattern
+	 * @param string $sCASPattern
+	 * @return bool True if it's a regular expression pattern, false otherwise
+	 */
+	protected static function IsPattern($sCASPattern)
+	{
+		if ((substr($sCASPattern, 0, 1) == '/') && (substr($sCASPattern, -1) == '/'))
+		{
+			// the string is enclosed by slashes, let's assume it's a pattern
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+
+// By default enable the 'CAS_SelfRegister' defined above
 UserRights::SelectSelfRegister('CAS_SelfRegister');
\ No newline at end of file
diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
index 5ac87bfaa..85dc509a7 100644
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -1,462 +1,462 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Value set definitions (from a fixed list or from a query, etc.)
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('MyHelpers.class.inc.php');
-
-/**
- * ValueSetDefinition
- * value sets API and implementations
- *
- * @package     iTopORM
- */
-abstract class ValueSetDefinition
-{
-	protected $m_bIsLoaded = false;
-	protected $m_aValues = array();
-
-
-	// Displayable description that could be computed out of the std usage context
-	public function GetValuesDescription()
-	{
-		$aValues = $this->GetValues(array(), '');
-		$aDisplayedValues = array();
-		foreach($aValues as $key => $value)
-		{
-			$aDisplayedValues[] = "$key => $value";
-		}
-		$sAllowedValues = implode(', ', $aDisplayedValues);
-		return $sAllowedValues;
-	}
-
-
-	public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
-	{
-		if (!$this->m_bIsLoaded)
-		{
-			$this->LoadValues($aArgs);
-			$this->m_bIsLoaded = true;
-		}
-		if (strlen($sContains) == 0)
-		{
-			// No filtering
-			$aRet = $this->m_aValues;
-		}
-		else
-		{
-			// Filter on results containing the needle <sContain>
-			$aRet = array();
-			foreach ($this->m_aValues as $sKey=>$sValue)
-			{
-				if (stripos($sValue, $sContains) !== false)
-				{
-					$aRet[$sKey] = $sValue;
-				}
-			}
-		}
-		// Sort on the display value
-		asort($aRet);
-		return $aRet;
-	}
-
-	abstract protected function LoadValues($aArgs);
-}
-
-
-/**
- * Set of existing values for an attribute, given a search filter 
- *
- * @package     iTopORM
- */
-class ValueSetObjects extends ValueSetDefinition
-{
-	protected $m_sContains;
-	protected $m_sOperation;
-	protected $m_sFilterExpr; // in OQL
-	protected $m_sValueAttCode;
-	protected $m_aOrderBy;
-	protected $m_aExtraConditions;
-	private $m_bAllowAllData;
-	private $m_aModifierProperties;
-	private $m_bSort;
-	private $m_iLimit;
-
-
-	/**
-	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
-	 */	
-	public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false, $aModifierProperties = array())
-	{
-		$this->m_sContains = '';
-		$this->m_sOperation = '';
-		$this->m_sFilterExpr = $sFilterExp;
-		$this->m_sValueAttCode = $sValueAttCode;
-		$this->m_aOrderBy = $aOrderBy;
-		$this->m_bAllowAllData = $bAllowAllData;
-		$this->m_aModifierProperties = $aModifierProperties;
-		$this->m_aExtraConditions = array();
-		$this->m_bSort = true;
-		$this->m_iLimit = 0;
-	}
-
-	public function SetModifierProperty($sPluginClass, $sProperty, $value)
-	{
-		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
-	}
-
-	public function AddCondition(DBSearch $oFilter)
-	{
-		$this->m_aExtraConditions[] = $oFilter;		
-	}
-
-	public function ToObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
-	{
-		if ($this->m_bAllowAllData)
-		{
-			$oFilter = DBObjectSearch::FromOQL_AllData($this->m_sFilterExpr);
-		}
-		else
-		{
-			$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr);
-		}
-		foreach($this->m_aExtraConditions as $oExtraFilter)
-		{
-			$oFilter = $oFilter->Intersect($oExtraFilter);
-		}
-		foreach($this->m_aModifierProperties as $sPluginClass => $aProperties)
-		{
-			foreach ($aProperties as $sProperty => $value)
-			{
-				$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
-			}
-		}
-		if ($iAdditionalValue > 0)
-		{
-			$oSearchAdditionalValue = new DBObjectSearch($oFilter->GetClass());
-			$oSearchAdditionalValue->AddConditionExpression( new BinaryExpression(
-			    new FieldExpression('id', $oSearchAdditionalValue->GetClassAlias()),
-                '=',
-                new VariableExpression('current_extkey_id'))
-            );
-			$oSearchAdditionalValue->AllowAllData();
-			$oSearchAdditionalValue->SetArchiveMode(true);
-			$oSearchAdditionalValue->SetInternalParams( array('current_extkey_id' => $iAdditionalValue) );
-
-			$oFilter = new DBUnionSearch(array($oFilter, $oSearchAdditionalValue));
-		}
-
-		return new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
-	}
-
-    /**
-     * @param        $aArgs
-     * @param string $sContains
-     * @param string $sOperation for the values @see self::LoadValues()
-     *
-     * @return array
-     * @throws CoreException
-     * @throws OQLException
-     */
-    public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
-	{
-		if (!$this->m_bIsLoaded || ($sContains != $this->m_sContains) || ($sOperation != $this->m_sOperation))
-		{
-			$this->LoadValues($aArgs, $sContains, $sOperation);
-			$this->m_bIsLoaded = true;
-		}
-		// The results are already filtered and sorted (on friendly name)
-		$aRet = $this->m_aValues;
-		return $aRet;
-	}
-
-	/**
-	 * @param $aArgs
-	 * @param string $sContains
-	 * @param string $sOperation 'contains' or 'equals_start_with'
-	 *
-	 * @return bool
-	 * @throws \CoreException
-	 * @throws \OQLException
-	 */
-	protected function LoadValues($aArgs, $sContains = '', $sOperation = 'contains')
-	{
-		$this->m_sContains = $sContains;
-		$this->m_sOperation = $sOperation;
-
-		$this->m_aValues = array();
-		
-		if ($this->m_bAllowAllData)
-		{
-			$oFilter = DBObjectSearch::FromOQL_AllData($this->m_sFilterExpr);
-		}
-		else
-		{
-			$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr);
-		}
-		if (!$oFilter) return false;
-		foreach($this->m_aExtraConditions as $oExtraFilter)
-		{
-			$oFilter = $oFilter->Intersect($oExtraFilter);
-		}
-		foreach($this->m_aModifierProperties as $sPluginClass => $aProperties)
-		{
-			foreach ($aProperties as $sProperty => $value)
-			{
-				$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
-			}
-		}
-
-		$oExpression = DBObjectSearch::GetPolymorphicExpression($oFilter->GetClass(), 'friendlyname');
-		$aFields = $oExpression->ListRequiredFields();
-		$sClass = $oFilter->GetClass();
-		foreach($aFields as $sField)
-		{
-			$aFieldItems = explode('.', $sField);
-			if ($aFieldItems[0] != $sClass)
-			{
-				$sOperation = 'contains';
-				break;
-			}
-		}
-
-		switch ($sOperation)
-		{
-			case 'equals':
-				$aAttributes = MetaModel::GetFriendlyNameAttributeCodeList($sClass);
-				$sClassAlias = $oFilter->GetClassAlias();
-				$aFilters = array();
-				$oValueExpr = new ScalarExpression($sContains);
-				foreach($aAttributes as $sAttribute)
-				{
-					$oNewFilter = $oFilter->DeepClone();
-					$oNameExpr = new FieldExpression($sAttribute, $sClassAlias);
-					$oCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
-					$oNewFilter->AddConditionExpression($oCondition);
-					$aFilters[] = $oNewFilter;
-				}
-                // Unions are much faster than OR conditions
-				$oFilter = new DBUnionSearch($aFilters);
-				break;
-            case 'start_with':
-                $aAttributes = MetaModel::GetFriendlyNameAttributeCodeList($sClass);
-                $sClassAlias = $oFilter->GetClassAlias();
-                $aFilters = array();
-                $oValueExpr = new ScalarExpression($sContains.'%');
-                foreach($aAttributes as $sAttribute)
-                {
-                    $oNewFilter = $oFilter->DeepClone();
-                    $oNameExpr = new FieldExpression($sAttribute, $sClassAlias);
-                    $oCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
-                    $oNewFilter->AddConditionExpression($oCondition);
-                    $aFilters[] = $oNewFilter;
-                }
-                // Unions are much faster than OR conditions
-                $oFilter = new DBUnionSearch($aFilters);
-                break;
-
-			default:
-				$oValueExpr = new ScalarExpression('%'.$sContains.'%');
-				$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
-				$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
-				$oFilter->AddConditionExpression($oNewCondition);
-				break;
-		}
-
-		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs, null, $this->m_iLimit, 0, $this->m_bSort);
-		if (empty($this->m_sValueAttCode))
-		{
-			$aAttToLoad = array($oFilter->GetClassAlias() => array('friendlyname'));
-		}
-		else
-		{
-			$aAttToLoad = array($oFilter->GetClassAlias() => array($this->m_sValueAttCode));
-		}
-		$oObjects->OptimizeColumnLoad($aAttToLoad);
-		while ($oObject = $oObjects->Fetch())
-		{
-			if (empty($this->m_sValueAttCode))
-			{
-				$this->m_aValues[$oObject->GetKey()] = $oObject->GetName();
-			}
-			else
-			{
-				$this->m_aValues[$oObject->GetKey()] = $oObject->Get($this->m_sValueAttCode);
-			}
-		}
-		return true;
-	}
-	
-	public function GetValuesDescription()
-	{
-		return 'Filter: '.$this->m_sFilterExpr;
-	}
-
-	public function GetFilterExpression()
-	{
-		return $this->m_sFilterExpr;
-	}
-
-	/**
-	 * @param $iLimit
-	 */
-	public function SetLimit($iLimit)
-	{
-		$this->m_iLimit = $iLimit;
-	}
-
-	/**
-	 * @param $bSort
-	 */
-	public function SetSort($bSort)
-	{
-		$this->m_bSort = $bSort;
-	}
-}
-
-
-/**
- * Fixed set values (could be hardcoded in the business model) 
- *
- * @package     iTopORM
- */
-class ValueSetEnum extends ValueSetDefinition
-{
-	protected $m_values;
-
-	public function __construct($Values)
-	{
-		$this->m_values = $Values;
-	}
-
-	// Helper to export the datat model
-	public function GetValueList()
-	{
-		$this->LoadValues($aArgs = array());
-		return $this->m_aValues;
-	}
-
-	protected function LoadValues($aArgs)
-	{
-		if (is_array($this->m_values))
-		{
-			$aValues = $this->m_values;
-		}
-		elseif (is_string($this->m_values) && strlen($this->m_values) > 0)
-		{
-			$aValues = array();
-			foreach (explode(",", $this->m_values) as $sVal)
-			{
-				$sVal = trim($sVal);
-				$sKey = $sVal; 
-				$aValues[$sKey] = $sVal;
-			}
-		}
-		else
-		{
-			$aValues = array();
-		}
-		$this->m_aValues = $aValues;
-		return true;
-	}
-}
-
-/**
- * Fixed set values, defined as a range: 0..59 (with an optional increment)
- *
- * @package     iTopORM
- */
-class ValueSetRange extends ValueSetDefinition
-{
-	protected $m_iStart;
-	protected $m_iEnd;
-
-	public function __construct($iStart, $iEnd, $iStep = 1)
-	{
-		$this->m_iStart = $iStart;
-		$this->m_iEnd = $iEnd;
-		$this->m_iStep = $iStep;
-	}
-
-	protected function LoadValues($aArgs)
-	{
-		$iValue = $this->m_iStart;
-		for($iValue = $this->m_iStart; $iValue <= $this->m_iEnd; $iValue += $this->m_iStep)
-		{
-			$this->m_aValues[$iValue] = $iValue;
-		}
-		return true;
-	}
-}
-
-
-/**
- * Data model classes 
- *
- * @package     iTopORM
- */
-class ValueSetEnumClasses extends ValueSetEnum
-{
-	protected $m_sCategories;
-
-	public function __construct($sCategories = '', $sAdditionalValues = '')
-	{
-		$this->m_sCategories = $sCategories;
-		parent::__construct($sAdditionalValues);
-	}
-
-	protected function LoadValues($aArgs)
-	{
-		// Call the parent to parse the additional values...
-		parent::LoadValues($aArgs);
-		
-		// Translate the labels of the additional values
-		foreach($this->m_aValues as $sClass => $void)
-		{
-			if (MetaModel::IsValidClass($sClass))
-			{
-				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
-			}
-			else
-			{
-				unset($this->m_aValues[$sClass]);
-			}
-		}
-
-		// Then, add the classes from the category definition
-		foreach (MetaModel::GetClasses($this->m_sCategories) as $sClass)
-		{
-			if (MetaModel::IsValidClass($sClass))
-			{
-				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
-			}
-			else
-			{
-				unset($this->m_aValues[$sClass]);
-			}
-		}
-
-		return true;
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Value set definitions (from a fixed list or from a query, etc.)
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('MyHelpers.class.inc.php');
+
+/**
+ * ValueSetDefinition
+ * value sets API and implementations
+ *
+ * @package     iTopORM
+ */
+abstract class ValueSetDefinition
+{
+	protected $m_bIsLoaded = false;
+	protected $m_aValues = array();
+
+
+	// Displayable description that could be computed out of the std usage context
+	public function GetValuesDescription()
+	{
+		$aValues = $this->GetValues(array(), '');
+		$aDisplayedValues = array();
+		foreach($aValues as $key => $value)
+		{
+			$aDisplayedValues[] = "$key => $value";
+		}
+		$sAllowedValues = implode(', ', $aDisplayedValues);
+		return $sAllowedValues;
+	}
+
+
+	public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
+	{
+		if (!$this->m_bIsLoaded)
+		{
+			$this->LoadValues($aArgs);
+			$this->m_bIsLoaded = true;
+		}
+		if (strlen($sContains) == 0)
+		{
+			// No filtering
+			$aRet = $this->m_aValues;
+		}
+		else
+		{
+			// Filter on results containing the needle <sContain>
+			$aRet = array();
+			foreach ($this->m_aValues as $sKey=>$sValue)
+			{
+				if (stripos($sValue, $sContains) !== false)
+				{
+					$aRet[$sKey] = $sValue;
+				}
+			}
+		}
+		// Sort on the display value
+		asort($aRet);
+		return $aRet;
+	}
+
+	abstract protected function LoadValues($aArgs);
+}
+
+
+/**
+ * Set of existing values for an attribute, given a search filter 
+ *
+ * @package     iTopORM
+ */
+class ValueSetObjects extends ValueSetDefinition
+{
+	protected $m_sContains;
+	protected $m_sOperation;
+	protected $m_sFilterExpr; // in OQL
+	protected $m_sValueAttCode;
+	protected $m_aOrderBy;
+	protected $m_aExtraConditions;
+	private $m_bAllowAllData;
+	private $m_aModifierProperties;
+	private $m_bSort;
+	private $m_iLimit;
+
+
+	/**
+	 * @param hash $aOrderBy Array of '[<classalias>.]attcode' => bAscending
+	 */	
+	public function __construct($sFilterExp, $sValueAttCode = '', $aOrderBy = array(), $bAllowAllData = false, $aModifierProperties = array())
+	{
+		$this->m_sContains = '';
+		$this->m_sOperation = '';
+		$this->m_sFilterExpr = $sFilterExp;
+		$this->m_sValueAttCode = $sValueAttCode;
+		$this->m_aOrderBy = $aOrderBy;
+		$this->m_bAllowAllData = $bAllowAllData;
+		$this->m_aModifierProperties = $aModifierProperties;
+		$this->m_aExtraConditions = array();
+		$this->m_bSort = true;
+		$this->m_iLimit = 0;
+	}
+
+	public function SetModifierProperty($sPluginClass, $sProperty, $value)
+	{
+		$this->m_aModifierProperties[$sPluginClass][$sProperty] = $value;
+	}
+
+	public function AddCondition(DBSearch $oFilter)
+	{
+		$this->m_aExtraConditions[] = $oFilter;		
+	}
+
+	public function ToObjectSet($aArgs = array(), $sContains = '', $iAdditionalValue = null)
+	{
+		if ($this->m_bAllowAllData)
+		{
+			$oFilter = DBObjectSearch::FromOQL_AllData($this->m_sFilterExpr);
+		}
+		else
+		{
+			$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr);
+		}
+		foreach($this->m_aExtraConditions as $oExtraFilter)
+		{
+			$oFilter = $oFilter->Intersect($oExtraFilter);
+		}
+		foreach($this->m_aModifierProperties as $sPluginClass => $aProperties)
+		{
+			foreach ($aProperties as $sProperty => $value)
+			{
+				$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
+			}
+		}
+		if ($iAdditionalValue > 0)
+		{
+			$oSearchAdditionalValue = new DBObjectSearch($oFilter->GetClass());
+			$oSearchAdditionalValue->AddConditionExpression( new BinaryExpression(
+			    new FieldExpression('id', $oSearchAdditionalValue->GetClassAlias()),
+                '=',
+                new VariableExpression('current_extkey_id'))
+            );
+			$oSearchAdditionalValue->AllowAllData();
+			$oSearchAdditionalValue->SetArchiveMode(true);
+			$oSearchAdditionalValue->SetInternalParams( array('current_extkey_id' => $iAdditionalValue) );
+
+			$oFilter = new DBUnionSearch(array($oFilter, $oSearchAdditionalValue));
+		}
+
+		return new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
+	}
+
+    /**
+     * @param        $aArgs
+     * @param string $sContains
+     * @param string $sOperation for the values @see self::LoadValues()
+     *
+     * @return array
+     * @throws CoreException
+     * @throws OQLException
+     */
+    public function GetValues($aArgs, $sContains = '', $sOperation = 'contains')
+	{
+		if (!$this->m_bIsLoaded || ($sContains != $this->m_sContains) || ($sOperation != $this->m_sOperation))
+		{
+			$this->LoadValues($aArgs, $sContains, $sOperation);
+			$this->m_bIsLoaded = true;
+		}
+		// The results are already filtered and sorted (on friendly name)
+		$aRet = $this->m_aValues;
+		return $aRet;
+	}
+
+	/**
+	 * @param $aArgs
+	 * @param string $sContains
+	 * @param string $sOperation 'contains' or 'equals_start_with'
+	 *
+	 * @return bool
+	 * @throws \CoreException
+	 * @throws \OQLException
+	 */
+	protected function LoadValues($aArgs, $sContains = '', $sOperation = 'contains')
+	{
+		$this->m_sContains = $sContains;
+		$this->m_sOperation = $sOperation;
+
+		$this->m_aValues = array();
+		
+		if ($this->m_bAllowAllData)
+		{
+			$oFilter = DBObjectSearch::FromOQL_AllData($this->m_sFilterExpr);
+		}
+		else
+		{
+			$oFilter = DBObjectSearch::FromOQL($this->m_sFilterExpr);
+		}
+		if (!$oFilter) return false;
+		foreach($this->m_aExtraConditions as $oExtraFilter)
+		{
+			$oFilter = $oFilter->Intersect($oExtraFilter);
+		}
+		foreach($this->m_aModifierProperties as $sPluginClass => $aProperties)
+		{
+			foreach ($aProperties as $sProperty => $value)
+			{
+				$oFilter->SetModifierProperty($sPluginClass, $sProperty, $value);
+			}
+		}
+
+		$oExpression = DBObjectSearch::GetPolymorphicExpression($oFilter->GetClass(), 'friendlyname');
+		$aFields = $oExpression->ListRequiredFields();
+		$sClass = $oFilter->GetClass();
+		foreach($aFields as $sField)
+		{
+			$aFieldItems = explode('.', $sField);
+			if ($aFieldItems[0] != $sClass)
+			{
+				$sOperation = 'contains';
+				break;
+			}
+		}
+
+		switch ($sOperation)
+		{
+			case 'equals':
+				$aAttributes = MetaModel::GetFriendlyNameAttributeCodeList($sClass);
+				$sClassAlias = $oFilter->GetClassAlias();
+				$aFilters = array();
+				$oValueExpr = new ScalarExpression($sContains);
+				foreach($aAttributes as $sAttribute)
+				{
+					$oNewFilter = $oFilter->DeepClone();
+					$oNameExpr = new FieldExpression($sAttribute, $sClassAlias);
+					$oCondition = new BinaryExpression($oNameExpr, '=', $oValueExpr);
+					$oNewFilter->AddConditionExpression($oCondition);
+					$aFilters[] = $oNewFilter;
+				}
+                // Unions are much faster than OR conditions
+				$oFilter = new DBUnionSearch($aFilters);
+				break;
+            case 'start_with':
+                $aAttributes = MetaModel::GetFriendlyNameAttributeCodeList($sClass);
+                $sClassAlias = $oFilter->GetClassAlias();
+                $aFilters = array();
+                $oValueExpr = new ScalarExpression($sContains.'%');
+                foreach($aAttributes as $sAttribute)
+                {
+                    $oNewFilter = $oFilter->DeepClone();
+                    $oNameExpr = new FieldExpression($sAttribute, $sClassAlias);
+                    $oCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+                    $oNewFilter->AddConditionExpression($oCondition);
+                    $aFilters[] = $oNewFilter;
+                }
+                // Unions are much faster than OR conditions
+                $oFilter = new DBUnionSearch($aFilters);
+                break;
+
+			default:
+				$oValueExpr = new ScalarExpression('%'.$sContains.'%');
+				$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
+				$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+				$oFilter->AddConditionExpression($oNewCondition);
+				break;
+		}
+
+		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs, null, $this->m_iLimit, 0, $this->m_bSort);
+		if (empty($this->m_sValueAttCode))
+		{
+			$aAttToLoad = array($oFilter->GetClassAlias() => array('friendlyname'));
+		}
+		else
+		{
+			$aAttToLoad = array($oFilter->GetClassAlias() => array($this->m_sValueAttCode));
+		}
+		$oObjects->OptimizeColumnLoad($aAttToLoad);
+		while ($oObject = $oObjects->Fetch())
+		{
+			if (empty($this->m_sValueAttCode))
+			{
+				$this->m_aValues[$oObject->GetKey()] = $oObject->GetName();
+			}
+			else
+			{
+				$this->m_aValues[$oObject->GetKey()] = $oObject->Get($this->m_sValueAttCode);
+			}
+		}
+		return true;
+	}
+	
+	public function GetValuesDescription()
+	{
+		return 'Filter: '.$this->m_sFilterExpr;
+	}
+
+	public function GetFilterExpression()
+	{
+		return $this->m_sFilterExpr;
+	}
+
+	/**
+	 * @param $iLimit
+	 */
+	public function SetLimit($iLimit)
+	{
+		$this->m_iLimit = $iLimit;
+	}
+
+	/**
+	 * @param $bSort
+	 */
+	public function SetSort($bSort)
+	{
+		$this->m_bSort = $bSort;
+	}
+}
+
+
+/**
+ * Fixed set values (could be hardcoded in the business model) 
+ *
+ * @package     iTopORM
+ */
+class ValueSetEnum extends ValueSetDefinition
+{
+	protected $m_values;
+
+	public function __construct($Values)
+	{
+		$this->m_values = $Values;
+	}
+
+	// Helper to export the datat model
+	public function GetValueList()
+	{
+		$this->LoadValues($aArgs = array());
+		return $this->m_aValues;
+	}
+
+	protected function LoadValues($aArgs)
+	{
+		if (is_array($this->m_values))
+		{
+			$aValues = $this->m_values;
+		}
+		elseif (is_string($this->m_values) && strlen($this->m_values) > 0)
+		{
+			$aValues = array();
+			foreach (explode(",", $this->m_values) as $sVal)
+			{
+				$sVal = trim($sVal);
+				$sKey = $sVal; 
+				$aValues[$sKey] = $sVal;
+			}
+		}
+		else
+		{
+			$aValues = array();
+		}
+		$this->m_aValues = $aValues;
+		return true;
+	}
+}
+
+/**
+ * Fixed set values, defined as a range: 0..59 (with an optional increment)
+ *
+ * @package     iTopORM
+ */
+class ValueSetRange extends ValueSetDefinition
+{
+	protected $m_iStart;
+	protected $m_iEnd;
+
+	public function __construct($iStart, $iEnd, $iStep = 1)
+	{
+		$this->m_iStart = $iStart;
+		$this->m_iEnd = $iEnd;
+		$this->m_iStep = $iStep;
+	}
+
+	protected function LoadValues($aArgs)
+	{
+		$iValue = $this->m_iStart;
+		for($iValue = $this->m_iStart; $iValue <= $this->m_iEnd; $iValue += $this->m_iStep)
+		{
+			$this->m_aValues[$iValue] = $iValue;
+		}
+		return true;
+	}
+}
+
+
+/**
+ * Data model classes 
+ *
+ * @package     iTopORM
+ */
+class ValueSetEnumClasses extends ValueSetEnum
+{
+	protected $m_sCategories;
+
+	public function __construct($sCategories = '', $sAdditionalValues = '')
+	{
+		$this->m_sCategories = $sCategories;
+		parent::__construct($sAdditionalValues);
+	}
+
+	protected function LoadValues($aArgs)
+	{
+		// Call the parent to parse the additional values...
+		parent::LoadValues($aArgs);
+		
+		// Translate the labels of the additional values
+		foreach($this->m_aValues as $sClass => $void)
+		{
+			if (MetaModel::IsValidClass($sClass))
+			{
+				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			}
+			else
+			{
+				unset($this->m_aValues[$sClass]);
+			}
+		}
+
+		// Then, add the classes from the category definition
+		foreach (MetaModel::GetClasses($this->m_sCategories) as $sClass)
+		{
+			if (MetaModel::IsValidClass($sClass))
+			{
+				$this->m_aValues[$sClass] = MetaModel::GetName($sClass);
+			}
+			else
+			{
+				unset($this->m_aValues[$sClass]);
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/css/blue_green.css b/css/blue_green.css
index 18585c3cd..75837a430 100644
--- a/css/blue_green.css
+++ b/css/blue_green.css
@@ -1,222 +1,222 @@
-/* CSS Document */
-body {
-    font-family: Verdana, Arial, Helevtica;
-    font-size: smaller;
-    background-color: #68a;
-    color:#000000;
-	margin: 0;			/* Remove body margin/padding */
-	padding: 0;
-	overflow: hidden;	/* Remove scroll bars on browser window */
-}
-
-table {
-	border: 1px solid #000000;
-}
-
-.raw_output {
-    font-family: Courier-New, Courier, Arial, Helevtica;
-    font-size: smaller;
-    background-color: #eeeeee;
-    color: #000000;
-    border: 1px dashed #000000;
-    padding: 0.25em;
-    margin-top: 1em;
-}
-
-th {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-    background-color:#ace27d;	
-}
-
-td {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-	background-color: #b7cfe8;
-}
-
-tr.clicked td {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-	background-color: #ffcfe8;
-}
-
-td.label {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-    background-color:#ace27d;
-    padding: 0.2em;	
-}
-
-td a, td a:visited {
-	text-decoration:none;
-	color:#000000;
-}
-td a:hover {
-	text-decoration:underline;
-	color:#FFFFFF;
-}
-
-a.small_action {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-	text-decoration:none;
-}
-
-.display_block {
-	noborder: 1px dashed #CCC;
-	background: #79b;
-	padding:0.25em;
-}
-div#TopPane .display_block {
-	background: #f0eee0;
-	padding:0.25em;
-	text-align:center;
-}
-div#TopPane label {
-	color:#000;
-	background: #f0eee0;
-}
-
-div#TopPane td {
-	color:#000;
-	background: #f0eee0;
-}
-
-.loading {
-	noborder: 1px dashed #CCC;
-	background: #b9c1c8;
-	padding:0.25em;
-}
-
-label {
-	font-family:Georgia, "Times New Roman", Times, serif;
-	color:#FFFFFF;
-	text-align:right;
-}
-
-input.textSearch {
-	border:1px solid #333;
-	noheight:1.2em;
-	font-size:0.8em;
-	font-family:Verdana, Arial, Helvetica, sans-serif;
-	color:#000000;
-}
-
-/* By Rom */
-.csvimport_createobj {
-    color: #AA0000;
-    background-color:#EEEEEE;
-}
-.csvimport_error {
-    font-weight: bold;
-    color: #FF0000;
-    background-color:#EEEEEE;
-}
-.csvimport_warning {
-    color: #CC8888;
-    background-color:#EEEEEE;
-}
-.csvimport_ok {
-    color: #00000;
-    background-color:#BBFFBB;
-}
-.csvimport_reconkey {
-    font-style: italic;
-    color: #888888;
-    background-color:#FFFFF;
-}
-.csvimport_extreconkey {
-    color: #888888;
-    background-color:#FFFFFF;
-}
-
-.treeview, .treeview ul { 
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}	
-
-.treeview li { 
-	margin: 0;
-	padding: 3px 0pt 3px 16px;
-	font-size:0.9em;
-}
-
-ul.dir li {
-	padding: 2px 0 0 16px;
-}
-
-.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
-.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
-.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
-.treeview .last { background-image: url(../images/tv-item-last.gif); }
-.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
-.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
-
-#Header { padding: 0; background:#ccc url(../images/bandeau2.gif) repeat-x center;}
-div.iTopLogo {
-	background:url(../images/iTop.gif) no-repeat center;
-	width:100px;
-	height:56px;
-}
-div.iTopLogo span {
-	display:none;
-}
-
-#MySplitter {
-	/* Height is set to match window size in $().ready() below */
-	border:0px;
-	margin:4px;
-	padding:0px;
-	min-width: 100px;	/* Splitter can't be too thin ... */
-	min-height: 100px;	/* ... or too flat */
-}
-#LeftPane {
-	background: #f0eee0;
-	padding: 4px;
-	overflow: auto;		/* Scroll bars appear as needed */
-	color:#666;
-}
-#TopPane {				/* Top nested in right pane */
-	background: #f0eee0;
-	padding: 4px;
-	height: 150px;		/* Initial height */
-	min-height: 75px;	/* Minimum height */
-	overflow: auto;	
-	color:#666;
-}
-#RightPane {			/* Bottom nested in right pane */
-	background: #79b;
-	height:150px;		/* Initial height */
-	min-height:130px;
-	no.padding:15px;
-	no.margin:10px;
-	overflow:auto;
-	color:#fff;
-}
-
-#BottomPane {			/* Bottom nested in right pane */
-	background: #79b;
-	padding: 4px;
-	overflow: auto;
-	color:#fff;
-}
-#MySplitter .vsplitbar {
-	width: 7px;
-	height: 50px;
-	background: #68a url(../images/vgrabber2.gif) no-repeat  center;
-}
-#MySplitter .vsplitbar.active, #MySplitter .vsplitbar:hover {
-	background: #68a url(../images/vgrabber2_active.gif) no-repeat  center;
-}
-#MySplitter .hsplitbar {
-	height: 8px;
-	background: #68a url(../images/hgrabber2.gif) no-repeat center;
-}
-#MySplitter .hsplitbar.active, #MySplitter .hsplitbar:hover {
-	background: #68a url(../images/hgrabber2_active.gif) no-repeat center;
-}
+/* CSS Document */
+body {
+    font-family: Verdana, Arial, Helevtica;
+    font-size: smaller;
+    background-color: #68a;
+    color:#000000;
+	margin: 0;			/* Remove body margin/padding */
+	padding: 0;
+	overflow: hidden;	/* Remove scroll bars on browser window */
+}
+
+table {
+	border: 1px solid #000000;
+}
+
+.raw_output {
+    font-family: Courier-New, Courier, Arial, Helevtica;
+    font-size: smaller;
+    background-color: #eeeeee;
+    color: #000000;
+    border: 1px dashed #000000;
+    padding: 0.25em;
+    margin-top: 1em;
+}
+
+th {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: smaller;
+    color: #000000;
+    background-color:#ace27d;	
+}
+
+td {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: smaller;
+	background-color: #b7cfe8;
+}
+
+tr.clicked td {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: smaller;
+	background-color: #ffcfe8;
+}
+
+td.label {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: smaller;
+    color: #000000;
+    background-color:#ace27d;
+    padding: 0.2em;	
+}
+
+td a, td a:visited {
+	text-decoration:none;
+	color:#000000;
+}
+td a:hover {
+	text-decoration:underline;
+	color:#FFFFFF;
+}
+
+a.small_action {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: smaller;
+    color: #000000;
+	text-decoration:none;
+}
+
+.display_block {
+	noborder: 1px dashed #CCC;
+	background: #79b;
+	padding:0.25em;
+}
+div#TopPane .display_block {
+	background: #f0eee0;
+	padding:0.25em;
+	text-align:center;
+}
+div#TopPane label {
+	color:#000;
+	background: #f0eee0;
+}
+
+div#TopPane td {
+	color:#000;
+	background: #f0eee0;
+}
+
+.loading {
+	noborder: 1px dashed #CCC;
+	background: #b9c1c8;
+	padding:0.25em;
+}
+
+label {
+	font-family:Georgia, "Times New Roman", Times, serif;
+	color:#FFFFFF;
+	text-align:right;
+}
+
+input.textSearch {
+	border:1px solid #333;
+	noheight:1.2em;
+	font-size:0.8em;
+	font-family:Verdana, Arial, Helvetica, sans-serif;
+	color:#000000;
+}
+
+/* By Rom */
+.csvimport_createobj {
+    color: #AA0000;
+    background-color:#EEEEEE;
+}
+.csvimport_error {
+    font-weight: bold;
+    color: #FF0000;
+    background-color:#EEEEEE;
+}
+.csvimport_warning {
+    color: #CC8888;
+    background-color:#EEEEEE;
+}
+.csvimport_ok {
+    color: #00000;
+    background-color:#BBFFBB;
+}
+.csvimport_reconkey {
+    font-style: italic;
+    color: #888888;
+    background-color:#FFFFF;
+}
+.csvimport_extreconkey {
+    color: #888888;
+    background-color:#FFFFFF;
+}
+
+.treeview, .treeview ul { 
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}	
+
+.treeview li { 
+	margin: 0;
+	padding: 3px 0pt 3px 16px;
+	font-size:0.9em;
+}
+
+ul.dir li {
+	padding: 2px 0 0 16px;
+}
+
+.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
+.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
+.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
+.treeview .last { background-image: url(../images/tv-item-last.gif); }
+.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
+.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
+
+#Header { padding: 0; background:#ccc url(../images/bandeau2.gif) repeat-x center;}
+div.iTopLogo {
+	background:url(../images/iTop.gif) no-repeat center;
+	width:100px;
+	height:56px;
+}
+div.iTopLogo span {
+	display:none;
+}
+
+#MySplitter {
+	/* Height is set to match window size in $().ready() below */
+	border:0px;
+	margin:4px;
+	padding:0px;
+	min-width: 100px;	/* Splitter can't be too thin ... */
+	min-height: 100px;	/* ... or too flat */
+}
+#LeftPane {
+	background: #f0eee0;
+	padding: 4px;
+	overflow: auto;		/* Scroll bars appear as needed */
+	color:#666;
+}
+#TopPane {				/* Top nested in right pane */
+	background: #f0eee0;
+	padding: 4px;
+	height: 150px;		/* Initial height */
+	min-height: 75px;	/* Minimum height */
+	overflow: auto;	
+	color:#666;
+}
+#RightPane {			/* Bottom nested in right pane */
+	background: #79b;
+	height:150px;		/* Initial height */
+	min-height:130px;
+	no.padding:15px;
+	no.margin:10px;
+	overflow:auto;
+	color:#fff;
+}
+
+#BottomPane {			/* Bottom nested in right pane */
+	background: #79b;
+	padding: 4px;
+	overflow: auto;
+	color:#fff;
+}
+#MySplitter .vsplitbar {
+	width: 7px;
+	height: 50px;
+	background: #68a url(../images/vgrabber2.gif) no-repeat  center;
+}
+#MySplitter .vsplitbar.active, #MySplitter .vsplitbar:hover {
+	background: #68a url(../images/vgrabber2_active.gif) no-repeat  center;
+}
+#MySplitter .hsplitbar {
+	height: 8px;
+	background: #68a url(../images/hgrabber2.gif) no-repeat center;
+}
+#MySplitter .hsplitbar.active, #MySplitter .hsplitbar:hover {
+	background: #68a url(../images/hgrabber2_active.gif) no-repeat center;
+}
diff --git a/css/date.picker.css b/css/date.picker.css
index a394482a0..b537f5039 100644
--- a/css/date.picker.css
+++ b/css/date.picker.css
@@ -1,117 +1,117 @@
-
-
-table.jCalendar {
-	border: 1px solid #000;
-	background: #aaa;
-    border-collapse: separate;
-    border-spacing: 2px;
-}
-table.jCalendar th {
-	background: #333;
-	color: #fff;
-	font-weight: bold;
-	padding: 3px 5px;
-}
-table.jCalendar td {
-	background: #ccc;
-	color: #000;
-	padding: 3px 5px;
-	text-align: center;
-}
-table.jCalendar td.other-month {
-	background: #ddd;
-	color: #aaa;
-}
-table.jCalendar td.today {
-	background: #666;
-	color: #fff;
-}
-table.jCalendar td.selected {
-	background: #f66;
-	color: #fff;
-}
-table.jCalendar td.selected:hover {
-	background: #f33;
-	color: #fff;
-}
-table.jCalendar td:hover, table.jCalendar td.dp-hover {
-	background: #fff;
-	color: #000;
-}
-table.jCalendar td.disabled, table.jCalendar td.disabled:hover {
-	background: #bbb;
-	color: #888;
-}
-
-/* For the popup */
-
-/* NOTE - you will probably want to style a.dp-choose-date - see how I did it in demo.css */
-
-div.dp-popup {
-	position: relative;
-	background: #ccc;
-	font-size: 10px;
-	font-family: arial, sans-serif;
-	padding: 2px;
-	width: 171px;
-	line-height: 1.2em;
-}
-div#dp-popup {
-	position: absolute;
-	z-index: 199;
-}
-div.dp-popup h2 {
-	font-size: 12px;
-	text-align: center;
-	margin: 2px 0;
-	padding: 0;
-}
-a#dp-close {
-	font-size: 11px;
-	padding: 4px 0;
-	text-align: center;
-	display: block;
-}
-a#dp-close:hover {
-	text-decoration: underline;
-}
-div.dp-popup a {
-	color: #000;
-	text-decoration: none;
-	padding: 3px 2px 0;
-}
-div.dp-popup div.dp-nav-prev {
-	position: absolute;
-	top: 2px;
-	left: 4px;
-	width: 100px;
-}
-div.dp-popup div.dp-nav-prev a {
-	float: left;
-}
-/* Opera needs the rules to be this specific otherwise it doesn't change the cursor back to pointer after you have disabled and re-enabled a link */
-div.dp-popup div.dp-nav-prev a, div.dp-popup div.dp-nav-next a {
-	cursor: pointer;
-}
-div.dp-popup div.dp-nav-prev a.disabled, div.dp-popup div.dp-nav-next a.disabled {
-	cursor: default;
-}
-div.dp-popup div.dp-nav-next {
-	position: absolute;
-	top: 2px;
-	right: 4px;
-	width: 100px;
-}
-div.dp-popup div.dp-nav-next a {
-	float: right;
-}
-div.dp-popup a.disabled {
-	cursor: default;
-	color: #aaa;
-}
-div.dp-popup td {
-	cursor: pointer;
-}
-div.dp-popup td.disabled {
-	cursor: default;
+
+
+table.jCalendar {
+	border: 1px solid #000;
+	background: #aaa;
+    border-collapse: separate;
+    border-spacing: 2px;
+}
+table.jCalendar th {
+	background: #333;
+	color: #fff;
+	font-weight: bold;
+	padding: 3px 5px;
+}
+table.jCalendar td {
+	background: #ccc;
+	color: #000;
+	padding: 3px 5px;
+	text-align: center;
+}
+table.jCalendar td.other-month {
+	background: #ddd;
+	color: #aaa;
+}
+table.jCalendar td.today {
+	background: #666;
+	color: #fff;
+}
+table.jCalendar td.selected {
+	background: #f66;
+	color: #fff;
+}
+table.jCalendar td.selected:hover {
+	background: #f33;
+	color: #fff;
+}
+table.jCalendar td:hover, table.jCalendar td.dp-hover {
+	background: #fff;
+	color: #000;
+}
+table.jCalendar td.disabled, table.jCalendar td.disabled:hover {
+	background: #bbb;
+	color: #888;
+}
+
+/* For the popup */
+
+/* NOTE - you will probably want to style a.dp-choose-date - see how I did it in demo.css */
+
+div.dp-popup {
+	position: relative;
+	background: #ccc;
+	font-size: 10px;
+	font-family: arial, sans-serif;
+	padding: 2px;
+	width: 171px;
+	line-height: 1.2em;
+}
+div#dp-popup {
+	position: absolute;
+	z-index: 199;
+}
+div.dp-popup h2 {
+	font-size: 12px;
+	text-align: center;
+	margin: 2px 0;
+	padding: 0;
+}
+a#dp-close {
+	font-size: 11px;
+	padding: 4px 0;
+	text-align: center;
+	display: block;
+}
+a#dp-close:hover {
+	text-decoration: underline;
+}
+div.dp-popup a {
+	color: #000;
+	text-decoration: none;
+	padding: 3px 2px 0;
+}
+div.dp-popup div.dp-nav-prev {
+	position: absolute;
+	top: 2px;
+	left: 4px;
+	width: 100px;
+}
+div.dp-popup div.dp-nav-prev a {
+	float: left;
+}
+/* Opera needs the rules to be this specific otherwise it doesn't change the cursor back to pointer after you have disabled and re-enabled a link */
+div.dp-popup div.dp-nav-prev a, div.dp-popup div.dp-nav-next a {
+	cursor: pointer;
+}
+div.dp-popup div.dp-nav-prev a.disabled, div.dp-popup div.dp-nav-next a.disabled {
+	cursor: default;
+}
+div.dp-popup div.dp-nav-next {
+	position: absolute;
+	top: 2px;
+	right: 4px;
+	width: 100px;
+}
+div.dp-popup div.dp-nav-next a {
+	float: right;
+}
+div.dp-popup a.disabled {
+	cursor: default;
+	color: #aaa;
+}
+div.dp-popup td {
+	cursor: pointer;
+}
+div.dp-popup td.disabled {
+	cursor: default;
 }
\ No newline at end of file
diff --git a/css/default.css b/css/default.css
index eaabed838..66afc959c 100644
--- a/css/default.css
+++ b/css/default.css
@@ -1,165 +1,165 @@
-/* CSS Document */
-body {
-    font-family: Verdana, Arial, Helevtica;
-    font-size: smaller;
-    background-color: #ffffff;
-    color:#000000;
-	margin: 0;			/* Remove body margin/padding */
-	padding: 0;
-	overflow: hidden;	/* Remove scroll bars on browser window */
-}
-
-table {
-	border: 1px solid #000000;
-}
-
-.raw_output {
-    font-family: Courier-New, Courier, Arial, Helevtica;
-    font-size: smaller;
-    background-color: #eeeeee;
-    color: #000000;
-    border: 1px dashed #000000;
-    padding: 0.25em;
-    margin-top: 1em;
-}
-
-th {
-    font-family: Verdana, Arial, Helevtica;
-    font-size: smaller;
-    color: #000000;
-    background-color:#E1DEB5;	
-}
-
-td {
-    font-family: Verdana, Arial, Helevtica;
-    font-size: smaller;
-}
-
-td.label {
-    font-family: Verdana, Arial, Helevtica;
-    font-size: smaller;
-    color: #000000;
-    background-color:#E1DEB5;
-    padding: 0.2em;	
-}
-
-a.small_action {
-    font-family: Verdana, Arial, Helvetica;
-    font-size: smaller;
-    color: #000000;
-	text-decoration:none;
-}
-
-.display_block {
-	border: 1px dashed #CCC;
-	background: #CFC;
-	padding:0.25em;
-}
-
-.loading {
-	border: 1px dashed #CCC;
-	background: #FCC;
-	padding:0.25em;
-}
-
-/* By Rom */
-.csvimport_createobj {
-    color: #AA0000;
-    background-color:#EEEEEE;
-}
-.csvimport_error {
-    font-weight: bold;
-    color: #FF0000;
-    background-color:#EEEEEE;
-}
-.csvimport_warning {
-    color: #CC8888;
-    background-color:#EEEEEE;
-}
-.csvimport_ok {
-    color: #00000;
-    background-color:#BBFFBB;
-}
-.csvimport_reconkey {
-    font-style: italic;
-    color: #888888;
-    background-color:#FFFFF;
-}
-.csvimport_extreconkey {
-    color: #888888;
-    background-color:#FFFFFF;
-}
-
-.treeview, .treeview ul { 
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}	
-
-.treeview li { 
-	margin: 0;
-	padding: 3px 0pt 3px 16px;
-}
-
-ul.dir li { padding: 2px 0 0 16px; }
-
-.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
-.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
-.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
-.treeview .last { background-image: url(../images/tv-item-last.gif); }
-.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
-.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
-
-#MySplitter {
-	/* Height is set to match window size in $().ready() below */
-	border:0px;
-	margin:4px;
-	padding:0px;
-	min-width: 100px;	/* Splitter can't be too thin ... */
-	min-height: 100px;	/* ... or too flat */
-}
-#LeftPane {
-	background: #f0eee0;
-	padding: 4px;
-	overflow: auto;		/* Scroll bars appear as needed */
-	color:#666;
-}
-#TopPane {				/* Top nested in right pane */
-	background: #f0eee0;
-	padding: 4px;
-	height: 150px;		/* Initial height */
-	min-height: 75px;	/* Minimum height */
-	overflow: auto;	
-	color:#666;
-}
-#RightPane {			/* Bottom nested in right pane */
-	background: #79b;
-	height:150px;		/* Initial height */
-	min-height:130px;
-	no.padding:15px;
-	no.margin:10px;
-	overflow:auto;
-	color:#fff;
-}
-
-#BottomPane {			/* Bottom nested in right pane */
-	background: #79b;
-	padding: 4px;
-	overflow: auto;
-	color:#fff;
-}
-#MySplitter .vsplitbar {
-	width: 7px;
-	height: 50px;
-	background: #68a url(../images/vgrabber2.gif) no-repeat  center;
-}
-#MySplitter .vsplitbar.active, #MySplitter .vsplitbar:hover {
-	background: #68a url(../images/vgrabber2_active.gif) no-repeat  center;
-}
-#MySplitter .hsplitbar {
-	height: 8px;
-	background: #68a url(../images/hgrabber2.gif) no-repeat center;
-}
-#MySplitter .hsplitbar.active, #MySplitter .hsplitbar:hover {
-	background: #68a url(../images/hgrabber2_active.gif) no-repeat center;
-}
+/* CSS Document */
+body {
+    font-family: Verdana, Arial, Helevtica;
+    font-size: smaller;
+    background-color: #ffffff;
+    color:#000000;
+	margin: 0;			/* Remove body margin/padding */
+	padding: 0;
+	overflow: hidden;	/* Remove scroll bars on browser window */
+}
+
+table {
+	border: 1px solid #000000;
+}
+
+.raw_output {
+    font-family: Courier-New, Courier, Arial, Helevtica;
+    font-size: smaller;
+    background-color: #eeeeee;
+    color: #000000;
+    border: 1px dashed #000000;
+    padding: 0.25em;
+    margin-top: 1em;
+}
+
+th {
+    font-family: Verdana, Arial, Helevtica;
+    font-size: smaller;
+    color: #000000;
+    background-color:#E1DEB5;	
+}
+
+td {
+    font-family: Verdana, Arial, Helevtica;
+    font-size: smaller;
+}
+
+td.label {
+    font-family: Verdana, Arial, Helevtica;
+    font-size: smaller;
+    color: #000000;
+    background-color:#E1DEB5;
+    padding: 0.2em;	
+}
+
+a.small_action {
+    font-family: Verdana, Arial, Helvetica;
+    font-size: smaller;
+    color: #000000;
+	text-decoration:none;
+}
+
+.display_block {
+	border: 1px dashed #CCC;
+	background: #CFC;
+	padding:0.25em;
+}
+
+.loading {
+	border: 1px dashed #CCC;
+	background: #FCC;
+	padding:0.25em;
+}
+
+/* By Rom */
+.csvimport_createobj {
+    color: #AA0000;
+    background-color:#EEEEEE;
+}
+.csvimport_error {
+    font-weight: bold;
+    color: #FF0000;
+    background-color:#EEEEEE;
+}
+.csvimport_warning {
+    color: #CC8888;
+    background-color:#EEEEEE;
+}
+.csvimport_ok {
+    color: #00000;
+    background-color:#BBFFBB;
+}
+.csvimport_reconkey {
+    font-style: italic;
+    color: #888888;
+    background-color:#FFFFF;
+}
+.csvimport_extreconkey {
+    color: #888888;
+    background-color:#FFFFFF;
+}
+
+.treeview, .treeview ul { 
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}	
+
+.treeview li { 
+	margin: 0;
+	padding: 3px 0pt 3px 16px;
+}
+
+ul.dir li { padding: 2px 0 0 16px; }
+
+.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
+.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
+.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
+.treeview .last { background-image: url(../images/tv-item-last.gif); }
+.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
+.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
+
+#MySplitter {
+	/* Height is set to match window size in $().ready() below */
+	border:0px;
+	margin:4px;
+	padding:0px;
+	min-width: 100px;	/* Splitter can't be too thin ... */
+	min-height: 100px;	/* ... or too flat */
+}
+#LeftPane {
+	background: #f0eee0;
+	padding: 4px;
+	overflow: auto;		/* Scroll bars appear as needed */
+	color:#666;
+}
+#TopPane {				/* Top nested in right pane */
+	background: #f0eee0;
+	padding: 4px;
+	height: 150px;		/* Initial height */
+	min-height: 75px;	/* Minimum height */
+	overflow: auto;	
+	color:#666;
+}
+#RightPane {			/* Bottom nested in right pane */
+	background: #79b;
+	height:150px;		/* Initial height */
+	min-height:130px;
+	no.padding:15px;
+	no.margin:10px;
+	overflow:auto;
+	color:#fff;
+}
+
+#BottomPane {			/* Bottom nested in right pane */
+	background: #79b;
+	padding: 4px;
+	overflow: auto;
+	color:#fff;
+}
+#MySplitter .vsplitbar {
+	width: 7px;
+	height: 50px;
+	background: #68a url(../images/vgrabber2.gif) no-repeat  center;
+}
+#MySplitter .vsplitbar.active, #MySplitter .vsplitbar:hover {
+	background: #68a url(../images/vgrabber2_active.gif) no-repeat  center;
+}
+#MySplitter .hsplitbar {
+	height: 8px;
+	background: #68a url(../images/hgrabber2.gif) no-repeat center;
+}
+#MySplitter .hsplitbar.active, #MySplitter .hsplitbar:hover {
+	background: #68a url(../images/hgrabber2_active.gif) no-repeat center;
+}
diff --git a/css/font-combodo/glyphs/0.svg b/css/font-combodo/glyphs/0.svg
index ad232eb48..022d8f225 100644
--- a/css/font-combodo/glyphs/0.svg
+++ b/css/font-combodo/glyphs/0.svg
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<g>
-	<path fill="#231F20" d="M358.179,112.114c45.101-19.253,92.379-28.928,141.835-28.928c49.429,0,96.705,9.675,141.757,28.928
-		c45.031,19.253,83.89,45.208,116.459,77.777c32.56,32.559,58.514,71.398,77.855,116.548
-		c19.174,45.041,28.928,92.319,28.928,141.736s-9.754,96.705-28.928,141.737c-19.342,45.129-45.296,83.979-77.855,116.547
-		c-32.569,32.559-71.418,58.514-116.459,77.776c-45.052,19.254-92.328,28.929-141.757,28.929c-49.456,0-96.735-9.675-141.835-28.929
-		c-45.031-19.263-83.88-45.218-116.498-77.776c-32.559-32.559-58.465-71.408-77.767-116.547
-		c-19.302-45.032-28.928-92.32-28.928-141.737s9.626-96.696,28.928-141.736c19.302-45.14,45.208-83.979,77.767-116.548
-		C274.309,157.322,313.149,131.366,358.179,112.114z M223.803,595.22l79.013-79.014c-7.605-22.236-11.412-44.962-11.412-68.022
-		s3.807-45.796,11.412-68.032l-79.013-79.004c-24.435,46.435-36.691,95.46-36.691,147.036S199.368,548.776,223.803,595.22z
-		 M389.395,558.774c30.537,30.578,67.404,45.866,110.63,45.866c43.146,0,80.014-15.288,110.591-45.866
-		c30.499-30.497,45.797-67.364,45.797-110.59c0-43.235-15.288-80.103-45.797-110.67c-30.577-30.498-67.444-45.796-110.591-45.796
-		c-43.226,0-80.093,15.279-110.63,45.796c-30.538,30.567-45.836,67.435-45.836,110.67
-		C343.558,491.41,358.857,528.267,389.395,558.774z M500.015,135.35c-51.616,0-100.621,12.227-147.114,36.681l79.042,79.013
-		c22.247-7.595,44.972-11.402,68.063-11.402c22.981,0,45.786,3.808,67.944,11.402l79.092-79.013
-		C600.519,147.577,551.592,135.35,500.015,135.35z M500.015,761.018c51.577,0,100.504-12.228,147.036-36.69l-79.092-79.004
-		c-22.158,7.605-44.963,11.403-67.944,11.403c-23.1,0-45.826-3.798-68.052-11.403l-79.052,79.004
-		C399.404,748.791,448.409,761.018,500.015,761.018z M697.155,516.197l79.014,79.014c24.385-46.444,36.691-95.46,36.691-147.036
-		s-12.316-100.602-36.691-147.036l-79.014,79.004c7.605,22.236,11.413,44.972,11.413,68.032S704.75,493.961,697.155,516.197z"/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<g>
+	<path fill="#231F20" d="M358.179,112.114c45.101-19.253,92.379-28.928,141.835-28.928c49.429,0,96.705,9.675,141.757,28.928
+		c45.031,19.253,83.89,45.208,116.459,77.777c32.56,32.559,58.514,71.398,77.855,116.548
+		c19.174,45.041,28.928,92.319,28.928,141.736s-9.754,96.705-28.928,141.737c-19.342,45.129-45.296,83.979-77.855,116.547
+		c-32.569,32.559-71.418,58.514-116.459,77.776c-45.052,19.254-92.328,28.929-141.757,28.929c-49.456,0-96.735-9.675-141.835-28.929
+		c-45.031-19.263-83.88-45.218-116.498-77.776c-32.559-32.559-58.465-71.408-77.767-116.547
+		c-19.302-45.032-28.928-92.32-28.928-141.737s9.626-96.696,28.928-141.736c19.302-45.14,45.208-83.979,77.767-116.548
+		C274.309,157.322,313.149,131.366,358.179,112.114z M223.803,595.22l79.013-79.014c-7.605-22.236-11.412-44.962-11.412-68.022
+		s3.807-45.796,11.412-68.032l-79.013-79.004c-24.435,46.435-36.691,95.46-36.691,147.036S199.368,548.776,223.803,595.22z
+		 M389.395,558.774c30.537,30.578,67.404,45.866,110.63,45.866c43.146,0,80.014-15.288,110.591-45.866
+		c30.499-30.497,45.797-67.364,45.797-110.59c0-43.235-15.288-80.103-45.797-110.67c-30.577-30.498-67.444-45.796-110.591-45.796
+		c-43.226,0-80.093,15.279-110.63,45.796c-30.538,30.567-45.836,67.435-45.836,110.67
+		C343.558,491.41,358.857,528.267,389.395,558.774z M500.015,135.35c-51.616,0-100.621,12.227-147.114,36.681l79.042,79.013
+		c22.247-7.595,44.972-11.402,68.063-11.402c22.981,0,45.786,3.808,67.944,11.402l79.092-79.013
+		C600.519,147.577,551.592,135.35,500.015,135.35z M500.015,761.018c51.577,0,100.504-12.228,147.036-36.69l-79.092-79.004
+		c-22.158,7.605-44.963,11.403-67.944,11.403c-23.1,0-45.826-3.798-68.052-11.403l-79.052,79.004
+		C399.404,748.791,448.409,761.018,500.015,761.018z M697.155,516.197l79.014,79.014c24.385-46.444,36.691-95.46,36.691-147.036
+		s-12.316-100.602-36.691-147.036l-79.014,79.004c7.605,22.236,11.413,44.972,11.413,68.032S704.75,493.961,697.155,516.197z"/>
+</g>
+</svg>
diff --git a/css/font-combodo/glyphs/1.svg b/css/font-combodo/glyphs/1.svg
index 2750be5d4..d78c67055 100644
--- a/css/font-combodo/glyphs/1.svg
+++ b/css/font-combodo/glyphs/1.svg
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<path fill="#231F20" d="M866.498,492.629c0-172.569-172.61-312.947-366.54-312.947c-205.265,0-366.456,140.378-366.456,312.947
-	c0,172.511,161.191,312.948,366.456,312.948c42.846,0,86.248-11.319,129.707-22.049l118.354,64.845L715.315,740.69
-	C802.134,675.854,866.498,589.597,866.498,492.629z M658.162,524.678c0,7.801-7.768,14.133-17.22,14.133H536.297v104.612
-	c0,9.542-6.373,17.252-14.182,17.252h-77.89c-7.851,0-14.183-7.71-14.183-17.252V538.811H325.448c-9.501,0-17.22-6.332-17.22-14.133
-	V446.78c0-7.892,7.719-14.224,17.22-14.224h104.596V327.953c0-9.452,6.332-17.178,14.183-17.178h77.89
-	c7.809,0,14.182,7.726,14.182,17.178v104.603h104.646c9.452,0,17.22,6.332,17.22,14.224V524.678L658.162,524.678z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<path fill="#231F20" d="M866.498,492.629c0-172.569-172.61-312.947-366.54-312.947c-205.265,0-366.456,140.378-366.456,312.947
+	c0,172.511,161.191,312.948,366.456,312.948c42.846,0,86.248-11.319,129.707-22.049l118.354,64.845L715.315,740.69
+	C802.134,675.854,866.498,589.597,866.498,492.629z M658.162,524.678c0,7.801-7.768,14.133-17.22,14.133H536.297v104.612
+	c0,9.542-6.373,17.252-14.182,17.252h-77.89c-7.851,0-14.183-7.71-14.183-17.252V538.811H325.448c-9.501,0-17.22-6.332-17.22-14.133
+	V446.78c0-7.892,7.719-14.224,17.22-14.224h104.596V327.953c0-9.452,6.332-17.178,14.183-17.178h77.89
+	c7.809,0,14.182,7.726,14.182,17.178v104.603h104.646c9.452,0,17.22,6.332,17.22,14.224V524.678L658.162,524.678z"/>
+</svg>
diff --git a/css/font-combodo/glyphs/2.svg b/css/font-combodo/glyphs/2.svg
index 7709ca27e..23589d7b7 100644
--- a/css/font-combodo/glyphs/2.svg
+++ b/css/font-combodo/glyphs/2.svg
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<path fill="#231F20" d="M296.416,534.64c0-116.722,78.171-217.884,191.547-266.479c-46.256-27.633-102.769-43.899-164.408-43.899
-	c-151.479,0-286.188,109.67-286.188,244.378c0,75.69,50.255,143.041,118.02,193.622l-25.533,84.137l92.469-50.59
-	c33.882,8.341,67.755,17.184,101.232,17.184c13.53,0,26.777-0.847,39.761-2.355C321.305,661.336,296.416,600.473,296.416,534.64z"/>
-<path fill="#231F20" d="M970.632,541.419c0-148.892-148.893-270.098-316.318-270.098c-177.153,0-316.258,121.214-316.258,270.098
-	c0,148.884,139.114,270.089,316.258,270.089c37.007,0,74.445-9.779,111.903-18.993l102.212,55.895l-28.234-92.972
-	C915.1,699.525,970.632,625.08,970.632,541.419z M509.305,574.939c-18.552,0-37.087-18.543-37.087-37.589
-	c0-18.632,18.535-37.166,37.087-37.166c28.375,0,46.953,18.544,46.953,37.166C556.258,556.405,537.68,574.939,509.305,574.939z
-	 M650.668,574.983c-18.533,0-37.077-18.631-37.077-37.677c0-18.588,18.544-37.166,37.077-37.166
-	c28.366,0,47.007,18.588,47.007,37.166C697.675,556.361,679.026,574.983,650.668,574.983z M792.182,574.939
-	c-18.649,0-37.175-18.543-37.175-37.589c0-18.632,18.535-37.166,37.175-37.166c27.846,0,46.865,18.544,46.865,37.166
-	C839.038,556.405,820.036,574.939,792.182,574.939z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<path fill="#231F20" d="M296.416,534.64c0-116.722,78.171-217.884,191.547-266.479c-46.256-27.633-102.769-43.899-164.408-43.899
+	c-151.479,0-286.188,109.67-286.188,244.378c0,75.69,50.255,143.041,118.02,193.622l-25.533,84.137l92.469-50.59
+	c33.882,8.341,67.755,17.184,101.232,17.184c13.53,0,26.777-0.847,39.761-2.355C321.305,661.336,296.416,600.473,296.416,534.64z"/>
+<path fill="#231F20" d="M970.632,541.419c0-148.892-148.893-270.098-316.318-270.098c-177.153,0-316.258,121.214-316.258,270.098
+	c0,148.884,139.114,270.089,316.258,270.089c37.007,0,74.445-9.779,111.903-18.993l102.212,55.895l-28.234-92.972
+	C915.1,699.525,970.632,625.08,970.632,541.419z M509.305,574.939c-18.552,0-37.087-18.543-37.087-37.589
+	c0-18.632,18.535-37.166,37.087-37.166c28.375,0,46.953,18.544,46.953,37.166C556.258,556.405,537.68,574.939,509.305,574.939z
+	 M650.668,574.983c-18.533,0-37.077-18.631-37.077-37.677c0-18.588,18.544-37.166,37.077-37.166
+	c28.366,0,47.007,18.588,47.007,37.166C697.675,556.361,679.026,574.983,650.668,574.983z M792.182,574.939
+	c-18.649,0-37.175-18.543-37.175-37.589c0-18.632,18.535-37.166,37.175-37.166c27.846,0,46.865,18.544,46.865,37.166
+	C839.038,556.405,820.036,574.939,792.182,574.939z"/>
+</svg>
diff --git a/css/font-combodo/glyphs/3.svg b/css/font-combodo/glyphs/3.svg
index ffe595e0c..4be5fc9b2 100644
--- a/css/font-combodo/glyphs/3.svg
+++ b/css/font-combodo/glyphs/3.svg
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_2"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<path fill="#231F20" d="M968.382,542.585c0-147.978-147.97-268.432-314.358-268.432c-176.063,0-314.305,120.454-314.305,268.432
-	C339.719,690.537,477.978,811,654.024,811c36.769,0,73.984-9.719,111.201-18.885l101.578,55.557l-28.05-92.404
-	C913.185,699.703,968.382,625.726,968.382,542.585z M776.583,628.103l-47.11,47.215c-4.771,4.764-13.385,3.939-19.068-1.842
-	l-63.441-63.433l-63.433,63.433c-5.78,5.693-14.306,6.605-19.017,1.842l-47.259-47.215c-4.815-4.859-3.981-13.288,1.78-19.068
-	l63.398-63.433l-63.398-63.442c-5.736-5.78-6.552-14.209-1.78-18.98l47.259-47.303c4.711-4.772,13.245-3.851,19.017,1.833
-	l63.433,63.433l63.441-63.433c5.684-5.771,14.297-6.605,19.068-1.833l47.11,47.303c4.771,4.771,3.946,13.209-1.824,18.893
-	l-63.442,63.529l63.442,63.433C780.617,614.815,781.355,623.332,776.583,628.103z"/>
-<path fill="#231F20" d="M294.81,532.718c0-115.999,77.686-216.533,190.36-264.827c-45.97-27.462-102.131-43.628-163.389-43.628
-	c-150.539,0-284.413,108.99-284.413,242.864c0,75.222,49.943,142.163,117.288,192.422l-25.375,83.623l91.895-50.275
-	c33.672,8.279,67.336,17.077,100.605,17.077c13.446,0,26.612-0.833,39.514-2.342C319.545,658.636,294.81,598.133,294.81,532.718z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_2"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<path fill="#231F20" d="M968.382,542.585c0-147.978-147.97-268.432-314.358-268.432c-176.063,0-314.305,120.454-314.305,268.432
+	C339.719,690.537,477.978,811,654.024,811c36.769,0,73.984-9.719,111.201-18.885l101.578,55.557l-28.05-92.404
+	C913.185,699.703,968.382,625.726,968.382,542.585z M776.583,628.103l-47.11,47.215c-4.771,4.764-13.385,3.939-19.068-1.842
+	l-63.441-63.433l-63.433,63.433c-5.78,5.693-14.306,6.605-19.017,1.842l-47.259-47.215c-4.815-4.859-3.981-13.288,1.78-19.068
+	l63.398-63.433l-63.398-63.442c-5.736-5.78-6.552-14.209-1.78-18.98l47.259-47.303c4.711-4.772,13.245-3.851,19.017,1.833
+	l63.433,63.433l63.441-63.433c5.684-5.771,14.297-6.605,19.068-1.833l47.11,47.303c4.771,4.771,3.946,13.209-1.824,18.893
+	l-63.442,63.529l63.442,63.433C780.617,614.815,781.355,623.332,776.583,628.103z"/>
+<path fill="#231F20" d="M294.81,532.718c0-115.999,77.686-216.533,190.36-264.827c-45.97-27.462-102.131-43.628-163.389-43.628
+	c-150.539,0-284.413,108.99-284.413,242.864c0,75.222,49.943,142.163,117.288,192.422l-25.375,83.623l91.895-50.275
+	c33.672,8.279,67.336,17.077,100.605,17.077c13.446,0,26.612-0.833,39.514-2.342C319.545,658.636,294.81,598.133,294.81,532.718z"/>
+</svg>
diff --git a/css/font-combodo/glyphs/4.svg b/css/font-combodo/glyphs/4.svg
index 9e807f579..bc525b3b1 100644
--- a/css/font-combodo/glyphs/4.svg
+++ b/css/font-combodo/glyphs/4.svg
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<path d="M782.403,865.469l-154.508-84.653c-41.386,10.247-84.155,20.761-126.938,20.761c-103.692,0-200.729-34.312-273.236-96.612
-	c-35.467-30.476-63.322-66.095-82.789-105.866c-20.192-41.251-30.43-85.147-30.43-130.469c0-45.334,10.238-89.239,30.43-130.493
-	c19.467-39.773,47.321-75.391,82.79-105.864c72.499-62.287,169.535-96.59,273.235-96.59c49.85,0,98.952,8.694,145.943,25.842
-	c45.657,16.661,87.014,40.417,122.923,70.61c36.458,30.654,65.213,66.204,85.467,105.661
-	c21.372,41.634,32.208,85.653,32.208,130.834c0,49.914-15.553,99.344-46.225,146.918c-24.909,38.634-59.118,75.12-101.793,108.597
-	L782.403,865.469L782.403,865.469z M633.438,738.242l82.198,45.035l-22.539-74.211l11.251-8.401
-	c92.312-68.938,143.15-151.343,143.15-232.036c0-158.793-158.696-292.947-346.541-292.947
-	c-191.036,0-346.455,131.416-346.455,292.947s155.419,292.947,346.455,292.947c38.218,0,77.086-9.624,118.235-19.813
-	L633.438,738.242L633.438,738.242z"/>
-<path d="M658.965,500.679c0,7.801-7.768,14.133-17.219,14.133H537.102v104.612c0,9.542-6.373,17.252-14.184,17.252h-77.889
-	c-7.852,0-14.184-7.71-14.184-17.252V514.812H326.252c-9.501,0-17.22-6.332-17.22-14.133V422.78c0-7.892,7.719-14.224,17.22-14.224
-	h104.597V303.953c0-9.451,6.331-17.178,14.183-17.178h77.889c7.811,0,14.184,7.727,14.184,17.178v104.604h104.645
-	c9.453,0,17.221,6.332,17.221,14.224v77.898H658.965z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<path d="M782.403,865.469l-154.508-84.653c-41.386,10.247-84.155,20.761-126.938,20.761c-103.692,0-200.729-34.312-273.236-96.612
+	c-35.467-30.476-63.322-66.095-82.789-105.866c-20.192-41.251-30.43-85.147-30.43-130.469c0-45.334,10.238-89.239,30.43-130.493
+	c19.467-39.773,47.321-75.391,82.79-105.864c72.499-62.287,169.535-96.59,273.235-96.59c49.85,0,98.952,8.694,145.943,25.842
+	c45.657,16.661,87.014,40.417,122.923,70.61c36.458,30.654,65.213,66.204,85.467,105.661
+	c21.372,41.634,32.208,85.653,32.208,130.834c0,49.914-15.553,99.344-46.225,146.918c-24.909,38.634-59.118,75.12-101.793,108.597
+	L782.403,865.469L782.403,865.469z M633.438,738.242l82.198,45.035l-22.539-74.211l11.251-8.401
+	c92.312-68.938,143.15-151.343,143.15-232.036c0-158.793-158.696-292.947-346.541-292.947
+	c-191.036,0-346.455,131.416-346.455,292.947s155.419,292.947,346.455,292.947c38.218,0,77.086-9.624,118.235-19.813
+	L633.438,738.242L633.438,738.242z"/>
+<path d="M658.965,500.679c0,7.801-7.768,14.133-17.219,14.133H537.102v104.612c0,9.542-6.373,17.252-14.184,17.252h-77.889
+	c-7.852,0-14.184-7.71-14.184-17.252V514.812H326.252c-9.501,0-17.22-6.332-17.22-14.133V422.78c0-7.892,7.719-14.224,17.22-14.224
+	h104.597V303.953c0-9.451,6.331-17.178,14.183-17.178h77.889c7.811,0,14.184,7.727,14.184,17.178v104.604h104.645
+	c9.453,0,17.221,6.332,17.221,14.224v77.898H658.965z"/>
+</svg>
diff --git a/css/font-combodo/glyphs/C.svg b/css/font-combodo/glyphs/C.svg
index f1a82079b..65d2c1c1e 100644
--- a/css/font-combodo/glyphs/C.svg
+++ b/css/font-combodo/glyphs/C.svg
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<path fill="#010101" d="M626.01,912.824c-3.839,0-7.464-0.894-10.775-2.654c-7.166-3.806-18.222-13.761-11.633-37.6
-	c2.681-9.688,7.889-21.117,13.407-33.22c7.747-16.992,16.526-36.251,19.114-52.397c2.104-13.062-7.717-35.54-26.272-60.147
-	c-14.192-18.821-29.013-33.055-37.457-39.536c-23.266,8.18-60.974,17.937-83.818,18.217l-0.822,0.005
-	c-19.333,0.001-30.751-8.556-38.305-14.218c-3.396-2.546-5.573-4.135-7.489-4.795c-3.329,0.364-13.864,3.459-28.673,11.547
-	c-10.319,5.635-17.318,10.728-21.348,14.225c9.669,10.246,33.908,28.146,45.247,36.52c11.281,8.332,20.191,14.912,25.046,19.598
-	c17.505,16.855,13.923,58.696,13.027,66.911c-2.021,18.544-9.063,51.887-33.495,66.841c-8.156,4.99-16.938,7.518-26.104,7.518
-	c-37.301,0-67.472-43.222-72.642-59.651c-3.555-11.314-5.598-32.092-6.533-44.069c-7.101-5.721-19.086-15.689-31.088-27.095
-	c-29.089-27.642-41.487-47.405-40.193-64.08c2.387-31.286,28.692-83.744,80.798-124.937c12.665-10.002,32.123-16.555,48.9-20.662
-	c-7.086-5.52-16.09-10.549-26.88-12.719c-1.526-0.309-3.006-0.463-4.412-0.463c-5.852,0-10.735,2.765-15.904,5.694
-	c-2.03,1.149-4.128,2.338-6.329,3.376c-28.714,13.508-52.119,33.866-70.925,50.225c-17.052,14.834-28.318,24.632-40.378,27.201
-	c-1.722,0.374-3.601,0.569-5.525,0.57c-0.003,0-0.007,0-0.01,0c-8.992,0-23.197-3.622-60.349-30.442
-	c-8.514-6.148-16.478-12.251-22.737-17.169l-17.281,18.383l-1.544,1.073c-2.684,1.868-16.848,11.184-32.191,11.186
-	c-13.706,0.002-24.83-7.259-30.523-19.921c-10.257-22.775-8.457-83.479-7.993-95.417l0.06-1.485l0.3-1.458
-	c1.125-5.441,7.759-33.159,27.945-44.569c3.507-1.979,7.543-2.978,12.009-2.978c9.292,0,25.593,3.898,76.053,32.807
-	c16.842,9.649,32.412,19.195,41.832,25.067l91.185-51.828l3.857-23.849c-8.177-7.053-21.649-19.009-35.692-32.882
-	c-31.73-31.35-49.341-55.531-53.84-73.927c-6.359-25.939-2.63-61.543,10.235-97.67c6.171-17.33,23.536-59.211,51.421-73.771
-	c8.874-4.639,20.872-6.992,35.652-6.992c21.307,0,44.994,4.871,66.696,13.717c26.152,10.658,47.653,26.479,62.183,45.754
-	c26.064,34.583,25.061,86.052,21.877,114.888l7.091,0.138l22.506-18.698l36.82-20.278l-4.926-9.063l-41.675-8.174l-3.501-9.488
-	c-0.365-0.989-9-24.507-14.485-50.54c-5.625-26.7-10.367-63.969,13.306-79.276c7.723-4.994,17.518-7.524,29.114-7.524
-	c33.263,0,75.393,20.77,80.087,23.14l5.021,2.533l35.934,66.072c4.951,3.875,14.762,11.859,24.305,21.408
-	c21.854,21.867,30.233,39.52,26.377,55.556c-3.766,15.762-21.216,32.516-51.736,60.771c-19.577,18.125-41.766,38.667-49.108,51.768
-	c-9.224,16.444,8.018,33.826,20.604,43.624c10.608-11.457,26.778-29.194,36.398-41.075c9.482-11.754,28.798-29.333,48.047-43.721
-	c25.969-19.412,47.112-29.904,62.843-31.188c1.025-0.084,2.08-0.127,3.137-0.127c18.719,0,39.658,13.263,61.824,27.304
-	c13.215,8.37,33.184,21.019,40.699,21.019c0.027-0.001,0.038-0.001,0.042,0l0.597-0.106l0.711-0.068
-	c1.407-0.136,6.155-1.147,9.97-1.96c12.402-2.642,29.387-6.258,44.346-6.258c25.01,0,34.521,10.99,38.092,20.21
-	c6.593,17.001-1.824,44.056-10.05,63.758c-5.206,12.473-19.181,42.651-36.454,53.481c-4.435,2.77-9.75,4.167-15.825,4.168
-	c-0.002,0-0.004,0-0.006,0c-16.253,0-40.188-10.529-67.902-22.722c-24.064-10.586-54.012-23.76-67.958-23.76
-	c-1.34,0-1.9,0.149-1.906,0.15c-1.445,0.449-6.93,3.197-15.321,19.279c-7.022,13.462-13.506,31.092-20.368,49.755
-	c-5.829,15.854-11.812,32.129-18.596,47.053c34.784,37.289,53.174,105.168,43.337,165.17c-4.443,27.182-25.34,67.129-43.413,95.448
-	c-10.502,16.453-21.042,30.734-30.482,41.297c-13.905,15.563-24.424,22.205-35.168,22.21
-	C626.018,912.824,626.014,912.824,626.01,912.824L626.01,912.824z M301.15,716.984c0.413,1.587,4.053,12.336,31.011,37.584
-	c16.329,15.291,32.524,27.744,32.686,27.867l6.522,5.001l0.497,8.21c0.748,12.439,2.903,35.26,5.503,43.535
-	c0.714,2.162,5.75,11.524,14.752,20.787c8.434,8.68,17.014,13.656,23.539,13.656c2.508,0,4.83-0.708,7.31-2.224
-	c5.863-3.589,11.203-13.631,14.281-26.858c5.466-23.499,2.169-45.649-0.566-50.771c-3.594-3.264-12.379-9.751-20.891-16.037
-	c-46.36-34.235-66.267-51.283-62.343-70.823c0.904-4.503,3.657-18.211,38.713-38.33c7.419-4.258,32.974-18.149,50.34-18.149
-	c2.255,0,4.416,0.221,6.42,0.659c9.861,2.178,16.659,7.272,22.121,11.365c6.042,4.529,9.371,7.023,16.708,7.023l0.384-0.002
-	c20.516-0.251,60.798-11.345,79.517-18.871l7.094-2.854l6.981,3.126c15.828,7.087,40.592,32.653,56.874,54.245
-	c17.734,23.52,37.869,57.801,33.073,87.545c-2.193,13.68-7.158,27.646-12.763,41.006c1.915-2.937,3.882-6.039,5.901-9.31
-	c18.39-29.797,32.021-59.753,34.73-76.313c4.198-25.614,2.213-54.415-5.593-81.104c-7.73-26.43-20.359-47.85-35.567-60.316
-	l-11.302-9.265l6.744-12.967c8.293-15.949,15.626-35.894,22.717-55.181c16.201-44.063,30.193-82.118,58.847-91.011
-	c3.775-1.167,7.992-1.757,12.545-1.757c21.518,0,51.12,13.022,82.458,26.81c17.82,7.838,41.856,18.412,51.791,19.569
-	c3.893-3.911,11.81-14.803,19.825-33.427c7.422-17.241,10.025-29.765,10.46-35.848c-1.111-0.125-2.566-0.218-4.431-0.218
-	c-11.169,0-26.62,3.291-36.847,5.469c-5.727,1.22-9.971,2.123-13.311,2.508c-1.782,0.277-3.632,0.416-5.511,0.416
-	c-17.961,0-38.365-12.925-59.967-26.607c-13.65-8.647-34.28-21.714-42.554-21.714c-0.072,0-0.143,0.001-0.211,0.007
-	c-6.169,0.503-21.451,7.126-44.211,24.139c-18.746,14.012-35.118,29.476-41.599,37.511c-16.048,19.821-47.398,53.004-48.725,54.407
-	l-9.697,10.255l-12.274-6.968c-0.733-0.417-18.14-10.388-32.508-26.236c-21.859-24.11-26.552-50.48-13.216-74.252
-	c10.117-18.052,33.47-39.673,56.055-60.581c14.814-13.717,36.946-34.207,40.932-42.293c-0.587-2.08-3.642-9.708-18.976-24.506
-	c-10.635-10.264-21.05-18.011-21.152-18.089l-3.195-2.368l-34.189-62.867c-13.597-6.252-40.612-16.921-58.942-16.921
-	c-5.382,0-8.05,0.962-9.127,1.507c-1.668,2.911-3.995,15.773,2.813,45.84c2.839,12.529,6.404,24.296,8.938,32.082l38.169,7.485
-	l30.114,55.409l-65.187,35.9l-30.181,25.075l-63.004-1.229l4.712-21.44c4.257-19.601,10.387-77.069-12.131-106.948
-	c-22.336-29.63-67.277-45.133-100.124-45.133c-9.904,0-16.298,1.497-18.979,2.898c-22.114,11.548-53.948,87.747-43.353,130.96
-	c5.065,20.708,52.987,67.619,85.4,94.317l7.977,6.571l-9.886,61.117l-125.008,71.053l-9.157-5.862
-	c-0.226-0.145-22.931-14.664-48.237-29.213c-34.989-20.116-50.335-26.187-56.376-28.019c-3.153,4.022-6.154,11.394-7.477,16.741
-	c-1.009,28.676,0.349,64.309,4.313,76.066c2.499-0.563,5.934-2.098,8.592-3.68l37.485-39.871l13.028,10.832
-	c28.844,23.984,61.46,46.256,72.363,49.584c4.873-2.66,14.944-11.422,23.195-18.599c19.407-16.881,45.987-40.002,79.21-55.631
-	c0.969-0.457,2.408-1.272,3.931-2.135c7.292-4.13,18.311-10.371,33.652-10.371c3.793,0,7.668,0.394,11.522,1.171
-	c45.986,9.249,69.087,49.411,70.049,51.117l13.311,23.62l-26.934,3.106c-17.707,2.063-50.544,9.073-63.231,19.095
-	C322.512,654.276,302.914,697.664,301.15,716.984L301.15,716.984z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<path fill="#010101" d="M626.01,912.824c-3.839,0-7.464-0.894-10.775-2.654c-7.166-3.806-18.222-13.761-11.633-37.6
+	c2.681-9.688,7.889-21.117,13.407-33.22c7.747-16.992,16.526-36.251,19.114-52.397c2.104-13.062-7.717-35.54-26.272-60.147
+	c-14.192-18.821-29.013-33.055-37.457-39.536c-23.266,8.18-60.974,17.937-83.818,18.217l-0.822,0.005
+	c-19.333,0.001-30.751-8.556-38.305-14.218c-3.396-2.546-5.573-4.135-7.489-4.795c-3.329,0.364-13.864,3.459-28.673,11.547
+	c-10.319,5.635-17.318,10.728-21.348,14.225c9.669,10.246,33.908,28.146,45.247,36.52c11.281,8.332,20.191,14.912,25.046,19.598
+	c17.505,16.855,13.923,58.696,13.027,66.911c-2.021,18.544-9.063,51.887-33.495,66.841c-8.156,4.99-16.938,7.518-26.104,7.518
+	c-37.301,0-67.472-43.222-72.642-59.651c-3.555-11.314-5.598-32.092-6.533-44.069c-7.101-5.721-19.086-15.689-31.088-27.095
+	c-29.089-27.642-41.487-47.405-40.193-64.08c2.387-31.286,28.692-83.744,80.798-124.937c12.665-10.002,32.123-16.555,48.9-20.662
+	c-7.086-5.52-16.09-10.549-26.88-12.719c-1.526-0.309-3.006-0.463-4.412-0.463c-5.852,0-10.735,2.765-15.904,5.694
+	c-2.03,1.149-4.128,2.338-6.329,3.376c-28.714,13.508-52.119,33.866-70.925,50.225c-17.052,14.834-28.318,24.632-40.378,27.201
+	c-1.722,0.374-3.601,0.569-5.525,0.57c-0.003,0-0.007,0-0.01,0c-8.992,0-23.197-3.622-60.349-30.442
+	c-8.514-6.148-16.478-12.251-22.737-17.169l-17.281,18.383l-1.544,1.073c-2.684,1.868-16.848,11.184-32.191,11.186
+	c-13.706,0.002-24.83-7.259-30.523-19.921c-10.257-22.775-8.457-83.479-7.993-95.417l0.06-1.485l0.3-1.458
+	c1.125-5.441,7.759-33.159,27.945-44.569c3.507-1.979,7.543-2.978,12.009-2.978c9.292,0,25.593,3.898,76.053,32.807
+	c16.842,9.649,32.412,19.195,41.832,25.067l91.185-51.828l3.857-23.849c-8.177-7.053-21.649-19.009-35.692-32.882
+	c-31.73-31.35-49.341-55.531-53.84-73.927c-6.359-25.939-2.63-61.543,10.235-97.67c6.171-17.33,23.536-59.211,51.421-73.771
+	c8.874-4.639,20.872-6.992,35.652-6.992c21.307,0,44.994,4.871,66.696,13.717c26.152,10.658,47.653,26.479,62.183,45.754
+	c26.064,34.583,25.061,86.052,21.877,114.888l7.091,0.138l22.506-18.698l36.82-20.278l-4.926-9.063l-41.675-8.174l-3.501-9.488
+	c-0.365-0.989-9-24.507-14.485-50.54c-5.625-26.7-10.367-63.969,13.306-79.276c7.723-4.994,17.518-7.524,29.114-7.524
+	c33.263,0,75.393,20.77,80.087,23.14l5.021,2.533l35.934,66.072c4.951,3.875,14.762,11.859,24.305,21.408
+	c21.854,21.867,30.233,39.52,26.377,55.556c-3.766,15.762-21.216,32.516-51.736,60.771c-19.577,18.125-41.766,38.667-49.108,51.768
+	c-9.224,16.444,8.018,33.826,20.604,43.624c10.608-11.457,26.778-29.194,36.398-41.075c9.482-11.754,28.798-29.333,48.047-43.721
+	c25.969-19.412,47.112-29.904,62.843-31.188c1.025-0.084,2.08-0.127,3.137-0.127c18.719,0,39.658,13.263,61.824,27.304
+	c13.215,8.37,33.184,21.019,40.699,21.019c0.027-0.001,0.038-0.001,0.042,0l0.597-0.106l0.711-0.068
+	c1.407-0.136,6.155-1.147,9.97-1.96c12.402-2.642,29.387-6.258,44.346-6.258c25.01,0,34.521,10.99,38.092,20.21
+	c6.593,17.001-1.824,44.056-10.05,63.758c-5.206,12.473-19.181,42.651-36.454,53.481c-4.435,2.77-9.75,4.167-15.825,4.168
+	c-0.002,0-0.004,0-0.006,0c-16.253,0-40.188-10.529-67.902-22.722c-24.064-10.586-54.012-23.76-67.958-23.76
+	c-1.34,0-1.9,0.149-1.906,0.15c-1.445,0.449-6.93,3.197-15.321,19.279c-7.022,13.462-13.506,31.092-20.368,49.755
+	c-5.829,15.854-11.812,32.129-18.596,47.053c34.784,37.289,53.174,105.168,43.337,165.17c-4.443,27.182-25.34,67.129-43.413,95.448
+	c-10.502,16.453-21.042,30.734-30.482,41.297c-13.905,15.563-24.424,22.205-35.168,22.21
+	C626.018,912.824,626.014,912.824,626.01,912.824L626.01,912.824z M301.15,716.984c0.413,1.587,4.053,12.336,31.011,37.584
+	c16.329,15.291,32.524,27.744,32.686,27.867l6.522,5.001l0.497,8.21c0.748,12.439,2.903,35.26,5.503,43.535
+	c0.714,2.162,5.75,11.524,14.752,20.787c8.434,8.68,17.014,13.656,23.539,13.656c2.508,0,4.83-0.708,7.31-2.224
+	c5.863-3.589,11.203-13.631,14.281-26.858c5.466-23.499,2.169-45.649-0.566-50.771c-3.594-3.264-12.379-9.751-20.891-16.037
+	c-46.36-34.235-66.267-51.283-62.343-70.823c0.904-4.503,3.657-18.211,38.713-38.33c7.419-4.258,32.974-18.149,50.34-18.149
+	c2.255,0,4.416,0.221,6.42,0.659c9.861,2.178,16.659,7.272,22.121,11.365c6.042,4.529,9.371,7.023,16.708,7.023l0.384-0.002
+	c20.516-0.251,60.798-11.345,79.517-18.871l7.094-2.854l6.981,3.126c15.828,7.087,40.592,32.653,56.874,54.245
+	c17.734,23.52,37.869,57.801,33.073,87.545c-2.193,13.68-7.158,27.646-12.763,41.006c1.915-2.937,3.882-6.039,5.901-9.31
+	c18.39-29.797,32.021-59.753,34.73-76.313c4.198-25.614,2.213-54.415-5.593-81.104c-7.73-26.43-20.359-47.85-35.567-60.316
+	l-11.302-9.265l6.744-12.967c8.293-15.949,15.626-35.894,22.717-55.181c16.201-44.063,30.193-82.118,58.847-91.011
+	c3.775-1.167,7.992-1.757,12.545-1.757c21.518,0,51.12,13.022,82.458,26.81c17.82,7.838,41.856,18.412,51.791,19.569
+	c3.893-3.911,11.81-14.803,19.825-33.427c7.422-17.241,10.025-29.765,10.46-35.848c-1.111-0.125-2.566-0.218-4.431-0.218
+	c-11.169,0-26.62,3.291-36.847,5.469c-5.727,1.22-9.971,2.123-13.311,2.508c-1.782,0.277-3.632,0.416-5.511,0.416
+	c-17.961,0-38.365-12.925-59.967-26.607c-13.65-8.647-34.28-21.714-42.554-21.714c-0.072,0-0.143,0.001-0.211,0.007
+	c-6.169,0.503-21.451,7.126-44.211,24.139c-18.746,14.012-35.118,29.476-41.599,37.511c-16.048,19.821-47.398,53.004-48.725,54.407
+	l-9.697,10.255l-12.274-6.968c-0.733-0.417-18.14-10.388-32.508-26.236c-21.859-24.11-26.552-50.48-13.216-74.252
+	c10.117-18.052,33.47-39.673,56.055-60.581c14.814-13.717,36.946-34.207,40.932-42.293c-0.587-2.08-3.642-9.708-18.976-24.506
+	c-10.635-10.264-21.05-18.011-21.152-18.089l-3.195-2.368l-34.189-62.867c-13.597-6.252-40.612-16.921-58.942-16.921
+	c-5.382,0-8.05,0.962-9.127,1.507c-1.668,2.911-3.995,15.773,2.813,45.84c2.839,12.529,6.404,24.296,8.938,32.082l38.169,7.485
+	l30.114,55.409l-65.187,35.9l-30.181,25.075l-63.004-1.229l4.712-21.44c4.257-19.601,10.387-77.069-12.131-106.948
+	c-22.336-29.63-67.277-45.133-100.124-45.133c-9.904,0-16.298,1.497-18.979,2.898c-22.114,11.548-53.948,87.747-43.353,130.96
+	c5.065,20.708,52.987,67.619,85.4,94.317l7.977,6.571l-9.886,61.117l-125.008,71.053l-9.157-5.862
+	c-0.226-0.145-22.931-14.664-48.237-29.213c-34.989-20.116-50.335-26.187-56.376-28.019c-3.153,4.022-6.154,11.394-7.477,16.741
+	c-1.009,28.676,0.349,64.309,4.313,76.066c2.499-0.563,5.934-2.098,8.592-3.68l37.485-39.871l13.028,10.832
+	c28.844,23.984,61.46,46.256,72.363,49.584c4.873-2.66,14.944-11.422,23.195-18.599c19.407-16.881,45.987-40.002,79.21-55.631
+	c0.969-0.457,2.408-1.272,3.931-2.135c7.292-4.13,18.311-10.371,33.652-10.371c3.793,0,7.668,0.394,11.522,1.171
+	c45.986,9.249,69.087,49.411,70.049,51.117l13.311,23.62l-26.934,3.106c-17.707,2.063-50.544,9.073-63.231,19.095
+	C322.512,654.276,302.914,697.664,301.15,716.984L301.15,716.984z"/>
+</svg>
diff --git a/css/font-combodo/glyphs/D.svg b/css/font-combodo/glyphs/D.svg
index 78fba5683..a16025f3e 100644
--- a/css/font-combodo/glyphs/D.svg
+++ b/css/font-combodo/glyphs/D.svg
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<path d="M431.95,881.456c-32.777,20.049-67-28.318-71.182-41.602c-4.181-13.314-6.211-47.199-6.211-47.199
-	s-71.674-54.916-69.768-79.485c1.875-24.567,24.261-72.135,72.996-110.647c21.216-16.758,71.336-22.554,71.336-22.554
-	s-19.218-34.085-57.131-41.726c-17.987-3.628-29.149,5.98-37.359,9.854c-53.01,24.938-88.432,71.337-105.897,75.058
-	c-17.035,3.674-85.389-53.164-85.389-53.164l-27.028,28.749c0,0-26.597,18.495-35.515-1.322
-	c-8.917-19.816-6.334-86.126-6.334-86.126s5.012-24.245,18.911-32.101c13.929-7.857,118.903,59.375,118.903,59.375l106.575-60.575
-	l6.764-41.817c0,0-81.545-67.17-90.185-102.5c-11.653-47.537,19.925-132.495,51.78-149.13
-	c24.476-12.791,103.53-1.507,139.875,46.707c32.132,42.633,15.128,119.98,15.128,119.98l33.885,0.661l25.982-21.584l50.305-27.704
-	l-17.28-31.794l-39.512-7.749c0,0-33.454-90.631-8.179-106.974s90.061,16.343,90.061,16.343l34.592,63.603
-	c0,0,51.72,38.344,46.523,59.96c-5.166,21.616-80.007,74.918-97.688,106.466c-22.63,40.341,38.375,74.979,38.375,74.979
-	s31.578-33.393,47.137-52.611c15.527-19.248,70.045-65.155,97.012-67.354c26.966-2.198,81.053,51.734,105.805,47.337
-	c11.593-1.122,65.74-17.833,72.873,0.569c7.134,18.403-20.201,82.543-38.742,94.167c-18.541,11.592-116.968-52.887-147.285-43.509
-	c-30.318,9.409-44.677,86.803-69.952,135.416c37.206,30.486,56.146,99.426,46.86,156.063
-	c-7.503,45.907-75.58,150.269-92.337,141.352c-16.789-8.918,23.061-61.035,29.795-103.039
-	c6.765-41.972-58.668-111.954-78.439-120.81c-20.109,8.087-62.173,19.617-84.835,19.894c-22.63,0.277-27.919-15.281-42.679-18.525
-	c-14.79-3.229-70.045,26.645-72.966,41.188c-2.921,14.544,64.295,57.101,77.548,69.892
-	C462.33,790.227,461.991,863.071,431.95,881.456z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<path d="M431.95,881.456c-32.777,20.049-67-28.318-71.182-41.602c-4.181-13.314-6.211-47.199-6.211-47.199
+	s-71.674-54.916-69.768-79.485c1.875-24.567,24.261-72.135,72.996-110.647c21.216-16.758,71.336-22.554,71.336-22.554
+	s-19.218-34.085-57.131-41.726c-17.987-3.628-29.149,5.98-37.359,9.854c-53.01,24.938-88.432,71.337-105.897,75.058
+	c-17.035,3.674-85.389-53.164-85.389-53.164l-27.028,28.749c0,0-26.597,18.495-35.515-1.322
+	c-8.917-19.816-6.334-86.126-6.334-86.126s5.012-24.245,18.911-32.101c13.929-7.857,118.903,59.375,118.903,59.375l106.575-60.575
+	l6.764-41.817c0,0-81.545-67.17-90.185-102.5c-11.653-47.537,19.925-132.495,51.78-149.13
+	c24.476-12.791,103.53-1.507,139.875,46.707c32.132,42.633,15.128,119.98,15.128,119.98l33.885,0.661l25.982-21.584l50.305-27.704
+	l-17.28-31.794l-39.512-7.749c0,0-33.454-90.631-8.179-106.974s90.061,16.343,90.061,16.343l34.592,63.603
+	c0,0,51.72,38.344,46.523,59.96c-5.166,21.616-80.007,74.918-97.688,106.466c-22.63,40.341,38.375,74.979,38.375,74.979
+	s31.578-33.393,47.137-52.611c15.527-19.248,70.045-65.155,97.012-67.354c26.966-2.198,81.053,51.734,105.805,47.337
+	c11.593-1.122,65.74-17.833,72.873,0.569c7.134,18.403-20.201,82.543-38.742,94.167c-18.541,11.592-116.968-52.887-147.285-43.509
+	c-30.318,9.409-44.677,86.803-69.952,135.416c37.206,30.486,56.146,99.426,46.86,156.063
+	c-7.503,45.907-75.58,150.269-92.337,141.352c-16.789-8.918,23.061-61.035,29.795-103.039
+	c6.765-41.972-58.668-111.954-78.439-120.81c-20.109,8.087-62.173,19.617-84.835,19.894c-22.63,0.277-27.919-15.281-42.679-18.525
+	c-14.79-3.229-70.045,26.645-72.966,41.188c-2.921,14.544,64.295,57.101,77.548,69.892
+	C462.33,790.227,461.991,863.071,431.95,881.456z"/>
+</svg>
diff --git a/css/font-combodo/glyphs/I.svg b/css/font-combodo/glyphs/I.svg
index 2e6eec3e4..3b4b7c50b 100644
--- a/css/font-combodo/glyphs/I.svg
+++ b/css/font-combodo/glyphs/I.svg
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" id="Layer_1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
-	 viewBox="0 0 1000 1000" xml:space="preserve">
-<g>
-	<rect x="50.013" y="50.022" fill="#E87D25" width="899.955" height="899.955"/>
-</g>
-<g>
-	<path fill="#FFFFFF" d="M484.99,341.368c4.958-0.236,9.966-0.368,15.017-0.368c5.04,0,10.036,0.132,14.983,0.366v-50.652
-		l80.77-80.748L499.99,114.17l-95.787,95.796l80.786,80.748V341.368L484.99,341.368z"/>
-	<path fill="#FFFFFF" d="M638.014,392.131l26.871-26.871h114.258V229.796h-135.44v114.223l-25.951,25.95
-		C627.125,376.584,633.957,384.055,638.014,392.131z"/>
-	<polygon fill="#FFFFFF" points="357.698,523.971 357.74,493.971 281.732,493.971 200.96,413.193 105.191,508.971 200.96,604.734 
-		281.731,523.971 	"/>
-	<path fill="#FFFFFF" d="M335.065,365.26l26.892,26.893c4.055-8.076,10.884-15.552,20.258-22.168l-25.936-25.937V229.796H220.805
-		l0.019,135.464H335.065z"/>
-	<path fill="#FFFFFF" d="M361.941,625.778l-26.918,26.918H220.805l0.019,135.436h135.438l0.016-114.264l25.911-25.91
-		C372.814,641.337,365.993,633.857,361.941,625.778z"/>
-	<polygon fill="#FFFFFF" points="799.004,413.194 718.236,493.971 642.31,493.971 642.335,523.971 718.236,523.971 799.004,604.732 
-		894.79,508.971 	"/>
-	<path fill="#FFFFFF" d="M638.029,625.797c-4.057,8.08-10.877,15.557-20.252,22.174l25.926,25.926v114.234h135.44V652.696H664.926
-		L638.029,625.797z"/>
-	<path fill="#FFFFFF" d="M514.99,676.575c-4.947,0.233-9.943,0.366-14.983,0.366c-5.051,0-10.059-0.133-15.017-0.366v50.653
-		l-80.786,80.748l95.787,95.795l95.769-95.795l-80.77-80.746V676.575L514.99,676.575z"/>
-</g>
-<path fill="#FFFFFF" d="M595.973,460.415c-25.874,11.007-59.951,17.067-95.956,17.067c-36.01,0-70.096-6.062-95.976-17.067
-	c-5.955-2.532-11.368-5.297-16.236-8.259l-0.225,159.741c0,7.579,11.064,17.194,28.189,24.476
-	c22.256,9.461,52.172,14.672,84.237,14.672c32.058,0,61.966-5.211,84.214-14.672c17.119-7.279,28.18-16.896,28.18-24.497
-	l-0.127-159.764C607.39,455.092,601.956,457.87,595.973,460.415z"/>
-<path fill="#FFFFFF" d="M500.007,367.609c-32.063,0-61.979,5.213-84.235,14.679c-17.126,7.284-28.191,16.901-28.191,24.504
-	c0,7.612,11.065,17.237,28.191,24.521c22.252,9.463,52.167,14.676,84.235,14.676c32.061,0,61.968-5.213,84.212-14.676
-	c17.12-7.281,28.182-16.907,28.182-24.521c0-7.604-11.062-17.222-28.182-24.504C561.969,372.822,532.061,367.609,500.007,367.609
-	L500.007,367.609z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" id="Layer_1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1000px" height="1000px"
+	 viewBox="0 0 1000 1000" xml:space="preserve">
+<g>
+	<rect x="50.013" y="50.022" fill="#E87D25" width="899.955" height="899.955"/>
+</g>
+<g>
+	<path fill="#FFFFFF" d="M484.99,341.368c4.958-0.236,9.966-0.368,15.017-0.368c5.04,0,10.036,0.132,14.983,0.366v-50.652
+		l80.77-80.748L499.99,114.17l-95.787,95.796l80.786,80.748V341.368L484.99,341.368z"/>
+	<path fill="#FFFFFF" d="M638.014,392.131l26.871-26.871h114.258V229.796h-135.44v114.223l-25.951,25.95
+		C627.125,376.584,633.957,384.055,638.014,392.131z"/>
+	<polygon fill="#FFFFFF" points="357.698,523.971 357.74,493.971 281.732,493.971 200.96,413.193 105.191,508.971 200.96,604.734 
+		281.731,523.971 	"/>
+	<path fill="#FFFFFF" d="M335.065,365.26l26.892,26.893c4.055-8.076,10.884-15.552,20.258-22.168l-25.936-25.937V229.796H220.805
+		l0.019,135.464H335.065z"/>
+	<path fill="#FFFFFF" d="M361.941,625.778l-26.918,26.918H220.805l0.019,135.436h135.438l0.016-114.264l25.911-25.91
+		C372.814,641.337,365.993,633.857,361.941,625.778z"/>
+	<polygon fill="#FFFFFF" points="799.004,413.194 718.236,493.971 642.31,493.971 642.335,523.971 718.236,523.971 799.004,604.732 
+		894.79,508.971 	"/>
+	<path fill="#FFFFFF" d="M638.029,625.797c-4.057,8.08-10.877,15.557-20.252,22.174l25.926,25.926v114.234h135.44V652.696H664.926
+		L638.029,625.797z"/>
+	<path fill="#FFFFFF" d="M514.99,676.575c-4.947,0.233-9.943,0.366-14.983,0.366c-5.051,0-10.059-0.133-15.017-0.366v50.653
+		l-80.786,80.748l95.787,95.795l95.769-95.795l-80.77-80.746V676.575L514.99,676.575z"/>
+</g>
+<path fill="#FFFFFF" d="M595.973,460.415c-25.874,11.007-59.951,17.067-95.956,17.067c-36.01,0-70.096-6.062-95.976-17.067
+	c-5.955-2.532-11.368-5.297-16.236-8.259l-0.225,159.741c0,7.579,11.064,17.194,28.189,24.476
+	c22.256,9.461,52.172,14.672,84.237,14.672c32.058,0,61.966-5.211,84.214-14.672c17.119-7.279,28.18-16.896,28.18-24.497
+	l-0.127-159.764C607.39,455.092,601.956,457.87,595.973,460.415z"/>
+<path fill="#FFFFFF" d="M500.007,367.609c-32.063,0-61.979,5.213-84.235,14.679c-17.126,7.284-28.191,16.901-28.191,24.504
+	c0,7.612,11.065,17.237,28.191,24.521c22.252,9.463,52.167,14.676,84.235,14.676c32.061,0,61.968-5.213,84.212-14.676
+	c17.12-7.281,28.182-16.907,28.182-24.521c0-7.604-11.062-17.222-28.182-24.504C561.969,372.822,532.061,367.609,500.007,367.609
+	L500.007,367.609z"/>
+</svg>
diff --git a/css/font-combodo/test.html b/css/font-combodo/test.html
index 1ff460b0d..434ac047b 100644
--- a/css/font-combodo/test.html
+++ b/css/font-combodo/test.html
@@ -1,84 +1,84 @@
-<html>
-<head>
-<meta charset="utf-8">
-<title>Combodo Font test page</title>
-<link rel="stylesheet" type="text/css" href="./font-combodo.css" />
-<style>
-body {
-	font-size: 10pt;
-	font-family: Verdana, Arial, Helvetica;
-}
-</style>
-<script>
-aIcons = {
-	'new-request': 'New request',
-	'new-request-o': 'New request (outline)',
-	'ongoing-request': 'On-going request',
-	'closed-request': 'Closed request',
-	'combodo-icon': 'Combodo icon',
-	'combodo-icon-o': 'Combodo icon (outline)',
-	'itop-icon': 'iTop icon',
-	'itophub-icon': 'iTop Hub icon',
-	'chameleon-icon': 'Hub\'s Chameleon icon',
-	'opensource-icon': 'Open Source Logo',
-}
-
-function GenerateTable() {
-	var sHtml = '';
-	for(var k in aIcons)
-	{
-		var sClass =  'fc fc-'+k;
-		var sColor = document.getElementById('color').value;
-		var sSize = document.getElementById('size').value;
-		if (sSize != '')
-		{
-			sClass += ' fc-'+sSize;
-		}
-		var sRotation = document.getElementById('rotation').value;
-		if (sRotation != '')
-		{
-			sClass += ' fc-rotate-'+sRotation;
-		}
-		var sFlip = document.getElementById('flip').value;
-		if (sFlip != '')
-		{
-			sClass += ' fc-flip-'+sFlip;
-		}
-		var sAnimation = document.getElementById('animation').value;
-		if (sAnimation != '')
-		{
-			sClass += ' fc-'+sAnimation;
-		}
-		var sStyle= 'color: '+sColor;
-		var sTitle = sClass;
-		sHtml += '<div title="'+sTitle+'"><span class="'+sClass+'" style="'+sStyle+'"></span>&nbsp;'+aIcons[k]+'</div>';
-	}
-	var oElement = document.getElementById('dump');
-	oElement.innerHTML = sHtml;
-}
-</script>
-</head>
-<body>
-<h1>Combodo Font test page</h1>
-<h2>Parameters</h2>
-<div>
-<p>Text color: <input type="text" id="color" value="#CC8800"></p>
-<p>Icon size: <select id="size"><option value="">Normal (1x)</option><option value="2x" selected>2x</option><option value="3x">3x</option><option value="4x">4x</option><option value="5x" selected>5x</option></select></p>
-<p>Rotation: <select id="rotation"><option value="" selected>None</option><option value="90">90°</option><option value="180">180°</option><option value="270">270°</option></select></p>
-<p>Flip: <select id="flip"><option value="" selected>None</option><option value="vertical">Vertical</option><option value="horizontal">Horizontal</option></select> (NB: flip and rotation cannot be combined)</p>
-<p>Animation: <select id="animation"><option value="" selected>None</option><option value="spin">Spin</option><option value="Rotate">Rotate (Experimental!)</option></select></p>
-<button type="button" onclick="GenerateTable()">Redraw !</button>                                                                                         
-</div>
-<h2>Icons</h2>
-<div id="dump"></div>
-
-<script>
-(function() {
-   // your page initialization code here
-   // the DOM will be available here
-   GenerateTable();
-})();
-</script>
-
-</body>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Combodo Font test page</title>
+<link rel="stylesheet" type="text/css" href="./font-combodo.css" />
+<style>
+body {
+	font-size: 10pt;
+	font-family: Verdana, Arial, Helvetica;
+}
+</style>
+<script>
+aIcons = {
+	'new-request': 'New request',
+	'new-request-o': 'New request (outline)',
+	'ongoing-request': 'On-going request',
+	'closed-request': 'Closed request',
+	'combodo-icon': 'Combodo icon',
+	'combodo-icon-o': 'Combodo icon (outline)',
+	'itop-icon': 'iTop icon',
+	'itophub-icon': 'iTop Hub icon',
+	'chameleon-icon': 'Hub\'s Chameleon icon',
+	'opensource-icon': 'Open Source Logo',
+}
+
+function GenerateTable() {
+	var sHtml = '';
+	for(var k in aIcons)
+	{
+		var sClass =  'fc fc-'+k;
+		var sColor = document.getElementById('color').value;
+		var sSize = document.getElementById('size').value;
+		if (sSize != '')
+		{
+			sClass += ' fc-'+sSize;
+		}
+		var sRotation = document.getElementById('rotation').value;
+		if (sRotation != '')
+		{
+			sClass += ' fc-rotate-'+sRotation;
+		}
+		var sFlip = document.getElementById('flip').value;
+		if (sFlip != '')
+		{
+			sClass += ' fc-flip-'+sFlip;
+		}
+		var sAnimation = document.getElementById('animation').value;
+		if (sAnimation != '')
+		{
+			sClass += ' fc-'+sAnimation;
+		}
+		var sStyle= 'color: '+sColor;
+		var sTitle = sClass;
+		sHtml += '<div title="'+sTitle+'"><span class="'+sClass+'" style="'+sStyle+'"></span>&nbsp;'+aIcons[k]+'</div>';
+	}
+	var oElement = document.getElementById('dump');
+	oElement.innerHTML = sHtml;
+}
+</script>
+</head>
+<body>
+<h1>Combodo Font test page</h1>
+<h2>Parameters</h2>
+<div>
+<p>Text color: <input type="text" id="color" value="#CC8800"></p>
+<p>Icon size: <select id="size"><option value="">Normal (1x)</option><option value="2x" selected>2x</option><option value="3x">3x</option><option value="4x">4x</option><option value="5x" selected>5x</option></select></p>
+<p>Rotation: <select id="rotation"><option value="" selected>None</option><option value="90">90°</option><option value="180">180°</option><option value="270">270°</option></select></p>
+<p>Flip: <select id="flip"><option value="" selected>None</option><option value="vertical">Vertical</option><option value="horizontal">Horizontal</option></select> (NB: flip and rotation cannot be combined)</p>
+<p>Animation: <select id="animation"><option value="" selected>None</option><option value="spin">Spin</option><option value="Rotate">Rotate (Experimental!)</option></select></p>
+<button type="button" onclick="GenerateTable()">Redraw !</button>                                                                                         
+</div>
+<h2>Icons</h2>
+<div id="dump"></div>
+
+<script>
+(function() {
+   // your page initialization code here
+   // the DOM will be available here
+   GenerateTable();
+})();
+</script>
+
+</body>
 </html>
\ No newline at end of file
diff --git a/css/jqModal.css b/css/jqModal.css
index 41e059343..1da9fdd03 100644
--- a/css/jqModal.css
+++ b/css/jqModal.css
@@ -1,39 +1,39 @@
-/* jqModal base Styling courtesy of;
-	Brice Burgess <bhb@iceburg.net> */
-
-/* The Window's CSS z-index value is respected (takes priority). If none is supplied,
-	the Window's z-index value will be set to 3000 by default (via jqModal.js). */
-	
-.jqmWindow {
-    display: none;
-    
-    position: fixed;
-    no.top: 17%;
-    no.left: 50%;
-    
-    no.margin-left: -300px;
-    no.width: 700px;
-    
-    background-color: #EEE;
-    color: #333;
-    border: 1px solid black;
-    padding: 12px;
-    
-    z-index:9999; 
-}
-
-.jqmOverlay { background-color: #000; }
-
-/* Background iframe styling for IE6. Prevents ActiveX bleed-through (<select> form elements, etc.) */
-* iframe.jqm {position:absolute;top:0;left:0;z-index:-1;
-	width: expression(this.parentNode.offsetWidth+'px');
-	height: expression(this.parentNode.offsetHeight+'px');
-}
-
-/* Fixed posistioning emulation for IE6
-     Star selector used to hide definition from browsers other than IE6
-     For valid CSS, use a conditional include instead */
-* html .jqmWindow {
-     position: absolute;
-     top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(17 * (document.documentElement.offsetHeight || document.body.clientHeight) / 100) + 'px');
-}
+/* jqModal base Styling courtesy of;
+	Brice Burgess <bhb@iceburg.net> */
+
+/* The Window's CSS z-index value is respected (takes priority). If none is supplied,
+	the Window's z-index value will be set to 3000 by default (via jqModal.js). */
+	
+.jqmWindow {
+    display: none;
+    
+    position: fixed;
+    no.top: 17%;
+    no.left: 50%;
+    
+    no.margin-left: -300px;
+    no.width: 700px;
+    
+    background-color: #EEE;
+    color: #333;
+    border: 1px solid black;
+    padding: 12px;
+    
+    z-index:9999; 
+}
+
+.jqmOverlay { background-color: #000; }
+
+/* Background iframe styling for IE6. Prevents ActiveX bleed-through (<select> form elements, etc.) */
+* iframe.jqm {position:absolute;top:0;left:0;z-index:-1;
+	width: expression(this.parentNode.offsetWidth+'px');
+	height: expression(this.parentNode.offsetHeight+'px');
+}
+
+/* Fixed posistioning emulation for IE6
+     Star selector used to hide definition from browsers other than IE6
+     For valid CSS, use a conditional include instead */
+* html .jqmWindow {
+     position: absolute;
+     top: expression((document.documentElement.scrollTop || document.body.scrollTop) + Math.round(17 * (document.documentElement.offsetHeight || document.body.clientHeight) / 100) + 'px');
+}
diff --git a/css/jquery-ui-timepicker-addon.css b/css/jquery-ui-timepicker-addon.css
index 95a22420c..586a7f04d 100644
--- a/css/jquery-ui-timepicker-addon.css
+++ b/css/jquery-ui-timepicker-addon.css
@@ -1,30 +1,30 @@
-.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
-.ui-timepicker-div dl { text-align: left; }
-.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
-.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
-.ui-timepicker-div td { font-size: 90%; }
-.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
-.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }
-
-.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; }
-.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; }
-
-.ui-timepicker-rtl{ direction: rtl; }
-.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
-.ui-timepicker-rtl dl dt{ float: right; clear: right; }
-.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
-
-/* Shortened version style */
-.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; }
-.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time, 
-.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; }
-.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; }
-.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; }
-.ui-timepicker-div.ui-timepicker-oneLine dl dd, 
-.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; }
-.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,
-.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; }
-.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,
-.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; }
-.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 40%; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+.ui-timepicker-div .ui_tpicker_unit_hide{ display: none; }
+
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input { background: none; color: inherit; border: none; outline: none; border-bottom: solid 1px #555; width: 95%; }
+.ui-timepicker-div .ui_tpicker_time .ui_tpicker_time_input:focus { border-bottom-color: #aaa; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 40% 10px 10px; }
+
+/* Shortened version style */
+.ui-timepicker-div.ui-timepicker-oneLine { padding-right: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time, 
+.ui-timepicker-div.ui-timepicker-oneLine dt { display: none; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_time_label { display: block; padding-top: 2px; }
+.ui-timepicker-div.ui-timepicker-oneLine dl { text-align: right; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd, 
+.ui-timepicker-div.ui-timepicker-oneLine dl dd > div { display:inline-block; margin:0; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_minute:before,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_second:before { content:':'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_millisec:before,
+.ui-timepicker-div.ui-timepicker-oneLine dl dd.ui_tpicker_microsec:before { content:'.'; display:inline-block; }
+.ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide,
 .ui-timepicker-div.ui-timepicker-oneLine .ui_tpicker_unit_hide:before{ display: none; }
\ No newline at end of file
diff --git a/css/jquery.tabs.css b/css/jquery.tabs.css
index ff9bf60b4..ae64133f5 100644
--- a/css/jquery.tabs.css
+++ b/css/jquery.tabs.css
@@ -1,76 +1,76 @@
-/* Caution! Ensure accessibility in print and other media types... */
-@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
-    .tabs-hide {
-        display: none;
-    }
-}
-
-/* Hide useless elements in print layouts... */
-@media print {
-    .tabs-nav {
-        display: none;
-    }
-}
-
-/* Skin */
-.tabs-nav {
-    list-style: none;
-    margin: 0;
-    padding: 0 0 0 4px;
-}
-.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
-    display: block;
-    clear: both;
-    content: " ";
-}
-.tabs-nav li {
-    float: left;
-    margin: 0 0 0 1px;
-}
-.tabs-nav a {
-    display: block;
-    position: relative;
-    top: 1px;
-    z-index: 2;
-    padding: 6px 10px 0;
-    width: 64px;
-    height: 18px;
-    color: #27537a;
-    font-size: 12px;
-    font-weight: bold;
-    line-height: 1.2;
-    text-align: center;
-    text-decoration: none;
-    background: url(../images/tab.png) no-repeat;
-}
-.tabs-nav .tabs-selected a {
-    padding-top: 7px;
-    color: #000;
-}
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
-    background-position: 0 -50px;
-    outline: 0; /* @ Firefox, switch off dotted border */
-}
-.tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
-    background-position: 0 0;
-}
-.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited,
-.tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
-    cursor: text;
-}
-.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
-    cursor: pointer;
-}
-.tabs-nav .tabs-disabled {
-    opacity: .4;
-}
-.tabs-container {
-    border-top: 1px solid #97a5b0;
-    padding: 1em 8px;
-    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
-}
-/* Uncomment this if you want a little spinner to be shown next to the tab title while an Ajax tab gets loaded
-.tabs-loading span {
-    padding: 0 0 0 20px;
-    background: url(loading.gif) no-repeat 0 50%;
+/* Caution! Ensure accessibility in print and other media types... */
+@media projection, screen { /* Use class for showing/hiding tab content, so that visibility can be better controlled in different media types... */
+    .tabs-hide {
+        display: none;
+    }
+}
+
+/* Hide useless elements in print layouts... */
+@media print {
+    .tabs-nav {
+        display: none;
+    }
+}
+
+/* Skin */
+.tabs-nav {
+    list-style: none;
+    margin: 0;
+    padding: 0 0 0 4px;
+}
+.tabs-nav:after { /* clearing without presentational markup, IE gets extra treatment */
+    display: block;
+    clear: both;
+    content: " ";
+}
+.tabs-nav li {
+    float: left;
+    margin: 0 0 0 1px;
+}
+.tabs-nav a {
+    display: block;
+    position: relative;
+    top: 1px;
+    z-index: 2;
+    padding: 6px 10px 0;
+    width: 64px;
+    height: 18px;
+    color: #27537a;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 1.2;
+    text-align: center;
+    text-decoration: none;
+    background: url(../images/tab.png) no-repeat;
+}
+.tabs-nav .tabs-selected a {
+    padding-top: 7px;
+    color: #000;
+}
+.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
+    background-position: 0 -50px;
+    outline: 0; /* @ Firefox, switch off dotted border */
+}
+.tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
+    background-position: 0 0;
+}
+.tabs-nav .tabs-selected a:link, .tabs-nav .tabs-selected a:visited,
+.tabs-nav .tabs-disabled a:link, .tabs-nav .tabs-disabled a:visited { /* @ Opera, use pseudo classes otherwise it confuses cursor... */
+    cursor: text;
+}
+.tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active { /* @ Opera, we need to be explicit again here now... */
+    cursor: pointer;
+}
+.tabs-nav .tabs-disabled {
+    opacity: .4;
+}
+.tabs-container {
+    border-top: 1px solid #97a5b0;
+    padding: 1em 8px;
+    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
+}
+/* Uncomment this if you want a little spinner to be shown next to the tab title while an Ajax tab gets loaded
+.tabs-loading span {
+    padding: 0 0 0 20px;
+    background: url(loading.gif) no-repeat 0 50%;
 }*/
\ No newline at end of file
diff --git a/css/jquery.treeview.css b/css/jquery.treeview.css
index b5f038600..7ffac8ecf 100644
--- a/css/jquery.treeview.css
+++ b/css/jquery.treeview.css
@@ -1,45 +1,45 @@
-.treeview, .treeview ul {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}
-
-.treeview div.hitarea {
-	height: 15px;
-	width: 15px;
-	margin-left: -15px;
-	float: left;
-	cursor: pointer;
-}
-/* fix for IE6 */
-* html div.hitarea {
-	background: #fff;
-	filter: alpha(opacity=0);
-	display: inline;
-	float:none;
-}
-
-.treeview li { 
-	margin: 0;
-	padding: 3px 0pt 3px 16px;
-}
-
-.treeview a.selected {
-	background-color: #eee;
-}
-
-#treecontrol { margin: 1em 0; }
-
-.treeview .hover { color: red; cursor: pointer; }
-
-.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
-.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
-.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
-.treeview .last { background-image: url(../images/tv-item-last.gif); }
-.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
-.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
-
-.filetree li { padding: 3px 0 1px 16px; }
-.filetree span.folder, .filetree span.file { padding-left: 16px; display: block; height: 15px; }
-.filetree span.folder { background: url(../images/folder.gif) 0 0 no-repeat; }
-.filetree span.file { background: url(../images/file.gif) 0 0 no-repeat; }
+.treeview, .treeview ul {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+}
+
+.treeview div.hitarea {
+	height: 15px;
+	width: 15px;
+	margin-left: -15px;
+	float: left;
+	cursor: pointer;
+}
+/* fix for IE6 */
+* html div.hitarea {
+	background: #fff;
+	filter: alpha(opacity=0);
+	display: inline;
+	float:none;
+}
+
+.treeview li { 
+	margin: 0;
+	padding: 3px 0pt 3px 16px;
+}
+
+.treeview a.selected {
+	background-color: #eee;
+}
+
+#treecontrol { margin: 1em 0; }
+
+.treeview .hover { color: red; cursor: pointer; }
+
+.treeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
+.treeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
+.treeview .expandable { background-image: url(../images/tv-expandable.gif); }
+.treeview .last { background-image: url(../images/tv-item-last.gif); }
+.treeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
+.treeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
+
+.filetree li { padding: 3px 0 1px 16px; }
+.filetree span.folder, .filetree span.file { padding-left: 16px; display: block; height: 15px; }
+.filetree span.folder { background: url(../images/folder.gif) 0 0 no-repeat; }
+.filetree span.file { background: url(../images/file.gif) 0 0 no-repeat; }
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 4c83fa55e..1a612b6e9 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -1,3233 +1,3233 @@
-@import 'css-variables.scss';
-
-$hilight-color: $highlight-color;
-$summary-details-background: $grey-color;
-$main-header-background: $frame-background-color;
-$table-even-background: $frame-background-color;
-$popup-menu-highlight-color: $highlight-color;
-$popup-menu-text-color: #000;
-$popup-menu-background-color: #fff;
-$popup-menu-text-higlight-color: #fff;
-$breadcrumb-color: #555;
-$breadcrumb-text-color: #fff;
-$breadcrumb-highlight-color: $highlight-color;
-$breadcrumb-text-highlight-color: #fff;
-
-/* CSS Document */
-body {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 10pt;
-    color: $text-color;
-	margin: 0;			/* Remove body margin/padding */
-	padding: 0;
-	overflow: hidden;	/* Remove scroll bars on browser window */
-}
-
-body.printable-version {
-	margin:1.5em;
-	overflow:auto;
-}
-
-/* to prevent flicker, hide the pane's content until it's ready */
-.ui-layout-center, .ui-layout-north, .ui-layout-south {
-    display: none;
-}
-.ui-layout-content {
-	padding-left: 10px;
-}
-.ui-layout-content .ui-tabs-nav li {
-	/* Overriding jQuery UI theme to see active tab better */
-	margin-bottom: 2px;
-
-	&.ui-tabs-active{
-		padding-bottom: 3px;
-	}
-}
-
-.raw_output {
-    font-family: Courier-New, Courier, Arial, Helvetica;
-    font-size: 8pt;
-    background-color: #eeeeee;
-    color: $text-color;
-    border: 1px dashed $text-color;
-    padding: 0.25em;
-    margin-top: 1em;
-}
-
-h1 {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    color: $text-color;
-    font-weight: bold;
-    font-size: 12pt;
-}
-h2 {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    color: $text-color;
-    font-weight: normal;
-    font-size: 12pt;
-}
-h3 {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    color: $text-color;
-    font-weight: normal;
-    font-size: 10pt;
-}
-
-label {
-	cursor: pointer;
-}
-
-.hilite, .hilite a, .hilite a:visited {
-    color: $hilight-color;
-    text-decoration: none;
-}
-table.datatable {
-	width: 100%;
-	border: 0;
-	padding: 0;
-}
-td.menucontainer {
-	text-align: right;
-}
-table.listResults {
-    padding: 0px;
-	border-top: 3px solid $frame-background-color;
-	border-left: 3px solid $frame-background-color;
-	border-bottom: 3px solid #e6e6e1;  
-	border-right: 3px solid #e6e6e1;
-	width: 100%;
-	background-color: #fff;
-}
-
-table.listResults td {
-	padding: 2px;
-}
-
-table.listResults td .view-image {
-  // Counteract the forced dimensions (usefull for displaying in the details view)
-  width: inherit !important;
-  height: inherit !important;
-  img {
-    max-width: 48px !important;
-    max-height: 48px !important;
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-  }
-}
-
-.edit-image {
-  .view-image {
-	display: inline-block;
-
-    img[src=""],
-	img[src="null"] {
-		// Hiding "broken" image when src is not set
-		visibility: hidden;
-	}
-
-	&.dirty {
-	  // The image will be modified when saving the changes
-
-	  &.compat {
-		// Browser not supporting FileReader
-		background-image: url("ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png");
-		img {
-		  opacity: 0.3;
-		}
-	  }
-	}
-  }
-
-  .edit-buttons {
-	display: inline-block;
-	vertical-align: top;
-	margin-top: 4px;
-	margin-left: 3px;
-
-	.button {
-	  cursor: pointer;
-	  margin-bottom: 3px;
-	  padding: 2px;
-	  background-color: $highlight-color;
-
-	  &.disabled {
-		cursor: default;
-		background-color: $grey-color;
-		opacity: 0.3;
-	  }
-	  .ui-icon {
-		background-image: url("ui-lightness/images/ui-icons_ffffff_256x240.png");
-	  }
-	}
-  }
-
-  .file-input {
-	display: block;
-  }
-}
-
-/* Center the image both horizontally and vertically, withing a box which size is fixed (depends on the attribute definition) */
-.details .view-image {
-  text-align: center;
-  padding: 2px;
-  border: 2px solid #DDDDDD;
-  border-radius: 6px;
-
-  img {
-	  display: inline-block;
-	  vertical-align: middle;
-	  max-width: 90% !important;
-	  max-height: 90% !important;
-  }
-  .helper-middle {
-	// Helper to center the image (requires a span dedicated to this)
-	display: inline-block;
-	height: 100%;
-	vertical-align: middle;
-  }
-}
-
-table.listContainer {
-    border: 0;
-	padding: 0;
-	margin: 0;
-	width: 100%;
-	clear: both;
-}
-
-tr.containerHeader, tr.containerHeader td {
-	background: transparent;
-} 
-
-tr.even td, .wizContainer tr.even td {
-	background-color: $table-even-background;
-} 
-tr.red_even td, .wizContainer tr.red_even td {
-	background-color: #f97e75;
-	color: #fff;
-}
-tr.red td, .wizContainer tr.red td {
-	background-color: #f9a397;
-	color: #fff;
-}
-tr.orange_even td, .wizContainer tr.orange_even td {
-	background-color: #f4d07a;
-}
-tr.orange td, .wizContainer tr.orange td {
-	background-color: #f4e96c;
-} 
-tr.green_even td, .wizContainer tr.green_even td {
-	background-color: #bee5a3;
-} 
-tr.green td, .wizContainer tr.green td {
-	background-color: #b3e5b4;
-} 
-
-tr td.hover, tr.even td.hover, .hover a, .hover a:visited, .hover a:hover, .wizContainer tr.even td.hover,  .wizContainer tr td.hover {
-	background-color: #fdf5d0;
-	color: $text-color;
-}
-
-th {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 8pt;
-    color: $complement-color;
-    height:20px;
-    background: $frame-background-color bottom repeat-x;	
-}
-
-th.header {
-	cursor: pointer;
-	background-repeat: no-repeat;
-	background-position: center right;
-	background-repeat: no-repeat;
-	padding-right: 16px; // some space for the asc/desc icons
-}
-
-th.headerSortUp {
-	background-image: url(../images/asc.gif);
-	text-decoration: underline;
-	cursor: pointer;
-}
-
-th.headerSortDown {
-	background-image: url(../images/desc.gif);
-	text-decoration: underline;
-	cursor: pointer;
-}
-
-td {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 12px;
-    color:#696969;
-	nobackground-color: #ffffff;
-	padding: 0px;
-}
-
-tr.clicked td {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: smaller;
-	background-color: #ffcfe8;
-}
-
-td.label {
-	vertical-align: top;
-}
-td.label span {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 12px;
-    color: #000000;
-    padding: 5px;
-    padding-right: 10px;	
-    font-weight:bold;
-    vertical-align: top;
-    text-align: right;
-    display: block;
-}
-fieldset td.label span {
-    padding: 3px;
-    padding-right: 10px;
-}
-fieldset {
-    margin-top: 3px;	
-    -moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	border-radius: 6px;
-	border-style: solid;
-	border-color: #ddd;
-}
-
-legend {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 12px;
-	padding:8px;
-	color: #fff;
-	background-color: $complement-color;
-	font-weight: bold;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	border-radius: 6px;
-}
-legend.transparent {
-	background: transparent;
-	color: #333333;
-	font-size: 1em;
-	font-weight: normal;
-	padding: 0;
-}
-.ui-widget-content td legend a, .ui-widget-content td legend a:hover, .ui-widget-content td legend a:visited {
-	color: #fff;
-}
-
-.ui-widget-content td a, p a, p a:visited, td a, td a:visited {
-	text-decoration:none;
-	color: $complement-color;
-}
-.ui-widget-content td a.cke_button, .ui-widget-content td a.cke_toolbox_collapser, .ui-widget-content td a.cke_combo_button, cke_dialog a {
-	padding-left: 0;
-	background-image: none;
-}
-
-.ui-widget-content td a:hover, p a:hover, td a:hover {
-	text-decoration:underline;
-	color:$highlight-color;
-}
-.cke_reset_all *:hover {
-	text-decoration: none;
-	color: #000;
-}
-table.cke_dialog_contents a.cke_dialog_ui_button_ok {
-    color: #000;
-    border-color: $highlight-color;
-    background: $highlight-color;
-}
-.cke_notifications_area {
-	display: none;
-}
-td a.no-arrow, td a.no-arrow:visited, .SearchDrawer a.no-arrow, .SearchDrawer a.no-arrow:visited {
-	text-decoration:none;
-	color:#000000;
-	padding-left:0px;
-	background: inherit;
-}
-td a.no-arrow:hover {
-	text-decoration:underline;
-	color:#d81515;
-	padding-left:0px;
-	background: inherit;
-}
-td a,
-td a:visited{
-	&:hover{
-		.text_decoration{
-			color: darken($highlight-color, 6%);
-		}
-	}
-
-	.text_decoration{
-		vertical-align: baseline;
-		text-decoration: none;
-		color: $highlight-color;
-		margin-right: 8px;
-		transition: color 0.2s ease-in-out;
-	}
-}
-
-a.small_action {
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 8pt;
-    color: #000000;
-	text-decoration:none;
-}
-.display_block {
-	padding:0.25em;
-}
-.actions_details {
-	float:right;
-	margin-top:10px;
-	margin-right:10px;
-	padding-left: 5px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	background: $highlight-color url(../images/actions_left.png?v=#{$version}) no-repeat left;
-}
-.actions_details span{
-	background: url(../images/actions_right.png?v=#{$version}) no-repeat right;
-	color: #fff;
-	font-weight: bold;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 12px;
-}
-.actions_details a {
-	text-decoration:none;
-}
-.loading {
-	noborder: 1px dashed #CCC;
-	background: #b9c1c8;
-	padding:0.25em;
-}
-
-input.textSearch {
-	border:1px solid #000;
-	font-family:Tahoma,Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color:#000000;
-}
-
-.ac_input {
-	border: 1px solid #7f9db9;
-	background: #fff url(../images/ac-background.gif) no-repeat right;
-}
-/* By Rom */
-.csvimport_createobj {
-    color: #AA0000;
-    background-color:#EEEEEE;
-}
-.csvimport_error {
-    font-weight: bold;
-    color: #FF0000;
-    background-color:#EEEEEE;
-}
-.csvimport_warning {
-    color: #CC8888;
-    background-color:#EEEEEE;
-}
-.csvimport_ok {
-    color: #00000;
-    background-color:#BBFFBB;
-}
-.csvimport_reconkey {
-    font-style: italic;
-    color: #888888;
-    background-color:#FFFFF;
-}
-.csvimport_extreconkey {
-    color: #888888;
-    background-color:#FFFFFF;
-}
-#accordion {
-	display:none;
-}
-
-#accordion h3 {
-	padding: 10px;
-}
-
-.ui-accordion-content ul {
-    list-style:none;
-    list-style-image: url(data:0);
-    padding-left:16px;
-	margin-top: 8px;
-}	
-
-.ui-accordion-content li.submenu {
-	margin-top: 8px;
-}	
-
-.ui-accordion-content ul ul {
-	padding: 8px 0px 8px 8px;
-	margin:0;
-    list-style:none;
-    list-style-image: url(data:0);
-    border: 0;
-}	
-	
-.nothing {
-    noborder-top: 1px solid #8b8b8b;
-    padding: 4px 0px 0px 16px;   	
-	font-size:8pt;
-    background: url(../images/green-square.gif) no-repeat bottom left;
-    color:#83b217;
-    font-weight:bold;
-	text-decoration:none;
-}
-div.ui-accordion-content {
-	padding-top: 10px;
-	padding-left: 10px;
-}
-.ui-accordion-content a, ui-accordion-content a:visited {
-	color:	$complement-color;
-	text-decoration:none;
-}
-
-.ui-accordion-content a:hover {
-	color: 	$highlight-color;
-	text-decoration: none;
-}
-
-.ui-accordion-content ul { 
-	padding-left: 0;
-	margin-top: 0;
-}
-
-.ui-accordion-content li { 
-	color:$grey-color;
-	text-decoration:none;
-	margin: 0;
-	padding: 0px 0pt 0px 16px;
-	font-size: 9pt;
-    background: url(../images/mini-arrow-orange.gif) no-repeat top left;
-    font-weight:normal;
-    border: 0;
-}
-
-a.CollapsibleLabel, td a.CollapsibleLabel { 
-	margin: 0;
-	padding: 0px 0pt 0px 16px;
-	font-size:8pt;
-	text-decoration:none;
-	color:$grey-color;
-    background: url(../images/mini-arrow-orange.gif) no-repeat left;
-}
-
-/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
-a.CollapsibleLabel.open,  td a.CollapsibleLabel.open { 
-	margin: 0;
-	padding: 0px 0pt 0px 16px;
-	font-size:8pt;
-	text-decoration:none;
-	color: $highlight-color;
-    background: url(../images/mini-arrow-orange-open.gif) no-repeat left;
-}
-
-.page_header {
-	background-color:$frame-background-color;
-	padding:5px;
-}
-/* move up a header immediately following a display block (i.e. "actions" menu) */
-.display_block + .page_header {
-	margin-top: -8px;
-}
-
-.notreeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
-.notreeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
-.notreeview .expandable { background-image: url(../images/tv-expandable.gif); }
-.notreeview .last { background-image: url(../images/tv-item-last.gif); }
-.notreeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
-.notreeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
-
-#OrganizationSelection {
-    padding:5px 0px 16px 20px;
-}
-
-/* popup menus */
-div.itop_popup {
-	margin: 0;
-	padding: 0;
-	float:right;
-}
-div.itop_popup > ul > li {
-	list-style: none;
-	cursor: pointer;
-	position: relative;
-}
-
-div.actions_menu > ul {
-	height:19px;
-	line-height: 17px;
-	vertical-align: middle;
-	display:block;
-	nowidth:70px; /* Nasty work-around for IE... en attendant mieux */
-	padding-left: 5px;
-	background: $highlight-color url(../images/actions_left.png?v=#{$version}) no-repeat top left;
-	cursor: pointer;
-	margin: 0;
-}
-
-div.actions_menu > ul > li {
-	float: left;
-	list-style: none;
-	font-size: 11px;
-	font-family: Tahoma,sans-serif;
-	height: 17px;
-	padding-right: 16px;
-	padding-left: 4px;
-	background: url(../images/actions_right.png?v=#{$version}) no-repeat top right transparent;
-	font-weight: bold;
-	color: $popup-menu-text-higlight-color;
-	vertical-align: middle;
-	margin: 0;
-}
-#logOffBtn > ul > li {
-	list-style: none;
-	vertical-align: middle;
-	margin: 0;
-	padding-left: 10px;
-	padding-right: 10px;
-	cursor: pointer;
-}
-#logOffBtn > ul {
-	list-style: none;
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	height: 25px;
-}
-	
-.itop_popup li a, #logOffBtn li a {
-	display: block;
-	padding: 5px 12px;
-	text-decoration: none;
-	nowidth: 70px;
-	color: $popup-menu-text-color;
-	font-weight: bold;
-	white-space: nowrap;
-	background: $popup-menu-background-color;
-}
-
-#logOffBtn li span {
-	display: block;
-	padding: 5px 12px;
-	text-decoration: none;
-	nowidth: 70px;
-	color: $popup-menu-text-color;
-	white-space: nowrap;
-	background: $popup-menu-background-color;
-}
-.itop_popup ul {
-	padding-left: 0;
-}
-
-.menucontainer div.toolkit_menu {
-	margin-left: 10px;
-}
-
-.itop_popup li a:hover, #logOffBtn li a:hover {
-	background: #1A4473;
-}
-
-.itop_popup ul > li > ul, #logOffBtn ul > li > ul
-{	
-	border: 1px solid black;
-	background: #fff;
-}
-	
-.itop_popup li > ul, #logOffBtn li > ul
-{	margin: 0;
-	padding: 0;
-	position: absolute;
-	display: none;
-	border-top: 1px solid white;
-	z-index: 1500;
-}
-
-.itop_popup li ul li,  #logOffBtn li ul li {
-	float: none;
-	display: inline;
-}
-
-.itop_popup li ul li a, #logOffBtn li ul li a {
-	width: auto;
-	text-align: left;
-}
-
-.itop_popup li ul li a:hover, #logOffBtn li ul li a:hover{
-	background: $popup-menu-highlight-color;
-	color: $popup-menu-text-higlight-color;
-	font-weight: bold;
-}
-.itop_popup > ul {
-	margin: 0;
-}
-hr.menu-separator {
-	border: none 0;
-	border-top: 1px solid #ccc;
-	color: #ccc;
-	background-color: transparent;
-	height: 1px;
-	margin: 3px;
-	cursor: default;
-}
-/************************************/
-.wizHeader {
-	background: $complement-color;
-	padding: 15px;
-}
-.wizContainer {
-	border: 5px solid $complement-color;
-	background: $complement-light;
-	padding: 5px;
-}
-
-.wizContainer table tr td {
-	background: transparent;
-}
-.alignRight {
-	text-align: right;
-	padding: 3px;
-}
-
-.alignLeft {
-	text-align: left;
-	padding: 3px;
-}
-
-.red {
-	background-color: #ff6000;
-	color: #000;
-}
-
-th.red {
-	background: url(../images/red-header.gif) bottom left repeat-x;
-	color: #000;
-}
-
-.green {
-	background-color: #00cc00;
-	color: #000;
-}
-th.green {
-	background: url(../images/green-header.gif) bottom left repeat-x;
-	color: #000;
-}
-
-.orange {
-	background-color: #ffde00;
-	color: #000;
-}
-
-th.orange {
-	background: url(../images/orange-header.gif) bottom left repeat-x;
-	color: #000;
-}
-
-/* For Date Picker: Creates a little calendar icon
- * instead of a text link for "Choose date"
- */
-td a.dp-choose-date, a.dp-choose-date, td a.dp-choose-date:hover, a.dp-choose-date:hover, td a.dp-choose-date:visited, a.dp-choose-date:visited {
-	float: left;
-	width: 16px;
-	height: 16px;
-	padding: 0;
-	margin: 5px 3px 0;
-	display: block;
-	text-indent: -2000px;
-	overflow: hidden;
-	background: url(../images/calendar.png?v=#{$version}) no-repeat; 
-}
-td a.dp-choose-date.dp-disabled, a.dp-choose-date.dp-disabled {
-	background-position: 0 -20px;
-	cursor: default;
-}
-/* For Date Picker: makes the input field shorter once the date picker code
- * has run (to allow space for the calendar icon)
- */
-input.dp-applied {
-	width: 140px;
-	float: left;
-}
-
-/* For search forms */
-.mini_tabs a {
-	text-decoration: none;
-	font-weight:bold;
-	color: #ccc;
-	background-color:#333;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-bottom: 0.25em;
-}
-.mini_tabs a.selected {
-	color: #fff;
-	background-color:  $complement-color;
-	padding-top: 0.25em;
-}
-.mini_tabs ul {
-	margin: -10px;
-}
-.mini_tabs ul li {
-	float: right;
-	list-style: none;
-	nopadding-left: 1em;
-	nopadding-right: 1em;
-	margin-top: 0;
-}
-/* Search forms v2 */
-.search_box{
-	box-sizing: border-box;
-	position: relative;
-	z-index: 1100; /* To be over the table block/unblock UI. Not very sure about this. */
-	text-align: center; /* Used when form is closed */
-
-	/* Sizing reset */
-	*{
-		box-sizing: border-box;
-	}
-}
-.search_form_handler{
-	position: relative;
-	z-index: 10;
-	width: 100%;
-	margin-left: auto;
-	margin-right: auto;
-	font-size: 12px;
-	text-align: left;   /* To compensate .search_box:text-align */
-	border: 1px solid $complement-color;
-	//transition: width 0.3s ease-in-out;
-
-	/* Sizing reset */
-	*{
-		box-sizing: border-box;
-	}
-	/* Hyperlink reset */
-	a{
-		color: inherit;
-		text-decoration: none;
-	}
-	/* Input reset */
-	input[type="text"],
-	select{
-		padding: 1px 2px;
-	}
-
-	&:not(.closed){
-		.sf_title{
-			.sft_short{
-				display: none;
-			}
-
-			.sft_hint,
-			.sft_toggler{
-				margin-top: 4px;
-			}
-			.sft_toggler{
-				transform: rotateX(180deg);
-				transition: transform 0.5s linear;
-			}
-		}
-	}
-	&.closed{
-		margin-bottom: 0.5em;
-		width: 150px;
-		overflow: hidden;
-		border-radius: 4px;
-		background-color: $complement-color;
-
-		.sf_criterion_area{
-			height: 0;
-			opacity: 0;
-			padding: 0;
-		}
-		.sf_title {
-			padding: 6px 8px;
-			text-align: center;
-			font-size: 12px;
-
-			.sft_long{
-				display: none;
-			}
-			.sft_hint{
-				display: none;
-			}
-		}
-	}
-
-	&:not(.no_auto_submit){
-		.sft_hint{
-			display: none;
-		}
-		.sfc_fg_apply{
-			display: none;
-		}
-	}
-	&.no_auto_submit{
-		.sfc_fg_search{
-			display: none;
-		}
-	}
-
-	.sf_title{
-		transition: opacity 0.3s, background-color 0.3s, color 0.3s linear;
-		padding: 8px 10px;
-		margin: 0;
-		color: #ffffff;
-		background-color: $complement-color;
-		cursor: pointer;
-		.sft_hint{
-			font-size: 8pt;
-			font-style: italic;
-		}
-		.sft_toggler{
-			margin-left: 0.7em;
-			transition: color 0.2s ease-in-out, transform 0.4s ease-in-out;
-
-			&:hover{
-				color: $gray-extra-light;
-			}
-		}
-	}
-	.sf_message{
-		display: none;
-		margin: 8px 8px 0px 8px;
-		border-radius: 0px;
-	}
-	.sf_criterion_area{
-		/*display: none;*/
-		padding: 8px 8px 3px 8px; /* padding-bottom must equals to padding-top - .search_form_criteria:margin-bottom */
-		background-color: $white;
-
-		.sf_criterion_row{
-			position: relative;;
-
-			&:not(:first-child){
-				margin-top: 20px;
-
-				&::before{
-					content: "";
-					position: absolute;
-					top: -12px;
-					left: 0px;
-					width: 100%;
-					border-top: 1px solid $search-criteria-box-border-color;
-				}
-				&::after{
-					content: "or"; /* TODO: Make this into a dict entry */
-					position: absolute;
-					top: -20px;
-					left: 8px;
-					padding-left: 5px;
-					padding-right: 5px;
-					color: $gray-light;
-					background-color: $white; /* Must match .sf_criterion_area:background-color */
-				}
-			}
-
-			.sf_criterion_group{
-				display: inline;
-			}
-		}
-
-		/* Common style between criterion and more criterion */
-		.search_form_criteria,
-		.sf_more_criterion,
-		.sf_button{
-			position: relative;
-			display: inline-block;
-			margin-right: 10px;
-			margin-bottom: 5px;
-			vertical-align: top;
-
-			&.opened{
-				margin-bottom: 0px; /* To compensate the .sfc/.sfm_header:padding-bottom: 13px */
-
-				.sfc_header,
-				.sfm_header{
-					border-bottom: none !important;
-					box-shadow: none !important;
-					padding-bottom: 13px; /* Must be equal to .search_form_criteria:margin-bottom + this:padding-bottom */
-				}
-			}
-
-			> *{
-				padding: 7px 8px;
-				vertical-align: top;
-				border: $search-criteria-box-border;
-				border-radius: $search-criteria-box-radius;
-				box-shadow: $box-shadow-regular;
-			}
-			.sfc_form_group,
-			.sfm_content{
-				position: absolute;
-				z-index: -1;
-				min-width: 100%;
-				left: 0px;
-				margin-top: -1px;
-			}
-		}
-
-		/* Criteria tags */
-		.search_form_criteria{
-			/* Non editable criteria */
-			&.locked{
-				background-color: $gray-extra-light;
-
-				.sfc_title{
-					user-select: none;
-					cursor: initial;
-				}
-			}
-            /* Draft criteria (modifications not applied) */
-            &.draft{
-				.sfc_header,
-				.sfc_form_group{
-					border-style: dashed;
-				}
-
-				.sfc_title{
-					font-style: italic;
-				}
-            }
-			/* Opened criteria (form group displayed) */
-			&.opened{
-				z-index: 1; /* To be over other criterion */
-
-				.sfc_toggle{
-					transform: rotateX(-180deg);
-				}
-				.sfc_form_group{
-					display: block;
-				}
-			}
-			&.opened_left{
-				.sfc_form_group{
-					left: auto;
-					right: 0px;
-				}
-			}
-
-			/* Add "and" on criterion but the one and submit button */
-			&:not(:last-of-type){
-				margin-right: 30px;
-
-				&::after{
-					/* TODO: Find an elegant way to do this, without hardcoding the content (could be a <style> in the markup) and margin. Note, only a few languages (hawaiian and stuff like this have more than 4 letters in for "and" word. */
-					content: "and";
-					position: absolute;
-					top: 8px;
-					left: calc(100% + 0px);
-					margin-right: 5px;
-					margin-left: 5px;
-					text-align: center;
-					color: $gray-light;
-				}
-			}
-
-			> *{
-				background-color: $search-criteria-box-bg-color;
-				color: $search-criteria-box-color;
-			}
-
-			/* Top left corner icons */
-			.sfc_toggle,
-			.sfc_close{
-				position: absolute;
-				top: 7px;
-				color: $search-criteria-box-picto-color;
-			}
-			.sfc_locked{
-				position: absolute;
-				top: 9px;
-				color: $gray-light;
-			}
-			.sfc_toggle{
-				display: inline-block;
-				right: 23px;
-				transition: all 0.3s ease-in-out;
-			}
-			.sfc_close,
-			.sfc_locked{
-				right: 7px;
-			}
-
-			.sfc_title{
-				max-width: 240px;
-				padding-right: 30px;
-				white-space: nowrap;
-				overflow-x: hidden;
-				text-overflow: ellipsis;
-				cursor: pointer;
-
-				.sfc_values {
-					font-weight: bold;
-				}
-
-			}
-			.sfc_form_group{
-				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
-				display: none;
-				max-height: 520px;
-				overflow: auto;
-
-				.sfc_fg_operators{
-					font-size: 12px;
-
-					.sfc_fg_operator{
-						&.force_hide {
-							display: none !important;
-						}
-
-						> label{
-							line-height: 20px;
-							white-space: nowrap;
-
-							> *{
-								display: inline-block;
-								vertical-align: middle;
-							}
-						}
-
-						.sfc_op_radio{
-							width: 12px;
-							margin: 0px;
-							margin-right: 7px;
-						}
-
-						.sfc_op_name{
-							width: 90px;
-						}
-						.sfc_op_content{
-							input[type="text"]{
-								width: 160px;
-							}
-						}
-
-						.sfc_opc_multichoices{
-							label > input{
-								vertical-align: middle;
-								margin-left: 0px;
-								margin-right: 8px;
-							}
-							.sfc_opc_mc_toggler{
-
-							}
-							.sfc_opc_mc_items_wrapper{
-								max-height: 415px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
-								overflow-y: auto;
-								margin: 0px -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
-
-								.sfc_opc_mc_items{
-									.sfc_opc_mc_items_list{
-										&.sfc_opc_mc_items_selected{
-											position: relative;
-											padding-top: 5px;
-											margin-top: 5px;
-
-											&::before{
-												content: "";
-												position: absolute;
-												border-top: 1px solid $gray-lighter;
-												width: calc(100% - 12px); /* minus margin-left x2 */
-												margin-left: 6px;
-												top: 0px;
-											}
-										}
-
-										.sfc_opc_mc_placeholder{
-											padding: 15px 8px;
-											font-style: italic;
-											text-align: center;
-										}
-										.sfc_opc_mc_item{
-											padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
-
-											&:hover{
-												background-color: $search-criteria-box-hover-color;
-											}
-
-											label{
-												display: inline-block;
-												width: 100%;
-											}
-										}
-									}
-								}
-								.sfc_opc_mc_items_hint{
-									margin-top: 15px;
-									margin-bottom: 15px;
-									padding-left: 9px;
-									padding-right: 9px;
-									color: $gray;
-									font-size: 10px;
-									font-style: italic;
-
-									> span{
-										margin-right: 0.5em;
-										font-style: italic;
-									}
-								}
-							}
-						}
-					}
-				}
-
-				.sfc_fg_search,
-				.sfc_fg_apply,
-				.sfc_fg_cancel{
-					margin-top: 8px;
-					padding: 3px 6px;
-					font-size: 11px; /* Not bold, so it looks like 10px/bold of more/less buttons */
-				}
-				.sfc_fg_search,
-				.sfc_fg_apply{
-					margin-right: 5px;
-				}
-
-				.sfc_fg_more,
-				.sfc_fg_less{
-					position: absolute;
-					bottom: 4px;
-					right: 0px;
-					cursor: pointer;
-					color: #3F7294;
-					font-size: 10px;
-					font-weight: bold;
-					border: none;
-					background-color: transparent;
-
-					> span{
-						margin-left: 3px;
-					}
-				}
-
-				/* Show only first operator in simple mode */
-				.sfc_fg_operator:not(:first-of-type),
-				.sfc_fg_operator:first-of-type .sfc_op_radio{
-					display: none;
-				}
-				.sfc_fg_less{
-					display: none;
-				}
-				.sfc_fg_more{
-					display: inline-block;
-				}
-
-				/* Show all operators in advanced mode */
-				&.advanced{
-
-					.sfc_fg_operator{
-						margin-bottom: 3px;
-
-						&:last-of-type{
-							margin-bottom: 0px;
-						}
-					}
-
-					.sfc_fg_operator:not(:first-of-type),
-					.sfc_fg_operator:first-of-type .sfc_op_radio{
-						display: inherit;
-					}
-					.sfc_fg_less{
-						display: inline-block;
-					}
-					.sfc_fg_more{
-						display: none;
-					}
-
-					.hide_on_advanced {
-						display: none;
-					}
-
-				}
-
-				&:not(.advanced) {
-					.hide_on_less {
-						display: none;
-					}
-				}
-			}
-
-			/* Special criterion processing */
-			&.search_form_criteria_raw{
-				> *{
-					border-color: transparent;
-				}
-				.sfc_title{
-					cursor: initial;
-					padding-right: 20px; /* Less than regular as there is no toggle icon */
-				}
-				.sfc_form_group{
-					display: none;
-				}
-			}
-			&.search_form_criteria_enum{
-				.sfc_form_group{
-					.sfc_fg_operator_in{
-						> label{
-							display: inline-block;
-							width: 100%;
-							line-height: initial;
-							white-space: nowrap;
-
-							.sfc_op_content{
-								width: 100%;
-							}
-						}
-					}
-				}
-			}
-			&.search_form_criteria_numeric {
-				//.sfc_form_group.advanced {
-				//	.sfc_fg_operator_between {
-				//		margin-top: 5px;
-				//		margin-bottom: 5px;
-				//	}
-				//}
-				.sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_between {
-					.sfc_op_content_from_outer{
-						display: inline;
-					}
-					.sfc_op_content_until_outer {
-						display: inline;
-						margin-left: 5px;
-					}
-					label {
-						&.sfc_op_content_from_label, &.sfc_op_content_until_label {
-							width: 45px;
-							display: inline-block;
-						}
-					}
-					input[type="text"] {
-						width: 77px;
-					}
-				}
-			}
-
-			&.search_form_criteria_date_time,
-			&.search_form_criteria_date {
-				.sfc_form_group.advanced {
-					.sfc_fg_operator_between {
-						margin-bottom: 5px;
-					}
-				}
-				.sfc_fg_operator_between_days {
-					input {
-						width: 135px;
-					}
-				}
-				button.ui-datepicker-trigger {
-					background: none;
-					border: none;
-					height: 100%;
-					padding: 2px;
-					img {
-						vertical-align: middle;
-					}
-				}
-			}
-		}
-
-		/* More criterion */
-		.sf_more_criterion{
-			&.opened{
-				z-index: 2; /* To be over criterion */
-
-				.sfm_content{
-					display: inherit;
-				}
-			}
-			&.opened_left{
-				.sfm_content{
-					left: auto;
-					right: 0px;
-				}
-			}
-
-			> *{
-				background-color: $search-add-criteria-box-bg-color;
-				color: $search-add-criteria-box-color;
-			}
-			.sfm_toggler{
-				.sfm_tg_title{
-					margin-right: 7px;
-				}
-				.sfm_tg_icon{
-					color: $search-criteria-box-picto-color;
-				}
-			}
-			.sfm_content{
-				display: none;
-				min-width: 200px; /* To avoid element going to thin on filter, not very slick */
-
-				.sfm_lists{
-					margin: 0px -8px;
-					padding: 0px 8px;
-					max-height: 400px;
-					overflow-x: hidden;
-					overflow-y: auto;
-
-					.sfl_items{
-						> li{
-							&:hover{
-								background-color: $search-add-criteria-box-hover-color;
-							}
-						}
-					}
-				}
-				.sfm_buttons{
-					display: none;
-
-					button{
-						margin-top: 8px;
-						margin-right: 5px;
-						padding: 3px 6px;
-						font-size: 11px;
-
-						&:last-of-type{
-							margin-right: 0px;
-						}
-					}
-				}
-			}
-		}
-
-		/* Misc. buttons */
-		.sf_button{
-			cursor: pointer;
-
-			> *{
-				background-color: $search-button-box-bg-color;
-				color: $search-button-box-color;
-			}
-		}
-	}
-
-	/* List helpers */
-	.sf_list{
-		&:not(:first-of-type){
-			.sfl_title{
-				border-top: 1px solid $gray-lighter;
-				padding-top: 8px;
-				margin-top: 5px;
-			}
-		}
-
-		.sfl_title{
-			font-weight: bold;
-		}
-		.sfl_items{
-			margin: 5px -8px 0px -8px;
-			padding: 0px;
-
-			> li{
-				padding: 4px 8px;
-				list-style: none;
-				white-space: nowrap;
-
-				&:hover{
-					background-color: $white;
-				}
-				&.sfl_i_placeholder{
-					font-style: italic;
-					opacity: 0.8;
-				}
-
-				> label{
-					display: inline-block;
-					width: 100%;
-
-					> *{
-						vertical-align: middle;
-					}
-					> input[type="checkbox"]{
-						margin-left: 0px;
-						margin-right: 8px;
-					}
-				}
-			}
-		}
-	}
-	.sf_filter{
-		position: relative;
-		margin-top: 8px;
-		margin-bottom: 8px;
-
-		input,
-		button,
-		.sff_picto{
-			vertical-align: middle;
-			height: 22px;
-		}
-
-		input,
-		button{
-			border: 1px solid #ABABAB;
-		}
-		input{
-			width: 100% !important;
-		}
-		button{
-			width: 23px; /* Must be equals to .sf_filter > *:height */
-			background-color: $white;
-			color: $combodo-orange;
-			font-size: 10px;
-
-			&:first-of-type{
-				margin-left: 5px;
-			}
-			&:not(:first-of-type){
-				border-left: transparent;
-			}
-		}
-		.sff_input_wrapper{
-			position: relative;
-
-			.sff_picto{
-				position: absolute;
-				right: 5px;
-				top: 2px;
-				opacity: 0.6;
-				user-select: none;
-			}
-			.sff_reset{
-				display: none;
-			}
-
-			input::-ms-clear {
-				display: none;
-			}
-		}
-
-		&.sf_with_buttons{
-			input{
-				width: calc(100% - 28px) !important; /* Minus button outter width (only one for now) */
-				min-width: 120px;
-			}
-		}
-	}
-}
-.sf_results_area{
-	.sf_results_placeholder{
-		margin-top: 100px;
-		text-align: center;
-
-		button > span{
-			margin-left: 0.5em;
-		}
-	}
-}
-
-.hidden{
-	display: none !important;
-}
-.visible{
-	display: initial !important;
-}
-.mandatory {
-	border: 1px solid #f00;
-}
-
-/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
-table.listResults tr.odd td.truncated, table.listResults tr td.truncated, .wizContainer table.listResults tr.odd td.truncated, .wizContainer table.listResults tr td.truncated {
-	background: url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
-}
-
-/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
-table.listResults tr.even td.truncated, .wizContainer table.listResults  tr.even td.truncated {
-	background: #f9f9f1 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
-}
-
-/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
-table.listResults tr.even td.hover.truncated, .wizContainer table.listResults  tr.even td.hover.truncated {
-	background: #fdf5d0 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
-}
-
-/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
-table.listResults tr.odd td.hover.truncated,  table.listResults tr td.hover.truncated, .wizContainer table.listResults  tr.odd td.hover.truncated, .wizContainer table.listResults  tr td.hover.truncated {
-	background: #fdf5d0 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
-}
-
-table.listResults.truncated {
-	border-bottom: 0;
-	padding-bottom: 0;
-}
-
-tr.csv_row0 td {
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	padding-right:10px;
-	background: #fff;
-	border-left: #000 1px solid;
-	
-}
-tr.csv_row1 td {
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	padding-right:10px;
-	background: #f9f9f1;
-	border-left: #000 1px solid;
-	
-}
-tr.csv_row1 th, tr.csv_row0 th {
-	padding-top:5px;
-	padding-bottom:5px;
-	padding-left:10px;
-	padding-right:10px;
-	border-left: #000 1px solid;
-	
-}
-
-td.cell_modified {
-	font-weight: bold;
-	color: #000;
-}
-
-td.cell_error {
-	font-weight: bold;
-	color: #D81515;
-}
-table.transparent, table.transparent td {
-	background: transparent;
-}
-p.page-header {
-	color:$complement-color;
-	font-weight: bold;
-	font-size: 12pt;
-	font-family: Verdana, Arial, Helvetica, Sans-Serif
-}
-td.dashboard {
-	vertical-align:top;
-	border: 1px solid #ccc;
-	padding: 0.5em;
-	width: 50%;
-}
-.white {
-	background-color: #fff;
-}
-
-/*** New Lacanau layout ***/
-
-.ui-layout-pane { /* all 'panes' */ 
-	overflow: auto;
-} 
-
-.ui-layout-resizer { /* all 'resizer-bars' */ 
-	background: #f1f1f1; 
-} 
-.ui-layout-toggler { /* all 'toggler-buttons' */ 
-	background: #AAA; 
-}
-div#top-left {
-	width: 28px;
-	height: 70px;
-	background: $frame-background-color;
-	float:left;
-}
-div#header-logo {
-	width: 100%;
-	height: 70px;
-	background: $frame-background-color;
-}
-.ui-layout-pane-west {
-	background: $frame-background-color;
-}
-div#right {
-	min-width: 260px;
-}
-div#menu {
-	width: 100%;
-	overflow: auto;
-}
-.header-menu {
-	padding-left: 24px;
-	padding-right: 8px;
-	padding-bottom: 24px;
-	background: transparent;
-}
-div#inner_menu {
-	padding-left: 24px;
-	padding-right: 8px;
-	background: transparent;
-}
-div#logo {
-	height: 70px;
-	nowidth: 100%;
-	text-align: center;
-}
-div#logo div {
-	height: 88px;
-	width: 244px;
-	background: url(../images/itop-logo-2.png?v=#{$version}) left no-repeat;
-}
-#left-pane .ui-layout-north {
-	overflow: hidden;
-}
-#top-bar {
-	background: $frame-background-color;
-	text-align: right;
-}
-.app-banner {
-
-}
-.app-message {
-	float: left;
-	margin-top: 2px;
-	margin-right: 4px;
-	padding: 6px 9px;
-	background-color: $highlight-color;
-	color: white;
-	border-radius: 6px;
-	text-align: left;
-}
-.app-message-icon {
-	margin-right: 5px;
-}
-.app-message-body {
-}
-.fa-sm {
-	font-size: 0.66em;
-}
-.object-details-header {
-	margin-top: 7px;
-	margin-bottom: 7px;
-
-}
-.object-icon {
-	display: table-cell;
-	vertical-align: middle;
-	padding-left: 10px;
-	padding-right: 10px;
-}
-.object-infos {
-	display: table-cell;
-	vertical-align: middle;
-}
-.object-name {
-	margin-top: 0px;
-	margin-bottom: 0px;
-}
-.tags {
-	margin-top: 5px;
-}
-.tag {
-	font-size: 10px;
-	font-weight: initial;
-	display: inline-block;
-	color:white;
-	background-color:#555;
-	padding: 3px 6px;
-	-webkit-border-radius:4px;
-	-moz-border-radius:4px;
-	border-radius:4px;
-}
-.text-danger {
-	color: red;
-}
-#global-search {
-	height: 55px;
-	float: right;
-	text-align: right;
-	overflow-y: hidden;
-}
-#global-search table, #global-search tr td,  #global-search tr {
-	padding: 0;
-	border: 0;
-	height: 55px;
-	margin: 0;
-	background: transparent;
-	overflow-y: hidden;
-	vertical-align: middle;
-}
-#global-search-area {
-	line-height: 55px;
-}
-#global-search-input {
-	vertical-align: middle;
-	-moz-border-radius: 6px;
-	-webkit-border-radius: 6px;
-	border-radius: 6px;
-	border: 1px #CCC solid;
-	height: 18px;
-	width: 180px;
-	padding: 3px;
-	background: #fff;
-	display: inline-block;
-}
-#global-search-image {
-	vertical-align: middle;
-	background: url(../images/search.png?v=#{$version}) center center no-repeat;
-	display:inline-block;
-	width: 28px;
-	height: 30px;
-	margin-left: -8px;
-	cursor: pointer;
-}
-#help-link img {
-	padding: 0;
-	border: 0;
-}
-#help-link {
-	padding: 0;
-	border: 0;
-	background: transparent;
-	margin-left: 15px;
-	margin-right: 10px;
-}
-div.icon {
-	width: 20px;
-	height: 20px;
-	margin: 2px;
-	float: right;
-}
-span.ui-icon {
-	float:left;
-	margin:0 2px;
-}
-.ui-layout-button-pin-down {
-	background: url(../images/splitter-bkg.png?v=#{$version}) transparent;
-	width: 16px;
-	background-position: -144px -144px;
-}
-.ui-layout-resizer-west-open {
-	background-color: $frame-background-color;
-	width: 8px;
-}
-div.footer img {
-	border: 0;
-	margin-bottom: 5px;
-	margin-top: 5px;
-}
-div.footer{
-	text-align:center;
-}
-#SearchResultsToAdd table.listResults tbody {
-	height: 300px;
-	overflow-y: auto;
-}
-tr.row_unchanged td {
-	border-bottom: 1px #ccc solid;
-	padding: 2px;
-}
-.wizContainer table tr.row_error td {
-	border-bottom: 1px #ccc solid;
-	background-color: #fdd;
-	padding: 2px;
-}
-tr.row_modified td {
-	border-bottom: 1px #ccc solid;
-	padding: 2px;
-}
-tr.row_added td {
-	border-bottom: 1px #ccc solid;
-	padding: 2px;
-}
-a.truncated {
-	cursor: pointer;
-}
-.org_combo
-{
-	font-size:x-small;
-	width: auto;
-	max-width: 200px; 
-}
-span.form_validation {
-	width:24px;
-	text-align:center;
-}
-.notification {
-	border: 1px solid #c33;
-	background-color: #fee;
-	padding: 0.5em;
-	margin: 0.5em;
-	text-align:center;
-	width: 95%;
-	-moz-border-radius: 0.5em;
-}
-.wiki_broken_link {
-	text-decoration: line-through;
-}
-.synoptics, .synoptics tr td {
-	background: transparent;
-	padding:10px;
-	font-size:1em;
-	vertical-align:middle;
-	color:#fff;
-	text-align:center;
-}
-.synoptics tr td.arrow {
-	color:#333;
-	border-top: 1px dashed #333;
-	width:100px;
-}
-.synoptics tr.synoptics_header td {
-	color:#000; font-size:1em;
-	vertical-align:middle;
-	text-align:center;
-}
-.mono_value {
-	display: inline-block;
-	background-color: #3c3;
-	color: #fff;
-	font-weight:bold;
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-	margin-left:3px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-	border-radius: 10px;
-}
-.multi_values {
-	display: inline-block;
-	background-color: #c33;
-	color: #fff;
-	font-weight:bold;
-	padding: 3px;
-	padding-left: 5px;
-	padding-right: 5px;
-	margin-left:3px;
-	-moz-border-radius: 10px;
-	-webkit-border-radius: 10px;
-	border-radius: 10px;
-}
-.caselog {
-	overflow-x: hidden;
-	display: block;
-	overflow-y: auto;
-	border: 1px #ddd solid;
-    font-family: Tahoma, Verdana, Arial, Helvetica;
-    font-size: 12px;
-}
-.caselog_input_header {
-	padding-top:3px;
-	padding-bottom:3px;
-	border-top:1px solid #fff;
-	background: #ddd;
-	width:100%;
-	height: 21px;
-}
-.caselog_input_header:empty {
-	display: none;
-}
-.editor_magnifier{
-	/* !important so it overrides the .cke_reset_all style */
-	background-position: center center !important;
-	background-repeat: no-repeat !important;
-	background-size: 100% !important;
-}
-.editor_magnifier:hover {
-	background-color: #CCC;
-}
-.caselog_header {
-	padding:3px;
-	border-top:1px solid #fff;
-	background: #ddd url(../images/plus.gif) left no-repeat;
-	padding-left: 16px;
-	cursor: pointer;
-	width:100%;
-}
-.caselog_header.open {
-	background: #ddd url(../images/minus.gif) left no-repeat;
-}
-.caselog_entry {
-	padding:3px;
-	padding-left: 16px;
-	border-bottom:1px #999 solid;
-	margin-left:0;
-	margin-right:0;
- 	white-space: pre-wrap; /* css-3 */
-    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
-    white-space: -pre-wrap; /* Opera 4-6 */
-    white-space: -o-pre-wrap; /* Opera 7 */
-    word-wrap: break-word; /* Internet Explorer 5.5+, CSS3 */
-}
-.caselog_entry_html p, .HTML p {
-	margin-top: 0.25em;
-	margin-bottom: 0.25em;
-}
-
-/* Helper classes for object details display. */
-.one-col-details {
-	min-width: 400px;
-	max-width: 600px;
-}
-.n-cols-details {
-	width: 100%;
-
-	> tbody > tr > td {
-		min-width: 240px;
-	}
-}
-.details {
-  border-collapse: collapse;
-  noborder-bottom: 2px #fff solid;
-  nowidth:100%;
-
-	* {
-		box-sizing: border-box;
-	}
-}
-fieldset .details>.field_container {
-	background: transparent;
-	border: 0;
-}
-.field_container {
-	display: table;
-	width: 100%;
-	margin-bottom: 5px;
-	border-bottom: 2px #ddd solid;
-	box-sizing: border-box;
-
-	&:last-child {
-		margin-bottom: 0px;
-	}
-
-	&.field_large {
-		display: inherit;
-
-		/* .field_label, .field_data */
-		> div {
-			display: inherit;
-
-			&.field_label {
-				width: inherit;
-				margin-bottom: 5px;
-			}
-
-			&.field_data {
-				margin-top: 8px;
-				margin-bottom: 10px;
-			}
-
-			/* .field_value, .field_comments, .field_infos */
-			> div {
-			}
-		}
-	}
-
-	* {
-		box-sizing: border-box;
-	}
-
-	/* .field_label, .field_data */
-	> div {
-		display: table-cell;
-		vertical-align: top;
-
-		&.field_label {
-			min-width: 100px;
-			max-width: 145px;
-			width: 30%;
-			padding-right: 10px;
-
-			> label,span {
-				color: #000000;
-				font-weight:bold;
-			}
-		}
-
-		&.field_data {
-			display: table;
-			width: 100%;
-			margin-bottom: 5px;
-		}
-
-		/* .field_value, .field_comments, .field_infos */
-		> div {
-			display: table-cell;
-			width: auto;
-
-			&.field_comments,
-			&.field_infos{
-				width: 50px;
-			}
-
-			&.field_value{
-
-				.attribute-edit{
-					display: table;
-					width: 100%;
-
-					/* TODO: Refactor so status icon show over mandatory icon */
-					.form_validation, .field_status{
-						display: table-cell;
-						width: 20px;
-						padding-left: 0.4em;
-						vertical-align: middle;
-					}
-
-					.field_input_zone{
-						width: 100%; /* auto; */
-
-						&.field_input_string,
-						&.field_input_password{
-							> select, input{
-								width: 100%;
-							}
-						}
-
-						&.field_input_onewaypassword{
-							display: table-cell;
-							width: auto;
-
-							> *{
-								display: block;
-								width: 100%;
-							}
-
-							> span{
-								margin-bottom: 3px;
-							}
-						}
-
-						&.field_input_date,
-						&.field_input_datetime{
-							display: table;
-							width: 100%;
-
-							> input {
-								display: table-cell;
-								width: 100%;
-							}
-
-							> span {
-								display: table-cell;
-								width: 20px;
-								padding-left: 0.4em;
-								vertical-align: middle;
-
-								> img {
-									width: 20px;
-									cursor: pointer;
-								}
-							}
-						}
-
-						&.field_input_text{
-							border: none;
-
-							.f_i_text_header{
-								/* Inspired by .cke_top */
-								padding: 6px 8px 6px;
-								white-space: normal;
-								border-bottom: 1px solid #fff;
-								background: #f2f2f2;
-
-								.fullscreen_button{
-									display: block;
-									width: 15px;
-									height: 15px;
-									border: 1px #A6A6A6 solid;
-									cursor: pointer;
-									background-image: url('../images/full-screen.png');
-									background-repeat: no-repeat;
-									background-position: center center;
-									background-size: 98%;
-								}
-								.fullscreen_button:hover,
-								.fullscreen_button:focus{
-									background-color: #CCCCCC;
-								}
-							}
-							textarea{
-								/* Size for default display */
-								width: 100%;
-								height: 100%;
-								padding: 5px 10px;
-								border: none;
-								resize: none;
-							}
-
-							&.fullscreen{
-								z-index: 100;
-								position: fixed;
-								top: 0px;
-								left: 0px;
-								width: 100%;
-								height: 100%;
-
-								textarea{
-									/* Size set again here to override resize value when in fullscreen */
-									width: 100% !important;
-									height: 100% !important;
-								}
-								.fullscreen_button{
-									width: 22px;
-									height: 22px;
-									background-color: #CCCCCC;
-								}
-							}
-						}
-
-						&.field_input_html{
-							// Nothing
-						}
-
-						&.field_input_document{
-							> input{
-								width: 100%;
-							}
-
-							> span {
-								display: inline-block;
-								margin-bottom: 2px;
-							}
-						}
-
-						&.field_input_image{
-							input{
-								width: 100%;
-							}
-						}
-
-						&.field_input_extkey{
-							display: table;
-							width: 100%;
-
-							> .field_select_wrapper{
-								display: table-cell;
-								width: auto;
-
-								> select {
-									width: 100%;
-								}
-							}
-
-							> .field_autocomplete{
-								display: table-cell;
-								width: 100%;
-							}
-
-							> .field_input_btn{
-								display: table-cell;
-								width: 25px;
-								padding-left: 0.4em;
-
-								> img {
-									max-width: 20px;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}
-.one-col-details .details .field_container.field_small {
-	div.field_label {
-		/* On a single column, field labels can take more width but they are limited so it doesn't feel weird when all labels are short */
-		width: 175px;
-		max-width: inherit;
-	}
-}
-/* This is extracted from the ".details > .field_container ..." because of the fullscreen option (element is moved at the end of the body */
-.field_input_text{
-	border: none;
-
-	.f_i_text_header{
-		/* Inspired by .cke_top */
-		padding: 6px 8px 6px;
-		white-space: normal;
-		border-bottom: 1px solid #fff;
-		background: #f2f2f2;
-
-		.fullscreen_button{
-			display: block;
-			width: 15px;
-			height: 15px;
-			border: 1px #A6A6A6 solid;
-			cursor: pointer;
-			background-image: url('../images/full-screen.png');
-			background-repeat: no-repeat;
-			background-position: center center;
-			background-size: 98%;
-		}
-		.fullscreen_button:hover,
-		.fullscreen_button:focus{
-			background-color: #CCCCCC;
-		}
-	}
-	textarea{
-		/* Size for default display */
-		width: 100%;
-		height: 100%;
-		margin: 0px;
-		padding: 5px 10px;
-		border: none;
-		resize: none;
-	}
-
-	&.fullscreen{
-		z-index: 100;
-		position: fixed;
-		top: 0px;
-		left: 0px;
-		width: 100%;
-		height: 100%;
-
-		textarea{
-			/* Size set again here to override resize value when in fullscreen */
-			width: 100% !important;
-			height: 100% !important;
-		}
-		.fullscreen_button{
-			width: 22px;
-			height: 22px;
-			background-color: #CCCCCC;
-		}
-	}
-}
-#SiloSelection{
-	padding-top: 3px;
-	padding-right: 30px;
-	text-align: left;
-
-	*{
-		box-sizing: border-box;
-		vertical-align: middle;
-	}
-
-	.ac_input {
-		width: 100%;
-	}
-
-	.field_input_extkey{
-		display: table;
-		width: 100%;
-
-		.field_select_wrapper{
-			display: table-cell;
-			width: 100%;
-
-			> select{
-				width: 100%;
-				max-width: initial;
-			}
-		}
-
-		.field_input_btn{
-			display: table-cell;
-			width: 25px;
-			padding-left: 0.4em;
-		}
-	}
-}
-.ac_dlg_loading {
-	background: white url('../images/indicator.gif') right center no-repeat;
-}
-table.pagination {
-	display:inline-block;
-}
-table.pagination tr td {
-	padding: 3px;
-}
-.pagination_container {
-	padding-left: 3px;
-}
-.pager p {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-.pager td span {
-	min-width: 20px;
-	padding-left: 2px;
-	padding-right: 2px;
-	display:inline-block;
-	text-align: center;
-	cursor: pointer;
-}
-
-.pager td span.curr_page {
-	color: #fff;
-	background: #999;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
-}
-img.prev, img.first, img.next, img.last {
-	cursor: pointer;
-}
-div.actions_button {
-	float:right;
-	background: $highlight-color url("../images/actions_left.png?v=#{$version}") no-repeat scroll left top;
-	padding-left: 5px;
-	margin-top: 0;
-	margin-right: 10px;
-	height:19px;
-	vertical-align: middle;
-}
-
-div.actions_button a, .actions_button a:hover, .actions_button a:visited {
-	background: $highlight-color  url(../images/actions_bkg.png?v=#{$version}) no-repeat scroll right top;
-	color:#fff;
-	padding-right: 8px;
-	cursor:pointer;
-	font-family: Tahoma,sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	padding-left: 4px;
-	text-decoration: none;
-	height:19px;
-	line-height: 17px;
-	display: block;
-}
-select#org_id {
-	max-width: 90%;
-}
-/*********** Dashboards ***********/
-.itop-dashboard {
-	background-color: #fff;
-}
-.itop-dashboard a {
-	cursor: not-allowed;
-}
-.dragHover {
-	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=#{$version});
-}
-.edit_mode .dashlet {
-	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=#{$version});
-	padding: 5px;
-	margin:0;
-	position:relative;
-}
-.edit_mode .dashlet-selected {
-	background: $highlight-color !important;
-	padding: 5px;
-	margin:0;
-}
-td.layout_cell {
-	height: 50px; /* min-height does not work */
-	vertical-align: top;
-}
-.dashlet-content {
-	position: relative;
-	background: #fff;
-	margin:0;
-	overflow: auto;
-}
-table.prop_table {
-    border-bottom: 2px solid #F9F9F1;
-    padding: 1px;
-    width: 100%;
-}
-.close-box {
-	margin: 5px;
-	width: 20px;
-	height: 20px;
-	position: absolute;
-	top: 0;
-	right: 0;
-	z-index: 10;
-	background: transparent url(../images/delete.png?v=#{$version}) no-repeat center;
-}
-td.prop_value {
-	text-align: left;
-}
-tr.itop-property-field-modified td {
-	background: #fbb;
-}
-tr.itop-property-field-modified td.hover {
-	background: #f99;
-}
-td.prop_value textarea, td.prop_value input[type=text]{
-	width: 98%;
-}
-td.prop_icon {
-	width: 20px;
-}
-
-.dashlet {
-	text-align:left;
-}
-.dashlet-inline {
-	display: inline-block;
-}
-.dashlet-badge a.actions {
-    background: none repeat scroll 0 0 transparent;
-    color: #666666;
-    font-size: 16px;
-    text-decoration: none;
-}
-.dashlet-content .display_block {
-	text-align:left;
-}
-.dashlet-unknown, .dashlet-proxy {
-	.dashlet-content {
-		padding: 8px;
-		background-color: #F2F2F2;
-		text-align: center;
-
-		.dashlet-ukn-text, .dashlet-pxy-text {
-			margin-top: 10px;
-		}
-	}
-}
-.prop_apply .ui-icon-alert {
-	display: none;
-}
-.prop_apply .ui-state-error .ui-icon-alert {
-	display: block;
-}
-.ui-state-error .ui-icon-circle-check {
-	display: none;
-}
-.summary-details {
-    float: right;
-    margin-top: 5px;
-}
-.summary-details th {
-    background: none repeat scroll 0 0 $summary-details-background;
-    color: #EEEEEE;
-    padding: 5px;
-    text-align: center;
-}
-.main_header {
-    background-color: $main-header-background;
-    min-height: 60px;
-    width: 100%;
-}
-.main_header h1 {
-    color: $complement-color;
-    line-height: 16px;
-    margin-bottom: 0;
-    margin-top: 0;
-    padding-bottom: 10px;
-    padding-top: 10px;
-}
-.main_header img {
-	margin-top: 10px;
-	margin-right: 10px;
-	float:left;
-}
-a.summary,  a.summary:hover {
-    background: none repeat scroll 0 0 transparent;
-    color: #666666;
-    text-decoration: none;
-    padding-left: 0;
-}
-.summary-details td {
-    background: none repeat scroll 0 0 transparent;
-    padding: 5px;
-    text-align: center;
-}
-
-#DashboardMenu > ul > li {
-	list-style: none;
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	cursor: pointer;
-}
-
-#DashboardMenu > ul {
-	list-style: none;
-	vertical-align: middle;
-	margin: 0;
-	padding: 0;
-	height: 25px;
-}
-#DashboardMenu li a {
-	display: block;
-	padding: 5px 12px;
-	text-decoration: none;
-	color: #000;
-	font-weight: bold;
-	text-align: left;
-	white-space: nowrap;
-	background: #fff;
-}
-#DashboardMenu li span {
-	display: block;
-	padding: 5px 12px;
-	text-decoration: none;
-	color: #000;
-	white-space: nowrap;
-	background: #fff;
-}
-#DashboardMenu li {
-	list-style: none;
-}
-#DashboardMenu li a:hover {
-	background: #1A4473;
-}
-
-#DashboardMenu ul > li > ul
-{	
-	border: 1px solid black;
-	background: #fff;
-}
-	
-#DashboardMenu li > ul
-{	margin: 0;
-	padding: 0;
-	position: absolute;
-	display: none;
-	border-top: 1px solid white;
-	z-index: 1500;
-}
-#DashboardMenu li ul li a:hover{
-	background: $popup-menu-highlight-color;
-	color: $popup-menu-text-higlight-color;
-	font-weight: bold;
-	list-style: none;
-}
-.sortable_field_list {
-	display: inline-block;
-	width: 250px;
-	height: 150px;
-	border: 1px #333 solid;
-	overflow: auto;
-	padding-left: 0;
-	margin: 0;
-}
-.sortable_field_list li {
-	list-style: none;
-	font-size: 11px;
-}
-.sort_order {
-	display: inline-block;
-	width: 16px;
-	height: 12px;
-}
-.sort_none {
-	background: url(../images/bg.gif) no-repeat center;
-}
-.sort_asc {
-	background: url(../images/desc.gif) no-repeat center;
-}
-.sort_desc {
-	background: url(../images/asc.gif) no-repeat center;
-}
-.sort_hidden {
-	display: none;
-}
-.sortable_field_list > li.selected {
-	background: #F6A828;
-}
-.itop-deleted-object {
-	text-decoration: line-through;
-}
-.header_message {
-	padding: 1em;
-	font-size: 10pt;
-	background: #fff;
-	border: 1px solid #999;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
-	margin-bottom: 10px;
-}
-.header_message {
-	padding: 1em;
-	font-size: 10pt;
-	background: #fff;
-	border: 1px solid #999;
-	-moz-border-radius: 4px;
-	-webkit-border-radius: 4px;
-	border-radius: 4px;
-	margin-bottom: 10px;
-}
-.message_info {
-	border: 1px solid #993;
-	background: url(../images/info-mini.png?v=#{$version}) 1em 1em no-repeat #ffc;
-	padding-left: 3em;
-}
-.message_ok {
-	border: 1px solid #393;
-	background: url(../images/ok.png?v=#{$version}) 1em 1em no-repeat #cfc;
-	padding-left: 3em;
-}
-.message_error {
-	border: 1px solid #933;
-	background: url(../images/error.png?v=#{$version}) 1em 1em no-repeat #fcc;
-	padding-left: 3em;
-}
-.fg-menu a img {
-        border: 0;
-}
-div.ui-dialog-header {
-    padding-bottom: 10px;
-    padding-top: 7px;
-}
-.form_field_error {
-	border: 1px solid #933;
-	background: #fcc;
-}
-.simple-graph, .graph_config {
-	background: #fff;
-}
-.graph_config {
-	padding: 0.25em;
-}
-.graph_config button.ui-widget {
-	font-size: 12px;
-}
-.ui-tooltip, .arrow:after {
-	background: $frame-background-color;
-	border: 1px solid $grey-color;
-}
-.ui-tooltip {
-	padding: 10px 10px;
-	box-shadow: 0 0 7px black;
-	max-width: 350px;
-	overflow: hidden;
-}
-.ui-tooltip .arrow {
-	width: 70px;
-	height: 16px;
-	overflow: hidden;
-	position: absolute;
-	left: 50%;
-	margin-left: -35px;
-	bottom: -16px;
-}
-.ui-tooltip .arrow.top {
-	top: -16px;
-	bottom: auto;
-}
-.ui-tooltip .arrow.left {
-	left: 20%;
-}
-.ui-tooltip .arrow:after {
-	content: "";
-	position: absolute;
-	left: 20px;
-	top: -20px;
-	width: 25px;
-	height: 25px;
-	box-shadow: 6px 5px 9px -9px black;
-	-webkit-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-	transform: rotate(45deg);
-}
-.ui-tooltip .arrow.top:after {
-	bottom: -20px;
-	top: auto;
-}
-.ui-tooltip .ui-tooltip-content{
-	overflow-x: auto;
-}
-table.export_parameters td {
-	padding-right: 2em;
-}
-
-.table_preview > table {
-	border-collapse: collapse;
-	max-height: 150px;
-	overflow: auto;
-	display: block;
-}
-.table_preview > table > thead > tr > th, .table_preview > table > tbody > tr > td {
-	border: 1px $grey-color solid;
-	min-height: 1em;
-	padding-left: 0.25em;
-	padding-right: 0.25em;
-	font-size: 10pt;
-}
-.table_preview > table > tbody > tr > td {
-	vertical-align: top;
-}
-.table_preview .drag-handle {
-	cursor: move;	
-}
-.table_preview div.text-preview {
-	white-space: pre-wrap;
-}
-/* Format for the PDF output */
-.table_preview .view-image {
-  // Counteract the forced dimensions (usefull for displaying in the details view)
-  width: inherit !important;
-  height: inherit !important;
-  text-align: center;
-  img {
-	max-width: 48px !important;
-	max-height: 48px !important;
-	display: inline-block;
-  }
-}
-.graph_zoom {
-	display: inline-block;
-	float: right;
-	margin-right: 2em;
-}
-.graph_zoom_slider {
-	display: inline-block;
-	width: 10em;
-}
-.graph_zoom_plus, .graph_zoom_minus {
-	display: inline-block;
-	margin-left: 1em;
-	margin-right: 1em;
-}
-div.explain-printable {
-	border: 5px solid $complement-color;
-	background: $complement-light;
-	color: #000;
-	padding: 10px;
-	margin: 0;
-	font-size: 12px;
-}
-
-.hideable-chapter {
-	cursor: pointer;
-}
-#hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span {
-	padding-left: 20px;
-	background: url(../images/eye-open-555.png?v=#{$version}) 2px center no-repeat;
-}
-
-#hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span {
-	text-decoration: line-through;
-	background: url(../images/eye-closed-555.png?v=#{$version}) 2px center no-repeat;
-}
-.printable-version legend {
-	padding-left: 26px;
-	background: $complement-color url(../images/eye-open-fff.png?v=#{$version}) 8px center no-repeat;
-}
-.printable-version .strikethrough legend {
-	background: $complement-color url(../images/eye-closed-fff.png?v=#{$version}) 8px center no-repeat;
-}
-.printable-version fieldset.strikethrough span {
-	display: none;
-}
-h2.printable-tab-title {
-	border-bottom: 2px solid;
-}
-.strikethrough {
-	text-decoration: line-through;
-}
-select.multiselect {
-	max-width: 150px;
-}
-span.search-button, span.refresh-button {
-	display: inline-block;
-	width: 21px;
-	height: 18px;
-	cursor: pointer;
-	color: #FFFFFF;
-	text-align: center;
-	padding-top: 3px;
-	font-size: 10px;
-}
-.actions_button.icon_actions_button {
-	padding: 0 2px 0 2px;
-}
-.case-log-history-entry {
-	display: block;
-}
-.case-log-history-entry-end {
-	display: none;
-}
-.expanded .case-log-history-entry-end {
-	display: inline;
-}
-.case-log-history-entry-more {
-	display: inline;
-}
-.expanded .case-log-history-entry-more {
-	display: none;
-}
-.case-log-history-entry .case-log-history-entry-toggle {
-	display: inline-block;
-	float: none;
-	pointer: cursor;
-	vertical-align: bottom;
-}
-.printable-tab .case-log-history-entry-end {
-	display: inline;
-}
-.printable-tab .case-log-history-entry-more {
-	display: none;
-}
-.printable-tab .case-log-history-entry .case-log-history-entry-toggle {
-	display: none;
-}
-.history_entry {
-	position: relative !important;
-	max-width: 100%;
-}
-.history_entry_truncated {
-	max-height: 7em;
-	overflow: hidden;
-}
-.history_truncated_toggler {
-	position: absolute !important;
-	bottom: 0;
-	right: 0;
-	display: block;
-	cursor: pointer;
-	width: 16px;
-	height: 16px;
-	background-image: url(ui-lightness/images/ui-icons_222222_256x240.png);
-	background-position: -16px -192px;
-}
-.history_entry_truncated .history_truncated_toggler {
-	background-position: 0 -192px;
-}
-
-#top-bar-table {
-  width: 100%;
-  padding-left: 5px;
-
-  $top-button-width: 40px;
-  $top-button-heigth: 55px;
-  $top-button-spacer: 35px;
-
-  #open-left-pane {
-	text-align: center;
-	width: $top-button-width !important;
-	cursor: pointer;
-  }
-  #go-home {
-	text-align: center;
-	width: $top-button-width !important;
-
-	a {
-	  text-decoration: none;
-	  color: #555;
-	  font-size: 9pt;
-	  padding: 0;
-	  background: none;
-
-	  // Make the whole cell clickable
-	  display: inline-block;
-	  line-height: $top-button-heigth;
-	  width: 100%;
-	}
-  }
-  .top-bar-spacer{
-	width: $top-button-spacer !important;
-  }
-  #top-bar-table-search{
-    min-width: 370px;
-  }
-}
-
-#itop-breadcrumb{
-  overflow: hidden;
-  float: left;
-  background: $frame-background-color;
-
-  .breadcrumb-item{
-	float: left;
-	margin: 3px 22px 2px 0px;
-
-	.icon img{
-	  height: 15px;
-	  width: auto;
-	  margin-right: 5px;
-
-	  -webkit-filter: grayscale(100%);
-	  filter: grayscale(100%);
-	  filter: gray;
-
-	  // IE has no filter option: at least, have some effect when hovering...
-	  opacity: 0.5;
-	}
-
-	a{
-	  text-decoration: none;
-	  color: #555;
-	  font-size: 9pt;
-	  padding: 0;
-	  background: none;
-
-	  &:hover .icon img{
-		-webkit-filter: none;
-		filter: none;
-		opacity: 1;
-	  }
-
-	  span.truncate
-	  {
-		// Ellipsis
-		max-width: 200px;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: inline-block;
-	  }
-
-	  &:hover{
-		text-decoration: none;
-		color: $highlight-color;
-	  }
-
-	  &::after{
-		content:'';
-		position: absolute;
-		background-image: url(../images/breadcrumb-separator.png?v=#{$version});
-		background-repeat: no-repeat;
-		width: 8px;
-		height: 16px;
-		margin-left: 5px;
-	  }
-	}
-
-	&:last-child a::after{
-	  display: none;
-	}
-
-	&.breadcrumb-current{
-	  text-decoration: none;
-	  color: #555;
-	  font-size: 9pt;
-	  padding: 0;
-	  background: none;
-	  span.truncate
-	  {
-		// Ellipsis
-		max-width: 200px;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: inline-block;
-	  }
-
-	}
-  }
-}
-.ui-datepicker-buttonpane, .ui-timepicker-div {
-	font-size: 9pt;
-	font-family: Tahoma, Verdana, Arial, Helvetica;
-}
-.date_format_tooltip td {
-	padding: 0.25em;
-}
-#setup {
-  .module-selection-banner img {
-		max-height: 48px;
-  }
-  .module-selection-body {
-	height: 28em;
-	overflow: auto;
-	border: #ccc 1px solid;
-  }
-}
-.mfp-close {
-	cursor: pointer !important;
-}
-
-.qtip-content {
-	font-size: 12px;
-}
-.qtip-content p:first-child {
-	margin-top: 0px;
-}
-.qtip-content p:last-child {
-	margin-bottom: 0px;
-}
-.synchro-source {
-}
-.synchro-source-title {
-	font-weight: bolder;
-}
-.synchro-source-description {
-	font-size: smaller;
-	margin-top: 3px;
-	margin-bottom: 1px;
-}
-.object-ref.archived {
-}
-.object-ref-icon.fa {
-	color: $highlight-color;
-	font-size: smaller;
-	vertical-align: 1px;
-	margin-right: 1px;
-}
-.object-ref-icon-disabled.fa {
-	color: $grey-color;
-	font-size: smaller;
-	margin-right: 1px;
-}
-.object-ref-link {
-	background: none;
-}
-.extension-source {
-	display:inline-block;
-	background-color: $grey-color;
-	padding:3px;
-	font-size:10px;
-	color:#fff;
-    border-radius: 4px;
-}
-
-///////////////////
-// Datamodel Viewer
-///////////////////
-
-#img-lifecycle{
-	width:100%;
-}
-#img-lifecycle:hover{
-	width:100%;
-	cursor:pointer;
-}
-
-#search-model{
-	width:90%;
-}
-
-.mfp-figure:after{
-	background-color: #dff1ff;
-}
-#classDetailsClassName{
-	display:inline;
-}
-
-.qtip-content a, .qtip-content a:visited{
-	color : #1c94c4;
-	text-decoration: none;
-}
-.qtip-content a:hover, .qtip-content a:active{
-	color : #e87c1e;
-	text-decoration: none;
-}
-
-.data-model-viewer a, .data-model-viewer a:visited {
-	color : #1c94c4;
-	text-decoration : none;
-}
-
-.data-model-viewer a:hover {
-	color: #e87c1e;
-	text-decoration: none;
-}
-
-table.listResults .originColor{
-	width : 0px;
-	padding : 2px !important;
-}
-#displaySelectorLabel,  #changeDefaultDisplay{
-	display :inline-block;
-}
-
-#dataModelSplitPane{
-	height:100%;
-}
-#dataModelClassIcon, dataModelScrollableDiv > img{
-	padding-right: 13px;
-	display: inline;
-}
-
-#dataModelScrollableDiv{
-	background-color: #eee;
-	position: fixed;
-	z-index: -1;
-    width: 100%
-}
-#dataModelHeader{
-	background-color: white;
-}
-
-#dataModelSplitPane  #tabbedContent_0{
-	z-index: -2;
-}
-
-#dataModelScrollableClassName, #dataModelScrollableClassIcon{
-	display: inline;
-}
-#dataModelScrollableDiv > img {
-  padding-right: 5px;
-}
-
-#dataModelSplitPane .ui-layout-resizer {
-	background: #DDD;
-	width:10px !important;
-	margin-left: 15px !important;
-}
-#dataModelSplitPane .ui-layout-resizer :hover{
-	background: #E87C1E;
-}
-#dataModelSplitPane .ui-layout-resizer-west{
-	border-left : 1px solid #BBB;
-	border-right: 1px solid #BBB;
-}
-#dataModelSplitPane .ui-layout-resizer-east{
-	border-left : 1px solid #BBB;
-	border-right: 1px solid #BBB;
-}
-
-#dataModelSplitPane .ui-layout-toggler{
-	background: #AAA;
-	width:10px !important;
-}
-#dataModelSplitPane .ui-layout-toggler:hover{
-	background: #E87C1E;
-}
-.dataModelSchema g {
-	cursor: pointer;
-}
-.dataModelSchema g:hover rect:not(.liseret){
-	fill: #dbe4f0;
-}
-.dataModelSchema text {
-	fill: black;
-	font: 10px sans-serif;
-	text-anchor: middle;
-}
-#selfreferencing:hover ~ g > .selfattr{
-	fill: #dbe4f0;
-}
-.tooltipD3{
-	position: fixed;
-	text-align: center;
-	background: #EEE;
-	border: 1px solid $grey-color;
-	border-radius: 2px;
-	pointer-events: none;
-	fill: black;
-	font: 11px sans-serif;
-	text-anchor: middle;
-}
-#tooltipD3_top{
-	font-weight: bold;
-	border-bottom: 1px solid $grey-color;
-	padding: 3px;
-}
-.tooltipD3 i {
-	font-size: 14px;
-}
-.tooltipD3 span{
-	margin: 2px;
-}
-.dataModelSchema .selfattrtxt {
-	font-family: FontAwesome;
-}
-
-.data-model-viewer{
-	background-color: #FFF;
-	margin-top:7px !important;
-	margin-left: 15px !important;
-}
-
-#delDataModelSearch {
-	color: #E87C1E;
-	font-family: FontAwesome;
-	display:inline-block;
-	font-size:15px;
-	margin-left:1%;
-}
-
-#dataModelSplitPane .ui-layout-center{
-	margin-left :30px !important;
-}
-///////////////////
-//Impact analysis filter
-#ds_flash{
-	margin-bottom: 5px;
+@import 'css-variables.scss';
+
+$hilight-color: $highlight-color;
+$summary-details-background: $grey-color;
+$main-header-background: $frame-background-color;
+$table-even-background: $frame-background-color;
+$popup-menu-highlight-color: $highlight-color;
+$popup-menu-text-color: #000;
+$popup-menu-background-color: #fff;
+$popup-menu-text-higlight-color: #fff;
+$breadcrumb-color: #555;
+$breadcrumb-text-color: #fff;
+$breadcrumb-highlight-color: $highlight-color;
+$breadcrumb-text-highlight-color: #fff;
+
+/* CSS Document */
+body {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 10pt;
+    color: $text-color;
+	margin: 0;			/* Remove body margin/padding */
+	padding: 0;
+	overflow: hidden;	/* Remove scroll bars on browser window */
+}
+
+body.printable-version {
+	margin:1.5em;
+	overflow:auto;
+}
+
+/* to prevent flicker, hide the pane's content until it's ready */
+.ui-layout-center, .ui-layout-north, .ui-layout-south {
+    display: none;
+}
+.ui-layout-content {
+	padding-left: 10px;
+}
+.ui-layout-content .ui-tabs-nav li {
+	/* Overriding jQuery UI theme to see active tab better */
+	margin-bottom: 2px;
+
+	&.ui-tabs-active{
+		padding-bottom: 3px;
+	}
+}
+
+.raw_output {
+    font-family: Courier-New, Courier, Arial, Helvetica;
+    font-size: 8pt;
+    background-color: #eeeeee;
+    color: $text-color;
+    border: 1px dashed $text-color;
+    padding: 0.25em;
+    margin-top: 1em;
+}
+
+h1 {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    color: $text-color;
+    font-weight: bold;
+    font-size: 12pt;
+}
+h2 {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    color: $text-color;
+    font-weight: normal;
+    font-size: 12pt;
+}
+h3 {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    color: $text-color;
+    font-weight: normal;
+    font-size: 10pt;
+}
+
+label {
+	cursor: pointer;
+}
+
+.hilite, .hilite a, .hilite a:visited {
+    color: $hilight-color;
+    text-decoration: none;
+}
+table.datatable {
+	width: 100%;
+	border: 0;
+	padding: 0;
+}
+td.menucontainer {
+	text-align: right;
+}
+table.listResults {
+    padding: 0px;
+	border-top: 3px solid $frame-background-color;
+	border-left: 3px solid $frame-background-color;
+	border-bottom: 3px solid #e6e6e1;  
+	border-right: 3px solid #e6e6e1;
+	width: 100%;
+	background-color: #fff;
+}
+
+table.listResults td {
+	padding: 2px;
+}
+
+table.listResults td .view-image {
+  // Counteract the forced dimensions (usefull for displaying in the details view)
+  width: inherit !important;
+  height: inherit !important;
+  img {
+    max-width: 48px !important;
+    max-height: 48px !important;
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}
+
+.edit-image {
+  .view-image {
+	display: inline-block;
+
+    img[src=""],
+	img[src="null"] {
+		// Hiding "broken" image when src is not set
+		visibility: hidden;
+	}
+
+	&.dirty {
+	  // The image will be modified when saving the changes
+
+	  &.compat {
+		// Browser not supporting FileReader
+		background-image: url("ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png");
+		img {
+		  opacity: 0.3;
+		}
+	  }
+	}
+  }
+
+  .edit-buttons {
+	display: inline-block;
+	vertical-align: top;
+	margin-top: 4px;
+	margin-left: 3px;
+
+	.button {
+	  cursor: pointer;
+	  margin-bottom: 3px;
+	  padding: 2px;
+	  background-color: $highlight-color;
+
+	  &.disabled {
+		cursor: default;
+		background-color: $grey-color;
+		opacity: 0.3;
+	  }
+	  .ui-icon {
+		background-image: url("ui-lightness/images/ui-icons_ffffff_256x240.png");
+	  }
+	}
+  }
+
+  .file-input {
+	display: block;
+  }
+}
+
+/* Center the image both horizontally and vertically, withing a box which size is fixed (depends on the attribute definition) */
+.details .view-image {
+  text-align: center;
+  padding: 2px;
+  border: 2px solid #DDDDDD;
+  border-radius: 6px;
+
+  img {
+	  display: inline-block;
+	  vertical-align: middle;
+	  max-width: 90% !important;
+	  max-height: 90% !important;
+  }
+  .helper-middle {
+	// Helper to center the image (requires a span dedicated to this)
+	display: inline-block;
+	height: 100%;
+	vertical-align: middle;
+  }
+}
+
+table.listContainer {
+    border: 0;
+	padding: 0;
+	margin: 0;
+	width: 100%;
+	clear: both;
+}
+
+tr.containerHeader, tr.containerHeader td {
+	background: transparent;
+} 
+
+tr.even td, .wizContainer tr.even td {
+	background-color: $table-even-background;
+} 
+tr.red_even td, .wizContainer tr.red_even td {
+	background-color: #f97e75;
+	color: #fff;
+}
+tr.red td, .wizContainer tr.red td {
+	background-color: #f9a397;
+	color: #fff;
+}
+tr.orange_even td, .wizContainer tr.orange_even td {
+	background-color: #f4d07a;
+}
+tr.orange td, .wizContainer tr.orange td {
+	background-color: #f4e96c;
+} 
+tr.green_even td, .wizContainer tr.green_even td {
+	background-color: #bee5a3;
+} 
+tr.green td, .wizContainer tr.green td {
+	background-color: #b3e5b4;
+} 
+
+tr td.hover, tr.even td.hover, .hover a, .hover a:visited, .hover a:hover, .wizContainer tr.even td.hover,  .wizContainer tr td.hover {
+	background-color: #fdf5d0;
+	color: $text-color;
+}
+
+th {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 8pt;
+    color: $complement-color;
+    height:20px;
+    background: $frame-background-color bottom repeat-x;	
+}
+
+th.header {
+	cursor: pointer;
+	background-repeat: no-repeat;
+	background-position: center right;
+	background-repeat: no-repeat;
+	padding-right: 16px; // some space for the asc/desc icons
+}
+
+th.headerSortUp {
+	background-image: url(../images/asc.gif);
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+th.headerSortDown {
+	background-image: url(../images/desc.gif);
+	text-decoration: underline;
+	cursor: pointer;
+}
+
+td {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 12px;
+    color:#696969;
+	nobackground-color: #ffffff;
+	padding: 0px;
+}
+
+tr.clicked td {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: smaller;
+	background-color: #ffcfe8;
+}
+
+td.label {
+	vertical-align: top;
+}
+td.label span {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 12px;
+    color: #000000;
+    padding: 5px;
+    padding-right: 10px;	
+    font-weight:bold;
+    vertical-align: top;
+    text-align: right;
+    display: block;
+}
+fieldset td.label span {
+    padding: 3px;
+    padding-right: 10px;
+}
+fieldset {
+    margin-top: 3px;	
+    -moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border-style: solid;
+	border-color: #ddd;
+}
+
+legend {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 12px;
+	padding:8px;
+	color: #fff;
+	background-color: $complement-color;
+	font-weight: bold;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+}
+legend.transparent {
+	background: transparent;
+	color: #333333;
+	font-size: 1em;
+	font-weight: normal;
+	padding: 0;
+}
+.ui-widget-content td legend a, .ui-widget-content td legend a:hover, .ui-widget-content td legend a:visited {
+	color: #fff;
+}
+
+.ui-widget-content td a, p a, p a:visited, td a, td a:visited {
+	text-decoration:none;
+	color: $complement-color;
+}
+.ui-widget-content td a.cke_button, .ui-widget-content td a.cke_toolbox_collapser, .ui-widget-content td a.cke_combo_button, cke_dialog a {
+	padding-left: 0;
+	background-image: none;
+}
+
+.ui-widget-content td a:hover, p a:hover, td a:hover {
+	text-decoration:underline;
+	color:$highlight-color;
+}
+.cke_reset_all *:hover {
+	text-decoration: none;
+	color: #000;
+}
+table.cke_dialog_contents a.cke_dialog_ui_button_ok {
+    color: #000;
+    border-color: $highlight-color;
+    background: $highlight-color;
+}
+.cke_notifications_area {
+	display: none;
+}
+td a.no-arrow, td a.no-arrow:visited, .SearchDrawer a.no-arrow, .SearchDrawer a.no-arrow:visited {
+	text-decoration:none;
+	color:#000000;
+	padding-left:0px;
+	background: inherit;
+}
+td a.no-arrow:hover {
+	text-decoration:underline;
+	color:#d81515;
+	padding-left:0px;
+	background: inherit;
+}
+td a,
+td a:visited{
+	&:hover{
+		.text_decoration{
+			color: darken($highlight-color, 6%);
+		}
+	}
+
+	.text_decoration{
+		vertical-align: baseline;
+		text-decoration: none;
+		color: $highlight-color;
+		margin-right: 8px;
+		transition: color 0.2s ease-in-out;
+	}
+}
+
+a.small_action {
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 8pt;
+    color: #000000;
+	text-decoration:none;
+}
+.display_block {
+	padding:0.25em;
+}
+.actions_details {
+	float:right;
+	margin-top:10px;
+	margin-right:10px;
+	padding-left: 5px;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	background: $highlight-color url(../images/actions_left.png?v=#{$version}) no-repeat left;
+}
+.actions_details span{
+	background: url(../images/actions_right.png?v=#{$version}) no-repeat right;
+	color: #fff;
+	font-weight: bold;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 12px;
+}
+.actions_details a {
+	text-decoration:none;
+}
+.loading {
+	noborder: 1px dashed #CCC;
+	background: #b9c1c8;
+	padding:0.25em;
+}
+
+input.textSearch {
+	border:1px solid #000;
+	font-family:Tahoma,Verdana, Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color:#000000;
+}
+
+.ac_input {
+	border: 1px solid #7f9db9;
+	background: #fff url(../images/ac-background.gif) no-repeat right;
+}
+/* By Rom */
+.csvimport_createobj {
+    color: #AA0000;
+    background-color:#EEEEEE;
+}
+.csvimport_error {
+    font-weight: bold;
+    color: #FF0000;
+    background-color:#EEEEEE;
+}
+.csvimport_warning {
+    color: #CC8888;
+    background-color:#EEEEEE;
+}
+.csvimport_ok {
+    color: #00000;
+    background-color:#BBFFBB;
+}
+.csvimport_reconkey {
+    font-style: italic;
+    color: #888888;
+    background-color:#FFFFF;
+}
+.csvimport_extreconkey {
+    color: #888888;
+    background-color:#FFFFFF;
+}
+#accordion {
+	display:none;
+}
+
+#accordion h3 {
+	padding: 10px;
+}
+
+.ui-accordion-content ul {
+    list-style:none;
+    list-style-image: url(data:0);
+    padding-left:16px;
+	margin-top: 8px;
+}	
+
+.ui-accordion-content li.submenu {
+	margin-top: 8px;
+}	
+
+.ui-accordion-content ul ul {
+	padding: 8px 0px 8px 8px;
+	margin:0;
+    list-style:none;
+    list-style-image: url(data:0);
+    border: 0;
+}	
+	
+.nothing {
+    noborder-top: 1px solid #8b8b8b;
+    padding: 4px 0px 0px 16px;   	
+	font-size:8pt;
+    background: url(../images/green-square.gif) no-repeat bottom left;
+    color:#83b217;
+    font-weight:bold;
+	text-decoration:none;
+}
+div.ui-accordion-content {
+	padding-top: 10px;
+	padding-left: 10px;
+}
+.ui-accordion-content a, ui-accordion-content a:visited {
+	color:	$complement-color;
+	text-decoration:none;
+}
+
+.ui-accordion-content a:hover {
+	color: 	$highlight-color;
+	text-decoration: none;
+}
+
+.ui-accordion-content ul { 
+	padding-left: 0;
+	margin-top: 0;
+}
+
+.ui-accordion-content li { 
+	color:$grey-color;
+	text-decoration:none;
+	margin: 0;
+	padding: 0px 0pt 0px 16px;
+	font-size: 9pt;
+    background: url(../images/mini-arrow-orange.gif) no-repeat top left;
+    font-weight:normal;
+    border: 0;
+}
+
+a.CollapsibleLabel, td a.CollapsibleLabel { 
+	margin: 0;
+	padding: 0px 0pt 0px 16px;
+	font-size:8pt;
+	text-decoration:none;
+	color:$grey-color;
+    background: url(../images/mini-arrow-orange.gif) no-repeat left;
+}
+
+/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
+a.CollapsibleLabel.open,  td a.CollapsibleLabel.open { 
+	margin: 0;
+	padding: 0px 0pt 0px 16px;
+	font-size:8pt;
+	text-decoration:none;
+	color: $highlight-color;
+    background: url(../images/mini-arrow-orange-open.gif) no-repeat left;
+}
+
+.page_header {
+	background-color:$frame-background-color;
+	padding:5px;
+}
+/* move up a header immediately following a display block (i.e. "actions" menu) */
+.display_block + .page_header {
+	margin-top: -8px;
+}
+
+.notreeview li { background: url(../images/tv-item.gif) 0 0 no-repeat; }
+.notreeview .collapsable { background-image: url(../images/tv-collapsable.gif); }
+.notreeview .expandable { background-image: url(../images/tv-expandable.gif); }
+.notreeview .last { background-image: url(../images/tv-item-last.gif); }
+.notreeview .lastCollapsable { background-image: url(../images/tv-collapsable-last.gif); }
+.notreeview .lastExpandable { background-image: url(../images/tv-expandable-last.gif); }
+
+#OrganizationSelection {
+    padding:5px 0px 16px 20px;
+}
+
+/* popup menus */
+div.itop_popup {
+	margin: 0;
+	padding: 0;
+	float:right;
+}
+div.itop_popup > ul > li {
+	list-style: none;
+	cursor: pointer;
+	position: relative;
+}
+
+div.actions_menu > ul {
+	height:19px;
+	line-height: 17px;
+	vertical-align: middle;
+	display:block;
+	nowidth:70px; /* Nasty work-around for IE... en attendant mieux */
+	padding-left: 5px;
+	background: $highlight-color url(../images/actions_left.png?v=#{$version}) no-repeat top left;
+	cursor: pointer;
+	margin: 0;
+}
+
+div.actions_menu > ul > li {
+	float: left;
+	list-style: none;
+	font-size: 11px;
+	font-family: Tahoma,sans-serif;
+	height: 17px;
+	padding-right: 16px;
+	padding-left: 4px;
+	background: url(../images/actions_right.png?v=#{$version}) no-repeat top right transparent;
+	font-weight: bold;
+	color: $popup-menu-text-higlight-color;
+	vertical-align: middle;
+	margin: 0;
+}
+#logOffBtn > ul > li {
+	list-style: none;
+	vertical-align: middle;
+	margin: 0;
+	padding-left: 10px;
+	padding-right: 10px;
+	cursor: pointer;
+}
+#logOffBtn > ul {
+	list-style: none;
+	vertical-align: middle;
+	margin: 0;
+	padding: 0;
+	height: 25px;
+}
+	
+.itop_popup li a, #logOffBtn li a {
+	display: block;
+	padding: 5px 12px;
+	text-decoration: none;
+	nowidth: 70px;
+	color: $popup-menu-text-color;
+	font-weight: bold;
+	white-space: nowrap;
+	background: $popup-menu-background-color;
+}
+
+#logOffBtn li span {
+	display: block;
+	padding: 5px 12px;
+	text-decoration: none;
+	nowidth: 70px;
+	color: $popup-menu-text-color;
+	white-space: nowrap;
+	background: $popup-menu-background-color;
+}
+.itop_popup ul {
+	padding-left: 0;
+}
+
+.menucontainer div.toolkit_menu {
+	margin-left: 10px;
+}
+
+.itop_popup li a:hover, #logOffBtn li a:hover {
+	background: #1A4473;
+}
+
+.itop_popup ul > li > ul, #logOffBtn ul > li > ul
+{	
+	border: 1px solid black;
+	background: #fff;
+}
+	
+.itop_popup li > ul, #logOffBtn li > ul
+{	margin: 0;
+	padding: 0;
+	position: absolute;
+	display: none;
+	border-top: 1px solid white;
+	z-index: 1500;
+}
+
+.itop_popup li ul li,  #logOffBtn li ul li {
+	float: none;
+	display: inline;
+}
+
+.itop_popup li ul li a, #logOffBtn li ul li a {
+	width: auto;
+	text-align: left;
+}
+
+.itop_popup li ul li a:hover, #logOffBtn li ul li a:hover{
+	background: $popup-menu-highlight-color;
+	color: $popup-menu-text-higlight-color;
+	font-weight: bold;
+}
+.itop_popup > ul {
+	margin: 0;
+}
+hr.menu-separator {
+	border: none 0;
+	border-top: 1px solid #ccc;
+	color: #ccc;
+	background-color: transparent;
+	height: 1px;
+	margin: 3px;
+	cursor: default;
+}
+/************************************/
+.wizHeader {
+	background: $complement-color;
+	padding: 15px;
+}
+.wizContainer {
+	border: 5px solid $complement-color;
+	background: $complement-light;
+	padding: 5px;
+}
+
+.wizContainer table tr td {
+	background: transparent;
+}
+.alignRight {
+	text-align: right;
+	padding: 3px;
+}
+
+.alignLeft {
+	text-align: left;
+	padding: 3px;
+}
+
+.red {
+	background-color: #ff6000;
+	color: #000;
+}
+
+th.red {
+	background: url(../images/red-header.gif) bottom left repeat-x;
+	color: #000;
+}
+
+.green {
+	background-color: #00cc00;
+	color: #000;
+}
+th.green {
+	background: url(../images/green-header.gif) bottom left repeat-x;
+	color: #000;
+}
+
+.orange {
+	background-color: #ffde00;
+	color: #000;
+}
+
+th.orange {
+	background: url(../images/orange-header.gif) bottom left repeat-x;
+	color: #000;
+}
+
+/* For Date Picker: Creates a little calendar icon
+ * instead of a text link for "Choose date"
+ */
+td a.dp-choose-date, a.dp-choose-date, td a.dp-choose-date:hover, a.dp-choose-date:hover, td a.dp-choose-date:visited, a.dp-choose-date:visited {
+	float: left;
+	width: 16px;
+	height: 16px;
+	padding: 0;
+	margin: 5px 3px 0;
+	display: block;
+	text-indent: -2000px;
+	overflow: hidden;
+	background: url(../images/calendar.png?v=#{$version}) no-repeat; 
+}
+td a.dp-choose-date.dp-disabled, a.dp-choose-date.dp-disabled {
+	background-position: 0 -20px;
+	cursor: default;
+}
+/* For Date Picker: makes the input field shorter once the date picker code
+ * has run (to allow space for the calendar icon)
+ */
+input.dp-applied {
+	width: 140px;
+	float: left;
+}
+
+/* For search forms */
+.mini_tabs a {
+	text-decoration: none;
+	font-weight:bold;
+	color: #ccc;
+	background-color:#333;
+	padding-left: 1em;
+	padding-right: 1em;
+	padding-bottom: 0.25em;
+}
+.mini_tabs a.selected {
+	color: #fff;
+	background-color:  $complement-color;
+	padding-top: 0.25em;
+}
+.mini_tabs ul {
+	margin: -10px;
+}
+.mini_tabs ul li {
+	float: right;
+	list-style: none;
+	nopadding-left: 1em;
+	nopadding-right: 1em;
+	margin-top: 0;
+}
+/* Search forms v2 */
+.search_box{
+	box-sizing: border-box;
+	position: relative;
+	z-index: 1100; /* To be over the table block/unblock UI. Not very sure about this. */
+	text-align: center; /* Used when form is closed */
+
+	/* Sizing reset */
+	*{
+		box-sizing: border-box;
+	}
+}
+.search_form_handler{
+	position: relative;
+	z-index: 10;
+	width: 100%;
+	margin-left: auto;
+	margin-right: auto;
+	font-size: 12px;
+	text-align: left;   /* To compensate .search_box:text-align */
+	border: 1px solid $complement-color;
+	//transition: width 0.3s ease-in-out;
+
+	/* Sizing reset */
+	*{
+		box-sizing: border-box;
+	}
+	/* Hyperlink reset */
+	a{
+		color: inherit;
+		text-decoration: none;
+	}
+	/* Input reset */
+	input[type="text"],
+	select{
+		padding: 1px 2px;
+	}
+
+	&:not(.closed){
+		.sf_title{
+			.sft_short{
+				display: none;
+			}
+
+			.sft_hint,
+			.sft_toggler{
+				margin-top: 4px;
+			}
+			.sft_toggler{
+				transform: rotateX(180deg);
+				transition: transform 0.5s linear;
+			}
+		}
+	}
+	&.closed{
+		margin-bottom: 0.5em;
+		width: 150px;
+		overflow: hidden;
+		border-radius: 4px;
+		background-color: $complement-color;
+
+		.sf_criterion_area{
+			height: 0;
+			opacity: 0;
+			padding: 0;
+		}
+		.sf_title {
+			padding: 6px 8px;
+			text-align: center;
+			font-size: 12px;
+
+			.sft_long{
+				display: none;
+			}
+			.sft_hint{
+				display: none;
+			}
+		}
+	}
+
+	&:not(.no_auto_submit){
+		.sft_hint{
+			display: none;
+		}
+		.sfc_fg_apply{
+			display: none;
+		}
+	}
+	&.no_auto_submit{
+		.sfc_fg_search{
+			display: none;
+		}
+	}
+
+	.sf_title{
+		transition: opacity 0.3s, background-color 0.3s, color 0.3s linear;
+		padding: 8px 10px;
+		margin: 0;
+		color: #ffffff;
+		background-color: $complement-color;
+		cursor: pointer;
+		.sft_hint{
+			font-size: 8pt;
+			font-style: italic;
+		}
+		.sft_toggler{
+			margin-left: 0.7em;
+			transition: color 0.2s ease-in-out, transform 0.4s ease-in-out;
+
+			&:hover{
+				color: $gray-extra-light;
+			}
+		}
+	}
+	.sf_message{
+		display: none;
+		margin: 8px 8px 0px 8px;
+		border-radius: 0px;
+	}
+	.sf_criterion_area{
+		/*display: none;*/
+		padding: 8px 8px 3px 8px; /* padding-bottom must equals to padding-top - .search_form_criteria:margin-bottom */
+		background-color: $white;
+
+		.sf_criterion_row{
+			position: relative;;
+
+			&:not(:first-child){
+				margin-top: 20px;
+
+				&::before{
+					content: "";
+					position: absolute;
+					top: -12px;
+					left: 0px;
+					width: 100%;
+					border-top: 1px solid $search-criteria-box-border-color;
+				}
+				&::after{
+					content: "or"; /* TODO: Make this into a dict entry */
+					position: absolute;
+					top: -20px;
+					left: 8px;
+					padding-left: 5px;
+					padding-right: 5px;
+					color: $gray-light;
+					background-color: $white; /* Must match .sf_criterion_area:background-color */
+				}
+			}
+
+			.sf_criterion_group{
+				display: inline;
+			}
+		}
+
+		/* Common style between criterion and more criterion */
+		.search_form_criteria,
+		.sf_more_criterion,
+		.sf_button{
+			position: relative;
+			display: inline-block;
+			margin-right: 10px;
+			margin-bottom: 5px;
+			vertical-align: top;
+
+			&.opened{
+				margin-bottom: 0px; /* To compensate the .sfc/.sfm_header:padding-bottom: 13px */
+
+				.sfc_header,
+				.sfm_header{
+					border-bottom: none !important;
+					box-shadow: none !important;
+					padding-bottom: 13px; /* Must be equal to .search_form_criteria:margin-bottom + this:padding-bottom */
+				}
+			}
+
+			> *{
+				padding: 7px 8px;
+				vertical-align: top;
+				border: $search-criteria-box-border;
+				border-radius: $search-criteria-box-radius;
+				box-shadow: $box-shadow-regular;
+			}
+			.sfc_form_group,
+			.sfm_content{
+				position: absolute;
+				z-index: -1;
+				min-width: 100%;
+				left: 0px;
+				margin-top: -1px;
+			}
+		}
+
+		/* Criteria tags */
+		.search_form_criteria{
+			/* Non editable criteria */
+			&.locked{
+				background-color: $gray-extra-light;
+
+				.sfc_title{
+					user-select: none;
+					cursor: initial;
+				}
+			}
+            /* Draft criteria (modifications not applied) */
+            &.draft{
+				.sfc_header,
+				.sfc_form_group{
+					border-style: dashed;
+				}
+
+				.sfc_title{
+					font-style: italic;
+				}
+            }
+			/* Opened criteria (form group displayed) */
+			&.opened{
+				z-index: 1; /* To be over other criterion */
+
+				.sfc_toggle{
+					transform: rotateX(-180deg);
+				}
+				.sfc_form_group{
+					display: block;
+				}
+			}
+			&.opened_left{
+				.sfc_form_group{
+					left: auto;
+					right: 0px;
+				}
+			}
+
+			/* Add "and" on criterion but the one and submit button */
+			&:not(:last-of-type){
+				margin-right: 30px;
+
+				&::after{
+					/* TODO: Find an elegant way to do this, without hardcoding the content (could be a <style> in the markup) and margin. Note, only a few languages (hawaiian and stuff like this have more than 4 letters in for "and" word. */
+					content: "and";
+					position: absolute;
+					top: 8px;
+					left: calc(100% + 0px);
+					margin-right: 5px;
+					margin-left: 5px;
+					text-align: center;
+					color: $gray-light;
+				}
+			}
+
+			> *{
+				background-color: $search-criteria-box-bg-color;
+				color: $search-criteria-box-color;
+			}
+
+			/* Top left corner icons */
+			.sfc_toggle,
+			.sfc_close{
+				position: absolute;
+				top: 7px;
+				color: $search-criteria-box-picto-color;
+			}
+			.sfc_locked{
+				position: absolute;
+				top: 9px;
+				color: $gray-light;
+			}
+			.sfc_toggle{
+				display: inline-block;
+				right: 23px;
+				transition: all 0.3s ease-in-out;
+			}
+			.sfc_close,
+			.sfc_locked{
+				right: 7px;
+			}
+
+			.sfc_title{
+				max-width: 240px;
+				padding-right: 30px;
+				white-space: nowrap;
+				overflow-x: hidden;
+				text-overflow: ellipsis;
+				cursor: pointer;
+
+				.sfc_values {
+					font-weight: bold;
+				}
+
+			}
+			.sfc_form_group{
+				/* Form group (operators) is displayed only when the criteria is toggled to opened state */
+				display: none;
+				max-height: 520px;
+				overflow: auto;
+
+				.sfc_fg_operators{
+					font-size: 12px;
+
+					.sfc_fg_operator{
+						&.force_hide {
+							display: none !important;
+						}
+
+						> label{
+							line-height: 20px;
+							white-space: nowrap;
+
+							> *{
+								display: inline-block;
+								vertical-align: middle;
+							}
+						}
+
+						.sfc_op_radio{
+							width: 12px;
+							margin: 0px;
+							margin-right: 7px;
+						}
+
+						.sfc_op_name{
+							width: 90px;
+						}
+						.sfc_op_content{
+							input[type="text"]{
+								width: 160px;
+							}
+						}
+
+						.sfc_opc_multichoices{
+							label > input{
+								vertical-align: middle;
+								margin-left: 0px;
+								margin-right: 8px;
+							}
+							.sfc_opc_mc_toggler{
+
+							}
+							.sfc_opc_mc_items_wrapper{
+								max-height: 415px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
+								overflow-y: auto;
+								margin: 0px -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */
+
+								.sfc_opc_mc_items{
+									.sfc_opc_mc_items_list{
+										&.sfc_opc_mc_items_selected{
+											position: relative;
+											padding-top: 5px;
+											margin-top: 5px;
+
+											&::before{
+												content: "";
+												position: absolute;
+												border-top: 1px solid $gray-lighter;
+												width: calc(100% - 12px); /* minus margin-left x2 */
+												margin-left: 6px;
+												top: 0px;
+											}
+										}
+
+										.sfc_opc_mc_placeholder{
+											padding: 15px 8px;
+											font-style: italic;
+											text-align: center;
+										}
+										.sfc_opc_mc_item{
+											padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */
+
+											&:hover{
+												background-color: $search-criteria-box-hover-color;
+											}
+
+											label{
+												display: inline-block;
+												width: 100%;
+											}
+										}
+									}
+								}
+								.sfc_opc_mc_items_hint{
+									margin-top: 15px;
+									margin-bottom: 15px;
+									padding-left: 9px;
+									padding-right: 9px;
+									color: $gray;
+									font-size: 10px;
+									font-style: italic;
+
+									> span{
+										margin-right: 0.5em;
+										font-style: italic;
+									}
+								}
+							}
+						}
+					}
+				}
+
+				.sfc_fg_search,
+				.sfc_fg_apply,
+				.sfc_fg_cancel{
+					margin-top: 8px;
+					padding: 3px 6px;
+					font-size: 11px; /* Not bold, so it looks like 10px/bold of more/less buttons */
+				}
+				.sfc_fg_search,
+				.sfc_fg_apply{
+					margin-right: 5px;
+				}
+
+				.sfc_fg_more,
+				.sfc_fg_less{
+					position: absolute;
+					bottom: 4px;
+					right: 0px;
+					cursor: pointer;
+					color: #3F7294;
+					font-size: 10px;
+					font-weight: bold;
+					border: none;
+					background-color: transparent;
+
+					> span{
+						margin-left: 3px;
+					}
+				}
+
+				/* Show only first operator in simple mode */
+				.sfc_fg_operator:not(:first-of-type),
+				.sfc_fg_operator:first-of-type .sfc_op_radio{
+					display: none;
+				}
+				.sfc_fg_less{
+					display: none;
+				}
+				.sfc_fg_more{
+					display: inline-block;
+				}
+
+				/* Show all operators in advanced mode */
+				&.advanced{
+
+					.sfc_fg_operator{
+						margin-bottom: 3px;
+
+						&:last-of-type{
+							margin-bottom: 0px;
+						}
+					}
+
+					.sfc_fg_operator:not(:first-of-type),
+					.sfc_fg_operator:first-of-type .sfc_op_radio{
+						display: inherit;
+					}
+					.sfc_fg_less{
+						display: inline-block;
+					}
+					.sfc_fg_more{
+						display: none;
+					}
+
+					.hide_on_advanced {
+						display: none;
+					}
+
+				}
+
+				&:not(.advanced) {
+					.hide_on_less {
+						display: none;
+					}
+				}
+			}
+
+			/* Special criterion processing */
+			&.search_form_criteria_raw{
+				> *{
+					border-color: transparent;
+				}
+				.sfc_title{
+					cursor: initial;
+					padding-right: 20px; /* Less than regular as there is no toggle icon */
+				}
+				.sfc_form_group{
+					display: none;
+				}
+			}
+			&.search_form_criteria_enum{
+				.sfc_form_group{
+					.sfc_fg_operator_in{
+						> label{
+							display: inline-block;
+							width: 100%;
+							line-height: initial;
+							white-space: nowrap;
+
+							.sfc_op_content{
+								width: 100%;
+							}
+						}
+					}
+				}
+			}
+			&.search_form_criteria_numeric {
+				//.sfc_form_group.advanced {
+				//	.sfc_fg_operator_between {
+				//		margin-top: 5px;
+				//		margin-bottom: 5px;
+				//	}
+				//}
+				.sfc_fg_operators .sfc_fg_operator.sfc_fg_operator_between {
+					.sfc_op_content_from_outer{
+						display: inline;
+					}
+					.sfc_op_content_until_outer {
+						display: inline;
+						margin-left: 5px;
+					}
+					label {
+						&.sfc_op_content_from_label, &.sfc_op_content_until_label {
+							width: 45px;
+							display: inline-block;
+						}
+					}
+					input[type="text"] {
+						width: 77px;
+					}
+				}
+			}
+
+			&.search_form_criteria_date_time,
+			&.search_form_criteria_date {
+				.sfc_form_group.advanced {
+					.sfc_fg_operator_between {
+						margin-bottom: 5px;
+					}
+				}
+				.sfc_fg_operator_between_days {
+					input {
+						width: 135px;
+					}
+				}
+				button.ui-datepicker-trigger {
+					background: none;
+					border: none;
+					height: 100%;
+					padding: 2px;
+					img {
+						vertical-align: middle;
+					}
+				}
+			}
+		}
+
+		/* More criterion */
+		.sf_more_criterion{
+			&.opened{
+				z-index: 2; /* To be over criterion */
+
+				.sfm_content{
+					display: inherit;
+				}
+			}
+			&.opened_left{
+				.sfm_content{
+					left: auto;
+					right: 0px;
+				}
+			}
+
+			> *{
+				background-color: $search-add-criteria-box-bg-color;
+				color: $search-add-criteria-box-color;
+			}
+			.sfm_toggler{
+				.sfm_tg_title{
+					margin-right: 7px;
+				}
+				.sfm_tg_icon{
+					color: $search-criteria-box-picto-color;
+				}
+			}
+			.sfm_content{
+				display: none;
+				min-width: 200px; /* To avoid element going to thin on filter, not very slick */
+
+				.sfm_lists{
+					margin: 0px -8px;
+					padding: 0px 8px;
+					max-height: 400px;
+					overflow-x: hidden;
+					overflow-y: auto;
+
+					.sfl_items{
+						> li{
+							&:hover{
+								background-color: $search-add-criteria-box-hover-color;
+							}
+						}
+					}
+				}
+				.sfm_buttons{
+					display: none;
+
+					button{
+						margin-top: 8px;
+						margin-right: 5px;
+						padding: 3px 6px;
+						font-size: 11px;
+
+						&:last-of-type{
+							margin-right: 0px;
+						}
+					}
+				}
+			}
+		}
+
+		/* Misc. buttons */
+		.sf_button{
+			cursor: pointer;
+
+			> *{
+				background-color: $search-button-box-bg-color;
+				color: $search-button-box-color;
+			}
+		}
+	}
+
+	/* List helpers */
+	.sf_list{
+		&:not(:first-of-type){
+			.sfl_title{
+				border-top: 1px solid $gray-lighter;
+				padding-top: 8px;
+				margin-top: 5px;
+			}
+		}
+
+		.sfl_title{
+			font-weight: bold;
+		}
+		.sfl_items{
+			margin: 5px -8px 0px -8px;
+			padding: 0px;
+
+			> li{
+				padding: 4px 8px;
+				list-style: none;
+				white-space: nowrap;
+
+				&:hover{
+					background-color: $white;
+				}
+				&.sfl_i_placeholder{
+					font-style: italic;
+					opacity: 0.8;
+				}
+
+				> label{
+					display: inline-block;
+					width: 100%;
+
+					> *{
+						vertical-align: middle;
+					}
+					> input[type="checkbox"]{
+						margin-left: 0px;
+						margin-right: 8px;
+					}
+				}
+			}
+		}
+	}
+	.sf_filter{
+		position: relative;
+		margin-top: 8px;
+		margin-bottom: 8px;
+
+		input,
+		button,
+		.sff_picto{
+			vertical-align: middle;
+			height: 22px;
+		}
+
+		input,
+		button{
+			border: 1px solid #ABABAB;
+		}
+		input{
+			width: 100% !important;
+		}
+		button{
+			width: 23px; /* Must be equals to .sf_filter > *:height */
+			background-color: $white;
+			color: $combodo-orange;
+			font-size: 10px;
+
+			&:first-of-type{
+				margin-left: 5px;
+			}
+			&:not(:first-of-type){
+				border-left: transparent;
+			}
+		}
+		.sff_input_wrapper{
+			position: relative;
+
+			.sff_picto{
+				position: absolute;
+				right: 5px;
+				top: 2px;
+				opacity: 0.6;
+				user-select: none;
+			}
+			.sff_reset{
+				display: none;
+			}
+
+			input::-ms-clear {
+				display: none;
+			}
+		}
+
+		&.sf_with_buttons{
+			input{
+				width: calc(100% - 28px) !important; /* Minus button outter width (only one for now) */
+				min-width: 120px;
+			}
+		}
+	}
+}
+.sf_results_area{
+	.sf_results_placeholder{
+		margin-top: 100px;
+		text-align: center;
+
+		button > span{
+			margin-left: 0.5em;
+		}
+	}
+}
+
+.hidden{
+	display: none !important;
+}
+.visible{
+	display: initial !important;
+}
+.mandatory {
+	border: 1px solid #f00;
+}
+
+/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
+table.listResults tr.odd td.truncated, table.listResults tr td.truncated, .wizContainer table.listResults tr.odd td.truncated, .wizContainer table.listResults tr td.truncated {
+	background: url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
+}
+
+/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
+table.listResults tr.even td.truncated, .wizContainer table.listResults  tr.even td.truncated {
+	background: #f9f9f1 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
+}
+
+/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
+table.listResults tr.even td.hover.truncated, .wizContainer table.listResults  tr.even td.hover.truncated {
+	background: #fdf5d0 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
+}
+
+/* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
+table.listResults tr.odd td.hover.truncated,  table.listResults tr td.hover.truncated, .wizContainer table.listResults  tr.odd td.hover.truncated, .wizContainer table.listResults  tr td.hover.truncated {
+	background: #fdf5d0 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
+}
+
+table.listResults.truncated {
+	border-bottom: 0;
+	padding-bottom: 0;
+}
+
+tr.csv_row0 td {
+	padding-top:5px;
+	padding-bottom:5px;
+	padding-left:10px;
+	padding-right:10px;
+	background: #fff;
+	border-left: #000 1px solid;
+	
+}
+tr.csv_row1 td {
+	padding-top:5px;
+	padding-bottom:5px;
+	padding-left:10px;
+	padding-right:10px;
+	background: #f9f9f1;
+	border-left: #000 1px solid;
+	
+}
+tr.csv_row1 th, tr.csv_row0 th {
+	padding-top:5px;
+	padding-bottom:5px;
+	padding-left:10px;
+	padding-right:10px;
+	border-left: #000 1px solid;
+	
+}
+
+td.cell_modified {
+	font-weight: bold;
+	color: #000;
+}
+
+td.cell_error {
+	font-weight: bold;
+	color: #D81515;
+}
+table.transparent, table.transparent td {
+	background: transparent;
+}
+p.page-header {
+	color:$complement-color;
+	font-weight: bold;
+	font-size: 12pt;
+	font-family: Verdana, Arial, Helvetica, Sans-Serif
+}
+td.dashboard {
+	vertical-align:top;
+	border: 1px solid #ccc;
+	padding: 0.5em;
+	width: 50%;
+}
+.white {
+	background-color: #fff;
+}
+
+/*** New Lacanau layout ***/
+
+.ui-layout-pane { /* all 'panes' */ 
+	overflow: auto;
+} 
+
+.ui-layout-resizer { /* all 'resizer-bars' */ 
+	background: #f1f1f1; 
+} 
+.ui-layout-toggler { /* all 'toggler-buttons' */ 
+	background: #AAA; 
+}
+div#top-left {
+	width: 28px;
+	height: 70px;
+	background: $frame-background-color;
+	float:left;
+}
+div#header-logo {
+	width: 100%;
+	height: 70px;
+	background: $frame-background-color;
+}
+.ui-layout-pane-west {
+	background: $frame-background-color;
+}
+div#right {
+	min-width: 260px;
+}
+div#menu {
+	width: 100%;
+	overflow: auto;
+}
+.header-menu {
+	padding-left: 24px;
+	padding-right: 8px;
+	padding-bottom: 24px;
+	background: transparent;
+}
+div#inner_menu {
+	padding-left: 24px;
+	padding-right: 8px;
+	background: transparent;
+}
+div#logo {
+	height: 70px;
+	nowidth: 100%;
+	text-align: center;
+}
+div#logo div {
+	height: 88px;
+	width: 244px;
+	background: url(../images/itop-logo-2.png?v=#{$version}) left no-repeat;
+}
+#left-pane .ui-layout-north {
+	overflow: hidden;
+}
+#top-bar {
+	background: $frame-background-color;
+	text-align: right;
+}
+.app-banner {
+
+}
+.app-message {
+	float: left;
+	margin-top: 2px;
+	margin-right: 4px;
+	padding: 6px 9px;
+	background-color: $highlight-color;
+	color: white;
+	border-radius: 6px;
+	text-align: left;
+}
+.app-message-icon {
+	margin-right: 5px;
+}
+.app-message-body {
+}
+.fa-sm {
+	font-size: 0.66em;
+}
+.object-details-header {
+	margin-top: 7px;
+	margin-bottom: 7px;
+
+}
+.object-icon {
+	display: table-cell;
+	vertical-align: middle;
+	padding-left: 10px;
+	padding-right: 10px;
+}
+.object-infos {
+	display: table-cell;
+	vertical-align: middle;
+}
+.object-name {
+	margin-top: 0px;
+	margin-bottom: 0px;
+}
+.tags {
+	margin-top: 5px;
+}
+.tag {
+	font-size: 10px;
+	font-weight: initial;
+	display: inline-block;
+	color:white;
+	background-color:#555;
+	padding: 3px 6px;
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+}
+.text-danger {
+	color: red;
+}
+#global-search {
+	height: 55px;
+	float: right;
+	text-align: right;
+	overflow-y: hidden;
+}
+#global-search table, #global-search tr td,  #global-search tr {
+	padding: 0;
+	border: 0;
+	height: 55px;
+	margin: 0;
+	background: transparent;
+	overflow-y: hidden;
+	vertical-align: middle;
+}
+#global-search-area {
+	line-height: 55px;
+}
+#global-search-input {
+	vertical-align: middle;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border: 1px #CCC solid;
+	height: 18px;
+	width: 180px;
+	padding: 3px;
+	background: #fff;
+	display: inline-block;
+}
+#global-search-image {
+	vertical-align: middle;
+	background: url(../images/search.png?v=#{$version}) center center no-repeat;
+	display:inline-block;
+	width: 28px;
+	height: 30px;
+	margin-left: -8px;
+	cursor: pointer;
+}
+#help-link img {
+	padding: 0;
+	border: 0;
+}
+#help-link {
+	padding: 0;
+	border: 0;
+	background: transparent;
+	margin-left: 15px;
+	margin-right: 10px;
+}
+div.icon {
+	width: 20px;
+	height: 20px;
+	margin: 2px;
+	float: right;
+}
+span.ui-icon {
+	float:left;
+	margin:0 2px;
+}
+.ui-layout-button-pin-down {
+	background: url(../images/splitter-bkg.png?v=#{$version}) transparent;
+	width: 16px;
+	background-position: -144px -144px;
+}
+.ui-layout-resizer-west-open {
+	background-color: $frame-background-color;
+	width: 8px;
+}
+div.footer img {
+	border: 0;
+	margin-bottom: 5px;
+	margin-top: 5px;
+}
+div.footer{
+	text-align:center;
+}
+#SearchResultsToAdd table.listResults tbody {
+	height: 300px;
+	overflow-y: auto;
+}
+tr.row_unchanged td {
+	border-bottom: 1px #ccc solid;
+	padding: 2px;
+}
+.wizContainer table tr.row_error td {
+	border-bottom: 1px #ccc solid;
+	background-color: #fdd;
+	padding: 2px;
+}
+tr.row_modified td {
+	border-bottom: 1px #ccc solid;
+	padding: 2px;
+}
+tr.row_added td {
+	border-bottom: 1px #ccc solid;
+	padding: 2px;
+}
+a.truncated {
+	cursor: pointer;
+}
+.org_combo
+{
+	font-size:x-small;
+	width: auto;
+	max-width: 200px; 
+}
+span.form_validation {
+	width:24px;
+	text-align:center;
+}
+.notification {
+	border: 1px solid #c33;
+	background-color: #fee;
+	padding: 0.5em;
+	margin: 0.5em;
+	text-align:center;
+	width: 95%;
+	-moz-border-radius: 0.5em;
+}
+.wiki_broken_link {
+	text-decoration: line-through;
+}
+.synoptics, .synoptics tr td {
+	background: transparent;
+	padding:10px;
+	font-size:1em;
+	vertical-align:middle;
+	color:#fff;
+	text-align:center;
+}
+.synoptics tr td.arrow {
+	color:#333;
+	border-top: 1px dashed #333;
+	width:100px;
+}
+.synoptics tr.synoptics_header td {
+	color:#000; font-size:1em;
+	vertical-align:middle;
+	text-align:center;
+}
+.mono_value {
+	display: inline-block;
+	background-color: #3c3;
+	color: #fff;
+	font-weight:bold;
+	padding: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin-left:3px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+.multi_values {
+	display: inline-block;
+	background-color: #c33;
+	color: #fff;
+	font-weight:bold;
+	padding: 3px;
+	padding-left: 5px;
+	padding-right: 5px;
+	margin-left:3px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	border-radius: 10px;
+}
+.caselog {
+	overflow-x: hidden;
+	display: block;
+	overflow-y: auto;
+	border: 1px #ddd solid;
+    font-family: Tahoma, Verdana, Arial, Helvetica;
+    font-size: 12px;
+}
+.caselog_input_header {
+	padding-top:3px;
+	padding-bottom:3px;
+	border-top:1px solid #fff;
+	background: #ddd;
+	width:100%;
+	height: 21px;
+}
+.caselog_input_header:empty {
+	display: none;
+}
+.editor_magnifier{
+	/* !important so it overrides the .cke_reset_all style */
+	background-position: center center !important;
+	background-repeat: no-repeat !important;
+	background-size: 100% !important;
+}
+.editor_magnifier:hover {
+	background-color: #CCC;
+}
+.caselog_header {
+	padding:3px;
+	border-top:1px solid #fff;
+	background: #ddd url(../images/plus.gif) left no-repeat;
+	padding-left: 16px;
+	cursor: pointer;
+	width:100%;
+}
+.caselog_header.open {
+	background: #ddd url(../images/minus.gif) left no-repeat;
+}
+.caselog_entry {
+	padding:3px;
+	padding-left: 16px;
+	border-bottom:1px #999 solid;
+	margin-left:0;
+	margin-right:0;
+ 	white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: -pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+, CSS3 */
+}
+.caselog_entry_html p, .HTML p {
+	margin-top: 0.25em;
+	margin-bottom: 0.25em;
+}
+
+/* Helper classes for object details display. */
+.one-col-details {
+	min-width: 400px;
+	max-width: 600px;
+}
+.n-cols-details {
+	width: 100%;
+
+	> tbody > tr > td {
+		min-width: 240px;
+	}
+}
+.details {
+  border-collapse: collapse;
+  noborder-bottom: 2px #fff solid;
+  nowidth:100%;
+
+	* {
+		box-sizing: border-box;
+	}
+}
+fieldset .details>.field_container {
+	background: transparent;
+	border: 0;
+}
+.field_container {
+	display: table;
+	width: 100%;
+	margin-bottom: 5px;
+	border-bottom: 2px #ddd solid;
+	box-sizing: border-box;
+
+	&:last-child {
+		margin-bottom: 0px;
+	}
+
+	&.field_large {
+		display: inherit;
+
+		/* .field_label, .field_data */
+		> div {
+			display: inherit;
+
+			&.field_label {
+				width: inherit;
+				margin-bottom: 5px;
+			}
+
+			&.field_data {
+				margin-top: 8px;
+				margin-bottom: 10px;
+			}
+
+			/* .field_value, .field_comments, .field_infos */
+			> div {
+			}
+		}
+	}
+
+	* {
+		box-sizing: border-box;
+	}
+
+	/* .field_label, .field_data */
+	> div {
+		display: table-cell;
+		vertical-align: top;
+
+		&.field_label {
+			min-width: 100px;
+			max-width: 145px;
+			width: 30%;
+			padding-right: 10px;
+
+			> label,span {
+				color: #000000;
+				font-weight:bold;
+			}
+		}
+
+		&.field_data {
+			display: table;
+			width: 100%;
+			margin-bottom: 5px;
+		}
+
+		/* .field_value, .field_comments, .field_infos */
+		> div {
+			display: table-cell;
+			width: auto;
+
+			&.field_comments,
+			&.field_infos{
+				width: 50px;
+			}
+
+			&.field_value{
+
+				.attribute-edit{
+					display: table;
+					width: 100%;
+
+					/* TODO: Refactor so status icon show over mandatory icon */
+					.form_validation, .field_status{
+						display: table-cell;
+						width: 20px;
+						padding-left: 0.4em;
+						vertical-align: middle;
+					}
+
+					.field_input_zone{
+						width: 100%; /* auto; */
+
+						&.field_input_string,
+						&.field_input_password{
+							> select, input{
+								width: 100%;
+							}
+						}
+
+						&.field_input_onewaypassword{
+							display: table-cell;
+							width: auto;
+
+							> *{
+								display: block;
+								width: 100%;
+							}
+
+							> span{
+								margin-bottom: 3px;
+							}
+						}
+
+						&.field_input_date,
+						&.field_input_datetime{
+							display: table;
+							width: 100%;
+
+							> input {
+								display: table-cell;
+								width: 100%;
+							}
+
+							> span {
+								display: table-cell;
+								width: 20px;
+								padding-left: 0.4em;
+								vertical-align: middle;
+
+								> img {
+									width: 20px;
+									cursor: pointer;
+								}
+							}
+						}
+
+						&.field_input_text{
+							border: none;
+
+							.f_i_text_header{
+								/* Inspired by .cke_top */
+								padding: 6px 8px 6px;
+								white-space: normal;
+								border-bottom: 1px solid #fff;
+								background: #f2f2f2;
+
+								.fullscreen_button{
+									display: block;
+									width: 15px;
+									height: 15px;
+									border: 1px #A6A6A6 solid;
+									cursor: pointer;
+									background-image: url('../images/full-screen.png');
+									background-repeat: no-repeat;
+									background-position: center center;
+									background-size: 98%;
+								}
+								.fullscreen_button:hover,
+								.fullscreen_button:focus{
+									background-color: #CCCCCC;
+								}
+							}
+							textarea{
+								/* Size for default display */
+								width: 100%;
+								height: 100%;
+								padding: 5px 10px;
+								border: none;
+								resize: none;
+							}
+
+							&.fullscreen{
+								z-index: 100;
+								position: fixed;
+								top: 0px;
+								left: 0px;
+								width: 100%;
+								height: 100%;
+
+								textarea{
+									/* Size set again here to override resize value when in fullscreen */
+									width: 100% !important;
+									height: 100% !important;
+								}
+								.fullscreen_button{
+									width: 22px;
+									height: 22px;
+									background-color: #CCCCCC;
+								}
+							}
+						}
+
+						&.field_input_html{
+							// Nothing
+						}
+
+						&.field_input_document{
+							> input{
+								width: 100%;
+							}
+
+							> span {
+								display: inline-block;
+								margin-bottom: 2px;
+							}
+						}
+
+						&.field_input_image{
+							input{
+								width: 100%;
+							}
+						}
+
+						&.field_input_extkey{
+							display: table;
+							width: 100%;
+
+							> .field_select_wrapper{
+								display: table-cell;
+								width: auto;
+
+								> select {
+									width: 100%;
+								}
+							}
+
+							> .field_autocomplete{
+								display: table-cell;
+								width: 100%;
+							}
+
+							> .field_input_btn{
+								display: table-cell;
+								width: 25px;
+								padding-left: 0.4em;
+
+								> img {
+									max-width: 20px;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+.one-col-details .details .field_container.field_small {
+	div.field_label {
+		/* On a single column, field labels can take more width but they are limited so it doesn't feel weird when all labels are short */
+		width: 175px;
+		max-width: inherit;
+	}
+}
+/* This is extracted from the ".details > .field_container ..." because of the fullscreen option (element is moved at the end of the body */
+.field_input_text{
+	border: none;
+
+	.f_i_text_header{
+		/* Inspired by .cke_top */
+		padding: 6px 8px 6px;
+		white-space: normal;
+		border-bottom: 1px solid #fff;
+		background: #f2f2f2;
+
+		.fullscreen_button{
+			display: block;
+			width: 15px;
+			height: 15px;
+			border: 1px #A6A6A6 solid;
+			cursor: pointer;
+			background-image: url('../images/full-screen.png');
+			background-repeat: no-repeat;
+			background-position: center center;
+			background-size: 98%;
+		}
+		.fullscreen_button:hover,
+		.fullscreen_button:focus{
+			background-color: #CCCCCC;
+		}
+	}
+	textarea{
+		/* Size for default display */
+		width: 100%;
+		height: 100%;
+		margin: 0px;
+		padding: 5px 10px;
+		border: none;
+		resize: none;
+	}
+
+	&.fullscreen{
+		z-index: 100;
+		position: fixed;
+		top: 0px;
+		left: 0px;
+		width: 100%;
+		height: 100%;
+
+		textarea{
+			/* Size set again here to override resize value when in fullscreen */
+			width: 100% !important;
+			height: 100% !important;
+		}
+		.fullscreen_button{
+			width: 22px;
+			height: 22px;
+			background-color: #CCCCCC;
+		}
+	}
+}
+#SiloSelection{
+	padding-top: 3px;
+	padding-right: 30px;
+	text-align: left;
+
+	*{
+		box-sizing: border-box;
+		vertical-align: middle;
+	}
+
+	.ac_input {
+		width: 100%;
+	}
+
+	.field_input_extkey{
+		display: table;
+		width: 100%;
+
+		.field_select_wrapper{
+			display: table-cell;
+			width: 100%;
+
+			> select{
+				width: 100%;
+				max-width: initial;
+			}
+		}
+
+		.field_input_btn{
+			display: table-cell;
+			width: 25px;
+			padding-left: 0.4em;
+		}
+	}
+}
+.ac_dlg_loading {
+	background: white url('../images/indicator.gif') right center no-repeat;
+}
+table.pagination {
+	display:inline-block;
+}
+table.pagination tr td {
+	padding: 3px;
+}
+.pagination_container {
+	padding-left: 3px;
+}
+.pager p {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+.pager td span {
+	min-width: 20px;
+	padding-left: 2px;
+	padding-right: 2px;
+	display:inline-block;
+	text-align: center;
+	cursor: pointer;
+}
+
+.pager td span.curr_page {
+	color: #fff;
+	background: #999;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+img.prev, img.first, img.next, img.last {
+	cursor: pointer;
+}
+div.actions_button {
+	float:right;
+	background: $highlight-color url("../images/actions_left.png?v=#{$version}") no-repeat scroll left top;
+	padding-left: 5px;
+	margin-top: 0;
+	margin-right: 10px;
+	height:19px;
+	vertical-align: middle;
+}
+
+div.actions_button a, .actions_button a:hover, .actions_button a:visited {
+	background: $highlight-color  url(../images/actions_bkg.png?v=#{$version}) no-repeat scroll right top;
+	color:#fff;
+	padding-right: 8px;
+	cursor:pointer;
+	font-family: Tahoma,sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	padding-left: 4px;
+	text-decoration: none;
+	height:19px;
+	line-height: 17px;
+	display: block;
+}
+select#org_id {
+	max-width: 90%;
+}
+/*********** Dashboards ***********/
+.itop-dashboard {
+	background-color: #fff;
+}
+.itop-dashboard a {
+	cursor: not-allowed;
+}
+.dragHover {
+	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=#{$version});
+}
+.edit_mode .dashlet {
+	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=#{$version});
+	padding: 5px;
+	margin:0;
+	position:relative;
+}
+.edit_mode .dashlet-selected {
+	background: $highlight-color !important;
+	padding: 5px;
+	margin:0;
+}
+td.layout_cell {
+	height: 50px; /* min-height does not work */
+	vertical-align: top;
+}
+.dashlet-content {
+	position: relative;
+	background: #fff;
+	margin:0;
+	overflow: auto;
+}
+table.prop_table {
+    border-bottom: 2px solid #F9F9F1;
+    padding: 1px;
+    width: 100%;
+}
+.close-box {
+	margin: 5px;
+	width: 20px;
+	height: 20px;
+	position: absolute;
+	top: 0;
+	right: 0;
+	z-index: 10;
+	background: transparent url(../images/delete.png?v=#{$version}) no-repeat center;
+}
+td.prop_value {
+	text-align: left;
+}
+tr.itop-property-field-modified td {
+	background: #fbb;
+}
+tr.itop-property-field-modified td.hover {
+	background: #f99;
+}
+td.prop_value textarea, td.prop_value input[type=text]{
+	width: 98%;
+}
+td.prop_icon {
+	width: 20px;
+}
+
+.dashlet {
+	text-align:left;
+}
+.dashlet-inline {
+	display: inline-block;
+}
+.dashlet-badge a.actions {
+    background: none repeat scroll 0 0 transparent;
+    color: #666666;
+    font-size: 16px;
+    text-decoration: none;
+}
+.dashlet-content .display_block {
+	text-align:left;
+}
+.dashlet-unknown, .dashlet-proxy {
+	.dashlet-content {
+		padding: 8px;
+		background-color: #F2F2F2;
+		text-align: center;
+
+		.dashlet-ukn-text, .dashlet-pxy-text {
+			margin-top: 10px;
+		}
+	}
+}
+.prop_apply .ui-icon-alert {
+	display: none;
+}
+.prop_apply .ui-state-error .ui-icon-alert {
+	display: block;
+}
+.ui-state-error .ui-icon-circle-check {
+	display: none;
+}
+.summary-details {
+    float: right;
+    margin-top: 5px;
+}
+.summary-details th {
+    background: none repeat scroll 0 0 $summary-details-background;
+    color: #EEEEEE;
+    padding: 5px;
+    text-align: center;
+}
+.main_header {
+    background-color: $main-header-background;
+    min-height: 60px;
+    width: 100%;
+}
+.main_header h1 {
+    color: $complement-color;
+    line-height: 16px;
+    margin-bottom: 0;
+    margin-top: 0;
+    padding-bottom: 10px;
+    padding-top: 10px;
+}
+.main_header img {
+	margin-top: 10px;
+	margin-right: 10px;
+	float:left;
+}
+a.summary,  a.summary:hover {
+    background: none repeat scroll 0 0 transparent;
+    color: #666666;
+    text-decoration: none;
+    padding-left: 0;
+}
+.summary-details td {
+    background: none repeat scroll 0 0 transparent;
+    padding: 5px;
+    text-align: center;
+}
+
+#DashboardMenu > ul > li {
+	list-style: none;
+	vertical-align: middle;
+	margin: 0;
+	padding: 0;
+	cursor: pointer;
+}
+
+#DashboardMenu > ul {
+	list-style: none;
+	vertical-align: middle;
+	margin: 0;
+	padding: 0;
+	height: 25px;
+}
+#DashboardMenu li a {
+	display: block;
+	padding: 5px 12px;
+	text-decoration: none;
+	color: #000;
+	font-weight: bold;
+	text-align: left;
+	white-space: nowrap;
+	background: #fff;
+}
+#DashboardMenu li span {
+	display: block;
+	padding: 5px 12px;
+	text-decoration: none;
+	color: #000;
+	white-space: nowrap;
+	background: #fff;
+}
+#DashboardMenu li {
+	list-style: none;
+}
+#DashboardMenu li a:hover {
+	background: #1A4473;
+}
+
+#DashboardMenu ul > li > ul
+{	
+	border: 1px solid black;
+	background: #fff;
+}
+	
+#DashboardMenu li > ul
+{	margin: 0;
+	padding: 0;
+	position: absolute;
+	display: none;
+	border-top: 1px solid white;
+	z-index: 1500;
+}
+#DashboardMenu li ul li a:hover{
+	background: $popup-menu-highlight-color;
+	color: $popup-menu-text-higlight-color;
+	font-weight: bold;
+	list-style: none;
+}
+.sortable_field_list {
+	display: inline-block;
+	width: 250px;
+	height: 150px;
+	border: 1px #333 solid;
+	overflow: auto;
+	padding-left: 0;
+	margin: 0;
+}
+.sortable_field_list li {
+	list-style: none;
+	font-size: 11px;
+}
+.sort_order {
+	display: inline-block;
+	width: 16px;
+	height: 12px;
+}
+.sort_none {
+	background: url(../images/bg.gif) no-repeat center;
+}
+.sort_asc {
+	background: url(../images/desc.gif) no-repeat center;
+}
+.sort_desc {
+	background: url(../images/asc.gif) no-repeat center;
+}
+.sort_hidden {
+	display: none;
+}
+.sortable_field_list > li.selected {
+	background: #F6A828;
+}
+.itop-deleted-object {
+	text-decoration: line-through;
+}
+.header_message {
+	padding: 1em;
+	font-size: 10pt;
+	background: #fff;
+	border: 1px solid #999;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	margin-bottom: 10px;
+}
+.header_message {
+	padding: 1em;
+	font-size: 10pt;
+	background: #fff;
+	border: 1px solid #999;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+	margin-bottom: 10px;
+}
+.message_info {
+	border: 1px solid #993;
+	background: url(../images/info-mini.png?v=#{$version}) 1em 1em no-repeat #ffc;
+	padding-left: 3em;
+}
+.message_ok {
+	border: 1px solid #393;
+	background: url(../images/ok.png?v=#{$version}) 1em 1em no-repeat #cfc;
+	padding-left: 3em;
+}
+.message_error {
+	border: 1px solid #933;
+	background: url(../images/error.png?v=#{$version}) 1em 1em no-repeat #fcc;
+	padding-left: 3em;
+}
+.fg-menu a img {
+        border: 0;
+}
+div.ui-dialog-header {
+    padding-bottom: 10px;
+    padding-top: 7px;
+}
+.form_field_error {
+	border: 1px solid #933;
+	background: #fcc;
+}
+.simple-graph, .graph_config {
+	background: #fff;
+}
+.graph_config {
+	padding: 0.25em;
+}
+.graph_config button.ui-widget {
+	font-size: 12px;
+}
+.ui-tooltip, .arrow:after {
+	background: $frame-background-color;
+	border: 1px solid $grey-color;
+}
+.ui-tooltip {
+	padding: 10px 10px;
+	box-shadow: 0 0 7px black;
+	max-width: 350px;
+	overflow: hidden;
+}
+.ui-tooltip .arrow {
+	width: 70px;
+	height: 16px;
+	overflow: hidden;
+	position: absolute;
+	left: 50%;
+	margin-left: -35px;
+	bottom: -16px;
+}
+.ui-tooltip .arrow.top {
+	top: -16px;
+	bottom: auto;
+}
+.ui-tooltip .arrow.left {
+	left: 20%;
+}
+.ui-tooltip .arrow:after {
+	content: "";
+	position: absolute;
+	left: 20px;
+	top: -20px;
+	width: 25px;
+	height: 25px;
+	box-shadow: 6px 5px 9px -9px black;
+	-webkit-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+.ui-tooltip .arrow.top:after {
+	bottom: -20px;
+	top: auto;
+}
+.ui-tooltip .ui-tooltip-content{
+	overflow-x: auto;
+}
+table.export_parameters td {
+	padding-right: 2em;
+}
+
+.table_preview > table {
+	border-collapse: collapse;
+	max-height: 150px;
+	overflow: auto;
+	display: block;
+}
+.table_preview > table > thead > tr > th, .table_preview > table > tbody > tr > td {
+	border: 1px $grey-color solid;
+	min-height: 1em;
+	padding-left: 0.25em;
+	padding-right: 0.25em;
+	font-size: 10pt;
+}
+.table_preview > table > tbody > tr > td {
+	vertical-align: top;
+}
+.table_preview .drag-handle {
+	cursor: move;	
+}
+.table_preview div.text-preview {
+	white-space: pre-wrap;
+}
+/* Format for the PDF output */
+.table_preview .view-image {
+  // Counteract the forced dimensions (usefull for displaying in the details view)
+  width: inherit !important;
+  height: inherit !important;
+  text-align: center;
+  img {
+	max-width: 48px !important;
+	max-height: 48px !important;
+	display: inline-block;
+  }
+}
+.graph_zoom {
+	display: inline-block;
+	float: right;
+	margin-right: 2em;
+}
+.graph_zoom_slider {
+	display: inline-block;
+	width: 10em;
+}
+.graph_zoom_plus, .graph_zoom_minus {
+	display: inline-block;
+	margin-left: 1em;
+	margin-right: 1em;
+}
+div.explain-printable {
+	border: 5px solid $complement-color;
+	background: $complement-light;
+	color: #000;
+	padding: 10px;
+	margin: 0;
+	font-size: 12px;
+}
+
+.hideable-chapter {
+	cursor: pointer;
+}
+#hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span {
+	padding-left: 20px;
+	background: url(../images/eye-open-555.png?v=#{$version}) 2px center no-repeat;
+}
+
+#hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span {
+	text-decoration: line-through;
+	background: url(../images/eye-closed-555.png?v=#{$version}) 2px center no-repeat;
+}
+.printable-version legend {
+	padding-left: 26px;
+	background: $complement-color url(../images/eye-open-fff.png?v=#{$version}) 8px center no-repeat;
+}
+.printable-version .strikethrough legend {
+	background: $complement-color url(../images/eye-closed-fff.png?v=#{$version}) 8px center no-repeat;
+}
+.printable-version fieldset.strikethrough span {
+	display: none;
+}
+h2.printable-tab-title {
+	border-bottom: 2px solid;
+}
+.strikethrough {
+	text-decoration: line-through;
+}
+select.multiselect {
+	max-width: 150px;
+}
+span.search-button, span.refresh-button {
+	display: inline-block;
+	width: 21px;
+	height: 18px;
+	cursor: pointer;
+	color: #FFFFFF;
+	text-align: center;
+	padding-top: 3px;
+	font-size: 10px;
+}
+.actions_button.icon_actions_button {
+	padding: 0 2px 0 2px;
+}
+.case-log-history-entry {
+	display: block;
+}
+.case-log-history-entry-end {
+	display: none;
+}
+.expanded .case-log-history-entry-end {
+	display: inline;
+}
+.case-log-history-entry-more {
+	display: inline;
+}
+.expanded .case-log-history-entry-more {
+	display: none;
+}
+.case-log-history-entry .case-log-history-entry-toggle {
+	display: inline-block;
+	float: none;
+	pointer: cursor;
+	vertical-align: bottom;
+}
+.printable-tab .case-log-history-entry-end {
+	display: inline;
+}
+.printable-tab .case-log-history-entry-more {
+	display: none;
+}
+.printable-tab .case-log-history-entry .case-log-history-entry-toggle {
+	display: none;
+}
+.history_entry {
+	position: relative !important;
+	max-width: 100%;
+}
+.history_entry_truncated {
+	max-height: 7em;
+	overflow: hidden;
+}
+.history_truncated_toggler {
+	position: absolute !important;
+	bottom: 0;
+	right: 0;
+	display: block;
+	cursor: pointer;
+	width: 16px;
+	height: 16px;
+	background-image: url(ui-lightness/images/ui-icons_222222_256x240.png);
+	background-position: -16px -192px;
+}
+.history_entry_truncated .history_truncated_toggler {
+	background-position: 0 -192px;
+}
+
+#top-bar-table {
+  width: 100%;
+  padding-left: 5px;
+
+  $top-button-width: 40px;
+  $top-button-heigth: 55px;
+  $top-button-spacer: 35px;
+
+  #open-left-pane {
+	text-align: center;
+	width: $top-button-width !important;
+	cursor: pointer;
+  }
+  #go-home {
+	text-align: center;
+	width: $top-button-width !important;
+
+	a {
+	  text-decoration: none;
+	  color: #555;
+	  font-size: 9pt;
+	  padding: 0;
+	  background: none;
+
+	  // Make the whole cell clickable
+	  display: inline-block;
+	  line-height: $top-button-heigth;
+	  width: 100%;
+	}
+  }
+  .top-bar-spacer{
+	width: $top-button-spacer !important;
+  }
+  #top-bar-table-search{
+    min-width: 370px;
+  }
+}
+
+#itop-breadcrumb{
+  overflow: hidden;
+  float: left;
+  background: $frame-background-color;
+
+  .breadcrumb-item{
+	float: left;
+	margin: 3px 22px 2px 0px;
+
+	.icon img{
+	  height: 15px;
+	  width: auto;
+	  margin-right: 5px;
+
+	  -webkit-filter: grayscale(100%);
+	  filter: grayscale(100%);
+	  filter: gray;
+
+	  // IE has no filter option: at least, have some effect when hovering...
+	  opacity: 0.5;
+	}
+
+	a{
+	  text-decoration: none;
+	  color: #555;
+	  font-size: 9pt;
+	  padding: 0;
+	  background: none;
+
+	  &:hover .icon img{
+		-webkit-filter: none;
+		filter: none;
+		opacity: 1;
+	  }
+
+	  span.truncate
+	  {
+		// Ellipsis
+		max-width: 200px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: inline-block;
+	  }
+
+	  &:hover{
+		text-decoration: none;
+		color: $highlight-color;
+	  }
+
+	  &::after{
+		content:'';
+		position: absolute;
+		background-image: url(../images/breadcrumb-separator.png?v=#{$version});
+		background-repeat: no-repeat;
+		width: 8px;
+		height: 16px;
+		margin-left: 5px;
+	  }
+	}
+
+	&:last-child a::after{
+	  display: none;
+	}
+
+	&.breadcrumb-current{
+	  text-decoration: none;
+	  color: #555;
+	  font-size: 9pt;
+	  padding: 0;
+	  background: none;
+	  span.truncate
+	  {
+		// Ellipsis
+		max-width: 200px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: inline-block;
+	  }
+
+	}
+  }
+}
+.ui-datepicker-buttonpane, .ui-timepicker-div {
+	font-size: 9pt;
+	font-family: Tahoma, Verdana, Arial, Helvetica;
+}
+.date_format_tooltip td {
+	padding: 0.25em;
+}
+#setup {
+  .module-selection-banner img {
+		max-height: 48px;
+  }
+  .module-selection-body {
+	height: 28em;
+	overflow: auto;
+	border: #ccc 1px solid;
+  }
+}
+.mfp-close {
+	cursor: pointer !important;
+}
+
+.qtip-content {
+	font-size: 12px;
+}
+.qtip-content p:first-child {
+	margin-top: 0px;
+}
+.qtip-content p:last-child {
+	margin-bottom: 0px;
+}
+.synchro-source {
+}
+.synchro-source-title {
+	font-weight: bolder;
+}
+.synchro-source-description {
+	font-size: smaller;
+	margin-top: 3px;
+	margin-bottom: 1px;
+}
+.object-ref.archived {
+}
+.object-ref-icon.fa {
+	color: $highlight-color;
+	font-size: smaller;
+	vertical-align: 1px;
+	margin-right: 1px;
+}
+.object-ref-icon-disabled.fa {
+	color: $grey-color;
+	font-size: smaller;
+	margin-right: 1px;
+}
+.object-ref-link {
+	background: none;
+}
+.extension-source {
+	display:inline-block;
+	background-color: $grey-color;
+	padding:3px;
+	font-size:10px;
+	color:#fff;
+    border-radius: 4px;
+}
+
+///////////////////
+// Datamodel Viewer
+///////////////////
+
+#img-lifecycle{
+	width:100%;
+}
+#img-lifecycle:hover{
+	width:100%;
+	cursor:pointer;
+}
+
+#search-model{
+	width:90%;
+}
+
+.mfp-figure:after{
+	background-color: #dff1ff;
+}
+#classDetailsClassName{
+	display:inline;
+}
+
+.qtip-content a, .qtip-content a:visited{
+	color : #1c94c4;
+	text-decoration: none;
+}
+.qtip-content a:hover, .qtip-content a:active{
+	color : #e87c1e;
+	text-decoration: none;
+}
+
+.data-model-viewer a, .data-model-viewer a:visited {
+	color : #1c94c4;
+	text-decoration : none;
+}
+
+.data-model-viewer a:hover {
+	color: #e87c1e;
+	text-decoration: none;
+}
+
+table.listResults .originColor{
+	width : 0px;
+	padding : 2px !important;
+}
+#displaySelectorLabel,  #changeDefaultDisplay{
+	display :inline-block;
+}
+
+#dataModelSplitPane{
+	height:100%;
+}
+#dataModelClassIcon, dataModelScrollableDiv > img{
+	padding-right: 13px;
+	display: inline;
+}
+
+#dataModelScrollableDiv{
+	background-color: #eee;
+	position: fixed;
+	z-index: -1;
+    width: 100%
+}
+#dataModelHeader{
+	background-color: white;
+}
+
+#dataModelSplitPane  #tabbedContent_0{
+	z-index: -2;
+}
+
+#dataModelScrollableClassName, #dataModelScrollableClassIcon{
+	display: inline;
+}
+#dataModelScrollableDiv > img {
+  padding-right: 5px;
+}
+
+#dataModelSplitPane .ui-layout-resizer {
+	background: #DDD;
+	width:10px !important;
+	margin-left: 15px !important;
+}
+#dataModelSplitPane .ui-layout-resizer :hover{
+	background: #E87C1E;
+}
+#dataModelSplitPane .ui-layout-resizer-west{
+	border-left : 1px solid #BBB;
+	border-right: 1px solid #BBB;
+}
+#dataModelSplitPane .ui-layout-resizer-east{
+	border-left : 1px solid #BBB;
+	border-right: 1px solid #BBB;
+}
+
+#dataModelSplitPane .ui-layout-toggler{
+	background: #AAA;
+	width:10px !important;
+}
+#dataModelSplitPane .ui-layout-toggler:hover{
+	background: #E87C1E;
+}
+.dataModelSchema g {
+	cursor: pointer;
+}
+.dataModelSchema g:hover rect:not(.liseret){
+	fill: #dbe4f0;
+}
+.dataModelSchema text {
+	fill: black;
+	font: 10px sans-serif;
+	text-anchor: middle;
+}
+#selfreferencing:hover ~ g > .selfattr{
+	fill: #dbe4f0;
+}
+.tooltipD3{
+	position: fixed;
+	text-align: center;
+	background: #EEE;
+	border: 1px solid $grey-color;
+	border-radius: 2px;
+	pointer-events: none;
+	fill: black;
+	font: 11px sans-serif;
+	text-anchor: middle;
+}
+#tooltipD3_top{
+	font-weight: bold;
+	border-bottom: 1px solid $grey-color;
+	padding: 3px;
+}
+.tooltipD3 i {
+	font-size: 14px;
+}
+.tooltipD3 span{
+	margin: 2px;
+}
+.dataModelSchema .selfattrtxt {
+	font-family: FontAwesome;
+}
+
+.data-model-viewer{
+	background-color: #FFF;
+	margin-top:7px !important;
+	margin-left: 15px !important;
+}
+
+#delDataModelSearch {
+	color: #E87C1E;
+	font-family: FontAwesome;
+	display:inline-block;
+	font-size:15px;
+	margin-left:1%;
+}
+
+#dataModelSplitPane .ui-layout-center{
+	margin-left :30px !important;
+}
+///////////////////
+//Impact analysis filter
+#ds_flash{
+	margin-bottom: 5px;
 }
\ No newline at end of file
diff --git a/data/.htaccess b/data/.htaccess
index 89682e1f9..782472c78 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,13 +1,13 @@
-# Apache 2.4
-<ifModule mod_authz_core.c>
-Require all denied
-</ifModule>
-
-# Apache 2.2
-<ifModule !mod_authz_core.c>
-deny from all
-Satisfy All
-</ifModule>
-
-# Apache 2.2 and 2.4
-IndexIgnore *
+# Apache 2.4
+<ifModule mod_authz_core.c>
+Require all denied
+</ifModule>
+
+# Apache 2.2
+<ifModule !mod_authz_core.c>
+deny from all
+Satisfy All
+</ifModule>
+
+# Apache 2.2 and 2.4
+IndexIgnore *
diff --git a/data/index.php b/data/index.php
index f4609aaef..112807643 100644
--- a/data/index.php
+++ b/data/index.php
@@ -1,2 +1,2 @@
-<?php
-echo 'Access denied';
+<?php
+echo 'Access denied';
diff --git a/data/web.config b/data/web.config
index 68aa91a67..599a5f260 100644
--- a/data/web.config
+++ b/data/web.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <system.web>
-          <authorization>
-                  <deny users="*" /> <!-- Denies all users -->
-          </authorization>
-  </system.web>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.web>
+          <authorization>
+                  <deny users="*" /> <!-- Denies all users -->
+          </authorization>
+  </system.web>
 </configuration>
\ No newline at end of file
diff --git a/datamodels/2.x/authent-external/en.dict.authent-external.php b/datamodels/2.x/authent-external/en.dict.authent-external.php
index 4cd35a25b..ff2919826 100755
--- a/datamodels/2.x/authent-external/en.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/en.dict.authent-external.php
@@ -1,48 +1,48 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserExternal
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:UserExternal' => 'External user',
-	'Class:UserExternal+' => 'User authentified outside of iTop',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserExternal' => 'External user',
+	'Class:UserExternal+' => 'User authentified outside of iTop',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-external/fr.dict.authent-external.php b/datamodels/2.x/authent-external/fr.dict.authent-external.php
index a0eccea22..661bcf38a 100755
--- a/datamodels/2.x/authent-external/fr.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/fr.dict.authent-external.php
@@ -1,28 +1,28 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:UserExternal' => 'Utilisateur externe à iTop',
-	'Class:UserExternal+' => 'Utilisateur authentifié à l\'extérieur d\'iTop',
-));
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:UserExternal' => 'Utilisateur externe à iTop',
+	'Class:UserExternal+' => 'Utilisateur authentifié à l\'extérieur d\'iTop',
+));
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/authent-external/it.dict.authent-external.php b/datamodels/2.x/authent-external/it.dict.authent-external.php
index ad28900e8..b739d88db 100755
--- a/datamodels/2.x/authent-external/it.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/it.dict.authent-external.php
@@ -1,48 +1,48 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserExternal
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:UserExternal' => 'Esterno utente',
-	'Class:UserExternal+' => 'Utente autenticato al di fuori di iTop',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:UserExternal' => 'Esterno utente',
+	'Class:UserExternal+' => 'Utente autenticato al di fuori di iTop',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-external/model.authent-external.php b/datamodels/2.x/authent-external/model.authent-external.php
index 75114df66..2b6d8ed7b 100755
--- a/datamodels/2.x/authent-external/model.authent-external.php
+++ b/datamodels/2.x/authent-external/model.authent-external.php
@@ -1,90 +1,90 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Authent External
- * User authentication Module, for authentication outside of the iTop application
- * for example using a .htaccess file. The web server is in charge of authentifying the users
- * and providing the name (= 'login') of the authentified user in the $_SERVER['REMOTE_USER']
- * variable that is passed to PHP. iTop will not make any attempt to authentify such users.
- * Similarly once inside iTop, there is no way for the users to change their password or
- * log off from the iTop application, this has to be handled outside of iTop.
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class UserExternal extends User
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/authentication,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "login",
-			"state_attcode" => "",
-			"reconc_keys" => array('login'),
-			"db_table" => "",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'first_name', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login', 'status')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('advanced_search', array('login', 'contactid')); // Criteria of the advanced search form
-	}
-
-	/**
-	 * Check the user's password... always return true. Actually the password
-	 * is not even passed to this function, we trust the web server for authentifiying
-	 * the users
-	 */
-	public function CheckCredentials($sPassword)
-	{
-		// External authentication: for iTop it's always Ok
-		return true;
-	}
-
-	public function TrustWebServerContext()
-	{
-		return true;
-	}
-
-	public function CanChangePassword()
-	{
-		// External authentication: iTop has no way to change a user's password
-		return false;
-	}
-
-	public function ChangePassword($sOldPassword, $sNewPassword)
-	{
-		return false;
-	}
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Authent External
+ * User authentication Module, for authentication outside of the iTop application
+ * for example using a .htaccess file. The web server is in charge of authentifying the users
+ * and providing the name (= 'login') of the authentified user in the $_SERVER['REMOTE_USER']
+ * variable that is passed to PHP. iTop will not make any attempt to authentify such users.
+ * Similarly once inside iTop, there is no way for the users to change their password or
+ * log off from the iTop application, this has to be handled outside of iTop.
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserExternal extends User
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/authentication,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "login",
+			"state_attcode" => "",
+			"reconc_keys" => array('login'),
+			"db_table" => "",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contactid', 'first_name', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login', 'status')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('advanced_search', array('login', 'contactid')); // Criteria of the advanced search form
+	}
+
+	/**
+	 * Check the user's password... always return true. Actually the password
+	 * is not even passed to this function, we trust the web server for authentifiying
+	 * the users
+	 */
+	public function CheckCredentials($sPassword)
+	{
+		// External authentication: for iTop it's always Ok
+		return true;
+	}
+
+	public function TrustWebServerContext()
+	{
+		return true;
+	}
+
+	public function CanChangePassword()
+	{
+		// External authentication: iTop has no way to change a user's password
+		return false;
+	}
+
+	public function ChangePassword($sOldPassword, $sNewPassword)
+	{
+		return false;
+	}
+}
+
+
+?>
diff --git a/datamodels/2.x/authent-external/module.authent-external.php b/datamodels/2.x/authent-external/module.authent-external.php
index caf9b3f71..8e986f324 100755
--- a/datamodels/2.x/authent-external/module.authent-external.php
+++ b/datamodels/2.x/authent-external/module.authent-external.php
@@ -1,65 +1,65 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Authent External
- * Module definition file for the "External Authentication" module
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'External user authentication',
-		'category' => 'authentication',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.authent-external.php',
-		),
-		'data.struct' => array(
-			//'data.struct.authent-ldap.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.authent-ldap.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(),
-	)
-);
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Authent External
+ * Module definition file for the "External Authentication" module
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'authent-external/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'External user authentication',
+		'category' => 'authentication',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.authent-external.php',
+		),
+		'data.struct' => array(
+			//'data.struct.authent-ldap.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.authent-ldap.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(),
+	)
+);
diff --git a/datamodels/2.x/authent-external/tr.dict.authent-external.php b/datamodels/2.x/authent-external/tr.dict.authent-external.php
index 7ddecd483..b0405a07f 100755
--- a/datamodels/2.x/authent-external/tr.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/tr.dict.authent-external.php
@@ -1,50 +1,50 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserExternal
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:UserExternal' => 'Harici kullanıcı',
-	'Class:UserExternal+' => 'iTop dışında yetki kontrolü yapılan kullanıcı',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:UserExternal' => 'Harici kullanıcı',
+	'Class:UserExternal+' => 'iTop dışında yetki kontrolü yapılan kullanıcı',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-external/zh.dict.authent-external.php b/datamodels/2.x/authent-external/zh.dict.authent-external.php
index 81bc87fbc..e13bea1ce 100755
--- a/datamodels/2.x/authent-external/zh.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/zh.dict.authent-external.php
@@ -1,49 +1,49 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserExternal
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:UserExternal' => '外部用户',
-	'Class:UserExternal+' => '用户在 iTop 外部验证身份',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserExternal
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:UserExternal' => '外部用户',
+	'Class:UserExternal+' => '用户在 iTop 外部验证身份',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-ldap/en.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/en.dict.authent-ldap.php
index 53a78fe71..aee67a43d 100755
--- a/datamodels/2.x/authent-ldap/en.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/en.dict.authent-ldap.php
@@ -1,50 +1,50 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:UserLDAP' => 'LDAP user',
-	'Class:UserLDAP+' => 'User authentified by LDAP',
-	'Class:UserLDAP/Attribute:password' => 'Password',
-	'Class:UserLDAP/Attribute:password+' => 'user authentication string',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserLDAP' => 'LDAP user',
+	'Class:UserLDAP+' => 'User authentified by LDAP',
+	'Class:UserLDAP/Attribute:password' => 'Password',
+	'Class:UserLDAP/Attribute:password+' => 'user authentication string',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php
index cbc1dd905..a8092d33e 100755
--- a/datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/fr.dict.authent-ldap.php
@@ -1,30 +1,30 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:UserLDAP' => 'Utilisateur LDAP',
-	'Class:UserLDAP+' => 'Utilisateur authentifié par un serveur LDAP',
-	'Class:UserLDAP/Attribute:password' => 'Mot de passe LDAP',
-	'Class:UserLDAP/Attribute:password+' => '',
-));
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:UserLDAP' => 'Utilisateur LDAP',
+	'Class:UserLDAP+' => 'Utilisateur authentifié par un serveur LDAP',
+	'Class:UserLDAP/Attribute:password' => 'Mot de passe LDAP',
+	'Class:UserLDAP/Attribute:password+' => '',
+));
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/authent-ldap/it.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/it.dict.authent-ldap.php
index 95acacb05..7d4067f15 100755
--- a/datamodels/2.x/authent-ldap/it.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/it.dict.authent-ldap.php
@@ -1,50 +1,50 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:UserLDAP' => 'Utente LDAP',
-	'Class:UserLDAP+' => 'Utente autenticato da LDAP',
-	'Class:UserLDAP/Attribute:password' => 'Password',
-	'Class:UserLDAP/Attribute:password+' => 'user authentication string',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:UserLDAP' => 'Utente LDAP',
+	'Class:UserLDAP+' => 'Utente autenticato da LDAP',
+	'Class:UserLDAP/Attribute:password' => 'Password',
+	'Class:UserLDAP/Attribute:password+' => 'user authentication string',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-ldap/model.authent-ldap.php b/datamodels/2.x/authent-ldap/model.authent-ldap.php
index 0c1d8c7ce..1bc8ec1eb 100755
--- a/datamodels/2.x/authent-ldap/model.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/model.authent-ldap.php
@@ -1,206 +1,206 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Authent LDAP
- * User authentication Module, no password at all!
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class UserLDAP extends UserInternal
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/authentication,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "login",
-			"state_attcode" => "",
-			"reconc_keys" => array('login'),
-			"db_table" => "",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
-	}
-
-	/**
-	 * Check the user's password against the LDAP server
-	 * Algorithm:
-	 * 1) Connect to the LDAP server, using a predefined account (or anonymously)
-	 * 2) Search for the specified user, based on a specific search query/pattern
-	 * 3) If exactly one user is found, continue, otherwise return false (wrong user or wrong query configured)
-	 * 3) Bind again to LDAP using the DN of the found user and the password
-	 * 4) If the bind is successful return true, otherwise return false (wrong password)
-	 * @param string $sPassword The user's password to validate against the LDAP server
-	 * @return boolean True if the password is Ok, false otherwise
-	 */
-	public function CheckCredentials($sPassword)
-	{
-		$sLDAPHost = MetaModel::GetModuleSetting('authent-ldap', 'host', 'localhost');
-		$iLDAPPort = MetaModel::GetModuleSetting('authent-ldap', 'port', 389);
-		
-		$sDefaultLDAPUser = MetaModel::GetModuleSetting('authent-ldap', 'default_user', '');
-		$sDefaultLDAPPwd = MetaModel::GetModuleSetting('authent-ldap', 'default_pwd', '');
-		$bLDAPStartTLS = MetaModel::GetModuleSetting('authent-ldap', 'start_tls', false);
-		
-		$aOptions = MetaModel::GetModuleSetting('authent-ldap', 'options', array());
-		if (array_key_exists(LDAP_OPT_DEBUG_LEVEL, $aOptions))
-		{
-			// Set debug level before trying to connect, so that debug info appear in the PHP error log if ldap_connect goes wrong
-			$bRet = ldap_set_option($hDS, LDAP_OPT_DEBUG_LEVEL, $aOptions[LDAP_OPT_DEBUG_LEVEL]);
-			$this->LogMessage("ldap_set_option('$name', '$value') returned ".($bRet ? 'true' : 'false'));
-		}
-		$hDS = @ldap_connect($sLDAPHost, $iLDAPPort);
-		if ($hDS === false)
-		{
-			$this->LogMessage("ldap_authentication: can not connect to the LDAP server '$sLDAPHost' (port: $iLDAPPort). Check the configuration file config-itop.php.");
-			return false;
-		}
-		foreach($aOptions as $name => $value)
-		{
-			$bRet = ldap_set_option($hDS, $name, $value);
-			$this->LogMessage("ldap_set_option('$name', '$value') returned ".($bRet ? 'true' : 'false'));
-		}
-		if ($bLDAPStartTLS)
-		{
-			$this->LogMessage("ldap_authentication: start tls required.");
-			$hStartTLS = ldap_start_tls($hDS);
-			//$this->LogMessage("ldap_authentication: hStartTLS = '$hStartTLS'");
-			if (!$hStartTLS)
-			{
-				$this->LogMessage("ldap_authentication: start tls failed.");
-				return false;
-			}
-		}
-		
-		if ($bind = @ldap_bind($hDS, $sDefaultLDAPUser, $sDefaultLDAPPwd))
-		{
-			// Search for the person, using the specified query expression
-			$sLDAPUserQuery = MetaModel::GetModuleSetting('authent-ldap', 'user_query', '');
-			$sBaseDN = MetaModel::GetModuleSetting('authent-ldap', 'base_dn', '');
-			
-			$sLogin = $this->Get('login');
-			$iContactId = $this->Get('contactid');
-			$sFirstName = '';
-			$sLastName = '';
-			$sEMail = '';
-			if ($iContactId > 0)
-			{
-				$oPerson = MetaModel::GetObject('Person', $iContactId);
-				if (is_object($oPerson))
-				{
-					$sFirstName = $oPerson->Get('first_name');
-					$sLastName = $oPerson->Get('name');
-					$sEMail = $oPerson->Get('email');
-				}
-			}
-			// %1$s => login
-			// %2$s => first name
-			// %3$s => last name			
-			// %4$s => email
-			$sQuery = sprintf($sLDAPUserQuery, $sLogin, $sFirstName, $sLastName, $sEMail);
-			$hSearchResult = @ldap_search($hDS, $sBaseDN, $sQuery);
-
-			$iCountEntries = ($hSearchResult !== false) ? @ldap_count_entries($hDS, $hSearchResult) : 0;
-			switch($iCountEntries)
-			{
-				case 1:
-				// Exactly one entry found, let's check the password by trying to bind with this user
-				$aEntry = ldap_get_entries($hDS, $hSearchResult);
-				$sUserDN = $aEntry[0]['dn'];
-				$bUserBind =  @ldap_bind($hDS, $sUserDN, $sPassword);
-				if (($bUserBind !== false) && !empty($sPassword))
-				{
-					ldap_unbind($hDS);
-					return true; // Password Ok
-				}
-				$this->LogMessage("ldap_authentication: wrong password for user: '$sUserDN'.");
-				return false; // Wrong password
-				break;
-				
-				case 0:
-				// User not found...
-				$this->LogMessage("ldap_authentication: no entry found with the query '$sQuery', base_dn = '$sBaseDN'. User not found in LDAP.");
-				break;
-				
-				default:
-				// More than one entry... maybe the query is not specific enough...
-				$this->LogMessage("ldap_authentication: several (".ldap_count_entries($hDS, $hSearchResult).") entries match the query '$sQuery', base_dn = '$sBaseDN', check that the query defined in config-itop.php is specific enough.");
-			}
-			return false;
-		}
-		else
-		{
-			// Trace: invalid default user for LDAP initial binding
-			$this->LogMessage("ldap_authentication: can not bind to the LDAP server '$sLDAPHost' (port: $iLDAPPort), user='$sDefaultLDAPUser', pwd='$sDefaultLDAPPwd'. Error: '".ldap_error($hDS)."'. Check the configuration file config-itop.php.");
-			return false;
-		}
-	}
-
-	public function TrustWebServerContext()
-	{
-		return false;
-	}
-
-	public function CanChangePassword()
-	{
-		return false;
-	}
-
-	public function ChangePassword($sOldPassword, $sNewPassword)
-	{
-		return false;
-	}
-	
-	protected function LogMessage($sMessage, $aData = array())
-	{
-		if (MetaModel::GetModuleSetting('authent-ldap', 'debug', false) && MetaModel::IsLogEnabledIssue())
-		{
-			if (MetaModel::IsValidClass('EventIssue'))
-			{
-				$oLog = new EventIssue();
-	
-				$oLog->Set('message', $sMessage);
-				$oLog->Set('userinfo', '');
-				$oLog->Set('issue', 'LDAP Authentication');
-				$oLog->Set('impact', 'User login rejected');
-				$oLog->Set('data', $aData);
-				$oLog->DBInsertNoReload();
-			}
-	
-			IssueLog::Error($sMessage);
-		}		
-	}
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Authent LDAP
+ * User authentication Module, no password at all!
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserLDAP extends UserInternal
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/authentication,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "login",
+			"state_attcode" => "",
+			"reconc_keys" => array('login'),
+			"db_table" => "",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'status', 'org_id')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
+	}
+
+	/**
+	 * Check the user's password against the LDAP server
+	 * Algorithm:
+	 * 1) Connect to the LDAP server, using a predefined account (or anonymously)
+	 * 2) Search for the specified user, based on a specific search query/pattern
+	 * 3) If exactly one user is found, continue, otherwise return false (wrong user or wrong query configured)
+	 * 3) Bind again to LDAP using the DN of the found user and the password
+	 * 4) If the bind is successful return true, otherwise return false (wrong password)
+	 * @param string $sPassword The user's password to validate against the LDAP server
+	 * @return boolean True if the password is Ok, false otherwise
+	 */
+	public function CheckCredentials($sPassword)
+	{
+		$sLDAPHost = MetaModel::GetModuleSetting('authent-ldap', 'host', 'localhost');
+		$iLDAPPort = MetaModel::GetModuleSetting('authent-ldap', 'port', 389);
+		
+		$sDefaultLDAPUser = MetaModel::GetModuleSetting('authent-ldap', 'default_user', '');
+		$sDefaultLDAPPwd = MetaModel::GetModuleSetting('authent-ldap', 'default_pwd', '');
+		$bLDAPStartTLS = MetaModel::GetModuleSetting('authent-ldap', 'start_tls', false);
+		
+		$aOptions = MetaModel::GetModuleSetting('authent-ldap', 'options', array());
+		if (array_key_exists(LDAP_OPT_DEBUG_LEVEL, $aOptions))
+		{
+			// Set debug level before trying to connect, so that debug info appear in the PHP error log if ldap_connect goes wrong
+			$bRet = ldap_set_option($hDS, LDAP_OPT_DEBUG_LEVEL, $aOptions[LDAP_OPT_DEBUG_LEVEL]);
+			$this->LogMessage("ldap_set_option('$name', '$value') returned ".($bRet ? 'true' : 'false'));
+		}
+		$hDS = @ldap_connect($sLDAPHost, $iLDAPPort);
+		if ($hDS === false)
+		{
+			$this->LogMessage("ldap_authentication: can not connect to the LDAP server '$sLDAPHost' (port: $iLDAPPort). Check the configuration file config-itop.php.");
+			return false;
+		}
+		foreach($aOptions as $name => $value)
+		{
+			$bRet = ldap_set_option($hDS, $name, $value);
+			$this->LogMessage("ldap_set_option('$name', '$value') returned ".($bRet ? 'true' : 'false'));
+		}
+		if ($bLDAPStartTLS)
+		{
+			$this->LogMessage("ldap_authentication: start tls required.");
+			$hStartTLS = ldap_start_tls($hDS);
+			//$this->LogMessage("ldap_authentication: hStartTLS = '$hStartTLS'");
+			if (!$hStartTLS)
+			{
+				$this->LogMessage("ldap_authentication: start tls failed.");
+				return false;
+			}
+		}
+		
+		if ($bind = @ldap_bind($hDS, $sDefaultLDAPUser, $sDefaultLDAPPwd))
+		{
+			// Search for the person, using the specified query expression
+			$sLDAPUserQuery = MetaModel::GetModuleSetting('authent-ldap', 'user_query', '');
+			$sBaseDN = MetaModel::GetModuleSetting('authent-ldap', 'base_dn', '');
+			
+			$sLogin = $this->Get('login');
+			$iContactId = $this->Get('contactid');
+			$sFirstName = '';
+			$sLastName = '';
+			$sEMail = '';
+			if ($iContactId > 0)
+			{
+				$oPerson = MetaModel::GetObject('Person', $iContactId);
+				if (is_object($oPerson))
+				{
+					$sFirstName = $oPerson->Get('first_name');
+					$sLastName = $oPerson->Get('name');
+					$sEMail = $oPerson->Get('email');
+				}
+			}
+			// %1$s => login
+			// %2$s => first name
+			// %3$s => last name			
+			// %4$s => email
+			$sQuery = sprintf($sLDAPUserQuery, $sLogin, $sFirstName, $sLastName, $sEMail);
+			$hSearchResult = @ldap_search($hDS, $sBaseDN, $sQuery);
+
+			$iCountEntries = ($hSearchResult !== false) ? @ldap_count_entries($hDS, $hSearchResult) : 0;
+			switch($iCountEntries)
+			{
+				case 1:
+				// Exactly one entry found, let's check the password by trying to bind with this user
+				$aEntry = ldap_get_entries($hDS, $hSearchResult);
+				$sUserDN = $aEntry[0]['dn'];
+				$bUserBind =  @ldap_bind($hDS, $sUserDN, $sPassword);
+				if (($bUserBind !== false) && !empty($sPassword))
+				{
+					ldap_unbind($hDS);
+					return true; // Password Ok
+				}
+				$this->LogMessage("ldap_authentication: wrong password for user: '$sUserDN'.");
+				return false; // Wrong password
+				break;
+				
+				case 0:
+				// User not found...
+				$this->LogMessage("ldap_authentication: no entry found with the query '$sQuery', base_dn = '$sBaseDN'. User not found in LDAP.");
+				break;
+				
+				default:
+				// More than one entry... maybe the query is not specific enough...
+				$this->LogMessage("ldap_authentication: several (".ldap_count_entries($hDS, $hSearchResult).") entries match the query '$sQuery', base_dn = '$sBaseDN', check that the query defined in config-itop.php is specific enough.");
+			}
+			return false;
+		}
+		else
+		{
+			// Trace: invalid default user for LDAP initial binding
+			$this->LogMessage("ldap_authentication: can not bind to the LDAP server '$sLDAPHost' (port: $iLDAPPort), user='$sDefaultLDAPUser', pwd='$sDefaultLDAPPwd'. Error: '".ldap_error($hDS)."'. Check the configuration file config-itop.php.");
+			return false;
+		}
+	}
+
+	public function TrustWebServerContext()
+	{
+		return false;
+	}
+
+	public function CanChangePassword()
+	{
+		return false;
+	}
+
+	public function ChangePassword($sOldPassword, $sNewPassword)
+	{
+		return false;
+	}
+	
+	protected function LogMessage($sMessage, $aData = array())
+	{
+		if (MetaModel::GetModuleSetting('authent-ldap', 'debug', false) && MetaModel::IsLogEnabledIssue())
+		{
+			if (MetaModel::IsValidClass('EventIssue'))
+			{
+				$oLog = new EventIssue();
+	
+				$oLog->Set('message', $sMessage);
+				$oLog->Set('userinfo', '');
+				$oLog->Set('issue', 'LDAP Authentication');
+				$oLog->Set('impact', 'User login rejected');
+				$oLog->Set('data', $aData);
+				$oLog->DBInsertNoReload();
+			}
+	
+			IssueLog::Error($sMessage);
+		}		
+	}
+}
+
+
+?>
diff --git a/datamodels/2.x/authent-ldap/module.authent-ldap.php b/datamodels/2.x/authent-ldap/module.authent-ldap.php
index c46b2a6f7..3fddd458e 100755
--- a/datamodels/2.x/authent-ldap/module.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/module.authent-ldap.php
@@ -1,65 +1,65 @@
-<?php
-
-
-// Until we develop a mean to adress this within the setup, let's check that this instance
-// of PHP has the php_ldap extension
-//
-if (function_exists('ldap_connect'))
-{
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-ldap/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'User authentication based on LDAP',
-		'category' => 'authentication',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.authent-ldap.php',
-		),
-		'data.struct' => array(
-			//'data.struct.authent-ldap.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.authent-ldap.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-			'host' => 'localhost', // host or IP address of your LDAP server
-			'port' => 389,		  // LDAP port (std: 389)
-			'default_user' => '', // User and password used for initial "Anonymous" bind to LDAP
-			'default_pwd' => '',  // Leave both blank, if anonymous (read-only) bind is allowed
-			'base_dn' => 'dc=yourcompany,dc=com', // Base DN for User queries, adjust it to your LDAP schema
-			'user_query' => '(&(uid=%1$s)(inetuserstatus=ACTIVE))', // Query used to retrieve each user %1$s => iTop login
-																	// For Windows AD use (samaccountname=%1$s) or (userprincipalname=%1$s)
-																	
-			// Some extra LDAP options, refer to: http://www.php.net/manual/en/function.ldap-set-option.php for more info
-			'options' => array(
-				LDAP_OPT_PROTOCOL_VERSION => 3,
-				LDAP_OPT_REFERRALS => 0,
-			),
-			'start_tls' => false,
-			'debug' => false,
-		),
-	)
-);
-
-} // if (function_exists('ldap_connect'))
+<?php
+
+
+// Until we develop a mean to adress this within the setup, let's check that this instance
+// of PHP has the php_ldap extension
+//
+if (function_exists('ldap_connect'))
+{
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'authent-ldap/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'User authentication based on LDAP',
+		'category' => 'authentication',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.authent-ldap.php',
+		),
+		'data.struct' => array(
+			//'data.struct.authent-ldap.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.authent-ldap.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+			'host' => 'localhost', // host or IP address of your LDAP server
+			'port' => 389,		  // LDAP port (std: 389)
+			'default_user' => '', // User and password used for initial "Anonymous" bind to LDAP
+			'default_pwd' => '',  // Leave both blank, if anonymous (read-only) bind is allowed
+			'base_dn' => 'dc=yourcompany,dc=com', // Base DN for User queries, adjust it to your LDAP schema
+			'user_query' => '(&(uid=%1$s)(inetuserstatus=ACTIVE))', // Query used to retrieve each user %1$s => iTop login
+																	// For Windows AD use (samaccountname=%1$s) or (userprincipalname=%1$s)
+																	
+			// Some extra LDAP options, refer to: http://www.php.net/manual/en/function.ldap-set-option.php for more info
+			'options' => array(
+				LDAP_OPT_PROTOCOL_VERSION => 3,
+				LDAP_OPT_REFERRALS => 0,
+			),
+			'start_tls' => false,
+			'debug' => false,
+		),
+	)
+);
+
+} // if (function_exists('ldap_connect'))
diff --git a/datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php
index 29c24797d..1172c279c 100755
--- a/datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/tr.dict.authent-ldap.php
@@ -1,51 +1,51 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:UserLDAP' => 'LDAP kullanıcısı',
-	'Class:UserLDAP+' => 'Yetki kontrolü LDAP tarafından yapılan',
-	'Class:UserLDAP/Attribute:password' => 'Şifre',
-	'Class:UserLDAP/Attribute:password+' => 'şifre',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:UserLDAP' => 'LDAP kullanıcısı',
+	'Class:UserLDAP+' => 'Yetki kontrolü LDAP tarafından yapılan',
+	'Class:UserLDAP/Attribute:password' => 'Şifre',
+	'Class:UserLDAP/Attribute:password+' => 'şifre',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-ldap/zh.dict.authent-ldap.php b/datamodels/2.x/authent-ldap/zh.dict.authent-ldap.php
index cd123a6db..c2d6f293c 100755
--- a/datamodels/2.x/authent-ldap/zh.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/zh.dict.authent-ldap.php
@@ -1,51 +1,51 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLDAP
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:UserLDAP' => 'LDAP 用户',
-	'Class:UserLDAP+' => '用户由 LDAP 鉴别身份',
-	'Class:UserLDAP/Attribute:password' => '密码',
-	'Class:UserLDAP/Attribute:password+' => '用户身份验证串',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLDAP
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:UserLDAP' => 'LDAP 用户',
+	'Class:UserLDAP+' => '用户由 LDAP 鉴别身份',
+	'Class:UserLDAP/Attribute:password' => '密码',
+	'Class:UserLDAP/Attribute:password+' => '用户身份验证串',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-local/en.dict.authent-local.php b/datamodels/2.x/authent-local/en.dict.authent-local.php
index 931bccc82..fda1550a9 100755
--- a/datamodels/2.x/authent-local/en.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/en.dict.authent-local.php
@@ -1,50 +1,50 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:UserLocal' => 'iTop user',
-	'Class:UserLocal+' => 'User authentified by iTop',
-	'Class:UserLocal/Attribute:password' => 'Password',
-	'Class:UserLocal/Attribute:password+' => 'user authentication string',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserLocal' => 'iTop user',
+	'Class:UserLocal+' => 'User authentified by iTop',
+	'Class:UserLocal/Attribute:password' => 'Password',
+	'Class:UserLocal/Attribute:password+' => 'user authentication string',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-local/fr.dict.authent-local.php b/datamodels/2.x/authent-local/fr.dict.authent-local.php
index a42201bf7..4599f8cc3 100755
--- a/datamodels/2.x/authent-local/fr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/fr.dict.authent-local.php
@@ -1,30 +1,30 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:UserLocal' => 'Utilisateur iTop',
-	'Class:UserLocal+' => 'Utilisateur authentifié par iTop',
-	'Class:UserLocal/Attribute:password' => 'Mot de passe',
-	'Class:UserLocal/Attribute:password+' => '',
-));
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Class:UserLocal' => 'Utilisateur iTop',
+	'Class:UserLocal+' => 'Utilisateur authentifié par iTop',
+	'Class:UserLocal/Attribute:password' => 'Mot de passe',
+	'Class:UserLocal/Attribute:password+' => '',
+));
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/authent-local/it.dict.authent-local.php b/datamodels/2.x/authent-local/it.dict.authent-local.php
index 6afb58807..113ebf580 100755
--- a/datamodels/2.x/authent-local/it.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/it.dict.authent-local.php
@@ -1,50 +1,50 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:UserLocal' => 'Utente iTop',
-	'Class:UserLocal+' => 'Utente autenticato da iTop',
-	'Class:UserLocal/Attribute:password' => 'Password',
-	'Class:UserLocal/Attribute:password+' => 'user authentication string',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:UserLocal' => 'Utente iTop',
+	'Class:UserLocal+' => 'Utente autenticato da iTop',
+	'Class:UserLocal/Attribute:password' => 'Password',
+	'Class:UserLocal/Attribute:password+' => 'user authentication string',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-local/model.authent-local.php b/datamodels/2.x/authent-local/model.authent-local.php
index cc5106f2b..bde1214de 100755
--- a/datamodels/2.x/authent-local/model.authent-local.php
+++ b/datamodels/2.x/authent-local/model.authent-local.php
@@ -1,133 +1,133 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Authent Local
- * User authentication Module, password stored in the local database
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class UserLocal extends UserInternal
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "addon/authentication,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "login",
-			"state_attcode" => "",
-			"reconc_keys" => array('login'),
-			"db_table" => "priv_user_local",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("password", array("allowed_values"=>null, "sql"=>"pwd", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'password', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login', 'org_id')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
-	}
-
-	public function CheckCredentials($sPassword)
-	{
-		$oPassword = $this->Get('password'); // ormPassword object
-		// Cannot compare directly the values since they are hashed, so
-		// Let's ask the password to compare the hashed values
-		if ($oPassword->CheckPassword($sPassword))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	public function TrustWebServerContext()
-	{
-		return true;
-	}
-
-	public function CanChangePassword()
-	{
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			return false;
-		}
-		return true;
-	}
-
-	public function ChangePassword($sOldPassword, $sNewPassword)
-	{
-		$oPassword = $this->Get('password'); // ormPassword object
-		// Cannot compare directly the values since they are hashed, so
-		// Let's ask the password to compare the hashed values
-		if ($oPassword->CheckPassword($sOldPassword))
-		{
-			$this->SetPassword($sNewPassword);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Use with care!
-	 */	 	
-	public function SetPassword($sNewPassword)
-	{
-		$this->Set('password', $sNewPassword);
-		$oChange = MetaModel::NewObject("CMDBChange");
-		$oChange->Set("date", time());
-		$sUserString = CMDBChange::GetCurrentUserName();
-		$oChange->Set("userinfo", $sUserString);
-		$oChange->DBInsert();
-		$this->DBUpdateTracked($oChange, true);
-	}
-
-	/**
-	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
-	 * for the given attribute in the current state of the object
-	 * @param $sAttCode string $sAttCode The code of the attribute
-	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
-	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
-	 * @return integer Flags: the binary combination of the flags applicable to this attribute
-	 */	 	  	 	
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			if (strpos('contactid,login,language,password,status,profile_list,allowed_org_list', $sAttCode) !== false)
-			{
-				// contactid and allowed_org_list are disabled to make sure the portal remains accessible 
-				$aReasons[] = 'Sorry, this attribute is read-only in the demonstration mode!';
-				$iFlags |= OPT_ATT_READONLY;
-			}
-		}
-		return $iFlags;
-	}
-}
-
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Authent Local
+ * User authentication Module, password stored in the local database
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class UserLocal extends UserInternal
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "addon/authentication,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "login",
+			"state_attcode" => "",
+			"reconc_keys" => array('login'),
+			"db_table" => "priv_user_local",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeOneWayPassword("password", array("allowed_values"=>null, "sql"=>"pwd", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('contactid', 'org_id', 'email', 'login', 'password', 'language', 'status', 'profile_list', 'allowed_org_list')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('first_name', 'last_name', 'login', 'org_id')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('login', 'contactid', 'status', 'org_id')); // Criteria of the std search form
+	}
+
+	public function CheckCredentials($sPassword)
+	{
+		$oPassword = $this->Get('password'); // ormPassword object
+		// Cannot compare directly the values since they are hashed, so
+		// Let's ask the password to compare the hashed values
+		if ($oPassword->CheckPassword($sPassword))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	public function TrustWebServerContext()
+	{
+		return true;
+	}
+
+	public function CanChangePassword()
+	{
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			return false;
+		}
+		return true;
+	}
+
+	public function ChangePassword($sOldPassword, $sNewPassword)
+	{
+		$oPassword = $this->Get('password'); // ormPassword object
+		// Cannot compare directly the values since they are hashed, so
+		// Let's ask the password to compare the hashed values
+		if ($oPassword->CheckPassword($sOldPassword))
+		{
+			$this->SetPassword($sNewPassword);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Use with care!
+	 */	 	
+	public function SetPassword($sNewPassword)
+	{
+		$this->Set('password', $sNewPassword);
+		$oChange = MetaModel::NewObject("CMDBChange");
+		$oChange->Set("date", time());
+		$sUserString = CMDBChange::GetCurrentUserName();
+		$oChange->Set("userinfo", $sUserString);
+		$oChange->DBInsert();
+		$this->DBUpdateTracked($oChange, true);
+	}
+
+	/**
+	 * Returns the set of flags (OPT_ATT_HIDDEN, OPT_ATT_READONLY, OPT_ATT_MANDATORY...)
+	 * for the given attribute in the current state of the object
+	 * @param $sAttCode string $sAttCode The code of the attribute
+	 * @param $aReasons array To store the reasons why the attribute is read-only (info about the synchro replicas)
+	 * @param $sTargetState string The target state in which to evalutate the flags, if empty the current state will be used
+	 * @return integer Flags: the binary combination of the flags applicable to this attribute
+	 */	 	  	 	
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		$iFlags = parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			if (strpos('contactid,login,language,password,status,profile_list,allowed_org_list', $sAttCode) !== false)
+			{
+				// contactid and allowed_org_list are disabled to make sure the portal remains accessible 
+				$aReasons[] = 'Sorry, this attribute is read-only in the demonstration mode!';
+				$iFlags |= OPT_ATT_READONLY;
+			}
+		}
+		return $iFlags;
+	}
+}
+
diff --git a/datamodels/2.x/authent-local/module.authent-local.php b/datamodels/2.x/authent-local/module.authent-local.php
index a63120f14..e54f0662a 100755
--- a/datamodels/2.x/authent-local/module.authent-local.php
+++ b/datamodels/2.x/authent-local/module.authent-local.php
@@ -1,42 +1,42 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'User authentication based on the local DB',
-		'category' => 'authentication',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => true,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.authent-local.php',
-		),
-		'data.struct' => array(
-			//'data.struct.authent-local.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.authent-local.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'authent-local/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'User authentication based on the local DB',
+		'category' => 'authentication',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.authent-local.php',
+		),
+		'data.struct' => array(
+			//'data.struct.authent-local.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.authent-local.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/authent-local/tr.dict.authent-local.php b/datamodels/2.x/authent-local/tr.dict.authent-local.php
index a0796050b..013a59269 100755
--- a/datamodels/2.x/authent-local/tr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/tr.dict.authent-local.php
@@ -1,51 +1,51 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:UserLocal' => 'iTop kullanıcısı',
-	'Class:UserLocal+' => 'Yetki kontorlünü iTop tarafından yapılan kullanıcı',
-	'Class:UserLocal/Attribute:password' => 'Şifre',
-	'Class:UserLocal/Attribute:password+' => 'şifre',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:UserLocal' => 'iTop kullanıcısı',
+	'Class:UserLocal+' => 'Yetki kontorlünü iTop tarafından yapılan kullanıcı',
+	'Class:UserLocal/Attribute:password' => 'Şifre',
+	'Class:UserLocal/Attribute:password+' => 'şifre',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/authent-local/zh.dict.authent-local.php b/datamodels/2.x/authent-local/zh.dict.authent-local.php
index 69762e13d..7f0e39a30 100755
--- a/datamodels/2.x/authent-local/zh.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/zh.dict.authent-local.php
@@ -1,51 +1,51 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserLocal
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:UserLocal' => 'iTop 用户',
-	'Class:UserLocal+' => '用户由 iTop 验证身份',
-	'Class:UserLocal/Attribute:password' => '密码',
-	'Class:UserLocal/Attribute:password+' => '用户身份验证串',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserLocal
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:UserLocal' => 'iTop 用户',
+	'Class:UserLocal+' => '用户由 iTop 验证身份',
+	'Class:UserLocal/Attribute:password' => '密码',
+	'Class:UserLocal/Attribute:password+' => '用户身份验证串',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/itop-attachments/ajax.attachment.php b/datamodels/2.x/itop-attachments/ajax.attachment.php
index 037749754..f8b453dde 100755
--- a/datamodels/2.x/itop-attachments/ajax.attachment.php
+++ b/datamodels/2.x/itop-attachments/ajax.attachment.php
@@ -1,112 +1,112 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Handles various ajax requests
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/webpage.class.inc.php');
-require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
-
-try
-{
-	require_once(APPROOT.'/application/startup.inc.php');
-//	require_once(APPROOT.'/application/user.preferences.class.inc.php');
-	
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-	LoginWebPage::DoLoginEx(null /* any portal */, false);
-	
-	$oPage = new ajax_page("");
-	$oPage->no_cache();
-	
-	$sOperation = utils::ReadParam('operation', '');
-
-	switch($sOperation)
-	{
-	case 'add':
-		$aResult = array(
-			'error' => '',
-			'att_id' => 0,
-			'preview' => 'false',
-			'msg' => ''
-		);
-		$sObjClass = stripslashes(utils::ReadParam('obj_class', '', false, 'class'));
-		$sTempId = utils::ReadParam('temp_id', '');
-		if (empty($sObjClass))
-		{
-			$aResult['error'] = "Missing argument 'obj_class'";
-		}
-		elseif (empty($sTempId))
-		{
-			$aResult['error'] = "Missing argument 'temp_id'";
-		}
-		else
-		{
-			try
-			{
-				$oDoc = utils::ReadPostedDocument('file');
-				$oAttachment = MetaModel::NewObject('Attachment');
-				$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime'));
-				$oAttachment->Set('temp_id', $sTempId);
-				$oAttachment->Set('item_class', $sObjClass);
-				$oAttachment->SetDefaultOrgId();
-				$oAttachment->Set('contents', $oDoc);
-				$iAttId = $oAttachment->DBInsert();
-				
-				$aResult['msg'] = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
-				$aResult['icon'] = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($oDoc->GetFileName());
-				$aResult['att_id'] = $iAttId;
-				$aResult['preview'] = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
-			}
-			catch (FileUploadException $e)
-			{
-					$aResult['error'] = $e->GetMessage();
-			}
-		}
-		$oPage->add(json_encode($aResult));
-		break;
-	
-	case 'remove':
-	$iAttachmentId = utils::ReadParam('att_id', '');
-	$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE id = :id");
-	$oSet = new DBObjectSet($oSearch, array(), array('id' => $iAttachmentId));
-	while ($oAttachment = $oSet->Fetch())
-	{
-		$oAttachment->DBDelete();
-	}
-	break;
-	
-	default:
-		$oPage->p("Missing argument 'operation'");
-	}
-
-	$oPage->output();
-}
-catch (Exception $e)
-{
-	// note: transform to cope with XSS attacks
-	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
-	IssueLog::Error($e->getMessage());
-}
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Handles various ajax requests
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
+
+try
+{
+	require_once(APPROOT.'/application/startup.inc.php');
+//	require_once(APPROOT.'/application/user.preferences.class.inc.php');
+	
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLoginEx(null /* any portal */, false);
+	
+	$oPage = new ajax_page("");
+	$oPage->no_cache();
+	
+	$sOperation = utils::ReadParam('operation', '');
+
+	switch($sOperation)
+	{
+	case 'add':
+		$aResult = array(
+			'error' => '',
+			'att_id' => 0,
+			'preview' => 'false',
+			'msg' => ''
+		);
+		$sObjClass = stripslashes(utils::ReadParam('obj_class', '', false, 'class'));
+		$sTempId = utils::ReadParam('temp_id', '');
+		if (empty($sObjClass))
+		{
+			$aResult['error'] = "Missing argument 'obj_class'";
+		}
+		elseif (empty($sTempId))
+		{
+			$aResult['error'] = "Missing argument 'temp_id'";
+		}
+		else
+		{
+			try
+			{
+				$oDoc = utils::ReadPostedDocument('file');
+				$oAttachment = MetaModel::NewObject('Attachment');
+				$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime'));
+				$oAttachment->Set('temp_id', $sTempId);
+				$oAttachment->Set('item_class', $sObjClass);
+				$oAttachment->SetDefaultOrgId();
+				$oAttachment->Set('contents', $oDoc);
+				$iAttId = $oAttachment->DBInsert();
+				
+				$aResult['msg'] = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
+				$aResult['icon'] = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($oDoc->GetFileName());
+				$aResult['att_id'] = $iAttId;
+				$aResult['preview'] = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
+			}
+			catch (FileUploadException $e)
+			{
+					$aResult['error'] = $e->GetMessage();
+			}
+		}
+		$oPage->add(json_encode($aResult));
+		break;
+	
+	case 'remove':
+	$iAttachmentId = utils::ReadParam('att_id', '');
+	$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE id = :id");
+	$oSet = new DBObjectSet($oSearch, array(), array('id' => $iAttachmentId));
+	while ($oAttachment = $oSet->Fetch())
+	{
+		$oAttachment->DBDelete();
+	}
+	break;
+	
+	default:
+		$oPage->p("Missing argument 'operation'");
+	}
+
+	$oPage->output();
+}
+catch (Exception $e)
+{
+	// note: transform to cope with XSS attacks
+	echo htmlentities($e->GetMessage(), ENT_QUOTES, 'utf-8');
+	IssueLog::Error($e->getMessage());
+}
+?>
diff --git a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
index ab3ebbd96..206414c8c 100755
--- a/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/en.dict.itop-attachments.php
@@ -1,42 +1,42 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Attachments:TabTitle_Count' => 'Attachments (%1$d)',
-	'Attachments:EmptyTabTitle' => 'Attachments',
-	'Attachments:FieldsetTitle' => 'Attachments',
-	'Attachments:DeleteBtn' => 'Delete',
-	'Attachments:History_File_Added' => 'Attachment %1$s added.',
-	'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)',
-	'Attachments:NoAttachment' => 'No attachment. ',
-	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Attachments:TabTitle_Count' => 'Attachments (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Attachments',
+	'Attachments:FieldsetTitle' => 'Attachments',
+	'Attachments:DeleteBtn' => 'Delete',
+	'Attachments:History_File_Added' => 'Attachment %1$s added.',
+	'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)',
+	'Attachments:NoAttachment' => 'No attachment. ',
+	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.',
+));
+?>
diff --git a/datamodels/2.x/itop-attachments/main.attachments.php b/datamodels/2.x/itop-attachments/main.attachments.php
index 836217fa8..5325224e4 100755
--- a/datamodels/2.x/itop-attachments/main.attachments.php
+++ b/datamodels/2.x/itop-attachments/main.attachments.php
@@ -1,811 +1,811 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-define('ATTACHMENT_DOWNLOAD_URL', 'pages/ajax.document.php?operation=download_document&class=Attachment&field=contents&id=');
-
-class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExtension
-{
-    const ENUM_GUI_ALL = 'all';
-    const ENUM_GUI_BACKOFFICE = 'backoffice';
-    const ENUM_GUI_PORTALS = 'portals';
-
-	protected static $m_bIsModified = false;
-
-	public function OnDisplayProperties($oObject, WebPage $oPage, $bEditMode = false)
-	{
-		if ($this->GetAttachmentsPosition() == 'properties')
-		{
-			$this->DisplayAttachments($oObject, $oPage, $bEditMode);		
-		}
-	}
-
-	public function OnDisplayRelations($oObject, WebPage $oPage, $bEditMode = false)
-	{
-		if ($this->GetAttachmentsPosition() == 'relations')
-		{
-			$this->DisplayAttachments($oObject, $oPage, $bEditMode);		
-		}
-	}
-
-	public function OnFormSubmit($oObject, $sFormPrefix = '')
-	{
-		if ($this->IsTargetObject($oObject))
-		{
-			// For new objects attachments are processed in OnDBInsert
-			if (!$oObject->IsNew())
-			{
-				self::UpdateAttachments($oObject);
-			}
-		}
-	}
-
-	protected function GetMaxUpload()
-	{
-		$iMaxUpload = ini_get('upload_max_filesize');
-		if (!$iMaxUpload)
-		{
-			$sRet = Dict::S('Attachments:UploadNotAllowedOnThisSystem');
-		}
-		else
-		{
-			$iMaxUpload = utils::ConvertToBytes($iMaxUpload);
-			if ($iMaxUpload > 1024*1024*1024)
-			{
-				$sRet = Dict::Format('Attachment:Max_Go', sprintf('%0.2f', $iMaxUpload/(1024*1024*1024)));
-			}
-			else if ($iMaxUpload > 1024*1024)
-			{
-				$sRet = Dict::Format('Attachment:Max_Mo', sprintf('%0.2f', $iMaxUpload/(1024*1024)));
-			}
-			else
-			{
-				$sRet = Dict::Format('Attachment:Max_Ko', sprintf('%0.2f', $iMaxUpload/(1024)));
-			}
-		}
-		return $sRet;
-	}
-	
-	public function OnFormCancel($sTempId)
-	{
-		// Delete all "pending" attachments for this form
-		$sOQL = 'SELECT Attachment WHERE temp_id = :temp_id';
-		$oSearch = DBObjectSearch::FromOQL($sOQL);
-		$oSet = new DBObjectSet($oSearch, array(), array('temp_id' => $sTempId));
-		while($oAttachment = $oSet->Fetch())
-		{
-			$oAttachment->DBDelete();
-			// Pending attachment, don't mention it in the history
-		}
-	}
-
-	public function EnumUsedAttributes($oObject)
-	{
-		return array();
-	}
-
-	public function GetIcon($oObject)
-	{
-		return '';
-	}
-
-	public function GetHilightClass($oObject)
-	{
-		// Possible return values are:
-		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
-		return HILIGHT_CLASS_NONE;
-	}
-
-	public function EnumAllowedActions(DBObjectSet $oSet)
-	{
-		// No action
-		return array();
-    }
-
-	public function OnIsModified($oObject)
-	{
-		return self::$m_bIsModified;
-	}
-
-	public function OnCheckToWrite($oObject)
-	{
-		return array();
-	}
-
-	public function OnCheckToDelete($oObject)
-	{
-		return array();
-	}
-
-	public function OnDBUpdate($oObject, $oChange = null)
-	{
-		if ($this->IsTargetObject($oObject))
-		{
-			// Get all current attachments
-			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
-			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
-			while ($oAttachment = $oSet->Fetch())
-			{
-				$oAttachment->SetItem($oObject, true /*updateonchange*/);
-			}			
-		}
-	}
-	
-	public function OnDBInsert($oObject, $oChange = null)
-	{
-		if ($this->IsTargetObject($oObject))
-		{
-			self::UpdateAttachments($oObject, $oChange);
-		}
-	}
-	
-	public function OnDBDelete($oObject, $oChange = null)
-	{
-		if ($this->IsTargetObject($oObject))
-		{
-			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
-			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
-			while ($oAttachment = $oSet->Fetch())
-			{
-				$oAttachment->DBDelete();
-			}
-		}			
-	}
-
-	///////////////////////////////////////////////////////////////////////////////////////////////////////
-	//
-	// Plug-ins specific functions
-	//
-	///////////////////////////////////////////////////////////////////////////////////////////////////////
-	
-	protected function IsTargetObject($oObject)
-	{
-		$aAllowedClasses = MetaModel::GetModuleSetting('itop-attachments', 'allowed_classes', array('Ticket'));
-		foreach($aAllowedClasses as $sAllowedClass)
-		{
-			if ($oObject instanceof $sAllowedClass)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	protected function GetAttachmentsPosition()
-	{
-		return MetaModel::GetModuleSetting('itop-attachments', 'position', 'relations');
-	}
-
-	var $m_bDeleteEnabled = true;
-
-	public function EnableDelete($bEnabled)
-	{
-		$this->m_bDeleteEnabled = $bEnabled;
-	}
-
-	public function DisplayAttachments($oObject, WebPage $oPage, $bEditMode = false)
-	{
-		// Exit here if the class is not allowed
-		if (!$this->IsTargetObject($oObject)) return;
-		
-		$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
-		$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
-		if ($this->GetAttachmentsPosition() == 'relations')
-		{
-			$sTitle = ($oSet->Count() > 0)? Dict::Format('Attachments:TabTitle_Count', $oSet->Count()) : Dict::S('Attachments:EmptyTabTitle');
-			$oPage->SetCurrentTab($sTitle);
-		}
-		$sMaxWidth = MetaModel::GetModuleSetting('itop-attachment', 'inline_image_max_width', '450px');
-		$oPage->add_style(
-<<<EOF
-.attachment {
-	display: inline-block;
-	text-align:center;
-	float:left;
-	padding:5px;	
-}
-.attachment:hover {
-	background-color: #e0e0e0;
-}
-.attachment img {
-	border: 0;
-}
-.attachment a {
-	text-decoration: none;
-	color: #1C94C4;
-}
-.btn_hidden {
-	display: none;
-}
-.drag_in {
-	-webkit-box-shadow:inset 0 0 10px 2px #1C94C4;
-	box-shadow:inset 0 0 10px 2px #1C94C4;
-}
-#history .attachment-history-added {
-	padding: 0;
-	float: none;
-}
-.inline-image {
-	cursor: zoom-in;
-}
-EOF
-		);
-		$oPage->add('<fieldset>');
-		$oPage->add('<legend>'.Dict::S('Attachments:FieldsetTitle').'</legend>');
-
-		if ($bEditMode && !static::IsReadonlyState($oObject, $oObject->GetState(), static::ENUM_GUI_BACKOFFICE) )
-		{
-			$sIsDeleteEnabled = $this->m_bDeleteEnabled ? 'true' : 'false';
-			$iTransactionId = $oPage->GetTransactionId();
-			$sClass = get_class($oObject);
-			$iObjectId = $oObject->Getkey();
-			$sTempId = session_id().'_'.$iTransactionId;
-			$sDeleteBtn = Dict::S('Attachments:DeleteBtn');
-			$oPage->add_script(
-<<<EOF
-	function RemoveAttachment(att_id)
-	{
-		var bDelete = true;
-		if ($('#display_attachment_'+att_id).hasClass('image-in-use'))
-		{
-				bDelete = window.confirm('This image is used in a description. Delete it anyway?');
-		}
-		if (bDelete)
-		{
-			$('#attachment_'+att_id).attr('name', 'removed_attachments[]');
-			$('#display_attachment_'+att_id).hide();
-			$('#attachment_plugin').trigger('remove_attachment', [att_id]);
-		}
-		return false; // Do not submit the form !
-	}
-EOF
-);
-			$oPage->add('<span id="attachments">');
-			while ($oAttachment = $oSet->Fetch())
-			{
-				$iAttId = $oAttachment->GetKey();
-				$oDoc = $oAttachment->Get('contents');
-				$sFileName = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
-				$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
-				$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
-				$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL.$iAttId;
-				$oPage->add('<div class="attachment" id="display_attachment_' . $iAttId . '"><a data-preview="' . $sPreview . '" href="' . $sDownloadLink . '"><img src="' . $sIcon . '"><br/>' . $sFileName . '<input id="attachment_' . $iAttId . '" type="hidden" name="attachments[]" value="' . $iAttId . '"/></a><br/>&nbsp;<input id="btn_remove_' . $iAttId . '" type="button" class="btn_hidden" value="' . Dict::S('Attachments:DeleteBtn') . '" onClick="RemoveAttachment(' . $iAttId . ');"/>&nbsp;</div>');
-			}
-			
-			// Suggested attachments are listed here but treated as temporary
-			$aDefault = utils::ReadParam('default', array(), false, 'raw_data');
-			if (array_key_exists('suggested_attachments', $aDefault))
-			{
-				$sSuggestedAttachements = $aDefault['suggested_attachments'];
-				if (is_array($sSuggestedAttachements))
-				{
-					$sSuggestedAttachements = implode(',', $sSuggestedAttachements);
-				}
-				$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE id IN($sSuggestedAttachements)");
-				$oSet = new DBObjectSet($oSearch, array());
-				if ($oSet->Count() > 0)
-				{
-					while ($oAttachment = $oSet->Fetch())
-					{
-						// Mark the attachments as temporary attachments for the current object/form
-						$oAttachment->Set('temp_id', $sTempId);
-						$oAttachment->DBUpdate();
-						// Display them
-						$iAttId = $oAttachment->GetKey();
-						$oDoc = $oAttachment->Get('contents');
-						$sFileName = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
-						$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
-						$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL.$iAttId;
-						$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
-						$oPage->add('<div class="attachment" id="display_attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'<input id="attachment_'.$iAttId.'" type="hidden" name="attachments[]" value="'.$iAttId.'"/></a><br/>&nbsp;<input id="btn_remove_'.$iAttId.'" type="button" class="btn_hidden" value="Delete" onClick="RemoveAttachment('.$iAttId.');"/>&nbsp;</div>');
-						$oPage->add_ready_script("$('#attachment_plugin').trigger('add_attachment', [$iAttId, '".addslashes($sFileName)."', false /* not an line image */]);");
-					}
-				}
-			}
-			
-			$oPage->add('</span>');			
-			$oPage->add('<div style="clear:both"></div>');			
-			$sMaxUpload = $this->GetMaxUpload();
-			$oPage->p(Dict::S('Attachments:AddAttachment').'<input type="file" name="file" id="file"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
-			
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.iframe-transport.js');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.fileupload.js');		
-			
-			$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL;		
-			$oPage->add_ready_script(
-<<< EOF
-    $('#file').fileupload({
-		url: GetAbsoluteUrlModulesRoot()+'itop-attachments/ajax.attachment.php',
-		formData: { operation: 'add', temp_id: '$sTempId', obj_class: '$sClass' },
-        dataType: 'json',
-		pasteZone: null, // Don't accept files via Chrome's copy/paste
-        done: function (e, data) {
-			if(typeof(data.result.error) != 'undefined')
-			{
-				if(data.result.error != '')
-				{
-					alert(data.result.error);
-				}
-				else
-				{
-					var sDownloadLink = '$sDownloadLink'+data.result.att_id;
-					$('#attachments').append('<div class="attachment" id="display_attachment_'+data.result.att_id+'"><a data-preview="'+data.result.preview+'" href="'+sDownloadLink+'"><img src="'+data.result.icon+'"><br/>'+data.result.msg+'<input id="attachment_'+data.result.att_id+'" type="hidden" name="attachments[]" value="'+data.result.att_id+'"/></a><br/><input type="button" class="btn_hidden" value="{$sDeleteBtn}" onClick="RemoveAttachment('+data.result.att_id+');"/></div>');
-					if($sIsDeleteEnabled)
-					{
-						$('#display_attachment_'+data.result.att_id).hover( function() { $(this).children(':button').toggleClass('btn_hidden'); } );
-					}
-					$('#attachment_plugin').trigger('add_attachment', [data.result.att_id, data.result.msg, false /* inline image */]);
-				}
-			}
-        },
-        start: function() {
-        	$('#attachment_loading').show();
-		},
-        stop: function() {
-        	$('#attachment_loading').hide();
-		}
-    });
-
-	$(document).bind('dragover', function (e) {
-		var bFiles = false;
-		if (e.dataTransfer && e.dataTransfer.types)
-		{
-			for (var i = 0; i < e.dataTransfer.types.length; i++)
-			{
-				if (e.dataTransfer.types[i] == "application/x-moz-nativeimage")
-				{
-					bFiles = false; // mozilla contains "Files" in the types list when dragging images inside the page, but it also contains "application/x-moz-nativeimage" before
-					break;
-				}
-				
-				if (e.dataTransfer.types[i] == "Files")
-				{
-					bFiles = true;
-					break;
-				}
-			}
-		}
-	
-		if (!bFiles) return; // Not dragging files
-		
-		var dropZone = $('#file').closest('fieldset');
-		if (!dropZone.is(':visible'))
-		{
-			// Hidden, but inside an inactive tab? Higlight the tab
-			var sTabId = dropZone.closest('.ui-tabs-panel').attr('aria-labelledby');
-			dropZone = $('#'+sTabId).closest('li');
-		}
-	    timeout = window.dropZoneTimeout;
-	    if (!timeout) {
-	        dropZone.addClass('drag_in');
-	    } else {
-	        clearTimeout(timeout);
-	    }
-	    window.dropZoneTimeout = setTimeout(function () {
-	        window.dropZoneTimeout = null;
-	        dropZone.removeClass('drag_in');
-	    }, 300);
-	});
-	
-	// check if the attachments are used by inline images
-	window.setTimeout( function() {
-		$('.attachment a').each(function() {
-			var sUrl = $(this).attr('href');
-			if($('img[src="'+sUrl+'"]').length > 0)
-			{
-				$(this).addClass('image-in-use').find('img').wrap('<div class="image-in-use-wrapper" style="position:relative;display:inline-block;"></div>');
-			}
-		});
-		$('.htmlEditor').each(function() {
-			var oEditor = $(this).ckeditorGet();
-			var sHtml = oEditor.getData();
-			var jElement = $('<div/>').html(sHtml).contents();
-			jElement.find('img').each(function() {
-				var sSrc = $(this).attr('src');
-				$('.attachment a[href="'+sSrc+'"]').parent().addClass('image-in-use').find('img').wrap('<div class="image-in-use-wrapper" style="position:relative;display:inline-block;"></div>');
-			});
-		});
-		$('.image-in-use-wrapper').append('<div style="position:absolute;top:0;left:0;"><img src="../images/transp-lock.png"></div>');
-	}, 200 );
-EOF
-);
-			$oPage->p('<span style="display:none;" id="attachment_loading">Loading, please wait...</span>');
-			$oPage->p('<input type="hidden" id="attachment_plugin" name="attachment_plugin"/>');
-			if ($this->m_bDeleteEnabled)
-			{
-				$oPage->add_ready_script('$(".attachment").hover( function() {$(this).children(":button").toggleClass("btn_hidden"); } );');
-			}
-		}
-		else
-		{
-			$oPage->add('<span id="attachments">');
-			if ($oSet->Count() == 0)
-			{
-				$oPage->add(Dict::S('Attachments:NoAttachment'));	
-			}
-			else
-			{
-				while ($oAttachment = $oSet->Fetch())
-				{
-					$iAttId = $oAttachment->GetKey();
-					$oDoc = $oAttachment->Get('contents');
-					$sFileName = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
-					$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
-					$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
-					$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL.$iAttId;
-					$oPage->add('<div class="attachment" id="attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'</a><input type="hidden" name="attachments[]" value="'.$iAttId.'"/><br/>&nbsp;&nbsp;</div>');
-				}
-			}
-			$oPage->add('</span>');
-		}
-		$oPage->add('</fieldset>');
-		$sPreviewNotAvailable = addslashes(Dict::S('Attachments:PreviewNotAvailable'));
-		$iMaxWidth = MetaModel::GetModuleSetting('itop-attachments', 'preview_max_width', 290);
-		$oPage->add_ready_script(
-<<<EOF
-	$(document).tooltip({
-		items: '.attachment a',
-		position: { my: 'left top', at: 'right top', using: function( position, feedback ) { $( this ).css( position ); }},
-		content: function() { if ($(this).attr('data-preview') == 'true') { return('<img style=\"max-width:{$iMaxWidth}px\" src=\"'+$(this).attr('href')+'\"></img>');} else { return '$sPreviewNotAvailable'; }}
-	});
-EOF
-		);
-	}
-
-	protected static function UpdateAttachments($oObject, $oChange = null)
-	{
-		self::$m_bIsModified = false;
-
-		if (utils::ReadParam('attachment_plugin', 'not-in-form') == 'not-in-form')
-		{
-			// Workaround to an issue in iTop < 2.0
-			// Leave silently if there is no trace of the attachment form
-			return;
-		}
-		$iTransactionId = utils::ReadParam('transaction_id', null);
-		if (!is_null($iTransactionId))
-		{
-			$aActions = array();
-			$aAttachmentIds = utils::ReadParam('attachments', array());
-			$aRemovedAttachmentIds = utils::ReadParam('removed_attachments', array());
-			
-			// Get all current attachments
-			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
-			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
-			while ($oAttachment = $oSet->Fetch())
-			{
-				// Remove attachments that are no longer attached to the current object
-				if (in_array($oAttachment->GetKey(), $aRemovedAttachmentIds))
-				{
-					$oAttachment->DBDelete();
-					$aActions[] = self::GetActionChangeOp($oAttachment, false /* false => deletion */);
-				}
-			}			
-
-			// Attach new (temporary) attachements
-			$sTempId = session_id().'_'.$iTransactionId;
-			// The object is being created from a form, check if there are pending attachments
-			// for this object, but deleting the "new" ones that were already removed from the form
-			$sOQL = 'SELECT Attachment WHERE temp_id = :temp_id';
-			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			foreach($aAttachmentIds as $iAttachmentId)
-			{
-				$oSet = new DBObjectSet($oSearch, array(), array('temp_id' => $sTempId));
-				while($oAttachment = $oSet->Fetch())
-				{
-					if (in_array($oAttachment->GetKey(),$aRemovedAttachmentIds))
-					{
-						$oAttachment->DBDelete();
-						// temporary attachment removed, don't even mention it in the history
-					}
-					else
-					{
-						$oAttachment->SetItem($oObject);
-						$oAttachment->Set('temp_id', '');
-						$oAttachment->DBUpdate();
-						// temporary attachment confirmed, list it in the history
-						$aActions[] = self::GetActionChangeOp($oAttachment, true /* true => creation */);
-					}
-				}
-			}
-			if (count($aActions) > 0)
-			{
-				foreach($aActions as $oChangeOp)
-				{
-					self::RecordHistory($oChange, $oObject, $oChangeOp);
-				}
-				self::$m_bIsModified = true;
-			}
-		}
-	}
-	
-	/////////////////////////////////////////////////////////////////////////////////////////
-	public static function GetFileIcon($sFileName)
-	{
-		$aPathParts = pathinfo($sFileName);
-		if (!array_key_exists('extension', $aPathParts))
-		{
-			// No extension: use the default icon
-			$sIcon = 'document.png';
-		}
-		else 
-		{
-			switch($aPathParts['extension'])
-			{
-				case 'doc':
-				case 'docx':
-				$sIcon = 'doc.png';
-				break;
-				
-				case 'xls':
-				case 'xlsx':
-				$sIcon = 'xls.png';
-				break;
-				
-				case 'ppt':
-				case 'pptx':
-				$sIcon = 'ppt.png';
-				break;
-				
-				case 'pdf':
-				$sIcon = 'pdf.png';
-				break;
-				
-				case 'txt':
-				case 'text':
-				$sIcon = 'txt.png';
-				break;
-				
-				case 'rtf':
-				$sIcon = 'rtf.png';
-				break;
-				
-				case 'odt':
-				$sIcon = 'odt.png';
-				break;
-				
-				case 'ods':
-				$sIcon = 'ods.png';
-				break;
-				
-				case 'odp':
-				$sIcon = 'odp.png';
-				break;
-				
-				case 'html':
-				case 'htm':
-				$sIcon = 'html.png';
-				break;
-				
-				case 'png':
-				case 'gif':
-				case 'jpg':
-				case 'jpeg':
-				case 'tiff':
-				case 'tif':
-				case 'bmp':
-				$sIcon = 'image.png';
-				
-				break;
-				case 'zip':
-				case 'gz':
-				case 'tgz':
-				case 'rar':
-				$sIcon = 'zip.png';
-				break;
-	
-				default:
-				$sIcon = 'document.png';
-				break;
-			}
-		}
-		
-		return 'env-'.utils::GetCurrentEnvironment()."/itop-attachments/icons/$sIcon";
-	}
-	
-	/////////////////////////////////////////////////////////////////////////
-	private static function RecordHistory($oChange, $oTargetObject, $oMyChangeOp)
-	{
-		if (!is_null($oChange))
-		{
-			$oMyChangeOp->Set("change", $oChange->GetKey());
-		}
-		$oMyChangeOp->Set("objclass", get_class($oTargetObject));
-		$oMyChangeOp->Set("objkey", $oTargetObject->GetKey());
-		$iId = $oMyChangeOp->DBInsertNoReload();
-	}
-
-	/////////////////////////////////////////////////////////////////////////
-	private static function GetActionChangeOp($oAttachment, $bCreate = true)
-	{
-		$oBlob = $oAttachment->Get('contents');
-		$sFileName = $oBlob->GetFileName();
-		if ($bCreate)
-		{
-			$oChangeOp = new CMDBChangeOpAttachmentAdded();
-			$oChangeOp->Set('attachment_id', $oAttachment->GetKey());
-			$oChangeOp->Set('filename', $sFileName);
-		}
-		else
-		{
-			$oChangeOp = new CMDBChangeOpAttachmentRemoved();
-			$oChangeOp->Set('filename', $sFileName);
-		}
-		return $oChangeOp;
-	}
-
-	/////////////////////////////////////////////////////////////////////////
-    /**
-     * Returns if Attachments should be readonly for $oObject in the $sState state for the $sGUI GUI
-     *
-     * @param DBObject $oObject
-     * @param string $sState
-     * @param string $sGUI
-     * @return bool
-     */
-    public static function IsReadonlyState(DBObject $oObject, $sState, $sGUI = self::ENUM_GUI_ALL)
-    {
-        $aParamDefaultValue = array(
-            static::ENUM_GUI_ALL => array(
-                'Ticket' => array('closed')
-            )
-        );
-
-        $bReadonly = false;
-        $sClass = get_class($oObject);
-        $aReadonlyStatus = MetaModel::GetModuleSetting('itop-attachments', 'readonly_states', $aParamDefaultValue);
-        if(!empty($aReadonlyStatus))
-        {
-            // Merging GUIs entries
-            $aEntries = array();
-            // - All
-            if( array_key_exists(static::ENUM_GUI_ALL, $aReadonlyStatus) )
-            {
-                $aEntries = array_merge_recursive($aEntries, $aReadonlyStatus[static::ENUM_GUI_ALL]);
-            }
-            // - Backoffice & Portals
-            foreach( array(static::ENUM_GUI_BACKOFFICE, static::ENUM_GUI_PORTALS) as $sEnumGUI)
-            {
-                if( in_array($sGUI, array(static::ENUM_GUI_ALL, $sEnumGUI)) )
-                {
-                    if( array_key_exists($sEnumGUI, $aReadonlyStatus) )
-                    {
-                        $aEntries = array_merge_recursive($aEntries, $aReadonlyStatus[$sEnumGUI]);
-                    }
-                }
-            }
-
-            $aParentClasses = array_reverse( MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL) );
-            foreach($aParentClasses as $sParentClass)
-            {
-                if( array_key_exists($sParentClass, $aEntries) )
-                {
-                    // If we found an ancestor of the object's class, we stop looking event if the current state is not specified
-                    if( in_array($oObject->GetState(), $aEntries[$sParentClass]) )
-                    {
-                        $bReadonly = true;
-                    }
-                    break;
-                }
-            }
-        }
-
-        return $bReadonly;
-    }
-}
-
-/**
- * Record the modification of a caselog (text)
- * since the caselog itself stores the history
- * of its entries, there is no need to duplicate
- * the text here
- *
- * @package     iTopORM
- */
-class CMDBChangeOpAttachmentAdded extends CMDBChangeOp
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_attachment_added",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("attachment_id", array("targetclass"=>"Attachment", "allowed_values"=>null, "sql"=>"attachment_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("filename", array("allowed_values"=>null, "sql"=>"filename", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('attachment_id')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('attachment_id')); // Attributes to be displayed for a list
-	}
-	
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */	 
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-		
-		$sResult = '';
-		$sTargetObjectClass = 'Attachment';
-		$iTargetObjectKey = $this->Get('attachment_id');
-		$sFilename = htmlentities($this->Get('filename'), ENT_QUOTES, 'UTF-8');
-		$oTargetSearch = new DBObjectSearch($sTargetObjectClass);
-		$oTargetSearch->AddCondition('id', $iTargetObjectKey, '=');
-
-		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
-		if ($oMonoObjectSet->Count() > 0)
-		{
-			$oAttachment = $oMonoObjectSet->Fetch();
-			$oDoc = $oAttachment->Get('contents');
-			$sPreview = $oDoc->IsPreviewAvailable() ? 'data-preview="true"' : '';
-			$sResult = Dict::Format('Attachments:History_File_Added', '<span class="attachment-history-added attachment"><a '.$sPreview.' target="_blank" href="'.$oDoc->GetDownloadURL($sTargetObjectClass, $iTargetObjectKey, 'contents').'">'.$sFilename.'</a></span>');
-		}
-		else
-		{
-			$sResult = Dict::Format('Attachments:History_File_Added', '<span class="attachment-history-deleted">'.$sFilename.'</span>');
-		}
-		return $sResult;
-	}
-}
-	
-class CMDBChangeOpAttachmentRemoved extends CMDBChangeOp
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "",
-			"name_attcode" => "change",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_changeop_attachment_removed",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("filename", array("allowed_values"=>null, "sql"=>"filename", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('filename')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('filename')); // Attributes to be displayed for a list
-	}
-
-	/**
-	 * Describe (as a text string) the modifications corresponding to this change
-	 */
-	public function GetDescription()
-	{
-		// Temporary, until we change the options of GetDescription() -needs a more global revision
-		$bIsHtml = true;
-
-		$sResult = Dict::Format('Attachments:History_File_Removed', '<span class="attachment-history-deleted">'.htmlentities($this->Get('filename'), ENT_QUOTES, 'UTF-8').'</span>');
-		return $sResult;
-	}
-}
-
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+define('ATTACHMENT_DOWNLOAD_URL', 'pages/ajax.document.php?operation=download_document&class=Attachment&field=contents&id=');
+
+class AttachmentPlugIn implements iApplicationUIExtension, iApplicationObjectExtension
+{
+    const ENUM_GUI_ALL = 'all';
+    const ENUM_GUI_BACKOFFICE = 'backoffice';
+    const ENUM_GUI_PORTALS = 'portals';
+
+	protected static $m_bIsModified = false;
+
+	public function OnDisplayProperties($oObject, WebPage $oPage, $bEditMode = false)
+	{
+		if ($this->GetAttachmentsPosition() == 'properties')
+		{
+			$this->DisplayAttachments($oObject, $oPage, $bEditMode);		
+		}
+	}
+
+	public function OnDisplayRelations($oObject, WebPage $oPage, $bEditMode = false)
+	{
+		if ($this->GetAttachmentsPosition() == 'relations')
+		{
+			$this->DisplayAttachments($oObject, $oPage, $bEditMode);		
+		}
+	}
+
+	public function OnFormSubmit($oObject, $sFormPrefix = '')
+	{
+		if ($this->IsTargetObject($oObject))
+		{
+			// For new objects attachments are processed in OnDBInsert
+			if (!$oObject->IsNew())
+			{
+				self::UpdateAttachments($oObject);
+			}
+		}
+	}
+
+	protected function GetMaxUpload()
+	{
+		$iMaxUpload = ini_get('upload_max_filesize');
+		if (!$iMaxUpload)
+		{
+			$sRet = Dict::S('Attachments:UploadNotAllowedOnThisSystem');
+		}
+		else
+		{
+			$iMaxUpload = utils::ConvertToBytes($iMaxUpload);
+			if ($iMaxUpload > 1024*1024*1024)
+			{
+				$sRet = Dict::Format('Attachment:Max_Go', sprintf('%0.2f', $iMaxUpload/(1024*1024*1024)));
+			}
+			else if ($iMaxUpload > 1024*1024)
+			{
+				$sRet = Dict::Format('Attachment:Max_Mo', sprintf('%0.2f', $iMaxUpload/(1024*1024)));
+			}
+			else
+			{
+				$sRet = Dict::Format('Attachment:Max_Ko', sprintf('%0.2f', $iMaxUpload/(1024)));
+			}
+		}
+		return $sRet;
+	}
+	
+	public function OnFormCancel($sTempId)
+	{
+		// Delete all "pending" attachments for this form
+		$sOQL = 'SELECT Attachment WHERE temp_id = :temp_id';
+		$oSearch = DBObjectSearch::FromOQL($sOQL);
+		$oSet = new DBObjectSet($oSearch, array(), array('temp_id' => $sTempId));
+		while($oAttachment = $oSet->Fetch())
+		{
+			$oAttachment->DBDelete();
+			// Pending attachment, don't mention it in the history
+		}
+	}
+
+	public function EnumUsedAttributes($oObject)
+	{
+		return array();
+	}
+
+	public function GetIcon($oObject)
+	{
+		return '';
+	}
+
+	public function GetHilightClass($oObject)
+	{
+		// Possible return values are:
+		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
+		return HILIGHT_CLASS_NONE;
+	}
+
+	public function EnumAllowedActions(DBObjectSet $oSet)
+	{
+		// No action
+		return array();
+    }
+
+	public function OnIsModified($oObject)
+	{
+		return self::$m_bIsModified;
+	}
+
+	public function OnCheckToWrite($oObject)
+	{
+		return array();
+	}
+
+	public function OnCheckToDelete($oObject)
+	{
+		return array();
+	}
+
+	public function OnDBUpdate($oObject, $oChange = null)
+	{
+		if ($this->IsTargetObject($oObject))
+		{
+			// Get all current attachments
+			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
+			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
+			while ($oAttachment = $oSet->Fetch())
+			{
+				$oAttachment->SetItem($oObject, true /*updateonchange*/);
+			}			
+		}
+	}
+	
+	public function OnDBInsert($oObject, $oChange = null)
+	{
+		if ($this->IsTargetObject($oObject))
+		{
+			self::UpdateAttachments($oObject, $oChange);
+		}
+	}
+	
+	public function OnDBDelete($oObject, $oChange = null)
+	{
+		if ($this->IsTargetObject($oObject))
+		{
+			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
+			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
+			while ($oAttachment = $oSet->Fetch())
+			{
+				$oAttachment->DBDelete();
+			}
+		}			
+	}
+
+	///////////////////////////////////////////////////////////////////////////////////////////////////////
+	//
+	// Plug-ins specific functions
+	//
+	///////////////////////////////////////////////////////////////////////////////////////////////////////
+	
+	protected function IsTargetObject($oObject)
+	{
+		$aAllowedClasses = MetaModel::GetModuleSetting('itop-attachments', 'allowed_classes', array('Ticket'));
+		foreach($aAllowedClasses as $sAllowedClass)
+		{
+			if ($oObject instanceof $sAllowedClass)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	protected function GetAttachmentsPosition()
+	{
+		return MetaModel::GetModuleSetting('itop-attachments', 'position', 'relations');
+	}
+
+	var $m_bDeleteEnabled = true;
+
+	public function EnableDelete($bEnabled)
+	{
+		$this->m_bDeleteEnabled = $bEnabled;
+	}
+
+	public function DisplayAttachments($oObject, WebPage $oPage, $bEditMode = false)
+	{
+		// Exit here if the class is not allowed
+		if (!$this->IsTargetObject($oObject)) return;
+		
+		$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
+		$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
+		if ($this->GetAttachmentsPosition() == 'relations')
+		{
+			$sTitle = ($oSet->Count() > 0)? Dict::Format('Attachments:TabTitle_Count', $oSet->Count()) : Dict::S('Attachments:EmptyTabTitle');
+			$oPage->SetCurrentTab($sTitle);
+		}
+		$sMaxWidth = MetaModel::GetModuleSetting('itop-attachment', 'inline_image_max_width', '450px');
+		$oPage->add_style(
+<<<EOF
+.attachment {
+	display: inline-block;
+	text-align:center;
+	float:left;
+	padding:5px;	
+}
+.attachment:hover {
+	background-color: #e0e0e0;
+}
+.attachment img {
+	border: 0;
+}
+.attachment a {
+	text-decoration: none;
+	color: #1C94C4;
+}
+.btn_hidden {
+	display: none;
+}
+.drag_in {
+	-webkit-box-shadow:inset 0 0 10px 2px #1C94C4;
+	box-shadow:inset 0 0 10px 2px #1C94C4;
+}
+#history .attachment-history-added {
+	padding: 0;
+	float: none;
+}
+.inline-image {
+	cursor: zoom-in;
+}
+EOF
+		);
+		$oPage->add('<fieldset>');
+		$oPage->add('<legend>'.Dict::S('Attachments:FieldsetTitle').'</legend>');
+
+		if ($bEditMode && !static::IsReadonlyState($oObject, $oObject->GetState(), static::ENUM_GUI_BACKOFFICE) )
+		{
+			$sIsDeleteEnabled = $this->m_bDeleteEnabled ? 'true' : 'false';
+			$iTransactionId = $oPage->GetTransactionId();
+			$sClass = get_class($oObject);
+			$iObjectId = $oObject->Getkey();
+			$sTempId = session_id().'_'.$iTransactionId;
+			$sDeleteBtn = Dict::S('Attachments:DeleteBtn');
+			$oPage->add_script(
+<<<EOF
+	function RemoveAttachment(att_id)
+	{
+		var bDelete = true;
+		if ($('#display_attachment_'+att_id).hasClass('image-in-use'))
+		{
+				bDelete = window.confirm('This image is used in a description. Delete it anyway?');
+		}
+		if (bDelete)
+		{
+			$('#attachment_'+att_id).attr('name', 'removed_attachments[]');
+			$('#display_attachment_'+att_id).hide();
+			$('#attachment_plugin').trigger('remove_attachment', [att_id]);
+		}
+		return false; // Do not submit the form !
+	}
+EOF
+);
+			$oPage->add('<span id="attachments">');
+			while ($oAttachment = $oSet->Fetch())
+			{
+				$iAttId = $oAttachment->GetKey();
+				$oDoc = $oAttachment->Get('contents');
+				$sFileName = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
+				$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
+				$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
+				$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL.$iAttId;
+				$oPage->add('<div class="attachment" id="display_attachment_' . $iAttId . '"><a data-preview="' . $sPreview . '" href="' . $sDownloadLink . '"><img src="' . $sIcon . '"><br/>' . $sFileName . '<input id="attachment_' . $iAttId . '" type="hidden" name="attachments[]" value="' . $iAttId . '"/></a><br/>&nbsp;<input id="btn_remove_' . $iAttId . '" type="button" class="btn_hidden" value="' . Dict::S('Attachments:DeleteBtn') . '" onClick="RemoveAttachment(' . $iAttId . ');"/>&nbsp;</div>');
+			}
+			
+			// Suggested attachments are listed here but treated as temporary
+			$aDefault = utils::ReadParam('default', array(), false, 'raw_data');
+			if (array_key_exists('suggested_attachments', $aDefault))
+			{
+				$sSuggestedAttachements = $aDefault['suggested_attachments'];
+				if (is_array($sSuggestedAttachements))
+				{
+					$sSuggestedAttachements = implode(',', $sSuggestedAttachements);
+				}
+				$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE id IN($sSuggestedAttachements)");
+				$oSet = new DBObjectSet($oSearch, array());
+				if ($oSet->Count() > 0)
+				{
+					while ($oAttachment = $oSet->Fetch())
+					{
+						// Mark the attachments as temporary attachments for the current object/form
+						$oAttachment->Set('temp_id', $sTempId);
+						$oAttachment->DBUpdate();
+						// Display them
+						$iAttId = $oAttachment->GetKey();
+						$oDoc = $oAttachment->Get('contents');
+						$sFileName = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
+						$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
+						$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL.$iAttId;
+						$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
+						$oPage->add('<div class="attachment" id="display_attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'<input id="attachment_'.$iAttId.'" type="hidden" name="attachments[]" value="'.$iAttId.'"/></a><br/>&nbsp;<input id="btn_remove_'.$iAttId.'" type="button" class="btn_hidden" value="Delete" onClick="RemoveAttachment('.$iAttId.');"/>&nbsp;</div>');
+						$oPage->add_ready_script("$('#attachment_plugin').trigger('add_attachment', [$iAttId, '".addslashes($sFileName)."', false /* not an line image */]);");
+					}
+				}
+			}
+			
+			$oPage->add('</span>');			
+			$oPage->add('<div style="clear:both"></div>');			
+			$sMaxUpload = $this->GetMaxUpload();
+			$oPage->p(Dict::S('Attachments:AddAttachment').'<input type="file" name="file" id="file"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
+			
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.iframe-transport.js');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.fileupload.js');		
+			
+			$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL;		
+			$oPage->add_ready_script(
+<<< EOF
+    $('#file').fileupload({
+		url: GetAbsoluteUrlModulesRoot()+'itop-attachments/ajax.attachment.php',
+		formData: { operation: 'add', temp_id: '$sTempId', obj_class: '$sClass' },
+        dataType: 'json',
+		pasteZone: null, // Don't accept files via Chrome's copy/paste
+        done: function (e, data) {
+			if(typeof(data.result.error) != 'undefined')
+			{
+				if(data.result.error != '')
+				{
+					alert(data.result.error);
+				}
+				else
+				{
+					var sDownloadLink = '$sDownloadLink'+data.result.att_id;
+					$('#attachments').append('<div class="attachment" id="display_attachment_'+data.result.att_id+'"><a data-preview="'+data.result.preview+'" href="'+sDownloadLink+'"><img src="'+data.result.icon+'"><br/>'+data.result.msg+'<input id="attachment_'+data.result.att_id+'" type="hidden" name="attachments[]" value="'+data.result.att_id+'"/></a><br/><input type="button" class="btn_hidden" value="{$sDeleteBtn}" onClick="RemoveAttachment('+data.result.att_id+');"/></div>');
+					if($sIsDeleteEnabled)
+					{
+						$('#display_attachment_'+data.result.att_id).hover( function() { $(this).children(':button').toggleClass('btn_hidden'); } );
+					}
+					$('#attachment_plugin').trigger('add_attachment', [data.result.att_id, data.result.msg, false /* inline image */]);
+				}
+			}
+        },
+        start: function() {
+        	$('#attachment_loading').show();
+		},
+        stop: function() {
+        	$('#attachment_loading').hide();
+		}
+    });
+
+	$(document).bind('dragover', function (e) {
+		var bFiles = false;
+		if (e.dataTransfer && e.dataTransfer.types)
+		{
+			for (var i = 0; i < e.dataTransfer.types.length; i++)
+			{
+				if (e.dataTransfer.types[i] == "application/x-moz-nativeimage")
+				{
+					bFiles = false; // mozilla contains "Files" in the types list when dragging images inside the page, but it also contains "application/x-moz-nativeimage" before
+					break;
+				}
+				
+				if (e.dataTransfer.types[i] == "Files")
+				{
+					bFiles = true;
+					break;
+				}
+			}
+		}
+	
+		if (!bFiles) return; // Not dragging files
+		
+		var dropZone = $('#file').closest('fieldset');
+		if (!dropZone.is(':visible'))
+		{
+			// Hidden, but inside an inactive tab? Higlight the tab
+			var sTabId = dropZone.closest('.ui-tabs-panel').attr('aria-labelledby');
+			dropZone = $('#'+sTabId).closest('li');
+		}
+	    timeout = window.dropZoneTimeout;
+	    if (!timeout) {
+	        dropZone.addClass('drag_in');
+	    } else {
+	        clearTimeout(timeout);
+	    }
+	    window.dropZoneTimeout = setTimeout(function () {
+	        window.dropZoneTimeout = null;
+	        dropZone.removeClass('drag_in');
+	    }, 300);
+	});
+	
+	// check if the attachments are used by inline images
+	window.setTimeout( function() {
+		$('.attachment a').each(function() {
+			var sUrl = $(this).attr('href');
+			if($('img[src="'+sUrl+'"]').length > 0)
+			{
+				$(this).addClass('image-in-use').find('img').wrap('<div class="image-in-use-wrapper" style="position:relative;display:inline-block;"></div>');
+			}
+		});
+		$('.htmlEditor').each(function() {
+			var oEditor = $(this).ckeditorGet();
+			var sHtml = oEditor.getData();
+			var jElement = $('<div/>').html(sHtml).contents();
+			jElement.find('img').each(function() {
+				var sSrc = $(this).attr('src');
+				$('.attachment a[href="'+sSrc+'"]').parent().addClass('image-in-use').find('img').wrap('<div class="image-in-use-wrapper" style="position:relative;display:inline-block;"></div>');
+			});
+		});
+		$('.image-in-use-wrapper').append('<div style="position:absolute;top:0;left:0;"><img src="../images/transp-lock.png"></div>');
+	}, 200 );
+EOF
+);
+			$oPage->p('<span style="display:none;" id="attachment_loading">Loading, please wait...</span>');
+			$oPage->p('<input type="hidden" id="attachment_plugin" name="attachment_plugin"/>');
+			if ($this->m_bDeleteEnabled)
+			{
+				$oPage->add_ready_script('$(".attachment").hover( function() {$(this).children(":button").toggleClass("btn_hidden"); } );');
+			}
+		}
+		else
+		{
+			$oPage->add('<span id="attachments">');
+			if ($oSet->Count() == 0)
+			{
+				$oPage->add(Dict::S('Attachments:NoAttachment'));	
+			}
+			else
+			{
+				while ($oAttachment = $oSet->Fetch())
+				{
+					$iAttId = $oAttachment->GetKey();
+					$oDoc = $oAttachment->Get('contents');
+					$sFileName = htmlentities($oDoc->GetFileName(), ENT_QUOTES, 'UTF-8');
+					$sIcon = utils::GetAbsoluteUrlAppRoot().AttachmentPlugIn::GetFileIcon($sFileName);
+					$sPreview = $oDoc->IsPreviewAvailable() ? 'true' : 'false';
+					$sDownloadLink = utils::GetAbsoluteUrlAppRoot().ATTACHMENT_DOWNLOAD_URL.$iAttId;
+					$oPage->add('<div class="attachment" id="attachment_'.$iAttId.'"><a data-preview="'.$sPreview.'" href="'.$sDownloadLink.'"><img src="'.$sIcon.'"><br/>'.$sFileName.'</a><input type="hidden" name="attachments[]" value="'.$iAttId.'"/><br/>&nbsp;&nbsp;</div>');
+				}
+			}
+			$oPage->add('</span>');
+		}
+		$oPage->add('</fieldset>');
+		$sPreviewNotAvailable = addslashes(Dict::S('Attachments:PreviewNotAvailable'));
+		$iMaxWidth = MetaModel::GetModuleSetting('itop-attachments', 'preview_max_width', 290);
+		$oPage->add_ready_script(
+<<<EOF
+	$(document).tooltip({
+		items: '.attachment a',
+		position: { my: 'left top', at: 'right top', using: function( position, feedback ) { $( this ).css( position ); }},
+		content: function() { if ($(this).attr('data-preview') == 'true') { return('<img style=\"max-width:{$iMaxWidth}px\" src=\"'+$(this).attr('href')+'\"></img>');} else { return '$sPreviewNotAvailable'; }}
+	});
+EOF
+		);
+	}
+
+	protected static function UpdateAttachments($oObject, $oChange = null)
+	{
+		self::$m_bIsModified = false;
+
+		if (utils::ReadParam('attachment_plugin', 'not-in-form') == 'not-in-form')
+		{
+			// Workaround to an issue in iTop < 2.0
+			// Leave silently if there is no trace of the attachment form
+			return;
+		}
+		$iTransactionId = utils::ReadParam('transaction_id', null);
+		if (!is_null($iTransactionId))
+		{
+			$aActions = array();
+			$aAttachmentIds = utils::ReadParam('attachments', array());
+			$aRemovedAttachmentIds = utils::ReadParam('removed_attachments', array());
+			
+			// Get all current attachments
+			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_class = :class AND item_id = :item_id");
+			$oSet = new DBObjectSet($oSearch, array(), array('class' => get_class($oObject), 'item_id' => $oObject->GetKey()));
+			while ($oAttachment = $oSet->Fetch())
+			{
+				// Remove attachments that are no longer attached to the current object
+				if (in_array($oAttachment->GetKey(), $aRemovedAttachmentIds))
+				{
+					$oAttachment->DBDelete();
+					$aActions[] = self::GetActionChangeOp($oAttachment, false /* false => deletion */);
+				}
+			}			
+
+			// Attach new (temporary) attachements
+			$sTempId = session_id().'_'.$iTransactionId;
+			// The object is being created from a form, check if there are pending attachments
+			// for this object, but deleting the "new" ones that were already removed from the form
+			$sOQL = 'SELECT Attachment WHERE temp_id = :temp_id';
+			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			foreach($aAttachmentIds as $iAttachmentId)
+			{
+				$oSet = new DBObjectSet($oSearch, array(), array('temp_id' => $sTempId));
+				while($oAttachment = $oSet->Fetch())
+				{
+					if (in_array($oAttachment->GetKey(),$aRemovedAttachmentIds))
+					{
+						$oAttachment->DBDelete();
+						// temporary attachment removed, don't even mention it in the history
+					}
+					else
+					{
+						$oAttachment->SetItem($oObject);
+						$oAttachment->Set('temp_id', '');
+						$oAttachment->DBUpdate();
+						// temporary attachment confirmed, list it in the history
+						$aActions[] = self::GetActionChangeOp($oAttachment, true /* true => creation */);
+					}
+				}
+			}
+			if (count($aActions) > 0)
+			{
+				foreach($aActions as $oChangeOp)
+				{
+					self::RecordHistory($oChange, $oObject, $oChangeOp);
+				}
+				self::$m_bIsModified = true;
+			}
+		}
+	}
+	
+	/////////////////////////////////////////////////////////////////////////////////////////
+	public static function GetFileIcon($sFileName)
+	{
+		$aPathParts = pathinfo($sFileName);
+		if (!array_key_exists('extension', $aPathParts))
+		{
+			// No extension: use the default icon
+			$sIcon = 'document.png';
+		}
+		else 
+		{
+			switch($aPathParts['extension'])
+			{
+				case 'doc':
+				case 'docx':
+				$sIcon = 'doc.png';
+				break;
+				
+				case 'xls':
+				case 'xlsx':
+				$sIcon = 'xls.png';
+				break;
+				
+				case 'ppt':
+				case 'pptx':
+				$sIcon = 'ppt.png';
+				break;
+				
+				case 'pdf':
+				$sIcon = 'pdf.png';
+				break;
+				
+				case 'txt':
+				case 'text':
+				$sIcon = 'txt.png';
+				break;
+				
+				case 'rtf':
+				$sIcon = 'rtf.png';
+				break;
+				
+				case 'odt':
+				$sIcon = 'odt.png';
+				break;
+				
+				case 'ods':
+				$sIcon = 'ods.png';
+				break;
+				
+				case 'odp':
+				$sIcon = 'odp.png';
+				break;
+				
+				case 'html':
+				case 'htm':
+				$sIcon = 'html.png';
+				break;
+				
+				case 'png':
+				case 'gif':
+				case 'jpg':
+				case 'jpeg':
+				case 'tiff':
+				case 'tif':
+				case 'bmp':
+				$sIcon = 'image.png';
+				
+				break;
+				case 'zip':
+				case 'gz':
+				case 'tgz':
+				case 'rar':
+				$sIcon = 'zip.png';
+				break;
+	
+				default:
+				$sIcon = 'document.png';
+				break;
+			}
+		}
+		
+		return 'env-'.utils::GetCurrentEnvironment()."/itop-attachments/icons/$sIcon";
+	}
+	
+	/////////////////////////////////////////////////////////////////////////
+	private static function RecordHistory($oChange, $oTargetObject, $oMyChangeOp)
+	{
+		if (!is_null($oChange))
+		{
+			$oMyChangeOp->Set("change", $oChange->GetKey());
+		}
+		$oMyChangeOp->Set("objclass", get_class($oTargetObject));
+		$oMyChangeOp->Set("objkey", $oTargetObject->GetKey());
+		$iId = $oMyChangeOp->DBInsertNoReload();
+	}
+
+	/////////////////////////////////////////////////////////////////////////
+	private static function GetActionChangeOp($oAttachment, $bCreate = true)
+	{
+		$oBlob = $oAttachment->Get('contents');
+		$sFileName = $oBlob->GetFileName();
+		if ($bCreate)
+		{
+			$oChangeOp = new CMDBChangeOpAttachmentAdded();
+			$oChangeOp->Set('attachment_id', $oAttachment->GetKey());
+			$oChangeOp->Set('filename', $sFileName);
+		}
+		else
+		{
+			$oChangeOp = new CMDBChangeOpAttachmentRemoved();
+			$oChangeOp->Set('filename', $sFileName);
+		}
+		return $oChangeOp;
+	}
+
+	/////////////////////////////////////////////////////////////////////////
+    /**
+     * Returns if Attachments should be readonly for $oObject in the $sState state for the $sGUI GUI
+     *
+     * @param DBObject $oObject
+     * @param string $sState
+     * @param string $sGUI
+     * @return bool
+     */
+    public static function IsReadonlyState(DBObject $oObject, $sState, $sGUI = self::ENUM_GUI_ALL)
+    {
+        $aParamDefaultValue = array(
+            static::ENUM_GUI_ALL => array(
+                'Ticket' => array('closed')
+            )
+        );
+
+        $bReadonly = false;
+        $sClass = get_class($oObject);
+        $aReadonlyStatus = MetaModel::GetModuleSetting('itop-attachments', 'readonly_states', $aParamDefaultValue);
+        if(!empty($aReadonlyStatus))
+        {
+            // Merging GUIs entries
+            $aEntries = array();
+            // - All
+            if( array_key_exists(static::ENUM_GUI_ALL, $aReadonlyStatus) )
+            {
+                $aEntries = array_merge_recursive($aEntries, $aReadonlyStatus[static::ENUM_GUI_ALL]);
+            }
+            // - Backoffice & Portals
+            foreach( array(static::ENUM_GUI_BACKOFFICE, static::ENUM_GUI_PORTALS) as $sEnumGUI)
+            {
+                if( in_array($sGUI, array(static::ENUM_GUI_ALL, $sEnumGUI)) )
+                {
+                    if( array_key_exists($sEnumGUI, $aReadonlyStatus) )
+                    {
+                        $aEntries = array_merge_recursive($aEntries, $aReadonlyStatus[$sEnumGUI]);
+                    }
+                }
+            }
+
+            $aParentClasses = array_reverse( MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL) );
+            foreach($aParentClasses as $sParentClass)
+            {
+                if( array_key_exists($sParentClass, $aEntries) )
+                {
+                    // If we found an ancestor of the object's class, we stop looking event if the current state is not specified
+                    if( in_array($oObject->GetState(), $aEntries[$sParentClass]) )
+                    {
+                        $bReadonly = true;
+                    }
+                    break;
+                }
+            }
+        }
+
+        return $bReadonly;
+    }
+}
+
+/**
+ * Record the modification of a caselog (text)
+ * since the caselog itself stores the history
+ * of its entries, there is no need to duplicate
+ * the text here
+ *
+ * @package     iTopORM
+ */
+class CMDBChangeOpAttachmentAdded extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_attachment_added",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("attachment_id", array("targetclass"=>"Attachment", "allowed_values"=>null, "sql"=>"attachment_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("filename", array("allowed_values"=>null, "sql"=>"filename", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('attachment_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('attachment_id')); // Attributes to be displayed for a list
+	}
+	
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */	 
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+		
+		$sResult = '';
+		$sTargetObjectClass = 'Attachment';
+		$iTargetObjectKey = $this->Get('attachment_id');
+		$sFilename = htmlentities($this->Get('filename'), ENT_QUOTES, 'UTF-8');
+		$oTargetSearch = new DBObjectSearch($sTargetObjectClass);
+		$oTargetSearch->AddCondition('id', $iTargetObjectKey, '=');
+
+		$oMonoObjectSet = new DBObjectSet($oTargetSearch);
+		if ($oMonoObjectSet->Count() > 0)
+		{
+			$oAttachment = $oMonoObjectSet->Fetch();
+			$oDoc = $oAttachment->Get('contents');
+			$sPreview = $oDoc->IsPreviewAvailable() ? 'data-preview="true"' : '';
+			$sResult = Dict::Format('Attachments:History_File_Added', '<span class="attachment-history-added attachment"><a '.$sPreview.' target="_blank" href="'.$oDoc->GetDownloadURL($sTargetObjectClass, $iTargetObjectKey, 'contents').'">'.$sFilename.'</a></span>');
+		}
+		else
+		{
+			$sResult = Dict::Format('Attachments:History_File_Added', '<span class="attachment-history-deleted">'.$sFilename.'</span>');
+		}
+		return $sResult;
+	}
+}
+	
+class CMDBChangeOpAttachmentRemoved extends CMDBChangeOp
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb",
+			"key_type" => "",
+			"name_attcode" => "change",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_changeop_attachment_removed",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("filename", array("allowed_values"=>null, "sql"=>"filename", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('filename')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('filename')); // Attributes to be displayed for a list
+	}
+
+	/**
+	 * Describe (as a text string) the modifications corresponding to this change
+	 */
+	public function GetDescription()
+	{
+		// Temporary, until we change the options of GetDescription() -needs a more global revision
+		$bIsHtml = true;
+
+		$sResult = Dict::Format('Attachments:History_File_Removed', '<span class="attachment-history-deleted">'.htmlentities($this->Get('filename'), ENT_QUOTES, 'UTF-8').'</span>');
+		return $sResult;
+	}
+}
+
diff --git a/datamodels/2.x/itop-attachments/module.attachments.php b/datamodels/2.x/itop-attachments/module.attachments.php
index 82d44b976..a359bc25e 100755
--- a/datamodels/2.x/itop-attachments/module.attachments.php
+++ b/datamodels/2.x/itop-attachments/module.attachments.php
@@ -1,147 +1,147 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Tickets Attachments',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			
-		),
-		'mandatory' => false,
-		'visible' => true,
-		'installer' => 'AttachmentInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-attachments.php',
-			'main.attachments.php',
-		),
-		'webservice' => array(
-			
-		),
-		'dictionary' => array(
-
-		),
-		'data.struct' => array(
-			// add your 'structure' definition XML files here,
-		),
-		'data.sample' => array(
-			// add your sample data XML files here,
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
-		'doc.more_information' => '', // hyperlink to more information, if any 
-
-		// Default settings
-		//
-		'settings' => array(
-			'allowed_classes' => array('Ticket'), // List of classes for which to manage "Attachments"
-			'position' => 'relations', // Where to display the attachments: relations | properties
-			'preview_max_width' => 290,
-		),
-	)
-);
-
-if (!class_exists('AttachmentInstaller'))
-{
-	// Module installation handler
-	//
-	class AttachmentInstaller extends ModuleInstallerAPI
-	{
-		public static function BeforeWritingConfig(Config $oConfiguration)
-		{
-			// If you want to override/force some configuration values, do it here
-			return $oConfiguration;
-		}
-
-		/**
-		 * Handler called before creating or upgrading the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			if ($sPreviousVersion != '')
-			{
-				// Migrating from a previous version
-				// Check for records where item_id = '', since they are not attached to any object and cannot be migrated to the objkey schema
-				$sTableName = MetaModel::DBGetTable('Attachment');
-				$sCountQuery = "SELECT COUNT(*) FROM `$sTableName` WHERE (`item_id`='' OR `item_id` IS NULL)";
-				$iCount = CMDBSource::QueryToScalar($sCountQuery);
-				if ($iCount > 0)
-				{
-					SetupPage::log_info("Cleanup of orphan attachments that cannot be migrated to the new ObjKey model: $iCount record(s) must be deleted."); 
-					$sRepairQuery = "DELETE FROM `$sTableName` WHERE (`item_id`='' OR `item_id` IS NULL)";
-					$iRet = CMDBSource::Query($sRepairQuery); // Throws an exception in case of error
-					SetupPage::log_info("Cleanup of orphan attachments successfully completed.");
-				}
-				else
-				{
-					SetupPage::log_info("No orphan attachment found.");
-				}
-			}
-		}
-		
-		/**
-		 * Handler called after the creation/update of the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			// For each record having item_org_id unset,
-			//    get the org_id from the container object 
-			//
-			// Prerequisite: change null into 0 (workaround to the fact that we cannot use IS NULL in OQL)
-			SetupPage::log_info("Initializing attachment/item_org_id - null to zero"); 
-			$sTableName = MetaModel::DBGetTable('Attachment');
-			$sRepair = "UPDATE `$sTableName` SET `item_org_id` = 0 WHERE `item_org_id` IS NULL";
-			CMDBSource::Query($sRepair);
-
-			SetupPage::log_info("Initializing attachment/item_org_id - zero to the container");
-			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_org_id = 0");
-			$oSet = new DBObjectSet($oSearch);
-			$iUpdated = 0;
-			while ($oAttachment = $oSet->Fetch())
-			{
-				$oContainer = MetaModel::GetObject($oAttachment->Get('item_class'), $oAttachment->Get('item_id'), false /* must be found */, true /* allow all data */);
-				if ($oContainer)
-				{
-					$oAttachment->SetItem($oContainer, true /*updateonchange*/);
-					$iUpdated++;
-				}
-			}
-
-			SetupPage::log_info("Initializing attachment/item_org_id - $iUpdated records have been adjusted"); 
-		}
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-attachments/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Tickets Attachments',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			
+		),
+		'mandatory' => false,
+		'visible' => true,
+		'installer' => 'AttachmentInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-attachments.php',
+			'main.attachments.php',
+		),
+		'webservice' => array(
+			
+		),
+		'dictionary' => array(
+
+		),
+		'data.struct' => array(
+			// add your 'structure' definition XML files here,
+		),
+		'data.sample' => array(
+			// add your sample data XML files here,
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+		'doc.more_information' => '', // hyperlink to more information, if any 
+
+		// Default settings
+		//
+		'settings' => array(
+			'allowed_classes' => array('Ticket'), // List of classes for which to manage "Attachments"
+			'position' => 'relations', // Where to display the attachments: relations | properties
+			'preview_max_width' => 290,
+		),
+	)
+);
+
+if (!class_exists('AttachmentInstaller'))
+{
+	// Module installation handler
+	//
+	class AttachmentInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if ($sPreviousVersion != '')
+			{
+				// Migrating from a previous version
+				// Check for records where item_id = '', since they are not attached to any object and cannot be migrated to the objkey schema
+				$sTableName = MetaModel::DBGetTable('Attachment');
+				$sCountQuery = "SELECT COUNT(*) FROM `$sTableName` WHERE (`item_id`='' OR `item_id` IS NULL)";
+				$iCount = CMDBSource::QueryToScalar($sCountQuery);
+				if ($iCount > 0)
+				{
+					SetupPage::log_info("Cleanup of orphan attachments that cannot be migrated to the new ObjKey model: $iCount record(s) must be deleted."); 
+					$sRepairQuery = "DELETE FROM `$sTableName` WHERE (`item_id`='' OR `item_id` IS NULL)";
+					$iRet = CMDBSource::Query($sRepairQuery); // Throws an exception in case of error
+					SetupPage::log_info("Cleanup of orphan attachments successfully completed.");
+				}
+				else
+				{
+					SetupPage::log_info("No orphan attachment found.");
+				}
+			}
+		}
+		
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			// For each record having item_org_id unset,
+			//    get the org_id from the container object 
+			//
+			// Prerequisite: change null into 0 (workaround to the fact that we cannot use IS NULL in OQL)
+			SetupPage::log_info("Initializing attachment/item_org_id - null to zero"); 
+			$sTableName = MetaModel::DBGetTable('Attachment');
+			$sRepair = "UPDATE `$sTableName` SET `item_org_id` = 0 WHERE `item_org_id` IS NULL";
+			CMDBSource::Query($sRepair);
+
+			SetupPage::log_info("Initializing attachment/item_org_id - zero to the container");
+			$oSearch = DBObjectSearch::FromOQL("SELECT Attachment WHERE item_org_id = 0");
+			$oSet = new DBObjectSet($oSearch);
+			$iUpdated = 0;
+			while ($oAttachment = $oSet->Fetch())
+			{
+				$oContainer = MetaModel::GetObject($oAttachment->Get('item_class'), $oAttachment->Get('item_id'), false /* must be found */, true /* allow all data */);
+				if ($oContainer)
+				{
+					$oAttachment->SetItem($oContainer, true /*updateonchange*/);
+					$iUpdated++;
+				}
+			}
+
+			SetupPage::log_info("Initializing attachment/item_org_id - $iUpdated records have been adjusted"); 
+		}
+	}
+}
diff --git a/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
index f881daa7f..ecc35985a 100644
--- a/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/nl.dict.itop-attachments.php
@@ -1,48 +1,48 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Attachments:TabTitle_Count' => 'Bijlagen (%1$d)',
-	'Attachments:EmptyTabTitle' => 'Bijlagen',
-	'Attachments:FieldsetTitle' => 'Bijlagen',
-	'Attachments:DeleteBtn' => 'Verwijder',
-	'Attachments:History_File_Added' => 'Bijlage %1$s toegevoegd.',
-	'Attachments:History_File_Removed' => 'Bijlage %1$s verwijderd.',
-	'Attachments:AddAttachment' => 'Voeg bijlage toe: ',
-	'Attachments:UploadNotAllowedOnThisSystem' => 'Bestand upload is NIET toegestaan op dit systeem.',
-	'Attachment:Max_Go' => '(Maximum bestandsgrootte: %1$s Go)',
-	'Attachment:Max_Mo' => '(Maximum bestandsgrootte: %1$s Mo)',
-	'Attachment:Max_Ko' => '(Maximum bestandsgrootte: %1$s Ko)',
-	'Attachments:NoAttachment' => 'Geen bijlage. ',
-	'Attachments:PreviewNotAvailable' => 'Een voorbeeld is niet beschikbaar voor dit type bijlage.',
-	'Class:Attachment' => 'Bijlage',
-	'Class:Attachment+' => '',
-		
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Attachments:TabTitle_Count' => 'Bijlagen (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Bijlagen',
+	'Attachments:FieldsetTitle' => 'Bijlagen',
+	'Attachments:DeleteBtn' => 'Verwijder',
+	'Attachments:History_File_Added' => 'Bijlage %1$s toegevoegd.',
+	'Attachments:History_File_Removed' => 'Bijlage %1$s verwijderd.',
+	'Attachments:AddAttachment' => 'Voeg bijlage toe: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'Bestand upload is NIET toegestaan op dit systeem.',
+	'Attachment:Max_Go' => '(Maximum bestandsgrootte: %1$s Go)',
+	'Attachment:Max_Mo' => '(Maximum bestandsgrootte: %1$s Mo)',
+	'Attachment:Max_Ko' => '(Maximum bestandsgrootte: %1$s Ko)',
+	'Attachments:NoAttachment' => 'Geen bijlage. ',
+	'Attachments:PreviewNotAvailable' => 'Een voorbeeld is niet beschikbaar voor dit type bijlage.',
+	'Class:Attachment' => 'Bijlage',
+	'Class:Attachment+' => '',
+		
+));
+?>
diff --git a/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php b/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
index 487532f95..3e7dce4ce 100644
--- a/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/pt_br.dict.itop-attachments.php
@@ -1,42 +1,42 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
-	'Attachments:EmptyTabTitle' => 'Anexos',
-	'Attachments:FieldsetTitle' => 'Anexos',
-	'Attachments:DeleteBtn' => 'Excluir',
-	'Attachments:History_File_Added' => 'Anexo %1$s adicionado.',
-	'Attachments:History_File_Removed' => 'Anexo %1$s excluído.',
-	'Attachments:AddAttachment' => 'Adicionar anexo: ',
-	'Attachments:UploadNotAllowedOnThisSystem' => 'Arquivo carregado NÃO PERMITIDO pelo sistema.',
-	'Attachment:Max_Go' => '(Tamanho máximo arquivo: %1$s Gb)',
-	'Attachment:Max_Mo' => '(Tamanho máximo arquivo: %1$s Mb)',
-	'Attachment:Max_Ko' => '(Tamanho máximo arquivo: %1$s Kb)',
-	'Attachments:NoAttachment' => 'Nenhum anexo. ',
-	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Anexos',
+	'Attachments:FieldsetTitle' => 'Anexos',
+	'Attachments:DeleteBtn' => 'Excluir',
+	'Attachments:History_File_Added' => 'Anexo %1$s adicionado.',
+	'Attachments:History_File_Removed' => 'Anexo %1$s excluído.',
+	'Attachments:AddAttachment' => 'Adicionar anexo: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'Arquivo carregado NÃO PERMITIDO pelo sistema.',
+	'Attachment:Max_Go' => '(Tamanho máximo arquivo: %1$s Gb)',
+	'Attachment:Max_Mo' => '(Tamanho máximo arquivo: %1$s Mb)',
+	'Attachment:Max_Ko' => '(Tamanho máximo arquivo: %1$s Kb)',
+	'Attachments:NoAttachment' => 'Nenhum anexo. ',
+	'Attachments:PreviewNotAvailable' => 'Preview not available for this type of attachment.~~',
+));
+?>
diff --git a/datamodels/2.x/itop-backup/dbrestore.class.inc.php b/datamodels/2.x/itop-backup/dbrestore.class.inc.php
index fc38b292c..984f8463a 100644
--- a/datamodels/2.x/itop-backup/dbrestore.class.inc.php
+++ b/datamodels/2.x/itop-backup/dbrestore.class.inc.php
@@ -1,203 +1,203 @@
-<?php
-// Copyright (C) 2014-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-class DBRestore extends DBBackup
-{
-	/** @var string */
-	private $sDBPwd;
-	/** @var string */
-	private $sDBUser;
-
-	public function __construct(\Config $oConfig = null)
-	{
-		parent::__construct($oConfig);
-
-		$this->sDBUser = $oConfig->Get('db_user');
-		$this->sDBPwd = $oConfig->Get('db_pwd');
-	}
-
-	protected function LogInfo($sMsg)
-	{
-		//IssueLog::Info('non juste info: '.$sMsg);
-	}
-
-	protected function LogError($sMsg)
-	{
-		IssueLog::Error($sMsg);
-	}
-
-	protected function LoadDatabase($sDataFile)
-	{
-		$this->LogInfo("Loading data onto $this->sDBHost/$this->sDBName(suffix:'$this->sDBSubName')");
-
-		// Just to check the connection to the DB (more accurate than getting the retcode of mysql)
-		$oMysqli = $this->DBConnect();
-
-		$sHost = self::EscapeShellArg($this->sDBHost);
-		$sUser = self::EscapeShellArg($this->sDBUser);
-		$sPwd = self::EscapeShellArg($this->sDBPwd);
-		$sDBName = self::EscapeShellArg($this->sDBName);
-		if (empty($this->sMySQLBinDir))
-		{
-			$sMySQLExe = 'mysql';
-		}
-		else
-		{
-			$sMySQLExe = '"'.$this->sMySQLBinDir.'/mysql"';
-		}
-		if (is_null($this->iDBPort))
-		{
-			$sPortOption = '';
-		}
-		else
-		{
-			$sPortOption = '--port='.$this->iDBPort.' ';
-		}
-
-		$sDataFileEscaped = self::EscapeShellArg($sDataFile);
-		$sCommand = "$sMySQLExe --default-character-set=".DEFAULT_CHARACTER_SET." --host=$sHost $sPortOption --user=$sUser --password=$sPwd $sDBName <$sDataFileEscaped 2>&1";
-		$sCommandDisplay = "$sMySQLExe --default-character-set=".DEFAULT_CHARACTER_SET." --host=$sHost $sPortOption --user=xxxx --password=xxxx $sDBName <$sDataFileEscaped 2>&1";
-
-		// Now run the command for real
-		$this->LogInfo("Executing command: $sCommandDisplay");
-		$aOutput = array();
-		$iRetCode = 0;
-		exec($sCommand, $aOutput, $iRetCode);
-		foreach($aOutput as $sLine)
-		{
-			$this->LogInfo("mysql said: $sLine");
-		}
-		if ($iRetCode != 0)
-		{
-			$this->LogError("Failed to execute: $sCommandDisplay. The command returned:$iRetCode");
-			foreach($aOutput as $sLine)
-			{
-				$this->LogError("mysql said: $sLine");
-			}
-			if (count($aOutput) == 1) 
-			{
-				$sMoreInfo = trim($aOutput[0]);
-			}
-			else
-			{
-				$sMoreInfo = "Check the log file '".realpath(APPROOT.'/log/error.log')."' for more information.";
-			}
-			throw new BackupException("Failed to execute mysql: ".$sMoreInfo);
-		}
-	}
-
-	/**
-	 * @deprecated Use RestoreFromCompressedBackup instead
-	 *
-	 * @param $sZipFile
-	 * @param string $sEnvironment
-	 */
-	public function RestoreFromZip($sZipFile, $sEnvironment = 'production')
-	{
-		$this->RestoreFromCompressedBackup($sZipFile, $sEnvironment);
-	}
-
-	/**
-	 * <strong>Warning</strong> : can't be called with a loaded DataModel as we're compiling after restore
-	 *
-	 * @param string $sFile A file with the extension .zip or .tar.gz
-	 * @param string $sEnvironment Target environment
-	 *
-	 * @throws \BackupException
-	 *
-	 * @uses \RunTimeEnvironment::CompileFrom()
-	 */
-	public function RestoreFromCompressedBackup($sFile, $sEnvironment = 'production')
-	{
-		$this->LogInfo("Starting restore of ".basename($sFile));
-
-		$sNormalizedFile = strtolower(basename($sFile));
-		if (substr($sNormalizedFile, -4) == '.zip')
-		{
-			$this->LogInfo('zip file detected');
-			$oArchive = new ZipArchiveEx();
-			$oArchive->open($sFile);
-		}
-		elseif (substr($sNormalizedFile, -7) == '.tar.gz')
-		{
-			$this->LogInfo('tar.gz file detected');
-			$oArchive = new TarGzArchive($sFile);
-		}
-		else
-		{
-			throw new BackupException('Unsupported format for a backup file: '.$sFile);
-		}
-
-		// Load the database
-		//
-		$sDataDir = APPROOT.'data/tmp-backup-'.rand(10000, getrandmax());
-
-		SetupUtils::builddir($sDataDir); // Here is the directory
-		$oArchive->extractTo($sDataDir);
-
-		$sDataFile = $sDataDir.'/itop-dump.sql';
-		$this->LoadDatabase($sDataFile);
-
-		// Update the code
-		//
-		$sDeltaFile = APPROOT.'data/'.$sEnvironment.'.delta.xml';
-
-		if (is_file($sDataDir.'/delta.xml'))
-		{
-			// Extract and rename delta.xml => <env>.delta.xml;
-			rename($sDataDir.'/delta.xml', $sDeltaFile);
-		}
-		else
-		{
-			@unlink($sDeltaFile);
-		}
-		if (is_dir(APPROOT.'data/production-modules/'))
-		{
-			try
-			{
-				SetupUtils::rrmdir(APPROOT.'data/production-modules/');
-			}
-			catch (Exception $e)
-			{
-				throw new BackupException("Can't remove production-modules dir", 0, $e);
-			}
-		}
-		if (is_dir($sDataDir.'/production-modules'))
-		{
-			rename($sDataDir.'/production-modules', APPROOT.'data/production-modules/');
-		}
-
-		$sConfigFile = APPROOT.'conf/'.$sEnvironment.'/config-itop.php';
-		@chmod($sConfigFile, 0770); // Allow overwriting the file
-		rename($sDataDir.'/config-itop.php', $sConfigFile);
-		@chmod($sConfigFile, 0444); // Read-only
-
-		try
-		{
-			SetupUtils::rrmdir($sDataDir);
-		}
-		catch (Exception $e)
-		{
-			throw new BackupException("Can't remove data dir", 0, $e);
-		}
-
-		$oEnvironment = new RunTimeEnvironment($sEnvironment);
-		$oEnvironment->CompileFrom($sEnvironment);
-	}
-}
+<?php
+// Copyright (C) 2014-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+class DBRestore extends DBBackup
+{
+	/** @var string */
+	private $sDBPwd;
+	/** @var string */
+	private $sDBUser;
+
+	public function __construct(\Config $oConfig = null)
+	{
+		parent::__construct($oConfig);
+
+		$this->sDBUser = $oConfig->Get('db_user');
+		$this->sDBPwd = $oConfig->Get('db_pwd');
+	}
+
+	protected function LogInfo($sMsg)
+	{
+		//IssueLog::Info('non juste info: '.$sMsg);
+	}
+
+	protected function LogError($sMsg)
+	{
+		IssueLog::Error($sMsg);
+	}
+
+	protected function LoadDatabase($sDataFile)
+	{
+		$this->LogInfo("Loading data onto $this->sDBHost/$this->sDBName(suffix:'$this->sDBSubName')");
+
+		// Just to check the connection to the DB (more accurate than getting the retcode of mysql)
+		$oMysqli = $this->DBConnect();
+
+		$sHost = self::EscapeShellArg($this->sDBHost);
+		$sUser = self::EscapeShellArg($this->sDBUser);
+		$sPwd = self::EscapeShellArg($this->sDBPwd);
+		$sDBName = self::EscapeShellArg($this->sDBName);
+		if (empty($this->sMySQLBinDir))
+		{
+			$sMySQLExe = 'mysql';
+		}
+		else
+		{
+			$sMySQLExe = '"'.$this->sMySQLBinDir.'/mysql"';
+		}
+		if (is_null($this->iDBPort))
+		{
+			$sPortOption = '';
+		}
+		else
+		{
+			$sPortOption = '--port='.$this->iDBPort.' ';
+		}
+
+		$sDataFileEscaped = self::EscapeShellArg($sDataFile);
+		$sCommand = "$sMySQLExe --default-character-set=".DEFAULT_CHARACTER_SET." --host=$sHost $sPortOption --user=$sUser --password=$sPwd $sDBName <$sDataFileEscaped 2>&1";
+		$sCommandDisplay = "$sMySQLExe --default-character-set=".DEFAULT_CHARACTER_SET." --host=$sHost $sPortOption --user=xxxx --password=xxxx $sDBName <$sDataFileEscaped 2>&1";
+
+		// Now run the command for real
+		$this->LogInfo("Executing command: $sCommandDisplay");
+		$aOutput = array();
+		$iRetCode = 0;
+		exec($sCommand, $aOutput, $iRetCode);
+		foreach($aOutput as $sLine)
+		{
+			$this->LogInfo("mysql said: $sLine");
+		}
+		if ($iRetCode != 0)
+		{
+			$this->LogError("Failed to execute: $sCommandDisplay. The command returned:$iRetCode");
+			foreach($aOutput as $sLine)
+			{
+				$this->LogError("mysql said: $sLine");
+			}
+			if (count($aOutput) == 1) 
+			{
+				$sMoreInfo = trim($aOutput[0]);
+			}
+			else
+			{
+				$sMoreInfo = "Check the log file '".realpath(APPROOT.'/log/error.log')."' for more information.";
+			}
+			throw new BackupException("Failed to execute mysql: ".$sMoreInfo);
+		}
+	}
+
+	/**
+	 * @deprecated Use RestoreFromCompressedBackup instead
+	 *
+	 * @param $sZipFile
+	 * @param string $sEnvironment
+	 */
+	public function RestoreFromZip($sZipFile, $sEnvironment = 'production')
+	{
+		$this->RestoreFromCompressedBackup($sZipFile, $sEnvironment);
+	}
+
+	/**
+	 * <strong>Warning</strong> : can't be called with a loaded DataModel as we're compiling after restore
+	 *
+	 * @param string $sFile A file with the extension .zip or .tar.gz
+	 * @param string $sEnvironment Target environment
+	 *
+	 * @throws \BackupException
+	 *
+	 * @uses \RunTimeEnvironment::CompileFrom()
+	 */
+	public function RestoreFromCompressedBackup($sFile, $sEnvironment = 'production')
+	{
+		$this->LogInfo("Starting restore of ".basename($sFile));
+
+		$sNormalizedFile = strtolower(basename($sFile));
+		if (substr($sNormalizedFile, -4) == '.zip')
+		{
+			$this->LogInfo('zip file detected');
+			$oArchive = new ZipArchiveEx();
+			$oArchive->open($sFile);
+		}
+		elseif (substr($sNormalizedFile, -7) == '.tar.gz')
+		{
+			$this->LogInfo('tar.gz file detected');
+			$oArchive = new TarGzArchive($sFile);
+		}
+		else
+		{
+			throw new BackupException('Unsupported format for a backup file: '.$sFile);
+		}
+
+		// Load the database
+		//
+		$sDataDir = APPROOT.'data/tmp-backup-'.rand(10000, getrandmax());
+
+		SetupUtils::builddir($sDataDir); // Here is the directory
+		$oArchive->extractTo($sDataDir);
+
+		$sDataFile = $sDataDir.'/itop-dump.sql';
+		$this->LoadDatabase($sDataFile);
+
+		// Update the code
+		//
+		$sDeltaFile = APPROOT.'data/'.$sEnvironment.'.delta.xml';
+
+		if (is_file($sDataDir.'/delta.xml'))
+		{
+			// Extract and rename delta.xml => <env>.delta.xml;
+			rename($sDataDir.'/delta.xml', $sDeltaFile);
+		}
+		else
+		{
+			@unlink($sDeltaFile);
+		}
+		if (is_dir(APPROOT.'data/production-modules/'))
+		{
+			try
+			{
+				SetupUtils::rrmdir(APPROOT.'data/production-modules/');
+			}
+			catch (Exception $e)
+			{
+				throw new BackupException("Can't remove production-modules dir", 0, $e);
+			}
+		}
+		if (is_dir($sDataDir.'/production-modules'))
+		{
+			rename($sDataDir.'/production-modules', APPROOT.'data/production-modules/');
+		}
+
+		$sConfigFile = APPROOT.'conf/'.$sEnvironment.'/config-itop.php';
+		@chmod($sConfigFile, 0770); // Allow overwriting the file
+		rename($sDataDir.'/config-itop.php', $sConfigFile);
+		@chmod($sConfigFile, 0444); // Read-only
+
+		try
+		{
+			SetupUtils::rrmdir($sDataDir);
+		}
+		catch (Exception $e)
+		{
+			throw new BackupException("Can't remove data dir", 0, $e);
+		}
+
+		$oEnvironment = new RunTimeEnvironment($sEnvironment);
+		$oEnvironment->CompileFrom($sEnvironment);
+	}
+}
diff --git a/datamodels/2.x/itop-backup/module.itop-backup.php b/datamodels/2.x/itop-backup/module.itop-backup.php
index f9b3a904a..5b3e6e376 100644
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -1,58 +1,58 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Backup utilities',
-		'category' => 'Application management',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => true,
-		'visible' => false,
-
-		// Components
-		//
-		'datamodel' => array(
-			'main.itop-backup.php',
-			'model.itop-backup.php',
-		),
-		'webservice' => array(
-			//'webservices.itop-backup.php',
-		),
-		'dictionary' => array(
-			'en.dict.itop-backup.php',
-			'fr.dict.itop-backup.php',
-			//'de.dict.itop-backup.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-backup.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-backup.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-			'mysql_bindir' => '',
-			'week_days' => 'monday, tuesday, wednesday, thursday, friday',
-			'time' => '23:30',
-			//'file_name_format' => '__DB__-%Y-%m-%d_%H_%M',
-			'retention_count' => 5, 
-			'enabled' => true,
-			'debug' => false
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-backup/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Backup utilities',
+		'category' => 'Application management',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => false,
+
+		// Components
+		//
+		'datamodel' => array(
+			'main.itop-backup.php',
+			'model.itop-backup.php',
+		),
+		'webservice' => array(
+			//'webservices.itop-backup.php',
+		),
+		'dictionary' => array(
+			'en.dict.itop-backup.php',
+			'fr.dict.itop-backup.php',
+			//'de.dict.itop-backup.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-backup.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-backup.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+			'mysql_bindir' => '',
+			'week_days' => 'monday, tuesday, wednesday, thursday, friday',
+			'time' => '23:30',
+			//'file_name_format' => '__DB__-%Y-%m-%d_%H_%M',
+			'retention_count' => 5, 
+			'enabled' => true,
+			'debug' => false
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-backup/status.php b/datamodels/2.x/itop-backup/status.php
index 58c3eec6c..2bea90041 100644
--- a/datamodels/2.x/itop-backup/status.php
+++ b/datamodels/2.x/itop-backup/status.php
@@ -1,398 +1,398 @@
-<?php
-// Copyright (C) 2016-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Monitor the backup
- *
- * @copyright   Copyright (C) 2016-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
-require_once(APPROOT.'application/application.inc.php');
-require_once(APPROOT.'application/itopwebpage.class.inc.php');
-
-require_once(APPROOT.'application/startup.inc.php');
-
-require_once(APPROOT.'application/loginwebpage.class.inc.php');
-
-
-/////////////////////////////////////////////////////////////////////
-// Main program
-//
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-ApplicationMenu::CheckMenuIdEnabled('BackupStatus');
-
-//$sOperation = utils::ReadParam('operation', 'menu');
-//$oAppContext = new ApplicationContext();
-
-
-
-try
-{
-	$oP = new iTopWebPage(Dict::S('bkp-status-title'));
-	$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
-
-	$oP->add("<h1>".Dict::S('bkp-status-title')."</h1>");
-
-	if (MetaModel::GetConfig()->Get('demo_mode'))
-	{
-		$oP->add("<div class=\"header_message message_info\">iTop is in <b>demonstration mode</b>: the feature is disabled.</div>");
-	}
-
-	$sImgOk = '<img src="../images/validation_ok.png"> ';
-	$sImgError = '<img src="../images/validation_error.png"> ';
-
-	$oP->add("<fieldset>");
-	$oP->add("<legend>".Dict::S('bkp-status-checks')."</legend>");
-
-	// Availability of mysqldump
-	//
-	$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
-	$sMySQLBinDir = utils::ReadParam('mysql_bindir', $sMySQLBinDir, true);
-	if (empty($sMySQLBinDir))
-	{
-		$sMySQLDump = 'mysqldump';
-	}
-	else
-	{
-		//echo 'Info - Found mysql_bindir: '.$sMySQLBinDir;
-		$sMySQLDump = '"'.$sMySQLBinDir.'/mysqldump"';
-	}
-	$sCommand = "$sMySQLDump -V 2>&1";
-
-	$aOutput = array();
-	$iRetCode = 0;
-	exec($sCommand, $aOutput, $iRetCode);
-	if ($iRetCode == 0)
-	{
-		$sMySqlDump = $sImgOk.Dict::Format("bkp-mysqldump-ok", $aOutput[0]);
-	}
-	elseif ($iRetCode == 1)
-	{
-		$sMySqlDump = $sImgError.Dict::Format("bkp-mysqldump-notfound", implode(' ', $aOutput));
-	}
-	else
-	{
-		$sMySqlDump = $sImgError.Dict::Format("bkp-mysqldump-issue", $iRetCode);
-	}
-	foreach($aOutput as $sLine)
-	{
-		IssueLog::Info("$sCommand said: $sLine");
-	}
-	$oP->p($sMySqlDump);
-
-	// Destination directory
-	//
-	// Make sure the target directory exists and is writeable
-	$sBackupDir = APPROOT.'data/backups/';
-	SetupUtils::builddir($sBackupDir);
-	if (!is_dir($sBackupDir))
-	{
-		$oP->p($sImgError.Dict::Format('bkp-missing-dir', $sBackupDir));
-	}
-	else
-	{
-		$oP->p(Dict::Format('bkp-free-disk-space', SetupUtils::HumanReadableSize(SetupUtils::CheckDiskSpace($sBackupDir)), $sBackupDir));
-		if (!is_writable($sBackupDir))
-		{
-			$oP->p($sImgError.Dict::Format('bkp-dir-not-writeable', $sBackupDir));
-		}
-	}
-	$sBackupDirAuto = $sBackupDir.'auto/';
-	SetupUtils::builddir($sBackupDirAuto);
-	$sBackupDirManual = $sBackupDir.'manual/';
-	SetupUtils::builddir($sBackupDirManual);
-
-	// Wrong format
-	//
-	$sBackupFile = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'file_name_format', BACKUP_DEFAULT_FORMAT);
-	$oBackup = new DBBackupScheduled();
-	$sZipName = $oBackup->MakeName($sBackupFile);
-	if ($sZipName == '')
-	{
-		$oP->p($sImgError.Dict::Format('bkp-wrong-format-spec', $sBackupFile, BACKUP_DEFAULT_FORMAT));
-	}
-	else
-	{
-		$oP->p(Dict::Format('bkp-name-sample', $sZipName));
-	}
-
-	// Week Days
-	//
-	$aWeekDayToString = array(
-		1 => Dict::S('DayOfWeek-Monday'),
-		2 => Dict::S('DayOfWeek-Tuesday'),
-		3 => Dict::S('DayOfWeek-Wednesday'),
-		4 => Dict::S('DayOfWeek-Thursday'),
-		5 => Dict::S('DayOfWeek-Friday'),
-		6 => Dict::S('DayOfWeek-Saturday'),
-		7 => Dict::S('DayOfWeek-Sunday')
-	);
-	$aDayLabels = array();
-	$oBackupExec = new BackupExec();
-	foreach ($oBackupExec->InterpretWeekDays() as $iDay)
-	{
-		$aDayLabels[] = $aWeekDayToString[$iDay];
-	}
-	$sDays = implode(', ', $aDayLabels);
-	$sBackupTime = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'time', '23:30');
-	$oP->p(Dict::Format('bkp-week-days', $sDays, $sBackupTime));
-
-	$iRetention = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'retention_count', 5);
-	$oP->p(Dict::Format('bkp-retention', $iRetention));
-
-	$oP->add("</fieldset>");
-
-	// List of backups
-	//
-	$aFiles = $oBackup->ListFiles($sBackupDirAuto);
-	$aFilesToDelete = array();
-	while (count($aFiles) > $iRetention - 1)
-	{
-		$aFilesToDelete[] = array_shift($aFiles);
-	}
-
-	$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
-	if ($oRestoreMutex->IsLocked())
-	{
-		$sDisableRestore = 'disabled="disabled"';
-	}
-	else
-	{
-		$sDisableRestore = '';
-	}
-	
-	// 1st table: list the backups made in the background
-	//
-	$aDetails = array();
-	foreach ($oBackup->ListFiles($sBackupDirAuto) as $sBackupFile)
-	{
-		$sFileName = basename($sBackupFile);
-		$sFilePath = 'auto/'.$sFileName;
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			$sName = $sFileName;
-		}
-		else
-		{
-			$sAjax = utils::GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php', array('operation' => 'download', 'file' => $sFilePath));
-			$sName = "<a href=\"$sAjax\">".$sFileName.'</a>';
-		}
-		$sSize = SetupUtils::HumanReadableSize(filesize($sBackupFile));
-		$sConfirmRestore = addslashes(Dict::Format('bkp-confirm-restore', $sFileName));
-		$sFileEscaped = addslashes($sFilePath);
-		$sRestoreBtn = '<button class="restore" onclick="LaunchRestoreNow(\''.$sFileEscaped.'\', \''.$sConfirmRestore.'\');" '.$sDisableRestore.'>'.Dict::S('bkp-button-restore-now').'</button>';
-		if (in_array($sBackupFile, $aFilesToDelete))
-		{
-			$aDetails[] = array('file' => $sName.' <span class="next_to_delete" title="'.Dict::S('bkp-next-to-delete').'">*</span>', 'size' => $sSize, 'actions' => $sRestoreBtn);
-		}
-		else
-		{
-			$aDetails[] = array('file' => $sName, 'size' => $sSize, 'actions' => $sRestoreBtn);
-		}
-	}
-	$aConfig = array(
-		'file' => array('label' => Dict::S('bkp-table-file'), 'description' => Dict::S('bkp-table-file+')),
-		'size' => array('label' => Dict::S('bkp-table-size'), 'description' => Dict::S('bkp-table-size+')),
-		'actions' => array('label' => Dict::S('bkp-table-actions'), 'description' => Dict::S('bkp-table-actions+')),
-	);
-	$oP->add("<fieldset>");
-	$oP->add("<legend>".Dict::S('bkp-status-backups-auto')."</legend>");
-	if (count($aDetails) > 0)
-	{
-		$oP->add('<div style="max-height:400px; overflow: auto;">');
-		$oP->table($aConfig, array_reverse($aDetails));
-		$oP->add('</div>');
-	}
-	else
-	{
-		$oP->p(Dict::S('bkp-status-backups-none'));
-	}
-	$oP->add("</fieldset>");
-
-	// 2nd table: list the backups made manually
-	//
-	$aDetails = array();
-	foreach ($oBackup->ListFiles($sBackupDirManual) as $sBackupFile)
-	{
-		$sFileName = basename($sBackupFile);
-		$sFilePath = 'manual/'.$sFileName;
-		if (MetaModel::GetConfig()->Get('demo_mode'))
-		{
-			$sName = $sFileName;
-		}
-		else
-		{
-			$sAjax = utils::GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php', array('operation' => 'download', 'file' => $sFilePath));
-			$sName = "<a href=\"$sAjax\">".$sFileName.'</a>';
-		}
-		$sSize = SetupUtils::HumanReadableSize(filesize($sBackupFile));
-		$sConfirmRestore = addslashes(Dict::Format('bkp-confirm-restore', $sFileName));
-		$sFileEscaped = addslashes($sFilePath);
-		$sRestoreBtn = '<button class="restore" onclick="LaunchRestoreNow(\''.$sFileEscaped.'\', \''.$sConfirmRestore.'\');" '.$sDisableRestore.'>'.Dict::S('bkp-button-restore-now').'</button>';
-		$aDetails[] = array('file' => $sName, 'size' => $sSize, 'actions' => $sRestoreBtn);
-	}
-	$aConfig = array(
-		'file' => array('label' => Dict::S('bkp-table-file'), 'description' => Dict::S('bkp-table-file+')),
-		'size' => array('label' => Dict::S('bkp-table-size'), 'description' => Dict::S('bkp-table-size+')),
-		'actions' => array('label' => Dict::S('bkp-table-actions'), 'description' => Dict::S('bkp-table-actions+')),
-	);
-	$oP->add("<fieldset>");
-	$oP->add("<legend>".Dict::S('bkp-status-backups-manual')."</legend>");
-	if (count($aDetails) > 0)
-	{
-		$oP->add('<div style="max-height:400px; overflow: auto;">');
-		$oP->table($aConfig, array_reverse($aDetails));
-		$oP->add('</div>');
-	}
-	else
-	{
-		$oP->p(Dict::S('bkp-status-backups-none'));
-	}
-	$oP->add("</fieldset>");
-
-	// Ongoing operation ?
-	//
-	$oBackupMutex = new iTopMutex('backup.'.utils::GetCurrentEnvironment());
-	if ($oBackupMutex->IsLocked())
-	{
-		$oP->p(Dict::S('bkp-backup-running'));
-	}
-	$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
-	if ($oRestoreMutex->IsLocked())
-	{
-		$oP->p(Dict::S('bkp-restore-running'));
-	}
-
-	// Do backup now
-	//
-	$oBackupExec = new BackupExec();
-	$oNext = $oBackupExec->GetNextOccurrence();
-	$oP->p(Dict::Format('bkp-next-backup', $aWeekDayToString[$oNext->Format('N')], $oNext->Format('Y-m-d'), $oNext->Format('H:i')));
-	$oP->p('<button onclick="LaunchBackupNow();">'.Dict::S('bkp-button-backup-now').'</button>');
-	$oP->add('<div id="backup_success" class="header_message message_ok" style="display: none;"></div>');
-	$oP->add('<div id="backup_errors" class="header_message message_error" style="display: none;"></div>');
-	$oP->add('<input type="hidden" name="restore_token" id="restore_token"/>');
-	
-	$sConfirmBackup = addslashes(Dict::S('bkp-confirm-backup'));
-	$sPleaseWaitBackup = addslashes(Dict::S('bkp-wait-backup'));
-	$sPleaseWaitRestore = addslashes(Dict::S('bkp-wait-restore'));
-	$sRestoreDone = addslashes(Dict::S('bkp-success-restore'));
-
-	$sMySQLBinDir = addslashes(MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''));
-	$sDBHost = addslashes(MetaModel::GetConfig()->Get('db_host'));
-	$sDBUser = addslashes(MetaModel::GetConfig()->Get('db_user'));
-	$sDBPwd = addslashes(MetaModel::GetConfig()->Get('db_pwd'));
-	$sDBName = addslashes(MetaModel::GetConfig()->Get('db_name'));
-	$sDBSubName = addslashes(MetaModel::GetConfig()->Get('db_subname'));
-
-	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
-	
-	$oP->add_script(
-<<<EOF
-function LaunchBackupNow()
-{
-	$('#backup_success').hide();
-	$('#backup_errors').hide();
-
-	if (confirm('$sConfirmBackup'))
-	{
-		$.blockUI({ message: '<h1><img src="../images/indicator.gif" /> $sPleaseWaitBackup</h1>' });
-
-		var oParams = {};
-		oParams.operation = 'backup';
-		$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
-			if (data.search(/error|exceptio|notice|warning/i) != -1)
-			{
-				$('#backup_errors').html(data);
-				$('#backup_errors').show();
-			}
-			else
-			{
-				window.location.reload();
-			}
-			$.unblockUI();
-		});
-	}
-}
-function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
-{
-	if (confirm(sConfirmationMessage))
-	{
-		$.blockUI({ message: '<h1><img src="../images/indicator.gif" /> $sPleaseWaitRestore</h1>' });
-
-		$('#backup_success').hide();
-		$('#backup_errors').hide();
-
-		var oParams = {};
-		oParams.operation = 'restore_get_token';
-		oParams.file = sBackupFile;
-		$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
-
-			// Get the value of restore_token
-			$('#backup_errors').append(data);
-
-			var oParams = {};
-			oParams.operation = 'restore_exec';
-			oParams.token = $("#restore_token").val(); // token to check auth + rights without loading MetaModel
-			oParams.environment = '$sEnvironment'; // needed to load the config
-			if (oParams.token.length > 0)
-			{
-				$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
-					if (data.search(/error|exceptio|notice|warning/i) != -1)
-					{
-						$('#backup_success').hide();
-						$('#backup_errors').html(data);
-						$('#backup_errors').show();
-					}
-					else
-					{
-						$('#backup_errors').hide();
-						$('#backup_success').html('$sRestoreDone');
-						$('#backup_success').show();
-					}
-					$.unblockUI();
-				});
-			}
-			else
-			{
-				$('button.restore').attr('disabled', 'disabled');
-				$.unblockUI();
-			}
-		});
-	}
-}
-EOF
-	);
-
-	if (MetaModel::GetConfig()->Get('demo_mode'))
-	{
-		$oP->add_ready_script("$('button').attr('disabled', 'disabled').attr('title', 'Disabled in demonstration mode')");
-	}
-}
-catch(Exception $e)
-{
-	$oP = new iTopWebPage(Dict::S('bkp-status-title'));
-	$oP->p('<b>'.$e->getMessage().'</b>');
-}
-
-$oP->output();
-?>
+<?php
+// Copyright (C) 2016-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Monitor the backup
+ *
+ * @copyright   Copyright (C) 2016-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+if (!defined('APPROOT')) require_once(__DIR__.'/../../approot.inc.php');
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'application/startup.inc.php');
+
+require_once(APPROOT.'application/loginwebpage.class.inc.php');
+
+
+/////////////////////////////////////////////////////////////////////
+// Main program
+//
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+ApplicationMenu::CheckMenuIdEnabled('BackupStatus');
+
+//$sOperation = utils::ReadParam('operation', 'menu');
+//$oAppContext = new ApplicationContext();
+
+
+
+try
+{
+	$oP = new iTopWebPage(Dict::S('bkp-status-title'));
+	$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
+
+	$oP->add("<h1>".Dict::S('bkp-status-title')."</h1>");
+
+	if (MetaModel::GetConfig()->Get('demo_mode'))
+	{
+		$oP->add("<div class=\"header_message message_info\">iTop is in <b>demonstration mode</b>: the feature is disabled.</div>");
+	}
+
+	$sImgOk = '<img src="../images/validation_ok.png"> ';
+	$sImgError = '<img src="../images/validation_error.png"> ';
+
+	$oP->add("<fieldset>");
+	$oP->add("<legend>".Dict::S('bkp-status-checks')."</legend>");
+
+	// Availability of mysqldump
+	//
+	$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
+	$sMySQLBinDir = utils::ReadParam('mysql_bindir', $sMySQLBinDir, true);
+	if (empty($sMySQLBinDir))
+	{
+		$sMySQLDump = 'mysqldump';
+	}
+	else
+	{
+		//echo 'Info - Found mysql_bindir: '.$sMySQLBinDir;
+		$sMySQLDump = '"'.$sMySQLBinDir.'/mysqldump"';
+	}
+	$sCommand = "$sMySQLDump -V 2>&1";
+
+	$aOutput = array();
+	$iRetCode = 0;
+	exec($sCommand, $aOutput, $iRetCode);
+	if ($iRetCode == 0)
+	{
+		$sMySqlDump = $sImgOk.Dict::Format("bkp-mysqldump-ok", $aOutput[0]);
+	}
+	elseif ($iRetCode == 1)
+	{
+		$sMySqlDump = $sImgError.Dict::Format("bkp-mysqldump-notfound", implode(' ', $aOutput));
+	}
+	else
+	{
+		$sMySqlDump = $sImgError.Dict::Format("bkp-mysqldump-issue", $iRetCode);
+	}
+	foreach($aOutput as $sLine)
+	{
+		IssueLog::Info("$sCommand said: $sLine");
+	}
+	$oP->p($sMySqlDump);
+
+	// Destination directory
+	//
+	// Make sure the target directory exists and is writeable
+	$sBackupDir = APPROOT.'data/backups/';
+	SetupUtils::builddir($sBackupDir);
+	if (!is_dir($sBackupDir))
+	{
+		$oP->p($sImgError.Dict::Format('bkp-missing-dir', $sBackupDir));
+	}
+	else
+	{
+		$oP->p(Dict::Format('bkp-free-disk-space', SetupUtils::HumanReadableSize(SetupUtils::CheckDiskSpace($sBackupDir)), $sBackupDir));
+		if (!is_writable($sBackupDir))
+		{
+			$oP->p($sImgError.Dict::Format('bkp-dir-not-writeable', $sBackupDir));
+		}
+	}
+	$sBackupDirAuto = $sBackupDir.'auto/';
+	SetupUtils::builddir($sBackupDirAuto);
+	$sBackupDirManual = $sBackupDir.'manual/';
+	SetupUtils::builddir($sBackupDirManual);
+
+	// Wrong format
+	//
+	$sBackupFile = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'file_name_format', BACKUP_DEFAULT_FORMAT);
+	$oBackup = new DBBackupScheduled();
+	$sZipName = $oBackup->MakeName($sBackupFile);
+	if ($sZipName == '')
+	{
+		$oP->p($sImgError.Dict::Format('bkp-wrong-format-spec', $sBackupFile, BACKUP_DEFAULT_FORMAT));
+	}
+	else
+	{
+		$oP->p(Dict::Format('bkp-name-sample', $sZipName));
+	}
+
+	// Week Days
+	//
+	$aWeekDayToString = array(
+		1 => Dict::S('DayOfWeek-Monday'),
+		2 => Dict::S('DayOfWeek-Tuesday'),
+		3 => Dict::S('DayOfWeek-Wednesday'),
+		4 => Dict::S('DayOfWeek-Thursday'),
+		5 => Dict::S('DayOfWeek-Friday'),
+		6 => Dict::S('DayOfWeek-Saturday'),
+		7 => Dict::S('DayOfWeek-Sunday')
+	);
+	$aDayLabels = array();
+	$oBackupExec = new BackupExec();
+	foreach ($oBackupExec->InterpretWeekDays() as $iDay)
+	{
+		$aDayLabels[] = $aWeekDayToString[$iDay];
+	}
+	$sDays = implode(', ', $aDayLabels);
+	$sBackupTime = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'time', '23:30');
+	$oP->p(Dict::Format('bkp-week-days', $sDays, $sBackupTime));
+
+	$iRetention = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'retention_count', 5);
+	$oP->p(Dict::Format('bkp-retention', $iRetention));
+
+	$oP->add("</fieldset>");
+
+	// List of backups
+	//
+	$aFiles = $oBackup->ListFiles($sBackupDirAuto);
+	$aFilesToDelete = array();
+	while (count($aFiles) > $iRetention - 1)
+	{
+		$aFilesToDelete[] = array_shift($aFiles);
+	}
+
+	$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
+	if ($oRestoreMutex->IsLocked())
+	{
+		$sDisableRestore = 'disabled="disabled"';
+	}
+	else
+	{
+		$sDisableRestore = '';
+	}
+	
+	// 1st table: list the backups made in the background
+	//
+	$aDetails = array();
+	foreach ($oBackup->ListFiles($sBackupDirAuto) as $sBackupFile)
+	{
+		$sFileName = basename($sBackupFile);
+		$sFilePath = 'auto/'.$sFileName;
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			$sName = $sFileName;
+		}
+		else
+		{
+			$sAjax = utils::GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php', array('operation' => 'download', 'file' => $sFilePath));
+			$sName = "<a href=\"$sAjax\">".$sFileName.'</a>';
+		}
+		$sSize = SetupUtils::HumanReadableSize(filesize($sBackupFile));
+		$sConfirmRestore = addslashes(Dict::Format('bkp-confirm-restore', $sFileName));
+		$sFileEscaped = addslashes($sFilePath);
+		$sRestoreBtn = '<button class="restore" onclick="LaunchRestoreNow(\''.$sFileEscaped.'\', \''.$sConfirmRestore.'\');" '.$sDisableRestore.'>'.Dict::S('bkp-button-restore-now').'</button>';
+		if (in_array($sBackupFile, $aFilesToDelete))
+		{
+			$aDetails[] = array('file' => $sName.' <span class="next_to_delete" title="'.Dict::S('bkp-next-to-delete').'">*</span>', 'size' => $sSize, 'actions' => $sRestoreBtn);
+		}
+		else
+		{
+			$aDetails[] = array('file' => $sName, 'size' => $sSize, 'actions' => $sRestoreBtn);
+		}
+	}
+	$aConfig = array(
+		'file' => array('label' => Dict::S('bkp-table-file'), 'description' => Dict::S('bkp-table-file+')),
+		'size' => array('label' => Dict::S('bkp-table-size'), 'description' => Dict::S('bkp-table-size+')),
+		'actions' => array('label' => Dict::S('bkp-table-actions'), 'description' => Dict::S('bkp-table-actions+')),
+	);
+	$oP->add("<fieldset>");
+	$oP->add("<legend>".Dict::S('bkp-status-backups-auto')."</legend>");
+	if (count($aDetails) > 0)
+	{
+		$oP->add('<div style="max-height:400px; overflow: auto;">');
+		$oP->table($aConfig, array_reverse($aDetails));
+		$oP->add('</div>');
+	}
+	else
+	{
+		$oP->p(Dict::S('bkp-status-backups-none'));
+	}
+	$oP->add("</fieldset>");
+
+	// 2nd table: list the backups made manually
+	//
+	$aDetails = array();
+	foreach ($oBackup->ListFiles($sBackupDirManual) as $sBackupFile)
+	{
+		$sFileName = basename($sBackupFile);
+		$sFilePath = 'manual/'.$sFileName;
+		if (MetaModel::GetConfig()->Get('demo_mode'))
+		{
+			$sName = $sFileName;
+		}
+		else
+		{
+			$sAjax = utils::GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php', array('operation' => 'download', 'file' => $sFilePath));
+			$sName = "<a href=\"$sAjax\">".$sFileName.'</a>';
+		}
+		$sSize = SetupUtils::HumanReadableSize(filesize($sBackupFile));
+		$sConfirmRestore = addslashes(Dict::Format('bkp-confirm-restore', $sFileName));
+		$sFileEscaped = addslashes($sFilePath);
+		$sRestoreBtn = '<button class="restore" onclick="LaunchRestoreNow(\''.$sFileEscaped.'\', \''.$sConfirmRestore.'\');" '.$sDisableRestore.'>'.Dict::S('bkp-button-restore-now').'</button>';
+		$aDetails[] = array('file' => $sName, 'size' => $sSize, 'actions' => $sRestoreBtn);
+	}
+	$aConfig = array(
+		'file' => array('label' => Dict::S('bkp-table-file'), 'description' => Dict::S('bkp-table-file+')),
+		'size' => array('label' => Dict::S('bkp-table-size'), 'description' => Dict::S('bkp-table-size+')),
+		'actions' => array('label' => Dict::S('bkp-table-actions'), 'description' => Dict::S('bkp-table-actions+')),
+	);
+	$oP->add("<fieldset>");
+	$oP->add("<legend>".Dict::S('bkp-status-backups-manual')."</legend>");
+	if (count($aDetails) > 0)
+	{
+		$oP->add('<div style="max-height:400px; overflow: auto;">');
+		$oP->table($aConfig, array_reverse($aDetails));
+		$oP->add('</div>');
+	}
+	else
+	{
+		$oP->p(Dict::S('bkp-status-backups-none'));
+	}
+	$oP->add("</fieldset>");
+
+	// Ongoing operation ?
+	//
+	$oBackupMutex = new iTopMutex('backup.'.utils::GetCurrentEnvironment());
+	if ($oBackupMutex->IsLocked())
+	{
+		$oP->p(Dict::S('bkp-backup-running'));
+	}
+	$oRestoreMutex = new iTopMutex('restore.'.utils::GetCurrentEnvironment());
+	if ($oRestoreMutex->IsLocked())
+	{
+		$oP->p(Dict::S('bkp-restore-running'));
+	}
+
+	// Do backup now
+	//
+	$oBackupExec = new BackupExec();
+	$oNext = $oBackupExec->GetNextOccurrence();
+	$oP->p(Dict::Format('bkp-next-backup', $aWeekDayToString[$oNext->Format('N')], $oNext->Format('Y-m-d'), $oNext->Format('H:i')));
+	$oP->p('<button onclick="LaunchBackupNow();">'.Dict::S('bkp-button-backup-now').'</button>');
+	$oP->add('<div id="backup_success" class="header_message message_ok" style="display: none;"></div>');
+	$oP->add('<div id="backup_errors" class="header_message message_error" style="display: none;"></div>');
+	$oP->add('<input type="hidden" name="restore_token" id="restore_token"/>');
+	
+	$sConfirmBackup = addslashes(Dict::S('bkp-confirm-backup'));
+	$sPleaseWaitBackup = addslashes(Dict::S('bkp-wait-backup'));
+	$sPleaseWaitRestore = addslashes(Dict::S('bkp-wait-restore'));
+	$sRestoreDone = addslashes(Dict::S('bkp-success-restore'));
+
+	$sMySQLBinDir = addslashes(MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''));
+	$sDBHost = addslashes(MetaModel::GetConfig()->Get('db_host'));
+	$sDBUser = addslashes(MetaModel::GetConfig()->Get('db_user'));
+	$sDBPwd = addslashes(MetaModel::GetConfig()->Get('db_pwd'));
+	$sDBName = addslashes(MetaModel::GetConfig()->Get('db_name'));
+	$sDBSubName = addslashes(MetaModel::GetConfig()->Get('db_subname'));
+
+	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
+	
+	$oP->add_script(
+<<<EOF
+function LaunchBackupNow()
+{
+	$('#backup_success').hide();
+	$('#backup_errors').hide();
+
+	if (confirm('$sConfirmBackup'))
+	{
+		$.blockUI({ message: '<h1><img src="../images/indicator.gif" /> $sPleaseWaitBackup</h1>' });
+
+		var oParams = {};
+		oParams.operation = 'backup';
+		$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
+			if (data.search(/error|exceptio|notice|warning/i) != -1)
+			{
+				$('#backup_errors').html(data);
+				$('#backup_errors').show();
+			}
+			else
+			{
+				window.location.reload();
+			}
+			$.unblockUI();
+		});
+	}
+}
+function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
+{
+	if (confirm(sConfirmationMessage))
+	{
+		$.blockUI({ message: '<h1><img src="../images/indicator.gif" /> $sPleaseWaitRestore</h1>' });
+
+		$('#backup_success').hide();
+		$('#backup_errors').hide();
+
+		var oParams = {};
+		oParams.operation = 'restore_get_token';
+		oParams.file = sBackupFile;
+		$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
+
+			// Get the value of restore_token
+			$('#backup_errors').append(data);
+
+			var oParams = {};
+			oParams.operation = 'restore_exec';
+			oParams.token = $("#restore_token").val(); // token to check auth + rights without loading MetaModel
+			oParams.environment = '$sEnvironment'; // needed to load the config
+			if (oParams.token.length > 0)
+			{
+				$.post(GetAbsoluteUrlModulePage('itop-backup', 'ajax.backup.php'), oParams, function(data){
+					if (data.search(/error|exceptio|notice|warning/i) != -1)
+					{
+						$('#backup_success').hide();
+						$('#backup_errors').html(data);
+						$('#backup_errors').show();
+					}
+					else
+					{
+						$('#backup_errors').hide();
+						$('#backup_success').html('$sRestoreDone');
+						$('#backup_success').show();
+					}
+					$.unblockUI();
+				});
+			}
+			else
+			{
+				$('button.restore').attr('disabled', 'disabled');
+				$.unblockUI();
+			}
+		});
+	}
+}
+EOF
+	);
+
+	if (MetaModel::GetConfig()->Get('demo_mode'))
+	{
+		$oP->add_ready_script("$('button').attr('disabled', 'disabled').attr('title', 'Disabled in demonstration mode')");
+	}
+}
+catch(Exception $e)
+{
+	$oP = new iTopWebPage(Dict::S('bkp-status-title'));
+	$oP->p('<b>'.$e->getMessage().'</b>');
+}
+
+$oP->output();
+?>
diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
index dbb86863a..f2ad7934c 100644
--- a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
@@ -1,45 +1,45 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Links between virtualization and storage',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-storage-mgmt/2.2.0',
-			'itop-virtualization-mgmt/2.2.0',
-		),
-		'mandatory' => false,
-		'visible' => false,
-		'auto_select' => 'SetupInfo::ModuleIsSelected("itop-storage-mgmt") && SetupInfo::ModuleIsSelected("itop-virtualization-mgmt")',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-bridge-virtualization-storage.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-change-mgmt.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-change-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-bridge-virtualization-storage/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Links between virtualization and storage',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-storage-mgmt/2.2.0',
+			'itop-virtualization-mgmt/2.2.0',
+		),
+		'mandatory' => false,
+		'visible' => false,
+		'auto_select' => 'SetupInfo::ModuleIsSelected("itop-storage-mgmt") && SetupInfo::ModuleIsSelected("itop-virtualization-mgmt")',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-bridge-virtualization-storage.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-change-mgmt.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-change-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
index 99e4a37c6..d9601f149 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/en.dict.itop-change-mgmt-itil.php
@@ -1,299 +1,299 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Menu:ChangeManagement' => 'Change management',
-	'Menu:Change:Overview' => 'Overview',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'New change',
-	'Menu:NewChange+' => 'Create a new change ticket',
-	'Menu:SearchChanges' => 'Search for changes',
-	'Menu:SearchChanges+' => 'Search for change tickets',
-	'Menu:Change:Shortcuts' => 'Shortcuts',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Changes awaiting approval',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Open changes',
-	'Menu:Changes+' => 'All open changes',
-	'Menu:MyChanges' => 'Changes assigned to me',
-	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days',
-	'Tickets:Related:OpenChanges' => 'Open changes',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Change' => 'Change',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:status' => 'Status',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'New',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:validated' => 'Validated',
-	'Class:Change/Attribute:status/Value:validated+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Rejected',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Assigned',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Planned and scheduled',
-	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Approved',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Not approved',
-	'Class:Change/Attribute:status/Value:notapproved+' => '',
-	'Class:Change/Attribute:status/Value:implemented' => 'Implemented',
-	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => 'Monitored',
-	'Class:Change/Attribute:status/Value:monitored+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Closed',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Reject reason',
-	'Class:Change/Attribute:reason+' => '',
-	'Class:Change/Attribute:requestor_id' => 'Requestor',
-	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => 'Requestor email',
-	'Class:Change/Attribute:requestor_email+' => '',
-	'Class:Change/Attribute:creation_date' => 'Creation date',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:impact' => 'Impact',
-	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => 'Supervisor team',
-	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => 'Supervisor team name',
-	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => 'Supervisor',
-	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => 'Supervisor email',
-	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => 'Manager team',
-	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => 'Manager team name',
-	'Class:Change/Attribute:manager_group_name+' => '',
-	'Class:Change/Attribute:manager_id' => 'Manager',
-	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => 'Manager email',
-	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => 'Outage',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'No',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:fallback' => 'Fallback plan',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Attribute:parent_id' => 'Parent change',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => 'Parent change Ref',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Related requests',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change',
-	'Class:Change/Attribute:related_problems_list' => 'Related problems',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change',
-	'Class:Change/Attribute:related_incident_list' => 'Related incidents',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type',
-	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
-	'Class:Change/Stimulus:ev_validate' => 'Validate',
-	'Class:Change/Stimulus:ev_validate+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Reject',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Assign',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Reopen',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Plan',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Approve',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Replan',
-	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => 'Reject',
-	'Class:Change/Stimulus:ev_notapprove+' => '',
-	'Class:Change/Stimulus:ev_implement' => 'Implement',
-	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => 'Monitor',
-	'Class:Change/Stimulus:ev_monitor+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Finish',
-	'Class:Change/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: RoutineChange
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:RoutineChange' => 'Routine Change',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => 'Validate',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject',
-	'Class:RoutineChange/Stimulus:ev_reject+' => '',
-	'Class:RoutineChange/Stimulus:ev_assign' => 'Assign',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => 'Reopen',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Plan',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve',
-	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Replan',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve',
-	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
-	'Class:RoutineChange/Stimulus:ev_implement' => 'Implement',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => 'Monitor',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => 'Finish',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: ApprovedChange
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ApprovedChange' => 'Approved Changes',
-	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => 'Approval Date',
-	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => 'Approval comment',
-	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => 'Validate',
-	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => 'Reject',
-	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => 'Assign',
-	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Reopen',
-	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Plan',
-	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approve',
-	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replan',
-	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Reject approval',
-	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implement',
-	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Monitor',
-	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
-	'Class:ApprovedChange/Stimulus:ev_finish' => 'Finish',
-	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: NormalChange
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:NormalChange' => 'Normal Change',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => 'Acceptance date',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => 'Acceptance comment',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => 'Validate',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => 'Reject',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => 'Assign',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => 'Reopen',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Plan',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => 'Approve',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Replan',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => 'Reject approval',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => 'Implement',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => 'Monitor',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => 'Finish',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: EmergencyChange
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EmergencyChange' => 'Emergency Change',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validate',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => 'Reject',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => 'Assign',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Reopen',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Plan',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approve',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replan',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Reject approval',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implement',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Monitor',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => 'Finish',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:ChangeManagement' => 'Change management',
+	'Menu:Change:Overview' => 'Overview',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'New change',
+	'Menu:NewChange+' => 'Create a new change ticket',
+	'Menu:SearchChanges' => 'Search for changes',
+	'Menu:SearchChanges+' => 'Search for change tickets',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Changes awaiting approval',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Open changes',
+	'Menu:Changes+' => 'All open changes',
+	'Menu:MyChanges' => 'Changes assigned to me',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days',
+	'Tickets:Related:OpenChanges' => 'Open changes',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Change' => 'Change',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'New',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:validated' => 'Validated',
+	'Class:Change/Attribute:status/Value:validated+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rejected',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Assigned',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Planned and scheduled',
+	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Approved',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Not approved',
+	'Class:Change/Attribute:status/Value:notapproved+' => '',
+	'Class:Change/Attribute:status/Value:implemented' => 'Implemented',
+	'Class:Change/Attribute:status/Value:implemented+' => '',
+	'Class:Change/Attribute:status/Value:monitored' => 'Monitored',
+	'Class:Change/Attribute:status/Value:monitored+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Closed',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:reason' => 'Reject reason',
+	'Class:Change/Attribute:reason+' => '',
+	'Class:Change/Attribute:requestor_id' => 'Requestor',
+	'Class:Change/Attribute:requestor_id+' => '',
+	'Class:Change/Attribute:requestor_email' => 'Requestor email',
+	'Class:Change/Attribute:requestor_email+' => '',
+	'Class:Change/Attribute:creation_date' => 'Creation date',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:impact' => 'Impact',
+	'Class:Change/Attribute:impact+' => '',
+	'Class:Change/Attribute:supervisor_group_id' => 'Supervisor team',
+	'Class:Change/Attribute:supervisor_group_id+' => '',
+	'Class:Change/Attribute:supervisor_group_name' => 'Supervisor team name',
+	'Class:Change/Attribute:supervisor_group_name+' => '',
+	'Class:Change/Attribute:supervisor_id' => 'Supervisor',
+	'Class:Change/Attribute:supervisor_id+' => '',
+	'Class:Change/Attribute:supervisor_email' => 'Supervisor email',
+	'Class:Change/Attribute:supervisor_email+' => '',
+	'Class:Change/Attribute:manager_group_id' => 'Manager team',
+	'Class:Change/Attribute:manager_group_id+' => '',
+	'Class:Change/Attribute:manager_group_name' => 'Manager team name',
+	'Class:Change/Attribute:manager_group_name+' => '',
+	'Class:Change/Attribute:manager_id' => 'Manager',
+	'Class:Change/Attribute:manager_id+' => '',
+	'Class:Change/Attribute:manager_email' => 'Manager email',
+	'Class:Change/Attribute:manager_email+' => '',
+	'Class:Change/Attribute:outage' => 'Outage',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'No',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Class:Change/Attribute:fallback' => 'Fallback plan',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Attribute:parent_id' => 'Parent change',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => 'Parent change Ref',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Related requests',
+	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change',
+	'Class:Change/Attribute:related_problems_list' => 'Related problems',
+	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change',
+	'Class:Change/Attribute:related_incident_list' => 'Related incidents',
+	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change',
+	'Class:Change/Attribute:child_changes_list' => 'Child changes',
+	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type',
+	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
+	'Class:Change/Stimulus:ev_validate' => 'Validate',
+	'Class:Change/Stimulus:ev_validate+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Reject',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Assign',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Reopen',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Plan',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Approve',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_replan' => 'Replan',
+	'Class:Change/Stimulus:ev_replan+' => '',
+	'Class:Change/Stimulus:ev_notapprove' => 'Reject',
+	'Class:Change/Stimulus:ev_notapprove+' => '',
+	'Class:Change/Stimulus:ev_implement' => 'Implement',
+	'Class:Change/Stimulus:ev_implement+' => '',
+	'Class:Change/Stimulus:ev_monitor' => 'Monitor',
+	'Class:Change/Stimulus:ev_monitor+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Finish',
+	'Class:Change/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: RoutineChange
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:RoutineChange' => 'Routine Change',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => 'Validate',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject',
+	'Class:RoutineChange/Stimulus:ev_reject+' => '',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Assign',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => 'Reopen',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Plan',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve',
+	'Class:RoutineChange/Stimulus:ev_approve+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Replan',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve',
+	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Implement',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => 'Monitor',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => 'Finish',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: ApprovedChange
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ApprovedChange' => 'Approved Changes',
+	'Class:ApprovedChange+' => '',
+	'Class:ApprovedChange/Attribute:approval_date' => 'Approval Date',
+	'Class:ApprovedChange/Attribute:approval_date+' => '',
+	'Class:ApprovedChange/Attribute:approval_comment' => 'Approval comment',
+	'Class:ApprovedChange/Attribute:approval_comment+' => '',
+	'Class:ApprovedChange/Stimulus:ev_validate' => 'Validate',
+	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Reject',
+	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
+	'Class:ApprovedChange/Stimulus:ev_assign' => 'Assign',
+	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Reopen',
+	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Plan',
+	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approve',
+	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Replan',
+	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Reject approval',
+	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
+	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implement',
+	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Monitor',
+	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
+	'Class:ApprovedChange/Stimulus:ev_finish' => 'Finish',
+	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: NormalChange
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:NormalChange' => 'Normal Change',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => 'Acceptance date',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => 'Acceptance comment',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => 'Validate',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Reject',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => 'Assign',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => 'Reopen',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Plan',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => 'Approve',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Replan',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Reject approval',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Implement',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => 'Monitor',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => 'Finish',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: EmergencyChange
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EmergencyChange' => 'Emergency Change',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validate',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Reject',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => 'Assign',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Reopen',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Plan',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approve',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Replan',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Reject approval',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implement',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Monitor',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => 'Finish',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+));
+
+?>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php
index 949aac184..d38d944f3 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/it.dict.itop-change-mgmt-itil.php
@@ -1,320 +1,320 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:RoutineChange' => 'Routine di cambi',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => 'Convalida',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Respingi',
-	'Class:RoutineChange/Stimulus:ev_assign' => 'Assegna',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => 'Riapri',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Pianifica',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Approva',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Ripianifica',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Non Approva',
-	'Class:RoutineChange/Stimulus:ev_implement' => 'Implementa',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => 'Monitora',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => 'Fine',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-	'Class:NormalChange' => 'Cambi normali',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => 'Data di approvazione',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => 'Commento di approvazione',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => 'Convalida',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => 'Rifiuta',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => 'Assegna',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => 'Riapre',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Pianifica',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => 'Approva',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Ripianifica',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => 'Rifiuta l\'approvazione',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => 'Implementa',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => 'Monitora',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => 'Fine',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-	'Class:EmergencyChange' => 'Cambi di emergenza',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => 'Convalida',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => 'Rifiuta',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => 'Assegna',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Riapre',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Pianifica',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approva',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Riapre',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Rifiuta l\'approvazione',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implementa',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Monitora',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => 'Fine',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
-	'Menu:ChangeManagement' => 'Gestione dei cambi',
-	'Menu:Change:Overview' => 'Panoramica',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Nuovo cambio',
-	'Menu:NewChange+' => 'Crea un ticket per un nuovo cambio',
-	'Menu:SearchChanges' => 'Cerca per cambi',
-	'Menu:SearchChanges+' => 'Cerca i cambi per tickets',
-	'Menu:Change:Shortcuts' => 'Scorciatoie',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Modifiche in attesa di accettazione',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Modifiche in attesa di approvazione',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Modifiche aperte',
-	'Menu:Changes+' => 'Tutte le Modifiche aperte',
-	'Menu:MyChanges' => 'Modifiche assegnate a me',
-	'Menu:MyChanges+' => 'Modifiche assegnato a me (come Agent)',
-	'Class:Change' => 'Cambio',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:start_date' => 'Avvio previsto',
-	'Class:Change/Attribute:start_date+' => '',
-	'Class:Change/Attribute:status' => 'Stato',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Nuovo',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:validated' => 'Convalidato',
-	'Class:Change/Attribute:status/Value:validated+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Rifiutato',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Assegnato',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
-	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Approvato',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Non approvato',
-	'Class:Change/Attribute:status/Value:notapproved+' => '',
-	'Class:Change/Attribute:status/Value:implemented' => 'Implementato',
-	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => 'Monitorato',
-	'Class:Change/Attribute:status/Value:monitored+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Chiuso',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Motivo',
-	'Class:Change/Attribute:reason+' => '',
-	'Class:Change/Attribute:requestor_id' => 'Richiedente',
-	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => 'Richiedente',
-	'Class:Change/Attribute:requestor_email+' => '',
-	'Class:Change/Attribute:org_id' => 'Cliente',
-	'Class:Change/Attribute:org_id+' => '',
-	'Class:Change/Attribute:org_name' => 'Cliente',
-	'Class:Change/Attribute:org_name+' => '',
-	'Class:Change/Attribute:workgroup_id' => 'Gruppo di lavoro',
-	'Class:Change/Attribute:workgroup_id+' => '',
-	'Class:Change/Attribute:workgroup_name' => 'Gruppo di lavoro',
-	'Class:Change/Attribute:workgroup_name+' => '',
-	'Class:Change/Attribute:creation_date' => 'Creato',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:last_update' => 'Ultimo aggiornamento',
-	'Class:Change/Attribute:last_update+' => '',
-	'Class:Change/Attribute:end_date' => 'Data di fine',
-	'Class:Change/Attribute:end_date+' => '',
-	'Class:Change/Attribute:close_date' => 'Chiuso',
-	'Class:Change/Attribute:close_date+' => '',
-	'Class:Change/Attribute:impact' => 'Impatto',
-	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:agent_id' => 'Agente',
-	'Class:Change/Attribute:agent_id+' => '',
-	'Class:Change/Attribute:agent_name' => 'Agente',
-	'Class:Change/Attribute:agent_name+' => '',
-	'Class:Change/Attribute:agent_email' => 'Agente',
-	'Class:Change/Attribute:agent_email+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => 'Supervisore del team',
-	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => 'Supervisore del team',
-	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => 'Supervisore',
-	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => 'Supervisore',
-	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => 'Manager del team',
-	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => 'Manager del team',
-	'Class:Change/Attribute:manager_group_name+' => '',
-	'Class:Change/Attribute:manager_id' => 'Manager',
-	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => 'Manager',
-	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => 'Interruzione',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Si',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'No',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:change_request' => 'Richiesta',
-	'Class:Change/Attribute:change_request+' => '',
-	'Class:Change/Attribute:fallback' => 'Piano alternativo',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Stimulus:ev_validate' => 'Convalida',
-	'Class:Change/Stimulus:ev_validate+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Rifiuta',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Assegna',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Riapre',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Pianifica',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Approva',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Ripianifica',
-	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => 'Rifiuta',
-	'Class:Change/Stimulus:ev_notapprove+' => '',
-	'Class:Change/Stimulus:ev_implement' => 'Implementa',
-	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => 'Monitora',
-	'Class:Change/Stimulus:ev_monitor+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Fine',
-	'Class:Change/Stimulus:ev_finish+' => '',
-	'Class:RoutineChange/Attribute:status/Value:new' => 'Nuovo',
-	'Class:RoutineChange/Attribute:status/Value:new+' => '',
-	'Class:RoutineChange/Attribute:status/Value:assigned' => 'Assegnato',
-	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:RoutineChange/Attribute:status/Value:approved' => 'Approvato',
-	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
-	'Class:RoutineChange/Attribute:status/Value:implemented' => 'Implementato',
-	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
-	'Class:RoutineChange/Attribute:status/Value:monitored' => 'Monitorato',
-	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
-	'Class:RoutineChange/Attribute:status/Value:closed' => 'Chiuso',
-	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
-	'Class:ApprovedChange' => 'Cambi approvati',
-	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => 'Data di approvazione',
-	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => 'Commento di approvazione',
-	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => 'Convalida',
-	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => 'Rifiuta',
-	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => 'Assegna',
-	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Riapre',
-	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Pianifica',
-	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approvare',
-	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Ripianifica',
-	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Rifiuta l\'approvazione',
-	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implementa',
-	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Monitora',
-	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
-	'Class:ApprovedChange/Stimulus:ev_finish' => 'Fine',
-	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
-	'Class:NormalChange/Attribute:status/Value:new' => 'Nuovo',
-	'Class:NormalChange/Attribute:status/Value:new+' => '',
-	'Class:NormalChange/Attribute:status/Value:validated' => 'Convalidato',
-	'Class:NormalChange/Attribute:status/Value:validated+' => '',
-	'Class:NormalChange/Attribute:status/Value:rejected' => 'Rifiutato',
-	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
-	'Class:NormalChange/Attribute:status/Value:assigned' => 'Assegnato',
-	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:NormalChange/Attribute:status/Value:approved' => 'Approvato',
-	'Class:NormalChange/Attribute:status/Value:approved+' => '',
-	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Non approvato',
-	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
-	'Class:NormalChange/Attribute:status/Value:implemented' => 'Implementato',
-	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
-	'Class:NormalChange/Attribute:status/Value:monitored' => 'Monitorato',
-	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
-	'Class:NormalChange/Attribute:status/Value:closed' => 'Chiuso',
-	'Class:NormalChange/Attribute:status/Value:closed+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:new' => 'Nuovo',
-	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:validated' => 'Convalidato',
-	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:rejected' => 'Rifiutato',
-	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:assigned' => 'Asseganto',
-	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Approvato',
-	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Non approvato',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Implementato',
-	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:monitored' => 'Monitorato',
-	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:closed' => 'Chiuso',
-	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
-	'Class:Change/Attribute:parent_id' => 'Parent change~~',
-	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
-	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
-	'Tickets:Related:OpenChanges' => 'Open changes~~',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:RoutineChange' => 'Routine di cambi',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => 'Convalida',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Respingi',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Assegna',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => 'Riapri',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Pianifica',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_approve' => 'Approva',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Ripianifica',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Non Approva',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Implementa',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => 'Monitora',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => 'Fine',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+	'Class:NormalChange' => 'Cambi normali',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => 'Data di approvazione',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => 'Commento di approvazione',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => 'Convalida',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Rifiuta',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => 'Assegna',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => 'Riapre',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Pianifica',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => 'Approva',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Ripianifica',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Rifiuta l\'approvazione',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Implementa',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => 'Monitora',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => 'Fine',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+	'Class:EmergencyChange' => 'Cambi di emergenza',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => 'Convalida',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Rifiuta',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => 'Assegna',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Riapre',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Pianifica',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => 'Approva',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Riapre',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Rifiuta l\'approvazione',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implementa',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Monitora',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => 'Fine',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+	'Menu:ChangeManagement' => 'Gestione dei cambi',
+	'Menu:Change:Overview' => 'Panoramica',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Nuovo cambio',
+	'Menu:NewChange+' => 'Crea un ticket per un nuovo cambio',
+	'Menu:SearchChanges' => 'Cerca per cambi',
+	'Menu:SearchChanges+' => 'Cerca i cambi per tickets',
+	'Menu:Change:Shortcuts' => 'Scorciatoie',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Modifiche in attesa di accettazione',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Modifiche in attesa di approvazione',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Modifiche aperte',
+	'Menu:Changes+' => 'Tutte le Modifiche aperte',
+	'Menu:MyChanges' => 'Modifiche assegnate a me',
+	'Menu:MyChanges+' => 'Modifiche assegnato a me (come Agent)',
+	'Class:Change' => 'Cambio',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:start_date' => 'Avvio previsto',
+	'Class:Change/Attribute:start_date+' => '',
+	'Class:Change/Attribute:status' => 'Stato',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Nuovo',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:validated' => 'Convalidato',
+	'Class:Change/Attribute:status/Value:validated+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rifiutato',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Assegnato',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
+	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Approvato',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Non approvato',
+	'Class:Change/Attribute:status/Value:notapproved+' => '',
+	'Class:Change/Attribute:status/Value:implemented' => 'Implementato',
+	'Class:Change/Attribute:status/Value:implemented+' => '',
+	'Class:Change/Attribute:status/Value:monitored' => 'Monitorato',
+	'Class:Change/Attribute:status/Value:monitored+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Chiuso',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:reason' => 'Motivo',
+	'Class:Change/Attribute:reason+' => '',
+	'Class:Change/Attribute:requestor_id' => 'Richiedente',
+	'Class:Change/Attribute:requestor_id+' => '',
+	'Class:Change/Attribute:requestor_email' => 'Richiedente',
+	'Class:Change/Attribute:requestor_email+' => '',
+	'Class:Change/Attribute:org_id' => 'Cliente',
+	'Class:Change/Attribute:org_id+' => '',
+	'Class:Change/Attribute:org_name' => 'Cliente',
+	'Class:Change/Attribute:org_name+' => '',
+	'Class:Change/Attribute:workgroup_id' => 'Gruppo di lavoro',
+	'Class:Change/Attribute:workgroup_id+' => '',
+	'Class:Change/Attribute:workgroup_name' => 'Gruppo di lavoro',
+	'Class:Change/Attribute:workgroup_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Creato',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:last_update' => 'Ultimo aggiornamento',
+	'Class:Change/Attribute:last_update+' => '',
+	'Class:Change/Attribute:end_date' => 'Data di fine',
+	'Class:Change/Attribute:end_date+' => '',
+	'Class:Change/Attribute:close_date' => 'Chiuso',
+	'Class:Change/Attribute:close_date+' => '',
+	'Class:Change/Attribute:impact' => 'Impatto',
+	'Class:Change/Attribute:impact+' => '',
+	'Class:Change/Attribute:agent_id' => 'Agente',
+	'Class:Change/Attribute:agent_id+' => '',
+	'Class:Change/Attribute:agent_name' => 'Agente',
+	'Class:Change/Attribute:agent_name+' => '',
+	'Class:Change/Attribute:agent_email' => 'Agente',
+	'Class:Change/Attribute:agent_email+' => '',
+	'Class:Change/Attribute:supervisor_group_id' => 'Supervisore del team',
+	'Class:Change/Attribute:supervisor_group_id+' => '',
+	'Class:Change/Attribute:supervisor_group_name' => 'Supervisore del team',
+	'Class:Change/Attribute:supervisor_group_name+' => '',
+	'Class:Change/Attribute:supervisor_id' => 'Supervisore',
+	'Class:Change/Attribute:supervisor_id+' => '',
+	'Class:Change/Attribute:supervisor_email' => 'Supervisore',
+	'Class:Change/Attribute:supervisor_email+' => '',
+	'Class:Change/Attribute:manager_group_id' => 'Manager del team',
+	'Class:Change/Attribute:manager_group_id+' => '',
+	'Class:Change/Attribute:manager_group_name' => 'Manager del team',
+	'Class:Change/Attribute:manager_group_name+' => '',
+	'Class:Change/Attribute:manager_id' => 'Manager',
+	'Class:Change/Attribute:manager_id+' => '',
+	'Class:Change/Attribute:manager_email' => 'Manager',
+	'Class:Change/Attribute:manager_email+' => '',
+	'Class:Change/Attribute:outage' => 'Interruzione',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Si',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'No',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:change_request' => 'Richiesta',
+	'Class:Change/Attribute:change_request+' => '',
+	'Class:Change/Attribute:fallback' => 'Piano alternativo',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Stimulus:ev_validate' => 'Convalida',
+	'Class:Change/Stimulus:ev_validate+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Rifiuta',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Assegna',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Riapre',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Pianifica',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Approva',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_replan' => 'Ripianifica',
+	'Class:Change/Stimulus:ev_replan+' => '',
+	'Class:Change/Stimulus:ev_notapprove' => 'Rifiuta',
+	'Class:Change/Stimulus:ev_notapprove+' => '',
+	'Class:Change/Stimulus:ev_implement' => 'Implementa',
+	'Class:Change/Stimulus:ev_implement+' => '',
+	'Class:Change/Stimulus:ev_monitor' => 'Monitora',
+	'Class:Change/Stimulus:ev_monitor+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Fine',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:RoutineChange/Attribute:status/Value:new' => 'Nuovo',
+	'Class:RoutineChange/Attribute:status/Value:new+' => '',
+	'Class:RoutineChange/Attribute:status/Value:assigned' => 'Assegnato',
+	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:RoutineChange/Attribute:status/Value:approved' => 'Approvato',
+	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
+	'Class:RoutineChange/Attribute:status/Value:implemented' => 'Implementato',
+	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
+	'Class:RoutineChange/Attribute:status/Value:monitored' => 'Monitorato',
+	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
+	'Class:RoutineChange/Attribute:status/Value:closed' => 'Chiuso',
+	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
+	'Class:ApprovedChange' => 'Cambi approvati',
+	'Class:ApprovedChange+' => '',
+	'Class:ApprovedChange/Attribute:approval_date' => 'Data di approvazione',
+	'Class:ApprovedChange/Attribute:approval_date+' => '',
+	'Class:ApprovedChange/Attribute:approval_comment' => 'Commento di approvazione',
+	'Class:ApprovedChange/Attribute:approval_comment+' => '',
+	'Class:ApprovedChange/Stimulus:ev_validate' => 'Convalida',
+	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Rifiuta',
+	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
+	'Class:ApprovedChange/Stimulus:ev_assign' => 'Assegna',
+	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Riapre',
+	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Pianifica',
+	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_approve' => 'Approvare',
+	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Ripianifica',
+	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Rifiuta l\'approvazione',
+	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
+	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implementa',
+	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Monitora',
+	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
+	'Class:ApprovedChange/Stimulus:ev_finish' => 'Fine',
+	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
+	'Class:NormalChange/Attribute:status/Value:new' => 'Nuovo',
+	'Class:NormalChange/Attribute:status/Value:new+' => '',
+	'Class:NormalChange/Attribute:status/Value:validated' => 'Convalidato',
+	'Class:NormalChange/Attribute:status/Value:validated+' => '',
+	'Class:NormalChange/Attribute:status/Value:rejected' => 'Rifiutato',
+	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
+	'Class:NormalChange/Attribute:status/Value:assigned' => 'Assegnato',
+	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:NormalChange/Attribute:status/Value:approved' => 'Approvato',
+	'Class:NormalChange/Attribute:status/Value:approved+' => '',
+	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Non approvato',
+	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
+	'Class:NormalChange/Attribute:status/Value:implemented' => 'Implementato',
+	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
+	'Class:NormalChange/Attribute:status/Value:monitored' => 'Monitorato',
+	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
+	'Class:NormalChange/Attribute:status/Value:closed' => 'Chiuso',
+	'Class:NormalChange/Attribute:status/Value:closed+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:new' => 'Nuovo',
+	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:validated' => 'Convalidato',
+	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:rejected' => 'Rifiutato',
+	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:assigned' => 'Asseganto',
+	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => 'Pianificato e programmato',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Approvato',
+	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Non approvato',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Implementato',
+	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:monitored' => 'Monitorato',
+	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:closed' => 'Chiuso',
+	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
+	'Class:Change/Attribute:parent_id' => 'Parent change~~',
+	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
+	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
+	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
+	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
+	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
+	'Class:Change/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
+	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
+	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
+	'Tickets:Related:OpenChanges' => 'Open changes~~',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
+));
+?>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
index 0837d049b..d2e49c2b9 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
@@ -1,44 +1,44 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Change Management ITIL',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.0.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-change-mgmt-itil.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-change-mgmt.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-change-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-change-mgmt-itil/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Change Management ITIL',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-tickets/2.0.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-change-mgmt-itil.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-change-mgmt.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-change-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-change-mgmt-itil/pt_br.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/pt_br.dict.itop-change-mgmt-itil.php
index e83977c11..d43a287f8 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/pt_br.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/pt_br.dict.itop-change-mgmt-itil.php
@@ -1,299 +1,299 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:ChangeManagement' => 'Gerenciamento Mudanças',
-	'Menu:Change:Overview' => 'Visão geral',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Nova mudança',
-	'Menu:NewChange+' => 'Criar uma nova mudança',
-	'Menu:SearchChanges' => 'Pesquisar por mudanças',
-	'Menu:SearchChanges+' => 'Pesquisar por solicitação de mudança',
-	'Menu:Change:Shortcuts' => 'Atalho',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Mudanças aguardando aceitação',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Mudanças abertas',
-	'Menu:Changes+' => 'Todas mudanças abertas',
-	'Menu:MyChanges' => 'Mudanças atribuídas a mim',
-	'Menu:MyChanges+' => 'Mudanças atribuídas a mim (como Agente)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Mudanças por categoria nos últimos 7 dias',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Número de mudanças nos últimos 7 dias',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Change' => 'Mudanças',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:status' => 'Estado',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Nova',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:validated' => 'Validado',
-	'Class:Change/Attribute:status/Value:validated+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Rejeitado',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Atribuído',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Planejado e agendado',
-	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Aprovado',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Não aprovado',
-	'Class:Change/Attribute:status/Value:notapproved+' => '',
-	'Class:Change/Attribute:status/Value:implemented' => 'Implementado',
-	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => 'Monitorado',
-	'Class:Change/Attribute:status/Value:monitored+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Fechado',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Razão rejeição',
-	'Class:Change/Attribute:reason+' => '',
-	'Class:Change/Attribute:requestor_id' => 'Solicitante',
-	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => 'Email solicitante',
-	'Class:Change/Attribute:requestor_email+' => '',
-	'Class:Change/Attribute:creation_date' => 'Data criação',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:impact' => 'Impacto',
-	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => 'Supervisor da equipe',
-	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => 'Nome supervisor da equipe',
-	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => 'Supervisor',
-	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => 'Email supervisor',
-	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => 'Gerente equipe',
-	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => 'Nome gerente equipe',
-	'Class:Change/Attribute:manager_group_name+' => '',
-	'Class:Change/Attribute:manager_id' => 'Gerente',
-	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => 'Gerente',
-	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => 'Outage',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'Não',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Sim',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:fallback' => 'Plano de contingência',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Attribute:parent_id' => 'Sub-mudanças',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => 'Ref sub-mudanças',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Solicitações relacionadas',
-	'Class:Change/Attribute:related_request_list+' => 'Todas as solicitações vinculadas a essa mudança',
-	'Class:Change/Attribute:related_problems_list' => 'Problemas relacionados',
-	'Class:Change/Attribute:related_problems_list+' => 'Todos os problemas vinculados com essa mudança',
-	'Class:Change/Attribute:related_incident_list' => 'Incidentes relacionados',
-	'Class:Change/Attribute:related_incident_list+' => 'Todos os incidentes vinculados a essa mudança',
-	'Class:Change/Attribute:child_changes_list' => 'Sub-mudanças',
-	'Class:Change/Attribute:child_changes_list+' => 'Todas as sub-mudanças vinculadas a essa mudança',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Nome amigável mudança relacionado',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Tipo mudança',
-	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
-	'Class:Change/Stimulus:ev_validate' => 'Validar',
-	'Class:Change/Stimulus:ev_validate+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Atribuir',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Planejar',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Aprovar',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Re-planejar',
-	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => 'Rejeitar',
-	'Class:Change/Stimulus:ev_notapprove+' => '',
-	'Class:Change/Stimulus:ev_implement' => 'Implementar',
-	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => 'Monitorar',
-	'Class:Change/Stimulus:ev_monitor+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Finalizar',
-	'Class:Change/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: RoutineChange
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:RoutineChange' => 'Mudança rotina',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => 'Validar',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:RoutineChange/Stimulus:ev_reject+' => '',
-	'Class:RoutineChange/Stimulus:ev_assign' => 'Atribuir',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Planejar',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Aprovar',
-	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Re-planejar',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Não aprovo',
-	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
-	'Class:RoutineChange/Stimulus:ev_implement' => 'Implementar',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => 'Monitorar',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => 'Finalizar',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: ApprovedChange
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ApprovedChange' => 'Mudanças aprovadas',
-	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => 'Data aprovação',
-	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => 'Comentário aprovação',
-	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => 'Validar',
-	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => 'Atribuir',
-	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planejar',
-	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_approve' => 'Aprovar',
-	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Re-planejar',
-	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Rejeitar aprovação',
-	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implementar',
-	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Monitorar',
-	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
-	'Class:ApprovedChange/Stimulus:ev_finish' => 'Finalização',
-	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: NormalChange
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NormalChange' => 'Mudança normal',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => 'Data aceitação',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => 'Comentário aceitação',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => 'Validar',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => 'Atribuir',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Planejar',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => 'Aprovar',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Re-planejar',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => 'Rejeitar aprovação',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => 'Implementar',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => 'Monitorar',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => 'Finalizar',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: EmergencyChange
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EmergencyChange' => 'Mudança emergência',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validar',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => 'Atribuir',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planejar',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => 'Aprovar',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Re-planejar',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Rejeitar aprovação',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implementar',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Monitorar',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => 'Finalizar',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
-	'Tickets:Related:OpenChanges' => 'Open changes~~',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:ChangeManagement' => 'Gerenciamento Mudanças',
+	'Menu:Change:Overview' => 'Visão geral',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Nova mudança',
+	'Menu:NewChange+' => 'Criar uma nova mudança',
+	'Menu:SearchChanges' => 'Pesquisar por mudanças',
+	'Menu:SearchChanges+' => 'Pesquisar por solicitação de mudança',
+	'Menu:Change:Shortcuts' => 'Atalho',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Mudanças aguardando aceitação',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Mudanças abertas',
+	'Menu:Changes+' => 'Todas mudanças abertas',
+	'Menu:MyChanges' => 'Mudanças atribuídas a mim',
+	'Menu:MyChanges+' => 'Mudanças atribuídas a mim (como Agente)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Mudanças por categoria nos últimos 7 dias',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Número de mudanças nos últimos 7 dias',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Change' => 'Mudanças',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Estado',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Nova',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:validated' => 'Validado',
+	'Class:Change/Attribute:status/Value:validated+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rejeitado',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Atribuído',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Planejado e agendado',
+	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Aprovado',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Não aprovado',
+	'Class:Change/Attribute:status/Value:notapproved+' => '',
+	'Class:Change/Attribute:status/Value:implemented' => 'Implementado',
+	'Class:Change/Attribute:status/Value:implemented+' => '',
+	'Class:Change/Attribute:status/Value:monitored' => 'Monitorado',
+	'Class:Change/Attribute:status/Value:monitored+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Fechado',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:reason' => 'Razão rejeição',
+	'Class:Change/Attribute:reason+' => '',
+	'Class:Change/Attribute:requestor_id' => 'Solicitante',
+	'Class:Change/Attribute:requestor_id+' => '',
+	'Class:Change/Attribute:requestor_email' => 'Email solicitante',
+	'Class:Change/Attribute:requestor_email+' => '',
+	'Class:Change/Attribute:creation_date' => 'Data criação',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:impact' => 'Impacto',
+	'Class:Change/Attribute:impact+' => '',
+	'Class:Change/Attribute:supervisor_group_id' => 'Supervisor da equipe',
+	'Class:Change/Attribute:supervisor_group_id+' => '',
+	'Class:Change/Attribute:supervisor_group_name' => 'Nome supervisor da equipe',
+	'Class:Change/Attribute:supervisor_group_name+' => '',
+	'Class:Change/Attribute:supervisor_id' => 'Supervisor',
+	'Class:Change/Attribute:supervisor_id+' => '',
+	'Class:Change/Attribute:supervisor_email' => 'Email supervisor',
+	'Class:Change/Attribute:supervisor_email+' => '',
+	'Class:Change/Attribute:manager_group_id' => 'Gerente equipe',
+	'Class:Change/Attribute:manager_group_id+' => '',
+	'Class:Change/Attribute:manager_group_name' => 'Nome gerente equipe',
+	'Class:Change/Attribute:manager_group_name+' => '',
+	'Class:Change/Attribute:manager_id' => 'Gerente',
+	'Class:Change/Attribute:manager_id+' => '',
+	'Class:Change/Attribute:manager_email' => 'Gerente',
+	'Class:Change/Attribute:manager_email+' => '',
+	'Class:Change/Attribute:outage' => 'Outage',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'Não',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Sim',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Class:Change/Attribute:fallback' => 'Plano de contingência',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Attribute:parent_id' => 'Sub-mudanças',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => 'Ref sub-mudanças',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Solicitações relacionadas',
+	'Class:Change/Attribute:related_request_list+' => 'Todas as solicitações vinculadas a essa mudança',
+	'Class:Change/Attribute:related_problems_list' => 'Problemas relacionados',
+	'Class:Change/Attribute:related_problems_list+' => 'Todos os problemas vinculados com essa mudança',
+	'Class:Change/Attribute:related_incident_list' => 'Incidentes relacionados',
+	'Class:Change/Attribute:related_incident_list+' => 'Todos os incidentes vinculados a essa mudança',
+	'Class:Change/Attribute:child_changes_list' => 'Sub-mudanças',
+	'Class:Change/Attribute:child_changes_list+' => 'Todas as sub-mudanças vinculadas a essa mudança',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Nome amigável mudança relacionado',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Tipo mudança',
+	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
+	'Class:Change/Stimulus:ev_validate' => 'Validar',
+	'Class:Change/Stimulus:ev_validate+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Atribuir',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Planejar',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Aprovar',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_replan' => 'Re-planejar',
+	'Class:Change/Stimulus:ev_replan+' => '',
+	'Class:Change/Stimulus:ev_notapprove' => 'Rejeitar',
+	'Class:Change/Stimulus:ev_notapprove+' => '',
+	'Class:Change/Stimulus:ev_implement' => 'Implementar',
+	'Class:Change/Stimulus:ev_implement+' => '',
+	'Class:Change/Stimulus:ev_monitor' => 'Monitorar',
+	'Class:Change/Stimulus:ev_monitor+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Finalizar',
+	'Class:Change/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: RoutineChange
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:RoutineChange' => 'Mudança rotina',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => 'Validar',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:RoutineChange/Stimulus:ev_reject+' => '',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Atribuir',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Planejar',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_approve' => 'Aprovar',
+	'Class:RoutineChange/Stimulus:ev_approve+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Re-planejar',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Não aprovo',
+	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Implementar',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => 'Monitorar',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => 'Finalizar',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: ApprovedChange
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ApprovedChange' => 'Mudanças aprovadas',
+	'Class:ApprovedChange+' => '',
+	'Class:ApprovedChange/Attribute:approval_date' => 'Data aprovação',
+	'Class:ApprovedChange/Attribute:approval_date+' => '',
+	'Class:ApprovedChange/Attribute:approval_comment' => 'Comentário aprovação',
+	'Class:ApprovedChange/Attribute:approval_comment+' => '',
+	'Class:ApprovedChange/Stimulus:ev_validate' => 'Validar',
+	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
+	'Class:ApprovedChange/Stimulus:ev_assign' => 'Atribuir',
+	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planejar',
+	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_approve' => 'Aprovar',
+	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Re-planejar',
+	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Rejeitar aprovação',
+	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
+	'Class:ApprovedChange/Stimulus:ev_implement' => 'Implementar',
+	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => 'Monitorar',
+	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
+	'Class:ApprovedChange/Stimulus:ev_finish' => 'Finalização',
+	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: NormalChange
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:NormalChange' => 'Mudança normal',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => 'Data aceitação',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => 'Comentário aceitação',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => 'Validar',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => 'Atribuir',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Planejar',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => 'Aprovar',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Re-planejar',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Rejeitar aprovação',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Implementar',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => 'Monitorar',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => 'Finalizar',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: EmergencyChange
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EmergencyChange' => 'Mudança emergência',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validar',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => 'Atribuir',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planejar',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => 'Aprovar',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Re-planejar',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Rejeitar aprovação',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Implementar',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => 'Monitorar',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => 'Finalizar',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+	'Tickets:Related:OpenChanges' => 'Open changes~~',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/tr.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/tr.dict.itop-change-mgmt-itil.php
index a08926211..5221db382 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/tr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/tr.dict.itop-change-mgmt-itil.php
@@ -1,371 +1,371 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Menu:ChangeManagement' => 'Değişiklik Yönetimi',
-	'Menu:Change:Overview' => 'Özet',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Yeni değişiklik',
-	'Menu:NewChange+' => 'Yeni değişiklik isteği yarat',
-	'Menu:SearchChanges' => 'Değişiklik ara',
-	'Menu:SearchChanges+' => 'Değişiklik isteği ara',
-	'Menu:Change:Shortcuts' => 'Kısayollar',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Kabul bekleyen değişiklik talepleri',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Onay bekleyen değişiklik talepleri',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Açık değişiklikler',
-	'Menu:Changes+' => '',
-	'Menu:MyChanges' => 'Bana atanan değişiklik istekleri',
-	'Menu:MyChanges+' => 'Bana atanan değişiklik istekleri',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Change' => 'Değişiklik',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:start_date' => 'Planlanan başlama tarihi',
-	'Class:Change/Attribute:start_date+' => '',
-	'Class:Change/Attribute:status' => 'Durumu',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Yeni',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:validated' => 'Kontrol edilen',
-	'Class:Change/Attribute:status/Value:validated+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Reddedilen',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Atanmış',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Planlanan',
-	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Onaylanan',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => 'Onaylanmayan',
-	'Class:Change/Attribute:status/Value:notapproved+' => '',
-	'Class:Change/Attribute:status/Value:implemented' => 'Uygulanan',
-	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => 'İzlenen',
-	'Class:Change/Attribute:status/Value:monitored+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Kapanan',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => 'Sebep',
-	'Class:Change/Attribute:reason+' => '',
-	'Class:Change/Attribute:requestor_id' => 'İstek sahibi',
-	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => 'İstek sahibi',
-	'Class:Change/Attribute:requestor_email+' => '',
-	'Class:Change/Attribute:org_id' => 'Müşteri',
-	'Class:Change/Attribute:org_id+' => '',
-	'Class:Change/Attribute:org_name' => 'Müşteri',
-	'Class:Change/Attribute:org_name+' => '',
-	'Class:Change/Attribute:workgroup_id' => 'İş grubu',
-	'Class:Change/Attribute:workgroup_id+' => '',
-	'Class:Change/Attribute:workgroup_name' => 'İş grubu',
-	'Class:Change/Attribute:workgroup_name+' => '',
-	'Class:Change/Attribute:creation_date' => 'Yaratıldı',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:last_update' => 'Son güncelleme',
-	'Class:Change/Attribute:last_update+' => '',
-	'Class:Change/Attribute:end_date' => 'Bitiş tarihi',
-	'Class:Change/Attribute:end_date+' => '',
-	'Class:Change/Attribute:close_date' => 'Bitirilme tarihi',
-	'Class:Change/Attribute:close_date+' => '',
-	'Class:Change/Attribute:impact' => 'Etkisi',
-	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:agent_id' => 'Yetkili',
-	'Class:Change/Attribute:agent_id+' => '',
-	'Class:Change/Attribute:agent_name' => 'Yetkili',
-	'Class:Change/Attribute:agent_name+' => '',
-	'Class:Change/Attribute:agent_email' => 'Yetkili',
-	'Class:Change/Attribute:agent_email+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => 'Supervizör ekip',
-	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => 'Supervizör ekip',
-	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => 'Supervizör',
-	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => 'Supervizör',
-	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => 'Yönetici ekibi',
-	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => 'Yönetici ekibi',
-	'Class:Change/Attribute:manager_group_name+' => '',
-	'Class:Change/Attribute:manager_id' => 'Yönetici',
-	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => 'Yönetici',
-	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => 'Servis kesilmesi',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Evet',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'Hayır',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:change_request' => 'İstek',
-	'Class:Change/Attribute:change_request+' => '',
-	'Class:Change/Attribute:fallback' => 'Geridönüş planı',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Stimulus:ev_validate' => 'Doğrula',
-	'Class:Change/Stimulus:ev_validate+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Ret',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Ata',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Tekrar aç',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Planla',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Onayla',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => 'Tekrar planla',
-	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => 'Ret',
-	'Class:Change/Stimulus:ev_notapprove+' => '',
-	'Class:Change/Stimulus:ev_implement' => 'Uygula',
-	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => 'İzle',
-	'Class:Change/Stimulus:ev_monitor+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Bitir',
-	'Class:Change/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: RoutineChange
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:RoutineChange' => 'Sıradan değişiklik',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Attribute:status/Value:new' => 'Yeni',
-	'Class:RoutineChange/Attribute:status/Value:new+' => '',
-	'Class:RoutineChange/Attribute:status/Value:assigned' => 'Atanmış',
-	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => 'Planlanan',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:RoutineChange/Attribute:status/Value:approved' => 'Onaylanan',
-	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
-	'Class:RoutineChange/Attribute:status/Value:implemented' => 'Uygulanan',
-	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
-	'Class:RoutineChange/Attribute:status/Value:monitored' => 'İzlenen',
-	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
-	'Class:RoutineChange/Attribute:status/Value:closed' => 'Kapatılan',
-	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => 'Doğrulanan',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_assign' => 'Atanan',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => 'Tekrar açılan',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => 'Planlanan',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => 'Tekrar planlanan',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_implement' => 'Uygula',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => 'İzle',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => 'Bitir',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: ApprovedChange
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ApprovedChange' => 'Onaylanan değişiklik',
-	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => 'Onay tarihi',
-	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => 'Onay yorumu',
-	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => 'Onaylı',
-	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => 'Reddedilen',
-	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => 'Ata',
-	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Tekrar aç',
-	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planla',
-	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_approve' => 'Onayla',
-	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => 'Tekrar planla',
-	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Onayı reddet',
-	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-	'Class:ApprovedChange/Stimulus:ev_implement' => 'Uygula',
-	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => 'İzle',
-	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
-	'Class:ApprovedChange/Stimulus:ev_finish' => 'Bitir',
-	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
-));
-//
-// Class: NormalChange
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:NormalChange' => 'Normal değişiklik',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:status/Value:new' => 'Yeni',
-	'Class:NormalChange/Attribute:status/Value:new+' => '',
-	'Class:NormalChange/Attribute:status/Value:validated' => 'Doğrulanan',
-	'Class:NormalChange/Attribute:status/Value:validated+' => '',
-	'Class:NormalChange/Attribute:status/Value:rejected' => 'Reddedilen',
-	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
-	'Class:NormalChange/Attribute:status/Value:assigned' => 'Atanan',
-	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => 'Planlanan',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:NormalChange/Attribute:status/Value:approved' => 'Onaylanan',
-	'Class:NormalChange/Attribute:status/Value:approved+' => '',
-	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Onaylanmayan',
-	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
-	'Class:NormalChange/Attribute:status/Value:implemented' => 'Uygulanan',
-	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
-	'Class:NormalChange/Attribute:status/Value:monitored' => 'İzlenen',
-	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
-	'Class:NormalChange/Attribute:status/Value:closed' => 'Kapatılan',
-	'Class:NormalChange/Attribute:status/Value:closed+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => 'Kabul tarihi',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => 'Kabul yorumu',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => 'Doğrula',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => 'Reddet',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => 'Ata',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => 'Tekrar aç',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => 'Planla',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => 'Onayla',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => 'Tekrar planla',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => 'Onayı reddet',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => 'Uygula',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => 'İzle',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => 'Bitir',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: EmergencyChange
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:EmergencyChange' => 'Acil değişiklik',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:new' => 'Yeni',
-	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:validated' => 'Doğrulanan',
-	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:rejected' => 'Reddedilen',
-	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:assigned' => 'Atanan',
-	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => 'Planan',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Onaylanan',
-	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Onaylanmayan',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Uygulanan',
-	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:monitored' => 'İzlenen',
-	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:closed' => 'Kapatılan',
-	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => 'Doğrula',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => 'Reddet',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => 'Ata',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Tekrar aç',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planla',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => 'Onayla',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => 'Tekrar planla',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Onayı reddet',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => 'Uygula',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => 'İzle',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => 'Bitir',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
-	'Class:Change/Attribute:parent_id' => 'Parent change~~',
-	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
-	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject~~',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve~~',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve~~',
-	'Tickets:Related:OpenChanges' => 'Open changes~~',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:ChangeManagement' => 'Değişiklik Yönetimi',
+	'Menu:Change:Overview' => 'Özet',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Yeni değişiklik',
+	'Menu:NewChange+' => 'Yeni değişiklik isteği yarat',
+	'Menu:SearchChanges' => 'Değişiklik ara',
+	'Menu:SearchChanges+' => 'Değişiklik isteği ara',
+	'Menu:Change:Shortcuts' => 'Kısayollar',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Kabul bekleyen değişiklik talepleri',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Onay bekleyen değişiklik talepleri',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Açık değişiklikler',
+	'Menu:Changes+' => '',
+	'Menu:MyChanges' => 'Bana atanan değişiklik istekleri',
+	'Menu:MyChanges+' => 'Bana atanan değişiklik istekleri',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Change' => 'Değişiklik',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:start_date' => 'Planlanan başlama tarihi',
+	'Class:Change/Attribute:start_date+' => '',
+	'Class:Change/Attribute:status' => 'Durumu',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Yeni',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:validated' => 'Kontrol edilen',
+	'Class:Change/Attribute:status/Value:validated+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Reddedilen',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Atanmış',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => 'Planlanan',
+	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Onaylanan',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:notapproved' => 'Onaylanmayan',
+	'Class:Change/Attribute:status/Value:notapproved+' => '',
+	'Class:Change/Attribute:status/Value:implemented' => 'Uygulanan',
+	'Class:Change/Attribute:status/Value:implemented+' => '',
+	'Class:Change/Attribute:status/Value:monitored' => 'İzlenen',
+	'Class:Change/Attribute:status/Value:monitored+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Kapanan',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:reason' => 'Sebep',
+	'Class:Change/Attribute:reason+' => '',
+	'Class:Change/Attribute:requestor_id' => 'İstek sahibi',
+	'Class:Change/Attribute:requestor_id+' => '',
+	'Class:Change/Attribute:requestor_email' => 'İstek sahibi',
+	'Class:Change/Attribute:requestor_email+' => '',
+	'Class:Change/Attribute:org_id' => 'Müşteri',
+	'Class:Change/Attribute:org_id+' => '',
+	'Class:Change/Attribute:org_name' => 'Müşteri',
+	'Class:Change/Attribute:org_name+' => '',
+	'Class:Change/Attribute:workgroup_id' => 'İş grubu',
+	'Class:Change/Attribute:workgroup_id+' => '',
+	'Class:Change/Attribute:workgroup_name' => 'İş grubu',
+	'Class:Change/Attribute:workgroup_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Yaratıldı',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:last_update' => 'Son güncelleme',
+	'Class:Change/Attribute:last_update+' => '',
+	'Class:Change/Attribute:end_date' => 'Bitiş tarihi',
+	'Class:Change/Attribute:end_date+' => '',
+	'Class:Change/Attribute:close_date' => 'Bitirilme tarihi',
+	'Class:Change/Attribute:close_date+' => '',
+	'Class:Change/Attribute:impact' => 'Etkisi',
+	'Class:Change/Attribute:impact+' => '',
+	'Class:Change/Attribute:agent_id' => 'Yetkili',
+	'Class:Change/Attribute:agent_id+' => '',
+	'Class:Change/Attribute:agent_name' => 'Yetkili',
+	'Class:Change/Attribute:agent_name+' => '',
+	'Class:Change/Attribute:agent_email' => 'Yetkili',
+	'Class:Change/Attribute:agent_email+' => '',
+	'Class:Change/Attribute:supervisor_group_id' => 'Supervizör ekip',
+	'Class:Change/Attribute:supervisor_group_id+' => '',
+	'Class:Change/Attribute:supervisor_group_name' => 'Supervizör ekip',
+	'Class:Change/Attribute:supervisor_group_name+' => '',
+	'Class:Change/Attribute:supervisor_id' => 'Supervizör',
+	'Class:Change/Attribute:supervisor_id+' => '',
+	'Class:Change/Attribute:supervisor_email' => 'Supervizör',
+	'Class:Change/Attribute:supervisor_email+' => '',
+	'Class:Change/Attribute:manager_group_id' => 'Yönetici ekibi',
+	'Class:Change/Attribute:manager_group_id+' => '',
+	'Class:Change/Attribute:manager_group_name' => 'Yönetici ekibi',
+	'Class:Change/Attribute:manager_group_name+' => '',
+	'Class:Change/Attribute:manager_id' => 'Yönetici',
+	'Class:Change/Attribute:manager_id+' => '',
+	'Class:Change/Attribute:manager_email' => 'Yönetici',
+	'Class:Change/Attribute:manager_email+' => '',
+	'Class:Change/Attribute:outage' => 'Servis kesilmesi',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Evet',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'Hayır',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:change_request' => 'İstek',
+	'Class:Change/Attribute:change_request+' => '',
+	'Class:Change/Attribute:fallback' => 'Geridönüş planı',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Stimulus:ev_validate' => 'Doğrula',
+	'Class:Change/Stimulus:ev_validate+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Ret',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Ata',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Tekrar aç',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Planla',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Onayla',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_replan' => 'Tekrar planla',
+	'Class:Change/Stimulus:ev_replan+' => '',
+	'Class:Change/Stimulus:ev_notapprove' => 'Ret',
+	'Class:Change/Stimulus:ev_notapprove+' => '',
+	'Class:Change/Stimulus:ev_implement' => 'Uygula',
+	'Class:Change/Stimulus:ev_implement+' => '',
+	'Class:Change/Stimulus:ev_monitor' => 'İzle',
+	'Class:Change/Stimulus:ev_monitor+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Bitir',
+	'Class:Change/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: RoutineChange
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:RoutineChange' => 'Sıradan değişiklik',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Attribute:status/Value:new' => 'Yeni',
+	'Class:RoutineChange/Attribute:status/Value:new+' => '',
+	'Class:RoutineChange/Attribute:status/Value:assigned' => 'Atanmış',
+	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => 'Planlanan',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:RoutineChange/Attribute:status/Value:approved' => 'Onaylanan',
+	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
+	'Class:RoutineChange/Attribute:status/Value:implemented' => 'Uygulanan',
+	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
+	'Class:RoutineChange/Attribute:status/Value:monitored' => 'İzlenen',
+	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
+	'Class:RoutineChange/Attribute:status/Value:closed' => 'Kapatılan',
+	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => 'Doğrulanan',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_assign' => 'Atanan',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => 'Tekrar açılan',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => 'Planlanan',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => 'Tekrar planlanan',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_implement' => 'Uygula',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => 'İzle',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => 'Bitir',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: ApprovedChange
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ApprovedChange' => 'Onaylanan değişiklik',
+	'Class:ApprovedChange+' => '',
+	'Class:ApprovedChange/Attribute:approval_date' => 'Onay tarihi',
+	'Class:ApprovedChange/Attribute:approval_date+' => '',
+	'Class:ApprovedChange/Attribute:approval_comment' => 'Onay yorumu',
+	'Class:ApprovedChange/Attribute:approval_comment+' => '',
+	'Class:ApprovedChange/Stimulus:ev_validate' => 'Onaylı',
+	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reject' => 'Reddedilen',
+	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
+	'Class:ApprovedChange/Stimulus:ev_assign' => 'Ata',
+	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => 'Tekrar aç',
+	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
+	'Class:ApprovedChange/Stimulus:ev_plan' => 'Planla',
+	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_approve' => 'Onayla',
+	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
+	'Class:ApprovedChange/Stimulus:ev_replan' => 'Tekrar planla',
+	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => 'Onayı reddet',
+	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
+	'Class:ApprovedChange/Stimulus:ev_implement' => 'Uygula',
+	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => 'İzle',
+	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
+	'Class:ApprovedChange/Stimulus:ev_finish' => 'Bitir',
+	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
+));
+//
+// Class: NormalChange
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:NormalChange' => 'Normal değişiklik',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:status/Value:new' => 'Yeni',
+	'Class:NormalChange/Attribute:status/Value:new+' => '',
+	'Class:NormalChange/Attribute:status/Value:validated' => 'Doğrulanan',
+	'Class:NormalChange/Attribute:status/Value:validated+' => '',
+	'Class:NormalChange/Attribute:status/Value:rejected' => 'Reddedilen',
+	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
+	'Class:NormalChange/Attribute:status/Value:assigned' => 'Atanan',
+	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => 'Planlanan',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:NormalChange/Attribute:status/Value:approved' => 'Onaylanan',
+	'Class:NormalChange/Attribute:status/Value:approved+' => '',
+	'Class:NormalChange/Attribute:status/Value:notapproved' => 'Onaylanmayan',
+	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
+	'Class:NormalChange/Attribute:status/Value:implemented' => 'Uygulanan',
+	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
+	'Class:NormalChange/Attribute:status/Value:monitored' => 'İzlenen',
+	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
+	'Class:NormalChange/Attribute:status/Value:closed' => 'Kapatılan',
+	'Class:NormalChange/Attribute:status/Value:closed+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => 'Kabul tarihi',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => 'Kabul yorumu',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => 'Doğrula',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => 'Reddet',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => 'Ata',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => 'Tekrar aç',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => 'Planla',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => 'Onayla',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => 'Tekrar planla',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => 'Onayı reddet',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => 'Uygula',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => 'İzle',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => 'Bitir',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: EmergencyChange
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:EmergencyChange' => 'Acil değişiklik',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:new' => 'Yeni',
+	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:validated' => 'Doğrulanan',
+	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:rejected' => 'Reddedilen',
+	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:assigned' => 'Atanan',
+	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => 'Planan',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:approved' => 'Onaylanan',
+	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved' => 'Onaylanmayan',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:implemented' => 'Uygulanan',
+	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:monitored' => 'İzlenen',
+	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:closed' => 'Kapatılan',
+	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => 'Doğrula',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => 'Reddet',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => 'Ata',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => 'Tekrar aç',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => 'Planla',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => 'Onayla',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => 'Tekrar planla',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => 'Onayı reddet',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => 'Uygula',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => 'İzle',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => 'Bitir',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
+	'Class:Change/Attribute:parent_id' => 'Parent change~~',
+	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
+	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
+	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
+	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
+	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
+	'Class:Change/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
+	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
+	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject~~',
+	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve~~',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve~~',
+	'Tickets:Related:OpenChanges' => 'Open changes~~',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php b/datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
index fc5fd6357..a148524a7 100755
--- a/datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
@@ -1,370 +1,370 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Menu:ChangeManagement' => '变更管理',
-	'Menu:Change:Overview' => '概览',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => '新变更',
-	'Menu:NewChange+' => '创建新变更的单据',
-	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更单据',
-	'Menu:Change:Shortcuts' => '快捷方式',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => '等待接受的变更',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => '等待批准的变更',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => '待处理的变更',
-	'Menu:Changes+' => '',
-	'Menu:MyChanges' => '指派给我的变更',
-	'Menu:MyChanges+' => '指派给我的变更 (作为办理人)',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Change' => '变更',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:start_date' => '计划启动',
-	'Class:Change/Attribute:start_date+' => '',
-	'Class:Change/Attribute:status' => '状态',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => '新',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:validated' => '已生效',
-	'Class:Change/Attribute:status/Value:validated+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => '已拒绝',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => '已指派',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:plannedscheduled' => '已计划和安排',
-	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => '已批准',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => '未批准',
-	'Class:Change/Attribute:status/Value:notapproved+' => '',
-	'Class:Change/Attribute:status/Value:implemented' => '已实施',
-	'Class:Change/Attribute:status/Value:implemented+' => '',
-	'Class:Change/Attribute:status/Value:monitored' => '已监控',
-	'Class:Change/Attribute:status/Value:monitored+' => '',
-	'Class:Change/Attribute:status/Value:closed' => '已关闭',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:reason' => '原因',
-	'Class:Change/Attribute:reason+' => '',
-	'Class:Change/Attribute:requestor_id' => '申请者',
-	'Class:Change/Attribute:requestor_id+' => '',
-	'Class:Change/Attribute:requestor_email' => '申请者',
-	'Class:Change/Attribute:requestor_email+' => '',
-	'Class:Change/Attribute:org_id' => '客户',
-	'Class:Change/Attribute:org_id+' => '',
-	'Class:Change/Attribute:org_name' => '客户',
-	'Class:Change/Attribute:org_name+' => '',
-	'Class:Change/Attribute:workgroup_id' => '工作组',
-	'Class:Change/Attribute:workgroup_id+' => '',
-	'Class:Change/Attribute:workgroup_name' => '工作组',
-	'Class:Change/Attribute:workgroup_name+' => '',
-	'Class:Change/Attribute:creation_date' => '创建',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:last_update' => '最后更新',
-	'Class:Change/Attribute:last_update+' => '',
-	'Class:Change/Attribute:end_date' => '结束',
-	'Class:Change/Attribute:end_date+' => '',
-	'Class:Change/Attribute:close_date' => '关闭',
-	'Class:Change/Attribute:close_date+' => '',
-	'Class:Change/Attribute:impact' => '影响',
-	'Class:Change/Attribute:impact+' => '',
-	'Class:Change/Attribute:agent_id' => '办理人',
-	'Class:Change/Attribute:agent_id+' => '',
-	'Class:Change/Attribute:agent_name' => '办理人',
-	'Class:Change/Attribute:agent_name+' => '',
-	'Class:Change/Attribute:agent_email' => '办理人',
-	'Class:Change/Attribute:agent_email+' => '',
-	'Class:Change/Attribute:supervisor_group_id' => '监督团队',
-	'Class:Change/Attribute:supervisor_group_id+' => '',
-	'Class:Change/Attribute:supervisor_group_name' => '监督团队',
-	'Class:Change/Attribute:supervisor_group_name+' => '',
-	'Class:Change/Attribute:supervisor_id' => '监督者',
-	'Class:Change/Attribute:supervisor_id+' => '',
-	'Class:Change/Attribute:supervisor_email' => '监督者',
-	'Class:Change/Attribute:supervisor_email+' => '',
-	'Class:Change/Attribute:manager_group_id' => '管理团队',
-	'Class:Change/Attribute:manager_group_id+' => '',
-	'Class:Change/Attribute:manager_group_name' => '管理团队',
-	'Class:Change/Attribute:manager_group_name+' => '',
-	'Class:Change/Attribute:manager_id' => '管理人',
-	'Class:Change/Attribute:manager_id+' => '',
-	'Class:Change/Attribute:manager_email' => '管理人',
-	'Class:Change/Attribute:manager_email+' => '',
-	'Class:Change/Attribute:outage' => '停歇',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => '是',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:outage/Value:no' => '否',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:change_request' => '申请',
-	'Class:Change/Attribute:change_request+' => '',
-	'Class:Change/Attribute:fallback' => '回退计划',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Stimulus:ev_validate' => '生效',
-	'Class:Change/Stimulus:ev_validate+' => '',
-	'Class:Change/Stimulus:ev_reject' => '拒绝',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_assign' => '指派',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_reopen' => '重开',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_plan' => '计划',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_approve' => '批准',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_replan' => '重新计划',
-	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => '不批准',
-	'Class:Change/Stimulus:ev_notapprove+' => '',
-	'Class:Change/Stimulus:ev_implement' => '实施',
-	'Class:Change/Stimulus:ev_implement+' => '',
-	'Class:Change/Stimulus:ev_monitor' => '监控',
-	'Class:Change/Stimulus:ev_monitor+' => '',
-	'Class:Change/Stimulus:ev_finish' => '完成',
-	'Class:Change/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: RoutineChange
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:RoutineChange' => '例行变更',
-	'Class:RoutineChange+' => '',
-	'Class:RoutineChange/Attribute:status/Value:new' => '新',
-	'Class:RoutineChange/Attribute:status/Value:new+' => '',
-	'Class:RoutineChange/Attribute:status/Value:assigned' => '已指派',
-	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => '已计划和安排',
-	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:RoutineChange/Attribute:status/Value:approved' => '已批准',
-	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
-	'Class:RoutineChange/Attribute:status/Value:implemented' => '已实施',
-	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
-	'Class:RoutineChange/Attribute:status/Value:monitored' => '已监控',
-	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
-	'Class:RoutineChange/Attribute:status/Value:closed' => '已关闭',
-	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
-	'Class:RoutineChange/Stimulus:ev_validate' => '生效',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_assign' => '指派',
-	'Class:RoutineChange/Stimulus:ev_assign+' => '',
-	'Class:RoutineChange/Stimulus:ev_reopen' => '重开',
-	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
-	'Class:RoutineChange/Stimulus:ev_plan' => '计划',
-	'Class:RoutineChange/Stimulus:ev_plan+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => '重新计划',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_implement' => '实施',
-	'Class:RoutineChange/Stimulus:ev_implement+' => '',
-	'Class:RoutineChange/Stimulus:ev_monitor' => '监控',
-	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
-	'Class:RoutineChange/Stimulus:ev_finish' => '完成',
-	'Class:RoutineChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: ApprovedChange
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ApprovedChange' => '批准的变更',
-	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => '批准日期',
-	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => '批准说明',
-	'Class:ApprovedChange/Attribute:approval_comment+' => '',
-	'Class:ApprovedChange/Stimulus:ev_validate' => '生效',
-	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reject' => '拒绝',
-	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
-	'Class:ApprovedChange/Stimulus:ev_assign' => '指派',
-	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
-	'Class:ApprovedChange/Stimulus:ev_reopen' => '重开',
-	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
-	'Class:ApprovedChange/Stimulus:ev_plan' => '计划',
-	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_approve' => '批准',
-	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
-	'Class:ApprovedChange/Stimulus:ev_replan' => '重新计划',
-	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => '拒绝批准',
-	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
-	'Class:ApprovedChange/Stimulus:ev_implement' => '实施',
-	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
-	'Class:ApprovedChange/Stimulus:ev_monitor' => '监控',
-	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
-	'Class:ApprovedChange/Stimulus:ev_finish' => '完成',
-	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
-));
-//
-// Class: NormalChange
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:NormalChange' => '正常变更',
-	'Class:NormalChange+' => '',
-	'Class:NormalChange/Attribute:status/Value:new' => '新',
-	'Class:NormalChange/Attribute:status/Value:new+' => '',
-	'Class:NormalChange/Attribute:status/Value:validated' => '已生效',
-	'Class:NormalChange/Attribute:status/Value:validated+' => '',
-	'Class:NormalChange/Attribute:status/Value:rejected' => '已拒绝',
-	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
-	'Class:NormalChange/Attribute:status/Value:assigned' => '已指派',
-	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => '已计划和安排',
-	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:NormalChange/Attribute:status/Value:approved' => '已批准',
-	'Class:NormalChange/Attribute:status/Value:approved+' => '',
-	'Class:NormalChange/Attribute:status/Value:notapproved' => '不批准',
-	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
-	'Class:NormalChange/Attribute:status/Value:implemented' => '已实施',
-	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
-	'Class:NormalChange/Attribute:status/Value:monitored' => '已监控',
-	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
-	'Class:NormalChange/Attribute:status/Value:closed' => '已关闭',
-	'Class:NormalChange/Attribute:status/Value:closed+' => '',
-	'Class:NormalChange/Attribute:acceptance_date' => '接受日期',
-	'Class:NormalChange/Attribute:acceptance_date+' => '',
-	'Class:NormalChange/Attribute:acceptance_comment' => '接受说明',
-	'Class:NormalChange/Attribute:acceptance_comment+' => '',
-	'Class:NormalChange/Stimulus:ev_validate' => '生效',
-	'Class:NormalChange/Stimulus:ev_validate+' => '',
-	'Class:NormalChange/Stimulus:ev_reject' => '拒绝',
-	'Class:NormalChange/Stimulus:ev_reject+' => '',
-	'Class:NormalChange/Stimulus:ev_assign' => '指派',
-	'Class:NormalChange/Stimulus:ev_assign+' => '',
-	'Class:NormalChange/Stimulus:ev_reopen' => '重开',
-	'Class:NormalChange/Stimulus:ev_reopen+' => '',
-	'Class:NormalChange/Stimulus:ev_plan' => '计划',
-	'Class:NormalChange/Stimulus:ev_plan+' => '',
-	'Class:NormalChange/Stimulus:ev_approve' => '批准',
-	'Class:NormalChange/Stimulus:ev_approve+' => '',
-	'Class:NormalChange/Stimulus:ev_replan' => '重新计划',
-	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => '拒绝批准',
-	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
-	'Class:NormalChange/Stimulus:ev_implement' => '实施',
-	'Class:NormalChange/Stimulus:ev_implement+' => '',
-	'Class:NormalChange/Stimulus:ev_monitor' => '监控',
-	'Class:NormalChange/Stimulus:ev_monitor+' => '',
-	'Class:NormalChange/Stimulus:ev_finish' => '完成',
-	'Class:NormalChange/Stimulus:ev_finish+' => '',
-));
-
-//
-// Class: EmergencyChange
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EmergencyChange' => '紧急变更',
-	'Class:EmergencyChange+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:new' => '新',
-	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:validated' => '已生效',
-	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:rejected' => '已拒绝',
-	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:assigned' => '已指派',
-	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => '已计划和安排',
-	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:approved' => '已批准',
-	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved' => '不批准',
-	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:implemented' => '已实施',
-	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:monitored' => '已监控',
-	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
-	'Class:EmergencyChange/Attribute:status/Value:closed' => '已关闭',
-	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
-	'Class:EmergencyChange/Stimulus:ev_validate' => '生效',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => '拒绝',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-	'Class:EmergencyChange/Stimulus:ev_assign' => '指派',
-	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reopen' => '重开',
-	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
-	'Class:EmergencyChange/Stimulus:ev_plan' => '计划',
-	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_approve' => '批准',
-	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
-	'Class:EmergencyChange/Stimulus:ev_replan' => '重新计划',
-	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => '拒绝批准',
-	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
-	'Class:EmergencyChange/Stimulus:ev_implement' => '实施',
-	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
-	'Class:EmergencyChange/Stimulus:ev_monitor' => '监控',
-	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
-	'Class:EmergencyChange/Stimulus:ev_finish' => '完成',
-	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
-	'Class:Change/Attribute:parent_id' => 'Parent change~~',
-	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
-	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
-	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
-	'Class:Change/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
-	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject~~',
-	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve~~',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve~~',
-	'Tickets:Related:OpenChanges' => 'Open changes~~',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:ChangeManagement' => '变更管理',
+	'Menu:Change:Overview' => '概览',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => '新变更',
+	'Menu:NewChange+' => '创建新变更的单据',
+	'Menu:SearchChanges' => '搜索变更',
+	'Menu:SearchChanges+' => '搜索变更单据',
+	'Menu:Change:Shortcuts' => '快捷方式',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => '等待接受的变更',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => '等待批准的变更',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => '待处理的变更',
+	'Menu:Changes+' => '',
+	'Menu:MyChanges' => '指派给我的变更',
+	'Menu:MyChanges+' => '指派给我的变更 (作为办理人)',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Change' => '变更',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:start_date' => '计划启动',
+	'Class:Change/Attribute:start_date+' => '',
+	'Class:Change/Attribute:status' => '状态',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => '新',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:validated' => '已生效',
+	'Class:Change/Attribute:status/Value:validated+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => '已拒绝',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => '已指派',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:plannedscheduled' => '已计划和安排',
+	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:Change/Attribute:status/Value:approved' => '已批准',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:notapproved' => '未批准',
+	'Class:Change/Attribute:status/Value:notapproved+' => '',
+	'Class:Change/Attribute:status/Value:implemented' => '已实施',
+	'Class:Change/Attribute:status/Value:implemented+' => '',
+	'Class:Change/Attribute:status/Value:monitored' => '已监控',
+	'Class:Change/Attribute:status/Value:monitored+' => '',
+	'Class:Change/Attribute:status/Value:closed' => '已关闭',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:reason' => '原因',
+	'Class:Change/Attribute:reason+' => '',
+	'Class:Change/Attribute:requestor_id' => '申请者',
+	'Class:Change/Attribute:requestor_id+' => '',
+	'Class:Change/Attribute:requestor_email' => '申请者',
+	'Class:Change/Attribute:requestor_email+' => '',
+	'Class:Change/Attribute:org_id' => '客户',
+	'Class:Change/Attribute:org_id+' => '',
+	'Class:Change/Attribute:org_name' => '客户',
+	'Class:Change/Attribute:org_name+' => '',
+	'Class:Change/Attribute:workgroup_id' => '工作组',
+	'Class:Change/Attribute:workgroup_id+' => '',
+	'Class:Change/Attribute:workgroup_name' => '工作组',
+	'Class:Change/Attribute:workgroup_name+' => '',
+	'Class:Change/Attribute:creation_date' => '创建',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:last_update' => '最后更新',
+	'Class:Change/Attribute:last_update+' => '',
+	'Class:Change/Attribute:end_date' => '结束',
+	'Class:Change/Attribute:end_date+' => '',
+	'Class:Change/Attribute:close_date' => '关闭',
+	'Class:Change/Attribute:close_date+' => '',
+	'Class:Change/Attribute:impact' => '影响',
+	'Class:Change/Attribute:impact+' => '',
+	'Class:Change/Attribute:agent_id' => '办理人',
+	'Class:Change/Attribute:agent_id+' => '',
+	'Class:Change/Attribute:agent_name' => '办理人',
+	'Class:Change/Attribute:agent_name+' => '',
+	'Class:Change/Attribute:agent_email' => '办理人',
+	'Class:Change/Attribute:agent_email+' => '',
+	'Class:Change/Attribute:supervisor_group_id' => '监督团队',
+	'Class:Change/Attribute:supervisor_group_id+' => '',
+	'Class:Change/Attribute:supervisor_group_name' => '监督团队',
+	'Class:Change/Attribute:supervisor_group_name+' => '',
+	'Class:Change/Attribute:supervisor_id' => '监督者',
+	'Class:Change/Attribute:supervisor_id+' => '',
+	'Class:Change/Attribute:supervisor_email' => '监督者',
+	'Class:Change/Attribute:supervisor_email+' => '',
+	'Class:Change/Attribute:manager_group_id' => '管理团队',
+	'Class:Change/Attribute:manager_group_id+' => '',
+	'Class:Change/Attribute:manager_group_name' => '管理团队',
+	'Class:Change/Attribute:manager_group_name+' => '',
+	'Class:Change/Attribute:manager_id' => '管理人',
+	'Class:Change/Attribute:manager_id+' => '',
+	'Class:Change/Attribute:manager_email' => '管理人',
+	'Class:Change/Attribute:manager_email+' => '',
+	'Class:Change/Attribute:outage' => '停歇',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => '是',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Class:Change/Attribute:outage/Value:no' => '否',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:change_request' => '申请',
+	'Class:Change/Attribute:change_request+' => '',
+	'Class:Change/Attribute:fallback' => '回退计划',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Stimulus:ev_validate' => '生效',
+	'Class:Change/Stimulus:ev_validate+' => '',
+	'Class:Change/Stimulus:ev_reject' => '拒绝',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_assign' => '指派',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_reopen' => '重开',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_plan' => '计划',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_approve' => '批准',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_replan' => '重新计划',
+	'Class:Change/Stimulus:ev_replan+' => '',
+	'Class:Change/Stimulus:ev_notapprove' => '不批准',
+	'Class:Change/Stimulus:ev_notapprove+' => '',
+	'Class:Change/Stimulus:ev_implement' => '实施',
+	'Class:Change/Stimulus:ev_implement+' => '',
+	'Class:Change/Stimulus:ev_monitor' => '监控',
+	'Class:Change/Stimulus:ev_monitor+' => '',
+	'Class:Change/Stimulus:ev_finish' => '完成',
+	'Class:Change/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: RoutineChange
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:RoutineChange' => '例行变更',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Attribute:status/Value:new' => '新',
+	'Class:RoutineChange/Attribute:status/Value:new+' => '',
+	'Class:RoutineChange/Attribute:status/Value:assigned' => '已指派',
+	'Class:RoutineChange/Attribute:status/Value:assigned+' => '',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled' => '已计划和安排',
+	'Class:RoutineChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:RoutineChange/Attribute:status/Value:approved' => '已批准',
+	'Class:RoutineChange/Attribute:status/Value:approved+' => '',
+	'Class:RoutineChange/Attribute:status/Value:implemented' => '已实施',
+	'Class:RoutineChange/Attribute:status/Value:implemented+' => '',
+	'Class:RoutineChange/Attribute:status/Value:monitored' => '已监控',
+	'Class:RoutineChange/Attribute:status/Value:monitored+' => '',
+	'Class:RoutineChange/Attribute:status/Value:closed' => '已关闭',
+	'Class:RoutineChange/Attribute:status/Value:closed+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => '生效',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_assign' => '指派',
+	'Class:RoutineChange/Stimulus:ev_assign+' => '',
+	'Class:RoutineChange/Stimulus:ev_reopen' => '重开',
+	'Class:RoutineChange/Stimulus:ev_reopen+' => '',
+	'Class:RoutineChange/Stimulus:ev_plan' => '计划',
+	'Class:RoutineChange/Stimulus:ev_plan+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => '重新计划',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_implement' => '实施',
+	'Class:RoutineChange/Stimulus:ev_implement+' => '',
+	'Class:RoutineChange/Stimulus:ev_monitor' => '监控',
+	'Class:RoutineChange/Stimulus:ev_monitor+' => '',
+	'Class:RoutineChange/Stimulus:ev_finish' => '完成',
+	'Class:RoutineChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: ApprovedChange
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ApprovedChange' => '批准的变更',
+	'Class:ApprovedChange+' => '',
+	'Class:ApprovedChange/Attribute:approval_date' => '批准日期',
+	'Class:ApprovedChange/Attribute:approval_date+' => '',
+	'Class:ApprovedChange/Attribute:approval_comment' => '批准说明',
+	'Class:ApprovedChange/Attribute:approval_comment+' => '',
+	'Class:ApprovedChange/Stimulus:ev_validate' => '生效',
+	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reject' => '拒绝',
+	'Class:ApprovedChange/Stimulus:ev_reject+' => '',
+	'Class:ApprovedChange/Stimulus:ev_assign' => '指派',
+	'Class:ApprovedChange/Stimulus:ev_assign+' => '',
+	'Class:ApprovedChange/Stimulus:ev_reopen' => '重开',
+	'Class:ApprovedChange/Stimulus:ev_reopen+' => '',
+	'Class:ApprovedChange/Stimulus:ev_plan' => '计划',
+	'Class:ApprovedChange/Stimulus:ev_plan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_approve' => '批准',
+	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
+	'Class:ApprovedChange/Stimulus:ev_replan' => '重新计划',
+	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => '拒绝批准',
+	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
+	'Class:ApprovedChange/Stimulus:ev_implement' => '实施',
+	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
+	'Class:ApprovedChange/Stimulus:ev_monitor' => '监控',
+	'Class:ApprovedChange/Stimulus:ev_monitor+' => '',
+	'Class:ApprovedChange/Stimulus:ev_finish' => '完成',
+	'Class:ApprovedChange/Stimulus:ev_finish+' => '',
+));
+//
+// Class: NormalChange
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:NormalChange' => '正常变更',
+	'Class:NormalChange+' => '',
+	'Class:NormalChange/Attribute:status/Value:new' => '新',
+	'Class:NormalChange/Attribute:status/Value:new+' => '',
+	'Class:NormalChange/Attribute:status/Value:validated' => '已生效',
+	'Class:NormalChange/Attribute:status/Value:validated+' => '',
+	'Class:NormalChange/Attribute:status/Value:rejected' => '已拒绝',
+	'Class:NormalChange/Attribute:status/Value:rejected+' => '',
+	'Class:NormalChange/Attribute:status/Value:assigned' => '已指派',
+	'Class:NormalChange/Attribute:status/Value:assigned+' => '',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled' => '已计划和安排',
+	'Class:NormalChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:NormalChange/Attribute:status/Value:approved' => '已批准',
+	'Class:NormalChange/Attribute:status/Value:approved+' => '',
+	'Class:NormalChange/Attribute:status/Value:notapproved' => '不批准',
+	'Class:NormalChange/Attribute:status/Value:notapproved+' => '',
+	'Class:NormalChange/Attribute:status/Value:implemented' => '已实施',
+	'Class:NormalChange/Attribute:status/Value:implemented+' => '',
+	'Class:NormalChange/Attribute:status/Value:monitored' => '已监控',
+	'Class:NormalChange/Attribute:status/Value:monitored+' => '',
+	'Class:NormalChange/Attribute:status/Value:closed' => '已关闭',
+	'Class:NormalChange/Attribute:status/Value:closed+' => '',
+	'Class:NormalChange/Attribute:acceptance_date' => '接受日期',
+	'Class:NormalChange/Attribute:acceptance_date+' => '',
+	'Class:NormalChange/Attribute:acceptance_comment' => '接受说明',
+	'Class:NormalChange/Attribute:acceptance_comment+' => '',
+	'Class:NormalChange/Stimulus:ev_validate' => '生效',
+	'Class:NormalChange/Stimulus:ev_validate+' => '',
+	'Class:NormalChange/Stimulus:ev_reject' => '拒绝',
+	'Class:NormalChange/Stimulus:ev_reject+' => '',
+	'Class:NormalChange/Stimulus:ev_assign' => '指派',
+	'Class:NormalChange/Stimulus:ev_assign+' => '',
+	'Class:NormalChange/Stimulus:ev_reopen' => '重开',
+	'Class:NormalChange/Stimulus:ev_reopen+' => '',
+	'Class:NormalChange/Stimulus:ev_plan' => '计划',
+	'Class:NormalChange/Stimulus:ev_plan+' => '',
+	'Class:NormalChange/Stimulus:ev_approve' => '批准',
+	'Class:NormalChange/Stimulus:ev_approve+' => '',
+	'Class:NormalChange/Stimulus:ev_replan' => '重新计划',
+	'Class:NormalChange/Stimulus:ev_replan+' => '',
+	'Class:NormalChange/Stimulus:ev_notapprove' => '拒绝批准',
+	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
+	'Class:NormalChange/Stimulus:ev_implement' => '实施',
+	'Class:NormalChange/Stimulus:ev_implement+' => '',
+	'Class:NormalChange/Stimulus:ev_monitor' => '监控',
+	'Class:NormalChange/Stimulus:ev_monitor+' => '',
+	'Class:NormalChange/Stimulus:ev_finish' => '完成',
+	'Class:NormalChange/Stimulus:ev_finish+' => '',
+));
+
+//
+// Class: EmergencyChange
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:EmergencyChange' => '紧急变更',
+	'Class:EmergencyChange+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:new' => '新',
+	'Class:EmergencyChange/Attribute:status/Value:new+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:validated' => '已生效',
+	'Class:EmergencyChange/Attribute:status/Value:validated+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:rejected' => '已拒绝',
+	'Class:EmergencyChange/Attribute:status/Value:rejected+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:assigned' => '已指派',
+	'Class:EmergencyChange/Attribute:status/Value:assigned+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled' => '已计划和安排',
+	'Class:EmergencyChange/Attribute:status/Value:plannedscheduled+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:approved' => '已批准',
+	'Class:EmergencyChange/Attribute:status/Value:approved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved' => '不批准',
+	'Class:EmergencyChange/Attribute:status/Value:notapproved+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:implemented' => '已实施',
+	'Class:EmergencyChange/Attribute:status/Value:implemented+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:monitored' => '已监控',
+	'Class:EmergencyChange/Attribute:status/Value:monitored+' => '',
+	'Class:EmergencyChange/Attribute:status/Value:closed' => '已关闭',
+	'Class:EmergencyChange/Attribute:status/Value:closed+' => '',
+	'Class:EmergencyChange/Stimulus:ev_validate' => '生效',
+	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reject' => '拒绝',
+	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
+	'Class:EmergencyChange/Stimulus:ev_assign' => '指派',
+	'Class:EmergencyChange/Stimulus:ev_assign+' => '',
+	'Class:EmergencyChange/Stimulus:ev_reopen' => '重开',
+	'Class:EmergencyChange/Stimulus:ev_reopen+' => '',
+	'Class:EmergencyChange/Stimulus:ev_plan' => '计划',
+	'Class:EmergencyChange/Stimulus:ev_plan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_approve' => '批准',
+	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
+	'Class:EmergencyChange/Stimulus:ev_replan' => '重新计划',
+	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => '拒绝批准',
+	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
+	'Class:EmergencyChange/Stimulus:ev_implement' => '实施',
+	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
+	'Class:EmergencyChange/Stimulus:ev_monitor' => '监控',
+	'Class:EmergencyChange/Stimulus:ev_monitor+' => '',
+	'Class:EmergencyChange/Stimulus:ev_finish' => '完成',
+	'Class:EmergencyChange/Stimulus:ev_finish+' => '',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days~~',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days~~',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days~~',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days~~',
+	'Class:Change/Attribute:parent_id' => 'Parent change~~',
+	'Class:Change/Attribute:parent_name' => 'Parent change Ref~~',
+	'Class:Change/Attribute:related_request_list' => 'Related requests~~',
+	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change~~',
+	'Class:Change/Attribute:related_problems_list' => 'Related problems~~',
+	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change~~',
+	'Class:Change/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change~~',
+	'Class:Change/Attribute:child_changes_list' => 'Child changes~~',
+	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change~~',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name~~',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Change type~~',
+	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject~~',
+	'Class:RoutineChange/Stimulus:ev_approve' => 'Approve~~',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => 'Do Not Approve~~',
+	'Tickets:Related:OpenChanges' => 'Open changes~~',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php
index 356562158..f418e873f 100755
--- a/datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/en.dict.itop-change-mgmt.php
@@ -1,145 +1,145 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Menu:ChangeManagement' => 'Change management',
-	'Menu:Change:Overview' => 'Overview',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'New change',
-	'Menu:NewChange+' => 'Create a new change ticket',
-	'Menu:SearchChanges' => 'Search for changes',
-	'Menu:SearchChanges+' => 'Search for change tickets',
-	'Menu:Change:Shortcuts' => 'Shortcuts',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Changes awaiting approval',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Open changes',
-	'Menu:Changes+' => 'All open changes',
-	'Menu:MyChanges' => 'Changes assigned to me',
-	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days',
-	'Tickets:Related:OpenChanges' => 'Open changes',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Change' => 'Change',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:status' => 'Status',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'New',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Assigned',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:planned' => 'Planned',
-	'Class:Change/Attribute:status/Value:planned+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Rejected',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Approved',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Closed',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:category' => 'Category',
-	'Class:Change/Attribute:category+' => '',
-	'Class:Change/Attribute:category/Value:application' => 'application',
-	'Class:Change/Attribute:category/Value:application+' => 'application',
-	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
-	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
-	'Class:Change/Attribute:category/Value:network' => 'network',
-	'Class:Change/Attribute:category/Value:network+' => 'network',
-	'Class:Change/Attribute:category/Value:other' => 'other',
-	'Class:Change/Attribute:category/Value:other+' => 'other',
-	'Class:Change/Attribute:category/Value:software' => 'software',
-	'Class:Change/Attribute:category/Value:software+' => 'software',
-	'Class:Change/Attribute:category/Value:system' => 'system',
-	'Class:Change/Attribute:category/Value:system+' => 'system',
-	'Class:Change/Attribute:reject_reason' => 'Reject reason',
-	'Class:Change/Attribute:reject_reason+' => '',
-	'Class:Change/Attribute:changemanager_id' => 'Change manager',
-	'Class:Change/Attribute:changemanager_id+' => '',
-	'Class:Change/Attribute:changemanager_email' => 'Change manager email',
-	'Class:Change/Attribute:changemanager_email+' => '',
-	'Class:Change/Attribute:parent_id' => 'Parent change',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => 'Parent change ref',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:creation_date' => 'Creation date',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:approval_date' => 'Approval date',
-	'Class:Change/Attribute:approval_date+' => '',
-	'Class:Change/Attribute:fallback_plan' => 'Fallback plan',
-	'Class:Change/Attribute:fallback_plan+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Related requests',
-	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change',
-	'Class:Change/Attribute:related_incident_list' => 'Related incidents',
-	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change',
-	'Class:Change/Attribute:related_problems_list' => 'Related problems',
-	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes',
-	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent change friendly name',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Assign',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Plan',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Reject',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Reopen',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Approve',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Close',
-	'Class:Change/Stimulus:ev_finish+' => '',
-	'Class:Change/Attribute:outage' => 'Outage',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'No',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:ChangeManagement' => 'Change management',
+	'Menu:Change:Overview' => 'Overview',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'New change',
+	'Menu:NewChange+' => 'Create a new change ticket',
+	'Menu:SearchChanges' => 'Search for changes',
+	'Menu:SearchChanges+' => 'Search for change tickets',
+	'Menu:Change:Shortcuts' => 'Shortcuts',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changes awaiting acceptance',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Changes awaiting approval',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Open changes',
+	'Menu:Changes+' => 'All open changes',
+	'Menu:MyChanges' => 'Changes assigned to me',
+	'Menu:MyChanges+' => 'Changes assigned to me (as Agent)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes by category for the last 7 days',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Number of changes for the last 7 days',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes by domain for the last 7 days',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes by status for the last 7 days',
+	'Tickets:Related:OpenChanges' => 'Open changes',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Change' => 'Change',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'New',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Assigned',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => 'Planned',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rejected',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Approved',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Closed',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:category' => 'Category',
+	'Class:Change/Attribute:category+' => '',
+	'Class:Change/Attribute:category/Value:application' => 'application',
+	'Class:Change/Attribute:category/Value:application+' => 'application',
+	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
+	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
+	'Class:Change/Attribute:category/Value:network' => 'network',
+	'Class:Change/Attribute:category/Value:network+' => 'network',
+	'Class:Change/Attribute:category/Value:other' => 'other',
+	'Class:Change/Attribute:category/Value:other+' => 'other',
+	'Class:Change/Attribute:category/Value:software' => 'software',
+	'Class:Change/Attribute:category/Value:software+' => 'software',
+	'Class:Change/Attribute:category/Value:system' => 'system',
+	'Class:Change/Attribute:category/Value:system+' => 'system',
+	'Class:Change/Attribute:reject_reason' => 'Reject reason',
+	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changemanager_id' => 'Change manager',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:changemanager_email' => 'Change manager email',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_id' => 'Parent change',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => 'Parent change ref',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Creation date',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => 'Approval date',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => 'Fallback plan',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Related requests',
+	'Class:Change/Attribute:related_request_list+' => 'All the user requests linked to this change',
+	'Class:Change/Attribute:related_incident_list' => 'Related incidents',
+	'Class:Change/Attribute:related_incident_list+' => 'All the incidents linked to this change',
+	'Class:Change/Attribute:related_problems_list' => 'Related problems',
+	'Class:Change/Attribute:related_problems_list+' => 'All the problems linked to this change',
+	'Class:Change/Attribute:child_changes_list' => 'Child changes',
+	'Class:Change/Attribute:child_changes_list+' => 'All the sub changes linked to this change',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent change friendly name',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Assign',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Plan',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Reject',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Reopen',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Approve',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Close',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:Change/Attribute:outage' => 'Outage',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'No',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+));
+
+?>
diff --git a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
index 09d061ae7..16d3e87f9 100755
--- a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
@@ -1,93 +1,93 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Change Management',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.0.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-		'installer' => 'ChangeManagementInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-change-mgmt.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-change-mgmt.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-change-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-// Module installation handler
-//
-class ChangeManagementInstaller extends ModuleInstallerAPI
-{
-	public static function BeforeWritingConfig(Config $oConfiguration)
-	{
-		// If you want to override/force some configuration values, do it here
-		return $oConfiguration;
-	}
-
-	/**
-	 * Handler called before creating or upgrading the database schema
-	 * @param $oConfiguration Config The new configuration of the application
-	 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-	 * @param $sCurrentVersion string Current version number of the module
-	 */
-	public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-	{
-		// If you want to migrate data from one format to another, do it here
-	}
-	
-	/**
-	 * Handler called after the creation/update of the database schema
-	 * @param $oConfiguration Config The new configuration of the application
-	 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-	 * @param $sCurrentVersion string Current version number of the module
-	 */
-	public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-	{
-		// Bug #464 - start_date was both in Ticket and Change tables
-		//
-		$sSourceTable = 'change';
-		$sSourceKeyField = 'id';
-
-		$sTargetTable = 'ticket';
-		$sTargetKeyField = 'id';
-
-		$sField = 'start_date';
-
-		if (CMDBSource::IsField($sSourceTable, $sField) && CMDBSource::IsField($sTargetTable, $sField) && CMDBSource::IsField($sSourceTable, $sSourceKeyField) && CMDBSource::IsField($sTargetTable, $sTargetKeyField))
-		{
-			SetupWebPage::log_info("Issue #464 - Copying change/start_date into ticket/start_date"); 
-			$sRepair = "UPDATE `$sTargetTable`, `$sSourceTable` SET `$sTargetTable`.`$sField` = `$sSourceTable`.`$sField` WHERE `$sTargetTable`.`$sField` IS NULL AND`$sTargetTable`.`$sTargetKeyField` = `$sSourceTable`.`$sSourceKeyField`";
-			CMDBSource::Query($sRepair);
-		}
-	}
-}
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-change-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Change Management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-tickets/2.0.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+		'installer' => 'ChangeManagementInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-change-mgmt.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-change-mgmt.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-change-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+// Module installation handler
+//
+class ChangeManagementInstaller extends ModuleInstallerAPI
+{
+	public static function BeforeWritingConfig(Config $oConfiguration)
+	{
+		// If you want to override/force some configuration values, do it here
+		return $oConfiguration;
+	}
+
+	/**
+	 * Handler called before creating or upgrading the database schema
+	 * @param $oConfiguration Config The new configuration of the application
+	 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+	 * @param $sCurrentVersion string Current version number of the module
+	 */
+	public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+	{
+		// If you want to migrate data from one format to another, do it here
+	}
+	
+	/**
+	 * Handler called after the creation/update of the database schema
+	 * @param $oConfiguration Config The new configuration of the application
+	 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+	 * @param $sCurrentVersion string Current version number of the module
+	 */
+	public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+	{
+		// Bug #464 - start_date was both in Ticket and Change tables
+		//
+		$sSourceTable = 'change';
+		$sSourceKeyField = 'id';
+
+		$sTargetTable = 'ticket';
+		$sTargetKeyField = 'id';
+
+		$sField = 'start_date';
+
+		if (CMDBSource::IsField($sSourceTable, $sField) && CMDBSource::IsField($sTargetTable, $sField) && CMDBSource::IsField($sSourceTable, $sSourceKeyField) && CMDBSource::IsField($sTargetTable, $sTargetKeyField))
+		{
+			SetupWebPage::log_info("Issue #464 - Copying change/start_date into ticket/start_date"); 
+			$sRepair = "UPDATE `$sTargetTable`, `$sSourceTable` SET `$sTargetTable`.`$sField` = `$sSourceTable`.`$sField` WHERE `$sTargetTable`.`$sField` IS NULL AND`$sTargetTable`.`$sTargetKeyField` = `$sSourceTable`.`$sSourceKeyField`";
+			CMDBSource::Query($sRepair);
+		}
+	}
+}
diff --git a/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
index 97daec682..527ec02fc 100644
--- a/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/nl.dict.itop-change-mgmt.php
@@ -1,148 +1,148 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-'Menu:ChangeManagement' => 'Change management',
-	'Menu:Change:Overview' => 'Overzicht',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Nieuwe change',
-	'Menu:NewChange+' => 'Maak een nieuwe change ticket aan',
-	'Menu:SearchChanges' => 'Zoek voor changes',
-	'Menu:SearchChanges+' => 'Zoek voor change tickets',
-	'Menu:Change:Shortcuts' => 'Snelkoppelingen',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Changes die nog acceptatie vereisen',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Changes die nog goedkeuring vereisen',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Open changes',
-	'Menu:Changes+' => 'Alle open changes',
-	'Menu:MyChanges' => 'Changes toegewezen aan mij',
-	'Menu:MyChanges+' => 'Changes toegewezen door mij (als Agent)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes per categorie van de afgelopen 7 dagen',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Aantal changes van de afgelopen 7 dagen',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes per domein van de afgelopen 7 dagen',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes per status van de afgelopen 7 dagen',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('NL NL', "Dutch", "Nederlands", array(
-	'Class:Change' => 'Change',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:status' => 'Status',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Nieuw',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Toegewezen',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:planned' => 'Gepland',
-	'Class:Change/Attribute:status/Value:planned+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Rejected',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Goedgekeurd',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Gesloten',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:category' => 'Categorie',
-	'Class:Change/Attribute:category+' => '',
-	'Class:Change/Attribute:category/Value:application' => 'applicatie',
-	'Class:Change/Attribute:category/Value:application+' => 'applicatie',
-	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
-	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
-	'Class:Change/Attribute:category/Value:network' => 'netwerk',
-	'Class:Change/Attribute:category/Value:network+' => 'netwerk',
-	'Class:Change/Attribute:category/Value:other' => 'anders',
-	'Class:Change/Attribute:category/Value:other+' => 'anders',
-	'Class:Change/Attribute:category/Value:software' => 'software',
-	'Class:Change/Attribute:category/Value:software+' => 'software',
-	'Class:Change/Attribute:category/Value:system' => 'systeem',
-	'Class:Change/Attribute:category/Value:system+' => 'systeem',
-	'Class:Change/Attribute:reject_reason' => 'Reden van afwijzing',
-	'Class:Change/Attribute:reject_reason+' => '',
-	'Class:Change/Attribute:changemanager_id' => 'Change manager',
-	'Class:Change/Attribute:changemanager_id+' => '',
-	'Class:Change/Attribute:changemanager_email' => 'Change manager email',
-	'Class:Change/Attribute:changemanager_email+' => '',
-	'Class:Change/Attribute:parent_id' => 'Hoofd change',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => 'Hoofd change ref',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:creation_date' => 'Creatie datum',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:approval_date' => 'Goedkeuring datum',
-	'Class:Change/Attribute:approval_date+' => '',
-	'Class:Change/Attribute:fallback_plan' => 'Backup plan',
-	'Class:Change/Attribute:fallback_plan+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Gerelateerde verzoeken',
-	'Class:Change/Attribute:related_request_list+' => 'Alle gebruikersverzoeken gelinkt aan deze change',
-	'Class:Change/Attribute:related_incident_list' => 'Gerelateerde incidenten',
-	'Class:Change/Attribute:related_incident_list+' => 'Alle incidenten die gelinkt zijn aan deze change',
-	'Class:Change/Attribute:related_problems_list' => 'Gerelateerde problemen',
-	'Class:Change/Attribute:related_problems_list+' => 'Alle problemen gelinkt aan deze change',
-	'Class:Change/Attribute:child_changes_list' => 'Sub changes',
-	'Class:Change/Attribute:child_changes_list+' => 'Alle sub changes gelinkt aan deze change',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Hoofd change friendly name',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Wijs toe',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Plan',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Wijs af',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Heropen',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Keur goed',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Sluit',
-	'Class:Change/Stimulus:ev_finish+' => '',
-	'Class:Change/Attribute:outage' => 'Storing',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:no' => 'Nee',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Tickets:Related:OpenChanges' => 'Open changes~~',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+'Menu:ChangeManagement' => 'Change management',
+	'Menu:Change:Overview' => 'Overzicht',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Nieuwe change',
+	'Menu:NewChange+' => 'Maak een nieuwe change ticket aan',
+	'Menu:SearchChanges' => 'Zoek voor changes',
+	'Menu:SearchChanges+' => 'Zoek voor change tickets',
+	'Menu:Change:Shortcuts' => 'Snelkoppelingen',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changes die nog acceptatie vereisen',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Changes die nog goedkeuring vereisen',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Open changes',
+	'Menu:Changes+' => 'Alle open changes',
+	'Menu:MyChanges' => 'Changes toegewezen aan mij',
+	'Menu:MyChanges+' => 'Changes toegewezen door mij (als Agent)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes per categorie van de afgelopen 7 dagen',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Aantal changes van de afgelopen 7 dagen',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes per domein van de afgelopen 7 dagen',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes per status van de afgelopen 7 dagen',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('NL NL', "Dutch", "Nederlands", array(
+	'Class:Change' => 'Change',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Nieuw',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Toegewezen',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => 'Gepland',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rejected',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Goedgekeurd',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Gesloten',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:category' => 'Categorie',
+	'Class:Change/Attribute:category+' => '',
+	'Class:Change/Attribute:category/Value:application' => 'applicatie',
+	'Class:Change/Attribute:category/Value:application+' => 'applicatie',
+	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
+	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
+	'Class:Change/Attribute:category/Value:network' => 'netwerk',
+	'Class:Change/Attribute:category/Value:network+' => 'netwerk',
+	'Class:Change/Attribute:category/Value:other' => 'anders',
+	'Class:Change/Attribute:category/Value:other+' => 'anders',
+	'Class:Change/Attribute:category/Value:software' => 'software',
+	'Class:Change/Attribute:category/Value:software+' => 'software',
+	'Class:Change/Attribute:category/Value:system' => 'systeem',
+	'Class:Change/Attribute:category/Value:system+' => 'systeem',
+	'Class:Change/Attribute:reject_reason' => 'Reden van afwijzing',
+	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changemanager_id' => 'Change manager',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:changemanager_email' => 'Change manager email',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_id' => 'Hoofd change',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => 'Hoofd change ref',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Creatie datum',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => 'Goedkeuring datum',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => 'Backup plan',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Gerelateerde verzoeken',
+	'Class:Change/Attribute:related_request_list+' => 'Alle gebruikersverzoeken gelinkt aan deze change',
+	'Class:Change/Attribute:related_incident_list' => 'Gerelateerde incidenten',
+	'Class:Change/Attribute:related_incident_list+' => 'Alle incidenten die gelinkt zijn aan deze change',
+	'Class:Change/Attribute:related_problems_list' => 'Gerelateerde problemen',
+	'Class:Change/Attribute:related_problems_list+' => 'Alle problemen gelinkt aan deze change',
+	'Class:Change/Attribute:child_changes_list' => 'Sub changes',
+	'Class:Change/Attribute:child_changes_list+' => 'Alle sub changes gelinkt aan deze change',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Hoofd change friendly name',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Wijs toe',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Plan',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Wijs af',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Heropen',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Keur goed',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Sluit',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:Change/Attribute:outage' => 'Storing',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => 'Nee',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => 'Yes',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
+	'Tickets:Related:OpenChanges' => 'Open changes~~',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php b/datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php
index f6dffecc5..4211cc92d 100644
--- a/datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/pt_br.dict.itop-change-mgmt.php
@@ -1,142 +1,142 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:ChangeManagement' => 'Gerenciamento Mudanças',
-	'Menu:Change:Overview' => 'Visão geral',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Nova mudança',
-	'Menu:NewChange+' => 'Criar uma nova solicitação de mudança',
-	'Menu:SearchChanges' => 'Pesquisar por mudanças',
-	'Menu:SearchChanges+' => 'Pesquisar por solicitação de mudança',
-	'Menu:Change:Shortcuts' => 'Atalho',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Mudanças à espera de aceitação',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Mudanças abertas',
-	'Menu:Changes+' => 'Todas mudanças abertas',
-	'Menu:MyChanges' => 'Mudanças atribuídas a mim',
-	'Menu:MyChanges+' => 'Mudanças atribuídas a mim (como Agente)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Mudanças por categoria nos últimos 7 dias',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Número de mudanças nos últimos 7 dias',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Mudanças por status nos últimos 7 dias',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Change
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Change' => 'Mudanças',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:status' => 'Status',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Nova',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Atribuido',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:planned' => 'Planejado',
-	'Class:Change/Attribute:status/Value:planned+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Rejeitado',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Aprovado',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Fechado',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:category' => 'Categoria',
-	'Class:Change/Attribute:category+' => '',
-	'Class:Change/Attribute:category/Value:application' => 'aplicação',
-	'Class:Change/Attribute:category/Value:application+' => 'aplicação',
-	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
-	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
-	'Class:Change/Attribute:category/Value:network' => 'rede',
-	'Class:Change/Attribute:category/Value:network+' => 'rede',
-	'Class:Change/Attribute:category/Value:other' => 'outro',
-	'Class:Change/Attribute:category/Value:other+' => 'outro',
-	'Class:Change/Attribute:category/Value:software' => 'software',
-	'Class:Change/Attribute:category/Value:software+' => 'software',
-	'Class:Change/Attribute:category/Value:system' => 'sistema',
-	'Class:Change/Attribute:category/Value:system+' => 'sistema',
-	'Class:Change/Attribute:reject_reason' => 'Razão rejeição',
-	'Class:Change/Attribute:reject_reason+' => '',
-	'Class:Change/Attribute:changemanager_id' => 'Gerente mudança',
-	'Class:Change/Attribute:changemanager_id+' => '',
-	'Class:Change/Attribute:changemanager_email' => 'Email gerente mudança',
-	'Class:Change/Attribute:changemanager_email+' => '',
-	'Class:Change/Attribute:parent_id' => 'Parente mudança',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => 'Ref parente mudança',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:creation_date' => 'Data criação',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:approval_date' => 'Data aprovação',
-	'Class:Change/Attribute:approval_date+' => '',
-	'Class:Change/Attribute:fallback_plan' => 'Plano de contingência',
-	'Class:Change/Attribute:fallback_plan+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Solicitações relacionadas',
-	'Class:Change/Attribute:related_request_list+' => 'Todas as solicitações de usuários ligados a esta mudança',
-	'Class:Change/Attribute:related_incident_list' => 'Incidentes relacionados',
-	'Class:Change/Attribute:related_incident_list+' => 'Todos os incidentes ligados a esta mudança',
-	'Class:Change/Attribute:related_problems_list' => 'Problemas relacionados',
-	'Class:Change/Attribute:related_problems_list+' => 'Todos os problemas relacionados com esta mudança',
-	'Class:Change/Attribute:child_changes_list' => 'Mudanças filhas',
-	'Class:Change/Attribute:child_changes_list+' => 'Todas as sub-mudanças ligadas a esta mudança',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Nome amigável mudança relacionado',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Atribuir',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Planejar',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Aprovar',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Fechar',
-	'Class:Change/Stimulus:ev_finish+' => '',
-	'Tickets:Related:OpenChanges' => 'Open changes~~',
-	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
-	'Class:Change/Attribute:outage' => 'Outage',
-	'Class:Change/Attribute:outage/Value:no' => 'Não',
-	'Class:Change/Attribute:outage/Value:yes' => 'Sim',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:ChangeManagement' => 'Gerenciamento Mudanças',
+	'Menu:Change:Overview' => 'Visão geral',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Nova mudança',
+	'Menu:NewChange+' => 'Criar uma nova solicitação de mudança',
+	'Menu:SearchChanges' => 'Pesquisar por mudanças',
+	'Menu:SearchChanges+' => 'Pesquisar por solicitação de mudança',
+	'Menu:Change:Shortcuts' => 'Atalho',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Mudanças à espera de aceitação',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Mudanças aguardando aprovação',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Mudanças abertas',
+	'Menu:Changes+' => 'Todas mudanças abertas',
+	'Menu:MyChanges' => 'Mudanças atribuídas a mim',
+	'Menu:MyChanges+' => 'Mudanças atribuídas a mim (como Agente)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Mudanças por categoria nos últimos 7 dias',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Número de mudanças nos últimos 7 dias',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Mudanças por domínio nos últimos 7 dias',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Mudanças por status nos últimos 7 dias',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Change' => 'Mudanças',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Nova',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Atribuido',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => 'Planejado',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Rejeitado',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Aprovado',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Fechado',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:category' => 'Categoria',
+	'Class:Change/Attribute:category+' => '',
+	'Class:Change/Attribute:category/Value:application' => 'aplicação',
+	'Class:Change/Attribute:category/Value:application+' => 'aplicação',
+	'Class:Change/Attribute:category/Value:hardware' => 'hardware',
+	'Class:Change/Attribute:category/Value:hardware+' => 'hardware',
+	'Class:Change/Attribute:category/Value:network' => 'rede',
+	'Class:Change/Attribute:category/Value:network+' => 'rede',
+	'Class:Change/Attribute:category/Value:other' => 'outro',
+	'Class:Change/Attribute:category/Value:other+' => 'outro',
+	'Class:Change/Attribute:category/Value:software' => 'software',
+	'Class:Change/Attribute:category/Value:software+' => 'software',
+	'Class:Change/Attribute:category/Value:system' => 'sistema',
+	'Class:Change/Attribute:category/Value:system+' => 'sistema',
+	'Class:Change/Attribute:reject_reason' => 'Razão rejeição',
+	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changemanager_id' => 'Gerente mudança',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:changemanager_email' => 'Email gerente mudança',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_id' => 'Parente mudança',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => 'Ref parente mudança',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:creation_date' => 'Data criação',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => 'Data aprovação',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => 'Plano de contingência',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Solicitações relacionadas',
+	'Class:Change/Attribute:related_request_list+' => 'Todas as solicitações de usuários ligados a esta mudança',
+	'Class:Change/Attribute:related_incident_list' => 'Incidentes relacionados',
+	'Class:Change/Attribute:related_incident_list+' => 'Todos os incidentes ligados a esta mudança',
+	'Class:Change/Attribute:related_problems_list' => 'Problemas relacionados',
+	'Class:Change/Attribute:related_problems_list+' => 'Todos os problemas relacionados com esta mudança',
+	'Class:Change/Attribute:child_changes_list' => 'Mudanças filhas',
+	'Class:Change/Attribute:child_changes_list+' => 'Todas as sub-mudanças ligadas a esta mudança',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Nome amigável mudança relacionado',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Atribuir',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Planejar',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Aprovar',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Fechar',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Tickets:Related:OpenChanges' => 'Open changes~~',
+	'Tickets:Related:RecentChanges' => 'Recent changes (72h)~~',
+	'Class:Change/Attribute:outage' => 'Outage',
+	'Class:Change/Attribute:outage/Value:no' => 'Não',
+	'Class:Change/Attribute:outage/Value:yes' => 'Sim',
+));
+
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
index e7ce020da..a9dcecce2 100755
--- a/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php
@@ -1,1897 +1,1897 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Relation:impacts/Description' => 'Elements impacted by',
-	'Relation:impacts/DownStream' => 'Impacts...',
-	'Relation:impacts/DownStream+' => 'Elements impacted by',
-	'Relation:impacts/UpStream' => 'Depends on......',
-	'Relation:impacts/UpStream+' => 'Elements impacting',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Elements impacting',
-	'Relation:depends on/DownStream' => 'Depends on...',
-	'Relation:depends on/UpStream' => 'Impacts...',
-));
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-
-//
-// Class: Organization
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Organization' => 'Organization',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Name',
-	'Class:Organization/Attribute:name+' => 'Common name',
-	'Class:Organization/Attribute:code' => 'Code',
-	'Class:Organization/Attribute:code+' => 'Organization code (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Active',
-	'Class:Organization/Attribute:status/Value:active+' => 'Active',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inactive',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Organization/Attribute:parent_id' => 'Parent',
-	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
-	'Class:Organization/Attribute:parent_name' => 'Parent name',
-	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Location' => 'Location',
-	'Class:Location+' => 'Any type of location: Region, Country, City, Site, Building, Floor, Room, Rack,...',
-	'Class:Location/Attribute:name' => 'Name',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Active',
-	'Class:Location/Attribute:status/Value:active+' => 'Active',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inactive',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Location/Attribute:org_id' => 'Owner organization',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Name of the owner organization',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Address',
-	'Class:Location/Attribute:address+' => 'Postal address',
-	'Class:Location/Attribute:postal_code' => 'Postal code',
-	'Class:Location/Attribute:postal_code+' => 'ZIP/Postal code',
-	'Class:Location/Attribute:city' => 'City',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Country',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location',
-	'Class:Location/Attribute:person_list' => 'Contacts',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Contact' => 'Contact',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Name',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Active',
-	'Class:Contact/Attribute:status/Value:active+' => 'Active',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inactive',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactive',
-	'Class:Contact/Attribute:org_id' => 'Organization',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organization name',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Phone',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notification',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'no',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes',
-	'Class:Contact/Attribute:function' => 'Function',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact',
-	'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
-	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Person' => 'Person',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Last Name',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'First Name',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Employee number',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Location',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Location name',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Manager name',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Person/Attribute:picture' => 'Picture',
-	'Class:Person/Attribute:picture+' => '',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Members',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Document' => 'Document',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Name',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organization',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Organization name',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Document type',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Version',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Description',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Draft',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Published',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document',
-	'Class:Document/Attribute:contracts_list' => 'Contracts',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
-	'Class:Document/Attribute:finalclass' => 'Document sub-class',
-	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentFile' => 'Document File',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'File',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentNote' => 'Document Note',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Text',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentWeb' => 'Document Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
-//
-// Class: FunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FunctionalCI' => 'Functional CI',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Name',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:description' => 'Description',
-	'Class:FunctionalCI/Attribute:description+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => 'Organization',
-	'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 criticality',
-	'Class:FunctionalCI/Attribute:business_criticity+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'high',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium',
-	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date',
-	'Class:FunctionalCI/Attribute:move2production+' => '',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Documents',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
-	'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
-	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets',
-));
-
-//
-// Class: PhysicalDevice
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PhysicalDevice' => 'Physical Device',
-	'Class:PhysicalDevice+' => '',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number',
-	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Location',
-	'Class:PhysicalDevice/Attribute:location_id+' => '',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Location name',
-	'Class:PhysicalDevice/Attribute:location_name+' => '',
-	'Class:PhysicalDevice/Attribute:status' => 'Status',
-	'Class:PhysicalDevice/Attribute:status+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand',
-	'Class:PhysicalDevice/Attribute:brand_id+' => '',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name',
-	'Class:PhysicalDevice/Attribute:brand_name+' => '',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
-	'Class:PhysicalDevice/Attribute:model_id+' => '',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Model name',
-	'Class:PhysicalDevice/Attribute:model_name+' => '',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number',
-	'Class:PhysicalDevice/Attribute:asset_number+' => '',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date',
-	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty',
-	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
-));
-
-//
-// Class: Rack
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Rack' => 'Rack',
-	'Class:Rack+' => '',
-	'Class:Rack/Attribute:nb_u' => 'Rack units',
-	'Class:Rack/Attribute:nb_u+' => '',
-	'Class:Rack/Attribute:device_list' => 'Devices',
-	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack',
-	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
-	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack',
-));
-
-//
-// Class: TelephonyCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TelephonyCI' => 'Telephony CI',
-	'Class:TelephonyCI+' => '',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number',
-	'Class:TelephonyCI/Attribute:phonenumber+' => '',
-));
-
-//
-// Class: Phone
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Phone' => 'Phone',
-	'Class:Phone+' => '',
-));
-
-//
-// Class: MobilePhone
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:MobilePhone' => 'Mobile Phone',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-));
-
-//
-// Class: IPPhone
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:IPPhone' => 'IP Phone',
-	'Class:IPPhone+' => '',
-));
-
-//
-// Class: Tablet
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Tablet' => 'Tablet',
-	'Class:Tablet+' => '',
-));
-
-//
-// Class: ConnectableCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ConnectableCI' => 'Connectable CI',
-	'Class:ConnectableCI+' => 'Physical CI',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces',
-));
-
-//
-// Class: DatacenterDevice
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DatacenterDevice' => 'Datacenter Device',
-	'Class:DatacenterDevice+' => '',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
-	'Class:DatacenterDevice/Attribute:rack_id+' => '',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name',
-	'Class:DatacenterDevice/Attribute:rack_name+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure',
-	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name',
-	'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+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source',
-	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name',
-	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source',
-	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name',
-	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device',
-	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up',
-	// Unused yet
-	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up',
-	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up',
-));
-
-//
-// Class: NetworkDevice
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:NetworkDevice' => 'Network Device',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version',
-	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name',
-	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-));
-
-//
-// Class: Server
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Server' => 'Server',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:osfamily_id' => 'OS family',
-	'Class:Server/Attribute:osfamily_id+' => '',
-	'Class:Server/Attribute:osfamily_name' => 'OS family name',
-	'Class:Server/Attribute:osfamily_name+' => '',
-	'Class:Server/Attribute:osversion_id' => 'OS version',
-	'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+' => '',
-	'Class:Server/Attribute:oslicence_name' => 'OS licence 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:logicalvolumes_list' => 'Logical volumes',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server',
-));
-
-//
-// Class: StorageSystem
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:StorageSystem' => 'Storage System',
-	'Class:StorageSystem+' => '',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system',
-));
-
-//
-// Class: SANSwitch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SANSwitch' => 'SAN Switch',
-	'Class:SANSwitch+' => '',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch',
-));
-
-//
-// Class: TapeLibrary
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TapeLibrary' => 'Tape Library',
-	'Class:TapeLibrary+' => '',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library',
-));
-
-//
-// Class: NAS
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS',
-));
-
-//
-// Class: PC
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:osfamily_id' => 'OS family',
-	'Class:PC/Attribute:osfamily_id+' => '',
-	'Class:PC/Attribute:osfamily_name' => 'OS family name',
-	'Class:PC/Attribute:osfamily_name+' => '',
-	'Class:PC/Attribute:osversion_id' => 'OS version',
-	'Class:PC/Attribute:osversion_id+' => '',
-	'Class:PC/Attribute:osversion_name' => 'OS version 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' => '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',
-	'Class:PC/Attribute:type/Value:laptop+' => 'laptop',
-));
-
-//
-// Class: Printer
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Printer' => 'Printer',
-	'Class:Printer+' => '',
-));
-
-//
-// Class: PowerConnection
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PowerConnection' => 'Power Connection',
-	'Class:PowerConnection+' => '',
-));
-
-//
-// Class: PowerSource
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PowerSource' => 'Power Source',
-	'Class:PowerSource+' => '',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
-	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source',
-));
-
-//
-// Class: PDU
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '',
-	'Class:PDU/Attribute:rack_id' => 'Rack',
-	'Class:PDU/Attribute:rack_id+' => '',
-	'Class:PDU/Attribute:rack_name' => 'Rack name',
-	'Class:PDU/Attribute:rack_name+' => '',
-	'Class:PDU/Attribute:powerstart_id' => 'Power start',
-	'Class:PDU/Attribute:powerstart_id+' => '',
-	'Class:PDU/Attribute:powerstart_name' => 'Power start name',
-	'Class:PDU/Attribute:powerstart_name+' => '',
-));
-
-//
-// Class: Peripheral
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Peripheral' => 'Peripheral',
-	'Class:Peripheral+' => '',
-));
-
-//
-// Class: Enclosure
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Enclosure' => 'Enclosure',
-	'Class:Enclosure+' => '',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack',
-	'Class:Enclosure/Attribute:rack_id+' => '',
-	'Class:Enclosure/Attribute:rack_name' => 'Rack name',
-	'Class:Enclosure/Attribute:rack_name+' => '',
-	'Class:Enclosure/Attribute:nb_u' => 'Rack units',
-	'Class:Enclosure/Attribute:nb_u+' => '',
-	'Class:Enclosure/Attribute:device_list' => 'Devices',
-	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure',
-));
-
-//
-// Class: ApplicationSolution
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ApplicationSolution' => 'Application Solution',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution',
-	'Class:ApplicationSolution/Attribute:status' => 'Status',
-	'Class:ApplicationSolution/Attribute:status+' => '',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive',
-	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up',
-));
-
-//
-// Class: BusinessProcess
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:BusinessProcess' => 'Business Process',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process',
-	'Class:BusinessProcess/Attribute:status' => 'Status',
-	'Class:BusinessProcess/Attribute:status+' => '',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'active',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive',
-));
-
-//
-// Class: SoftwareInstance
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SoftwareInstance' => 'Software Instance',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Attribute:system_id' => 'System',
-	'Class:SoftwareInstance/Attribute:system_id+' => '',
-	'Class:SoftwareInstance/Attribute:system_name' => 'System name',
-	'Class:SoftwareInstance/Attribute:system_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
-	'Class:SoftwareInstance/Attribute:software_id+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => 'Software name',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
-	'Class:SoftwareInstance/Attribute:path' => 'Path',
-	'Class:SoftwareInstance/Attribute:path+' => '',
-	'Class:SoftwareInstance/Attribute:status' => 'Status',
-	'Class:SoftwareInstance/Attribute:status+' => '',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive',
-));
-
-//
-// Class: Middleware
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => '',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware',
-));
-
-//
-// Class: DBServer
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DBServer' => 'DB Server',
-	'Class:DBServer+' => '',
-	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas',
-	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server',
-));
-
-//
-// Class: WebServer
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:WebServer' => 'Web server',
-	'Class:WebServer+' => '',
-	'Class:WebServer/Attribute:webapp_list' => 'Web applications',
-	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server',
-));
-
-//
-// Class: PCSoftware
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PCSoftware' => 'PC Software',
-	'Class:PCSoftware+' => '',
-));
-
-//
-// Class: OtherSoftware
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:OtherSoftware' => 'Other Software',
-	'Class:OtherSoftware+' => '',
-));
-
-//
-// Class: MiddlewareInstance
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:MiddlewareInstance' => 'Middleware Instance',
-	'Class:MiddlewareInstance+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
-	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name',
-	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
-));
-
-//
-// Class: DatabaseSchema
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DatabaseSchema' => 'Database Schema',
-	'Class:DatabaseSchema+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
-	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name',
-	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
-));
-
-//
-// Class: WebApplication
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:WebApplication' => 'Web Application',
-	'Class:WebApplication+' => '',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
-	'Class:WebApplication/Attribute:webserver_id+' => '',
-	'Class:WebApplication/Attribute:webserver_name' => 'Web server name',
-	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:url' => 'URL',
-	'Class:WebApplication/Attribute:url+' => '',
-));
-
-
-//
-// Class: VirtualDevice
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:VirtualDevice' => 'Virtual Device',
-	'Class:VirtualDevice+' => '',
-	'Class:VirtualDevice/Attribute:status' => 'Status',
-	'Class:VirtualDevice/Attribute:status+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'production',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device',
-));
-
-//
-// Class: VirtualHost
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:VirtualHost' => 'Virtual Host',
-	'Class:VirtualHost+' => '',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host',
-));
-
-//
-// Class: Hypervisor
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '',
-	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
-	'Class:Hypervisor/Attribute:farm_id+' => '',
-	'Class:Hypervisor/Attribute:farm_name' => 'Farm name',
-	'Class:Hypervisor/Attribute:farm_name+' => '',
-	'Class:Hypervisor/Attribute:server_id' => 'Server',
-	'Class:Hypervisor/Attribute:server_id+' => '',
-	'Class:Hypervisor/Attribute:server_name' => 'Server name',
-	'Class:Hypervisor/Attribute:server_name+' => '',
-));
-
-//
-// Class: Farm
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Farm' => 'Farm',
-	'Class:Farm+' => '',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm',
-	'Class:Farm/Attribute:redundancy' => 'High availability',
-	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up',
-	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up',
-	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up',
-));
-
-//
-// Class: VirtualMachine
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:VirtualMachine' => 'Virtual Machine',
-	'Class:VirtualMachine+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host',
-	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name',
-	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family',
-	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name',
-	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version',
-	'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+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name',
-	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
-	'Class:VirtualMachine/Attribute:cpu+' => '',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM',
-	'Class:VirtualMachine/Attribute:ram+' => '',
-	'Class:VirtualMachine/Attribute:managementip' => 'IP',
-	'Class:VirtualMachine/Attribute:managementip+' => '',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces',
-));
-
-//
-// Class: LogicalVolume
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:LogicalVolume' => 'Logical Volume',
-	'Class:LogicalVolume+' => '',
-	'Class:LogicalVolume/Attribute:name' => 'Name',
-	'Class:LogicalVolume/Attribute:name+' => '',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
-	'Class:LogicalVolume/Attribute:lun_id+' => '',
-	'Class:LogicalVolume/Attribute:description' => 'Description',
-	'Class:LogicalVolume/Attribute:description+' => '',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level',
-	'Class:LogicalVolume/Attribute:raid_level+' => '',
-	'Class:LogicalVolume/Attribute:size' => 'Size',
-	'Class:LogicalVolume/Attribute:size+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system',
-	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name',
-	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servers',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume',
-));
-
-//
-// Class: lnkServerToVolume
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkServerToVolume' => 'Link Server / Volume',
-	'Class:lnkServerToVolume+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name',
-	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
-	'Class:lnkServerToVolume/Attribute:server_id+' => '',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name',
-	'Class:lnkServerToVolume/Attribute:server_name+' => '',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used',
-	'Class:lnkServerToVolume/Attribute:size_used+' => '',
-));
-
-//
-// Class: lnkVirtualDeviceToVolume
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
-	'Class:lnkVirtualDeviceToVolume+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
-));
-
-//
-// Class: lnkSanToDatacenterDevice
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
-	'Class:lnkSanToDatacenterDevice+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
-));
-
-//
-// Class: Tape
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Tape' => 'Tape',
-	'Class:Tape+' => '',
-	'Class:Tape/Attribute:name' => 'Name',
-	'Class:Tape/Attribute:name+' => '',
-	'Class:Tape/Attribute:description' => 'Description',
-	'Class:Tape/Attribute:description+' => '',
-	'Class:Tape/Attribute:size' => 'Size',
-	'Class:Tape/Attribute:size+' => '',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library',
-	'Class:Tape/Attribute:tapelibrary_id+' => '',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name',
-	'Class:Tape/Attribute:tapelibrary_name+' => '',
-));
-
-//
-// Class: NASFileSystem
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:NASFileSystem' => 'NAS File System',
-	'Class:NASFileSystem+' => '',
-	'Class:NASFileSystem/Attribute:name' => 'Name',
-	'Class:NASFileSystem/Attribute:name+' => '',
-	'Class:NASFileSystem/Attribute:description' => 'Description',
-	'Class:NASFileSystem/Attribute:description+' => '',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level',
-	'Class:NASFileSystem/Attribute:raid_level+' => '',
-	'Class:NASFileSystem/Attribute:size' => 'Size',
-	'Class:NASFileSystem/Attribute:size+' => '',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NASFileSystem/Attribute:nas_id+' => '',
-	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name',
-	'Class:NASFileSystem/Attribute:nas_name+' => '',
-));
-
-//
-// Class: Software
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Software' => 'Software',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => 'Name',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:vendor' => 'Vendor',
-	'Class:Software/Attribute:vendor+' => '',
-	'Class:Software/Attribute:version' => 'Version',
-	'Class:Software/Attribute:version+' => '',
-	'Class:Software/Attribute:documents_list' => 'Documents',
-	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software',
-	'Class:Software/Attribute:type' => 'Type',
-	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances',
-	'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: Patch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Patch' => 'Patch',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Name',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:documents_list' => 'Documents',
-	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch',
-	'Class:Patch/Attribute:description' => 'Description',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Patch sub-class',
-	'Class:Patch/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: OSPatch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:OSPatch' => 'OS Patch',
-	'Class:OSPatch+' => '',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed',
-	'Class:OSPatch/Attribute:osversion_id' => 'OS version',
-	'Class:OSPatch/Attribute:osversion_id+' => '',
-	'Class:OSPatch/Attribute:osversion_name' => 'OS version name',
-	'Class:OSPatch/Attribute:osversion_name+' => '',
-));
-
-//
-// Class: SoftwarePatch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SoftwarePatch' => 'Software Patch',
-	'Class:SoftwarePatch+' => '',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
-	'Class:SoftwarePatch/Attribute:software_id+' => '',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Software name',
-	'Class:SoftwarePatch/Attribute:software_name+' => '',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed',
-));
-
-//
-// Class: Licence
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Licence' => 'License',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:name' => 'Name',
-	'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:org_id' => 'Organization',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:organization_name' => 'Organization name',
-	'Class:Licence/Attribute:organization_name+' => 'Common name',
-	'Class:Licence/Attribute:usage_limit' => 'Usage limit',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:description' => 'Description',
-	'Class:Licence/Attribute:description+' => '',
-	'Class:Licence/Attribute:start_date' => 'Start date',
-	'Class:Licence/Attribute:start_date+' => '',
-	'Class:Licence/Attribute:end_date' => 'End date',
-	'Class:Licence/Attribute:end_date+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Key',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:perpetual' => 'Perpetual',
-	'Class:Licence/Attribute:perpetual+' => '',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'no',
-	'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' => 'Licence sub-class',
-	'Class:Licence/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: OSLicence
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:OSLicence' => 'OS Licence',
-	'Class:OSLicence+' => '',
-	'Class:OSLicence/Attribute:osversion_id' => 'OS version',
-	'Class:OSLicence/Attribute:osversion_id+' => '',
-	'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: SoftwareLicence
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SoftwareLicence' => 'Software Licence',
-	'Class:SoftwareLicence+' => '',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
-	'Class:SoftwareLicence/Attribute:software_id+' => '',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Software name',
-	'Class:SoftwareLicence/Attribute:software_name+' => '',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used',
-));
-
-//
-// Class: lnkDocumentToLicence
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToLicence' => 'Link Document / Licence',
-	'Class:lnkDocumentToLicence+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
-	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name',
-	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name',
-	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
-));
-
-//
-// Class: Typology
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Typology' => 'Typology',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Name',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Typology sub-class',
-	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: OSVersion
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:OSVersion' => 'OS Version',
-	'Class:OSVersion+' => '',
-	'Class:OSVersion/Attribute:osfamily_id' => 'OS family',
-	'Class:OSVersion/Attribute:osfamily_id+' => '',
-	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name',
-	'Class:OSVersion/Attribute:osfamily_name+' => '',
-));
-
-//
-// Class: OSFamily
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:OSFamily' => 'OS Family',
-	'Class:OSFamily+' => '',
-));
-
-//
-// Class: DocumentType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DocumentType' => 'Document Type',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ContactType' => 'Contact Type',
-	'Class:ContactType+' => '',
-));
-
-//
-// Class: Brand
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Brand' => 'Brand',
-	'Class:Brand+' => '',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand',
-));
-
-//
-// Class: Model
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Model' => 'Model',
-	'Class:Model+' => '',
-	'Class:Model/Attribute:brand_id' => 'Brand',
-	'Class:Model/Attribute:brand_id+' => '',
-	'Class:Model/Attribute:brand_name' => 'Brand name',
-	'Class:Model/Attribute:brand_name+' => '',
-	'Class:Model/Attribute:type' => 'Device type',
-	'Class:Model/Attribute:type+' => '',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source',
-	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array',
-	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device',
-	'Class:Model/Attribute:type/Value:PC' => 'PC',
-	'Class:Model/Attribute:type/Value:PC+' => 'PC',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral',
-	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral',
-	'Class:Model/Attribute:type/Value:Printer' => 'Printer',
-	'Class:Model/Attribute:type/Value:Printer+' => 'Printer',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch',
-	'Class:Model/Attribute:type/Value:Server' => 'Server',
-	'Class:Model/Attribute:type/Value:Server+' => 'Server',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
-	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library',
-	'Class:Model/Attribute:type/Value:Phone' => 'Telephone',
-	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone',
-	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices',
-	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model',
-));
-
-//
-// Class: NetworkDeviceType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:NetworkDeviceType' => 'Network Device Type',
-	'Class:NetworkDeviceType+' => '',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type',
-));
-
-//
-// Class: IOSVersion
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:IOSVersion' => 'IOS Version',
-	'Class:IOSVersion+' => '',
-	'Class:IOSVersion/Attribute:brand_id' => 'Brand',
-	'Class:IOSVersion/Attribute:brand_id+' => '',
-	'Class:IOSVersion/Attribute:brand_name' => 'Brand name',
-	'Class:IOSVersion/Attribute:brand_name+' => '',
-));
-
-//
-// Class: lnkDocumentToPatch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
-	'Class:lnkDocumentToPatch+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name',
-	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name',
-	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkSoftwareInstanceToSoftwarePatch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToOSPatch
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
-	'Class:lnkFunctionalCIToOSPatch+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: lnkDocumentToSoftware
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
-	'Class:lnkDocumentToSoftware+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
-	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name',
-	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name',
-	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkDocumentToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
-	'Class:lnkDocumentToFunctionalCI+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
-));
-
-//
-// Class: Subnet
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Attribute:description' => 'Description',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:subnet_name' => 'Subnet name',
-	'Class:Subnet/Attribute:subnet_name+' => '',
-	'Class:Subnet/Attribute:org_id' => 'Owner organization',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:org_name' => 'Name',
-	'Class:Subnet/Attribute:org_name+' => 'Common name',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-	'Class:Subnet/Attribute:vlans_list' => 'VLANs',
-	'Class:Subnet/Attribute:vlans_list+' => '',
-));
-
-//
-// Class: VLAN
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:VLAN' => 'VLAN',
-	'Class:VLAN+' => '',
-	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag',
-	'Class:VLAN/Attribute:vlan_tag+' => '',
-	'Class:VLAN/Attribute:description' => 'Description',
-	'Class:VLAN/Attribute:description+' => '',
-	'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:subnets_list' => 'Subnets',
-	'Class:VLAN/Attribute:subnets_list+' => '',
-	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces',
-	'Class:VLAN/Attribute:physicalinterfaces_list+' => '',
-));
-
-//
-// Class: lnkSubnetToVLAN
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
-	'Class:lnkSubnetToVLAN+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
-));
-
-//
-// Class: NetworkInterface
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:NetworkInterface' => 'Network Interface',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Attribute:name' => 'Name',
-	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class',
-	'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: IPInterface
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:IPInterface' => 'IP Interface',
-	'Class:IPInterface+' => '',
-	'Class:IPInterface/Attribute:ipaddress' => 'IP address',
-	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
-	'Class:IPInterface/Attribute:macaddress' => 'MAC address',
-	'Class:IPInterface/Attribute:macaddress+' => '',
-	'Class:IPInterface/Attribute:comment' => 'Comment',
-	'Class:IPInterface/Attribute:coment+' => '',
-	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway',
-	'Class:IPInterface/Attribute:ipgateway+' => '',
-	'Class:IPInterface/Attribute:ipmask' => 'IP mask',
-	'Class:IPInterface/Attribute:ipmask+' => '',
-	'Class:IPInterface/Attribute:speed' => 'Speed',
-	'Class:IPInterface/Attribute:speed+' => '',
-));
-
-//
-// Class: PhysicalInterface
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:PhysicalInterface' => 'Physical Interface',
-	'Class:PhysicalInterface+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device',
-	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name',
-	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
-	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
-));
-
-//
-// Class: lnkPhysicalInterfaceToVLAN
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
-));
-
-
-//
-// Class: LogicalInterface
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:LogicalInterface' => 'Logical Interface',
-	'Class:LogicalInterface+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine',
-	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name',
-	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
-));
-
-//
-// Class: FiberChannelInterface
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
-	'Class:FiberChannelInterface+' => '',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Speed',
-	'Class:FiberChannelInterface/Attribute:speed+' => '',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topology',
-	'Class:FiberChannelInterface/Attribute:topology+' => '',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
-	'Class:FiberChannelInterface/Attribute:wwn+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
-));
-
-//
-// Class: lnkConnectableCIToNetworkDevice
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
-	'Class:lnkConnectableCIToNetworkDevice+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Connection type',
-	'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: lnkApplicationSolutionToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI',
-	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: lnkApplicationSolutionToBusinessProcess
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
-	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
-));
-
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkPersonToTeam' => 'Link Person / Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
-//
-// Class: Group
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Group' => 'Group',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => 'Name',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => 'Status',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => 'Implementation',
-	'Class:Group/Attribute:status/Value:implementation+' => 'Implementation',
-	'Class:Group/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:Group/Attribute:status/Value:obsolete+' => 'Obsolete',
-	'Class:Group/Attribute:status/Value:production' => 'Production',
-	'Class:Group/Attribute:status/Value:production+' => 'Production',
-	'Class:Group/Attribute:org_id' => 'Organization',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => 'Name',
-	'Class:Group/Attribute:owner_name+' => 'Common name',
-	'Class:Group/Attribute:description' => 'Description',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Type',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Parent Group',
-
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:parent_name' => 'Name',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => 'Linked CIs',
-	'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group',
-	'Class:Group/Attribute:parent_id_friendlyname+' => '',
-));
-
-//
-// Class: lnkGroupToCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkGroupToCI' => 'Link Group / CI',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Group',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Name',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Name',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Reason',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-));
-
-
-//
-// Application Menu
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-'Menu:DataAdministration' => 'Data administration',
-'Menu:DataAdministration+' => 'Data administration',
-'Menu:Catalogs' => 'Catalogs',
-'Menu:Catalogs+' => 'Data types',
-'Menu:Audit' => 'Audit',
-'Menu:Audit+' => 'Audit',
-'Menu:CSVImport' => 'CSV import',
-'Menu:CSVImport+' => 'Bulk creation or update',
-'Menu:Organization' => 'Organizations',
-'Menu:Organization+' => 'All organizations',
-'Menu:Application' => 'Applications',
-'Menu:Application+' => 'All applications',
-'Menu:DBServer' => 'Database servers',
-'Menu:DBServer+' => 'Database servers',
-'Menu:Audit' => 'Audit',
-'Menu:ConfigManagement' => 'Configuration Management',
-'Menu:ConfigManagement+' => 'Configuration Management',
-'Menu:ConfigManagementOverview' => 'Overview',
-'Menu:ConfigManagementOverview+' => 'Overview',
-'Menu:Contact' => 'Contacts',
-'Menu:Contact+' => 'Contacts',
-'Menu:Contact:Count' => '%1$d contacts',
-'Menu:Person' => 'Persons',
-'Menu:Person+' => 'All persons',
-'Menu:Team' => 'Teams',
-'Menu:Team+' => 'All teams',
-'Menu:Document' => 'Documents',
-'Menu:Document+' => 'All documents',
-'Menu:Location' => 'Locations',
-
-'Menu:Location+' => 'All locations',
-'Menu:ConfigManagementCI' => 'Configuration items',
-'Menu:ConfigManagementCI+' => 'Configuration items',
-'Menu:BusinessProcess' => 'Business processes',
-'Menu:BusinessProcess+' => 'All business processes',
-'Menu:ApplicationSolution' => 'Application solutions',
-'Menu:ApplicationSolution+' => 'All application solutions',
-'Menu:ConfigManagementSoftware' => 'Application management',
-'Menu:Licence' => 'Licences',
-'Menu:Licence+' => 'All licences',
-'Menu:Patch' => 'Patches',
-'Menu:Patch+' => 'All patches',
-'Menu:ApplicationInstance' => 'Installed software',
-'Menu:ApplicationInstance+' => 'Applications and database servers',
-'Menu:ConfigManagementHardware' => 'Infrastructure management',
-'Menu:Subnet' => 'Subnets',
-'Menu:Subnet+' => 'All subnets',
-'Menu:NetworkDevice' => 'Network devices',
-'Menu:NetworkDevice+' => 'All network devices',
-'Menu:Server' => 'Servers',
-'Menu:Server+' => 'All servers',
-'Menu:Printer' => 'Printers',
-'Menu:Printer+' => 'All printers',
-'Menu:MobilePhone' => 'Mobile phones',
-'Menu:MobilePhone+' => 'All mobile phones',
-'Menu:PC' => 'Personal computers',
-'Menu:PC+' => 'All Personal computers',
-'Menu:NewContact' => 'New contact',
-'Menu:NewContact+' => 'New contact',
-'Menu:SearchContacts' => 'Search for contacts',
-'Menu:SearchContacts+' => 'Search for contacts',
-'Menu:NewCI' => 'New CI',
-'Menu:NewCI+' => 'New CI',
-'Menu:SearchCIs' => 'Search for CIs',
-'Menu:SearchCIs+' => 'Search for CIs',
-'Menu:ConfigManagement:Devices' => 'Devices',
-'Menu:ConfigManagement:AllDevices' => 'Infrastructure',
-'Menu:ConfigManagement:virtualization' => 'Virtualization',
-'Menu:ConfigManagement:EndUsers' => 'End user devices',
-'Menu:ConfigManagement:SWAndApps' => 'Software and applications',
-'Menu:ConfigManagement:Misc' => 'Miscellaneous',
-'Menu:Group' => 'Groups of CIs',
-'Menu:Group+' => 'Groups of CIs',
-'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
-'Menu:ConfigManagement:AllContacts' => 'All contacts: %1$d',
-'Menu:Typology' => 'Typology configuration',
-'Menu:Typology+' => 'Typology configuration',
-'Menu:OSVersion' => 'OS versions',
-'Menu:OSVersion+' => '',
-'Menu:Software' => 'Software catalog',
-'Menu:Software+' => 'Software catalog',
-'UI_WelcomeMenu_AllConfigItems' => 'Summary',
-'Menu:ConfigManagement:Typology' => 'Typology configuration',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('EN US', 'English', 'English', array(
-'Server:baseinfo' => 'General information',
-'Server:Date' => 'Dates',
-'Server:moreinfo' => 'More information',
-'Server:otherinfo' => 'Other information',
-'Server:power' => 'Power supply',
-'Person:info' => 'General information',
-'Person:personal_info' => 'Personal information',
-'Person:notifiy' => 'Notification',
-'Class:Subnet/Tab:IPUsage' => 'IP Usage',
-'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
-'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
-'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
-'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
-'Class:Document:PreviewTab' => 'Preview',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Relation:impacts/Description' => 'Elements impacted by',
+	'Relation:impacts/DownStream' => 'Impacts...',
+	'Relation:impacts/DownStream+' => 'Elements impacted by',
+	'Relation:impacts/UpStream' => 'Depends on......',
+	'Relation:impacts/UpStream+' => 'Elements impacting',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Elements impacting',
+	'Relation:depends on/DownStream' => 'Depends on...',
+	'Relation:depends on/UpStream' => 'Impacts...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Organization' => 'Organization',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Name',
+	'Class:Organization/Attribute:name+' => 'Common name',
+	'Class:Organization/Attribute:code' => 'Code',
+	'Class:Organization/Attribute:code+' => 'Organization code (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Active',
+	'Class:Organization/Attribute:status/Value:active+' => 'Active',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inactive',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Organization/Attribute:parent_id' => 'Parent',
+	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
+	'Class:Organization/Attribute:parent_name' => 'Parent name',
+	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Location' => 'Location',
+	'Class:Location+' => 'Any type of location: Region, Country, City, Site, Building, Floor, Room, Rack,...',
+	'Class:Location/Attribute:name' => 'Name',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Active',
+	'Class:Location/Attribute:status/Value:active+' => 'Active',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inactive',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Location/Attribute:org_id' => 'Owner organization',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Name of the owner organization',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Address',
+	'Class:Location/Attribute:address+' => 'Postal address',
+	'Class:Location/Attribute:postal_code' => 'Postal code',
+	'Class:Location/Attribute:postal_code+' => 'ZIP/Postal code',
+	'Class:Location/Attribute:city' => 'City',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Country',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location',
+	'Class:Location/Attribute:person_list' => 'Contacts',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Contact' => 'Contact',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Name',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Active',
+	'Class:Contact/Attribute:status/Value:active+' => 'Active',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inactive',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactive',
+	'Class:Contact/Attribute:org_id' => 'Organization',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organization name',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Phone',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notification',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'no',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes',
+	'Class:Contact/Attribute:function' => 'Function',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact',
+	'Class:Contact/Attribute:finalclass' => 'Contact sub-class',
+	'Class:Contact/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Person' => 'Person',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Last Name',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'First Name',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Employee number',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Location',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Location name',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Manager name',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Teams',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Person/Attribute:picture' => 'Picture',
+	'Class:Person/Attribute:picture+' => '',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Members',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Document' => 'Document',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Name',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organization',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Organization name',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Document type',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Version',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Description',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Draft',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Published',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document',
+	'Class:Document/Attribute:contracts_list' => 'Contracts',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document',
+	'Class:Document/Attribute:finalclass' => 'Document sub-class',
+	'Class:Document/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentFile' => 'Document File',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'File',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentNote' => 'Document Note',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Text',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentWeb' => 'Document Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FunctionalCI' => 'Functional CI',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Name',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:description' => 'Description',
+	'Class:FunctionalCI/Attribute:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Organization',
+	'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 criticality',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'high',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium',
+	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date',
+	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Documents',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item',
+	'Class:FunctionalCI/Attribute:finalclass' => 'CI sub-class',
+	'Class:FunctionalCI/Attribute:finalclass+' => 'Name of the final class',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets',
+));
+
+//
+// Class: PhysicalDevice
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PhysicalDevice' => 'Physical Device',
+	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number',
+	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Location',
+	'Class:PhysicalDevice/Attribute:location_id+' => '',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Location name',
+	'Class:PhysicalDevice/Attribute:location_name+' => '',
+	'Class:PhysicalDevice/Attribute:status' => 'Status',
+	'Class:PhysicalDevice/Attribute:status+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand',
+	'Class:PhysicalDevice/Attribute:brand_id+' => '',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name',
+	'Class:PhysicalDevice/Attribute:brand_name+' => '',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
+	'Class:PhysicalDevice/Attribute:model_id+' => '',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Model name',
+	'Class:PhysicalDevice/Attribute:model_name+' => '',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number',
+	'Class:PhysicalDevice/Attribute:asset_number+' => '',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date',
+	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty',
+	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
+));
+
+//
+// Class: Rack
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Rack' => 'Rack',
+	'Class:Rack+' => '',
+	'Class:Rack/Attribute:nb_u' => 'Rack units',
+	'Class:Rack/Attribute:nb_u+' => '',
+	'Class:Rack/Attribute:device_list' => 'Devices',
+	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack',
+	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
+	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack',
+));
+
+//
+// Class: TelephonyCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TelephonyCI' => 'Telephony CI',
+	'Class:TelephonyCI+' => '',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number',
+	'Class:TelephonyCI/Attribute:phonenumber+' => '',
+));
+
+//
+// Class: Phone
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Phone' => 'Phone',
+	'Class:Phone+' => '',
+));
+
+//
+// Class: MobilePhone
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:MobilePhone' => 'Mobile Phone',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+));
+
+//
+// Class: IPPhone
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:IPPhone' => 'IP Phone',
+	'Class:IPPhone+' => '',
+));
+
+//
+// Class: Tablet
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Tablet' => 'Tablet',
+	'Class:Tablet+' => '',
+));
+
+//
+// Class: ConnectableCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ConnectableCI' => 'Connectable CI',
+	'Class:ConnectableCI+' => 'Physical CI',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces',
+));
+
+//
+// Class: DatacenterDevice
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DatacenterDevice' => 'Datacenter Device',
+	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
+	'Class:DatacenterDevice/Attribute:rack_id+' => '',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name',
+	'Class:DatacenterDevice/Attribute:rack_name+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure',
+	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name',
+	'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+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source',
+	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name',
+	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source',
+	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name',
+	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up',
+	// Unused yet
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up',
+));
+
+//
+// Class: NetworkDevice
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:NetworkDevice' => 'Network Device',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version',
+	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name',
+	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+));
+
+//
+// Class: Server
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Server' => 'Server',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:osfamily_id' => 'OS family',
+	'Class:Server/Attribute:osfamily_id+' => '',
+	'Class:Server/Attribute:osfamily_name' => 'OS family name',
+	'Class:Server/Attribute:osfamily_name+' => '',
+	'Class:Server/Attribute:osversion_id' => 'OS version',
+	'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+' => '',
+	'Class:Server/Attribute:oslicence_name' => 'OS licence 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:logicalvolumes_list' => 'Logical volumes',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server',
+));
+
+//
+// Class: StorageSystem
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:StorageSystem' => 'Storage System',
+	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system',
+));
+
+//
+// Class: SANSwitch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SANSwitch' => 'SAN Switch',
+	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch',
+));
+
+//
+// Class: TapeLibrary
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TapeLibrary' => 'Tape Library',
+	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library',
+));
+
+//
+// Class: NAS
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:NAS' => 'NAS',
+	'Class:NAS+' => '',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS',
+));
+
+//
+// Class: PC
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:osfamily_id' => 'OS family',
+	'Class:PC/Attribute:osfamily_id+' => '',
+	'Class:PC/Attribute:osfamily_name' => 'OS family name',
+	'Class:PC/Attribute:osfamily_name+' => '',
+	'Class:PC/Attribute:osversion_id' => 'OS version',
+	'Class:PC/Attribute:osversion_id+' => '',
+	'Class:PC/Attribute:osversion_name' => 'OS version 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' => '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',
+	'Class:PC/Attribute:type/Value:laptop+' => 'laptop',
+));
+
+//
+// Class: Printer
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Printer' => 'Printer',
+	'Class:Printer+' => '',
+));
+
+//
+// Class: PowerConnection
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PowerConnection' => 'Power Connection',
+	'Class:PowerConnection+' => '',
+));
+
+//
+// Class: PowerSource
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PowerSource' => 'Power Source',
+	'Class:PowerSource+' => '',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
+	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source',
+));
+
+//
+// Class: PDU
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PDU' => 'PDU',
+	'Class:PDU+' => '',
+	'Class:PDU/Attribute:rack_id' => 'Rack',
+	'Class:PDU/Attribute:rack_id+' => '',
+	'Class:PDU/Attribute:rack_name' => 'Rack name',
+	'Class:PDU/Attribute:rack_name+' => '',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start',
+	'Class:PDU/Attribute:powerstart_id+' => '',
+	'Class:PDU/Attribute:powerstart_name' => 'Power start name',
+	'Class:PDU/Attribute:powerstart_name+' => '',
+));
+
+//
+// Class: Peripheral
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Peripheral' => 'Peripheral',
+	'Class:Peripheral+' => '',
+));
+
+//
+// Class: Enclosure
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Enclosure' => 'Enclosure',
+	'Class:Enclosure+' => '',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack',
+	'Class:Enclosure/Attribute:rack_id+' => '',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack name',
+	'Class:Enclosure/Attribute:rack_name+' => '',
+	'Class:Enclosure/Attribute:nb_u' => 'Rack units',
+	'Class:Enclosure/Attribute:nb_u+' => '',
+	'Class:Enclosure/Attribute:device_list' => 'Devices',
+	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure',
+));
+
+//
+// Class: ApplicationSolution
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ApplicationSolution' => 'Application Solution',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution',
+	'Class:ApplicationSolution/Attribute:status' => 'Status',
+	'Class:ApplicationSolution/Attribute:status+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up',
+));
+
+//
+// Class: BusinessProcess
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:BusinessProcess' => 'Business Process',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process',
+	'Class:BusinessProcess/Attribute:status' => 'Status',
+	'Class:BusinessProcess/Attribute:status+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'active',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive',
+));
+
+//
+// Class: SoftwareInstance
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SoftwareInstance' => 'Software Instance',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Attribute:system_id' => 'System',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
+	'Class:SoftwareInstance/Attribute:system_name' => 'System name',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
+	'Class:SoftwareInstance/Attribute:software_id+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Software name',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
+	'Class:SoftwareInstance/Attribute:path' => 'Path',
+	'Class:SoftwareInstance/Attribute:path+' => '',
+	'Class:SoftwareInstance/Attribute:status' => 'Status',
+	'Class:SoftwareInstance/Attribute:status+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive',
+));
+
+//
+// Class: Middleware
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Middleware' => 'Middleware',
+	'Class:Middleware+' => '',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware',
+));
+
+//
+// Class: DBServer
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DBServer' => 'DB Server',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas',
+	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server',
+));
+
+//
+// Class: WebServer
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:WebServer' => 'Web server',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Web applications',
+	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server',
+));
+
+//
+// Class: PCSoftware
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PCSoftware' => 'PC Software',
+	'Class:PCSoftware+' => '',
+));
+
+//
+// Class: OtherSoftware
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:OtherSoftware' => 'Other Software',
+	'Class:OtherSoftware+' => '',
+));
+
+//
+// Class: MiddlewareInstance
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:MiddlewareInstance' => 'Middleware Instance',
+	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name',
+	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
+));
+
+//
+// Class: DatabaseSchema
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DatabaseSchema' => 'Database Schema',
+	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
+	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name',
+	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
+));
+
+//
+// Class: WebApplication
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:WebApplication' => 'Web Application',
+	'Class:WebApplication+' => '',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
+	'Class:WebApplication/Attribute:webserver_id+' => '',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web server name',
+	'Class:WebApplication/Attribute:webserver_name+' => '',
+	'Class:WebApplication/Attribute:url' => 'URL',
+	'Class:WebApplication/Attribute:url+' => '',
+));
+
+
+//
+// Class: VirtualDevice
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:VirtualDevice' => 'Virtual Device',
+	'Class:VirtualDevice+' => '',
+	'Class:VirtualDevice/Attribute:status' => 'Status',
+	'Class:VirtualDevice/Attribute:status+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'production',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device',
+));
+
+//
+// Class: VirtualHost
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:VirtualHost' => 'Virtual Host',
+	'Class:VirtualHost+' => '',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host',
+));
+
+//
+// Class: Hypervisor
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor+' => '',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
+	'Class:Hypervisor/Attribute:farm_id+' => '',
+	'Class:Hypervisor/Attribute:farm_name' => 'Farm name',
+	'Class:Hypervisor/Attribute:farm_name+' => '',
+	'Class:Hypervisor/Attribute:server_id' => 'Server',
+	'Class:Hypervisor/Attribute:server_id+' => '',
+	'Class:Hypervisor/Attribute:server_name' => 'Server name',
+	'Class:Hypervisor/Attribute:server_name+' => '',
+));
+
+//
+// Class: Farm
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Farm' => 'Farm',
+	'Class:Farm+' => '',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm',
+	'Class:Farm/Attribute:redundancy' => 'High availability',
+	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up',
+	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up',
+	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up',
+));
+
+//
+// Class: VirtualMachine
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:VirtualMachine' => 'Virtual Machine',
+	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host',
+	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name',
+	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family',
+	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name',
+	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version',
+	'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+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name',
+	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
+	'Class:VirtualMachine/Attribute:cpu+' => '',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM',
+	'Class:VirtualMachine/Attribute:ram+' => '',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP',
+	'Class:VirtualMachine/Attribute:managementip+' => '',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces',
+));
+
+//
+// Class: LogicalVolume
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:LogicalVolume' => 'Logical Volume',
+	'Class:LogicalVolume+' => '',
+	'Class:LogicalVolume/Attribute:name' => 'Name',
+	'Class:LogicalVolume/Attribute:name+' => '',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
+	'Class:LogicalVolume/Attribute:lun_id+' => '',
+	'Class:LogicalVolume/Attribute:description' => 'Description',
+	'Class:LogicalVolume/Attribute:description+' => '',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level',
+	'Class:LogicalVolume/Attribute:raid_level+' => '',
+	'Class:LogicalVolume/Attribute:size' => 'Size',
+	'Class:LogicalVolume/Attribute:size+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system',
+	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name',
+	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servers',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume',
+));
+
+//
+// Class: lnkServerToVolume
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkServerToVolume' => 'Link Server / Volume',
+	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name',
+	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
+	'Class:lnkServerToVolume/Attribute:server_id+' => '',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name',
+	'Class:lnkServerToVolume/Attribute:server_name+' => '',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used',
+	'Class:lnkServerToVolume/Attribute:size_used+' => '',
+));
+
+//
+// Class: lnkVirtualDeviceToVolume
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
+	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
+));
+
+//
+// Class: lnkSanToDatacenterDevice
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
+	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
+));
+
+//
+// Class: Tape
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Tape' => 'Tape',
+	'Class:Tape+' => '',
+	'Class:Tape/Attribute:name' => 'Name',
+	'Class:Tape/Attribute:name+' => '',
+	'Class:Tape/Attribute:description' => 'Description',
+	'Class:Tape/Attribute:description+' => '',
+	'Class:Tape/Attribute:size' => 'Size',
+	'Class:Tape/Attribute:size+' => '',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library',
+	'Class:Tape/Attribute:tapelibrary_id+' => '',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name',
+	'Class:Tape/Attribute:tapelibrary_name+' => '',
+));
+
+//
+// Class: NASFileSystem
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:NASFileSystem' => 'NAS File System',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Name',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Description',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Size',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
+));
+
+//
+// Class: Software
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Name',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'Vendor',
+	'Class:Software/Attribute:vendor+' => '',
+	'Class:Software/Attribute:version' => 'Version',
+	'Class:Software/Attribute:version+' => '',
+	'Class:Software/Attribute:documents_list' => 'Documents',
+	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software',
+	'Class:Software/Attribute:type' => 'Type',
+	'Class:Software/Attribute:type+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances',
+	'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: Patch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Patch' => 'Patch',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Name',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:documents_list' => 'Documents',
+	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch',
+	'Class:Patch/Attribute:description' => 'Description',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Patch sub-class',
+	'Class:Patch/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: OSPatch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:OSPatch' => 'OS Patch',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS version',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS version name',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
+));
+
+//
+// Class: SoftwarePatch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SoftwarePatch' => 'Software Patch',
+	'Class:SoftwarePatch+' => '',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
+	'Class:SoftwarePatch/Attribute:software_id+' => '',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Software name',
+	'Class:SoftwarePatch/Attribute:software_name+' => '',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed',
+));
+
+//
+// Class: Licence
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Licence' => 'License',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:name' => 'Name',
+	'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:org_id' => 'Organization',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:organization_name' => 'Organization name',
+	'Class:Licence/Attribute:organization_name+' => 'Common name',
+	'Class:Licence/Attribute:usage_limit' => 'Usage limit',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:description' => 'Description',
+	'Class:Licence/Attribute:description+' => '',
+	'Class:Licence/Attribute:start_date' => 'Start date',
+	'Class:Licence/Attribute:start_date+' => '',
+	'Class:Licence/Attribute:end_date' => 'End date',
+	'Class:Licence/Attribute:end_date+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Key',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Perpetual',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'no',
+	'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' => 'Licence sub-class',
+	'Class:Licence/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: OSLicence
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:OSLicence' => 'OS Licence',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS version',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'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: SoftwareLicence
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SoftwareLicence' => 'Software Licence',
+	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
+	'Class:SoftwareLicence/Attribute:software_id+' => '',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Software name',
+	'Class:SoftwareLicence/Attribute:software_name+' => '',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used',
+));
+
+//
+// Class: lnkDocumentToLicence
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToLicence' => 'Link Document / Licence',
+	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Typology' => 'Typology',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Name',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Typology sub-class',
+	'Class:Typology/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: OSVersion
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:OSVersion' => 'OS Version',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS family',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
+));
+
+//
+// Class: OSFamily
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:OSFamily' => 'OS Family',
+	'Class:OSFamily+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DocumentType' => 'Document Type',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ContactType' => 'Contact Type',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: Brand
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Brand' => 'Brand',
+	'Class:Brand+' => '',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand',
+));
+
+//
+// Class: Model
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Model' => 'Model',
+	'Class:Model+' => '',
+	'Class:Model/Attribute:brand_id' => 'Brand',
+	'Class:Model/Attribute:brand_id+' => '',
+	'Class:Model/Attribute:brand_name' => 'Brand name',
+	'Class:Model/Attribute:brand_name+' => '',
+	'Class:Model/Attribute:type' => 'Device type',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral',
+	'Class:Model/Attribute:type/Value:Printer' => 'Printer',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Printer',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch',
+	'Class:Model/Attribute:type/Value:Server' => 'Server',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telephone',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone',
+	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices',
+	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model',
+));
+
+//
+// Class: NetworkDeviceType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:NetworkDeviceType' => 'Network Device Type',
+	'Class:NetworkDeviceType+' => '',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type',
+));
+
+//
+// Class: IOSVersion
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:IOSVersion' => 'IOS Version',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Brand',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Brand name',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
+));
+
+//
+// Class: lnkDocumentToPatch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
+	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkSoftwareInstanceToSoftwarePatch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToOSPatch
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkDocumentToSoftware
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
+	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkDocumentToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+));
+
+//
+// Class: Subnet
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Subnet' => 'Subnet',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Attribute:description' => 'Description',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:subnet_name' => 'Subnet name',
+	'Class:Subnet/Attribute:subnet_name+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Owner organization',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:org_name' => 'Name',
+	'Class:Subnet/Attribute:org_name+' => 'Common name',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:Subnet/Attribute:vlans_list' => 'VLANs',
+	'Class:Subnet/Attribute:vlans_list+' => '',
+));
+
+//
+// Class: VLAN
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:VLAN' => 'VLAN',
+	'Class:VLAN+' => '',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag',
+	'Class:VLAN/Attribute:vlan_tag+' => '',
+	'Class:VLAN/Attribute:description' => 'Description',
+	'Class:VLAN/Attribute:description+' => '',
+	'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:subnets_list' => 'Subnets',
+	'Class:VLAN/Attribute:subnets_list+' => '',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces',
+	'Class:VLAN/Attribute:physicalinterfaces_list+' => '',
+));
+
+//
+// Class: lnkSubnetToVLAN
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
+	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
+));
+
+//
+// Class: NetworkInterface
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:NetworkInterface' => 'Network Interface',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:name' => 'Name',
+	'Class:NetworkInterface/Attribute:name+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class',
+	'Class:NetworkInterface/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: IPInterface
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:IPInterface' => 'IP Interface',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP address',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+
+
+	'Class:IPInterface/Attribute:macaddress' => 'MAC address',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Comment',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'IP mask',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Speed',
+	'Class:IPInterface/Attribute:speed+' => '',
+));
+
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:PhysicalInterface' => 'Physical Interface',
+	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device',
+	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name',
+	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
+	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
+));
+
+//
+// Class: lnkPhysicalInterfaceToVLAN
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
+));
+
+
+//
+// Class: LogicalInterface
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:LogicalInterface' => 'Logical Interface',
+	'Class:LogicalInterface+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine',
+	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name',
+	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
+));
+
+//
+// Class: FiberChannelInterface
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
+	'Class:FiberChannelInterface+' => '',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Speed',
+	'Class:FiberChannelInterface/Attribute:speed+' => '',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topology',
+	'Class:FiberChannelInterface/Attribute:topology+' => '',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
+	'Class:FiberChannelInterface/Attribute:wwn+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
+));
+
+//
+// Class: lnkConnectableCIToNetworkDevice
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Connection type',
+	'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: lnkApplicationSolutionToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkApplicationSolutionToBusinessProcess
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkPersonToTeam' => 'Link Person / Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Class: Group
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Group' => 'Group',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Name',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Status',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Implementation',
+	'Class:Group/Attribute:status/Value:implementation+' => 'Implementation',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:Group/Attribute:status/Value:obsolete+' => 'Obsolete',
+	'Class:Group/Attribute:status/Value:production' => 'Production',
+	'Class:Group/Attribute:status/Value:production+' => 'Production',
+	'Class:Group/Attribute:org_id' => 'Organization',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:owner_name' => 'Name',
+	'Class:Group/Attribute:owner_name+' => 'Common name',
+	'Class:Group/Attribute:description' => 'Description',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Type',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Parent Group',
+
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:parent_name' => 'Name',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:ci_list' => 'Linked CIs',
+	'Class:Group/Attribute:ci_list+' => 'All the configuration items linked to this group',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group',
+	'Class:Group/Attribute:parent_id_friendlyname+' => '',
+));
+
+//
+// Class: lnkGroupToCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkGroupToCI' => 'Link Group / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Group',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Name',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Name',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Reason',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+));
+
+
+//
+// Application Menu
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+'Menu:DataAdministration' => 'Data administration',
+'Menu:DataAdministration+' => 'Data administration',
+'Menu:Catalogs' => 'Catalogs',
+'Menu:Catalogs+' => 'Data types',
+'Menu:Audit' => 'Audit',
+'Menu:Audit+' => 'Audit',
+'Menu:CSVImport' => 'CSV import',
+'Menu:CSVImport+' => 'Bulk creation or update',
+'Menu:Organization' => 'Organizations',
+'Menu:Organization+' => 'All organizations',
+'Menu:Application' => 'Applications',
+'Menu:Application+' => 'All applications',
+'Menu:DBServer' => 'Database servers',
+'Menu:DBServer+' => 'Database servers',
+'Menu:Audit' => 'Audit',
+'Menu:ConfigManagement' => 'Configuration Management',
+'Menu:ConfigManagement+' => 'Configuration Management',
+'Menu:ConfigManagementOverview' => 'Overview',
+'Menu:ConfigManagementOverview+' => 'Overview',
+'Menu:Contact' => 'Contacts',
+'Menu:Contact+' => 'Contacts',
+'Menu:Contact:Count' => '%1$d contacts',
+'Menu:Person' => 'Persons',
+'Menu:Person+' => 'All persons',
+'Menu:Team' => 'Teams',
+'Menu:Team+' => 'All teams',
+'Menu:Document' => 'Documents',
+'Menu:Document+' => 'All documents',
+'Menu:Location' => 'Locations',
+
+'Menu:Location+' => 'All locations',
+'Menu:ConfigManagementCI' => 'Configuration items',
+'Menu:ConfigManagementCI+' => 'Configuration items',
+'Menu:BusinessProcess' => 'Business processes',
+'Menu:BusinessProcess+' => 'All business processes',
+'Menu:ApplicationSolution' => 'Application solutions',
+'Menu:ApplicationSolution+' => 'All application solutions',
+'Menu:ConfigManagementSoftware' => 'Application management',
+'Menu:Licence' => 'Licences',
+'Menu:Licence+' => 'All licences',
+'Menu:Patch' => 'Patches',
+'Menu:Patch+' => 'All patches',
+'Menu:ApplicationInstance' => 'Installed software',
+'Menu:ApplicationInstance+' => 'Applications and database servers',
+'Menu:ConfigManagementHardware' => 'Infrastructure management',
+'Menu:Subnet' => 'Subnets',
+'Menu:Subnet+' => 'All subnets',
+'Menu:NetworkDevice' => 'Network devices',
+'Menu:NetworkDevice+' => 'All network devices',
+'Menu:Server' => 'Servers',
+'Menu:Server+' => 'All servers',
+'Menu:Printer' => 'Printers',
+'Menu:Printer+' => 'All printers',
+'Menu:MobilePhone' => 'Mobile phones',
+'Menu:MobilePhone+' => 'All mobile phones',
+'Menu:PC' => 'Personal computers',
+'Menu:PC+' => 'All Personal computers',
+'Menu:NewContact' => 'New contact',
+'Menu:NewContact+' => 'New contact',
+'Menu:SearchContacts' => 'Search for contacts',
+'Menu:SearchContacts+' => 'Search for contacts',
+'Menu:NewCI' => 'New CI',
+'Menu:NewCI+' => 'New CI',
+'Menu:SearchCIs' => 'Search for CIs',
+'Menu:SearchCIs+' => 'Search for CIs',
+'Menu:ConfigManagement:Devices' => 'Devices',
+'Menu:ConfigManagement:AllDevices' => 'Infrastructure',
+'Menu:ConfigManagement:virtualization' => 'Virtualization',
+'Menu:ConfigManagement:EndUsers' => 'End user devices',
+'Menu:ConfigManagement:SWAndApps' => 'Software and applications',
+'Menu:ConfigManagement:Misc' => 'Miscellaneous',
+'Menu:Group' => 'Groups of CIs',
+'Menu:Group+' => 'Groups of CIs',
+'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
+'Menu:ConfigManagement:AllContacts' => 'All contacts: %1$d',
+'Menu:Typology' => 'Typology configuration',
+'Menu:Typology+' => 'Typology configuration',
+'Menu:OSVersion' => 'OS versions',
+'Menu:OSVersion+' => '',
+'Menu:Software' => 'Software catalog',
+'Menu:Software+' => 'Software catalog',
+'UI_WelcomeMenu_AllConfigItems' => 'Summary',
+'Menu:ConfigManagement:Typology' => 'Typology configuration',
+
+));
+
+
+// Add translation for Fieldsets
+
+Dict::Add('EN US', 'English', 'English', array(
+'Server:baseinfo' => 'General information',
+'Server:Date' => 'Dates',
+'Server:moreinfo' => 'More information',
+'Server:otherinfo' => 'Other information',
+'Server:power' => 'Power supply',
+'Person:info' => 'General information',
+'Person:personal_info' => 'Personal information',
+'Person:notifiy' => 'Notification',
+'Class:Subnet/Tab:IPUsage' => 'IP Usage',
+'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
+'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
+'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
+'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
+'Class:Document:PreviewTab' => 'Preview',
+));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
index 4303837f4..2ee74f4c1 100755
--- a/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/it.dict.itop-config-mgmt.php
@@ -1,1281 +1,1281 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Organization' => 'Organizzazione',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Cognome',
-	'Class:Organization/Attribute:name+' => 'Nome',
-	'Class:Organization/Attribute:code' => 'Codice',
-	'Class:Organization/Attribute:code+' => 'Codice dell\'organizzazione (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Stato',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Attivo',
-	'Class:Organization/Attribute:status/Value:active+' => 'Attivo',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inattivo',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inattivo',
-	'Class:Organization/Attribute:parent_id' => 'Parent',
-	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
-	'Class:Location' => 'Localizzazione',
-	'Class:Location+' => 'Qualsiasi tipo di localizzazione: Regione, Paese, Città, Sito, Edificio, Piano, Stanza, Rack,,...',
-	'Class:Location/Attribute:name' => 'Nome',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Stato',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Attivo',
-	'Class:Location/Attribute:status/Value:active+' => 'Attivo',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inattivo',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inattivo',
-	'Class:Location/Attribute:org_id' => 'Organizzazione proprietaria',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:address' => 'Indirizzo',
-	'Class:Location/Attribute:address+' => 'Indirizzo postale',
-	'Class:Location/Attribute:postal_code' => 'Codice avviamento postale',
-	'Class:Location/Attribute:postal_code+' => 'CAP/codice avviamento postale',
-	'Class:Location/Attribute:city' => 'Città',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Paese',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:parent_id' => 'Parent location',
-	'Class:Location/Attribute:parent_id+' => '',
-	'Class:Location/Attribute:contact_list' => 'Contatti',
-	'Class:Location/Attribute:contact_list+' => 'Contatti posizionati su questo sito',
-	'Class:Location/Attribute:infra_list' => 'Infrastrutture',
-	'Class:Location/Attribute:infra_list+' => 'CIs posizionati su questo sito',
-	'Class:Person' => 'Persona',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:first_name' => 'Nome',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_id' => 'ID dipendente',
-	'Class:Person/Attribute:employee_id+' => '',
-	'Class:Team' => 'Squadra',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:member_list' => 'Membri',
-	'Class:Team/Attribute:member_list+' => 'Contatti che appartengono a questa Squadra',
-	'Class:lnkTeamToContact' => 'Membri della squadra',
-	'Class:lnkTeamToContact+' => 'membri della squadra',
-	'Class:lnkTeamToContact/Attribute:team_id' => 'Squadra',
-	'Class:lnkTeamToContact/Attribute:team_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_id' => 'Membri',
-	'Class:lnkTeamToContact/Attribute:contact_id+' => '',
-	'Class:lnkTeamToContact/Attribute:role' => 'Ruolo',
-	'Class:lnkTeamToContact/Attribute:role+' => '',
-	'Class:WebDoc' => 'Documento Web',
-	'Class:WebDoc+' => 'Documento disponibile su un altro server web',
-	'Class:WebDoc/Attribute:url' => 'Url',
-	'Class:WebDoc/Attribute:url+' => '',
-	'Class:Note' => 'Note',
-	'Class:Note+' => '',
-	'Class:Note/Attribute:note' => 'Testo',
-	'Class:Note/Attribute:note+' => '',
-	'Class:FileDoc' => 'Documento (file)',
-	'Class:FileDoc+' => '',
-	'Class:FileDoc/Attribute:contents' => 'Contenuti',
-	'Class:FileDoc/Attribute:contents+' => '',
-	'Class:Licence' => 'Licenza',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:provider' => 'Provider',
-	'Class:Licence/Attribute:provider+' => '',
-	'Class:Licence/Attribute:org_id' => 'Proprietario',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:product' => 'Prodotto',
-	'Class:Licence/Attribute:product+' => '',
-	'Class:Licence/Attribute:name' => 'Nome',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:start' => 'Data di inizio',
-	'Class:Licence/Attribute:start+' => '',
-	'Class:Licence/Attribute:end' => 'Data di fine',
-	'Class:Licence/Attribute:end+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Key',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:scope' => 'Scopo',
-	'Class:Licence/Attribute:scope+' => '',
-	'Class:Licence/Attribute:usage_limit' => 'Limiti d\'uso',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:usage_list' => 'Uso',
-	'Class:Licence/Attribute:usage_list+' => 'Istanze di applicazioni che usano questa licenza',
-	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Attribute:description' => 'Descrizione',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:org_id' => 'Organizzazione proprietaria',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-	'Class:Patch' => 'Patch',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Nome',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:description' => 'Descrizione',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:target_sw' => 'Scopo dell\'applicazione',
-	'Class:Patch/Attribute:target_sw+' => 'Software bersaglio (OS o applicazione)',
-	'Class:Patch/Attribute:version' => 'Versione',
-	'Class:Patch/Attribute:version+' => '',
-	'Class:Patch/Attribute:type' => 'Tipo',
-	'Class:Patch/Attribute:type+' => '',
-	'Class:Patch/Attribute:type/Value:application' => 'Applicazione',
-	'Class:Patch/Attribute:type/Value:application+' => '',
-	'Class:Patch/Attribute:type/Value:os' => 'OS',
-	'Class:Patch/Attribute:type/Value:os+' => '',
-	'Class:Patch/Attribute:type/Value:security' => 'Securirezza',
-	'Class:Patch/Attribute:type/Value:security+' => '',
-	'Class:Patch/Attribute:type/Value:servicepack' => 'Service Pack',
-	'Class:Patch/Attribute:type/Value:servicepack+' => '',
-	'Class:Patch/Attribute:ci_list' => 'Dispositivi',
-	'Class:Patch/Attribute:ci_list+' => 'Dispositivi dove la patch è installata',
-	'Class:Application' => 'Applicazione',
-	'Class:Application+' => '',
-	'Class:Application/Attribute:instance_list' => 'Installazioni',
-	'Class:Application/Attribute:instance_list+' => 'Istanze di questa applicazione',
-	'Class:DBServer' => 'Database',
-	'Class:DBServer+' => 'Database server SW',
-	'Class:DBServer/Attribute:instance_list' => 'Installazioni',
-	'Class:DBServer/Attribute:instance_list+' => 'Istanze di questo database server',
-	'Class:lnkPatchToCI' => 'Utilizzo di Patch',
-	'Class:lnkPatchToCI+' => '',
-	'Class:lnkPatchToCI/Attribute:patch_id' => 'Patch',
-	'Class:lnkPatchToCI/Attribute:patch_id+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkPatchToCI/Attribute:ci_id+' => '',
-	'Class:DBServerInstance' => 'Istanza del DB Server',
-	'Class:DBServerInstance+' => '',
-	'Class:DBServerInstance/Attribute:software_id' => 'Software',
-	'Class:DBServerInstance/Attribute:software_id+' => '',
-	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Databases',
-	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Sorgente del database',
-	'Class:ApplicationInstance' => 'Istanza dell\'applicazione',
-	'Class:ApplicationInstance+' => '',
-	'Class:ApplicationInstance/Attribute:software_id' => 'Software',
-	'Class:ApplicationInstance/Attribute:software_id+' => '',
-	'Class:DatabaseInstance' => 'Istanza del database',
-	'Class:DatabaseInstance+' => '',
-	'Class:DatabaseInstance/Attribute:db_server_instance_id' => 'Server del database',
-	'Class:DatabaseInstance/Attribute:db_server_instance_id+' => '',
-	'Class:DatabaseInstance/Attribute:description' => 'Descrizione',
-	'Class:DatabaseInstance/Attribute:description+' => '',
-	'Class:Group' => 'Groppo',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => 'Nome',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => 'Stato',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => 'Implementazione',
-	'Class:Group/Attribute:status/Value:implementation+' => 'Implementazione',
-	'Class:Group/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Group/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:Group/Attribute:status/Value:production' => 'Produzione',
-	'Class:Group/Attribute:status/Value:production+' => 'Produzione',
-	'Class:Group/Attribute:org_id' => 'Organizazione',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:description' => 'Descrizione',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Tipo',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Parent Group',
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:ci_list' => 'CIs collegati',
-	'Class:Group/Attribute:ci_list+' => '',
-	'Class:lnkGroupToCI' => 'Groppo / CI',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Groppo',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Motivo',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-	'Class:ApplicationSolution' => 'Soluzione Applicativa',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:description' => 'Descrizione',
-	'Class:ApplicationSolution/Attribute:description+' => '',
-	'Class:ApplicationSolution/Attribute:ci_list' => 'CIs',
-	'Class:ApplicationSolution/Attribute:ci_list+' => 'CIs che compongono la soluzione applicativa',
-	'Class:ApplicationSolution/Attribute:process_list' => 'Processi di business',
-	'Class:ApplicationSolution/Attribute:process_list+' => 'Processi di business che si basano sulla soluzione',
-	'Class:BusinessProcess' => 'Processi di business',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:description' => 'Descrizione',
-	'Class:BusinessProcess/Attribute:description+' => '',
-	'Class:BusinessProcess/Attribute:used_solution_list' => 'Soluzioni Applicative',
-	'Class:BusinessProcess/Attribute:used_solution_list+' => 'Soluzioni applicative sui cui si basa il processo',
-	'Class:NetworkInterface' => 'Interfaccia di Rete',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Attribute:device_id' => 'Dispositivo',
-	'Class:NetworkInterface/Attribute:device_id+' => '',
-	'Class:NetworkInterface/Attribute:logical_type' => 'Logical Type',
-	'Class:NetworkInterface/Attribute:logical_type+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:backup' => 'Backup',
-	'Class:NetworkInterface/Attribute:logical_type/Value:backup+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:logical' => 'Logical',
-	'Class:NetworkInterface/Attribute:logical_type/Value:logical+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:port' => 'Porta',
-	'Class:NetworkInterface/Attribute:logical_type/Value:port+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:primary' => 'Primario',
-	'Class:NetworkInterface/Attribute:logical_type/Value:primary+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:secondary' => 'Secondario',
-	'Class:NetworkInterface/Attribute:logical_type/Value:secondary+' => '',
-	'Class:NetworkInterface/Attribute:physical_type' => 'Tipo fisico',
-	'Class:NetworkInterface/Attribute:physical_type+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:atm' => 'ATM',
-	'Class:NetworkInterface/Attribute:physical_type/Value:atm+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet' => 'Ethernet',
-	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay' => 'Frame Relay',
-	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:vlan' => 'VLAN',
-	'Class:NetworkInterface/Attribute:physical_type/Value:vlan+' => '',
-	'Class:NetworkInterface/Attribute:ip_address' => 'Indirizzo IP',
-	'Class:NetworkInterface/Attribute:ip_address+' => '',
-	'Class:NetworkInterface/Attribute:ip_mask' => 'Maschera IP',
-	'Class:NetworkInterface/Attribute:ip_mask+' => '',
-	'Class:NetworkInterface/Attribute:mac_address' => 'Indirizzo MAC',
-	'Class:NetworkInterface/Attribute:mac_address+' => '',
-	'Class:NetworkInterface/Attribute:speed' => 'Velocità',
-	'Class:NetworkInterface/Attribute:speed+' => '',
-	'Class:NetworkInterface/Attribute:duplex' => 'Duplex',
-	'Class:NetworkInterface/Attribute:duplex+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:auto' => 'Auto',
-	'Class:NetworkInterface/Attribute:duplex/Value:auto+' => 'Auto',
-	'Class:NetworkInterface/Attribute:duplex/Value:full' => 'Full',
-	'Class:NetworkInterface/Attribute:duplex/Value:full+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:half' => 'Half',
-	'Class:NetworkInterface/Attribute:duplex/Value:half+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:unknown' => 'Sconosciuta',
-	'Class:NetworkInterface/Attribute:duplex/Value:unknown+' => '',
-	'Class:NetworkInterface/Attribute:connected_if' => 'Connesso a ',
-	'Class:NetworkInterface/Attribute:connected_if+' => 'Interfaccia connessa',
-	'Class:NetworkInterface/Attribute:link_type' => 'Tipo di link',
-	'Class:NetworkInterface/Attribute:link_type+' => '',
-	'Class:NetworkInterface/Attribute:link_type/Value:downlink' => 'Down link',
-	'Class:NetworkInterface/Attribute:link_type/Value:downlink+' => '',
-	'Class:NetworkInterface/Attribute:link_type/Value:uplink' => 'Up link',
-	'Class:NetworkInterface/Attribute:link_type/Value:uplink+' => '',
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:cpu' => 'CPU',
-	'Class:PC/Attribute:cpu+' => '',
-	'Class:PC/Attribute:ram' => 'RAM',
-	'Class:PC/Attribute:ram+' => '',
-	'Class:PC/Attribute:hdd' => 'Hard disk',
-	'Class:PC/Attribute:hdd+' => '',
-	'Class:PC/Attribute:os_family' => 'OS Family',
-	'Class:PC/Attribute:os_family+' => '',
-	'Class:PC/Attribute:os_version' => 'OS Version',
-	'Class:PC/Attribute:os_version+' => '',
-	'Class:PC/Attribute:application_list' => 'Applicazioni',
-	'Class:PC/Attribute:application_list+' => 'Applicazioni installate su questo PC',
-	'Class:PC/Attribute:patch_list' => 'Patches',
-	'Class:PC/Attribute:patch_list+' => 'Patches installate su questo PC',
-	'Class:MobilePhone' => 'Cellulari',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:number' => 'Numero di telefono',
-	'Class:MobilePhone/Attribute:number+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-	'Class:NetworkDevice' => 'Dispositivi di rete',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:type' => 'Tipo',
-	'Class:NetworkDevice/Attribute:type+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:firewall' => 'Firewall',
-	'Class:NetworkDevice/Attribute:type/Value:firewall+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:hub' => 'Hub',
-	'Class:NetworkDevice/Attribute:type/Value:hub+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:loadbalancer' => 'Load Balancer',
-	'Class:NetworkDevice/Attribute:type/Value:loadbalancer+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:router' => 'Router',
-	'Class:NetworkDevice/Attribute:type/Value:router+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:switch' => 'Switch',
-	'Class:NetworkDevice/Attribute:type/Value:switch+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator' => 'Acceleratore WAN',
-	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator+' => '',
-	'Class:NetworkDevice/Attribute:ios_version' => 'Versione IOS',
-	'Class:NetworkDevice/Attribute:ios_version+' => '',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-	'Class:NetworkDevice/Attribute:snmp_read' => 'SNMP Read',
-	'Class:NetworkDevice/Attribute:snmp_read+' => '',
-	'Class:NetworkDevice/Attribute:snmp_write' => 'SNMP Write',
-	'Class:NetworkDevice/Attribute:snmp_write+' => '',
-	'Class:Server' => 'Server',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:cpu' => 'CPU',
-	'Class:Server/Attribute:cpu+' => '',
-	'Class:Server/Attribute:ram' => 'RAM',
-	'Class:Server/Attribute:ram+' => '',
-	'Class:Server/Attribute:hdd' => 'Hard Disk',
-	'Class:Server/Attribute:hdd+' => '',
-	'Class:Server/Attribute:os_family' => 'OS Family',
-	'Class:Server/Attribute:os_family+' => '',
-	'Class:Server/Attribute:os_version' => 'OS Version',
-	'Class:Server/Attribute:os_version+' => '',
-	'Class:Server/Attribute:application_list' => 'Applicazioni',
-	'Class:Server/Attribute:application_list+' => 'Applicazioni installate su questo server',
-	'Class:Server/Attribute:patch_list' => 'Patches',
-	'Class:Server/Attribute:patch_list+' => 'Patches installate su questo server',
-	'Class:Printer' => 'Stampante',
-	'Class:Printer+' => '',
-	'Class:Printer/Attribute:type' => 'Tipo',
-	'Class:Printer/Attribute:type+' => '',
-	'Class:Printer/Attribute:type/Value:mopier' => 'Mopier',
-	'Class:Printer/Attribute:type/Value:mopier+' => '',
-	'Class:Printer/Attribute:type/Value:printer' => 'Stampante',
-	'Class:Printer/Attribute:type/Value:printer+' => '',
-	'Class:Printer/Attribute:technology' => 'Tecnologia',
-	'Class:Printer/Attribute:technology+' => '',
-	'Class:Printer/Attribute:technology/Value:inkjet' => 'Inkjet',
-	'Class:Printer/Attribute:technology/Value:inkjet+' => '',
-	'Class:Printer/Attribute:technology/Value:laser' => 'Laser',
-	'Class:Printer/Attribute:technology/Value:laser+' => '',
-	'Class:Printer/Attribute:technology/Value:tracer' => 'Tracer',
-	'Class:Printer/Attribute:technology/Value:tracer+' => '',
-	'Class:lnkCIToDoc' => 'Doc/CI',
-	'Class:lnkCIToDoc+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_id' => 'CI',
-	'Class:lnkCIToDoc/Attribute:ci_id+' => '',
-	'Class:lnkCIToDoc/Attribute:document_id' => 'Documento',
-	'Class:lnkCIToDoc/Attribute:document_id+' => '',
-	'Class:lnkCIToContact' => 'CI/Contatto',
-	'Class:lnkCIToContact+' => '',
-	'Class:lnkCIToContact/Attribute:ci_id' => 'CI',
-	'Class:lnkCIToContact/Attribute:ci_id+' => '',
-	'Class:lnkCIToContact/Attribute:contact_id' => 'Contatto',
-	'Class:lnkCIToContact/Attribute:contact_id+' => '',
-	'Class:lnkCIToContact/Attribute:role' => 'Ruolo',
-	'Class:lnkCIToContact/Attribute:role+' => 'Ruolo del contatto per quanto riguarda il CI',
-	'Class:lnkSolutionToCI' => 'CI/Solutione',
-	'Class:lnkSolutionToCI+' => '',
-	'Class:lnkSolutionToCI/Attribute:solution_id' => 'Soluzione applicativa',
-	'Class:lnkSolutionToCI/Attribute:solution_id+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkSolutionToCI/Attribute:ci_id+' => '',
-	'Class:lnkSolutionToCI/Attribute:utility' => 'Utility',
-	'Class:lnkSolutionToCI/Attribute:utility+' => 'Utility del CI nella soluzione applicativa',
-	'Class:lnkProcessToSolution' => 'Processo di business/Solutione',
-	'Class:lnkProcessToSolution+' => '',
-	'Class:lnkProcessToSolution/Attribute:solution_id' => 'Soluzione applicativa',
-	'Class:lnkProcessToSolution/Attribute:solution_id+' => '',
-	'Class:lnkProcessToSolution/Attribute:process_id' => 'Processo',
-	'Class:lnkProcessToSolution/Attribute:process_id+' => '',
-	'Class:lnkProcessToSolution/Attribute:reason' => 'Motivo',
-	'Class:lnkProcessToSolution/Attribute:reason+' => 'Più informazioni tra il processo di business e la soluzione applicativa',
-	'Relation:impacts/Description' => 'Elementi impattati da...',
-	'Relation:impacts/DownStream' => 'Impatto...',
-	'Relation:impacts/DownStream+' => 'Elementi impattati da...',
-	'Relation:impacts/UpStream' => 'Dipende da...',
-	'Relation:impacts/UpStream+' => 'Elementi di questo elemento dipende da',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Elementi di questo elemento dipende da',
-	'Relation:depends on/DownStream' => 'Dipende da...',
-	'Relation:depends on/UpStream' => 'Impatto...',
-	'Class:Organization/Attribute:parent_name' => 'Parent name',
-	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
-	'Class:Location/Attribute:org_name' => 'Nome dell\'organizzazione',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:parent_name' => 'Parent name',
-	'Class:Location/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:owner_name' => 'Cognome',
-	'Class:Group/Attribute:owner_name+' => 'Nome',
-	'Class:Group/Attribute:parent_name' => 'Nome',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Nome',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Nome',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_status' => 'CI Stato',
-	'Class:lnkGroupToCI/Attribute:ci_status+' => '',
-	'Class:Contact' => 'Contatto',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Nome',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Stato',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Attivo',
-	'Class:Contact/Attribute:status/Value:active+' => 'Attivo',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inattivo',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inattivo',
-	'Class:Contact/Attribute:org_id' => 'Organizzazione',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organizzazione',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefono',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:location_id' => 'Posizione',
-	'Class:Contact/Attribute:location_id+' => '',
-	'Class:Contact/Attribute:location_name' => 'Posizione',
-	'Class:Contact/Attribute:location_name+' => '',
-	'Class:Contact/Attribute:ci_list' => 'CIs',
-	'Class:Contact/Attribute:ci_list+' => 'CIs relativi al contatto',
-	'Class:Contact/Attribute:contract_list' => 'Contratti',
-	'Class:Contact/Attribute:contract_list+' => 'Contratti relativi al contatto',
-	'Class:Contact/Attribute:service_list' => 'Servizi',
-	'Class:Contact/Attribute:service_list+' => 'Servizi relativi al contatto',
-	'Class:Contact/Attribute:ticket_list' => 'Tickets',
-	'Class:Contact/Attribute:ticket_list+' => 'Tickets relativi al contatto',
-	'Class:Contact/Attribute:team_list' => 'Squadre',
-	'Class:Contact/Attribute:team_list+' => 'Squadre di appartenenza',
-	'Class:Contact/Attribute:finalclass' => 'Tipo',
-	'Class:Contact/Attribute:finalclass+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_location_id' => 'Posizione',
-	'Class:lnkTeamToContact/Attribute:contact_location_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_email' => 'Email',
-	'Class:lnkTeamToContact/Attribute:contact_email+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_phone' => 'Telefono',
-	'Class:lnkTeamToContact/Attribute:contact_phone+' => '',
-	'Class:Document' => 'Documento',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Nome',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organizzazione',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:org_name' => 'Nome dell\'organizzazione',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:description' => 'Descrizione',
-	'Class:Document/Attribute:type' => 'Tipo',
-	'Class:Document/Attribute:type+' => '',
-	'Class:Document/Attribute:type/Value:contract' => 'Contratto',
-	'Class:Document/Attribute:type/Value:contract+' => '',
-	'Class:Document/Attribute:type/Value:networkmap' => 'Network Map',
-	'Class:Document/Attribute:type/Value:networkmap+' => '',
-	'Class:Document/Attribute:type/Value:presentation' => 'Presentazine',
-	'Class:Document/Attribute:type/Value:presentation+' => '',
-	'Class:Document/Attribute:type/Value:training' => 'Formazione',
-	'Class:Document/Attribute:type/Value:training+' => '',
-	'Class:Document/Attribute:type/Value:whitePaper' => 'Foglio bianco',
-	'Class:Document/Attribute:type/Value:whitePaper+' => '',
-	'Class:Document/Attribute:type/Value:workinginstructions' => 'Istruzioni di lavoro',
-	'Class:Document/Attribute:type/Value:workinginstructions+' => '',
-	'Class:Document/Attribute:status' => 'Stato',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Draft',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Pubblicato',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:ci_list' => 'CIs',
-	'Class:Document/Attribute:ci_list+' => 'CIs relativo a questo documento',
-	'Class:Document/Attribute:contract_list' => 'Contratti',
-	'Class:Document/Attribute:contract_list+' => 'Contratti relativi a questo documento',
-	'Class:Document/Attribute:service_list' => 'Servizi',
-	'Class:Document/Attribute:service_list+' => 'Servizi relativi a questo documento',
-	'Class:Document/Attribute:ticket_list' => 'Tickets',
-	'Class:Document/Attribute:ticket_list+' => 'Tickets relativi a questo documento',
-	'Class:Document:PreviewTab' => 'Anteprima',
-	'Class:Licence/Attribute:org_name' => 'Cognome',
-	'Class:Licence/Attribute:org_name+' => 'Nome',
-	'Class:Subnet/Name' => '%1$s / %2$s~~',
-	'Class:Software' => 'Software',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => 'Nome',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:description' => 'Descrizione',
-	'Class:Software/Attribute:description+' => '',
-	'Class:Software/Attribute:instance_list' => 'Installazioni',
-	'Class:Software/Attribute:instance_list+' => 'Istanze di questo software',
-	'Class:Software/Attribute:finalclass' => 'Tipo',
-	'Class:Software/Attribute:finalclass+' => '',
-	'Class:Application/Attribute:name' => 'Nome',
-	'Class:Application/Attribute:name+' => '',
-	'Class:Application/Attribute:description' => 'Descrizione',
-	'Class:Application/Attribute:description+' => '',
-	'Class:lnkPatchToCI/Attribute:patch_name' => 'Patch',
-	'Class:lnkPatchToCI/Attribute:patch_name+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkPatchToCI/Attribute:ci_name+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_status' => 'CI Stato',
-	'Class:lnkPatchToCI/Attribute:ci_status+' => '',
-	'Class:FunctionalCI' => 'CI Funzionale',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Nome',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:status' => 'Stato',
-	'Class:FunctionalCI/Attribute:status+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:implementation' => 'Implementazione',
-	'Class:FunctionalCI/Attribute:status/Value:implementation+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:FunctionalCI/Attribute:status/Value:obsolete+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:production' => 'Produzione',
-	'Class:FunctionalCI/Attribute:status/Value:production+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => 'Organizzazione proprietaria',
-	'Class:FunctionalCI/Attribute:org_id+' => '',
-	'Class:FunctionalCI/Attribute:owner_name' => 'Organizzazione proprietaria',
-	'Class:FunctionalCI/Attribute:owner_name+' => '',
-	'Class:FunctionalCI/Attribute:importance' => 'Criticità di business',
-	'Class:FunctionalCI/Attribute:importance+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:high' => 'Alta',
-	'Class:FunctionalCI/Attribute:importance/Value:high+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:low' => 'Bassa',
-	'Class:FunctionalCI/Attribute:importance/Value:low+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:medium' => 'Media',
-	'Class:FunctionalCI/Attribute:importance/Value:medium+' => '',
-	'Class:FunctionalCI/Attribute:contact_list' => 'Contatti',
-	'Class:FunctionalCI/Attribute:contact_list+' => 'Contatti per questo CI',
-	'Class:FunctionalCI/Attribute:document_list' => 'Documenti',
-	'Class:FunctionalCI/Attribute:document_list+' => 'Documentazione per questo CI',
-	'Class:FunctionalCI/Attribute:solution_list' => 'Soluzioni applicative',
-	'Class:FunctionalCI/Attribute:solution_list+' => 'Soluzioni applicative che utilizzano questo CI',
-	'Class:FunctionalCI/Attribute:contract_list' => 'Contratti',
-	'Class:FunctionalCI/Attribute:contract_list+' => 'Contratti a sostegno di questo CI',
-	'Class:FunctionalCI/Attribute:ticket_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:ticket_list+' => 'Tickets relativi al CI',
-	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-	'Class:SoftwareInstance' => 'Istanza software',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Name' => '%1$s - %2$s~~',
-	'Class:SoftwareInstance/Attribute:device_id' => 'Dispositivo',
-	'Class:SoftwareInstance/Attribute:device_id+' => '',
-	'Class:SoftwareInstance/Attribute:device_name' => 'Dispositivo',
-	'Class:SoftwareInstance/Attribute:device_name+' => '',
-	'Class:SoftwareInstance/Attribute:licence_id' => 'Licenza',
-	'Class:SoftwareInstance/Attribute:licence_id+' => '',
-	'Class:SoftwareInstance/Attribute:licence_name' => 'Licenza',
-	'Class:SoftwareInstance/Attribute:licence_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => 'Software',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:version' => 'Versione',
-	'Class:SoftwareInstance/Attribute:version+' => '',
-	'Class:SoftwareInstance/Attribute:description' => 'Descrizione',
-	'Class:SoftwareInstance/Attribute:description+' => '',
-	'Class:ApplicationInstance/Name' => '%1$s - %2$s~~',
-	'Class:ApplicationInstance/Attribute:software_name' => 'Nome',
-	'Class:ApplicationInstance/Attribute:software_name+' => '',
-	'Class:DBServerInstance/Name' => '%1$s - %2$s~~',
-	'Class:DBServerInstance/Attribute:software_name' => 'Nome del Software',
-	'Class:DBServerInstance/Attribute:software_name+' => '',
-	'Class:DatabaseInstance/Name' => '%1$s - %2$s~~',
-	'Class:DatabaseInstance/Attribute:db_server_instance_version' => 'Versione del database',
-	'Class:DatabaseInstance/Attribute:db_server_instance_version+' => '',
-	'Class:ConnectableCI' => 'CI collegabile',
-	'Class:ConnectableCI+' => 'CI fisico',
-	'Class:ConnectableCI/Attribute:brand' => 'Marca',
-	'Class:ConnectableCI/Attribute:brand+' => '',
-	'Class:ConnectableCI/Attribute:model' => 'Modello',
-	'Class:ConnectableCI/Attribute:model+' => '',
-	'Class:ConnectableCI/Attribute:serial_number' => 'Numero seriala',
-	'Class:ConnectableCI/Attribute:serial_number+' => '',
-	'Class:ConnectableCI/Attribute:asset_ref' => 'Asset di riferimento',
-	'Class:ConnectableCI/Attribute:asset_ref+' => '',
-	'Class:NetworkInterface/Name' => '%1$s - %2$s~~',
-	'Class:NetworkInterface/Attribute:device_name' => 'Dispositivo',
-	'Class:NetworkInterface/Attribute:device_name+' => '',
-	'Class:NetworkInterface/Attribute:connected_name' => 'Connesso a ',
-	'Class:NetworkInterface/Attribute:connected_name+' => '',
-	'Class:NetworkInterface/Attribute:connected_if_device_id' => 'Dispositivo connesso',
-	'Class:NetworkInterface/Attribute:connected_if_device_id+' => '',
-	'Class:NetworkInterface/Attribute:connected_if_device_id_name' => 'Dispositivo',
-	'Class:NetworkInterface/Attribute:connected_if_device_id_name+' => '',
-	'Class:Device' => 'Dispositivo',
-	'Class:Device+' => '',
-	'Class:Device/Attribute:nwinterface_list' => 'Interfaccia di Rete',
-	'Class:Device/Attribute:nwinterface_list+' => '',
-	'Class:MobileCI' => 'CI Mobili',
-	'Class:MobileCI+' => '',
-	'Class:InfrastructureCI' => 'CI Infrastrutture',
-	'Class:InfrastructureCI+' => '',
-	'Class:InfrastructureCI/Attribute:description' => 'Descrizione',
-	'Class:InfrastructureCI/Attribute:description+' => '',
-	'Class:InfrastructureCI/Attribute:location_id' => 'Posizione',
-	'Class:InfrastructureCI/Attribute:location_id+' => '',
-	'Class:InfrastructureCI/Attribute:location_name' => 'Posizione',
-	'Class:InfrastructureCI/Attribute:location_name+' => '',
-	'Class:InfrastructureCI/Attribute:location_details' => 'Dettagli di posizione',
-	'Class:InfrastructureCI/Attribute:location_details+' => '',
-	'Class:InfrastructureCI/Attribute:management_ip' => 'Gestione IP',
-	'Class:InfrastructureCI/Attribute:management_ip+' => '',
-	'Class:InfrastructureCI/Attribute:default_gateway' => 'Gateway di default',
-	'Class:InfrastructureCI/Attribute:default_gateway+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_name' => 'CI',
-	'Class:lnkCIToDoc/Attribute:ci_name+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_status' => 'CI Stato',
-	'Class:lnkCIToDoc/Attribute:ci_status+' => '',
-	'Class:lnkCIToDoc/Attribute:document_name' => 'Documento',
-	'Class:lnkCIToDoc/Attribute:document_name+' => '',
-	'Class:lnkCIToDoc/Attribute:document_type' => 'Tipo di documento',
-	'Class:lnkCIToDoc/Attribute:document_type+' => '',
-	'Class:lnkCIToDoc/Attribute:document_status' => 'Stato del documento',
-	'Class:lnkCIToDoc/Attribute:document_status+' => '',
-	'Class:lnkCIToContact/Attribute:ci_name' => 'CI',
-	'Class:lnkCIToContact/Attribute:ci_name+' => '',
-	'Class:lnkCIToContact/Attribute:ci_status' => 'CI Stato',
-	'Class:lnkCIToContact/Attribute:ci_status+' => '',
-	'Class:lnkCIToContact/Attribute:contact_name' => 'Contatto',
-	'Class:lnkCIToContact/Attribute:contact_name+' => '',
-	'Class:lnkCIToContact/Attribute:contact_email' => 'Contatto Email',
-	'Class:lnkCIToContact/Attribute:contact_email+' => '',
-	'Class:lnkSolutionToCI/Attribute:solution_name' => 'Soluzione applicativa',
-	'Class:lnkSolutionToCI/Attribute:solution_name+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkSolutionToCI/Attribute:ci_name+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_status' => 'CI Stato',
-	'Class:lnkSolutionToCI/Attribute:ci_status+' => '',
-	'Class:lnkProcessToSolution/Attribute:solution_name' => 'Soluzione applicativa',
-	'Class:lnkProcessToSolution/Attribute:solution_name+' => '',
-	'Class:lnkProcessToSolution/Attribute:process_name' => 'Processo',
-	'Class:lnkProcessToSolution/Attribute:process_name+' => '',
-	'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Iterfacce che hanno un IP nell\'intervallo: <em>%1$s</em> e <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'IP liberi',
-	'Class:Subnet/Tab:FreeIPs-count' => 'IP liberi: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Qui c\'è un estratto di 10 indirizzi IP liberi',
-	'Menu:DataAdministration' => 'Dati di amministrazione',
-	'Menu:DataAdministration+' => '',
-	'Menu:Catalogs' => 'Cataloghi',
-	'Menu:Catalogs+' => 'Tipi di dato',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' =>  'Importazione CSV',
-	'Menu:CSVImport+' => '',
-	'Menu:Organization' => 'Organizzazioni',
-	'Menu:Organization+' => 'Tutte le organizzazioni',
-	'Menu:Application' => 'Applicazioni',
-	'Menu:Application+' => 'Tutte le applicazioni',
-	'Menu:DBServer' => 'Database Servers',
-	'Menu:DBServer+' => 'Database Servers',
-	'Menu:ConfigManagement' => 'Gestione delle Configurazioni',
-	'Menu:ConfigManagement+' => 'Gestione delle Configurazioni',
-	'Menu:ConfigManagementOverview' => 'Panoramica',
-	'Menu:ConfigManagementOverview+' => 'Panoramica',
-	'Menu:Contact' => 'Contatti',
-	'Menu:Contact+' => 'Contatti',
-	'Menu:Contact:Count' => '%1$d contatti',
-	'Menu:Person' => 'Persone',
-	'Menu:Person+' => 'Tutte le persone',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'Tutti i Teams',
-	'Menu:Document' => 'Documenti',
-	'Menu:Document+' => 'Tutti i Documenti',
-	'Menu:Location' => 'Posizioni',
-	'Menu:Location+' => 'Tutte le pozisioni',
-	'Menu:ConfigManagementCI' => 'Elementi di Configurazione (CI)',
-	'Menu:ConfigManagementCI+' => 'Elementi di Configurazione (CI)',
-	'Menu:BusinessProcess' => 'Processi di business',
-	'Menu:BusinessProcess+' => 'Tutti i processi di business',
-	'Menu:ApplicationSolution' => 'Soluzioni applicative',
-	'Menu:ApplicationSolution+' => 'Tutte le soluzioni applicative',
-	'Menu:ConfigManagementSoftware' => 'Gestione delle Applicazioni',
-	'Menu:Licence' => 'Licenze',
-	'Menu:Licence+' => 'Tutte le licenze',
-	'Menu:Patch' => 'Patches',
-	'Menu:Patch+' => 'Tutte le patches',
-	'Menu:ApplicationInstance' => 'Software Installati',
-	'Menu:ApplicationInstance+' => 'Applicazioni e Database servers',
-	'Menu:ConfigManagementHardware' => 'Gestione Infrastrutture',
-	'Menu:Subnet' => 'Subnets',
-	'Menu:Subnet+' => 'Tutte le Subnets',
-	'Menu:NetworkDevice' => 'Dispositivi di rete',
-	'Menu:NetworkDevice+' => 'Tutti i dispositivi di rete',
-	'Menu:Server' => 'Server',
-	'Menu:Server+' => 'Tutti i Server',
-	'Menu:Printer' => 'Stampanti',
-	'Menu:Printer+' => 'Tutte le stampanti',
-	'Menu:MobilePhone' => 'Cellulari',
-	'Menu:MobilePhone+' => 'Tutti i cellulari',
-	'Menu:PC' => 'Personal Computers',
-	'Menu:PC+' => 'Tutti i Personal Computers',
-	'Menu:NewContact' => 'Nuovo Contatto',
-	'Menu:NewContact+' => 'Nuovo Contatto',
-	'Menu:SearchContacts' => 'Ricerca contatti',
-	'Menu:SearchContacts+' => 'Ricerca contatti',
-	'Menu:NewCI' => 'Nuovo CI',
-	'Menu:NewCI+' => 'Nuovo CI',
-	'Menu:SearchCIs' => 'Ricerca CIs',
-	'Menu:SearchCIs+' => 'Ricerca CIs',
-	'Menu:ConfigManagement:Devices' => 'Dispositvi',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastrutture',
-	'Menu:ConfigManagement:SWAndApps' => 'Software e Applicazioni',
-	'Menu:ConfigManagement:Misc' => 'Varie',
-	'Menu:Group' => 'Gruppi di CIs',
-	'Menu:Group+' => 'Gruppi di CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Scorciatoie',
-	'Menu:ConfigManagement:AllContacts' => 'Tutti i contatti: %1$d',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
-	'Class:Location/Attribute:person_list' => 'Contacts~~',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
-	'Class:Contact/Attribute:notify' => 'Notification~~',
-	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
-	'Class:Contact/Attribute:function' => 'Function~~',
-	'Class:Contact/Attribute:cis_list' => 'CIs~~',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
-	'Class:Person/Attribute:name' => 'Last Name~~',
-	'Class:Person/Attribute:employee_number' => 'Employee number~~',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
-	'Class:Person/Attribute:location_id' => 'Location~~',
-	'Class:Person/Attribute:location_name' => 'Location name~~',
-	'Class:Person/Attribute:manager_id' => 'Manager~~',
-	'Class:Person/Attribute:manager_name' => 'Manager name~~',
-	'Class:Person/Attribute:team_list' => 'Teams~~',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
-	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
-	'Class:Team/Attribute:persons_list' => 'Members~~',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
-	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
-	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:cis_list' => 'CIs~~',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Document Type~~',
-	'Class:DocumentFile' => 'Document File~~',
-	'Class:DocumentFile/Attribute:file' => 'File~~',
-	'Class:DocumentNote' => 'Document Note~~',
-	'Class:DocumentNote/Attribute:text' => 'Text~~',
-	'Class:DocumentWeb' => 'Document Web~~',
-	'Class:DocumentWeb/Attribute:url' => 'URL~~',
-	'Class:FunctionalCI/Attribute:description' => 'Description~~',
-	'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/Value:high' => 'high~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
-	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date~~',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts~~',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Documents~~',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
-	'Class:PhysicalDevice' => 'Physical Device~~',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Location name~~',
-	'Class:PhysicalDevice/Attribute:status' => 'Status~~',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock~~',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand~~',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name~~',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Model~~',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Model name~~',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number~~',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date~~',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty~~',
-	'Class:Rack' => 'Rack~~',
-	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
-	'Class:Rack/Attribute:device_list' => 'Devices~~',
-	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
-	'Class:Rack/Attribute:enclosure_list' => 'Enclosures~~',
-	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
-	'Class:TelephonyCI' => 'Telephony CI~~',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number~~',
-	'Class:Phone' => 'Phone~~',
-	'Class:IPPhone' => 'IP Phone~~',
-	'Class:Tablet' => 'Tablet~~',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
-	'Class:DatacenterDevice' => 'Datacenter Device~~',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure~~',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name~~',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name~~',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source~~',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name~~',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports~~',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs~~',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
-	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices~~',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version~~',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name~~',
-	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
-	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:Server/Attribute:osversion_id' => 'OS version~~',
-	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
-	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
-	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
-	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes~~',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
-	'Class:StorageSystem' => 'Storage System~~',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
-	'Class:SANSwitch' => 'SAN Switch~~',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
-	'Class:TapeLibrary' => 'Tape Library~~',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
-	'Class:NAS' => 'NAS~~',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
-	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
-	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:PC/Attribute:osversion_id' => 'OS version~~',
-	'Class:PC/Attribute:osversion_name' => 'OS version name~~',
-	'Class:PC/Attribute:type' => 'Type~~',
-	'Class:PC/Attribute:type/Value:desktop' => 'desktop~~',
-	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
-	'Class:PC/Attribute:type/Value:laptop' => 'laptop~~',
-	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
-	'Class:PowerConnection' => 'Power Connection~~',
-	'Class:PowerSource' => 'Power Source~~',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
-	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
-	'Class:PDU' => 'PDU~~',
-	'Class:PDU/Attribute:rack_id' => 'Rack~~',
-	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
-	'Class:PDU/Attribute:powerstart_id' => 'Power start~~',
-	'Class:PDU/Attribute:powerstart_name' => 'Power start name~~',
-	'Class:Peripheral' => 'Peripheral~~',
-	'Class:Enclosure' => 'Enclosure~~',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
-	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
-	'Class:Enclosure/Attribute:nb_u' => 'Rack units~~',
-	'Class:Enclosure/Attribute:device_list' => 'Devices~~',
-	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes~~',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
-	'Class:ApplicationSolution/Attribute:status' => 'Status~~',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active~~',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions~~',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
-	'Class:BusinessProcess/Attribute:status' => 'Status~~',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'active~~',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:SoftwareInstance/Attribute:system_id' => 'System~~',
-	'Class:SoftwareInstance/Attribute:system_name' => 'System name~~',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
-	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
-	'Class:SoftwareInstance/Attribute:status' => 'Status~~',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active~~',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:Middleware' => 'Middleware~~',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
-	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas~~',
-	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
-	'Class:WebServer' => 'Web server~~',
-	'Class:WebServer/Attribute:webapp_list' => 'Web applications~~',
-	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
-	'Class:PCSoftware' => 'PC Software~~',
-	'Class:OtherSoftware' => 'Other Software~~',
-	'Class:MiddlewareInstance' => 'Middleware Instance~~',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
-	'Class:DatabaseSchema' => 'Database Schema~~',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
-	'Class:WebApplication' => 'Web Application~~',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
-	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
-	'Class:WebApplication/Attribute:url' => 'URL~~',
-	'Class:VirtualDevice' => 'Virtual Device~~',
-	'Class:VirtualDevice/Attribute:status' => 'Status~~',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'production~~',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock~~',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes~~',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
-	'Class:VirtualHost' => 'Virtual Host~~',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines~~',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
-	'Class:Hypervisor' => 'Hypervisor~~',
-	'Class:Hypervisor/Attribute:farm_id' => 'Farm~~',
-	'Class:Hypervisor/Attribute:farm_name' => 'Farm name~~',
-	'Class:Hypervisor/Attribute:server_id' => 'Server~~',
-	'Class:Hypervisor/Attribute:server_name' => 'Server name~~',
-	'Class:Farm' => 'Farm~~',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors~~',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
-	'Class:Farm/Attribute:redundancy' => 'High availability~~',
-	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
-	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
-	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
-	'Class:VirtualMachine' => 'Virtual Machine~~',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family~~',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version~~',
-	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
-	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM~~',
-	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
-	'Class:LogicalVolume' => 'Logical Volume~~',
-	'Class:LogicalVolume/Attribute:name' => 'Name~~',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID~~',
-	'Class:LogicalVolume/Attribute:description' => 'Description~~',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level~~',
-	'Class:LogicalVolume/Attribute:size' => 'Size~~',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system~~',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name~~',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servers~~',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices~~',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
-	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Server~~',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name~~',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used~~',
-	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used~~',
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc~~',
-	'Class:Tape' => 'Tape~~',
-	'Class:Tape/Attribute:name' => 'Name~~',
-	'Class:Tape/Attribute:description' => 'Description~~',
-	'Class:Tape/Attribute:size' => 'Size~~',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library~~',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
-	'Class:NASFileSystem' => 'NAS File System~~',
-	'Class:NASFileSystem/Attribute:name' => 'Name~~',
-	'Class:NASFileSystem/Attribute:description' => 'Description~~',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level~~',
-	'Class:NASFileSystem/Attribute:size' => 'Size~~',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
-	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name~~',
-	'Class:Software/Attribute:vendor' => 'vendor~~',
-	'Class:Software/Attribute:version' => 'Version~~',
-	'Class:Software/Attribute:documents_list' => 'Documents~~',
-	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
-	'Class:Software/Attribute:type' => 'Type~~',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server~~',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software~~',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software~~',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server~~',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances~~',
-	'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:Patch/Attribute:documents_list' => 'Documents~~',
-	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
-	'Class:Patch/Attribute:finalclass' => 'Type~~',
-	'Class:OSPatch' => 'OS Patch~~',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices~~',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
-	'Class:OSPatch/Attribute:osversion_id' => 'OS version~~',
-	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
-	'Class:SoftwarePatch' => 'Software Patch~~',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software~~',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
-	'Class:Licence/Attribute:documents_list' => 'Documents~~',
-	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
-	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
-	'Class:Licence/Attribute:organization_name+' => 'Common name~~',
-	'Class:Licence/Attribute:description' => 'Description~~',
-	'Class:Licence/Attribute:start_date' => 'Start date~~',
-	'Class:Licence/Attribute:end_date' => 'End date~~',
-	'Class:Licence/Attribute:perpetual' => 'Perpetual~~',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'no~~',
-	'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:OSLicence' => 'OS Licence~~',
-	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
-	'Class:OSLicence/Attribute:osversion_name' => 'OS version 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:SoftwareLicence' => 'Software Licence~~',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
-	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name~~',
-	'Class:Typology' => 'Typology~~',
-	'Class:Typology/Attribute:name' => 'Name~~',
-	'Class:Typology/Attribute:finalclass' => 'Type~~',
-	'Class:OSVersion' => 'OS Version~~',
-	'Class:OSVersion/Attribute:osfamily_id' => 'OS family~~',
-	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:OSFamily' => 'OS Family~~',
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:Brand' => 'Brand~~',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
-	'Class:Model' => 'Model~~',
-	'Class:Model/Attribute:brand_id' => 'Brand~~',
-	'Class:Model/Attribute:brand_name' => 'Brand name~~',
-	'Class:Model/Attribute:type' => 'Device type~~',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
-	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source~~',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
-	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array~~',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone~~',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone~~',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
-	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device~~',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
-	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
-	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
-	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
-	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
-	'Class:Model/Attribute:type/Value:Printer' => 'Printer~~',
-	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
-	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
-	'Class:Model/Attribute:type/Value:Server' => 'Server~~',
-	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet~~',
-	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
-	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
-	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
-	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
-	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
-	'Class:NetworkDeviceType' => 'Network Device Type~~',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices~~',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
-	'Class:IOSVersion' => 'IOS Version~~',
-	'Class:IOSVersion/Attribute:brand_id' => 'Brand~~',
-	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
-	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
-	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name~~',
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name~~',
-	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:Subnet/Attribute:org_name' => 'Name~~',
-	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
-	'Class:Subnet/Attribute:vlans_list' => 'VLANs~~',
-	'Class:VLAN' => 'VLAN~~',
-	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:VLAN/Attribute:description' => 'Description~~',
-	'Class:VLAN/Attribute:org_id' => 'Organization~~',
-	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
-	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
-	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
-	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN~~',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:NetworkInterface/Attribute:name' => 'Name~~',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
-	'Class:IPInterface' => 'IP Interface~~',
-	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
-	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
-	'Class:IPInterface/Attribute:comment' => 'Comment~~',
-	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway~~',
-	'Class:IPInterface/Attribute:ipmask' => 'IP mask~~',
-	'Class:IPInterface/Attribute:speed' => 'Speed~~',
-	'Class:PhysicalInterface' => 'Physical Interface~~',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs~~',
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:LogicalInterface' => 'Logical Interface~~',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine~~',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name~~',
-	'Class:FiberChannelInterface' => 'Fiber Channel Interface~~',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Speed~~',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topology~~',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN~~',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device~~',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name~~',
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => '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:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name~~',
-	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group~~',
-	'Menu:ConfigManagement:virtualization' => 'Virtualization~~',
-	'Menu:ConfigManagement:EndUsers' => 'End user devices~~',
-	'Menu:Typology' => 'Typology configuration~~',
-	'Menu:Typology+' => 'Typology configuration~~',
-	'Menu:OSVersion' => 'OS versions~~',
-	'Menu:Software' => 'Software catalog~~',
-	'Menu:Software+' => 'Software catalog~~',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-	'Server:baseinfo' => 'General information~~',
-	'Server:Date' => 'Dates~~',
-	'Server:moreinfo' => 'More information~~',
-	'Server:otherinfo' => 'Other information~~',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'General information~~',
-	'Person:notifiy' => 'Notification~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Organization' => 'Organizzazione',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Cognome',
+	'Class:Organization/Attribute:name+' => 'Nome',
+	'Class:Organization/Attribute:code' => 'Codice',
+	'Class:Organization/Attribute:code+' => 'Codice dell\'organizzazione (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Stato',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Attivo',
+	'Class:Organization/Attribute:status/Value:active+' => 'Attivo',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inattivo',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inattivo',
+	'Class:Organization/Attribute:parent_id' => 'Parent',
+	'Class:Organization/Attribute:parent_id+' => 'Parent organization',
+	'Class:Location' => 'Localizzazione',
+	'Class:Location+' => 'Qualsiasi tipo di localizzazione: Regione, Paese, Città, Sito, Edificio, Piano, Stanza, Rack,,...',
+	'Class:Location/Attribute:name' => 'Nome',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Stato',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Attivo',
+	'Class:Location/Attribute:status/Value:active+' => 'Attivo',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inattivo',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inattivo',
+	'Class:Location/Attribute:org_id' => 'Organizzazione proprietaria',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:address' => 'Indirizzo',
+	'Class:Location/Attribute:address+' => 'Indirizzo postale',
+	'Class:Location/Attribute:postal_code' => 'Codice avviamento postale',
+	'Class:Location/Attribute:postal_code+' => 'CAP/codice avviamento postale',
+	'Class:Location/Attribute:city' => 'Città',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Paese',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:parent_id' => 'Parent location',
+	'Class:Location/Attribute:parent_id+' => '',
+	'Class:Location/Attribute:contact_list' => 'Contatti',
+	'Class:Location/Attribute:contact_list+' => 'Contatti posizionati su questo sito',
+	'Class:Location/Attribute:infra_list' => 'Infrastrutture',
+	'Class:Location/Attribute:infra_list+' => 'CIs posizionati su questo sito',
+	'Class:Person' => 'Persona',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:first_name' => 'Nome',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_id' => 'ID dipendente',
+	'Class:Person/Attribute:employee_id+' => '',
+	'Class:Team' => 'Squadra',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:member_list' => 'Membri',
+	'Class:Team/Attribute:member_list+' => 'Contatti che appartengono a questa Squadra',
+	'Class:lnkTeamToContact' => 'Membri della squadra',
+	'Class:lnkTeamToContact+' => 'membri della squadra',
+	'Class:lnkTeamToContact/Attribute:team_id' => 'Squadra',
+	'Class:lnkTeamToContact/Attribute:team_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_id' => 'Membri',
+	'Class:lnkTeamToContact/Attribute:contact_id+' => '',
+	'Class:lnkTeamToContact/Attribute:role' => 'Ruolo',
+	'Class:lnkTeamToContact/Attribute:role+' => '',
+	'Class:WebDoc' => 'Documento Web',
+	'Class:WebDoc+' => 'Documento disponibile su un altro server web',
+	'Class:WebDoc/Attribute:url' => 'Url',
+	'Class:WebDoc/Attribute:url+' => '',
+	'Class:Note' => 'Note',
+	'Class:Note+' => '',
+	'Class:Note/Attribute:note' => 'Testo',
+	'Class:Note/Attribute:note+' => '',
+	'Class:FileDoc' => 'Documento (file)',
+	'Class:FileDoc+' => '',
+	'Class:FileDoc/Attribute:contents' => 'Contenuti',
+	'Class:FileDoc/Attribute:contents+' => '',
+	'Class:Licence' => 'Licenza',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:provider' => 'Provider',
+	'Class:Licence/Attribute:provider+' => '',
+	'Class:Licence/Attribute:org_id' => 'Proprietario',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:product' => 'Prodotto',
+	'Class:Licence/Attribute:product+' => '',
+	'Class:Licence/Attribute:name' => 'Nome',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:start' => 'Data di inizio',
+	'Class:Licence/Attribute:start+' => '',
+	'Class:Licence/Attribute:end' => 'Data di fine',
+	'Class:Licence/Attribute:end+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Key',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:scope' => 'Scopo',
+	'Class:Licence/Attribute:scope+' => '',
+	'Class:Licence/Attribute:usage_limit' => 'Limiti d\'uso',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:usage_list' => 'Uso',
+	'Class:Licence/Attribute:usage_list+' => 'Istanze di applicazioni che usano questa licenza',
+	'Class:Subnet' => 'Subnet',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Attribute:description' => 'Descrizione',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Organizzazione proprietaria',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:Patch' => 'Patch',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Nome',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:description' => 'Descrizione',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:target_sw' => 'Scopo dell\'applicazione',
+	'Class:Patch/Attribute:target_sw+' => 'Software bersaglio (OS o applicazione)',
+	'Class:Patch/Attribute:version' => 'Versione',
+	'Class:Patch/Attribute:version+' => '',
+	'Class:Patch/Attribute:type' => 'Tipo',
+	'Class:Patch/Attribute:type+' => '',
+	'Class:Patch/Attribute:type/Value:application' => 'Applicazione',
+	'Class:Patch/Attribute:type/Value:application+' => '',
+	'Class:Patch/Attribute:type/Value:os' => 'OS',
+	'Class:Patch/Attribute:type/Value:os+' => '',
+	'Class:Patch/Attribute:type/Value:security' => 'Securirezza',
+	'Class:Patch/Attribute:type/Value:security+' => '',
+	'Class:Patch/Attribute:type/Value:servicepack' => 'Service Pack',
+	'Class:Patch/Attribute:type/Value:servicepack+' => '',
+	'Class:Patch/Attribute:ci_list' => 'Dispositivi',
+	'Class:Patch/Attribute:ci_list+' => 'Dispositivi dove la patch è installata',
+	'Class:Application' => 'Applicazione',
+	'Class:Application+' => '',
+	'Class:Application/Attribute:instance_list' => 'Installazioni',
+	'Class:Application/Attribute:instance_list+' => 'Istanze di questa applicazione',
+	'Class:DBServer' => 'Database',
+	'Class:DBServer+' => 'Database server SW',
+	'Class:DBServer/Attribute:instance_list' => 'Installazioni',
+	'Class:DBServer/Attribute:instance_list+' => 'Istanze di questo database server',
+	'Class:lnkPatchToCI' => 'Utilizzo di Patch',
+	'Class:lnkPatchToCI+' => '',
+	'Class:lnkPatchToCI/Attribute:patch_id' => 'Patch',
+	'Class:lnkPatchToCI/Attribute:patch_id+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkPatchToCI/Attribute:ci_id+' => '',
+	'Class:DBServerInstance' => 'Istanza del DB Server',
+	'Class:DBServerInstance+' => '',
+	'Class:DBServerInstance/Attribute:software_id' => 'Software',
+	'Class:DBServerInstance/Attribute:software_id+' => '',
+	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Databases',
+	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Sorgente del database',
+	'Class:ApplicationInstance' => 'Istanza dell\'applicazione',
+	'Class:ApplicationInstance+' => '',
+	'Class:ApplicationInstance/Attribute:software_id' => 'Software',
+	'Class:ApplicationInstance/Attribute:software_id+' => '',
+	'Class:DatabaseInstance' => 'Istanza del database',
+	'Class:DatabaseInstance+' => '',
+	'Class:DatabaseInstance/Attribute:db_server_instance_id' => 'Server del database',
+	'Class:DatabaseInstance/Attribute:db_server_instance_id+' => '',
+	'Class:DatabaseInstance/Attribute:description' => 'Descrizione',
+	'Class:DatabaseInstance/Attribute:description+' => '',
+	'Class:Group' => 'Groppo',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Nome',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Stato',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Implementazione',
+	'Class:Group/Attribute:status/Value:implementation+' => 'Implementazione',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Group/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:Group/Attribute:status/Value:production' => 'Produzione',
+	'Class:Group/Attribute:status/Value:production+' => 'Produzione',
+	'Class:Group/Attribute:org_id' => 'Organizazione',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:description' => 'Descrizione',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Tipo',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Parent Group',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:ci_list' => 'CIs collegati',
+	'Class:Group/Attribute:ci_list+' => '',
+	'Class:lnkGroupToCI' => 'Groppo / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Groppo',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Motivo',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+	'Class:ApplicationSolution' => 'Soluzione Applicativa',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:description' => 'Descrizione',
+	'Class:ApplicationSolution/Attribute:description+' => '',
+	'Class:ApplicationSolution/Attribute:ci_list' => 'CIs',
+	'Class:ApplicationSolution/Attribute:ci_list+' => 'CIs che compongono la soluzione applicativa',
+	'Class:ApplicationSolution/Attribute:process_list' => 'Processi di business',
+	'Class:ApplicationSolution/Attribute:process_list+' => 'Processi di business che si basano sulla soluzione',
+	'Class:BusinessProcess' => 'Processi di business',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:description' => 'Descrizione',
+	'Class:BusinessProcess/Attribute:description+' => '',
+	'Class:BusinessProcess/Attribute:used_solution_list' => 'Soluzioni Applicative',
+	'Class:BusinessProcess/Attribute:used_solution_list+' => 'Soluzioni applicative sui cui si basa il processo',
+	'Class:NetworkInterface' => 'Interfaccia di Rete',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:device_id' => 'Dispositivo',
+	'Class:NetworkInterface/Attribute:device_id+' => '',
+	'Class:NetworkInterface/Attribute:logical_type' => 'Logical Type',
+	'Class:NetworkInterface/Attribute:logical_type+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:backup' => 'Backup',
+	'Class:NetworkInterface/Attribute:logical_type/Value:backup+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:logical' => 'Logical',
+	'Class:NetworkInterface/Attribute:logical_type/Value:logical+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:port' => 'Porta',
+	'Class:NetworkInterface/Attribute:logical_type/Value:port+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:primary' => 'Primario',
+	'Class:NetworkInterface/Attribute:logical_type/Value:primary+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:secondary' => 'Secondario',
+	'Class:NetworkInterface/Attribute:logical_type/Value:secondary+' => '',
+	'Class:NetworkInterface/Attribute:physical_type' => 'Tipo fisico',
+	'Class:NetworkInterface/Attribute:physical_type+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:atm' => 'ATM',
+	'Class:NetworkInterface/Attribute:physical_type/Value:atm+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet' => 'Ethernet',
+	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay' => 'Frame Relay',
+	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:vlan' => 'VLAN',
+	'Class:NetworkInterface/Attribute:physical_type/Value:vlan+' => '',
+	'Class:NetworkInterface/Attribute:ip_address' => 'Indirizzo IP',
+	'Class:NetworkInterface/Attribute:ip_address+' => '',
+	'Class:NetworkInterface/Attribute:ip_mask' => 'Maschera IP',
+	'Class:NetworkInterface/Attribute:ip_mask+' => '',
+	'Class:NetworkInterface/Attribute:mac_address' => 'Indirizzo MAC',
+	'Class:NetworkInterface/Attribute:mac_address+' => '',
+	'Class:NetworkInterface/Attribute:speed' => 'Velocità',
+	'Class:NetworkInterface/Attribute:speed+' => '',
+	'Class:NetworkInterface/Attribute:duplex' => 'Duplex',
+	'Class:NetworkInterface/Attribute:duplex+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:auto' => 'Auto',
+	'Class:NetworkInterface/Attribute:duplex/Value:auto+' => 'Auto',
+	'Class:NetworkInterface/Attribute:duplex/Value:full' => 'Full',
+	'Class:NetworkInterface/Attribute:duplex/Value:full+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:half' => 'Half',
+	'Class:NetworkInterface/Attribute:duplex/Value:half+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:unknown' => 'Sconosciuta',
+	'Class:NetworkInterface/Attribute:duplex/Value:unknown+' => '',
+	'Class:NetworkInterface/Attribute:connected_if' => 'Connesso a ',
+	'Class:NetworkInterface/Attribute:connected_if+' => 'Interfaccia connessa',
+	'Class:NetworkInterface/Attribute:link_type' => 'Tipo di link',
+	'Class:NetworkInterface/Attribute:link_type+' => '',
+	'Class:NetworkInterface/Attribute:link_type/Value:downlink' => 'Down link',
+	'Class:NetworkInterface/Attribute:link_type/Value:downlink+' => '',
+	'Class:NetworkInterface/Attribute:link_type/Value:uplink' => 'Up link',
+	'Class:NetworkInterface/Attribute:link_type/Value:uplink+' => '',
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:cpu' => 'CPU',
+	'Class:PC/Attribute:cpu+' => '',
+	'Class:PC/Attribute:ram' => 'RAM',
+	'Class:PC/Attribute:ram+' => '',
+	'Class:PC/Attribute:hdd' => 'Hard disk',
+	'Class:PC/Attribute:hdd+' => '',
+	'Class:PC/Attribute:os_family' => 'OS Family',
+	'Class:PC/Attribute:os_family+' => '',
+	'Class:PC/Attribute:os_version' => 'OS Version',
+	'Class:PC/Attribute:os_version+' => '',
+	'Class:PC/Attribute:application_list' => 'Applicazioni',
+	'Class:PC/Attribute:application_list+' => 'Applicazioni installate su questo PC',
+	'Class:PC/Attribute:patch_list' => 'Patches',
+	'Class:PC/Attribute:patch_list+' => 'Patches installate su questo PC',
+	'Class:MobilePhone' => 'Cellulari',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:number' => 'Numero di telefono',
+	'Class:MobilePhone/Attribute:number+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+	'Class:NetworkDevice' => 'Dispositivi di rete',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:type' => 'Tipo',
+	'Class:NetworkDevice/Attribute:type+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:firewall' => 'Firewall',
+	'Class:NetworkDevice/Attribute:type/Value:firewall+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:hub' => 'Hub',
+	'Class:NetworkDevice/Attribute:type/Value:hub+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:loadbalancer' => 'Load Balancer',
+	'Class:NetworkDevice/Attribute:type/Value:loadbalancer+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:router' => 'Router',
+	'Class:NetworkDevice/Attribute:type/Value:router+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:switch' => 'Switch',
+	'Class:NetworkDevice/Attribute:type/Value:switch+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator' => 'Acceleratore WAN',
+	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator+' => '',
+	'Class:NetworkDevice/Attribute:ios_version' => 'Versione IOS',
+	'Class:NetworkDevice/Attribute:ios_version+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+	'Class:NetworkDevice/Attribute:snmp_read' => 'SNMP Read',
+	'Class:NetworkDevice/Attribute:snmp_read+' => '',
+	'Class:NetworkDevice/Attribute:snmp_write' => 'SNMP Write',
+	'Class:NetworkDevice/Attribute:snmp_write+' => '',
+	'Class:Server' => 'Server',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:cpu' => 'CPU',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => 'RAM',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:hdd' => 'Hard Disk',
+	'Class:Server/Attribute:hdd+' => '',
+	'Class:Server/Attribute:os_family' => 'OS Family',
+	'Class:Server/Attribute:os_family+' => '',
+	'Class:Server/Attribute:os_version' => 'OS Version',
+	'Class:Server/Attribute:os_version+' => '',
+	'Class:Server/Attribute:application_list' => 'Applicazioni',
+	'Class:Server/Attribute:application_list+' => 'Applicazioni installate su questo server',
+	'Class:Server/Attribute:patch_list' => 'Patches',
+	'Class:Server/Attribute:patch_list+' => 'Patches installate su questo server',
+	'Class:Printer' => 'Stampante',
+	'Class:Printer+' => '',
+	'Class:Printer/Attribute:type' => 'Tipo',
+	'Class:Printer/Attribute:type+' => '',
+	'Class:Printer/Attribute:type/Value:mopier' => 'Mopier',
+	'Class:Printer/Attribute:type/Value:mopier+' => '',
+	'Class:Printer/Attribute:type/Value:printer' => 'Stampante',
+	'Class:Printer/Attribute:type/Value:printer+' => '',
+	'Class:Printer/Attribute:technology' => 'Tecnologia',
+	'Class:Printer/Attribute:technology+' => '',
+	'Class:Printer/Attribute:technology/Value:inkjet' => 'Inkjet',
+	'Class:Printer/Attribute:technology/Value:inkjet+' => '',
+	'Class:Printer/Attribute:technology/Value:laser' => 'Laser',
+	'Class:Printer/Attribute:technology/Value:laser+' => '',
+	'Class:Printer/Attribute:technology/Value:tracer' => 'Tracer',
+	'Class:Printer/Attribute:technology/Value:tracer+' => '',
+	'Class:lnkCIToDoc' => 'Doc/CI',
+	'Class:lnkCIToDoc+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_id' => 'CI',
+	'Class:lnkCIToDoc/Attribute:ci_id+' => '',
+	'Class:lnkCIToDoc/Attribute:document_id' => 'Documento',
+	'Class:lnkCIToDoc/Attribute:document_id+' => '',
+	'Class:lnkCIToContact' => 'CI/Contatto',
+	'Class:lnkCIToContact+' => '',
+	'Class:lnkCIToContact/Attribute:ci_id' => 'CI',
+	'Class:lnkCIToContact/Attribute:ci_id+' => '',
+	'Class:lnkCIToContact/Attribute:contact_id' => 'Contatto',
+	'Class:lnkCIToContact/Attribute:contact_id+' => '',
+	'Class:lnkCIToContact/Attribute:role' => 'Ruolo',
+	'Class:lnkCIToContact/Attribute:role+' => 'Ruolo del contatto per quanto riguarda il CI',
+	'Class:lnkSolutionToCI' => 'CI/Solutione',
+	'Class:lnkSolutionToCI+' => '',
+	'Class:lnkSolutionToCI/Attribute:solution_id' => 'Soluzione applicativa',
+	'Class:lnkSolutionToCI/Attribute:solution_id+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkSolutionToCI/Attribute:ci_id+' => '',
+	'Class:lnkSolutionToCI/Attribute:utility' => 'Utility',
+	'Class:lnkSolutionToCI/Attribute:utility+' => 'Utility del CI nella soluzione applicativa',
+	'Class:lnkProcessToSolution' => 'Processo di business/Solutione',
+	'Class:lnkProcessToSolution+' => '',
+	'Class:lnkProcessToSolution/Attribute:solution_id' => 'Soluzione applicativa',
+	'Class:lnkProcessToSolution/Attribute:solution_id+' => '',
+	'Class:lnkProcessToSolution/Attribute:process_id' => 'Processo',
+	'Class:lnkProcessToSolution/Attribute:process_id+' => '',
+	'Class:lnkProcessToSolution/Attribute:reason' => 'Motivo',
+	'Class:lnkProcessToSolution/Attribute:reason+' => 'Più informazioni tra il processo di business e la soluzione applicativa',
+	'Relation:impacts/Description' => 'Elementi impattati da...',
+	'Relation:impacts/DownStream' => 'Impatto...',
+	'Relation:impacts/DownStream+' => 'Elementi impattati da...',
+	'Relation:impacts/UpStream' => 'Dipende da...',
+	'Relation:impacts/UpStream+' => 'Elementi di questo elemento dipende da',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Elementi di questo elemento dipende da',
+	'Relation:depends on/DownStream' => 'Dipende da...',
+	'Relation:depends on/UpStream' => 'Impatto...',
+	'Class:Organization/Attribute:parent_name' => 'Parent name',
+	'Class:Organization/Attribute:parent_name+' => 'Name of the parent organization',
+	'Class:Location/Attribute:org_name' => 'Nome dell\'organizzazione',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:parent_name' => 'Parent name',
+	'Class:Location/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:owner_name' => 'Cognome',
+	'Class:Group/Attribute:owner_name+' => 'Nome',
+	'Class:Group/Attribute:parent_name' => 'Nome',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Nome',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Nome',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_status' => 'CI Stato',
+	'Class:lnkGroupToCI/Attribute:ci_status+' => '',
+	'Class:Contact' => 'Contatto',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Nome',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Stato',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Attivo',
+	'Class:Contact/Attribute:status/Value:active+' => 'Attivo',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inattivo',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inattivo',
+	'Class:Contact/Attribute:org_id' => 'Organizzazione',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organizzazione',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefono',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:location_id' => 'Posizione',
+	'Class:Contact/Attribute:location_id+' => '',
+	'Class:Contact/Attribute:location_name' => 'Posizione',
+	'Class:Contact/Attribute:location_name+' => '',
+	'Class:Contact/Attribute:ci_list' => 'CIs',
+	'Class:Contact/Attribute:ci_list+' => 'CIs relativi al contatto',
+	'Class:Contact/Attribute:contract_list' => 'Contratti',
+	'Class:Contact/Attribute:contract_list+' => 'Contratti relativi al contatto',
+	'Class:Contact/Attribute:service_list' => 'Servizi',
+	'Class:Contact/Attribute:service_list+' => 'Servizi relativi al contatto',
+	'Class:Contact/Attribute:ticket_list' => 'Tickets',
+	'Class:Contact/Attribute:ticket_list+' => 'Tickets relativi al contatto',
+	'Class:Contact/Attribute:team_list' => 'Squadre',
+	'Class:Contact/Attribute:team_list+' => 'Squadre di appartenenza',
+	'Class:Contact/Attribute:finalclass' => 'Tipo',
+	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_location_id' => 'Posizione',
+	'Class:lnkTeamToContact/Attribute:contact_location_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_email' => 'Email',
+	'Class:lnkTeamToContact/Attribute:contact_email+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_phone' => 'Telefono',
+	'Class:lnkTeamToContact/Attribute:contact_phone+' => '',
+	'Class:Document' => 'Documento',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Nome',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organizzazione',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:org_name' => 'Nome dell\'organizzazione',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:description' => 'Descrizione',
+	'Class:Document/Attribute:type' => 'Tipo',
+	'Class:Document/Attribute:type+' => '',
+	'Class:Document/Attribute:type/Value:contract' => 'Contratto',
+	'Class:Document/Attribute:type/Value:contract+' => '',
+	'Class:Document/Attribute:type/Value:networkmap' => 'Network Map',
+	'Class:Document/Attribute:type/Value:networkmap+' => '',
+	'Class:Document/Attribute:type/Value:presentation' => 'Presentazine',
+	'Class:Document/Attribute:type/Value:presentation+' => '',
+	'Class:Document/Attribute:type/Value:training' => 'Formazione',
+	'Class:Document/Attribute:type/Value:training+' => '',
+	'Class:Document/Attribute:type/Value:whitePaper' => 'Foglio bianco',
+	'Class:Document/Attribute:type/Value:whitePaper+' => '',
+	'Class:Document/Attribute:type/Value:workinginstructions' => 'Istruzioni di lavoro',
+	'Class:Document/Attribute:type/Value:workinginstructions+' => '',
+	'Class:Document/Attribute:status' => 'Stato',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Draft',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Pubblicato',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:ci_list' => 'CIs',
+	'Class:Document/Attribute:ci_list+' => 'CIs relativo a questo documento',
+	'Class:Document/Attribute:contract_list' => 'Contratti',
+	'Class:Document/Attribute:contract_list+' => 'Contratti relativi a questo documento',
+	'Class:Document/Attribute:service_list' => 'Servizi',
+	'Class:Document/Attribute:service_list+' => 'Servizi relativi a questo documento',
+	'Class:Document/Attribute:ticket_list' => 'Tickets',
+	'Class:Document/Attribute:ticket_list+' => 'Tickets relativi a questo documento',
+	'Class:Document:PreviewTab' => 'Anteprima',
+	'Class:Licence/Attribute:org_name' => 'Cognome',
+	'Class:Licence/Attribute:org_name+' => 'Nome',
+	'Class:Subnet/Name' => '%1$s / %2$s~~',
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Nome',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:description' => 'Descrizione',
+	'Class:Software/Attribute:description+' => '',
+	'Class:Software/Attribute:instance_list' => 'Installazioni',
+	'Class:Software/Attribute:instance_list+' => 'Istanze di questo software',
+	'Class:Software/Attribute:finalclass' => 'Tipo',
+	'Class:Software/Attribute:finalclass+' => '',
+	'Class:Application/Attribute:name' => 'Nome',
+	'Class:Application/Attribute:name+' => '',
+	'Class:Application/Attribute:description' => 'Descrizione',
+	'Class:Application/Attribute:description+' => '',
+	'Class:lnkPatchToCI/Attribute:patch_name' => 'Patch',
+	'Class:lnkPatchToCI/Attribute:patch_name+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkPatchToCI/Attribute:ci_name+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_status' => 'CI Stato',
+	'Class:lnkPatchToCI/Attribute:ci_status+' => '',
+	'Class:FunctionalCI' => 'CI Funzionale',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Nome',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:status' => 'Stato',
+	'Class:FunctionalCI/Attribute:status+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:implementation' => 'Implementazione',
+	'Class:FunctionalCI/Attribute:status/Value:implementation+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:FunctionalCI/Attribute:status/Value:obsolete+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:production' => 'Produzione',
+	'Class:FunctionalCI/Attribute:status/Value:production+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Organizzazione proprietaria',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:owner_name' => 'Organizzazione proprietaria',
+	'Class:FunctionalCI/Attribute:owner_name+' => '',
+	'Class:FunctionalCI/Attribute:importance' => 'Criticità di business',
+	'Class:FunctionalCI/Attribute:importance+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:high' => 'Alta',
+	'Class:FunctionalCI/Attribute:importance/Value:high+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:low' => 'Bassa',
+	'Class:FunctionalCI/Attribute:importance/Value:low+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:medium' => 'Media',
+	'Class:FunctionalCI/Attribute:importance/Value:medium+' => '',
+	'Class:FunctionalCI/Attribute:contact_list' => 'Contatti',
+	'Class:FunctionalCI/Attribute:contact_list+' => 'Contatti per questo CI',
+	'Class:FunctionalCI/Attribute:document_list' => 'Documenti',
+	'Class:FunctionalCI/Attribute:document_list+' => 'Documentazione per questo CI',
+	'Class:FunctionalCI/Attribute:solution_list' => 'Soluzioni applicative',
+	'Class:FunctionalCI/Attribute:solution_list+' => 'Soluzioni applicative che utilizzano questo CI',
+	'Class:FunctionalCI/Attribute:contract_list' => 'Contratti',
+	'Class:FunctionalCI/Attribute:contract_list+' => 'Contratti a sostegno di questo CI',
+	'Class:FunctionalCI/Attribute:ticket_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:ticket_list+' => 'Tickets relativi al CI',
+	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:SoftwareInstance' => 'Istanza software',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Name' => '%1$s - %2$s~~',
+	'Class:SoftwareInstance/Attribute:device_id' => 'Dispositivo',
+	'Class:SoftwareInstance/Attribute:device_id+' => '',
+	'Class:SoftwareInstance/Attribute:device_name' => 'Dispositivo',
+	'Class:SoftwareInstance/Attribute:device_name+' => '',
+	'Class:SoftwareInstance/Attribute:licence_id' => 'Licenza',
+	'Class:SoftwareInstance/Attribute:licence_id+' => '',
+	'Class:SoftwareInstance/Attribute:licence_name' => 'Licenza',
+	'Class:SoftwareInstance/Attribute:licence_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Software',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:version' => 'Versione',
+	'Class:SoftwareInstance/Attribute:version+' => '',
+	'Class:SoftwareInstance/Attribute:description' => 'Descrizione',
+	'Class:SoftwareInstance/Attribute:description+' => '',
+	'Class:ApplicationInstance/Name' => '%1$s - %2$s~~',
+	'Class:ApplicationInstance/Attribute:software_name' => 'Nome',
+	'Class:ApplicationInstance/Attribute:software_name+' => '',
+	'Class:DBServerInstance/Name' => '%1$s - %2$s~~',
+	'Class:DBServerInstance/Attribute:software_name' => 'Nome del Software',
+	'Class:DBServerInstance/Attribute:software_name+' => '',
+	'Class:DatabaseInstance/Name' => '%1$s - %2$s~~',
+	'Class:DatabaseInstance/Attribute:db_server_instance_version' => 'Versione del database',
+	'Class:DatabaseInstance/Attribute:db_server_instance_version+' => '',
+	'Class:ConnectableCI' => 'CI collegabile',
+	'Class:ConnectableCI+' => 'CI fisico',
+	'Class:ConnectableCI/Attribute:brand' => 'Marca',
+	'Class:ConnectableCI/Attribute:brand+' => '',
+	'Class:ConnectableCI/Attribute:model' => 'Modello',
+	'Class:ConnectableCI/Attribute:model+' => '',
+	'Class:ConnectableCI/Attribute:serial_number' => 'Numero seriala',
+	'Class:ConnectableCI/Attribute:serial_number+' => '',
+	'Class:ConnectableCI/Attribute:asset_ref' => 'Asset di riferimento',
+	'Class:ConnectableCI/Attribute:asset_ref+' => '',
+	'Class:NetworkInterface/Name' => '%1$s - %2$s~~',
+	'Class:NetworkInterface/Attribute:device_name' => 'Dispositivo',
+	'Class:NetworkInterface/Attribute:device_name+' => '',
+	'Class:NetworkInterface/Attribute:connected_name' => 'Connesso a ',
+	'Class:NetworkInterface/Attribute:connected_name+' => '',
+	'Class:NetworkInterface/Attribute:connected_if_device_id' => 'Dispositivo connesso',
+	'Class:NetworkInterface/Attribute:connected_if_device_id+' => '',
+	'Class:NetworkInterface/Attribute:connected_if_device_id_name' => 'Dispositivo',
+	'Class:NetworkInterface/Attribute:connected_if_device_id_name+' => '',
+	'Class:Device' => 'Dispositivo',
+	'Class:Device+' => '',
+	'Class:Device/Attribute:nwinterface_list' => 'Interfaccia di Rete',
+	'Class:Device/Attribute:nwinterface_list+' => '',
+	'Class:MobileCI' => 'CI Mobili',
+	'Class:MobileCI+' => '',
+	'Class:InfrastructureCI' => 'CI Infrastrutture',
+	'Class:InfrastructureCI+' => '',
+	'Class:InfrastructureCI/Attribute:description' => 'Descrizione',
+	'Class:InfrastructureCI/Attribute:description+' => '',
+	'Class:InfrastructureCI/Attribute:location_id' => 'Posizione',
+	'Class:InfrastructureCI/Attribute:location_id+' => '',
+	'Class:InfrastructureCI/Attribute:location_name' => 'Posizione',
+	'Class:InfrastructureCI/Attribute:location_name+' => '',
+	'Class:InfrastructureCI/Attribute:location_details' => 'Dettagli di posizione',
+	'Class:InfrastructureCI/Attribute:location_details+' => '',
+	'Class:InfrastructureCI/Attribute:management_ip' => 'Gestione IP',
+	'Class:InfrastructureCI/Attribute:management_ip+' => '',
+	'Class:InfrastructureCI/Attribute:default_gateway' => 'Gateway di default',
+	'Class:InfrastructureCI/Attribute:default_gateway+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_name' => 'CI',
+	'Class:lnkCIToDoc/Attribute:ci_name+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_status' => 'CI Stato',
+	'Class:lnkCIToDoc/Attribute:ci_status+' => '',
+	'Class:lnkCIToDoc/Attribute:document_name' => 'Documento',
+	'Class:lnkCIToDoc/Attribute:document_name+' => '',
+	'Class:lnkCIToDoc/Attribute:document_type' => 'Tipo di documento',
+	'Class:lnkCIToDoc/Attribute:document_type+' => '',
+	'Class:lnkCIToDoc/Attribute:document_status' => 'Stato del documento',
+	'Class:lnkCIToDoc/Attribute:document_status+' => '',
+	'Class:lnkCIToContact/Attribute:ci_name' => 'CI',
+	'Class:lnkCIToContact/Attribute:ci_name+' => '',
+	'Class:lnkCIToContact/Attribute:ci_status' => 'CI Stato',
+	'Class:lnkCIToContact/Attribute:ci_status+' => '',
+	'Class:lnkCIToContact/Attribute:contact_name' => 'Contatto',
+	'Class:lnkCIToContact/Attribute:contact_name+' => '',
+	'Class:lnkCIToContact/Attribute:contact_email' => 'Contatto Email',
+	'Class:lnkCIToContact/Attribute:contact_email+' => '',
+	'Class:lnkSolutionToCI/Attribute:solution_name' => 'Soluzione applicativa',
+	'Class:lnkSolutionToCI/Attribute:solution_name+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkSolutionToCI/Attribute:ci_name+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_status' => 'CI Stato',
+	'Class:lnkSolutionToCI/Attribute:ci_status+' => '',
+	'Class:lnkProcessToSolution/Attribute:solution_name' => 'Soluzione applicativa',
+	'Class:lnkProcessToSolution/Attribute:solution_name+' => '',
+	'Class:lnkProcessToSolution/Attribute:process_name' => 'Processo',
+	'Class:lnkProcessToSolution/Attribute:process_name+' => '',
+	'Class:Subnet/Tab:IPUsage' => 'Utilizzo IP',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Iterfacce che hanno un IP nell\'intervallo: <em>%1$s</em> e <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'IP liberi',
+	'Class:Subnet/Tab:FreeIPs-count' => 'IP liberi: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Qui c\'è un estratto di 10 indirizzi IP liberi',
+	'Menu:DataAdministration' => 'Dati di amministrazione',
+	'Menu:DataAdministration+' => '',
+	'Menu:Catalogs' => 'Cataloghi',
+	'Menu:Catalogs+' => 'Tipi di dato',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' =>  'Importazione CSV',
+	'Menu:CSVImport+' => '',
+	'Menu:Organization' => 'Organizzazioni',
+	'Menu:Organization+' => 'Tutte le organizzazioni',
+	'Menu:Application' => 'Applicazioni',
+	'Menu:Application+' => 'Tutte le applicazioni',
+	'Menu:DBServer' => 'Database Servers',
+	'Menu:DBServer+' => 'Database Servers',
+	'Menu:ConfigManagement' => 'Gestione delle Configurazioni',
+	'Menu:ConfigManagement+' => 'Gestione delle Configurazioni',
+	'Menu:ConfigManagementOverview' => 'Panoramica',
+	'Menu:ConfigManagementOverview+' => 'Panoramica',
+	'Menu:Contact' => 'Contatti',
+	'Menu:Contact+' => 'Contatti',
+	'Menu:Contact:Count' => '%1$d contatti',
+	'Menu:Person' => 'Persone',
+	'Menu:Person+' => 'Tutte le persone',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'Tutti i Teams',
+	'Menu:Document' => 'Documenti',
+	'Menu:Document+' => 'Tutti i Documenti',
+	'Menu:Location' => 'Posizioni',
+	'Menu:Location+' => 'Tutte le pozisioni',
+	'Menu:ConfigManagementCI' => 'Elementi di Configurazione (CI)',
+	'Menu:ConfigManagementCI+' => 'Elementi di Configurazione (CI)',
+	'Menu:BusinessProcess' => 'Processi di business',
+	'Menu:BusinessProcess+' => 'Tutti i processi di business',
+	'Menu:ApplicationSolution' => 'Soluzioni applicative',
+	'Menu:ApplicationSolution+' => 'Tutte le soluzioni applicative',
+	'Menu:ConfigManagementSoftware' => 'Gestione delle Applicazioni',
+	'Menu:Licence' => 'Licenze',
+	'Menu:Licence+' => 'Tutte le licenze',
+	'Menu:Patch' => 'Patches',
+	'Menu:Patch+' => 'Tutte le patches',
+	'Menu:ApplicationInstance' => 'Software Installati',
+	'Menu:ApplicationInstance+' => 'Applicazioni e Database servers',
+	'Menu:ConfigManagementHardware' => 'Gestione Infrastrutture',
+	'Menu:Subnet' => 'Subnets',
+	'Menu:Subnet+' => 'Tutte le Subnets',
+	'Menu:NetworkDevice' => 'Dispositivi di rete',
+	'Menu:NetworkDevice+' => 'Tutti i dispositivi di rete',
+	'Menu:Server' => 'Server',
+	'Menu:Server+' => 'Tutti i Server',
+	'Menu:Printer' => 'Stampanti',
+	'Menu:Printer+' => 'Tutte le stampanti',
+	'Menu:MobilePhone' => 'Cellulari',
+	'Menu:MobilePhone+' => 'Tutti i cellulari',
+	'Menu:PC' => 'Personal Computers',
+	'Menu:PC+' => 'Tutti i Personal Computers',
+	'Menu:NewContact' => 'Nuovo Contatto',
+	'Menu:NewContact+' => 'Nuovo Contatto',
+	'Menu:SearchContacts' => 'Ricerca contatti',
+	'Menu:SearchContacts+' => 'Ricerca contatti',
+	'Menu:NewCI' => 'Nuovo CI',
+	'Menu:NewCI+' => 'Nuovo CI',
+	'Menu:SearchCIs' => 'Ricerca CIs',
+	'Menu:SearchCIs+' => 'Ricerca CIs',
+	'Menu:ConfigManagement:Devices' => 'Dispositvi',
+	'Menu:ConfigManagement:AllDevices' => 'Infrastrutture',
+	'Menu:ConfigManagement:SWAndApps' => 'Software e Applicazioni',
+	'Menu:ConfigManagement:Misc' => 'Varie',
+	'Menu:Group' => 'Gruppi di CIs',
+	'Menu:Group+' => 'Gruppi di CIs',
+	'Menu:ConfigManagement:Shortcuts' => 'Scorciatoie',
+	'Menu:ConfigManagement:AllContacts' => 'Tutti i contatti: %1$d',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Contacts~~',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+	'Class:Contact/Attribute:notify' => 'Notification~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
+	'Class:Contact/Attribute:function' => 'Function~~',
+	'Class:Contact/Attribute:cis_list' => 'CIs~~',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Person/Attribute:name' => 'Last Name~~',
+	'Class:Person/Attribute:employee_number' => 'Employee number~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
+	'Class:Person/Attribute:location_id' => 'Location~~',
+	'Class:Person/Attribute:location_name' => 'Location name~~',
+	'Class:Person/Attribute:manager_id' => 'Manager~~',
+	'Class:Person/Attribute:manager_name' => 'Manager name~~',
+	'Class:Person/Attribute:team_list' => 'Teams~~',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
+	'Class:Team/Attribute:persons_list' => 'Members~~',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:cis_list' => 'CIs~~',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Document Type~~',
+	'Class:DocumentFile' => 'Document File~~',
+	'Class:DocumentFile/Attribute:file' => 'File~~',
+	'Class:DocumentNote' => 'Document Note~~',
+	'Class:DocumentNote/Attribute:text' => 'Text~~',
+	'Class:DocumentWeb' => 'Document Web~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL~~',
+	'Class:FunctionalCI/Attribute:description' => 'Description~~',
+	'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/Value:high' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
+	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date~~',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts~~',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Documents~~',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:PhysicalDevice' => 'Physical Device~~',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Location name~~',
+	'Class:PhysicalDevice/Attribute:status' => 'Status~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand~~',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name~~',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model~~',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Model name~~',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number~~',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date~~',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty~~',
+	'Class:Rack' => 'Rack~~',
+	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
+	'Class:Rack/Attribute:device_list' => 'Devices~~',
+	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
+	'Class:Rack/Attribute:enclosure_list' => 'Enclosures~~',
+	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
+	'Class:TelephonyCI' => 'Telephony CI~~',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number~~',
+	'Class:Phone' => 'Phone~~',
+	'Class:IPPhone' => 'IP Phone~~',
+	'Class:Tablet' => 'Tablet~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
+	'Class:DatacenterDevice' => 'Datacenter Device~~',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure~~',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name~~',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name~~',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source~~',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs~~',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version~~',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name~~',
+	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
+	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:Server/Attribute:osversion_id' => 'OS version~~',
+	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
+	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes~~',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
+	'Class:StorageSystem' => 'Storage System~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
+	'Class:SANSwitch' => 'SAN Switch~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
+	'Class:TapeLibrary' => 'Tape Library~~',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
+	'Class:NAS' => 'NAS~~',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
+	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
+	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:PC/Attribute:osversion_id' => 'OS version~~',
+	'Class:PC/Attribute:osversion_name' => 'OS version name~~',
+	'Class:PC/Attribute:type' => 'Type~~',
+	'Class:PC/Attribute:type/Value:desktop' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:laptop' => 'laptop~~',
+	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
+	'Class:PowerConnection' => 'Power Connection~~',
+	'Class:PowerSource' => 'Power Source~~',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
+	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
+	'Class:PDU' => 'PDU~~',
+	'Class:PDU/Attribute:rack_id' => 'Rack~~',
+	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start~~',
+	'Class:PDU/Attribute:powerstart_name' => 'Power start name~~',
+	'Class:Peripheral' => 'Peripheral~~',
+	'Class:Enclosure' => 'Enclosure~~',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
+	'Class:Enclosure/Attribute:nb_u' => 'Rack units~~',
+	'Class:Enclosure/Attribute:device_list' => 'Devices~~',
+	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
+	'Class:ApplicationSolution/Attribute:status' => 'Status~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
+	'Class:BusinessProcess/Attribute:status' => 'Status~~',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:system_id' => 'System~~',
+	'Class:SoftwareInstance/Attribute:system_name' => 'System name~~',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
+	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
+	'Class:SoftwareInstance/Attribute:status' => 'Status~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:Middleware' => 'Middleware~~',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas~~',
+	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
+	'Class:WebServer' => 'Web server~~',
+	'Class:WebServer/Attribute:webapp_list' => 'Web applications~~',
+	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
+	'Class:PCSoftware' => 'PC Software~~',
+	'Class:OtherSoftware' => 'Other Software~~',
+	'Class:MiddlewareInstance' => 'Middleware Instance~~',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
+	'Class:DatabaseSchema' => 'Database Schema~~',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
+	'Class:WebApplication' => 'Web Application~~',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
+	'Class:WebApplication/Attribute:url' => 'URL~~',
+	'Class:VirtualDevice' => 'Virtual Device~~',
+	'Class:VirtualDevice/Attribute:status' => 'Status~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
+	'Class:VirtualHost' => 'Virtual Host~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
+	'Class:Hypervisor' => 'Hypervisor~~',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farm~~',
+	'Class:Hypervisor/Attribute:farm_name' => 'Farm name~~',
+	'Class:Hypervisor/Attribute:server_id' => 'Server~~',
+	'Class:Hypervisor/Attribute:server_name' => 'Server name~~',
+	'Class:Farm' => 'Farm~~',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors~~',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+	'Class:Farm/Attribute:redundancy' => 'High availability~~',
+	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
+	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
+	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
+	'Class:VirtualMachine' => 'Virtual Machine~~',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family~~',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version~~',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM~~',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
+	'Class:LogicalVolume' => 'Logical Volume~~',
+	'Class:LogicalVolume/Attribute:name' => 'Name~~',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID~~',
+	'Class:LogicalVolume/Attribute:description' => 'Description~~',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level~~',
+	'Class:LogicalVolume/Attribute:size' => 'Size~~',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system~~',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name~~',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servers~~',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
+	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server~~',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name~~',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used~~',
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used~~',
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc~~',
+	'Class:Tape' => 'Tape~~',
+	'Class:Tape/Attribute:name' => 'Name~~',
+	'Class:Tape/Attribute:description' => 'Description~~',
+	'Class:Tape/Attribute:size' => 'Size~~',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library~~',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
+	'Class:NASFileSystem' => 'NAS File System~~',
+	'Class:NASFileSystem/Attribute:name' => 'Name~~',
+	'Class:NASFileSystem/Attribute:description' => 'Description~~',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level~~',
+	'Class:NASFileSystem/Attribute:size' => 'Size~~',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name~~',
+	'Class:Software/Attribute:vendor' => 'vendor~~',
+	'Class:Software/Attribute:version' => 'Version~~',
+	'Class:Software/Attribute:documents_list' => 'Documents~~',
+	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
+	'Class:Software/Attribute:type' => 'Type~~',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server~~',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances~~',
+	'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:Patch/Attribute:documents_list' => 'Documents~~',
+	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
+	'Class:Patch/Attribute:finalclass' => 'Type~~',
+	'Class:OSPatch' => 'OS Patch~~',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices~~',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
+	'Class:SoftwarePatch' => 'Software Patch~~',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software~~',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
+	'Class:Licence/Attribute:documents_list' => 'Documents~~',
+	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
+	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
+	'Class:Licence/Attribute:organization_name+' => 'Common name~~',
+	'Class:Licence/Attribute:description' => 'Description~~',
+	'Class:Licence/Attribute:start_date' => 'Start date~~',
+	'Class:Licence/Attribute:end_date' => 'End date~~',
+	'Class:Licence/Attribute:perpetual' => 'Perpetual~~',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'no~~',
+	'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:OSLicence' => 'OS Licence~~',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS version 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:SoftwareLicence' => 'Software Licence~~',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
+	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name~~',
+	'Class:Typology' => 'Typology~~',
+	'Class:Typology/Attribute:name' => 'Name~~',
+	'Class:Typology/Attribute:finalclass' => 'Type~~',
+	'Class:OSVersion' => 'OS Version~~',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS family~~',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:OSFamily' => 'OS Family~~',
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:Brand' => 'Brand~~',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
+	'Class:Model' => 'Model~~',
+	'Class:Model/Attribute:brand_id' => 'Brand~~',
+	'Class:Model/Attribute:brand_name' => 'Brand name~~',
+	'Class:Model/Attribute:type' => 'Device type~~',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Printer' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:Server' => 'Server~~',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
+	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
+	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
+	'Class:NetworkDeviceType' => 'Network Device Type~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
+	'Class:IOSVersion' => 'IOS Version~~',
+	'Class:IOSVersion/Attribute:brand_id' => 'Brand~~',
+	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
+	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name~~',
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name~~',
+	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
+	'Class:Subnet/Attribute:org_name' => 'Name~~',
+	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
+	'Class:Subnet/Attribute:vlans_list' => 'VLANs~~',
+	'Class:VLAN' => 'VLAN~~',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:VLAN/Attribute:description' => 'Description~~',
+	'Class:VLAN/Attribute:org_id' => 'Organization~~',
+	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
+	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
+	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:NetworkInterface/Attribute:name' => 'Name~~',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
+	'Class:IPInterface' => 'IP Interface~~',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
+	'Class:IPInterface/Attribute:comment' => 'Comment~~',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway~~',
+	'Class:IPInterface/Attribute:ipmask' => 'IP mask~~',
+	'Class:IPInterface/Attribute:speed' => 'Speed~~',
+	'Class:PhysicalInterface' => 'Physical Interface~~',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs~~',
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:LogicalInterface' => 'Logical Interface~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name~~',
+	'Class:FiberChannelInterface' => 'Fiber Channel Interface~~',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Speed~~',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topology~~',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name~~',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => '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:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name~~',
+	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group~~',
+	'Menu:ConfigManagement:virtualization' => 'Virtualization~~',
+	'Menu:ConfigManagement:EndUsers' => 'End user devices~~',
+	'Menu:Typology' => 'Typology configuration~~',
+	'Menu:Typology+' => 'Typology configuration~~',
+	'Menu:OSVersion' => 'OS versions~~',
+	'Menu:Software' => 'Software catalog~~',
+	'Menu:Software+' => 'Software catalog~~',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
+	'Server:baseinfo' => 'General information~~',
+	'Server:Date' => 'Dates~~',
+	'Server:moreinfo' => 'More information~~',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'General information~~',
+	'Person:notifiy' => 'Notification~~',
+));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/main.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/main.itop-config-mgmt.php
index d2c96cbd8..f989da795 100755
--- a/datamodels/2.x/itop-config-mgmt/main.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/main.itop-config-mgmt.php
@@ -1,25 +1,25 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-// Starting with iTop 1.2 you can restrict the list of organizations displayed in the drop-down list
-// by specifying a query as shown below. Note that this is NOT a security settings, since the
-// choice 'All Organizations' will always be available in the menu
-ApplicationMenu::SetFavoriteSiloQuery('SELECT Organization');
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+// Starting with iTop 1.2 you can restrict the list of organizations displayed in the drop-down list
+// by specifying a query as shown below. Note that this is NOT a security settings, since the
+// choice 'All Organizations' will always be available in the menu
+ApplicationMenu::SetFavoriteSiloQuery('SELECT Organization');
+
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
index 4d5a26416..b8784f217 100755
--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -1,117 +1,117 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Configuration Management (CMDB)',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => true,
-		'visible' => true,
-		'installer' => 'ConfigMgmtInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-config-mgmt.php',
-			'main.itop-config-mgmt.php',
-		),
-		'data.struct' => array(
-		),
-		'data.sample' => array(
-			'data.sample.organizations.xml',
-			'data.sample.brand.xml',
-			'data.sample.model.xml',
-			'data.sample.osfamily.xml',
-			'data.sample.osversion.xml',
-			'data.sample.networkdevicetype.xml',
-			'data.sample.contacttype.xml',
-			'data.sample.locations.xml',
-			'data.sample.persons.xml',
-			'data.sample.teams.xml',
-			'data.sample.contactteam.xml',
-			'data.sample.servers.xml',
-			'data.sample.nw-devices.xml',
-			'data.sample.software.xml',
-			'data.sample.dbserver.xml',
-			'data.sample.dbschema.xml',
-			'data.sample.webserver.xml',
-			'data.sample.webapp.xml',
-			'data.sample.applications.xml',
-			'data.sample.applicationsolutionci.xml',
-
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-if (!class_exists('ConfigMgmtInstaller'))
-{
-	// Module installation handler
-	//
-	class ConfigMgmtInstaller extends ModuleInstallerAPI
-	{
-		public static function BeforeWritingConfig(Config $oConfiguration)
-		{
-			// If you want to override/force some configuration values, do it here
-			return $oConfiguration;
-		}
-
-		/**
-		 * Handler called before creating or upgrading the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			if (strlen($sPreviousVersion) > 0)
-			{
-				// If you want to migrate data from one format to another, do it here
-				self::RenameEnumValueInDB('Software', 'type', 'DBserver', 'DBServer');
-				self::RenameEnumValueInDB('Software', 'type', 'Webserver', 'WebServer');
-				self::RenameEnumValueInDB('Model', 'type', 'SANswitch', 'SANSwitch');
-				self::RenameEnumValueInDB('Model', 'type', 'IpPhone', 'IPPhone');
-				self::RenameEnumValueInDB('Model', 'type', 'Telephone', 'Phone');
-				self::RenameClassInDB('DBserver', 'DBServer');
-				self::RenameClassInDB('OSfamily', 'OSFamily');
-				self::RenameClassInDB('OSversion', 'OSVersion');
-				self::RenameClassInDB('Webserver', 'WebServer');
-				self::RenameClassInDB('OSpatch', 'OSPatch');
-				self::RenameClassInDB('lnkFunctionalCIToOSpatch', 'lnkFunctionalCIToOSPatch');
-				self::RenameClassInDB('OsLicence', 'OSLicence');
-				self::RenameClassInDB('IOSversion', 'IOSVersion');
-				self::RenameClassInDB('IPinterface', 'IPInterface');
-			}
-		}
-	
-		/**
-		 * Handler called after the creation/update of the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-		}
-	}
-}
-
-?>
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-config-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Configuration Management (CMDB)',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => true,
+		'installer' => 'ConfigMgmtInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-config-mgmt.php',
+			'main.itop-config-mgmt.php',
+		),
+		'data.struct' => array(
+		),
+		'data.sample' => array(
+			'data.sample.organizations.xml',
+			'data.sample.brand.xml',
+			'data.sample.model.xml',
+			'data.sample.osfamily.xml',
+			'data.sample.osversion.xml',
+			'data.sample.networkdevicetype.xml',
+			'data.sample.contacttype.xml',
+			'data.sample.locations.xml',
+			'data.sample.persons.xml',
+			'data.sample.teams.xml',
+			'data.sample.contactteam.xml',
+			'data.sample.servers.xml',
+			'data.sample.nw-devices.xml',
+			'data.sample.software.xml',
+			'data.sample.dbserver.xml',
+			'data.sample.dbschema.xml',
+			'data.sample.webserver.xml',
+			'data.sample.webapp.xml',
+			'data.sample.applications.xml',
+			'data.sample.applicationsolutionci.xml',
+
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+if (!class_exists('ConfigMgmtInstaller'))
+{
+	// Module installation handler
+	//
+	class ConfigMgmtInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if (strlen($sPreviousVersion) > 0)
+			{
+				// If you want to migrate data from one format to another, do it here
+				self::RenameEnumValueInDB('Software', 'type', 'DBserver', 'DBServer');
+				self::RenameEnumValueInDB('Software', 'type', 'Webserver', 'WebServer');
+				self::RenameEnumValueInDB('Model', 'type', 'SANswitch', 'SANSwitch');
+				self::RenameEnumValueInDB('Model', 'type', 'IpPhone', 'IPPhone');
+				self::RenameEnumValueInDB('Model', 'type', 'Telephone', 'Phone');
+				self::RenameClassInDB('DBserver', 'DBServer');
+				self::RenameClassInDB('OSfamily', 'OSFamily');
+				self::RenameClassInDB('OSversion', 'OSVersion');
+				self::RenameClassInDB('Webserver', 'WebServer');
+				self::RenameClassInDB('OSpatch', 'OSPatch');
+				self::RenameClassInDB('lnkFunctionalCIToOSpatch', 'lnkFunctionalCIToOSPatch');
+				self::RenameClassInDB('OsLicence', 'OSLicence');
+				self::RenameClassInDB('IOSversion', 'IOSVersion');
+				self::RenameClassInDB('IPinterface', 'IPInterface');
+			}
+		}
+	
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+		}
+	}
+}
+
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
index b6faea5fb..39916cc47 100644
--- a/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/nl.dict.itop-config-mgmt.php
@@ -1,1894 +1,1894 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Relation:impacts/Description' => 'Elementen hebben impact op',
-	'Relation:impacts/DownStream' => 'Impact...',
-	'Relation:impacts/DownStream+' => 'Elementen hebben impact op',
-	'Relation:impacts/UpStream' => 'Is afhankelijk van...',
-	'Relation:impacts/UpStream+' => 'Elementen waarvan dit element afhankelijk van is',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Elementen waarvan dit element afhankelijk van is',
-	'Relation:depends on/DownStream' => 'Is afhankelijk van...',
-	'Relation:depends on/UpStream' => 'Impacts...',
-));
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-
-//
-// Class: Organization
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Organization' => 'Organisatie',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Naam',
-	'Class:Organization/Attribute:name+' => 'Gemeenschappelijke naam',
-	'Class:Organization/Attribute:code' => 'Code',
-	'Class:Organization/Attribute:code+' => 'Organisatie code (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Actief',
-	'Class:Organization/Attribute:status/Value:active+' => 'Actief',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inactief',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactief',
-	'Class:Organization/Attribute:parent_id' => 'Moeder organisatie',
-	'Class:Organization/Attribute:parent_id+' => 'Moeder organisatie',
-	'Class:Organization/Attribute:parent_name' => 'Moeder naam',
-	'Class:Organization/Attribute:parent_name+' => 'Naam van de moeder organisatie',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Moeder',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Moeder organisatie',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Location' => 'Locatie',
-	'Class:Location+' => 'Een type locatie zoals: Regio, Land, Stad, Gebouw, Verdieping, Kamer,  ,...',
-	'Class:Location/Attribute:name' => 'Naam',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Actief',
-	'Class:Location/Attribute:status/Value:active+' => 'Actief',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inactief',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inactief',
-	'Class:Location/Attribute:org_id' => 'Organisatie',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Naam van de organisatie',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adres',
-	'Class:Location/Attribute:address+' => 'Locatie van de organisatie',
-	'Class:Location/Attribute:postal_code' => 'Postcode',
-	'Class:Location/Attribute:postal_code+' => 'Postcode van de organisatie',
-	'Class:Location/Attribute:city' => 'Stad',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Land',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Apparaten',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Alle apparaten die zich bevinden op deze locatie',
-	'Class:Location/Attribute:person_list' => 'Contacten',
-	'Class:Location/Attribute:person_list+' => 'Alle contacten die zich bevinden op deze locatie',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Contact' => 'Contact',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Naam',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Actief',
-	'Class:Contact/Attribute:status/Value:active+' => 'Actief',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inactief',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactief',
-	'Class:Contact/Attribute:org_id' => 'Organisatie',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Naam van de organisatie',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefoon',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notificatie',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'nee',
-	'Class:Contact/Attribute:notify/Value:no+' => 'nee',
-	'Class:Contact/Attribute:notify/Value:yes' => 'ja',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'ja',
-	'Class:Contact/Attribute:function' => 'Functie',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => 'Alle configuratie items die gelinkt aan dit team',
-	'Class:Contact/Attribute:finalclass' => 'Contact Type',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Person' => 'Persoon',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Achternaam',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Voornaam',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Burgerservicenummer',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobiele telefoon',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Locatie',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Locatie waarbij de persoon werkzaam is',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Naam van de manager',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => 'Alle teams waarvan deze persoon lid is',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => 'Alle tickets waarvan deze persoon de aanvrager is',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Volledige naam van de manager',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Leden',
-	'Class:Team/Attribute:persons_list+' => 'Alle personen die lid zijn van dit team',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => 'Alle tickets die gelinkt zijn aan dit team',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-		'Class:Document' => 'Document',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Naam',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organisatie',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Naam van de organisatie',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Document type',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Naam van het document type',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:version' => 'Versie',
-	'Class:Document/Attribute:version+' => '',
-	'Class:Document/Attribute:description' => 'Omschrijving',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Concept',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Verouderd',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Gepubliceerd',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => 'Alle configuratie items gelinkt aan dit document',
-	'Class:Document/Attribute:contracts_list' => 'Contracten',
-	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gelinkt aan dit document',
-	'Class:Document/Attribute:services_list' => 'Diensten',
-	'Class:Document/Attribute:services_list+' => 'Alle diensten gelinkt aan dit document.',
-	'Class:Document/Attribute:finalclass' => 'Document Type',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentFile' => 'Document Bestand',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Bestand',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentNote' => 'Document Notitie',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Tekst',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentWeb' => 'Document Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
-//
-// Class: FunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FunctionalCI' => 'Functionele CI',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Naam',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:description' => 'Omschrijving',
-	'Class:FunctionalCI/Attribute:description+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => 'Organisatie',
-	'Class:FunctionalCI/Attribute:org_id+' => '',
-	'Class:FunctionalCI/Attribute:organization_name' => 'Naam van de organisatie',
-	'Class:FunctionalCI/Attribute:organization_name+' => 'Gemeenschappelijke naam',
-	'Class:FunctionalCI/Attribute:business_criticity' => 'Bedrijfskritisch',
-	'Class:FunctionalCI/Attribute:business_criticity+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'hoog',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'hoog',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'laag',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'laag',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'normaal',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'normaal',
-	'Class:FunctionalCI/Attribute:move2production' => 'Verplaats naar productie datum',
-	'Class:FunctionalCI/Attribute:move2production+' => '',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacten',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'Alle contacten voor dit configuratie item',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Documenten',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'Alle documenten gelinkt aan dit configuratie item.',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applicatie oplossingen',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alle applicatie oplossingen die afhankelijk zijn van dit configuratie item',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leveranciers contracten',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Alle leveranciers contracten voor dit configuratie item',
-	'Class:FunctionalCI/Attribute:services_list' => 'Diensten',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Alle diensten die impact hebben op dit configuratie item',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'Alle software geïnstalleerd op dit configuratie item',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle tickets voor dit configuratie item',
-	'Class:FunctionalCI/Attribute:finalclass' => 'CI Type',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-));
-
-//
-// Class: PhysicalDevice
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PhysicalDevice' => 'Fysieke Apparaat',
-	'Class:PhysicalDevice+' => '',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serie nummer',
-	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Locatie',
-	'Class:PhysicalDevice/Attribute:location_id+' => '',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Naam van de locatie',
-	'Class:PhysicalDevice/Attribute:location_name+' => '',
-	'Class:PhysicalDevice/Attribute:status' => 'Status',
-	'Class:PhysicalDevice/Attribute:status+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementatie',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementatie',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'overbodig',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'overbodig',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'productie',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'productie',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'voorraad',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'voorraad',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Merk',
-	'Class:PhysicalDevice/Attribute:brand_id+' => '',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Merk naam',
-	'Class:PhysicalDevice/Attribute:brand_name+' => '',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
-	'Class:PhysicalDevice/Attribute:model_id+' => '',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Model naam',
-	'Class:PhysicalDevice/Attribute:model_name+' => '',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset nummer',
-	'Class:PhysicalDevice/Attribute:asset_number+' => '',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Aankoop datum',
-	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Einde van garantieperiode',
-	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
-));
-
-//
-// Class: Rack
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Rack' => 'Rack',
-	'Class:Rack+' => '',
-	'Class:Rack/Attribute:nb_u' => 'Rack eenheden',
-	'Class:Rack/Attribute:nb_u+' => '',
-	'Class:Rack/Attribute:device_list' => 'Apparaten',
-	'Class:Rack/Attribute:device_list+' => 'Alle fysieke apparaten die zich bevinden in dit rack',
-	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
-	'Class:Rack/Attribute:enclosure_list+' => 'Alle enclosures in dit rack',
-));
-
-//
-// Class: TelephonyCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TelephonyCI' => 'Telefonie CI',
-	'Class:TelephonyCI+' => '',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Telefoon nummer',
-	'Class:TelephonyCI/Attribute:phonenumber+' => '',
-));
-
-//
-// Class: Phone
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Phone' => 'Telefoon',
-	'Class:Phone+' => '',
-));
-
-//
-// Class: MobilePhone
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:MobilePhone' => 'Mobiele Telefoon',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-));
-
-//
-// Class: IPPhone
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:IPPhone' => 'IP Telefoon',
-	'Class:IPPhone+' => '',
-));
-
-//
-// Class: Tablet
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Tablet' => 'Tablet',
-	'Class:Tablet+' => '',
-));
-
-//
-// Class: ConnectableCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ConnectableCI' => 'Aansluitbaar CI',
-	'Class:ConnectableCI+' => 'Fysieke CI',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netwerk apparaten',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Alle netwerk apparaten die zijn verbonden met dit apparaat',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netwerk interfaces',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Alle fysieke netwerk interfaces',
-));
-
-//
-// Class: DatacenterDevice
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DatacenterDevice' => 'Datacenter Apparaat',
-	'Class:DatacenterDevice+' => '',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
-	'Class:DatacenterDevice/Attribute:rack_id+' => '',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack naam',
-	'Class:DatacenterDevice/Attribute:rack_name+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure',
-	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure naam',
-	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack eenheden',
-	'Class:DatacenterDevice/Attribute:nb_u+' => '',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip',
-	'Class:DatacenterDevice/Attribute:managementip+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA bron',
-	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA bron naam',
-	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB bron',
-	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB bron naam',
-	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Alle fiber channel interfaces voor dit apparaat',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'Alle SAN switches die verbonden zijn met dit apparaat',
-));
-
-//
-// Class: NetworkDevice
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:NetworkDevice' => 'Netwerk Apparaat',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Netwerk type',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Naam van het Netwerk type ',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Apparaten',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Alle apparaten die verbonden zijn met dit netwerk apparaat',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS versie',
-	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS versie naam',
-	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-));
-
-//
-// Class: Server
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Server' => 'Server',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:osfamily_id' => 'OS familie',
-	'Class:Server/Attribute:osfamily_id+' => '',
-	'Class:Server/Attribute:osfamily_name' => 'OS familie naam',
-	'Class:Server/Attribute:osfamily_name+' => '',
-	'Class:Server/Attribute:osversion_id' => 'OS versie',
-	'Class:Server/Attribute:osversion_id+' => '',
-	'Class:Server/Attribute:osversion_name' => 'OS versie naam',
-	'Class:Server/Attribute:osversion_name+' => '',
-	'Class:Server/Attribute:oslicence_id' => 'OS ',
-	'Class:Server/Attribute:oslicence_id+' => '',
-	'Class:Server/Attribute:oslicence_name' => 'OS licentie 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:logicalvolumes_list' => 'Logische volumes',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'Alle logische volumes die verbonden zijn met deze server',
-));
-
-//
-// Class: StorageSystem
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:StorageSystem' => 'Opslag Systeem',
-	'Class:StorageSystem+' => '',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logische volumes',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Alle logische volumes in dit opslag systeem',
-));
-
-//
-// Class: SANSwitch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SANSwitch' => 'SAN Switch',
-	'Class:SANSwitch+' => '',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Apparaten',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch',
-));
-
-//
-// Class: TapeLibrary
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TapeLibrary' => 'Tape Bibliotheek',
-	'Class:TapeLibrary+' => '',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'Alle tapes in de tape library',
-));
-
-//
-// Class: NAS
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Bestandssysteem',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'Alle bestandsystemen in deze NAS',
-));
-
-//
-// Class: PC
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:osfamily_id' => 'OS familie',
-	'Class:PC/Attribute:osfamily_id+' => '',
-	'Class:PC/Attribute:osfamily_name' => 'OS familie naam',
-	'Class:PC/Attribute:osfamily_name+' => '',
-	'Class:PC/Attribute:osversion_id' => 'OS versie',
-	'Class:PC/Attribute:osversion_id+' => '',
-	'Class:PC/Attribute:osversion_name' => 'OS versie naam',
-	'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' => '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',
-	'Class:PC/Attribute:type/Value:laptop+' => 'laptop',
-));
-
-//
-// Class: Printer
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Printer' => 'Printer',
-	'Class:Printer+' => '',
-));
-
-//
-// Class: PowerConnection
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PowerConnection' => 'Stroom Connectie',
-	'Class:PowerConnection+' => '',
-));
-
-//
-// Class: PowerSource
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PowerSource' => 'Stroom bron',
-	'Class:PowerSource+' => '',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
-	'Class:PowerSource/Attribute:pdus_list+' => 'Alle PDUs die gebruikt worden door deze stroom bron',
-));
-
-//
-// Class: PDU
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '',
-	'Class:PDU/Attribute:rack_id' => 'Rack',
-	'Class:PDU/Attribute:rack_id+' => '',
-	'Class:PDU/Attribute:rack_name' => 'Rack naam',
-	'Class:PDU/Attribute:rack_name+' => '',
-	'Class:PDU/Attribute:powerstart_id' => 'Power start',
-	'Class:PDU/Attribute:powerstart_id+' => '',
-	'Class:PDU/Attribute:powerstart_name' => 'Power start naam',
-	'Class:PDU/Attribute:powerstart_name+' => '',
-));
-
-//
-// Class: Peripheral
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Peripheral' => 'Randapparatuur',
-	'Class:Peripheral+' => '',
-));
-
-//
-// Class: Enclosure
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Enclosure' => 'Enclosure',
-	'Class:Enclosure+' => '',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack',
-	'Class:Enclosure/Attribute:rack_id+' => '',
-	'Class:Enclosure/Attribute:rack_name' => 'Rack naam',
-	'Class:Enclosure/Attribute:rack_name+' => '',
-	'Class:Enclosure/Attribute:nb_u' => 'Rack eenheden',
-	'Class:Enclosure/Attribute:nb_u+' => '',
-	'Class:Enclosure/Attribute:device_list' => 'Apparaten',
-	'Class:Enclosure/Attribute:device_list+' => 'Alle apparaten in deze enclosure',
-));
-
-//
-// Class: ApplicationSolution
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ApplicationSolution' => 'Applicatie Oplossing',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle configuratie items dat deze applicatie oplossing tot stand brengt',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Bedrijfsprocessen',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle bedrijfsprocessen die afhankelijk zijn van deze applicatie oplossing',
-	'Class:ApplicationSolution/Attribute:status' => 'Status',
-	'Class:ApplicationSolution/Attribute:status+' => '',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'actief',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'actief',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactief',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactief',
-));
-
-//
-// Class: BusinessProcess
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:BusinessProcess' => 'Bedrijfsproces',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Applicatie oplossing',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process',
-	'Class:BusinessProcess/Attribute:status' => 'Status',
-	'Class:BusinessProcess/Attribute:status+' => '',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'actief',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => 'actief',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactief',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactief',
-));
-
-//
-// Class: SoftwareInstance
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SoftwareInstance' => 'Software Instantie',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Attribute:system_id' => 'Systeem',
-	'Class:SoftwareInstance/Attribute:system_id+' => '',
-	'Class:SoftwareInstance/Attribute:system_name' => 'Systeem naam',
-	'Class:SoftwareInstance/Attribute:system_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
-	'Class:SoftwareInstance/Attribute:software_id+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => 'Software naam',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licentie',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licentie naam',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
-	'Class:SoftwareInstance/Attribute:path' => 'Pad',
-	'Class:SoftwareInstance/Attribute:path+' => '',
-	'Class:SoftwareInstance/Attribute:status' => 'Status',
-	'Class:SoftwareInstance/Attribute:status+' => '',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'actief',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'actief',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactief',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactief',
-));
-
-//
-// Class: Middleware
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => '',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instanties',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Alle middleware instanties die geleverd worden door deze middleware',
-));
-
-//
-// Class: DBServer
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DBServer' => 'DB Server',
-	'Class:DBServer+' => '',
-	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas',
-	'Class:DBServer/Attribute:dbschema_list+' => 'Alle  database schemas voor deze DB server',
-));
-
-//
-// Class: WebServer
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:WebServer' => 'Web server',
-	'Class:WebServer+' => '',
-	'Class:WebServer/Attribute:webapp_list' => 'Web applicaties',
-	'Class:WebServer/Attribute:webapp_list+' => 'Alle  web applicaties die beschikbaar zijn voor deze web server',
-));
-
-//
-// Class: PCSoftware
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PCSoftware' => 'PC Software',
-	'Class:PCSoftware+' => '',
-));
-
-//
-// Class: OtherSoftware
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:OtherSoftware' => 'Overige Software',
-	'Class:OtherSoftware+' => '',
-));
-
-//
-// Class: MiddlewareInstance
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:MiddlewareInstance' => 'Middleware Instantie',
-	'Class:MiddlewareInstance+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
-	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware naam',
-	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
-));
-
-//
-// Class: DatabaseSchema
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DatabaseSchema' => 'Database Schema',
-	'Class:DatabaseSchema+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
-	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server naam',
-	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
-));
-
-//
-// Class: WebApplication
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:WebApplication' => 'Web Applicatie',
-	'Class:WebApplication+' => '',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
-	'Class:WebApplication/Attribute:webserver_id+' => '',
-	'Class:WebApplication/Attribute:webserver_name' => 'Web server naam',
-	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:url' => 'URL',
-	'Class:WebApplication/Attribute:url+' => '',
-));
-
-
-//
-// Class: VirtualDevice
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:VirtualDevice' => 'Virtuele Apparaat',
-	'Class:VirtualDevice+' => '',
-	'Class:VirtualDevice/Attribute:status' => 'Status',
-	'Class:VirtualDevice/Attribute:status+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementatie',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementatie',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'overbodig',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'overbodig',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'productie',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => 'productie',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device',
-));
-
-//
-// Class: VirtualHost
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:VirtualHost' => 'Virtual Host',
-	'Class:VirtualHost+' => '',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host',
-));
-
-//
-// Class: Hypervisor
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '',
-	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
-	'Class:Hypervisor/Attribute:farm_id+' => '',
-	'Class:Hypervisor/Attribute:farm_name' => 'Farm name',
-	'Class:Hypervisor/Attribute:farm_name+' => '',
-	'Class:Hypervisor/Attribute:server_id' => 'Server',
-	'Class:Hypervisor/Attribute:server_id+' => '',
-	'Class:Hypervisor/Attribute:server_name' => 'Server name',
-	'Class:Hypervisor/Attribute:server_name+' => '',
-));
-
-//
-// Class: Farm
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Farm' => 'Farm',
-	'Class:Farm+' => '',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm',
-));
-
-//
-// Class: VirtualMachine
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:VirtualMachine' => 'Virtuele Machine',
-	'Class:VirtualMachine+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host',
-	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name',
-	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS familie',
-	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS familie naam',
-	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version',
-	'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+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name',
-	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
-	'Class:VirtualMachine/Attribute:cpu+' => '',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM',
-	'Class:VirtualMachine/Attribute:ram+' => '',
-	'Class:VirtualMachine/Attribute:managementip' => 'IP',
-	'Class:VirtualMachine/Attribute:managementip+' => '',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces',
-));
-
-//
-// Class: LogicalVolume
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:LogicalVolume' => 'Logisch Volume',
-	'Class:LogicalVolume+' => '',
-	'Class:LogicalVolume/Attribute:name' => 'Naam',
-	'Class:LogicalVolume/Attribute:name+' => '',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
-	'Class:LogicalVolume/Attribute:lun_id+' => '',
-	'Class:LogicalVolume/Attribute:description' => 'Omschrijving',
-	'Class:LogicalVolume/Attribute:description+' => '',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid niveau',
-	'Class:LogicalVolume/Attribute:raid_level+' => '',
-	'Class:LogicalVolume/Attribute:size' => 'Grootte',
-	'Class:LogicalVolume/Attribute:size+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Opslag systeem',
-	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Naam van de opslag systeem',
-	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servers',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'Alle  servers die dit volume gebruiken',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuele apparaten',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Alle virtuele apparaten die dit volume gebruiken',
-));
-
-//
-// Class: lnkServerToVolume
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkServerToVolume' => 'Link Server / Volume',
-	'Class:lnkServerToVolume+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume naam',
-	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
-	'Class:lnkServerToVolume/Attribute:server_id+' => '',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Server naam',
-	'Class:lnkServerToVolume/Attribute:server_name+' => '',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Grootte gebruikt',
-	'Class:lnkServerToVolume/Attribute:size_used+' => '',
-));
-
-//
-// Class: lnkVirtualDeviceToVolume
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
-	'Class:lnkVirtualDeviceToVolume+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume naam',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtuele apparaat',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Naam van het virtuele apparaat',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Grootte gebruikt',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
-));
-
-//
-// Class: lnkSanToDatacenterDevice
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
-	'Class:lnkSanToDatacenterDevice+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch naam',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Apparaat',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Apparaat naam',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Apparaat fc',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
-));
-
-//
-// Class: Tape
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Tape' => 'Tape',
-	'Class:Tape+' => '',
-	'Class:Tape/Attribute:name' => 'Naam',
-	'Class:Tape/Attribute:name+' => '',
-	'Class:Tape/Attribute:description' => 'Omschrijving',
-	'Class:Tape/Attribute:description+' => '',
-	'Class:Tape/Attribute:size' => 'Grootte',
-	'Class:Tape/Attribute:size+' => '',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape Bibliotheek',
-	'Class:Tape/Attribute:tapelibrary_id+' => '',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Tape Bibliotheek naam',
-	'Class:Tape/Attribute:tapelibrary_name+' => '',
-));
-
-//
-// Class: NASFileSystem
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:NASFileSystem' => 'NAS Bestands Systeem',
-	'Class:NASFileSystem+' => '',
-	'Class:NASFileSystem/Attribute:name' => 'Naam',
-	'Class:NASFileSystem/Attribute:name+' => '',
-	'Class:NASFileSystem/Attribute:description' => 'Omschrijving',
-	'Class:NASFileSystem/Attribute:description+' => '',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid niveau',
-	'Class:NASFileSystem/Attribute:raid_level+' => '',
-	'Class:NASFileSystem/Attribute:size' => 'Grootte',
-	'Class:NASFileSystem/Attribute:size+' => '',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NASFileSystem/Attribute:nas_id+' => '',
-	'Class:NASFileSystem/Attribute:nas_name' => 'NAS naam',
-	'Class:NASFileSystem/Attribute:nas_name+' => '',
-));
-
-//
-// Class: Software
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Software' => 'Software',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => 'Naam',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:vendor' => 'verkoper',
-	'Class:Software/Attribute:vendor+' => '',
-	'Class:Software/Attribute:version' => 'Versie',
-	'Class:Software/Attribute:version+' => '',
-	'Class:Software/Attribute:documents_list' => 'Documenten',
-	'Class:Software/Attribute:documents_list+' => 'Alle  documenten gelinkt aan deze software',
-	'Class:Software/Attribute:type' => 'Type',
-	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Overige Software',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Overige Software',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instanties',
-	'Class:Software/Attribute:softwareinstance_list+' => 'Alle  software instanties voor deze sofware',
-	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
-	'Class:Software/Attribute:softwarepatch_list+' => 'Alle  patches voor deze software',
-	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenties',
-	'Class:Software/Attribute:softwarelicence_list+' => 'Alle licenties voor deze software',
-));
-
-//
-// Class: Patch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Patch' => 'Patch',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Naam',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:documents_list' => 'Documenten',
-	'Class:Patch/Attribute:documents_list+' => 'Alle documenten gelinkt aan deze patch',
-	'Class:Patch/Attribute:description' => 'Omschrijving',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Type',
-	'Class:Patch/Attribute:finalclass+' => '',
-));
-
-//
-// Class: OSPatch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:OSPatch' => 'OS Patch',
-	'Class:OSPatch+' => '',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Apparaten',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'Alle systemen waar deze patch is geïnstalleerd',
-	'Class:OSPatch/Attribute:osversion_id' => 'OS versie',
-	'Class:OSPatch/Attribute:osversion_id+' => '',
-	'Class:OSPatch/Attribute:osversion_name' => 'OS versie naam',
-	'Class:OSPatch/Attribute:osversion_name+' => '',
-));
-
-//
-// Class: SoftwarePatch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SoftwarePatch' => 'Software Patch',
-	'Class:SoftwarePatch+' => '',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
-	'Class:SoftwarePatch/Attribute:software_id+' => '',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Software naam',
-	'Class:SoftwarePatch/Attribute:software_name+' => '',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instanties',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Alle systemen waar deze patch is geïnstalleerd',
-));
-
-//
-// Class: Licence
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Licence' => 'Licentie',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:name' => 'Naam',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:documents_list' => 'Documenten',
-	'Class:Licence/Attribute:documents_list+' => 'All documenten gelinkt aan deze licentie',
-	'Class:Licence/Attribute:org_id' => 'Organization',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:organization_name' => 'Organisatie naam',
-	'Class:Licence/Attribute:organization_name+' => 'Gemeenschappelijke naam',
-	'Class:Licence/Attribute:usage_limit' => 'Gebruikslimiet',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:description' => 'Omschrijving',
-	'Class:Licence/Attribute:description+' => '',
-	'Class:Licence/Attribute:start_date' => 'Start datum',
-	'Class:Licence/Attribute:start_date+' => '',
-	'Class:Licence/Attribute:end_date' => 'Eind datum',
-	'Class:Licence/Attribute:end_date+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Code',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:perpetual' => 'Lifetime',
-	'Class:Licence/Attribute:perpetual+' => '',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'nee',
-	'Class:Licence/Attribute:perpetual/Value:no+' => 'nee',
-	'Class:Licence/Attribute:perpetual/Value:yes' => 'ja',
-	'Class:Licence/Attribute:perpetual/Value:yes+' => 'ja',
-	'Class:Licence/Attribute:finalclass' => 'Type',
-	'Class:Licence/Attribute:finalclass+' => '',
-));
-
-//
-// Class: OSLicence
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:OSLicence' => 'OS Licentie',
-	'Class:OSLicence+' => '',
-	'Class:OSLicence/Attribute:osversion_id' => 'OS versie',
-	'Class:OSLicence/Attribute:osversion_id+' => '',
-	'Class:OSLicence/Attribute:osversion_name' => 'OS version naam',
-	'Class:OSLicence/Attribute:osversion_name+' => '',
-	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuele machines',
-	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Alle  virtual machines die gebruik maken van deze licentie',
-	'Class:OSLicence/Attribute:servers_list' => 'servers',
-	'Class:OSLicence/Attribute:servers_list+' => 'Alle servers die gebruik maken van deze licentie',
-));
-
-//
-// Class: SoftwareLicence
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SoftwareLicence' => 'Software Licentie',
-	'Class:SoftwareLicence+' => '',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
-	'Class:SoftwareLicence/Attribute:software_id+' => '',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Software naam',
-	'Class:SoftwareLicence/Attribute:software_name+' => '',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instanties',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Alle systemen die gebruik maken van deze licentie',
-));
-
-//
-// Class: lnkDocumentToLicence
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDocumentToLicence' => 'Link Document / Licentie',
-	'Class:lnkDocumentToLicence+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licentie',
-	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licentie naam',
-	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document naam',
-	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
-));
-
-//
-// Class: Typology
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Typology' => 'Typology',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Naam',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Type',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
-//
-// Class: OSVersion
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-		'Class:OSVersion' => 'OS Versie',
-	'Class:OSVersion+' => '',
-	'Class:OSVersion/Attribute:osfamily_id' => 'OS familie',
-	'Class:OSVersion/Attribute:osfamily_id+' => '',
-	'Class:OSVersion/Attribute:osfamily_name' => 'OS familie naam',
-	'Class:OSVersion/Attribute:osfamily_name+' => '',
-
-));
-
-//
-// Class: OSFamily
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:OSFamily' => 'OS Familie',
-	'Class:OSFamily+' => '',
-));
-
-//
-// Class: DocumentType
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DocumentType' => 'Document Type',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ContactType' => 'Contact Type',
-	'Class:ContactType+' => '',
-));
-
-//
-// Class: Brand
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Brand' => 'Merk',
-	'Class:Brand+' => '',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Fysieke apparaten',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten die corresponderen met dit merk',
-));
-
-//
-// Class: Model
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Model' => 'Model',
-	'Class:Model+' => '',
-	'Class:Model/Attribute:brand_id' => 'Merk',
-	'Class:Model/Attribute:brand_id+' => '',
-	'Class:Model/Attribute:brand_name' => 'Merk naam',
-	'Class:Model/Attribute:brand_name+' => '',
-	'Class:Model/Attribute:type' => 'Apparaat type',
-	'Class:Model/Attribute:type+' => '',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Stroom Bron',
-	'Class:Model/Attribute:type/Value:PowerSource+' => 'Stroom Bron',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Schijven Set',
-	'Class:Model/Attribute:type/Value:DiskArray+' => 'Schijven Set',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Telefoon',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Telefoon',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiele Telefoon',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobiele Telefoon',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netwerk Apparaat',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Netwerk Apparaat',
-	'Class:Model/Attribute:type/Value:PC' => 'PC',
-	'Class:Model/Attribute:type/Value:PC+' => 'PC',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Randapparatuur',
-	'Class:Model/Attribute:type/Value:Peripheral+' => 'Randapparatuur',
-	'Class:Model/Attribute:type/Value:Printer' => 'Printer',
-	'Class:Model/Attribute:type/Value:Printer+' => 'Printer',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch',
-	'Class:Model/Attribute:type/Value:Server' => 'Server',
-	'Class:Model/Attribute:type/Value:Server+' => 'Server',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Opslag Systeem',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Opslag Systeem',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
-	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Bibliotheek',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Bibliotheek',
-	'Class:Model/Attribute:type/Value:Telephone' => 'Telefoon',
-	'Class:Model/Attribute:type/Value:Telephone+' => 'Telefoon',
-	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices',
-	'Class:Model/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten die corresponderen met dit model',
-));
-
-//
-// Class: NetworkDeviceType
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:NetworkDeviceType' => 'Network Device Type',
-	'Class:NetworkDeviceType+' => '',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netwerk apparaten',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Alle netwerk apparaten die corresponderen met dit type',
-));
-
-//
-// Class: IOSVersion
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:IOSVersion' => 'IOS Versie',
-	'Class:IOSVersion+' => '',
-	'Class:IOSVersion/Attribute:brand_id' => 'Merk',
-	'Class:IOSVersion/Attribute:brand_id+' => '',
-	'Class:IOSVersion/Attribute:brand_name' => 'Merk naam',
-	'Class:IOSVersion/Attribute:brand_name+' => '',
-));
-
-//
-// Class: lnkDocumentToPatch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
-	'Class:lnkDocumentToPatch+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch naam',
-	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document naam',
-	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkSoftwareInstanceToSoftwarePatch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch naam',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instantie',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instantie naam',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToOSPatch
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
-	'Class:lnkFunctionalCIToOSPatch+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch naam',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci naam',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: lnkDocumentToSoftware
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
-	'Class:lnkDocumentToSoftware+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
-	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software naam',
-	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document naam',
-	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci naam',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact naam',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkDocumentToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
-	'Class:lnkDocumentToFunctionalCI+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci naam',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document naam',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
-));
-
-//
-// Class: Subnet
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Attribute:description' => 'Omschrijving',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:subnet_name' => 'Subnet naam',
-	'Class:Subnet/Attribute:subnet_name+' => '',
-	'Class:Subnet/Attribute:org_id' => 'Organisatie',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:org_name' => 'Naam',
-	'Class:Subnet/Attribute:org_name+' => 'Gemeenschappelijke naam',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-	'Class:Subnet/Attribute:vlans_list' => 'VLANs',
-	'Class:Subnet/Attribute:vlans_list+' => '',
-));
-
-//
-// Class: VLAN
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:VLAN' => 'VLAN',
-	'Class:VLAN+' => '',
-	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Label',
-	'Class:VLAN/Attribute:vlan_tag+' => '',
-	'Class:VLAN/Attribute:description' => 'Omschrijving',
-	'Class:VLAN/Attribute:description+' => '',
-	'Class:VLAN/Attribute:org_id' => 'Organisatie',
-	'Class:VLAN/Attribute:org_id+' => '',
-	'Class:VLAN/Attribute:org_name' => 'Organisatie naam',
-	'Class:VLAN/Attribute:org_name+' => 'Gemeenschappelijke naam',
-	'Class:VLAN/Attribute:subnets_list' => 'Subnets',
-	'Class:VLAN/Attribute:subnets_list+' => '',
-	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Fysieke netwerk interfaces',
-	'Class:VLAN/Attribute:physicalinterfaces_list+' => '',
-));
-
-//
-// Class: lnkSubnetToVLAN
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
-	'Class:lnkSubnetToVLAN+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet naam',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Label',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
-));
-
-//
-// Class: NetworkInterface
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:NetworkInterface' => 'Netwerk Interface',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Attribute:name' => 'Naam',
-	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type',
-	'Class:NetworkInterface/Attribute:finalclass+' => '',
-));
-
-//
-// Class: IPInterface
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:IPInterface' => 'IP Interface',
-	'Class:IPInterface+' => '',
-	'Class:IPInterface/Attribute:ipaddress' => 'IP address',
-	'Class:IPInterface/Attribute:ipaddress+' => '',
-	'Class:IPInterface/Attribute:macaddress' => 'MAC address',
-	'Class:IPInterface/Attribute:macaddress+' => '',
-	'Class:IPInterface/Attribute:comment' => 'Commentaar',
-	'Class:IPInterface/Attribute:coment+' => '',
-	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway',
-	'Class:IPInterface/Attribute:ipgateway+' => '',
-	'Class:IPInterface/Attribute:ipmask' => 'IP mask',
-	'Class:IPInterface/Attribute:ipmask+' => '',
-	'Class:IPInterface/Attribute:speed' => 'Snelheid',
-	'Class:IPInterface/Attribute:speed+' => '',
-));
-
-//
-// Class: PhysicalInterface
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:PhysicalInterface' => 'Fysieke Interface',
-	'Class:PhysicalInterface+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Apparaat',
-	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Apparaat naam',
-	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
-	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
-));
-
-//
-// Class: lnkPhysicalInterfaceToVLAN
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fysieke Interface',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Fysieke Interface Naam',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Apparaat',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Apparaat naam',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Label',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
-));
-
-
-//
-// Class: LogicalInterface
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:LogicalInterface' => 'Logical Interface',
-	'Class:LogicalInterface+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine',
-	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name',
-	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
-));
-
-//
-// Class: FiberChannelInterface
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
-	'Class:FiberChannelInterface+' => '',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Snelheid',
-	'Class:FiberChannelInterface/Attribute:speed+' => '',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topologie',
-	'Class:FiberChannelInterface/Attribute:topology+' => '',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
-	'Class:FiberChannelInterface/Attribute:wwn+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Apparaat',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Apparaat naam',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
-));
-
-//
-// Class: lnkConnectableCIToNetworkDevice
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetwerkApparaat',
-	'Class:lnkConnectableCIToNetworkDevice+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netwerk apparaat',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Netwerk apparaat naam',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Verbonden apparaat',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Verbonden apparaat naam',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Netwerk poort',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Apparaat poort',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Connectie type',
-	'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: lnkApplicationSolutionToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicatieOplossing / FunctioneleCI',
-	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applicatie oplossing',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Applicatie oplossing naam',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functioneleci',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functioneleci name',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: lnkApplicationSolutionToBusinessProcess
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / Bedrijfsproces',
-	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Bedrijfsproces',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Bedrijfsproces naam',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Applicatie oplossing',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Applicatie oplossing naam',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
-));
-
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkPersonToTeam' => 'Link Persoon / Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team naam',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Persoon',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Persoon naam',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rol',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role naam',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
-//
-// Class: Group
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Group' => 'Groep',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => 'Naam',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => 'Status',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => 'Implementatie',
-	'Class:Group/Attribute:status/Value:implementation+' => 'Implementatie',
-	'Class:Group/Attribute:status/Value:obsolete' => 'Verouderd',
-	'Class:Group/Attribute:status/Value:obsolete+' => 'Verouderd',
-	'Class:Group/Attribute:status/Value:production' => 'Productie',
-	'Class:Group/Attribute:status/Value:production+' => 'Productie',
-	'Class:Group/Attribute:org_id' => 'Organisatie',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => 'Naam',
-	'Class:Group/Attribute:owner_name+' => 'Gemeenschappelijke naam',
-	'Class:Group/Attribute:description' => 'Omschrijving',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Type',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Hoofd Groep',
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:parent_name' => 'Naam',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => 'Gelinkte CIs',
-	'Class:Group/Attribute:ci_list+' => 'Alle configuratie items gelinkt aan deze groep',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Moeder Groep',
-	'Class:Group/Attribute:parent_id_friendlyname+' => '',
-));
-
-//
-// Class: lnkGroupToCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkGroupToCI' => 'Link Groep / CI',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Groep',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Naam',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Naam',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Reden',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-));
-
-
-//
-// Application Menu
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:DataAdministration' => 'Data administratie',
-	'Menu:DataAdministration+' => 'Data administratie',
-	'Menu:Catalogs' => 'Catalogus',
-	'Menu:Catalogs+' => 'Data typen',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => 'Audit',
-	'Menu:CSVImport' => 'CSV import',
-	'Menu:CSVImport+' => 'Grootschalige aanmaak of update',
-	'Menu:Organization' => 'Organisaties',
-	'Menu:Organization+' => 'Alle organisaties',
-	'Menu:Application' => 'Applicaties',
-	'Menu:Application+' => 'Alle Applicaties',
-	'Menu:DBServer' => 'Database servers',
-	'Menu:DBServer+' => 'Database servers',
-	'Menu:ConfigManagement' => 'Configuratie Management',
-	'Menu:ConfigManagement+' => 'Configuratie Management',
-	'Menu:ConfigManagementOverview' => 'Overzicht',
-	'Menu:ConfigManagementOverview+' => 'Overzicht',
-	'Menu:Contact' => 'Contacten',
-	'Menu:Contact+' => 'Contacten',
-	'Menu:Contact:Count' => '%1$d contacten',
-	'Menu:Person' => 'Personen',
-	'Menu:Person+' => 'Alle personen',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => 'Alle teams',
-	'Menu:Document' => 'Documenten',
-	'Menu:Document+' => 'Alle documenten',
-	'Menu:Location' => 'Locaties',
-	'Menu:Location+' => 'Alle locaties',
-	'Menu:ConfigManagementCI' => 'Configuratie items',
-	'Menu:ConfigManagementCI+' => 'Configuratie items',
-	'Menu:BusinessProcess' => 'Bedrijfsprocessen',
-	'Menu:BusinessProcess+' => 'Alle bedrijfsprocessen',
-	'Menu:ApplicationSolution' => 'Applicatie oplossing',
-	'Menu:ApplicationSolution+' => 'Alle applicatie oplossingen',
-	'Menu:ConfigManagementSoftware' => 'Applicatie management',
-	'Menu:Licence' => 'Licenties',
-	'Menu:Licence+' => 'Alle licenties',
-	'Menu:Patch' => 'Patches',
-	'Menu:Patch+' => 'Alle patches',
-	'Menu:ApplicationInstance' => 'Geïnstalleerde software',
-	'Menu:ApplicationInstance+' => 'Applicaties en database servers',
-	'Menu:ConfigManagementHardware' => 'Infrastructuur management',
-	'Menu:Subnet' => 'Subnets',
-	'Menu:Subnet+' => 'Alle subnets',
-	'Menu:NetworkDevice' => 'Netwerk apparaten',
-	'Menu:NetworkDevice+' => 'Alle network apparaten',
-	'Menu:Server' => 'Servers',
-	'Menu:Server+' => 'Alle servers',
-	'Menu:Printer' => 'Printers',
-	'Menu:Printer+' => 'Alle printers',
-	'Menu:MobilePhone' => 'Mobiele telefoons',
-	'Menu:MobilePhone+' => 'Alle mobiele telefoons',
-	'Menu:PC' => 'Personal computers',
-	'Menu:PC+' => 'Alle Personal computers',
-	'Menu:NewContact' => 'Nieuw contact',
-	'Menu:NewContact+' => 'Nieuw contact',
-	'Menu:SearchContacts' => 'Zoeken naar contacten',
-	'Menu:SearchContacts+' => 'Zoeken naar contacten',
-	'Menu:NewCI' => 'Nieuw CI',
-	'Menu:NewCI+' => 'Nieuw CI',
-	'Menu:SearchCIs' => 'Zoek naar CIs',
-	'Menu:SearchCIs+' => 'Zoek naar CIs',
-	'Menu:ConfigManagement:Devices' => 'Apparaten',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastructuur',
-	'Menu:ConfigManagement:virtualization' => 'Virtualisatie',
-	'Menu:ConfigManagement:EndUsers' => 'Eindgebruiker apparaten',
-	'Menu:ConfigManagement:SWAndApps' => 'Software en applicaties',
-	'Menu:ConfigManagement:Misc' => 'Diversen',
-	'Menu:Group' => 'Groepen van CIs',
-	'Menu:Group+' => 'Groepen van CIs',
-	'Menu:ConfigManagement:Shortcuts' => 'Snelkoppelingen',
-	'Menu:ConfigManagement:AllContacts' => 'Alle contacten: %1$d',
-	'Menu:Typology' => 'Typologie configuratie',
-	'Menu:Typology+' => 'Typologie configuratie',
-	'Menu:OSVersion' => 'OS versies',
-	'Menu:OSVersion+' => '',
-	'Menu:Software' => 'Software catalogus',
-	'Menu:Software+' => 'Software catalogus',
-	'UI_WelcomeMenu_AllConfigItems' => 'Samenvatting',
-	'Menu:ConfigManagement:Typology' => 'Typologie configuratie',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Server:baseinfo' => 'Globale informatie',
-	'Server:Date' => 'Datum',
-	'Server:moreinfo' => 'Meer informatie',
-	'Server:otherinfo' => 'Andere informatie',
-	'Person:info' => 'Globale informatie',
-	'Person:notifiy' => 'Notificatie',
-	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
-	'Class:Document:PreviewTab' => 'Preview',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
-	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
-	'Class:Farm/Attribute:redundancy' => 'High availability~~',
-	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
-	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
-	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
-	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
-	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
-	'Server:power' => 'Power supply~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Relation:impacts/Description' => 'Elementen hebben impact op',
+	'Relation:impacts/DownStream' => 'Impact...',
+	'Relation:impacts/DownStream+' => 'Elementen hebben impact op',
+	'Relation:impacts/UpStream' => 'Is afhankelijk van...',
+	'Relation:impacts/UpStream+' => 'Elementen waarvan dit element afhankelijk van is',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Elementen waarvan dit element afhankelijk van is',
+	'Relation:depends on/DownStream' => 'Is afhankelijk van...',
+	'Relation:depends on/UpStream' => 'Impacts...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Organization' => 'Organisatie',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Naam',
+	'Class:Organization/Attribute:name+' => 'Gemeenschappelijke naam',
+	'Class:Organization/Attribute:code' => 'Code',
+	'Class:Organization/Attribute:code+' => 'Organisatie code (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Actief',
+	'Class:Organization/Attribute:status/Value:active+' => 'Actief',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inactief',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inactief',
+	'Class:Organization/Attribute:parent_id' => 'Moeder organisatie',
+	'Class:Organization/Attribute:parent_id+' => 'Moeder organisatie',
+	'Class:Organization/Attribute:parent_name' => 'Moeder naam',
+	'Class:Organization/Attribute:parent_name+' => 'Naam van de moeder organisatie',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Moeder',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Moeder organisatie',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Location' => 'Locatie',
+	'Class:Location+' => 'Een type locatie zoals: Regio, Land, Stad, Gebouw, Verdieping, Kamer,  ,...',
+	'Class:Location/Attribute:name' => 'Naam',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Actief',
+	'Class:Location/Attribute:status/Value:active+' => 'Actief',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inactief',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inactief',
+	'Class:Location/Attribute:org_id' => 'Organisatie',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Naam van de organisatie',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adres',
+	'Class:Location/Attribute:address+' => 'Locatie van de organisatie',
+	'Class:Location/Attribute:postal_code' => 'Postcode',
+	'Class:Location/Attribute:postal_code+' => 'Postcode van de organisatie',
+	'Class:Location/Attribute:city' => 'Stad',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Land',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Apparaten',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Alle apparaten die zich bevinden op deze locatie',
+	'Class:Location/Attribute:person_list' => 'Contacten',
+	'Class:Location/Attribute:person_list+' => 'Alle contacten die zich bevinden op deze locatie',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Contact' => 'Contact',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Naam',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Actief',
+	'Class:Contact/Attribute:status/Value:active+' => 'Actief',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inactief',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inactief',
+	'Class:Contact/Attribute:org_id' => 'Organisatie',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Naam van de organisatie',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefoon',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notificatie',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'nee',
+	'Class:Contact/Attribute:notify/Value:no+' => 'nee',
+	'Class:Contact/Attribute:notify/Value:yes' => 'ja',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'ja',
+	'Class:Contact/Attribute:function' => 'Functie',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => 'Alle configuratie items die gelinkt aan dit team',
+	'Class:Contact/Attribute:finalclass' => 'Contact Type',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Person' => 'Persoon',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Achternaam',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Voornaam',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Burgerservicenummer',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobiele telefoon',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Locatie',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Locatie waarbij de persoon werkzaam is',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Naam van de manager',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Teams',
+	'Class:Person/Attribute:team_list+' => 'Alle teams waarvan deze persoon lid is',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => 'Alle tickets waarvan deze persoon de aanvrager is',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Volledige naam van de manager',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Leden',
+	'Class:Team/Attribute:persons_list+' => 'Alle personen die lid zijn van dit team',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => 'Alle tickets die gelinkt zijn aan dit team',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+		'Class:Document' => 'Document',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Naam',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organisatie',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Naam van de organisatie',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Document type',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Naam van het document type',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:version' => 'Versie',
+	'Class:Document/Attribute:version+' => '',
+	'Class:Document/Attribute:description' => 'Omschrijving',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Concept',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Verouderd',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Gepubliceerd',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => 'Alle configuratie items gelinkt aan dit document',
+	'Class:Document/Attribute:contracts_list' => 'Contracten',
+	'Class:Document/Attribute:contracts_list+' => 'Alle contracten gelinkt aan dit document',
+	'Class:Document/Attribute:services_list' => 'Diensten',
+	'Class:Document/Attribute:services_list+' => 'Alle diensten gelinkt aan dit document.',
+	'Class:Document/Attribute:finalclass' => 'Document Type',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentFile' => 'Document Bestand',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Bestand',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentNote' => 'Document Notitie',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Tekst',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentWeb' => 'Document Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FunctionalCI' => 'Functionele CI',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Naam',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:description' => 'Omschrijving',
+	'Class:FunctionalCI/Attribute:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Organisatie',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:organization_name' => 'Naam van de organisatie',
+	'Class:FunctionalCI/Attribute:organization_name+' => 'Gemeenschappelijke naam',
+	'Class:FunctionalCI/Attribute:business_criticity' => 'Bedrijfskritisch',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'hoog',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'hoog',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'laag',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'laag',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'normaal',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'normaal',
+	'Class:FunctionalCI/Attribute:move2production' => 'Verplaats naar productie datum',
+	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacten',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'Alle contacten voor dit configuratie item',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Documenten',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'Alle documenten gelinkt aan dit configuratie item.',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applicatie oplossingen',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Alle applicatie oplossingen die afhankelijk zijn van dit configuratie item',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leveranciers contracten',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Alle leveranciers contracten voor dit configuratie item',
+	'Class:FunctionalCI/Attribute:services_list' => 'Diensten',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Alle diensten die impact hebben op dit configuratie item',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'Alle software geïnstalleerd op dit configuratie item',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Alle tickets voor dit configuratie item',
+	'Class:FunctionalCI/Attribute:finalclass' => 'CI Type',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+));
+
+//
+// Class: PhysicalDevice
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PhysicalDevice' => 'Fysieke Apparaat',
+	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serie nummer',
+	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Locatie',
+	'Class:PhysicalDevice/Attribute:location_id+' => '',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Naam van de locatie',
+	'Class:PhysicalDevice/Attribute:location_name+' => '',
+	'Class:PhysicalDevice/Attribute:status' => 'Status',
+	'Class:PhysicalDevice/Attribute:status+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementatie',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementatie',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'overbodig',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'overbodig',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'productie',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'productie',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'voorraad',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'voorraad',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Merk',
+	'Class:PhysicalDevice/Attribute:brand_id+' => '',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Merk naam',
+	'Class:PhysicalDevice/Attribute:brand_name+' => '',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
+	'Class:PhysicalDevice/Attribute:model_id+' => '',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Model naam',
+	'Class:PhysicalDevice/Attribute:model_name+' => '',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset nummer',
+	'Class:PhysicalDevice/Attribute:asset_number+' => '',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Aankoop datum',
+	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Einde van garantieperiode',
+	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
+));
+
+//
+// Class: Rack
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Rack' => 'Rack',
+	'Class:Rack+' => '',
+	'Class:Rack/Attribute:nb_u' => 'Rack eenheden',
+	'Class:Rack/Attribute:nb_u+' => '',
+	'Class:Rack/Attribute:device_list' => 'Apparaten',
+	'Class:Rack/Attribute:device_list+' => 'Alle fysieke apparaten die zich bevinden in dit rack',
+	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
+	'Class:Rack/Attribute:enclosure_list+' => 'Alle enclosures in dit rack',
+));
+
+//
+// Class: TelephonyCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TelephonyCI' => 'Telefonie CI',
+	'Class:TelephonyCI+' => '',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Telefoon nummer',
+	'Class:TelephonyCI/Attribute:phonenumber+' => '',
+));
+
+//
+// Class: Phone
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Phone' => 'Telefoon',
+	'Class:Phone+' => '',
+));
+
+//
+// Class: MobilePhone
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:MobilePhone' => 'Mobiele Telefoon',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+));
+
+//
+// Class: IPPhone
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:IPPhone' => 'IP Telefoon',
+	'Class:IPPhone+' => '',
+));
+
+//
+// Class: Tablet
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Tablet' => 'Tablet',
+	'Class:Tablet+' => '',
+));
+
+//
+// Class: ConnectableCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ConnectableCI' => 'Aansluitbaar CI',
+	'Class:ConnectableCI+' => 'Fysieke CI',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netwerk apparaten',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Alle netwerk apparaten die zijn verbonden met dit apparaat',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netwerk interfaces',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Alle fysieke netwerk interfaces',
+));
+
+//
+// Class: DatacenterDevice
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DatacenterDevice' => 'Datacenter Apparaat',
+	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
+	'Class:DatacenterDevice/Attribute:rack_id+' => '',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack naam',
+	'Class:DatacenterDevice/Attribute:rack_name+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure',
+	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure naam',
+	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack eenheden',
+	'Class:DatacenterDevice/Attribute:nb_u+' => '',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip',
+	'Class:DatacenterDevice/Attribute:managementip+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA bron',
+	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA bron naam',
+	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB bron',
+	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB bron naam',
+	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Alle fiber channel interfaces voor dit apparaat',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'Alle SAN switches die verbonden zijn met dit apparaat',
+));
+
+//
+// Class: NetworkDevice
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:NetworkDevice' => 'Netwerk Apparaat',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Netwerk type',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Naam van het Netwerk type ',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Apparaten',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Alle apparaten die verbonden zijn met dit netwerk apparaat',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS versie',
+	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS versie naam',
+	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+));
+
+//
+// Class: Server
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Server' => 'Server',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:osfamily_id' => 'OS familie',
+	'Class:Server/Attribute:osfamily_id+' => '',
+	'Class:Server/Attribute:osfamily_name' => 'OS familie naam',
+	'Class:Server/Attribute:osfamily_name+' => '',
+	'Class:Server/Attribute:osversion_id' => 'OS versie',
+	'Class:Server/Attribute:osversion_id+' => '',
+	'Class:Server/Attribute:osversion_name' => 'OS versie naam',
+	'Class:Server/Attribute:osversion_name+' => '',
+	'Class:Server/Attribute:oslicence_id' => 'OS ',
+	'Class:Server/Attribute:oslicence_id+' => '',
+	'Class:Server/Attribute:oslicence_name' => 'OS licentie 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:logicalvolumes_list' => 'Logische volumes',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'Alle logische volumes die verbonden zijn met deze server',
+));
+
+//
+// Class: StorageSystem
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:StorageSystem' => 'Opslag Systeem',
+	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logische volumes',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Alle logische volumes in dit opslag systeem',
+));
+
+//
+// Class: SANSwitch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SANSwitch' => 'SAN Switch',
+	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Apparaten',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch',
+));
+
+//
+// Class: TapeLibrary
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TapeLibrary' => 'Tape Bibliotheek',
+	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'Alle tapes in de tape library',
+));
+
+//
+// Class: NAS
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:NAS' => 'NAS',
+	'Class:NAS+' => '',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Bestandssysteem',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'Alle bestandsystemen in deze NAS',
+));
+
+//
+// Class: PC
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:osfamily_id' => 'OS familie',
+	'Class:PC/Attribute:osfamily_id+' => '',
+	'Class:PC/Attribute:osfamily_name' => 'OS familie naam',
+	'Class:PC/Attribute:osfamily_name+' => '',
+	'Class:PC/Attribute:osversion_id' => 'OS versie',
+	'Class:PC/Attribute:osversion_id+' => '',
+	'Class:PC/Attribute:osversion_name' => 'OS versie naam',
+	'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' => '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',
+	'Class:PC/Attribute:type/Value:laptop+' => 'laptop',
+));
+
+//
+// Class: Printer
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Printer' => 'Printer',
+	'Class:Printer+' => '',
+));
+
+//
+// Class: PowerConnection
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PowerConnection' => 'Stroom Connectie',
+	'Class:PowerConnection+' => '',
+));
+
+//
+// Class: PowerSource
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PowerSource' => 'Stroom bron',
+	'Class:PowerSource+' => '',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
+	'Class:PowerSource/Attribute:pdus_list+' => 'Alle PDUs die gebruikt worden door deze stroom bron',
+));
+
+//
+// Class: PDU
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PDU' => 'PDU',
+	'Class:PDU+' => '',
+	'Class:PDU/Attribute:rack_id' => 'Rack',
+	'Class:PDU/Attribute:rack_id+' => '',
+	'Class:PDU/Attribute:rack_name' => 'Rack naam',
+	'Class:PDU/Attribute:rack_name+' => '',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start',
+	'Class:PDU/Attribute:powerstart_id+' => '',
+	'Class:PDU/Attribute:powerstart_name' => 'Power start naam',
+	'Class:PDU/Attribute:powerstart_name+' => '',
+));
+
+//
+// Class: Peripheral
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Peripheral' => 'Randapparatuur',
+	'Class:Peripheral+' => '',
+));
+
+//
+// Class: Enclosure
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Enclosure' => 'Enclosure',
+	'Class:Enclosure+' => '',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack',
+	'Class:Enclosure/Attribute:rack_id+' => '',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack naam',
+	'Class:Enclosure/Attribute:rack_name+' => '',
+	'Class:Enclosure/Attribute:nb_u' => 'Rack eenheden',
+	'Class:Enclosure/Attribute:nb_u+' => '',
+	'Class:Enclosure/Attribute:device_list' => 'Apparaten',
+	'Class:Enclosure/Attribute:device_list+' => 'Alle apparaten in deze enclosure',
+));
+
+//
+// Class: ApplicationSolution
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ApplicationSolution' => 'Applicatie Oplossing',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle configuratie items dat deze applicatie oplossing tot stand brengt',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Bedrijfsprocessen',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle bedrijfsprocessen die afhankelijk zijn van deze applicatie oplossing',
+	'Class:ApplicationSolution/Attribute:status' => 'Status',
+	'Class:ApplicationSolution/Attribute:status+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'actief',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'actief',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactief',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactief',
+));
+
+//
+// Class: BusinessProcess
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:BusinessProcess' => 'Bedrijfsproces',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Applicatie oplossing',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process',
+	'Class:BusinessProcess/Attribute:status' => 'Status',
+	'Class:BusinessProcess/Attribute:status+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'actief',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'actief',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactief',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactief',
+));
+
+//
+// Class: SoftwareInstance
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SoftwareInstance' => 'Software Instantie',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Attribute:system_id' => 'Systeem',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
+	'Class:SoftwareInstance/Attribute:system_name' => 'Systeem naam',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
+	'Class:SoftwareInstance/Attribute:software_id+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Software naam',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licentie',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licentie naam',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
+	'Class:SoftwareInstance/Attribute:path' => 'Pad',
+	'Class:SoftwareInstance/Attribute:path+' => '',
+	'Class:SoftwareInstance/Attribute:status' => 'Status',
+	'Class:SoftwareInstance/Attribute:status+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'actief',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'actief',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactief',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactief',
+));
+
+//
+// Class: Middleware
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Middleware' => 'Middleware',
+	'Class:Middleware+' => '',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instanties',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Alle middleware instanties die geleverd worden door deze middleware',
+));
+
+//
+// Class: DBServer
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DBServer' => 'DB Server',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas',
+	'Class:DBServer/Attribute:dbschema_list+' => 'Alle  database schemas voor deze DB server',
+));
+
+//
+// Class: WebServer
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:WebServer' => 'Web server',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Web applicaties',
+	'Class:WebServer/Attribute:webapp_list+' => 'Alle  web applicaties die beschikbaar zijn voor deze web server',
+));
+
+//
+// Class: PCSoftware
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PCSoftware' => 'PC Software',
+	'Class:PCSoftware+' => '',
+));
+
+//
+// Class: OtherSoftware
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:OtherSoftware' => 'Overige Software',
+	'Class:OtherSoftware+' => '',
+));
+
+//
+// Class: MiddlewareInstance
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:MiddlewareInstance' => 'Middleware Instantie',
+	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware naam',
+	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
+));
+
+//
+// Class: DatabaseSchema
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DatabaseSchema' => 'Database Schema',
+	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
+	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server naam',
+	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
+));
+
+//
+// Class: WebApplication
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:WebApplication' => 'Web Applicatie',
+	'Class:WebApplication+' => '',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
+	'Class:WebApplication/Attribute:webserver_id+' => '',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web server naam',
+	'Class:WebApplication/Attribute:webserver_name+' => '',
+	'Class:WebApplication/Attribute:url' => 'URL',
+	'Class:WebApplication/Attribute:url+' => '',
+));
+
+
+//
+// Class: VirtualDevice
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:VirtualDevice' => 'Virtuele Apparaat',
+	'Class:VirtualDevice+' => '',
+	'Class:VirtualDevice/Attribute:status' => 'Status',
+	'Class:VirtualDevice/Attribute:status+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementatie',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementatie',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'overbodig',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'overbodig',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'productie',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'productie',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device',
+));
+
+//
+// Class: VirtualHost
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:VirtualHost' => 'Virtual Host',
+	'Class:VirtualHost+' => '',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host',
+));
+
+//
+// Class: Hypervisor
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor+' => '',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
+	'Class:Hypervisor/Attribute:farm_id+' => '',
+	'Class:Hypervisor/Attribute:farm_name' => 'Farm name',
+	'Class:Hypervisor/Attribute:farm_name+' => '',
+	'Class:Hypervisor/Attribute:server_id' => 'Server',
+	'Class:Hypervisor/Attribute:server_id+' => '',
+	'Class:Hypervisor/Attribute:server_name' => 'Server name',
+	'Class:Hypervisor/Attribute:server_name+' => '',
+));
+
+//
+// Class: Farm
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Farm' => 'Farm',
+	'Class:Farm+' => '',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm',
+));
+
+//
+// Class: VirtualMachine
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:VirtualMachine' => 'Virtuele Machine',
+	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host',
+	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name',
+	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS familie',
+	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS familie naam',
+	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version',
+	'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+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name',
+	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
+	'Class:VirtualMachine/Attribute:cpu+' => '',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM',
+	'Class:VirtualMachine/Attribute:ram+' => '',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP',
+	'Class:VirtualMachine/Attribute:managementip+' => '',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces',
+));
+
+//
+// Class: LogicalVolume
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:LogicalVolume' => 'Logisch Volume',
+	'Class:LogicalVolume+' => '',
+	'Class:LogicalVolume/Attribute:name' => 'Naam',
+	'Class:LogicalVolume/Attribute:name+' => '',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
+	'Class:LogicalVolume/Attribute:lun_id+' => '',
+	'Class:LogicalVolume/Attribute:description' => 'Omschrijving',
+	'Class:LogicalVolume/Attribute:description+' => '',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid niveau',
+	'Class:LogicalVolume/Attribute:raid_level+' => '',
+	'Class:LogicalVolume/Attribute:size' => 'Grootte',
+	'Class:LogicalVolume/Attribute:size+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Opslag systeem',
+	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Naam van de opslag systeem',
+	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servers',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'Alle  servers die dit volume gebruiken',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuele apparaten',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Alle virtuele apparaten die dit volume gebruiken',
+));
+
+//
+// Class: lnkServerToVolume
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkServerToVolume' => 'Link Server / Volume',
+	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume naam',
+	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
+	'Class:lnkServerToVolume/Attribute:server_id+' => '',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Server naam',
+	'Class:lnkServerToVolume/Attribute:server_name+' => '',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Grootte gebruikt',
+	'Class:lnkServerToVolume/Attribute:size_used+' => '',
+));
+
+//
+// Class: lnkVirtualDeviceToVolume
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
+	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume naam',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtuele apparaat',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Naam van het virtuele apparaat',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Grootte gebruikt',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
+));
+
+//
+// Class: lnkSanToDatacenterDevice
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
+	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch naam',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Apparaat',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Apparaat naam',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Apparaat fc',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
+));
+
+//
+// Class: Tape
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Tape' => 'Tape',
+	'Class:Tape+' => '',
+	'Class:Tape/Attribute:name' => 'Naam',
+	'Class:Tape/Attribute:name+' => '',
+	'Class:Tape/Attribute:description' => 'Omschrijving',
+	'Class:Tape/Attribute:description+' => '',
+	'Class:Tape/Attribute:size' => 'Grootte',
+	'Class:Tape/Attribute:size+' => '',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape Bibliotheek',
+	'Class:Tape/Attribute:tapelibrary_id+' => '',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Tape Bibliotheek naam',
+	'Class:Tape/Attribute:tapelibrary_name+' => '',
+));
+
+//
+// Class: NASFileSystem
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:NASFileSystem' => 'NAS Bestands Systeem',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Naam',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Omschrijving',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid niveau',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Grootte',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS naam',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
+));
+
+//
+// Class: Software
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Naam',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'verkoper',
+	'Class:Software/Attribute:vendor+' => '',
+	'Class:Software/Attribute:version' => 'Versie',
+	'Class:Software/Attribute:version+' => '',
+	'Class:Software/Attribute:documents_list' => 'Documenten',
+	'Class:Software/Attribute:documents_list+' => 'Alle  documenten gelinkt aan deze software',
+	'Class:Software/Attribute:type' => 'Type',
+	'Class:Software/Attribute:type+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Overige Software',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Overige Software',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instanties',
+	'Class:Software/Attribute:softwareinstance_list+' => 'Alle  software instanties voor deze sofware',
+	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
+	'Class:Software/Attribute:softwarepatch_list+' => 'Alle  patches voor deze software',
+	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenties',
+	'Class:Software/Attribute:softwarelicence_list+' => 'Alle licenties voor deze software',
+));
+
+//
+// Class: Patch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Patch' => 'Patch',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Naam',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:documents_list' => 'Documenten',
+	'Class:Patch/Attribute:documents_list+' => 'Alle documenten gelinkt aan deze patch',
+	'Class:Patch/Attribute:description' => 'Omschrijving',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Type',
+	'Class:Patch/Attribute:finalclass+' => '',
+));
+
+//
+// Class: OSPatch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:OSPatch' => 'OS Patch',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Apparaten',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'Alle systemen waar deze patch is geïnstalleerd',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS versie',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS versie naam',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
+));
+
+//
+// Class: SoftwarePatch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SoftwarePatch' => 'Software Patch',
+	'Class:SoftwarePatch+' => '',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
+	'Class:SoftwarePatch/Attribute:software_id+' => '',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Software naam',
+	'Class:SoftwarePatch/Attribute:software_name+' => '',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instanties',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Alle systemen waar deze patch is geïnstalleerd',
+));
+
+//
+// Class: Licence
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Licence' => 'Licentie',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:name' => 'Naam',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:documents_list' => 'Documenten',
+	'Class:Licence/Attribute:documents_list+' => 'All documenten gelinkt aan deze licentie',
+	'Class:Licence/Attribute:org_id' => 'Organization',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:organization_name' => 'Organisatie naam',
+	'Class:Licence/Attribute:organization_name+' => 'Gemeenschappelijke naam',
+	'Class:Licence/Attribute:usage_limit' => 'Gebruikslimiet',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:description' => 'Omschrijving',
+	'Class:Licence/Attribute:description+' => '',
+	'Class:Licence/Attribute:start_date' => 'Start datum',
+	'Class:Licence/Attribute:start_date+' => '',
+	'Class:Licence/Attribute:end_date' => 'Eind datum',
+	'Class:Licence/Attribute:end_date+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Code',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Lifetime',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'nee',
+	'Class:Licence/Attribute:perpetual/Value:no+' => 'nee',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'ja',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => 'ja',
+	'Class:Licence/Attribute:finalclass' => 'Type',
+	'Class:Licence/Attribute:finalclass+' => '',
+));
+
+//
+// Class: OSLicence
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:OSLicence' => 'OS Licentie',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS versie',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS version naam',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuele machines',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Alle  virtual machines die gebruik maken van deze licentie',
+	'Class:OSLicence/Attribute:servers_list' => 'servers',
+	'Class:OSLicence/Attribute:servers_list+' => 'Alle servers die gebruik maken van deze licentie',
+));
+
+//
+// Class: SoftwareLicence
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SoftwareLicence' => 'Software Licentie',
+	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
+	'Class:SoftwareLicence/Attribute:software_id+' => '',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Software naam',
+	'Class:SoftwareLicence/Attribute:software_name+' => '',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instanties',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Alle systemen die gebruik maken van deze licentie',
+));
+
+//
+// Class: lnkDocumentToLicence
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDocumentToLicence' => 'Link Document / Licentie',
+	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licentie',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licentie naam',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document naam',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Typology' => 'Typology',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Naam',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Type',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: OSVersion
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+		'Class:OSVersion' => 'OS Versie',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS familie',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS familie naam',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
+
+));
+
+//
+// Class: OSFamily
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:OSFamily' => 'OS Familie',
+	'Class:OSFamily+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DocumentType' => 'Document Type',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ContactType' => 'Contact Type',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: Brand
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Brand' => 'Merk',
+	'Class:Brand+' => '',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Fysieke apparaten',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten die corresponderen met dit merk',
+));
+
+//
+// Class: Model
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Model' => 'Model',
+	'Class:Model+' => '',
+	'Class:Model/Attribute:brand_id' => 'Merk',
+	'Class:Model/Attribute:brand_id+' => '',
+	'Class:Model/Attribute:brand_name' => 'Merk naam',
+	'Class:Model/Attribute:brand_name+' => '',
+	'Class:Model/Attribute:type' => 'Apparaat type',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Stroom Bron',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Stroom Bron',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Schijven Set',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Schijven Set',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Telefoon',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Telefoon',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobiele Telefoon',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobiele Telefoon',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netwerk Apparaat',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Netwerk Apparaat',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Randapparatuur',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Randapparatuur',
+	'Class:Model/Attribute:type/Value:Printer' => 'Printer',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Printer',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch',
+	'Class:Model/Attribute:type/Value:Server' => 'Server',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Opslag Systeem',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Opslag Systeem',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Bibliotheek',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Bibliotheek',
+	'Class:Model/Attribute:type/Value:Telephone' => 'Telefoon',
+	'Class:Model/Attribute:type/Value:Telephone+' => 'Telefoon',
+	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices',
+	'Class:Model/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten die corresponderen met dit model',
+));
+
+//
+// Class: NetworkDeviceType
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:NetworkDeviceType' => 'Network Device Type',
+	'Class:NetworkDeviceType+' => '',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netwerk apparaten',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Alle netwerk apparaten die corresponderen met dit type',
+));
+
+//
+// Class: IOSVersion
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:IOSVersion' => 'IOS Versie',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Merk',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Merk naam',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
+));
+
+//
+// Class: lnkDocumentToPatch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
+	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch naam',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document naam',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkSoftwareInstanceToSoftwarePatch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch naam',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instantie',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instantie naam',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToOSPatch
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch naam',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci naam',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkDocumentToSoftware
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
+	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software naam',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document naam',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci naam',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact naam',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkDocumentToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci naam',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document naam',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+));
+
+//
+// Class: Subnet
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Subnet' => 'Subnet',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Attribute:description' => 'Omschrijving',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:subnet_name' => 'Subnet naam',
+	'Class:Subnet/Attribute:subnet_name+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Organisatie',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:org_name' => 'Naam',
+	'Class:Subnet/Attribute:org_name+' => 'Gemeenschappelijke naam',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:Subnet/Attribute:vlans_list' => 'VLANs',
+	'Class:Subnet/Attribute:vlans_list+' => '',
+));
+
+//
+// Class: VLAN
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:VLAN' => 'VLAN',
+	'Class:VLAN+' => '',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Label',
+	'Class:VLAN/Attribute:vlan_tag+' => '',
+	'Class:VLAN/Attribute:description' => 'Omschrijving',
+	'Class:VLAN/Attribute:description+' => '',
+	'Class:VLAN/Attribute:org_id' => 'Organisatie',
+	'Class:VLAN/Attribute:org_id+' => '',
+	'Class:VLAN/Attribute:org_name' => 'Organisatie naam',
+	'Class:VLAN/Attribute:org_name+' => 'Gemeenschappelijke naam',
+	'Class:VLAN/Attribute:subnets_list' => 'Subnets',
+	'Class:VLAN/Attribute:subnets_list+' => '',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Fysieke netwerk interfaces',
+	'Class:VLAN/Attribute:physicalinterfaces_list+' => '',
+));
+
+//
+// Class: lnkSubnetToVLAN
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
+	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet naam',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Label',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
+));
+
+//
+// Class: NetworkInterface
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:NetworkInterface' => 'Netwerk Interface',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:name' => 'Naam',
+	'Class:NetworkInterface/Attribute:name+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Type',
+	'Class:NetworkInterface/Attribute:finalclass+' => '',
+));
+
+//
+// Class: IPInterface
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:IPInterface' => 'IP Interface',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP address',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC address',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Commentaar',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'IP mask',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Snelheid',
+	'Class:IPInterface/Attribute:speed+' => '',
+));
+
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:PhysicalInterface' => 'Fysieke Interface',
+	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Apparaat',
+	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Apparaat naam',
+	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
+	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
+));
+
+//
+// Class: lnkPhysicalInterfaceToVLAN
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Fysieke Interface',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Fysieke Interface Naam',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Apparaat',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Apparaat naam',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Label',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
+));
+
+
+//
+// Class: LogicalInterface
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:LogicalInterface' => 'Logical Interface',
+	'Class:LogicalInterface+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine',
+	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name',
+	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
+));
+
+//
+// Class: FiberChannelInterface
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
+	'Class:FiberChannelInterface+' => '',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Snelheid',
+	'Class:FiberChannelInterface/Attribute:speed+' => '',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topologie',
+	'Class:FiberChannelInterface/Attribute:topology+' => '',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
+	'Class:FiberChannelInterface/Attribute:wwn+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Apparaat',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Apparaat naam',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
+));
+
+//
+// Class: lnkConnectableCIToNetworkDevice
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetwerkApparaat',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netwerk apparaat',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Netwerk apparaat naam',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Verbonden apparaat',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Verbonden apparaat naam',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Netwerk poort',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Apparaat poort',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Connectie type',
+	'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: lnkApplicationSolutionToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicatieOplossing / FunctioneleCI',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applicatie oplossing',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Applicatie oplossing naam',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functioneleci',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functioneleci name',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkApplicationSolutionToBusinessProcess
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / Bedrijfsproces',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Bedrijfsproces',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Bedrijfsproces naam',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Applicatie oplossing',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Applicatie oplossing naam',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkPersonToTeam' => 'Link Persoon / Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team naam',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Persoon',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Persoon naam',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rol',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role naam',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Class: Group
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Group' => 'Groep',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Naam',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Status',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Implementatie',
+	'Class:Group/Attribute:status/Value:implementation+' => 'Implementatie',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Verouderd',
+	'Class:Group/Attribute:status/Value:obsolete+' => 'Verouderd',
+	'Class:Group/Attribute:status/Value:production' => 'Productie',
+	'Class:Group/Attribute:status/Value:production+' => 'Productie',
+	'Class:Group/Attribute:org_id' => 'Organisatie',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:owner_name' => 'Naam',
+	'Class:Group/Attribute:owner_name+' => 'Gemeenschappelijke naam',
+	'Class:Group/Attribute:description' => 'Omschrijving',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Type',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Hoofd Groep',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:parent_name' => 'Naam',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:ci_list' => 'Gelinkte CIs',
+	'Class:Group/Attribute:ci_list+' => 'Alle configuratie items gelinkt aan deze groep',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Moeder Groep',
+	'Class:Group/Attribute:parent_id_friendlyname+' => '',
+));
+
+//
+// Class: lnkGroupToCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkGroupToCI' => 'Link Groep / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Groep',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Naam',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Naam',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Reden',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+));
+
+
+//
+// Application Menu
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:DataAdministration' => 'Data administratie',
+	'Menu:DataAdministration+' => 'Data administratie',
+	'Menu:Catalogs' => 'Catalogus',
+	'Menu:Catalogs+' => 'Data typen',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => 'Audit',
+	'Menu:CSVImport' => 'CSV import',
+	'Menu:CSVImport+' => 'Grootschalige aanmaak of update',
+	'Menu:Organization' => 'Organisaties',
+	'Menu:Organization+' => 'Alle organisaties',
+	'Menu:Application' => 'Applicaties',
+	'Menu:Application+' => 'Alle Applicaties',
+	'Menu:DBServer' => 'Database servers',
+	'Menu:DBServer+' => 'Database servers',
+	'Menu:ConfigManagement' => 'Configuratie Management',
+	'Menu:ConfigManagement+' => 'Configuratie Management',
+	'Menu:ConfigManagementOverview' => 'Overzicht',
+	'Menu:ConfigManagementOverview+' => 'Overzicht',
+	'Menu:Contact' => 'Contacten',
+	'Menu:Contact+' => 'Contacten',
+	'Menu:Contact:Count' => '%1$d contacten',
+	'Menu:Person' => 'Personen',
+	'Menu:Person+' => 'Alle personen',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => 'Alle teams',
+	'Menu:Document' => 'Documenten',
+	'Menu:Document+' => 'Alle documenten',
+	'Menu:Location' => 'Locaties',
+	'Menu:Location+' => 'Alle locaties',
+	'Menu:ConfigManagementCI' => 'Configuratie items',
+	'Menu:ConfigManagementCI+' => 'Configuratie items',
+	'Menu:BusinessProcess' => 'Bedrijfsprocessen',
+	'Menu:BusinessProcess+' => 'Alle bedrijfsprocessen',
+	'Menu:ApplicationSolution' => 'Applicatie oplossing',
+	'Menu:ApplicationSolution+' => 'Alle applicatie oplossingen',
+	'Menu:ConfigManagementSoftware' => 'Applicatie management',
+	'Menu:Licence' => 'Licenties',
+	'Menu:Licence+' => 'Alle licenties',
+	'Menu:Patch' => 'Patches',
+	'Menu:Patch+' => 'Alle patches',
+	'Menu:ApplicationInstance' => 'Geïnstalleerde software',
+	'Menu:ApplicationInstance+' => 'Applicaties en database servers',
+	'Menu:ConfigManagementHardware' => 'Infrastructuur management',
+	'Menu:Subnet' => 'Subnets',
+	'Menu:Subnet+' => 'Alle subnets',
+	'Menu:NetworkDevice' => 'Netwerk apparaten',
+	'Menu:NetworkDevice+' => 'Alle network apparaten',
+	'Menu:Server' => 'Servers',
+	'Menu:Server+' => 'Alle servers',
+	'Menu:Printer' => 'Printers',
+	'Menu:Printer+' => 'Alle printers',
+	'Menu:MobilePhone' => 'Mobiele telefoons',
+	'Menu:MobilePhone+' => 'Alle mobiele telefoons',
+	'Menu:PC' => 'Personal computers',
+	'Menu:PC+' => 'Alle Personal computers',
+	'Menu:NewContact' => 'Nieuw contact',
+	'Menu:NewContact+' => 'Nieuw contact',
+	'Menu:SearchContacts' => 'Zoeken naar contacten',
+	'Menu:SearchContacts+' => 'Zoeken naar contacten',
+	'Menu:NewCI' => 'Nieuw CI',
+	'Menu:NewCI+' => 'Nieuw CI',
+	'Menu:SearchCIs' => 'Zoek naar CIs',
+	'Menu:SearchCIs+' => 'Zoek naar CIs',
+	'Menu:ConfigManagement:Devices' => 'Apparaten',
+	'Menu:ConfigManagement:AllDevices' => 'Infrastructuur',
+	'Menu:ConfigManagement:virtualization' => 'Virtualisatie',
+	'Menu:ConfigManagement:EndUsers' => 'Eindgebruiker apparaten',
+	'Menu:ConfigManagement:SWAndApps' => 'Software en applicaties',
+	'Menu:ConfigManagement:Misc' => 'Diversen',
+	'Menu:Group' => 'Groepen van CIs',
+	'Menu:Group+' => 'Groepen van CIs',
+	'Menu:ConfigManagement:Shortcuts' => 'Snelkoppelingen',
+	'Menu:ConfigManagement:AllContacts' => 'Alle contacten: %1$d',
+	'Menu:Typology' => 'Typologie configuratie',
+	'Menu:Typology+' => 'Typologie configuratie',
+	'Menu:OSVersion' => 'OS versies',
+	'Menu:OSVersion+' => '',
+	'Menu:Software' => 'Software catalogus',
+	'Menu:Software+' => 'Software catalogus',
+	'UI_WelcomeMenu_AllConfigItems' => 'Samenvatting',
+	'Menu:ConfigManagement:Typology' => 'Typologie configuratie',
+
+));
+
+
+// Add translation for Fieldsets
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Server:baseinfo' => 'Globale informatie',
+	'Server:Date' => 'Datum',
+	'Server:moreinfo' => 'Meer informatie',
+	'Server:otherinfo' => 'Andere informatie',
+	'Person:info' => 'Globale informatie',
+	'Person:notifiy' => 'Notificatie',
+	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
+	'Class:Document:PreviewTab' => 'Preview',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
+	'Class:Farm/Attribute:redundancy' => 'High availability~~',
+	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
+	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
+	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
+	'Server:power' => 'Power supply~~',
+));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
index eb5f57951..672b9c3b1 100755
--- a/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php
@@ -1,1887 +1,1887 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Relation:impacts/Description' => 'Elementos impactados por',
-	'Relation:impacts/DownStream' => 'Impacto...',
-	'Relation:impacts/DownStream+' => 'Elementos impactados por',
-	'Relation:impacts/UpStream' => 'Depende de...',
-	'Relation:impacts/UpStream+' => 'Elementos estes, que dependem deste elemento',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Elementos estes, que dependem deste elemento',
-	'Relation:depends on/DownStream' => 'Depende de...',
-	'Relation:depends on/UpStream' => 'Impactos...',
-));
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-
-//
-// Class: Organization
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Organization' => 'Organização',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Nome',
-	'Class:Organization/Attribute:name+' => 'Nome comum',
-	'Class:Organization/Attribute:code' => 'Código',
-	'Class:Organization/Attribute:code+' => 'Código organização (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Estado',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Ativo',
-	'Class:Organization/Attribute:status/Value:active+' => 'Ativo',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Organization/Attribute:parent_id' => 'Principal',
-	'Class:Organization/Attribute:parent_id+' => 'Organização principal',
-	'Class:Organization/Attribute:parent_name' => 'Nome principal',
-	'Class:Organization/Attribute:parent_name+' => 'Nome da organização principal',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Principal',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organização principal',
-));
-
-//
-// Class: Location
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Location' => 'Localidade',
-	'Class:Location+' => 'Qualquer tipo de localização: Região, País, Cidade, Lugar, Edifício, Andar, Sala, Rack,...',
-	'Class:Location/Attribute:name' => 'Nome',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Estado',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Ativo',
-	'Class:Location/Attribute:status/Value:active+' => 'Ativo',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Location/Attribute:org_id' => 'Organização',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Nome organização',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Endereço',
-	'Class:Location/Attribute:address+' => 'Endereço',
-	'Class:Location/Attribute:postal_code' => 'CEP',
-	'Class:Location/Attribute:postal_code+' => 'CEP',
-	'Class:Location/Attribute:city' => 'Cidade',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'País',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Dispositivos',
-	'Class:Location/Attribute:physicaldevice_list+' => 'Todos os dispositivos desta localidade',
-	'Class:Location/Attribute:person_list' => 'Contatos',
-	'Class:Location/Attribute:person_list+' => 'Todos os contatos desta localidade',
-));
-
-//
-// Class: Contact
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Contact' => 'Contato',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Nome',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Estado',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Ativo',
-	'Class:Contact/Attribute:status/Value:active+' => 'Ativo',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Inativo',
-	'Class:Contact/Attribute:org_id' => 'Organização',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Nome organização',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefone',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Notificação',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'Não',
-	'Class:Contact/Attribute:notify/Value:no+' => 'Não',
-	'Class:Contact/Attribute:notify/Value:yes' => 'Sim',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'Sim',
-	'Class:Contact/Attribute:function' => 'Função',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => 'Todos os itens de configuração vinculado a esse contato',
-	'Class:Contact/Attribute:finalclass' => 'Tipo contato',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Person' => 'Pessoa',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:name' => 'Último nome',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:first_name' => 'Primeiro nome',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Número colaborador',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Celular',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Localidade',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:location_name' => 'Nome localidade',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => 'Gerente',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => 'Nome gerente',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:team_list' => 'Equipes',
-	'Class:Person/Attribute:team_list+' => 'Todas as equipes que essa pessoa pertence',
-	'Class:Person/Attribute:tickets_list' => 'Solicitações',
-	'Class:Person/Attribute:tickets_list+' => 'Todos as solicitações que essa pessoa solicitou',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Nome amigável gerente',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Team' => 'Equipe',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Membros',
-	'Class:Team/Attribute:persons_list+' => 'Todas as pessoas que pertencem a esta equipe',
-	'Class:Team/Attribute:tickets_list' => 'Solicitações',
-	'Class:Team/Attribute:tickets_list+' => 'Todas as solicitações atribuídas a esta equipe',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Document' => 'Documento',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Nome',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organização',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Nome organização',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Tipo documento',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Nome tipo documento',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:description' => 'Descrição',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Estado',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Rascunho',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Publicado',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => 'Todos os itens de configuração vinculados a esse documento',
-	'Class:Document/Attribute:contracts_list' => 'Contratos',
-	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
-	'Class:Document/Attribute:finalclass' => 'Tipo documento',
-	'Class:Document/Attribute:finalclass+' => '',
-));
-
-//
-// Class: DocumentFile
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentFile' => 'Arquivo',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Arquivo',
-	'Class:DocumentFile/Attribute:file+' => '',
-));
-
-//
-// Class: DocumentNote
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentNote' => 'Texto',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Texto',
-	'Class:DocumentNote/Attribute:text+' => '',
-));
-
-//
-// Class: DocumentWeb
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentWeb' => 'Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-));
-
-//
-// Class: FunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FunctionalCI' => 'CI',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Nome',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:description' => 'Descrição',
-	'Class:FunctionalCI/Attribute:description+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => 'Organização',
-	'Class:FunctionalCI/Attribute:org_id+' => '',
-	'Class:FunctionalCI/Attribute:organization_name' => 'Nome organização',
-	'Class:FunctionalCI/Attribute:organization_name+' => 'Nome comum',
-	'Class:FunctionalCI/Attribute:business_criticity' => 'Criticidade negócio',
-	'Class:FunctionalCI/Attribute:business_criticity+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'Alta',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'Alta',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'Baixa',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'Baixa',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'Média',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'Média',
-	'Class:FunctionalCI/Attribute:move2production' => 'Data ir para produção',
-	'Class:FunctionalCI/Attribute:move2production+' => '',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Contatos',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'Todos os contatos para esse item de configuração',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Documentos',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'Todos os documentos vinculados a este item de configuração',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluções de aplicações',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Todas as soluções de aplicação, dependente desse item de configuração',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrato provedor(a)',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Todos os contratos para esse item de configuração',
-	'Class:FunctionalCI/Attribute:services_list' => 'Serviços',
-	'Class:FunctionalCI/Attribute:services_list+' => 'Todos os serviços impactados por esse item de configuração',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'Todos os softwares instalados neste item de configuração',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
-	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo CI',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-));
-
-//
-// Class: PhysicalDevice
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PhysicalDevice' => 'Dispositivos físicos',
-	'Class:PhysicalDevice+' => '',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número serial',
-	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Localidade',
-	'Class:PhysicalDevice/Attribute:location_id+' => '',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Nome localidade',
-	'Class:PhysicalDevice/Attribute:location_name+' => '',
-	'Class:PhysicalDevice/Attribute:status' => 'Estado',
-	'Class:PhysicalDevice/Attribute:status+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Produção',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'Produção',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Suporte',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'Suporte',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Fabricante',
-	'Class:PhysicalDevice/Attribute:brand_id+' => '',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Nome fabricante',
-	'Class:PhysicalDevice/Attribute:brand_name+' => '',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Modelo',
-	'Class:PhysicalDevice/Attribute:model_id+' => '',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Nome modelo',
-	'Class:PhysicalDevice/Attribute:model_name+' => '',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Número do ativo',
-	'Class:PhysicalDevice/Attribute:asset_number+' => '',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Data da compra',
-	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Fim da garantia',
-	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
-));
-
-//
-// Class: Rack
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Rack' => 'Rack',
-	'Class:Rack+' => '',
-	'Class:Rack/Attribute:nb_u' => 'Unidades',
-	'Class:Rack/Attribute:nb_u+' => '',
-	'Class:Rack/Attribute:device_list' => 'Dispositivos',
-	'Class:Rack/Attribute:device_list+' => 'Todos os dispositivos físicos empilhados neste rack',
-	'Class:Rack/Attribute:enclosure_list' => 'Gavetas',
-	'Class:Rack/Attribute:enclosure_list+' => 'Todas as gavetas neste rack',
-));
-
-//
-// Class: TelephonyCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TelephonyCI' => 'Telefonia',
-	'Class:TelephonyCI+' => '',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Número telefone',
-	'Class:TelephonyCI/Attribute:phonenumber+' => '',
-));
-
-//
-// Class: Phone
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Phone' => 'Telefone',
-	'Class:Phone+' => '',
-));
-
-//
-// Class: MobilePhone
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:MobilePhone' => 'Telefone celular',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-));
-
-//
-// Class: IPPhone
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:IPPhone' => 'Telefone IP',
-	'Class:IPPhone+' => '',
-));
-
-//
-// Class: Tablet
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Tablet' => 'Tablet',
-	'Class:Tablet+' => '',
-));
-
-//
-// Class: ConnectableCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ConnectableCI' => 'Conectividades',
-	'Class:ConnectableCI+' => 'Físicos',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Dispositivo de rede',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Todos os dispositivos de rede conectados nesse dispositivo',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interface de rede',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Todas as interfaces de rede',
-));
-
-//
-// Class: DatacenterDevice
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DatacenterDevice' => 'Dispositivos Datacenter',
-	'Class:DatacenterDevice+' => '',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
-	'Class:DatacenterDevice/Attribute:rack_id+' => '',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Nome rack',
-	'Class:DatacenterDevice/Attribute:rack_name+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Gaveta',
-	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Nome gaveta',
-	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Unidades',
-	'Class:DatacenterDevice/Attribute:nb_u+' => '',
-	'Class:DatacenterDevice/Attribute:managementip' => 'IP gerenciamento',
-	'Class:DatacenterDevice/Attribute:managementip+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'Fonte energia A',
-	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'Nome fonte energia A',
-	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'Fonte energia B',
-	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'Nome fonte energia B',
-	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Portas FC',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Todas as portas Fiber Channel para esse dispositivo',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'Todos os switches SAN vinculados para esse dispositivo',
-));
-
-//
-// Class: NetworkDevice
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NetworkDevice' => 'Dispositivo Rede',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo rede',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nome tipo rede',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Dispositivos',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Todos os dispositivos vinculados para esse dispositivo de rede',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'Versão IOS',
-	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'Nome versão IOS',
-	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-));
-
-//
-// Class: Server
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Server' => 'Servidor',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:osfamily_id' => 'Família OS',
-	'Class:Server/Attribute:osfamily_id+' => '',
-	'Class:Server/Attribute:osfamily_name' => 'Nome família OS',
-	'Class:Server/Attribute:osfamily_name+' => '',
-	'Class:Server/Attribute:osversion_id' => 'Versão OS',
-	'Class:Server/Attribute:osversion_id+' => '',
-	'Class:Server/Attribute:osversion_name' => 'Nome versão OS',
-	'Class:Server/Attribute:osversion_name+' => '',
-	'Class:Server/Attribute:oslicence_id' => 'Licença OS',
-	'Class:Server/Attribute:oslicence_id+' => '',
-	'Class:Server/Attribute:oslicence_name' => 'Nome licença OS',
-	'Class:Server/Attribute:oslicence_name+' => '',
-	'Class:Server/Attribute:cpu' => 'CPU',
-	'Class:Server/Attribute:cpu+' => '',
-	'Class:Server/Attribute:ram' => 'RAM',
-	'Class:Server/Attribute:ram+' => '',
-	'Class:Server/Attribute:logicalvolumes_list' => 'Volumes lógicos',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'Todos os volumoes lógicos vinculados para esse servidor',
-));
-
-//
-// Class: StorageSystem
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:StorageSystem' => 'Sistema Storage',
-	'Class:StorageSystem+' => '',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes lógicos',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Todos os volumes lógicos neste sistema storage',
-));
-
-//
-// Class: SANSwitch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SANSwitch' => 'Switch SAN',
-	'Class:SANSwitch+' => '',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Todos os dispositivos vinculados para esse switch SAN',
-));
-
-//
-// Class: TapeLibrary
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TapeLibrary' => 'Tape Library',
-	'Class:TapeLibrary+' => '',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Fitas',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'Todas as fitas para essa Tape library',
-));
-
-//
-// Class: NAS
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Sistemas de arquivos',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'Todos os sistemas de arquivos para esse NAS',
-));
-
-//
-// Class: PC
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:osfamily_id' => 'Família OS',
-	'Class:PC/Attribute:osfamily_id+' => '',
-	'Class:PC/Attribute:osfamily_name' => 'Nome família OS',
-	'Class:PC/Attribute:osfamily_name+' => '',
-	'Class:PC/Attribute:osversion_id' => 'Versão OS',
-	'Class:PC/Attribute:osversion_id+' => '',
-	'Class:PC/Attribute:osversion_name' => 'Nome versão OS',
-	'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' => 'Tipo',
-	'Class:PC/Attribute:type+' => '',
-	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
-	'Class:PC/Attribute:type/Value:desktop+' => 'Desktop',
-	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
-	'Class:PC/Attribute:type/Value:laptop+' => 'Laptop',
-));
-
-//
-// Class: Printer
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Printer' => 'Impressoras',
-	'Class:Printer+' => '',
-));
-
-//
-// Class: PowerConnection
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PowerConnection' => 'Conexão energia',
-	'Class:PowerConnection+' => '',
-));
-
-//
-// Class: PowerSource
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PowerSource' => 'Fonte energia',
-	'Class:PowerSource+' => '',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
-	'Class:PowerSource/Attribute:pdus_list+' => 'Todos os PDUs utilizando essa fonte de energia',
-));
-
-//
-// Class: PDU
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '',
-	'Class:PDU/Attribute:rack_id' => 'Rack',
-	'Class:PDU/Attribute:rack_id+' => '',
-	'Class:PDU/Attribute:rack_name' => 'Nome rack',
-	'Class:PDU/Attribute:rack_name+' => '',
-	'Class:PDU/Attribute:powerstart_id' => 'Fonte energia',
-	'Class:PDU/Attribute:powerstart_id+' => '',
-	'Class:PDU/Attribute:powerstart_name' => 'Nome fonte de energia',
-	'Class:PDU/Attribute:powerstart_name+' => '',
-));
-
-//
-// Class: Peripheral
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Peripheral' => 'Periféricos',
-	'Class:Peripheral+' => '',
-));
-
-//
-// Class: Enclosure
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Enclosure' => 'Gaveta',
-	'Class:Enclosure+' => '',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack',
-	'Class:Enclosure/Attribute:rack_id+' => '',
-	'Class:Enclosure/Attribute:rack_name' => 'Nome rack',
-	'Class:Enclosure/Attribute:rack_name+' => '',
-	'Class:Enclosure/Attribute:nb_u' => 'Unidades',
-	'Class:Enclosure/Attribute:nb_u+' => '',
-	'Class:Enclosure/Attribute:device_list' => 'Dispositivos',
-	'Class:Enclosure/Attribute:device_list+' => 'Todos os dispositivos para essa gaveta',
-));
-
-//
-// Class: ApplicationSolution
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ApplicationSolution' => 'Solução aplicação',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Todos os itens de configuração que compõem essa solução de aplicação',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Processos de negócio',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Todos os processos do negócio dependente para essa solução de aplicação',
-	'Class:ApplicationSolution/Attribute:status' => 'Estado',
-	'Class:ApplicationSolution/Attribute:status+' => '',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Ativo',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'Ativo',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'Inativo',
-));
-
-//
-// Class: BusinessProcess
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:BusinessProcess' => 'Processos de negócio',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Solução aplicação',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Todas as soluções de aplicações que impactam este processo de negócio',
-	'Class:BusinessProcess/Attribute:status' => 'Estado',
-	'Class:BusinessProcess/Attribute:status+' => '',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'Ativo',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => 'Ativo',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'Inativo',
-));
-
-//
-// Class: SoftwareInstance
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SoftwareInstance' => 'Instância Software',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Attribute:system_id' => 'Sistema',
-	'Class:SoftwareInstance/Attribute:system_id+' => '',
-	'Class:SoftwareInstance/Attribute:system_name' => 'Nome sistema',
-	'Class:SoftwareInstance/Attribute:system_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
-	'Class:SoftwareInstance/Attribute:software_id+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => 'Nome software',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Licença software',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Nome licença software',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
-	'Class:SoftwareInstance/Attribute:path' => 'Caminho',
-	'Class:SoftwareInstance/Attribute:path+' => '',
-	'Class:SoftwareInstance/Attribute:status' => 'Estado',
-	'Class:SoftwareInstance/Attribute:status+' => '',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'Ativo',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'Ativo',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'Inativo',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'Inativo',
-));
-
-//
-// Class: Middleware
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => '',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Instância Middleware',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Todos as instância middleware fornecida por essa middleware',
-));
-
-//
-// Class: DBServer
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DBServer' => 'Serviço DB',
-	'Class:DBServer+' => '',
-	'Class:DBServer/Attribute:dbschema_list' => 'Schemas DB',
-	'Class:DBServer/Attribute:dbschema_list+' => 'Todos os schemas para esse banco de dados',
-));
-
-//
-// Class: WebServer
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:WebServer' => 'Serviço Web',
-	'Class:WebServer+' => '',
-	'Class:WebServer/Attribute:webapp_list' => 'Aplicações Web',
-	'Class:WebServer/Attribute:webapp_list+' => 'Todas as aplicações web disponíveis para esse serviço web',
-));
-
-//
-// Class: PCSoftware
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PCSoftware' => 'PC Software',
-	'Class:PCSoftware+' => '',
-));
-
-//
-// Class: OtherSoftware
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:OtherSoftware' => 'Outros software',
-	'Class:OtherSoftware+' => '',
-));
-
-//
-// Class: MiddlewareInstance
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:MiddlewareInstance' => 'Instância Middleware',
-	'Class:MiddlewareInstance+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
-	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nome middleware',
-	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
-));
-
-//
-// Class: DatabaseSchema
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DatabaseSchema' => 'Schema Banco Dados',
-	'Class:DatabaseSchema+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Serviço DB',
-	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Nome serviço DB',
-	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
-));
-
-//
-// Class: WebApplication
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:WebApplication' => 'Aplicação Web',
-	'Class:WebApplication+' => '',
-	'Class:WebApplication/Attribute:webserver_id' => 'Serviço Web',
-	'Class:WebApplication/Attribute:webserver_id+' => '',
-	'Class:WebApplication/Attribute:webserver_name' => 'Nome serviço Web',
-	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:url' => 'URL',
-	'Class:WebApplication/Attribute:url+' => '',
-));
-
-//
-// Class: VirtualDevice
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:VirtualDevice' => 'Dispositivo Virtual',
-	'Class:VirtualDevice+' => '',
-	'Class:VirtualDevice/Attribute:status' => 'Estado',
-	'Class:VirtualDevice/Attribute:status+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'Produção',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => 'Produção',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Suporte',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'Suporte',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Volume lógico',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Todos os volumes lógicos vinculados para esse dispositivo',
-));
-
-//
-// Class: VirtualHost
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:VirtualHost' => 'Host virtual',
-	'Class:VirtualHost+' => '',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Máquinas Virtuais',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Todas as máquinas virtuais hospedados para esse Host',
-));
-
-//
-// Class: Hypervisor
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '',
-	'Class:Hypervisor/Attribute:farm_id' => 'Cluster/HA',
-	'Class:Hypervisor/Attribute:farm_id+' => '',
-	'Class:Hypervisor/Attribute:farm_name' => 'Nome Cluster/HA',
-	'Class:Hypervisor/Attribute:farm_name+' => '',
-	'Class:Hypervisor/Attribute:server_id' => 'Servidor',
-	'Class:Hypervisor/Attribute:server_id+' => '',
-	'Class:Hypervisor/Attribute:server_name' => 'Nome servidor',
-	'Class:Hypervisor/Attribute:server_name+' => '',
-));
-
-//
-// Class: Farm
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Farm' => 'Cluster/HA',
-	'Class:Farm+' => '',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
-	'Class:Farm/Attribute:hypervisor_list+' => 'Todos os hypervisors que compoem esse Cluster/HA',
-));
-
-//
-// Class: VirtualMachine
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:VirtualMachine' => 'Máquina virtual',
-	'Class:VirtualMachine+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host virtual',
-	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Nome Host virtual',
-	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'Família OS',
-	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'Nome família OS',
-	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'Versão OS',
-	'Class:VirtualMachine/Attribute:osversion_id+' => '',
-	'Class:VirtualMachine/Attribute:osversion_name' => 'Nome versão OS',
-	'Class:VirtualMachine/Attribute:osversion_name+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_id' => 'Licença OS',
-	'Class:VirtualMachine/Attribute:oslicence_id+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'Nome licença OS',
-	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
-	'Class:VirtualMachine/Attribute:cpu+' => '',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM',
-	'Class:VirtualMachine/Attribute:ram+' => '',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Placas de rede',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Todas as placas de rede',
-));
-
-//
-// Class: LogicalVolume
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:LogicalVolume' => 'Volume lógico',
-	'Class:LogicalVolume+' => '',
-	'Class:LogicalVolume/Attribute:name' => 'Nome',
-	'Class:LogicalVolume/Attribute:name+' => '',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
-	'Class:LogicalVolume/Attribute:lun_id+' => '',
-	'Class:LogicalVolume/Attribute:description' => 'Descrição',
-	'Class:LogicalVolume/Attribute:description+' => '',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid nível',
-	'Class:LogicalVolume/Attribute:raid_level+' => '',
-	'Class:LogicalVolume/Attribute:size' => 'Tamanho',
-	'Class:LogicalVolume/Attribute:size+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Sistema arquivo',
-	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Nome sistema arquivo',
-	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servidores',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'Todos os servidores usando esse volume',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Dispositivos virtuais',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Todos os dispositivos virtuais usando esse volume',
-));
-
-//
-// Class: lnkServerToVolume
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkServerToVolume' => 'Link Servidor / Volume',
-	'Class:lnkServerToVolume+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Nome volume',
-	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Servidor',
-	'Class:lnkServerToVolume/Attribute:server_id+' => '',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Nome servidor',
-	'Class:lnkServerToVolume/Attribute:server_name+' => '',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Tamanho usado',
-	'Class:lnkServerToVolume/Attribute:size_used+' => '',
-));
-
-//
-// Class: lnkVirtualDeviceToVolume
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkVirtualDeviceToVolume' => 'Link Dispositivo Virtual / Volume',
-	'Class:lnkVirtualDeviceToVolume+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Nome volume',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Dispositivo virtual',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Nome dispositivo virtual',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Tamanho usado',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
-));
-
-//
-// Class: lnkSanToDatacenterDevice
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Dispositivo Datacenter',
-	'Class:lnkSanToDatacenterDevice+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Nome switch SAN',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Dispositivo',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Nome Dispositivo',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'FC SAN',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Dispositivo FC',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
-));
-
-//
-// Class: Tape
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Tape' => 'Fita',
-	'Class:Tape+' => '',
-	'Class:Tape/Attribute:name' => 'Nome',
-	'Class:Tape/Attribute:name+' => '',
-	'Class:Tape/Attribute:description' => 'Descrição',
-	'Class:Tape/Attribute:description+' => '',
-	'Class:Tape/Attribute:size' => 'Tamanho',
-	'Class:Tape/Attribute:size+' => '',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library',
-	'Class:Tape/Attribute:tapelibrary_id+' => '',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Nome Tape library',
-	'Class:Tape/Attribute:tapelibrary_name+' => '',
-));
-
-//
-// Class: NASFileSystem
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NASFileSystem' => 'Sistema arquivo NAS',
-	'Class:NASFileSystem+' => '',
-	'Class:NASFileSystem/Attribute:name' => 'Nome',
-	'Class:NASFileSystem/Attribute:name+' => '',
-	'Class:NASFileSystem/Attribute:description' => 'Descrição',
-	'Class:NASFileSystem/Attribute:description+' => '',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid nível',
-	'Class:NASFileSystem/Attribute:raid_level+' => '',
-	'Class:NASFileSystem/Attribute:size' => 'Tamanho',
-	'Class:NASFileSystem/Attribute:size+' => '',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NASFileSystem/Attribute:nas_id+' => '',
-	'Class:NASFileSystem/Attribute:nas_name' => 'Nome NAS',
-	'Class:NASFileSystem/Attribute:nas_name+' => '',
-));
-
-//
-// Class: Software
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Software' => 'Software',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => 'Nome',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:vendor' => 'Fabricante',
-	'Class:Software/Attribute:vendor+' => '',
-	'Class:Software/Attribute:version' => 'Versão',
-	'Class:Software/Attribute:version+' => '',
-	'Class:Software/Attribute:documents_list' => 'Documentos',
-	'Class:Software/Attribute:documents_list+' => 'Todos os documentos vinculados a esse software',
-	'Class:Software/Attribute:type' => 'Tipo',
-	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBServer' => 'Serviço DB',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'Serviço DB',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Outro Software',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Outro Software',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Serviço Web',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Serviço Web',
-	'Class:Software/Attribute:softwareinstance_list' => 'Instâncias Software',
-	'Class:Software/Attribute:softwareinstance_list+' => 'Todas as instâncias software para esse software',
-	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
-	'Class:Software/Attribute:softwarepatch_list+' => 'Todos os patchs para esse software',
-	'Class:Software/Attribute:softwarelicence_list' => 'Licença Software',
-	'Class:Software/Attribute:softwarelicence_list+' => 'Todas as licenças software para esse software',
-));
-
-//
-// Class: Patch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Patch' => 'Patch',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Nome',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:documents_list' => 'Documentos',
-	'Class:Patch/Attribute:documents_list+' => 'Todos os documentos vinculados a esse patch',
-	'Class:Patch/Attribute:description' => 'Descrição',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Tipo',
-	'Class:Patch/Attribute:finalclass+' => '',
-));
-
-//
-// Class: OSPatch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:OSPatch' => 'OS Patch',
-	'Class:OSPatch+' => '',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'Todos os sistemas onde o patch está instalado',
-	'Class:OSPatch/Attribute:osversion_id' => 'Versão OS',
-	'Class:OSPatch/Attribute:osversion_id+' => '',
-	'Class:OSPatch/Attribute:osversion_name' => 'Nome versão OS',
-	'Class:OSPatch/Attribute:osversion_name+' => '',
-));
-
-//
-// Class: SoftwarePatch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SoftwarePatch' => 'Software Patch',
-	'Class:SoftwarePatch+' => '',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
-	'Class:SoftwarePatch/Attribute:software_id+' => '',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Nome software',
-	'Class:SoftwarePatch/Attribute:software_name+' => '',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Instâncias Software',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Todos os sistemas onde software patch está instalado',
-));
-
-//
-// Class: Licence
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Licence' => 'Licença',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:name' => 'Nome',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:documents_list' => 'Documentos',
-	'Class:Licence/Attribute:documents_list+' => 'Todos os documentos vinculados a essa licença',
-	'Class:Licence/Attribute:org_id' => 'Organização',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:organization_name' => 'Nome organização',
-	'Class:Licence/Attribute:organization_name+' => 'Nome comum',
-	'Class:Licence/Attribute:usage_limit' => 'Limite usado',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:description' => 'Descrição',
-	'Class:Licence/Attribute:description+' => '',
-	'Class:Licence/Attribute:start_date' => 'Data início',
-	'Class:Licence/Attribute:start_date+' => '',
-	'Class:Licence/Attribute:end_date' => 'Data final',
-	'Class:Licence/Attribute:end_date+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Chave',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:perpetual' => 'Permanente',
-	'Class:Licence/Attribute:perpetual+' => '',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'Não',
-	'Class:Licence/Attribute:perpetual/Value:no+' => 'Não',
-	'Class:Licence/Attribute:perpetual/Value:yes' => 'Sim',
-	'Class:Licence/Attribute:perpetual/Value:yes+' => 'sim',
-	'Class:Licence/Attribute:finalclass' => 'Tipo',
-	'Class:Licence/Attribute:finalclass+' => '',
-));
-
-//
-// Class: OSLicence
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:OSLicence' => 'Licença OS',
-	'Class:OSLicence+' => '',
-	'Class:OSLicence/Attribute:osversion_id' => 'Versão OS',
-	'Class:OSLicence/Attribute:osversion_id+' => '',
-	'Class:OSLicence/Attribute:osversion_name' => 'Nome versão OS',
-	'Class:OSLicence/Attribute:osversion_name+' => '',
-	'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas virtuais',
-	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Todas as máquinas virtuais onde essa licença é usada',
-	'Class:OSLicence/Attribute:servers_list' => 'servidores',
-	'Class:OSLicence/Attribute:servers_list+' => 'Todos os servidores onde essa licença é usada',
-));
-
-//
-// Class: SoftwareLicence
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SoftwareLicence' => 'Licença software',
-	'Class:SoftwareLicence+' => '',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
-	'Class:SoftwareLicence/Attribute:software_id+' => '',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Nome software',
-	'Class:SoftwareLicence/Attribute:software_name+' => '',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Instâncias software',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Todos os sistemas onde essa licença é usada',
-));
-
-//
-// Class: lnkDocumentToLicence
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToLicence' => 'Link Documento / Licença',
-	'Class:lnkDocumentToLicence+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licença',
-	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nome licença',
-	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
-));
-
-//
-// Class: Typology
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Typology' => 'Tipologia',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Nome',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Tipo',
-	'Class:Typology/Attribute:finalclass+' => '',
-));
-
-//
-// Class: OSVersion
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:OSVersion' => 'Versão OS',
-	'Class:OSVersion+' => '',
-	'Class:OSVersion/Attribute:osfamily_id' => 'Família OS',
-	'Class:OSVersion/Attribute:osfamily_id+' => '',
-	'Class:OSVersion/Attribute:osfamily_name' => 'Nome família OS',
-	'Class:OSVersion/Attribute:osfamily_name+' => '',
-));
-
-//
-// Class: OSFamily
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:OSFamily' => 'Família OS',
-	'Class:OSFamily+' => '',
-));
-
-//
-// Class: DocumentType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DocumentType' => 'Tipo documento',
-	'Class:DocumentType+' => '',
-));
-
-//
-// Class: ContactType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ContactType' => 'Tipo contato',
-	'Class:ContactType+' => '',
-));
-
-//
-// Class: Brand
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Brand' => 'Fabricante',
-	'Class:Brand+' => '',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivos físicos',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a essa fabricante',
-));
-
-//
-// Class: Model
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Model' => 'Modelo',
-	'Class:Model+' => '',
-	'Class:Model/Attribute:brand_id' => 'Fabricante',
-	'Class:Model/Attribute:brand_id+' => '',
-	'Class:Model/Attribute:brand_name' => 'Nome fabricante',
-	'Class:Model/Attribute:brand_name+' => '',
-	'Class:Model/Attribute:type' => 'Tipo dispositivo',
-	'Class:Model/Attribute:type+' => '',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Fonte energia',
-	'Class:Model/Attribute:type/Value:PowerSource+' => 'Fonte energia',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Array disco',
-	'Class:Model/Attribute:type/Value:DiskArray+' => 'Array disco',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Gaveta',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Gaveta',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'Telefone IP',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'Telefone IP',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Telefone celular',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Telefone celular',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Dispositivo rede',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Dispositivo rede',
-	'Class:Model/Attribute:type/Value:PC' => 'PC',
-	'Class:Model/Attribute:type/Value:PC+' => 'PC',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Periférico',
-	'Class:Model/Attribute:type/Value:Peripheral+' => 'Periférico',
-	'Class:Model/Attribute:type/Value:Printer' => 'Impressora',
-	'Class:Model/Attribute:type/Value:Printer+' => 'Impressora',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'Switch SAN',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'Switch SAN',
-	'Class:Model/Attribute:type/Value:Server' => 'Servidor',
-	'Class:Model/Attribute:type/Value:Server+' => 'Servidor',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Sistema Storage',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Sistema Storage',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
-	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library',
-	'Class:Model/Attribute:type/Value:Phone' => 'Telefone',
-	'Class:Model/Attribute:type/Value:Phone+' => 'Telefone',
-	'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo físico',
-	'Class:Model/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a esse modelo',
-));
-
-//
-// Class: NetworkDeviceType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NetworkDeviceType' => 'Tipo dispositivo rede',
-	'Class:NetworkDeviceType+' => '',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Dispositivo rede',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Todos os dispositivo de rede correspondentes a esse tipo',
-));
-
-//
-// Class: IOSVersion
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:IOSVersion' => 'Versão IOS',
-	'Class:IOSVersion+' => '',
-	'Class:IOSVersion/Attribute:brand_id' => 'Fabricante',
-	'Class:IOSVersion/Attribute:brand_id+' => '',
-	'Class:IOSVersion/Attribute:brand_name' => 'Nome fabricante',
-	'Class:IOSVersion/Attribute:brand_name+' => '',
-));
-
-//
-// Class: lnkDocumentToPatch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToPatch' => 'Link Documento / Patch',
-	'Class:lnkDocumentToPatch+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nome patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkSoftwareInstanceToSoftwarePatch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Instância Software / Software Patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Nome software patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Instância software',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Nome instância software',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToOSPatch
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToOSPatch' => 'Link CI / OS patch',
-	'Class:lnkFunctionalCIToOSPatch+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Nome OS patch',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: lnkDocumentToSoftware
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToSoftware' => 'Link Documento / Software',
-	'Class:lnkDocumentToSoftware+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
-	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nome software',
-	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkDocumentToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToFunctionalCI' => 'Link Documento / CI',
-	'Class:lnkDocumentToFunctionalCI+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
-));
-
-//
-// Class: Subnet
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Subnet' => 'Sub-rede',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Attribute:description' => 'Descrição',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:subnet_name' => 'Nome Sub-rede',
-	'Class:Subnet/Attribute:subnet_name+' => '',
-	'Class:Subnet/Attribute:org_id' => 'Organização',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:org_name' => 'Nome',
-	'Class:Subnet/Attribute:org_name+' => 'Nome comum',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'Máscara rede',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-	'Class:Subnet/Attribute:vlans_list' => 'VLANs',
-	'Class:Subnet/Attribute:vlans_list+' => '',
-));
-
-//
-// Class: VLAN
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:VLAN' => 'VLAN',
-	'Class:VLAN+' => '',
-	'Class:VLAN/Attribute:vlan_tag' => 'Nome VLAN',
-	'Class:VLAN/Attribute:vlan_tag+' => '',
-	'Class:VLAN/Attribute:description' => 'Descrição',
-	'Class:VLAN/Attribute:description+' => '',
-	'Class:VLAN/Attribute:org_id' => 'Organização',
-	'Class:VLAN/Attribute:org_id+' => '',
-	'Class:VLAN/Attribute:org_name' => 'Nome organização',
-	'Class:VLAN/Attribute:org_name+' => 'Nome comum',
-	'Class:VLAN/Attribute:subnets_list' => 'Sub-redes',
-	'Class:VLAN/Attribute:subnets_list+' => '',
-	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Interfaces rede física',
-	'Class:VLAN/Attribute:physicalinterfaces_list+' => '',
-));
-
-//
-// Class: lnkSubnetToVLAN
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSubnetToVLAN' => 'Link Sub-rede / VLAN',
-	'Class:lnkSubnetToVLAN+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Sub-rede',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP sub-rede',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Nome sub-rede',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'Nome VLAN',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
-));
-
-//
-// Class: NetworkInterface
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NetworkInterface' => 'Placa de rede',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Attribute:name' => 'Nome',
-	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Tipo',
-	'Class:NetworkInterface/Attribute:finalclass+' => '',
-));
-
-//
-// Class: IPInterface
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:IPInterface' => 'Endereço IP',
-	'Class:IPInterface+' => '',
-	'Class:IPInterface/Attribute:ipaddress' => 'Endereço IP',
-	'Class:IPInterface/Attribute:ipaddress+' => '',
-
-
-	'Class:IPInterface/Attribute:macaddress' => 'Endereço MAC',
-	'Class:IPInterface/Attribute:macaddress+' => '',
-	'Class:IPInterface/Attribute:comment' => 'Comentário',
-	'Class:IPInterface/Attribute:coment+' => '',
-	'Class:IPInterface/Attribute:ipgateway' => 'Gateway',
-	'Class:IPInterface/Attribute:ipgateway+' => '',
-	'Class:IPInterface/Attribute:ipmask' => 'Máscara de rede',
-	'Class:IPInterface/Attribute:ipmask+' => '',
-	'Class:IPInterface/Attribute:speed' => 'Velocidade',
-	'Class:IPInterface/Attribute:speed+' => '',
-));
-
-//
-// Class: PhysicalInterface
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PhysicalInterface' => 'Placa física',
-	'Class:PhysicalInterface+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Dispositivo',
-	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nome dispositivo',
-	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
-	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
-));
-
-//
-// Class: lnkPhysicalInterfaceToVLAN
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Link Interfaces físicas / VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface física',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nome interface física',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Dispositivo',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Nome dispositivo',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'Nome VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
-));
-
-//
-// Class: LogicalInterface
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:LogicalInterface' => 'Placa lógica',
-	'Class:LogicalInterface+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Máquina virtual',
-	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Nome máquina virtual',
-	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
-));
-
-//
-// Class: FiberChannelInterface
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FiberChannelInterface' => 'Placa Fiber Channel',
-	'Class:FiberChannelInterface+' => '',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Velocidade',
-	'Class:FiberChannelInterface/Attribute:speed+' => '',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topologia',
-	'Class:FiberChannelInterface/Attribute:topology+' => '',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
-	'Class:FiberChannelInterface/Attribute:wwn+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Dispositivo',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Nome dispositivo',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
-));
-
-//
-// Class: lnkConnectableCIToNetworkDevice
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
-	'Class:lnkConnectableCIToNetworkDevice+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Dispositivo rede',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Nome dispositivo rede',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Dispositivo conectado',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Nome dispositivo conectado',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Porta de rede',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Porta dispositivo',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Tipo conexão',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Link down',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'Link down',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Link up',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'Link up',
-));
-
-//
-// Class: lnkApplicationSolutionToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / CI',
-	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solução aplicação',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Nome solução aplicação',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: lnkApplicationSolutionToBusinessProcess
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
-	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processos de negócio',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Nome processos de negócio',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Solução aplicação',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Nome solução aplicação',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
-));
-
-//
-// Class: lnkPersonToTeam
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkPersonToTeam' => 'Link Pessoa / Equipe',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nome equipe',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Pessoa',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Nome pessoa',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Função',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Nome função',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-));
-
-//
-// Class: Group
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Group' => 'Grupo',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => 'Nome',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => 'Status',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:Group/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:Group/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Group/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:Group/Attribute:status/Value:production' => 'Produção',
-	'Class:Group/Attribute:status/Value:production+' => 'Produção',
-	'Class:Group/Attribute:org_id' => 'Organização',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => 'Nome',
-	'Class:Group/Attribute:owner_name+' => 'Nome comum',
-	'Class:Group/Attribute:description' => 'Descrição',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Tipo',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Grupo principal',
-
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:parent_name' => 'Nome',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => 'CIs ligados',
-	'Class:Group/Attribute:ci_list+' => 'Todos os itens de configuração associada a esse grupo',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Grupo principal',
-	'Class:Group/Attribute:parent_id_friendlyname+' => '',
-));
-
-//
-// Class: lnkGroupToCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkGroupToCI' => 'Link Grupo / CI',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupo',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Nome',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Nome',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Razão',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-));
-
-
-//
-// Application Menu
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-'Menu:DataAdministration' => 'Administração Dados',
-'Menu:DataAdministration+' => 'Administração Dados',
-'Menu:Catalogs' => 'Catálogos',
-'Menu:Catalogs+' => 'Tipos dados',
-'Menu:Audit' => 'Auditoria',
-'Menu:Audit+' => 'Auditoria',
-'Menu:CSVImport' => 'Importar CSV',
-'Menu:CSVImport+' => 'Criação ou atualização em massa',
-'Menu:Organization' => 'Organizações',
-'Menu:Organization+' => 'Todas organizações',
-'Menu:Application' => 'Applicações',
-'Menu:Application+' => 'Todas aplicações',
-'Menu:DBServer' => 'Serviços Banco de Dados',
-'Menu:DBServer+' => 'Serviços Banco de Dados',
-'Menu:ConfigManagement' => 'Gerenciamento Configurações',
-'Menu:ConfigManagement+' => 'Gerenciamento Configurações',
-'Menu:ConfigManagementOverview' => 'Visão geral',
-'Menu:ConfigManagementOverview+' => 'Visão geral',
-'Menu:Contact' => 'Contatos',
-'Menu:Contact+' => 'Contatos',
-'Menu:Contact:Count' => '%1$d contatos',
-'Menu:Person' => 'Pessoas',
-'Menu:Person+' => 'Todas pessoas',
-'Menu:Team' => 'Equipes',
-'Menu:Team+' => 'Todas equipes',
-'Menu:Document' => 'Documentos',
-'Menu:Document+' => 'Todos documentos',
-'Menu:Location' => 'Localidades',
-'Menu:Location+' => 'Todas localidades',
-'Menu:ConfigManagementCI' => 'Itens de configuração',
-'Menu:ConfigManagementCI+' => 'Itens de configuração',
-'Menu:BusinessProcess' => 'Processos de negócios',
-'Menu:BusinessProcess+' => 'Todos processos de negócios',
-'Menu:ApplicationSolution' => 'Solução aplicação',
-'Menu:ApplicationSolution+' => 'Todas soluções aplicações',
-'Menu:ConfigManagementSoftware' => 'Gerenciamento aplicações',
-'Menu:Licence' => 'Licenças',
-'Menu:Licence+' => 'Todoas licenças',
-'Menu:Patch' => 'Patches',
-'Menu:Patch+' => 'Todos patches',
-'Menu:ApplicationInstance' => 'Software instalados',
-'Menu:ApplicationInstance+' => 'Serviços aplicações e Banco de dados',
-'Menu:ConfigManagementHardware' => 'Gerenciamento Infra-estrutura',
-'Menu:Subnet' => 'Sub-redes',
-'Menu:Subnet+' => 'Todas sub-redes',
-'Menu:NetworkDevice' => 'Dispositivos rede',
-'Menu:NetworkDevice+' => 'Todos dispositivos rede',
-'Menu:Server' => 'Servidores',
-'Menu:Server+' => 'Todos servidores',
-'Menu:Printer' => 'Impressoras',
-'Menu:Printer+' => 'Todas impressoras',
-'Menu:MobilePhone' => 'Telefone celulares',
-'Menu:MobilePhone+' => 'Todos telefone celulares',
-'Menu:PC' => 'Estação de trabalho',
-'Menu:PC+' => 'Todas estação de trabalho',
-'Menu:NewContact' => 'Novo contato',
-'Menu:NewContact+' => 'Novo contato',
-'Menu:SearchContacts' => 'Pesquisar por contatos',
-'Menu:SearchContacts+' => 'Pesquisar por contatos',
-'Menu:NewCI' => 'Novo CI',
-'Menu:NewCI+' => 'Novo CI',
-'Menu:SearchCIs' => 'Pesquisar por CIs',
-'Menu:SearchCIs+' => 'Pesquisar por CIs',
-'Menu:ConfigManagement:Devices' => 'Dispositivos',
-'Menu:ConfigManagement:AllDevices' => 'Infra-estrutura',
-'Menu:ConfigManagement:virtualization' => 'Virtualização',
-'Menu:ConfigManagement:EndUsers' => 'Dispositivos usuário final',
-'Menu:ConfigManagement:SWAndApps' => 'Software e aplicações',
-'Menu:ConfigManagement:Misc' => 'Diversos',
-'Menu:Group' => 'Grupos de CIs',
-'Menu:Group+' => 'Grupos de CIs',
-'Menu:ConfigManagement:Shortcuts' => 'Atalhos',
-'Menu:ConfigManagement:AllContacts' => 'Todos contatos: %1$d',
-'Menu:Typology' => 'Configuração tipologia',
-'Menu:Typology+' => 'Configuração tipologia',
-'Menu:OSVersion' => 'Versão OS',
-'Menu:OSVersion+' => '',
-'Menu:Software' => 'Catálogo software',
-'Menu:Software+' => 'Catálogo software',
-'UI_WelcomeMenu_AllConfigItems' => 'Índice',
-'Menu:ConfigManagement:Typology' => 'Configuração tipologia',
-
-));
-
-
-// Add translation for Fieldsets
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-'Server:baseinfo' => 'Informações gerais',
-'Server:Date' => 'Data',
-'Server:moreinfo' => 'Mais informações',
-'Server:otherinfo' => 'Outras informações',
-'Person:info' => 'Informações gerais',
-'Person:notifiy' => 'Notificação',
-'Class:Subnet/Tab:IPUsage' => 'IP usado',
-'Class:Subnet/Tab:IPUsage-explain' => 'Placas de rede contendo IP na faixa: <em>%1$s</em> para <em>%2$s</em>',
-'Class:Subnet/Tab:FreeIPs' => 'IPs livres',
-'Class:Subnet/Tab:FreeIPs-count' => 'IPs livres: %1$s',
-'Class:Subnet/Tab:FreeIPs-explain' => 'Aqui uma faixa de 10 endereços IPs livres',
-'Class:Document:PreviewTab' => 'Visualização',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
-	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
-	'Class:Farm/Attribute:redundancy' => 'High availability~~',
-	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
-	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
-	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
-	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
-	'Server:power' => 'Power supply~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Relation:impacts/Description' => 'Elementos impactados por',
+	'Relation:impacts/DownStream' => 'Impacto...',
+	'Relation:impacts/DownStream+' => 'Elementos impactados por',
+	'Relation:impacts/UpStream' => 'Depende de...',
+	'Relation:impacts/UpStream+' => 'Elementos estes, que dependem deste elemento',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Elementos estes, que dependem deste elemento',
+	'Relation:depends on/DownStream' => 'Depende de...',
+	'Relation:depends on/UpStream' => 'Impactos...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+
+//
+// Class: Organization
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Organization' => 'Organização',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Nome',
+	'Class:Organization/Attribute:name+' => 'Nome comum',
+	'Class:Organization/Attribute:code' => 'Código',
+	'Class:Organization/Attribute:code+' => 'Código organização (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Estado',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Ativo',
+	'Class:Organization/Attribute:status/Value:active+' => 'Ativo',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Inativo',
+	'Class:Organization/Attribute:parent_id' => 'Principal',
+	'Class:Organization/Attribute:parent_id+' => 'Organização principal',
+	'Class:Organization/Attribute:parent_name' => 'Nome principal',
+	'Class:Organization/Attribute:parent_name+' => 'Nome da organização principal',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Principal',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organização principal',
+));
+
+//
+// Class: Location
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Location' => 'Localidade',
+	'Class:Location+' => 'Qualquer tipo de localização: Região, País, Cidade, Lugar, Edifício, Andar, Sala, Rack,...',
+	'Class:Location/Attribute:name' => 'Nome',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Estado',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Ativo',
+	'Class:Location/Attribute:status/Value:active+' => 'Ativo',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Inativo',
+	'Class:Location/Attribute:org_id' => 'Organização',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Nome organização',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Endereço',
+	'Class:Location/Attribute:address+' => 'Endereço',
+	'Class:Location/Attribute:postal_code' => 'CEP',
+	'Class:Location/Attribute:postal_code+' => 'CEP',
+	'Class:Location/Attribute:city' => 'Cidade',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'País',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Dispositivos',
+	'Class:Location/Attribute:physicaldevice_list+' => 'Todos os dispositivos desta localidade',
+	'Class:Location/Attribute:person_list' => 'Contatos',
+	'Class:Location/Attribute:person_list+' => 'Todos os contatos desta localidade',
+));
+
+//
+// Class: Contact
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Contact' => 'Contato',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Nome',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Estado',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Ativo',
+	'Class:Contact/Attribute:status/Value:active+' => 'Ativo',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Inativo',
+	'Class:Contact/Attribute:org_id' => 'Organização',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Nome organização',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefone',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Notificação',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'Não',
+	'Class:Contact/Attribute:notify/Value:no+' => 'Não',
+	'Class:Contact/Attribute:notify/Value:yes' => 'Sim',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'Sim',
+	'Class:Contact/Attribute:function' => 'Função',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => 'Todos os itens de configuração vinculado a esse contato',
+	'Class:Contact/Attribute:finalclass' => 'Tipo contato',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Person' => 'Pessoa',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:name' => 'Último nome',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:first_name' => 'Primeiro nome',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Número colaborador',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Celular',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Localidade',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:location_name' => 'Nome localidade',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_id' => 'Gerente',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:manager_name' => 'Nome gerente',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:team_list' => 'Equipes',
+	'Class:Person/Attribute:team_list+' => 'Todas as equipes que essa pessoa pertence',
+	'Class:Person/Attribute:tickets_list' => 'Solicitações',
+	'Class:Person/Attribute:tickets_list+' => 'Todos as solicitações que essa pessoa solicitou',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Nome amigável gerente',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Team' => 'Equipe',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Membros',
+	'Class:Team/Attribute:persons_list+' => 'Todas as pessoas que pertencem a esta equipe',
+	'Class:Team/Attribute:tickets_list' => 'Solicitações',
+	'Class:Team/Attribute:tickets_list+' => 'Todas as solicitações atribuídas a esta equipe',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Document' => 'Documento',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Nome',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organização',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Nome organização',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Tipo documento',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Nome tipo documento',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:description' => 'Descrição',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Estado',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Rascunho',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Publicado',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => 'Todos os itens de configuração vinculados a esse documento',
+	'Class:Document/Attribute:contracts_list' => 'Contratos',
+	'Class:Document/Attribute:contracts_list+' => 'Todos os contratos vinculados com esse documento',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => 'Todos os serviços vinculados a esse documento',
+	'Class:Document/Attribute:finalclass' => 'Tipo documento',
+	'Class:Document/Attribute:finalclass+' => '',
+));
+
+//
+// Class: DocumentFile
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentFile' => 'Arquivo',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Arquivo',
+	'Class:DocumentFile/Attribute:file+' => '',
+));
+
+//
+// Class: DocumentNote
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentNote' => 'Texto',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Texto',
+	'Class:DocumentNote/Attribute:text+' => '',
+));
+
+//
+// Class: DocumentWeb
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentWeb' => 'Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FunctionalCI' => 'CI',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Nome',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:description' => 'Descrição',
+	'Class:FunctionalCI/Attribute:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Organização',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:organization_name' => 'Nome organização',
+	'Class:FunctionalCI/Attribute:organization_name+' => 'Nome comum',
+	'Class:FunctionalCI/Attribute:business_criticity' => 'Criticidade negócio',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'Alta',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'Alta',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'Baixa',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'Baixa',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'Média',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'Média',
+	'Class:FunctionalCI/Attribute:move2production' => 'Data ir para produção',
+	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Contatos',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'Todos os contatos para esse item de configuração',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Documentos',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'Todos os documentos vinculados a este item de configuração',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluções de aplicações',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Todas as soluções de aplicação, dependente desse item de configuração',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contrato provedor(a)',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Todos os contratos para esse item de configuração',
+	'Class:FunctionalCI/Attribute:services_list' => 'Serviços',
+	'Class:FunctionalCI/Attribute:services_list+' => 'Todos os serviços impactados por esse item de configuração',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'Todos os softwares instalados neste item de configuração',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
+	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo CI',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+));
+
+//
+// Class: PhysicalDevice
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PhysicalDevice' => 'Dispositivos físicos',
+	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número serial',
+	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Localidade',
+	'Class:PhysicalDevice/Attribute:location_id+' => '',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Nome localidade',
+	'Class:PhysicalDevice/Attribute:location_name+' => '',
+	'Class:PhysicalDevice/Attribute:status' => 'Estado',
+	'Class:PhysicalDevice/Attribute:status+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Produção',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'Produção',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Suporte',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'Suporte',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Fabricante',
+	'Class:PhysicalDevice/Attribute:brand_id+' => '',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Nome fabricante',
+	'Class:PhysicalDevice/Attribute:brand_name+' => '',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Modelo',
+	'Class:PhysicalDevice/Attribute:model_id+' => '',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Nome modelo',
+	'Class:PhysicalDevice/Attribute:model_name+' => '',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Número do ativo',
+	'Class:PhysicalDevice/Attribute:asset_number+' => '',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Data da compra',
+	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Fim da garantia',
+	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
+));
+
+//
+// Class: Rack
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Rack' => 'Rack',
+	'Class:Rack+' => '',
+	'Class:Rack/Attribute:nb_u' => 'Unidades',
+	'Class:Rack/Attribute:nb_u+' => '',
+	'Class:Rack/Attribute:device_list' => 'Dispositivos',
+	'Class:Rack/Attribute:device_list+' => 'Todos os dispositivos físicos empilhados neste rack',
+	'Class:Rack/Attribute:enclosure_list' => 'Gavetas',
+	'Class:Rack/Attribute:enclosure_list+' => 'Todas as gavetas neste rack',
+));
+
+//
+// Class: TelephonyCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TelephonyCI' => 'Telefonia',
+	'Class:TelephonyCI+' => '',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Número telefone',
+	'Class:TelephonyCI/Attribute:phonenumber+' => '',
+));
+
+//
+// Class: Phone
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Phone' => 'Telefone',
+	'Class:Phone+' => '',
+));
+
+//
+// Class: MobilePhone
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:MobilePhone' => 'Telefone celular',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+));
+
+//
+// Class: IPPhone
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:IPPhone' => 'Telefone IP',
+	'Class:IPPhone+' => '',
+));
+
+//
+// Class: Tablet
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Tablet' => 'Tablet',
+	'Class:Tablet+' => '',
+));
+
+//
+// Class: ConnectableCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ConnectableCI' => 'Conectividades',
+	'Class:ConnectableCI+' => 'Físicos',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Dispositivo de rede',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Todos os dispositivos de rede conectados nesse dispositivo',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interface de rede',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Todas as interfaces de rede',
+));
+
+//
+// Class: DatacenterDevice
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DatacenterDevice' => 'Dispositivos Datacenter',
+	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
+	'Class:DatacenterDevice/Attribute:rack_id+' => '',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Nome rack',
+	'Class:DatacenterDevice/Attribute:rack_name+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Gaveta',
+	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Nome gaveta',
+	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Unidades',
+	'Class:DatacenterDevice/Attribute:nb_u+' => '',
+	'Class:DatacenterDevice/Attribute:managementip' => 'IP gerenciamento',
+	'Class:DatacenterDevice/Attribute:managementip+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'Fonte energia A',
+	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'Nome fonte energia A',
+	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'Fonte energia B',
+	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'Nome fonte energia B',
+	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Portas FC',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Todas as portas Fiber Channel para esse dispositivo',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'Todos os switches SAN vinculados para esse dispositivo',
+));
+
+//
+// Class: NetworkDevice
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:NetworkDevice' => 'Dispositivo Rede',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo rede',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nome tipo rede',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Dispositivos',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Todos os dispositivos vinculados para esse dispositivo de rede',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'Versão IOS',
+	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'Nome versão IOS',
+	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+));
+
+//
+// Class: Server
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Server' => 'Servidor',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:osfamily_id' => 'Família OS',
+	'Class:Server/Attribute:osfamily_id+' => '',
+	'Class:Server/Attribute:osfamily_name' => 'Nome família OS',
+	'Class:Server/Attribute:osfamily_name+' => '',
+	'Class:Server/Attribute:osversion_id' => 'Versão OS',
+	'Class:Server/Attribute:osversion_id+' => '',
+	'Class:Server/Attribute:osversion_name' => 'Nome versão OS',
+	'Class:Server/Attribute:osversion_name+' => '',
+	'Class:Server/Attribute:oslicence_id' => 'Licença OS',
+	'Class:Server/Attribute:oslicence_id+' => '',
+	'Class:Server/Attribute:oslicence_name' => 'Nome licença OS',
+	'Class:Server/Attribute:oslicence_name+' => '',
+	'Class:Server/Attribute:cpu' => 'CPU',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => 'RAM',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Volumes lógicos',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'Todos os volumoes lógicos vinculados para esse servidor',
+));
+
+//
+// Class: StorageSystem
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:StorageSystem' => 'Sistema Storage',
+	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes lógicos',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Todos os volumes lógicos neste sistema storage',
+));
+
+//
+// Class: SANSwitch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SANSwitch' => 'Switch SAN',
+	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Todos os dispositivos vinculados para esse switch SAN',
+));
+
+//
+// Class: TapeLibrary
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TapeLibrary' => 'Tape Library',
+	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Fitas',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'Todas as fitas para essa Tape library',
+));
+
+//
+// Class: NAS
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:NAS' => 'NAS',
+	'Class:NAS+' => '',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Sistemas de arquivos',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'Todos os sistemas de arquivos para esse NAS',
+));
+
+//
+// Class: PC
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:osfamily_id' => 'Família OS',
+	'Class:PC/Attribute:osfamily_id+' => '',
+	'Class:PC/Attribute:osfamily_name' => 'Nome família OS',
+	'Class:PC/Attribute:osfamily_name+' => '',
+	'Class:PC/Attribute:osversion_id' => 'Versão OS',
+	'Class:PC/Attribute:osversion_id+' => '',
+	'Class:PC/Attribute:osversion_name' => 'Nome versão OS',
+	'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' => 'Tipo',
+	'Class:PC/Attribute:type+' => '',
+	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
+	'Class:PC/Attribute:type/Value:desktop+' => 'Desktop',
+	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
+	'Class:PC/Attribute:type/Value:laptop+' => 'Laptop',
+));
+
+//
+// Class: Printer
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Printer' => 'Impressoras',
+	'Class:Printer+' => '',
+));
+
+//
+// Class: PowerConnection
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PowerConnection' => 'Conexão energia',
+	'Class:PowerConnection+' => '',
+));
+
+//
+// Class: PowerSource
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PowerSource' => 'Fonte energia',
+	'Class:PowerSource+' => '',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
+	'Class:PowerSource/Attribute:pdus_list+' => 'Todos os PDUs utilizando essa fonte de energia',
+));
+
+//
+// Class: PDU
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PDU' => 'PDU',
+	'Class:PDU+' => '',
+	'Class:PDU/Attribute:rack_id' => 'Rack',
+	'Class:PDU/Attribute:rack_id+' => '',
+	'Class:PDU/Attribute:rack_name' => 'Nome rack',
+	'Class:PDU/Attribute:rack_name+' => '',
+	'Class:PDU/Attribute:powerstart_id' => 'Fonte energia',
+	'Class:PDU/Attribute:powerstart_id+' => '',
+	'Class:PDU/Attribute:powerstart_name' => 'Nome fonte de energia',
+	'Class:PDU/Attribute:powerstart_name+' => '',
+));
+
+//
+// Class: Peripheral
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Peripheral' => 'Periféricos',
+	'Class:Peripheral+' => '',
+));
+
+//
+// Class: Enclosure
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Enclosure' => 'Gaveta',
+	'Class:Enclosure+' => '',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack',
+	'Class:Enclosure/Attribute:rack_id+' => '',
+	'Class:Enclosure/Attribute:rack_name' => 'Nome rack',
+	'Class:Enclosure/Attribute:rack_name+' => '',
+	'Class:Enclosure/Attribute:nb_u' => 'Unidades',
+	'Class:Enclosure/Attribute:nb_u+' => '',
+	'Class:Enclosure/Attribute:device_list' => 'Dispositivos',
+	'Class:Enclosure/Attribute:device_list+' => 'Todos os dispositivos para essa gaveta',
+));
+
+//
+// Class: ApplicationSolution
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ApplicationSolution' => 'Solução aplicação',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Todos os itens de configuração que compõem essa solução de aplicação',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Processos de negócio',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Todos os processos do negócio dependente para essa solução de aplicação',
+	'Class:ApplicationSolution/Attribute:status' => 'Estado',
+	'Class:ApplicationSolution/Attribute:status+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Ativo',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'Ativo',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'Inativo',
+));
+
+//
+// Class: BusinessProcess
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:BusinessProcess' => 'Processos de negócio',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Solução aplicação',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Todas as soluções de aplicações que impactam este processo de negócio',
+	'Class:BusinessProcess/Attribute:status' => 'Estado',
+	'Class:BusinessProcess/Attribute:status+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'Ativo',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'Ativo',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'Inativo',
+));
+
+//
+// Class: SoftwareInstance
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SoftwareInstance' => 'Instância Software',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Attribute:system_id' => 'Sistema',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
+	'Class:SoftwareInstance/Attribute:system_name' => 'Nome sistema',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
+	'Class:SoftwareInstance/Attribute:software_id+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Nome software',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Licença software',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Nome licença software',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
+	'Class:SoftwareInstance/Attribute:path' => 'Caminho',
+	'Class:SoftwareInstance/Attribute:path+' => '',
+	'Class:SoftwareInstance/Attribute:status' => 'Estado',
+	'Class:SoftwareInstance/Attribute:status+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'Ativo',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'Ativo',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'Inativo',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'Inativo',
+));
+
+//
+// Class: Middleware
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Middleware' => 'Middleware',
+	'Class:Middleware+' => '',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Instância Middleware',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Todos as instância middleware fornecida por essa middleware',
+));
+
+//
+// Class: DBServer
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DBServer' => 'Serviço DB',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'Schemas DB',
+	'Class:DBServer/Attribute:dbschema_list+' => 'Todos os schemas para esse banco de dados',
+));
+
+//
+// Class: WebServer
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:WebServer' => 'Serviço Web',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Aplicações Web',
+	'Class:WebServer/Attribute:webapp_list+' => 'Todas as aplicações web disponíveis para esse serviço web',
+));
+
+//
+// Class: PCSoftware
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PCSoftware' => 'PC Software',
+	'Class:PCSoftware+' => '',
+));
+
+//
+// Class: OtherSoftware
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:OtherSoftware' => 'Outros software',
+	'Class:OtherSoftware+' => '',
+));
+
+//
+// Class: MiddlewareInstance
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:MiddlewareInstance' => 'Instância Middleware',
+	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nome middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
+));
+
+//
+// Class: DatabaseSchema
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DatabaseSchema' => 'Schema Banco Dados',
+	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Serviço DB',
+	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'Nome serviço DB',
+	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
+));
+
+//
+// Class: WebApplication
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:WebApplication' => 'Aplicação Web',
+	'Class:WebApplication+' => '',
+	'Class:WebApplication/Attribute:webserver_id' => 'Serviço Web',
+	'Class:WebApplication/Attribute:webserver_id+' => '',
+	'Class:WebApplication/Attribute:webserver_name' => 'Nome serviço Web',
+	'Class:WebApplication/Attribute:webserver_name+' => '',
+	'Class:WebApplication/Attribute:url' => 'URL',
+	'Class:WebApplication/Attribute:url+' => '',
+));
+
+//
+// Class: VirtualDevice
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:VirtualDevice' => 'Dispositivo Virtual',
+	'Class:VirtualDevice+' => '',
+	'Class:VirtualDevice/Attribute:status' => 'Estado',
+	'Class:VirtualDevice/Attribute:status+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'Produção',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'Produção',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Suporte',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'Suporte',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Volume lógico',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Todos os volumes lógicos vinculados para esse dispositivo',
+));
+
+//
+// Class: VirtualHost
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:VirtualHost' => 'Host virtual',
+	'Class:VirtualHost+' => '',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Máquinas Virtuais',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Todas as máquinas virtuais hospedados para esse Host',
+));
+
+//
+// Class: Hypervisor
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor+' => '',
+	'Class:Hypervisor/Attribute:farm_id' => 'Cluster/HA',
+	'Class:Hypervisor/Attribute:farm_id+' => '',
+	'Class:Hypervisor/Attribute:farm_name' => 'Nome Cluster/HA',
+	'Class:Hypervisor/Attribute:farm_name+' => '',
+	'Class:Hypervisor/Attribute:server_id' => 'Servidor',
+	'Class:Hypervisor/Attribute:server_id+' => '',
+	'Class:Hypervisor/Attribute:server_name' => 'Nome servidor',
+	'Class:Hypervisor/Attribute:server_name+' => '',
+));
+
+//
+// Class: Farm
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Farm' => 'Cluster/HA',
+	'Class:Farm+' => '',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
+	'Class:Farm/Attribute:hypervisor_list+' => 'Todos os hypervisors que compoem esse Cluster/HA',
+));
+
+//
+// Class: VirtualMachine
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:VirtualMachine' => 'Máquina virtual',
+	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host virtual',
+	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Nome Host virtual',
+	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'Família OS',
+	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'Nome família OS',
+	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'Versão OS',
+	'Class:VirtualMachine/Attribute:osversion_id+' => '',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'Nome versão OS',
+	'Class:VirtualMachine/Attribute:osversion_name+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'Licença OS',
+	'Class:VirtualMachine/Attribute:oslicence_id+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'Nome licença OS',
+	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
+	'Class:VirtualMachine/Attribute:cpu+' => '',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM',
+	'Class:VirtualMachine/Attribute:ram+' => '',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Placas de rede',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Todas as placas de rede',
+));
+
+//
+// Class: LogicalVolume
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:LogicalVolume' => 'Volume lógico',
+	'Class:LogicalVolume+' => '',
+	'Class:LogicalVolume/Attribute:name' => 'Nome',
+	'Class:LogicalVolume/Attribute:name+' => '',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
+	'Class:LogicalVolume/Attribute:lun_id+' => '',
+	'Class:LogicalVolume/Attribute:description' => 'Descrição',
+	'Class:LogicalVolume/Attribute:description+' => '',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid nível',
+	'Class:LogicalVolume/Attribute:raid_level+' => '',
+	'Class:LogicalVolume/Attribute:size' => 'Tamanho',
+	'Class:LogicalVolume/Attribute:size+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Sistema arquivo',
+	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Nome sistema arquivo',
+	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servidores',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'Todos os servidores usando esse volume',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Dispositivos virtuais',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Todos os dispositivos virtuais usando esse volume',
+));
+
+//
+// Class: lnkServerToVolume
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkServerToVolume' => 'Link Servidor / Volume',
+	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Nome volume',
+	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Servidor',
+	'Class:lnkServerToVolume/Attribute:server_id+' => '',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Nome servidor',
+	'Class:lnkServerToVolume/Attribute:server_name+' => '',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Tamanho usado',
+	'Class:lnkServerToVolume/Attribute:size_used+' => '',
+));
+
+//
+// Class: lnkVirtualDeviceToVolume
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkVirtualDeviceToVolume' => 'Link Dispositivo Virtual / Volume',
+	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Nome volume',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Dispositivo virtual',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Nome dispositivo virtual',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Tamanho usado',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
+));
+
+//
+// Class: lnkSanToDatacenterDevice
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Dispositivo Datacenter',
+	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'Nome switch SAN',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Dispositivo',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Nome Dispositivo',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'FC SAN',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Dispositivo FC',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
+));
+
+//
+// Class: Tape
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Tape' => 'Fita',
+	'Class:Tape+' => '',
+	'Class:Tape/Attribute:name' => 'Nome',
+	'Class:Tape/Attribute:name+' => '',
+	'Class:Tape/Attribute:description' => 'Descrição',
+	'Class:Tape/Attribute:description+' => '',
+	'Class:Tape/Attribute:size' => 'Tamanho',
+	'Class:Tape/Attribute:size+' => '',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library',
+	'Class:Tape/Attribute:tapelibrary_id+' => '',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Nome Tape library',
+	'Class:Tape/Attribute:tapelibrary_name+' => '',
+));
+
+//
+// Class: NASFileSystem
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:NASFileSystem' => 'Sistema arquivo NAS',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Nome',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Descrição',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid nível',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Tamanho',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'Nome NAS',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
+));
+
+//
+// Class: Software
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Nome',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'Fabricante',
+	'Class:Software/Attribute:vendor+' => '',
+	'Class:Software/Attribute:version' => 'Versão',
+	'Class:Software/Attribute:version+' => '',
+	'Class:Software/Attribute:documents_list' => 'Documentos',
+	'Class:Software/Attribute:documents_list+' => 'Todos os documentos vinculados a esse software',
+	'Class:Software/Attribute:type' => 'Tipo',
+	'Class:Software/Attribute:type+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'Serviço DB',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'Serviço DB',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Outro Software',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Outro Software',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Serviço Web',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Serviço Web',
+	'Class:Software/Attribute:softwareinstance_list' => 'Instâncias Software',
+	'Class:Software/Attribute:softwareinstance_list+' => 'Todas as instâncias software para esse software',
+	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
+	'Class:Software/Attribute:softwarepatch_list+' => 'Todos os patchs para esse software',
+	'Class:Software/Attribute:softwarelicence_list' => 'Licença Software',
+	'Class:Software/Attribute:softwarelicence_list+' => 'Todas as licenças software para esse software',
+));
+
+//
+// Class: Patch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Patch' => 'Patch',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Nome',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:documents_list' => 'Documentos',
+	'Class:Patch/Attribute:documents_list+' => 'Todos os documentos vinculados a esse patch',
+	'Class:Patch/Attribute:description' => 'Descrição',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Tipo',
+	'Class:Patch/Attribute:finalclass+' => '',
+));
+
+//
+// Class: OSPatch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:OSPatch' => 'OS Patch',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'Todos os sistemas onde o patch está instalado',
+	'Class:OSPatch/Attribute:osversion_id' => 'Versão OS',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'Nome versão OS',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
+));
+
+//
+// Class: SoftwarePatch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SoftwarePatch' => 'Software Patch',
+	'Class:SoftwarePatch+' => '',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
+	'Class:SoftwarePatch/Attribute:software_id+' => '',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Nome software',
+	'Class:SoftwarePatch/Attribute:software_name+' => '',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Instâncias Software',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Todos os sistemas onde software patch está instalado',
+));
+
+//
+// Class: Licence
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Licence' => 'Licença',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:name' => 'Nome',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:documents_list' => 'Documentos',
+	'Class:Licence/Attribute:documents_list+' => 'Todos os documentos vinculados a essa licença',
+	'Class:Licence/Attribute:org_id' => 'Organização',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:organization_name' => 'Nome organização',
+	'Class:Licence/Attribute:organization_name+' => 'Nome comum',
+	'Class:Licence/Attribute:usage_limit' => 'Limite usado',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:description' => 'Descrição',
+	'Class:Licence/Attribute:description+' => '',
+	'Class:Licence/Attribute:start_date' => 'Data início',
+	'Class:Licence/Attribute:start_date+' => '',
+	'Class:Licence/Attribute:end_date' => 'Data final',
+	'Class:Licence/Attribute:end_date+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Chave',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:perpetual' => 'Permanente',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'Não',
+	'Class:Licence/Attribute:perpetual/Value:no+' => 'Não',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'Sim',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => 'sim',
+	'Class:Licence/Attribute:finalclass' => 'Tipo',
+	'Class:Licence/Attribute:finalclass+' => '',
+));
+
+//
+// Class: OSLicence
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:OSLicence' => 'Licença OS',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'Versão OS',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'Nome versão OS',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas virtuais',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Todas as máquinas virtuais onde essa licença é usada',
+	'Class:OSLicence/Attribute:servers_list' => 'servidores',
+	'Class:OSLicence/Attribute:servers_list+' => 'Todos os servidores onde essa licença é usada',
+));
+
+//
+// Class: SoftwareLicence
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SoftwareLicence' => 'Licença software',
+	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
+	'Class:SoftwareLicence/Attribute:software_id+' => '',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Nome software',
+	'Class:SoftwareLicence/Attribute:software_name+' => '',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Instâncias software',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Todos os sistemas onde essa licença é usada',
+));
+
+//
+// Class: lnkDocumentToLicence
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToLicence' => 'Link Documento / Licença',
+	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licença',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Nome licença',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
+));
+
+//
+// Class: Typology
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Typology' => 'Tipologia',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Nome',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Tipo',
+	'Class:Typology/Attribute:finalclass+' => '',
+));
+
+//
+// Class: OSVersion
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:OSVersion' => 'Versão OS',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'Família OS',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'Nome família OS',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
+));
+
+//
+// Class: OSFamily
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:OSFamily' => 'Família OS',
+	'Class:OSFamily+' => '',
+));
+
+//
+// Class: DocumentType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DocumentType' => 'Tipo documento',
+	'Class:DocumentType+' => '',
+));
+
+//
+// Class: ContactType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ContactType' => 'Tipo contato',
+	'Class:ContactType+' => '',
+));
+
+//
+// Class: Brand
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Brand' => 'Fabricante',
+	'Class:Brand+' => '',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivos físicos',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a essa fabricante',
+));
+
+//
+// Class: Model
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Model' => 'Modelo',
+	'Class:Model+' => '',
+	'Class:Model/Attribute:brand_id' => 'Fabricante',
+	'Class:Model/Attribute:brand_id+' => '',
+	'Class:Model/Attribute:brand_name' => 'Nome fabricante',
+	'Class:Model/Attribute:brand_name+' => '',
+	'Class:Model/Attribute:type' => 'Tipo dispositivo',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Fonte energia',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Fonte energia',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Array disco',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Array disco',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Gaveta',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Gaveta',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'Telefone IP',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'Telefone IP',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Telefone celular',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Telefone celular',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Dispositivo rede',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Dispositivo rede',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Periférico',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Periférico',
+	'Class:Model/Attribute:type/Value:Printer' => 'Impressora',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Impressora',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'Switch SAN',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'Switch SAN',
+	'Class:Model/Attribute:type/Value:Server' => 'Servidor',
+	'Class:Model/Attribute:type/Value:Server+' => 'Servidor',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Sistema Storage',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Sistema Storage',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telefone',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telefone',
+	'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo físico',
+	'Class:Model/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a esse modelo',
+));
+
+//
+// Class: NetworkDeviceType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:NetworkDeviceType' => 'Tipo dispositivo rede',
+	'Class:NetworkDeviceType+' => '',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Dispositivo rede',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Todos os dispositivo de rede correspondentes a esse tipo',
+));
+
+//
+// Class: IOSVersion
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:IOSVersion' => 'Versão IOS',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Fabricante',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Nome fabricante',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
+));
+
+//
+// Class: lnkDocumentToPatch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToPatch' => 'Link Documento / Patch',
+	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Nome patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkSoftwareInstanceToSoftwarePatch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Instância Software / Software Patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Nome software patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Instância software',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Nome instância software',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToOSPatch
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToOSPatch' => 'Link CI / OS patch',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'Nome OS patch',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkDocumentToSoftware
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToSoftware' => 'Link Documento / Software',
+	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Nome software',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToFunctionalCI' => 'Link Contato / CI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkDocumentToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToFunctionalCI' => 'Link Documento / CI',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+));
+
+//
+// Class: Subnet
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Subnet' => 'Sub-rede',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Attribute:description' => 'Descrição',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:subnet_name' => 'Nome Sub-rede',
+	'Class:Subnet/Attribute:subnet_name+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Organização',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:org_name' => 'Nome',
+	'Class:Subnet/Attribute:org_name+' => 'Nome comum',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'Máscara rede',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:Subnet/Attribute:vlans_list' => 'VLANs',
+	'Class:Subnet/Attribute:vlans_list+' => '',
+));
+
+//
+// Class: VLAN
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:VLAN' => 'VLAN',
+	'Class:VLAN+' => '',
+	'Class:VLAN/Attribute:vlan_tag' => 'Nome VLAN',
+	'Class:VLAN/Attribute:vlan_tag+' => '',
+	'Class:VLAN/Attribute:description' => 'Descrição',
+	'Class:VLAN/Attribute:description+' => '',
+	'Class:VLAN/Attribute:org_id' => 'Organização',
+	'Class:VLAN/Attribute:org_id+' => '',
+	'Class:VLAN/Attribute:org_name' => 'Nome organização',
+	'Class:VLAN/Attribute:org_name+' => 'Nome comum',
+	'Class:VLAN/Attribute:subnets_list' => 'Sub-redes',
+	'Class:VLAN/Attribute:subnets_list+' => '',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Interfaces rede física',
+	'Class:VLAN/Attribute:physicalinterfaces_list+' => '',
+));
+
+//
+// Class: lnkSubnetToVLAN
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkSubnetToVLAN' => 'Link Sub-rede / VLAN',
+	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Sub-rede',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'IP sub-rede',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Nome sub-rede',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'Nome VLAN',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
+));
+
+//
+// Class: NetworkInterface
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:NetworkInterface' => 'Placa de rede',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:name' => 'Nome',
+	'Class:NetworkInterface/Attribute:name+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Tipo',
+	'Class:NetworkInterface/Attribute:finalclass+' => '',
+));
+
+//
+// Class: IPInterface
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:IPInterface' => 'Endereço IP',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'Endereço IP',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+
+
+	'Class:IPInterface/Attribute:macaddress' => 'Endereço MAC',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Comentário',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'Gateway',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'Máscara de rede',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Velocidade',
+	'Class:IPInterface/Attribute:speed+' => '',
+));
+
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:PhysicalInterface' => 'Placa física',
+	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Dispositivo',
+	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nome dispositivo',
+	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
+	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
+));
+
+//
+// Class: lnkPhysicalInterfaceToVLAN
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link Interfaces físicas / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface física',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Nome interface física',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Dispositivo',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Nome dispositivo',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'Nome VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
+));
+
+//
+// Class: LogicalInterface
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:LogicalInterface' => 'Placa lógica',
+	'Class:LogicalInterface+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Máquina virtual',
+	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Nome máquina virtual',
+	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
+));
+
+//
+// Class: FiberChannelInterface
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FiberChannelInterface' => 'Placa Fiber Channel',
+	'Class:FiberChannelInterface+' => '',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Velocidade',
+	'Class:FiberChannelInterface/Attribute:speed+' => '',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topologia',
+	'Class:FiberChannelInterface/Attribute:topology+' => '',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
+	'Class:FiberChannelInterface/Attribute:wwn+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Dispositivo',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Nome dispositivo',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
+));
+
+//
+// Class: lnkConnectableCIToNetworkDevice
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Dispositivo rede',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Nome dispositivo rede',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Dispositivo conectado',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Nome dispositivo conectado',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Porta de rede',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Porta dispositivo',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Tipo conexão',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Link down',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => 'Link down',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Link up',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => 'Link up',
+));
+
+//
+// Class: lnkApplicationSolutionToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / CI',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solução aplicação',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Nome solução aplicação',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: lnkApplicationSolutionToBusinessProcess
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processos de negócio',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Nome processos de negócio',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Solução aplicação',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Nome solução aplicação',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
+));
+
+//
+// Class: lnkPersonToTeam
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkPersonToTeam' => 'Link Pessoa / Equipe',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Equipe',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Nome equipe',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Pessoa',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Nome pessoa',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Função',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Nome função',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+));
+
+//
+// Class: Group
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Group' => 'Grupo',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Nome',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Status',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:Group/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Group/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:Group/Attribute:status/Value:production' => 'Produção',
+	'Class:Group/Attribute:status/Value:production+' => 'Produção',
+	'Class:Group/Attribute:org_id' => 'Organização',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:owner_name' => 'Nome',
+	'Class:Group/Attribute:owner_name+' => 'Nome comum',
+	'Class:Group/Attribute:description' => 'Descrição',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Tipo',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Grupo principal',
+
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:parent_name' => 'Nome',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:ci_list' => 'CIs ligados',
+	'Class:Group/Attribute:ci_list+' => 'Todos os itens de configuração associada a esse grupo',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Grupo principal',
+	'Class:Group/Attribute:parent_id_friendlyname+' => '',
+));
+
+//
+// Class: lnkGroupToCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkGroupToCI' => 'Link Grupo / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupo',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Nome',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Nome',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Razão',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+));
+
+
+//
+// Application Menu
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+'Menu:DataAdministration' => 'Administração Dados',
+'Menu:DataAdministration+' => 'Administração Dados',
+'Menu:Catalogs' => 'Catálogos',
+'Menu:Catalogs+' => 'Tipos dados',
+'Menu:Audit' => 'Auditoria',
+'Menu:Audit+' => 'Auditoria',
+'Menu:CSVImport' => 'Importar CSV',
+'Menu:CSVImport+' => 'Criação ou atualização em massa',
+'Menu:Organization' => 'Organizações',
+'Menu:Organization+' => 'Todas organizações',
+'Menu:Application' => 'Applicações',
+'Menu:Application+' => 'Todas aplicações',
+'Menu:DBServer' => 'Serviços Banco de Dados',
+'Menu:DBServer+' => 'Serviços Banco de Dados',
+'Menu:ConfigManagement' => 'Gerenciamento Configurações',
+'Menu:ConfigManagement+' => 'Gerenciamento Configurações',
+'Menu:ConfigManagementOverview' => 'Visão geral',
+'Menu:ConfigManagementOverview+' => 'Visão geral',
+'Menu:Contact' => 'Contatos',
+'Menu:Contact+' => 'Contatos',
+'Menu:Contact:Count' => '%1$d contatos',
+'Menu:Person' => 'Pessoas',
+'Menu:Person+' => 'Todas pessoas',
+'Menu:Team' => 'Equipes',
+'Menu:Team+' => 'Todas equipes',
+'Menu:Document' => 'Documentos',
+'Menu:Document+' => 'Todos documentos',
+'Menu:Location' => 'Localidades',
+'Menu:Location+' => 'Todas localidades',
+'Menu:ConfigManagementCI' => 'Itens de configuração',
+'Menu:ConfigManagementCI+' => 'Itens de configuração',
+'Menu:BusinessProcess' => 'Processos de negócios',
+'Menu:BusinessProcess+' => 'Todos processos de negócios',
+'Menu:ApplicationSolution' => 'Solução aplicação',
+'Menu:ApplicationSolution+' => 'Todas soluções aplicações',
+'Menu:ConfigManagementSoftware' => 'Gerenciamento aplicações',
+'Menu:Licence' => 'Licenças',
+'Menu:Licence+' => 'Todoas licenças',
+'Menu:Patch' => 'Patches',
+'Menu:Patch+' => 'Todos patches',
+'Menu:ApplicationInstance' => 'Software instalados',
+'Menu:ApplicationInstance+' => 'Serviços aplicações e Banco de dados',
+'Menu:ConfigManagementHardware' => 'Gerenciamento Infra-estrutura',
+'Menu:Subnet' => 'Sub-redes',
+'Menu:Subnet+' => 'Todas sub-redes',
+'Menu:NetworkDevice' => 'Dispositivos rede',
+'Menu:NetworkDevice+' => 'Todos dispositivos rede',
+'Menu:Server' => 'Servidores',
+'Menu:Server+' => 'Todos servidores',
+'Menu:Printer' => 'Impressoras',
+'Menu:Printer+' => 'Todas impressoras',
+'Menu:MobilePhone' => 'Telefone celulares',
+'Menu:MobilePhone+' => 'Todos telefone celulares',
+'Menu:PC' => 'Estação de trabalho',
+'Menu:PC+' => 'Todas estação de trabalho',
+'Menu:NewContact' => 'Novo contato',
+'Menu:NewContact+' => 'Novo contato',
+'Menu:SearchContacts' => 'Pesquisar por contatos',
+'Menu:SearchContacts+' => 'Pesquisar por contatos',
+'Menu:NewCI' => 'Novo CI',
+'Menu:NewCI+' => 'Novo CI',
+'Menu:SearchCIs' => 'Pesquisar por CIs',
+'Menu:SearchCIs+' => 'Pesquisar por CIs',
+'Menu:ConfigManagement:Devices' => 'Dispositivos',
+'Menu:ConfigManagement:AllDevices' => 'Infra-estrutura',
+'Menu:ConfigManagement:virtualization' => 'Virtualização',
+'Menu:ConfigManagement:EndUsers' => 'Dispositivos usuário final',
+'Menu:ConfigManagement:SWAndApps' => 'Software e aplicações',
+'Menu:ConfigManagement:Misc' => 'Diversos',
+'Menu:Group' => 'Grupos de CIs',
+'Menu:Group+' => 'Grupos de CIs',
+'Menu:ConfigManagement:Shortcuts' => 'Atalhos',
+'Menu:ConfigManagement:AllContacts' => 'Todos contatos: %1$d',
+'Menu:Typology' => 'Configuração tipologia',
+'Menu:Typology+' => 'Configuração tipologia',
+'Menu:OSVersion' => 'Versão OS',
+'Menu:OSVersion+' => '',
+'Menu:Software' => 'Catálogo software',
+'Menu:Software+' => 'Catálogo software',
+'UI_WelcomeMenu_AllConfigItems' => 'Índice',
+'Menu:ConfigManagement:Typology' => 'Configuração tipologia',
+
+));
+
+
+// Add translation for Fieldsets
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+'Server:baseinfo' => 'Informações gerais',
+'Server:Date' => 'Data',
+'Server:moreinfo' => 'Mais informações',
+'Server:otherinfo' => 'Outras informações',
+'Person:info' => 'Informações gerais',
+'Person:notifiy' => 'Notificação',
+'Class:Subnet/Tab:IPUsage' => 'IP usado',
+'Class:Subnet/Tab:IPUsage-explain' => 'Placas de rede contendo IP na faixa: <em>%1$s</em> para <em>%2$s</em>',
+'Class:Subnet/Tab:FreeIPs' => 'IPs livres',
+'Class:Subnet/Tab:FreeIPs-count' => 'IPs livres: %1$s',
+'Class:Subnet/Tab:FreeIPs-explain' => 'Aqui uma faixa de 10 endereços IPs livres',
+'Class:Document:PreviewTab' => 'Visualização',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
+	'Class:Farm/Attribute:redundancy' => 'High availability~~',
+	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
+	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
+	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
+	'Server:power' => 'Power supply~~',
+));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
index c6105c64c..c0e37d67b 100755
--- a/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/tr.dict.itop-config-mgmt.php
@@ -1,1632 +1,1632 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Relation:impacts/Description' => 'Etkilenen kalemler',
-	'Relation:impacts/DownStream' => 'Etkiler...',
-	'Relation:impacts/DownStream+' => 'Etkilenen kalemler',
-	'Relation:impacts/UpStream' => 'Bağımlı olanlar...',
-	'Relation:impacts/UpStream+' => 'Bu kaleme bağımlı olan kalemler',
-	// Legacy entries
-	'Relation:depends on/Description' => 'Bu kaleme bağımlı olan kalemler',
-	'Relation:depends on/DownStream' => 'Bağımlı olanlar...',
-	'Relation:depends on/UpStream' => 'Etkiledikleri...',
-));
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: Organization
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Organization' => 'Kurum',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Adı',
-	'Class:Organization/Attribute:name+' => 'Kullanılan adı',
-	'Class:Organization/Attribute:code' => 'Kodu',
-	'Class:Organization/Attribute:code+' => 'Kurumu kodu (Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => 'Durumu',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Etkin',
-	'Class:Organization/Attribute:status/Value:active+' => 'Etkin',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Etkin değil',
-	'Class:Organization/Attribute:status/Value:inactive+' => 'Etkin değil',
-	'Class:Organization/Attribute:parent_id' => 'Bağlı olduğu kurum',
-	'Class:Organization/Attribute:parent_id+' => 'Bağlı olduğu kurum',
-	'Class:Organization/Attribute:parent_name' => 'Bağlı olduğu kurumun adı',
-	'Class:Organization/Attribute:parent_name+' => 'Bağlı olduğu kurumun adı',
-));
-
-
-//
-// Class: Location
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Location' => 'Yerleşke',
-	'Class:Location+' => 'Yerleşke : Bölge, Ülke, Şehir, Yerleşke, Bina, Kat, Oda, kabin,...',
-	'Class:Location/Attribute:name' => 'Adı',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Durumu',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Etkin',
-	'Class:Location/Attribute:status/Value:active+' => 'Etkin',
-	'Class:Location/Attribute:status/Value:inactive' => 'Etkin değil',
-	'Class:Location/Attribute:status/Value:inactive+' => 'Etkin değil',
-	'Class:Location/Attribute:org_id' => 'Kurumun sahibi',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => 'Kurumun sahibinin adı',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => 'Adres',
-	'Class:Location/Attribute:address+' => 'Posta adresi',
-	'Class:Location/Attribute:postal_code' => 'Posta kodu',
-	'Class:Location/Attribute:postal_code+' => 'Posta kodu',
-	'Class:Location/Attribute:city' => 'Şehir',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Ülke',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:parent_id' => 'Bağlı olduğu yerleşke',
-	'Class:Location/Attribute:parent_id+' => '',
-	'Class:Location/Attribute:parent_name' => 'Ebebeyn adı',
-	'Class:Location/Attribute:parent_name+' => '',
-	'Class:Location/Attribute:contact_list' => 'İrtibatlar',
-	'Class:Location/Attribute:contact_list+' => 'Yerleşkedeki irtibatlar',
-	'Class:Location/Attribute:infra_list' => 'Altyapı',
-	'Class:Location/Attribute:infra_list+' => 'Yerleşkedeki Konfigürasyon Kalemleri (KK)',
-));
-//
-// Class: Group
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Group' => 'Grup',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => 'Adı',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => 'Surumu',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => 'Uygulama',
-	'Class:Group/Attribute:status/Value:implementation+' => 'Uygulama',
-	'Class:Group/Attribute:status/Value:obsolete' => 'Üretimden kalkan',
-	'Class:Group/Attribute:status/Value:obsolete+' => 'Üretimden kalkan',
-	'Class:Group/Attribute:status/Value:production' => 'Kullanımda',
-	'Class:Group/Attribute:status/Value:production+' => 'Kullanımda',
-	'Class:Group/Attribute:org_id' => 'Kurum',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => 'Adı',
-	'Class:Group/Attribute:owner_name+' => 'Kullanılan Adı',
-	'Class:Group/Attribute:description' => 'Tanımlama',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Tip',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Bağlı olduğu grup',
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:parent_name' => 'Adı',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => 'Bağlantılı Konfigürasyon Kalemleri (KK)',
-	'Class:Group/Attribute:ci_list+' => '',
-));
-
-//
-// Class: lnkGroupToCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkGroupToCI' => 'Grup / KK',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Grup',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Adı',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'KK',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Adı',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_status' => 'KK durumu',
-	'Class:lnkGroupToCI/Attribute:ci_status+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Sebep',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-));
-
-
-//
-// Class: Contact
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Contact' => 'İrtibat',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Adı',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Durumu',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Etkin',
-	'Class:Contact/Attribute:status/Value:active+' => 'Etkin',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Etkin değil',
-	'Class:Contact/Attribute:status/Value:inactive+' => 'Etkin değil',
-	'Class:Contact/Attribute:org_id' => 'Kurum',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Kurum',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'E-posta',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefon',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:location_id' => 'Yerleşke',
-	'Class:Contact/Attribute:location_id+' => '',
-	'Class:Contact/Attribute:location_name' => 'Yerleşke',
-	'Class:Contact/Attribute:location_name+' => '',
-	'Class:Contact/Attribute:ci_list' => 'Konfigürasyon kalemleri',
-	'Class:Contact/Attribute:ci_list+' => 'İrtibatla ilgili KK',
-	'Class:Contact/Attribute:contract_list' => 'İrtibatlar',
-	'Class:Contact/Attribute:contract_list+' => 'İrtibatla ilgili sözleşmeler',
-	'Class:Contact/Attribute:service_list' => 'Hizmetler',
-	'Class:Contact/Attribute:service_list+' => 'İrtibatla ilgili hizmetler',
-	'Class:Contact/Attribute:ticket_list' => 'Çağrılar',
-	'Class:Contact/Attribute:ticket_list+' => 'İrtibatla ilgili çağrılar',
-	'Class:Contact/Attribute:team_list' => 'Ekipler',
-	'Class:Contact/Attribute:team_list+' => 'İrtibatın dahil olduğu ekip',
-	'Class:Contact/Attribute:finalclass' => 'Tip',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Person' => 'Kişi',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:first_name' => 'Adı',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_id' => 'Çalışan No',
-	'Class:Person/Attribute:employee_id+' => '',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Team' => 'Ekip',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:member_list' => 'Üyeleri',
-	'Class:Team/Attribute:member_list+' => 'Ekip üyeleri',
-));
-
-//
-// Class: lnkTeamToContact
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkTeamToContact' => 'Ekip üyeleri',
-	'Class:lnkTeamToContact+' => 'Ekip üyeleri',
-	'Class:lnkTeamToContact/Attribute:team_id' => 'Ekip',
-	'Class:lnkTeamToContact/Attribute:team_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_id' => 'Üye',
-	'Class:lnkTeamToContact/Attribute:contact_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_location_id' => 'Yerleşke',
-	'Class:lnkTeamToContact/Attribute:contact_location_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_email' => 'E-posta',
-	'Class:lnkTeamToContact/Attribute:contact_email+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_phone' => 'Telefon',
-	'Class:lnkTeamToContact/Attribute:contact_phone+' => '',
-	'Class:lnkTeamToContact/Attribute:role' => 'Rolü',
-	'Class:lnkTeamToContact/Attribute:role+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Document' => 'Doküman',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Adı',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Kurum',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:org_name' => 'Kurum Adı',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:description' => 'Tanımlama',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:type' => 'Tip',
-	'Class:Document/Attribute:type+' => '',
-	'Class:Document/Attribute:type/Value:contract' => 'Sözleşme',
-	'Class:Document/Attribute:type/Value:contract+' => '',
-	'Class:Document/Attribute:type/Value:networkmap' => 'Ağ haritası',
-	'Class:Document/Attribute:type/Value:networkmap+' => '',
-	'Class:Document/Attribute:type/Value:presentation' => 'Sunum',
-	'Class:Document/Attribute:type/Value:presentation+' => '',
-	'Class:Document/Attribute:type/Value:training' => 'Eğitim',
-	'Class:Document/Attribute:type/Value:training+' => '',
-	'Class:Document/Attribute:type/Value:whitePaper' => 'Tanıtım',
-	'Class:Document/Attribute:type/Value:whitePaper+' => '',
-	'Class:Document/Attribute:type/Value:workinginstructions' => 'İş talimatı',
-	'Class:Document/Attribute:type/Value:workinginstructions+' => '',
-	'Class:Document/Attribute:status' => 'Durumu',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Taslak',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Geçersiz',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Yayınlanan',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:ci_list' => 'Konfigürasyon kalemleri',
-	'Class:Document/Attribute:ci_list+' => 'Dokümana referans veren KKler',
-	'Class:Document/Attribute:contract_list' => 'İrtibatlar',
-	'Class:Document/Attribute:contract_list+' => 'Dokümanla ilgili sözleşmeler',
-	'Class:Document/Attribute:service_list' => 'Servisler',
-	'Class:Document/Attribute:service_list+' => 'Dokümanla ilgili servisler',
-	'Class:Document/Attribute:ticket_list' => 'Çağrılar',
-	'Class:Document/Attribute:ticket_list+' => 'Dokümanla ilgili çağrılar',
-	'Class:Document:PreviewTab' => 'Ön görünüm',
-));
-
-//
-// Class: WebDoc
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:WebDoc' => 'Web Dokümanı',
-	'Class:WebDoc+' => 'Farklı web sunucunda olan dokümanlar',
-	'Class:WebDoc/Attribute:url' => 'Url',
-	'Class:WebDoc/Attribute:url+' => '',
-));
-
-//
-// Class: Note
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Note' => 'Not',
-	'Class:Note+' => '',
-	'Class:Note/Attribute:note' => 'Metin',
-	'Class:Note/Attribute:note+' => '',
-));
-
-//
-// Class: FileDoc
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:FileDoc' => 'Doküman (dosya)',
-	'Class:FileDoc+' => '',
-	'Class:FileDoc/Attribute:contents' => 'İçerik',
-	'Class:FileDoc/Attribute:contents+' => '',
-));
-
-//
-// Class: Licence
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Licence' => 'Lisans',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:provider' => 'Lisansı veren',
-	'Class:Licence/Attribute:provider+' => '',
-	'Class:Licence/Attribute:org_id' => 'Sahibi',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:org_name' => 'Adı',
-	'Class:Licence/Attribute:org_name+' => 'Adı',
-	'Class:Licence/Attribute:product' => 'Ürün',
-	'Class:Licence/Attribute:product+' => '',
-	'Class:Licence/Attribute:name' => 'Adı',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:start' => 'Başlangıç tarihi',
-	'Class:Licence/Attribute:start+' => '',
-	'Class:Licence/Attribute:end' => 'Bitiş tarihi',
-	'Class:Licence/Attribute:end+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Lisans',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:scope' => 'Kapsam',
-	'Class:Licence/Attribute:scope+' => '',
-	'Class:Licence/Attribute:usage_limit' => 'Kullanım limit',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:usage_list' => 'Kullanım',
-	'Class:Licence/Attribute:usage_list+' => 'Lisansı kullanan uygulamalar',
-));
-
-
-//
-// Class: Subnet
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Name' => '%1$s / %2$s',
-	//'Class:Subnet/Attribute:name' => 'Adı',
-	//'Class:Subnet/Attribute:name+' => '',
-	'Class:Subnet/Attribute:org_id' => 'Kurum',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:description' => 'Tanımlama',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-));
-
-//
-// Class: Patch
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Patch' => 'Yama',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Adı',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:description' => 'Tanımlama',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:target_sw' => 'Hedef uygulama',
-	'Class:Patch/Attribute:target_sw+' => 'Hedef yazılım',
-	'Class:Patch/Attribute:version' => 'Versiyon',
-	'Class:Patch/Attribute:version+' => '',
-	'Class:Patch/Attribute:type' => 'Tip',
-	'Class:Patch/Attribute:type+' => '',
-	'Class:Patch/Attribute:type/Value:application' => 'Uygulama',
-	'Class:Patch/Attribute:type/Value:application+' => '',
-	'Class:Patch/Attribute:type/Value:os' => 'İşletim sistemi',
-	'Class:Patch/Attribute:type/Value:os+' => '',
-	'Class:Patch/Attribute:type/Value:security' => 'Güvenlik',
-	'Class:Patch/Attribute:type/Value:security+' => '',
-	'Class:Patch/Attribute:type/Value:servicepack' => 'Servis paketi',
-	'Class:Patch/Attribute:type/Value:servicepack+' => '',
-	'Class:Patch/Attribute:ci_list' => 'Cihazlar',
-	'Class:Patch/Attribute:ci_list+' => 'Yamanın yüklendiği cihazlar',
-));
-
-//
-// Class: Software
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Software' => 'Yazılım',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => 'Adı',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:description' => 'Tanımlama',
-	'Class:Software/Attribute:description+' => '',
-	'Class:Software/Attribute:instance_list' => 'Yüklemeler',
-	'Class:Software/Attribute:instance_list+' => 'Yazılımın kurulumları',
-	'Class:Software/Attribute:finalclass' => 'Tip',
-	'Class:Software/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Application
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Application' => 'Uygulama',
-	'Class:Application+' => '',
-	'Class:Application/Attribute:name' => 'Adı',
-	'Class:Application/Attribute:name+' => '',
-	'Class:Application/Attribute:description' => 'Tanımlama',
-	'Class:Application/Attribute:description+' => '',
-	'Class:Application/Attribute:instance_list' => 'Yüklemeler',
-	'Class:Application/Attribute:instance_list+' => 'Uygulamanın kurulumları',
-));
-
-//
-// Class: DBServer
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DBServer' => 'Veritabanı',
-	'Class:DBServer+' => 'Veritabanı yazılımı',
-	'Class:DBServer/Attribute:instance_list' => 'Yüklemeler',
-	'Class:DBServer/Attribute:instance_list+' => 'Veritabanı kurulumları',
-));
-
-//
-// Class: lnkPatchToCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkPatchToCI' => 'Yama kullanımı',
-	'Class:lnkPatchToCI+' => '',
-	'Class:lnkPatchToCI/Attribute:patch_id' => 'Yama',
-	'Class:lnkPatchToCI/Attribute:patch_id+' => '',
-	'Class:lnkPatchToCI/Attribute:patch_name' => 'Yama',
-	'Class:lnkPatchToCI/Attribute:patch_name+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_id' => 'KK',
-	'Class:lnkPatchToCI/Attribute:ci_id+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_name' => 'KK',
-	'Class:lnkPatchToCI/Attribute:ci_name+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_status' => 'KK Durumu',
-	'Class:lnkPatchToCI/Attribute:ci_status+' => '',
-));
-
-//
-// Class: FunctionalCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:FunctionalCI' => 'Fonksiyonel KK',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Adı',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:status' => 'Durumu',
-	'Class:FunctionalCI/Attribute:status+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:implementation' => 'Uygulama',
-	'Class:FunctionalCI/Attribute:status/Value:implementation+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:obsolete' => 'Üretimden kalkan',
-	'Class:FunctionalCI/Attribute:status/Value:obsolete+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:production' => 'Kullanımda',
-	'Class:FunctionalCI/Attribute:status/Value:production+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => 'Sahip kurum',
-	'Class:FunctionalCI/Attribute:org_id+' => '',
-	'Class:FunctionalCI/Attribute:owner_name' => 'Sahip kurum',
-	'Class:FunctionalCI/Attribute:owner_name+' => '',
-	'Class:FunctionalCI/Attribute:importance' => 'İş açısından kritikliği',
-	'Class:FunctionalCI/Attribute:importance+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:high' => 'Yüksek',
-	'Class:FunctionalCI/Attribute:importance/Value:high+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:low' => 'Düşük',
-	'Class:FunctionalCI/Attribute:importance/Value:low+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:medium' => 'Orta',
-	'Class:FunctionalCI/Attribute:importance/Value:medium+' => '',
-	'Class:FunctionalCI/Attribute:contact_list' => 'İrtibatlar',
-	'Class:FunctionalCI/Attribute:contact_list+' => 'KK için İrtibatlar',
-	'Class:FunctionalCI/Attribute:document_list' => 'Dokümanlar',
-	'Class:FunctionalCI/Attribute:document_list+' => 'KK için dokümanlar',
-	'Class:FunctionalCI/Attribute:solution_list' => 'Uygulama çözümleri',
-	'Class:FunctionalCI/Attribute:solution_list+' => 'KKyi kullanan uygulama çözümleri',
-	'Class:FunctionalCI/Attribute:contract_list' => 'İrtibatlar',
-	'Class:FunctionalCI/Attribute:contract_list+' => 'KKyi destekleyen sözleşmeler',
-	'Class:FunctionalCI/Attribute:ticket_list' => 'Çağrılar',
-	'Class:FunctionalCI/Attribute:ticket_list+' => 'KK ile ilgili çağrılar',
-	'Class:FunctionalCI/Attribute:finalclass' => 'Tip',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-));
-
-//
-// Class: SoftwareInstance
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:SoftwareInstance' => 'Yazılım Kurulumu',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Name' => '%1$s - %2$s',
-	'Class:SoftwareInstance/Attribute:device_id' => 'Cihaz',
-	'Class:SoftwareInstance/Attribute:device_id+' => '',
-	'Class:SoftwareInstance/Attribute:device_name' => 'Cihaz',
-	'Class:SoftwareInstance/Attribute:device_name+' => '',
-	'Class:SoftwareInstance/Attribute:licence_id' => 'Lisans',
-	'Class:SoftwareInstance/Attribute:licence_id+' => '',
-	'Class:SoftwareInstance/Attribute:licence_name' => 'Lisans',
-	'Class:SoftwareInstance/Attribute:licence_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => 'Yazılım',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:version' => 'Versiyon',
-	'Class:SoftwareInstance/Attribute:version+' => '',
-	'Class:SoftwareInstance/Attribute:description' => 'Tanımlama',
-	'Class:SoftwareInstance/Attribute:description+' => '',
-));
-
-//
-// Class: ApplicationInstance
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ApplicationInstance' => 'Uygulama Kurulumu',
-	'Class:ApplicationInstance+' => '',
-	'Class:ApplicationInstance/Name' => '%1$s - %2$s',
-	'Class:ApplicationInstance/Attribute:software_id' => 'Yazılım',
-	'Class:ApplicationInstance/Attribute:software_id+' => '',
-	'Class:ApplicationInstance/Attribute:software_name' => 'Adı',
-	'Class:ApplicationInstance/Attribute:software_name+' => '',
-));
-
-
-//
-// Class: DBServerInstance
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DBServerInstance' => 'Veritabanı Sunucusu',
-	'Class:DBServerInstance+' => '',
-	'Class:DBServerInstance/Name' => '%1$s - %2$s',
-	'Class:DBServerInstance/Attribute:software_id' => 'Yazılım',
-	'Class:DBServerInstance/Attribute:software_id+' => '',
-	'Class:DBServerInstance/Attribute:software_name' => 'Adı',
-	'Class:DBServerInstance/Attribute:software_name+' => '',
-	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Veritabanları',
-	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Veritabanları',
-));
-
-
-//
-// Class: DatabaseInstance
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:DatabaseInstance' => 'Veritabanı',
-	'Class:DatabaseInstance+' => '',
-	'Class:DatabaseInstance/Name' => '%1$s - %2$s',
-	'Class:DatabaseInstance/Attribute:db_server_instance_id' => 'Veritabanı sunucusu',
-	'Class:DatabaseInstance/Attribute:db_server_instance_id+' => '',
-	'Class:DatabaseInstance/Attribute:db_server_instance_version' => 'Veritabanı versiyonu',
-	'Class:DatabaseInstance/Attribute:db_server_instance_version+' => '',
-	'Class:DatabaseInstance/Attribute:description' => 'Tanımlama',
-	'Class:DatabaseInstance/Attribute:description+' => '',
-));
-
-//
-// Class: ApplicationSolution
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ApplicationSolution' => 'Uygulama çözümleri',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:description' => 'Tanımlama',
-	'Class:ApplicationSolution/Attribute:description+' => '',
-	'Class:ApplicationSolution/Attribute:ci_list' => 'Konfigürasyon kalemleri',
-	'Class:ApplicationSolution/Attribute:ci_list+' => 'Çözümü oluşturan KKler',
-	'Class:ApplicationSolution/Attribute:process_list' => 'İş süreçleri',
-	'Class:ApplicationSolution/Attribute:process_list+' => 'Uygulama çözümüne bağımlı iş süreci',
-));
-
-//
-// Class: BusinessProcess
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:BusinessProcess' => 'İş süreci',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:description' => 'Tanımlama',
-	'Class:BusinessProcess/Attribute:description+' => '',
-	'Class:BusinessProcess/Attribute:used_solution_list' => 'Uygulama çözümleri',
-	'Class:BusinessProcess/Attribute:used_solution_list+' => 'Sürecin bağımlı olduğu iş süreci',
-));
-
-//
-// Class: ConnectableCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ConnectableCI' => 'Bağlanabilir KK',
-	'Class:ConnectableCI+' => 'Fiziksel KK',
-	'Class:ConnectableCI/Attribute:brand' => 'Marka',
-	'Class:ConnectableCI/Attribute:brand+' => '',
-	'Class:ConnectableCI/Attribute:model' => 'Model',
-	'Class:ConnectableCI/Attribute:model+' => '',
-	'Class:ConnectableCI/Attribute:serial_number' => 'Seri No',
-	'Class:ConnectableCI/Attribute:serial_number+' => '',
-	'Class:ConnectableCI/Attribute:asset_ref' => 'Kaynak referansı',
-	'Class:ConnectableCI/Attribute:asset_ref+' => '',
-));
-
-//
-// Class: NetworkInterface
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:NetworkInterface' => 'Network arayüzü',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Name' => '%1$s - %2$s',
-	'Class:NetworkInterface/Attribute:device_id' => 'Cihaz',
-	'Class:NetworkInterface/Attribute:device_id+' => '',
-	'Class:NetworkInterface/Attribute:device_name' => 'Cihaz',
-	'Class:NetworkInterface/Attribute:device_name+' => '',
-	'Class:NetworkInterface/Attribute:logical_type' => 'Mantıksal tipi',
-	'Class:NetworkInterface/Attribute:logical_type+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:backup' => 'Yedek',
-	'Class:NetworkInterface/Attribute:logical_type/Value:backup+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:logical' => 'Mantıksal',
-	'Class:NetworkInterface/Attribute:logical_type/Value:logical+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:port' => 'Port',
-	'Class:NetworkInterface/Attribute:logical_type/Value:port+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:primary' => 'Birincil',
-	'Class:NetworkInterface/Attribute:logical_type/Value:primary+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:secondary' => 'İkincil',
-	'Class:NetworkInterface/Attribute:logical_type/Value:secondary+' => '',
-	'Class:NetworkInterface/Attribute:physical_type' => 'Fiziksel tip',
-	'Class:NetworkInterface/Attribute:physical_type+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:atm' => 'ATM',
-	'Class:NetworkInterface/Attribute:physical_type/Value:atm+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet' => 'Ethernet',
-	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay' => 'Frame Relay',
-	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:vlan' => 'VLAN',
-	'Class:NetworkInterface/Attribute:physical_type/Value:vlan+' => '',
-	'Class:NetworkInterface/Attribute:ip_address' => 'IP Adresi',
-	'Class:NetworkInterface/Attribute:ip_address+' => '',
-	'Class:NetworkInterface/Attribute:ip_mask' => 'IP maskesi',
-	'Class:NetworkInterface/Attribute:ip_mask+' => '',
-	'Class:NetworkInterface/Attribute:mac_address' => 'MAC Adresi',
-	'Class:NetworkInterface/Attribute:mac_address+' => '',
-	'Class:NetworkInterface/Attribute:speed' => 'Hızı',
-	'Class:NetworkInterface/Attribute:speed+' => '',
-	'Class:NetworkInterface/Attribute:duplex' => 'Çift yönlü',
-	'Class:NetworkInterface/Attribute:duplex+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:auto' => 'Otomatik',
-	'Class:NetworkInterface/Attribute:duplex/Value:auto+' => 'Otomatik',
-	'Class:NetworkInterface/Attribute:duplex/Value:full' => 'Full',
-	'Class:NetworkInterface/Attribute:duplex/Value:full+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:half' => 'Half',
-	'Class:NetworkInterface/Attribute:duplex/Value:half+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:unknown' => 'Unknown',
-	'Class:NetworkInterface/Attribute:duplex/Value:unknown+' => '',
-	'Class:NetworkInterface/Attribute:connected_if' => 'Bağlantıda',
-	'Class:NetworkInterface/Attribute:connected_if+' => 'Bağlantıdaki arayüz',
-	'Class:NetworkInterface/Attribute:connected_name' => 'Bağlantıda',
-	'Class:NetworkInterface/Attribute:connected_name+' => '',
-	'Class:NetworkInterface/Attribute:connected_if_device_id' => 'Bağlı cihazlar',
-	'Class:NetworkInterface/Attribute:connected_if_device_id+' => '',
-	'Class:NetworkInterface/Attribute:connected_if_device_id_name' => 'Cihaz',
-	'Class:NetworkInterface/Attribute:connected_if_device_id_name+' => '',
-	'Class:NetworkInterface/Attribute:link_type' => 'Hat tipi',
-	'Class:NetworkInterface/Attribute:link_type+' => '',
-	'Class:NetworkInterface/Attribute:link_type/Value:downlink' => 'Hat kapalı',
-	'Class:NetworkInterface/Attribute:link_type/Value:downlink+' => '',
-	'Class:NetworkInterface/Attribute:link_type/Value:uplink' => 'Hat açık',
-	'Class:NetworkInterface/Attribute:link_type/Value:uplink+' => '',
-));
-
-
-
-//
-// Class: Device
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Device' => 'Cihaz',
-	'Class:Device+' => '',
-	'Class:Device/Attribute:nwinterface_list' => 'Network arayüzleri',
-	'Class:Device/Attribute:nwinterface_list+' => '',
-));
-
-//
-// Class: PC
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:cpu' => 'CPU',
-	'Class:PC/Attribute:cpu+' => '',
-	'Class:PC/Attribute:ram' => 'RAM',
-	'Class:PC/Attribute:ram+' => '',
-	'Class:PC/Attribute:hdd' => 'Sabit disk',
-	'Class:PC/Attribute:hdd+' => '',
-	'Class:PC/Attribute:os_family' => 'OS Family',
-	'Class:PC/Attribute:os_family+' => '',
-	'Class:PC/Attribute:os_version' => 'OS Versiyonu',
-	'Class:PC/Attribute:os_version+' => '',
-	'Class:PC/Attribute:application_list' => 'Uygulamalar',
-	'Class:PC/Attribute:application_list+' => 'PCye yüklü programlar',
-	'Class:PC/Attribute:patch_list' => 'Yamalar',
-	'Class:PC/Attribute:patch_list+' => 'PCye yüklü yamalar',
-));
-
-//
-// Class: MobileCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:MobileCI' => 'Mobil KK',
-	'Class:MobileCI+' => '',
-));
-
-//
-// Class: MobilePhone
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:MobilePhone' => 'Cep telefonu',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:number' => 'Tel No',
-	'Class:MobilePhone/Attribute:number+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-));
-
-//
-// Class: InfrastructureCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:InfrastructureCI' => 'Altyapı KK',
-	'Class:InfrastructureCI+' => '',
-	'Class:InfrastructureCI/Attribute:description' => 'Tanımlama',
-	'Class:InfrastructureCI/Attribute:description+' => '',
-	'Class:InfrastructureCI/Attribute:location_id' => 'Yerleşke',
-	'Class:InfrastructureCI/Attribute:location_id+' => '',
-	'Class:InfrastructureCI/Attribute:location_name' => 'Yerleşke',
-	'Class:InfrastructureCI/Attribute:location_name+' => '',
-	'Class:InfrastructureCI/Attribute:location_details' => 'Yerleşke detayları',
-	'Class:InfrastructureCI/Attribute:location_details+' => '',
-	'Class:InfrastructureCI/Attribute:management_ip' => 'Yönetim IPsi',
-	'Class:InfrastructureCI/Attribute:management_ip+' => '',
-	'Class:InfrastructureCI/Attribute:default_gateway' => 'Default Gateway',
-	'Class:InfrastructureCI/Attribute:default_gateway+' => '',
-));
-
-//
-// Class: NetworkDevice
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:NetworkDevice' => 'Ağ Cihazı',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:type' => 'Tip',
-	'Class:NetworkDevice/Attribute:type+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator' => 'WAN Accelerator',
-	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:firewall' => 'Firewall',
-	'Class:NetworkDevice/Attribute:type/Value:firewall+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:hub' => 'Hub',
-	'Class:NetworkDevice/Attribute:type/Value:hub+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:loadbalancer' => 'Load Balancer',
-	'Class:NetworkDevice/Attribute:type/Value:loadbalancer+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:router' => 'Router',
-	'Class:NetworkDevice/Attribute:type/Value:router+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:switch' => 'Switch',
-	'Class:NetworkDevice/Attribute:type/Value:switch+' => '',
-	'Class:NetworkDevice/Attribute:ios_version' => 'IOS Version',
-	'Class:NetworkDevice/Attribute:ios_version+' => '',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-	'Class:NetworkDevice/Attribute:snmp_read' => 'SNMP Read',
-	'Class:NetworkDevice/Attribute:snmp_read+' => '',
-	'Class:NetworkDevice/Attribute:snmp_write' => 'SNMP Write',
-	'Class:NetworkDevice/Attribute:snmp_write+' => '',
-));
-
-//
-// Class: Server
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Server' => 'Sunucu',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:cpu' => 'CPU',
-	'Class:Server/Attribute:cpu+' => '',
-	'Class:Server/Attribute:ram' => 'RAM',
-	'Class:Server/Attribute:ram+' => '',
-	'Class:Server/Attribute:hdd' => 'Sabit Disk',
-	'Class:Server/Attribute:hdd+' => '',
-	'Class:Server/Attribute:os_family' => 'OS Family',
-	'Class:Server/Attribute:os_family+' => '',
-	'Class:Server/Attribute:os_version' => 'OS Versiyonu',
-	'Class:Server/Attribute:os_version+' => '',
-	'Class:Server/Attribute:application_list' => 'Uygulamalar',
-	'Class:Server/Attribute:application_list+' => 'Sunucuya yüklü uygulamalar',
-	'Class:Server/Attribute:patch_list' => 'Yamalar',
-	'Class:Server/Attribute:patch_list+' => 'Sunucuya yüklü yamalar',
-));
-
-//
-// Class: Printer
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Printer' => 'Yazıcı',
-	'Class:Printer+' => '',
-	'Class:Printer/Attribute:type' => 'Tip',
-	'Class:Printer/Attribute:type+' => '',
-	'Class:Printer/Attribute:type/Value:mopier' => 'Mopier',
-	'Class:Printer/Attribute:type/Value:mopier+' => '',
-	'Class:Printer/Attribute:type/Value:printer' => 'Printer',
-	'Class:Printer/Attribute:type/Value:printer+' => '',
-	'Class:Printer/Attribute:technology' => 'Technology',
-	'Class:Printer/Attribute:technology+' => '',
-	'Class:Printer/Attribute:technology/Value:inkjet' => 'Inkjet',
-	'Class:Printer/Attribute:technology/Value:inkjet+' => '',
-	'Class:Printer/Attribute:technology/Value:laser' => 'Laser',
-	'Class:Printer/Attribute:technology/Value:laser+' => '',
-	'Class:Printer/Attribute:technology/Value:tracer' => 'Tracer',
-	'Class:Printer/Attribute:technology/Value:tracer+' => '',
-));
-
-//
-// Class: lnkCIToDoc
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkCIToDoc' => 'Doküman/KK',
-	'Class:lnkCIToDoc+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_id' => 'KK',
-	'Class:lnkCIToDoc/Attribute:ci_id+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_name' => 'KK',
-	'Class:lnkCIToDoc/Attribute:ci_name+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_status' => 'KK Durumu',
-	'Class:lnkCIToDoc/Attribute:ci_status+' => '',
-	'Class:lnkCIToDoc/Attribute:document_id' => 'Doküman',
-	'Class:lnkCIToDoc/Attribute:document_id+' => '',
-	'Class:lnkCIToDoc/Attribute:document_name' => 'Doküman',
-	'Class:lnkCIToDoc/Attribute:document_name+' => '',
-	'Class:lnkCIToDoc/Attribute:document_type' => 'Doküman tipi',
-	'Class:lnkCIToDoc/Attribute:document_type+' => '',
-	'Class:lnkCIToDoc/Attribute:document_status' => 'Doküman durumu',
-	'Class:lnkCIToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkCIToContact
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkCIToContact' => 'KK/İrtibat',
-	'Class:lnkCIToContact+' => '',
-	'Class:lnkCIToContact/Attribute:ci_id' => 'KK',
-	'Class:lnkCIToContact/Attribute:ci_id+' => '',
-	'Class:lnkCIToContact/Attribute:ci_name' => 'KK',
-	'Class:lnkCIToContact/Attribute:ci_name+' => '',
-	'Class:lnkCIToContact/Attribute:ci_status' => 'KK Durumu',
-	'Class:lnkCIToContact/Attribute:ci_status+' => '',
-	'Class:lnkCIToContact/Attribute:contact_id' => 'İrtibat',
-	'Class:lnkCIToContact/Attribute:contact_id+' => '',
-	'Class:lnkCIToContact/Attribute:contact_name' => 'İrtibat',
-	'Class:lnkCIToContact/Attribute:contact_name+' => '',
-	'Class:lnkCIToContact/Attribute:contact_email' => 'İrtibat E-posta',
-	'Class:lnkCIToContact/Attribute:contact_email+' => '',
-	'Class:lnkCIToContact/Attribute:role' => 'Rolü',
-	'Class:lnkCIToContact/Attribute:role+' => 'KK ile ilgili irtibatın rolü',
-));
-
-//
-// Class: lnkSolutionToCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkSolutionToCI' => 'KK/Çözüm',
-	'Class:lnkSolutionToCI+' => '',
-	'Class:lnkSolutionToCI/Attribute:solution_id' => 'Uygulama Çözümü',
-	'Class:lnkSolutionToCI/Attribute:solution_id+' => '',
-	'Class:lnkSolutionToCI/Attribute:solution_name' => 'Uygulama Çözümü',
-	'Class:lnkSolutionToCI/Attribute:solution_name+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_id' => 'KK',
-	'Class:lnkSolutionToCI/Attribute:ci_id+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_name' => 'KK',
-	'Class:lnkSolutionToCI/Attribute:ci_name+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_status' => 'KK Durumu',
-	'Class:lnkSolutionToCI/Attribute:ci_status+' => '',
-	'Class:lnkSolutionToCI/Attribute:utility' => 'Yardımcı araç',
-	'Class:lnkSolutionToCI/Attribute:utility+' => 'Çözümdeki KK için yardımcı araç',
-));
-
-//
-// Class: lnkProcessToSolution
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkProcessToSolution' => 'İş Süreci/Çözüm',
-	'Class:lnkProcessToSolution+' => '',
-	'Class:lnkProcessToSolution/Attribute:solution_id' => 'Uygulama Çözümü',
-	'Class:lnkProcessToSolution/Attribute:solution_id+' => '',
-	'Class:lnkProcessToSolution/Attribute:solution_name' => 'Uygulama Çözümü',
-	'Class:lnkProcessToSolution/Attribute:solution_name+' => '',
-	'Class:lnkProcessToSolution/Attribute:process_id' => 'Süreç',
-	'Class:lnkProcessToSolution/Attribute:process_id+' => '',
-	'Class:lnkProcessToSolution/Attribute:process_name' => 'Süreç',
-	'Class:lnkProcessToSolution/Attribute:process_name+' => '',
-	'Class:lnkProcessToSolution/Attribute:reason' => 'Sebep',
-	'Class:lnkProcessToSolution/Attribute:reason+' => 'Çözüm ve süreç arasındaki ilişkinin detayı',
-));
-
-
-
-//
-// Class extensions
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı',
-'Class:Subnet/Tab:IPUsage-explain' => '<em>%1$s</em> - <em>%2$s</em> aralığındaki IPye sahip arayüzler',
-'Class:Subnet/Tab:FreeIPs' => 'Boş IPler',
-'Class:Subnet/Tab:FreeIPs-count' => 'Boş IPler: %1$s',
-'Class:Subnet/Tab:FreeIPs-explain' => 'Boş IP adresleri',
-));
-
-//
-// Application Menu
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-'Menu:DataAdministration' => 'Veri Yönetimi',
-'Menu:DataAdministration+' => 'Veri Yönetimi',
-'Menu:Catalogs' => 'Kataloglar',
-'Menu:Catalogs+' => 'Veri tipleri',
-'Menu:Audit' => 'Denetleme',
-'Menu:Audit+' => 'Denetleme',
-'Menu:CSVImport' => 'CSV dışardan al',
-'Menu:CSVImport+' => 'Çoklu yaratım veya güncelleme',
-'Menu:Organization' => 'Kurumlar',
-'Menu:Organization+' => 'Tüm Kurumlar',
-'Menu:Application' => 'Uygulamalar',
-'Menu:Application+' => 'Tüm Uygulamalar',
-'Menu:DBServer' => 'Veritabanı sunucuları',
-'Menu:DBServer+' => 'Veritabanı sunucuları',
-'Menu:Audit' => 'Denetleme',
-'Menu:ConfigManagement' => 'Konfigürasyon Yönetimi',
-'Menu:ConfigManagement+' => 'Konfigürasyon Yönetimi',
-'Menu:ConfigManagementOverview' => 'Özet',
-'Menu:ConfigManagementOverview+' => 'Özet',
-'Menu:Contact' => 'İrtibatlar',
-'Menu:Contact+' => 'İrtibatlar',
-'Menu:Contact:Count' => '%1$d',
-'Menu:Person' => 'Kişiler',
-'Menu:Person+' => 'Tüm Kişiler',
-'Menu:Team' => 'Ekipler',
-'Menu:Team+' => 'Tüm ekipler',
-'Menu:Document' => 'Dokümanlar',
-'Menu:Document+' => 'Tüm dokümanlar',
-'Menu:Location' => 'Yerleşkeler',
-'Menu:Location+' => 'Tüm Yerleşkeler',
-'Menu:ConfigManagementCI' => 'Konfigürasyon Kalemleri',
-'Menu:ConfigManagementCI+' => 'Konfigürasyon Kalemleri',
-'Menu:BusinessProcess' => 'İş süreçleri',
-'Menu:BusinessProcess+' => 'Tüm İş süreçleri',
-'Menu:ApplicationSolution' => 'Uygulama çözümleri',
-'Menu:ApplicationSolution+' => 'Tüm Uygulama çözümleri',
-'Menu:ConfigManagementSoftware' => 'Uygulama Yönetimi',
-'Menu:Licence' => 'Lisanslar',
-'Menu:Licence+' => 'Tüm Lisanslar',
-'Menu:Patch' => 'Yamalar',
-'Menu:Patch+' => 'Tüm Yamalar',
-'Menu:ApplicationInstance' => 'Yüklenen yazılımlar',
-'Menu:ApplicationInstance+' => 'Uygulama ve Veritabanı sunucuları',
-'Menu:ConfigManagementHardware' => 'Altyapı Yönetimi',
-'Menu:Subnet' => 'Subnets',
-'Menu:Subnet+' => 'All Subnets',
-'Menu:NetworkDevice' => 'Network cihazları',
-'Menu:NetworkDevice+' => 'Tüm Network cihazları',
-'Menu:Server' => 'Sunucular',
-'Menu:Server+' => 'Tüm Sunucular',
-'Menu:Printer' => 'Yazıcılar',
-'Menu:Printer+' => 'Tüm Yazıcılar',
-'Menu:MobilePhone' => 'Cep Telefonları',
-'Menu:MobilePhone+' => 'Tüm Cep Telefonları',
-'Menu:PC' => 'Kişisel Bilgisayarlar',
-'Menu:PC+' => 'Tüm Kişisel Bilgisayarlar',
-'Menu:NewContact' => 'Yeni İrtibat',
-'Menu:NewContact+' => 'Yeni İrtibat',
-'Menu:SearchContacts' => 'İrtibat ara',
-'Menu:SearchContacts+' => 'İrtibat ara',
-'Menu:NewCI' => 'Yeni KK',
-'Menu:NewCI+' => 'Yeni KK',
-'Menu:SearchCIs' => 'KK ara',
-'Menu:SearchCIs+' => 'KK ara',
-'Menu:ConfigManagement:Devices' => 'Cihazlar',
-'Menu:ConfigManagement:AllDevices' => 'Altyapı',
-'Menu:ConfigManagement:SWAndApps' => 'Yazılım ve uygulamalar',
-'Menu:ConfigManagement:Misc' => 'Diğer',
-'Menu:Group' => 'KK Grupları',
-'Menu:Group+' => 'KK Grupları',
-'Menu:ConfigManagement:Shortcuts' => 'Kısalyollar',
-'Menu:ConfigManagement:AllContacts' => 'Tüm irtibatlar: %1$d',
-
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
-	'Class:Location/Attribute:person_list' => 'Contacts~~',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
-	'Class:Contact/Attribute:notify' => 'Notification~~',
-	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
-	'Class:Contact/Attribute:function' => 'Function~~',
-	'Class:Contact/Attribute:cis_list' => 'CIs~~',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
-	'Class:Person/Attribute:name' => 'Last Name~~',
-	'Class:Person/Attribute:employee_number' => 'Employee number~~',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
-	'Class:Person/Attribute:location_id' => 'Location~~',
-	'Class:Person/Attribute:location_name' => 'Location name~~',
-	'Class:Person/Attribute:manager_id' => 'Manager~~',
-	'Class:Person/Attribute:manager_name' => 'Manager name~~',
-	'Class:Person/Attribute:team_list' => 'Teams~~',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
-	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
-	'Class:Team/Attribute:persons_list' => 'Members~~',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
-	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
-	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:cis_list' => 'CIs~~',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Document Type~~',
-	'Class:DocumentFile' => 'Document File~~',
-	'Class:DocumentFile/Attribute:file' => 'File~~',
-	'Class:DocumentNote' => 'Document Note~~',
-	'Class:DocumentNote/Attribute:text' => 'Text~~',
-	'Class:DocumentWeb' => 'Document Web~~',
-	'Class:DocumentWeb/Attribute:url' => 'URL~~',
-	'Class:FunctionalCI/Attribute:description' => 'Description~~',
-	'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/Value:high' => 'high~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
-	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date~~',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts~~',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Documents~~',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
-	'Class:PhysicalDevice' => 'Physical Device~~',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Location name~~',
-	'Class:PhysicalDevice/Attribute:status' => 'Status~~',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock~~',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand~~',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name~~',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Model~~',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Model name~~',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number~~',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date~~',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty~~',
-	'Class:Rack' => 'Rack~~',
-	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
-	'Class:Rack/Attribute:device_list' => 'Devices~~',
-	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
-	'Class:Rack/Attribute:enclosure_list' => 'Enclosures~~',
-	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
-	'Class:TelephonyCI' => 'Telephony CI~~',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number~~',
-	'Class:Phone' => 'Phone~~',
-	'Class:IPPhone' => 'IP Phone~~',
-	'Class:Tablet' => 'Tablet~~',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
-	'Class:DatacenterDevice' => 'Datacenter Device~~',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure~~',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name~~',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name~~',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source~~',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name~~',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports~~',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs~~',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
-	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices~~',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version~~',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name~~',
-	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
-	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:Server/Attribute:osversion_id' => 'OS version~~',
-	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
-	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
-	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
-	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes~~',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
-	'Class:StorageSystem' => 'Storage System~~',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
-	'Class:SANSwitch' => 'SAN Switch~~',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
-	'Class:TapeLibrary' => 'Tape Library~~',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
-	'Class:NAS' => 'NAS~~',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
-	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
-	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:PC/Attribute:osversion_id' => 'OS version~~',
-	'Class:PC/Attribute:osversion_name' => 'OS version name~~',
-	'Class:PC/Attribute:type' => 'Type~~',
-	'Class:PC/Attribute:type/Value:desktop' => 'desktop~~',
-	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
-	'Class:PC/Attribute:type/Value:laptop' => 'laptop~~',
-	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
-	'Class:PowerConnection' => 'Power Connection~~',
-	'Class:PowerSource' => 'Power Source~~',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
-	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
-	'Class:PDU' => 'PDU~~',
-	'Class:PDU/Attribute:rack_id' => 'Rack~~',
-	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
-	'Class:PDU/Attribute:powerstart_id' => 'Power start~~',
-	'Class:PDU/Attribute:powerstart_name' => 'Power start name~~',
-	'Class:Peripheral' => 'Peripheral~~',
-	'Class:Enclosure' => 'Enclosure~~',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
-	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
-	'Class:Enclosure/Attribute:nb_u' => 'Rack units~~',
-	'Class:Enclosure/Attribute:device_list' => 'Devices~~',
-	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes~~',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
-	'Class:ApplicationSolution/Attribute:status' => 'Status~~',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active~~',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions~~',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
-	'Class:BusinessProcess/Attribute:status' => 'Status~~',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'active~~',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:SoftwareInstance/Attribute:system_id' => 'System~~',
-	'Class:SoftwareInstance/Attribute:system_name' => 'System name~~',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
-	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
-	'Class:SoftwareInstance/Attribute:status' => 'Status~~',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active~~',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:Middleware' => 'Middleware~~',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
-	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas~~',
-	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
-	'Class:WebServer' => 'Web server~~',
-	'Class:WebServer/Attribute:webapp_list' => 'Web applications~~',
-	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
-	'Class:PCSoftware' => 'PC Software~~',
-	'Class:OtherSoftware' => 'Other Software~~',
-	'Class:MiddlewareInstance' => 'Middleware Instance~~',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
-	'Class:DatabaseSchema' => 'Database Schema~~',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
-	'Class:WebApplication' => 'Web Application~~',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
-	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
-	'Class:WebApplication/Attribute:url' => 'URL~~',
-	'Class:VirtualDevice' => 'Virtual Device~~',
-	'Class:VirtualDevice/Attribute:status' => 'Status~~',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'production~~',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock~~',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes~~',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
-	'Class:VirtualHost' => 'Virtual Host~~',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines~~',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
-	'Class:Hypervisor' => 'Hypervisor~~',
-	'Class:Hypervisor/Attribute:farm_id' => 'Farm~~',
-	'Class:Hypervisor/Attribute:farm_name' => 'Farm name~~',
-	'Class:Hypervisor/Attribute:server_id' => 'Server~~',
-	'Class:Hypervisor/Attribute:server_name' => 'Server name~~',
-	'Class:Farm' => 'Farm~~',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors~~',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
-	'Class:Farm/Attribute:redundancy' => 'High availability~~',
-	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
-	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
-	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
-	'Class:VirtualMachine' => 'Virtual Machine~~',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family~~',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version~~',
-	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
-	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM~~',
-	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
-	'Class:LogicalVolume' => 'Logical Volume~~',
-	'Class:LogicalVolume/Attribute:name' => 'Name~~',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID~~',
-	'Class:LogicalVolume/Attribute:description' => 'Description~~',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level~~',
-	'Class:LogicalVolume/Attribute:size' => 'Size~~',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system~~',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name~~',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servers~~',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices~~',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
-	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Server~~',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name~~',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used~~',
-	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used~~',
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc~~',
-	'Class:Tape' => 'Tape~~',
-	'Class:Tape/Attribute:name' => 'Name~~',
-	'Class:Tape/Attribute:description' => 'Description~~',
-	'Class:Tape/Attribute:size' => 'Size~~',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library~~',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
-	'Class:NASFileSystem' => 'NAS File System~~',
-	'Class:NASFileSystem/Attribute:name' => 'Name~~',
-	'Class:NASFileSystem/Attribute:description' => 'Description~~',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level~~',
-	'Class:NASFileSystem/Attribute:size' => 'Size~~',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
-	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name~~',
-	'Class:Software/Attribute:vendor' => 'vendor~~',
-	'Class:Software/Attribute:version' => 'Version~~',
-	'Class:Software/Attribute:documents_list' => 'Documents~~',
-	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
-	'Class:Software/Attribute:type' => 'Type~~',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server~~',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software~~',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software~~',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server~~',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances~~',
-	'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:Patch/Attribute:documents_list' => 'Documents~~',
-	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
-	'Class:Patch/Attribute:finalclass' => 'Type~~',
-	'Class:OSPatch' => 'OS Patch~~',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices~~',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
-	'Class:OSPatch/Attribute:osversion_id' => 'OS version~~',
-	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
-	'Class:SoftwarePatch' => 'Software Patch~~',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software~~',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
-	'Class:Licence/Attribute:documents_list' => 'Documents~~',
-	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
-	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
-	'Class:Licence/Attribute:organization_name+' => 'Common name~~',
-	'Class:Licence/Attribute:description' => 'Description~~',
-	'Class:Licence/Attribute:start_date' => 'Start date~~',
-	'Class:Licence/Attribute:end_date' => 'End date~~',
-	'Class:Licence/Attribute:perpetual' => 'Perpetual~~',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'no~~',
-	'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:OSLicence' => 'OS Licence~~',
-	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
-	'Class:OSLicence/Attribute:osversion_name' => 'OS version 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:SoftwareLicence' => 'Software Licence~~',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
-	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name~~',
-	'Class:Typology' => 'Typology~~',
-	'Class:Typology/Attribute:name' => 'Name~~',
-	'Class:Typology/Attribute:finalclass' => 'Type~~',
-	'Class:OSVersion' => 'OS Version~~',
-	'Class:OSVersion/Attribute:osfamily_id' => 'OS family~~',
-	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:OSFamily' => 'OS Family~~',
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:Brand' => 'Brand~~',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
-	'Class:Model' => 'Model~~',
-	'Class:Model/Attribute:brand_id' => 'Brand~~',
-	'Class:Model/Attribute:brand_name' => 'Brand name~~',
-	'Class:Model/Attribute:type' => 'Device type~~',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
-	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source~~',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
-	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array~~',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone~~',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone~~',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
-	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device~~',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
-	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
-	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
-	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
-	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
-	'Class:Model/Attribute:type/Value:Printer' => 'Printer~~',
-	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
-	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
-	'Class:Model/Attribute:type/Value:Server' => 'Server~~',
-	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet~~',
-	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
-	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
-	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
-	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
-	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
-	'Class:NetworkDeviceType' => 'Network Device Type~~',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices~~',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
-	'Class:IOSVersion' => 'IOS Version~~',
-	'Class:IOSVersion/Attribute:brand_id' => 'Brand~~',
-	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
-	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
-	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name~~',
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name~~',
-	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:Subnet/Attribute:org_name' => 'Name~~',
-	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
-	'Class:Subnet/Attribute:vlans_list' => 'VLANs~~',
-	'Class:VLAN' => 'VLAN~~',
-	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:VLAN/Attribute:description' => 'Description~~',
-	'Class:VLAN/Attribute:org_id' => 'Organization~~',
-	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
-	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
-	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
-	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN~~',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:NetworkInterface/Attribute:name' => 'Name~~',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
-	'Class:IPInterface' => 'IP Interface~~',
-	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
-	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
-	'Class:IPInterface/Attribute:comment' => 'Comment~~',
-	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway~~',
-	'Class:IPInterface/Attribute:ipmask' => 'IP mask~~',
-	'Class:IPInterface/Attribute:speed' => 'Speed~~',
-	'Class:PhysicalInterface' => 'Physical Interface~~',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs~~',
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:LogicalInterface' => 'Logical Interface~~',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine~~',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name~~',
-	'Class:FiberChannelInterface' => 'Fiber Channel Interface~~',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Speed~~',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topology~~',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN~~',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device~~',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name~~',
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => '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:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name~~',
-	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group~~',
-	'Menu:ConfigManagement:virtualization' => 'Virtualization~~',
-	'Menu:ConfigManagement:EndUsers' => 'End user devices~~',
-	'Menu:Typology' => 'Typology configuration~~',
-	'Menu:Typology+' => 'Typology configuration~~',
-	'Menu:OSVersion' => 'OS versions~~',
-	'Menu:Software' => 'Software catalog~~',
-	'Menu:Software+' => 'Software catalog~~',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-	'Server:baseinfo' => 'General information~~',
-	'Server:Date' => 'Dates~~',
-	'Server:moreinfo' => 'More information~~',
-	'Server:otherinfo' => 'Other information~~',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'General information~~',
-	'Person:notifiy' => 'Notification~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Relation:impacts/Description' => 'Etkilenen kalemler',
+	'Relation:impacts/DownStream' => 'Etkiler...',
+	'Relation:impacts/DownStream+' => 'Etkilenen kalemler',
+	'Relation:impacts/UpStream' => 'Bağımlı olanlar...',
+	'Relation:impacts/UpStream+' => 'Bu kaleme bağımlı olan kalemler',
+	// Legacy entries
+	'Relation:depends on/Description' => 'Bu kaleme bağımlı olan kalemler',
+	'Relation:depends on/DownStream' => 'Bağımlı olanlar...',
+	'Relation:depends on/UpStream' => 'Etkiledikleri...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Organization' => 'Kurum',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Adı',
+	'Class:Organization/Attribute:name+' => 'Kullanılan adı',
+	'Class:Organization/Attribute:code' => 'Kodu',
+	'Class:Organization/Attribute:code+' => 'Kurumu kodu (Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => 'Durumu',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Etkin',
+	'Class:Organization/Attribute:status/Value:active+' => 'Etkin',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Etkin değil',
+	'Class:Organization/Attribute:status/Value:inactive+' => 'Etkin değil',
+	'Class:Organization/Attribute:parent_id' => 'Bağlı olduğu kurum',
+	'Class:Organization/Attribute:parent_id+' => 'Bağlı olduğu kurum',
+	'Class:Organization/Attribute:parent_name' => 'Bağlı olduğu kurumun adı',
+	'Class:Organization/Attribute:parent_name+' => 'Bağlı olduğu kurumun adı',
+));
+
+
+//
+// Class: Location
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Location' => 'Yerleşke',
+	'Class:Location+' => 'Yerleşke : Bölge, Ülke, Şehir, Yerleşke, Bina, Kat, Oda, kabin,...',
+	'Class:Location/Attribute:name' => 'Adı',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Durumu',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Etkin',
+	'Class:Location/Attribute:status/Value:active+' => 'Etkin',
+	'Class:Location/Attribute:status/Value:inactive' => 'Etkin değil',
+	'Class:Location/Attribute:status/Value:inactive+' => 'Etkin değil',
+	'Class:Location/Attribute:org_id' => 'Kurumun sahibi',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => 'Kurumun sahibinin adı',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => 'Adres',
+	'Class:Location/Attribute:address+' => 'Posta adresi',
+	'Class:Location/Attribute:postal_code' => 'Posta kodu',
+	'Class:Location/Attribute:postal_code+' => 'Posta kodu',
+	'Class:Location/Attribute:city' => 'Şehir',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Ülke',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:parent_id' => 'Bağlı olduğu yerleşke',
+	'Class:Location/Attribute:parent_id+' => '',
+	'Class:Location/Attribute:parent_name' => 'Ebebeyn adı',
+	'Class:Location/Attribute:parent_name+' => '',
+	'Class:Location/Attribute:contact_list' => 'İrtibatlar',
+	'Class:Location/Attribute:contact_list+' => 'Yerleşkedeki irtibatlar',
+	'Class:Location/Attribute:infra_list' => 'Altyapı',
+	'Class:Location/Attribute:infra_list+' => 'Yerleşkedeki Konfigürasyon Kalemleri (KK)',
+));
+//
+// Class: Group
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Group' => 'Grup',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Adı',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Surumu',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Uygulama',
+	'Class:Group/Attribute:status/Value:implementation+' => 'Uygulama',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Üretimden kalkan',
+	'Class:Group/Attribute:status/Value:obsolete+' => 'Üretimden kalkan',
+	'Class:Group/Attribute:status/Value:production' => 'Kullanımda',
+	'Class:Group/Attribute:status/Value:production+' => 'Kullanımda',
+	'Class:Group/Attribute:org_id' => 'Kurum',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:owner_name' => 'Adı',
+	'Class:Group/Attribute:owner_name+' => 'Kullanılan Adı',
+	'Class:Group/Attribute:description' => 'Tanımlama',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Tip',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Bağlı olduğu grup',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:parent_name' => 'Adı',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:ci_list' => 'Bağlantılı Konfigürasyon Kalemleri (KK)',
+	'Class:Group/Attribute:ci_list+' => '',
+));
+
+//
+// Class: lnkGroupToCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkGroupToCI' => 'Grup / KK',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Grup',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Adı',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'KK',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Adı',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_status' => 'KK durumu',
+	'Class:lnkGroupToCI/Attribute:ci_status+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Sebep',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+));
+
+
+//
+// Class: Contact
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Contact' => 'İrtibat',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Adı',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Durumu',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Etkin',
+	'Class:Contact/Attribute:status/Value:active+' => 'Etkin',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Etkin değil',
+	'Class:Contact/Attribute:status/Value:inactive+' => 'Etkin değil',
+	'Class:Contact/Attribute:org_id' => 'Kurum',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Kurum',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'E-posta',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefon',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:location_id' => 'Yerleşke',
+	'Class:Contact/Attribute:location_id+' => '',
+	'Class:Contact/Attribute:location_name' => 'Yerleşke',
+	'Class:Contact/Attribute:location_name+' => '',
+	'Class:Contact/Attribute:ci_list' => 'Konfigürasyon kalemleri',
+	'Class:Contact/Attribute:ci_list+' => 'İrtibatla ilgili KK',
+	'Class:Contact/Attribute:contract_list' => 'İrtibatlar',
+	'Class:Contact/Attribute:contract_list+' => 'İrtibatla ilgili sözleşmeler',
+	'Class:Contact/Attribute:service_list' => 'Hizmetler',
+	'Class:Contact/Attribute:service_list+' => 'İrtibatla ilgili hizmetler',
+	'Class:Contact/Attribute:ticket_list' => 'Çağrılar',
+	'Class:Contact/Attribute:ticket_list+' => 'İrtibatla ilgili çağrılar',
+	'Class:Contact/Attribute:team_list' => 'Ekipler',
+	'Class:Contact/Attribute:team_list+' => 'İrtibatın dahil olduğu ekip',
+	'Class:Contact/Attribute:finalclass' => 'Tip',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Person' => 'Kişi',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:first_name' => 'Adı',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_id' => 'Çalışan No',
+	'Class:Person/Attribute:employee_id+' => '',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Team' => 'Ekip',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:member_list' => 'Üyeleri',
+	'Class:Team/Attribute:member_list+' => 'Ekip üyeleri',
+));
+
+//
+// Class: lnkTeamToContact
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkTeamToContact' => 'Ekip üyeleri',
+	'Class:lnkTeamToContact+' => 'Ekip üyeleri',
+	'Class:lnkTeamToContact/Attribute:team_id' => 'Ekip',
+	'Class:lnkTeamToContact/Attribute:team_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_id' => 'Üye',
+	'Class:lnkTeamToContact/Attribute:contact_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_location_id' => 'Yerleşke',
+	'Class:lnkTeamToContact/Attribute:contact_location_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_email' => 'E-posta',
+	'Class:lnkTeamToContact/Attribute:contact_email+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_phone' => 'Telefon',
+	'Class:lnkTeamToContact/Attribute:contact_phone+' => '',
+	'Class:lnkTeamToContact/Attribute:role' => 'Rolü',
+	'Class:lnkTeamToContact/Attribute:role+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Document' => 'Doküman',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Adı',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Kurum',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:org_name' => 'Kurum Adı',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:description' => 'Tanımlama',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:type' => 'Tip',
+	'Class:Document/Attribute:type+' => '',
+	'Class:Document/Attribute:type/Value:contract' => 'Sözleşme',
+	'Class:Document/Attribute:type/Value:contract+' => '',
+	'Class:Document/Attribute:type/Value:networkmap' => 'Ağ haritası',
+	'Class:Document/Attribute:type/Value:networkmap+' => '',
+	'Class:Document/Attribute:type/Value:presentation' => 'Sunum',
+	'Class:Document/Attribute:type/Value:presentation+' => '',
+	'Class:Document/Attribute:type/Value:training' => 'Eğitim',
+	'Class:Document/Attribute:type/Value:training+' => '',
+	'Class:Document/Attribute:type/Value:whitePaper' => 'Tanıtım',
+	'Class:Document/Attribute:type/Value:whitePaper+' => '',
+	'Class:Document/Attribute:type/Value:workinginstructions' => 'İş talimatı',
+	'Class:Document/Attribute:type/Value:workinginstructions+' => '',
+	'Class:Document/Attribute:status' => 'Durumu',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Taslak',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Geçersiz',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Yayınlanan',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:ci_list' => 'Konfigürasyon kalemleri',
+	'Class:Document/Attribute:ci_list+' => 'Dokümana referans veren KKler',
+	'Class:Document/Attribute:contract_list' => 'İrtibatlar',
+	'Class:Document/Attribute:contract_list+' => 'Dokümanla ilgili sözleşmeler',
+	'Class:Document/Attribute:service_list' => 'Servisler',
+	'Class:Document/Attribute:service_list+' => 'Dokümanla ilgili servisler',
+	'Class:Document/Attribute:ticket_list' => 'Çağrılar',
+	'Class:Document/Attribute:ticket_list+' => 'Dokümanla ilgili çağrılar',
+	'Class:Document:PreviewTab' => 'Ön görünüm',
+));
+
+//
+// Class: WebDoc
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:WebDoc' => 'Web Dokümanı',
+	'Class:WebDoc+' => 'Farklı web sunucunda olan dokümanlar',
+	'Class:WebDoc/Attribute:url' => 'Url',
+	'Class:WebDoc/Attribute:url+' => '',
+));
+
+//
+// Class: Note
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Note' => 'Not',
+	'Class:Note+' => '',
+	'Class:Note/Attribute:note' => 'Metin',
+	'Class:Note/Attribute:note+' => '',
+));
+
+//
+// Class: FileDoc
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FileDoc' => 'Doküman (dosya)',
+	'Class:FileDoc+' => '',
+	'Class:FileDoc/Attribute:contents' => 'İçerik',
+	'Class:FileDoc/Attribute:contents+' => '',
+));
+
+//
+// Class: Licence
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Licence' => 'Lisans',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:provider' => 'Lisansı veren',
+	'Class:Licence/Attribute:provider+' => '',
+	'Class:Licence/Attribute:org_id' => 'Sahibi',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:org_name' => 'Adı',
+	'Class:Licence/Attribute:org_name+' => 'Adı',
+	'Class:Licence/Attribute:product' => 'Ürün',
+	'Class:Licence/Attribute:product+' => '',
+	'Class:Licence/Attribute:name' => 'Adı',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:start' => 'Başlangıç tarihi',
+	'Class:Licence/Attribute:start+' => '',
+	'Class:Licence/Attribute:end' => 'Bitiş tarihi',
+	'Class:Licence/Attribute:end+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Lisans',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:scope' => 'Kapsam',
+	'Class:Licence/Attribute:scope+' => '',
+	'Class:Licence/Attribute:usage_limit' => 'Kullanım limit',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:usage_list' => 'Kullanım',
+	'Class:Licence/Attribute:usage_list+' => 'Lisansı kullanan uygulamalar',
+));
+
+
+//
+// Class: Subnet
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Subnet' => 'Subnet',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s / %2$s',
+	//'Class:Subnet/Attribute:name' => 'Adı',
+	//'Class:Subnet/Attribute:name+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Kurum',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:description' => 'Tanımlama',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+));
+
+//
+// Class: Patch
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Patch' => 'Yama',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Adı',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:description' => 'Tanımlama',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:target_sw' => 'Hedef uygulama',
+	'Class:Patch/Attribute:target_sw+' => 'Hedef yazılım',
+	'Class:Patch/Attribute:version' => 'Versiyon',
+	'Class:Patch/Attribute:version+' => '',
+	'Class:Patch/Attribute:type' => 'Tip',
+	'Class:Patch/Attribute:type+' => '',
+	'Class:Patch/Attribute:type/Value:application' => 'Uygulama',
+	'Class:Patch/Attribute:type/Value:application+' => '',
+	'Class:Patch/Attribute:type/Value:os' => 'İşletim sistemi',
+	'Class:Patch/Attribute:type/Value:os+' => '',
+	'Class:Patch/Attribute:type/Value:security' => 'Güvenlik',
+	'Class:Patch/Attribute:type/Value:security+' => '',
+	'Class:Patch/Attribute:type/Value:servicepack' => 'Servis paketi',
+	'Class:Patch/Attribute:type/Value:servicepack+' => '',
+	'Class:Patch/Attribute:ci_list' => 'Cihazlar',
+	'Class:Patch/Attribute:ci_list+' => 'Yamanın yüklendiği cihazlar',
+));
+
+//
+// Class: Software
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Software' => 'Yazılım',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Adı',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:description' => 'Tanımlama',
+	'Class:Software/Attribute:description+' => '',
+	'Class:Software/Attribute:instance_list' => 'Yüklemeler',
+	'Class:Software/Attribute:instance_list+' => 'Yazılımın kurulumları',
+	'Class:Software/Attribute:finalclass' => 'Tip',
+	'Class:Software/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Application
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Application' => 'Uygulama',
+	'Class:Application+' => '',
+	'Class:Application/Attribute:name' => 'Adı',
+	'Class:Application/Attribute:name+' => '',
+	'Class:Application/Attribute:description' => 'Tanımlama',
+	'Class:Application/Attribute:description+' => '',
+	'Class:Application/Attribute:instance_list' => 'Yüklemeler',
+	'Class:Application/Attribute:instance_list+' => 'Uygulamanın kurulumları',
+));
+
+//
+// Class: DBServer
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DBServer' => 'Veritabanı',
+	'Class:DBServer+' => 'Veritabanı yazılımı',
+	'Class:DBServer/Attribute:instance_list' => 'Yüklemeler',
+	'Class:DBServer/Attribute:instance_list+' => 'Veritabanı kurulumları',
+));
+
+//
+// Class: lnkPatchToCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkPatchToCI' => 'Yama kullanımı',
+	'Class:lnkPatchToCI+' => '',
+	'Class:lnkPatchToCI/Attribute:patch_id' => 'Yama',
+	'Class:lnkPatchToCI/Attribute:patch_id+' => '',
+	'Class:lnkPatchToCI/Attribute:patch_name' => 'Yama',
+	'Class:lnkPatchToCI/Attribute:patch_name+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_id' => 'KK',
+	'Class:lnkPatchToCI/Attribute:ci_id+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_name' => 'KK',
+	'Class:lnkPatchToCI/Attribute:ci_name+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_status' => 'KK Durumu',
+	'Class:lnkPatchToCI/Attribute:ci_status+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:FunctionalCI' => 'Fonksiyonel KK',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Adı',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:status' => 'Durumu',
+	'Class:FunctionalCI/Attribute:status+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:implementation' => 'Uygulama',
+	'Class:FunctionalCI/Attribute:status/Value:implementation+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:obsolete' => 'Üretimden kalkan',
+	'Class:FunctionalCI/Attribute:status/Value:obsolete+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:production' => 'Kullanımda',
+	'Class:FunctionalCI/Attribute:status/Value:production+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Sahip kurum',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:owner_name' => 'Sahip kurum',
+	'Class:FunctionalCI/Attribute:owner_name+' => '',
+	'Class:FunctionalCI/Attribute:importance' => 'İş açısından kritikliği',
+	'Class:FunctionalCI/Attribute:importance+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:high' => 'Yüksek',
+	'Class:FunctionalCI/Attribute:importance/Value:high+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:low' => 'Düşük',
+	'Class:FunctionalCI/Attribute:importance/Value:low+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:medium' => 'Orta',
+	'Class:FunctionalCI/Attribute:importance/Value:medium+' => '',
+	'Class:FunctionalCI/Attribute:contact_list' => 'İrtibatlar',
+	'Class:FunctionalCI/Attribute:contact_list+' => 'KK için İrtibatlar',
+	'Class:FunctionalCI/Attribute:document_list' => 'Dokümanlar',
+	'Class:FunctionalCI/Attribute:document_list+' => 'KK için dokümanlar',
+	'Class:FunctionalCI/Attribute:solution_list' => 'Uygulama çözümleri',
+	'Class:FunctionalCI/Attribute:solution_list+' => 'KKyi kullanan uygulama çözümleri',
+	'Class:FunctionalCI/Attribute:contract_list' => 'İrtibatlar',
+	'Class:FunctionalCI/Attribute:contract_list+' => 'KKyi destekleyen sözleşmeler',
+	'Class:FunctionalCI/Attribute:ticket_list' => 'Çağrılar',
+	'Class:FunctionalCI/Attribute:ticket_list+' => 'KK ile ilgili çağrılar',
+	'Class:FunctionalCI/Attribute:finalclass' => 'Tip',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+));
+
+//
+// Class: SoftwareInstance
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:SoftwareInstance' => 'Yazılım Kurulumu',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Name' => '%1$s - %2$s',
+	'Class:SoftwareInstance/Attribute:device_id' => 'Cihaz',
+	'Class:SoftwareInstance/Attribute:device_id+' => '',
+	'Class:SoftwareInstance/Attribute:device_name' => 'Cihaz',
+	'Class:SoftwareInstance/Attribute:device_name+' => '',
+	'Class:SoftwareInstance/Attribute:licence_id' => 'Lisans',
+	'Class:SoftwareInstance/Attribute:licence_id+' => '',
+	'Class:SoftwareInstance/Attribute:licence_name' => 'Lisans',
+	'Class:SoftwareInstance/Attribute:licence_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Yazılım',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:version' => 'Versiyon',
+	'Class:SoftwareInstance/Attribute:version+' => '',
+	'Class:SoftwareInstance/Attribute:description' => 'Tanımlama',
+	'Class:SoftwareInstance/Attribute:description+' => '',
+));
+
+//
+// Class: ApplicationInstance
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ApplicationInstance' => 'Uygulama Kurulumu',
+	'Class:ApplicationInstance+' => '',
+	'Class:ApplicationInstance/Name' => '%1$s - %2$s',
+	'Class:ApplicationInstance/Attribute:software_id' => 'Yazılım',
+	'Class:ApplicationInstance/Attribute:software_id+' => '',
+	'Class:ApplicationInstance/Attribute:software_name' => 'Adı',
+	'Class:ApplicationInstance/Attribute:software_name+' => '',
+));
+
+
+//
+// Class: DBServerInstance
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DBServerInstance' => 'Veritabanı Sunucusu',
+	'Class:DBServerInstance+' => '',
+	'Class:DBServerInstance/Name' => '%1$s - %2$s',
+	'Class:DBServerInstance/Attribute:software_id' => 'Yazılım',
+	'Class:DBServerInstance/Attribute:software_id+' => '',
+	'Class:DBServerInstance/Attribute:software_name' => 'Adı',
+	'Class:DBServerInstance/Attribute:software_name+' => '',
+	'Class:DBServerInstance/Attribute:dbinstance_list' => 'Veritabanları',
+	'Class:DBServerInstance/Attribute:dbinstance_list+' => 'Veritabanları',
+));
+
+
+//
+// Class: DatabaseInstance
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:DatabaseInstance' => 'Veritabanı',
+	'Class:DatabaseInstance+' => '',
+	'Class:DatabaseInstance/Name' => '%1$s - %2$s',
+	'Class:DatabaseInstance/Attribute:db_server_instance_id' => 'Veritabanı sunucusu',
+	'Class:DatabaseInstance/Attribute:db_server_instance_id+' => '',
+	'Class:DatabaseInstance/Attribute:db_server_instance_version' => 'Veritabanı versiyonu',
+	'Class:DatabaseInstance/Attribute:db_server_instance_version+' => '',
+	'Class:DatabaseInstance/Attribute:description' => 'Tanımlama',
+	'Class:DatabaseInstance/Attribute:description+' => '',
+));
+
+//
+// Class: ApplicationSolution
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ApplicationSolution' => 'Uygulama çözümleri',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:description' => 'Tanımlama',
+	'Class:ApplicationSolution/Attribute:description+' => '',
+	'Class:ApplicationSolution/Attribute:ci_list' => 'Konfigürasyon kalemleri',
+	'Class:ApplicationSolution/Attribute:ci_list+' => 'Çözümü oluşturan KKler',
+	'Class:ApplicationSolution/Attribute:process_list' => 'İş süreçleri',
+	'Class:ApplicationSolution/Attribute:process_list+' => 'Uygulama çözümüne bağımlı iş süreci',
+));
+
+//
+// Class: BusinessProcess
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:BusinessProcess' => 'İş süreci',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:description' => 'Tanımlama',
+	'Class:BusinessProcess/Attribute:description+' => '',
+	'Class:BusinessProcess/Attribute:used_solution_list' => 'Uygulama çözümleri',
+	'Class:BusinessProcess/Attribute:used_solution_list+' => 'Sürecin bağımlı olduğu iş süreci',
+));
+
+//
+// Class: ConnectableCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ConnectableCI' => 'Bağlanabilir KK',
+	'Class:ConnectableCI+' => 'Fiziksel KK',
+	'Class:ConnectableCI/Attribute:brand' => 'Marka',
+	'Class:ConnectableCI/Attribute:brand+' => '',
+	'Class:ConnectableCI/Attribute:model' => 'Model',
+	'Class:ConnectableCI/Attribute:model+' => '',
+	'Class:ConnectableCI/Attribute:serial_number' => 'Seri No',
+	'Class:ConnectableCI/Attribute:serial_number+' => '',
+	'Class:ConnectableCI/Attribute:asset_ref' => 'Kaynak referansı',
+	'Class:ConnectableCI/Attribute:asset_ref+' => '',
+));
+
+//
+// Class: NetworkInterface
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:NetworkInterface' => 'Network arayüzü',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Name' => '%1$s - %2$s',
+	'Class:NetworkInterface/Attribute:device_id' => 'Cihaz',
+	'Class:NetworkInterface/Attribute:device_id+' => '',
+	'Class:NetworkInterface/Attribute:device_name' => 'Cihaz',
+	'Class:NetworkInterface/Attribute:device_name+' => '',
+	'Class:NetworkInterface/Attribute:logical_type' => 'Mantıksal tipi',
+	'Class:NetworkInterface/Attribute:logical_type+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:backup' => 'Yedek',
+	'Class:NetworkInterface/Attribute:logical_type/Value:backup+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:logical' => 'Mantıksal',
+	'Class:NetworkInterface/Attribute:logical_type/Value:logical+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:port' => 'Port',
+	'Class:NetworkInterface/Attribute:logical_type/Value:port+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:primary' => 'Birincil',
+	'Class:NetworkInterface/Attribute:logical_type/Value:primary+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:secondary' => 'İkincil',
+	'Class:NetworkInterface/Attribute:logical_type/Value:secondary+' => '',
+	'Class:NetworkInterface/Attribute:physical_type' => 'Fiziksel tip',
+	'Class:NetworkInterface/Attribute:physical_type+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:atm' => 'ATM',
+	'Class:NetworkInterface/Attribute:physical_type/Value:atm+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet' => 'Ethernet',
+	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay' => 'Frame Relay',
+	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:vlan' => 'VLAN',
+	'Class:NetworkInterface/Attribute:physical_type/Value:vlan+' => '',
+	'Class:NetworkInterface/Attribute:ip_address' => 'IP Adresi',
+	'Class:NetworkInterface/Attribute:ip_address+' => '',
+	'Class:NetworkInterface/Attribute:ip_mask' => 'IP maskesi',
+	'Class:NetworkInterface/Attribute:ip_mask+' => '',
+	'Class:NetworkInterface/Attribute:mac_address' => 'MAC Adresi',
+	'Class:NetworkInterface/Attribute:mac_address+' => '',
+	'Class:NetworkInterface/Attribute:speed' => 'Hızı',
+	'Class:NetworkInterface/Attribute:speed+' => '',
+	'Class:NetworkInterface/Attribute:duplex' => 'Çift yönlü',
+	'Class:NetworkInterface/Attribute:duplex+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:auto' => 'Otomatik',
+	'Class:NetworkInterface/Attribute:duplex/Value:auto+' => 'Otomatik',
+	'Class:NetworkInterface/Attribute:duplex/Value:full' => 'Full',
+	'Class:NetworkInterface/Attribute:duplex/Value:full+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:half' => 'Half',
+	'Class:NetworkInterface/Attribute:duplex/Value:half+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:unknown' => 'Unknown',
+	'Class:NetworkInterface/Attribute:duplex/Value:unknown+' => '',
+	'Class:NetworkInterface/Attribute:connected_if' => 'Bağlantıda',
+	'Class:NetworkInterface/Attribute:connected_if+' => 'Bağlantıdaki arayüz',
+	'Class:NetworkInterface/Attribute:connected_name' => 'Bağlantıda',
+	'Class:NetworkInterface/Attribute:connected_name+' => '',
+	'Class:NetworkInterface/Attribute:connected_if_device_id' => 'Bağlı cihazlar',
+	'Class:NetworkInterface/Attribute:connected_if_device_id+' => '',
+	'Class:NetworkInterface/Attribute:connected_if_device_id_name' => 'Cihaz',
+	'Class:NetworkInterface/Attribute:connected_if_device_id_name+' => '',
+	'Class:NetworkInterface/Attribute:link_type' => 'Hat tipi',
+	'Class:NetworkInterface/Attribute:link_type+' => '',
+	'Class:NetworkInterface/Attribute:link_type/Value:downlink' => 'Hat kapalı',
+	'Class:NetworkInterface/Attribute:link_type/Value:downlink+' => '',
+	'Class:NetworkInterface/Attribute:link_type/Value:uplink' => 'Hat açık',
+	'Class:NetworkInterface/Attribute:link_type/Value:uplink+' => '',
+));
+
+
+
+//
+// Class: Device
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Device' => 'Cihaz',
+	'Class:Device+' => '',
+	'Class:Device/Attribute:nwinterface_list' => 'Network arayüzleri',
+	'Class:Device/Attribute:nwinterface_list+' => '',
+));
+
+//
+// Class: PC
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:cpu' => 'CPU',
+	'Class:PC/Attribute:cpu+' => '',
+	'Class:PC/Attribute:ram' => 'RAM',
+	'Class:PC/Attribute:ram+' => '',
+	'Class:PC/Attribute:hdd' => 'Sabit disk',
+	'Class:PC/Attribute:hdd+' => '',
+	'Class:PC/Attribute:os_family' => 'OS Family',
+	'Class:PC/Attribute:os_family+' => '',
+	'Class:PC/Attribute:os_version' => 'OS Versiyonu',
+	'Class:PC/Attribute:os_version+' => '',
+	'Class:PC/Attribute:application_list' => 'Uygulamalar',
+	'Class:PC/Attribute:application_list+' => 'PCye yüklü programlar',
+	'Class:PC/Attribute:patch_list' => 'Yamalar',
+	'Class:PC/Attribute:patch_list+' => 'PCye yüklü yamalar',
+));
+
+//
+// Class: MobileCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:MobileCI' => 'Mobil KK',
+	'Class:MobileCI+' => '',
+));
+
+//
+// Class: MobilePhone
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:MobilePhone' => 'Cep telefonu',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:number' => 'Tel No',
+	'Class:MobilePhone/Attribute:number+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+));
+
+//
+// Class: InfrastructureCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:InfrastructureCI' => 'Altyapı KK',
+	'Class:InfrastructureCI+' => '',
+	'Class:InfrastructureCI/Attribute:description' => 'Tanımlama',
+	'Class:InfrastructureCI/Attribute:description+' => '',
+	'Class:InfrastructureCI/Attribute:location_id' => 'Yerleşke',
+	'Class:InfrastructureCI/Attribute:location_id+' => '',
+	'Class:InfrastructureCI/Attribute:location_name' => 'Yerleşke',
+	'Class:InfrastructureCI/Attribute:location_name+' => '',
+	'Class:InfrastructureCI/Attribute:location_details' => 'Yerleşke detayları',
+	'Class:InfrastructureCI/Attribute:location_details+' => '',
+	'Class:InfrastructureCI/Attribute:management_ip' => 'Yönetim IPsi',
+	'Class:InfrastructureCI/Attribute:management_ip+' => '',
+	'Class:InfrastructureCI/Attribute:default_gateway' => 'Default Gateway',
+	'Class:InfrastructureCI/Attribute:default_gateway+' => '',
+));
+
+//
+// Class: NetworkDevice
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:NetworkDevice' => 'Ağ Cihazı',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:type' => 'Tip',
+	'Class:NetworkDevice/Attribute:type+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator' => 'WAN Accelerator',
+	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:firewall' => 'Firewall',
+	'Class:NetworkDevice/Attribute:type/Value:firewall+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:hub' => 'Hub',
+	'Class:NetworkDevice/Attribute:type/Value:hub+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:loadbalancer' => 'Load Balancer',
+	'Class:NetworkDevice/Attribute:type/Value:loadbalancer+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:router' => 'Router',
+	'Class:NetworkDevice/Attribute:type/Value:router+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:switch' => 'Switch',
+	'Class:NetworkDevice/Attribute:type/Value:switch+' => '',
+	'Class:NetworkDevice/Attribute:ios_version' => 'IOS Version',
+	'Class:NetworkDevice/Attribute:ios_version+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+	'Class:NetworkDevice/Attribute:snmp_read' => 'SNMP Read',
+	'Class:NetworkDevice/Attribute:snmp_read+' => '',
+	'Class:NetworkDevice/Attribute:snmp_write' => 'SNMP Write',
+	'Class:NetworkDevice/Attribute:snmp_write+' => '',
+));
+
+//
+// Class: Server
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Server' => 'Sunucu',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:cpu' => 'CPU',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => 'RAM',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:hdd' => 'Sabit Disk',
+	'Class:Server/Attribute:hdd+' => '',
+	'Class:Server/Attribute:os_family' => 'OS Family',
+	'Class:Server/Attribute:os_family+' => '',
+	'Class:Server/Attribute:os_version' => 'OS Versiyonu',
+	'Class:Server/Attribute:os_version+' => '',
+	'Class:Server/Attribute:application_list' => 'Uygulamalar',
+	'Class:Server/Attribute:application_list+' => 'Sunucuya yüklü uygulamalar',
+	'Class:Server/Attribute:patch_list' => 'Yamalar',
+	'Class:Server/Attribute:patch_list+' => 'Sunucuya yüklü yamalar',
+));
+
+//
+// Class: Printer
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Printer' => 'Yazıcı',
+	'Class:Printer+' => '',
+	'Class:Printer/Attribute:type' => 'Tip',
+	'Class:Printer/Attribute:type+' => '',
+	'Class:Printer/Attribute:type/Value:mopier' => 'Mopier',
+	'Class:Printer/Attribute:type/Value:mopier+' => '',
+	'Class:Printer/Attribute:type/Value:printer' => 'Printer',
+	'Class:Printer/Attribute:type/Value:printer+' => '',
+	'Class:Printer/Attribute:technology' => 'Technology',
+	'Class:Printer/Attribute:technology+' => '',
+	'Class:Printer/Attribute:technology/Value:inkjet' => 'Inkjet',
+	'Class:Printer/Attribute:technology/Value:inkjet+' => '',
+	'Class:Printer/Attribute:technology/Value:laser' => 'Laser',
+	'Class:Printer/Attribute:technology/Value:laser+' => '',
+	'Class:Printer/Attribute:technology/Value:tracer' => 'Tracer',
+	'Class:Printer/Attribute:technology/Value:tracer+' => '',
+));
+
+//
+// Class: lnkCIToDoc
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkCIToDoc' => 'Doküman/KK',
+	'Class:lnkCIToDoc+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_id' => 'KK',
+	'Class:lnkCIToDoc/Attribute:ci_id+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_name' => 'KK',
+	'Class:lnkCIToDoc/Attribute:ci_name+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_status' => 'KK Durumu',
+	'Class:lnkCIToDoc/Attribute:ci_status+' => '',
+	'Class:lnkCIToDoc/Attribute:document_id' => 'Doküman',
+	'Class:lnkCIToDoc/Attribute:document_id+' => '',
+	'Class:lnkCIToDoc/Attribute:document_name' => 'Doküman',
+	'Class:lnkCIToDoc/Attribute:document_name+' => '',
+	'Class:lnkCIToDoc/Attribute:document_type' => 'Doküman tipi',
+	'Class:lnkCIToDoc/Attribute:document_type+' => '',
+	'Class:lnkCIToDoc/Attribute:document_status' => 'Doküman durumu',
+	'Class:lnkCIToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkCIToContact
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkCIToContact' => 'KK/İrtibat',
+	'Class:lnkCIToContact+' => '',
+	'Class:lnkCIToContact/Attribute:ci_id' => 'KK',
+	'Class:lnkCIToContact/Attribute:ci_id+' => '',
+	'Class:lnkCIToContact/Attribute:ci_name' => 'KK',
+	'Class:lnkCIToContact/Attribute:ci_name+' => '',
+	'Class:lnkCIToContact/Attribute:ci_status' => 'KK Durumu',
+	'Class:lnkCIToContact/Attribute:ci_status+' => '',
+	'Class:lnkCIToContact/Attribute:contact_id' => 'İrtibat',
+	'Class:lnkCIToContact/Attribute:contact_id+' => '',
+	'Class:lnkCIToContact/Attribute:contact_name' => 'İrtibat',
+	'Class:lnkCIToContact/Attribute:contact_name+' => '',
+	'Class:lnkCIToContact/Attribute:contact_email' => 'İrtibat E-posta',
+	'Class:lnkCIToContact/Attribute:contact_email+' => '',
+	'Class:lnkCIToContact/Attribute:role' => 'Rolü',
+	'Class:lnkCIToContact/Attribute:role+' => 'KK ile ilgili irtibatın rolü',
+));
+
+//
+// Class: lnkSolutionToCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkSolutionToCI' => 'KK/Çözüm',
+	'Class:lnkSolutionToCI+' => '',
+	'Class:lnkSolutionToCI/Attribute:solution_id' => 'Uygulama Çözümü',
+	'Class:lnkSolutionToCI/Attribute:solution_id+' => '',
+	'Class:lnkSolutionToCI/Attribute:solution_name' => 'Uygulama Çözümü',
+	'Class:lnkSolutionToCI/Attribute:solution_name+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_id' => 'KK',
+	'Class:lnkSolutionToCI/Attribute:ci_id+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_name' => 'KK',
+	'Class:lnkSolutionToCI/Attribute:ci_name+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_status' => 'KK Durumu',
+	'Class:lnkSolutionToCI/Attribute:ci_status+' => '',
+	'Class:lnkSolutionToCI/Attribute:utility' => 'Yardımcı araç',
+	'Class:lnkSolutionToCI/Attribute:utility+' => 'Çözümdeki KK için yardımcı araç',
+));
+
+//
+// Class: lnkProcessToSolution
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkProcessToSolution' => 'İş Süreci/Çözüm',
+	'Class:lnkProcessToSolution+' => '',
+	'Class:lnkProcessToSolution/Attribute:solution_id' => 'Uygulama Çözümü',
+	'Class:lnkProcessToSolution/Attribute:solution_id+' => '',
+	'Class:lnkProcessToSolution/Attribute:solution_name' => 'Uygulama Çözümü',
+	'Class:lnkProcessToSolution/Attribute:solution_name+' => '',
+	'Class:lnkProcessToSolution/Attribute:process_id' => 'Süreç',
+	'Class:lnkProcessToSolution/Attribute:process_id+' => '',
+	'Class:lnkProcessToSolution/Attribute:process_name' => 'Süreç',
+	'Class:lnkProcessToSolution/Attribute:process_name+' => '',
+	'Class:lnkProcessToSolution/Attribute:reason' => 'Sebep',
+	'Class:lnkProcessToSolution/Attribute:reason+' => 'Çözüm ve süreç arasındaki ilişkinin detayı',
+));
+
+
+
+//
+// Class extensions
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+'Class:Subnet/Tab:IPUsage' => 'IP Kullanımı',
+'Class:Subnet/Tab:IPUsage-explain' => '<em>%1$s</em> - <em>%2$s</em> aralığındaki IPye sahip arayüzler',
+'Class:Subnet/Tab:FreeIPs' => 'Boş IPler',
+'Class:Subnet/Tab:FreeIPs-count' => 'Boş IPler: %1$s',
+'Class:Subnet/Tab:FreeIPs-explain' => 'Boş IP adresleri',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+'Menu:DataAdministration' => 'Veri Yönetimi',
+'Menu:DataAdministration+' => 'Veri Yönetimi',
+'Menu:Catalogs' => 'Kataloglar',
+'Menu:Catalogs+' => 'Veri tipleri',
+'Menu:Audit' => 'Denetleme',
+'Menu:Audit+' => 'Denetleme',
+'Menu:CSVImport' => 'CSV dışardan al',
+'Menu:CSVImport+' => 'Çoklu yaratım veya güncelleme',
+'Menu:Organization' => 'Kurumlar',
+'Menu:Organization+' => 'Tüm Kurumlar',
+'Menu:Application' => 'Uygulamalar',
+'Menu:Application+' => 'Tüm Uygulamalar',
+'Menu:DBServer' => 'Veritabanı sunucuları',
+'Menu:DBServer+' => 'Veritabanı sunucuları',
+'Menu:Audit' => 'Denetleme',
+'Menu:ConfigManagement' => 'Konfigürasyon Yönetimi',
+'Menu:ConfigManagement+' => 'Konfigürasyon Yönetimi',
+'Menu:ConfigManagementOverview' => 'Özet',
+'Menu:ConfigManagementOverview+' => 'Özet',
+'Menu:Contact' => 'İrtibatlar',
+'Menu:Contact+' => 'İrtibatlar',
+'Menu:Contact:Count' => '%1$d',
+'Menu:Person' => 'Kişiler',
+'Menu:Person+' => 'Tüm Kişiler',
+'Menu:Team' => 'Ekipler',
+'Menu:Team+' => 'Tüm ekipler',
+'Menu:Document' => 'Dokümanlar',
+'Menu:Document+' => 'Tüm dokümanlar',
+'Menu:Location' => 'Yerleşkeler',
+'Menu:Location+' => 'Tüm Yerleşkeler',
+'Menu:ConfigManagementCI' => 'Konfigürasyon Kalemleri',
+'Menu:ConfigManagementCI+' => 'Konfigürasyon Kalemleri',
+'Menu:BusinessProcess' => 'İş süreçleri',
+'Menu:BusinessProcess+' => 'Tüm İş süreçleri',
+'Menu:ApplicationSolution' => 'Uygulama çözümleri',
+'Menu:ApplicationSolution+' => 'Tüm Uygulama çözümleri',
+'Menu:ConfigManagementSoftware' => 'Uygulama Yönetimi',
+'Menu:Licence' => 'Lisanslar',
+'Menu:Licence+' => 'Tüm Lisanslar',
+'Menu:Patch' => 'Yamalar',
+'Menu:Patch+' => 'Tüm Yamalar',
+'Menu:ApplicationInstance' => 'Yüklenen yazılımlar',
+'Menu:ApplicationInstance+' => 'Uygulama ve Veritabanı sunucuları',
+'Menu:ConfigManagementHardware' => 'Altyapı Yönetimi',
+'Menu:Subnet' => 'Subnets',
+'Menu:Subnet+' => 'All Subnets',
+'Menu:NetworkDevice' => 'Network cihazları',
+'Menu:NetworkDevice+' => 'Tüm Network cihazları',
+'Menu:Server' => 'Sunucular',
+'Menu:Server+' => 'Tüm Sunucular',
+'Menu:Printer' => 'Yazıcılar',
+'Menu:Printer+' => 'Tüm Yazıcılar',
+'Menu:MobilePhone' => 'Cep Telefonları',
+'Menu:MobilePhone+' => 'Tüm Cep Telefonları',
+'Menu:PC' => 'Kişisel Bilgisayarlar',
+'Menu:PC+' => 'Tüm Kişisel Bilgisayarlar',
+'Menu:NewContact' => 'Yeni İrtibat',
+'Menu:NewContact+' => 'Yeni İrtibat',
+'Menu:SearchContacts' => 'İrtibat ara',
+'Menu:SearchContacts+' => 'İrtibat ara',
+'Menu:NewCI' => 'Yeni KK',
+'Menu:NewCI+' => 'Yeni KK',
+'Menu:SearchCIs' => 'KK ara',
+'Menu:SearchCIs+' => 'KK ara',
+'Menu:ConfigManagement:Devices' => 'Cihazlar',
+'Menu:ConfigManagement:AllDevices' => 'Altyapı',
+'Menu:ConfigManagement:SWAndApps' => 'Yazılım ve uygulamalar',
+'Menu:ConfigManagement:Misc' => 'Diğer',
+'Menu:Group' => 'KK Grupları',
+'Menu:Group+' => 'KK Grupları',
+'Menu:ConfigManagement:Shortcuts' => 'Kısalyollar',
+'Menu:ConfigManagement:AllContacts' => 'Tüm irtibatlar: %1$d',
+
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Contacts~~',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+	'Class:Contact/Attribute:notify' => 'Notification~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
+	'Class:Contact/Attribute:function' => 'Function~~',
+	'Class:Contact/Attribute:cis_list' => 'CIs~~',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Person/Attribute:name' => 'Last Name~~',
+	'Class:Person/Attribute:employee_number' => 'Employee number~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
+	'Class:Person/Attribute:location_id' => 'Location~~',
+	'Class:Person/Attribute:location_name' => 'Location name~~',
+	'Class:Person/Attribute:manager_id' => 'Manager~~',
+	'Class:Person/Attribute:manager_name' => 'Manager name~~',
+	'Class:Person/Attribute:team_list' => 'Teams~~',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
+	'Class:Team/Attribute:persons_list' => 'Members~~',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:cis_list' => 'CIs~~',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Document Type~~',
+	'Class:DocumentFile' => 'Document File~~',
+	'Class:DocumentFile/Attribute:file' => 'File~~',
+	'Class:DocumentNote' => 'Document Note~~',
+	'Class:DocumentNote/Attribute:text' => 'Text~~',
+	'Class:DocumentWeb' => 'Document Web~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL~~',
+	'Class:FunctionalCI/Attribute:description' => 'Description~~',
+	'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/Value:high' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
+	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date~~',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts~~',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Documents~~',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:PhysicalDevice' => 'Physical Device~~',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Location name~~',
+	'Class:PhysicalDevice/Attribute:status' => 'Status~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand~~',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name~~',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model~~',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Model name~~',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number~~',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date~~',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty~~',
+	'Class:Rack' => 'Rack~~',
+	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
+	'Class:Rack/Attribute:device_list' => 'Devices~~',
+	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
+	'Class:Rack/Attribute:enclosure_list' => 'Enclosures~~',
+	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
+	'Class:TelephonyCI' => 'Telephony CI~~',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number~~',
+	'Class:Phone' => 'Phone~~',
+	'Class:IPPhone' => 'IP Phone~~',
+	'Class:Tablet' => 'Tablet~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
+	'Class:DatacenterDevice' => 'Datacenter Device~~',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure~~',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name~~',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name~~',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source~~',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs~~',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version~~',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name~~',
+	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
+	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:Server/Attribute:osversion_id' => 'OS version~~',
+	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
+	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes~~',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
+	'Class:StorageSystem' => 'Storage System~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
+	'Class:SANSwitch' => 'SAN Switch~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
+	'Class:TapeLibrary' => 'Tape Library~~',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
+	'Class:NAS' => 'NAS~~',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
+	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
+	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:PC/Attribute:osversion_id' => 'OS version~~',
+	'Class:PC/Attribute:osversion_name' => 'OS version name~~',
+	'Class:PC/Attribute:type' => 'Type~~',
+	'Class:PC/Attribute:type/Value:desktop' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:laptop' => 'laptop~~',
+	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
+	'Class:PowerConnection' => 'Power Connection~~',
+	'Class:PowerSource' => 'Power Source~~',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
+	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
+	'Class:PDU' => 'PDU~~',
+	'Class:PDU/Attribute:rack_id' => 'Rack~~',
+	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start~~',
+	'Class:PDU/Attribute:powerstart_name' => 'Power start name~~',
+	'Class:Peripheral' => 'Peripheral~~',
+	'Class:Enclosure' => 'Enclosure~~',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
+	'Class:Enclosure/Attribute:nb_u' => 'Rack units~~',
+	'Class:Enclosure/Attribute:device_list' => 'Devices~~',
+	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
+	'Class:ApplicationSolution/Attribute:status' => 'Status~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
+	'Class:BusinessProcess/Attribute:status' => 'Status~~',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:system_id' => 'System~~',
+	'Class:SoftwareInstance/Attribute:system_name' => 'System name~~',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
+	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
+	'Class:SoftwareInstance/Attribute:status' => 'Status~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:Middleware' => 'Middleware~~',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas~~',
+	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
+	'Class:WebServer' => 'Web server~~',
+	'Class:WebServer/Attribute:webapp_list' => 'Web applications~~',
+	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
+	'Class:PCSoftware' => 'PC Software~~',
+	'Class:OtherSoftware' => 'Other Software~~',
+	'Class:MiddlewareInstance' => 'Middleware Instance~~',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
+	'Class:DatabaseSchema' => 'Database Schema~~',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
+	'Class:WebApplication' => 'Web Application~~',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
+	'Class:WebApplication/Attribute:url' => 'URL~~',
+	'Class:VirtualDevice' => 'Virtual Device~~',
+	'Class:VirtualDevice/Attribute:status' => 'Status~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
+	'Class:VirtualHost' => 'Virtual Host~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
+	'Class:Hypervisor' => 'Hypervisor~~',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farm~~',
+	'Class:Hypervisor/Attribute:farm_name' => 'Farm name~~',
+	'Class:Hypervisor/Attribute:server_id' => 'Server~~',
+	'Class:Hypervisor/Attribute:server_name' => 'Server name~~',
+	'Class:Farm' => 'Farm~~',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors~~',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+	'Class:Farm/Attribute:redundancy' => 'High availability~~',
+	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
+	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
+	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
+	'Class:VirtualMachine' => 'Virtual Machine~~',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family~~',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version~~',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM~~',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
+	'Class:LogicalVolume' => 'Logical Volume~~',
+	'Class:LogicalVolume/Attribute:name' => 'Name~~',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID~~',
+	'Class:LogicalVolume/Attribute:description' => 'Description~~',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level~~',
+	'Class:LogicalVolume/Attribute:size' => 'Size~~',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system~~',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name~~',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servers~~',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
+	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server~~',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name~~',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used~~',
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used~~',
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc~~',
+	'Class:Tape' => 'Tape~~',
+	'Class:Tape/Attribute:name' => 'Name~~',
+	'Class:Tape/Attribute:description' => 'Description~~',
+	'Class:Tape/Attribute:size' => 'Size~~',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library~~',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
+	'Class:NASFileSystem' => 'NAS File System~~',
+	'Class:NASFileSystem/Attribute:name' => 'Name~~',
+	'Class:NASFileSystem/Attribute:description' => 'Description~~',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level~~',
+	'Class:NASFileSystem/Attribute:size' => 'Size~~',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name~~',
+	'Class:Software/Attribute:vendor' => 'vendor~~',
+	'Class:Software/Attribute:version' => 'Version~~',
+	'Class:Software/Attribute:documents_list' => 'Documents~~',
+	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
+	'Class:Software/Attribute:type' => 'Type~~',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server~~',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances~~',
+	'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:Patch/Attribute:documents_list' => 'Documents~~',
+	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
+	'Class:Patch/Attribute:finalclass' => 'Type~~',
+	'Class:OSPatch' => 'OS Patch~~',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices~~',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
+	'Class:SoftwarePatch' => 'Software Patch~~',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software~~',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
+	'Class:Licence/Attribute:documents_list' => 'Documents~~',
+	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
+	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
+	'Class:Licence/Attribute:organization_name+' => 'Common name~~',
+	'Class:Licence/Attribute:description' => 'Description~~',
+	'Class:Licence/Attribute:start_date' => 'Start date~~',
+	'Class:Licence/Attribute:end_date' => 'End date~~',
+	'Class:Licence/Attribute:perpetual' => 'Perpetual~~',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'no~~',
+	'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:OSLicence' => 'OS Licence~~',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS version 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:SoftwareLicence' => 'Software Licence~~',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
+	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name~~',
+	'Class:Typology' => 'Typology~~',
+	'Class:Typology/Attribute:name' => 'Name~~',
+	'Class:Typology/Attribute:finalclass' => 'Type~~',
+	'Class:OSVersion' => 'OS Version~~',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS family~~',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:OSFamily' => 'OS Family~~',
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:Brand' => 'Brand~~',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
+	'Class:Model' => 'Model~~',
+	'Class:Model/Attribute:brand_id' => 'Brand~~',
+	'Class:Model/Attribute:brand_name' => 'Brand name~~',
+	'Class:Model/Attribute:type' => 'Device type~~',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Printer' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:Server' => 'Server~~',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
+	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
+	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
+	'Class:NetworkDeviceType' => 'Network Device Type~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
+	'Class:IOSVersion' => 'IOS Version~~',
+	'Class:IOSVersion/Attribute:brand_id' => 'Brand~~',
+	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
+	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name~~',
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name~~',
+	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
+	'Class:Subnet/Attribute:org_name' => 'Name~~',
+	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
+	'Class:Subnet/Attribute:vlans_list' => 'VLANs~~',
+	'Class:VLAN' => 'VLAN~~',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:VLAN/Attribute:description' => 'Description~~',
+	'Class:VLAN/Attribute:org_id' => 'Organization~~',
+	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
+	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
+	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:NetworkInterface/Attribute:name' => 'Name~~',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
+	'Class:IPInterface' => 'IP Interface~~',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
+	'Class:IPInterface/Attribute:comment' => 'Comment~~',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway~~',
+	'Class:IPInterface/Attribute:ipmask' => 'IP mask~~',
+	'Class:IPInterface/Attribute:speed' => 'Speed~~',
+	'Class:PhysicalInterface' => 'Physical Interface~~',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs~~',
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:LogicalInterface' => 'Logical Interface~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name~~',
+	'Class:FiberChannelInterface' => 'Fiber Channel Interface~~',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Speed~~',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topology~~',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name~~',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => '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:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name~~',
+	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group~~',
+	'Menu:ConfigManagement:virtualization' => 'Virtualization~~',
+	'Menu:ConfigManagement:EndUsers' => 'End user devices~~',
+	'Menu:Typology' => 'Typology configuration~~',
+	'Menu:Typology+' => 'Typology configuration~~',
+	'Menu:OSVersion' => 'OS versions~~',
+	'Menu:Software' => 'Software catalog~~',
+	'Menu:Software+' => 'Software catalog~~',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
+	'Server:baseinfo' => 'General information~~',
+	'Server:Date' => 'Dates~~',
+	'Server:moreinfo' => 'More information~~',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'General information~~',
+	'Person:notifiy' => 'Notification~~',
+));
+?>
diff --git a/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
index 0585315f5..ac6da0281 100755
--- a/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
@@ -1,1634 +1,1634 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//////////////////////////////////////////////////////////////////////
-// Relations
-//////////////////////////////////////////////////////////////////////
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Relation:impacts/Description' => '被影响的元素',
-	'Relation:impacts/DownStream' => '影响...',
-	'Relation:impacts/DownStream+' => '被影响的元素',
-	'Relation:impacts/UpStream' => '依赖于...',
-	'Relation:impacts/UpStream+' => '该元素依赖的元素...',
-	// Legacy entries
-	'Relation:depends on/Description' => '该元素依赖的元素...',
-	'Relation:depends on/DownStream' => '依赖于...',
-	'Relation:depends on/UpStream' => '影响...',
-));
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Note: The classes have been grouped by categories: bizmodel
-//////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: Organization
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Organization' => '组织',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => '名称',
-	'Class:Organization/Attribute:name+' => '常用名称',
-	'Class:Organization/Attribute:code' => '编码',
-	'Class:Organization/Attribute:code+' => '组织编码(Siret, DUNS,...)',
-	'Class:Organization/Attribute:status' => '状态',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => '活动',
-	'Class:Organization/Attribute:status/Value:active+' => '活动',
-	'Class:Organization/Attribute:status/Value:inactive' => '非活动',
-	'Class:Organization/Attribute:status/Value:inactive+' => '非活动',
-	'Class:Organization/Attribute:parent_id' => '父级',
-	'Class:Organization/Attribute:parent_id+' => '父级组织',
-	'Class:Organization/Attribute:parent_name' => '父级名称',
-	'Class:Organization/Attribute:parent_name+' => '父级组织名称',
-));
-
-
-//
-// Class: Location
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Location' => '位置',
-	'Class:Location+' => '任何类型的地理位置: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
-	'Class:Location/Attribute:name' => '名称',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => '状态',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => '活动',
-	'Class:Location/Attribute:status/Value:active+' => '活动',
-	'Class:Location/Attribute:status/Value:inactive' => '非活动',
-	'Class:Location/Attribute:status/Value:inactive+' => '非活动',
-	'Class:Location/Attribute:org_id' => '拥有者组织',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:org_name' => '拥有者组织名称',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Location/Attribute:address' => '地址',
-	'Class:Location/Attribute:address+' => '门户地址',
-	'Class:Location/Attribute:postal_code' => '邮编',
-	'Class:Location/Attribute:postal_code+' => 'ZIP/邮政编码',
-	'Class:Location/Attribute:city' => '城市',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => '国家',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:parent_id' => '父级位置',
-	'Class:Location/Attribute:parent_id+' => '',
-	'Class:Location/Attribute:parent_name' => '父级名称',
-	'Class:Location/Attribute:parent_name+' => '',
-	'Class:Location/Attribute:contact_list' => '联系人',
-	'Class:Location/Attribute:contact_list+' => '该场点的联系人',
-	'Class:Location/Attribute:infra_list' => '基础架构',
-	'Class:Location/Attribute:infra_list+' => '该场点的CI',
-));
-//
-// Class: Group
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Group' => '组',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => '名称',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => '状态',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => '实施',
-	'Class:Group/Attribute:status/Value:implementation+' => '实施',
-	'Class:Group/Attribute:status/Value:obsolete' => '荒废',
-	'Class:Group/Attribute:status/Value:obsolete+' => '荒废',
-	'Class:Group/Attribute:status/Value:production' => '生产',
-	'Class:Group/Attribute:status/Value:production+' => '生产',
-	'Class:Group/Attribute:org_id' => '组织',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => '名称',
-	'Class:Group/Attribute:owner_name+' => '常用名称',
-	'Class:Group/Attribute:description' => '描述',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => '种类',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => '父级组别',
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:parent_name' => '名称',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => '连接的CI',
-	'Class:Group/Attribute:ci_list+' => '',
-));
-
-//
-// Class: lnkGroupToCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkGroupToCI' => '组 / CI',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => '组',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => '名称',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => '名称',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_status' => 'CI状态',
-	'Class:lnkGroupToCI/Attribute:ci_status+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => '原因',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-));
-
-
-//
-// Class: Contact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Contact' => '联系人',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => '名称',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => '状态',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => '活动',
-	'Class:Contact/Attribute:status/Value:active+' => '活动',
-	'Class:Contact/Attribute:status/Value:inactive' => '非活动',
-	'Class:Contact/Attribute:status/Value:inactive+' => '非活动',
-	'Class:Contact/Attribute:org_id' => '组织',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => '组织',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => '电话',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:location_id' => '位置',
-	'Class:Contact/Attribute:location_id+' => '',
-	'Class:Contact/Attribute:location_name' => '位置',
-	'Class:Contact/Attribute:location_name+' => '',
-	'Class:Contact/Attribute:ci_list' => 'CI',
-	'Class:Contact/Attribute:ci_list+' => '该联系人相关CI',
-	'Class:Contact/Attribute:contract_list' => '合同',
-	'Class:Contact/Attribute:contract_list+' => '该联系人相关合同',
-	'Class:Contact/Attribute:service_list' => '服务',
-	'Class:Contact/Attribute:service_list+' => '该联系人相关服务',
-	'Class:Contact/Attribute:ticket_list' => 'Tickets',
-	'Class:Contact/Attribute:ticket_list+' => '该联系人相关',
-	'Class:Contact/Attribute:team_list' => '团队',
-	'Class:Contact/Attribute:team_list+' => '该联系人所属团队',
-	'Class:Contact/Attribute:finalclass' => '类别',
-	'Class:Contact/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Person
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Person' => '人员',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:first_name' => '姓',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_id' => '员工ID',
-	'Class:Person/Attribute:employee_id+' => '',
-));
-
-//
-// Class: Team
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Team' => '团队',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:member_list' => '成员',
-	'Class:Team/Attribute:member_list+' => '团队所辖成员',
-));
-
-//
-// Class: lnkTeamToContact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkTeamToContact' => '团队成员',
-	'Class:lnkTeamToContact+' => '团队中的成员',
-	'Class:lnkTeamToContact/Attribute:team_id' => '团队',
-	'Class:lnkTeamToContact/Attribute:team_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_id' => '成员',
-	'Class:lnkTeamToContact/Attribute:contact_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_location_id' => '位置',
-	'Class:lnkTeamToContact/Attribute:contact_location_id+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_email' => 'Email',
-	'Class:lnkTeamToContact/Attribute:contact_email+' => '',
-	'Class:lnkTeamToContact/Attribute:contact_phone' => '电话',
-	'Class:lnkTeamToContact/Attribute:contact_phone+' => '',
-	'Class:lnkTeamToContact/Attribute:role' => '角色',
-	'Class:lnkTeamToContact/Attribute:role+' => '',
-));
-
-//
-// Class: Document
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Document' => '文档',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => '名称',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => '组织',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:org_name' => '组织名称',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:description' => '描述',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:type' => '类别',
-	'Class:Document/Attribute:type+' => '',
-	'Class:Document/Attribute:type/Value:contract' => '合同',
-	'Class:Document/Attribute:type/Value:contract+' => '',
-	'Class:Document/Attribute:type/Value:networkmap' => '网络图',
-	'Class:Document/Attribute:type/Value:networkmap+' => '',
-	'Class:Document/Attribute:type/Value:presentation' => '展现',
-	'Class:Document/Attribute:type/Value:presentation+' => '',
-	'Class:Document/Attribute:type/Value:training' => '培训',
-	'Class:Document/Attribute:type/Value:training+' => '',
-	'Class:Document/Attribute:type/Value:whitePaper' => '白皮书',
-	'Class:Document/Attribute:type/Value:whitePaper+' => '',
-	'Class:Document/Attribute:type/Value:workinginstructions' => '工作指南',
-	'Class:Document/Attribute:type/Value:workinginstructions+' => '',
-	'Class:Document/Attribute:type/Value:design' => '设计',
-	'Class:Document/Attribute:type/Value:design+' => '',
-	'Class:Document/Attribute:status' => '状态',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => '草案',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => '荒废',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => '已发布',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:ci_list' => 'CI',
-	'Class:Document/Attribute:ci_list+' => '参照该文档的CI',
-	'Class:Document/Attribute:contract_list' => '合同',
-	'Class:Document/Attribute:contract_list+' => '参照该文档的合同',
-	'Class:Document/Attribute:service_list' => '服务',
-	'Class:Document/Attribute:service_list+' => '参照该文档的服务',
-	'Class:Document/Attribute:ticket_list' => '单据',
-	'Class:Document/Attribute:ticket_list+' => '引用该文档的单据',
-	'Class:Document:PreviewTab' => '预览',
-));
-
-//
-// Class: WebDoc
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:WebDoc' => 'Web 文档',
-	'Class:WebDoc+' => '其他web服务器上可获得的文档',
-	'Class:WebDoc/Attribute:url' => 'Url',
-	'Class:WebDoc/Attribute:url+' => '',
-));
-
-//
-// Class: Note
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Note' => '备注',
-	'Class:Note+' => '',
-	'Class:Note/Attribute:note' => '文本',
-	'Class:Note/Attribute:note+' => '',
-));
-
-//
-// Class: FileDoc
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FileDoc' => '文档',
-	'Class:FileDoc+' => '',
-	'Class:FileDoc/Attribute:contents' => '内容',
-	'Class:FileDoc/Attribute:contents+' => '',
-));
-
-//
-// Class: Licence
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Licence' => 'Licence',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:provider' => '提供商',
-	'Class:Licence/Attribute:provider+' => '',
-	'Class:Licence/Attribute:org_id' => '所有者',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:org_name' => '名称',
-	'Class:Licence/Attribute:org_name+' => '常用名称',
-	'Class:Licence/Attribute:product' => '产品',
-	'Class:Licence/Attribute:product+' => '',
-	'Class:Licence/Attribute:name' => '名称',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:start' => '启始日期',
-	'Class:Licence/Attribute:start+' => '',
-	'Class:Licence/Attribute:end' => '终止日期',
-	'Class:Licence/Attribute:end+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Key',
-	'Class:Licence/Attribute:licence_key+' => '',
-	'Class:Licence/Attribute:scope' => '范围',
-	'Class:Licence/Attribute:scope+' => '',
-	'Class:Licence/Attribute:usage_limit' => '使用限制',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:usage_list' => '用途',
-	'Class:Licence/Attribute:usage_list+' => '使用该License的应用程序实例',
-));
-
-
-//
-// Class: Subnet
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Subnet' => '子网',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Name' => '%1$s / %2$s',
-	//'Class:Subnet/Attribute:name' => 'Name',
-	//'Class:Subnet/Attribute:name+' => '',
-	'Class:Subnet/Attribute:org_id' => '拥有者组织',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:description' => '描述',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-));
-
-//
-// Class: Patch
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Patch' => '补丁',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => '名称',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:description' => '描述',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:target_sw' => '应用程序范围',
-	'Class:Patch/Attribute:target_sw+' => '目标软件 (OS 或应用程序)',
-	'Class:Patch/Attribute:version' => '版本',
-	'Class:Patch/Attribute:version+' => '',
-	'Class:Patch/Attribute:type' => '类别',
-	'Class:Patch/Attribute:type+' => '',
-	'Class:Patch/Attribute:type/Value:application' => '应用程序',
-	'Class:Patch/Attribute:type/Value:application+' => '',
-	'Class:Patch/Attribute:type/Value:os' => 'OS',
-	'Class:Patch/Attribute:type/Value:os+' => '',
-	'Class:Patch/Attribute:type/Value:security' => '安全',
-	'Class:Patch/Attribute:type/Value:security+' => '',
-	'Class:Patch/Attribute:type/Value:servicepack' => '服务包',
-	'Class:Patch/Attribute:type/Value:servicepack+' => '',
-	'Class:Patch/Attribute:ci_list' => '设备',
-	'Class:Patch/Attribute:ci_list+' => '安装该补丁的设备',
-));
-
-//
-// Class: Software
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Software' => '软件',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => '名称',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:description' => '描述',
-	'Class:Software/Attribute:description+' => '',
-	'Class:Software/Attribute:instance_list' => '安装',
-	'Class:Software/Attribute:instance_list+' => '该软件的实例',
-	'Class:Software/Attribute:finalclass' => '类别',
-	'Class:Software/Attribute:finalclass+' => '',
-));
-
-//
-// Class: Application
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Application' => '应用程序',
-	'Class:Application+' => '',
-	'Class:Application/Attribute:name' => '名称',
-	'Class:Application/Attribute:name+' => '',
-	'Class:Application/Attribute:description' => '描述',
-	'Class:Application/Attribute:description+' => '',
-	'Class:Application/Attribute:instance_list' => '安装',
-	'Class:Application/Attribute:instance_list+' => '应用程序实例',
-));
-
-//
-// Class: DBServer
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DBServer' => '数据库',
-	'Class:DBServer+' => '数据库服务器SW',
-	'Class:DBServer/Attribute:instance_list' => '安装',
-	'Class:DBServer/Attribute:instance_list+' => '数据库服务器实例',
-));
-
-//
-// Class: lnkPatchToCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkPatchToCI' => '补丁使用范围',
-	'Class:lnkPatchToCI+' => '',
-	'Class:lnkPatchToCI/Attribute:patch_id' => '补丁',
-	'Class:lnkPatchToCI/Attribute:patch_id+' => '',
-	'Class:lnkPatchToCI/Attribute:patch_name' => '补丁',
-	'Class:lnkPatchToCI/Attribute:patch_name+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkPatchToCI/Attribute:ci_id+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkPatchToCI/Attribute:ci_name+' => '',
-	'Class:lnkPatchToCI/Attribute:ci_status' => 'CI状态',
-	'Class:lnkPatchToCI/Attribute:ci_status+' => '',
-));
-
-//
-// Class: FunctionalCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:FunctionalCI' => '功能 CI',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => '名称',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:status' => '状态',
-	'Class:FunctionalCI/Attribute:status+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:implementation' => '实施',
-	'Class:FunctionalCI/Attribute:status/Value:implementation+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:obsolete' => '废弃',
-	'Class:FunctionalCI/Attribute:status/Value:obsolete+' => '',
-	'Class:FunctionalCI/Attribute:status/Value:production' => '生产',
-	'Class:FunctionalCI/Attribute:status/Value:production+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => '拥有者组织',
-	'Class:FunctionalCI/Attribute:org_id+' => '',
-	'Class:FunctionalCI/Attribute:owner_name' => '拥有者组织',
-	'Class:FunctionalCI/Attribute:owner_name+' => '',
-	'Class:FunctionalCI/Attribute:importance' => '业务关键性',
-	'Class:FunctionalCI/Attribute:importance+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:high' => '高',
-	'Class:FunctionalCI/Attribute:importance/Value:high+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:low' => '低',
-	'Class:FunctionalCI/Attribute:importance/Value:low+' => '',
-	'Class:FunctionalCI/Attribute:importance/Value:medium' => '中',
-	'Class:FunctionalCI/Attribute:importance/Value:medium+' => '',
-	'Class:FunctionalCI/Attribute:contact_list' => '联系人',
-	'Class:FunctionalCI/Attribute:contact_list+' => '该 CI 的联系人',
-	'Class:FunctionalCI/Attribute:document_list' => '文档',
-	'Class:FunctionalCI/Attribute:document_list+' => '该 CI 的文档',
-	'Class:FunctionalCI/Attribute:solution_list' => '应用方案',
-	'Class:FunctionalCI/Attribute:solution_list+' => '使用该 CI 的应用方案',
-	'Class:FunctionalCI/Attribute:contract_list' => '合同',
-	'Class:FunctionalCI/Attribute:contract_list+' => '支持该 CI 合同',
-	'Class:FunctionalCI/Attribute:ticket_list' => '单据',
-	'Class:FunctionalCI/Attribute:ticket_list+' => '与该 CI 相关的单据',
-	'Class:FunctionalCI/Attribute:finalclass' => '类别',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-));
-
-//
-// Class: SoftwareInstance
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:SoftwareInstance' => '软件实例',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Name' => '%1$s - %2$s',
-	'Class:SoftwareInstance/Attribute:device_id' => '设备',
-	'Class:SoftwareInstance/Attribute:device_id+' => '',
-	'Class:SoftwareInstance/Attribute:device_name' => '设备',
-	'Class:SoftwareInstance/Attribute:device_name+' => '',
-	'Class:SoftwareInstance/Attribute:licence_id' => 'Licence',
-	'Class:SoftwareInstance/Attribute:licence_id+' => '',
-	'Class:SoftwareInstance/Attribute:licence_name' => 'Licence',
-	'Class:SoftwareInstance/Attribute:licence_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => '软件',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:version' => '版本',
-	'Class:SoftwareInstance/Attribute:version+' => '',
-	'Class:SoftwareInstance/Attribute:description' => '描述',
-	'Class:SoftwareInstance/Attribute:description+' => '',
-));
-
-//
-// Class: ApplicationInstance
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ApplicationInstance' => '应用实例',
-	'Class:ApplicationInstance+' => '',
-	'Class:ApplicationInstance/Name' => '%1$s - %2$s',
-	'Class:ApplicationInstance/Attribute:software_id' => '软件',
-	'Class:ApplicationInstance/Attribute:software_id+' => '',
-	'Class:ApplicationInstance/Attribute:software_name' => '名称',
-	'Class:ApplicationInstance/Attribute:software_name+' => '',
-));
-
-
-//
-// Class: DBServerInstance
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DBServerInstance' => 'DB Server 实例',
-	'Class:DBServerInstance+' => '',
-	'Class:DBServerInstance/Name' => '%1$s - %2$s',
-	'Class:DBServerInstance/Attribute:software_id' => '软件',
-	'Class:DBServerInstance/Attribute:software_id+' => '',
-	'Class:DBServerInstance/Attribute:software_name' => '名称',
-	'Class:DBServerInstance/Attribute:software_name+' => '',
-	'Class:DBServerInstance/Attribute:dbinstance_list' => '数据库',
-	'Class:DBServerInstance/Attribute:dbinstance_list+' => '数据库源',
-));
-
-
-//
-// Class: DatabaseInstance
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:DatabaseInstance' => 'Database 实例',
-	'Class:DatabaseInstance+' => '',
-	'Class:DatabaseInstance/Name' => '%1$s - %2$s',
-	'Class:DatabaseInstance/Attribute:db_server_instance_id' => '数据库服务器',
-	'Class:DatabaseInstance/Attribute:db_server_instance_id+' => '',
-	'Class:DatabaseInstance/Attribute:db_server_instance_version' => '数据库版本',
-	'Class:DatabaseInstance/Attribute:db_server_instance_version+' => '',
-	'Class:DatabaseInstance/Attribute:description' => '描述',
-	'Class:DatabaseInstance/Attribute:description+' => '',
-));
-
-//
-// Class: ApplicationSolution
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ApplicationSolution' => '应用方案',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:description' => '描述',
-	'Class:ApplicationSolution/Attribute:description+' => '',
-	'Class:ApplicationSolution/Attribute:ci_list' => 'CI',
-	'Class:ApplicationSolution/Attribute:ci_list+' => '构成该方案的 CI',
-	'Class:ApplicationSolution/Attribute:process_list' => '业务流程',
-	'Class:ApplicationSolution/Attribute:process_list+' => '依赖于该方案的业务流程',
-));
-
-//
-// Class: BusinessProcess
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:BusinessProcess' => '业务流程',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:description' => '描述',
-	'Class:BusinessProcess/Attribute:description+' => '',
-	'Class:BusinessProcess/Attribute:used_solution_list' => '应用方案',
-	'Class:BusinessProcess/Attribute:used_solution_list+' => '业务流程所依赖的应用方案',
-));
-
-//
-// Class: ConnectableCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ConnectableCI' => '可连接的 CI',
-	'Class:ConnectableCI+' => '物理 CI',
-	'Class:ConnectableCI/Attribute:brand' => '品牌',
-	'Class:ConnectableCI/Attribute:brand+' => '',
-	'Class:ConnectableCI/Attribute:model' => '型号',
-	'Class:ConnectableCI/Attribute:model+' => '',
-	'Class:ConnectableCI/Attribute:serial_number' => '序列号',
-	'Class:ConnectableCI/Attribute:serial_number+' => '',
-	'Class:ConnectableCI/Attribute:asset_ref' => '资产参考资料',
-	'Class:ConnectableCI/Attribute:asset_ref+' => '',
-));
-
-//
-// Class: NetworkInterface
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:NetworkInterface' => '网络接口',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Name' => '%1$s - %2$s',
-	'Class:NetworkInterface/Attribute:device_id' => '设备',
-	'Class:NetworkInterface/Attribute:device_id+' => '',
-	'Class:NetworkInterface/Attribute:device_name' => '设备',
-	'Class:NetworkInterface/Attribute:device_name+' => '',
-	'Class:NetworkInterface/Attribute:logical_type' => '逻辑类别',
-	'Class:NetworkInterface/Attribute:logical_type+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:backup' => '备份',
-	'Class:NetworkInterface/Attribute:logical_type/Value:backup+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:logical' => '逻辑的',
-	'Class:NetworkInterface/Attribute:logical_type/Value:logical+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:port' => '端口',
-	'Class:NetworkInterface/Attribute:logical_type/Value:port+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:primary' => 'Primary',
-	'Class:NetworkInterface/Attribute:logical_type/Value:primary+' => '',
-	'Class:NetworkInterface/Attribute:logical_type/Value:secondary' => 'Secondary',
-	'Class:NetworkInterface/Attribute:logical_type/Value:secondary+' => '',
-	'Class:NetworkInterface/Attribute:physical_type' => '物理类别',
-	'Class:NetworkInterface/Attribute:physical_type+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:atm' => 'ATM',
-	'Class:NetworkInterface/Attribute:physical_type/Value:atm+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet' => 'Ethernet',
-	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay' => 'Frame Relay',
-	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay+' => '',
-	'Class:NetworkInterface/Attribute:physical_type/Value:vlan' => 'VLAN',
-	'Class:NetworkInterface/Attribute:physical_type/Value:vlan+' => '',
-	'Class:NetworkInterface/Attribute:ip_address' => 'IP 地址',
-	'Class:NetworkInterface/Attribute:ip_address+' => '',
-	'Class:NetworkInterface/Attribute:ip_mask' => 'IP 掩码',
-	'Class:NetworkInterface/Attribute:ip_mask+' => '',
-	'Class:NetworkInterface/Attribute:mac_address' => 'MAC 地址',
-	'Class:NetworkInterface/Attribute:mac_address+' => '',
-	'Class:NetworkInterface/Attribute:speed' => '速率',
-	'Class:NetworkInterface/Attribute:speed+' => '',
-	'Class:NetworkInterface/Attribute:duplex' => 'Duplex',
-	'Class:NetworkInterface/Attribute:duplex+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:auto' => 'Auto',
-	'Class:NetworkInterface/Attribute:duplex/Value:auto+' => 'Auto',
-	'Class:NetworkInterface/Attribute:duplex/Value:full' => 'Full',
-	'Class:NetworkInterface/Attribute:duplex/Value:full+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:half' => 'Half',
-	'Class:NetworkInterface/Attribute:duplex/Value:half+' => '',
-	'Class:NetworkInterface/Attribute:duplex/Value:unknown' => '未知',
-	'Class:NetworkInterface/Attribute:duplex/Value:unknown+' => '',
-	'Class:NetworkInterface/Attribute:connected_if' => '连接到',
-	'Class:NetworkInterface/Attribute:connected_if+' => '连接的接口',
-	'Class:NetworkInterface/Attribute:connected_name' => '连接到',
-	'Class:NetworkInterface/Attribute:connected_name+' => '',
-	'Class:NetworkInterface/Attribute:connected_if_device_id' => '连接的设备',
-	'Class:NetworkInterface/Attribute:connected_if_device_id+' => '',
-	'Class:NetworkInterface/Attribute:connected_if_device_id_name' => '设备',
-	'Class:NetworkInterface/Attribute:connected_if_device_id_name+' => '',
-	'Class:NetworkInterface/Attribute:link_type' => '连接类别',
-	'Class:NetworkInterface/Attribute:link_type+' => '',
-	'Class:NetworkInterface/Attribute:link_type/Value:downlink' => 'Down link',
-	'Class:NetworkInterface/Attribute:link_type/Value:downlink+' => '',
-	'Class:NetworkInterface/Attribute:link_type/Value:uplink' => 'Up link',
-	'Class:NetworkInterface/Attribute:link_type/Value:uplink+' => '',
-));
-
-
-
-//
-// Class: Device
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Device' => '设备',
-	'Class:Device+' => '',
-	'Class:Device/Attribute:nwinterface_list' => '网络接口',
-	'Class:Device/Attribute:nwinterface_list+' => '',
-));
-
-//
-// Class: PC
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:cpu' => 'CPU',
-	'Class:PC/Attribute:cpu+' => '',
-	'Class:PC/Attribute:ram' => '内存',
-	'Class:PC/Attribute:ram+' => '',
-	'Class:PC/Attribute:hdd' => '硬盘',
-	'Class:PC/Attribute:hdd+' => '',
-	'Class:PC/Attribute:os_family' => 'OS 族',
-	'Class:PC/Attribute:os_family+' => '',
-	'Class:PC/Attribute:os_version' => 'OS 版本',
-	'Class:PC/Attribute:os_version+' => '',
-	'Class:PC/Attribute:application_list' => '应用程序',
-	'Class:PC/Attribute:application_list+' => '安装在该 PC 上的应用程序',
-	'Class:PC/Attribute:patch_list' => '补丁',
-	'Class:PC/Attribute:patch_list+' => '安装在该 PC 上的补丁',
-));
-
-//
-// Class: MobileCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:MobileCI' => '移动 CI',
-	'Class:MobileCI+' => '',
-));
-
-//
-// Class: MobilePhone
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:MobilePhone' => '移动电话',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:number' => '电话号码',
-	'Class:MobilePhone/Attribute:number+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => '硬件 PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-));
-
-//
-// Class: InfrastructureCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:InfrastructureCI' => '基础架构 CI',
-	'Class:InfrastructureCI+' => '',
-	'Class:InfrastructureCI/Attribute:description' => '描述',
-	'Class:InfrastructureCI/Attribute:description+' => '',
-	'Class:InfrastructureCI/Attribute:location_id' => '位置',
-	'Class:InfrastructureCI/Attribute:location_id+' => '',
-	'Class:InfrastructureCI/Attribute:location_name' => '位置',
-	'Class:InfrastructureCI/Attribute:location_name+' => '',
-	'Class:InfrastructureCI/Attribute:location_details' => '位置明细',
-	'Class:InfrastructureCI/Attribute:location_details+' => '',
-	'Class:InfrastructureCI/Attribute:management_ip' => '管理 IP',
-	'Class:InfrastructureCI/Attribute:management_ip+' => '',
-	'Class:InfrastructureCI/Attribute:default_gateway' => '缺省网关',
-	'Class:InfrastructureCI/Attribute:default_gateway+' => '',
-));
-
-//
-// Class: NetworkDevice
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:NetworkDevice' => '网络设备',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:type' => '类别',
-	'Class:NetworkDevice/Attribute:type+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator' => 'WAN 加速器',
-	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:firewall' => '防火墙',
-	'Class:NetworkDevice/Attribute:type/Value:firewall+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:hub' => '集线器',
-	'Class:NetworkDevice/Attribute:type/Value:hub+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:loadbalancer' => '负载均衡',
-	'Class:NetworkDevice/Attribute:type/Value:loadbalancer+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:router' => '路由器',
-	'Class:NetworkDevice/Attribute:type/Value:router+' => '',
-	'Class:NetworkDevice/Attribute:type/Value:switch' => '交换机',
-	'Class:NetworkDevice/Attribute:type/Value:switch+' => '',
-	'Class:NetworkDevice/Attribute:ios_version' => 'IOS 版本',
-	'Class:NetworkDevice/Attribute:ios_version+' => '',
-	'Class:NetworkDevice/Attribute:ram' => '内存',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-	'Class:NetworkDevice/Attribute:snmp_read' => 'SNMP 读',
-	'Class:NetworkDevice/Attribute:snmp_read+' => '',
-	'Class:NetworkDevice/Attribute:snmp_write' => 'SNMP 写',
-	'Class:NetworkDevice/Attribute:snmp_write+' => '',
-));
-
-//
-// Class: Server
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Server' => '服务器',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:cpu' => 'CPU',
-	'Class:Server/Attribute:cpu+' => '',
-	'Class:Server/Attribute:ram' => '内存',
-	'Class:Server/Attribute:ram+' => '',
-	'Class:Server/Attribute:hdd' => '硬盘',
-	'Class:Server/Attribute:hdd+' => '',
-	'Class:Server/Attribute:os_family' => 'OS族',
-	'Class:Server/Attribute:os_family+' => '',
-	'Class:Server/Attribute:os_version' => 'OS版本 ',
-	'Class:Server/Attribute:os_version+' => '',
-	'Class:Server/Attribute:application_list' => '应用程序',
-	'Class:Server/Attribute:application_list+' => '服务器上安装的应用程序',
-	'Class:Server/Attribute:patch_list' => '补丁',
-	'Class:Server/Attribute:patch_list+' => '服务器上安装的补丁',
-));
-
-//
-// Class: Printer
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Printer' => '打印机',
-	'Class:Printer+' => '',
-	'Class:Printer/Attribute:type' => '类别',
-	'Class:Printer/Attribute:type+' => '',
-	'Class:Printer/Attribute:type/Value:mopier' => 'Mopier',
-	'Class:Printer/Attribute:type/Value:mopier+' => '',
-	'Class:Printer/Attribute:type/Value:printer' => '打印机',
-	'Class:Printer/Attribute:type/Value:printer+' => '',
-	'Class:Printer/Attribute:technology' => 'Technology',
-	'Class:Printer/Attribute:technology+' => '',
-	'Class:Printer/Attribute:technology/Value:inkjet' => '喷墨',
-	'Class:Printer/Attribute:technology/Value:inkjet+' => '',
-	'Class:Printer/Attribute:technology/Value:laser' => '激光',
-	'Class:Printer/Attribute:technology/Value:laser+' => '',
-	'Class:Printer/Attribute:technology/Value:tracer' => '绘图',
-	'Class:Printer/Attribute:technology/Value:tracer+' => '',
-));
-
-//
-// Class: lnkCIToDoc
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkCIToDoc' => 'Doc/CI',
-	'Class:lnkCIToDoc+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_id' => 'CI',
-	'Class:lnkCIToDoc/Attribute:ci_id+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_name' => 'CI',
-	'Class:lnkCIToDoc/Attribute:ci_name+' => '',
-	'Class:lnkCIToDoc/Attribute:ci_status' => 'CI 状态',
-	'Class:lnkCIToDoc/Attribute:ci_status+' => '',
-	'Class:lnkCIToDoc/Attribute:document_id' => '文档',
-	'Class:lnkCIToDoc/Attribute:document_id+' => '',
-	'Class:lnkCIToDoc/Attribute:document_name' => '文档',
-	'Class:lnkCIToDoc/Attribute:document_name+' => '',
-	'Class:lnkCIToDoc/Attribute:document_type' => '文档类别',
-	'Class:lnkCIToDoc/Attribute:document_type+' => '',
-	'Class:lnkCIToDoc/Attribute:document_status' => '文档状态',
-	'Class:lnkCIToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkCIToContact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkCIToContact' => 'CI/联系人',
-	'Class:lnkCIToContact+' => '',
-	'Class:lnkCIToContact/Attribute:ci_id' => 'CI',
-	'Class:lnkCIToContact/Attribute:ci_id+' => '',
-	'Class:lnkCIToContact/Attribute:ci_name' => 'CI',
-	'Class:lnkCIToContact/Attribute:ci_name+' => '',
-	'Class:lnkCIToContact/Attribute:ci_status' => 'CI 状态',
-	'Class:lnkCIToContact/Attribute:ci_status+' => '',
-	'Class:lnkCIToContact/Attribute:contact_id' => '联系人',
-	'Class:lnkCIToContact/Attribute:contact_id+' => '',
-	'Class:lnkCIToContact/Attribute:contact_name' => '联系人',
-	'Class:lnkCIToContact/Attribute:contact_name+' => '',
-	'Class:lnkCIToContact/Attribute:contact_email' => '联系人 Email',
-	'Class:lnkCIToContact/Attribute:contact_email+' => '',
-	'Class:lnkCIToContact/Attribute:role' => '角色',
-	'Class:lnkCIToContact/Attribute:role+' => '和该 CI 相关的联系人的角色',
-));
-
-//
-// Class: lnkSolutionToCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkSolutionToCI' => 'CI/方案',
-	'Class:lnkSolutionToCI+' => '',
-	'Class:lnkSolutionToCI/Attribute:solution_id' => '应用方案',
-	'Class:lnkSolutionToCI/Attribute:solution_id+' => '',
-	'Class:lnkSolutionToCI/Attribute:solution_name' => '应用方案',
-	'Class:lnkSolutionToCI/Attribute:solution_name+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkSolutionToCI/Attribute:ci_id+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkSolutionToCI/Attribute:ci_name+' => '',
-	'Class:lnkSolutionToCI/Attribute:ci_status' => 'CI 状态',
-	'Class:lnkSolutionToCI/Attribute:ci_status+' => '',
-	'Class:lnkSolutionToCI/Attribute:utility' => '用途',
-	'Class:lnkSolutionToCI/Attribute:utility+' => '在方案中该 CI 的用途',
-));
-
-//
-// Class: lnkProcessToSolution
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkProcessToSolution' => '业务流程/方案',
-	'Class:lnkProcessToSolution+' => '',
-	'Class:lnkProcessToSolution/Attribute:solution_id' => '应用方案',
-	'Class:lnkProcessToSolution/Attribute:solution_id+' => '',
-	'Class:lnkProcessToSolution/Attribute:solution_name' => '应用方案',
-	'Class:lnkProcessToSolution/Attribute:solution_name+' => '',
-	'Class:lnkProcessToSolution/Attribute:process_id' => '流程',
-	'Class:lnkProcessToSolution/Attribute:process_id+' => '',
-	'Class:lnkProcessToSolution/Attribute:process_name' => '流程',
-	'Class:lnkProcessToSolution/Attribute:process_name+' => '',
-	'Class:lnkProcessToSolution/Attribute:reason' => '原因',
-	'Class:lnkProcessToSolution/Attribute:reason+' => '联系流程和方案的更多信息',
-));
-
-
-
-//
-// Class extensions
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-'Class:Subnet/Tab:IPUsage' => 'IP 使用情况',
-'Class:Subnet/Tab:IPUsage-explain' => '接口拥有一个下述范围内的IP: <em>%1$s</em> 到 <em>%2$s</em>',
-'Class:Subnet/Tab:FreeIPs' => '未用的 IP',
-'Class:Subnet/Tab:FreeIPs-count' => '未用的 IP: %1$s',
-'Class:Subnet/Tab:FreeIPs-explain' => '这里有10个抽取的未用的 IP 地址',
-));
-
-//
-// Application Menu
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-'Menu:DataAdministration' => '数据管理',
-'Menu:DataAdministration+' => '数据管理',
-'Menu:Catalogs' => '目录',
-'Menu:Catalogs+' => '数据类别',
-'Menu:Audit' => '审计',
-'Menu:Audit+' => '审计',
-'Menu:CSVImport' => 'CSV 导入',
-'Menu:CSVImport+' => '大批量创建或修改',
-'Menu:Organization' => '组织',
-'Menu:Organization+' => '所有组织',
-'Menu:Application' => '应用程序',
-'Menu:Application+' => '所有应用程序',
-'Menu:DBServer' => '数据库服务器',
-'Menu:DBServer+' => '数据库服务器',
-'Menu:Audit' => '审计',
-'Menu:ConfigManagement' => '配置管理',
-'Menu:ConfigManagement+' => '配置管理',
-'Menu:ConfigManagementOverview' => '总览',
-'Menu:ConfigManagementOverview+' => '总览',
-'Menu:Contact' => '联系人',
-'Menu:Contact+' => '联系人',
-'Menu:Contact:Count' => '%1$d',
-'Menu:Person' => '人员',
-'Menu:Person+' => '所有人员',
-'Menu:Team' => '团队',
-'Menu:Team+' => '所有团队',
-'Menu:Document' => '文档',
-'Menu:Document+' => '所有文档',
-'Menu:Location' => '位置',
-'Menu:Location+' => '所有位置',
-'Menu:ConfigManagementCI' => '配置项',
-'Menu:ConfigManagementCI+' => '配置项',
-'Menu:BusinessProcess' => '业务过程',
-'Menu:BusinessProcess+' => '所有业务过程',
-'Menu:ApplicationSolution' => '应用方案',
-'Menu:ApplicationSolution+' => '所有应用方案',
-'Menu:ConfigManagementSoftware' => '应用管理',
-'Menu:Licence' => 'Licences',
-'Menu:Licence+' => '所有Licences',
-'Menu:Patch' => '补丁',
-'Menu:Patch+' => '所有补丁',
-'Menu:ApplicationInstance' => '已安装的软件',
-'Menu:ApplicationInstance+' => '应用程序和数据库服务器',
-'Menu:ConfigManagementHardware' => '基础架构管理',
-'Menu:Subnet' => '子网',
-'Menu:Subnet+' => '所有子网',
-'Menu:NetworkDevice' => '网络设备',
-'Menu:NetworkDevice+' => '所有网络设备',
-'Menu:Server' => '服务器',
-'Menu:Server+' => '所有服务器',
-'Menu:Printer' => '打印机',
-'Menu:Printer+' => '所有打印机',
-'Menu:MobilePhone' => '手机',
-'Menu:MobilePhone+' => '所有手机',
-'Menu:PC' => '个人电脑',
-'Menu:PC+' => '所有个人电脑',
-'Menu:NewContact' => '新联系人',
-'Menu:NewContact+' => '新联系人',
-'Menu:SearchContacts' => '查找联系人',
-'Menu:SearchContacts+' => '查找联系人',
-'Menu:NewCI' => '新CI',
-'Menu:NewCI+' => '新CI',
-'Menu:SearchCIs' => '查找CI',
-'Menu:SearchCIs+' => '查找CI',
-'Menu:ConfigManagement:Devices' => '设备',
-'Menu:ConfigManagement:AllDevices' => '基础架构',
-'Menu:ConfigManagement:SWAndApps' => '软件和应用程序',
-'Menu:ConfigManagement:Misc' => '杂项',
-'Menu:Group' => 'CI族',
-'Menu:Group+' => 'CI族',
-'Menu:ConfigManagement:Shortcuts' => '快捷方式',
-'Menu:ConfigManagement:AllContacts' => '所有联系人: %1$d',
-
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
-	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
-	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
-	'Class:Location/Attribute:person_list' => 'Contacts~~',
-	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
-	'Class:Contact/Attribute:notify' => 'Notification~~',
-	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
-	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
-	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
-	'Class:Contact/Attribute:function' => 'Function~~',
-	'Class:Contact/Attribute:cis_list' => 'CIs~~',
-	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
-	'Class:Person/Attribute:name' => 'Last Name~~',
-	'Class:Person/Attribute:employee_number' => 'Employee number~~',
-	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
-	'Class:Person/Attribute:location_id' => 'Location~~',
-	'Class:Person/Attribute:location_name' => 'Location name~~',
-	'Class:Person/Attribute:manager_id' => 'Manager~~',
-	'Class:Person/Attribute:manager_name' => 'Manager name~~',
-	'Class:Person/Attribute:team_list' => 'Teams~~',
-	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
-	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
-	'Class:Team/Attribute:persons_list' => 'Members~~',
-	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
-	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
-	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
-	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
-	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
-	'Class:Document/Attribute:version' => 'Version~~',
-	'Class:Document/Attribute:cis_list' => 'CIs~~',
-	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
-	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
-	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
-	'Class:Document/Attribute:services_list' => 'Services~~',
-	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
-	'Class:Document/Attribute:finalclass' => 'Document Type~~',
-	'Class:DocumentFile' => 'Document File~~',
-	'Class:DocumentFile/Attribute:file' => 'File~~',
-	'Class:DocumentNote' => 'Document Note~~',
-	'Class:DocumentNote/Attribute:text' => 'Text~~',
-	'Class:DocumentWeb' => 'Document Web~~',
-	'Class:DocumentWeb/Attribute:url' => 'URL~~',
-	'Class:FunctionalCI/Attribute:description' => 'Description~~',
-	'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/Value:high' => 'high~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium~~',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
-	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date~~',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts~~',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Documents~~',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
-	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
-	'Class:PhysicalDevice' => 'Physical Device~~',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Location name~~',
-	'Class:PhysicalDevice/Attribute:status' => 'Status~~',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production~~',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock~~',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand~~',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name~~',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Model~~',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Model name~~',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number~~',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date~~',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty~~',
-	'Class:Rack' => 'Rack~~',
-	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
-	'Class:Rack/Attribute:device_list' => 'Devices~~',
-	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
-	'Class:Rack/Attribute:enclosure_list' => 'Enclosures~~',
-	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
-	'Class:TelephonyCI' => 'Telephony CI~~',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number~~',
-	'Class:Phone' => 'Phone~~',
-	'Class:IPPhone' => 'IP Phone~~',
-	'Class:Tablet' => 'Tablet~~',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
-	'Class:DatacenterDevice' => 'Datacenter Device~~',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure~~',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name~~',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name~~',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source~~',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name~~',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports~~',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs~~',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
-	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
-	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices~~',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version~~',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name~~',
-	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
-	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:Server/Attribute:osversion_id' => 'OS version~~',
-	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
-	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
-	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
-	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes~~',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
-	'Class:StorageSystem' => 'Storage System~~',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
-	'Class:SANSwitch' => 'SAN Switch~~',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
-	'Class:TapeLibrary' => 'Tape Library~~',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
-	'Class:NAS' => 'NAS~~',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
-	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
-	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:PC/Attribute:osversion_id' => 'OS version~~',
-	'Class:PC/Attribute:osversion_name' => 'OS version name~~',
-	'Class:PC/Attribute:type' => 'Type~~',
-	'Class:PC/Attribute:type/Value:desktop' => 'desktop~~',
-	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
-	'Class:PC/Attribute:type/Value:laptop' => 'laptop~~',
-	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
-	'Class:PowerConnection' => 'Power Connection~~',
-	'Class:PowerSource' => 'Power Source~~',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
-	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
-	'Class:PDU' => 'PDU~~',
-	'Class:PDU/Attribute:rack_id' => 'Rack~~',
-	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
-	'Class:PDU/Attribute:powerstart_id' => 'Power start~~',
-	'Class:PDU/Attribute:powerstart_name' => 'Power start name~~',
-	'Class:Peripheral' => 'Peripheral~~',
-	'Class:Enclosure' => 'Enclosure~~',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
-	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
-	'Class:Enclosure/Attribute:nb_u' => 'Rack units~~',
-	'Class:Enclosure/Attribute:device_list' => 'Devices~~',
-	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes~~',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
-	'Class:ApplicationSolution/Attribute:status' => 'Status~~',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active~~',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions~~',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
-	'Class:BusinessProcess/Attribute:status' => 'Status~~',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'active~~',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:SoftwareInstance/Attribute:system_id' => 'System~~',
-	'Class:SoftwareInstance/Attribute:system_name' => 'System name~~',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
-	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
-	'Class:SoftwareInstance/Attribute:status' => 'Status~~',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active~~',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive~~',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
-	'Class:Middleware' => 'Middleware~~',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
-	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas~~',
-	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
-	'Class:WebServer' => 'Web server~~',
-	'Class:WebServer/Attribute:webapp_list' => 'Web applications~~',
-	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
-	'Class:PCSoftware' => 'PC Software~~',
-	'Class:OtherSoftware' => 'Other Software~~',
-	'Class:MiddlewareInstance' => 'Middleware Instance~~',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
-	'Class:DatabaseSchema' => 'Database Schema~~',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
-	'Class:WebApplication' => 'Web Application~~',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
-	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
-	'Class:WebApplication/Attribute:url' => 'URL~~',
-	'Class:VirtualDevice' => 'Virtual Device~~',
-	'Class:VirtualDevice/Attribute:status' => 'Status~~',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'production~~',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock~~',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes~~',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
-	'Class:VirtualHost' => 'Virtual Host~~',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines~~',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
-	'Class:Hypervisor' => 'Hypervisor~~',
-	'Class:Hypervisor/Attribute:farm_id' => 'Farm~~',
-	'Class:Hypervisor/Attribute:farm_name' => 'Farm name~~',
-	'Class:Hypervisor/Attribute:server_id' => 'Server~~',
-	'Class:Hypervisor/Attribute:server_name' => 'Server name~~',
-	'Class:Farm' => 'Farm~~',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors~~',
-	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
-	'Class:Farm/Attribute:redundancy' => 'High availability~~',
-	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
-	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
-	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
-	'Class:VirtualMachine' => 'Virtual Machine~~',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family~~',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version~~',
-	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
-	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM~~',
-	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
-	'Class:LogicalVolume' => 'Logical Volume~~',
-	'Class:LogicalVolume/Attribute:name' => 'Name~~',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID~~',
-	'Class:LogicalVolume/Attribute:description' => 'Description~~',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level~~',
-	'Class:LogicalVolume/Attribute:size' => 'Size~~',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system~~',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name~~',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servers~~',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices~~',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
-	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Server~~',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name~~',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used~~',
-	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name~~',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used~~',
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc~~',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc~~',
-	'Class:Tape' => 'Tape~~',
-	'Class:Tape/Attribute:name' => 'Name~~',
-	'Class:Tape/Attribute:description' => 'Description~~',
-	'Class:Tape/Attribute:size' => 'Size~~',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library~~',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
-	'Class:NASFileSystem' => 'NAS File System~~',
-	'Class:NASFileSystem/Attribute:name' => 'Name~~',
-	'Class:NASFileSystem/Attribute:description' => 'Description~~',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level~~',
-	'Class:NASFileSystem/Attribute:size' => 'Size~~',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
-	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name~~',
-	'Class:Software/Attribute:vendor' => 'vendor~~',
-	'Class:Software/Attribute:version' => 'Version~~',
-	'Class:Software/Attribute:documents_list' => 'Documents~~',
-	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
-	'Class:Software/Attribute:type' => 'Type~~',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server~~',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software~~',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software~~',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server~~',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances~~',
-	'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:Patch/Attribute:documents_list' => 'Documents~~',
-	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
-	'Class:Patch/Attribute:finalclass' => 'Type~~',
-	'Class:OSPatch' => 'OS Patch~~',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices~~',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
-	'Class:OSPatch/Attribute:osversion_id' => 'OS version~~',
-	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
-	'Class:SoftwarePatch' => 'Software Patch~~',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software~~',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
-	'Class:Licence/Attribute:documents_list' => 'Documents~~',
-	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
-	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
-	'Class:Licence/Attribute:organization_name+' => 'Common name~~',
-	'Class:Licence/Attribute:description' => 'Description~~',
-	'Class:Licence/Attribute:start_date' => 'Start date~~',
-	'Class:Licence/Attribute:end_date' => 'End date~~',
-	'Class:Licence/Attribute:perpetual' => 'Perpetual~~',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'no~~',
-	'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:OSLicence' => 'OS Licence~~',
-	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
-	'Class:OSLicence/Attribute:osversion_name' => 'OS version 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:SoftwareLicence' => 'Software Licence~~',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
-	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name~~',
-	'Class:Typology' => 'Typology~~',
-	'Class:Typology/Attribute:name' => 'Name~~',
-	'Class:Typology/Attribute:finalclass' => 'Type~~',
-	'Class:OSVersion' => 'OS Version~~',
-	'Class:OSVersion/Attribute:osfamily_id' => 'OS family~~',
-	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
-	'Class:OSFamily' => 'OS Family~~',
-	'Class:DocumentType' => 'Document Type~~',
-	'Class:ContactType' => 'Contact Type~~',
-	'Class:Brand' => 'Brand~~',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
-	'Class:Model' => 'Model~~',
-	'Class:Model/Attribute:brand_id' => 'Brand~~',
-	'Class:Model/Attribute:brand_name' => 'Brand name~~',
-	'Class:Model/Attribute:type' => 'Device type~~',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
-	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source~~',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
-	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array~~',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
-	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone~~',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone~~',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
-	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device~~',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
-	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
-	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
-	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
-	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
-	'Class:Model/Attribute:type/Value:Printer' => 'Printer~~',
-	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
-	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
-	'Class:Model/Attribute:type/Value:Server' => 'Server~~',
-	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet~~',
-	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
-	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
-	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
-	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
-	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
-	'Class:NetworkDeviceType' => 'Network Device Type~~',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices~~',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
-	'Class:IOSVersion' => 'IOS Version~~',
-	'Class:IOSVersion/Attribute:brand_id' => 'Brand~~',
-	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
-	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
-	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name~~',
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name~~',
-	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:Subnet/Attribute:org_name' => 'Name~~',
-	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
-	'Class:Subnet/Attribute:vlans_list' => 'VLANs~~',
-	'Class:VLAN' => 'VLAN~~',
-	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:VLAN/Attribute:description' => 'Description~~',
-	'Class:VLAN/Attribute:org_id' => 'Organization~~',
-	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
-	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
-	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
-	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
-	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
-	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN~~',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:NetworkInterface/Attribute:name' => 'Name~~',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
-	'Class:IPInterface' => 'IP Interface~~',
-	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
-	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
-	'Class:IPInterface/Attribute:comment' => 'Comment~~',
-	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway~~',
-	'Class:IPInterface/Attribute:ipmask' => 'IP mask~~',
-	'Class:IPInterface/Attribute:speed' => 'Speed~~',
-	'Class:PhysicalInterface' => 'Physical Interface~~',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
-	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs~~',
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN~~',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
-	'Class:LogicalInterface' => 'Logical Interface~~',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine~~',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name~~',
-	'Class:FiberChannelInterface' => 'Fiber Channel Interface~~',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Speed~~',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topology~~',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN~~',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device~~',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name~~',
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port~~',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => '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:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution~~',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name~~',
-	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group~~',
-	'Menu:ConfigManagement:virtualization' => 'Virtualization~~',
-	'Menu:ConfigManagement:EndUsers' => 'End user devices~~',
-	'Menu:Typology' => 'Typology configuration~~',
-	'Menu:Typology+' => 'Typology configuration~~',
-	'Menu:OSVersion' => 'OS versions~~',
-	'Menu:Software' => 'Software catalog~~',
-	'Menu:Software+' => 'Software catalog~~',
-	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
-	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
-	'Server:baseinfo' => 'General information~~',
-	'Server:Date' => 'Dates~~',
-	'Server:moreinfo' => 'More information~~',
-	'Server:otherinfo' => 'Other information~~',
-	'Server:power' => 'Power supply~~',
-	'Person:info' => 'General information~~',
-	'Person:notifiy' => 'Notification~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Relations
+//////////////////////////////////////////////////////////////////////
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Relation:impacts/Description' => '被影响的元素',
+	'Relation:impacts/DownStream' => '影响...',
+	'Relation:impacts/DownStream+' => '被影响的元素',
+	'Relation:impacts/UpStream' => '依赖于...',
+	'Relation:impacts/UpStream+' => '该元素依赖的元素...',
+	// Legacy entries
+	'Relation:depends on/Description' => '该元素依赖的元素...',
+	'Relation:depends on/DownStream' => '依赖于...',
+	'Relation:depends on/UpStream' => '影响...',
+));
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: Organization
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Organization' => '组织',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => '名称',
+	'Class:Organization/Attribute:name+' => '常用名称',
+	'Class:Organization/Attribute:code' => '编码',
+	'Class:Organization/Attribute:code+' => '组织编码(Siret, DUNS,...)',
+	'Class:Organization/Attribute:status' => '状态',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => '活动',
+	'Class:Organization/Attribute:status/Value:active+' => '活动',
+	'Class:Organization/Attribute:status/Value:inactive' => '非活动',
+	'Class:Organization/Attribute:status/Value:inactive+' => '非活动',
+	'Class:Organization/Attribute:parent_id' => '父级',
+	'Class:Organization/Attribute:parent_id+' => '父级组织',
+	'Class:Organization/Attribute:parent_name' => '父级名称',
+	'Class:Organization/Attribute:parent_name+' => '父级组织名称',
+));
+
+
+//
+// Class: Location
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Location' => '位置',
+	'Class:Location+' => '任何类型的地理位置: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
+	'Class:Location/Attribute:name' => '名称',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => '状态',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => '活动',
+	'Class:Location/Attribute:status/Value:active+' => '活动',
+	'Class:Location/Attribute:status/Value:inactive' => '非活动',
+	'Class:Location/Attribute:status/Value:inactive+' => '非活动',
+	'Class:Location/Attribute:org_id' => '拥有者组织',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:org_name' => '拥有者组织名称',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Location/Attribute:address' => '地址',
+	'Class:Location/Attribute:address+' => '门户地址',
+	'Class:Location/Attribute:postal_code' => '邮编',
+	'Class:Location/Attribute:postal_code+' => 'ZIP/邮政编码',
+	'Class:Location/Attribute:city' => '城市',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => '国家',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:parent_id' => '父级位置',
+	'Class:Location/Attribute:parent_id+' => '',
+	'Class:Location/Attribute:parent_name' => '父级名称',
+	'Class:Location/Attribute:parent_name+' => '',
+	'Class:Location/Attribute:contact_list' => '联系人',
+	'Class:Location/Attribute:contact_list+' => '该场点的联系人',
+	'Class:Location/Attribute:infra_list' => '基础架构',
+	'Class:Location/Attribute:infra_list+' => '该场点的CI',
+));
+//
+// Class: Group
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Group' => '组',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => '名称',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => '状态',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => '实施',
+	'Class:Group/Attribute:status/Value:implementation+' => '实施',
+	'Class:Group/Attribute:status/Value:obsolete' => '荒废',
+	'Class:Group/Attribute:status/Value:obsolete+' => '荒废',
+	'Class:Group/Attribute:status/Value:production' => '生产',
+	'Class:Group/Attribute:status/Value:production+' => '生产',
+	'Class:Group/Attribute:org_id' => '组织',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:owner_name' => '名称',
+	'Class:Group/Attribute:owner_name+' => '常用名称',
+	'Class:Group/Attribute:description' => '描述',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => '种类',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => '父级组别',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:parent_name' => '名称',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:ci_list' => '连接的CI',
+	'Class:Group/Attribute:ci_list+' => '',
+));
+
+//
+// Class: lnkGroupToCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkGroupToCI' => '组 / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => '组',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => '名称',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => '名称',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_status' => 'CI状态',
+	'Class:lnkGroupToCI/Attribute:ci_status+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => '原因',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+));
+
+
+//
+// Class: Contact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Contact' => '联系人',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => '名称',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => '状态',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => '活动',
+	'Class:Contact/Attribute:status/Value:active+' => '活动',
+	'Class:Contact/Attribute:status/Value:inactive' => '非活动',
+	'Class:Contact/Attribute:status/Value:inactive+' => '非活动',
+	'Class:Contact/Attribute:org_id' => '组织',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => '组织',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => '电话',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:location_id' => '位置',
+	'Class:Contact/Attribute:location_id+' => '',
+	'Class:Contact/Attribute:location_name' => '位置',
+	'Class:Contact/Attribute:location_name+' => '',
+	'Class:Contact/Attribute:ci_list' => 'CI',
+	'Class:Contact/Attribute:ci_list+' => '该联系人相关CI',
+	'Class:Contact/Attribute:contract_list' => '合同',
+	'Class:Contact/Attribute:contract_list+' => '该联系人相关合同',
+	'Class:Contact/Attribute:service_list' => '服务',
+	'Class:Contact/Attribute:service_list+' => '该联系人相关服务',
+	'Class:Contact/Attribute:ticket_list' => 'Tickets',
+	'Class:Contact/Attribute:ticket_list+' => '该联系人相关',
+	'Class:Contact/Attribute:team_list' => '团队',
+	'Class:Contact/Attribute:team_list+' => '该联系人所属团队',
+	'Class:Contact/Attribute:finalclass' => '类别',
+	'Class:Contact/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Person
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Person' => '人员',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:first_name' => '姓',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_id' => '员工ID',
+	'Class:Person/Attribute:employee_id+' => '',
+));
+
+//
+// Class: Team
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Team' => '团队',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:member_list' => '成员',
+	'Class:Team/Attribute:member_list+' => '团队所辖成员',
+));
+
+//
+// Class: lnkTeamToContact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkTeamToContact' => '团队成员',
+	'Class:lnkTeamToContact+' => '团队中的成员',
+	'Class:lnkTeamToContact/Attribute:team_id' => '团队',
+	'Class:lnkTeamToContact/Attribute:team_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_id' => '成员',
+	'Class:lnkTeamToContact/Attribute:contact_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_location_id' => '位置',
+	'Class:lnkTeamToContact/Attribute:contact_location_id+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_email' => 'Email',
+	'Class:lnkTeamToContact/Attribute:contact_email+' => '',
+	'Class:lnkTeamToContact/Attribute:contact_phone' => '电话',
+	'Class:lnkTeamToContact/Attribute:contact_phone+' => '',
+	'Class:lnkTeamToContact/Attribute:role' => '角色',
+	'Class:lnkTeamToContact/Attribute:role+' => '',
+));
+
+//
+// Class: Document
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Document' => '文档',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => '名称',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => '组织',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:org_name' => '组织名称',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:description' => '描述',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:type' => '类别',
+	'Class:Document/Attribute:type+' => '',
+	'Class:Document/Attribute:type/Value:contract' => '合同',
+	'Class:Document/Attribute:type/Value:contract+' => '',
+	'Class:Document/Attribute:type/Value:networkmap' => '网络图',
+	'Class:Document/Attribute:type/Value:networkmap+' => '',
+	'Class:Document/Attribute:type/Value:presentation' => '展现',
+	'Class:Document/Attribute:type/Value:presentation+' => '',
+	'Class:Document/Attribute:type/Value:training' => '培训',
+	'Class:Document/Attribute:type/Value:training+' => '',
+	'Class:Document/Attribute:type/Value:whitePaper' => '白皮书',
+	'Class:Document/Attribute:type/Value:whitePaper+' => '',
+	'Class:Document/Attribute:type/Value:workinginstructions' => '工作指南',
+	'Class:Document/Attribute:type/Value:workinginstructions+' => '',
+	'Class:Document/Attribute:type/Value:design' => '设计',
+	'Class:Document/Attribute:type/Value:design+' => '',
+	'Class:Document/Attribute:status' => '状态',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => '草案',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => '荒废',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => '已发布',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:ci_list' => 'CI',
+	'Class:Document/Attribute:ci_list+' => '参照该文档的CI',
+	'Class:Document/Attribute:contract_list' => '合同',
+	'Class:Document/Attribute:contract_list+' => '参照该文档的合同',
+	'Class:Document/Attribute:service_list' => '服务',
+	'Class:Document/Attribute:service_list+' => '参照该文档的服务',
+	'Class:Document/Attribute:ticket_list' => '单据',
+	'Class:Document/Attribute:ticket_list+' => '引用该文档的单据',
+	'Class:Document:PreviewTab' => '预览',
+));
+
+//
+// Class: WebDoc
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:WebDoc' => 'Web 文档',
+	'Class:WebDoc+' => '其他web服务器上可获得的文档',
+	'Class:WebDoc/Attribute:url' => 'Url',
+	'Class:WebDoc/Attribute:url+' => '',
+));
+
+//
+// Class: Note
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Note' => '备注',
+	'Class:Note+' => '',
+	'Class:Note/Attribute:note' => '文本',
+	'Class:Note/Attribute:note+' => '',
+));
+
+//
+// Class: FileDoc
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FileDoc' => '文档',
+	'Class:FileDoc+' => '',
+	'Class:FileDoc/Attribute:contents' => '内容',
+	'Class:FileDoc/Attribute:contents+' => '',
+));
+
+//
+// Class: Licence
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Licence' => 'Licence',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:provider' => '提供商',
+	'Class:Licence/Attribute:provider+' => '',
+	'Class:Licence/Attribute:org_id' => '所有者',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:org_name' => '名称',
+	'Class:Licence/Attribute:org_name+' => '常用名称',
+	'Class:Licence/Attribute:product' => '产品',
+	'Class:Licence/Attribute:product+' => '',
+	'Class:Licence/Attribute:name' => '名称',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:start' => '启始日期',
+	'Class:Licence/Attribute:start+' => '',
+	'Class:Licence/Attribute:end' => '终止日期',
+	'Class:Licence/Attribute:end+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Key',
+	'Class:Licence/Attribute:licence_key+' => '',
+	'Class:Licence/Attribute:scope' => '范围',
+	'Class:Licence/Attribute:scope+' => '',
+	'Class:Licence/Attribute:usage_limit' => '使用限制',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:usage_list' => '用途',
+	'Class:Licence/Attribute:usage_list+' => '使用该License的应用程序实例',
+));
+
+
+//
+// Class: Subnet
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Subnet' => '子网',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Name' => '%1$s / %2$s',
+	//'Class:Subnet/Attribute:name' => 'Name',
+	//'Class:Subnet/Attribute:name+' => '',
+	'Class:Subnet/Attribute:org_id' => '拥有者组织',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:description' => '描述',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP Mask',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+));
+
+//
+// Class: Patch
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Patch' => '补丁',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => '名称',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:description' => '描述',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:target_sw' => '应用程序范围',
+	'Class:Patch/Attribute:target_sw+' => '目标软件 (OS 或应用程序)',
+	'Class:Patch/Attribute:version' => '版本',
+	'Class:Patch/Attribute:version+' => '',
+	'Class:Patch/Attribute:type' => '类别',
+	'Class:Patch/Attribute:type+' => '',
+	'Class:Patch/Attribute:type/Value:application' => '应用程序',
+	'Class:Patch/Attribute:type/Value:application+' => '',
+	'Class:Patch/Attribute:type/Value:os' => 'OS',
+	'Class:Patch/Attribute:type/Value:os+' => '',
+	'Class:Patch/Attribute:type/Value:security' => '安全',
+	'Class:Patch/Attribute:type/Value:security+' => '',
+	'Class:Patch/Attribute:type/Value:servicepack' => '服务包',
+	'Class:Patch/Attribute:type/Value:servicepack+' => '',
+	'Class:Patch/Attribute:ci_list' => '设备',
+	'Class:Patch/Attribute:ci_list+' => '安装该补丁的设备',
+));
+
+//
+// Class: Software
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Software' => '软件',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => '名称',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:description' => '描述',
+	'Class:Software/Attribute:description+' => '',
+	'Class:Software/Attribute:instance_list' => '安装',
+	'Class:Software/Attribute:instance_list+' => '该软件的实例',
+	'Class:Software/Attribute:finalclass' => '类别',
+	'Class:Software/Attribute:finalclass+' => '',
+));
+
+//
+// Class: Application
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Application' => '应用程序',
+	'Class:Application+' => '',
+	'Class:Application/Attribute:name' => '名称',
+	'Class:Application/Attribute:name+' => '',
+	'Class:Application/Attribute:description' => '描述',
+	'Class:Application/Attribute:description+' => '',
+	'Class:Application/Attribute:instance_list' => '安装',
+	'Class:Application/Attribute:instance_list+' => '应用程序实例',
+));
+
+//
+// Class: DBServer
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DBServer' => '数据库',
+	'Class:DBServer+' => '数据库服务器SW',
+	'Class:DBServer/Attribute:instance_list' => '安装',
+	'Class:DBServer/Attribute:instance_list+' => '数据库服务器实例',
+));
+
+//
+// Class: lnkPatchToCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkPatchToCI' => '补丁使用范围',
+	'Class:lnkPatchToCI+' => '',
+	'Class:lnkPatchToCI/Attribute:patch_id' => '补丁',
+	'Class:lnkPatchToCI/Attribute:patch_id+' => '',
+	'Class:lnkPatchToCI/Attribute:patch_name' => '补丁',
+	'Class:lnkPatchToCI/Attribute:patch_name+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkPatchToCI/Attribute:ci_id+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkPatchToCI/Attribute:ci_name+' => '',
+	'Class:lnkPatchToCI/Attribute:ci_status' => 'CI状态',
+	'Class:lnkPatchToCI/Attribute:ci_status+' => '',
+));
+
+//
+// Class: FunctionalCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:FunctionalCI' => '功能 CI',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => '名称',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:status' => '状态',
+	'Class:FunctionalCI/Attribute:status+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:implementation' => '实施',
+	'Class:FunctionalCI/Attribute:status/Value:implementation+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:obsolete' => '废弃',
+	'Class:FunctionalCI/Attribute:status/Value:obsolete+' => '',
+	'Class:FunctionalCI/Attribute:status/Value:production' => '生产',
+	'Class:FunctionalCI/Attribute:status/Value:production+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => '拥有者组织',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:owner_name' => '拥有者组织',
+	'Class:FunctionalCI/Attribute:owner_name+' => '',
+	'Class:FunctionalCI/Attribute:importance' => '业务关键性',
+	'Class:FunctionalCI/Attribute:importance+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:high' => '高',
+	'Class:FunctionalCI/Attribute:importance/Value:high+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:low' => '低',
+	'Class:FunctionalCI/Attribute:importance/Value:low+' => '',
+	'Class:FunctionalCI/Attribute:importance/Value:medium' => '中',
+	'Class:FunctionalCI/Attribute:importance/Value:medium+' => '',
+	'Class:FunctionalCI/Attribute:contact_list' => '联系人',
+	'Class:FunctionalCI/Attribute:contact_list+' => '该 CI 的联系人',
+	'Class:FunctionalCI/Attribute:document_list' => '文档',
+	'Class:FunctionalCI/Attribute:document_list+' => '该 CI 的文档',
+	'Class:FunctionalCI/Attribute:solution_list' => '应用方案',
+	'Class:FunctionalCI/Attribute:solution_list+' => '使用该 CI 的应用方案',
+	'Class:FunctionalCI/Attribute:contract_list' => '合同',
+	'Class:FunctionalCI/Attribute:contract_list+' => '支持该 CI 合同',
+	'Class:FunctionalCI/Attribute:ticket_list' => '单据',
+	'Class:FunctionalCI/Attribute:ticket_list+' => '与该 CI 相关的单据',
+	'Class:FunctionalCI/Attribute:finalclass' => '类别',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+));
+
+//
+// Class: SoftwareInstance
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:SoftwareInstance' => '软件实例',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Name' => '%1$s - %2$s',
+	'Class:SoftwareInstance/Attribute:device_id' => '设备',
+	'Class:SoftwareInstance/Attribute:device_id+' => '',
+	'Class:SoftwareInstance/Attribute:device_name' => '设备',
+	'Class:SoftwareInstance/Attribute:device_name+' => '',
+	'Class:SoftwareInstance/Attribute:licence_id' => 'Licence',
+	'Class:SoftwareInstance/Attribute:licence_id+' => '',
+	'Class:SoftwareInstance/Attribute:licence_name' => 'Licence',
+	'Class:SoftwareInstance/Attribute:licence_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => '软件',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:version' => '版本',
+	'Class:SoftwareInstance/Attribute:version+' => '',
+	'Class:SoftwareInstance/Attribute:description' => '描述',
+	'Class:SoftwareInstance/Attribute:description+' => '',
+));
+
+//
+// Class: ApplicationInstance
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ApplicationInstance' => '应用实例',
+	'Class:ApplicationInstance+' => '',
+	'Class:ApplicationInstance/Name' => '%1$s - %2$s',
+	'Class:ApplicationInstance/Attribute:software_id' => '软件',
+	'Class:ApplicationInstance/Attribute:software_id+' => '',
+	'Class:ApplicationInstance/Attribute:software_name' => '名称',
+	'Class:ApplicationInstance/Attribute:software_name+' => '',
+));
+
+
+//
+// Class: DBServerInstance
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DBServerInstance' => 'DB Server 实例',
+	'Class:DBServerInstance+' => '',
+	'Class:DBServerInstance/Name' => '%1$s - %2$s',
+	'Class:DBServerInstance/Attribute:software_id' => '软件',
+	'Class:DBServerInstance/Attribute:software_id+' => '',
+	'Class:DBServerInstance/Attribute:software_name' => '名称',
+	'Class:DBServerInstance/Attribute:software_name+' => '',
+	'Class:DBServerInstance/Attribute:dbinstance_list' => '数据库',
+	'Class:DBServerInstance/Attribute:dbinstance_list+' => '数据库源',
+));
+
+
+//
+// Class: DatabaseInstance
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:DatabaseInstance' => 'Database 实例',
+	'Class:DatabaseInstance+' => '',
+	'Class:DatabaseInstance/Name' => '%1$s - %2$s',
+	'Class:DatabaseInstance/Attribute:db_server_instance_id' => '数据库服务器',
+	'Class:DatabaseInstance/Attribute:db_server_instance_id+' => '',
+	'Class:DatabaseInstance/Attribute:db_server_instance_version' => '数据库版本',
+	'Class:DatabaseInstance/Attribute:db_server_instance_version+' => '',
+	'Class:DatabaseInstance/Attribute:description' => '描述',
+	'Class:DatabaseInstance/Attribute:description+' => '',
+));
+
+//
+// Class: ApplicationSolution
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ApplicationSolution' => '应用方案',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:description' => '描述',
+	'Class:ApplicationSolution/Attribute:description+' => '',
+	'Class:ApplicationSolution/Attribute:ci_list' => 'CI',
+	'Class:ApplicationSolution/Attribute:ci_list+' => '构成该方案的 CI',
+	'Class:ApplicationSolution/Attribute:process_list' => '业务流程',
+	'Class:ApplicationSolution/Attribute:process_list+' => '依赖于该方案的业务流程',
+));
+
+//
+// Class: BusinessProcess
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:BusinessProcess' => '业务流程',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:description' => '描述',
+	'Class:BusinessProcess/Attribute:description+' => '',
+	'Class:BusinessProcess/Attribute:used_solution_list' => '应用方案',
+	'Class:BusinessProcess/Attribute:used_solution_list+' => '业务流程所依赖的应用方案',
+));
+
+//
+// Class: ConnectableCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ConnectableCI' => '可连接的 CI',
+	'Class:ConnectableCI+' => '物理 CI',
+	'Class:ConnectableCI/Attribute:brand' => '品牌',
+	'Class:ConnectableCI/Attribute:brand+' => '',
+	'Class:ConnectableCI/Attribute:model' => '型号',
+	'Class:ConnectableCI/Attribute:model+' => '',
+	'Class:ConnectableCI/Attribute:serial_number' => '序列号',
+	'Class:ConnectableCI/Attribute:serial_number+' => '',
+	'Class:ConnectableCI/Attribute:asset_ref' => '资产参考资料',
+	'Class:ConnectableCI/Attribute:asset_ref+' => '',
+));
+
+//
+// Class: NetworkInterface
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:NetworkInterface' => '网络接口',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Name' => '%1$s - %2$s',
+	'Class:NetworkInterface/Attribute:device_id' => '设备',
+	'Class:NetworkInterface/Attribute:device_id+' => '',
+	'Class:NetworkInterface/Attribute:device_name' => '设备',
+	'Class:NetworkInterface/Attribute:device_name+' => '',
+	'Class:NetworkInterface/Attribute:logical_type' => '逻辑类别',
+	'Class:NetworkInterface/Attribute:logical_type+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:backup' => '备份',
+	'Class:NetworkInterface/Attribute:logical_type/Value:backup+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:logical' => '逻辑的',
+	'Class:NetworkInterface/Attribute:logical_type/Value:logical+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:port' => '端口',
+	'Class:NetworkInterface/Attribute:logical_type/Value:port+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:primary' => 'Primary',
+	'Class:NetworkInterface/Attribute:logical_type/Value:primary+' => '',
+	'Class:NetworkInterface/Attribute:logical_type/Value:secondary' => 'Secondary',
+	'Class:NetworkInterface/Attribute:logical_type/Value:secondary+' => '',
+	'Class:NetworkInterface/Attribute:physical_type' => '物理类别',
+	'Class:NetworkInterface/Attribute:physical_type+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:atm' => 'ATM',
+	'Class:NetworkInterface/Attribute:physical_type/Value:atm+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet' => 'Ethernet',
+	'Class:NetworkInterface/Attribute:physical_type/Value:ethernet+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay' => 'Frame Relay',
+	'Class:NetworkInterface/Attribute:physical_type/Value:framerelay+' => '',
+	'Class:NetworkInterface/Attribute:physical_type/Value:vlan' => 'VLAN',
+	'Class:NetworkInterface/Attribute:physical_type/Value:vlan+' => '',
+	'Class:NetworkInterface/Attribute:ip_address' => 'IP 地址',
+	'Class:NetworkInterface/Attribute:ip_address+' => '',
+	'Class:NetworkInterface/Attribute:ip_mask' => 'IP 掩码',
+	'Class:NetworkInterface/Attribute:ip_mask+' => '',
+	'Class:NetworkInterface/Attribute:mac_address' => 'MAC 地址',
+	'Class:NetworkInterface/Attribute:mac_address+' => '',
+	'Class:NetworkInterface/Attribute:speed' => '速率',
+	'Class:NetworkInterface/Attribute:speed+' => '',
+	'Class:NetworkInterface/Attribute:duplex' => 'Duplex',
+	'Class:NetworkInterface/Attribute:duplex+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:auto' => 'Auto',
+	'Class:NetworkInterface/Attribute:duplex/Value:auto+' => 'Auto',
+	'Class:NetworkInterface/Attribute:duplex/Value:full' => 'Full',
+	'Class:NetworkInterface/Attribute:duplex/Value:full+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:half' => 'Half',
+	'Class:NetworkInterface/Attribute:duplex/Value:half+' => '',
+	'Class:NetworkInterface/Attribute:duplex/Value:unknown' => '未知',
+	'Class:NetworkInterface/Attribute:duplex/Value:unknown+' => '',
+	'Class:NetworkInterface/Attribute:connected_if' => '连接到',
+	'Class:NetworkInterface/Attribute:connected_if+' => '连接的接口',
+	'Class:NetworkInterface/Attribute:connected_name' => '连接到',
+	'Class:NetworkInterface/Attribute:connected_name+' => '',
+	'Class:NetworkInterface/Attribute:connected_if_device_id' => '连接的设备',
+	'Class:NetworkInterface/Attribute:connected_if_device_id+' => '',
+	'Class:NetworkInterface/Attribute:connected_if_device_id_name' => '设备',
+	'Class:NetworkInterface/Attribute:connected_if_device_id_name+' => '',
+	'Class:NetworkInterface/Attribute:link_type' => '连接类别',
+	'Class:NetworkInterface/Attribute:link_type+' => '',
+	'Class:NetworkInterface/Attribute:link_type/Value:downlink' => 'Down link',
+	'Class:NetworkInterface/Attribute:link_type/Value:downlink+' => '',
+	'Class:NetworkInterface/Attribute:link_type/Value:uplink' => 'Up link',
+	'Class:NetworkInterface/Attribute:link_type/Value:uplink+' => '',
+));
+
+
+
+//
+// Class: Device
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Device' => '设备',
+	'Class:Device+' => '',
+	'Class:Device/Attribute:nwinterface_list' => '网络接口',
+	'Class:Device/Attribute:nwinterface_list+' => '',
+));
+
+//
+// Class: PC
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:cpu' => 'CPU',
+	'Class:PC/Attribute:cpu+' => '',
+	'Class:PC/Attribute:ram' => '内存',
+	'Class:PC/Attribute:ram+' => '',
+	'Class:PC/Attribute:hdd' => '硬盘',
+	'Class:PC/Attribute:hdd+' => '',
+	'Class:PC/Attribute:os_family' => 'OS 族',
+	'Class:PC/Attribute:os_family+' => '',
+	'Class:PC/Attribute:os_version' => 'OS 版本',
+	'Class:PC/Attribute:os_version+' => '',
+	'Class:PC/Attribute:application_list' => '应用程序',
+	'Class:PC/Attribute:application_list+' => '安装在该 PC 上的应用程序',
+	'Class:PC/Attribute:patch_list' => '补丁',
+	'Class:PC/Attribute:patch_list+' => '安装在该 PC 上的补丁',
+));
+
+//
+// Class: MobileCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:MobileCI' => '移动 CI',
+	'Class:MobileCI+' => '',
+));
+
+//
+// Class: MobilePhone
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:MobilePhone' => '移动电话',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:number' => '电话号码',
+	'Class:MobilePhone/Attribute:number+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => '硬件 PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+));
+
+//
+// Class: InfrastructureCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:InfrastructureCI' => '基础架构 CI',
+	'Class:InfrastructureCI+' => '',
+	'Class:InfrastructureCI/Attribute:description' => '描述',
+	'Class:InfrastructureCI/Attribute:description+' => '',
+	'Class:InfrastructureCI/Attribute:location_id' => '位置',
+	'Class:InfrastructureCI/Attribute:location_id+' => '',
+	'Class:InfrastructureCI/Attribute:location_name' => '位置',
+	'Class:InfrastructureCI/Attribute:location_name+' => '',
+	'Class:InfrastructureCI/Attribute:location_details' => '位置明细',
+	'Class:InfrastructureCI/Attribute:location_details+' => '',
+	'Class:InfrastructureCI/Attribute:management_ip' => '管理 IP',
+	'Class:InfrastructureCI/Attribute:management_ip+' => '',
+	'Class:InfrastructureCI/Attribute:default_gateway' => '缺省网关',
+	'Class:InfrastructureCI/Attribute:default_gateway+' => '',
+));
+
+//
+// Class: NetworkDevice
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:NetworkDevice' => '网络设备',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:type' => '类别',
+	'Class:NetworkDevice/Attribute:type+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator' => 'WAN 加速器',
+	'Class:NetworkDevice/Attribute:type/Value:wanaccelerator+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:firewall' => '防火墙',
+	'Class:NetworkDevice/Attribute:type/Value:firewall+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:hub' => '集线器',
+	'Class:NetworkDevice/Attribute:type/Value:hub+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:loadbalancer' => '负载均衡',
+	'Class:NetworkDevice/Attribute:type/Value:loadbalancer+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:router' => '路由器',
+	'Class:NetworkDevice/Attribute:type/Value:router+' => '',
+	'Class:NetworkDevice/Attribute:type/Value:switch' => '交换机',
+	'Class:NetworkDevice/Attribute:type/Value:switch+' => '',
+	'Class:NetworkDevice/Attribute:ios_version' => 'IOS 版本',
+	'Class:NetworkDevice/Attribute:ios_version+' => '',
+	'Class:NetworkDevice/Attribute:ram' => '内存',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+	'Class:NetworkDevice/Attribute:snmp_read' => 'SNMP 读',
+	'Class:NetworkDevice/Attribute:snmp_read+' => '',
+	'Class:NetworkDevice/Attribute:snmp_write' => 'SNMP 写',
+	'Class:NetworkDevice/Attribute:snmp_write+' => '',
+));
+
+//
+// Class: Server
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Server' => '服务器',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:cpu' => 'CPU',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => '内存',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:hdd' => '硬盘',
+	'Class:Server/Attribute:hdd+' => '',
+	'Class:Server/Attribute:os_family' => 'OS族',
+	'Class:Server/Attribute:os_family+' => '',
+	'Class:Server/Attribute:os_version' => 'OS版本 ',
+	'Class:Server/Attribute:os_version+' => '',
+	'Class:Server/Attribute:application_list' => '应用程序',
+	'Class:Server/Attribute:application_list+' => '服务器上安装的应用程序',
+	'Class:Server/Attribute:patch_list' => '补丁',
+	'Class:Server/Attribute:patch_list+' => '服务器上安装的补丁',
+));
+
+//
+// Class: Printer
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Printer' => '打印机',
+	'Class:Printer+' => '',
+	'Class:Printer/Attribute:type' => '类别',
+	'Class:Printer/Attribute:type+' => '',
+	'Class:Printer/Attribute:type/Value:mopier' => 'Mopier',
+	'Class:Printer/Attribute:type/Value:mopier+' => '',
+	'Class:Printer/Attribute:type/Value:printer' => '打印机',
+	'Class:Printer/Attribute:type/Value:printer+' => '',
+	'Class:Printer/Attribute:technology' => 'Technology',
+	'Class:Printer/Attribute:technology+' => '',
+	'Class:Printer/Attribute:technology/Value:inkjet' => '喷墨',
+	'Class:Printer/Attribute:technology/Value:inkjet+' => '',
+	'Class:Printer/Attribute:technology/Value:laser' => '激光',
+	'Class:Printer/Attribute:technology/Value:laser+' => '',
+	'Class:Printer/Attribute:technology/Value:tracer' => '绘图',
+	'Class:Printer/Attribute:technology/Value:tracer+' => '',
+));
+
+//
+// Class: lnkCIToDoc
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkCIToDoc' => 'Doc/CI',
+	'Class:lnkCIToDoc+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_id' => 'CI',
+	'Class:lnkCIToDoc/Attribute:ci_id+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_name' => 'CI',
+	'Class:lnkCIToDoc/Attribute:ci_name+' => '',
+	'Class:lnkCIToDoc/Attribute:ci_status' => 'CI 状态',
+	'Class:lnkCIToDoc/Attribute:ci_status+' => '',
+	'Class:lnkCIToDoc/Attribute:document_id' => '文档',
+	'Class:lnkCIToDoc/Attribute:document_id+' => '',
+	'Class:lnkCIToDoc/Attribute:document_name' => '文档',
+	'Class:lnkCIToDoc/Attribute:document_name+' => '',
+	'Class:lnkCIToDoc/Attribute:document_type' => '文档类别',
+	'Class:lnkCIToDoc/Attribute:document_type+' => '',
+	'Class:lnkCIToDoc/Attribute:document_status' => '文档状态',
+	'Class:lnkCIToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkCIToContact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkCIToContact' => 'CI/联系人',
+	'Class:lnkCIToContact+' => '',
+	'Class:lnkCIToContact/Attribute:ci_id' => 'CI',
+	'Class:lnkCIToContact/Attribute:ci_id+' => '',
+	'Class:lnkCIToContact/Attribute:ci_name' => 'CI',
+	'Class:lnkCIToContact/Attribute:ci_name+' => '',
+	'Class:lnkCIToContact/Attribute:ci_status' => 'CI 状态',
+	'Class:lnkCIToContact/Attribute:ci_status+' => '',
+	'Class:lnkCIToContact/Attribute:contact_id' => '联系人',
+	'Class:lnkCIToContact/Attribute:contact_id+' => '',
+	'Class:lnkCIToContact/Attribute:contact_name' => '联系人',
+	'Class:lnkCIToContact/Attribute:contact_name+' => '',
+	'Class:lnkCIToContact/Attribute:contact_email' => '联系人 Email',
+	'Class:lnkCIToContact/Attribute:contact_email+' => '',
+	'Class:lnkCIToContact/Attribute:role' => '角色',
+	'Class:lnkCIToContact/Attribute:role+' => '和该 CI 相关的联系人的角色',
+));
+
+//
+// Class: lnkSolutionToCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkSolutionToCI' => 'CI/方案',
+	'Class:lnkSolutionToCI+' => '',
+	'Class:lnkSolutionToCI/Attribute:solution_id' => '应用方案',
+	'Class:lnkSolutionToCI/Attribute:solution_id+' => '',
+	'Class:lnkSolutionToCI/Attribute:solution_name' => '应用方案',
+	'Class:lnkSolutionToCI/Attribute:solution_name+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkSolutionToCI/Attribute:ci_id+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkSolutionToCI/Attribute:ci_name+' => '',
+	'Class:lnkSolutionToCI/Attribute:ci_status' => 'CI 状态',
+	'Class:lnkSolutionToCI/Attribute:ci_status+' => '',
+	'Class:lnkSolutionToCI/Attribute:utility' => '用途',
+	'Class:lnkSolutionToCI/Attribute:utility+' => '在方案中该 CI 的用途',
+));
+
+//
+// Class: lnkProcessToSolution
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkProcessToSolution' => '业务流程/方案',
+	'Class:lnkProcessToSolution+' => '',
+	'Class:lnkProcessToSolution/Attribute:solution_id' => '应用方案',
+	'Class:lnkProcessToSolution/Attribute:solution_id+' => '',
+	'Class:lnkProcessToSolution/Attribute:solution_name' => '应用方案',
+	'Class:lnkProcessToSolution/Attribute:solution_name+' => '',
+	'Class:lnkProcessToSolution/Attribute:process_id' => '流程',
+	'Class:lnkProcessToSolution/Attribute:process_id+' => '',
+	'Class:lnkProcessToSolution/Attribute:process_name' => '流程',
+	'Class:lnkProcessToSolution/Attribute:process_name+' => '',
+	'Class:lnkProcessToSolution/Attribute:reason' => '原因',
+	'Class:lnkProcessToSolution/Attribute:reason+' => '联系流程和方案的更多信息',
+));
+
+
+
+//
+// Class extensions
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+'Class:Subnet/Tab:IPUsage' => 'IP 使用情况',
+'Class:Subnet/Tab:IPUsage-explain' => '接口拥有一个下述范围内的IP: <em>%1$s</em> 到 <em>%2$s</em>',
+'Class:Subnet/Tab:FreeIPs' => '未用的 IP',
+'Class:Subnet/Tab:FreeIPs-count' => '未用的 IP: %1$s',
+'Class:Subnet/Tab:FreeIPs-explain' => '这里有10个抽取的未用的 IP 地址',
+));
+
+//
+// Application Menu
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+'Menu:DataAdministration' => '数据管理',
+'Menu:DataAdministration+' => '数据管理',
+'Menu:Catalogs' => '目录',
+'Menu:Catalogs+' => '数据类别',
+'Menu:Audit' => '审计',
+'Menu:Audit+' => '审计',
+'Menu:CSVImport' => 'CSV 导入',
+'Menu:CSVImport+' => '大批量创建或修改',
+'Menu:Organization' => '组织',
+'Menu:Organization+' => '所有组织',
+'Menu:Application' => '应用程序',
+'Menu:Application+' => '所有应用程序',
+'Menu:DBServer' => '数据库服务器',
+'Menu:DBServer+' => '数据库服务器',
+'Menu:Audit' => '审计',
+'Menu:ConfigManagement' => '配置管理',
+'Menu:ConfigManagement+' => '配置管理',
+'Menu:ConfigManagementOverview' => '总览',
+'Menu:ConfigManagementOverview+' => '总览',
+'Menu:Contact' => '联系人',
+'Menu:Contact+' => '联系人',
+'Menu:Contact:Count' => '%1$d',
+'Menu:Person' => '人员',
+'Menu:Person+' => '所有人员',
+'Menu:Team' => '团队',
+'Menu:Team+' => '所有团队',
+'Menu:Document' => '文档',
+'Menu:Document+' => '所有文档',
+'Menu:Location' => '位置',
+'Menu:Location+' => '所有位置',
+'Menu:ConfigManagementCI' => '配置项',
+'Menu:ConfigManagementCI+' => '配置项',
+'Menu:BusinessProcess' => '业务过程',
+'Menu:BusinessProcess+' => '所有业务过程',
+'Menu:ApplicationSolution' => '应用方案',
+'Menu:ApplicationSolution+' => '所有应用方案',
+'Menu:ConfigManagementSoftware' => '应用管理',
+'Menu:Licence' => 'Licences',
+'Menu:Licence+' => '所有Licences',
+'Menu:Patch' => '补丁',
+'Menu:Patch+' => '所有补丁',
+'Menu:ApplicationInstance' => '已安装的软件',
+'Menu:ApplicationInstance+' => '应用程序和数据库服务器',
+'Menu:ConfigManagementHardware' => '基础架构管理',
+'Menu:Subnet' => '子网',
+'Menu:Subnet+' => '所有子网',
+'Menu:NetworkDevice' => '网络设备',
+'Menu:NetworkDevice+' => '所有网络设备',
+'Menu:Server' => '服务器',
+'Menu:Server+' => '所有服务器',
+'Menu:Printer' => '打印机',
+'Menu:Printer+' => '所有打印机',
+'Menu:MobilePhone' => '手机',
+'Menu:MobilePhone+' => '所有手机',
+'Menu:PC' => '个人电脑',
+'Menu:PC+' => '所有个人电脑',
+'Menu:NewContact' => '新联系人',
+'Menu:NewContact+' => '新联系人',
+'Menu:SearchContacts' => '查找联系人',
+'Menu:SearchContacts+' => '查找联系人',
+'Menu:NewCI' => '新CI',
+'Menu:NewCI+' => '新CI',
+'Menu:SearchCIs' => '查找CI',
+'Menu:SearchCIs+' => '查找CI',
+'Menu:ConfigManagement:Devices' => '设备',
+'Menu:ConfigManagement:AllDevices' => '基础架构',
+'Menu:ConfigManagement:SWAndApps' => '软件和应用程序',
+'Menu:ConfigManagement:Misc' => '杂项',
+'Menu:Group' => 'CI族',
+'Menu:Group+' => 'CI族',
+'Menu:ConfigManagement:Shortcuts' => '快捷方式',
+'Menu:ConfigManagement:AllContacts' => '所有联系人: %1$d',
+
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent~~',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Parent organization~~',
+	'Class:Location/Attribute:physicaldevice_list' => 'Devices~~',
+	'Class:Location/Attribute:physicaldevice_list+' => 'All the devices in this location~~',
+	'Class:Location/Attribute:person_list' => 'Contacts~~',
+	'Class:Location/Attribute:person_list+' => 'All the contacts located on this location~~',
+	'Class:Contact/Attribute:notify' => 'Notification~~',
+	'Class:Contact/Attribute:notify/Value:no' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:no+' => 'no~~',
+	'Class:Contact/Attribute:notify/Value:yes' => 'yes~~',
+	'Class:Contact/Attribute:notify/Value:yes+' => 'yes~~',
+	'Class:Contact/Attribute:function' => 'Function~~',
+	'Class:Contact/Attribute:cis_list' => 'CIs~~',
+	'Class:Contact/Attribute:cis_list+' => 'All the configuration items linked to this contact~~',
+	'Class:Person/Attribute:name' => 'Last Name~~',
+	'Class:Person/Attribute:employee_number' => 'Employee number~~',
+	'Class:Person/Attribute:mobile_phone' => 'Mobile phone~~',
+	'Class:Person/Attribute:location_id' => 'Location~~',
+	'Class:Person/Attribute:location_name' => 'Location name~~',
+	'Class:Person/Attribute:manager_id' => 'Manager~~',
+	'Class:Person/Attribute:manager_name' => 'Manager name~~',
+	'Class:Person/Attribute:team_list' => 'Teams~~',
+	'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to~~',
+	'Class:Person/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller~~',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name~~',
+	'Class:Team/Attribute:persons_list' => 'Members~~',
+	'Class:Team/Attribute:persons_list+' => 'All the people belonging to this team~~',
+	'Class:Team/Attribute:tickets_list' => 'Tickets~~',
+	'Class:Team/Attribute:tickets_list+' => 'All the tickets assigned to this team~~',
+	'Class:Document/Attribute:documenttype_id' => 'Document type~~',
+	'Class:Document/Attribute:documenttype_name' => 'Document type name~~',
+	'Class:Document/Attribute:version' => 'Version~~',
+	'Class:Document/Attribute:cis_list' => 'CIs~~',
+	'Class:Document/Attribute:cis_list+' => 'All the configuration items linked to this document~~',
+	'Class:Document/Attribute:contracts_list' => 'Contracts~~',
+	'Class:Document/Attribute:contracts_list+' => 'All the contracts linked to this document~~',
+	'Class:Document/Attribute:services_list' => 'Services~~',
+	'Class:Document/Attribute:services_list+' => 'All the services linked to this document~~',
+	'Class:Document/Attribute:finalclass' => 'Document Type~~',
+	'Class:DocumentFile' => 'Document File~~',
+	'Class:DocumentFile/Attribute:file' => 'File~~',
+	'Class:DocumentNote' => 'Document Note~~',
+	'Class:DocumentNote/Attribute:text' => 'Text~~',
+	'Class:DocumentWeb' => 'Document Web~~',
+	'Class:DocumentWeb/Attribute:url' => 'URL~~',
+	'Class:FunctionalCI/Attribute:description' => 'Description~~',
+	'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/Value:high' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => 'high~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => 'low~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'medium~~',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => 'medium~~',
+	'Class:FunctionalCI/Attribute:move2production' => 'Move to production date~~',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Contacts~~',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'All the contacts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Documents~~',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'All the documents linked to this configuration item~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Application solutions~~',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'All the application solutions depending on this configuration item~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'All the provider contracts for this configuration item~~',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services~~',
+	'Class:FunctionalCI/Attribute:services_list+' => 'All the services impacted by this configuration item~~',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares~~',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'All the softwares installed on this configuration item~~',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Tickets~~',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'All the tickets for this configuration item~~',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Active Tickets~~',
+	'Class:PhysicalDevice' => 'Physical Device~~',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number~~',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Location name~~',
+	'Class:PhysicalDevice/Attribute:status' => 'Status~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Brand~~',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Brand name~~',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model~~',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Model name~~',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Asset number~~',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Purchase date~~',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'End of warranty~~',
+	'Class:Rack' => 'Rack~~',
+	'Class:Rack/Attribute:nb_u' => 'Rack units~~',
+	'Class:Rack/Attribute:device_list' => 'Devices~~',
+	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack~~',
+	'Class:Rack/Attribute:enclosure_list' => 'Enclosures~~',
+	'Class:Rack/Attribute:enclosure_list+' => 'All the enclosures in this rack~~',
+	'Class:TelephonyCI' => 'Telephony CI~~',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number~~',
+	'Class:Phone' => 'Phone~~',
+	'Class:IPPhone' => 'IP Phone~~',
+	'Class:Tablet' => 'Tablet~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices~~',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Network interfaces~~',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'All the physical network interfaces~~',
+	'Class:DatacenterDevice' => 'Datacenter Device~~',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack~~',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name~~',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure~~',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name~~',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack units~~',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip~~',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'PowerA source~~',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'PowerA source name~~',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'PowerB source~~',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'PowerB source name~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC ports~~',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'All the fiber channel interfaces for this device~~',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs~~',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'All the SAN switches connected to this device~~',
+	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundancy~~',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => 'The device is up if at least one power connection (A or B) is up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'The device is up if all its power connections are up~~',
+	'Class:DatacenterDevice/Attribute:redundancy/percent' => 'The device is up if at least %1$s %% of its power connections are up~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type~~',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Network type name~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Devices~~',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'All the devices connected to this network device~~',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version~~',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version name~~',
+	'Class:Server/Attribute:osfamily_id' => 'OS family~~',
+	'Class:Server/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:Server/Attribute:osversion_id' => 'OS version~~',
+	'Class:Server/Attribute:osversion_name' => 'OS version name~~',
+	'Class:Server/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:Server/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes~~',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'All the logical volumes connected to this server~~',
+	'Class:StorageSystem' => 'Storage System~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes~~',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system~~',
+	'Class:SANSwitch' => 'SAN Switch~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices~~',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch~~',
+	'Class:TapeLibrary' => 'Tape Library~~',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes~~',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library~~',
+	'Class:NAS' => 'NAS~~',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems~~',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS~~',
+	'Class:PC/Attribute:osfamily_id' => 'OS family~~',
+	'Class:PC/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:PC/Attribute:osversion_id' => 'OS version~~',
+	'Class:PC/Attribute:osversion_name' => 'OS version name~~',
+	'Class:PC/Attribute:type' => 'Type~~',
+	'Class:PC/Attribute:type/Value:desktop' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:desktop+' => 'desktop~~',
+	'Class:PC/Attribute:type/Value:laptop' => 'laptop~~',
+	'Class:PC/Attribute:type/Value:laptop+' => 'laptop~~',
+	'Class:PowerConnection' => 'Power Connection~~',
+	'Class:PowerSource' => 'Power Source~~',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUs~~',
+	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source~~',
+	'Class:PDU' => 'PDU~~',
+	'Class:PDU/Attribute:rack_id' => 'Rack~~',
+	'Class:PDU/Attribute:rack_name' => 'Rack name~~',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start~~',
+	'Class:PDU/Attribute:powerstart_name' => 'Power start name~~',
+	'Class:Peripheral' => 'Peripheral~~',
+	'Class:Enclosure' => 'Enclosure~~',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack~~',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack name~~',
+	'Class:Enclosure/Attribute:nb_u' => 'Rack units~~',
+	'Class:Enclosure/Attribute:device_list' => 'Devices~~',
+	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes~~',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
+	'Class:ApplicationSolution/Attribute:status' => 'Status~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => 'active~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:ApplicationSolution/Attribute:redundancy' => 'Impact analysis: configuration of the redundancy~~',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'The solution is up if all CIs are up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'The solution is up if at least %1$s CI(s) is(are) up~~',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'The solution is up if at least %1$s %% of the CIs are up~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions~~',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
+	'Class:BusinessProcess/Attribute:status' => 'Status~~',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => 'active~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:system_id' => 'System~~',
+	'Class:SoftwareInstance/Attribute:system_name' => 'System name~~',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licence~~',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licence name~~',
+	'Class:SoftwareInstance/Attribute:path' => 'Path~~',
+	'Class:SoftwareInstance/Attribute:status' => 'Status~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => 'active~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inactive~~',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => 'inactive~~',
+	'Class:Middleware' => 'Middleware~~',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances~~',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware~~',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas~~',
+	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server~~',
+	'Class:WebServer' => 'Web server~~',
+	'Class:WebServer/Attribute:webapp_list' => 'Web applications~~',
+	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
+	'Class:PCSoftware' => 'PC Software~~',
+	'Class:OtherSoftware' => 'Other Software~~',
+	'Class:MiddlewareInstance' => 'Middleware Instance~~',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware~~',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name~~',
+	'Class:DatabaseSchema' => 'Database Schema~~',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server~~',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server name~~',
+	'Class:WebApplication' => 'Web Application~~',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server~~',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web server name~~',
+	'Class:WebApplication/Attribute:url' => 'URL~~',
+	'Class:VirtualDevice' => 'Virtual Device~~',
+	'Class:VirtualDevice/Attribute:status' => 'Status~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => 'production~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'stock~~',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'stock~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes~~',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'All the logical volumes used by this device~~',
+	'Class:VirtualHost' => 'Virtual Host~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines~~',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host~~',
+	'Class:Hypervisor' => 'Hypervisor~~',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farm~~',
+	'Class:Hypervisor/Attribute:farm_name' => 'Farm name~~',
+	'Class:Hypervisor/Attribute:server_id' => 'Server~~',
+	'Class:Hypervisor/Attribute:server_name' => 'Server name~~',
+	'Class:Farm' => 'Farm~~',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors~~',
+	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm~~',
+	'Class:Farm/Attribute:redundancy' => 'High availability~~',
+	'Class:Farm/Attribute:redundancy/disabled' => 'The farm is up if all the hypervisors are up~~',
+	'Class:Farm/Attribute:redundancy/count' => 'The farm is up if at least %1$s hypervisor(s) is(are) up~~',
+	'Class:Farm/Attribute:redundancy/percent' => 'The farm is up if at least %1$s %% of the hypervisors are up~~',
+	'Class:VirtualMachine' => 'Virtual Machine~~',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host~~',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host name~~',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS family~~',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version~~',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version name~~',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licence~~',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licence name~~',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU~~',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM~~',
+	'Class:VirtualMachine/Attribute:managementip' => 'IP~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Network Interfaces~~',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'All the logical network interfaces~~',
+	'Class:LogicalVolume' => 'Logical Volume~~',
+	'Class:LogicalVolume/Attribute:name' => 'Name~~',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID~~',
+	'Class:LogicalVolume/Attribute:description' => 'Description~~',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level~~',
+	'Class:LogicalVolume/Attribute:size' => 'Size~~',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system~~',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system name~~',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servers~~',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtual devices~~',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume~~',
+	'Class:lnkServerToVolume' => 'Link Server / Volume~~',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume~~',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name~~',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server~~',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Server name~~',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Size used~~',
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume name~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtual device name~~',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Size used~~',
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch name~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Device~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Device name~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc~~',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Device fc~~',
+	'Class:Tape' => 'Tape~~',
+	'Class:Tape/Attribute:name' => 'Name~~',
+	'Class:Tape/Attribute:description' => 'Description~~',
+	'Class:Tape/Attribute:size' => 'Size~~',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library~~',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library name~~',
+	'Class:NASFileSystem' => 'NAS File System~~',
+	'Class:NASFileSystem/Attribute:name' => 'Name~~',
+	'Class:NASFileSystem/Attribute:description' => 'Description~~',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level~~',
+	'Class:NASFileSystem/Attribute:size' => 'Size~~',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS~~',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS name~~',
+	'Class:Software/Attribute:vendor' => 'vendor~~',
+	'Class:Software/Attribute:version' => 'Version~~',
+	'Class:Software/Attribute:documents_list' => 'Documents~~',
+	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
+	'Class:Software/Attribute:type' => 'Type~~',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server~~',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software~~',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server~~',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server~~',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances~~',
+	'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:Patch/Attribute:documents_list' => 'Documents~~',
+	'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch~~',
+	'Class:Patch/Attribute:finalclass' => 'Type~~',
+	'Class:OSPatch' => 'OS Patch~~',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices~~',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed~~',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS version name~~',
+	'Class:SoftwarePatch' => 'Software Patch~~',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software~~',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Software name~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instances~~',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed~~',
+	'Class:Licence/Attribute:documents_list' => 'Documents~~',
+	'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence~~',
+	'Class:Licence/Attribute:organization_name' => 'Organization name~~',
+	'Class:Licence/Attribute:organization_name+' => 'Common name~~',
+	'Class:Licence/Attribute:description' => 'Description~~',
+	'Class:Licence/Attribute:start_date' => 'Start date~~',
+	'Class:Licence/Attribute:end_date' => 'End date~~',
+	'Class:Licence/Attribute:perpetual' => 'Perpetual~~',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'no~~',
+	'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:OSLicence' => 'OS Licence~~',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS version~~',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS version 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:SoftwareLicence' => 'Software Licence~~',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software~~',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Software name~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instances~~',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used~~',
+	'Class:lnkDocumentToLicence' => 'Link Document / Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence~~',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licence name~~',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name~~',
+	'Class:Typology' => 'Typology~~',
+	'Class:Typology/Attribute:name' => 'Name~~',
+	'Class:Typology/Attribute:finalclass' => 'Type~~',
+	'Class:OSVersion' => 'OS Version~~',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS family~~',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name~~',
+	'Class:OSFamily' => 'OS Family~~',
+	'Class:DocumentType' => 'Document Type~~',
+	'Class:ContactType' => 'Contact Type~~',
+	'Class:Brand' => 'Brand~~',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Physical devices~~',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand~~',
+	'Class:Model' => 'Model~~',
+	'Class:Model/Attribute:brand_id' => 'Brand~~',
+	'Class:Model/Attribute:brand_name' => 'Brand name~~',
+	'Class:Model/Attribute:type' => 'Device type~~',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:PowerSource+' => 'Power Source~~',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:DiskArray+' => 'Disk Array~~',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:Enclosure+' => 'Enclosure~~',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => 'Mobile Phone~~',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NAS+' => 'NAS~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => 'Network Device~~',
+	'Class:Model/Attribute:type/Value:PC' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PC+' => 'PC~~',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:PDU+' => 'PDU~~',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Peripheral+' => 'Peripheral~~',
+	'Class:Model/Attribute:type/Value:Printer' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Printer+' => 'Printer~~',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:Rack+' => 'Rack~~',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN switch~~',
+	'Class:Model/Attribute:type/Value:Server' => 'Server~~',
+	'Class:Model/Attribute:type/Value:Server+' => 'Server~~',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => 'Storage System~~',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:Tablet+' => 'Tablet~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => 'Tape Library~~',
+	'Class:Model/Attribute:type/Value:Phone' => 'Telephone~~',
+	'Class:Model/Attribute:type/Value:Phone+' => 'Telephone~~',
+	'Class:Model/Attribute:physicaldevices_list' => 'Physical devices~~',
+	'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model~~',
+	'Class:NetworkDeviceType' => 'Network Device Type~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices~~',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type~~',
+	'Class:IOSVersion' => 'IOS Version~~',
+	'Class:IOSVersion/Attribute:brand_id' => 'Brand~~',
+	'Class:IOSVersion/Attribute:brand_name' => 'Brand name~~',
+	'Class:lnkDocumentToPatch' => 'Link Document / Patch~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch~~',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name~~',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance~~',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name~~',
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkDocumentToSoftware' => 'Link Document / Software~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software~~',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name~~',
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name~~',
+	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
+	'Class:Subnet/Attribute:org_name' => 'Name~~',
+	'Class:Subnet/Attribute:org_name+' => 'Common name~~',
+	'Class:Subnet/Attribute:vlans_list' => 'VLANs~~',
+	'Class:VLAN' => 'VLAN~~',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:VLAN/Attribute:description' => 'Description~~',
+	'Class:VLAN/Attribute:org_id' => 'Organization~~',
+	'Class:VLAN/Attribute:org_name' => 'Organization name~~',
+	'Class:VLAN/Attribute:org_name+' => 'Common name~~',
+	'Class:VLAN/Attribute:subnets_list' => 'Subnets~~',
+	'Class:VLAN/Attribute:physicalinterfaces_list' => 'Physical network interfaces~~',
+	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP~~',
+	'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN~~',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:NetworkInterface/Attribute:name' => 'Name~~',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Type~~',
+	'Class:IPInterface' => 'IP Interface~~',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP address~~',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC address~~',
+	'Class:IPInterface/Attribute:comment' => 'Comment~~',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway~~',
+	'Class:IPInterface/Attribute:ipmask' => 'IP mask~~',
+	'Class:IPInterface/Attribute:speed' => 'Speed~~',
+	'Class:PhysicalInterface' => 'Physical Interface~~',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device~~',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name~~',
+	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs~~',
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => 'Device~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN~~',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag~~',
+	'Class:LogicalInterface' => 'Logical Interface~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine~~',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name~~',
+	'Class:FiberChannelInterface' => 'Fiber Channel Interface~~',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Speed~~',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topology~~',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Device~~',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name~~',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Connected device~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Network port~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Device port~~',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => '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:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci~~',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name~~',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Application solution~~',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name~~',
+	'Class:lnkPersonToTeam' => 'Link Person / Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team~~',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name~~',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person~~',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name~~',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Role~~',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name~~',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Group~~',
+	'Menu:ConfigManagement:virtualization' => 'Virtualization~~',
+	'Menu:ConfigManagement:EndUsers' => 'End user devices~~',
+	'Menu:Typology' => 'Typology configuration~~',
+	'Menu:Typology+' => 'Typology configuration~~',
+	'Menu:OSVersion' => 'OS versions~~',
+	'Menu:Software' => 'Software catalog~~',
+	'Menu:Software+' => 'Software catalog~~',
+	'UI_WelcomeMenu_AllConfigItems' => 'Summary~~',
+	'Menu:ConfigManagement:Typology' => 'Typology configuration~~',
+	'Server:baseinfo' => 'General information~~',
+	'Server:Date' => 'Dates~~',
+	'Server:moreinfo' => 'More information~~',
+	'Server:otherinfo' => 'Other information~~',
+	'Server:power' => 'Power supply~~',
+	'Person:info' => 'General information~~',
+	'Person:notifiy' => 'Notification~~',
+));
+?>
diff --git a/datamodels/2.x/itop-config/config.php b/datamodels/2.x/itop-config/config.php
index 0ea260951..b0c7b7800 100644
--- a/datamodels/2.x/itop-config/config.php
+++ b/datamodels/2.x/itop-config/config.php
@@ -1,332 +1,332 @@
-<?php
-// Copyright (C) 2014-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Monitor the backup
- *
- * @copyright   Copyright (C) 2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'application/application.inc.php');
-require_once(APPROOT.'application/itopwebpage.class.inc.php');
-require_once(APPROOT.'application/startup.inc.php');
-require_once(APPROOT.'application/loginwebpage.class.inc.php');
-
-
-function TestConfig($sContents, $oP)
-{
-	try
-	{
-		ini_set('display_errors', 1);
-		ob_start();
-        // in PHP < 7.0.0 syntax errors are in output
-        // in PHP >= 7.0.0 syntax errors are thrown as Error
-        $sSafeContent = preg_replace(array('#^\s*<\?php#', '#\?>\s*$#'), '', $sContents);
-        eval('if(0){'.trim($sSafeContent).'}');
-        $sNoise = trim(ob_get_contents());
-		ob_end_clean();
-    }
-    catch (Error $e)
-    {
-        // ParseError only thrown in PHP7
-		throw new Exception('Error in configuration: '.$e->getMessage().' at line '.$e->getLine());
-	}
-	if (strlen($sNoise) > 0)
-	{
-		if (preg_match("/(Error|Parse error|Notice|Warning): (.+) in \S+ : eval\(\)'d code on line (\d+)/i", strip_tags($sNoise), $aMatches))
-		{
-			$sMessage = $aMatches[2];
-			$sLine = $aMatches[3];
-			$iLine = (int) $sLine;
-
-			// Highlight the line
-			$aLines = explode("\n", $sContents);
-			$iStart = 0;
-			for ($i = 0 ; $i < $iLine - 1; $i++) $iStart += strlen($aLines[$i]);
-			$iEnd = $iStart + strlen($aLines[$iLine - 1]);
-			$iTotalLines = count($aLines);
-
-			$sMessage = Dict::Format('config-parse-error', $sMessage, $sLine);
-			throw new Exception($sMessage);
-		}
-		else
-		{
-			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
-			throw new Exception('Syntax error in configuration file: <tt>'.$sNoise.'</tt>');
-		}
-	}
-}
-
-
-/////////////////////////////////////////////////////////////////////
-// Main program
-//
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-ApplicationMenu::CheckMenuIdEnabled('ConfigEditor');
-
-//$sOperation = utils::ReadParam('operation', 'menu');
-//$oAppContext = new ApplicationContext();
-
-$oP = new iTopWebPage(Dict::S('config-edit-title'));
-$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ace.js');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/mode-php.js');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/theme-eclipse.js');
-$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ext-searchbox.js');
-
-try
-{
-	$sOperation = utils::ReadParam('operation', '');
-
-	$oP->add("<h1>".Dict::S('config-edit-title')."</h1>");
-
-	if (MetaModel::GetConfig()->Get('demo_mode'))
-	{
-		$oP->add("<div class=\"header_message message_info\">Sorry, iTop is in <b>demonstration mode</b>: the configuration file cannot be edited.</div>");
-	}
-	else if (MetaModel::GetModuleSetting('itop-config', 'config_editor', '') == 'disabled')
-	{
-		$oP->add("<div class=\"header_message message_info\">iTop interactive edition of the configuration as been disabled. See <tt>'config_editor' => 'disabled'</tt> in the configuration file.</div>");
-	}
-	else
-	{
-		$sConfigFile = APPROOT.'conf/'.utils::GetCurrentEnvironment().'/config-itop.php';
-
-        $iEditorTopMargin = 9;
-        $sConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
-        $sOrginalConfig = $sConfig;
-
-        if (!empty($sOperation))
-        {
-            $iEditorTopMargin = 14;
-            $sConfig = utils::ReadParam('new_config', '', false, 'raw_data');
-            $sOrginalConfig = utils::ReadParam('prev_config', '', false, 'raw_data');
-        }
-
-        if ($sOperation == 'revert')
-        {
-            $oP->add('<div id="save_result" class="header_message message_info">'.Dict::S('config-reverted').'</div>');
-        }
-        if ($sOperation == 'save')
-        {
-            $sTransactionId = utils::ReadParam('transaction_id', '');
-            if (!utils::IsTransactionValid($sTransactionId, true))
-            {
-                $oP->add("<div class=\"header_message message_info\">Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.</div>");
-            }
-            else
-            {
-                if ($sConfig == $sOrginalConfig)
-                {
-                    $oP->add('<div id="save_result" class="header_message">'.Dict::S('config-no-change').'</div>');
-                }
-                else
-                {
-                    try
-                    {
-                        TestConfig($sConfig, $oP); // throws exceptions
-
-                        @chmod($sConfigFile, 0770); // Allow overwriting the file
-                        $sTmpFile = tempnam(SetupUtils::GetTmpDir(), 'itop-cfg-');
-                        // Don't write the file as-is since it would allow to inject any kind of PHP code.
-                        // Instead write the interpreted version of the file
-                        // Note:
-                        // The actual raw PHP code will anyhow be interpreted exactly twice: once in TestConfig() above
-                        // and a second time during the load of the Config object below.
-                        // If you are really concerned about an iTop administrator crafting some malicious
-                        // PHP code inside the config file, then turn off the interactive configuration
-                        // editor by adding the configuration parameter:
-                        // 'itop-config' => array(
-                        //     'config_editor' => 'disabled',
-                        // )
-                        file_put_contents($sTmpFile, $sConfig);
-                        $oTempConfig = new Config($sTmpFile, true);
-                        $oTempConfig->WriteToFile($sConfigFile);
-                        @unlink($sTmpFile);
-                        @chmod($sConfigFile, 0444); // Read-only
-
-                        $oP->p('<div id="save_result" class="header_message message_ok">'.Dict::S('config-saved').'</div>');
-                        $sOrginalConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
-                    }
-                    catch (Exception $e)
-                    {
-                        $oP->p('<div id="save_result" class="header_message message_error">'.$e->getMessage().'</div>');
-                    }
-                }
-            }
-        }
-
-
-		$sConfigEscaped = htmlentities($sConfig, ENT_QUOTES, 'UTF-8');
-		$sOriginalConfigEscaped = htmlentities($sOrginalConfig, ENT_QUOTES, 'UTF-8');
-		$oP->p(Dict::S('config-edit-intro'));
-		$oP->add("<form method=\"POST\">");
-        $oP->add("<input id=\"operation\" type=\"hidden\" name=\"operation\" value=\"save\">");
-		$oP->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\">");
-		$oP->add("<input id=\"submit_button\" type=\"submit\" value=\"".Dict::S('config-apply')."\" title=\"".Dict::S('config-apply-title')."\"><button id=\"cancel_button\" disabled=\"disabled\" onclick=\"return ResetConfig();\">".Dict::S('config-cancel')."</button>");
-		$oP->add("<input type=\"hidden\" id=\"prev_config\" name=\"prev_config\" value=\"$sOriginalConfigEscaped\">");
-        $oP->add("<input type=\"hidden\"  name=\"new_config\" value=\"$sConfigEscaped\">");
-        $oP->add("<div id =\"new_config\" style=\"position: absolute; top: ".$iEditorTopMargin."em; bottom: 0; left: 5px; right: 5px;\"></div>");
-		$oP->add("</form>");
-	
-		$sConfirmCancel = addslashes(Dict::S('config-confirm-cancel'));
-		$oP->add_script(
-			<<<'EOF'
-var EditorUtils = (function() {
-	var STORAGE_RANGE_KEY = 'cfgEditorRange';
-	var STORAGE_LINE_KEY = 'cfgEditorFirstline';
-	var _editorSavedRange = null;
-	var _editorSavedFirstLine = null;
-	
-	var saveEditorDisplay = function(editor) {
-		_initObjectValues(editor);
-		_persistObjectValues();
-	};
-	
-	var _initObjectValues = function(editor) {
-		_editorSavedRange = editor.getSelectionRange();
-		_editorSavedFirstLine = editor.renderer.getFirstVisibleRow();
-	};
-	
-	var _persistObjectValues = function() {
-		sessionStorage.setItem(EditorUtils.STORAGE_RANGE_KEY, JSON.stringify(_editorSavedRange));
-		sessionStorage.setItem(EditorUtils.STORAGE_LINE_KEY, _editorSavedFirstLine);
-	};
-	
-	var restoreEditorDisplay = function(editor) {
-		_restoreObjectValues();
-		_setEditorDisplay(editor);
-	};
-	
-	var _restoreObjectValues = function() {
-		if ((sessionStorage.getItem(STORAGE_RANGE_KEY) == null) 
-			|| (sessionStorage.getItem(STORAGE_LINE_KEY) == null)) {
-			return;
-		}
-		
-		_editorSavedRange = JSON.parse(sessionStorage.getItem(EditorUtils.STORAGE_RANGE_KEY));
-		_editorSavedFirstLine = sessionStorage.getItem(EditorUtils.STORAGE_LINE_KEY);
-		sessionStorage.removeItem(STORAGE_RANGE_KEY);
-		sessionStorage.removeItem(STORAGE_LINE_KEY);
-	};
-	
-	var _setEditorDisplay = function(editor) {
-		if ((_editorSavedRange == null) || (_editorSavedFirstLine == null)) {
-			return;
-		}
-
-		editor.selection.setRange(_editorSavedRange);
-		editor.renderer.scrollToRow(_editorSavedFirstLine);
-	};
-	
-	var getEditorForm = function(editor) {
-        var $editorContainer = $(editor.container);
-        var $editorForm = $editorContainer.closest("form");
-        return $editorForm;
-	};
-	
-	var updateConfigEditorButtonState = function(editor) {
-	    var isSameContent = (editor.getValue() == $('#prev_config').val());
-	    var hasNoError = $.isEmptyObject(editor.getSession().getAnnotations());
-	    $('#cancel_button').attr('disabled', isSameContent);
-	    $('#submit_button').attr('disabled', isSameContent || !hasNoError);
-	};
-	
-	return {
-		STORAGE_RANGE_KEY: STORAGE_RANGE_KEY,
-		STORAGE_LINE_KEY : STORAGE_LINE_KEY,
-		saveEditorDisplay : saveEditorDisplay,
-		restoreEditorDisplay : restoreEditorDisplay,
-		getEditorForm : getEditorForm,
-		updateConfigEditorButtonState : updateConfigEditorButtonState
-	};
-})();
-EOF
-		);
-		$oP->add_ready_script(
-	        <<<'EOF'
-var editor = ace.edit("new_config");
-
-var $configurationSource = $('input[name="new_config"]');
-editor.getSession().setValue($configurationSource.val());
-
-editor.getSession().on('change', function()
-{
-  $configurationSource.val(editor.getSession().getValue());
-  EditorUtils.updateConfigEditorButtonState(editor);
-});
-editor.getSession().on("changeAnnotation", function()
-{
-  EditorUtils.updateConfigEditorButtonState(editor);
-});
-
-editor.setTheme("ace/theme/eclipse");
-editor.getSession().setMode("ace/mode/php");
-editor.commands.addCommand({
-    name: 'save',
-    bindKey: {win: "Ctrl-S", "mac": "Cmd-S"},
-    exec: function(editor) {
-        $editorForm = EditorUtils.getEditorForm(editor);
-        $submitButton = $('#submit_button');
-        
-        if ($submitButton.is(":enabled")) {
-            $editorForm.submit();
-        }
-    }
-});
-
-
-var $editorForm = EditorUtils.getEditorForm(editor);
-$editorForm.submit(function() {
-	EditorUtils.saveEditorDisplay(editor);
-});
-
-
-EditorUtils.restoreEditorDisplay(editor);
-editor.focus();
-EOF
-        );
-
-		$oP->add_script(
-<<<EOF
-function ResetConfig()
-{
-    var editor = ace.edit("new_config");
-	$("#operation").attr('value', 'revert');
-	if (editor.getValue() != $('#prev_config').val())
-	{
-		if (confirm('$sConfirmCancel'))
-		{
-			$('input[name="new_config"]').val($('#prev_config').val());
-			return true;
-		}
-	}
-	return false;
-}
-EOF
-		);
-	}
-}
-catch(Exception $e)
-{
-	$oP->p('<b>'.$e->getMessage().'</b>');
-}
-
-$oP->output();
+<?php
+// Copyright (C) 2014-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Monitor the backup
+ *
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/itopwebpage.class.inc.php');
+require_once(APPROOT.'application/startup.inc.php');
+require_once(APPROOT.'application/loginwebpage.class.inc.php');
+
+
+function TestConfig($sContents, $oP)
+{
+	try
+	{
+		ini_set('display_errors', 1);
+		ob_start();
+        // in PHP < 7.0.0 syntax errors are in output
+        // in PHP >= 7.0.0 syntax errors are thrown as Error
+        $sSafeContent = preg_replace(array('#^\s*<\?php#', '#\?>\s*$#'), '', $sContents);
+        eval('if(0){'.trim($sSafeContent).'}');
+        $sNoise = trim(ob_get_contents());
+		ob_end_clean();
+    }
+    catch (Error $e)
+    {
+        // ParseError only thrown in PHP7
+		throw new Exception('Error in configuration: '.$e->getMessage().' at line '.$e->getLine());
+	}
+	if (strlen($sNoise) > 0)
+	{
+		if (preg_match("/(Error|Parse error|Notice|Warning): (.+) in \S+ : eval\(\)'d code on line (\d+)/i", strip_tags($sNoise), $aMatches))
+		{
+			$sMessage = $aMatches[2];
+			$sLine = $aMatches[3];
+			$iLine = (int) $sLine;
+
+			// Highlight the line
+			$aLines = explode("\n", $sContents);
+			$iStart = 0;
+			for ($i = 0 ; $i < $iLine - 1; $i++) $iStart += strlen($aLines[$i]);
+			$iEnd = $iStart + strlen($aLines[$iLine - 1]);
+			$iTotalLines = count($aLines);
+
+			$sMessage = Dict::Format('config-parse-error', $sMessage, $sLine);
+			throw new Exception($sMessage);
+		}
+		else
+		{
+			// Note: sNoise is an html output, but so far it was ok for me (e.g. showing the entire call stack) 
+			throw new Exception('Syntax error in configuration file: <tt>'.$sNoise.'</tt>');
+		}
+	}
+}
+
+
+/////////////////////////////////////////////////////////////////////
+// Main program
+//
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+ApplicationMenu::CheckMenuIdEnabled('ConfigEditor');
+
+//$sOperation = utils::ReadParam('operation', 'menu');
+//$oAppContext = new ApplicationContext();
+
+$oP = new iTopWebPage(Dict::S('config-edit-title'));
+$oP->set_base(utils::GetAbsoluteUrlAppRoot().'pages/');
+$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ace.js');
+$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/mode-php.js');
+$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/theme-eclipse.js');
+$oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ext-searchbox.js');
+
+try
+{
+	$sOperation = utils::ReadParam('operation', '');
+
+	$oP->add("<h1>".Dict::S('config-edit-title')."</h1>");
+
+	if (MetaModel::GetConfig()->Get('demo_mode'))
+	{
+		$oP->add("<div class=\"header_message message_info\">Sorry, iTop is in <b>demonstration mode</b>: the configuration file cannot be edited.</div>");
+	}
+	else if (MetaModel::GetModuleSetting('itop-config', 'config_editor', '') == 'disabled')
+	{
+		$oP->add("<div class=\"header_message message_info\">iTop interactive edition of the configuration as been disabled. See <tt>'config_editor' => 'disabled'</tt> in the configuration file.</div>");
+	}
+	else
+	{
+		$sConfigFile = APPROOT.'conf/'.utils::GetCurrentEnvironment().'/config-itop.php';
+
+        $iEditorTopMargin = 9;
+        $sConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
+        $sOrginalConfig = $sConfig;
+
+        if (!empty($sOperation))
+        {
+            $iEditorTopMargin = 14;
+            $sConfig = utils::ReadParam('new_config', '', false, 'raw_data');
+            $sOrginalConfig = utils::ReadParam('prev_config', '', false, 'raw_data');
+        }
+
+        if ($sOperation == 'revert')
+        {
+            $oP->add('<div id="save_result" class="header_message message_info">'.Dict::S('config-reverted').'</div>');
+        }
+        if ($sOperation == 'save')
+        {
+            $sTransactionId = utils::ReadParam('transaction_id', '');
+            if (!utils::IsTransactionValid($sTransactionId, true))
+            {
+                $oP->add("<div class=\"header_message message_info\">Error: invalid Transaction ID. The configuration was <b>NOT</b> modified.</div>");
+            }
+            else
+            {
+                if ($sConfig == $sOrginalConfig)
+                {
+                    $oP->add('<div id="save_result" class="header_message">'.Dict::S('config-no-change').'</div>');
+                }
+                else
+                {
+                    try
+                    {
+                        TestConfig($sConfig, $oP); // throws exceptions
+
+                        @chmod($sConfigFile, 0770); // Allow overwriting the file
+                        $sTmpFile = tempnam(SetupUtils::GetTmpDir(), 'itop-cfg-');
+                        // Don't write the file as-is since it would allow to inject any kind of PHP code.
+                        // Instead write the interpreted version of the file
+                        // Note:
+                        // The actual raw PHP code will anyhow be interpreted exactly twice: once in TestConfig() above
+                        // and a second time during the load of the Config object below.
+                        // If you are really concerned about an iTop administrator crafting some malicious
+                        // PHP code inside the config file, then turn off the interactive configuration
+                        // editor by adding the configuration parameter:
+                        // 'itop-config' => array(
+                        //     'config_editor' => 'disabled',
+                        // )
+                        file_put_contents($sTmpFile, $sConfig);
+                        $oTempConfig = new Config($sTmpFile, true);
+                        $oTempConfig->WriteToFile($sConfigFile);
+                        @unlink($sTmpFile);
+                        @chmod($sConfigFile, 0444); // Read-only
+
+                        $oP->p('<div id="save_result" class="header_message message_ok">'.Dict::S('config-saved').'</div>');
+                        $sOrginalConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
+                    }
+                    catch (Exception $e)
+                    {
+                        $oP->p('<div id="save_result" class="header_message message_error">'.$e->getMessage().'</div>');
+                    }
+                }
+            }
+        }
+
+
+		$sConfigEscaped = htmlentities($sConfig, ENT_QUOTES, 'UTF-8');
+		$sOriginalConfigEscaped = htmlentities($sOrginalConfig, ENT_QUOTES, 'UTF-8');
+		$oP->p(Dict::S('config-edit-intro'));
+		$oP->add("<form method=\"POST\">");
+        $oP->add("<input id=\"operation\" type=\"hidden\" name=\"operation\" value=\"save\">");
+		$oP->add("<input type=\"hidden\" name=\"transaction_id\" value=\"".utils::GetNewTransactionId()."\">");
+		$oP->add("<input id=\"submit_button\" type=\"submit\" value=\"".Dict::S('config-apply')."\" title=\"".Dict::S('config-apply-title')."\"><button id=\"cancel_button\" disabled=\"disabled\" onclick=\"return ResetConfig();\">".Dict::S('config-cancel')."</button>");
+		$oP->add("<input type=\"hidden\" id=\"prev_config\" name=\"prev_config\" value=\"$sOriginalConfigEscaped\">");
+        $oP->add("<input type=\"hidden\"  name=\"new_config\" value=\"$sConfigEscaped\">");
+        $oP->add("<div id =\"new_config\" style=\"position: absolute; top: ".$iEditorTopMargin."em; bottom: 0; left: 5px; right: 5px;\"></div>");
+		$oP->add("</form>");
+	
+		$sConfirmCancel = addslashes(Dict::S('config-confirm-cancel'));
+		$oP->add_script(
+			<<<'EOF'
+var EditorUtils = (function() {
+	var STORAGE_RANGE_KEY = 'cfgEditorRange';
+	var STORAGE_LINE_KEY = 'cfgEditorFirstline';
+	var _editorSavedRange = null;
+	var _editorSavedFirstLine = null;
+	
+	var saveEditorDisplay = function(editor) {
+		_initObjectValues(editor);
+		_persistObjectValues();
+	};
+	
+	var _initObjectValues = function(editor) {
+		_editorSavedRange = editor.getSelectionRange();
+		_editorSavedFirstLine = editor.renderer.getFirstVisibleRow();
+	};
+	
+	var _persistObjectValues = function() {
+		sessionStorage.setItem(EditorUtils.STORAGE_RANGE_KEY, JSON.stringify(_editorSavedRange));
+		sessionStorage.setItem(EditorUtils.STORAGE_LINE_KEY, _editorSavedFirstLine);
+	};
+	
+	var restoreEditorDisplay = function(editor) {
+		_restoreObjectValues();
+		_setEditorDisplay(editor);
+	};
+	
+	var _restoreObjectValues = function() {
+		if ((sessionStorage.getItem(STORAGE_RANGE_KEY) == null) 
+			|| (sessionStorage.getItem(STORAGE_LINE_KEY) == null)) {
+			return;
+		}
+		
+		_editorSavedRange = JSON.parse(sessionStorage.getItem(EditorUtils.STORAGE_RANGE_KEY));
+		_editorSavedFirstLine = sessionStorage.getItem(EditorUtils.STORAGE_LINE_KEY);
+		sessionStorage.removeItem(STORAGE_RANGE_KEY);
+		sessionStorage.removeItem(STORAGE_LINE_KEY);
+	};
+	
+	var _setEditorDisplay = function(editor) {
+		if ((_editorSavedRange == null) || (_editorSavedFirstLine == null)) {
+			return;
+		}
+
+		editor.selection.setRange(_editorSavedRange);
+		editor.renderer.scrollToRow(_editorSavedFirstLine);
+	};
+	
+	var getEditorForm = function(editor) {
+        var $editorContainer = $(editor.container);
+        var $editorForm = $editorContainer.closest("form");
+        return $editorForm;
+	};
+	
+	var updateConfigEditorButtonState = function(editor) {
+	    var isSameContent = (editor.getValue() == $('#prev_config').val());
+	    var hasNoError = $.isEmptyObject(editor.getSession().getAnnotations());
+	    $('#cancel_button').attr('disabled', isSameContent);
+	    $('#submit_button').attr('disabled', isSameContent || !hasNoError);
+	};
+	
+	return {
+		STORAGE_RANGE_KEY: STORAGE_RANGE_KEY,
+		STORAGE_LINE_KEY : STORAGE_LINE_KEY,
+		saveEditorDisplay : saveEditorDisplay,
+		restoreEditorDisplay : restoreEditorDisplay,
+		getEditorForm : getEditorForm,
+		updateConfigEditorButtonState : updateConfigEditorButtonState
+	};
+})();
+EOF
+		);
+		$oP->add_ready_script(
+	        <<<'EOF'
+var editor = ace.edit("new_config");
+
+var $configurationSource = $('input[name="new_config"]');
+editor.getSession().setValue($configurationSource.val());
+
+editor.getSession().on('change', function()
+{
+  $configurationSource.val(editor.getSession().getValue());
+  EditorUtils.updateConfigEditorButtonState(editor);
+});
+editor.getSession().on("changeAnnotation", function()
+{
+  EditorUtils.updateConfigEditorButtonState(editor);
+});
+
+editor.setTheme("ace/theme/eclipse");
+editor.getSession().setMode("ace/mode/php");
+editor.commands.addCommand({
+    name: 'save',
+    bindKey: {win: "Ctrl-S", "mac": "Cmd-S"},
+    exec: function(editor) {
+        $editorForm = EditorUtils.getEditorForm(editor);
+        $submitButton = $('#submit_button');
+        
+        if ($submitButton.is(":enabled")) {
+            $editorForm.submit();
+        }
+    }
+});
+
+
+var $editorForm = EditorUtils.getEditorForm(editor);
+$editorForm.submit(function() {
+	EditorUtils.saveEditorDisplay(editor);
+});
+
+
+EditorUtils.restoreEditorDisplay(editor);
+editor.focus();
+EOF
+        );
+
+		$oP->add_script(
+<<<EOF
+function ResetConfig()
+{
+    var editor = ace.edit("new_config");
+	$("#operation").attr('value', 'revert');
+	if (editor.getValue() != $('#prev_config').val())
+	{
+		if (confirm('$sConfirmCancel'))
+		{
+			$('input[name="new_config"]').val($('#prev_config').val());
+			return true;
+		}
+	}
+	return false;
+}
+EOF
+		);
+	}
+}
+catch(Exception $e)
+{
+	$oP->p('<b>'.$e->getMessage().'</b>');
+}
+
+$oP->output();
diff --git a/datamodels/2.x/itop-config/js/ace.js b/datamodels/2.x/itop-config/js/ace.js
index 3f52ec133..5235e786e 100644
--- a/datamodels/2.x/itop-config/js/ace.js
+++ b/datamodels/2.x/itop-config/js/ace.js
@@ -1,14 +1,14 @@
-(function(){function o(n){var i=e;n&&(e[n]||(e[n]={}),i=e[n]);if(!i.define||!i.define.packaged)t.original=i.define,i.define=t,i.define.packaged=!0;if(!i.require||!i.require.packaged)r.original=i.require,i.require=r,i.require.packaged=!0}var ACE_NAMESPACE = "ace",e=function(){return this}();!e&&typeof window!="undefined"&&(e=window);if(!ACE_NAMESPACE&&typeof requirejs!="undefined")return;var t=function(e,n,r){if(typeof e!="string"){t.original?t.original.apply(this,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(r=n),t.modules[e]||(t.payloads[e]=r,t.modules[e]=null)};t.modules={},t.payloads={};var n=function(e,t,n){if(typeof t=="string"){var i=s(e,t);if(i!=undefined)return n&&n(),i}else if(Object.prototype.toString.call(t)==="[object Array]"){var o=[];for(var u=0,a=t.length;u<a;++u){var f=s(e,t[u]);if(f==undefined&&r.original)return;o.push(f)}return n&&n.apply(null,o)||!0}},r=function(e,t){var i=n("",e,t);return i==undefined&&r.original?r.original.apply(this,arguments):i},i=function(e,t){if(t.indexOf("!")!==-1){var n=t.split("!");return i(e,n[0])+"!"+i(e,n[1])}if(t.charAt(0)=="."){var r=e.split("/").slice(0,-1).join("/");t=r+"/"+t;while(t.indexOf(".")!==-1&&s!=t){var s=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return t},s=function(e,r){r=i(e,r);var s=t.modules[r];if(!s){s=t.payloads[r];if(typeof s=="function"){var o={},u={id:r,uri:"",exports:o,packaged:!0},a=function(e,t){return n(r,e,t)},f=s(a,o,u);o=f||u.exports,t.modules[r]=o,delete t.payloads[r]}s=t.modules[r]=o||s}return s};o(ACE_NAMESPACE)})(),ace.define("ace/lib/regexp",["require","exports","module"],function(e,t,n){"use strict";function o(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function u(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1}var r={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},i=r.exec.call(/()??/,"")[1]===undefined,s=function(){var e=/^/g;return r.test.call(e,""),!e.lastIndex}();if(s&&i)return;RegExp.prototype.exec=function(e){var t=r.exec.apply(this,arguments),n,a;if(typeof e=="string"&&t){!i&&t.length>1&&u(t,"")>-1&&(a=RegExp(this.source,r.replace.call(o(this),"g","")),r.replace.call(e.slice(t.index),a,function(){for(var e=1;e<arguments.length-2;e++)arguments[e]===undefined&&(t[e]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var f=1;f<t.length;f++)n=this._xregexp.captureNames[f-1],n&&(t[n]=t[f]);!s&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--}return t},s||(RegExp.prototype.test=function(e){var t=r.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t})}),ace.define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _="	\n\f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}}),ace.define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(e,t,n){"use strict";e("./regexp"),e("./es5-shim")}),ace.define("ace/lib/dom",["require","exports","module"],function(e,t,n){"use strict";var r="http://www.w3.org/1999/xhtml";t.getDocumentHead=function(e){return e||(e=document),e.head||e.getElementsByTagName("head")[0]||e.documentElement},t.createElement=function(e,t){return document.createElementNS?document.createElementNS(t||r,e):document.createElement(e)},t.hasCssClass=function(e,t){var n=(e.className+"").split(/\s+/g);return n.indexOf(t)!==-1},t.addCssClass=function(e,n){t.hasCssClass(e,n)||(e.className+=" "+n)},t.removeCssClass=function(e,t){var n=e.className.split(/\s+/g);for(;;){var r=n.indexOf(t);if(r==-1)break;n.splice(r,1)}e.className=n.join(" ")},t.toggleCssClass=function(e,t){var n=e.className.split(/\s+/g),r=!0;for(;;){var i=n.indexOf(t);if(i==-1)break;r=!1,n.splice(i,1)}return r&&n.push(t),e.className=n.join(" "),r},t.setCssClass=function(e,n,r){r?t.addCssClass(e,n):t.removeCssClass(e,n)},t.hasCssString=function(e,t){var n=0,r;t=t||document;if(t.createStyleSheet&&(r=t.styleSheets)){while(n<r.length)if(r[n++].owningElement.id===e)return!0}else if(r=t.getElementsByTagName("style"))while(n<r.length)if(r[n++].id===e)return!0;return!1},t.importCssString=function(n,r,i){i=i||document;if(r&&t.hasCssString(r,i))return null;var s;r&&(n+="\n/*# sourceURL=ace/css/"+r+" */"),i.createStyleSheet?(s=i.createStyleSheet(),s.cssText=n,r&&(s.owningElement.id=r)):(s=t.createElement("style"),s.appendChild(i.createTextNode(n)),r&&(s.id=r),t.getDocumentHead(i).appendChild(s))},t.importCssStylsheet=function(e,n){if(n.createStyleSheet)n.createStyleSheet(e);else{var r=t.createElement("link");r.rel="stylesheet",r.href=e,t.getDocumentHead(n).appendChild(r)}},t.getInnerWidth=function(e){return parseInt(t.computedStyle(e,"paddingLeft"),10)+parseInt(t.computedStyle(e,"paddingRight"),10)+e.clientWidth},t.getInnerHeight=function(e){return parseInt(t.computedStyle(e,"paddingTop"),10)+parseInt(t.computedStyle(e,"paddingBottom"),10)+e.clientHeight},t.scrollbarWidth=function(e){var n=t.createElement("ace_inner");n.style.width="100%",n.style.minWidth="0px",n.style.height="200px",n.style.display="block";var r=t.createElement("ace_outer"),i=r.style;i.position="absolute",i.left="-10000px",i.overflow="hidden",i.width="200px",i.minWidth="0px",i.height="150px",i.display="block",r.appendChild(n);var s=e.documentElement;s.appendChild(r);var o=n.offsetWidth;i.overflow="scroll";var u=n.offsetWidth;return o==u&&(u=r.clientWidth),s.removeChild(r),o-u};if(typeof document=="undefined"){t.importCssString=function(){};return}window.pageYOffset!==undefined?(t.getPageScrollTop=function(){return window.pageYOffset},t.getPageScrollLeft=function(){return window.pageXOffset}):(t.getPageScrollTop=function(){return document.body.scrollTop},t.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?t.computedStyle=function(e,t){return t?(window.getComputedStyle(e,"")||{})[t]||"":window.getComputedStyle(e,"")||{}}:t.computedStyle=function(e,t){return t?e.currentStyle[t]:e.currentStyle},t.setInnerHtml=function(e,t){var n=e.cloneNode(!1);return n.innerHTML=t,e.parentNode.replaceChild(n,e),n},"textContent"in document.documentElement?(t.setInnerText=function(e,t){e.textContent=t},t.getInnerText=function(e){return e.textContent}):(t.setInnerText=function(e,t){e.innerText=t},t.getInnerText=function(e){return e.innerText}),t.getParentWindow=function(e){return e.defaultView||e.parentWindow}}),ace.define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),ace.define("ace/lib/keys",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop"],function(e,t,n){"use strict";e("./fixoldbrowsers");var r=e("./oop"),i=function(){var e={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,"super":8,meta:8,command:8,cmd:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9","-13":"NumpadEnter",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",111:"/",106:"*"}},t,n;for(n in e.FUNCTION_KEYS)t=e.FUNCTION_KEYS[n].toLowerCase(),e[t]=parseInt(n,10);for(n in e.PRINTABLE_KEYS)t=e.PRINTABLE_KEYS[n].toLowerCase(),e[t]=parseInt(n,10);return r.mixin(e,e.MODIFIER_KEYS),r.mixin(e,e.PRINTABLE_KEYS),r.mixin(e,e.FUNCTION_KEYS),e.enter=e["return"],e.escape=e.esc,e.del=e["delete"],e[173]="-",function(){var t=["cmd","ctrl","alt","shift"];for(var n=Math.pow(2,t.length);n--;)e.KEY_MODS[n]=t.filter(function(t){return n&e.KEY_MODS[t]}).join("-")+"-"}(),e.KEY_MODS[0]="",e.KEY_MODS[-1]="input-",e}();r.mixin(t,i),t.keyCodeToString=function(e){var t=i[e];return typeof t!="string"&&(t=String.fromCharCode(e)),t.toLowerCase()}}),ace.define("ace/lib/useragent",["require","exports","module"],function(e,t,n){"use strict";t.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},t.getOS=function(){return t.isMac?t.OS.MAC:t.isLinux?t.OS.LINUX:t.OS.WINDOWS};if(typeof navigator!="object")return;var r=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),i=navigator.userAgent;t.isWin=r=="win",t.isMac=r=="mac",t.isLinux=r=="linux",t.isIE=navigator.appName=="Microsoft Internet Explorer"||navigator.appName.indexOf("MSAppHost")>=0?parseFloat((i.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]):parseFloat((i.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]),t.isOldIE=t.isIE&&t.isIE<9,t.isGecko=t.isMozilla=(window.Controllers||window.controllers)&&window.navigator.product==="Gecko",t.isOldGecko=t.isGecko&&parseInt((i.match(/rv:(\d+)/)||[])[1],10)<4,t.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",t.isWebKit=parseFloat(i.split("WebKit/")[1])||undefined,t.isChrome=parseFloat(i.split(" Chrome/")[1])||undefined,t.isAIR=i.indexOf("AdobeAIR")>=0,t.isIPad=i.indexOf("iPad")>=0,t.isChromeOS=i.indexOf(" CrOS ")>=0,t.isIOS=/iPad|iPhone|iPod/.test(i)&&!window.MSStream,t.isIOS&&(t.isMac=!0)}),ace.define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent"],function(e,t,n){"use strict";function a(e,t,n){var a=u(t);if(!i.isMac&&s){t.getModifierState&&(t.getModifierState("OS")||t.getModifierState("Win"))&&(a|=8);if(s.altGr){if((3&a)==3)return;s.altGr=0}if(n===18||n===17){var f="location"in t?t.location:t.keyLocation;if(n===17&&f===1)s[n]==1&&(o=t.timeStamp);else if(n===18&&a===3&&f===2){var l=t.timeStamp-o;l<50&&(s.altGr=!0)}}}n in r.MODIFIER_KEYS&&(n=-1),a&8&&n>=91&&n<=93&&(n=-1);if(!a&&n===13){var f="location"in t?t.location:t.keyLocation;if(f===3){e(t,a,-n);if(t.defaultPrevented)return}}if(i.isChromeOS&&a&8){e(t,a,n);if(t.defaultPrevented)return;a&=-9}return!!a||n in r.FUNCTION_KEYS||n in r.PRINTABLE_KEYS?e(t,a,n):!1}function f(){s=Object.create(null)}var r=e("./keys"),i=e("./useragent"),s=null,o=0;t.addListener=function(e,t,n){if(e.addEventListener)return e.addEventListener(t,n,!1);if(e.attachEvent){var r=function(){n.call(e,window.event)};n._wrapper=r,e.attachEvent("on"+t,r)}},t.removeListener=function(e,t,n){if(e.removeEventListener)return e.removeEventListener(t,n,!1);e.detachEvent&&e.detachEvent("on"+t,n._wrapper||n)},t.stopEvent=function(e){return t.stopPropagation(e),t.preventDefault(e),!1},t.stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},t.preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},t.getButton=function(e){return e.type=="dblclick"?0:e.type=="contextmenu"||i.isMac&&e.ctrlKey&&!e.altKey&&!e.shiftKey?2:e.preventDefault?e.button:{1:0,2:2,4:1}[e.button]},t.capture=function(e,n,r){function i(e){n&&n(e),r&&r(e),t.removeListener(document,"mousemove",n,!0),t.removeListener(document,"mouseup",i,!0),t.removeListener(document,"dragstart",i,!0)}return t.addListener(document,"mousemove",n,!0),t.addListener(document,"mouseup",i,!0),t.addListener(document,"dragstart",i,!0),i},t.addTouchMoveListener=function(e,n){if("ontouchmove"in e){var r,i;t.addListener(e,"touchstart",function(e){var t=e.changedTouches[0];r=t.clientX,i=t.clientY}),t.addListener(e,"touchmove",function(e){var t=1,s=e.changedTouches[0];e.wheelX=-(s.clientX-r)/t,e.wheelY=-(s.clientY-i)/t,r=s.clientX,i=s.clientY,n(e)})}},t.addMouseWheelListener=function(e,n){"onmousewheel"in e?t.addListener(e,"mousewheel",function(e){var t=8;e.wheelDeltaX!==undefined?(e.wheelX=-e.wheelDeltaX/t,e.wheelY=-e.wheelDeltaY/t):(e.wheelX=0,e.wheelY=-e.wheelDelta/t),n(e)}):"onwheel"in e?t.addListener(e,"wheel",function(e){var t=.35;switch(e.deltaMode){case e.DOM_DELTA_PIXEL:e.wheelX=e.deltaX*t||0,e.wheelY=e.deltaY*t||0;break;case e.DOM_DELTA_LINE:case e.DOM_DELTA_PAGE:e.wheelX=(e.deltaX||0)*5,e.wheelY=(e.deltaY||0)*5}n(e)}):t.addListener(e,"DOMMouseScroll",function(e){e.axis&&e.axis==e.HORIZONTAL_AXIS?(e.wheelX=(e.detail||0)*5,e.wheelY=0):(e.wheelX=0,e.wheelY=(e.detail||0)*5),n(e)})},t.addMultiMouseDownListener=function(e,n,r,s){function c(e){t.getButton(e)!==0?o=0:e.detail>1?(o++,o>4&&(o=1)):o=1;if(i.isIE){var c=Math.abs(e.clientX-u)>5||Math.abs(e.clientY-a)>5;if(!f||c)o=1;f&&clearTimeout(f),f=setTimeout(function(){f=null},n[o-1]||600),o==1&&(u=e.clientX,a=e.clientY)}e._clicks=o,r[s]("mousedown",e);if(o>4)o=0;else if(o>1)return r[s](l[o],e)}function h(e){o=2,f&&clearTimeout(f),f=setTimeout(function(){f=null},n[o-1]||600),r[s]("mousedown",e),r[s](l[o],e)}var o=0,u,a,f,l={2:"dblclick",3:"tripleclick",4:"quadclick"};Array.isArray(e)||(e=[e]),e.forEach(function(e){t.addListener(e,"mousedown",c),i.isOldIE&&t.addListener(e,"dblclick",h)})};var u=!i.isMac||!i.isOpera||"KeyboardEvent"in window?function(e){return 0|(e.ctrlKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.metaKey?8:0)}:function(e){return 0|(e.metaKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.ctrlKey?8:0)};t.getModifierString=function(e){return r.KEY_MODS[u(e)]},t.addCommandKeyListener=function(e,n){var r=t.addListener;if(i.isOldGecko||i.isOpera&&!("KeyboardEvent"in window)){var o=null;r(e,"keydown",function(e){o=e.keyCode}),r(e,"keypress",function(e){return a(n,e,o)})}else{var u=null;r(e,"keydown",function(e){s[e.keyCode]=(s[e.keyCode]||0)+1;var t=a(n,e,e.keyCode);return u=e.defaultPrevented,t}),r(e,"keypress",function(e){u&&(e.ctrlKey||e.altKey||e.shiftKey||e.metaKey)&&(t.stopEvent(e),u=null)}),r(e,"keyup",function(e){s[e.keyCode]=null}),s||(f(),r(window,"focus",f))}};if(typeof window=="object"&&window.postMessage&&!i.isOldIE){var l=1;t.nextTick=function(e,n){n=n||window;var r="zero-timeout-message-"+l;t.addListener(n,"message",function i(s){s.data==r&&(t.stopPropagation(s),t.removeListener(n,"message",i),e())}),n.postMessage(r,"*")}}t.nextFrame=typeof window=="object"&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame),t.nextFrame?t.nextFrame=t.nextFrame.bind(window):t.nextFrame=function(e){setTimeout(e,17)}}),ace.define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),ace.define("ace/keyboard/textinput_ios",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),u=e("../lib/keys"),a=u.KEY_MODS,f=i.isChrome<18,l=i.isIE,c=function(e,t){function x(e){if(m)return;m=!0;if(k)t=0,n=e?0:c.value.length-1;else var t=4,n=5;try{c.setSelectionRange(t,n)}catch(r){}m=!1}function T(){if(m)return;c.value=h,i.isWebKit&&S.schedule()}function R(){clearTimeout(q),q=setTimeout(function(){g&&(c.style.cssText=g,g=""),t.renderer.$keepTextAreaAtCursor==null&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())},0)}var n=this,c=s.createElement("textarea");c.className=i.isIOS?"ace_text-input ace_text-input-ios":"ace_text-input",i.isTouchPad&&c.setAttribute("x-palm-disable-auto-cap",!0),c.setAttribute("wrap","off"),c.setAttribute("autocorrect","off"),c.setAttribute("autocapitalize","off"),c.setAttribute("spellcheck",!1),c.style.opacity="0",e.insertBefore(c,e.firstChild);var h="\n aaaa a\n",p=!1,d=!1,v=!1,m=!1,g="",y=!0;try{var b=document.activeElement===c}catch(w){}r.addListener(c,"blur",function(e){t.onBlur(e),b=!1}),r.addListener(c,"focus",function(e){b=!0,t.onFocus(e),x()}),this.focus=function(){if(g)return c.focus();c.style.position="fixed",c.focus()},this.blur=function(){c.blur()},this.isFocused=function(){return b};var E=o.delayedCall(function(){b&&x(y)}),S=o.delayedCall(function(){m||(c.value=h,b&&x())});i.isWebKit||t.addEventListener("changeSelection",function(){t.selection.isEmpty()!=y&&(y=!y,E.schedule())}),T(),b&&t.onFocus();var N=function(e){return e.selectionStart===0&&e.selectionEnd===e.value.length},C=function(e){N(c)?(t.selectAll(),x()):k&&x(t.selection.isEmpty())},k=null;this.setInputHandler=function(e){k=e},this.getInputHandler=function(){return k};var L=!1,A=function(e){if(c.selectionStart===4&&c.selectionEnd===5)return;k&&(e=k(e),k=null),v?(x(),e&&t.onPaste(e),v=!1):e==h.substr(0)&&c.selectionStart===4?L?t.execCommand("del",{source:"ace"}):t.execCommand("backspace",{source:"ace"}):p||(e.substring(0,9)==h&&e.length>h.length?e=e.substr(9):e.substr(0,4)==h.substr(0,4)?e=e.substr(4,e.length-h.length+1):e.charAt(e.length-1)==h.charAt(0)&&(e=e.slice(0,-1)),e!=h.charAt(0)&&e.charAt(e.length-1)==h.charAt(0)&&(e=e.slice(0,-1)),e&&t.onTextInput(e)),p&&(p=!1),L&&(L=!1)},O=function(e){if(m)return;var t=c.value;A(t),T()},M=function(e,t,n){var r=e.clipboardData||window.clipboardData;if(!r||f)return;var i=l||n?"Text":"text/plain";try{return t?r.setData(i,t)!==!1:r.getData(i)}catch(e){if(!n)return M(e,t,!0)}},_=function(e,n){var s=t.getCopyText();if(!s)return r.preventDefault(e);M(e,s)?(i.isIOS&&(d=n,c.value="\n aa"+s+"a a\n",c.setSelectionRange(4,4+s.length),p={value:s}),n?t.onCut():t.onCopy(),i.isIOS||r.preventDefault(e)):(p=!0,c.value=s,c.select(),setTimeout(function(){p=!1,T(),x(),n?t.onCut():t.onCopy()}))},D=function(e){_(e,!0)},P=function(e){_(e,!1)},H=function(e){var n=M(e);typeof n=="string"?(n&&t.onPaste(n,e),i.isIE&&setTimeout(x),r.preventDefault(e)):(c.value="",v=!0)};r.addCommandKeyListener(c,t.onCommandKey.bind(t)),r.addListener(c,"select",C),r.addListener(c,"input",O),r.addListener(c,"cut",D),r.addListener(c,"copy",P),r.addListener(c,"paste",H);var B=function(e){if(m||!t.onCompositionStart||t.$readOnly)return;m={},m.canUndo=t.session.$undoManager,t.onCompositionStart(),setTimeout(j,0),t.on("mousedown",F),m.canUndo&&!t.selection.isEmpty()&&(t.insert(""),t.session.markUndoGroup(),t.selection.clearSelection()),t.session.markUndoGroup()},j=function(){if(!m||!t.onCompositionUpdate||t.$readOnly)return;var e=c.value.replace(/\x01/g,"");if(m.lastValue===e)return;t.onCompositionUpdate(e),m.lastValue&&t.undo(),m.canUndo&&(m.lastValue=e);if(m.lastValue){var n=t.selection.getRange();t.insert(m.lastValue),t.session.markUndoGroup(),m.range=t.selection.getRange(),t.selection.setRange(n),t.selection.clearSelection()}},F=function(e){if(!t.onCompositionEnd||t.$readOnly)return;var n=m;m=!1;var r=setTimeout(function(){r=null;var e=c.value.replace(/\x01/g,"");if(m)return;e==n.lastValue?T():!n.lastValue&&e&&(T(),A(e))});k=function(i){return r&&clearTimeout(r),i=i.replace(/\x01/g,""),i==n.lastValue?"":(n.lastValue&&r&&t.undo(),i)},t.onCompositionEnd(),t.removeListener("mousedown",F),e.type=="compositionend"&&n.range&&t.selection.setRange(n.range);var s=!!i.isChrome&&i.isChrome>=53||!!i.isWebKit&&i.isWebKit>=603;s&&O()},I=o.delayedCall(j,50);r.addListener(c,"compositionstart",B),i.isGecko?r.addListener(c,"text",function(){I.schedule()}):(r.addListener(c,"keyup",function(){I.schedule()}),r.addListener(c,"keydown",function(){I.schedule()})),r.addListener(c,"compositionend",F),this.getElement=function(){return c},this.setReadOnly=function(e){c.readOnly=e},this.onContextMenu=function(e){L=!0,x(t.selection.isEmpty()),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,n){g||(g=c.style.cssText),c.style.cssText=(n?"z-index:100000;":"")+"height:"+c.style.height+";"+(i.isIE?"opacity:0.1;":"");var o=t.container.getBoundingClientRect(),u=s.computedStyle(t.container),a=o.top+(parseInt(u.borderTopWidth)||0),f=o.left+(parseInt(o.borderLeftWidth)||0),l=o.bottom-a-c.clientHeight-2,h=function(e){c.style.left=e.clientX-f-2+"px",c.style.top=Math.min(e.clientY-a-2,l)+"px"};h(e);if(e.type!="mousedown")return;t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout(q),i.isWin&&r.capture(t.container,h,R)},this.onContextMenuClose=R;var q,U=function(e){t.textInput.onContextMenu(e),R()};r.addListener(c,"mouseup",U),r.addListener(c,"mousedown",function(e){e.preventDefault(),R()}),r.addListener(t.renderer.scroller,"contextmenu",U),r.addListener(c,"contextmenu",U);if(i.isIOS){var z=null,W=!1;e.addEventListener("keydown",function(e){z&&clearTimeout(z),W=!0}),e.addEventListener("keyup",function(e){z=setTimeout(function(){W=!1},100)});var X=function(e){if(document.activeElement!==c)return;if(W)return;if(d)return setTimeout(function(){d=!1},100);var n=c.selectionStart,r=c.selectionEnd;c.setSelectionRange(4,5);if(n==r)switch(n){case 0:t.onCommandKey(null,0,u.up);break;case 1:t.onCommandKey(null,0,u.home);break;case 2:t.onCommandKey(null,a.option,u.left);break;case 4:t.onCommandKey(null,0,u.left);break;case 5:t.onCommandKey(null,0,u.right);break;case 7:t.onCommandKey(null,a.option,u.right);break;case 8:t.onCommandKey(null,0,u.end);break;case 9:t.onCommandKey(null,0,u.down)}else{switch(r){case 6:t.onCommandKey(null,a.shift,u.right);break;case 7:t.onCommandKey(null,a.shift|a.option,u.right);break;case 8:t.onCommandKey(null,a.shift,u.end);break;case 9:t.onCommandKey(null,a.shift,u.down)}switch(n){case 0:t.onCommandKey(null,a.shift,u.up);break;case 1:t.onCommandKey(null,a.shift,u.home);break;case 2:t.onCommandKey(null,a.shift|a.option,u.left);break;case 3:t.onCommandKey(null,a.shift,u.left)}}};document.addEventListener("selectionchange",X),t.on("destroy",function(){document.removeEventListener("selectionchange",X)})}};t.TextInput=c}),ace.define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/keyboard/textinput_ios"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),u=i.isChrome<18,a=i.isIE,f=e("./textinput_ios").TextInput,l=function(e,t){function w(e){if(p)return;p=!0;if(T)t=0,r=e?0:n.value.length-1;else var t=e?2:1,r=2;try{n.setSelectionRange(t,r)}catch(i){}p=!1}function E(){if(p)return;n.value=l,i.isWebKit&&b.schedule()}function F(){clearTimeout(j),j=setTimeout(function(){d&&(n.style.cssText=d,d=""),t.renderer.$keepTextAreaAtCursor==null&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())},0)}if(i.isIOS)return f.call(this,e,t);var n=s.createElement("textarea");n.className="ace_text-input",n.setAttribute("wrap","off"),n.setAttribute("autocorrect","off"),n.setAttribute("autocapitalize","off"),n.setAttribute("spellcheck",!1),n.style.opacity="0",e.insertBefore(n,e.firstChild);var l="\u2028\u2028",c=!1,h=!1,p=!1,d="",v=!0;try{var m=document.activeElement===n}catch(g){}r.addListener(n,"blur",function(e){t.onBlur(e),m=!1}),r.addListener(n,"focus",function(e){m=!0,t.onFocus(e),w()}),this.focus=function(){if(d)return n.focus();var e=n.style.top;n.style.position="fixed",n.style.top="0px",n.focus(),setTimeout(function(){n.style.position="",n.style.top=="0px"&&(n.style.top=e)},0)},this.blur=function(){n.blur()},this.isFocused=function(){return m};var y=o.delayedCall(function(){m&&w(v)}),b=o.delayedCall(function(){p||(n.value=l,m&&w())});i.isWebKit||t.addEventListener("changeSelection",function(){t.selection.isEmpty()!=v&&(v=!v,y.schedule())}),E(),m&&t.onFocus();var S=function(e){return e.selectionStart===0&&e.selectionEnd===e.value.length},x=function(e){c?c=!1:S(n)?(t.selectAll(),w()):T&&w(t.selection.isEmpty())},T=null;this.setInputHandler=function(e){T=e},this.getInputHandler=function(){return T};var N=!1,C=function(e){T&&(e=T(e),T=null),h?(w(),e&&t.onPaste(e),h=!1):e==l.charAt(0)?N?t.execCommand("del",{source:"ace"}):t.execCommand("backspace",{source:"ace"}):(e.substring(0,2)==l?e=e.substr(2):e.charAt(0)==l.charAt(0)?e=e.substr(1):e.charAt(e.length-1)==l.charAt(0)&&(e=e.slice(0,-1)),e.charAt(e.length-1)==l.charAt(0)&&(e=e.slice(0,-1)),e&&t.onTextInput(e)),N&&(N=!1)},k=function(e){if(p)return;var t=n.value;C(t),E()},L=function(e,t,n){var r=e.clipboardData||window.clipboardData;if(!r||u)return;var i=a||n?"Text":"text/plain";try{return t?r.setData(i,t)!==!1:r.getData(i)}catch(e){if(!n)return L(e,t,!0)}},A=function(e,i){var s=t.getCopyText();if(!s)return r.preventDefault(e);L(e,s)?(i?t.onCut():t.onCopy(),r.preventDefault(e)):(c=!0,n.value=s,n.select(),setTimeout(function(){c=!1,E(),w(),i?t.onCut():t.onCopy()}))},O=function(e){A(e,!0)},M=function(e){A(e,!1)},_=function(e){var s=L(e);typeof s=="string"?(s&&t.onPaste(s,e),i.isIE&&setTimeout(w),r.preventDefault(e)):(n.value="",h=!0)};r.addCommandKeyListener(n,t.onCommandKey.bind(t)),r.addListener(n,"select",x),r.addListener(n,"input",k),r.addListener(n,"cut",O),r.addListener(n,"copy",M),r.addListener(n,"paste",_),(!("oncut"in n)||!("oncopy"in n)||!("onpaste"in n))&&r.addListener(e,"keydown",function(e){if(i.isMac&&!e.metaKey||!e.ctrlKey)return;switch(e.keyCode){case 67:M(e);break;case 86:_(e);break;case 88:O(e)}});var D=function(e){if(p||!t.onCompositionStart||t.$readOnly)return;p={},p.canUndo=t.session.$undoManager,t.onCompositionStart(),setTimeout(P,0),t.on("mousedown",H),p.canUndo&&!t.selection.isEmpty()&&(t.insert(""),t.session.markUndoGroup(),t.selection.clearSelection()),t.session.markUndoGroup()},P=function(){if(!p||!t.onCompositionUpdate||t.$readOnly)return;var e=n.value.replace(/\u2028/g,"");if(p.lastValue===e)return;t.onCompositionUpdate(e),p.lastValue&&t.undo(),p.canUndo&&(p.lastValue=e);if(p.lastValue){var r=t.selection.getRange();t.insert(p.lastValue),t.session.markUndoGroup(),p.range=t.selection.getRange(),t.selection.setRange(r),t.selection.clearSelection()}},H=function(e){if(!t.onCompositionEnd||t.$readOnly)return;var r=p;p=!1;var s=setTimeout(function(){s=null;var e=n.value.replace(/\u2028/g,"");if(p)return;e==r.lastValue?E():!r.lastValue&&e&&(E(),C(e))});T=function(n){return s&&clearTimeout(s),n=n.replace(/\u2028/g,""),n==r.lastValue?"":(r.lastValue&&s&&t.undo(),n)},t.onCompositionEnd(),t.removeListener("mousedown",H),e.type=="compositionend"&&r.range&&t.selection.setRange(r.range);var o=!!i.isChrome&&i.isChrome>=53||!!i.isWebKit&&i.isWebKit>=603;o&&k()},B=o.delayedCall(P,50);r.addListener(n,"compositionstart",D),i.isGecko?r.addListener(n,"text",function(){B.schedule()}):(r.addListener(n,"keyup",function(){B.schedule()}),r.addListener(n,"keydown",function(){B.schedule()})),r.addListener(n,"compositionend",H),this.getElement=function(){return n},this.setReadOnly=function(e){n.readOnly=e},this.onContextMenu=function(e){N=!0,w(t.selection.isEmpty()),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,o){d||(d=n.style.cssText),n.style.cssText=(o?"z-index:100000;":"")+"height:"+n.style.height+";"+(i.isIE?"opacity:0.1;":"");var u=t.container.getBoundingClientRect(),a=s.computedStyle(t.container),f=u.top+(parseInt(a.borderTopWidth)||0),l=u.left+(parseInt(u.borderLeftWidth)||0),c=u.bottom-f-n.clientHeight-2,h=function(e){n.style.left=e.clientX-l-2+"px",n.style.top=Math.min(e.clientY-f-2,c)+"px"};h(e);if(e.type!="mousedown")return;t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout(j),i.isWin&&r.capture(t.container,h,F)},this.onContextMenuClose=F;var j,I=function(e){t.textInput.onContextMenu(e),F()};r.addListener(n,"mouseup",I),r.addListener(n,"mousedown",function(e){e.preventDefault(),F()}),r.addListener(t.renderer.scroller,"contextmenu",I),r.addListener(n,"contextmenu",I)};t.TextInput=l}),ace.define("ace/mouse/default_handlers",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";function u(e){e.$clickSelection=null;var t=e.editor;t.setDefaultHandler("mousedown",this.onMouseDown.bind(e)),t.setDefaultHandler("dblclick",this.onDoubleClick.bind(e)),t.setDefaultHandler("tripleclick",this.onTripleClick.bind(e)),t.setDefaultHandler("quadclick",this.onQuadClick.bind(e)),t.setDefaultHandler("mousewheel",this.onMouseWheel.bind(e)),t.setDefaultHandler("touchmove",this.onTouchMove.bind(e));var n=["select","startSelect","selectEnd","selectAllEnd","selectByWordsEnd","selectByLinesEnd","dragWait","dragWaitEnd","focusWait"];n.forEach(function(t){e[t]=this[t]},this),e.selectByLines=this.extendSelectionBy.bind(e,"getLineRange"),e.selectByWords=this.extendSelectionBy.bind(e,"getWordRange")}function a(e,t,n,r){return Math.sqrt(Math.pow(n-e,2)+Math.pow(r-t,2))}function f(e,t){if(e.start.row==e.end.row)var n=2*t.column-e.start.column-e.end.column;else if(e.start.row==e.end.row-1&&!e.start.column&&!e.end.column)var n=t.column-4;else var n=2*t.row-e.start.row-e.end.row;return n<0?{cursor:e.start,anchor:e.end}:{cursor:e.end,anchor:e.start}}var r=e("../lib/dom"),i=e("../lib/event"),s=e("../lib/useragent"),o=0;(function(){this.onMouseDown=function(e){var t=e.inSelection(),n=e.getDocumentPosition();this.mousedownEvent=e;var r=this.editor,i=e.getButton();if(i!==0){var o=r.getSelectionRange(),u=o.isEmpty();r.$blockScrolling++,(u||i==1)&&r.selection.moveToPosition(n),r.$blockScrolling--,i==2&&(r.textInput.onContextMenu(e.domEvent),s.isMozilla||e.preventDefault());return}this.mousedownEvent.time=Date.now();if(t&&!r.isFocused()){r.focus();if(this.$focusTimout&&!this.$clickSelection&&!r.inMultiSelectMode){this.setState("focusWait"),this.captureMouse(e);return}}return this.captureMouse(e),this.startSelect(n,e.domEvent._clicks>1),e.preventDefault()},this.startSelect=function(e,t){e=e||this.editor.renderer.screenToTextCoordinates(this.x,this.y);var n=this.editor;n.$blockScrolling++,this.mousedownEvent.getShiftKey()?n.selection.selectToPosition(e):t||n.selection.moveToPosition(e),t||this.select(),n.renderer.scroller.setCapture&&n.renderer.scroller.setCapture(),n.setStyle("ace_selecting"),this.setState("select"),n.$blockScrolling--},this.select=function(){var e,t=this.editor,n=t.renderer.screenToTextCoordinates(this.x,this.y);t.$blockScrolling++;if(this.$clickSelection){var r=this.$clickSelection.comparePoint(n);if(r==-1)e=this.$clickSelection.end;else if(r==1)e=this.$clickSelection.start;else{var i=f(this.$clickSelection,n);n=i.cursor,e=i.anchor}t.selection.setSelectionAnchor(e.row,e.column)}t.selection.selectToPosition(n),t.$blockScrolling--,t.renderer.scrollCursorIntoView()},this.extendSelectionBy=function(e){var t,n=this.editor,r=n.renderer.screenToTextCoordinates(this.x,this.y),i=n.selection[e](r.row,r.column);n.$blockScrolling++;if(this.$clickSelection){var s=this.$clickSelection.comparePoint(i.start),o=this.$clickSelection.comparePoint(i.end);if(s==-1&&o<=0){t=this.$clickSelection.end;if(i.end.row!=r.row||i.end.column!=r.column)r=i.start}else if(o==1&&s>=0){t=this.$clickSelection.start;if(i.start.row!=r.row||i.start.column!=r.column)r=i.end}else if(s==-1&&o==1)r=i.end,t=i.start;else{var u=f(this.$clickSelection,r);r=u.cursor,t=u.anchor}n.selection.setSelectionAnchor(t.row,t.column)}n.selection.selectToPosition(r),n.$blockScrolling--,n.renderer.scrollCursorIntoView()},this.selectEnd=this.selectAllEnd=this.selectByWordsEnd=this.selectByLinesEnd=function(){this.$clickSelection=null,this.editor.unsetStyle("ace_selecting"),this.editor.renderer.scroller.releaseCapture&&this.editor.renderer.scroller.releaseCapture()},this.focusWait=function(){var e=a(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y),t=Date.now();(e>o||t-this.mousedownEvent.time>this.$focusTimout)&&this.startSelect(this.mousedownEvent.getDocumentPosition())},this.onDoubleClick=function(e){var t=e.getDocumentPosition(),n=this.editor,r=n.session,i=r.getBracketRange(t);i?(i.isEmpty()&&(i.start.column--,i.end.column++),this.setState("select")):(i=n.selection.getWordRange(t.row,t.column),this.setState("selectByWords")),this.$clickSelection=i,this.select()},this.onTripleClick=function(e){var t=e.getDocumentPosition(),n=this.editor;this.setState("selectByLines");var r=n.getSelectionRange();r.isMultiLine()&&r.contains(t.row,t.column)?(this.$clickSelection=n.selection.getLineRange(r.start.row),this.$clickSelection.end=n.selection.getLineRange(r.end.row).end):this.$clickSelection=n.selection.getLineRange(t.row),this.select()},this.onQuadClick=function(e){var t=this.editor;t.selectAll(),this.$clickSelection=t.getSelectionRange(),this.setState("selectAll")},this.onMouseWheel=function(e){if(e.getAccelKey())return;e.getShiftKey()&&e.wheelY&&!e.wheelX&&(e.wheelX=e.wheelY,e.wheelY=0);var t=e.domEvent.timeStamp,n=t-(this.$lastScrollTime||0),r=this.editor,i=r.renderer.isScrollableBy(e.wheelX*e.speed,e.wheelY*e.speed);if(i||n<200)return this.$lastScrollTime=t,r.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()},this.onTouchMove=function(e){var t=e.domEvent.timeStamp,n=t-(this.$lastScrollTime||0),r=this.editor,i=r.renderer.isScrollableBy(e.wheelX*e.speed,e.wheelY*e.speed);if(i||n<200)return this.$lastScrollTime=t,r.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()}}).call(u.prototype),t.DefaultHandlers=u}),ace.define("ace/tooltip",["require","exports","module","ace/lib/oop","ace/lib/dom"],function(e,t,n){"use strict";function s(e){this.isOpen=!1,this.$element=null,this.$parentNode=e}var r=e("./lib/oop"),i=e("./lib/dom");(function(){this.$init=function(){return this.$element=i.createElement("div"),this.$element.className="ace_tooltip",this.$element.style.display="none",this.$parentNode.appendChild(this.$element),this.$element},this.getElement=function(){return this.$element||this.$init()},this.setText=function(e){i.setInnerText(this.getElement(),e)},this.setHtml=function(e){this.getElement().innerHTML=e},this.setPosition=function(e,t){this.getElement().style.left=e+"px",this.getElement().style.top=t+"px"},this.setClassName=function(e){i.addCssClass(this.getElement(),e)},this.show=function(e,t,n){e!=null&&this.setText(e),t!=null&&n!=null&&this.setPosition(t,n),this.isOpen||(this.getElement().style.display="block",this.isOpen=!0)},this.hide=function(){this.isOpen&&(this.getElement().style.display="none",this.isOpen=!1)},this.getHeight=function(){return this.getElement().offsetHeight},this.getWidth=function(){return this.getElement().offsetWidth},this.destroy=function(){this.isOpen=!1,this.$element&&this.$element.parentNode&&this.$element.parentNode.removeChild(this.$element)}}).call(s.prototype),t.Tooltip=s}),ace.define("ace/mouse/default_gutter_handler",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event","ace/tooltip"],function(e,t,n){"use strict";function u(e){function l(){var r=u.getDocumentPosition().row,s=n.$annotations[r];if(!s)return c();var o=t.session.getLength();if(r==o){var a=t.renderer.pixelToScreenCoordinates(0,u.y).row,l=u.$pos;if(a>t.session.documentToScreenRow(l.row,l.column))return c()}if(f==s)return;f=s.text.join("<br/>"),i.setHtml(f),i.show(),t._signal("showGutterTooltip",i),t.on("mousewheel",c);if(e.$tooltipFollowsMouse)h(u);else{var p=u.domEvent.target,d=p.getBoundingClientRect(),v=i.getElement().style;v.left=d.right+"px",v.top=d.bottom+"px"}}function c(){o&&(o=clearTimeout(o)),f&&(i.hide(),f=null,t._signal("hideGutterTooltip",i),t.removeEventListener("mousewheel",c))}function h(e){i.setPosition(e.x,e.y)}var t=e.editor,n=t.renderer.$gutterLayer,i=new a(t.container);e.editor.setDefaultHandler("guttermousedown",function(r){if(!t.isFocused()||r.getButton()!=0)return;var i=n.getRegion(r);if(i=="foldWidgets")return;var s=r.getDocumentPosition().row,o=t.session.selection;if(r.getShiftKey())o.selectTo(s,0);else{if(r.domEvent.detail==2)return t.selectAll(),r.preventDefault();e.$clickSelection=t.selection.getLineRange(s)}return e.setState("selectByLines"),e.captureMouse(r),r.preventDefault()});var o,u,f;e.editor.setDefaultHandler("guttermousemove",function(t){var n=t.domEvent.target||t.domEvent.srcElement;if(r.hasCssClass(n,"ace_fold-widget"))return c();f&&e.$tooltipFollowsMouse&&h(t),u=t;if(o)return;o=setTimeout(function(){o=null,u&&!e.isMousePressed?l():c()},50)}),s.addListener(t.renderer.$gutter,"mouseout",function(e){u=null;if(!f||o)return;o=setTimeout(function(){o=null,c()},50)}),t.on("changeSession",c)}function a(e){o.call(this,e)}var r=e("../lib/dom"),i=e("../lib/oop"),s=e("../lib/event"),o=e("../tooltip").Tooltip;i.inherits(a,o),function(){this.setPosition=function(e,t){var n=window.innerWidth||document.documentElement.clientWidth,r=window.innerHeight||document.documentElement.clientHeight,i=this.getWidth(),s=this.getHeight();e+=15,t+=15,e+i>n&&(e-=e+i-n),t+s>r&&(t-=20+s),o.prototype.setPosition.call(this,e,t)}}.call(a.prototype),t.GutterHandler=u}),ace.define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=t.MouseEvent=function(e,t){this.domEvent=e,this.editor=t,this.x=this.clientX=e.clientX,this.y=this.clientY=e.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){r.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){r.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){return this.$pos?this.$pos:(this.$pos=this.editor.renderer.screenToTextCoordinates(this.clientX,this.clientY),this.$pos)},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var e=this.editor,t=e.getSelectionRange();if(t.isEmpty())this.$inSelection=!1;else{var n=this.getDocumentPosition();this.$inSelection=t.contains(n.row,n.column)}return this.$inSelection},this.getButton=function(){return r.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=i.isMac?function(){return this.domEvent.metaKey}:function(){return this.domEvent.ctrlKey}}).call(s.prototype)}),ace.define("ace/mouse/dragdrop_handler",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";function f(e){function T(e,n){var r=Date.now(),i=!n||e.row!=n.row,s=!n||e.column!=n.column;if(!S||i||s)t.$blockScrolling+=1,t.moveCursorToPosition(e),t.$blockScrolling-=1,S=r,x={x:p,y:d};else{var o=l(x.x,x.y,p,d);o>a?S=null:r-S>=u&&(t.renderer.scrollCursorIntoView(),S=null)}}function N(e,n){var r=Date.now(),i=t.renderer.layerConfig.lineHeight,s=t.renderer.layerConfig.characterWidth,u=t.renderer.scroller.getBoundingClientRect(),a={x:{left:p-u.left,right:u.right-p},y:{top:d-u.top,bottom:u.bottom-d}},f=Math.min(a.x.left,a.x.right),l=Math.min(a.y.top,a.y.bottom),c={row:e.row,column:e.column};f/s<=2&&(c.column+=a.x.left<a.x.right?-3:2),l/i<=1&&(c.row+=a.y.top<a.y.bottom?-1:1);var h=e.row!=c.row,v=e.column!=c.column,m=!n||e.row!=n.row;h||v&&!m?E?r-E>=o&&t.renderer.scrollCursorIntoView(c):E=r:E=null}function C(){var e=g;g=t.renderer.screenToTextCoordinates(p,d),T(g,e),N(g,e)}function k(){m=t.selection.toOrientedRange(),h=t.session.addMarker(m,"ace_selection",t.getSelectionStyle()),t.clearSelection(),t.isFocused()&&t.renderer.$cursorLayer.setBlinking(!1),clearInterval(v),C(),v=setInterval(C,20),y=0,i.addListener(document,"mousemove",O)}function L(){clearInterval(v),t.session.removeMarker(h),h=null,t.$blockScrolling+=1,t.selection.fromOrientedRange(m),t.$blockScrolling-=1,t.isFocused()&&!w&&t.renderer.$cursorLayer.setBlinking(!t.getReadOnly()),m=null,g=null,y=0,E=null,S=null,i.removeListener(document,"mousemove",O)}function O(){A==null&&(A=setTimeout(function(){A!=null&&h&&L()},20))}function M(e){var t=e.types;return!t||Array.prototype.some.call(t,function(e){return e=="text/plain"||e=="Text"})}function _(e){var t=["copy","copymove","all","uninitialized"],n=["move","copymove","linkmove","all","uninitialized"],r=s.isMac?e.altKey:e.ctrlKey,i="uninitialized";try{i=e.dataTransfer.effectAllowed.toLowerCase()}catch(e){}var o="none";return r&&t.indexOf(i)>=0?o="copy":n.indexOf(i)>=0?o="move":t.indexOf(i)>=0&&(o="copy"),o}var t=e.editor,n=r.createElement("img");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",s.isOpera&&(n.style.cssText="width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;");var f=["dragWait","dragWaitEnd","startDrag","dragReadyEnd","onMouseDrag"];f.forEach(function(t){e[t]=this[t]},this),t.addEventListener("mousedown",this.onMouseDown.bind(e));var c=t.container,h,p,d,v,m,g,y=0,b,w,E,S,x;this.onDragStart=function(e){if(this.cancelDrag||!c.draggable){var r=this;return setTimeout(function(){r.startSelect(),r.captureMouse(e)},0),e.preventDefault()}m=t.getSelectionRange();var i=e.dataTransfer;i.effectAllowed=t.getReadOnly()?"copy":"copyMove",s.isOpera&&(t.container.appendChild(n),n.scrollTop=0),i.setDragImage&&i.setDragImage(n,0,0),s.isOpera&&t.container.removeChild(n),i.clearData(),i.setData("Text",t.session.getTextRange()),w=!0,this.setState("drag")},this.onDragEnd=function(e){c.draggable=!1,w=!1,this.setState(null);if(!t.getReadOnly()){var n=e.dataTransfer.dropEffect;!b&&n=="move"&&t.session.remove(t.getSelectionRange()),t.renderer.$cursorLayer.setBlinking(!0)}this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle("")},this.onDragEnter=function(e){if(t.getReadOnly()||!M(e.dataTransfer))return;return p=e.clientX,d=e.clientY,h||k(),y++,e.dataTransfer.dropEffect=b=_(e),i.preventDefault(e)},this.onDragOver=function(e){if(t.getReadOnly()||!M(e.dataTransfer))return;return p=e.clientX,d=e.clientY,h||(k(),y++),A!==null&&(A=null),e.dataTransfer.dropEffect=b=_(e),i.preventDefault(e)},this.onDragLeave=function(e){y--;if(y<=0&&h)return L(),b=null,i.preventDefault(e)},this.onDrop=function(e){if(!g)return;var n=e.dataTransfer;if(w)switch(b){case"move":m.contains(g.row,g.column)?m={start:g,end:g}:m=t.moveText(m,g);break;case"copy":m=t.moveText(m,g,!0)}else{var r=n.getData("Text");m={start:g,end:t.session.insert(g,r)},t.focus(),b=null}return L(),i.preventDefault(e)},i.addListener(c,"dragstart",this.onDragStart.bind(e)),i.addListener(c,"dragend",this.onDragEnd.bind(e)),i.addListener(c,"dragenter",this.onDragEnter.bind(e)),i.addListener(c,"dragover",this.onDragOver.bind(e)),i.addListener(c,"dragleave",this.onDragLeave.bind(e)),i.addListener(c,"drop",this.onDrop.bind(e));var A=null}function l(e,t,n,r){return Math.sqrt(Math.pow(n-e,2)+Math.pow(r-t,2))}var r=e("../lib/dom"),i=e("../lib/event"),s=e("../lib/useragent"),o=200,u=200,a=5;(function(){this.dragWait=function(){var e=Date.now()-this.mousedownEvent.time;e>this.editor.getDragDelay()&&this.startDrag()},this.dragWaitEnd=function(){var e=this.editor.container;e.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()),this.selectEnd()},this.dragReadyEnd=function(e){this.editor.renderer.$cursorLayer.setBlinking(!this.editor.getReadOnly()),this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle(""),this.dragWaitEnd()},this.startDrag=function(){this.cancelDrag=!1;var e=this.editor,t=e.container;t.draggable=!0,e.renderer.$cursorLayer.setBlinking(!1),e.setStyle("ace_dragging");var n=s.isWin?"default":"move";e.renderer.setCursorStyle(n),this.setState("dragReady")},this.onMouseDrag=function(e){var t=this.editor.container;if(s.isIE&&this.state=="dragReady"){var n=l(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y);n>3&&t.dragDrop()}if(this.state==="dragWait"){var n=l(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y);n>0&&(t.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()))}},this.onMouseDown=function(e){if(!this.$dragEnabled)return;this.mousedownEvent=e;var t=this.editor,n=e.inSelection(),r=e.getButton(),i=e.domEvent.detail||1;if(i===1&&r===0&&n){if(e.editor.inMultiSelectMode&&(e.getAccelKey()||e.getShiftKey()))return;this.mousedownEvent.time=Date.now();var o=e.domEvent.target||e.domEvent.srcElement;"unselectable"in o&&(o.unselectable="on");if(t.getDragDelay()){if(s.isWebKit){this.cancelDrag=!0;var u=t.container;u.draggable=!0}this.setState("dragWait")}else this.startDrag();this.captureMouse(e,this.onMouseDrag.bind(this)),e.defaultPrevented=!0}}}).call(f.prototype),t.DragdropHandler=f}),ace.define("ace/lib/net",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("./dom");t.get=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.onreadystatechange=function(){n.readyState===4&&t(n.responseText)},n.send(null)},t.loadScript=function(e,t){var n=r.getDocumentHead(),i=document.createElement("script");i.src=e,n.appendChild(i),i.onload=i.onreadystatechange=function(e,n){if(n||!i.readyState||i.readyState=="loaded"||i.readyState=="complete")i=i.onload=i.onreadystatechange=null,n||t()}},t.qualifyURL=function(e){var t=document.createElement("a");return t.href=e,t.href}}),ace.define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),ace.define("ace/lib/app_config",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"no use strict";function o(e){typeof console!="undefined"&&console.warn&&console.warn.apply(console,arguments)}function u(e,t){var n=new Error(e);n.data=t,typeof console=="object"&&console.error&&console.error(n),setTimeout(function(){throw n})}var r=e("./oop"),i=e("./event_emitter").EventEmitter,s={setOptions:function(e){Object.keys(e).forEach(function(t){this.setOption(t,e[t])},this)},getOptions:function(e){var t={};return e?Array.isArray(e)||(t=e,e=Object.keys(t)):e=Object.keys(this.$options),e.forEach(function(e){t[e]=this.getOption(e)},this),t},setOption:function(e,t){if(this["$"+e]===t)return;var n=this.$options[e];if(!n)return o('misspelled option "'+e+'"');if(n.forwardTo)return this[n.forwardTo]&&this[n.forwardTo].setOption(e,t);n.handlesSet||(this["$"+e]=t),n&&n.set&&n.set.call(this,t)},getOption:function(e){var t=this.$options[e];return t?t.forwardTo?this[t.forwardTo]&&this[t.forwardTo].getOption(e):t&&t.get?t.get.call(this):this["$"+e]:o('misspelled option "'+e+'"')}},a=function(){this.$defaultOptions={}};(function(){r.implement(this,i),this.defineOptions=function(e,t,n){return e.$options||(this.$defaultOptions[t]=e.$options={}),Object.keys(n).forEach(function(t){var r=n[t];typeof r=="string"&&(r={forwardTo:r}),r.name||(r.name=t),e.$options[r.name]=r,"initialValue"in r&&(e["$"+r.name]=r.initialValue)}),r.implement(e,s),this},this.resetOptions=function(e){Object.keys(e.$options).forEach(function(t){var n=e.$options[t];"value"in n&&e.setOption(t,n.value)})},this.setDefaultValue=function(e,t,n){var r=this.$defaultOptions[e]||(this.$defaultOptions[e]={});r[t]&&(r.forwardTo?this.setDefaultValue(r.forwardTo,t,n):r[t].value=n)},this.setDefaultValues=function(e,t){Object.keys(t).forEach(function(n){this.setDefaultValue(e,n,t[n])},this)},this.warn=o,this.reportError=u}).call(a.prototype),t.AppConfig=a}),ace.define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/app_config"],function(e,t,n){"no use strict";function f(r){if(!u||!u.document)return;a.packaged=r||e.packaged||n.packaged||u.define&&define.packaged;var i={},s="",o=document.currentScript||document._currentScript,f=o&&o.ownerDocument||document,c=f.getElementsByTagName("script");for(var h=0;h<c.length;h++){var p=c[h],d=p.src||p.getAttribute("src");if(!d)continue;var v=p.attributes;for(var m=0,g=v.length;m<g;m++){var y=v[m];y.name.indexOf("data-ace-")===0&&(i[l(y.name.replace(/^data-ace-/,""))]=y.value)}var b=d.match(/^(.*)\/ace(\-\w+)?\.js(\?|$)/);b&&(s=b[1])}s&&(i.base=i.base||s,i.packaged=!0),i.basePath=i.base,i.workerPath=i.workerPath||i.base,i.modePath=i.modePath||i.base,i.themePath=i.themePath||i.base,delete i.base;for(var w in i)typeof i[w]!="undefined"&&t.set(w,i[w])}function l(e){return e.replace(/-(.)/g,function(e,t){return t.toUpperCase()})}var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./lib/net"),o=e("./lib/app_config").AppConfig;n.exports=t=new o;var u=function(){return this||typeof window!="undefined"&&window}(),a={packaged:!1,workerPath:null,modePath:null,themePath:null,basePath:"",suffix:".js",$moduleUrls:{}};t.get=function(e){if(!a.hasOwnProperty(e))throw new Error("Unknown config key: "+e);return a[e]},t.set=function(e,t){if(!a.hasOwnProperty(e))throw new Error("Unknown config key: "+e);a[e]=t},t.all=function(){return r.copyObject(a)},t.moduleUrl=function(e,t){if(a.$moduleUrls[e])return a.$moduleUrls[e];var n=e.split("/");t=t||n[n.length-2]||"";var r=t=="snippets"?"/":"-",i=n[n.length-1];if(t=="worker"&&r=="-"){var s=new RegExp("^"+t+"[\\-_]|[\\-_]"+t+"$","g");i=i.replace(s,"")}(!i||i==t)&&n.length>1&&(i=n[n.length-2]);var o=a[t+"Path"];return o==null?o=a.basePath:r=="/"&&(t=r=""),o&&o.slice(-1)!="/"&&(o+="/"),o+t+r+i+this.get("suffix")},t.setModuleUrl=function(e,t){return a.$moduleUrls[e]=t},t.$loading={},t.loadModule=function(n,r){var i,o;Array.isArray(n)&&(o=n[0],n=n[1]);try{i=e(n)}catch(u){}if(i&&!t.$loading[n])return r&&r(i);t.$loading[n]||(t.$loading[n]=[]),t.$loading[n].push(r);if(t.$loading[n].length>1)return;var a=function(){e([n],function(e){t._emit("load.module",{name:n,module:e});var r=t.$loading[n];t.$loading[n]=null,r.forEach(function(t){t&&t(e)})})};if(!t.get("packaged"))return a();s.loadScript(t.moduleUrl(n,o),a)},t.init=f}),ace.define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event","ace/mouse/dragdrop_handler","ace/config"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("./default_handlers").DefaultHandlers,o=e("./default_gutter_handler").GutterHandler,u=e("./mouse_event").MouseEvent,a=e("./dragdrop_handler").DragdropHandler,f=e("../config"),l=function(e){var t=this;this.editor=e,new s(this),new o(this),new a(this);var n=function(t){var n=!document.hasFocus||!document.hasFocus()||!e.isFocused()&&document.activeElement==(e.textInput&&e.textInput.getElement());n&&window.focus(),e.focus()},u=e.renderer.getMouseEventTarget();r.addListener(u,"click",this.onMouseEvent.bind(this,"click")),r.addListener(u,"mousemove",this.onMouseMove.bind(this,"mousemove")),r.addMultiMouseDownListener([u,e.renderer.scrollBarV&&e.renderer.scrollBarV.inner,e.renderer.scrollBarH&&e.renderer.scrollBarH.inner,e.textInput&&e.textInput.getElement()].filter(Boolean),[400,300,250],this,"onMouseEvent"),r.addMouseWheelListener(e.container,this.onMouseWheel.bind(this,"mousewheel")),r.addTouchMoveListener(e.container,this.onTouchMove.bind(this,"touchmove"));var f=e.renderer.$gutter;r.addListener(f,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),r.addListener(f,"click",this.onMouseEvent.bind(this,"gutterclick")),r.addListener(f,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),r.addListener(f,"mousemove",this.onMouseEvent.bind(this,"guttermousemove")),r.addListener(u,"mousedown",n),r.addListener(f,"mousedown",n),i.isIE&&e.renderer.scrollBarV&&(r.addListener(e.renderer.scrollBarV.element,"mousedown",n),r.addListener(e.renderer.scrollBarH.element,"mousedown",n)),e.on("mousemove",function(n){if(t.state||t.$dragDelay||!t.$dragEnabled)return;var r=e.renderer.screenToTextCoordinates(n.x,n.y),i=e.session.selection.getRange(),s=e.renderer;!i.isEmpty()&&i.insideStart(r.row,r.column)?s.setCursorStyle("default"):s.setCursorStyle("")})};(function(){this.onMouseEvent=function(e,t){this.editor._emit(e,new u(t,this.editor))},this.onMouseMove=function(e,t){var n=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!n||!n.length)return;this.editor._emit(e,new u(t,this.editor))},this.onMouseWheel=function(e,t){var n=new u(t,this.editor);n.speed=this.$scrollSpeed*2,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.onTouchMove=function(e,t){var n=new u(t,this.editor);n.speed=1,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.setState=function(e){this.state=e},this.captureMouse=function(e,t){this.x=e.x,this.y=e.y,this.isMousePressed=!0;var n=this.editor.renderer;n.$keepTextAreaAtCursor&&(n.$keepTextAreaAtCursor=null);var s=this,o=function(e){if(!e)return;if(i.isWebKit&&!e.which&&s.releaseMouse)return s.releaseMouse();s.x=e.clientX,s.y=e.clientY,t&&t(e),s.mouseEvent=new u(e,s.editor),s.$mouseMoved=!0},a=function(e){clearInterval(l),f(),s[s.state+"End"]&&s[s.state+"End"](e),s.state="",n.$keepTextAreaAtCursor==null&&(n.$keepTextAreaAtCursor=!0,n.$moveTextAreaToCursor()),s.isMousePressed=!1,s.$onCaptureMouseMove=s.releaseMouse=null,e&&s.onMouseEvent("mouseup",e)},f=function(){s[s.state]&&s[s.state](),s.$mouseMoved=!1};if(i.isOldIE&&e.domEvent.type=="dblclick")return setTimeout(function(){a(e)});s.$onCaptureMouseMove=o,s.releaseMouse=r.capture(this.editor.container,o,a);var l=setInterval(f,20)},this.releaseMouse=null,this.cancelContextMenu=function(){var e=function(t){if(t&&t.domEvent&&t.domEvent.type!="contextmenu")return;this.editor.off("nativecontextmenu",e),t&&t.domEvent&&r.stopEvent(t.domEvent)}.bind(this);setTimeout(e,10),this.editor.on("nativecontextmenu",e)}}).call(l.prototype),f.defineOptions(l.prototype,"mouseHandler",{scrollSpeed:{initialValue:2},dragDelay:{initialValue:i.isMac?150:0},dragEnabled:{initialValue:!0},focusTimout:{initialValue:0},tooltipFollowsMouse:{initialValue:!0}}),t.MouseHandler=l}),ace.define("ace/mouse/fold_handler",["require","exports","module"],function(e,t,n){"use strict";function r(e){e.on("click",function(t){var n=t.getDocumentPosition(),r=e.session,i=r.getFoldAt(n.row,n.column,1);i&&(t.getAccelKey()?r.removeFold(i):r.expandFold(i),t.stop())}),e.on("gutterclick",function(t){var n=e.renderer.$gutterLayer.getRegion(t);if(n=="foldWidgets"){var r=t.getDocumentPosition().row,i=e.session;i.foldWidgets&&i.foldWidgets[r]&&e.session.onFoldWidgetClick(r,t),e.isFocused()||e.focus(),t.stop()}}),e.on("gutterdblclick",function(t){var n=e.renderer.$gutterLayer.getRegion(t);if(n=="foldWidgets"){var r=t.getDocumentPosition().row,i=e.session,s=i.getParentFoldRangeData(r,!0),o=s.range||s.firstRange;if(o){r=o.start.row;var u=i.getFoldAt(r,i.getLine(r).length,1);u?i.removeFold(u):(i.addFold("...",o),e.renderer.scrollCursorIntoView({row:o.start.row,column:0}))}t.stop()}})}t.FoldHandler=r}),ace.define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event"],function(e,t,n){"use strict";var r=e("../lib/keys"),i=e("../lib/event"),s=function(e){this.$editor=e,this.$data={editor:e},this.$handlers=[],this.setDefaultHandler(e.commands)};(function(){this.setDefaultHandler=function(e){this.removeKeyboardHandler(this.$defaultHandler),this.$defaultHandler=e,this.addKeyboardHandler(e,0)},this.setKeyboardHandler=function(e){var t=this.$handlers;if(t[t.length-1]==e)return;while(t[t.length-1]&&t[t.length-1]!=this.$defaultHandler)this.removeKeyboardHandler(t[t.length-1]);this.addKeyboardHandler(e,1)},this.addKeyboardHandler=function(e,t){if(!e)return;typeof e=="function"&&!e.handleKeyboard&&(e.handleKeyboard=e);var n=this.$handlers.indexOf(e);n!=-1&&this.$handlers.splice(n,1),t==undefined?this.$handlers.push(e):this.$handlers.splice(t,0,e),n==-1&&e.attach&&e.attach(this.$editor)},this.removeKeyboardHandler=function(e){var t=this.$handlers.indexOf(e);return t==-1?!1:(this.$handlers.splice(t,1),e.detach&&e.detach(this.$editor),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.getStatusText=function(){var e=this.$data,t=e.editor;return this.$handlers.map(function(n){return n.getStatusText&&n.getStatusText(t,e)||""}).filter(Boolean).join(" ")},this.$callKeyboardHandlers=function(e,t,n,r){var s,o=!1,u=this.$editor.commands;for(var a=this.$handlers.length;a--;){s=this.$handlers[a].handleKeyboard(this.$data,e,t,n,r);if(!s||!s.command)continue;s.command=="null"?o=!0:o=u.exec(s.command,this.$editor,s.args,r),o&&r&&e!=-1&&s.passEvent!=1&&s.command.passEvent!=1&&i.stopEvent(r);if(o)break}return!o&&e==-1&&(s={command:"insertstring"},o=u.exec("insertstring",this.$editor,t)),o&&this.$editor._signal&&this.$editor._signal("keyboardActivity",s),o},this.onCommandKey=function(e,t,n){var i=r.keyCodeToString(n);this.$callKeyboardHandlers(t,i,n,e)},this.onTextInput=function(e){this.$callKeyboardHandlers(-1,e)}}).call(s.prototype),t.KeyBinding=s}),ace.define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),ace.define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=function(e){this.session=e,this.doc=e.getDocument(),this.clearSelection(),this.lead=this.selectionLead=this.doc.createAnchor(0,0),this.anchor=this.selectionAnchor=this.doc.createAnchor(0,0);var t=this;this.lead.on("change",function(e){t._emit("changeCursor"),t.$isEmpty||t._emit("changeSelection"),!t.$keepDesiredColumnOnChange&&e.old.column!=e.value.column&&(t.$desiredColumn=null)}),this.selectionAnchor.on("change",function(){t.$isEmpty||t._emit("changeSelection")})};(function(){r.implement(this,s),this.isEmpty=function(){return this.$isEmpty||this.anchor.row==this.lead.row&&this.anchor.column==this.lead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.lead.getPosition()},this.setSelectionAnchor=function(e,t){this.anchor.setPosition(e,t),this.$isEmpty&&(this.$isEmpty=!1,this._emit("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.anchor.getPosition()},this.getSelectionLead=function(){return this.lead.getPosition()},this.shiftSelection=function(e){if(this.$isEmpty){this.moveCursorTo(this.lead.row,this.lead.column+e);return}var t=this.getSelectionAnchor(),n=this.getSelectionLead(),r=this.isBackwards();(!r||t.column!==0)&&this.setSelectionAnchor(t.row,t.column+e),(r||n.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(n.row,n.column+e)})},this.isBackwards=function(){var e=this.anchor,t=this.lead;return e.row>t.row||e.row==t.row&&e.column>t.column},this.getRange=function(){var e=this.anchor,t=this.lead;return this.isEmpty()?o.fromPoints(t,t):this.isBackwards()?o.fromPoints(t,e):o.fromPoints(e,t)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){var e=this.doc.getLength()-1;this.setSelectionAnchor(0,0),this.moveCursorTo(e,this.doc.getLine(e).length)},this.setRange=this.setSelectionRange=function(e,t){t?(this.setSelectionAnchor(e.end.row,e.end.column),this.selectTo(e.start.row,e.start.column)):(this.setSelectionAnchor(e.start.row,e.start.column),this.selectTo(e.end.row,e.end.column)),this.getRange().isEmpty()&&(this.$isEmpty=!0),this.$desiredColumn=null},this.$moveSelection=function(e){var t=this.lead;this.$isEmpty&&this.setSelectionAnchor(t.row,t.column),e.call(this)},this.selectTo=function(e,t){this.$moveSelection(function(){this.moveCursorTo(e,t)})},this.selectToPosition=function(e){this.$moveSelection(function(){this.moveCursorToPosition(e)})},this.moveTo=function(e,t){this.clearSelection(),this.moveCursorTo(e,t)},this.moveToPosition=function(e){this.clearSelection(),this.moveCursorToPosition(e)},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.getWordRange=function(e,t){if(typeof t=="undefined"){var n=e||this.lead;e=n.row,t=n.column}return this.session.getWordRange(e,t)},this.selectWord=function(){this.setSelectionRange(this.getWordRange())},this.selectAWord=function(){var e=this.getCursor(),t=this.session.getAWordRange(e.row,e.column);this.setSelectionRange(t)},this.getLineRange=function(e,t){var n=typeof e=="number"?e:this.lead.row,r,i=this.session.getFoldLine(n);return i?(n=i.start.row,r=i.end.row):r=n,t===!0?new o(n,0,r,this.session.getLine(r).length):new o(n,0,r+1,0)},this.selectLine=function(){this.setSelectionRange(this.getLineRange())},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.wouldMoveIntoSoftTab=function(e,t,n){var r=e.column,i=e.column+t;return n<0&&(r=e.column-t,i=e.column),this.session.isTabStop(e)&&this.doc.getLine(e.row).slice(r,i).split(" ").length-1==t},this.moveCursorLeft=function(){var e=this.lead.getPosition(),t;if(t=this.session.getFoldAt(e.row,e.column,-1))this.moveCursorTo(t.start.row,t.start.column);else if(e.column===0)e.row>0&&this.moveCursorTo(e.row-1,this.doc.getLine(e.row-1).length);else{var n=this.session.getTabSize();this.wouldMoveIntoSoftTab(e,n,-1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,-n):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var e=this.lead.getPosition(),t;if(t=this.session.getFoldAt(e.row,e.column,1))this.moveCursorTo(t.end.row,t.end.column);else if(this.lead.column==this.doc.getLine(this.lead.row).length)this.lead.row<this.doc.getLength()-1&&this.moveCursorTo(this.lead.row+1,0);else{var n=this.session.getTabSize(),e=this.lead;this.wouldMoveIntoSoftTab(e,n,1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,n):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var e=this.lead.row,t=this.lead.column,n=this.session.documentToScreenRow(e,t),r=this.session.screenToDocumentPosition(n,0),i=this.session.getDisplayLine(e,null,r.row,r.column),s=i.match(/^\s*/);s[0].length!=t&&!this.session.$useEmacsStyleLineStart&&(r.column+=s[0].length),this.moveCursorToPosition(r)},this.moveCursorLineEnd=function(){var e=this.lead,t=this.session.getDocumentLastRowColumnPosition(e.row,e.column);if(this.lead.column==t.column){var n=this.session.getLine(t.row);if(t.column==n.length){var r=n.search(/\s+$/);r>0&&(t.column=r)}}this.moveCursorTo(t.row,t.column)},this.moveCursorFileEnd=function(){var e=this.doc.getLength()-1,t=this.doc.getLine(e).length;this.moveCursorTo(e,t)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorLongWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),r=n.substring(t),i;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var s=this.session.getFoldAt(e,t,1);if(s){this.moveCursorTo(s.end.row,s.end.column);return}if(i=this.session.nonTokenRe.exec(r))t+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,r=n.substring(t);if(t>=n.length){this.moveCursorTo(e,n.length),this.moveCursorRight(),e<this.doc.getLength()-1&&this.moveCursorWordRight();return}if(i=this.session.tokenRe.exec(r))t+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(e,t)},this.moveCursorLongWordLeft=function(){var e=this.lead.row,t=this.lead.column,n;if(n=this.session.getFoldAt(e,t,-1)){this.moveCursorTo(n.start.row,n.start.column);return}var r=this.session.getFoldStringAt(e,t,-1);r==null&&(r=this.doc.getLine(e).substring(0,t));var s=i.stringReverse(r),o;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(o=this.session.nonTokenRe.exec(s))t-=this.session.nonTokenRe.lastIndex,s=s.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0;if(t<=0){this.moveCursorTo(e,0),this.moveCursorLeft(),e>0&&this.moveCursorWordLeft();return}if(o=this.session.tokenRe.exec(s))t-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(e,t)},this.$shortWordEndIndex=function(e){var t,n=0,r,i=/\s/,s=this.session.tokenRe;s.lastIndex=0;if(t=this.session.tokenRe.exec(e))n=this.session.tokenRe.lastIndex;else{while((r=e[n])&&i.test(r))n++;if(n<1){s.lastIndex=0;while((r=e[n])&&!s.test(r)){s.lastIndex=0,n++;if(i.test(r)){if(n>2){n--;break}while((r=e[n])&&i.test(r))n++;if(n>2)break}}}}return s.lastIndex=0,n},this.moveCursorShortWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),r=n.substring(t),i=this.session.getFoldAt(e,t,1);if(i)return this.moveCursorTo(i.end.row,i.end.column);if(t==n.length){var s=this.doc.getLength();do e++,r=this.doc.getLine(e);while(e<s&&/^\s*$/.test(r));/^\s+/.test(r)||(r=""),t=0}var o=this.$shortWordEndIndex(r);this.moveCursorTo(e,t+o)},this.moveCursorShortWordLeft=function(){var e=this.lead.row,t=this.lead.column,n;if(n=this.session.getFoldAt(e,t,-1))return this.moveCursorTo(n.start.row,n.start.column);var r=this.session.getLine(e).substring(0,t);if(t===0){do e--,r=this.doc.getLine(e);while(e>0&&/^\s*$/.test(r));t=r.length,/\s+$/.test(r)||(r="")}var s=i.stringReverse(r),o=this.$shortWordEndIndex(s);return this.moveCursorTo(e,t-o)},this.moveCursorWordRight=function(){this.session.$selectLongWords?this.moveCursorLongWordRight():this.moveCursorShortWordRight()},this.moveCursorWordLeft=function(){this.session.$selectLongWords?this.moveCursorLongWordLeft():this.moveCursorShortWordLeft()},this.moveCursorBy=function(e,t){var n=this.session.documentToScreenPosition(this.lead.row,this.lead.column);t===0&&(this.$desiredColumn?n.column=this.$desiredColumn:this.$desiredColumn=n.column);var r=this.session.screenToDocumentPosition(n.row+e,n.column);e!==0&&t===0&&r.row===this.lead.row&&r.column===this.lead.column&&this.session.lineWidgets&&this.session.lineWidgets[r.row]&&(r.row>0||e>0)&&r.row++,this.moveCursorTo(r.row,r.column+t,t===0)},this.moveCursorToPosition=function(e){this.moveCursorTo(e.row,e.column)},this.moveCursorTo=function(e,t,n){var r=this.session.getFoldAt(e,t,1);r&&(e=r.start.row,t=r.start.column),this.$keepDesiredColumnOnChange=!0,this.lead.setPosition(e,t),this.$keepDesiredColumnOnChange=!1,n||(this.$desiredColumn=null)},this.moveCursorToScreen=function(e,t,n){var r=this.session.screenToDocumentPosition(e,t);this.moveCursorTo(r.row,r.column,n)},this.detach=function(){this.lead.detach(),this.anchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(e){this.setSelectionRange(e,e.cursor==e.start),this.$desiredColumn=e.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(e){var t=this.getRange();return e?(e.start.column=t.start.column,e.start.row=t.start.row,e.end.column=t.end.column,e.end.row=t.end.row):e=t,e.cursor=this.isBackwards()?e.start:e.end,e.desiredColumn=this.$desiredColumn,e},this.getRangeOfMovements=function(e){var t=this.getCursor();try{e(this);var n=this.getCursor();return o.fromPoints(t,n)}catch(r){return o.fromPoints(t,t)}finally{this.moveCursorToPosition(t)}},this.toJSON=function(){if(this.rangeCount)var e=this.ranges.map(function(e){var t=e.clone();return t.isBackwards=e.cursor==e.start,t});else{var e=this.getRange();e.isBackwards=this.isBackwards()}return e},this.fromJSON=function(e){if(e.start==undefined){if(this.rangeList){this.toSingleRange(e[0]);for(var t=e.length;t--;){var n=o.fromPoints(e[t].start,e[t].end);e[t].isBackwards&&(n.cursor=n.start),this.addRange(n,!0)}return}e=e[0]}this.rangeList&&this.toSingleRange(e),this.setSelectionRange(e,e.isBackwards)},this.isEqual=function(e){if((e.length||this.rangeCount)&&e.length!=this.rangeCount)return!1;if(!e.length||!this.ranges)return this.getRange().isEqual(e);for(var t=this.ranges.length;t--;)if(!this.ranges[t].isEqual(e[t]))return!1;return!0}}).call(u.prototype),t.Selection=u}),ace.define("ace/tokenizer",["require","exports","module","ace/config"],function(e,t,n){"use strict";var r=e("./config"),i=2e3,s=function(e){this.states=e,this.regExps={},this.matchMappings={};for(var t in this.states){var n=this.states[t],r=[],i=0,s=this.matchMappings[t]={defaultToken:"text"},o="g",u=[];for(var a=0;a<n.length;a++){var f=n[a];f.defaultToken&&(s.defaultToken=f.defaultToken),f.caseInsensitive&&(o="gi");if(f.regex==null)continue;f.regex instanceof RegExp&&(f.regex=f.regex.toString().slice(1,-1));var l=f.regex,c=(new RegExp("(?:("+l+")|(.))")).exec("a").length-2;Array.isArray(f.token)?f.token.length==1||c==1?f.token=f.token[0]:c-1!=f.token.length?(this.reportError("number of classes and regexp groups doesn't match",{rule:f,groupCount:c-1}),f.token=f.token[0]):(f.tokenArray=f.token,f.token=null,f.onMatch=this.$arrayTokens):typeof f.token=="function"&&!f.onMatch&&(c>1?f.onMatch=this.$applyToken:f.onMatch=f.token),c>1&&(/\\\d/.test(f.regex)?l=f.regex.replace(/\\([0-9]+)/g,function(e,t){return"\\"+(parseInt(t,10)+i+1)}):(c=1,l=this.removeCapturingGroups(f.regex)),!f.splitRegex&&typeof f.token!="string"&&u.push(f)),s[i]=a,i+=c,r.push(l),f.onMatch||(f.onMatch=null)}r.length||(s[0]=0,r.push("$")),u.forEach(function(e){e.splitRegex=this.createSplitterRegexp(e.regex,o)},this),this.regExps[t]=new RegExp("("+r.join(")|(")+")|($)",o)}};(function(){this.$setMaxTokenCount=function(e){i=e|0},this.$applyToken=function(e){var t=this.splitRegex.exec(e).slice(1),n=this.token.apply(this,t);if(typeof n=="string")return[{type:n,value:e}];var r=[];for(var i=0,s=n.length;i<s;i++)t[i]&&(r[r.length]={type:n[i],value:t[i]});return r},this.$arrayTokens=function(e){if(!e)return[];var t=this.splitRegex.exec(e);if(!t)return"text";var n=[],r=this.tokenArray;for(var i=0,s=r.length;i<s;i++)t[i+1]&&(n[n.length]={type:r[i],value:t[i+1]});return n},this.removeCapturingGroups=function(e){var t=e.replace(/\[(?:\\.|[^\]])*?\]|\\.|\(\?[:=!]|(\()/g,function(e,t){return t?"(?:":e});return t},this.createSplitterRegexp=function(e,t){if(e.indexOf("(?=")!=-1){var n=0,r=!1,i={};e.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g,function(e,t,s,o,u,a){return r?r=u!="]":u?r=!0:o?(n==i.stack&&(i.end=a+1,i.stack=-1),n--):s&&(n++,s.length!=1&&(i.stack=n,i.start=a)),e}),i.end!=null&&/^\)*$/.test(e.substr(i.end))&&(e=e.substring(0,i.start)+e.substr(i.end))}return e.charAt(0)!="^"&&(e="^"+e),e.charAt(e.length-1)!="$"&&(e+="$"),new RegExp(e,(t||"").replace("g",""))},this.getLineTokens=function(e,t){if(t&&typeof t!="string"){var n=t.slice(0);t=n[0],t==="#tmp"&&(n.shift(),t=n.shift())}else var n=[];var r=t||"start",s=this.states[r];s||(r="start",s=this.states[r]);var o=this.matchMappings[r],u=this.regExps[r];u.lastIndex=0;var a,f=[],l=0,c=0,h={type:null,value:""};while(a=u.exec(e)){var p=o.defaultToken,d=null,v=a[0],m=u.lastIndex;if(m-v.length>l){var g=e.substring(l,m-v.length);h.type==p?h.value+=g:(h.type&&f.push(h),h={type:p,value:g})}for(var y=0;y<a.length-2;y++){if(a[y+1]===undefined)continue;d=s[o[y]],d.onMatch?p=d.onMatch(v,r,n,e):p=d.token,d.next&&(typeof d.next=="string"?r=d.next:r=d.next(r,n),s=this.states[r],s||(this.reportError("state doesn't exist",r),r="start",s=this.states[r]),o=this.matchMappings[r],l=m,u=this.regExps[r],u.lastIndex=m),d.consumeLineEnd&&(l=m);break}if(v)if(typeof p=="string")!!d&&d.merge===!1||h.type!==p?(h.type&&f.push(h),h={type:p,value:v}):h.value+=v;else if(p){h.type&&f.push(h),h={type:null,value:""};for(var y=0;y<p.length;y++)f.push(p[y])}if(l==e.length)break;l=m;if(c++>i){c>2*e.length&&this.reportError("infinite loop with in ace tokenizer",{startState:t,line:e});while(l<e.length)h.type&&f.push(h),h={value:e.substring(l,l+=2e3),type:"overflow"};r="start",n=[];break}}return h.type&&f.push(h),n.length>1&&n[0]!==r&&n.unshift("#tmp",r),{tokens:f,state:n.length?n:r}},this.reportError=r.reportError}).call(s.prototype),t.Tokenizer=s}),ace.define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../lib/lang"),i=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{defaultToken:"text"}]}};(function(){this.addRules=function(e,t){if(!t){for(var n in e)this.$rules[n]=e[n];return}for(var n in e){var r=e[n];for(var i=0;i<r.length;i++){var s=r[i];if(s.next||s.onMatch)typeof s.next=="string"&&s.next.indexOf(t)!==0&&(s.next=t+s.next),s.nextState&&s.nextState.indexOf(t)!==0&&(s.nextState=t+s.nextState)}this.$rules[t+n]=r}},this.getRules=function(){return this.$rules},this.embedRules=function(e,t,n,i,s){var o=typeof e=="function"?(new e).getRules():e;if(i)for(var u=0;u<i.length;u++)i[u]=t+i[u];else{i=[];for(var a in o)i.push(t+a)}this.addRules(o,t);if(n){var f=Array.prototype[s?"push":"unshift"];for(var u=0;u<i.length;u++)f.apply(this.$rules[i[u]],r.deepCopy(n))}this.$embeds||(this.$embeds=[]),this.$embeds.push(t)},this.getEmbeds=function(){return this.$embeds};var e=function(e,t){return(e!="start"||t.length)&&t.unshift(this.nextState,e),this.nextState},t=function(e,t){return t.shift(),t.shift()||"start"};this.normalizeRules=function(){function i(s){var o=r[s];o.processed=!0;for(var u=0;u<o.length;u++){var a=o[u],f=null;Array.isArray(a)&&(f=a,a={}),!a.regex&&a.start&&(a.regex=a.start,a.next||(a.next=[]),a.next.push({defaultToken:a.token},{token:a.token+".end",regex:a.end||a.start,next:"pop"}),a.token=a.token+".start",a.push=!0);var l=a.next||a.push;if(l&&Array.isArray(l)){var c=a.stateName;c||(c=a.token,typeof c!="string"&&(c=c[0]||""),r[c]&&(c+=n++)),r[c]=l,a.next=c,i(c)}else l=="pop"&&(a.next=t);a.push&&(a.nextState=a.next||a.push,a.next=e,delete a.push);if(a.rules)for(var h in a.rules)r[h]?r[h].push&&r[h].push.apply(r[h],a.rules[h]):r[h]=a.rules[h];var p=typeof a=="string"?a:a.include;p&&(Array.isArray(p)?f=p.map(function(e){return r[e]}):f=r[p]);if(f){var d=[u,1].concat(f);a.noEscape&&(d=d.filter(function(e){return!e.next})),o.splice.apply(o,d),u--}a.keywordMap&&(a.token=this.createKeywordMapper(a.keywordMap,a.defaultToken||"text",a.caseInsensitive),delete a.defaultToken)}}var n=0,r=this.$rules;Object.keys(r).forEach(i,this)},this.createKeywordMapper=function(e,t,n,r){var i=Object.create(null);return Object.keys(e).forEach(function(t){var s=e[t];n&&(s=s.toLowerCase());var o=s.split(r||"|");for(var u=o.length;u--;)i[o[u]]=t}),Object.getPrototypeOf(i)&&(i.__proto__=null),this.$keywordList=Object.keys(i),e=null,n?function(e){return i[e.toLowerCase()]||t}:function(e){return i[e]||t}},this.getKeywords=function(){return this.$keywords}}).call(i.prototype),t.TextHighlightRules=i}),ace.define("ace/mode/behaviour",["require","exports","module"],function(e,t,n){"use strict";var r=function(){this.$behaviours={}};(function(){this.add=function(e,t,n){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[e]:this.$behaviours[e]={}}this.$behaviours[e][t]=n},this.addBehaviours=function(e){for(var t in e)for(var n in e[t])this.add(t,n,e[t][n])},this.remove=function(e){this.$behaviours&&this.$behaviours[e]&&delete this.$behaviours[e]},this.inherit=function(e,t){if(typeof e=="function")var n=(new e).getBehaviours(t);else var n=e.getBehaviours(t);this.addBehaviours(n)},this.getBehaviours=function(e){if(!e)return this.$behaviours;var t={};for(var n=0;n<e.length;n++)this.$behaviours[e[n]]&&(t[e[n]]=this.$behaviours[e[n]]);return t}}).call(r.prototype),t.Behaviour=r}),ace.define("ace/token_iterator",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t,n){this.$session=e,this.$row=t,this.$rowTokens=e.getTokens(t);var r=e.getTokenAt(t,n);this.$tokenIndex=r?r.index:-1};(function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){this.$tokenIndex+=1;var e;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1,e||(e=this.$session.getLength());if(this.$row>=e)return this.$row=e-1,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var e=this.$rowTokens,t=this.$tokenIndex,n=e[t].start;if(n!==undefined)return n;n=0;while(t>0)t-=1,n+=e[t].value.length;return n},this.getCurrentTokenPosition=function(){return{row:this.$row,column:this.getCurrentTokenColumn()}}}).call(r.prototype),t.TokenIterator=r}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c={'"':'"',"'":"'"},h=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},p=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},d=function(e){this.add("braces","insertion",function(t,n,r,i,s){var u=r.getCursorPosition(),a=i.doc.getLine(u.row);if(s=="{"){h(r);var l=r.getSelectionRange(),c=i.doc.getTextRange(l);if(c!==""&&c!=="{"&&r.getWrapBehavioursEnabled())return p(l,c,"{","}");if(d.isSaneInsertion(r,i))return/[\]\}\)]/.test(a[u.column])||r.inMultiSelectMode||e&&e.braces?(d.recordAutoInsert(r,i,"}"),{text:"{}",selection:[1,1]}):(d.recordMaybeInsert(r,i,"{"),{text:"{",selection:[1,1]})}else if(s=="}"){h(r);var v=a.substring(u.column,u.column+1);if(v=="}"){var m=i.$findOpeningBracket("}",{column:u.column+1,row:u.row});if(m!==null&&d.isAutoInsertedClosing(u,a,s))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(s=="\n"||s=="\r\n"){h(r);var g="";d.isMaybeInsertedClosing(u,a)&&(g=o.stringRepeat("}",f.maybeInsertedBrackets),d.clearMaybeInsertedClosing());var v=a.substring(u.column,u.column+1);if(v==="}"){var y=i.findMatchingBracket({row:u.row,column:u.column+1},"}");if(!y)return null;var b=this.$getIndent(i.getLine(y.row))}else{if(!g){d.clearMaybeInsertedClosing();return}var b=this.$getIndent(a)}var w=b+i.getTabString();return{text:"\n"+w+"\n"+b+g,selection:[1,w.length,1,w.length]}}d.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){h(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return p(s,o,"(",")");if(d.isSaneInsertion(n,r))return d.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){h(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&d.isAutoInsertedClosing(u,a,i))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){h(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return p(s,o,"[","]");if(d.isSaneInsertion(n,r))return d.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){h(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&d.isAutoInsertedClosing(u,a,i))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){var s=r.$mode.$quotes||c;if(i.length==1&&s[i]){if(this.lineCommentStart&&this.lineCommentStart.indexOf(i)!=-1)return;h(n);var o=i,u=n.getSelectionRange(),a=r.doc.getTextRange(u);if(a!==""&&(a.length!=1||!s[a])&&n.getWrapBehavioursEnabled())return p(u,a,o,o);if(!a){var f=n.getCursorPosition(),l=r.doc.getLine(f.row),d=l.substring(f.column-1,f.column),v=l.substring(f.column,f.column+1),m=r.getTokenAt(f.row,f.column),g=r.getTokenAt(f.row,f.column+1);if(d=="\\"&&m&&/escape/.test(m.type))return null;var y=m&&/string|escape/.test(m.type),b=!g||/string|escape/.test(g.type),w;if(v==o)w=y!==b,w&&/string\.end/.test(g.type)&&(w=!1);else{if(y&&!b)return null;if(y&&b)return null;var E=r.$mode.tokenRe;E.lastIndex=0;var S=E.test(d);E.lastIndex=0;var x=E.test(d);if(S||x)return null;if(v&&!/[\s;,.})\]\\]/.test(v))return null;w=!0}return{text:w?o+o:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};d.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},d.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},d.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},d.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},d.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},d.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},d.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},d.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(d,i),t.CstyleBehaviour=d}),ace.define("ace/unicode",["require","exports","module"],function(e,t,n){"use strict";function r(e){var n=/\w{4}/g;for(var r in e)t.packages[r]=e[r].replace(n,"\\u$&")}t.packages={},r({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),ace.define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour/cstyle","ace/unicode","ace/lib/lang","ace/token_iterator","ace/range"],function(e,t,n){"use strict";var r=e("../tokenizer").Tokenizer,i=e("./text_highlight_rules").TextHighlightRules,s=e("./behaviour/cstyle").CstyleBehaviour,o=e("../unicode"),u=e("../lib/lang"),a=e("../token_iterator").TokenIterator,f=e("../range").Range,l=function(){this.HighlightRules=i};(function(){this.$defaultBehaviour=new s,this.tokenRe=new RegExp("^["+o.packages.L+o.packages.Mn+o.packages.Mc+o.packages.Nd+o.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+o.packages.L+o.packages.Mn+o.packages.Mc+o.packages.Nd+o.packages.Pc+"\\$_]|\\s])+","g"),this.getTokenizer=function(){return this.$tokenizer||(this.$highlightRules=this.$highlightRules||new this.HighlightRules(this.$highlightRuleConfig),this.$tokenizer=new r(this.$highlightRules.getRules())),this.$tokenizer},this.lineCommentStart="",this.blockComment="",this.toggleCommentLines=function(e,t,n,r){function w(e){for(var t=n;t<=r;t++)e(i.getLine(t),t)}var i=t.doc,s=!0,o=!0,a=Infinity,f=t.getTabSize(),l=!1;if(!this.lineCommentStart){if(!this.blockComment)return!1;var c=this.blockComment.start,h=this.blockComment.end,p=new RegExp("^(\\s*)(?:"+u.escapeRegExp(c)+")"),d=new RegExp("(?:"+u.escapeRegExp(h)+")\\s*$"),v=function(e,t){if(g(e,t))return;if(!s||/\S/.test(e))i.insertInLine({row:t,column:e.length},h),i.insertInLine({row:t,column:a},c)},m=function(e,t){var n;(n=e.match(d))&&i.removeInLine(t,e.length-n[0].length,e.length),(n=e.match(p))&&i.removeInLine(t,n[1].length,n[0].length)},g=function(e,n){if(p.test(e))return!0;var r=t.getTokens(n);for(var i=0;i<r.length;i++)if(r[i].type==="comment")return!0}}else{if(Array.isArray(this.lineCommentStart))var p=this.lineCommentStart.map(u.escapeRegExp).join("|"),c=this.lineCommentStart[0];else var p=u.escapeRegExp(this.lineCommentStart),c=this.lineCommentStart;p=new RegExp("^(\\s*)(?:"+p+") ?"),l=t.getUseSoftTabs();var m=function(e,t){var n=e.match(p);if(!n)return;var r=n[1].length,s=n[0].length;!b(e,r,s)&&n[0][s-1]==" "&&s--,i.removeInLine(t,r,s)},y=c+" ",v=function(e,t){if(!s||/\S/.test(e))b(e,a,a)?i.insertInLine({row:t,column:a},y):i.insertInLine({row:t,column:a},c)},g=function(e,t){return p.test(e)},b=function(e,t,n){var r=0;while(t--&&e.charAt(t)==" ")r++;if(r%f!=0)return!1;var r=0;while(e.charAt(n++)==" ")r++;return f>2?r%f!=f-1:r%f==0}}var E=Infinity;w(function(e,t){var n=e.search(/\S/);n!==-1?(n<a&&(a=n),o&&!g(e,t)&&(o=!1)):E>e.length&&(E=e.length)}),a==Infinity&&(a=E,s=!1,o=!1),l&&a%f!=0&&(a=Math.floor(a/f)*f),w(o?m:v)},this.toggleBlockComment=function(e,t,n,r){var i=this.blockComment;if(!i)return;!i.start&&i[0]&&(i=i[0]);var s=new a(t,r.row,r.column),o=s.getCurrentToken(),u=t.selection,l=t.selection.toOrientedRange(),c,h;if(o&&/comment/.test(o.type)){var p,d;while(o&&/comment/.test(o.type)){var v=o.value.indexOf(i.start);if(v!=-1){var m=s.getCurrentTokenRow(),g=s.getCurrentTokenColumn()+v;p=new f(m,g,m,g+i.start.length);break}o=s.stepBackward()}var s=new a(t,r.row,r.column),o=s.getCurrentToken();while(o&&/comment/.test(o.type)){var v=o.value.indexOf(i.end);if(v!=-1){var m=s.getCurrentTokenRow(),g=s.getCurrentTokenColumn()+v;d=new f(m,g,m,g+i.end.length);break}o=s.stepForward()}d&&t.remove(d),p&&(t.remove(p),c=p.start.row,h=-i.start.length)}else h=i.start.length,c=n.start.row,t.insert(n.end,i.end),t.insert(n.start,i.start);l.start.row==c&&(l.start.column+=h),l.end.row==c&&(l.end.column+=h),t.selection.fromOrientedRange(l)},this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.autoOutdent=function(e,t,n){},this.$getIndent=function(e){return e.match(/^\s*/)[0]},this.createWorker=function(e){return null},this.createModeDelegates=function(e){this.$embeds=[],this.$modes={};for(var t in e)e[t]&&(this.$embeds.push(t),this.$modes[t]=new e[t]);var n=["toggleBlockComment","toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction","getCompletions"];for(var t=0;t<n.length;t++)(function(e){var r=n[t],i=e[r];e[n[t]]=function(){return this.$delegator(r,arguments,i)}})(this)},this.$delegator=function(e,t,n){var r=t[0];typeof r!="string"&&(r=r[0]);for(var i=0;i<this.$embeds.length;i++){if(!this.$modes[this.$embeds[i]])continue;var s=r.split(this.$embeds[i]);if(!s[0]&&s[1]){t[0]=s[1];var o=this.$modes[this.$embeds[i]];return o[e].apply(o,t)}}var u=n.apply(this,t);return n?u:undefined},this.transformAction=function(e,t,n,r,i){if(this.$behaviour){var s=this.$behaviour.getBehaviours();for(var o in s)if(s[o][t]){var u=s[o][t].apply(this,arguments);if(u)return u}}},this.getKeywords=function(e){if(!this.completionKeywords){var t=this.$tokenizer.rules,n=[];for(var r in t){var i=t[r];for(var s=0,o=i.length;s<o;s++)if(typeof i[s].token=="string")/keyword|support|storage/.test(i[s].token)&&n.push(i[s].regex);else if(typeof i[s].token=="object")for(var u=0,a=i[s].token.length;u<a;u++)if(/keyword|support|storage/.test(i[s].token[u])){var r=i[s].regex.match(/\(.+?\)/g)[u];n.push(r.substr(1,r.length-2))}}this.completionKeywords=n}return e?n.concat(this.$keywordList||[]):this.$keywordList},this.$createKeywordList=function(){return this.$highlightRules||this.getTokenizer(),this.$keywordList=this.$highlightRules.$keywordList||[]},this.getCompletions=function(e,t,n,r){var i=this.$keywordList||this.$createKeywordList();return i.map(function(e){return{name:e,value:e,score:0,meta:"keyword"}})},this.$id="ace/mode/text"}).call(l.prototype),t.Mode=l}),ace.define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),ace.define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),ace.define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),ace.define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=function(e,t){this.running=!1,this.lines=[],this.states=[],this.currentLine=0,this.tokenizer=e;var n=this;this.$worker=function(){if(!n.running)return;var e=new Date,t=n.currentLine,r=-1,i=n.doc,s=t;while(n.lines[t])t++;var o=i.getLength(),u=0;n.running=!1;while(t<o){n.$tokenizeRow(t),r=t;do t++;while(n.lines[t]);u++;if(u%5===0&&new Date-e>20){n.running=setTimeout(n.$worker,20);break}}n.currentLine=t,r==-1&&(r=t),s<=r&&n.fireUpdateEvent(s,r)}};(function(){r.implement(this,i),this.setTokenizer=function(e){this.tokenizer=e,this.lines=[],this.states=[],this.start(0)},this.setDocument=function(e){this.doc=e,this.lines=[],this.states=[],this.stop()},this.fireUpdateEvent=function(e,t){var n={first:e,last:t};this._signal("update",{data:n})},this.start=function(e){this.currentLine=Math.min(e||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.states.splice(this.currentLine,this.states.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.scheduleStart=function(){this.running||(this.running=setTimeout(this.$worker,700))},this.$updateOnChange=function(e){var t=e.start.row,n=e.end.row-t;if(n===0)this.lines[t]=null;else if(e.action=="remove")this.lines.splice(t,n+1,null),this.states.splice(t,n+1,null);else{var r=Array(n+1);r.unshift(t,1),this.lines.splice.apply(this.lines,r),this.states.splice.apply(this.states,r)}this.currentLine=Math.min(t,this.currentLine,this.doc.getLength()),this.stop()},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(e){return this.lines[e]||this.$tokenizeRow(e)},this.getState=function(e){return this.currentLine==e&&this.$tokenizeRow(e),this.states[e]||"start"},this.$tokenizeRow=function(e){var t=this.doc.getLine(e),n=this.states[e-1],r=this.tokenizer.getLineTokens(t,n,e);return this.states[e]+""!=r.state+""?(this.states[e]=r.state,this.lines[e+1]=null,this.currentLine>e+1&&(this.currentLine=e+1)):this.currentLine==e&&(this.currentLine=e+1),this.lines[e]=r.tokens}}).call(s.prototype),t.BackgroundTokenizer=s}),ace.define("ace/search_highlight",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(e,t,n){"use strict";var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./range").Range,o=function(e,t,n){this.setRegexp(e),this.clazz=t,this.type=n||"text"};(function(){this.MAX_RANGES=500,this.setRegexp=function(e){if(this.regExp+""==e+"")return;this.regExp=e,this.cache=[]},this.update=function(e,t,n,i){if(!this.regExp)return;var o=i.firstRow,u=i.lastRow;for(var a=o;a<=u;a++){var f=this.cache[a];f==null&&(f=r.getMatchOffsets(n.getLine(a),this.regExp),f.length>this.MAX_RANGES&&(f=f.slice(0,this.MAX_RANGES)),f=f.map(function(e){return new s(a,e.offset,a,e.offset+e.length)}),this.cache[a]=f.length?f:"");for(var l=f.length;l--;)t.drawSingleLineMarker(e,f[l].toScreenRange(n),this.clazz,i)}}}).call(o.prototype),t.SearchHighlight=o}),ace.define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(e,t,n){"use strict";function i(e,t){this.foldData=e,Array.isArray(t)?this.folds=t:t=this.folds=[t];var n=t[t.length-1];this.range=new r(t[0].start.row,t[0].start.column,n.end.row,n.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(e){e.setFoldLine(this)},this)}var r=e("../range").Range;(function(){this.shiftRow=function(e){this.start.row+=e,this.end.row+=e,this.folds.forEach(function(t){t.start.row+=e,t.end.row+=e})},this.addFold=function(e){if(e.sameRow){if(e.start.row<this.startRow||e.endRow>this.endRow)throw new Error("Can't add a fold to this FoldLine as it has no connection");this.folds.push(e),this.folds.sort(function(e,t){return-e.range.compareEnd(t.start.row,t.start.column)}),this.range.compareEnd(e.start.row,e.start.column)>0?(this.end.row=e.end.row,this.end.column=e.end.column):this.range.compareStart(e.end.row,e.end.column)<0&&(this.start.row=e.start.row,this.start.column=e.start.column)}else if(e.start.row==this.end.row)this.folds.push(e),this.end.row=e.end.row,this.end.column=e.end.column;else{if(e.end.row!=this.start.row)throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");this.folds.unshift(e),this.start.row=e.start.row,this.start.column=e.start.column}e.foldLine=this},this.containsRow=function(e){return e>=this.start.row&&e<=this.end.row},this.walk=function(e,t,n){var r=0,i=this.folds,s,o,u,a=!0;t==null&&(t=this.end.row,n=this.end.column);for(var f=0;f<i.length;f++){s=i[f],o=s.range.compareStart(t,n);if(o==-1){e(null,t,n,r,a);return}u=e(null,s.start.row,s.start.column,r,a),u=!u&&e(s.placeholder,s.start.row,s.start.column,r);if(u||o===0)return;a=!s.sameRow,r=s.end.column}e(null,t,n,r,a)},this.getNextFoldTo=function(e,t){var n,r;for(var i=0;i<this.folds.length;i++){n=this.folds[i],r=n.range.compareEnd(e,t);if(r==-1)return{fold:n,kind:"after"};if(r===0)return{fold:n,kind:"inside"}}return null},this.addRemoveChars=function(e,t,n){var r=this.getNextFoldTo(e,t),i,s;if(r){i=r.fold;if(r.kind=="inside"&&i.start.column!=t&&i.start.row!=e)window.console&&window.console.log(e,t,i);else if(i.start.row==e){s=this.folds;var o=s.indexOf(i);o===0&&(this.start.column+=n);for(o;o<s.length;o++){i=s[o],i.start.column+=n;if(!i.sameRow)return;i.end.column+=n}this.end.column+=n}}},this.split=function(e,t){var n=this.getNextFoldTo(e,t);if(!n||n.kind=="inside")return null;var r=n.fold,s=this.folds,o=this.foldData,u=s.indexOf(r),a=s[u-1];this.end.row=a.end.row,this.end.column=a.end.column,s=s.splice(u,s.length-u);var f=new i(o,s);return o.splice(o.indexOf(this)+1,0,f),f},this.merge=function(e){var t=e.folds;for(var n=0;n<t.length;n++)this.addFold(t[n]);var r=this.foldData;r.splice(r.indexOf(e),1)},this.toString=function(){var e=[this.range.toString()+": ["];return this.folds.forEach(function(t){e.push("  "+t.toString())}),e.push("]"),e.join("\n")},this.idxToPosition=function(e){var t=0;for(var n=0;n<this.folds.length;n++){var r=this.folds[n];e-=r.start.column-t;if(e<0)return{row:r.start.row,column:r.start.column+e};e-=r.placeholder.length;if(e<0)return r.start;t=r.end.column}return{row:this.end.row,column:this.end.column+e}}}).call(i.prototype),t.FoldLine=i}),ace.define("ace/range_list",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("./range").Range,i=r.comparePoints,s=function(){this.ranges=[]};(function(){this.comparePoints=i,this.pointIndex=function(e,t,n){var r=this.ranges;for(var s=n||0;s<r.length;s++){var o=r[s],u=i(e,o.end);if(u>0)continue;var a=i(e,o.start);return u===0?t&&a!==0?-s-2:s:a>0||a===0&&!t?s:-s-1}return-s-1},this.add=function(e){var t=!e.isEmpty(),n=this.pointIndex(e.start,t);n<0&&(n=-n-1);var r=this.pointIndex(e.end,t,n);return r<0?r=-r-1:r++,this.ranges.splice(n,r-n,e)},this.addList=function(e){var t=[];for(var n=e.length;n--;)t.push.apply(t,this.add(e[n]));return t},this.substractPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges.splice(t,1)},this.merge=function(){var e=[],t=this.ranges;t=t.sort(function(e,t){return i(e.start,t.start)});var n=t[0],r;for(var s=1;s<t.length;s++){r=n,n=t[s];var o=i(r.end,n.start);if(o<0)continue;if(o==0&&!r.isEmpty()&&!n.isEmpty())continue;i(r.end,n.end)<0&&(r.end.row=n.end.row,r.end.column=n.end.column),t.splice(s,1),e.push(n),n=r,s--}return this.ranges=t,e},this.contains=function(e,t){return this.pointIndex({row:e,column:t})>=0},this.containsPoint=function(e){return this.pointIndex(e)>=0},this.rangeAtPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges[t]},this.clipRows=function(e,t){var n=this.ranges;if(n[0].start.row>t||n[n.length-1].start.row<e)return[];var r=this.pointIndex({row:e,column:0});r<0&&(r=-r-1);var i=this.pointIndex({row:t,column:0},r);i<0&&(i=-i-1);var s=[];for(var o=r;o<i;o++)s.push(n[o]);return s},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(e){this.session&&this.detach(),this.session=e,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){if(!this.session)return;this.session.removeListener("change",this.onChange),this.session=null},this.$onChange=function(e){if(e.action=="insert")var t=e.start,n=e.end;else var n=e.start,t=e.end;var r=t.row,i=n.row,s=i-r,o=-t.column+n.column,u=this.ranges;for(var a=0,f=u.length;a<f;a++){var l=u[a];if(l.end.row<r)continue;if(l.start.row>r)break;l.start.row==r&&l.start.column>=t.column&&(l.start.column!=t.column||!this.$insertRight)&&(l.start.column+=o,l.start.row+=s);if(l.end.row==r&&l.end.column>=t.column){if(l.end.column==t.column&&this.$insertRight)continue;l.end.column==t.column&&o>0&&a<f-1&&l.end.column>l.start.column&&l.end.column==u[a+1].start.column&&(l.end.column-=o),l.end.column+=o,l.end.row+=s}}if(s!=0&&a<f)for(;a<f;a++){var l=u[a];l.start.row+=s,l.end.row+=s}}}).call(s.prototype),t.RangeList=s}),ace.define("ace/edit_session/fold",["require","exports","module","ace/range","ace/range_list","ace/lib/oop"],function(e,t,n){"use strict";function u(e,t){e.row-=t.row,e.row==0&&(e.column-=t.column)}function a(e,t){u(e.start,t),u(e.end,t)}function f(e,t){e.row==0&&(e.column+=t.column),e.row+=t.row}function l(e,t){f(e.start,t),f(e.end,t)}var r=e("../range").Range,i=e("../range_list").RangeList,s=e("../lib/oop"),o=t.Fold=function(e,t){this.foldLine=null,this.placeholder=t,this.range=e,this.start=e.start,this.end=e.end,this.sameRow=e.start.row==e.end.row,this.subFolds=this.ranges=[]};s.inherits(o,i),function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(e){this.foldLine=e,this.subFolds.forEach(function(t){t.setFoldLine(e)})},this.clone=function(){var e=this.range.clone(),t=new o(e,this.placeholder);return this.subFolds.forEach(function(e){t.subFolds.push(e.clone())}),t.collapseChildren=this.collapseChildren,t},this.addSubFold=function(e){if(this.range.isEqual(e))return;if(!this.range.containsRange(e))throw new Error("A fold can't intersect already existing fold"+e.range+this.range);a(e,this.start);var t=e.start.row,n=e.start.column;for(var r=0,i=-1;r<this.subFolds.length;r++){i=this.subFolds[r].range.compare(t,n);if(i!=1)break}var s=this.subFolds[r];if(i==0)return s.addSubFold(e);var t=e.range.end.row,n=e.range.end.column;for(var o=r,i=-1;o<this.subFolds.length;o++){i=this.subFolds[o].range.compare(t,n);if(i!=1)break}var u=this.subFolds[o];if(i==0)throw new Error("A fold can't intersect already existing fold"+e.range+this.range);var f=this.subFolds.splice(r,o-r,e);return e.setFoldLine(this.foldLine),e},this.restoreRange=function(e){return l(e,this.start)}}.call(o.prototype)}),ace.define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(e,t,n){"use strict";function u(){this.getFoldAt=function(e,t,n){var r=this.getFoldLine(e);if(!r)return null;var i=r.folds;for(var s=0;s<i.length;s++){var o=i[s];if(o.range.contains(e,t)){if(n==1&&o.range.isEnd(e,t))continue;if(n==-1&&o.range.isStart(e,t))continue;return o}}},this.getFoldsInRange=function(e){var t=e.start,n=e.end,r=this.$foldData,i=[];t.column+=1,n.column-=1;for(var s=0;s<r.length;s++){var o=r[s].range.compareRange(e);if(o==2)continue;if(o==-2)break;var u=r[s].folds;for(var a=0;a<u.length;a++){var f=u[a];o=f.range.compareRange(e);if(o==-2)break;if(o==2)continue;if(o==42)break;i.push(f)}}return t.column-=1,n.column+=1,i},this.getFoldsInRangeList=function(e){if(Array.isArray(e)){var t=[];e.forEach(function(e){t=t.concat(this.getFoldsInRange(e))},this)}else var t=this.getFoldsInRange(e);return t},this.getAllFolds=function(){var e=[],t=this.$foldData;for(var n=0;n<t.length;n++)for(var r=0;r<t[n].folds.length;r++)e.push(t[n].folds[r]);return e},this.getFoldStringAt=function(e,t,n,r){r=r||this.getFoldLine(e);if(!r)return null;var i={end:{column:0}},s,o;for(var u=0;u<r.folds.length;u++){o=r.folds[u];var a=o.range.compareEnd(e,t);if(a==-1){s=this.getLine(o.start.row).substring(i.end.column,o.start.column);break}if(a===0)return null;i=o}return s||(s=this.getLine(o.start.row).substring(i.end.column)),n==-1?s.substring(0,t-i.end.column):n==1?s.substring(t-i.end.column):s},this.getFoldLine=function(e,t){var n=this.$foldData,r=0;t&&(r=n.indexOf(t)),r==-1&&(r=0);for(r;r<n.length;r++){var i=n[r];if(i.start.row<=e&&i.end.row>=e)return i;if(i.end.row>e)return null}return null},this.getNextFoldLine=function(e,t){var n=this.$foldData,r=0;t&&(r=n.indexOf(t)),r==-1&&(r=0);for(r;r<n.length;r++){var i=n[r];if(i.end.row>=e)return i}return null},this.getFoldedRowCount=function(e,t){var n=this.$foldData,r=t-e+1;for(var i=0;i<n.length;i++){var s=n[i],o=s.end.row,u=s.start.row;if(o>=t){u<t&&(u>=e?r-=t-u:r=0);break}o>=e&&(u>=e?r-=o-u:r-=o-e+1)}return r},this.$addFoldLine=function(e){return this.$foldData.push(e),this.$foldData.sort(function(e,t){return e.start.row-t.start.row}),e},this.addFold=function(e,t){var n=this.$foldData,r=!1,o;e instanceof s?o=e:(o=new s(t,e),o.collapseChildren=t.collapseChildren),this.$clipRangeToDocument(o.range);var u=o.start.row,a=o.start.column,f=o.end.row,l=o.end.column;if(u<f||u==f&&a<=l-2){var c=this.getFoldAt(u,a,1),h=this.getFoldAt(f,l,-1);if(c&&h==c)return c.addSubFold(o);c&&!c.range.isStart(u,a)&&this.removeFold(c),h&&!h.range.isEnd(f,l)&&this.removeFold(h);var p=this.getFoldsInRange(o.range);p.length>0&&(this.removeFolds(p),p.forEach(function(e){o.addSubFold(e)}));for(var d=0;d<n.length;d++){var v=n[d];if(f==v.start.row){v.addFold(o),r=!0;break}if(u==v.end.row){v.addFold(o),r=!0;if(!o.sameRow){var m=n[d+1];if(m&&m.start.row==f){v.merge(m);break}}break}if(f<=v.start.row)break}return r||(v=this.$addFoldLine(new i(this.$foldData,o))),this.$useWrapMode?this.$updateWrapData(v.start.row,v.start.row):this.$updateRowLengthCache(v.start.row,v.start.row),this.$modified=!0,this._signal("changeFold",{data:o,action:"add"}),o}throw new Error("The range has to be at least 2 characters width")},this.addFolds=function(e){e.forEach(function(e){this.addFold(e)},this)},this.removeFold=function(e){var t=e.foldLine,n=t.start.row,r=t.end.row,i=this.$foldData,s=t.folds;if(s.length==1)i.splice(i.indexOf(t),1);else if(t.range.isEnd(e.end.row,e.end.column))s.pop(),t.end.row=s[s.length-1].end.row,t.end.column=s[s.length-1].end.column;else if(t.range.isStart(e.start.row,e.start.column))s.shift(),t.start.row=s[0].start.row,t.start.column=s[0].start.column;else if(e.sameRow)s.splice(s.indexOf(e),1);else{var o=t.split(e.start.row,e.start.column);s=o.folds,s.shift(),o.start.row=s[0].start.row,o.start.column=s[0].start.column}this.$updating||(this.$useWrapMode?this.$updateWrapData(n,r):this.$updateRowLengthCache(n,r)),this.$modified=!0,this._signal("changeFold",{data:e,action:"remove"})},this.removeFolds=function(e){var t=[];for(var n=0;n<e.length;n++)t.push(e[n]);t.forEach(function(e){this.removeFold(e)},this),this.$modified=!0},this.expandFold=function(e){this.removeFold(e),e.subFolds.forEach(function(t){e.restoreRange(t),this.addFold(t)},this),e.collapseChildren>0&&this.foldAll(e.start.row+1,e.end.row,e.collapseChildren-1),e.subFolds=[]},this.expandFolds=function(e){e.forEach(function(e){this.expandFold(e)},this)},this.unfold=function(e,t){var n,i;e==null?(n=new r(0,0,this.getLength(),0),t=!0):typeof e=="number"?n=new r(e,0,e,this.getLine(e).length):"row"in e?n=r.fromPoints(e,e):n=e,i=this.getFoldsInRangeList(n);if(t)this.removeFolds(i);else{var s=i;while(s.length)this.expandFolds(s),s=this.getFoldsInRangeList(n)}if(i.length)return i},this.isRowFolded=function(e,t){return!!this.getFoldLine(e,t)},this.getRowFoldEnd=function(e,t){var n=this.getFoldLine(e,t);return n?n.end.row:e},this.getRowFoldStart=function(e,t){var n=this.getFoldLine(e,t);return n?n.start.row:e},this.getFoldDisplayLine=function(e,t,n,r,i){r==null&&(r=e.start.row),i==null&&(i=0),t==null&&(t=e.end.row),n==null&&(n=this.getLine(t).length);var s=this.doc,o="";return e.walk(function(e,t,n,u){if(t<r)return;if(t==r){if(n<i)return;u=Math.max(i,u)}e!=null?o+=e:o+=s.getLine(t).substring(u,n)},t,n),o},this.getDisplayLine=function(e,t,n,r){var i=this.getFoldLine(e);if(!i){var s;return s=this.doc.getLine(e),s.substring(r||0,t||s.length)}return this.getFoldDisplayLine(i,e,t,n,r)},this.$cloneFoldData=function(){var e=[];return e=this.$foldData.map(function(t){var n=t.folds.map(function(e){return e.clone()});return new i(e,n)}),e},this.toggleFold=function(e){var t=this.selection,n=t.getRange(),r,i;if(n.isEmpty()){var s=n.start;r=this.getFoldAt(s.row,s.column);if(r){this.expandFold(r);return}(i=this.findMatchingBracket(s))?n.comparePoint(i)==1?n.end=i:(n.start=i,n.start.column++,n.end.column--):(i=this.findMatchingBracket({row:s.row,column:s.column+1}))?(n.comparePoint(i)==1?n.end=i:n.start=i,n.start.column++):n=this.getCommentFoldRange(s.row,s.column)||n}else{var o=this.getFoldsInRange(n);if(e&&o.length){this.expandFolds(o);return}o.length==1&&(r=o[0])}r||(r=this.getFoldAt(n.start.row,n.start.column));if(r&&r.range.toString()==n.toString()){this.expandFold(r);return}var u="...";if(!n.isMultiLine()){u=this.getTextRange(n);if(u.length<4)return;u=u.trim().substring(0,2)+".."}this.addFold(u,n)},this.getCommentFoldRange=function(e,t,n){var i=new o(this,e,t),s=i.getCurrentToken(),u=s.type;if(s&&/^comment|string/.test(u)){u=u.match(/comment|string/)[0],u=="comment"&&(u+="|doc-start");var a=new RegExp(u),f=new r;if(n!=1){do s=i.stepBackward();while(s&&a.test(s.type));i.stepForward()}f.start.row=i.getCurrentTokenRow(),f.start.column=i.getCurrentTokenColumn()+2,i=new o(this,e,t);if(n!=-1){var l=-1;do{s=i.stepForward();if(l==-1){var c=this.getState(i.$row);a.test(c)||(l=i.$row)}else if(i.$row>l)break}while(s&&a.test(s.type));s=i.stepBackward()}else s=i.getCurrentToken();return f.end.row=i.getCurrentTokenRow(),f.end.column=i.getCurrentTokenColumn()+s.value.length-2,f}},this.foldAll=function(e,t,n){n==undefined&&(n=1e5);var r=this.foldWidgets;if(!r)return;t=t||this.getLength(),e=e||0;for(var i=e;i<t;i++){r[i]==null&&(r[i]=this.getFoldWidget(i));if(r[i]!="start")continue;var s=this.getFoldWidgetRange(i);if(s&&s.isMultiLine()&&s.end.row<=t&&s.start.row>=e){i=s.end.row;try{var o=this.addFold("...",s);o&&(o.collapseChildren=n)}catch(u){}}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(e){if(!this.$foldStyles[e])throw new Error("invalid fold style: "+e+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==e)return;this.$foldStyle=e,e=="manual"&&this.unfold();var t=this.$foldMode;this.$setFolding(null),this.$setFolding(t)},this.$setFolding=function(e){if(this.$foldMode==e)return;this.$foldMode=e,this.off("change",this.$updateFoldWidgets),this.off("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets),this._signal("changeAnnotation");if(!e||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=e.getFoldWidget.bind(e,this,this.$foldStyle),this.getFoldWidgetRange=e.getFoldWidgetRange.bind(e,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.$tokenizerUpdateFoldWidgets=this.tokenizerUpdateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets),this.on("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets)},this.getParentFoldRangeData=function(e,t){var n=this.foldWidgets;if(!n||t&&n[e])return{};var r=e-1,i;while(r>=0){var s=n[r];s==null&&(s=n[r]=this.getFoldWidget(r));if(s=="start"){var o=this.getFoldWidgetRange(r);i||(i=o);if(o&&o.end.row>=e)break}r--}return{range:r!==-1&&o,firstRange:i}},this.onFoldWidgetClick=function(e,t){t=t.domEvent;var n={children:t.shiftKey,all:t.ctrlKey||t.metaKey,siblings:t.altKey},r=this.$toggleFoldWidget(e,n);if(!r){var i=t.target||t.srcElement;i&&/ace_fold-widget/.test(i.className)&&(i.className+=" ace_invalid")}},this.$toggleFoldWidget=function(e,t){if(!this.getFoldWidget)return;var n=this.getFoldWidget(e),r=this.getLine(e),i=n==="end"?-1:1,s=this.getFoldAt(e,i===-1?0:r.length,i);if(s)return t.children||t.all?this.removeFold(s):this.expandFold(s),s;var o=this.getFoldWidgetRange(e,!0);if(o&&!o.isMultiLine()){s=this.getFoldAt(o.start.row,o.start.column,1);if(s&&o.isEqual(s.range))return this.removeFold(s),s}if(t.siblings){var u=this.getParentFoldRangeData(e);if(u.range)var a=u.range.start.row+1,f=u.range.end.row;this.foldAll(a,f,t.all?1e4:0)}else t.children?(f=o?o.end.row:this.getLength(),this.foldAll(e+1,f,t.all?1e4:0)):o&&(t.all&&(o.collapseChildren=1e4),this.addFold("...",o));return o},this.toggleFoldWidget=function(e){var t=this.selection.getCursor().row;t=this.getRowFoldStart(t);var n=this.$toggleFoldWidget(t,{});if(n)return;var r=this.getParentFoldRangeData(t,!0);n=r.range||r.firstRange;if(n){t=n.start.row;var i=this.getFoldAt(t,this.getLine(t).length,1);i?this.removeFold(i):this.addFold("...",n)}},this.updateFoldWidgets=function(e){var t=e.start.row,n=e.end.row-t;if(n===0)this.foldWidgets[t]=null;else if(e.action=="remove")this.foldWidgets.splice(t,n+1,null);else{var r=Array(n+1);r.unshift(t,1),this.foldWidgets.splice.apply(this.foldWidgets,r)}},this.tokenizerUpdateFoldWidgets=function(e){var t=e.data;t.first!=t.last&&this.foldWidgets.length>t.first&&this.foldWidgets.splice(t.first,this.foldWidgets.length)}}var r=e("../range").Range,i=e("./fold_line").FoldLine,s=e("./fold").Fold,o=e("../token_iterator").TokenIterator;t.Folding=u}),ace.define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator","ace/range"],function(e,t,n){"use strict";function s(){this.findMatchingBracket=function(e,t){if(e.column==0)return null;var n=t||this.getLine(e.row).charAt(e.column-1);if(n=="")return null;var r=n.match(/([\(\[\{])|([\)\]\}])/);return r?r[1]?this.$findClosingBracket(r[1],e):this.$findOpeningBracket(r[2],e):null},this.getBracketRange=function(e){var t=this.getLine(e.row),n=!0,r,s=t.charAt(e.column-1),o=s&&s.match(/([\(\[\{])|([\)\]\}])/);o||(s=t.charAt(e.column),e={row:e.row,column:e.column+1},o=s&&s.match(/([\(\[\{])|([\)\]\}])/),n=!1);if(!o)return null;if(o[1]){var u=this.$findClosingBracket(o[1],e);if(!u)return null;r=i.fromPoints(e,u),n||(r.end.column++,r.start.column--),r.cursor=r.end}else{var u=this.$findOpeningBracket(o[2],e);if(!u)return null;r=i.fromPoints(u,e),n||(r.start.column++,r.end.column--),r.cursor=r.start}return r},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(e,t,n){var i=this.$brackets[e],s=1,o=new r(this,t.row,t.column),u=o.getCurrentToken();u||(u=o.stepForward());if(!u)return;n||(n=new RegExp("(\\.?"+u.type.replace(".","\\.").replace("rparen",".paren").replace(/\b(?:end)\b/,"(?:start|begin|end)")+")+"));var a=t.column-o.getCurrentTokenColumn()-2,f=u.value;for(;;){while(a>=0){var l=f.charAt(a);if(l==i){s-=1;if(s==0)return{row:o.getCurrentTokenRow(),column:a+o.getCurrentTokenColumn()}}else l==e&&(s+=1);a-=1}do u=o.stepBackward();while(u&&!n.test(u.type));if(u==null)break;f=u.value,a=f.length-1}return null},this.$findClosingBracket=function(e,t,n){var i=this.$brackets[e],s=1,o=new r(this,t.row,t.column),u=o.getCurrentToken();u||(u=o.stepForward());if(!u)return;n||(n=new RegExp("(\\.?"+u.type.replace(".","\\.").replace("lparen",".paren").replace(/\b(?:start|begin)\b/,"(?:start|begin|end)")+")+"));var a=t.column-o.getCurrentTokenColumn();for(;;){var f=u.value,l=f.length;while(a<l){var c=f.charAt(a);if(c==i){s-=1;if(s==0)return{row:o.getCurrentTokenRow(),column:a+o.getCurrentTokenColumn()}}else c==e&&(s+=1);a+=1}do u=o.stepForward();while(u&&!n.test(u.type));if(u==null)break;a=0}return null}}var r=e("../token_iterator").TokenIterator,i=e("../range").Range;t.BracketMatch=s}),ace.define("ace/edit_session",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/config","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/search_highlight","ace/edit_session/folding","ace/edit_session/bracket_match"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./config"),o=e("./lib/event_emitter").EventEmitter,u=e("./selection").Selection,a=e("./mode/text").Mode,f=e("./range").Range,l=e("./document").Document,c=e("./background_tokenizer").BackgroundTokenizer,h=e("./search_highlight").SearchHighlight,p=function(e,t){this.$breakpoints=[],this.$decorations=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$undoSelect=!0,this.$foldData=[],this.id="session"+ ++p.$uid,this.$foldData.toString=function(){return this.join("\n")},this.on("changeFold",this.onChangeFold.bind(this)),this.$onChange=this.onChange.bind(this);if(typeof e!="object"||!e.getLine)e=new l(e);this.setDocument(e),this.selection=new u(this),s.resetOptions(this),this.setMode(t),s._signal("session",this)};p.$uid=0,function(){function m(e){return e<4352?!1:e>=4352&&e<=4447||e>=4515&&e<=4519||e>=4602&&e<=4607||e>=9001&&e<=9002||e>=11904&&e<=11929||e>=11931&&e<=12019||e>=12032&&e<=12245||e>=12272&&e<=12283||e>=12288&&e<=12350||e>=12353&&e<=12438||e>=12441&&e<=12543||e>=12549&&e<=12589||e>=12593&&e<=12686||e>=12688&&e<=12730||e>=12736&&e<=12771||e>=12784&&e<=12830||e>=12832&&e<=12871||e>=12880&&e<=13054||e>=13056&&e<=19903||e>=19968&&e<=42124||e>=42128&&e<=42182||e>=43360&&e<=43388||e>=44032&&e<=55203||e>=55216&&e<=55238||e>=55243&&e<=55291||e>=63744&&e<=64255||e>=65040&&e<=65049||e>=65072&&e<=65106||e>=65108&&e<=65126||e>=65128&&e<=65131||e>=65281&&e<=65376||e>=65504&&e<=65510}r.implement(this,o),this.setDocument=function(e){this.doc&&this.doc.removeListener("change",this.$onChange),this.doc=e,e.on("change",this.$onChange),this.bgTokenizer&&this.bgTokenizer.setDocument(this.getDocument()),this.resetCaches()},this.getDocument=function(){return this.doc},this.$resetRowCache=function(e){if(!e){this.$docRowCache=[],this.$screenRowCache=[];return}var t=this.$docRowCache.length,n=this.$getRowCacheIndex(this.$docRowCache,e)+1;t>n&&(this.$docRowCache.splice(n,t),this.$screenRowCache.splice(n,t))},this.$getRowCacheIndex=function(e,t){var n=0,r=e.length-1;while(n<=r){var i=n+r>>1,s=e[i];if(t>s)n=i+1;else{if(!(t<s))return i;r=i-1}}return n-1},this.resetCaches=function(){this.$modified=!0,this.$wrapData=[],this.$rowLengthCache=[],this.$resetRowCache(0),this.bgTokenizer&&this.bgTokenizer.start(0)},this.onChangeFold=function(e){var t=e.data;this.$resetRowCache(t.start.row)},this.onChange=function(e){this.$modified=!0,this.$resetRowCache(e.start.row);var t=this.$updateInternalDataOnChange(e);!this.$fromUndo&&this.$undoManager&&!e.ignore&&(this.$deltasDoc.push(e),t&&t.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:t}),this.$informUndoManager.schedule()),this.bgTokenizer&&this.bgTokenizer.$updateOnChange(e),this._signal("change",e)},this.setValue=function(e){this.doc.setValue(e),this.selection.moveTo(0,0),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.setUndoManager(this.$undoManager),this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(e){return this.bgTokenizer.getState(e)},this.getTokens=function(e){return this.bgTokenizer.getTokens(e)},this.getTokenAt=function(e,t){var n=this.bgTokenizer.getTokens(e),r,i=0;if(t==null)s=n.length-1,i=this.getLine(e).length;else for(var s=0;s<n.length;s++){i+=n[s].value.length;if(i>=t)break}return r=n[s],r?(r.index=s,r.start=i-r.value.length,r):null},this.setUndoManager=function(e){this.$undoManager=e,this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(e){var t=this;this.$syncInformUndoManager=function(){t.$informUndoManager.cancel(),t.$deltasFold.length&&(t.$deltas.push({group:"fold",deltas:t.$deltasFold}),t.$deltasFold=[]),t.$deltasDoc.length&&(t.$deltas.push({group:"doc",deltas:t.$deltasDoc}),t.$deltasDoc=[]),t.$deltas.length>0&&e.execute({action:"aceupdate",args:[t.$deltas,t],merge:t.mergeUndoDeltas}),t.mergeUndoDeltas=!1,t.$deltas=[]},this.$informUndoManager=i.delayedCall(this.$syncInformUndoManager)}},this.markUndoGroup=function(){this.$syncInformUndoManager&&this.$syncInformUndoManager()},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?i.stringRepeat(" ",this.getTabSize()):"	"},this.setUseSoftTabs=function(e){this.setOption("useSoftTabs",e)},this.getUseSoftTabs=function(){return this.$useSoftTabs&&!this.$mode.$indentWithTabs},this.setTabSize=function(e){this.setOption("tabSize",e)},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(e){return this.$useSoftTabs&&e.column%this.$tabSize===0},this.setNavigateWithinSoftTabs=function(e){this.setOption("navigateWithinSoftTabs",e)},this.getNavigateWithinSoftTabs=function(){return this.$navigateWithinSoftTabs},this.$overwrite=!1,this.setOverwrite=function(e){this.setOption("overwrite",e)},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.addGutterDecoration=function(e,t){this.$decorations[e]||(this.$decorations[e]=""),this.$decorations[e]+=" "+t,this._signal("changeBreakpoint",{})},this.removeGutterDecoration=function(e,t){this.$decorations[e]=(this.$decorations[e]||"").replace(" "+t,""),this._signal("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(e){this.$breakpoints=[];for(var t=0;t<e.length;t++)this.$breakpoints[e[t]]="ace_breakpoint";this._signal("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._signal("changeBreakpoint",{})},this.setBreakpoint=function(e,t){t===undefined&&(t="ace_breakpoint"),t?this.$breakpoints[e]=t:delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.clearBreakpoint=function(e){delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.addMarker=function(e,t,n,r){var i=this.$markerId++,s={range:e,type:n||"line",renderer:typeof n=="function"?n:null,clazz:t,inFront:!!r,id:i};return r?(this.$frontMarkers[i]=s,this._signal("changeFrontMarker")):(this.$backMarkers[i]=s,this._signal("changeBackMarker")),i},this.addDynamicMarker=function(e,t){if(!e.update)return;var n=this.$markerId++;return e.id=n,e.inFront=!!t,t?(this.$frontMarkers[n]=e,this._signal("changeFrontMarker")):(this.$backMarkers[n]=e,this._signal("changeBackMarker")),e},this.removeMarker=function(e){var t=this.$frontMarkers[e]||this.$backMarkers[e];if(!t)return;var n=t.inFront?this.$frontMarkers:this.$backMarkers;t&&(delete n[e],this._signal(t.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(e){return e?this.$frontMarkers:this.$backMarkers},this.highlight=function(e){if(!this.$searchHighlight){var t=new h(null,"ace_selected-word","text");this.$searchHighlight=this.addDynamicMarker(t)}this.$searchHighlight.setRegexp(e)},this.highlightLines=function(e,t,n,r){typeof t!="number"&&(n=t,t=e),n||(n="ace_step");var i=new f(e,0,t,Infinity);return i.id=this.addMarker(i,n,"fullLine",r),i},this.setAnnotations=function(e){this.$annotations=e,this._signal("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||[]},this.clearAnnotations=function(){this.setAnnotations([])},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r?\n)/m);t?this.$autoNewLine=t[1]:this.$autoNewLine="\n"},this.getWordRange=function(e,t){var n=this.getLine(e),r=!1;t>0&&(r=!!n.charAt(t-1).match(this.tokenRe)),r||(r=!!n.charAt(t).match(this.tokenRe));if(r)var i=this.tokenRe;else if(/^\s+$/.test(n.slice(t-1,t+1)))var i=/\s/;else var i=this.nonTokenRe;var s=t;if(s>0){do s--;while(s>=0&&n.charAt(s).match(i));s++}var o=t;while(o<n.length&&n.charAt(o).match(i))o++;return new f(e,s,e,o)},this.getAWordRange=function(e,t){var n=this.getWordRange(e,t),r=this.getLine(n.end.row);while(r.charAt(n.end.column).match(/[ \t]/))n.end.column+=1;return n},this.setNewLineMode=function(e){this.doc.setNewLineMode(e)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.setUseWorker=function(e){this.setOption("useWorker",e)},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(e){var t=e.data;this.bgTokenizer.start(t.first),this._signal("tokenizerUpdate",e)},this.$modes={},this.$mode=null,this.$modeId=null,this.setMode=function(e,t){if(e&&typeof e=="object"){if(e.getTokenizer)return this.$onChangeMode(e);var n=e,r=n.path}else r=e||"ace/mode/text";this.$modes["ace/mode/text"]||(this.$modes["ace/mode/text"]=new a);if(this.$modes[r]&&!n){this.$onChangeMode(this.$modes[r]),t&&t();return}this.$modeId=r,s.loadModule(["mode",r],function(e){if(this.$modeId!==r)return t&&t();this.$modes[r]&&!n?this.$onChangeMode(this.$modes[r]):e&&e.Mode&&(e=new e.Mode(n),n||(this.$modes[r]=e,e.$id=r),this.$onChangeMode(e)),t&&t()}.bind(this)),this.$mode||this.$onChangeMode(this.$modes["ace/mode/text"],!0)},this.$onChangeMode=function(e,t){t||(this.$modeId=e.$id);if(this.$mode===e)return;this.$mode=e,this.$stopWorker(),this.$useWorker&&this.$startWorker();var n=e.getTokenizer();if(n.addEventListener!==undefined){var r=this.onReloadTokenizer.bind(this);n.addEventListener("update",r)}if(!this.bgTokenizer){this.bgTokenizer=new c(n);var i=this;this.bgTokenizer.addEventListener("update",function(e){i._signal("tokenizerUpdate",e)})}else this.bgTokenizer.setTokenizer(n);this.bgTokenizer.setDocument(this.getDocument()),this.tokenRe=e.tokenRe,this.nonTokenRe=e.nonTokenRe,t||(e.attachToSession&&e.attachToSession(this),this.$options.wrapMethod.set.call(this,this.$wrapMethod),this.$setFolding(e.foldingRules),this.bgTokenizer.start(0),this._emit("changeMode"))},this.$stopWorker=function(){this.$worker&&(this.$worker.terminate(),this.$worker=null)},this.$startWorker=function(){try{this.$worker=this.$mode.createWorker(this)}catch(e){s.warn("Could not load worker",e),this.$worker=null}},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(e){if(this.$scrollTop===e||isNaN(e))return;this.$scrollTop=e,this._signal("changeScrollTop",e)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(e){if(this.$scrollLeft===e||isNaN(e))return;this.$scrollLeft=e,this._signal("changeScrollLeft",e)},this.getScrollLeft=function(){return this.$scrollLeft},this.getScreenWidth=function(){return this.$computeWidth(),this.lineWidgets?Math.max(this.getLineWidgetMaxWidth(),this.screenWidth):this.screenWidth},this.getLineWidgetMaxWidth=function(){if(this.lineWidgetsWidth!=null)return this.lineWidgetsWidth;var e=0;return this.lineWidgets.forEach(function(t){t&&t.screenWidth>e&&(e=t.screenWidth)}),this.lineWidgetWidth=e},this.$computeWidth=function(e){if(this.$modified||e){this.$modified=!1;if(this.$useWrapMode)return this.screenWidth=this.$wrapLimit;var t=this.doc.getAllLines(),n=this.$rowLengthCache,r=0,i=0,s=this.$foldData[i],o=s?s.start.row:Infinity,u=t.length;for(var a=0;a<u;a++){if(a>o){a=s.end.row+1;if(a>=u)break;s=this.$foldData[i++],o=s?s.start.row:Infinity}n[a]==null&&(n[a]=this.$getStringScreenWidth(t[a])[0]),n[a]>r&&(r=n[a])}this.screenWidth=r}},this.getLine=function(e){return this.doc.getLine(e)},this.getLines=function(e,t){return this.doc.getLines(e,t)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(e){return this.doc.getTextRange(e||this.selection.getRange())},this.insert=function(e,t){return this.doc.insert(e,t)},this.remove=function(e){return this.doc.remove(e)},this.removeFullLines=function(e,t){return this.doc.removeFullLines(e,t)},this.undoChanges=function(e,t){if(!e.length)return;this.$fromUndo=!0;var n=null;for(var r=e.length-1;r!=-1;r--){var i=e[r];i.group=="doc"?(this.doc.revertDeltas(i.deltas),n=this.$getUndoSelection(i.deltas,!0,n)):i.deltas.forEach(function(e){this.addFolds(e.folds)},this)}return this.$fromUndo=!1,n&&this.$undoSelect&&!t&&this.selection.setSelectionRange(n),n},this.redoChanges=function(e,t){if(!e.length)return;this.$fromUndo=!0;var n=null;for(var r=0;r<e.length;r++){var i=e[r];i.group=="doc"&&(this.doc.applyDeltas(i.deltas),n=this.$getUndoSelection(i.deltas,!1,n))}return this.$fromUndo=!1,n&&this.$undoSelect&&!t&&this.selection.setSelectionRange(n),n},this.setUndoSelect=function(e){this.$undoSelect=e},this.$getUndoSelection=function(e,t,n){function r(e){return t?e.action!=="insert":e.action==="insert"}var i=e[0],s,o,u=!1;r(i)?(s=f.fromPoints(i.start,i.end),u=!0):(s=f.fromPoints(i.start,i.start),u=!1);for(var a=1;a<e.length;a++)i=e[a],r(i)?(o=i.start,s.compare(o.row,o.column)==-1&&s.setStart(o),o=i.end,s.compare(o.row,o.column)==1&&s.setEnd(o),u=!0):(o=i.start,s.compare(o.row,o.column)==-1&&(s=f.fromPoints(i.start,i.start)),u=!1);if(n!=null){f.comparePoints(n.start,s.start)===0&&(n.start.column+=s.end.column-s.start.column,n.end.column+=s.end.column-s.start.column);var l=n.compareRange(s);l==1?s.setStart(n.start):l==-1&&s.setEnd(n.end)}return s},this.replace=function(e,t){return this.doc.replace(e,t)},this.moveText=function(e,t,n){var r=this.getTextRange(e),i=this.getFoldsInRange(e),s=f.fromPoints(t,t);if(!n){this.remove(e);var o=e.start.row-e.end.row,u=o?-e.end.column:e.start.column-e.end.column;u&&(s.start.row==e.end.row&&s.start.column>e.end.column&&(s.start.column+=u),s.end.row==e.end.row&&s.end.column>e.end.column&&(s.end.column+=u)),o&&s.start.row>=e.end.row&&(s.start.row+=o,s.end.row+=o)}s.end=this.insert(s.start,r);if(i.length){var a=e.start,l=s.start,o=l.row-a.row,u=l.column-a.column;this.addFolds(i.map(function(e){return e=e.clone(),e.start.row==a.row&&(e.start.column+=u),e.end.row==a.row&&(e.end.column+=u),e.start.row+=o,e.end.row+=o,e}))}return s},this.indentRows=function(e,t,n){n=n.replace(/\t/g,this.getTabString());for(var r=e;r<=t;r++)this.doc.insertInLine({row:r,column:0},n)},this.outdentRows=function(e){var t=e.collapseRows(),n=new f(0,0,0,0),r=this.getTabSize();for(var i=t.start.row;i<=t.end.row;++i){var s=this.getLine(i);n.start.row=i,n.end.row=i;for(var o=0;o<r;++o)if(s.charAt(o)!=" ")break;o<r&&s.charAt(o)=="	"?(n.start.column=o,n.end.column=o+1):(n.start.column=0,n.end.column=o),this.remove(n)}},this.$moveLines=function(e,t,n){e=this.getRowFoldStart(e),t=this.getRowFoldEnd(t);if(n<0){var r=this.getRowFoldStart(e+n);if(r<0)return 0;var i=r-e}else if(n>0){var r=this.getRowFoldEnd(t+n);if(r>this.doc.getLength()-1)return 0;var i=r-t}else{e=this.$clipRowToDocument(e),t=this.$clipRowToDocument(t);var i=t-e+1}var s=new f(e,0,t,Number.MAX_VALUE),o=this.getFoldsInRange(s).map(function(e){return e=e.clone(),e.start.row+=i,e.end.row+=i,e}),u=n==0?this.doc.getLines(e,t):this.doc.removeFullLines(e,t);return this.doc.insertFullLines(e+i,u),o.length&&this.addFolds(o),i},this.moveLinesUp=function(e,t){return this.$moveLines(e,t,-1)},this.moveLinesDown=function(e,t){return this.$moveLines(e,t,1)},this.duplicateLines=function(e,t){return this.$moveLines(e,t,0)},this.$clipRowToDocument=function(e){return Math.max(0,Math.min(e,this.doc.getLength()-1))},this.$clipColumnToRow=function(e,t){return t<0?0:Math.min(this.doc.getLine(e).length,t)},this.$clipPositionToDocument=function(e,t){t=Math.max(0,t);if(e<0)e=0,t=0;else{var n=this.doc.getLength();e>=n?(e=n-1,t=this.doc.getLine(n-1).length):t=Math.min(this.doc.getLine(e).length,t)}return{row:e,column:t}},this.$clipRangeToDocument=function(e){e.start.row<0?(e.start.row=0,e.start.column=0):e.start.column=this.$clipColumnToRow(e.start.row,e.start.column);var t=this.doc.getLength()-1;return e.end.row>t?(e.end.row=t,e.end.column=this.doc.getLine(t).length):e.end.column=this.$clipColumnToRow(e.end.row,e.end.column),e},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(e){if(e!=this.$useWrapMode){this.$useWrapMode=e,this.$modified=!0,this.$resetRowCache(0);if(e){var t=this.getLength();this.$wrapData=Array(t),this.$updateWrapData(0,t-1)}this._signal("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(e,t){if(this.$wrapLimitRange.min!==e||this.$wrapLimitRange.max!==t)this.$wrapLimitRange={min:e,max:t},this.$modified=!0,this.$useWrapMode&&this._signal("changeWrapMode")},this.adjustWrapLimit=function(e,t){var n=this.$wrapLimitRange;n.max<0&&(n={min:t,max:t});var r=this.$constrainWrapLimit(e,n.min,n.max);return r!=this.$wrapLimit&&r>1?(this.$wrapLimit=r,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._signal("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(e,t,n){return t&&(e=Math.max(t,e)),n&&(e=Math.min(n,e)),e},this.getWrapLimit=function(){return this.$wrapLimit},this.setWrapLimit=function(e){this.setWrapLimitRange(e,e)},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(e){var t=this.$useWrapMode,n=e.action,r=e.start,i=e.end,s=r.row,o=i.row,u=o-s,a=null;this.$updating=!0;if(u!=0)if(n==="remove"){this[t?"$wrapData":"$rowLengthCache"].splice(s,u);var f=this.$foldData;a=this.getFoldsInRange(e),this.removeFolds(a);var l=this.getFoldLine(i.row),c=0;if(l){l.addRemoveChars(i.row,i.column,r.column-i.column),l.shiftRow(-u);var h=this.getFoldLine(s);h&&h!==l&&(h.merge(l),l=h),c=f.indexOf(l)+1}for(c;c<f.length;c++){var l=f[c];l.start.row>=i.row&&l.shiftRow(-u)}o=s}else{var p=Array(u);p.unshift(s,0);var d=t?this.$wrapData:this.$rowLengthCache;d.splice.apply(d,p);var f=this.$foldData,l=this.getFoldLine(s),c=0;if(l){var v=l.range.compareInside(r.row,r.column);v==0?(l=l.split(r.row,r.column),l&&(l.shiftRow(u),l.addRemoveChars(o,0,i.column-r.column))):v==-1&&(l.addRemoveChars(s,0,i.column-r.column),l.shiftRow(u)),c=f.indexOf(l)+1}for(c;c<f.length;c++){var l=f[c];l.start.row>=s&&l.shiftRow(u)}}else{u=Math.abs(e.start.column-e.end.column),n==="remove"&&(a=this.getFoldsInRange(e),this.removeFolds(a),u=-u);var l=this.getFoldLine(s);l&&l.addRemoveChars(s,r.column,u)}return t&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),this.$updating=!1,t?this.$updateWrapData(s,o):this.$updateRowLengthCache(s,o),a},this.$updateRowLengthCache=function(e,t,n){this.$rowLengthCache[e]=null,this.$rowLengthCache[t]=null},this.$updateWrapData=function(e,t){var r=this.doc.getAllLines(),i=this.getTabSize(),s=this.$wrapData,o=this.$wrapLimit,a,f,l=e;t=Math.min(t,r.length-1);while(l<=t)f=this.getFoldLine(l,f),f?(a=[],f.walk(function(e,t,i,s){var o;if(e!=null){o=this.$getDisplayTokens(e,a.length),o[0]=n;for(var f=1;f<o.length;f++)o[f]=u}else o=this.$getDisplayTokens(r[t].substring(s,i),a.length);a=a.concat(o)}.bind(this),f.end.row,r[f.end.row].length+1),s[f.start.row]=this.$computeWrapSplits(a,o,i),l=f.end.row+1):(a=this.$getDisplayTokens(r[l]),s[l]=this.$computeWrapSplits(a,o,i),l++)};var e=1,t=2,n=3,u=4,l=9,p=10,d=11,v=12;this.$computeWrapSplits=function(e,r,i){function g(){var t=0;if(m===0)return t;if(h)for(var n=0;n<e.length;n++){var r=e[n];if(r==p)t+=1;else{if(r!=d){if(r==v)continue;break}t+=i}}return c&&h!==!1&&(t+=i),Math.min(t,m)}function y(t){var n=e.slice(a,t),r=n.length;n.join("").replace(/12/g,function(){r-=1}).replace(/2/g,function(){r-=1}),s.length||(b=g(),s.indent=b),f+=r,s.push(f),a=t}if(e.length==0)return[];var s=[],o=e.length,a=0,f=0,c=this.$wrapAsCode,h=this.$indentedSoftWrap,m=r<=Math.max(2*i,8)||h===!1?0:Math.floor(r/2),b=0;while(o-a>r-b){var w=a+r-b;if(e[w-1]>=p&&e[w]>=p){y(w);continue}if(e[w]==n||e[w]==u){for(w;w!=a-1;w--)if(e[w]==n)break;if(w>a){y(w);continue}w=a+r;for(w;w<e.length;w++)if(e[w]!=u)break;if(w==e.length)break;y(w);continue}var E=Math.max(w-(r-(r>>2)),a-1);while(w>E&&e[w]<n)w--;if(c){while(w>E&&e[w]<n)w--;while(w>E&&e[w]==l)w--}else while(w>E&&e[w]<p)w--;if(w>E){y(++w);continue}w=a+r,e[w]==t&&w--,y(w-b)}return s},this.$getDisplayTokens=function(n,r){var i=[],s;r=r||0;for(var o=0;o<n.length;o++){var u=n.charCodeAt(o);if(u==9){s=this.getScreenTabSize(i.length+r),i.push(d);for(var a=1;a<s;a++)i.push(v)}else u==32?i.push(p):u>39&&u<48||u>57&&u<64?i.push(l):u>=4352&&m(u)?i.push(e,t):i.push(e)}return i},this.$getStringScreenWidth=function(e,t,n){if(t==0)return[0,0];t==null&&(t=Infinity),n=n||0;var r,i;for(i=0;i<e.length;i++){r=e.charCodeAt(i),r==9?n+=this.getScreenTabSize(n):r>=4352&&m(r)?n+=2:n+=1;if(n>t)break}return[n,i]},this.lineWidgets=null,this.getRowLength=function(e){if(this.lineWidgets)var t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0;else t=0;return!this.$useWrapMode||!this.$wrapData[e]?1+t:this.$wrapData[e].length+1+t},this.getRowLineCount=function(e){return!this.$useWrapMode||!this.$wrapData[e]?1:this.$wrapData[e].length+1},this.getRowWrapIndent=function(e){if(this.$useWrapMode){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE),n=this.$wrapData[t.row];return n.length&&n[0]<t.column?n.indent:0}return 0},this.getScreenLastRowColumn=function(e){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE);return this.documentToScreenColumn(t.row,t.column)},this.getDocumentLastRowColumn=function(e,t){var n=this.documentToScreenRow(e,t);return this.getScreenLastRowColumn(n)},this.getDocumentLastRowColumnPosition=function(e,t){var n=this.documentToScreenRow(e,t);return this.screenToDocumentPosition(n,Number.MAX_VALUE/10)},this.getRowSplitData=function(e){return this.$useWrapMode?this.$wrapData[e]:undefined},this.getScreenTabSize=function(e){return this.$tabSize-e%this.$tabSize},this.screenToDocumentRow=function(e,t){return this.screenToDocumentPosition(e,t).row},this.screenToDocumentColumn=function(e,t){return this.screenToDocumentPosition(e,t).column},this.screenToDocumentPosition=function(e,t){if(e<0)return{row:0,column:0};var n,r=0,i=0,s,o=0,u=0,a=this.$screenRowCache,f=this.$getRowCacheIndex(a,e),l=a.length;if(l&&f>=0)var o=a[f],r=this.$docRowCache[f],c=e>a[l-1];else var c=!l;var h=this.getLength()-1,p=this.getNextFoldLine(r),d=p?p.start.row:Infinity;while(o<=e){u=this.getRowLength(r);if(o+u>e||r>=h)break;o+=u,r++,r>d&&(r=p.end.row+1,p=this.getNextFoldLine(r,p),d=p?p.start.row:Infinity),c&&(this.$docRowCache.push(r),this.$screenRowCache.push(o))}if(p&&p.start.row<=r)n=this.getFoldDisplayLine(p),r=p.start.row;else{if(o+u<=e||r>h)return{row:h,column:this.getLine(h).length};n=this.getLine(r),p=null}var v=0;if(this.$useWrapMode){var m=this.$wrapData[r];if(m){var g=Math.floor(e-o);s=m[g],g>0&&m.length&&(v=m.indent,i=m[g-1]||m[m.length-1],n=n.substring(i))}}return i+=this.$getStringScreenWidth(n,t-v)[1],this.$useWrapMode&&i>=s&&(i=s-1),p?p.idxToPosition(i):{row:r,column:i}},this.documentToScreenPosition=function(e,t){if(typeof t=="undefined")var n=this.$clipPositionToDocument(e.row,e.column);else n=this.$clipPositionToDocument(e,t);e=n.row,t=n.column;var r=0,i=null,s=null;s=this.getFoldAt(e,t,1),s&&(e=s.start.row,t=s.start.column);var o,u=0,a=this.$docRowCache,f=this.$getRowCacheIndex(a,e),l=a.length;if(l&&f>=0)var u=a[f],r=this.$screenRowCache[f],c=e>a[l-1];else var c=!l;var h=this.getNextFoldLine(u),p=h?h.start.row:Infinity;while(u<e){if(u>=p){o=h.end.row+1;if(o>e)break;h=this.getNextFoldLine(o,h),p=h?h.start.row:Infinity}else o=u+1;r+=this.getRowLength(u),u=o,c&&(this.$docRowCache.push(u),this.$screenRowCache.push(r))}var d="";h&&u>=p?(d=this.getFoldDisplayLine(h,e,t),i=h.start.row):(d=this.getLine(e).substring(0,t),i=e);var v=0;if(this.$useWrapMode){var m=this.$wrapData[i];if(m){var g=0;while(d.length>=m[g])r++,g++;d=d.substring(m[g-1]||0,d.length),v=g>0?m.indent:0}}return{row:r,column:v+this.$getStringScreenWidth(d)[0]}},this.documentToScreenColumn=function(e,t){return this.documentToScreenPosition(e,t).column},this.documentToScreenRow=function(e,t){return this.documentToScreenPosition(e,t).row},this.getScreenLength=function(){var e=0,t=null;if(!this.$useWrapMode){e=this.getLength();var n=this.$foldData;for(var r=0;r<n.length;r++)t=n[r],e-=t.end.row-t.start.row}else{var i=this.$wrapData.length,s=0,r=0,t=this.$foldData[r++],o=t?t.start.row:Infinity;while(s<i){var u=this.$wrapData[s];e+=u?u.length+1:1,s++,s>o&&(s=t.end.row+1,t=this.$foldData[r++],o=t?t.start.row:Infinity)}}return this.lineWidgets&&(e+=this.$getWidgetScreenLength()),e},this.$setFontMetrics=function(e){if(!this.$enableVarChar)return;this.$getStringScreenWidth=function(t,n,r){if(n===0)return[0,0];n||(n=Infinity),r=r||0;var i,s;for(s=0;s<t.length;s++){i=t.charAt(s),i==="	"?r+=this.getScreenTabSize(r):r+=e.getCharacterWidth(i);if(r>n)break}return[r,s]}},this.destroy=function(){this.bgTokenizer&&(this.bgTokenizer.setDocument(null),this.bgTokenizer=null),this.$stopWorker()}}.call(p.prototype),e("./edit_session/folding").Folding.call(p.prototype),e("./edit_session/bracket_match").BracketMatch.call(p.prototype),s.defineOptions(p.prototype,"session",{wrap:{set:function(e){!e||e=="off"?e=!1:e=="free"?e=!0:e=="printMargin"?e=-1:typeof e=="string"&&(e=parseInt(e,10)||!1);if(this.$wrap==e)return;this.$wrap=e;if(!e)this.setUseWrapMode(!1);else{var t=typeof e=="number"?e:null;this.setWrapLimitRange(t,t),this.setUseWrapMode(!0)}},get:function(){return this.getUseWrapMode()?this.$wrap==-1?"printMargin":this.getWrapLimitRange().min?this.$wrap:"free":"off"},handlesSet:!0},wrapMethod:{set:function(e){e=e=="auto"?this.$mode.type!="text":e!="text",e!=this.$wrapAsCode&&(this.$wrapAsCode=e,this.$useWrapMode&&(this.$modified=!0,this.$resetRowCache(0),this.$updateWrapData(0,this.getLength()-1)))},initialValue:"auto"},indentedSoftWrap:{initialValue:!0},firstLineNumber:{set:function(){this._signal("changeBreakpoint")},initialValue:1},useWorker:{set:function(e){this.$useWorker=e,this.$stopWorker(),e&&this.$startWorker()},initialValue:!0},useSoftTabs:{initialValue:!0},tabSize:{set:function(e){if(isNaN(e)||this.$tabSize===e)return;this.$modified=!0,this.$rowLengthCache=[],this.$tabSize=e,this._signal("changeTabSize")},initialValue:4,handlesSet:!0},navigateWithinSoftTabs:{initialValue:!1},overwrite:{set:function(e){this._signal("changeOverwrite")},initialValue:!1},newLineMode:{set:function(e){this.doc.setNewLineMode(e)},get:function(){return this.doc.getNewLineMode()},handlesSet:!0},mode:{set:function(e){this.setMode(e)},get:function(){return this.$modeId}}}),t.EditSession=p}),ace.define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(e,t,n){"use strict";function u(e,t){function n(e){return/\w/.test(e)||t.regExp?"\\b":""}return n(e[0])+e+n(e[e.length-1])}var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./range").Range,o=function(){this.$options={}};(function(){this.set=function(e){return i.mixin(this.$options,e),this},this.getOptions=function(){return r.copyObject(this.$options)},this.setOptions=function(e){this.$options=e},this.find=function(e){var t=this.$options,n=this.$matchIterator(e,t);if(!n)return!1;var r=null;return n.forEach(function(e,n,i,o){return r=new s(e,n,i,o),n==o&&t.start&&t.start.start&&t.skipCurrent!=0&&r.isEqual(t.start)?(r=null,!1):!0}),r},this.findAll=function(e){var t=this.$options;if(!t.needle)return[];this.$assembleRegExp(t);var n=t.range,i=n?e.getLines(n.start.row,n.end.row):e.doc.getAllLines(),o=[],u=t.re;if(t.$isMultiLine){var a=u.length,f=i.length-a,l;e:for(var c=u.offset||0;c<=f;c++){for(var h=0;h<a;h++)if(i[c+h].search(u[h])==-1)continue e;var p=i[c],d=i[c+a-1],v=p.length-p.match(u[0])[0].length,m=d.match(u[a-1])[0].length;if(l&&l.end.row===c&&l.end.column>v)continue;o.push(l=new s(c,v,c+a-1,m)),a>2&&(c=c+a-2)}}else for(var g=0;g<i.length;g++){var y=r.getMatchOffsets(i[g],u);for(var h=0;h<y.length;h++){var b=y[h];o.push(new s(g,b.offset,g,b.offset+b.length))}}if(n){var w=n.start.column,E=n.start.column,g=0,h=o.length-1;while(g<h&&o[g].start.column<w&&o[g].start.row==n.start.row)g++;while(g<h&&o[h].end.column>E&&o[h].end.row==n.end.row)h--;o=o.slice(g,h+1);for(g=0,h=o.length;g<h;g++)o[g].start.row+=n.start.row,o[g].end.row+=n.start.row}return o},this.replace=function(e,t){var n=this.$options,r=this.$assembleRegExp(n);if(n.$isMultiLine)return t;if(!r)return;var i=r.exec(e);if(!i||i[0].length!=e.length)return null;t=e.replace(r,t);if(n.preserveCase){t=t.split("");for(var s=Math.min(e.length,e.length);s--;){var o=e[s];o&&o.toLowerCase()!=o?t[s]=t[s].toUpperCase():t[s]=t[s].toLowerCase()}t=t.join("")}return t},this.$assembleRegExp=function(e,t){if(e.needle instanceof RegExp)return e.re=e.needle;var n=e.needle;if(!e.needle)return e.re=!1;e.regExp||(n=r.escapeRegExp(n)),e.wholeWord&&(n=u(n,e));var i=e.caseSensitive?"gm":"gmi";e.$isMultiLine=!t&&/[\n\r]/.test(n);if(e.$isMultiLine)return e.re=this.$assembleMultilineRegExp(n,i);try{var s=new RegExp(n,i)}catch(o){s=!1}return e.re=s},this.$assembleMultilineRegExp=function(e,t){var n=e.replace(/\r\n|\r|\n/g,"$\n^").split("\n"),r=[];for(var i=0;i<n.length;i++)try{r.push(new RegExp(n[i],t))}catch(s){return!1}return r},this.$matchIterator=function(e,t){var n=this.$assembleRegExp(t);if(!n)return!1;var r=t.backwards==1,i=t.skipCurrent!=0,s=t.range,o=t.start;o||(o=s?s[r?"end":"start"]:e.selection.getRange()),o.start&&(o=o[i!=r?"end":"start"]);var u=s?s.start.row:0,a=s?s.end.row:e.getLength()-1;if(r)var f=function(e){var n=o.row;if(c(n,o.column,e))return;for(n--;n>=u;n--)if(c(n,Number.MAX_VALUE,e))return;if(t.wrap==0)return;for(n=a,u=o.row;n>=u;n--)if(c(n,Number.MAX_VALUE,e))return};else var f=function(e){var n=o.row;if(c(n,o.column,e))return;for(n+=1;n<=a;n++)if(c(n,0,e))return;if(t.wrap==0)return;for(n=u,a=o.row;n<=a;n++)if(c(n,0,e))return};if(t.$isMultiLine)var l=n.length,c=function(t,i,s){var o=r?t-l+1:t;if(o<0)return;var u=e.getLine(o),a=u.search(n[0]);if(!r&&a<i||a===-1)return;for(var f=1;f<l;f++){u=e.getLine(o+f);if(u.search(n[f])==-1)return}var c=u.match(n[l-1])[0].length;if(r&&c>i)return;if(s(o,a,o+l-1,c))return!0};else if(r)var c=function(t,r,i){var s=e.getLine(t),o=[],u,a=0;n.lastIndex=0;while(u=n.exec(s)){var f=u[0].length;a=u.index;if(!f){if(a>=s.length)break;n.lastIndex=a+=1}if(u.index+f>r)break;o.push(u.index,f)}for(var l=o.length-1;l>=0;l-=2){var c=o[l-1],f=o[l];if(i(t,c,t,c+f))return!0}};else var c=function(t,r,i){var s=e.getLine(t),o,u=r;n.lastIndex=r;while(o=n.exec(s)){var a=o[0].length;u=o.index;if(i(t,u,t,u+a))return!0;if(!a){n.lastIndex=u+=1;if(u>=s.length)return!1}}};return{forEach:f}}}).call(o.prototype),t.Search=o}),ace.define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys","ace/lib/useragent"],function(e,t,n){"use strict";function o(e,t){this.platform=t||(i.isMac?"mac":"win"),this.commands={},this.commandKeyBinding={},this.addCommands(e),this.$singleCommand=!0}function u(e,t){o.call(this,e,t),this.$singleCommand=!1}var r=e("../lib/keys"),i=e("../lib/useragent"),s=r.KEY_MODS;u.prototype=o.prototype,function(){function e(e){return typeof e=="object"&&e.bindKey&&e.bindKey.position||(e.isDefault?-100:0)}this.addCommand=function(e){this.commands[e.name]&&this.removeCommand(e),this.commands[e.name]=e,e.bindKey&&this._buildKeyHash(e)},this.removeCommand=function(e,t){var n=e&&(typeof e=="string"?e:e.name);e=this.commands[n],t||delete this.commands[n];var r=this.commandKeyBinding;for(var i in r){var s=r[i];if(s==e)delete r[i];else if(Array.isArray(s)){var o=s.indexOf(e);o!=-1&&(s.splice(o,1),s.length==1&&(r[i]=s[0]))}}},this.bindKey=function(e,t,n){typeof e=="object"&&e&&(n==undefined&&(n=e.position),e=e[this.platform]);if(!e)return;if(typeof t=="function")return this.addCommand({exec:t,bindKey:e,name:t.name||e});e.split("|").forEach(function(e){var r="";if(e.indexOf(" ")!=-1){var i=e.split(/\s+/);e=i.pop(),i.forEach(function(e){var t=this.parseKeys(e),n=s[t.hashId]+t.key;r+=(r?" ":"")+n,this._addCommandToBinding(r,"chainKeys")},this),r+=" "}var o=this.parseKeys(e),u=s[o.hashId]+o.key;this._addCommandToBinding(r+u,t,n)},this)},this._addCommandToBinding=function(t,n,r){var i=this.commandKeyBinding,s;if(!n)delete i[t];else if(!i[t]||this.$singleCommand)i[t]=n;else{Array.isArray(i[t])?(s=i[t].indexOf(n))!=-1&&i[t].splice(s,1):i[t]=[i[t]],typeof r!="number"&&(r=e(n));var o=i[t];for(s=0;s<o.length;s++){var u=o[s],a=e(u);if(a>r)break}o.splice(s,0,n)}},this.addCommands=function(e){e&&Object.keys(e).forEach(function(t){var n=e[t];if(!n)return;if(typeof n=="string")return this.bindKey(n,t);typeof n=="function"&&(n={exec:n});if(typeof n!="object")return;n.name||(n.name=t),this.addCommand(n)},this)},this.removeCommands=function(e){Object.keys(e).forEach(function(t){this.removeCommand(e[t])},this)},this.bindKeys=function(e){Object.keys(e).forEach(function(t){this.bindKey(t,e[t])},this)},this._buildKeyHash=function(e){this.bindKey(e.bindKey,e)},this.parseKeys=function(e){var t=e.toLowerCase().split(/[\-\+]([\-\+])?/).filter(function(e){return e}),n=t.pop(),i=r[n];if(r.FUNCTION_KEYS[i])n=r.FUNCTION_KEYS[i].toLowerCase();else{if(!t.length)return{key:n,hashId:-1};if(t.length==1&&t[0]=="shift")return{key:n.toUpperCase(),hashId:-1}}var s=0;for(var o=t.length;o--;){var u=r.KEY_MODS[t[o]];if(u==null)return typeof console!="undefined"&&console.error("invalid modifier "+t[o]+" in "+e),!1;s|=u}return{key:n,hashId:s}},this.findKeyCommand=function(t,n){var r=s[t]+n;return this.commandKeyBinding[r]},this.handleKeyboard=function(e,t,n,r){if(r<0)return;var i=s[t]+n,o=this.commandKeyBinding[i];e.$keyChain&&(e.$keyChain+=" "+i,o=this.commandKeyBinding[e.$keyChain]||o);if(o)if(o=="chainKeys"||o[o.length-1]=="chainKeys")return e.$keyChain=e.$keyChain||i,{command:"null"};if(e.$keyChain)if(!!t&&t!=4||n.length!=1){if(t==-1||r>0)e.$keyChain=""}else e.$keyChain=e.$keyChain.slice(0,-i.length-1);return{command:o}},this.getStatusText=function(e,t){return t.$keyChain||""}}.call(o.prototype),t.HashHandler=o,t.MultiHashHandler=u}),ace.define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../keyboard/hash_handler").MultiHashHandler,s=e("../lib/event_emitter").EventEmitter,o=function(e,t){i.call(this,t,e),this.byName=this.commands,this.setDefaultHandler("exec",function(e){return e.command.exec(e.editor,e.args||{})})};r.inherits(o,i),function(){r.implement(this,s),this.exec=function(e,t,n){if(Array.isArray(e)){for(var r=e.length;r--;)if(this.exec(e[r],t,n))return!0;return!1}typeof e=="string"&&(e=this.commands[e]);if(!e)return!1;if(t&&t.$readOnly&&!e.readOnly)return!1;if(e.isAvailable&&!e.isAvailable(t))return!1;var i={editor:t,command:e,args:n};return i.returnValue=this._emit("exec",i),this._signal("afterExec",i),i.returnValue===!1?!1:!0},this.toggleRecording=function(e){if(this.$inReplay)return;return e&&e._emit("changeStatus"),this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(e){this.macro.push([e.command,e.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(e){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording(e);try{this.$inReplay=!0,this.macro.forEach(function(t){typeof t=="string"?this.exec(t,e):this.exec(t[0],e,t[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(e){return e.map(function(e){return typeof e[0]!="string"&&(e[0]=e[0].name),e[1]||(e=e[0]),e})}}.call(o.prototype),t.CommandManager=o}),ace.define("ace/commands/default_commands",["require","exports","module","ace/lib/lang","ace/config","ace/range"],function(e,t,n){"use strict";function o(e,t){return{win:e,mac:t}}var r=e("../lib/lang"),i=e("../config"),s=e("../range").Range;t.commands=[{name:"showSettingsMenu",bindKey:o("Ctrl-,","Command-,"),exec:function(e){i.loadModule("ace/ext/settings_menu",function(t){t.init(e),e.showSettingsMenu()})},readOnly:!0},{name:"goToNextError",bindKey:o("Alt-E","F4"),exec:function(e){i.loadModule("ace/ext/error_marker",function(t){t.showErrorMarker(e,1)})},scrollIntoView:"animate",readOnly:!0},{name:"goToPreviousError",bindKey:o("Alt-Shift-E","Shift-F4"),exec:function(e){i.loadModule("ace/ext/error_marker",function(t){t.showErrorMarker(e,-1)})},scrollIntoView:"animate",readOnly:!0},{name:"selectall",bindKey:o("Ctrl-A","Command-A"),exec:function(e){e.selectAll()},readOnly:!0},{name:"centerselection",bindKey:o(null,"Ctrl-L"),exec:function(e){e.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:o("Ctrl-L","Command-L"),exec:function(e){var t=parseInt(prompt("Enter line number:"),10);isNaN(t)||e.gotoLine(t)},readOnly:!0},{name:"fold",bindKey:o("Alt-L|Ctrl-F1","Command-Alt-L|Command-F1"),exec:function(e){e.session.toggleFold(!1)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"unfold",bindKey:o("Alt-Shift-L|Ctrl-Shift-F1","Command-Alt-Shift-L|Command-Shift-F1"),exec:function(e){e.session.toggleFold(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleFoldWidget",bindKey:o("F2","F2"),exec:function(e){e.session.toggleFoldWidget()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleParentFoldWidget",bindKey:o("Alt-F2","Alt-F2"),exec:function(e){e.session.toggleFoldWidget(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"foldall",bindKey:o(null,"Ctrl-Command-Option-0"),exec:function(e){e.session.foldAll()},scrollIntoView:"center",readOnly:!0},{name:"foldOther",bindKey:o("Alt-0","Command-Option-0"),exec:function(e){e.session.foldAll(),e.session.unfold(e.selection.getAllRanges())},scrollIntoView:"center",readOnly:!0},{name:"unfoldall",bindKey:o("Alt-Shift-0","Command-Option-Shift-0"),exec:function(e){e.session.unfold()},scrollIntoView:"center",readOnly:!0},{name:"findnext",bindKey:o("Ctrl-K","Command-G"),exec:function(e){e.findNext()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"findprevious",bindKey:o("Ctrl-Shift-K","Command-Shift-G"),exec:function(e){e.findPrevious()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"selectOrFindNext",bindKey:o("Alt-K","Ctrl-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findNext()},readOnly:!0},{name:"selectOrFindPrevious",bindKey:o("Alt-Shift-K","Ctrl-Shift-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findPrevious()},readOnly:!0},{name:"find",bindKey:o("Ctrl-F","Command-F"),exec:function(e){i.loadModule("ace/ext/searchbox",function(t){t.Search(e)})},readOnly:!0},{name:"overwrite",bindKey:"Insert",exec:function(e){e.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:o("Ctrl-Shift-Home","Command-Shift-Home|Command-Shift-Up"),exec:function(e){e.getSelection().selectFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotostart",bindKey:o("Ctrl-Home","Command-Home|Command-Up"),exec:function(e){e.navigateFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectup",bindKey:o("Shift-Up","Shift-Up|Ctrl-Shift-P"),exec:function(e){e.getSelection().selectUp()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golineup",bindKey:o("Up","Up|Ctrl-P"),exec:function(e,t){e.navigateUp(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttoend",bindKey:o("Ctrl-Shift-End","Command-Shift-End|Command-Shift-Down"),exec:function(e){e.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotoend",bindKey:o("Ctrl-End","Command-End|Command-Down"),exec:function(e){e.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectdown",bindKey:o("Shift-Down","Shift-Down|Ctrl-Shift-N"),exec:function(e){e.getSelection().selectDown()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golinedown",bindKey:o("Down","Down|Ctrl-N"),exec:function(e,t){e.navigateDown(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordleft",bindKey:o("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(e){e.getSelection().selectWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordleft",bindKey:o("Ctrl-Left","Option-Left"),exec:function(e){e.navigateWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolinestart",bindKey:o("Alt-Shift-Left","Command-Shift-Left|Ctrl-Shift-A"),exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolinestart",bindKey:o("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(e){e.navigateLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectleft",bindKey:o("Shift-Left","Shift-Left|Ctrl-Shift-B"),exec:function(e){e.getSelection().selectLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoleft",bindKey:o("Left","Left|Ctrl-B"),exec:function(e,t){e.navigateLeft(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordright",bindKey:o("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(e){e.getSelection().selectWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordright",bindKey:o("Ctrl-Right","Option-Right"),exec:function(e){e.navigateWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolineend",bindKey:o("Alt-Shift-Right","Command-Shift-Right|Shift-End|Ctrl-Shift-E"),exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolineend",bindKey:o("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(e){e.navigateLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectright",bindKey:o("Shift-Right","Shift-Right"),exec:function(e){e.getSelection().selectRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoright",bindKey:o("Right","Right|Ctrl-F"),exec:function(e,t){e.navigateRight(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectpagedown",bindKey:"Shift-PageDown",exec:function(e){e.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:o(null,"Option-PageDown"),exec:function(e){e.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:o("PageDown","PageDown|Ctrl-V"),exec:function(e){e.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:"Shift-PageUp",exec:function(e){e.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:o(null,"Option-PageUp"),exec:function(e){e.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:"PageUp",exec:function(e){e.gotoPageUp()},readOnly:!0},{name:"scrollup",bindKey:o("Ctrl-Up",null),exec:function(e){e.renderer.scrollBy(0,-2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"scrolldown",bindKey:o("Ctrl-Down",null),exec:function(e){e.renderer.scrollBy(0,2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"selectlinestart",bindKey:"Shift-Home",exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectlineend",bindKey:"Shift-End",exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"togglerecording",bindKey:o("Ctrl-Alt-E","Command-Option-E"),exec:function(e){e.commands.toggleRecording(e)},readOnly:!0},{name:"replaymacro",bindKey:o("Ctrl-Shift-E","Command-Shift-E"),exec:function(e){e.commands.replay(e)},readOnly:!0},{name:"jumptomatching",bindKey:o("Ctrl-P","Ctrl-P"),exec:function(e){e.jumpToMatching()},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"selecttomatching",bindKey:o("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(e){e.jumpToMatching(!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"expandToMatching",bindKey:o("Ctrl-Shift-M","Ctrl-Shift-M"),exec:function(e){e.jumpToMatching(!0,!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"passKeysToBrowser",bindKey:o(null,null),exec:function(){},passEvent:!0,readOnly:!0},{name:"copy",exec:function(e){},readOnly:!0},{name:"cut",exec:function(e){var t=e.getSelectionRange();e._emit("cut",t),e.selection.isEmpty()||(e.session.remove(t),e.clearSelection())},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"paste",exec:function(e,t){e.$handlePaste(t)},scrollIntoView:"cursor"},{name:"removeline",bindKey:o("Ctrl-D","Command-D"),exec:function(e){e.removeLines()},scrollIntoView:"cursor",multiSelectAction:"forEachLine"},{name:"duplicateSelection",bindKey:o("Ctrl-Shift-D","Command-Shift-D"),exec:function(e){e.duplicateSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"sortlines",bindKey:o("Ctrl-Alt-S","Command-Alt-S"),exec:function(e){e.sortLines()},scrollIntoView:"selection",multiSelectAction:"forEachLine"},{name:"togglecomment",bindKey:o("Ctrl-/","Command-/"),exec:function(e){e.toggleCommentLines()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"toggleBlockComment",bindKey:o("Ctrl-Shift-/","Command-Shift-/"),exec:function(e){e.toggleBlockComment()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"modifyNumberUp",bindKey:o("Ctrl-Shift-Up","Alt-Shift-Up"),exec:function(e){e.modifyNumber(1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"modifyNumberDown",bindKey:o("Ctrl-Shift-Down","Alt-Shift-Down"),exec:function(e){e.modifyNumber(-1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"replace",bindKey:o("Ctrl-H","Command-Option-F"),exec:function(e){i.loadModule("ace/ext/searchbox",function(t){t.Search(e,!0)})}},{name:"undo",bindKey:o("Ctrl-Z","Command-Z"),exec:function(e){e.undo()}},{name:"redo",bindKey:o("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(e){e.redo()}},{name:"copylinesup",bindKey:o("Alt-Shift-Up","Command-Option-Up"),exec:function(e){e.copyLinesUp()},scrollIntoView:"cursor"},{name:"movelinesup",bindKey:o("Alt-Up","Option-Up"),exec:function(e){e.moveLinesUp()},scrollIntoView:"cursor"},{name:"copylinesdown",bindKey:o("Alt-Shift-Down","Command-Option-Down"),exec:function(e){e.copyLinesDown()},scrollIntoView:"cursor"},{name:"movelinesdown",bindKey:o("Alt-Down","Option-Down"),exec:function(e){e.moveLinesDown()},scrollIntoView:"cursor"},{name:"del",bindKey:o("Delete","Delete|Ctrl-D|Shift-Delete"),exec:function(e){e.remove("right")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"backspace",bindKey:o("Shift-Backspace|Backspace","Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(e){e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"cut_or_delete",bindKey:o("Shift-Delete",null),exec:function(e){if(!e.selection.isEmpty())return!1;e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestart",bindKey:o("Alt-Backspace","Command-Backspace"),exec:function(e){e.removeToLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineend",bindKey:o("Alt-Delete","Ctrl-K"),exec:function(e){e.removeToLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordleft",bindKey:o("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(e){e.removeWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordright",bindKey:o("Ctrl-Delete","Alt-Delete"),exec:function(e){e.removeWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"outdent",bindKey:o("Shift-Tab","Shift-Tab"),exec:function(e){e.blockOutdent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"indent",bindKey:o("Tab","Tab"),exec:function(e){e.indent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"blockoutdent",bindKey:o("Ctrl-[","Ctrl-["),exec:function(e){e.blockOutdent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"blockindent",bindKey:o("Ctrl-]","Ctrl-]"),exec:function(e){e.blockIndent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"insertstring",exec:function(e,t){e.insert(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"inserttext",exec:function(e,t){e.insert(r.stringRepeat(t.text||"",t.times||1))},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"splitline",bindKey:o(null,"Ctrl-O"),exec:function(e){e.splitLine()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"transposeletters",bindKey:o("Alt-Shift-X","Ctrl-T"),exec:function(e){e.transposeLetters()},multiSelectAction:function(e){e.transposeSelections(1)},scrollIntoView:"cursor"},{name:"touppercase",bindKey:o("Ctrl-U","Ctrl-U"),exec:function(e){e.toUpperCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"tolowercase",bindKey:o("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(e){e.toLowerCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"expandtoline",bindKey:o("Ctrl-Shift-L","Command-Shift-L"),exec:function(e){var t=e.selection.getRange();t.start.column=t.end.column=0,t.end.row++,e.selection.setRange(t,!1)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"joinlines",bindKey:o(null,null),exec:function(e){var t=e.selection.isBackwards(),n=t?e.selection.getSelectionLead():e.selection.getSelectionAnchor(),i=t?e.selection.getSelectionAnchor():e.selection.getSelectionLead(),o=e.session.doc.getLine(n.row).length,u=e.session.doc.getTextRange(e.selection.getRange()),a=u.replace(/\n\s*/," ").length,f=e.session.doc.getLine(n.row);for(var l=n.row+1;l<=i.row+1;l++){var c=r.stringTrimLeft(r.stringTrimRight(e.session.doc.getLine(l)));c.length!==0&&(c=" "+c),f+=c}i.row+1<e.session.doc.getLength()-1&&(f+=e.session.doc.getNewLineCharacter()),e.clearSelection(),e.session.doc.replace(new s(n.row,0,i.row+2,0),f),a>0?(e.selection.moveCursorTo(n.row,n.column),e.selection.selectTo(n.row,n.column+a)):(o=e.session.doc.getLine(n.row).length>o?o+1:o,e.selection.moveCursorTo(n.row,o))},multiSelectAction:"forEach",readOnly:!0},{name:"invertSelection",bindKey:o(null,null),exec:function(e){var t=e.session.doc.getLength()-1,n=e.session.doc.getLine(t).length,r=e.selection.rangeList.ranges,i=[];r.length<1&&(r=[e.selection.getRange()]);for(var o=0;o<r.length;o++)o==r.length-1&&(r[o].end.row!==t||r[o].end.column!==n)&&i.push(new s(r[o].end.row,r[o].end.column,t,n)),o===0?(r[o].start.row!==0||r[o].start.column!==0)&&i.push(new s(0,0,r[o].start.row,r[o].start.column)):i.push(new s(r[o-1].end.row,r[o-1].end.column,r[o].start.row,r[o].start.column));e.exitMultiSelectMode(),e.clearSelection();for(var o=0;o<i.length;o++)e.selection.addRange(i[o],!1)},readOnly:!0,scrollIntoView:"none"}]}),ace.define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands","ace/config","ace/token_iterator"],function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./lib/lang"),o=e("./lib/useragent"),u=e("./keyboard/textinput").TextInput,a=e("./mouse/mouse_handler").MouseHandler,f=e("./mouse/fold_handler").FoldHandler,l=e("./keyboard/keybinding").KeyBinding,c=e("./edit_session").EditSession,h=e("./search").Search,p=e("./range").Range,d=e("./lib/event_emitter").EventEmitter,v=e("./commands/command_manager").CommandManager,m=e("./commands/default_commands").commands,g=e("./config"),y=e("./token_iterator").TokenIterator,b=function(e,t){var n=e.getContainerElement();this.container=n,this.renderer=e,this.id="editor"+ ++b.$uid,this.commands=new v(o.isMac?"mac":"win",m),typeof document=="object"&&(this.textInput=new u(e.getTextAreaContainer(),this),this.renderer.textarea=this.textInput.getElement(),this.$mouseHandler=new a(this),new f(this)),this.keyBinding=new l(this),this.$blockScrolling=0,this.$search=(new h).set({wrap:!0}),this.$historyTracker=this.$historyTracker.bind(this),this.commands.on("exec",this.$historyTracker),this.$initOperationListeners(),this._$emitInputEvent=s.delayedCall(function(){this._signal("input",{}),this.session&&this.session.bgTokenizer&&this.session.bgTokenizer.scheduleStart()}.bind(this)),this.on("change",function(e,t){t._$emitInputEvent.schedule(31)}),this.setSession(t||new c("")),g.resetOptions(this),g._signal("editor",this)};b.$uid=0,function(){r.implement(this,d),this.$initOperationListeners=function(){function e(e){return e[e.length-1]}this.selections=[],this.commands.on("exec",this.startOperation.bind(this),!0),this.commands.on("afterExec",this.endOperation.bind(this),!0),this.$opResetTimer=s.delayedCall(this.endOperation.bind(this)),this.on("change",function(){this.curOp||this.startOperation(),this.curOp.docChanged=!0}.bind(this),!0),this.on("changeSelection",function(){this.curOp||this.startOperation(),this.curOp.selectionChanged=!0}.bind(this),!0)},this.curOp=null,this.prevOp={},this.startOperation=function(e){if(this.curOp){if(!e||this.curOp.command)return;this.prevOp=this.curOp}e||(this.previousCommand=null,e={}),this.$opResetTimer.schedule(),this.curOp={command:e.command||{},args:e.args,scrollTop:this.renderer.scrollTop},this.curOp.command.name&&this.curOp.command.scrollIntoView!==undefined&&this.$blockScrolling++},this.endOperation=function(e){if(this.curOp){if(e&&e.returnValue===!1)return this.curOp=null;this._signal("beforeEndOperation");var t=this.curOp.command;t.name&&this.$blockScrolling>0&&this.$blockScrolling--;var n=t&&t.scrollIntoView;if(n){switch(n){case"center-animate":n="animate";case"center":this.renderer.scrollCursorIntoView(null,.5);break;case"animate":case"cursor":this.renderer.scrollCursorIntoView();break;case"selectionPart":var r=this.selection.getRange(),i=this.renderer.layerConfig;(r.start.row>=i.lastRow||r.end.row<=i.firstRow)&&this.renderer.scrollSelectionIntoView(this.selection.anchor,this.selection.lead);break;default:}n=="animate"&&this.renderer.animateScrolling(this.curOp.scrollTop)}this.prevOp=this.curOp,this.curOp=null}},this.$mergeableCommands=["backspace","del","insertstring"],this.$historyTracker=function(e){if(!this.$mergeUndoDeltas)return;var t=this.prevOp,n=this.$mergeableCommands,r=t.command&&e.command.name==t.command.name;if(e.command.name=="insertstring"){var i=e.args;this.mergeNextCommand===undefined&&(this.mergeNextCommand=!0),r=r&&this.mergeNextCommand&&(!/\s/.test(i)||/\s/.test(t.args)),this.mergeNextCommand=!0}else r=r&&n.indexOf(e.command.name)!==-1;this.$mergeUndoDeltas!="always"&&Date.now()-this.sequenceStartTime>2e3&&(r=!1),r?this.session.mergeUndoDeltas=!0:n.indexOf(e.command.name)!==-1&&(this.sequenceStartTime=Date.now())},this.setKeyboardHandler=function(e,t){if(e&&typeof e=="string"){this.$keybindingId=e;var n=this;g.loadModule(["keybinding",e],function(r){n.$keybindingId==e&&n.keyBinding.setKeyboardHandler(r&&r.handler),t&&t()})}else this.$keybindingId=null,this.keyBinding.setKeyboardHandler(e),t&&t()},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(e){if(this.session==e)return;this.curOp&&this.endOperation(),this.curOp={};var t=this.session;if(t){this.session.off("change",this.$onDocumentChange),this.session.off("changeMode",this.$onChangeMode),this.session.off("tokenizerUpdate",this.$onTokenizerUpdate),this.session.off("changeTabSize",this.$onChangeTabSize),this.session.off("changeWrapLimit",this.$onChangeWrapLimit),this.session.off("changeWrapMode",this.$onChangeWrapMode),this.session.off("changeFold",this.$onChangeFold),this.session.off("changeFrontMarker",this.$onChangeFrontMarker),this.session.off("changeBackMarker",this.$onChangeBackMarker),this.session.off("changeBreakpoint",this.$onChangeBreakpoint),this.session.off("changeAnnotation",this.$onChangeAnnotation),this.session.off("changeOverwrite",this.$onCursorChange),this.session.off("changeScrollTop",this.$onScrollTopChange),this.session.off("changeScrollLeft",this.$onScrollLeftChange);var n=this.session.getSelection();n.off("changeCursor",this.$onCursorChange),n.off("changeSelection",this.$onSelectionChange)}this.session=e,e?(this.$onDocumentChange=this.onDocumentChange.bind(this),e.on("change",this.$onDocumentChange),this.renderer.setSession(e),this.$onChangeMode=this.onChangeMode.bind(this),e.on("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),e.on("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.onChangeTabSize.bind(this.renderer),e.on("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),e.on("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),e.on("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),e.on("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.on("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.on("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.on("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.on("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.on("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.on("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.on("changeScrollLeft",this.$onScrollLeftChange),this.selection=e.getSelection(),this.selection.on("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.on("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.$blockScrolling+=1,this.onCursorChange(),this.$blockScrolling-=1,this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull()):(this.selection=null,this.renderer.setSession(e)),this._signal("changeSession",{session:e,oldSession:t}),this.curOp=null,t&&t._signal("changeEditor",{oldEditor:this}),e&&e._signal("changeEditor",{editor:this}),e&&e.bgTokenizer&&e.bgTokenizer.scheduleStart()},this.getSession=function(){return this.session},this.setValue=function(e,t){return this.session.doc.setValue(e),t?t==1?this.navigateFileEnd():t==-1&&this.navigateFileStart():this.selectAll(),e},this.getValue=function(){return this.session.getValue()},this.getSelection=function(){return this.selection},this.resize=function(e){this.renderer.onResize(e)},this.setTheme=function(e,t){this.renderer.setTheme(e,t)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(e){this.renderer.setStyle(e)},this.unsetStyle=function(e){this.renderer.unsetStyle(e)},this.getFontSize=function(){return this.getOption("fontSize")||i.computedStyle(this.container,"fontSize")},this.setFontSize=function(e){this.setOption("fontSize",e)},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var e=this;this.$highlightPending=!0,setTimeout(function(){e.$highlightPending=!1;var t=e.session;if(!t||!t.bgTokenizer)return;var n=t.findMatchingBracket(e.getCursorPosition());if(n)var r=new p(n.row,n.column,n.row,n.column+1);else if(t.$mode.getMatching)var r=t.$mode.getMatching(e.session);r&&(t.$bracketHighlight=t.addMarker(r,"ace_bracket","text"))},50)},this.$highlightTags=function(){if(this.$highlightTagPending)return;var e=this;this.$highlightTagPending=!0,setTimeout(function(){e.$highlightTagPending=!1;var t=e.session;if(!t||!t.bgTokenizer)return;var n=e.getCursorPosition(),r=new y(e.session,n.row,n.column),i=r.getCurrentToken();if(!i||!/\b(?:tag-open|tag-name)/.test(i.type)){t.removeMarker(t.$tagHighlight),t.$tagHighlight=null;return}if(i.type.indexOf("tag-open")!=-1){i=r.stepForward();if(!i)return}var s=i.value,o=0,u=r.stepBackward();if(u.value=="<"){do u=i,i=r.stepForward(),i&&i.value===s&&i.type.indexOf("tag-name")!==-1&&(u.value==="<"?o++:u.value==="</"&&o--);while(i&&o>=0)}else{do i=u,u=r.stepBackward(),i&&i.value===s&&i.type.indexOf("tag-name")!==-1&&(u.value==="<"?o++:u.value==="</"&&o--);while(u&&o<=0);r.stepForward()}if(!i){t.removeMarker(t.$tagHighlight),t.$tagHighlight=null;return}var a=r.getCurrentTokenRow(),f=r.getCurrentTokenColumn(),l=new p(a,f,a,f+i.value.length),c=t.$backMarkers[t.$tagHighlight];t.$tagHighlight&&c!=undefined&&l.compareRange(c.range)!==0&&(t.removeMarker(t.$tagHighlight),t.$tagHighlight=null),l&&!t.$tagHighlight&&(t.$tagHighlight=t.addMarker(l,"ace_bracket","text"))},50)},this.focus=function(){var e=this;setTimeout(function(){e.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(e){if(this.$isFocused)return;this.$isFocused=!0,this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus",e)},this.onBlur=function(e){if(!this.$isFocused)return;this.$isFocused=!1,this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur",e)},this.$cursorChange=function(){this.renderer.updateCursor()},this.onDocumentChange=function(e){var t=this.session.$useWrapMode,n=e.start.row==e.end.row?e.end.row:Infinity;this.renderer.updateLines(e.start.row,n,t),this._signal("change",e),this.$cursorChange(),this.$updateHighlightActiveLine()},this.onTokenizerUpdate=function(e){var t=e.data;this.renderer.updateLines(t.first,t.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.$cursorChange(),this.$blockScrolling||(g.warn("Automatically scrolling cursor into view after selection change","this will be disabled in the next version","set editor.$blockScrolling = Infinity to disable this message"),this.renderer.scrollCursorIntoView()),this.$highlightBrackets(),this.$highlightTags(),this.$updateHighlightActiveLine(),this._signal("changeSelection")},this.$updateHighlightActiveLine=function(){var e=this.getSession(),t;if(this.$highlightActiveLine){if(this.$selectionStyle!="line"||!this.selection.isMultiLine())t=this.getCursorPosition();this.renderer.$maxLines&&this.session.getLength()===1&&!(this.renderer.$minLines>1)&&(t=!1)}if(e.$highlightLineMarker&&!t)e.removeMarker(e.$highlightLineMarker.id),e.$highlightLineMarker=null;else if(!e.$highlightLineMarker&&t){var n=new p(t.row,t.column,t.row,Infinity);n.id=e.addMarker(n,"ace_active-line","screenLine"),e.$highlightLineMarker=n}else t&&(e.$highlightLineMarker.start.row=t.row,e.$highlightLineMarker.end.row=t.row,e.$highlightLineMarker.start.column=t.column,e._signal("changeBackMarker"))},this.onSelectionChange=function(e){var t=this.session;t.$selectionMarker&&t.removeMarker(t.$selectionMarker),t.$selectionMarker=null;if(!this.selection.isEmpty()){var n=this.selection.getRange(),r=this.getSelectionStyle();t.$selectionMarker=t.addMarker(n,"ace_selection",r)}else this.$updateHighlightActiveLine();var i=this.$highlightSelectedWord&&this.$getSelectionHighLightRegexp();this.session.highlight(i),this._signal("changeSelection")},this.$getSelectionHighLightRegexp=function(){var e=this.session,t=this.getSelectionRange();if(t.isEmpty()||t.isMultiLine())return;var n=t.start.column-1,r=t.end.column+1,i=e.getLine(t.start.row),s=i.length,o=i.substring(Math.max(n,0),Math.min(r,s));if(n>=0&&/^[\w\d]/.test(o)||r<=s&&/[\w\d]$/.test(o))return;o=i.substring(t.start.column,t.end.column);if(!/^[\w\d]+$/.test(o))return;var u=this.$search.$assembleRegExp({wholeWord:!0,caseSensitive:!0,needle:o});return u},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.updateBreakpoints()},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(e){this.renderer.updateText(),this._emit("changeMode",e)},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getSelectedText=function(){return this.session.getTextRange(this.getSelectionRange())},this.getCopyText=function(){var e=this.getSelectedText();return this._signal("copy",e),e},this.onCopy=function(){this.commands.exec("copy",this)},this.onCut=function(){this.commands.exec("cut",this)},this.onPaste=function(e,t){var n={text:e,event:t};this.commands.exec("paste",this,n)},this.$handlePaste=function(e){typeof e=="string"&&(e={text:e}),this._signal("paste",e);var t=e.text;if(!this.inMultiSelectMode||this.inVirtualSelectionMode)this.insert(t);else{var n=t.split(/\r\n|\r|\n/),r=this.selection.rangeList.ranges;if(n.length>r.length||n.length<2||!n[1])return this.commands.exec("insertstring",this,t);for(var i=r.length;i--;){var s=r[i];s.isEmpty()||this.session.remove(s),this.session.insert(s.start,n[i])}}},this.execCommand=function(e,t){return this.commands.exec(e,this,t)},this.insert=function(e,t){var n=this.session,r=n.getMode(),i=this.getCursorPosition();if(this.getBehavioursEnabled()&&!t){var s=r.transformAction(n.getState(i.row),"insertion",this,n,e);s&&(e!==s.text&&(this.session.mergeUndoDeltas=!1,this.$mergeNextCommand=!1),e=s.text)}e=="	"&&(e=this.session.getTabString());if(!this.selection.isEmpty()){var o=this.getSelectionRange();i=this.session.remove(o),this.clearSelection()}else if(this.session.getOverwrite()&&e.indexOf("\n")==-1){var o=new p.fromPoints(i,i);o.end.column+=e.length,this.session.remove(o)}if(e=="\n"||e=="\r\n"){var u=n.getLine(i.row);if(i.column>u.search(/\S|$/)){var a=u.substr(i.column).search(/\S|$/);n.doc.removeInLine(i.row,i.column,i.column+a)}}this.clearSelection();var f=i.column,l=n.getState(i.row),u=n.getLine(i.row),c=r.checkOutdent(l,u,e),h=n.insert(i,e);s&&s.selection&&(s.selection.length==2?this.selection.setSelectionRange(new p(i.row,f+s.selection[0],i.row,f+s.selection[1])):this.selection.setSelectionRange(new p(i.row+s.selection[0],s.selection[1],i.row+s.selection[2],s.selection[3])));if(n.getDocument().isNewLine(e)){var d=r.getNextLineIndent(l,u.slice(0,i.column),n.getTabString());n.insert({row:i.row+1,column:0},d)}c&&r.autoOutdent(l,n,i.row)},this.onTextInput=function(e){this.keyBinding.onTextInput(e)},this.onCommandKey=function(e,t,n){this.keyBinding.onCommandKey(e,t,n)},this.setOverwrite=function(e){this.session.setOverwrite(e)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(e){this.setOption("scrollSpeed",e)},this.getScrollSpeed=function(){return this.getOption("scrollSpeed")},this.setDragDelay=function(e){this.setOption("dragDelay",e)},this.getDragDelay=function(){return this.getOption("dragDelay")},this.setSelectionStyle=function(e){this.setOption("selectionStyle",e)},this.getSelectionStyle=function(){return this.getOption("selectionStyle")},this.setHighlightActiveLine=function(e){this.setOption("highlightActiveLine",e)},this.getHighlightActiveLine=function(){return this.getOption("highlightActiveLine")},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.setHighlightSelectedWord=function(e){this.setOption("highlightSelectedWord",e)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(e){this.renderer.setAnimatedScroll(e)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(e){this.renderer.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setDisplayIndentGuides=function(e){this.renderer.setDisplayIndentGuides(e)},this.getDisplayIndentGuides=function(){return this.renderer.getDisplayIndentGuides()},this.setShowPrintMargin=function(e){this.renderer.setShowPrintMargin(e)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(e){this.renderer.setPrintMarginColumn(e)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.setReadOnly=function(e){this.setOption("readOnly",e)},this.getReadOnly=function(){return this.getOption("readOnly")},this.setBehavioursEnabled=function(e){this.setOption("behavioursEnabled",e)},this.getBehavioursEnabled=function(){return this.getOption("behavioursEnabled")},this.setWrapBehavioursEnabled=function(e){this.setOption("wrapBehavioursEnabled",e)},this.getWrapBehavioursEnabled=function(){return this.getOption("wrapBehavioursEnabled")},this.setShowFoldWidgets=function(e){this.setOption("showFoldWidgets",e)},this.getShowFoldWidgets=function(){return this.getOption("showFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.remove=function(e){this.selection.isEmpty()&&(e=="left"?this.selection.selectLeft():this.selection.selectRight());var t=this.getSelectionRange();if(this.getBehavioursEnabled()){var n=this.session,r=n.getState(t.start.row),i=n.getMode().transformAction(r,"deletion",this,n,t);if(t.end.column===0){var s=n.getTextRange(t);if(s[s.length-1]=="\n"){var o=n.getLine(t.end.row);/^\s+$/.test(o)&&(t.end.column=o.length)}}i&&(t=i)}this.session.remove(t),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var e=this.getSelectionRange();e.start.column==e.end.column&&e.start.row==e.end.row&&(e.end.column=0,e.end.row++),this.session.remove(e),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var e=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(e)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var e=this.getCursorPosition(),t=e.column;if(t===0)return;var n=this.session.getLine(e.row),r,i;t<n.length?(r=n.charAt(t)+n.charAt(t-1),i=new p(e.row,t-1,e.row,t+1)):(r=n.charAt(t-1)+n.charAt(t-2),i=new p(e.row,t-2,e.row,t)),this.session.replace(i,r),this.session.selection.moveToPosition(i.end)},this.toLowerCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toLowerCase()),this.selection.setSelectionRange(e)},this.toUpperCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toUpperCase()),this.selection.setSelectionRange(e)},this.indent=function(){var e=this.session,t=this.getSelectionRange();if(t.start.row<t.end.row){var n=this.$getSelectedRows();e.indentRows(n.first,n.last,"	");return}if(t.start.column<t.end.column){var r=e.getTextRange(t);if(!/^\s+$/.test(r)){var n=this.$getSelectedRows();e.indentRows(n.first,n.last,"	");return}}var i=e.getLine(t.start.row),o=t.start,u=e.getTabSize(),a=e.documentToScreenColumn(o.row,o.column);if(this.session.getUseSoftTabs())var f=u-a%u,l=s.stringRepeat(" ",f);else{var f=a%u;while(i[t.start.column-1]==" "&&f)t.start.column--,f--;this.selection.setSelectionRange(t),l="	"}return this.insert(l)},this.blockIndent=function(){var e=this.$getSelectedRows();this.session.indentRows(e.first,e.last,"	")},this.blockOutdent=function(){var e=this.session.getSelection();this.session.outdentRows(e.getRange())},this.sortLines=function(){var e=this.$getSelectedRows(),t=this.session,n=[];for(i=e.first;i<=e.last;i++)n.push(t.getLine(i));n.sort(function(e,t){return e.toLowerCase()<t.toLowerCase()?-1:e.toLowerCase()>t.toLowerCase()?1:0});var r=new p(0,0,0,0);for(var i=e.first;i<=e.last;i++){var s=t.getLine(i);r.start.row=i,r.end.row=i,r.end.column=s.length,t.replace(r,n[i-e.first])}},this.toggleCommentLines=function(){var e=this.session.getState(this.getCursorPosition().row),t=this.$getSelectedRows();this.session.getMode().toggleCommentLines(e,this.session,t.first,t.last)},this.toggleBlockComment=function(){var e=this.getCursorPosition(),t=this.session.getState(e.row),n=this.getSelectionRange();this.session.getMode().toggleBlockComment(t,this.session,n,e)},this.getNumberAt=function(e,t){var n=/[\-]?[0-9]+(?:\.[0-9]+)?/g;n.lastIndex=0;var r=this.session.getLine(e);while(n.lastIndex<t){var i=n.exec(r);if(i.index<=t&&i.index+i[0].length>=t){var s={value:i[0],start:i.index,end:i.index+i[0].length};return s}}return null},this.modifyNumber=function(e){var t=this.selection.getCursor().row,n=this.selection.getCursor().column,r=new p(t,n-1,t,n),i=this.session.getTextRange(r);if(!isNaN(parseFloat(i))&&isFinite(i)){var s=this.getNumberAt(t,n);if(s){var o=s.value.indexOf(".")>=0?s.start+s.value.indexOf(".")+1:s.end,u=s.start+s.value.length-o,a=parseFloat(s.value);a*=Math.pow(10,u),o!==s.end&&n<o?e*=Math.pow(10,s.end-n-1):e*=Math.pow(10,s.end-n),a+=e,a/=Math.pow(10,u);var f=a.toFixed(u),l=new p(t,s.start,t,s.end);this.session.replace(l,f),this.moveCursorTo(t,Math.max(s.start+1,n+f.length-s.value.length))}}},this.removeLines=function(){var e=this.$getSelectedRows();this.session.removeFullLines(e.first,e.last),this.clearSelection()},this.duplicateSelection=function(){var e=this.selection,t=this.session,n=e.getRange(),r=e.isBackwards();if(n.isEmpty()){var i=n.start.row;t.duplicateLines(i,i)}else{var s=r?n.start:n.end,o=t.insert(s,t.getTextRange(n),!1);n.start=s,n.end=o,e.setSelectionRange(n,r)}},this.moveLinesDown=function(){this.$moveLines(1,!1)},this.moveLinesUp=function(){this.$moveLines(-1,!1)},this.moveText=function(e,t,n){return this.session.moveText(e,t,n)},this.copyLinesUp=function(){this.$moveLines(-1,!0)},this.copyLinesDown=function(){this.$moveLines(1,!0)},this.$moveLines=function(e,t){var n,r,i=this.selection;if(!i.inMultiSelectMode||this.inVirtualSelectionMode){var s=i.toOrientedRange();n=this.$getSelectedRows(s),r=this.session.$moveLines(n.first,n.last,t?0:e),t&&e==-1&&(r=0),s.moveBy(r,0),i.fromOrientedRange(s)}else{var o=i.rangeList.ranges;i.rangeList.detach(this.session),this.inVirtualSelectionMode=!0;var u=0,a=0,f=o.length;for(var l=0;l<f;l++){var c=l;o[l].moveBy(u,0),n=this.$getSelectedRows(o[l]);var h=n.first,p=n.last;while(++l<f){a&&o[l].moveBy(a,0);var d=this.$getSelectedRows(o[l]);if(t&&d.first!=p)break;if(!t&&d.first>p+1)break;p=d.last}l--,u=this.session.$moveLines(h,p,t?0:e),t&&e==-1&&(c=l+1);while(c<=l)o[c].moveBy(u,0),c++;t||(u=0),a+=u}i.fromOrientedRange(i.ranges[0]),i.rangeList.attach(this.session),this.inVirtualSelectionMode=!1}},this.$getSelectedRows=function(e){return e=(e||this.getSelectionRange()).collapseRows(),{first:this.session.getRowFoldStart(e.start.row),last:this.session.getRowFoldEnd(e.end.row)}},this.onCompositionStart=function(e){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(e){this.renderer.setCompositionText(e)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(e){return e>=this.getFirstVisibleRow()&&e<=this.getLastVisibleRow()},this.isRowFullyVisible=function(e){return e>=this.renderer.getFirstFullyVisibleRow()&&e<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$moveByPage=function(e,t){var n=this.renderer,r=this.renderer.layerConfig,i=e*Math.floor(r.height/r.lineHeight);this.$blockScrolling++,t===!0?this.selection.$moveSelection(function(){this.moveCursorBy(i,0)}):t===!1&&(this.selection.moveCursorBy(i,0),this.selection.clearSelection()),this.$blockScrolling--;var s=n.scrollTop;n.scrollBy(0,i*r.lineHeight),t!=null&&n.scrollCursorIntoView(null,.5),n.animateScrolling(s)},this.selectPageDown=function(){this.$moveByPage(1,!0)},this.selectPageUp=function(){this.$moveByPage(-1,!0)},this.gotoPageDown=function(){this.$moveByPage(1,!1)},this.gotoPageUp=function(){this.$moveByPage(-1,!1)},this.scrollPageDown=function(){this.$moveByPage(1)},this.scrollPageUp=function(){this.$moveByPage(-1)},this.scrollToRow=function(e){this.renderer.scrollToRow(e)},this.scrollToLine=function(e,t,n,r){this.renderer.scrollToLine(e,t,n,r)},this.centerSelection=function(){var e=this.getSelectionRange(),t={row:Math.floor(e.start.row+(e.end.row-e.start.row)/2),column:Math.floor(e.start.column+(e.end.column-e.start.column)/2)};this.renderer.alignCursor(t,.5)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(e,t){this.selection.moveCursorTo(e,t)},this.moveCursorToPosition=function(e){this.selection.moveCursorToPosition(e)},this.jumpToMatching=function(e,t){var n=this.getCursorPosition(),r=new y(this.session,n.row,n.column),i=r.getCurrentToken(),s=i||r.stepForward();if(!s)return;var o,u=!1,a={},f=n.column-s.start,l,c={")":"(","(":"(","]":"[","[":"[","{":"{","}":"{"};do{if(s.value.match(/[{}()\[\]]/g))for(;f<s.value.length&&!u;f++){if(!c[s.value[f]])continue;l=c[s.value[f]]+"."+s.type.replace("rparen","lparen"),isNaN(a[l])&&(a[l]=0);switch(s.value[f]){case"(":case"[":case"{":a[l]++;break;case")":case"]":case"}":a[l]--,a[l]===-1&&(o="bracket",u=!0)}}else s&&s.type.indexOf("tag-name")!==-1&&(isNaN(a[s.value])&&(a[s.value]=0),i.value==="<"?a[s.value]++:i.value==="</"&&a[s.value]--,a[s.value]===-1&&(o="tag",u=!0));u||(i=s,s=r.stepForward(),f=0)}while(s&&!u);if(!o)return;var h,d;if(o==="bracket"){h=this.session.getBracketRange(n);if(!h){h=new p(r.getCurrentTokenRow(),r.getCurrentTokenColumn()+f-1,r.getCurrentTokenRow(),r.getCurrentTokenColumn()+f-1),d=h.start;if(t||d.row===n.row&&Math.abs(d.column-n.column)<2)h=this.session.getBracketRange(d)}}else if(o==="tag"){if(!s||s.type.indexOf("tag-name")===-1)return;var v=s.value;h=new p(r.getCurrentTokenRow(),r.getCurrentTokenColumn()-2,r.getCurrentTokenRow(),r.getCurrentTokenColumn()-2);if(h.compare(n.row,n.column)===0){u=!1;do s=i,i=r.stepBackward(),i&&(i.type.indexOf("tag-close")!==-1&&h.setEnd(r.getCurrentTokenRow(),r.getCurrentTokenColumn()+1),s.value===v&&s.type.indexOf("tag-name")!==-1&&(i.value==="<"?a[v]++:i.value==="</"&&a[v]--,a[v]===0&&(u=!0)));while(i&&!u)}s&&s.type.indexOf("tag-name")&&(d=h.start,d.row==n.row&&Math.abs(d.column-n.column)<2&&(d=h.end))}d=h&&h.cursor||d,d&&(e?h&&t?this.selection.setRange(h):h&&h.isEqual(this.getSelectionRange())?this.clearSelection():this.selection.selectTo(d.row,d.column):this.selection.moveTo(d.row,d.column))},this.gotoLine=function(e,t,n){this.selection.clearSelection(),this.session.unfold({row:e-1,column:t||0}),this.$blockScrolling+=1,this.exitMultiSelectMode&&this.exitMultiSelectMode(),this.moveCursorTo(e-1,t||0),this.$blockScrolling-=1,this.isRowFullyVisible(e-1)||this.scrollToLine(e-1,!0,n)},this.navigateTo=function(e,t){this.selection.moveTo(e,t)},this.navigateUp=function(e){if(this.selection.isMultiLine()&&!this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(-e||-1,0)},this.navigateDown=function(e){if(this.selection.isMultiLine()&&this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(e||1,0)},this.navigateLeft=function(e){if(!this.selection.isEmpty()){var t=this.getSelectionRange().start;this.moveCursorToPosition(t)}else{e=e||1;while(e--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(e){if(!this.selection.isEmpty()){var t=this.getSelectionRange().end;this.moveCursorToPosition(t)}else{e=e||1;while(e--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(e,t){t&&this.$search.set(t);var n=this.$search.find(this.session),r=0;return n?(this.$tryReplace(n,e)&&(r=1),n!==null&&(this.selection.setSelectionRange(n),this.renderer.scrollSelectionIntoView(n.start,n.end)),r):r},this.replaceAll=function(e,t){t&&this.$search.set(t);var n=this.$search.findAll(this.session),r=0;if(!n.length)return r;this.$blockScrolling+=1;var i=this.getSelectionRange();this.selection.moveTo(0,0);for(var s=n.length-1;s>=0;--s)this.$tryReplace(n[s],e)&&r++;return this.selection.setSelectionRange(i),this.$blockScrolling-=1,r},this.$tryReplace=function(e,t){var n=this.session.getTextRange(e);return t=this.$search.replace(n,t),t!==null?(e.end=this.session.replace(e,t),e):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(e,t,n){t||(t={}),typeof e=="string"||e instanceof RegExp?t.needle=e:typeof e=="object"&&r.mixin(t,e);var i=this.selection.getRange();t.needle==null&&(e=this.session.getTextRange(i)||this.$search.$options.needle,e||(i=this.session.getWordRange(i.start.row,i.start.column),e=this.session.getTextRange(i)),this.$search.set({needle:e})),this.$search.set(t),t.start||this.$search.set({start:i});var s=this.$search.find(this.session);if(t.preventScroll)return s;if(s)return this.revealRange(s,n),s;t.backwards?i.start=i.end:i.end=i.start,this.selection.setRange(i)},this.findNext=function(e,t){this.find({skipCurrent:!0,backwards:!1},e,t)},this.findPrevious=function(e,t){this.find(e,{skipCurrent:!0,backwards:!0},t)},this.revealRange=function(e,t){this.$blockScrolling+=1,this.session.unfold(e),this.selection.setSelectionRange(e),this.$blockScrolling-=1;var n=this.renderer.scrollTop;this.renderer.scrollSelectionIntoView(e.start,e.end,.5),t!==!1&&this.renderer.animateScrolling(n)},this.undo=function(){this.$blockScrolling++,this.session.getUndoManager().undo(),this.$blockScrolling--,this.renderer.scrollCursorIntoView(null,.5)},this.redo=function(){this.$blockScrolling++,this.session.getUndoManager().redo(),this.$blockScrolling--,this.renderer.scrollCursorIntoView(null,.5)},this.destroy=function(){this.renderer.destroy(),this._signal("destroy",this),this.session&&this.session.destroy()},this.setAutoScrollEditorIntoView=function(e){if(!e)return;var t,n=this,r=!1;this.$scrollAnchor||(this.$scrollAnchor=document.createElement("div"));var i=this.$scrollAnchor;i.style.cssText="position:absolute",this.container.insertBefore(i,this.container.firstChild);var s=this.on("changeSelection",function(){r=!0}),o=this.renderer.on("beforeRender",function(){r&&(t=n.renderer.container.getBoundingClientRect())}),u=this.renderer.on("afterRender",function(){if(r&&t&&(n.isFocused()||n.searchBox&&n.searchBox.isFocused())){var e=n.renderer,s=e.$cursorLayer.$pixelPos,o=e.layerConfig,u=s.top-o.offset;s.top>=0&&u+t.top<0?r=!0:s.top<o.height&&s.top+t.top+o.lineHeight>window.innerHeight?r=!1:r=null,r!=null&&(i.style.top=u+"px",i.style.left=s.left+"px",i.style.height=o.lineHeight+"px",i.scrollIntoView(r)),r=t=null}});this.setAutoScrollEditorIntoView=function(e){if(e)return;delete this.setAutoScrollEditorIntoView,this.off("changeSelection",s),this.renderer.off("afterRender",u),this.renderer.off("beforeRender",o)}},this.$resetCursorStyle=function(){var e=this.$cursorStyle||"ace",t=this.renderer.$cursorLayer;if(!t)return;t.setSmoothBlinking(/smooth/.test(e)),t.isBlinking=!this.$readOnly&&e!="wide",i.setCssClass(t.element,"ace_slim-cursors",/slim/.test(e))}}.call(b.prototype),g.defineOptions(b.prototype,"editor",{selectionStyle:{set:function(e){this.onSelectionChange(),this._signal("changeSelectionStyle",{data:e})},initialValue:"line"},highlightActiveLine:{set:function(){this.$updateHighlightActiveLine()},initialValue:!0},highlightSelectedWord:{set:function(e){this.$onSelectionChange()},initialValue:!0},readOnly:{set:function(e){this.$resetCursorStyle()},initialValue:!1},cursorStyle:{set:function(e){this.$resetCursorStyle()},values:["ace","slim","smooth","wide"],initialValue:"ace"},mergeUndoDeltas:{values:[!1,!0,"always"],initialValue:!0},behavioursEnabled:{initialValue:!0},wrapBehavioursEnabled:{initialValue:!0},autoScrollEditorIntoView:{set:function(e){this.setAutoScrollEditorIntoView(e)}},keyboardHandler:{set:function(e){this.setKeyboardHandler(e)},get:function(){return this.keybindingId},handlesSet:!0},hScrollBarAlwaysVisible:"renderer",vScrollBarAlwaysVisible:"renderer",highlightGutterLine:"renderer",animatedScroll:"renderer",showInvisibles:"renderer",showPrintMargin:"renderer",printMarginColumn:"renderer",printMargin:"renderer",fadeFoldWidgets:"renderer",showFoldWidgets:"renderer",showLineNumbers:"renderer",showGutter:"renderer",displayIndentGuides:"renderer",fontSize:"renderer",fontFamily:"renderer",maxLines:"renderer",minLines:"renderer",scrollPastEnd:"renderer",fixedWidthGutter:"renderer",theme:"renderer",scrollSpeed:"$mouseHandler",dragDelay:"$mouseHandler",dragEnabled:"$mouseHandler",focusTimout:"$mouseHandler",tooltipFollowsMouse:"$mouseHandler",firstLineNumber:"session",overwrite:"session",newLineMode:"session",useWorker:"session",useSoftTabs:"session",tabSize:"session",wrap:"session",indentedSoftWrap:"session",foldStyle:"session",mode:"session"}),t.Editor=b}),ace.define("ace/undomanager",["require","exports","module"],function(e,t,n){"use strict";var r=function(){this.reset()};(function(){function e(e){return{action:e.action,start:e.start,end:e.end,lines:e.lines.length==1?null:e.lines,text:e.lines.length==1?e.lines[0]:null}}function t(e){return{action:e.action,start:e.start,end:e.end,lines:e.lines||[e.text]}}function n(e,t){var n=new Array(e.length);for(var r=0;r<e.length;r++){var i=e[r],s={group:i.group,deltas:new Array(i.length)};for(var o=0;o<i.deltas.length;o++){var u=i.deltas[o];s.deltas[o]=t(u)}n[r]=s}return n}this.execute=function(e){var t=e.args[0];this.$doc=e.args[1],e.merge&&this.hasUndo()&&(this.dirtyCounter--,t=this.$undoStack.pop().concat(t)),this.$undoStack.push(t),this.$redoStack=[],this.dirtyCounter<0&&(this.dirtyCounter=NaN),this.dirtyCounter++},this.undo=function(e){var t=this.$undoStack.pop(),n=null;return t&&(n=this.$doc.undoChanges(t,e),this.$redoStack.push(t),this.dirtyCounter--),n},this.redo=function(e){var t=this.$redoStack.pop(),n=null;return t&&(n=this.$doc.redoChanges(this.$deserializeDeltas(t),e),this.$undoStack.push(t),this.dirtyCounter++),n},this.reset=function(){this.$undoStack=[],this.$redoStack=[],this.dirtyCounter=0},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0},this.markClean=function(){this.dirtyCounter=0},this.isClean=function(){return this.dirtyCounter===0},this.$serializeDeltas=function(t){return n(t,e)},this.$deserializeDeltas=function(e){return n(e,t)}}).call(r.prototype),t.UndoManager=r}),ace.define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=e("../lib/oop"),s=e("../lib/lang"),o=e("../lib/event_emitter").EventEmitter,u=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_gutter-layer",e.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$annotations=[],this.$updateAnnotations=this.$updateAnnotations.bind(this),this.$cells=[]};(function(){i.implement(this,o),this.setSession=function(e){this.session&&this.session.removeEventListener("change",this.$updateAnnotations),this.session=e,e&&e.on("change",this.$updateAnnotations)},this.addGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.addGutterDecoration"),this.session.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.removeGutterDecoration"),this.session.removeGutterDecoration(e,t)},this.setAnnotations=function(e){this.$annotations=[];for(var t=0;t<e.length;t++){var n=e[t],r=n.row,i=this.$annotations[r];i||(i=this.$annotations[r]={text:[]});var o=n.text;o=o?s.escapeHTML(o):n.html||"",i.text.indexOf(o)===-1&&i.text.push(o);var u=n.type;u=="error"?i.className=" ace_error":u=="warning"&&i.className!=" ace_error"?i.className=" ace_warning":u=="info"&&!i.className&&(i.className=" ace_info")}},this.$updateAnnotations=function(e){if(!this.$annotations.length)return;var t=e.start.row,n=e.end.row-t;if(n!==0)if(e.action=="remove")this.$annotations.splice(t,n+1,null);else{var r=new Array(n+1);r.unshift(t,1),this.$annotations.splice.apply(this.$annotations,r)}},this.update=function(e){var t=this.session,n=e.firstRow,i=Math.min(e.lastRow+e.gutterOffset,t.getLength()-1),s=t.getNextFoldLine(n),o=s?s.start.row:Infinity,u=this.$showFoldWidgets&&t.foldWidgets,a=t.$breakpoints,f=t.$decorations,l=t.$firstLineNumber,c=0,h=t.gutterRenderer||this.$renderer,p=null,d=-1,v=n;for(;;){v>o&&(v=s.end.row+1,s=t.getNextFoldLine(v,s),o=s?s.start.row:Infinity);if(v>i){while(this.$cells.length>d+1)p=this.$cells.pop(),this.element.removeChild(p.element);break}p=this.$cells[++d],p||(p={element:null,textNode:null,foldWidget:null},p.element=r.createElement("div"),p.textNode=document.createTextNode(""),p.element.appendChild(p.textNode),this.element.appendChild(p.element),this.$cells[d]=p);var m="ace_gutter-cell ";a[v]&&(m+=a[v]),f[v]&&(m+=f[v]),this.$annotations[v]&&(m+=this.$annotations[v].className),p.element.className!=m&&(p.element.className=m);var g=t.getRowLength(v)*e.lineHeight+"px";g!=p.element.style.height&&(p.element.style.height=g);if(u){var y=u[v];y==null&&(y=u[v]=t.getFoldWidget(v))}if(y){p.foldWidget||(p.foldWidget=r.createElement("span"),p.element.appendChild(p.foldWidget));var m="ace_fold-widget ace_"+y;y=="start"&&v==o&&v<s.end.row?m+=" ace_closed":m+=" ace_open",p.foldWidget.className!=m&&(p.foldWidget.className=m);var g=e.lineHeight+"px";p.foldWidget.style.height!=g&&(p.foldWidget.style.height=g)}else p.foldWidget&&(p.element.removeChild(p.foldWidget),p.foldWidget=null);var b=c=h?h.getText(t,v):v+l;b!==p.textNode.data&&(p.textNode.data=b),v++}this.element.style.height=e.minHeight+"px";if(this.$fixedWidth||t.$useWrapMode)c=t.getLength()+l;var w=h?h.getWidth(t,c,e):c.toString().length*e.characterWidth,E=this.$padding||this.$computePadding();w+=E.left+E.right,w!==this.gutterWidth&&!isNaN(w)&&(this.gutterWidth=w,this.element.style.width=Math.ceil(this.gutterWidth)+"px",this._emit("changeGutterWidth",w))},this.$fixedWidth=!1,this.$showLineNumbers=!0,this.$renderer="",this.setShowLineNumbers=function(e){this.$renderer=!e&&{getWidth:function(){return""},getText:function(){return""}}},this.getShowLineNumbers=function(){return this.$showLineNumbers},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(e){e?r.addCssClass(this.element,"ace_folding-enabled"):r.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=e,this.$padding=null},this.getShowFoldWidgets=function(){return this.$showFoldWidgets},this.$computePadding=function(){if(!this.element.firstChild)return{left:0,right:0};var e=r.computedStyle(this.element.firstChild);return this.$padding={},this.$padding.left=parseInt(e.paddingLeft)+1||0,this.$padding.right=parseInt(e.paddingRight)||0,this.$padding},this.getRegion=function(e){var t=this.$padding||this.$computePadding(),n=this.element.getBoundingClientRect();if(e.x<t.left+n.left)return"markers";if(this.$showFoldWidgets&&e.x>n.right-t.right)return"foldWidgets"}}).call(u.prototype),t.Gutter=u}),ace.define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../lib/dom"),s=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_marker-layer",e.appendChild(this.element)};(function(){function e(e,t,n,r){return(e?1:0)|(t?2:0)|(n?4:0)|(r?8:0)}this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setMarkers=function(e){this.markers=e},this.update=function(e){if(!e)return;this.config=e;var t=[];for(var n in this.markers){var r=this.markers[n];if(!r.range){r.update(t,this,this.session,e);continue}var i=r.range.clipRows(e.firstRow,e.lastRow);if(i.isEmpty())continue;i=i.toScreenRange(this.session);if(r.renderer){var s=this.$getTop(i.start.row,e),o=this.$padding+i.start.column*e.characterWidth;r.renderer(t,i,o,s,e)}else r.type=="fullLine"?this.drawFullLineMarker(t,i,r.clazz,e):r.type=="screenLine"?this.drawScreenLineMarker(t,i,r.clazz,e):i.isMultiLine()?r.type=="text"?this.drawTextMarker(t,i,r.clazz,e):this.drawMultiLineMarker(t,i,r.clazz,e):this.drawSingleLineMarker(t,i,r.clazz+" ace_start"+" ace_br15",e)}this.element.innerHTML=t.join("")},this.$getTop=function(e,t){return(e-t.firstRowScreen)*t.lineHeight},this.drawTextMarker=function(t,n,i,s,o){var u=this.session,a=n.start.row,f=n.end.row,l=a,c=0,h=0,p=u.getScreenLastRowColumn(l),d=new r(l,n.start.column,l,h);for(;l<=f;l++)d.start.row=d.end.row=l,d.start.column=l==a?n.start.column:u.getRowWrapIndent(l),d.end.column=p,c=h,h=p,p=l+1<f?u.getScreenLastRowColumn(l+1):l==f?0:n.end.column,this.drawSingleLineMarker(t,d,i+(l==a?" ace_start":"")+" ace_br"+e(l==a||l==a+1&&n.start.column,c<h,h>p,l==f),s,l==f?0:1,o)},this.drawMultiLineMarker=function(e,t,n,r,i){var s=this.$padding,o=r.lineHeight,u=this.$getTop(t.start.row,r),a=s+t.start.column*r.characterWidth;i=i||"",e.push("<div class='",n," ace_br1 ace_start' style='","height:",o,"px;","right:0;","top:",u,"px;","left:",a,"px;",i,"'></div>"),u=this.$getTop(t.end.row,r);var f=t.end.column*r.characterWidth;e.push("<div class='",n," ace_br12' style='","height:",o,"px;","width:",f,"px;","top:",u,"px;","left:",s,"px;",i,"'></div>"),o=(t.end.row-t.start.row-1)*r.lineHeight;if(o<=0)return;u=this.$getTop(t.start.row+1,r);var l=(t.start.column?1:0)|(t.end.column?0:8);e.push("<div class='",n,l?" ace_br"+l:"","' style='","height:",o,"px;","right:0;","top:",u,"px;","left:",s,"px;",i,"'></div>")},this.drawSingleLineMarker=function(e,t,n,r,i,s){var o=r.lineHeight,u=(t.end.column+(i||0)-t.start.column)*r.characterWidth,a=this.$getTop(t.start.row,r),f=this.$padding+t.start.column*r.characterWidth;e.push("<div class='",n,"' style='","height:",o,"px;","width:",u,"px;","top:",a,"px;","left:",f,"px;",s||"","'></div>")},this.drawFullLineMarker=function(e,t,n,r,i){var s=this.$getTop(t.start.row,r),o=r.lineHeight;t.start.row!=t.end.row&&(o+=this.$getTop(t.end.row,r)-s),e.push("<div class='",n,"' style='","height:",o,"px;","top:",s,"px;","left:0;right:0;",i||"","'></div>")},this.drawScreenLineMarker=function(e,t,n,r,i){var s=this.$getTop(t.start.row,r),o=r.lineHeight;e.push("<div class='",n,"' style='","height:",o,"px;","top:",s,"px;","left:0;right:0;",i||"","'></div>")}}).call(s.prototype),t.Marker=s}),ace.define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/useragent"),u=e("../lib/event_emitter").EventEmitter,a=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_text-layer",e.appendChild(this.element),this.$updateEolChar=this.$updateEolChar.bind(this)};(function(){r.implement(this,u),this.EOF_CHAR="\u00b6",this.EOL_CHAR_LF="\u00ac",this.EOL_CHAR_CRLF="\u00a4",this.EOL_CHAR=this.EOL_CHAR_LF,this.TAB_CHAR="\u2014",this.SPACE_CHAR="\u00b7",this.$padding=0,this.$updateEolChar=function(){var e=this.session.doc.getNewLineCharacter()=="\n"?this.EOL_CHAR_LF:this.EOL_CHAR_CRLF;if(this.EOL_CHAR!=e)return this.EOL_CHAR=e,!0},this.setPadding=function(e){this.$padding=e,this.element.style.padding="0 "+e+"px"},this.getLineHeight=function(){return this.$fontMetrics.$characterSize.height||0},this.getCharacterWidth=function(){return this.$fontMetrics.$characterSize.width||0},this.$setFontMetrics=function(e){this.$fontMetrics=e,this.$fontMetrics.on("changeCharacterSize",function(e){this._signal("changeCharacterSize",e)}.bind(this)),this.$pollSizeChanges()},this.checkForSizeChanges=function(){this.$fontMetrics.checkForSizeChanges()},this.$pollSizeChanges=function(){return this.$pollSizeChangesTimer=this.$fontMetrics.$pollSizeChanges()},this.setSession=function(e){this.session=e,e&&this.$computeTabString()},this.showInvisibles=!1,this.setShowInvisibles=function(e){return this.showInvisibles==e?!1:(this.showInvisibles=e,this.$computeTabString(),!0)},this.displayIndentGuides=!0,this.setDisplayIndentGuides=function(e){return this.displayIndentGuides==e?!1:(this.displayIndentGuides=e,this.$computeTabString(),!0)},this.$tabStrings=[],this.onChangeTabSize=this.$computeTabString=function(){var e=this.session.getTabSize();this.tabSize=e;var t=this.$tabStrings=[0];for(var n=1;n<e+1;n++)this.showInvisibles?t.push("<span class='ace_invisible ace_invisible_tab'>"+s.stringRepeat(this.TAB_CHAR,n)+"</span>"):t.push(s.stringRepeat(" ",n));if(this.displayIndentGuides){this.$indentGuideRe=/\s\S| \t|\t |\s$/;var r="ace_indent-guide",i="",o="";if(this.showInvisibles){r+=" ace_invisible",i=" ace_invisible_space",o=" ace_invisible_tab";var u=s.stringRepeat(this.SPACE_CHAR,this.tabSize),a=s.stringRepeat(this.TAB_CHAR,this.tabSize)}else var u=s.stringRepeat(" ",this.tabSize),a=u;this.$tabStrings[" "]="<span class='"+r+i+"'>"+u+"</span>",this.$tabStrings["	"]="<span class='"+r+o+"'>"+a+"</span>"}},this.updateLines=function(e,t,n){(this.config.lastRow!=e.lastRow||this.config.firstRow!=e.firstRow)&&this.scrollLines(e),this.config=e;var r=Math.max(t,e.firstRow),i=Math.min(n,e.lastRow),s=this.element.childNodes,o=0;for(var u=e.firstRow;u<r;u++){var a=this.session.getFoldLine(u);if(a){if(a.containsRow(r)){r=a.start.row;break}u=a.end.row}o++}var u=r,a=this.session.getNextFoldLine(u),f=a?a.start.row:Infinity;for(;;){u>f&&(u=a.end.row+1,a=this.session.getNextFoldLine(u,a),f=a?a.start.row:Infinity);if(u>i)break;var l=s[o++];if(l){var c=[];this.$renderLine(c,u,!this.$useLineGroups(),u==f?a:!1),l.style.height=e.lineHeight*this.session.getRowLength(u)+"px",l.innerHTML=c.join("")}u++}},this.scrollLines=function(e){var t=this.config;this.config=e;if(!t||t.lastRow<e.firstRow)return this.update(e);if(e.lastRow<t.firstRow)return this.update(e);var n=this.element;if(t.firstRow<e.firstRow)for(var r=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);r>0;r--)n.removeChild(n.firstChild);if(t.lastRow>e.lastRow)for(var r=this.session.getFoldedRowCount(e.lastRow+1,t.lastRow);r>0;r--)n.removeChild(n.lastChild);if(e.firstRow<t.firstRow){var i=this.$renderLinesFragment(e,e.firstRow,t.firstRow-1);n.firstChild?n.insertBefore(i,n.firstChild):n.appendChild(i)}if(e.lastRow>t.lastRow){var i=this.$renderLinesFragment(e,t.lastRow+1,e.lastRow);n.appendChild(i)}},this.$renderLinesFragment=function(e,t,n){var r=this.element.ownerDocument.createDocumentFragment(),s=t,o=this.session.getNextFoldLine(s),u=o?o.start.row:Infinity;for(;;){s>u&&(s=o.end.row+1,o=this.session.getNextFoldLine(s,o),u=o?o.start.row:Infinity);if(s>n)break;var a=i.createElement("div"),f=[];this.$renderLine(f,s,!1,s==u?o:!1),a.innerHTML=f.join("");if(this.$useLineGroups())a.className="ace_line_group",r.appendChild(a),a.style.height=e.lineHeight*this.session.getRowLength(s)+"px";else while(a.firstChild)r.appendChild(a.firstChild);s++}return r},this.update=function(e){this.config=e;var t=[],n=e.firstRow,r=e.lastRow,i=n,s=this.session.getNextFoldLine(i),o=s?s.start.row:Infinity;for(;;){i>o&&(i=s.end.row+1,s=this.session.getNextFoldLine(i,s),o=s?s.start.row:Infinity);if(i>r)break;this.$useLineGroups()&&t.push("<div class='ace_line_group' style='height:",e.lineHeight*this.session.getRowLength(i),"px'>"),this.$renderLine(t,i,!1,i==o?s:!1),this.$useLineGroups()&&t.push("</div>"),i++}this.element.innerHTML=t.join("")},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(e,t,n,r){var i=this,o=/\t|&|<|>|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\u3000\uFEFF\uFFF9-\uFFFC])|[\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]/g,u=function(e,n,r,o,u){if(n)return i.showInvisibles?"<span class='ace_invisible ace_invisible_space'>"+s.stringRepeat(i.SPACE_CHAR,e.length)+"</span>":e;if(e=="&")return"&#38;";if(e=="<")return"&#60;";if(e==">")return"&#62;";if(e=="	"){var a=i.session.getScreenTabSize(t+o);return t+=a-1,i.$tabStrings[a]}if(e=="\u3000"){var f=i.showInvisibles?"ace_cjk ace_invisible ace_invisible_space":"ace_cjk",l=i.showInvisibles?i.SPACE_CHAR:"";return t+=1,"<span class='"+f+"' style='width:"+i.config.characterWidth*2+"px'>"+l+"</span>"}return r?"<span class='ace_invisible ace_invisible_space ace_invalid'>"+i.SPACE_CHAR+"</span>":(t+=1,"<span class='ace_cjk' style='width:"+i.config.characterWidth*2+"px'>"+e+"</span>")},a=r.replace(o,u);if(!this.$textToken[n.type]){var f="ace_"+n.type.replace(/\./g," ace_"),l="";n.type=="fold"&&(l=" style='width:"+n.value.length*this.config.characterWidth+"px;' "),e.push("<span class='",f,"'",l,">",a,"</span>")}else e.push(a);return t+r.length},this.renderIndentGuide=function(e,t,n){var r=t.search(this.$indentGuideRe);return r<=0||r>=n?t:t[0]==" "?(r-=r%this.tabSize,e.push(s.stringRepeat(this.$tabStrings[" "],r/this.tabSize)),t.substr(r)):t[0]=="	"?(e.push(s.stringRepeat(this.$tabStrings["	"],r)),t.substr(r)):t},this.$renderWrappedLine=function(e,t,n,r){var i=0,o=0,u=n[0],a=0;for(var f=0;f<t.length;f++){var l=t[f],c=l.value;if(f==0&&this.displayIndentGuides){i=c.length,c=this.renderIndentGuide(e,c,u);if(!c)continue;i-=c.length}if(i+c.length<u)a=this.$renderToken(e,a,l,c),i+=c.length;else{while(i+c.length>=u)a=this.$renderToken(e,a,l,c.substring(0,u-i)),c=c.substring(u-i),i=u,r||e.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px'>"),e.push(s.stringRepeat("\u00a0",n.indent)),o++,a=0,u=n[o]||Number.MAX_VALUE;c.length!=0&&(i+=c.length,a=this.$renderToken(e,a,l,c))}}},this.$renderSimpleLine=function(e,t){var n=0,r=t[0],i=r.value;this.displayIndentGuides&&(i=this.renderIndentGuide(e,i)),i&&(n=this.$renderToken(e,n,r,i));for(var s=1;s<t.length;s++)r=t[s],i=r.value,n=this.$renderToken(e,n,r,i)},this.$renderLine=function(e,t,n,r){!r&&r!=0&&(r=this.session.getFoldLine(t));if(r)var i=this.$getFoldLineTokens(t,r);else var i=this.session.getTokens(t);n||e.push("<div class='ace_line' style='height:",this.config.lineHeight*(this.$useLineGroups()?1:this.session.getRowLength(t)),"px'>");if(i.length){var s=this.session.getRowSplitData(t);s&&s.length?this.$renderWrappedLine(e,i,s,n):this.$renderSimpleLine(e,i)}this.showInvisibles&&(r&&(t=r.end.row),e.push("<span class='ace_invisible ace_invisible_eol'>",t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,"</span>")),n||e.push("</div>")},this.$getFoldLineTokens=function(e,t){function i(e,t,n){var i=0,s=0;while(s+e[i].value.length<t){s+=e[i].value.length,i++;if(i==e.length)return}if(s!=t){var o=e[i].value.substring(t-s);o.length>n-t&&(o=o.substring(0,n-t)),r.push({type:e[i].type,value:o}),s=t+o.length,i+=1}while(s<n&&i<e.length){var o=e[i].value;o.length+s>n?r.push({type:e[i].type,value:o.substring(0,n-s)}):r.push(e[i]),s+=o.length,i+=1}}var n=this.session,r=[],s=n.getTokens(e);return t.walk(function(e,t,o,u,a){e!=null?r.push({type:"fold",value:e}):(a&&(s=n.getTokens(t)),s.length&&i(s,u,o))},t.end.row,this.session.getLine(t.end.row).length),r},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(a.prototype),t.Text=a}),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../lib/dom"),i,s=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),i===undefined&&(i=!("opacity"in this.element.style)),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),r.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=(i?this.$updateVisibility:this.$updateOpacity).bind(this)};(function(){this.$updateVisibility=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.visibility=e?"":"hidden"},this.$updateOpacity=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.opacity=e?"":"0"},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&!i&&(this.smoothBlinking=e,r.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.$updateCursors=this.$updateOpacity.bind(this),this.restartTimer())},this.addCursor=function(){var e=r.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,r.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,r.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.smoothBlinking&&r.removeCssClass(this.element,"ace_smooth-blinking"),e(!0);if(!this.isBlinking||!this.blinkInterval||!this.isVisible)return;this.smoothBlinking&&setTimeout(function(){r.addCssClass(this.element,"ace_smooth-blinking")}.bind(this));var t=function(){this.timeoutId=setTimeout(function(){e(!1)},.6*this.blinkInterval)}.bind(this);this.intervalId=setInterval(function(){e(!0),t()},this.blinkInterval),t()},this.getPixelPosition=function(e,t){if(!this.config||!this.session)return{left:0,top:0};e||(e=this.session.selection.getCursor());var n=this.session.documentToScreenPosition(e),r=this.$padding+n.column*this.config.characterWidth,i=(n.row-(t?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:r,top:i}},this.update=function(e){this.config=e;var t=this.session.$selectionMarkers,n=0,r=0;if(t===undefined||t.length===0)t=[{cursor:null}];for(var n=0,i=t.length;n<i;n++){var s=this.getPixelPosition(t[n].cursor,!0);if((s.top>e.height+e.offset||s.top<0)&&n>1)continue;var o=(this.cursors[r++]||this.addCursor()).style;this.drawCursor?this.drawCursor(o,s,e,t[n],this.session):(o.left=s.left+"px",o.top=s.top+"px",o.width=e.characterWidth+"px",o.height=e.lineHeight+"px")}while(this.cursors.length>r)this.removeCursor();var u=this.session.getOverwrite();this.$setOverwrite(u),this.$pixelPos=s,this.restartTimer()},this.drawCursor=null,this.$setOverwrite=function(e){e!=this.overwrite&&(this.overwrite=e,e?r.addCssClass(this.element,"ace_overwrite-cursors"):r.removeCssClass(this.element,"ace_overwrite-cursors"))},this.destroy=function(){clearInterval(this.intervalId),clearTimeout(this.timeoutId)}}).call(s.prototype),t.Cursor=s}),ace.define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./lib/event"),o=e("./lib/event_emitter").EventEmitter,u=32768,a=function(e){this.element=i.createElement("div"),this.element.className="ace_scrollbar ace_scrollbar"+this.classSuffix,this.inner=i.createElement("div"),this.inner.className="ace_scrollbar-inner",this.element.appendChild(this.inner),e.appendChild(this.element),this.setVisible(!1),this.skipEvent=!1,s.addListener(this.element,"scroll",this.onScroll.bind(this)),s.addListener(this.element,"mousedown",s.preventDefault)};(function(){r.implement(this,o),this.setVisible=function(e){this.element.style.display=e?"":"none",this.isVisible=e,this.coeff=1}}).call(a.prototype);var f=function(e,t){a.call(this,e),this.scrollTop=0,this.scrollHeight=0,t.$scrollbarWidth=this.width=i.scrollbarWidth(e.ownerDocument),this.inner.style.width=this.element.style.width=(this.width||15)+5+"px",this.$minWidth=0};r.inherits(f,a),function(){this.classSuffix="-v",this.onScroll=function(){if(!this.skipEvent){this.scrollTop=this.element.scrollTop;if(this.coeff!=1){var e=this.element.clientHeight/this.scrollHeight;this.scrollTop=this.scrollTop*(1-e)/(this.coeff-e)}this._emit("scroll",{data:this.scrollTop})}this.skipEvent=!1},this.getWidth=function(){return Math.max(this.isVisible?this.width:0,this.$minWidth||0)},this.setHeight=function(e){this.element.style.height=e+"px"},this.setInnerHeight=this.setScrollHeight=function(e){this.scrollHeight=e,e>u?(this.coeff=u/e,e=u):this.coeff!=1&&(this.coeff=1),this.inner.style.height=e+"px"},this.setScrollTop=function(e){this.scrollTop!=e&&(this.skipEvent=!0,this.scrollTop=e,this.element.scrollTop=e*this.coeff)}}.call(f.prototype);var l=function(e,t){a.call(this,e),this.scrollLeft=0,this.height=t.$scrollbarWidth,this.inner.style.height=this.element.style.height=(this.height||15)+5+"px"};r.inherits(l,a),function(){this.classSuffix="-h",this.onScroll=function(){this.skipEvent||(this.scrollLeft=this.element.scrollLeft,this._emit("scroll",{data:this.scrollLeft})),this.skipEvent=!1},this.getHeight=function(){return this.isVisible?this.height:0},this.setWidth=function(e){this.element.style.width=e+"px"},this.setInnerWidth=function(e){this.inner.style.width=e+"px"},this.setScrollWidth=function(e){this.inner.style.width=e+"px"},this.setScrollLeft=function(e){this.scrollLeft!=e&&(this.skipEvent=!0,this.scrollLeft=this.element.scrollLeft=e)}}.call(l.prototype),t.ScrollBar=f,t.ScrollBarV=f,t.ScrollBarH=l,t.VScrollBar=f,t.HScrollBar=l}),ace.define("ace/renderloop",["require","exports","module","ace/lib/event"],function(e,t,n){"use strict";var r=e("./lib/event"),i=function(e,t){this.onRender=e,this.pending=!1,this.changes=0,this.window=t||window};(function(){this.schedule=function(e){this.changes=this.changes|e;if(!this.pending&&this.changes){this.pending=!0;var t=this;r.nextFrame(function(){t.pending=!1;var e;while(e=t.changes)t.changes=0,t.onRender(e)},this.window)}}}).call(i.prototype),t.RenderLoop=i}),ace.define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(e,t,n){var r=e("../lib/oop"),i=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/useragent"),u=e("../lib/event_emitter").EventEmitter,a=0,f=t.FontMetrics=function(e){this.el=i.createElement("div"),this.$setMeasureNodeStyles(this.el.style,!0),this.$main=i.createElement("div"),this.$setMeasureNodeStyles(this.$main.style),this.$measureNode=i.createElement("div"),this.$setMeasureNodeStyles(this.$measureNode.style),this.el.appendChild(this.$main),this.el.appendChild(this.$measureNode),e.appendChild(this.el),a||this.$testFractionalRect(),this.$measureNode.innerHTML=s.stringRepeat("X",a),this.$characterSize={width:0,height:0},this.checkForSizeChanges()};(function(){r.implement(this,u),this.$characterSize={width:0,height:0},this.$testFractionalRect=function(){var e=i.createElement("div");this.$setMeasureNodeStyles(e.style),e.style.width="0.2px",document.documentElement.appendChild(e);var t=e.getBoundingClientRect().width;t>0&&t<1?a=50:a=100,e.parentNode.removeChild(e)},this.$setMeasureNodeStyles=function(e,t){e.width=e.height="auto",e.left=e.top="0px",e.visibility="hidden",e.position="absolute",e.whiteSpace="pre",o.isIE<8?e["font-family"]="inherit":e.font="inherit",e.overflow=t?"hidden":"visible"},this.checkForSizeChanges=function(){var e=this.$measureSizes();if(e&&(this.$characterSize.width!==e.width||this.$characterSize.height!==e.height)){this.$measureNode.style.fontWeight="bold";var t=this.$measureSizes();this.$measureNode.style.fontWeight="",this.$characterSize=e,this.charSizes=Object.create(null),this.allowBoldFonts=t&&t.width===e.width&&t.height===e.height,this._emit("changeCharacterSize",{data:e})}},this.$pollSizeChanges=function(){if(this.$pollSizeChangesTimer)return this.$pollSizeChangesTimer;var e=this;return this.$pollSizeChangesTimer=setInterval(function(){e.checkForSizeChanges()},500)},this.setPolling=function(e){e?this.$pollSizeChanges():this.$pollSizeChangesTimer&&(clearInterval(this.$pollSizeChangesTimer),this.$pollSizeChangesTimer=0)},this.$measureSizes=function(){if(a===50){var e=null;try{e=this.$measureNode.getBoundingClientRect()}catch(t){e={width:0,height:0}}var n={height:e.height,width:e.width/a}}else var n={height:this.$measureNode.clientHeight,width:this.$measureNode.clientWidth/a};return n.width===0||n.height===0?null:n},this.$measureCharWidth=function(e){this.$main.innerHTML=s.stringRepeat(e,a);var t=this.$main.getBoundingClientRect();return t.width/a},this.getCharacterWidth=function(e){var t=this.charSizes[e];return t===undefined&&(t=this.charSizes[e]=this.$measureCharWidth(e)/this.$characterSize.width),t},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.el&&this.el.parentNode&&this.el.parentNode.removeChild(this.el)}}).call(f.prototype)}),ace.define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/lib/useragent","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./config"),o=e("./lib/useragent"),u=e("./layer/gutter").Gutter,a=e("./layer/marker").Marker,f=e("./layer/text").Text,l=e("./layer/cursor").Cursor,c=e("./scrollbar").HScrollBar,h=e("./scrollbar").VScrollBar,p=e("./renderloop").RenderLoop,d=e("./layer/font_metrics").FontMetrics,v=e("./lib/event_emitter").EventEmitter,m='.ace_editor {position: relative;overflow: hidden;font: 12px/normal \'Monaco\', \'Menlo\', \'Ubuntu Mono\', \'Consolas\', \'source-code-pro\', monospace;direction: ltr;text-align: left;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}.ace_scroller {position: absolute;overflow: hidden;top: 0;bottom: 0;background-color: inherit;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;cursor: text;}.ace_content {position: absolute;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;min-width: 100%;}.ace_dragging .ace_scroller:before{position: absolute;top: 0;left: 0;right: 0;bottom: 0;content: \'\';background: rgba(250, 250, 250, 0.01);z-index: 1000;}.ace_dragging.ace_dark .ace_scroller:before{background: rgba(0, 0, 0, 0.01);}.ace_selecting, .ace_selecting * {cursor: text !important;}.ace_gutter {position: absolute;overflow : hidden;width: auto;top: 0;bottom: 0;left: 0;cursor: default;z-index: 4;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;}.ace_gutter-active-line {position: absolute;left: 0;right: 0;}.ace_scroller.ace_scroll-left {box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;}.ace_gutter-cell {padding-left: 19px;padding-right: 6px;background-repeat: no-repeat;}.ace_gutter-cell.ace_error {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: 2px center;}.ace_gutter-cell.ace_warning {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==");background-position: 2px center;}.ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=");background-position: 2px center;}.ace_dark .ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC");}.ace_scrollbar {position: absolute;right: 0;bottom: 0;z-index: 6;}.ace_scrollbar-inner {position: absolute;cursor: text;left: 0;top: 0;}.ace_scrollbar-v{overflow-x: hidden;overflow-y: scroll;top: 0;}.ace_scrollbar-h {overflow-x: scroll;overflow-y: hidden;left: 0;}.ace_print-margin {position: absolute;height: 100%;}.ace_text-input {position: absolute;z-index: 0;width: 0.5em;height: 1em;opacity: 0;background: transparent;-moz-appearance: none;appearance: none;border: none;resize: none;outline: none;overflow: hidden;font: inherit;padding: 0 1px;margin: 0 -1px;text-indent: -1em;-ms-user-select: text;-moz-user-select: text;-webkit-user-select: text;user-select: text;white-space: pre!important;}.ace_text-input.ace_composition {background: inherit;color: inherit;z-index: 1000;opacity: 1;text-indent: 0;}.ace_layer {z-index: 1;position: absolute;overflow: hidden;word-wrap: normal;white-space: pre;height: 100%;width: 100%;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;pointer-events: none;}.ace_gutter-layer {position: relative;width: auto;text-align: right;pointer-events: auto;}.ace_text-layer {font: inherit !important;}.ace_cjk {display: inline-block;text-align: center;}.ace_cursor-layer {z-index: 4;}.ace_cursor {z-index: 4;position: absolute;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;border-left: 2px solid;transform: translatez(0);}.ace_multiselect .ace_cursor {border-left-width: 1px;}.ace_slim-cursors .ace_cursor {border-left-width: 1px;}.ace_overwrite-cursors .ace_cursor {border-left-width: 0;border-bottom: 1px solid;}.ace_hidden-cursors .ace_cursor {opacity: 0.2;}.ace_smooth-blinking .ace_cursor {-webkit-transition: opacity 0.18s;transition: opacity 0.18s;}.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {position: absolute;z-index: 3;}.ace_marker-layer .ace_selection {position: absolute;z-index: 5;}.ace_marker-layer .ace_bracket {position: absolute;z-index: 6;}.ace_marker-layer .ace_active-line {position: absolute;z-index: 2;}.ace_marker-layer .ace_selected-word {position: absolute;z-index: 4;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;}.ace_line .ace_fold {-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;display: inline-block;height: 11px;margin-top: -2px;vertical-align: middle;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=");background-repeat: no-repeat, repeat-x;background-position: center center, top left;color: transparent;border: 1px solid black;border-radius: 2px;cursor: pointer;pointer-events: auto;}.ace_dark .ace_fold {}.ace_fold:hover{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC");}.ace_tooltip {background-color: #FFF;background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.1));background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));border: 1px solid gray;border-radius: 1px;box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);color: black;max-width: 100%;padding: 3px 4px;position: fixed;z-index: 999999;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;cursor: default;white-space: pre;word-wrap: break-word;line-height: normal;font-style: normal;font-weight: normal;letter-spacing: normal;pointer-events: none;}.ace_folding-enabled > .ace_gutter-cell {padding-right: 13px;}.ace_fold-widget {-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;margin: 0 -12px 0 1px;display: none;width: 11px;vertical-align: top;background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: center;border-radius: 3px;border: 1px solid transparent;cursor: pointer;}.ace_folding-enabled .ace_fold-widget {display: inline-block;   }.ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");}.ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");}.ace_fold-widget:hover {border: 1px solid rgba(0, 0, 0, 0.3);background-color: rgba(255, 255, 255, 0.2);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);}.ace_fold-widget:active {border: 1px solid rgba(0, 0, 0, 0.4);background-color: rgba(0, 0, 0, 0.05);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);}.ace_dark .ace_fold-widget {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");}.ace_dark .ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget:hover {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);background-color: rgba(255, 255, 255, 0.1);}.ace_dark .ace_fold-widget:active {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);}.ace_fold-widget.ace_invalid {background-color: #FFB4B4;border-color: #DE5555;}.ace_fade-fold-widgets .ace_fold-widget {-webkit-transition: opacity 0.4s ease 0.05s;transition: opacity 0.4s ease 0.05s;opacity: 0;}.ace_fade-fold-widgets:hover .ace_fold-widget {-webkit-transition: opacity 0.05s ease 0.05s;transition: opacity 0.05s ease 0.05s;opacity:1;}.ace_underline {text-decoration: underline;}.ace_bold {font-weight: bold;}.ace_nobold .ace_bold {font-weight: normal;}.ace_italic {font-style: italic;}.ace_error-marker {background-color: rgba(255, 0, 0,0.2);position: absolute;z-index: 9;}.ace_highlight-marker {background-color: rgba(255, 255, 0,0.2);position: absolute;z-index: 8;}.ace_br1 {border-top-left-radius    : 3px;}.ace_br2 {border-top-right-radius   : 3px;}.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}.ace_br4 {border-bottom-right-radius: 3px;}.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}.ace_br8 {border-bottom-left-radius : 3px;}.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}.ace_text-input-ios {position: absolute !important;top: -100000px !important;left: -100000px !important;}';i.importCssString(m,"ace_editor.css");var g=function(e,t){var n=this;this.container=e||i.createElement("div"),this.$keepTextAreaAtCursor=!o.isOldIE,i.addCssClass(this.container,"ace_editor"),this.setTheme(t),this.$gutter=i.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=i.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=i.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new u(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onGutterResize.bind(this)),this.$markerBack=new a(this.content);var r=this.$textLayer=new f(this.content);this.canvas=r.element,this.$markerFront=new a(this.content),this.$cursorLayer=new l(this.content),this.$horizScroll=!1,this.$vScroll=!1,this.scrollBar=this.scrollBarV=new h(this.container,this),this.scrollBarH=new c(this.container,this),this.scrollBarV.addEventListener("scroll",function(e){n.$scrollAnimation||n.session.setScrollTop(e.data-n.scrollMargin.top)}),this.scrollBarH.addEventListener("scroll",function(e){n.$scrollAnimation||n.session.setScrollLeft(e.data-n.scrollMargin.left)}),this.scrollTop=0,this.scrollLeft=0,this.cursorPos={row:0,column:0},this.$fontMetrics=new d(this.container),this.$textLayer.$setFontMetrics(this.$fontMetrics),this.$textLayer.addEventListener("changeCharacterSize",function(e){n.updateCharacterSize(),n.onResize(!0,n.gutterWidth,n.$size.width,n.$size.height),n._signal("changeCharacterSize",e)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0,$dirty:!0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:0,characterWidth:0,minHeight:1,maxHeight:1,offset:0,height:1,gutterOffset:1},this.scrollMargin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.$loop=new p(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.updateCharacterSize(),this.setPadding(4),s.resetOptions(this),s._emit("renderer",this)};(function(){this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,r.implement(this,v),this.updateCharacterSize=function(){this.$textLayer.allowBoldFonts!=this.$allowBoldFonts&&(this.$allowBoldFonts=this.$textLayer.allowBoldFonts,this.setStyle("ace_nobold",!this.$allowBoldFonts)),this.layerConfig.characterWidth=this.characterWidth=this.$textLayer.getCharacterWidth(),this.layerConfig.lineHeight=this.lineHeight=this.$textLayer.getLineHeight(),this.$updatePrintMargin()},this.setSession=function(e){this.session&&this.session.doc.off("changeNewLineMode",this.onChangeNewLineMode),this.session=e,e&&this.scrollMargin.top&&e.getScrollTop()<=0&&e.setScrollTop(-this.scrollMargin.top),this.$cursorLayer.setSession(e),this.$markerBack.setSession(e),this.$markerFront.setSession(e),this.$gutterLayer.setSession(e),this.$textLayer.setSession(e);if(!e)return;this.$loop.schedule(this.CHANGE_FULL),this.session.$setFontMetrics(this.$fontMetrics),this.scrollBarH.scrollLeft=this.scrollBarV.scrollTop=null,this.onChangeNewLineMode=this.onChangeNewLineMode.bind(this),this.onChangeNewLineMode(),this.session.doc.on("changeNewLineMode",this.onChangeNewLineMode)},this.updateLines=function(e,t,n){t===undefined&&(t=Infinity),this.$changedLines?(this.$changedLines.firstRow>e&&(this.$changedLines.firstRow=e),this.$changedLines.lastRow<t&&(this.$changedLines.lastRow=t)):this.$changedLines={firstRow:e,lastRow:t};if(this.$changedLines.lastRow<this.layerConfig.firstRow){if(!n)return;this.$changedLines.lastRow=this.layerConfig.lastRow}if(this.$changedLines.firstRow>this.layerConfig.lastRow)return;this.$loop.schedule(this.CHANGE_LINES)},this.onChangeNewLineMode=function(){this.$loop.schedule(this.CHANGE_TEXT),this.$textLayer.$updateEolChar()},this.onChangeTabSize=function(){this.$loop.schedule(this.CHANGE_TEXT|this.CHANGE_MARKER),this.$textLayer.onChangeTabSize()},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(e){e?this.$renderChanges(this.CHANGE_FULL,!0):this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.$changes=0,this.$updateSizeAsync=function(){this.$loop.pending?this.$size.$dirty=!0:this.onResize()},this.onResize=function(e,t,n,r){if(this.resizing>2)return;this.resizing>0?this.resizing++:this.resizing=e?1:0;var i=this.container;r||(r=i.clientHeight||i.scrollHeight),n||(n=i.clientWidth||i.scrollWidth);var s=this.$updateCachedSize(e,t,n,r);if(!this.$size.scrollerHeight||!n&&!r)return this.resizing=0;e&&(this.$gutterLayer.$padding=null),e?this.$renderChanges(s|this.$changes,!0):this.$loop.schedule(s|this.$changes),this.resizing&&(this.resizing=0),this.scrollBarV.scrollLeft=this.scrollBarV.scrollTop=null},this.$updateCachedSize=function(e,t,n,r){r-=this.$extraHeight||0;var i=0,s=this.$size,o={width:s.width,height:s.height,scrollerHeight:s.scrollerHeight,scrollerWidth:s.scrollerWidth};r&&(e||s.height!=r)&&(s.height=r,i|=this.CHANGE_SIZE,s.scrollerHeight=s.height,this.$horizScroll&&(s.scrollerHeight-=this.scrollBarH.getHeight()),this.scrollBarV.element.style.bottom=this.scrollBarH.getHeight()+"px",i|=this.CHANGE_SCROLL);if(n&&(e||s.width!=n)){i|=this.CHANGE_SIZE,s.width=n,t==null&&(t=this.$showGutter?this.$gutter.offsetWidth:0),this.gutterWidth=t,this.scrollBarH.element.style.left=this.scroller.style.left=t+"px",s.scrollerWidth=Math.max(0,n-t-this.scrollBarV.getWidth()),this.scrollBarH.element.style.right=this.scroller.style.right=this.scrollBarV.getWidth()+"px",this.scroller.style.bottom=this.scrollBarH.getHeight()+"px";if(this.session&&this.session.getUseWrapMode()&&this.adjustWrapLimit()||e)i|=this.CHANGE_FULL}return s.$dirty=!n||!r,i&&this._signal("resize",o),i},this.onGutterResize=function(){var e=this.$showGutter?this.$gutter.offsetWidth:0;e!=this.gutterWidth&&(this.$changes|=this.$updateCachedSize(!0,e,this.$size.width,this.$size.height)),this.session.getUseWrapMode()&&this.adjustWrapLimit()?this.$loop.schedule(this.CHANGE_FULL):this.$size.$dirty?this.$loop.schedule(this.CHANGE_FULL):(this.$computeLayerConfig(),this.$loop.schedule(this.CHANGE_MARKER))},this.adjustWrapLimit=function(){var e=this.$size.scrollerWidth-this.$padding*2,t=Math.floor(e/this.characterWidth);return this.session.adjustWrapLimit(t,this.$showPrintMargin&&this.$printMarginColumn)},this.setAnimatedScroll=function(e){this.setOption("animatedScroll",e)},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(e){this.setOption("showInvisibles",e)},this.getShowInvisibles=function(){return this.getOption("showInvisibles")},this.getDisplayIndentGuides=function(){return this.getOption("displayIndentGuides")},this.setDisplayIndentGuides=function(e){this.setOption("displayIndentGuides",e)},this.setShowPrintMargin=function(e){this.setOption("showPrintMargin",e)},this.getShowPrintMargin=function(){return this.getOption("showPrintMargin")},this.setPrintMarginColumn=function(e){this.setOption("printMarginColumn",e)},this.getPrintMarginColumn=function(){return this.getOption("printMarginColumn")},this.getShowGutter=function(){return this.getOption("showGutter")},this.setShowGutter=function(e){return this.setOption("showGutter",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.$updateGutterLineHighlight=function(){var e=this.$cursorLayer.$pixelPos,t=this.layerConfig.lineHeight;if(this.session.getUseWrapMode()){var n=this.session.selection.getCursor();n.column=0,e=this.$cursorLayer.getPixelPosition(n,!0),t*=this.session.getRowLength(n.row)}this.$gutterLineHighlight.style.top=e.top-this.layerConfig.offset+"px",this.$gutterLineHighlight.style.height=t+"px"},this.$updatePrintMargin=function(){if(!this.$showPrintMargin&&!this.$printMarginEl)return;if(!this.$printMarginEl){var e=i.createElement("div");e.className="ace_layer ace_print-margin-layer",this.$printMarginEl=i.createElement("div"),this.$printMarginEl.className="ace_print-margin",e.appendChild(this.$printMarginEl),this.content.insertBefore(e,this.content.firstChild)}var t=this.$printMarginEl.style;t.left=this.characterWidth*this.$printMarginColumn+this.$padding+"px",t.visibility=this.$showPrintMargin?"visible":"hidden",this.session&&this.session.$wrap==-1&&this.adjustWrapLimit()},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.scroller},this.getTextAreaContainer=function(){return this.container},this.$moveTextAreaToCursor=function(){if(!this.$keepTextAreaAtCursor)return;var e=this.layerConfig,t=this.$cursorLayer.$pixelPos.top,n=this.$cursorLayer.$pixelPos.left;t-=e.offset;var r=this.textarea.style,i=this.lineHeight;if(t<0||t>e.height-i){r.top=r.left="0";return}var s=this.characterWidth;if(this.$composition){var o=this.textarea.value.replace(/^\x01+/,"");s*=this.session.$getStringScreenWidth(o)[0]+2,i+=2}n-=this.scrollLeft,n>this.$size.scrollerWidth-s&&(n=this.$size.scrollerWidth-s),n+=this.gutterWidth,r.height=i+"px",r.width=s+"px",r.left=Math.min(n,this.$size.scrollerWidth-s)+"px",r.top=Math.min(t,this.$size.height-i)+"px"},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var e=this.layerConfig,t=e.lastRow,n=this.session.documentToScreenRow(t,0)*e.lineHeight;return n-this.session.getScrollTop()>e.height-e.lineHeight?t-1:t},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(e){this.$padding=e,this.$textLayer.setPadding(e),this.$cursorLayer.setPadding(e),this.$markerFront.setPadding(e),this.$markerBack.setPadding(e),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.setScrollMargin=function(e,t,n,r){var i=this.scrollMargin;i.top=e|0,i.bottom=t|0,i.right=r|0,i.left=n|0,i.v=i.top+i.bottom,i.h=i.left+i.right,i.top&&this.scrollTop<=0&&this.session&&this.session.setScrollTop(-i.top),this.updateFull()},this.getHScrollBarAlwaysVisible=function(){return this.$hScrollBarAlwaysVisible},this.setHScrollBarAlwaysVisible=function(e){this.setOption("hScrollBarAlwaysVisible",e)},this.getVScrollBarAlwaysVisible=function(){return this.$vScrollBarAlwaysVisible},this.setVScrollBarAlwaysVisible=function(e){this.setOption("vScrollBarAlwaysVisible",e)},this.$updateScrollBarV=function(){var e=this.layerConfig.maxHeight,t=this.$size.scrollerHeight;!this.$maxLines&&this.$scrollPastEnd&&(e-=(t-this.lineHeight)*this.$scrollPastEnd,this.scrollTop>e-t&&(e=this.scrollTop+t,this.scrollBarV.scrollTop=null)),this.scrollBarV.setScrollHeight(e+this.scrollMargin.v),this.scrollBarV.setScrollTop(this.scrollTop+this.scrollMargin.top)},this.$updateScrollBarH=function(){this.scrollBarH.setScrollWidth(this.layerConfig.width+2*this.$padding+this.scrollMargin.h),this.scrollBarH.setScrollLeft(this.scrollLeft+this.scrollMargin.left)},this.$frozen=!1,this.freeze=function(){this.$frozen=!0},this.unfreeze=function(){this.$frozen=!1},this.$renderChanges=function(e,t){this.$changes&&(e|=this.$changes,this.$changes=0);if(!this.session||!this.container.offsetWidth||this.$frozen||!e&&!t){this.$changes|=e;return}if(this.$size.$dirty)return this.$changes|=e,this.onResize(!0);this.lineHeight||this.$textLayer.checkForSizeChanges(),this._signal("beforeRender");var n=this.layerConfig;if(e&this.CHANGE_FULL||e&this.CHANGE_SIZE||e&this.CHANGE_TEXT||e&this.CHANGE_LINES||e&this.CHANGE_SCROLL||e&this.CHANGE_H_SCROLL){e|=this.$computeLayerConfig();if(n.firstRow!=this.layerConfig.firstRow&&n.firstRowScreen==this.layerConfig.firstRowScreen){var r=this.scrollTop+(n.firstRow-this.layerConfig.firstRow)*this.lineHeight;r>0&&(this.scrollTop=r,e|=this.CHANGE_SCROLL,e|=this.$computeLayerConfig())}n=this.layerConfig,this.$updateScrollBarV(),e&this.CHANGE_H_SCROLL&&this.$updateScrollBarH(),this.$gutterLayer.element.style.marginTop=-n.offset+"px",this.content.style.marginTop=-n.offset+"px",this.content.style.width=n.width+2*this.$padding+"px",this.content.style.height=n.minHeight+"px"}e&this.CHANGE_H_SCROLL&&(this.content.style.marginLeft=-this.scrollLeft+"px",this.scroller.className=this.scrollLeft<=0?"ace_scroller":"ace_scroller ace_scroll-left");if(e&this.CHANGE_FULL){this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),this.$highlightGutterLine&&this.$updateGutterLineHighlight(),this._signal("afterRender");return}if(e&this.CHANGE_SCROLL){e&this.CHANGE_TEXT||e&this.CHANGE_LINES?this.$textLayer.update(n):this.$textLayer.scrollLines(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$highlightGutterLine&&this.$updateGutterLineHighlight(),this.$moveTextAreaToCursor(),this._signal("afterRender");return}e&this.CHANGE_TEXT?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n)):e&this.CHANGE_LINES?(this.$updateLines()||e&this.CHANGE_GUTTER&&this.$showGutter)&&this.$gutterLayer.update(n):(e&this.CHANGE_TEXT||e&this.CHANGE_GUTTER)&&this.$showGutter&&this.$gutterLayer.update(n),e&this.CHANGE_CURSOR&&(this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),this.$highlightGutterLine&&this.$updateGutterLineHighlight()),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(n),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(n),this._signal("afterRender")},this.$autosize=function(){var e=this.session.getScreenLength()*this.lineHeight,t=this.$maxLines*this.lineHeight,n=Math.min(t,Math.max((this.$minLines||1)*this.lineHeight,e))+this.scrollMargin.v+(this.$extraHeight||0);this.$horizScroll&&(n+=this.scrollBarH.getHeight()),this.$maxPixelHeight&&n>this.$maxPixelHeight&&(n=this.$maxPixelHeight);var r=e>t;if(n!=this.desiredHeight||this.$size.height!=this.desiredHeight||r!=this.$vScroll){r!=this.$vScroll&&(this.$vScroll=r,this.scrollBarV.setVisible(r));var i=this.container.clientWidth;this.container.style.height=n+"px",this.$updateCachedSize(!0,this.$gutterWidth,i,n),this.desiredHeight=n,this._signal("autosize")}},this.$computeLayerConfig=function(){var e=this.session,t=this.$size,n=t.height<=2*this.lineHeight,r=this.session.getScreenLength(),i=r*this.lineHeight,s=this.$getLongestLine(),o=!n&&(this.$hScrollBarAlwaysVisible||t.scrollerWidth-s-2*this.$padding<0),u=this.$horizScroll!==o;u&&(this.$horizScroll=o,this.scrollBarH.setVisible(o));var a=this.$vScroll;this.$maxLines&&this.lineHeight>1&&this.$autosize();var f=this.scrollTop%this.lineHeight,l=t.scrollerHeight+this.lineHeight,c=!this.$maxLines&&this.$scrollPastEnd?(t.scrollerHeight-this.lineHeight)*this.$scrollPastEnd:0;i+=c;var h=this.scrollMargin;this.session.setScrollTop(Math.max(-h.top,Math.min(this.scrollTop,i-t.scrollerHeight+h.bottom))),this.session.setScrollLeft(Math.max(-h.left,Math.min(this.scrollLeft,s+2*this.$padding-t.scrollerWidth+h.right)));var p=!n&&(this.$vScrollBarAlwaysVisible||t.scrollerHeight-i+c<0||this.scrollTop>h.top),d=a!==p;d&&(this.$vScroll=p,this.scrollBarV.setVisible(p));var v=Math.ceil(l/this.lineHeight)-1,m=Math.max(0,Math.round((this.scrollTop-f)/this.lineHeight)),g=m+v,y,b,w=this.lineHeight;m=e.screenToDocumentRow(m,0);var E=e.getFoldLine(m);E&&(m=E.start.row),y=e.documentToScreenRow(m,0),b=e.getRowLength(m)*w,g=Math.min(e.screenToDocumentRow(g,0),e.getLength()-1),l=t.scrollerHeight+e.getRowLength(g)*w+b,f=this.scrollTop-y*w;var S=0;this.layerConfig.width!=s&&(S=this.CHANGE_H_SCROLL);if(u||d)S=this.$updateCachedSize(!0,this.gutterWidth,t.width,t.height),this._signal("scrollbarVisibilityChanged"),d&&(s=this.$getLongestLine());return this.layerConfig={width:s,padding:this.$padding,firstRow:m,firstRowScreen:y,lastRow:g,lineHeight:w,characterWidth:this.characterWidth,minHeight:l,maxHeight:i,offset:f,gutterOffset:w?Math.max(0,Math.ceil((f+t.height-t.scrollerHeight)/w)):0,height:this.$size.scrollerHeight},S},this.$updateLines=function(){if(!this.$changedLines)return;var e=this.$changedLines.firstRow,t=this.$changedLines.lastRow;this.$changedLines=null;var n=this.layerConfig;if(e>n.lastRow+1)return;if(t<n.firstRow)return;if(t===Infinity){this.$showGutter&&this.$gutterLayer.update(n),this.$textLayer.update(n);return}return this.$textLayer.updateLines(n,e,t),!0},this.$getLongestLine=function(){var e=this.session.getScreenWidth();return this.showInvisibles&&!this.session.$useWrapMode&&(e+=1),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(e*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(e,t){this.$gutterLayer.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){this.$gutterLayer.removeGutterDecoration(e,t)},this.updateBreakpoints=function(e){this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(e){this.$gutterLayer.setAnnotations(e),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(e,t,n){this.scrollCursorIntoView(e,n),this.scrollCursorIntoView(t,n)},this.scrollCursorIntoView=function(e,t,n){if(this.$size.scrollerHeight===0)return;var r=this.$cursorLayer.getPixelPosition(e),i=r.left,s=r.top,o=n&&n.top||0,u=n&&n.bottom||0,a=this.$scrollAnimation?this.session.getScrollTop():this.scrollTop;a+o>s?(t&&a+o>s+this.lineHeight&&(s-=t*this.$size.scrollerHeight),s===0&&(s=-this.scrollMargin.top),this.session.setScrollTop(s)):a+this.$size.scrollerHeight-u<s+this.lineHeight&&(t&&a+this.$size.scrollerHeight-u<s-this.lineHeight&&(s+=t*this.$size.scrollerHeight),this.session.setScrollTop(s+this.lineHeight-this.$size.scrollerHeight));var f=this.scrollLeft;f>i?(i<this.$padding+2*this.layerConfig.characterWidth&&(i=-this.scrollMargin.left),this.session.setScrollLeft(i)):f+this.$size.scrollerWidth<i+this.characterWidth?this.session.setScrollLeft(Math.round(i+this.characterWidth-this.$size.scrollerWidth)):f<=this.$padding&&i-f<this.characterWidth&&this.session.setScrollLeft(0)},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(e){this.session.setScrollTop(e*this.lineHeight)},this.alignCursor=function(e,t){typeof e=="number"&&(e={row:e,column:0});var n=this.$cursorLayer.getPixelPosition(e),r=this.$size.scrollerHeight-this.lineHeight,i=n.top-r*(t||0);return this.session.setScrollTop(i),i},this.STEPS=8,this.$calcSteps=function(e,t){var n=0,r=this.STEPS,i=[],s=function(e,t,n){return n*(Math.pow(e-1,3)+1)+t};for(n=0;n<r;++n)i.push(s(n/this.STEPS,e,t-e));return i},this.scrollToLine=function(e,t,n,r){var i=this.$cursorLayer.getPixelPosition({row:e,column:0}),s=i.top;t&&(s-=this.$size.scrollerHeight/2);var o=this.scrollTop;this.session.setScrollTop(s),n!==!1&&this.animateScrolling(o,r)},this.animateScrolling=function(e,t){var n=this.scrollTop;if(!this.$animatedScroll)return;var r=this;if(e==n)return;if(this.$scrollAnimation){var i=this.$scrollAnimation.steps;if(i.length){e=i[0];if(e==n)return}}var s=r.$calcSteps(e,n);this.$scrollAnimation={from:e,to:n,steps:s},clearInterval(this.$timer),r.session.setScrollTop(s.shift()),r.session.$scrollTop=n,this.$timer=setInterval(function(){s.length?(r.session.setScrollTop(s.shift()),r.session.$scrollTop=n):n!=null?(r.session.$scrollTop=-1,r.session.setScrollTop(n),n=null):(r.$timer=clearInterval(r.$timer),r.$scrollAnimation=null,t&&t())},10)},this.scrollToY=function(e){this.scrollTop!==e&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=e)},this.scrollToX=function(e){this.scrollLeft!==e&&(this.scrollLeft=e),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollTo=function(e,t){this.session.setScrollTop(t),this.session.setScrollLeft(t)},this.scrollBy=function(e,t){t&&this.session.setScrollTop(this.session.getScrollTop()+t),e&&this.session.setScrollLeft(this.session.getScrollLeft()+e)},this.isScrollableBy=function(e,t){if(t<0&&this.session.getScrollTop()>=1-this.scrollMargin.top)return!0;if(t>0&&this.session.getScrollTop()+this.$size.scrollerHeight-this.layerConfig.maxHeight<-1+this.scrollMargin.bottom)return!0;if(e<0&&this.session.getScrollLeft()>=1-this.scrollMargin.left)return!0;if(e>0&&this.session.getScrollLeft()+this.$size.scrollerWidth-this.layerConfig.width<-1+this.scrollMargin.right)return!0},this.pixelToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=(e+this.scrollLeft-n.left-this.$padding)/this.characterWidth,i=Math.floor((t+this.scrollTop-n.top)/this.lineHeight),s=Math.round(r);return{row:i,column:s,side:r-s>0?1:-1}},this.screenToTextCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=Math.round((e+this.scrollLeft-n.left-this.$padding)/this.characterWidth),i=(t+this.scrollTop-n.top)/this.lineHeight;return this.session.screenToDocumentPosition(i,Math.max(r,0))},this.textToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=this.session.documentToScreenPosition(e,t),i=this.$padding+Math.round(r.column*this.characterWidth),s=r.row*this.lineHeight;return{pageX:n.left+i-this.scrollLeft,pageY:n.top+s-this.scrollTop}},this.visualizeFocus=function(){i.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){i.removeCssClass(this.container,"ace_focus")},this.showComposition=function(e){this.$composition||(this.$composition={keepTextAreaAtCursor:this.$keepTextAreaAtCursor,cssText:this.textarea.style.cssText}),this.$keepTextAreaAtCursor=!0,i.addCssClass(this.textarea,"ace_composition"),this.textarea.style.cssText="",this.$moveTextAreaToCursor()},this.setCompositionText=function(e){this.$moveTextAreaToCursor()},this.hideComposition=function(){if(!this.$composition)return;i.removeCssClass(this.textarea,"ace_composition"),this.$keepTextAreaAtCursor=this.$composition.keepTextAreaAtCursor,this.textarea.style.cssText=this.$composition.cssText,this.$composition=null},this.setTheme=function(e,t){function o(r){if(n.$themeId!=e)return t&&t();if(!r||!r.cssClass)throw new Error("couldn't load module "+e+" or it didn't call define");i.importCssString(r.cssText,r.cssClass,n.container.ownerDocument),n.theme&&i.removeCssClass(n.container,n.theme.cssClass);var s="padding"in r?r.padding:"padding"in(n.theme||{})?4:n.$padding;n.$padding&&s!=n.$padding&&n.setPadding(s),n.$theme=r.cssClass,n.theme=r,i.addCssClass(n.container,r.cssClass),i.setCssClass(n.container,"ace_dark",r.isDark),n.$size&&(n.$size.width=0,n.$updateSizeAsync()),n._dispatchEvent("themeLoaded",{theme:r}),t&&t()}var n=this;this.$themeId=e,n._dispatchEvent("themeChange",{theme:e});if(!e||typeof e=="string"){var r=e||this.$options.theme.initialValue;s.loadModule(["theme",r],o)}else o(e)},this.getTheme=function(){return this.$themeId},this.setStyle=function(e,t){i.setCssClass(this.container,e,t!==!1)},this.unsetStyle=function(e){i.removeCssClass(this.container,e)},this.setCursorStyle=function(e){this.scroller.style.cursor!=e&&(this.scroller.style.cursor=e)},this.setMouseCursor=function(e){this.scroller.style.cursor=e},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}}).call(g.prototype),s.defineOptions(g.prototype,"renderer",{animatedScroll:{initialValue:!1},showInvisibles:{set:function(e){this.$textLayer.setShowInvisibles(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!1},showPrintMargin:{set:function(){this.$updatePrintMargin()},initialValue:!0},printMarginColumn:{set:function(){this.$updatePrintMargin()},initialValue:80},printMargin:{set:function(e){typeof e=="number"&&(this.$printMarginColumn=e),this.$showPrintMargin=!!e,this.$updatePrintMargin()},get:function(){return this.$showPrintMargin&&this.$printMarginColumn}},showGutter:{set:function(e){this.$gutter.style.display=e?"block":"none",this.$loop.schedule(this.CHANGE_FULL),this.onGutterResize()},initialValue:!0},fadeFoldWidgets:{set:function(e){i.setCssClass(this.$gutter,"ace_fade-fold-widgets",e)},initialValue:!1},showFoldWidgets:{set:function(e){this.$gutterLayer.setShowFoldWidgets(e)},initialValue:!0},showLineNumbers:{set:function(e){this.$gutterLayer.setShowLineNumbers(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},displayIndentGuides:{set:function(e){this.$textLayer.setDisplayIndentGuides(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!0},highlightGutterLine:{set:function(e){if(!this.$gutterLineHighlight){this.$gutterLineHighlight=i.createElement("div"),this.$gutterLineHighlight.className="ace_gutter-active-line",this.$gutter.appendChild(this.$gutterLineHighlight);return}this.$gutterLineHighlight.style.display=e?"":"none",this.$cursorLayer.$pixelPos&&this.$updateGutterLineHighlight()},initialValue:!1,value:!0},hScrollBarAlwaysVisible:{set:function(e){(!this.$hScrollBarAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},vScrollBarAlwaysVisible:{set:function(e){(!this.$vScrollBarAlwaysVisible||!this.$vScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},fontSize:{set:function(e){typeof e=="number"&&(e+="px"),this.container.style.fontSize=e,this.updateFontSize()},initialValue:12},fontFamily:{set:function(e){this.container.style.fontFamily=e,this.updateFontSize()}},maxLines:{set:function(e){this.updateFull()}},minLines:{set:function(e){this.updateFull()}},maxPixelHeight:{set:function(e){this.updateFull()},initialValue:0},scrollPastEnd:{set:function(e){e=+e||0;if(this.$scrollPastEnd==e)return;this.$scrollPastEnd=e,this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:0,handlesSet:!0},fixedWidthGutter:{set:function(e){this.$gutterLayer.$fixedWidth=!!e,this.$loop.schedule(this.CHANGE_GUTTER)}},theme:{set:function(e){this.setTheme(e)},get:function(){return this.$themeId||this.theme},initialValue:"./theme/textmate",handlesSet:!0}}),t.VirtualRenderer=g}),ace.define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/net","ace/lib/event_emitter","ace/config"],function(e,t,n){"use strict";function u(e){var t="importScripts('"+i.qualifyURL(e)+"');";try{return new Blob([t],{type:"application/javascript"})}catch(n){var r=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder,s=new r;return s.append(t),s.getBlob("application/javascript")}}function a(e){var t=u(e),n=window.URL||window.webkitURL,r=n.createObjectURL(t);return new Worker(r)}var r=e("../lib/oop"),i=e("../lib/net"),s=e("../lib/event_emitter").EventEmitter,o=e("../config"),f=function(t,n,r,i,s){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.onMessage=this.onMessage.bind(this),e.nameToUrl&&!e.toUrl&&(e.toUrl=e.nameToUrl);if(o.get("packaged")||!e.toUrl)i=i||o.moduleUrl(n,"worker");else{var u=this.$normalizePath;i=i||u(e.toUrl("ace/worker/worker.js",null,"_"));var f={};t.forEach(function(t){f[t]=u(e.toUrl(t,null,"_").replace(/(\.js)?(\?.*)?$/,""))})}this.$worker=a(i),s&&this.send("importScripts",s),this.$worker.postMessage({init:!0,tlns:f,module:n,classname:r}),this.callbackId=1,this.callbacks={},this.$worker.onmessage=this.onMessage};(function(){r.implement(this,s),this.onMessage=function(e){var t=e.data;switch(t.type){case"event":this._signal(t.name,{data:t.data});break;case"call":var n=this.callbacks[t.id];n&&(n(t.data),delete this.callbacks[t.id]);break;case"error":this.reportError(t.data);break;case"log":window.console&&console.log&&console.log.apply(console,t.data)}},this.reportError=function(e){window.console&&console.error&&console.error(e)},this.$normalizePath=function(e){return i.qualifyURL(e)},this.terminate=function(){this._signal("terminate",{}),this.deltaQueue=null,this.$worker.terminate(),this.$worker=null,this.$doc&&this.$doc.off("change",this.changeListener),this.$doc=null},this.send=function(e,t){this.$worker.postMessage({command:e,args:t})},this.call=function(e,t,n){if(n){var r=this.callbackId++;this.callbacks[r]=n,t.push(r)}this.send(e,t)},this.emit=function(e,t){try{this.$worker.postMessage({event:e,data:{data:t.data}})}catch(n){console.error(n.stack)}},this.attachToDocument=function(e){this.$doc&&this.terminate(),this.$doc=e,this.call("setValue",[e.getValue()]),e.on("change",this.changeListener)},this.changeListener=function(e){this.deltaQueue||(this.deltaQueue=[],setTimeout(this.$sendDeltaQueue,0)),e.action=="insert"?this.deltaQueue.push(e.start,e.lines):this.deltaQueue.push(e.start,e.end)},this.$sendDeltaQueue=function(){var e=this.deltaQueue;if(!e)return;this.deltaQueue=null,e.length>50&&e.length>this.$doc.getLength()>>1?this.call("setValue",[this.$doc.getValue()]):this.emit("change",{data:e})}}).call(f.prototype);var l=function(e,t,n){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.callbackId=1,this.callbacks={},this.messageBuffer=[];var r=null,i=!1,u=Object.create(s),a=this;this.$worker={},this.$worker.terminate=function(){},this.$worker.postMessage=function(e){a.messageBuffer.push(e),r&&(i?setTimeout(f):f())},this.setEmitSync=function(e){i=e};var f=function(){var e=a.messageBuffer.shift();e.command?r[e.command].apply(r,e.args):e.event&&u._signal(e.event,e.data)};u.postMessage=function(e){a.onMessage({data:e})},u.callback=function(e,t){this.postMessage({type:"call",id:t,data:e})},u.emit=function(e,t){this.postMessage({type:"event",name:e,data:t})},o.loadModule(["worker",t],function(e){r=new e[n](u);while(a.messageBuffer.length)f()})};l.prototype=f.prototype,t.UIWorkerClient=l,t.WorkerClient=f,t.createWorker=a}),ace.define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],function(e,t,n){"use strict";var r=e("./range").Range,i=e("./lib/event_emitter").EventEmitter,s=e("./lib/oop"),o=function(e,t,n,r,i,s){var o=this;this.length=t,this.session=e,this.doc=e.getDocument(),this.mainClass=i,this.othersClass=s,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=r,this.$onCursorChange=function(){setTimeout(function(){o.onCursorChange()})},this.$pos=n;var u=e.getUndoManager().$undoStack||e.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=u.length,this.setup(),e.selection.on("changeCursor",this.$onCursorChange)};(function(){s.implement(this,i),this.setup=function(){var e=this,t=this.doc,n=this.session;this.selectionBefore=n.selection.toJSON(),n.selection.inMultiSelectMode&&n.selection.toSingleRange(),this.pos=t.createAnchor(this.$pos.row,this.$pos.column);var i=this.pos;i.$insertRight=!0,i.detach(),i.markerId=n.addMarker(new r(i.row,i.column,i.row,i.column+this.length),this.mainClass,null,!1),this.others=[],this.$others.forEach(function(n){var r=t.createAnchor(n.row,n.column);r.$insertRight=!0,r.detach(),e.others.push(r)}),n.setUndoSelect(!1)},this.showOtherMarkers=function(){if(this.othersActive)return;var e=this.session,t=this;this.othersActive=!0,this.others.forEach(function(n){n.markerId=e.addMarker(new r(n.row,n.column,n.row,n.column+t.length),t.othersClass,null,!1)})},this.hideOtherMarkers=function(){if(!this.othersActive)return;this.othersActive=!1;for(var e=0;e<this.others.length;e++)this.session.removeMarker(this.others[e].markerId)},this.onUpdate=function(e){if(this.$updating)return this.updateAnchors(e);var t=e;if(t.start.row!==t.end.row)return;if(t.start.row!==this.pos.row)return;this.$updating=!0;var n=e.action==="insert"?t.end.column-t.start.column:t.start.column-t.end.column,i=t.start.column>=this.pos.column&&t.start.column<=this.pos.column+this.length+1,s=t.start.column-this.pos.column;this.updateAnchors(e),i&&(this.length+=n);if(i&&!this.session.$fromUndo)if(e.action==="insert")for(var o=this.others.length-1;o>=0;o--){var u=this.others[o],a={row:u.row,column:u.column+s};this.doc.insertMergedLines(a,e.lines)}else if(e.action==="remove")for(var o=this.others.length-1;o>=0;o--){var u=this.others[o],a={row:u.row,column:u.column+s};this.doc.remove(new r(a.row,a.column,a.row,a.column-n))}this.$updating=!1,this.updateMarkers()},this.updateAnchors=function(e){this.pos.onChange(e);for(var t=this.others.length;t--;)this.others[t].onChange(e);this.updateMarkers()},this.updateMarkers=function(){if(this.$updating)return;var e=this,t=this.session,n=function(n,i){t.removeMarker(n.markerId),n.markerId=t.addMarker(new r(n.row,n.column,n.row,n.column+e.length),i,null,!1)};n(this.pos,this.mainClass);for(var i=this.others.length;i--;)n(this.others[i],this.othersClass)},this.onCursorChange=function(e){if(this.$updating||!this.session)return;var t=this.session.selection.getCursor();t.row===this.pos.row&&t.column>=this.pos.column&&t.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",e)):(this.hideOtherMarkers(),this._emit("cursorLeave",e))},this.detach=function(){this.session.removeMarker(this.pos&&this.pos.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.session.setUndoSelect(!0),this.session=null},this.cancel=function(){if(this.$undoStackDepth===-1)return;var e=this.session.getUndoManager(),t=(e.$undoStack||e.$undostack).length-this.$undoStackDepth;for(var n=0;n<t;n++)e.undo(!0);this.selectionBefore&&this.session.selection.fromJSON(this.selectionBefore)}}).call(o.prototype),t.PlaceHolder=o}),ace.define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event","ace/lib/useragent"],function(e,t,n){function s(e,t){return e.row==t.row&&e.column==t.column}function o(e){var t=e.domEvent,n=t.altKey,o=t.shiftKey,u=t.ctrlKey,a=e.getAccelKey(),f=e.getButton();u&&i.isMac&&(f=t.button);if(e.editor.inMultiSelectMode&&f==2){e.editor.textInput.onContextMenu(e.domEvent);return}if(!u&&!n&&!a){f===0&&e.editor.inMultiSelectMode&&e.editor.exitMultiSelectMode();return}if(f!==0)return;var l=e.editor,c=l.selection,h=l.inMultiSelectMode,p=e.getDocumentPosition(),d=c.getCursor(),v=e.inSelection()||c.isEmpty()&&s(p,d),m=e.x,g=e.y,y=function(e){m=e.clientX,g=e.clientY},b=l.session,w=l.renderer.pixelToScreenCoordinates(m,g),E=w,S;if(l.$mouseHandler.$enableJumpToDef)u&&n||a&&n?S=o?"block":"add":n&&l.$blockSelectEnabled&&(S="block");else if(a&&!n){S="add";if(!h&&o)return}else n&&l.$blockSelectEnabled&&(S="block");S&&i.isMac&&t.ctrlKey&&l.$mouseHandler.cancelContextMenu();if(S=="add"){if(!h&&v)return;if(!h){var x=c.toOrientedRange();l.addSelectionMarker(x)}var T=c.rangeList.rangeAtPoint(p);l.$blockScrolling++,l.inVirtualSelectionMode=!0,o&&(T=null,x=c.ranges[0]||x,l.removeSelectionMarker(x)),l.once("mouseup",function(){var e=c.toOrientedRange();T&&e.isEmpty()&&s(T.cursor,e.cursor)?c.substractPoint(e.cursor):(o?c.substractPoint(x.cursor):x&&(l.removeSelectionMarker(x),c.addRange(x)),c.addRange(e)),l.$blockScrolling--,l.inVirtualSelectionMode=!1})}else if(S=="block"){e.stop(),l.inVirtualSelectionMode=!0;var N,C=[],k=function(){var e=l.renderer.pixelToScreenCoordinates(m,g),t=b.screenToDocumentPosition(e.row,e.column);if(s(E,e)&&s(t,c.lead))return;E=e,l.$blockScrolling++,l.selection.moveToPosition(t),l.renderer.scrollCursorIntoView(),l.removeSelectionMarkers(C),C=c.rectangularRangeBlock(E,w),l.$mouseHandler.$clickSelection&&C.length==1&&C[0].isEmpty()&&(C[0]=l.$mouseHandler.$clickSelection.clone()),C.forEach(l.addSelectionMarker,l),l.updateSelectionMarkers(),l.$blockScrolling--};l.$blockScrolling++,h&&!a?c.toSingleRange():!h&&a&&(N=c.toOrientedRange(),l.addSelectionMarker(N)),o?w=b.documentToScreenPosition(c.lead):c.moveToPosition(p),l.$blockScrolling--,E={row:-1,column:-1};var L=function(e){clearInterval(O),l.removeSelectionMarkers(C),C.length||(C=[c.toOrientedRange()]),l.$blockScrolling++,N&&(l.removeSelectionMarker(N),c.toSingleRange(N));for(var t=0;t<C.length;t++)c.addRange(C[t]);l.inVirtualSelectionMode=!1,l.$mouseHandler.$clickSelection=null,l.$blockScrolling--},A=k;r.capture(l.container,y,L);var O=setInterval(function(){A()},20);return e.preventDefault()}}var r=e("../lib/event"),i=e("../lib/useragent");t.onMouseDown=o}),ace.define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],function(e,t,n){t.defaultCommands=[{name:"addCursorAbove",exec:function(e){e.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelow",exec:function(e){e.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorAboveSkipCurrent",exec:function(e){e.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelowSkipCurrent",exec:function(e){e.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreBefore",exec:function(e){e.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreAfter",exec:function(e){e.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextBefore",exec:function(e){e.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextAfter",exec:function(e){e.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"splitIntoLines",exec:function(e){e.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Alt-L",mac:"Ctrl-Alt-L"},readOnly:!0},{name:"alignCursors",exec:function(e){e.alignCursors()},bindKey:{win:"Ctrl-Alt-A",mac:"Ctrl-Alt-A"},scrollIntoView:"cursor"},{name:"findAll",exec:function(e){e.findAll()},bindKey:{win:"Ctrl-Alt-K",mac:"Ctrl-Alt-G"},scrollIntoView:"cursor",readOnly:!0}],t.multiSelectCommands=[{name:"singleSelection",bindKey:"esc",exec:function(e){e.exitMultiSelectMode()},scrollIntoView:"cursor",readOnly:!0,isAvailable:function(e){return e&&e.inMultiSelectMode}}];var r=e("../keyboard/hash_handler").HashHandler;t.keyboardHandler=new r(t.multiSelectCommands)}),ace.define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/lib/event","ace/lib/lang","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor","ace/config"],function(e,t,n){function h(e,t,n){return c.$options.wrap=!0,c.$options.needle=t,c.$options.backwards=n==-1,c.find(e)}function v(e,t){return e.row==t.row&&e.column==t.column}function m(e){if(e.$multiselectOnSessionChange)return;e.$onAddRange=e.$onAddRange.bind(e),e.$onRemoveRange=e.$onRemoveRange.bind(e),e.$onMultiSelect=e.$onMultiSelect.bind(e),e.$onSingleSelect=e.$onSingleSelect.bind(e),e.$multiselectOnSessionChange=t.onSessionChange.bind(e),e.$checkMultiselectChange=e.$checkMultiselectChange.bind(e),e.$multiselectOnSessionChange(e),e.on("changeSession",e.$multiselectOnSessionChange),e.on("mousedown",o),e.commands.addCommands(f.defaultCommands),g(e)}function g(e){function r(t){n&&(e.renderer.setMouseCursor(""),n=!1)}var t=e.textInput.getElement(),n=!1;u.addListener(t,"keydown",function(t){var i=t.keyCode==18&&!(t.ctrlKey||t.shiftKey||t.metaKey);e.$blockSelectEnabled&&i?n||(e.renderer.setMouseCursor("crosshair"),n=!0):n&&r()}),u.addListener(t,"keyup",r),u.addListener(t,"blur",r)}var r=e("./range_list").RangeList,i=e("./range").Range,s=e("./selection").Selection,o=e("./mouse/multi_select_handler").onMouseDown,u=e("./lib/event"),a=e("./lib/lang"),f=e("./commands/multi_select_commands");t.commands=f.defaultCommands.concat(f.multiSelectCommands);var l=e("./search").Search,c=new l,p=e("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(p.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(e,t){if(!e)return;if(!this.inMultiSelectMode&&this.rangeCount===0){var n=this.toOrientedRange();this.rangeList.add(n),this.rangeList.add(e);if(this.rangeList.ranges.length!=2)return this.rangeList.removeAll(),t||this.fromOrientedRange(e);this.rangeList.removeAll(),this.rangeList.add(n),this.$onAddRange(n)}e.cursor||(e.cursor=e.end);var r=this.rangeList.add(e);return this.$onAddRange(e),r.length&&this.$onRemoveRange(r),this.rangeCount>1&&!this.inMultiSelectMode&&(this._signal("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session)),t||this.fromOrientedRange(e)},this.toSingleRange=function(e){e=e||this.ranges[0];var t=this.rangeList.removeAll();t.length&&this.$onRemoveRange(t),e&&this.fromOrientedRange(e)},this.substractPoint=function(e){var t=this.rangeList.substractPoint(e);if(t)return this.$onRemoveRange(t),t[0]},this.mergeOverlappingRanges=function(){var e=this.rangeList.merge();e.length?this.$onRemoveRange(e):this.ranges[0]&&this.fromOrientedRange(this.ranges[0])},this.$onAddRange=function(e){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(e),this._signal("addRange",{range:e})},this.$onRemoveRange=function(e){this.rangeCount=this.rangeList.ranges.length;if(this.rangeCount==1&&this.inMultiSelectMode){var t=this.rangeList.ranges.pop();e.push(t),this.rangeCount=0}for(var n=e.length;n--;){var r=this.ranges.indexOf(e[n]);this.ranges.splice(r,1)}this._signal("removeRange",{ranges:e}),this.rangeCount===0&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._signal("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),t=t||this.ranges[0],t&&!t.isEqual(this.getRange())&&this.fromOrientedRange(t)},this.$initRangeList=function(){if(this.rangeList)return;this.rangeList=new r,this.ranges=[],this.rangeCount=0},this.getAllRanges=function(){return this.rangeCount?this.rangeList.ranges.concat():[this.getRange()]},this.splitIntoLines=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=i.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var n=this.getRange(),r=this.isBackwards(),s=n.start.row,o=n.end.row;if(s==o){if(r)var u=n.end,a=n.start;else var u=n.start,a=n.end;this.addRange(i.fromPoints(a,a)),this.addRange(i.fromPoints(u,u));return}var f=[],l=this.getLineRange(s,!0);l.start.column=n.start.column,f.push(l);for(var c=s+1;c<o;c++)f.push(this.getLineRange(c,!0));l=this.getLineRange(o,!0),l.end.column=n.end.column,f.push(l),f.forEach(this.addRange,this)}},this.toggleBlockSelection=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=i.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var r=this.session.documentToScreenPosition(this.selectionLead),s=this.session.documentToScreenPosition(this.selectionAnchor),o=this.rectangularRangeBlock(r,s);o.forEach(this.addRange,this)}},this.rectangularRangeBlock=function(e,t,n){var r=[],s=e.column<t.column;if(s)var o=e.column,u=t.column;else var o=t.column,u=e.column;var a=e.row<t.row;if(a)var f=e.row,l=t.row;else var f=t.row,l=e.row;o<0&&(o=0),f<0&&(f=0),f==l&&(n=!0);for(var c=f;c<=l;c++){var h=i.fromPoints(this.session.screenToDocumentPosition(c,o),this.session.screenToDocumentPosition(c,u));if(h.isEmpty()){if(p&&v(h.end,p))break;var p=h.end}h.cursor=s?h.start:h.end,r.push(h)}a&&r.reverse();if(!n){var d=r.length-1;while(r[d].isEmpty()&&d>0)d--;if(d>0){var m=0;while(r[m].isEmpty())m++}for(var g=d;g>=m;g--)r[g].isEmpty()&&r.splice(g,1)}return r}}.call(s.prototype);var d=e("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(e){e.cursor||(e.cursor=e.end);var t=this.getSelectionStyle();return e.marker=this.session.addMarker(e,"ace_selection",t),this.session.$selectionMarkers.push(e),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,e},this.removeSelectionMarker=function(e){if(!e.marker)return;this.session.removeMarker(e.marker);var t=this.session.$selectionMarkers.indexOf(e);t!=-1&&this.session.$selectionMarkers.splice(t,1),this.session.selectionMarkerCount=this.session.$selectionMarkers.length},this.removeSelectionMarkers=function(e){var t=this.session.$selectionMarkers;for(var n=e.length;n--;){var r=e[n];if(!r.marker)continue;this.session.removeMarker(r.marker);var i=t.indexOf(r);i!=-1&&t.splice(i,1)}this.session.selectionMarkerCount=t.length},this.$onAddRange=function(e){this.addSelectionMarker(e.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(e){this.removeSelectionMarkers(e.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(e){if(this.inMultiSelectMode)return;this.inMultiSelectMode=!0,this.setStyle("ace_multiselect"),this.keyBinding.addKeyboardHandler(f.keyboardHandler),this.commands.setDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onSingleSelect=function(e){if(this.session.multiSelect.inVirtualMode)return;this.inMultiSelectMode=!1,this.unsetStyle("ace_multiselect"),this.keyBinding.removeKeyboardHandler(f.keyboardHandler),this.commands.removeDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers(),this._emit("changeSelection")},this.$onMultiSelectExec=function(e){var t=e.command,n=e.editor;if(!n.multiSelect)return;if(!t.multiSelectAction){var r=t.exec(n,e.args||{});n.multiSelect.addRange(n.multiSelect.toOrientedRange()),n.multiSelect.mergeOverlappingRanges()}else t.multiSelectAction=="forEach"?r=n.forEachSelection(t,e.args):t.multiSelectAction=="forEachLine"?r=n.forEachSelection(t,e.args,!0):t.multiSelectAction=="single"?(n.exitMultiSelectMode(),r=t.exec(n,e.args||{})):r=t.multiSelectAction(n,e.args||{});return r},this.forEachSelection=function(e,t,n){if(this.inVirtualSelectionMode)return;var r=n&&n.keepOrder,i=n==1||n&&n.$byLines,o=this.session,u=this.selection,a=u.rangeList,f=(r?u:a).ranges,l;if(!f.length)return e.exec?e.exec(this,t||{}):e(this,t||{});var c=u._eventRegistry;u._eventRegistry={};var h=new s(o);this.inVirtualSelectionMode=!0;for(var p=f.length;p--;){if(i)while(p>0&&f[p].start.row==f[p-1].end.row)p--;h.fromOrientedRange(f[p]),h.index=p,this.selection=o.selection=h;var d=e.exec?e.exec(this,t||{}):e(this,t||{});!l&&d!==undefined&&(l=d),h.toOrientedRange(f[p])}h.detach(),this.selection=o.selection=u,this.inVirtualSelectionMode=!1,u._eventRegistry=c,u.mergeOverlappingRanges();var v=this.renderer.$scrollAnimation;return this.onCursorChange(),this.onSelectionChange(),v&&v.from==v.to&&this.renderer.animateScrolling(v.from),l},this.exitMultiSelectMode=function(){if(!this.inMultiSelectMode||this.inVirtualSelectionMode)return;this.multiSelect.toSingleRange()},this.getSelectedText=function(){var e="";if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var t=this.multiSelect.rangeList.ranges,n=[];for(var r=0;r<t.length;r++)n.push(this.session.getTextRange(t[r]));var i=this.session.getDocument().getNewLineCharacter();e=n.join(i),e.length==(n.length-1)*i.length&&(e="")}else this.selection.isEmpty()||(e=this.session.getTextRange(this.getSelectionRange()));return e},this.$checkMultiselectChange=function(e,t){if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var n=this.multiSelect.ranges[0];if(this.multiSelect.isEmpty()&&t==this.multiSelect.anchor)return;var r=t==this.multiSelect.anchor?n.cursor==n.start?n.end:n.start:n.cursor;(r.row!=t.row||this.session.$clipPositionToDocument(r.row,r.column).column!=t.column)&&this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange())}},this.findAll=function(e,t,n){t=t||{},t.needle=e||t.needle;if(t.needle==undefined){var r=this.selection.isEmpty()?this.selection.getWordRange():this.selection.getRange();t.needle=this.session.getTextRange(r)}this.$search.set(t);var i=this.$search.findAll(this.session);if(!i.length)return 0;this.$blockScrolling+=1;var s=this.multiSelect;n||s.toSingleRange(i[0]);for(var o=i.length;o--;)s.addRange(i[o],!0);return r&&s.rangeList.rangeAtPoint(r.start)&&s.addRange(r,!0),this.$blockScrolling-=1,i.length},this.selectMoreLines=function(e,t){var n=this.selection.toOrientedRange(),r=n.cursor==n.end,s=this.session.documentToScreenPosition(n.cursor);this.selection.$desiredColumn&&(s.column=this.selection.$desiredColumn);var o=this.session.screenToDocumentPosition(s.row+e,s.column);if(!n.isEmpty())var u=this.session.documentToScreenPosition(r?n.end:n.start),a=this.session.screenToDocumentPosition(u.row+e,u.column);else var a=o;if(r){var f=i.fromPoints(o,a);f.cursor=f.start}else{var f=i.fromPoints(a,o);f.cursor=f.end}f.desiredColumn=s.column;if(!this.selection.inMultiSelectMode)this.selection.addRange(n);else if(t)var l=n.cursor;this.selection.addRange(f),l&&this.selection.substractPoint(l)},this.transposeSelections=function(e){var t=this.session,n=t.multiSelect,r=n.ranges;for(var i=r.length;i--;){var s=r[i];if(s.isEmpty()){var o=t.getWordRange(s.start.row,s.start.column);s.start.row=o.start.row,s.start.column=o.start.column,s.end.row=o.end.row,s.end.column=o.end.column}}n.mergeOverlappingRanges();var u=[];for(var i=r.length;i--;){var s=r[i];u.unshift(t.getTextRange(s))}e<0?u.unshift(u.pop()):u.push(u.shift());for(var i=r.length;i--;){var s=r[i],o=s.clone();t.replace(s,u[i]),s.start.row=o.start.row,s.start.column=o.start.column}},this.selectMore=function(e,t,n){var r=this.session,i=r.multiSelect,s=i.toOrientedRange();if(s.isEmpty()){s=r.getWordRange(s.start.row,s.start.column),s.cursor=e==-1?s.start:s.end,this.multiSelect.addRange(s);if(n)return}var o=r.getTextRange(s),u=h(r,o,e);u&&(u.cursor=e==-1?u.start:u.end,this.$blockScrolling+=1,this.session.unfold(u),this.multiSelect.addRange(u),this.$blockScrolling-=1,this.renderer.scrollCursorIntoView(null,.5)),t&&this.multiSelect.substractPoint(s.cursor)},this.alignCursors=function(){var e=this.session,t=e.multiSelect,n=t.ranges,r=-1,s=n.filter(function(e){if(e.cursor.row==r)return!0;r=e.cursor.row});if(!n.length||s.length==n.length-1){var o=this.selection.getRange(),u=o.start.row,f=o.end.row,l=u==f;if(l){var c=this.session.getLength(),h;do h=this.session.getLine(f);while(/[=:]/.test(h)&&++f<c);do h=this.session.getLine(u);while(/[=:]/.test(h)&&--u>0);u<0&&(u=0),f>=c&&(f=c-1)}var p=this.session.removeFullLines(u,f);p=this.$reAlignText(p,l),this.session.insert({row:u,column:0},p.join("\n")+"\n"),l||(o.start.column=0,o.end.column=p[p.length-1].length),this.selection.setRange(o)}else{s.forEach(function(e){t.substractPoint(e.cursor)});var d=0,v=Infinity,m=n.map(function(t){var n=t.cursor,r=e.getLine(n.row),i=r.substr(n.column).search(/\S/g);return i==-1&&(i=0),n.column>d&&(d=n.column),i<v&&(v=i),i});n.forEach(function(t,n){var r=t.cursor,s=d-r.column,o=m[n]-v;s>o?e.insert(r,a.stringRepeat(" ",s-o)):e.remove(new i(r.row,r.column,r.row,r.column-s+o)),t.start.column=t.end.column=d,t.start.row=t.end.row=r.row,t.cursor=t.end}),t.fromOrientedRange(n[0]),this.renderer.updateCursor(),this.renderer.updateBackMarkers()}},this.$reAlignText=function(e,t){function u(e){return a.stringRepeat(" ",e)}function f(e){return e[2]?u(i)+e[2]+u(s-e[2].length+o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}function l(e){return e[2]?u(i+s-e[2].length)+e[2]+u(o," ")+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}function c(e){return e[2]?u(i)+e[2]+u(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}var n=!0,r=!0,i,s,o;return e.map(function(e){var t=e.match(/(\s*)(.*?)(\s*)([=:].*)/);return t?i==null?(i=t[1].length,s=t[2].length,o=t[3].length,t):(i+s+o!=t[1].length+t[2].length+t[3].length&&(r=!1),i!=t[1].length&&(n=!1),i>t[1].length&&(i=t[1].length),s<t[2].length&&(s=t[2].length),o>t[3].length&&(o=t[3].length),t):[e]}).map(t?f:n?r?l:f:c)}}).call(d.prototype),t.onSessionChange=function(e){var t=e.session;t&&!t.multiSelect&&(t.$selectionMarkers=[],t.selection.$initRangeList(),t.multiSelect=t.selection),this.multiSelect=t&&t.multiSelect;var n=e.oldSession;n&&(n.multiSelect.off("addRange",this.$onAddRange),n.multiSelect.off("removeRange",this.$onRemoveRange),n.multiSelect.off("multiSelect",this.$onMultiSelect),n.multiSelect.off("singleSelect",this.$onSingleSelect),n.multiSelect.lead.off("change",this.$checkMultiselectChange),n.multiSelect.anchor.off("change",this.$checkMultiselectChange)),t&&(t.multiSelect.on("addRange",this.$onAddRange),t.multiSelect.on("removeRange",this.$onRemoveRange),t.multiSelect.on("multiSelect",this.$onMultiSelect),t.multiSelect.on("singleSelect",this.$onSingleSelect),t.multiSelect.lead.on("change",this.$checkMultiselectChange),t.multiSelect.anchor.on("change",this.$checkMultiselectChange)),t&&this.inMultiSelectMode!=t.selection.inMultiSelectMode&&(t.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},t.MultiSelect=m,e("./config").defineOptions(d.prototype,"editor",{enableMultiselect:{set:function(e){m(this),e?(this.on("changeSession",this.$multiselectOnSessionChange),this.on("mousedown",o)):(this.off("changeSession",this.$multiselectOnSessionChange),this.off("mousedown",o))},value:!0},enableBlockSelect:{set:function(e){this.$blockSelectEnabled=e},value:!0}})}),ace.define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../../range").Range,i=t.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);return this.foldingStartMarker.test(r)?"start":t=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(r)?"end":""},this.getFoldWidgetRange=function(e,t,n){return null},this.indentationBlock=function(e,t,n){var i=/\S/,s=e.getLine(t),o=s.search(i);if(o==-1)return;var u=n||s.length,a=e.getLength(),f=t,l=t;while(++t<a){var c=e.getLine(t).search(i);if(c==-1)continue;if(c<=o)break;l=t}if(l>f){var h=e.getLine(l).length;return new r(f,u,l,h)}},this.openingBracketBlock=function(e,t,n,i,s){var o={row:n,column:i+1},u=e.$findClosingBracket(t,o,s);if(!u)return;var a=e.foldWidgets[u.row];return a==null&&(a=e.getFoldWidget(u.row)),a=="start"&&u.row>o.row&&(u.row--,u.column=e.getLine(u.row).length),r.fromPoints(o,u)},this.closingBracketBlock=function(e,t,n,i,s){var o={row:n,column:i},u=e.$findOpeningBracket(t,o);if(!u)return;return u.column++,o.column--,r.fromPoints(u,o)}}).call(i.prototype)}),ace.define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";t.isDark=!1,t.cssClass="ace-tm",t.cssText='.ace-tm .ace_gutter {background: #f0f0f0;color: #333;}.ace-tm .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-tm .ace_fold {background-color: #6B72E6;}.ace-tm {background-color: #FFFFFF;color: black;}.ace-tm .ace_cursor {color: black;}.ace-tm .ace_invisible {color: rgb(191, 191, 191);}.ace-tm .ace_storage,.ace-tm .ace_keyword {color: blue;}.ace-tm .ace_constant {color: rgb(197, 6, 11);}.ace-tm .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-tm .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-tm .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-tm .ace_invalid {background-color: rgba(255, 0, 0, 0.1);color: red;}.ace-tm .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-tm .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-tm .ace_support.ace_type,.ace-tm .ace_support.ace_class {color: rgb(109, 121, 222);}.ace-tm .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-tm .ace_string {color: rgb(3, 106, 7);}.ace-tm .ace_comment {color: rgb(76, 136, 107);}.ace-tm .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-tm .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-tm .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-tm .ace_variable {color: rgb(49, 132, 149);}.ace-tm .ace_xml-pe {color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-tm .ace_heading {color: rgb(12, 7, 255);}.ace-tm .ace_list {color:rgb(185, 6, 144);}.ace-tm .ace_meta.ace_tag {color:rgb(0, 22, 142);}.ace-tm .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-tm .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-tm.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px white;}.ace-tm .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_gutter-active-line {background-color : #dcdcdc;}.ace-tm .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}';var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)}),ace.define("ace/line_widgets",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/range"],function(e,t,n){"use strict";function o(e){this.session=e,this.session.widgetManager=this,this.session.getRowLength=this.getRowLength,this.session.$getWidgetScreenLength=this.$getWidgetScreenLength,this.updateOnChange=this.updateOnChange.bind(this),this.renderWidgets=this.renderWidgets.bind(this),this.measureWidgets=this.measureWidgets.bind(this),this.session._changedWidgets=[],this.$onChangeEditor=this.$onChangeEditor.bind(this),this.session.on("change",this.updateOnChange),this.session.on("changeFold",this.updateOnFold),this.session.on("changeEditor",this.$onChangeEditor)}var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./range").Range;(function(){this.getRowLength=function(e){var t;return this.lineWidgets?t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0:t=0,!this.$useWrapMode||!this.$wrapData[e]?1+t:this.$wrapData[e].length+1+t},this.$getWidgetScreenLength=function(){var e=0;return this.lineWidgets.forEach(function(t){t&&t.rowCount&&!t.hidden&&(e+=t.rowCount)}),e},this.$onChangeEditor=function(e){this.attach(e.editor)},this.attach=function(e){e&&e.widgetManager&&e.widgetManager!=this&&e.widgetManager.detach();if(this.editor==e)return;this.detach(),this.editor=e,e&&(e.widgetManager=this,e.renderer.on("beforeRender",this.measureWidgets),e.renderer.on("afterRender",this.renderWidgets))},this.detach=function(e){var t=this.editor;if(!t)return;this.editor=null,t.widgetManager=null,t.renderer.off("beforeRender",this.measureWidgets),t.renderer.off("afterRender",this.renderWidgets);var n=this.session.lineWidgets;n&&n.forEach(function(e){e&&e.el&&e.el.parentNode&&(e._inDocument=!1,e.el.parentNode.removeChild(e.el))})},this.updateOnFold=function(e,t){var n=t.lineWidgets;if(!n||!e.action)return;var r=e.data,i=r.start.row,s=r.end.row,o=e.action=="add";for(var u=i+1;u<s;u++)n[u]&&(n[u].hidden=o);n[s]&&(o?n[i]?n[s].hidden=o:n[i]=n[s]:(n[i]==n[s]&&(n[i]=undefined),n[s].hidden=o))},this.updateOnChange=function(e){var t=this.session.lineWidgets;if(!t)return;var n=e.start.row,r=e.end.row-n;if(r!==0)if(e.action=="remove"){var i=t.splice(n+1,r);i.forEach(function(e){e&&this.removeLineWidget(e)},this),this.$updateRows()}else{var s=new Array(r);s.unshift(n,0),t.splice.apply(t,s),this.$updateRows()}},this.$updateRows=function(){var e=this.session.lineWidgets;if(!e)return;var t=!0;e.forEach(function(e,n){if(e){t=!1,e.row=n;while(e.$oldWidget)e.$oldWidget.row=n,e=e.$oldWidget}}),t&&(this.session.lineWidgets=null)},this.addLineWidget=function(e){this.session.lineWidgets||(this.session.lineWidgets=new Array(this.session.getLength()));var t=this.session.lineWidgets[e.row];t&&(e.$oldWidget=t,t.el&&t.el.parentNode&&(t.el.parentNode.removeChild(t.el),t._inDocument=!1)),this.session.lineWidgets[e.row]=e,e.session=this.session;var n=this.editor.renderer;e.html&&!e.el&&(e.el=i.createElement("div"),e.el.innerHTML=e.html),e.el&&(i.addCssClass(e.el,"ace_lineWidgetContainer"),e.el.style.position="absolute",e.el.style.zIndex=5,n.container.appendChild(e.el),e._inDocument=!0),e.coverGutter||(e.el.style.zIndex=3),e.pixelHeight==null&&(e.pixelHeight=e.el.offsetHeight),e.rowCount==null&&(e.rowCount=e.pixelHeight/n.layerConfig.lineHeight);var r=this.session.getFoldAt(e.row,0);e.$fold=r;if(r){var s=this.session.lineWidgets;e.row==r.end.row&&!s[r.start.row]?s[r.start.row]=e:e.hidden=!0}return this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows(),this.renderWidgets(null,n),this.onWidgetChanged(e),e},this.removeLineWidget=function(e){e._inDocument=!1,e.session=null,e.el&&e.el.parentNode&&e.el.parentNode.removeChild(e.el);if(e.editor&&e.editor.destroy)try{e.editor.destroy()}catch(t){}if(this.session.lineWidgets){var n=this.session.lineWidgets[e.row];if(n==e)this.session.lineWidgets[e.row]=e.$oldWidget,e.$oldWidget&&this.onWidgetChanged(e.$oldWidget);else while(n){if(n.$oldWidget==e){n.$oldWidget=e.$oldWidget;break}n=n.$oldWidget}}this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows()},this.getWidgetsAtRow=function(e){var t=this.session.lineWidgets,n=t&&t[e],r=[];while(n)r.push(n),n=n.$oldWidget;return r},this.onWidgetChanged=function(e){this.session._changedWidgets.push(e),this.editor&&this.editor.renderer.updateFull()},this.measureWidgets=function(e,t){var n=this.session._changedWidgets,r=t.layerConfig;if(!n||!n.length)return;var i=Infinity;for(var s=0;s<n.length;s++){var o=n[s];if(!o||!o.el)continue;if(o.session!=this.session)continue;if(!o._inDocument){if(this.session.lineWidgets[o.row]!=o)continue;o._inDocument=!0,t.container.appendChild(o.el)}o.h=o.el.offsetHeight,o.fixedWidth||(o.w=o.el.offsetWidth,o.screenWidth=Math.ceil(o.w/r.characterWidth));var u=o.h/r.lineHeight;o.coverLine&&(u-=this.session.getRowLineCount(o.row),u<0&&(u=0)),o.rowCount!=u&&(o.rowCount=u,o.row<i&&(i=o.row))}i!=Infinity&&(this.session._emit("changeFold",{data:{start:{row:i}}}),this.session.lineWidgetWidth=null),this.session._changedWidgets=[]},this.renderWidgets=function(e,t){var n=t.layerConfig,r=this.session.lineWidgets;if(!r)return;var i=Math.min(this.firstRow,n.firstRow),s=Math.max(this.lastRow,n.lastRow,r.length);while(i>0&&!r[i])i--;this.firstRow=n.firstRow,this.lastRow=n.lastRow,t.$cursorLayer.config=n;for(var o=i;o<=s;o++){var u=r[o];if(!u||!u.el)continue;if(u.hidden){u.el.style.top=-100-(u.pixelHeight||0)+"px";continue}u._inDocument||(u._inDocument=!0,t.container.appendChild(u.el));var a=t.$cursorLayer.getPixelPosition({row:o,column:0},!0).top;u.coverLine||(a+=n.lineHeight*this.session.getRowLineCount(u.row)),u.el.style.top=a-n.offset+"px";var f=u.coverGutter?0:t.gutterWidth;u.fixedWidth||(f-=t.scrollLeft),u.el.style.left=f+"px",u.fullWidth&&u.screenWidth&&(u.el.style.minWidth=n.width+2*n.padding+"px"),u.fixedWidth?u.el.style.right=t.scrollBar.getWidth()+"px":u.el.style.right=""}}}).call(o.prototype),t.LineWidgets=o}),ace.define("ace/ext/error_marker",["require","exports","module","ace/line_widgets","ace/lib/dom","ace/range"],function(e,t,n){"use strict";function o(e,t,n){var r=0,i=e.length-1;while(r<=i){var s=r+i>>1,o=n(t,e[s]);if(o>0)r=s+1;else{if(!(o<0))return s;i=s-1}}return-(r+1)}function u(e,t,n){var r=e.getAnnotations().sort(s.comparePoints);if(!r.length)return;var i=o(r,{row:t,column:-1},s.comparePoints);i<0&&(i=-i-1),i>=r.length?i=n>0?0:r.length-1:i===0&&n<0&&(i=r.length-1);var u=r[i];if(!u||!n)return;if(u.row===t){do u=r[i+=n];while(u&&u.row===t);if(!u)return r.slice()}var a=[];t=u.row;do a[n<0?"unshift":"push"](u),u=r[i+=n];while(u&&u.row==t);return a.length&&a}var r=e("../line_widgets").LineWidgets,i=e("../lib/dom"),s=e("../range").Range;t.showErrorMarker=function(e,t){var n=e.session;n.widgetManager||(n.widgetManager=new r(n),n.widgetManager.attach(e));var s=e.getCursorPosition(),o=s.row,a=n.widgetManager.getWidgetsAtRow(o).filter(function(e){return e.type=="errorMarker"})[0];a?a.destroy():o-=t;var f=u(n,o,t),l;if(f){var c=f[0];s.column=(c.pos&&typeof c.column!="number"?c.pos.sc:c.column)||0,s.row=c.row,l=e.renderer.$gutterLayer.$annotations[s.row]}else{if(a)return;l={text:["Looks good!"],className:"ace_ok"}}e.session.unfold(s.row),e.selection.moveToPosition(s);var h={row:s.row,fixedWidth:!0,coverGutter:!0,el:i.createElement("div"),type:"errorMarker"},p=h.el.appendChild(i.createElement("div")),d=h.el.appendChild(i.createElement("div"));d.className="error_widget_arrow "+l.className;var v=e.renderer.$cursorLayer.getPixelPosition(s).left;d.style.left=v+e.renderer.gutterWidth-5+"px",h.el.className="error_widget_wrapper",p.className="error_widget "+l.className,p.innerHTML=l.text.join("<br>"),p.appendChild(i.createElement("div"));var m=function(e,t,n){if(t===0&&(n==="esc"||n==="return"))return h.destroy(),{command:"null"}};h.destroy=function(){if(e.$mouseHandler.isMousePressed)return;e.keyBinding.removeKeyboardHandler(m),n.widgetManager.removeLineWidget(h),e.off("changeSelection",h.destroy),e.off("changeSession",h.destroy),e.off("mouseup",h.destroy),e.off("change",h.destroy)},e.keyBinding.addKeyboardHandler(m),e.on("changeSelection",h.destroy),e.on("changeSession",h.destroy),e.on("mouseup",h.destroy),e.on("change",h.destroy),e.session.widgetManager.addLineWidget(h),h.el.onmousedown=e.focus.bind(e),e.renderer.scrollCursorIntoView(null,.5,{bottom:h.el.offsetHeight})},i.importCssString("    .error_widget_wrapper {        background: inherit;        color: inherit;        border:none    }    .error_widget {        border-top: solid 2px;        border-bottom: solid 2px;        margin: 5px 0;        padding: 10px 40px;        white-space: pre-wrap;    }    .error_widget.ace_error, .error_widget_arrow.ace_error{        border-color: #ff5a5a    }    .error_widget.ace_warning, .error_widget_arrow.ace_warning{        border-color: #F1D817    }    .error_widget.ace_info, .error_widget_arrow.ace_info{        border-color: #5a5a5a    }    .error_widget.ace_ok, .error_widget_arrow.ace_ok{        border-color: #5aaa5a    }    .error_widget_arrow {        position: absolute;        border: solid 5px;        border-top-color: transparent!important;        border-right-color: transparent!important;        border-left-color: transparent!important;        top: -5px;    }","")}),ace.define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"],function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var r=e("./lib/dom"),i=e("./lib/event"),s=e("./editor").Editor,o=e("./edit_session").EditSession,u=e("./undomanager").UndoManager,a=e("./virtual_renderer").VirtualRenderer;e("./worker/worker_client"),e("./keyboard/hash_handler"),e("./placeholder"),e("./multi_select"),e("./mode/folding/fold_mode"),e("./theme/textmate"),e("./ext/error_marker"),t.config=e("./config"),t.require=e,typeof define=="function"&&(t.define=define),t.edit=function(e){if(typeof e=="string"){var n=e;e=document.getElementById(n);if(!e)throw new Error("ace.edit can't find div #"+n)}if(e&&e.env&&e.env.editor instanceof s)return e.env.editor;var o="";if(e&&/input|textarea/i.test(e.tagName)){var u=e;o=u.value,e=r.createElement("pre"),u.parentNode.replaceChild(e,u)}else e&&(o=r.getInnerText(e),e.innerHTML="");var f=t.createEditSession(o),l=new s(new a(e));l.setSession(f);var c={document:f,editor:l,onResize:l.resize.bind(l,null)};return u&&(c.textarea=u),i.addListener(window,"resize",c.onResize),l.on("destroy",function(){i.removeListener(window,"resize",c.onResize),c.editor.container.env=null}),l.container.env=l.env=c,l},t.createEditSession=function(e,t){var n=new o(e,t);return n.setUndoManager(new u),n},t.EditSession=o,t.UndoManager=u,t.version="1.2.8"});
-(function() {
-    ace.require(["ace/ace"], function(a) {
-        if (a) {
-            a.config.init(true);
-            a.define = ace.define;
-        }
-        if (!window.ace)
-            window.ace = a;
-        for (var key in a) if (a.hasOwnProperty(key))
-            window.ace[key] = a[key];
-    });
-})();
+(function(){function o(n){var i=e;n&&(e[n]||(e[n]={}),i=e[n]);if(!i.define||!i.define.packaged)t.original=i.define,i.define=t,i.define.packaged=!0;if(!i.require||!i.require.packaged)r.original=i.require,i.require=r,i.require.packaged=!0}var ACE_NAMESPACE = "ace",e=function(){return this}();!e&&typeof window!="undefined"&&(e=window);if(!ACE_NAMESPACE&&typeof requirejs!="undefined")return;var t=function(e,n,r){if(typeof e!="string"){t.original?t.original.apply(this,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(r=n),t.modules[e]||(t.payloads[e]=r,t.modules[e]=null)};t.modules={},t.payloads={};var n=function(e,t,n){if(typeof t=="string"){var i=s(e,t);if(i!=undefined)return n&&n(),i}else if(Object.prototype.toString.call(t)==="[object Array]"){var o=[];for(var u=0,a=t.length;u<a;++u){var f=s(e,t[u]);if(f==undefined&&r.original)return;o.push(f)}return n&&n.apply(null,o)||!0}},r=function(e,t){var i=n("",e,t);return i==undefined&&r.original?r.original.apply(this,arguments):i},i=function(e,t){if(t.indexOf("!")!==-1){var n=t.split("!");return i(e,n[0])+"!"+i(e,n[1])}if(t.charAt(0)=="."){var r=e.split("/").slice(0,-1).join("/");t=r+"/"+t;while(t.indexOf(".")!==-1&&s!=t){var s=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return t},s=function(e,r){r=i(e,r);var s=t.modules[r];if(!s){s=t.payloads[r];if(typeof s=="function"){var o={},u={id:r,uri:"",exports:o,packaged:!0},a=function(e,t){return n(r,e,t)},f=s(a,o,u);o=f||u.exports,t.modules[r]=o,delete t.payloads[r]}s=t.modules[r]=o||s}return s};o(ACE_NAMESPACE)})(),ace.define("ace/lib/regexp",["require","exports","module"],function(e,t,n){"use strict";function o(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function u(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1}var r={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},i=r.exec.call(/()??/,"")[1]===undefined,s=function(){var e=/^/g;return r.test.call(e,""),!e.lastIndex}();if(s&&i)return;RegExp.prototype.exec=function(e){var t=r.exec.apply(this,arguments),n,a;if(typeof e=="string"&&t){!i&&t.length>1&&u(t,"")>-1&&(a=RegExp(this.source,r.replace.call(o(this),"g","")),r.replace.call(e.slice(t.index),a,function(){for(var e=1;e<arguments.length-2;e++)arguments[e]===undefined&&(t[e]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var f=1;f<t.length;f++)n=this._xregexp.captureNames[f-1],n&&(t[n]=t[f]);!s&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--}return t},s||(RegExp.prototype.test=function(e){var t=r.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t})}),ace.define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _="	\n\f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}}),ace.define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(e,t,n){"use strict";e("./regexp"),e("./es5-shim")}),ace.define("ace/lib/dom",["require","exports","module"],function(e,t,n){"use strict";var r="http://www.w3.org/1999/xhtml";t.getDocumentHead=function(e){return e||(e=document),e.head||e.getElementsByTagName("head")[0]||e.documentElement},t.createElement=function(e,t){return document.createElementNS?document.createElementNS(t||r,e):document.createElement(e)},t.hasCssClass=function(e,t){var n=(e.className+"").split(/\s+/g);return n.indexOf(t)!==-1},t.addCssClass=function(e,n){t.hasCssClass(e,n)||(e.className+=" "+n)},t.removeCssClass=function(e,t){var n=e.className.split(/\s+/g);for(;;){var r=n.indexOf(t);if(r==-1)break;n.splice(r,1)}e.className=n.join(" ")},t.toggleCssClass=function(e,t){var n=e.className.split(/\s+/g),r=!0;for(;;){var i=n.indexOf(t);if(i==-1)break;r=!1,n.splice(i,1)}return r&&n.push(t),e.className=n.join(" "),r},t.setCssClass=function(e,n,r){r?t.addCssClass(e,n):t.removeCssClass(e,n)},t.hasCssString=function(e,t){var n=0,r;t=t||document;if(t.createStyleSheet&&(r=t.styleSheets)){while(n<r.length)if(r[n++].owningElement.id===e)return!0}else if(r=t.getElementsByTagName("style"))while(n<r.length)if(r[n++].id===e)return!0;return!1},t.importCssString=function(n,r,i){i=i||document;if(r&&t.hasCssString(r,i))return null;var s;r&&(n+="\n/*# sourceURL=ace/css/"+r+" */"),i.createStyleSheet?(s=i.createStyleSheet(),s.cssText=n,r&&(s.owningElement.id=r)):(s=t.createElement("style"),s.appendChild(i.createTextNode(n)),r&&(s.id=r),t.getDocumentHead(i).appendChild(s))},t.importCssStylsheet=function(e,n){if(n.createStyleSheet)n.createStyleSheet(e);else{var r=t.createElement("link");r.rel="stylesheet",r.href=e,t.getDocumentHead(n).appendChild(r)}},t.getInnerWidth=function(e){return parseInt(t.computedStyle(e,"paddingLeft"),10)+parseInt(t.computedStyle(e,"paddingRight"),10)+e.clientWidth},t.getInnerHeight=function(e){return parseInt(t.computedStyle(e,"paddingTop"),10)+parseInt(t.computedStyle(e,"paddingBottom"),10)+e.clientHeight},t.scrollbarWidth=function(e){var n=t.createElement("ace_inner");n.style.width="100%",n.style.minWidth="0px",n.style.height="200px",n.style.display="block";var r=t.createElement("ace_outer"),i=r.style;i.position="absolute",i.left="-10000px",i.overflow="hidden",i.width="200px",i.minWidth="0px",i.height="150px",i.display="block",r.appendChild(n);var s=e.documentElement;s.appendChild(r);var o=n.offsetWidth;i.overflow="scroll";var u=n.offsetWidth;return o==u&&(u=r.clientWidth),s.removeChild(r),o-u};if(typeof document=="undefined"){t.importCssString=function(){};return}window.pageYOffset!==undefined?(t.getPageScrollTop=function(){return window.pageYOffset},t.getPageScrollLeft=function(){return window.pageXOffset}):(t.getPageScrollTop=function(){return document.body.scrollTop},t.getPageScrollLeft=function(){return document.body.scrollLeft}),window.getComputedStyle?t.computedStyle=function(e,t){return t?(window.getComputedStyle(e,"")||{})[t]||"":window.getComputedStyle(e,"")||{}}:t.computedStyle=function(e,t){return t?e.currentStyle[t]:e.currentStyle},t.setInnerHtml=function(e,t){var n=e.cloneNode(!1);return n.innerHTML=t,e.parentNode.replaceChild(n,e),n},"textContent"in document.documentElement?(t.setInnerText=function(e,t){e.textContent=t},t.getInnerText=function(e){return e.textContent}):(t.setInnerText=function(e,t){e.innerText=t},t.getInnerText=function(e){return e.innerText}),t.getParentWindow=function(e){return e.defaultView||e.parentWindow}}),ace.define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),ace.define("ace/lib/keys",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop"],function(e,t,n){"use strict";e("./fixoldbrowsers");var r=e("./oop"),i=function(){var e={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,"super":8,meta:8,command:8,cmd:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9","-13":"NumpadEnter",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",111:"/",106:"*"}},t,n;for(n in e.FUNCTION_KEYS)t=e.FUNCTION_KEYS[n].toLowerCase(),e[t]=parseInt(n,10);for(n in e.PRINTABLE_KEYS)t=e.PRINTABLE_KEYS[n].toLowerCase(),e[t]=parseInt(n,10);return r.mixin(e,e.MODIFIER_KEYS),r.mixin(e,e.PRINTABLE_KEYS),r.mixin(e,e.FUNCTION_KEYS),e.enter=e["return"],e.escape=e.esc,e.del=e["delete"],e[173]="-",function(){var t=["cmd","ctrl","alt","shift"];for(var n=Math.pow(2,t.length);n--;)e.KEY_MODS[n]=t.filter(function(t){return n&e.KEY_MODS[t]}).join("-")+"-"}(),e.KEY_MODS[0]="",e.KEY_MODS[-1]="input-",e}();r.mixin(t,i),t.keyCodeToString=function(e){var t=i[e];return typeof t!="string"&&(t=String.fromCharCode(e)),t.toLowerCase()}}),ace.define("ace/lib/useragent",["require","exports","module"],function(e,t,n){"use strict";t.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},t.getOS=function(){return t.isMac?t.OS.MAC:t.isLinux?t.OS.LINUX:t.OS.WINDOWS};if(typeof navigator!="object")return;var r=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),i=navigator.userAgent;t.isWin=r=="win",t.isMac=r=="mac",t.isLinux=r=="linux",t.isIE=navigator.appName=="Microsoft Internet Explorer"||navigator.appName.indexOf("MSAppHost")>=0?parseFloat((i.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]):parseFloat((i.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]),t.isOldIE=t.isIE&&t.isIE<9,t.isGecko=t.isMozilla=(window.Controllers||window.controllers)&&window.navigator.product==="Gecko",t.isOldGecko=t.isGecko&&parseInt((i.match(/rv:(\d+)/)||[])[1],10)<4,t.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",t.isWebKit=parseFloat(i.split("WebKit/")[1])||undefined,t.isChrome=parseFloat(i.split(" Chrome/")[1])||undefined,t.isAIR=i.indexOf("AdobeAIR")>=0,t.isIPad=i.indexOf("iPad")>=0,t.isChromeOS=i.indexOf(" CrOS ")>=0,t.isIOS=/iPad|iPhone|iPod/.test(i)&&!window.MSStream,t.isIOS&&(t.isMac=!0)}),ace.define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent"],function(e,t,n){"use strict";function a(e,t,n){var a=u(t);if(!i.isMac&&s){t.getModifierState&&(t.getModifierState("OS")||t.getModifierState("Win"))&&(a|=8);if(s.altGr){if((3&a)==3)return;s.altGr=0}if(n===18||n===17){var f="location"in t?t.location:t.keyLocation;if(n===17&&f===1)s[n]==1&&(o=t.timeStamp);else if(n===18&&a===3&&f===2){var l=t.timeStamp-o;l<50&&(s.altGr=!0)}}}n in r.MODIFIER_KEYS&&(n=-1),a&8&&n>=91&&n<=93&&(n=-1);if(!a&&n===13){var f="location"in t?t.location:t.keyLocation;if(f===3){e(t,a,-n);if(t.defaultPrevented)return}}if(i.isChromeOS&&a&8){e(t,a,n);if(t.defaultPrevented)return;a&=-9}return!!a||n in r.FUNCTION_KEYS||n in r.PRINTABLE_KEYS?e(t,a,n):!1}function f(){s=Object.create(null)}var r=e("./keys"),i=e("./useragent"),s=null,o=0;t.addListener=function(e,t,n){if(e.addEventListener)return e.addEventListener(t,n,!1);if(e.attachEvent){var r=function(){n.call(e,window.event)};n._wrapper=r,e.attachEvent("on"+t,r)}},t.removeListener=function(e,t,n){if(e.removeEventListener)return e.removeEventListener(t,n,!1);e.detachEvent&&e.detachEvent("on"+t,n._wrapper||n)},t.stopEvent=function(e){return t.stopPropagation(e),t.preventDefault(e),!1},t.stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},t.preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},t.getButton=function(e){return e.type=="dblclick"?0:e.type=="contextmenu"||i.isMac&&e.ctrlKey&&!e.altKey&&!e.shiftKey?2:e.preventDefault?e.button:{1:0,2:2,4:1}[e.button]},t.capture=function(e,n,r){function i(e){n&&n(e),r&&r(e),t.removeListener(document,"mousemove",n,!0),t.removeListener(document,"mouseup",i,!0),t.removeListener(document,"dragstart",i,!0)}return t.addListener(document,"mousemove",n,!0),t.addListener(document,"mouseup",i,!0),t.addListener(document,"dragstart",i,!0),i},t.addTouchMoveListener=function(e,n){if("ontouchmove"in e){var r,i;t.addListener(e,"touchstart",function(e){var t=e.changedTouches[0];r=t.clientX,i=t.clientY}),t.addListener(e,"touchmove",function(e){var t=1,s=e.changedTouches[0];e.wheelX=-(s.clientX-r)/t,e.wheelY=-(s.clientY-i)/t,r=s.clientX,i=s.clientY,n(e)})}},t.addMouseWheelListener=function(e,n){"onmousewheel"in e?t.addListener(e,"mousewheel",function(e){var t=8;e.wheelDeltaX!==undefined?(e.wheelX=-e.wheelDeltaX/t,e.wheelY=-e.wheelDeltaY/t):(e.wheelX=0,e.wheelY=-e.wheelDelta/t),n(e)}):"onwheel"in e?t.addListener(e,"wheel",function(e){var t=.35;switch(e.deltaMode){case e.DOM_DELTA_PIXEL:e.wheelX=e.deltaX*t||0,e.wheelY=e.deltaY*t||0;break;case e.DOM_DELTA_LINE:case e.DOM_DELTA_PAGE:e.wheelX=(e.deltaX||0)*5,e.wheelY=(e.deltaY||0)*5}n(e)}):t.addListener(e,"DOMMouseScroll",function(e){e.axis&&e.axis==e.HORIZONTAL_AXIS?(e.wheelX=(e.detail||0)*5,e.wheelY=0):(e.wheelX=0,e.wheelY=(e.detail||0)*5),n(e)})},t.addMultiMouseDownListener=function(e,n,r,s){function c(e){t.getButton(e)!==0?o=0:e.detail>1?(o++,o>4&&(o=1)):o=1;if(i.isIE){var c=Math.abs(e.clientX-u)>5||Math.abs(e.clientY-a)>5;if(!f||c)o=1;f&&clearTimeout(f),f=setTimeout(function(){f=null},n[o-1]||600),o==1&&(u=e.clientX,a=e.clientY)}e._clicks=o,r[s]("mousedown",e);if(o>4)o=0;else if(o>1)return r[s](l[o],e)}function h(e){o=2,f&&clearTimeout(f),f=setTimeout(function(){f=null},n[o-1]||600),r[s]("mousedown",e),r[s](l[o],e)}var o=0,u,a,f,l={2:"dblclick",3:"tripleclick",4:"quadclick"};Array.isArray(e)||(e=[e]),e.forEach(function(e){t.addListener(e,"mousedown",c),i.isOldIE&&t.addListener(e,"dblclick",h)})};var u=!i.isMac||!i.isOpera||"KeyboardEvent"in window?function(e){return 0|(e.ctrlKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.metaKey?8:0)}:function(e){return 0|(e.metaKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.ctrlKey?8:0)};t.getModifierString=function(e){return r.KEY_MODS[u(e)]},t.addCommandKeyListener=function(e,n){var r=t.addListener;if(i.isOldGecko||i.isOpera&&!("KeyboardEvent"in window)){var o=null;r(e,"keydown",function(e){o=e.keyCode}),r(e,"keypress",function(e){return a(n,e,o)})}else{var u=null;r(e,"keydown",function(e){s[e.keyCode]=(s[e.keyCode]||0)+1;var t=a(n,e,e.keyCode);return u=e.defaultPrevented,t}),r(e,"keypress",function(e){u&&(e.ctrlKey||e.altKey||e.shiftKey||e.metaKey)&&(t.stopEvent(e),u=null)}),r(e,"keyup",function(e){s[e.keyCode]=null}),s||(f(),r(window,"focus",f))}};if(typeof window=="object"&&window.postMessage&&!i.isOldIE){var l=1;t.nextTick=function(e,n){n=n||window;var r="zero-timeout-message-"+l;t.addListener(n,"message",function i(s){s.data==r&&(t.stopPropagation(s),t.removeListener(n,"message",i),e())}),n.postMessage(r,"*")}}t.nextFrame=typeof window=="object"&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame),t.nextFrame?t.nextFrame=t.nextFrame.bind(window):t.nextFrame=function(e){setTimeout(e,17)}}),ace.define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return e.replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),ace.define("ace/keyboard/textinput_ios",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),u=e("../lib/keys"),a=u.KEY_MODS,f=i.isChrome<18,l=i.isIE,c=function(e,t){function x(e){if(m)return;m=!0;if(k)t=0,n=e?0:c.value.length-1;else var t=4,n=5;try{c.setSelectionRange(t,n)}catch(r){}m=!1}function T(){if(m)return;c.value=h,i.isWebKit&&S.schedule()}function R(){clearTimeout(q),q=setTimeout(function(){g&&(c.style.cssText=g,g=""),t.renderer.$keepTextAreaAtCursor==null&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())},0)}var n=this,c=s.createElement("textarea");c.className=i.isIOS?"ace_text-input ace_text-input-ios":"ace_text-input",i.isTouchPad&&c.setAttribute("x-palm-disable-auto-cap",!0),c.setAttribute("wrap","off"),c.setAttribute("autocorrect","off"),c.setAttribute("autocapitalize","off"),c.setAttribute("spellcheck",!1),c.style.opacity="0",e.insertBefore(c,e.firstChild);var h="\n aaaa a\n",p=!1,d=!1,v=!1,m=!1,g="",y=!0;try{var b=document.activeElement===c}catch(w){}r.addListener(c,"blur",function(e){t.onBlur(e),b=!1}),r.addListener(c,"focus",function(e){b=!0,t.onFocus(e),x()}),this.focus=function(){if(g)return c.focus();c.style.position="fixed",c.focus()},this.blur=function(){c.blur()},this.isFocused=function(){return b};var E=o.delayedCall(function(){b&&x(y)}),S=o.delayedCall(function(){m||(c.value=h,b&&x())});i.isWebKit||t.addEventListener("changeSelection",function(){t.selection.isEmpty()!=y&&(y=!y,E.schedule())}),T(),b&&t.onFocus();var N=function(e){return e.selectionStart===0&&e.selectionEnd===e.value.length},C=function(e){N(c)?(t.selectAll(),x()):k&&x(t.selection.isEmpty())},k=null;this.setInputHandler=function(e){k=e},this.getInputHandler=function(){return k};var L=!1,A=function(e){if(c.selectionStart===4&&c.selectionEnd===5)return;k&&(e=k(e),k=null),v?(x(),e&&t.onPaste(e),v=!1):e==h.substr(0)&&c.selectionStart===4?L?t.execCommand("del",{source:"ace"}):t.execCommand("backspace",{source:"ace"}):p||(e.substring(0,9)==h&&e.length>h.length?e=e.substr(9):e.substr(0,4)==h.substr(0,4)?e=e.substr(4,e.length-h.length+1):e.charAt(e.length-1)==h.charAt(0)&&(e=e.slice(0,-1)),e!=h.charAt(0)&&e.charAt(e.length-1)==h.charAt(0)&&(e=e.slice(0,-1)),e&&t.onTextInput(e)),p&&(p=!1),L&&(L=!1)},O=function(e){if(m)return;var t=c.value;A(t),T()},M=function(e,t,n){var r=e.clipboardData||window.clipboardData;if(!r||f)return;var i=l||n?"Text":"text/plain";try{return t?r.setData(i,t)!==!1:r.getData(i)}catch(e){if(!n)return M(e,t,!0)}},_=function(e,n){var s=t.getCopyText();if(!s)return r.preventDefault(e);M(e,s)?(i.isIOS&&(d=n,c.value="\n aa"+s+"a a\n",c.setSelectionRange(4,4+s.length),p={value:s}),n?t.onCut():t.onCopy(),i.isIOS||r.preventDefault(e)):(p=!0,c.value=s,c.select(),setTimeout(function(){p=!1,T(),x(),n?t.onCut():t.onCopy()}))},D=function(e){_(e,!0)},P=function(e){_(e,!1)},H=function(e){var n=M(e);typeof n=="string"?(n&&t.onPaste(n,e),i.isIE&&setTimeout(x),r.preventDefault(e)):(c.value="",v=!0)};r.addCommandKeyListener(c,t.onCommandKey.bind(t)),r.addListener(c,"select",C),r.addListener(c,"input",O),r.addListener(c,"cut",D),r.addListener(c,"copy",P),r.addListener(c,"paste",H);var B=function(e){if(m||!t.onCompositionStart||t.$readOnly)return;m={},m.canUndo=t.session.$undoManager,t.onCompositionStart(),setTimeout(j,0),t.on("mousedown",F),m.canUndo&&!t.selection.isEmpty()&&(t.insert(""),t.session.markUndoGroup(),t.selection.clearSelection()),t.session.markUndoGroup()},j=function(){if(!m||!t.onCompositionUpdate||t.$readOnly)return;var e=c.value.replace(/\x01/g,"");if(m.lastValue===e)return;t.onCompositionUpdate(e),m.lastValue&&t.undo(),m.canUndo&&(m.lastValue=e);if(m.lastValue){var n=t.selection.getRange();t.insert(m.lastValue),t.session.markUndoGroup(),m.range=t.selection.getRange(),t.selection.setRange(n),t.selection.clearSelection()}},F=function(e){if(!t.onCompositionEnd||t.$readOnly)return;var n=m;m=!1;var r=setTimeout(function(){r=null;var e=c.value.replace(/\x01/g,"");if(m)return;e==n.lastValue?T():!n.lastValue&&e&&(T(),A(e))});k=function(i){return r&&clearTimeout(r),i=i.replace(/\x01/g,""),i==n.lastValue?"":(n.lastValue&&r&&t.undo(),i)},t.onCompositionEnd(),t.removeListener("mousedown",F),e.type=="compositionend"&&n.range&&t.selection.setRange(n.range);var s=!!i.isChrome&&i.isChrome>=53||!!i.isWebKit&&i.isWebKit>=603;s&&O()},I=o.delayedCall(j,50);r.addListener(c,"compositionstart",B),i.isGecko?r.addListener(c,"text",function(){I.schedule()}):(r.addListener(c,"keyup",function(){I.schedule()}),r.addListener(c,"keydown",function(){I.schedule()})),r.addListener(c,"compositionend",F),this.getElement=function(){return c},this.setReadOnly=function(e){c.readOnly=e},this.onContextMenu=function(e){L=!0,x(t.selection.isEmpty()),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,n){g||(g=c.style.cssText),c.style.cssText=(n?"z-index:100000;":"")+"height:"+c.style.height+";"+(i.isIE?"opacity:0.1;":"");var o=t.container.getBoundingClientRect(),u=s.computedStyle(t.container),a=o.top+(parseInt(u.borderTopWidth)||0),f=o.left+(parseInt(o.borderLeftWidth)||0),l=o.bottom-a-c.clientHeight-2,h=function(e){c.style.left=e.clientX-f-2+"px",c.style.top=Math.min(e.clientY-a-2,l)+"px"};h(e);if(e.type!="mousedown")return;t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout(q),i.isWin&&r.capture(t.container,h,R)},this.onContextMenuClose=R;var q,U=function(e){t.textInput.onContextMenu(e),R()};r.addListener(c,"mouseup",U),r.addListener(c,"mousedown",function(e){e.preventDefault(),R()}),r.addListener(t.renderer.scroller,"contextmenu",U),r.addListener(c,"contextmenu",U);if(i.isIOS){var z=null,W=!1;e.addEventListener("keydown",function(e){z&&clearTimeout(z),W=!0}),e.addEventListener("keyup",function(e){z=setTimeout(function(){W=!1},100)});var X=function(e){if(document.activeElement!==c)return;if(W)return;if(d)return setTimeout(function(){d=!1},100);var n=c.selectionStart,r=c.selectionEnd;c.setSelectionRange(4,5);if(n==r)switch(n){case 0:t.onCommandKey(null,0,u.up);break;case 1:t.onCommandKey(null,0,u.home);break;case 2:t.onCommandKey(null,a.option,u.left);break;case 4:t.onCommandKey(null,0,u.left);break;case 5:t.onCommandKey(null,0,u.right);break;case 7:t.onCommandKey(null,a.option,u.right);break;case 8:t.onCommandKey(null,0,u.end);break;case 9:t.onCommandKey(null,0,u.down)}else{switch(r){case 6:t.onCommandKey(null,a.shift,u.right);break;case 7:t.onCommandKey(null,a.shift|a.option,u.right);break;case 8:t.onCommandKey(null,a.shift,u.end);break;case 9:t.onCommandKey(null,a.shift,u.down)}switch(n){case 0:t.onCommandKey(null,a.shift,u.up);break;case 1:t.onCommandKey(null,a.shift,u.home);break;case 2:t.onCommandKey(null,a.shift|a.option,u.left);break;case 3:t.onCommandKey(null,a.shift,u.left)}}};document.addEventListener("selectionchange",X),t.on("destroy",function(){document.removeEventListener("selectionchange",X)})}};t.TextInput=c}),ace.define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/keyboard/textinput_ios"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),u=i.isChrome<18,a=i.isIE,f=e("./textinput_ios").TextInput,l=function(e,t){function w(e){if(p)return;p=!0;if(T)t=0,r=e?0:n.value.length-1;else var t=e?2:1,r=2;try{n.setSelectionRange(t,r)}catch(i){}p=!1}function E(){if(p)return;n.value=l,i.isWebKit&&b.schedule()}function F(){clearTimeout(j),j=setTimeout(function(){d&&(n.style.cssText=d,d=""),t.renderer.$keepTextAreaAtCursor==null&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())},0)}if(i.isIOS)return f.call(this,e,t);var n=s.createElement("textarea");n.className="ace_text-input",n.setAttribute("wrap","off"),n.setAttribute("autocorrect","off"),n.setAttribute("autocapitalize","off"),n.setAttribute("spellcheck",!1),n.style.opacity="0",e.insertBefore(n,e.firstChild);var l="\u2028\u2028",c=!1,h=!1,p=!1,d="",v=!0;try{var m=document.activeElement===n}catch(g){}r.addListener(n,"blur",function(e){t.onBlur(e),m=!1}),r.addListener(n,"focus",function(e){m=!0,t.onFocus(e),w()}),this.focus=function(){if(d)return n.focus();var e=n.style.top;n.style.position="fixed",n.style.top="0px",n.focus(),setTimeout(function(){n.style.position="",n.style.top=="0px"&&(n.style.top=e)},0)},this.blur=function(){n.blur()},this.isFocused=function(){return m};var y=o.delayedCall(function(){m&&w(v)}),b=o.delayedCall(function(){p||(n.value=l,m&&w())});i.isWebKit||t.addEventListener("changeSelection",function(){t.selection.isEmpty()!=v&&(v=!v,y.schedule())}),E(),m&&t.onFocus();var S=function(e){return e.selectionStart===0&&e.selectionEnd===e.value.length},x=function(e){c?c=!1:S(n)?(t.selectAll(),w()):T&&w(t.selection.isEmpty())},T=null;this.setInputHandler=function(e){T=e},this.getInputHandler=function(){return T};var N=!1,C=function(e){T&&(e=T(e),T=null),h?(w(),e&&t.onPaste(e),h=!1):e==l.charAt(0)?N?t.execCommand("del",{source:"ace"}):t.execCommand("backspace",{source:"ace"}):(e.substring(0,2)==l?e=e.substr(2):e.charAt(0)==l.charAt(0)?e=e.substr(1):e.charAt(e.length-1)==l.charAt(0)&&(e=e.slice(0,-1)),e.charAt(e.length-1)==l.charAt(0)&&(e=e.slice(0,-1)),e&&t.onTextInput(e)),N&&(N=!1)},k=function(e){if(p)return;var t=n.value;C(t),E()},L=function(e,t,n){var r=e.clipboardData||window.clipboardData;if(!r||u)return;var i=a||n?"Text":"text/plain";try{return t?r.setData(i,t)!==!1:r.getData(i)}catch(e){if(!n)return L(e,t,!0)}},A=function(e,i){var s=t.getCopyText();if(!s)return r.preventDefault(e);L(e,s)?(i?t.onCut():t.onCopy(),r.preventDefault(e)):(c=!0,n.value=s,n.select(),setTimeout(function(){c=!1,E(),w(),i?t.onCut():t.onCopy()}))},O=function(e){A(e,!0)},M=function(e){A(e,!1)},_=function(e){var s=L(e);typeof s=="string"?(s&&t.onPaste(s,e),i.isIE&&setTimeout(w),r.preventDefault(e)):(n.value="",h=!0)};r.addCommandKeyListener(n,t.onCommandKey.bind(t)),r.addListener(n,"select",x),r.addListener(n,"input",k),r.addListener(n,"cut",O),r.addListener(n,"copy",M),r.addListener(n,"paste",_),(!("oncut"in n)||!("oncopy"in n)||!("onpaste"in n))&&r.addListener(e,"keydown",function(e){if(i.isMac&&!e.metaKey||!e.ctrlKey)return;switch(e.keyCode){case 67:M(e);break;case 86:_(e);break;case 88:O(e)}});var D=function(e){if(p||!t.onCompositionStart||t.$readOnly)return;p={},p.canUndo=t.session.$undoManager,t.onCompositionStart(),setTimeout(P,0),t.on("mousedown",H),p.canUndo&&!t.selection.isEmpty()&&(t.insert(""),t.session.markUndoGroup(),t.selection.clearSelection()),t.session.markUndoGroup()},P=function(){if(!p||!t.onCompositionUpdate||t.$readOnly)return;var e=n.value.replace(/\u2028/g,"");if(p.lastValue===e)return;t.onCompositionUpdate(e),p.lastValue&&t.undo(),p.canUndo&&(p.lastValue=e);if(p.lastValue){var r=t.selection.getRange();t.insert(p.lastValue),t.session.markUndoGroup(),p.range=t.selection.getRange(),t.selection.setRange(r),t.selection.clearSelection()}},H=function(e){if(!t.onCompositionEnd||t.$readOnly)return;var r=p;p=!1;var s=setTimeout(function(){s=null;var e=n.value.replace(/\u2028/g,"");if(p)return;e==r.lastValue?E():!r.lastValue&&e&&(E(),C(e))});T=function(n){return s&&clearTimeout(s),n=n.replace(/\u2028/g,""),n==r.lastValue?"":(r.lastValue&&s&&t.undo(),n)},t.onCompositionEnd(),t.removeListener("mousedown",H),e.type=="compositionend"&&r.range&&t.selection.setRange(r.range);var o=!!i.isChrome&&i.isChrome>=53||!!i.isWebKit&&i.isWebKit>=603;o&&k()},B=o.delayedCall(P,50);r.addListener(n,"compositionstart",D),i.isGecko?r.addListener(n,"text",function(){B.schedule()}):(r.addListener(n,"keyup",function(){B.schedule()}),r.addListener(n,"keydown",function(){B.schedule()})),r.addListener(n,"compositionend",H),this.getElement=function(){return n},this.setReadOnly=function(e){n.readOnly=e},this.onContextMenu=function(e){N=!0,w(t.selection.isEmpty()),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,o){d||(d=n.style.cssText),n.style.cssText=(o?"z-index:100000;":"")+"height:"+n.style.height+";"+(i.isIE?"opacity:0.1;":"");var u=t.container.getBoundingClientRect(),a=s.computedStyle(t.container),f=u.top+(parseInt(a.borderTopWidth)||0),l=u.left+(parseInt(u.borderLeftWidth)||0),c=u.bottom-f-n.clientHeight-2,h=function(e){n.style.left=e.clientX-l-2+"px",n.style.top=Math.min(e.clientY-f-2,c)+"px"};h(e);if(e.type!="mousedown")return;t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout(j),i.isWin&&r.capture(t.container,h,F)},this.onContextMenuClose=F;var j,I=function(e){t.textInput.onContextMenu(e),F()};r.addListener(n,"mouseup",I),r.addListener(n,"mousedown",function(e){e.preventDefault(),F()}),r.addListener(t.renderer.scroller,"contextmenu",I),r.addListener(n,"contextmenu",I)};t.TextInput=l}),ace.define("ace/mouse/default_handlers",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";function u(e){e.$clickSelection=null;var t=e.editor;t.setDefaultHandler("mousedown",this.onMouseDown.bind(e)),t.setDefaultHandler("dblclick",this.onDoubleClick.bind(e)),t.setDefaultHandler("tripleclick",this.onTripleClick.bind(e)),t.setDefaultHandler("quadclick",this.onQuadClick.bind(e)),t.setDefaultHandler("mousewheel",this.onMouseWheel.bind(e)),t.setDefaultHandler("touchmove",this.onTouchMove.bind(e));var n=["select","startSelect","selectEnd","selectAllEnd","selectByWordsEnd","selectByLinesEnd","dragWait","dragWaitEnd","focusWait"];n.forEach(function(t){e[t]=this[t]},this),e.selectByLines=this.extendSelectionBy.bind(e,"getLineRange"),e.selectByWords=this.extendSelectionBy.bind(e,"getWordRange")}function a(e,t,n,r){return Math.sqrt(Math.pow(n-e,2)+Math.pow(r-t,2))}function f(e,t){if(e.start.row==e.end.row)var n=2*t.column-e.start.column-e.end.column;else if(e.start.row==e.end.row-1&&!e.start.column&&!e.end.column)var n=t.column-4;else var n=2*t.row-e.start.row-e.end.row;return n<0?{cursor:e.start,anchor:e.end}:{cursor:e.end,anchor:e.start}}var r=e("../lib/dom"),i=e("../lib/event"),s=e("../lib/useragent"),o=0;(function(){this.onMouseDown=function(e){var t=e.inSelection(),n=e.getDocumentPosition();this.mousedownEvent=e;var r=this.editor,i=e.getButton();if(i!==0){var o=r.getSelectionRange(),u=o.isEmpty();r.$blockScrolling++,(u||i==1)&&r.selection.moveToPosition(n),r.$blockScrolling--,i==2&&(r.textInput.onContextMenu(e.domEvent),s.isMozilla||e.preventDefault());return}this.mousedownEvent.time=Date.now();if(t&&!r.isFocused()){r.focus();if(this.$focusTimout&&!this.$clickSelection&&!r.inMultiSelectMode){this.setState("focusWait"),this.captureMouse(e);return}}return this.captureMouse(e),this.startSelect(n,e.domEvent._clicks>1),e.preventDefault()},this.startSelect=function(e,t){e=e||this.editor.renderer.screenToTextCoordinates(this.x,this.y);var n=this.editor;n.$blockScrolling++,this.mousedownEvent.getShiftKey()?n.selection.selectToPosition(e):t||n.selection.moveToPosition(e),t||this.select(),n.renderer.scroller.setCapture&&n.renderer.scroller.setCapture(),n.setStyle("ace_selecting"),this.setState("select"),n.$blockScrolling--},this.select=function(){var e,t=this.editor,n=t.renderer.screenToTextCoordinates(this.x,this.y);t.$blockScrolling++;if(this.$clickSelection){var r=this.$clickSelection.comparePoint(n);if(r==-1)e=this.$clickSelection.end;else if(r==1)e=this.$clickSelection.start;else{var i=f(this.$clickSelection,n);n=i.cursor,e=i.anchor}t.selection.setSelectionAnchor(e.row,e.column)}t.selection.selectToPosition(n),t.$blockScrolling--,t.renderer.scrollCursorIntoView()},this.extendSelectionBy=function(e){var t,n=this.editor,r=n.renderer.screenToTextCoordinates(this.x,this.y),i=n.selection[e](r.row,r.column);n.$blockScrolling++;if(this.$clickSelection){var s=this.$clickSelection.comparePoint(i.start),o=this.$clickSelection.comparePoint(i.end);if(s==-1&&o<=0){t=this.$clickSelection.end;if(i.end.row!=r.row||i.end.column!=r.column)r=i.start}else if(o==1&&s>=0){t=this.$clickSelection.start;if(i.start.row!=r.row||i.start.column!=r.column)r=i.end}else if(s==-1&&o==1)r=i.end,t=i.start;else{var u=f(this.$clickSelection,r);r=u.cursor,t=u.anchor}n.selection.setSelectionAnchor(t.row,t.column)}n.selection.selectToPosition(r),n.$blockScrolling--,n.renderer.scrollCursorIntoView()},this.selectEnd=this.selectAllEnd=this.selectByWordsEnd=this.selectByLinesEnd=function(){this.$clickSelection=null,this.editor.unsetStyle("ace_selecting"),this.editor.renderer.scroller.releaseCapture&&this.editor.renderer.scroller.releaseCapture()},this.focusWait=function(){var e=a(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y),t=Date.now();(e>o||t-this.mousedownEvent.time>this.$focusTimout)&&this.startSelect(this.mousedownEvent.getDocumentPosition())},this.onDoubleClick=function(e){var t=e.getDocumentPosition(),n=this.editor,r=n.session,i=r.getBracketRange(t);i?(i.isEmpty()&&(i.start.column--,i.end.column++),this.setState("select")):(i=n.selection.getWordRange(t.row,t.column),this.setState("selectByWords")),this.$clickSelection=i,this.select()},this.onTripleClick=function(e){var t=e.getDocumentPosition(),n=this.editor;this.setState("selectByLines");var r=n.getSelectionRange();r.isMultiLine()&&r.contains(t.row,t.column)?(this.$clickSelection=n.selection.getLineRange(r.start.row),this.$clickSelection.end=n.selection.getLineRange(r.end.row).end):this.$clickSelection=n.selection.getLineRange(t.row),this.select()},this.onQuadClick=function(e){var t=this.editor;t.selectAll(),this.$clickSelection=t.getSelectionRange(),this.setState("selectAll")},this.onMouseWheel=function(e){if(e.getAccelKey())return;e.getShiftKey()&&e.wheelY&&!e.wheelX&&(e.wheelX=e.wheelY,e.wheelY=0);var t=e.domEvent.timeStamp,n=t-(this.$lastScrollTime||0),r=this.editor,i=r.renderer.isScrollableBy(e.wheelX*e.speed,e.wheelY*e.speed);if(i||n<200)return this.$lastScrollTime=t,r.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()},this.onTouchMove=function(e){var t=e.domEvent.timeStamp,n=t-(this.$lastScrollTime||0),r=this.editor,i=r.renderer.isScrollableBy(e.wheelX*e.speed,e.wheelY*e.speed);if(i||n<200)return this.$lastScrollTime=t,r.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()}}).call(u.prototype),t.DefaultHandlers=u}),ace.define("ace/tooltip",["require","exports","module","ace/lib/oop","ace/lib/dom"],function(e,t,n){"use strict";function s(e){this.isOpen=!1,this.$element=null,this.$parentNode=e}var r=e("./lib/oop"),i=e("./lib/dom");(function(){this.$init=function(){return this.$element=i.createElement("div"),this.$element.className="ace_tooltip",this.$element.style.display="none",this.$parentNode.appendChild(this.$element),this.$element},this.getElement=function(){return this.$element||this.$init()},this.setText=function(e){i.setInnerText(this.getElement(),e)},this.setHtml=function(e){this.getElement().innerHTML=e},this.setPosition=function(e,t){this.getElement().style.left=e+"px",this.getElement().style.top=t+"px"},this.setClassName=function(e){i.addCssClass(this.getElement(),e)},this.show=function(e,t,n){e!=null&&this.setText(e),t!=null&&n!=null&&this.setPosition(t,n),this.isOpen||(this.getElement().style.display="block",this.isOpen=!0)},this.hide=function(){this.isOpen&&(this.getElement().style.display="none",this.isOpen=!1)},this.getHeight=function(){return this.getElement().offsetHeight},this.getWidth=function(){return this.getElement().offsetWidth},this.destroy=function(){this.isOpen=!1,this.$element&&this.$element.parentNode&&this.$element.parentNode.removeChild(this.$element)}}).call(s.prototype),t.Tooltip=s}),ace.define("ace/mouse/default_gutter_handler",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event","ace/tooltip"],function(e,t,n){"use strict";function u(e){function l(){var r=u.getDocumentPosition().row,s=n.$annotations[r];if(!s)return c();var o=t.session.getLength();if(r==o){var a=t.renderer.pixelToScreenCoordinates(0,u.y).row,l=u.$pos;if(a>t.session.documentToScreenRow(l.row,l.column))return c()}if(f==s)return;f=s.text.join("<br/>"),i.setHtml(f),i.show(),t._signal("showGutterTooltip",i),t.on("mousewheel",c);if(e.$tooltipFollowsMouse)h(u);else{var p=u.domEvent.target,d=p.getBoundingClientRect(),v=i.getElement().style;v.left=d.right+"px",v.top=d.bottom+"px"}}function c(){o&&(o=clearTimeout(o)),f&&(i.hide(),f=null,t._signal("hideGutterTooltip",i),t.removeEventListener("mousewheel",c))}function h(e){i.setPosition(e.x,e.y)}var t=e.editor,n=t.renderer.$gutterLayer,i=new a(t.container);e.editor.setDefaultHandler("guttermousedown",function(r){if(!t.isFocused()||r.getButton()!=0)return;var i=n.getRegion(r);if(i=="foldWidgets")return;var s=r.getDocumentPosition().row,o=t.session.selection;if(r.getShiftKey())o.selectTo(s,0);else{if(r.domEvent.detail==2)return t.selectAll(),r.preventDefault();e.$clickSelection=t.selection.getLineRange(s)}return e.setState("selectByLines"),e.captureMouse(r),r.preventDefault()});var o,u,f;e.editor.setDefaultHandler("guttermousemove",function(t){var n=t.domEvent.target||t.domEvent.srcElement;if(r.hasCssClass(n,"ace_fold-widget"))return c();f&&e.$tooltipFollowsMouse&&h(t),u=t;if(o)return;o=setTimeout(function(){o=null,u&&!e.isMousePressed?l():c()},50)}),s.addListener(t.renderer.$gutter,"mouseout",function(e){u=null;if(!f||o)return;o=setTimeout(function(){o=null,c()},50)}),t.on("changeSession",c)}function a(e){o.call(this,e)}var r=e("../lib/dom"),i=e("../lib/oop"),s=e("../lib/event"),o=e("../tooltip").Tooltip;i.inherits(a,o),function(){this.setPosition=function(e,t){var n=window.innerWidth||document.documentElement.clientWidth,r=window.innerHeight||document.documentElement.clientHeight,i=this.getWidth(),s=this.getHeight();e+=15,t+=15,e+i>n&&(e-=e+i-n),t+s>r&&(t-=20+s),o.prototype.setPosition.call(this,e,t)}}.call(a.prototype),t.GutterHandler=u}),ace.define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=t.MouseEvent=function(e,t){this.domEvent=e,this.editor=t,this.x=this.clientX=e.clientX,this.y=this.clientY=e.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){r.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){r.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){return this.$pos?this.$pos:(this.$pos=this.editor.renderer.screenToTextCoordinates(this.clientX,this.clientY),this.$pos)},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var e=this.editor,t=e.getSelectionRange();if(t.isEmpty())this.$inSelection=!1;else{var n=this.getDocumentPosition();this.$inSelection=t.contains(n.row,n.column)}return this.$inSelection},this.getButton=function(){return r.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=i.isMac?function(){return this.domEvent.metaKey}:function(){return this.domEvent.ctrlKey}}).call(s.prototype)}),ace.define("ace/mouse/dragdrop_handler",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";function f(e){function T(e,n){var r=Date.now(),i=!n||e.row!=n.row,s=!n||e.column!=n.column;if(!S||i||s)t.$blockScrolling+=1,t.moveCursorToPosition(e),t.$blockScrolling-=1,S=r,x={x:p,y:d};else{var o=l(x.x,x.y,p,d);o>a?S=null:r-S>=u&&(t.renderer.scrollCursorIntoView(),S=null)}}function N(e,n){var r=Date.now(),i=t.renderer.layerConfig.lineHeight,s=t.renderer.layerConfig.characterWidth,u=t.renderer.scroller.getBoundingClientRect(),a={x:{left:p-u.left,right:u.right-p},y:{top:d-u.top,bottom:u.bottom-d}},f=Math.min(a.x.left,a.x.right),l=Math.min(a.y.top,a.y.bottom),c={row:e.row,column:e.column};f/s<=2&&(c.column+=a.x.left<a.x.right?-3:2),l/i<=1&&(c.row+=a.y.top<a.y.bottom?-1:1);var h=e.row!=c.row,v=e.column!=c.column,m=!n||e.row!=n.row;h||v&&!m?E?r-E>=o&&t.renderer.scrollCursorIntoView(c):E=r:E=null}function C(){var e=g;g=t.renderer.screenToTextCoordinates(p,d),T(g,e),N(g,e)}function k(){m=t.selection.toOrientedRange(),h=t.session.addMarker(m,"ace_selection",t.getSelectionStyle()),t.clearSelection(),t.isFocused()&&t.renderer.$cursorLayer.setBlinking(!1),clearInterval(v),C(),v=setInterval(C,20),y=0,i.addListener(document,"mousemove",O)}function L(){clearInterval(v),t.session.removeMarker(h),h=null,t.$blockScrolling+=1,t.selection.fromOrientedRange(m),t.$blockScrolling-=1,t.isFocused()&&!w&&t.renderer.$cursorLayer.setBlinking(!t.getReadOnly()),m=null,g=null,y=0,E=null,S=null,i.removeListener(document,"mousemove",O)}function O(){A==null&&(A=setTimeout(function(){A!=null&&h&&L()},20))}function M(e){var t=e.types;return!t||Array.prototype.some.call(t,function(e){return e=="text/plain"||e=="Text"})}function _(e){var t=["copy","copymove","all","uninitialized"],n=["move","copymove","linkmove","all","uninitialized"],r=s.isMac?e.altKey:e.ctrlKey,i="uninitialized";try{i=e.dataTransfer.effectAllowed.toLowerCase()}catch(e){}var o="none";return r&&t.indexOf(i)>=0?o="copy":n.indexOf(i)>=0?o="move":t.indexOf(i)>=0&&(o="copy"),o}var t=e.editor,n=r.createElement("img");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",s.isOpera&&(n.style.cssText="width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;");var f=["dragWait","dragWaitEnd","startDrag","dragReadyEnd","onMouseDrag"];f.forEach(function(t){e[t]=this[t]},this),t.addEventListener("mousedown",this.onMouseDown.bind(e));var c=t.container,h,p,d,v,m,g,y=0,b,w,E,S,x;this.onDragStart=function(e){if(this.cancelDrag||!c.draggable){var r=this;return setTimeout(function(){r.startSelect(),r.captureMouse(e)},0),e.preventDefault()}m=t.getSelectionRange();var i=e.dataTransfer;i.effectAllowed=t.getReadOnly()?"copy":"copyMove",s.isOpera&&(t.container.appendChild(n),n.scrollTop=0),i.setDragImage&&i.setDragImage(n,0,0),s.isOpera&&t.container.removeChild(n),i.clearData(),i.setData("Text",t.session.getTextRange()),w=!0,this.setState("drag")},this.onDragEnd=function(e){c.draggable=!1,w=!1,this.setState(null);if(!t.getReadOnly()){var n=e.dataTransfer.dropEffect;!b&&n=="move"&&t.session.remove(t.getSelectionRange()),t.renderer.$cursorLayer.setBlinking(!0)}this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle("")},this.onDragEnter=function(e){if(t.getReadOnly()||!M(e.dataTransfer))return;return p=e.clientX,d=e.clientY,h||k(),y++,e.dataTransfer.dropEffect=b=_(e),i.preventDefault(e)},this.onDragOver=function(e){if(t.getReadOnly()||!M(e.dataTransfer))return;return p=e.clientX,d=e.clientY,h||(k(),y++),A!==null&&(A=null),e.dataTransfer.dropEffect=b=_(e),i.preventDefault(e)},this.onDragLeave=function(e){y--;if(y<=0&&h)return L(),b=null,i.preventDefault(e)},this.onDrop=function(e){if(!g)return;var n=e.dataTransfer;if(w)switch(b){case"move":m.contains(g.row,g.column)?m={start:g,end:g}:m=t.moveText(m,g);break;case"copy":m=t.moveText(m,g,!0)}else{var r=n.getData("Text");m={start:g,end:t.session.insert(g,r)},t.focus(),b=null}return L(),i.preventDefault(e)},i.addListener(c,"dragstart",this.onDragStart.bind(e)),i.addListener(c,"dragend",this.onDragEnd.bind(e)),i.addListener(c,"dragenter",this.onDragEnter.bind(e)),i.addListener(c,"dragover",this.onDragOver.bind(e)),i.addListener(c,"dragleave",this.onDragLeave.bind(e)),i.addListener(c,"drop",this.onDrop.bind(e));var A=null}function l(e,t,n,r){return Math.sqrt(Math.pow(n-e,2)+Math.pow(r-t,2))}var r=e("../lib/dom"),i=e("../lib/event"),s=e("../lib/useragent"),o=200,u=200,a=5;(function(){this.dragWait=function(){var e=Date.now()-this.mousedownEvent.time;e>this.editor.getDragDelay()&&this.startDrag()},this.dragWaitEnd=function(){var e=this.editor.container;e.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()),this.selectEnd()},this.dragReadyEnd=function(e){this.editor.renderer.$cursorLayer.setBlinking(!this.editor.getReadOnly()),this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle(""),this.dragWaitEnd()},this.startDrag=function(){this.cancelDrag=!1;var e=this.editor,t=e.container;t.draggable=!0,e.renderer.$cursorLayer.setBlinking(!1),e.setStyle("ace_dragging");var n=s.isWin?"default":"move";e.renderer.setCursorStyle(n),this.setState("dragReady")},this.onMouseDrag=function(e){var t=this.editor.container;if(s.isIE&&this.state=="dragReady"){var n=l(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y);n>3&&t.dragDrop()}if(this.state==="dragWait"){var n=l(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y);n>0&&(t.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()))}},this.onMouseDown=function(e){if(!this.$dragEnabled)return;this.mousedownEvent=e;var t=this.editor,n=e.inSelection(),r=e.getButton(),i=e.domEvent.detail||1;if(i===1&&r===0&&n){if(e.editor.inMultiSelectMode&&(e.getAccelKey()||e.getShiftKey()))return;this.mousedownEvent.time=Date.now();var o=e.domEvent.target||e.domEvent.srcElement;"unselectable"in o&&(o.unselectable="on");if(t.getDragDelay()){if(s.isWebKit){this.cancelDrag=!0;var u=t.container;u.draggable=!0}this.setState("dragWait")}else this.startDrag();this.captureMouse(e,this.onMouseDrag.bind(this)),e.defaultPrevented=!0}}}).call(f.prototype),t.DragdropHandler=f}),ace.define("ace/lib/net",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("./dom");t.get=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.onreadystatechange=function(){n.readyState===4&&t(n.responseText)},n.send(null)},t.loadScript=function(e,t){var n=r.getDocumentHead(),i=document.createElement("script");i.src=e,n.appendChild(i),i.onload=i.onreadystatechange=function(e,n){if(n||!i.readyState||i.readyState=="loaded"||i.readyState=="complete")i=i.onload=i.onreadystatechange=null,n||t()}},t.qualifyURL=function(e){var t=document.createElement("a");return t.href=e,t.href}}),ace.define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;t&&this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t){var i=n[e];r&&this.setDefaultHandler(e,r.pop())}else if(r){var s=r.indexOf(t);s!=-1&&r.splice(s,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),ace.define("ace/lib/app_config",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"no use strict";function o(e){typeof console!="undefined"&&console.warn&&console.warn.apply(console,arguments)}function u(e,t){var n=new Error(e);n.data=t,typeof console=="object"&&console.error&&console.error(n),setTimeout(function(){throw n})}var r=e("./oop"),i=e("./event_emitter").EventEmitter,s={setOptions:function(e){Object.keys(e).forEach(function(t){this.setOption(t,e[t])},this)},getOptions:function(e){var t={};return e?Array.isArray(e)||(t=e,e=Object.keys(t)):e=Object.keys(this.$options),e.forEach(function(e){t[e]=this.getOption(e)},this),t},setOption:function(e,t){if(this["$"+e]===t)return;var n=this.$options[e];if(!n)return o('misspelled option "'+e+'"');if(n.forwardTo)return this[n.forwardTo]&&this[n.forwardTo].setOption(e,t);n.handlesSet||(this["$"+e]=t),n&&n.set&&n.set.call(this,t)},getOption:function(e){var t=this.$options[e];return t?t.forwardTo?this[t.forwardTo]&&this[t.forwardTo].getOption(e):t&&t.get?t.get.call(this):this["$"+e]:o('misspelled option "'+e+'"')}},a=function(){this.$defaultOptions={}};(function(){r.implement(this,i),this.defineOptions=function(e,t,n){return e.$options||(this.$defaultOptions[t]=e.$options={}),Object.keys(n).forEach(function(t){var r=n[t];typeof r=="string"&&(r={forwardTo:r}),r.name||(r.name=t),e.$options[r.name]=r,"initialValue"in r&&(e["$"+r.name]=r.initialValue)}),r.implement(e,s),this},this.resetOptions=function(e){Object.keys(e.$options).forEach(function(t){var n=e.$options[t];"value"in n&&e.setOption(t,n.value)})},this.setDefaultValue=function(e,t,n){var r=this.$defaultOptions[e]||(this.$defaultOptions[e]={});r[t]&&(r.forwardTo?this.setDefaultValue(r.forwardTo,t,n):r[t].value=n)},this.setDefaultValues=function(e,t){Object.keys(t).forEach(function(n){this.setDefaultValue(e,n,t[n])},this)},this.warn=o,this.reportError=u}).call(a.prototype),t.AppConfig=a}),ace.define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/app_config"],function(e,t,n){"no use strict";function f(r){if(!u||!u.document)return;a.packaged=r||e.packaged||n.packaged||u.define&&define.packaged;var i={},s="",o=document.currentScript||document._currentScript,f=o&&o.ownerDocument||document,c=f.getElementsByTagName("script");for(var h=0;h<c.length;h++){var p=c[h],d=p.src||p.getAttribute("src");if(!d)continue;var v=p.attributes;for(var m=0,g=v.length;m<g;m++){var y=v[m];y.name.indexOf("data-ace-")===0&&(i[l(y.name.replace(/^data-ace-/,""))]=y.value)}var b=d.match(/^(.*)\/ace(\-\w+)?\.js(\?|$)/);b&&(s=b[1])}s&&(i.base=i.base||s,i.packaged=!0),i.basePath=i.base,i.workerPath=i.workerPath||i.base,i.modePath=i.modePath||i.base,i.themePath=i.themePath||i.base,delete i.base;for(var w in i)typeof i[w]!="undefined"&&t.set(w,i[w])}function l(e){return e.replace(/-(.)/g,function(e,t){return t.toUpperCase()})}var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./lib/net"),o=e("./lib/app_config").AppConfig;n.exports=t=new o;var u=function(){return this||typeof window!="undefined"&&window}(),a={packaged:!1,workerPath:null,modePath:null,themePath:null,basePath:"",suffix:".js",$moduleUrls:{}};t.get=function(e){if(!a.hasOwnProperty(e))throw new Error("Unknown config key: "+e);return a[e]},t.set=function(e,t){if(!a.hasOwnProperty(e))throw new Error("Unknown config key: "+e);a[e]=t},t.all=function(){return r.copyObject(a)},t.moduleUrl=function(e,t){if(a.$moduleUrls[e])return a.$moduleUrls[e];var n=e.split("/");t=t||n[n.length-2]||"";var r=t=="snippets"?"/":"-",i=n[n.length-1];if(t=="worker"&&r=="-"){var s=new RegExp("^"+t+"[\\-_]|[\\-_]"+t+"$","g");i=i.replace(s,"")}(!i||i==t)&&n.length>1&&(i=n[n.length-2]);var o=a[t+"Path"];return o==null?o=a.basePath:r=="/"&&(t=r=""),o&&o.slice(-1)!="/"&&(o+="/"),o+t+r+i+this.get("suffix")},t.setModuleUrl=function(e,t){return a.$moduleUrls[e]=t},t.$loading={},t.loadModule=function(n,r){var i,o;Array.isArray(n)&&(o=n[0],n=n[1]);try{i=e(n)}catch(u){}if(i&&!t.$loading[n])return r&&r(i);t.$loading[n]||(t.$loading[n]=[]),t.$loading[n].push(r);if(t.$loading[n].length>1)return;var a=function(){e([n],function(e){t._emit("load.module",{name:n,module:e});var r=t.$loading[n];t.$loading[n]=null,r.forEach(function(t){t&&t(e)})})};if(!t.get("packaged"))return a();s.loadScript(t.moduleUrl(n,o),a)},t.init=f}),ace.define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event","ace/mouse/dragdrop_handler","ace/config"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("./default_handlers").DefaultHandlers,o=e("./default_gutter_handler").GutterHandler,u=e("./mouse_event").MouseEvent,a=e("./dragdrop_handler").DragdropHandler,f=e("../config"),l=function(e){var t=this;this.editor=e,new s(this),new o(this),new a(this);var n=function(t){var n=!document.hasFocus||!document.hasFocus()||!e.isFocused()&&document.activeElement==(e.textInput&&e.textInput.getElement());n&&window.focus(),e.focus()},u=e.renderer.getMouseEventTarget();r.addListener(u,"click",this.onMouseEvent.bind(this,"click")),r.addListener(u,"mousemove",this.onMouseMove.bind(this,"mousemove")),r.addMultiMouseDownListener([u,e.renderer.scrollBarV&&e.renderer.scrollBarV.inner,e.renderer.scrollBarH&&e.renderer.scrollBarH.inner,e.textInput&&e.textInput.getElement()].filter(Boolean),[400,300,250],this,"onMouseEvent"),r.addMouseWheelListener(e.container,this.onMouseWheel.bind(this,"mousewheel")),r.addTouchMoveListener(e.container,this.onTouchMove.bind(this,"touchmove"));var f=e.renderer.$gutter;r.addListener(f,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),r.addListener(f,"click",this.onMouseEvent.bind(this,"gutterclick")),r.addListener(f,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),r.addListener(f,"mousemove",this.onMouseEvent.bind(this,"guttermousemove")),r.addListener(u,"mousedown",n),r.addListener(f,"mousedown",n),i.isIE&&e.renderer.scrollBarV&&(r.addListener(e.renderer.scrollBarV.element,"mousedown",n),r.addListener(e.renderer.scrollBarH.element,"mousedown",n)),e.on("mousemove",function(n){if(t.state||t.$dragDelay||!t.$dragEnabled)return;var r=e.renderer.screenToTextCoordinates(n.x,n.y),i=e.session.selection.getRange(),s=e.renderer;!i.isEmpty()&&i.insideStart(r.row,r.column)?s.setCursorStyle("default"):s.setCursorStyle("")})};(function(){this.onMouseEvent=function(e,t){this.editor._emit(e,new u(t,this.editor))},this.onMouseMove=function(e,t){var n=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!n||!n.length)return;this.editor._emit(e,new u(t,this.editor))},this.onMouseWheel=function(e,t){var n=new u(t,this.editor);n.speed=this.$scrollSpeed*2,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.onTouchMove=function(e,t){var n=new u(t,this.editor);n.speed=1,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.setState=function(e){this.state=e},this.captureMouse=function(e,t){this.x=e.x,this.y=e.y,this.isMousePressed=!0;var n=this.editor.renderer;n.$keepTextAreaAtCursor&&(n.$keepTextAreaAtCursor=null);var s=this,o=function(e){if(!e)return;if(i.isWebKit&&!e.which&&s.releaseMouse)return s.releaseMouse();s.x=e.clientX,s.y=e.clientY,t&&t(e),s.mouseEvent=new u(e,s.editor),s.$mouseMoved=!0},a=function(e){clearInterval(l),f(),s[s.state+"End"]&&s[s.state+"End"](e),s.state="",n.$keepTextAreaAtCursor==null&&(n.$keepTextAreaAtCursor=!0,n.$moveTextAreaToCursor()),s.isMousePressed=!1,s.$onCaptureMouseMove=s.releaseMouse=null,e&&s.onMouseEvent("mouseup",e)},f=function(){s[s.state]&&s[s.state](),s.$mouseMoved=!1};if(i.isOldIE&&e.domEvent.type=="dblclick")return setTimeout(function(){a(e)});s.$onCaptureMouseMove=o,s.releaseMouse=r.capture(this.editor.container,o,a);var l=setInterval(f,20)},this.releaseMouse=null,this.cancelContextMenu=function(){var e=function(t){if(t&&t.domEvent&&t.domEvent.type!="contextmenu")return;this.editor.off("nativecontextmenu",e),t&&t.domEvent&&r.stopEvent(t.domEvent)}.bind(this);setTimeout(e,10),this.editor.on("nativecontextmenu",e)}}).call(l.prototype),f.defineOptions(l.prototype,"mouseHandler",{scrollSpeed:{initialValue:2},dragDelay:{initialValue:i.isMac?150:0},dragEnabled:{initialValue:!0},focusTimout:{initialValue:0},tooltipFollowsMouse:{initialValue:!0}}),t.MouseHandler=l}),ace.define("ace/mouse/fold_handler",["require","exports","module"],function(e,t,n){"use strict";function r(e){e.on("click",function(t){var n=t.getDocumentPosition(),r=e.session,i=r.getFoldAt(n.row,n.column,1);i&&(t.getAccelKey()?r.removeFold(i):r.expandFold(i),t.stop())}),e.on("gutterclick",function(t){var n=e.renderer.$gutterLayer.getRegion(t);if(n=="foldWidgets"){var r=t.getDocumentPosition().row,i=e.session;i.foldWidgets&&i.foldWidgets[r]&&e.session.onFoldWidgetClick(r,t),e.isFocused()||e.focus(),t.stop()}}),e.on("gutterdblclick",function(t){var n=e.renderer.$gutterLayer.getRegion(t);if(n=="foldWidgets"){var r=t.getDocumentPosition().row,i=e.session,s=i.getParentFoldRangeData(r,!0),o=s.range||s.firstRange;if(o){r=o.start.row;var u=i.getFoldAt(r,i.getLine(r).length,1);u?i.removeFold(u):(i.addFold("...",o),e.renderer.scrollCursorIntoView({row:o.start.row,column:0}))}t.stop()}})}t.FoldHandler=r}),ace.define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event"],function(e,t,n){"use strict";var r=e("../lib/keys"),i=e("../lib/event"),s=function(e){this.$editor=e,this.$data={editor:e},this.$handlers=[],this.setDefaultHandler(e.commands)};(function(){this.setDefaultHandler=function(e){this.removeKeyboardHandler(this.$defaultHandler),this.$defaultHandler=e,this.addKeyboardHandler(e,0)},this.setKeyboardHandler=function(e){var t=this.$handlers;if(t[t.length-1]==e)return;while(t[t.length-1]&&t[t.length-1]!=this.$defaultHandler)this.removeKeyboardHandler(t[t.length-1]);this.addKeyboardHandler(e,1)},this.addKeyboardHandler=function(e,t){if(!e)return;typeof e=="function"&&!e.handleKeyboard&&(e.handleKeyboard=e);var n=this.$handlers.indexOf(e);n!=-1&&this.$handlers.splice(n,1),t==undefined?this.$handlers.push(e):this.$handlers.splice(t,0,e),n==-1&&e.attach&&e.attach(this.$editor)},this.removeKeyboardHandler=function(e){var t=this.$handlers.indexOf(e);return t==-1?!1:(this.$handlers.splice(t,1),e.detach&&e.detach(this.$editor),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.getStatusText=function(){var e=this.$data,t=e.editor;return this.$handlers.map(function(n){return n.getStatusText&&n.getStatusText(t,e)||""}).filter(Boolean).join(" ")},this.$callKeyboardHandlers=function(e,t,n,r){var s,o=!1,u=this.$editor.commands;for(var a=this.$handlers.length;a--;){s=this.$handlers[a].handleKeyboard(this.$data,e,t,n,r);if(!s||!s.command)continue;s.command=="null"?o=!0:o=u.exec(s.command,this.$editor,s.args,r),o&&r&&e!=-1&&s.passEvent!=1&&s.command.passEvent!=1&&i.stopEvent(r);if(o)break}return!o&&e==-1&&(s={command:"insertstring"},o=u.exec("insertstring",this.$editor,t)),o&&this.$editor._signal&&this.$editor._signal("keyboardActivity",s),o},this.onCommandKey=function(e,t,n){var i=r.keyCodeToString(n);this.$callKeyboardHandlers(t,i,n,e)},this.onTextInput=function(e){this.$callKeyboardHandlers(-1,e)}}).call(s.prototype),t.KeyBinding=s}),ace.define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),ace.define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=function(e){this.session=e,this.doc=e.getDocument(),this.clearSelection(),this.lead=this.selectionLead=this.doc.createAnchor(0,0),this.anchor=this.selectionAnchor=this.doc.createAnchor(0,0);var t=this;this.lead.on("change",function(e){t._emit("changeCursor"),t.$isEmpty||t._emit("changeSelection"),!t.$keepDesiredColumnOnChange&&e.old.column!=e.value.column&&(t.$desiredColumn=null)}),this.selectionAnchor.on("change",function(){t.$isEmpty||t._emit("changeSelection")})};(function(){r.implement(this,s),this.isEmpty=function(){return this.$isEmpty||this.anchor.row==this.lead.row&&this.anchor.column==this.lead.column},this.isMultiLine=function(){return this.isEmpty()?!1:this.getRange().isMultiLine()},this.getCursor=function(){return this.lead.getPosition()},this.setSelectionAnchor=function(e,t){this.anchor.setPosition(e,t),this.$isEmpty&&(this.$isEmpty=!1,this._emit("changeSelection"))},this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.anchor.getPosition()},this.getSelectionLead=function(){return this.lead.getPosition()},this.shiftSelection=function(e){if(this.$isEmpty){this.moveCursorTo(this.lead.row,this.lead.column+e);return}var t=this.getSelectionAnchor(),n=this.getSelectionLead(),r=this.isBackwards();(!r||t.column!==0)&&this.setSelectionAnchor(t.row,t.column+e),(r||n.column!==0)&&this.$moveSelection(function(){this.moveCursorTo(n.row,n.column+e)})},this.isBackwards=function(){var e=this.anchor,t=this.lead;return e.row>t.row||e.row==t.row&&e.column>t.column},this.getRange=function(){var e=this.anchor,t=this.lead;return this.isEmpty()?o.fromPoints(t,t):this.isBackwards()?o.fromPoints(t,e):o.fromPoints(e,t)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){var e=this.doc.getLength()-1;this.setSelectionAnchor(0,0),this.moveCursorTo(e,this.doc.getLine(e).length)},this.setRange=this.setSelectionRange=function(e,t){t?(this.setSelectionAnchor(e.end.row,e.end.column),this.selectTo(e.start.row,e.start.column)):(this.setSelectionAnchor(e.start.row,e.start.column),this.selectTo(e.end.row,e.end.column)),this.getRange().isEmpty()&&(this.$isEmpty=!0),this.$desiredColumn=null},this.$moveSelection=function(e){var t=this.lead;this.$isEmpty&&this.setSelectionAnchor(t.row,t.column),e.call(this)},this.selectTo=function(e,t){this.$moveSelection(function(){this.moveCursorTo(e,t)})},this.selectToPosition=function(e){this.$moveSelection(function(){this.moveCursorToPosition(e)})},this.moveTo=function(e,t){this.clearSelection(),this.moveCursorTo(e,t)},this.moveToPosition=function(e){this.clearSelection(),this.moveCursorToPosition(e)},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.getWordRange=function(e,t){if(typeof t=="undefined"){var n=e||this.lead;e=n.row,t=n.column}return this.session.getWordRange(e,t)},this.selectWord=function(){this.setSelectionRange(this.getWordRange())},this.selectAWord=function(){var e=this.getCursor(),t=this.session.getAWordRange(e.row,e.column);this.setSelectionRange(t)},this.getLineRange=function(e,t){var n=typeof e=="number"?e:this.lead.row,r,i=this.session.getFoldLine(n);return i?(n=i.start.row,r=i.end.row):r=n,t===!0?new o(n,0,r,this.session.getLine(r).length):new o(n,0,r+1,0)},this.selectLine=function(){this.setSelectionRange(this.getLineRange())},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.wouldMoveIntoSoftTab=function(e,t,n){var r=e.column,i=e.column+t;return n<0&&(r=e.column-t,i=e.column),this.session.isTabStop(e)&&this.doc.getLine(e.row).slice(r,i).split(" ").length-1==t},this.moveCursorLeft=function(){var e=this.lead.getPosition(),t;if(t=this.session.getFoldAt(e.row,e.column,-1))this.moveCursorTo(t.start.row,t.start.column);else if(e.column===0)e.row>0&&this.moveCursorTo(e.row-1,this.doc.getLine(e.row-1).length);else{var n=this.session.getTabSize();this.wouldMoveIntoSoftTab(e,n,-1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,-n):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var e=this.lead.getPosition(),t;if(t=this.session.getFoldAt(e.row,e.column,1))this.moveCursorTo(t.end.row,t.end.column);else if(this.lead.column==this.doc.getLine(this.lead.row).length)this.lead.row<this.doc.getLength()-1&&this.moveCursorTo(this.lead.row+1,0);else{var n=this.session.getTabSize(),e=this.lead;this.wouldMoveIntoSoftTab(e,n,1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,n):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var e=this.lead.row,t=this.lead.column,n=this.session.documentToScreenRow(e,t),r=this.session.screenToDocumentPosition(n,0),i=this.session.getDisplayLine(e,null,r.row,r.column),s=i.match(/^\s*/);s[0].length!=t&&!this.session.$useEmacsStyleLineStart&&(r.column+=s[0].length),this.moveCursorToPosition(r)},this.moveCursorLineEnd=function(){var e=this.lead,t=this.session.getDocumentLastRowColumnPosition(e.row,e.column);if(this.lead.column==t.column){var n=this.session.getLine(t.row);if(t.column==n.length){var r=n.search(/\s+$/);r>0&&(t.column=r)}}this.moveCursorTo(t.row,t.column)},this.moveCursorFileEnd=function(){var e=this.doc.getLength()-1,t=this.doc.getLine(e).length;this.moveCursorTo(e,t)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorLongWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),r=n.substring(t),i;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var s=this.session.getFoldAt(e,t,1);if(s){this.moveCursorTo(s.end.row,s.end.column);return}if(i=this.session.nonTokenRe.exec(r))t+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,r=n.substring(t);if(t>=n.length){this.moveCursorTo(e,n.length),this.moveCursorRight(),e<this.doc.getLength()-1&&this.moveCursorWordRight();return}if(i=this.session.tokenRe.exec(r))t+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(e,t)},this.moveCursorLongWordLeft=function(){var e=this.lead.row,t=this.lead.column,n;if(n=this.session.getFoldAt(e,t,-1)){this.moveCursorTo(n.start.row,n.start.column);return}var r=this.session.getFoldStringAt(e,t,-1);r==null&&(r=this.doc.getLine(e).substring(0,t));var s=i.stringReverse(r),o;this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;if(o=this.session.nonTokenRe.exec(s))t-=this.session.nonTokenRe.lastIndex,s=s.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0;if(t<=0){this.moveCursorTo(e,0),this.moveCursorLeft(),e>0&&this.moveCursorWordLeft();return}if(o=this.session.tokenRe.exec(s))t-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0;this.moveCursorTo(e,t)},this.$shortWordEndIndex=function(e){var t,n=0,r,i=/\s/,s=this.session.tokenRe;s.lastIndex=0;if(t=this.session.tokenRe.exec(e))n=this.session.tokenRe.lastIndex;else{while((r=e[n])&&i.test(r))n++;if(n<1){s.lastIndex=0;while((r=e[n])&&!s.test(r)){s.lastIndex=0,n++;if(i.test(r)){if(n>2){n--;break}while((r=e[n])&&i.test(r))n++;if(n>2)break}}}}return s.lastIndex=0,n},this.moveCursorShortWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),r=n.substring(t),i=this.session.getFoldAt(e,t,1);if(i)return this.moveCursorTo(i.end.row,i.end.column);if(t==n.length){var s=this.doc.getLength();do e++,r=this.doc.getLine(e);while(e<s&&/^\s*$/.test(r));/^\s+/.test(r)||(r=""),t=0}var o=this.$shortWordEndIndex(r);this.moveCursorTo(e,t+o)},this.moveCursorShortWordLeft=function(){var e=this.lead.row,t=this.lead.column,n;if(n=this.session.getFoldAt(e,t,-1))return this.moveCursorTo(n.start.row,n.start.column);var r=this.session.getLine(e).substring(0,t);if(t===0){do e--,r=this.doc.getLine(e);while(e>0&&/^\s*$/.test(r));t=r.length,/\s+$/.test(r)||(r="")}var s=i.stringReverse(r),o=this.$shortWordEndIndex(s);return this.moveCursorTo(e,t-o)},this.moveCursorWordRight=function(){this.session.$selectLongWords?this.moveCursorLongWordRight():this.moveCursorShortWordRight()},this.moveCursorWordLeft=function(){this.session.$selectLongWords?this.moveCursorLongWordLeft():this.moveCursorShortWordLeft()},this.moveCursorBy=function(e,t){var n=this.session.documentToScreenPosition(this.lead.row,this.lead.column);t===0&&(this.$desiredColumn?n.column=this.$desiredColumn:this.$desiredColumn=n.column);var r=this.session.screenToDocumentPosition(n.row+e,n.column);e!==0&&t===0&&r.row===this.lead.row&&r.column===this.lead.column&&this.session.lineWidgets&&this.session.lineWidgets[r.row]&&(r.row>0||e>0)&&r.row++,this.moveCursorTo(r.row,r.column+t,t===0)},this.moveCursorToPosition=function(e){this.moveCursorTo(e.row,e.column)},this.moveCursorTo=function(e,t,n){var r=this.session.getFoldAt(e,t,1);r&&(e=r.start.row,t=r.start.column),this.$keepDesiredColumnOnChange=!0,this.lead.setPosition(e,t),this.$keepDesiredColumnOnChange=!1,n||(this.$desiredColumn=null)},this.moveCursorToScreen=function(e,t,n){var r=this.session.screenToDocumentPosition(e,t);this.moveCursorTo(r.row,r.column,n)},this.detach=function(){this.lead.detach(),this.anchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(e){this.setSelectionRange(e,e.cursor==e.start),this.$desiredColumn=e.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(e){var t=this.getRange();return e?(e.start.column=t.start.column,e.start.row=t.start.row,e.end.column=t.end.column,e.end.row=t.end.row):e=t,e.cursor=this.isBackwards()?e.start:e.end,e.desiredColumn=this.$desiredColumn,e},this.getRangeOfMovements=function(e){var t=this.getCursor();try{e(this);var n=this.getCursor();return o.fromPoints(t,n)}catch(r){return o.fromPoints(t,t)}finally{this.moveCursorToPosition(t)}},this.toJSON=function(){if(this.rangeCount)var e=this.ranges.map(function(e){var t=e.clone();return t.isBackwards=e.cursor==e.start,t});else{var e=this.getRange();e.isBackwards=this.isBackwards()}return e},this.fromJSON=function(e){if(e.start==undefined){if(this.rangeList){this.toSingleRange(e[0]);for(var t=e.length;t--;){var n=o.fromPoints(e[t].start,e[t].end);e[t].isBackwards&&(n.cursor=n.start),this.addRange(n,!0)}return}e=e[0]}this.rangeList&&this.toSingleRange(e),this.setSelectionRange(e,e.isBackwards)},this.isEqual=function(e){if((e.length||this.rangeCount)&&e.length!=this.rangeCount)return!1;if(!e.length||!this.ranges)return this.getRange().isEqual(e);for(var t=this.ranges.length;t--;)if(!this.ranges[t].isEqual(e[t]))return!1;return!0}}).call(u.prototype),t.Selection=u}),ace.define("ace/tokenizer",["require","exports","module","ace/config"],function(e,t,n){"use strict";var r=e("./config"),i=2e3,s=function(e){this.states=e,this.regExps={},this.matchMappings={};for(var t in this.states){var n=this.states[t],r=[],i=0,s=this.matchMappings[t]={defaultToken:"text"},o="g",u=[];for(var a=0;a<n.length;a++){var f=n[a];f.defaultToken&&(s.defaultToken=f.defaultToken),f.caseInsensitive&&(o="gi");if(f.regex==null)continue;f.regex instanceof RegExp&&(f.regex=f.regex.toString().slice(1,-1));var l=f.regex,c=(new RegExp("(?:("+l+")|(.))")).exec("a").length-2;Array.isArray(f.token)?f.token.length==1||c==1?f.token=f.token[0]:c-1!=f.token.length?(this.reportError("number of classes and regexp groups doesn't match",{rule:f,groupCount:c-1}),f.token=f.token[0]):(f.tokenArray=f.token,f.token=null,f.onMatch=this.$arrayTokens):typeof f.token=="function"&&!f.onMatch&&(c>1?f.onMatch=this.$applyToken:f.onMatch=f.token),c>1&&(/\\\d/.test(f.regex)?l=f.regex.replace(/\\([0-9]+)/g,function(e,t){return"\\"+(parseInt(t,10)+i+1)}):(c=1,l=this.removeCapturingGroups(f.regex)),!f.splitRegex&&typeof f.token!="string"&&u.push(f)),s[i]=a,i+=c,r.push(l),f.onMatch||(f.onMatch=null)}r.length||(s[0]=0,r.push("$")),u.forEach(function(e){e.splitRegex=this.createSplitterRegexp(e.regex,o)},this),this.regExps[t]=new RegExp("("+r.join(")|(")+")|($)",o)}};(function(){this.$setMaxTokenCount=function(e){i=e|0},this.$applyToken=function(e){var t=this.splitRegex.exec(e).slice(1),n=this.token.apply(this,t);if(typeof n=="string")return[{type:n,value:e}];var r=[];for(var i=0,s=n.length;i<s;i++)t[i]&&(r[r.length]={type:n[i],value:t[i]});return r},this.$arrayTokens=function(e){if(!e)return[];var t=this.splitRegex.exec(e);if(!t)return"text";var n=[],r=this.tokenArray;for(var i=0,s=r.length;i<s;i++)t[i+1]&&(n[n.length]={type:r[i],value:t[i+1]});return n},this.removeCapturingGroups=function(e){var t=e.replace(/\[(?:\\.|[^\]])*?\]|\\.|\(\?[:=!]|(\()/g,function(e,t){return t?"(?:":e});return t},this.createSplitterRegexp=function(e,t){if(e.indexOf("(?=")!=-1){var n=0,r=!1,i={};e.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g,function(e,t,s,o,u,a){return r?r=u!="]":u?r=!0:o?(n==i.stack&&(i.end=a+1,i.stack=-1),n--):s&&(n++,s.length!=1&&(i.stack=n,i.start=a)),e}),i.end!=null&&/^\)*$/.test(e.substr(i.end))&&(e=e.substring(0,i.start)+e.substr(i.end))}return e.charAt(0)!="^"&&(e="^"+e),e.charAt(e.length-1)!="$"&&(e+="$"),new RegExp(e,(t||"").replace("g",""))},this.getLineTokens=function(e,t){if(t&&typeof t!="string"){var n=t.slice(0);t=n[0],t==="#tmp"&&(n.shift(),t=n.shift())}else var n=[];var r=t||"start",s=this.states[r];s||(r="start",s=this.states[r]);var o=this.matchMappings[r],u=this.regExps[r];u.lastIndex=0;var a,f=[],l=0,c=0,h={type:null,value:""};while(a=u.exec(e)){var p=o.defaultToken,d=null,v=a[0],m=u.lastIndex;if(m-v.length>l){var g=e.substring(l,m-v.length);h.type==p?h.value+=g:(h.type&&f.push(h),h={type:p,value:g})}for(var y=0;y<a.length-2;y++){if(a[y+1]===undefined)continue;d=s[o[y]],d.onMatch?p=d.onMatch(v,r,n,e):p=d.token,d.next&&(typeof d.next=="string"?r=d.next:r=d.next(r,n),s=this.states[r],s||(this.reportError("state doesn't exist",r),r="start",s=this.states[r]),o=this.matchMappings[r],l=m,u=this.regExps[r],u.lastIndex=m),d.consumeLineEnd&&(l=m);break}if(v)if(typeof p=="string")!!d&&d.merge===!1||h.type!==p?(h.type&&f.push(h),h={type:p,value:v}):h.value+=v;else if(p){h.type&&f.push(h),h={type:null,value:""};for(var y=0;y<p.length;y++)f.push(p[y])}if(l==e.length)break;l=m;if(c++>i){c>2*e.length&&this.reportError("infinite loop with in ace tokenizer",{startState:t,line:e});while(l<e.length)h.type&&f.push(h),h={value:e.substring(l,l+=2e3),type:"overflow"};r="start",n=[];break}}return h.type&&f.push(h),n.length>1&&n[0]!==r&&n.unshift("#tmp",r),{tokens:f,state:n.length?n:r}},this.reportError=r.reportError}).call(s.prototype),t.Tokenizer=s}),ace.define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../lib/lang"),i=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{defaultToken:"text"}]}};(function(){this.addRules=function(e,t){if(!t){for(var n in e)this.$rules[n]=e[n];return}for(var n in e){var r=e[n];for(var i=0;i<r.length;i++){var s=r[i];if(s.next||s.onMatch)typeof s.next=="string"&&s.next.indexOf(t)!==0&&(s.next=t+s.next),s.nextState&&s.nextState.indexOf(t)!==0&&(s.nextState=t+s.nextState)}this.$rules[t+n]=r}},this.getRules=function(){return this.$rules},this.embedRules=function(e,t,n,i,s){var o=typeof e=="function"?(new e).getRules():e;if(i)for(var u=0;u<i.length;u++)i[u]=t+i[u];else{i=[];for(var a in o)i.push(t+a)}this.addRules(o,t);if(n){var f=Array.prototype[s?"push":"unshift"];for(var u=0;u<i.length;u++)f.apply(this.$rules[i[u]],r.deepCopy(n))}this.$embeds||(this.$embeds=[]),this.$embeds.push(t)},this.getEmbeds=function(){return this.$embeds};var e=function(e,t){return(e!="start"||t.length)&&t.unshift(this.nextState,e),this.nextState},t=function(e,t){return t.shift(),t.shift()||"start"};this.normalizeRules=function(){function i(s){var o=r[s];o.processed=!0;for(var u=0;u<o.length;u++){var a=o[u],f=null;Array.isArray(a)&&(f=a,a={}),!a.regex&&a.start&&(a.regex=a.start,a.next||(a.next=[]),a.next.push({defaultToken:a.token},{token:a.token+".end",regex:a.end||a.start,next:"pop"}),a.token=a.token+".start",a.push=!0);var l=a.next||a.push;if(l&&Array.isArray(l)){var c=a.stateName;c||(c=a.token,typeof c!="string"&&(c=c[0]||""),r[c]&&(c+=n++)),r[c]=l,a.next=c,i(c)}else l=="pop"&&(a.next=t);a.push&&(a.nextState=a.next||a.push,a.next=e,delete a.push);if(a.rules)for(var h in a.rules)r[h]?r[h].push&&r[h].push.apply(r[h],a.rules[h]):r[h]=a.rules[h];var p=typeof a=="string"?a:a.include;p&&(Array.isArray(p)?f=p.map(function(e){return r[e]}):f=r[p]);if(f){var d=[u,1].concat(f);a.noEscape&&(d=d.filter(function(e){return!e.next})),o.splice.apply(o,d),u--}a.keywordMap&&(a.token=this.createKeywordMapper(a.keywordMap,a.defaultToken||"text",a.caseInsensitive),delete a.defaultToken)}}var n=0,r=this.$rules;Object.keys(r).forEach(i,this)},this.createKeywordMapper=function(e,t,n,r){var i=Object.create(null);return Object.keys(e).forEach(function(t){var s=e[t];n&&(s=s.toLowerCase());var o=s.split(r||"|");for(var u=o.length;u--;)i[o[u]]=t}),Object.getPrototypeOf(i)&&(i.__proto__=null),this.$keywordList=Object.keys(i),e=null,n?function(e){return i[e.toLowerCase()]||t}:function(e){return i[e]||t}},this.getKeywords=function(){return this.$keywords}}).call(i.prototype),t.TextHighlightRules=i}),ace.define("ace/mode/behaviour",["require","exports","module"],function(e,t,n){"use strict";var r=function(){this.$behaviours={}};(function(){this.add=function(e,t,n){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[e]:this.$behaviours[e]={}}this.$behaviours[e][t]=n},this.addBehaviours=function(e){for(var t in e)for(var n in e[t])this.add(t,n,e[t][n])},this.remove=function(e){this.$behaviours&&this.$behaviours[e]&&delete this.$behaviours[e]},this.inherit=function(e,t){if(typeof e=="function")var n=(new e).getBehaviours(t);else var n=e.getBehaviours(t);this.addBehaviours(n)},this.getBehaviours=function(e){if(!e)return this.$behaviours;var t={};for(var n=0;n<e.length;n++)this.$behaviours[e[n]]&&(t[e[n]]=this.$behaviours[e[n]]);return t}}).call(r.prototype),t.Behaviour=r}),ace.define("ace/token_iterator",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t,n){this.$session=e,this.$row=t,this.$rowTokens=e.getTokens(t);var r=e.getTokenAt(t,n);this.$tokenIndex=r?r.index:-1};(function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){this.$tokenIndex+=1;var e;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1,e||(e=this.$session.getLength());if(this.$row>=e)return this.$row=e-1,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var e=this.$rowTokens,t=this.$tokenIndex,n=e[t].start;if(n!==undefined)return n;n=0;while(t>0)t-=1,n+=e[t].value.length;return n},this.getCurrentTokenPosition=function(){return{row:this.$row,column:this.getCurrentTokenColumn()}}}).call(r.prototype),t.TokenIterator=r}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c={'"':'"',"'":"'"},h=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},p=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},d=function(e){this.add("braces","insertion",function(t,n,r,i,s){var u=r.getCursorPosition(),a=i.doc.getLine(u.row);if(s=="{"){h(r);var l=r.getSelectionRange(),c=i.doc.getTextRange(l);if(c!==""&&c!=="{"&&r.getWrapBehavioursEnabled())return p(l,c,"{","}");if(d.isSaneInsertion(r,i))return/[\]\}\)]/.test(a[u.column])||r.inMultiSelectMode||e&&e.braces?(d.recordAutoInsert(r,i,"}"),{text:"{}",selection:[1,1]}):(d.recordMaybeInsert(r,i,"{"),{text:"{",selection:[1,1]})}else if(s=="}"){h(r);var v=a.substring(u.column,u.column+1);if(v=="}"){var m=i.$findOpeningBracket("}",{column:u.column+1,row:u.row});if(m!==null&&d.isAutoInsertedClosing(u,a,s))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(s=="\n"||s=="\r\n"){h(r);var g="";d.isMaybeInsertedClosing(u,a)&&(g=o.stringRepeat("}",f.maybeInsertedBrackets),d.clearMaybeInsertedClosing());var v=a.substring(u.column,u.column+1);if(v==="}"){var y=i.findMatchingBracket({row:u.row,column:u.column+1},"}");if(!y)return null;var b=this.$getIndent(i.getLine(y.row))}else{if(!g){d.clearMaybeInsertedClosing();return}var b=this.$getIndent(a)}var w=b+i.getTabString();return{text:"\n"+w+"\n"+b+g,selection:[1,w.length,1,w.length]}}d.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){h(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return p(s,o,"(",")");if(d.isSaneInsertion(n,r))return d.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){h(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&d.isAutoInsertedClosing(u,a,i))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){h(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return p(s,o,"[","]");if(d.isSaneInsertion(n,r))return d.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){h(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&d.isAutoInsertedClosing(u,a,i))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){var s=r.$mode.$quotes||c;if(i.length==1&&s[i]){if(this.lineCommentStart&&this.lineCommentStart.indexOf(i)!=-1)return;h(n);var o=i,u=n.getSelectionRange(),a=r.doc.getTextRange(u);if(a!==""&&(a.length!=1||!s[a])&&n.getWrapBehavioursEnabled())return p(u,a,o,o);if(!a){var f=n.getCursorPosition(),l=r.doc.getLine(f.row),d=l.substring(f.column-1,f.column),v=l.substring(f.column,f.column+1),m=r.getTokenAt(f.row,f.column),g=r.getTokenAt(f.row,f.column+1);if(d=="\\"&&m&&/escape/.test(m.type))return null;var y=m&&/string|escape/.test(m.type),b=!g||/string|escape/.test(g.type),w;if(v==o)w=y!==b,w&&/string\.end/.test(g.type)&&(w=!1);else{if(y&&!b)return null;if(y&&b)return null;var E=r.$mode.tokenRe;E.lastIndex=0;var S=E.test(d);E.lastIndex=0;var x=E.test(d);if(S||x)return null;if(v&&!/[\s;,.})\]\\]/.test(v))return null;w=!0}return{text:w?o+o:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&(s=='"'||s=="'")){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==s)return i.end.column++,i}})};d.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},d.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},d.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},d.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},d.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},d.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},d.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},d.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(d,i),t.CstyleBehaviour=d}),ace.define("ace/unicode",["require","exports","module"],function(e,t,n){"use strict";function r(e){var n=/\w{4}/g;for(var r in e)t.packages[r]=e[r].replace(n,"\\u$&")}t.packages={},r({L:"0041-005A0061-007A00AA00B500BA00C0-00D600D8-00F600F8-02C102C6-02D102E0-02E402EC02EE0370-037403760377037A-037D03860388-038A038C038E-03A103A3-03F503F7-0481048A-05250531-055605590561-058705D0-05EA05F0-05F20621-064A066E066F0671-06D306D506E506E606EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA07F407F507FA0800-0815081A082408280904-0939093D09500958-0961097109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E460E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EC60EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10A0-10C510D0-10FA10FC1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317D717DC1820-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541AA71B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C7D1CE9-1CEC1CEE-1CF11D00-1DBF1E00-1F151F18-1F1D1F20-1F451F48-1F4D1F50-1F571F591F5B1F5D1F5F-1F7D1F80-1FB41FB6-1FBC1FBE1FC2-1FC41FC6-1FCC1FD0-1FD31FD6-1FDB1FE0-1FEC1FF2-1FF41FF6-1FFC2071207F2090-209421022107210A-211321152119-211D212421262128212A-212D212F-2139213C-213F2145-2149214E218321842C00-2C2E2C30-2C5E2C60-2CE42CEB-2CEE2D00-2D252D30-2D652D6F2D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE2E2F300530063031-3035303B303C3041-3096309D-309F30A1-30FA30FC-30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A48CA4D0-A4FDA500-A60CA610-A61FA62AA62BA640-A65FA662-A66EA67F-A697A6A0-A6E5A717-A71FA722-A788A78BA78CA7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2A9CFAA00-AA28AA40-AA42AA44-AA4BAA60-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADB-AADDABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB00-FB06FB13-FB17FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF21-FF3AFF41-FF5AFF66-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",Ll:"0061-007A00AA00B500BA00DF-00F600F8-00FF01010103010501070109010B010D010F01110113011501170119011B011D011F01210123012501270129012B012D012F01310133013501370138013A013C013E014001420144014601480149014B014D014F01510153015501570159015B015D015F01610163016501670169016B016D016F0171017301750177017A017C017E-0180018301850188018C018D019201950199-019B019E01A101A301A501A801AA01AB01AD01B001B401B601B901BA01BD-01BF01C601C901CC01CE01D001D201D401D601D801DA01DC01DD01DF01E101E301E501E701E901EB01ED01EF01F001F301F501F901FB01FD01FF02010203020502070209020B020D020F02110213021502170219021B021D021F02210223022502270229022B022D022F02310233-0239023C023F0240024202470249024B024D024F-02930295-02AF037103730377037B-037D039003AC-03CE03D003D103D5-03D703D903DB03DD03DF03E103E303E503E703E903EB03ED03EF-03F303F503F803FB03FC0430-045F04610463046504670469046B046D046F04710473047504770479047B047D047F0481048B048D048F04910493049504970499049B049D049F04A104A304A504A704A904AB04AD04AF04B104B304B504B704B904BB04BD04BF04C204C404C604C804CA04CC04CE04CF04D104D304D504D704D904DB04DD04DF04E104E304E504E704E904EB04ED04EF04F104F304F504F704F904FB04FD04FF05010503050505070509050B050D050F05110513051505170519051B051D051F0521052305250561-05871D00-1D2B1D62-1D771D79-1D9A1E011E031E051E071E091E0B1E0D1E0F1E111E131E151E171E191E1B1E1D1E1F1E211E231E251E271E291E2B1E2D1E2F1E311E331E351E371E391E3B1E3D1E3F1E411E431E451E471E491E4B1E4D1E4F1E511E531E551E571E591E5B1E5D1E5F1E611E631E651E671E691E6B1E6D1E6F1E711E731E751E771E791E7B1E7D1E7F1E811E831E851E871E891E8B1E8D1E8F1E911E931E95-1E9D1E9F1EA11EA31EA51EA71EA91EAB1EAD1EAF1EB11EB31EB51EB71EB91EBB1EBD1EBF1EC11EC31EC51EC71EC91ECB1ECD1ECF1ED11ED31ED51ED71ED91EDB1EDD1EDF1EE11EE31EE51EE71EE91EEB1EED1EEF1EF11EF31EF51EF71EF91EFB1EFD1EFF-1F071F10-1F151F20-1F271F30-1F371F40-1F451F50-1F571F60-1F671F70-1F7D1F80-1F871F90-1F971FA0-1FA71FB0-1FB41FB61FB71FBE1FC2-1FC41FC61FC71FD0-1FD31FD61FD71FE0-1FE71FF2-1FF41FF61FF7210A210E210F2113212F21342139213C213D2146-2149214E21842C30-2C5E2C612C652C662C682C6A2C6C2C712C732C742C76-2C7C2C812C832C852C872C892C8B2C8D2C8F2C912C932C952C972C992C9B2C9D2C9F2CA12CA32CA52CA72CA92CAB2CAD2CAF2CB12CB32CB52CB72CB92CBB2CBD2CBF2CC12CC32CC52CC72CC92CCB2CCD2CCF2CD12CD32CD52CD72CD92CDB2CDD2CDF2CE12CE32CE42CEC2CEE2D00-2D25A641A643A645A647A649A64BA64DA64FA651A653A655A657A659A65BA65DA65FA663A665A667A669A66BA66DA681A683A685A687A689A68BA68DA68FA691A693A695A697A723A725A727A729A72BA72DA72F-A731A733A735A737A739A73BA73DA73FA741A743A745A747A749A74BA74DA74FA751A753A755A757A759A75BA75DA75FA761A763A765A767A769A76BA76DA76FA771-A778A77AA77CA77FA781A783A785A787A78CFB00-FB06FB13-FB17FF41-FF5A",Lu:"0041-005A00C0-00D600D8-00DE01000102010401060108010A010C010E01100112011401160118011A011C011E01200122012401260128012A012C012E01300132013401360139013B013D013F0141014301450147014A014C014E01500152015401560158015A015C015E01600162016401660168016A016C016E017001720174017601780179017B017D018101820184018601870189-018B018E-0191019301940196-0198019C019D019F01A001A201A401A601A701A901AC01AE01AF01B1-01B301B501B701B801BC01C401C701CA01CD01CF01D101D301D501D701D901DB01DE01E001E201E401E601E801EA01EC01EE01F101F401F6-01F801FA01FC01FE02000202020402060208020A020C020E02100212021402160218021A021C021E02200222022402260228022A022C022E02300232023A023B023D023E02410243-02460248024A024C024E03700372037603860388-038A038C038E038F0391-03A103A3-03AB03CF03D2-03D403D803DA03DC03DE03E003E203E403E603E803EA03EC03EE03F403F703F903FA03FD-042F04600462046404660468046A046C046E04700472047404760478047A047C047E0480048A048C048E04900492049404960498049A049C049E04A004A204A404A604A804AA04AC04AE04B004B204B404B604B804BA04BC04BE04C004C104C304C504C704C904CB04CD04D004D204D404D604D804DA04DC04DE04E004E204E404E604E804EA04EC04EE04F004F204F404F604F804FA04FC04FE05000502050405060508050A050C050E05100512051405160518051A051C051E0520052205240531-055610A0-10C51E001E021E041E061E081E0A1E0C1E0E1E101E121E141E161E181E1A1E1C1E1E1E201E221E241E261E281E2A1E2C1E2E1E301E321E341E361E381E3A1E3C1E3E1E401E421E441E461E481E4A1E4C1E4E1E501E521E541E561E581E5A1E5C1E5E1E601E621E641E661E681E6A1E6C1E6E1E701E721E741E761E781E7A1E7C1E7E1E801E821E841E861E881E8A1E8C1E8E1E901E921E941E9E1EA01EA21EA41EA61EA81EAA1EAC1EAE1EB01EB21EB41EB61EB81EBA1EBC1EBE1EC01EC21EC41EC61EC81ECA1ECC1ECE1ED01ED21ED41ED61ED81EDA1EDC1EDE1EE01EE21EE41EE61EE81EEA1EEC1EEE1EF01EF21EF41EF61EF81EFA1EFC1EFE1F08-1F0F1F18-1F1D1F28-1F2F1F38-1F3F1F48-1F4D1F591F5B1F5D1F5F1F68-1F6F1FB8-1FBB1FC8-1FCB1FD8-1FDB1FE8-1FEC1FF8-1FFB21022107210B-210D2110-211221152119-211D212421262128212A-212D2130-2133213E213F214521832C00-2C2E2C602C62-2C642C672C692C6B2C6D-2C702C722C752C7E-2C802C822C842C862C882C8A2C8C2C8E2C902C922C942C962C982C9A2C9C2C9E2CA02CA22CA42CA62CA82CAA2CAC2CAE2CB02CB22CB42CB62CB82CBA2CBC2CBE2CC02CC22CC42CC62CC82CCA2CCC2CCE2CD02CD22CD42CD62CD82CDA2CDC2CDE2CE02CE22CEB2CEDA640A642A644A646A648A64AA64CA64EA650A652A654A656A658A65AA65CA65EA662A664A666A668A66AA66CA680A682A684A686A688A68AA68CA68EA690A692A694A696A722A724A726A728A72AA72CA72EA732A734A736A738A73AA73CA73EA740A742A744A746A748A74AA74CA74EA750A752A754A756A758A75AA75CA75EA760A762A764A766A768A76AA76CA76EA779A77BA77DA77EA780A782A784A786A78BFF21-FF3A",Lt:"01C501C801CB01F21F88-1F8F1F98-1F9F1FA8-1FAF1FBC1FCC1FFC",Lm:"02B0-02C102C6-02D102E0-02E402EC02EE0374037A0559064006E506E607F407F507FA081A0824082809710E460EC610FC17D718431AA71C78-1C7D1D2C-1D611D781D9B-1DBF2071207F2090-20942C7D2D6F2E2F30053031-3035303B309D309E30FC-30FEA015A4F8-A4FDA60CA67FA717-A71FA770A788A9CFAA70AADDFF70FF9EFF9F",Lo:"01BB01C0-01C3029405D0-05EA05F0-05F20621-063F0641-064A066E066F0671-06D306D506EE06EF06FA-06FC06FF07100712-072F074D-07A507B107CA-07EA0800-08150904-0939093D09500958-096109720979-097F0985-098C098F09900993-09A809AA-09B009B209B6-09B909BD09CE09DC09DD09DF-09E109F009F10A05-0A0A0A0F0A100A13-0A280A2A-0A300A320A330A350A360A380A390A59-0A5C0A5E0A72-0A740A85-0A8D0A8F-0A910A93-0AA80AAA-0AB00AB20AB30AB5-0AB90ABD0AD00AE00AE10B05-0B0C0B0F0B100B13-0B280B2A-0B300B320B330B35-0B390B3D0B5C0B5D0B5F-0B610B710B830B85-0B8A0B8E-0B900B92-0B950B990B9A0B9C0B9E0B9F0BA30BA40BA8-0BAA0BAE-0BB90BD00C05-0C0C0C0E-0C100C12-0C280C2A-0C330C35-0C390C3D0C580C590C600C610C85-0C8C0C8E-0C900C92-0CA80CAA-0CB30CB5-0CB90CBD0CDE0CE00CE10D05-0D0C0D0E-0D100D12-0D280D2A-0D390D3D0D600D610D7A-0D7F0D85-0D960D9A-0DB10DB3-0DBB0DBD0DC0-0DC60E01-0E300E320E330E40-0E450E810E820E840E870E880E8A0E8D0E94-0E970E99-0E9F0EA1-0EA30EA50EA70EAA0EAB0EAD-0EB00EB20EB30EBD0EC0-0EC40EDC0EDD0F000F40-0F470F49-0F6C0F88-0F8B1000-102A103F1050-1055105A-105D106110651066106E-10701075-1081108E10D0-10FA1100-1248124A-124D1250-12561258125A-125D1260-1288128A-128D1290-12B012B2-12B512B8-12BE12C012C2-12C512C8-12D612D8-13101312-13151318-135A1380-138F13A0-13F41401-166C166F-167F1681-169A16A0-16EA1700-170C170E-17111720-17311740-17511760-176C176E-17701780-17B317DC1820-18421844-18771880-18A818AA18B0-18F51900-191C1950-196D1970-19741980-19AB19C1-19C71A00-1A161A20-1A541B05-1B331B45-1B4B1B83-1BA01BAE1BAF1C00-1C231C4D-1C4F1C5A-1C771CE9-1CEC1CEE-1CF12135-21382D30-2D652D80-2D962DA0-2DA62DA8-2DAE2DB0-2DB62DB8-2DBE2DC0-2DC62DC8-2DCE2DD0-2DD62DD8-2DDE3006303C3041-3096309F30A1-30FA30FF3105-312D3131-318E31A0-31B731F0-31FF3400-4DB54E00-9FCBA000-A014A016-A48CA4D0-A4F7A500-A60BA610-A61FA62AA62BA66EA6A0-A6E5A7FB-A801A803-A805A807-A80AA80C-A822A840-A873A882-A8B3A8F2-A8F7A8FBA90A-A925A930-A946A960-A97CA984-A9B2AA00-AA28AA40-AA42AA44-AA4BAA60-AA6FAA71-AA76AA7AAA80-AAAFAAB1AAB5AAB6AAB9-AABDAAC0AAC2AADBAADCABC0-ABE2AC00-D7A3D7B0-D7C6D7CB-D7FBF900-FA2DFA30-FA6DFA70-FAD9FB1DFB1F-FB28FB2A-FB36FB38-FB3CFB3EFB40FB41FB43FB44FB46-FBB1FBD3-FD3DFD50-FD8FFD92-FDC7FDF0-FDFBFE70-FE74FE76-FEFCFF66-FF6FFF71-FF9DFFA0-FFBEFFC2-FFC7FFCA-FFCFFFD2-FFD7FFDA-FFDC",M:"0300-036F0483-04890591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DE-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0903093C093E-094E0951-0955096209630981-098309BC09BE-09C409C709C809CB-09CD09D709E209E30A01-0A030A3C0A3E-0A420A470A480A4B-0A4D0A510A700A710A750A81-0A830ABC0ABE-0AC50AC7-0AC90ACB-0ACD0AE20AE30B01-0B030B3C0B3E-0B440B470B480B4B-0B4D0B560B570B620B630B820BBE-0BC20BC6-0BC80BCA-0BCD0BD70C01-0C030C3E-0C440C46-0C480C4A-0C4D0C550C560C620C630C820C830CBC0CBE-0CC40CC6-0CC80CCA-0CCD0CD50CD60CE20CE30D020D030D3E-0D440D46-0D480D4A-0D4D0D570D620D630D820D830DCA0DCF-0DD40DD60DD8-0DDF0DF20DF30E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F3E0F3F0F71-0F840F860F870F90-0F970F99-0FBC0FC6102B-103E1056-1059105E-10601062-10641067-106D1071-10741082-108D108F109A-109D135F1712-17141732-1734175217531772177317B6-17D317DD180B-180D18A91920-192B1930-193B19B0-19C019C819C91A17-1A1B1A55-1A5E1A60-1A7C1A7F1B00-1B041B34-1B441B6B-1B731B80-1B821BA1-1BAA1C24-1C371CD0-1CD21CD4-1CE81CED1CF21DC0-1DE61DFD-1DFF20D0-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66F-A672A67CA67DA6F0A6F1A802A806A80BA823-A827A880A881A8B4-A8C4A8E0-A8F1A926-A92DA947-A953A980-A983A9B3-A9C0AA29-AA36AA43AA4CAA4DAA7BAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE3-ABEAABECABEDFB1EFE00-FE0FFE20-FE26",Mn:"0300-036F0483-04870591-05BD05BF05C105C205C405C505C70610-061A064B-065E067006D6-06DC06DF-06E406E706E806EA-06ED07110730-074A07A6-07B007EB-07F30816-0819081B-08230825-08270829-082D0900-0902093C0941-0948094D0951-095509620963098109BC09C1-09C409CD09E209E30A010A020A3C0A410A420A470A480A4B-0A4D0A510A700A710A750A810A820ABC0AC1-0AC50AC70AC80ACD0AE20AE30B010B3C0B3F0B41-0B440B4D0B560B620B630B820BC00BCD0C3E-0C400C46-0C480C4A-0C4D0C550C560C620C630CBC0CBF0CC60CCC0CCD0CE20CE30D41-0D440D4D0D620D630DCA0DD2-0DD40DD60E310E34-0E3A0E47-0E4E0EB10EB4-0EB90EBB0EBC0EC8-0ECD0F180F190F350F370F390F71-0F7E0F80-0F840F860F870F90-0F970F99-0FBC0FC6102D-10301032-10371039103A103D103E10581059105E-10601071-1074108210851086108D109D135F1712-17141732-1734175217531772177317B7-17BD17C617C9-17D317DD180B-180D18A91920-19221927192819321939-193B1A171A181A561A58-1A5E1A601A621A65-1A6C1A73-1A7C1A7F1B00-1B031B341B36-1B3A1B3C1B421B6B-1B731B801B811BA2-1BA51BA81BA91C2C-1C331C361C371CD0-1CD21CD4-1CE01CE2-1CE81CED1DC0-1DE61DFD-1DFF20D0-20DC20E120E5-20F02CEF-2CF12DE0-2DFF302A-302F3099309AA66FA67CA67DA6F0A6F1A802A806A80BA825A826A8C4A8E0-A8F1A926-A92DA947-A951A980-A982A9B3A9B6-A9B9A9BCAA29-AA2EAA31AA32AA35AA36AA43AA4CAAB0AAB2-AAB4AAB7AAB8AABEAABFAAC1ABE5ABE8ABEDFB1EFE00-FE0FFE20-FE26",Mc:"0903093E-09400949-094C094E0982098309BE-09C009C709C809CB09CC09D70A030A3E-0A400A830ABE-0AC00AC90ACB0ACC0B020B030B3E0B400B470B480B4B0B4C0B570BBE0BBF0BC10BC20BC6-0BC80BCA-0BCC0BD70C01-0C030C41-0C440C820C830CBE0CC0-0CC40CC70CC80CCA0CCB0CD50CD60D020D030D3E-0D400D46-0D480D4A-0D4C0D570D820D830DCF-0DD10DD8-0DDF0DF20DF30F3E0F3F0F7F102B102C10311038103B103C105610571062-10641067-106D108310841087-108C108F109A-109C17B617BE-17C517C717C81923-19261929-192B193019311933-193819B0-19C019C819C91A19-1A1B1A551A571A611A631A641A6D-1A721B041B351B3B1B3D-1B411B431B441B821BA11BA61BA71BAA1C24-1C2B1C341C351CE11CF2A823A824A827A880A881A8B4-A8C3A952A953A983A9B4A9B5A9BAA9BBA9BD-A9C0AA2FAA30AA33AA34AA4DAA7BABE3ABE4ABE6ABE7ABE9ABEAABEC",Me:"0488048906DE20DD-20E020E2-20E4A670-A672",N:"0030-003900B200B300B900BC-00BE0660-066906F0-06F907C0-07C90966-096F09E6-09EF09F4-09F90A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BF20C66-0C6F0C78-0C7E0CE6-0CEF0D66-0D750E50-0E590ED0-0ED90F20-0F331040-10491090-10991369-137C16EE-16F017E0-17E917F0-17F91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C5920702074-20792080-20892150-21822185-21892460-249B24EA-24FF2776-27932CFD30073021-30293038-303A3192-31953220-32293251-325F3280-328932B1-32BFA620-A629A6E6-A6EFA830-A835A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nd:"0030-00390660-066906F0-06F907C0-07C90966-096F09E6-09EF0A66-0A6F0AE6-0AEF0B66-0B6F0BE6-0BEF0C66-0C6F0CE6-0CEF0D66-0D6F0E50-0E590ED0-0ED90F20-0F291040-10491090-109917E0-17E91810-18191946-194F19D0-19DA1A80-1A891A90-1A991B50-1B591BB0-1BB91C40-1C491C50-1C59A620-A629A8D0-A8D9A900-A909A9D0-A9D9AA50-AA59ABF0-ABF9FF10-FF19",Nl:"16EE-16F02160-21822185-218830073021-30293038-303AA6E6-A6EF",No:"00B200B300B900BC-00BE09F4-09F90BF0-0BF20C78-0C7E0D70-0D750F2A-0F331369-137C17F0-17F920702074-20792080-20892150-215F21892460-249B24EA-24FF2776-27932CFD3192-31953220-32293251-325F3280-328932B1-32BFA830-A835",P:"0021-00230025-002A002C-002F003A003B003F0040005B-005D005F007B007D00A100AB00B700BB00BF037E0387055A-055F0589058A05BE05C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F3A-0F3D0F850FD0-0FD4104A-104F10FB1361-13681400166D166E169B169C16EB-16ED1735173617D4-17D617D8-17DA1800-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD32010-20272030-20432045-20512053-205E207D207E208D208E2329232A2768-277527C527C627E6-27EF2983-299829D8-29DB29FC29FD2CF9-2CFC2CFE2CFF2E00-2E2E2E302E313001-30033008-30113014-301F3030303D30A030FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFD3EFD3FFE10-FE19FE30-FE52FE54-FE61FE63FE68FE6AFE6BFF01-FF03FF05-FF0AFF0C-FF0FFF1AFF1BFF1FFF20FF3B-FF3DFF3FFF5BFF5DFF5F-FF65",Pd:"002D058A05BE140018062010-20152E172E1A301C303030A0FE31FE32FE58FE63FF0D",Ps:"0028005B007B0F3A0F3C169B201A201E2045207D208D23292768276A276C276E27702772277427C527E627E827EA27EC27EE2983298529872989298B298D298F299129932995299729D829DA29FC2E222E242E262E283008300A300C300E3010301430163018301A301DFD3EFE17FE35FE37FE39FE3BFE3DFE3FFE41FE43FE47FE59FE5BFE5DFF08FF3BFF5BFF5FFF62",Pe:"0029005D007D0F3B0F3D169C2046207E208E232A2769276B276D276F27712773277527C627E727E927EB27ED27EF298429862988298A298C298E2990299229942996299829D929DB29FD2E232E252E272E293009300B300D300F3011301530173019301B301E301FFD3FFE18FE36FE38FE3AFE3CFE3EFE40FE42FE44FE48FE5AFE5CFE5EFF09FF3DFF5DFF60FF63",Pi:"00AB2018201B201C201F20392E022E042E092E0C2E1C2E20",Pf:"00BB2019201D203A2E032E052E0A2E0D2E1D2E21",Pc:"005F203F20402054FE33FE34FE4D-FE4FFF3F",Po:"0021-00230025-0027002A002C002E002F003A003B003F0040005C00A100B700BF037E0387055A-055F058905C005C305C605F305F40609060A060C060D061B061E061F066A-066D06D40700-070D07F7-07F90830-083E0964096509700DF40E4F0E5A0E5B0F04-0F120F850FD0-0FD4104A-104F10FB1361-1368166D166E16EB-16ED1735173617D4-17D617D8-17DA1800-18051807-180A1944194519DE19DF1A1E1A1F1AA0-1AA61AA8-1AAD1B5A-1B601C3B-1C3F1C7E1C7F1CD3201620172020-20272030-2038203B-203E2041-20432047-205120532055-205E2CF9-2CFC2CFE2CFF2E002E012E06-2E082E0B2E0E-2E162E182E192E1B2E1E2E1F2E2A-2E2E2E302E313001-3003303D30FBA4FEA4FFA60D-A60FA673A67EA6F2-A6F7A874-A877A8CEA8CFA8F8-A8FAA92EA92FA95FA9C1-A9CDA9DEA9DFAA5C-AA5FAADEAADFABEBFE10-FE16FE19FE30FE45FE46FE49-FE4CFE50-FE52FE54-FE57FE5F-FE61FE68FE6AFE6BFF01-FF03FF05-FF07FF0AFF0CFF0EFF0FFF1AFF1BFF1FFF20FF3CFF61FF64FF65",S:"0024002B003C-003E005E0060007C007E00A2-00A900AC00AE-00B100B400B600B800D700F702C2-02C502D2-02DF02E5-02EB02ED02EF-02FF03750384038503F604820606-0608060B060E060F06E906FD06FE07F609F209F309FA09FB0AF10B700BF3-0BFA0C7F0CF10CF20D790E3F0F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-139917DB194019E0-19FF1B61-1B6A1B74-1B7C1FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE20442052207A-207C208A-208C20A0-20B8210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B2140-2144214A-214D214F2190-2328232B-23E82400-24262440-244A249C-24E92500-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE27C0-27C427C7-27CA27CC27D0-27E527F0-29822999-29D729DC-29FB29FE-2B4C2B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F309B309C319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A700-A716A720A721A789A78AA828-A82BA836-A839AA77-AA79FB29FDFCFDFDFE62FE64-FE66FE69FF04FF0BFF1C-FF1EFF3EFF40FF5CFF5EFFE0-FFE6FFE8-FFEEFFFCFFFD",Sm:"002B003C-003E007C007E00AC00B100D700F703F60606-060820442052207A-207C208A-208C2140-2144214B2190-2194219A219B21A021A321A621AE21CE21CF21D221D421F4-22FF2308-230B23202321237C239B-23B323DC-23E125B725C125F8-25FF266F27C0-27C427C7-27CA27CC27D0-27E527F0-27FF2900-29822999-29D729DC-29FB29FE-2AFF2B30-2B442B47-2B4CFB29FE62FE64-FE66FF0BFF1C-FF1EFF5CFF5EFFE2FFE9-FFEC",Sc:"002400A2-00A5060B09F209F309FB0AF10BF90E3F17DB20A0-20B8A838FDFCFE69FF04FFE0FFE1FFE5FFE6",Sk:"005E006000A800AF00B400B802C2-02C502D2-02DF02E5-02EB02ED02EF-02FF0375038403851FBD1FBF-1FC11FCD-1FCF1FDD-1FDF1FED-1FEF1FFD1FFE309B309CA700-A716A720A721A789A78AFF3EFF40FFE3",So:"00A600A700A900AE00B000B60482060E060F06E906FD06FE07F609FA0B700BF3-0BF80BFA0C7F0CF10CF20D790F01-0F030F13-0F170F1A-0F1F0F340F360F380FBE-0FC50FC7-0FCC0FCE0FCF0FD5-0FD8109E109F13601390-1399194019E0-19FF1B61-1B6A1B74-1B7C210021012103-21062108210921142116-2118211E-2123212521272129212E213A213B214A214C214D214F2195-2199219C-219F21A121A221A421A521A7-21AD21AF-21CD21D021D121D321D5-21F32300-2307230C-231F2322-2328232B-237B237D-239A23B4-23DB23E2-23E82400-24262440-244A249C-24E92500-25B625B8-25C025C2-25F72600-266E2670-26CD26CF-26E126E326E8-26FF2701-27042706-2709270C-27272729-274B274D274F-27522756-275E2761-276727942798-27AF27B1-27BE2800-28FF2B00-2B2F2B452B462B50-2B592CE5-2CEA2E80-2E992E9B-2EF32F00-2FD52FF0-2FFB300430123013302030363037303E303F319031913196-319F31C0-31E33200-321E322A-32503260-327F328A-32B032C0-32FE3300-33FF4DC0-4DFFA490-A4C6A828-A82BA836A837A839AA77-AA79FDFDFFE4FFE8FFEDFFEEFFFCFFFD",Z:"002000A01680180E2000-200A20282029202F205F3000",Zs:"002000A01680180E2000-200A202F205F3000",Zl:"2028",Zp:"2029",C:"0000-001F007F-009F00AD03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-0605061C061D0620065F06DD070E070F074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17B417B517DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF200B-200F202A-202E2060-206F20722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-F8FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFD-FF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFFBFFFEFFFF",Cc:"0000-001F007F-009F",Cf:"00AD0600-060306DD070F17B417B5200B-200F202A-202E2060-2064206A-206FFEFFFFF9-FFFB",Co:"E000-F8FF",Cs:"D800-DFFF",Cn:"03780379037F-0383038B038D03A20526-05300557055805600588058B-059005C8-05CF05EB-05EF05F5-05FF06040605061C061D0620065F070E074B074C07B2-07BF07FB-07FF082E082F083F-08FF093A093B094F095609570973-097809800984098D098E0991099209A909B109B3-09B509BA09BB09C509C609C909CA09CF-09D609D8-09DB09DE09E409E509FC-0A000A040A0B-0A0E0A110A120A290A310A340A370A3A0A3B0A3D0A43-0A460A490A4A0A4E-0A500A52-0A580A5D0A5F-0A650A76-0A800A840A8E0A920AA90AB10AB40ABA0ABB0AC60ACA0ACE0ACF0AD1-0ADF0AE40AE50AF00AF2-0B000B040B0D0B0E0B110B120B290B310B340B3A0B3B0B450B460B490B4A0B4E-0B550B58-0B5B0B5E0B640B650B72-0B810B840B8B-0B8D0B910B96-0B980B9B0B9D0BA0-0BA20BA5-0BA70BAB-0BAD0BBA-0BBD0BC3-0BC50BC90BCE0BCF0BD1-0BD60BD8-0BE50BFB-0C000C040C0D0C110C290C340C3A-0C3C0C450C490C4E-0C540C570C5A-0C5F0C640C650C70-0C770C800C810C840C8D0C910CA90CB40CBA0CBB0CC50CC90CCE-0CD40CD7-0CDD0CDF0CE40CE50CF00CF3-0D010D040D0D0D110D290D3A-0D3C0D450D490D4E-0D560D58-0D5F0D640D650D76-0D780D800D810D840D97-0D990DB20DBC0DBE0DBF0DC7-0DC90DCB-0DCE0DD50DD70DE0-0DF10DF5-0E000E3B-0E3E0E5C-0E800E830E850E860E890E8B0E8C0E8E-0E930E980EA00EA40EA60EA80EA90EAC0EBA0EBE0EBF0EC50EC70ECE0ECF0EDA0EDB0EDE-0EFF0F480F6D-0F700F8C-0F8F0F980FBD0FCD0FD9-0FFF10C6-10CF10FD-10FF1249124E124F12571259125E125F1289128E128F12B112B612B712BF12C112C612C712D7131113161317135B-135E137D-137F139A-139F13F5-13FF169D-169F16F1-16FF170D1715-171F1737-173F1754-175F176D17711774-177F17DE17DF17EA-17EF17FA-17FF180F181A-181F1878-187F18AB-18AF18F6-18FF191D-191F192C-192F193C-193F1941-1943196E196F1975-197F19AC-19AF19CA-19CF19DB-19DD1A1C1A1D1A5F1A7D1A7E1A8A-1A8F1A9A-1A9F1AAE-1AFF1B4C-1B4F1B7D-1B7F1BAB-1BAD1BBA-1BFF1C38-1C3A1C4A-1C4C1C80-1CCF1CF3-1CFF1DE7-1DFC1F161F171F1E1F1F1F461F471F4E1F4F1F581F5A1F5C1F5E1F7E1F7F1FB51FC51FD41FD51FDC1FF01FF11FF51FFF2065-206920722073208F2095-209F20B9-20CF20F1-20FF218A-218F23E9-23FF2427-243F244B-245F26CE26E226E4-26E727002705270A270B2728274C274E2753-2755275F27602795-279727B027BF27CB27CD-27CF2B4D-2B4F2B5A-2BFF2C2F2C5F2CF2-2CF82D26-2D2F2D66-2D6E2D70-2D7F2D97-2D9F2DA72DAF2DB72DBF2DC72DCF2DD72DDF2E32-2E7F2E9A2EF4-2EFF2FD6-2FEF2FFC-2FFF3040309730983100-3104312E-3130318F31B8-31BF31E4-31EF321F32FF4DB6-4DBF9FCC-9FFFA48D-A48FA4C7-A4CFA62C-A63FA660A661A674-A67BA698-A69FA6F8-A6FFA78D-A7FAA82C-A82FA83A-A83FA878-A87FA8C5-A8CDA8DA-A8DFA8FC-A8FFA954-A95EA97D-A97FA9CEA9DA-A9DDA9E0-A9FFAA37-AA3FAA4EAA4FAA5AAA5BAA7C-AA7FAAC3-AADAAAE0-ABBFABEEABEFABFA-ABFFD7A4-D7AFD7C7-D7CAD7FC-D7FFFA2EFA2FFA6EFA6FFADA-FAFFFB07-FB12FB18-FB1CFB37FB3DFB3FFB42FB45FBB2-FBD2FD40-FD4FFD90FD91FDC8-FDEFFDFEFDFFFE1A-FE1FFE27-FE2FFE53FE67FE6C-FE6FFE75FEFDFEFEFF00FFBF-FFC1FFC8FFC9FFD0FFD1FFD8FFD9FFDD-FFDFFFE7FFEF-FFF8FFFEFFFF"})}),ace.define("ace/mode/text",["require","exports","module","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour/cstyle","ace/unicode","ace/lib/lang","ace/token_iterator","ace/range"],function(e,t,n){"use strict";var r=e("../tokenizer").Tokenizer,i=e("./text_highlight_rules").TextHighlightRules,s=e("./behaviour/cstyle").CstyleBehaviour,o=e("../unicode"),u=e("../lib/lang"),a=e("../token_iterator").TokenIterator,f=e("../range").Range,l=function(){this.HighlightRules=i};(function(){this.$defaultBehaviour=new s,this.tokenRe=new RegExp("^["+o.packages.L+o.packages.Mn+o.packages.Mc+o.packages.Nd+o.packages.Pc+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+o.packages.L+o.packages.Mn+o.packages.Mc+o.packages.Nd+o.packages.Pc+"\\$_]|\\s])+","g"),this.getTokenizer=function(){return this.$tokenizer||(this.$highlightRules=this.$highlightRules||new this.HighlightRules(this.$highlightRuleConfig),this.$tokenizer=new r(this.$highlightRules.getRules())),this.$tokenizer},this.lineCommentStart="",this.blockComment="",this.toggleCommentLines=function(e,t,n,r){function w(e){for(var t=n;t<=r;t++)e(i.getLine(t),t)}var i=t.doc,s=!0,o=!0,a=Infinity,f=t.getTabSize(),l=!1;if(!this.lineCommentStart){if(!this.blockComment)return!1;var c=this.blockComment.start,h=this.blockComment.end,p=new RegExp("^(\\s*)(?:"+u.escapeRegExp(c)+")"),d=new RegExp("(?:"+u.escapeRegExp(h)+")\\s*$"),v=function(e,t){if(g(e,t))return;if(!s||/\S/.test(e))i.insertInLine({row:t,column:e.length},h),i.insertInLine({row:t,column:a},c)},m=function(e,t){var n;(n=e.match(d))&&i.removeInLine(t,e.length-n[0].length,e.length),(n=e.match(p))&&i.removeInLine(t,n[1].length,n[0].length)},g=function(e,n){if(p.test(e))return!0;var r=t.getTokens(n);for(var i=0;i<r.length;i++)if(r[i].type==="comment")return!0}}else{if(Array.isArray(this.lineCommentStart))var p=this.lineCommentStart.map(u.escapeRegExp).join("|"),c=this.lineCommentStart[0];else var p=u.escapeRegExp(this.lineCommentStart),c=this.lineCommentStart;p=new RegExp("^(\\s*)(?:"+p+") ?"),l=t.getUseSoftTabs();var m=function(e,t){var n=e.match(p);if(!n)return;var r=n[1].length,s=n[0].length;!b(e,r,s)&&n[0][s-1]==" "&&s--,i.removeInLine(t,r,s)},y=c+" ",v=function(e,t){if(!s||/\S/.test(e))b(e,a,a)?i.insertInLine({row:t,column:a},y):i.insertInLine({row:t,column:a},c)},g=function(e,t){return p.test(e)},b=function(e,t,n){var r=0;while(t--&&e.charAt(t)==" ")r++;if(r%f!=0)return!1;var r=0;while(e.charAt(n++)==" ")r++;return f>2?r%f!=f-1:r%f==0}}var E=Infinity;w(function(e,t){var n=e.search(/\S/);n!==-1?(n<a&&(a=n),o&&!g(e,t)&&(o=!1)):E>e.length&&(E=e.length)}),a==Infinity&&(a=E,s=!1,o=!1),l&&a%f!=0&&(a=Math.floor(a/f)*f),w(o?m:v)},this.toggleBlockComment=function(e,t,n,r){var i=this.blockComment;if(!i)return;!i.start&&i[0]&&(i=i[0]);var s=new a(t,r.row,r.column),o=s.getCurrentToken(),u=t.selection,l=t.selection.toOrientedRange(),c,h;if(o&&/comment/.test(o.type)){var p,d;while(o&&/comment/.test(o.type)){var v=o.value.indexOf(i.start);if(v!=-1){var m=s.getCurrentTokenRow(),g=s.getCurrentTokenColumn()+v;p=new f(m,g,m,g+i.start.length);break}o=s.stepBackward()}var s=new a(t,r.row,r.column),o=s.getCurrentToken();while(o&&/comment/.test(o.type)){var v=o.value.indexOf(i.end);if(v!=-1){var m=s.getCurrentTokenRow(),g=s.getCurrentTokenColumn()+v;d=new f(m,g,m,g+i.end.length);break}o=s.stepForward()}d&&t.remove(d),p&&(t.remove(p),c=p.start.row,h=-i.start.length)}else h=i.start.length,c=n.start.row,t.insert(n.end,i.end),t.insert(n.start,i.start);l.start.row==c&&(l.start.column+=h),l.end.row==c&&(l.end.column+=h),t.selection.fromOrientedRange(l)},this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.autoOutdent=function(e,t,n){},this.$getIndent=function(e){return e.match(/^\s*/)[0]},this.createWorker=function(e){return null},this.createModeDelegates=function(e){this.$embeds=[],this.$modes={};for(var t in e)e[t]&&(this.$embeds.push(t),this.$modes[t]=new e[t]);var n=["toggleBlockComment","toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction","getCompletions"];for(var t=0;t<n.length;t++)(function(e){var r=n[t],i=e[r];e[n[t]]=function(){return this.$delegator(r,arguments,i)}})(this)},this.$delegator=function(e,t,n){var r=t[0];typeof r!="string"&&(r=r[0]);for(var i=0;i<this.$embeds.length;i++){if(!this.$modes[this.$embeds[i]])continue;var s=r.split(this.$embeds[i]);if(!s[0]&&s[1]){t[0]=s[1];var o=this.$modes[this.$embeds[i]];return o[e].apply(o,t)}}var u=n.apply(this,t);return n?u:undefined},this.transformAction=function(e,t,n,r,i){if(this.$behaviour){var s=this.$behaviour.getBehaviours();for(var o in s)if(s[o][t]){var u=s[o][t].apply(this,arguments);if(u)return u}}},this.getKeywords=function(e){if(!this.completionKeywords){var t=this.$tokenizer.rules,n=[];for(var r in t){var i=t[r];for(var s=0,o=i.length;s<o;s++)if(typeof i[s].token=="string")/keyword|support|storage/.test(i[s].token)&&n.push(i[s].regex);else if(typeof i[s].token=="object")for(var u=0,a=i[s].token.length;u<a;u++)if(/keyword|support|storage/.test(i[s].token[u])){var r=i[s].regex.match(/\(.+?\)/g)[u];n.push(r.substr(1,r.length-2))}}this.completionKeywords=n}return e?n.concat(this.$keywordList||[]):this.$keywordList},this.$createKeywordList=function(){return this.$highlightRules||this.getTokenizer(),this.$keywordList=this.$highlightRules.$keywordList||[]},this.getCompletions=function(e,t,n,r){var i=this.$keywordList||this.$createKeywordList();return i.map(function(e){return{name:e,value:e,score:0,meta:"keyword"}})},this.$id="ace/mode/text"}).call(l.prototype),t.Mode=l}),ace.define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),ace.define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),ace.define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4&&this.$splitAndapplyLargeDelta(e,2e4),i(this.$lines,e,t),this._signal("change",e)},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length,i=e.start.row,s=e.start.column,o=0,u=0;do{o=u,u+=t-1;var a=n.slice(o,u);if(u>r){e.lines=a,e.start.row=i+o,e.start.column=s;break}a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}while(!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:n[s-1].length}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),ace.define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=function(e,t){this.running=!1,this.lines=[],this.states=[],this.currentLine=0,this.tokenizer=e;var n=this;this.$worker=function(){if(!n.running)return;var e=new Date,t=n.currentLine,r=-1,i=n.doc,s=t;while(n.lines[t])t++;var o=i.getLength(),u=0;n.running=!1;while(t<o){n.$tokenizeRow(t),r=t;do t++;while(n.lines[t]);u++;if(u%5===0&&new Date-e>20){n.running=setTimeout(n.$worker,20);break}}n.currentLine=t,r==-1&&(r=t),s<=r&&n.fireUpdateEvent(s,r)}};(function(){r.implement(this,i),this.setTokenizer=function(e){this.tokenizer=e,this.lines=[],this.states=[],this.start(0)},this.setDocument=function(e){this.doc=e,this.lines=[],this.states=[],this.stop()},this.fireUpdateEvent=function(e,t){var n={first:e,last:t};this._signal("update",{data:n})},this.start=function(e){this.currentLine=Math.min(e||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.states.splice(this.currentLine,this.states.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.scheduleStart=function(){this.running||(this.running=setTimeout(this.$worker,700))},this.$updateOnChange=function(e){var t=e.start.row,n=e.end.row-t;if(n===0)this.lines[t]=null;else if(e.action=="remove")this.lines.splice(t,n+1,null),this.states.splice(t,n+1,null);else{var r=Array(n+1);r.unshift(t,1),this.lines.splice.apply(this.lines,r),this.states.splice.apply(this.states,r)}this.currentLine=Math.min(t,this.currentLine,this.doc.getLength()),this.stop()},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(e){return this.lines[e]||this.$tokenizeRow(e)},this.getState=function(e){return this.currentLine==e&&this.$tokenizeRow(e),this.states[e]||"start"},this.$tokenizeRow=function(e){var t=this.doc.getLine(e),n=this.states[e-1],r=this.tokenizer.getLineTokens(t,n,e);return this.states[e]+""!=r.state+""?(this.states[e]=r.state,this.lines[e+1]=null,this.currentLine>e+1&&(this.currentLine=e+1)):this.currentLine==e&&(this.currentLine=e+1),this.lines[e]=r.tokens}}).call(s.prototype),t.BackgroundTokenizer=s}),ace.define("ace/search_highlight",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(e,t,n){"use strict";var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./range").Range,o=function(e,t,n){this.setRegexp(e),this.clazz=t,this.type=n||"text"};(function(){this.MAX_RANGES=500,this.setRegexp=function(e){if(this.regExp+""==e+"")return;this.regExp=e,this.cache=[]},this.update=function(e,t,n,i){if(!this.regExp)return;var o=i.firstRow,u=i.lastRow;for(var a=o;a<=u;a++){var f=this.cache[a];f==null&&(f=r.getMatchOffsets(n.getLine(a),this.regExp),f.length>this.MAX_RANGES&&(f=f.slice(0,this.MAX_RANGES)),f=f.map(function(e){return new s(a,e.offset,a,e.offset+e.length)}),this.cache[a]=f.length?f:"");for(var l=f.length;l--;)t.drawSingleLineMarker(e,f[l].toScreenRange(n),this.clazz,i)}}}).call(o.prototype),t.SearchHighlight=o}),ace.define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(e,t,n){"use strict";function i(e,t){this.foldData=e,Array.isArray(t)?this.folds=t:t=this.folds=[t];var n=t[t.length-1];this.range=new r(t[0].start.row,t[0].start.column,n.end.row,n.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(e){e.setFoldLine(this)},this)}var r=e("../range").Range;(function(){this.shiftRow=function(e){this.start.row+=e,this.end.row+=e,this.folds.forEach(function(t){t.start.row+=e,t.end.row+=e})},this.addFold=function(e){if(e.sameRow){if(e.start.row<this.startRow||e.endRow>this.endRow)throw new Error("Can't add a fold to this FoldLine as it has no connection");this.folds.push(e),this.folds.sort(function(e,t){return-e.range.compareEnd(t.start.row,t.start.column)}),this.range.compareEnd(e.start.row,e.start.column)>0?(this.end.row=e.end.row,this.end.column=e.end.column):this.range.compareStart(e.end.row,e.end.column)<0&&(this.start.row=e.start.row,this.start.column=e.start.column)}else if(e.start.row==this.end.row)this.folds.push(e),this.end.row=e.end.row,this.end.column=e.end.column;else{if(e.end.row!=this.start.row)throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");this.folds.unshift(e),this.start.row=e.start.row,this.start.column=e.start.column}e.foldLine=this},this.containsRow=function(e){return e>=this.start.row&&e<=this.end.row},this.walk=function(e,t,n){var r=0,i=this.folds,s,o,u,a=!0;t==null&&(t=this.end.row,n=this.end.column);for(var f=0;f<i.length;f++){s=i[f],o=s.range.compareStart(t,n);if(o==-1){e(null,t,n,r,a);return}u=e(null,s.start.row,s.start.column,r,a),u=!u&&e(s.placeholder,s.start.row,s.start.column,r);if(u||o===0)return;a=!s.sameRow,r=s.end.column}e(null,t,n,r,a)},this.getNextFoldTo=function(e,t){var n,r;for(var i=0;i<this.folds.length;i++){n=this.folds[i],r=n.range.compareEnd(e,t);if(r==-1)return{fold:n,kind:"after"};if(r===0)return{fold:n,kind:"inside"}}return null},this.addRemoveChars=function(e,t,n){var r=this.getNextFoldTo(e,t),i,s;if(r){i=r.fold;if(r.kind=="inside"&&i.start.column!=t&&i.start.row!=e)window.console&&window.console.log(e,t,i);else if(i.start.row==e){s=this.folds;var o=s.indexOf(i);o===0&&(this.start.column+=n);for(o;o<s.length;o++){i=s[o],i.start.column+=n;if(!i.sameRow)return;i.end.column+=n}this.end.column+=n}}},this.split=function(e,t){var n=this.getNextFoldTo(e,t);if(!n||n.kind=="inside")return null;var r=n.fold,s=this.folds,o=this.foldData,u=s.indexOf(r),a=s[u-1];this.end.row=a.end.row,this.end.column=a.end.column,s=s.splice(u,s.length-u);var f=new i(o,s);return o.splice(o.indexOf(this)+1,0,f),f},this.merge=function(e){var t=e.folds;for(var n=0;n<t.length;n++)this.addFold(t[n]);var r=this.foldData;r.splice(r.indexOf(e),1)},this.toString=function(){var e=[this.range.toString()+": ["];return this.folds.forEach(function(t){e.push("  "+t.toString())}),e.push("]"),e.join("\n")},this.idxToPosition=function(e){var t=0;for(var n=0;n<this.folds.length;n++){var r=this.folds[n];e-=r.start.column-t;if(e<0)return{row:r.start.row,column:r.start.column+e};e-=r.placeholder.length;if(e<0)return r.start;t=r.end.column}return{row:this.end.row,column:this.end.column+e}}}).call(i.prototype),t.FoldLine=i}),ace.define("ace/range_list",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("./range").Range,i=r.comparePoints,s=function(){this.ranges=[]};(function(){this.comparePoints=i,this.pointIndex=function(e,t,n){var r=this.ranges;for(var s=n||0;s<r.length;s++){var o=r[s],u=i(e,o.end);if(u>0)continue;var a=i(e,o.start);return u===0?t&&a!==0?-s-2:s:a>0||a===0&&!t?s:-s-1}return-s-1},this.add=function(e){var t=!e.isEmpty(),n=this.pointIndex(e.start,t);n<0&&(n=-n-1);var r=this.pointIndex(e.end,t,n);return r<0?r=-r-1:r++,this.ranges.splice(n,r-n,e)},this.addList=function(e){var t=[];for(var n=e.length;n--;)t.push.apply(t,this.add(e[n]));return t},this.substractPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges.splice(t,1)},this.merge=function(){var e=[],t=this.ranges;t=t.sort(function(e,t){return i(e.start,t.start)});var n=t[0],r;for(var s=1;s<t.length;s++){r=n,n=t[s];var o=i(r.end,n.start);if(o<0)continue;if(o==0&&!r.isEmpty()&&!n.isEmpty())continue;i(r.end,n.end)<0&&(r.end.row=n.end.row,r.end.column=n.end.column),t.splice(s,1),e.push(n),n=r,s--}return this.ranges=t,e},this.contains=function(e,t){return this.pointIndex({row:e,column:t})>=0},this.containsPoint=function(e){return this.pointIndex(e)>=0},this.rangeAtPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges[t]},this.clipRows=function(e,t){var n=this.ranges;if(n[0].start.row>t||n[n.length-1].start.row<e)return[];var r=this.pointIndex({row:e,column:0});r<0&&(r=-r-1);var i=this.pointIndex({row:t,column:0},r);i<0&&(i=-i-1);var s=[];for(var o=r;o<i;o++)s.push(n[o]);return s},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(e){this.session&&this.detach(),this.session=e,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){if(!this.session)return;this.session.removeListener("change",this.onChange),this.session=null},this.$onChange=function(e){if(e.action=="insert")var t=e.start,n=e.end;else var n=e.start,t=e.end;var r=t.row,i=n.row,s=i-r,o=-t.column+n.column,u=this.ranges;for(var a=0,f=u.length;a<f;a++){var l=u[a];if(l.end.row<r)continue;if(l.start.row>r)break;l.start.row==r&&l.start.column>=t.column&&(l.start.column!=t.column||!this.$insertRight)&&(l.start.column+=o,l.start.row+=s);if(l.end.row==r&&l.end.column>=t.column){if(l.end.column==t.column&&this.$insertRight)continue;l.end.column==t.column&&o>0&&a<f-1&&l.end.column>l.start.column&&l.end.column==u[a+1].start.column&&(l.end.column-=o),l.end.column+=o,l.end.row+=s}}if(s!=0&&a<f)for(;a<f;a++){var l=u[a];l.start.row+=s,l.end.row+=s}}}).call(s.prototype),t.RangeList=s}),ace.define("ace/edit_session/fold",["require","exports","module","ace/range","ace/range_list","ace/lib/oop"],function(e,t,n){"use strict";function u(e,t){e.row-=t.row,e.row==0&&(e.column-=t.column)}function a(e,t){u(e.start,t),u(e.end,t)}function f(e,t){e.row==0&&(e.column+=t.column),e.row+=t.row}function l(e,t){f(e.start,t),f(e.end,t)}var r=e("../range").Range,i=e("../range_list").RangeList,s=e("../lib/oop"),o=t.Fold=function(e,t){this.foldLine=null,this.placeholder=t,this.range=e,this.start=e.start,this.end=e.end,this.sameRow=e.start.row==e.end.row,this.subFolds=this.ranges=[]};s.inherits(o,i),function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(e){this.foldLine=e,this.subFolds.forEach(function(t){t.setFoldLine(e)})},this.clone=function(){var e=this.range.clone(),t=new o(e,this.placeholder);return this.subFolds.forEach(function(e){t.subFolds.push(e.clone())}),t.collapseChildren=this.collapseChildren,t},this.addSubFold=function(e){if(this.range.isEqual(e))return;if(!this.range.containsRange(e))throw new Error("A fold can't intersect already existing fold"+e.range+this.range);a(e,this.start);var t=e.start.row,n=e.start.column;for(var r=0,i=-1;r<this.subFolds.length;r++){i=this.subFolds[r].range.compare(t,n);if(i!=1)break}var s=this.subFolds[r];if(i==0)return s.addSubFold(e);var t=e.range.end.row,n=e.range.end.column;for(var o=r,i=-1;o<this.subFolds.length;o++){i=this.subFolds[o].range.compare(t,n);if(i!=1)break}var u=this.subFolds[o];if(i==0)throw new Error("A fold can't intersect already existing fold"+e.range+this.range);var f=this.subFolds.splice(r,o-r,e);return e.setFoldLine(this.foldLine),e},this.restoreRange=function(e){return l(e,this.start)}}.call(o.prototype)}),ace.define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(e,t,n){"use strict";function u(){this.getFoldAt=function(e,t,n){var r=this.getFoldLine(e);if(!r)return null;var i=r.folds;for(var s=0;s<i.length;s++){var o=i[s];if(o.range.contains(e,t)){if(n==1&&o.range.isEnd(e,t))continue;if(n==-1&&o.range.isStart(e,t))continue;return o}}},this.getFoldsInRange=function(e){var t=e.start,n=e.end,r=this.$foldData,i=[];t.column+=1,n.column-=1;for(var s=0;s<r.length;s++){var o=r[s].range.compareRange(e);if(o==2)continue;if(o==-2)break;var u=r[s].folds;for(var a=0;a<u.length;a++){var f=u[a];o=f.range.compareRange(e);if(o==-2)break;if(o==2)continue;if(o==42)break;i.push(f)}}return t.column-=1,n.column+=1,i},this.getFoldsInRangeList=function(e){if(Array.isArray(e)){var t=[];e.forEach(function(e){t=t.concat(this.getFoldsInRange(e))},this)}else var t=this.getFoldsInRange(e);return t},this.getAllFolds=function(){var e=[],t=this.$foldData;for(var n=0;n<t.length;n++)for(var r=0;r<t[n].folds.length;r++)e.push(t[n].folds[r]);return e},this.getFoldStringAt=function(e,t,n,r){r=r||this.getFoldLine(e);if(!r)return null;var i={end:{column:0}},s,o;for(var u=0;u<r.folds.length;u++){o=r.folds[u];var a=o.range.compareEnd(e,t);if(a==-1){s=this.getLine(o.start.row).substring(i.end.column,o.start.column);break}if(a===0)return null;i=o}return s||(s=this.getLine(o.start.row).substring(i.end.column)),n==-1?s.substring(0,t-i.end.column):n==1?s.substring(t-i.end.column):s},this.getFoldLine=function(e,t){var n=this.$foldData,r=0;t&&(r=n.indexOf(t)),r==-1&&(r=0);for(r;r<n.length;r++){var i=n[r];if(i.start.row<=e&&i.end.row>=e)return i;if(i.end.row>e)return null}return null},this.getNextFoldLine=function(e,t){var n=this.$foldData,r=0;t&&(r=n.indexOf(t)),r==-1&&(r=0);for(r;r<n.length;r++){var i=n[r];if(i.end.row>=e)return i}return null},this.getFoldedRowCount=function(e,t){var n=this.$foldData,r=t-e+1;for(var i=0;i<n.length;i++){var s=n[i],o=s.end.row,u=s.start.row;if(o>=t){u<t&&(u>=e?r-=t-u:r=0);break}o>=e&&(u>=e?r-=o-u:r-=o-e+1)}return r},this.$addFoldLine=function(e){return this.$foldData.push(e),this.$foldData.sort(function(e,t){return e.start.row-t.start.row}),e},this.addFold=function(e,t){var n=this.$foldData,r=!1,o;e instanceof s?o=e:(o=new s(t,e),o.collapseChildren=t.collapseChildren),this.$clipRangeToDocument(o.range);var u=o.start.row,a=o.start.column,f=o.end.row,l=o.end.column;if(u<f||u==f&&a<=l-2){var c=this.getFoldAt(u,a,1),h=this.getFoldAt(f,l,-1);if(c&&h==c)return c.addSubFold(o);c&&!c.range.isStart(u,a)&&this.removeFold(c),h&&!h.range.isEnd(f,l)&&this.removeFold(h);var p=this.getFoldsInRange(o.range);p.length>0&&(this.removeFolds(p),p.forEach(function(e){o.addSubFold(e)}));for(var d=0;d<n.length;d++){var v=n[d];if(f==v.start.row){v.addFold(o),r=!0;break}if(u==v.end.row){v.addFold(o),r=!0;if(!o.sameRow){var m=n[d+1];if(m&&m.start.row==f){v.merge(m);break}}break}if(f<=v.start.row)break}return r||(v=this.$addFoldLine(new i(this.$foldData,o))),this.$useWrapMode?this.$updateWrapData(v.start.row,v.start.row):this.$updateRowLengthCache(v.start.row,v.start.row),this.$modified=!0,this._signal("changeFold",{data:o,action:"add"}),o}throw new Error("The range has to be at least 2 characters width")},this.addFolds=function(e){e.forEach(function(e){this.addFold(e)},this)},this.removeFold=function(e){var t=e.foldLine,n=t.start.row,r=t.end.row,i=this.$foldData,s=t.folds;if(s.length==1)i.splice(i.indexOf(t),1);else if(t.range.isEnd(e.end.row,e.end.column))s.pop(),t.end.row=s[s.length-1].end.row,t.end.column=s[s.length-1].end.column;else if(t.range.isStart(e.start.row,e.start.column))s.shift(),t.start.row=s[0].start.row,t.start.column=s[0].start.column;else if(e.sameRow)s.splice(s.indexOf(e),1);else{var o=t.split(e.start.row,e.start.column);s=o.folds,s.shift(),o.start.row=s[0].start.row,o.start.column=s[0].start.column}this.$updating||(this.$useWrapMode?this.$updateWrapData(n,r):this.$updateRowLengthCache(n,r)),this.$modified=!0,this._signal("changeFold",{data:e,action:"remove"})},this.removeFolds=function(e){var t=[];for(var n=0;n<e.length;n++)t.push(e[n]);t.forEach(function(e){this.removeFold(e)},this),this.$modified=!0},this.expandFold=function(e){this.removeFold(e),e.subFolds.forEach(function(t){e.restoreRange(t),this.addFold(t)},this),e.collapseChildren>0&&this.foldAll(e.start.row+1,e.end.row,e.collapseChildren-1),e.subFolds=[]},this.expandFolds=function(e){e.forEach(function(e){this.expandFold(e)},this)},this.unfold=function(e,t){var n,i;e==null?(n=new r(0,0,this.getLength(),0),t=!0):typeof e=="number"?n=new r(e,0,e,this.getLine(e).length):"row"in e?n=r.fromPoints(e,e):n=e,i=this.getFoldsInRangeList(n);if(t)this.removeFolds(i);else{var s=i;while(s.length)this.expandFolds(s),s=this.getFoldsInRangeList(n)}if(i.length)return i},this.isRowFolded=function(e,t){return!!this.getFoldLine(e,t)},this.getRowFoldEnd=function(e,t){var n=this.getFoldLine(e,t);return n?n.end.row:e},this.getRowFoldStart=function(e,t){var n=this.getFoldLine(e,t);return n?n.start.row:e},this.getFoldDisplayLine=function(e,t,n,r,i){r==null&&(r=e.start.row),i==null&&(i=0),t==null&&(t=e.end.row),n==null&&(n=this.getLine(t).length);var s=this.doc,o="";return e.walk(function(e,t,n,u){if(t<r)return;if(t==r){if(n<i)return;u=Math.max(i,u)}e!=null?o+=e:o+=s.getLine(t).substring(u,n)},t,n),o},this.getDisplayLine=function(e,t,n,r){var i=this.getFoldLine(e);if(!i){var s;return s=this.doc.getLine(e),s.substring(r||0,t||s.length)}return this.getFoldDisplayLine(i,e,t,n,r)},this.$cloneFoldData=function(){var e=[];return e=this.$foldData.map(function(t){var n=t.folds.map(function(e){return e.clone()});return new i(e,n)}),e},this.toggleFold=function(e){var t=this.selection,n=t.getRange(),r,i;if(n.isEmpty()){var s=n.start;r=this.getFoldAt(s.row,s.column);if(r){this.expandFold(r);return}(i=this.findMatchingBracket(s))?n.comparePoint(i)==1?n.end=i:(n.start=i,n.start.column++,n.end.column--):(i=this.findMatchingBracket({row:s.row,column:s.column+1}))?(n.comparePoint(i)==1?n.end=i:n.start=i,n.start.column++):n=this.getCommentFoldRange(s.row,s.column)||n}else{var o=this.getFoldsInRange(n);if(e&&o.length){this.expandFolds(o);return}o.length==1&&(r=o[0])}r||(r=this.getFoldAt(n.start.row,n.start.column));if(r&&r.range.toString()==n.toString()){this.expandFold(r);return}var u="...";if(!n.isMultiLine()){u=this.getTextRange(n);if(u.length<4)return;u=u.trim().substring(0,2)+".."}this.addFold(u,n)},this.getCommentFoldRange=function(e,t,n){var i=new o(this,e,t),s=i.getCurrentToken(),u=s.type;if(s&&/^comment|string/.test(u)){u=u.match(/comment|string/)[0],u=="comment"&&(u+="|doc-start");var a=new RegExp(u),f=new r;if(n!=1){do s=i.stepBackward();while(s&&a.test(s.type));i.stepForward()}f.start.row=i.getCurrentTokenRow(),f.start.column=i.getCurrentTokenColumn()+2,i=new o(this,e,t);if(n!=-1){var l=-1;do{s=i.stepForward();if(l==-1){var c=this.getState(i.$row);a.test(c)||(l=i.$row)}else if(i.$row>l)break}while(s&&a.test(s.type));s=i.stepBackward()}else s=i.getCurrentToken();return f.end.row=i.getCurrentTokenRow(),f.end.column=i.getCurrentTokenColumn()+s.value.length-2,f}},this.foldAll=function(e,t,n){n==undefined&&(n=1e5);var r=this.foldWidgets;if(!r)return;t=t||this.getLength(),e=e||0;for(var i=e;i<t;i++){r[i]==null&&(r[i]=this.getFoldWidget(i));if(r[i]!="start")continue;var s=this.getFoldWidgetRange(i);if(s&&s.isMultiLine()&&s.end.row<=t&&s.start.row>=e){i=s.end.row;try{var o=this.addFold("...",s);o&&(o.collapseChildren=n)}catch(u){}}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(e){if(!this.$foldStyles[e])throw new Error("invalid fold style: "+e+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==e)return;this.$foldStyle=e,e=="manual"&&this.unfold();var t=this.$foldMode;this.$setFolding(null),this.$setFolding(t)},this.$setFolding=function(e){if(this.$foldMode==e)return;this.$foldMode=e,this.off("change",this.$updateFoldWidgets),this.off("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets),this._signal("changeAnnotation");if(!e||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=e.getFoldWidget.bind(e,this,this.$foldStyle),this.getFoldWidgetRange=e.getFoldWidgetRange.bind(e,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.$tokenizerUpdateFoldWidgets=this.tokenizerUpdateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets),this.on("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets)},this.getParentFoldRangeData=function(e,t){var n=this.foldWidgets;if(!n||t&&n[e])return{};var r=e-1,i;while(r>=0){var s=n[r];s==null&&(s=n[r]=this.getFoldWidget(r));if(s=="start"){var o=this.getFoldWidgetRange(r);i||(i=o);if(o&&o.end.row>=e)break}r--}return{range:r!==-1&&o,firstRange:i}},this.onFoldWidgetClick=function(e,t){t=t.domEvent;var n={children:t.shiftKey,all:t.ctrlKey||t.metaKey,siblings:t.altKey},r=this.$toggleFoldWidget(e,n);if(!r){var i=t.target||t.srcElement;i&&/ace_fold-widget/.test(i.className)&&(i.className+=" ace_invalid")}},this.$toggleFoldWidget=function(e,t){if(!this.getFoldWidget)return;var n=this.getFoldWidget(e),r=this.getLine(e),i=n==="end"?-1:1,s=this.getFoldAt(e,i===-1?0:r.length,i);if(s)return t.children||t.all?this.removeFold(s):this.expandFold(s),s;var o=this.getFoldWidgetRange(e,!0);if(o&&!o.isMultiLine()){s=this.getFoldAt(o.start.row,o.start.column,1);if(s&&o.isEqual(s.range))return this.removeFold(s),s}if(t.siblings){var u=this.getParentFoldRangeData(e);if(u.range)var a=u.range.start.row+1,f=u.range.end.row;this.foldAll(a,f,t.all?1e4:0)}else t.children?(f=o?o.end.row:this.getLength(),this.foldAll(e+1,f,t.all?1e4:0)):o&&(t.all&&(o.collapseChildren=1e4),this.addFold("...",o));return o},this.toggleFoldWidget=function(e){var t=this.selection.getCursor().row;t=this.getRowFoldStart(t);var n=this.$toggleFoldWidget(t,{});if(n)return;var r=this.getParentFoldRangeData(t,!0);n=r.range||r.firstRange;if(n){t=n.start.row;var i=this.getFoldAt(t,this.getLine(t).length,1);i?this.removeFold(i):this.addFold("...",n)}},this.updateFoldWidgets=function(e){var t=e.start.row,n=e.end.row-t;if(n===0)this.foldWidgets[t]=null;else if(e.action=="remove")this.foldWidgets.splice(t,n+1,null);else{var r=Array(n+1);r.unshift(t,1),this.foldWidgets.splice.apply(this.foldWidgets,r)}},this.tokenizerUpdateFoldWidgets=function(e){var t=e.data;t.first!=t.last&&this.foldWidgets.length>t.first&&this.foldWidgets.splice(t.first,this.foldWidgets.length)}}var r=e("../range").Range,i=e("./fold_line").FoldLine,s=e("./fold").Fold,o=e("../token_iterator").TokenIterator;t.Folding=u}),ace.define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator","ace/range"],function(e,t,n){"use strict";function s(){this.findMatchingBracket=function(e,t){if(e.column==0)return null;var n=t||this.getLine(e.row).charAt(e.column-1);if(n=="")return null;var r=n.match(/([\(\[\{])|([\)\]\}])/);return r?r[1]?this.$findClosingBracket(r[1],e):this.$findOpeningBracket(r[2],e):null},this.getBracketRange=function(e){var t=this.getLine(e.row),n=!0,r,s=t.charAt(e.column-1),o=s&&s.match(/([\(\[\{])|([\)\]\}])/);o||(s=t.charAt(e.column),e={row:e.row,column:e.column+1},o=s&&s.match(/([\(\[\{])|([\)\]\}])/),n=!1);if(!o)return null;if(o[1]){var u=this.$findClosingBracket(o[1],e);if(!u)return null;r=i.fromPoints(e,u),n||(r.end.column++,r.start.column--),r.cursor=r.end}else{var u=this.$findOpeningBracket(o[2],e);if(!u)return null;r=i.fromPoints(u,e),n||(r.start.column++,r.end.column--),r.cursor=r.start}return r},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(e,t,n){var i=this.$brackets[e],s=1,o=new r(this,t.row,t.column),u=o.getCurrentToken();u||(u=o.stepForward());if(!u)return;n||(n=new RegExp("(\\.?"+u.type.replace(".","\\.").replace("rparen",".paren").replace(/\b(?:end)\b/,"(?:start|begin|end)")+")+"));var a=t.column-o.getCurrentTokenColumn()-2,f=u.value;for(;;){while(a>=0){var l=f.charAt(a);if(l==i){s-=1;if(s==0)return{row:o.getCurrentTokenRow(),column:a+o.getCurrentTokenColumn()}}else l==e&&(s+=1);a-=1}do u=o.stepBackward();while(u&&!n.test(u.type));if(u==null)break;f=u.value,a=f.length-1}return null},this.$findClosingBracket=function(e,t,n){var i=this.$brackets[e],s=1,o=new r(this,t.row,t.column),u=o.getCurrentToken();u||(u=o.stepForward());if(!u)return;n||(n=new RegExp("(\\.?"+u.type.replace(".","\\.").replace("lparen",".paren").replace(/\b(?:start|begin)\b/,"(?:start|begin|end)")+")+"));var a=t.column-o.getCurrentTokenColumn();for(;;){var f=u.value,l=f.length;while(a<l){var c=f.charAt(a);if(c==i){s-=1;if(s==0)return{row:o.getCurrentTokenRow(),column:a+o.getCurrentTokenColumn()}}else c==e&&(s+=1);a+=1}do u=o.stepForward();while(u&&!n.test(u.type));if(u==null)break;a=0}return null}}var r=e("../token_iterator").TokenIterator,i=e("../range").Range;t.BracketMatch=s}),ace.define("ace/edit_session",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/config","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/search_highlight","ace/edit_session/folding","ace/edit_session/bracket_match"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./config"),o=e("./lib/event_emitter").EventEmitter,u=e("./selection").Selection,a=e("./mode/text").Mode,f=e("./range").Range,l=e("./document").Document,c=e("./background_tokenizer").BackgroundTokenizer,h=e("./search_highlight").SearchHighlight,p=function(e,t){this.$breakpoints=[],this.$decorations=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$undoSelect=!0,this.$foldData=[],this.id="session"+ ++p.$uid,this.$foldData.toString=function(){return this.join("\n")},this.on("changeFold",this.onChangeFold.bind(this)),this.$onChange=this.onChange.bind(this);if(typeof e!="object"||!e.getLine)e=new l(e);this.setDocument(e),this.selection=new u(this),s.resetOptions(this),this.setMode(t),s._signal("session",this)};p.$uid=0,function(){function m(e){return e<4352?!1:e>=4352&&e<=4447||e>=4515&&e<=4519||e>=4602&&e<=4607||e>=9001&&e<=9002||e>=11904&&e<=11929||e>=11931&&e<=12019||e>=12032&&e<=12245||e>=12272&&e<=12283||e>=12288&&e<=12350||e>=12353&&e<=12438||e>=12441&&e<=12543||e>=12549&&e<=12589||e>=12593&&e<=12686||e>=12688&&e<=12730||e>=12736&&e<=12771||e>=12784&&e<=12830||e>=12832&&e<=12871||e>=12880&&e<=13054||e>=13056&&e<=19903||e>=19968&&e<=42124||e>=42128&&e<=42182||e>=43360&&e<=43388||e>=44032&&e<=55203||e>=55216&&e<=55238||e>=55243&&e<=55291||e>=63744&&e<=64255||e>=65040&&e<=65049||e>=65072&&e<=65106||e>=65108&&e<=65126||e>=65128&&e<=65131||e>=65281&&e<=65376||e>=65504&&e<=65510}r.implement(this,o),this.setDocument=function(e){this.doc&&this.doc.removeListener("change",this.$onChange),this.doc=e,e.on("change",this.$onChange),this.bgTokenizer&&this.bgTokenizer.setDocument(this.getDocument()),this.resetCaches()},this.getDocument=function(){return this.doc},this.$resetRowCache=function(e){if(!e){this.$docRowCache=[],this.$screenRowCache=[];return}var t=this.$docRowCache.length,n=this.$getRowCacheIndex(this.$docRowCache,e)+1;t>n&&(this.$docRowCache.splice(n,t),this.$screenRowCache.splice(n,t))},this.$getRowCacheIndex=function(e,t){var n=0,r=e.length-1;while(n<=r){var i=n+r>>1,s=e[i];if(t>s)n=i+1;else{if(!(t<s))return i;r=i-1}}return n-1},this.resetCaches=function(){this.$modified=!0,this.$wrapData=[],this.$rowLengthCache=[],this.$resetRowCache(0),this.bgTokenizer&&this.bgTokenizer.start(0)},this.onChangeFold=function(e){var t=e.data;this.$resetRowCache(t.start.row)},this.onChange=function(e){this.$modified=!0,this.$resetRowCache(e.start.row);var t=this.$updateInternalDataOnChange(e);!this.$fromUndo&&this.$undoManager&&!e.ignore&&(this.$deltasDoc.push(e),t&&t.length!=0&&this.$deltasFold.push({action:"removeFolds",folds:t}),this.$informUndoManager.schedule()),this.bgTokenizer&&this.bgTokenizer.$updateOnChange(e),this._signal("change",e)},this.setValue=function(e){this.doc.setValue(e),this.selection.moveTo(0,0),this.$resetRowCache(0),this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.setUndoManager(this.$undoManager),this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(e){return this.bgTokenizer.getState(e)},this.getTokens=function(e){return this.bgTokenizer.getTokens(e)},this.getTokenAt=function(e,t){var n=this.bgTokenizer.getTokens(e),r,i=0;if(t==null)s=n.length-1,i=this.getLine(e).length;else for(var s=0;s<n.length;s++){i+=n[s].value.length;if(i>=t)break}return r=n[s],r?(r.index=s,r.start=i-r.value.length,r):null},this.setUndoManager=function(e){this.$undoManager=e,this.$deltas=[],this.$deltasDoc=[],this.$deltasFold=[],this.$informUndoManager&&this.$informUndoManager.cancel();if(e){var t=this;this.$syncInformUndoManager=function(){t.$informUndoManager.cancel(),t.$deltasFold.length&&(t.$deltas.push({group:"fold",deltas:t.$deltasFold}),t.$deltasFold=[]),t.$deltasDoc.length&&(t.$deltas.push({group:"doc",deltas:t.$deltasDoc}),t.$deltasDoc=[]),t.$deltas.length>0&&e.execute({action:"aceupdate",args:[t.$deltas,t],merge:t.mergeUndoDeltas}),t.mergeUndoDeltas=!1,t.$deltas=[]},this.$informUndoManager=i.delayedCall(this.$syncInformUndoManager)}},this.markUndoGroup=function(){this.$syncInformUndoManager&&this.$syncInformUndoManager()},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?i.stringRepeat(" ",this.getTabSize()):"	"},this.setUseSoftTabs=function(e){this.setOption("useSoftTabs",e)},this.getUseSoftTabs=function(){return this.$useSoftTabs&&!this.$mode.$indentWithTabs},this.setTabSize=function(e){this.setOption("tabSize",e)},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(e){return this.$useSoftTabs&&e.column%this.$tabSize===0},this.setNavigateWithinSoftTabs=function(e){this.setOption("navigateWithinSoftTabs",e)},this.getNavigateWithinSoftTabs=function(){return this.$navigateWithinSoftTabs},this.$overwrite=!1,this.setOverwrite=function(e){this.setOption("overwrite",e)},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.addGutterDecoration=function(e,t){this.$decorations[e]||(this.$decorations[e]=""),this.$decorations[e]+=" "+t,this._signal("changeBreakpoint",{})},this.removeGutterDecoration=function(e,t){this.$decorations[e]=(this.$decorations[e]||"").replace(" "+t,""),this._signal("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(e){this.$breakpoints=[];for(var t=0;t<e.length;t++)this.$breakpoints[e[t]]="ace_breakpoint";this._signal("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._signal("changeBreakpoint",{})},this.setBreakpoint=function(e,t){t===undefined&&(t="ace_breakpoint"),t?this.$breakpoints[e]=t:delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.clearBreakpoint=function(e){delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.addMarker=function(e,t,n,r){var i=this.$markerId++,s={range:e,type:n||"line",renderer:typeof n=="function"?n:null,clazz:t,inFront:!!r,id:i};return r?(this.$frontMarkers[i]=s,this._signal("changeFrontMarker")):(this.$backMarkers[i]=s,this._signal("changeBackMarker")),i},this.addDynamicMarker=function(e,t){if(!e.update)return;var n=this.$markerId++;return e.id=n,e.inFront=!!t,t?(this.$frontMarkers[n]=e,this._signal("changeFrontMarker")):(this.$backMarkers[n]=e,this._signal("changeBackMarker")),e},this.removeMarker=function(e){var t=this.$frontMarkers[e]||this.$backMarkers[e];if(!t)return;var n=t.inFront?this.$frontMarkers:this.$backMarkers;t&&(delete n[e],this._signal(t.inFront?"changeFrontMarker":"changeBackMarker"))},this.getMarkers=function(e){return e?this.$frontMarkers:this.$backMarkers},this.highlight=function(e){if(!this.$searchHighlight){var t=new h(null,"ace_selected-word","text");this.$searchHighlight=this.addDynamicMarker(t)}this.$searchHighlight.setRegexp(e)},this.highlightLines=function(e,t,n,r){typeof t!="number"&&(n=t,t=e),n||(n="ace_step");var i=new f(e,0,t,Infinity);return i.id=this.addMarker(i,n,"fullLine",r),i},this.setAnnotations=function(e){this.$annotations=e,this._signal("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||[]},this.clearAnnotations=function(){this.setAnnotations([])},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r?\n)/m);t?this.$autoNewLine=t[1]:this.$autoNewLine="\n"},this.getWordRange=function(e,t){var n=this.getLine(e),r=!1;t>0&&(r=!!n.charAt(t-1).match(this.tokenRe)),r||(r=!!n.charAt(t).match(this.tokenRe));if(r)var i=this.tokenRe;else if(/^\s+$/.test(n.slice(t-1,t+1)))var i=/\s/;else var i=this.nonTokenRe;var s=t;if(s>0){do s--;while(s>=0&&n.charAt(s).match(i));s++}var o=t;while(o<n.length&&n.charAt(o).match(i))o++;return new f(e,s,e,o)},this.getAWordRange=function(e,t){var n=this.getWordRange(e,t),r=this.getLine(n.end.row);while(r.charAt(n.end.column).match(/[ \t]/))n.end.column+=1;return n},this.setNewLineMode=function(e){this.doc.setNewLineMode(e)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.setUseWorker=function(e){this.setOption("useWorker",e)},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(e){var t=e.data;this.bgTokenizer.start(t.first),this._signal("tokenizerUpdate",e)},this.$modes={},this.$mode=null,this.$modeId=null,this.setMode=function(e,t){if(e&&typeof e=="object"){if(e.getTokenizer)return this.$onChangeMode(e);var n=e,r=n.path}else r=e||"ace/mode/text";this.$modes["ace/mode/text"]||(this.$modes["ace/mode/text"]=new a);if(this.$modes[r]&&!n){this.$onChangeMode(this.$modes[r]),t&&t();return}this.$modeId=r,s.loadModule(["mode",r],function(e){if(this.$modeId!==r)return t&&t();this.$modes[r]&&!n?this.$onChangeMode(this.$modes[r]):e&&e.Mode&&(e=new e.Mode(n),n||(this.$modes[r]=e,e.$id=r),this.$onChangeMode(e)),t&&t()}.bind(this)),this.$mode||this.$onChangeMode(this.$modes["ace/mode/text"],!0)},this.$onChangeMode=function(e,t){t||(this.$modeId=e.$id);if(this.$mode===e)return;this.$mode=e,this.$stopWorker(),this.$useWorker&&this.$startWorker();var n=e.getTokenizer();if(n.addEventListener!==undefined){var r=this.onReloadTokenizer.bind(this);n.addEventListener("update",r)}if(!this.bgTokenizer){this.bgTokenizer=new c(n);var i=this;this.bgTokenizer.addEventListener("update",function(e){i._signal("tokenizerUpdate",e)})}else this.bgTokenizer.setTokenizer(n);this.bgTokenizer.setDocument(this.getDocument()),this.tokenRe=e.tokenRe,this.nonTokenRe=e.nonTokenRe,t||(e.attachToSession&&e.attachToSession(this),this.$options.wrapMethod.set.call(this,this.$wrapMethod),this.$setFolding(e.foldingRules),this.bgTokenizer.start(0),this._emit("changeMode"))},this.$stopWorker=function(){this.$worker&&(this.$worker.terminate(),this.$worker=null)},this.$startWorker=function(){try{this.$worker=this.$mode.createWorker(this)}catch(e){s.warn("Could not load worker",e),this.$worker=null}},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(e){if(this.$scrollTop===e||isNaN(e))return;this.$scrollTop=e,this._signal("changeScrollTop",e)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(e){if(this.$scrollLeft===e||isNaN(e))return;this.$scrollLeft=e,this._signal("changeScrollLeft",e)},this.getScrollLeft=function(){return this.$scrollLeft},this.getScreenWidth=function(){return this.$computeWidth(),this.lineWidgets?Math.max(this.getLineWidgetMaxWidth(),this.screenWidth):this.screenWidth},this.getLineWidgetMaxWidth=function(){if(this.lineWidgetsWidth!=null)return this.lineWidgetsWidth;var e=0;return this.lineWidgets.forEach(function(t){t&&t.screenWidth>e&&(e=t.screenWidth)}),this.lineWidgetWidth=e},this.$computeWidth=function(e){if(this.$modified||e){this.$modified=!1;if(this.$useWrapMode)return this.screenWidth=this.$wrapLimit;var t=this.doc.getAllLines(),n=this.$rowLengthCache,r=0,i=0,s=this.$foldData[i],o=s?s.start.row:Infinity,u=t.length;for(var a=0;a<u;a++){if(a>o){a=s.end.row+1;if(a>=u)break;s=this.$foldData[i++],o=s?s.start.row:Infinity}n[a]==null&&(n[a]=this.$getStringScreenWidth(t[a])[0]),n[a]>r&&(r=n[a])}this.screenWidth=r}},this.getLine=function(e){return this.doc.getLine(e)},this.getLines=function(e,t){return this.doc.getLines(e,t)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(e){return this.doc.getTextRange(e||this.selection.getRange())},this.insert=function(e,t){return this.doc.insert(e,t)},this.remove=function(e){return this.doc.remove(e)},this.removeFullLines=function(e,t){return this.doc.removeFullLines(e,t)},this.undoChanges=function(e,t){if(!e.length)return;this.$fromUndo=!0;var n=null;for(var r=e.length-1;r!=-1;r--){var i=e[r];i.group=="doc"?(this.doc.revertDeltas(i.deltas),n=this.$getUndoSelection(i.deltas,!0,n)):i.deltas.forEach(function(e){this.addFolds(e.folds)},this)}return this.$fromUndo=!1,n&&this.$undoSelect&&!t&&this.selection.setSelectionRange(n),n},this.redoChanges=function(e,t){if(!e.length)return;this.$fromUndo=!0;var n=null;for(var r=0;r<e.length;r++){var i=e[r];i.group=="doc"&&(this.doc.applyDeltas(i.deltas),n=this.$getUndoSelection(i.deltas,!1,n))}return this.$fromUndo=!1,n&&this.$undoSelect&&!t&&this.selection.setSelectionRange(n),n},this.setUndoSelect=function(e){this.$undoSelect=e},this.$getUndoSelection=function(e,t,n){function r(e){return t?e.action!=="insert":e.action==="insert"}var i=e[0],s,o,u=!1;r(i)?(s=f.fromPoints(i.start,i.end),u=!0):(s=f.fromPoints(i.start,i.start),u=!1);for(var a=1;a<e.length;a++)i=e[a],r(i)?(o=i.start,s.compare(o.row,o.column)==-1&&s.setStart(o),o=i.end,s.compare(o.row,o.column)==1&&s.setEnd(o),u=!0):(o=i.start,s.compare(o.row,o.column)==-1&&(s=f.fromPoints(i.start,i.start)),u=!1);if(n!=null){f.comparePoints(n.start,s.start)===0&&(n.start.column+=s.end.column-s.start.column,n.end.column+=s.end.column-s.start.column);var l=n.compareRange(s);l==1?s.setStart(n.start):l==-1&&s.setEnd(n.end)}return s},this.replace=function(e,t){return this.doc.replace(e,t)},this.moveText=function(e,t,n){var r=this.getTextRange(e),i=this.getFoldsInRange(e),s=f.fromPoints(t,t);if(!n){this.remove(e);var o=e.start.row-e.end.row,u=o?-e.end.column:e.start.column-e.end.column;u&&(s.start.row==e.end.row&&s.start.column>e.end.column&&(s.start.column+=u),s.end.row==e.end.row&&s.end.column>e.end.column&&(s.end.column+=u)),o&&s.start.row>=e.end.row&&(s.start.row+=o,s.end.row+=o)}s.end=this.insert(s.start,r);if(i.length){var a=e.start,l=s.start,o=l.row-a.row,u=l.column-a.column;this.addFolds(i.map(function(e){return e=e.clone(),e.start.row==a.row&&(e.start.column+=u),e.end.row==a.row&&(e.end.column+=u),e.start.row+=o,e.end.row+=o,e}))}return s},this.indentRows=function(e,t,n){n=n.replace(/\t/g,this.getTabString());for(var r=e;r<=t;r++)this.doc.insertInLine({row:r,column:0},n)},this.outdentRows=function(e){var t=e.collapseRows(),n=new f(0,0,0,0),r=this.getTabSize();for(var i=t.start.row;i<=t.end.row;++i){var s=this.getLine(i);n.start.row=i,n.end.row=i;for(var o=0;o<r;++o)if(s.charAt(o)!=" ")break;o<r&&s.charAt(o)=="	"?(n.start.column=o,n.end.column=o+1):(n.start.column=0,n.end.column=o),this.remove(n)}},this.$moveLines=function(e,t,n){e=this.getRowFoldStart(e),t=this.getRowFoldEnd(t);if(n<0){var r=this.getRowFoldStart(e+n);if(r<0)return 0;var i=r-e}else if(n>0){var r=this.getRowFoldEnd(t+n);if(r>this.doc.getLength()-1)return 0;var i=r-t}else{e=this.$clipRowToDocument(e),t=this.$clipRowToDocument(t);var i=t-e+1}var s=new f(e,0,t,Number.MAX_VALUE),o=this.getFoldsInRange(s).map(function(e){return e=e.clone(),e.start.row+=i,e.end.row+=i,e}),u=n==0?this.doc.getLines(e,t):this.doc.removeFullLines(e,t);return this.doc.insertFullLines(e+i,u),o.length&&this.addFolds(o),i},this.moveLinesUp=function(e,t){return this.$moveLines(e,t,-1)},this.moveLinesDown=function(e,t){return this.$moveLines(e,t,1)},this.duplicateLines=function(e,t){return this.$moveLines(e,t,0)},this.$clipRowToDocument=function(e){return Math.max(0,Math.min(e,this.doc.getLength()-1))},this.$clipColumnToRow=function(e,t){return t<0?0:Math.min(this.doc.getLine(e).length,t)},this.$clipPositionToDocument=function(e,t){t=Math.max(0,t);if(e<0)e=0,t=0;else{var n=this.doc.getLength();e>=n?(e=n-1,t=this.doc.getLine(n-1).length):t=Math.min(this.doc.getLine(e).length,t)}return{row:e,column:t}},this.$clipRangeToDocument=function(e){e.start.row<0?(e.start.row=0,e.start.column=0):e.start.column=this.$clipColumnToRow(e.start.row,e.start.column);var t=this.doc.getLength()-1;return e.end.row>t?(e.end.row=t,e.end.column=this.doc.getLine(t).length):e.end.column=this.$clipColumnToRow(e.end.row,e.end.column),e},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(e){if(e!=this.$useWrapMode){this.$useWrapMode=e,this.$modified=!0,this.$resetRowCache(0);if(e){var t=this.getLength();this.$wrapData=Array(t),this.$updateWrapData(0,t-1)}this._signal("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(e,t){if(this.$wrapLimitRange.min!==e||this.$wrapLimitRange.max!==t)this.$wrapLimitRange={min:e,max:t},this.$modified=!0,this.$useWrapMode&&this._signal("changeWrapMode")},this.adjustWrapLimit=function(e,t){var n=this.$wrapLimitRange;n.max<0&&(n={min:t,max:t});var r=this.$constrainWrapLimit(e,n.min,n.max);return r!=this.$wrapLimit&&r>1?(this.$wrapLimit=r,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._signal("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(e,t,n){return t&&(e=Math.max(t,e)),n&&(e=Math.min(n,e)),e},this.getWrapLimit=function(){return this.$wrapLimit},this.setWrapLimit=function(e){this.setWrapLimitRange(e,e)},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(e){var t=this.$useWrapMode,n=e.action,r=e.start,i=e.end,s=r.row,o=i.row,u=o-s,a=null;this.$updating=!0;if(u!=0)if(n==="remove"){this[t?"$wrapData":"$rowLengthCache"].splice(s,u);var f=this.$foldData;a=this.getFoldsInRange(e),this.removeFolds(a);var l=this.getFoldLine(i.row),c=0;if(l){l.addRemoveChars(i.row,i.column,r.column-i.column),l.shiftRow(-u);var h=this.getFoldLine(s);h&&h!==l&&(h.merge(l),l=h),c=f.indexOf(l)+1}for(c;c<f.length;c++){var l=f[c];l.start.row>=i.row&&l.shiftRow(-u)}o=s}else{var p=Array(u);p.unshift(s,0);var d=t?this.$wrapData:this.$rowLengthCache;d.splice.apply(d,p);var f=this.$foldData,l=this.getFoldLine(s),c=0;if(l){var v=l.range.compareInside(r.row,r.column);v==0?(l=l.split(r.row,r.column),l&&(l.shiftRow(u),l.addRemoveChars(o,0,i.column-r.column))):v==-1&&(l.addRemoveChars(s,0,i.column-r.column),l.shiftRow(u)),c=f.indexOf(l)+1}for(c;c<f.length;c++){var l=f[c];l.start.row>=s&&l.shiftRow(u)}}else{u=Math.abs(e.start.column-e.end.column),n==="remove"&&(a=this.getFoldsInRange(e),this.removeFolds(a),u=-u);var l=this.getFoldLine(s);l&&l.addRemoveChars(s,r.column,u)}return t&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),this.$updating=!1,t?this.$updateWrapData(s,o):this.$updateRowLengthCache(s,o),a},this.$updateRowLengthCache=function(e,t,n){this.$rowLengthCache[e]=null,this.$rowLengthCache[t]=null},this.$updateWrapData=function(e,t){var r=this.doc.getAllLines(),i=this.getTabSize(),s=this.$wrapData,o=this.$wrapLimit,a,f,l=e;t=Math.min(t,r.length-1);while(l<=t)f=this.getFoldLine(l,f),f?(a=[],f.walk(function(e,t,i,s){var o;if(e!=null){o=this.$getDisplayTokens(e,a.length),o[0]=n;for(var f=1;f<o.length;f++)o[f]=u}else o=this.$getDisplayTokens(r[t].substring(s,i),a.length);a=a.concat(o)}.bind(this),f.end.row,r[f.end.row].length+1),s[f.start.row]=this.$computeWrapSplits(a,o,i),l=f.end.row+1):(a=this.$getDisplayTokens(r[l]),s[l]=this.$computeWrapSplits(a,o,i),l++)};var e=1,t=2,n=3,u=4,l=9,p=10,d=11,v=12;this.$computeWrapSplits=function(e,r,i){function g(){var t=0;if(m===0)return t;if(h)for(var n=0;n<e.length;n++){var r=e[n];if(r==p)t+=1;else{if(r!=d){if(r==v)continue;break}t+=i}}return c&&h!==!1&&(t+=i),Math.min(t,m)}function y(t){var n=e.slice(a,t),r=n.length;n.join("").replace(/12/g,function(){r-=1}).replace(/2/g,function(){r-=1}),s.length||(b=g(),s.indent=b),f+=r,s.push(f),a=t}if(e.length==0)return[];var s=[],o=e.length,a=0,f=0,c=this.$wrapAsCode,h=this.$indentedSoftWrap,m=r<=Math.max(2*i,8)||h===!1?0:Math.floor(r/2),b=0;while(o-a>r-b){var w=a+r-b;if(e[w-1]>=p&&e[w]>=p){y(w);continue}if(e[w]==n||e[w]==u){for(w;w!=a-1;w--)if(e[w]==n)break;if(w>a){y(w);continue}w=a+r;for(w;w<e.length;w++)if(e[w]!=u)break;if(w==e.length)break;y(w);continue}var E=Math.max(w-(r-(r>>2)),a-1);while(w>E&&e[w]<n)w--;if(c){while(w>E&&e[w]<n)w--;while(w>E&&e[w]==l)w--}else while(w>E&&e[w]<p)w--;if(w>E){y(++w);continue}w=a+r,e[w]==t&&w--,y(w-b)}return s},this.$getDisplayTokens=function(n,r){var i=[],s;r=r||0;for(var o=0;o<n.length;o++){var u=n.charCodeAt(o);if(u==9){s=this.getScreenTabSize(i.length+r),i.push(d);for(var a=1;a<s;a++)i.push(v)}else u==32?i.push(p):u>39&&u<48||u>57&&u<64?i.push(l):u>=4352&&m(u)?i.push(e,t):i.push(e)}return i},this.$getStringScreenWidth=function(e,t,n){if(t==0)return[0,0];t==null&&(t=Infinity),n=n||0;var r,i;for(i=0;i<e.length;i++){r=e.charCodeAt(i),r==9?n+=this.getScreenTabSize(n):r>=4352&&m(r)?n+=2:n+=1;if(n>t)break}return[n,i]},this.lineWidgets=null,this.getRowLength=function(e){if(this.lineWidgets)var t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0;else t=0;return!this.$useWrapMode||!this.$wrapData[e]?1+t:this.$wrapData[e].length+1+t},this.getRowLineCount=function(e){return!this.$useWrapMode||!this.$wrapData[e]?1:this.$wrapData[e].length+1},this.getRowWrapIndent=function(e){if(this.$useWrapMode){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE),n=this.$wrapData[t.row];return n.length&&n[0]<t.column?n.indent:0}return 0},this.getScreenLastRowColumn=function(e){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE);return this.documentToScreenColumn(t.row,t.column)},this.getDocumentLastRowColumn=function(e,t){var n=this.documentToScreenRow(e,t);return this.getScreenLastRowColumn(n)},this.getDocumentLastRowColumnPosition=function(e,t){var n=this.documentToScreenRow(e,t);return this.screenToDocumentPosition(n,Number.MAX_VALUE/10)},this.getRowSplitData=function(e){return this.$useWrapMode?this.$wrapData[e]:undefined},this.getScreenTabSize=function(e){return this.$tabSize-e%this.$tabSize},this.screenToDocumentRow=function(e,t){return this.screenToDocumentPosition(e,t).row},this.screenToDocumentColumn=function(e,t){return this.screenToDocumentPosition(e,t).column},this.screenToDocumentPosition=function(e,t){if(e<0)return{row:0,column:0};var n,r=0,i=0,s,o=0,u=0,a=this.$screenRowCache,f=this.$getRowCacheIndex(a,e),l=a.length;if(l&&f>=0)var o=a[f],r=this.$docRowCache[f],c=e>a[l-1];else var c=!l;var h=this.getLength()-1,p=this.getNextFoldLine(r),d=p?p.start.row:Infinity;while(o<=e){u=this.getRowLength(r);if(o+u>e||r>=h)break;o+=u,r++,r>d&&(r=p.end.row+1,p=this.getNextFoldLine(r,p),d=p?p.start.row:Infinity),c&&(this.$docRowCache.push(r),this.$screenRowCache.push(o))}if(p&&p.start.row<=r)n=this.getFoldDisplayLine(p),r=p.start.row;else{if(o+u<=e||r>h)return{row:h,column:this.getLine(h).length};n=this.getLine(r),p=null}var v=0;if(this.$useWrapMode){var m=this.$wrapData[r];if(m){var g=Math.floor(e-o);s=m[g],g>0&&m.length&&(v=m.indent,i=m[g-1]||m[m.length-1],n=n.substring(i))}}return i+=this.$getStringScreenWidth(n,t-v)[1],this.$useWrapMode&&i>=s&&(i=s-1),p?p.idxToPosition(i):{row:r,column:i}},this.documentToScreenPosition=function(e,t){if(typeof t=="undefined")var n=this.$clipPositionToDocument(e.row,e.column);else n=this.$clipPositionToDocument(e,t);e=n.row,t=n.column;var r=0,i=null,s=null;s=this.getFoldAt(e,t,1),s&&(e=s.start.row,t=s.start.column);var o,u=0,a=this.$docRowCache,f=this.$getRowCacheIndex(a,e),l=a.length;if(l&&f>=0)var u=a[f],r=this.$screenRowCache[f],c=e>a[l-1];else var c=!l;var h=this.getNextFoldLine(u),p=h?h.start.row:Infinity;while(u<e){if(u>=p){o=h.end.row+1;if(o>e)break;h=this.getNextFoldLine(o,h),p=h?h.start.row:Infinity}else o=u+1;r+=this.getRowLength(u),u=o,c&&(this.$docRowCache.push(u),this.$screenRowCache.push(r))}var d="";h&&u>=p?(d=this.getFoldDisplayLine(h,e,t),i=h.start.row):(d=this.getLine(e).substring(0,t),i=e);var v=0;if(this.$useWrapMode){var m=this.$wrapData[i];if(m){var g=0;while(d.length>=m[g])r++,g++;d=d.substring(m[g-1]||0,d.length),v=g>0?m.indent:0}}return{row:r,column:v+this.$getStringScreenWidth(d)[0]}},this.documentToScreenColumn=function(e,t){return this.documentToScreenPosition(e,t).column},this.documentToScreenRow=function(e,t){return this.documentToScreenPosition(e,t).row},this.getScreenLength=function(){var e=0,t=null;if(!this.$useWrapMode){e=this.getLength();var n=this.$foldData;for(var r=0;r<n.length;r++)t=n[r],e-=t.end.row-t.start.row}else{var i=this.$wrapData.length,s=0,r=0,t=this.$foldData[r++],o=t?t.start.row:Infinity;while(s<i){var u=this.$wrapData[s];e+=u?u.length+1:1,s++,s>o&&(s=t.end.row+1,t=this.$foldData[r++],o=t?t.start.row:Infinity)}}return this.lineWidgets&&(e+=this.$getWidgetScreenLength()),e},this.$setFontMetrics=function(e){if(!this.$enableVarChar)return;this.$getStringScreenWidth=function(t,n,r){if(n===0)return[0,0];n||(n=Infinity),r=r||0;var i,s;for(s=0;s<t.length;s++){i=t.charAt(s),i==="	"?r+=this.getScreenTabSize(r):r+=e.getCharacterWidth(i);if(r>n)break}return[r,s]}},this.destroy=function(){this.bgTokenizer&&(this.bgTokenizer.setDocument(null),this.bgTokenizer=null),this.$stopWorker()}}.call(p.prototype),e("./edit_session/folding").Folding.call(p.prototype),e("./edit_session/bracket_match").BracketMatch.call(p.prototype),s.defineOptions(p.prototype,"session",{wrap:{set:function(e){!e||e=="off"?e=!1:e=="free"?e=!0:e=="printMargin"?e=-1:typeof e=="string"&&(e=parseInt(e,10)||!1);if(this.$wrap==e)return;this.$wrap=e;if(!e)this.setUseWrapMode(!1);else{var t=typeof e=="number"?e:null;this.setWrapLimitRange(t,t),this.setUseWrapMode(!0)}},get:function(){return this.getUseWrapMode()?this.$wrap==-1?"printMargin":this.getWrapLimitRange().min?this.$wrap:"free":"off"},handlesSet:!0},wrapMethod:{set:function(e){e=e=="auto"?this.$mode.type!="text":e!="text",e!=this.$wrapAsCode&&(this.$wrapAsCode=e,this.$useWrapMode&&(this.$modified=!0,this.$resetRowCache(0),this.$updateWrapData(0,this.getLength()-1)))},initialValue:"auto"},indentedSoftWrap:{initialValue:!0},firstLineNumber:{set:function(){this._signal("changeBreakpoint")},initialValue:1},useWorker:{set:function(e){this.$useWorker=e,this.$stopWorker(),e&&this.$startWorker()},initialValue:!0},useSoftTabs:{initialValue:!0},tabSize:{set:function(e){if(isNaN(e)||this.$tabSize===e)return;this.$modified=!0,this.$rowLengthCache=[],this.$tabSize=e,this._signal("changeTabSize")},initialValue:4,handlesSet:!0},navigateWithinSoftTabs:{initialValue:!1},overwrite:{set:function(e){this._signal("changeOverwrite")},initialValue:!1},newLineMode:{set:function(e){this.doc.setNewLineMode(e)},get:function(){return this.doc.getNewLineMode()},handlesSet:!0},mode:{set:function(e){this.setMode(e)},get:function(){return this.$modeId}}}),t.EditSession=p}),ace.define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(e,t,n){"use strict";function u(e,t){function n(e){return/\w/.test(e)||t.regExp?"\\b":""}return n(e[0])+e+n(e[e.length-1])}var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./range").Range,o=function(){this.$options={}};(function(){this.set=function(e){return i.mixin(this.$options,e),this},this.getOptions=function(){return r.copyObject(this.$options)},this.setOptions=function(e){this.$options=e},this.find=function(e){var t=this.$options,n=this.$matchIterator(e,t);if(!n)return!1;var r=null;return n.forEach(function(e,n,i,o){return r=new s(e,n,i,o),n==o&&t.start&&t.start.start&&t.skipCurrent!=0&&r.isEqual(t.start)?(r=null,!1):!0}),r},this.findAll=function(e){var t=this.$options;if(!t.needle)return[];this.$assembleRegExp(t);var n=t.range,i=n?e.getLines(n.start.row,n.end.row):e.doc.getAllLines(),o=[],u=t.re;if(t.$isMultiLine){var a=u.length,f=i.length-a,l;e:for(var c=u.offset||0;c<=f;c++){for(var h=0;h<a;h++)if(i[c+h].search(u[h])==-1)continue e;var p=i[c],d=i[c+a-1],v=p.length-p.match(u[0])[0].length,m=d.match(u[a-1])[0].length;if(l&&l.end.row===c&&l.end.column>v)continue;o.push(l=new s(c,v,c+a-1,m)),a>2&&(c=c+a-2)}}else for(var g=0;g<i.length;g++){var y=r.getMatchOffsets(i[g],u);for(var h=0;h<y.length;h++){var b=y[h];o.push(new s(g,b.offset,g,b.offset+b.length))}}if(n){var w=n.start.column,E=n.start.column,g=0,h=o.length-1;while(g<h&&o[g].start.column<w&&o[g].start.row==n.start.row)g++;while(g<h&&o[h].end.column>E&&o[h].end.row==n.end.row)h--;o=o.slice(g,h+1);for(g=0,h=o.length;g<h;g++)o[g].start.row+=n.start.row,o[g].end.row+=n.start.row}return o},this.replace=function(e,t){var n=this.$options,r=this.$assembleRegExp(n);if(n.$isMultiLine)return t;if(!r)return;var i=r.exec(e);if(!i||i[0].length!=e.length)return null;t=e.replace(r,t);if(n.preserveCase){t=t.split("");for(var s=Math.min(e.length,e.length);s--;){var o=e[s];o&&o.toLowerCase()!=o?t[s]=t[s].toUpperCase():t[s]=t[s].toLowerCase()}t=t.join("")}return t},this.$assembleRegExp=function(e,t){if(e.needle instanceof RegExp)return e.re=e.needle;var n=e.needle;if(!e.needle)return e.re=!1;e.regExp||(n=r.escapeRegExp(n)),e.wholeWord&&(n=u(n,e));var i=e.caseSensitive?"gm":"gmi";e.$isMultiLine=!t&&/[\n\r]/.test(n);if(e.$isMultiLine)return e.re=this.$assembleMultilineRegExp(n,i);try{var s=new RegExp(n,i)}catch(o){s=!1}return e.re=s},this.$assembleMultilineRegExp=function(e,t){var n=e.replace(/\r\n|\r|\n/g,"$\n^").split("\n"),r=[];for(var i=0;i<n.length;i++)try{r.push(new RegExp(n[i],t))}catch(s){return!1}return r},this.$matchIterator=function(e,t){var n=this.$assembleRegExp(t);if(!n)return!1;var r=t.backwards==1,i=t.skipCurrent!=0,s=t.range,o=t.start;o||(o=s?s[r?"end":"start"]:e.selection.getRange()),o.start&&(o=o[i!=r?"end":"start"]);var u=s?s.start.row:0,a=s?s.end.row:e.getLength()-1;if(r)var f=function(e){var n=o.row;if(c(n,o.column,e))return;for(n--;n>=u;n--)if(c(n,Number.MAX_VALUE,e))return;if(t.wrap==0)return;for(n=a,u=o.row;n>=u;n--)if(c(n,Number.MAX_VALUE,e))return};else var f=function(e){var n=o.row;if(c(n,o.column,e))return;for(n+=1;n<=a;n++)if(c(n,0,e))return;if(t.wrap==0)return;for(n=u,a=o.row;n<=a;n++)if(c(n,0,e))return};if(t.$isMultiLine)var l=n.length,c=function(t,i,s){var o=r?t-l+1:t;if(o<0)return;var u=e.getLine(o),a=u.search(n[0]);if(!r&&a<i||a===-1)return;for(var f=1;f<l;f++){u=e.getLine(o+f);if(u.search(n[f])==-1)return}var c=u.match(n[l-1])[0].length;if(r&&c>i)return;if(s(o,a,o+l-1,c))return!0};else if(r)var c=function(t,r,i){var s=e.getLine(t),o=[],u,a=0;n.lastIndex=0;while(u=n.exec(s)){var f=u[0].length;a=u.index;if(!f){if(a>=s.length)break;n.lastIndex=a+=1}if(u.index+f>r)break;o.push(u.index,f)}for(var l=o.length-1;l>=0;l-=2){var c=o[l-1],f=o[l];if(i(t,c,t,c+f))return!0}};else var c=function(t,r,i){var s=e.getLine(t),o,u=r;n.lastIndex=r;while(o=n.exec(s)){var a=o[0].length;u=o.index;if(i(t,u,t,u+a))return!0;if(!a){n.lastIndex=u+=1;if(u>=s.length)return!1}}};return{forEach:f}}}).call(o.prototype),t.Search=o}),ace.define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys","ace/lib/useragent"],function(e,t,n){"use strict";function o(e,t){this.platform=t||(i.isMac?"mac":"win"),this.commands={},this.commandKeyBinding={},this.addCommands(e),this.$singleCommand=!0}function u(e,t){o.call(this,e,t),this.$singleCommand=!1}var r=e("../lib/keys"),i=e("../lib/useragent"),s=r.KEY_MODS;u.prototype=o.prototype,function(){function e(e){return typeof e=="object"&&e.bindKey&&e.bindKey.position||(e.isDefault?-100:0)}this.addCommand=function(e){this.commands[e.name]&&this.removeCommand(e),this.commands[e.name]=e,e.bindKey&&this._buildKeyHash(e)},this.removeCommand=function(e,t){var n=e&&(typeof e=="string"?e:e.name);e=this.commands[n],t||delete this.commands[n];var r=this.commandKeyBinding;for(var i in r){var s=r[i];if(s==e)delete r[i];else if(Array.isArray(s)){var o=s.indexOf(e);o!=-1&&(s.splice(o,1),s.length==1&&(r[i]=s[0]))}}},this.bindKey=function(e,t,n){typeof e=="object"&&e&&(n==undefined&&(n=e.position),e=e[this.platform]);if(!e)return;if(typeof t=="function")return this.addCommand({exec:t,bindKey:e,name:t.name||e});e.split("|").forEach(function(e){var r="";if(e.indexOf(" ")!=-1){var i=e.split(/\s+/);e=i.pop(),i.forEach(function(e){var t=this.parseKeys(e),n=s[t.hashId]+t.key;r+=(r?" ":"")+n,this._addCommandToBinding(r,"chainKeys")},this),r+=" "}var o=this.parseKeys(e),u=s[o.hashId]+o.key;this._addCommandToBinding(r+u,t,n)},this)},this._addCommandToBinding=function(t,n,r){var i=this.commandKeyBinding,s;if(!n)delete i[t];else if(!i[t]||this.$singleCommand)i[t]=n;else{Array.isArray(i[t])?(s=i[t].indexOf(n))!=-1&&i[t].splice(s,1):i[t]=[i[t]],typeof r!="number"&&(r=e(n));var o=i[t];for(s=0;s<o.length;s++){var u=o[s],a=e(u);if(a>r)break}o.splice(s,0,n)}},this.addCommands=function(e){e&&Object.keys(e).forEach(function(t){var n=e[t];if(!n)return;if(typeof n=="string")return this.bindKey(n,t);typeof n=="function"&&(n={exec:n});if(typeof n!="object")return;n.name||(n.name=t),this.addCommand(n)},this)},this.removeCommands=function(e){Object.keys(e).forEach(function(t){this.removeCommand(e[t])},this)},this.bindKeys=function(e){Object.keys(e).forEach(function(t){this.bindKey(t,e[t])},this)},this._buildKeyHash=function(e){this.bindKey(e.bindKey,e)},this.parseKeys=function(e){var t=e.toLowerCase().split(/[\-\+]([\-\+])?/).filter(function(e){return e}),n=t.pop(),i=r[n];if(r.FUNCTION_KEYS[i])n=r.FUNCTION_KEYS[i].toLowerCase();else{if(!t.length)return{key:n,hashId:-1};if(t.length==1&&t[0]=="shift")return{key:n.toUpperCase(),hashId:-1}}var s=0;for(var o=t.length;o--;){var u=r.KEY_MODS[t[o]];if(u==null)return typeof console!="undefined"&&console.error("invalid modifier "+t[o]+" in "+e),!1;s|=u}return{key:n,hashId:s}},this.findKeyCommand=function(t,n){var r=s[t]+n;return this.commandKeyBinding[r]},this.handleKeyboard=function(e,t,n,r){if(r<0)return;var i=s[t]+n,o=this.commandKeyBinding[i];e.$keyChain&&(e.$keyChain+=" "+i,o=this.commandKeyBinding[e.$keyChain]||o);if(o)if(o=="chainKeys"||o[o.length-1]=="chainKeys")return e.$keyChain=e.$keyChain||i,{command:"null"};if(e.$keyChain)if(!!t&&t!=4||n.length!=1){if(t==-1||r>0)e.$keyChain=""}else e.$keyChain=e.$keyChain.slice(0,-i.length-1);return{command:o}},this.getStatusText=function(e,t){return t.$keyChain||""}}.call(o.prototype),t.HashHandler=o,t.MultiHashHandler=u}),ace.define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../keyboard/hash_handler").MultiHashHandler,s=e("../lib/event_emitter").EventEmitter,o=function(e,t){i.call(this,t,e),this.byName=this.commands,this.setDefaultHandler("exec",function(e){return e.command.exec(e.editor,e.args||{})})};r.inherits(o,i),function(){r.implement(this,s),this.exec=function(e,t,n){if(Array.isArray(e)){for(var r=e.length;r--;)if(this.exec(e[r],t,n))return!0;return!1}typeof e=="string"&&(e=this.commands[e]);if(!e)return!1;if(t&&t.$readOnly&&!e.readOnly)return!1;if(e.isAvailable&&!e.isAvailable(t))return!1;var i={editor:t,command:e,args:n};return i.returnValue=this._emit("exec",i),this._signal("afterExec",i),i.returnValue===!1?!1:!0},this.toggleRecording=function(e){if(this.$inReplay)return;return e&&e._emit("changeStatus"),this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(e){this.macro.push([e.command,e.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(e){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording(e);try{this.$inReplay=!0,this.macro.forEach(function(t){typeof t=="string"?this.exec(t,e):this.exec(t[0],e,t[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(e){return e.map(function(e){return typeof e[0]!="string"&&(e[0]=e[0].name),e[1]||(e=e[0]),e})}}.call(o.prototype),t.CommandManager=o}),ace.define("ace/commands/default_commands",["require","exports","module","ace/lib/lang","ace/config","ace/range"],function(e,t,n){"use strict";function o(e,t){return{win:e,mac:t}}var r=e("../lib/lang"),i=e("../config"),s=e("../range").Range;t.commands=[{name:"showSettingsMenu",bindKey:o("Ctrl-,","Command-,"),exec:function(e){i.loadModule("ace/ext/settings_menu",function(t){t.init(e),e.showSettingsMenu()})},readOnly:!0},{name:"goToNextError",bindKey:o("Alt-E","F4"),exec:function(e){i.loadModule("ace/ext/error_marker",function(t){t.showErrorMarker(e,1)})},scrollIntoView:"animate",readOnly:!0},{name:"goToPreviousError",bindKey:o("Alt-Shift-E","Shift-F4"),exec:function(e){i.loadModule("ace/ext/error_marker",function(t){t.showErrorMarker(e,-1)})},scrollIntoView:"animate",readOnly:!0},{name:"selectall",bindKey:o("Ctrl-A","Command-A"),exec:function(e){e.selectAll()},readOnly:!0},{name:"centerselection",bindKey:o(null,"Ctrl-L"),exec:function(e){e.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:o("Ctrl-L","Command-L"),exec:function(e){var t=parseInt(prompt("Enter line number:"),10);isNaN(t)||e.gotoLine(t)},readOnly:!0},{name:"fold",bindKey:o("Alt-L|Ctrl-F1","Command-Alt-L|Command-F1"),exec:function(e){e.session.toggleFold(!1)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"unfold",bindKey:o("Alt-Shift-L|Ctrl-Shift-F1","Command-Alt-Shift-L|Command-Shift-F1"),exec:function(e){e.session.toggleFold(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleFoldWidget",bindKey:o("F2","F2"),exec:function(e){e.session.toggleFoldWidget()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleParentFoldWidget",bindKey:o("Alt-F2","Alt-F2"),exec:function(e){e.session.toggleFoldWidget(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"foldall",bindKey:o(null,"Ctrl-Command-Option-0"),exec:function(e){e.session.foldAll()},scrollIntoView:"center",readOnly:!0},{name:"foldOther",bindKey:o("Alt-0","Command-Option-0"),exec:function(e){e.session.foldAll(),e.session.unfold(e.selection.getAllRanges())},scrollIntoView:"center",readOnly:!0},{name:"unfoldall",bindKey:o("Alt-Shift-0","Command-Option-Shift-0"),exec:function(e){e.session.unfold()},scrollIntoView:"center",readOnly:!0},{name:"findnext",bindKey:o("Ctrl-K","Command-G"),exec:function(e){e.findNext()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"findprevious",bindKey:o("Ctrl-Shift-K","Command-Shift-G"),exec:function(e){e.findPrevious()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"selectOrFindNext",bindKey:o("Alt-K","Ctrl-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findNext()},readOnly:!0},{name:"selectOrFindPrevious",bindKey:o("Alt-Shift-K","Ctrl-Shift-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findPrevious()},readOnly:!0},{name:"find",bindKey:o("Ctrl-F","Command-F"),exec:function(e){i.loadModule("ace/ext/searchbox",function(t){t.Search(e)})},readOnly:!0},{name:"overwrite",bindKey:"Insert",exec:function(e){e.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:o("Ctrl-Shift-Home","Command-Shift-Home|Command-Shift-Up"),exec:function(e){e.getSelection().selectFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotostart",bindKey:o("Ctrl-Home","Command-Home|Command-Up"),exec:function(e){e.navigateFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectup",bindKey:o("Shift-Up","Shift-Up|Ctrl-Shift-P"),exec:function(e){e.getSelection().selectUp()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golineup",bindKey:o("Up","Up|Ctrl-P"),exec:function(e,t){e.navigateUp(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttoend",bindKey:o("Ctrl-Shift-End","Command-Shift-End|Command-Shift-Down"),exec:function(e){e.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotoend",bindKey:o("Ctrl-End","Command-End|Command-Down"),exec:function(e){e.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectdown",bindKey:o("Shift-Down","Shift-Down|Ctrl-Shift-N"),exec:function(e){e.getSelection().selectDown()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golinedown",bindKey:o("Down","Down|Ctrl-N"),exec:function(e,t){e.navigateDown(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordleft",bindKey:o("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(e){e.getSelection().selectWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordleft",bindKey:o("Ctrl-Left","Option-Left"),exec:function(e){e.navigateWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolinestart",bindKey:o("Alt-Shift-Left","Command-Shift-Left|Ctrl-Shift-A"),exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolinestart",bindKey:o("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(e){e.navigateLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectleft",bindKey:o("Shift-Left","Shift-Left|Ctrl-Shift-B"),exec:function(e){e.getSelection().selectLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoleft",bindKey:o("Left","Left|Ctrl-B"),exec:function(e,t){e.navigateLeft(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordright",bindKey:o("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(e){e.getSelection().selectWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordright",bindKey:o("Ctrl-Right","Option-Right"),exec:function(e){e.navigateWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolineend",bindKey:o("Alt-Shift-Right","Command-Shift-Right|Shift-End|Ctrl-Shift-E"),exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolineend",bindKey:o("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(e){e.navigateLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectright",bindKey:o("Shift-Right","Shift-Right"),exec:function(e){e.getSelection().selectRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoright",bindKey:o("Right","Right|Ctrl-F"),exec:function(e,t){e.navigateRight(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectpagedown",bindKey:"Shift-PageDown",exec:function(e){e.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:o(null,"Option-PageDown"),exec:function(e){e.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:o("PageDown","PageDown|Ctrl-V"),exec:function(e){e.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:"Shift-PageUp",exec:function(e){e.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:o(null,"Option-PageUp"),exec:function(e){e.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:"PageUp",exec:function(e){e.gotoPageUp()},readOnly:!0},{name:"scrollup",bindKey:o("Ctrl-Up",null),exec:function(e){e.renderer.scrollBy(0,-2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"scrolldown",bindKey:o("Ctrl-Down",null),exec:function(e){e.renderer.scrollBy(0,2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"selectlinestart",bindKey:"Shift-Home",exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectlineend",bindKey:"Shift-End",exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"togglerecording",bindKey:o("Ctrl-Alt-E","Command-Option-E"),exec:function(e){e.commands.toggleRecording(e)},readOnly:!0},{name:"replaymacro",bindKey:o("Ctrl-Shift-E","Command-Shift-E"),exec:function(e){e.commands.replay(e)},readOnly:!0},{name:"jumptomatching",bindKey:o("Ctrl-P","Ctrl-P"),exec:function(e){e.jumpToMatching()},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"selecttomatching",bindKey:o("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(e){e.jumpToMatching(!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"expandToMatching",bindKey:o("Ctrl-Shift-M","Ctrl-Shift-M"),exec:function(e){e.jumpToMatching(!0,!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"passKeysToBrowser",bindKey:o(null,null),exec:function(){},passEvent:!0,readOnly:!0},{name:"copy",exec:function(e){},readOnly:!0},{name:"cut",exec:function(e){var t=e.getSelectionRange();e._emit("cut",t),e.selection.isEmpty()||(e.session.remove(t),e.clearSelection())},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"paste",exec:function(e,t){e.$handlePaste(t)},scrollIntoView:"cursor"},{name:"removeline",bindKey:o("Ctrl-D","Command-D"),exec:function(e){e.removeLines()},scrollIntoView:"cursor",multiSelectAction:"forEachLine"},{name:"duplicateSelection",bindKey:o("Ctrl-Shift-D","Command-Shift-D"),exec:function(e){e.duplicateSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"sortlines",bindKey:o("Ctrl-Alt-S","Command-Alt-S"),exec:function(e){e.sortLines()},scrollIntoView:"selection",multiSelectAction:"forEachLine"},{name:"togglecomment",bindKey:o("Ctrl-/","Command-/"),exec:function(e){e.toggleCommentLines()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"toggleBlockComment",bindKey:o("Ctrl-Shift-/","Command-Shift-/"),exec:function(e){e.toggleBlockComment()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"modifyNumberUp",bindKey:o("Ctrl-Shift-Up","Alt-Shift-Up"),exec:function(e){e.modifyNumber(1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"modifyNumberDown",bindKey:o("Ctrl-Shift-Down","Alt-Shift-Down"),exec:function(e){e.modifyNumber(-1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"replace",bindKey:o("Ctrl-H","Command-Option-F"),exec:function(e){i.loadModule("ace/ext/searchbox",function(t){t.Search(e,!0)})}},{name:"undo",bindKey:o("Ctrl-Z","Command-Z"),exec:function(e){e.undo()}},{name:"redo",bindKey:o("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(e){e.redo()}},{name:"copylinesup",bindKey:o("Alt-Shift-Up","Command-Option-Up"),exec:function(e){e.copyLinesUp()},scrollIntoView:"cursor"},{name:"movelinesup",bindKey:o("Alt-Up","Option-Up"),exec:function(e){e.moveLinesUp()},scrollIntoView:"cursor"},{name:"copylinesdown",bindKey:o("Alt-Shift-Down","Command-Option-Down"),exec:function(e){e.copyLinesDown()},scrollIntoView:"cursor"},{name:"movelinesdown",bindKey:o("Alt-Down","Option-Down"),exec:function(e){e.moveLinesDown()},scrollIntoView:"cursor"},{name:"del",bindKey:o("Delete","Delete|Ctrl-D|Shift-Delete"),exec:function(e){e.remove("right")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"backspace",bindKey:o("Shift-Backspace|Backspace","Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(e){e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"cut_or_delete",bindKey:o("Shift-Delete",null),exec:function(e){if(!e.selection.isEmpty())return!1;e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestart",bindKey:o("Alt-Backspace","Command-Backspace"),exec:function(e){e.removeToLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineend",bindKey:o("Alt-Delete","Ctrl-K"),exec:function(e){e.removeToLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordleft",bindKey:o("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(e){e.removeWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordright",bindKey:o("Ctrl-Delete","Alt-Delete"),exec:function(e){e.removeWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"outdent",bindKey:o("Shift-Tab","Shift-Tab"),exec:function(e){e.blockOutdent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"indent",bindKey:o("Tab","Tab"),exec:function(e){e.indent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"blockoutdent",bindKey:o("Ctrl-[","Ctrl-["),exec:function(e){e.blockOutdent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"blockindent",bindKey:o("Ctrl-]","Ctrl-]"),exec:function(e){e.blockIndent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"insertstring",exec:function(e,t){e.insert(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"inserttext",exec:function(e,t){e.insert(r.stringRepeat(t.text||"",t.times||1))},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"splitline",bindKey:o(null,"Ctrl-O"),exec:function(e){e.splitLine()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"transposeletters",bindKey:o("Alt-Shift-X","Ctrl-T"),exec:function(e){e.transposeLetters()},multiSelectAction:function(e){e.transposeSelections(1)},scrollIntoView:"cursor"},{name:"touppercase",bindKey:o("Ctrl-U","Ctrl-U"),exec:function(e){e.toUpperCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"tolowercase",bindKey:o("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(e){e.toLowerCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"expandtoline",bindKey:o("Ctrl-Shift-L","Command-Shift-L"),exec:function(e){var t=e.selection.getRange();t.start.column=t.end.column=0,t.end.row++,e.selection.setRange(t,!1)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"joinlines",bindKey:o(null,null),exec:function(e){var t=e.selection.isBackwards(),n=t?e.selection.getSelectionLead():e.selection.getSelectionAnchor(),i=t?e.selection.getSelectionAnchor():e.selection.getSelectionLead(),o=e.session.doc.getLine(n.row).length,u=e.session.doc.getTextRange(e.selection.getRange()),a=u.replace(/\n\s*/," ").length,f=e.session.doc.getLine(n.row);for(var l=n.row+1;l<=i.row+1;l++){var c=r.stringTrimLeft(r.stringTrimRight(e.session.doc.getLine(l)));c.length!==0&&(c=" "+c),f+=c}i.row+1<e.session.doc.getLength()-1&&(f+=e.session.doc.getNewLineCharacter()),e.clearSelection(),e.session.doc.replace(new s(n.row,0,i.row+2,0),f),a>0?(e.selection.moveCursorTo(n.row,n.column),e.selection.selectTo(n.row,n.column+a)):(o=e.session.doc.getLine(n.row).length>o?o+1:o,e.selection.moveCursorTo(n.row,o))},multiSelectAction:"forEach",readOnly:!0},{name:"invertSelection",bindKey:o(null,null),exec:function(e){var t=e.session.doc.getLength()-1,n=e.session.doc.getLine(t).length,r=e.selection.rangeList.ranges,i=[];r.length<1&&(r=[e.selection.getRange()]);for(var o=0;o<r.length;o++)o==r.length-1&&(r[o].end.row!==t||r[o].end.column!==n)&&i.push(new s(r[o].end.row,r[o].end.column,t,n)),o===0?(r[o].start.row!==0||r[o].start.column!==0)&&i.push(new s(0,0,r[o].start.row,r[o].start.column)):i.push(new s(r[o-1].end.row,r[o-1].end.column,r[o].start.row,r[o].start.column));e.exitMultiSelectMode(),e.clearSelection();for(var o=0;o<i.length;o++)e.selection.addRange(i[o],!1)},readOnly:!0,scrollIntoView:"none"}]}),ace.define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands","ace/config","ace/token_iterator"],function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./lib/lang"),o=e("./lib/useragent"),u=e("./keyboard/textinput").TextInput,a=e("./mouse/mouse_handler").MouseHandler,f=e("./mouse/fold_handler").FoldHandler,l=e("./keyboard/keybinding").KeyBinding,c=e("./edit_session").EditSession,h=e("./search").Search,p=e("./range").Range,d=e("./lib/event_emitter").EventEmitter,v=e("./commands/command_manager").CommandManager,m=e("./commands/default_commands").commands,g=e("./config"),y=e("./token_iterator").TokenIterator,b=function(e,t){var n=e.getContainerElement();this.container=n,this.renderer=e,this.id="editor"+ ++b.$uid,this.commands=new v(o.isMac?"mac":"win",m),typeof document=="object"&&(this.textInput=new u(e.getTextAreaContainer(),this),this.renderer.textarea=this.textInput.getElement(),this.$mouseHandler=new a(this),new f(this)),this.keyBinding=new l(this),this.$blockScrolling=0,this.$search=(new h).set({wrap:!0}),this.$historyTracker=this.$historyTracker.bind(this),this.commands.on("exec",this.$historyTracker),this.$initOperationListeners(),this._$emitInputEvent=s.delayedCall(function(){this._signal("input",{}),this.session&&this.session.bgTokenizer&&this.session.bgTokenizer.scheduleStart()}.bind(this)),this.on("change",function(e,t){t._$emitInputEvent.schedule(31)}),this.setSession(t||new c("")),g.resetOptions(this),g._signal("editor",this)};b.$uid=0,function(){r.implement(this,d),this.$initOperationListeners=function(){function e(e){return e[e.length-1]}this.selections=[],this.commands.on("exec",this.startOperation.bind(this),!0),this.commands.on("afterExec",this.endOperation.bind(this),!0),this.$opResetTimer=s.delayedCall(this.endOperation.bind(this)),this.on("change",function(){this.curOp||this.startOperation(),this.curOp.docChanged=!0}.bind(this),!0),this.on("changeSelection",function(){this.curOp||this.startOperation(),this.curOp.selectionChanged=!0}.bind(this),!0)},this.curOp=null,this.prevOp={},this.startOperation=function(e){if(this.curOp){if(!e||this.curOp.command)return;this.prevOp=this.curOp}e||(this.previousCommand=null,e={}),this.$opResetTimer.schedule(),this.curOp={command:e.command||{},args:e.args,scrollTop:this.renderer.scrollTop},this.curOp.command.name&&this.curOp.command.scrollIntoView!==undefined&&this.$blockScrolling++},this.endOperation=function(e){if(this.curOp){if(e&&e.returnValue===!1)return this.curOp=null;this._signal("beforeEndOperation");var t=this.curOp.command;t.name&&this.$blockScrolling>0&&this.$blockScrolling--;var n=t&&t.scrollIntoView;if(n){switch(n){case"center-animate":n="animate";case"center":this.renderer.scrollCursorIntoView(null,.5);break;case"animate":case"cursor":this.renderer.scrollCursorIntoView();break;case"selectionPart":var r=this.selection.getRange(),i=this.renderer.layerConfig;(r.start.row>=i.lastRow||r.end.row<=i.firstRow)&&this.renderer.scrollSelectionIntoView(this.selection.anchor,this.selection.lead);break;default:}n=="animate"&&this.renderer.animateScrolling(this.curOp.scrollTop)}this.prevOp=this.curOp,this.curOp=null}},this.$mergeableCommands=["backspace","del","insertstring"],this.$historyTracker=function(e){if(!this.$mergeUndoDeltas)return;var t=this.prevOp,n=this.$mergeableCommands,r=t.command&&e.command.name==t.command.name;if(e.command.name=="insertstring"){var i=e.args;this.mergeNextCommand===undefined&&(this.mergeNextCommand=!0),r=r&&this.mergeNextCommand&&(!/\s/.test(i)||/\s/.test(t.args)),this.mergeNextCommand=!0}else r=r&&n.indexOf(e.command.name)!==-1;this.$mergeUndoDeltas!="always"&&Date.now()-this.sequenceStartTime>2e3&&(r=!1),r?this.session.mergeUndoDeltas=!0:n.indexOf(e.command.name)!==-1&&(this.sequenceStartTime=Date.now())},this.setKeyboardHandler=function(e,t){if(e&&typeof e=="string"){this.$keybindingId=e;var n=this;g.loadModule(["keybinding",e],function(r){n.$keybindingId==e&&n.keyBinding.setKeyboardHandler(r&&r.handler),t&&t()})}else this.$keybindingId=null,this.keyBinding.setKeyboardHandler(e),t&&t()},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(e){if(this.session==e)return;this.curOp&&this.endOperation(),this.curOp={};var t=this.session;if(t){this.session.off("change",this.$onDocumentChange),this.session.off("changeMode",this.$onChangeMode),this.session.off("tokenizerUpdate",this.$onTokenizerUpdate),this.session.off("changeTabSize",this.$onChangeTabSize),this.session.off("changeWrapLimit",this.$onChangeWrapLimit),this.session.off("changeWrapMode",this.$onChangeWrapMode),this.session.off("changeFold",this.$onChangeFold),this.session.off("changeFrontMarker",this.$onChangeFrontMarker),this.session.off("changeBackMarker",this.$onChangeBackMarker),this.session.off("changeBreakpoint",this.$onChangeBreakpoint),this.session.off("changeAnnotation",this.$onChangeAnnotation),this.session.off("changeOverwrite",this.$onCursorChange),this.session.off("changeScrollTop",this.$onScrollTopChange),this.session.off("changeScrollLeft",this.$onScrollLeftChange);var n=this.session.getSelection();n.off("changeCursor",this.$onCursorChange),n.off("changeSelection",this.$onSelectionChange)}this.session=e,e?(this.$onDocumentChange=this.onDocumentChange.bind(this),e.on("change",this.$onDocumentChange),this.renderer.setSession(e),this.$onChangeMode=this.onChangeMode.bind(this),e.on("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),e.on("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.onChangeTabSize.bind(this.renderer),e.on("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),e.on("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),e.on("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),e.on("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.on("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.on("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.on("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.on("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.on("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.on("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.on("changeScrollLeft",this.$onScrollLeftChange),this.selection=e.getSelection(),this.selection.on("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.on("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.$blockScrolling+=1,this.onCursorChange(),this.$blockScrolling-=1,this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull()):(this.selection=null,this.renderer.setSession(e)),this._signal("changeSession",{session:e,oldSession:t}),this.curOp=null,t&&t._signal("changeEditor",{oldEditor:this}),e&&e._signal("changeEditor",{editor:this}),e&&e.bgTokenizer&&e.bgTokenizer.scheduleStart()},this.getSession=function(){return this.session},this.setValue=function(e,t){return this.session.doc.setValue(e),t?t==1?this.navigateFileEnd():t==-1&&this.navigateFileStart():this.selectAll(),e},this.getValue=function(){return this.session.getValue()},this.getSelection=function(){return this.selection},this.resize=function(e){this.renderer.onResize(e)},this.setTheme=function(e,t){this.renderer.setTheme(e,t)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(e){this.renderer.setStyle(e)},this.unsetStyle=function(e){this.renderer.unsetStyle(e)},this.getFontSize=function(){return this.getOption("fontSize")||i.computedStyle(this.container,"fontSize")},this.setFontSize=function(e){this.setOption("fontSize",e)},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var e=this;this.$highlightPending=!0,setTimeout(function(){e.$highlightPending=!1;var t=e.session;if(!t||!t.bgTokenizer)return;var n=t.findMatchingBracket(e.getCursorPosition());if(n)var r=new p(n.row,n.column,n.row,n.column+1);else if(t.$mode.getMatching)var r=t.$mode.getMatching(e.session);r&&(t.$bracketHighlight=t.addMarker(r,"ace_bracket","text"))},50)},this.$highlightTags=function(){if(this.$highlightTagPending)return;var e=this;this.$highlightTagPending=!0,setTimeout(function(){e.$highlightTagPending=!1;var t=e.session;if(!t||!t.bgTokenizer)return;var n=e.getCursorPosition(),r=new y(e.session,n.row,n.column),i=r.getCurrentToken();if(!i||!/\b(?:tag-open|tag-name)/.test(i.type)){t.removeMarker(t.$tagHighlight),t.$tagHighlight=null;return}if(i.type.indexOf("tag-open")!=-1){i=r.stepForward();if(!i)return}var s=i.value,o=0,u=r.stepBackward();if(u.value=="<"){do u=i,i=r.stepForward(),i&&i.value===s&&i.type.indexOf("tag-name")!==-1&&(u.value==="<"?o++:u.value==="</"&&o--);while(i&&o>=0)}else{do i=u,u=r.stepBackward(),i&&i.value===s&&i.type.indexOf("tag-name")!==-1&&(u.value==="<"?o++:u.value==="</"&&o--);while(u&&o<=0);r.stepForward()}if(!i){t.removeMarker(t.$tagHighlight),t.$tagHighlight=null;return}var a=r.getCurrentTokenRow(),f=r.getCurrentTokenColumn(),l=new p(a,f,a,f+i.value.length),c=t.$backMarkers[t.$tagHighlight];t.$tagHighlight&&c!=undefined&&l.compareRange(c.range)!==0&&(t.removeMarker(t.$tagHighlight),t.$tagHighlight=null),l&&!t.$tagHighlight&&(t.$tagHighlight=t.addMarker(l,"ace_bracket","text"))},50)},this.focus=function(){var e=this;setTimeout(function(){e.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(e){if(this.$isFocused)return;this.$isFocused=!0,this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus",e)},this.onBlur=function(e){if(!this.$isFocused)return;this.$isFocused=!1,this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur",e)},this.$cursorChange=function(){this.renderer.updateCursor()},this.onDocumentChange=function(e){var t=this.session.$useWrapMode,n=e.start.row==e.end.row?e.end.row:Infinity;this.renderer.updateLines(e.start.row,n,t),this._signal("change",e),this.$cursorChange(),this.$updateHighlightActiveLine()},this.onTokenizerUpdate=function(e){var t=e.data;this.renderer.updateLines(t.first,t.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.$cursorChange(),this.$blockScrolling||(g.warn("Automatically scrolling cursor into view after selection change","this will be disabled in the next version","set editor.$blockScrolling = Infinity to disable this message"),this.renderer.scrollCursorIntoView()),this.$highlightBrackets(),this.$highlightTags(),this.$updateHighlightActiveLine(),this._signal("changeSelection")},this.$updateHighlightActiveLine=function(){var e=this.getSession(),t;if(this.$highlightActiveLine){if(this.$selectionStyle!="line"||!this.selection.isMultiLine())t=this.getCursorPosition();this.renderer.$maxLines&&this.session.getLength()===1&&!(this.renderer.$minLines>1)&&(t=!1)}if(e.$highlightLineMarker&&!t)e.removeMarker(e.$highlightLineMarker.id),e.$highlightLineMarker=null;else if(!e.$highlightLineMarker&&t){var n=new p(t.row,t.column,t.row,Infinity);n.id=e.addMarker(n,"ace_active-line","screenLine"),e.$highlightLineMarker=n}else t&&(e.$highlightLineMarker.start.row=t.row,e.$highlightLineMarker.end.row=t.row,e.$highlightLineMarker.start.column=t.column,e._signal("changeBackMarker"))},this.onSelectionChange=function(e){var t=this.session;t.$selectionMarker&&t.removeMarker(t.$selectionMarker),t.$selectionMarker=null;if(!this.selection.isEmpty()){var n=this.selection.getRange(),r=this.getSelectionStyle();t.$selectionMarker=t.addMarker(n,"ace_selection",r)}else this.$updateHighlightActiveLine();var i=this.$highlightSelectedWord&&this.$getSelectionHighLightRegexp();this.session.highlight(i),this._signal("changeSelection")},this.$getSelectionHighLightRegexp=function(){var e=this.session,t=this.getSelectionRange();if(t.isEmpty()||t.isMultiLine())return;var n=t.start.column-1,r=t.end.column+1,i=e.getLine(t.start.row),s=i.length,o=i.substring(Math.max(n,0),Math.min(r,s));if(n>=0&&/^[\w\d]/.test(o)||r<=s&&/[\w\d]$/.test(o))return;o=i.substring(t.start.column,t.end.column);if(!/^[\w\d]+$/.test(o))return;var u=this.$search.$assembleRegExp({wholeWord:!0,caseSensitive:!0,needle:o});return u},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.updateBreakpoints()},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(e){this.renderer.updateText(),this._emit("changeMode",e)},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getSelectedText=function(){return this.session.getTextRange(this.getSelectionRange())},this.getCopyText=function(){var e=this.getSelectedText();return this._signal("copy",e),e},this.onCopy=function(){this.commands.exec("copy",this)},this.onCut=function(){this.commands.exec("cut",this)},this.onPaste=function(e,t){var n={text:e,event:t};this.commands.exec("paste",this,n)},this.$handlePaste=function(e){typeof e=="string"&&(e={text:e}),this._signal("paste",e);var t=e.text;if(!this.inMultiSelectMode||this.inVirtualSelectionMode)this.insert(t);else{var n=t.split(/\r\n|\r|\n/),r=this.selection.rangeList.ranges;if(n.length>r.length||n.length<2||!n[1])return this.commands.exec("insertstring",this,t);for(var i=r.length;i--;){var s=r[i];s.isEmpty()||this.session.remove(s),this.session.insert(s.start,n[i])}}},this.execCommand=function(e,t){return this.commands.exec(e,this,t)},this.insert=function(e,t){var n=this.session,r=n.getMode(),i=this.getCursorPosition();if(this.getBehavioursEnabled()&&!t){var s=r.transformAction(n.getState(i.row),"insertion",this,n,e);s&&(e!==s.text&&(this.session.mergeUndoDeltas=!1,this.$mergeNextCommand=!1),e=s.text)}e=="	"&&(e=this.session.getTabString());if(!this.selection.isEmpty()){var o=this.getSelectionRange();i=this.session.remove(o),this.clearSelection()}else if(this.session.getOverwrite()&&e.indexOf("\n")==-1){var o=new p.fromPoints(i,i);o.end.column+=e.length,this.session.remove(o)}if(e=="\n"||e=="\r\n"){var u=n.getLine(i.row);if(i.column>u.search(/\S|$/)){var a=u.substr(i.column).search(/\S|$/);n.doc.removeInLine(i.row,i.column,i.column+a)}}this.clearSelection();var f=i.column,l=n.getState(i.row),u=n.getLine(i.row),c=r.checkOutdent(l,u,e),h=n.insert(i,e);s&&s.selection&&(s.selection.length==2?this.selection.setSelectionRange(new p(i.row,f+s.selection[0],i.row,f+s.selection[1])):this.selection.setSelectionRange(new p(i.row+s.selection[0],s.selection[1],i.row+s.selection[2],s.selection[3])));if(n.getDocument().isNewLine(e)){var d=r.getNextLineIndent(l,u.slice(0,i.column),n.getTabString());n.insert({row:i.row+1,column:0},d)}c&&r.autoOutdent(l,n,i.row)},this.onTextInput=function(e){this.keyBinding.onTextInput(e)},this.onCommandKey=function(e,t,n){this.keyBinding.onCommandKey(e,t,n)},this.setOverwrite=function(e){this.session.setOverwrite(e)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(e){this.setOption("scrollSpeed",e)},this.getScrollSpeed=function(){return this.getOption("scrollSpeed")},this.setDragDelay=function(e){this.setOption("dragDelay",e)},this.getDragDelay=function(){return this.getOption("dragDelay")},this.setSelectionStyle=function(e){this.setOption("selectionStyle",e)},this.getSelectionStyle=function(){return this.getOption("selectionStyle")},this.setHighlightActiveLine=function(e){this.setOption("highlightActiveLine",e)},this.getHighlightActiveLine=function(){return this.getOption("highlightActiveLine")},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.setHighlightSelectedWord=function(e){this.setOption("highlightSelectedWord",e)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(e){this.renderer.setAnimatedScroll(e)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(e){this.renderer.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setDisplayIndentGuides=function(e){this.renderer.setDisplayIndentGuides(e)},this.getDisplayIndentGuides=function(){return this.renderer.getDisplayIndentGuides()},this.setShowPrintMargin=function(e){this.renderer.setShowPrintMargin(e)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(e){this.renderer.setPrintMarginColumn(e)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.setReadOnly=function(e){this.setOption("readOnly",e)},this.getReadOnly=function(){return this.getOption("readOnly")},this.setBehavioursEnabled=function(e){this.setOption("behavioursEnabled",e)},this.getBehavioursEnabled=function(){return this.getOption("behavioursEnabled")},this.setWrapBehavioursEnabled=function(e){this.setOption("wrapBehavioursEnabled",e)},this.getWrapBehavioursEnabled=function(){return this.getOption("wrapBehavioursEnabled")},this.setShowFoldWidgets=function(e){this.setOption("showFoldWidgets",e)},this.getShowFoldWidgets=function(){return this.getOption("showFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.remove=function(e){this.selection.isEmpty()&&(e=="left"?this.selection.selectLeft():this.selection.selectRight());var t=this.getSelectionRange();if(this.getBehavioursEnabled()){var n=this.session,r=n.getState(t.start.row),i=n.getMode().transformAction(r,"deletion",this,n,t);if(t.end.column===0){var s=n.getTextRange(t);if(s[s.length-1]=="\n"){var o=n.getLine(t.end.row);/^\s+$/.test(o)&&(t.end.column=o.length)}}i&&(t=i)}this.session.remove(t),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var e=this.getSelectionRange();e.start.column==e.end.column&&e.start.row==e.end.row&&(e.end.column=0,e.end.row++),this.session.remove(e),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var e=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(e)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var e=this.getCursorPosition(),t=e.column;if(t===0)return;var n=this.session.getLine(e.row),r,i;t<n.length?(r=n.charAt(t)+n.charAt(t-1),i=new p(e.row,t-1,e.row,t+1)):(r=n.charAt(t-1)+n.charAt(t-2),i=new p(e.row,t-2,e.row,t)),this.session.replace(i,r),this.session.selection.moveToPosition(i.end)},this.toLowerCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toLowerCase()),this.selection.setSelectionRange(e)},this.toUpperCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toUpperCase()),this.selection.setSelectionRange(e)},this.indent=function(){var e=this.session,t=this.getSelectionRange();if(t.start.row<t.end.row){var n=this.$getSelectedRows();e.indentRows(n.first,n.last,"	");return}if(t.start.column<t.end.column){var r=e.getTextRange(t);if(!/^\s+$/.test(r)){var n=this.$getSelectedRows();e.indentRows(n.first,n.last,"	");return}}var i=e.getLine(t.start.row),o=t.start,u=e.getTabSize(),a=e.documentToScreenColumn(o.row,o.column);if(this.session.getUseSoftTabs())var f=u-a%u,l=s.stringRepeat(" ",f);else{var f=a%u;while(i[t.start.column-1]==" "&&f)t.start.column--,f--;this.selection.setSelectionRange(t),l="	"}return this.insert(l)},this.blockIndent=function(){var e=this.$getSelectedRows();this.session.indentRows(e.first,e.last,"	")},this.blockOutdent=function(){var e=this.session.getSelection();this.session.outdentRows(e.getRange())},this.sortLines=function(){var e=this.$getSelectedRows(),t=this.session,n=[];for(i=e.first;i<=e.last;i++)n.push(t.getLine(i));n.sort(function(e,t){return e.toLowerCase()<t.toLowerCase()?-1:e.toLowerCase()>t.toLowerCase()?1:0});var r=new p(0,0,0,0);for(var i=e.first;i<=e.last;i++){var s=t.getLine(i);r.start.row=i,r.end.row=i,r.end.column=s.length,t.replace(r,n[i-e.first])}},this.toggleCommentLines=function(){var e=this.session.getState(this.getCursorPosition().row),t=this.$getSelectedRows();this.session.getMode().toggleCommentLines(e,this.session,t.first,t.last)},this.toggleBlockComment=function(){var e=this.getCursorPosition(),t=this.session.getState(e.row),n=this.getSelectionRange();this.session.getMode().toggleBlockComment(t,this.session,n,e)},this.getNumberAt=function(e,t){var n=/[\-]?[0-9]+(?:\.[0-9]+)?/g;n.lastIndex=0;var r=this.session.getLine(e);while(n.lastIndex<t){var i=n.exec(r);if(i.index<=t&&i.index+i[0].length>=t){var s={value:i[0],start:i.index,end:i.index+i[0].length};return s}}return null},this.modifyNumber=function(e){var t=this.selection.getCursor().row,n=this.selection.getCursor().column,r=new p(t,n-1,t,n),i=this.session.getTextRange(r);if(!isNaN(parseFloat(i))&&isFinite(i)){var s=this.getNumberAt(t,n);if(s){var o=s.value.indexOf(".")>=0?s.start+s.value.indexOf(".")+1:s.end,u=s.start+s.value.length-o,a=parseFloat(s.value);a*=Math.pow(10,u),o!==s.end&&n<o?e*=Math.pow(10,s.end-n-1):e*=Math.pow(10,s.end-n),a+=e,a/=Math.pow(10,u);var f=a.toFixed(u),l=new p(t,s.start,t,s.end);this.session.replace(l,f),this.moveCursorTo(t,Math.max(s.start+1,n+f.length-s.value.length))}}},this.removeLines=function(){var e=this.$getSelectedRows();this.session.removeFullLines(e.first,e.last),this.clearSelection()},this.duplicateSelection=function(){var e=this.selection,t=this.session,n=e.getRange(),r=e.isBackwards();if(n.isEmpty()){var i=n.start.row;t.duplicateLines(i,i)}else{var s=r?n.start:n.end,o=t.insert(s,t.getTextRange(n),!1);n.start=s,n.end=o,e.setSelectionRange(n,r)}},this.moveLinesDown=function(){this.$moveLines(1,!1)},this.moveLinesUp=function(){this.$moveLines(-1,!1)},this.moveText=function(e,t,n){return this.session.moveText(e,t,n)},this.copyLinesUp=function(){this.$moveLines(-1,!0)},this.copyLinesDown=function(){this.$moveLines(1,!0)},this.$moveLines=function(e,t){var n,r,i=this.selection;if(!i.inMultiSelectMode||this.inVirtualSelectionMode){var s=i.toOrientedRange();n=this.$getSelectedRows(s),r=this.session.$moveLines(n.first,n.last,t?0:e),t&&e==-1&&(r=0),s.moveBy(r,0),i.fromOrientedRange(s)}else{var o=i.rangeList.ranges;i.rangeList.detach(this.session),this.inVirtualSelectionMode=!0;var u=0,a=0,f=o.length;for(var l=0;l<f;l++){var c=l;o[l].moveBy(u,0),n=this.$getSelectedRows(o[l]);var h=n.first,p=n.last;while(++l<f){a&&o[l].moveBy(a,0);var d=this.$getSelectedRows(o[l]);if(t&&d.first!=p)break;if(!t&&d.first>p+1)break;p=d.last}l--,u=this.session.$moveLines(h,p,t?0:e),t&&e==-1&&(c=l+1);while(c<=l)o[c].moveBy(u,0),c++;t||(u=0),a+=u}i.fromOrientedRange(i.ranges[0]),i.rangeList.attach(this.session),this.inVirtualSelectionMode=!1}},this.$getSelectedRows=function(e){return e=(e||this.getSelectionRange()).collapseRows(),{first:this.session.getRowFoldStart(e.start.row),last:this.session.getRowFoldEnd(e.end.row)}},this.onCompositionStart=function(e){this.renderer.showComposition(this.getCursorPosition())},this.onCompositionUpdate=function(e){this.renderer.setCompositionText(e)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(e){return e>=this.getFirstVisibleRow()&&e<=this.getLastVisibleRow()},this.isRowFullyVisible=function(e){return e>=this.renderer.getFirstFullyVisibleRow()&&e<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$moveByPage=function(e,t){var n=this.renderer,r=this.renderer.layerConfig,i=e*Math.floor(r.height/r.lineHeight);this.$blockScrolling++,t===!0?this.selection.$moveSelection(function(){this.moveCursorBy(i,0)}):t===!1&&(this.selection.moveCursorBy(i,0),this.selection.clearSelection()),this.$blockScrolling--;var s=n.scrollTop;n.scrollBy(0,i*r.lineHeight),t!=null&&n.scrollCursorIntoView(null,.5),n.animateScrolling(s)},this.selectPageDown=function(){this.$moveByPage(1,!0)},this.selectPageUp=function(){this.$moveByPage(-1,!0)},this.gotoPageDown=function(){this.$moveByPage(1,!1)},this.gotoPageUp=function(){this.$moveByPage(-1,!1)},this.scrollPageDown=function(){this.$moveByPage(1)},this.scrollPageUp=function(){this.$moveByPage(-1)},this.scrollToRow=function(e){this.renderer.scrollToRow(e)},this.scrollToLine=function(e,t,n,r){this.renderer.scrollToLine(e,t,n,r)},this.centerSelection=function(){var e=this.getSelectionRange(),t={row:Math.floor(e.start.row+(e.end.row-e.start.row)/2),column:Math.floor(e.start.column+(e.end.column-e.start.column)/2)};this.renderer.alignCursor(t,.5)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.$blockScrolling+=1,this.selection.selectAll(),this.$blockScrolling-=1},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(e,t){this.selection.moveCursorTo(e,t)},this.moveCursorToPosition=function(e){this.selection.moveCursorToPosition(e)},this.jumpToMatching=function(e,t){var n=this.getCursorPosition(),r=new y(this.session,n.row,n.column),i=r.getCurrentToken(),s=i||r.stepForward();if(!s)return;var o,u=!1,a={},f=n.column-s.start,l,c={")":"(","(":"(","]":"[","[":"[","{":"{","}":"{"};do{if(s.value.match(/[{}()\[\]]/g))for(;f<s.value.length&&!u;f++){if(!c[s.value[f]])continue;l=c[s.value[f]]+"."+s.type.replace("rparen","lparen"),isNaN(a[l])&&(a[l]=0);switch(s.value[f]){case"(":case"[":case"{":a[l]++;break;case")":case"]":case"}":a[l]--,a[l]===-1&&(o="bracket",u=!0)}}else s&&s.type.indexOf("tag-name")!==-1&&(isNaN(a[s.value])&&(a[s.value]=0),i.value==="<"?a[s.value]++:i.value==="</"&&a[s.value]--,a[s.value]===-1&&(o="tag",u=!0));u||(i=s,s=r.stepForward(),f=0)}while(s&&!u);if(!o)return;var h,d;if(o==="bracket"){h=this.session.getBracketRange(n);if(!h){h=new p(r.getCurrentTokenRow(),r.getCurrentTokenColumn()+f-1,r.getCurrentTokenRow(),r.getCurrentTokenColumn()+f-1),d=h.start;if(t||d.row===n.row&&Math.abs(d.column-n.column)<2)h=this.session.getBracketRange(d)}}else if(o==="tag"){if(!s||s.type.indexOf("tag-name")===-1)return;var v=s.value;h=new p(r.getCurrentTokenRow(),r.getCurrentTokenColumn()-2,r.getCurrentTokenRow(),r.getCurrentTokenColumn()-2);if(h.compare(n.row,n.column)===0){u=!1;do s=i,i=r.stepBackward(),i&&(i.type.indexOf("tag-close")!==-1&&h.setEnd(r.getCurrentTokenRow(),r.getCurrentTokenColumn()+1),s.value===v&&s.type.indexOf("tag-name")!==-1&&(i.value==="<"?a[v]++:i.value==="</"&&a[v]--,a[v]===0&&(u=!0)));while(i&&!u)}s&&s.type.indexOf("tag-name")&&(d=h.start,d.row==n.row&&Math.abs(d.column-n.column)<2&&(d=h.end))}d=h&&h.cursor||d,d&&(e?h&&t?this.selection.setRange(h):h&&h.isEqual(this.getSelectionRange())?this.clearSelection():this.selection.selectTo(d.row,d.column):this.selection.moveTo(d.row,d.column))},this.gotoLine=function(e,t,n){this.selection.clearSelection(),this.session.unfold({row:e-1,column:t||0}),this.$blockScrolling+=1,this.exitMultiSelectMode&&this.exitMultiSelectMode(),this.moveCursorTo(e-1,t||0),this.$blockScrolling-=1,this.isRowFullyVisible(e-1)||this.scrollToLine(e-1,!0,n)},this.navigateTo=function(e,t){this.selection.moveTo(e,t)},this.navigateUp=function(e){if(this.selection.isMultiLine()&&!this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(-e||-1,0)},this.navigateDown=function(e){if(this.selection.isMultiLine()&&this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(e||1,0)},this.navigateLeft=function(e){if(!this.selection.isEmpty()){var t=this.getSelectionRange().start;this.moveCursorToPosition(t)}else{e=e||1;while(e--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(e){if(!this.selection.isEmpty()){var t=this.getSelectionRange().end;this.moveCursorToPosition(t)}else{e=e||1;while(e--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(e,t){t&&this.$search.set(t);var n=this.$search.find(this.session),r=0;return n?(this.$tryReplace(n,e)&&(r=1),n!==null&&(this.selection.setSelectionRange(n),this.renderer.scrollSelectionIntoView(n.start,n.end)),r):r},this.replaceAll=function(e,t){t&&this.$search.set(t);var n=this.$search.findAll(this.session),r=0;if(!n.length)return r;this.$blockScrolling+=1;var i=this.getSelectionRange();this.selection.moveTo(0,0);for(var s=n.length-1;s>=0;--s)this.$tryReplace(n[s],e)&&r++;return this.selection.setSelectionRange(i),this.$blockScrolling-=1,r},this.$tryReplace=function(e,t){var n=this.session.getTextRange(e);return t=this.$search.replace(n,t),t!==null?(e.end=this.session.replace(e,t),e):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(e,t,n){t||(t={}),typeof e=="string"||e instanceof RegExp?t.needle=e:typeof e=="object"&&r.mixin(t,e);var i=this.selection.getRange();t.needle==null&&(e=this.session.getTextRange(i)||this.$search.$options.needle,e||(i=this.session.getWordRange(i.start.row,i.start.column),e=this.session.getTextRange(i)),this.$search.set({needle:e})),this.$search.set(t),t.start||this.$search.set({start:i});var s=this.$search.find(this.session);if(t.preventScroll)return s;if(s)return this.revealRange(s,n),s;t.backwards?i.start=i.end:i.end=i.start,this.selection.setRange(i)},this.findNext=function(e,t){this.find({skipCurrent:!0,backwards:!1},e,t)},this.findPrevious=function(e,t){this.find(e,{skipCurrent:!0,backwards:!0},t)},this.revealRange=function(e,t){this.$blockScrolling+=1,this.session.unfold(e),this.selection.setSelectionRange(e),this.$blockScrolling-=1;var n=this.renderer.scrollTop;this.renderer.scrollSelectionIntoView(e.start,e.end,.5),t!==!1&&this.renderer.animateScrolling(n)},this.undo=function(){this.$blockScrolling++,this.session.getUndoManager().undo(),this.$blockScrolling--,this.renderer.scrollCursorIntoView(null,.5)},this.redo=function(){this.$blockScrolling++,this.session.getUndoManager().redo(),this.$blockScrolling--,this.renderer.scrollCursorIntoView(null,.5)},this.destroy=function(){this.renderer.destroy(),this._signal("destroy",this),this.session&&this.session.destroy()},this.setAutoScrollEditorIntoView=function(e){if(!e)return;var t,n=this,r=!1;this.$scrollAnchor||(this.$scrollAnchor=document.createElement("div"));var i=this.$scrollAnchor;i.style.cssText="position:absolute",this.container.insertBefore(i,this.container.firstChild);var s=this.on("changeSelection",function(){r=!0}),o=this.renderer.on("beforeRender",function(){r&&(t=n.renderer.container.getBoundingClientRect())}),u=this.renderer.on("afterRender",function(){if(r&&t&&(n.isFocused()||n.searchBox&&n.searchBox.isFocused())){var e=n.renderer,s=e.$cursorLayer.$pixelPos,o=e.layerConfig,u=s.top-o.offset;s.top>=0&&u+t.top<0?r=!0:s.top<o.height&&s.top+t.top+o.lineHeight>window.innerHeight?r=!1:r=null,r!=null&&(i.style.top=u+"px",i.style.left=s.left+"px",i.style.height=o.lineHeight+"px",i.scrollIntoView(r)),r=t=null}});this.setAutoScrollEditorIntoView=function(e){if(e)return;delete this.setAutoScrollEditorIntoView,this.off("changeSelection",s),this.renderer.off("afterRender",u),this.renderer.off("beforeRender",o)}},this.$resetCursorStyle=function(){var e=this.$cursorStyle||"ace",t=this.renderer.$cursorLayer;if(!t)return;t.setSmoothBlinking(/smooth/.test(e)),t.isBlinking=!this.$readOnly&&e!="wide",i.setCssClass(t.element,"ace_slim-cursors",/slim/.test(e))}}.call(b.prototype),g.defineOptions(b.prototype,"editor",{selectionStyle:{set:function(e){this.onSelectionChange(),this._signal("changeSelectionStyle",{data:e})},initialValue:"line"},highlightActiveLine:{set:function(){this.$updateHighlightActiveLine()},initialValue:!0},highlightSelectedWord:{set:function(e){this.$onSelectionChange()},initialValue:!0},readOnly:{set:function(e){this.$resetCursorStyle()},initialValue:!1},cursorStyle:{set:function(e){this.$resetCursorStyle()},values:["ace","slim","smooth","wide"],initialValue:"ace"},mergeUndoDeltas:{values:[!1,!0,"always"],initialValue:!0},behavioursEnabled:{initialValue:!0},wrapBehavioursEnabled:{initialValue:!0},autoScrollEditorIntoView:{set:function(e){this.setAutoScrollEditorIntoView(e)}},keyboardHandler:{set:function(e){this.setKeyboardHandler(e)},get:function(){return this.keybindingId},handlesSet:!0},hScrollBarAlwaysVisible:"renderer",vScrollBarAlwaysVisible:"renderer",highlightGutterLine:"renderer",animatedScroll:"renderer",showInvisibles:"renderer",showPrintMargin:"renderer",printMarginColumn:"renderer",printMargin:"renderer",fadeFoldWidgets:"renderer",showFoldWidgets:"renderer",showLineNumbers:"renderer",showGutter:"renderer",displayIndentGuides:"renderer",fontSize:"renderer",fontFamily:"renderer",maxLines:"renderer",minLines:"renderer",scrollPastEnd:"renderer",fixedWidthGutter:"renderer",theme:"renderer",scrollSpeed:"$mouseHandler",dragDelay:"$mouseHandler",dragEnabled:"$mouseHandler",focusTimout:"$mouseHandler",tooltipFollowsMouse:"$mouseHandler",firstLineNumber:"session",overwrite:"session",newLineMode:"session",useWorker:"session",useSoftTabs:"session",tabSize:"session",wrap:"session",indentedSoftWrap:"session",foldStyle:"session",mode:"session"}),t.Editor=b}),ace.define("ace/undomanager",["require","exports","module"],function(e,t,n){"use strict";var r=function(){this.reset()};(function(){function e(e){return{action:e.action,start:e.start,end:e.end,lines:e.lines.length==1?null:e.lines,text:e.lines.length==1?e.lines[0]:null}}function t(e){return{action:e.action,start:e.start,end:e.end,lines:e.lines||[e.text]}}function n(e,t){var n=new Array(e.length);for(var r=0;r<e.length;r++){var i=e[r],s={group:i.group,deltas:new Array(i.length)};for(var o=0;o<i.deltas.length;o++){var u=i.deltas[o];s.deltas[o]=t(u)}n[r]=s}return n}this.execute=function(e){var t=e.args[0];this.$doc=e.args[1],e.merge&&this.hasUndo()&&(this.dirtyCounter--,t=this.$undoStack.pop().concat(t)),this.$undoStack.push(t),this.$redoStack=[],this.dirtyCounter<0&&(this.dirtyCounter=NaN),this.dirtyCounter++},this.undo=function(e){var t=this.$undoStack.pop(),n=null;return t&&(n=this.$doc.undoChanges(t,e),this.$redoStack.push(t),this.dirtyCounter--),n},this.redo=function(e){var t=this.$redoStack.pop(),n=null;return t&&(n=this.$doc.redoChanges(this.$deserializeDeltas(t),e),this.$undoStack.push(t),this.dirtyCounter++),n},this.reset=function(){this.$undoStack=[],this.$redoStack=[],this.dirtyCounter=0},this.hasUndo=function(){return this.$undoStack.length>0},this.hasRedo=function(){return this.$redoStack.length>0},this.markClean=function(){this.dirtyCounter=0},this.isClean=function(){return this.dirtyCounter===0},this.$serializeDeltas=function(t){return n(t,e)},this.$deserializeDeltas=function(e){return n(e,t)}}).call(r.prototype),t.UndoManager=r}),ace.define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=e("../lib/oop"),s=e("../lib/lang"),o=e("../lib/event_emitter").EventEmitter,u=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_gutter-layer",e.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$annotations=[],this.$updateAnnotations=this.$updateAnnotations.bind(this),this.$cells=[]};(function(){i.implement(this,o),this.setSession=function(e){this.session&&this.session.removeEventListener("change",this.$updateAnnotations),this.session=e,e&&e.on("change",this.$updateAnnotations)},this.addGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.addGutterDecoration"),this.session.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.removeGutterDecoration"),this.session.removeGutterDecoration(e,t)},this.setAnnotations=function(e){this.$annotations=[];for(var t=0;t<e.length;t++){var n=e[t],r=n.row,i=this.$annotations[r];i||(i=this.$annotations[r]={text:[]});var o=n.text;o=o?s.escapeHTML(o):n.html||"",i.text.indexOf(o)===-1&&i.text.push(o);var u=n.type;u=="error"?i.className=" ace_error":u=="warning"&&i.className!=" ace_error"?i.className=" ace_warning":u=="info"&&!i.className&&(i.className=" ace_info")}},this.$updateAnnotations=function(e){if(!this.$annotations.length)return;var t=e.start.row,n=e.end.row-t;if(n!==0)if(e.action=="remove")this.$annotations.splice(t,n+1,null);else{var r=new Array(n+1);r.unshift(t,1),this.$annotations.splice.apply(this.$annotations,r)}},this.update=function(e){var t=this.session,n=e.firstRow,i=Math.min(e.lastRow+e.gutterOffset,t.getLength()-1),s=t.getNextFoldLine(n),o=s?s.start.row:Infinity,u=this.$showFoldWidgets&&t.foldWidgets,a=t.$breakpoints,f=t.$decorations,l=t.$firstLineNumber,c=0,h=t.gutterRenderer||this.$renderer,p=null,d=-1,v=n;for(;;){v>o&&(v=s.end.row+1,s=t.getNextFoldLine(v,s),o=s?s.start.row:Infinity);if(v>i){while(this.$cells.length>d+1)p=this.$cells.pop(),this.element.removeChild(p.element);break}p=this.$cells[++d],p||(p={element:null,textNode:null,foldWidget:null},p.element=r.createElement("div"),p.textNode=document.createTextNode(""),p.element.appendChild(p.textNode),this.element.appendChild(p.element),this.$cells[d]=p);var m="ace_gutter-cell ";a[v]&&(m+=a[v]),f[v]&&(m+=f[v]),this.$annotations[v]&&(m+=this.$annotations[v].className),p.element.className!=m&&(p.element.className=m);var g=t.getRowLength(v)*e.lineHeight+"px";g!=p.element.style.height&&(p.element.style.height=g);if(u){var y=u[v];y==null&&(y=u[v]=t.getFoldWidget(v))}if(y){p.foldWidget||(p.foldWidget=r.createElement("span"),p.element.appendChild(p.foldWidget));var m="ace_fold-widget ace_"+y;y=="start"&&v==o&&v<s.end.row?m+=" ace_closed":m+=" ace_open",p.foldWidget.className!=m&&(p.foldWidget.className=m);var g=e.lineHeight+"px";p.foldWidget.style.height!=g&&(p.foldWidget.style.height=g)}else p.foldWidget&&(p.element.removeChild(p.foldWidget),p.foldWidget=null);var b=c=h?h.getText(t,v):v+l;b!==p.textNode.data&&(p.textNode.data=b),v++}this.element.style.height=e.minHeight+"px";if(this.$fixedWidth||t.$useWrapMode)c=t.getLength()+l;var w=h?h.getWidth(t,c,e):c.toString().length*e.characterWidth,E=this.$padding||this.$computePadding();w+=E.left+E.right,w!==this.gutterWidth&&!isNaN(w)&&(this.gutterWidth=w,this.element.style.width=Math.ceil(this.gutterWidth)+"px",this._emit("changeGutterWidth",w))},this.$fixedWidth=!1,this.$showLineNumbers=!0,this.$renderer="",this.setShowLineNumbers=function(e){this.$renderer=!e&&{getWidth:function(){return""},getText:function(){return""}}},this.getShowLineNumbers=function(){return this.$showLineNumbers},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(e){e?r.addCssClass(this.element,"ace_folding-enabled"):r.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=e,this.$padding=null},this.getShowFoldWidgets=function(){return this.$showFoldWidgets},this.$computePadding=function(){if(!this.element.firstChild)return{left:0,right:0};var e=r.computedStyle(this.element.firstChild);return this.$padding={},this.$padding.left=parseInt(e.paddingLeft)+1||0,this.$padding.right=parseInt(e.paddingRight)||0,this.$padding},this.getRegion=function(e){var t=this.$padding||this.$computePadding(),n=this.element.getBoundingClientRect();if(e.x<t.left+n.left)return"markers";if(this.$showFoldWidgets&&e.x>n.right-t.right)return"foldWidgets"}}).call(u.prototype),t.Gutter=u}),ace.define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../lib/dom"),s=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_marker-layer",e.appendChild(this.element)};(function(){function e(e,t,n,r){return(e?1:0)|(t?2:0)|(n?4:0)|(r?8:0)}this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setMarkers=function(e){this.markers=e},this.update=function(e){if(!e)return;this.config=e;var t=[];for(var n in this.markers){var r=this.markers[n];if(!r.range){r.update(t,this,this.session,e);continue}var i=r.range.clipRows(e.firstRow,e.lastRow);if(i.isEmpty())continue;i=i.toScreenRange(this.session);if(r.renderer){var s=this.$getTop(i.start.row,e),o=this.$padding+i.start.column*e.characterWidth;r.renderer(t,i,o,s,e)}else r.type=="fullLine"?this.drawFullLineMarker(t,i,r.clazz,e):r.type=="screenLine"?this.drawScreenLineMarker(t,i,r.clazz,e):i.isMultiLine()?r.type=="text"?this.drawTextMarker(t,i,r.clazz,e):this.drawMultiLineMarker(t,i,r.clazz,e):this.drawSingleLineMarker(t,i,r.clazz+" ace_start"+" ace_br15",e)}this.element.innerHTML=t.join("")},this.$getTop=function(e,t){return(e-t.firstRowScreen)*t.lineHeight},this.drawTextMarker=function(t,n,i,s,o){var u=this.session,a=n.start.row,f=n.end.row,l=a,c=0,h=0,p=u.getScreenLastRowColumn(l),d=new r(l,n.start.column,l,h);for(;l<=f;l++)d.start.row=d.end.row=l,d.start.column=l==a?n.start.column:u.getRowWrapIndent(l),d.end.column=p,c=h,h=p,p=l+1<f?u.getScreenLastRowColumn(l+1):l==f?0:n.end.column,this.drawSingleLineMarker(t,d,i+(l==a?" ace_start":"")+" ace_br"+e(l==a||l==a+1&&n.start.column,c<h,h>p,l==f),s,l==f?0:1,o)},this.drawMultiLineMarker=function(e,t,n,r,i){var s=this.$padding,o=r.lineHeight,u=this.$getTop(t.start.row,r),a=s+t.start.column*r.characterWidth;i=i||"",e.push("<div class='",n," ace_br1 ace_start' style='","height:",o,"px;","right:0;","top:",u,"px;","left:",a,"px;",i,"'></div>"),u=this.$getTop(t.end.row,r);var f=t.end.column*r.characterWidth;e.push("<div class='",n," ace_br12' style='","height:",o,"px;","width:",f,"px;","top:",u,"px;","left:",s,"px;",i,"'></div>"),o=(t.end.row-t.start.row-1)*r.lineHeight;if(o<=0)return;u=this.$getTop(t.start.row+1,r);var l=(t.start.column?1:0)|(t.end.column?0:8);e.push("<div class='",n,l?" ace_br"+l:"","' style='","height:",o,"px;","right:0;","top:",u,"px;","left:",s,"px;",i,"'></div>")},this.drawSingleLineMarker=function(e,t,n,r,i,s){var o=r.lineHeight,u=(t.end.column+(i||0)-t.start.column)*r.characterWidth,a=this.$getTop(t.start.row,r),f=this.$padding+t.start.column*r.characterWidth;e.push("<div class='",n,"' style='","height:",o,"px;","width:",u,"px;","top:",a,"px;","left:",f,"px;",s||"","'></div>")},this.drawFullLineMarker=function(e,t,n,r,i){var s=this.$getTop(t.start.row,r),o=r.lineHeight;t.start.row!=t.end.row&&(o+=this.$getTop(t.end.row,r)-s),e.push("<div class='",n,"' style='","height:",o,"px;","top:",s,"px;","left:0;right:0;",i||"","'></div>")},this.drawScreenLineMarker=function(e,t,n,r,i){var s=this.$getTop(t.start.row,r),o=r.lineHeight;e.push("<div class='",n,"' style='","height:",o,"px;","top:",s,"px;","left:0;right:0;",i||"","'></div>")}}).call(s.prototype),t.Marker=s}),ace.define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/useragent"),u=e("../lib/event_emitter").EventEmitter,a=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_text-layer",e.appendChild(this.element),this.$updateEolChar=this.$updateEolChar.bind(this)};(function(){r.implement(this,u),this.EOF_CHAR="\u00b6",this.EOL_CHAR_LF="\u00ac",this.EOL_CHAR_CRLF="\u00a4",this.EOL_CHAR=this.EOL_CHAR_LF,this.TAB_CHAR="\u2014",this.SPACE_CHAR="\u00b7",this.$padding=0,this.$updateEolChar=function(){var e=this.session.doc.getNewLineCharacter()=="\n"?this.EOL_CHAR_LF:this.EOL_CHAR_CRLF;if(this.EOL_CHAR!=e)return this.EOL_CHAR=e,!0},this.setPadding=function(e){this.$padding=e,this.element.style.padding="0 "+e+"px"},this.getLineHeight=function(){return this.$fontMetrics.$characterSize.height||0},this.getCharacterWidth=function(){return this.$fontMetrics.$characterSize.width||0},this.$setFontMetrics=function(e){this.$fontMetrics=e,this.$fontMetrics.on("changeCharacterSize",function(e){this._signal("changeCharacterSize",e)}.bind(this)),this.$pollSizeChanges()},this.checkForSizeChanges=function(){this.$fontMetrics.checkForSizeChanges()},this.$pollSizeChanges=function(){return this.$pollSizeChangesTimer=this.$fontMetrics.$pollSizeChanges()},this.setSession=function(e){this.session=e,e&&this.$computeTabString()},this.showInvisibles=!1,this.setShowInvisibles=function(e){return this.showInvisibles==e?!1:(this.showInvisibles=e,this.$computeTabString(),!0)},this.displayIndentGuides=!0,this.setDisplayIndentGuides=function(e){return this.displayIndentGuides==e?!1:(this.displayIndentGuides=e,this.$computeTabString(),!0)},this.$tabStrings=[],this.onChangeTabSize=this.$computeTabString=function(){var e=this.session.getTabSize();this.tabSize=e;var t=this.$tabStrings=[0];for(var n=1;n<e+1;n++)this.showInvisibles?t.push("<span class='ace_invisible ace_invisible_tab'>"+s.stringRepeat(this.TAB_CHAR,n)+"</span>"):t.push(s.stringRepeat(" ",n));if(this.displayIndentGuides){this.$indentGuideRe=/\s\S| \t|\t |\s$/;var r="ace_indent-guide",i="",o="";if(this.showInvisibles){r+=" ace_invisible",i=" ace_invisible_space",o=" ace_invisible_tab";var u=s.stringRepeat(this.SPACE_CHAR,this.tabSize),a=s.stringRepeat(this.TAB_CHAR,this.tabSize)}else var u=s.stringRepeat(" ",this.tabSize),a=u;this.$tabStrings[" "]="<span class='"+r+i+"'>"+u+"</span>",this.$tabStrings["	"]="<span class='"+r+o+"'>"+a+"</span>"}},this.updateLines=function(e,t,n){(this.config.lastRow!=e.lastRow||this.config.firstRow!=e.firstRow)&&this.scrollLines(e),this.config=e;var r=Math.max(t,e.firstRow),i=Math.min(n,e.lastRow),s=this.element.childNodes,o=0;for(var u=e.firstRow;u<r;u++){var a=this.session.getFoldLine(u);if(a){if(a.containsRow(r)){r=a.start.row;break}u=a.end.row}o++}var u=r,a=this.session.getNextFoldLine(u),f=a?a.start.row:Infinity;for(;;){u>f&&(u=a.end.row+1,a=this.session.getNextFoldLine(u,a),f=a?a.start.row:Infinity);if(u>i)break;var l=s[o++];if(l){var c=[];this.$renderLine(c,u,!this.$useLineGroups(),u==f?a:!1),l.style.height=e.lineHeight*this.session.getRowLength(u)+"px",l.innerHTML=c.join("")}u++}},this.scrollLines=function(e){var t=this.config;this.config=e;if(!t||t.lastRow<e.firstRow)return this.update(e);if(e.lastRow<t.firstRow)return this.update(e);var n=this.element;if(t.firstRow<e.firstRow)for(var r=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);r>0;r--)n.removeChild(n.firstChild);if(t.lastRow>e.lastRow)for(var r=this.session.getFoldedRowCount(e.lastRow+1,t.lastRow);r>0;r--)n.removeChild(n.lastChild);if(e.firstRow<t.firstRow){var i=this.$renderLinesFragment(e,e.firstRow,t.firstRow-1);n.firstChild?n.insertBefore(i,n.firstChild):n.appendChild(i)}if(e.lastRow>t.lastRow){var i=this.$renderLinesFragment(e,t.lastRow+1,e.lastRow);n.appendChild(i)}},this.$renderLinesFragment=function(e,t,n){var r=this.element.ownerDocument.createDocumentFragment(),s=t,o=this.session.getNextFoldLine(s),u=o?o.start.row:Infinity;for(;;){s>u&&(s=o.end.row+1,o=this.session.getNextFoldLine(s,o),u=o?o.start.row:Infinity);if(s>n)break;var a=i.createElement("div"),f=[];this.$renderLine(f,s,!1,s==u?o:!1),a.innerHTML=f.join("");if(this.$useLineGroups())a.className="ace_line_group",r.appendChild(a),a.style.height=e.lineHeight*this.session.getRowLength(s)+"px";else while(a.firstChild)r.appendChild(a.firstChild);s++}return r},this.update=function(e){this.config=e;var t=[],n=e.firstRow,r=e.lastRow,i=n,s=this.session.getNextFoldLine(i),o=s?s.start.row:Infinity;for(;;){i>o&&(i=s.end.row+1,s=this.session.getNextFoldLine(i,s),o=s?s.start.row:Infinity);if(i>r)break;this.$useLineGroups()&&t.push("<div class='ace_line_group' style='height:",e.lineHeight*this.session.getRowLength(i),"px'>"),this.$renderLine(t,i,!1,i==o?s:!1),this.$useLineGroups()&&t.push("</div>"),i++}this.element.innerHTML=t.join("")},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(e,t,n,r){var i=this,o=/\t|&|<|>|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\u3000\uFEFF\uFFF9-\uFFFC])|[\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3000-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]/g,u=function(e,n,r,o,u){if(n)return i.showInvisibles?"<span class='ace_invisible ace_invisible_space'>"+s.stringRepeat(i.SPACE_CHAR,e.length)+"</span>":e;if(e=="&")return"&#38;";if(e=="<")return"&#60;";if(e==">")return"&#62;";if(e=="	"){var a=i.session.getScreenTabSize(t+o);return t+=a-1,i.$tabStrings[a]}if(e=="\u3000"){var f=i.showInvisibles?"ace_cjk ace_invisible ace_invisible_space":"ace_cjk",l=i.showInvisibles?i.SPACE_CHAR:"";return t+=1,"<span class='"+f+"' style='width:"+i.config.characterWidth*2+"px'>"+l+"</span>"}return r?"<span class='ace_invisible ace_invisible_space ace_invalid'>"+i.SPACE_CHAR+"</span>":(t+=1,"<span class='ace_cjk' style='width:"+i.config.characterWidth*2+"px'>"+e+"</span>")},a=r.replace(o,u);if(!this.$textToken[n.type]){var f="ace_"+n.type.replace(/\./g," ace_"),l="";n.type=="fold"&&(l=" style='width:"+n.value.length*this.config.characterWidth+"px;' "),e.push("<span class='",f,"'",l,">",a,"</span>")}else e.push(a);return t+r.length},this.renderIndentGuide=function(e,t,n){var r=t.search(this.$indentGuideRe);return r<=0||r>=n?t:t[0]==" "?(r-=r%this.tabSize,e.push(s.stringRepeat(this.$tabStrings[" "],r/this.tabSize)),t.substr(r)):t[0]=="	"?(e.push(s.stringRepeat(this.$tabStrings["	"],r)),t.substr(r)):t},this.$renderWrappedLine=function(e,t,n,r){var i=0,o=0,u=n[0],a=0;for(var f=0;f<t.length;f++){var l=t[f],c=l.value;if(f==0&&this.displayIndentGuides){i=c.length,c=this.renderIndentGuide(e,c,u);if(!c)continue;i-=c.length}if(i+c.length<u)a=this.$renderToken(e,a,l,c),i+=c.length;else{while(i+c.length>=u)a=this.$renderToken(e,a,l,c.substring(0,u-i)),c=c.substring(u-i),i=u,r||e.push("</div>","<div class='ace_line' style='height:",this.config.lineHeight,"px'>"),e.push(s.stringRepeat("\u00a0",n.indent)),o++,a=0,u=n[o]||Number.MAX_VALUE;c.length!=0&&(i+=c.length,a=this.$renderToken(e,a,l,c))}}},this.$renderSimpleLine=function(e,t){var n=0,r=t[0],i=r.value;this.displayIndentGuides&&(i=this.renderIndentGuide(e,i)),i&&(n=this.$renderToken(e,n,r,i));for(var s=1;s<t.length;s++)r=t[s],i=r.value,n=this.$renderToken(e,n,r,i)},this.$renderLine=function(e,t,n,r){!r&&r!=0&&(r=this.session.getFoldLine(t));if(r)var i=this.$getFoldLineTokens(t,r);else var i=this.session.getTokens(t);n||e.push("<div class='ace_line' style='height:",this.config.lineHeight*(this.$useLineGroups()?1:this.session.getRowLength(t)),"px'>");if(i.length){var s=this.session.getRowSplitData(t);s&&s.length?this.$renderWrappedLine(e,i,s,n):this.$renderSimpleLine(e,i)}this.showInvisibles&&(r&&(t=r.end.row),e.push("<span class='ace_invisible ace_invisible_eol'>",t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,"</span>")),n||e.push("</div>")},this.$getFoldLineTokens=function(e,t){function i(e,t,n){var i=0,s=0;while(s+e[i].value.length<t){s+=e[i].value.length,i++;if(i==e.length)return}if(s!=t){var o=e[i].value.substring(t-s);o.length>n-t&&(o=o.substring(0,n-t)),r.push({type:e[i].type,value:o}),s=t+o.length,i+=1}while(s<n&&i<e.length){var o=e[i].value;o.length+s>n?r.push({type:e[i].type,value:o.substring(0,n-s)}):r.push(e[i]),s+=o.length,i+=1}}var n=this.session,r=[],s=n.getTokens(e);return t.walk(function(e,t,o,u,a){e!=null?r.push({type:"fold",value:e}):(a&&(s=n.getTokens(t)),s.length&&i(s,u,o))},t.end.row,this.session.getLine(t.end.row).length),r},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$measureNode&&this.$measureNode.parentNode.removeChild(this.$measureNode),delete this.$measureNode}}).call(a.prototype),t.Text=a}),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../lib/dom"),i,s=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),i===undefined&&(i=!("opacity"in this.element.style)),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),r.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=(i?this.$updateVisibility:this.$updateOpacity).bind(this)};(function(){this.$updateVisibility=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.visibility=e?"":"hidden"},this.$updateOpacity=function(e){var t=this.cursors;for(var n=t.length;n--;)t[n].style.opacity=e?"":"0"},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&!i&&(this.smoothBlinking=e,r.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.$updateCursors=this.$updateOpacity.bind(this),this.restartTimer())},this.addCursor=function(){var e=r.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,r.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,r.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.smoothBlinking&&r.removeCssClass(this.element,"ace_smooth-blinking"),e(!0);if(!this.isBlinking||!this.blinkInterval||!this.isVisible)return;this.smoothBlinking&&setTimeout(function(){r.addCssClass(this.element,"ace_smooth-blinking")}.bind(this));var t=function(){this.timeoutId=setTimeout(function(){e(!1)},.6*this.blinkInterval)}.bind(this);this.intervalId=setInterval(function(){e(!0),t()},this.blinkInterval),t()},this.getPixelPosition=function(e,t){if(!this.config||!this.session)return{left:0,top:0};e||(e=this.session.selection.getCursor());var n=this.session.documentToScreenPosition(e),r=this.$padding+n.column*this.config.characterWidth,i=(n.row-(t?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:r,top:i}},this.update=function(e){this.config=e;var t=this.session.$selectionMarkers,n=0,r=0;if(t===undefined||t.length===0)t=[{cursor:null}];for(var n=0,i=t.length;n<i;n++){var s=this.getPixelPosition(t[n].cursor,!0);if((s.top>e.height+e.offset||s.top<0)&&n>1)continue;var o=(this.cursors[r++]||this.addCursor()).style;this.drawCursor?this.drawCursor(o,s,e,t[n],this.session):(o.left=s.left+"px",o.top=s.top+"px",o.width=e.characterWidth+"px",o.height=e.lineHeight+"px")}while(this.cursors.length>r)this.removeCursor();var u=this.session.getOverwrite();this.$setOverwrite(u),this.$pixelPos=s,this.restartTimer()},this.drawCursor=null,this.$setOverwrite=function(e){e!=this.overwrite&&(this.overwrite=e,e?r.addCssClass(this.element,"ace_overwrite-cursors"):r.removeCssClass(this.element,"ace_overwrite-cursors"))},this.destroy=function(){clearInterval(this.intervalId),clearTimeout(this.timeoutId)}}).call(s.prototype),t.Cursor=s}),ace.define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./lib/event"),o=e("./lib/event_emitter").EventEmitter,u=32768,a=function(e){this.element=i.createElement("div"),this.element.className="ace_scrollbar ace_scrollbar"+this.classSuffix,this.inner=i.createElement("div"),this.inner.className="ace_scrollbar-inner",this.element.appendChild(this.inner),e.appendChild(this.element),this.setVisible(!1),this.skipEvent=!1,s.addListener(this.element,"scroll",this.onScroll.bind(this)),s.addListener(this.element,"mousedown",s.preventDefault)};(function(){r.implement(this,o),this.setVisible=function(e){this.element.style.display=e?"":"none",this.isVisible=e,this.coeff=1}}).call(a.prototype);var f=function(e,t){a.call(this,e),this.scrollTop=0,this.scrollHeight=0,t.$scrollbarWidth=this.width=i.scrollbarWidth(e.ownerDocument),this.inner.style.width=this.element.style.width=(this.width||15)+5+"px",this.$minWidth=0};r.inherits(f,a),function(){this.classSuffix="-v",this.onScroll=function(){if(!this.skipEvent){this.scrollTop=this.element.scrollTop;if(this.coeff!=1){var e=this.element.clientHeight/this.scrollHeight;this.scrollTop=this.scrollTop*(1-e)/(this.coeff-e)}this._emit("scroll",{data:this.scrollTop})}this.skipEvent=!1},this.getWidth=function(){return Math.max(this.isVisible?this.width:0,this.$minWidth||0)},this.setHeight=function(e){this.element.style.height=e+"px"},this.setInnerHeight=this.setScrollHeight=function(e){this.scrollHeight=e,e>u?(this.coeff=u/e,e=u):this.coeff!=1&&(this.coeff=1),this.inner.style.height=e+"px"},this.setScrollTop=function(e){this.scrollTop!=e&&(this.skipEvent=!0,this.scrollTop=e,this.element.scrollTop=e*this.coeff)}}.call(f.prototype);var l=function(e,t){a.call(this,e),this.scrollLeft=0,this.height=t.$scrollbarWidth,this.inner.style.height=this.element.style.height=(this.height||15)+5+"px"};r.inherits(l,a),function(){this.classSuffix="-h",this.onScroll=function(){this.skipEvent||(this.scrollLeft=this.element.scrollLeft,this._emit("scroll",{data:this.scrollLeft})),this.skipEvent=!1},this.getHeight=function(){return this.isVisible?this.height:0},this.setWidth=function(e){this.element.style.width=e+"px"},this.setInnerWidth=function(e){this.inner.style.width=e+"px"},this.setScrollWidth=function(e){this.inner.style.width=e+"px"},this.setScrollLeft=function(e){this.scrollLeft!=e&&(this.skipEvent=!0,this.scrollLeft=this.element.scrollLeft=e)}}.call(l.prototype),t.ScrollBar=f,t.ScrollBarV=f,t.ScrollBarH=l,t.VScrollBar=f,t.HScrollBar=l}),ace.define("ace/renderloop",["require","exports","module","ace/lib/event"],function(e,t,n){"use strict";var r=e("./lib/event"),i=function(e,t){this.onRender=e,this.pending=!1,this.changes=0,this.window=t||window};(function(){this.schedule=function(e){this.changes=this.changes|e;if(!this.pending&&this.changes){this.pending=!0;var t=this;r.nextFrame(function(){t.pending=!1;var e;while(e=t.changes)t.changes=0,t.onRender(e)},this.window)}}}).call(i.prototype),t.RenderLoop=i}),ace.define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/lib/event_emitter"],function(e,t,n){var r=e("../lib/oop"),i=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/useragent"),u=e("../lib/event_emitter").EventEmitter,a=0,f=t.FontMetrics=function(e){this.el=i.createElement("div"),this.$setMeasureNodeStyles(this.el.style,!0),this.$main=i.createElement("div"),this.$setMeasureNodeStyles(this.$main.style),this.$measureNode=i.createElement("div"),this.$setMeasureNodeStyles(this.$measureNode.style),this.el.appendChild(this.$main),this.el.appendChild(this.$measureNode),e.appendChild(this.el),a||this.$testFractionalRect(),this.$measureNode.innerHTML=s.stringRepeat("X",a),this.$characterSize={width:0,height:0},this.checkForSizeChanges()};(function(){r.implement(this,u),this.$characterSize={width:0,height:0},this.$testFractionalRect=function(){var e=i.createElement("div");this.$setMeasureNodeStyles(e.style),e.style.width="0.2px",document.documentElement.appendChild(e);var t=e.getBoundingClientRect().width;t>0&&t<1?a=50:a=100,e.parentNode.removeChild(e)},this.$setMeasureNodeStyles=function(e,t){e.width=e.height="auto",e.left=e.top="0px",e.visibility="hidden",e.position="absolute",e.whiteSpace="pre",o.isIE<8?e["font-family"]="inherit":e.font="inherit",e.overflow=t?"hidden":"visible"},this.checkForSizeChanges=function(){var e=this.$measureSizes();if(e&&(this.$characterSize.width!==e.width||this.$characterSize.height!==e.height)){this.$measureNode.style.fontWeight="bold";var t=this.$measureSizes();this.$measureNode.style.fontWeight="",this.$characterSize=e,this.charSizes=Object.create(null),this.allowBoldFonts=t&&t.width===e.width&&t.height===e.height,this._emit("changeCharacterSize",{data:e})}},this.$pollSizeChanges=function(){if(this.$pollSizeChangesTimer)return this.$pollSizeChangesTimer;var e=this;return this.$pollSizeChangesTimer=setInterval(function(){e.checkForSizeChanges()},500)},this.setPolling=function(e){e?this.$pollSizeChanges():this.$pollSizeChangesTimer&&(clearInterval(this.$pollSizeChangesTimer),this.$pollSizeChangesTimer=0)},this.$measureSizes=function(){if(a===50){var e=null;try{e=this.$measureNode.getBoundingClientRect()}catch(t){e={width:0,height:0}}var n={height:e.height,width:e.width/a}}else var n={height:this.$measureNode.clientHeight,width:this.$measureNode.clientWidth/a};return n.width===0||n.height===0?null:n},this.$measureCharWidth=function(e){this.$main.innerHTML=s.stringRepeat(e,a);var t=this.$main.getBoundingClientRect();return t.width/a},this.getCharacterWidth=function(e){var t=this.charSizes[e];return t===undefined&&(t=this.charSizes[e]=this.$measureCharWidth(e)/this.$characterSize.width),t},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.el&&this.el.parentNode&&this.el.parentNode.removeChild(this.el)}}).call(f.prototype)}),ace.define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/lib/useragent","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./config"),o=e("./lib/useragent"),u=e("./layer/gutter").Gutter,a=e("./layer/marker").Marker,f=e("./layer/text").Text,l=e("./layer/cursor").Cursor,c=e("./scrollbar").HScrollBar,h=e("./scrollbar").VScrollBar,p=e("./renderloop").RenderLoop,d=e("./layer/font_metrics").FontMetrics,v=e("./lib/event_emitter").EventEmitter,m='.ace_editor {position: relative;overflow: hidden;font: 12px/normal \'Monaco\', \'Menlo\', \'Ubuntu Mono\', \'Consolas\', \'source-code-pro\', monospace;direction: ltr;text-align: left;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}.ace_scroller {position: absolute;overflow: hidden;top: 0;bottom: 0;background-color: inherit;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;cursor: text;}.ace_content {position: absolute;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;min-width: 100%;}.ace_dragging .ace_scroller:before{position: absolute;top: 0;left: 0;right: 0;bottom: 0;content: \'\';background: rgba(250, 250, 250, 0.01);z-index: 1000;}.ace_dragging.ace_dark .ace_scroller:before{background: rgba(0, 0, 0, 0.01);}.ace_selecting, .ace_selecting * {cursor: text !important;}.ace_gutter {position: absolute;overflow : hidden;width: auto;top: 0;bottom: 0;left: 0;cursor: default;z-index: 4;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;}.ace_gutter-active-line {position: absolute;left: 0;right: 0;}.ace_scroller.ace_scroll-left {box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;}.ace_gutter-cell {padding-left: 19px;padding-right: 6px;background-repeat: no-repeat;}.ace_gutter-cell.ace_error {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: 2px center;}.ace_gutter-cell.ace_warning {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==");background-position: 2px center;}.ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=");background-position: 2px center;}.ace_dark .ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC");}.ace_scrollbar {position: absolute;right: 0;bottom: 0;z-index: 6;}.ace_scrollbar-inner {position: absolute;cursor: text;left: 0;top: 0;}.ace_scrollbar-v{overflow-x: hidden;overflow-y: scroll;top: 0;}.ace_scrollbar-h {overflow-x: scroll;overflow-y: hidden;left: 0;}.ace_print-margin {position: absolute;height: 100%;}.ace_text-input {position: absolute;z-index: 0;width: 0.5em;height: 1em;opacity: 0;background: transparent;-moz-appearance: none;appearance: none;border: none;resize: none;outline: none;overflow: hidden;font: inherit;padding: 0 1px;margin: 0 -1px;text-indent: -1em;-ms-user-select: text;-moz-user-select: text;-webkit-user-select: text;user-select: text;white-space: pre!important;}.ace_text-input.ace_composition {background: inherit;color: inherit;z-index: 1000;opacity: 1;text-indent: 0;}.ace_layer {z-index: 1;position: absolute;overflow: hidden;word-wrap: normal;white-space: pre;height: 100%;width: 100%;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;pointer-events: none;}.ace_gutter-layer {position: relative;width: auto;text-align: right;pointer-events: auto;}.ace_text-layer {font: inherit !important;}.ace_cjk {display: inline-block;text-align: center;}.ace_cursor-layer {z-index: 4;}.ace_cursor {z-index: 4;position: absolute;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;border-left: 2px solid;transform: translatez(0);}.ace_multiselect .ace_cursor {border-left-width: 1px;}.ace_slim-cursors .ace_cursor {border-left-width: 1px;}.ace_overwrite-cursors .ace_cursor {border-left-width: 0;border-bottom: 1px solid;}.ace_hidden-cursors .ace_cursor {opacity: 0.2;}.ace_smooth-blinking .ace_cursor {-webkit-transition: opacity 0.18s;transition: opacity 0.18s;}.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {position: absolute;z-index: 3;}.ace_marker-layer .ace_selection {position: absolute;z-index: 5;}.ace_marker-layer .ace_bracket {position: absolute;z-index: 6;}.ace_marker-layer .ace_active-line {position: absolute;z-index: 2;}.ace_marker-layer .ace_selected-word {position: absolute;z-index: 4;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;}.ace_line .ace_fold {-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;display: inline-block;height: 11px;margin-top: -2px;vertical-align: middle;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=");background-repeat: no-repeat, repeat-x;background-position: center center, top left;color: transparent;border: 1px solid black;border-radius: 2px;cursor: pointer;pointer-events: auto;}.ace_dark .ace_fold {}.ace_fold:hover{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC");}.ace_tooltip {background-color: #FFF;background-image: -webkit-linear-gradient(top, transparent, rgba(0, 0, 0, 0.1));background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));border: 1px solid gray;border-radius: 1px;box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);color: black;max-width: 100%;padding: 3px 4px;position: fixed;z-index: 999999;-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;cursor: default;white-space: pre;word-wrap: break-word;line-height: normal;font-style: normal;font-weight: normal;letter-spacing: normal;pointer-events: none;}.ace_folding-enabled > .ace_gutter-cell {padding-right: 13px;}.ace_fold-widget {-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box;margin: 0 -12px 0 1px;display: none;width: 11px;vertical-align: top;background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: center;border-radius: 3px;border: 1px solid transparent;cursor: pointer;}.ace_folding-enabled .ace_fold-widget {display: inline-block;   }.ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");}.ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");}.ace_fold-widget:hover {border: 1px solid rgba(0, 0, 0, 0.3);background-color: rgba(255, 255, 255, 0.2);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);}.ace_fold-widget:active {border: 1px solid rgba(0, 0, 0, 0.4);background-color: rgba(0, 0, 0, 0.05);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);}.ace_dark .ace_fold-widget {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");}.ace_dark .ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget:hover {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);background-color: rgba(255, 255, 255, 0.1);}.ace_dark .ace_fold-widget:active {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);}.ace_fold-widget.ace_invalid {background-color: #FFB4B4;border-color: #DE5555;}.ace_fade-fold-widgets .ace_fold-widget {-webkit-transition: opacity 0.4s ease 0.05s;transition: opacity 0.4s ease 0.05s;opacity: 0;}.ace_fade-fold-widgets:hover .ace_fold-widget {-webkit-transition: opacity 0.05s ease 0.05s;transition: opacity 0.05s ease 0.05s;opacity:1;}.ace_underline {text-decoration: underline;}.ace_bold {font-weight: bold;}.ace_nobold .ace_bold {font-weight: normal;}.ace_italic {font-style: italic;}.ace_error-marker {background-color: rgba(255, 0, 0,0.2);position: absolute;z-index: 9;}.ace_highlight-marker {background-color: rgba(255, 255, 0,0.2);position: absolute;z-index: 8;}.ace_br1 {border-top-left-radius    : 3px;}.ace_br2 {border-top-right-radius   : 3px;}.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}.ace_br4 {border-bottom-right-radius: 3px;}.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}.ace_br8 {border-bottom-left-radius : 3px;}.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}.ace_text-input-ios {position: absolute !important;top: -100000px !important;left: -100000px !important;}';i.importCssString(m,"ace_editor.css");var g=function(e,t){var n=this;this.container=e||i.createElement("div"),this.$keepTextAreaAtCursor=!o.isOldIE,i.addCssClass(this.container,"ace_editor"),this.setTheme(t),this.$gutter=i.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.scroller=i.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=i.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new u(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onGutterResize.bind(this)),this.$markerBack=new a(this.content);var r=this.$textLayer=new f(this.content);this.canvas=r.element,this.$markerFront=new a(this.content),this.$cursorLayer=new l(this.content),this.$horizScroll=!1,this.$vScroll=!1,this.scrollBar=this.scrollBarV=new h(this.container,this),this.scrollBarH=new c(this.container,this),this.scrollBarV.addEventListener("scroll",function(e){n.$scrollAnimation||n.session.setScrollTop(e.data-n.scrollMargin.top)}),this.scrollBarH.addEventListener("scroll",function(e){n.$scrollAnimation||n.session.setScrollLeft(e.data-n.scrollMargin.left)}),this.scrollTop=0,this.scrollLeft=0,this.cursorPos={row:0,column:0},this.$fontMetrics=new d(this.container),this.$textLayer.$setFontMetrics(this.$fontMetrics),this.$textLayer.addEventListener("changeCharacterSize",function(e){n.updateCharacterSize(),n.onResize(!0,n.gutterWidth,n.$size.width,n.$size.height),n._signal("changeCharacterSize",e)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0,$dirty:!0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:0,characterWidth:0,minHeight:1,maxHeight:1,offset:0,height:1,gutterOffset:1},this.scrollMargin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.$loop=new p(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.updateCharacterSize(),this.setPadding(4),s.resetOptions(this),s._emit("renderer",this)};(function(){this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,r.implement(this,v),this.updateCharacterSize=function(){this.$textLayer.allowBoldFonts!=this.$allowBoldFonts&&(this.$allowBoldFonts=this.$textLayer.allowBoldFonts,this.setStyle("ace_nobold",!this.$allowBoldFonts)),this.layerConfig.characterWidth=this.characterWidth=this.$textLayer.getCharacterWidth(),this.layerConfig.lineHeight=this.lineHeight=this.$textLayer.getLineHeight(),this.$updatePrintMargin()},this.setSession=function(e){this.session&&this.session.doc.off("changeNewLineMode",this.onChangeNewLineMode),this.session=e,e&&this.scrollMargin.top&&e.getScrollTop()<=0&&e.setScrollTop(-this.scrollMargin.top),this.$cursorLayer.setSession(e),this.$markerBack.setSession(e),this.$markerFront.setSession(e),this.$gutterLayer.setSession(e),this.$textLayer.setSession(e);if(!e)return;this.$loop.schedule(this.CHANGE_FULL),this.session.$setFontMetrics(this.$fontMetrics),this.scrollBarH.scrollLeft=this.scrollBarV.scrollTop=null,this.onChangeNewLineMode=this.onChangeNewLineMode.bind(this),this.onChangeNewLineMode(),this.session.doc.on("changeNewLineMode",this.onChangeNewLineMode)},this.updateLines=function(e,t,n){t===undefined&&(t=Infinity),this.$changedLines?(this.$changedLines.firstRow>e&&(this.$changedLines.firstRow=e),this.$changedLines.lastRow<t&&(this.$changedLines.lastRow=t)):this.$changedLines={firstRow:e,lastRow:t};if(this.$changedLines.lastRow<this.layerConfig.firstRow){if(!n)return;this.$changedLines.lastRow=this.layerConfig.lastRow}if(this.$changedLines.firstRow>this.layerConfig.lastRow)return;this.$loop.schedule(this.CHANGE_LINES)},this.onChangeNewLineMode=function(){this.$loop.schedule(this.CHANGE_TEXT),this.$textLayer.$updateEolChar()},this.onChangeTabSize=function(){this.$loop.schedule(this.CHANGE_TEXT|this.CHANGE_MARKER),this.$textLayer.onChangeTabSize()},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(e){e?this.$renderChanges(this.CHANGE_FULL,!0):this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.$changes=0,this.$updateSizeAsync=function(){this.$loop.pending?this.$size.$dirty=!0:this.onResize()},this.onResize=function(e,t,n,r){if(this.resizing>2)return;this.resizing>0?this.resizing++:this.resizing=e?1:0;var i=this.container;r||(r=i.clientHeight||i.scrollHeight),n||(n=i.clientWidth||i.scrollWidth);var s=this.$updateCachedSize(e,t,n,r);if(!this.$size.scrollerHeight||!n&&!r)return this.resizing=0;e&&(this.$gutterLayer.$padding=null),e?this.$renderChanges(s|this.$changes,!0):this.$loop.schedule(s|this.$changes),this.resizing&&(this.resizing=0),this.scrollBarV.scrollLeft=this.scrollBarV.scrollTop=null},this.$updateCachedSize=function(e,t,n,r){r-=this.$extraHeight||0;var i=0,s=this.$size,o={width:s.width,height:s.height,scrollerHeight:s.scrollerHeight,scrollerWidth:s.scrollerWidth};r&&(e||s.height!=r)&&(s.height=r,i|=this.CHANGE_SIZE,s.scrollerHeight=s.height,this.$horizScroll&&(s.scrollerHeight-=this.scrollBarH.getHeight()),this.scrollBarV.element.style.bottom=this.scrollBarH.getHeight()+"px",i|=this.CHANGE_SCROLL);if(n&&(e||s.width!=n)){i|=this.CHANGE_SIZE,s.width=n,t==null&&(t=this.$showGutter?this.$gutter.offsetWidth:0),this.gutterWidth=t,this.scrollBarH.element.style.left=this.scroller.style.left=t+"px",s.scrollerWidth=Math.max(0,n-t-this.scrollBarV.getWidth()),this.scrollBarH.element.style.right=this.scroller.style.right=this.scrollBarV.getWidth()+"px",this.scroller.style.bottom=this.scrollBarH.getHeight()+"px";if(this.session&&this.session.getUseWrapMode()&&this.adjustWrapLimit()||e)i|=this.CHANGE_FULL}return s.$dirty=!n||!r,i&&this._signal("resize",o),i},this.onGutterResize=function(){var e=this.$showGutter?this.$gutter.offsetWidth:0;e!=this.gutterWidth&&(this.$changes|=this.$updateCachedSize(!0,e,this.$size.width,this.$size.height)),this.session.getUseWrapMode()&&this.adjustWrapLimit()?this.$loop.schedule(this.CHANGE_FULL):this.$size.$dirty?this.$loop.schedule(this.CHANGE_FULL):(this.$computeLayerConfig(),this.$loop.schedule(this.CHANGE_MARKER))},this.adjustWrapLimit=function(){var e=this.$size.scrollerWidth-this.$padding*2,t=Math.floor(e/this.characterWidth);return this.session.adjustWrapLimit(t,this.$showPrintMargin&&this.$printMarginColumn)},this.setAnimatedScroll=function(e){this.setOption("animatedScroll",e)},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(e){this.setOption("showInvisibles",e)},this.getShowInvisibles=function(){return this.getOption("showInvisibles")},this.getDisplayIndentGuides=function(){return this.getOption("displayIndentGuides")},this.setDisplayIndentGuides=function(e){this.setOption("displayIndentGuides",e)},this.setShowPrintMargin=function(e){this.setOption("showPrintMargin",e)},this.getShowPrintMargin=function(){return this.getOption("showPrintMargin")},this.setPrintMarginColumn=function(e){this.setOption("printMarginColumn",e)},this.getPrintMarginColumn=function(){return this.getOption("printMarginColumn")},this.getShowGutter=function(){return this.getOption("showGutter")},this.setShowGutter=function(e){return this.setOption("showGutter",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.$updateGutterLineHighlight=function(){var e=this.$cursorLayer.$pixelPos,t=this.layerConfig.lineHeight;if(this.session.getUseWrapMode()){var n=this.session.selection.getCursor();n.column=0,e=this.$cursorLayer.getPixelPosition(n,!0),t*=this.session.getRowLength(n.row)}this.$gutterLineHighlight.style.top=e.top-this.layerConfig.offset+"px",this.$gutterLineHighlight.style.height=t+"px"},this.$updatePrintMargin=function(){if(!this.$showPrintMargin&&!this.$printMarginEl)return;if(!this.$printMarginEl){var e=i.createElement("div");e.className="ace_layer ace_print-margin-layer",this.$printMarginEl=i.createElement("div"),this.$printMarginEl.className="ace_print-margin",e.appendChild(this.$printMarginEl),this.content.insertBefore(e,this.content.firstChild)}var t=this.$printMarginEl.style;t.left=this.characterWidth*this.$printMarginColumn+this.$padding+"px",t.visibility=this.$showPrintMargin?"visible":"hidden",this.session&&this.session.$wrap==-1&&this.adjustWrapLimit()},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.scroller},this.getTextAreaContainer=function(){return this.container},this.$moveTextAreaToCursor=function(){if(!this.$keepTextAreaAtCursor)return;var e=this.layerConfig,t=this.$cursorLayer.$pixelPos.top,n=this.$cursorLayer.$pixelPos.left;t-=e.offset;var r=this.textarea.style,i=this.lineHeight;if(t<0||t>e.height-i){r.top=r.left="0";return}var s=this.characterWidth;if(this.$composition){var o=this.textarea.value.replace(/^\x01+/,"");s*=this.session.$getStringScreenWidth(o)[0]+2,i+=2}n-=this.scrollLeft,n>this.$size.scrollerWidth-s&&(n=this.$size.scrollerWidth-s),n+=this.gutterWidth,r.height=i+"px",r.width=s+"px",r.left=Math.min(n,this.$size.scrollerWidth-s)+"px",r.top=Math.min(t,this.$size.height-i)+"px"},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var e=this.layerConfig,t=e.lastRow,n=this.session.documentToScreenRow(t,0)*e.lineHeight;return n-this.session.getScrollTop()>e.height-e.lineHeight?t-1:t},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(e){this.$padding=e,this.$textLayer.setPadding(e),this.$cursorLayer.setPadding(e),this.$markerFront.setPadding(e),this.$markerBack.setPadding(e),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.setScrollMargin=function(e,t,n,r){var i=this.scrollMargin;i.top=e|0,i.bottom=t|0,i.right=r|0,i.left=n|0,i.v=i.top+i.bottom,i.h=i.left+i.right,i.top&&this.scrollTop<=0&&this.session&&this.session.setScrollTop(-i.top),this.updateFull()},this.getHScrollBarAlwaysVisible=function(){return this.$hScrollBarAlwaysVisible},this.setHScrollBarAlwaysVisible=function(e){this.setOption("hScrollBarAlwaysVisible",e)},this.getVScrollBarAlwaysVisible=function(){return this.$vScrollBarAlwaysVisible},this.setVScrollBarAlwaysVisible=function(e){this.setOption("vScrollBarAlwaysVisible",e)},this.$updateScrollBarV=function(){var e=this.layerConfig.maxHeight,t=this.$size.scrollerHeight;!this.$maxLines&&this.$scrollPastEnd&&(e-=(t-this.lineHeight)*this.$scrollPastEnd,this.scrollTop>e-t&&(e=this.scrollTop+t,this.scrollBarV.scrollTop=null)),this.scrollBarV.setScrollHeight(e+this.scrollMargin.v),this.scrollBarV.setScrollTop(this.scrollTop+this.scrollMargin.top)},this.$updateScrollBarH=function(){this.scrollBarH.setScrollWidth(this.layerConfig.width+2*this.$padding+this.scrollMargin.h),this.scrollBarH.setScrollLeft(this.scrollLeft+this.scrollMargin.left)},this.$frozen=!1,this.freeze=function(){this.$frozen=!0},this.unfreeze=function(){this.$frozen=!1},this.$renderChanges=function(e,t){this.$changes&&(e|=this.$changes,this.$changes=0);if(!this.session||!this.container.offsetWidth||this.$frozen||!e&&!t){this.$changes|=e;return}if(this.$size.$dirty)return this.$changes|=e,this.onResize(!0);this.lineHeight||this.$textLayer.checkForSizeChanges(),this._signal("beforeRender");var n=this.layerConfig;if(e&this.CHANGE_FULL||e&this.CHANGE_SIZE||e&this.CHANGE_TEXT||e&this.CHANGE_LINES||e&this.CHANGE_SCROLL||e&this.CHANGE_H_SCROLL){e|=this.$computeLayerConfig();if(n.firstRow!=this.layerConfig.firstRow&&n.firstRowScreen==this.layerConfig.firstRowScreen){var r=this.scrollTop+(n.firstRow-this.layerConfig.firstRow)*this.lineHeight;r>0&&(this.scrollTop=r,e|=this.CHANGE_SCROLL,e|=this.$computeLayerConfig())}n=this.layerConfig,this.$updateScrollBarV(),e&this.CHANGE_H_SCROLL&&this.$updateScrollBarH(),this.$gutterLayer.element.style.marginTop=-n.offset+"px",this.content.style.marginTop=-n.offset+"px",this.content.style.width=n.width+2*this.$padding+"px",this.content.style.height=n.minHeight+"px"}e&this.CHANGE_H_SCROLL&&(this.content.style.marginLeft=-this.scrollLeft+"px",this.scroller.className=this.scrollLeft<=0?"ace_scroller":"ace_scroller ace_scroll-left");if(e&this.CHANGE_FULL){this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),this.$highlightGutterLine&&this.$updateGutterLineHighlight(),this._signal("afterRender");return}if(e&this.CHANGE_SCROLL){e&this.CHANGE_TEXT||e&this.CHANGE_LINES?this.$textLayer.update(n):this.$textLayer.scrollLines(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$highlightGutterLine&&this.$updateGutterLineHighlight(),this.$moveTextAreaToCursor(),this._signal("afterRender");return}e&this.CHANGE_TEXT?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n)):e&this.CHANGE_LINES?(this.$updateLines()||e&this.CHANGE_GUTTER&&this.$showGutter)&&this.$gutterLayer.update(n):(e&this.CHANGE_TEXT||e&this.CHANGE_GUTTER)&&this.$showGutter&&this.$gutterLayer.update(n),e&this.CHANGE_CURSOR&&(this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),this.$highlightGutterLine&&this.$updateGutterLineHighlight()),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(n),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(n),this._signal("afterRender")},this.$autosize=function(){var e=this.session.getScreenLength()*this.lineHeight,t=this.$maxLines*this.lineHeight,n=Math.min(t,Math.max((this.$minLines||1)*this.lineHeight,e))+this.scrollMargin.v+(this.$extraHeight||0);this.$horizScroll&&(n+=this.scrollBarH.getHeight()),this.$maxPixelHeight&&n>this.$maxPixelHeight&&(n=this.$maxPixelHeight);var r=e>t;if(n!=this.desiredHeight||this.$size.height!=this.desiredHeight||r!=this.$vScroll){r!=this.$vScroll&&(this.$vScroll=r,this.scrollBarV.setVisible(r));var i=this.container.clientWidth;this.container.style.height=n+"px",this.$updateCachedSize(!0,this.$gutterWidth,i,n),this.desiredHeight=n,this._signal("autosize")}},this.$computeLayerConfig=function(){var e=this.session,t=this.$size,n=t.height<=2*this.lineHeight,r=this.session.getScreenLength(),i=r*this.lineHeight,s=this.$getLongestLine(),o=!n&&(this.$hScrollBarAlwaysVisible||t.scrollerWidth-s-2*this.$padding<0),u=this.$horizScroll!==o;u&&(this.$horizScroll=o,this.scrollBarH.setVisible(o));var a=this.$vScroll;this.$maxLines&&this.lineHeight>1&&this.$autosize();var f=this.scrollTop%this.lineHeight,l=t.scrollerHeight+this.lineHeight,c=!this.$maxLines&&this.$scrollPastEnd?(t.scrollerHeight-this.lineHeight)*this.$scrollPastEnd:0;i+=c;var h=this.scrollMargin;this.session.setScrollTop(Math.max(-h.top,Math.min(this.scrollTop,i-t.scrollerHeight+h.bottom))),this.session.setScrollLeft(Math.max(-h.left,Math.min(this.scrollLeft,s+2*this.$padding-t.scrollerWidth+h.right)));var p=!n&&(this.$vScrollBarAlwaysVisible||t.scrollerHeight-i+c<0||this.scrollTop>h.top),d=a!==p;d&&(this.$vScroll=p,this.scrollBarV.setVisible(p));var v=Math.ceil(l/this.lineHeight)-1,m=Math.max(0,Math.round((this.scrollTop-f)/this.lineHeight)),g=m+v,y,b,w=this.lineHeight;m=e.screenToDocumentRow(m,0);var E=e.getFoldLine(m);E&&(m=E.start.row),y=e.documentToScreenRow(m,0),b=e.getRowLength(m)*w,g=Math.min(e.screenToDocumentRow(g,0),e.getLength()-1),l=t.scrollerHeight+e.getRowLength(g)*w+b,f=this.scrollTop-y*w;var S=0;this.layerConfig.width!=s&&(S=this.CHANGE_H_SCROLL);if(u||d)S=this.$updateCachedSize(!0,this.gutterWidth,t.width,t.height),this._signal("scrollbarVisibilityChanged"),d&&(s=this.$getLongestLine());return this.layerConfig={width:s,padding:this.$padding,firstRow:m,firstRowScreen:y,lastRow:g,lineHeight:w,characterWidth:this.characterWidth,minHeight:l,maxHeight:i,offset:f,gutterOffset:w?Math.max(0,Math.ceil((f+t.height-t.scrollerHeight)/w)):0,height:this.$size.scrollerHeight},S},this.$updateLines=function(){if(!this.$changedLines)return;var e=this.$changedLines.firstRow,t=this.$changedLines.lastRow;this.$changedLines=null;var n=this.layerConfig;if(e>n.lastRow+1)return;if(t<n.firstRow)return;if(t===Infinity){this.$showGutter&&this.$gutterLayer.update(n),this.$textLayer.update(n);return}return this.$textLayer.updateLines(n,e,t),!0},this.$getLongestLine=function(){var e=this.session.getScreenWidth();return this.showInvisibles&&!this.session.$useWrapMode&&(e+=1),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(e*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(e,t){this.$gutterLayer.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){this.$gutterLayer.removeGutterDecoration(e,t)},this.updateBreakpoints=function(e){this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(e){this.$gutterLayer.setAnnotations(e),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(e,t,n){this.scrollCursorIntoView(e,n),this.scrollCursorIntoView(t,n)},this.scrollCursorIntoView=function(e,t,n){if(this.$size.scrollerHeight===0)return;var r=this.$cursorLayer.getPixelPosition(e),i=r.left,s=r.top,o=n&&n.top||0,u=n&&n.bottom||0,a=this.$scrollAnimation?this.session.getScrollTop():this.scrollTop;a+o>s?(t&&a+o>s+this.lineHeight&&(s-=t*this.$size.scrollerHeight),s===0&&(s=-this.scrollMargin.top),this.session.setScrollTop(s)):a+this.$size.scrollerHeight-u<s+this.lineHeight&&(t&&a+this.$size.scrollerHeight-u<s-this.lineHeight&&(s+=t*this.$size.scrollerHeight),this.session.setScrollTop(s+this.lineHeight-this.$size.scrollerHeight));var f=this.scrollLeft;f>i?(i<this.$padding+2*this.layerConfig.characterWidth&&(i=-this.scrollMargin.left),this.session.setScrollLeft(i)):f+this.$size.scrollerWidth<i+this.characterWidth?this.session.setScrollLeft(Math.round(i+this.characterWidth-this.$size.scrollerWidth)):f<=this.$padding&&i-f<this.characterWidth&&this.session.setScrollLeft(0)},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(e){this.session.setScrollTop(e*this.lineHeight)},this.alignCursor=function(e,t){typeof e=="number"&&(e={row:e,column:0});var n=this.$cursorLayer.getPixelPosition(e),r=this.$size.scrollerHeight-this.lineHeight,i=n.top-r*(t||0);return this.session.setScrollTop(i),i},this.STEPS=8,this.$calcSteps=function(e,t){var n=0,r=this.STEPS,i=[],s=function(e,t,n){return n*(Math.pow(e-1,3)+1)+t};for(n=0;n<r;++n)i.push(s(n/this.STEPS,e,t-e));return i},this.scrollToLine=function(e,t,n,r){var i=this.$cursorLayer.getPixelPosition({row:e,column:0}),s=i.top;t&&(s-=this.$size.scrollerHeight/2);var o=this.scrollTop;this.session.setScrollTop(s),n!==!1&&this.animateScrolling(o,r)},this.animateScrolling=function(e,t){var n=this.scrollTop;if(!this.$animatedScroll)return;var r=this;if(e==n)return;if(this.$scrollAnimation){var i=this.$scrollAnimation.steps;if(i.length){e=i[0];if(e==n)return}}var s=r.$calcSteps(e,n);this.$scrollAnimation={from:e,to:n,steps:s},clearInterval(this.$timer),r.session.setScrollTop(s.shift()),r.session.$scrollTop=n,this.$timer=setInterval(function(){s.length?(r.session.setScrollTop(s.shift()),r.session.$scrollTop=n):n!=null?(r.session.$scrollTop=-1,r.session.setScrollTop(n),n=null):(r.$timer=clearInterval(r.$timer),r.$scrollAnimation=null,t&&t())},10)},this.scrollToY=function(e){this.scrollTop!==e&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=e)},this.scrollToX=function(e){this.scrollLeft!==e&&(this.scrollLeft=e),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollTo=function(e,t){this.session.setScrollTop(t),this.session.setScrollLeft(t)},this.scrollBy=function(e,t){t&&this.session.setScrollTop(this.session.getScrollTop()+t),e&&this.session.setScrollLeft(this.session.getScrollLeft()+e)},this.isScrollableBy=function(e,t){if(t<0&&this.session.getScrollTop()>=1-this.scrollMargin.top)return!0;if(t>0&&this.session.getScrollTop()+this.$size.scrollerHeight-this.layerConfig.maxHeight<-1+this.scrollMargin.bottom)return!0;if(e<0&&this.session.getScrollLeft()>=1-this.scrollMargin.left)return!0;if(e>0&&this.session.getScrollLeft()+this.$size.scrollerWidth-this.layerConfig.width<-1+this.scrollMargin.right)return!0},this.pixelToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=(e+this.scrollLeft-n.left-this.$padding)/this.characterWidth,i=Math.floor((t+this.scrollTop-n.top)/this.lineHeight),s=Math.round(r);return{row:i,column:s,side:r-s>0?1:-1}},this.screenToTextCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=Math.round((e+this.scrollLeft-n.left-this.$padding)/this.characterWidth),i=(t+this.scrollTop-n.top)/this.lineHeight;return this.session.screenToDocumentPosition(i,Math.max(r,0))},this.textToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=this.session.documentToScreenPosition(e,t),i=this.$padding+Math.round(r.column*this.characterWidth),s=r.row*this.lineHeight;return{pageX:n.left+i-this.scrollLeft,pageY:n.top+s-this.scrollTop}},this.visualizeFocus=function(){i.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){i.removeCssClass(this.container,"ace_focus")},this.showComposition=function(e){this.$composition||(this.$composition={keepTextAreaAtCursor:this.$keepTextAreaAtCursor,cssText:this.textarea.style.cssText}),this.$keepTextAreaAtCursor=!0,i.addCssClass(this.textarea,"ace_composition"),this.textarea.style.cssText="",this.$moveTextAreaToCursor()},this.setCompositionText=function(e){this.$moveTextAreaToCursor()},this.hideComposition=function(){if(!this.$composition)return;i.removeCssClass(this.textarea,"ace_composition"),this.$keepTextAreaAtCursor=this.$composition.keepTextAreaAtCursor,this.textarea.style.cssText=this.$composition.cssText,this.$composition=null},this.setTheme=function(e,t){function o(r){if(n.$themeId!=e)return t&&t();if(!r||!r.cssClass)throw new Error("couldn't load module "+e+" or it didn't call define");i.importCssString(r.cssText,r.cssClass,n.container.ownerDocument),n.theme&&i.removeCssClass(n.container,n.theme.cssClass);var s="padding"in r?r.padding:"padding"in(n.theme||{})?4:n.$padding;n.$padding&&s!=n.$padding&&n.setPadding(s),n.$theme=r.cssClass,n.theme=r,i.addCssClass(n.container,r.cssClass),i.setCssClass(n.container,"ace_dark",r.isDark),n.$size&&(n.$size.width=0,n.$updateSizeAsync()),n._dispatchEvent("themeLoaded",{theme:r}),t&&t()}var n=this;this.$themeId=e,n._dispatchEvent("themeChange",{theme:e});if(!e||typeof e=="string"){var r=e||this.$options.theme.initialValue;s.loadModule(["theme",r],o)}else o(e)},this.getTheme=function(){return this.$themeId},this.setStyle=function(e,t){i.setCssClass(this.container,e,t!==!1)},this.unsetStyle=function(e){i.removeCssClass(this.container,e)},this.setCursorStyle=function(e){this.scroller.style.cursor!=e&&(this.scroller.style.cursor=e)},this.setMouseCursor=function(e){this.scroller.style.cursor=e},this.destroy=function(){this.$textLayer.destroy(),this.$cursorLayer.destroy()}}).call(g.prototype),s.defineOptions(g.prototype,"renderer",{animatedScroll:{initialValue:!1},showInvisibles:{set:function(e){this.$textLayer.setShowInvisibles(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!1},showPrintMargin:{set:function(){this.$updatePrintMargin()},initialValue:!0},printMarginColumn:{set:function(){this.$updatePrintMargin()},initialValue:80},printMargin:{set:function(e){typeof e=="number"&&(this.$printMarginColumn=e),this.$showPrintMargin=!!e,this.$updatePrintMargin()},get:function(){return this.$showPrintMargin&&this.$printMarginColumn}},showGutter:{set:function(e){this.$gutter.style.display=e?"block":"none",this.$loop.schedule(this.CHANGE_FULL),this.onGutterResize()},initialValue:!0},fadeFoldWidgets:{set:function(e){i.setCssClass(this.$gutter,"ace_fade-fold-widgets",e)},initialValue:!1},showFoldWidgets:{set:function(e){this.$gutterLayer.setShowFoldWidgets(e)},initialValue:!0},showLineNumbers:{set:function(e){this.$gutterLayer.setShowLineNumbers(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},displayIndentGuides:{set:function(e){this.$textLayer.setDisplayIndentGuides(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!0},highlightGutterLine:{set:function(e){if(!this.$gutterLineHighlight){this.$gutterLineHighlight=i.createElement("div"),this.$gutterLineHighlight.className="ace_gutter-active-line",this.$gutter.appendChild(this.$gutterLineHighlight);return}this.$gutterLineHighlight.style.display=e?"":"none",this.$cursorLayer.$pixelPos&&this.$updateGutterLineHighlight()},initialValue:!1,value:!0},hScrollBarAlwaysVisible:{set:function(e){(!this.$hScrollBarAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},vScrollBarAlwaysVisible:{set:function(e){(!this.$vScrollBarAlwaysVisible||!this.$vScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},fontSize:{set:function(e){typeof e=="number"&&(e+="px"),this.container.style.fontSize=e,this.updateFontSize()},initialValue:12},fontFamily:{set:function(e){this.container.style.fontFamily=e,this.updateFontSize()}},maxLines:{set:function(e){this.updateFull()}},minLines:{set:function(e){this.updateFull()}},maxPixelHeight:{set:function(e){this.updateFull()},initialValue:0},scrollPastEnd:{set:function(e){e=+e||0;if(this.$scrollPastEnd==e)return;this.$scrollPastEnd=e,this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:0,handlesSet:!0},fixedWidthGutter:{set:function(e){this.$gutterLayer.$fixedWidth=!!e,this.$loop.schedule(this.CHANGE_GUTTER)}},theme:{set:function(e){this.setTheme(e)},get:function(){return this.$themeId||this.theme},initialValue:"./theme/textmate",handlesSet:!0}}),t.VirtualRenderer=g}),ace.define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/net","ace/lib/event_emitter","ace/config"],function(e,t,n){"use strict";function u(e){var t="importScripts('"+i.qualifyURL(e)+"');";try{return new Blob([t],{type:"application/javascript"})}catch(n){var r=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder,s=new r;return s.append(t),s.getBlob("application/javascript")}}function a(e){var t=u(e),n=window.URL||window.webkitURL,r=n.createObjectURL(t);return new Worker(r)}var r=e("../lib/oop"),i=e("../lib/net"),s=e("../lib/event_emitter").EventEmitter,o=e("../config"),f=function(t,n,r,i,s){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.onMessage=this.onMessage.bind(this),e.nameToUrl&&!e.toUrl&&(e.toUrl=e.nameToUrl);if(o.get("packaged")||!e.toUrl)i=i||o.moduleUrl(n,"worker");else{var u=this.$normalizePath;i=i||u(e.toUrl("ace/worker/worker.js",null,"_"));var f={};t.forEach(function(t){f[t]=u(e.toUrl(t,null,"_").replace(/(\.js)?(\?.*)?$/,""))})}this.$worker=a(i),s&&this.send("importScripts",s),this.$worker.postMessage({init:!0,tlns:f,module:n,classname:r}),this.callbackId=1,this.callbacks={},this.$worker.onmessage=this.onMessage};(function(){r.implement(this,s),this.onMessage=function(e){var t=e.data;switch(t.type){case"event":this._signal(t.name,{data:t.data});break;case"call":var n=this.callbacks[t.id];n&&(n(t.data),delete this.callbacks[t.id]);break;case"error":this.reportError(t.data);break;case"log":window.console&&console.log&&console.log.apply(console,t.data)}},this.reportError=function(e){window.console&&console.error&&console.error(e)},this.$normalizePath=function(e){return i.qualifyURL(e)},this.terminate=function(){this._signal("terminate",{}),this.deltaQueue=null,this.$worker.terminate(),this.$worker=null,this.$doc&&this.$doc.off("change",this.changeListener),this.$doc=null},this.send=function(e,t){this.$worker.postMessage({command:e,args:t})},this.call=function(e,t,n){if(n){var r=this.callbackId++;this.callbacks[r]=n,t.push(r)}this.send(e,t)},this.emit=function(e,t){try{this.$worker.postMessage({event:e,data:{data:t.data}})}catch(n){console.error(n.stack)}},this.attachToDocument=function(e){this.$doc&&this.terminate(),this.$doc=e,this.call("setValue",[e.getValue()]),e.on("change",this.changeListener)},this.changeListener=function(e){this.deltaQueue||(this.deltaQueue=[],setTimeout(this.$sendDeltaQueue,0)),e.action=="insert"?this.deltaQueue.push(e.start,e.lines):this.deltaQueue.push(e.start,e.end)},this.$sendDeltaQueue=function(){var e=this.deltaQueue;if(!e)return;this.deltaQueue=null,e.length>50&&e.length>this.$doc.getLength()>>1?this.call("setValue",[this.$doc.getValue()]):this.emit("change",{data:e})}}).call(f.prototype);var l=function(e,t,n){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.callbackId=1,this.callbacks={},this.messageBuffer=[];var r=null,i=!1,u=Object.create(s),a=this;this.$worker={},this.$worker.terminate=function(){},this.$worker.postMessage=function(e){a.messageBuffer.push(e),r&&(i?setTimeout(f):f())},this.setEmitSync=function(e){i=e};var f=function(){var e=a.messageBuffer.shift();e.command?r[e.command].apply(r,e.args):e.event&&u._signal(e.event,e.data)};u.postMessage=function(e){a.onMessage({data:e})},u.callback=function(e,t){this.postMessage({type:"call",id:t,data:e})},u.emit=function(e,t){this.postMessage({type:"event",name:e,data:t})},o.loadModule(["worker",t],function(e){r=new e[n](u);while(a.messageBuffer.length)f()})};l.prototype=f.prototype,t.UIWorkerClient=l,t.WorkerClient=f,t.createWorker=a}),ace.define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],function(e,t,n){"use strict";var r=e("./range").Range,i=e("./lib/event_emitter").EventEmitter,s=e("./lib/oop"),o=function(e,t,n,r,i,s){var o=this;this.length=t,this.session=e,this.doc=e.getDocument(),this.mainClass=i,this.othersClass=s,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=r,this.$onCursorChange=function(){setTimeout(function(){o.onCursorChange()})},this.$pos=n;var u=e.getUndoManager().$undoStack||e.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=u.length,this.setup(),e.selection.on("changeCursor",this.$onCursorChange)};(function(){s.implement(this,i),this.setup=function(){var e=this,t=this.doc,n=this.session;this.selectionBefore=n.selection.toJSON(),n.selection.inMultiSelectMode&&n.selection.toSingleRange(),this.pos=t.createAnchor(this.$pos.row,this.$pos.column);var i=this.pos;i.$insertRight=!0,i.detach(),i.markerId=n.addMarker(new r(i.row,i.column,i.row,i.column+this.length),this.mainClass,null,!1),this.others=[],this.$others.forEach(function(n){var r=t.createAnchor(n.row,n.column);r.$insertRight=!0,r.detach(),e.others.push(r)}),n.setUndoSelect(!1)},this.showOtherMarkers=function(){if(this.othersActive)return;var e=this.session,t=this;this.othersActive=!0,this.others.forEach(function(n){n.markerId=e.addMarker(new r(n.row,n.column,n.row,n.column+t.length),t.othersClass,null,!1)})},this.hideOtherMarkers=function(){if(!this.othersActive)return;this.othersActive=!1;for(var e=0;e<this.others.length;e++)this.session.removeMarker(this.others[e].markerId)},this.onUpdate=function(e){if(this.$updating)return this.updateAnchors(e);var t=e;if(t.start.row!==t.end.row)return;if(t.start.row!==this.pos.row)return;this.$updating=!0;var n=e.action==="insert"?t.end.column-t.start.column:t.start.column-t.end.column,i=t.start.column>=this.pos.column&&t.start.column<=this.pos.column+this.length+1,s=t.start.column-this.pos.column;this.updateAnchors(e),i&&(this.length+=n);if(i&&!this.session.$fromUndo)if(e.action==="insert")for(var o=this.others.length-1;o>=0;o--){var u=this.others[o],a={row:u.row,column:u.column+s};this.doc.insertMergedLines(a,e.lines)}else if(e.action==="remove")for(var o=this.others.length-1;o>=0;o--){var u=this.others[o],a={row:u.row,column:u.column+s};this.doc.remove(new r(a.row,a.column,a.row,a.column-n))}this.$updating=!1,this.updateMarkers()},this.updateAnchors=function(e){this.pos.onChange(e);for(var t=this.others.length;t--;)this.others[t].onChange(e);this.updateMarkers()},this.updateMarkers=function(){if(this.$updating)return;var e=this,t=this.session,n=function(n,i){t.removeMarker(n.markerId),n.markerId=t.addMarker(new r(n.row,n.column,n.row,n.column+e.length),i,null,!1)};n(this.pos,this.mainClass);for(var i=this.others.length;i--;)n(this.others[i],this.othersClass)},this.onCursorChange=function(e){if(this.$updating||!this.session)return;var t=this.session.selection.getCursor();t.row===this.pos.row&&t.column>=this.pos.column&&t.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",e)):(this.hideOtherMarkers(),this._emit("cursorLeave",e))},this.detach=function(){this.session.removeMarker(this.pos&&this.pos.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.session.setUndoSelect(!0),this.session=null},this.cancel=function(){if(this.$undoStackDepth===-1)return;var e=this.session.getUndoManager(),t=(e.$undoStack||e.$undostack).length-this.$undoStackDepth;for(var n=0;n<t;n++)e.undo(!0);this.selectionBefore&&this.session.selection.fromJSON(this.selectionBefore)}}).call(o.prototype),t.PlaceHolder=o}),ace.define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event","ace/lib/useragent"],function(e,t,n){function s(e,t){return e.row==t.row&&e.column==t.column}function o(e){var t=e.domEvent,n=t.altKey,o=t.shiftKey,u=t.ctrlKey,a=e.getAccelKey(),f=e.getButton();u&&i.isMac&&(f=t.button);if(e.editor.inMultiSelectMode&&f==2){e.editor.textInput.onContextMenu(e.domEvent);return}if(!u&&!n&&!a){f===0&&e.editor.inMultiSelectMode&&e.editor.exitMultiSelectMode();return}if(f!==0)return;var l=e.editor,c=l.selection,h=l.inMultiSelectMode,p=e.getDocumentPosition(),d=c.getCursor(),v=e.inSelection()||c.isEmpty()&&s(p,d),m=e.x,g=e.y,y=function(e){m=e.clientX,g=e.clientY},b=l.session,w=l.renderer.pixelToScreenCoordinates(m,g),E=w,S;if(l.$mouseHandler.$enableJumpToDef)u&&n||a&&n?S=o?"block":"add":n&&l.$blockSelectEnabled&&(S="block");else if(a&&!n){S="add";if(!h&&o)return}else n&&l.$blockSelectEnabled&&(S="block");S&&i.isMac&&t.ctrlKey&&l.$mouseHandler.cancelContextMenu();if(S=="add"){if(!h&&v)return;if(!h){var x=c.toOrientedRange();l.addSelectionMarker(x)}var T=c.rangeList.rangeAtPoint(p);l.$blockScrolling++,l.inVirtualSelectionMode=!0,o&&(T=null,x=c.ranges[0]||x,l.removeSelectionMarker(x)),l.once("mouseup",function(){var e=c.toOrientedRange();T&&e.isEmpty()&&s(T.cursor,e.cursor)?c.substractPoint(e.cursor):(o?c.substractPoint(x.cursor):x&&(l.removeSelectionMarker(x),c.addRange(x)),c.addRange(e)),l.$blockScrolling--,l.inVirtualSelectionMode=!1})}else if(S=="block"){e.stop(),l.inVirtualSelectionMode=!0;var N,C=[],k=function(){var e=l.renderer.pixelToScreenCoordinates(m,g),t=b.screenToDocumentPosition(e.row,e.column);if(s(E,e)&&s(t,c.lead))return;E=e,l.$blockScrolling++,l.selection.moveToPosition(t),l.renderer.scrollCursorIntoView(),l.removeSelectionMarkers(C),C=c.rectangularRangeBlock(E,w),l.$mouseHandler.$clickSelection&&C.length==1&&C[0].isEmpty()&&(C[0]=l.$mouseHandler.$clickSelection.clone()),C.forEach(l.addSelectionMarker,l),l.updateSelectionMarkers(),l.$blockScrolling--};l.$blockScrolling++,h&&!a?c.toSingleRange():!h&&a&&(N=c.toOrientedRange(),l.addSelectionMarker(N)),o?w=b.documentToScreenPosition(c.lead):c.moveToPosition(p),l.$blockScrolling--,E={row:-1,column:-1};var L=function(e){clearInterval(O),l.removeSelectionMarkers(C),C.length||(C=[c.toOrientedRange()]),l.$blockScrolling++,N&&(l.removeSelectionMarker(N),c.toSingleRange(N));for(var t=0;t<C.length;t++)c.addRange(C[t]);l.inVirtualSelectionMode=!1,l.$mouseHandler.$clickSelection=null,l.$blockScrolling--},A=k;r.capture(l.container,y,L);var O=setInterval(function(){A()},20);return e.preventDefault()}}var r=e("../lib/event"),i=e("../lib/useragent");t.onMouseDown=o}),ace.define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],function(e,t,n){t.defaultCommands=[{name:"addCursorAbove",exec:function(e){e.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelow",exec:function(e){e.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorAboveSkipCurrent",exec:function(e){e.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelowSkipCurrent",exec:function(e){e.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreBefore",exec:function(e){e.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreAfter",exec:function(e){e.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextBefore",exec:function(e){e.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextAfter",exec:function(e){e.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"splitIntoLines",exec:function(e){e.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Alt-L",mac:"Ctrl-Alt-L"},readOnly:!0},{name:"alignCursors",exec:function(e){e.alignCursors()},bindKey:{win:"Ctrl-Alt-A",mac:"Ctrl-Alt-A"},scrollIntoView:"cursor"},{name:"findAll",exec:function(e){e.findAll()},bindKey:{win:"Ctrl-Alt-K",mac:"Ctrl-Alt-G"},scrollIntoView:"cursor",readOnly:!0}],t.multiSelectCommands=[{name:"singleSelection",bindKey:"esc",exec:function(e){e.exitMultiSelectMode()},scrollIntoView:"cursor",readOnly:!0,isAvailable:function(e){return e&&e.inMultiSelectMode}}];var r=e("../keyboard/hash_handler").HashHandler;t.keyboardHandler=new r(t.multiSelectCommands)}),ace.define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/lib/event","ace/lib/lang","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor","ace/config"],function(e,t,n){function h(e,t,n){return c.$options.wrap=!0,c.$options.needle=t,c.$options.backwards=n==-1,c.find(e)}function v(e,t){return e.row==t.row&&e.column==t.column}function m(e){if(e.$multiselectOnSessionChange)return;e.$onAddRange=e.$onAddRange.bind(e),e.$onRemoveRange=e.$onRemoveRange.bind(e),e.$onMultiSelect=e.$onMultiSelect.bind(e),e.$onSingleSelect=e.$onSingleSelect.bind(e),e.$multiselectOnSessionChange=t.onSessionChange.bind(e),e.$checkMultiselectChange=e.$checkMultiselectChange.bind(e),e.$multiselectOnSessionChange(e),e.on("changeSession",e.$multiselectOnSessionChange),e.on("mousedown",o),e.commands.addCommands(f.defaultCommands),g(e)}function g(e){function r(t){n&&(e.renderer.setMouseCursor(""),n=!1)}var t=e.textInput.getElement(),n=!1;u.addListener(t,"keydown",function(t){var i=t.keyCode==18&&!(t.ctrlKey||t.shiftKey||t.metaKey);e.$blockSelectEnabled&&i?n||(e.renderer.setMouseCursor("crosshair"),n=!0):n&&r()}),u.addListener(t,"keyup",r),u.addListener(t,"blur",r)}var r=e("./range_list").RangeList,i=e("./range").Range,s=e("./selection").Selection,o=e("./mouse/multi_select_handler").onMouseDown,u=e("./lib/event"),a=e("./lib/lang"),f=e("./commands/multi_select_commands");t.commands=f.defaultCommands.concat(f.multiSelectCommands);var l=e("./search").Search,c=new l,p=e("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(p.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(e,t){if(!e)return;if(!this.inMultiSelectMode&&this.rangeCount===0){var n=this.toOrientedRange();this.rangeList.add(n),this.rangeList.add(e);if(this.rangeList.ranges.length!=2)return this.rangeList.removeAll(),t||this.fromOrientedRange(e);this.rangeList.removeAll(),this.rangeList.add(n),this.$onAddRange(n)}e.cursor||(e.cursor=e.end);var r=this.rangeList.add(e);return this.$onAddRange(e),r.length&&this.$onRemoveRange(r),this.rangeCount>1&&!this.inMultiSelectMode&&(this._signal("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session)),t||this.fromOrientedRange(e)},this.toSingleRange=function(e){e=e||this.ranges[0];var t=this.rangeList.removeAll();t.length&&this.$onRemoveRange(t),e&&this.fromOrientedRange(e)},this.substractPoint=function(e){var t=this.rangeList.substractPoint(e);if(t)return this.$onRemoveRange(t),t[0]},this.mergeOverlappingRanges=function(){var e=this.rangeList.merge();e.length?this.$onRemoveRange(e):this.ranges[0]&&this.fromOrientedRange(this.ranges[0])},this.$onAddRange=function(e){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(e),this._signal("addRange",{range:e})},this.$onRemoveRange=function(e){this.rangeCount=this.rangeList.ranges.length;if(this.rangeCount==1&&this.inMultiSelectMode){var t=this.rangeList.ranges.pop();e.push(t),this.rangeCount=0}for(var n=e.length;n--;){var r=this.ranges.indexOf(e[n]);this.ranges.splice(r,1)}this._signal("removeRange",{ranges:e}),this.rangeCount===0&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._signal("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),t=t||this.ranges[0],t&&!t.isEqual(this.getRange())&&this.fromOrientedRange(t)},this.$initRangeList=function(){if(this.rangeList)return;this.rangeList=new r,this.ranges=[],this.rangeCount=0},this.getAllRanges=function(){return this.rangeCount?this.rangeList.ranges.concat():[this.getRange()]},this.splitIntoLines=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=i.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var n=this.getRange(),r=this.isBackwards(),s=n.start.row,o=n.end.row;if(s==o){if(r)var u=n.end,a=n.start;else var u=n.start,a=n.end;this.addRange(i.fromPoints(a,a)),this.addRange(i.fromPoints(u,u));return}var f=[],l=this.getLineRange(s,!0);l.start.column=n.start.column,f.push(l);for(var c=s+1;c<o;c++)f.push(this.getLineRange(c,!0));l=this.getLineRange(o,!0),l.end.column=n.end.column,f.push(l),f.forEach(this.addRange,this)}},this.toggleBlockSelection=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=i.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var r=this.session.documentToScreenPosition(this.selectionLead),s=this.session.documentToScreenPosition(this.selectionAnchor),o=this.rectangularRangeBlock(r,s);o.forEach(this.addRange,this)}},this.rectangularRangeBlock=function(e,t,n){var r=[],s=e.column<t.column;if(s)var o=e.column,u=t.column;else var o=t.column,u=e.column;var a=e.row<t.row;if(a)var f=e.row,l=t.row;else var f=t.row,l=e.row;o<0&&(o=0),f<0&&(f=0),f==l&&(n=!0);for(var c=f;c<=l;c++){var h=i.fromPoints(this.session.screenToDocumentPosition(c,o),this.session.screenToDocumentPosition(c,u));if(h.isEmpty()){if(p&&v(h.end,p))break;var p=h.end}h.cursor=s?h.start:h.end,r.push(h)}a&&r.reverse();if(!n){var d=r.length-1;while(r[d].isEmpty()&&d>0)d--;if(d>0){var m=0;while(r[m].isEmpty())m++}for(var g=d;g>=m;g--)r[g].isEmpty()&&r.splice(g,1)}return r}}.call(s.prototype);var d=e("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(e){e.cursor||(e.cursor=e.end);var t=this.getSelectionStyle();return e.marker=this.session.addMarker(e,"ace_selection",t),this.session.$selectionMarkers.push(e),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,e},this.removeSelectionMarker=function(e){if(!e.marker)return;this.session.removeMarker(e.marker);var t=this.session.$selectionMarkers.indexOf(e);t!=-1&&this.session.$selectionMarkers.splice(t,1),this.session.selectionMarkerCount=this.session.$selectionMarkers.length},this.removeSelectionMarkers=function(e){var t=this.session.$selectionMarkers;for(var n=e.length;n--;){var r=e[n];if(!r.marker)continue;this.session.removeMarker(r.marker);var i=t.indexOf(r);i!=-1&&t.splice(i,1)}this.session.selectionMarkerCount=t.length},this.$onAddRange=function(e){this.addSelectionMarker(e.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(e){this.removeSelectionMarkers(e.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(e){if(this.inMultiSelectMode)return;this.inMultiSelectMode=!0,this.setStyle("ace_multiselect"),this.keyBinding.addKeyboardHandler(f.keyboardHandler),this.commands.setDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onSingleSelect=function(e){if(this.session.multiSelect.inVirtualMode)return;this.inMultiSelectMode=!1,this.unsetStyle("ace_multiselect"),this.keyBinding.removeKeyboardHandler(f.keyboardHandler),this.commands.removeDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers(),this._emit("changeSelection")},this.$onMultiSelectExec=function(e){var t=e.command,n=e.editor;if(!n.multiSelect)return;if(!t.multiSelectAction){var r=t.exec(n,e.args||{});n.multiSelect.addRange(n.multiSelect.toOrientedRange()),n.multiSelect.mergeOverlappingRanges()}else t.multiSelectAction=="forEach"?r=n.forEachSelection(t,e.args):t.multiSelectAction=="forEachLine"?r=n.forEachSelection(t,e.args,!0):t.multiSelectAction=="single"?(n.exitMultiSelectMode(),r=t.exec(n,e.args||{})):r=t.multiSelectAction(n,e.args||{});return r},this.forEachSelection=function(e,t,n){if(this.inVirtualSelectionMode)return;var r=n&&n.keepOrder,i=n==1||n&&n.$byLines,o=this.session,u=this.selection,a=u.rangeList,f=(r?u:a).ranges,l;if(!f.length)return e.exec?e.exec(this,t||{}):e(this,t||{});var c=u._eventRegistry;u._eventRegistry={};var h=new s(o);this.inVirtualSelectionMode=!0;for(var p=f.length;p--;){if(i)while(p>0&&f[p].start.row==f[p-1].end.row)p--;h.fromOrientedRange(f[p]),h.index=p,this.selection=o.selection=h;var d=e.exec?e.exec(this,t||{}):e(this,t||{});!l&&d!==undefined&&(l=d),h.toOrientedRange(f[p])}h.detach(),this.selection=o.selection=u,this.inVirtualSelectionMode=!1,u._eventRegistry=c,u.mergeOverlappingRanges();var v=this.renderer.$scrollAnimation;return this.onCursorChange(),this.onSelectionChange(),v&&v.from==v.to&&this.renderer.animateScrolling(v.from),l},this.exitMultiSelectMode=function(){if(!this.inMultiSelectMode||this.inVirtualSelectionMode)return;this.multiSelect.toSingleRange()},this.getSelectedText=function(){var e="";if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var t=this.multiSelect.rangeList.ranges,n=[];for(var r=0;r<t.length;r++)n.push(this.session.getTextRange(t[r]));var i=this.session.getDocument().getNewLineCharacter();e=n.join(i),e.length==(n.length-1)*i.length&&(e="")}else this.selection.isEmpty()||(e=this.session.getTextRange(this.getSelectionRange()));return e},this.$checkMultiselectChange=function(e,t){if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var n=this.multiSelect.ranges[0];if(this.multiSelect.isEmpty()&&t==this.multiSelect.anchor)return;var r=t==this.multiSelect.anchor?n.cursor==n.start?n.end:n.start:n.cursor;(r.row!=t.row||this.session.$clipPositionToDocument(r.row,r.column).column!=t.column)&&this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange())}},this.findAll=function(e,t,n){t=t||{},t.needle=e||t.needle;if(t.needle==undefined){var r=this.selection.isEmpty()?this.selection.getWordRange():this.selection.getRange();t.needle=this.session.getTextRange(r)}this.$search.set(t);var i=this.$search.findAll(this.session);if(!i.length)return 0;this.$blockScrolling+=1;var s=this.multiSelect;n||s.toSingleRange(i[0]);for(var o=i.length;o--;)s.addRange(i[o],!0);return r&&s.rangeList.rangeAtPoint(r.start)&&s.addRange(r,!0),this.$blockScrolling-=1,i.length},this.selectMoreLines=function(e,t){var n=this.selection.toOrientedRange(),r=n.cursor==n.end,s=this.session.documentToScreenPosition(n.cursor);this.selection.$desiredColumn&&(s.column=this.selection.$desiredColumn);var o=this.session.screenToDocumentPosition(s.row+e,s.column);if(!n.isEmpty())var u=this.session.documentToScreenPosition(r?n.end:n.start),a=this.session.screenToDocumentPosition(u.row+e,u.column);else var a=o;if(r){var f=i.fromPoints(o,a);f.cursor=f.start}else{var f=i.fromPoints(a,o);f.cursor=f.end}f.desiredColumn=s.column;if(!this.selection.inMultiSelectMode)this.selection.addRange(n);else if(t)var l=n.cursor;this.selection.addRange(f),l&&this.selection.substractPoint(l)},this.transposeSelections=function(e){var t=this.session,n=t.multiSelect,r=n.ranges;for(var i=r.length;i--;){var s=r[i];if(s.isEmpty()){var o=t.getWordRange(s.start.row,s.start.column);s.start.row=o.start.row,s.start.column=o.start.column,s.end.row=o.end.row,s.end.column=o.end.column}}n.mergeOverlappingRanges();var u=[];for(var i=r.length;i--;){var s=r[i];u.unshift(t.getTextRange(s))}e<0?u.unshift(u.pop()):u.push(u.shift());for(var i=r.length;i--;){var s=r[i],o=s.clone();t.replace(s,u[i]),s.start.row=o.start.row,s.start.column=o.start.column}},this.selectMore=function(e,t,n){var r=this.session,i=r.multiSelect,s=i.toOrientedRange();if(s.isEmpty()){s=r.getWordRange(s.start.row,s.start.column),s.cursor=e==-1?s.start:s.end,this.multiSelect.addRange(s);if(n)return}var o=r.getTextRange(s),u=h(r,o,e);u&&(u.cursor=e==-1?u.start:u.end,this.$blockScrolling+=1,this.session.unfold(u),this.multiSelect.addRange(u),this.$blockScrolling-=1,this.renderer.scrollCursorIntoView(null,.5)),t&&this.multiSelect.substractPoint(s.cursor)},this.alignCursors=function(){var e=this.session,t=e.multiSelect,n=t.ranges,r=-1,s=n.filter(function(e){if(e.cursor.row==r)return!0;r=e.cursor.row});if(!n.length||s.length==n.length-1){var o=this.selection.getRange(),u=o.start.row,f=o.end.row,l=u==f;if(l){var c=this.session.getLength(),h;do h=this.session.getLine(f);while(/[=:]/.test(h)&&++f<c);do h=this.session.getLine(u);while(/[=:]/.test(h)&&--u>0);u<0&&(u=0),f>=c&&(f=c-1)}var p=this.session.removeFullLines(u,f);p=this.$reAlignText(p,l),this.session.insert({row:u,column:0},p.join("\n")+"\n"),l||(o.start.column=0,o.end.column=p[p.length-1].length),this.selection.setRange(o)}else{s.forEach(function(e){t.substractPoint(e.cursor)});var d=0,v=Infinity,m=n.map(function(t){var n=t.cursor,r=e.getLine(n.row),i=r.substr(n.column).search(/\S/g);return i==-1&&(i=0),n.column>d&&(d=n.column),i<v&&(v=i),i});n.forEach(function(t,n){var r=t.cursor,s=d-r.column,o=m[n]-v;s>o?e.insert(r,a.stringRepeat(" ",s-o)):e.remove(new i(r.row,r.column,r.row,r.column-s+o)),t.start.column=t.end.column=d,t.start.row=t.end.row=r.row,t.cursor=t.end}),t.fromOrientedRange(n[0]),this.renderer.updateCursor(),this.renderer.updateBackMarkers()}},this.$reAlignText=function(e,t){function u(e){return a.stringRepeat(" ",e)}function f(e){return e[2]?u(i)+e[2]+u(s-e[2].length+o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}function l(e){return e[2]?u(i+s-e[2].length)+e[2]+u(o," ")+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}function c(e){return e[2]?u(i)+e[2]+u(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}var n=!0,r=!0,i,s,o;return e.map(function(e){var t=e.match(/(\s*)(.*?)(\s*)([=:].*)/);return t?i==null?(i=t[1].length,s=t[2].length,o=t[3].length,t):(i+s+o!=t[1].length+t[2].length+t[3].length&&(r=!1),i!=t[1].length&&(n=!1),i>t[1].length&&(i=t[1].length),s<t[2].length&&(s=t[2].length),o>t[3].length&&(o=t[3].length),t):[e]}).map(t?f:n?r?l:f:c)}}).call(d.prototype),t.onSessionChange=function(e){var t=e.session;t&&!t.multiSelect&&(t.$selectionMarkers=[],t.selection.$initRangeList(),t.multiSelect=t.selection),this.multiSelect=t&&t.multiSelect;var n=e.oldSession;n&&(n.multiSelect.off("addRange",this.$onAddRange),n.multiSelect.off("removeRange",this.$onRemoveRange),n.multiSelect.off("multiSelect",this.$onMultiSelect),n.multiSelect.off("singleSelect",this.$onSingleSelect),n.multiSelect.lead.off("change",this.$checkMultiselectChange),n.multiSelect.anchor.off("change",this.$checkMultiselectChange)),t&&(t.multiSelect.on("addRange",this.$onAddRange),t.multiSelect.on("removeRange",this.$onRemoveRange),t.multiSelect.on("multiSelect",this.$onMultiSelect),t.multiSelect.on("singleSelect",this.$onSingleSelect),t.multiSelect.lead.on("change",this.$checkMultiselectChange),t.multiSelect.anchor.on("change",this.$checkMultiselectChange)),t&&this.inMultiSelectMode!=t.selection.inMultiSelectMode&&(t.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},t.MultiSelect=m,e("./config").defineOptions(d.prototype,"editor",{enableMultiselect:{set:function(e){m(this),e?(this.on("changeSession",this.$multiselectOnSessionChange),this.on("mousedown",o)):(this.off("changeSession",this.$multiselectOnSessionChange),this.off("mousedown",o))},value:!0},enableBlockSelect:{set:function(e){this.$blockSelectEnabled=e},value:!0}})}),ace.define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../../range").Range,i=t.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);return this.foldingStartMarker.test(r)?"start":t=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(r)?"end":""},this.getFoldWidgetRange=function(e,t,n){return null},this.indentationBlock=function(e,t,n){var i=/\S/,s=e.getLine(t),o=s.search(i);if(o==-1)return;var u=n||s.length,a=e.getLength(),f=t,l=t;while(++t<a){var c=e.getLine(t).search(i);if(c==-1)continue;if(c<=o)break;l=t}if(l>f){var h=e.getLine(l).length;return new r(f,u,l,h)}},this.openingBracketBlock=function(e,t,n,i,s){var o={row:n,column:i+1},u=e.$findClosingBracket(t,o,s);if(!u)return;var a=e.foldWidgets[u.row];return a==null&&(a=e.getFoldWidget(u.row)),a=="start"&&u.row>o.row&&(u.row--,u.column=e.getLine(u.row).length),r.fromPoints(o,u)},this.closingBracketBlock=function(e,t,n,i,s){var o={row:n,column:i},u=e.$findOpeningBracket(t,o);if(!u)return;return u.column++,o.column--,r.fromPoints(u,o)}}).call(i.prototype)}),ace.define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";t.isDark=!1,t.cssClass="ace-tm",t.cssText='.ace-tm .ace_gutter {background: #f0f0f0;color: #333;}.ace-tm .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-tm .ace_fold {background-color: #6B72E6;}.ace-tm {background-color: #FFFFFF;color: black;}.ace-tm .ace_cursor {color: black;}.ace-tm .ace_invisible {color: rgb(191, 191, 191);}.ace-tm .ace_storage,.ace-tm .ace_keyword {color: blue;}.ace-tm .ace_constant {color: rgb(197, 6, 11);}.ace-tm .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-tm .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-tm .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-tm .ace_invalid {background-color: rgba(255, 0, 0, 0.1);color: red;}.ace-tm .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-tm .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-tm .ace_support.ace_type,.ace-tm .ace_support.ace_class {color: rgb(109, 121, 222);}.ace-tm .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-tm .ace_string {color: rgb(3, 106, 7);}.ace-tm .ace_comment {color: rgb(76, 136, 107);}.ace-tm .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-tm .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-tm .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-tm .ace_variable {color: rgb(49, 132, 149);}.ace-tm .ace_xml-pe {color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-tm .ace_heading {color: rgb(12, 7, 255);}.ace-tm .ace_list {color:rgb(185, 6, 144);}.ace-tm .ace_meta.ace_tag {color:rgb(0, 22, 142);}.ace-tm .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-tm .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-tm.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px white;}.ace-tm .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_gutter-active-line {background-color : #dcdcdc;}.ace-tm .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}';var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)}),ace.define("ace/line_widgets",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/range"],function(e,t,n){"use strict";function o(e){this.session=e,this.session.widgetManager=this,this.session.getRowLength=this.getRowLength,this.session.$getWidgetScreenLength=this.$getWidgetScreenLength,this.updateOnChange=this.updateOnChange.bind(this),this.renderWidgets=this.renderWidgets.bind(this),this.measureWidgets=this.measureWidgets.bind(this),this.session._changedWidgets=[],this.$onChangeEditor=this.$onChangeEditor.bind(this),this.session.on("change",this.updateOnChange),this.session.on("changeFold",this.updateOnFold),this.session.on("changeEditor",this.$onChangeEditor)}var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./range").Range;(function(){this.getRowLength=function(e){var t;return this.lineWidgets?t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0:t=0,!this.$useWrapMode||!this.$wrapData[e]?1+t:this.$wrapData[e].length+1+t},this.$getWidgetScreenLength=function(){var e=0;return this.lineWidgets.forEach(function(t){t&&t.rowCount&&!t.hidden&&(e+=t.rowCount)}),e},this.$onChangeEditor=function(e){this.attach(e.editor)},this.attach=function(e){e&&e.widgetManager&&e.widgetManager!=this&&e.widgetManager.detach();if(this.editor==e)return;this.detach(),this.editor=e,e&&(e.widgetManager=this,e.renderer.on("beforeRender",this.measureWidgets),e.renderer.on("afterRender",this.renderWidgets))},this.detach=function(e){var t=this.editor;if(!t)return;this.editor=null,t.widgetManager=null,t.renderer.off("beforeRender",this.measureWidgets),t.renderer.off("afterRender",this.renderWidgets);var n=this.session.lineWidgets;n&&n.forEach(function(e){e&&e.el&&e.el.parentNode&&(e._inDocument=!1,e.el.parentNode.removeChild(e.el))})},this.updateOnFold=function(e,t){var n=t.lineWidgets;if(!n||!e.action)return;var r=e.data,i=r.start.row,s=r.end.row,o=e.action=="add";for(var u=i+1;u<s;u++)n[u]&&(n[u].hidden=o);n[s]&&(o?n[i]?n[s].hidden=o:n[i]=n[s]:(n[i]==n[s]&&(n[i]=undefined),n[s].hidden=o))},this.updateOnChange=function(e){var t=this.session.lineWidgets;if(!t)return;var n=e.start.row,r=e.end.row-n;if(r!==0)if(e.action=="remove"){var i=t.splice(n+1,r);i.forEach(function(e){e&&this.removeLineWidget(e)},this),this.$updateRows()}else{var s=new Array(r);s.unshift(n,0),t.splice.apply(t,s),this.$updateRows()}},this.$updateRows=function(){var e=this.session.lineWidgets;if(!e)return;var t=!0;e.forEach(function(e,n){if(e){t=!1,e.row=n;while(e.$oldWidget)e.$oldWidget.row=n,e=e.$oldWidget}}),t&&(this.session.lineWidgets=null)},this.addLineWidget=function(e){this.session.lineWidgets||(this.session.lineWidgets=new Array(this.session.getLength()));var t=this.session.lineWidgets[e.row];t&&(e.$oldWidget=t,t.el&&t.el.parentNode&&(t.el.parentNode.removeChild(t.el),t._inDocument=!1)),this.session.lineWidgets[e.row]=e,e.session=this.session;var n=this.editor.renderer;e.html&&!e.el&&(e.el=i.createElement("div"),e.el.innerHTML=e.html),e.el&&(i.addCssClass(e.el,"ace_lineWidgetContainer"),e.el.style.position="absolute",e.el.style.zIndex=5,n.container.appendChild(e.el),e._inDocument=!0),e.coverGutter||(e.el.style.zIndex=3),e.pixelHeight==null&&(e.pixelHeight=e.el.offsetHeight),e.rowCount==null&&(e.rowCount=e.pixelHeight/n.layerConfig.lineHeight);var r=this.session.getFoldAt(e.row,0);e.$fold=r;if(r){var s=this.session.lineWidgets;e.row==r.end.row&&!s[r.start.row]?s[r.start.row]=e:e.hidden=!0}return this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows(),this.renderWidgets(null,n),this.onWidgetChanged(e),e},this.removeLineWidget=function(e){e._inDocument=!1,e.session=null,e.el&&e.el.parentNode&&e.el.parentNode.removeChild(e.el);if(e.editor&&e.editor.destroy)try{e.editor.destroy()}catch(t){}if(this.session.lineWidgets){var n=this.session.lineWidgets[e.row];if(n==e)this.session.lineWidgets[e.row]=e.$oldWidget,e.$oldWidget&&this.onWidgetChanged(e.$oldWidget);else while(n){if(n.$oldWidget==e){n.$oldWidget=e.$oldWidget;break}n=n.$oldWidget}}this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows()},this.getWidgetsAtRow=function(e){var t=this.session.lineWidgets,n=t&&t[e],r=[];while(n)r.push(n),n=n.$oldWidget;return r},this.onWidgetChanged=function(e){this.session._changedWidgets.push(e),this.editor&&this.editor.renderer.updateFull()},this.measureWidgets=function(e,t){var n=this.session._changedWidgets,r=t.layerConfig;if(!n||!n.length)return;var i=Infinity;for(var s=0;s<n.length;s++){var o=n[s];if(!o||!o.el)continue;if(o.session!=this.session)continue;if(!o._inDocument){if(this.session.lineWidgets[o.row]!=o)continue;o._inDocument=!0,t.container.appendChild(o.el)}o.h=o.el.offsetHeight,o.fixedWidth||(o.w=o.el.offsetWidth,o.screenWidth=Math.ceil(o.w/r.characterWidth));var u=o.h/r.lineHeight;o.coverLine&&(u-=this.session.getRowLineCount(o.row),u<0&&(u=0)),o.rowCount!=u&&(o.rowCount=u,o.row<i&&(i=o.row))}i!=Infinity&&(this.session._emit("changeFold",{data:{start:{row:i}}}),this.session.lineWidgetWidth=null),this.session._changedWidgets=[]},this.renderWidgets=function(e,t){var n=t.layerConfig,r=this.session.lineWidgets;if(!r)return;var i=Math.min(this.firstRow,n.firstRow),s=Math.max(this.lastRow,n.lastRow,r.length);while(i>0&&!r[i])i--;this.firstRow=n.firstRow,this.lastRow=n.lastRow,t.$cursorLayer.config=n;for(var o=i;o<=s;o++){var u=r[o];if(!u||!u.el)continue;if(u.hidden){u.el.style.top=-100-(u.pixelHeight||0)+"px";continue}u._inDocument||(u._inDocument=!0,t.container.appendChild(u.el));var a=t.$cursorLayer.getPixelPosition({row:o,column:0},!0).top;u.coverLine||(a+=n.lineHeight*this.session.getRowLineCount(u.row)),u.el.style.top=a-n.offset+"px";var f=u.coverGutter?0:t.gutterWidth;u.fixedWidth||(f-=t.scrollLeft),u.el.style.left=f+"px",u.fullWidth&&u.screenWidth&&(u.el.style.minWidth=n.width+2*n.padding+"px"),u.fixedWidth?u.el.style.right=t.scrollBar.getWidth()+"px":u.el.style.right=""}}}).call(o.prototype),t.LineWidgets=o}),ace.define("ace/ext/error_marker",["require","exports","module","ace/line_widgets","ace/lib/dom","ace/range"],function(e,t,n){"use strict";function o(e,t,n){var r=0,i=e.length-1;while(r<=i){var s=r+i>>1,o=n(t,e[s]);if(o>0)r=s+1;else{if(!(o<0))return s;i=s-1}}return-(r+1)}function u(e,t,n){var r=e.getAnnotations().sort(s.comparePoints);if(!r.length)return;var i=o(r,{row:t,column:-1},s.comparePoints);i<0&&(i=-i-1),i>=r.length?i=n>0?0:r.length-1:i===0&&n<0&&(i=r.length-1);var u=r[i];if(!u||!n)return;if(u.row===t){do u=r[i+=n];while(u&&u.row===t);if(!u)return r.slice()}var a=[];t=u.row;do a[n<0?"unshift":"push"](u),u=r[i+=n];while(u&&u.row==t);return a.length&&a}var r=e("../line_widgets").LineWidgets,i=e("../lib/dom"),s=e("../range").Range;t.showErrorMarker=function(e,t){var n=e.session;n.widgetManager||(n.widgetManager=new r(n),n.widgetManager.attach(e));var s=e.getCursorPosition(),o=s.row,a=n.widgetManager.getWidgetsAtRow(o).filter(function(e){return e.type=="errorMarker"})[0];a?a.destroy():o-=t;var f=u(n,o,t),l;if(f){var c=f[0];s.column=(c.pos&&typeof c.column!="number"?c.pos.sc:c.column)||0,s.row=c.row,l=e.renderer.$gutterLayer.$annotations[s.row]}else{if(a)return;l={text:["Looks good!"],className:"ace_ok"}}e.session.unfold(s.row),e.selection.moveToPosition(s);var h={row:s.row,fixedWidth:!0,coverGutter:!0,el:i.createElement("div"),type:"errorMarker"},p=h.el.appendChild(i.createElement("div")),d=h.el.appendChild(i.createElement("div"));d.className="error_widget_arrow "+l.className;var v=e.renderer.$cursorLayer.getPixelPosition(s).left;d.style.left=v+e.renderer.gutterWidth-5+"px",h.el.className="error_widget_wrapper",p.className="error_widget "+l.className,p.innerHTML=l.text.join("<br>"),p.appendChild(i.createElement("div"));var m=function(e,t,n){if(t===0&&(n==="esc"||n==="return"))return h.destroy(),{command:"null"}};h.destroy=function(){if(e.$mouseHandler.isMousePressed)return;e.keyBinding.removeKeyboardHandler(m),n.widgetManager.removeLineWidget(h),e.off("changeSelection",h.destroy),e.off("changeSession",h.destroy),e.off("mouseup",h.destroy),e.off("change",h.destroy)},e.keyBinding.addKeyboardHandler(m),e.on("changeSelection",h.destroy),e.on("changeSession",h.destroy),e.on("mouseup",h.destroy),e.on("change",h.destroy),e.session.widgetManager.addLineWidget(h),h.el.onmousedown=e.focus.bind(e),e.renderer.scrollCursorIntoView(null,.5,{bottom:h.el.offsetHeight})},i.importCssString("    .error_widget_wrapper {        background: inherit;        color: inherit;        border:none    }    .error_widget {        border-top: solid 2px;        border-bottom: solid 2px;        margin: 5px 0;        padding: 10px 40px;        white-space: pre-wrap;    }    .error_widget.ace_error, .error_widget_arrow.ace_error{        border-color: #ff5a5a    }    .error_widget.ace_warning, .error_widget_arrow.ace_warning{        border-color: #F1D817    }    .error_widget.ace_info, .error_widget_arrow.ace_info{        border-color: #5a5a5a    }    .error_widget.ace_ok, .error_widget_arrow.ace_ok{        border-color: #5aaa5a    }    .error_widget_arrow {        position: absolute;        border: solid 5px;        border-top-color: transparent!important;        border-right-color: transparent!important;        border-left-color: transparent!important;        top: -5px;    }","")}),ace.define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"],function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var r=e("./lib/dom"),i=e("./lib/event"),s=e("./editor").Editor,o=e("./edit_session").EditSession,u=e("./undomanager").UndoManager,a=e("./virtual_renderer").VirtualRenderer;e("./worker/worker_client"),e("./keyboard/hash_handler"),e("./placeholder"),e("./multi_select"),e("./mode/folding/fold_mode"),e("./theme/textmate"),e("./ext/error_marker"),t.config=e("./config"),t.require=e,typeof define=="function"&&(t.define=define),t.edit=function(e){if(typeof e=="string"){var n=e;e=document.getElementById(n);if(!e)throw new Error("ace.edit can't find div #"+n)}if(e&&e.env&&e.env.editor instanceof s)return e.env.editor;var o="";if(e&&/input|textarea/i.test(e.tagName)){var u=e;o=u.value,e=r.createElement("pre"),u.parentNode.replaceChild(e,u)}else e&&(o=r.getInnerText(e),e.innerHTML="");var f=t.createEditSession(o),l=new s(new a(e));l.setSession(f);var c={document:f,editor:l,onResize:l.resize.bind(l,null)};return u&&(c.textarea=u),i.addListener(window,"resize",c.onResize),l.on("destroy",function(){i.removeListener(window,"resize",c.onResize),c.editor.container.env=null}),l.container.env=l.env=c,l},t.createEditSession=function(e,t){var n=new o(e,t);return n.setUndoManager(new u),n},t.EditSession=o,t.UndoManager=u,t.version="1.2.8"});
+(function() {
+    ace.require(["ace/ace"], function(a) {
+        if (a) {
+            a.config.init(true);
+            a.define = ace.define;
+        }
+        if (!window.ace)
+            window.ace = a;
+        for (var key in a) if (a.hasOwnProperty(key))
+            window.ace[key] = a[key];
+    });
+})();
         
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config/js/ext-searchbox.js b/datamodels/2.x/itop-config/js/ext-searchbox.js
index 05fa23278..f88f26c54 100644
--- a/datamodels/2.x/itop-config/js/ext-searchbox.js
+++ b/datamodels/2.x/itop-config/js/ext-searchbox.js
@@ -1,4 +1,4 @@
-ace.define("ace/ext/searchbox",["require","exports","module","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/keyboard/hash_handler","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=e("../lib/lang"),s=e("../lib/event"),o='.ace_search {background-color: #ddd;color: #666;border: 1px solid #cbcbcb;border-top: 0 none;overflow: hidden;margin: 0;padding: 4px 6px 0 4px;position: absolute;top: 0;z-index: 99;white-space: normal;}.ace_search.left {border-left: 0 none;border-radius: 0px 0px 5px 0px;left: 0;}.ace_search.right {border-radius: 0px 0px 0px 5px;border-right: 0 none;right: 0;}.ace_search_form, .ace_replace_form {margin: 0 20px 4px 0;overflow: hidden;line-height: 1.9;}.ace_replace_form {margin-right: 0;}.ace_search_form.ace_nomatch {outline: 1px solid red;}.ace_search_field {border-radius: 3px 0 0 3px;background-color: white;color: black;border: 1px solid #cbcbcb;border-right: 0 none;box-sizing: border-box!important;outline: 0;padding: 0;font-size: inherit;margin: 0;line-height: inherit;padding: 0 6px;min-width: 17em;vertical-align: top;}.ace_searchbtn {border: 1px solid #cbcbcb;line-height: inherit;display: inline-block;padding: 0 6px;background: #fff;border-right: 0 none;border-left: 1px solid #dcdcdc;cursor: pointer;margin: 0;position: relative;box-sizing: content-box!important;color: #666;}.ace_searchbtn:last-child {border-radius: 0 3px 3px 0;border-right: 1px solid #cbcbcb;}.ace_searchbtn:disabled {background: none;cursor: default;}.ace_searchbtn:hover {background-color: #eef1f6;}.ace_searchbtn.prev, .ace_searchbtn.next {padding: 0px 0.7em}.ace_searchbtn.prev:after, .ace_searchbtn.next:after {content: "";border: solid 2px #888;width: 0.5em;height: 0.5em;border-width:  2px 0 0 2px;display:inline-block;transform: rotate(-45deg);}.ace_searchbtn.next:after {border-width: 0 2px 2px 0 ;}.ace_searchbtn_close {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;border-radius: 50%;border: 0 none;color: #656565;cursor: pointer;font: 16px/16px Arial;padding: 0;height: 14px;width: 14px;top: 9px;right: 7px;position: absolute;}.ace_searchbtn_close:hover {background-color: #656565;background-position: 50% 100%;color: white;}.ace_button {margin-left: 2px;cursor: pointer;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;overflow: hidden;opacity: 0.7;border: 1px solid rgba(100,100,100,0.23);padding: 1px;box-sizing:    border-box!important;color: black;}.ace_button:hover {background-color: #eee;opacity:1;}.ace_button:active {background-color: #ddd;}.ace_button.checked {border-color: #3399ff;opacity:1;}.ace_search_options{margin-bottom: 3px;text-align: right;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;clear: both;}.ace_search_counter {float: left;font-family: arial;padding: 0 8px;}',u=e("../keyboard/hash_handler").HashHandler,a=e("../lib/keys"),f=999;r.importCssString(o,"ace_searchbox");var l='<div class="ace_search right">    <span action="hide" class="ace_searchbtn_close"></span>    <div class="ace_search_form">        <input class="ace_search_field" placeholder="Search for" spellcheck="false"></input>        <span action="findPrev" class="ace_searchbtn prev"></span>        <span action="findNext" class="ace_searchbtn next"></span>        <span action="findAll" class="ace_searchbtn" title="Alt-Enter">All</span>    </div>    <div class="ace_replace_form">        <input class="ace_search_field" placeholder="Replace with" spellcheck="false"></input>        <span action="replaceAndFindNext" class="ace_searchbtn">Replace</span>        <span action="replaceAll" class="ace_searchbtn">All</span>    </div>    <div class="ace_search_options">        <span action="toggleReplace" class="ace_button" title="Toggel Replace mode"            style="float:left;margin-top:-2px;padding:0 5px;">+</span>        <span class="ace_search_counter"></span>        <span action="toggleRegexpMode" class="ace_button" title="RegExp Search">.*</span>        <span action="toggleCaseSensitive" class="ace_button" title="CaseSensitive Search">Aa</span>        <span action="toggleWholeWords" class="ace_button" title="Whole Word Search">\\b</span>        <span action="searchInSelection" class="ace_button" title="Search In Selection">S</span>    </div></div>'.replace(/> +/g,">"),c=function(e,t,n){var i=r.createElement("div");i.innerHTML=l,this.element=i.firstChild,this.setSession=this.setSession.bind(this),this.$init(),this.setEditor(e)};(function(){this.setEditor=function(e){e.searchBox=this,e.renderer.scroller.appendChild(this.element),this.editor=e},this.setSession=function(e){debugger;this.searchRange=null,this.$syncOptions(!0)},this.$initElements=function(e){this.searchBox=e.querySelector(".ace_search_form"),this.replaceBox=e.querySelector(".ace_replace_form"),this.searchOption=e.querySelector("[action=searchInSelection]"),this.replaceOption=e.querySelector("[action=toggleReplace]"),this.regExpOption=e.querySelector("[action=toggleRegexpMode]"),this.caseSensitiveOption=e.querySelector("[action=toggleCaseSensitive]"),this.wholeWordOption=e.querySelector("[action=toggleWholeWords]"),this.searchInput=this.searchBox.querySelector(".ace_search_field"),this.replaceInput=this.replaceBox.querySelector(".ace_search_field"),this.searchCounter=e.querySelector(".ace_search_counter")},this.$init=function(){var e=this.element;this.$initElements(e);var t=this;s.addListener(e,"mousedown",function(e){setTimeout(function(){t.activeInput.focus()},0),s.stopPropagation(e)}),s.addListener(e,"click",function(e){var n=e.target||e.srcElement,r=n.getAttribute("action");r&&t[r]?t[r]():t.$searchBarKb.commands[r]&&t.$searchBarKb.commands[r].exec(t),s.stopPropagation(e)}),s.addCommandKeyListener(e,function(e,n,r){var i=a.keyCodeToString(r),o=t.$searchBarKb.findKeyCommand(n,i);o&&o.exec&&(o.exec(t),s.stopEvent(e))}),this.$onChange=i.delayedCall(function(){t.find(!1,!1)}),s.addListener(this.searchInput,"input",function(){t.$onChange.schedule(20)}),s.addListener(this.searchInput,"focus",function(){t.activeInput=t.searchInput,t.searchInput.value&&t.highlight()}),s.addListener(this.replaceInput,"focus",function(){t.activeInput=t.replaceInput,t.searchInput.value&&t.highlight()})},this.$closeSearchBarKb=new u([{bindKey:"Esc",name:"closeSearchBar",exec:function(e){e.searchBox.hide()}}]),this.$searchBarKb=new u,this.$searchBarKb.bindKeys({"Ctrl-f|Command-f":function(e){var t=e.isReplace=!e.isReplace;e.replaceBox.style.display=t?"":"none",e.replaceOption.checked=!1,e.$syncOptions(),e.searchInput.focus()},"Ctrl-H|Command-Option-F":function(e){e.replaceOption.checked=!0,e.$syncOptions(),e.replaceInput.focus()},"Ctrl-G|Command-G":function(e){e.findNext()},"Ctrl-Shift-G|Command-Shift-G":function(e){e.findPrev()},esc:function(e){setTimeout(function(){e.hide()})},Return:function(e){e.activeInput==e.replaceInput&&e.replace(),e.findNext()},"Shift-Return":function(e){e.activeInput==e.replaceInput&&e.replace(),e.findPrev()},"Alt-Return":function(e){e.activeInput==e.replaceInput&&e.replaceAll(),e.findAll()},Tab:function(e){(e.activeInput==e.replaceInput?e.searchInput:e.replaceInput).focus()}}),this.$searchBarKb.addCommands([{name:"toggleRegexpMode",bindKey:{win:"Alt-R|Alt-/",mac:"Ctrl-Alt-R|Ctrl-Alt-/"},exec:function(e){e.regExpOption.checked=!e.regExpOption.checked,e.$syncOptions()}},{name:"toggleCaseSensitive",bindKey:{win:"Alt-C|Alt-I",mac:"Ctrl-Alt-R|Ctrl-Alt-I"},exec:function(e){e.caseSensitiveOption.checked=!e.caseSensitiveOption.checked,e.$syncOptions()}},{name:"toggleWholeWords",bindKey:{win:"Alt-B|Alt-W",mac:"Ctrl-Alt-B|Ctrl-Alt-W"},exec:function(e){e.wholeWordOption.checked=!e.wholeWordOption.checked,e.$syncOptions()}},{name:"toggleReplace",exec:function(e){e.replaceOption.checked=!e.replaceOption.checked,e.$syncOptions()}},{name:"searchInSelection",exec:function(e){e.searchOption.checked=!e.searchRange,e.setSearchRange(e.searchOption.checked&&e.editor.getSelectionRange()),e.$syncOptions()}}]),this.setSearchRange=function(e){this.searchRange=e,e?this.searchRangeMarker=this.editor.session.addMarker(e,"ace_active-line"):this.searchRangeMarker&&(this.editor.session.removeMarker(this.searchRangeMarker),this.searchRangeMarker=null)},this.$syncOptions=function(e){r.setCssClass(this.replaceOption,"checked",this.searchRange),r.setCssClass(this.searchOption,"checked",this.searchOption.checked),this.replaceOption.textContent=this.replaceOption.checked?"-":"+",r.setCssClass(this.regExpOption,"checked",this.regExpOption.checked),r.setCssClass(this.wholeWordOption,"checked",this.wholeWordOption.checked),r.setCssClass(this.caseSensitiveOption,"checked",this.caseSensitiveOption.checked),this.replaceBox.style.display=this.replaceOption.checked?"":"none",this.find(!1,!1,e)},this.highlight=function(e){this.editor.session.highlight(e||this.editor.$search.$options.re),this.editor.renderer.updateBackMarkers()},this.find=function(e,t,n){var i=this.editor.find(this.searchInput.value,{skipCurrent:e,backwards:t,wrap:!0,regExp:this.regExpOption.checked,caseSensitive:this.caseSensitiveOption.checked,wholeWord:this.wholeWordOption.checked,preventScroll:n,range:this.searchRange}),s=!i&&this.searchInput.value;r.setCssClass(this.searchBox,"ace_nomatch",s),this.editor._emit("findSearchBox",{match:!s}),this.highlight(),this.updateCounter()},this.updateCounter=function(){var e=this.editor,t=e.$search.$options.re,n=0,r=0;if(t){var i=this.searchRange?e.session.getTextRange(this.searchRange):e.getValue(),s=e.session.doc.positionToIndex(e.selection.anchor);this.searchRange&&(s-=e.session.doc.positionToIndex(this.searchRange.start));var o=t.lastIndex=0,u;while(u=t.exec(i)){n++,o=u.index,o<=s&&r++;if(n>f)break;if(!u[0]){t.lastIndex=o+=1;if(o>=i.length)break}}}this.searchCounter.textContent=r+" of "+(n>f?f+"+":n)},this.findNext=function(){this.find(!0,!1)},this.findPrev=function(){this.find(!0,!0)},this.findAll=function(){var e=this.editor.findAll(this.searchInput.value,{regExp:this.regExpOption.checked,caseSensitive:this.caseSensitiveOption.checked,wholeWord:this.wholeWordOption.checked}),t=!e&&this.searchInput.value;r.setCssClass(this.searchBox,"ace_nomatch",t),this.editor._emit("findSearchBox",{match:!t}),this.highlight(),this.hide()},this.replace=function(){this.editor.getReadOnly()||this.editor.replace(this.replaceInput.value)},this.replaceAndFindNext=function(){this.editor.getReadOnly()||(this.editor.replace(this.replaceInput.value),this.findNext())},this.replaceAll=function(){this.editor.getReadOnly()||this.editor.replaceAll(this.replaceInput.value)},this.hide=function(){this.active=!1,this.setSearchRange(null),this.editor.off("changeSession",this.setSession),this.element.style.display="none",this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb),this.editor.focus()},this.show=function(e,t){this.active=!0,this.editor.on("changeSession",this.setSession),this.element.style.display="",this.replaceOption.checked=t,e&&(this.searchInput.value=e),this.searchInput.focus(),this.searchInput.select(),this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb),this.$syncOptions(!0)},this.isFocused=function(){var e=document.activeElement;return e==this.searchInput||e==this.replaceInput}}).call(c.prototype),t.SearchBox=c,t.Search=function(e,t){var n=e.searchBox||new c(e);n.show(e.session.getTextRange(),t)}});
-(function() {
-    ace.require(["ace/ext/searchbox"], function() {});
-})();
+ace.define("ace/ext/searchbox",["require","exports","module","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/keyboard/hash_handler","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=e("../lib/lang"),s=e("../lib/event"),o='.ace_search {background-color: #ddd;color: #666;border: 1px solid #cbcbcb;border-top: 0 none;overflow: hidden;margin: 0;padding: 4px 6px 0 4px;position: absolute;top: 0;z-index: 99;white-space: normal;}.ace_search.left {border-left: 0 none;border-radius: 0px 0px 5px 0px;left: 0;}.ace_search.right {border-radius: 0px 0px 0px 5px;border-right: 0 none;right: 0;}.ace_search_form, .ace_replace_form {margin: 0 20px 4px 0;overflow: hidden;line-height: 1.9;}.ace_replace_form {margin-right: 0;}.ace_search_form.ace_nomatch {outline: 1px solid red;}.ace_search_field {border-radius: 3px 0 0 3px;background-color: white;color: black;border: 1px solid #cbcbcb;border-right: 0 none;box-sizing: border-box!important;outline: 0;padding: 0;font-size: inherit;margin: 0;line-height: inherit;padding: 0 6px;min-width: 17em;vertical-align: top;}.ace_searchbtn {border: 1px solid #cbcbcb;line-height: inherit;display: inline-block;padding: 0 6px;background: #fff;border-right: 0 none;border-left: 1px solid #dcdcdc;cursor: pointer;margin: 0;position: relative;box-sizing: content-box!important;color: #666;}.ace_searchbtn:last-child {border-radius: 0 3px 3px 0;border-right: 1px solid #cbcbcb;}.ace_searchbtn:disabled {background: none;cursor: default;}.ace_searchbtn:hover {background-color: #eef1f6;}.ace_searchbtn.prev, .ace_searchbtn.next {padding: 0px 0.7em}.ace_searchbtn.prev:after, .ace_searchbtn.next:after {content: "";border: solid 2px #888;width: 0.5em;height: 0.5em;border-width:  2px 0 0 2px;display:inline-block;transform: rotate(-45deg);}.ace_searchbtn.next:after {border-width: 0 2px 2px 0 ;}.ace_searchbtn_close {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;border-radius: 50%;border: 0 none;color: #656565;cursor: pointer;font: 16px/16px Arial;padding: 0;height: 14px;width: 14px;top: 9px;right: 7px;position: absolute;}.ace_searchbtn_close:hover {background-color: #656565;background-position: 50% 100%;color: white;}.ace_button {margin-left: 2px;cursor: pointer;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;overflow: hidden;opacity: 0.7;border: 1px solid rgba(100,100,100,0.23);padding: 1px;box-sizing:    border-box!important;color: black;}.ace_button:hover {background-color: #eee;opacity:1;}.ace_button:active {background-color: #ddd;}.ace_button.checked {border-color: #3399ff;opacity:1;}.ace_search_options{margin-bottom: 3px;text-align: right;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;clear: both;}.ace_search_counter {float: left;font-family: arial;padding: 0 8px;}',u=e("../keyboard/hash_handler").HashHandler,a=e("../lib/keys"),f=999;r.importCssString(o,"ace_searchbox");var l='<div class="ace_search right">    <span action="hide" class="ace_searchbtn_close"></span>    <div class="ace_search_form">        <input class="ace_search_field" placeholder="Search for" spellcheck="false"></input>        <span action="findPrev" class="ace_searchbtn prev"></span>        <span action="findNext" class="ace_searchbtn next"></span>        <span action="findAll" class="ace_searchbtn" title="Alt-Enter">All</span>    </div>    <div class="ace_replace_form">        <input class="ace_search_field" placeholder="Replace with" spellcheck="false"></input>        <span action="replaceAndFindNext" class="ace_searchbtn">Replace</span>        <span action="replaceAll" class="ace_searchbtn">All</span>    </div>    <div class="ace_search_options">        <span action="toggleReplace" class="ace_button" title="Toggel Replace mode"            style="float:left;margin-top:-2px;padding:0 5px;">+</span>        <span class="ace_search_counter"></span>        <span action="toggleRegexpMode" class="ace_button" title="RegExp Search">.*</span>        <span action="toggleCaseSensitive" class="ace_button" title="CaseSensitive Search">Aa</span>        <span action="toggleWholeWords" class="ace_button" title="Whole Word Search">\\b</span>        <span action="searchInSelection" class="ace_button" title="Search In Selection">S</span>    </div></div>'.replace(/> +/g,">"),c=function(e,t,n){var i=r.createElement("div");i.innerHTML=l,this.element=i.firstChild,this.setSession=this.setSession.bind(this),this.$init(),this.setEditor(e)};(function(){this.setEditor=function(e){e.searchBox=this,e.renderer.scroller.appendChild(this.element),this.editor=e},this.setSession=function(e){debugger;this.searchRange=null,this.$syncOptions(!0)},this.$initElements=function(e){this.searchBox=e.querySelector(".ace_search_form"),this.replaceBox=e.querySelector(".ace_replace_form"),this.searchOption=e.querySelector("[action=searchInSelection]"),this.replaceOption=e.querySelector("[action=toggleReplace]"),this.regExpOption=e.querySelector("[action=toggleRegexpMode]"),this.caseSensitiveOption=e.querySelector("[action=toggleCaseSensitive]"),this.wholeWordOption=e.querySelector("[action=toggleWholeWords]"),this.searchInput=this.searchBox.querySelector(".ace_search_field"),this.replaceInput=this.replaceBox.querySelector(".ace_search_field"),this.searchCounter=e.querySelector(".ace_search_counter")},this.$init=function(){var e=this.element;this.$initElements(e);var t=this;s.addListener(e,"mousedown",function(e){setTimeout(function(){t.activeInput.focus()},0),s.stopPropagation(e)}),s.addListener(e,"click",function(e){var n=e.target||e.srcElement,r=n.getAttribute("action");r&&t[r]?t[r]():t.$searchBarKb.commands[r]&&t.$searchBarKb.commands[r].exec(t),s.stopPropagation(e)}),s.addCommandKeyListener(e,function(e,n,r){var i=a.keyCodeToString(r),o=t.$searchBarKb.findKeyCommand(n,i);o&&o.exec&&(o.exec(t),s.stopEvent(e))}),this.$onChange=i.delayedCall(function(){t.find(!1,!1)}),s.addListener(this.searchInput,"input",function(){t.$onChange.schedule(20)}),s.addListener(this.searchInput,"focus",function(){t.activeInput=t.searchInput,t.searchInput.value&&t.highlight()}),s.addListener(this.replaceInput,"focus",function(){t.activeInput=t.replaceInput,t.searchInput.value&&t.highlight()})},this.$closeSearchBarKb=new u([{bindKey:"Esc",name:"closeSearchBar",exec:function(e){e.searchBox.hide()}}]),this.$searchBarKb=new u,this.$searchBarKb.bindKeys({"Ctrl-f|Command-f":function(e){var t=e.isReplace=!e.isReplace;e.replaceBox.style.display=t?"":"none",e.replaceOption.checked=!1,e.$syncOptions(),e.searchInput.focus()},"Ctrl-H|Command-Option-F":function(e){e.replaceOption.checked=!0,e.$syncOptions(),e.replaceInput.focus()},"Ctrl-G|Command-G":function(e){e.findNext()},"Ctrl-Shift-G|Command-Shift-G":function(e){e.findPrev()},esc:function(e){setTimeout(function(){e.hide()})},Return:function(e){e.activeInput==e.replaceInput&&e.replace(),e.findNext()},"Shift-Return":function(e){e.activeInput==e.replaceInput&&e.replace(),e.findPrev()},"Alt-Return":function(e){e.activeInput==e.replaceInput&&e.replaceAll(),e.findAll()},Tab:function(e){(e.activeInput==e.replaceInput?e.searchInput:e.replaceInput).focus()}}),this.$searchBarKb.addCommands([{name:"toggleRegexpMode",bindKey:{win:"Alt-R|Alt-/",mac:"Ctrl-Alt-R|Ctrl-Alt-/"},exec:function(e){e.regExpOption.checked=!e.regExpOption.checked,e.$syncOptions()}},{name:"toggleCaseSensitive",bindKey:{win:"Alt-C|Alt-I",mac:"Ctrl-Alt-R|Ctrl-Alt-I"},exec:function(e){e.caseSensitiveOption.checked=!e.caseSensitiveOption.checked,e.$syncOptions()}},{name:"toggleWholeWords",bindKey:{win:"Alt-B|Alt-W",mac:"Ctrl-Alt-B|Ctrl-Alt-W"},exec:function(e){e.wholeWordOption.checked=!e.wholeWordOption.checked,e.$syncOptions()}},{name:"toggleReplace",exec:function(e){e.replaceOption.checked=!e.replaceOption.checked,e.$syncOptions()}},{name:"searchInSelection",exec:function(e){e.searchOption.checked=!e.searchRange,e.setSearchRange(e.searchOption.checked&&e.editor.getSelectionRange()),e.$syncOptions()}}]),this.setSearchRange=function(e){this.searchRange=e,e?this.searchRangeMarker=this.editor.session.addMarker(e,"ace_active-line"):this.searchRangeMarker&&(this.editor.session.removeMarker(this.searchRangeMarker),this.searchRangeMarker=null)},this.$syncOptions=function(e){r.setCssClass(this.replaceOption,"checked",this.searchRange),r.setCssClass(this.searchOption,"checked",this.searchOption.checked),this.replaceOption.textContent=this.replaceOption.checked?"-":"+",r.setCssClass(this.regExpOption,"checked",this.regExpOption.checked),r.setCssClass(this.wholeWordOption,"checked",this.wholeWordOption.checked),r.setCssClass(this.caseSensitiveOption,"checked",this.caseSensitiveOption.checked),this.replaceBox.style.display=this.replaceOption.checked?"":"none",this.find(!1,!1,e)},this.highlight=function(e){this.editor.session.highlight(e||this.editor.$search.$options.re),this.editor.renderer.updateBackMarkers()},this.find=function(e,t,n){var i=this.editor.find(this.searchInput.value,{skipCurrent:e,backwards:t,wrap:!0,regExp:this.regExpOption.checked,caseSensitive:this.caseSensitiveOption.checked,wholeWord:this.wholeWordOption.checked,preventScroll:n,range:this.searchRange}),s=!i&&this.searchInput.value;r.setCssClass(this.searchBox,"ace_nomatch",s),this.editor._emit("findSearchBox",{match:!s}),this.highlight(),this.updateCounter()},this.updateCounter=function(){var e=this.editor,t=e.$search.$options.re,n=0,r=0;if(t){var i=this.searchRange?e.session.getTextRange(this.searchRange):e.getValue(),s=e.session.doc.positionToIndex(e.selection.anchor);this.searchRange&&(s-=e.session.doc.positionToIndex(this.searchRange.start));var o=t.lastIndex=0,u;while(u=t.exec(i)){n++,o=u.index,o<=s&&r++;if(n>f)break;if(!u[0]){t.lastIndex=o+=1;if(o>=i.length)break}}}this.searchCounter.textContent=r+" of "+(n>f?f+"+":n)},this.findNext=function(){this.find(!0,!1)},this.findPrev=function(){this.find(!0,!0)},this.findAll=function(){var e=this.editor.findAll(this.searchInput.value,{regExp:this.regExpOption.checked,caseSensitive:this.caseSensitiveOption.checked,wholeWord:this.wholeWordOption.checked}),t=!e&&this.searchInput.value;r.setCssClass(this.searchBox,"ace_nomatch",t),this.editor._emit("findSearchBox",{match:!t}),this.highlight(),this.hide()},this.replace=function(){this.editor.getReadOnly()||this.editor.replace(this.replaceInput.value)},this.replaceAndFindNext=function(){this.editor.getReadOnly()||(this.editor.replace(this.replaceInput.value),this.findNext())},this.replaceAll=function(){this.editor.getReadOnly()||this.editor.replaceAll(this.replaceInput.value)},this.hide=function(){this.active=!1,this.setSearchRange(null),this.editor.off("changeSession",this.setSession),this.element.style.display="none",this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb),this.editor.focus()},this.show=function(e,t){this.active=!0,this.editor.on("changeSession",this.setSession),this.element.style.display="",this.replaceOption.checked=t,e&&(this.searchInput.value=e),this.searchInput.focus(),this.searchInput.select(),this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb),this.$syncOptions(!0)},this.isFocused=function(){var e=document.activeElement;return e==this.searchInput||e==this.replaceInput}}).call(c.prototype),t.SearchBox=c,t.Search=function(e,t){var n=e.searchBox||new c(e);n.show(e.session.getTextRange(),t)}});
+(function() {
+    ace.require(["ace/ext/searchbox"], function() {});
+})();
diff --git a/datamodels/2.x/itop-config/js/theme-eclipse.js b/datamodels/2.x/itop-config/js/theme-eclipse.js
index 8ec770e0e..da904f8f5 100644
--- a/datamodels/2.x/itop-config/js/theme-eclipse.js
+++ b/datamodels/2.x/itop-config/js/theme-eclipse.js
@@ -1 +1 @@
-ace.define("ace/theme/eclipse",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";t.isDark=!1,t.cssText='.ace-eclipse .ace_gutter {background: #ebebeb;border-right: 1px solid rgb(159, 159, 159);color: rgb(136, 136, 136);}.ace-eclipse .ace_print-margin {width: 1px;background: #ebebeb;}.ace-eclipse {background-color: #FFFFFF;color: black;}.ace-eclipse .ace_fold {background-color: rgb(60, 76, 114);}.ace-eclipse .ace_cursor {color: black;}.ace-eclipse .ace_storage,.ace-eclipse .ace_keyword,.ace-eclipse .ace_variable {color: rgb(127, 0, 85);}.ace-eclipse .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-eclipse .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-eclipse .ace_function {color: rgb(60, 76, 114);}.ace-eclipse .ace_string {color: rgb(42, 0, 255);}.ace-eclipse .ace_comment {color: rgb(113, 150, 130);}.ace-eclipse .ace_comment.ace_doc {color: rgb(63, 95, 191);}.ace-eclipse .ace_comment.ace_doc.ace_tag {color: rgb(127, 159, 191);}.ace-eclipse .ace_constant.ace_numeric {color: darkblue;}.ace-eclipse .ace_tag {color: rgb(25, 118, 116);}.ace-eclipse .ace_type {color: rgb(127, 0, 127);}.ace-eclipse .ace_xml-pe {color: rgb(104, 104, 91);}.ace-eclipse .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-eclipse .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-eclipse .ace_meta.ace_tag {color:rgb(25, 118, 116);}.ace-eclipse .ace_invisible {color: #ddd;}.ace-eclipse .ace_entity.ace_other.ace_attribute-name {color:rgb(127, 0, 127);}.ace-eclipse .ace_marker-layer .ace_step {background: rgb(255, 255, 0);}.ace-eclipse .ace_active-line {background: rgb(232, 242, 254);}.ace-eclipse .ace_gutter-active-line {background-color : #DADADA;}.ace-eclipse .ace_marker-layer .ace_selected-word {border: 1px solid rgb(181, 213, 255);}.ace-eclipse .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}',t.cssClass="ace-eclipse";var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)})
+ace.define("ace/theme/eclipse",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";t.isDark=!1,t.cssText='.ace-eclipse .ace_gutter {background: #ebebeb;border-right: 1px solid rgb(159, 159, 159);color: rgb(136, 136, 136);}.ace-eclipse .ace_print-margin {width: 1px;background: #ebebeb;}.ace-eclipse {background-color: #FFFFFF;color: black;}.ace-eclipse .ace_fold {background-color: rgb(60, 76, 114);}.ace-eclipse .ace_cursor {color: black;}.ace-eclipse .ace_storage,.ace-eclipse .ace_keyword,.ace-eclipse .ace_variable {color: rgb(127, 0, 85);}.ace-eclipse .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-eclipse .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-eclipse .ace_function {color: rgb(60, 76, 114);}.ace-eclipse .ace_string {color: rgb(42, 0, 255);}.ace-eclipse .ace_comment {color: rgb(113, 150, 130);}.ace-eclipse .ace_comment.ace_doc {color: rgb(63, 95, 191);}.ace-eclipse .ace_comment.ace_doc.ace_tag {color: rgb(127, 159, 191);}.ace-eclipse .ace_constant.ace_numeric {color: darkblue;}.ace-eclipse .ace_tag {color: rgb(25, 118, 116);}.ace-eclipse .ace_type {color: rgb(127, 0, 127);}.ace-eclipse .ace_xml-pe {color: rgb(104, 104, 91);}.ace-eclipse .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-eclipse .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-eclipse .ace_meta.ace_tag {color:rgb(25, 118, 116);}.ace-eclipse .ace_invisible {color: #ddd;}.ace-eclipse .ace_entity.ace_other.ace_attribute-name {color:rgb(127, 0, 127);}.ace-eclipse .ace_marker-layer .ace_step {background: rgb(255, 255, 0);}.ace-eclipse .ace_active-line {background: rgb(232, 242, 254);}.ace-eclipse .ace_gutter-active-line {background-color : #DADADA;}.ace-eclipse .ace_marker-layer .ace_selected-word {border: 1px solid rgb(181, 213, 255);}.ace-eclipse .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}',t.cssClass="ace-eclipse";var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)})
diff --git a/datamodels/2.x/itop-config/license.itop-config.xml b/datamodels/2.x/itop-config/license.itop-config.xml
index a40b69542..4b83a15f4 100644
--- a/datamodels/2.x/itop-config/license.itop-config.xml
+++ b/datamodels/2.x/itop-config/license.itop-config.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<licenses>
-    <license>
-        <product>ajaxorg/ace</product>
-        <author>Ajax.org B.V.</author>
-        <license_type>BSD 3-clause "New" or "Revised"</license_type>
-        <text><![CDATA[
-        Copyright (c) 2010, Ajax.org B.V.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Ajax.org B.V. nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-]]></text>
-    </license>
+<?xml version="1.0" encoding="UTF-8"?>
+<licenses>
+    <license>
+        <product>ajaxorg/ace</product>
+        <author>Ajax.org B.V.</author>
+        <license_type>BSD 3-clause "New" or "Revised"</license_type>
+        <text><![CDATA[
+        Copyright (c) 2010, Ajax.org B.V.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Ajax.org B.V. nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+]]></text>
+    </license>
 </licenses>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-config/module.itop-config.php b/datamodels/2.x/itop-config/module.itop-config.php
index 8c249724c..6188caa63 100644
--- a/datamodels/2.x/itop-config/module.itop-config.php
+++ b/datamodels/2.x/itop-config/module.itop-config.php
@@ -1,41 +1,41 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-    'itop-config/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Configuration editor',
-		'category' => 'Application management',
-
-		// Setup
-		//
-		'dependencies' => array(),
-		'mandatory' => true,
-		'visible' => false,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-config.php',
-		),
-		'webservice' => array(),
-		'dictionary' => array(
-			'en.dict.itop-config.php',
-			'fr.dict.itop-config.php',
-		),
-		'data.struct' => array(),
-		'data.sample' => array(),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+    'itop-config/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Configuration editor',
+		'category' => 'Application management',
+
+		// Setup
+		//
+		'dependencies' => array(),
+		'mandatory' => true,
+		'visible' => false,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-config.php',
+		),
+		'webservice' => array(),
+		'dictionary' => array(
+			'en.dict.itop-config.php',
+			'fr.dict.itop-config.php',
+		),
+		'data.struct' => array(),
+		'data.sample' => array(),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(),
+	)
+);
diff --git a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
index e11a59c57..73c9d071b 100644
--- a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
+++ b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
-	<classes>
-		<class id="Ticket">
-			<methods>
-				<method id="CreateFromServiceSubcategory" _delta="define">
-					<comment>/**
-						* Instanciate an object of the relevant class, depending on the request type
-						* @return DBObject
-						*/</comment>
-					<static>true</static>
-					<access>public</access>
-					<type>Factory</type>
-					<code><![CDATA[	static public function CreateFromServiceSubcategory($oServiceSubcategory)
-	{
-        $sType = $oServiceSubcategory->Get('request_type');
-        if ($sType == 'incident')
-        {
-            if (!class_exists('Incident'))
-            {
-                throw new Exception('Could not create a ticket after the service '.$oServiceSubcategory->Get('friendlyname').' of type '.$sType.': unknown class "Incident"');
-            }
-            $oRet = new Incident();
-        }
-        else
-        {
-            if (!class_exists('UserRequest'))
-            {
-                throw new Exception('Could not create a ticket after the service '.$oServiceSubcategory->Get('friendlyname').' of type '.$sType.': unknown class "UserRequest"');
-            }
-            $oRet = new UserRequest();
-        }
-        return $oRet;
-	}]]></code>
-				</method>
-			</methods>
-		</class>
-	</classes>
-	<module_designs>
-		<module_design id="itop-portal">
-			<bricks>
-				<brick id="services">
-					<levels>
-						<level id="1">
-							<levels>
-								<level id="1">
-									<levels>
-										<level id="1">
-											<actions>
-												<action id="create_from_this">
-													<class _delta="delete" />
-													<factory_method _delta="define"><![CDATA[\Ticket::CreateFromServiceSubcategory]]></factory_method>
-												</action>
-											</actions>
-										</level>
-									</levels>
-								</level>
-							</levels>
-						</level>
-					</levels>
-				</brick>
-			</bricks>
-			<classes>
-				<class id="ServiceSubcategory">
-					<scopes>
-						<scope id="all">
-							<oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete']]></oql_view>
-						</scope>
-					</scopes>
-				</class>
-			</classes>
-		</module_design>
-	</module_designs>
-</itop_design>
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
+	<classes>
+		<class id="Ticket">
+			<methods>
+				<method id="CreateFromServiceSubcategory" _delta="define">
+					<comment>/**
+						* Instanciate an object of the relevant class, depending on the request type
+						* @return DBObject
+						*/</comment>
+					<static>true</static>
+					<access>public</access>
+					<type>Factory</type>
+					<code><![CDATA[	static public function CreateFromServiceSubcategory($oServiceSubcategory)
+	{
+        $sType = $oServiceSubcategory->Get('request_type');
+        if ($sType == 'incident')
+        {
+            if (!class_exists('Incident'))
+            {
+                throw new Exception('Could not create a ticket after the service '.$oServiceSubcategory->Get('friendlyname').' of type '.$sType.': unknown class "Incident"');
+            }
+            $oRet = new Incident();
+        }
+        else
+        {
+            if (!class_exists('UserRequest'))
+            {
+                throw new Exception('Could not create a ticket after the service '.$oServiceSubcategory->Get('friendlyname').' of type '.$sType.': unknown class "UserRequest"');
+            }
+            $oRet = new UserRequest();
+        }
+        return $oRet;
+	}]]></code>
+				</method>
+			</methods>
+		</class>
+	</classes>
+	<module_designs>
+		<module_design id="itop-portal">
+			<bricks>
+				<brick id="services">
+					<levels>
+						<level id="1">
+							<levels>
+								<level id="1">
+									<levels>
+										<level id="1">
+											<actions>
+												<action id="create_from_this">
+													<class _delta="delete" />
+													<factory_method _delta="define"><![CDATA[\Ticket::CreateFromServiceSubcategory]]></factory_method>
+												</action>
+											</actions>
+										</level>
+									</levels>
+								</level>
+							</levels>
+						</level>
+					</levels>
+				</brick>
+			</bricks>
+			<classes>
+				<class id="ServiceSubcategory">
+					<scopes>
+						<scope id="all">
+							<oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete']]></oql_view>
+						</scope>
+					</scopes>
+				</class>
+			</classes>
+		</module_design>
+	</module_designs>
+</itop_design>
diff --git a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
index d8ae346cd..c6416d15e 100644
--- a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
+++ b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
@@ -1,47 +1,47 @@
-<?php
-
-//
-// iTop module definition file
-//
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/2.5.0', array(
-	// Identification
-	//
-		'label' => 'Bridge - Request management ITIL + Incident management ITIL',
-	'category' => 'business',
-	// Setup
-	//
-		'dependencies' => array(
-		'itop-request-mgmt-itil/2.3.0',
-		'itop-incident-mgmt-itil/2.3.0',
-	),
-	'mandatory' => false,
-	'visible' => false,
-	'auto_select' => 'SetupInfo::ModuleIsSelected("itop-request-mgmt-itil") && SetupInfo::ModuleIsSelected("itop-incident-mgmt-itil")',
-	// Components
-	//
-		'datamodel' => array(
-	//'model.itop-portal-full-itil.php'
-	),
-	'webservice' => array(
-	),
-	'data.struct' => array(
-	// add your 'structure' definition XML files here,
-	),
-	'data.sample' => array(
-	// add your sample data XML files here,
-	),
-	// Documentation
-	//
-		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
-	'doc.more_information' => '', // hyperlink to more information, if any
-	// Default settings
-	//
-		'settings' => array(
-	// Module specific settings go here, if any
-	),
-	)
-);
-?>
+<?php
+
+//
+// iTop module definition file
+//
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-full-itil/2.5.0', array(
+	// Identification
+	//
+		'label' => 'Bridge - Request management ITIL + Incident management ITIL',
+	'category' => 'business',
+	// Setup
+	//
+		'dependencies' => array(
+		'itop-request-mgmt-itil/2.3.0',
+		'itop-incident-mgmt-itil/2.3.0',
+	),
+	'mandatory' => false,
+	'visible' => false,
+	'auto_select' => 'SetupInfo::ModuleIsSelected("itop-request-mgmt-itil") && SetupInfo::ModuleIsSelected("itop-incident-mgmt-itil")',
+	// Components
+	//
+		'datamodel' => array(
+	//'model.itop-portal-full-itil.php'
+	),
+	'webservice' => array(
+	),
+	'data.struct' => array(
+	// add your 'structure' definition XML files here,
+	),
+	'data.sample' => array(
+	// add your sample data XML files here,
+	),
+	// Documentation
+	//
+		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
+	'doc.more_information' => '', // hyperlink to more information, if any
+	// Default settings
+	//
+		'settings' => array(
+	// Module specific settings go here, if any
+	),
+	)
+);
+?>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
index c340debbe..2cd323222 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/en.dict.itop-incident-mgmt-itil.php
@@ -1,240 +1,240 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Menu:IncidentManagement' => 'Incident Management',
-	'Menu:IncidentManagement+' => 'Incident Management',
-	'Menu:Incident:Overview' => 'Overview',
-	'Menu:Incident:Overview+' => 'Overview',
-	'Menu:NewIncident' => 'New incident',
-	'Menu:NewIncident+' => 'Create a new incident ticket',
-	'Menu:SearchIncidents' => 'Search for incidents',
-	'Menu:SearchIncidents+' => 'Search for incident tickets',
-	'Menu:Incident:Shortcuts' => 'Shortcuts',
-	'Menu:Incident:Shortcuts+' => '',
-	'Menu:Incident:MyIncidents' => 'Incidents assigned to me',
-	'Menu:Incident:MyIncidents+' => 'Incidents assigned to me (as Agent)',
-	'Menu:Incident:EscalatedIncidents' => 'Escalated incidents',
-	'Menu:Incident:EscalatedIncidents+' => 'Escalated incidents',
-	'Menu:Incident:OpenIncidents' => 'All open incidents',
-	'Menu:Incident:OpenIncidents+' => 'All open incidents',
-	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Last 14 days incident per priority',
-	'UI-IncidentManagementOverview-Last-14-days' => 'Last 14 days number of incidents',
-	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Open incidents by status',
-	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Open incidents by agent',
-	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Open incidents by customer',
-));
-
-
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: Incident
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Incident' => 'Incident',
-	'Class:Incident+' => '',
-	'Class:Incident/Attribute:status' => 'Status',
-	'Class:Incident/Attribute:status+' => '',
-	'Class:Incident/Attribute:status/Value:new' => 'New',
-	'Class:Incident/Attribute:status/Value:new+' => '',
-	'Class:Incident/Attribute:status/Value:escalated_tto' => 'Escalated TTO',
-	'Class:Incident/Attribute:status/Value:escalated_tto+' => '',
-	'Class:Incident/Attribute:status/Value:assigned' => 'Assigned',
-	'Class:Incident/Attribute:status/Value:assigned+' => '',
-	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'Escalated TTR',
-	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:Incident/Attribute:status/Value:waiting_for_approval' => 'Waiting for approval',
-	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:Incident/Attribute:status/Value:pending' => 'Pending',
-	'Class:Incident/Attribute:status/Value:pending+' => '',
-	'Class:Incident/Attribute:status/Value:resolved' => 'Resolved',
-	'Class:Incident/Attribute:status/Value:resolved+' => '',
-	'Class:Incident/Attribute:status/Value:closed' => 'Closed',
-	'Class:Incident/Attribute:status/Value:closed+' => '',
-	'Class:Incident/Attribute:impact' => 'Impact',
-	'Class:Incident/Attribute:impact+' => '',
-	'Class:Incident/Attribute:impact/Value:1' => 'A department',
-	'Class:Incident/Attribute:impact/Value:1+' => '',
-	'Class:Incident/Attribute:impact/Value:2' => 'A service',
-	'Class:Incident/Attribute:impact/Value:2+' => '',
-	'Class:Incident/Attribute:impact/Value:3' => 'A person',
-	'Class:Incident/Attribute:impact/Value:3+' => '',
-	'Class:Incident/Attribute:priority' => 'Priority',
-	'Class:Incident/Attribute:priority+' => '',
-	'Class:Incident/Attribute:priority/Value:1' => 'critical',
-	'Class:Incident/Attribute:priority/Value:1+' => 'critical',
-	'Class:Incident/Attribute:priority/Value:2' => 'high',
-	'Class:Incident/Attribute:priority/Value:2+' => 'high',
-	'Class:Incident/Attribute:priority/Value:3' => 'medium',
-	'Class:Incident/Attribute:priority/Value:3+' => 'medium',
-	'Class:Incident/Attribute:priority/Value:4' => 'low',
-	'Class:Incident/Attribute:priority/Value:4+' => 'low',
-	'Class:Incident/Attribute:urgency' => 'Urgency',
-	'Class:Incident/Attribute:urgency+' => '',
-	'Class:Incident/Attribute:urgency/Value:1' => 'critical',
-	'Class:Incident/Attribute:urgency/Value:1+' => 'critical',
-	'Class:Incident/Attribute:urgency/Value:2' => 'high',
-	'Class:Incident/Attribute:urgency/Value:2+' => 'high',
-	'Class:Incident/Attribute:urgency/Value:3' => 'medium',
-	'Class:Incident/Attribute:urgency/Value:3+' => 'medium',
-	'Class:Incident/Attribute:urgency/Value:4' => 'low',
-	'Class:Incident/Attribute:urgency/Value:4+' => 'low',
-	'Class:Incident/Attribute:origin' => 'Origin',
-	'Class:Incident/Attribute:origin+' => '',
-	'Class:Incident/Attribute:origin/Value:mail' => 'email',
-	'Class:Incident/Attribute:origin/Value:mail+' => 'email',
-	'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring',
-	'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring',
-	'Class:Incident/Attribute:origin/Value:phone' => 'phone',
-	'Class:Incident/Attribute:origin/Value:phone+' => 'phone',
-	'Class:Incident/Attribute:origin/Value:portal' => 'portal',
-	'Class:Incident/Attribute:origin/Value:portal+' => 'portal',
-	'Class:Incident/Attribute:service_id' => 'Service',
-	'Class:Incident/Attribute:service_id+' => '',
-	'Class:Incident/Attribute:service_name' => 'Service name',
-	'Class:Incident/Attribute:service_name+' => '',
-	'Class:Incident/Attribute:servicesubcategory_id' => 'Service subcategory',
-	'Class:Incident/Attribute:servicesubcategory_id+' => '',
-	'Class:Incident/Attribute:servicesubcategory_name' => 'Service subcategory name',
-	'Class:Incident/Attribute:servicesubcategory_name+' => '',
-	'Class:Incident/Attribute:escalation_flag' => 'Hot Flag',
-	'Class:Incident/Attribute:escalation_flag+' => '',
-	'Class:Incident/Attribute:escalation_flag/Value:no' => 'No',
-	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No',
-	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Yes',
-	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes',
-	'Class:Incident/Attribute:escalation_reason' => 'Hot reason',
-	'Class:Incident/Attribute:escalation_reason+' => '',
-	'Class:Incident/Attribute:assignment_date' => 'Assignment date',
-	'Class:Incident/Attribute:assignment_date+' => '',
-	'Class:Incident/Attribute:resolution_date' => 'Resolution date',
-	'Class:Incident/Attribute:resolution_date+' => '',
-	'Class:Incident/Attribute:last_pending_date' => 'Last pending date',
-	'Class:Incident/Attribute:last_pending_date+' => '',
-	'Class:Incident/Attribute:cumulatedpending' => 'Cumulated pending',
-	'Class:Incident/Attribute:cumulatedpending+' => '',
-	'Class:Incident/Attribute:tto' => 'tto',
-	'Class:Incident/Attribute:tto+' => '',
-	'Class:Incident/Attribute:ttr' => 'ttr',
-	'Class:Incident/Attribute:ttr+' => '',
-	'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO Deadline',
-	'Class:Incident/Attribute:tto_escalation_deadline+' => '',
-	'Class:Incident/Attribute:sla_tto_passed' => 'SLA tto passed',
-	'Class:Incident/Attribute:sla_tto_passed+' => '',
-	'Class:Incident/Attribute:sla_tto_over' => 'SLA tto over',
-	'Class:Incident/Attribute:sla_tto_over+' => '',
-	'Class:Incident/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
-	'Class:Incident/Attribute:ttr_escalation_deadline+' => '',
-	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA ttr passed',
-	'Class:Incident/Attribute:sla_ttr_passed+' => '',
-	'Class:Incident/Attribute:sla_ttr_over' => 'SLA ttr over',
-	'Class:Incident/Attribute:sla_ttr_over+' => '',
-	'Class:Incident/Attribute:time_spent' => 'Resolution delay',
-	'Class:Incident/Attribute:time_spent+' => '',
-	'Class:Incident/Attribute:resolution_code' => 'Resolution code',
-	'Class:Incident/Attribute:resolution_code+' => '',
-	'Class:Incident/Attribute:resolution_code/Value:assistance' => 'assistance',
-	'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'assistance',
-	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'bug fixed',
-	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
-	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'hardware repair',
-	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
-	'Class:Incident/Attribute:resolution_code/Value:other' => 'other',
-	'Class:Incident/Attribute:resolution_code/Value:other+' => 'other',
-	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'software patch',
-	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'software patch',
-	'Class:Incident/Attribute:resolution_code/Value:system update' => 'system update',
-	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'system update',
-	'Class:Incident/Attribute:resolution_code/Value:training' => 'training',
-	'Class:Incident/Attribute:resolution_code/Value:training+' => 'training',
-	'Class:Incident/Attribute:solution' => 'Solution',
-	'Class:Incident/Attribute:solution+' => '',
-	'Class:Incident/Attribute:pending_reason' => 'Pending reason',
-	'Class:Incident/Attribute:pending_reason+' => '',
-	'Class:Incident/Attribute:parent_incident_id' => 'Parent incident',
-	'Class:Incident/Attribute:parent_incident_id+' => '',
-	'Class:Incident/Attribute:parent_incident_ref' => 'Parent incident ref',
-	'Class:Incident/Attribute:parent_incident_ref+' => '',
-	'Class:Incident/Attribute:parent_change_id' => 'Parent change',
-	'Class:Incident/Attribute:parent_change_id+' => '',
-	'Class:Incident/Attribute:parent_change_ref' => 'Parent change ref',
-	'Class:Incident/Attribute:parent_change_ref+' => '',
-	'Class:Incident/Attribute:related_request_list' => 'Child requests',
-	'Class:Incident/Attribute:related_request_list+' => '',
-	'Class:Incident/Attribute:child_incidents_list' => 'Child incidents',
-	'Class:Incident/Attribute:child_incidents_list+' => 'All the child incidents related to this incident',
-	'Class:Incident/Attribute:public_log' => 'Public log',
-	'Class:Incident/Attribute:public_log+' => '',
-	'Class:Incident/Attribute:user_satisfaction' => 'User satisfaction',
-	'Class:Incident/Attribute:user_satisfaction+' => '',
-	'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Very satisfied',
-	'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Very satisfied',
-	'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied',
-	'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied',
-	'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified',
-	'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified',
-	'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied',
-	'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied',
-	'Class:Incident/Attribute:user_comment' => 'User comment',
-	'Class:Incident/Attribute:user_comment+' => '',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
-	'Class:Incident/Stimulus:ev_assign' => 'Assign',
-	'Class:Incident/Stimulus:ev_assign+' => '',
-	'Class:Incident/Stimulus:ev_reassign' => 'Re-assign',
-	'Class:Incident/Stimulus:ev_reassign+' => '',
-	'Class:Incident/Stimulus:ev_pending' => 'Pending',
-	'Class:Incident/Stimulus:ev_pending+' => '',
-	'Class:Incident/Stimulus:ev_timeout' => 'Timeout',
-	'Class:Incident/Stimulus:ev_timeout+' => '',
-	'Class:Incident/Stimulus:ev_autoresolve' => 'Automatic resolve',
-	'Class:Incident/Stimulus:ev_autoresolve+' => '',
-	'Class:Incident/Stimulus:ev_autoclose' => 'Automatic close',
-	'Class:Incident/Stimulus:ev_autoclose+' => '',
-	'Class:Incident/Stimulus:ev_resolve' => 'Mark as resolved',
-	'Class:Incident/Stimulus:ev_resolve+' => '',
-	'Class:Incident/Stimulus:ev_close' => 'Close this request',
-	'Class:Incident/Stimulus:ev_close+' => '',
-	'Class:Incident/Stimulus:ev_reopen' => 'Re-open',
-	'Class:Incident/Stimulus:ev_reopen+' => '',
-	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself',
-
-	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
-	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info',
-	'Tickets:Related:OpenIncidents' => 'Open incidents',
-));
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:IncidentManagement' => 'Incident Management',
+	'Menu:IncidentManagement+' => 'Incident Management',
+	'Menu:Incident:Overview' => 'Overview',
+	'Menu:Incident:Overview+' => 'Overview',
+	'Menu:NewIncident' => 'New incident',
+	'Menu:NewIncident+' => 'Create a new incident ticket',
+	'Menu:SearchIncidents' => 'Search for incidents',
+	'Menu:SearchIncidents+' => 'Search for incident tickets',
+	'Menu:Incident:Shortcuts' => 'Shortcuts',
+	'Menu:Incident:Shortcuts+' => '',
+	'Menu:Incident:MyIncidents' => 'Incidents assigned to me',
+	'Menu:Incident:MyIncidents+' => 'Incidents assigned to me (as Agent)',
+	'Menu:Incident:EscalatedIncidents' => 'Escalated incidents',
+	'Menu:Incident:EscalatedIncidents+' => 'Escalated incidents',
+	'Menu:Incident:OpenIncidents' => 'All open incidents',
+	'Menu:Incident:OpenIncidents+' => 'All open incidents',
+	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Last 14 days incident per priority',
+	'UI-IncidentManagementOverview-Last-14-days' => 'Last 14 days number of incidents',
+	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Open incidents by status',
+	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Open incidents by agent',
+	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Open incidents by customer',
+));
+
+
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: Incident
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Incident' => 'Incident',
+	'Class:Incident+' => '',
+	'Class:Incident/Attribute:status' => 'Status',
+	'Class:Incident/Attribute:status+' => '',
+	'Class:Incident/Attribute:status/Value:new' => 'New',
+	'Class:Incident/Attribute:status/Value:new+' => '',
+	'Class:Incident/Attribute:status/Value:escalated_tto' => 'Escalated TTO',
+	'Class:Incident/Attribute:status/Value:escalated_tto+' => '',
+	'Class:Incident/Attribute:status/Value:assigned' => 'Assigned',
+	'Class:Incident/Attribute:status/Value:assigned+' => '',
+	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'Escalated TTR',
+	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval' => 'Waiting for approval',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:Incident/Attribute:status/Value:pending' => 'Pending',
+	'Class:Incident/Attribute:status/Value:pending+' => '',
+	'Class:Incident/Attribute:status/Value:resolved' => 'Resolved',
+	'Class:Incident/Attribute:status/Value:resolved+' => '',
+	'Class:Incident/Attribute:status/Value:closed' => 'Closed',
+	'Class:Incident/Attribute:status/Value:closed+' => '',
+	'Class:Incident/Attribute:impact' => 'Impact',
+	'Class:Incident/Attribute:impact+' => '',
+	'Class:Incident/Attribute:impact/Value:1' => 'A department',
+	'Class:Incident/Attribute:impact/Value:1+' => '',
+	'Class:Incident/Attribute:impact/Value:2' => 'A service',
+	'Class:Incident/Attribute:impact/Value:2+' => '',
+	'Class:Incident/Attribute:impact/Value:3' => 'A person',
+	'Class:Incident/Attribute:impact/Value:3+' => '',
+	'Class:Incident/Attribute:priority' => 'Priority',
+	'Class:Incident/Attribute:priority+' => '',
+	'Class:Incident/Attribute:priority/Value:1' => 'critical',
+	'Class:Incident/Attribute:priority/Value:1+' => 'critical',
+	'Class:Incident/Attribute:priority/Value:2' => 'high',
+	'Class:Incident/Attribute:priority/Value:2+' => 'high',
+	'Class:Incident/Attribute:priority/Value:3' => 'medium',
+	'Class:Incident/Attribute:priority/Value:3+' => 'medium',
+	'Class:Incident/Attribute:priority/Value:4' => 'low',
+	'Class:Incident/Attribute:priority/Value:4+' => 'low',
+	'Class:Incident/Attribute:urgency' => 'Urgency',
+	'Class:Incident/Attribute:urgency+' => '',
+	'Class:Incident/Attribute:urgency/Value:1' => 'critical',
+	'Class:Incident/Attribute:urgency/Value:1+' => 'critical',
+	'Class:Incident/Attribute:urgency/Value:2' => 'high',
+	'Class:Incident/Attribute:urgency/Value:2+' => 'high',
+	'Class:Incident/Attribute:urgency/Value:3' => 'medium',
+	'Class:Incident/Attribute:urgency/Value:3+' => 'medium',
+	'Class:Incident/Attribute:urgency/Value:4' => 'low',
+	'Class:Incident/Attribute:urgency/Value:4+' => 'low',
+	'Class:Incident/Attribute:origin' => 'Origin',
+	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:mail' => 'email',
+	'Class:Incident/Attribute:origin/Value:mail+' => 'email',
+	'Class:Incident/Attribute:origin/Value:monitoring' => 'monitoring',
+	'Class:Incident/Attribute:origin/Value:monitoring+' => 'monitoring',
+	'Class:Incident/Attribute:origin/Value:phone' => 'phone',
+	'Class:Incident/Attribute:origin/Value:phone+' => 'phone',
+	'Class:Incident/Attribute:origin/Value:portal' => 'portal',
+	'Class:Incident/Attribute:origin/Value:portal+' => 'portal',
+	'Class:Incident/Attribute:service_id' => 'Service',
+	'Class:Incident/Attribute:service_id+' => '',
+	'Class:Incident/Attribute:service_name' => 'Service name',
+	'Class:Incident/Attribute:service_name+' => '',
+	'Class:Incident/Attribute:servicesubcategory_id' => 'Service subcategory',
+	'Class:Incident/Attribute:servicesubcategory_id+' => '',
+	'Class:Incident/Attribute:servicesubcategory_name' => 'Service subcategory name',
+	'Class:Incident/Attribute:servicesubcategory_name+' => '',
+	'Class:Incident/Attribute:escalation_flag' => 'Hot Flag',
+	'Class:Incident/Attribute:escalation_flag+' => '',
+	'Class:Incident/Attribute:escalation_flag/Value:no' => 'No',
+	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'No',
+	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Yes',
+	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Yes',
+	'Class:Incident/Attribute:escalation_reason' => 'Hot reason',
+	'Class:Incident/Attribute:escalation_reason+' => '',
+	'Class:Incident/Attribute:assignment_date' => 'Assignment date',
+	'Class:Incident/Attribute:assignment_date+' => '',
+	'Class:Incident/Attribute:resolution_date' => 'Resolution date',
+	'Class:Incident/Attribute:resolution_date+' => '',
+	'Class:Incident/Attribute:last_pending_date' => 'Last pending date',
+	'Class:Incident/Attribute:last_pending_date+' => '',
+	'Class:Incident/Attribute:cumulatedpending' => 'Cumulated pending',
+	'Class:Incident/Attribute:cumulatedpending+' => '',
+	'Class:Incident/Attribute:tto' => 'tto',
+	'Class:Incident/Attribute:tto+' => '',
+	'Class:Incident/Attribute:ttr' => 'ttr',
+	'Class:Incident/Attribute:ttr+' => '',
+	'Class:Incident/Attribute:tto_escalation_deadline' => 'TTO Deadline',
+	'Class:Incident/Attribute:tto_escalation_deadline+' => '',
+	'Class:Incident/Attribute:sla_tto_passed' => 'SLA tto passed',
+	'Class:Incident/Attribute:sla_tto_passed+' => '',
+	'Class:Incident/Attribute:sla_tto_over' => 'SLA tto over',
+	'Class:Incident/Attribute:sla_tto_over+' => '',
+	'Class:Incident/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
+	'Class:Incident/Attribute:ttr_escalation_deadline+' => '',
+	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA ttr passed',
+	'Class:Incident/Attribute:sla_ttr_passed+' => '',
+	'Class:Incident/Attribute:sla_ttr_over' => 'SLA ttr over',
+	'Class:Incident/Attribute:sla_ttr_over+' => '',
+	'Class:Incident/Attribute:time_spent' => 'Resolution delay',
+	'Class:Incident/Attribute:time_spent+' => '',
+	'Class:Incident/Attribute:resolution_code' => 'Resolution code',
+	'Class:Incident/Attribute:resolution_code+' => '',
+	'Class:Incident/Attribute:resolution_code/Value:assistance' => 'assistance',
+	'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'assistance',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'bug fixed',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'hardware repair',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
+	'Class:Incident/Attribute:resolution_code/Value:other' => 'other',
+	'Class:Incident/Attribute:resolution_code/Value:other+' => 'other',
+	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'software patch',
+	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'software patch',
+	'Class:Incident/Attribute:resolution_code/Value:system update' => 'system update',
+	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'system update',
+	'Class:Incident/Attribute:resolution_code/Value:training' => 'training',
+	'Class:Incident/Attribute:resolution_code/Value:training+' => 'training',
+	'Class:Incident/Attribute:solution' => 'Solution',
+	'Class:Incident/Attribute:solution+' => '',
+	'Class:Incident/Attribute:pending_reason' => 'Pending reason',
+	'Class:Incident/Attribute:pending_reason+' => '',
+	'Class:Incident/Attribute:parent_incident_id' => 'Parent incident',
+	'Class:Incident/Attribute:parent_incident_id+' => '',
+	'Class:Incident/Attribute:parent_incident_ref' => 'Parent incident ref',
+	'Class:Incident/Attribute:parent_incident_ref+' => '',
+	'Class:Incident/Attribute:parent_change_id' => 'Parent change',
+	'Class:Incident/Attribute:parent_change_id+' => '',
+	'Class:Incident/Attribute:parent_change_ref' => 'Parent change ref',
+	'Class:Incident/Attribute:parent_change_ref+' => '',
+	'Class:Incident/Attribute:related_request_list' => 'Child requests',
+	'Class:Incident/Attribute:related_request_list+' => '',
+	'Class:Incident/Attribute:child_incidents_list' => 'Child incidents',
+	'Class:Incident/Attribute:child_incidents_list+' => 'All the child incidents related to this incident',
+	'Class:Incident/Attribute:public_log' => 'Public log',
+	'Class:Incident/Attribute:public_log+' => '',
+	'Class:Incident/Attribute:user_satisfaction' => 'User satisfaction',
+	'Class:Incident/Attribute:user_satisfaction+' => '',
+	'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Very satisfied',
+	'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Very satisfied',
+	'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied',
+	'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied',
+	'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified',
+	'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified',
+	'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied',
+	'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied',
+	'Class:Incident/Attribute:user_comment' => 'User comment',
+	'Class:Incident/Attribute:user_comment+' => '',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
+	'Class:Incident/Stimulus:ev_assign' => 'Assign',
+	'Class:Incident/Stimulus:ev_assign+' => '',
+	'Class:Incident/Stimulus:ev_reassign' => 'Re-assign',
+	'Class:Incident/Stimulus:ev_reassign+' => '',
+	'Class:Incident/Stimulus:ev_pending' => 'Pending',
+	'Class:Incident/Stimulus:ev_pending+' => '',
+	'Class:Incident/Stimulus:ev_timeout' => 'Timeout',
+	'Class:Incident/Stimulus:ev_timeout+' => '',
+	'Class:Incident/Stimulus:ev_autoresolve' => 'Automatic resolve',
+	'Class:Incident/Stimulus:ev_autoresolve+' => '',
+	'Class:Incident/Stimulus:ev_autoclose' => 'Automatic close',
+	'Class:Incident/Stimulus:ev_autoclose+' => '',
+	'Class:Incident/Stimulus:ev_resolve' => 'Mark as resolved',
+	'Class:Incident/Stimulus:ev_resolve+' => '',
+	'Class:Incident/Stimulus:ev_close' => 'Close this request',
+	'Class:Incident/Stimulus:ev_close+' => '',
+	'Class:Incident/Stimulus:ev_reopen' => 'Re-open',
+	'Class:Incident/Stimulus:ev_reopen+' => '',
+	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Cannot assign the Parent incident to the incident itself',
+
+	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info',
+	'Tickets:Related:OpenIncidents' => 'Open incidents',
+));
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
index 877ca5a76..6815a12fa 100755
--- a/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
@@ -1,47 +1,47 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-incident-mgmt-itil/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Incident Management ITIL',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
-			'itop-tickets/2.4.0',
-			'itop-profiles-itil/2.3.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-incident-mgmt-itil.php',
-		),
-		'data.struct' => array(
-
-		),
-		'data.sample' => array(
-			//'data.sample.itop-request-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-?>
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-incident-mgmt-itil/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Incident Management ITIL',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.4.0',
+			'itop-tickets/2.4.0',
+			'itop-profiles-itil/2.3.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-incident-mgmt-itil.php',
+		),
+		'data.struct' => array(
+
+		),
+		'data.sample' => array(
+			//'data.sample.itop-request-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+?>
diff --git a/datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php b/datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php
index e4ccc1e8c..5a1a92963 100644
--- a/datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/pt_br.dict.itop-incident-mgmt-itil.php
@@ -1,245 +1,245 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:IncidentManagement' => 'Gerenciamento Incidentes',
-	'Menu:IncidentManagement+' => 'Gerenciamento Incidentes',
-	'Menu:Incident:Overview' => 'Visão geral',
-	'Menu:Incident:Overview+' => 'Visão geral',
-	'Menu:NewIncident' => 'Novo incidente',
-	'Menu:NewIncident+' => 'Criar uma novo incidente',
-	'Menu:SearchIncidents' => 'Pesquisar por incidentes',
-	'Menu:SearchIncidents+' => 'Pesquisar por solicitações incidentes',
-	'Menu:Incident:Shortcuts' => 'Atalho',
-	'Menu:Incident:Shortcuts+' => '',
-	'Menu:Incident:MyIncidents' => 'Incidentes atribuídos para mim',
-	'Menu:Incident:MyIncidents+' => 'Incidentes atribuídos para mim (como agente)',
-	'Menu:Incident:EscalatedIncidents' => 'Incidentes escalados',
-	'Menu:Incident:EscalatedIncidents+' => 'Incidentes escalados',
-	'Menu:Incident:OpenIncidents' => 'Todos incidentes abertos',
-	'Menu:Incident:OpenIncidents+' => 'Todos incidentes abertos',
-	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Últimos 14 dias por incidente prioridade',
-	'UI-IncidentManagementOverview-Last-14-days' => 'Últimos 14 dias por incidente prioridade',
-	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Incidentes abertos por estado',
-	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Incidentes abertos por agentes',
-	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Incidentes abertos por cliente',
-));
-
-
-
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: Incident
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Incident' => 'Incidente',
-	'Class:Incident+' => '',
-	'Class:Incident/Attribute:status' => 'Estado',
-	'Class:Incident/Attribute:status+' => '',
-	'Class:Incident/Attribute:status/Value:new' => 'Novo',
-	'Class:Incident/Attribute:status/Value:new+' => '',
-	'Class:Incident/Attribute:status/Value:escalated_tto' => 'TTO escalado',
-	'Class:Incident/Attribute:status/Value:escalated_tto+' => '',
-	'Class:Incident/Attribute:status/Value:assigned' => 'Atribuído',
-	'Class:Incident/Attribute:status/Value:assigned+' => '',
-	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'TTR escalado',
-	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:Incident/Attribute:status/Value:waiting_for_approval' => 'Aguardando aprovação',
-	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:Incident/Attribute:status/Value:pending' => 'Pendente',
-	'Class:Incident/Attribute:status/Value:pending+' => '',
-	'Class:Incident/Attribute:status/Value:resolved' => 'Resolvido',
-	'Class:Incident/Attribute:status/Value:resolved+' => '',
-	'Class:Incident/Attribute:status/Value:closed' => 'Fechado',
-	'Class:Incident/Attribute:status/Value:closed+' => '',
-	'Class:Incident/Attribute:impact' => 'Impacto',
-	'Class:Incident/Attribute:impact+' => '',
-	'Class:Incident/Attribute:impact/Value:1' => 'Um departamento',
-	'Class:Incident/Attribute:impact/Value:1+' => '',
-	'Class:Incident/Attribute:impact/Value:2' => 'Um serviço',
-	'Class:Incident/Attribute:impact/Value:2+' => '',
-	'Class:Incident/Attribute:impact/Value:3' => 'Uma pessoa',
-	'Class:Incident/Attribute:impact/Value:3+' => '',
-	'Class:Incident/Attribute:priority' => 'Prioridade',
-	'Class:Incident/Attribute:priority+' => '',
-	'Class:Incident/Attribute:priority/Value:1' => 'Crítica',
-	'Class:Incident/Attribute:priority/Value:1+' => 'Crítica',
-	'Class:Incident/Attribute:priority/Value:2' => 'Alta',
-	'Class:Incident/Attribute:priority/Value:2+' => 'Alta',
-	'Class:Incident/Attribute:priority/Value:3' => 'Média',
-	'Class:Incident/Attribute:priority/Value:3+' => 'Média',
-	'Class:Incident/Attribute:priority/Value:4' => 'Baixa',
-	'Class:Incident/Attribute:priority/Value:4+' => 'Baixa',
-	'Class:Incident/Attribute:urgency' => 'Urgência',
-	'Class:Incident/Attribute:urgency+' => '',
-	'Class:Incident/Attribute:urgency/Value:1' => 'Crítica',
-	'Class:Incident/Attribute:urgency/Value:1+' => 'Crítica',
-	'Class:Incident/Attribute:urgency/Value:2' => 'Alta',
-	'Class:Incident/Attribute:urgency/Value:2+' => 'Alta',
-	'Class:Incident/Attribute:urgency/Value:3' => 'Média',
-	'Class:Incident/Attribute:urgency/Value:3+' => 'Média',
-	'Class:Incident/Attribute:urgency/Value:4' => 'Baixa',
-	'Class:Incident/Attribute:urgency/Value:4+' => 'Baixa',
-	'Class:Incident/Attribute:origin' => 'Origem',
-	'Class:Incident/Attribute:origin+' => '',
-	'Class:Incident/Attribute:origin/Value:mail' => 'Email',
-	'Class:Incident/Attribute:origin/Value:mail+' => 'Email',
-	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoramento',
-	'Class:Incident/Attribute:origin/Value:monitoring+' => 'Monitoramento',
-	'Class:Incident/Attribute:origin/Value:phone' => 'Telefone',
-	'Class:Incident/Attribute:origin/Value:phone+' => 'Telefone',
-	'Class:Incident/Attribute:origin/Value:portal' => 'Portal',
-	'Class:Incident/Attribute:origin/Value:portal+' => 'Portal',
-	'Class:Incident/Attribute:service_id' => 'Serviço',
-	'Class:Incident/Attribute:service_id+' => '',
-	'Class:Incident/Attribute:service_name' => 'Nome serviço',
-	'Class:Incident/Attribute:service_name+' => '',
-	'Class:Incident/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
-	'Class:Incident/Attribute:servicesubcategory_id+' => '',
-	'Class:Incident/Attribute:servicesubcategory_name' => 'Nome Sub-categoria serviço',
-	'Class:Incident/Attribute:servicesubcategory_name+' => '',
-	'Class:Incident/Attribute:escalation_flag' => 'Alerta vermelho',
-	'Class:Incident/Attribute:escalation_flag+' => '',
-	'Class:Incident/Attribute:escalation_flag/Value:no' => 'Não',
-	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'Não',
-	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Sim',
-	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Sim',
-	'Class:Incident/Attribute:escalation_reason' => 'Razão alerta',
-	'Class:Incident/Attribute:escalation_reason+' => '',
-	'Class:Incident/Attribute:assignment_date' => 'Data atribuição',
-	'Class:Incident/Attribute:assignment_date+' => '',
-	'Class:Incident/Attribute:resolution_date' => 'Data resolução',
-	'Class:Incident/Attribute:resolution_date+' => '',
-	'Class:Incident/Attribute:last_pending_date' => 'Última data pendente',
-	'Class:Incident/Attribute:last_pending_date+' => '',
-	'Class:Incident/Attribute:cumulatedpending' => 'Pendências acumuladas',
-	'Class:Incident/Attribute:cumulatedpending+' => '',
-	'Class:Incident/Attribute:tto' => 'TTO',
-	'Class:Incident/Attribute:tto+' => '',
-	'Class:Incident/Attribute:ttr' => 'TTR',
-	'Class:Incident/Attribute:ttr+' => '',
-	'Class:Incident/Attribute:tto_escalation_deadline' => 'Prazo determinado TTO',
-	'Class:Incident/Attribute:tto_escalation_deadline+' => '',
-	'Class:Incident/Attribute:sla_tto_passed' => 'SLA TTO passou',
-	'Class:Incident/Attribute:sla_tto_passed+' => '',
-	'Class:Incident/Attribute:sla_tto_over' => 'SLA TTO acima',
-	'Class:Incident/Attribute:sla_tto_over+' => '',
-	'Class:Incident/Attribute:ttr_escalation_deadline' => 'Prazo determinado TTR',
-	'Class:Incident/Attribute:ttr_escalation_deadline+' => '',
-	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA TTR passou',
-	'Class:Incident/Attribute:sla_ttr_passed+' => '',
-	'Class:Incident/Attribute:sla_ttr_over' => 'SLA TTR acima',
-	'Class:Incident/Attribute:sla_ttr_over+' => '',
-	'Class:Incident/Attribute:time_spent' => 'Atraso resolução',
-	'Class:Incident/Attribute:time_spent+' => '',
-	'Class:Incident/Attribute:resolution_code' => 'Código resolução',
-	'Class:Incident/Attribute:resolution_code+' => '',
-	'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Assistência',
-	'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'Assistência',
-	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Bug corrigido',
-	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'Bug corrigido',
-	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparado',
-	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'Hardware reparado',
-	'Class:Incident/Attribute:resolution_code/Value:other' => 'Outro',
-	'Class:Incident/Attribute:resolution_code/Value:other+' => 'Outro',
-	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'Software patch',
-	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'Software patch',
-	'Class:Incident/Attribute:resolution_code/Value:system update' => 'Atualização sistema',
-	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'Atualização sistema',
-	'Class:Incident/Attribute:resolution_code/Value:training' => 'Treinamento',
-	'Class:Incident/Attribute:resolution_code/Value:training+' => 'Treinamento',
-	'Class:Incident/Attribute:solution' => 'Solução',
-	'Class:Incident/Attribute:solution+' => '',
-	'Class:Incident/Attribute:pending_reason' => 'Razão pendência',
-	'Class:Incident/Attribute:pending_reason+' => '',
-	'Class:Incident/Attribute:parent_incident_id' => 'Incidente principal',
-	'Class:Incident/Attribute:parent_incident_id+' => '',
-	'Class:Incident/Attribute:parent_incident_ref' => 'Ref Incidente principal',
-	'Class:Incident/Attribute:parent_incident_ref+' => '',
-	'Class:Incident/Attribute:parent_problem_id' => 'Problema principal',
-	'Class:Incident/Attribute:parent_problem_id+' => '',
-	'Class:Incident/Attribute:parent_problem_ref' => 'Ref problema principal',
-	'Class:Incident/Attribute:parent_problem_ref+' => '',
-	'Class:Incident/Attribute:parent_change_id' => 'Mudança principal',
-	'Class:Incident/Attribute:parent_change_id+' => '',
-	'Class:Incident/Attribute:parent_change_ref' => 'Ref mudança principal',
-	'Class:Incident/Attribute:parent_change_ref+' => '',
-	'Class:Incident/Attribute:child_incidents_list' => 'Sub-Incidentes',
-	'Class:Incident/Attribute:child_incidents_list+' => 'Todos os sub-incidentes vinculados a esse incidente',
-	'Class:Incident/Attribute:public_log' => 'Log público',
-	'Class:Incident/Attribute:public_log+' => '',
-	'Class:Incident/Attribute:user_satisfaction' => 'Satisfação do usuário',
-	'Class:Incident/Attribute:user_satisfaction+' => '',
-	'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Muito satisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Muito satisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Bastante satisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Bastante satisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Bastante insatisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Bastante insatisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Muito insatisfeito',
-	'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Muito insatisfeito',
-	'Class:Incident/Attribute:user_comment' => 'Comentário usuário',
-	'Class:Incident/Attribute:user_comment+' => '',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
-	'Class:Incident/Stimulus:ev_assign' => 'Atribuir',
-	'Class:Incident/Stimulus:ev_assign+' => '',
-	'Class:Incident/Stimulus:ev_reassign' => 'Re-atribuir',
-	'Class:Incident/Stimulus:ev_reassign+' => '',
-	'Class:Incident/Stimulus:ev_pending' => 'Pendente',
-	'Class:Incident/Stimulus:ev_pending+' => '',
-	'Class:Incident/Stimulus:ev_timeout' => 'Timeout',
-	'Class:Incident/Stimulus:ev_timeout+' => '',
-	'Class:Incident/Stimulus:ev_autoresolve' => 'Resolvido automaticamente',
-	'Class:Incident/Stimulus:ev_autoresolve+' => '',
-	'Class:Incident/Stimulus:ev_autoclose' => 'Fechado automaticamente',
-	'Class:Incident/Stimulus:ev_autoclose+' => '',
-	'Class:Incident/Stimulus:ev_resolve' => 'Marcar como resolvido',
-	'Class:Incident/Stimulus:ev_resolve+' => '',
-	'Class:Incident/Stimulus:ev_close' => 'Fechar esta solicitação',
-	'Class:Incident/Stimulus:ev_close+' => '',
-	'Class:Incident/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:Incident/Stimulus:ev_reopen+' => '',
-	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Não é possível atribuir o incidente principal ao próprio incidente',
-	'Class:Incident/Attribute:related_request_list' => 'Child requests~~',
-	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
-	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
-	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
-));
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:IncidentManagement' => 'Gerenciamento Incidentes',
+	'Menu:IncidentManagement+' => 'Gerenciamento Incidentes',
+	'Menu:Incident:Overview' => 'Visão geral',
+	'Menu:Incident:Overview+' => 'Visão geral',
+	'Menu:NewIncident' => 'Novo incidente',
+	'Menu:NewIncident+' => 'Criar uma novo incidente',
+	'Menu:SearchIncidents' => 'Pesquisar por incidentes',
+	'Menu:SearchIncidents+' => 'Pesquisar por solicitações incidentes',
+	'Menu:Incident:Shortcuts' => 'Atalho',
+	'Menu:Incident:Shortcuts+' => '',
+	'Menu:Incident:MyIncidents' => 'Incidentes atribuídos para mim',
+	'Menu:Incident:MyIncidents+' => 'Incidentes atribuídos para mim (como agente)',
+	'Menu:Incident:EscalatedIncidents' => 'Incidentes escalados',
+	'Menu:Incident:EscalatedIncidents+' => 'Incidentes escalados',
+	'Menu:Incident:OpenIncidents' => 'Todos incidentes abertos',
+	'Menu:Incident:OpenIncidents+' => 'Todos incidentes abertos',
+	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Últimos 14 dias por incidente prioridade',
+	'UI-IncidentManagementOverview-Last-14-days' => 'Últimos 14 dias por incidente prioridade',
+	'UI-IncidentManagementOverview-OpenIncidentByStatus' => 'Incidentes abertos por estado',
+	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'Incidentes abertos por agentes',
+	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => 'Incidentes abertos por cliente',
+));
+
+
+
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: Incident
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Incident' => 'Incidente',
+	'Class:Incident+' => '',
+	'Class:Incident/Attribute:status' => 'Estado',
+	'Class:Incident/Attribute:status+' => '',
+	'Class:Incident/Attribute:status/Value:new' => 'Novo',
+	'Class:Incident/Attribute:status/Value:new+' => '',
+	'Class:Incident/Attribute:status/Value:escalated_tto' => 'TTO escalado',
+	'Class:Incident/Attribute:status/Value:escalated_tto+' => '',
+	'Class:Incident/Attribute:status/Value:assigned' => 'Atribuído',
+	'Class:Incident/Attribute:status/Value:assigned+' => '',
+	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'TTR escalado',
+	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval' => 'Aguardando aprovação',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:Incident/Attribute:status/Value:pending' => 'Pendente',
+	'Class:Incident/Attribute:status/Value:pending+' => '',
+	'Class:Incident/Attribute:status/Value:resolved' => 'Resolvido',
+	'Class:Incident/Attribute:status/Value:resolved+' => '',
+	'Class:Incident/Attribute:status/Value:closed' => 'Fechado',
+	'Class:Incident/Attribute:status/Value:closed+' => '',
+	'Class:Incident/Attribute:impact' => 'Impacto',
+	'Class:Incident/Attribute:impact+' => '',
+	'Class:Incident/Attribute:impact/Value:1' => 'Um departamento',
+	'Class:Incident/Attribute:impact/Value:1+' => '',
+	'Class:Incident/Attribute:impact/Value:2' => 'Um serviço',
+	'Class:Incident/Attribute:impact/Value:2+' => '',
+	'Class:Incident/Attribute:impact/Value:3' => 'Uma pessoa',
+	'Class:Incident/Attribute:impact/Value:3+' => '',
+	'Class:Incident/Attribute:priority' => 'Prioridade',
+	'Class:Incident/Attribute:priority+' => '',
+	'Class:Incident/Attribute:priority/Value:1' => 'Crítica',
+	'Class:Incident/Attribute:priority/Value:1+' => 'Crítica',
+	'Class:Incident/Attribute:priority/Value:2' => 'Alta',
+	'Class:Incident/Attribute:priority/Value:2+' => 'Alta',
+	'Class:Incident/Attribute:priority/Value:3' => 'Média',
+	'Class:Incident/Attribute:priority/Value:3+' => 'Média',
+	'Class:Incident/Attribute:priority/Value:4' => 'Baixa',
+	'Class:Incident/Attribute:priority/Value:4+' => 'Baixa',
+	'Class:Incident/Attribute:urgency' => 'Urgência',
+	'Class:Incident/Attribute:urgency+' => '',
+	'Class:Incident/Attribute:urgency/Value:1' => 'Crítica',
+	'Class:Incident/Attribute:urgency/Value:1+' => 'Crítica',
+	'Class:Incident/Attribute:urgency/Value:2' => 'Alta',
+	'Class:Incident/Attribute:urgency/Value:2+' => 'Alta',
+	'Class:Incident/Attribute:urgency/Value:3' => 'Média',
+	'Class:Incident/Attribute:urgency/Value:3+' => 'Média',
+	'Class:Incident/Attribute:urgency/Value:4' => 'Baixa',
+	'Class:Incident/Attribute:urgency/Value:4+' => 'Baixa',
+	'Class:Incident/Attribute:origin' => 'Origem',
+	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:mail' => 'Email',
+	'Class:Incident/Attribute:origin/Value:mail+' => 'Email',
+	'Class:Incident/Attribute:origin/Value:monitoring' => 'Monitoramento',
+	'Class:Incident/Attribute:origin/Value:monitoring+' => 'Monitoramento',
+	'Class:Incident/Attribute:origin/Value:phone' => 'Telefone',
+	'Class:Incident/Attribute:origin/Value:phone+' => 'Telefone',
+	'Class:Incident/Attribute:origin/Value:portal' => 'Portal',
+	'Class:Incident/Attribute:origin/Value:portal+' => 'Portal',
+	'Class:Incident/Attribute:service_id' => 'Serviço',
+	'Class:Incident/Attribute:service_id+' => '',
+	'Class:Incident/Attribute:service_name' => 'Nome serviço',
+	'Class:Incident/Attribute:service_name+' => '',
+	'Class:Incident/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
+	'Class:Incident/Attribute:servicesubcategory_id+' => '',
+	'Class:Incident/Attribute:servicesubcategory_name' => 'Nome Sub-categoria serviço',
+	'Class:Incident/Attribute:servicesubcategory_name+' => '',
+	'Class:Incident/Attribute:escalation_flag' => 'Alerta vermelho',
+	'Class:Incident/Attribute:escalation_flag+' => '',
+	'Class:Incident/Attribute:escalation_flag/Value:no' => 'Não',
+	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'Não',
+	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'Sim',
+	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'Sim',
+	'Class:Incident/Attribute:escalation_reason' => 'Razão alerta',
+	'Class:Incident/Attribute:escalation_reason+' => '',
+	'Class:Incident/Attribute:assignment_date' => 'Data atribuição',
+	'Class:Incident/Attribute:assignment_date+' => '',
+	'Class:Incident/Attribute:resolution_date' => 'Data resolução',
+	'Class:Incident/Attribute:resolution_date+' => '',
+	'Class:Incident/Attribute:last_pending_date' => 'Última data pendente',
+	'Class:Incident/Attribute:last_pending_date+' => '',
+	'Class:Incident/Attribute:cumulatedpending' => 'Pendências acumuladas',
+	'Class:Incident/Attribute:cumulatedpending+' => '',
+	'Class:Incident/Attribute:tto' => 'TTO',
+	'Class:Incident/Attribute:tto+' => '',
+	'Class:Incident/Attribute:ttr' => 'TTR',
+	'Class:Incident/Attribute:ttr+' => '',
+	'Class:Incident/Attribute:tto_escalation_deadline' => 'Prazo determinado TTO',
+	'Class:Incident/Attribute:tto_escalation_deadline+' => '',
+	'Class:Incident/Attribute:sla_tto_passed' => 'SLA TTO passou',
+	'Class:Incident/Attribute:sla_tto_passed+' => '',
+	'Class:Incident/Attribute:sla_tto_over' => 'SLA TTO acima',
+	'Class:Incident/Attribute:sla_tto_over+' => '',
+	'Class:Incident/Attribute:ttr_escalation_deadline' => 'Prazo determinado TTR',
+	'Class:Incident/Attribute:ttr_escalation_deadline+' => '',
+	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA TTR passou',
+	'Class:Incident/Attribute:sla_ttr_passed+' => '',
+	'Class:Incident/Attribute:sla_ttr_over' => 'SLA TTR acima',
+	'Class:Incident/Attribute:sla_ttr_over+' => '',
+	'Class:Incident/Attribute:time_spent' => 'Atraso resolução',
+	'Class:Incident/Attribute:time_spent+' => '',
+	'Class:Incident/Attribute:resolution_code' => 'Código resolução',
+	'Class:Incident/Attribute:resolution_code+' => '',
+	'Class:Incident/Attribute:resolution_code/Value:assistance' => 'Assistência',
+	'Class:Incident/Attribute:resolution_code/Value:assistance+' => 'Assistência',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'Bug corrigido',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'Bug corrigido',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparado',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'Hardware reparado',
+	'Class:Incident/Attribute:resolution_code/Value:other' => 'Outro',
+	'Class:Incident/Attribute:resolution_code/Value:other+' => 'Outro',
+	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'Software patch',
+	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'Software patch',
+	'Class:Incident/Attribute:resolution_code/Value:system update' => 'Atualização sistema',
+	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'Atualização sistema',
+	'Class:Incident/Attribute:resolution_code/Value:training' => 'Treinamento',
+	'Class:Incident/Attribute:resolution_code/Value:training+' => 'Treinamento',
+	'Class:Incident/Attribute:solution' => 'Solução',
+	'Class:Incident/Attribute:solution+' => '',
+	'Class:Incident/Attribute:pending_reason' => 'Razão pendência',
+	'Class:Incident/Attribute:pending_reason+' => '',
+	'Class:Incident/Attribute:parent_incident_id' => 'Incidente principal',
+	'Class:Incident/Attribute:parent_incident_id+' => '',
+	'Class:Incident/Attribute:parent_incident_ref' => 'Ref Incidente principal',
+	'Class:Incident/Attribute:parent_incident_ref+' => '',
+	'Class:Incident/Attribute:parent_problem_id' => 'Problema principal',
+	'Class:Incident/Attribute:parent_problem_id+' => '',
+	'Class:Incident/Attribute:parent_problem_ref' => 'Ref problema principal',
+	'Class:Incident/Attribute:parent_problem_ref+' => '',
+	'Class:Incident/Attribute:parent_change_id' => 'Mudança principal',
+	'Class:Incident/Attribute:parent_change_id+' => '',
+	'Class:Incident/Attribute:parent_change_ref' => 'Ref mudança principal',
+	'Class:Incident/Attribute:parent_change_ref+' => '',
+	'Class:Incident/Attribute:child_incidents_list' => 'Sub-Incidentes',
+	'Class:Incident/Attribute:child_incidents_list+' => 'Todos os sub-incidentes vinculados a esse incidente',
+	'Class:Incident/Attribute:public_log' => 'Log público',
+	'Class:Incident/Attribute:public_log+' => '',
+	'Class:Incident/Attribute:user_satisfaction' => 'Satisfação do usuário',
+	'Class:Incident/Attribute:user_satisfaction+' => '',
+	'Class:Incident/Attribute:user_satisfaction/Value:1' => 'Muito satisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:1+' => 'Muito satisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:2' => 'Bastante satisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:2+' => 'Bastante satisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:3' => 'Bastante insatisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:3+' => 'Bastante insatisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:4' => 'Muito insatisfeito',
+	'Class:Incident/Attribute:user_satisfaction/Value:4+' => 'Muito insatisfeito',
+	'Class:Incident/Attribute:user_comment' => 'Comentário usuário',
+	'Class:Incident/Attribute:user_comment+' => '',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname' => 'parent_incident_id_friendlyname',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
+	'Class:Incident/Stimulus:ev_assign' => 'Atribuir',
+	'Class:Incident/Stimulus:ev_assign+' => '',
+	'Class:Incident/Stimulus:ev_reassign' => 'Re-atribuir',
+	'Class:Incident/Stimulus:ev_reassign+' => '',
+	'Class:Incident/Stimulus:ev_pending' => 'Pendente',
+	'Class:Incident/Stimulus:ev_pending+' => '',
+	'Class:Incident/Stimulus:ev_timeout' => 'Timeout',
+	'Class:Incident/Stimulus:ev_timeout+' => '',
+	'Class:Incident/Stimulus:ev_autoresolve' => 'Resolvido automaticamente',
+	'Class:Incident/Stimulus:ev_autoresolve+' => '',
+	'Class:Incident/Stimulus:ev_autoclose' => 'Fechado automaticamente',
+	'Class:Incident/Stimulus:ev_autoclose+' => '',
+	'Class:Incident/Stimulus:ev_resolve' => 'Marcar como resolvido',
+	'Class:Incident/Stimulus:ev_resolve+' => '',
+	'Class:Incident/Stimulus:ev_close' => 'Fechar esta solicitação',
+	'Class:Incident/Stimulus:ev_close+' => '',
+	'Class:Incident/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:Incident/Stimulus:ev_reopen+' => '',
+	'Class:Incident/Error:CannotAssignParentIncidentIdToSelf' => 'Não é possível atribuir o incidente principal ao próprio incidente',
+	'Class:Incident/Attribute:related_request_list' => 'Child requests~~',
+	'Class:Incident/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
+	'Class:Incident/Method:ResolveChildTickets+' => 'Cascade the resolution to child ticket (ev_autoresolve), and align the following characteristics: service, team, agent, resolution info~~',
+	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
+));
+
+
+?>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php
index 7e8f856cf..ac20f9824 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php
@@ -26,108 +26,108 @@
 
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:KnownError' => 'Known Error',
-	'Class:KnownError+' => 'Dokumentierter Fehler für ein Issue',
+	'Class:KnownError+' => 'Dokumentierter Fehler für ein Issue',
 	'Class:KnownError/Attribute:name' => 'Name',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => 'Kunde',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:problem_id' => 'Zugehöriges Problem',
-	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Kunde',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'Zugehöriges Problem',
+	'Class:KnownError/Attribute:problem_id+' => '',
 	'Class:KnownError/Attribute:symptom' => 'Symptom',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => 'Grundursache',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => 'Workaround',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => 'Lösung',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'Fehlercode',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'Bereich',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'Anwendung',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'Anwendung',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Grundursache',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Workaround',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Lösung',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Fehlercode',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Bereich',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Anwendung',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Anwendung',
 	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'Netzwerk',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'Netzwerk',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Netzwerk',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Netzwerk',
 	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
-	'Class:KnownError/Attribute:vendor' => 'Anbieter',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'Modell',
-	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
+	'Class:KnownError/Attribute:vendor' => 'Anbieter',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Modell',
+	'Class:KnownError/Attribute:model+' => '',
 	'Class:KnownError/Attribute:version' => 'Version',
-	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:version+' => '',
 	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => '',
-	'Class:KnownError/Attribute:document_list' => 'Dokumente',
-	'Class:KnownError/Attribute:document_list+' => '',
-	'Class:lnkErrorToFunctionalCI' => 'Verknüpfung KnownError/FunctionalCI',
-	'Class:lnkErrorToFunctionalCI+' => '',
+	'Class:KnownError/Attribute:ci_list+' => '',
+	'Class:KnownError/Attribute:document_list' => 'Dokumente',
+	'Class:KnownError/Attribute:document_list+' => '',
+	'Class:lnkErrorToFunctionalCI' => 'Verknüpfung KnownError/FunctionalCI',
+	'Class:lnkErrorToFunctionalCI+' => '',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Fehler',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Begründung',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
-	'Class:lnkDocumentToError' => 'Verknüpfung Dokumente/KnownError',
-	'Class:lnkDocumentToError+' => '',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokument',
-	'Class:lnkDocumentToError/Attribute:document_id+' => '',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Known Error',
-	'Class:lnkDocumentToError/Attribute:error_id+' => '',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'Verknüpfungstyp',
-	'Class:lnkDocumentToError/Attribute:link_type+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Fehler',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Begründung',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
+	'Class:lnkDocumentToError' => 'Verknüpfung Dokumente/KnownError',
+	'Class:lnkDocumentToError+' => '',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToError/Attribute:document_id+' => '',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Known Error',
+	'Class:lnkDocumentToError/Attribute:error_id+' => '',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'Verknüpfungstyp',
+	'Class:lnkDocumentToError/Attribute:link_type+' => '',
 	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => '',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Zusammenfassung',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Beschreibung',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Kategorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Fehlercode',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQCategory' => 'FAQ-Kategorie',
-	'Class:FAQCategory+' => '',
+	'Class:FAQ+' => '',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Zusammenfassung',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Beschreibung',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Kategorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Fehlercode',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Schlüsselwörter',
+	'Class:FAQ/Attribute:key_words+' => '',
+	'Class:FAQCategory' => 'FAQ-Kategorie',
+	'Class:FAQCategory+' => '',
 	'Class:FAQCategory/Attribute:name' => 'Name',
-	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:name+' => '',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
 	'Menu:ProblemManagement' => 'Problem Management',
-	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
 	'Menu:Problem:Shortcuts' => 'Shortcuts',
-	'Menu:NewError' => 'Neuer Known Error',
-	'Menu:NewError+' => '',
-	'Menu:SearchError' => 'Nach Known Error suchen',
-	'Menu:SearchError+' => '',
-	'Menu:Problem:KnownErrors' => 'Alle Known Errors',
-	'Menu:Problem:KnownErrors+' => 'Alle Known Errors',
-	'Menu:FAQCategory' => 'FAQ-Kategorien',
-	'Menu:FAQCategory+' => '',
+	'Menu:NewError' => 'Neuer Known Error',
+	'Menu:NewError+' => '',
+	'Menu:SearchError' => 'Nach Known Error suchen',
+	'Menu:SearchError+' => '',
+	'Menu:Problem:KnownErrors' => 'Alle Known Errors',
+	'Menu:Problem:KnownErrors+' => 'Alle Known Errors',
+	'Menu:FAQCategory' => 'FAQ-Kategorien',
+	'Menu:FAQCategory+' => '',
 	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => '',
-	'Class:KnownError/Attribute:cust_name' => 'Kundenname',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Referenz',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI-Name',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Known Error-Name',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Dokumentname',
-	'Class:lnkDocumentToError/Attribute:document_name+' => '',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Known Error-Name',
-	'Class:lnkDocumentToError/Attribute:error_name+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Kategoriename',
-	'Class:FAQ/Attribute:category_name+' => '',
+	'Menu:FAQ+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Kundenname',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Referenz',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI-Name',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Known Error-Name',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Dokumentname',
+	'Class:lnkDocumentToError/Attribute:document_name+' => '',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Known Error-Name',
+	'Class:lnkDocumentToError/Attribute:error_name+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Kategoriename',
+	'Class:FAQ/Attribute:category_name+' => '',
 	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Oft gestellte Fragen (FAQs)',
-	'Brick:Portal:FAQ:Title+' => '<p>In Eile?</p><p>Sehen Sie sich die meistgestellten Fragen an (FAQs) und finden Sie (eventuell) die Antwort direkt dort.</p>',
+	'Brick:Portal:FAQ:Title' => 'Oft gestellte Fragen (FAQs)',
+	'Brick:Portal:FAQ:Title+' => '<p>In Eile?</p><p>Sehen Sie sich die meistgestellten Fragen an (FAQs) und finden Sie (eventuell) die Antwort direkt dort.</p>',
 	));
 ?>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php
index 762284295..3814616c0 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php
@@ -1,192 +1,192 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: KnownError
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:KnownError' => 'Known Error',
-	'Class:KnownError+' => 'Error documented for a known issue',
-	'Class:KnownError/Attribute:name' => 'Name',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => 'Customer',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => 'Customer Name',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => 'Related Problem',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Related Problem Ref',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => 'Symptom',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => 'Root Cause',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => 'Work around',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => 'Solution',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'Error Code',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'Domain',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'Application',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'Application',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'Network',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'Network',
-	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
-	'Class:KnownError/Attribute:vendor' => 'Vendor',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'Model',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => 'Version',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => 'All the configuration items that are related to this known error',
-	'Class:KnownError/Attribute:document_list' => 'Documents',
-	'Class:KnownError/Attribute:document_list+' => 'All the documents linked to this known error',
-));
-
-//
-// Class: lnkErrorToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI',
-	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
-));
-
-//
-// Class: lnkDocumentToError
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToError' => 'Link Documents / Errors',
-	'Class:lnkDocumentToError+' => 'A link between a document and a known error',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToError/Attribute:document_id+' => '',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name',
-	'Class:lnkDocumentToError/Attribute:document_name+' => '',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Error',
-	'Class:lnkDocumentToError/Attribute:error_id+' => '',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name',
-	'Class:lnkDocumentToError/Attribute:error_name+' => '',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type',
-	'Class:lnkDocumentToError/Attribute:link_type+' => '',
-));
-
-//
-// Class: FAQ
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Frequently asked questions',
-	'Class:FAQ/Attribute:title' => 'Title',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Summary',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Description',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Category',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Category name',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Error code',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Key words',
-	'Class:FAQ/Attribute:key_words+' => '',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:FAQCategory' => 'FAQ Category',
-	'Class:FAQCategory+' => 'Category for FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Name',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category',
-));
-Dict::Add('EN US', 'English', 'English', array(
-	'Menu:ProblemManagement' => 'Problem Management',
-	'Menu:ProblemManagement+' => 'Problem Management',
-	'Menu:Problem:Shortcuts' => 'Shortcuts',
-	'Menu:NewError' => 'New known error',
-	'Menu:NewError+' => 'Creation of a new known error',
-	'Menu:SearchError' => 'Search for known errors',
-	'Menu:SearchError+' => 'Search for known errors',
-	'Menu:Problem:KnownErrors' => 'All known errors',
-	'Menu:Problem:KnownErrors+' => 'All known errors',
-	'Menu:FAQCategory' => 'FAQ categories',
-	'Menu:FAQCategory+' => 'All FAQ categories',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'All FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
-	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
-));
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: KnownError
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:KnownError' => 'Known Error',
+	'Class:KnownError+' => 'Error documented for a known issue',
+	'Class:KnownError/Attribute:name' => 'Name',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Customer',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Customer Name',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'Related Problem',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Related Problem Ref',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => 'Symptom',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Root Cause',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Work around',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Solution',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Error Code',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Domain',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Application',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Application',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Network',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Network',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
+	'Class:KnownError/Attribute:vendor' => 'Vendor',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Model',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'Version',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CIs',
+	'Class:KnownError/Attribute:ci_list+' => 'All the configuration items that are related to this known error',
+	'Class:KnownError/Attribute:document_list' => 'Documents',
+	'Class:KnownError/Attribute:document_list+' => 'All the documents linked to this known error',
+));
+
+//
+// Class: lnkErrorToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentToError
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToError' => 'Link Documents / Errors',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToError/Attribute:document_id+' => '',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name',
+	'Class:lnkDocumentToError/Attribute:document_name+' => '',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Error',
+	'Class:lnkDocumentToError/Attribute:error_id+' => '',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name',
+	'Class:lnkDocumentToError/Attribute:error_name+' => '',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type',
+	'Class:lnkDocumentToError/Attribute:link_type+' => '',
+));
+
+//
+// Class: FAQ
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Frequently asked questions',
+	'Class:FAQ/Attribute:title' => 'Title',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Summary',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Description',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Category',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Category name',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Error code',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Key words',
+	'Class:FAQ/Attribute:key_words+' => '',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:FAQCategory' => 'FAQ Category',
+	'Class:FAQCategory+' => 'Category for FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Name',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category',
+));
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:ProblemManagement' => 'Problem Management',
+	'Menu:ProblemManagement+' => 'Problem Management',
+	'Menu:Problem:Shortcuts' => 'Shortcuts',
+	'Menu:NewError' => 'New known error',
+	'Menu:NewError+' => 'Creation of a new known error',
+	'Menu:SearchError' => 'Search for known errors',
+	'Menu:SearchError+' => 'Search for known errors',
+	'Menu:Problem:KnownErrors' => 'All known errors',
+	'Menu:Problem:KnownErrors+' => 'All known errors',
+	'Menu:FAQCategory' => 'FAQ categories',
+	'Menu:FAQCategory+' => 'All FAQ categories',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'All FAQs',
+
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
+));
diff --git a/datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php
index 69ce8d0cb..193bf3712 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php
@@ -1,185 +1,185 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: KnownError
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:KnownError' => 'Errori conosciuti',
-	'Class:KnownError+' => 'Errori documentati per problemi noti',
-	'Class:KnownError/Attribute:name' => 'Nome',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => 'Cliente ',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => 'Nome del cliente',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => 'Problema correlato',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Ref',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => 'Sintomo',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => 'Causa principale',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => 'Soluzione temporanea',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => 'Solutione',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'Codice di errore',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'Dominio',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'Applicazione',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'Applicazione',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'Network',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'Network',
-	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
-	'Class:KnownError/Attribute:vendor' => 'Venditore',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'Modello',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => 'Versione',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => '',
-	'Class:KnownError/Attribute:document_list' => 'Documenti',
-	'Class:KnownError/Attribute:document_list+' => '',
-));
-
-
-//
-// Class: lnkInfraError
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkInfraError' => 'InfraErrorLinks',
-	'Class:lnkInfraError+' => 'Infra relativi a un errore noto',
-	'Class:lnkInfraError/Attribute:infra_id' => 'CI',
-	'Class:lnkInfraError/Attribute:infra_id+' => '',
-	'Class:lnkInfraError/Attribute:infra_name' => 'Nome CI',
-	'Class:lnkInfraError/Attribute:infra_name+' => '',
-	'Class:lnkInfraError/Attribute:infra_status' => 'CI Stato',
-	'Class:lnkInfraError/Attribute:infra_status+' => '',
-	'Class:lnkInfraError/Attribute:error_id' => 'Errore',
-	'Class:lnkInfraError/Attribute:error_id+' => '',
-	'Class:lnkInfraError/Attribute:error_name' => 'Nome Errore',
-	'Class:lnkInfraError/Attribute:error_name+' => '',
-	'Class:lnkInfraError/Attribute:reason' => 'Motivo',
-	'Class:lnkInfraError/Attribute:reason+' => '',
-));
-
-//
-// Class: lnkDocumentError
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkDocumentError' => 'DocumentsErrorLinks',
-	'Class:lnkDocumentError+' => 'Un collegamento tra un documento e un errore noto',
-	'Class:lnkDocumentError/Attribute:doc_id' => 'Documento',
-	'Class:lnkDocumentError/Attribute:doc_id+' => '',
-	'Class:lnkDocumentError/Attribute:doc_name' => 'Nome Documento',
-	'Class:lnkDocumentError/Attribute:doc_name+' => '',
-	'Class:lnkDocumentError/Attribute:error_id' => 'Errore',
-	'Class:lnkDocumentError/Attribute:error_id+' => '',
-	'Class:lnkDocumentError/Attribute:error_name' => 'Nome Errore',
-	'Class:lnkDocumentError/Attribute:error_name+' => '',
-	'Class:lnkDocumentError/Attribute:link_type' => 'Informazione',
-	'Class:lnkDocumentError/Attribute:link_type+' => '',
-));
-
-Dict::Add('IT IT', 'Italian', 'Italian', array(
-	'Menu:ProblemManagement' => 'Gestione dei Problemi',
-	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
-	'Menu:Problem:Shortcuts' => 'Scorciatoia',
-	'Menu:NewError' => 'Nuovo errore conosciuto',
-	'Menu:NewError+' => 'Creazione di un Nuovo Errore Conosciuto',
-	'Menu:SearchError' => 'Ricerca per Errori Conosciuti',
-	'Menu:SearchError+' => 'Ricerca per Errori Conosciuti',
-        'Menu:Problem:KnownErrors' => 'Tutti gli errori conosciuti',
-        'Menu:Problem:KnownErrors+' => 'Tutti gli errori conosciuti',
-	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
-	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
-	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
-	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: KnownError
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:KnownError' => 'Errori conosciuti',
+	'Class:KnownError+' => 'Errori documentati per problemi noti',
+	'Class:KnownError/Attribute:name' => 'Nome',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Cliente ',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Nome del cliente',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'Problema correlato',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Ref',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => 'Sintomo',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Causa principale',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Soluzione temporanea',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Solutione',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Codice di errore',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Dominio',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Applicazione',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Applicazione',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Network',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Network',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
+	'Class:KnownError/Attribute:vendor' => 'Venditore',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Modello',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'Versione',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CIs',
+	'Class:KnownError/Attribute:ci_list+' => '',
+	'Class:KnownError/Attribute:document_list' => 'Documenti',
+	'Class:KnownError/Attribute:document_list+' => '',
+));
+
+
+//
+// Class: lnkInfraError
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkInfraError' => 'InfraErrorLinks',
+	'Class:lnkInfraError+' => 'Infra relativi a un errore noto',
+	'Class:lnkInfraError/Attribute:infra_id' => 'CI',
+	'Class:lnkInfraError/Attribute:infra_id+' => '',
+	'Class:lnkInfraError/Attribute:infra_name' => 'Nome CI',
+	'Class:lnkInfraError/Attribute:infra_name+' => '',
+	'Class:lnkInfraError/Attribute:infra_status' => 'CI Stato',
+	'Class:lnkInfraError/Attribute:infra_status+' => '',
+	'Class:lnkInfraError/Attribute:error_id' => 'Errore',
+	'Class:lnkInfraError/Attribute:error_id+' => '',
+	'Class:lnkInfraError/Attribute:error_name' => 'Nome Errore',
+	'Class:lnkInfraError/Attribute:error_name+' => '',
+	'Class:lnkInfraError/Attribute:reason' => 'Motivo',
+	'Class:lnkInfraError/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentError
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkDocumentError' => 'DocumentsErrorLinks',
+	'Class:lnkDocumentError+' => 'Un collegamento tra un documento e un errore noto',
+	'Class:lnkDocumentError/Attribute:doc_id' => 'Documento',
+	'Class:lnkDocumentError/Attribute:doc_id+' => '',
+	'Class:lnkDocumentError/Attribute:doc_name' => 'Nome Documento',
+	'Class:lnkDocumentError/Attribute:doc_name+' => '',
+	'Class:lnkDocumentError/Attribute:error_id' => 'Errore',
+	'Class:lnkDocumentError/Attribute:error_id+' => '',
+	'Class:lnkDocumentError/Attribute:error_name' => 'Nome Errore',
+	'Class:lnkDocumentError/Attribute:error_name+' => '',
+	'Class:lnkDocumentError/Attribute:link_type' => 'Informazione',
+	'Class:lnkDocumentError/Attribute:link_type+' => '',
+));
+
+Dict::Add('IT IT', 'Italian', 'Italian', array(
+	'Menu:ProblemManagement' => 'Gestione dei Problemi',
+	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
+	'Menu:Problem:Shortcuts' => 'Scorciatoia',
+	'Menu:NewError' => 'Nuovo errore conosciuto',
+	'Menu:NewError+' => 'Creazione di un Nuovo Errore Conosciuto',
+	'Menu:SearchError' => 'Ricerca per Errori Conosciuti',
+	'Menu:SearchError+' => 'Ricerca per Errori Conosciuti',
+        'Menu:Problem:KnownErrors' => 'Tutti gli errori conosciuti',
+        'Menu:Problem:KnownErrors+' => 'Tutti gli errori conosciuti',
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
+	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+));
+?>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
index 20cad21ed..4096c93f7 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
@@ -1,86 +1,86 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-knownerror-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Known Errors Database',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.3.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-		'installer' => 'KnownErrorMgmtInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-knownerror-mgmt.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-knownerror-mgmt.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-knownerror-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '', // No manual installation instructions
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-if (!class_exists('KnownErrorMgmtInstaller'))
-{
-	// Module installation handler
-	//
-	class KnownErrorMgmtInstaller extends ModuleInstallerAPI
-	{
-		public static function BeforeWritingConfig(Config $oConfiguration)
-		{
-			// If you want to override/force some configuration values, do it here
-			return $oConfiguration;
-		}
-
-		/**
-		 * Handler called before creating or upgrading the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			if (strlen($sPreviousVersion) > 0)
-			{
-				// If you want to migrate data from one format to another, do it here
-				self::RenameClassInDB('FAQcategory', 'FAQCategory');
-			}
-		}
-	
-		/**
-		 * Handler called after the creation/update of the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-		}
-	}
-}
-
-?>
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-knownerror-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Known Errors Database',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-tickets/2.3.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+		'installer' => 'KnownErrorMgmtInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-knownerror-mgmt.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-knownerror-mgmt.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-knownerror-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '', // No manual installation instructions
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+if (!class_exists('KnownErrorMgmtInstaller'))
+{
+	// Module installation handler
+	//
+	class KnownErrorMgmtInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if (strlen($sPreviousVersion) > 0)
+			{
+				// If you want to migrate data from one format to another, do it here
+				self::RenameClassInDB('FAQcategory', 'FAQCategory');
+			}
+		}
+	
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+		}
+	}
+}
+
+?>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
index f6516c6c3..0e79b0ad8 100644
--- a/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/nl.dict.itop-knownerror-mgmt.php
@@ -1,193 +1,193 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: KnownError
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:KnownError' => 'Bekende Fout',
-	'Class:KnownError+' => 'Error documented for a known issue',
-	'Class:KnownError/Attribute:name' => 'Naam',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => 'Klant',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => 'Klant Naam',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => 'Gerelateerde Probleem',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Gerelateerde Probleem Ref',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => 'Symptoon',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => 'Hoofd Oorzaak',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => 'Work around',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => 'Oplossing',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'Fout Code',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'Domein',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'Applicatie',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'Applicatie',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'Netwerk',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'Netwerk',
-	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
-	'Class:KnownError/Attribute:vendor' => 'Verkoper',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'Model',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => 'Versie',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => 'Alle configuratie items die gerelateerd zijn aan deze bekende fout',
-	'Class:KnownError/Attribute:document_list' => 'Documenten',
-	'Class:KnownError/Attribute:document_list+' => 'Alle documenten die gelinkt zijn aan deze bekende fout',
-));
-
-//
-// Class: lnkErrorToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI',
-	'Class:lnkErrorToFunctionalCI+' => 'Infra gerelateerd aan een bekende fout',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI naam',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Fout',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Fout naam',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reden',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
-));
-
-//
-// Class: lnkDocumentToError
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDocumentToError' => 'Link Documenten / Fouten',
-	'Class:lnkDocumentToError+' => 'Een link tussen een document en een bekende fout',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToError/Attribute:document_id+' => '',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Naam',
-	'Class:lnkDocumentToError/Attribute:document_name+' => '',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Fout',
-	'Class:lnkDocumentToError/Attribute:error_id+' => '',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Fout naam',
-	'Class:lnkDocumentToError/Attribute:error_name+' => '',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type',
-	'Class:lnkDocumentToError/Attribute:link_type+' => '',
-));
-
-//
-// Class: FAQ
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Frequently asked questions',
-	'Class:FAQ/Attribute:title' => 'Titel',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Samenvatting',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Omschrijving',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categorie',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Categorie naam',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Fout code',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Zoek termen',
-	'Class:FAQ/Attribute:key_words+' => '',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:FAQCategory' => 'FAQ Categorie',
-	'Class:FAQCategory+' => 'Categoryie voor de FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Naam',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Alle frequently asked questions gerelateerd aan deze categorie',
-));
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:ProblemManagement' => 'Probleem Management',
-	'Menu:ProblemManagement+' => 'Probleem Management',
-	'Menu:Problem:Shortcuts' => 'Snelkoppelingen',
-	'Menu:NewError' => 'Nieuwe bekende fout',
-	'Menu:NewError+' => 'Creatie van een nieuwe bekende fout',
-	'Menu:SearchError' => 'Zoek naar bekende fouten',
-	'Menu:SearchError+' => 'Zoek naar bekende fouten',
-	'Menu:Problem:KnownErrors' => 'Alle bekende fouten',
-	'Menu:Problem:KnownErrors+' => 'Alle bekende fouten',
-	'Menu:FAQCategory' => 'FAQ categorieen',
-	'Menu:FAQCategory+' => 'Alle FAQ categorieen',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Alle FAQs',
-
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: KnownError
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:KnownError' => 'Bekende Fout',
+	'Class:KnownError+' => 'Error documented for a known issue',
+	'Class:KnownError/Attribute:name' => 'Naam',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Klant',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Klant Naam',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'Gerelateerde Probleem',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Gerelateerde Probleem Ref',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => 'Symptoon',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Hoofd Oorzaak',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Work around',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Oplossing',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Fout Code',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Domein',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Applicatie',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Applicatie',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Netwerk',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Netwerk',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'Server',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Server',
+	'Class:KnownError/Attribute:vendor' => 'Verkoper',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Model',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'Versie',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CIs',
+	'Class:KnownError/Attribute:ci_list+' => 'Alle configuratie items die gerelateerd zijn aan deze bekende fout',
+	'Class:KnownError/Attribute:document_list' => 'Documenten',
+	'Class:KnownError/Attribute:document_list+' => 'Alle documenten die gelinkt zijn aan deze bekende fout',
+));
+
+//
+// Class: lnkErrorToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra gerelateerd aan een bekende fout',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI naam',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Fout',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Fout naam',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reden',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentToError
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDocumentToError' => 'Link Documenten / Fouten',
+	'Class:lnkDocumentToError+' => 'Een link tussen een document en een bekende fout',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToError/Attribute:document_id+' => '',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Naam',
+	'Class:lnkDocumentToError/Attribute:document_name+' => '',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Fout',
+	'Class:lnkDocumentToError/Attribute:error_id+' => '',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Fout naam',
+	'Class:lnkDocumentToError/Attribute:error_name+' => '',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type',
+	'Class:lnkDocumentToError/Attribute:link_type+' => '',
+));
+
+//
+// Class: FAQ
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Frequently asked questions',
+	'Class:FAQ/Attribute:title' => 'Titel',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Samenvatting',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Omschrijving',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categorie',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Categorie naam',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Fout code',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Zoek termen',
+	'Class:FAQ/Attribute:key_words+' => '',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:FAQCategory' => 'FAQ Categorie',
+	'Class:FAQCategory+' => 'Categoryie voor de FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Naam',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Alle frequently asked questions gerelateerd aan deze categorie',
+));
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:ProblemManagement' => 'Probleem Management',
+	'Menu:ProblemManagement+' => 'Probleem Management',
+	'Menu:Problem:Shortcuts' => 'Snelkoppelingen',
+	'Menu:NewError' => 'Nieuwe bekende fout',
+	'Menu:NewError+' => 'Creatie van een nieuwe bekende fout',
+	'Menu:SearchError' => 'Zoek naar bekende fouten',
+	'Menu:SearchError+' => 'Zoek naar bekende fouten',
+	'Menu:Problem:KnownErrors' => 'Alle bekende fouten',
+	'Menu:Problem:KnownErrors+' => 'Alle bekende fouten',
+	'Menu:FAQCategory' => 'FAQ categorieen',
+	'Menu:FAQCategory+' => 'Alle FAQ categorieen',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Alle FAQs',
+
+));
+?>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php
index a3f6e2827..66819f94e 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php
@@ -1,194 +1,194 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: KnownError
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:KnownError' => 'Erros conhecidos',
-	'Class:KnownError+' => 'Erro documentado de um problema conhecido',
-	'Class:KnownError/Attribute:name' => 'Nome',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => 'Cliente',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => 'Nome cliente',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => 'Problema vinculado',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Ref problema vinculado',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => 'Sinal erro',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => 'Origem causa',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => 'Contornar',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => 'Solução',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'Código erro',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'Domínio',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'Aplicação',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'Aplicação',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'Rede',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'Rede',
-	'Class:KnownError/Attribute:domain/Value:Server' => 'Servidor',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'Servidor',
-	'Class:KnownError/Attribute:vendor' => 'Fabricante',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'Modelo',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => 'Versão',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => 'Todos os itens de configuração que estão vinculados a esse erro conhecido',
-	'Class:KnownError/Attribute:document_list' => 'Documentos',
-	'Class:KnownError/Attribute:document_list+' => 'Todos os documentos vinculados a esse erro conhecido',
-));
-
-//
-// Class: lnkErrorToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkErrorToFunctionalCI' => 'Link Erro / CI',
-	'Class:lnkErrorToFunctionalCI+' => 'Infra-estrutura vinculado para esse erro conhecido',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Erro',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Nome erro',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Razão',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
-));
-
-//
-// Class: lnkDocumentToError
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToError' => 'Link Documentos / Erros',
-	'Class:lnkDocumentToError+' => 'Uma ligação entre um documento e um erro conhecido',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToError/Attribute:document_id+' => '',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToError/Attribute:document_name+' => '',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Erro',
-	'Class:lnkDocumentToError/Attribute:error_id+' => '',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Nome erro',
-	'Class:lnkDocumentToError/Attribute:error_name+' => '',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'Tipo de link',
-	'Class:lnkDocumentToError/Attribute:link_type+' => '',
-));
-
-//
-// Class: FAQ
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'Perguntas mais frequentes',
-	'Class:FAQ/Attribute:title' => 'Título',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => 'Índice',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => 'Descrição',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'Categoria',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:category_name' => 'Nome categoria',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Class:FAQ/Attribute:error_code' => 'Código erro',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'Palavras-chaves',
-	'Class:FAQ/Attribute:key_words+' => '',
-));
-
-//
-// Class: FAQCategory
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:FAQCategory' => 'Categoria FAQ',
-	'Class:FAQCategory+' => 'Categoria por FAQ',
-	'Class:FAQCategory/Attribute:name' => 'Nome',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
-	'Class:FAQCategory/Attribute:faq_list+' => 'Todas as perguntas mais frequentes vinculadas a essa categoria',
-));
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:ProblemManagement' => 'Gerencimento Problemas',
-	'Menu:ProblemManagement+' => 'Gerencimento Problemas',
-	'Menu:Problem:Shortcuts' => 'Atalho',
-	'Menu:NewError' => 'Novo erro conhecido',
-	'Menu:NewError+' => 'Criar um erro conhecido',
-	'Menu:SearchError' => 'Pesquisar por um erro conhecido',
-	'Menu:SearchError+' => 'Pesquisar por erros conhecidos',
-	'Menu:Problem:KnownErrors' => 'Todos erros conhecidos',
-	'Menu:Problem:KnownErrors+' => 'Todos erros conhecidos',
-	'Menu:FAQCategory' => 'Categorias FAQ',
-	'Menu:FAQCategory+' => 'Todas categorias FAQ',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Todas FAQs',
-
-	'Brick:Portal:FAQ:Menu' => 'FAQ',
-	'Brick:Portal:FAQ:Title' => 'Perguntes frequentes (FAQ)',
-	'Brick:Portal:FAQ:Title+' => '<p>Com pressa?</p><p>Confira a lista de perguntas mais comuns e (talvez) encontre a resposta esperada imediatamente.</p>',
-
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: KnownError
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:KnownError' => 'Erros conhecidos',
+	'Class:KnownError+' => 'Erro documentado de um problema conhecido',
+	'Class:KnownError/Attribute:name' => 'Nome',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Cliente',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Nome cliente',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'Problema vinculado',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Ref problema vinculado',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => 'Sinal erro',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Origem causa',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Contornar',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Solução',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Código erro',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Domínio',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Aplicação',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Aplicação',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Desktop',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Rede',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Rede',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'Servidor',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Servidor',
+	'Class:KnownError/Attribute:vendor' => 'Fabricante',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Modelo',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'Versão',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CIs',
+	'Class:KnownError/Attribute:ci_list+' => 'Todos os itens de configuração que estão vinculados a esse erro conhecido',
+	'Class:KnownError/Attribute:document_list' => 'Documentos',
+	'Class:KnownError/Attribute:document_list+' => 'Todos os documentos vinculados a esse erro conhecido',
+));
+
+//
+// Class: lnkErrorToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkErrorToFunctionalCI' => 'Link Erro / CI',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra-estrutura vinculado para esse erro conhecido',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Erro',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Nome erro',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Razão',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentToError
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToError' => 'Link Documentos / Erros',
+	'Class:lnkDocumentToError+' => 'Uma ligação entre um documento e um erro conhecido',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToError/Attribute:document_id+' => '',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToError/Attribute:document_name+' => '',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Erro',
+	'Class:lnkDocumentToError/Attribute:error_id+' => '',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Nome erro',
+	'Class:lnkDocumentToError/Attribute:error_name+' => '',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'Tipo de link',
+	'Class:lnkDocumentToError/Attribute:link_type+' => '',
+));
+
+//
+// Class: FAQ
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'Perguntas mais frequentes',
+	'Class:FAQ/Attribute:title' => 'Título',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => 'Índice',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => 'Descrição',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'Categoria',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'Nome categoria',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'Código erro',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'Palavras-chaves',
+	'Class:FAQ/Attribute:key_words+' => '',
+));
+
+//
+// Class: FAQCategory
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:FAQCategory' => 'Categoria FAQ',
+	'Class:FAQCategory+' => 'Categoria por FAQ',
+	'Class:FAQCategory/Attribute:name' => 'Nome',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
+	'Class:FAQCategory/Attribute:faq_list+' => 'Todas as perguntas mais frequentes vinculadas a essa categoria',
+));
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:ProblemManagement' => 'Gerencimento Problemas',
+	'Menu:ProblemManagement+' => 'Gerencimento Problemas',
+	'Menu:Problem:Shortcuts' => 'Atalho',
+	'Menu:NewError' => 'Novo erro conhecido',
+	'Menu:NewError+' => 'Criar um erro conhecido',
+	'Menu:SearchError' => 'Pesquisar por um erro conhecido',
+	'Menu:SearchError+' => 'Pesquisar por erros conhecidos',
+	'Menu:Problem:KnownErrors' => 'Todos erros conhecidos',
+	'Menu:Problem:KnownErrors+' => 'Todos erros conhecidos',
+	'Menu:FAQCategory' => 'Categorias FAQ',
+	'Menu:FAQCategory+' => 'Todas categorias FAQ',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Todas FAQs',
+
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
+	'Brick:Portal:FAQ:Title' => 'Perguntes frequentes (FAQ)',
+	'Brick:Portal:FAQ:Title+' => '<p>Com pressa?</p><p>Confira a lista de perguntas mais comuns e (talvez) encontre a resposta esperada imediatamente.</p>',
+
 ));
\ No newline at end of file
diff --git a/datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php
index 5350ffaae..c83475b4c 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php
@@ -1,186 +1,186 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: KnownError
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:KnownError' => 'Bilinen hata',
-	'Class:KnownError+' => 'Hata bilinen hatalara kaydedildi',
-	'Class:KnownError/Attribute:name' => 'Adı',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => 'Müşteri',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => 'Müşteri Adı',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => 'İlgili problem',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Referans',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => 'Belirtisi',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => 'Ana sebep',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => 'Ara çözüm',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => 'Çözüm',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => 'Hata kodu',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => 'Etki alanı',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => 'Uygulama',
-	'Class:KnownError/Attribute:domain/Value:Application+' => 'Uygulama',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Masaüstü',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Masaüstü',
-	'Class:KnownError/Attribute:domain/Value:Network' => 'Ağ',
-	'Class:KnownError/Attribute:domain/Value:Network+' => 'Ağ',
-	'Class:KnownError/Attribute:domain/Value:Server' => 'Sunucu',
-	'Class:KnownError/Attribute:domain/Value:Server+' => 'Sunucu',
-	'Class:KnownError/Attribute:vendor' => 'Üretici',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => 'Model',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => 'Versiyon',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'KKler',
-	'Class:KnownError/Attribute:ci_list+' => '',
-	'Class:KnownError/Attribute:document_list' => 'Dokümanlar',
-	'Class:KnownError/Attribute:document_list+' => '',
-));
-
-
-//
-// Class: lnkInfraError
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkInfraError' => 'Altyapı hata bağlantısı',
-	'Class:lnkInfraError+' => 'Alyapı ile ilgili bilinen hata',
-	'Class:lnkInfraError/Attribute:infra_id' => 'KK',
-	'Class:lnkInfraError/Attribute:infra_id+' => '',
-	'Class:lnkInfraError/Attribute:infra_name' => 'KK Adı',
-	'Class:lnkInfraError/Attribute:infra_name+' => '',
-	'Class:lnkInfraError/Attribute:infra_status' => 'KK durumu',
-	'Class:lnkInfraError/Attribute:infra_status+' => '',
-	'Class:lnkInfraError/Attribute:error_id' => 'Hata',
-	'Class:lnkInfraError/Attribute:error_id+' => '',
-	'Class:lnkInfraError/Attribute:error_name' => 'Hata adı',
-	'Class:lnkInfraError/Attribute:error_name+' => '',
-	'Class:lnkInfraError/Attribute:reason' => 'Sebep',
-	'Class:lnkInfraError/Attribute:reason+' => '',
-));
-
-//
-// Class: lnkDocumentError
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkDocumentError' => 'Bağlı Doküman hatası',
-	'Class:lnkDocumentError+' => 'Doküman ve bilinen hata bağlantısı',
-	'Class:lnkDocumentError/Attribute:doc_id' => 'Doküman',
-	'Class:lnkDocumentError/Attribute:doc_id+' => '',
-	'Class:lnkDocumentError/Attribute:doc_name' => 'Doküman Adı',
-	'Class:lnkDocumentError/Attribute:doc_name+' => '',
-	'Class:lnkDocumentError/Attribute:error_id' => 'Hata',
-	'Class:lnkDocumentError/Attribute:error_id+' => '',
-	'Class:lnkDocumentError/Attribute:error_name' => 'Hata Adı',
-	'Class:lnkDocumentError/Attribute:error_name+' => '',
-	'Class:lnkDocumentError/Attribute:link_type' => 'Bilgi',
-	'Class:lnkDocumentError/Attribute:link_type+' => '',
-));
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Menu:ProblemManagement' => 'Problem Yönetimi',
-	'Menu:ProblemManagement+' => 'Problem Yönetimi',
-	'Menu:Problem:Shortcuts' => 'Kısayollar',
-	'Menu:NewError' => 'Yeni bilinen hata',
-	'Menu:NewError+' => 'Yeni bilinen hata yatarımı',
-	'Menu:SearchError' => 'Bilinen hataları ara',
-	'Menu:SearchError+' => 'Bilinen hataları ara',
-        'Menu:Problem:KnownErrors' => 'Tüm bilinen hatalar',
-        'Menu:Problem:KnownErrors+' => 'Tüm bilinen hatalar',
-	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
-	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
-	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
-	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: KnownError
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:KnownError' => 'Bilinen hata',
+	'Class:KnownError+' => 'Hata bilinen hatalara kaydedildi',
+	'Class:KnownError/Attribute:name' => 'Adı',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => 'Müşteri',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => 'Müşteri Adı',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => 'İlgili problem',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => 'Referans',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => 'Belirtisi',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => 'Ana sebep',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => 'Ara çözüm',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => 'Çözüm',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => 'Hata kodu',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => 'Etki alanı',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => 'Uygulama',
+	'Class:KnownError/Attribute:domain/Value:Application+' => 'Uygulama',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => 'Masaüstü',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => 'Masaüstü',
+	'Class:KnownError/Attribute:domain/Value:Network' => 'Ağ',
+	'Class:KnownError/Attribute:domain/Value:Network+' => 'Ağ',
+	'Class:KnownError/Attribute:domain/Value:Server' => 'Sunucu',
+	'Class:KnownError/Attribute:domain/Value:Server+' => 'Sunucu',
+	'Class:KnownError/Attribute:vendor' => 'Üretici',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => 'Model',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => 'Versiyon',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'KKler',
+	'Class:KnownError/Attribute:ci_list+' => '',
+	'Class:KnownError/Attribute:document_list' => 'Dokümanlar',
+	'Class:KnownError/Attribute:document_list+' => '',
+));
+
+
+//
+// Class: lnkInfraError
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkInfraError' => 'Altyapı hata bağlantısı',
+	'Class:lnkInfraError+' => 'Alyapı ile ilgili bilinen hata',
+	'Class:lnkInfraError/Attribute:infra_id' => 'KK',
+	'Class:lnkInfraError/Attribute:infra_id+' => '',
+	'Class:lnkInfraError/Attribute:infra_name' => 'KK Adı',
+	'Class:lnkInfraError/Attribute:infra_name+' => '',
+	'Class:lnkInfraError/Attribute:infra_status' => 'KK durumu',
+	'Class:lnkInfraError/Attribute:infra_status+' => '',
+	'Class:lnkInfraError/Attribute:error_id' => 'Hata',
+	'Class:lnkInfraError/Attribute:error_id+' => '',
+	'Class:lnkInfraError/Attribute:error_name' => 'Hata adı',
+	'Class:lnkInfraError/Attribute:error_name+' => '',
+	'Class:lnkInfraError/Attribute:reason' => 'Sebep',
+	'Class:lnkInfraError/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentError
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkDocumentError' => 'Bağlı Doküman hatası',
+	'Class:lnkDocumentError+' => 'Doküman ve bilinen hata bağlantısı',
+	'Class:lnkDocumentError/Attribute:doc_id' => 'Doküman',
+	'Class:lnkDocumentError/Attribute:doc_id+' => '',
+	'Class:lnkDocumentError/Attribute:doc_name' => 'Doküman Adı',
+	'Class:lnkDocumentError/Attribute:doc_name+' => '',
+	'Class:lnkDocumentError/Attribute:error_id' => 'Hata',
+	'Class:lnkDocumentError/Attribute:error_id+' => '',
+	'Class:lnkDocumentError/Attribute:error_name' => 'Hata Adı',
+	'Class:lnkDocumentError/Attribute:error_name+' => '',
+	'Class:lnkDocumentError/Attribute:link_type' => 'Bilgi',
+	'Class:lnkDocumentError/Attribute:link_type+' => '',
+));
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Menu:ProblemManagement' => 'Problem Yönetimi',
+	'Menu:ProblemManagement+' => 'Problem Yönetimi',
+	'Menu:Problem:Shortcuts' => 'Kısayollar',
+	'Menu:NewError' => 'Yeni bilinen hata',
+	'Menu:NewError+' => 'Yeni bilinen hata yatarımı',
+	'Menu:SearchError' => 'Bilinen hataları ara',
+	'Menu:SearchError+' => 'Bilinen hataları ara',
+        'Menu:Problem:KnownErrors' => 'Tüm bilinen hatalar',
+        'Menu:Problem:KnownErrors+' => 'Tüm bilinen hatalar',
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
+	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+));
+?>
diff --git a/datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
index 356b3927c..00692a494 100755
--- a/datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
@@ -1,186 +1,186 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: KnownError
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:KnownError' => '已知错误',
-	'Class:KnownError+' => '被归档为已知议题的错误',
-	'Class:KnownError/Attribute:name' => '名称',
-	'Class:KnownError/Attribute:name+' => '',
-	'Class:KnownError/Attribute:org_id' => '客户',
-	'Class:KnownError/Attribute:org_id+' => '',
-	'Class:KnownError/Attribute:cust_name' => '客户',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_id' => '相关的问题',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => '参考',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:KnownError/Attribute:symptom' => '症状',
-	'Class:KnownError/Attribute:symptom+' => '',
-	'Class:KnownError/Attribute:root_cause' => '根源原因',
-	'Class:KnownError/Attribute:root_cause+' => '',
-	'Class:KnownError/Attribute:workaround' => '工作区',
-	'Class:KnownError/Attribute:workaround+' => '',
-	'Class:KnownError/Attribute:solution' => '方案',
-	'Class:KnownError/Attribute:solution+' => '',
-	'Class:KnownError/Attribute:error_code' => '错误编码',
-	'Class:KnownError/Attribute:error_code+' => '',
-	'Class:KnownError/Attribute:domain' => '域',
-	'Class:KnownError/Attribute:domain+' => '',
-	'Class:KnownError/Attribute:domain/Value:Application' => '应用程序',
-	'Class:KnownError/Attribute:domain/Value:Application+' => '应用程序',
-	'Class:KnownError/Attribute:domain/Value:Desktop' => '桌面',
-	'Class:KnownError/Attribute:domain/Value:Desktop+' => '桌面',
-	'Class:KnownError/Attribute:domain/Value:Network' => '网络',
-	'Class:KnownError/Attribute:domain/Value:Network+' => '网络',
-	'Class:KnownError/Attribute:domain/Value:Server' => '服务器',
-	'Class:KnownError/Attribute:domain/Value:Server+' => '服务器',
-	'Class:KnownError/Attribute:vendor' => '卖主',
-	'Class:KnownError/Attribute:vendor+' => '',
-	'Class:KnownError/Attribute:model' => '型号',
-	'Class:KnownError/Attribute:model+' => '',
-	'Class:KnownError/Attribute:version' => '版本',
-	'Class:KnownError/Attribute:version+' => '',
-	'Class:KnownError/Attribute:ci_list' => 'CIs',
-	'Class:KnownError/Attribute:ci_list+' => '',
-	'Class:KnownError/Attribute:document_list' => '文档',
-	'Class:KnownError/Attribute:document_list+' => '',
-));
-
-
-//
-// Class: lnkInfraError
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkInfraError' => 'InfraErrorLinks',
-	'Class:lnkInfraError+' => 'Infra related to a known error',
-	'Class:lnkInfraError/Attribute:infra_id' => 'CI',
-	'Class:lnkInfraError/Attribute:infra_id+' => '',
-	'Class:lnkInfraError/Attribute:infra_name' => 'CI 名称',
-	'Class:lnkInfraError/Attribute:infra_name+' => '',
-	'Class:lnkInfraError/Attribute:infra_status' => 'CI 状态',
-	'Class:lnkInfraError/Attribute:infra_status+' => '',
-	'Class:lnkInfraError/Attribute:error_id' => '错误',
-	'Class:lnkInfraError/Attribute:error_id+' => '',
-	'Class:lnkInfraError/Attribute:error_name' => '错误名称',
-	'Class:lnkInfraError/Attribute:error_name+' => '',
-	'Class:lnkInfraError/Attribute:reason' => '原因',
-	'Class:lnkInfraError/Attribute:reason+' => '',
-));
-
-//
-// Class: lnkDocumentError
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkDocumentError' => 'DocumentsErrorLinks',
-	'Class:lnkDocumentError+' => '在文档和已知错误间的链接',
-	'Class:lnkDocumentError/Attribute:doc_id' => '文档',
-	'Class:lnkDocumentError/Attribute:doc_id+' => '',
-	'Class:lnkDocumentError/Attribute:doc_name' => '文档名称',
-	'Class:lnkDocumentError/Attribute:doc_name+' => '',
-	'Class:lnkDocumentError/Attribute:error_id' => '错误',
-	'Class:lnkDocumentError/Attribute:error_id+' => '',
-	'Class:lnkDocumentError/Attribute:error_name' => '错误名称',
-	'Class:lnkDocumentError/Attribute:error_name+' => '',
-	'Class:lnkDocumentError/Attribute:link_type' => '信息',
-	'Class:lnkDocumentError/Attribute:link_type+' => '',
-));
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Menu:ProblemManagement' => '问题管理',
-	'Menu:ProblemManagement+' => '问题管理',
-	'Menu:Problem:Shortcuts' => '快捷方式',
-	'Menu:NewError' => '新的已知错误',
-	'Menu:NewError+' => '新已知错误的创建',
-	'Menu:SearchError' => '搜索已知错误',
-	'Menu:SearchError+' => '搜索已知错误',
-        'Menu:Problem:KnownErrors' => '所有已知错误',
-        'Menu:Problem:KnownErrors+' => '所有已知错误',
-	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
-	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
-	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
-	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
-	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
-	'Class:FAQ' => 'FAQ~~',
-	'Class:FAQ+' => 'Frequently asked questions~~',
-	'Class:FAQ/Attribute:title' => 'Title~~',
-	'Class:FAQ/Attribute:summary' => 'Summary~~',
-	'Class:FAQ/Attribute:description' => 'Description~~',
-	'Class:FAQ/Attribute:category_id' => 'Category~~',
-	'Class:FAQ/Attribute:category_name' => 'Category name~~',
-	'Class:FAQ/Attribute:error_code' => 'Error code~~',
-	'Class:FAQ/Attribute:key_words' => 'Key words~~',
-	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Category for FAQ~~',
-	'Class:FAQCategory/Attribute:name' => 'Name~~',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
-	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
-	'Menu:FAQCategory' => 'FAQ categories~~',
-	'Menu:FAQCategory+' => 'All FAQ categories~~',
-	'Menu:FAQ' => 'FAQs~~',
-	'Menu:FAQ+' => 'All FAQs~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: KnownError
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:KnownError' => '已知错误',
+	'Class:KnownError+' => '被归档为已知议题的错误',
+	'Class:KnownError/Attribute:name' => '名称',
+	'Class:KnownError/Attribute:name+' => '',
+	'Class:KnownError/Attribute:org_id' => '客户',
+	'Class:KnownError/Attribute:org_id+' => '',
+	'Class:KnownError/Attribute:cust_name' => '客户',
+	'Class:KnownError/Attribute:cust_name+' => '',
+	'Class:KnownError/Attribute:problem_id' => '相关的问题',
+	'Class:KnownError/Attribute:problem_id+' => '',
+	'Class:KnownError/Attribute:problem_ref' => '参考',
+	'Class:KnownError/Attribute:problem_ref+' => '',
+	'Class:KnownError/Attribute:symptom' => '症状',
+	'Class:KnownError/Attribute:symptom+' => '',
+	'Class:KnownError/Attribute:root_cause' => '根源原因',
+	'Class:KnownError/Attribute:root_cause+' => '',
+	'Class:KnownError/Attribute:workaround' => '工作区',
+	'Class:KnownError/Attribute:workaround+' => '',
+	'Class:KnownError/Attribute:solution' => '方案',
+	'Class:KnownError/Attribute:solution+' => '',
+	'Class:KnownError/Attribute:error_code' => '错误编码',
+	'Class:KnownError/Attribute:error_code+' => '',
+	'Class:KnownError/Attribute:domain' => '域',
+	'Class:KnownError/Attribute:domain+' => '',
+	'Class:KnownError/Attribute:domain/Value:Application' => '应用程序',
+	'Class:KnownError/Attribute:domain/Value:Application+' => '应用程序',
+	'Class:KnownError/Attribute:domain/Value:Desktop' => '桌面',
+	'Class:KnownError/Attribute:domain/Value:Desktop+' => '桌面',
+	'Class:KnownError/Attribute:domain/Value:Network' => '网络',
+	'Class:KnownError/Attribute:domain/Value:Network+' => '网络',
+	'Class:KnownError/Attribute:domain/Value:Server' => '服务器',
+	'Class:KnownError/Attribute:domain/Value:Server+' => '服务器',
+	'Class:KnownError/Attribute:vendor' => '卖主',
+	'Class:KnownError/Attribute:vendor+' => '',
+	'Class:KnownError/Attribute:model' => '型号',
+	'Class:KnownError/Attribute:model+' => '',
+	'Class:KnownError/Attribute:version' => '版本',
+	'Class:KnownError/Attribute:version+' => '',
+	'Class:KnownError/Attribute:ci_list' => 'CIs',
+	'Class:KnownError/Attribute:ci_list+' => '',
+	'Class:KnownError/Attribute:document_list' => '文档',
+	'Class:KnownError/Attribute:document_list+' => '',
+));
+
+
+//
+// Class: lnkInfraError
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkInfraError' => 'InfraErrorLinks',
+	'Class:lnkInfraError+' => 'Infra related to a known error',
+	'Class:lnkInfraError/Attribute:infra_id' => 'CI',
+	'Class:lnkInfraError/Attribute:infra_id+' => '',
+	'Class:lnkInfraError/Attribute:infra_name' => 'CI 名称',
+	'Class:lnkInfraError/Attribute:infra_name+' => '',
+	'Class:lnkInfraError/Attribute:infra_status' => 'CI 状态',
+	'Class:lnkInfraError/Attribute:infra_status+' => '',
+	'Class:lnkInfraError/Attribute:error_id' => '错误',
+	'Class:lnkInfraError/Attribute:error_id+' => '',
+	'Class:lnkInfraError/Attribute:error_name' => '错误名称',
+	'Class:lnkInfraError/Attribute:error_name+' => '',
+	'Class:lnkInfraError/Attribute:reason' => '原因',
+	'Class:lnkInfraError/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentError
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkDocumentError' => 'DocumentsErrorLinks',
+	'Class:lnkDocumentError+' => '在文档和已知错误间的链接',
+	'Class:lnkDocumentError/Attribute:doc_id' => '文档',
+	'Class:lnkDocumentError/Attribute:doc_id+' => '',
+	'Class:lnkDocumentError/Attribute:doc_name' => '文档名称',
+	'Class:lnkDocumentError/Attribute:doc_name+' => '',
+	'Class:lnkDocumentError/Attribute:error_id' => '错误',
+	'Class:lnkDocumentError/Attribute:error_id+' => '',
+	'Class:lnkDocumentError/Attribute:error_name' => '错误名称',
+	'Class:lnkDocumentError/Attribute:error_name+' => '',
+	'Class:lnkDocumentError/Attribute:link_type' => '信息',
+	'Class:lnkDocumentError/Attribute:link_type+' => '',
+));
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Menu:ProblemManagement' => '问题管理',
+	'Menu:ProblemManagement+' => '问题管理',
+	'Menu:Problem:Shortcuts' => '快捷方式',
+	'Menu:NewError' => '新的已知错误',
+	'Menu:NewError+' => '新已知错误的创建',
+	'Menu:SearchError' => '搜索已知错误',
+	'Menu:SearchError+' => '搜索已知错误',
+        'Menu:Problem:KnownErrors' => '所有已知错误',
+        'Menu:Problem:KnownErrors+' => '所有已知错误',
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
+	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
+	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
+	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
+	'Class:FAQ' => 'FAQ~~',
+	'Class:FAQ+' => 'Frequently asked questions~~',
+	'Class:FAQ/Attribute:title' => 'Title~~',
+	'Class:FAQ/Attribute:summary' => 'Summary~~',
+	'Class:FAQ/Attribute:description' => 'Description~~',
+	'Class:FAQ/Attribute:category_id' => 'Category~~',
+	'Class:FAQ/Attribute:category_name' => 'Category name~~',
+	'Class:FAQ/Attribute:error_code' => 'Error code~~',
+	'Class:FAQ/Attribute:key_words' => 'Key words~~',
+	'Class:FAQCategory' => 'FAQ Category~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
+	'Class:FAQCategory/Attribute:name' => 'Name~~',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
+	'Class:FAQCategory/Attribute:faq_list+' => 'All the frequently asked questions related to this category~~',
+	'Menu:FAQCategory' => 'FAQ categories~~',
+	'Menu:FAQCategory+' => 'All FAQ categories~~',
+	'Menu:FAQ' => 'FAQs~~',
+	'Menu:FAQ+' => 'All FAQs~~',
+));
+?>
diff --git a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
index 6f47ad227..8b20b8bdd 100644
--- a/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/module.itop-portal-base.php
@@ -1,42 +1,42 @@
-<?php
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal-base/2.5.0', array(
-	// Identification
-	'label' => 'Portal Development Library',
-		'category' => 'Portal',
-	// Setup
-	'dependencies' => array(
-	),
-	'mandatory' => false,
-	'visible' => true,
-	// Components
-	'datamodel' => array(
-		'portal/src/controllers/abstractcontroller.class.inc.php',
-		'portal/src/controllers/brickcontroller.class.inc.php',
-		'portal/src/entities/abstractbrick.class.inc.php',
-		'portal/src/entities/portalbrick.class.inc.php',
-		'portal/src/routers/abstractrouter.class.inc.php',
-	),
-	'webservice' => array(
-	//'webservices.itop-portal-base.php',
-	),
-	'dictionary' => array(
-		'fr.dict.itop-portal-base.php',
-	//'de.dict.itop-portal-base.php',
-	),
-	'data.struct' => array(
-	//'data.struct.itop-portal-base.xml',
-	),
-	'data.sample' => array(
-	//'data.sample.itop-portal-base.xml',
-	),
-	// Documentation
-	'doc.manual_setup' => '',
-	'doc.more_information' => '',
-	// Default settings
-	'settings' => array(
-	),
-	)
-);
+<?php
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-portal-base/2.5.0', array(
+	// Identification
+	'label' => 'Portal Development Library',
+		'category' => 'Portal',
+	// Setup
+	'dependencies' => array(
+	),
+	'mandatory' => false,
+	'visible' => true,
+	// Components
+	'datamodel' => array(
+		'portal/src/controllers/abstractcontroller.class.inc.php',
+		'portal/src/controllers/brickcontroller.class.inc.php',
+		'portal/src/entities/abstractbrick.class.inc.php',
+		'portal/src/entities/portalbrick.class.inc.php',
+		'portal/src/routers/abstractrouter.class.inc.php',
+	),
+	'webservice' => array(
+	//'webservices.itop-portal-base.php',
+	),
+	'dictionary' => array(
+		'fr.dict.itop-portal-base.php',
+	//'de.dict.itop-portal-base.php',
+	),
+	'data.struct' => array(
+	//'data.struct.itop-portal-base.xml',
+	),
+	'data.sample' => array(
+	//'data.sample.itop-portal-base.xml',
+	),
+	// Documentation
+	'doc.manual_setup' => '',
+	'doc.more_information' => '',
+	// Default settings
+	'settings' => array(
+	),
+	)
+);
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
index 71b24ef6e..b0a0d39af 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php
@@ -1,35 +1,35 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-
-/**
- * AbstractController class
- *
- * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
- */
-abstract class AbstractController
-{
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * AbstractController class
+ *
+ * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
+ */
+abstract class AbstractController
+{
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
index af18f3bae..93cbd50b6 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php
@@ -1,30 +1,30 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-
-abstract class BrickController extends AbstractController
-{
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+
+abstract class BrickController extends AbstractController
+{
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
index 2b9179b2f..449ad8d56 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php
@@ -1,754 +1,754 @@
-<?php
-
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use UserRights;
-use Dict;
-use MetaModel;
-use DBSearch;
-use DBObjectSet;
-use BinaryExpression;
-use FieldExpression;
-use VariableExpression;
-use Combodo\iTop\Portal\Helper\ApplicationHelper;
-use Combodo\iTop\Portal\Helper\SecurityHelper;
-use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
-use Combodo\iTop\Portal\Brick\AbstractBrick;
-use Combodo\iTop\Portal\Brick\BrowseBrick;
-
-class BrowseBrickController extends BrickController
-{
-	const LEVEL_SEPARATOR = '-';
-	public static $aOptionalAttributes = array('tooltip_att', 'description_att', 'image_att');
-
-	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sBrowseMode = null, $sDataLoading = null)
-	{
-        /** @var \Combodo\iTop\Portal\Brick\BrowseBrick $oBrick */
-        $oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-
-		// Getting availables browse modes
-		$aBrowseModes = $oBrick->GetAvailablesBrowseModes();
-		$aBrowseButtons = array_keys($aBrowseModes);
-		// Getting current browse mode (First from router pamater, then default brick value)
-		$sBrowseMode = (!empty($sBrowseMode)) ? $sBrowseMode : $oBrick->GetDefaultBrowseMode();
-		// Getting current dataloading mode (First from router parameter, then query parameter, then default brick value)
-		$sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $oApp['request_manipulator']->ReadParam('sDataLoading', $oBrick->GetDataLoading());
-		// Getting search value
-		$sSearchValue = $oApp['request_manipulator']->ReadParam('sSearchValue', '');
-		if (!empty($sSearchValue))
-		{
-			$sDataLoading = AbstractBrick::ENUM_DATA_LOADING_LAZY;
-		}
-
-		$aData = array();
-		$aLevelsProperties = array();
-		$aLevelsClasses = array();
-		static::TreeToFlatLevelsProperties($oApp, $oBrick->GetLevels(), $aLevelsProperties);
-
-		// Concistency checks
-		if (!in_array($sBrowseMode, array_keys($aBrowseModes)))
-		{
-			$oApp->abort(500, 'Browse brick "' . $sBrickId . '" : Unknown browse mode "' . $sBrowseMode . '", availables are ' . implode(' / ', array_keys($aBrowseModes)));
-		}
-		if (empty($aLevelsProperties))
-		{
-			$oApp->abort(500, 'Browse brick "' . $sBrickId . '" : No levels to display.');
-		}
-
-		// Building DBobjectSearch
-		$oQuery = null;
-		// ... In this case only we have to build a specific query for the current level only
-		if (in_array($sBrowseMode, array(BrowseBrick::ENUM_BROWSE_MODE_TREE, BrowseBrick::ENUM_BROWSE_MODE_MOSAIC)) && ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY))
-		{
-			// Will be handled later in the pagination part
-		}
-		// .. Otherwise
-		else
-		{
-			// We iterate (in reverse mode /!\) over the levels to build the whole query, starting from the bottom
-			$aLevelsPropertiesKeys = array_keys($aLevelsProperties);
-			$iLoopMax = count($aLevelsPropertiesKeys) - 1;
-			$oFullBinExpr = null;
-			for ($i = $iLoopMax; $i >= 0; $i--)
-			{
-				// Retrieving class alias for all depth
-				array_unshift($aLevelsClasses, $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->GetClassAlias());
-
-				// Joining queries from bottom-up
-				if ($i < $iLoopMax)
-				{
-					$aRealiasingMap = array();
-					$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search'] = $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->Join($aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['search'], DBSearch::JOIN_REFERENCED_BY, $aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['parent_att'], TREE_OPERATOR_EQUALS, $aRealiasingMap);
-					foreach ($aLevelsPropertiesKeys as $sLevelAlias)
-					{
-						if (array_key_exists($sLevelAlias, $aRealiasingMap))
-						{
-							$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->RenameAlias($aRealiasingMap[$sLevelAlias], $sLevelAlias);
-						}
-					}
-				}
-
-				// Adding search clause
-				// Note : For know the search is naive and looks only for the exact match. It doesn't search for words separately
-				if (!empty($sSearchValue))
-				{
-					// - Cleaning the search value by exploding and trimming spaces
-					$aSearchValues = explode(' ', $sSearchValue);
-					array_walk($aSearchValues, function(&$sSearchValue, $sKey)
-					{
-						trim($sSearchValue);
-					});
-
-					// - Retrieving fields to search
-					$aSearchFields = array($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['name_att']);
-					if (!empty($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['fields']))
-					{
-						foreach ($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['fields'] as $aTmpField)
-						{
-							$aSearchFields[] = $aTmpField['code'];
-						}
-					}
-					// - Building query for the search values parts
-					$oLevelBinExpr = null;
-					$iFieldLoopMax = count($aSearchFields) - 1;
-					$iSearchLoopMax = count($aSearchValues) - 1;
-					for ($j = 0; $j <= $iFieldLoopMax; $j++)
-					{
-						$sTmpFieldAttCode = $aSearchFields[$j];
-						$oFieldBinExpr = null;
-						//$oFieldBinExpr = new BinaryExpression(new FieldExpression($aSearchFields[$j], $aLevelsPropertiesKeys[$i]), )
-
-						for ($k = 0; $k <= $iSearchLoopMax; $k++)
-						{
-							$oSearchBinExpr = new BinaryExpression(new FieldExpression($sTmpFieldAttCode, $aLevelsPropertiesKeys[$i]), 'LIKE', new VariableExpression('search_value_' . $k));
-							if ($k === 0)
-							{
-								$oFieldBinExpr = $oSearchBinExpr;
-							}
-							else
-							{
-								$oFieldBinExpr = new BinaryExpression($oFieldBinExpr, 'AND', $oSearchBinExpr);
-							}
-						}
-
-						if ($j === 0)
-						{
-							$oLevelBinExpr = $oFieldBinExpr;
-						}
-						else
-						{
-							$oLevelBinExpr = new BinaryExpression($oLevelBinExpr, 'OR', $oFieldBinExpr);
-						}
-					}
-
-					// - Building query for the level
-					if ($i === $iLoopMax)
-					{
-						$oFullBinExpr = $oLevelBinExpr;
-					}
-					else
-					{
-						$oFullBinExpr = new BinaryExpression($oFullBinExpr, 'OR', $oLevelBinExpr);
-					}
-
-					// - Adding it to the query when complete
-					if ($i === 0)
-					{
-						$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->AddConditionExpression($oFullBinExpr);
-					}
-				}
-
-				// Setting selected classes and binding parameters
-				if ($i === 0)
-				{
-					$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->SetSelectedClasses($aLevelsClasses);
-
-					if (!empty($sSearchValue))
-					{
-						// Note : This could be way more simpler if we had a SetInternalParam($sParam, $value) verb
-						$aQueryParams = $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->GetInternalParams();
-						// Note : $iSearchloopMax was initialized on the previous loop
-						for ($j = 0; $j <= $iSearchLoopMax; $j++)
-						{
-							$aQueryParams['search_value_' . $j] = '%' . $aSearchValues[$j] . '%';
-						}
-						$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->SetInternalParams($aQueryParams);
-					}
-				}
-			}
-			$oQuery = $aLevelsProperties[$aLevelsPropertiesKeys[0]]['search'];
-
-			// Testing appropriate data loading mode if we are in auto
-			if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_AUTO)
-			{
-				// - Check how many records there is.
-				// - Update $sDataLoading with its new value regarding the number of record and the threshold
-				$oCountSet = new DBObjectSet($oQuery);
-				$fThreshold = (float) MetaModel::GetModuleSetting($oApp['combodo.portal.instance.id'], 'lazy_loading_threshold');
-				$sDataLoading = ($oCountSet->Count() > $fThreshold) ? AbstractBrick::ENUM_DATA_LOADING_LAZY : AbstractBrick::ENUM_DATA_LOADING_FULL;
-				unset($oCountSet);
-			}
-		}
-
-		// Setting query pagination if needed
-		if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY)
-		{
-			switch ($sBrowseMode)
-			{
-				case BrowseBrick::ENUM_BROWSE_MODE_LIST:
-					// Retrieving parameters
-					$iPageNumber = (int) $oApp['request_manipulator']->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT);
-					$iListLength = (int) $oApp['request_manipulator']->ReadParam('iListLength', BrowseBrick::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT);
-
-					// Getting total records number
-					$oCountSet = new DBObjectSet($oQuery);
-					$aData['recordsTotal'] = $oCountSet->Count();
-					$aData['recordsFiltered'] = $oCountSet->Count();
-					unset($oCountSet);
-
-					$oSet = new DBObjectSet($oQuery);
-					$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
-
-					break;
-				case BrowseBrick::ENUM_BROWSE_MODE_TREE:
-                case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC:
-					// Retrieving parameters
-					$sLevelAlias = $oApp['request_manipulator']->ReadParam('sLevelAlias', '');
-					$sNodeId = $oApp['request_manipulator']->ReadParam('sNodeId', '');
-
-					// If no values for those parameters, we might be loading page in lazy mode for the first time, therefore the URL doesn't have those informations.
-					if (empty($sLevelAlias))
-					{
-						reset($aLevelsProperties);
-						$oQuery = $aLevelsProperties[key($aLevelsProperties)]['search'];
-						if (!empty($sNodeId))
-						{
-							$oQuery->AddCondition('id', $sNodeId);
-						}
-					}
-					// Else we need to find the OQL for that particular level
-					else
-					{
-						$bFoundLevel = false;
-						foreach ($aLevelsProperties as $aLevelProperties)
-						{
-							if ($aLevelProperties['alias'] === $sLevelAlias)
-							{
-								if (isset($aLevelProperties['levels']) && !empty($aLevelProperties['levels']) && isset($aLevelsProperties[$aLevelProperties['levels'][0]]))
-								{
-									$oQuery = $aLevelsProperties[$aLevelProperties['levels'][0]]['search'];
-									if (!empty($sNodeId))
-									{
-										$oQuery->AddCondition($aLevelsProperties[$aLevelProperties['levels'][0]]['parent_att'], $sNodeId);
-									}
-									$bFoundLevel = true;
-									break;
-								}
-							}
-						}
-
-						if (!$bFoundLevel)
-						{
-							$oApp->abort(500, 'Browse brick "' . $sBrickId . '" : Level alias "' . $sLevelAlias . '" is not defined for that brick.');
-						}
-					}
-
-					$oSet = new DBObjectSet($oQuery);
-					break;
-
-				default:
-					// We should never be there. If there is an other browse mode for that brick :
-					// - If it's from a custom brick extension, it should be handle by the extension router/controller
-					// - If it's from a base brick, it should be handle in a case above this one
-					// - If none of the previous statements was done, this fail safe will load all data as it's not able to know how to handle the pagination
-					$oSet = new DBObjectSet($oQuery);
-					break;
-			}
-		}
-		else
-		{
-			$oSet = new DBObjectSet($oQuery);
-		}
-
-		// Optimizing the ObjectSet to retrieve only necessary columns
-		$aColumnAttrs = array();
-		foreach ($oSet->GetFilter()->GetSelectedClasses() as $sTmpClassAlias => $sTmpClassName)
-		{
-			if (isset($aLevelsProperties[$sTmpClassAlias]))
-			{
-				$aTmpLevelProperties = $aLevelsProperties[$sTmpClassAlias];
-				// Mandatory main attribute
-				$aTmpColumnAttrs = array($aTmpLevelProperties['name_att']);
-				// Optional attributes, only if in list mode
-				if ($sBrowseMode === BrowseBrick::ENUM_BROWSE_MODE_LIST)
-				{
-					foreach ($aTmpLevelProperties['fields'] as $aTmpField)
-					{
-						$aTmpColumnAttrs[] = $aTmpField['code'];
-					}
-				}
-                // Optional attributes
-                foreach(static::$aOptionalAttributes as $sOptionalAttribute)
-                {
-                    if($aTmpLevelProperties[$sOptionalAttribute] !== null)
-                    {
-                        $aTmpColumnAttrs[] = $aTmpLevelProperties[$sOptionalAttribute];
-                    }
-                }
-
-				$aColumnAttrs[$sTmpClassAlias] = $aTmpColumnAttrs;
-			}
-		}
-		$oSet->OptimizeColumnLoad($aColumnAttrs);
-
-		// Sorting objects through defined order (in DM)
-		$oSet->SetOrderByClasses();
-
-		// Retrieving results and organizing them for templating
-		$aItems = array();
-		while ($aCurrentRow = $oSet->FetchAssoc())
-		{
-			switch ($sBrowseMode)
-			{
-				case BrowseBrick::ENUM_BROWSE_MODE_TREE:
-                case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC:
-					static::AddToTreeItems($aItems, $aCurrentRow, $aLevelsProperties, null, $oApp);
-					break;
-
-				case BrowseBrick::ENUM_BROWSE_MODE_LIST:
-				default:
-					$aItems[] = static::AddToFlatItems($aCurrentRow, $aLevelsProperties, $oApp);
-					break;
-			}
-		}
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			$aData = $aData + array(
-				'data' => $aItems,
-				'levelsProperties' => $aLevelsProperties
-			);
-			$oResponse = $oApp->json($aData);
-		}
-		else
-		{
-			$aData = $aData + array(
-				'oBrick' => $oBrick,
-				'sBrickId' => $sBrickId,
-				'sBrowseMode' => $sBrowseMode,
-				'aBrowseButtons' => $aBrowseButtons,
-				'sSearchValue' => $sSearchValue,
-				'sDataLoading' => $sDataLoading,
-				'aItems' => json_encode($aItems),
-				'iItemsCount' => count($aItems),
-				'aLevelsProperties' => json_encode($aLevelsProperties)
-			);
-
-			// Note : To extend this brick's template, depending on what you want to do :
-			// a) Modify the whole template :
-			//	 - Create a template and specify it in the brick configuration
-			// b) Add a new browse mode :
-			//	 - Create a template for that browse mode,
-			//	 - Add the mode to those availables in the brick configuration,
-			//	 - Create a router and add a route for the new browse mode
-			if ($oBrick->GetPageTemplatePath() !== null)
-			{
-				$sTemplatePath = $oBrick->GetPageTemplatePath();
-			}
-			else
-			{
-				$sTemplatePath = $aBrowseModes[$sBrowseMode]['template'];
-			}
-			$oResponse = $oApp['twig']->render($sTemplatePath, $aData);
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Flattens the $aLevels into $aLevelsProperties in order to be able to build an OQL query from multiple single queries related to each others.
-	 * As of now it only keeps search / parent_att / name_att properties.
-	 *
-	 * Note : This is not in the BrowseBrick class because the classes should not rely on DBObjectSearch.
-	 *
-	 * @param \Silex\Application $oApp
-	 * @param array $aLevels Levels from a BrowseBrick class
-	 * @param array $aLevelsProperties Reference to an array that will contain the flattened levels
-	 * @param string $sLevelAliasPrefix String that will be prefixed to the level ID as an unique path identifier
-	 */
-	public static function TreeToFlatLevelsProperties(Application $oApp, array $aLevels, array &$aLevelsProperties, $sLevelAliasPrefix = 'L')
-	{
-		foreach ($aLevels as $aLevel)
-		{
-			$sCurrentLevelAlias = $sLevelAliasPrefix . static::LEVEL_SEPARATOR . $aLevel['id'];
-			$oSearch = DBSearch::CloneWithAlias(DBSearch::FromOQL($aLevel['oql']), $sCurrentLevelAlias);
-
-			// Restricting to the allowed scope
-			$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oSearch->GetClass(), UR_ACTION_READ);
-			$oSearch = ($oScopeSearch !== null) ? $oSearch->Intersect($oScopeSearch) : null;
-			// - Allowing all data if necessary
-			if ($oScopeSearch !== null && $oScopeSearch->IsAllDataAllowed())
-			{
-				$oSearch->AllowAllData();
-			}
-
-			if ($oSearch !== null)
-			{
-				$aLevelsProperties[$sCurrentLevelAlias] = array(
-					'alias' => $sCurrentLevelAlias,
-					'title' => ($aLevel['title'] !== null) ? Dict::S($aLevel['title']) : MetaModel::GetName($oSearch->GetClass()),
-					'parent_att' => $aLevel['parent_att'],
-					'name_att' => $aLevel['name_att'],
-                    'tooltip_att' => $aLevel['tooltip_att'],
-                    'description_att' => $aLevel['description_att'],
-                    'image_att' => $aLevel['image_att'],
-					'search' => $oSearch,
-					'fields' => array(),
-					'actions' => array()
-				);
-
-				// Adding current level's fields
-				if (isset($aLevel['fields']))
-				{
-					$aLevelsProperties[$sCurrentLevelAlias]['fields'] = array();
-
-					foreach ($aLevel['fields'] as $sFieldAttCode => $aFieldProperties)
-					{
-						$aLevelsProperties[$sCurrentLevelAlias]['fields'][] = array(
-							'code' => $sFieldAttCode,
-							'label' => MetaModel::GetAttributeDef($oSearch->GetClass(), $sFieldAttCode)->GetLabel(),
-							'hidden' => $aFieldProperties['hidden']
-						);
-					}
-				}
-
-				// Flattening and adding sublevels
-				if (isset($aLevel['levels']))
-				{
-					foreach ($aLevel['levels'] as $aChildLevel)
-					{
-						// Checking if the sublevel if allowed
-						$oChildSearch = DBSearch::FromOQL($aChildLevel['oql']);
-						if (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oChildSearch->GetClass()))
-						{
-							// Adding the sublevel to this one
-							$aLevelsProperties[$sCurrentLevelAlias]['levels'][] = $sCurrentLevelAlias . static::LEVEL_SEPARATOR . $aChildLevel['id'];
-
-							// Adding drilldown action if necessary
-							foreach ($aLevel['actions'] as $sId => $aAction)
-							{
-								if ($aAction['type'] === BrowseBrick::ENUM_ACTION_DRILLDOWN)
-								{
-									$aLevelsProperties[$sCurrentLevelAlias]['actions'][$sId] = $aAction;
-									break;
-								}
-							}
-						}
-						unset($oChildSearch);
-					}
-					static::TreeToFlatLevelsProperties($oApp, $aLevel['levels'], $aLevelsProperties, $sCurrentLevelAlias);
-				}
-
-				// Adding actions to the level
-				foreach ($aLevel['actions'] as $sId => $aAction)
-				{
-					// ... Only if it's not already there (eg. the drilldown added with the sublevels)
-					if (!array_key_exists($sId, $aLevelsProperties[$sCurrentLevelAlias]['actions']))
-					{
-						// Adding action only if allowed
-						if (($aAction['type'] === BrowseBrick::ENUM_ACTION_VIEW) && !SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oSearch->GetClass()))
-						{
-							continue;
-						}
-						elseif (($aAction['type'] === BrowseBrick::ENUM_ACTION_EDIT) && !SecurityHelper::IsActionAllowed($oApp, UR_ACTION_MODIFY, $oSearch->GetClass()))
-						{
-							continue;
-						}
-						elseif ($aAction['type'] === BrowseBrick::ENUM_ACTION_DRILLDOWN)
-						{
-							continue;
-						}
-
-						// Setting action title
-						if (isset($aAction['title']))
-						{
-							// Note : There could be an enhancement here, by checking if the string code has the '%1' needle and use Dict::S or Dict::Format accordingly.
-							// But it would require to benchmark a potential performance drop as it will be done for all items
-							$aAction['title'] = Dict::S($aAction['title']);
-						}
-						else
-						{
-							switch ($aAction['type'])
-							{
-								case BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS:
-									// We can only make translate a dictionnary entry with a class placeholder when the action has a class tag. if it has a factory method, we don't know yet what class is going to be created
-									if ($aAction['factory']['type'] === BrowseBrick::ENUM_FACTORY_TYPE_CLASS)
-									{
-										$aAction['title'] = Dict::Format('Brick:Portal:Browse:Action:CreateObjectFromThis', MetaModel::GetName($aAction['factory']['value']));
-										$aAction['url'] = $oApp['url_generator']->generate('p_object_create', array('sObjectClass' => $aAction['factory']['value']));
-									}
-									else
-									{
-										$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:Create');
-									}
-									break;
-								case BrowseBrick::ENUM_ACTION_VIEW:
-									$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:View');
-									break;
-								case BrowseBrick::ENUM_ACTION_EDIT:
-									$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:Edit');
-									break;
-								case BrowseBrick::ENUM_ACTION_DRILLDOWN:
-									$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:Drilldown');
-									break;
-							}
-						}
-
-						// Setting action icon class
-						if (!isset($aAction['icon_class']))
-						{
-							switch ($aAction['type'])
-							{
-								case BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS:
-									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_CREATE_FROM_THIS;
-									break;
-								case BrowseBrick::ENUM_ACTION_VIEW:
-									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_VIEW;
-									break;
-								case BrowseBrick::ENUM_ACTION_EDIT:
-									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_EDIT;
-									break;
-								case BrowseBrick::ENUM_ACTION_DRILLDOWN:
-									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_DRILLDOWN;
-									break;
-							}
-						}
-
-						// Setting action url
-						switch ($aAction['type'])
-						{
-							case BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS:
-								if ($aAction['factory']['type'] === BrowseBrick::ENUM_FACTORY_TYPE_CLASS)
-								{
-									$aAction['url'] = $oApp['url_generator']->generate('p_object_create', array('sObjectClass' => $aAction['factory']['value']));
-								}
-								else
-								{
-									$aAction['url'] = $oApp['url_generator']->generate('p_object_create_from_factory', array('sEncodedMethodName' => base64_encode($aAction['factory']['value']), 'sObjectClass' => '-objectClass-', 'sObjectId' => '-objectId-'));
-								}
-								break;
-						}
-
-						$aLevelsProperties[$sCurrentLevelAlias]['actions'][$sId] = $aAction;
-					}
-				}
-			}
-		}
-	}
-
-    /**
-     * Prepares the action rules for an array of DBObject items.
-     *
-     * @param array $aItems
-     * @param string $sLevelsAlias
-     * @param array $aLevelsProperties
-     * @return array
-     */
-	public static function PrepareActionRulesForItems(array $aItems, $sLevelsAlias, array &$aLevelsProperties)
-    {
-        $aActionRules = array();
-
-        foreach ($aLevelsProperties[$sLevelsAlias]['actions'] as $sId => $aAction)
-        {
-            $aActionRules[$sId] = ContextManipulatorHelper::PrepareAndEncodeRulesToken($aAction['rules'], $aItems);
-        }
-
-        return $aActionRules;
-    }
-
-	/**
-	 * Takes $aCurrentRow as a flat array and transform it in another flat array (not objects) with only the necessary informations
-	 *
-	 * eg:
-	 * - $aCurrentRow : array('L-1' => ObjectClass1, 'L-1-1' => ObjectClass2, 'L-1-1-1' => ObjectClass3)
-	 * - $aRow will be : array(
-	 * 	  'L1' => array(
-	 * 		  'name' => 'Object class 1 name'
-	 * 	  ),
-	 * 	  'L1-1' => array(
-	 * 		  'name' => 'Object class 2 name',
-	 * 	  ),
-	 * 	  'L1-1-1' => array(
-	 * 		  'name' => 'Object class 3 name',
-	 * 	  ),
-	 * 	  ...
-	 *  )
-	 *
-	 * @param array $aCurrentRow
-	 * @param array $aLevelsProperties
-	 * @return array
-	 */
-	public static function AddToFlatItems(array $aCurrentRow, array &$aLevelsProperties, Application $oApp)
-	{
-		$aRow = array();
-
-		foreach ($aCurrentRow as $key => $value)
-		{
-		    // Retrieving objects from all levels
-		    $aItems = array_values($aCurrentRow);
-
-			$aRow[$key] = array(
-				'level_alias' => $key,
-				'id' => $value->GetKey(),
-				'name' => $value->Get($aLevelsProperties[$key]['name_att']),
-				'class' => get_class($value),
-				'action_rules_token' => static::PrepareActionRulesForItems($aItems, $key, $aLevelsProperties)
-			);
-
-			// Adding optional attributes if necessary
-            foreach(static::$aOptionalAttributes as $sOptionalAttribute)
-            {
-                if ($aLevelsProperties[$key][$sOptionalAttribute] !== null)
-                {
-                    $sPropertyName = substr($sOptionalAttribute, 0, -4);
-                    $oAttDef = MetaModel::GetAttributeDef(get_class($value), $aLevelsProperties[$key][$sOptionalAttribute]);
-
-                    $tmpAttValue = $value->GetAsHTML($aLevelsProperties[$key][$sOptionalAttribute]);
-                    if($sOptionalAttribute === 'image_att')
-                    {
-                        if (is_object($tmpAttValue) && !$tmpAttValue->IsEmpty())
-                        {
-                            $tmpAttValue = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($value), 'sObjectId' => $value->GetKey(), 'sObjectField' => $aLevelsProperties[$key][$sOptionalAttribute], 'cache' => 86400));
-                        }
-                        else
-                        {
-                            $tmpAttValue = $oAttDef->Get('default_image');
-                        }
-                    }
-
-                    $aRow[$key][$sPropertyName] = $tmpAttValue;
-                }
-            }
-			// Adding fields attributes if necessary
-			if (!empty($aLevelsProperties[$key]['fields']))
-			{
-				$aRow[$key]['fields'] = array();
-				foreach ($aLevelsProperties[$key]['fields'] as $aField)
-				{
-					$oAttDef = MetaModel::GetAttributeDef(get_class($value), $aField['code']);
-					$aRow[$key]['fields'][$aField['code']] = $oAttDef->GetAsHTML($value->Get($aField['code']));
-				}
-			}
-		}
-
-		return $aRow;
-	}
-
-	/**
-	 * Takes $aCurrentRow as a flat array to recursvily convert and insert it into a tree array $aItems.
-	 * This is used to build a tree array from a DBObjectSet retrieved with FetchAssoc().
-	 *
-	 * eg:
-	 * - $aCurrentRow : array('L-1' => ObjectClass1, 'L-1-1' => ObjectClass2, 'L-1-1-1' => ObjectClass3)
-	 * - $aItems will be : array(
-	 * 	  'L1' =>
-	 * 		  'name' => 'Object class 1 name',
-	 * 		  'subitems' => array(
-	 * 			  'L1-1' => array(
-	 * 				  'name' => 'Object class 2 name',
-	 * 				  'subitems' => array(
-	 * 					  'L1-1-1' => array(
-	 * 						  'name' => 'Object class 3 name',
-	 * 						  'subitems' => array()
-	 * 					  ),
-	 * 					  ...
-	 * 				  )
-	 * 			  ),
-	 * 			  ...
-	 * 		  )
-	 * 	  ),
-	 * 	  ...
-	 *  )
-	 *
-	 * @param array &$aItems Reference to the array to be built
-	 * @param array $aCurrentRow
-	 * @param array $aLevelsProperties
-	 */
-	public static function AddToTreeItems(array &$aItems, array $aCurrentRow, array &$aLevelsProperties, $aCurrentRowObjects = null, Application $oApp = null)
-	{
-		$aCurrentRowKeys = array_keys($aCurrentRow);
-		$aCurrentRowValues = array_values($aCurrentRow);
-		$sCurrentIndex = $aCurrentRowKeys[0] . '::' . $aCurrentRowValues[0]->GetKey();
-
-		// We make sure to keep all row objects through levels by copying them when processing the first level.
-        // Otherwise they will be sliced through levels, one by one.
-		if($aCurrentRowObjects === null)
-        {
-            $aCurrentRowObjects = $aCurrentRowValues;
-        }
-
-		if (!isset($aItems[$sCurrentIndex]))
-		{
-			$aItems[$sCurrentIndex] = array(
-				'level_alias' => $aCurrentRowKeys[0],
-				'id' => $aCurrentRowValues[0]->GetKey(),
-				'name' => $aCurrentRowValues[0]->Get($aLevelsProperties[$aCurrentRowKeys[0]]['name_att']),
-				'class' => get_class($aCurrentRowValues[0]),
-				'subitems' => array(),
-				'action_rules_token' => static::PrepareActionRulesForItems($aCurrentRowObjects, $aCurrentRowKeys[0], $aLevelsProperties)
-			);
-
-            // Adding optional attributes if necessary
-            foreach(static::$aOptionalAttributes as $sOptionalAttribute)
-            {
-                if ($aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute] !== null)
-                {
-                    $sPropertyName = substr($sOptionalAttribute, 0, -4);
-                    $oAttDef = MetaModel::GetAttributeDef(get_class($aCurrentRowValues[0]), $aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute]);
-
-                    $tmpAttValue = $aCurrentRowValues[0]->GetAsHTML($aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute]);
-                    if($sOptionalAttribute === 'image_att')
-                    {
-                        if (is_object($tmpAttValue) && !$tmpAttValue->IsEmpty())
-                        {
-                            $tmpAttValue = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($aCurrentRowValues[0]), 'sObjectId' => $aCurrentRowValues[0]->GetKey(), 'sObjectField' => $aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute], 'cache' => 86400));
-                        }
-                        else
-                        {
-                            $tmpAttValue = $oAttDef->Get('default_image');
-                        }
-                    }
-
-                    $aItems[$sCurrentIndex][$sPropertyName] = $tmpAttValue;
-                }
-            }
-		}
-
-		$aCurrentRowSliced = array_slice($aCurrentRow, 1);
-		if (!empty($aCurrentRowSliced))
-		{
-			static::AddToTreeItems($aItems[$sCurrentIndex]['subitems'], $aCurrentRowSliced, $aLevelsProperties, $aCurrentRowObjects, $oApp);
-		}
-	}
-
-}
+<?php
+
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use UserRights;
+use Dict;
+use MetaModel;
+use DBSearch;
+use DBObjectSet;
+use BinaryExpression;
+use FieldExpression;
+use VariableExpression;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
+use Combodo\iTop\Portal\Brick\AbstractBrick;
+use Combodo\iTop\Portal\Brick\BrowseBrick;
+
+class BrowseBrickController extends BrickController
+{
+	const LEVEL_SEPARATOR = '-';
+	public static $aOptionalAttributes = array('tooltip_att', 'description_att', 'image_att');
+
+	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sBrowseMode = null, $sDataLoading = null)
+	{
+        /** @var \Combodo\iTop\Portal\Brick\BrowseBrick $oBrick */
+        $oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+
+		// Getting availables browse modes
+		$aBrowseModes = $oBrick->GetAvailablesBrowseModes();
+		$aBrowseButtons = array_keys($aBrowseModes);
+		// Getting current browse mode (First from router pamater, then default brick value)
+		$sBrowseMode = (!empty($sBrowseMode)) ? $sBrowseMode : $oBrick->GetDefaultBrowseMode();
+		// Getting current dataloading mode (First from router parameter, then query parameter, then default brick value)
+		$sDataLoading = ($sDataLoading !== null) ? $sDataLoading : $oApp['request_manipulator']->ReadParam('sDataLoading', $oBrick->GetDataLoading());
+		// Getting search value
+		$sSearchValue = $oApp['request_manipulator']->ReadParam('sSearchValue', '');
+		if (!empty($sSearchValue))
+		{
+			$sDataLoading = AbstractBrick::ENUM_DATA_LOADING_LAZY;
+		}
+
+		$aData = array();
+		$aLevelsProperties = array();
+		$aLevelsClasses = array();
+		static::TreeToFlatLevelsProperties($oApp, $oBrick->GetLevels(), $aLevelsProperties);
+
+		// Concistency checks
+		if (!in_array($sBrowseMode, array_keys($aBrowseModes)))
+		{
+			$oApp->abort(500, 'Browse brick "' . $sBrickId . '" : Unknown browse mode "' . $sBrowseMode . '", availables are ' . implode(' / ', array_keys($aBrowseModes)));
+		}
+		if (empty($aLevelsProperties))
+		{
+			$oApp->abort(500, 'Browse brick "' . $sBrickId . '" : No levels to display.');
+		}
+
+		// Building DBobjectSearch
+		$oQuery = null;
+		// ... In this case only we have to build a specific query for the current level only
+		if (in_array($sBrowseMode, array(BrowseBrick::ENUM_BROWSE_MODE_TREE, BrowseBrick::ENUM_BROWSE_MODE_MOSAIC)) && ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY))
+		{
+			// Will be handled later in the pagination part
+		}
+		// .. Otherwise
+		else
+		{
+			// We iterate (in reverse mode /!\) over the levels to build the whole query, starting from the bottom
+			$aLevelsPropertiesKeys = array_keys($aLevelsProperties);
+			$iLoopMax = count($aLevelsPropertiesKeys) - 1;
+			$oFullBinExpr = null;
+			for ($i = $iLoopMax; $i >= 0; $i--)
+			{
+				// Retrieving class alias for all depth
+				array_unshift($aLevelsClasses, $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->GetClassAlias());
+
+				// Joining queries from bottom-up
+				if ($i < $iLoopMax)
+				{
+					$aRealiasingMap = array();
+					$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search'] = $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->Join($aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['search'], DBSearch::JOIN_REFERENCED_BY, $aLevelsProperties[$aLevelsPropertiesKeys[$i + 1]]['parent_att'], TREE_OPERATOR_EQUALS, $aRealiasingMap);
+					foreach ($aLevelsPropertiesKeys as $sLevelAlias)
+					{
+						if (array_key_exists($sLevelAlias, $aRealiasingMap))
+						{
+							$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->RenameAlias($aRealiasingMap[$sLevelAlias], $sLevelAlias);
+						}
+					}
+				}
+
+				// Adding search clause
+				// Note : For know the search is naive and looks only for the exact match. It doesn't search for words separately
+				if (!empty($sSearchValue))
+				{
+					// - Cleaning the search value by exploding and trimming spaces
+					$aSearchValues = explode(' ', $sSearchValue);
+					array_walk($aSearchValues, function(&$sSearchValue, $sKey)
+					{
+						trim($sSearchValue);
+					});
+
+					// - Retrieving fields to search
+					$aSearchFields = array($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['name_att']);
+					if (!empty($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['fields']))
+					{
+						foreach ($aLevelsProperties[$aLevelsPropertiesKeys[$i]]['fields'] as $aTmpField)
+						{
+							$aSearchFields[] = $aTmpField['code'];
+						}
+					}
+					// - Building query for the search values parts
+					$oLevelBinExpr = null;
+					$iFieldLoopMax = count($aSearchFields) - 1;
+					$iSearchLoopMax = count($aSearchValues) - 1;
+					for ($j = 0; $j <= $iFieldLoopMax; $j++)
+					{
+						$sTmpFieldAttCode = $aSearchFields[$j];
+						$oFieldBinExpr = null;
+						//$oFieldBinExpr = new BinaryExpression(new FieldExpression($aSearchFields[$j], $aLevelsPropertiesKeys[$i]), )
+
+						for ($k = 0; $k <= $iSearchLoopMax; $k++)
+						{
+							$oSearchBinExpr = new BinaryExpression(new FieldExpression($sTmpFieldAttCode, $aLevelsPropertiesKeys[$i]), 'LIKE', new VariableExpression('search_value_' . $k));
+							if ($k === 0)
+							{
+								$oFieldBinExpr = $oSearchBinExpr;
+							}
+							else
+							{
+								$oFieldBinExpr = new BinaryExpression($oFieldBinExpr, 'AND', $oSearchBinExpr);
+							}
+						}
+
+						if ($j === 0)
+						{
+							$oLevelBinExpr = $oFieldBinExpr;
+						}
+						else
+						{
+							$oLevelBinExpr = new BinaryExpression($oLevelBinExpr, 'OR', $oFieldBinExpr);
+						}
+					}
+
+					// - Building query for the level
+					if ($i === $iLoopMax)
+					{
+						$oFullBinExpr = $oLevelBinExpr;
+					}
+					else
+					{
+						$oFullBinExpr = new BinaryExpression($oFullBinExpr, 'OR', $oLevelBinExpr);
+					}
+
+					// - Adding it to the query when complete
+					if ($i === 0)
+					{
+						$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->AddConditionExpression($oFullBinExpr);
+					}
+				}
+
+				// Setting selected classes and binding parameters
+				if ($i === 0)
+				{
+					$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->SetSelectedClasses($aLevelsClasses);
+
+					if (!empty($sSearchValue))
+					{
+						// Note : This could be way more simpler if we had a SetInternalParam($sParam, $value) verb
+						$aQueryParams = $aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->GetInternalParams();
+						// Note : $iSearchloopMax was initialized on the previous loop
+						for ($j = 0; $j <= $iSearchLoopMax; $j++)
+						{
+							$aQueryParams['search_value_' . $j] = '%' . $aSearchValues[$j] . '%';
+						}
+						$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->SetInternalParams($aQueryParams);
+					}
+				}
+			}
+			$oQuery = $aLevelsProperties[$aLevelsPropertiesKeys[0]]['search'];
+
+			// Testing appropriate data loading mode if we are in auto
+			if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_AUTO)
+			{
+				// - Check how many records there is.
+				// - Update $sDataLoading with its new value regarding the number of record and the threshold
+				$oCountSet = new DBObjectSet($oQuery);
+				$fThreshold = (float) MetaModel::GetModuleSetting($oApp['combodo.portal.instance.id'], 'lazy_loading_threshold');
+				$sDataLoading = ($oCountSet->Count() > $fThreshold) ? AbstractBrick::ENUM_DATA_LOADING_LAZY : AbstractBrick::ENUM_DATA_LOADING_FULL;
+				unset($oCountSet);
+			}
+		}
+
+		// Setting query pagination if needed
+		if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY)
+		{
+			switch ($sBrowseMode)
+			{
+				case BrowseBrick::ENUM_BROWSE_MODE_LIST:
+					// Retrieving parameters
+					$iPageNumber = (int) $oApp['request_manipulator']->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT);
+					$iListLength = (int) $oApp['request_manipulator']->ReadParam('iListLength', BrowseBrick::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT);
+
+					// Getting total records number
+					$oCountSet = new DBObjectSet($oQuery);
+					$aData['recordsTotal'] = $oCountSet->Count();
+					$aData['recordsFiltered'] = $oCountSet->Count();
+					unset($oCountSet);
+
+					$oSet = new DBObjectSet($oQuery);
+					$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
+
+					break;
+				case BrowseBrick::ENUM_BROWSE_MODE_TREE:
+                case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC:
+					// Retrieving parameters
+					$sLevelAlias = $oApp['request_manipulator']->ReadParam('sLevelAlias', '');
+					$sNodeId = $oApp['request_manipulator']->ReadParam('sNodeId', '');
+
+					// If no values for those parameters, we might be loading page in lazy mode for the first time, therefore the URL doesn't have those informations.
+					if (empty($sLevelAlias))
+					{
+						reset($aLevelsProperties);
+						$oQuery = $aLevelsProperties[key($aLevelsProperties)]['search'];
+						if (!empty($sNodeId))
+						{
+							$oQuery->AddCondition('id', $sNodeId);
+						}
+					}
+					// Else we need to find the OQL for that particular level
+					else
+					{
+						$bFoundLevel = false;
+						foreach ($aLevelsProperties as $aLevelProperties)
+						{
+							if ($aLevelProperties['alias'] === $sLevelAlias)
+							{
+								if (isset($aLevelProperties['levels']) && !empty($aLevelProperties['levels']) && isset($aLevelsProperties[$aLevelProperties['levels'][0]]))
+								{
+									$oQuery = $aLevelsProperties[$aLevelProperties['levels'][0]]['search'];
+									if (!empty($sNodeId))
+									{
+										$oQuery->AddCondition($aLevelsProperties[$aLevelProperties['levels'][0]]['parent_att'], $sNodeId);
+									}
+									$bFoundLevel = true;
+									break;
+								}
+							}
+						}
+
+						if (!$bFoundLevel)
+						{
+							$oApp->abort(500, 'Browse brick "' . $sBrickId . '" : Level alias "' . $sLevelAlias . '" is not defined for that brick.');
+						}
+					}
+
+					$oSet = new DBObjectSet($oQuery);
+					break;
+
+				default:
+					// We should never be there. If there is an other browse mode for that brick :
+					// - If it's from a custom brick extension, it should be handle by the extension router/controller
+					// - If it's from a base brick, it should be handle in a case above this one
+					// - If none of the previous statements was done, this fail safe will load all data as it's not able to know how to handle the pagination
+					$oSet = new DBObjectSet($oQuery);
+					break;
+			}
+		}
+		else
+		{
+			$oSet = new DBObjectSet($oQuery);
+		}
+
+		// Optimizing the ObjectSet to retrieve only necessary columns
+		$aColumnAttrs = array();
+		foreach ($oSet->GetFilter()->GetSelectedClasses() as $sTmpClassAlias => $sTmpClassName)
+		{
+			if (isset($aLevelsProperties[$sTmpClassAlias]))
+			{
+				$aTmpLevelProperties = $aLevelsProperties[$sTmpClassAlias];
+				// Mandatory main attribute
+				$aTmpColumnAttrs = array($aTmpLevelProperties['name_att']);
+				// Optional attributes, only if in list mode
+				if ($sBrowseMode === BrowseBrick::ENUM_BROWSE_MODE_LIST)
+				{
+					foreach ($aTmpLevelProperties['fields'] as $aTmpField)
+					{
+						$aTmpColumnAttrs[] = $aTmpField['code'];
+					}
+				}
+                // Optional attributes
+                foreach(static::$aOptionalAttributes as $sOptionalAttribute)
+                {
+                    if($aTmpLevelProperties[$sOptionalAttribute] !== null)
+                    {
+                        $aTmpColumnAttrs[] = $aTmpLevelProperties[$sOptionalAttribute];
+                    }
+                }
+
+				$aColumnAttrs[$sTmpClassAlias] = $aTmpColumnAttrs;
+			}
+		}
+		$oSet->OptimizeColumnLoad($aColumnAttrs);
+
+		// Sorting objects through defined order (in DM)
+		$oSet->SetOrderByClasses();
+
+		// Retrieving results and organizing them for templating
+		$aItems = array();
+		while ($aCurrentRow = $oSet->FetchAssoc())
+		{
+			switch ($sBrowseMode)
+			{
+				case BrowseBrick::ENUM_BROWSE_MODE_TREE:
+                case BrowseBrick::ENUM_BROWSE_MODE_MOSAIC:
+					static::AddToTreeItems($aItems, $aCurrentRow, $aLevelsProperties, null, $oApp);
+					break;
+
+				case BrowseBrick::ENUM_BROWSE_MODE_LIST:
+				default:
+					$aItems[] = static::AddToFlatItems($aCurrentRow, $aLevelsProperties, $oApp);
+					break;
+			}
+		}
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			$aData = $aData + array(
+				'data' => $aItems,
+				'levelsProperties' => $aLevelsProperties
+			);
+			$oResponse = $oApp->json($aData);
+		}
+		else
+		{
+			$aData = $aData + array(
+				'oBrick' => $oBrick,
+				'sBrickId' => $sBrickId,
+				'sBrowseMode' => $sBrowseMode,
+				'aBrowseButtons' => $aBrowseButtons,
+				'sSearchValue' => $sSearchValue,
+				'sDataLoading' => $sDataLoading,
+				'aItems' => json_encode($aItems),
+				'iItemsCount' => count($aItems),
+				'aLevelsProperties' => json_encode($aLevelsProperties)
+			);
+
+			// Note : To extend this brick's template, depending on what you want to do :
+			// a) Modify the whole template :
+			//	 - Create a template and specify it in the brick configuration
+			// b) Add a new browse mode :
+			//	 - Create a template for that browse mode,
+			//	 - Add the mode to those availables in the brick configuration,
+			//	 - Create a router and add a route for the new browse mode
+			if ($oBrick->GetPageTemplatePath() !== null)
+			{
+				$sTemplatePath = $oBrick->GetPageTemplatePath();
+			}
+			else
+			{
+				$sTemplatePath = $aBrowseModes[$sBrowseMode]['template'];
+			}
+			$oResponse = $oApp['twig']->render($sTemplatePath, $aData);
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Flattens the $aLevels into $aLevelsProperties in order to be able to build an OQL query from multiple single queries related to each others.
+	 * As of now it only keeps search / parent_att / name_att properties.
+	 *
+	 * Note : This is not in the BrowseBrick class because the classes should not rely on DBObjectSearch.
+	 *
+	 * @param \Silex\Application $oApp
+	 * @param array $aLevels Levels from a BrowseBrick class
+	 * @param array $aLevelsProperties Reference to an array that will contain the flattened levels
+	 * @param string $sLevelAliasPrefix String that will be prefixed to the level ID as an unique path identifier
+	 */
+	public static function TreeToFlatLevelsProperties(Application $oApp, array $aLevels, array &$aLevelsProperties, $sLevelAliasPrefix = 'L')
+	{
+		foreach ($aLevels as $aLevel)
+		{
+			$sCurrentLevelAlias = $sLevelAliasPrefix . static::LEVEL_SEPARATOR . $aLevel['id'];
+			$oSearch = DBSearch::CloneWithAlias(DBSearch::FromOQL($aLevel['oql']), $sCurrentLevelAlias);
+
+			// Restricting to the allowed scope
+			$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oSearch->GetClass(), UR_ACTION_READ);
+			$oSearch = ($oScopeSearch !== null) ? $oSearch->Intersect($oScopeSearch) : null;
+			// - Allowing all data if necessary
+			if ($oScopeSearch !== null && $oScopeSearch->IsAllDataAllowed())
+			{
+				$oSearch->AllowAllData();
+			}
+
+			if ($oSearch !== null)
+			{
+				$aLevelsProperties[$sCurrentLevelAlias] = array(
+					'alias' => $sCurrentLevelAlias,
+					'title' => ($aLevel['title'] !== null) ? Dict::S($aLevel['title']) : MetaModel::GetName($oSearch->GetClass()),
+					'parent_att' => $aLevel['parent_att'],
+					'name_att' => $aLevel['name_att'],
+                    'tooltip_att' => $aLevel['tooltip_att'],
+                    'description_att' => $aLevel['description_att'],
+                    'image_att' => $aLevel['image_att'],
+					'search' => $oSearch,
+					'fields' => array(),
+					'actions' => array()
+				);
+
+				// Adding current level's fields
+				if (isset($aLevel['fields']))
+				{
+					$aLevelsProperties[$sCurrentLevelAlias]['fields'] = array();
+
+					foreach ($aLevel['fields'] as $sFieldAttCode => $aFieldProperties)
+					{
+						$aLevelsProperties[$sCurrentLevelAlias]['fields'][] = array(
+							'code' => $sFieldAttCode,
+							'label' => MetaModel::GetAttributeDef($oSearch->GetClass(), $sFieldAttCode)->GetLabel(),
+							'hidden' => $aFieldProperties['hidden']
+						);
+					}
+				}
+
+				// Flattening and adding sublevels
+				if (isset($aLevel['levels']))
+				{
+					foreach ($aLevel['levels'] as $aChildLevel)
+					{
+						// Checking if the sublevel if allowed
+						$oChildSearch = DBSearch::FromOQL($aChildLevel['oql']);
+						if (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oChildSearch->GetClass()))
+						{
+							// Adding the sublevel to this one
+							$aLevelsProperties[$sCurrentLevelAlias]['levels'][] = $sCurrentLevelAlias . static::LEVEL_SEPARATOR . $aChildLevel['id'];
+
+							// Adding drilldown action if necessary
+							foreach ($aLevel['actions'] as $sId => $aAction)
+							{
+								if ($aAction['type'] === BrowseBrick::ENUM_ACTION_DRILLDOWN)
+								{
+									$aLevelsProperties[$sCurrentLevelAlias]['actions'][$sId] = $aAction;
+									break;
+								}
+							}
+						}
+						unset($oChildSearch);
+					}
+					static::TreeToFlatLevelsProperties($oApp, $aLevel['levels'], $aLevelsProperties, $sCurrentLevelAlias);
+				}
+
+				// Adding actions to the level
+				foreach ($aLevel['actions'] as $sId => $aAction)
+				{
+					// ... Only if it's not already there (eg. the drilldown added with the sublevels)
+					if (!array_key_exists($sId, $aLevelsProperties[$sCurrentLevelAlias]['actions']))
+					{
+						// Adding action only if allowed
+						if (($aAction['type'] === BrowseBrick::ENUM_ACTION_VIEW) && !SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oSearch->GetClass()))
+						{
+							continue;
+						}
+						elseif (($aAction['type'] === BrowseBrick::ENUM_ACTION_EDIT) && !SecurityHelper::IsActionAllowed($oApp, UR_ACTION_MODIFY, $oSearch->GetClass()))
+						{
+							continue;
+						}
+						elseif ($aAction['type'] === BrowseBrick::ENUM_ACTION_DRILLDOWN)
+						{
+							continue;
+						}
+
+						// Setting action title
+						if (isset($aAction['title']))
+						{
+							// Note : There could be an enhancement here, by checking if the string code has the '%1' needle and use Dict::S or Dict::Format accordingly.
+							// But it would require to benchmark a potential performance drop as it will be done for all items
+							$aAction['title'] = Dict::S($aAction['title']);
+						}
+						else
+						{
+							switch ($aAction['type'])
+							{
+								case BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS:
+									// We can only make translate a dictionnary entry with a class placeholder when the action has a class tag. if it has a factory method, we don't know yet what class is going to be created
+									if ($aAction['factory']['type'] === BrowseBrick::ENUM_FACTORY_TYPE_CLASS)
+									{
+										$aAction['title'] = Dict::Format('Brick:Portal:Browse:Action:CreateObjectFromThis', MetaModel::GetName($aAction['factory']['value']));
+										$aAction['url'] = $oApp['url_generator']->generate('p_object_create', array('sObjectClass' => $aAction['factory']['value']));
+									}
+									else
+									{
+										$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:Create');
+									}
+									break;
+								case BrowseBrick::ENUM_ACTION_VIEW:
+									$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:View');
+									break;
+								case BrowseBrick::ENUM_ACTION_EDIT:
+									$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:Edit');
+									break;
+								case BrowseBrick::ENUM_ACTION_DRILLDOWN:
+									$aAction['title'] = Dict::S('Brick:Portal:Browse:Action:Drilldown');
+									break;
+							}
+						}
+
+						// Setting action icon class
+						if (!isset($aAction['icon_class']))
+						{
+							switch ($aAction['type'])
+							{
+								case BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS:
+									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_CREATE_FROM_THIS;
+									break;
+								case BrowseBrick::ENUM_ACTION_VIEW:
+									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_VIEW;
+									break;
+								case BrowseBrick::ENUM_ACTION_EDIT:
+									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_EDIT;
+									break;
+								case BrowseBrick::ENUM_ACTION_DRILLDOWN:
+									$aAction['icon_class'] = BrowseBrick::ENUM_ACTION_ICON_CLASS_DRILLDOWN;
+									break;
+							}
+						}
+
+						// Setting action url
+						switch ($aAction['type'])
+						{
+							case BrowseBrick::ENUM_ACTION_CREATE_FROM_THIS:
+								if ($aAction['factory']['type'] === BrowseBrick::ENUM_FACTORY_TYPE_CLASS)
+								{
+									$aAction['url'] = $oApp['url_generator']->generate('p_object_create', array('sObjectClass' => $aAction['factory']['value']));
+								}
+								else
+								{
+									$aAction['url'] = $oApp['url_generator']->generate('p_object_create_from_factory', array('sEncodedMethodName' => base64_encode($aAction['factory']['value']), 'sObjectClass' => '-objectClass-', 'sObjectId' => '-objectId-'));
+								}
+								break;
+						}
+
+						$aLevelsProperties[$sCurrentLevelAlias]['actions'][$sId] = $aAction;
+					}
+				}
+			}
+		}
+	}
+
+    /**
+     * Prepares the action rules for an array of DBObject items.
+     *
+     * @param array $aItems
+     * @param string $sLevelsAlias
+     * @param array $aLevelsProperties
+     * @return array
+     */
+	public static function PrepareActionRulesForItems(array $aItems, $sLevelsAlias, array &$aLevelsProperties)
+    {
+        $aActionRules = array();
+
+        foreach ($aLevelsProperties[$sLevelsAlias]['actions'] as $sId => $aAction)
+        {
+            $aActionRules[$sId] = ContextManipulatorHelper::PrepareAndEncodeRulesToken($aAction['rules'], $aItems);
+        }
+
+        return $aActionRules;
+    }
+
+	/**
+	 * Takes $aCurrentRow as a flat array and transform it in another flat array (not objects) with only the necessary informations
+	 *
+	 * eg:
+	 * - $aCurrentRow : array('L-1' => ObjectClass1, 'L-1-1' => ObjectClass2, 'L-1-1-1' => ObjectClass3)
+	 * - $aRow will be : array(
+	 * 	  'L1' => array(
+	 * 		  'name' => 'Object class 1 name'
+	 * 	  ),
+	 * 	  'L1-1' => array(
+	 * 		  'name' => 'Object class 2 name',
+	 * 	  ),
+	 * 	  'L1-1-1' => array(
+	 * 		  'name' => 'Object class 3 name',
+	 * 	  ),
+	 * 	  ...
+	 *  )
+	 *
+	 * @param array $aCurrentRow
+	 * @param array $aLevelsProperties
+	 * @return array
+	 */
+	public static function AddToFlatItems(array $aCurrentRow, array &$aLevelsProperties, Application $oApp)
+	{
+		$aRow = array();
+
+		foreach ($aCurrentRow as $key => $value)
+		{
+		    // Retrieving objects from all levels
+		    $aItems = array_values($aCurrentRow);
+
+			$aRow[$key] = array(
+				'level_alias' => $key,
+				'id' => $value->GetKey(),
+				'name' => $value->Get($aLevelsProperties[$key]['name_att']),
+				'class' => get_class($value),
+				'action_rules_token' => static::PrepareActionRulesForItems($aItems, $key, $aLevelsProperties)
+			);
+
+			// Adding optional attributes if necessary
+            foreach(static::$aOptionalAttributes as $sOptionalAttribute)
+            {
+                if ($aLevelsProperties[$key][$sOptionalAttribute] !== null)
+                {
+                    $sPropertyName = substr($sOptionalAttribute, 0, -4);
+                    $oAttDef = MetaModel::GetAttributeDef(get_class($value), $aLevelsProperties[$key][$sOptionalAttribute]);
+
+                    $tmpAttValue = $value->GetAsHTML($aLevelsProperties[$key][$sOptionalAttribute]);
+                    if($sOptionalAttribute === 'image_att')
+                    {
+                        if (is_object($tmpAttValue) && !$tmpAttValue->IsEmpty())
+                        {
+                            $tmpAttValue = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($value), 'sObjectId' => $value->GetKey(), 'sObjectField' => $aLevelsProperties[$key][$sOptionalAttribute], 'cache' => 86400));
+                        }
+                        else
+                        {
+                            $tmpAttValue = $oAttDef->Get('default_image');
+                        }
+                    }
+
+                    $aRow[$key][$sPropertyName] = $tmpAttValue;
+                }
+            }
+			// Adding fields attributes if necessary
+			if (!empty($aLevelsProperties[$key]['fields']))
+			{
+				$aRow[$key]['fields'] = array();
+				foreach ($aLevelsProperties[$key]['fields'] as $aField)
+				{
+					$oAttDef = MetaModel::GetAttributeDef(get_class($value), $aField['code']);
+					$aRow[$key]['fields'][$aField['code']] = $oAttDef->GetAsHTML($value->Get($aField['code']));
+				}
+			}
+		}
+
+		return $aRow;
+	}
+
+	/**
+	 * Takes $aCurrentRow as a flat array to recursvily convert and insert it into a tree array $aItems.
+	 * This is used to build a tree array from a DBObjectSet retrieved with FetchAssoc().
+	 *
+	 * eg:
+	 * - $aCurrentRow : array('L-1' => ObjectClass1, 'L-1-1' => ObjectClass2, 'L-1-1-1' => ObjectClass3)
+	 * - $aItems will be : array(
+	 * 	  'L1' =>
+	 * 		  'name' => 'Object class 1 name',
+	 * 		  'subitems' => array(
+	 * 			  'L1-1' => array(
+	 * 				  'name' => 'Object class 2 name',
+	 * 				  'subitems' => array(
+	 * 					  'L1-1-1' => array(
+	 * 						  'name' => 'Object class 3 name',
+	 * 						  'subitems' => array()
+	 * 					  ),
+	 * 					  ...
+	 * 				  )
+	 * 			  ),
+	 * 			  ...
+	 * 		  )
+	 * 	  ),
+	 * 	  ...
+	 *  )
+	 *
+	 * @param array &$aItems Reference to the array to be built
+	 * @param array $aCurrentRow
+	 * @param array $aLevelsProperties
+	 */
+	public static function AddToTreeItems(array &$aItems, array $aCurrentRow, array &$aLevelsProperties, $aCurrentRowObjects = null, Application $oApp = null)
+	{
+		$aCurrentRowKeys = array_keys($aCurrentRow);
+		$aCurrentRowValues = array_values($aCurrentRow);
+		$sCurrentIndex = $aCurrentRowKeys[0] . '::' . $aCurrentRowValues[0]->GetKey();
+
+		// We make sure to keep all row objects through levels by copying them when processing the first level.
+        // Otherwise they will be sliced through levels, one by one.
+		if($aCurrentRowObjects === null)
+        {
+            $aCurrentRowObjects = $aCurrentRowValues;
+        }
+
+		if (!isset($aItems[$sCurrentIndex]))
+		{
+			$aItems[$sCurrentIndex] = array(
+				'level_alias' => $aCurrentRowKeys[0],
+				'id' => $aCurrentRowValues[0]->GetKey(),
+				'name' => $aCurrentRowValues[0]->Get($aLevelsProperties[$aCurrentRowKeys[0]]['name_att']),
+				'class' => get_class($aCurrentRowValues[0]),
+				'subitems' => array(),
+				'action_rules_token' => static::PrepareActionRulesForItems($aCurrentRowObjects, $aCurrentRowKeys[0], $aLevelsProperties)
+			);
+
+            // Adding optional attributes if necessary
+            foreach(static::$aOptionalAttributes as $sOptionalAttribute)
+            {
+                if ($aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute] !== null)
+                {
+                    $sPropertyName = substr($sOptionalAttribute, 0, -4);
+                    $oAttDef = MetaModel::GetAttributeDef(get_class($aCurrentRowValues[0]), $aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute]);
+
+                    $tmpAttValue = $aCurrentRowValues[0]->GetAsHTML($aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute]);
+                    if($sOptionalAttribute === 'image_att')
+                    {
+                        if (is_object($tmpAttValue) && !$tmpAttValue->IsEmpty())
+                        {
+                            $tmpAttValue = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($aCurrentRowValues[0]), 'sObjectId' => $aCurrentRowValues[0]->GetKey(), 'sObjectField' => $aLevelsProperties[$aCurrentRowKeys[0]][$sOptionalAttribute], 'cache' => 86400));
+                        }
+                        else
+                        {
+                            $tmpAttValue = $oAttDef->Get('default_image');
+                        }
+                    }
+
+                    $aItems[$sCurrentIndex][$sPropertyName] = $tmpAttValue;
+                }
+            }
+		}
+
+		$aCurrentRowSliced = array_slice($aCurrentRow, 1);
+		if (!empty($aCurrentRowSliced))
+		{
+			static::AddToTreeItems($aItems[$sCurrentIndex]['subitems'], $aCurrentRowSliced, $aLevelsProperties, $aCurrentRowObjects, $oApp);
+		}
+	}
+
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
index 8425a3738..f14f80f0a 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php
@@ -1,94 +1,94 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use MetaModel;
-use Combodo\iTop\Portal\Helper\ApplicationHelper;
-use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
-use Combodo\iTop\Portal\Helper\SecurityHelper;
-
-class CreateBrickController extends BrickController
-{
-
-	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId)
-	{
-		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-        $sObjectClass = $oBrick->GetClass();
-
-		$aRouteParams = array(
-			'sObjectClass' => $oBrick->GetClass()
-		);
-
-        // Checking for actions rules
-        $aRules = $oBrick->GetRules();
-        if (!empty($aRules))
-        {
-            $aRouteParams['ar_token'] = ContextManipulatorHelper::PrepareAndEncodeRulesToken($aRules);
-        }
-
-        // Checking if the target object class is asbtract or not
-        // - If is not abstract, we redirect to object creation form
-        if (!MetaModel::IsAbstract($sObjectClass))
-        {
-            // Preparing redirection route
-            // - Adding brick id to the params
-            $aRouteParams['sBrickId'] = $sBrickId;
-            // - Generating route
-            $sRedirectRoute = $oApp['url_generator']->generate('p_object_create', $aRouteParams);
-            // - Request
-            $oSubRequest = Request::create($sRedirectRoute, 'GET', $oRequest->query->all(), $oRequest->cookies->all(), array(), $oRequest->server->all());
-
-            $oResponse = $oApp->handle($oSubRequest, HttpKernelInterface::SUB_REQUEST, true);
-        }
-        // - Else, we list the leaf classes as an intermediate step
-        else
-        {
-            $aData = array(
-                'oBrick' => $oBrick,
-                'sBrickId' => $sBrickId,
-                'aLeafClasses' => array(),
-                'ar_token' => $aRouteParams['ar_token']
-            );
-
-            $aLeafClasses = array();
-            $aChildClasses = MetaModel::EnumChildClasses($sObjectClass);
-            foreach ($aChildClasses as $sChildClass)
-            {
-                if (!MetaModel::IsAbstract($sChildClass) && SecurityHelper::IsActionAllowed($oApp, UR_ACTION_CREATE, $sChildClass))
-                {
-                    $aLeafClasses[] = array(
-                        'id' => $sChildClass,
-                        'name' => MetaModel::GetName($sChildClass)
-                    );
-                }
-            }
-            $aData['aLeafClasses'] = $aLeafClasses;
-
-            $oResponse = $oApp['twig']->render($oBrick->GetPageTemplatePath(), $aData);
-        }
-
-        return $oResponse;
-	}
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use MetaModel;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+
+class CreateBrickController extends BrickController
+{
+
+	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId)
+	{
+		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+        $sObjectClass = $oBrick->GetClass();
+
+		$aRouteParams = array(
+			'sObjectClass' => $oBrick->GetClass()
+		);
+
+        // Checking for actions rules
+        $aRules = $oBrick->GetRules();
+        if (!empty($aRules))
+        {
+            $aRouteParams['ar_token'] = ContextManipulatorHelper::PrepareAndEncodeRulesToken($aRules);
+        }
+
+        // Checking if the target object class is asbtract or not
+        // - If is not abstract, we redirect to object creation form
+        if (!MetaModel::IsAbstract($sObjectClass))
+        {
+            // Preparing redirection route
+            // - Adding brick id to the params
+            $aRouteParams['sBrickId'] = $sBrickId;
+            // - Generating route
+            $sRedirectRoute = $oApp['url_generator']->generate('p_object_create', $aRouteParams);
+            // - Request
+            $oSubRequest = Request::create($sRedirectRoute, 'GET', $oRequest->query->all(), $oRequest->cookies->all(), array(), $oRequest->server->all());
+
+            $oResponse = $oApp->handle($oSubRequest, HttpKernelInterface::SUB_REQUEST, true);
+        }
+        // - Else, we list the leaf classes as an intermediate step
+        else
+        {
+            $aData = array(
+                'oBrick' => $oBrick,
+                'sBrickId' => $sBrickId,
+                'aLeafClasses' => array(),
+                'ar_token' => $aRouteParams['ar_token']
+            );
+
+            $aLeafClasses = array();
+            $aChildClasses = MetaModel::EnumChildClasses($sObjectClass);
+            foreach ($aChildClasses as $sChildClass)
+            {
+                if (!MetaModel::IsAbstract($sChildClass) && SecurityHelper::IsActionAllowed($oApp, UR_ACTION_CREATE, $sChildClass))
+                {
+                    $aLeafClasses[] = array(
+                        'id' => $sChildClass,
+                        'name' => MetaModel::GetName($sChildClass)
+                    );
+                }
+            }
+            $aData['aLeafClasses'] = $aLeafClasses;
+
+            $oResponse = $oApp['twig']->render($oBrick->GetPageTemplatePath(), $aData);
+        }
+
+        return $oResponse;
+	}
+
+}
+
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
index f99f9e795..4d685a531 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php
@@ -1,62 +1,62 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use Combodo\iTop\Portal\Brick\PortalBrick;
-
-class DefaultController
-{
-
-	public function homeAction(Request $oRequest, Application $oApp)
-	{
-		$aData = array();
-
-		// Rendering tiles
-		$aData['aTilesRendering'] = array();
-		foreach($oApp['combodo.portal.instance.conf']['bricks'] as $oBrick)
-		{
-			// Doing it only for tile visible on home page to avoid unnecessary rendering
-			if (($oBrick->GetVisibleHome() === true) && ($oBrick->GetTileControllerAction() !== null))
-			{
-				$aControllerActionParts = explode('::', $oBrick->GetTileControllerAction());
-				if (count($aControllerActionParts) !== 2)
-				{
-					$oApp->abort(500, 'Tile controller action must be of form "\Namespace\ControllerClass::FunctionName" for brick "' . $oBrick->GetId() . '"');
-				}
-
-				$sControllerName = $aControllerActionParts[0];
-				$sControllerAction = $aControllerActionParts[1];
-
-				$oController = new $sControllerName($oRequest, $oApp, $oBrick->GetId());
-				$aData['aTilesRendering'][$oBrick->GetId()] = $oController->$sControllerAction($oRequest, $oApp, $oBrick->GetId());
-			}
-		}
-
-		// Home page template
-		$template = $oApp['combodo.portal.instance.conf']['properties']['templates']['home'];
-
-		return $oApp['twig']->render($template, $aData);
-	}
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Combodo\iTop\Portal\Brick\PortalBrick;
+
+class DefaultController
+{
+
+	public function homeAction(Request $oRequest, Application $oApp)
+	{
+		$aData = array();
+
+		// Rendering tiles
+		$aData['aTilesRendering'] = array();
+		foreach($oApp['combodo.portal.instance.conf']['bricks'] as $oBrick)
+		{
+			// Doing it only for tile visible on home page to avoid unnecessary rendering
+			if (($oBrick->GetVisibleHome() === true) && ($oBrick->GetTileControllerAction() !== null))
+			{
+				$aControllerActionParts = explode('::', $oBrick->GetTileControllerAction());
+				if (count($aControllerActionParts) !== 2)
+				{
+					$oApp->abort(500, 'Tile controller action must be of form "\Namespace\ControllerClass::FunctionName" for brick "' . $oBrick->GetId() . '"');
+				}
+
+				$sControllerName = $aControllerActionParts[0];
+				$sControllerAction = $aControllerActionParts[1];
+
+				$oController = new $sControllerName($oRequest, $oApp, $oBrick->GetId());
+				$aData['aTilesRendering'][$oBrick->GetId()] = $oController->$sControllerAction($oRequest, $oApp, $oBrick->GetId());
+			}
+		}
+
+		// Home page template
+		$template = $oApp['combodo.portal.instance.conf']['properties']['templates']['home'];
+
+		return $oApp['twig']->render($template, $aData);
+	}
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
index 99cd4174e..366c525b5 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php
@@ -1,946 +1,946 @@
-<?php
-
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Exception;
-use AttributeDate;
-use AttributeDateTime;
-use AttributeDefinition;
-use AttributeDuration;
-use AttributeSubItem;
-use BinaryExpression;
-use CMDBSource;
-use Combodo\iTop\Portal\Brick\AbstractBrick;
-use Combodo\iTop\Portal\Brick\ManageBrick;
-use Combodo\iTop\Portal\Helper\ApplicationHelper;
-use Combodo\iTop\Portal\Helper\SecurityHelper;
-use DBObject;
-use DBObjectSet;
-use DBSearch;
-use Dict;
-use FieldExpression;
-use iPopupMenuExtension;
-use JSButtonItem;
-use MetaModel;
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use UnaryExpression;
-use URLButtonItem;
-use UserRights;
-use VariableExpression;
-
-class ManageBrickController extends BrickController
-{
-	const EXCEL_EXPORT_TEMPLATE_PATH = 'itop-portal-base/portal/src/views/bricks/manage/popup-export-excel.html.twig';
-
-    /**
-     * @param Request $oRequest
-     * @param Application $oApp
-     * @param string $sBrickId
-     * @param string $sGroupingTab
-     * @param string $sDisplayMode
-     *
-     * @return Response
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     * @throws \DictExceptionMissingString
-     * @throws \MySQLException
-     * @throws \OQLException
-     */
-	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayMode = null)
-    {
-		/** @var ManageBrick $oBrick */
-		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-
-		if (is_null($sDisplayMode))
-		{
-			$sDisplayMode = $oBrick->GetDefaultDisplayMode();
-		}
-		$aDisplayParams = $oBrick->GetPresentationDataForTileMode($sDisplayMode);
-		$aData = $this->GetData($oRequest, $oApp, $sBrickId, $sGroupingTab, $oBrick::AreDetailsNeededForDisplayMode($sDisplayMode));
-
-		$aExportFields = $oBrick->GetExportFields();
-		$aData = $aData + array(
-				'sDisplayMode' => $sDisplayMode,
-				'bCanExport' => !empty($aExportFields),
-			);
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			$oResponse = $oApp->json($aData);
-		}
-		else
-		{
-			$sLayoutTemplate = $oBrick::GetPageTemplateFromDisplayMode($sDisplayMode);
-			$oResponse = $oApp['twig']->render($sLayoutTemplate, $aData);
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Method for the brick's tile on home page
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sBrickId
-	 *
-	 * @return Response
-	 */
-	public function TileAction(Request $oRequest, Application $oApp, $sBrickId)
-	{
-		/** @var ManageBrick $oBrick */
-		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-
-		try
-		{
-			$aData = $this->GetData($oRequest, $oApp, $sBrickId, null);
-		}
-		catch (Exception $e)
-		{
-			// TODO Default values
-			$aData = array();
-		}
-
-		return $oApp['twig']->render($oBrick->GetTileTemplatePath(), $aData);
-	}
-
-	/**
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sBrickId
-	 * @param string $sGroupingTab
-	 * @param string $sGroupingArea
-	 *
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 * @throws \Exception
-	 */
-	public function ExcelExportStartAction(
-		Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sGroupingArea
-	) {
-		/** @var ManageBrick $oBrick */
-		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-		$oQuery = DBSearch::FromOQL($oBrick->GetOql());
-		$sClass = $oQuery->GetClass();
-		$aData = $this->GetData($oRequest, $oApp, $sBrickId, $sGroupingTab, true);
-
-		if (isset($aData['aQueries']) && count($aData['aQueries']) === 1)
-		{
-			$aQueries = $aData['aQueries'];
-			reset($aQueries);
-			$sKey = key($aQueries);
-			$oSearch = $aData['aQueries'][$sKey];
-		}
-		else
-		{
-			$oQuery = DBSearch::FromOQL($oBrick->GetOql());
-			$sClass = $oQuery->GetClass();
-			/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
-			$oScopeHelper = $oApp['scope_validator'];
-			$oScopeHelper->AddScopeToQuery($oQuery, $sClass);
-			$aData = array();
-			$this->ManageSearchValue($oApp, $aData, $oQuery, $sClass);
-
-			// Grouping tab
-			if ($oBrick->HasGroupingTabs())
-			{
-				$aGroupingTabs = $oBrick->GetGroupingTabs();
-
-				// If tabs are made of the distinct values of an attribute, we have a find them via a query
-				if ($oBrick->IsGroupingTabsByDistinctValues())
-				{
-					$sGroupingTabAttCode = $aGroupingTabs['attribute'];
-					$aGroupingTabsValues = $this->GroupByAttribute($oQuery, $sGroupingTabAttCode, $oApp, $oBrick);
-					$oQuery = $oQuery->Intersect($aGroupingTabsValues[$sGroupingTab]['condition']);
-				}
-				else
-				{
-					foreach ($aGroupingTabs['groups'] as $aGroup)
-					{
-						if ($aGroup['id'] === $sGroupingTab)
-						{
-							$oConditionQuery = $oQuery->Intersect(DBSearch::FromOQL($aGroup['condition']));
-							$oQuery = $oQuery->Intersect($oConditionQuery);
-							break;
-						}
-					}
-				}
-			}
-
-			// Finalclass
-			$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GARE');
-			$oExpression = new BinaryExpression(new FieldExpression('finalclass', 'GARE'), '=',
-				new UnaryExpression($sGroupingArea));
-			$oConditionQuery->AddConditionExpression($oExpression);
-			/** @var DBSearch $oSearch */
-			$oSearch = $oQuery->Intersect($oConditionQuery);
-		}
-
-		$aColumnsAttrs = $oBrick->GetExportFields();
-		$aFields = array();
-		$sTitleAttrCode = 'friendlyname';
-		if (!in_array($sTitleAttrCode, $aColumnsAttrs))
-		{
-			$aFields[] = $sTitleAttrCode;
-		}
-		foreach ($aColumnsAttrs as $sAttCode)
-		{
-			$oAttributeDef = MetaModel::GetAttributeDef($sGroupingArea, $sAttCode);
-			if ($oAttributeDef->IsExternalKey(EXTKEY_ABSOLUTE))
-			{
-				$aFields[] = $sAttCode.'_friendlyname';
-			}
-			else
-			{
-				$aFields[] = $sAttCode;
-			}
-		}
-
-		$sFields = implode(',', $aFields);
-		$aData = array(
-			'oBrick' => $oBrick,
-			'sBrickId' => $sBrickId,
-			'sFields' => $sFields,
-			'sOQL' => $oSearch->ToOQL(),
-		);
-
-		return $oApp['twig']->render(static::EXCEL_EXPORT_TEMPLATE_PATH, $aData);
-	}
-
-
-	/**
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sBrickId
-	 * @param string $sGroupingTab
-	 * @param bool $bNeedDetails
-	 *
-	 * @return array
-	 * @throws \CoreException
-	 * @throws \DictExceptionMissingString
-	 * @throws \Exception
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	public function GetData(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $bNeedDetails = false)
-	{
-		/** @var ManageBrick $oBrick */
-		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-
-		$aData = array();
-		$aGroupingTabsValues = array();
-		$aGroupingAreasValues = array();
-		$aQueries = array();
-		$bHasScope = true;
-
-		// Getting current dataloading mode (First from router parameter, then query parameter, then default brick value)
-		$sDataLoading = $oApp['request_manipulator']->ReadParam('sDataLoading', $oBrick->GetDataLoading());
-
-		// - Retrieving the grouping areas to display
-		$sGroupingArea = $oApp['request_manipulator']->ReadParam('sGroupingArea', '');
-		if (!empty($sGroupingArea))
-		{
-			$bNeedDetails = true;
-		}
-
-		// Getting area columns properties
-		$aColumnsAttrs = $oBrick->GetFields();
-		// Adding friendlyname attribute to the list if not already in it
-		$sTitleAttrCode = 'friendlyname';
-		if (($sTitleAttrCode !== null) && !in_array($sTitleAttrCode, $aColumnsAttrs))
-		{
-			$aColumnsAttrs = array_merge(array($sTitleAttrCode), $aColumnsAttrs);
-		}
-
-		// Starting to build query
-		$oQuery = DBSearch::FromOQL($oBrick->GetOql());
-		$sClass = $oQuery->GetClass();
-		$sIconURL = MetaModel::GetClassIcon($sClass, false);
-
-		// Preparing tabs
-		// - We need to retrieve distinct values for the grouping attribute
-		$iCount = 0;
-		if ($oBrick->HasGroupingTabs())
-		{
-			$aGroupingTabs = $oBrick->GetGroupingTabs();
-
-			// If tabs are made of the distinct values of an attribute, we have a find them via a query
-			if ($oBrick->IsGroupingTabsByDistinctValues())
-			{
-				$sGroupingTabAttCode = $aGroupingTabs['attribute'];
-				$aGroupingTabsValues = $this->GroupByAttribute($oQuery, $sGroupingTabAttCode, $oApp, $oBrick);
-				foreach ($aGroupingTabsValues as $aResult)
-				{
-					$iCount += $aResult['count'];
-				}
-			}
-			// Otherwise we create the tabs from the SQL expressions
-			else
-			{
-				foreach ($aGroupingTabs['groups'] as $aGroup)
-				{
-					$oConditionQuery = $oQuery->Intersect(DBSearch::FromOQL($aGroup['condition']));
-					// - Restricting query to scope
-
-					/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
-					$oScopeHelper = $oApp['scope_validator'];
-					$bHasScope = $oScopeHelper->AddScopeToQuery($oConditionQuery, $oConditionQuery->GetClass());
-					if ($bHasScope)
-					{
-						// - Building ObjectSet
-						$oConditionSet = new DBObjectSet($oConditionQuery);
-						$iGroupCount = $oConditionSet->Count();
-					}
-					else
-					{
-						$oConditionSet = null;
-						$iGroupCount = 0;
-					}
-					$aGroupingTabsValues[$aGroup['id']] = array(
-						'value' => $aGroup['id'],
-						'label' => Dict::S($aGroup['title']),
-						'label_html' => Dict::S($aGroup['title']),
-						'condition' => $oConditionQuery,
-						'count' => $iGroupCount,
-					);
-					$iCount += $iGroupCount;
-				}
-			}
-		}
-		else
-		{
-			$oConditionQuery = $this->GetScopedQuery($oApp, $oBrick, $sClass);
-			if (!is_null($oConditionQuery))
-			{
-				$oSet = new DBObjectSet($oConditionQuery);
-				$iCount = $oSet->Count();
-			}
-		}
-
-		// - Retrieving the current grouping tab to display if necessary and altering the query to do so
-		if (empty($sGroupingTab))
-		{
-			if ($oBrick->HasGroupingTabs())
-			{
-				reset($aGroupingTabsValues);
-				$sGroupingTab = key($aGroupingTabsValues);
-				if ($aGroupingTabsValues[$sGroupingTab]['condition'] !== null)
-				{
-					$oQuery = $aGroupingTabsValues[$sGroupingTab]['condition']->DeepClone();
-				}
-			}
-		}
-		else
-		{
-			if ($aGroupingTabsValues[$sGroupingTab]['condition'] !== null)
-			{
-				$oQuery = $aGroupingTabsValues[$sGroupingTab]['condition']->DeepClone();
-			}
-		}
-
-        // - Adding search clause if necessary
-        $this->ManageSearchValue($oApp, $aData, $oQuery, $sClass, $aColumnsAttrs);
-
-		// Preparing areas
-		// - We need to retrieve distinct values for the grouping attribute
-		// Note : Will have to be changed when we consider grouping on something else than the finalclass
-		$sParentAlias = $oQuery->GetClassAlias();
-		if ($bNeedDetails)
-		{
-			$sGroupingAreaAttCode = 'finalclass';
-
-			// For root classes
-			if (MetaModel::IsValidAttCode($sClass, $sGroupingAreaAttCode))
-			{
-				$oDistinctQuery = $this->GetScopedQuery($oApp, $oBrick, $sClass);
-				// Adding grouping conditions
-				$oFieldExp = new FieldExpression($sGroupingAreaAttCode, $oDistinctQuery->GetClassAlias());
-				$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
-				$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);
-
-				foreach ($aDistinctResults as $aDistinctResult)
-				{
-					$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GARE');
-					$oExpression = new BinaryExpression(new FieldExpression($sGroupingAreaAttCode, 'GARE'), '=',
-						new UnaryExpression($aDistinctResult['grouped_by_1']));
-					$oConditionQuery->AddConditionExpression($oExpression);
-
-					$aGroupingAreasValues[$aDistinctResult['grouped_by_1']] = array(
-						'value' => $aDistinctResult['grouped_by_1'],
-						'label' => MetaModel::GetName($aDistinctResult['grouped_by_1']),
-						// Caution : This works only because we froze the grouping areas on the finalclass attribute.
-						'condition' => $oConditionQuery,
-						'count' => $aDistinctResult['_itop_count_']
-					);
-					unset($oConditionQuery);
-				}
-				unset($aDistinctResults);
-			}
-			// For leaf classes
-			else
-			{
-				$aGroupingAreasValues[$sClass] = array(
-					'value' => $sClass,
-					'label' => MetaModel::GetName($sClass),
-					// Caution : This works only because we froze the grouping areas on the finalclass attribute.
-					'condition' => null,
-					'count' => 0
-				);
-			}
-
-			//   - If specified or lazy loading, we truncate the $aGroupingAreasValues to keep only this one
-			if (!empty($sGroupingArea))
-			{
-				$aGroupingAreasValues = array($sGroupingArea => $aGroupingAreasValues[$sGroupingArea]);
-			}
-			//   - Preparing the queries
-			foreach ($aGroupingAreasValues as $sKey => $aGroupingAreasValue)
-			{
-				$oAreaQuery = DBSearch::CloneWithAlias($oQuery, $sParentAlias);
-				if ($aGroupingAreasValue['condition'] !== null)
-				{
-					$oAreaQuery = $aGroupingAreasValue['condition']->DeepClone();
-				}
-
-				// Restricting query to allowed scope on each classes
-				// Note: Will need to moved the scope restriction on queries elsewhere when we consider grouping on something else than finalclass
-				// Note: We now get view scope instead of edit scope as we allowed users to view/edit objects in the brick regarding their rights
-				/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
-				$oScopeHelper = $oApp['scope_validator'];
-				$bHasScope = $oScopeHelper->AddScopeToQuery($oAreaQuery, $aGroupingAreasValue['value']);
-				if (!$bHasScope)
-				{
-					// if no scope apply does not allow any data
-					$oAreaQuery = null;
-				}
-
-				$aQueries[$sKey] = $oAreaQuery;
-			}
-
-			$aData['aQueries'] = $aQueries;
-
-			// Testing appropriate data loading mode if we are in auto
-			// - For all (html) tables, this doesn't care for the grouping ares (finalclass)
-			if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_AUTO)
-			{
-				// - Check how many records there is.
-				// - Update $sDataLoading with its new value regarding the number of record and the threshold
-				$oCountSet = new DBObjectSet($oQuery);
-				$oCountSet->OptimizeColumnLoad(array());
-				$fThreshold = (float)MetaModel::GetModuleSetting($oApp['combodo.portal.instance.id'],
-					'lazy_loading_threshold');
-				$sDataLoading = ($oCountSet->Count() > $fThreshold) ? AbstractBrick::ENUM_DATA_LOADING_LAZY : AbstractBrick::ENUM_DATA_LOADING_FULL;
-				unset($oCountSet);
-			}
-
-			// Preparing data sets
-			$aSets = array();
-			/** @var DBSearch $oQuery */
-			foreach ($aQueries as $sKey => $oQuery)
-			{
-				// Checking if we have a valid query
-				if ($oQuery !== null)
-				{
-					// Setting query pagination if needed
-					if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY)
-					{
-						// Retrieving parameters
-						$iPageNumber = (int)$oApp['request_manipulator']->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT);
-						$iListLength = (int)$oApp['request_manipulator']->ReadParam('iListLength', ManageBrick::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT);
-
-						// Getting total records number
-						$oCountSet = new DBObjectSet($oQuery);
-						$oCountSet->OptimizeColumnLoad(array($oQuery->GetClassAlias() => $aColumnsAttrs));
-						$aData['recordsTotal'] = $oCountSet->Count();
-						$aData['recordsFiltered'] = $oCountSet->Count();
-						unset($oCountSet);
-
-						$oSet = new DBObjectSet($oQuery);
-						$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
-					}
-					else
-					{
-						$oSet = new DBObjectSet($oQuery);
-					}
-
-					// Adding always_in_tables attributes
-					$aColumnsToLoad = array($oQuery->GetClassAlias() => $aColumnsAttrs);
-					foreach ($oQuery->GetSelectedClasses() as $sAlias => $sClassSelected)
-					{
-						/** @var AttributeDefinition $oAttDef */
-						foreach (MetaModel::ListAttributeDefs($sClassSelected) as $sAttCode => $oAttDef)
-						{
-							if ($oAttDef->AlwaysLoadInTables())
-							{
-								$aColumnsToLoad[$sAlias][] = $sAttCode;
-							}
-						}
-					}
-
-					$oSet->OptimizeColumnLoad($aColumnsToLoad);
-					$oSet->SetOrderByClasses();
-					SecurityHelper::PreloadForCache($oApp, $oSet->GetFilter(),
-						$aColumnsToLoad[$oQuery->GetClassAlias()] /* preloading only extkeys from the main class */);
-					$aSets[$sKey] = $oSet;
-				}
-			}
-
-			// Retrieving and preparing data for rendering
-			$aGroupingAreasData = array();
-			$bHasObjectListItemExtension = false;
-			foreach ($aSets as $sKey => $oSet)
-			{
-				// Set properties
-				$sCurrentClass = $sKey;
-
-				// Defining which attribute will open the edition form)
-				$sMainActionAttrCode = $aColumnsAttrs[0];
-
-				// Loading columns definition
-				$aColumnsDefinition = array();
-				foreach ($aColumnsAttrs as $sColumnAttr)
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sKey, $sColumnAttr);
-					$aColumnsDefinition[$sColumnAttr] = array(
-						'title' => $oAttDef->GetLabel(),
-						'type' => ($oAttDef instanceof AttributeDateTime) ? 'moment-'.$oAttDef->GetFormat()->ToMomentJS() : 'html',
-						// Special sorting for Date & Time
-					);
-				}
-
-				// Getting items
-				$aItems = array();
-				// ... For each item
-				/** @var DBObject $oCurrentRow */
-				while ($oCurrentRow = $oSet->Fetch())
-				{
-					// ... Retrieving item's attributes values
-					$aItemAttrs = array();
-					foreach ($aColumnsAttrs as $sItemAttr)
-					{
-						$aActions = array();
-						// Set the edit action to the main (first) attribute only
-						//if ($sItemAttr === $sTitleAttrCode)
-						if ($sItemAttr === $sMainActionAttrCode)
-						{
-							// Checking if we can edit the object
-							if (($oBrick->GetOpeningMode() === ManageBrick::ENUM_ACTION_EDIT) && SecurityHelper::IsActionAllowed($oApp,
-									UR_ACTION_MODIFY, $sCurrentClass, $oCurrentRow->GetKey()))
-							{
-								$sActionType = ManageBrick::ENUM_ACTION_EDIT;
-							}
-							// - Otherwise, check if view is allowed
-							elseif (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sCurrentClass,
-								$oCurrentRow->GetKey()))
-							{
-								$sActionType = ManageBrick::ENUM_ACTION_VIEW;
-							}
-							else
-							{
-								$sActionType = null;
-							}
-							// - Then set allowed action
-							if ($sActionType !== null)
-							{
-								$aActions[] = array(
-									'type' => $sActionType,
-									'class' => $sCurrentClass,
-									'id' => $oCurrentRow->GetKey(),
-									'opening_target' => $oBrick->GetOpeningTarget(),
-								);
-							}
-						}
-
-						/** @var AttributeDefinition $oAttDef */
-						$oAttDef = MetaModel::GetAttributeDef($sCurrentClass, $sItemAttr);
-						if ($oAttDef->IsExternalKey())
-						{
-							$sValue = $oCurrentRow->GetAsHTML($sItemAttr.'_friendlyname');
-
-							// Adding a view action on the external keys
-							if ($oCurrentRow->Get($sItemAttr) !== $oAttDef->GetNullValue())
-							{
-								// Checking if we can view the object
-								if ((SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oAttDef->GetTargetClass(),
-									$oCurrentRow->Get($sItemAttr))))
-								{
-									$aActions[] = array(
-										'type' => ManageBrick::ENUM_ACTION_VIEW,
-										'class' => $oAttDef->GetTargetClass(),
-										'id' => $oCurrentRow->Get($sItemAttr),
-										'opening_target' => $oBrick->GetOpeningTarget(),
-									);
-								}
-							}
-						}
-						elseif ($oAttDef instanceof AttributeImage)
-                        {
-                            $oOrmDoc = $oCurrentRow->Get($sItemAttr);
-                            if (is_object($oOrmDoc) && !$oOrmDoc->IsEmpty())
-                            {
-                                $sUrl = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oCurrentRow), 'sObjectId' => $oCurrentRow->GetKey(), 'sObjectField' => $sItemAttr, 'cache' => 86400));
-                            }
-                            else
-                            {
-                                $sUrl = $oAttDef->Get('default_image');
-                            }
-                            $sValue = '<img src="' . $sUrl . '" />';
-                        }
-						else
-						{
-                            $sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
-						}
-						unset($oAttDef);
-
-						$aItemAttrs[$sItemAttr] = array(
-							'att_code' => $sItemAttr,
-							'value' => $sValue,
-							'actions' => $aActions
-						);
-					}
-
-					// ... Checking menu extensions
-					$aItemButtons = array();
-					foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
-					{
-						foreach ($oExtensionInstance->EnumItems(iPopupMenuExtension::PORTAL_OBJLISTITEM_ACTIONS, array(
-							'portal_id' => $oApp['combodo.portal.instance.id'],
-							'object' => $oCurrentRow
-						)) as $oMenuItem)
-						{
-							if (is_object($oMenuItem))
-							{
-								if ($oMenuItem instanceof JSButtonItem)
-								{
-									$aItemButtons[] = $oMenuItem->GetMenuItem() + array(
-											'js_files' => $oMenuItem->GetLinkedScripts(),
-											'type' => 'button'
-										);
-								}
-								elseif ($oMenuItem instanceof URLButtonItem)
-								{
-									$aItemButtons[] = $oMenuItem->GetMenuItem() + array('type' => 'link');
-								}
-							}
-						}
-					}
-
-					// ... And item's properties
-					$aItems[] = array(
-						'id' => $oCurrentRow->GetKey(),
-						'class' => $sCurrentClass,
-						'attributes' => $aItemAttrs,
-						'highlight_class' => $oCurrentRow->GetHilightClass(),
-						'actions' => $aItemButtons,
-					);
-
-					if (!empty($aItemButtons))
-					{
-						$bHasObjectListItemExtension = true;
-					}
-				}
-
-				// Adding an extra column for object list item extensions
-				if ($bHasObjectListItemExtension === true)
-				{
-					$aColumnsDefinition['_ui_extensions'] = array(
-						'title' => Dict::S('Brick:Portal:Manage:Table:ItemActions'),
-						'type' => 'html',
-					);
-				}
-
-				$aGroupingAreasData[$sKey] = array(
-					'sId' => $sKey,
-					'sTitle' => $aGroupingAreasValues[$sKey]['label'],
-					'aItems' => $aItems,
-					'iItemsCount' => $oSet->Count(),
-					'aColumnsDefinition' => $aColumnsDefinition
-				);
-			}
-		}
-		else
-		{
-			$aGroupingAreasData = array();
-			$sGroupingArea = null;
-		}
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			$aData = $aData + array(
-					'data' => $aGroupingAreasData[$sGroupingArea]['aItems']
-				);
-		}
-		else
-		{
-			$aDisplayValues = array();
-			$aUrls = array();
-			$aColumns = array();
-			$aNames = array();
-			if ($bHasScope)
-			{
-				foreach ($aGroupingTabsValues as $aValues)
-				{
-					$aDisplayValues[] = array(
-						'value' => $aValues['count'],
-						'label' => $aValues['label'],
-						'label_html' => $aValues['label_html'],
-					);
-					$aUrls[] = $oApp['url_generator']->generate('p_manage_brick', array(
-						'sBrickId' => $sBrickId,
-						'sDisplayMode' => 'default',
-						'sGroupingTab' => $aValues['value']
-					));
-				}
-
-				foreach ($aDisplayValues as $idx => $aValue)
-				{
-					$aColumns[] = array('series_'.$idx, (int)$aValue['value']);
-					$aNames['series_'.$idx] = $aValue['label'];
-				}
-			}
-
-			// Preparing data to pass to the templating service
-			$aData = $aData + array(
-					'sFct' => 'count',
-					'sIconURL' => $sIconURL,
-					'aColumns' => $aColumns,
-					'aNames' => $aNames,
-					'aDisplayValues' => $aDisplayValues,
-					'aUrls' => $aUrls,
-					'oBrick' => $oBrick,
-					'sBrickId' => $sBrickId,
-					'sGroupingTab' => $sGroupingTab,
-					'aGroupingTabsValues' => $aGroupingTabsValues,
-					'sDataLoading' => $sDataLoading,
-					'aGroupingAreasData' => $aGroupingAreasData,
-					'sDateFormat' => AttributeDate::GetFormat()->ToMomentJS(),
-					'sDateTimeFormat' => AttributeDateTime::GetFormat()->ToMomentJS(),
-					'iCount' => $iCount,
-				);
-		}
-
-		return $aData;
-	}
-
-    /**
-     * @param Application $oApp
-     * @param array $aData
-     * @param DBSearch $oQuery
-     * @param string $sClass
-     * @param array $aColumnsAttrs
-     *
-     * @throws \Exception
-     * @throws \CoreException
-     */
-	protected function ManageSearchValue(Application $oApp, &$aData, DBSearch &$oQuery, $sClass, $aColumnsAttrs)
-	{
-		// Getting search value
-		$sSearchValue = $oApp['request_manipulator']->ReadParam('sSearchValue', '');
-
-		// - Adding search clause if necessary
-		// Note : This is a very naive search at the moment
-		if (!empty($sSearchValue))
-		{
-		    // Putting only valid attributes as one can define attributes of leaf classes in the brick definition (<fields>), but at this stage we are working on the abstract class.
-            // Note: This won't fix everything as the search will not be looking in all fields.
-		    $aSearchListItems = array();
-		    foreach($aColumnsAttrs as $sColumnAttr)
-            {
-                if(MetaModel::IsValidAttCode($sClass, $sColumnAttr))
-                {
-                    $aSearchListItems[] = $sColumnAttr;
-                }
-            }
-
-			$oFullBinExpr = null;
-			foreach ($aSearchListItems as $sSearchItemAttr)
-			{
-				$oBinExpr = new BinaryExpression(new FieldExpression($sSearchItemAttr, $oQuery->GetClassAlias()),
-					'LIKE', new VariableExpression('search_value'));
-				// At each iteration we build the complete expression for the search like ( (field1 LIKE %search%) OR (field2 LIKE %search%) OR (field3 LIKE %search%) ...)
-				if (is_null($oFullBinExpr))
-				{
-					$oFullBinExpr = $oBinExpr;
-				}
-				else
-				{
-					$oFullBinExpr = new BinaryExpression($oFullBinExpr, 'OR', $oBinExpr);
-				}
-			}
-
-			// Then add the complete expression to the query
-			if (!is_null($oFullBinExpr))
-			{
-				// - Adding expression to the query
-				$oQuery->AddConditionExpression($oFullBinExpr);
-				// - Setting expression parameters
-				// Note : This could be way more simpler if we had a SetInternalParam($sParam, $value) verb
-				$aQueryParams = $oQuery->GetInternalParams();
-				$aQueryParams['search_value'] = '%'.$sSearchValue.'%';
-				$oQuery->SetInternalParams($aQueryParams);
-			}
-		}
-
-		$aData['sSearchValue'] = $sSearchValue;
-	}
-
-	/**
-	 * Get the groups using a given attribute code.
-	 * If a limit is given, the remaining groups are aggregated (groupby result and search request).
-	 *
-	 * @param DBSearch $oQuery Initial query
-	 * @param string $sGroupingTabAttCode Attribute code to group by
-	 * @param Application $oApp
-	 * @param ManageBrick $oBrick
-	 *
-	 * @return array of results from the groupby request and the corrsponding search.
-	 * @throws \DictExceptionMissingString
-	 * @throws \MissingQueryArgument
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	protected function GroupByAttribute(
-		DBSearch $oQuery, $sGroupingTabAttCode, Application $oApp, ManageBrick $oBrick
-	) {
-		$aGroupingTabsValues = array();
-		$aDistinctResults = array();
-		$oDistinctQuery = DBSearch::FromOQL($oBrick->GetOql());
-		/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
-		$oScopeHelper = $oApp['scope_validator'];
-		$bHasScope = $oScopeHelper->AddScopeToQuery($oDistinctQuery, $oDistinctQuery->GetClass());
-		if ($bHasScope)
-		{
-			// - Adding field condition
-			$oFieldExp = new FieldExpression($sGroupingTabAttCode, $oDistinctQuery->GetClassAlias());
-			$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
-			$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);
-			if (!empty($aDistinctResults))
-			{
-				$iLimit = $oBrick->GetGroupLimit();
-				$aOthers = array();
-				if ($iLimit > 0)
-				{
-					uasort($aDistinctResults, function ($a, $b) {
-						$v1 = $a['_itop_count_'];
-						$v2 = $b['_itop_count_'];
-
-						return ($v1 == $v2) ? 0 : (($v1 > $v2) ? -1 : 1);
-					});
-
-					if (count($aDistinctResults) > $iLimit)
-					{
-						if ($oBrick->ShowGroupOthers())
-						{
-							$aOthers = array_slice($aDistinctResults, $iLimit);
-						}
-						$aDistinctResults = array_slice($aDistinctResults, 0, $iLimit);
-					}
-				}
-
-				foreach ($aDistinctResults as $aDistinctResult)
-				{
-					$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GTAB');
-					$oExpression = new BinaryExpression(new FieldExpression($sGroupingTabAttCode,
-                        $oConditionQuery->GetClassAlias()), '=', new UnaryExpression($aDistinctResult['grouped_by_1']));
-					$oConditionQuery->AddConditionExpression($oExpression);
-
-					$sHtmlLabel = $oFieldExp->MakeValueLabel($oDistinctQuery, $aDistinctResult['grouped_by_1'], '');
-					$aGroupingTabsValues[$aDistinctResult['grouped_by_1']] = array(
-						'value' => $aDistinctResult['grouped_by_1'],
-						'label_html' => $sHtmlLabel,
-						'label' => strip_tags($sHtmlLabel),
-						'condition' => $oConditionQuery,
-						'count' => $aDistinctResult['_itop_count_'],
-					);
-					unset($oConditionQuery);
-				}
-				if (!empty($aOthers))
-				{
-					// Aggregate others
-					$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GTAB');
-					$oExpression = null;
-					$iOtherCount = 0;
-					foreach ($aOthers as $aResult)
-					{
-						$iOtherCount += $aResult['_itop_count_'];
-						$oExpr = new BinaryExpression(new FieldExpression($sGroupingTabAttCode,
-                            $oConditionQuery->GetClassAlias()), '=', new UnaryExpression($aResult['grouped_by_1']));
-						if (is_null($oExpression))
-						{
-							$oExpression = $oExpr;
-						}
-						else
-						{
-							$oExpression = new BinaryExpression($oExpression, 'OR', $oExpr);
-						}
-					}
-					$oConditionQuery->AddConditionExpression($oExpression);
-
-					$sLabel = Dict::S('Brick:Portal:Manage:Others');
-					$aGroupingTabsValues['Others'] = array(
-						'value' => 'Others',
-						'label_html' => $sLabel,
-						'label' => $sLabel,
-						'condition' => $oConditionQuery,
-						'count' => $iOtherCount,
-					);
-					unset($oConditionQuery);
-				}
-			}
-		}
-		if (empty($aDistinctResults))
-		{
-			$sLabel = Dict::S('Brick:Portal:Manage:All');
-			$aGroupingTabsValues['undefined'] = array(
-				'value' => 'All',
-				'label_html' => $sLabel,
-				'label' => $sLabel,
-				'condition' => null,
-				'count' => 0,
-			);
-		}
-
-		return $aGroupingTabsValues;
-	}
-
-	/**
-	 * @param Application $oApp
-	 * @param ManageBrick $oBrick
-	 * @param string $sClass
-	 *
-	 * @return DBSearch
-	 * @throws \OQLException
-	 */
-	protected function GetScopedQuery(Application $oApp, ManageBrick $oBrick, $sClass)
-	{
-		$oQuery = DBSearch::FromOQL($oBrick->GetOql());
-		/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
-		$oScopeHelper = $oApp['scope_validator'];
-		$oScopeHelper->AddScopeToQuery($oQuery, $sClass);
-
-		return $oQuery;
-	}
-}
+<?php
+
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Exception;
+use AttributeDate;
+use AttributeDateTime;
+use AttributeDefinition;
+use AttributeDuration;
+use AttributeSubItem;
+use BinaryExpression;
+use CMDBSource;
+use Combodo\iTop\Portal\Brick\AbstractBrick;
+use Combodo\iTop\Portal\Brick\ManageBrick;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+use DBObject;
+use DBObjectSet;
+use DBSearch;
+use Dict;
+use FieldExpression;
+use iPopupMenuExtension;
+use JSButtonItem;
+use MetaModel;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use UnaryExpression;
+use URLButtonItem;
+use UserRights;
+use VariableExpression;
+
+class ManageBrickController extends BrickController
+{
+	const EXCEL_EXPORT_TEMPLATE_PATH = 'itop-portal-base/portal/src/views/bricks/manage/popup-export-excel.html.twig';
+
+    /**
+     * @param Request $oRequest
+     * @param Application $oApp
+     * @param string $sBrickId
+     * @param string $sGroupingTab
+     * @param string $sDisplayMode
+     *
+     * @return Response
+     *
+     * @throws \Exception
+     * @throws \CoreException
+     * @throws \DictExceptionMissingString
+     * @throws \MySQLException
+     * @throws \OQLException
+     */
+	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayMode = null)
+    {
+		/** @var ManageBrick $oBrick */
+		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+
+		if (is_null($sDisplayMode))
+		{
+			$sDisplayMode = $oBrick->GetDefaultDisplayMode();
+		}
+		$aDisplayParams = $oBrick->GetPresentationDataForTileMode($sDisplayMode);
+		$aData = $this->GetData($oRequest, $oApp, $sBrickId, $sGroupingTab, $oBrick::AreDetailsNeededForDisplayMode($sDisplayMode));
+
+		$aExportFields = $oBrick->GetExportFields();
+		$aData = $aData + array(
+				'sDisplayMode' => $sDisplayMode,
+				'bCanExport' => !empty($aExportFields),
+			);
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			$oResponse = $oApp->json($aData);
+		}
+		else
+		{
+			$sLayoutTemplate = $oBrick::GetPageTemplateFromDisplayMode($sDisplayMode);
+			$oResponse = $oApp['twig']->render($sLayoutTemplate, $aData);
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Method for the brick's tile on home page
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sBrickId
+	 *
+	 * @return Response
+	 */
+	public function TileAction(Request $oRequest, Application $oApp, $sBrickId)
+	{
+		/** @var ManageBrick $oBrick */
+		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+
+		try
+		{
+			$aData = $this->GetData($oRequest, $oApp, $sBrickId, null);
+		}
+		catch (Exception $e)
+		{
+			// TODO Default values
+			$aData = array();
+		}
+
+		return $oApp['twig']->render($oBrick->GetTileTemplatePath(), $aData);
+	}
+
+	/**
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sBrickId
+	 * @param string $sGroupingTab
+	 * @param string $sGroupingArea
+	 *
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 * @throws \Exception
+	 */
+	public function ExcelExportStartAction(
+		Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sGroupingArea
+	) {
+		/** @var ManageBrick $oBrick */
+		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+		$oQuery = DBSearch::FromOQL($oBrick->GetOql());
+		$sClass = $oQuery->GetClass();
+		$aData = $this->GetData($oRequest, $oApp, $sBrickId, $sGroupingTab, true);
+
+		if (isset($aData['aQueries']) && count($aData['aQueries']) === 1)
+		{
+			$aQueries = $aData['aQueries'];
+			reset($aQueries);
+			$sKey = key($aQueries);
+			$oSearch = $aData['aQueries'][$sKey];
+		}
+		else
+		{
+			$oQuery = DBSearch::FromOQL($oBrick->GetOql());
+			$sClass = $oQuery->GetClass();
+			/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
+			$oScopeHelper = $oApp['scope_validator'];
+			$oScopeHelper->AddScopeToQuery($oQuery, $sClass);
+			$aData = array();
+			$this->ManageSearchValue($oApp, $aData, $oQuery, $sClass);
+
+			// Grouping tab
+			if ($oBrick->HasGroupingTabs())
+			{
+				$aGroupingTabs = $oBrick->GetGroupingTabs();
+
+				// If tabs are made of the distinct values of an attribute, we have a find them via a query
+				if ($oBrick->IsGroupingTabsByDistinctValues())
+				{
+					$sGroupingTabAttCode = $aGroupingTabs['attribute'];
+					$aGroupingTabsValues = $this->GroupByAttribute($oQuery, $sGroupingTabAttCode, $oApp, $oBrick);
+					$oQuery = $oQuery->Intersect($aGroupingTabsValues[$sGroupingTab]['condition']);
+				}
+				else
+				{
+					foreach ($aGroupingTabs['groups'] as $aGroup)
+					{
+						if ($aGroup['id'] === $sGroupingTab)
+						{
+							$oConditionQuery = $oQuery->Intersect(DBSearch::FromOQL($aGroup['condition']));
+							$oQuery = $oQuery->Intersect($oConditionQuery);
+							break;
+						}
+					}
+				}
+			}
+
+			// Finalclass
+			$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GARE');
+			$oExpression = new BinaryExpression(new FieldExpression('finalclass', 'GARE'), '=',
+				new UnaryExpression($sGroupingArea));
+			$oConditionQuery->AddConditionExpression($oExpression);
+			/** @var DBSearch $oSearch */
+			$oSearch = $oQuery->Intersect($oConditionQuery);
+		}
+
+		$aColumnsAttrs = $oBrick->GetExportFields();
+		$aFields = array();
+		$sTitleAttrCode = 'friendlyname';
+		if (!in_array($sTitleAttrCode, $aColumnsAttrs))
+		{
+			$aFields[] = $sTitleAttrCode;
+		}
+		foreach ($aColumnsAttrs as $sAttCode)
+		{
+			$oAttributeDef = MetaModel::GetAttributeDef($sGroupingArea, $sAttCode);
+			if ($oAttributeDef->IsExternalKey(EXTKEY_ABSOLUTE))
+			{
+				$aFields[] = $sAttCode.'_friendlyname';
+			}
+			else
+			{
+				$aFields[] = $sAttCode;
+			}
+		}
+
+		$sFields = implode(',', $aFields);
+		$aData = array(
+			'oBrick' => $oBrick,
+			'sBrickId' => $sBrickId,
+			'sFields' => $sFields,
+			'sOQL' => $oSearch->ToOQL(),
+		);
+
+		return $oApp['twig']->render(static::EXCEL_EXPORT_TEMPLATE_PATH, $aData);
+	}
+
+
+	/**
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sBrickId
+	 * @param string $sGroupingTab
+	 * @param bool $bNeedDetails
+	 *
+	 * @return array
+	 * @throws \CoreException
+	 * @throws \DictExceptionMissingString
+	 * @throws \Exception
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function GetData(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $bNeedDetails = false)
+	{
+		/** @var ManageBrick $oBrick */
+		$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+
+		$aData = array();
+		$aGroupingTabsValues = array();
+		$aGroupingAreasValues = array();
+		$aQueries = array();
+		$bHasScope = true;
+
+		// Getting current dataloading mode (First from router parameter, then query parameter, then default brick value)
+		$sDataLoading = $oApp['request_manipulator']->ReadParam('sDataLoading', $oBrick->GetDataLoading());
+
+		// - Retrieving the grouping areas to display
+		$sGroupingArea = $oApp['request_manipulator']->ReadParam('sGroupingArea', '');
+		if (!empty($sGroupingArea))
+		{
+			$bNeedDetails = true;
+		}
+
+		// Getting area columns properties
+		$aColumnsAttrs = $oBrick->GetFields();
+		// Adding friendlyname attribute to the list if not already in it
+		$sTitleAttrCode = 'friendlyname';
+		if (($sTitleAttrCode !== null) && !in_array($sTitleAttrCode, $aColumnsAttrs))
+		{
+			$aColumnsAttrs = array_merge(array($sTitleAttrCode), $aColumnsAttrs);
+		}
+
+		// Starting to build query
+		$oQuery = DBSearch::FromOQL($oBrick->GetOql());
+		$sClass = $oQuery->GetClass();
+		$sIconURL = MetaModel::GetClassIcon($sClass, false);
+
+		// Preparing tabs
+		// - We need to retrieve distinct values for the grouping attribute
+		$iCount = 0;
+		if ($oBrick->HasGroupingTabs())
+		{
+			$aGroupingTabs = $oBrick->GetGroupingTabs();
+
+			// If tabs are made of the distinct values of an attribute, we have a find them via a query
+			if ($oBrick->IsGroupingTabsByDistinctValues())
+			{
+				$sGroupingTabAttCode = $aGroupingTabs['attribute'];
+				$aGroupingTabsValues = $this->GroupByAttribute($oQuery, $sGroupingTabAttCode, $oApp, $oBrick);
+				foreach ($aGroupingTabsValues as $aResult)
+				{
+					$iCount += $aResult['count'];
+				}
+			}
+			// Otherwise we create the tabs from the SQL expressions
+			else
+			{
+				foreach ($aGroupingTabs['groups'] as $aGroup)
+				{
+					$oConditionQuery = $oQuery->Intersect(DBSearch::FromOQL($aGroup['condition']));
+					// - Restricting query to scope
+
+					/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
+					$oScopeHelper = $oApp['scope_validator'];
+					$bHasScope = $oScopeHelper->AddScopeToQuery($oConditionQuery, $oConditionQuery->GetClass());
+					if ($bHasScope)
+					{
+						// - Building ObjectSet
+						$oConditionSet = new DBObjectSet($oConditionQuery);
+						$iGroupCount = $oConditionSet->Count();
+					}
+					else
+					{
+						$oConditionSet = null;
+						$iGroupCount = 0;
+					}
+					$aGroupingTabsValues[$aGroup['id']] = array(
+						'value' => $aGroup['id'],
+						'label' => Dict::S($aGroup['title']),
+						'label_html' => Dict::S($aGroup['title']),
+						'condition' => $oConditionQuery,
+						'count' => $iGroupCount,
+					);
+					$iCount += $iGroupCount;
+				}
+			}
+		}
+		else
+		{
+			$oConditionQuery = $this->GetScopedQuery($oApp, $oBrick, $sClass);
+			if (!is_null($oConditionQuery))
+			{
+				$oSet = new DBObjectSet($oConditionQuery);
+				$iCount = $oSet->Count();
+			}
+		}
+
+		// - Retrieving the current grouping tab to display if necessary and altering the query to do so
+		if (empty($sGroupingTab))
+		{
+			if ($oBrick->HasGroupingTabs())
+			{
+				reset($aGroupingTabsValues);
+				$sGroupingTab = key($aGroupingTabsValues);
+				if ($aGroupingTabsValues[$sGroupingTab]['condition'] !== null)
+				{
+					$oQuery = $aGroupingTabsValues[$sGroupingTab]['condition']->DeepClone();
+				}
+			}
+		}
+		else
+		{
+			if ($aGroupingTabsValues[$sGroupingTab]['condition'] !== null)
+			{
+				$oQuery = $aGroupingTabsValues[$sGroupingTab]['condition']->DeepClone();
+			}
+		}
+
+        // - Adding search clause if necessary
+        $this->ManageSearchValue($oApp, $aData, $oQuery, $sClass, $aColumnsAttrs);
+
+		// Preparing areas
+		// - We need to retrieve distinct values for the grouping attribute
+		// Note : Will have to be changed when we consider grouping on something else than the finalclass
+		$sParentAlias = $oQuery->GetClassAlias();
+		if ($bNeedDetails)
+		{
+			$sGroupingAreaAttCode = 'finalclass';
+
+			// For root classes
+			if (MetaModel::IsValidAttCode($sClass, $sGroupingAreaAttCode))
+			{
+				$oDistinctQuery = $this->GetScopedQuery($oApp, $oBrick, $sClass);
+				// Adding grouping conditions
+				$oFieldExp = new FieldExpression($sGroupingAreaAttCode, $oDistinctQuery->GetClassAlias());
+				$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
+				$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);
+
+				foreach ($aDistinctResults as $aDistinctResult)
+				{
+					$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GARE');
+					$oExpression = new BinaryExpression(new FieldExpression($sGroupingAreaAttCode, 'GARE'), '=',
+						new UnaryExpression($aDistinctResult['grouped_by_1']));
+					$oConditionQuery->AddConditionExpression($oExpression);
+
+					$aGroupingAreasValues[$aDistinctResult['grouped_by_1']] = array(
+						'value' => $aDistinctResult['grouped_by_1'],
+						'label' => MetaModel::GetName($aDistinctResult['grouped_by_1']),
+						// Caution : This works only because we froze the grouping areas on the finalclass attribute.
+						'condition' => $oConditionQuery,
+						'count' => $aDistinctResult['_itop_count_']
+					);
+					unset($oConditionQuery);
+				}
+				unset($aDistinctResults);
+			}
+			// For leaf classes
+			else
+			{
+				$aGroupingAreasValues[$sClass] = array(
+					'value' => $sClass,
+					'label' => MetaModel::GetName($sClass),
+					// Caution : This works only because we froze the grouping areas on the finalclass attribute.
+					'condition' => null,
+					'count' => 0
+				);
+			}
+
+			//   - If specified or lazy loading, we truncate the $aGroupingAreasValues to keep only this one
+			if (!empty($sGroupingArea))
+			{
+				$aGroupingAreasValues = array($sGroupingArea => $aGroupingAreasValues[$sGroupingArea]);
+			}
+			//   - Preparing the queries
+			foreach ($aGroupingAreasValues as $sKey => $aGroupingAreasValue)
+			{
+				$oAreaQuery = DBSearch::CloneWithAlias($oQuery, $sParentAlias);
+				if ($aGroupingAreasValue['condition'] !== null)
+				{
+					$oAreaQuery = $aGroupingAreasValue['condition']->DeepClone();
+				}
+
+				// Restricting query to allowed scope on each classes
+				// Note: Will need to moved the scope restriction on queries elsewhere when we consider grouping on something else than finalclass
+				// Note: We now get view scope instead of edit scope as we allowed users to view/edit objects in the brick regarding their rights
+				/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
+				$oScopeHelper = $oApp['scope_validator'];
+				$bHasScope = $oScopeHelper->AddScopeToQuery($oAreaQuery, $aGroupingAreasValue['value']);
+				if (!$bHasScope)
+				{
+					// if no scope apply does not allow any data
+					$oAreaQuery = null;
+				}
+
+				$aQueries[$sKey] = $oAreaQuery;
+			}
+
+			$aData['aQueries'] = $aQueries;
+
+			// Testing appropriate data loading mode if we are in auto
+			// - For all (html) tables, this doesn't care for the grouping ares (finalclass)
+			if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_AUTO)
+			{
+				// - Check how many records there is.
+				// - Update $sDataLoading with its new value regarding the number of record and the threshold
+				$oCountSet = new DBObjectSet($oQuery);
+				$oCountSet->OptimizeColumnLoad(array());
+				$fThreshold = (float)MetaModel::GetModuleSetting($oApp['combodo.portal.instance.id'],
+					'lazy_loading_threshold');
+				$sDataLoading = ($oCountSet->Count() > $fThreshold) ? AbstractBrick::ENUM_DATA_LOADING_LAZY : AbstractBrick::ENUM_DATA_LOADING_FULL;
+				unset($oCountSet);
+			}
+
+			// Preparing data sets
+			$aSets = array();
+			/** @var DBSearch $oQuery */
+			foreach ($aQueries as $sKey => $oQuery)
+			{
+				// Checking if we have a valid query
+				if ($oQuery !== null)
+				{
+					// Setting query pagination if needed
+					if ($sDataLoading === AbstractBrick::ENUM_DATA_LOADING_LAZY)
+					{
+						// Retrieving parameters
+						$iPageNumber = (int)$oApp['request_manipulator']->ReadParam('iPageNumber', 1, FILTER_SANITIZE_NUMBER_INT);
+						$iListLength = (int)$oApp['request_manipulator']->ReadParam('iListLength', ManageBrick::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT);
+
+						// Getting total records number
+						$oCountSet = new DBObjectSet($oQuery);
+						$oCountSet->OptimizeColumnLoad(array($oQuery->GetClassAlias() => $aColumnsAttrs));
+						$aData['recordsTotal'] = $oCountSet->Count();
+						$aData['recordsFiltered'] = $oCountSet->Count();
+						unset($oCountSet);
+
+						$oSet = new DBObjectSet($oQuery);
+						$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
+					}
+					else
+					{
+						$oSet = new DBObjectSet($oQuery);
+					}
+
+					// Adding always_in_tables attributes
+					$aColumnsToLoad = array($oQuery->GetClassAlias() => $aColumnsAttrs);
+					foreach ($oQuery->GetSelectedClasses() as $sAlias => $sClassSelected)
+					{
+						/** @var AttributeDefinition $oAttDef */
+						foreach (MetaModel::ListAttributeDefs($sClassSelected) as $sAttCode => $oAttDef)
+						{
+							if ($oAttDef->AlwaysLoadInTables())
+							{
+								$aColumnsToLoad[$sAlias][] = $sAttCode;
+							}
+						}
+					}
+
+					$oSet->OptimizeColumnLoad($aColumnsToLoad);
+					$oSet->SetOrderByClasses();
+					SecurityHelper::PreloadForCache($oApp, $oSet->GetFilter(),
+						$aColumnsToLoad[$oQuery->GetClassAlias()] /* preloading only extkeys from the main class */);
+					$aSets[$sKey] = $oSet;
+				}
+			}
+
+			// Retrieving and preparing data for rendering
+			$aGroupingAreasData = array();
+			$bHasObjectListItemExtension = false;
+			foreach ($aSets as $sKey => $oSet)
+			{
+				// Set properties
+				$sCurrentClass = $sKey;
+
+				// Defining which attribute will open the edition form)
+				$sMainActionAttrCode = $aColumnsAttrs[0];
+
+				// Loading columns definition
+				$aColumnsDefinition = array();
+				foreach ($aColumnsAttrs as $sColumnAttr)
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sKey, $sColumnAttr);
+					$aColumnsDefinition[$sColumnAttr] = array(
+						'title' => $oAttDef->GetLabel(),
+						'type' => ($oAttDef instanceof AttributeDateTime) ? 'moment-'.$oAttDef->GetFormat()->ToMomentJS() : 'html',
+						// Special sorting for Date & Time
+					);
+				}
+
+				// Getting items
+				$aItems = array();
+				// ... For each item
+				/** @var DBObject $oCurrentRow */
+				while ($oCurrentRow = $oSet->Fetch())
+				{
+					// ... Retrieving item's attributes values
+					$aItemAttrs = array();
+					foreach ($aColumnsAttrs as $sItemAttr)
+					{
+						$aActions = array();
+						// Set the edit action to the main (first) attribute only
+						//if ($sItemAttr === $sTitleAttrCode)
+						if ($sItemAttr === $sMainActionAttrCode)
+						{
+							// Checking if we can edit the object
+							if (($oBrick->GetOpeningMode() === ManageBrick::ENUM_ACTION_EDIT) && SecurityHelper::IsActionAllowed($oApp,
+									UR_ACTION_MODIFY, $sCurrentClass, $oCurrentRow->GetKey()))
+							{
+								$sActionType = ManageBrick::ENUM_ACTION_EDIT;
+							}
+							// - Otherwise, check if view is allowed
+							elseif (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sCurrentClass,
+								$oCurrentRow->GetKey()))
+							{
+								$sActionType = ManageBrick::ENUM_ACTION_VIEW;
+							}
+							else
+							{
+								$sActionType = null;
+							}
+							// - Then set allowed action
+							if ($sActionType !== null)
+							{
+								$aActions[] = array(
+									'type' => $sActionType,
+									'class' => $sCurrentClass,
+									'id' => $oCurrentRow->GetKey(),
+									'opening_target' => $oBrick->GetOpeningTarget(),
+								);
+							}
+						}
+
+						/** @var AttributeDefinition $oAttDef */
+						$oAttDef = MetaModel::GetAttributeDef($sCurrentClass, $sItemAttr);
+						if ($oAttDef->IsExternalKey())
+						{
+							$sValue = $oCurrentRow->GetAsHTML($sItemAttr.'_friendlyname');
+
+							// Adding a view action on the external keys
+							if ($oCurrentRow->Get($sItemAttr) !== $oAttDef->GetNullValue())
+							{
+								// Checking if we can view the object
+								if ((SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oAttDef->GetTargetClass(),
+									$oCurrentRow->Get($sItemAttr))))
+								{
+									$aActions[] = array(
+										'type' => ManageBrick::ENUM_ACTION_VIEW,
+										'class' => $oAttDef->GetTargetClass(),
+										'id' => $oCurrentRow->Get($sItemAttr),
+										'opening_target' => $oBrick->GetOpeningTarget(),
+									);
+								}
+							}
+						}
+						elseif ($oAttDef instanceof AttributeImage)
+                        {
+                            $oOrmDoc = $oCurrentRow->Get($sItemAttr);
+                            if (is_object($oOrmDoc) && !$oOrmDoc->IsEmpty())
+                            {
+                                $sUrl = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oCurrentRow), 'sObjectId' => $oCurrentRow->GetKey(), 'sObjectField' => $sItemAttr, 'cache' => 86400));
+                            }
+                            else
+                            {
+                                $sUrl = $oAttDef->Get('default_image');
+                            }
+                            $sValue = '<img src="' . $sUrl . '" />';
+                        }
+						else
+						{
+                            $sValue = $oAttDef->GetAsHTML($oCurrentRow->Get($sItemAttr));
+						}
+						unset($oAttDef);
+
+						$aItemAttrs[$sItemAttr] = array(
+							'att_code' => $sItemAttr,
+							'value' => $sValue,
+							'actions' => $aActions
+						);
+					}
+
+					// ... Checking menu extensions
+					$aItemButtons = array();
+					foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
+					{
+						foreach ($oExtensionInstance->EnumItems(iPopupMenuExtension::PORTAL_OBJLISTITEM_ACTIONS, array(
+							'portal_id' => $oApp['combodo.portal.instance.id'],
+							'object' => $oCurrentRow
+						)) as $oMenuItem)
+						{
+							if (is_object($oMenuItem))
+							{
+								if ($oMenuItem instanceof JSButtonItem)
+								{
+									$aItemButtons[] = $oMenuItem->GetMenuItem() + array(
+											'js_files' => $oMenuItem->GetLinkedScripts(),
+											'type' => 'button'
+										);
+								}
+								elseif ($oMenuItem instanceof URLButtonItem)
+								{
+									$aItemButtons[] = $oMenuItem->GetMenuItem() + array('type' => 'link');
+								}
+							}
+						}
+					}
+
+					// ... And item's properties
+					$aItems[] = array(
+						'id' => $oCurrentRow->GetKey(),
+						'class' => $sCurrentClass,
+						'attributes' => $aItemAttrs,
+						'highlight_class' => $oCurrentRow->GetHilightClass(),
+						'actions' => $aItemButtons,
+					);
+
+					if (!empty($aItemButtons))
+					{
+						$bHasObjectListItemExtension = true;
+					}
+				}
+
+				// Adding an extra column for object list item extensions
+				if ($bHasObjectListItemExtension === true)
+				{
+					$aColumnsDefinition['_ui_extensions'] = array(
+						'title' => Dict::S('Brick:Portal:Manage:Table:ItemActions'),
+						'type' => 'html',
+					);
+				}
+
+				$aGroupingAreasData[$sKey] = array(
+					'sId' => $sKey,
+					'sTitle' => $aGroupingAreasValues[$sKey]['label'],
+					'aItems' => $aItems,
+					'iItemsCount' => $oSet->Count(),
+					'aColumnsDefinition' => $aColumnsDefinition
+				);
+			}
+		}
+		else
+		{
+			$aGroupingAreasData = array();
+			$sGroupingArea = null;
+		}
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			$aData = $aData + array(
+					'data' => $aGroupingAreasData[$sGroupingArea]['aItems']
+				);
+		}
+		else
+		{
+			$aDisplayValues = array();
+			$aUrls = array();
+			$aColumns = array();
+			$aNames = array();
+			if ($bHasScope)
+			{
+				foreach ($aGroupingTabsValues as $aValues)
+				{
+					$aDisplayValues[] = array(
+						'value' => $aValues['count'],
+						'label' => $aValues['label'],
+						'label_html' => $aValues['label_html'],
+					);
+					$aUrls[] = $oApp['url_generator']->generate('p_manage_brick', array(
+						'sBrickId' => $sBrickId,
+						'sDisplayMode' => 'default',
+						'sGroupingTab' => $aValues['value']
+					));
+				}
+
+				foreach ($aDisplayValues as $idx => $aValue)
+				{
+					$aColumns[] = array('series_'.$idx, (int)$aValue['value']);
+					$aNames['series_'.$idx] = $aValue['label'];
+				}
+			}
+
+			// Preparing data to pass to the templating service
+			$aData = $aData + array(
+					'sFct' => 'count',
+					'sIconURL' => $sIconURL,
+					'aColumns' => $aColumns,
+					'aNames' => $aNames,
+					'aDisplayValues' => $aDisplayValues,
+					'aUrls' => $aUrls,
+					'oBrick' => $oBrick,
+					'sBrickId' => $sBrickId,
+					'sGroupingTab' => $sGroupingTab,
+					'aGroupingTabsValues' => $aGroupingTabsValues,
+					'sDataLoading' => $sDataLoading,
+					'aGroupingAreasData' => $aGroupingAreasData,
+					'sDateFormat' => AttributeDate::GetFormat()->ToMomentJS(),
+					'sDateTimeFormat' => AttributeDateTime::GetFormat()->ToMomentJS(),
+					'iCount' => $iCount,
+				);
+		}
+
+		return $aData;
+	}
+
+    /**
+     * @param Application $oApp
+     * @param array $aData
+     * @param DBSearch $oQuery
+     * @param string $sClass
+     * @param array $aColumnsAttrs
+     *
+     * @throws \Exception
+     * @throws \CoreException
+     */
+	protected function ManageSearchValue(Application $oApp, &$aData, DBSearch &$oQuery, $sClass, $aColumnsAttrs)
+	{
+		// Getting search value
+		$sSearchValue = $oApp['request_manipulator']->ReadParam('sSearchValue', '');
+
+		// - Adding search clause if necessary
+		// Note : This is a very naive search at the moment
+		if (!empty($sSearchValue))
+		{
+		    // Putting only valid attributes as one can define attributes of leaf classes in the brick definition (<fields>), but at this stage we are working on the abstract class.
+            // Note: This won't fix everything as the search will not be looking in all fields.
+		    $aSearchListItems = array();
+		    foreach($aColumnsAttrs as $sColumnAttr)
+            {
+                if(MetaModel::IsValidAttCode($sClass, $sColumnAttr))
+                {
+                    $aSearchListItems[] = $sColumnAttr;
+                }
+            }
+
+			$oFullBinExpr = null;
+			foreach ($aSearchListItems as $sSearchItemAttr)
+			{
+				$oBinExpr = new BinaryExpression(new FieldExpression($sSearchItemAttr, $oQuery->GetClassAlias()),
+					'LIKE', new VariableExpression('search_value'));
+				// At each iteration we build the complete expression for the search like ( (field1 LIKE %search%) OR (field2 LIKE %search%) OR (field3 LIKE %search%) ...)
+				if (is_null($oFullBinExpr))
+				{
+					$oFullBinExpr = $oBinExpr;
+				}
+				else
+				{
+					$oFullBinExpr = new BinaryExpression($oFullBinExpr, 'OR', $oBinExpr);
+				}
+			}
+
+			// Then add the complete expression to the query
+			if (!is_null($oFullBinExpr))
+			{
+				// - Adding expression to the query
+				$oQuery->AddConditionExpression($oFullBinExpr);
+				// - Setting expression parameters
+				// Note : This could be way more simpler if we had a SetInternalParam($sParam, $value) verb
+				$aQueryParams = $oQuery->GetInternalParams();
+				$aQueryParams['search_value'] = '%'.$sSearchValue.'%';
+				$oQuery->SetInternalParams($aQueryParams);
+			}
+		}
+
+		$aData['sSearchValue'] = $sSearchValue;
+	}
+
+	/**
+	 * Get the groups using a given attribute code.
+	 * If a limit is given, the remaining groups are aggregated (groupby result and search request).
+	 *
+	 * @param DBSearch $oQuery Initial query
+	 * @param string $sGroupingTabAttCode Attribute code to group by
+	 * @param Application $oApp
+	 * @param ManageBrick $oBrick
+	 *
+	 * @return array of results from the groupby request and the corrsponding search.
+	 * @throws \DictExceptionMissingString
+	 * @throws \MissingQueryArgument
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	protected function GroupByAttribute(
+		DBSearch $oQuery, $sGroupingTabAttCode, Application $oApp, ManageBrick $oBrick
+	) {
+		$aGroupingTabsValues = array();
+		$aDistinctResults = array();
+		$oDistinctQuery = DBSearch::FromOQL($oBrick->GetOql());
+		/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
+		$oScopeHelper = $oApp['scope_validator'];
+		$bHasScope = $oScopeHelper->AddScopeToQuery($oDistinctQuery, $oDistinctQuery->GetClass());
+		if ($bHasScope)
+		{
+			// - Adding field condition
+			$oFieldExp = new FieldExpression($sGroupingTabAttCode, $oDistinctQuery->GetClassAlias());
+			$sDistinctSql = $oDistinctQuery->MakeGroupByQuery(array(), array('grouped_by_1' => $oFieldExp), true);
+			$aDistinctResults = CMDBSource::QueryToArray($sDistinctSql);
+			if (!empty($aDistinctResults))
+			{
+				$iLimit = $oBrick->GetGroupLimit();
+				$aOthers = array();
+				if ($iLimit > 0)
+				{
+					uasort($aDistinctResults, function ($a, $b) {
+						$v1 = $a['_itop_count_'];
+						$v2 = $b['_itop_count_'];
+
+						return ($v1 == $v2) ? 0 : (($v1 > $v2) ? -1 : 1);
+					});
+
+					if (count($aDistinctResults) > $iLimit)
+					{
+						if ($oBrick->ShowGroupOthers())
+						{
+							$aOthers = array_slice($aDistinctResults, $iLimit);
+						}
+						$aDistinctResults = array_slice($aDistinctResults, 0, $iLimit);
+					}
+				}
+
+				foreach ($aDistinctResults as $aDistinctResult)
+				{
+					$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GTAB');
+					$oExpression = new BinaryExpression(new FieldExpression($sGroupingTabAttCode,
+                        $oConditionQuery->GetClassAlias()), '=', new UnaryExpression($aDistinctResult['grouped_by_1']));
+					$oConditionQuery->AddConditionExpression($oExpression);
+
+					$sHtmlLabel = $oFieldExp->MakeValueLabel($oDistinctQuery, $aDistinctResult['grouped_by_1'], '');
+					$aGroupingTabsValues[$aDistinctResult['grouped_by_1']] = array(
+						'value' => $aDistinctResult['grouped_by_1'],
+						'label_html' => $sHtmlLabel,
+						'label' => strip_tags($sHtmlLabel),
+						'condition' => $oConditionQuery,
+						'count' => $aDistinctResult['_itop_count_'],
+					);
+					unset($oConditionQuery);
+				}
+				if (!empty($aOthers))
+				{
+					// Aggregate others
+					$oConditionQuery = DBSearch::CloneWithAlias($oQuery, 'GTAB');
+					$oExpression = null;
+					$iOtherCount = 0;
+					foreach ($aOthers as $aResult)
+					{
+						$iOtherCount += $aResult['_itop_count_'];
+						$oExpr = new BinaryExpression(new FieldExpression($sGroupingTabAttCode,
+                            $oConditionQuery->GetClassAlias()), '=', new UnaryExpression($aResult['grouped_by_1']));
+						if (is_null($oExpression))
+						{
+							$oExpression = $oExpr;
+						}
+						else
+						{
+							$oExpression = new BinaryExpression($oExpression, 'OR', $oExpr);
+						}
+					}
+					$oConditionQuery->AddConditionExpression($oExpression);
+
+					$sLabel = Dict::S('Brick:Portal:Manage:Others');
+					$aGroupingTabsValues['Others'] = array(
+						'value' => 'Others',
+						'label_html' => $sLabel,
+						'label' => $sLabel,
+						'condition' => $oConditionQuery,
+						'count' => $iOtherCount,
+					);
+					unset($oConditionQuery);
+				}
+			}
+		}
+		if (empty($aDistinctResults))
+		{
+			$sLabel = Dict::S('Brick:Portal:Manage:All');
+			$aGroupingTabsValues['undefined'] = array(
+				'value' => 'All',
+				'label_html' => $sLabel,
+				'label' => $sLabel,
+				'condition' => null,
+				'count' => 0,
+			);
+		}
+
+		return $aGroupingTabsValues;
+	}
+
+	/**
+	 * @param Application $oApp
+	 * @param ManageBrick $oBrick
+	 * @param string $sClass
+	 *
+	 * @return DBSearch
+	 * @throws \OQLException
+	 */
+	protected function GetScopedQuery(Application $oApp, ManageBrick $oBrick, $sClass)
+	{
+		$oQuery = DBSearch::FromOQL($oBrick->GetOql());
+		/** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */
+		$oScopeHelper = $oApp['scope_validator'];
+		$oScopeHelper->AddScopeToQuery($oQuery, $sClass);
+
+		return $oQuery;
+	}
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
index a15796e05..f7e3ee82a 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php
@@ -1,1647 +1,1647 @@
-<?php
-
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Exception;
-use FileUploadException;
-use utils;
-use Dict;
-use IssueLog;
-use MetaModel;
-use DBObject;
-use DBSearch;
-use DBObjectSearch;
-use FalseExpression;
-use BinaryExpression;
-use FieldExpression;
-use VariableExpression;
-use ListExpression;
-use ScalarExpression;
-use DBObjectSet;
-use AttributeEnum;
-use AttributeImage;
-use AttributeFinalClass;
-use AttributeFriendlyName;
-use UserRights;
-use iPopupMenuExtension;
-use URLButtonItem;
-use JSButtonItem;
-use Combodo\iTop\Portal\Helper\ApplicationHelper;
-use Combodo\iTop\Portal\Helper\SecurityHelper;
-use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
-use Combodo\iTop\Portal\Form\ObjectFormManager;
-use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
-
-/**
- * Controller to handle basic view / edit / create of cmdbAbstractObject
- */
-class ObjectController extends AbstractController
-{
-
-	const ENUM_MODE_VIEW = 'view';
-	const ENUM_MODE_EDIT = 'edit';
-	const ENUM_MODE_CREATE = 'create';
-
-	const DEFAULT_PAGE_NUMBER = 1;
-	const DEFAULT_LIST_LENGTH = 10;
-
-	/**
-	 * Displays an cmdbAbstractObject if the connected user is allowed to.
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sObjectClass (Class must be instance of cmdbAbstractObject)
-	 * @param string $sObjectId
-	 * @return Response
-	 */
-	public function ViewAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId)
-	{
-		// Checking parameters
-		if ($sObjectClass === '' || $sObjectId === '')
-		{
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass and sObjectId expected, "' . $sObjectClass . '" and "' . $sObjectId . '" given.');
-			$oApp->abort(500, Dict::Format('UI:Error:2ParametersMissing', 'class', 'id'));
-		}
-
-		// Checking security layers
-		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sObjectClass, $sObjectId))
-		{
-			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to read ' . $sObjectClass . '::' . $sObjectId . ' object.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// Retrieving object
-		$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* MustBeFound */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
-		if ($oObject === null)
-		{
-			// We should never be there as the secuirty helper makes sure that the object exists, but just in case.
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
-
-		$aData = array('sMode' => 'view');
-		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId);
-		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:View:Title', MetaModel::GetName($sObjectClass), $oObject->GetName());
-
-		// Add an edit button if user is allowed
-		if (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_MODIFY, $sObjectClass, $sObjectId))
-		{
-		    $oModifyButton = new URLButtonItem(
-		        'modify_object',
-                Dict::S('UI:Menu:Modify'),
-				$oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId))
-            );
-		    // Putting this one first
-		    $aData['form']['buttons']['links'][] = $oModifyButton->GetMenuItem();
-		}
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
-			if (empty($sOperation))
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
-			}
-			else
-			{
-				$oResponse = $oApp->json($aData);
-			}
-		}
-		else
-		{
-			// Adding brick if it was passed
-			$sBrickId = $oApp['request_manipulator']->ReadParam('sBrickId', '');
-			if (!empty($sBrickId))
-			{
-				$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-				if ($oBrick !== null)
-				{
-					$aData['oBrick'] = $oBrick;
-				}
-			}
-			$aData['sPageTitle'] = $aData['form']['title'];
-			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
-		}
-
-		return $oResponse;
-	}
-
-	public function EditAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId)
-	{
-		// Checking parameters
-		if ($sObjectClass === '' || $sObjectId === '')
-		{
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass and sObjectId expected, "' . $sObjectClass . '" and "' . $sObjectId . '" given.');
-			$oApp->abort(500, Dict::Format('UI:Error:2ParametersMissing', 'class', 'id'));
-		}
-		
-		// Checking security layers
-		// Warning : This is a dirty quick fix to allow editing its own contact information
-		$bAllowWrite = ($sObjectClass === 'Person' && $sObjectId == UserRights::GetContactId());
-		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_MODIFY, $sObjectClass, $sObjectId) && !$bAllowWrite)
-		{
-			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to modify ' . $sObjectClass . '::' . $sObjectId . ' object.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// Retrieving object
-		$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* MustBeFound */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
-		if ($oObject === null)
-		{
-			// We should never be there as the secuirty helper makes sure that the object exists, but just in case.
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
-
-		$aData = array('sMode' => 'edit');
-		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId);
-		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Edit:Title', MetaModel::GetName($sObjectClass), $aData['form']['object_name']);
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
-			if (empty($sOperation))
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
-			}
-			else
-			{
-				$oResponse = $oApp->json($aData);
-			}
-		}
-		else
-		{
-			// Adding brick if it was passed
-			$sBrickId = $oApp['request_manipulator']->ReadParam('sBrickId', '');
-			if (!empty($sBrickId))
-			{
-				$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-				if ($oBrick !== null)
-				{
-					$aData['oBrick'] = $oBrick;
-				}
-			}
-			$aData['sPageTitle'] = $aData['form']['title'];
-			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Creates an cmdbAbstractObject of the $sObjectClass
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sObjectClass
-	 * @return Response
-	 */
-	public function CreateAction(Request $oRequest, Application $oApp, $sObjectClass)
-	{
-		// Checking security layers
-		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_CREATE, $sObjectClass))
-		{
-			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to create ' . $sObjectClass . ' object.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
-
-		$aData = array('sMode' => 'create');
-		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass);
-		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Create:Title', MetaModel::GetName($sObjectClass));
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
-			if (empty($sOperation))
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
-			}
-			else
-			{
-				$oResponse = $oApp->json($aData);
-			}
-		}
-		else
-		{
-			// Adding brick if it was passed
-			$sBrickId = $oApp['request_manipulator']->ReadParam('sBrickId', '');
-			if (!empty($sBrickId))
-			{
-				$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-				if ($oBrick !== null)
-				{
-					$aData['oBrick'] = $oBrick;
-				}
-			}
-			$aData['sPageTitle'] = $aData['form']['title'];
-			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Creates an cmdbAbstractObject of a class determined by the method encoded in $sEncodedMethodName.
-	 * This method use an origin DBObject in order to determine the created cmdbAbstractObject.
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sObjectClass Class of the origin object
-	 * @param string $sObjectId ID of the origin object
-	 * @param string $sEncodedMethodName Base64 encoded factory method name
-	 * @return Response
-	 */
-	public function CreateFromFactoryAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId, $sEncodedMethodName)
-	{
-		$sMethodName = base64_decode($sEncodedMethodName);
-
-		// Checking that the factory method is valid
-		if (!is_callable($sMethodName))
-		{
-			IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Invalid factory method "' . $sMethodName . '" used when creating an object.');
-			$oApp->abort(500, 'Invalid factory method "' . $sMethodName . '" used when creating an object');
-		}
-		
-		// Retrieving origin object
-		// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
-		$oOriginObject = MetaModel::GetObject($sObjectClass, $sObjectId, true, true);
-
-		// Retrieving target object (We check if the method is a simple function or if it's part of a class in which case only static function are supported)
-		if (!strpos($sMethodName, '::'))
-		{
-			$oTargetObject = $sMethodName($oOriginObject);
-		}
-		else
-		{
-			$aMethodNameParts = explode('::', $sMethodName);
-			$sMethodClass = $aMethodNameParts[0];
-			$sMethodName = $aMethodNameParts[1];
-			$oTargetObject = $sMethodClass::$sMethodName($oOriginObject);
-		}
-
-		// Preparing redirection
-		// - Route
-		$aRouteParams = array(
-			'sObjectClass' => get_class($oTargetObject)
-		);
-		$sRedirectRoute = $oApp['url_generator']->generate('p_object_create', $aRouteParams);
-		// - Request
-		$oSubRequest = Request::create($sRedirectRoute, 'GET', $oRequest->query->all(), $oRequest->cookies->all(), array(), $oRequest->server->all());
-
-		return $oApp->handle($oSubRequest, HttpKernelInterface::SUB_REQUEST, true);
-	}
-
-	/**
-	 * Applies a stimulus $sStimulus on an cmdbAbstractObject
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sObjectClass
-	 * @param string $sObjectId
-	 * @param string $sStimulusCode
-	 * @return Response
-	 */
-	public function ApplyStimulusAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId, $sStimulusCode)
-	{
-		// Checking parameters
-		if ($sObjectClass === '' || $sObjectId === '' || $sStimulusCode === '')
-		{
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass, sObjectId and $sStimulusCode expected, "' . $sObjectClass . '", "' . $sObjectId . '" and "' . $sStimulusCode . '" given.');
-			$oApp->abort(500, Dict::Format('UI:Error:3ParametersMissing', 'class', 'id', 'stimulus'));
-		}
-
-		// Checking security layers
-        if(!SecurityHelper::IsStimulusAllowed($oApp, $sStimulusCode, $sObjectClass))
-		{
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-		
-		// Retrieving object
-		$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* MustBeFound */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
-		if ($oObject === null)
-		{
-			// We should never be there as the secuirty helper makes sure that the object exists, but just in case.
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// Retrieving request parameters
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
-
-		// Retrieving form properties
-        $aStimuliForms = ApplicationHelper::GetLoadedFormFromClass($oApp, $sObjectClass, 'apply_stimulus');
-        if(array_key_exists($sStimulusCode, $aStimuliForms))
-        {
-            $aFormProperties = $aStimuliForms[$sStimulusCode];
-        }
-        // Or preparing a default form for the stimulus application
-        else
-        {
-            // Preparing default form
-            $aFormProperties = array(
-                'id' => 'apply-stimulus',
-                'type' => 'custom_list',
-                'fields' => array(),
-                'layout' => null
-            );
-        }
-
-        // Adding stimulus code to form
-        $aFormProperties['stimulus_code'] = $sStimulusCode;
-
-		// Adding target_state to current_values
-		$oRequest->request->set('apply_stimulus', array('code' => $sStimulusCode));
-
-		$aData = array('sMode' => 'apply_stimulus');
-		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId, $aFormProperties);
-		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Stimulus:Title');
-		$aData['form']['validation']['redirection'] = array(
-			'url' => $oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId))
-		);
-
-		// TODO : This is a ugly patch to avoid showing a modal with a readonly form to the user as it would prevent user from finishing the transition.
-		// Instead, we apply the stimulus directly here and then go to the edited object.
-		if (empty($sOperation))
-		{
-			if (isset($aData['form']['editable_fields_count']) && $aData['form']['editable_fields_count'] === 0)
-			{
-				$sOperation = 'redirect';
-
-				$oSubRequest = $oRequest;
-				$oSubRequest->request->set('operation', 'submit');
-				$oSubRequest->request->set('stimulus_code', '');
-				
-				$aData = array('sMode' => 'apply_stimulus');
-				$aData['form'] = $this->HandleForm($oSubRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId, $aFormProperties);
-				// Redefining the array to be as simple as possible :
-				$aData = array('redirection' =>
-					array('url' => $oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId)))
-				);
-			}
-		}
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
-			if (empty($sOperation))
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
-			}
-			elseif ($sOperation === 'redirect')
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/modal/mode_loader.html.twig', $aData);
-			}
-			else
-			{
-				$oResponse = $oApp->json($aData);
-			}
-		}
-		else
-		{
-			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
-		}
-
-		return $oResponse;
-	}
-
-	public static function HandleForm(Request $oRequest, Application $oApp, $sMode, $sObjectClass, $sObjectId = null, $aFormProperties = null)
-	{
-		$aFormData = array();
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
-		$bModal = ($oRequest->isXmlHttpRequest() && empty($sOperation));
-
-		// - Retrieve form properties
-		if ($aFormProperties === null)
-		{
-			$aFormProperties = ApplicationHelper::GetLoadedFormFromClass($oApp, $sObjectClass, $sMode);
-		}
-
-		// - Create and
-		if (empty($sOperation))
-		{
-			// Retrieving action rules
-			//
-			// Note : The action rules must be a base64-encoded JSON object, this is just so users are tempted to changes values.
-			// But it would not be a security issue as it only presets values in the form.
-            $sActionRulesToken = $oApp['request_manipulator']->ReadParam('ar_token', '');
-			$aActionRules = (!empty($sActionRulesToken)) ? ContextManipulatorHelper::DecodeRulesToken($sActionRulesToken) : array();
-			
-			// Preparing object
-			if ($sObjectId === null)
-			{
-				// Create new UserRequest
-				$oObject = MetaModel::NewObject($sObjectClass);
-
-				// Retrieve action rules information to auto-fill the form if available
-				// Preparing object
-				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObject);
-				$aPrefillFormParam = array( 'user' => $_SESSION["auth_user"],
-											'origin' => 'portal');
-				$oObject->PrefillForm('creation_from_0', $aPrefillFormParam);
-			}
-			else
-			{
-				$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, true, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
-			}
-
-			// Preparing buttons
-			$aFormData['buttons'] = array(
-				'transitions' => array(),
-                'actions' => array(),
-                'links' => array(),
-                'submit' => array(
-                    'label' => Dict::S('Portal:Button:Submit'),
-                ),
-			);
-			if ($sMode !== 'apply_stimulus')
-			{
-			    // Add transition buttons
-				$oSetToCheckRights = DBObjectSet::FromObject($oObject);
-				$aStimuli = Metamodel::EnumStimuli($sObjectClass);
-				foreach ($oObject->EnumTransitions() as $sStimulusCode => $aTransitionDef)
-				{
-					if(SecurityHelper::IsStimulusAllowed($oApp, $sStimulusCode, $sObjectClass, $oSetToCheckRights))
-                    {
-                        $aFormData['buttons']['transitions'][$sStimulusCode] = $aStimuli[$sStimulusCode]->GetLabel();
-                    }
-				}
-
-                // Add plugin buttons
-                foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
-                {
-                    foreach($oExtensionInstance->EnumItems(iPopupMenuExtension::PORTAL_OBJDETAILS_ACTIONS, array('portal_id' => $oApp['combodo.portal.instance.id'], 'object' => $oObject)) as $oMenuItem)
-                    {
-                        if (is_object($oMenuItem))
-                        {
-                            if($oMenuItem instanceof JSButtonItem)
-                            {
-                                $aFormData['buttons']['actions'][] = $oMenuItem->GetMenuItem() + array('js_files' => $oMenuItem->GetLinkedScripts());
-                            }
-                            elseif($oMenuItem instanceof URLButtonItem)
-                            {
-                                $aFormData['buttons']['links'][] = $oMenuItem->GetMenuItem();
-                            }
-                        }
-                    }
-                }
-
-                // Hiding submit button or changing its label if necessary
-                if(!empty($aFormData['buttons']['transitions']) && isset($aFormProperties['properties']) &&$aFormProperties['properties']['always_show_submit'] === false)
-                {
-                    unset($aFormData['buttons']['submit']);
-                }
-                elseif($sMode === static::ENUM_MODE_EDIT)
-                {
-                    $aFormData['buttons']['submit']['label'] = Dict::S('Portal:Button:Apply');
-                }
-			}
-			else
-			{
-				$aPrefillFormParam = array(
-				    'user' => $_SESSION["auth_user"],
-					'origin' => 'portal',
-					'stimulus' => $oApp['request_manipulator']->ReadParam('apply_stimulus', null)['code'],
-                );
-				$oObject->PrefillForm('state_change', $aPrefillFormParam);
-			}
-
-			// Preparing callback urls
-			$aCallbackUrls = $oApp['context_manipulator']->GetCallbackUrls($oApp, $aActionRules, $oObject, $bModal);
-			$aFormData['submit_callback'] = $aCallbackUrls['submit'];
-			$aFormData['cancel_callback'] = $aCallbackUrls['cancel'];
-
-			// Preparing renderer
-			// Note : We might need to distinguish form & renderer endpoints
-			if (in_array($sMode, array('create', 'edit', 'view')))
-			{
-				$sFormEndpoint = $oApp['url_generator']->generate('p_object_' . $sMode, array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId));
-			}
-			else
-			{
-				$sFormEndpoint = $_SERVER['REQUEST_URI'];
-			}
-			$oFormRenderer = new BsFormRenderer();
-			$oFormRenderer->SetEndpoint($sFormEndpoint);
-
-			$oFormManager = new ObjectFormManager();
-			$oFormManager->SetApplication($oApp)
-				->SetObject($oObject)
-				->SetMode($sMode)
-				->SetActionRulesToken($sActionRulesToken)
-				->SetRenderer($oFormRenderer)
-				->SetFormProperties($aFormProperties);
-
-			$oFormManager->Build();
-
-			// Check the number of editable fields
-			$aFormData['editable_fields_count'] = $oFormManager->GetForm()->GetEditableFieldCount();
-		}
-		else
-		{
-			// Update / Submit / Cancel
-			$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', '', FILTER_UNSAFE_RAW);
-			$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', '', FILTER_UNSAFE_RAW);
-			if ( empty($sFormManagerClass) || empty($sFormManagerData) )
-			{
-				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameters formmanager_class and formamanager_data must be defined.');
-				$oApp->abort(500, 'Parameters formmanager_class and formmanager_data must be defined.');
-			}
-
-			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
-			$oFormManager->SetApplication($oApp);
-			
-			// Applying action rules if present
-			if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
-			{
-				$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
-				$oObj = $oFormManager->GetObject();
-				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObj);
-				$oFormManager->SetObject($oObj);
-			}
-			
-			switch ($sOperation)
-			{
-				case 'submit':
-					// Applying modification to object
-					$aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW), 'attachmentIds' => $oApp['request_manipulator']->ReadParam('attachment_ids', array(), FILTER_UNSAFE_RAW), 'formProperties' => $aFormProperties, 'applyStimulus' => $oApp['request_manipulator']->ReadParam('apply_stimulus', null)));
-					if ($aFormData['validation']['valid'] === true)
-					{
-						// Note : We don't use $sObjectId there as it can be null if we are creating a new one. Instead we use the id from the created object once it has been seralized
-						// Check if stimulus has to be applied
-                        $sStimulusCode = $oApp['request_manipulator']->ReadParam('stimulus_code', '');
-						if (!empty($sStimulusCode))
-						{
-							$aFormData['validation']['redirection'] = array(
-								'url' => $oApp['url_generator']->generate('p_object_apply_stimulus', array('sObjectClass' => $sObjectClass, 'sObjectId' => $oFormManager->GetObject()->GetKey(), 'sStimulusCode' => $sStimulusCode)),
-								'ajax' => true
-							);
-						}
-						// Otherwise, we show the object if there is no default
-//						else
-//						{
-//							$aFormData['validation']['redirection'] = array(
-//								'alternative_url' => $oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $oFormManager->GetObject()->GetKey()))
-//							);
-//						}
-					}
-					break;
-
-				case 'update':
-					$oFormManager->OnUpdate(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW), 'formProperties' => $aFormProperties));
-					break;
-
-				case 'cancel':
-					$oFormManager->OnCancel();
-					break;
-			}
-		}
-		
-		// Preparing field_set data
-		$aFieldSetData = array(
-			//'fields_list' => $oFormManager->GetRenderer()->Render(), // GLA : This should be done just after in the if statement.
-			'fields_impacts' => $oFormManager->GetForm()->GetFieldsImpacts(),
-			'form_path' => $oFormManager->GetForm()->GetId()
-		);
-
-		// Preparing fields list regarding the operation
-		if ($sOperation === 'update')
-		{
-			$aRequestedFields = $oApp['request_manipulator']->ReadParam('requested_fields', array(), FILTER_UNSAFE_RAW);
-			$sFormPath = $oApp['request_manipulator']->ReadParam('form_path', '');
-
-			// Checking if the update was on a subform, if so we need to make the rendering for that part only
-			if ( !empty($sFormPath) && $sFormPath !== $oFormManager->GetForm()->GetId() )
-			{
-				$oSubForm = $oFormManager->GetForm()->FindSubForm($sFormPath);
-				$oSubFormRenderer = new BsFormRenderer($oSubForm);
-				$oSubFormRenderer->SetEndpoint($oFormManager->GetRenderer()->GetEndpoint());
-				$aFormData['updated_fields'] = $oSubFormRenderer->Render($aRequestedFields);
-			}
-			else
-			{
-				$aFormData['updated_fields'] = $oFormManager->GetRenderer()->Render($aRequestedFields);
-			}
-		}
-		else
-		{
-			$aFieldSetData['fields_list'] = $oFormManager->GetRenderer()->Render();
-		}
-
-		// Preparing form data
-		$aFormData['id'] = $oFormManager->GetForm()->GetId();
-		$aFormData['transaction_id'] = $oFormManager->GetForm()->GetTransactionId();
-		$aFormData['formmanager_class'] = $oFormManager->GetClass();
-		$aFormData['formmanager_data'] = $oFormManager->ToJSON();
-		$aFormData['renderer'] = $oFormManager->GetRenderer();
-		$aFormData['object_name'] = $oFormManager->GetObject()->GetName();
-		$aFormData['object_state'] = $oFormManager->GetObject()->GetState();
-		$aFormData['fieldset'] = $aFieldSetData;
-        $aFormData['display_mode'] = (isset($aFormProperties['properties'])) ? $aFormProperties['properties']['display_mode'] : ApplicationHelper::FORM_DEFAULT_DISPLAY_MODE;
-
-		return $aFormData;
-	}
-
-	/**
-	 * Handles the autocomplete search
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search
-	 * @param string $sHostObjectClass Class name of the host object
-	 * @param string $sHostObjectId Id of the host object
-	 * @return Response
-	 */
-	public function SearchAutocompleteAction(Request $oRequest, Application $oApp, $sTargetAttCode, $sHostObjectClass, $sHostObjectId = null)
-	{
-		$aData = array(
-			'results' => array(
-				'count' => 0,
-				'items' => array()
-			)
-		);
-
-		// Parsing parameters from request payload
-		parse_str($oRequest->getContent(), $aRequestContent);
-
-		// Checking parameters
-		if (!isset($aRequestContent['sQuery']))
-		{
-			IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameter sQuery missing.');
-			$oApp->abort(500, Dict::Format('UI:Error:ParameterMissing', 'sQuery'));
-		}
-
-		// Retrieving parameters
-		$sQuery = $aRequestContent['sQuery'];
-		$sFormPath = $aRequestContent['sFormPath'];
-		$sFieldId = $aRequestContent['sFieldId'];
-
-		// Checking security layers
-		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostObjectClass, $sHostObjectId))
-		{
-			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sHostObjectClass . '::' . $sHostObjectId . '.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// Retrieving host object for future DBSearch parameters
-		if ($sHostObjectId !== null)
-		{
-			// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
-			$oHostObject = MetaModel::GetObject($sHostObjectClass, $sHostObjectId, true, true);
-		}
-		else
-		{
-			$oHostObject = MetaModel::NewObject($sHostObjectClass);
-			// Retrieving action rules
-			//
-			// Note : The action rules must be a base64-encoded JSON object, this is just so users are tempted to changes values.
-			// But it would not be a security issue as it only presets values in the form.
-            $sActionRulesToken = $oApp['request_manipulator']->ReadParam('ar_token', '');
-			$aActionRules = (!empty($sActionRulesToken)) ? ContextManipulatorHelper::DecodeRulesToken($sActionRulesToken) : array();
-			// Preparing object
-			$oApp['context_manipulator']->PrepareObject($aActionRules, $oHostObject);
-		}
-
-		// Updating host object with form data / values
-		$sFormManagerClass = $aRequestContent['formmanager_class'];
-		$sFormManagerData = $aRequestContent['formmanager_data'];
-		if (!empty($sFormManagerClass) && !empty($sFormManagerData))
-		{
-			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
-			$oFormManager->SetApplication($oApp);
-			$oFormManager->SetObject($oHostObject);
-
-			// Applying action rules if present
-			if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
-			{
-				$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
-				$oObj = $oFormManager->GetObject();
-				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObj);
-				$oFormManager->SetObject($oObj);
-			}
-			
-			// Updating host object
-			$oFormManager->OnUpdate(array('currentValues' => $aRequestContent['current_values']));
-			$oHostObject = $oFormManager->GetObject();
-		}
-
-		// Building search query
-		// - Retrieving target object class from attcode
-		$oTargetAttDef = MetaModel::GetAttributeDef($sHostObjectClass, $sTargetAttCode);
-		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
-		{
-			$oRequestTemplate = $oHostObject->Get($sTargetAttCode);
-			$oTemplateFieldSearch = $oRequestTemplate->GetForm()->GetField('user_data')->GetForm()->GetField($sFieldId)->GetSearch();
-			$sTargetObjectClass = $oTemplateFieldSearch->GetClass();
-		}
-		elseif ($oTargetAttDef->IsLinkSet())
-		{
-			throw new Exception('Search autocomplete cannot apply on AttributeLinkedSet objects, ' . get_class($oTargetAttDef) . ' (' . $sHostObjectClass . '->' . $sTargetAttCode . ') given.');
-		}
-		else
-		{
-			$sTargetObjectClass = $oTargetAttDef->GetTargetClass();
-		}
-		// - Base query from meta model
-		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
-		{
-			$oSearch = $oTemplateFieldSearch;
-		}
-		else
-		{
-			$oSearch = DBSearch::FromOQL($oTargetAttDef->GetValuesDef()->GetFilterExpression());
-		}
-		// - Adding query condition
-		$oSearch->AddConditionExpression(new BinaryExpression(new FieldExpression('friendlyname', $oSearch->GetClassAlias()), 'LIKE', new VariableExpression('ac_query')));
-		// - Intersecting with scope constraints
-		// Note : This do NOT apply to custom fields as the portal administrator is not supposed to know which objects will be put in the templates.
-		// It is the responsability of the template designer to write the right query so the user see only what he should.
-		if ($oTargetAttDef->GetEditClass() !== 'CustomFields')
-		{
-			$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
-			$oSearch = $oSearch->Intersect($oScopeSearch);
-			// - Allowing all data if necessary
-			if ($oScopeSearch->IsAllDataAllowed())
-			{
-				$oSearch->AllowAllData();
-			}
-		}
-
-		// Retrieving results
-		// - Preparing object set
-		$oSet = new DBObjectSet($oSearch, array(), array('this' => $oHostObject, 'ac_query' => '%' . $sQuery . '%'));
-		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
-		// Note : This limit is also used in the field renderer by typeahead to determine how many suggestions to display
-		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
-		{
-			$oSet->SetLimit(static::DEFAULT_LIST_LENGTH);
-		}
-		else
-		{
-			$oSet->SetLimit($oTargetAttDef->GetMaximumComboLength()); // TODO : Is this the right limit value ? We might want to use another parameter
-		}
-		// - Retrieving objects
-		while ($oItem = $oSet->Fetch())
-		{
-			$aData['results']['items'][] = array('id' => $oItem->GetKey(), 'name' => html_entity_decode($oItem->GetName(), ENT_QUOTES, 'UTF-8'));
-			$aData['results']['count'] ++;
-		}
-
-		// Preparing response
-		if ($oRequest->isXmlHttpRequest())
-		{
-			$oResponse = $oApp->json($aData);
-		}
-		else
-		{
-			$oResponse = $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Handles the regular (table) search from an attribute
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search
-	 * @param string $sHostObjectClass Class name of the host object
-	 * @param string $sHostObjectId Id of the host object
-	 * @return Response
-	 */
-	public function SearchFromAttributeAction(Request $oRequest, Application $oApp, $sTargetAttCode, $sHostObjectClass, $sHostObjectId = null)
-	{
-		$aData = array(
-			'sMode' => 'search_regular',
-			'sTargetAttCode' => $sTargetAttCode,
-			'sHostObjectClass' => $sHostObjectClass,
-			'sHostObjectId' => $sHostObjectId,
-			'sActionRulesToken' => $oApp['request_manipulator']->ReadParam('ar_token', ''),
-		);
-
-		// Checking security layers
-		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostObjectClass, $sHostObjectId))
-		{
-			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to read ' . $sHostObjectClass . '::' . $sHostObjectId . ' object.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// Retrieving host object for future DBSearch parameters
-		if ($sHostObjectId !== null)
-		{
-			// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
-			$oHostObject = MetaModel::GetObject($sHostObjectClass, $sHostObjectId, true, true);
-		}
-		else
-		{
-			$oHostObject = MetaModel::NewObject($sHostObjectClass);
-			// Retrieving action rules
-			//
-			// Note : The action rules must be a base64-encoded JSON object, this is just so users are tempted to changes values.
-			// But it would not be a security issue as it only presets values in the form.
-			$aActionRules = !empty($aData['sActionRulesToken']) ? ContextManipulatorHelper::DecodeRulesToken($aData['sActionRulesToken']) : array();
-			// Preparing object
-			$oApp['context_manipulator']->PrepareObject($aActionRules, $oHostObject);
-		}
-
-		// Updating host object with form data / values
-		$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', '', FILTER_UNSAFE_RAW);
-		$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', '', FILTER_UNSAFE_RAW);
-		if ( !empty($sFormManagerClass) && !empty($sFormManagerData) )
-		{
-			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
-			$oFormManager->SetApplication($oApp);
-			$oFormManager->SetObject($oHostObject);
-
-			// Applying action rules if present
-			if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
-			{
-				$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
-				$oObj = $oFormManager->GetObject();
-				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObj);
-				$oFormManager->SetObject($oObj);
-			}
-			
-			// Updating host object
-			$oFormManager->OnUpdate(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW)));
-			$oHostObject = $oFormManager->GetObject();
-		}
-		
-		// Retrieving request parameters
-		$iPageNumber = $oApp['request_manipulator']->ReadParam('iPageNumber', static::DEFAULT_PAGE_NUMBER, FILTER_SANITIZE_NUMBER_INT);
-		$iListLength = $oApp['request_manipulator']->ReadParam('iListLength', static::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT);
-		$bInitalPass = $oApp['request_manipulator']->HasParam('draw') ? false : true;
-		$sQuery = $oApp['request_manipulator']->ReadParam('sSearchValue', '');
-		$sFormPath = $oApp['request_manipulator']->ReadParam('sFormPath', '');
-		$sFieldId = $oApp['request_manipulator']->ReadParam('sFieldId', '');
-		$aObjectIdsToIgnore = $oApp['request_manipulator']->ReadParam('aObjectIdsToIgnore', null, FILTER_UNSAFE_RAW);
-
-		// Building search query
-		// - Retrieving target object class from attcode
-		$oTargetAttDef = MetaModel::GetAttributeDef($sHostObjectClass, $sTargetAttCode);
-		if ($oTargetAttDef->IsExternalKey())
-		{
-			$sTargetObjectClass = $oTargetAttDef->GetTargetClass();
-		}
-		elseif ($oTargetAttDef->IsLinkSet())
-		{
-			if (!$oTargetAttDef->IsIndirect())
-			{
-				$sTargetObjectClass = $oTargetAttDef->GetLinkedClass();
-			}
-			else
-			{
-				$oRemoteAttDef = MetaModel::GetAttributeDef($oTargetAttDef->GetLinkedClass(), $oTargetAttDef->GetExtKeyToRemote());
-				$sTargetObjectClass = $oRemoteAttDef->GetTargetClass();
-			}
-		}
-		elseif ($oTargetAttDef->GetEditClass() === 'CustomFields')
-		{
-			$oRequestTemplate = $oHostObject->Get($sTargetAttCode);
-			$oTemplateFieldSearch = $oRequestTemplate->GetForm()->GetField('user_data')->GetForm()->GetField($sFieldId)->GetSearch();
-			$sTargetObjectClass = $oTemplateFieldSearch->GetClass();
-		}
-		else
-		{
-			throw new Exception('Search from attribute can only apply on AttributeExternalKey or AttributeLinkedSet objects, ' . get_class($oTargetAttDef) . ' given.');
-		}
-		
-		// - Retrieving class attribute list
-		$aAttCodes = ApplicationHelper::GetLoadedListFromClass($oApp, $sTargetObjectClass, 'list');
-		// - Adding friendlyname attribute to the list is not already in it
-		$sTitleAttCode = 'friendlyname';
-		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodes))
-		{
-			$aAttCodes = array_merge(array($sTitleAttCode), $aAttCodes);
-		}
-
-		// - Retrieving scope search
-		// Note : This do NOT apply to custom fields as the portal administrator is not supposed to know which objects will be put in the templates.
-		// It is the responsability of the template designer to write the right query so the user see only what he should.
-		$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
-		$aInternalParams = array();
-		if (($oScopeSearch === null) && ($oTargetAttDef->GetEditClass() !== 'CustomFields'))
-		{
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' has no scope query for ' . $sTargetObjectClass . ' class.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// - Base query from meta model
-		if ($oTargetAttDef->IsExternalKey())
-		{
-			$oSearch = DBSearch::FromOQL($oTargetAttDef->GetValuesDef()->GetFilterExpression());
-		}
-		elseif ($oTargetAttDef->IsLinkSet())
-		{
-			$oSearch = $oScopeSearch;
-		}
-		elseif ($oTargetAttDef->GetEditClass() === 'CustomFields')
-		{
-			// Note : $oTemplateFieldSearch has been defined in the "Retrieving target object class from attcode" part, it is not available otherwise
-			$oSearch = $oTemplateFieldSearch;
-		}
-
-		// - Filtering objects to ignore
-		if (($aObjectIdsToIgnore !== null) && (is_array($aObjectIdsToIgnore)))
-		{
-			//$oSearch->AddConditionExpression('id', $aObjectIdsToIgnore, 'NOT IN');
-			$aExpressions = array();
-			foreach ($aObjectIdsToIgnore as $sObjectIdToIgnore)
-			{
-				$aExpressions[] = new ScalarExpression($sObjectIdToIgnore);
-			}
-			$oSearch->AddConditionExpression(new BinaryExpression(new FieldExpression('id', $oSearch->GetClassAlias()), 'NOT IN', new ListExpression($aExpressions)));
-		}
-		
-		// - Adding query condition
-		$aInternalParams['this'] = $oHostObject;
-		if (!empty($sQuery))
-		{
-			$oFullExpr = null;
-			for ($i = 0; $i < count($aAttCodes); $i++)
-			{
-				// Checking if the current attcode is an external key in order to search on the friendlyname
-				$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $aAttCodes[$i]);
-				$sAttCode = (!$oAttDef->IsExternalKey()) ? $aAttCodes[$i] : $aAttCodes[$i] . '_friendlyname';
-				// Building expression for the current attcode
-				// - For attributes that need conversion from their display value to storage value
-				//   Note : This is dirty hack that will need to be refactored in the OQL core in order to be nicer and to be extended to other types such as dates etc...
-				if (($oAttDef instanceof AttributeEnum) || ($oAttDef instanceof AttributeFinalClass))
-				{
-					// Looking up storage value
-					$aMatchedCodes = array();
-					foreach ($oAttDef->GetAllowedValues() as $sValueCode => $sValueLabel)
-					{
-						if (stripos($sValueLabel, $sQuery) !== false)
-						{
-							$aMatchedCodes[] = $sValueCode;
-						}
-					}
-					// Building expression
-					if (!empty($aMatchedCodes))
-					{
-						$oEnumeratedListExpr = ListExpression::FromScalars($aMatchedCodes);
-						$oBinExpr = new BinaryExpression(new FieldExpression($sAttCode, $oSearch->GetClassAlias()), 'IN', $oEnumeratedListExpr);
-					}
-					else
-					{
-						$oBinExpr = new FalseExpression();
-					}
-				}
-				// - For regular attributs
-				else
-				{
-					$oBinExpr = new BinaryExpression(new FieldExpression($sAttCode, $oSearch->GetClassAlias()), 'LIKE', new VariableExpression('re_query'));
-				}
-				// Adding expression to the full expression (all attcodes)
-				if ($i === 0)
-				{
-					$oFullExpr = $oBinExpr;
-				}
-				else
-				{
-					$oFullExpr = new BinaryExpression($oFullExpr, 'OR', $oBinExpr);
-				}
-			}
-			// Adding full expression to the search object
-			$oSearch->AddConditionExpression($oFullExpr);
-			$aInternalParams['re_query'] = '%' . $sQuery . '%';
-		}
-
-		// - Intersecting with scope constraints
-		// Note : This do NOT apply to custom fields as the portal administrator is not supposed to know which objects will be put in the templates.
-		// It is the responsability of the template designer to write the right query so the user see only what he should.
-		if (($oScopeSearch !== null) && ($oTargetAttDef->GetEditClass() !== 'CustomFields'))
-		{
-			$oSearch = $oSearch->Intersect($oScopeSearch);
-			// - Allowing all data if necessary
-			if ($oScopeSearch->IsAllDataAllowed())
-			{
-				$oSearch->AllowAllData();
-			}
-		}
-
-		// Retrieving results
-		// - Preparing object set
-		$oSet = new DBObjectSet($oSearch, array(), $aInternalParams);
-		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => $aAttCodes));
-		$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
-		// - Retrieving columns properties
-		$aColumnProperties = array();
-		foreach ($aAttCodes as $sAttCode)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $sAttCode);
-			$aColumnProperties[$sAttCode] = array(
-				'title' => $oAttDef->GetLabel()
-			);
-		}
-		// - Retrieving objects
-		$aItems = array();
-		while ($oItem = $oSet->Fetch())
-		{
-			$aItems[] = $this->PrepareObjectInformations($oApp, $oItem, $aAttCodes);
-		}
-		
-		// Preparing response
-		if ($bInitalPass)
-		{
-			$aData = $aData + array(
-				'form' => array(
-					'id' => 'object_search_form_' . time(),
-					'title' => Dict::Format('Brick:Portal:Object:Search:Regular:Title', $oTargetAttDef->GetLabel(), MetaModel::GetName($sTargetObjectClass))
-				),
-				'aColumnProperties' => json_encode($aColumnProperties),
-				'aResults' => array(
-					'aItems' => json_encode($aItems),
-					'iCount' => count($aItems)
-				),
-				'bMultipleSelect' => $oTargetAttDef->IsLinkSet(),
-				'aSource' => array(
-					'sFormPath' => $sFormPath,
-					'sFieldId' => $sFieldId,
-					'aObjectIdsToIgnore' => $aObjectIdsToIgnore,
-					'sFormManagerClass' => $sFormManagerClass,
-					'sFormManagerData' => $sFormManagerData
-				)
-			);
-			
-			if ($oRequest->isXmlHttpRequest())
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
-			}
-			else
-			{
-				//$oResponse = $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
-			}
-		}
-		else
-		{
-			$aData = $aData + array(
-				'levelsProperties' => $aColumnProperties,
-				'data' => $aItems,
-				'recordsTotal' => $oSet->Count(),
-				'recordsFiltered' => $oSet->Count()
-			);
-
-			$oResponse = $oApp->json($aData);
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Handles the hierarchical search from an attribute
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search
-	 * @param string $sHostObjectClass Class name of the host object
-	 * @param string $sHostObjectId Id of the host object
-	 * @return Response
-	 */
-	public function SearchHierarchyAction(Request $oRequest, Application $oApp, $sTargetAttCode, $sHostObjectClass, $sHostObjectId = null)
-	{
-		$aData = array(
-			'sMode' => 'search_hierarchy',
-			'sTargetAttCode' => $sTargetAttCode,
-			'sHostObjectClass' => $sHostObjectClass,
-			'sHostObjectId' => $sHostObjectId
-		);
-
-		// Checking security layers
-		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostObjectClass, $sHostObjectId))
-		{
-			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to read ' . $sHostObjectClass . '::' . $sHostObjectId . ' object.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// Retrieving host object for future DBSearch parameters
-		if ($sHostObjectId !== null)
-		{
-			// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
-			$oHostObject = MetaModel::GetObject($sHostObjectClass, $sHostObjectId, true, true);
-		}
-		else
-		{
-			$oHostObject = MetaModel::NewObject($sHostObjectClass);
-		}
-
-		// Retrieving request parameters
-		$bInitalPass = ($oRequest->get('draw') === null) ? true : false;
-		$sQuery = $oRequest->get('sSearchValue'); // Note : Not used yet
-		$sFormPath = $oRequest->get('sFormPath');
-		$sFieldId = $oRequest->get('sFieldId');
-
-		// Building search query
-		// - Retrieving target object class from attcode
-		$oTargetAttDef = MetaModel::GetAttributeDef($sHostObjectClass, $sTargetAttCode);
-		if ($oTargetAttDef->IsExternalKey())
-		{
-			$sTargetObjectClass = $oTargetAttDef->GetTargetClass();
-		}
-		elseif ($oTargetAttDef->IsLinkSet())
-		{
-			if (!$oTargetAttDef->IsIndirect())
-			{
-				$sTargetObjectClass = $oTargetAttDef->GetLinkedClass();
-			}
-			else
-			{
-				$oRemoteAttDef = MetaModel::GetAttributeDef($oTargetAttDef->GetLinkedClass(), $oTargetAttDef->GetExtKeyToRemote());
-				$sTargetObjectClass = $oRemoteAttDef->GetTargetClass();
-			}
-		}
-		else
-		{
-			throw new Exception('Search by hierarchy can only apply on AttributeExternalKey or AttributeLinkedSet objects, ' . get_class($oTargetAttDef) . ' given.');
-		}
-
-//		// - Retrieving class attribute list
-//		$aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list'));
-//		// - Adding friendlyname attribute to the list is not already in it
-//		$sTitleAttrCode = 'friendlyname';
-//		if (($sTitleAttrCode !== null) && !in_array($sTitleAttrCode, $aAttCodes))
-//		{
-//			$aAttCodes = array_merge(array($sTitleAttrCode), $aAttCodes);
-//		}
-		// - Retrieving scope search
-		$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
-		if ($oScopeSearch === null)
-		{
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' has no scope query for ' . $sTargetObjectClass . ' class.');
-			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-		}
-
-		// - Base query from meta model
-		if ($oTargetAttDef->IsExternalKey())
-		{
-			$oSearch = DBSearch::FromOQL($oTargetAttDef->GetValuesDef()->GetFilterExpression());
-		}
-//		elseif ($oTargetAttDef->IsLinkSet())
-		else
-		{
-			$oSearch = $oScopeSearch;
-		}
-
-//		// - Adding query condition
-		$aInternalParams = array('this' => $oHostObject);
-//		if ($sQuery !== null)
-//		{
-//			for ($i = 0; $i < count($aAttCodes); $i++)
-//			{
-//				// Checking if the current attcode is an external key in order to search on the friendlyname
-//				$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $aAttCodes[$i]);
-//				$sAttCode = (!$oAttDef->IsExternalKey()) ? $aAttCodes[$i] : $aAttCodes[$i] . '_friendlyname';
-//				// Building expression for the current attcode
-//				$oBinExpr = new BinaryExpression(new FieldExpression($sAttCode, $oSearch->GetClassAlias()), 'LIKE', new VariableExpression('re_query'));
-//				// Adding expression to the full expression (all attcodes)
-//				if ($i === 0)
-//				{
-//					$oFullExpr = $oBinExpr;
-//				}
-//				else
-//				{
-//					$oFullExpr = new BinaryExpression($oFullExpr, 'OR', $oBinExpr);
-//				}
-//			}
-//			// Adding full expression to the search object
-//			$oSearch->AddConditionExpression($oFullExpr);
-//			$aInternalParams['re_query'] = '%' . $sQuery . '%';
-//		}
-		// - Intersecting with scope constraints
-		$oSearch = $oSearch->Intersect($oScopeSearch);
-		// - Allowing all data if necessary
-		if ($oScopeSearch->IsAllDataAllowed())
-		{
-			$oSearch->AllowAllData();
-		}
-
-		// Retrieving results
-		// - Preparing object set
-		$oSet = new DBObjectSet($oSearch, array(), $aInternalParams);
-		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
-//		$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
-//		// - Retrieving columns properties
-//		$aColumnProperties = array();
-//		foreach ($aAttCodes as $sAttCode)
-//		{
-//			$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $sAttCode);
-//			$aColumnProperties[$sAttCode] = array(
-//				'title' => $oAttDef->GetLabel()
-//			);
-//		}
-		// - Retrieving objects
-		$aItems = array();
-		while ($oItem = $oSet->Fetch())
-		{
-			$aItemProperties = array(
-				'id' => $oItem->GetKey(),
-				'name' => $oItem->GetName(),
-				'attributes' => array()
-			);
-
-//			foreach ($aAttCodes as $sAttCode)
-//			{
-//				if ($sAttCode !== 'id')
-//				{
-//					$aAttProperties = array(
-//						'att_code' => $sAttCode
-//					);
-//
-//					$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $sAttCode);
-//					if ($oAttDef->IsExternalKey())
-//					{
-//						$aAttProperties['value'] = $oItem->Get($sAttCode . '_friendlyname');
-//						// Checking if we can view the object
-//						if ((SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oAttDef->GetTargetClass(), $oItem->Get($sAttCode))))
-//						{
-//							$aAttProperties['url'] = $oApp['url_generator']->generate('p_object_view', array('sObjectClass' => $oAttDef->GetTargetClass(), 'sObjectId' => $oItem->GetKey()));
-//						}
-//					}
-//					else
-//					{
-//						$aAttProperties['value'] = $oAttDef->GetValueLabel($oItem->Get($sAttCode));
-//					}
-//
-//					$aItemProperties['attributes'][$sAttCode] = $aAttProperties;
-//				}
-//			}
-
-			$aItems[] = $aItemProperties;
-		}
-
-		// Preparing response
-		if ($bInitalPass)
-		{
-			$aData = $aData + array(
-				'form' => array(
-					'id' => 'object_search_form_' . time(),
-					'title' => Dict::Format('Brick:Portal:Object:Search:Hierarchy:Title', $oTargetAttDef->GetLabel(), MetaModel::GetName($sTargetObjectClass))
-				),
-				'aResults' => array(
-					'aItems' => json_encode($aItems),
-					'iCount' => count($aItems)
-				),
-				'aSource' => array(
-					'sFormPath' => $sFormPath,
-					'sFieldId' => $sFieldId
-				)
-			);
-
-			if ($oRequest->isXmlHttpRequest())
-			{
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
-			}
-			else
-			{
-				//$oResponse = $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
-			}
-		}
-		else
-		{
-			$aData = $aData + array(
-				'levelsProperties' => $aColumnProperties,
-				'data' => $aItems
-			);
-
-			$oResponse = $oApp->json($aData);
-		}
-
-		return $oResponse;
-	}
-
-    /**
-     * Handles ormDocument display / download from an object
-     *
-     * Note: This is inspired from pages/ajax.document.php, but duplicated as there is no secret mecanism for ormDocument yet.
-     *
-     * @param Request $oRequest
-     * @param Application $oApp
-     * @param string $sOperation
-     */
-	public function DocumentAction(Request $oRequest, Application $oApp, $sOperation = null)
-    {
-        // Setting default operation
-        if($sOperation === null)
-        {
-            $sOperation = 'display';
-        }
-
-        // Retrieving ormDocument's host object
-        $sObjectClass = $oApp['request_manipulator']->ReadParam('sObjectClass', '');
-        $sObjectId = $oApp['request_manipulator']->ReadParam('sObjectId', '');
-        $sObjectField = $oApp['request_manipulator']->ReadParam('sObjectField', '');
-
-        // When reaching to an Attachment, we have to check security on its host object instead of the Attachment itself
-        if($sObjectClass === 'Attachment')
-        {
-            $oAttachment = MetaModel::GetObject($sObjectClass, $sObjectId, true, true);
-            $sHostClass = $oAttachment->Get('item_class');
-            $sHostId = $oAttachment->Get('item_id');
-        }
-        else
-        {
-            $sHostClass = $sObjectClass;
-            $sHostId = $sObjectId;
-        }
-
-        // Checking security layers
-        if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostClass, $sHostId))
-        {
-            IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to retrieve document from attribute ' . $sObjectField . ' as it not allowed to read ' . $sHostClass . '::' . $sHostId . ' object.');
-            $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-        }
-
-        // Retrieving object
-        $oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* Must not be found */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sHostClass));
-        if ($oObject === null)
-        {
-            // We should never be there as the secuirty helper makes sure that the object exists, but just in case.
-            IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
-            $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
-        }
-
-        // Setting cache timeout
-        // Note: Attachment download should be handle through AttachmentAction()
-        if($sObjectClass === 'Attachment')
-        {
-            // One year ahead: an attachement cannot change
-            $iCacheSec = 31556926;
-        }
-        else
-        {
-            $iCacheSec = $oApp['request_manipulator']->ReadParam('cache', 0, FILTER_SANITIZE_NUMBER_INT);
-        }
-
-        $aHeaders = array();
-        if($iCacheSec > 0)
-        {
-            $aHeaders['Expires'] = '';
-            $aHeaders['Cache-Control'] = 'no-transform, public,max-age='.$iCacheSec.',s-maxage='.$iCacheSec;
-            // Reset the value set previously
-            $aHeaders['Pragma'] = 'cache';
-            // An arbitrary date in the past is ok
-            $aHeaders['Last-Modified'] = 'Wed, 15 Jun 2015 13:21:15 GMT';
-        }
-
-        /** @var \ormDocument $oDocument */
-        $oDocument = $oObject->Get($sObjectField);
-        $aHeaders['Content-Type'] = $oDocument->GetMimeType();
-        $aHeaders['Content-Disposition'] = (($sOperation === 'display') ? 'inline' : 'attachment') . ';filename="'.$oDocument->GetFileName().'"';
-
-        return new Response($oDocument->GetData(), Response::HTTP_OK, $aHeaders);
-    }
-
-	/**
-	 * Handles attachment add/remove on an object
-	 *
-	 * Note: This is inspired from itop-attachment/ajax.attachment.php
-	 * 
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 */
-	public function AttachmentAction(Request $oRequest, Application $oApp, $sOperation = null)
-	{
-		$aData = array(
-			'att_id' => 0,
-			'preview' => false,
-			'msg' => ''
-		);
-
-		// Retrieving sOperation from request only if it wasn't forced (determined by the route)
-		if ($sOperation === null)
-		{
-			$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
-		}
-		switch ($sOperation)
-		{
-			case 'add':
-				$sFieldName = $oApp['request_manipulator']->ReadParam('field_name', '');
-				$sObjectClass = $oApp['request_manipulator']->ReadParam('object_class', '');
-				$sTempId = $oApp['request_manipulator']->ReadParam('temp_id', '');
-
-				if (empty($sObjectClass) || empty($sTempId))
-				{
-					$aData['error'] = Dict::Format('UI:Error:2ParametersMissing', 'object_class', 'temp_id');
-				}
-				else
-				{
-					try
-					{
-						$oDocument = utils::ReadPostedDocument($sFieldName);
-						$oAttachment = MetaModel::NewObject('Attachment');
-						$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime')); // one hour...
-						$oAttachment->Set('temp_id', $sTempId);
-						$oAttachment->Set('item_class', $sObjectClass);
-						$oAttachment->SetDefaultOrgId();
-						$oAttachment->Set('contents', $oDocument);
-						$iAttId = $oAttachment->DBInsert();
-
-						$aData['msg'] = htmlentities($oDocument->GetFileName(), ENT_QUOTES, 'UTF-8');
-						// TODO : Change icon location when itop-attachment is refactored
-						//$aData['icon'] = utils::GetAbsoluteUrlAppRoot() . AttachmentPlugIn::GetFileIcon($oDoc->GetFileName());
-						$aData['icon'] = utils::GetAbsoluteUrlAppRoot() . 'env-' . utils::GetCurrentEnvironment() . '/itop-attachments/icons/image.png';
-						$aData['att_id'] = $iAttId;
-						$aData['preview'] = $oDocument->IsPreviewAvailable() ? 'true' : 'false';
-					}
-					catch (FileUploadException $e)
-					{
-						$aData['error'] = $e->GetMessage();
-					}
-				}
-
-				// Note : The Content-Type header is set to 'text/plain' in order to be IE9 compatible. Otherwise ('application/json') IE9 will download the response as a JSON file to the user computer...
-				$oResponse = $oApp->json($aData, 200, array('Content-Type' => 'text/plain'));
-				break;
-
-			case 'download':
-				// Preparing redirection
-                // - Route
-                $aRouteParams = array(
-                    'sObjectClass' => 'Attachment',
-                    'sObjectId' => $oApp['request_manipulator']->ReadParam('sAttachmentId', null),
-                    'sObjectField' => 'contents',
-                );
-                $sRedirectRoute = $oApp['url_generator']->generate('p_object_document_download', $aRouteParams);
-                // - Request
-                $oSubRequest = Request::create($sRedirectRoute, 'GET', $oRequest->query->all(), $oRequest->cookies->all(), array(), $oRequest->server->all());
-
-                $oResponse = $oApp->handle($oSubRequest, HttpKernelInterface::SUB_REQUEST, true);
-				break;
-
-			default:
-				$oApp->abort(403);
-				break;
-		}
-
-		return $oResponse;
-	}
-
-	/**
-	 * Returns a json response containing an array of objects informations.
-	 *
-	 * The service must be given 3 parameters :
-	 * - sObjectClass : The class of objects to retrieve information from
-	 * - aObjectIds : An array of object ids
-	 * - aObjectAttCodes : An array of attribute codes to retrieve
-	 *
-	 * @param Request $oRequest
-	 * @param Application $oApp
-	 * @return Response
-	 */
-	public function GetInformationsAsJsonAction(Request $oRequest, Application $oApp)
-	{
-		$aData = array();
-
-		// Retrieving parameters
-		$sObjectClass = $oApp['request_manipulator']->ReadParam('sObjectClass', '');
-		$aObjectIds = $oApp['request_manipulator']->ReadParam('aObjectIds', array(), FILTER_UNSAFE_RAW);
-		$aObjectAttCodes = $oApp['request_manipulator']->ReadParam('aObjectAttCodes', array(), FILTER_UNSAFE_RAW);
-		if ( empty($sObjectClass) || empty($aObjectIds) || empty($aObjectAttCodes) )
-		{
-			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass, sObjectId and aObjectAttCodes expected, "' . $sObjectClass . '", "' . $sObjectId . '" given.');
-			$oApp->abort(500, 'Invalid request data, some informations are missing');
-		}
-
-		// Checking that id is in the AttCodes
-		if (!in_array('id', $aObjectAttCodes))
-		{
-			$aObjectAttCodes = array_merge(array('id'), $aObjectAttCodes);
-		}
-
-		// Building the search
-		$bIgnoreSilos = $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass);
-		$oSearch = DBObjectSearch::FromOQL("SELECT " . $sObjectClass . " WHERE id IN ('" . implode("','", $aObjectIds) . "')");
-		if ($bIgnoreSilos === true)
-		{
-			$oSearch->AllowAllData();
-		}
-		$oSet = new DBObjectSet($oSearch);
-		$oSet->OptimizeColumnLoad($aObjectAttCodes);
-
-		// Retrieving objects
-		while ($oObject = $oSet->Fetch())
-		{
-			$aData['items'][] = $this->PrepareObjectInformations($oApp, $oObject, $aObjectAttCodes);
-		}
-
-		return $oApp->json($aData);
-	}
-
-	/**
-	 * Prepare a DBObject informations as an array for a client side usage (typically, add a row in a table)
-	 *
-	 * @param \Silex\Application $oApp
-	 * @param \Combodo\iTop\Portal\Controller\DBObject $oObject
-	 * @param array $aAttCodes
-	 *
-	 * @return array
-	 */
-	protected function PrepareObjectInformations(Application $oApp, DBObject $oObject, $aAttCodes = array())
-	{
-		$sObjectClass = get_class($oObject);
-		$aObjectData = array(
-			'id' => $oObject->GetKey(),
-			'name' => $oObject->GetName(),
-			'attributes' => array(),
-		);
-
-		// Retrieving attributes definitions
-		$aAttDefs = array();
-		foreach ($aAttCodes as $sAttCode)
-		{
-			if ($sAttCode === 'id')
-				continue;
-
-			$aAttDefs[$sAttCode] = MetaModel::GetAttributeDef($sObjectClass, $sAttCode);
-		}
-
-		// Preparing attribute data
-		foreach ($aAttDefs as $oAttDef)
-		{
-			$aAttData = array(
-				'att_code' => $oAttDef->GetCode()
-			);
-
-			if ($oAttDef->IsExternalKey())
-			{
-				$aAttData['value'] = $oObject->GetAsHTML($oAttDef->GetCode() . '_friendlyname');
-
-				// Checking if user can access object's external key
-				if (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oAttDef->GetTargetClass()))
-				{
-					$aAttData['url'] = $oApp['url_generator']->generate('p_object_view', array('sObjectClass' => $oAttDef->GetTargetClass(), 'sObjectId' => $oObject->Get($oAttDef->GetCode())));
-				}
-			}
-			elseif ($oAttDef->IsLinkSet())
-			{
-				// We skip it
-				continue;
-			}
-			elseif ($oAttDef instanceof AttributeImage)
-            {
-                $oOrmDoc = $oObject->Get($oAttDef->GetCode());
-                if (is_object($oOrmDoc) && !$oOrmDoc->IsEmpty())
-                {
-                    $sUrl = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oObject), 'sObjectId' => $oObject->GetKey(), 'sObjectField' => $oAttDef->GetCode(), 'cache' => 86400));
-                }
-                else
-                {
-                    $sUrl = $oAttDef->Get('default_image');
-                }
-                $aAttData['value'] = '<img src="' . $sUrl . '" />';
-            }
-			else
-			{
-				$aAttData['value'] = $oAttDef->GetAsHTML($oObject->Get($oAttDef->GetCode()));
-
-				if ($oAttDef instanceof AttributeFriendlyName)
-				{
-					// Checking if user can access object
-					if(SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sObjectClass))
-					{
-						$aAttData['url'] = $oApp['url_generator']->generate('p_object_view', array('sObjectClass' => $sObjectClass, 'sObjectId' => $oObject->GetKey()));
-					}
-				}
-			}
-
-			$aObjectData['attributes'][$oAttDef->GetCode()] = $aAttData;
-		}
-
-		return $aObjectData;
-	}
-
-}
+<?php
+
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Exception;
+use FileUploadException;
+use utils;
+use Dict;
+use IssueLog;
+use MetaModel;
+use DBObject;
+use DBSearch;
+use DBObjectSearch;
+use FalseExpression;
+use BinaryExpression;
+use FieldExpression;
+use VariableExpression;
+use ListExpression;
+use ScalarExpression;
+use DBObjectSet;
+use AttributeEnum;
+use AttributeImage;
+use AttributeFinalClass;
+use AttributeFriendlyName;
+use UserRights;
+use iPopupMenuExtension;
+use URLButtonItem;
+use JSButtonItem;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Helper\SecurityHelper;
+use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
+use Combodo\iTop\Portal\Form\ObjectFormManager;
+use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
+
+/**
+ * Controller to handle basic view / edit / create of cmdbAbstractObject
+ */
+class ObjectController extends AbstractController
+{
+
+	const ENUM_MODE_VIEW = 'view';
+	const ENUM_MODE_EDIT = 'edit';
+	const ENUM_MODE_CREATE = 'create';
+
+	const DEFAULT_PAGE_NUMBER = 1;
+	const DEFAULT_LIST_LENGTH = 10;
+
+	/**
+	 * Displays an cmdbAbstractObject if the connected user is allowed to.
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sObjectClass (Class must be instance of cmdbAbstractObject)
+	 * @param string $sObjectId
+	 * @return Response
+	 */
+	public function ViewAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId)
+	{
+		// Checking parameters
+		if ($sObjectClass === '' || $sObjectId === '')
+		{
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass and sObjectId expected, "' . $sObjectClass . '" and "' . $sObjectId . '" given.');
+			$oApp->abort(500, Dict::Format('UI:Error:2ParametersMissing', 'class', 'id'));
+		}
+
+		// Checking security layers
+		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sObjectClass, $sObjectId))
+		{
+			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to read ' . $sObjectClass . '::' . $sObjectId . ' object.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// Retrieving object
+		$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* MustBeFound */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
+		if ($oObject === null)
+		{
+			// We should never be there as the secuirty helper makes sure that the object exists, but just in case.
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
+
+		$aData = array('sMode' => 'view');
+		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId);
+		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:View:Title', MetaModel::GetName($sObjectClass), $oObject->GetName());
+
+		// Add an edit button if user is allowed
+		if (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_MODIFY, $sObjectClass, $sObjectId))
+		{
+		    $oModifyButton = new URLButtonItem(
+		        'modify_object',
+                Dict::S('UI:Menu:Modify'),
+				$oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId))
+            );
+		    // Putting this one first
+		    $aData['form']['buttons']['links'][] = $oModifyButton->GetMenuItem();
+		}
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
+			if (empty($sOperation))
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
+			}
+			else
+			{
+				$oResponse = $oApp->json($aData);
+			}
+		}
+		else
+		{
+			// Adding brick if it was passed
+			$sBrickId = $oApp['request_manipulator']->ReadParam('sBrickId', '');
+			if (!empty($sBrickId))
+			{
+				$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+				if ($oBrick !== null)
+				{
+					$aData['oBrick'] = $oBrick;
+				}
+			}
+			$aData['sPageTitle'] = $aData['form']['title'];
+			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
+		}
+
+		return $oResponse;
+	}
+
+	public function EditAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId)
+	{
+		// Checking parameters
+		if ($sObjectClass === '' || $sObjectId === '')
+		{
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass and sObjectId expected, "' . $sObjectClass . '" and "' . $sObjectId . '" given.');
+			$oApp->abort(500, Dict::Format('UI:Error:2ParametersMissing', 'class', 'id'));
+		}
+		
+		// Checking security layers
+		// Warning : This is a dirty quick fix to allow editing its own contact information
+		$bAllowWrite = ($sObjectClass === 'Person' && $sObjectId == UserRights::GetContactId());
+		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_MODIFY, $sObjectClass, $sObjectId) && !$bAllowWrite)
+		{
+			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to modify ' . $sObjectClass . '::' . $sObjectId . ' object.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// Retrieving object
+		$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* MustBeFound */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
+		if ($oObject === null)
+		{
+			// We should never be there as the secuirty helper makes sure that the object exists, but just in case.
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
+
+		$aData = array('sMode' => 'edit');
+		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId);
+		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Edit:Title', MetaModel::GetName($sObjectClass), $aData['form']['object_name']);
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
+			if (empty($sOperation))
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
+			}
+			else
+			{
+				$oResponse = $oApp->json($aData);
+			}
+		}
+		else
+		{
+			// Adding brick if it was passed
+			$sBrickId = $oApp['request_manipulator']->ReadParam('sBrickId', '');
+			if (!empty($sBrickId))
+			{
+				$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+				if ($oBrick !== null)
+				{
+					$aData['oBrick'] = $oBrick;
+				}
+			}
+			$aData['sPageTitle'] = $aData['form']['title'];
+			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Creates an cmdbAbstractObject of the $sObjectClass
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sObjectClass
+	 * @return Response
+	 */
+	public function CreateAction(Request $oRequest, Application $oApp, $sObjectClass)
+	{
+		// Checking security layers
+		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_CREATE, $sObjectClass))
+		{
+			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to create ' . $sObjectClass . ' object.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
+
+		$aData = array('sMode' => 'create');
+		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass);
+		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Create:Title', MetaModel::GetName($sObjectClass));
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
+			if (empty($sOperation))
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
+			}
+			else
+			{
+				$oResponse = $oApp->json($aData);
+			}
+		}
+		else
+		{
+			// Adding brick if it was passed
+			$sBrickId = $oApp['request_manipulator']->ReadParam('sBrickId', '');
+			if (!empty($sBrickId))
+			{
+				$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+				if ($oBrick !== null)
+				{
+					$aData['oBrick'] = $oBrick;
+				}
+			}
+			$aData['sPageTitle'] = $aData['form']['title'];
+			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Creates an cmdbAbstractObject of a class determined by the method encoded in $sEncodedMethodName.
+	 * This method use an origin DBObject in order to determine the created cmdbAbstractObject.
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sObjectClass Class of the origin object
+	 * @param string $sObjectId ID of the origin object
+	 * @param string $sEncodedMethodName Base64 encoded factory method name
+	 * @return Response
+	 */
+	public function CreateFromFactoryAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId, $sEncodedMethodName)
+	{
+		$sMethodName = base64_decode($sEncodedMethodName);
+
+		// Checking that the factory method is valid
+		if (!is_callable($sMethodName))
+		{
+			IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Invalid factory method "' . $sMethodName . '" used when creating an object.');
+			$oApp->abort(500, 'Invalid factory method "' . $sMethodName . '" used when creating an object');
+		}
+		
+		// Retrieving origin object
+		// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
+		$oOriginObject = MetaModel::GetObject($sObjectClass, $sObjectId, true, true);
+
+		// Retrieving target object (We check if the method is a simple function or if it's part of a class in which case only static function are supported)
+		if (!strpos($sMethodName, '::'))
+		{
+			$oTargetObject = $sMethodName($oOriginObject);
+		}
+		else
+		{
+			$aMethodNameParts = explode('::', $sMethodName);
+			$sMethodClass = $aMethodNameParts[0];
+			$sMethodName = $aMethodNameParts[1];
+			$oTargetObject = $sMethodClass::$sMethodName($oOriginObject);
+		}
+
+		// Preparing redirection
+		// - Route
+		$aRouteParams = array(
+			'sObjectClass' => get_class($oTargetObject)
+		);
+		$sRedirectRoute = $oApp['url_generator']->generate('p_object_create', $aRouteParams);
+		// - Request
+		$oSubRequest = Request::create($sRedirectRoute, 'GET', $oRequest->query->all(), $oRequest->cookies->all(), array(), $oRequest->server->all());
+
+		return $oApp->handle($oSubRequest, HttpKernelInterface::SUB_REQUEST, true);
+	}
+
+	/**
+	 * Applies a stimulus $sStimulus on an cmdbAbstractObject
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sObjectClass
+	 * @param string $sObjectId
+	 * @param string $sStimulusCode
+	 * @return Response
+	 */
+	public function ApplyStimulusAction(Request $oRequest, Application $oApp, $sObjectClass, $sObjectId, $sStimulusCode)
+	{
+		// Checking parameters
+		if ($sObjectClass === '' || $sObjectId === '' || $sStimulusCode === '')
+		{
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass, sObjectId and $sStimulusCode expected, "' . $sObjectClass . '", "' . $sObjectId . '" and "' . $sStimulusCode . '" given.');
+			$oApp->abort(500, Dict::Format('UI:Error:3ParametersMissing', 'class', 'id', 'stimulus'));
+		}
+
+		// Checking security layers
+        if(!SecurityHelper::IsStimulusAllowed($oApp, $sStimulusCode, $sObjectClass))
+		{
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+		
+		// Retrieving object
+		$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* MustBeFound */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
+		if ($oObject === null)
+		{
+			// We should never be there as the secuirty helper makes sure that the object exists, but just in case.
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// Retrieving request parameters
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
+
+		// Retrieving form properties
+        $aStimuliForms = ApplicationHelper::GetLoadedFormFromClass($oApp, $sObjectClass, 'apply_stimulus');
+        if(array_key_exists($sStimulusCode, $aStimuliForms))
+        {
+            $aFormProperties = $aStimuliForms[$sStimulusCode];
+        }
+        // Or preparing a default form for the stimulus application
+        else
+        {
+            // Preparing default form
+            $aFormProperties = array(
+                'id' => 'apply-stimulus',
+                'type' => 'custom_list',
+                'fields' => array(),
+                'layout' => null
+            );
+        }
+
+        // Adding stimulus code to form
+        $aFormProperties['stimulus_code'] = $sStimulusCode;
+
+		// Adding target_state to current_values
+		$oRequest->request->set('apply_stimulus', array('code' => $sStimulusCode));
+
+		$aData = array('sMode' => 'apply_stimulus');
+		$aData['form'] = $this->HandleForm($oRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId, $aFormProperties);
+		$aData['form']['title'] = Dict::Format('Brick:Portal:Object:Form:Stimulus:Title');
+		$aData['form']['validation']['redirection'] = array(
+			'url' => $oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId))
+		);
+
+		// TODO : This is a ugly patch to avoid showing a modal with a readonly form to the user as it would prevent user from finishing the transition.
+		// Instead, we apply the stimulus directly here and then go to the edited object.
+		if (empty($sOperation))
+		{
+			if (isset($aData['form']['editable_fields_count']) && $aData['form']['editable_fields_count'] === 0)
+			{
+				$sOperation = 'redirect';
+
+				$oSubRequest = $oRequest;
+				$oSubRequest->request->set('operation', 'submit');
+				$oSubRequest->request->set('stimulus_code', '');
+				
+				$aData = array('sMode' => 'apply_stimulus');
+				$aData['form'] = $this->HandleForm($oSubRequest, $oApp, $aData['sMode'], $sObjectClass, $sObjectId, $aFormProperties);
+				// Redefining the array to be as simple as possible :
+				$aData = array('redirection' =>
+					array('url' => $oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId)))
+				);
+			}
+		}
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			// We have to check whether the 'operation' parameter is defined or not in order to know if the form is required via ajax (to be displayed as a modal dialog) or if it's a lifecycle call from a existing form.
+			if (empty($sOperation))
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
+			}
+			elseif ($sOperation === 'redirect')
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/modal/mode_loader.html.twig', $aData);
+			}
+			else
+			{
+				$oResponse = $oApp->json($aData);
+			}
+		}
+		else
+		{
+			$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
+		}
+
+		return $oResponse;
+	}
+
+	public static function HandleForm(Request $oRequest, Application $oApp, $sMode, $sObjectClass, $sObjectId = null, $aFormProperties = null)
+	{
+		$aFormData = array();
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', '');
+		$bModal = ($oRequest->isXmlHttpRequest() && empty($sOperation));
+
+		// - Retrieve form properties
+		if ($aFormProperties === null)
+		{
+			$aFormProperties = ApplicationHelper::GetLoadedFormFromClass($oApp, $sObjectClass, $sMode);
+		}
+
+		// - Create and
+		if (empty($sOperation))
+		{
+			// Retrieving action rules
+			//
+			// Note : The action rules must be a base64-encoded JSON object, this is just so users are tempted to changes values.
+			// But it would not be a security issue as it only presets values in the form.
+            $sActionRulesToken = $oApp['request_manipulator']->ReadParam('ar_token', '');
+			$aActionRules = (!empty($sActionRulesToken)) ? ContextManipulatorHelper::DecodeRulesToken($sActionRulesToken) : array();
+			
+			// Preparing object
+			if ($sObjectId === null)
+			{
+				// Create new UserRequest
+				$oObject = MetaModel::NewObject($sObjectClass);
+
+				// Retrieve action rules information to auto-fill the form if available
+				// Preparing object
+				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObject);
+				$aPrefillFormParam = array( 'user' => $_SESSION["auth_user"],
+											'origin' => 'portal');
+				$oObject->PrefillForm('creation_from_0', $aPrefillFormParam);
+			}
+			else
+			{
+				$oObject = MetaModel::GetObject($sObjectClass, $sObjectId, true, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass));
+			}
+
+			// Preparing buttons
+			$aFormData['buttons'] = array(
+				'transitions' => array(),
+                'actions' => array(),
+                'links' => array(),
+                'submit' => array(
+                    'label' => Dict::S('Portal:Button:Submit'),
+                ),
+			);
+			if ($sMode !== 'apply_stimulus')
+			{
+			    // Add transition buttons
+				$oSetToCheckRights = DBObjectSet::FromObject($oObject);
+				$aStimuli = Metamodel::EnumStimuli($sObjectClass);
+				foreach ($oObject->EnumTransitions() as $sStimulusCode => $aTransitionDef)
+				{
+					if(SecurityHelper::IsStimulusAllowed($oApp, $sStimulusCode, $sObjectClass, $oSetToCheckRights))
+                    {
+                        $aFormData['buttons']['transitions'][$sStimulusCode] = $aStimuli[$sStimulusCode]->GetLabel();
+                    }
+				}
+
+                // Add plugin buttons
+                foreach (MetaModel::EnumPlugins('iPopupMenuExtension') as $oExtensionInstance)
+                {
+                    foreach($oExtensionInstance->EnumItems(iPopupMenuExtension::PORTAL_OBJDETAILS_ACTIONS, array('portal_id' => $oApp['combodo.portal.instance.id'], 'object' => $oObject)) as $oMenuItem)
+                    {
+                        if (is_object($oMenuItem))
+                        {
+                            if($oMenuItem instanceof JSButtonItem)
+                            {
+                                $aFormData['buttons']['actions'][] = $oMenuItem->GetMenuItem() + array('js_files' => $oMenuItem->GetLinkedScripts());
+                            }
+                            elseif($oMenuItem instanceof URLButtonItem)
+                            {
+                                $aFormData['buttons']['links'][] = $oMenuItem->GetMenuItem();
+                            }
+                        }
+                    }
+                }
+
+                // Hiding submit button or changing its label if necessary
+                if(!empty($aFormData['buttons']['transitions']) && isset($aFormProperties['properties']) &&$aFormProperties['properties']['always_show_submit'] === false)
+                {
+                    unset($aFormData['buttons']['submit']);
+                }
+                elseif($sMode === static::ENUM_MODE_EDIT)
+                {
+                    $aFormData['buttons']['submit']['label'] = Dict::S('Portal:Button:Apply');
+                }
+			}
+			else
+			{
+				$aPrefillFormParam = array(
+				    'user' => $_SESSION["auth_user"],
+					'origin' => 'portal',
+					'stimulus' => $oApp['request_manipulator']->ReadParam('apply_stimulus', null)['code'],
+                );
+				$oObject->PrefillForm('state_change', $aPrefillFormParam);
+			}
+
+			// Preparing callback urls
+			$aCallbackUrls = $oApp['context_manipulator']->GetCallbackUrls($oApp, $aActionRules, $oObject, $bModal);
+			$aFormData['submit_callback'] = $aCallbackUrls['submit'];
+			$aFormData['cancel_callback'] = $aCallbackUrls['cancel'];
+
+			// Preparing renderer
+			// Note : We might need to distinguish form & renderer endpoints
+			if (in_array($sMode, array('create', 'edit', 'view')))
+			{
+				$sFormEndpoint = $oApp['url_generator']->generate('p_object_' . $sMode, array('sObjectClass' => $sObjectClass, 'sObjectId' => $sObjectId));
+			}
+			else
+			{
+				$sFormEndpoint = $_SERVER['REQUEST_URI'];
+			}
+			$oFormRenderer = new BsFormRenderer();
+			$oFormRenderer->SetEndpoint($sFormEndpoint);
+
+			$oFormManager = new ObjectFormManager();
+			$oFormManager->SetApplication($oApp)
+				->SetObject($oObject)
+				->SetMode($sMode)
+				->SetActionRulesToken($sActionRulesToken)
+				->SetRenderer($oFormRenderer)
+				->SetFormProperties($aFormProperties);
+
+			$oFormManager->Build();
+
+			// Check the number of editable fields
+			$aFormData['editable_fields_count'] = $oFormManager->GetForm()->GetEditableFieldCount();
+		}
+		else
+		{
+			// Update / Submit / Cancel
+			$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', '', FILTER_UNSAFE_RAW);
+			$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', '', FILTER_UNSAFE_RAW);
+			if ( empty($sFormManagerClass) || empty($sFormManagerData) )
+			{
+				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameters formmanager_class and formamanager_data must be defined.');
+				$oApp->abort(500, 'Parameters formmanager_class and formmanager_data must be defined.');
+			}
+
+			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
+			$oFormManager->SetApplication($oApp);
+			
+			// Applying action rules if present
+			if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
+			{
+				$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
+				$oObj = $oFormManager->GetObject();
+				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObj);
+				$oFormManager->SetObject($oObj);
+			}
+			
+			switch ($sOperation)
+			{
+				case 'submit':
+					// Applying modification to object
+					$aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW), 'attachmentIds' => $oApp['request_manipulator']->ReadParam('attachment_ids', array(), FILTER_UNSAFE_RAW), 'formProperties' => $aFormProperties, 'applyStimulus' => $oApp['request_manipulator']->ReadParam('apply_stimulus', null)));
+					if ($aFormData['validation']['valid'] === true)
+					{
+						// Note : We don't use $sObjectId there as it can be null if we are creating a new one. Instead we use the id from the created object once it has been seralized
+						// Check if stimulus has to be applied
+                        $sStimulusCode = $oApp['request_manipulator']->ReadParam('stimulus_code', '');
+						if (!empty($sStimulusCode))
+						{
+							$aFormData['validation']['redirection'] = array(
+								'url' => $oApp['url_generator']->generate('p_object_apply_stimulus', array('sObjectClass' => $sObjectClass, 'sObjectId' => $oFormManager->GetObject()->GetKey(), 'sStimulusCode' => $sStimulusCode)),
+								'ajax' => true
+							);
+						}
+						// Otherwise, we show the object if there is no default
+//						else
+//						{
+//							$aFormData['validation']['redirection'] = array(
+//								'alternative_url' => $oApp['url_generator']->generate('p_object_edit', array('sObjectClass' => $sObjectClass, 'sObjectId' => $oFormManager->GetObject()->GetKey()))
+//							);
+//						}
+					}
+					break;
+
+				case 'update':
+					$oFormManager->OnUpdate(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW), 'formProperties' => $aFormProperties));
+					break;
+
+				case 'cancel':
+					$oFormManager->OnCancel();
+					break;
+			}
+		}
+		
+		// Preparing field_set data
+		$aFieldSetData = array(
+			//'fields_list' => $oFormManager->GetRenderer()->Render(), // GLA : This should be done just after in the if statement.
+			'fields_impacts' => $oFormManager->GetForm()->GetFieldsImpacts(),
+			'form_path' => $oFormManager->GetForm()->GetId()
+		);
+
+		// Preparing fields list regarding the operation
+		if ($sOperation === 'update')
+		{
+			$aRequestedFields = $oApp['request_manipulator']->ReadParam('requested_fields', array(), FILTER_UNSAFE_RAW);
+			$sFormPath = $oApp['request_manipulator']->ReadParam('form_path', '');
+
+			// Checking if the update was on a subform, if so we need to make the rendering for that part only
+			if ( !empty($sFormPath) && $sFormPath !== $oFormManager->GetForm()->GetId() )
+			{
+				$oSubForm = $oFormManager->GetForm()->FindSubForm($sFormPath);
+				$oSubFormRenderer = new BsFormRenderer($oSubForm);
+				$oSubFormRenderer->SetEndpoint($oFormManager->GetRenderer()->GetEndpoint());
+				$aFormData['updated_fields'] = $oSubFormRenderer->Render($aRequestedFields);
+			}
+			else
+			{
+				$aFormData['updated_fields'] = $oFormManager->GetRenderer()->Render($aRequestedFields);
+			}
+		}
+		else
+		{
+			$aFieldSetData['fields_list'] = $oFormManager->GetRenderer()->Render();
+		}
+
+		// Preparing form data
+		$aFormData['id'] = $oFormManager->GetForm()->GetId();
+		$aFormData['transaction_id'] = $oFormManager->GetForm()->GetTransactionId();
+		$aFormData['formmanager_class'] = $oFormManager->GetClass();
+		$aFormData['formmanager_data'] = $oFormManager->ToJSON();
+		$aFormData['renderer'] = $oFormManager->GetRenderer();
+		$aFormData['object_name'] = $oFormManager->GetObject()->GetName();
+		$aFormData['object_state'] = $oFormManager->GetObject()->GetState();
+		$aFormData['fieldset'] = $aFieldSetData;
+        $aFormData['display_mode'] = (isset($aFormProperties['properties'])) ? $aFormProperties['properties']['display_mode'] : ApplicationHelper::FORM_DEFAULT_DISPLAY_MODE;
+
+		return $aFormData;
+	}
+
+	/**
+	 * Handles the autocomplete search
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search
+	 * @param string $sHostObjectClass Class name of the host object
+	 * @param string $sHostObjectId Id of the host object
+	 * @return Response
+	 */
+	public function SearchAutocompleteAction(Request $oRequest, Application $oApp, $sTargetAttCode, $sHostObjectClass, $sHostObjectId = null)
+	{
+		$aData = array(
+			'results' => array(
+				'count' => 0,
+				'items' => array()
+			)
+		);
+
+		// Parsing parameters from request payload
+		parse_str($oRequest->getContent(), $aRequestContent);
+
+		// Checking parameters
+		if (!isset($aRequestContent['sQuery']))
+		{
+			IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameter sQuery missing.');
+			$oApp->abort(500, Dict::Format('UI:Error:ParameterMissing', 'sQuery'));
+		}
+
+		// Retrieving parameters
+		$sQuery = $aRequestContent['sQuery'];
+		$sFormPath = $aRequestContent['sFormPath'];
+		$sFieldId = $aRequestContent['sFieldId'];
+
+		// Checking security layers
+		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostObjectClass, $sHostObjectId))
+		{
+			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sHostObjectClass . '::' . $sHostObjectId . '.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// Retrieving host object for future DBSearch parameters
+		if ($sHostObjectId !== null)
+		{
+			// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
+			$oHostObject = MetaModel::GetObject($sHostObjectClass, $sHostObjectId, true, true);
+		}
+		else
+		{
+			$oHostObject = MetaModel::NewObject($sHostObjectClass);
+			// Retrieving action rules
+			//
+			// Note : The action rules must be a base64-encoded JSON object, this is just so users are tempted to changes values.
+			// But it would not be a security issue as it only presets values in the form.
+            $sActionRulesToken = $oApp['request_manipulator']->ReadParam('ar_token', '');
+			$aActionRules = (!empty($sActionRulesToken)) ? ContextManipulatorHelper::DecodeRulesToken($sActionRulesToken) : array();
+			// Preparing object
+			$oApp['context_manipulator']->PrepareObject($aActionRules, $oHostObject);
+		}
+
+		// Updating host object with form data / values
+		$sFormManagerClass = $aRequestContent['formmanager_class'];
+		$sFormManagerData = $aRequestContent['formmanager_data'];
+		if (!empty($sFormManagerClass) && !empty($sFormManagerData))
+		{
+			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
+			$oFormManager->SetApplication($oApp);
+			$oFormManager->SetObject($oHostObject);
+
+			// Applying action rules if present
+			if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
+			{
+				$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
+				$oObj = $oFormManager->GetObject();
+				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObj);
+				$oFormManager->SetObject($oObj);
+			}
+			
+			// Updating host object
+			$oFormManager->OnUpdate(array('currentValues' => $aRequestContent['current_values']));
+			$oHostObject = $oFormManager->GetObject();
+		}
+
+		// Building search query
+		// - Retrieving target object class from attcode
+		$oTargetAttDef = MetaModel::GetAttributeDef($sHostObjectClass, $sTargetAttCode);
+		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
+		{
+			$oRequestTemplate = $oHostObject->Get($sTargetAttCode);
+			$oTemplateFieldSearch = $oRequestTemplate->GetForm()->GetField('user_data')->GetForm()->GetField($sFieldId)->GetSearch();
+			$sTargetObjectClass = $oTemplateFieldSearch->GetClass();
+		}
+		elseif ($oTargetAttDef->IsLinkSet())
+		{
+			throw new Exception('Search autocomplete cannot apply on AttributeLinkedSet objects, ' . get_class($oTargetAttDef) . ' (' . $sHostObjectClass . '->' . $sTargetAttCode . ') given.');
+		}
+		else
+		{
+			$sTargetObjectClass = $oTargetAttDef->GetTargetClass();
+		}
+		// - Base query from meta model
+		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
+		{
+			$oSearch = $oTemplateFieldSearch;
+		}
+		else
+		{
+			$oSearch = DBSearch::FromOQL($oTargetAttDef->GetValuesDef()->GetFilterExpression());
+		}
+		// - Adding query condition
+		$oSearch->AddConditionExpression(new BinaryExpression(new FieldExpression('friendlyname', $oSearch->GetClassAlias()), 'LIKE', new VariableExpression('ac_query')));
+		// - Intersecting with scope constraints
+		// Note : This do NOT apply to custom fields as the portal administrator is not supposed to know which objects will be put in the templates.
+		// It is the responsability of the template designer to write the right query so the user see only what he should.
+		if ($oTargetAttDef->GetEditClass() !== 'CustomFields')
+		{
+			$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
+			$oSearch = $oSearch->Intersect($oScopeSearch);
+			// - Allowing all data if necessary
+			if ($oScopeSearch->IsAllDataAllowed())
+			{
+				$oSearch->AllowAllData();
+			}
+		}
+
+		// Retrieving results
+		// - Preparing object set
+		$oSet = new DBObjectSet($oSearch, array(), array('this' => $oHostObject, 'ac_query' => '%' . $sQuery . '%'));
+		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
+		// Note : This limit is also used in the field renderer by typeahead to determine how many suggestions to display
+		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
+		{
+			$oSet->SetLimit(static::DEFAULT_LIST_LENGTH);
+		}
+		else
+		{
+			$oSet->SetLimit($oTargetAttDef->GetMaximumComboLength()); // TODO : Is this the right limit value ? We might want to use another parameter
+		}
+		// - Retrieving objects
+		while ($oItem = $oSet->Fetch())
+		{
+			$aData['results']['items'][] = array('id' => $oItem->GetKey(), 'name' => html_entity_decode($oItem->GetName(), ENT_QUOTES, 'UTF-8'));
+			$aData['results']['count'] ++;
+		}
+
+		// Preparing response
+		if ($oRequest->isXmlHttpRequest())
+		{
+			$oResponse = $oApp->json($aData);
+		}
+		else
+		{
+			$oResponse = $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Handles the regular (table) search from an attribute
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search
+	 * @param string $sHostObjectClass Class name of the host object
+	 * @param string $sHostObjectId Id of the host object
+	 * @return Response
+	 */
+	public function SearchFromAttributeAction(Request $oRequest, Application $oApp, $sTargetAttCode, $sHostObjectClass, $sHostObjectId = null)
+	{
+		$aData = array(
+			'sMode' => 'search_regular',
+			'sTargetAttCode' => $sTargetAttCode,
+			'sHostObjectClass' => $sHostObjectClass,
+			'sHostObjectId' => $sHostObjectId,
+			'sActionRulesToken' => $oApp['request_manipulator']->ReadParam('ar_token', ''),
+		);
+
+		// Checking security layers
+		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostObjectClass, $sHostObjectId))
+		{
+			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to read ' . $sHostObjectClass . '::' . $sHostObjectId . ' object.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// Retrieving host object for future DBSearch parameters
+		if ($sHostObjectId !== null)
+		{
+			// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
+			$oHostObject = MetaModel::GetObject($sHostObjectClass, $sHostObjectId, true, true);
+		}
+		else
+		{
+			$oHostObject = MetaModel::NewObject($sHostObjectClass);
+			// Retrieving action rules
+			//
+			// Note : The action rules must be a base64-encoded JSON object, this is just so users are tempted to changes values.
+			// But it would not be a security issue as it only presets values in the form.
+			$aActionRules = !empty($aData['sActionRulesToken']) ? ContextManipulatorHelper::DecodeRulesToken($aData['sActionRulesToken']) : array();
+			// Preparing object
+			$oApp['context_manipulator']->PrepareObject($aActionRules, $oHostObject);
+		}
+
+		// Updating host object with form data / values
+		$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', '', FILTER_UNSAFE_RAW);
+		$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', '', FILTER_UNSAFE_RAW);
+		if ( !empty($sFormManagerClass) && !empty($sFormManagerData) )
+		{
+			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
+			$oFormManager->SetApplication($oApp);
+			$oFormManager->SetObject($oHostObject);
+
+			// Applying action rules if present
+			if (($oFormManager->GetActionRulesToken() !== null) && ($oFormManager->GetActionRulesToken() !== ''))
+			{
+				$aActionRules = ContextManipulatorHelper::DecodeRulesToken($oFormManager->GetActionRulesToken());
+				$oObj = $oFormManager->GetObject();
+				$oApp['context_manipulator']->PrepareObject($aActionRules, $oObj);
+				$oFormManager->SetObject($oObj);
+			}
+			
+			// Updating host object
+			$oFormManager->OnUpdate(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW)));
+			$oHostObject = $oFormManager->GetObject();
+		}
+		
+		// Retrieving request parameters
+		$iPageNumber = $oApp['request_manipulator']->ReadParam('iPageNumber', static::DEFAULT_PAGE_NUMBER, FILTER_SANITIZE_NUMBER_INT);
+		$iListLength = $oApp['request_manipulator']->ReadParam('iListLength', static::DEFAULT_LIST_LENGTH, FILTER_SANITIZE_NUMBER_INT);
+		$bInitalPass = $oApp['request_manipulator']->HasParam('draw') ? false : true;
+		$sQuery = $oApp['request_manipulator']->ReadParam('sSearchValue', '');
+		$sFormPath = $oApp['request_manipulator']->ReadParam('sFormPath', '');
+		$sFieldId = $oApp['request_manipulator']->ReadParam('sFieldId', '');
+		$aObjectIdsToIgnore = $oApp['request_manipulator']->ReadParam('aObjectIdsToIgnore', null, FILTER_UNSAFE_RAW);
+
+		// Building search query
+		// - Retrieving target object class from attcode
+		$oTargetAttDef = MetaModel::GetAttributeDef($sHostObjectClass, $sTargetAttCode);
+		if ($oTargetAttDef->IsExternalKey())
+		{
+			$sTargetObjectClass = $oTargetAttDef->GetTargetClass();
+		}
+		elseif ($oTargetAttDef->IsLinkSet())
+		{
+			if (!$oTargetAttDef->IsIndirect())
+			{
+				$sTargetObjectClass = $oTargetAttDef->GetLinkedClass();
+			}
+			else
+			{
+				$oRemoteAttDef = MetaModel::GetAttributeDef($oTargetAttDef->GetLinkedClass(), $oTargetAttDef->GetExtKeyToRemote());
+				$sTargetObjectClass = $oRemoteAttDef->GetTargetClass();
+			}
+		}
+		elseif ($oTargetAttDef->GetEditClass() === 'CustomFields')
+		{
+			$oRequestTemplate = $oHostObject->Get($sTargetAttCode);
+			$oTemplateFieldSearch = $oRequestTemplate->GetForm()->GetField('user_data')->GetForm()->GetField($sFieldId)->GetSearch();
+			$sTargetObjectClass = $oTemplateFieldSearch->GetClass();
+		}
+		else
+		{
+			throw new Exception('Search from attribute can only apply on AttributeExternalKey or AttributeLinkedSet objects, ' . get_class($oTargetAttDef) . ' given.');
+		}
+		
+		// - Retrieving class attribute list
+		$aAttCodes = ApplicationHelper::GetLoadedListFromClass($oApp, $sTargetObjectClass, 'list');
+		// - Adding friendlyname attribute to the list is not already in it
+		$sTitleAttCode = 'friendlyname';
+		if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodes))
+		{
+			$aAttCodes = array_merge(array($sTitleAttCode), $aAttCodes);
+		}
+
+		// - Retrieving scope search
+		// Note : This do NOT apply to custom fields as the portal administrator is not supposed to know which objects will be put in the templates.
+		// It is the responsability of the template designer to write the right query so the user see only what he should.
+		$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
+		$aInternalParams = array();
+		if (($oScopeSearch === null) && ($oTargetAttDef->GetEditClass() !== 'CustomFields'))
+		{
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' has no scope query for ' . $sTargetObjectClass . ' class.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// - Base query from meta model
+		if ($oTargetAttDef->IsExternalKey())
+		{
+			$oSearch = DBSearch::FromOQL($oTargetAttDef->GetValuesDef()->GetFilterExpression());
+		}
+		elseif ($oTargetAttDef->IsLinkSet())
+		{
+			$oSearch = $oScopeSearch;
+		}
+		elseif ($oTargetAttDef->GetEditClass() === 'CustomFields')
+		{
+			// Note : $oTemplateFieldSearch has been defined in the "Retrieving target object class from attcode" part, it is not available otherwise
+			$oSearch = $oTemplateFieldSearch;
+		}
+
+		// - Filtering objects to ignore
+		if (($aObjectIdsToIgnore !== null) && (is_array($aObjectIdsToIgnore)))
+		{
+			//$oSearch->AddConditionExpression('id', $aObjectIdsToIgnore, 'NOT IN');
+			$aExpressions = array();
+			foreach ($aObjectIdsToIgnore as $sObjectIdToIgnore)
+			{
+				$aExpressions[] = new ScalarExpression($sObjectIdToIgnore);
+			}
+			$oSearch->AddConditionExpression(new BinaryExpression(new FieldExpression('id', $oSearch->GetClassAlias()), 'NOT IN', new ListExpression($aExpressions)));
+		}
+		
+		// - Adding query condition
+		$aInternalParams['this'] = $oHostObject;
+		if (!empty($sQuery))
+		{
+			$oFullExpr = null;
+			for ($i = 0; $i < count($aAttCodes); $i++)
+			{
+				// Checking if the current attcode is an external key in order to search on the friendlyname
+				$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $aAttCodes[$i]);
+				$sAttCode = (!$oAttDef->IsExternalKey()) ? $aAttCodes[$i] : $aAttCodes[$i] . '_friendlyname';
+				// Building expression for the current attcode
+				// - For attributes that need conversion from their display value to storage value
+				//   Note : This is dirty hack that will need to be refactored in the OQL core in order to be nicer and to be extended to other types such as dates etc...
+				if (($oAttDef instanceof AttributeEnum) || ($oAttDef instanceof AttributeFinalClass))
+				{
+					// Looking up storage value
+					$aMatchedCodes = array();
+					foreach ($oAttDef->GetAllowedValues() as $sValueCode => $sValueLabel)
+					{
+						if (stripos($sValueLabel, $sQuery) !== false)
+						{
+							$aMatchedCodes[] = $sValueCode;
+						}
+					}
+					// Building expression
+					if (!empty($aMatchedCodes))
+					{
+						$oEnumeratedListExpr = ListExpression::FromScalars($aMatchedCodes);
+						$oBinExpr = new BinaryExpression(new FieldExpression($sAttCode, $oSearch->GetClassAlias()), 'IN', $oEnumeratedListExpr);
+					}
+					else
+					{
+						$oBinExpr = new FalseExpression();
+					}
+				}
+				// - For regular attributs
+				else
+				{
+					$oBinExpr = new BinaryExpression(new FieldExpression($sAttCode, $oSearch->GetClassAlias()), 'LIKE', new VariableExpression('re_query'));
+				}
+				// Adding expression to the full expression (all attcodes)
+				if ($i === 0)
+				{
+					$oFullExpr = $oBinExpr;
+				}
+				else
+				{
+					$oFullExpr = new BinaryExpression($oFullExpr, 'OR', $oBinExpr);
+				}
+			}
+			// Adding full expression to the search object
+			$oSearch->AddConditionExpression($oFullExpr);
+			$aInternalParams['re_query'] = '%' . $sQuery . '%';
+		}
+
+		// - Intersecting with scope constraints
+		// Note : This do NOT apply to custom fields as the portal administrator is not supposed to know which objects will be put in the templates.
+		// It is the responsability of the template designer to write the right query so the user see only what he should.
+		if (($oScopeSearch !== null) && ($oTargetAttDef->GetEditClass() !== 'CustomFields'))
+		{
+			$oSearch = $oSearch->Intersect($oScopeSearch);
+			// - Allowing all data if necessary
+			if ($oScopeSearch->IsAllDataAllowed())
+			{
+				$oSearch->AllowAllData();
+			}
+		}
+
+		// Retrieving results
+		// - Preparing object set
+		$oSet = new DBObjectSet($oSearch, array(), $aInternalParams);
+		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => $aAttCodes));
+		$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
+		// - Retrieving columns properties
+		$aColumnProperties = array();
+		foreach ($aAttCodes as $sAttCode)
+		{
+			$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $sAttCode);
+			$aColumnProperties[$sAttCode] = array(
+				'title' => $oAttDef->GetLabel()
+			);
+		}
+		// - Retrieving objects
+		$aItems = array();
+		while ($oItem = $oSet->Fetch())
+		{
+			$aItems[] = $this->PrepareObjectInformations($oApp, $oItem, $aAttCodes);
+		}
+		
+		// Preparing response
+		if ($bInitalPass)
+		{
+			$aData = $aData + array(
+				'form' => array(
+					'id' => 'object_search_form_' . time(),
+					'title' => Dict::Format('Brick:Portal:Object:Search:Regular:Title', $oTargetAttDef->GetLabel(), MetaModel::GetName($sTargetObjectClass))
+				),
+				'aColumnProperties' => json_encode($aColumnProperties),
+				'aResults' => array(
+					'aItems' => json_encode($aItems),
+					'iCount' => count($aItems)
+				),
+				'bMultipleSelect' => $oTargetAttDef->IsLinkSet(),
+				'aSource' => array(
+					'sFormPath' => $sFormPath,
+					'sFieldId' => $sFieldId,
+					'aObjectIdsToIgnore' => $aObjectIdsToIgnore,
+					'sFormManagerClass' => $sFormManagerClass,
+					'sFormManagerData' => $sFormManagerData
+				)
+			);
+			
+			if ($oRequest->isXmlHttpRequest())
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
+			}
+			else
+			{
+				//$oResponse = $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
+			}
+		}
+		else
+		{
+			$aData = $aData + array(
+				'levelsProperties' => $aColumnProperties,
+				'data' => $aItems,
+				'recordsTotal' => $oSet->Count(),
+				'recordsFiltered' => $oSet->Count()
+			);
+
+			$oResponse = $oApp->json($aData);
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Handles the hierarchical search from an attribute
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search
+	 * @param string $sHostObjectClass Class name of the host object
+	 * @param string $sHostObjectId Id of the host object
+	 * @return Response
+	 */
+	public function SearchHierarchyAction(Request $oRequest, Application $oApp, $sTargetAttCode, $sHostObjectClass, $sHostObjectId = null)
+	{
+		$aData = array(
+			'sMode' => 'search_hierarchy',
+			'sTargetAttCode' => $sTargetAttCode,
+			'sHostObjectClass' => $sHostObjectClass,
+			'sHostObjectId' => $sHostObjectId
+		);
+
+		// Checking security layers
+		if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostObjectClass, $sHostObjectId))
+		{
+			IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to read ' . $sHostObjectClass . '::' . $sHostObjectId . ' object.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// Retrieving host object for future DBSearch parameters
+		if ($sHostObjectId !== null)
+		{
+			// Note : AllowAllData set to true here instead of checking scope's flag because we are displaying a value that has been set and validated
+			$oHostObject = MetaModel::GetObject($sHostObjectClass, $sHostObjectId, true, true);
+		}
+		else
+		{
+			$oHostObject = MetaModel::NewObject($sHostObjectClass);
+		}
+
+		// Retrieving request parameters
+		$bInitalPass = ($oRequest->get('draw') === null) ? true : false;
+		$sQuery = $oRequest->get('sSearchValue'); // Note : Not used yet
+		$sFormPath = $oRequest->get('sFormPath');
+		$sFieldId = $oRequest->get('sFieldId');
+
+		// Building search query
+		// - Retrieving target object class from attcode
+		$oTargetAttDef = MetaModel::GetAttributeDef($sHostObjectClass, $sTargetAttCode);
+		if ($oTargetAttDef->IsExternalKey())
+		{
+			$sTargetObjectClass = $oTargetAttDef->GetTargetClass();
+		}
+		elseif ($oTargetAttDef->IsLinkSet())
+		{
+			if (!$oTargetAttDef->IsIndirect())
+			{
+				$sTargetObjectClass = $oTargetAttDef->GetLinkedClass();
+			}
+			else
+			{
+				$oRemoteAttDef = MetaModel::GetAttributeDef($oTargetAttDef->GetLinkedClass(), $oTargetAttDef->GetExtKeyToRemote());
+				$sTargetObjectClass = $oRemoteAttDef->GetTargetClass();
+			}
+		}
+		else
+		{
+			throw new Exception('Search by hierarchy can only apply on AttributeExternalKey or AttributeLinkedSet objects, ' . get_class($oTargetAttDef) . ' given.');
+		}
+
+//		// - Retrieving class attribute list
+//		$aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list'));
+//		// - Adding friendlyname attribute to the list is not already in it
+//		$sTitleAttrCode = 'friendlyname';
+//		if (($sTitleAttrCode !== null) && !in_array($sTitleAttrCode, $aAttCodes))
+//		{
+//			$aAttCodes = array_merge(array($sTitleAttrCode), $aAttCodes);
+//		}
+		// - Retrieving scope search
+		$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
+		if ($oScopeSearch === null)
+		{
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' has no scope query for ' . $sTargetObjectClass . ' class.');
+			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+		}
+
+		// - Base query from meta model
+		if ($oTargetAttDef->IsExternalKey())
+		{
+			$oSearch = DBSearch::FromOQL($oTargetAttDef->GetValuesDef()->GetFilterExpression());
+		}
+//		elseif ($oTargetAttDef->IsLinkSet())
+		else
+		{
+			$oSearch = $oScopeSearch;
+		}
+
+//		// - Adding query condition
+		$aInternalParams = array('this' => $oHostObject);
+//		if ($sQuery !== null)
+//		{
+//			for ($i = 0; $i < count($aAttCodes); $i++)
+//			{
+//				// Checking if the current attcode is an external key in order to search on the friendlyname
+//				$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $aAttCodes[$i]);
+//				$sAttCode = (!$oAttDef->IsExternalKey()) ? $aAttCodes[$i] : $aAttCodes[$i] . '_friendlyname';
+//				// Building expression for the current attcode
+//				$oBinExpr = new BinaryExpression(new FieldExpression($sAttCode, $oSearch->GetClassAlias()), 'LIKE', new VariableExpression('re_query'));
+//				// Adding expression to the full expression (all attcodes)
+//				if ($i === 0)
+//				{
+//					$oFullExpr = $oBinExpr;
+//				}
+//				else
+//				{
+//					$oFullExpr = new BinaryExpression($oFullExpr, 'OR', $oBinExpr);
+//				}
+//			}
+//			// Adding full expression to the search object
+//			$oSearch->AddConditionExpression($oFullExpr);
+//			$aInternalParams['re_query'] = '%' . $sQuery . '%';
+//		}
+		// - Intersecting with scope constraints
+		$oSearch = $oSearch->Intersect($oScopeSearch);
+		// - Allowing all data if necessary
+		if ($oScopeSearch->IsAllDataAllowed())
+		{
+			$oSearch->AllowAllData();
+		}
+
+		// Retrieving results
+		// - Preparing object set
+		$oSet = new DBObjectSet($oSearch, array(), $aInternalParams);
+		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
+//		$oSet->SetLimit($iListLength, $iListLength * ($iPageNumber - 1));
+//		// - Retrieving columns properties
+//		$aColumnProperties = array();
+//		foreach ($aAttCodes as $sAttCode)
+//		{
+//			$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $sAttCode);
+//			$aColumnProperties[$sAttCode] = array(
+//				'title' => $oAttDef->GetLabel()
+//			);
+//		}
+		// - Retrieving objects
+		$aItems = array();
+		while ($oItem = $oSet->Fetch())
+		{
+			$aItemProperties = array(
+				'id' => $oItem->GetKey(),
+				'name' => $oItem->GetName(),
+				'attributes' => array()
+			);
+
+//			foreach ($aAttCodes as $sAttCode)
+//			{
+//				if ($sAttCode !== 'id')
+//				{
+//					$aAttProperties = array(
+//						'att_code' => $sAttCode
+//					);
+//
+//					$oAttDef = MetaModel::GetAttributeDef($sTargetObjectClass, $sAttCode);
+//					if ($oAttDef->IsExternalKey())
+//					{
+//						$aAttProperties['value'] = $oItem->Get($sAttCode . '_friendlyname');
+//						// Checking if we can view the object
+//						if ((SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oAttDef->GetTargetClass(), $oItem->Get($sAttCode))))
+//						{
+//							$aAttProperties['url'] = $oApp['url_generator']->generate('p_object_view', array('sObjectClass' => $oAttDef->GetTargetClass(), 'sObjectId' => $oItem->GetKey()));
+//						}
+//					}
+//					else
+//					{
+//						$aAttProperties['value'] = $oAttDef->GetValueLabel($oItem->Get($sAttCode));
+//					}
+//
+//					$aItemProperties['attributes'][$sAttCode] = $aAttProperties;
+//				}
+//			}
+
+			$aItems[] = $aItemProperties;
+		}
+
+		// Preparing response
+		if ($bInitalPass)
+		{
+			$aData = $aData + array(
+				'form' => array(
+					'id' => 'object_search_form_' . time(),
+					'title' => Dict::Format('Brick:Portal:Object:Search:Hierarchy:Title', $oTargetAttDef->GetLabel(), MetaModel::GetName($sTargetObjectClass))
+				),
+				'aResults' => array(
+					'aItems' => json_encode($aItems),
+					'iCount' => count($aItems)
+				),
+				'aSource' => array(
+					'sFormPath' => $sFormPath,
+					'sFieldId' => $sFieldId
+				)
+			);
+
+			if ($oRequest->isXmlHttpRequest())
+			{
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/modal.html.twig', $aData);
+			}
+			else
+			{
+				//$oResponse = $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+				$oResponse = $oApp['twig']->render('itop-portal-base/portal/src/views/bricks/object/layout.html.twig', $aData);
+			}
+		}
+		else
+		{
+			$aData = $aData + array(
+				'levelsProperties' => $aColumnProperties,
+				'data' => $aItems
+			);
+
+			$oResponse = $oApp->json($aData);
+		}
+
+		return $oResponse;
+	}
+
+    /**
+     * Handles ormDocument display / download from an object
+     *
+     * Note: This is inspired from pages/ajax.document.php, but duplicated as there is no secret mecanism for ormDocument yet.
+     *
+     * @param Request $oRequest
+     * @param Application $oApp
+     * @param string $sOperation
+     */
+	public function DocumentAction(Request $oRequest, Application $oApp, $sOperation = null)
+    {
+        // Setting default operation
+        if($sOperation === null)
+        {
+            $sOperation = 'display';
+        }
+
+        // Retrieving ormDocument's host object
+        $sObjectClass = $oApp['request_manipulator']->ReadParam('sObjectClass', '');
+        $sObjectId = $oApp['request_manipulator']->ReadParam('sObjectId', '');
+        $sObjectField = $oApp['request_manipulator']->ReadParam('sObjectField', '');
+
+        // When reaching to an Attachment, we have to check security on its host object instead of the Attachment itself
+        if($sObjectClass === 'Attachment')
+        {
+            $oAttachment = MetaModel::GetObject($sObjectClass, $sObjectId, true, true);
+            $sHostClass = $oAttachment->Get('item_class');
+            $sHostId = $oAttachment->Get('item_id');
+        }
+        else
+        {
+            $sHostClass = $sObjectClass;
+            $sHostId = $sObjectId;
+        }
+
+        // Checking security layers
+        if (!SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sHostClass, $sHostId))
+        {
+            IssueLog::Warning(__METHOD__ . ' at line ' . __LINE__ . ' : User #' . UserRights::GetUserId() . ' not allowed to retrieve document from attribute ' . $sObjectField . ' as it not allowed to read ' . $sHostClass . '::' . $sHostId . ' object.');
+            $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+        }
+
+        // Retrieving object
+        $oObject = MetaModel::GetObject($sObjectClass, $sObjectId, false /* Must not be found */, $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sHostClass));
+        if ($oObject === null)
+        {
+            // We should never be there as the secuirty helper makes sure that the object exists, but just in case.
+            IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : Could not load object ' . $sObjectClass . '::' . $sObjectId . '.');
+            $oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
+        }
+
+        // Setting cache timeout
+        // Note: Attachment download should be handle through AttachmentAction()
+        if($sObjectClass === 'Attachment')
+        {
+            // One year ahead: an attachement cannot change
+            $iCacheSec = 31556926;
+        }
+        else
+        {
+            $iCacheSec = $oApp['request_manipulator']->ReadParam('cache', 0, FILTER_SANITIZE_NUMBER_INT);
+        }
+
+        $aHeaders = array();
+        if($iCacheSec > 0)
+        {
+            $aHeaders['Expires'] = '';
+            $aHeaders['Cache-Control'] = 'no-transform, public,max-age='.$iCacheSec.',s-maxage='.$iCacheSec;
+            // Reset the value set previously
+            $aHeaders['Pragma'] = 'cache';
+            // An arbitrary date in the past is ok
+            $aHeaders['Last-Modified'] = 'Wed, 15 Jun 2015 13:21:15 GMT';
+        }
+
+        /** @var \ormDocument $oDocument */
+        $oDocument = $oObject->Get($sObjectField);
+        $aHeaders['Content-Type'] = $oDocument->GetMimeType();
+        $aHeaders['Content-Disposition'] = (($sOperation === 'display') ? 'inline' : 'attachment') . ';filename="'.$oDocument->GetFileName().'"';
+
+        return new Response($oDocument->GetData(), Response::HTTP_OK, $aHeaders);
+    }
+
+	/**
+	 * Handles attachment add/remove on an object
+	 *
+	 * Note: This is inspired from itop-attachment/ajax.attachment.php
+	 * 
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 */
+	public function AttachmentAction(Request $oRequest, Application $oApp, $sOperation = null)
+	{
+		$aData = array(
+			'att_id' => 0,
+			'preview' => false,
+			'msg' => ''
+		);
+
+		// Retrieving sOperation from request only if it wasn't forced (determined by the route)
+		if ($sOperation === null)
+		{
+			$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
+		}
+		switch ($sOperation)
+		{
+			case 'add':
+				$sFieldName = $oApp['request_manipulator']->ReadParam('field_name', '');
+				$sObjectClass = $oApp['request_manipulator']->ReadParam('object_class', '');
+				$sTempId = $oApp['request_manipulator']->ReadParam('temp_id', '');
+
+				if (empty($sObjectClass) || empty($sTempId))
+				{
+					$aData['error'] = Dict::Format('UI:Error:2ParametersMissing', 'object_class', 'temp_id');
+				}
+				else
+				{
+					try
+					{
+						$oDocument = utils::ReadPostedDocument($sFieldName);
+						$oAttachment = MetaModel::NewObject('Attachment');
+						$oAttachment->Set('expire', time() + MetaModel::GetConfig()->Get('draft_attachments_lifetime')); // one hour...
+						$oAttachment->Set('temp_id', $sTempId);
+						$oAttachment->Set('item_class', $sObjectClass);
+						$oAttachment->SetDefaultOrgId();
+						$oAttachment->Set('contents', $oDocument);
+						$iAttId = $oAttachment->DBInsert();
+
+						$aData['msg'] = htmlentities($oDocument->GetFileName(), ENT_QUOTES, 'UTF-8');
+						// TODO : Change icon location when itop-attachment is refactored
+						//$aData['icon'] = utils::GetAbsoluteUrlAppRoot() . AttachmentPlugIn::GetFileIcon($oDoc->GetFileName());
+						$aData['icon'] = utils::GetAbsoluteUrlAppRoot() . 'env-' . utils::GetCurrentEnvironment() . '/itop-attachments/icons/image.png';
+						$aData['att_id'] = $iAttId;
+						$aData['preview'] = $oDocument->IsPreviewAvailable() ? 'true' : 'false';
+					}
+					catch (FileUploadException $e)
+					{
+						$aData['error'] = $e->GetMessage();
+					}
+				}
+
+				// Note : The Content-Type header is set to 'text/plain' in order to be IE9 compatible. Otherwise ('application/json') IE9 will download the response as a JSON file to the user computer...
+				$oResponse = $oApp->json($aData, 200, array('Content-Type' => 'text/plain'));
+				break;
+
+			case 'download':
+				// Preparing redirection
+                // - Route
+                $aRouteParams = array(
+                    'sObjectClass' => 'Attachment',
+                    'sObjectId' => $oApp['request_manipulator']->ReadParam('sAttachmentId', null),
+                    'sObjectField' => 'contents',
+                );
+                $sRedirectRoute = $oApp['url_generator']->generate('p_object_document_download', $aRouteParams);
+                // - Request
+                $oSubRequest = Request::create($sRedirectRoute, 'GET', $oRequest->query->all(), $oRequest->cookies->all(), array(), $oRequest->server->all());
+
+                $oResponse = $oApp->handle($oSubRequest, HttpKernelInterface::SUB_REQUEST, true);
+				break;
+
+			default:
+				$oApp->abort(403);
+				break;
+		}
+
+		return $oResponse;
+	}
+
+	/**
+	 * Returns a json response containing an array of objects informations.
+	 *
+	 * The service must be given 3 parameters :
+	 * - sObjectClass : The class of objects to retrieve information from
+	 * - aObjectIds : An array of object ids
+	 * - aObjectAttCodes : An array of attribute codes to retrieve
+	 *
+	 * @param Request $oRequest
+	 * @param Application $oApp
+	 * @return Response
+	 */
+	public function GetInformationsAsJsonAction(Request $oRequest, Application $oApp)
+	{
+		$aData = array();
+
+		// Retrieving parameters
+		$sObjectClass = $oApp['request_manipulator']->ReadParam('sObjectClass', '');
+		$aObjectIds = $oApp['request_manipulator']->ReadParam('aObjectIds', array(), FILTER_UNSAFE_RAW);
+		$aObjectAttCodes = $oApp['request_manipulator']->ReadParam('aObjectAttCodes', array(), FILTER_UNSAFE_RAW);
+		if ( empty($sObjectClass) || empty($aObjectIds) || empty($aObjectAttCodes) )
+		{
+			IssueLog::Info(__METHOD__ . ' at line ' . __LINE__ . ' : sObjectClass, sObjectId and aObjectAttCodes expected, "' . $sObjectClass . '", "' . $sObjectId . '" given.');
+			$oApp->abort(500, 'Invalid request data, some informations are missing');
+		}
+
+		// Checking that id is in the AttCodes
+		if (!in_array('id', $aObjectAttCodes))
+		{
+			$aObjectAttCodes = array_merge(array('id'), $aObjectAttCodes);
+		}
+
+		// Building the search
+		$bIgnoreSilos = $oApp['scope_validator']->IsAllDataAllowedForScope(UserRights::ListProfiles(), $sObjectClass);
+		$oSearch = DBObjectSearch::FromOQL("SELECT " . $sObjectClass . " WHERE id IN ('" . implode("','", $aObjectIds) . "')");
+		if ($bIgnoreSilos === true)
+		{
+			$oSearch->AllowAllData();
+		}
+		$oSet = new DBObjectSet($oSearch);
+		$oSet->OptimizeColumnLoad($aObjectAttCodes);
+
+		// Retrieving objects
+		while ($oObject = $oSet->Fetch())
+		{
+			$aData['items'][] = $this->PrepareObjectInformations($oApp, $oObject, $aObjectAttCodes);
+		}
+
+		return $oApp->json($aData);
+	}
+
+	/**
+	 * Prepare a DBObject informations as an array for a client side usage (typically, add a row in a table)
+	 *
+	 * @param \Silex\Application $oApp
+	 * @param \Combodo\iTop\Portal\Controller\DBObject $oObject
+	 * @param array $aAttCodes
+	 *
+	 * @return array
+	 */
+	protected function PrepareObjectInformations(Application $oApp, DBObject $oObject, $aAttCodes = array())
+	{
+		$sObjectClass = get_class($oObject);
+		$aObjectData = array(
+			'id' => $oObject->GetKey(),
+			'name' => $oObject->GetName(),
+			'attributes' => array(),
+		);
+
+		// Retrieving attributes definitions
+		$aAttDefs = array();
+		foreach ($aAttCodes as $sAttCode)
+		{
+			if ($sAttCode === 'id')
+				continue;
+
+			$aAttDefs[$sAttCode] = MetaModel::GetAttributeDef($sObjectClass, $sAttCode);
+		}
+
+		// Preparing attribute data
+		foreach ($aAttDefs as $oAttDef)
+		{
+			$aAttData = array(
+				'att_code' => $oAttDef->GetCode()
+			);
+
+			if ($oAttDef->IsExternalKey())
+			{
+				$aAttData['value'] = $oObject->GetAsHTML($oAttDef->GetCode() . '_friendlyname');
+
+				// Checking if user can access object's external key
+				if (SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $oAttDef->GetTargetClass()))
+				{
+					$aAttData['url'] = $oApp['url_generator']->generate('p_object_view', array('sObjectClass' => $oAttDef->GetTargetClass(), 'sObjectId' => $oObject->Get($oAttDef->GetCode())));
+				}
+			}
+			elseif ($oAttDef->IsLinkSet())
+			{
+				// We skip it
+				continue;
+			}
+			elseif ($oAttDef instanceof AttributeImage)
+            {
+                $oOrmDoc = $oObject->Get($oAttDef->GetCode());
+                if (is_object($oOrmDoc) && !$oOrmDoc->IsEmpty())
+                {
+                    $sUrl = $oApp['url_generator']->generate('p_object_document_display', array('sObjectClass' => get_class($oObject), 'sObjectId' => $oObject->GetKey(), 'sObjectField' => $oAttDef->GetCode(), 'cache' => 86400));
+                }
+                else
+                {
+                    $sUrl = $oAttDef->Get('default_image');
+                }
+                $aAttData['value'] = '<img src="' . $sUrl . '" />';
+            }
+			else
+			{
+				$aAttData['value'] = $oAttDef->GetAsHTML($oObject->Get($oAttDef->GetCode()));
+
+				if ($oAttDef instanceof AttributeFriendlyName)
+				{
+					// Checking if user can access object
+					if(SecurityHelper::IsActionAllowed($oApp, UR_ACTION_READ, $sObjectClass))
+					{
+						$aAttData['url'] = $oApp['url_generator']->generate('p_object_view', array('sObjectClass' => $sObjectClass, 'sObjectId' => $oObject->GetKey()));
+					}
+				}
+			}
+
+			$aObjectData['attributes'][$oAttDef->GetCode()] = $aAttData;
+		}
+
+		return $aObjectData;
+	}
+
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
index 10660eae3..d2d8ebdae 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php
@@ -1,303 +1,303 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Controller;
-
-use Exception;
-use IssueLog;
-use utils;
-use MetaModel;
-use UserRights;
-use Silex\Application;
-use Symfony\Component\HttpFoundation\Request;
-use Combodo\iTop\Portal\Helper\ApplicationHelper;
-use Combodo\iTop\Portal\Brick\UserProfileBrick;
-use Combodo\iTop\Portal\Controller\ObjectController;
-use Combodo\iTop\Portal\Form\PreferencesFormManager;
-use Combodo\iTop\Portal\Form\PasswordFormManager;
-use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
-
-class UserProfileBrickController extends BrickController
-{
-	const ENUM_FORM_TYPE_PICTURE = 'picture';
-
-	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId)
-	{
-		// If the brick id was not specified, we get the first one registered that is an instance of UserProfileBrick as default
-		if ($sBrickId === null)
-		{
-			foreach ($oApp['combodo.portal.instance.conf']['bricks'] as $oTmpBrick)
-			{
-				if ($oTmpBrick instanceof UserProfileBrick)
-				{
-					$oBrick = $oTmpBrick;
-				}
-			}
-
-			// We make sure a UserProfileBrick was found
-			if (!isset($oBrick) || $oBrick === null)
-			{
-				$oBrick = new UserProfileBrick();
-				//$oApp->abort(500, 'UserProfileBrick : Brick could not be loaded as there was no UserProfileBrick loaded in the application.');
-			}
-		}
-		else
-		{
-			$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
-		}
-
-		$aData = array();
-		
-		// Setting form mode regarding the demo mode parameter
-		$bDemoMode = MetaModel::GetConfig()->Get('demo_mode');
-		$sFormMode = ($bDemoMode) ? ObjectController::ENUM_MODE_VIEW : ObjectController::ENUM_MODE_EDIT;
-
-		// If this is ajax call, we are just submiting preferences or password forms
-		if ($oRequest->isXmlHttpRequest())
-		{
-			$aCurrentValues = $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW);
-			$sFormType = $aCurrentValues['form_type'];
-			if ($sFormType === PreferencesFormManager::FORM_TYPE)
-			{
-				$aData['form'] = $this->HandlePreferencesForm($oRequest, $oApp, $sFormMode);
-			}
-			elseif ($sFormType === PasswordFormManager::FORM_TYPE)
-			{
-				$aData['form'] = $this->HandlePasswordForm($oRequest, $oApp);
-			}
-			elseif ($sFormType === static::ENUM_FORM_TYPE_PICTURE)
-			{
-				$aData['form'] = $this->HandlePictureForm($oRequest, $oApp, $sFormMode);
-			}
-			else
-			{
-				throw new Exception('Unknown form type.');
-			}
-			$oResponse = $oApp->json($aData);
-		}
-		// Else, we are displaying page for first time
-		else
-		{
-			// Retrieving current contact
-			$oCurContact = UserRights::GetContactObject();
-			$sCurContactClass = get_class($oCurContact);
-			$sCurContactId = $oCurContact->GetKey();
-
-			// Preparing forms
-			$aData['forms']['contact'] = ObjectController::HandleForm($oRequest, $oApp, $sFormMode, $sCurContactClass, $sCurContactId, $oBrick->GetForm());
-			$aData['forms']['preferences'] = $this->HandlePreferencesForm($oRequest, $oApp, $sFormMode);
-			// - If user can change password, we display the form
-			$aData['forms']['password'] = (UserRights::CanChangePassword()) ? $this->HandlePasswordForm($oRequest, $oApp) : null;
-
-			$aData = $aData + array(
-				'oBrick' => $oBrick,
-				'sFormMode' => $sFormMode,
-				'bDemoMode' => $bDemoMode
-			);
-
-			$oResponse = $oApp['twig']->render($oBrick->GetPageTemplatePath(), $aData);
-		}
-
-		return $oResponse;
-	}
-
-	public function HandlePreferencesForm(Request $oRequest, Application $oApp, $sFormMode)
-	{
-		$aFormData = array();
-
-		// Handling form
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
-		// - Create
-		if ($sOperation === null)
-		{
-			// - Creating renderer
-			$oFormRenderer = new BsFormRenderer();
-			$oFormRenderer->SetEndpoint($_SERVER['REQUEST_URI']);
-			// - Creating manager
-			$oFormManager = new PreferencesFormManager();
-			$oFormManager->SetRenderer($oFormRenderer)
-				->Build();
-			// - Checking if we have to make the form read only
-			if ($sFormMode === ObjectController::ENUM_MODE_VIEW)
-			{
-				$oFormManager->GetForm()->MakeReadOnly();
-			}
-		}
-		// - Submit
-		else if ($sOperation === 'submit')
-		{
-			$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', null, FILTER_UNSAFE_RAW);
-			$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', null, FILTER_UNSAFE_RAW);
-			if ($sFormManagerClass === null || $sFormManagerData === null)
-			{
-				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameters formmanager_class and formamanager_data must be defined.');
-				$oApp->abort(500, 'Parameters formmanager_class and formmanager_data must be defined.');
-			}
-
-			// Rebuilding manager from json
-			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
-			// Applying modification to object
-			$aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW)));
-			// Reloading page only if preferences were changed
-			if (($aFormData['validation']['valid'] === true) && !empty($aFormData['validation']['messages']['success']))
-			{
-				$aFormData['validation']['redirection'] = array(
-					'url' => $oApp['url_generator']->generate('p_user_profile_brick'),
-				);
-			}
-		}
-		else
-		{
-			// Else, submit from another form
-		}
-
-		// Preparing field_set data
-		$aFieldSetData = array(
-			'fields_list' => $oFormManager->GetRenderer()->Render(),
-			'fields_impacts' => $oFormManager->GetForm()->GetFieldsImpacts(),
-			'form_path' => $oFormManager->GetForm()->GetId()
-		);
-
-		// Preparing form data
-		$aFormData['id'] = $oFormManager->GetForm()->GetId();
-		$aFormData['formmanager_class'] = $oFormManager->GetClass();
-		$aFormData['formmanager_data'] = $oFormManager->ToJSON();
-		$aFormData['renderer'] = $oFormManager->GetRenderer();
-		$aFormData['fieldset'] = $aFieldSetData;
-
-		return $aFormData;
-	}
-
-	public function HandlePasswordForm(Request $oRequest, Application $oApp)
-	{
-		$aFormData = array();
-
-		// Handling form
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
-		// - Create
-		if ($sOperation === null)
-		{
-			// - Creating renderer
-			$oFormRenderer = new BsFormRenderer();
-			$oFormRenderer->SetEndpoint($_SERVER['REQUEST_URI']);
-			// - Creating manager
-			$oFormManager = new PasswordFormManager();
-			$oFormManager->SetRenderer($oFormRenderer)
-				->Build();
-		}
-		// - Submit
-		else if ($sOperation === 'submit')
-		{
-			$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', null, FILTER_UNSAFE_RAW);
-			$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', null, FILTER_UNSAFE_RAW);
-			if ($sFormManagerClass === null || $sFormManagerData === null)
-			{
-				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameters formmanager_class and formamanager_data must be defined.');
-				$oApp->abort(500, 'Parameters formmanager_class and formmanager_data must be defined.');
-			}
-
-			// Rebuilding manager from json
-			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
-			// Applying modification to object
-			$aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW)));
-		}
-		else
-		{
-			// Else, submit from another form
-		}
-
-		// Preparing field_set data
-		$aFieldSetData = array(
-			'fields_list' => $oFormManager->GetRenderer()->Render(),
-			'fields_impacts' => $oFormManager->GetForm()->GetFieldsImpacts(),
-			'form_path' => $oFormManager->GetForm()->GetId()
-		);
-
-		// Preparing form data
-		$aFormData['id'] = $oFormManager->GetForm()->GetId();
-		$aFormData['formmanager_class'] = $oFormManager->GetClass();
-		$aFormData['formmanager_data'] = $oFormManager->ToJSON();
-		$aFormData['renderer'] = $oFormManager->GetRenderer();
-		$aFormData['fieldset'] = $aFieldSetData;
-
-		return $aFormData;
-	}
-
-	public function HandlePictureForm(Request $oRequest, Application $oApp, $sFormMode)
-	{
-		$aFormData = array();
-		$sPictureAttCode = 'picture';
-
-		// Handling form
-		$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
-		// - No operation specified
-		if ($sOperation === null)
-		{
-			IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Operation parameter must be specified.');
-			$oApp->abort(500, 'Operation parameter must be specified.');
-		}
-		// - Submit
-		else if ($sOperation === 'submit')
-		{
-			$oRequestFiles = $oRequest->files;
-			$oPictureFile = $oRequestFiles->get($sPictureAttCode);
-			if ($oPictureFile === null)
-			{
-				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameter picture must be defined.');
-				$oApp->abort(500, 'Parameter picture must be defined.');
-			}
-			
-			try
-			{
-				// Retrieving image as an ORMDocument
-				$oImage = utils::ReadPostedDocument($sPictureAttCode);
-				// Retrieving current contact
-				$oCurContact = UserRights::GetContactObject();
-				// Resizing image
-				$oAttDef = MetaModel::GetAttributeDef(get_class($oCurContact), $sPictureAttCode);
-				$aSize = utils::GetImageSize($oImage->GetData());
-				$oImage = utils::ResizeImageToFit($oImage, $aSize[0], $aSize[1], $oAttDef->Get('storage_max_width'), $oAttDef->Get('storage_max_height'));
-				// Setting it to the contact
-				$oCurContact->Set($sPictureAttCode, $oImage);
-				// Forcing allowed writing on the object if necessary.
-				$oCurContact->AllowWrite(true);
-				$oCurContact->DBUpdate();
-			}
-			catch (FileUploadException $e)
-			{
-				$aFormData['error'] = $e->GetMessage();
-			}
-
-			$aFormData['picture_url'] = $oImage->GetDownloadURL(get_class($oCurContact), $oCurContact->GetKey(), $sPictureAttCode);
-			$aFormData['validation'] = array(
-				'valid' => true,
-				'messages' => array()
-			);
-		}
-		else
-		{
-			// Else, submit from another form
-		}
-
-		return $aFormData;
-	}
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Controller;
+
+use Exception;
+use IssueLog;
+use utils;
+use MetaModel;
+use UserRights;
+use Silex\Application;
+use Symfony\Component\HttpFoundation\Request;
+use Combodo\iTop\Portal\Helper\ApplicationHelper;
+use Combodo\iTop\Portal\Brick\UserProfileBrick;
+use Combodo\iTop\Portal\Controller\ObjectController;
+use Combodo\iTop\Portal\Form\PreferencesFormManager;
+use Combodo\iTop\Portal\Form\PasswordFormManager;
+use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
+
+class UserProfileBrickController extends BrickController
+{
+	const ENUM_FORM_TYPE_PICTURE = 'picture';
+
+	public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId)
+	{
+		// If the brick id was not specified, we get the first one registered that is an instance of UserProfileBrick as default
+		if ($sBrickId === null)
+		{
+			foreach ($oApp['combodo.portal.instance.conf']['bricks'] as $oTmpBrick)
+			{
+				if ($oTmpBrick instanceof UserProfileBrick)
+				{
+					$oBrick = $oTmpBrick;
+				}
+			}
+
+			// We make sure a UserProfileBrick was found
+			if (!isset($oBrick) || $oBrick === null)
+			{
+				$oBrick = new UserProfileBrick();
+				//$oApp->abort(500, 'UserProfileBrick : Brick could not be loaded as there was no UserProfileBrick loaded in the application.');
+			}
+		}
+		else
+		{
+			$oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId);
+		}
+
+		$aData = array();
+		
+		// Setting form mode regarding the demo mode parameter
+		$bDemoMode = MetaModel::GetConfig()->Get('demo_mode');
+		$sFormMode = ($bDemoMode) ? ObjectController::ENUM_MODE_VIEW : ObjectController::ENUM_MODE_EDIT;
+
+		// If this is ajax call, we are just submiting preferences or password forms
+		if ($oRequest->isXmlHttpRequest())
+		{
+			$aCurrentValues = $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW);
+			$sFormType = $aCurrentValues['form_type'];
+			if ($sFormType === PreferencesFormManager::FORM_TYPE)
+			{
+				$aData['form'] = $this->HandlePreferencesForm($oRequest, $oApp, $sFormMode);
+			}
+			elseif ($sFormType === PasswordFormManager::FORM_TYPE)
+			{
+				$aData['form'] = $this->HandlePasswordForm($oRequest, $oApp);
+			}
+			elseif ($sFormType === static::ENUM_FORM_TYPE_PICTURE)
+			{
+				$aData['form'] = $this->HandlePictureForm($oRequest, $oApp, $sFormMode);
+			}
+			else
+			{
+				throw new Exception('Unknown form type.');
+			}
+			$oResponse = $oApp->json($aData);
+		}
+		// Else, we are displaying page for first time
+		else
+		{
+			// Retrieving current contact
+			$oCurContact = UserRights::GetContactObject();
+			$sCurContactClass = get_class($oCurContact);
+			$sCurContactId = $oCurContact->GetKey();
+
+			// Preparing forms
+			$aData['forms']['contact'] = ObjectController::HandleForm($oRequest, $oApp, $sFormMode, $sCurContactClass, $sCurContactId, $oBrick->GetForm());
+			$aData['forms']['preferences'] = $this->HandlePreferencesForm($oRequest, $oApp, $sFormMode);
+			// - If user can change password, we display the form
+			$aData['forms']['password'] = (UserRights::CanChangePassword()) ? $this->HandlePasswordForm($oRequest, $oApp) : null;
+
+			$aData = $aData + array(
+				'oBrick' => $oBrick,
+				'sFormMode' => $sFormMode,
+				'bDemoMode' => $bDemoMode
+			);
+
+			$oResponse = $oApp['twig']->render($oBrick->GetPageTemplatePath(), $aData);
+		}
+
+		return $oResponse;
+	}
+
+	public function HandlePreferencesForm(Request $oRequest, Application $oApp, $sFormMode)
+	{
+		$aFormData = array();
+
+		// Handling form
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
+		// - Create
+		if ($sOperation === null)
+		{
+			// - Creating renderer
+			$oFormRenderer = new BsFormRenderer();
+			$oFormRenderer->SetEndpoint($_SERVER['REQUEST_URI']);
+			// - Creating manager
+			$oFormManager = new PreferencesFormManager();
+			$oFormManager->SetRenderer($oFormRenderer)
+				->Build();
+			// - Checking if we have to make the form read only
+			if ($sFormMode === ObjectController::ENUM_MODE_VIEW)
+			{
+				$oFormManager->GetForm()->MakeReadOnly();
+			}
+		}
+		// - Submit
+		else if ($sOperation === 'submit')
+		{
+			$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', null, FILTER_UNSAFE_RAW);
+			$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', null, FILTER_UNSAFE_RAW);
+			if ($sFormManagerClass === null || $sFormManagerData === null)
+			{
+				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameters formmanager_class and formamanager_data must be defined.');
+				$oApp->abort(500, 'Parameters formmanager_class and formmanager_data must be defined.');
+			}
+
+			// Rebuilding manager from json
+			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
+			// Applying modification to object
+			$aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW)));
+			// Reloading page only if preferences were changed
+			if (($aFormData['validation']['valid'] === true) && !empty($aFormData['validation']['messages']['success']))
+			{
+				$aFormData['validation']['redirection'] = array(
+					'url' => $oApp['url_generator']->generate('p_user_profile_brick'),
+				);
+			}
+		}
+		else
+		{
+			// Else, submit from another form
+		}
+
+		// Preparing field_set data
+		$aFieldSetData = array(
+			'fields_list' => $oFormManager->GetRenderer()->Render(),
+			'fields_impacts' => $oFormManager->GetForm()->GetFieldsImpacts(),
+			'form_path' => $oFormManager->GetForm()->GetId()
+		);
+
+		// Preparing form data
+		$aFormData['id'] = $oFormManager->GetForm()->GetId();
+		$aFormData['formmanager_class'] = $oFormManager->GetClass();
+		$aFormData['formmanager_data'] = $oFormManager->ToJSON();
+		$aFormData['renderer'] = $oFormManager->GetRenderer();
+		$aFormData['fieldset'] = $aFieldSetData;
+
+		return $aFormData;
+	}
+
+	public function HandlePasswordForm(Request $oRequest, Application $oApp)
+	{
+		$aFormData = array();
+
+		// Handling form
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
+		// - Create
+		if ($sOperation === null)
+		{
+			// - Creating renderer
+			$oFormRenderer = new BsFormRenderer();
+			$oFormRenderer->SetEndpoint($_SERVER['REQUEST_URI']);
+			// - Creating manager
+			$oFormManager = new PasswordFormManager();
+			$oFormManager->SetRenderer($oFormRenderer)
+				->Build();
+		}
+		// - Submit
+		else if ($sOperation === 'submit')
+		{
+			$sFormManagerClass = $oApp['request_manipulator']->ReadParam('formmanager_class', null, FILTER_UNSAFE_RAW);
+			$sFormManagerData = $oApp['request_manipulator']->ReadParam('formmanager_data', null, FILTER_UNSAFE_RAW);
+			if ($sFormManagerClass === null || $sFormManagerData === null)
+			{
+				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameters formmanager_class and formamanager_data must be defined.');
+				$oApp->abort(500, 'Parameters formmanager_class and formmanager_data must be defined.');
+			}
+
+			// Rebuilding manager from json
+			$oFormManager = $sFormManagerClass::FromJSON($sFormManagerData);
+			// Applying modification to object
+			$aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW)));
+		}
+		else
+		{
+			// Else, submit from another form
+		}
+
+		// Preparing field_set data
+		$aFieldSetData = array(
+			'fields_list' => $oFormManager->GetRenderer()->Render(),
+			'fields_impacts' => $oFormManager->GetForm()->GetFieldsImpacts(),
+			'form_path' => $oFormManager->GetForm()->GetId()
+		);
+
+		// Preparing form data
+		$aFormData['id'] = $oFormManager->GetForm()->GetId();
+		$aFormData['formmanager_class'] = $oFormManager->GetClass();
+		$aFormData['formmanager_data'] = $oFormManager->ToJSON();
+		$aFormData['renderer'] = $oFormManager->GetRenderer();
+		$aFormData['fieldset'] = $aFieldSetData;
+
+		return $aFormData;
+	}
+
+	public function HandlePictureForm(Request $oRequest, Application $oApp, $sFormMode)
+	{
+		$aFormData = array();
+		$sPictureAttCode = 'picture';
+
+		// Handling form
+		$sOperation = $oApp['request_manipulator']->ReadParam('operation', null);
+		// - No operation specified
+		if ($sOperation === null)
+		{
+			IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Operation parameter must be specified.');
+			$oApp->abort(500, 'Operation parameter must be specified.');
+		}
+		// - Submit
+		else if ($sOperation === 'submit')
+		{
+			$oRequestFiles = $oRequest->files;
+			$oPictureFile = $oRequestFiles->get($sPictureAttCode);
+			if ($oPictureFile === null)
+			{
+				IssueLog::Error(__METHOD__ . ' at line ' . __LINE__ . ' : Parameter picture must be defined.');
+				$oApp->abort(500, 'Parameter picture must be defined.');
+			}
+			
+			try
+			{
+				// Retrieving image as an ORMDocument
+				$oImage = utils::ReadPostedDocument($sPictureAttCode);
+				// Retrieving current contact
+				$oCurContact = UserRights::GetContactObject();
+				// Resizing image
+				$oAttDef = MetaModel::GetAttributeDef(get_class($oCurContact), $sPictureAttCode);
+				$aSize = utils::GetImageSize($oImage->GetData());
+				$oImage = utils::ResizeImageToFit($oImage, $aSize[0], $aSize[1], $oAttDef->Get('storage_max_width'), $oAttDef->Get('storage_max_height'));
+				// Setting it to the contact
+				$oCurContact->Set($sPictureAttCode, $oImage);
+				// Forcing allowed writing on the object if necessary.
+				$oCurContact->AllowWrite(true);
+				$oCurContact->DBUpdate();
+			}
+			catch (FileUploadException $e)
+			{
+				$aFormData['error'] = $e->GetMessage();
+			}
+
+			$aFormData['picture_url'] = $oImage->GetDownloadURL(get_class($oCurContact), $oCurContact->GetKey(), $sPictureAttCode);
+			$aFormData['validation'] = array(
+				'valid' => true,
+				'messages' => array()
+			);
+		}
+		else
+		{
+			// Else, submit from another form
+		}
+
+		return $aFormData;
+	}
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/abstractrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/abstractrouter.class.inc.php
index d132bdeb6..f426e8c08 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/abstractrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/abstractrouter.class.inc.php
@@ -1,138 +1,138 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-use Silex\Application;
-
-/**
- * AbstractRouter class is where URLs are defined with their callback, parameters and constraints (assertions).
- * It allows us to have URL pattern at one place only and to generate them anywhere in the code, avoiding to maintain URLs in multiple places.
- * 
- * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
- */
-abstract class AbstractRouter
-{
-	/**
-	 * List of routes for that Router.
-	 *
-	 * Each route is defined as an associative array and can have the following parameters :
-	 * - pattern : URL pattern with its parameters names (eg: '/{sBrickId}/browse/{sBrowseMode}')
-	 * - hash : String to append to the URL with an '#' (eg: 'modal-popup' will append '#modal-popup' to the above URL)
-	 * - callback : Function to be called for that route, usally in a Controller. (eg: 'Combodo\\iTop\\Portal\\Controller\\CreateBrickController::DisplayAction')
-	 * - bind : Unique name of the route, must not contain blanks. Usually lowercase with underscore (eg: 'p_browse_brick')
-	 * - asserts : Associative array of assertions to check for the pattern parameters (eg: array(	'sBrowseMode' => 'list|tree'))
-	 * - values : Associative array of default values for the pattern parameters (eg: array('sBrowseMode' => 'tree'))
-	 *
-	 * @var array
-	 */
-	static $aRoutes = array();
-
-	/**
-	 * Returns routes of the current AbstractRouter defined in $aRoutes.
-	 *
-	 * @return array
-	 */
-	static function GetRoutes()
-	{
-		return static::$aRoutes;
-	}
-
-	/**
-	 * Returns the route named $name of the current AbstractRouter.
-	 * Throws an exception if not found.
-	 *
-	 * @param string $name
-	 * @return array
-	 * @throws \Exception
-	 */
-	static function GetRoute($name)
-	{
-		$bFound = false;
-		$aFoundRoute = array();
-
-		foreach (static::$aRoutes as $aRoute)
-		{
-			if (isset($aRoute['bind']) && $aRoute['bind'] === $name)
-			{
-				$bFound = true;
-				$aFoundRoute = $aRoute;
-				break;
-			}
-		}
-
-		if (!$bFound)
-		{
-			throw new \Exception('Unknown route "' . $name . '" for ' . get_class() . '');
-		}
-
-		return $aRoute;
-	}
-
-	/**
-	 * Registers all routes of the current AbstractRouter to the Application $oApp.
-	 *
-	 * @param Application $oApp
-	 * @return int Number of succesfully registered routes
-	 * @throws \Exception
-	 */
-	static function RegisterAllRoutes(Application $oApp)
-	{
-		$iCounter = 0;
-
-		foreach (static::$aRoutes as $aRoute)
-		{
-			// Check if we have the base parameters to register the route
-			if (!isset($aRoute['pattern']) || !isset($aRoute['callback']))
-			{
-				throw new \Exception('Unable to register routes from ' . get_class() . ', some parameters are missing.');
-			}
-
-			// Registering base route
-			$controller = $oApp->match($aRoute['pattern'], $aRoute['callback']);
-
-			// Checking if route has optionnal parameters
-			if (isset($aRoute['bind']))
-			{
-				$controller->bind($aRoute['bind']);
-			}
-			if (isset($aRoute['asserts']))
-			{
-				foreach ($aRoute['asserts'] as $sKey => $sValue)
-				{
-					$controller->assert($sKey, $sValue);
-				}
-			}
-			if (isset($aRoute['values']))
-			{
-				foreach ($aRoute['values'] as $sKey => $sValue)
-				{
-					$controller->value($sKey, $sValue);
-				}
-			}
-
-			$iCounter++;
-		}
-
-		return $iCounter;
-	}
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+use Silex\Application;
+
+/**
+ * AbstractRouter class is where URLs are defined with their callback, parameters and constraints (assertions).
+ * It allows us to have URL pattern at one place only and to generate them anywhere in the code, avoiding to maintain URLs in multiple places.
+ * 
+ * @author Guillaume Lajarige <guillaume.lajarige@combodo.com>
+ */
+abstract class AbstractRouter
+{
+	/**
+	 * List of routes for that Router.
+	 *
+	 * Each route is defined as an associative array and can have the following parameters :
+	 * - pattern : URL pattern with its parameters names (eg: '/{sBrickId}/browse/{sBrowseMode}')
+	 * - hash : String to append to the URL with an '#' (eg: 'modal-popup' will append '#modal-popup' to the above URL)
+	 * - callback : Function to be called for that route, usally in a Controller. (eg: 'Combodo\\iTop\\Portal\\Controller\\CreateBrickController::DisplayAction')
+	 * - bind : Unique name of the route, must not contain blanks. Usually lowercase with underscore (eg: 'p_browse_brick')
+	 * - asserts : Associative array of assertions to check for the pattern parameters (eg: array(	'sBrowseMode' => 'list|tree'))
+	 * - values : Associative array of default values for the pattern parameters (eg: array('sBrowseMode' => 'tree'))
+	 *
+	 * @var array
+	 */
+	static $aRoutes = array();
+
+	/**
+	 * Returns routes of the current AbstractRouter defined in $aRoutes.
+	 *
+	 * @return array
+	 */
+	static function GetRoutes()
+	{
+		return static::$aRoutes;
+	}
+
+	/**
+	 * Returns the route named $name of the current AbstractRouter.
+	 * Throws an exception if not found.
+	 *
+	 * @param string $name
+	 * @return array
+	 * @throws \Exception
+	 */
+	static function GetRoute($name)
+	{
+		$bFound = false;
+		$aFoundRoute = array();
+
+		foreach (static::$aRoutes as $aRoute)
+		{
+			if (isset($aRoute['bind']) && $aRoute['bind'] === $name)
+			{
+				$bFound = true;
+				$aFoundRoute = $aRoute;
+				break;
+			}
+		}
+
+		if (!$bFound)
+		{
+			throw new \Exception('Unknown route "' . $name . '" for ' . get_class() . '');
+		}
+
+		return $aRoute;
+	}
+
+	/**
+	 * Registers all routes of the current AbstractRouter to the Application $oApp.
+	 *
+	 * @param Application $oApp
+	 * @return int Number of succesfully registered routes
+	 * @throws \Exception
+	 */
+	static function RegisterAllRoutes(Application $oApp)
+	{
+		$iCounter = 0;
+
+		foreach (static::$aRoutes as $aRoute)
+		{
+			// Check if we have the base parameters to register the route
+			if (!isset($aRoute['pattern']) || !isset($aRoute['callback']))
+			{
+				throw new \Exception('Unable to register routes from ' . get_class() . ', some parameters are missing.');
+			}
+
+			// Registering base route
+			$controller = $oApp->match($aRoute['pattern'], $aRoute['callback']);
+
+			// Checking if route has optionnal parameters
+			if (isset($aRoute['bind']))
+			{
+				$controller->bind($aRoute['bind']);
+			}
+			if (isset($aRoute['asserts']))
+			{
+				foreach ($aRoute['asserts'] as $sKey => $sValue)
+				{
+					$controller->assert($sKey, $sValue);
+				}
+			}
+			if (isset($aRoute['values']))
+			{
+				foreach ($aRoute['values'] as $sKey => $sValue)
+				{
+					$controller->value($sKey, $sValue);
+				}
+			}
+
+			$iCounter++;
+		}
+
+		return $iCounter;
+	}
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
index 7c4a51667..618a7836e 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php
@@ -1,65 +1,65 @@
-<?php
-
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should havze received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-use Silex\Application;
-
-class BrowseBrickRouter extends AbstractRouter
-{
-	static $aRoutes = array(
-		// We don't set asserts for sBrowseMode on that route, as it the generic one, it can be extended by another brick.
-		array('pattern' => '/browse/{sBrickId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
-			'bind' => 'p_browse_brick'
-		),
-		array('pattern' => '/browse/{sBrickId}/{sBrowseMode}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
-			'bind' => 'p_browse_brick_mode'
-		),
-		array('pattern' => '/browse/{sBrickId}/list/page/{iPageNumber}/show/{iListLength}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
-			'bind' => 'p_browse_brick_mode_list',
-			'asserts' => array(
-				'sBrowseMode' => 'list',
-				'iPageNumber' => '\d+',
-				'iListLength' => '\d+'
-			),
-			'values' => array(
-				'sBrowseMode' => 'list',
-				'sDataLoading' => 'lazy',
-				'iPageNumber' => '1',
-				'iListLength' => '20'
-			)
-		),
-		array('pattern' => '/browse/{sBrickId}/tree/expand/{sLevelAlias}/{sNodeId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
-			'bind' => 'p_browse_brick_mode_tree',
-			'asserts' => array(
-				'sBrowseMode' => 'tree'
-			),
-			'values' => array(
-				'sBrowseMode' => 'tree',
-				'sDataLoading' => 'lazy',
-				'sNodeId' => null
-			)
-		),
-	);
-
-}
+<?php
+
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should havze received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+use Silex\Application;
+
+class BrowseBrickRouter extends AbstractRouter
+{
+	static $aRoutes = array(
+		// We don't set asserts for sBrowseMode on that route, as it the generic one, it can be extended by another brick.
+		array('pattern' => '/browse/{sBrickId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
+			'bind' => 'p_browse_brick'
+		),
+		array('pattern' => '/browse/{sBrickId}/{sBrowseMode}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
+			'bind' => 'p_browse_brick_mode'
+		),
+		array('pattern' => '/browse/{sBrickId}/list/page/{iPageNumber}/show/{iListLength}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
+			'bind' => 'p_browse_brick_mode_list',
+			'asserts' => array(
+				'sBrowseMode' => 'list',
+				'iPageNumber' => '\d+',
+				'iListLength' => '\d+'
+			),
+			'values' => array(
+				'sBrowseMode' => 'list',
+				'sDataLoading' => 'lazy',
+				'iPageNumber' => '1',
+				'iListLength' => '20'
+			)
+		),
+		array('pattern' => '/browse/{sBrickId}/tree/expand/{sLevelAlias}/{sNodeId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\BrowseBrickController::DisplayAction',
+			'bind' => 'p_browse_brick_mode_tree',
+			'asserts' => array(
+				'sBrowseMode' => 'tree'
+			),
+			'values' => array(
+				'sBrowseMode' => 'tree',
+				'sDataLoading' => 'lazy',
+				'sNodeId' => null
+			)
+		),
+	);
+
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
index 6df68230e..0f8cf83e6 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php
@@ -1,32 +1,32 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-use Silex\Application;
-
-class CreateBrickRouter extends AbstractRouter
-{
-	static $aRoutes = array(
-		array('pattern' => '/create/{sBrickId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\CreateBrickController::DisplayAction',
-			'bind' => 'p_create_brick')
-	);
-
-}
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+use Silex\Application;
+
+class CreateBrickRouter extends AbstractRouter
+{
+	static $aRoutes = array(
+		array('pattern' => '/create/{sBrickId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\CreateBrickController::DisplayAction',
+			'bind' => 'p_create_brick')
+	);
+
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
index 319088a9a..4385ada3d 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php
@@ -1,40 +1,40 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-use Silex\Application;
-
-class DefaultRouter extends AbstractRouter
-{
-	static $aRoutes = array(
-		array('pattern' => '/',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\DefaultController::homeAction',
-			'bind' => 'p_home'),
-//		// Example route
-//		array('pattern' => '/url-pattern',
-//			'hash' => 'string-to-be-append-to-the-pattern-after-a-#',
-//			'navigation_menu_attr' => array('id' => 'link_id', 'rel' => 'foo'),
-//			'callback' => 'Combodo\\iTop\\Portal\\Controller\\DefaultController::exampleAction',
-//			'bind' => 'p_example')
-	);
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+use Silex\Application;
+
+class DefaultRouter extends AbstractRouter
+{
+	static $aRoutes = array(
+		array('pattern' => '/',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\DefaultController::homeAction',
+			'bind' => 'p_home'),
+//		// Example route
+//		array('pattern' => '/url-pattern',
+//			'hash' => 'string-to-be-append-to-the-pattern-after-a-#',
+//			'navigation_menu_attr' => array('id' => 'link_id', 'rel' => 'foo'),
+//			'callback' => 'Combodo\\iTop\\Portal\\Controller\\DefaultController::exampleAction',
+//			'bind' => 'p_example')
+	);
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php
index 06af20ea6..0e54b215d 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php
@@ -1,68 +1,68 @@
-<?php
-
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-class ManageBrickRouter extends AbstractRouter
-{
-	static $aRoutes = array(
-        array(
-            'pattern' => '/manage/{sBrickId}/{sGroupingTab}',
-            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
-            'bind' => 'p_manage_brick',
-            'asserts' => array(),
-            'values' => array(
-                'sGroupingTab' => null,
-            )
-        ),
-        array(
-            'pattern' => '/manage/{sBrickId}/display-as/{sDisplayMode}/{sGroupingTab}',
-            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
-            'bind' => 'p_manage_brick_display_as',
-            'asserts' => array(
-                'sDisplayMode' => 'list|pie-chart|bar-chart'
-            ),
-            'values' => array(
-                'sGroupingTab' => null,
-            )
-        ),
-        array(
-			'pattern' => '/manage/{sBrickId}/{sGroupingTab}/{sGroupingArea}/page/{iPageNumber}/show/{iListLength}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
-			'bind' => 'p_manage_brick_lazy',
-			'asserts' => array(
-				'iPageNumber' => '\d+',
-				'iListLength' => '\d+',
-			),
-			'values' => array(
-				'sDataLoading' => 'lazy',
-				'iPageNumber' => '1',
-				'iListLength' => '20',
-			)
-		),
-		array(
-			'pattern' => '/manage/export/excel/start/{sBrickId}/{sGroupingTab}/{sGroupingArea}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::ExcelExportStartAction',
-			'bind' => 'p_manage_brick_excel_export_start',
-			'asserts' => array(),
-			'values' => array(),
-		),
-	);
-
-}
+<?php
+
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+class ManageBrickRouter extends AbstractRouter
+{
+	static $aRoutes = array(
+        array(
+            'pattern' => '/manage/{sBrickId}/{sGroupingTab}',
+            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
+            'bind' => 'p_manage_brick',
+            'asserts' => array(),
+            'values' => array(
+                'sGroupingTab' => null,
+            )
+        ),
+        array(
+            'pattern' => '/manage/{sBrickId}/display-as/{sDisplayMode}/{sGroupingTab}',
+            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
+            'bind' => 'p_manage_brick_display_as',
+            'asserts' => array(
+                'sDisplayMode' => 'list|pie-chart|bar-chart'
+            ),
+            'values' => array(
+                'sGroupingTab' => null,
+            )
+        ),
+        array(
+			'pattern' => '/manage/{sBrickId}/{sGroupingTab}/{sGroupingArea}/page/{iPageNumber}/show/{iListLength}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::DisplayAction',
+			'bind' => 'p_manage_brick_lazy',
+			'asserts' => array(
+				'iPageNumber' => '\d+',
+				'iListLength' => '\d+',
+			),
+			'values' => array(
+				'sDataLoading' => 'lazy',
+				'iPageNumber' => '1',
+				'iListLength' => '20',
+			)
+		),
+		array(
+			'pattern' => '/manage/export/excel/start/{sBrickId}/{sGroupingTab}/{sGroupingArea}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ManageBrickController::ExcelExportStartAction',
+			'bind' => 'p_manage_brick_excel_export_start',
+			'asserts' => array(),
+			'values' => array(),
+		),
+	);
+
+}
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
index ecffdf543..ac3e81a07 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php
@@ -1,117 +1,117 @@
-<?php
-
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-use Silex\Application;
-
-class ObjectRouter extends AbstractRouter
-{
-	static $aRoutes = array(
-		array('pattern' => '/object/create/{sObjectClass}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::CreateAction',
-			'bind' => 'p_object_create'
-		),
-		array('pattern' => '/object/create-from-factory/{sObjectClass}/{sObjectId}/{sEncodedMethodName}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::CreateFromFactoryAction',
-			'bind' => 'p_object_create_from_factory'
-		),
-		array('pattern' => '/object/edit/{sObjectClass}/{sObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::EditAction',
-			'bind' => 'p_object_edit'
-		),
-		array('pattern' => '/object/view/{sObjectClass}/{sObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::ViewAction',
-			'bind' => 'p_object_view'
-		),
-		array('pattern' => '/object/apply-stimulus/{sStimulusCode}/{sObjectClass}/{sObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::ApplyStimulusAction',
-			'bind' => 'p_object_apply_stimulus'
-		),
-		array('pattern' => '/object/search',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchRegularAction',
-			'bind' => 'p_object_search_regular'
-		),
-		array('pattern' => '/object/search/from-attribute/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchFromAttributeAction',
-			'bind' => 'p_object_search_from_attribute',
-			'values' => array(
-				'sHostObjectClass' => null,
-				'sHostObjectId' => null
-			)
-		),
-		array('pattern' => '/object/search/autocomplete/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchAutocompleteAction',
-			'bind' => 'p_object_search_autocomplete',
-			'values' => array(
-				'sHostObjectClass' => null,
-				'sHostObjectId' => null
-			)
-		),
-		array('pattern' => '/object/search/hierarchy/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchHierarchyAction',
-			'bind' => 'p_object_search_hierarchy',
-			'values' => array(
-				'sHostObjectClass' => null,
-				'sHostObjectId' => null
-			)
-		),
-		array('pattern' => '/object/search/{sMode}/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchAction',
-			'bind' => 'p_object_search_generic',
-			'values' => array(
-				'sMode' => '-sMode-',
-				'sHostObjectClass' => null,
-				'sHostObjectId' => null
-			)
-		),
-		array('pattern' => '/object/get-informations/json',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::GetInformationsAsJsonAction',
-			'bind' => 'p_object_get_informations_json',
-		),
-        array('pattern' => '/object/document/display/{sObjectClass}/{sObjectId}/{sObjectField}',
-            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::DocumentAction',
-            'bind' => 'p_object_document_display',
-            'values' => array(
-                'sOperation' => 'display'
-            )
-        ),
-        array('pattern' => '/object/document/download/{sObjectClass}/{sObjectId}/{sObjectField}',
-            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::DocumentAction',
-            'bind' => 'p_object_document_download',
-            'values' => array(
-                'sOperation' => 'download'
-            )
-        ),
-        array('pattern' => '/object/attachment/add',
-            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::AttachmentAction',
-            'bind' => 'p_object_attachment_add'
-        ),
-        array('pattern' => '/object/attachment/download/{sAttachmentId}',
-            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::AttachmentAction',
-            'bind' => 'p_object_attachment_download',
-            'values' => array(
-                'sOperation' => 'download'
-            )
-        ),
-	);
-
-}
-
+<?php
+
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+use Silex\Application;
+
+class ObjectRouter extends AbstractRouter
+{
+	static $aRoutes = array(
+		array('pattern' => '/object/create/{sObjectClass}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::CreateAction',
+			'bind' => 'p_object_create'
+		),
+		array('pattern' => '/object/create-from-factory/{sObjectClass}/{sObjectId}/{sEncodedMethodName}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::CreateFromFactoryAction',
+			'bind' => 'p_object_create_from_factory'
+		),
+		array('pattern' => '/object/edit/{sObjectClass}/{sObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::EditAction',
+			'bind' => 'p_object_edit'
+		),
+		array('pattern' => '/object/view/{sObjectClass}/{sObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::ViewAction',
+			'bind' => 'p_object_view'
+		),
+		array('pattern' => '/object/apply-stimulus/{sStimulusCode}/{sObjectClass}/{sObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::ApplyStimulusAction',
+			'bind' => 'p_object_apply_stimulus'
+		),
+		array('pattern' => '/object/search',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchRegularAction',
+			'bind' => 'p_object_search_regular'
+		),
+		array('pattern' => '/object/search/from-attribute/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchFromAttributeAction',
+			'bind' => 'p_object_search_from_attribute',
+			'values' => array(
+				'sHostObjectClass' => null,
+				'sHostObjectId' => null
+			)
+		),
+		array('pattern' => '/object/search/autocomplete/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchAutocompleteAction',
+			'bind' => 'p_object_search_autocomplete',
+			'values' => array(
+				'sHostObjectClass' => null,
+				'sHostObjectId' => null
+			)
+		),
+		array('pattern' => '/object/search/hierarchy/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchHierarchyAction',
+			'bind' => 'p_object_search_hierarchy',
+			'values' => array(
+				'sHostObjectClass' => null,
+				'sHostObjectId' => null
+			)
+		),
+		array('pattern' => '/object/search/{sMode}/{sTargetAttCode}/{sHostObjectClass}/{sHostObjectId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::SearchAction',
+			'bind' => 'p_object_search_generic',
+			'values' => array(
+				'sMode' => '-sMode-',
+				'sHostObjectClass' => null,
+				'sHostObjectId' => null
+			)
+		),
+		array('pattern' => '/object/get-informations/json',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::GetInformationsAsJsonAction',
+			'bind' => 'p_object_get_informations_json',
+		),
+        array('pattern' => '/object/document/display/{sObjectClass}/{sObjectId}/{sObjectField}',
+            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::DocumentAction',
+            'bind' => 'p_object_document_display',
+            'values' => array(
+                'sOperation' => 'display'
+            )
+        ),
+        array('pattern' => '/object/document/download/{sObjectClass}/{sObjectId}/{sObjectField}',
+            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::DocumentAction',
+            'bind' => 'p_object_document_download',
+            'values' => array(
+                'sOperation' => 'download'
+            )
+        ),
+        array('pattern' => '/object/attachment/add',
+            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::AttachmentAction',
+            'bind' => 'p_object_attachment_add'
+        ),
+        array('pattern' => '/object/attachment/download/{sAttachmentId}',
+            'callback' => 'Combodo\\iTop\\Portal\\Controller\\ObjectController::AttachmentAction',
+            'bind' => 'p_object_attachment_download',
+            'values' => array(
+                'sOperation' => 'download'
+            )
+        ),
+	);
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
index 1d4a840de..d13573b39 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php
@@ -1,38 +1,38 @@
-<?php
-
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Portal\Router;
-
-use Silex\Application;
-
-class UserProfileRouter extends AbstractRouter
-{
-	static $aRoutes = array(
-		array('pattern' => '/user/{sBrickId}',
-			'callback' => 'Combodo\\iTop\\Portal\\Controller\\UserProfileBrickController::DisplayAction',
-			'bind' => 'p_user_profile_brick',
-			'values' => array(
-				'sBrickId' => null
-			)
-		)
-	);
-
-}
-
+<?php
+
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Portal\Router;
+
+use Silex\Application;
+
+class UserProfileRouter extends AbstractRouter
+{
+	static $aRoutes = array(
+		array('pattern' => '/user/{sBrickId}',
+			'callback' => 'Combodo\\iTop\\Portal\\Controller\\UserProfileBrickController::DisplayAction',
+			'bind' => 'p_user_profile_brick',
+			'values' => array(
+				'sBrickId' => null
+			)
+		)
+	);
+
+}
+
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/web/lib/jquery-treelistfilter/js/TreeListFilter.js b/datamodels/2.x/itop-portal-base/portal/web/lib/jquery-treelistfilter/js/TreeListFilter.js
index ff51adde7..3edfff4c5 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/lib/jquery-treelistfilter/js/TreeListFilter.js
+++ b/datamodels/2.x/itop-portal-base/portal/web/lib/jquery-treelistfilter/js/TreeListFilter.js
@@ -1,83 +1,83 @@
-/**
- * Tree List Filter jQuery plugin 1.0
- *
- * Copyright (c) 2014, AIWSolutions
- * License: GPL2
- * Project Website: http://wiki.aiwsolutions.net/dOQKO
- **/
-
-jQuery.fn.treeListFilter = function(list, timeout, callback) {
-    var list = jQuery(list);
-    var input = this;
-    var keyTimeout;
-    var lastFilter = '';
-
-    // Default timeout
-    if (timeout === undefined) {
-        timeout = 200;
-    }
-    // Default callback
-    if (callback === undefined) {
-        callback = function(){ return null; };
-    }
-
-    function filterList(ulObject, filterValue) {
-        if (!ulObject.is('ul') && !ulObject.is('ol')) {
-            return false;
-        }
-        var children = ulObject.children();
-        var result = false;
-        for (var i = 0; i < children.length; i++) {
-            var liObject = jQuery(children[i]);
-            if(liObject.is('li')) {
-                var display = false;
-                if (liObject.children().length > 0) {
-                    for (var j = 0; j < liObject.children().length; j++) {
-                        var subDisplay = filterList(jQuery(liObject.children()[j]), filterValue);
-                        display = display || subDisplay;
-                    }
-                }
-                if (!display) {
-                    // Modified the search so it looks  for each parts of the search and not the entire sentance
-                    // Modified the text to remove accents (latinise())
-                    var text = liObject.find('.tree-item-wrapper').text();
-                    var textLC = text.toLowerCase().latinise();
-                    var filterValues = filterValue.split(' ');
-                    var display = true;
-
-                    for(var k in filterValues)
-                    {
-                        if(textLC.indexOf(filterValues[k]) < 0)
-                        {
-                            display = false;
-                            break;
-                        }
-                    }
-                }
-                liObject.css('display', display ? '' : 'none');
-                result = result || display;
-            }
-        }
-        return result;
-    }
-
-    input.on('change', function(event) {
-        // Modified the search t remove accents (latinise())
-        var filter = input.val().toLowerCase().trim().latinise();
-        //var startTime = new Date().getTime();
-        filterList(list, filter);
-        //var endTime = new Date().getTime();
-        //console.log('Search for ' + filter + ' took: ' + (endTime - startTime) + 'ms');
-        callback();
-        return false;
-    }).keydown(function() {
-        clearTimeout(keyTimeout);
-        keyTimeout = setTimeout(function() {
-            if( input.val() === lastFilter ) return;
-            lastFilter = input.val();
-            input.change();
-        }, timeout);
-    });
-    return this;
-}
-
+/**
+ * Tree List Filter jQuery plugin 1.0
+ *
+ * Copyright (c) 2014, AIWSolutions
+ * License: GPL2
+ * Project Website: http://wiki.aiwsolutions.net/dOQKO
+ **/
+
+jQuery.fn.treeListFilter = function(list, timeout, callback) {
+    var list = jQuery(list);
+    var input = this;
+    var keyTimeout;
+    var lastFilter = '';
+
+    // Default timeout
+    if (timeout === undefined) {
+        timeout = 200;
+    }
+    // Default callback
+    if (callback === undefined) {
+        callback = function(){ return null; };
+    }
+
+    function filterList(ulObject, filterValue) {
+        if (!ulObject.is('ul') && !ulObject.is('ol')) {
+            return false;
+        }
+        var children = ulObject.children();
+        var result = false;
+        for (var i = 0; i < children.length; i++) {
+            var liObject = jQuery(children[i]);
+            if(liObject.is('li')) {
+                var display = false;
+                if (liObject.children().length > 0) {
+                    for (var j = 0; j < liObject.children().length; j++) {
+                        var subDisplay = filterList(jQuery(liObject.children()[j]), filterValue);
+                        display = display || subDisplay;
+                    }
+                }
+                if (!display) {
+                    // Modified the search so it looks  for each parts of the search and not the entire sentance
+                    // Modified the text to remove accents (latinise())
+                    var text = liObject.find('.tree-item-wrapper').text();
+                    var textLC = text.toLowerCase().latinise();
+                    var filterValues = filterValue.split(' ');
+                    var display = true;
+
+                    for(var k in filterValues)
+                    {
+                        if(textLC.indexOf(filterValues[k]) < 0)
+                        {
+                            display = false;
+                            break;
+                        }
+                    }
+                }
+                liObject.css('display', display ? '' : 'none');
+                result = result || display;
+            }
+        }
+        return result;
+    }
+
+    input.on('change', function(event) {
+        // Modified the search t remove accents (latinise())
+        var filter = input.val().toLowerCase().trim().latinise();
+        //var startTime = new Date().getTime();
+        filterList(list, filter);
+        //var endTime = new Date().getTime();
+        //console.log('Search for ' + filter + ' took: ' + (endTime - startTime) + 'ms');
+        callback();
+        return false;
+    }).keydown(function() {
+        clearTimeout(keyTimeout);
+        keyTimeout = setTimeout(function() {
+            if( input.val() === lastFilter ) return;
+            lastFilter = input.val();
+            input.change();
+        }, timeout);
+    });
+    return this;
+}
+
diff --git a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
index 5234eb515..4514b87e0 100644
--- a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
+++ b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
-	<portals>
-		<portal id="legacy_portal" _delta="delete" /> <!-- TODO: voir si opportun de renommer au lieu de delete+define -->
-		<portal id="itop-portal" _delta="define"><!-- ID must match module_design[id] -->
-			<url>pages/exec.php?exec_module=itop-portal-base&amp;exec_page=index.php&amp;portal_id=itop-portal</url><!-- portal_id	 must match module_design[id] -->
-			<rank>1.0</rank>
-			<handler />
-			<allow>
-			</allow>
-			<deny />
-		</portal>
-	</portals>
-</itop_design>
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.5">
+	<portals>
+		<portal id="legacy_portal" _delta="delete" /> <!-- TODO: voir si opportun de renommer au lieu de delete+define -->
+		<portal id="itop-portal" _delta="define"><!-- ID must match module_design[id] -->
+			<url>pages/exec.php?exec_module=itop-portal-base&amp;exec_page=index.php&amp;portal_id=itop-portal</url><!-- portal_id	 must match module_design[id] -->
+			<rank>1.0</rank>
+			<handler />
+			<allow>
+			</allow>
+			<deny />
+		</portal>
+	</portals>
+</itop_design>
diff --git a/datamodels/2.x/itop-portal/module.itop-portal.php b/datamodels/2.x/itop-portal/module.itop-portal.php
index bc582fd1c..c14d766db 100644
--- a/datamodels/2.x/itop-portal/module.itop-portal.php
+++ b/datamodels/2.x/itop-portal/module.itop-portal.php
@@ -1,37 +1,37 @@
-<?php
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-portal/2.5.0', array(
-	// Identification
-	'label' => 'Enhanced Customer Portal',
-	'category' => 'Portal',
-	// Setup
-	'dependencies' => array(
-		'itop-portal-base/1.0.0'
-	),
-	'mandatory' => false,
-	'visible' => true,
-	// Components
-	'datamodel' => array(
-		'main.itop-portal.php'
-	),
-	'webservice' => array(
-	//'webservices.itop-portal.php',
-	),
-	'dictionary' => array(
-	),
-	'data.struct' => array(
-	//'data.struct.itop-portal.xml',
-	),
-	'data.sample' => array(
-	//'data.sample.itop-portal.xml',
-	),
-	// Documentation
-	'doc.manual_setup' => '',
-	'doc.more_information' => '',
-	// Default settings
-	'settings' => array(
-	),
-	)
-);
+<?php
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-portal/2.5.0', array(
+	// Identification
+	'label' => 'Enhanced Customer Portal',
+	'category' => 'Portal',
+	// Setup
+	'dependencies' => array(
+		'itop-portal-base/1.0.0'
+	),
+	'mandatory' => false,
+	'visible' => true,
+	// Components
+	'datamodel' => array(
+		'main.itop-portal.php'
+	),
+	'webservice' => array(
+	//'webservices.itop-portal.php',
+	),
+	'dictionary' => array(
+	),
+	'data.struct' => array(
+	//'data.struct.itop-portal.xml',
+	),
+	'data.sample' => array(
+	//'data.sample.itop-portal.xml',
+	),
+	// Documentation
+	'doc.manual_setup' => '',
+	'doc.more_information' => '',
+	// Default settings
+	'settings' => array(
+	),
+	)
+);
diff --git a/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
index fcb5e6b71..c0c214c6b 100755
--- a/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/en.dict.itop-problem-mgmt.php
@@ -1,158 +1,158 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-
-
-Dict::Add('EN US', 'English', 'English', array(
-        'Menu:ProblemManagement' => 'Problem Management',
-        'Menu:ProblemManagement+' => 'Problem Management',
-    	'Menu:Problem:Overview' => 'Overview',
-    	'Menu:Problem:Overview+' => 'Overview',
-    	'Menu:NewProblem' => 'New problem',
-    	'Menu:NewProblem+' => 'New problem',
-    	'Menu:SearchProblems' => 'Search for problems',
-    	'Menu:SearchProblems+' => 'Search for problems',
-    	'Menu:Problem:Shortcuts' => 'Shortcuts',
-        'Menu:Problem:MyProblems' => 'My problems',
-        'Menu:Problem:MyProblems+' => 'My problems',
-        'Menu:Problem:OpenProblems' => 'All open problems',
-        'Menu:Problem:OpenProblems+' => 'All open problems',
-	'UI-ProblemManagementOverview-ProblemByService' => 'Problems by service',
-	'UI-ProblemManagementOverview-ProblemByService+' => 'Problems by service',
-	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problems by priority',
-	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problems by priority',
-	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Unassigned problems',
-	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Unassigned problems',
-	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard for Problem Management',
-	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard for Problem Management',
-
-));
-//
-// Class: Problem
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Problem' => 'Problem',
-	'Class:Problem+' => '',
-	'Class:Problem/Attribute:status' => 'Status',
-	'Class:Problem/Attribute:status+' => '',
-	'Class:Problem/Attribute:status/Value:new' => 'New',
-	'Class:Problem/Attribute:status/Value:new+' => '',
-	'Class:Problem/Attribute:status/Value:assigned' => 'Assigned',
-	'Class:Problem/Attribute:status/Value:assigned+' => '',
-	'Class:Problem/Attribute:status/Value:resolved' => 'Resolved',
-	'Class:Problem/Attribute:status/Value:resolved+' => '',
-	'Class:Problem/Attribute:status/Value:closed' => 'Closed',
-	'Class:Problem/Attribute:status/Value:closed+' => '',
-	'Class:Problem/Attribute:service_id' => 'Service',
-	'Class:Problem/Attribute:service_id+' => '',
-	'Class:Problem/Attribute:service_name' => 'Service name',
-	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => 'Service subcategory',
-	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => 'Service subcategory',
-	'Class:Problem/Attribute:servicesubcategory_name+' => '',
-	'Class:Problem/Attribute:product' => 'Product',
-	'Class:Problem/Attribute:product+' => '',
-	'Class:Problem/Attribute:impact' => 'Impact',
-	'Class:Problem/Attribute:impact+' => '',
-	'Class:Problem/Attribute:impact/Value:1' => 'A Department',
-	'Class:Problem/Attribute:impact/Value:1+' => '',
-	'Class:Problem/Attribute:impact/Value:2' => 'A Service',
-	'Class:Problem/Attribute:impact/Value:2+' => '',
-	'Class:Problem/Attribute:impact/Value:3' => 'A person',
-	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:urgency' => 'Urgency',
-	'Class:Problem/Attribute:urgency+' => '',
-	'Class:Problem/Attribute:urgency/Value:1' => 'critical',
-	'Class:Problem/Attribute:urgency/Value:1+' => 'critical',
-	'Class:Problem/Attribute:urgency/Value:2' => 'high',
-	'Class:Problem/Attribute:urgency/Value:2+' => 'high',
-	'Class:Problem/Attribute:urgency/Value:3' => 'medium',
-	'Class:Problem/Attribute:urgency/Value:3+' => 'medium',
-	'Class:Problem/Attribute:urgency/Value:4' => 'low',
-	'Class:Problem/Attribute:urgency/Value:4+' => 'low',
-	'Class:Problem/Attribute:priority' => 'Priority',
-	'Class:Problem/Attribute:priority+' => '',
-	'Class:Problem/Attribute:priority/Value:1' => 'Critical',
-	'Class:Problem/Attribute:priority/Value:1+' => 'Critical',
-	'Class:Problem/Attribute:priority/Value:2' => 'High',
-	'Class:Problem/Attribute:priority/Value:2+' => 'High',
-	'Class:Problem/Attribute:priority/Value:3' => 'Medium',
-	'Class:Problem/Attribute:priority/Value:3+' => 'Medium',
-	'Class:Problem/Attribute:priority/Value:4' => 'Low',
-	'Class:Problem/Attribute:priority/Value:4+' => 'Low',
-	'Class:Problem/Attribute:related_change_id' => 'Related Change',
-	'Class:Problem/Attribute:related_change_id+' => '',
-	'Class:Problem/Attribute:related_change_ref' => 'Related Change ref',
-	'Class:Problem/Attribute:related_change_ref+' => '',
-	'Class:Problem/Attribute:assignment_date' => 'Assignment Date',
-	'Class:Problem/Attribute:assignment_date+' => '',
-	'Class:Problem/Attribute:resolution_date' => 'Resolution Date',
-	'Class:Problem/Attribute:resolution_date+' => '',
-	'Class:Problem/Attribute:knownerrors_list' => 'Known Errors',
-	'Class:Problem/Attribute:knownerrors_list+' => 'All the known errors that are linked to this problem',
-	'Class:Problem/Attribute:related_request_list' => 'Related requests',
-	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem',
-	'Class:Problem/Attribute:related_incident_list' => 'Related incidents',
-	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem',
-	'Class:Problem/Stimulus:ev_assign' => 'Assign',
-	'Class:Problem/Stimulus:ev_assign+' => '',
-	'Class:Problem/Stimulus:ev_reassign' => 'Reassign',
-	'Class:Problem/Stimulus:ev_reassign+' => '',
-	'Class:Problem/Stimulus:ev_resolve' => 'Resolve',
-	'Class:Problem/Stimulus:ev_resolve+' => '',
-	'Class:Problem/Stimulus:ev_close' => 'Close',
-	'Class:Problem/Stimulus:ev_close+' => '',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+
+
+Dict::Add('EN US', 'English', 'English', array(
+        'Menu:ProblemManagement' => 'Problem Management',
+        'Menu:ProblemManagement+' => 'Problem Management',
+    	'Menu:Problem:Overview' => 'Overview',
+    	'Menu:Problem:Overview+' => 'Overview',
+    	'Menu:NewProblem' => 'New problem',
+    	'Menu:NewProblem+' => 'New problem',
+    	'Menu:SearchProblems' => 'Search for problems',
+    	'Menu:SearchProblems+' => 'Search for problems',
+    	'Menu:Problem:Shortcuts' => 'Shortcuts',
+        'Menu:Problem:MyProblems' => 'My problems',
+        'Menu:Problem:MyProblems+' => 'My problems',
+        'Menu:Problem:OpenProblems' => 'All open problems',
+        'Menu:Problem:OpenProblems+' => 'All open problems',
+	'UI-ProblemManagementOverview-ProblemByService' => 'Problems by service',
+	'UI-ProblemManagementOverview-ProblemByService+' => 'Problems by service',
+	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problems by priority',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problems by priority',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Unassigned problems',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Unassigned problems',
+	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard for Problem Management',
+	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard for Problem Management',
+
+));
+//
+// Class: Problem
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Problem' => 'Problem',
+	'Class:Problem+' => '',
+	'Class:Problem/Attribute:status' => 'Status',
+	'Class:Problem/Attribute:status+' => '',
+	'Class:Problem/Attribute:status/Value:new' => 'New',
+	'Class:Problem/Attribute:status/Value:new+' => '',
+	'Class:Problem/Attribute:status/Value:assigned' => 'Assigned',
+	'Class:Problem/Attribute:status/Value:assigned+' => '',
+	'Class:Problem/Attribute:status/Value:resolved' => 'Resolved',
+	'Class:Problem/Attribute:status/Value:resolved+' => '',
+	'Class:Problem/Attribute:status/Value:closed' => 'Closed',
+	'Class:Problem/Attribute:status/Value:closed+' => '',
+	'Class:Problem/Attribute:service_id' => 'Service',
+	'Class:Problem/Attribute:service_id+' => '',
+	'Class:Problem/Attribute:service_name' => 'Service name',
+	'Class:Problem/Attribute:service_name+' => '',
+	'Class:Problem/Attribute:servicesubcategory_id' => 'Service subcategory',
+	'Class:Problem/Attribute:servicesubcategory_id+' => '',
+	'Class:Problem/Attribute:servicesubcategory_name' => 'Service subcategory',
+	'Class:Problem/Attribute:servicesubcategory_name+' => '',
+	'Class:Problem/Attribute:product' => 'Product',
+	'Class:Problem/Attribute:product+' => '',
+	'Class:Problem/Attribute:impact' => 'Impact',
+	'Class:Problem/Attribute:impact+' => '',
+	'Class:Problem/Attribute:impact/Value:1' => 'A Department',
+	'Class:Problem/Attribute:impact/Value:1+' => '',
+	'Class:Problem/Attribute:impact/Value:2' => 'A Service',
+	'Class:Problem/Attribute:impact/Value:2+' => '',
+	'Class:Problem/Attribute:impact/Value:3' => 'A person',
+	'Class:Problem/Attribute:impact/Value:3+' => '',
+	'Class:Problem/Attribute:urgency' => 'Urgency',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'critical',
+	'Class:Problem/Attribute:urgency/Value:1+' => 'critical',
+	'Class:Problem/Attribute:urgency/Value:2' => 'high',
+	'Class:Problem/Attribute:urgency/Value:2+' => 'high',
+	'Class:Problem/Attribute:urgency/Value:3' => 'medium',
+	'Class:Problem/Attribute:urgency/Value:3+' => 'medium',
+	'Class:Problem/Attribute:urgency/Value:4' => 'low',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'low',
+	'Class:Problem/Attribute:priority' => 'Priority',
+	'Class:Problem/Attribute:priority+' => '',
+	'Class:Problem/Attribute:priority/Value:1' => 'Critical',
+	'Class:Problem/Attribute:priority/Value:1+' => 'Critical',
+	'Class:Problem/Attribute:priority/Value:2' => 'High',
+	'Class:Problem/Attribute:priority/Value:2+' => 'High',
+	'Class:Problem/Attribute:priority/Value:3' => 'Medium',
+	'Class:Problem/Attribute:priority/Value:3+' => 'Medium',
+	'Class:Problem/Attribute:priority/Value:4' => 'Low',
+	'Class:Problem/Attribute:priority/Value:4+' => 'Low',
+	'Class:Problem/Attribute:related_change_id' => 'Related Change',
+	'Class:Problem/Attribute:related_change_id+' => '',
+	'Class:Problem/Attribute:related_change_ref' => 'Related Change ref',
+	'Class:Problem/Attribute:related_change_ref+' => '',
+	'Class:Problem/Attribute:assignment_date' => 'Assignment Date',
+	'Class:Problem/Attribute:assignment_date+' => '',
+	'Class:Problem/Attribute:resolution_date' => 'Resolution Date',
+	'Class:Problem/Attribute:resolution_date+' => '',
+	'Class:Problem/Attribute:knownerrors_list' => 'Known Errors',
+	'Class:Problem/Attribute:knownerrors_list+' => 'All the known errors that are linked to this problem',
+	'Class:Problem/Attribute:related_request_list' => 'Related requests',
+	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem',
+	'Class:Problem/Attribute:related_incident_list' => 'Related incidents',
+	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem',
+	'Class:Problem/Stimulus:ev_assign' => 'Assign',
+	'Class:Problem/Stimulus:ev_assign+' => '',
+	'Class:Problem/Stimulus:ev_reassign' => 'Reassign',
+	'Class:Problem/Stimulus:ev_reassign+' => '',
+	'Class:Problem/Stimulus:ev_resolve' => 'Resolve',
+	'Class:Problem/Stimulus:ev_resolve+' => '',
+	'Class:Problem/Stimulus:ev_close' => 'Close',
+	'Class:Problem/Stimulus:ev_close+' => '',
+));
+
+?>
diff --git a/datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php
index 3ff2cf588..5ab17b7ee 100755
--- a/datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/it.dict.itop-problem-mgmt.php
@@ -1,137 +1,137 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Problem' => 'Problema',
-	'Class:Problem+' => '',
-	'Class:Problem/Attribute:status' => 'Stato',
-	'Class:Problem/Attribute:status+' => '',
-	'Class:Problem/Attribute:status/Value:new' => 'Nuovo',
-	'Class:Problem/Attribute:status/Value:new+' => '',
-	'Class:Problem/Attribute:status/Value:assigned' => 'Assegnato',
-	'Class:Problem/Attribute:status/Value:assigned+' => '',
-	'Class:Problem/Attribute:status/Value:resolved' => 'Risolto',
-	'Class:Problem/Attribute:status/Value:resolved+' => '',
-	'Class:Problem/Attribute:status/Value:closed' => 'Chiuso',
-	'Class:Problem/Attribute:status/Value:closed+' => '',
-	'Class:Problem/Attribute:org_id' => 'Cliente',
-	'Class:Problem/Attribute:org_id+' => '',
-	'Class:Problem/Attribute:service_id' => 'Servizio',
-	'Class:Problem/Attribute:service_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => 'Categoria di servizio',
-	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'Class:Problem/Attribute:product' => 'Prodotto',
-	'Class:Problem/Attribute:product+' => '',
-	'Class:Problem/Attribute:impact' => 'Impatto',
-	'Class:Problem/Attribute:impact+' => '',
-	'Class:Problem/Attribute:impact/Value:1' => 'Una persona',
-	'Class:Problem/Attribute:impact/Value:1+' => '',
-	'Class:Problem/Attribute:impact/Value:2' => 'Un servizio',
-	'Class:Problem/Attribute:impact/Value:2+' => '',
-	'Class:Problem/Attribute:impact/Value:3' => 'Un dipartimento',
-	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:urgency' => 'Urgenza',
-	'Class:Problem/Attribute:urgency+' => '',
-	'Class:Problem/Attribute:urgency/Value:1' => 'Bassa',
-	'Class:Problem/Attribute:urgency/Value:1+' => 'Bassa',
-	'Class:Problem/Attribute:urgency/Value:2' => 'Media',
-	'Class:Problem/Attribute:urgency/Value:2+' => 'Media',
-	'Class:Problem/Attribute:urgency/Value:3' => 'Alta',
-	'Class:Problem/Attribute:urgency/Value:3+' => 'Alta',
-	'Class:Problem/Attribute:priority' => 'Priorità',
-	'Class:Problem/Attribute:priority+' => '',
-	'Class:Problem/Attribute:priority/Value:1' => 'Bassa',
-	'Class:Problem/Attribute:priority/Value:1+' => '',
-	'Class:Problem/Attribute:priority/Value:2' => 'Media',
-	'Class:Problem/Attribute:priority/Value:2+' => '',
-	'Class:Problem/Attribute:priority/Value:3' => 'Alta',
-	'Class:Problem/Attribute:priority/Value:3+' => '',
-	'Class:Problem/Attribute:workgroup_id' => 'Gruppo di lavoro',
-	'Class:Problem/Attribute:workgroup_id+' => '',
-	'Class:Problem/Attribute:agent_id' => 'Agente',
-	'Class:Problem/Attribute:agent_id+' => '',
-	'Class:Problem/Attribute:related_change_id' => 'Cambi Correlati',
-	'Class:Problem/Attribute:related_change_id+' => '',
-	'Class:Problem/Attribute:close_date' => 'Data di Chiusura',
-	'Class:Problem/Attribute:close_date+' => '',
-	'Class:Problem/Attribute:last_update' => 'Ultimo Aggiornamento',
-	'Class:Problem/Attribute:last_update+' => '',
-	'Class:Problem/Attribute:assignment_date' => 'Data di asseganzione',
-	'Class:Problem/Attribute:assignment_date+' => '',
-	'Class:Problem/Attribute:resolution_date' => 'Data di risoluzione',
-	'Class:Problem/Attribute:resolution_date+' => '',
-	'Class:Problem/Attribute:knownerrors_list' => 'Errori Conosciuti',
-	'Class:Problem/Attribute:knownerrors_list+' => '',
-	'Class:Problem/Stimulus:ev_assign' => 'Assegnare',
-	'Class:Problem/Stimulus:ev_assign+' => '',
-	'Class:Problem/Stimulus:ev_reassign' => 'Riassegnare',
-	'Class:Problem/Stimulus:ev_reassign+' => '',
-	'Class:Problem/Stimulus:ev_resolve' => 'Risolvere',
-	'Class:Problem/Stimulus:ev_resolve+' => '',
-	'Class:Problem/Stimulus:ev_close' => 'Chiudere',
-	'Class:Problem/Stimulus:ev_close+' => '',
-	'Menu:ProblemManagement' => 'Gestione dei Problemi',
-	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
-	'Menu:Problem:Overview' => 'Panoramica',
-	'Menu:Problem:Overview+' => 'Panoramica',
-	'Menu:NewProblem' => 'Nuovo Problema',
-	'Menu:NewProblem+' => 'Nuovo Problema',
-	'Menu:SearchProblems' => 'Ricerca per Problema',
-	'Menu:SearchProblems+' => 'Ricerca per Problema',
-	'Menu:Problem:Shortcuts' => 'Scorciatoia',
-	'Menu:Problem:MyProblems' => 'I Miei Problemi',
-	'Menu:Problem:MyProblems+' => 'I Miei Problemi',
-	'Menu:Problem:OpenProblems' => 'Tutti i Problemi Aperti',
-	'Menu:Problem:OpenProblems+' => 'Tutti i Problemi Aperti',
-	'UI-ProblemManagementOverview-ProblemByService' => 'Problemi per Servizio',
-	'UI-ProblemManagementOverview-ProblemByService+' => 'Problemi per Servizio',
-	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problemi per Priorità',
-	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problemi per Priorità',
-	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Problemi non assegnati',
-	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Problemi non assegnati',
-	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard per la gestione dei problemi',
-	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard per la gestione dei problemi',
-	'Class:Problem/Attribute:org_name' => 'Nome',
-	'Class:Problem/Attribute:org_name+' => 'Nome Comune',
-	'Class:Problem/Attribute:service_name' => 'Nome',
-	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => 'Nome',
-	'Class:Problem/Attribute:servicesubcategory_name+' => '',
-	'Class:Problem/Attribute:workgroup_name' => 'Nome',
-	'Class:Problem/Attribute:workgroup_name+' => '',
-	'Class:Problem/Attribute:agent_name' => 'Nome dell\Agente',
-	'Class:Problem/Attribute:agent_name+' => '',
-	'Class:Problem/Attribute:agent_email' => 'Email dell\'Agente',
-	'Class:Problem/Attribute:agent_email+' => '',
-	'Class:Problem/Attribute:related_change_ref' => 'Ref',
-	'Class:Problem/Attribute:related_change_ref+' => '',
-	'Class:Problem/Attribute:urgency/Value:4' => 'low~~',
-	'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
-	'Class:Problem/Attribute:priority/Value:4' => 'Low~~',
-	'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
-	'Class:Problem/Attribute:related_request_list' => 'Related requests~~',
-	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem~~',
-	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
-));
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Problem' => 'Problema',
+	'Class:Problem+' => '',
+	'Class:Problem/Attribute:status' => 'Stato',
+	'Class:Problem/Attribute:status+' => '',
+	'Class:Problem/Attribute:status/Value:new' => 'Nuovo',
+	'Class:Problem/Attribute:status/Value:new+' => '',
+	'Class:Problem/Attribute:status/Value:assigned' => 'Assegnato',
+	'Class:Problem/Attribute:status/Value:assigned+' => '',
+	'Class:Problem/Attribute:status/Value:resolved' => 'Risolto',
+	'Class:Problem/Attribute:status/Value:resolved+' => '',
+	'Class:Problem/Attribute:status/Value:closed' => 'Chiuso',
+	'Class:Problem/Attribute:status/Value:closed+' => '',
+	'Class:Problem/Attribute:org_id' => 'Cliente',
+	'Class:Problem/Attribute:org_id+' => '',
+	'Class:Problem/Attribute:service_id' => 'Servizio',
+	'Class:Problem/Attribute:service_id+' => '',
+	'Class:Problem/Attribute:servicesubcategory_id' => 'Categoria di servizio',
+	'Class:Problem/Attribute:servicesubcategory_id+' => '',
+	'Class:Problem/Attribute:product' => 'Prodotto',
+	'Class:Problem/Attribute:product+' => '',
+	'Class:Problem/Attribute:impact' => 'Impatto',
+	'Class:Problem/Attribute:impact+' => '',
+	'Class:Problem/Attribute:impact/Value:1' => 'Una persona',
+	'Class:Problem/Attribute:impact/Value:1+' => '',
+	'Class:Problem/Attribute:impact/Value:2' => 'Un servizio',
+	'Class:Problem/Attribute:impact/Value:2+' => '',
+	'Class:Problem/Attribute:impact/Value:3' => 'Un dipartimento',
+	'Class:Problem/Attribute:impact/Value:3+' => '',
+	'Class:Problem/Attribute:urgency' => 'Urgenza',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'Bassa',
+	'Class:Problem/Attribute:urgency/Value:1+' => 'Bassa',
+	'Class:Problem/Attribute:urgency/Value:2' => 'Media',
+	'Class:Problem/Attribute:urgency/Value:2+' => 'Media',
+	'Class:Problem/Attribute:urgency/Value:3' => 'Alta',
+	'Class:Problem/Attribute:urgency/Value:3+' => 'Alta',
+	'Class:Problem/Attribute:priority' => 'Priorità',
+	'Class:Problem/Attribute:priority+' => '',
+	'Class:Problem/Attribute:priority/Value:1' => 'Bassa',
+	'Class:Problem/Attribute:priority/Value:1+' => '',
+	'Class:Problem/Attribute:priority/Value:2' => 'Media',
+	'Class:Problem/Attribute:priority/Value:2+' => '',
+	'Class:Problem/Attribute:priority/Value:3' => 'Alta',
+	'Class:Problem/Attribute:priority/Value:3+' => '',
+	'Class:Problem/Attribute:workgroup_id' => 'Gruppo di lavoro',
+	'Class:Problem/Attribute:workgroup_id+' => '',
+	'Class:Problem/Attribute:agent_id' => 'Agente',
+	'Class:Problem/Attribute:agent_id+' => '',
+	'Class:Problem/Attribute:related_change_id' => 'Cambi Correlati',
+	'Class:Problem/Attribute:related_change_id+' => '',
+	'Class:Problem/Attribute:close_date' => 'Data di Chiusura',
+	'Class:Problem/Attribute:close_date+' => '',
+	'Class:Problem/Attribute:last_update' => 'Ultimo Aggiornamento',
+	'Class:Problem/Attribute:last_update+' => '',
+	'Class:Problem/Attribute:assignment_date' => 'Data di asseganzione',
+	'Class:Problem/Attribute:assignment_date+' => '',
+	'Class:Problem/Attribute:resolution_date' => 'Data di risoluzione',
+	'Class:Problem/Attribute:resolution_date+' => '',
+	'Class:Problem/Attribute:knownerrors_list' => 'Errori Conosciuti',
+	'Class:Problem/Attribute:knownerrors_list+' => '',
+	'Class:Problem/Stimulus:ev_assign' => 'Assegnare',
+	'Class:Problem/Stimulus:ev_assign+' => '',
+	'Class:Problem/Stimulus:ev_reassign' => 'Riassegnare',
+	'Class:Problem/Stimulus:ev_reassign+' => '',
+	'Class:Problem/Stimulus:ev_resolve' => 'Risolvere',
+	'Class:Problem/Stimulus:ev_resolve+' => '',
+	'Class:Problem/Stimulus:ev_close' => 'Chiudere',
+	'Class:Problem/Stimulus:ev_close+' => '',
+	'Menu:ProblemManagement' => 'Gestione dei Problemi',
+	'Menu:ProblemManagement+' => 'Gestione dei Problemi',
+	'Menu:Problem:Overview' => 'Panoramica',
+	'Menu:Problem:Overview+' => 'Panoramica',
+	'Menu:NewProblem' => 'Nuovo Problema',
+	'Menu:NewProblem+' => 'Nuovo Problema',
+	'Menu:SearchProblems' => 'Ricerca per Problema',
+	'Menu:SearchProblems+' => 'Ricerca per Problema',
+	'Menu:Problem:Shortcuts' => 'Scorciatoia',
+	'Menu:Problem:MyProblems' => 'I Miei Problemi',
+	'Menu:Problem:MyProblems+' => 'I Miei Problemi',
+	'Menu:Problem:OpenProblems' => 'Tutti i Problemi Aperti',
+	'Menu:Problem:OpenProblems+' => 'Tutti i Problemi Aperti',
+	'UI-ProblemManagementOverview-ProblemByService' => 'Problemi per Servizio',
+	'UI-ProblemManagementOverview-ProblemByService+' => 'Problemi per Servizio',
+	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problemi per Priorità',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problemi per Priorità',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Problemi non assegnati',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Problemi non assegnati',
+	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard per la gestione dei problemi',
+	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard per la gestione dei problemi',
+	'Class:Problem/Attribute:org_name' => 'Nome',
+	'Class:Problem/Attribute:org_name+' => 'Nome Comune',
+	'Class:Problem/Attribute:service_name' => 'Nome',
+	'Class:Problem/Attribute:service_name+' => '',
+	'Class:Problem/Attribute:servicesubcategory_name' => 'Nome',
+	'Class:Problem/Attribute:servicesubcategory_name+' => '',
+	'Class:Problem/Attribute:workgroup_name' => 'Nome',
+	'Class:Problem/Attribute:workgroup_name+' => '',
+	'Class:Problem/Attribute:agent_name' => 'Nome dell\Agente',
+	'Class:Problem/Attribute:agent_name+' => '',
+	'Class:Problem/Attribute:agent_email' => 'Email dell\'Agente',
+	'Class:Problem/Attribute:agent_email+' => '',
+	'Class:Problem/Attribute:related_change_ref' => 'Ref',
+	'Class:Problem/Attribute:related_change_ref+' => '',
+	'Class:Problem/Attribute:urgency/Value:4' => 'low~~',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
+	'Class:Problem/Attribute:priority/Value:4' => 'Low~~',
+	'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
+	'Class:Problem/Attribute:related_request_list' => 'Related requests~~',
+	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem~~',
+	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
+));
+?>
diff --git a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
index 0b054f33d..72802d144 100755
--- a/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
@@ -1,44 +1,44 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-problem-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Problem Management',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.0.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-problem-mgmt.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-problem-mgmt.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-problem-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-problem-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Problem Management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-tickets/2.0.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-problem-mgmt.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-problem-mgmt.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-problem-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php
index cc2c7424c..c48c624da 100644
--- a/datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/nl.dict.itop-problem-mgmt.php
@@ -1,170 +1,170 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:ProblemManagement' => 'Probleem Management',
-	'Menu:ProblemManagement+' => 'Probleem Management',
-	'Menu:Problem:Shortcuts' => 'Snelkoppelingen',
-	'Menu:NewError' => 'Nieuwe bekende fout',
-	'Menu:NewError+' => 'Creatie van een nieuwe bekende fout',
-	'Menu:SearchError' => 'Zoek naar bekende fouten',
-	'Menu:SearchError+' => 'Zoek naar bekende fouten',
-	'Menu:Problem:KnownErrors' => 'Alle bekende fouten',
-	'Menu:Problem:KnownErrors+' => 'Alle bekende fouten',
-	'Menu:FAQCategory' => 'FAQ categorieen',
-	'Menu:FAQCategory+' => 'Alle FAQ categorieen',
-	'Menu:FAQ' => 'FAQs',
-	'Menu:FAQ+' => 'Alle FAQs',
-	'Menu:Problem:Overview' => 'Overzicht',
-	'Menu:Problem:Overview+' => 'Overzicht',
-	'Menu:NewProblem' => 'Nieuw probleem',
-	'Menu:NewProblem+' => 'Nieuw probleem',
-	'Menu:SearchProblems' => 'Zoek naar problemen',
-	'Menu:SearchProblems+' => 'Zoek naar problemen',
-	'Menu:Problem:MyProblems' => 'Mijn problemen',
-	'Menu:Problem:MyProblems+' => 'Mijn problemen',
-	'Menu:Problem:OpenProblems' => 'Alle open problemen',
-	'Menu:Problem:OpenProblems+' => 'Alle open problemen',
-	'UI-ProblemManagementOverview-ProblemByService' => 'Problemen per dienst',
-	'UI-ProblemManagementOverview-ProblemByService+' => 'Problemen per dienst',
-	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problemen per prioriteit',
-	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problemen per prioriteit',
-	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Niet toegewezen problemen',
-	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Niet toegewezen problemen',
-	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard voor Probleem Management',
-	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard voor Probleem Management',
-
-));
-//
-// Class: Problem
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Problem' => 'Probleem',
-	'Class:Problem+' => '',
-	'Class:Problem/Attribute:status' => 'Status',
-	'Class:Problem/Attribute:status+' => '',
-	'Class:Problem/Attribute:status/Value:new' => 'Nieuw',
-	'Class:Problem/Attribute:status/Value:new+' => '',
-	'Class:Problem/Attribute:status/Value:assigned' => 'Toegewezen',
-	'Class:Problem/Attribute:status/Value:assigned+' => '',
-	'Class:Problem/Attribute:status/Value:resolved' => 'Opgelost',
-	'Class:Problem/Attribute:status/Value:resolved+' => '',
-	'Class:Problem/Attribute:status/Value:closed' => 'Gesloten',
-	'Class:Problem/Attribute:status/Value:closed+' => '',
-	'Class:Problem/Attribute:service_id' => 'Dienst',
-	'Class:Problem/Attribute:service_id+' => '',
-	'Class:Problem/Attribute:service_name' => 'Dienst naam',
-	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => 'Dienst subcategorie',
-	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => 'Dienst subcategorie',
-	'Class:Problem/Attribute:servicesubcategory_name+' => '',
-	'Class:Problem/Attribute:product' => 'Product',
-	'Class:Problem/Attribute:product+' => '',
-	'Class:Problem/Attribute:impact' => 'Impact',
-	'Class:Problem/Attribute:impact+' => '',
-	'Class:Problem/Attribute:impact/Value:1' => 'Een afdeling',
-	'Class:Problem/Attribute:impact/Value:1+' => '',
-	'Class:Problem/Attribute:impact/Value:2' => 'Een dienst',
-	'Class:Problem/Attribute:impact/Value:2+' => '',
-	'Class:Problem/Attribute:impact/Value:3' => 'Een persoon',
-	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:urgency' => 'Urgentie',
-	'Class:Problem/Attribute:urgency+' => '',
-	'Class:Problem/Attribute:urgency/Value:1' => 'kritiek',
-	'Class:Problem/Attribute:urgency/Value:1+' => 'kritiek',
-	'Class:Problem/Attribute:urgency/Value:2' => 'hoog',
-	'Class:Problem/Attribute:urgency/Value:2+' => 'hoog',
-	'Class:Problem/Attribute:urgency/Value:3' => 'normaal',
-	'Class:Problem/Attribute:urgency/Value:3+' => 'normaal',
-	'Class:Problem/Attribute:urgency/Value:4' => 'laag',
-	'Class:Problem/Attribute:urgency/Value:4+' => 'laag',
-	'Class:Problem/Attribute:priority' => 'Prioriteit',
-	'Class:Problem/Attribute:priority+' => '',
-	'Class:Problem/Attribute:priority/Value:1' => 'Kritisch',
-	'Class:Problem/Attribute:priority/Value:1+' => 'Kritisch',
-	'Class:Problem/Attribute:priority/Value:2' => 'Hoog',
-	'Class:Problem/Attribute:priority/Value:2+' => 'Hoog',
-	'Class:Problem/Attribute:priority/Value:3' => 'Normaal',
-	'Class:Problem/Attribute:priority/Value:3+' => 'Normaal',
-	'Class:Problem/Attribute:priority/Value:4' => 'Laag',
-	'Class:Problem/Attribute:priority/Value:4+' => 'Laag',
-	'Class:Problem/Attribute:related_change_id' => 'Gerelateerde Change',
-	'Class:Problem/Attribute:related_change_id+' => '',
-	'Class:Problem/Attribute:related_change_ref' => 'Gerelateerde Change ref',
-	'Class:Problem/Attribute:related_change_ref+' => '',
-	'Class:Problem/Attribute:assignment_date' => 'Toegewezen Datum',
-	'Class:Problem/Attribute:assignment_date+' => '',
-	'Class:Problem/Attribute:resolution_date' => 'Resolutie Datum',
-	'Class:Problem/Attribute:resolution_date+' => '',
-	'Class:Problem/Attribute:knownerrors_list' => 'Bekende fouten',
-	'Class:Problem/Attribute:knownerrors_list+' => 'Alle bekende fouten die gelinkt zijn aan dit probleem',
-	'Class:Problem/Attribute:related_request_list' => 'Gerelateerde verzoeken',
-	'Class:Problem/Attribute:related_request_list+' => 'Alle verzoeken die gerelateerd zijn aan dit probleem',
-	'Class:Problem/Stimulus:ev_assign' => 'Wijs toe',
-	'Class:Problem/Stimulus:ev_assign+' => '',
-	'Class:Problem/Stimulus:ev_reassign' => 'Wijs opnieuw toe',
-	'Class:Problem/Stimulus:ev_reassign+' => '',
-	'Class:Problem/Stimulus:ev_resolve' => 'Los het op',
-	'Class:Problem/Stimulus:ev_resolve+' => '',
-	'Class:Problem/Stimulus:ev_close' => 'Sluit',
-	'Class:Problem/Stimulus:ev_close+' => '',
-	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:ProblemManagement' => 'Probleem Management',
+	'Menu:ProblemManagement+' => 'Probleem Management',
+	'Menu:Problem:Shortcuts' => 'Snelkoppelingen',
+	'Menu:NewError' => 'Nieuwe bekende fout',
+	'Menu:NewError+' => 'Creatie van een nieuwe bekende fout',
+	'Menu:SearchError' => 'Zoek naar bekende fouten',
+	'Menu:SearchError+' => 'Zoek naar bekende fouten',
+	'Menu:Problem:KnownErrors' => 'Alle bekende fouten',
+	'Menu:Problem:KnownErrors+' => 'Alle bekende fouten',
+	'Menu:FAQCategory' => 'FAQ categorieen',
+	'Menu:FAQCategory+' => 'Alle FAQ categorieen',
+	'Menu:FAQ' => 'FAQs',
+	'Menu:FAQ+' => 'Alle FAQs',
+	'Menu:Problem:Overview' => 'Overzicht',
+	'Menu:Problem:Overview+' => 'Overzicht',
+	'Menu:NewProblem' => 'Nieuw probleem',
+	'Menu:NewProblem+' => 'Nieuw probleem',
+	'Menu:SearchProblems' => 'Zoek naar problemen',
+	'Menu:SearchProblems+' => 'Zoek naar problemen',
+	'Menu:Problem:MyProblems' => 'Mijn problemen',
+	'Menu:Problem:MyProblems+' => 'Mijn problemen',
+	'Menu:Problem:OpenProblems' => 'Alle open problemen',
+	'Menu:Problem:OpenProblems+' => 'Alle open problemen',
+	'UI-ProblemManagementOverview-ProblemByService' => 'Problemen per dienst',
+	'UI-ProblemManagementOverview-ProblemByService+' => 'Problemen per dienst',
+	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problemen per prioriteit',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problemen per prioriteit',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Niet toegewezen problemen',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Niet toegewezen problemen',
+	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard voor Probleem Management',
+	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard voor Probleem Management',
+
+));
+//
+// Class: Problem
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Problem' => 'Probleem',
+	'Class:Problem+' => '',
+	'Class:Problem/Attribute:status' => 'Status',
+	'Class:Problem/Attribute:status+' => '',
+	'Class:Problem/Attribute:status/Value:new' => 'Nieuw',
+	'Class:Problem/Attribute:status/Value:new+' => '',
+	'Class:Problem/Attribute:status/Value:assigned' => 'Toegewezen',
+	'Class:Problem/Attribute:status/Value:assigned+' => '',
+	'Class:Problem/Attribute:status/Value:resolved' => 'Opgelost',
+	'Class:Problem/Attribute:status/Value:resolved+' => '',
+	'Class:Problem/Attribute:status/Value:closed' => 'Gesloten',
+	'Class:Problem/Attribute:status/Value:closed+' => '',
+	'Class:Problem/Attribute:service_id' => 'Dienst',
+	'Class:Problem/Attribute:service_id+' => '',
+	'Class:Problem/Attribute:service_name' => 'Dienst naam',
+	'Class:Problem/Attribute:service_name+' => '',
+	'Class:Problem/Attribute:servicesubcategory_id' => 'Dienst subcategorie',
+	'Class:Problem/Attribute:servicesubcategory_id+' => '',
+	'Class:Problem/Attribute:servicesubcategory_name' => 'Dienst subcategorie',
+	'Class:Problem/Attribute:servicesubcategory_name+' => '',
+	'Class:Problem/Attribute:product' => 'Product',
+	'Class:Problem/Attribute:product+' => '',
+	'Class:Problem/Attribute:impact' => 'Impact',
+	'Class:Problem/Attribute:impact+' => '',
+	'Class:Problem/Attribute:impact/Value:1' => 'Een afdeling',
+	'Class:Problem/Attribute:impact/Value:1+' => '',
+	'Class:Problem/Attribute:impact/Value:2' => 'Een dienst',
+	'Class:Problem/Attribute:impact/Value:2+' => '',
+	'Class:Problem/Attribute:impact/Value:3' => 'Een persoon',
+	'Class:Problem/Attribute:impact/Value:3+' => '',
+	'Class:Problem/Attribute:urgency' => 'Urgentie',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'kritiek',
+	'Class:Problem/Attribute:urgency/Value:1+' => 'kritiek',
+	'Class:Problem/Attribute:urgency/Value:2' => 'hoog',
+	'Class:Problem/Attribute:urgency/Value:2+' => 'hoog',
+	'Class:Problem/Attribute:urgency/Value:3' => 'normaal',
+	'Class:Problem/Attribute:urgency/Value:3+' => 'normaal',
+	'Class:Problem/Attribute:urgency/Value:4' => 'laag',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'laag',
+	'Class:Problem/Attribute:priority' => 'Prioriteit',
+	'Class:Problem/Attribute:priority+' => '',
+	'Class:Problem/Attribute:priority/Value:1' => 'Kritisch',
+	'Class:Problem/Attribute:priority/Value:1+' => 'Kritisch',
+	'Class:Problem/Attribute:priority/Value:2' => 'Hoog',
+	'Class:Problem/Attribute:priority/Value:2+' => 'Hoog',
+	'Class:Problem/Attribute:priority/Value:3' => 'Normaal',
+	'Class:Problem/Attribute:priority/Value:3+' => 'Normaal',
+	'Class:Problem/Attribute:priority/Value:4' => 'Laag',
+	'Class:Problem/Attribute:priority/Value:4+' => 'Laag',
+	'Class:Problem/Attribute:related_change_id' => 'Gerelateerde Change',
+	'Class:Problem/Attribute:related_change_id+' => '',
+	'Class:Problem/Attribute:related_change_ref' => 'Gerelateerde Change ref',
+	'Class:Problem/Attribute:related_change_ref+' => '',
+	'Class:Problem/Attribute:assignment_date' => 'Toegewezen Datum',
+	'Class:Problem/Attribute:assignment_date+' => '',
+	'Class:Problem/Attribute:resolution_date' => 'Resolutie Datum',
+	'Class:Problem/Attribute:resolution_date+' => '',
+	'Class:Problem/Attribute:knownerrors_list' => 'Bekende fouten',
+	'Class:Problem/Attribute:knownerrors_list+' => 'Alle bekende fouten die gelinkt zijn aan dit probleem',
+	'Class:Problem/Attribute:related_request_list' => 'Gerelateerde verzoeken',
+	'Class:Problem/Attribute:related_request_list+' => 'Alle verzoeken die gerelateerd zijn aan dit probleem',
+	'Class:Problem/Stimulus:ev_assign' => 'Wijs toe',
+	'Class:Problem/Stimulus:ev_assign+' => '',
+	'Class:Problem/Stimulus:ev_reassign' => 'Wijs opnieuw toe',
+	'Class:Problem/Stimulus:ev_reassign+' => '',
+	'Class:Problem/Stimulus:ev_resolve' => 'Los het op',
+	'Class:Problem/Stimulus:ev_resolve+' => '',
+	'Class:Problem/Stimulus:ev_close' => 'Sluit',
+	'Class:Problem/Stimulus:ev_close+' => '',
+	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-problem-mgmt/pt_br.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/pt_br.dict.itop-problem-mgmt.php
index e199a0fed..2eb824555 100755
--- a/datamodels/2.x/itop-problem-mgmt/pt_br.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/pt_br.dict.itop-problem-mgmt.php
@@ -1,158 +1,158 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-        'Menu:ProblemManagement' => 'Gerenciamento Problemas',
-        'Menu:ProblemManagement+' => 'Gerenciamento Problemas',
-    	'Menu:Problem:Overview' => 'Visão geral',
-    	'Menu:Problem:Overview+' => 'Visão geral',
-    	'Menu:NewProblem' => 'Novo problema',
-    	'Menu:NewProblem+' => 'Novo problema',
-    	'Menu:SearchProblems' => 'Pesquisar por problemas',
-    	'Menu:SearchProblems+' => 'Pesquisar por problemas',
-    	'Menu:Problem:Shortcuts' => 'Atalho',
-        'Menu:Problem:MyProblems' => 'Meus problemas',
-        'Menu:Problem:MyProblems+' => 'Meus problemas',
-        'Menu:Problem:OpenProblems' => 'Todos problemas abertos',
-        'Menu:Problem:OpenProblems+' => 'Todos problemas abertos',
-	'UI-ProblemManagementOverview-ProblemByService' => 'Problemas por serviço',
-	'UI-ProblemManagementOverview-ProblemByService+' => 'Problemas por serviço',
-	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problemas por prioridade',
-	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problemas por prioridade',
-	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Problemas não atribuídos',
-	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Problemas não atribuídos',
-	'UI:ProblemMgmtMenuOverview:Title' => 'Painel para Gerenciamento Problemas',
-	'UI:ProblemMgmtMenuOverview:Title+' => 'Painel para Gerenciamento Problemas',
-
-));
-//
-// Class: Problem
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Problem' => 'Problema',
-	'Class:Problem+' => '',
-	'Class:Problem/Attribute:status' => 'Estado',
-	'Class:Problem/Attribute:status+' => '',
-	'Class:Problem/Attribute:status/Value:new' => 'Novo',
-	'Class:Problem/Attribute:status/Value:new+' => '',
-	'Class:Problem/Attribute:status/Value:assigned' => 'Atribuído',
-	'Class:Problem/Attribute:status/Value:assigned+' => '',
-	'Class:Problem/Attribute:status/Value:resolved' => 'Resolvido',
-	'Class:Problem/Attribute:status/Value:resolved+' => '',
-	'Class:Problem/Attribute:status/Value:closed' => 'Fechado',
-	'Class:Problem/Attribute:status/Value:closed+' => '',
-	'Class:Problem/Attribute:service_id' => 'Serviço',
-	'Class:Problem/Attribute:service_id+' => '',
-	'Class:Problem/Attribute:service_name' => 'Nome serviço',
-	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
-	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => 'Sub-categoria serviço',
-	'Class:Problem/Attribute:servicesubcategory_name+' => '',
-	'Class:Problem/Attribute:product' => 'Produto',
-	'Class:Problem/Attribute:product+' => '',
-	'Class:Problem/Attribute:impact' => 'Impacto',
-	'Class:Problem/Attribute:impact+' => '',
-	'Class:Problem/Attribute:impact/Value:1' => 'Um departamento',
-	'Class:Problem/Attribute:impact/Value:1+' => '',
-	'Class:Problem/Attribute:impact/Value:2' => 'Um serviço',
-	'Class:Problem/Attribute:impact/Value:2+' => '',
-	'Class:Problem/Attribute:impact/Value:3' => 'Uma pessoa',
-	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:urgency' => 'Urgência',
-	'Class:Problem/Attribute:urgency+' => '',
-	'Class:Problem/Attribute:urgency/Value:1' => 'Crítica',
-	'Class:Problem/Attribute:urgency/Value:1+' => 'Crítica',
-	'Class:Problem/Attribute:urgency/Value:2' => 'Alta',
-	'Class:Problem/Attribute:urgency/Value:2+' => 'Alta',
-	'Class:Problem/Attribute:urgency/Value:3' => 'Média',
-	'Class:Problem/Attribute:urgency/Value:3+' => 'Média',
-	'Class:Problem/Attribute:urgency/Value:4' => 'Baixa',
-	'Class:Problem/Attribute:urgency/Value:4+' => 'Baixa',
-	'Class:Problem/Attribute:priority' => 'Prioridade',
-	'Class:Problem/Attribute:priority+' => '',
-	'Class:Problem/Attribute:priority/Value:1' => 'Crítica',
-	'Class:Problem/Attribute:priority/Value:1+' => 'Crítica',
-	'Class:Problem/Attribute:priority/Value:2' => 'Alta',
-	'Class:Problem/Attribute:priority/Value:2+' => 'Alta',
-	'Class:Problem/Attribute:priority/Value:3' => 'Média',
-	'Class:Problem/Attribute:priority/Value:3+' => 'Média',
-	'Class:Problem/Attribute:priority/Value:4' => 'Baixa',
-	'Class:Problem/Attribute:priority/Value:4+' => 'Baixa',
-	'Class:Problem/Attribute:related_change_id' => 'Mudança vinculada',
-	'Class:Problem/Attribute:related_change_id+' => '',
-	'Class:Problem/Attribute:related_change_ref' => 'Ref mudança vinculada',
-	'Class:Problem/Attribute:related_change_ref+' => '',
-	'Class:Problem/Attribute:assignment_date' => 'Data atribuição',
-	'Class:Problem/Attribute:assignment_date+' => '',
-	'Class:Problem/Attribute:resolution_date' => 'Data resolução',
-	'Class:Problem/Attribute:resolution_date+' => '',
-	'Class:Problem/Attribute:knownerrors_list' => 'Erros conhecidos',
-	'Class:Problem/Attribute:knownerrors_list+' => 'Todos os erros conhecidos vinculados a esse problema',
-	'Class:Problem/Attribute:related_request_list' => 'Solicitações vinculadas',
-	'Class:Problem/Attribute:related_request_list+' => 'Todas as solicitações vinculadas com esse problema',
-	'Class:Problem/Stimulus:ev_assign' => 'Atribuir',
-	'Class:Problem/Stimulus:ev_assign+' => '',
-	'Class:Problem/Stimulus:ev_reassign' => 'Re-atribuir',
-	'Class:Problem/Stimulus:ev_reassign+' => '',
-	'Class:Problem/Stimulus:ev_resolve' => 'Resolver',
-	'Class:Problem/Stimulus:ev_resolve+' => '',
-	'Class:Problem/Stimulus:ev_close' => 'Fechar',
-	'Class:Problem/Stimulus:ev_close+' => '',
-	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+        'Menu:ProblemManagement' => 'Gerenciamento Problemas',
+        'Menu:ProblemManagement+' => 'Gerenciamento Problemas',
+    	'Menu:Problem:Overview' => 'Visão geral',
+    	'Menu:Problem:Overview+' => 'Visão geral',
+    	'Menu:NewProblem' => 'Novo problema',
+    	'Menu:NewProblem+' => 'Novo problema',
+    	'Menu:SearchProblems' => 'Pesquisar por problemas',
+    	'Menu:SearchProblems+' => 'Pesquisar por problemas',
+    	'Menu:Problem:Shortcuts' => 'Atalho',
+        'Menu:Problem:MyProblems' => 'Meus problemas',
+        'Menu:Problem:MyProblems+' => 'Meus problemas',
+        'Menu:Problem:OpenProblems' => 'Todos problemas abertos',
+        'Menu:Problem:OpenProblems+' => 'Todos problemas abertos',
+	'UI-ProblemManagementOverview-ProblemByService' => 'Problemas por serviço',
+	'UI-ProblemManagementOverview-ProblemByService+' => 'Problemas por serviço',
+	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problemas por prioridade',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problemas por prioridade',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Problemas não atribuídos',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Problemas não atribuídos',
+	'UI:ProblemMgmtMenuOverview:Title' => 'Painel para Gerenciamento Problemas',
+	'UI:ProblemMgmtMenuOverview:Title+' => 'Painel para Gerenciamento Problemas',
+
+));
+//
+// Class: Problem
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Problem' => 'Problema',
+	'Class:Problem+' => '',
+	'Class:Problem/Attribute:status' => 'Estado',
+	'Class:Problem/Attribute:status+' => '',
+	'Class:Problem/Attribute:status/Value:new' => 'Novo',
+	'Class:Problem/Attribute:status/Value:new+' => '',
+	'Class:Problem/Attribute:status/Value:assigned' => 'Atribuído',
+	'Class:Problem/Attribute:status/Value:assigned+' => '',
+	'Class:Problem/Attribute:status/Value:resolved' => 'Resolvido',
+	'Class:Problem/Attribute:status/Value:resolved+' => '',
+	'Class:Problem/Attribute:status/Value:closed' => 'Fechado',
+	'Class:Problem/Attribute:status/Value:closed+' => '',
+	'Class:Problem/Attribute:service_id' => 'Serviço',
+	'Class:Problem/Attribute:service_id+' => '',
+	'Class:Problem/Attribute:service_name' => 'Nome serviço',
+	'Class:Problem/Attribute:service_name+' => '',
+	'Class:Problem/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
+	'Class:Problem/Attribute:servicesubcategory_id+' => '',
+	'Class:Problem/Attribute:servicesubcategory_name' => 'Sub-categoria serviço',
+	'Class:Problem/Attribute:servicesubcategory_name+' => '',
+	'Class:Problem/Attribute:product' => 'Produto',
+	'Class:Problem/Attribute:product+' => '',
+	'Class:Problem/Attribute:impact' => 'Impacto',
+	'Class:Problem/Attribute:impact+' => '',
+	'Class:Problem/Attribute:impact/Value:1' => 'Um departamento',
+	'Class:Problem/Attribute:impact/Value:1+' => '',
+	'Class:Problem/Attribute:impact/Value:2' => 'Um serviço',
+	'Class:Problem/Attribute:impact/Value:2+' => '',
+	'Class:Problem/Attribute:impact/Value:3' => 'Uma pessoa',
+	'Class:Problem/Attribute:impact/Value:3+' => '',
+	'Class:Problem/Attribute:urgency' => 'Urgência',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => 'Crítica',
+	'Class:Problem/Attribute:urgency/Value:1+' => 'Crítica',
+	'Class:Problem/Attribute:urgency/Value:2' => 'Alta',
+	'Class:Problem/Attribute:urgency/Value:2+' => 'Alta',
+	'Class:Problem/Attribute:urgency/Value:3' => 'Média',
+	'Class:Problem/Attribute:urgency/Value:3+' => 'Média',
+	'Class:Problem/Attribute:urgency/Value:4' => 'Baixa',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'Baixa',
+	'Class:Problem/Attribute:priority' => 'Prioridade',
+	'Class:Problem/Attribute:priority+' => '',
+	'Class:Problem/Attribute:priority/Value:1' => 'Crítica',
+	'Class:Problem/Attribute:priority/Value:1+' => 'Crítica',
+	'Class:Problem/Attribute:priority/Value:2' => 'Alta',
+	'Class:Problem/Attribute:priority/Value:2+' => 'Alta',
+	'Class:Problem/Attribute:priority/Value:3' => 'Média',
+	'Class:Problem/Attribute:priority/Value:3+' => 'Média',
+	'Class:Problem/Attribute:priority/Value:4' => 'Baixa',
+	'Class:Problem/Attribute:priority/Value:4+' => 'Baixa',
+	'Class:Problem/Attribute:related_change_id' => 'Mudança vinculada',
+	'Class:Problem/Attribute:related_change_id+' => '',
+	'Class:Problem/Attribute:related_change_ref' => 'Ref mudança vinculada',
+	'Class:Problem/Attribute:related_change_ref+' => '',
+	'Class:Problem/Attribute:assignment_date' => 'Data atribuição',
+	'Class:Problem/Attribute:assignment_date+' => '',
+	'Class:Problem/Attribute:resolution_date' => 'Data resolução',
+	'Class:Problem/Attribute:resolution_date+' => '',
+	'Class:Problem/Attribute:knownerrors_list' => 'Erros conhecidos',
+	'Class:Problem/Attribute:knownerrors_list+' => 'Todos os erros conhecidos vinculados a esse problema',
+	'Class:Problem/Attribute:related_request_list' => 'Solicitações vinculadas',
+	'Class:Problem/Attribute:related_request_list+' => 'Todas as solicitações vinculadas com esse problema',
+	'Class:Problem/Stimulus:ev_assign' => 'Atribuir',
+	'Class:Problem/Stimulus:ev_assign+' => '',
+	'Class:Problem/Stimulus:ev_reassign' => 'Re-atribuir',
+	'Class:Problem/Stimulus:ev_reassign+' => '',
+	'Class:Problem/Stimulus:ev_resolve' => 'Resolver',
+	'Class:Problem/Stimulus:ev_resolve+' => '',
+	'Class:Problem/Stimulus:ev_close' => 'Fechar',
+	'Class:Problem/Stimulus:ev_close+' => '',
+	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php b/datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
index 606c169d8..98b36dc1c 100755
--- a/datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
@@ -1,177 +1,177 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'bizmodel'
-//////////////////////////////////////////////////////////////////////
-//
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-        'Menu:ProblemManagement' => '问题管理',
-        'Menu:ProblemManagement+' => '问题管理',
-    	'Menu:Problem:Overview' => '概览',
-    	'Menu:Problem:Overview+' => '概览',
-    	'Menu:NewProblem' => '新问题',
-    	'Menu:NewProblem+' => '新问题',
-    	'Menu:SearchProblems' => '搜索问题',
-    	'Menu:SearchProblems+' => '搜索问题',
-    	'Menu:Problem:Shortcuts' => '快捷方式',
-        'Menu:Problem:MyProblems' => '我的问题',
-        'Menu:Problem:MyProblems+' => '我的问题',
-        'Menu:Problem:OpenProblems' => '所有待解决的问题',
-        'Menu:Problem:OpenProblems+' => '所有待解决的问题',
-	'UI-ProblemManagementOverview-ProblemByService' => '按服务划分的问题',
-	'UI-ProblemManagementOverview-ProblemByService+' => '按服务划分的问题',
-	'UI-ProblemManagementOverview-ProblemByPriority' => '按优先级划分的问题',
-	'UI-ProblemManagementOverview-ProblemByPriority+' => '按优先级划分的问题',
-	'UI-ProblemManagementOverview-ProblemUnassigned' => '未指派的问题',
-	'UI-ProblemManagementOverview-ProblemUnassigned+' => '未指派的问题',
-	'UI:ProblemMgmtMenuOverview:Title' => '问题管理仪表板',
-	'UI:ProblemMgmtMenuOverview:Title+' => '问题管理仪表板',
-
-));
-//
-// Class: Problem
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Problem' => '问题',
-	'Class:Problem+' => '',
-	'Class:Problem/Attribute:status' => '状态',
-	'Class:Problem/Attribute:status+' => '',
-	'Class:Problem/Attribute:status/Value:new' => '新',
-	'Class:Problem/Attribute:status/Value:new+' => '',
-	'Class:Problem/Attribute:status/Value:assigned' => '已指派',
-	'Class:Problem/Attribute:status/Value:assigned+' => '',
-	'Class:Problem/Attribute:status/Value:resolved' => '已解决',
-	'Class:Problem/Attribute:status/Value:resolved+' => '',
-	'Class:Problem/Attribute:status/Value:closed' => '已关闭',
-	'Class:Problem/Attribute:status/Value:closed+' => '',
-	'Class:Problem/Attribute:org_id' => '客户',
-	'Class:Problem/Attribute:org_id+' => '',
-	'Class:Problem/Attribute:org_name' => '名称',
-	'Class:Problem/Attribute:org_name+' => '常用名称',
-	'Class:Problem/Attribute:service_id' => '服务',
-	'Class:Problem/Attribute:service_id+' => '',
-	'Class:Problem/Attribute:service_name' => '名称',
-	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => '服务类目',
-	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => '名称',
-	'Class:Problem/Attribute:servicesubcategory_name+' => '',
-	'Class:Problem/Attribute:product' => '生产',
-	'Class:Problem/Attribute:product+' => '',
-	'Class:Problem/Attribute:impact' => '影响',
-	'Class:Problem/Attribute:impact+' => '',
-	'Class:Problem/Attribute:impact/Value:1' => '个人',
-	'Class:Problem/Attribute:impact/Value:1+' => '',
-	'Class:Problem/Attribute:impact/Value:2' => '服务',
-	'Class:Problem/Attribute:impact/Value:2+' => '',
-	'Class:Problem/Attribute:impact/Value:3' => '部门',
-	'Class:Problem/Attribute:impact/Value:3+' => '',
-	'Class:Problem/Attribute:urgency' => '紧急',
-	'Class:Problem/Attribute:urgency+' => '',
-	'Class:Problem/Attribute:urgency/Value:1' => '低',
-	'Class:Problem/Attribute:urgency/Value:1+' => '低',
-	'Class:Problem/Attribute:urgency/Value:2' => '中',
-	'Class:Problem/Attribute:urgency/Value:2+' => '中',
-	'Class:Problem/Attribute:urgency/Value:3' => '高',
-	'Class:Problem/Attribute:urgency/Value:3+' => '高',
-	'Class:Problem/Attribute:priority' => '优先级',
-	'Class:Problem/Attribute:priority+' => '',
-	'Class:Problem/Attribute:priority/Value:1' => '低',
-	'Class:Problem/Attribute:priority/Value:1+' => '',
-	'Class:Problem/Attribute:priority/Value:2' => '中',
-	'Class:Problem/Attribute:priority/Value:2+' => '',
-	'Class:Problem/Attribute:priority/Value:3' => '高',
-	'Class:Problem/Attribute:priority/Value:3+' => '',
-	'Class:Problem/Attribute:workgroup_id' => '工作组',
-	'Class:Problem/Attribute:workgroup_id+' => '',
-	'Class:Problem/Attribute:workgroup_name' => '名称',
-	'Class:Problem/Attribute:workgroup_name+' => '',
-	'Class:Problem/Attribute:agent_id' => '办理人',
-	'Class:Problem/Attribute:agent_id+' => '',
-	'Class:Problem/Attribute:agent_name' => '办理人名称',
-	'Class:Problem/Attribute:agent_name+' => '',
-	'Class:Problem/Attribute:agent_email' => '办理人 Email',
-	'Class:Problem/Attribute:agent_email+' => '',
-	'Class:Problem/Attribute:related_change_id' => '关联变更',
-	'Class:Problem/Attribute:related_change_id+' => '',
-	'Class:Problem/Attribute:related_change_ref' => '参考',
-	'Class:Problem/Attribute:related_change_ref+' => '',
-	'Class:Problem/Attribute:close_date' => '关闭日期',
-	'Class:Problem/Attribute:close_date+' => '',
-	'Class:Problem/Attribute:last_update' => '最后的更新',
-	'Class:Problem/Attribute:last_update+' => '',
-	'Class:Problem/Attribute:assignment_date' => '指派日期',
-	'Class:Problem/Attribute:assignment_date+' => '',
-	'Class:Problem/Attribute:resolution_date' => '解决日期',
-	'Class:Problem/Attribute:resolution_date+' => '',
-	'Class:Problem/Attribute:knownerrors_list' => '已知错误',
-	'Class:Problem/Attribute:knownerrors_list+' => '',
-	'Class:Problem/Stimulus:ev_assign' => '指派',
-	'Class:Problem/Stimulus:ev_assign+' => '',
-	'Class:Problem/Stimulus:ev_reassign' => '重新指派',
-	'Class:Problem/Stimulus:ev_reassign+' => '',
-	'Class:Problem/Stimulus:ev_resolve' => '解决',
-	'Class:Problem/Stimulus:ev_resolve+' => '',
-	'Class:Problem/Stimulus:ev_close' => '关闭',
-	'Class:Problem/Stimulus:ev_close+' => '',
-	'Class:Problem/Attribute:urgency/Value:4' => 'low~~',
-	'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
-	'Class:Problem/Attribute:priority/Value:4' => 'Low~~',
-	'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
-	'Class:Problem/Attribute:related_request_list' => 'Related requests~~',
-	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem~~',
-	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
-	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+        'Menu:ProblemManagement' => '问题管理',
+        'Menu:ProblemManagement+' => '问题管理',
+    	'Menu:Problem:Overview' => '概览',
+    	'Menu:Problem:Overview+' => '概览',
+    	'Menu:NewProblem' => '新问题',
+    	'Menu:NewProblem+' => '新问题',
+    	'Menu:SearchProblems' => '搜索问题',
+    	'Menu:SearchProblems+' => '搜索问题',
+    	'Menu:Problem:Shortcuts' => '快捷方式',
+        'Menu:Problem:MyProblems' => '我的问题',
+        'Menu:Problem:MyProblems+' => '我的问题',
+        'Menu:Problem:OpenProblems' => '所有待解决的问题',
+        'Menu:Problem:OpenProblems+' => '所有待解决的问题',
+	'UI-ProblemManagementOverview-ProblemByService' => '按服务划分的问题',
+	'UI-ProblemManagementOverview-ProblemByService+' => '按服务划分的问题',
+	'UI-ProblemManagementOverview-ProblemByPriority' => '按优先级划分的问题',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => '按优先级划分的问题',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => '未指派的问题',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => '未指派的问题',
+	'UI:ProblemMgmtMenuOverview:Title' => '问题管理仪表板',
+	'UI:ProblemMgmtMenuOverview:Title+' => '问题管理仪表板',
+
+));
+//
+// Class: Problem
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Problem' => '问题',
+	'Class:Problem+' => '',
+	'Class:Problem/Attribute:status' => '状态',
+	'Class:Problem/Attribute:status+' => '',
+	'Class:Problem/Attribute:status/Value:new' => '新',
+	'Class:Problem/Attribute:status/Value:new+' => '',
+	'Class:Problem/Attribute:status/Value:assigned' => '已指派',
+	'Class:Problem/Attribute:status/Value:assigned+' => '',
+	'Class:Problem/Attribute:status/Value:resolved' => '已解决',
+	'Class:Problem/Attribute:status/Value:resolved+' => '',
+	'Class:Problem/Attribute:status/Value:closed' => '已关闭',
+	'Class:Problem/Attribute:status/Value:closed+' => '',
+	'Class:Problem/Attribute:org_id' => '客户',
+	'Class:Problem/Attribute:org_id+' => '',
+	'Class:Problem/Attribute:org_name' => '名称',
+	'Class:Problem/Attribute:org_name+' => '常用名称',
+	'Class:Problem/Attribute:service_id' => '服务',
+	'Class:Problem/Attribute:service_id+' => '',
+	'Class:Problem/Attribute:service_name' => '名称',
+	'Class:Problem/Attribute:service_name+' => '',
+	'Class:Problem/Attribute:servicesubcategory_id' => '服务类目',
+	'Class:Problem/Attribute:servicesubcategory_id+' => '',
+	'Class:Problem/Attribute:servicesubcategory_name' => '名称',
+	'Class:Problem/Attribute:servicesubcategory_name+' => '',
+	'Class:Problem/Attribute:product' => '生产',
+	'Class:Problem/Attribute:product+' => '',
+	'Class:Problem/Attribute:impact' => '影响',
+	'Class:Problem/Attribute:impact+' => '',
+	'Class:Problem/Attribute:impact/Value:1' => '个人',
+	'Class:Problem/Attribute:impact/Value:1+' => '',
+	'Class:Problem/Attribute:impact/Value:2' => '服务',
+	'Class:Problem/Attribute:impact/Value:2+' => '',
+	'Class:Problem/Attribute:impact/Value:3' => '部门',
+	'Class:Problem/Attribute:impact/Value:3+' => '',
+	'Class:Problem/Attribute:urgency' => '紧急',
+	'Class:Problem/Attribute:urgency+' => '',
+	'Class:Problem/Attribute:urgency/Value:1' => '低',
+	'Class:Problem/Attribute:urgency/Value:1+' => '低',
+	'Class:Problem/Attribute:urgency/Value:2' => '中',
+	'Class:Problem/Attribute:urgency/Value:2+' => '中',
+	'Class:Problem/Attribute:urgency/Value:3' => '高',
+	'Class:Problem/Attribute:urgency/Value:3+' => '高',
+	'Class:Problem/Attribute:priority' => '优先级',
+	'Class:Problem/Attribute:priority+' => '',
+	'Class:Problem/Attribute:priority/Value:1' => '低',
+	'Class:Problem/Attribute:priority/Value:1+' => '',
+	'Class:Problem/Attribute:priority/Value:2' => '中',
+	'Class:Problem/Attribute:priority/Value:2+' => '',
+	'Class:Problem/Attribute:priority/Value:3' => '高',
+	'Class:Problem/Attribute:priority/Value:3+' => '',
+	'Class:Problem/Attribute:workgroup_id' => '工作组',
+	'Class:Problem/Attribute:workgroup_id+' => '',
+	'Class:Problem/Attribute:workgroup_name' => '名称',
+	'Class:Problem/Attribute:workgroup_name+' => '',
+	'Class:Problem/Attribute:agent_id' => '办理人',
+	'Class:Problem/Attribute:agent_id+' => '',
+	'Class:Problem/Attribute:agent_name' => '办理人名称',
+	'Class:Problem/Attribute:agent_name+' => '',
+	'Class:Problem/Attribute:agent_email' => '办理人 Email',
+	'Class:Problem/Attribute:agent_email+' => '',
+	'Class:Problem/Attribute:related_change_id' => '关联变更',
+	'Class:Problem/Attribute:related_change_id+' => '',
+	'Class:Problem/Attribute:related_change_ref' => '参考',
+	'Class:Problem/Attribute:related_change_ref+' => '',
+	'Class:Problem/Attribute:close_date' => '关闭日期',
+	'Class:Problem/Attribute:close_date+' => '',
+	'Class:Problem/Attribute:last_update' => '最后的更新',
+	'Class:Problem/Attribute:last_update+' => '',
+	'Class:Problem/Attribute:assignment_date' => '指派日期',
+	'Class:Problem/Attribute:assignment_date+' => '',
+	'Class:Problem/Attribute:resolution_date' => '解决日期',
+	'Class:Problem/Attribute:resolution_date+' => '',
+	'Class:Problem/Attribute:knownerrors_list' => '已知错误',
+	'Class:Problem/Attribute:knownerrors_list+' => '',
+	'Class:Problem/Stimulus:ev_assign' => '指派',
+	'Class:Problem/Stimulus:ev_assign+' => '',
+	'Class:Problem/Stimulus:ev_reassign' => '重新指派',
+	'Class:Problem/Stimulus:ev_reassign+' => '',
+	'Class:Problem/Stimulus:ev_resolve' => '解决',
+	'Class:Problem/Stimulus:ev_resolve+' => '',
+	'Class:Problem/Stimulus:ev_close' => '关闭',
+	'Class:Problem/Stimulus:ev_close+' => '',
+	'Class:Problem/Attribute:urgency/Value:4' => 'low~~',
+	'Class:Problem/Attribute:urgency/Value:4+' => 'low~~',
+	'Class:Problem/Attribute:priority/Value:4' => 'Low~~',
+	'Class:Problem/Attribute:priority/Value:4+' => 'Low~~',
+	'Class:Problem/Attribute:related_request_list' => 'Related requests~~',
+	'Class:Problem/Attribute:related_request_list+' => 'All the requests that are related to this problem~~',
+	'Class:Problem/Attribute:related_incident_list' => 'Related incidents~~',
+	'Class:Problem/Attribute:related_incident_list+' => 'All the incidents that are related to this problem~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
index 5fe724887..64acb22ef 100755
--- a/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
+++ b/datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
@@ -1,64 +1,64 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-profiles-itil/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Create standard ITIL profiles',
-		'category' => 'create_profiles',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => true,
-		'visible' => false,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-profiles-itil.php',
-		),
-		'webservice' => array(
-			//'webservices.itop-profiles-itil.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-profiles-itil.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-profiles-itil.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-			//'some_setting' => 'some value',
-		),
-	)
-);
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-profiles-itil/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Create standard ITIL profiles',
+		'category' => 'create_profiles',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => false,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-profiles-itil.php',
+		),
+		'webservice' => array(
+			//'webservices.itop-profiles-itil.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-profiles-itil.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-profiles-itil.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+			//'some_setting' => 'some value',
+		),
+	)
+);
+
+?>
diff --git a/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
index 738efcd5d..03349d95e 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/en.dict.itop-request-mgmt-itil.php
@@ -1,267 +1,267 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => 'Helpdesk',
-	'Menu:RequestManagementProvider' => 'Helpdesk provider',
-	'Menu:RequestManagementProvider+' => 'Helpdesk provider',
-	'Menu:UserRequest:Provider' => 'Open request transfered to provider',
-	'Menu:UserRequest:Provider+' => 'Open request transfered to provider',
-	'Menu:UserRequest:Overview' => 'Overview',
-	'Menu:UserRequest:Overview+' => 'Overview',
-	'Menu:NewUserRequest' => 'New user request',
-	'Menu:NewUserRequest+' => 'Create a new user request ticket',
-	'Menu:SearchUserRequests' => 'Search for user requests',
-	'Menu:SearchUserRequests+' => 'Search for user request tickets',
-	'Menu:UserRequest:Shortcuts' => 'Shortcuts',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Requests assigned to me',
-	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)',
-	'Menu:UserRequest:MySupportRequests' => "My support calls",
-	'Menu:UserRequest:MySupportRequests+' => "My support calls",
-	'Menu:UserRequest:EscalatedRequests' => 'Hot Requests',
-	'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests',
-	'Menu:UserRequest:OpenRequests' => 'All open requests',
-	'Menu:UserRequest:OpenRequests+' => 'All open requests',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Last 14 days request per type',
-	'UI-RequestManagementOverview-Last-14-days' => 'Last 14 days number of requests',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open requests by status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open requests by agent',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Open requests by type',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open requests by customer',
-	'Class:UserRequest:KnownErrorList' => 'Known Errors',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserRequest
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:UserRequest' => 'User Request',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Status',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'New',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Escalated TTO',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Assigned',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Escalated TTR',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Waiting for approval',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Approved',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejected',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'Pending',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolved',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Closed',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Request Type',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
-	'Class:UserRequest/Attribute:impact' => 'Impact',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'A department',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'A service',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'A person',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => 'Priority',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'critical',
-	'Class:UserRequest/Attribute:priority/Value:1+' => 'critical',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'high',
-	'Class:UserRequest/Attribute:priority/Value:2+' => 'high',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'medium',
-	'Class:UserRequest/Attribute:priority/Value:3+' => 'medium',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'low',
-	'Class:UserRequest/Attribute:priority/Value:4+' => 'low',
-	'Class:UserRequest/Attribute:urgency' => 'Urgency',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'critical',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'high',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => 'high',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'medium',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'low',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low',
-	'Class:UserRequest/Attribute:origin' => 'Origin',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'email',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'phone',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
-	'Class:UserRequest/Attribute:approver_id' => 'Approver',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:approver_email' => 'Approver Email',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Service',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Service name',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Service subcategory',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Service subcategory name',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Assignment date',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Resolution date',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Last pending date',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passed',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr passed',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Resolution delay',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Resolution code',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
-	'Class:UserRequest/Attribute:solution' => 'Solution',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Pending reason',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Parent request',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_incident_id' => 'Parent incident',
-	'Class:UserRequest/Attribute:parent_incident_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Parent problem',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Parent change',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Child Requests',
-	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request',
-	'Class:UserRequest/Attribute:public_log' => 'Public log',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied',
-	'Class:UserRequest/Attribute:user_comment' => 'User comment',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Assign',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-assign',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Approve',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Reject',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'Pending',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatic resolve',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatic close',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Mark as resolved',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Close this request',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-open',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wait for approval',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
-
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
-));
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => 'Helpdesk',
+	'Menu:RequestManagementProvider' => 'Helpdesk provider',
+	'Menu:RequestManagementProvider+' => 'Helpdesk provider',
+	'Menu:UserRequest:Provider' => 'Open request transfered to provider',
+	'Menu:UserRequest:Provider+' => 'Open request transfered to provider',
+	'Menu:UserRequest:Overview' => 'Overview',
+	'Menu:UserRequest:Overview+' => 'Overview',
+	'Menu:NewUserRequest' => 'New user request',
+	'Menu:NewUserRequest+' => 'Create a new user request ticket',
+	'Menu:SearchUserRequests' => 'Search for user requests',
+	'Menu:SearchUserRequests+' => 'Search for user request tickets',
+	'Menu:UserRequest:Shortcuts' => 'Shortcuts',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Requests assigned to me',
+	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)',
+	'Menu:UserRequest:MySupportRequests' => "My support calls",
+	'Menu:UserRequest:MySupportRequests+' => "My support calls",
+	'Menu:UserRequest:EscalatedRequests' => 'Hot Requests',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests',
+	'Menu:UserRequest:OpenRequests' => 'All open requests',
+	'Menu:UserRequest:OpenRequests+' => 'All open requests',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Last 14 days request per type',
+	'UI-RequestManagementOverview-Last-14-days' => 'Last 14 days number of requests',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open requests by status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open requests by agent',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Open requests by type',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open requests by customer',
+	'Class:UserRequest:KnownErrorList' => 'Known Errors',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserRequest
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserRequest' => 'User Request',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Status',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'New',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Escalated TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Assigned',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Escalated TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Waiting for approval',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Approved',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejected',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Pending',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolved',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Closed',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Request Type',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
+	'Class:UserRequest/Attribute:impact' => 'Impact',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'A department',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'A service',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'A person',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Priority',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'critical',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'critical',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'high',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'high',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'medium',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'medium',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'low',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'low',
+	'Class:UserRequest/Attribute:urgency' => 'Urgency',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'critical',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'high',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'high',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'medium',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'low',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low',
+	'Class:UserRequest/Attribute:origin' => 'Origin',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'email',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'phone',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
+	'Class:UserRequest/Attribute:approver_id' => 'Approver',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => 'Approver Email',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Service',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Service name',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Service subcategory',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Service subcategory name',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Assignment date',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Resolution date',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Last pending date',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passed',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr passed',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Resolution delay',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Resolution code',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
+	'Class:UserRequest/Attribute:solution' => 'Solution',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Pending reason',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Parent request',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_incident_id' => 'Parent incident',
+	'Class:UserRequest/Attribute:parent_incident_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Parent problem',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Parent change',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Child Requests',
+	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request',
+	'Class:UserRequest/Attribute:public_log' => 'Public log',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied',
+	'Class:UserRequest/Attribute:user_comment' => 'User comment',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Assign',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-assign',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Approve',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Reject',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Pending',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatic resolve',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatic close',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Mark as resolved',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Close this request',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-open',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wait for approval',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
+
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
+));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
index 5a81d3107..a79f09c6c 100755
--- a/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
@@ -1,45 +1,45 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt-itil/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'User request Management ITIL',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
-			'itop-tickets/2.4.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-request-mgmt-itil.php',
-			'main.itop-request-mgmt-itil.php',
-		),
-		'data.struct' => array(
-
-		),
-		'data.sample' => array(
-			//'data.sample.itop-request-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-request-mgmt-itil/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'User request Management ITIL',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.4.0',
+			'itop-tickets/2.4.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-request-mgmt-itil.php',
+			'main.itop-request-mgmt-itil.php',
+		),
+		'data.struct' => array(
+
+		),
+		'data.sample' => array(
+			//'data.sample.itop-request-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-request-mgmt-itil/nl.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/nl.dict.itop-request-mgmt-itil.php
index 714dedd34..84924dae6 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/nl.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/nl.dict.itop-request-mgmt-itil.php
@@ -1,267 +1,267 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => 'Helpdesk',
-	'Menu:RequestManagementProvider' => 'Helpdesk leverancier',
-	'Menu:RequestManagementProvider+' => 'Helpdesk leverancier',
-	'Menu:UserRequest:Provider' => 'Open verzoeken Open requests overgebracht naar leverancier',
-	'Menu:UserRequest:Provider+' => 'Open verzoeken Open requests overgebracht naar leverancier',
-	'Menu:UserRequest:Overview' => 'Overzicht',
-	'Menu:UserRequest:Overview+' => 'Overzicht',
-	'Menu:NewUserRequest' => 'Nieuw gebruikersverzoek',
-	'Menu:NewUserRequest+' => 'Maak een nieuwe gebruikersverzoek ticket aan',
-	'Menu:SearchUserRequests' => 'Zoek naar gebruikersverzoeken',
-	'Menu:SearchUserRequests+' => 'Zoek naar gebruikersverzoeken',
-	'Menu:UserRequest:Shortcuts' => 'Snelkoppelingen',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Verzoeken toegewezen aan mij',
-	'Menu:UserRequest:MyRequests+' => 'Verzoeken toegewezen aan mij (als Agent)',
-	'Menu:UserRequest:MySupportRequests' => 'Mijn support gesprekken',
-	'Menu:UserRequest:MySupportRequests+' => 'Mijn support gesprekken',
-	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
-	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
-	'Menu:UserRequest:OpenRequests' => 'Alle open verzoeken',
-	'Menu:UserRequest:OpenRequests+' => 'Alle open verzoeken',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Verzoeken toegewezen aan mij',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per type)',
-	'UI-RequestManagementOverview-Last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per dag)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open verzoeken per status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open verzoeken per medewerker',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Open verzoeken per type',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open verzoeken per organisatie',
-	'Class:UserRequest:KnownErrorList' => 'Bekende fouten',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserRequest
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:UserRequest' => 'Gebruikersverzoek',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Status',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'Nieuw',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Geëscalleerd TTO',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Toegewezen',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Geëscalleerd TTR',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Wacht op goedkeuring',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Goedgekeurd',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Afgewezen',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'Wachtend',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Opgelost',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Gesloten',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Verzoek Type',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
-	'Class:UserRequest/Attribute:impact' => 'Impact',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'Een afdeling',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'Een dienst',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'Een persoon',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => 'Prioriteit',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'kritiek',
-	'Class:UserRequest/Attribute:priority/Value:1+' => 'kritisch',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'hoog',
-	'Class:UserRequest/Attribute:priority/Value:2+' => 'hoog',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'gemiddeld',
-	'Class:UserRequest/Attribute:priority/Value:3+' => 'normaal',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'laag',
-	'Class:UserRequest/Attribute:priority/Value:4+' => 'laag',
-	'Class:UserRequest/Attribute:urgency' => 'Urgentie',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'kritiek',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => 'kritisch',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'hoog',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => 'hoog',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'gemiddeld',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => 'normaal',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'laag',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => 'laag',
-	'Class:UserRequest/Attribute:origin' => 'Origin',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'mail',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'mail',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'telefoon',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => 'telefoon',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
-	'Class:UserRequest/Attribute:approver_id' => 'Goedkeurder',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:approver_email' => 'Goedkeurder Email',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Dienst',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Dienst naam',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Dienst subcategorie',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Dienst subcategorie naam',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nee',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Nee',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Ja',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Ja',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Toegewezen datum',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Resolutie datum',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Laatste wachtend datum',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passed',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr gepasseerd',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Resolutie vertraging',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Resolutie code',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistentie',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug opgelost',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware gerepareerd',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
-	'Class:UserRequest/Attribute:solution' => 'Solution',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Reden waarvoor het in afwachting staat',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Hoofd aanvraag',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_incident_id' => 'Hoofd incident',
-	'Class:UserRequest/Attribute:parent_incident_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Hoofd probleem',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Hoofd change',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Sub Verzoeken',
-	'Class:UserRequest/Attribute:related_request_list+' => 'Alle verzoeken die gelinkt zijn aan dit hoofdverzoek',
-	'Class:UserRequest/Attribute:public_log' => 'Publiek commentaar',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'Gebruikerstevredenheid',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Zeer tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Zeer tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Tamelijk tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Takelijk tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Tamelijk ontevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Tamelijk ontevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Zeer ontevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Zeer ontevreden',
-	'Class:UserRequest/Attribute:user_comment' => 'Gebruikersreactie',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Wijs toe',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Wijs opnieuw toe',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Keur goed',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Keur af',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'In afwachting',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatisch oplossen',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatisch sluiten',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Markeren als opgelost',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Sluit dit verzoek',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Her-open',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wacht op goedkeuring',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Kan niet toewijzen aan hoofdverzoek en aan het verzoek zelf',
-
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
-));
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => 'Helpdesk',
+	'Menu:RequestManagementProvider' => 'Helpdesk leverancier',
+	'Menu:RequestManagementProvider+' => 'Helpdesk leverancier',
+	'Menu:UserRequest:Provider' => 'Open verzoeken Open requests overgebracht naar leverancier',
+	'Menu:UserRequest:Provider+' => 'Open verzoeken Open requests overgebracht naar leverancier',
+	'Menu:UserRequest:Overview' => 'Overzicht',
+	'Menu:UserRequest:Overview+' => 'Overzicht',
+	'Menu:NewUserRequest' => 'Nieuw gebruikersverzoek',
+	'Menu:NewUserRequest+' => 'Maak een nieuwe gebruikersverzoek ticket aan',
+	'Menu:SearchUserRequests' => 'Zoek naar gebruikersverzoeken',
+	'Menu:SearchUserRequests+' => 'Zoek naar gebruikersverzoeken',
+	'Menu:UserRequest:Shortcuts' => 'Snelkoppelingen',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Verzoeken toegewezen aan mij',
+	'Menu:UserRequest:MyRequests+' => 'Verzoeken toegewezen aan mij (als Agent)',
+	'Menu:UserRequest:MySupportRequests' => 'Mijn support gesprekken',
+	'Menu:UserRequest:MySupportRequests+' => 'Mijn support gesprekken',
+	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
+	'Menu:UserRequest:OpenRequests' => 'Alle open verzoeken',
+	'Menu:UserRequest:OpenRequests+' => 'Alle open verzoeken',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Verzoeken toegewezen aan mij',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per type)',
+	'UI-RequestManagementOverview-Last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per dag)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open verzoeken per status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open verzoeken per medewerker',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Open verzoeken per type',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open verzoeken per organisatie',
+	'Class:UserRequest:KnownErrorList' => 'Bekende fouten',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserRequest
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:UserRequest' => 'Gebruikersverzoek',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Status',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Nieuw',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Geëscalleerd TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Toegewezen',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Geëscalleerd TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Wacht op goedkeuring',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Goedgekeurd',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Afgewezen',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Wachtend',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Opgelost',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Gesloten',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Verzoek Type',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
+	'Class:UserRequest/Attribute:impact' => 'Impact',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Een afdeling',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Een dienst',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Een persoon',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Prioriteit',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'kritiek',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'kritisch',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'hoog',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'hoog',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'gemiddeld',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'normaal',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'laag',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'laag',
+	'Class:UserRequest/Attribute:urgency' => 'Urgentie',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'kritiek',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'kritisch',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'hoog',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'hoog',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'gemiddeld',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'normaal',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'laag',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'laag',
+	'Class:UserRequest/Attribute:origin' => 'Origin',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'mail',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'mail',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'telefoon',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'telefoon',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
+	'Class:UserRequest/Attribute:approver_id' => 'Goedkeurder',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => 'Goedkeurder Email',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Dienst',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Dienst naam',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Dienst subcategorie',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Dienst subcategorie naam',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nee',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Nee',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Ja',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Ja',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Toegewezen datum',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Resolutie datum',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Laatste wachtend datum',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passed',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr gepasseerd',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Resolutie vertraging',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Resolutie code',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistentie',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug opgelost',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware gerepareerd',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
+	'Class:UserRequest/Attribute:solution' => 'Solution',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Reden waarvoor het in afwachting staat',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Hoofd aanvraag',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_incident_id' => 'Hoofd incident',
+	'Class:UserRequest/Attribute:parent_incident_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Hoofd probleem',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Hoofd change',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Sub Verzoeken',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Alle verzoeken die gelinkt zijn aan dit hoofdverzoek',
+	'Class:UserRequest/Attribute:public_log' => 'Publiek commentaar',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Gebruikerstevredenheid',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Zeer tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Zeer tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Tamelijk tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Takelijk tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Tamelijk ontevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Tamelijk ontevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Zeer ontevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Zeer ontevreden',
+	'Class:UserRequest/Attribute:user_comment' => 'Gebruikersreactie',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Wijs toe',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Wijs opnieuw toe',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Keur goed',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Keur af',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'In afwachting',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatisch oplossen',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatisch sluiten',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Markeren als opgelost',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Sluit dit verzoek',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Her-open',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wacht op goedkeuring',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Kan niet toewijzen aan hoofdverzoek en aan het verzoek zelf',
+
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
+));
diff --git a/datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php b/datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php
index 65bba5296..b4161b159 100644
--- a/datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/pt_br.dict.itop-request-mgmt-itil.php
@@ -1,270 +1,270 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:RequestManagement' => 'Gerenciamento Solicitações',
-	'Menu:RequestManagement+' => 'Gerenciamento Solicitações',
-	'Menu:RequestManagementProvider' => 'Provedor de Solicitações',
-	'Menu:RequestManagementProvider+' => 'Provedor de Solicitações',
-	'Menu:UserRequest:Provider' => 'Solicitações abertas transferidas para provedor',
-	'Menu:UserRequest:Provider+' => 'Solicitações abertas transferidas para provedor',
-	'Menu:UserRequest:Overview' => 'Visão geral',
-	'Menu:UserRequest:Overview+' => 'Visão geral',
-	'Menu:NewUserRequest' => 'Nova solicitação',
-	'Menu:NewUserRequest+' => 'Criar uma nova solicitação',
-	'Menu:SearchUserRequests' => 'Pesquisar por solicitação',
-	'Menu:SearchUserRequests+' => 'Pesquisar por solicitação',
-	'Menu:UserRequest:Shortcuts' => 'Atalho',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Solicitações abertas por mim',
-	'Menu:UserRequest:MyRequests+' => 'Solicitações abertas por mim (como agente)',
-	'Menu:UserRequest:MySupportRequests' => "Minhas solicitações de suporte",
-	'Menu:UserRequest:MySupportRequests+' => "Minhas solicitações de suporte",
-	'Menu:UserRequest:EscalatedRequests' => 'Hot Requests',
-	'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests',
-	'Menu:UserRequest:OpenRequests' => 'Todas solicitações abertas',
-	'Menu:UserRequest:OpenRequests+' => 'Todas solicitações abertas',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Solicitações atribuidas a mim',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Solicitações dos últimos 14 dias por tipo',
-	'UI-RequestManagementOverview-Last-14-days' => 'Número de solicitações dos últimos 14 dias',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Solicitações abertas por status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Solicitações abertas por agente',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Solicitações abertas por tipo',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Solicitações abertas por cliente',
-	'Class:UserRequest:KnownErrorList' => 'Erros conhecidos',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserRequest
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:UserRequest' => 'Solicitação usuário',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Estado',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'Nova',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'TTO escalado',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Atribuído',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'TTR escalado',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Aguardando aprovação',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Aprovado',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejeitado',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'Pendência',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolvido',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Fechado',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Tipo solicitação',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
-	'Class:UserRequest/Attribute:impact' => 'Impacto',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'Um departamento',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'Um serviço',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'Uma pessoa',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => 'Prioridade',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'Crítica',
-	'Class:UserRequest/Attribute:priority/Value:1+' => 'Crítica',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'Alta',
-	'Class:UserRequest/Attribute:priority/Value:2+' => 'Alta',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'Média',
-	'Class:UserRequest/Attribute:priority/Value:3+' => 'Média',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'Baixa',
-	'Class:UserRequest/Attribute:priority/Value:4+' => 'Baixa',
-	'Class:UserRequest/Attribute:urgency' => 'Urgência',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'Crítica',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => 'Crítica',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'Alta',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => 'Alta',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'Média',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => 'Média',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'Baixa',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Baixa',
-	'Class:UserRequest/Attribute:origin' => 'Origem',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Email',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoramento',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Monitoramento',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefone',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => 'Telefone',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Portal',
-	'Class:UserRequest/Attribute:approver_id' => 'Aprovador',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:approver_email' => 'Email aprovador',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Serviço',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Nome serviço',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nome Sub-categoria serviço',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Alerta vermelho',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Não',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Não',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Sim',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Sim',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Data atribuição',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Data resolução',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Última data pendente',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'Pendências acumuladas',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Prazo determinado TTO',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO passou',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO acima',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'Prazo determinado TTR',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR passou',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR acima',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Atraso resolução',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Código resolução',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistência',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'Assistência',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug corrigido',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'Bug corrigido',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparado',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'Hardware reparado',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Outro',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'Outro',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'Software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Atualização sistema',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'Atualização sistema',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Treinamento',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'Treinamento',
-	'Class:UserRequest/Attribute:solution' => 'Solução',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Razão pendência',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Solicitação principal',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_incident_id' => 'Incidente principal',
-	'Class:UserRequest/Attribute:parent_incident_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref solitação',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Problema principal',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problema',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Mudança principal',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref mudança',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Sub-Solicitação',
-	'Class:UserRequest/Attribute:related_request_list+' => 'Todas as solicitações vinculadas a essa solicitação principal',
-	'Class:UserRequest/Attribute:public_log' => 'Log público',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'Satisfação do usuário',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Muito satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Muito satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Bastante satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Bastante satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Bastante insatisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Bastante insatisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Muito insatisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Muito insatisfeito',
-	'Class:UserRequest/Attribute:user_comment' => 'Comentário usuário',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Atribuir',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-atribuir',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Aprovar',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'Pendência',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Resolvido automaticamente',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Fechado automaticamente',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Marcar como resolvido',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Fechar esta solicitação',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Aguardar por aprovação',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Não é possível atribuir a solicitação principal para a própria solicitação',
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:RequestManagement' => 'Gerenciamento Solicitações',
+	'Menu:RequestManagement+' => 'Gerenciamento Solicitações',
+	'Menu:RequestManagementProvider' => 'Provedor de Solicitações',
+	'Menu:RequestManagementProvider+' => 'Provedor de Solicitações',
+	'Menu:UserRequest:Provider' => 'Solicitações abertas transferidas para provedor',
+	'Menu:UserRequest:Provider+' => 'Solicitações abertas transferidas para provedor',
+	'Menu:UserRequest:Overview' => 'Visão geral',
+	'Menu:UserRequest:Overview+' => 'Visão geral',
+	'Menu:NewUserRequest' => 'Nova solicitação',
+	'Menu:NewUserRequest+' => 'Criar uma nova solicitação',
+	'Menu:SearchUserRequests' => 'Pesquisar por solicitação',
+	'Menu:SearchUserRequests+' => 'Pesquisar por solicitação',
+	'Menu:UserRequest:Shortcuts' => 'Atalho',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Solicitações abertas por mim',
+	'Menu:UserRequest:MyRequests+' => 'Solicitações abertas por mim (como agente)',
+	'Menu:UserRequest:MySupportRequests' => "Minhas solicitações de suporte",
+	'Menu:UserRequest:MySupportRequests+' => "Minhas solicitações de suporte",
+	'Menu:UserRequest:EscalatedRequests' => 'Hot Requests',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot Requests',
+	'Menu:UserRequest:OpenRequests' => 'Todas solicitações abertas',
+	'Menu:UserRequest:OpenRequests+' => 'Todas solicitações abertas',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Solicitações atribuidas a mim',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Solicitações dos últimos 14 dias por tipo',
+	'UI-RequestManagementOverview-Last-14-days' => 'Número de solicitações dos últimos 14 dias',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Solicitações abertas por status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Solicitações abertas por agente',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Solicitações abertas por tipo',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Solicitações abertas por cliente',
+	'Class:UserRequest:KnownErrorList' => 'Erros conhecidos',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserRequest
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:UserRequest' => 'Solicitação usuário',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Estado',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Nova',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'TTO escalado',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Atribuído',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'TTR escalado',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Aguardando aprovação',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Aprovado',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejeitado',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Pendência',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolvido',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Fechado',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Tipo solicitação',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
+	'Class:UserRequest/Attribute:impact' => 'Impacto',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Um departamento',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Um serviço',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Uma pessoa',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Prioridade',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'Crítica',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'Crítica',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'Alta',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'Alta',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'Média',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'Média',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'Baixa',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'Baixa',
+	'Class:UserRequest/Attribute:urgency' => 'Urgência',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'Crítica',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'Crítica',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'Alta',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'Alta',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'Média',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'Média',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'Baixa',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Baixa',
+	'Class:UserRequest/Attribute:origin' => 'Origem',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Email',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoramento',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Monitoramento',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefone',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'Telefone',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Portal',
+	'Class:UserRequest/Attribute:approver_id' => 'Aprovador',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => 'Email aprovador',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Serviço',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Nome serviço',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nome Sub-categoria serviço',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Alerta vermelho',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Não',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Não',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Sim',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Sim',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Data atribuição',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Data resolução',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Última data pendente',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'Pendências acumuladas',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Prazo determinado TTO',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO passou',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO acima',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'Prazo determinado TTR',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR passou',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR acima',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Atraso resolução',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Código resolução',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistência',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'Assistência',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug corrigido',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'Bug corrigido',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparado',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'Hardware reparado',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Outro',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'Outro',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'Software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Atualização sistema',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'Atualização sistema',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Treinamento',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'Treinamento',
+	'Class:UserRequest/Attribute:solution' => 'Solução',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Razão pendência',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Solicitação principal',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_incident_id' => 'Incidente principal',
+	'Class:UserRequest/Attribute:parent_incident_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref solitação',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Problema principal',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problema',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Mudança principal',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref mudança',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Sub-Solicitação',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Todas as solicitações vinculadas a essa solicitação principal',
+	'Class:UserRequest/Attribute:public_log' => 'Log público',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Satisfação do usuário',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Muito satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Muito satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Bastante satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Bastante satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Bastante insatisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Bastante insatisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Muito insatisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Muito insatisfeito',
+	'Class:UserRequest/Attribute:user_comment' => 'Comentário usuário',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Atribuir',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-atribuir',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Aprovar',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Pendência',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Resolvido automaticamente',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Fechado automaticamente',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Marcar como resolvido',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Fechar esta solicitação',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Aguardar por aprovação',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Não é possível atribuir a solicitação principal para a própria solicitação',
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
+));
+
+
+
+?>
diff --git a/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
index eb826e47e..59e311a2e 100755
--- a/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/en.dict.itop-request-mgmt.php
@@ -1,297 +1,297 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => 'Helpdesk',
-	'Menu:RequestManagementProvider' => 'Helpdesk provider',
-	'Menu:RequestManagementProvider+' => 'Helpdesk provider',
-	'Menu:UserRequest:Provider' => 'Open requests transfered to provider',
-	'Menu:UserRequest:Provider+' => 'Open requests transfered to provider',
-	'Menu:UserRequest:Overview' => 'Overview',
-	'Menu:UserRequest:Overview+' => 'Overview',
-	'Menu:NewUserRequest' => 'New user request',
-	'Menu:NewUserRequest+' => 'Create a new user request ticket',
-	'Menu:SearchUserRequests' => 'Search for user requests',
-	'Menu:SearchUserRequests+' => 'Search for user request tickets',
-	'Menu:UserRequest:Shortcuts' => 'Shortcuts',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Requests assigned to me',
-	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)',
-	'Menu:UserRequest:MySupportRequests' => "My support calls",
-	'Menu:UserRequest:MySupportRequests+' => "My support calls",
-	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
-	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
-	'Menu:UserRequest:OpenRequests' => 'All open requests',
-	'Menu:UserRequest:OpenRequests+' => 'All open requests',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Requests of the last 14 days (per type)',
-	'UI-RequestManagementOverview-Last-14-days' => 'Requests of the last 14 days (per day)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open requests by status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open requests by agent',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Open requests by type',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open requests by organization',
-	'Class:UserRequest:KnownErrorList' => 'Known Errors',
-	'Menu:UserRequest:MyWorkOrders' => 'Work orders assigned to me',
-	'Menu:UserRequest:MyWorkOrders+' => 'All work orders assigned to me',
-	'Class:Problem:KnownProblemList' => 'Known problems',
-	'Tickets:Related:OpenIncidents' => 'Open incidents',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserRequest
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:UserRequest' => 'User Request',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Status',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'New',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Escalated TTO',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Assigned',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Escalated TTR',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Waiting for approval',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Approved',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejected',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'Pending',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolved',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Closed',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Request Type',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
-	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
-	'Class:UserRequest/Attribute:impact' => 'Impact',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'A department',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'A service',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'A person',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => 'Priority',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'critical',
-	'Class:UserRequest/Attribute:priority/Value:1+' => 'critical',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'high',
-	'Class:UserRequest/Attribute:priority/Value:2+' => 'high',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'medium',
-	'Class:UserRequest/Attribute:priority/Value:3+' => 'medium',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'low',
-	'Class:UserRequest/Attribute:priority/Value:4+' => 'low',
-	'Class:UserRequest/Attribute:urgency' => 'Urgency',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'critical',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'high',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => 'high',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'medium',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'low',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low',
-	'Class:UserRequest/Attribute:origin' => 'Origin',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'email',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'phone',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
-	'Class:UserRequest/Attribute:approver_id' => 'Approver',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:approver_email' => 'Approver Email',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Service',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Service name',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Service subcategory',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Service subcategory name',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Assignment date',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Resolution date',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Last pending date',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passed',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr passed',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Resolution delay',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Resolution code',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
-	'Class:UserRequest/Attribute:solution' => 'Solution',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Pending reason',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Parent request',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Parent problem',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Parent change',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Child Requests',
-	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request',
-	'Class:UserRequest/Attribute:public_log' => 'Public log',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied',
-	'Class:UserRequest/Attribute:user_comment' => 'User comment',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Assign',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-assign',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Approve',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Reject',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'Pending',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatic resolve',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatic close',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Mark as resolved',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Close this request',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-open',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wait for approval',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
-));
-
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Portal:TitleDetailsFor_Request' => 'Details for request',
-	'Portal:ButtonUpdate' => 'Update',
-	'Portal:ButtonClose' => 'Close',
-	'Portal:ButtonReopen' => 'Reopen',
-	'Portal:ShowServices' => 'Service catalogue',
-	'Portal:SelectRequestType' => 'Select a type of request',
-	'Portal:SelectServiceElementFrom_Service' => 'Select a service element for %1$s',
-	'Portal:ListServices' => 'List of services',
-	'Portal:TitleDetailsFor_Service' => 'Details for Service',
-	'Portal:Button:CreateRequestFromService' => 'Create a Request for this service',
-	'Portal:ListOpenRequests' => 'List open requests',
-'Portal:UserRequest:MoreInfo' => 'More information',
-	'Portal:Details-Service-Element' => 'Service elements',
-	'Portal:NoClosedTicket' => 'No closed request',
-	'Portal:NoService' => '',
-	'Portal:ListOpenProblems' => 'On going problems',
-	'Portal:ShowProblem' => 'Problems',
-	'Portal:ShowFaqs' => 'FAQs',
-	'Portal:NoOpenProblem' => 'No open problem',
-	'Portal:SelectLanguage' => "Change you language",
-	'Portal:LanguageChangedTo_Lang' => 'Language changed to',
-	'Portal:ChooseYourFavoriteLanguage' => 'Choose your favorite language',
-
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
-));
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => 'Helpdesk',
+	'Menu:RequestManagementProvider' => 'Helpdesk provider',
+	'Menu:RequestManagementProvider+' => 'Helpdesk provider',
+	'Menu:UserRequest:Provider' => 'Open requests transfered to provider',
+	'Menu:UserRequest:Provider+' => 'Open requests transfered to provider',
+	'Menu:UserRequest:Overview' => 'Overview',
+	'Menu:UserRequest:Overview+' => 'Overview',
+	'Menu:NewUserRequest' => 'New user request',
+	'Menu:NewUserRequest+' => 'Create a new user request ticket',
+	'Menu:SearchUserRequests' => 'Search for user requests',
+	'Menu:SearchUserRequests+' => 'Search for user request tickets',
+	'Menu:UserRequest:Shortcuts' => 'Shortcuts',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Requests assigned to me',
+	'Menu:UserRequest:MyRequests+' => 'Requests assigned to me (as Agent)',
+	'Menu:UserRequest:MySupportRequests' => "My support calls",
+	'Menu:UserRequest:MySupportRequests+' => "My support calls",
+	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
+	'Menu:UserRequest:OpenRequests' => 'All open requests',
+	'Menu:UserRequest:OpenRequests+' => 'All open requests',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Requests assigned to me',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Requests of the last 14 days (per type)',
+	'UI-RequestManagementOverview-Last-14-days' => 'Requests of the last 14 days (per day)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open requests by status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open requests by agent',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Open requests by type',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open requests by organization',
+	'Class:UserRequest:KnownErrorList' => 'Known Errors',
+	'Menu:UserRequest:MyWorkOrders' => 'Work orders assigned to me',
+	'Menu:UserRequest:MyWorkOrders+' => 'All work orders assigned to me',
+	'Class:Problem:KnownProblemList' => 'Known problems',
+	'Tickets:Related:OpenIncidents' => 'Open incidents',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserRequest
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:UserRequest' => 'User Request',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Status',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'New',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Escalated TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Assigned',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Escalated TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Waiting for approval',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Approved',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejected',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Pending',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolved',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Closed',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Request Type',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
+	'Class:UserRequest/Attribute:impact' => 'Impact',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'A department',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'A service',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'A person',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Priority',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'critical',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'critical',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'high',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'high',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'medium',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'medium',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'low',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'low',
+	'Class:UserRequest/Attribute:urgency' => 'Urgency',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'critical',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'critical',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'high',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'high',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'medium',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'medium',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'low',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'low',
+	'Class:UserRequest/Attribute:origin' => 'Origin',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'email',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'email',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'phone',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'phone',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
+	'Class:UserRequest/Attribute:approver_id' => 'Approver',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => 'Approver Email',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Service',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Service name',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Service subcategory',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Service subcategory name',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'No',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'No',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Yes',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Yes',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Assignment date',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Resolution date',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Last pending date',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passed',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr passed',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Resolution delay',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Resolution code',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistance',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistance',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug fixed',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug fixed',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware repair',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware repair',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'other',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'other',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'system update',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'system update',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
+	'Class:UserRequest/Attribute:solution' => 'Solution',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Pending reason',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Parent request',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Parent problem',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Parent change',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Child Requests',
+	'Class:UserRequest/Attribute:related_request_list+' => 'All the requests that are linked to this parent request',
+	'Class:UserRequest/Attribute:public_log' => 'Public log',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'User satisfaction',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Very satisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Very satisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Fairly statisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Fairly statisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Rather Dissatified',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Rather Dissatified',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Very Dissatisfied',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Very Dissatisfied',
+	'Class:UserRequest/Attribute:user_comment' => 'User comment',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Assign',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-assign',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Approve',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Reject',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Pending',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatic resolve',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatic close',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Mark as resolved',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Close this request',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-open',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wait for approval',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Cannot assign the Parent request to the request itself',
+));
+
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Portal:TitleDetailsFor_Request' => 'Details for request',
+	'Portal:ButtonUpdate' => 'Update',
+	'Portal:ButtonClose' => 'Close',
+	'Portal:ButtonReopen' => 'Reopen',
+	'Portal:ShowServices' => 'Service catalogue',
+	'Portal:SelectRequestType' => 'Select a type of request',
+	'Portal:SelectServiceElementFrom_Service' => 'Select a service element for %1$s',
+	'Portal:ListServices' => 'List of services',
+	'Portal:TitleDetailsFor_Service' => 'Details for Service',
+	'Portal:Button:CreateRequestFromService' => 'Create a Request for this service',
+	'Portal:ListOpenRequests' => 'List open requests',
+'Portal:UserRequest:MoreInfo' => 'More information',
+	'Portal:Details-Service-Element' => 'Service elements',
+	'Portal:NoClosedTicket' => 'No closed request',
+	'Portal:NoService' => '',
+	'Portal:ListOpenProblems' => 'On going problems',
+	'Portal:ShowProblem' => 'Problems',
+	'Portal:ShowFaqs' => 'FAQs',
+	'Portal:NoOpenProblem' => 'No open problem',
+	'Portal:SelectLanguage' => "Change you language",
+	'Portal:LanguageChangedTo_Lang' => 'Language changed to',
+	'Portal:ChooseYourFavoriteLanguage' => 'Choose your favorite language',
+
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info',
+));
diff --git a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
index 856946f77..5276d20e6 100755
--- a/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
@@ -1,45 +1,45 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-request-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Simple Ticket Management',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
-			'itop-tickets/2.4.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-request-mgmt.php',
-			'main.itop-request-mgmt.php',
-		),
-		'data.struct' => array(
-
-		),
-		'data.sample' => array(
-			//'data.sample.itop-request-mgmt.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-request-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Simple Ticket Management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.4.0',
+			'itop-tickets/2.4.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-request-mgmt.php',
+			'main.itop-request-mgmt.php',
+		),
+		'data.struct' => array(
+
+		),
+		'data.sample' => array(
+			//'data.sample.itop-request-mgmt.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
diff --git a/datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php
index 2188d3081..c4b9d250f 100644
--- a/datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/nl.dict.itop-request-mgmt.php
@@ -1,301 +1,301 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => 'Helpdesk',
-	'Menu:RequestManagementProvider' => 'Helpdesk leverancier',
-	'Menu:RequestManagementProvider+' => 'Helpdesk leverancier',
-	'Menu:UserRequest:Provider' => 'Open verzoeken Open requests overgebracht naar leverancier',
-	'Menu:UserRequest:Provider+' => 'Open verzoeken Open requests overgebracht naar leverancier',
-	'Menu:UserRequest:Overview' => 'Overzicht',
-	'Menu:UserRequest:Overview+' => 'Overzicht',
-	'Menu:NewUserRequest' => 'Nieuw gebruikersverzoek',
-	'Menu:NewUserRequest+' => 'Maak een nieuwe gebruikersverzoek ticket aan',
-	'Menu:SearchUserRequests' => 'Zoek naar gebruikersverzoeken',
-	'Menu:SearchUserRequests+' => 'Zoek naar gebruikersverzoeken',
-	'Menu:UserRequest:Shortcuts' => 'Snelkoppelingen',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Verzoeken toegewezen aan mij',
-	'Menu:UserRequest:MyRequests+' => 'Verzoeken toegewezen aan mij (als Agent)',
-	'Menu:UserRequest:MySupportRequests' => 'Mijn support gesprekken',
-	'Menu:UserRequest:MySupportRequests+' => 'Mijn support gesprekken',
-	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
-	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
-	'Menu:UserRequest:OpenRequests' => 'Alle open verzoeken',
-	'Menu:UserRequest:OpenRequests+' => 'Alle open verzoeken',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Verzoeken toegewezen aan mij',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per type)',
-	'UI-RequestManagementOverview-Last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per dag)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open verzoeken per status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open verzoeken per medewerker',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Open verzoeken per type',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open verzoeken per organisatie',
-	'Class:UserRequest:KnownErrorList' => 'Bekende fouten',
-	'Menu:UserRequest:MyWorkOrders' => 'Work orders toegewezen aan mij',
-	'Menu:UserRequest:MyWorkOrders+' => 'Alle work orders toegewezen aan mij',
-	'Class:Problem:KnownProblemList' => 'Bekende fouten',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserRequest
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:UserRequest' => 'Gebruikersverzoek',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Status',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'Nieuw',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Geëscaleerde TTO',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Toegewezen',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Geëscaleerde TTR',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Wacht voor goedkeuring',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Goedgekeurd',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Afgewezen',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'In afwachting van',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Opgelost',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Gesloten',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Verzoek Type',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
-	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
-	'Class:UserRequest/Attribute:impact' => 'Impact',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'Een afdeling',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'Een dienst',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'Een persoon',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => 'Prioriteit',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'kritisch',
-	'Class:UserRequest/Attribute:priority/Value:1+' => 'kritisch',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'hoog',
-	'Class:UserRequest/Attribute:priority/Value:2+' => 'hoog',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'normaal',
-	'Class:UserRequest/Attribute:priority/Value:3+' => 'normaal',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'laag',
-	'Class:UserRequest/Attribute:priority/Value:4+' => 'laag',
-	'Class:UserRequest/Attribute:urgency' => 'Urgentie',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'kritisch',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => 'kritisch',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'hoog',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => 'hoog',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'normaal',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => 'normaal',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'laag',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => 'laag',
-	'Class:UserRequest/Attribute:origin' => 'Afkomst',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'mail',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'mail',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'telefoon',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => 'telefoon',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
-	'Class:UserRequest/Attribute:approver_id' => 'Goedkeurder',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:approver_email' => 'Goedkeurder Email',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Dienst',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Dienst naam',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Dienst subcategorie',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Dienst subcategorie naam',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nee',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Nee',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Ja',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Ja',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Toegewezen datum',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Resolutie datum',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Laatste pending date',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto gepasseerd',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr gepasseerd',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Resolutie vertraging',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Resolutie code',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistentie',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistentie',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug opgelost',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug opgelost',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware gerepareerd',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware gerepareerd',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'anders',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'anders',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'systeem update',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'systeem update',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
-	'Class:UserRequest/Attribute:solution' => 'Oplossing',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Reden waarvoor het in afwachting staat',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Hoofd aanvraag',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Hoofd probleem',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Hoofd change',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Sub Verzoeken',
-	'Class:UserRequest/Attribute:related_request_list+' => 'Alle verzoeken die gelinkt zijn aan dit hoofdverzoek',
-	'Class:UserRequest/Attribute:public_log' => 'Publieke log',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'Klant tevredenheid',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Erg tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Erg tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Tevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Ontevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Ontevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Erg ontevreden',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Erg ontevreden',
-	'Class:UserRequest/Attribute:user_comment' => 'Gebruikersreactie',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Wijs toe',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Wijs opnieuw toe',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Keur goed',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Keur af',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'In afwachting',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatisch oplossen',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatisch sluiten',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Markeren als opgelost',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Sluit dit verzoek',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Her-open',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wacht op goedkeuring',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Kan niet toewijzen aan hoofdverzoek en aan het verzoek zelf',
-));
-
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Portal:TitleDetailsFor_Request' => 'Details van het verzoek',
-	'Portal:ButtonUpdate' => 'Wijzig',
-	'Portal:ButtonClose' => 'Sluit',
-	'Portal:ButtonReopen' => 'Heropen',
-	'Portal:ShowServices' => 'Dienst catalogus',
-	'Portal:SelectRequestType' => 'Selecteer een type verzoek',
-	'Portal:SelectServiceElementFrom_Service' => 'Selecteer een dienst voor %1$s',
-	'Portal:ListServices' => 'Lijst met diensten',
-	'Portal:TitleDetailsFor_Service' => 'Details van de Dienst',
-	'Portal:Button:CreateRequestFromService' => 'Maak een verzoek aan voor deze dienst',
-	'Portal:ListOpenRequests' => 'Lijst met open verzoeken',
-	'Portal:UserRequest:MoreInfo' => 'Meer informatie',
-	'Portal:Details-Service-Element' => 'Dienst elementen',
-	'Portal:NoClosedTicket' => 'Geen gesloten verzoeken',
-	'Portal:NoService' => '',
-	'Portal:ListOpenProblems' => 'Openstaande problemen',
-	'Portal:ShowProblem' => 'Problemen',
-	'Portal:ShowFaqs' => 'Vragen & Antwoorden',
-	'Portal:NoOpenProblem' => 'Geen open probleem',
-	'Portal:SelectLanguage' => 'Verander je Taal',
-	'Portal:LanguageChangedTo_Lang' => 'Taal veranderd naar',
-	'Portal:ChooseYourFavoriteLanguage' => 'Kies je favoriete taal',
-	'Tickets:Related:OpenIncidents' => 'Open incidenten~~',
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => 'Helpdesk',
+	'Menu:RequestManagementProvider' => 'Helpdesk leverancier',
+	'Menu:RequestManagementProvider+' => 'Helpdesk leverancier',
+	'Menu:UserRequest:Provider' => 'Open verzoeken Open requests overgebracht naar leverancier',
+	'Menu:UserRequest:Provider+' => 'Open verzoeken Open requests overgebracht naar leverancier',
+	'Menu:UserRequest:Overview' => 'Overzicht',
+	'Menu:UserRequest:Overview+' => 'Overzicht',
+	'Menu:NewUserRequest' => 'Nieuw gebruikersverzoek',
+	'Menu:NewUserRequest+' => 'Maak een nieuwe gebruikersverzoek ticket aan',
+	'Menu:SearchUserRequests' => 'Zoek naar gebruikersverzoeken',
+	'Menu:SearchUserRequests+' => 'Zoek naar gebruikersverzoeken',
+	'Menu:UserRequest:Shortcuts' => 'Snelkoppelingen',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Verzoeken toegewezen aan mij',
+	'Menu:UserRequest:MyRequests+' => 'Verzoeken toegewezen aan mij (als Agent)',
+	'Menu:UserRequest:MySupportRequests' => 'Mijn support gesprekken',
+	'Menu:UserRequest:MySupportRequests+' => 'Mijn support gesprekken',
+	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
+	'Menu:UserRequest:OpenRequests' => 'Alle open verzoeken',
+	'Menu:UserRequest:OpenRequests+' => 'Alle open verzoeken',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Verzoeken toegewezen aan mij',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per type)',
+	'UI-RequestManagementOverview-Last-14-days' => 'Verzoeken van de afgelopen 14 dagen (per dag)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Open verzoeken per status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Open verzoeken per medewerker',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Open verzoeken per type',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Open verzoeken per organisatie',
+	'Class:UserRequest:KnownErrorList' => 'Bekende fouten',
+	'Menu:UserRequest:MyWorkOrders' => 'Work orders toegewezen aan mij',
+	'Menu:UserRequest:MyWorkOrders+' => 'Alle work orders toegewezen aan mij',
+	'Class:Problem:KnownProblemList' => 'Bekende fouten',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserRequest
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:UserRequest' => 'Gebruikersverzoek',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Status',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Nieuw',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Geëscaleerde TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Toegewezen',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Geëscaleerde TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Wacht voor goedkeuring',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Goedgekeurd',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Afgewezen',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'In afwachting van',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Opgelost',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Gesloten',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Verzoek Type',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incident',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service request',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Service request',
+	'Class:UserRequest/Attribute:impact' => 'Impact',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Een afdeling',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Een dienst',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Een persoon',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Prioriteit',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'kritisch',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'kritisch',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'hoog',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'hoog',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'normaal',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'normaal',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'laag',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'laag',
+	'Class:UserRequest/Attribute:urgency' => 'Urgentie',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'kritisch',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'kritisch',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'hoog',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'hoog',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'normaal',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'normaal',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'laag',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'laag',
+	'Class:UserRequest/Attribute:origin' => 'Afkomst',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'mail',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'mail',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'monitoring',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'telefoon',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'telefoon',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'portal',
+	'Class:UserRequest/Attribute:approver_id' => 'Goedkeurder',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => 'Goedkeurder Email',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Dienst',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Dienst naam',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Dienst subcategorie',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Dienst subcategorie naam',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nee',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Nee',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Ja',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Ja',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Hot reason',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Toegewezen datum',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Resolutie datum',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Laatste pending date',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'cumulatedpending',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto gepasseerd',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr gepasseerd',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Resolutie vertraging',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Resolutie code',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'assistentie',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'assistentie',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'bug opgelost',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'bug opgelost',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'hardware gerepareerd',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'hardware gerepareerd',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'anders',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'anders',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'systeem update',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'systeem update',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'training',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'training',
+	'Class:UserRequest/Attribute:solution' => 'Oplossing',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Reden waarvoor het in afwachting staat',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Hoofd aanvraag',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref request',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Hoofd probleem',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Hoofd change',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Sub Verzoeken',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Alle verzoeken die gelinkt zijn aan dit hoofdverzoek',
+	'Class:UserRequest/Attribute:public_log' => 'Publieke log',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Klant tevredenheid',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Erg tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Erg tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Tevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Ontevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Ontevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Erg ontevreden',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Erg ontevreden',
+	'Class:UserRequest/Attribute:user_comment' => 'Gebruikersreactie',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Wijs toe',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Wijs opnieuw toe',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Keur goed',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Keur af',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'In afwachting',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatisch oplossen',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatisch sluiten',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Markeren als opgelost',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Sluit dit verzoek',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Her-open',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Wacht op goedkeuring',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Kan niet toewijzen aan hoofdverzoek en aan het verzoek zelf',
+));
+
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Portal:TitleDetailsFor_Request' => 'Details van het verzoek',
+	'Portal:ButtonUpdate' => 'Wijzig',
+	'Portal:ButtonClose' => 'Sluit',
+	'Portal:ButtonReopen' => 'Heropen',
+	'Portal:ShowServices' => 'Dienst catalogus',
+	'Portal:SelectRequestType' => 'Selecteer een type verzoek',
+	'Portal:SelectServiceElementFrom_Service' => 'Selecteer een dienst voor %1$s',
+	'Portal:ListServices' => 'Lijst met diensten',
+	'Portal:TitleDetailsFor_Service' => 'Details van de Dienst',
+	'Portal:Button:CreateRequestFromService' => 'Maak een verzoek aan voor deze dienst',
+	'Portal:ListOpenRequests' => 'Lijst met open verzoeken',
+	'Portal:UserRequest:MoreInfo' => 'Meer informatie',
+	'Portal:Details-Service-Element' => 'Dienst elementen',
+	'Portal:NoClosedTicket' => 'Geen gesloten verzoeken',
+	'Portal:NoService' => '',
+	'Portal:ListOpenProblems' => 'Openstaande problemen',
+	'Portal:ShowProblem' => 'Problemen',
+	'Portal:ShowFaqs' => 'Vragen & Antwoorden',
+	'Portal:NoOpenProblem' => 'Geen open probleem',
+	'Portal:SelectLanguage' => 'Verander je Taal',
+	'Portal:LanguageChangedTo_Lang' => 'Taal veranderd naar',
+	'Portal:ChooseYourFavoriteLanguage' => 'Kies je favoriete taal',
+	'Tickets:Related:OpenIncidents' => 'Open incidenten~~',
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-request-mgmt/pt_br.dict.itop-request-mgmt.php b/datamodels/2.x/itop-request-mgmt/pt_br.dict.itop-request-mgmt.php
index d477b0111..bacb7db27 100644
--- a/datamodels/2.x/itop-request-mgmt/pt_br.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/pt_br.dict.itop-request-mgmt.php
@@ -1,297 +1,297 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:RequestManagement' => 'Gerenciamento Solicitações',
-	'Menu:RequestManagement+' => 'Gerenciamento Solicitações',
-	'Menu:RequestManagementProvider' => 'Solicitações provedoras',
-	'Menu:RequestManagementProvider+' => 'Solicitações provedoras',
-	'Menu:UserRequest:Provider' => 'Solicitações abertas transferidas para provedor',
-	'Menu:UserRequest:Provider+' => 'Solicitações abertas transferidas para provedor',
-	'Menu:UserRequest:Overview' => 'Visão geral',
-	'Menu:UserRequest:Overview+' => 'Visão geral',
-	'Menu:NewUserRequest' => 'Nova solicitação',
-	'Menu:NewUserRequest+' => 'Criar uma nova solicitação',
-	'Menu:SearchUserRequests' => 'Pesquisar por solicitação',
-	'Menu:SearchUserRequests+' => 'Pesquisar por solicitação',
-	'Menu:UserRequest:Shortcuts' => 'Atalho',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Solicitações abertas por mim',
-	'Menu:UserRequest:MyRequests+' => 'Solicitações abertas por mim (como agente)',
-	'Menu:UserRequest:MySupportRequests' => "Minhas solicitações de suporte",
-	'Menu:UserRequest:MySupportRequests+' => "Minhas solicitações de suporte",
-	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
-	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
-	'Menu:UserRequest:OpenRequests' => 'Todas solicitações abertas',
-	'Menu:UserRequest:OpenRequests+' => 'Todas solicitações abertas',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Solicitações atribuidas a mim',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Solicitações dos últimos 14 dias (por tipo)',
-	'UI-RequestManagementOverview-Last-14-days' => 'Solicitações dos últimos 14 dias (por dia)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Solicitações abertas por status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Solicitações abertas por agente',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Solicitações abertas por tipo',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Solicitações abertas por organização',
-	'Class:UserRequest:KnownErrorList' => 'Erros conhecidos',
-	'Menu:UserRequest:MyWorkOrders' => 'Ordens de serviço atribuídas a mim',
-	'Menu:UserRequest:MyWorkOrders+' => 'Todas as Ordens de serviço atribuídos a min',
-	'Class:Problem:KnownProblemList' => 'Problemas conhecidos',
-));
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-//
-// Class: UserRequest
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:UserRequest' => 'Usuário solicitante',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Estado',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'Nova',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'TTO escalado',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Atribuido',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'TTR escalado',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Aguardando aprovação',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Aprovado',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejeitado',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'Pendente',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolvido',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Fechado',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Tipo solicitação',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incidente',
-	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incidente',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
-	'Class:UserRequest/Attribute:impact' => 'Impacto',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'Um departamento',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'Um serviço',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'Uma pessoa',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => 'Prioridade',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'Crítica',
-	'Class:UserRequest/Attribute:priority/Value:1+' => 'Crítica',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'Alta',
-	'Class:UserRequest/Attribute:priority/Value:2+' => 'Alta',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'Média',
-	'Class:UserRequest/Attribute:priority/Value:3+' => 'Média',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'Baixa',
-	'Class:UserRequest/Attribute:priority/Value:4+' => 'Baixa',
-	'Class:UserRequest/Attribute:urgency' => 'Urgência',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'Crítica',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => 'Crítica',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'Alta',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => 'Alta',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'Média',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => 'Média',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'Baixa',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Baixa',
-	'Class:UserRequest/Attribute:origin' => 'Origem',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Email',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoramento',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Monitoramento',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefone',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => 'Telefone',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Portal',
-	'Class:UserRequest/Attribute:approver_id' => 'Aprovador',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:approver_email' => 'Email aprovador',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Serviço',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Nome serviço',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nome Sub-categoria serviço',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Alerta vermelho',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Não',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Não',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Sim',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Sim',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Razão alerta',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Data atribuição',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Data resolução',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Última data pendente',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'Pendências acumuladas',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Prazo determinado TTO',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO passou',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO acima',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'Prazo determinado TTR',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR passou',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR acima',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Atraso resolução',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Código resolução',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistência',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'Assistência',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug corrigido',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'Bug corrigido',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparado',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'Hardware reparado',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Outros',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'Outros',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'Software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Atualização sistema',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'Atualização sistema',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Treinamento',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'Treinamento',
-	'Class:UserRequest/Attribute:solution' => 'Solução',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Razão pendência',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Solicitação principal',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref solicitação',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Problema principal',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problema',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Mudança principal',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref mudança',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Sub-solicitação',
-	'Class:UserRequest/Attribute:related_request_list+' => 'Todas as solicitações vinculadas a essa solicitação principal',
-	'Class:UserRequest/Attribute:public_log' => 'Log público',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'Satisfação do usuário',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Muito satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Muito satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Bastante satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Bastante satisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Bastante insatisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Bastante insatisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Muito insatisfeito',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Muito insatisfeito',
-	'Class:UserRequest/Attribute:user_comment' => 'Comentário usuário',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Atribuir',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-Atribuir',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Aprovar',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Rejeitar',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'Pendência',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Resolvido automaticamente',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Fechado automaticamente',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Marcar como resolvido',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Fechar esta solicitação',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-abrir',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Aguardar por aprovação',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Não é possível atribuir a solicitação principal para si mesmo',
-));
-
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Portal:TitleDetailsFor_Request' => 'Detalhes da solicitação',
-	'Portal:ButtonUpdate' => 'Atualizado',
-	'Portal:ButtonClose' => 'Fechado',
-	'Portal:ButtonReopen' => 'Re-aberto',
-	'Portal:ShowServices' => 'Catálogo dos serviços',
-	'Portal:SelectRequestType' => 'Selecione um tipo de solicitação',
-	'Portal:SelectServiceElementFrom_Service' => 'Selecione um serviço para %1$s',
-	'Portal:SelectRequestTemplate' => 'Selecione um modelo para %1$s',
-	'Portal:ListServices' => 'Lista dos serviços',
-	'Portal:TitleDetailsFor_Service' => 'Detalhes dos serviços',
-	'Portal:Button:CreateRequestFromService' => 'Criar uma solicitação para esse serviço',
-	'Portal:ListOpenRequests' => 'Lista solicitações abertas',
-	'Portal:UserRequest:MoreInfo' => 'Mais informações',
-	'Portal:Details-Service-Element' => 'Elementos do Serviço',
-	'Portal:NoClosedTicket' => 'Nenhuma solicitação fechada',
-	'Portal:NoService' => '',
-	'Portal:ListOpenProblems' => 'Problemas em curso',
-	'Portal:ShowProblem' => 'Problemas',
-	'Portal:ShowFaqs' => 'FAQs',
-	'Portal:NoOpenProblem' => 'Nenhum problema aberto',
-	'Portal:SelectLanguage' => "Alterar sua linguagem",
-	'Portal:LanguageChangedTo_Lang' => 'Linguagem alterada para',
-	'Portal:ChooseYourFavoriteLanguage' => 'Escolha sua linguagem favorita',
-	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
-));
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Menu:RequestManagement' => 'Gerenciamento Solicitações',
+	'Menu:RequestManagement+' => 'Gerenciamento Solicitações',
+	'Menu:RequestManagementProvider' => 'Solicitações provedoras',
+	'Menu:RequestManagementProvider+' => 'Solicitações provedoras',
+	'Menu:UserRequest:Provider' => 'Solicitações abertas transferidas para provedor',
+	'Menu:UserRequest:Provider+' => 'Solicitações abertas transferidas para provedor',
+	'Menu:UserRequest:Overview' => 'Visão geral',
+	'Menu:UserRequest:Overview+' => 'Visão geral',
+	'Menu:NewUserRequest' => 'Nova solicitação',
+	'Menu:NewUserRequest+' => 'Criar uma nova solicitação',
+	'Menu:SearchUserRequests' => 'Pesquisar por solicitação',
+	'Menu:SearchUserRequests+' => 'Pesquisar por solicitação',
+	'Menu:UserRequest:Shortcuts' => 'Atalho',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Solicitações abertas por mim',
+	'Menu:UserRequest:MyRequests+' => 'Solicitações abertas por mim (como agente)',
+	'Menu:UserRequest:MySupportRequests' => "Minhas solicitações de suporte",
+	'Menu:UserRequest:MySupportRequests+' => "Minhas solicitações de suporte",
+	'Menu:UserRequest:EscalatedRequests' => 'Hot requests',
+	'Menu:UserRequest:EscalatedRequests+' => 'Hot requests',
+	'Menu:UserRequest:OpenRequests' => 'Todas solicitações abertas',
+	'Menu:UserRequest:OpenRequests+' => 'Todas solicitações abertas',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Solicitações atribuidas a mim',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Solicitações dos últimos 14 dias (por tipo)',
+	'UI-RequestManagementOverview-Last-14-days' => 'Solicitações dos últimos 14 dias (por dia)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Solicitações abertas por status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Solicitações abertas por agente',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Solicitações abertas por tipo',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Solicitações abertas por organização',
+	'Class:UserRequest:KnownErrorList' => 'Erros conhecidos',
+	'Menu:UserRequest:MyWorkOrders' => 'Ordens de serviço atribuídas a mim',
+	'Menu:UserRequest:MyWorkOrders+' => 'Todas as Ordens de serviço atribuídos a min',
+	'Class:Problem:KnownProblemList' => 'Problemas conhecidos',
+));
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+//
+// Class: UserRequest
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:UserRequest' => 'Usuário solicitante',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Estado',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Nova',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'TTO escalado',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Atribuido',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'TTR escalado',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Aguardando aprovação',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Aprovado',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Rejeitado',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Pendente',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Resolvido',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Fechado',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Tipo solicitação',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incidente',
+	'Class:UserRequest/Attribute:request_type/Value:incident+' => 'Incidente',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
+	'Class:UserRequest/Attribute:impact' => 'Impacto',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Um departamento',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Um serviço',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Uma pessoa',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => 'Prioridade',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'Crítica',
+	'Class:UserRequest/Attribute:priority/Value:1+' => 'Crítica',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'Alta',
+	'Class:UserRequest/Attribute:priority/Value:2+' => 'Alta',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'Média',
+	'Class:UserRequest/Attribute:priority/Value:3+' => 'Média',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'Baixa',
+	'Class:UserRequest/Attribute:priority/Value:4+' => 'Baixa',
+	'Class:UserRequest/Attribute:urgency' => 'Urgência',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'Crítica',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => 'Crítica',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'Alta',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => 'Alta',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'Média',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => 'Média',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'Baixa',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => 'Baixa',
+	'Class:UserRequest/Attribute:origin' => 'Origem',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'Email',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'Email',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitoramento',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'Monitoramento',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefone',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => 'Telefone',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Portal',
+	'Class:UserRequest/Attribute:approver_id' => 'Aprovador',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => 'Email aprovador',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Serviço',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Nome serviço',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sub-categoria serviço',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nome Sub-categoria serviço',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Alerta vermelho',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Não',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'Não',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Sim',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'Sim',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Razão alerta',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Data atribuição',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Data resolução',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Última data pendente',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'Pendências acumuladas',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Prazo determinado TTO',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO passou',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA TTO acima',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'Prazo determinado TTR',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA TTR passou',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR acima',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Atraso resolução',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Código resolução',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Assistência',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => 'Assistência',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug corrigido',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'Bug corrigido',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparado',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'Hardware reparado',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Outros',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'Outros',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'Software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'Atualização sistema',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'Atualização sistema',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Treinamento',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => 'Treinamento',
+	'Class:UserRequest/Attribute:solution' => 'Solução',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Razão pendência',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Solicitação principal',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref solicitação',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Problema principal',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problema',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Mudança principal',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref mudança',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Sub-solicitação',
+	'Class:UserRequest/Attribute:related_request_list+' => 'Todas as solicitações vinculadas a essa solicitação principal',
+	'Class:UserRequest/Attribute:public_log' => 'Log público',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Satisfação do usuário',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Muito satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => 'Muito satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Bastante satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => 'Bastante satisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Bastante insatisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => 'Bastante insatisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Muito insatisfeito',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => 'Muito insatisfeito',
+	'Class:UserRequest/Attribute:user_comment' => 'Comentário usuário',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Atribuir',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Re-Atribuir',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Aprovar',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Rejeitar',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Pendência',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Resolvido automaticamente',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Fechado automaticamente',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Marcar como resolvido',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Fechar esta solicitação',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Re-abrir',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Aguardar por aprovação',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Não é possível atribuir a solicitação principal para si mesmo',
+));
+
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Portal:TitleDetailsFor_Request' => 'Detalhes da solicitação',
+	'Portal:ButtonUpdate' => 'Atualizado',
+	'Portal:ButtonClose' => 'Fechado',
+	'Portal:ButtonReopen' => 'Re-aberto',
+	'Portal:ShowServices' => 'Catálogo dos serviços',
+	'Portal:SelectRequestType' => 'Selecione um tipo de solicitação',
+	'Portal:SelectServiceElementFrom_Service' => 'Selecione um serviço para %1$s',
+	'Portal:SelectRequestTemplate' => 'Selecione um modelo para %1$s',
+	'Portal:ListServices' => 'Lista dos serviços',
+	'Portal:TitleDetailsFor_Service' => 'Detalhes dos serviços',
+	'Portal:Button:CreateRequestFromService' => 'Criar uma solicitação para esse serviço',
+	'Portal:ListOpenRequests' => 'Lista solicitações abertas',
+	'Portal:UserRequest:MoreInfo' => 'Mais informações',
+	'Portal:Details-Service-Element' => 'Elementos do Serviço',
+	'Portal:NoClosedTicket' => 'Nenhuma solicitação fechada',
+	'Portal:NoService' => '',
+	'Portal:ListOpenProblems' => 'Problemas em curso',
+	'Portal:ShowProblem' => 'Problemas',
+	'Portal:ShowFaqs' => 'FAQs',
+	'Portal:NoOpenProblem' => 'Nenhum problema aberto',
+	'Portal:SelectLanguage' => "Alterar sua linguagem",
+	'Portal:LanguageChangedTo_Lang' => 'Linguagem alterada para',
+	'Portal:ChooseYourFavoriteLanguage' => 'Escolha sua linguagem favorita',
+	'Tickets:Related:OpenIncidents' => 'Open incidents~~',
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets~~',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Cascade the resolution to child requests (ev_autoresolve), and align the following characteristics of the request: service, team, agent, resolution info~~',
+));
diff --git a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
index 1ca916512..4384b4058 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php
@@ -1,528 +1,528 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('EN US', 'English', 'English', array(
-'Menu:ServiceManagement' => 'Service Management',
-'Menu:ServiceManagement+' => 'Service Management Overview',
-'Menu:Service:Overview' => 'Overview',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
-'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
-
-'Menu:ProviderContract' => 'Provider contracts',
-'Menu:ProviderContract+' => 'Provider contracts',
-'Menu:CustomerContract' => 'Customer contracts',
-'Menu:CustomerContract+' => 'Customer contracts',
-'Menu:ServiceSubcategory' => 'Service subcategories',
-'Menu:ServiceSubcategory+' => 'Service subcategories',
-'Menu:Service' => 'Services',
-'Menu:Service+' => 'Services',
-'Menu:ServiceElement' => 'Sevice elements',
-'Menu:ServiceElement+' => 'Sevice elements',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => 'Service Level Agreements',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => 'Service Level Targets',
-'Menu:DeliveryModel' => 'Delivery models',
-'Menu:DeliveryModel+' => 'Delivery models',
-
-));
-
-
-/*
-	'UI:ServiceManagementMenu' => 'Gestion des Services',
-	'UI:ServiceManagementMenu+' => 'Gestion des Services',
-	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
-*/
-
-//
-// Class: Organization
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-));
-
-
-
-//
-// Class: ContractType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ContractType' => 'Contract Type',
-	'Class:ContractType+' => '',
-));
-
-
-//
-// Class: Contract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Contract' => 'Contract',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Name',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => 'Organization',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => 'Organization Name',
-	'Class:Contract/Attribute:organization_name+' => 'Common name',
-	'Class:Contract/Attribute:contacts_list' => 'Contacts',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract',
-	'Class:Contract/Attribute:documents_list' => 'Documents',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract',
-	'Class:Contract/Attribute:description' => 'Description',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Start date',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'End date',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Cost',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Cost Currency',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:contracttype_id' => 'Contract type',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Billing frequency',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'Provider',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'Provider Name',
-	'Class:Contract/Attribute:provider_name+' => '',
-	'Class:Contract/Attribute:status' => 'Status',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => 'implementation',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
-	'Class:Contract/Attribute:status/Value:production' => 'production',
-	'Class:Contract/Attribute:status/Value:production+' => 'production',
-	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
-	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: CustomerContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CustomerContract' => 'Customer Contract',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'Services',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract',
-	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract',
-	'Class:CustomerContract/Attribute:providercontracts_list' => 'Provider contracts',
-	'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ProviderContract' => 'Provider Contract',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-));
-
-//
-// Class: lnkContactToContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToContract' => 'Link Contact / Contract',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkContractToDocument
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContractToDocument' => 'Link Contract / Document',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Document',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: ServiceFamily
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ServiceFamily' => 'Service Family',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => 'Name',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon',
-	'Class:ServiceFamily/Attribute:icon+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'Services',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Service' => 'Service',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => 'Name',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Provider',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Provider Name',
-	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:description' => 'Description',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => 'Documents',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service',
-	'Class:Service/Attribute:contacts_list' => 'Contacts',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
-	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
-	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'production',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon',
-	'Class:Service/Attribute:icon+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service',
-));
-
-//
-// Class: lnkDocumentToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToService' => 'Link Document / Service',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToService' => 'Link Contact / Service',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'Service',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ServiceSubcategory' => 'Service Subcategory',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Name',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Description',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Service Name',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
-	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name',
-	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Name',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => 'description',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Organization',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:organization_name' => 'Organization Name',
-	'Class:SLA/Attribute:organization_name+' => '',
-	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA',
-	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Name',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => 'Priority',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => 'critical',
-	'Class:SLT/Attribute:priority/Value:1+' => 'critical',
-	'Class:SLT/Attribute:priority/Value:2' => 'high',
-	'Class:SLT/Attribute:priority/Value:2+' => 'high',
-	'Class:SLT/Attribute:priority/Value:3' => 'medium',
-	'Class:SLT/Attribute:priority/Value:3+' => 'medium',
-	'Class:SLT/Attribute:priority/Value:4' => 'low',
-	'Class:SLT/Attribute:priority/Value:4+' => 'low',
-	'Class:SLT/Attribute:request_type' => 'Request type',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
-	'Class:SLT/Attribute:metric' => 'Metric',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
-	'Class:SLT/Attribute:value' => 'Value',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => 'Unit',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => 'hours',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'hours',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes',
-));
-
-//
-// Class: lnkSLAToSLT
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkCustomerContractToProviderContract' => 'Link Customer Contract / Provider Contract',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Customer contract Name',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToFunctionalCI
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI',
-	'Class:lnkCustomerContractToFunctionalCI+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Customer contract Name',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: DeliveryModel
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DeliveryModel' => 'Delivery Model',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Name',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name',
-	'Class:DeliveryModel/Attribute:organization_name+' => '',
-	'Class:DeliveryModel/Attribute:description' => 'Description',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Customers',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model',
-));
-
-//
-// Class: lnkDeliveryModelToContact
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('EN US', 'English', 'English', array(
+'Menu:ServiceManagement' => 'Service Management',
+'Menu:ServiceManagement+' => 'Service Management Overview',
+'Menu:Service:Overview' => 'Overview',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
+
+'Menu:ProviderContract' => 'Provider contracts',
+'Menu:ProviderContract+' => 'Provider contracts',
+'Menu:CustomerContract' => 'Customer contracts',
+'Menu:CustomerContract+' => 'Customer contracts',
+'Menu:ServiceSubcategory' => 'Service subcategories',
+'Menu:ServiceSubcategory+' => 'Service subcategories',
+'Menu:Service' => 'Services',
+'Menu:Service+' => 'Services',
+'Menu:ServiceElement' => 'Sevice elements',
+'Menu:ServiceElement+' => 'Sevice elements',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Service Level Agreements',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Service Level Targets',
+'Menu:DeliveryModel' => 'Delivery models',
+'Menu:DeliveryModel+' => 'Delivery models',
+
+));
+
+
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
+//
+// Class: Organization
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+));
+
+
+
+//
+// Class: ContractType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ContractType' => 'Contract Type',
+	'Class:ContractType+' => '',
+));
+
+
+//
+// Class: Contract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Contract' => 'Contract',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Name',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Organization',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Organization Name',
+	'Class:Contract/Attribute:organization_name+' => 'Common name',
+	'Class:Contract/Attribute:contacts_list' => 'Contacts',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract',
+	'Class:Contract/Attribute:documents_list' => 'Documents',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract',
+	'Class:Contract/Attribute:description' => 'Description',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Start date',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'End date',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Cost',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Cost Currency',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Contract type',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Billing frequency',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Provider',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Provider Name',
+	'Class:Contract/Attribute:provider_name+' => '',
+	'Class:Contract/Attribute:status' => 'Status',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'implementation',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
+	'Class:Contract/Attribute:status/Value:production' => 'production',
+	'Class:Contract/Attribute:status/Value:production+' => 'production',
+	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
+	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CustomerContract' => 'Customer Contract',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Services',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract',
+	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract',
+	'Class:CustomerContract/Attribute:providercontracts_list' => 'Provider contracts',
+	'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ProviderContract' => 'Provider Contract',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContactToContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToContract' => 'Link Contact / Contract',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkContractToDocument
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContractToDocument' => 'Link Contract / Document',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Document',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: ServiceFamily
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ServiceFamily' => 'Service Family',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Name',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon',
+	'Class:ServiceFamily/Attribute:icon+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Services',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Service' => 'Service',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Name',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Provider',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Provider Name',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:description' => 'Description',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Documents',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service',
+	'Class:Service/Attribute:contacts_list' => 'Contacts',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
+	'Class:Service/Attribute:status' => 'Status',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'production',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:icon' => 'Icon',
+	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service',
+));
+
+//
+// Class: lnkDocumentToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToService' => 'Link Document / Service',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToService' => 'Link Contact / Service',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Service',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ServiceSubcategory' => 'Service Subcategory',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Name',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Description',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Service Name',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
+	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name',
+	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Name',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'description',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Organization',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Organization Name',
+	'Class:SLA/Attribute:organization_name+' => '',
+	'Class:SLA/Attribute:slts_list' => 'SLTs',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA',
+	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Name',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Priority',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'critical',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical',
+	'Class:SLT/Attribute:priority/Value:2' => 'high',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high',
+	'Class:SLT/Attribute:priority/Value:3' => 'medium',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium',
+	'Class:SLT/Attribute:priority/Value:4' => 'low',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low',
+	'Class:SLT/Attribute:request_type' => 'Request type',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
+	'Class:SLT/Attribute:metric' => 'Metric',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
+	'Class:SLT/Attribute:value' => 'Value',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Unit',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'hours',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes',
+));
+
+//
+// Class: lnkSLAToSLT
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkCustomerContractToProviderContract' => 'Link Customer Contract / Provider Contract',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Customer contract Name',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToFunctionalCI
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI',
+	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Customer contract Name',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: DeliveryModel
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DeliveryModel' => 'Delivery Model',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Name',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name',
+	'Class:DeliveryModel/Attribute:organization_name+' => '',
+	'Class:DeliveryModel/Attribute:description' => 'Description',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Customers',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model',
+));
+
+//
+// Class: lnkDeliveryModelToContact
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+));
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/main.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/main.itop-service-mgmt-provider.php
index 3a23acb41..66839932a 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/main.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/main.itop-service-mgmt-provider.php
@@ -1,20 +1,20 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
index 96fb6bf26..1459d226a 100755
--- a/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
@@ -1,97 +1,97 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt-provider/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Service Management for Service Providers',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-		        'itop-tickets/2.0.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-		'installer' => 'ServiceMgmtProviderInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-service-mgmt-provider.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-service-mgmt.xml',
-		),
-		'data.sample' => array(
-			'data.sample.organizations.xml',
-			'data.sample.contracts.xml',
-			'data.sample.servicefamilies.xml',
-			'data.sample.services.xml',
-			'data.sample.serviceelements.xml',
-			'data.sample.sla.xml',
-			'data.sample.slt.xml',
-			'data.sample.sltsla.xml',
-	//		'data.sample.coveragewindows.xml',
-			'data.sample.contractservice.xml',
-	//		'data.sample.deliverymodel.xml',
-			'data.sample.deliverymodelcontact.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-if (!class_exists('ServiceMgmtProviderInstaller'))
-{
-	// Module installation handler
-	//
-	class ServiceMgmtProviderInstaller extends ModuleInstallerAPI
-	{
-		public static function BeforeWritingConfig(Config $oConfiguration)
-		{
-			// If you want to override/force some configuration values, do it here
-			return $oConfiguration;
-		}
-
-		/**
-		 * Handler called before creating or upgrading the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			if (strlen($sPreviousVersion) > 0)
-			{
-				// If you want to migrate data from one format to another, do it here
-				self::RenameClassInDB('ServiceFamilly', 'ServiceFamily');
-
-				self::RenameEnumValueInDB('SLT', 'request_type', 'servicerequest', 'service_request');
-			}
-		}
-	
-		/**
-		 * Handler called after the creation/update of the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-		}
-	}
-}
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-service-mgmt-provider/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Service Management for Service Providers',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+		        'itop-tickets/2.0.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+		'installer' => 'ServiceMgmtProviderInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-service-mgmt-provider.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-service-mgmt.xml',
+		),
+		'data.sample' => array(
+			'data.sample.organizations.xml',
+			'data.sample.contracts.xml',
+			'data.sample.servicefamilies.xml',
+			'data.sample.services.xml',
+			'data.sample.serviceelements.xml',
+			'data.sample.sla.xml',
+			'data.sample.slt.xml',
+			'data.sample.sltsla.xml',
+	//		'data.sample.coveragewindows.xml',
+			'data.sample.contractservice.xml',
+	//		'data.sample.deliverymodel.xml',
+			'data.sample.deliverymodelcontact.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+if (!class_exists('ServiceMgmtProviderInstaller'))
+{
+	// Module installation handler
+	//
+	class ServiceMgmtProviderInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if (strlen($sPreviousVersion) > 0)
+			{
+				// If you want to migrate data from one format to another, do it here
+				self::RenameClassInDB('ServiceFamilly', 'ServiceFamily');
+
+				self::RenameEnumValueInDB('SLT', 'request_type', 'servicerequest', 'service_request');
+			}
+		}
+	
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+		}
+	}
+}
diff --git a/datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php
index c7ce25911..f38d3bc1f 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/nl.dict.itop-service-mgmt-provider.php
@@ -1,542 +1,542 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Menu:ServiceManagement' => 'Service Management',
-	'Menu:ServiceManagement+' => 'Service Management Overzicht',
-	'Menu:Service:Overview' => 'Overzicht',
-	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracten per service level',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracten met status',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracten die in minder dan 30 dagen eindigen',
-	
-	'Menu:ProviderContract' => 'Leveranciers contracten',
-	'Menu:ProviderContract+' => 'Leveranciers contracten',
-	'Menu:CustomerContract' => 'Klant contracten',
-	'Menu:CustomerContract+' => 'Klant contracten',
-	'Menu:ServiceSubcategory' => 'Dienst subcategorieën',
-	'Menu:ServiceSubcategory+' => 'Dienst subcategorieën',
-	'Menu:Service' => 'Diensten',
-	'Menu:Service+' => 'Diensten',
-	'Menu:ServiceElement' => 'Dienst elementen',
-	'Menu:ServiceElement+' => 'Dienst elementen',
-	'Menu:SLA' => 'SLAs',
-	'Menu:SLA+' => 'Service Level Agreements',
-	'Menu:SLT' => 'SLTs',
-	'Menu:SLT+' => 'Service Level Targets',
-	'Menu:DeliveryModel' => 'Delivery models',
-	'Menu:DeliveryModel+' => 'Delivery models',
-));
-
-
-/*
-	'UI:ServiceManagementMenu' => 'Gestion des Services',
-	'UI:ServiceManagementMenu+' => 'Gestion des Services',
-	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
-*/
-
-//
-// Class: Organization
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-));
-
-
-
-//
-// Class: ContractType
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ContractType' => 'Contract Type',
-	'Class:ContractType+' => '',
-));
-
-
-//
-// Class: Contract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Contract' => 'Contract',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Naam',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => 'Klant',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => 'Klant Naam',
-	'Class:Contract/Attribute:organization_name+' => 'Gemeenschappelijke naam',
-	'Class:Contract/Attribute:contacts_list' => 'Contacten',
-	'Class:Contract/Attribute:contacts_list+' => 'Alle contacten voor dit klant contract',
-	'Class:Contract/Attribute:documents_list' => 'Documenten',
-	'Class:Contract/Attribute:documents_list+' => 'Alle documenten voor dit klant contract',
-	'Class:Contract/Attribute:description' => 'Omschrijving',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Start datum',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Eind datum',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Kosten',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Valuta',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:contracttype_id' => 'Contract type',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Facturering frequentie',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Kost eenheid',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'Leverancier',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'Leverancier Naam',
-	'Class:Contract/Attribute:provider_name+' => 'Gemeenschappelijke naam',
-	'Class:Contract/Attribute:status' => 'Status',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => 'implementatie',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'implementatie',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'overbodig',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'overbodig',
-	'Class:Contract/Attribute:status/Value:production' => 'productie',
-	'Class:Contract/Attribute:status/Value:production+' => 'productie',
-	'Class:Contract/Attribute:finalclass' => 'Type',
-	'Class:Contract/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CustomerContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CustomerContract' => 'Klant Contract',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'Diensten',
-	'Class:CustomerContract/Attribute:services_list+' => 'Alle diensten die zijn aangeschaft voor dit contract',
-	'Class:ProviderContract' => 'Leveranciers Contract',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Alle configuratie items die gedekt zijn door dit leveranciers contract',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ProviderContract' => 'Leveranciers Contract',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Alle configuratie items die gedekt zijn door dit leveranciers contract',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-	'Class:ProviderContract/Attribute:coverage' => 'Dienst uren',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-));
-
-//
-// Class: lnkContactToContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToContract' => 'Link Contact / Contract',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Naam',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Naam',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkContractToDocument
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContractToDocument' => 'Link Contract / Document',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Naam',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Document',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Naam',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Naam',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Naam',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: ServiceFamily
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ServiceFamily' => 'Dienst Familie',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => 'Naam',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
-	'Class:ServiceFamily/Attribute:icon+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'Diensten',
-	'Class:ServiceFamily/Attribute:services_list+' => 'Alle diensten in deze categorie',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Service' => 'Dienst',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => 'Naam',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Leverancier',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Leverancier Naam',
-	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:servicefamily_id' => 'Service Familie',
-	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:servicefamily_name' => 'Service Familie Naam',
-	'Class:Service/Attribute:servicefamily_name+' => '',
-	'Class:Service/Attribute:description' => 'Omschrijving',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => 'Documenten',
-	'Class:Service/Attribute:documents_list+' => 'Alle documenten die gelinkt zijn aan deze dienst',
-	'Class:Service/Attribute:contacts_list' => 'Contacten',
-	'Class:Service/Attribute:contacts_list+' => 'Alle contacten voor deze dienst',
-	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementatie',
-	'Class:Service/Attribute:status/Value:implementation+' => 'implementatie',
-	'Class:Service/Attribute:status/Value:obsolete' => 'overbodig',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'productie',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon~~',
-	'Class:Service/Attribute:icon+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Klant contracten',
-	'Class:Service/Attribute:customercontracts_list+' => 'Alle klanten contracten die deze dienst hebben aangeschaft',
-	'Class:Service/Attribute:providercontracts_list' => 'Leveranciers contracten',
-	'Class:Service/Attribute:providercontracts_list+' => 'Alle leveranciers contracten die ondersteuning bieden voor deze dienst',
-	'Class:Service/Attribute:functionalcis_list' => 'Afhankelijk van CIs',
-	'Class:Service/Attribute:functionalcis_list+' => 'Alle configuratie items die gebruikt worden voor het beschikbaarheid van deze dienst',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Dienst subcategorieën',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Alle subcategorieën van deze dienst',
-));
-
-//
-// Class: lnkDocumentToService
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDocumentToService' => 'Link Document / Dienst',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Dienst',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Dienst Naam',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Naam',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToService
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToService' => 'Link Contact / Dienst',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'Dienst',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'Dienst Naam',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Naam',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ServiceSubcategory' => 'Dienst Subcategorie',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Naam',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Omschrijving',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Dienst',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Dienst naam',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementatie',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementatie',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'overbodig',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'overbodig',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'productie',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'productie',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Verzoek type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Naam',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => 'omschrijving',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Provider',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:organization_name' => 'Leveranciers Naam',
-	'Class:SLA/Attribute:organization_name+' => 'Gemeenschappelijke naam',
-	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'Alle service level doelstellingen voor deze SLA',
-	'Class:SLA/Attribute:customercontracts_list' => 'Klant contracten',
-	'Class:SLA/Attribute:customercontracts_list+' => 'Alle klant contracten die gebruik maken van deze SLA',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Naam',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => 'Prioriteit',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => 'kritisch',
-	'Class:SLT/Attribute:priority/Value:1+' => 'kritisch',
-	'Class:SLT/Attribute:priority/Value:2' => 'hoog',
-	'Class:SLT/Attribute:priority/Value:2+' => 'hoog',
-	'Class:SLT/Attribute:priority/Value:3' => 'normaal',
-	'Class:SLT/Attribute:priority/Value:3+' => 'normaal',
-	'Class:SLT/Attribute:priority/Value:4' => 'laag',
-	'Class:SLT/Attribute:priority/Value:4+' => 'laag',
-	'Class:SLT/Attribute:request_type' => 'Verzoek type',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
-	'Class:SLT/Attribute:metric' => 'Metric',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
-	'Class:SLT/Attribute:value' => 'Waarde',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => 'Eenheid',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => 'uren',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'uren',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minuten',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'minuten',
-));
-
-//
-// Class: lnkSLAToSLT
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Naam',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Naam',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToService
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Dienst',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Klant contract',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Klant contract Name',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Dienst',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Dienst Naam',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Naam',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToProviderContract
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkCustomerContractToProviderContract' => 'Link Klant Contract / Leveranciers Contract',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Leveranciers contract',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Klant contract Naam',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Leveranciers contract',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Leveranciers contract Naam',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToFunctionalCI
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkCustomerContractToFunctionalCI' => 'Link Klant Contract / FunctioneleCI',
-	'Class:lnkCustomerContractToFunctionalCI+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Klant contract',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Klant contract Naam',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'CI Naam',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: DeliveryModel
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:DeliveryModel' => 'Delivery Model',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Naam',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organisatie',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organisatie Naam',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Gemeenschappelijke naam',
-	'Class:DeliveryModel/Attribute:description' => 'Omschrijving',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacten',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'Alle contacten (Teams en Personen) voor dit delivery model',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Klanten',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'Alle klanten die gebruik maken van dit delivering model',
-));
-
-//
-// Class: lnkDeliveryModelToContact
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model naam',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact naam',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Rol',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Rol naam',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
-	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
-	'Class:CustomerContract/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)~~',
-	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name~~',
-	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Menu:ServiceManagement' => 'Service Management',
+	'Menu:ServiceManagement+' => 'Service Management Overzicht',
+	'Menu:Service:Overview' => 'Overzicht',
+	'Menu:Service:Overview+' => '',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracten per service level',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracten met status',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracten die in minder dan 30 dagen eindigen',
+	
+	'Menu:ProviderContract' => 'Leveranciers contracten',
+	'Menu:ProviderContract+' => 'Leveranciers contracten',
+	'Menu:CustomerContract' => 'Klant contracten',
+	'Menu:CustomerContract+' => 'Klant contracten',
+	'Menu:ServiceSubcategory' => 'Dienst subcategorieën',
+	'Menu:ServiceSubcategory+' => 'Dienst subcategorieën',
+	'Menu:Service' => 'Diensten',
+	'Menu:Service+' => 'Diensten',
+	'Menu:ServiceElement' => 'Dienst elementen',
+	'Menu:ServiceElement+' => 'Dienst elementen',
+	'Menu:SLA' => 'SLAs',
+	'Menu:SLA+' => 'Service Level Agreements',
+	'Menu:SLT' => 'SLTs',
+	'Menu:SLT+' => 'Service Level Targets',
+	'Menu:DeliveryModel' => 'Delivery models',
+	'Menu:DeliveryModel+' => 'Delivery models',
+));
+
+
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
+//
+// Class: Organization
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+));
+
+
+
+//
+// Class: ContractType
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ContractType' => 'Contract Type',
+	'Class:ContractType+' => '',
+));
+
+
+//
+// Class: Contract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Contract' => 'Contract',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Naam',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Klant',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Klant Naam',
+	'Class:Contract/Attribute:organization_name+' => 'Gemeenschappelijke naam',
+	'Class:Contract/Attribute:contacts_list' => 'Contacten',
+	'Class:Contract/Attribute:contacts_list+' => 'Alle contacten voor dit klant contract',
+	'Class:Contract/Attribute:documents_list' => 'Documenten',
+	'Class:Contract/Attribute:documents_list+' => 'Alle documenten voor dit klant contract',
+	'Class:Contract/Attribute:description' => 'Omschrijving',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Start datum',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Eind datum',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Kosten',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Valuta',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Contract type',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Facturering frequentie',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Kost eenheid',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Leverancier',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Leverancier Naam',
+	'Class:Contract/Attribute:provider_name+' => 'Gemeenschappelijke naam',
+	'Class:Contract/Attribute:status' => 'Status',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'implementatie',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementatie',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'overbodig',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'overbodig',
+	'Class:Contract/Attribute:status/Value:production' => 'productie',
+	'Class:Contract/Attribute:status/Value:production+' => 'productie',
+	'Class:Contract/Attribute:finalclass' => 'Type',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CustomerContract' => 'Klant Contract',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Diensten',
+	'Class:CustomerContract/Attribute:services_list+' => 'Alle diensten die zijn aangeschaft voor dit contract',
+	'Class:ProviderContract' => 'Leveranciers Contract',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Alle configuratie items die gedekt zijn door dit leveranciers contract',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ProviderContract' => 'Leveranciers Contract',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Alle configuratie items die gedekt zijn door dit leveranciers contract',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Dienst uren',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContactToContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToContract' => 'Link Contact / Contract',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Naam',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Naam',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkContractToDocument
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContractToDocument' => 'Link Contract / Document',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Naam',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Document',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Naam',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Naam',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Naam',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: ServiceFamily
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ServiceFamily' => 'Dienst Familie',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Naam',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:icon+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Diensten',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Alle diensten in deze categorie',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Service' => 'Dienst',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Naam',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Leverancier',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Leverancier Naam',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:servicefamily_id' => 'Service Familie',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'Service Familie Naam',
+	'Class:Service/Attribute:servicefamily_name+' => '',
+	'Class:Service/Attribute:description' => 'Omschrijving',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Documenten',
+	'Class:Service/Attribute:documents_list+' => 'Alle documenten die gelinkt zijn aan deze dienst',
+	'Class:Service/Attribute:contacts_list' => 'Contacten',
+	'Class:Service/Attribute:contacts_list+' => 'Alle contacten voor deze dienst',
+	'Class:Service/Attribute:status' => 'Status',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementatie',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementatie',
+	'Class:Service/Attribute:status/Value:obsolete' => 'overbodig',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'productie',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Klant contracten',
+	'Class:Service/Attribute:customercontracts_list+' => 'Alle klanten contracten die deze dienst hebben aangeschaft',
+	'Class:Service/Attribute:providercontracts_list' => 'Leveranciers contracten',
+	'Class:Service/Attribute:providercontracts_list+' => 'Alle leveranciers contracten die ondersteuning bieden voor deze dienst',
+	'Class:Service/Attribute:functionalcis_list' => 'Afhankelijk van CIs',
+	'Class:Service/Attribute:functionalcis_list+' => 'Alle configuratie items die gebruikt worden voor het beschikbaarheid van deze dienst',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Dienst subcategorieën',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Alle subcategorieën van deze dienst',
+));
+
+//
+// Class: lnkDocumentToService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDocumentToService' => 'Link Document / Dienst',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Dienst',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Dienst Naam',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Naam',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToService' => 'Link Contact / Dienst',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Dienst',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Dienst Naam',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Naam',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ServiceSubcategory' => 'Dienst Subcategorie',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Naam',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Omschrijving',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Dienst',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Dienst naam',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementatie',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementatie',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'overbodig',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'overbodig',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'productie',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'productie',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Verzoek type',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Naam',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'omschrijving',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Provider',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Leveranciers Naam',
+	'Class:SLA/Attribute:organization_name+' => 'Gemeenschappelijke naam',
+	'Class:SLA/Attribute:slts_list' => 'SLTs',
+	'Class:SLA/Attribute:slts_list+' => 'Alle service level doelstellingen voor deze SLA',
+	'Class:SLA/Attribute:customercontracts_list' => 'Klant contracten',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Alle klant contracten die gebruik maken van deze SLA',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Naam',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Prioriteit',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'kritisch',
+	'Class:SLT/Attribute:priority/Value:1+' => 'kritisch',
+	'Class:SLT/Attribute:priority/Value:2' => 'hoog',
+	'Class:SLT/Attribute:priority/Value:2+' => 'hoog',
+	'Class:SLT/Attribute:priority/Value:3' => 'normaal',
+	'Class:SLT/Attribute:priority/Value:3+' => 'normaal',
+	'Class:SLT/Attribute:priority/Value:4' => 'laag',
+	'Class:SLT/Attribute:priority/Value:4+' => 'laag',
+	'Class:SLT/Attribute:request_type' => 'Verzoek type',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
+	'Class:SLT/Attribute:metric' => 'Metric',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
+	'Class:SLT/Attribute:value' => 'Waarde',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Eenheid',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'uren',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'uren',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minuten',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minuten',
+));
+
+//
+// Class: lnkSLAToSLT
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Naam',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Naam',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Dienst',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Klant contract',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Klant contract Name',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Dienst',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Dienst Naam',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Naam',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkCustomerContractToProviderContract' => 'Link Klant Contract / Leveranciers Contract',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Leveranciers contract',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Klant contract Naam',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Leveranciers contract',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Leveranciers contract Naam',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToFunctionalCI
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkCustomerContractToFunctionalCI' => 'Link Klant Contract / FunctioneleCI',
+	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Klant contract',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Klant contract Naam',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'CI Naam',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: DeliveryModel
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:DeliveryModel' => 'Delivery Model',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Naam',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organisatie',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organisatie Naam',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Gemeenschappelijke naam',
+	'Class:DeliveryModel/Attribute:description' => 'Omschrijving',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacten',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Alle contacten (Teams en Personen) voor dit delivery model',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Klanten',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Alle klanten die gebruik maken van dit delivering model',
+));
+
+//
+// Class: lnkDeliveryModelToContact
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model naam',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact naam',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Rol',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Rol naam',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:CustomerContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract~~',
+	'Class:CustomerContract/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:CustomerContract/Attribute:providercontracts_list+' => 'All the provider contracts to deliver the services for this contract (underpinning contract)~~',
+	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name~~',
+	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php b/datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php
index e3003819d..4a0ac45d6 100644
--- a/datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/pt_br.dict.itop-service-mgmt-provider.php
@@ -1,535 +1,535 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-'Menu:ServiceManagement' => 'Gerenciamento Serviços',
-'Menu:ServiceManagement+' => 'Gerenciamento Serviços',
-'Menu:Service:Overview' => 'Visão geral',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
-'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por status',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos terminando em menos de 30 dias',
-
-'Menu:ProviderContract' => 'Contratos Provedores(as)',
-'Menu:ProviderContract+' => 'Contratos Provedores(as)',
-'Menu:CustomerContract' => 'Contratos Clientes',
-'Menu:CustomerContract+' => 'Contratos Clientes',
-'Menu:ServiceSubcategory' => 'Sub-categorias serviços',
-'Menu:ServiceSubcategory+' => 'Sub-categorias serviços',
-'Menu:Service' => 'Serviços',
-'Menu:Service+' => 'Serviços',
-'Menu:ServiceElement' => 'Elementos seviços',
-'Menu:ServiceElement+' => 'Elementos seviços',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => 'Lista Nível de Serviço Acordados',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => 'Lista Nível de Metas de Serviço',
-'Menu:DeliveryModel' => 'Modelos entrega',
-'Menu:DeliveryModel+' => 'Modelos entrega',
-
-));
-
-
-/*
-	'UI:ServiceManagementMenu' => 'Gestion des Services',
-	'UI:ServiceManagementMenu+' => 'Gestion des Services',
-	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
-*/
-
-//
-// Class: Organization
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-));
-
-
-
-//
-// Class: ContractType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ContractType' => 'Tipo contrato',
-	'Class:ContractType+' => '',
-));
-
-
-//
-// Class: Contract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Contract' => 'Contrato',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Nome',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => 'Organização',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => 'Nome organização',
-	'Class:Contract/Attribute:organization_name+' => 'Nome comum',
-	'Class:Contract/Attribute:contacts_list' => 'Contatos',
-	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos para este contrato com o cliente',
-	'Class:Contract/Attribute:documents_list' => 'Documentos',
-	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos para este contrato com o cliente',
-	'Class:Contract/Attribute:description' => 'Descrição',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Data início',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Data final',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Valor',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Valor atual',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dólares',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:contracttype_id' => 'Tipo contrato',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => 'Nome tipo contrato',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Frequência pagamento',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Valor unitário',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'Provedor(a)',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'Nome provedor(a)',
-	'Class:Contract/Attribute:provider_name+' => '',
-	'Class:Contract/Attribute:status' => 'Estado',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:Contract/Attribute:status/Value:production' => 'Produção',
-	'Class:Contract/Attribute:status/Value:production+' => 'Produção',
-	'Class:Contract/Attribute:finalclass' => 'Tipo contrato',
-	'Class:Contract/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CustomerContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CustomerContract' => 'Contrato cliente',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'Serviços',
-	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para o presente contrato',
-	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:CustomerContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração que são utilizados para a prestação deste serviço',
-	'Class:CustomerContract/Attribute:providercontracts_list' => 'Contrato provedor(a)',
-	'Class:CustomerContract/Attribute:providercontracts_list+' => 'Todos contratos para suporte para esse serviço',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ProviderContract' => 'Contrato provedor(a)',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração abrangidos para esse contrato',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'SLA',
-	'Class:ProviderContract/Attribute:coverage' => 'Horas de serviço',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-));
-
-//
-// Class: lnkContactToContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToContract' => 'Link Contato / Contrato',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Nome contrato',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkContractToDocument
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nome contrato',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Documento',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Nome documento',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: ServiceFamily
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ServiceFamily' => 'Família serviços',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:id' => 'Id',
-	'Class:ServiceFamily/Attribute:id+' => '',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => 'Nome',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
-	'Class:ServiceFamily/Attribute:icon+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'Serviços',
-	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços para essa categoria',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Service' => 'Serviço',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => 'Nome',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Organização',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Nome',
-	'Class:Service/Attribute:organization_name+' => 'Nome comum',
-	'Class:Service/Attribute:servicefamily_id' => 'Família serviço',
-	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:servicefamily_name' => 'Nome família serviço',
-	'Class:Service/Attribute:servicefamily_name+' => 'Nome família serviço',
-	'Class:Service/Attribute:description' => 'Descrição',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => 'Documentos',
-	'Class:Service/Attribute:documents_list+' => 'Todos documentos vinculados com o serviço',
-	'Class:Service/Attribute:contacts_list' => 'Contatos',
-	'Class:Service/Attribute:contacts_list+' => 'Todos contatos com o serviço',
-	'Class:Service/Attribute:status' => 'Estado',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:Service/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'Produção',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon~~',
-	'Class:Service/Attribute:icon+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Contratos clientes',
-	'Class:Service/Attribute:customercontracts_list+' => 'Todos contratos de clientes que contrataram esse serviço',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Sub-categorias serviço',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as sub-categorias para esse serviço',
-));
-
-//
-// Class: lnkDocumentToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToService' => 'Link Contato / Serviço',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ServiceSubcategory' => 'Sub-categoria serviço',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Descrição',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Serviço',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Nome serviço',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:ServiceSubcategory/Attribute:status' => 'Estado',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produção',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Produção',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo solicitação',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incidente',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Nome',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => 'Descrição',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Organização',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:organization_name' => 'Nome organização',
-	'Class:SLA/Attribute:organization_name+' => '',
-	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'Todos os SLTs para essa SLA',
-	'Class:SLA/Attribute:customercontracts_list' => 'Contratos clientes',
-	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os contratos de clientes utilizando essa SLA',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Nome',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => 'Prioridade',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => 'Crítica',
-	'Class:SLT/Attribute:priority/Value:1+' => 'Crítica',
-	'Class:SLT/Attribute:priority/Value:2' => 'Alta',
-	'Class:SLT/Attribute:priority/Value:2+' => 'Alta',
-	'Class:SLT/Attribute:priority/Value:3' => 'Média',
-	'Class:SLT/Attribute:priority/Value:3+' => 'Média',
-	'Class:SLT/Attribute:priority/Value:4' => 'Baixa',
-	'Class:SLT/Attribute:priority/Value:4+' => 'Baixa',
-	'Class:SLT/Attribute:request_type' => 'Tipo solicitação',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidente',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incidente',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
-	'Class:SLT/Attribute:metric' => 'Métrica',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
-	'Class:SLT/Attribute:value' => 'Valor',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => 'Unidade',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => 'Horas',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'Minutos',
-));
-
-//
-// Class: lnkSLAToSLT
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nome SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'Nome SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToService' => 'Link Contrato cliente / Serviço',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato cliente',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nome contrato cliente',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nome SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToProviderContract' => 'Link Contrato cliente / Contrato provedor(a)',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrato cliente',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Nome contrato cliente',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
-	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToFunctionalCI
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToFunctionalCI' => 'Link Contrato cliente / CI',
-	'Class:lnkCustomerContractToFunctionalCI+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrato cliente',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Nome contrato cliente',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: DeliveryModel
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DeliveryModel' => 'Modelo entrega',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Nome',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Nome organização',
-	'Class:DeliveryModel/Attribute:organization_name+' => '',
-	'Class:DeliveryModel/Attribute:description' => 'Descrição',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contatos',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os contatos (Equipe e Pessoa) para esse Modelo entrega',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes com esse Modelo entrega',
-));
-
-//
-// Class: lnkDeliveryModelToContact
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDeliveryModelToContact' => 'Link Modelo entrega / Contato',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo entrega',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nome Modelo entrega',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contato',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Regra',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Nome regra',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
-	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name~~',
-	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider~~',
-));
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+'Menu:ServiceManagement' => 'Gerenciamento Serviços',
+'Menu:ServiceManagement+' => 'Gerenciamento Serviços',
+'Menu:Service:Overview' => 'Visão geral',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por status',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos terminando em menos de 30 dias',
+
+'Menu:ProviderContract' => 'Contratos Provedores(as)',
+'Menu:ProviderContract+' => 'Contratos Provedores(as)',
+'Menu:CustomerContract' => 'Contratos Clientes',
+'Menu:CustomerContract+' => 'Contratos Clientes',
+'Menu:ServiceSubcategory' => 'Sub-categorias serviços',
+'Menu:ServiceSubcategory+' => 'Sub-categorias serviços',
+'Menu:Service' => 'Serviços',
+'Menu:Service+' => 'Serviços',
+'Menu:ServiceElement' => 'Elementos seviços',
+'Menu:ServiceElement+' => 'Elementos seviços',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Lista Nível de Serviço Acordados',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Lista Nível de Metas de Serviço',
+'Menu:DeliveryModel' => 'Modelos entrega',
+'Menu:DeliveryModel+' => 'Modelos entrega',
+
+));
+
+
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
+//
+// Class: Organization
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+));
+
+
+
+//
+// Class: ContractType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ContractType' => 'Tipo contrato',
+	'Class:ContractType+' => '',
+));
+
+
+//
+// Class: Contract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Contract' => 'Contrato',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Nome',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Organização',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Nome organização',
+	'Class:Contract/Attribute:organization_name+' => 'Nome comum',
+	'Class:Contract/Attribute:contacts_list' => 'Contatos',
+	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos para este contrato com o cliente',
+	'Class:Contract/Attribute:documents_list' => 'Documentos',
+	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos para este contrato com o cliente',
+	'Class:Contract/Attribute:description' => 'Descrição',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Data início',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Data final',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Valor',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Valor atual',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dólares',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Tipo contrato',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Nome tipo contrato',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Frequência pagamento',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Valor unitário',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Provedor(a)',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Nome provedor(a)',
+	'Class:Contract/Attribute:provider_name+' => '',
+	'Class:Contract/Attribute:status' => 'Estado',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:Contract/Attribute:status/Value:production' => 'Produção',
+	'Class:Contract/Attribute:status/Value:production+' => 'Produção',
+	'Class:Contract/Attribute:finalclass' => 'Tipo contrato',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CustomerContract' => 'Contrato cliente',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Serviços',
+	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para o presente contrato',
+	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:CustomerContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração que são utilizados para a prestação deste serviço',
+	'Class:CustomerContract/Attribute:providercontracts_list' => 'Contrato provedor(a)',
+	'Class:CustomerContract/Attribute:providercontracts_list+' => 'Todos contratos para suporte para esse serviço',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ProviderContract' => 'Contrato provedor(a)',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração abrangidos para esse contrato',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'SLA',
+	'Class:ProviderContract/Attribute:coverage' => 'Horas de serviço',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContactToContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToContract' => 'Link Contato / Contrato',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Nome contrato',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkContractToDocument
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nome contrato',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Documento',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Nome documento',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: ServiceFamily
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ServiceFamily' => 'Família serviços',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:id' => 'Id',
+	'Class:ServiceFamily/Attribute:id+' => '',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Nome',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:icon+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Serviços',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços para essa categoria',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Service' => 'Serviço',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Nome',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Organização',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Nome',
+	'Class:Service/Attribute:organization_name+' => 'Nome comum',
+	'Class:Service/Attribute:servicefamily_id' => 'Família serviço',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'Nome família serviço',
+	'Class:Service/Attribute:servicefamily_name+' => 'Nome família serviço',
+	'Class:Service/Attribute:description' => 'Descrição',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Documentos',
+	'Class:Service/Attribute:documents_list+' => 'Todos documentos vinculados com o serviço',
+	'Class:Service/Attribute:contacts_list' => 'Contatos',
+	'Class:Service/Attribute:contacts_list+' => 'Todos contatos com o serviço',
+	'Class:Service/Attribute:status' => 'Estado',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:Service/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Produção',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Contratos clientes',
+	'Class:Service/Attribute:customercontracts_list+' => 'Todos contratos de clientes que contrataram esse serviço',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Sub-categorias serviço',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as sub-categorias para esse serviço',
+));
+
+//
+// Class: lnkDocumentToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToService' => 'Link Contato / Serviço',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ServiceSubcategory' => 'Sub-categoria serviço',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Descrição',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Serviço',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Nome serviço',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:ServiceSubcategory/Attribute:status' => 'Estado',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produção',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Produção',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo solicitação',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incidente',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Nome',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'Descrição',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Organização',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Nome organização',
+	'Class:SLA/Attribute:organization_name+' => '',
+	'Class:SLA/Attribute:slts_list' => 'SLTs',
+	'Class:SLA/Attribute:slts_list+' => 'Todos os SLTs para essa SLA',
+	'Class:SLA/Attribute:customercontracts_list' => 'Contratos clientes',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os contratos de clientes utilizando essa SLA',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Nome',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Prioridade',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'Crítica',
+	'Class:SLT/Attribute:priority/Value:1+' => 'Crítica',
+	'Class:SLT/Attribute:priority/Value:2' => 'Alta',
+	'Class:SLT/Attribute:priority/Value:2+' => 'Alta',
+	'Class:SLT/Attribute:priority/Value:3' => 'Média',
+	'Class:SLT/Attribute:priority/Value:3+' => 'Média',
+	'Class:SLT/Attribute:priority/Value:4' => 'Baixa',
+	'Class:SLT/Attribute:priority/Value:4+' => 'Baixa',
+	'Class:SLT/Attribute:request_type' => 'Tipo solicitação',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidente',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incidente',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
+	'Class:SLT/Attribute:metric' => 'Métrica',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
+	'Class:SLT/Attribute:value' => 'Valor',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Unidade',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'Horas',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'Minutos',
+));
+
+//
+// Class: lnkSLAToSLT
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nome SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'Nome SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkCustomerContractToService' => 'Link Contrato cliente / Serviço',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato cliente',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nome contrato cliente',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nome SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkCustomerContractToProviderContract' => 'Link Contrato cliente / Contrato provedor(a)',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrato cliente',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name' => 'Nome contrato cliente',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
+	'Class:lnkCustomerContractToProviderContract/Attribute:providercontract_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToFunctionalCI
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkCustomerContractToFunctionalCI' => 'Link Contrato cliente / CI',
+	'Class:lnkCustomerContractToFunctionalCI+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrato cliente',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name' => 'Nome contrato cliente',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkCustomerContractToFunctionalCI/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: DeliveryModel
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DeliveryModel' => 'Modelo entrega',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Nome',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Nome organização',
+	'Class:DeliveryModel/Attribute:organization_name+' => '',
+	'Class:DeliveryModel/Attribute:description' => 'Descrição',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contatos',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os contatos (Equipe e Pessoa) para esse Modelo entrega',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes com esse Modelo entrega',
+));
+
+//
+// Class: lnkDeliveryModelToContact
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDeliveryModelToContact' => 'Link Modelo entrega / Contato',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo entrega',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nome Modelo entrega',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contato',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Regra',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Nome regra',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+	'Class:ServiceSubcategory/Attribute:service_provider' => 'Provider Name~~',
+	'Class:ServiceSubcategory/Attribute:service_org_id' => 'Provider~~',
+));
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
index c3cc70d77..c8b19b302 100755
--- a/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php
@@ -1,528 +1,528 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('EN US', 'English', 'English', array(
-'Menu:ServiceManagement' => 'Service Management',
-'Menu:ServiceManagement+' => 'Service Management Overview',
-'Menu:Service:Overview' => 'Overview',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
-'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
-
-'Menu:ProviderContract' => 'Provider contracts',
-'Menu:ProviderContract+' => 'Provider contracts',
-'Menu:CustomerContract' => 'Customer contracts',
-'Menu:CustomerContract+' => 'Customer contracts',
-'Menu:ServiceSubcategory' => 'Service subcategories',
-'Menu:ServiceSubcategory+' => 'Service subcategories',
-'Menu:Service' => 'Services',
-'Menu:Service+' => 'Services',
-'Menu:ServiceElement' => 'Sevice elements',
-'Menu:ServiceElement+' => 'Sevice elements',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => 'Service Level Agreements',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => 'Service Level Targets',
-'Menu:DeliveryModel' => 'Delivery models',
-'Menu:DeliveryModel+' => 'Delivery models',
-'Menu:ServiceFamily' => 'Service families',
-'Menu:ServiceFamily+' => 'Service families',
-'Menu:Procedure' => 'Procedures catalog',
-'Menu:Procedure+' => 'All procedures catalog',
-
-
-
-));
-
-//
-// Class: Organization
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
-
-));
-
-
-//
-// Class: ContractType
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ContractType' => 'Contract Type',
-	'Class:ContractType+' => '',
-));
-
-//
-// Class: Contract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Contract' => 'Contract',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Name',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => 'Customer',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => 'Customer Name',
-	'Class:Contract/Attribute:organization_name+' => 'Common name',
-	'Class:Contract/Attribute:contacts_list' => 'Contacts',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract',
-	'Class:Contract/Attribute:documents_list' => 'Documents',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract',
-	'Class:Contract/Attribute:description' => 'Description',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Start date',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'End date',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Cost',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Cost Currency',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:contracttype_id' => 'Contract type',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Billing frequency',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'Provider',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'Provider Name',
-	'Class:Contract/Attribute:provider_name+' => 'Common name',
-	'Class:Contract/Attribute:status' => 'Status',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => 'implementation',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
-	'Class:Contract/Attribute:status/Value:production' => 'production',
-	'Class:Contract/Attribute:status/Value:production+' => 'production',
-	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
-	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
-));
-//
-// Class: CustomerContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CustomerContract' => 'Customer Contract',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'Services',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ProviderContract' => 'Provider Contract',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type',
-	'Class:ProviderContract/Attribute:contracttype_id+' => '',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name',
-	'Class:ProviderContract/Attribute:contracttype_name+' => '',
-));
-
-//
-// Class: lnkContactToContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToContract' => 'Link Contact / Contract',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkContractToDocument
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContractToDocument' => 'Link Contract / Document',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Document',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: ServiceFamily
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ServiceFamily' => 'Service Family',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => 'Name',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon',
-	'Class:ServiceFamily/Attribute:icon+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'Services',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Service' => 'Service',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => 'Name',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Provider',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Provider Name',
-	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:servicefamily_id' => 'Service Family',
-	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name',
-	'Class:Service/Attribute:servicefamily_name+' => '',
-	'Class:Service/Attribute:description' => 'Description',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => 'Documents',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service',
-	'Class:Service/Attribute:contacts_list' => 'Contacts',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
-	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
-	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'production',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon',
-	'Class:Service/Attribute:icon+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service',
-	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts',
-	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service',
-	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs',
-	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service',
-));
-
-//
-// Class: lnkDocumentToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDocumentToService' => 'Link Document / Service',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Document',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToService' => 'Link Contact / Service',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'Service',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ServiceSubcategory' => 'Service Subcategory',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Name',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Description',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Service name',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Name',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => 'description',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Provider',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:organization_name' => 'Provider Name',
-	'Class:SLA/Attribute:organization_name+' => 'Common name',
-	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA',
-	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Name',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => 'Priority',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => 'critical',
-	'Class:SLT/Attribute:priority/Value:1+' => 'critical',
-	'Class:SLT/Attribute:priority/Value:2' => 'high',
-	'Class:SLT/Attribute:priority/Value:2+' => 'high',
-	'Class:SLT/Attribute:priority/Value:3' => 'medium',
-	'Class:SLT/Attribute:priority/Value:3+' => 'medium',
-	'Class:SLT/Attribute:priority/Value:4' => 'low',
-	'Class:SLT/Attribute:priority/Value:4+' => 'low',
-	'Class:SLT/Attribute:request_type' => 'Request type',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
-	'Class:SLT/Attribute:metric' => 'Metric',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
-	'Class:SLT/Attribute:value' => 'Value',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => 'Unit',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => 'hours',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'hours',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes',
-));
-
-//
-// Class: lnkSLAToSLT
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-));
-
-//
-// Class: lnkProviderContractToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service',
-	'Class:lnkProviderContractToService+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: DeliveryModel
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:DeliveryModel' => 'Delivery Model',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Name',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name',
-	'Class:DeliveryModel/Attribute:description' => 'Description',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Customers',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model',
-));
-
-//
-// Class: lnkDeliveryModelToContact
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
-));
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('EN US', 'English', 'English', array(
+'Menu:ServiceManagement' => 'Service Management',
+'Menu:ServiceManagement+' => 'Service Management Overview',
+'Menu:Service:Overview' => 'Overview',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
+
+'Menu:ProviderContract' => 'Provider contracts',
+'Menu:ProviderContract+' => 'Provider contracts',
+'Menu:CustomerContract' => 'Customer contracts',
+'Menu:CustomerContract+' => 'Customer contracts',
+'Menu:ServiceSubcategory' => 'Service subcategories',
+'Menu:ServiceSubcategory+' => 'Service subcategories',
+'Menu:Service' => 'Services',
+'Menu:Service+' => 'Services',
+'Menu:ServiceElement' => 'Sevice elements',
+'Menu:ServiceElement+' => 'Sevice elements',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Service Level Agreements',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Service Level Targets',
+'Menu:DeliveryModel' => 'Delivery models',
+'Menu:DeliveryModel+' => 'Delivery models',
+'Menu:ServiceFamily' => 'Service families',
+'Menu:ServiceFamily+' => 'Service families',
+'Menu:Procedure' => 'Procedures catalog',
+'Menu:Procedure+' => 'All procedures catalog',
+
+
+
+));
+
+//
+// Class: Organization
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name',
+
+));
+
+
+//
+// Class: ContractType
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ContractType' => 'Contract Type',
+	'Class:ContractType+' => '',
+));
+
+//
+// Class: Contract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Contract' => 'Contract',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Name',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Customer',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Customer Name',
+	'Class:Contract/Attribute:organization_name+' => 'Common name',
+	'Class:Contract/Attribute:contacts_list' => 'Contacts',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract',
+	'Class:Contract/Attribute:documents_list' => 'Documents',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract',
+	'Class:Contract/Attribute:description' => 'Description',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Start date',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'End date',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Cost',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Cost Currency',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Contract type',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Billing frequency',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Provider',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Provider Name',
+	'Class:Contract/Attribute:provider_name+' => 'Common name',
+	'Class:Contract/Attribute:status' => 'Status',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'implementation',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete',
+	'Class:Contract/Attribute:status/Value:production' => 'production',
+	'Class:Contract/Attribute:status/Value:production+' => 'production',
+	'Class:Contract/Attribute:finalclass' => 'Contract sub-class',
+	'Class:Contract/Attribute:finalclass+' => 'Name of the final class',
+));
+//
+// Class: CustomerContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CustomerContract' => 'Customer Contract',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Services',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ProviderContract' => 'Provider Contract',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type',
+	'Class:ProviderContract/Attribute:contracttype_id+' => '',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name',
+	'Class:ProviderContract/Attribute:contracttype_name+' => '',
+));
+
+//
+// Class: lnkContactToContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToContract' => 'Link Contact / Contract',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkContractToDocument
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContractToDocument' => 'Link Contract / Document',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Document',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: ServiceFamily
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ServiceFamily' => 'Service Family',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Name',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon',
+	'Class:ServiceFamily/Attribute:icon+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Services',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Service' => 'Service',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Name',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Provider',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Provider Name',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:servicefamily_id' => 'Service Family',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name',
+	'Class:Service/Attribute:servicefamily_name+' => '',
+	'Class:Service/Attribute:description' => 'Description',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Documents',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service',
+	'Class:Service/Attribute:contacts_list' => 'Contacts',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
+	'Class:Service/Attribute:status' => 'Status',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'production',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:icon' => 'Icon',
+	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service',
+	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts',
+	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service',
+	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs',
+	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service',
+));
+
+//
+// Class: lnkDocumentToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDocumentToService' => 'Link Document / Service',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Document',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToService' => 'Link Contact / Service',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Service',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ServiceSubcategory' => 'Service Subcategory',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Name',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Description',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Service name',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Name',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'description',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Provider',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Provider Name',
+	'Class:SLA/Attribute:organization_name+' => 'Common name',
+	'Class:SLA/Attribute:slts_list' => 'SLTs',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA',
+	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Name',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Priority',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'critical',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical',
+	'Class:SLT/Attribute:priority/Value:2' => 'high',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high',
+	'Class:SLT/Attribute:priority/Value:3' => 'medium',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium',
+	'Class:SLT/Attribute:priority/Value:4' => 'low',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low',
+	'Class:SLT/Attribute:request_type' => 'Request type',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
+	'Class:SLT/Attribute:metric' => 'Metric',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
+	'Class:SLT/Attribute:value' => 'Value',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Unit',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'hours',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes',
+));
+
+//
+// Class: lnkSLAToSLT
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+));
+
+//
+// Class: lnkProviderContractToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service',
+	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
+	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: DeliveryModel
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:DeliveryModel' => 'Delivery Model',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Name',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name',
+	'Class:DeliveryModel/Attribute:description' => 'Description',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Customers',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model',
+));
+
+//
+// Class: lnkDeliveryModelToContact
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+));
+
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php
index 3ea05e47b..02b2b844e 100755
--- a/datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/it.dict.itop-service-mgmt.php
@@ -1,620 +1,620 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('IT IT', 'Italian' ,'Italiano' ,array(
-'Menu:ServiceManagement' => 'Gestione del Servizio',
-'Menu:ServiceManagement+' => 'Panoramica della Gestione del Servizio',
-'Menu:Service:Overview' => 'Panoramica',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratti per livello di servizio',
-'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
-
-'Menu:ProviderContract' => 'Contratti con Provider',
-'Menu:ProviderContract+' => 'Contratti con Provider',
-'Menu:CustomerContract' => 'Contratti con Clienti',
-'Menu:CustomerContract+' => 'Contratti con Clienti',
-'Menu:ServiceSubcategory' => 'Sottocategorie di Servizio',
-'Menu:ServiceSubcategory+' => 'Sottocategorie di Servizio',
-'Menu:Service' => 'Servizi',
-'Menu:Service+' => 'Servizi',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => 'Service Level Agreements',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => 'Service Level Targets',
-
-));
-
-
-/*
-	'UI:ServiceManagementMenu' => 'Gestion des Services',
-	'UI:ServiceManagementMenu+' => 'Gestion des Services',
-	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
-*/
-
-
-//
-// Class: Contract
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Contract' => 'Contratto',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Nome',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:description' => 'Descrizione',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Data di inzio',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Data di fine',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Costo',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Valuta',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollari',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euro',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Costo unitario',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Frequenza di fatturazione',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:contact_list' => 'Contatti',
-	'Class:Contract/Attribute:contact_list+' => 'Contatti correlati al contratto',
-	'Class:Contract/Attribute:document_list' => 'Documenti',
-	'Class:Contract/Attribute:document_list+' => 'Documenti allegati al contratto',
-	'Class:Contract/Attribute:ci_list' => 'CIs',
-	'Class:Contract/Attribute:ci_list+' => 'CI supportate dal contratto',
-	'Class:Contract/Attribute:finalclass' => 'Tipo',
-	'Class:Contract/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('IT IT', 'Italian', 'Italian', array(
-	'Class:ProviderContract' => 'Contratto con Provider',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:provider_id' => 'Provider',
-	'Class:ProviderContract/Attribute:provider_id+' => '',
-	'Class:ProviderContract/Attribute:provider_name' => 'Nome del Provider',
-	'Class:ProviderContract/Attribute:provider_name+' => '',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-	'Class:ProviderContract/Attribute:coverage' => 'Ore di servizio',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-));
-
-//
-// Class: CustomerContract
-//
-
-Dict::Add('IT IT', 'Italian' ,'Italian', array(
-	'Class:CustomerContract' => 'Contratto con cliente',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:org_id' => 'Cliente',
-	'Class:CustomerContract/Attribute:org_id+' => '',
-	'Class:CustomerContract/Attribute:org_name' => 'Nome Cliente',
-	'Class:CustomerContract/Attribute:org_name+' => '',
-	'Class:CustomerContract/Attribute:provider_id' => 'Provider',
-	'Class:CustomerContract/Attribute:provider_id+' => '',
-	'Class:CustomerContract/Attribute:provider_name' => 'Nome Provider',
-	'Class:CustomerContract/Attribute:provider_name+' => '',
-	'Class:CustomerContract/Attribute:support_team_id' => 'Team di supporto',
-	'Class:CustomerContract/Attribute:support_team_id+' => '',
-	'Class:CustomerContract/Attribute:support_team_name' => 'Team di supporto',
-	'Class:CustomerContract/Attribute:support_team_name+' => '',
-	'Class:CustomerContract/Attribute:provider_list' => 'Providers',
-	'Class:CustomerContract/Attribute:provider_list+' => '',
-	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
-	'Class:CustomerContract/Attribute:sla_list+' => 'Lista delle SLA correlate con il contratto',
-	'Class:CustomerContract/Attribute:provider_list' => 'Contratti di sostegno',
-	'Class:CustomerContract/Attribute:sla_list+' => '',
-));
-//
-// Class: lnkCustomerContractToProviderContract
-//
-
-Dict::Add('IT IT', 'Italian','Italiano', array(
-	'Class:lnkCustomerContractToProviderContract' => 'lnkCustomerContractToProviderContract',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => 'Contratto con Cliente',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => 'Nome',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => 'Contratto con Provider',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => 'Nome',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => 'Provider SLA',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => 'Service Level Agreement',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => 'Ore di Servizio',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
-));
-
-
-//
-// Class: lnkContractToSLA
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkContractToSLA' => 'Contratto/SLA',
-	'Class:lnkContractToSLA+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_id' => 'Contratto',
-	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_name' => 'Contratto',
-	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
-	'Class:lnkContractToSLA/Attribute:coverage' => 'Ore di servizio',
-	'Class:lnkContractToSLA/Attribute:coverage+' => '',
-));
-
-//
-// Class: lnkContractToDoc
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkContractToDoc' => 'Contratto/Doc',
-	'Class:lnkContractToDoc+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_id' => 'Contratto',
-	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_name' => 'Contratto',
-	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_id' => 'Documento',
-	'Class:lnkContractToDoc/Attribute:document_id+' => '',
-	'Class:lnkContractToDoc/Attribute:document_name' => 'Documento',
-	'Class:lnkContractToDoc/Attribute:document_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_type' => 'Tipo di Documento',
-	'Class:lnkContractToDoc/Attribute:document_type+' => '',
-	'Class:lnkContractToDoc/Attribute:document_status' => 'Stato del documento',
-	'Class:lnkContractToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkContractToContact
-//
-
-Dict::Add('IT IT', 'Italian', 'Italian', array(
-	'Class:lnkContractToContact' => 'Contratto/Contatto',
-	'Class:lnkContractToContact+' => '',
-	'Class:lnkContractToContact/Attribute:contract_id' => 'Contratto',
-	'Class:lnkContractToContact/Attribute:contract_id+' => '',
-	'Class:lnkContractToContact/Attribute:contract_name' => 'Contratto',
-	'Class:lnkContractToContact/Attribute:contract_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_id' => 'Contatto',
-	'Class:lnkContractToContact/Attribute:contact_id+' => '',
-	'Class:lnkContractToContact/Attribute:contact_name' => 'Contatto',
-	'Class:lnkContractToContact/Attribute:contact_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_email' => 'Contatto email',
-	'Class:lnkContractToContact/Attribute:contact_email+' => '',
-	'Class:lnkContractToContact/Attribute:role' => 'Ruolo',
-	'Class:lnkContractToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkContractToCI
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkContractToCI' => 'Contratto/CI',
-	'Class:lnkContractToCI+' => '',
-	'Class:lnkContractToCI/Attribute:contract_id' => 'Contratto',
-	'Class:lnkContractToCI/Attribute:contract_id+' => '',
-	'Class:lnkContractToCI/Attribute:contract_name' => 'Contratto',
-	'Class:lnkContractToCI/Attribute:contract_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkContractToCI/Attribute:ci_id+' => '',
-	'Class:lnkContractToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkContractToCI/Attribute:ci_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_status' => 'CI stato',
-	'Class:lnkContractToCI/Attribute:ci_status+' => '',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('IT IT', 'Italian','Italiano', array(
-	'Class:Service' => 'Servizio',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:org_id' => 'Provider',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:provider_name' => 'Provider',
-	'Class:Service/Attribute:provider_name+' => '',
-	'Class:Service/Attribute:name' => 'Nome',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:description' => 'Descrizione',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:type' => 'Tipo',
-	'Class:Service/Attribute:type+' => '',
-	'Class:Service/Attribute:type/Value:IncidentManagement' => 'Gestione Incidente',
-	'Class:Service/Attribute:type/Value:IncidentManagement+' => 'Gestione Incidente',
-	'Class:Service/Attribute:type/Value:RequestManagement' => 'Gestione Richieste',
-	'Class:Service/Attribute:type/Value:RequestManagement+' => 'Gestione Richieste',
-	'Class:Service/Attribute:status' => 'Stato',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:design' => 'Progettazione',
-	'Class:Service/Attribute:status/Value:design+' => '',
-	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'Produzione',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:subcategory_list' => 'Sottocategorie di servizio',
-	'Class:Service/Attribute:subcategory_list+' => '',
-	'Class:Service/Attribute:sla_list' => 'SLAs',
-	'Class:Service/Attribute:sla_list+' => '',
-	'Class:Service/Attribute:document_list' => 'Documenti',
-	'Class:Service/Attribute:document_list+' => 'Documenti allegati al servizio',
-	'Class:Service/Attribute:contact_list' => 'Contatti',
-	'Class:Service/Attribute:contact_list+' => 'Contatti che hanno un ruolo per questo servizio',
-	'Class:Service/Tab:Related_Contracts' => 'Contratti correlati',
-	'Class:Service/Tab:Related_Contracts+' => 'Contratti siglati per questo servizio',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:ServiceSubcategory' => 'Sottocategorie del servizio',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Descrizione',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Servizio',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Servizio',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Name',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:service_id' => 'Servizio',
-	'Class:SLA/Attribute:service_id+' => '',
-	'Class:SLA/Attribute:service_name' => 'Servizio',
-	'Class:SLA/Attribute:service_name+' => '',
-	'Class:SLA/Attribute:slt_list' => 'SLTs',
-	'Class:SLA/Attribute:slt_list+' => 'Lista delle soglie dei libelli di servizio',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('IT IT', 'Italian' ,'Italiano', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Nome',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:metric' => 'Metrica',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
-	'Class:SLT/Attribute:ticket_priority' => 'Priorità del ticket',
-	'Class:SLT/Attribute:ticket_priority+' => '',
-	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
-	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
-	'Class:SLT/Attribute:value' => 'Valore',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:value_unit' => 'Unità',
-	'Class:SLT/Attribute:value_unit+' => '',
-	'Class:SLT/Attribute:value_unit/Value:days' => 'giorni',
-	'Class:SLT/Attribute:value_unit/Value:days+' => 'giorni',
-	'Class:SLT/Attribute:value_unit/Value:hours' => 'ore',
-	'Class:SLT/Attribute:value_unit/Value:hours+' => 'ore',
-	'Class:SLT/Attribute:value_unit/Value:minutes' => 'minuti',
-	'Class:SLT/Attribute:value_unit/Value:minutes+' => 'minuti',
-	'Class:SLT/Attribute:sla_list' => 'SLAs',
-	'Class:SLT/Attribute:sla_list+' => 'SLAs che usano i SLT',
-));
-
-//
-// Class: lnkSLTToSLA
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkSLTToSLA' => 'SLT/SLA',
-	'Class:lnkSLTToSLA+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metrica',
-	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => 'Priorità del ticket',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value' => 'Valore',
-	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => 'Unità',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
-));
-
-//
-// Class: lnkServiceToDoc
-//
-
-Dict::Add('IT IT', 'Italian', 'Italian', array(
-	'Class:lnkServiceToDoc' => 'Servizio/Doc',
-	'Class:lnkServiceToDoc+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_id' => 'Servizio',
-	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_name' => 'Servizio',
-	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_id' => 'Documento',
-	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_name' => 'Documento',
-	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_type' => 'Tipo documento',
-	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_status' => 'Stato del documento',
-	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkServiceToContact
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkServiceToContact' => 'Service/Contatto',
-	'Class:lnkServiceToContact+' => '',
-	'Class:lnkServiceToContact/Attribute:service_id' => 'Servizio',
-	'Class:lnkServiceToContact/Attribute:service_id+' => '',
-	'Class:lnkServiceToContact/Attribute:service_name' => 'Servizio',
-	'Class:lnkServiceToContact/Attribute:service_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_id' => 'Contatto',
-	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_name' => 'Contatto',
-	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_email' => 'Email del contatto',
-	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
-	'Class:lnkServiceToContact/Attribute:role' => 'Ruolo',
-	'Class:lnkServiceToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkServiceToCI
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkServiceToCI' => 'Servizio/CI',
-	'Class:lnkServiceToCI+' => '',
-	'Class:lnkServiceToCI/Attribute:service_id' => 'Servizio',
-	'Class:lnkServiceToCI/Attribute:service_id+' => '',
-	'Class:lnkServiceToCI/Attribute:service_name' => 'Servizio',
-	'Class:lnkServiceToCI/Attribute:service_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_status' => 'CI stato',
-	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
-	'Menu:ServiceElement' => 'Sevice elements~~',
-	'Menu:ServiceElement+' => 'Sevice elements~~',
-	'Menu:DeliveryModel' => 'Delivery models~~',
-	'Menu:DeliveryModel+' => 'Delivery models~~',
-	'Menu:ServiceFamily' => 'Service families~~',
-	'Menu:ServiceFamily+' => 'Service families~~',
-	'Menu:Procedure' => 'Procedures catalog~~',
-	'Menu:Procedure+' => 'All procedures catalog~~',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:ContractType' => 'Contract Type~~',
-	'Class:Contract/Attribute:org_id' => 'Customer~~',
-	'Class:Contract/Attribute:organization_name' => 'Customer Name~~',
-	'Class:Contract/Attribute:organization_name+' => 'Common name~~',
-	'Class:Contract/Attribute:contacts_list' => 'Contacts~~',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
-	'Class:Contract/Attribute:documents_list' => 'Documents~~',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
-	'Class:Contract/Attribute:contracttype_id' => 'Contract type~~',
-	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name~~',
-	'Class:Contract/Attribute:provider_id' => 'Provider~~',
-	'Class:Contract/Attribute:provider_name' => 'Provider Name~~',
-	'Class:Contract/Attribute:provider_name+' => 'Common name~~',
-	'Class:Contract/Attribute:status' => 'Status~~',
-	'Class:Contract/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:Contract/Attribute:status/Value:production' => 'production~~',
-	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
-	'Class:CustomerContract/Attribute:services_list' => 'Services~~',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
-	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type~~',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name~~',
-	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name~~',
-	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Document~~',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:ServiceFamily' => 'Service Family~~',
-	'Class:ServiceFamily/Attribute:name' => 'Name~~',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
-	'Class:ServiceFamily/Attribute:services_list' => 'Services~~',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
-	'Class:Service/Attribute:organization_name' => 'Provider Name~~',
-	'Class:Service/Attribute:servicefamily_id' => 'Service Family~~',
-	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name~~',
-	'Class:Service/Attribute:documents_list' => 'Documents~~',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
-	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:Service/Attribute:icon' => 'Icon~~',
-	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts~~',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
-	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
-	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs~~',
-	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories~~',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
-	'Class:lnkDocumentToService' => 'Link Document / Service~~',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkContactToService' => 'Link Contact / Service~~',
-	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name~~',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
-	'Class:SLA/Attribute:description' => 'description~~',
-	'Class:SLA/Attribute:org_id' => 'Provider~~',
-	'Class:SLA/Attribute:organization_name' => 'Provider Name~~',
-	'Class:SLA/Attribute:organization_name+' => 'Common name~~',
-	'Class:SLA/Attribute:slts_list' => 'SLTs~~',
-	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
-	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
-	'Class:SLT/Attribute:priority' => 'Priority~~',
-	'Class:SLT/Attribute:priority/Value:1' => 'critical~~',
-	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
-	'Class:SLT/Attribute:priority/Value:2' => 'high~~',
-	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
-	'Class:SLT/Attribute:priority/Value:3' => 'medium~~',
-	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
-	'Class:SLT/Attribute:priority/Value:4' => 'low~~',
-	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
-	'Class:SLT/Attribute:request_type' => 'Request type~~',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'incident~~',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request~~',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR~~',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
-	'Class:SLT/Attribute:unit' => 'Unit~~',
-	'Class:SLT/Attribute:unit/Value:hours' => 'hours~~',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT~~',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name~~',
-	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA~~',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
-	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:DeliveryModel' => 'Delivery Model~~',
-	'Class:DeliveryModel/Attribute:name' => 'Name~~',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organization~~',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name~~',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
-	'Class:DeliveryModel/Attribute:description' => 'Description~~',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts~~',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Customers~~',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
-	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role~~',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
-));
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('IT IT', 'Italian' ,'Italiano' ,array(
+'Menu:ServiceManagement' => 'Gestione del Servizio',
+'Menu:ServiceManagement+' => 'Panoramica della Gestione del Servizio',
+'Menu:Service:Overview' => 'Panoramica',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratti per livello di servizio',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
+
+'Menu:ProviderContract' => 'Contratti con Provider',
+'Menu:ProviderContract+' => 'Contratti con Provider',
+'Menu:CustomerContract' => 'Contratti con Clienti',
+'Menu:CustomerContract+' => 'Contratti con Clienti',
+'Menu:ServiceSubcategory' => 'Sottocategorie di Servizio',
+'Menu:ServiceSubcategory+' => 'Sottocategorie di Servizio',
+'Menu:Service' => 'Servizi',
+'Menu:Service+' => 'Servizi',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Service Level Agreements',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Service Level Targets',
+
+));
+
+
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
+
+//
+// Class: Contract
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Contract' => 'Contratto',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Nome',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:description' => 'Descrizione',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Data di inzio',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Data di fine',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Costo',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Valuta',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollari',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euro',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Costo unitario',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Frequenza di fatturazione',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:contact_list' => 'Contatti',
+	'Class:Contract/Attribute:contact_list+' => 'Contatti correlati al contratto',
+	'Class:Contract/Attribute:document_list' => 'Documenti',
+	'Class:Contract/Attribute:document_list+' => 'Documenti allegati al contratto',
+	'Class:Contract/Attribute:ci_list' => 'CIs',
+	'Class:Contract/Attribute:ci_list+' => 'CI supportate dal contratto',
+	'Class:Contract/Attribute:finalclass' => 'Tipo',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('IT IT', 'Italian', 'Italian', array(
+	'Class:ProviderContract' => 'Contratto con Provider',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:provider_id' => 'Provider',
+	'Class:ProviderContract/Attribute:provider_id+' => '',
+	'Class:ProviderContract/Attribute:provider_name' => 'Nome del Provider',
+	'Class:ProviderContract/Attribute:provider_name+' => '',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Ore di servizio',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('IT IT', 'Italian' ,'Italian', array(
+	'Class:CustomerContract' => 'Contratto con cliente',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:org_id' => 'Cliente',
+	'Class:CustomerContract/Attribute:org_id+' => '',
+	'Class:CustomerContract/Attribute:org_name' => 'Nome Cliente',
+	'Class:CustomerContract/Attribute:org_name+' => '',
+	'Class:CustomerContract/Attribute:provider_id' => 'Provider',
+	'Class:CustomerContract/Attribute:provider_id+' => '',
+	'Class:CustomerContract/Attribute:provider_name' => 'Nome Provider',
+	'Class:CustomerContract/Attribute:provider_name+' => '',
+	'Class:CustomerContract/Attribute:support_team_id' => 'Team di supporto',
+	'Class:CustomerContract/Attribute:support_team_id+' => '',
+	'Class:CustomerContract/Attribute:support_team_name' => 'Team di supporto',
+	'Class:CustomerContract/Attribute:support_team_name+' => '',
+	'Class:CustomerContract/Attribute:provider_list' => 'Providers',
+	'Class:CustomerContract/Attribute:provider_list+' => '',
+	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
+	'Class:CustomerContract/Attribute:sla_list+' => 'Lista delle SLA correlate con il contratto',
+	'Class:CustomerContract/Attribute:provider_list' => 'Contratti di sostegno',
+	'Class:CustomerContract/Attribute:sla_list+' => '',
+));
+//
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('IT IT', 'Italian','Italiano', array(
+	'Class:lnkCustomerContractToProviderContract' => 'lnkCustomerContractToProviderContract',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => 'Contratto con Cliente',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => 'Nome',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => 'Contratto con Provider',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => 'Nome',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => 'Provider SLA',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => 'Service Level Agreement',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => 'Ore di Servizio',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
+));
+
+
+//
+// Class: lnkContractToSLA
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkContractToSLA' => 'Contratto/SLA',
+	'Class:lnkContractToSLA+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_id' => 'Contratto',
+	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_name' => 'Contratto',
+	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
+	'Class:lnkContractToSLA/Attribute:coverage' => 'Ore di servizio',
+	'Class:lnkContractToSLA/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContractToDoc
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkContractToDoc' => 'Contratto/Doc',
+	'Class:lnkContractToDoc+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_id' => 'Contratto',
+	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_name' => 'Contratto',
+	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_id' => 'Documento',
+	'Class:lnkContractToDoc/Attribute:document_id+' => '',
+	'Class:lnkContractToDoc/Attribute:document_name' => 'Documento',
+	'Class:lnkContractToDoc/Attribute:document_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_type' => 'Tipo di Documento',
+	'Class:lnkContractToDoc/Attribute:document_type+' => '',
+	'Class:lnkContractToDoc/Attribute:document_status' => 'Stato del documento',
+	'Class:lnkContractToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkContractToContact
+//
+
+Dict::Add('IT IT', 'Italian', 'Italian', array(
+	'Class:lnkContractToContact' => 'Contratto/Contatto',
+	'Class:lnkContractToContact+' => '',
+	'Class:lnkContractToContact/Attribute:contract_id' => 'Contratto',
+	'Class:lnkContractToContact/Attribute:contract_id+' => '',
+	'Class:lnkContractToContact/Attribute:contract_name' => 'Contratto',
+	'Class:lnkContractToContact/Attribute:contract_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_id' => 'Contatto',
+	'Class:lnkContractToContact/Attribute:contact_id+' => '',
+	'Class:lnkContractToContact/Attribute:contact_name' => 'Contatto',
+	'Class:lnkContractToContact/Attribute:contact_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_email' => 'Contatto email',
+	'Class:lnkContractToContact/Attribute:contact_email+' => '',
+	'Class:lnkContractToContact/Attribute:role' => 'Ruolo',
+	'Class:lnkContractToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkContractToCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkContractToCI' => 'Contratto/CI',
+	'Class:lnkContractToCI+' => '',
+	'Class:lnkContractToCI/Attribute:contract_id' => 'Contratto',
+	'Class:lnkContractToCI/Attribute:contract_id+' => '',
+	'Class:lnkContractToCI/Attribute:contract_name' => 'Contratto',
+	'Class:lnkContractToCI/Attribute:contract_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkContractToCI/Attribute:ci_id+' => '',
+	'Class:lnkContractToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkContractToCI/Attribute:ci_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_status' => 'CI stato',
+	'Class:lnkContractToCI/Attribute:ci_status+' => '',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('IT IT', 'Italian','Italiano', array(
+	'Class:Service' => 'Servizio',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:org_id' => 'Provider',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:provider_name' => 'Provider',
+	'Class:Service/Attribute:provider_name+' => '',
+	'Class:Service/Attribute:name' => 'Nome',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:description' => 'Descrizione',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:type' => 'Tipo',
+	'Class:Service/Attribute:type+' => '',
+	'Class:Service/Attribute:type/Value:IncidentManagement' => 'Gestione Incidente',
+	'Class:Service/Attribute:type/Value:IncidentManagement+' => 'Gestione Incidente',
+	'Class:Service/Attribute:type/Value:RequestManagement' => 'Gestione Richieste',
+	'Class:Service/Attribute:type/Value:RequestManagement+' => 'Gestione Richieste',
+	'Class:Service/Attribute:status' => 'Stato',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:design' => 'Progettazione',
+	'Class:Service/Attribute:status/Value:design+' => '',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Produzione',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:subcategory_list' => 'Sottocategorie di servizio',
+	'Class:Service/Attribute:subcategory_list+' => '',
+	'Class:Service/Attribute:sla_list' => 'SLAs',
+	'Class:Service/Attribute:sla_list+' => '',
+	'Class:Service/Attribute:document_list' => 'Documenti',
+	'Class:Service/Attribute:document_list+' => 'Documenti allegati al servizio',
+	'Class:Service/Attribute:contact_list' => 'Contatti',
+	'Class:Service/Attribute:contact_list+' => 'Contatti che hanno un ruolo per questo servizio',
+	'Class:Service/Tab:Related_Contracts' => 'Contratti correlati',
+	'Class:Service/Tab:Related_Contracts+' => 'Contratti siglati per questo servizio',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:ServiceSubcategory' => 'Sottocategorie del servizio',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Descrizione',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Servizio',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Servizio',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Name',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:service_id' => 'Servizio',
+	'Class:SLA/Attribute:service_id+' => '',
+	'Class:SLA/Attribute:service_name' => 'Servizio',
+	'Class:SLA/Attribute:service_name+' => '',
+	'Class:SLA/Attribute:slt_list' => 'SLTs',
+	'Class:SLA/Attribute:slt_list+' => 'Lista delle soglie dei libelli di servizio',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('IT IT', 'Italian' ,'Italiano', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Nome',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:metric' => 'Metrica',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
+	'Class:SLT/Attribute:ticket_priority' => 'Priorità del ticket',
+	'Class:SLT/Attribute:ticket_priority+' => '',
+	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
+	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
+	'Class:SLT/Attribute:value' => 'Valore',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:value_unit' => 'Unità',
+	'Class:SLT/Attribute:value_unit+' => '',
+	'Class:SLT/Attribute:value_unit/Value:days' => 'giorni',
+	'Class:SLT/Attribute:value_unit/Value:days+' => 'giorni',
+	'Class:SLT/Attribute:value_unit/Value:hours' => 'ore',
+	'Class:SLT/Attribute:value_unit/Value:hours+' => 'ore',
+	'Class:SLT/Attribute:value_unit/Value:minutes' => 'minuti',
+	'Class:SLT/Attribute:value_unit/Value:minutes+' => 'minuti',
+	'Class:SLT/Attribute:sla_list' => 'SLAs',
+	'Class:SLT/Attribute:sla_list+' => 'SLAs che usano i SLT',
+));
+
+//
+// Class: lnkSLTToSLA
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkSLTToSLA' => 'SLT/SLA',
+	'Class:lnkSLTToSLA+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metrica',
+	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => 'Priorità del ticket',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value' => 'Valore',
+	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => 'Unità',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
+));
+
+//
+// Class: lnkServiceToDoc
+//
+
+Dict::Add('IT IT', 'Italian', 'Italian', array(
+	'Class:lnkServiceToDoc' => 'Servizio/Doc',
+	'Class:lnkServiceToDoc+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_id' => 'Servizio',
+	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_name' => 'Servizio',
+	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_id' => 'Documento',
+	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_name' => 'Documento',
+	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_type' => 'Tipo documento',
+	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_status' => 'Stato del documento',
+	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkServiceToContact
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkServiceToContact' => 'Service/Contatto',
+	'Class:lnkServiceToContact+' => '',
+	'Class:lnkServiceToContact/Attribute:service_id' => 'Servizio',
+	'Class:lnkServiceToContact/Attribute:service_id+' => '',
+	'Class:lnkServiceToContact/Attribute:service_name' => 'Servizio',
+	'Class:lnkServiceToContact/Attribute:service_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_id' => 'Contatto',
+	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_name' => 'Contatto',
+	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_email' => 'Email del contatto',
+	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
+	'Class:lnkServiceToContact/Attribute:role' => 'Ruolo',
+	'Class:lnkServiceToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkServiceToCI
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkServiceToCI' => 'Servizio/CI',
+	'Class:lnkServiceToCI+' => '',
+	'Class:lnkServiceToCI/Attribute:service_id' => 'Servizio',
+	'Class:lnkServiceToCI/Attribute:service_id+' => '',
+	'Class:lnkServiceToCI/Attribute:service_name' => 'Servizio',
+	'Class:lnkServiceToCI/Attribute:service_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_status' => 'CI stato',
+	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
+	'Menu:ServiceElement' => 'Sevice elements~~',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
+	'Menu:DeliveryModel' => 'Delivery models~~',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
+	'Menu:ServiceFamily' => 'Service families~~',
+	'Menu:ServiceFamily+' => 'Service families~~',
+	'Menu:Procedure' => 'Procedures catalog~~',
+	'Menu:Procedure+' => 'All procedures catalog~~',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:ContractType' => 'Contract Type~~',
+	'Class:Contract/Attribute:org_id' => 'Customer~~',
+	'Class:Contract/Attribute:organization_name' => 'Customer Name~~',
+	'Class:Contract/Attribute:organization_name+' => 'Common name~~',
+	'Class:Contract/Attribute:contacts_list' => 'Contacts~~',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:documents_list' => 'Documents~~',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:contracttype_id' => 'Contract type~~',
+	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name~~',
+	'Class:Contract/Attribute:provider_id' => 'Provider~~',
+	'Class:Contract/Attribute:provider_name' => 'Provider Name~~',
+	'Class:Contract/Attribute:provider_name+' => 'Common name~~',
+	'Class:Contract/Attribute:status' => 'Status~~',
+	'Class:Contract/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:production' => 'production~~',
+	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
+	'Class:CustomerContract/Attribute:services_list' => 'Services~~',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type~~',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name~~',
+	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name~~',
+	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Document~~',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:ServiceFamily' => 'Service Family~~',
+	'Class:ServiceFamily/Attribute:name' => 'Name~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:services_list' => 'Services~~',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:Service/Attribute:organization_name' => 'Provider Name~~',
+	'Class:Service/Attribute:servicefamily_id' => 'Service Family~~',
+	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name~~',
+	'Class:Service/Attribute:documents_list' => 'Documents~~',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts~~',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
+	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs~~',
+	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories~~',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:lnkDocumentToService' => 'Link Document / Service~~',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkContactToService' => 'Link Contact / Service~~',
+	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name~~',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
+	'Class:SLA/Attribute:description' => 'description~~',
+	'Class:SLA/Attribute:org_id' => 'Provider~~',
+	'Class:SLA/Attribute:organization_name' => 'Provider Name~~',
+	'Class:SLA/Attribute:organization_name+' => 'Common name~~',
+	'Class:SLA/Attribute:slts_list' => 'SLTs~~',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
+	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+	'Class:SLT/Attribute:priority' => 'Priority~~',
+	'Class:SLT/Attribute:priority/Value:1' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:2' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:3' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:4' => 'low~~',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
+	'Class:SLT/Attribute:request_type' => 'Request type~~',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request~~',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR~~',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
+	'Class:SLT/Attribute:unit' => 'Unit~~',
+	'Class:SLT/Attribute:unit/Value:hours' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT~~',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name~~',
+	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
+	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:DeliveryModel' => 'Delivery Model~~',
+	'Class:DeliveryModel/Attribute:name' => 'Name~~',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organization~~',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name~~',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
+	'Class:DeliveryModel/Attribute:description' => 'Description~~',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Customers~~',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
+));
+
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/main.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/main.itop-service-mgmt.php
index 3a23acb41..66839932a 100755
--- a/datamodels/2.x/itop-service-mgmt/main.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/main.itop-service-mgmt.php
@@ -1,20 +1,20 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
index fb8255376..b3c240d0f 100755
--- a/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
@@ -1,94 +1,94 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-service-mgmt/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Service Management',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.2.0',
-			'itop-tickets/2.0.0',
-		),
-		'mandatory' => false,
-		'visible' => true,
-		'installer' => 'ServiceMgmtInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'model.itop-service-mgmt.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-service-mgmt.xml',
-		),
-		'data.sample' => array(
-			'data.sample.organizations.xml',
-			'data.sample.contracts.xml',
-			'data.sample.servicefamilies.xml',
-			'data.sample.services.xml',
-			'data.sample.serviceelements.xml',
-			'data.sample.sla.xml',
-			'data.sample.slt.xml',
-			'data.sample.sltsla.xml',
-	//		'data.sample.coveragewindows.xml',
-			'data.sample.contractservice.xml',
-	//		'data.sample.deliverymodel.xml',
-			'data.sample.deliverymodelcontact.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-if (!class_exists('ServiceMgmtInstaller'))
-{
-	// Module installation handler
-	//
-	class ServiceMgmtInstaller extends ModuleInstallerAPI
-	{
-		public static function BeforeWritingConfig(Config $oConfiguration)
-		{
-			// If you want to override/force some configuration values, do it here
-			return $oConfiguration;
-		}
-
-		/**
-		 * Handler called before creating or upgrading the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-			if (strlen($sPreviousVersion) > 0)
-			{
-				self::RenameEnumValueInDB('SLT', 'request_type', 'servicerequest', 'service_request');
-			}
-		}
-	
-		/**
-		 * Handler called after the creation/update of the database schema
-		 * @param $oConfiguration Config The new configuration of the application
-		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
-		 * @param $sCurrentVersion string Current version number of the module
-		 */
-		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-		{
-		}
-	}
-}
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-service-mgmt/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Service Management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.2.0',
+			'itop-tickets/2.0.0',
+		),
+		'mandatory' => false,
+		'visible' => true,
+		'installer' => 'ServiceMgmtInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'model.itop-service-mgmt.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-service-mgmt.xml',
+		),
+		'data.sample' => array(
+			'data.sample.organizations.xml',
+			'data.sample.contracts.xml',
+			'data.sample.servicefamilies.xml',
+			'data.sample.services.xml',
+			'data.sample.serviceelements.xml',
+			'data.sample.sla.xml',
+			'data.sample.slt.xml',
+			'data.sample.sltsla.xml',
+	//		'data.sample.coveragewindows.xml',
+			'data.sample.contractservice.xml',
+	//		'data.sample.deliverymodel.xml',
+			'data.sample.deliverymodelcontact.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+if (!class_exists('ServiceMgmtInstaller'))
+{
+	// Module installation handler
+	//
+	class ServiceMgmtInstaller extends ModuleInstallerAPI
+	{
+		public static function BeforeWritingConfig(Config $oConfiguration)
+		{
+			// If you want to override/force some configuration values, do it here
+			return $oConfiguration;
+		}
+
+		/**
+		 * Handler called before creating or upgrading the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+			if (strlen($sPreviousVersion) > 0)
+			{
+				self::RenameEnumValueInDB('SLT', 'request_type', 'servicerequest', 'service_request');
+			}
+		}
+	
+		/**
+		 * Handler called after the creation/update of the database schema
+		 * @param $oConfiguration Config The new configuration of the application
+		 * @param $sPreviousVersion string PRevious version number of the module (empty string in case of first install)
+		 * @param $sCurrentVersion string Current version number of the module
+		 */
+		public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+		{
+		}
+	}
+}
diff --git a/datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php
index d375ec42a..5b898bc65 100755
--- a/datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/pt_br.dict.itop-service-mgmt.php
@@ -1,528 +1,528 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-'Menu:ServiceManagement' => 'Gerenciamento Serviços',
-'Menu:ServiceManagement+' => 'Gerenciamento Serviços',
-'Menu:Service:Overview' => 'Visão geral',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
-'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por estado',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos finalizando em menos de 30 dias',
-
-'Menu:ProviderContract' => 'Contratos Provedor(as)',
-'Menu:ProviderContract+' => 'Contratos Provedor(as)',
-'Menu:CustomerContract' => 'Contratos Clientes',
-'Menu:CustomerContract+' => 'Contratos Clientes',
-'Menu:ServiceSubcategory' => 'Sub-categorias serviços',
-'Menu:ServiceSubcategory+' => 'Sub-categorias serviços',
-'Menu:Service' => 'Serviços',
-'Menu:Service+' => 'Serviços',
-'Menu:ServiceElement' => 'Elementos seviços',
-'Menu:ServiceElement+' => 'Elementos seviços',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => 'Lista Nível de Serviço Acordados',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => 'Lista Nível de Metas de Serviço',
-'Menu:DeliveryModel' => 'Modelos entrega',
-'Menu:DeliveryModel+' => 'Modelos entrega',
-'Menu:ServiceFamily' => 'Família serviços',
-'Menu:ServiceFamily+' => 'Família serviços',
-'Menu:Procedure' => 'Catálogos procedimentos',
-'Menu:Procedure+' => 'Todos catálogos procedimentos',
-
-
-
-));
-
-//
-// Class: Organization
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
-
-));
-
-
-//
-// Class: ContractType
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ContractType' => 'Tipo contrato',
-	'Class:ContractType+' => '',
-));
-
-//
-// Class: Contract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Contract' => 'Contrato',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Nome',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => 'Cliente',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => 'Nome cliente',
-	'Class:Contract/Attribute:organization_name+' => 'Nome comum',
-	'Class:Contract/Attribute:contacts_list' => 'Contatos',
-	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos para este contrato com o cliente',
-	'Class:Contract/Attribute:documents_list' => 'Documentos',
-	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos para este contrato com o cliente',
-	'Class:Contract/Attribute:description' => 'Descrição',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Data início',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Data final',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Valor',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Valor atual',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dólares',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:contracttype_id' => 'Tipo contrato',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => 'Nome tipo contrato',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Frequência pagamento',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Valor unitário',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'Provedor(a)',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'Nome provedor(a)',
-	'Class:Contract/Attribute:provider_name+' => 'Nome comum',
-	'Class:Contract/Attribute:status' => 'Estado',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:Contract/Attribute:status/Value:production' => 'Produção',
-	'Class:Contract/Attribute:status/Value:production+' => 'Produção',
-	'Class:Contract/Attribute:finalclass' => 'Tipo',
-	'Class:Contract/Attribute:finalclass+' => '',
-));
-//
-// Class: CustomerContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CustomerContract' => 'Contrato cliente',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'Serviços',
-	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para o presente contrato',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ProviderContract' => 'Contrato provedor(a)',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração vinculados para esse contrato.',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'SLA',
-	'Class:ProviderContract/Attribute:coverage' => 'Horas de serviço',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-	'Class:ProviderContract/Attribute:contracttype_id' => 'Tipo contrato',
-	'Class:ProviderContract/Attribute:contracttype_id+' => '',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Nome tipo contrato',
-	'Class:ProviderContract/Attribute:contracttype_name+' => '',
-));
-
-//
-// Class: lnkContactToContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToContract' => 'Link Contato / Contrato',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Nome contrato',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-));
-
-//
-// Class: lnkContractToDocument
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nome contrato',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Documento',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Nome documento',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToProviderContract
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: ServiceFamily
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ServiceFamily' => 'Família serviços',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => 'Nome',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
-	'Class:ServiceFamily/Attribute:icon+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'Serviços',
-	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços para essa categoria',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Service' => 'Serviços',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => 'Nome',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Provedor(a)',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Nome provedor(a)',
-	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:servicefamily_id' => 'Família serviços',
-	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:servicefamily_name' => 'Nome família serviços',
-	'Class:Service/Attribute:servicefamily_name+' => '',
-	'Class:Service/Attribute:description' => 'Descrição',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => 'Documentos',
-	'Class:Service/Attribute:documents_list+' => 'Todos documentos vinculados com o serviço',
-	'Class:Service/Attribute:contacts_list' => 'Contatos',
-	'Class:Service/Attribute:contacts_list+' => 'Todos contatos com o serviço',
-	'Class:Service/Attribute:status' => 'Estado',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:Service/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'Produção',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Icon~~',
-	'Class:Service/Attribute:icon+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Contratos clientes',
-	'Class:Service/Attribute:customercontracts_list+' => 'Todos contratos de clientes que contrataram esse serviço',
-	'Class:Service/Attribute:providercontracts_list' => 'Contratos provedores',
-	'Class:Service/Attribute:providercontracts_list+' => 'Todos contratos provedores para suporte para esse serviço',
-	'Class:Service/Attribute:functionalcis_list' => 'CIs dependente',
-	'Class:Service/Attribute:functionalcis_list+' => 'Todos os itens de configuração que são utilizados para a prestação deste serviço',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Sub-categories serviço',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as sub-categorias para esse serviço',
-));
-
-//
-// Class: lnkDocumentToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Documento',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Nome documento',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkContactToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToService' => 'Link Contato / Serviço',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ServiceSubcategory' => 'Sub-categoria serviço',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Descrição',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Serviço',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Nome serviço',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo solicitação',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incidente',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
-	'Class:ServiceSubcategory/Attribute:status' => 'Estado',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'Implementação',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'Obsoleto',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produção',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Produção',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Nome',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => 'Descrição',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Provedor(a)',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:organization_name' => 'Nome provedor(a)',
-	'Class:SLA/Attribute:organization_name+' => 'Nome comum',
-	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'Todos os SLTs para essa SLA',
-	'Class:SLA/Attribute:customercontracts_list' => 'Contratos clientes',
-	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os contratos de clientes utilizando essa SLA',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Nome',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => 'Prioridade',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => 'Crítica',
-	'Class:SLT/Attribute:priority/Value:1+' => 'Crítica',
-	'Class:SLT/Attribute:priority/Value:2' => 'Alta',
-	'Class:SLT/Attribute:priority/Value:2+' => 'Alta',
-	'Class:SLT/Attribute:priority/Value:3' => 'Média',
-	'Class:SLT/Attribute:priority/Value:3+' => 'Média',
-	'Class:SLT/Attribute:priority/Value:4' => 'Baixa',
-	'Class:SLT/Attribute:priority/Value:4+' => 'Baixa',
-	'Class:SLT/Attribute:request_type' => 'Tipo solicitação',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidente',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incidente',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
-	'Class:SLT/Attribute:metric' => 'Métrica',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
-	'Class:SLT/Attribute:value' => 'Valor',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => 'Unidade',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => 'Horas',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'Minutos',
-));
-
-//
-// Class: lnkSLAToSLT
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nome SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'Nome SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-));
-
-//
-// Class: lnkCustomerContractToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToService' => 'Link Contrato cliente / Serviço',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato cliente',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nome contrato cliente',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nome SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-));
-
-//
-// Class: lnkProviderContractToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkProviderContractToService' => 'Link Contrato provedor(a) / Serviço',
-	'Class:lnkProviderContractToService+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Contrato provedor(a)',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToService' => 'Link CI / Serviço',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome serviço',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-));
-
-//
-// Class: DeliveryModel
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DeliveryModel' => 'Modelo entrega',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Nome',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Nome organização',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Nome comum',
-	'Class:DeliveryModel/Attribute:description' => 'Descrição',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contatos',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os contatos (Equipe e Pessoa) para esse Modelo entrega',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes com esse Modelo entrega',
-));
-
-//
-// Class: lnkDeliveryModelToContact
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDeliveryModelToContact' => 'Link Modelo entrega / Contato',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo entrega',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nome modelo entrega',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contato',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Nome contato',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Regra',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Nome regra',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
-));
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+'Menu:ServiceManagement' => 'Gerenciamento Serviços',
+'Menu:ServiceManagement+' => 'Gerenciamento Serviços',
+'Menu:Service:Overview' => 'Visão geral',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por estado',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos finalizando em menos de 30 dias',
+
+'Menu:ProviderContract' => 'Contratos Provedor(as)',
+'Menu:ProviderContract+' => 'Contratos Provedor(as)',
+'Menu:CustomerContract' => 'Contratos Clientes',
+'Menu:CustomerContract+' => 'Contratos Clientes',
+'Menu:ServiceSubcategory' => 'Sub-categorias serviços',
+'Menu:ServiceSubcategory+' => 'Sub-categorias serviços',
+'Menu:Service' => 'Serviços',
+'Menu:Service+' => 'Serviços',
+'Menu:ServiceElement' => 'Elementos seviços',
+'Menu:ServiceElement+' => 'Elementos seviços',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Lista Nível de Serviço Acordados',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Lista Nível de Metas de Serviço',
+'Menu:DeliveryModel' => 'Modelos entrega',
+'Menu:DeliveryModel+' => 'Modelos entrega',
+'Menu:ServiceFamily' => 'Família serviços',
+'Menu:ServiceFamily+' => 'Família serviços',
+'Menu:Procedure' => 'Catálogos procedimentos',
+'Menu:Procedure+' => 'Todos catálogos procedimentos',
+
+
+
+));
+
+//
+// Class: Organization
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo entrega',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Nome modelo entrega',
+
+));
+
+
+//
+// Class: ContractType
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ContractType' => 'Tipo contrato',
+	'Class:ContractType+' => '',
+));
+
+//
+// Class: Contract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Contract' => 'Contrato',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Nome',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Cliente',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Nome cliente',
+	'Class:Contract/Attribute:organization_name+' => 'Nome comum',
+	'Class:Contract/Attribute:contacts_list' => 'Contatos',
+	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos para este contrato com o cliente',
+	'Class:Contract/Attribute:documents_list' => 'Documentos',
+	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos para este contrato com o cliente',
+	'Class:Contract/Attribute:description' => 'Descrição',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Data início',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Data final',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Valor',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Valor atual',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dólares',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Tipo contrato',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Nome tipo contrato',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Frequência pagamento',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Valor unitário',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Provedor(a)',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Nome provedor(a)',
+	'Class:Contract/Attribute:provider_name+' => 'Nome comum',
+	'Class:Contract/Attribute:status' => 'Estado',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:Contract/Attribute:status/Value:production' => 'Produção',
+	'Class:Contract/Attribute:status/Value:production+' => 'Produção',
+	'Class:Contract/Attribute:finalclass' => 'Tipo',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+//
+// Class: CustomerContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CustomerContract' => 'Contrato cliente',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Serviços',
+	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para o presente contrato',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ProviderContract' => 'Contrato provedor(a)',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração vinculados para esse contrato.',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'SLA',
+	'Class:ProviderContract/Attribute:coverage' => 'Horas de serviço',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Tipo contrato',
+	'Class:ProviderContract/Attribute:contracttype_id+' => '',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Nome tipo contrato',
+	'Class:ProviderContract/Attribute:contracttype_name+' => '',
+));
+
+//
+// Class: lnkContactToContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToContract' => 'Link Contato / Contrato',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Nome contrato',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkContractToDocument
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Nome contrato',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Documento',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Nome documento',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'Link CI / Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: ServiceFamily
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ServiceFamily' => 'Família serviços',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Nome',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:icon+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Serviços',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços para essa categoria',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Service' => 'Serviços',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Nome',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Provedor(a)',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'Nome provedor(a)',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:servicefamily_id' => 'Família serviços',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'Nome família serviços',
+	'Class:Service/Attribute:servicefamily_name+' => '',
+	'Class:Service/Attribute:description' => 'Descrição',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Documentos',
+	'Class:Service/Attribute:documents_list+' => 'Todos documentos vinculados com o serviço',
+	'Class:Service/Attribute:contacts_list' => 'Contatos',
+	'Class:Service/Attribute:contacts_list+' => 'Todos contatos com o serviço',
+	'Class:Service/Attribute:status' => 'Estado',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:Service/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Produção',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Contratos clientes',
+	'Class:Service/Attribute:customercontracts_list+' => 'Todos contratos de clientes que contrataram esse serviço',
+	'Class:Service/Attribute:providercontracts_list' => 'Contratos provedores',
+	'Class:Service/Attribute:providercontracts_list+' => 'Todos contratos provedores para suporte para esse serviço',
+	'Class:Service/Attribute:functionalcis_list' => 'CIs dependente',
+	'Class:Service/Attribute:functionalcis_list+' => 'Todos os itens de configuração que são utilizados para a prestação deste serviço',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Sub-categories serviço',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as sub-categorias para esse serviço',
+));
+
+//
+// Class: lnkDocumentToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Documento',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Nome documento',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToService' => 'Link Contato / Serviço',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ServiceSubcategory' => 'Sub-categoria serviço',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Descrição',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Serviço',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Nome serviço',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo solicitação',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incidente',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
+	'Class:ServiceSubcategory/Attribute:status' => 'Estado',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'Implementação',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'Obsoleto',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produção',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Produção',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Nome',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'Descrição',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Provedor(a)',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Nome provedor(a)',
+	'Class:SLA/Attribute:organization_name+' => 'Nome comum',
+	'Class:SLA/Attribute:slts_list' => 'SLTs',
+	'Class:SLA/Attribute:slts_list+' => 'Todos os SLTs para essa SLA',
+	'Class:SLA/Attribute:customercontracts_list' => 'Contratos clientes',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os contratos de clientes utilizando essa SLA',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Nome',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Prioridade',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'Crítica',
+	'Class:SLT/Attribute:priority/Value:1+' => 'Crítica',
+	'Class:SLT/Attribute:priority/Value:2' => 'Alta',
+	'Class:SLT/Attribute:priority/Value:2+' => 'Alta',
+	'Class:SLT/Attribute:priority/Value:3' => 'Média',
+	'Class:SLT/Attribute:priority/Value:3+' => 'Média',
+	'Class:SLT/Attribute:priority/Value:4' => 'Baixa',
+	'Class:SLT/Attribute:priority/Value:4+' => 'Baixa',
+	'Class:SLT/Attribute:request_type' => 'Tipo solicitação',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidente',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incidente',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'Solicitação serviço',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Solicitação serviço',
+	'Class:SLT/Attribute:metric' => 'Métrica',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
+	'Class:SLT/Attribute:value' => 'Valor',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Unidade',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'Horas',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'Minutos',
+));
+
+//
+// Class: lnkSLAToSLT
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'Nome SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'Nome SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkCustomerContractToService' => 'Link Contrato cliente / Serviço',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato cliente',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nome contrato cliente',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nome SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+));
+
+//
+// Class: lnkProviderContractToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkProviderContractToService' => 'Link Contrato provedor(a) / Serviço',
+	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Contrato provedor(a)',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Nome contrato provedor(a)',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToService' => 'Link CI / Serviço',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Serviço',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Nome serviço',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: DeliveryModel
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:DeliveryModel' => 'Modelo entrega',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Nome',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Nome organização',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Nome comum',
+	'Class:DeliveryModel/Attribute:description' => 'Descrição',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contatos',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os contatos (Equipe e Pessoa) para esse Modelo entrega',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes com esse Modelo entrega',
+));
+
+//
+// Class: lnkDeliveryModelToContact
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkDeliveryModelToContact' => 'Link Modelo entrega / Contato',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo entrega',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Nome modelo entrega',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contato',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Nome contato',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Regra',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Nome regra',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+));
+
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php
index 9cc3a0d7f..1cf9a5f6f 100755
--- a/datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/tr.dict.itop-service-mgmt.php
@@ -1,610 +1,610 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-'Menu:ServiceManagement' => 'Hizmet Yönetimi',
-'Menu:ServiceManagement+' => 'Hizmet Yönetimi',
-'Menu:Service:Overview' => 'Özet',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Hizmet seviyesine göre sözleşmeler',
-'UI-ServiceManagementMenu-ContractsByStatus' => 'Durumuna göre sözleşmeler',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 gün çinde biten sözleşmeler',
-
-'Menu:ProviderContract' => 'Tedarikçi Sözleşmeleri',
-'Menu:ProviderContract+' => 'Tedarikçi Sözleşmeleri',
-'Menu:CustomerContract' => 'Müşteri Sözleşmeleri',
-'Menu:CustomerContract+' => 'Müşteri Sözleşmeleri',
-'Menu:ServiceSubcategory' => 'Hizmet alt kategorileri',
-'Menu:ServiceSubcategory+' => 'Hizmet alt kategorileri',
-'Menu:Service' => 'Hizmetler',
-'Menu:Service+' => 'Hizmetler',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => 'Hizmet Seviyesi Anlaşmaları',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => 'Hizmet Seviyesi Taahütleri',
-
-));
-
-//
-// Class: Contract
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Contract' => 'Sözleşme',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Adı',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:description' => 'Tanımlama',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Başlangıç Tarihi',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Bitiş Tarihi',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Maliyet',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Para Birimi',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'ABD Doları',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Avro',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Faturlandırma dönemleri',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:contact_list' => 'İrtibatlar',
-	'Class:Contract/Attribute:contact_list+' => 'Sözleşme için İrtibatlar',
-	'Class:Contract/Attribute:document_list' => 'Dokümanlar',
-	'Class:Contract/Attribute:document_list+' => 'Sözleşmeye eklenen dokümanlar',
-	'Class:Contract/Attribute:ci_list' => 'KK',
-	'Class:Contract/Attribute:ci_list+' => 'Sözleşme kapsamındaki KK',
-	'Class:Contract/Attribute:finalclass' => 'Tip',
-	'Class:Contract/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ProviderContract' => 'Tedarikçi Sözleşmesi',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:provider_id' => 'Tedarikçi',
-	'Class:ProviderContract/Attribute:provider_id+' => '',
-	'Class:ProviderContract/Attribute:provider_name' => 'Tedarikçi Adı',
-	'Class:ProviderContract/Attribute:provider_name+' => '',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
-	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-));
-
-//
-// Class: CustomerContract
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CustomerContract' => 'Müşteri Sözleşmesi',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:org_id' => 'Müşteri',
-	'Class:CustomerContract/Attribute:org_id+' => '',
-	'Class:CustomerContract/Attribute:org_name' => 'Müşteri Adı',
-	'Class:CustomerContract/Attribute:org_name+' => '',
-	'Class:CustomerContract/Attribute:provider_id' => 'Tedarikçi',
-	'Class:CustomerContract/Attribute:provider_id+' => '',
-	'Class:CustomerContract/Attribute:provider_name' => 'Tedarikçi Adı',
-	'Class:CustomerContract/Attribute:provider_name+' => '',
-	'Class:CustomerContract/Attribute:support_team_id' => 'Destek Ekibi',
-	'Class:CustomerContract/Attribute:support_team_id+' => '',
-	'Class:CustomerContract/Attribute:support_team_name' => 'Destek Ekibi',
-	'Class:CustomerContract/Attribute:support_team_name+' => '',
-	'Class:CustomerContract/Attribute:provider_list' => 'Tedarikçiler',
-	'Class:CustomerContract/Attribute:provider_list+' => '',
-	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
-	'Class:CustomerContract/Attribute:sla_list+' => 'List of SLA related to the contract',
-	'Class:CustomerContract/Attribute:provider_list' => 'Altyüklenici Sözleşmeleri',
-	'Class:CustomerContract/Attribute:sla_list+' => '',
-));
-//
-// Class: lnkCustomerContractToProviderContract
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkCustomerContractToProviderContract' => 'Müşteri ve Tedarikçi Sözleşmesi ilişkilendirmesi',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => 'Müşteri Sözleşmesi',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => 'Adı',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => 'Tedarikçi Sözleşmesi',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => 'Adı',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => 'Tedarikçi SLA',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => 'Hizmet Seviyesi Anlaşması',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => 'Hizmet süresi (saat)',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
-));
-
-
-//
-// Class: lnkContractToSLA
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContractToSLA' => 'Sözleşme/SLA',
-	'Class:lnkContractToSLA+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_id' => 'Sözleşme',
-	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_name' => 'Sözleşme',
-	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
-	'Class:lnkContractToSLA/Attribute:coverage' => 'Hizmet süresi (saat)',
-	'Class:lnkContractToSLA/Attribute:coverage+' => '',
-));
-
-//
-// Class: lnkContractToDoc
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContractToDoc' => 'Sözleşme/Doküman',
-	'Class:lnkContractToDoc+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_id' => 'Sözleşme',
-	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_name' => 'Sözleşme',
-	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_id' => 'Doküman',
-	'Class:lnkContractToDoc/Attribute:document_id+' => '',
-	'Class:lnkContractToDoc/Attribute:document_name' => 'Doküman',
-	'Class:lnkContractToDoc/Attribute:document_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_type' => 'Doküman tipi',
-	'Class:lnkContractToDoc/Attribute:document_type+' => '',
-	'Class:lnkContractToDoc/Attribute:document_status' => 'Doküman durumu',
-	'Class:lnkContractToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkContractToContact
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContractToContact' => 'Sözleşme/Sözleşme',
-	'Class:lnkContractToContact+' => '',
-	'Class:lnkContractToContact/Attribute:contract_id' => 'Sözleşme',
-	'Class:lnkContractToContact/Attribute:contract_id+' => '',
-	'Class:lnkContractToContact/Attribute:contract_name' => 'Sözleşme',
-	'Class:lnkContractToContact/Attribute:contract_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_id' => 'Sözleşme',
-	'Class:lnkContractToContact/Attribute:contact_id+' => '',
-	'Class:lnkContractToContact/Attribute:contact_name' => 'Sözleşme',
-	'Class:lnkContractToContact/Attribute:contact_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_email' => 'Sözleşme e-posta',
-	'Class:lnkContractToContact/Attribute:contact_email+' => '',
-	'Class:lnkContractToContact/Attribute:role' => 'Rol',
-	'Class:lnkContractToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkContractToCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkContractToCI' => 'Sözleşme/KK',
-	'Class:lnkContractToCI+' => '',
-	'Class:lnkContractToCI/Attribute:contract_id' => 'Sözleşme',
-	'Class:lnkContractToCI/Attribute:contract_id+' => '',
-	'Class:lnkContractToCI/Attribute:contract_name' => 'Sözleşme',
-	'Class:lnkContractToCI/Attribute:contract_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_id' => 'KK',
-	'Class:lnkContractToCI/Attribute:ci_id+' => '',
-	'Class:lnkContractToCI/Attribute:ci_name' => 'KK',
-	'Class:lnkContractToCI/Attribute:ci_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_status' => 'KK Durumu',
-	'Class:lnkContractToCI/Attribute:ci_status+' => '',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Service' => 'Hizmet',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:org_id' => 'Hizmet Sağlayıcı',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:provider_name' => 'Hizmet Sağlayıcı',
-	'Class:Service/Attribute:provider_name+' => '',
-	'Class:Service/Attribute:name' => 'Adı',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:description' => 'Tanımlama',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:type' => 'Tip',
-	'Class:Service/Attribute:type+' => '',
-	'Class:Service/Attribute:type/Value:IncidentManagement' => 'Arıza Yönetimi',
-	'Class:Service/Attribute:type/Value:IncidentManagement+' => 'Arıza Yönetimi',
-	'Class:Service/Attribute:type/Value:RequestManagement' => 'Çağrı Yönetimi',
-	'Class:Service/Attribute:type/Value:RequestManagement+' => 'Çağrı Yönetimi',
-	'Class:Service/Attribute:status' => 'Durum',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:design' => 'Tasarım',
-	'Class:Service/Attribute:status/Value:design+' => '',
-	'Class:Service/Attribute:status/Value:obsolete' => 'Üretimden Kalkan',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'Kullanımda',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:subcategory_list' => 'Hizmet alt kategorisi',
-	'Class:Service/Attribute:subcategory_list+' => '',
-	'Class:Service/Attribute:sla_list' => 'SLAs',
-	'Class:Service/Attribute:sla_list+' => '',
-	'Class:Service/Attribute:document_list' => 'Dokümanlar',
-	'Class:Service/Attribute:document_list+' => 'Hizmet bağlı dokümanlar',
-	'Class:Service/Attribute:contact_list' => 'Sözleşmeler',
-	'Class:Service/Attribute:contact_list+' => 'Hizmet ile ilintili Sözleşmeler',
-	'Class:Service/Tab:Related_Contracts' => 'Hizmet ile ilintili Sözleşmeler',
-	'Class:Service/Tab:Related_Contracts+' => 'Hizmet ile ilintili Sözleşmeler',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ServiceSubcategory' => 'Hizmet alt kategorisi',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Adı',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Tanımlama',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Hizmet',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Hizmet',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => 'Hizmet Seviyesi Anlaşması',
-	'Class:SLA/Attribute:name' => 'Adı',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:service_id' => 'Hizmet',
-	'Class:SLA/Attribute:service_id+' => '',
-	'Class:SLA/Attribute:service_name' => 'Hizmet',
-	'Class:SLA/Attribute:service_name+' => '',
-	'Class:SLA/Attribute:slt_list' => 'SLTs',
-	'Class:SLA/Attribute:slt_list+' => 'Hizmet Seviyesi Taahütler',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => 'Hizmet Seviyesi Taahütler',
-	'Class:SLT/Attribute:name' => 'Adı',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:metric' => 'Metrik',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
-	'Class:SLT/Attribute:ticket_priority' => 'Çağrı önceliği',
-	'Class:SLT/Attribute:ticket_priority+' => '',
-	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
-	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
-	'Class:SLT/Attribute:value' => 'Değer',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:value_unit' => 'Birim',
-	'Class:SLT/Attribute:value_unit+' => '',
-	'Class:SLT/Attribute:value_unit/Value:days' => 'gün',
-	'Class:SLT/Attribute:value_unit/Value:days+' => 'gün',
-	'Class:SLT/Attribute:value_unit/Value:hours' => 'saat',
-	'Class:SLT/Attribute:value_unit/Value:hours+' => 'saat',
-	'Class:SLT/Attribute:value_unit/Value:minutes' => 'dakika',
-	'Class:SLT/Attribute:value_unit/Value:minutes+' => 'dakika',
-	'Class:SLT/Attribute:sla_list' => 'SLAs',
-	'Class:SLT/Attribute:sla_list+' => 'SLAs using the SLT',
-));
-
-//
-// Class: lnkSLTToSLA
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkSLTToSLA' => 'SLT/SLA',
-	'Class:lnkSLTToSLA+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metrik',
-	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => 'Çağrı önceliği',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value' => 'Değer',
-	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => 'Birim',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
-));
-
-//
-// Class: lnkServiceToDoc
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkServiceToDoc' => 'Hizmet/Doküman',
-	'Class:lnkServiceToDoc+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_id' => 'Hizmet',
-	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_name' => 'Hizmet',
-	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_id' => 'Doküman',
-	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_name' => 'Doküman',
-	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_type' => 'Doküman tipi',
-	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_status' => 'Doküman durumu',
-	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkServiceToContact
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkServiceToContact' => 'Hizmet/Sözleşme',
-	'Class:lnkServiceToContact+' => '',
-	'Class:lnkServiceToContact/Attribute:service_id' => 'Hizmet',
-	'Class:lnkServiceToContact/Attribute:service_id+' => '',
-	'Class:lnkServiceToContact/Attribute:service_name' => 'Hizmet',
-	'Class:lnkServiceToContact/Attribute:service_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_id' => 'Sözleşme',
-	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_name' => 'Sözleşme',
-	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_email' => 'Sözleşme e-posta',
-	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
-	'Class:lnkServiceToContact/Attribute:role' => 'Rol',
-	'Class:lnkServiceToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkServiceToCI
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkServiceToCI' => 'Hizmet/KK',
-	'Class:lnkServiceToCI+' => '',
-	'Class:lnkServiceToCI/Attribute:service_id' => 'Hizmet',
-	'Class:lnkServiceToCI/Attribute:service_id+' => '',
-	'Class:lnkServiceToCI/Attribute:service_name' => 'Hizmet',
-	'Class:lnkServiceToCI/Attribute:service_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_id' => 'KK',
-	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_name' => 'KK',
-	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_status' => 'KK durumu',
-	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
-	'Menu:ServiceElement' => 'Sevice elements~~',
-	'Menu:ServiceElement+' => 'Sevice elements~~',
-	'Menu:DeliveryModel' => 'Delivery models~~',
-	'Menu:DeliveryModel+' => 'Delivery models~~',
-	'Menu:ServiceFamily' => 'Service families~~',
-	'Menu:ServiceFamily+' => 'Service families~~',
-	'Menu:Procedure' => 'Procedures catalog~~',
-	'Menu:Procedure+' => 'All procedures catalog~~',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:ContractType' => 'Contract Type~~',
-	'Class:Contract/Attribute:org_id' => 'Customer~~',
-	'Class:Contract/Attribute:organization_name' => 'Customer Name~~',
-	'Class:Contract/Attribute:organization_name+' => 'Common name~~',
-	'Class:Contract/Attribute:contacts_list' => 'Contacts~~',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
-	'Class:Contract/Attribute:documents_list' => 'Documents~~',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
-	'Class:Contract/Attribute:contracttype_id' => 'Contract type~~',
-	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name~~',
-	'Class:Contract/Attribute:provider_id' => 'Provider~~',
-	'Class:Contract/Attribute:provider_name' => 'Provider Name~~',
-	'Class:Contract/Attribute:provider_name+' => 'Common name~~',
-	'Class:Contract/Attribute:status' => 'Status~~',
-	'Class:Contract/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:Contract/Attribute:status/Value:production' => 'production~~',
-	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
-	'Class:CustomerContract/Attribute:services_list' => 'Services~~',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
-	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type~~',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name~~',
-	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name~~',
-	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Document~~',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:ServiceFamily' => 'Service Family~~',
-	'Class:ServiceFamily/Attribute:name' => 'Name~~',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
-	'Class:ServiceFamily/Attribute:services_list' => 'Services~~',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
-	'Class:Service/Attribute:organization_name' => 'Provider Name~~',
-	'Class:Service/Attribute:servicefamily_id' => 'Service Family~~',
-	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name~~',
-	'Class:Service/Attribute:documents_list' => 'Documents~~',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
-	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:Service/Attribute:icon' => 'Icon~~',
-	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts~~',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
-	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
-	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs~~',
-	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories~~',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
-	'Class:lnkDocumentToService' => 'Link Document / Service~~',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkContactToService' => 'Link Contact / Service~~',
-	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name~~',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
-	'Class:SLA/Attribute:description' => 'description~~',
-	'Class:SLA/Attribute:org_id' => 'Provider~~',
-	'Class:SLA/Attribute:organization_name' => 'Provider Name~~',
-	'Class:SLA/Attribute:organization_name+' => 'Common name~~',
-	'Class:SLA/Attribute:slts_list' => 'SLTs~~',
-	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
-	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
-	'Class:SLT/Attribute:priority' => 'Priority~~',
-	'Class:SLT/Attribute:priority/Value:1' => 'critical~~',
-	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
-	'Class:SLT/Attribute:priority/Value:2' => 'high~~',
-	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
-	'Class:SLT/Attribute:priority/Value:3' => 'medium~~',
-	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
-	'Class:SLT/Attribute:priority/Value:4' => 'low~~',
-	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
-	'Class:SLT/Attribute:request_type' => 'Request type~~',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'incident~~',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request~~',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR~~',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
-	'Class:SLT/Attribute:unit' => 'Unit~~',
-	'Class:SLT/Attribute:unit/Value:hours' => 'hours~~',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT~~',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name~~',
-	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA~~',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
-	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:DeliveryModel' => 'Delivery Model~~',
-	'Class:DeliveryModel/Attribute:name' => 'Name~~',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organization~~',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name~~',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
-	'Class:DeliveryModel/Attribute:description' => 'Description~~',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts~~',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Customers~~',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
-	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role~~',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
-));
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+'Menu:ServiceManagement' => 'Hizmet Yönetimi',
+'Menu:ServiceManagement+' => 'Hizmet Yönetimi',
+'Menu:Service:Overview' => 'Özet',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Hizmet seviyesine göre sözleşmeler',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'Durumuna göre sözleşmeler',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 gün çinde biten sözleşmeler',
+
+'Menu:ProviderContract' => 'Tedarikçi Sözleşmeleri',
+'Menu:ProviderContract+' => 'Tedarikçi Sözleşmeleri',
+'Menu:CustomerContract' => 'Müşteri Sözleşmeleri',
+'Menu:CustomerContract+' => 'Müşteri Sözleşmeleri',
+'Menu:ServiceSubcategory' => 'Hizmet alt kategorileri',
+'Menu:ServiceSubcategory+' => 'Hizmet alt kategorileri',
+'Menu:Service' => 'Hizmetler',
+'Menu:Service+' => 'Hizmetler',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'Hizmet Seviyesi Anlaşmaları',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => 'Hizmet Seviyesi Taahütleri',
+
+));
+
+//
+// Class: Contract
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Contract' => 'Sözleşme',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Adı',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:description' => 'Tanımlama',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Başlangıç Tarihi',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Bitiş Tarihi',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Maliyet',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Para Birimi',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'ABD Doları',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Avro',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Faturlandırma dönemleri',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:contact_list' => 'İrtibatlar',
+	'Class:Contract/Attribute:contact_list+' => 'Sözleşme için İrtibatlar',
+	'Class:Contract/Attribute:document_list' => 'Dokümanlar',
+	'Class:Contract/Attribute:document_list+' => 'Sözleşmeye eklenen dokümanlar',
+	'Class:Contract/Attribute:ci_list' => 'KK',
+	'Class:Contract/Attribute:ci_list+' => 'Sözleşme kapsamındaki KK',
+	'Class:Contract/Attribute:finalclass' => 'Tip',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ProviderContract' => 'Tedarikçi Sözleşmesi',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:provider_id' => 'Tedarikçi',
+	'Class:ProviderContract/Attribute:provider_id+' => '',
+	'Class:ProviderContract/Attribute:provider_name' => 'Tedarikçi Adı',
+	'Class:ProviderContract/Attribute:provider_name+' => '',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
+	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CustomerContract' => 'Müşteri Sözleşmesi',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:org_id' => 'Müşteri',
+	'Class:CustomerContract/Attribute:org_id+' => '',
+	'Class:CustomerContract/Attribute:org_name' => 'Müşteri Adı',
+	'Class:CustomerContract/Attribute:org_name+' => '',
+	'Class:CustomerContract/Attribute:provider_id' => 'Tedarikçi',
+	'Class:CustomerContract/Attribute:provider_id+' => '',
+	'Class:CustomerContract/Attribute:provider_name' => 'Tedarikçi Adı',
+	'Class:CustomerContract/Attribute:provider_name+' => '',
+	'Class:CustomerContract/Attribute:support_team_id' => 'Destek Ekibi',
+	'Class:CustomerContract/Attribute:support_team_id+' => '',
+	'Class:CustomerContract/Attribute:support_team_name' => 'Destek Ekibi',
+	'Class:CustomerContract/Attribute:support_team_name+' => '',
+	'Class:CustomerContract/Attribute:provider_list' => 'Tedarikçiler',
+	'Class:CustomerContract/Attribute:provider_list+' => '',
+	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
+	'Class:CustomerContract/Attribute:sla_list+' => 'List of SLA related to the contract',
+	'Class:CustomerContract/Attribute:provider_list' => 'Altyüklenici Sözleşmeleri',
+	'Class:CustomerContract/Attribute:sla_list+' => '',
+));
+//
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkCustomerContractToProviderContract' => 'Müşteri ve Tedarikçi Sözleşmesi ilişkilendirmesi',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => 'Müşteri Sözleşmesi',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => 'Adı',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => 'Tedarikçi Sözleşmesi',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => 'Adı',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => 'Tedarikçi SLA',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => 'Hizmet Seviyesi Anlaşması',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => 'Hizmet süresi (saat)',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
+));
+
+
+//
+// Class: lnkContractToSLA
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContractToSLA' => 'Sözleşme/SLA',
+	'Class:lnkContractToSLA+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_id' => 'Sözleşme',
+	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_name' => 'Sözleşme',
+	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
+	'Class:lnkContractToSLA/Attribute:coverage' => 'Hizmet süresi (saat)',
+	'Class:lnkContractToSLA/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContractToDoc
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContractToDoc' => 'Sözleşme/Doküman',
+	'Class:lnkContractToDoc+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_id' => 'Sözleşme',
+	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_name' => 'Sözleşme',
+	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_id' => 'Doküman',
+	'Class:lnkContractToDoc/Attribute:document_id+' => '',
+	'Class:lnkContractToDoc/Attribute:document_name' => 'Doküman',
+	'Class:lnkContractToDoc/Attribute:document_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_type' => 'Doküman tipi',
+	'Class:lnkContractToDoc/Attribute:document_type+' => '',
+	'Class:lnkContractToDoc/Attribute:document_status' => 'Doküman durumu',
+	'Class:lnkContractToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkContractToContact
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContractToContact' => 'Sözleşme/Sözleşme',
+	'Class:lnkContractToContact+' => '',
+	'Class:lnkContractToContact/Attribute:contract_id' => 'Sözleşme',
+	'Class:lnkContractToContact/Attribute:contract_id+' => '',
+	'Class:lnkContractToContact/Attribute:contract_name' => 'Sözleşme',
+	'Class:lnkContractToContact/Attribute:contract_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_id' => 'Sözleşme',
+	'Class:lnkContractToContact/Attribute:contact_id+' => '',
+	'Class:lnkContractToContact/Attribute:contact_name' => 'Sözleşme',
+	'Class:lnkContractToContact/Attribute:contact_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_email' => 'Sözleşme e-posta',
+	'Class:lnkContractToContact/Attribute:contact_email+' => '',
+	'Class:lnkContractToContact/Attribute:role' => 'Rol',
+	'Class:lnkContractToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkContractToCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkContractToCI' => 'Sözleşme/KK',
+	'Class:lnkContractToCI+' => '',
+	'Class:lnkContractToCI/Attribute:contract_id' => 'Sözleşme',
+	'Class:lnkContractToCI/Attribute:contract_id+' => '',
+	'Class:lnkContractToCI/Attribute:contract_name' => 'Sözleşme',
+	'Class:lnkContractToCI/Attribute:contract_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_id' => 'KK',
+	'Class:lnkContractToCI/Attribute:ci_id+' => '',
+	'Class:lnkContractToCI/Attribute:ci_name' => 'KK',
+	'Class:lnkContractToCI/Attribute:ci_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_status' => 'KK Durumu',
+	'Class:lnkContractToCI/Attribute:ci_status+' => '',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Service' => 'Hizmet',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:org_id' => 'Hizmet Sağlayıcı',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:provider_name' => 'Hizmet Sağlayıcı',
+	'Class:Service/Attribute:provider_name+' => '',
+	'Class:Service/Attribute:name' => 'Adı',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:description' => 'Tanımlama',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:type' => 'Tip',
+	'Class:Service/Attribute:type+' => '',
+	'Class:Service/Attribute:type/Value:IncidentManagement' => 'Arıza Yönetimi',
+	'Class:Service/Attribute:type/Value:IncidentManagement+' => 'Arıza Yönetimi',
+	'Class:Service/Attribute:type/Value:RequestManagement' => 'Çağrı Yönetimi',
+	'Class:Service/Attribute:type/Value:RequestManagement+' => 'Çağrı Yönetimi',
+	'Class:Service/Attribute:status' => 'Durum',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:design' => 'Tasarım',
+	'Class:Service/Attribute:status/Value:design+' => '',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Üretimden Kalkan',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Kullanımda',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:subcategory_list' => 'Hizmet alt kategorisi',
+	'Class:Service/Attribute:subcategory_list+' => '',
+	'Class:Service/Attribute:sla_list' => 'SLAs',
+	'Class:Service/Attribute:sla_list+' => '',
+	'Class:Service/Attribute:document_list' => 'Dokümanlar',
+	'Class:Service/Attribute:document_list+' => 'Hizmet bağlı dokümanlar',
+	'Class:Service/Attribute:contact_list' => 'Sözleşmeler',
+	'Class:Service/Attribute:contact_list+' => 'Hizmet ile ilintili Sözleşmeler',
+	'Class:Service/Tab:Related_Contracts' => 'Hizmet ile ilintili Sözleşmeler',
+	'Class:Service/Tab:Related_Contracts+' => 'Hizmet ile ilintili Sözleşmeler',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ServiceSubcategory' => 'Hizmet alt kategorisi',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Adı',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Tanımlama',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Hizmet',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Hizmet',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => 'Hizmet Seviyesi Anlaşması',
+	'Class:SLA/Attribute:name' => 'Adı',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:service_id' => 'Hizmet',
+	'Class:SLA/Attribute:service_id+' => '',
+	'Class:SLA/Attribute:service_name' => 'Hizmet',
+	'Class:SLA/Attribute:service_name+' => '',
+	'Class:SLA/Attribute:slt_list' => 'SLTs',
+	'Class:SLA/Attribute:slt_list+' => 'Hizmet Seviyesi Taahütler',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => 'Hizmet Seviyesi Taahütler',
+	'Class:SLT/Attribute:name' => 'Adı',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:metric' => 'Metrik',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
+	'Class:SLT/Attribute:ticket_priority' => 'Çağrı önceliği',
+	'Class:SLT/Attribute:ticket_priority+' => '',
+	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
+	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
+	'Class:SLT/Attribute:value' => 'Değer',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:value_unit' => 'Birim',
+	'Class:SLT/Attribute:value_unit+' => '',
+	'Class:SLT/Attribute:value_unit/Value:days' => 'gün',
+	'Class:SLT/Attribute:value_unit/Value:days+' => 'gün',
+	'Class:SLT/Attribute:value_unit/Value:hours' => 'saat',
+	'Class:SLT/Attribute:value_unit/Value:hours+' => 'saat',
+	'Class:SLT/Attribute:value_unit/Value:minutes' => 'dakika',
+	'Class:SLT/Attribute:value_unit/Value:minutes+' => 'dakika',
+	'Class:SLT/Attribute:sla_list' => 'SLAs',
+	'Class:SLT/Attribute:sla_list+' => 'SLAs using the SLT',
+));
+
+//
+// Class: lnkSLTToSLA
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkSLTToSLA' => 'SLT/SLA',
+	'Class:lnkSLTToSLA+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metrik',
+	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => 'Çağrı önceliği',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value' => 'Değer',
+	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => 'Birim',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
+));
+
+//
+// Class: lnkServiceToDoc
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkServiceToDoc' => 'Hizmet/Doküman',
+	'Class:lnkServiceToDoc+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_id' => 'Hizmet',
+	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_name' => 'Hizmet',
+	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_id' => 'Doküman',
+	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_name' => 'Doküman',
+	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_type' => 'Doküman tipi',
+	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_status' => 'Doküman durumu',
+	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkServiceToContact
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkServiceToContact' => 'Hizmet/Sözleşme',
+	'Class:lnkServiceToContact+' => '',
+	'Class:lnkServiceToContact/Attribute:service_id' => 'Hizmet',
+	'Class:lnkServiceToContact/Attribute:service_id+' => '',
+	'Class:lnkServiceToContact/Attribute:service_name' => 'Hizmet',
+	'Class:lnkServiceToContact/Attribute:service_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_id' => 'Sözleşme',
+	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_name' => 'Sözleşme',
+	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_email' => 'Sözleşme e-posta',
+	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
+	'Class:lnkServiceToContact/Attribute:role' => 'Rol',
+	'Class:lnkServiceToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkServiceToCI
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkServiceToCI' => 'Hizmet/KK',
+	'Class:lnkServiceToCI+' => '',
+	'Class:lnkServiceToCI/Attribute:service_id' => 'Hizmet',
+	'Class:lnkServiceToCI/Attribute:service_id+' => '',
+	'Class:lnkServiceToCI/Attribute:service_name' => 'Hizmet',
+	'Class:lnkServiceToCI/Attribute:service_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_id' => 'KK',
+	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_name' => 'KK',
+	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_status' => 'KK durumu',
+	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
+	'Menu:ServiceElement' => 'Sevice elements~~',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
+	'Menu:DeliveryModel' => 'Delivery models~~',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
+	'Menu:ServiceFamily' => 'Service families~~',
+	'Menu:ServiceFamily+' => 'Service families~~',
+	'Menu:Procedure' => 'Procedures catalog~~',
+	'Menu:Procedure+' => 'All procedures catalog~~',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:ContractType' => 'Contract Type~~',
+	'Class:Contract/Attribute:org_id' => 'Customer~~',
+	'Class:Contract/Attribute:organization_name' => 'Customer Name~~',
+	'Class:Contract/Attribute:organization_name+' => 'Common name~~',
+	'Class:Contract/Attribute:contacts_list' => 'Contacts~~',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:documents_list' => 'Documents~~',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:contracttype_id' => 'Contract type~~',
+	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name~~',
+	'Class:Contract/Attribute:provider_id' => 'Provider~~',
+	'Class:Contract/Attribute:provider_name' => 'Provider Name~~',
+	'Class:Contract/Attribute:provider_name+' => 'Common name~~',
+	'Class:Contract/Attribute:status' => 'Status~~',
+	'Class:Contract/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:production' => 'production~~',
+	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
+	'Class:CustomerContract/Attribute:services_list' => 'Services~~',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type~~',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name~~',
+	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name~~',
+	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Document~~',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:ServiceFamily' => 'Service Family~~',
+	'Class:ServiceFamily/Attribute:name' => 'Name~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:services_list' => 'Services~~',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:Service/Attribute:organization_name' => 'Provider Name~~',
+	'Class:Service/Attribute:servicefamily_id' => 'Service Family~~',
+	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name~~',
+	'Class:Service/Attribute:documents_list' => 'Documents~~',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts~~',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
+	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs~~',
+	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories~~',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:lnkDocumentToService' => 'Link Document / Service~~',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkContactToService' => 'Link Contact / Service~~',
+	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name~~',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
+	'Class:SLA/Attribute:description' => 'description~~',
+	'Class:SLA/Attribute:org_id' => 'Provider~~',
+	'Class:SLA/Attribute:organization_name' => 'Provider Name~~',
+	'Class:SLA/Attribute:organization_name+' => 'Common name~~',
+	'Class:SLA/Attribute:slts_list' => 'SLTs~~',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
+	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+	'Class:SLT/Attribute:priority' => 'Priority~~',
+	'Class:SLT/Attribute:priority/Value:1' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:2' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:3' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:4' => 'low~~',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
+	'Class:SLT/Attribute:request_type' => 'Request type~~',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request~~',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR~~',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
+	'Class:SLT/Attribute:unit' => 'Unit~~',
+	'Class:SLT/Attribute:unit/Value:hours' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT~~',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name~~',
+	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
+	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:DeliveryModel' => 'Delivery Model~~',
+	'Class:DeliveryModel/Attribute:name' => 'Name~~',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organization~~',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name~~',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
+	'Class:DeliveryModel/Attribute:description' => 'Description~~',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Customers~~',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
+));
+
+
+?>
diff --git a/datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php b/datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
index 791b73330..66ceeed30 100755
--- a/datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
@@ -1,621 +1,621 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-'Menu:ServiceManagement' => '服务管理',
-'Menu:ServiceManagement+' => '服务管理概览',
-'Menu:Service:Overview' => '概览',
-'Menu:Service:Overview+' => '',
-'UI-ServiceManagementMenu-ContractsBySrvLevel' => '按服务层级划分合同',
-'UI-ServiceManagementMenu-ContractsByStatus' => '按状态划分合同',
-'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '合同30天内终止',
-
-'Menu:ProviderContract' => '供应商合同',
-'Menu:ProviderContract+' => '供应商合同',
-'Menu:CustomerContract' => '客户合同',
-'Menu:CustomerContract+' => '客户合同',
-'Menu:ServiceSubcategory' => '服务子级类目',
-'Menu:ServiceSubcategory+' => '服务子级类目',
-'Menu:Service' => '服务',
-'Menu:Service+' => '服务',
-'Menu:SLA' => 'SLAs',
-'Menu:SLA+' => '服务级别协议',
-'Menu:SLT' => 'SLTs',
-'Menu:SLT+' => '服务级别目标',
-
-));
-
-
-/*
-	'UI:ServiceManagementMenu' => 'Gestion des Services',
-	'UI:ServiceManagementMenu+' => 'Gestion des Services',
-	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
-*/
-
-
-//
-// Class: Contract
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Contract' => '合同',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => '名称',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:description' => '描述',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => '启始日期',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => '截止日期',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => '费用',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => '费用货币',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => '美元',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => '欧元',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:cost_unit' => '费用单位',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:billing_frequency' => '付款周期',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:contact_list' => '合同',
-	'Class:Contract/Attribute:contact_list+' => '与该合同相关的合同能够',
-	'Class:Contract/Attribute:document_list' => '文档',
-	'Class:Contract/Attribute:document_list+' => '与该合同关联的文档',
-	'Class:Contract/Attribute:ci_list' => 'CIs',
-	'Class:Contract/Attribute:ci_list+' => '该合同所支持的 CI',
-	'Class:Contract/Attribute:finalclass' => '类别',
-	'Class:Contract/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ProviderContract
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ProviderContract' => '供应商合同',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:provider_id' => '供应商',
-	'Class:ProviderContract/Attribute:provider_id+' => '',
-	'Class:ProviderContract/Attribute:provider_name' => '供应商名称',
-	'Class:ProviderContract/Attribute:provider_name+' => '',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => '服务级别协议',
-	'Class:ProviderContract/Attribute:coverage' => '服务小时数',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-));
-
-//
-// Class: CustomerContract
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CustomerContract' => '客户合同',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:org_id' => '客户',
-	'Class:CustomerContract/Attribute:org_id+' => '',
-	'Class:CustomerContract/Attribute:org_name' => '客户名称',
-	'Class:CustomerContract/Attribute:org_name+' => '',
-	'Class:CustomerContract/Attribute:provider_id' => '供应商',
-	'Class:CustomerContract/Attribute:provider_id+' => '',
-	'Class:CustomerContract/Attribute:provider_name' => '供应商名称',
-	'Class:CustomerContract/Attribute:provider_name+' => '',
-	'Class:CustomerContract/Attribute:support_team_id' => '支持团队',
-	'Class:CustomerContract/Attribute:support_team_id+' => '',
-	'Class:CustomerContract/Attribute:support_team_name' => '支持团队',
-	'Class:CustomerContract/Attribute:support_team_name+' => '',
-	'Class:CustomerContract/Attribute:provider_list' => '供应商',
-	'Class:CustomerContract/Attribute:provider_list+' => '',
-	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
-	'Class:CustomerContract/Attribute:sla_list+' => '与该合同相关的 SLA 列表',
-	'Class:CustomerContract/Attribute:provider_list' => '支撑合同',
-	'Class:CustomerContract/Attribute:sla_list+' => '',
-));
-//
-// Class: lnkCustomerContractToProviderContract
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkCustomerContractToProviderContract' => 'lnkCustomerContractToProviderContract',
-	'Class:lnkCustomerContractToProviderContract+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => '客户合同',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => '名称',
-	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => '供应商合同',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => '名称',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => '供应商 SLA',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => '服务级别协议',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => '服务小时数',
-	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
-));
-
-
-//
-// Class: lnkContractToSLA
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContractToSLA' => '合同/SLA',
-	'Class:lnkContractToSLA+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_id' => '合同',
-	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
-	'Class:lnkContractToSLA/Attribute:contract_name' => '合同',
-	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
-	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
-	'Class:lnkContractToSLA/Attribute:coverage' => '服务小时数',
-	'Class:lnkContractToSLA/Attribute:coverage+' => '',
-));
-
-//
-// Class: lnkContractToDoc
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContractToDoc' => '合同/文档',
-	'Class:lnkContractToDoc+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_id' => '合同',
-	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
-	'Class:lnkContractToDoc/Attribute:contract_name' => '合同',
-	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_id' => '文档',
-	'Class:lnkContractToDoc/Attribute:document_id+' => '',
-	'Class:lnkContractToDoc/Attribute:document_name' => '文档',
-	'Class:lnkContractToDoc/Attribute:document_name+' => '',
-	'Class:lnkContractToDoc/Attribute:document_type' => '文档类别',
-	'Class:lnkContractToDoc/Attribute:document_type+' => '',
-	'Class:lnkContractToDoc/Attribute:document_status' => '文档状态',
-	'Class:lnkContractToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkContractToContact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContractToContact' => '合同/联系人',
-	'Class:lnkContractToContact+' => '',
-	'Class:lnkContractToContact/Attribute:contract_id' => '合同',
-	'Class:lnkContractToContact/Attribute:contract_id+' => '',
-	'Class:lnkContractToContact/Attribute:contract_name' => '合同',
-	'Class:lnkContractToContact/Attribute:contract_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_id' => '联系人',
-	'Class:lnkContractToContact/Attribute:contact_id+' => '',
-	'Class:lnkContractToContact/Attribute:contact_name' => '联系人',
-	'Class:lnkContractToContact/Attribute:contact_name+' => '',
-	'Class:lnkContractToContact/Attribute:contact_email' => '联系人 email',
-	'Class:lnkContractToContact/Attribute:contact_email+' => '',
-	'Class:lnkContractToContact/Attribute:role' => '角色',
-	'Class:lnkContractToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkContractToCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkContractToCI' => '合同/CI',
-	'Class:lnkContractToCI+' => '',
-	'Class:lnkContractToCI/Attribute:contract_id' => '合同',
-	'Class:lnkContractToCI/Attribute:contract_id+' => '',
-	'Class:lnkContractToCI/Attribute:contract_name' => '合同',
-	'Class:lnkContractToCI/Attribute:contract_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkContractToCI/Attribute:ci_id+' => '',
-	'Class:lnkContractToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkContractToCI/Attribute:ci_name+' => '',
-	'Class:lnkContractToCI/Attribute:ci_status' => 'CI 状态',
-	'Class:lnkContractToCI/Attribute:ci_status+' => '',
-));
-
-//
-// Class: Service
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Service' => '服务',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:org_id' => '供应商',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:provider_name' => '供应商',
-	'Class:Service/Attribute:provider_name+' => '',
-	'Class:Service/Attribute:name' => '名称',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:description' => '描述',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:type' => '类别',
-	'Class:Service/Attribute:type+' => '',
-	'Class:Service/Attribute:type/Value:IncidentManagement' => '事件管理',
-	'Class:Service/Attribute:type/Value:IncidentManagement+' => '事件管理',
-	'Class:Service/Attribute:type/Value:RequestManagement' => '请求管理',
-	'Class:Service/Attribute:type/Value:RequestManagement+' => '请求管理',
-	'Class:Service/Attribute:status' => '状态',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:design' => '设计',
-	'Class:Service/Attribute:status/Value:design+' => '',
-	'Class:Service/Attribute:status/Value:obsolete' => '废弃',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => '生产',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:subcategory_list' => '服务子级类目',
-	'Class:Service/Attribute:subcategory_list+' => '',
-	'Class:Service/Attribute:sla_list' => 'SLAs',
-	'Class:Service/Attribute:sla_list+' => '',
-	'Class:Service/Attribute:document_list' => '文档',
-	'Class:Service/Attribute:document_list+' => '与此服务相关的文档',
-	'Class:Service/Attribute:contact_list' => '联系人',
-	'Class:Service/Attribute:contact_list+' => '在此服务中承担角色的联系人',
-	'Class:Service/Tab:Related_Contracts' => '相关合同',
-	'Class:Service/Tab:Related_Contracts+' => '为此服务签订的合同',
-));
-
-//
-// Class: ServiceSubcategory
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ServiceSubcategory' => '服务子级类目',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => '名称',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => '描述',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => '服务',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => '服务',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-));
-
-//
-// Class: SLA
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => '名称',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:service_id' => '服务',
-	'Class:SLA/Attribute:service_id+' => '',
-	'Class:SLA/Attribute:service_name' => '服务',
-	'Class:SLA/Attribute:service_name+' => '',
-	'Class:SLA/Attribute:slt_list' => 'SLTs',
-	'Class:SLA/Attribute:slt_list+' => 'List Service Level Thresholds',
-));
-
-//
-// Class: SLT
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => '名称',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:metric' => 'Metric',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
-	'Class:SLT/Attribute:ticket_priority' => '单据优先级',
-	'Class:SLT/Attribute:ticket_priority+' => '',
-	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
-	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
-	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
-	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
-	'Class:SLT/Attribute:value' => '值',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:value_unit' => '单位',
-	'Class:SLT/Attribute:value_unit+' => '',
-	'Class:SLT/Attribute:value_unit/Value:days' => '天',
-	'Class:SLT/Attribute:value_unit/Value:days+' => '天',
-	'Class:SLT/Attribute:value_unit/Value:hours' => '小时',
-	'Class:SLT/Attribute:value_unit/Value:hours+' => '小时',
-	'Class:SLT/Attribute:value_unit/Value:minutes' => '分钟',
-	'Class:SLT/Attribute:value_unit/Value:minutes+' => '分钟',
-	'Class:SLT/Attribute:sla_list' => 'SLAs',
-	'Class:SLT/Attribute:sla_list+' => '使用此 SLT 的 SLAs',
-));
-
-//
-// Class: lnkSLTToSLA
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkSLTToSLA' => 'SLT/SLA',
-	'Class:lnkSLTToSLA+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
-	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
-	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metric',
-	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => '单据优先级',
-	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value' => '值',
-	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => '单位',
-	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
-));
-
-//
-// Class: lnkServiceToDoc
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkServiceToDoc' => '服务/文档',
-	'Class:lnkServiceToDoc+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_id' => '服务',
-	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:service_name' => '服务',
-	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_id' => '文档',
-	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_name' => '文档',
-	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_type' => '文档类别',
-	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
-	'Class:lnkServiceToDoc/Attribute:document_status' => '文档状态',
-	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
-));
-
-//
-// Class: lnkServiceToContact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkServiceToContact' => '服务/联系人',
-	'Class:lnkServiceToContact+' => '',
-	'Class:lnkServiceToContact/Attribute:service_id' => '服务',
-	'Class:lnkServiceToContact/Attribute:service_id+' => '',
-	'Class:lnkServiceToContact/Attribute:service_name' => '服务',
-	'Class:lnkServiceToContact/Attribute:service_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_id' => '联系人',
-	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_name' => '联系人',
-	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
-	'Class:lnkServiceToContact/Attribute:contact_email' => '联系人 email',
-	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
-	'Class:lnkServiceToContact/Attribute:role' => '角色',
-	'Class:lnkServiceToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkServiceToCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkServiceToCI' => '服务/CI',
-	'Class:lnkServiceToCI+' => '',
-	'Class:lnkServiceToCI/Attribute:service_id' => '服务',
-	'Class:lnkServiceToCI/Attribute:service_id+' => '',
-	'Class:lnkServiceToCI/Attribute:service_name' => '服务',
-	'Class:lnkServiceToCI/Attribute:service_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
-	'Class:lnkServiceToCI/Attribute:ci_status' => 'CI 状态',
-	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
-	'Menu:ServiceElement' => 'Sevice elements~~',
-	'Menu:ServiceElement+' => 'Sevice elements~~',
-	'Menu:DeliveryModel' => 'Delivery models~~',
-	'Menu:DeliveryModel+' => 'Delivery models~~',
-	'Menu:ServiceFamily' => 'Service families~~',
-	'Menu:ServiceFamily+' => 'Service families~~',
-	'Menu:Procedure' => 'Procedures catalog~~',
-	'Menu:Procedure+' => 'All procedures catalog~~',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:ContractType' => 'Contract Type~~',
-	'Class:Contract/Attribute:org_id' => 'Customer~~',
-	'Class:Contract/Attribute:organization_name' => 'Customer Name~~',
-	'Class:Contract/Attribute:organization_name+' => 'Common name~~',
-	'Class:Contract/Attribute:contacts_list' => 'Contacts~~',
-	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
-	'Class:Contract/Attribute:documents_list' => 'Documents~~',
-	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
-	'Class:Contract/Attribute:contracttype_id' => 'Contract type~~',
-	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name~~',
-	'Class:Contract/Attribute:provider_id' => 'Provider~~',
-	'Class:Contract/Attribute:provider_name' => 'Provider Name~~',
-	'Class:Contract/Attribute:provider_name+' => 'Common name~~',
-	'Class:Contract/Attribute:status' => 'Status~~',
-	'Class:Contract/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:Contract/Attribute:status/Value:production' => 'production~~',
-	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
-	'Class:CustomerContract/Attribute:services_list' => 'Services~~',
-	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs~~',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
-	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type~~',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name~~',
-	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name~~',
-	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Document~~',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:ServiceFamily' => 'Service Family~~',
-	'Class:ServiceFamily/Attribute:name' => 'Name~~',
-	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
-	'Class:ServiceFamily/Attribute:services_list' => 'Services~~',
-	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
-	'Class:Service/Attribute:organization_name' => 'Provider Name~~',
-	'Class:Service/Attribute:servicefamily_id' => 'Service Family~~',
-	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name~~',
-	'Class:Service/Attribute:documents_list' => 'Documents~~',
-	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
-	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
-	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:Service/Attribute:icon' => 'Icon~~',
-	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts~~',
-	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
-	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts~~',
-	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
-	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs~~',
-	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories~~',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
-	'Class:lnkDocumentToService' => 'Link Document / Service~~',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Document~~',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name~~',
-	'Class:lnkContactToService' => 'Link Contact / Service~~',
-	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name~~',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
-	'Class:SLA/Attribute:description' => 'description~~',
-	'Class:SLA/Attribute:org_id' => 'Provider~~',
-	'Class:SLA/Attribute:organization_name' => 'Provider Name~~',
-	'Class:SLA/Attribute:organization_name+' => 'Common name~~',
-	'Class:SLA/Attribute:slts_list' => 'SLTs~~',
-	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
-	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
-	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
-	'Class:SLT/Attribute:priority' => 'Priority~~',
-	'Class:SLT/Attribute:priority/Value:1' => 'critical~~',
-	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
-	'Class:SLT/Attribute:priority/Value:2' => 'high~~',
-	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
-	'Class:SLT/Attribute:priority/Value:3' => 'medium~~',
-	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
-	'Class:SLT/Attribute:priority/Value:4' => 'low~~',
-	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
-	'Class:SLT/Attribute:request_type' => 'Request type~~',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'incident~~',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request~~',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR~~',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
-	'Class:SLT/Attribute:unit' => 'Unit~~',
-	'Class:SLT/Attribute:unit/Value:hours' => 'hours~~',
-	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
-	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT~~',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name~~',
-	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA~~',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
-	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract~~',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name~~',
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
-	'Class:DeliveryModel' => 'Delivery Model~~',
-	'Class:DeliveryModel/Attribute:name' => 'Name~~',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organization~~',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name~~',
-	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
-	'Class:DeliveryModel/Attribute:description' => 'Description~~',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts~~',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Customers~~',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
-	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact~~',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name~~',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role~~',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
-));
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+'Menu:ServiceManagement' => '服务管理',
+'Menu:ServiceManagement+' => '服务管理概览',
+'Menu:Service:Overview' => '概览',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => '按服务层级划分合同',
+'UI-ServiceManagementMenu-ContractsByStatus' => '按状态划分合同',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '合同30天内终止',
+
+'Menu:ProviderContract' => '供应商合同',
+'Menu:ProviderContract+' => '供应商合同',
+'Menu:CustomerContract' => '客户合同',
+'Menu:CustomerContract+' => '客户合同',
+'Menu:ServiceSubcategory' => '服务子级类目',
+'Menu:ServiceSubcategory+' => '服务子级类目',
+'Menu:Service' => '服务',
+'Menu:Service+' => '服务',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => '服务级别协议',
+'Menu:SLT' => 'SLTs',
+'Menu:SLT+' => '服务级别目标',
+
+));
+
+
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
+
+//
+// Class: Contract
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Contract' => '合同',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => '名称',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:description' => '描述',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => '启始日期',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => '截止日期',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => '费用',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => '费用货币',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => '美元',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => '欧元',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:cost_unit' => '费用单位',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:billing_frequency' => '付款周期',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:contact_list' => '合同',
+	'Class:Contract/Attribute:contact_list+' => '与该合同相关的合同能够',
+	'Class:Contract/Attribute:document_list' => '文档',
+	'Class:Contract/Attribute:document_list+' => '与该合同关联的文档',
+	'Class:Contract/Attribute:ci_list' => 'CIs',
+	'Class:Contract/Attribute:ci_list+' => '该合同所支持的 CI',
+	'Class:Contract/Attribute:finalclass' => '类别',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ProviderContract' => '供应商合同',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:provider_id' => '供应商',
+	'Class:ProviderContract/Attribute:provider_id+' => '',
+	'Class:ProviderContract/Attribute:provider_name' => '供应商名称',
+	'Class:ProviderContract/Attribute:provider_name+' => '',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => '服务级别协议',
+	'Class:ProviderContract/Attribute:coverage' => '服务小时数',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+));
+
+//
+// Class: CustomerContract
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CustomerContract' => '客户合同',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:org_id' => '客户',
+	'Class:CustomerContract/Attribute:org_id+' => '',
+	'Class:CustomerContract/Attribute:org_name' => '客户名称',
+	'Class:CustomerContract/Attribute:org_name+' => '',
+	'Class:CustomerContract/Attribute:provider_id' => '供应商',
+	'Class:CustomerContract/Attribute:provider_id+' => '',
+	'Class:CustomerContract/Attribute:provider_name' => '供应商名称',
+	'Class:CustomerContract/Attribute:provider_name+' => '',
+	'Class:CustomerContract/Attribute:support_team_id' => '支持团队',
+	'Class:CustomerContract/Attribute:support_team_id+' => '',
+	'Class:CustomerContract/Attribute:support_team_name' => '支持团队',
+	'Class:CustomerContract/Attribute:support_team_name+' => '',
+	'Class:CustomerContract/Attribute:provider_list' => '供应商',
+	'Class:CustomerContract/Attribute:provider_list+' => '',
+	'Class:CustomerContract/Attribute:sla_list' => 'SLAs',
+	'Class:CustomerContract/Attribute:sla_list+' => '与该合同相关的 SLA 列表',
+	'Class:CustomerContract/Attribute:provider_list' => '支撑合同',
+	'Class:CustomerContract/Attribute:sla_list+' => '',
+));
+//
+// Class: lnkCustomerContractToProviderContract
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkCustomerContractToProviderContract' => 'lnkCustomerContractToProviderContract',
+	'Class:lnkCustomerContractToProviderContract+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id' => '客户合同',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name' => '名称',
+	'Class:lnkCustomerContractToProviderContract/Attribute:customer_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id' => '供应商合同',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_id+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name' => '名称',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_contract_name+' => '',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla' => '供应商 SLA',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_sla+' => '服务级别协议',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage' => '服务小时数',
+	'Class:lnkCustomerContractToProviderContract/Attribute:provider_coverage+' => '',
+));
+
+
+//
+// Class: lnkContractToSLA
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContractToSLA' => '合同/SLA',
+	'Class:lnkContractToSLA+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_id' => '合同',
+	'Class:lnkContractToSLA/Attribute:contract_id+' => '',
+	'Class:lnkContractToSLA/Attribute:contract_name' => '合同',
+	'Class:lnkContractToSLA/Attribute:contract_name+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_id+' => '',
+	'Class:lnkContractToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkContractToSLA/Attribute:sla_name+' => '',
+	'Class:lnkContractToSLA/Attribute:coverage' => '服务小时数',
+	'Class:lnkContractToSLA/Attribute:coverage+' => '',
+));
+
+//
+// Class: lnkContractToDoc
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContractToDoc' => '合同/文档',
+	'Class:lnkContractToDoc+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_id' => '合同',
+	'Class:lnkContractToDoc/Attribute:contract_id+' => '',
+	'Class:lnkContractToDoc/Attribute:contract_name' => '合同',
+	'Class:lnkContractToDoc/Attribute:contract_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_id' => '文档',
+	'Class:lnkContractToDoc/Attribute:document_id+' => '',
+	'Class:lnkContractToDoc/Attribute:document_name' => '文档',
+	'Class:lnkContractToDoc/Attribute:document_name+' => '',
+	'Class:lnkContractToDoc/Attribute:document_type' => '文档类别',
+	'Class:lnkContractToDoc/Attribute:document_type+' => '',
+	'Class:lnkContractToDoc/Attribute:document_status' => '文档状态',
+	'Class:lnkContractToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkContractToContact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContractToContact' => '合同/联系人',
+	'Class:lnkContractToContact+' => '',
+	'Class:lnkContractToContact/Attribute:contract_id' => '合同',
+	'Class:lnkContractToContact/Attribute:contract_id+' => '',
+	'Class:lnkContractToContact/Attribute:contract_name' => '合同',
+	'Class:lnkContractToContact/Attribute:contract_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_id' => '联系人',
+	'Class:lnkContractToContact/Attribute:contact_id+' => '',
+	'Class:lnkContractToContact/Attribute:contact_name' => '联系人',
+	'Class:lnkContractToContact/Attribute:contact_name+' => '',
+	'Class:lnkContractToContact/Attribute:contact_email' => '联系人 email',
+	'Class:lnkContractToContact/Attribute:contact_email+' => '',
+	'Class:lnkContractToContact/Attribute:role' => '角色',
+	'Class:lnkContractToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkContractToCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkContractToCI' => '合同/CI',
+	'Class:lnkContractToCI+' => '',
+	'Class:lnkContractToCI/Attribute:contract_id' => '合同',
+	'Class:lnkContractToCI/Attribute:contract_id+' => '',
+	'Class:lnkContractToCI/Attribute:contract_name' => '合同',
+	'Class:lnkContractToCI/Attribute:contract_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkContractToCI/Attribute:ci_id+' => '',
+	'Class:lnkContractToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkContractToCI/Attribute:ci_name+' => '',
+	'Class:lnkContractToCI/Attribute:ci_status' => 'CI 状态',
+	'Class:lnkContractToCI/Attribute:ci_status+' => '',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Service' => '服务',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:org_id' => '供应商',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:provider_name' => '供应商',
+	'Class:Service/Attribute:provider_name+' => '',
+	'Class:Service/Attribute:name' => '名称',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:description' => '描述',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:type' => '类别',
+	'Class:Service/Attribute:type+' => '',
+	'Class:Service/Attribute:type/Value:IncidentManagement' => '事件管理',
+	'Class:Service/Attribute:type/Value:IncidentManagement+' => '事件管理',
+	'Class:Service/Attribute:type/Value:RequestManagement' => '请求管理',
+	'Class:Service/Attribute:type/Value:RequestManagement+' => '请求管理',
+	'Class:Service/Attribute:status' => '状态',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:design' => '设计',
+	'Class:Service/Attribute:status/Value:design+' => '',
+	'Class:Service/Attribute:status/Value:obsolete' => '废弃',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => '生产',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:subcategory_list' => '服务子级类目',
+	'Class:Service/Attribute:subcategory_list+' => '',
+	'Class:Service/Attribute:sla_list' => 'SLAs',
+	'Class:Service/Attribute:sla_list+' => '',
+	'Class:Service/Attribute:document_list' => '文档',
+	'Class:Service/Attribute:document_list+' => '与此服务相关的文档',
+	'Class:Service/Attribute:contact_list' => '联系人',
+	'Class:Service/Attribute:contact_list+' => '在此服务中承担角色的联系人',
+	'Class:Service/Tab:Related_Contracts' => '相关合同',
+	'Class:Service/Tab:Related_Contracts+' => '为此服务签订的合同',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ServiceSubcategory' => '服务子级类目',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => '名称',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => '描述',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => '服务',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => '服务',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => '名称',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:service_id' => '服务',
+	'Class:SLA/Attribute:service_id+' => '',
+	'Class:SLA/Attribute:service_name' => '服务',
+	'Class:SLA/Attribute:service_name+' => '',
+	'Class:SLA/Attribute:slt_list' => 'SLTs',
+	'Class:SLA/Attribute:slt_list+' => 'List Service Level Thresholds',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => '名称',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:metric' => 'Metric',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:TTO' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTO+' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:TTR' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:TTR+' => 'TTR',
+	'Class:SLT/Attribute:ticket_priority' => '单据优先级',
+	'Class:SLT/Attribute:ticket_priority+' => '',
+	'Class:SLT/Attribute:ticket_priority/Value:1' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:1+' => '1',
+	'Class:SLT/Attribute:ticket_priority/Value:2' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:2+' => '2',
+	'Class:SLT/Attribute:ticket_priority/Value:3' => '3',
+	'Class:SLT/Attribute:ticket_priority/Value:3+' => '3',
+	'Class:SLT/Attribute:value' => '值',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:value_unit' => '单位',
+	'Class:SLT/Attribute:value_unit+' => '',
+	'Class:SLT/Attribute:value_unit/Value:days' => '天',
+	'Class:SLT/Attribute:value_unit/Value:days+' => '天',
+	'Class:SLT/Attribute:value_unit/Value:hours' => '小时',
+	'Class:SLT/Attribute:value_unit/Value:hours+' => '小时',
+	'Class:SLT/Attribute:value_unit/Value:minutes' => '分钟',
+	'Class:SLT/Attribute:value_unit/Value:minutes+' => '分钟',
+	'Class:SLT/Attribute:sla_list' => 'SLAs',
+	'Class:SLT/Attribute:sla_list+' => '使用此 SLT 的 SLAs',
+));
+
+//
+// Class: lnkSLTToSLA
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkSLTToSLA' => 'SLT/SLA',
+	'Class:lnkSLTToSLA+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:sla_name' => 'SLA',
+	'Class:lnkSLTToSLA/Attribute:sla_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_id+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_name' => 'SLT',
+	'Class:lnkSLTToSLA/Attribute:slt_name+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_metric' => 'Metric',
+	'Class:lnkSLTToSLA/Attribute:slt_metric+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority' => '单据优先级',
+	'Class:lnkSLTToSLA/Attribute:slt_ticket_priority+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value' => '值',
+	'Class:lnkSLTToSLA/Attribute:slt_value+' => '',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit' => '单位',
+	'Class:lnkSLTToSLA/Attribute:slt_value_unit+' => '',
+));
+
+//
+// Class: lnkServiceToDoc
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkServiceToDoc' => '服务/文档',
+	'Class:lnkServiceToDoc+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_id' => '服务',
+	'Class:lnkServiceToDoc/Attribute:service_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:service_name' => '服务',
+	'Class:lnkServiceToDoc/Attribute:service_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_id' => '文档',
+	'Class:lnkServiceToDoc/Attribute:document_id+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_name' => '文档',
+	'Class:lnkServiceToDoc/Attribute:document_name+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_type' => '文档类别',
+	'Class:lnkServiceToDoc/Attribute:document_type+' => '',
+	'Class:lnkServiceToDoc/Attribute:document_status' => '文档状态',
+	'Class:lnkServiceToDoc/Attribute:document_status+' => '',
+));
+
+//
+// Class: lnkServiceToContact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkServiceToContact' => '服务/联系人',
+	'Class:lnkServiceToContact+' => '',
+	'Class:lnkServiceToContact/Attribute:service_id' => '服务',
+	'Class:lnkServiceToContact/Attribute:service_id+' => '',
+	'Class:lnkServiceToContact/Attribute:service_name' => '服务',
+	'Class:lnkServiceToContact/Attribute:service_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_id' => '联系人',
+	'Class:lnkServiceToContact/Attribute:contact_id+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_name' => '联系人',
+	'Class:lnkServiceToContact/Attribute:contact_name+' => '',
+	'Class:lnkServiceToContact/Attribute:contact_email' => '联系人 email',
+	'Class:lnkServiceToContact/Attribute:contact_email+' => '',
+	'Class:lnkServiceToContact/Attribute:role' => '角色',
+	'Class:lnkServiceToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkServiceToCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkServiceToCI' => '服务/CI',
+	'Class:lnkServiceToCI+' => '',
+	'Class:lnkServiceToCI/Attribute:service_id' => '服务',
+	'Class:lnkServiceToCI/Attribute:service_id+' => '',
+	'Class:lnkServiceToCI/Attribute:service_name' => '服务',
+	'Class:lnkServiceToCI/Attribute:service_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkServiceToCI/Attribute:ci_id+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkServiceToCI/Attribute:ci_name+' => '',
+	'Class:lnkServiceToCI/Attribute:ci_status' => 'CI 状态',
+	'Class:lnkServiceToCI/Attribute:ci_status+' => '',
+	'Menu:ServiceElement' => 'Sevice elements~~',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
+	'Menu:DeliveryModel' => 'Delivery models~~',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
+	'Menu:ServiceFamily' => 'Service families~~',
+	'Menu:ServiceFamily+' => 'Service families~~',
+	'Menu:Procedure' => 'Procedures catalog~~',
+	'Menu:Procedure+' => 'All procedures catalog~~',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:ContractType' => 'Contract Type~~',
+	'Class:Contract/Attribute:org_id' => 'Customer~~',
+	'Class:Contract/Attribute:organization_name' => 'Customer Name~~',
+	'Class:Contract/Attribute:organization_name+' => 'Common name~~',
+	'Class:Contract/Attribute:contacts_list' => 'Contacts~~',
+	'Class:Contract/Attribute:contacts_list+' => 'All the contacts for this customer contract~~',
+	'Class:Contract/Attribute:documents_list' => 'Documents~~',
+	'Class:Contract/Attribute:documents_list+' => 'All the documents for this customer contract~~',
+	'Class:Contract/Attribute:contracttype_id' => 'Contract type~~',
+	'Class:Contract/Attribute:contracttype_name' => 'Contract type Name~~',
+	'Class:Contract/Attribute:provider_id' => 'Provider~~',
+	'Class:Contract/Attribute:provider_name' => 'Provider Name~~',
+	'Class:Contract/Attribute:provider_name+' => 'Common name~~',
+	'Class:Contract/Attribute:status' => 'Status~~',
+	'Class:Contract/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:Contract/Attribute:status/Value:production' => 'production~~',
+	'Class:Contract/Attribute:status/Value:production+' => 'production~~',
+	'Class:CustomerContract/Attribute:services_list' => 'Services~~',
+	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract~~',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs~~',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract~~',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type~~',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name~~',
+	'Class:lnkContactToContract' => 'Link Contact / Contract~~',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract~~',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Contract Name~~',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Contact Name~~',
+	'Class:lnkContractToDocument' => 'Link Contract / Document~~',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract~~',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Contract Name~~',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Document~~',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:ServiceFamily' => 'Service Family~~',
+	'Class:ServiceFamily/Attribute:name' => 'Name~~',
+	'Class:ServiceFamily/Attribute:icon' => 'Icon~~',
+	'Class:ServiceFamily/Attribute:services_list' => 'Services~~',
+	'Class:ServiceFamily/Attribute:services_list+' => 'All the services in this category~~',
+	'Class:Service/Attribute:organization_name' => 'Provider Name~~',
+	'Class:Service/Attribute:servicefamily_id' => 'Service Family~~',
+	'Class:Service/Attribute:servicefamily_name' => 'Service Family Name~~',
+	'Class:Service/Attribute:documents_list' => 'Documents~~',
+	'Class:Service/Attribute:documents_list+' => 'All the documents linked to the service~~',
+	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
+	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:Service/Attribute:icon' => 'Icon~~',
+	'Class:Service/Attribute:customercontracts_list' => 'Customer contracts~~',
+	'Class:Service/Attribute:customercontracts_list+' => 'All the customer contracts that have purchased this service~~',
+	'Class:Service/Attribute:providercontracts_list' => 'Provider contracts~~',
+	'Class:Service/Attribute:providercontracts_list+' => 'All the provider contracts to support this service~~',
+	'Class:Service/Attribute:functionalcis_list' => 'Depends on CIs~~',
+	'Class:Service/Attribute:functionalcis_list+' => 'All the configuration items that are used to provide this service~~',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Service sub categories~~',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'All the sub categories for this service~~',
+	'Class:lnkDocumentToService' => 'Link Document / Service~~',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Document~~',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Document Name~~',
+	'Class:lnkContactToService' => 'Link Contact / Service~~',
+	'Class:lnkContactToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkContactToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Contact Name~~',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => 'obsolete~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
+	'Class:SLA/Attribute:description' => 'description~~',
+	'Class:SLA/Attribute:org_id' => 'Provider~~',
+	'Class:SLA/Attribute:organization_name' => 'Provider Name~~',
+	'Class:SLA/Attribute:organization_name+' => 'Common name~~',
+	'Class:SLA/Attribute:slts_list' => 'SLTs~~',
+	'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
+	'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
+	'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
+	'Class:SLT/Attribute:priority' => 'Priority~~',
+	'Class:SLT/Attribute:priority/Value:1' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critical~~',
+	'Class:SLT/Attribute:priority/Value:2' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:2+' => 'high~~',
+	'Class:SLT/Attribute:priority/Value:3' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:3+' => 'medium~~',
+	'Class:SLT/Attribute:priority/Value:4' => 'low~~',
+	'Class:SLT/Attribute:priority/Value:4+' => 'low~~',
+	'Class:SLT/Attribute:request_type' => 'Request type~~',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident~~',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request~~',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request~~',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO~~',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR~~',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR~~',
+	'Class:SLT/Attribute:unit' => 'Unit~~',
+	'Class:SLT/Attribute:unit/Value:hours' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'hours~~',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes~~',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes~~',
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT~~',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA~~',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA Name~~',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT~~',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT Name~~',
+	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract~~',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name~~',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA~~',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
+	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service~~',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Provider contract~~',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name~~',
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service~~',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service Name~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI~~',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI Name~~',
+	'Class:DeliveryModel' => 'Delivery Model~~',
+	'Class:DeliveryModel/Attribute:name' => 'Name~~',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organization~~',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organization Name~~',
+	'Class:DeliveryModel/Attribute:organization_name+' => 'Common name~~',
+	'Class:DeliveryModel/Attribute:description' => 'Description~~',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Contacts~~',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'All the contacts (Teams and Person) for this delivery model~~',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Customers~~',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'All the customers having this delivering model~~',
+	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model~~',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Delivery model name~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Contact~~',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Contact name~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Role~~',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
+));
+
+
+?>
diff --git a/datamodels/2.x/itop-tickets/data.struct.ta-actions.xml b/datamodels/2.x/itop-tickets/data.struct.ta-actions.xml
index dfab3914f..d6da654dc 100755
--- a/datamodels/2.x/itop-tickets/data.struct.ta-actions.xml
+++ b/datamodels/2.x/itop-tickets/data.struct.ta-actions.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-<ActionEmail id="1">
-<name>Notification to a Workgroup</name>
-<description>This action informs a team that a ticket has been assigned their workgroup</description>
-<status>disabled</status>
-<test_recipient></test_recipient>
-<from>test@test.com</from>
-<reply_to></reply_to>
-<to>SELECT Team WHERE id=:this-&gt;workgroup_id</to>
-<cc></cc>
-<bcc></bcc>
-<subject>The ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ has been assigned to the workgroup $this-&gt;workgroup_name$</subject>
-<body>&lt;html&gt;
-&lt;body&gt;
-&lt;p&gt;The ticket $this-&gt;name()$ has been assigned to the workgroup $this-&gt;workgroup_name$.&lt;/p&gt;
-&lt;p&gt;Description: $this-&gt;title$&lt;/p&gt;
-&lt;p&gt;Title: $this-&gt;title$&lt;/p&gt;
-&lt;hr/&gt;
-&lt;p&gt;for more information on this ticket, click here: $this-&gt;hyperlink()$&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;</body>
-<importance>normal</importance>
-</ActionEmail>
-<ActionEmail id="2">
-<name>Notification to Agent</name>
-<description>This action informs an agent that a ticket has been assigned to her/him</description>
-<status>disabled</status>
-<test_recipient></test_recipient>
-<from>test@test.com</from>
-<reply_to></reply_to>
-<to>SELECT Person WHERE id=:this-&gt;agent_id</to>
-<cc></cc>
-<bcc></bcc>
-<subject>The ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ has been assigned to you</subject>
-<body>&lt;html&gt;
-&lt;body&gt;
-&lt;p&gt;The ticket $this-&gt;name()$ has been assigned to you.&lt;/p&gt;
-&lt;p&gt;Description: $this-&gt;title$&lt;/p&gt; 
-&lt;p&gt;Title: $this-&gt;title$&lt;/p&gt;
-&lt;hr/&gt;
-&lt;p&gt;for more information on this ticket, click here: $this-&gt;hyperlink()$&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;</body>
-<importance>normal</importance>
-</ActionEmail>
-<ActionEmail id="3">
-<name>Notification to caller</name>
-<description>This action is used to inform the caller</description>
-<status>disabled</status>
-<test_recipient></test_recipient>
-<from>test@test.com</from>
-<reply_to></reply_to>
-<to>SELECT Person WHERE id=:this-&gt;caller_id</to>
-<cc></cc>
-<bcc></bcc>
-<subject>Ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ - $this-&gt;status$</subject>
-<body>&lt;html&gt;
-&lt;body&gt;
-&lt;p&gt;The ticket $this-&gt;name()$ has changed to status $this-&gt;status$&lt;/p&gt;
-&lt;p&gt;Last update: $this-&gt;last_update$&lt;/p&gt;
-&lt;hr/&gt;
-&lt;p&gt;for more information on this ticket, click here: $this-&gt;hyperlink(portal)$&lt;/p&gt;
-&lt;/body&gt;
-&lt;/html&gt;</body>
-<importance>normal</importance>
-</ActionEmail>
-</Set>
+<?xml version="1.0" encoding="UTF-8"?>
+<Set>
+<ActionEmail id="1">
+<name>Notification to a Workgroup</name>
+<description>This action informs a team that a ticket has been assigned their workgroup</description>
+<status>disabled</status>
+<test_recipient></test_recipient>
+<from>test@test.com</from>
+<reply_to></reply_to>
+<to>SELECT Team WHERE id=:this-&gt;workgroup_id</to>
+<cc></cc>
+<bcc></bcc>
+<subject>The ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ has been assigned to the workgroup $this-&gt;workgroup_name$</subject>
+<body>&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;The ticket $this-&gt;name()$ has been assigned to the workgroup $this-&gt;workgroup_name$.&lt;/p&gt;
+&lt;p&gt;Description: $this-&gt;title$&lt;/p&gt;
+&lt;p&gt;Title: $this-&gt;title$&lt;/p&gt;
+&lt;hr/&gt;
+&lt;p&gt;for more information on this ticket, click here: $this-&gt;hyperlink()$&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</body>
+<importance>normal</importance>
+</ActionEmail>
+<ActionEmail id="2">
+<name>Notification to Agent</name>
+<description>This action informs an agent that a ticket has been assigned to her/him</description>
+<status>disabled</status>
+<test_recipient></test_recipient>
+<from>test@test.com</from>
+<reply_to></reply_to>
+<to>SELECT Person WHERE id=:this-&gt;agent_id</to>
+<cc></cc>
+<bcc></bcc>
+<subject>The ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ has been assigned to you</subject>
+<body>&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;The ticket $this-&gt;name()$ has been assigned to you.&lt;/p&gt;
+&lt;p&gt;Description: $this-&gt;title$&lt;/p&gt; 
+&lt;p&gt;Title: $this-&gt;title$&lt;/p&gt;
+&lt;hr/&gt;
+&lt;p&gt;for more information on this ticket, click here: $this-&gt;hyperlink()$&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</body>
+<importance>normal</importance>
+</ActionEmail>
+<ActionEmail id="3">
+<name>Notification to caller</name>
+<description>This action is used to inform the caller</description>
+<status>disabled</status>
+<test_recipient></test_recipient>
+<from>test@test.com</from>
+<reply_to></reply_to>
+<to>SELECT Person WHERE id=:this-&gt;caller_id</to>
+<cc></cc>
+<bcc></bcc>
+<subject>Ticket $this-&gt;name()$, priority $this-&gt;label(priority)$ - $this-&gt;status$</subject>
+<body>&lt;html&gt;
+&lt;body&gt;
+&lt;p&gt;The ticket $this-&gt;name()$ has changed to status $this-&gt;status$&lt;/p&gt;
+&lt;p&gt;Last update: $this-&gt;last_update$&lt;/p&gt;
+&lt;hr/&gt;
+&lt;p&gt;for more information on this ticket, click here: $this-&gt;hyperlink(portal)$&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;</body>
+<importance>normal</importance>
+</ActionEmail>
+</Set>
diff --git a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
index 09d113360..39f5a372c 100755
--- a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php
@@ -1,256 +1,256 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Ticket
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Ticket' => 'Ticket',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => 'Ref',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:org_id' => 'Organization',
-	'Class:Ticket/Attribute:org_id+' => '',
-	'Class:Ticket/Attribute:org_name' => 'Organization Name',
-	'Class:Ticket/Attribute:org_name+' => '',
-	'Class:Ticket/Attribute:caller_id' => 'Caller',
-	'Class:Ticket/Attribute:caller_id+' => '',
-	'Class:Ticket/Attribute:caller_name' => 'Caller Name',
-	'Class:Ticket/Attribute:caller_name+' => '',
-	'Class:Ticket/Attribute:team_id' => 'Team',
-	'Class:Ticket/Attribute:team_id+' => '',
-	'Class:Ticket/Attribute:team_name' => 'Team Name',
-	'Class:Ticket/Attribute:team_name+' => '',
-	'Class:Ticket/Attribute:agent_id' => 'Agent',
-	'Class:Ticket/Attribute:agent_id+' => '',
-	'Class:Ticket/Attribute:agent_name' => 'Agent Name',
-	'Class:Ticket/Attribute:agent_name+' => '',
-	'Class:Ticket/Attribute:title' => 'Title',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => 'Description',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:start_date' => 'Start date',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:end_date' => 'End date',
-	'Class:Ticket/Attribute:end_date+' => '',
-	'Class:Ticket/Attribute:last_update' => 'Last update',
-	'Class:Ticket/Attribute:last_update+' => '',
-	'Class:Ticket/Attribute:close_date' => 'Close date',
-	'Class:Ticket/Attribute:close_date+' => '',
-	'Class:Ticket/Attribute:private_log' => 'Private log',
-	'Class:Ticket/Attribute:private_log+' => '',
-	'Class:Ticket/Attribute:contacts_list' => 'Contacts',
-	'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket',
-	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
-	'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.',
-	'Class:Ticket/Attribute:workorders_list' => 'Work orders',
-	'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket',
-	'Class:Ticket/Attribute:finalclass' => 'Ticket sub-class',
-	'Class:Ticket/Attribute:finalclass+' => 'Name of the final class',
-	'Class:Ticket/Attribute:operational_status' => 'Operational status',
-	'Class:Ticket/Attribute:operational_status+' => 'Computed after the detailed status',
-	'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'Ongoing',
-	'Class:Ticket/Attribute:operational_status/Value:ongoing+' => 'Work in progress',
-	'Class:Ticket/Attribute:operational_status/Value:resolved' => 'Resolved',
-	'Class:Ticket/Attribute:operational_status/Value:resolved+' => '',
-	'Class:Ticket/Attribute:operational_status/Value:closed' => 'Closed',
-	'Class:Ticket/Attribute:operational_status/Value:closed+' => '',
-	'Ticket:ImpactAnalysis' => 'Impact Analysis',
-));
-
-
-//
-// Class: lnkContactToTicket
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkContactToTicket' => 'Link Contact / Ticket',
-	'Class:lnkContactToTicket+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_email' => 'Contact Email',
-	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
-	'Class:lnkContactToTicket/Attribute:role' => 'Role (text)',
-	'Class:lnkContactToTicket/Attribute:role+' => '',
-	'Class:lnkContactToTicket/Attribute:role_code' => 'Role',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Added manually',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computed',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify',
-));
-
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted',
-));
-
-
-//
-// Class: WorkOrder
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:WorkOrder' => 'Work Order',
-	'Class:WorkOrder+' => '',
-	'Class:WorkOrder/Attribute:name' => 'Name',
-	'Class:WorkOrder/Attribute:name+' => '',
-	'Class:WorkOrder/Attribute:status' => 'Status',
-	'Class:WorkOrder/Attribute:status+' => '',
-	'Class:WorkOrder/Attribute:status/Value:open' => 'open',
-	'Class:WorkOrder/Attribute:status/Value:open+' => '',
-	'Class:WorkOrder/Attribute:status/Value:closed' => 'closed',
-	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
-	'Class:WorkOrder/Attribute:description' => 'Description',
-	'Class:WorkOrder/Attribute:description+' => '',
-	'Class:WorkOrder/Attribute:ticket_id' => 'Ticket',
-	'Class:WorkOrder/Attribute:ticket_id+' => '',
-	'Class:WorkOrder/Attribute:ticket_ref' => 'Ticket ref',
-	'Class:WorkOrder/Attribute:ticket_ref+' => '',
-	'Class:WorkOrder/Attribute:team_id' => 'Team',
-	'Class:WorkOrder/Attribute:team_id+' => '',
-	'Class:WorkOrder/Attribute:team_name' => 'Team Name',
-	'Class:WorkOrder/Attribute:team_name+' => '',
-	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
-	'Class:WorkOrder/Attribute:agent_id+' => '',
-	'Class:WorkOrder/Attribute:agent_email' => 'Agent email',
-	'Class:WorkOrder/Attribute:agent_email+' => '',
-	'Class:WorkOrder/Attribute:start_date' => 'Start date',
-	'Class:WorkOrder/Attribute:start_date+' => '',
-	'Class:WorkOrder/Attribute:end_date' => 'End date',
-	'Class:WorkOrder/Attribute:end_date+' => '',
-	'Class:WorkOrder/Attribute:log' => 'Log',
-	'Class:WorkOrder/Attribute:log+' => '',
-	'Class:WorkOrder/Stimulus:ev_close' => 'Close',
-	'Class:WorkOrder/Stimulus:ev_close+' => '',
-));
-
-
-// Fieldset translation
-Dict::Add('EN US', 'English', 'English', array(
-
-	'Ticket:baseinfo' => 'General Information',
-	'Ticket:date' => 'Dates',
-	'Ticket:contact' => 'Contacts',
-	'Ticket:moreinfo' => 'More Information',
-	'Ticket:relation' => 'Relations',
-	'Ticket:log' => 'Communications',
-	'Ticket:Type' => 'Qualification',
-	'Ticket:support' => 'Support',
-	'Ticket:resolution' => 'Resolution',
-	'Ticket:SLA' => 'SLA report',
-	'WorkOrder:Details' => 'Details',
-	'WorkOrder:Moreinfo' => 'More information',
-	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s',
-
-	'Class:cmdbAbstractObject/Method:Set' => 'Set',
-	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
-	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
-	'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
-	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object',
-	'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
-	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
-
-	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - User portal',
-	'Brick:Portal:UserProfile:Title' => 'My profile',
-	'Brick:Portal:NewRequest:Title' => 'New request',
-	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
-	'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
-));
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Ticket
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Ticket' => 'Ticket',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Ref',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:org_id' => 'Organization',
+	'Class:Ticket/Attribute:org_id+' => '',
+	'Class:Ticket/Attribute:org_name' => 'Organization Name',
+	'Class:Ticket/Attribute:org_name+' => '',
+	'Class:Ticket/Attribute:caller_id' => 'Caller',
+	'Class:Ticket/Attribute:caller_id+' => '',
+	'Class:Ticket/Attribute:caller_name' => 'Caller Name',
+	'Class:Ticket/Attribute:caller_name+' => '',
+	'Class:Ticket/Attribute:team_id' => 'Team',
+	'Class:Ticket/Attribute:team_id+' => '',
+	'Class:Ticket/Attribute:team_name' => 'Team Name',
+	'Class:Ticket/Attribute:team_name+' => '',
+	'Class:Ticket/Attribute:agent_id' => 'Agent',
+	'Class:Ticket/Attribute:agent_id+' => '',
+	'Class:Ticket/Attribute:agent_name' => 'Agent Name',
+	'Class:Ticket/Attribute:agent_name+' => '',
+	'Class:Ticket/Attribute:title' => 'Title',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Description',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Start date',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:end_date' => 'End date',
+	'Class:Ticket/Attribute:end_date+' => '',
+	'Class:Ticket/Attribute:last_update' => 'Last update',
+	'Class:Ticket/Attribute:last_update+' => '',
+	'Class:Ticket/Attribute:close_date' => 'Close date',
+	'Class:Ticket/Attribute:close_date+' => '',
+	'Class:Ticket/Attribute:private_log' => 'Private log',
+	'Class:Ticket/Attribute:private_log+' => '',
+	'Class:Ticket/Attribute:contacts_list' => 'Contacts',
+	'Class:Ticket/Attribute:contacts_list+' => 'All the contacts linked to this ticket',
+	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
+	'Class:Ticket/Attribute:functionalcis_list+' => 'All the configuration items impacted by this ticket. Items marked as "Computed" have been automatically marked as impacted. Items marked as "Not impacted" are excluded from the impact.',
+	'Class:Ticket/Attribute:workorders_list' => 'Work orders',
+	'Class:Ticket/Attribute:workorders_list+' => 'All the work orders for this ticket',
+	'Class:Ticket/Attribute:finalclass' => 'Ticket sub-class',
+	'Class:Ticket/Attribute:finalclass+' => 'Name of the final class',
+	'Class:Ticket/Attribute:operational_status' => 'Operational status',
+	'Class:Ticket/Attribute:operational_status+' => 'Computed after the detailed status',
+	'Class:Ticket/Attribute:operational_status/Value:ongoing' => 'Ongoing',
+	'Class:Ticket/Attribute:operational_status/Value:ongoing+' => 'Work in progress',
+	'Class:Ticket/Attribute:operational_status/Value:resolved' => 'Resolved',
+	'Class:Ticket/Attribute:operational_status/Value:resolved+' => '',
+	'Class:Ticket/Attribute:operational_status/Value:closed' => 'Closed',
+	'Class:Ticket/Attribute:operational_status/Value:closed+' => '',
+	'Ticket:ImpactAnalysis' => 'Impact Analysis',
+));
+
+
+//
+// Class: lnkContactToTicket
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkContactToTicket' => 'Link Contact / Ticket',
+	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Contact Email',
+	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
+	'Class:lnkContactToTicket/Attribute:role' => 'Role (text)',
+	'Class:lnkContactToTicket/Attribute:role+' => '',
+	'Class:lnkContactToTicket/Attribute:role_code' => 'Role',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Added manually',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computed',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Name',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact (text)',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted',
+));
+
+
+//
+// Class: WorkOrder
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:WorkOrder' => 'Work Order',
+	'Class:WorkOrder+' => '',
+	'Class:WorkOrder/Attribute:name' => 'Name',
+	'Class:WorkOrder/Attribute:name+' => '',
+	'Class:WorkOrder/Attribute:status' => 'Status',
+	'Class:WorkOrder/Attribute:status+' => '',
+	'Class:WorkOrder/Attribute:status/Value:open' => 'open',
+	'Class:WorkOrder/Attribute:status/Value:open+' => '',
+	'Class:WorkOrder/Attribute:status/Value:closed' => 'closed',
+	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
+	'Class:WorkOrder/Attribute:description' => 'Description',
+	'Class:WorkOrder/Attribute:description+' => '',
+	'Class:WorkOrder/Attribute:ticket_id' => 'Ticket',
+	'Class:WorkOrder/Attribute:ticket_id+' => '',
+	'Class:WorkOrder/Attribute:ticket_ref' => 'Ticket ref',
+	'Class:WorkOrder/Attribute:ticket_ref+' => '',
+	'Class:WorkOrder/Attribute:team_id' => 'Team',
+	'Class:WorkOrder/Attribute:team_id+' => '',
+	'Class:WorkOrder/Attribute:team_name' => 'Team Name',
+	'Class:WorkOrder/Attribute:team_name+' => '',
+	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
+	'Class:WorkOrder/Attribute:agent_id+' => '',
+	'Class:WorkOrder/Attribute:agent_email' => 'Agent email',
+	'Class:WorkOrder/Attribute:agent_email+' => '',
+	'Class:WorkOrder/Attribute:start_date' => 'Start date',
+	'Class:WorkOrder/Attribute:start_date+' => '',
+	'Class:WorkOrder/Attribute:end_date' => 'End date',
+	'Class:WorkOrder/Attribute:end_date+' => '',
+	'Class:WorkOrder/Attribute:log' => 'Log',
+	'Class:WorkOrder/Attribute:log+' => '',
+	'Class:WorkOrder/Stimulus:ev_close' => 'Close',
+	'Class:WorkOrder/Stimulus:ev_close+' => '',
+));
+
+
+// Fieldset translation
+Dict::Add('EN US', 'English', 'English', array(
+
+	'Ticket:baseinfo' => 'General Information',
+	'Ticket:date' => 'Dates',
+	'Ticket:contact' => 'Contacts',
+	'Ticket:moreinfo' => 'More Information',
+	'Ticket:relation' => 'Relations',
+	'Ticket:log' => 'Communications',
+	'Ticket:Type' => 'Qualification',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Resolution',
+	'Ticket:SLA' => 'SLA report',
+	'WorkOrder:Details' => 'Details',
+	'WorkOrder:Moreinfo' => 'More information',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s',
+
+	'Class:cmdbAbstractObject/Method:Set' => 'Set',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the "person" attached to the logged in "user").',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to "DefaultWorkingTimeComputer" to force a 24x7 scheme',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'ApplyStimulus',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Stimulus code',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR',
+
+	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - User portal',
+	'Brick:Portal:UserProfile:Title' => 'My profile',
+	'Brick:Portal:NewRequest:Title' => 'New request',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Open',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolved',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
+));
diff --git a/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
index 04ee0c721..f3bdeb902 100755
--- a/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/it.dict.itop-tickets.php
@@ -1,219 +1,219 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkTicketToDoc' => 'Ticket/Documento',
-	'Class:lnkTicketToDoc+' => '',
-	'Class:lnkTicketToDoc/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToDoc/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToDoc/Attribute:document_id' => 'Documento',
-	'Class:lnkTicketToDoc/Attribute:document_id+' => '',
-	'Class:lnkTicketToContact' => 'Ticket/Contatto',
-	'Class:lnkTicketToContact+' => '',
-	'Class:lnkTicketToContact/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToContact/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_id' => 'Contatto',
-	'Class:lnkTicketToContact/Attribute:contact_id+' => '',
-	'Class:lnkTicketToContact/Attribute:role' => 'Ruolo',
-	'Class:lnkTicketToContact/Attribute:role+' => '',
-	'Class:lnkTicketToCI' => 'Ticket/CI',
-	'Class:lnkTicketToCI+' => '',
-	'Class:lnkTicketToCI/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkTicketToCI/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkTicketToCI/Attribute:ci_id+' => '',
-	'Class:lnkTicketToCI/Attribute:impact' => 'Impatto',
-	'Class:lnkTicketToCI/Attribute:impact+' => '',
-	'Class:Ticket' => 'Ticket',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => 'Ref',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:title' => 'Titolo',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => 'Descrizione',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:ticket_log' => 'Log',
-	'Class:Ticket/Attribute:ticket_log+' => '',
-	'Class:Ticket/Attribute:start_date' => 'Inzio',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:document_list' => 'Documenti',
-	'Class:Ticket/Attribute:document_list+' => 'Documenti relativi al ticket',
-	'Class:Ticket/Attribute:ci_list' => 'CIs',
-	'Class:Ticket/Attribute:ci_list+' => 'CIs coivolti dall\'incidente',
-	'Class:Ticket/Attribute:contact_list' => 'Contatti',
-	'Class:Ticket/Attribute:contact_list+' => 'Team e persone coinvolte',
-	'Class:Ticket/Attribute:incident_list' => 'Incidenti Correlati',
-	'Class:Ticket/Attribute:incident_list+' => '',
-	'Class:Ticket/Attribute:finalclass' => 'Tipo',
-	'Class:Ticket/Attribute:finalclass+' => '',
-	'Ticket:baseinfo' => 'Infomazioni Generali',
-	'Ticket:date' => 'Date',
-	'Ticket:contact' => 'Contatti',
-	'Ticket:moreinfo' => 'Più informazioni',
-	'Ticket:relation' => 'Relazioni',
-	'Ticket:log' => 'Communicazioni',
-	'Class:lnkTicketToDoc/Attribute:ticket_ref' => 'Ticket #',
-	'Class:lnkTicketToDoc/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToDoc/Attribute:document_name' => 'Documento',
-	'Class:lnkTicketToDoc/Attribute:document_name+' => '',
-	'Class:lnkTicketToContact/Attribute:ticket_ref' => 'Ticket #',
-	'Class:lnkTicketToContact/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_name' => 'Contatto',
-	'Class:lnkTicketToContact/Attribute:contact_name+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_email' => 'Email',
-	'Class:lnkTicketToContact/Attribute:contact_email+' => '',
-	'Class:lnkTicketToCI/Attribute:ticket_ref' => 'Ticket #',
-	'Class:lnkTicketToCI/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkTicketToCI/Attribute:ci_name+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_status' => 'CI stato',
-	'Class:lnkTicketToCI/Attribute:ci_status+' => '',
-	'Class:ResponseTicket' => 'Ticket di risposta',
-	'Class:ResponseTicket+' => '',
-	'Class:ResponseTicket/Attribute:status' => 'Stato',
-	'Class:ResponseTicket/Attribute:status+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:new' => 'Nuovo',
-	'Class:ResponseTicket/Attribute:status/Value:new+' => 'Recentemente aperto',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_tto' => 'Escalation/TTO',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_tto+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:assigned' => 'Assegnato',
-	'Class:ResponseTicket/Attribute:status/Value:assigned+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr' => 'Escalation/TTR',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:frozen' => 'In attesa',
-	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:resolved' => 'Risolto',
-	'Class:ResponseTicket/Attribute:status/Value:resolved+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:closed' => 'Chiuso',
-	'Class:ResponseTicket/Attribute:status/Value:closed+' => '',
-	'Class:ResponseTicket/Attribute:caller_id' => 'Visitatore',
-	'Class:ResponseTicket/Attribute:caller_id+' => '',
-	'Class:ResponseTicket/Attribute:caller_email' => 'Email',
-	'Class:ResponseTicket/Attribute:caller_email+' => '',
-	'Class:ResponseTicket/Attribute:org_id' => 'Cliente',
-	'Class:ResponseTicket/Attribute:org_id+' => '',
-	'Class:ResponseTicket/Attribute:org_name' => 'Cliente',
-	'Class:ResponseTicket/Attribute:org_name+' => '',
-	'Class:ResponseTicket/Attribute:service_id' => 'Servizio',
-	'Class:ResponseTicket/Attribute:service_id+' => '',
-	'Class:ResponseTicket/Attribute:service_name' => 'Nome',
-	'Class:ResponseTicket/Attribute:service_name+' => '',
-	'Class:ResponseTicket/Attribute:servicesubcategory_id' => 'Elemento di servizio',
-	'Class:ResponseTicket/Attribute:servicesubcategory_id+' => '',
-	'Class:ResponseTicket/Attribute:servicesubcategory_name' => 'Name',
-	'Class:ResponseTicket/Attribute:servicesubcategory_name+' => '',
-	'Class:ResponseTicket/Attribute:product' => 'Prodotto',
-	'Class:ResponseTicket/Attribute:product+' => '',
-	'Class:ResponseTicket/Attribute:impact' => 'Impatto',
-	'Class:ResponseTicket/Attribute:impact+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:1' => 'Un dipartimento',
-	'Class:ResponseTicket/Attribute:impact/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:2' => 'Un servizio',
-	'Class:ResponseTicket/Attribute:impact/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:3' => 'Una persona',
-	'Class:ResponseTicket/Attribute:impact/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:urgency' => 'Urgenza',
-	'Class:ResponseTicket/Attribute:urgency+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:1' => 'Alta',
-	'Class:ResponseTicket/Attribute:urgency/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:2' => 'Media',
-	'Class:ResponseTicket/Attribute:urgency/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:3' => 'Bassa',
-	'Class:ResponseTicket/Attribute:urgency/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:priority' => 'Priorità',
-	'Class:ResponseTicket/Attribute:priority+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:1' => 'Alta',
-	'Class:ResponseTicket/Attribute:priority/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:2' => 'Media',
-	'Class:ResponseTicket/Attribute:priority/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:3' => 'Bassa',
-	'Class:ResponseTicket/Attribute:priority/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:workgroup_id' => 'Gruppo di lavoro',
-	'Class:ResponseTicket/Attribute:workgroup_id+' => '',
-	'Class:ResponseTicket/Attribute:workgroup_name' => 'Workgroup',
-	'Class:ResponseTicket/Attribute:workgroup_name+' => '',
-	'Class:ResponseTicket/Attribute:agent_id' => 'Agente',
-	'Class:ResponseTicket/Attribute:agent_id+' => '',
-	'Class:ResponseTicket/Attribute:agent_name' => 'Agente',
-	'Class:ResponseTicket/Attribute:agent_name+' => '',
-	'Class:ResponseTicket/Attribute:agent_email' => 'Email dell\'agente',
-	'Class:ResponseTicket/Attribute:agent_email+' => '',
-	'Class:ResponseTicket/Attribute:related_problem_id' => 'Problemi correlati',
-	'Class:ResponseTicket/Attribute:related_problem_id+' => '',
-	'Class:ResponseTicket/Attribute:related_problem_ref' => 'Ref',
-	'Class:ResponseTicket/Attribute:related_problem_ref+' => '',
-	'Class:ResponseTicket/Attribute:related_change_id' => 'Cambi correlati',
-	'Class:ResponseTicket/Attribute:related_change_id+' => '',
-	'Class:ResponseTicket/Attribute:related_change_ref' => 'Cambi correlati',
-	'Class:ResponseTicket/Attribute:related_change_ref+' => '',
-	'Class:ResponseTicket/Attribute:close_date' => 'Chiuso',
-	'Class:ResponseTicket/Attribute:close_date+' => '',
-	'Class:ResponseTicket/Attribute:last_update' => 'Ultimo aggiornamento',
-	'Class:ResponseTicket/Attribute:last_update+' => '',
-	'Class:ResponseTicket/Attribute:assignment_date' => 'Data di Assegnazione ',
-	'Class:ResponseTicket/Attribute:assignment_date+' => '',
-	'Class:ResponseTicket/Attribute:resolution_date' => 'Data di risoluzione',
-	'Class:ResponseTicket/Attribute:resolution_date+' => '',
-	'Class:ResponseTicket/Attribute:tto_escalation_deadline' => 'TTO Scadenza di Escalation',
-	'Class:ResponseTicket/Attribute:tto_escalation_deadline+' => '',
-	'Class:ResponseTicket/Attribute:ttr_escalation_deadline' => 'TTR Scadenza di Escalation',
-	'Class:ResponseTicket/Attribute:ttr_escalation_deadline+' => '',
-	'Class:ResponseTicket/Attribute:closure_deadline' => 'Termine di chiusura',
-	'Class:ResponseTicket/Attribute:closure_deadline+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code' => 'Codice di risoluzione',
-	'Class:ResponseTicket/Attribute:resolution_code+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce' => 'Non puo\' essere riprodotto',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate' => 'Ticket duplicato',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed' => 'Fissato',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant' => 'Irrilevante',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant+' => '',
-	'Class:ResponseTicket/Attribute:solution' => 'Soluzione',
-	'Class:ResponseTicket/Attribute:solution+' => '',
-	'Class:ResponseTicket/Attribute:user_satisfaction' => 'Soddisfazione dell\'utente',
-	'Class:ResponseTicket/Attribute:user_satisfaction+' => '',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1' => 'Molto soddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1+' => 'Molto soddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2' => 'Abbastanza soddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2+' => 'Abbastanza soddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3' => 'Piuttosto insoddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3+' => 'Piuttosto insoddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4' => 'Molto insoddisfatto',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4+' => 'Molto insoddisfatto',
-	'Class:ResponseTicket/Attribute:user_commment' => 'Commento dell\'utente',
-	'Class:ResponseTicket/Attribute:user_commment+' => '',
-	'Class:ResponseTicket/Stimulus:ev_assign' => 'Assegna',
-	'Class:ResponseTicket/Stimulus:ev_assign+' => '',
-	'Class:ResponseTicket/Stimulus:ev_reassign' => 'Riassegna',
-	'Class:ResponseTicket/Stimulus:ev_reassign+' => '',
-	'Class:ResponseTicket/Stimulus:ev_timeout' => 'Escalation',
-	'Class:ResponseTicket/Stimulus:ev_timeout+' => '',
-	'Class:ResponseTicket/Stimulus:ev_resolve' => 'Segna come risolto',
-	'Class:ResponseTicket/Stimulus:ev_resolve+' => '',
-	'Class:ResponseTicket/Stimulus:ev_close' => 'Chiudi',
-	'Class:ResponseTicket/Stimulus:ev_close+' => '',
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkTicketToDoc' => 'Ticket/Documento',
+	'Class:lnkTicketToDoc+' => '',
+	'Class:lnkTicketToDoc/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkTicketToDoc/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToDoc/Attribute:document_id' => 'Documento',
+	'Class:lnkTicketToDoc/Attribute:document_id+' => '',
+	'Class:lnkTicketToContact' => 'Ticket/Contatto',
+	'Class:lnkTicketToContact+' => '',
+	'Class:lnkTicketToContact/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkTicketToContact/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_id' => 'Contatto',
+	'Class:lnkTicketToContact/Attribute:contact_id+' => '',
+	'Class:lnkTicketToContact/Attribute:role' => 'Ruolo',
+	'Class:lnkTicketToContact/Attribute:role+' => '',
+	'Class:lnkTicketToCI' => 'Ticket/CI',
+	'Class:lnkTicketToCI+' => '',
+	'Class:lnkTicketToCI/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkTicketToCI/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkTicketToCI/Attribute:ci_id+' => '',
+	'Class:lnkTicketToCI/Attribute:impact' => 'Impatto',
+	'Class:lnkTicketToCI/Attribute:impact+' => '',
+	'Class:Ticket' => 'Ticket',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Ref',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:title' => 'Titolo',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Descrizione',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:ticket_log' => 'Log',
+	'Class:Ticket/Attribute:ticket_log+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Inzio',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:document_list' => 'Documenti',
+	'Class:Ticket/Attribute:document_list+' => 'Documenti relativi al ticket',
+	'Class:Ticket/Attribute:ci_list' => 'CIs',
+	'Class:Ticket/Attribute:ci_list+' => 'CIs coivolti dall\'incidente',
+	'Class:Ticket/Attribute:contact_list' => 'Contatti',
+	'Class:Ticket/Attribute:contact_list+' => 'Team e persone coinvolte',
+	'Class:Ticket/Attribute:incident_list' => 'Incidenti Correlati',
+	'Class:Ticket/Attribute:incident_list+' => '',
+	'Class:Ticket/Attribute:finalclass' => 'Tipo',
+	'Class:Ticket/Attribute:finalclass+' => '',
+	'Ticket:baseinfo' => 'Infomazioni Generali',
+	'Ticket:date' => 'Date',
+	'Ticket:contact' => 'Contatti',
+	'Ticket:moreinfo' => 'Più informazioni',
+	'Ticket:relation' => 'Relazioni',
+	'Ticket:log' => 'Communicazioni',
+	'Class:lnkTicketToDoc/Attribute:ticket_ref' => 'Ticket #',
+	'Class:lnkTicketToDoc/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToDoc/Attribute:document_name' => 'Documento',
+	'Class:lnkTicketToDoc/Attribute:document_name+' => '',
+	'Class:lnkTicketToContact/Attribute:ticket_ref' => 'Ticket #',
+	'Class:lnkTicketToContact/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_name' => 'Contatto',
+	'Class:lnkTicketToContact/Attribute:contact_name+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_email' => 'Email',
+	'Class:lnkTicketToContact/Attribute:contact_email+' => '',
+	'Class:lnkTicketToCI/Attribute:ticket_ref' => 'Ticket #',
+	'Class:lnkTicketToCI/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkTicketToCI/Attribute:ci_name+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_status' => 'CI stato',
+	'Class:lnkTicketToCI/Attribute:ci_status+' => '',
+	'Class:ResponseTicket' => 'Ticket di risposta',
+	'Class:ResponseTicket+' => '',
+	'Class:ResponseTicket/Attribute:status' => 'Stato',
+	'Class:ResponseTicket/Attribute:status+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:new' => 'Nuovo',
+	'Class:ResponseTicket/Attribute:status/Value:new+' => 'Recentemente aperto',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_tto' => 'Escalation/TTO',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_tto+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:assigned' => 'Assegnato',
+	'Class:ResponseTicket/Attribute:status/Value:assigned+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr' => 'Escalation/TTR',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:frozen' => 'In attesa',
+	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:resolved' => 'Risolto',
+	'Class:ResponseTicket/Attribute:status/Value:resolved+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:closed' => 'Chiuso',
+	'Class:ResponseTicket/Attribute:status/Value:closed+' => '',
+	'Class:ResponseTicket/Attribute:caller_id' => 'Visitatore',
+	'Class:ResponseTicket/Attribute:caller_id+' => '',
+	'Class:ResponseTicket/Attribute:caller_email' => 'Email',
+	'Class:ResponseTicket/Attribute:caller_email+' => '',
+	'Class:ResponseTicket/Attribute:org_id' => 'Cliente',
+	'Class:ResponseTicket/Attribute:org_id+' => '',
+	'Class:ResponseTicket/Attribute:org_name' => 'Cliente',
+	'Class:ResponseTicket/Attribute:org_name+' => '',
+	'Class:ResponseTicket/Attribute:service_id' => 'Servizio',
+	'Class:ResponseTicket/Attribute:service_id+' => '',
+	'Class:ResponseTicket/Attribute:service_name' => 'Nome',
+	'Class:ResponseTicket/Attribute:service_name+' => '',
+	'Class:ResponseTicket/Attribute:servicesubcategory_id' => 'Elemento di servizio',
+	'Class:ResponseTicket/Attribute:servicesubcategory_id+' => '',
+	'Class:ResponseTicket/Attribute:servicesubcategory_name' => 'Name',
+	'Class:ResponseTicket/Attribute:servicesubcategory_name+' => '',
+	'Class:ResponseTicket/Attribute:product' => 'Prodotto',
+	'Class:ResponseTicket/Attribute:product+' => '',
+	'Class:ResponseTicket/Attribute:impact' => 'Impatto',
+	'Class:ResponseTicket/Attribute:impact+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:1' => 'Un dipartimento',
+	'Class:ResponseTicket/Attribute:impact/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:2' => 'Un servizio',
+	'Class:ResponseTicket/Attribute:impact/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:3' => 'Una persona',
+	'Class:ResponseTicket/Attribute:impact/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:urgency' => 'Urgenza',
+	'Class:ResponseTicket/Attribute:urgency+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:1' => 'Alta',
+	'Class:ResponseTicket/Attribute:urgency/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:2' => 'Media',
+	'Class:ResponseTicket/Attribute:urgency/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:3' => 'Bassa',
+	'Class:ResponseTicket/Attribute:urgency/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:priority' => 'Priorità',
+	'Class:ResponseTicket/Attribute:priority+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:1' => 'Alta',
+	'Class:ResponseTicket/Attribute:priority/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:2' => 'Media',
+	'Class:ResponseTicket/Attribute:priority/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:3' => 'Bassa',
+	'Class:ResponseTicket/Attribute:priority/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:workgroup_id' => 'Gruppo di lavoro',
+	'Class:ResponseTicket/Attribute:workgroup_id+' => '',
+	'Class:ResponseTicket/Attribute:workgroup_name' => 'Workgroup',
+	'Class:ResponseTicket/Attribute:workgroup_name+' => '',
+	'Class:ResponseTicket/Attribute:agent_id' => 'Agente',
+	'Class:ResponseTicket/Attribute:agent_id+' => '',
+	'Class:ResponseTicket/Attribute:agent_name' => 'Agente',
+	'Class:ResponseTicket/Attribute:agent_name+' => '',
+	'Class:ResponseTicket/Attribute:agent_email' => 'Email dell\'agente',
+	'Class:ResponseTicket/Attribute:agent_email+' => '',
+	'Class:ResponseTicket/Attribute:related_problem_id' => 'Problemi correlati',
+	'Class:ResponseTicket/Attribute:related_problem_id+' => '',
+	'Class:ResponseTicket/Attribute:related_problem_ref' => 'Ref',
+	'Class:ResponseTicket/Attribute:related_problem_ref+' => '',
+	'Class:ResponseTicket/Attribute:related_change_id' => 'Cambi correlati',
+	'Class:ResponseTicket/Attribute:related_change_id+' => '',
+	'Class:ResponseTicket/Attribute:related_change_ref' => 'Cambi correlati',
+	'Class:ResponseTicket/Attribute:related_change_ref+' => '',
+	'Class:ResponseTicket/Attribute:close_date' => 'Chiuso',
+	'Class:ResponseTicket/Attribute:close_date+' => '',
+	'Class:ResponseTicket/Attribute:last_update' => 'Ultimo aggiornamento',
+	'Class:ResponseTicket/Attribute:last_update+' => '',
+	'Class:ResponseTicket/Attribute:assignment_date' => 'Data di Assegnazione ',
+	'Class:ResponseTicket/Attribute:assignment_date+' => '',
+	'Class:ResponseTicket/Attribute:resolution_date' => 'Data di risoluzione',
+	'Class:ResponseTicket/Attribute:resolution_date+' => '',
+	'Class:ResponseTicket/Attribute:tto_escalation_deadline' => 'TTO Scadenza di Escalation',
+	'Class:ResponseTicket/Attribute:tto_escalation_deadline+' => '',
+	'Class:ResponseTicket/Attribute:ttr_escalation_deadline' => 'TTR Scadenza di Escalation',
+	'Class:ResponseTicket/Attribute:ttr_escalation_deadline+' => '',
+	'Class:ResponseTicket/Attribute:closure_deadline' => 'Termine di chiusura',
+	'Class:ResponseTicket/Attribute:closure_deadline+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code' => 'Codice di risoluzione',
+	'Class:ResponseTicket/Attribute:resolution_code+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce' => 'Non puo\' essere riprodotto',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate' => 'Ticket duplicato',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed' => 'Fissato',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant' => 'Irrilevante',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant+' => '',
+	'Class:ResponseTicket/Attribute:solution' => 'Soluzione',
+	'Class:ResponseTicket/Attribute:solution+' => '',
+	'Class:ResponseTicket/Attribute:user_satisfaction' => 'Soddisfazione dell\'utente',
+	'Class:ResponseTicket/Attribute:user_satisfaction+' => '',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1' => 'Molto soddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1+' => 'Molto soddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2' => 'Abbastanza soddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2+' => 'Abbastanza soddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3' => 'Piuttosto insoddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3+' => 'Piuttosto insoddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4' => 'Molto insoddisfatto',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4+' => 'Molto insoddisfatto',
+	'Class:ResponseTicket/Attribute:user_commment' => 'Commento dell\'utente',
+	'Class:ResponseTicket/Attribute:user_commment+' => '',
+	'Class:ResponseTicket/Stimulus:ev_assign' => 'Assegna',
+	'Class:ResponseTicket/Stimulus:ev_assign+' => '',
+	'Class:ResponseTicket/Stimulus:ev_reassign' => 'Riassegna',
+	'Class:ResponseTicket/Stimulus:ev_reassign+' => '',
+	'Class:ResponseTicket/Stimulus:ev_timeout' => 'Escalation',
+	'Class:ResponseTicket/Stimulus:ev_timeout+' => '',
+	'Class:ResponseTicket/Stimulus:ev_resolve' => 'Segna come risolto',
+	'Class:ResponseTicket/Stimulus:ev_resolve+' => '',
+	'Class:ResponseTicket/Stimulus:ev_close' => 'Chiudi',
+	'Class:ResponseTicket/Stimulus:ev_close+' => '',
 	'Class:Ticket/Attribute:org_id' => 'Organization~~',
 	'Class:Ticket/Attribute:org_name' => 'Organization Name~~',
 	'Class:Ticket/Attribute:caller_id' => 'Caller~~',
@@ -316,5 +316,5 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-));
-?>
+));
+?>
diff --git a/datamodels/2.x/itop-tickets/main.itop-tickets.php b/datamodels/2.x/itop-tickets/main.itop-tickets.php
index 7126eba0b..e461e6f30 100755
--- a/datamodels/2.x/itop-tickets/main.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/main.itop-tickets.php
@@ -1,286 +1,286 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Base class for computing TTO or TTR on a ticket
- */
-class ResponseTicketSLT
-{
-	/**
-	 * Determines the shortest SLT, for this ticket, for the given metric. Returns null is no SLT was found
-	 * @param string $sMetric Type of metric 'TTO', 'TTR', etc as defined in the SLT class
-	 * @return hash Array with 'SLT' => name of the SLT selected, 'value' => duration in seconds of the SLT metric, null if no SLT applies to this ticket
-	 */
-	protected static function ComputeSLT($oTicket, $sMetric = 'TTO')
-	{
-		$iDeadline = null;
-		if (MetaModel::IsValidClass('SLT'))
-		{
-			$sType=get_class($oTicket);
-			if ($sType == 'Incident')
-			{
-				$sRequestType = 'incident';
-			}
-			else
-			{
-				$sRequestType = $oTicket->Get('request_type');
-			}
-
-			$aArgs = $oTicket->ToArgs();
-			$aArgs['metric'] = $sMetric;
-			$aArgs['request_type'] = $sRequestType;
-
-			//echo "<p>Managing:".$sMetric."-".$this->Get('request_type')."-".$this->Get('importance')."</p>\n";
-			$oSLTSet = new DBObjectSet(DBObjectSearch::FromOQL(RESPONSE_TICKET_SLT_QUERY),
-						array(),
-						$aArgs
-						);
-
-			$iMinDuration = PHP_INT_MAX;
-			$sSLTName = '';
-
-			while($oSLT = $oSLTSet->Fetch())
-			{
-				$iDuration = (int)$oSLT->Get('value');
-				$sUnit = $oSLT->Get('unit');
-				switch($sUnit)
-				{
-					case 'days':
-					$iDuration = $iDuration * 24; // 24 hours in 1 days
-					// Fall though
-
-					case 'hours':
-					$iDuration = $iDuration * 60; // 60 minutes in 1 hour
-					// Fall though
-
-					case 'minutes':
-					$iDuration = $iDuration * 60;
-				}
-				if ($iDuration < $iMinDuration)
-				{
-					$iMinDuration = $iDuration;
-					$sSLTName = $oSLT->GetName();
-				}
-			}
-			if ($iMinDuration == PHP_INT_MAX)
-			{
-				$iDeadline = null;
-			}
-			else
-			{
-				// Store $sSLTName to keep track of which SLT has been used
-				$iDeadline = $iMinDuration;
-			}
-		}
-		return $iDeadline;
-
-	}
-}
-
-/**
- * Compute the TTO of a ticket - null if the class 'SLT' does not exist
- */
-class ResponseTicketTTO extends ResponseTicketSLT implements iMetricComputer
-{
-	public static function GetDescription()
-	{
-		return "Time to own a ticket";
-	}
-
-	public function ComputeMetric($oObject)
-	{
-		$iRes = $this->ComputeSLT($oObject, 'TTO');
-		return $iRes;
-	}
-}
-
-/**
- * Compute the TTR of a ticket - null if the class 'SLT' does not exist
- */
-class ResponseTicketTTR extends ResponseTicketSLT implements iMetricComputer
-{
-	public static function GetDescription()
-	{
-		return "Time to resolve a ticket";
-	}
-
-	public function ComputeMetric($oObject)
-	{
-		$iRes = $this->ComputeSLT($oObject, 'TTR');
-		return $iRes;
-	}
-}
-
-
-class _Ticket extends cmdbAbstractObject
-{
-
-	public function UpdateImpactedItems()
-	{
-		require_once(APPROOT.'core/displayablegraph.class.inc.php');
-
-		/** @var ormLinkSet $oContactsSet */
-		$oContactsSet = $this->Get('contacts_list');
-		/** @var ormLinkSet $oCIsSet */
-		$oCIsSet = $this->Get('functionalcis_list');
-
-		$aCIsToImpactCode = array();
-		$aSources = array();
-		$aExcluded = array();
-    	foreach ($oCIsSet as $oLink)
-		{
-			$iKey = $oLink->Get('functionalci_id');
-			$aCIsToImpactCode[$iKey] = array('link' => $oLink->GetKey(), 'code' => $oLink->Get('impact_code'));
-			if ($oLink->Get('impact_code') == 'manual')
-			{
-				$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
-				$aSources[$iKey] = $oObj;
-			}
-			else if ($oLink->Get('impact_code') == 'not_impacted')
-			{
-				$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
-				$aExcluded[] = $oObj;
-			}
-		}
-
-		$aContactsToRoleCode = array();
-		foreach ($oContactsSet as $oLink)
-		{
-			$iKey = $oLink->Get('contact_id');
-            $aContactsToRoleCode[$iKey] = array('link' => $oLink->GetKey(), 'code' => $oLink->Get('role_code'));
-			if ($oLink->Get('role_code') == 'do_not_notify')
-			{
-				$oObj = MetaModel::GetObject('Contact', $iKey);
-				$aExcluded[] = $oObj;
-			}
-		}
-		
-		$sContextKey = 'itop-tickets/relation_context/'.get_class($this).'/impacts/down';
-		$aContextDefs = DisplayableGraph::GetContextDefinitions($sContextKey, true, array('this' => $this));
-		$aDefaultContexts = array();
-		foreach($aContextDefs as $sKey => $aDefinition)
-		{
-			// Add the default context queries to the computation
-			if (array_key_exists('default', $aDefinition) && ($aDefinition['default'] == 'yes'))
-			{
-				$aDefaultContexts[] = $aDefinition['oql'];
-			}
-		}
-		// Merge the directly impacted items with the "new" ones added by the "context" queries
-        $aGraphObjects = array();
-        $oRawGraph = MetaModel::GetRelatedObjectsDown('impacts', $aSources, 10, true /* bEnableRedundancy */, $aExcluded);
-        $oIterator = new RelationTypeIterator($oRawGraph, 'Node');
-        foreach ($oIterator as $oNode)
-        {
-            // Any object node reached AND different from a source will do
-            if ( ($oNode instanceof RelationObjectNode) && ($oNode->GetProperty('is_reached')) && (!$oNode->GetProperty('source')) )
-            {
-                $this->StoreComputedObject($aGraphObjects, $oNode->GetProperty('object'));
-            }
-        }
-        if (count($aDefaultContexts) > 0)
-		{
-			$oAnnotatedGraph = MetaModel::GetRelatedObjectsDown('impacts', $aSources, 10, true /* bEnableRedundancy */, $aExcluded, $aDefaultContexts);
-			$oIterator = new RelationTypeIterator($oAnnotatedGraph, 'Node');
-			foreach ($oIterator as $oNode)
-			{
-                // Only pick the nodes which are NOT impacted by a context root cause, and merge them in the list
-                if (($oNode instanceof RelationObjectNode) && ($oNode->GetProperty('is_reached')) && (!$oNode->GetProperty('source')) && ($oNode->GetProperty('context_root_causes', null) == null))
-                {
-                    $this->StoreComputedObject($aGraphObjects, $oNode->GetProperty('object'));
-                }
-			}
-		}
-
-		// Remove unnecessary "computed" CIs and Contacts
-        foreach($aCIsToImpactCode as $iKey => $aCode)
-        {
-            if (($aCode['code'] == 'computed') && (!isset($aGraphObjects['FunctionalCI']) || (!array_key_exists($iKey, $aGraphObjects['FunctionalCI']))))
-            {
-                $oCIsSet->RemoveItem($aCode['link']);
-            }
-        }
-        foreach($aContactsToRoleCode as $iKey => $aCode)
-        {
-            if (($aCode['code'] == 'computed') && (!isset($aGraphObjects['Contact']) || (!array_key_exists($iKey, $aGraphObjects['Contact']))))
-            {
-                $oContactsSet->RemoveItem($aCode['link']);
-            }
-        }
-
-        // Add new nodes
-		foreach ($aGraphObjects as $sRootClass => $aObjects)
-		{
-			switch ($sRootClass)
-			{
-				case 'FunctionalCI':
-				// Only FunctionalCIs which are not already linked to the ticket
-                foreach($aObjects as $iKey => $oObj)
-                {
-                    if (!array_key_exists($iKey, $aCIsToImpactCode))
-                    {
-                        $oNewLink = new lnkFunctionalCIToTicket();
-                        $oNewLink->Set('functionalci_id', $iKey);
-                        $oNewLink->Set('impact_code', 'computed');
-                        $oCIsSet->AddItem($oNewLink);
-                    }
-                }
-				break;
-
-				case 'Contact':
-				// Only link Contacts which are not already linked to the ticket
-                foreach($aObjects as $iKey => $oObj)
-                {
-                    if (!array_key_exists($iKey, $aContactsToRoleCode))
-                    {
-                        $oNewLink = new lnkContactToTicket();
-                        $oNewLink->Set('contact_id', $iKey);
-                        $oNewLink->Set('role_code', 'computed');
-                        $oContactsSet->AddItem($oNewLink);
-                    }
-                }
-				break;
-			}
-		}
-		$this->Set('functionalcis_list', $oCIsSet);
-		$this->Set('contacts_list', $oContactsSet);
-	}
-
-	private function StoreComputedObject(&$aGraphObjects, $oObj)
-    {
-        $iKey = $oObj->GetKey();
-        $sRootClass = MetaModel::GetRootClass(get_class($oObj));
-        $aGraphObjects[$sRootClass][$iKey] = $oObj;
-    }
-
-	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		parent::DisplayBareRelations($oPage, $bEditMode);
-		// Display the impact analysis for tickets not in 'closed' or 'resolved' status... and not in edition
-		if ((!$bEditMode) && (!in_array($this->Get('status'), array('resolved', 'closed'))))
-		{
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/fraphael.js');
-			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery.contextMenu.css');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.contextMenu.js');
-			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/simple_graph.js');
-			$oPage->AddAjaxTab(Dict::S('Ticket:ImpactAnalysis'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=ticket_impact&class='.get_class($this).'&id='.$this->GetKey(), true);
-		}
-	}
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Base class for computing TTO or TTR on a ticket
+ */
+class ResponseTicketSLT
+{
+	/**
+	 * Determines the shortest SLT, for this ticket, for the given metric. Returns null is no SLT was found
+	 * @param string $sMetric Type of metric 'TTO', 'TTR', etc as defined in the SLT class
+	 * @return hash Array with 'SLT' => name of the SLT selected, 'value' => duration in seconds of the SLT metric, null if no SLT applies to this ticket
+	 */
+	protected static function ComputeSLT($oTicket, $sMetric = 'TTO')
+	{
+		$iDeadline = null;
+		if (MetaModel::IsValidClass('SLT'))
+		{
+			$sType=get_class($oTicket);
+			if ($sType == 'Incident')
+			{
+				$sRequestType = 'incident';
+			}
+			else
+			{
+				$sRequestType = $oTicket->Get('request_type');
+			}
+
+			$aArgs = $oTicket->ToArgs();
+			$aArgs['metric'] = $sMetric;
+			$aArgs['request_type'] = $sRequestType;
+
+			//echo "<p>Managing:".$sMetric."-".$this->Get('request_type')."-".$this->Get('importance')."</p>\n";
+			$oSLTSet = new DBObjectSet(DBObjectSearch::FromOQL(RESPONSE_TICKET_SLT_QUERY),
+						array(),
+						$aArgs
+						);
+
+			$iMinDuration = PHP_INT_MAX;
+			$sSLTName = '';
+
+			while($oSLT = $oSLTSet->Fetch())
+			{
+				$iDuration = (int)$oSLT->Get('value');
+				$sUnit = $oSLT->Get('unit');
+				switch($sUnit)
+				{
+					case 'days':
+					$iDuration = $iDuration * 24; // 24 hours in 1 days
+					// Fall though
+
+					case 'hours':
+					$iDuration = $iDuration * 60; // 60 minutes in 1 hour
+					// Fall though
+
+					case 'minutes':
+					$iDuration = $iDuration * 60;
+				}
+				if ($iDuration < $iMinDuration)
+				{
+					$iMinDuration = $iDuration;
+					$sSLTName = $oSLT->GetName();
+				}
+			}
+			if ($iMinDuration == PHP_INT_MAX)
+			{
+				$iDeadline = null;
+			}
+			else
+			{
+				// Store $sSLTName to keep track of which SLT has been used
+				$iDeadline = $iMinDuration;
+			}
+		}
+		return $iDeadline;
+
+	}
+}
+
+/**
+ * Compute the TTO of a ticket - null if the class 'SLT' does not exist
+ */
+class ResponseTicketTTO extends ResponseTicketSLT implements iMetricComputer
+{
+	public static function GetDescription()
+	{
+		return "Time to own a ticket";
+	}
+
+	public function ComputeMetric($oObject)
+	{
+		$iRes = $this->ComputeSLT($oObject, 'TTO');
+		return $iRes;
+	}
+}
+
+/**
+ * Compute the TTR of a ticket - null if the class 'SLT' does not exist
+ */
+class ResponseTicketTTR extends ResponseTicketSLT implements iMetricComputer
+{
+	public static function GetDescription()
+	{
+		return "Time to resolve a ticket";
+	}
+
+	public function ComputeMetric($oObject)
+	{
+		$iRes = $this->ComputeSLT($oObject, 'TTR');
+		return $iRes;
+	}
+}
+
+
+class _Ticket extends cmdbAbstractObject
+{
+
+	public function UpdateImpactedItems()
+	{
+		require_once(APPROOT.'core/displayablegraph.class.inc.php');
+
+		/** @var ormLinkSet $oContactsSet */
+		$oContactsSet = $this->Get('contacts_list');
+		/** @var ormLinkSet $oCIsSet */
+		$oCIsSet = $this->Get('functionalcis_list');
+
+		$aCIsToImpactCode = array();
+		$aSources = array();
+		$aExcluded = array();
+    	foreach ($oCIsSet as $oLink)
+		{
+			$iKey = $oLink->Get('functionalci_id');
+			$aCIsToImpactCode[$iKey] = array('link' => $oLink->GetKey(), 'code' => $oLink->Get('impact_code'));
+			if ($oLink->Get('impact_code') == 'manual')
+			{
+				$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
+				$aSources[$iKey] = $oObj;
+			}
+			else if ($oLink->Get('impact_code') == 'not_impacted')
+			{
+				$oObj = MetaModel::GetObject('FunctionalCI', $iKey);
+				$aExcluded[] = $oObj;
+			}
+		}
+
+		$aContactsToRoleCode = array();
+		foreach ($oContactsSet as $oLink)
+		{
+			$iKey = $oLink->Get('contact_id');
+            $aContactsToRoleCode[$iKey] = array('link' => $oLink->GetKey(), 'code' => $oLink->Get('role_code'));
+			if ($oLink->Get('role_code') == 'do_not_notify')
+			{
+				$oObj = MetaModel::GetObject('Contact', $iKey);
+				$aExcluded[] = $oObj;
+			}
+		}
+		
+		$sContextKey = 'itop-tickets/relation_context/'.get_class($this).'/impacts/down';
+		$aContextDefs = DisplayableGraph::GetContextDefinitions($sContextKey, true, array('this' => $this));
+		$aDefaultContexts = array();
+		foreach($aContextDefs as $sKey => $aDefinition)
+		{
+			// Add the default context queries to the computation
+			if (array_key_exists('default', $aDefinition) && ($aDefinition['default'] == 'yes'))
+			{
+				$aDefaultContexts[] = $aDefinition['oql'];
+			}
+		}
+		// Merge the directly impacted items with the "new" ones added by the "context" queries
+        $aGraphObjects = array();
+        $oRawGraph = MetaModel::GetRelatedObjectsDown('impacts', $aSources, 10, true /* bEnableRedundancy */, $aExcluded);
+        $oIterator = new RelationTypeIterator($oRawGraph, 'Node');
+        foreach ($oIterator as $oNode)
+        {
+            // Any object node reached AND different from a source will do
+            if ( ($oNode instanceof RelationObjectNode) && ($oNode->GetProperty('is_reached')) && (!$oNode->GetProperty('source')) )
+            {
+                $this->StoreComputedObject($aGraphObjects, $oNode->GetProperty('object'));
+            }
+        }
+        if (count($aDefaultContexts) > 0)
+		{
+			$oAnnotatedGraph = MetaModel::GetRelatedObjectsDown('impacts', $aSources, 10, true /* bEnableRedundancy */, $aExcluded, $aDefaultContexts);
+			$oIterator = new RelationTypeIterator($oAnnotatedGraph, 'Node');
+			foreach ($oIterator as $oNode)
+			{
+                // Only pick the nodes which are NOT impacted by a context root cause, and merge them in the list
+                if (($oNode instanceof RelationObjectNode) && ($oNode->GetProperty('is_reached')) && (!$oNode->GetProperty('source')) && ($oNode->GetProperty('context_root_causes', null) == null))
+                {
+                    $this->StoreComputedObject($aGraphObjects, $oNode->GetProperty('object'));
+                }
+			}
+		}
+
+		// Remove unnecessary "computed" CIs and Contacts
+        foreach($aCIsToImpactCode as $iKey => $aCode)
+        {
+            if (($aCode['code'] == 'computed') && (!isset($aGraphObjects['FunctionalCI']) || (!array_key_exists($iKey, $aGraphObjects['FunctionalCI']))))
+            {
+                $oCIsSet->RemoveItem($aCode['link']);
+            }
+        }
+        foreach($aContactsToRoleCode as $iKey => $aCode)
+        {
+            if (($aCode['code'] == 'computed') && (!isset($aGraphObjects['Contact']) || (!array_key_exists($iKey, $aGraphObjects['Contact']))))
+            {
+                $oContactsSet->RemoveItem($aCode['link']);
+            }
+        }
+
+        // Add new nodes
+		foreach ($aGraphObjects as $sRootClass => $aObjects)
+		{
+			switch ($sRootClass)
+			{
+				case 'FunctionalCI':
+				// Only FunctionalCIs which are not already linked to the ticket
+                foreach($aObjects as $iKey => $oObj)
+                {
+                    if (!array_key_exists($iKey, $aCIsToImpactCode))
+                    {
+                        $oNewLink = new lnkFunctionalCIToTicket();
+                        $oNewLink->Set('functionalci_id', $iKey);
+                        $oNewLink->Set('impact_code', 'computed');
+                        $oCIsSet->AddItem($oNewLink);
+                    }
+                }
+				break;
+
+				case 'Contact':
+				// Only link Contacts which are not already linked to the ticket
+                foreach($aObjects as $iKey => $oObj)
+                {
+                    if (!array_key_exists($iKey, $aContactsToRoleCode))
+                    {
+                        $oNewLink = new lnkContactToTicket();
+                        $oNewLink->Set('contact_id', $iKey);
+                        $oNewLink->Set('role_code', 'computed');
+                        $oContactsSet->AddItem($oNewLink);
+                    }
+                }
+				break;
+			}
+		}
+		$this->Set('functionalcis_list', $oCIsSet);
+		$this->Set('contacts_list', $oContactsSet);
+	}
+
+	private function StoreComputedObject(&$aGraphObjects, $oObj)
+    {
+        $iKey = $oObj->GetKey();
+        $sRootClass = MetaModel::GetRootClass(get_class($oObj));
+        $aGraphObjects[$sRootClass][$iKey] = $oObj;
+    }
+
+	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		parent::DisplayBareRelations($oPage, $bEditMode);
+		// Display the impact analysis for tickets not in 'closed' or 'resolved' status... and not in edition
+		if ((!$bEditMode) && (!in_array($this->Get('status'), array('resolved', 'closed'))))
+		{
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/fraphael.js');
+			$oPage->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/jquery.contextMenu.css');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.contextMenu.js');
+			$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/simple_graph.js');
+			$oPage->AddAjaxTab(Dict::S('Ticket:ImpactAnalysis'), utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=ticket_impact&class='.get_class($this).'&id='.$this->GetKey(), true);
+		}
+	}
+}
 ?>
\ No newline at end of file
diff --git a/datamodels/2.x/itop-tickets/module.itop-tickets.php b/datamodels/2.x/itop-tickets/module.itop-tickets.php
index ca41a478d..67c6c5cfb 100755
--- a/datamodels/2.x/itop-tickets/module.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/module.itop-tickets.php
@@ -1,72 +1,72 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__,
-	'itop-tickets/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'Tickets Management',
-		'category' => 'business',
-
-		// Setup
-		//
-		'dependencies' => array(
-			'itop-config-mgmt/2.4.0',
-		),
-		'mandatory' => true,
-		'visible' => false,
-		'installer' => 'TicketsInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'main.itop-tickets.php',
-			'model.itop-tickets.php',
-		),
-		'data.struct' => array(
-	//		'data.struct.ta-actions.xml',
-		),
-		'data.sample' => array(
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '/documentation/itop-tickets.htm',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-		),
-	)
-);
-
-// Module installation handler
-//
-class TicketsInstaller extends ModuleInstallerAPI
-{
-	public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-	{
-		// Delete all Triggers corresponding to a no more valid class
-		$oSearch = new DBObjectSearch('TriggerOnObject');
-		$oSet = new DBObjectSet($oSearch);
-		$oChange = null;
-		while($oTrigger = $oSet->Fetch())
-		{
-			if (!MetaModel::IsValidClass($oTrigger->Get('target_class')))
-			{
-				if ($oChange == null)
-				{
-					// Create the change for its first use
-					$oChange = new CMDBChange;
-					$oChange->Set("date", time());
-					$oChange->Set("userinfo", "Uninstallation");
-					$oChange->DBInsert();
-				}
-				$oTrigger->DBDeleteTracked($oChange);
-			}
-		}
-	}
-}
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__,
+	'itop-tickets/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'Tickets Management',
+		'category' => 'business',
+
+		// Setup
+		//
+		'dependencies' => array(
+			'itop-config-mgmt/2.4.0',
+		),
+		'mandatory' => true,
+		'visible' => false,
+		'installer' => 'TicketsInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'main.itop-tickets.php',
+			'model.itop-tickets.php',
+		),
+		'data.struct' => array(
+	//		'data.struct.ta-actions.xml',
+		),
+		'data.sample' => array(
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '/documentation/itop-tickets.htm',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+		),
+	)
+);
+
+// Module installation handler
+//
+class TicketsInstaller extends ModuleInstallerAPI
+{
+	public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+	{
+		// Delete all Triggers corresponding to a no more valid class
+		$oSearch = new DBObjectSearch('TriggerOnObject');
+		$oSet = new DBObjectSet($oSearch);
+		$oChange = null;
+		while($oTrigger = $oSet->Fetch())
+		{
+			if (!MetaModel::IsValidClass($oTrigger->Get('target_class')))
+			{
+				if ($oChange == null)
+				{
+					// Create the change for its first use
+					$oChange = new CMDBChange;
+					$oChange->Set("date", time());
+					$oChange->Set("userinfo", "Uninstallation");
+					$oChange->DBInsert();
+				}
+				$oTrigger->DBDeleteTracked($oChange);
+			}
+		}
+	}
+}
diff --git a/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
index 37bc9ec31..fefe27f33 100644
--- a/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/nl.dict.itop-tickets.php
@@ -1,254 +1,254 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Ticket
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Ticket' => 'Ticket',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => 'Nummer',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:org_id' => 'Organisatie',
-	'Class:Ticket/Attribute:org_id+' => '',
-	'Class:Ticket/Attribute:org_name' => 'Organisatie Naam',
-	'Class:Ticket/Attribute:org_name+' => '',
-	'Class:Ticket/Attribute:caller_id' => 'Aanvrager',
-	'Class:Ticket/Attribute:caller_id+' => '',
-	'Class:Ticket/Attribute:caller_name' => 'Aanvrager Naam',
-	'Class:Ticket/Attribute:caller_name+' => '',
-	'Class:Ticket/Attribute:team_id' => 'Team',
-	'Class:Ticket/Attribute:team_id+' => '',
-	'Class:Ticket/Attribute:team_name' => 'Team Naam',
-	'Class:Ticket/Attribute:team_name+' => '',
-	'Class:Ticket/Attribute:agent_id' => 'Agent',
-	'Class:Ticket/Attribute:agent_id+' => '',
-	'Class:Ticket/Attribute:agent_name' => 'Agent Naam',
-	'Class:Ticket/Attribute:agent_name+' => '',
-	'Class:Ticket/Attribute:title' => 'Titel',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => 'Omschrijving',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:start_date' => 'Start datum',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:end_date' => 'Eind datum',
-	'Class:Ticket/Attribute:end_date+' => '',
-	'Class:Ticket/Attribute:last_update' => 'Laatste update',
-	'Class:Ticket/Attribute:last_update+' => '',
-	'Class:Ticket/Attribute:close_date' => 'Sluitings datum',
-	'Class:Ticket/Attribute:close_date+' => '',
-	'Class:Ticket/Attribute:private_log' => 'Prive log',
-	'Class:Ticket/Attribute:private_log+' => '',
-	'Class:Ticket/Attribute:contacts_list' => 'Contacten',
-	'Class:Ticket/Attribute:contacts_list+' => 'Alle contacten die gelinkt zijn aan dit ticket',
-	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
-	'Class:Ticket/Attribute:functionalcis_list+' => 'Alle configuratie items die impact hebben op dit ticket',
-	'Class:Ticket/Attribute:workorders_list' => 'Werk orders',
-	'Class:Ticket/Attribute:workorders_list+' => 'Alle  werk orders voor dit ticket',
-	'Class:Ticket/Attribute:finalclass' => 'Type',
-	'Class:Ticket/Attribute:finalclass+' => '',
-));
-
-
-//
-// Class: lnkContactToTicket
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkContactToTicket' => 'Link Contact / Ticket',
-	'Class:lnkContactToTicket+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
-	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_email' => 'Contact Email',
-	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
-	'Class:lnkContactToTicket/Attribute:role' => 'Rol',
-	'Class:lnkContactToTicket/Attribute:role+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Naam',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-));
-
-
-//
-// Class: WorkOrder
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:WorkOrder' => 'Werk Order',
-	'Class:WorkOrder+' => '',
-	'Class:WorkOrder/Attribute:name' => 'Naam',
-	'Class:WorkOrder/Attribute:name+' => '',
-	'Class:WorkOrder/Attribute:status' => 'Status',
-	'Class:WorkOrder/Attribute:status+' => '',
-	'Class:WorkOrder/Attribute:status/Value:open' => 'open',
-	'Class:WorkOrder/Attribute:status/Value:open+' => '',
-	'Class:WorkOrder/Attribute:status/Value:closed' => 'gesloten',
-	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
-	'Class:WorkOrder/Attribute:description' => 'Omschrijving',
-	'Class:WorkOrder/Attribute:description+' => '',
-	'Class:WorkOrder/Attribute:ticket_id' => 'Ticket',
-	'Class:WorkOrder/Attribute:ticket_id+' => '',
-	'Class:WorkOrder/Attribute:ticket_ref' => 'Ticket ref',
-	'Class:WorkOrder/Attribute:ticket_ref+' => '',
-	'Class:WorkOrder/Attribute:team_id' => 'Team',
-	'Class:WorkOrder/Attribute:team_id+' => '',
-	'Class:WorkOrder/Attribute:team_name' => 'Team Naam',
-	'Class:WorkOrder/Attribute:team_name+' => '',
-	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
-	'Class:WorkOrder/Attribute:agent_id+' => '',
-	'Class:WorkOrder/Attribute:agent_email' => 'Agent email',
-	'Class:WorkOrder/Attribute:agent_email+' => '',
-	'Class:WorkOrder/Attribute:start_date' => 'Start datum',
-	'Class:WorkOrder/Attribute:start_date+' => '',
-	'Class:WorkOrder/Attribute:end_date' => 'End datum',
-	'Class:WorkOrder/Attribute:end_date+' => '',
-	'Class:WorkOrder/Attribute:log' => 'Log',
-	'Class:WorkOrder/Attribute:log+' => '',
-	'Class:WorkOrder/Stimulus:ev_close' => 'Sluiten',
-	'Class:WorkOrder/Stimulus:ev_close+' => '',
-));
-
-
-// Fieldset translation
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-
-	'Ticket:baseinfo' => 'Globale Informatie',
-	'Ticket:date' => 'Data',
-	'Ticket:contact' => 'Contacten',
-	'Ticket:moreinfo' => 'Meer Informatie',
-	'Ticket:relation' => 'Relaties',
-	'Ticket:log' => 'Communicaties',
-	'Ticket:Type' => 'Kwalificaties',
-	'Ticket:support' => 'Support',
-	'Ticket:resolution' => 'Resolutie',
-	'Ticket:SLA' => 'SLA rapportage',
-	'WorkOrder:Details' => 'Details',
-	'WorkOrder:Moreinfo' => 'Meer informatie',
-
-	'Ticket:ImpactAnalysis' => 'Impact Analysis~~',
-	'Class:lnkContactToTicket/Attribute:role_code' => 'Role~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Added manually~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computed~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
-	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \"person\" attached to the logged in \"user\").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \"DefaultWorkingTimeComputer\" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-	'portal:itop-portal' => 'Standaard portaal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => '%1$s - Gebruikersportaal',
-	'Brick:Portal:UserProfile:Title' => 'Mijn profiel',
-	'Brick:Portal:NewRequest:Title' => 'Nieuw verzoek',
-	'Brick:Portal:NewRequest:Title+' => '<p>Hulp nodig?</p><p>Selecteer de categorie uit de dienstencatalogus en verstuur uw verzoek naar onze support teams.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Lopende verzoeken',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Verder gaan met uw openstaande verzoeken.</p><p>Controleer de voortgang, voeg commentaar of documenten toe, bevestig de geboden oplossing.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Openstaand',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Opgelost',
-	'Brick:Portal:ClosedRequests:Title' => 'Gesloten verzoeken',
-
-));
-
-
-
-
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Ticket
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Ticket' => 'Ticket',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Nummer',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:org_id' => 'Organisatie',
+	'Class:Ticket/Attribute:org_id+' => '',
+	'Class:Ticket/Attribute:org_name' => 'Organisatie Naam',
+	'Class:Ticket/Attribute:org_name+' => '',
+	'Class:Ticket/Attribute:caller_id' => 'Aanvrager',
+	'Class:Ticket/Attribute:caller_id+' => '',
+	'Class:Ticket/Attribute:caller_name' => 'Aanvrager Naam',
+	'Class:Ticket/Attribute:caller_name+' => '',
+	'Class:Ticket/Attribute:team_id' => 'Team',
+	'Class:Ticket/Attribute:team_id+' => '',
+	'Class:Ticket/Attribute:team_name' => 'Team Naam',
+	'Class:Ticket/Attribute:team_name+' => '',
+	'Class:Ticket/Attribute:agent_id' => 'Agent',
+	'Class:Ticket/Attribute:agent_id+' => '',
+	'Class:Ticket/Attribute:agent_name' => 'Agent Naam',
+	'Class:Ticket/Attribute:agent_name+' => '',
+	'Class:Ticket/Attribute:title' => 'Titel',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Omschrijving',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Start datum',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:end_date' => 'Eind datum',
+	'Class:Ticket/Attribute:end_date+' => '',
+	'Class:Ticket/Attribute:last_update' => 'Laatste update',
+	'Class:Ticket/Attribute:last_update+' => '',
+	'Class:Ticket/Attribute:close_date' => 'Sluitings datum',
+	'Class:Ticket/Attribute:close_date+' => '',
+	'Class:Ticket/Attribute:private_log' => 'Prive log',
+	'Class:Ticket/Attribute:private_log+' => '',
+	'Class:Ticket/Attribute:contacts_list' => 'Contacten',
+	'Class:Ticket/Attribute:contacts_list+' => 'Alle contacten die gelinkt zijn aan dit ticket',
+	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
+	'Class:Ticket/Attribute:functionalcis_list+' => 'Alle configuratie items die impact hebben op dit ticket',
+	'Class:Ticket/Attribute:workorders_list' => 'Werk orders',
+	'Class:Ticket/Attribute:workorders_list+' => 'Alle  werk orders voor dit ticket',
+	'Class:Ticket/Attribute:finalclass' => 'Type',
+	'Class:Ticket/Attribute:finalclass+' => '',
+));
+
+
+//
+// Class: lnkContactToTicket
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkContactToTicket' => 'Link Contact / Ticket',
+	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contact',
+	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Contact Email',
+	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
+	'Class:lnkContactToTicket/Attribute:role' => 'Rol',
+	'Class:lnkContactToTicket/Attribute:role+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI Naam',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impact',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+));
+
+
+//
+// Class: WorkOrder
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:WorkOrder' => 'Werk Order',
+	'Class:WorkOrder+' => '',
+	'Class:WorkOrder/Attribute:name' => 'Naam',
+	'Class:WorkOrder/Attribute:name+' => '',
+	'Class:WorkOrder/Attribute:status' => 'Status',
+	'Class:WorkOrder/Attribute:status+' => '',
+	'Class:WorkOrder/Attribute:status/Value:open' => 'open',
+	'Class:WorkOrder/Attribute:status/Value:open+' => '',
+	'Class:WorkOrder/Attribute:status/Value:closed' => 'gesloten',
+	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
+	'Class:WorkOrder/Attribute:description' => 'Omschrijving',
+	'Class:WorkOrder/Attribute:description+' => '',
+	'Class:WorkOrder/Attribute:ticket_id' => 'Ticket',
+	'Class:WorkOrder/Attribute:ticket_id+' => '',
+	'Class:WorkOrder/Attribute:ticket_ref' => 'Ticket ref',
+	'Class:WorkOrder/Attribute:ticket_ref+' => '',
+	'Class:WorkOrder/Attribute:team_id' => 'Team',
+	'Class:WorkOrder/Attribute:team_id+' => '',
+	'Class:WorkOrder/Attribute:team_name' => 'Team Naam',
+	'Class:WorkOrder/Attribute:team_name+' => '',
+	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
+	'Class:WorkOrder/Attribute:agent_id+' => '',
+	'Class:WorkOrder/Attribute:agent_email' => 'Agent email',
+	'Class:WorkOrder/Attribute:agent_email+' => '',
+	'Class:WorkOrder/Attribute:start_date' => 'Start datum',
+	'Class:WorkOrder/Attribute:start_date+' => '',
+	'Class:WorkOrder/Attribute:end_date' => 'End datum',
+	'Class:WorkOrder/Attribute:end_date+' => '',
+	'Class:WorkOrder/Attribute:log' => 'Log',
+	'Class:WorkOrder/Attribute:log+' => '',
+	'Class:WorkOrder/Stimulus:ev_close' => 'Sluiten',
+	'Class:WorkOrder/Stimulus:ev_close+' => '',
+));
+
+
+// Fieldset translation
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+
+	'Ticket:baseinfo' => 'Globale Informatie',
+	'Ticket:date' => 'Data',
+	'Ticket:contact' => 'Contacten',
+	'Ticket:moreinfo' => 'Meer Informatie',
+	'Ticket:relation' => 'Relaties',
+	'Ticket:log' => 'Communicaties',
+	'Ticket:Type' => 'Kwalificaties',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Resolutie',
+	'Ticket:SLA' => 'SLA rapportage',
+	'WorkOrder:Details' => 'Details',
+	'WorkOrder:Moreinfo' => 'Meer informatie',
+
+	'Ticket:ImpactAnalysis' => 'Impact Analysis~~',
+	'Class:lnkContactToTicket/Attribute:role_code' => 'Role~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Added manually~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computed~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Do not notify~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Added manually~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computed~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Not impacted~~',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \"person\" attached to the logged in \"user\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \"DefaultWorkingTimeComputer\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
+	'portal:itop-portal' => 'Standaard portaal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => '%1$s - Gebruikersportaal',
+	'Brick:Portal:UserProfile:Title' => 'Mijn profiel',
+	'Brick:Portal:NewRequest:Title' => 'Nieuw verzoek',
+	'Brick:Portal:NewRequest:Title+' => '<p>Hulp nodig?</p><p>Selecteer de categorie uit de dienstencatalogus en verstuur uw verzoek naar onze support teams.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Lopende verzoeken',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Verder gaan met uw openstaande verzoeken.</p><p>Controleer de voortgang, voeg commentaar of documenten toe, bevestig de geboden oplossing.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Openstaand',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Opgelost',
+	'Brick:Portal:ClosedRequests:Title' => 'Gesloten verzoeken',
+
+));
+
+
+
+
+
+
+
+?>
diff --git a/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
index e72230f7a..8664fd4c9 100755
--- a/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/pt_br.dict.itop-tickets.php
@@ -1,244 +1,244 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Ticket
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Ticket' => 'Solicitação',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => 'Ref',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:org_id' => 'Organização',
-	'Class:Ticket/Attribute:org_id+' => '',
-	'Class:Ticket/Attribute:org_name' => 'Nome organização',
-	'Class:Ticket/Attribute:org_name+' => '',
-	'Class:Ticket/Attribute:caller_id' => 'Solicitante',
-	'Class:Ticket/Attribute:caller_id+' => '',
-	'Class:Ticket/Attribute:caller_name' => 'Nome solicitante',
-	'Class:Ticket/Attribute:caller_name+' => '',
-	'Class:Ticket/Attribute:team_id' => 'Equipe',
-	'Class:Ticket/Attribute:team_id+' => '',
-	'Class:Ticket/Attribute:team_name' => 'Nome equipe',
-	'Class:Ticket/Attribute:team_name+' => '',
-	'Class:Ticket/Attribute:agent_id' => 'Agente',
-	'Class:Ticket/Attribute:agent_id+' => '',
-	'Class:Ticket/Attribute:agent_name' => 'Nome agente',
-	'Class:Ticket/Attribute:agent_name+' => '',
-	'Class:Ticket/Attribute:title' => 'Título',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => 'Descrição',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:start_date' => 'Data início',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:end_date' => 'Data final',
-	'Class:Ticket/Attribute:end_date+' => '',
-	'Class:Ticket/Attribute:last_update' => 'Última atualização',
-	'Class:Ticket/Attribute:last_update+' => '',
-	'Class:Ticket/Attribute:close_date' => 'Data fechamento',
-	'Class:Ticket/Attribute:close_date+' => '',
-	'Class:Ticket/Attribute:private_log' => 'Log privado',
-	'Class:Ticket/Attribute:private_log+' => '',
-	'Class:Ticket/Attribute:contacts_list' => 'Contatos',
-	'Class:Ticket/Attribute:contacts_list+' => 'Todos os contatos vinculados a essa solicitação',
-	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
-	'Class:Ticket/Attribute:functionalcis_list+' => 'Todos os itens de configuração afetados por essa solicitação',
-	'Class:Ticket/Attribute:workorders_list' => 'Ordens de serviço',
-	'Class:Ticket/Attribute:workorders_list+' => 'Todos as Ordens de Serviço para essa solicitação',
-	'Class:Ticket/Attribute:finalclass' => 'Tipo',
-	'Class:Ticket/Attribute:finalclass+' => '',
-));
-
-
-//
-// Class: lnkContactToTicket
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToTicket' => 'Link Contato / Solicitação',
-	'Class:lnkContactToTicket+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Solicitação',
-	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contato',
-	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email contato',
-	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
-	'Class:lnkContactToTicket/Attribute:role' => 'Regra',
-	'Class:lnkContactToTicket/Attribute:role+' => '',
-));
-
-//
-// Class: lnkFunctionalCIToTicket
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToTicket' => 'Link CI / Solicitação',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CIs',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nome CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-));
-
-
-//
-// Class: WorkOrder
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:WorkOrder' => 'Ordem de serviço',
-	'Class:WorkOrder+' => '',
-	'Class:WorkOrder/Attribute:name' => 'Nome',
-	'Class:WorkOrder/Attribute:name+' => '',
-	'Class:WorkOrder/Attribute:status' => 'Estado',
-	'Class:WorkOrder/Attribute:status+' => '',
-	'Class:WorkOrder/Attribute:status/Value:open' => 'Aberto',
-	'Class:WorkOrder/Attribute:status/Value:open+' => '',
-	'Class:WorkOrder/Attribute:status/Value:closed' => 'Fechado',
-	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
-	'Class:WorkOrder/Attribute:description' => 'Descrição',
-	'Class:WorkOrder/Attribute:description+' => '',
-	'Class:WorkOrder/Attribute:ticket_id' => 'Solicitante',
-	'Class:WorkOrder/Attribute:ticket_id+' => '',
-	'Class:WorkOrder/Attribute:ticket_ref' => 'Ref solicitante',
-	'Class:WorkOrder/Attribute:ticket_ref+' => '',
-	'Class:WorkOrder/Attribute:team_id' => 'Equipe',
-	'Class:WorkOrder/Attribute:team_id+' => '',
-	'Class:WorkOrder/Attribute:team_name' => 'Nome equipe',
-	'Class:WorkOrder/Attribute:team_name+' => '',
-	'Class:WorkOrder/Attribute:agent_id' => 'Agente',
-	'Class:WorkOrder/Attribute:agent_id+' => '',
-	'Class:WorkOrder/Attribute:agent_email' => 'Email agente',
-	'Class:WorkOrder/Attribute:agent_email+' => '',
-	'Class:WorkOrder/Attribute:start_date' => 'Data início',
-	'Class:WorkOrder/Attribute:start_date+' => '',
-	'Class:WorkOrder/Attribute:end_date' => 'Data final',
-	'Class:WorkOrder/Attribute:end_date+' => '',
-	'Class:WorkOrder/Attribute:log' => 'Log',
-	'Class:WorkOrder/Attribute:log+' => '',
-	'Class:WorkOrder/Stimulus:ev_close' => 'Fechar',
-	'Class:WorkOrder/Stimulus:ev_close+' => '',
-));
-
-
-// Fieldset translation
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-
-	'Ticket:baseinfo' => 'Informações gerais',
-	'Ticket:date' => 'Datas',
-	'Ticket:contact' => 'Contatos',
-	'Ticket:moreinfo' => 'Mais informações',
-	'Ticket:relation' => 'Relações',
-	'Ticket:log' => 'Comunicação',
-	'Ticket:Type' => 'Qualificação',
-	'Ticket:support' => 'Suporte',
-	'Ticket:resolution' => 'Resolução',
-	'Ticket:SLA' => 'Relatório SLA',
-	'WorkOrder:Details' => 'Detalhes',
-	'WorkOrder:Moreinfo' => 'Mais informações',
-
-	'Ticket:ImpactAnalysis' => 'Análise de Impacto~~',
-	'Class:lnkContactToTicket/Attribute:role_code' => 'Role~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Adicionado manualmente~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computado~~',
-	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Não notificar~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado~~',
-	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
-	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
-	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
-	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \"person\" attached to the logged in \"user\").~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \"DefaultWorkingTimeComputer\" to force a 24x7 scheme~~',
-	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
-	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
-	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
-	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
-	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
-	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-
-	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
-	'Page:DefaultTitle' => 'iTop - Portal do Usuário',
-	'Brick:Portal:UserProfile:Title' => 'Meu Perfil',
-	'Brick:Portal:NewRequest:Title' => 'Nova Solicitação',
-	'Brick:Portal:NewRequest:Title+' => '<p>Precisa de ajuda?</p><p>Escolha no Catálogo de Serviços e envie sua solicitação para nossas equipes de suporte.</p>',
-	'Brick:Portal:OngoingRequests:Title' => 'Em andamento',
-	'Brick:Portal:OngoingRequests:Title+' => '<p>Acompanhar suas solicitações em andamento, adicionar comentários, anexar documentos e confirmar a solução.</p>',
-	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Abrir',
-	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolvido',
-	'Brick:Portal:ClosedRequests:Title' => 'Fechar solicitações',
-));
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Ticket
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Ticket' => 'Solicitação',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Ref',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:org_id' => 'Organização',
+	'Class:Ticket/Attribute:org_id+' => '',
+	'Class:Ticket/Attribute:org_name' => 'Nome organização',
+	'Class:Ticket/Attribute:org_name+' => '',
+	'Class:Ticket/Attribute:caller_id' => 'Solicitante',
+	'Class:Ticket/Attribute:caller_id+' => '',
+	'Class:Ticket/Attribute:caller_name' => 'Nome solicitante',
+	'Class:Ticket/Attribute:caller_name+' => '',
+	'Class:Ticket/Attribute:team_id' => 'Equipe',
+	'Class:Ticket/Attribute:team_id+' => '',
+	'Class:Ticket/Attribute:team_name' => 'Nome equipe',
+	'Class:Ticket/Attribute:team_name+' => '',
+	'Class:Ticket/Attribute:agent_id' => 'Agente',
+	'Class:Ticket/Attribute:agent_id+' => '',
+	'Class:Ticket/Attribute:agent_name' => 'Nome agente',
+	'Class:Ticket/Attribute:agent_name+' => '',
+	'Class:Ticket/Attribute:title' => 'Título',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Descrição',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Data início',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:end_date' => 'Data final',
+	'Class:Ticket/Attribute:end_date+' => '',
+	'Class:Ticket/Attribute:last_update' => 'Última atualização',
+	'Class:Ticket/Attribute:last_update+' => '',
+	'Class:Ticket/Attribute:close_date' => 'Data fechamento',
+	'Class:Ticket/Attribute:close_date+' => '',
+	'Class:Ticket/Attribute:private_log' => 'Log privado',
+	'Class:Ticket/Attribute:private_log+' => '',
+	'Class:Ticket/Attribute:contacts_list' => 'Contatos',
+	'Class:Ticket/Attribute:contacts_list+' => 'Todos os contatos vinculados a essa solicitação',
+	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
+	'Class:Ticket/Attribute:functionalcis_list+' => 'Todos os itens de configuração afetados por essa solicitação',
+	'Class:Ticket/Attribute:workorders_list' => 'Ordens de serviço',
+	'Class:Ticket/Attribute:workorders_list+' => 'Todos as Ordens de Serviço para essa solicitação',
+	'Class:Ticket/Attribute:finalclass' => 'Tipo',
+	'Class:Ticket/Attribute:finalclass+' => '',
+));
+
+
+//
+// Class: lnkContactToTicket
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkContactToTicket' => 'Link Contato / Solicitação',
+	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Solicitação',
+	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_id' => 'Contato',
+	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Email contato',
+	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
+	'Class:lnkContactToTicket/Attribute:role' => 'Regra',
+	'Class:lnkContactToTicket/Attribute:role+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToTicket
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkFunctionalCIToTicket' => 'Link CI / Solicitação',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CIs',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Nome CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Impacto',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+));
+
+
+//
+// Class: WorkOrder
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:WorkOrder' => 'Ordem de serviço',
+	'Class:WorkOrder+' => '',
+	'Class:WorkOrder/Attribute:name' => 'Nome',
+	'Class:WorkOrder/Attribute:name+' => '',
+	'Class:WorkOrder/Attribute:status' => 'Estado',
+	'Class:WorkOrder/Attribute:status+' => '',
+	'Class:WorkOrder/Attribute:status/Value:open' => 'Aberto',
+	'Class:WorkOrder/Attribute:status/Value:open+' => '',
+	'Class:WorkOrder/Attribute:status/Value:closed' => 'Fechado',
+	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
+	'Class:WorkOrder/Attribute:description' => 'Descrição',
+	'Class:WorkOrder/Attribute:description+' => '',
+	'Class:WorkOrder/Attribute:ticket_id' => 'Solicitante',
+	'Class:WorkOrder/Attribute:ticket_id+' => '',
+	'Class:WorkOrder/Attribute:ticket_ref' => 'Ref solicitante',
+	'Class:WorkOrder/Attribute:ticket_ref+' => '',
+	'Class:WorkOrder/Attribute:team_id' => 'Equipe',
+	'Class:WorkOrder/Attribute:team_id+' => '',
+	'Class:WorkOrder/Attribute:team_name' => 'Nome equipe',
+	'Class:WorkOrder/Attribute:team_name+' => '',
+	'Class:WorkOrder/Attribute:agent_id' => 'Agente',
+	'Class:WorkOrder/Attribute:agent_id+' => '',
+	'Class:WorkOrder/Attribute:agent_email' => 'Email agente',
+	'Class:WorkOrder/Attribute:agent_email+' => '',
+	'Class:WorkOrder/Attribute:start_date' => 'Data início',
+	'Class:WorkOrder/Attribute:start_date+' => '',
+	'Class:WorkOrder/Attribute:end_date' => 'Data final',
+	'Class:WorkOrder/Attribute:end_date+' => '',
+	'Class:WorkOrder/Attribute:log' => 'Log',
+	'Class:WorkOrder/Attribute:log+' => '',
+	'Class:WorkOrder/Stimulus:ev_close' => 'Fechar',
+	'Class:WorkOrder/Stimulus:ev_close+' => '',
+));
+
+
+// Fieldset translation
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+
+	'Ticket:baseinfo' => 'Informações gerais',
+	'Ticket:date' => 'Datas',
+	'Ticket:contact' => 'Contatos',
+	'Ticket:moreinfo' => 'Mais informações',
+	'Ticket:relation' => 'Relações',
+	'Ticket:log' => 'Comunicação',
+	'Ticket:Type' => 'Qualificação',
+	'Ticket:support' => 'Suporte',
+	'Ticket:resolution' => 'Resolução',
+	'Ticket:SLA' => 'Relatório SLA',
+	'WorkOrder:Details' => 'Detalhes',
+	'WorkOrder:Moreinfo' => 'Mais informações',
+
+	'Ticket:ImpactAnalysis' => 'Análise de Impacto~~',
+	'Class:lnkContactToTicket/Attribute:role_code' => 'Role~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:manual' => 'Adicionado manualmente~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:computed' => 'Computado~~',
+	'Class:lnkContactToTicket/Attribute:role_code/Value:do_not_notify' => 'Não notificar~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => 'Impact~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => 'Adicionado manualmente~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => 'Computado~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => 'Não impactado~~',
+	'Tickets:ResolvedFrom' => 'Automatically resolved from %1$s~~',
+	'Class:cmdbAbstractObject/Method:Set' => 'Set~~',
+	'Class:cmdbAbstractObject/Method:Set+' => 'Set a field with a static value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2' => 'Value~~',
+	'Class:cmdbAbstractObject/Method:Set/Param:2+' => 'The value to set~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate' => 'SetCurrentDate~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate+' => 'Set a field with the current date and time~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentDate/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'SetCurrentUser~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Set a field with the currently logged in user~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'SetCurrentPerson~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Set a field with the currently logged in person (the \"person\" attached to the logged in \"user\").~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'The field to set, in the current object. If the field is a string then the friendly name will be used, otherwise the identifier will be used.~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'SetElapsedTime~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Set a field with the time (seconds) elapsed since a date given by another field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Reference Field~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Working Hours~~',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Leave empty to rely on the standard working hours scheme, or set to \"DefaultWorkingTimeComputer\" to force a 24x7 scheme~~',
+	'Class:cmdbAbstractObject/Method:Reset' => 'Reset~~',
+	'Class:cmdbAbstractObject/Method:Reset+' => 'Reset a field to its default value~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Reset/Param:1+' => 'The field to reset, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy' => 'Copy~~',
+	'Class:cmdbAbstractObject/Method:Copy+' => 'Copy the value of a field to another field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1' => 'Target Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:1+' => 'The field to set, in the current object~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Source Field~~',
+	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'The field to get the value from, in the current object~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Time To Own~~',
+	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
+	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
+
+	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
+	'Page:DefaultTitle' => 'iTop - Portal do Usuário',
+	'Brick:Portal:UserProfile:Title' => 'Meu Perfil',
+	'Brick:Portal:NewRequest:Title' => 'Nova Solicitação',
+	'Brick:Portal:NewRequest:Title+' => '<p>Precisa de ajuda?</p><p>Escolha no Catálogo de Serviços e envie sua solicitação para nossas equipes de suporte.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Em andamento',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Acompanhar suas solicitações em andamento, adicionar comentários, anexar documentos e confirmar a solução.</p>',
+	'Brick:Portal:OngoingRequests:Tab:OnGoing' => 'Abrir',
+	'Brick:Portal:OngoingRequests:Tab:Resolved' => 'Resolvido',
+	'Brick:Portal:ClosedRequests:Title' => 'Fechar solicitações',
+));
diff --git a/datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
index dec8c414d..05e26112f 100755
--- a/datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
@@ -1,265 +1,265 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Dictionnay conventions
-// Class:<class_name>
-// Class:<class_name>+
-// Class:<class_name>/Attribute:<attribute_code>
-// Class:<class_name>/Attribute:<attribute_code>+
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
-// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
-// Class:<class_name>/Stimulus:<stimulus_code>
-// Class:<class_name>/Stimulus:<stimulus_code>+
-
-
-//
-// Class: Ticket
-//
-
-//
-// Class: Ticket
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Ticket' => '单据',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => '参照',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:title' => '标题',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => '描述',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:ticket_log' => '日志',
-	'Class:Ticket/Attribute:ticket_log+' => '',
-	'Class:Ticket/Attribute:start_date' => '启始',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:document_list' => '文档',
-	'Class:Ticket/Attribute:document_list+' => '与该单据相关的文档',
-	'Class:Ticket/Attribute:ci_list' => 'CIs',
-	'Class:Ticket/Attribute:ci_list+' => '事件关联的 CIs',
-	'Class:Ticket/Attribute:contact_list' => '联系人',
-	'Class:Ticket/Attribute:contact_list+' => '相关的团队及人员',
-	'Class:Ticket/Attribute:incident_list' => '相关的事件',
-	'Class:Ticket/Attribute:incident_list+' => '',
-	'Class:Ticket/Attribute:finalclass' => '类别',
-	'Class:Ticket/Attribute:finalclass+' => '',
-));
-
-
-//
-// Class: lnkTicketToDoc
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkTicketToDoc' => '单据/文档',
-	'Class:lnkTicketToDoc+' => '',
-	'Class:lnkTicketToDoc/Attribute:ticket_id' => '单据',
-	'Class:lnkTicketToDoc/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToDoc/Attribute:ticket_ref' => '单据 #',
-	'Class:lnkTicketToDoc/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToDoc/Attribute:document_id' => '文档',
-	'Class:lnkTicketToDoc/Attribute:document_id+' => '',
-	'Class:lnkTicketToDoc/Attribute:document_name' => '文档',
-	'Class:lnkTicketToDoc/Attribute:document_name+' => '',
-));
-
-//
-// Class: lnkTicketToContact
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkTicketToContact' => '单据/联系人',
-	'Class:lnkTicketToContact+' => '',
-	'Class:lnkTicketToContact/Attribute:ticket_id' => '单据',
-	'Class:lnkTicketToContact/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToContact/Attribute:ticket_ref' => '单据 #',
-	'Class:lnkTicketToContact/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_id' => '联系人',
-	'Class:lnkTicketToContact/Attribute:contact_id+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_name' => '联系人',
-	'Class:lnkTicketToContact/Attribute:contact_name+' => '',
-	'Class:lnkTicketToContact/Attribute:contact_email' => 'Email',
-	'Class:lnkTicketToContact/Attribute:contact_email+' => '',
-	'Class:lnkTicketToContact/Attribute:role' => '角色',
-	'Class:lnkTicketToContact/Attribute:role+' => '',
-));
-
-//
-// Class: lnkTicketToCI
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkTicketToCI' => '单据/CI',
-	'Class:lnkTicketToCI+' => '',
-	'Class:lnkTicketToCI/Attribute:ticket_id' => '单据',
-	'Class:lnkTicketToCI/Attribute:ticket_id+' => '',
-	'Class:lnkTicketToCI/Attribute:ticket_ref' => '单据 #',
-	'Class:lnkTicketToCI/Attribute:ticket_ref+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkTicketToCI/Attribute:ci_id+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_name' => 'CI',
-	'Class:lnkTicketToCI/Attribute:ci_name+' => '',
-	'Class:lnkTicketToCI/Attribute:ci_status' => 'CI 状态',
-	'Class:lnkTicketToCI/Attribute:ci_status+' => '',
-	'Class:lnkTicketToCI/Attribute:impact' => '影响',
-	'Class:lnkTicketToCI/Attribute:impact+' => '',
-));
-
-
-//
-// Class: ResponseTicket
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ResponseTicket' => '回复单据',
-	'Class:ResponseTicket+' => '',
-	'Class:ResponseTicket/Attribute:status' => '状态',
-	'Class:ResponseTicket/Attribute:status+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:new' => '新',
-	'Class:ResponseTicket/Attribute:status/Value:new+' => '新的待处理的',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_tto' => '升级/TTO',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_tto+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:assigned' => '已指派',
-	'Class:ResponseTicket/Attribute:status/Value:assigned+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr' => '升级/TTR',
-	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:frozen' => '未决',
-	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:resolved' => '已解决',
-	'Class:ResponseTicket/Attribute:status/Value:resolved+' => '',
-	'Class:ResponseTicket/Attribute:status/Value:closed' => '关闭',
-	'Class:ResponseTicket/Attribute:status/Value:closed+' => '',
-	'Class:ResponseTicket/Attribute:caller_id' => '呼叫者',
-	'Class:ResponseTicket/Attribute:caller_id+' => '',
-	'Class:ResponseTicket/Attribute:caller_email' => 'Email',
-	'Class:ResponseTicket/Attribute:caller_email+' => '',
-	'Class:ResponseTicket/Attribute:org_id' => '客户',
-	'Class:ResponseTicket/Attribute:org_id+' => '',
-	'Class:ResponseTicket/Attribute:org_name' => '客户',
-	'Class:ResponseTicket/Attribute:org_name+' => '',
-	'Class:ResponseTicket/Attribute:service_id' => '服务',
-	'Class:ResponseTicket/Attribute:service_id+' => '',
-	'Class:ResponseTicket/Attribute:service_name' => '名称',
-	'Class:ResponseTicket/Attribute:service_name+' => '',
-	'Class:ResponseTicket/Attribute:servicesubcategory_id' => '服务元素',
-	'Class:ResponseTicket/Attribute:servicesubcategory_id+' => '',
-	'Class:ResponseTicket/Attribute:servicesubcategory_name' => '名称',
-	'Class:ResponseTicket/Attribute:servicesubcategory_name+' => '',
-	'Class:ResponseTicket/Attribute:product' => '生产',
-	'Class:ResponseTicket/Attribute:product+' => '',
-	'Class:ResponseTicket/Attribute:impact' => '影响',
-	'Class:ResponseTicket/Attribute:impact+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:1' => '单个部门',
-	'Class:ResponseTicket/Attribute:impact/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:2' => '单个服务',
-	'Class:ResponseTicket/Attribute:impact/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:impact/Value:3' => '个人',
-	'Class:ResponseTicket/Attribute:impact/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:urgency' => '紧急',
-	'Class:ResponseTicket/Attribute:urgency+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:1' => '高',
-	'Class:ResponseTicket/Attribute:urgency/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:2' => '中',
-	'Class:ResponseTicket/Attribute:urgency/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:urgency/Value:3' => '低',
-	'Class:ResponseTicket/Attribute:urgency/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:priority' => '优先级',
-	'Class:ResponseTicket/Attribute:priority+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:1' => '高',
-	'Class:ResponseTicket/Attribute:priority/Value:1+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:2' => '中',
-	'Class:ResponseTicket/Attribute:priority/Value:2+' => '',
-	'Class:ResponseTicket/Attribute:priority/Value:3' => '低',
-	'Class:ResponseTicket/Attribute:priority/Value:3+' => '',
-	'Class:ResponseTicket/Attribute:workgroup_id' => '工作组',
-	'Class:ResponseTicket/Attribute:workgroup_id+' => '',
-	'Class:ResponseTicket/Attribute:workgroup_name' => '工作组',
-	'Class:ResponseTicket/Attribute:workgroup_name+' => '',
-	'Class:ResponseTicket/Attribute:agent_id' => '办理人',
-	'Class:ResponseTicket/Attribute:agent_id+' => '',
-	'Class:ResponseTicket/Attribute:agent_name' => '办理人',
-	'Class:ResponseTicket/Attribute:agent_name+' => '',
-	'Class:ResponseTicket/Attribute:agent_email' => '办理人 email',
-	'Class:ResponseTicket/Attribute:agent_email+' => '',
-	'Class:ResponseTicket/Attribute:related_problem_id' => '关联问题',
-	'Class:ResponseTicket/Attribute:related_problem_id+' => '',
-	'Class:ResponseTicket/Attribute:related_problem_ref' => '参照',
-	'Class:ResponseTicket/Attribute:related_problem_ref+' => '',
-	'Class:ResponseTicket/Attribute:related_change_id' => '关联变更',
-	'Class:ResponseTicket/Attribute:related_change_id+' => '',
-	'Class:ResponseTicket/Attribute:related_change_ref' => '关联变更',
-	'Class:ResponseTicket/Attribute:related_change_ref+' => '',
-	'Class:ResponseTicket/Attribute:close_date' => '关闭',
-	'Class:ResponseTicket/Attribute:close_date+' => '',
-	'Class:ResponseTicket/Attribute:last_update' => '最后更新',
-	'Class:ResponseTicket/Attribute:last_update+' => '',
-	'Class:ResponseTicket/Attribute:assignment_date' => '指派日期',
-	'Class:ResponseTicket/Attribute:assignment_date+' => '',
-	'Class:ResponseTicket/Attribute:resolution_date' => '解决日期',
-	'Class:ResponseTicket/Attribute:resolution_date+' => '',
-	'Class:ResponseTicket/Attribute:tto_escalation_deadline' => 'TTO 升级的最后期限',
-	'Class:ResponseTicket/Attribute:tto_escalation_deadline+' => '',
-	'Class:ResponseTicket/Attribute:ttr_escalation_deadline' => 'TTR 升级的最后期限',
-	'Class:ResponseTicket/Attribute:ttr_escalation_deadline+' => '',
-	'Class:ResponseTicket/Attribute:closure_deadline' => '关闭的最后期限',
-	'Class:ResponseTicket/Attribute:closure_deadline+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code' => '解决编码',
-	'Class:ResponseTicket/Attribute:resolution_code+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce' => '不能重生',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate' => '复制单据',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed' => '搞定',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed+' => '',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant' => '无关的',
-	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant+' => '',
-	'Class:ResponseTicket/Attribute:solution' => '方案',
-	'Class:ResponseTicket/Attribute:solution+' => '',
-	'Class:ResponseTicket/Attribute:user_satisfaction' => '用户满意',
-	'Class:ResponseTicket/Attribute:user_satisfaction+' => '',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1' => '非常满意',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1+' => '非常满意',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2' => '比较满意',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2+' => '比较满意',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3' => '一般',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3+' => '一般',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4' => '非常不满',
-	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4+' => '非常不满',
-	'Class:ResponseTicket/Attribute:user_commment' => '用户意见',
-	'Class:ResponseTicket/Attribute:user_commment+' => '',
-	'Class:ResponseTicket/Stimulus:ev_assign' => '指派',
-	'Class:ResponseTicket/Stimulus:ev_assign+' => '',
-	'Class:ResponseTicket/Stimulus:ev_reassign' => '再指派',
-	'Class:ResponseTicket/Stimulus:ev_reassign+' => '',
-	'Class:ResponseTicket/Stimulus:ev_timeout' => '升级',
-	'Class:ResponseTicket/Stimulus:ev_timeout+' => '',
-	'Class:ResponseTicket/Stimulus:ev_resolve' => '标记为已解决',
-	'Class:ResponseTicket/Stimulus:ev_resolve+' => '',
-	'Class:ResponseTicket/Stimulus:ev_close' => '关闭',
-	'Class:ResponseTicket/Stimulus:ev_close+' => '',
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Ticket
+//
+
+//
+// Class: Ticket
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Ticket' => '单据',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => '参照',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:title' => '标题',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => '描述',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:ticket_log' => '日志',
+	'Class:Ticket/Attribute:ticket_log+' => '',
+	'Class:Ticket/Attribute:start_date' => '启始',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:document_list' => '文档',
+	'Class:Ticket/Attribute:document_list+' => '与该单据相关的文档',
+	'Class:Ticket/Attribute:ci_list' => 'CIs',
+	'Class:Ticket/Attribute:ci_list+' => '事件关联的 CIs',
+	'Class:Ticket/Attribute:contact_list' => '联系人',
+	'Class:Ticket/Attribute:contact_list+' => '相关的团队及人员',
+	'Class:Ticket/Attribute:incident_list' => '相关的事件',
+	'Class:Ticket/Attribute:incident_list+' => '',
+	'Class:Ticket/Attribute:finalclass' => '类别',
+	'Class:Ticket/Attribute:finalclass+' => '',
+));
+
+
+//
+// Class: lnkTicketToDoc
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkTicketToDoc' => '单据/文档',
+	'Class:lnkTicketToDoc+' => '',
+	'Class:lnkTicketToDoc/Attribute:ticket_id' => '单据',
+	'Class:lnkTicketToDoc/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToDoc/Attribute:ticket_ref' => '单据 #',
+	'Class:lnkTicketToDoc/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToDoc/Attribute:document_id' => '文档',
+	'Class:lnkTicketToDoc/Attribute:document_id+' => '',
+	'Class:lnkTicketToDoc/Attribute:document_name' => '文档',
+	'Class:lnkTicketToDoc/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkTicketToContact
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkTicketToContact' => '单据/联系人',
+	'Class:lnkTicketToContact+' => '',
+	'Class:lnkTicketToContact/Attribute:ticket_id' => '单据',
+	'Class:lnkTicketToContact/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToContact/Attribute:ticket_ref' => '单据 #',
+	'Class:lnkTicketToContact/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_id' => '联系人',
+	'Class:lnkTicketToContact/Attribute:contact_id+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_name' => '联系人',
+	'Class:lnkTicketToContact/Attribute:contact_name+' => '',
+	'Class:lnkTicketToContact/Attribute:contact_email' => 'Email',
+	'Class:lnkTicketToContact/Attribute:contact_email+' => '',
+	'Class:lnkTicketToContact/Attribute:role' => '角色',
+	'Class:lnkTicketToContact/Attribute:role+' => '',
+));
+
+//
+// Class: lnkTicketToCI
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkTicketToCI' => '单据/CI',
+	'Class:lnkTicketToCI+' => '',
+	'Class:lnkTicketToCI/Attribute:ticket_id' => '单据',
+	'Class:lnkTicketToCI/Attribute:ticket_id+' => '',
+	'Class:lnkTicketToCI/Attribute:ticket_ref' => '单据 #',
+	'Class:lnkTicketToCI/Attribute:ticket_ref+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkTicketToCI/Attribute:ci_id+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_name' => 'CI',
+	'Class:lnkTicketToCI/Attribute:ci_name+' => '',
+	'Class:lnkTicketToCI/Attribute:ci_status' => 'CI 状态',
+	'Class:lnkTicketToCI/Attribute:ci_status+' => '',
+	'Class:lnkTicketToCI/Attribute:impact' => '影响',
+	'Class:lnkTicketToCI/Attribute:impact+' => '',
+));
+
+
+//
+// Class: ResponseTicket
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ResponseTicket' => '回复单据',
+	'Class:ResponseTicket+' => '',
+	'Class:ResponseTicket/Attribute:status' => '状态',
+	'Class:ResponseTicket/Attribute:status+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:new' => '新',
+	'Class:ResponseTicket/Attribute:status/Value:new+' => '新的待处理的',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_tto' => '升级/TTO',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_tto+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:assigned' => '已指派',
+	'Class:ResponseTicket/Attribute:status/Value:assigned+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr' => '升级/TTR',
+	'Class:ResponseTicket/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:frozen' => '未决',
+	'Class:ResponseTicket/Attribute:status/Value:frozen+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:resolved' => '已解决',
+	'Class:ResponseTicket/Attribute:status/Value:resolved+' => '',
+	'Class:ResponseTicket/Attribute:status/Value:closed' => '关闭',
+	'Class:ResponseTicket/Attribute:status/Value:closed+' => '',
+	'Class:ResponseTicket/Attribute:caller_id' => '呼叫者',
+	'Class:ResponseTicket/Attribute:caller_id+' => '',
+	'Class:ResponseTicket/Attribute:caller_email' => 'Email',
+	'Class:ResponseTicket/Attribute:caller_email+' => '',
+	'Class:ResponseTicket/Attribute:org_id' => '客户',
+	'Class:ResponseTicket/Attribute:org_id+' => '',
+	'Class:ResponseTicket/Attribute:org_name' => '客户',
+	'Class:ResponseTicket/Attribute:org_name+' => '',
+	'Class:ResponseTicket/Attribute:service_id' => '服务',
+	'Class:ResponseTicket/Attribute:service_id+' => '',
+	'Class:ResponseTicket/Attribute:service_name' => '名称',
+	'Class:ResponseTicket/Attribute:service_name+' => '',
+	'Class:ResponseTicket/Attribute:servicesubcategory_id' => '服务元素',
+	'Class:ResponseTicket/Attribute:servicesubcategory_id+' => '',
+	'Class:ResponseTicket/Attribute:servicesubcategory_name' => '名称',
+	'Class:ResponseTicket/Attribute:servicesubcategory_name+' => '',
+	'Class:ResponseTicket/Attribute:product' => '生产',
+	'Class:ResponseTicket/Attribute:product+' => '',
+	'Class:ResponseTicket/Attribute:impact' => '影响',
+	'Class:ResponseTicket/Attribute:impact+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:1' => '单个部门',
+	'Class:ResponseTicket/Attribute:impact/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:2' => '单个服务',
+	'Class:ResponseTicket/Attribute:impact/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:impact/Value:3' => '个人',
+	'Class:ResponseTicket/Attribute:impact/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:urgency' => '紧急',
+	'Class:ResponseTicket/Attribute:urgency+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:1' => '高',
+	'Class:ResponseTicket/Attribute:urgency/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:2' => '中',
+	'Class:ResponseTicket/Attribute:urgency/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:urgency/Value:3' => '低',
+	'Class:ResponseTicket/Attribute:urgency/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:priority' => '优先级',
+	'Class:ResponseTicket/Attribute:priority+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:1' => '高',
+	'Class:ResponseTicket/Attribute:priority/Value:1+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:2' => '中',
+	'Class:ResponseTicket/Attribute:priority/Value:2+' => '',
+	'Class:ResponseTicket/Attribute:priority/Value:3' => '低',
+	'Class:ResponseTicket/Attribute:priority/Value:3+' => '',
+	'Class:ResponseTicket/Attribute:workgroup_id' => '工作组',
+	'Class:ResponseTicket/Attribute:workgroup_id+' => '',
+	'Class:ResponseTicket/Attribute:workgroup_name' => '工作组',
+	'Class:ResponseTicket/Attribute:workgroup_name+' => '',
+	'Class:ResponseTicket/Attribute:agent_id' => '办理人',
+	'Class:ResponseTicket/Attribute:agent_id+' => '',
+	'Class:ResponseTicket/Attribute:agent_name' => '办理人',
+	'Class:ResponseTicket/Attribute:agent_name+' => '',
+	'Class:ResponseTicket/Attribute:agent_email' => '办理人 email',
+	'Class:ResponseTicket/Attribute:agent_email+' => '',
+	'Class:ResponseTicket/Attribute:related_problem_id' => '关联问题',
+	'Class:ResponseTicket/Attribute:related_problem_id+' => '',
+	'Class:ResponseTicket/Attribute:related_problem_ref' => '参照',
+	'Class:ResponseTicket/Attribute:related_problem_ref+' => '',
+	'Class:ResponseTicket/Attribute:related_change_id' => '关联变更',
+	'Class:ResponseTicket/Attribute:related_change_id+' => '',
+	'Class:ResponseTicket/Attribute:related_change_ref' => '关联变更',
+	'Class:ResponseTicket/Attribute:related_change_ref+' => '',
+	'Class:ResponseTicket/Attribute:close_date' => '关闭',
+	'Class:ResponseTicket/Attribute:close_date+' => '',
+	'Class:ResponseTicket/Attribute:last_update' => '最后更新',
+	'Class:ResponseTicket/Attribute:last_update+' => '',
+	'Class:ResponseTicket/Attribute:assignment_date' => '指派日期',
+	'Class:ResponseTicket/Attribute:assignment_date+' => '',
+	'Class:ResponseTicket/Attribute:resolution_date' => '解决日期',
+	'Class:ResponseTicket/Attribute:resolution_date+' => '',
+	'Class:ResponseTicket/Attribute:tto_escalation_deadline' => 'TTO 升级的最后期限',
+	'Class:ResponseTicket/Attribute:tto_escalation_deadline+' => '',
+	'Class:ResponseTicket/Attribute:ttr_escalation_deadline' => 'TTR 升级的最后期限',
+	'Class:ResponseTicket/Attribute:ttr_escalation_deadline+' => '',
+	'Class:ResponseTicket/Attribute:closure_deadline' => '关闭的最后期限',
+	'Class:ResponseTicket/Attribute:closure_deadline+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code' => '解决编码',
+	'Class:ResponseTicket/Attribute:resolution_code+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce' => '不能重生',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:couldnotreproduce+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate' => '复制单据',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:duplicate+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed' => '搞定',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:fixed+' => '',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant' => '无关的',
+	'Class:ResponseTicket/Attribute:resolution_code/Value:irrelevant+' => '',
+	'Class:ResponseTicket/Attribute:solution' => '方案',
+	'Class:ResponseTicket/Attribute:solution+' => '',
+	'Class:ResponseTicket/Attribute:user_satisfaction' => '用户满意',
+	'Class:ResponseTicket/Attribute:user_satisfaction+' => '',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1' => '非常满意',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:1+' => '非常满意',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2' => '比较满意',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:2+' => '比较满意',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3' => '一般',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:3+' => '一般',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4' => '非常不满',
+	'Class:ResponseTicket/Attribute:user_satisfaction/Value:4+' => '非常不满',
+	'Class:ResponseTicket/Attribute:user_commment' => '用户意见',
+	'Class:ResponseTicket/Attribute:user_commment+' => '',
+	'Class:ResponseTicket/Stimulus:ev_assign' => '指派',
+	'Class:ResponseTicket/Stimulus:ev_assign+' => '',
+	'Class:ResponseTicket/Stimulus:ev_reassign' => '再指派',
+	'Class:ResponseTicket/Stimulus:ev_reassign+' => '',
+	'Class:ResponseTicket/Stimulus:ev_timeout' => '升级',
+	'Class:ResponseTicket/Stimulus:ev_timeout+' => '',
+	'Class:ResponseTicket/Stimulus:ev_resolve' => '标记为已解决',
+	'Class:ResponseTicket/Stimulus:ev_resolve+' => '',
+	'Class:ResponseTicket/Stimulus:ev_close' => '关闭',
+	'Class:ResponseTicket/Stimulus:ev_close+' => '',
 	'Class:Ticket/Attribute:org_id' => 'Organization~~',
 	'Class:Ticket/Attribute:org_name' => 'Organization Name~~',
 	'Class:Ticket/Attribute:caller_id' => 'Caller~~',
@@ -368,9 +368,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTO~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Time To Resolve~~',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer+' => 'Goal based on a SLT of type TTR~~',
-));
-
-
-
-
-?>
+));
+
+
+
+
+?>
diff --git a/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php
index 3d5a6159a..84889d5b7 100755
--- a/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php
@@ -1,61 +1,61 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-// Add the standard menus (done in XML)
-/*
- * +--------------------+
- * | Welcome            |
- * +--------------------+
- * 		Welcome To iTop
- * +--------------------+
- * | Tools              |
- * +--------------------+
- * 		CSV Import
- * +--------------------+
- * | Admin Tools        |
- * +--------------------+
- *		User Accounts
- *		Profiles
- *		Notifications
- *		Run Queries
- *		Export
- *		Data Model
- *		Universal Search
- */
-
-/**
- * Direct end-users to the standard Portal application
- */ 
-class MyPortalURLMaker implements iDBObjectURLMaker
-{
-	public static function MakeObjectURL($sClass, $iId)
-	{
-		if (strpos(MetaModel::GetConfig()->Get('portal_tickets'), $sClass) !== false)
-		{
-			$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
-			$sUrl = "{$sAbsoluteUrl}portal/index.php?operation=details&class=$sClass&id=$iId";
-		}
-		else
-		{
-			$sUrl = '';
-		}
-		return $sUrl;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+// Add the standard menus (done in XML)
+/*
+ * +--------------------+
+ * | Welcome            |
+ * +--------------------+
+ * 		Welcome To iTop
+ * +--------------------+
+ * | Tools              |
+ * +--------------------+
+ * 		CSV Import
+ * +--------------------+
+ * | Admin Tools        |
+ * +--------------------+
+ *		User Accounts
+ *		Profiles
+ *		Notifications
+ *		Run Queries
+ *		Export
+ *		Data Model
+ *		Universal Search
+ */
+
+/**
+ * Direct end-users to the standard Portal application
+ */ 
+class MyPortalURLMaker implements iDBObjectURLMaker
+{
+	public static function MakeObjectURL($sClass, $iId)
+	{
+		if (strpos(MetaModel::GetConfig()->Get('portal_tickets'), $sClass) !== false)
+		{
+			$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
+			$sUrl = "{$sAbsoluteUrl}portal/index.php?operation=details&class=$sClass&id=$iId";
+		}
+		else
+		{
+			$sUrl = '';
+		}
+		return $sUrl;
+	}
+}
+
+?>
diff --git a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
index ba90b269c..9dc318cb4 100755
--- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
+++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
@@ -1,48 +1,48 @@
-<?php
-
-
-SetupWebPage::AddModule(
-	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-welcome-itil/2.5.0',
-	array(
-		// Identification
-		//
-		'label' => 'ITIL skin',
-		'category' => 'skin',
-
-		// Setup
-		//
-		'dependencies' => array(
-		),
-		'mandatory' => true,
-		'visible' => false,
-		//'installer' => 'MyInstaller',
-
-		// Components
-		//
-		'datamodel' => array(
-			'main.itop-welcome-itil.php',
-			'model.itop-welcome-itil.php',
-		),
-		'webservice' => array(
-			//'webservices.itop-welcome-itil.php',
-		),
-		'data.struct' => array(
-			//'data.struct.itop-welcome-itil.xml',
-		),
-		'data.sample' => array(
-			//'data.sample.itop-welcome-itil.xml',
-		),
-		
-		// Documentation
-		//
-		'doc.manual_setup' => '',
-		'doc.more_information' => '',
-
-		// Default settings
-		//
-		'settings' => array(
-			//'some_setting' => 'some value',
-		),
-	)
-);
+<?php
+
+
+SetupWebPage::AddModule(
+	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
+	'itop-welcome-itil/2.5.0',
+	array(
+		// Identification
+		//
+		'label' => 'ITIL skin',
+		'category' => 'skin',
+
+		// Setup
+		//
+		'dependencies' => array(
+		),
+		'mandatory' => true,
+		'visible' => false,
+		//'installer' => 'MyInstaller',
+
+		// Components
+		//
+		'datamodel' => array(
+			'main.itop-welcome-itil.php',
+			'model.itop-welcome-itil.php',
+		),
+		'webservice' => array(
+			//'webservices.itop-welcome-itil.php',
+		),
+		'data.struct' => array(
+			//'data.struct.itop-welcome-itil.xml',
+		),
+		'data.sample' => array(
+			//'data.sample.itop-welcome-itil.xml',
+		),
+		
+		// Documentation
+		//
+		'doc.manual_setup' => '',
+		'doc.more_information' => '',
+
+		// Default settings
+		//
+		'settings' => array(
+			//'some_setting' => 'some value',
+		),
+	)
+);
diff --git a/dictionaries/da.dictionary.itop.core.php b/dictionaries/da.dictionary.itop.core.php
index 0aee2a8b3..b07de830d 100644
--- a/dictionaries/da.dictionary.itop.core.php
+++ b/dictionaries/da.dictionary.itop.core.php
@@ -1,2517 +1,2517 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @author Erik Bøg <erik@boegmoeller.dk>
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:ActionEmail' => 'Email besked',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Test modtager',
-	'Class:ActionEmail/Attribute:test_recipient+' => '',
-	'Class:ActionEmail/Attribute:from' => 'Fra',
-	'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen',
-	'Class:ActionEmail/Attribute:reply_to' => 'Svar til',
-	'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til',
-	'Class:ActionEmail/Attribute:to' => 'Til',
-	'Class:ActionEmail/Attribute:to+' => 'Modtager af emailen',
-	'Class:ActionEmail/Attribute:cc' => 'Cc',
-	'Class:ActionEmail/Attribute:cc+' => 'Kopi sendes til',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
-	'Class:ActionEmail/Attribute:bcc+' => 'Blind kopi sendes til',
-	'Class:ActionEmail/Attribute:subject' => 'Emne',
-	'Class:ActionEmail/Attribute:subject+' => 'Tekst i emne feltet',
-	'Class:ActionEmail/Attribute:body' => 'Indhold',
-	'Class:ActionEmail/Attribute:body+' => 'Tekst delen af emailen',
-	'Class:ActionEmail/Attribute:importance' => 'Vigtighed',
-	'Class:ActionEmail/Attribute:importance+' => 'Hvilken prioritet skal emailen sendes med',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'Høj',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'Lav',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normal',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
-	'Class:TriggerOnPortalUpdate' => 'Trigger (Når opdateret fra portalen)',
-	'Class:TriggerOnPortalUpdate+' => '',
-	'Class:TriggerOnStateEnter' => 'Trigger (ved indtræden i en tilstand)',
-	'Class:TriggerOnStateEnter+' => '',
-	'Class:TriggerOnStateLeave' => 'Trigger (når en tilstand forlades)',
-	'Class:TriggerOnStateLeave+' => '',
-	'Class:TriggerOnObjectCreate' => 'Trigger (ved oprettelse af objekt)',
-	'Class:TriggerOnObjectCreate+' => '',
-	'Class:lnkTriggerAction' => 'Handling/Trigger',
-	'Class:lnkTriggerAction+' => '',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Handling',
-	'Class:lnkTriggerAction/Attribute:action_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Rækkefølge',
-	'Class:lnkTriggerAction/Attribute:order+' => '',
-	'Class:TriggerOnThresholdReached' => 'Trigger (grænseværdi)',
-	'Class:TriggerOnThresholdReached+' => '',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stopur',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Grænse',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
-	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
-	'Class:lnkVirtualDeviceToVolume+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Størrelse brugt',
-	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
-	'Class:Organization' => 'Organisation',
-	'Class:Organization+' => '',
-	'Class:Organization/Attribute:name' => 'Navn',
-	'Class:Organization/Attribute:name+' => '',
-	'Class:Organization/Attribute:code' => 'Kode',
-	'Class:Organization/Attribute:code+' => '',
-	'Class:Organization/Attribute:status' => 'Status',
-	'Class:Organization/Attribute:status+' => '',
-	'Class:Organization/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Organization/Attribute:status/Value:active+' => '',
-	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Organization/Attribute:status/Value:inactive+' => '',
-	'Class:Organization/Attribute:parent_id' => 'Forælder',
-	'Class:Organization/Attribute:parent_id+' => '',
-	'Class:Organization/Attribute:deliverymodel_id' => 'Leverings model',
-	'Class:Organization/Attribute:deliverymodel_id+' => '',
-	'Class:Location' => 'Lokation',
-	'Class:Location+' => '',
-	'Class:Location/Attribute:name' => 'Navn',
-	'Class:Location/Attribute:name+' => '',
-	'Class:Location/Attribute:status' => 'Status',
-	'Class:Location/Attribute:status+' => '',
-	'Class:Location/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Location/Attribute:status/Value:active+' => '',
-	'Class:Location/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Location/Attribute:status/Value:inactive+' => '',
-	'Class:Location/Attribute:org_id' => 'Ejer organisation',
-	'Class:Location/Attribute:org_id+' => '',
-	'Class:Location/Attribute:address' => 'Adresse',
-	'Class:Location/Attribute:address+' => '',
-	'Class:Location/Attribute:postal_code' => 'Postnummer',
-	'Class:Location/Attribute:postal_code+' => '',
-	'Class:Location/Attribute:city' => 'By',
-	'Class:Location/Attribute:city+' => '',
-	'Class:Location/Attribute:country' => 'Land',
-	'Class:Location/Attribute:country+' => '',
-	'Class:Location/Attribute:physicaldevice_list' => 'Enheder',
-	'Class:Location/Attribute:physicaldevice_list+' => '',
-	'Class:Location/Attribute:person_list' => 'Kontakter',
-	'Class:Location/Attribute:person_list+' => '',
-	'Class:Person' => 'Person',
-	'Class:Person+' => '',
-	'Class:Person/Attribute:first_name' => 'Fornavn',
-	'Class:Person/Attribute:first_name+' => '',
-	'Class:Person/Attribute:employee_number' => 'Medarbejdernummer',
-	'Class:Person/Attribute:employee_number+' => '',
-	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefon',
-	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => 'Lokation',
-	'Class:Person/Attribute:location_id+' => '',
-	'Class:Person/Attribute:manager_id' => 'Manager',
-	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:team_list' => 'Teams',
-	'Class:Person/Attribute:team_list+' => '',
-	'Class:Person/Attribute:tickets_list' => 'Tickets',
-	'Class:Person/Attribute:tickets_list+' => '',
-	'Class:Team' => 'Team',
-	'Class:Team+' => '',
-	'Class:Team/Attribute:persons_list' => 'Medlemmer',
-	'Class:Team/Attribute:persons_list+' => '',
-	'Class:Team/Attribute:tickets_list' => 'Tickets',
-	'Class:Team/Attribute:tickets_list+' => '',
-	'Class:DocumentFile' => 'Dokument Fil',
-	'Class:DocumentFile+' => '',
-	'Class:DocumentFile/Attribute:file' => 'Fil',
-	'Class:DocumentFile/Attribute:file+' => '',
-	'Class:DocumentNote' => 'Dokument Note',
-	'Class:DocumentNote+' => '',
-	'Class:DocumentNote/Attribute:text' => 'Tekst',
-	'Class:DocumentNote/Attribute:text+' => '',
-	'Class:DocumentWeb' => 'Dokument Web',
-	'Class:DocumentWeb+' => '',
-	'Class:DocumentWeb/Attribute:url' => 'URL',
-	'Class:DocumentWeb/Attribute:url+' => '',
-	'Class:NetworkDevice' => 'Netværks-enhed',
-	'Class:NetworkDevice+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Netværks-type',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Enhed(er)',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version',
-	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
-	'Class:NetworkDevice/Attribute:ram' => 'RAM',
-	'Class:NetworkDevice/Attribute:ram+' => '',
-	'Class:Server' => 'Server',
-	'Class:Server+' => '',
-	'Class:Server/Attribute:osfamily_id' => 'OS familie',
-	'Class:Server/Attribute:osfamily_id+' => '',
-	'Class:Server/Attribute:osversion_id' => 'OS version',
-	'Class:Server/Attribute:osversion_id+' => '',
-	'Class:Server/Attribute:oslicence_id' => 'OS licens',
-	'Class:Server/Attribute:oslicence_id+' => '',
-	'Class:Server/Attribute:cpu' => 'CPU',
-	'Class:Server/Attribute:cpu+' => '',
-	'Class:Server/Attribute:ram' => 'RAM',
-	'Class:Server/Attribute:ram+' => '',
-	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes',
-	'Class:Server/Attribute:logicalvolumes_list+' => '',
-	'Class:ApplicationSolution' => 'Applikations Løsninger',
-	'Class:ApplicationSolution+' => '',
-	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => '',
-	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Forretningsprocesser',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => '',
-	'Class:ApplicationSolution/Attribute:status' => 'Status',
-	'Class:ApplicationSolution/Attribute:status+' => '',
-	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktiv',
-	'Class:ApplicationSolution/Attribute:status/Value:active+' => '',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => '',
-	'Class:BusinessProcess' => 'Forretnings proces',
-	'Class:BusinessProcess+' => '',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Applikations løsning(er)',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => '',
-	'Class:BusinessProcess/Attribute:status' => 'Status',
-	'Class:BusinessProcess/Attribute:status+' => '',
-	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktiv',
-	'Class:BusinessProcess/Attribute:status/Value:active+' => '',
-	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:BusinessProcess/Attribute:status/Value:inactive+' => '',
-	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => '',
-	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instancer',
-	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Liset over Middleware instancer',
-	'Class:DBServer' => 'DB Server',
-	'Class:DBServer+' => '',
-	'Class:DBServer/Attribute:dbschema_list' => 'DB schema(er)',
-	'Class:DBServer/Attribute:dbschema_list+' => '',
-	'Class:WebServer' => 'Web server',
-	'Class:WebServer+' => '',
-	'Class:WebServer/Attribute:webapp_list' => 'Web applikationer',
-	'Class:WebServer/Attribute:webapp_list+' => '',
-	'Class:PCSoftware' => 'PC Software',
-	'Class:PCSoftware+' => '',
-	'Class:OtherSoftware' => 'Andet Software',
-	'Class:OtherSoftware+' => '',
-	'Class:MiddlewareInstance' => 'Middleware Instance',
-	'Class:MiddlewareInstance+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
-	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
-	'Class:DatabaseSchema' => 'Database Schema',
-	'Class:DatabaseSchema+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
-	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
-	'Class:WebApplication' => 'Web Applikation',
-	'Class:WebApplication+' => '',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
-	'Class:WebApplication/Attribute:webserver_id+' => '',
-	'Class:WebApplication/Attribute:url' => 'URL',
-	'Class:WebApplication/Attribute:url+' => '',
-	'Class:Software' => 'Software',
-	'Class:Software+' => '',
-	'Class:Software/Attribute:name' => 'Navn',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:vendor' => 'Sælger',
-	'Class:Software/Attribute:vendor+' => '',
-	'Class:Software/Attribute:version' => 'Version',
-	'Class:Software/Attribute:version+' => '',
-	'Class:Software/Attribute:documents_list' => 'Dokumenter',
-	'Class:Software/Attribute:documents_list+' => '',
-	'Class:Software/Attribute:type' => 'Type',
-	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
-	'Class:Software/Attribute:type/Value:DBServer+' => '',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
-	'Class:Software/Attribute:type/Value:Middleware+' => '',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Andet Software',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => '',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => '',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
-	'Class:Software/Attribute:type/Value:WebServer+' => '',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instancer',
-	'Class:Software/Attribute:softwareinstance_list+' => '',
-	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
-	'Class:Software/Attribute:softwarepatch_list+' => '',
-	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenser',
-	'Class:Software/Attribute:softwarelicence_list+' => '',
-	'Class:OSPatch' => 'OS Patch',
-	'Class:OSPatch+' => '',
-	'Class:OSPatch/Attribute:functionalcis_list' => 'Enheder',
-	'Class:OSPatch/Attribute:functionalcis_list+' => '',
-	'Class:OSPatch/Attribute:osversion_id' => 'OS version',
-	'Class:OSPatch/Attribute:osversion_id+' => '',
-	'Class:SoftwarePatch' => 'Software Patch',
-	'Class:SoftwarePatch+' => '',
-	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
-	'Class:SoftwarePatch/Attribute:software_id+' => '',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instancer',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => '',
-	'Class:OSLicence' => 'OS Licenser',
-	'Class:OSLicence+' => '',
-	'Class:OSLicence/Attribute:osversion_id' => 'OS version',
-	'Class:OSLicence/Attribute:osversion_id+' => '',
-	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuelle maskiner',
-	'Class:OSLicence/Attribute:virtualmachines_list+' => '',
-	'Class:OSLicence/Attribute:servers_list' => 'Servere',
-	'Class:OSLicence/Attribute:servers_list+' => '',
-	'Class:SoftwareLicence' => 'Software Licens',
-	'Class:SoftwareLicence+' => '',
-	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
-	'Class:SoftwareLicence/Attribute:software_id+' => '',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instancer',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => '',
-	'Class:lnkDocumentToLicence' => 'Link Dokument / Licens',
-	'Class:lnkDocumentToLicence+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licens',
-	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokument',
-	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
-	'Class:OSVersion' => 'OS Version',
-	'Class:OSVersion+' => '',
-	'Class:OSVersion/Attribute:osfamily_id' => 'OS familie',
-	'Class:OSVersion/Attribute:osfamily_id+' => '',
-	'Class:OSFamily' => 'OS Familie',
-	'Class:OSFamily+' => '',
-	'Class:DocumentType' => 'Dokument Type',
-	'Class:DocumentType+' => '',
-	'Class:ContactType' => 'Kontakt Type',
-	'Class:ContactType+' => '',
-	'Class:Brand' => 'Mærke',
-	'Class:Brand+' => '',
-	'Class:Brand/Attribute:physicaldevices_list' => 'Fysiske Enheder',
-	'Class:Brand/Attribute:physicaldevices_list+' => '',
-	'Class:Model' => 'Model',
-	'Class:Model+' => '',
-	'Class:Model/Attribute:brand_id' => 'Mærke',
-	'Class:Model/Attribute:brand_id+' => '',
-	'Class:Model/Attribute:type' => 'Enheds type',
-	'Class:Model/Attribute:type+' => '',
-	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array',
-	'Class:Model/Attribute:type/Value:DiskArray+' => '',
-	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
-	'Class:Model/Attribute:type/Value:Enclosure+' => '',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Telefon',
-	'Class:Model/Attribute:type/Value:IPPhone+' => '',
-	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobil Telefon',
-	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
-	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
-	'Class:Model/Attribute:type/Value:NAS+' => '',
-	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netværks Enhed',
-	'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
-	'Class:Model/Attribute:type/Value:PC' => 'PC',
-	'Class:Model/Attribute:type/Value:PC+' => '',
-	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
-	'Class:Model/Attribute:type/Value:PDU+' => '',
-	'Class:Model/Attribute:type/Value:Peripheral' => 'Perifer Enhed',
-	'Class:Model/Attribute:type/Value:Peripheral+' => '',
-	'Class:Model/Attribute:type/Value:PowerSource' => 'Strømforsyning',
-	'Class:Model/Attribute:type/Value:PowerSource+' => '',
-	'Class:Model/Attribute:type/Value:Printer' => 'Printer',
-	'Class:Model/Attribute:type/Value:Printer+' => '',
-	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
-	'Class:Model/Attribute:type/Value:Rack+' => '',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => '',
-	'Class:Model/Attribute:type/Value:Server' => 'Server',
-	'Class:Model/Attribute:type/Value:Server+' => '',
-	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System',
-	'Class:Model/Attribute:type/Value:StorageSystem+' => '',
-	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
-	'Class:Model/Attribute:type/Value:Tablet+' => '',
-	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library',
-	'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
-	'Class:Model/Attribute:type/Value:Telephone' => 'Telefon',
-	'Class:Model/Attribute:type/Value:Telephone+' => '',
-	'Class:Model/Attribute:physicaldevices_list' => 'Fysiske Enheder',
-	'Class:Model/Attribute:physicaldevices_list+' => '',
-	'Class:NetworkDeviceType' => 'Netværks Enhed Type',
-	'Class:NetworkDeviceType+' => '',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netværks Enheder',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => '',
-	'Class:IOSVersion' => 'IOS Version',
-	'Class:IOSVersion+' => '',
-	'Class:IOSVersion/Attribute:brand_id' => 'Mærke',
-	'Class:IOSVersion/Attribute:brand_id+' => '',
-	'Class:lnkDocumentToPatch' => 'Link Dokument / Patch',
-	'Class:lnkDocumentToPatch+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
-	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokument',
-	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
-	'Class:lnkFunctionalCIToOSPatch+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToSoftware' => 'Link Dokument / Software',
-	'Class:lnkDocumentToSoftware+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
-	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Dokument',
-	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
-	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
-	'Class:lnkDocumentToFunctionalCI' => 'Link Dokument / FunctionalCI',
-	'Class:lnkDocumentToFunctionalCI+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Dokument',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
-	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => '',
-	'Class:Subnet/Attribute:description' => 'Beskrivelse',
-	'Class:Subnet/Attribute:description+' => '',
-	'Class:Subnet/Attribute:org_id' => 'Ejer organisation',
-	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => '',
-	'Class:Subnet/Attribute:ip_mask' => 'IP Maske',
-	'Class:Subnet/Attribute:ip_mask+' => '',
-	'Class:PhysicalInterface' => 'Fysisk Interface',
-	'Class:PhysicalInterface+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Enhed',
-	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / Netværks enhed',
-	'Class:lnkConnectableCIToNetworkDevice+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netværks enhed',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Forbundet enhed',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Netværks port',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Enheds port',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Forbindelses type',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Down link',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Up link',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplikationsLøsning / FunctionalCI',
-	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applikations løsning',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplikationsLøsning / ForretningsProces',
-	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Forretningsproces',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Applikations løsning',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
-	'Class:lnkPersonToTeam' => 'Link Person / Team',
-	'Class:lnkPersonToTeam+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
-	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
-	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
-	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
-	'Class:Group' => 'Gruppe',
-	'Class:Group+' => '',
-	'Class:Group/Attribute:name' => 'Navn',
-	'Class:Group/Attribute:name+' => '',
-	'Class:Group/Attribute:status' => 'Status',
-	'Class:Group/Attribute:status+' => '',
-	'Class:Group/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:Group/Attribute:status/Value:implementation+' => '',
-	'Class:Group/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:Group/Attribute:status/Value:obsolete+' => '',
-	'Class:Group/Attribute:status/Value:production' => 'Produktion',
-	'Class:Group/Attribute:status/Value:production+' => '',
-	'Class:Group/Attribute:org_id' => 'Organisation~~',
-	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:description' => 'Beskrivelse',
-	'Class:Group/Attribute:description+' => '',
-	'Class:Group/Attribute:type' => 'Type',
-	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => 'Parent Gruppe',
-	'Class:Group/Attribute:parent_id+' => '',
-	'Class:Group/Attribute:ci_list' => 'Linked CIs',
-	'Class:Group/Attribute:ci_list+' => '',
-	'Class:lnkGroupToCI' => 'Link Gruppe / CI',
-	'Class:lnkGroupToCI+' => '',
-	'Class:lnkGroupToCI/Attribute:group_id' => 'Gruppe',
-	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
-	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:reason' => 'Årsag',
-	'Class:lnkGroupToCI/Attribute:reason+' => '',
-	'Class:Rack' => 'Rack',
-	'Class:Rack+' => '',
-	'Class:Rack/Attribute:nb_u' => 'NB U',
-	'Class:Rack/Attribute:nb_u+' => '',
-	'Class:Rack/Attribute:device_list' => 'Enheder',
-	'Class:Rack/Attribute:device_list+' => '',
-	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
-	'Class:Rack/Attribute:enclosure_list+' => '',
-	'Class:Enclosure' => 'Enclosure',
-	'Class:Enclosure+' => '',
-	'Class:Enclosure/Attribute:rack_id' => 'Rack',
-	'Class:Enclosure/Attribute:rack_id+' => '',
-	'Class:Enclosure/Attribute:nb_u' => 'NB U',
-	'Class:Enclosure/Attribute:nb_u+' => '',
-	'Class:Enclosure/Attribute:device_list' => 'Enheder',
-	'Class:Enclosure/Attribute:device_list+' => '',
-	'Class:PowerSource' => 'Strømforsyning',
-	'Class:PowerSource+' => '',
-	'Class:PowerSource/Attribute:pdus_list' => 'PDUer',
-	'Class:PowerSource/Attribute:pdus_list+' => '',
-	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '',
-	'Class:PDU/Attribute:rack_id' => 'Rack',
-	'Class:PDU/Attribute:rack_id+' => '',
-	'Class:PDU/Attribute:powerstart_id' => 'Power start',
-	'Class:PDU/Attribute:powerstart_id+' => '',
-	'Class:PC' => 'PC',
-	'Class:PC+' => '',
-	'Class:PC/Attribute:osfamily_id' => 'OS familie',
-	'Class:PC/Attribute:osfamily_id+' => '',
-	'Class:PC/Attribute:osversion_id' => 'OS version',
-	'Class:PC/Attribute:osversion_id+' => '',
-	'Class:PC/Attribute:cpu' => 'CPU',
-	'Class:PC/Attribute:cpu+' => '',
-	'Class:PC/Attribute:ram' => 'RAM',
-	'Class:PC/Attribute:ram+' => '',
-	'Class:PC/Attribute:type' => 'Type',
-	'Class:PC/Attribute:type+' => '',
-	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
-	'Class:PC/Attribute:type/Value:desktop+' => '',
-	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
-	'Class:PC/Attribute:type/Value:laptop+' => '',
-	'Class:Printer' => 'Printer',
-	'Class:Printer+' => '',
-	'Class:Phone' => 'Telefon',
-	'Class:Phone+' => '',
-	'Class:MobilePhone' => 'Mobil Telefon',
-	'Class:MobilePhone+' => '',
-	'Class:MobilePhone/Attribute:imei' => 'IMEI',
-	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
-	'Class:MobilePhone/Attribute:hw_pin+' => '',
-	'Class:IPPhone' => 'IP Telefon',
-	'Class:IPPhone+' => '',
-	'Class:Tablet' => 'Tablet',
-	'Class:Tablet+' => '',
-	'Class:Peripheral' => 'Perifer',
-	'Class:Peripheral+' => '',
-	'Class:ContractType' => 'Kontrakt Type',
-	'Class:ContractType+' => '',
-	'Class:CustomerContract' => 'Kunde Kontrakt',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'Services',
-	'Class:CustomerContract/Attribute:services_list+' => '',
-	'Class:ProviderContract' => 'Leverandør Kontrakt',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => '',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => '',
-	'Class:ProviderContract/Attribute:coverage' => 'Service timer',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-	'Class:lnkContactToContract' => 'Link Kontakt / Kontrakt',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => 'Kontrakt',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContractToDocument' => 'Link Kontrakt / Dokument',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => 'Kontrakt',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => 'Dokument',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / LeverandørKontrakt',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:ServiceFamily' => 'Service Familie',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => 'Navn',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'Services',
-	'Class:ServiceFamily/Attribute:services_list+' => '',
-	'Class:Service' => 'Service',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => 'Navn',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Leverandør',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:servicefamily_id' => 'Service Familie',
-	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:description' => 'Beskrivelse',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => 'Dokumenter',
-	'Class:Service/Attribute:documents_list+' => '',
-	'Class:Service/Attribute:contacts_list' => 'Kontakter',
-	'Class:Service/Attribute:contacts_list+' => '',
-	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => 'implementering',
-	'Class:Service/Attribute:status/Value:implementation+' => '',
-	'Class:Service/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:Service/Attribute:status/Value:obsolete+' => '',
-	'Class:Service/Attribute:status/Value:production' => 'Produktion',
-	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:customercontracts_list' => 'Kunde kontrakter',
-	'Class:Service/Attribute:customercontracts_list+' => '',
-	'Class:Service/Attribute:providercontracts_list' => 'Leverandør kontrakter',
-	'Class:Service/Attribute:providercontracts_list+' => '',
-	'Class:Service/Attribute:functionalcis_list' => 'Afhænger af CIer',
-	'Class:Service/Attribute:functionalcis_list+' => '',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Service Subkategorier',
-	'Class:Service/Attribute:servicesubcategories_list+' => '',
-	'Class:lnkDocumentToService' => 'Link Dokument / Service',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => 'Dokument',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkContactToService' => 'Link Kontakt / Service',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'Service',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'Class:ServiceSubcategory' => 'Service Subkategori',
-	'Class:ServiceSubcategory+' => '',
-	'Class:ServiceSubcategory/Attribute:name' => 'Navn',
-	'Class:ServiceSubcategory/Attribute:name+' => '',
-	'Class:ServiceSubcategory/Attribute:description' => 'Beskrivelse',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
-	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type' => 'Anmodnings type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Service anmodning',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => '',
-	'Class:ServiceSubcategory/Attribute:status' => 'Status',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produktion',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => 'Navn',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => 'Beskrivelse',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Leverandør',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:slts_list' => 'SLTer',
-	'Class:SLA/Attribute:slts_list+' => '',
-	'Class:SLA/Attribute:customercontracts_list' => 'Kunde kontrakter',
-	'Class:SLA/Attribute:customercontracts_list+' => '',
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => 'Navn',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => 'Prioritet',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => 'Kritisk',
-	'Class:SLT/Attribute:priority/Value:1+' => '',
-	'Class:SLT/Attribute:priority/Value:2' => 'Høj',
-	'Class:SLT/Attribute:priority/Value:2+' => '',
-	'Class:SLT/Attribute:priority/Value:3' => 'Medium',
-	'Class:SLT/Attribute:priority/Value:3+' => '',
-	'Class:SLT/Attribute:priority/Value:4' => 'Lav',
-	'Class:SLT/Attribute:priority/Value:4+' => '',
-	'Class:SLT/Attribute:request_type' => 'Anmodnings type',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'Incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => '',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'Service anmodning',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
-	'Class:SLT/Attribute:metric' => 'Metrisk',
-	'Class:SLT/Attribute:metric+' => '',
-	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => '',
-	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => '',
-	'Class:SLT/Attribute:value' => 'Værdi',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => 'Enhed',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => 'timer',
-	'Class:SLT/Attribute:unit/Value:hours+' => '',
-	'Class:SLT/Attribute:unit/Value:minutes' => 'minutter',
-	'Class:SLT/Attribute:unit/Value:minutes+' => '',
-	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
-	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
-	'Class:lnkCustomerContractToService' => 'Link Kunde Kontrakt / Service',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Kunde kontrakt',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkProviderContractToService' => 'Link Leverandør kontrakt / Service',
-	'Class:lnkProviderContractToService+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Leverandør kontrakt',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:DeliveryModel' => 'Leverings Model',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => 'Navn',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:description' => 'Beskrivelse',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakter',
-	'Class:DeliveryModel/Attribute:contacts_list+' => '',
-	'Class:DeliveryModel/Attribute:customers_list' => 'Kunder',
-	'Class:DeliveryModel/Attribute:customers_list+' => '',
-	'Class:lnkDeliveryModelToContact' => 'Link Leverings Model / Kontakt',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Leverings model',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Rolle',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Class:StorageSystem' => 'Storage System',
-	'Class:StorageSystem+' => '',
-	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => '',
-	'Class:SANSwitch' => 'SAN Switch',
-	'Class:SANSwitch+' => '',
-	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Enheder',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => '',
-	'Class:TapeLibrary' => 'Tape Library',
-	'Class:TapeLibrary+' => '',
-	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
-	'Class:TapeLibrary/Attribute:tapes_list+' => '',
-	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '',
-	'Class:NAS/Attribute:nasfilesystem_list' => 'Fil system(er)',
-	'Class:NAS/Attribute:nasfilesystem_list+' => '',
-	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
-	'Class:FiberChannelInterface+' => '',
-	'Class:FiberChannelInterface/Attribute:speed' => 'Hastighed',
-	'Class:FiberChannelInterface/Attribute:speed+' => '',
-	'Class:FiberChannelInterface/Attribute:topology' => 'Topologi',
-	'Class:FiberChannelInterface/Attribute:topology+' => '',
-	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
-	'Class:FiberChannelInterface/Attribute:wwn+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Enhed',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
-	'Class:Tape' => 'Tape',
-	'Class:Tape+' => '',
-	'Class:Tape/Attribute:name' => 'Navn',
-	'Class:Tape/Attribute:name+' => '',
-	'Class:Tape/Attribute:description' => 'Beskrivelse',
-	'Class:Tape/Attribute:description+' => '',
-	'Class:Tape/Attribute:size' => 'Størrelse',
-	'Class:Tape/Attribute:size+' => '',
-	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library',
-	'Class:Tape/Attribute:tapelibrary_id+' => '',
-	'Class:NASFileSystem' => 'NAS Fil System',
-	'Class:NASFileSystem+' => '',
-	'Class:NASFileSystem/Attribute:name' => 'Navn',
-	'Class:NASFileSystem/Attribute:name+' => '',
-	'Class:NASFileSystem/Attribute:description' => 'Beskrivelse',
-	'Class:NASFileSystem/Attribute:description+' => '',
-	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level',
-	'Class:NASFileSystem/Attribute:raid_level+' => '',
-	'Class:NASFileSystem/Attribute:size' => 'Størrelse',
-	'Class:NASFileSystem/Attribute:size+' => '',
-	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
-	'Class:NASFileSystem/Attribute:nas_id+' => '',
-	'Class:LogicalVolume' => 'Logical Volume',
-	'Class:LogicalVolume+' => '',
-	'Class:LogicalVolume/Attribute:name' => 'Navn',
-	'Class:LogicalVolume/Attribute:name+' => '',
-	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
-	'Class:LogicalVolume/Attribute:lun_id+' => '',
-	'Class:LogicalVolume/Attribute:description' => 'Beskrivelse',
-	'Class:LogicalVolume/Attribute:description+' => '',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level',
-	'Class:LogicalVolume/Attribute:raid_level+' => '',
-	'Class:LogicalVolume/Attribute:size' => 'Størrelse',
-	'Class:LogicalVolume/Attribute:size+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system',
-	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
-	'Class:LogicalVolume/Attribute:servers_list' => 'Servere',
-	'Class:LogicalVolume/Attribute:servers_list+' => '',
-	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuelle enheder',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => '',
-	'Class:lnkServerToVolume' => 'Link Server / Volume',
-	'Class:lnkServerToVolume+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
-	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
-	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
-	'Class:lnkServerToVolume/Attribute:server_id+' => '',
-	'Class:lnkServerToVolume/Attribute:size_used' => 'Størrelse anvendt',
-	'Class:lnkServerToVolume/Attribute:size_used+' => '',
-	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
-	'Class:lnkSanToDatacenterDevice+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Enhed',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Enheds fc',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
-	'Class:Ticket' => 'Billet',
-	'Class:Ticket+' => '',
-	'Class:Ticket/Attribute:ref' => 'Ref',
-	'Class:Ticket/Attribute:ref+' => '',
-	'Class:Ticket/Attribute:org_id' => 'Organisation',
-	'Class:Ticket/Attribute:org_id+' => '',
-	'Class:Ticket/Attribute:caller_id' => 'Rekvirent',
-	'Class:Ticket/Attribute:caller_id+' => '',
-	'Class:Ticket/Attribute:team_id' => 'Team',
-	'Class:Ticket/Attribute:team_id+' => '',
-	'Class:Ticket/Attribute:agent_id' => 'Agent',
-	'Class:Ticket/Attribute:agent_id+' => '',
-	'Class:Ticket/Attribute:title' => 'Titel',
-	'Class:Ticket/Attribute:title+' => '',
-	'Class:Ticket/Attribute:description' => 'Beskrivelse',
-	'Class:Ticket/Attribute:description+' => '',
-	'Class:Ticket/Attribute:start_date' => 'Start dato',
-	'Class:Ticket/Attribute:start_date+' => '',
-	'Class:Ticket/Attribute:end_date' => 'Slut dato',
-	'Class:Ticket/Attribute:end_date+' => '',
-	'Class:Ticket/Attribute:last_update' => 'Sidste opdatering',
-	'Class:Ticket/Attribute:last_update+' => '',
-	'Class:Ticket/Attribute:close_date' => 'Lukket dato',
-	'Class:Ticket/Attribute:close_date+' => '',
-	'Class:Ticket/Attribute:private_log' => 'Privat log',
-	'Class:Ticket/Attribute:private_log+' => '',
-	'Class:Ticket/Attribute:contacts_list' => 'Kontakter',
-	'Class:Ticket/Attribute:contacts_list+' => '',
-	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
-	'Class:Ticket/Attribute:functionalcis_list+' => '',
-	'Class:Ticket/Attribute:workorders_list' => 'Arbejds ordrer',
-	'Class:Ticket/Attribute:workorders_list+' => '',
-	'Class:Ticket/Attribute:finalclass' => 'Type',
-	'Class:Ticket/Attribute:finalclass+' => '',
-	'Class:lnkContactToTicket' => 'Link Kontakt / Billet',
-	'Class:lnkContactToTicket+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Billet',
-	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
-	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
-	'Class:lnkContactToTicket/Attribute:role' => 'Rolle',
-	'Class:lnkContactToTicket/Attribute:role+' => '',
-	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Billet',
-	'Class:lnkFunctionalCIToTicket+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Billet',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Påvirkning',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
-	'Class:WorkOrder' => 'Arbejds ordrer',
-	'Class:WorkOrder+' => '',
-	'Class:WorkOrder/Attribute:name' => 'Navn',
-	'Class:WorkOrder/Attribute:name+' => '',
-	'Class:WorkOrder/Attribute:status' => 'Status',
-	'Class:WorkOrder/Attribute:status+' => '',
-	'Class:WorkOrder/Attribute:status/Value:open' => 'Åben',
-	'Class:WorkOrder/Attribute:status/Value:open+' => '',
-	'Class:WorkOrder/Attribute:status/Value:closed' => 'Lukket',
-	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
-	'Class:WorkOrder/Attribute:description' => 'Beskrivelse',
-	'Class:WorkOrder/Attribute:description+' => '',
-	'Class:WorkOrder/Attribute:ticket_id' => 'Billet',
-	'Class:WorkOrder/Attribute:ticket_id+' => '',
-	'Class:WorkOrder/Attribute:team_id' => 'Team',
-	'Class:WorkOrder/Attribute:team_id+' => '',
-	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
-	'Class:WorkOrder/Attribute:agent_id+' => '',
-	'Class:WorkOrder/Attribute:start_date' => 'Start dato',
-	'Class:WorkOrder/Attribute:start_date+' => '',
-	'Class:WorkOrder/Attribute:end_date' => 'Slut dato',
-	'Class:WorkOrder/Attribute:end_date+' => '',
-	'Class:WorkOrder/Attribute:log' => 'Log',
-	'Class:WorkOrder/Attribute:log+' => '',
-	'Class:WorkOrder/Stimulus:ev_close' => 'Luk',
-	'Class:WorkOrder/Stimulus:ev_close+' => '',
-	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '',
-	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
-	'Class:Hypervisor/Attribute:farm_id+' => '',
-	'Class:Hypervisor/Attribute:server_id' => 'Server',
-	'Class:Hypervisor/Attribute:server_id+' => '',
-	'Class:Farm' => 'Farm',
-	'Class:Farm+' => '',
-	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
-	'Class:Farm/Attribute:hypervisor_list+' => '',
-	'Class:VirtualMachine' => 'Virtuel Maskine',
-	'Class:VirtualMachine+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuel vært',
-	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS familie',
-	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
-	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version',
-	'Class:VirtualMachine/Attribute:osversion_id+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licens',
-	'Class:VirtualMachine/Attribute:oslicence_id+' => '',
-	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
-	'Class:VirtualMachine/Attribute:cpu+' => '',
-	'Class:VirtualMachine/Attribute:ram' => 'RAM',
-	'Class:VirtualMachine/Attribute:ram+' => '',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Netværks Interfaces',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => '',
-	'Class:LogicalInterface' => 'Logisk Interface',
-	'Class:LogicalInterface+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuel maskine',
-	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
-	'Class:Change' => 'Ændring',
-	'Class:Change+' => '',
-	'Class:Change/Attribute:status' => 'Status',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:new' => 'Ny',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => 'Tildelt',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:planned' => 'Planlagt',
-	'Class:Change/Attribute:status/Value:planned+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => 'Afslået',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:approved' => 'Godkendt',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:closed' => 'Lukket',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:category' => 'Kategori',
-	'Class:Change/Attribute:category+' => '',
-	'Class:Change/Attribute:category/Value:application' => 'Applikation',
-	'Class:Change/Attribute:category/Value:application+' => '',
-	'Class:Change/Attribute:category/Value:hardware' => 'Hardware',
-	'Class:Change/Attribute:category/Value:hardware+' => '',
-	'Class:Change/Attribute:category/Value:network' => 'Netværk',
-	'Class:Change/Attribute:category/Value:network+' => '',
-	'Class:Change/Attribute:category/Value:other' => 'Andet',
-	'Class:Change/Attribute:category/Value:other+' => '',
-	'Class:Change/Attribute:category/Value:software' => 'Software',
-	'Class:Change/Attribute:category/Value:software+' => '',
-	'Class:Change/Attribute:category/Value:system' => 'System',
-	'Class:Change/Attribute:category/Value:system+' => '',
-	'Class:Change/Attribute:reject_reason' => 'Årsag til afslag',
-	'Class:Change/Attribute:reject_reason+' => '',
-	'Class:Change/Attribute:changemanager_id' => 'Change manager',
-	'Class:Change/Attribute:changemanager_id+' => '',
-	'Class:Change/Attribute:parent_id' => 'Parent change',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:creation_date' => 'Oprettelses dato',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:approval_date' => 'Godkendelses dato',
-	'Class:Change/Attribute:approval_date+' => '',
-	'Class:Change/Attribute:fallback_plan' => 'Fallback plan',
-	'Class:Change/Attribute:fallback_plan+' => '',
-	'Class:Change/Attribute:related_request_list' => 'Relaterede anmodninger',
-	'Class:Change/Attribute:related_request_list+' => '',
-	'Class:Change/Attribute:child_changes_list' => 'Child changes',
-	'Class:Change/Attribute:child_changes_list+' => '',
-	'Class:Change/Stimulus:ev_assign' => 'Tildel',
-	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_plan' => 'Planlæg',
-	'Class:Change/Stimulus:ev_plan+' => '',
-	'Class:Change/Stimulus:ev_reject' => 'Afslå',
-	'Class:Change/Stimulus:ev_reject+' => '',
-	'Class:Change/Stimulus:ev_reopen' => 'Genåben',
-	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Class:Change/Stimulus:ev_approve' => 'Godkend',
-	'Class:Change/Stimulus:ev_approve+' => '',
-	'Class:Change/Stimulus:ev_finish' => 'Luk',
-	'Class:Change/Stimulus:ev_finish+' => '',
-	'Class:UserRequest' => 'Bruger anmodning',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => 'Status',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => 'Ny',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eskaleret TTO',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => 'Tildelt',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eskaleret TTR',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Afventer godkendelse',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => 'Godkendt',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => 'Afslået',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => 'Afventer',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => 'Løst',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'Lukket',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => 'Anmodnings Type',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
-	'Class:UserRequest/Attribute:request_type/Value:incident+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service anmodning',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
-	'Class:UserRequest/Attribute:impact' => 'Påvirkning',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => 'Afdeling',
-	'Class:UserRequest/Attribute:impact/Value:1+' => 'En afdeling er påvirket',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'Service',
-	'Class:UserRequest/Attribute:impact/Value:2+' => 'En service er påvirket',
-	'Class:UserRequest/Attribute:impact/Value:3' => 'Person',
-	'Class:UserRequest/Attribute:impact/Value:3+' => 'En person er påvirket',
-	'Class:UserRequest/Attribute:priority' => 'Prioritet',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => 'Kritisk',
-	'Class:UserRequest/Attribute:priority/Value:1+' => '',
-	'Class:UserRequest/Attribute:priority/Value:2' => 'Høj',
-	'Class:UserRequest/Attribute:priority/Value:2+' => '',
-	'Class:UserRequest/Attribute:priority/Value:3' => 'Medium',
-	'Class:UserRequest/Attribute:priority/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority/Value:4' => 'Lav',
-	'Class:UserRequest/Attribute:priority/Value:4+' => '',
-	'Class:UserRequest/Attribute:urgency' => 'Vigtighed',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => 'Kritisk',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:2' => 'Høj',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:3' => 'Medium',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:4' => 'Lav',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
-	'Class:UserRequest/Attribute:origin' => 'Oprindelse',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitorering',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => '',
-	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => '',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => '',
-	'Class:UserRequest/Attribute:approver_id' => 'Godkender',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'Service',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Service subkategori',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nej',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Ja',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
-	'Class:UserRequest/Attribute:escalation_reason' => 'Hot årsag',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => 'Tildelings dato',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => 'Løsnings dato',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => 'Sidste afventer dato',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute:cumulatedpending' => 'Akumulerede afventer',
-	'Class:UserRequest/Attribute:cumulatedpending+' => '',
-	'Class:UserRequest/Attribute:tto' => 'TTO',
-	'Class:UserRequest/Attribute:tto+' => '',
-	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passeret',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr passeret',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => 'Løsnings forsinkelse',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => 'Løsnings kode',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Bistand',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparation',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Andet',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'System update',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Træning',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
-	'Class:UserRequest/Attribute:solution' => 'Løsning',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => 'Afventer årsag~~',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => 'Parent anmodning',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => 'Parent change',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => 'Child anmodninger',
-	'Class:UserRequest/Attribute:related_request_list+' => '',
-	'Class:UserRequest/Attribute:public_log' => 'Offentlig log',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'Bruger tilfredshed',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Meget tilfreds',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Tilfreds',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Meget utilfreds',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Hverken eller',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
-	'Class:UserRequest/Attribute:user_comment' => 'Bruger kommentar',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => 'Tildel',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => 'Gen-tildel',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => 'Godkend',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => 'Afslå',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => 'Afventer',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatisk løsning',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatisk lukning',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => 'Mærk som løst',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'Luk denne anmodning',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => 'Gen-åben',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Afventer godkendelse',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Class:AsyncSendEmail' => 'Email (asynkron)',
-	'Class:AsyncSendEmail/Attribute:to' => 'Til',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Emne',
-	'Class:CMDBChange' => 'Change',
-	'Class:CMDBChange+' => '',
-	'Class:CMDBChange/Attribute:date' => 'Dato',
-	'Class:CMDBChange/Attribute:date+' => '',
-	'Class:CMDBChange/Attribute:userinfo' => 'Forskellig info',
-	'Class:CMDBChange/Attribute:userinfo+' => '',
-	'Class:CMDBChangeOp' => 'Change Operation',
-	'Class:CMDBChangeOp+' => '',
-	'Class:CMDBChangeOp/Attribute:change' => 'Change',
-	'Class:CMDBChangeOp/Attribute:change+' => '',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'Objekt klasse',
-	'Class:CMDBChangeOp/Attribute:objclass+' => '',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'Objekt id',
-	'Class:CMDBChangeOp/Attribute:objkey+' => '',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'Type',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-	'Class:CMDBChangeOpCreate' => 'Object oprettelse',
-	'Class:CMDBChangeOpCreate+' => '',
-	'Class:CMDBChangeOpDelete' => 'Object sletning',
-	'Class:CMDBChangeOpDelete+' => '',
-	'Class:CMDBChangeOpSetAttribute' => 'Object ændring',
-	'Class:CMDBChangeOpSetAttribute+' => '',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribut',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar' => 'Property ændring',
-	'Class:CMDBChangeOpSetAttributeScalar+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Tidligere værdi',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Ny værdi',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
-	'Class:CMDBChangeOpSetAttributeBlob' => 'Data ændring',
-	'Class:CMDBChangeOpSetAttributeBlob+' => '',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Tidligere data',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Krypteret Password',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Tidligere værdi',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Krypteret Felt',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Tidligere værdi',
-	'Class:CMDBChangeOpSetAttributeText' => 'Tekst ændring',
-	'Class:CMDBChangeOpSetAttributeText+' => '',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Tidligere data',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Sags Log',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Sidste Entry',
-	'Class:Event' => 'Log Hændelse',
-	'Class:Event+' => '',
-	'Class:Event/Attribute:message' => 'Besked',
-	'Class:Event/Attribute:message+' => '',
-	'Class:Event/Attribute:date' => 'Dato',
-	'Class:Event/Attribute:date+' => '',
-	'Class:Event/Attribute:userinfo' => 'Bruger info',
-	'Class:Event/Attribute:userinfo+' => '',
-	'Class:Event/Attribute:finalclass' => 'Type',
-	'Class:Event/Attribute:finalclass+' => '',
-	'Class:EventNotification' => 'Notifikation hændelse',
-	'Class:EventNotification+' => '',
-	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
-	'Class:EventNotification/Attribute:trigger_id+' => '',
-	'Class:EventNotification/Attribute:action_id' => 'Bruger',
-	'Class:EventNotification/Attribute:action_id+' => '',
-	'Class:EventNotification/Attribute:object_id' => 'Object id',
-	'Class:EventNotification/Attribute:object_id+' => '',
-	'Class:EventNotificationEmail' => 'Email emission hændelse',
-	'Class:EventNotificationEmail+' => '',
-	'Class:EventNotificationEmail/Attribute:to' => 'Til',
-	'Class:EventNotificationEmail/Attribute:to+' => '',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => '',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:bcc+' => '',
-	'Class:EventNotificationEmail/Attribute:from' => 'Fra',
-	'Class:EventNotificationEmail/Attribute:from+' => '',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Emne',
-	'Class:EventNotificationEmail/Attribute:subject+' => '',
-	'Class:EventNotificationEmail/Attribute:body' => 'Indhold',
-	'Class:EventNotificationEmail/Attribute:body+' => '',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Vedhæftning(er)',
-	'Class:EventNotificationEmail/Attribute:attachments+' => '',
-	'Class:EventIssue' => 'Hændelses emne',
-	'Class:EventIssue+' => '',
-	'Class:EventIssue/Attribute:issue' => 'Emne',
-	'Class:EventIssue/Attribute:issue+' => '',
-	'Class:EventIssue/Attribute:impact' => 'Påvirkning',
-	'Class:EventIssue/Attribute:impact+' => '',
-	'Class:EventIssue/Attribute:page' => 'Side',
-	'Class:EventIssue/Attribute:page+' => '',
-	'Class:EventIssue/Attribute:arguments_post' => 'Postede argumenter',
-	'Class:EventIssue/Attribute:arguments_post+' => '',
-	'Class:EventIssue/Attribute:arguments_get' => 'URL argumenter',
-	'Class:EventIssue/Attribute:arguments_get+' => '',
-	'Class:EventIssue/Attribute:callstack' => 'Callstack',
-	'Class:EventIssue/Attribute:callstack+' => '',
-	'Class:EventIssue/Attribute:data' => 'Data',
-	'Class:EventIssue/Attribute:data+' => '',
-	'Class:EventWebService' => 'Web service hændelse',
-	'Class:EventWebService+' => '',
-	'Class:EventWebService/Attribute:verb' => 'Verb',
-	'Class:EventWebService/Attribute:verb+' => '',
-	'Class:EventWebService/Attribute:result' => 'Resultat',
-	'Class:EventWebService/Attribute:result+' => '',
-	'Class:EventWebService/Attribute:log_info' => 'Info log',
-	'Class:EventWebService/Attribute:log_info+' => '',
-	'Class:EventWebService/Attribute:log_warning' => 'Advarsels log',
-	'Class:EventWebService/Attribute:log_warning+' => '',
-	'Class:EventWebService/Attribute:log_error' => 'Fejl log',
-	'Class:EventWebService/Attribute:log_error+' => '',
-	'Class:EventWebService/Attribute:data' => 'Data',
-	'Class:EventWebService/Attribute:data+' => '',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-	'Class:EventLoginUsage' => 'Login Usage',
-	'Class:EventLoginUsage+' => '',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
-	'Class:EventLoginUsage/Attribute:user_id+' => '',
-	'Class:SynchroDataSource' => 'Synchro Data Kilde',
-	'Class:SynchroDataSource/Attribute:name' => 'Navn',
-	'Class:SynchroDataSource/Attribute:name+' => '',
-	'Class:SynchroDataSource/Attribute:description' => 'Beskrivelse',
-	'Class:SynchroDataSource/Attribute:status' => 'Status',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produktion',
-	'Class:SynchroDataSource/Attribute:user_id' => 'Bruger',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Kontakt som skal adviseres',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => '',
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Target klasse',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => '',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Afstemnings politik',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Brug attributterne',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Brug primær nøgle feltet',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Handling på nul',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Opret',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fejl',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Handling på en',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fejl',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Opdater',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Handling på mange',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Opret',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fejl',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Tag den første (vilkårlig?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Slet Politik',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Slet',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Opdater',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Opdater derefter Slet',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Opdater regler',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Fastholdelses varighed',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribut Liste',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Tilladte brugere',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => '',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Kun Administratorer',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Enhver har tilladelse til at slette sådanne elementer',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ingen',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink',
-	'Class:SynchroDataSource/Attribute:url_icon+' => '',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Applikation\'s hyperlink',
-	'Class:SynchroDataSource/Attribute:url_application+' => '',
-	'Class:SynchroAttribute' => 'Synchro Attribute~~',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Kilde',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Attribut Kode',
-	'Class:SynchroAttribute/Attribute:update' => 'Opdater',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Afstem',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Opdater Polik',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Låst',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Låst op',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialiser hvis tom',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Klasse',
-	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Afstem Attribut',
-	'Class:SynchroAttLinkSet' => 'Synchro Attribut (Linksæt)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Række separator',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attribut separator',
-	'Class:SynchroLog' => 'Synchr Log',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Kilde',
-	'Class:SynchroLog/Attribute:start_date' => 'Start Dato',
-	'Class:SynchroLog/Attribute:end_date' => 'Slut Dato',
-	'Class:SynchroLog/Attribute:status' => 'Status',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Fuldført',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Fejl',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Stadig Kørende',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nr replica opdaget',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nr replica total',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nr objekter slettet',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nr af fejl under sletning',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nr objekter forældede',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nr af fejl under markering af forældet',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nr objekter oprettet',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nr af fejl under oprettelse',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nr objekter opdateret',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nr af fejl under opdatering',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nr af fejl under afstemning',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nr af replica forsvundet',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nr objekter opdateret',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nr objekter uændrede',
-	'Class:SynchroLog/Attribute:last_error' => 'Sidste fejl',
-	'Class:SynchroLog/Attribute:traces' => 'Spor',
-	'Class:SynchroReplica' => 'Synchro Replica',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Kilde',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Destinations objekt (ID)',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Destinations type',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Sidst opdaget',
-	'Class:SynchroReplica/Attribute:status' => 'Status',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificeret',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'Ny',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synkroniset',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objekt Oprettet ?',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Sidste fejl',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Advarsler',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Oprettelses Dato',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Sidste Ændrings Dato',
-	'Class:appUserPreferences' => 'Bruger Indstillinger',
-	'Class:appUserPreferences/Attribute:userid' => 'Bruger',
-	'Class:appUserPreferences/Attribute:preferences' => 'Inst.',
-	'Core:DeletedObjectLabel' => '%1s (slettet)',
-	'Core:DeletedObjectTip' => 'Objektet er slettet på %1$s (%2$s)',
-	'Core:UnknownObjectLabel' => 'Objektet ikke fundet (klasse: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip' => 'Objektet kunne ikke findes. Det kan være slettet, uden at loggen er blevt tømt.',
-	'Core:AttributeLinkedSet' => 'Array af objekter',
-	'Core:AttributeLinkedSet+' => '',
-	'Core:AttributeLinkedSetIndirect' => 'Array af objekter (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => '',
-	'Core:AttributeInteger' => 'Integer',
-	'Core:AttributeInteger+' => '',
-	'Core:AttributeDecimal' => 'Decimal',
-	'Core:AttributeDecimal+' => '',
-	'Core:AttributeBoolean' => 'Boolean',
-	'Core:AttributeBoolean+' => '',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-	'Core:AttributeString' => 'String',
-	'Core:AttributeString+' => '',
-	'Core:AttributeClass' => 'Class',
-	'Core:AttributeClass+' => '',
-	'Core:AttributeApplicationLanguage' => 'Bruger sprog',
-	'Core:AttributeApplicationLanguage+' => '',
-	'Core:AttributeFinalClass' => 'Klasse (auto)',
-	'Core:AttributeFinalClass+' => '',
-	'Core:AttributePassword' => 'Password',
-	'Core:AttributePassword+' => '',
-	'Core:AttributeEncryptedString' => 'Krypteret streng',
-	'Core:AttributeEncryptedString+' => '',
-	'Core:AttributeText' => 'Tekst',
-	'Core:AttributeText+' => '',
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => '',
-	'Core:AttributeEmailAddress' => 'Email adresse',
-	'Core:AttributeEmailAddress+' => '',
-	'Core:AttributeIPAddress' => 'IP adresse',
-	'Core:AttributeIPAddress+' => '',
-	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => '',
-	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => '',
-	'Core:AttributeTemplateString' => 'Template streng',
-	'Core:AttributeTemplateString+' => '',
-	'Core:AttributeTemplateText' => 'Template tekst',
-	'Core:AttributeTemplateText+' => '',
-	'Core:AttributeTemplateHTML' => 'Template HTML',
-	'Core:AttributeTemplateHTML+' => '',
-	'Core:AttributeDateTime' => 'Dato/tid',
-	'Core:AttributeDateTime+' => '',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-If the time is omitted, it defaults to 00:00:00
-</p>~~',
-	'Core:AttributeDate' => 'Dato',
-	'Core:AttributeDate+' => '',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>',
-	'Core:AttributeDeadline' => 'Deadline',
-	'Core:AttributeDeadline+' => '',
-	'Core:AttributeExternalKey' => 'Ekstern nøgle',
-	'Core:AttributeExternalKey+' => '',
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Nøgle',
-	'Core:AttributeHierarchicalKey+' => '',
-	'Core:AttributeExternalField' => 'Eksternt felt',
-	'Core:AttributeExternalField+' => '',
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => '',
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => '',
-	'Core:AttributeOneWayPassword' => 'En vejs password',
-	'Core:AttributeOneWayPassword+' => '',
-	'Core:AttributeTable' => 'Tabel',
-	'Core:AttributeTable+' => '',
-	'Core:AttributePropertySet' => 'Egenskaber',
-	'Core:AttributePropertySet+' => '',
-	'Core:AttributeFriendlyName' => 'Friendly navn',
-	'Core:AttributeFriendlyName+' => '',
-	'Core:FriendlyName-Label' => 'Friendly navn',
-	'Core:FriendlyName-Description' => 'Friendly navn',
-	'Class:CMDBChangeOp/Attribute:date' => 'dato',
-	'Class:CMDBChangeOp/Attribute:date+' => '',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'bruger',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
-	'Change:ObjectCreated' => 'Objekt oprettet',
-	'Change:ObjectDeleted' => 'Objekt slettet',
-	'Change:ObjectModified' => 'Objekt ændret',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s sat til %2$s (tidligere værdi: %3$s)',
-	'Change:AttName_SetTo' => '%1$s sat til %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s tilføjet til %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s ændret, tidligere værdi: %2$s',
-	'Change:AttName_Changed' => '%1$s ændret',
-	'Change:AttName_EntryAdded' => '%1$s ændret, ny entry tilføjet: %2$s',
-	'Change:LinkSet:Added' => 'tilføjet %1$s',
-	'Change:LinkSet:Removed' => 'fjernet %1$s',
-	'Change:LinkSet:Modified' => 'ændret %1$s',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'Bruger navn',
-	'Class:EventLoginUsage/Attribute:contact_name+' => '',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'Bruger Email',
-	'Class:EventLoginUsage/Attribute:contact_email+' => '',
-	'Class:Action' => 'Brugerdefineret handling',
-	'Class:Action+' => '',
-	'Class:Action/Attribute:name' => 'Navn',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Beskrivelse',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Status',
-	'Class:Action/Attribute:status+' => '',
-	'Class:Action/Attribute:status/Value:test' => 'Bliver testet',
-	'Class:Action/Attribute:status/Value:test+' => '',
-	'Class:Action/Attribute:status/Value:enabled' => 'I produktion',
-	'Class:Action/Attribute:status/Value:enabled+' => '',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inaktiv',
-	'Class:Action/Attribute:status/Value:disabled+' => '',
-	'Class:Action/Attribute:trigger_list' => 'Relaterede Triggere',
-	'Class:Action/Attribute:trigger_list+' => '',
-	'Class:Action/Attribute:finalclass' => 'Type',
-	'Class:Action/Attribute:finalclass+' => '',
-	'Class:ActionNotification' => 'Notifikation',
-	'Class:ActionNotification+' => '',
-	'Class:Trigger' => 'Triggere',
-	'Class:Trigger+' => '',
-	'Class:Trigger/Attribute:description' => 'Beskrivelse',
-	'Class:Trigger/Attribute:description+' => '',
-	'Class:Trigger/Attribute:action_list' => 'Triggerede handlinger',
-	'Class:Trigger/Attribute:action_list+' => '',
-	'Class:Trigger/Attribute:finalclass' => 'Type',
-	'Class:Trigger/Attribute:finalclass+' => '',
-	'Class:TriggerOnObject' => 'Trigger (klasse afhængig)',
-	'Class:TriggerOnObject+' => '',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Target klasse',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-	'Class:TriggerOnStateChange' => 'Trigger (i tilstand ændring)',
-	'Class:TriggerOnStateChange+' => '',
-	'Class:TriggerOnStateChange/Attribute:state' => 'Tilstand',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Handling',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Ingen',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Kun Administratorer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Alle tilladte brugere',
-	'SynchroDataSource:Description' => 'Beskrivelse',
-	'SynchroDataSource:Reconciliation' => 'Søg &amp; afstemning',
-	'SynchroDataSource:Deletion' => 'Slette regler',
-	'SynchroDataSource:Status' => 'Status',
-	'SynchroDataSource:Information' => 'Information',
-	'SynchroDataSource:Definition' => 'Definition',
-	'Core:SynchroAttributes' => 'Attributter',
-	'Core:SynchroStatus' => 'Status',
-	'Core:Synchro:ErrorsLabel' => 'Fejl',
-	'Core:Synchro:CreatedLabel' => 'Oprettet',
-	'Core:Synchro:ModifiedLabel' => 'Ændret',
-	'Core:Synchro:UnchangedLabel' => 'Uændret',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Fejl',
-	'Core:Synchro:ReconciledLabel' => 'Afstemt',
-	'Core:Synchro:ReconciledNewLabel' => 'Oprettet',
-	'Core:SynchroReconcile:Yes' => 'Ja',
-	'Core:SynchroReconcile:No' => 'Nej',
-	'Core:SynchroUpdate:Yes' => 'Ja',
-	'Core:SynchroUpdate:No' => 'Nej',
-	'Core:Synchro:LastestStatus' => 'Sidste Status',
-	'Core:Synchro:History' => 'Synchronization Historik',
-	'Core:Synchro:NeverRun' => 'Denne synkronisering har aldrig været kørt. Endnu ingen log.',
-	'Core:Synchro:SynchroEndedOn_Date' => 'Sidste synkronisering sluttede den %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synkroniseringen der startede den %1$s kører stadig...',
-	'Menu:DataSources' => 'Synkroniserings Data Kilder',
-	'Menu:DataSources+' => '',
-	'Core:Synchro:label_repl_ignored' => 'Ignoreret (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Forsvundet (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Eksisterer (%1$s)',
-	'Core:Synchro:label_repl_new' => 'Ny (%1$s)',
-	'Core:Synchro:label_obj_deleted' => 'Slettet (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Forældet (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Fejl (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'Ingen handling (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Uændret (%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Opdateret (%1$s)',
-	'Core:Synchro:label_obj_updated_errors' => 'Fejl (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Uændret (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Opdateret (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Oprettet (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Fejl (%1$s)',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica behandlet: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Mindst 1 afstemnings nøgle skal anføres, eller afstemnings politikken skal sættes til at bruge primær nøgle.',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'En tilbageholdelses periode efter sletning skal anføres, da objekter slettes efter mærkning som Forældet',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Forældede objekter skal ajourføres, men der er ingen opdateringer specificeret.',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'Tabellen %1$s eksisterer allerede i databasen. Brug venligst et andet navn for synkroniserings tabellen.',
-	'Core:SynchroReplica:PublicData' => 'Offentlige Data',
-	'Core:SynchroReplica:PrivateDetails' => 'Private Detaljer',
-	'Core:SynchroReplica:BackToDataSource' => 'Gå Tilbage til Synkroniserings Data Kilde: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'Liste over Replica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primær Nøgle)',
-	'Core:SynchroAtt:attcode' => 'Attribut',
-	'Core:SynchroAtt:attcode+' => '',
-	'Core:SynchroAtt:reconciliation' => 'Afstem ?',
-	'Core:SynchroAtt:reconciliation+' => '',
-	'Core:SynchroAtt:update' => 'Opdater ?',
-	'Core:SynchroAtt:update+' => '',
-	'Core:SynchroAtt:update_policy' => 'Opdater Politik',
-	'Core:SynchroAtt:update_policy+' => '',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Afstemnings Nøgle',
-	'Core:SynchroAtt:reconciliation_attcode+' => '',
-	'Core:SyncDataExchangeComment' => '(Data Synchro)',
-	'Core:Synchro:ListOfDataSources' => 'Liste over data kilder:',
-	'Core:Synchro:LastSynchro' => 'Sidste synkronisering:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'Dette objekt er synkroniseret med en ekstern data kilde',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Objektet blev <b>oprettet</b> af den eksterne data kilde %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Objektet <b>kan slettes</b> af den eksterne data kilde %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Du <b>kan ikke slette dette objekt</b> fordi det er ejet af den eksterne data kilde %1$s',
-	'TitleSynchroExecution' => 'Udførelse af synkroniseringen',
-	'Class:SynchroDataSource:DataTable' => 'Database tabel: %1$s',
-	'Core:SyncDataSourceObsolete' => 'Data kilden er markeret som forældet. Handlingen afbrudt.',
-	'Core:SyncDataSourceAccessRestriction' => 'Kun adminstratorer eller brugere specificeret i data kilden kan udføre denne handling. Handlingen afbrudt.',
-	'Core:SyncTooManyMissingReplicas' => 'Alle records har været urørt i nogen tid (alle objekterne kan slettes). Venligst kontroller at processen som skriver i synkroniserings tabellen stadig kører. Handlingen afbrudtc.',
-	'Core:SyncSplitModeCLIOnly' => 'Synkroniseringen kan kun udføres i etapper hvis den udføres i CLI mode',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s fejl, %3$s advarsler.',
-	'Core:SynchroReplica:TargetObject' => 'Synkroniserede Objekter: %1$s',
-	'Class:AsyncSendEmail/Attribute:body' => 'Indhold',
-	'Class:AsyncSendEmail/Attribute:header' => 'Header',
-	'Core:ExecProcess:Code1' => 'Forkert kommando eller kommandoen afsluttede med fejl (f.eks. forkert script navn)',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
-	'Core:Duration_Seconds' => '%1$ds',
-	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
-	'Class:UserExternal' => 'Ekstern bruger',
-	'Class:UserExternal+' => '',
-	'Class:UserLDAP' => 'LDAP bruger',
-	'Class:UserLDAP+' => '',
-	'Class:UserLDAP/Attribute:password' => 'Password',
-	'Class:UserLDAP/Attribute:password+' => '',
-	'Class:UserLocal' => 'iTop bruger',
-	'Class:UserLocal+' => '',
-	'Class:UserLocal/Attribute:password' => 'Password',
-	'Class:UserLocal/Attribute:password+' => '',
-	'Attachments:TabTitle_Count' => 'Vedhæftninger (%1$d)',
-	'Attachments:EmptyTabTitle' => 'Vedhæftninger',
-	'Attachments:FieldsetTitle' => 'Vedhæftninger',
-	'Attachments:DeleteBtn' => 'Slet',
-	'Attachments:History_File_Added' => 'Vedhæftning %1$s tilføjet.',
-	'Attachments:History_File_Removed' => 'Vedhæftning %1$s fjernet.',
-	'Attachments:AddAttachment' => 'Tilføj vedhæftning: ',
-	'Attachments:UploadNotAllowedOnThisSystem' => 'Fil upload er IKKE tilladt på dette system.',
-	'Attachment:Max_Go' => '(Maks. fil størrelse: %1$s Go)',
-	'Attachment:Max_Mo' => '(Maks. fil størrelse: %1$s Mo)',
-	'Attachment:Max_Ko' => '(Maks. fil størrelse: %1$s Ko)',
-	'Attachments:NoAttachment' => 'Ingen vedhæftning.',
-	'Relation:impacts/Description' => 'Elementer påvirket af',
-	'Relation:impacts/DownStream' => 'Påvrikning...',
-	'Relation:impacts/UpStream' => 'Afhænger af...',
-	'Relation:depends on/Description' => 'Elementer dette element er afhængig af',
-	'Relation:depends on/DownStream' => 'Afhænger af...',
-	'Relation:depends on/UpStream' => 'Påvirker...',
-	'Class:Organization/Attribute:parent_name' => 'Parent navn',
-	'Class:Organization/Attribute:parent_name+' => '',
-	'Class:Organization/Attribute:deliverymodel_name' => 'Leverings model navn',
-	'Class:Organization/Attribute:deliverymodel_name+' => '',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
-	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
-	'Class:Location/Attribute:org_name' => 'Navn på ejer organisation',
-	'Class:Location/Attribute:org_name+' => '',
-	'Class:Contact' => 'Kontakt',
-	'Class:Contact+' => '',
-	'Class:Contact/Attribute:name' => 'Navn',
-	'Class:Contact/Attribute:name+' => '',
-	'Class:Contact/Attribute:status' => 'Status',
-	'Class:Contact/Attribute:status+' => '',
-	'Class:Contact/Attribute:status/Value:active' => 'Aktiv',
-	'Class:Contact/Attribute:status/Value:active+' => '',
-	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktiv',
-	'Class:Contact/Attribute:status/Value:inactive+' => '',
-	'Class:Contact/Attribute:org_id' => 'Organisation',
-	'Class:Contact/Attribute:org_id+' => '',
-	'Class:Contact/Attribute:org_name' => 'Organisation navn',
-	'Class:Contact/Attribute:org_name+' => '',
-	'Class:Contact/Attribute:email' => 'Email',
-	'Class:Contact/Attribute:email+' => '',
-	'Class:Contact/Attribute:phone' => 'Telefon',
-	'Class:Contact/Attribute:phone+' => '',
-	'Class:Contact/Attribute:notify' => 'Besked',
-	'Class:Contact/Attribute:notify+' => '',
-	'Class:Contact/Attribute:notify/Value:no' => 'nej',
-	'Class:Contact/Attribute:notify/Value:no+' => '',
-	'Class:Contact/Attribute:notify/Value:yes' => 'ja',
-	'Class:Contact/Attribute:notify/Value:yes+' => '',
-	'Class:Contact/Attribute:function' => 'Funktion',
-	'Class:Contact/Attribute:function+' => '',
-	'Class:Contact/Attribute:cis_list' => 'CIs',
-	'Class:Contact/Attribute:cis_list+' => '',
-	'Class:Contact/Attribute:finalclass' => 'Kontakt Type',
-	'Class:Contact/Attribute:finalclass+' => '',
-	'Class:Person/Attribute:name' => 'Efternavn',
-	'Class:Person/Attribute:name+' => '',
-	'Class:Person/Attribute:location_name' => 'Lokations navn',
-	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_name' => 'Manager navn',
-	'Class:Person/Attribute:manager_name+' => '',
-	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly navn',
-	'Class:Person/Attribute:manager_id_friendlyname+' => '',
-	'Class:Document' => 'Dokument',
-	'Class:Document+' => '',
-	'Class:Document/Attribute:name' => 'Navn',
-	'Class:Document/Attribute:name+' => '',
-	'Class:Document/Attribute:org_id' => 'Organisation',
-	'Class:Document/Attribute:org_id+' => '',
-	'Class:Document/Attribute:org_name' => 'Organisations navn',
-	'Class:Document/Attribute:org_name+' => '',
-	'Class:Document/Attribute:documenttype_id' => 'Dokument type',
-	'Class:Document/Attribute:documenttype_id+' => '',
-	'Class:Document/Attribute:documenttype_name' => 'Dokument type navn',
-	'Class:Document/Attribute:documenttype_name+' => '',
-	'Class:Document/Attribute:description' => 'Beskrivelse',
-	'Class:Document/Attribute:description+' => '',
-	'Class:Document/Attribute:status' => 'Status',
-	'Class:Document/Attribute:status+' => '',
-	'Class:Document/Attribute:status/Value:draft' => 'Udkast',
-	'Class:Document/Attribute:status/Value:draft+' => '',
-	'Class:Document/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:Document/Attribute:status/Value:obsolete+' => '',
-	'Class:Document/Attribute:status/Value:published' => 'Udgivet',
-	'Class:Document/Attribute:status/Value:published+' => '',
-	'Class:Document/Attribute:cis_list' => 'CIs',
-	'Class:Document/Attribute:cis_list+' => '',
-	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
-	'Class:Document/Attribute:contracts_list+' => '',
-	'Class:Document/Attribute:services_list' => 'Services',
-	'Class:Document/Attribute:services_list+' => '',
-	'Class:Document/Attribute:finalclass' => 'Dokument Type',
-	'Class:Document/Attribute:finalclass+' => '',
-	'Class:FunctionalCI' => 'Functional CI',
-	'Class:FunctionalCI+' => '',
-	'Class:FunctionalCI/Attribute:name' => 'Navn',
-	'Class:FunctionalCI/Attribute:name+' => '',
-	'Class:FunctionalCI/Attribute:description' => 'Beskrivelse',
-	'Class:FunctionalCI/Attribute:description+' => '',
-	'Class:FunctionalCI/Attribute:org_id' => 'Organisation',
-	'Class:FunctionalCI/Attribute:org_id+' => '',
-	'Class:FunctionalCI/Attribute:organization_name' => 'Organisations navn',
-	'Class:FunctionalCI/Attribute:organization_name+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity' => 'Forretnings kritiskhed',
-	'Class:FunctionalCI/Attribute:business_criticity+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'Høj',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'Lav',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => '',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'Medium',
-	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => '',
-	'Class:FunctionalCI/Attribute:move2production' => 'Flyttet til produktion dato',
-	'Class:FunctionalCI/Attribute:move2production+' => '',
-	'Class:FunctionalCI/Attribute:contacts_list' => 'Kontakter',
-	'Class:FunctionalCI/Attribute:contacts_list+' => '',
-	'Class:FunctionalCI/Attribute:documents_list' => 'Dokumenter',
-	'Class:FunctionalCI/Attribute:documents_list+' => '',
-	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applikations løsninger',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
-	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverandør kontrakter',
-	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
-	'Class:FunctionalCI/Attribute:services_list' => 'Services',
-	'Class:FunctionalCI/Attribute:services_list+' => '',
-	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
-	'Class:FunctionalCI/Attribute:softwares_list+' => '',
-	'Class:FunctionalCI/Attribute:tickets_list' => 'Billetter',
-	'Class:FunctionalCI/Attribute:tickets_list+' => '',
-	'Class:FunctionalCI/Attribute:finalclass' => 'CI Type',
-	'Class:FunctionalCI/Attribute:finalclass+' => '',
-	'Class:PhysicalDevice' => 'Fysiske Enheder',
-	'Class:PhysicalDevice+' => '',
-	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serie nummer',
-	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
-	'Class:PhysicalDevice/Attribute:location_id' => 'Lokation',
-	'Class:PhysicalDevice/Attribute:location_id+' => '',
-	'Class:PhysicalDevice/Attribute:location_name' => 'Lokations navn',
-	'Class:PhysicalDevice/Attribute:location_name+' => '',
-	'Class:PhysicalDevice/Attribute:status' => 'Status',
-	'Class:PhysicalDevice/Attribute:status+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Produktion',
-	'Class:PhysicalDevice/Attribute:status/Value:production+' => '',
-	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Lager',
-	'Class:PhysicalDevice/Attribute:status/Value:stock+' => '',
-	'Class:PhysicalDevice/Attribute:brand_id' => 'Mærke',
-	'Class:PhysicalDevice/Attribute:brand_id+' => '',
-	'Class:PhysicalDevice/Attribute:brand_name' => 'Mærke Navn',
-	'Class:PhysicalDevice/Attribute:brand_name+' => '',
-	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
-	'Class:PhysicalDevice/Attribute:model_id+' => '',
-	'Class:PhysicalDevice/Attribute:model_name' => 'Model navn',
-	'Class:PhysicalDevice/Attribute:model_name+' => '',
-	'Class:PhysicalDevice/Attribute:asset_number' => 'Aktiv nummer',
-	'Class:PhysicalDevice/Attribute:asset_number+' => '',
-	'Class:PhysicalDevice/Attribute:purchase_date' => 'Købs dato',
-	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
-	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Slut på Garanti',
-	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
-	'Class:TelephonyCI' => 'Telefoni CI',
-	'Class:TelephonyCI+' => '',
-	'Class:TelephonyCI/Attribute:phonenumber' => 'Telefon nummer',
-	'Class:TelephonyCI/Attribute:phonenumber+' => '',
-	'Class:ConnectableCI' => 'Connectable CI',
-	'Class:ConnectableCI+' => '',
-	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netværks enheder',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => '',
-	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netværks interfaces',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => '',
-	'Class:DatacenterDevice' => 'Datacenter Enhed',
-	'Class:DatacenterDevice+' => '',
-	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
-	'Class:DatacenterDevice/Attribute:rack_id+' => '',
-	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack navn',
-	'Class:DatacenterDevice/Attribute:rack_name+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure',
-	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
-	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure navn',
-	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
-	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack enheder',
-	'Class:DatacenterDevice/Attribute:nb_u+' => 'Antal units som enheden optager',
-	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip',
-	'Class:DatacenterDevice/Attribute:managementip+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_id' => 'Power kilde A',
-	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_name' => 'Power kilde A navn',
-	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_id' => 'Power kilde B',
-	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_name' => 'Power kilde B navn',
-	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC porte',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => '',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
-	'Class:DatacenterDevice/Attribute:san_list+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Netværks type navn',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version navn',
-	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
-	'Class:Server/Attribute:osfamily_name' => 'OS familie navn',
-	'Class:Server/Attribute:osfamily_name+' => '',
-	'Class:Server/Attribute:osversion_name' => 'OS version navn',
-	'Class:Server/Attribute:osversion_name+' => '',
-	'Class:Server/Attribute:oslicence_name' => 'OS licens navn',
-	'Class:Server/Attribute:oslicence_name+' => '',
-	'Class:PC/Attribute:osfamily_name' => 'OS familie navn',
-	'Class:PC/Attribute:osfamily_name+' => '',
-	'Class:PC/Attribute:osversion_name' => 'OS version navn',
-	'Class:PC/Attribute:osversion_name+' => '',
-	'Class:PowerConnection' => 'Power Connection',
-	'Class:PowerConnection+' => '',
-	'Class:PDU/Attribute:rack_name' => 'Rack navn',
-	'Class:PDU/Attribute:rack_name+' => '',
-	'Class:PDU/Attribute:powerstart_name' => 'Power start navn',
-	'Class:PDU/Attribute:powerstart_name+' => '',
-	'Class:Enclosure/Attribute:rack_name' => 'Rack navn',
-	'Class:Enclosure/Attribute:rack_name+' => '',
-	'Class:SoftwareInstance' => 'Software Instance',
-	'Class:SoftwareInstance+' => '',
-	'Class:SoftwareInstance/Attribute:system_id' => 'System',
-	'Class:SoftwareInstance/Attribute:system_id+' => '',
-	'Class:SoftwareInstance/Attribute:system_name' => 'System navn',
-	'Class:SoftwareInstance/Attribute:system_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
-	'Class:SoftwareInstance/Attribute:software_id+' => '',
-	'Class:SoftwareInstance/Attribute:software_name' => 'Software navn',
-	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licens',
-	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licens navn',
-	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
-	'Class:SoftwareInstance/Attribute:path' => 'Sti',
-	'Class:SoftwareInstance/Attribute:path+' => '',
-	'Class:SoftwareInstance/Attribute:status' => 'Status',
-	'Class:SoftwareInstance/Attribute:status+' => '',
-	'Class:SoftwareInstance/Attribute:status/Value:active' => 'aktiv',
-	'Class:SoftwareInstance/Attribute:status/Value:active+' => '',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inaktiv',
-	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware navn',
-	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server navn',
-	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
-	'Class:WebApplication/Attribute:webserver_name' => 'Web server navn',
-	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:VirtualDevice' => 'Virtuel Enhed',
-	'Class:VirtualDevice+' => '',
-	'Class:VirtualDevice/Attribute:status' => 'Status',
-	'Class:VirtualDevice/Attribute:status+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:VirtualDevice/Attribute:status/Value:implementation+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:production' => 'Produktion',
-	'Class:VirtualDevice/Attribute:status/Value:production+' => '',
-	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Lager',
-	'Class:VirtualDevice/Attribute:status/Value:stock+' => '',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => '',
-	'Class:VirtualHost' => 'Virtual Host',
-	'Class:VirtualHost+' => '',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtuelle maskiner',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => '',
-	'Class:Hypervisor/Attribute:farm_name' => 'Farm navn',
-	'Class:Hypervisor/Attribute:farm_name+' => '',
-	'Class:Hypervisor/Attribute:server_name' => 'Server navn',
-	'Class:Hypervisor/Attribute:server_name+' => '',
-	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host navn',
-	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS familie navn',
-	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
-	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version navn',
-	'Class:VirtualMachine/Attribute:osversion_name+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licens navn',
-	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system navn',
-	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
-	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume navn',
-	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
-	'Class:lnkServerToVolume/Attribute:server_name' => 'Server navn',
-	'Class:lnkServerToVolume/Attribute:server_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume navn',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtuel enhed navn',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch navn',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Enhed navn',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
-	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library navn',
-	'Class:Tape/Attribute:tapelibrary_name+' => '',
-	'Class:NASFileSystem/Attribute:nas_name' => 'NAS navn',
-	'Class:NASFileSystem/Attribute:nas_name+' => '',
-	'Class:Patch' => 'Patch',
-	'Class:Patch+' => '',
-	'Class:Patch/Attribute:name' => 'Navn',
-	'Class:Patch/Attribute:name+' => '',
-	'Class:Patch/Attribute:documents_list' => 'Dokumenter',
-	'Class:Patch/Attribute:documents_list+' => '',
-	'Class:Patch/Attribute:description' => 'Beskrivelse',
-	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => 'Type',
-	'Class:Patch/Attribute:finalclass+' => '',
-	'Class:OSPatch/Attribute:osversion_name' => 'OS version navn',
-	'Class:OSPatch/Attribute:osversion_name+' => '',
-	'Class:SoftwarePatch/Attribute:software_name' => 'Software navn',
-	'Class:SoftwarePatch/Attribute:software_name+' => '',
-	'Class:Licence' => 'Licens',
-	'Class:Licence+' => '',
-	'Class:Licence/Attribute:name' => 'Navn',
-	'Class:Licence/Attribute:name+' => '',
-	'Class:Licence/Attribute:documents_list' => 'Dokumenter',
-	'Class:Licence/Attribute:documents_list+' => '',
-	'Class:Licence/Attribute:org_id' => 'Organisation',
-	'Class:Licence/Attribute:org_id+' => '',
-	'Class:Licence/Attribute:organization_name' => 'Organisation navn',
-	'Class:Licence/Attribute:organization_name+' => '',
-	'Class:Licence/Attribute:usage_limit' => 'Forbrugs grænse',
-	'Class:Licence/Attribute:usage_limit+' => '',
-	'Class:Licence/Attribute:description' => 'Beskrivelse',
-	'Class:Licence/Attribute:description+' => '',
-	'Class:Licence/Attribute:start_date' => 'Start dato',
-	'Class:Licence/Attribute:start_date+' => '',
-	'Class:Licence/Attribute:end_date' => 'Slut dato',
-	'Class:Licence/Attribute:end_date+' => '',
-	'Class:Licence/Attribute:licence_key' => 'Nøgle',
-	'Class:Licence/Attribute:licence_key+' => 'Licens nøgle',
-	'Class:Licence/Attribute:perpetual' => 'Fortløbende',
-	'Class:Licence/Attribute:perpetual+' => '',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'nej',
-	'Class:Licence/Attribute:perpetual/Value:no+' => '',
-	'Class:Licence/Attribute:perpetual/Value:yes' => 'ja',
-	'Class:Licence/Attribute:perpetual/Value:yes+' => '',
-	'Class:Licence/Attribute:finalclass' => 'Type',
-	'Class:Licence/Attribute:finalclass+' => '',
-	'Class:OSLicence/Attribute:osversion_name' => 'OS version navn',
-	'Class:OSLicence/Attribute:osversion_name+' => '',
-	'Class:SoftwareLicence/Attribute:software_name' => 'Software navn',
-	'Class:SoftwareLicence/Attribute:software_name+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licens navn',
-	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
-	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Dokument navn',
-	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
-	'Class:Typology' => 'Typologi',
-	'Class:Typology+' => '',
-	'Class:Typology/Attribute:name' => 'Navn',
-	'Class:Typology/Attribute:name+' => '',
-	'Class:Typology/Attribute:finalclass' => 'Type',
-	'Class:Typology/Attribute:finalclass+' => '',
-	'Class:OSVersion/Attribute:osfamily_name' => 'OS familie navn',
-	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:Model/Attribute:brand_name' => 'Mærke navn',
-	'Class:Model/Attribute:brand_name+' => '',
-	'Class:IOSVersion/Attribute:brand_name' => 'Mærke navn',
-	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch navn',
-	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
-	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Dokument navn',
-	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch navn',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance navn',
-	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch navn',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software navn',
-	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
-	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Dokument navn',
-	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Dokument navn',
-	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
-	'Class:Subnet/Attribute:org_name' => 'Navn',
-	'Class:Subnet/Attribute:org_name+' => '',
-	'Class:NetworkInterface' => 'Netværks Interface',
-	'Class:NetworkInterface+' => '',
-	'Class:NetworkInterface/Attribute:name' => 'Navn',
-	'Class:NetworkInterface/Attribute:name+' => '',
-	'Class:NetworkInterface/Attribute:finalclass' => 'Type',
-	'Class:NetworkInterface/Attribute:finalclass+' => '',
-	'Class:IPInterface' => 'IP Interface',
-	'Class:IPInterface+' => '',
-	'Class:IPInterface/Attribute:ipaddress' => 'IP adresse',
-	'Class:IPInterface/Attribute:ipaddress+' => '',
-	'Class:IPInterface/Attribute:macaddress' => 'MAC adresse',
-	'Class:IPInterface/Attribute:macaddress+' => '',
-	'Class:IPInterface/Attribute:comment' => 'Kommentar',
-	'Class:IPInterface/Attribute:coment+' => '',
-	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway',
-	'Class:IPInterface/Attribute:ipgateway+' => '',
-	'Class:IPInterface/Attribute:ipmask' => 'IP maske',
-	'Class:IPInterface/Attribute:ipmask+' => '',
-	'Class:IPInterface/Attribute:speed' => 'Hastighed',
-	'Class:IPInterface/Attribute:speed+' => '',
-	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Enheds navn',
-	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtuel maskine navn',
-	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Enheds navn',
-	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Netværks enheds navn',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Forbundet enheds navn',
-	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Applikations løsnings navn',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
-	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Forretnings proces navn',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Applikations løsnings navn',
-	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team navn',
-	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person navn',
-	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
-	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rolle navn',
-	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
-	'Class:Group/Attribute:owner_name' => 'Navn',
-	'Class:Group/Attribute:owner_name+' => '',
-	'Class:Group/Attribute:parent_name' => 'Navn',
-	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Gruppe',
-	'Class:Group/Attribute:parent_id_friendlyname+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => 'Navn',
-	'Class:lnkGroupToCI/Attribute:group_name+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => 'Navn',
-	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
-	'Menu:Catalogs' => 'Kataloger',
-	'Menu:Catalogs+' => '',
-	'Menu:Audit' => 'Audit',
-	'Menu:Audit+' => '',
-	'Menu:Organization' => 'Organisationer',
-	'Menu:Organization+' => '',
-	'Menu:Application' => 'Applikationer',
-	'Menu:Application+' => '',
-	'Menu:DBServer' => 'Database servere',
-	'Menu:DBServer+' => '',
-	'Menu:ConfigManagement' => 'Konfigurations Management',
-	'Menu:ConfigManagement+' => '',
-	'Menu:ConfigManagementOverview' => 'Overblik',
-	'Menu:ConfigManagementOverview+' => '',
-	'Menu:Contact' => 'Kontakter',
-	'Menu:Contact+' => '',
-	'Menu:Contact:Count' => '%1$d kontakter',
-	'Menu:Person' => 'Personer',
-	'Menu:Person+' => '',
-	'Menu:Team' => 'Teams',
-	'Menu:Team+' => '',
-	'Menu:Document' => 'Dokumenter',
-	'Menu:Document+' => '',
-	'Menu:Location' => 'Lokationer',
-	'Menu:Location+' => '',
-	'Menu:ConfigManagementCI' => 'Konfigurations emner',
-	'Menu:ConfigManagementCI+' => '',
-	'Menu:BusinessProcess' => 'Forretnings processer',
-	'Menu:BusinessProcess+' => '',
-	'Menu:ApplicationSolution' => 'Applikations løsninger',
-	'Menu:ApplicationSolution+' => '',
-	'Menu:ConfigManagementSoftware' => 'Applikations management',
-	'Menu:Licence' => 'Licenser',
-	'Menu:Licence+' => '',
-	'Menu:Patch' => 'Patches',
-	'Menu:Patch+' => '',
-	'Menu:ApplicationInstance' => 'Installeret software',
-	'Menu:ApplicationInstance+' => '',
-	'Menu:ConfigManagementHardware' => 'Infrastruktur management',
-	'Menu:Subnet' => 'Subnets',
-	'Menu:Subnet+' => '',
-	'Menu:NetworkDevice' => 'Netværks enheder',
-	'Menu:NetworkDevice+' => '',
-	'Menu:Server' => 'Servere',
-	'Menu:Server+' => '',
-	'Menu:Printer' => 'Printere',
-	'Menu:Printer+' => '',
-	'Menu:MobilePhone' => 'Mobil telefoner',
-	'Menu:MobilePhone+' => '',
-	'Menu:PC' => 'Personlige computere',
-	'Menu:PC+' => '',
-	'Menu:NewContact' => 'Ny kontakt',
-	'Menu:NewContact+' => '',
-	'Menu:SearchContacts' => 'Søg efter kontakt',
-	'Menu:SearchContacts+' => '',
-	'Menu:NewCI' => 'Ny CI',
-	'Menu:NewCI+' => '',
-	'Menu:SearchCIs' => 'Søg efter CIs',
-	'Menu:SearchCIs+' => '',
-	'Menu:ConfigManagement:Devices' => 'Enheder',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastruktur',
-	'Menu:ConfigManagement:virtualization' => 'Virtualization',
-	'Menu:ConfigManagement:EndUsers' => 'Slut bruger enheder',
-	'Menu:ConfigManagement:SWAndApps' => 'Software og applikationer',
-	'Menu:ConfigManagement:Misc' => 'Forskelligt',
-	'Menu:Group' => 'Gruppe af CIs',
-	'Menu:Group+' => '',
-	'Menu:ConfigManagement:Shortcuts' => 'Genveje',
-	'Menu:ConfigManagement:AllContacts' => 'Alle kontakter: %1$d',
-	'Menu:Typology' => 'Typologi konfiguration',
-	'Menu:Typology+' => '',
-	'Menu:OSVersion' => 'OS versioner',
-	'Menu:OSVersion+' => '',
-	'Menu:Software' => 'Software katalog',
-	'Menu:Software+' => '',
-	'UI_WelcomeMenu_AllConfigItems' => 'Sammenfatning',
-	'Menu:ConfigManagement:Typology' => 'Typologi konfiguration',
-	'Server:baseinfo' => 'Generelle informationer',
-	'Server:Date' => 'Dato',
-	'Server:moreinfo' => 'Mere information',
-	'Server:otherinfo' => 'Andre informationer',
-	'Person:info' => 'Generelle informationer',
-	'Person:notifiy' => 'Underretning',
-	'Class:Subnet/Tab:IPUsage' => 'IP Brug',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces der har en IP i området: <em>%1$s</em> til <em>%2$s</em>',
-	'Class:Subnet/Tab:FreeIPs' => 'Ledige IP',
-	'Class:Subnet/Tab:FreeIPs-count' => 'Ledige IP: %1$s',
-	'Class:Subnet/Tab:FreeIPs-explain' => 'Her er et udtræk af 10 ledige IP adresser',
-	'Menu:ServiceManagement' => 'Service Management',
-	'Menu:ServiceManagement+' => '',
-	'Menu:Service:Overview' => 'Overblik',
-	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Kontrakter efter service level',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Kontrakter efter status',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Kontrakter som udløber om mindre end 30 dage',
-	'Menu:ProviderContract' => 'Leverandør kontrakter',
-	'Menu:ProviderContract+' => '',
-	'Menu:CustomerContract' => 'Kunde kontrakter',
-	'Menu:CustomerContract+' => '',
-	'Menu:ServiceSubcategory' => 'Service subkategorier',
-	'Menu:ServiceSubcategory+' => '',
-	'Menu:Service' => 'Services',
-	'Menu:Service+' => '',
-	'Menu:ServiceElement' => 'Sevice elementer',
-	'Menu:ServiceElement+' => '',
-	'Menu:SLA' => 'SLAer',
-	'Menu:SLA+' => '',
-	'Menu:SLT' => 'SLTer',
-	'Menu:SLT+' => '',
-	'Menu:DeliveryModel' => 'Leverings modeller',
-	'Menu:DeliveryModel+' => '',
-	'Menu:ServiceFamily' => 'Service familier',
-	'Menu:ServiceFamily+' => '',
-	'Menu:Procedure' => 'Procedure katalog',
-	'Menu:Procedure+' => '',
-	'Class:Contract' => 'Kontrakt',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => 'Navn',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => 'Kunde',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => 'Kunde navn',
-	'Class:Contract/Attribute:organization_name+' => '',
-	'Class:Contract/Attribute:contacts_list' => 'Kontakter',
-	'Class:Contract/Attribute:contacts_list+' => '',
-	'Class:Contract/Attribute:documents_list' => 'Dokumenter',
-	'Class:Contract/Attribute:documents_list+' => '',
-	'Class:Contract/Attribute:description' => 'Beskrivelse',
-	'Class:Contract/Attribute:description+' => '',
-	'Class:Contract/Attribute:start_date' => 'Start dato',
-	'Class:Contract/Attribute:start_date+' => '',
-	'Class:Contract/Attribute:end_date' => 'Slut dato',
-	'Class:Contract/Attribute:end_date+' => '',
-	'Class:Contract/Attribute:cost' => 'Omkostning',
-	'Class:Contract/Attribute:cost+' => '',
-	'Class:Contract/Attribute:cost_currency' => 'Omkostnings valuta',
-	'Class:Contract/Attribute:cost_currency+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
-	'Class:Contract/Attribute:cost_currency/Value:kroner' => 'Danske kroner',
-	'Class:Contract/Attribute:cost_currency/Value:kroner+' => '',
-	'Class:Contract/Attribute:contracttype_id' => 'Kontrakt type',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => 'Kontrakt type navn',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => 'Fakturerings frekvens',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => 'Omkostnings enhed',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'Leverandør',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'Leverandør navn',
-	'Class:Contract/Attribute:provider_name+' => '',
-	'Class:Contract/Attribute:status' => 'Status',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => 'Implementering',
-	'Class:Contract/Attribute:status/Value:implementation+' => '',
-	'Class:Contract/Attribute:status/Value:obsolete' => 'Forældet',
-	'Class:Contract/Attribute:status/Value:obsolete+' => '',
-	'Class:Contract/Attribute:status/Value:production' => 'Produktion',
-	'Class:Contract/Attribute:status/Value:production+' => '',
-	'Class:Contract/Attribute:finalclass' => 'Type',
-	'Class:Contract/Attribute:finalclass+' => '',
-	'Class:ProviderContract/Attribute:contracttype_id' => 'Kontrakt type',
-	'Class:ProviderContract/Attribute:contracttype_id+' => '',
-	'Class:ProviderContract/Attribute:contracttype_name' => 'Kontrakt type navn',
-	'Class:ProviderContract/Attribute:contracttype_name+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => 'Kontrakt navn',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => 'Kontrakt navn',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => 'Dokument navn',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-	'Class:Service/Attribute:organization_name' => 'Leverandør navn',
-	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:servicefamily_name' => 'Service Familie navn',
-	'Class:Service/Attribute:servicefamily_name+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'Service navn',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => 'Dokument navn',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'Service navn',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'Service navn',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:SLA/Attribute:organization_name' => 'Leverandør navn',
-	'Class:SLA/Attribute:organization_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA navn',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT navn',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Kunde kontrakt navn',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service navn',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA navn',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service navn',
-	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service navn',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => 'Organisations navn',
-	'Class:DeliveryModel/Attribute:organization_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Leverings model navn',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Kontakt navn',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Rolle navn',
-	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
-	'Class:Ticket/Attribute:org_name' => 'Organisation navn',
-	'Class:Ticket/Attribute:org_name+' => '',
-	'Class:Ticket/Attribute:caller_name' => 'Rekvirent navn',
-	'Class:Ticket/Attribute:caller_name+' => '',
-	'Class:Ticket/Attribute:team_name' => 'Team navn',
-	'Class:Ticket/Attribute:team_name+' => '',
-	'Class:Ticket/Attribute:agent_name' => 'Agent navn',
-	'Class:Ticket/Attribute:agent_name+' => '',
-	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkContactToTicket/Attribute:contact_email' => 'Kontakt Email',
-	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI navn',
-	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
-	'Class:WorkOrder/Attribute:ticket_ref' => 'Billet ref',
-	'Class:WorkOrder/Attribute:ticket_ref+' => '',
-	'Class:WorkOrder/Attribute:team_name' => 'Team navn',
-	'Class:WorkOrder/Attribute:team_name+' => '',
-	'Class:WorkOrder/Attribute:agent_email' => 'Agent email',
-	'Class:WorkOrder/Attribute:agent_email+' => '',
-	'Ticket:baseinfo' => 'Generel Information',
-	'Ticket:date' => 'Datoer',
-	'Ticket:contact' => 'Kontakter',
-	'Ticket:moreinfo' => 'Mere Information',
-	'Ticket:relation' => 'Relationer',
-	'Ticket:log' => 'Kommunikation',
-	'Ticket:Type' => 'Kvalifikationer',
-	'Ticket:support' => 'Support',
-	'Ticket:resolution' => 'Løsning',
-	'Ticket:SLA' => 'SLA rapport',
-	'WorkOrder:Details' => 'Detaljer',
-	'WorkOrder:Moreinfo' => 'Flere informationer',
-	'Menu:ChangeManagement' => 'Change management',
-	'Menu:Change:Overview' => 'Overblik',
-	'Menu:Change:Overview+' => '',
-	'Menu:NewChange' => 'Ny change',
-	'Menu:NewChange+' => '',
-	'Menu:SearchChanges' => 'Søg efter changes',
-	'Menu:SearchChanges+' => '',
-	'Menu:Change:Shortcuts' => 'Genveje',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => 'Changes der afventer accept',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => 'Changes der afventer godkendelse',
-	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => 'Åbne changes',
-	'Menu:Changes+' => '',
-	'Menu:MyChanges' => 'Changes tildelt til mig',
-	'Menu:MyChanges+' => '',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes efter kategori for de sidste 7 dage',
-	'UI-ChangeManagementOverview-Last-7-days' => 'Antal af changes de sidste 7 dage',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes efter domain de sidste 7 dage',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes efter status de sidste 7 dage',
-	'Class:Change/Attribute:changemanager_email' => 'Change manager email',
-	'Class:Change/Attribute:changemanager_email+' => '',
-	'Class:Change/Attribute:parent_name' => 'Parent change ref',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:related_incident_list' => 'Relaterede incidents',
-	'Class:Change/Attribute:related_incident_list+' => '',
-	'Class:Change/Attribute:related_problems_list' => 'Relaterede problemer',
-	'Class:Change/Attribute:related_problems_list+' => '',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent change friendly name',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Menu:RequestManagement' => 'Helpdesk',
-	'Menu:RequestManagement+' => '',
-	'Menu:RequestManagementProvider' => 'Helpdesk leverandør',
-	'Menu:RequestManagementProvider+' => '',
-	'Menu:UserRequest:Provider' => 'Åbne anmodninger overført til leverandør',
-	'Menu:UserRequest:Provider+' => '',
-	'Menu:UserRequest:Overview' => 'Overblik',
-	'Menu:UserRequest:Overview+' => '',
-	'Menu:NewUserRequest' => 'Ny bruger anmodning',
-	'Menu:NewUserRequest+' => '',
-	'Menu:SearchUserRequests' => 'Søg efter bruger anmodninger',
-	'Menu:SearchUserRequests+' => '',
-	'Menu:UserRequest:Shortcuts' => 'Genveje',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Anmodninger tildelt til mig',
-	'Menu:UserRequest:MyRequests+' => '',
-	'Menu:UserRequest:MySupportRequests' => 'Mine support kald',
-	'Menu:UserRequest:MySupportRequests+' => '',
-	'Menu:UserRequest:EscalatedRequests' => 'Hot anmodninger',
-	'Menu:UserRequest:EscalatedRequests+' => '',
-	'Menu:UserRequest:OpenRequests' => 'Alle åbne anmodninger',
-	'Menu:UserRequest:OpenRequests+' => '',
-	'UI:WelcomeMenu:MyAssignedCalls' => 'Anmodninger tildelt til mig',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Anmodninger de sidste 14 dage (efter type)',
-	'UI-RequestManagementOverview-Last-14-days' => 'Anmodninger de sidste 14 dage (per dag)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Åbne anmodninger efter status',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Åbne anmodninger efter agent',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Åbne anmodninger efter type',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Åbne anmodninger efter organisation',
-	'Class:UserRequest:KnownErrorList' => 'Kendte Fejl (Known Errors)',
-	'Menu:UserRequest:MyWorkOrders' => 'Arbejds ordrer tildelt til mig',
-	'Menu:UserRequest:MyWorkOrders+' => '',
-	'Class:Problem:KnownProblemList' => 'Kendte problemer (Known problems)',
-	'Class:UserRequest/Attribute:approver_email' => 'Godkender Email',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'Service navn',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Service subkategori navn',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref anmodning',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => 'Parent problem',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-	'Portal:TitleDetailsFor_Request' => 'Detaljer for anmodning',
-	'Portal:ButtonUpdate' => 'Opdater',
-	'Portal:ButtonClose' => 'Luk',
-	'Portal:ButtonReopen' => 'Genåben',
-	'Portal:ShowServices' => 'Service katalog',
-	'Portal:SelectRequestType' => 'Vælg en type af anmodning',
-	'Portal:SelectServiceElementFrom_Service' => 'Vælg et service element for %1$s',
-	'Portal:SelectRequestTemplate' => 'Vælg en skabelon for %1$s',
-	'Portal:ListServices' => 'Liste af services',
-	'Portal:TitleDetailsFor_Service' => 'Detaljer for Service',
-	'Portal:Button:CreateRequestFromService' => 'Opret en anmodning for denne service',
-	'Portal:ListOpenRequests' => 'Vis åbne anmodninger',
-	'Portal:UserRequest:MoreInfo' => 'Mere information',
-	'Portal:Details-Service-Element' => 'Service elementer',
-	'Portal:NoClosedTicket' => 'Ingen lukkede anmodninger',
-	'Portal:NoService' => 'Ingen service',
-	'Portal:ListOpenProblems' => 'Vis åbne problemer',
-	'Portal:ShowProblem' => 'Problemer',
-	'Portal:ShowFaqs' => 'FAQs',
-	'Portal:NoOpenProblem' => 'Ingen åbne problemer',
-	'Portal:SelectLanguage' => 'Skift sprog',
-	'Portal:LanguageChangedTo_Lang' => 'Sprog ændret til',
-	'Portal:ChooseYourFavoriteLanguage' => 'Vælg favorit sprog',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
-));
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @author Erik Bøg <erik@boegmoeller.dk>
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:ActionEmail' => 'Email besked',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Test modtager',
+	'Class:ActionEmail/Attribute:test_recipient+' => '',
+	'Class:ActionEmail/Attribute:from' => 'Fra',
+	'Class:ActionEmail/Attribute:from+' => 'Afsender af emailen',
+	'Class:ActionEmail/Attribute:reply_to' => 'Svar til',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Svar sendes til',
+	'Class:ActionEmail/Attribute:to' => 'Til',
+	'Class:ActionEmail/Attribute:to+' => 'Modtager af emailen',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Kopi sendes til',
+	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc+' => 'Blind kopi sendes til',
+	'Class:ActionEmail/Attribute:subject' => 'Emne',
+	'Class:ActionEmail/Attribute:subject+' => 'Tekst i emne feltet',
+	'Class:ActionEmail/Attribute:body' => 'Indhold',
+	'Class:ActionEmail/Attribute:body+' => 'Tekst delen af emailen',
+	'Class:ActionEmail/Attribute:importance' => 'Vigtighed',
+	'Class:ActionEmail/Attribute:importance+' => 'Hvilken prioritet skal emailen sendes med',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'Høj',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'Lav',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normal',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
+	'Class:TriggerOnPortalUpdate' => 'Trigger (Når opdateret fra portalen)',
+	'Class:TriggerOnPortalUpdate+' => '',
+	'Class:TriggerOnStateEnter' => 'Trigger (ved indtræden i en tilstand)',
+	'Class:TriggerOnStateEnter+' => '',
+	'Class:TriggerOnStateLeave' => 'Trigger (når en tilstand forlades)',
+	'Class:TriggerOnStateLeave+' => '',
+	'Class:TriggerOnObjectCreate' => 'Trigger (ved oprettelse af objekt)',
+	'Class:TriggerOnObjectCreate+' => '',
+	'Class:lnkTriggerAction' => 'Handling/Trigger',
+	'Class:lnkTriggerAction+' => '',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Handling',
+	'Class:lnkTriggerAction/Attribute:action_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Rækkefølge',
+	'Class:lnkTriggerAction/Attribute:order+' => '',
+	'Class:TriggerOnThresholdReached' => 'Trigger (grænseværdi)',
+	'Class:TriggerOnThresholdReached+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stopur',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Grænse',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
+	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => 'Virtual device',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => 'Størrelse brugt',
+	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
+	'Class:Organization' => 'Organisation',
+	'Class:Organization+' => '',
+	'Class:Organization/Attribute:name' => 'Navn',
+	'Class:Organization/Attribute:name+' => '',
+	'Class:Organization/Attribute:code' => 'Kode',
+	'Class:Organization/Attribute:code+' => '',
+	'Class:Organization/Attribute:status' => 'Status',
+	'Class:Organization/Attribute:status+' => '',
+	'Class:Organization/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Organization/Attribute:status/Value:active+' => '',
+	'Class:Organization/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Organization/Attribute:status/Value:inactive+' => '',
+	'Class:Organization/Attribute:parent_id' => 'Forælder',
+	'Class:Organization/Attribute:parent_id+' => '',
+	'Class:Organization/Attribute:deliverymodel_id' => 'Leverings model',
+	'Class:Organization/Attribute:deliverymodel_id+' => '',
+	'Class:Location' => 'Lokation',
+	'Class:Location+' => '',
+	'Class:Location/Attribute:name' => 'Navn',
+	'Class:Location/Attribute:name+' => '',
+	'Class:Location/Attribute:status' => 'Status',
+	'Class:Location/Attribute:status+' => '',
+	'Class:Location/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Location/Attribute:status/Value:active+' => '',
+	'Class:Location/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Location/Attribute:status/Value:inactive+' => '',
+	'Class:Location/Attribute:org_id' => 'Ejer organisation',
+	'Class:Location/Attribute:org_id+' => '',
+	'Class:Location/Attribute:address' => 'Adresse',
+	'Class:Location/Attribute:address+' => '',
+	'Class:Location/Attribute:postal_code' => 'Postnummer',
+	'Class:Location/Attribute:postal_code+' => '',
+	'Class:Location/Attribute:city' => 'By',
+	'Class:Location/Attribute:city+' => '',
+	'Class:Location/Attribute:country' => 'Land',
+	'Class:Location/Attribute:country+' => '',
+	'Class:Location/Attribute:physicaldevice_list' => 'Enheder',
+	'Class:Location/Attribute:physicaldevice_list+' => '',
+	'Class:Location/Attribute:person_list' => 'Kontakter',
+	'Class:Location/Attribute:person_list+' => '',
+	'Class:Person' => 'Person',
+	'Class:Person+' => '',
+	'Class:Person/Attribute:first_name' => 'Fornavn',
+	'Class:Person/Attribute:first_name+' => '',
+	'Class:Person/Attribute:employee_number' => 'Medarbejdernummer',
+	'Class:Person/Attribute:employee_number+' => '',
+	'Class:Person/Attribute:mobile_phone' => 'Mobiltelefon',
+	'Class:Person/Attribute:mobile_phone+' => '',
+	'Class:Person/Attribute:location_id' => 'Lokation',
+	'Class:Person/Attribute:location_id+' => '',
+	'Class:Person/Attribute:manager_id' => 'Manager',
+	'Class:Person/Attribute:manager_id+' => '',
+	'Class:Person/Attribute:team_list' => 'Teams',
+	'Class:Person/Attribute:team_list+' => '',
+	'Class:Person/Attribute:tickets_list' => 'Tickets',
+	'Class:Person/Attribute:tickets_list+' => '',
+	'Class:Team' => 'Team',
+	'Class:Team+' => '',
+	'Class:Team/Attribute:persons_list' => 'Medlemmer',
+	'Class:Team/Attribute:persons_list+' => '',
+	'Class:Team/Attribute:tickets_list' => 'Tickets',
+	'Class:Team/Attribute:tickets_list+' => '',
+	'Class:DocumentFile' => 'Dokument Fil',
+	'Class:DocumentFile+' => '',
+	'Class:DocumentFile/Attribute:file' => 'Fil',
+	'Class:DocumentFile/Attribute:file+' => '',
+	'Class:DocumentNote' => 'Dokument Note',
+	'Class:DocumentNote+' => '',
+	'Class:DocumentNote/Attribute:text' => 'Tekst',
+	'Class:DocumentNote/Attribute:text+' => '',
+	'Class:DocumentWeb' => 'Dokument Web',
+	'Class:DocumentWeb+' => '',
+	'Class:DocumentWeb/Attribute:url' => 'URL',
+	'Class:DocumentWeb/Attribute:url+' => '',
+	'Class:NetworkDevice' => 'Netværks-enhed',
+	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Netværks-type',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Enhed(er)',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => '',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS version',
+	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
+	'Class:NetworkDevice/Attribute:ram' => 'RAM',
+	'Class:NetworkDevice/Attribute:ram+' => '',
+	'Class:Server' => 'Server',
+	'Class:Server+' => '',
+	'Class:Server/Attribute:osfamily_id' => 'OS familie',
+	'Class:Server/Attribute:osfamily_id+' => '',
+	'Class:Server/Attribute:osversion_id' => 'OS version',
+	'Class:Server/Attribute:osversion_id+' => '',
+	'Class:Server/Attribute:oslicence_id' => 'OS licens',
+	'Class:Server/Attribute:oslicence_id+' => '',
+	'Class:Server/Attribute:cpu' => 'CPU',
+	'Class:Server/Attribute:cpu+' => '',
+	'Class:Server/Attribute:ram' => 'RAM',
+	'Class:Server/Attribute:ram+' => '',
+	'Class:Server/Attribute:logicalvolumes_list' => 'Logical volumes',
+	'Class:Server/Attribute:logicalvolumes_list+' => '',
+	'Class:ApplicationSolution' => 'Applikations Løsninger',
+	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => '',
+	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Forretningsprocesser',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => '',
+	'Class:ApplicationSolution/Attribute:status' => 'Status',
+	'Class:ApplicationSolution/Attribute:status+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktiv',
+	'Class:ApplicationSolution/Attribute:status/Value:active+' => '',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => '',
+	'Class:BusinessProcess' => 'Forretnings proces',
+	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Applikations løsning(er)',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => '',
+	'Class:BusinessProcess/Attribute:status' => 'Status',
+	'Class:BusinessProcess/Attribute:status+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktiv',
+	'Class:BusinessProcess/Attribute:status/Value:active+' => '',
+	'Class:BusinessProcess/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:BusinessProcess/Attribute:status/Value:inactive+' => '',
+	'Class:Middleware' => 'Middleware',
+	'Class:Middleware+' => '',
+	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instancer',
+	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Liset over Middleware instancer',
+	'Class:DBServer' => 'DB Server',
+	'Class:DBServer+' => '',
+	'Class:DBServer/Attribute:dbschema_list' => 'DB schema(er)',
+	'Class:DBServer/Attribute:dbschema_list+' => '',
+	'Class:WebServer' => 'Web server',
+	'Class:WebServer+' => '',
+	'Class:WebServer/Attribute:webapp_list' => 'Web applikationer',
+	'Class:WebServer/Attribute:webapp_list+' => '',
+	'Class:PCSoftware' => 'PC Software',
+	'Class:PCSoftware+' => '',
+	'Class:OtherSoftware' => 'Andet Software',
+	'Class:OtherSoftware+' => '',
+	'Class:MiddlewareInstance' => 'Middleware Instance',
+	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
+	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
+	'Class:DatabaseSchema' => 'Database Schema',
+	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
+	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
+	'Class:WebApplication' => 'Web Applikation',
+	'Class:WebApplication+' => '',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
+	'Class:WebApplication/Attribute:webserver_id+' => '',
+	'Class:WebApplication/Attribute:url' => 'URL',
+	'Class:WebApplication/Attribute:url+' => '',
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/Attribute:name' => 'Navn',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'Sælger',
+	'Class:Software/Attribute:vendor+' => '',
+	'Class:Software/Attribute:version' => 'Version',
+	'Class:Software/Attribute:version+' => '',
+	'Class:Software/Attribute:documents_list' => 'Dokumenter',
+	'Class:Software/Attribute:documents_list+' => '',
+	'Class:Software/Attribute:type' => 'Type',
+	'Class:Software/Attribute:type+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
+	'Class:Software/Attribute:type/Value:DBServer+' => '',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => '',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Andet Software',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => '',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => '',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
+	'Class:Software/Attribute:type/Value:WebServer+' => '',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instancer',
+	'Class:Software/Attribute:softwareinstance_list+' => '',
+	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
+	'Class:Software/Attribute:softwarepatch_list+' => '',
+	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenser',
+	'Class:Software/Attribute:softwarelicence_list+' => '',
+	'Class:OSPatch' => 'OS Patch',
+	'Class:OSPatch+' => '',
+	'Class:OSPatch/Attribute:functionalcis_list' => 'Enheder',
+	'Class:OSPatch/Attribute:functionalcis_list+' => '',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS version',
+	'Class:OSPatch/Attribute:osversion_id+' => '',
+	'Class:SoftwarePatch' => 'Software Patch',
+	'Class:SoftwarePatch+' => '',
+	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
+	'Class:SoftwarePatch/Attribute:software_id+' => '',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Software instancer',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => '',
+	'Class:OSLicence' => 'OS Licenser',
+	'Class:OSLicence+' => '',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS version',
+	'Class:OSLicence/Attribute:osversion_id+' => '',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuelle maskiner',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => '',
+	'Class:OSLicence/Attribute:servers_list' => 'Servere',
+	'Class:OSLicence/Attribute:servers_list+' => '',
+	'Class:SoftwareLicence' => 'Software Licens',
+	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
+	'Class:SoftwareLicence/Attribute:software_id+' => '',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Software instancer',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => '',
+	'Class:lnkDocumentToLicence' => 'Link Dokument / Licens',
+	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licens',
+	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
+	'Class:OSVersion' => 'OS Version',
+	'Class:OSVersion+' => '',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS familie',
+	'Class:OSVersion/Attribute:osfamily_id+' => '',
+	'Class:OSFamily' => 'OS Familie',
+	'Class:OSFamily+' => '',
+	'Class:DocumentType' => 'Dokument Type',
+	'Class:DocumentType+' => '',
+	'Class:ContactType' => 'Kontakt Type',
+	'Class:ContactType+' => '',
+	'Class:Brand' => 'Mærke',
+	'Class:Brand+' => '',
+	'Class:Brand/Attribute:physicaldevices_list' => 'Fysiske Enheder',
+	'Class:Brand/Attribute:physicaldevices_list+' => '',
+	'Class:Model' => 'Model',
+	'Class:Model+' => '',
+	'Class:Model/Attribute:brand_id' => 'Mærke',
+	'Class:Model/Attribute:brand_id+' => '',
+	'Class:Model/Attribute:type' => 'Enheds type',
+	'Class:Model/Attribute:type+' => '',
+	'Class:Model/Attribute:type/Value:DiskArray' => 'Disk Array',
+	'Class:Model/Attribute:type/Value:DiskArray+' => '',
+	'Class:Model/Attribute:type/Value:Enclosure' => 'Enclosure',
+	'Class:Model/Attribute:type/Value:Enclosure+' => '',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP Telefon',
+	'Class:Model/Attribute:type/Value:IPPhone+' => '',
+	'Class:Model/Attribute:type/Value:MobilePhone' => 'Mobil Telefon',
+	'Class:Model/Attribute:type/Value:MobilePhone+' => '',
+	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
+	'Class:Model/Attribute:type/Value:NAS+' => '',
+	'Class:Model/Attribute:type/Value:NetworkDevice' => 'Netværks Enhed',
+	'Class:Model/Attribute:type/Value:NetworkDevice+' => '',
+	'Class:Model/Attribute:type/Value:PC' => 'PC',
+	'Class:Model/Attribute:type/Value:PC+' => '',
+	'Class:Model/Attribute:type/Value:PDU' => 'PDU',
+	'Class:Model/Attribute:type/Value:PDU+' => '',
+	'Class:Model/Attribute:type/Value:Peripheral' => 'Perifer Enhed',
+	'Class:Model/Attribute:type/Value:Peripheral+' => '',
+	'Class:Model/Attribute:type/Value:PowerSource' => 'Strømforsyning',
+	'Class:Model/Attribute:type/Value:PowerSource+' => '',
+	'Class:Model/Attribute:type/Value:Printer' => 'Printer',
+	'Class:Model/Attribute:type/Value:Printer+' => '',
+	'Class:Model/Attribute:type/Value:Rack' => 'Rack',
+	'Class:Model/Attribute:type/Value:Rack+' => '',
+	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN switch',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => '',
+	'Class:Model/Attribute:type/Value:Server' => 'Server',
+	'Class:Model/Attribute:type/Value:Server+' => '',
+	'Class:Model/Attribute:type/Value:StorageSystem' => 'Storage System',
+	'Class:Model/Attribute:type/Value:StorageSystem+' => '',
+	'Class:Model/Attribute:type/Value:Tablet' => 'Tablet',
+	'Class:Model/Attribute:type/Value:Tablet+' => '',
+	'Class:Model/Attribute:type/Value:TapeLibrary' => 'Tape Library',
+	'Class:Model/Attribute:type/Value:TapeLibrary+' => '',
+	'Class:Model/Attribute:type/Value:Telephone' => 'Telefon',
+	'Class:Model/Attribute:type/Value:Telephone+' => '',
+	'Class:Model/Attribute:physicaldevices_list' => 'Fysiske Enheder',
+	'Class:Model/Attribute:physicaldevices_list+' => '',
+	'Class:NetworkDeviceType' => 'Netværks Enhed Type',
+	'Class:NetworkDeviceType+' => '',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netværks Enheder',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => '',
+	'Class:IOSVersion' => 'IOS Version',
+	'Class:IOSVersion+' => '',
+	'Class:IOSVersion/Attribute:brand_id' => 'Mærke',
+	'Class:IOSVersion/Attribute:brand_id+' => '',
+	'Class:lnkDocumentToPatch' => 'Link Dokument / Patch',
+	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
+	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToPatch/Attribute:document_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToSoftware' => 'Link Dokument / Software',
+	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
+	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToSoftware/Attribute:document_id+' => '',
+	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
+	'Class:lnkContactToFunctionalCI+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '',
+	'Class:lnkDocumentToFunctionalCI' => 'Link Dokument / FunctionalCI',
+	'Class:lnkDocumentToFunctionalCI+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '',
+	'Class:Subnet' => 'Subnet',
+	'Class:Subnet+' => '',
+	'Class:Subnet/Attribute:description' => 'Beskrivelse',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:org_id' => 'Ejer organisation',
+	'Class:Subnet/Attribute:org_id+' => '',
+	'Class:Subnet/Attribute:ip' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
+	'Class:Subnet/Attribute:ip_mask' => 'IP Maske',
+	'Class:Subnet/Attribute:ip_mask+' => '',
+	'Class:PhysicalInterface' => 'Fysisk Interface',
+	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Enhed',
+	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / Netværks enhed',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Netværks enhed',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => 'Forbundet enhed',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => 'Netværks port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port' => 'Enheds port',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:device_port+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type' => 'Forbindelses type',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink' => 'Down link',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:downlink+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink' => 'Up link',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connection_type/Value:uplink+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplikationsLøsning / FunctionalCI',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Applikations løsning',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'FunctionalCI',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplikationsLøsning / ForretningsProces',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Forretningsproces',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => 'Applikations løsning',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '',
+	'Class:lnkPersonToTeam' => 'Link Person / Team',
+	'Class:lnkPersonToTeam+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_id' => 'Team',
+	'Class:lnkPersonToTeam/Attribute:team_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_id' => 'Person',
+	'Class:lnkPersonToTeam/Attribute:person_id+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_id' => 'Rolle',
+	'Class:lnkPersonToTeam/Attribute:role_id+' => '',
+	'Class:Group' => 'Gruppe',
+	'Class:Group+' => '',
+	'Class:Group/Attribute:name' => 'Navn',
+	'Class:Group/Attribute:name+' => '',
+	'Class:Group/Attribute:status' => 'Status',
+	'Class:Group/Attribute:status+' => '',
+	'Class:Group/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:Group/Attribute:status/Value:implementation+' => '',
+	'Class:Group/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:Group/Attribute:status/Value:obsolete+' => '',
+	'Class:Group/Attribute:status/Value:production' => 'Produktion',
+	'Class:Group/Attribute:status/Value:production+' => '',
+	'Class:Group/Attribute:org_id' => 'Organisation~~',
+	'Class:Group/Attribute:org_id+' => '',
+	'Class:Group/Attribute:description' => 'Beskrivelse',
+	'Class:Group/Attribute:description+' => '',
+	'Class:Group/Attribute:type' => 'Type',
+	'Class:Group/Attribute:type+' => '',
+	'Class:Group/Attribute:parent_id' => 'Parent Gruppe',
+	'Class:Group/Attribute:parent_id+' => '',
+	'Class:Group/Attribute:ci_list' => 'Linked CIs',
+	'Class:Group/Attribute:ci_list+' => '',
+	'Class:lnkGroupToCI' => 'Link Gruppe / CI',
+	'Class:lnkGroupToCI+' => '',
+	'Class:lnkGroupToCI/Attribute:group_id' => 'Gruppe',
+	'Class:lnkGroupToCI/Attribute:group_id+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_id' => 'CI',
+	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
+	'Class:lnkGroupToCI/Attribute:reason' => 'Årsag',
+	'Class:lnkGroupToCI/Attribute:reason+' => '',
+	'Class:Rack' => 'Rack',
+	'Class:Rack+' => '',
+	'Class:Rack/Attribute:nb_u' => 'NB U',
+	'Class:Rack/Attribute:nb_u+' => '',
+	'Class:Rack/Attribute:device_list' => 'Enheder',
+	'Class:Rack/Attribute:device_list+' => '',
+	'Class:Rack/Attribute:enclosure_list' => 'Enclosures',
+	'Class:Rack/Attribute:enclosure_list+' => '',
+	'Class:Enclosure' => 'Enclosure',
+	'Class:Enclosure+' => '',
+	'Class:Enclosure/Attribute:rack_id' => 'Rack',
+	'Class:Enclosure/Attribute:rack_id+' => '',
+	'Class:Enclosure/Attribute:nb_u' => 'NB U',
+	'Class:Enclosure/Attribute:nb_u+' => '',
+	'Class:Enclosure/Attribute:device_list' => 'Enheder',
+	'Class:Enclosure/Attribute:device_list+' => '',
+	'Class:PowerSource' => 'Strømforsyning',
+	'Class:PowerSource+' => '',
+	'Class:PowerSource/Attribute:pdus_list' => 'PDUer',
+	'Class:PowerSource/Attribute:pdus_list+' => '',
+	'Class:PDU' => 'PDU',
+	'Class:PDU+' => '',
+	'Class:PDU/Attribute:rack_id' => 'Rack',
+	'Class:PDU/Attribute:rack_id+' => '',
+	'Class:PDU/Attribute:powerstart_id' => 'Power start',
+	'Class:PDU/Attribute:powerstart_id+' => '',
+	'Class:PC' => 'PC',
+	'Class:PC+' => '',
+	'Class:PC/Attribute:osfamily_id' => 'OS familie',
+	'Class:PC/Attribute:osfamily_id+' => '',
+	'Class:PC/Attribute:osversion_id' => 'OS version',
+	'Class:PC/Attribute:osversion_id+' => '',
+	'Class:PC/Attribute:cpu' => 'CPU',
+	'Class:PC/Attribute:cpu+' => '',
+	'Class:PC/Attribute:ram' => 'RAM',
+	'Class:PC/Attribute:ram+' => '',
+	'Class:PC/Attribute:type' => 'Type',
+	'Class:PC/Attribute:type+' => '',
+	'Class:PC/Attribute:type/Value:desktop' => 'Desktop',
+	'Class:PC/Attribute:type/Value:desktop+' => '',
+	'Class:PC/Attribute:type/Value:laptop' => 'Laptop',
+	'Class:PC/Attribute:type/Value:laptop+' => '',
+	'Class:Printer' => 'Printer',
+	'Class:Printer+' => '',
+	'Class:Phone' => 'Telefon',
+	'Class:Phone+' => '',
+	'Class:MobilePhone' => 'Mobil Telefon',
+	'Class:MobilePhone+' => '',
+	'Class:MobilePhone/Attribute:imei' => 'IMEI',
+	'Class:MobilePhone/Attribute:imei+' => '',
+	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
+	'Class:MobilePhone/Attribute:hw_pin+' => '',
+	'Class:IPPhone' => 'IP Telefon',
+	'Class:IPPhone+' => '',
+	'Class:Tablet' => 'Tablet',
+	'Class:Tablet+' => '',
+	'Class:Peripheral' => 'Perifer',
+	'Class:Peripheral+' => '',
+	'Class:ContractType' => 'Kontrakt Type',
+	'Class:ContractType+' => '',
+	'Class:CustomerContract' => 'Kunde Kontrakt',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'Services',
+	'Class:CustomerContract/Attribute:services_list+' => '',
+	'Class:ProviderContract' => 'Leverandør Kontrakt',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => '',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => '',
+	'Class:ProviderContract/Attribute:coverage' => 'Service timer',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+	'Class:lnkContactToContract' => 'Link Kontakt / Kontrakt',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => 'Kontrakt',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContractToDocument' => 'Link Kontrakt / Dokument',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => 'Kontrakt',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => 'Dokument',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / LeverandørKontrakt',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Leverandør kontrakt',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:ServiceFamily' => 'Service Familie',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => 'Navn',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'Services',
+	'Class:ServiceFamily/Attribute:services_list+' => '',
+	'Class:Service' => 'Service',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => 'Navn',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'Leverandør',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:servicefamily_id' => 'Service Familie',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:description' => 'Beskrivelse',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => 'Dokumenter',
+	'Class:Service/Attribute:documents_list+' => '',
+	'Class:Service/Attribute:contacts_list' => 'Kontakter',
+	'Class:Service/Attribute:contacts_list+' => '',
+	'Class:Service/Attribute:status' => 'Status',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => 'implementering',
+	'Class:Service/Attribute:status/Value:implementation+' => '',
+	'Class:Service/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:Service/Attribute:status/Value:obsolete+' => '',
+	'Class:Service/Attribute:status/Value:production' => 'Produktion',
+	'Class:Service/Attribute:status/Value:production+' => '',
+	'Class:Service/Attribute:customercontracts_list' => 'Kunde kontrakter',
+	'Class:Service/Attribute:customercontracts_list+' => '',
+	'Class:Service/Attribute:providercontracts_list' => 'Leverandør kontrakter',
+	'Class:Service/Attribute:providercontracts_list+' => '',
+	'Class:Service/Attribute:functionalcis_list' => 'Afhænger af CIer',
+	'Class:Service/Attribute:functionalcis_list+' => '',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Service Subkategorier',
+	'Class:Service/Attribute:servicesubcategories_list+' => '',
+	'Class:lnkDocumentToService' => 'Link Dokument / Service',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => 'Dokument',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkContactToService' => 'Link Kontakt / Service',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'Service',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:ServiceSubcategory' => 'Service Subkategori',
+	'Class:ServiceSubcategory+' => '',
+	'Class:ServiceSubcategory/Attribute:name' => 'Navn',
+	'Class:ServiceSubcategory/Attribute:name+' => '',
+	'Class:ServiceSubcategory/Attribute:description' => 'Beskrivelse',
+	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id' => 'Service',
+	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type' => 'Anmodnings type',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Service anmodning',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => '',
+	'Class:ServiceSubcategory/Attribute:status' => 'Status',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produktion',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => 'Navn',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => 'Beskrivelse',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'Leverandør',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:slts_list' => 'SLTer',
+	'Class:SLA/Attribute:slts_list+' => '',
+	'Class:SLA/Attribute:customercontracts_list' => 'Kunde kontrakter',
+	'Class:SLA/Attribute:customercontracts_list+' => '',
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => 'Navn',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => 'Prioritet',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => 'Kritisk',
+	'Class:SLT/Attribute:priority/Value:1+' => '',
+	'Class:SLT/Attribute:priority/Value:2' => 'Høj',
+	'Class:SLT/Attribute:priority/Value:2+' => '',
+	'Class:SLT/Attribute:priority/Value:3' => 'Medium',
+	'Class:SLT/Attribute:priority/Value:3+' => '',
+	'Class:SLT/Attribute:priority/Value:4' => 'Lav',
+	'Class:SLT/Attribute:priority/Value:4+' => '',
+	'Class:SLT/Attribute:request_type' => 'Anmodnings type',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:SLT/Attribute:request_type/Value:incident+' => '',
+	'Class:SLT/Attribute:request_type/Value:service_request' => 'Service anmodning',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:metric' => 'Metrisk',
+	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
+	'Class:SLT/Attribute:metric/Value:tto+' => '',
+	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
+	'Class:SLT/Attribute:metric/Value:ttr+' => '',
+	'Class:SLT/Attribute:value' => 'Værdi',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => 'Enhed',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => 'timer',
+	'Class:SLT/Attribute:unit/Value:hours+' => '',
+	'Class:SLT/Attribute:unit/Value:minutes' => 'minutter',
+	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkCustomerContractToService' => 'Link Kunde Kontrakt / Service',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Kunde kontrakt',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkProviderContractToService' => 'Link Leverandør kontrakt / Service',
+	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
+	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'Leverandør kontrakt',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:DeliveryModel' => 'Leverings Model',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => 'Navn',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:description' => 'Beskrivelse',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => 'Kontakter',
+	'Class:DeliveryModel/Attribute:contacts_list+' => '',
+	'Class:DeliveryModel/Attribute:customers_list' => 'Kunder',
+	'Class:DeliveryModel/Attribute:customers_list+' => '',
+	'Class:lnkDeliveryModelToContact' => 'Link Leverings Model / Kontakt',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Leverings model',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => 'Rolle',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:StorageSystem' => 'Storage System',
+	'Class:StorageSystem+' => '',
+	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => '',
+	'Class:SANSwitch' => 'SAN Switch',
+	'Class:SANSwitch+' => '',
+	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Enheder',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => '',
+	'Class:TapeLibrary' => 'Tape Library',
+	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
+	'Class:TapeLibrary/Attribute:tapes_list+' => '',
+	'Class:NAS' => 'NAS',
+	'Class:NAS+' => '',
+	'Class:NAS/Attribute:nasfilesystem_list' => 'Fil system(er)',
+	'Class:NAS/Attribute:nasfilesystem_list+' => '',
+	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
+	'Class:FiberChannelInterface+' => '',
+	'Class:FiberChannelInterface/Attribute:speed' => 'Hastighed',
+	'Class:FiberChannelInterface/Attribute:speed+' => '',
+	'Class:FiberChannelInterface/Attribute:topology' => 'Topologi',
+	'Class:FiberChannelInterface/Attribute:topology+' => '',
+	'Class:FiberChannelInterface/Attribute:wwn' => 'WWN',
+	'Class:FiberChannelInterface/Attribute:wwn+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => 'Enhed',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '',
+	'Class:Tape' => 'Tape',
+	'Class:Tape+' => '',
+	'Class:Tape/Attribute:name' => 'Navn',
+	'Class:Tape/Attribute:name+' => '',
+	'Class:Tape/Attribute:description' => 'Beskrivelse',
+	'Class:Tape/Attribute:description+' => '',
+	'Class:Tape/Attribute:size' => 'Størrelse',
+	'Class:Tape/Attribute:size+' => '',
+	'Class:Tape/Attribute:tapelibrary_id' => 'Tape library',
+	'Class:Tape/Attribute:tapelibrary_id+' => '',
+	'Class:NASFileSystem' => 'NAS Fil System',
+	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem/Attribute:name' => 'Navn',
+	'Class:NASFileSystem/Attribute:name+' => '',
+	'Class:NASFileSystem/Attribute:description' => 'Beskrivelse',
+	'Class:NASFileSystem/Attribute:description+' => '',
+	'Class:NASFileSystem/Attribute:raid_level' => 'Raid level',
+	'Class:NASFileSystem/Attribute:raid_level+' => '',
+	'Class:NASFileSystem/Attribute:size' => 'Størrelse',
+	'Class:NASFileSystem/Attribute:size+' => '',
+	'Class:NASFileSystem/Attribute:nas_id' => 'NAS',
+	'Class:NASFileSystem/Attribute:nas_id+' => '',
+	'Class:LogicalVolume' => 'Logical Volume',
+	'Class:LogicalVolume+' => '',
+	'Class:LogicalVolume/Attribute:name' => 'Navn',
+	'Class:LogicalVolume/Attribute:name+' => '',
+	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
+	'Class:LogicalVolume/Attribute:lun_id+' => '',
+	'Class:LogicalVolume/Attribute:description' => 'Beskrivelse',
+	'Class:LogicalVolume/Attribute:description+' => '',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Raid level',
+	'Class:LogicalVolume/Attribute:raid_level+' => '',
+	'Class:LogicalVolume/Attribute:size' => 'Størrelse',
+	'Class:LogicalVolume/Attribute:size+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_id' => 'Storage system',
+	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
+	'Class:LogicalVolume/Attribute:servers_list' => 'Servere',
+	'Class:LogicalVolume/Attribute:servers_list+' => '',
+	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Virtuelle enheder',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => '',
+	'Class:lnkServerToVolume' => 'Link Server / Volume',
+	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
+	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
+	'Class:lnkServerToVolume/Attribute:server_id' => 'Server',
+	'Class:lnkServerToVolume/Attribute:server_id+' => '',
+	'Class:lnkServerToVolume/Attribute:size_used' => 'Størrelse anvendt',
+	'Class:lnkServerToVolume/Attribute:size_used+' => '',
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
+	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => 'Enhed',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN fc',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Enheds fc',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
+	'Class:Ticket' => 'Billet',
+	'Class:Ticket+' => '',
+	'Class:Ticket/Attribute:ref' => 'Ref',
+	'Class:Ticket/Attribute:ref+' => '',
+	'Class:Ticket/Attribute:org_id' => 'Organisation',
+	'Class:Ticket/Attribute:org_id+' => '',
+	'Class:Ticket/Attribute:caller_id' => 'Rekvirent',
+	'Class:Ticket/Attribute:caller_id+' => '',
+	'Class:Ticket/Attribute:team_id' => 'Team',
+	'Class:Ticket/Attribute:team_id+' => '',
+	'Class:Ticket/Attribute:agent_id' => 'Agent',
+	'Class:Ticket/Attribute:agent_id+' => '',
+	'Class:Ticket/Attribute:title' => 'Titel',
+	'Class:Ticket/Attribute:title+' => '',
+	'Class:Ticket/Attribute:description' => 'Beskrivelse',
+	'Class:Ticket/Attribute:description+' => '',
+	'Class:Ticket/Attribute:start_date' => 'Start dato',
+	'Class:Ticket/Attribute:start_date+' => '',
+	'Class:Ticket/Attribute:end_date' => 'Slut dato',
+	'Class:Ticket/Attribute:end_date+' => '',
+	'Class:Ticket/Attribute:last_update' => 'Sidste opdatering',
+	'Class:Ticket/Attribute:last_update+' => '',
+	'Class:Ticket/Attribute:close_date' => 'Lukket dato',
+	'Class:Ticket/Attribute:close_date+' => '',
+	'Class:Ticket/Attribute:private_log' => 'Privat log',
+	'Class:Ticket/Attribute:private_log+' => '',
+	'Class:Ticket/Attribute:contacts_list' => 'Kontakter',
+	'Class:Ticket/Attribute:contacts_list+' => '',
+	'Class:Ticket/Attribute:functionalcis_list' => 'CIs',
+	'Class:Ticket/Attribute:functionalcis_list+' => '',
+	'Class:Ticket/Attribute:workorders_list' => 'Arbejds ordrer',
+	'Class:Ticket/Attribute:workorders_list+' => '',
+	'Class:Ticket/Attribute:finalclass' => 'Type',
+	'Class:Ticket/Attribute:finalclass+' => '',
+	'Class:lnkContactToTicket' => 'Link Kontakt / Billet',
+	'Class:lnkContactToTicket+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Billet',
+	'Class:lnkContactToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_id' => 'Kontakt',
+	'Class:lnkContactToTicket/Attribute:contact_id+' => '',
+	'Class:lnkContactToTicket/Attribute:role' => 'Rolle',
+	'Class:lnkContactToTicket/Attribute:role+' => '',
+	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Billet',
+	'Class:lnkFunctionalCIToTicket+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Billet',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact' => 'Påvirkning',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact+' => '',
+	'Class:WorkOrder' => 'Arbejds ordrer',
+	'Class:WorkOrder+' => '',
+	'Class:WorkOrder/Attribute:name' => 'Navn',
+	'Class:WorkOrder/Attribute:name+' => '',
+	'Class:WorkOrder/Attribute:status' => 'Status',
+	'Class:WorkOrder/Attribute:status+' => '',
+	'Class:WorkOrder/Attribute:status/Value:open' => 'Åben',
+	'Class:WorkOrder/Attribute:status/Value:open+' => '',
+	'Class:WorkOrder/Attribute:status/Value:closed' => 'Lukket',
+	'Class:WorkOrder/Attribute:status/Value:closed+' => '',
+	'Class:WorkOrder/Attribute:description' => 'Beskrivelse',
+	'Class:WorkOrder/Attribute:description+' => '',
+	'Class:WorkOrder/Attribute:ticket_id' => 'Billet',
+	'Class:WorkOrder/Attribute:ticket_id+' => '',
+	'Class:WorkOrder/Attribute:team_id' => 'Team',
+	'Class:WorkOrder/Attribute:team_id+' => '',
+	'Class:WorkOrder/Attribute:agent_id' => 'Agent',
+	'Class:WorkOrder/Attribute:agent_id+' => '',
+	'Class:WorkOrder/Attribute:start_date' => 'Start dato',
+	'Class:WorkOrder/Attribute:start_date+' => '',
+	'Class:WorkOrder/Attribute:end_date' => 'Slut dato',
+	'Class:WorkOrder/Attribute:end_date+' => '',
+	'Class:WorkOrder/Attribute:log' => 'Log',
+	'Class:WorkOrder/Attribute:log+' => '',
+	'Class:WorkOrder/Stimulus:ev_close' => 'Luk',
+	'Class:WorkOrder/Stimulus:ev_close+' => '',
+	'Class:Hypervisor' => 'Hypervisor',
+	'Class:Hypervisor+' => '',
+	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
+	'Class:Hypervisor/Attribute:farm_id+' => '',
+	'Class:Hypervisor/Attribute:server_id' => 'Server',
+	'Class:Hypervisor/Attribute:server_id+' => '',
+	'Class:Farm' => 'Farm',
+	'Class:Farm+' => '',
+	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
+	'Class:Farm/Attribute:hypervisor_list+' => '',
+	'Class:VirtualMachine' => 'Virtuel Maskine',
+	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtuel vært',
+	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS familie',
+	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS version',
+	'Class:VirtualMachine/Attribute:osversion_id+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS licens',
+	'Class:VirtualMachine/Attribute:oslicence_id+' => '',
+	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
+	'Class:VirtualMachine/Attribute:cpu+' => '',
+	'Class:VirtualMachine/Attribute:ram' => 'RAM',
+	'Class:VirtualMachine/Attribute:ram+' => '',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Netværks Interfaces',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => '',
+	'Class:LogicalInterface' => 'Logisk Interface',
+	'Class:LogicalInterface+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtuel maskine',
+	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
+	'Class:Change' => 'Ændring',
+	'Class:Change+' => '',
+	'Class:Change/Attribute:status' => 'Status',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => 'Ny',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => 'Tildelt',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => 'Planlagt',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => 'Afslået',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => 'Godkendt',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => 'Lukket',
+	'Class:Change/Attribute:status/Value:closed+' => '',
+	'Class:Change/Attribute:category' => 'Kategori',
+	'Class:Change/Attribute:category+' => '',
+	'Class:Change/Attribute:category/Value:application' => 'Applikation',
+	'Class:Change/Attribute:category/Value:application+' => '',
+	'Class:Change/Attribute:category/Value:hardware' => 'Hardware',
+	'Class:Change/Attribute:category/Value:hardware+' => '',
+	'Class:Change/Attribute:category/Value:network' => 'Netværk',
+	'Class:Change/Attribute:category/Value:network+' => '',
+	'Class:Change/Attribute:category/Value:other' => 'Andet',
+	'Class:Change/Attribute:category/Value:other+' => '',
+	'Class:Change/Attribute:category/Value:software' => 'Software',
+	'Class:Change/Attribute:category/Value:software+' => '',
+	'Class:Change/Attribute:category/Value:system' => 'System',
+	'Class:Change/Attribute:category/Value:system+' => '',
+	'Class:Change/Attribute:reject_reason' => 'Årsag til afslag',
+	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changemanager_id' => 'Change manager',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:parent_id' => 'Parent change',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:creation_date' => 'Oprettelses dato',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => 'Godkendelses dato',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => 'Fallback plan',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => 'Relaterede anmodninger',
+	'Class:Change/Attribute:related_request_list+' => '',
+	'Class:Change/Attribute:child_changes_list' => 'Child changes',
+	'Class:Change/Attribute:child_changes_list+' => '',
+	'Class:Change/Stimulus:ev_assign' => 'Tildel',
+	'Class:Change/Stimulus:ev_assign+' => '',
+	'Class:Change/Stimulus:ev_plan' => 'Planlæg',
+	'Class:Change/Stimulus:ev_plan+' => '',
+	'Class:Change/Stimulus:ev_reject' => 'Afslå',
+	'Class:Change/Stimulus:ev_reject+' => '',
+	'Class:Change/Stimulus:ev_reopen' => 'Genåben',
+	'Class:Change/Stimulus:ev_reopen+' => '',
+	'Class:Change/Stimulus:ev_approve' => 'Godkend',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => 'Luk',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:UserRequest' => 'Bruger anmodning',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => 'Status',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => 'Ny',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'Eskaleret TTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => 'Tildelt',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'Eskaleret TTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => 'Afventer godkendelse',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => 'Godkendt',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => 'Afslået',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => 'Afventer',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => 'Løst',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'Lukket',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => 'Anmodnings Type',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:incident' => 'Incident',
+	'Class:UserRequest/Attribute:request_type/Value:incident+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'Service anmodning',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => '',
+	'Class:UserRequest/Attribute:impact' => 'Påvirkning',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => 'Afdeling',
+	'Class:UserRequest/Attribute:impact/Value:1+' => 'En afdeling er påvirket',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'Service',
+	'Class:UserRequest/Attribute:impact/Value:2+' => 'En service er påvirket',
+	'Class:UserRequest/Attribute:impact/Value:3' => 'Person',
+	'Class:UserRequest/Attribute:impact/Value:3+' => 'En person er påvirket',
+	'Class:UserRequest/Attribute:priority' => 'Prioritet',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => 'Kritisk',
+	'Class:UserRequest/Attribute:priority/Value:1+' => '',
+	'Class:UserRequest/Attribute:priority/Value:2' => 'Høj',
+	'Class:UserRequest/Attribute:priority/Value:2+' => '',
+	'Class:UserRequest/Attribute:priority/Value:3' => 'Medium',
+	'Class:UserRequest/Attribute:priority/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority/Value:4' => 'Lav',
+	'Class:UserRequest/Attribute:priority/Value:4+' => '',
+	'Class:UserRequest/Attribute:urgency' => 'Vigtighed',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => 'Kritisk',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:2' => 'Høj',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:3' => 'Medium',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:4' => 'Lav',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => '',
+	'Class:UserRequest/Attribute:origin' => 'Oprindelse',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'Mail',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => '',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'Monitorering',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => '',
+	'Class:UserRequest/Attribute:origin/Value:phone' => 'Telefon',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => '',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'Portal',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => '',
+	'Class:UserRequest/Attribute:approver_id' => 'Godkender',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'Service',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Service subkategori',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'Hot Flag',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'Nej',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'Ja',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => '',
+	'Class:UserRequest/Attribute:escalation_reason' => 'Hot årsag',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => 'Tildelings dato',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => 'Løsnings dato',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => 'Sidste afventer dato',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute:cumulatedpending' => 'Akumulerede afventer',
+	'Class:UserRequest/Attribute:cumulatedpending+' => '',
+	'Class:UserRequest/Attribute:tto' => 'TTO',
+	'Class:UserRequest/Attribute:tto+' => '',
+	'Class:UserRequest/Attribute:ttr' => 'TTR',
+	'Class:UserRequest/Attribute:ttr+' => '',
+	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO Deadline',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto passeret',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto over',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR Deadline',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr passeret',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr over',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => 'Løsnings forsinkelse',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => 'Løsnings kode',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => 'Bistand',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'Bug fixed',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'Hardware reparation',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'Andet',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'Software patch',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'System update',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => 'Træning',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => '',
+	'Class:UserRequest/Attribute:solution' => 'Løsning',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => 'Afventer årsag~~',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => 'Parent anmodning',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => 'Parent change',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => 'Child anmodninger',
+	'Class:UserRequest/Attribute:related_request_list+' => '',
+	'Class:UserRequest/Attribute:public_log' => 'Offentlig log',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'Bruger tilfredshed',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => 'Meget tilfreds',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => 'Tilfreds',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => 'Meget utilfreds',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => 'Hverken eller',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '',
+	'Class:UserRequest/Attribute:user_comment' => 'Bruger kommentar',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => 'Tildel',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => 'Gen-tildel',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => 'Godkend',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => 'Afslå',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => 'Afventer',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'Timeout',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => 'Automatisk løsning',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => 'Automatisk lukning',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => 'Mærk som løst',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'Luk denne anmodning',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => 'Gen-åben',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Afventer godkendelse',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+	'Class:AsyncSendEmail' => 'Email (asynkron)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Til',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Emne',
+	'Class:CMDBChange' => 'Change',
+	'Class:CMDBChange+' => '',
+	'Class:CMDBChange/Attribute:date' => 'Dato',
+	'Class:CMDBChange/Attribute:date+' => '',
+	'Class:CMDBChange/Attribute:userinfo' => 'Forskellig info',
+	'Class:CMDBChange/Attribute:userinfo+' => '',
+	'Class:CMDBChangeOp' => 'Change Operation',
+	'Class:CMDBChangeOp+' => '',
+	'Class:CMDBChangeOp/Attribute:change' => 'Change',
+	'Class:CMDBChangeOp/Attribute:change+' => '',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'Objekt klasse',
+	'Class:CMDBChangeOp/Attribute:objclass+' => '',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'Objekt id',
+	'Class:CMDBChangeOp/Attribute:objkey+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'Type',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+	'Class:CMDBChangeOpCreate' => 'Object oprettelse',
+	'Class:CMDBChangeOpCreate+' => '',
+	'Class:CMDBChangeOpDelete' => 'Object sletning',
+	'Class:CMDBChangeOpDelete+' => '',
+	'Class:CMDBChangeOpSetAttribute' => 'Object ændring',
+	'Class:CMDBChangeOpSetAttribute+' => '',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribut',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Property ændring',
+	'Class:CMDBChangeOpSetAttributeScalar+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Tidligere værdi',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Ny værdi',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'Data ændring',
+	'Class:CMDBChangeOpSetAttributeBlob+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Tidligere data',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Krypteret Password',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Tidligere værdi',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Krypteret Felt',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Tidligere værdi',
+	'Class:CMDBChangeOpSetAttributeText' => 'Tekst ændring',
+	'Class:CMDBChangeOpSetAttributeText+' => '',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Tidligere data',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Sags Log',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Sidste Entry',
+	'Class:Event' => 'Log Hændelse',
+	'Class:Event+' => '',
+	'Class:Event/Attribute:message' => 'Besked',
+	'Class:Event/Attribute:message+' => '',
+	'Class:Event/Attribute:date' => 'Dato',
+	'Class:Event/Attribute:date+' => '',
+	'Class:Event/Attribute:userinfo' => 'Bruger info',
+	'Class:Event/Attribute:userinfo+' => '',
+	'Class:Event/Attribute:finalclass' => 'Type',
+	'Class:Event/Attribute:finalclass+' => '',
+	'Class:EventNotification' => 'Notifikation hændelse',
+	'Class:EventNotification+' => '',
+	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
+	'Class:EventNotification/Attribute:trigger_id+' => '',
+	'Class:EventNotification/Attribute:action_id' => 'Bruger',
+	'Class:EventNotification/Attribute:action_id+' => '',
+	'Class:EventNotification/Attribute:object_id' => 'Object id',
+	'Class:EventNotification/Attribute:object_id+' => '',
+	'Class:EventNotificationEmail' => 'Email emission hændelse',
+	'Class:EventNotificationEmail+' => '',
+	'Class:EventNotificationEmail/Attribute:to' => 'Til',
+	'Class:EventNotificationEmail/Attribute:to+' => '',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => '',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => '',
+	'Class:EventNotificationEmail/Attribute:from' => 'Fra',
+	'Class:EventNotificationEmail/Attribute:from+' => '',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Emne',
+	'Class:EventNotificationEmail/Attribute:subject+' => '',
+	'Class:EventNotificationEmail/Attribute:body' => 'Indhold',
+	'Class:EventNotificationEmail/Attribute:body+' => '',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Vedhæftning(er)',
+	'Class:EventNotificationEmail/Attribute:attachments+' => '',
+	'Class:EventIssue' => 'Hændelses emne',
+	'Class:EventIssue+' => '',
+	'Class:EventIssue/Attribute:issue' => 'Emne',
+	'Class:EventIssue/Attribute:issue+' => '',
+	'Class:EventIssue/Attribute:impact' => 'Påvirkning',
+	'Class:EventIssue/Attribute:impact+' => '',
+	'Class:EventIssue/Attribute:page' => 'Side',
+	'Class:EventIssue/Attribute:page+' => '',
+	'Class:EventIssue/Attribute:arguments_post' => 'Postede argumenter',
+	'Class:EventIssue/Attribute:arguments_post+' => '',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL argumenter',
+	'Class:EventIssue/Attribute:arguments_get+' => '',
+	'Class:EventIssue/Attribute:callstack' => 'Callstack',
+	'Class:EventIssue/Attribute:callstack+' => '',
+	'Class:EventIssue/Attribute:data' => 'Data',
+	'Class:EventIssue/Attribute:data+' => '',
+	'Class:EventWebService' => 'Web service hændelse',
+	'Class:EventWebService+' => '',
+	'Class:EventWebService/Attribute:verb' => 'Verb',
+	'Class:EventWebService/Attribute:verb+' => '',
+	'Class:EventWebService/Attribute:result' => 'Resultat',
+	'Class:EventWebService/Attribute:result+' => '',
+	'Class:EventWebService/Attribute:log_info' => 'Info log',
+	'Class:EventWebService/Attribute:log_info+' => '',
+	'Class:EventWebService/Attribute:log_warning' => 'Advarsels log',
+	'Class:EventWebService/Attribute:log_warning+' => '',
+	'Class:EventWebService/Attribute:log_error' => 'Fejl log',
+	'Class:EventWebService/Attribute:log_error+' => '',
+	'Class:EventWebService/Attribute:data' => 'Data',
+	'Class:EventWebService/Attribute:data+' => '',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+	'Class:EventLoginUsage' => 'Login Usage',
+	'Class:EventLoginUsage+' => '',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => '',
+	'Class:SynchroDataSource' => 'Synchro Data Kilde',
+	'Class:SynchroDataSource/Attribute:name' => 'Navn',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Beskrivelse',
+	'Class:SynchroDataSource/Attribute:status' => 'Status',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produktion',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Bruger',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Kontakt som skal adviseres',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => '',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target klasse',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => '',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Afstemnings politik',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Brug attributterne',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Brug primær nøgle feltet',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Handling på nul',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Opret',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Fejl',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Handling på en',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Fejl',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Opdater',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Handling på mange',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Opret',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Fejl',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Tag den første (vilkårlig?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Slet Politik',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Slet',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Opdater',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Opdater derefter Slet',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Opdater regler',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Fastholdelses varighed',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribut Liste',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Tilladte brugere',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Kun Administratorer',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Enhver har tilladelse til at slette sådanne elementer',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ingen',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink',
+	'Class:SynchroDataSource/Attribute:url_icon+' => '',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Applikation\'s hyperlink',
+	'Class:SynchroDataSource/Attribute:url_application+' => '',
+	'Class:SynchroAttribute' => 'Synchro Attribute~~',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Kilde',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribut Kode',
+	'Class:SynchroAttribute/Attribute:update' => 'Opdater',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Afstem',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Opdater Polik',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Låst',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Låst op',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialiser hvis tom',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Klasse',
+	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Afstem Attribut',
+	'Class:SynchroAttLinkSet' => 'Synchro Attribut (Linksæt)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Række separator',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attribut separator',
+	'Class:SynchroLog' => 'Synchr Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Kilde',
+	'Class:SynchroLog/Attribute:start_date' => 'Start Dato',
+	'Class:SynchroLog/Attribute:end_date' => 'Slut Dato',
+	'Class:SynchroLog/Attribute:status' => 'Status',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Fuldført',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Fejl',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Stadig Kørende',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nr replica opdaget',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nr replica total',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nr objekter slettet',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nr af fejl under sletning',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nr objekter forældede',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nr af fejl under markering af forældet',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nr objekter oprettet',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nr af fejl under oprettelse',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nr objekter opdateret',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nr af fejl under opdatering',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nr af fejl under afstemning',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nr af replica forsvundet',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nr objekter opdateret',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nr objekter uændrede',
+	'Class:SynchroLog/Attribute:last_error' => 'Sidste fejl',
+	'Class:SynchroLog/Attribute:traces' => 'Spor',
+	'Class:SynchroReplica' => 'Synchro Replica',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Kilde',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Destinations objekt (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Destinations type',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Sidst opdaget',
+	'Class:SynchroReplica/Attribute:status' => 'Status',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificeret',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Ny',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synkroniset',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objekt Oprettet ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Sidste fejl',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Advarsler',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Oprettelses Dato',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Sidste Ændrings Dato',
+	'Class:appUserPreferences' => 'Bruger Indstillinger',
+	'Class:appUserPreferences/Attribute:userid' => 'Bruger',
+	'Class:appUserPreferences/Attribute:preferences' => 'Inst.',
+	'Core:DeletedObjectLabel' => '%1s (slettet)',
+	'Core:DeletedObjectTip' => 'Objektet er slettet på %1$s (%2$s)',
+	'Core:UnknownObjectLabel' => 'Objektet ikke fundet (klasse: %1$s, id: %2$d)',
+	'Core:UnknownObjectTip' => 'Objektet kunne ikke findes. Det kan være slettet, uden at loggen er blevt tømt.',
+	'Core:AttributeLinkedSet' => 'Array af objekter',
+	'Core:AttributeLinkedSet+' => '',
+	'Core:AttributeLinkedSetIndirect' => 'Array af objekter (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => '',
+	'Core:AttributeInteger' => 'Integer',
+	'Core:AttributeInteger+' => '',
+	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal+' => '',
+	'Core:AttributeBoolean' => 'Boolean',
+	'Core:AttributeBoolean+' => '',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+	'Core:AttributeString' => 'String',
+	'Core:AttributeString+' => '',
+	'Core:AttributeClass' => 'Class',
+	'Core:AttributeClass+' => '',
+	'Core:AttributeApplicationLanguage' => 'Bruger sprog',
+	'Core:AttributeApplicationLanguage+' => '',
+	'Core:AttributeFinalClass' => 'Klasse (auto)',
+	'Core:AttributeFinalClass+' => '',
+	'Core:AttributePassword' => 'Password',
+	'Core:AttributePassword+' => '',
+	'Core:AttributeEncryptedString' => 'Krypteret streng',
+	'Core:AttributeEncryptedString+' => '',
+	'Core:AttributeText' => 'Tekst',
+	'Core:AttributeText+' => '',
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => '',
+	'Core:AttributeEmailAddress' => 'Email adresse',
+	'Core:AttributeEmailAddress+' => '',
+	'Core:AttributeIPAddress' => 'IP adresse',
+	'Core:AttributeIPAddress+' => '',
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => '',
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => '',
+	'Core:AttributeTemplateString' => 'Template streng',
+	'Core:AttributeTemplateString+' => '',
+	'Core:AttributeTemplateText' => 'Template tekst',
+	'Core:AttributeTemplateText+' => '',
+	'Core:AttributeTemplateHTML' => 'Template HTML',
+	'Core:AttributeTemplateHTML+' => '',
+	'Core:AttributeDateTime' => 'Dato/tid',
+	'Core:AttributeDateTime+' => '',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>~~',
+	'Core:AttributeDate' => 'Dato',
+	'Core:AttributeDate+' => '',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>',
+	'Core:AttributeDeadline' => 'Deadline',
+	'Core:AttributeDeadline+' => '',
+	'Core:AttributeExternalKey' => 'Ekstern nøgle',
+	'Core:AttributeExternalKey+' => '',
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Nøgle',
+	'Core:AttributeHierarchicalKey+' => '',
+	'Core:AttributeExternalField' => 'Eksternt felt',
+	'Core:AttributeExternalField+' => '',
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => '',
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => '',
+	'Core:AttributeOneWayPassword' => 'En vejs password',
+	'Core:AttributeOneWayPassword+' => '',
+	'Core:AttributeTable' => 'Tabel',
+	'Core:AttributeTable+' => '',
+	'Core:AttributePropertySet' => 'Egenskaber',
+	'Core:AttributePropertySet+' => '',
+	'Core:AttributeFriendlyName' => 'Friendly navn',
+	'Core:AttributeFriendlyName+' => '',
+	'Core:FriendlyName-Label' => 'Friendly navn',
+	'Core:FriendlyName-Description' => 'Friendly navn',
+	'Class:CMDBChangeOp/Attribute:date' => 'dato',
+	'Class:CMDBChangeOp/Attribute:date+' => '',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'bruger',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
+	'Change:ObjectCreated' => 'Objekt oprettet',
+	'Change:ObjectDeleted' => 'Objekt slettet',
+	'Change:ObjectModified' => 'Objekt ændret',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s sat til %2$s (tidligere værdi: %3$s)',
+	'Change:AttName_SetTo' => '%1$s sat til %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s tilføjet til %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s ændret, tidligere værdi: %2$s',
+	'Change:AttName_Changed' => '%1$s ændret',
+	'Change:AttName_EntryAdded' => '%1$s ændret, ny entry tilføjet: %2$s',
+	'Change:LinkSet:Added' => 'tilføjet %1$s',
+	'Change:LinkSet:Removed' => 'fjernet %1$s',
+	'Change:LinkSet:Modified' => 'ændret %1$s',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Bruger navn',
+	'Class:EventLoginUsage/Attribute:contact_name+' => '',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Bruger Email',
+	'Class:EventLoginUsage/Attribute:contact_email+' => '',
+	'Class:Action' => 'Brugerdefineret handling',
+	'Class:Action+' => '',
+	'Class:Action/Attribute:name' => 'Navn',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Beskrivelse',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Status',
+	'Class:Action/Attribute:status+' => '',
+	'Class:Action/Attribute:status/Value:test' => 'Bliver testet',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'I produktion',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inaktiv',
+	'Class:Action/Attribute:status/Value:disabled+' => '',
+	'Class:Action/Attribute:trigger_list' => 'Relaterede Triggere',
+	'Class:Action/Attribute:trigger_list+' => '',
+	'Class:Action/Attribute:finalclass' => 'Type',
+	'Class:Action/Attribute:finalclass+' => '',
+	'Class:ActionNotification' => 'Notifikation',
+	'Class:ActionNotification+' => '',
+	'Class:Trigger' => 'Triggere',
+	'Class:Trigger+' => '',
+	'Class:Trigger/Attribute:description' => 'Beskrivelse',
+	'Class:Trigger/Attribute:description+' => '',
+	'Class:Trigger/Attribute:action_list' => 'Triggerede handlinger',
+	'Class:Trigger/Attribute:action_list+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Type',
+	'Class:Trigger/Attribute:finalclass+' => '',
+	'Class:TriggerOnObject' => 'Trigger (klasse afhængig)',
+	'Class:TriggerOnObject+' => '',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Target klasse',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnStateChange' => 'Trigger (i tilstand ændring)',
+	'Class:TriggerOnStateChange+' => '',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Tilstand',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Handling',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Ingen',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Kun Administratorer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Alle tilladte brugere',
+	'SynchroDataSource:Description' => 'Beskrivelse',
+	'SynchroDataSource:Reconciliation' => 'Søg &amp; afstemning',
+	'SynchroDataSource:Deletion' => 'Slette regler',
+	'SynchroDataSource:Status' => 'Status',
+	'SynchroDataSource:Information' => 'Information',
+	'SynchroDataSource:Definition' => 'Definition',
+	'Core:SynchroAttributes' => 'Attributter',
+	'Core:SynchroStatus' => 'Status',
+	'Core:Synchro:ErrorsLabel' => 'Fejl',
+	'Core:Synchro:CreatedLabel' => 'Oprettet',
+	'Core:Synchro:ModifiedLabel' => 'Ændret',
+	'Core:Synchro:UnchangedLabel' => 'Uændret',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Fejl',
+	'Core:Synchro:ReconciledLabel' => 'Afstemt',
+	'Core:Synchro:ReconciledNewLabel' => 'Oprettet',
+	'Core:SynchroReconcile:Yes' => 'Ja',
+	'Core:SynchroReconcile:No' => 'Nej',
+	'Core:SynchroUpdate:Yes' => 'Ja',
+	'Core:SynchroUpdate:No' => 'Nej',
+	'Core:Synchro:LastestStatus' => 'Sidste Status',
+	'Core:Synchro:History' => 'Synchronization Historik',
+	'Core:Synchro:NeverRun' => 'Denne synkronisering har aldrig været kørt. Endnu ingen log.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'Sidste synkronisering sluttede den %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synkroniseringen der startede den %1$s kører stadig...',
+	'Menu:DataSources' => 'Synkroniserings Data Kilder',
+	'Menu:DataSources+' => '',
+	'Core:Synchro:label_repl_ignored' => 'Ignoreret (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Forsvundet (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Eksisterer (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Ny (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Slettet (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Forældet (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Fejl (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Ingen handling (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Uændret (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Opdateret (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Fejl (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Uændret (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Opdateret (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Oprettet (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Fejl (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica behandlet: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Mindst 1 afstemnings nøgle skal anføres, eller afstemnings politikken skal sættes til at bruge primær nøgle.',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'En tilbageholdelses periode efter sletning skal anføres, da objekter slettes efter mærkning som Forældet',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Forældede objekter skal ajourføres, men der er ingen opdateringer specificeret.',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'Tabellen %1$s eksisterer allerede i databasen. Brug venligst et andet navn for synkroniserings tabellen.',
+	'Core:SynchroReplica:PublicData' => 'Offentlige Data',
+	'Core:SynchroReplica:PrivateDetails' => 'Private Detaljer',
+	'Core:SynchroReplica:BackToDataSource' => 'Gå Tilbage til Synkroniserings Data Kilde: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Liste over Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primær Nøgle)',
+	'Core:SynchroAtt:attcode' => 'Attribut',
+	'Core:SynchroAtt:attcode+' => '',
+	'Core:SynchroAtt:reconciliation' => 'Afstem ?',
+	'Core:SynchroAtt:reconciliation+' => '',
+	'Core:SynchroAtt:update' => 'Opdater ?',
+	'Core:SynchroAtt:update+' => '',
+	'Core:SynchroAtt:update_policy' => 'Opdater Politik',
+	'Core:SynchroAtt:update_policy+' => '',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Afstemnings Nøgle',
+	'Core:SynchroAtt:reconciliation_attcode+' => '',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)',
+	'Core:Synchro:ListOfDataSources' => 'Liste over data kilder:',
+	'Core:Synchro:LastSynchro' => 'Sidste synkronisering:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Dette objekt er synkroniseret med en ekstern data kilde',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Objektet blev <b>oprettet</b> af den eksterne data kilde %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Objektet <b>kan slettes</b> af den eksterne data kilde %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Du <b>kan ikke slette dette objekt</b> fordi det er ejet af den eksterne data kilde %1$s',
+	'TitleSynchroExecution' => 'Udførelse af synkroniseringen',
+	'Class:SynchroDataSource:DataTable' => 'Database tabel: %1$s',
+	'Core:SyncDataSourceObsolete' => 'Data kilden er markeret som forældet. Handlingen afbrudt.',
+	'Core:SyncDataSourceAccessRestriction' => 'Kun adminstratorer eller brugere specificeret i data kilden kan udføre denne handling. Handlingen afbrudt.',
+	'Core:SyncTooManyMissingReplicas' => 'Alle records har været urørt i nogen tid (alle objekterne kan slettes). Venligst kontroller at processen som skriver i synkroniserings tabellen stadig kører. Handlingen afbrudtc.',
+	'Core:SyncSplitModeCLIOnly' => 'Synkroniseringen kan kun udføres i etapper hvis den udføres i CLI mode',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s fejl, %3$s advarsler.',
+	'Core:SynchroReplica:TargetObject' => 'Synkroniserede Objekter: %1$s',
+	'Class:AsyncSendEmail/Attribute:body' => 'Indhold',
+	'Class:AsyncSendEmail/Attribute:header' => 'Header',
+	'Core:ExecProcess:Code1' => 'Forkert kommando eller kommandoen afsluttede med fejl (f.eks. forkert script navn)',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
+	'Core:Duration_Seconds' => '%1$ds',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',
+	'Class:UserExternal' => 'Ekstern bruger',
+	'Class:UserExternal+' => '',
+	'Class:UserLDAP' => 'LDAP bruger',
+	'Class:UserLDAP+' => '',
+	'Class:UserLDAP/Attribute:password' => 'Password',
+	'Class:UserLDAP/Attribute:password+' => '',
+	'Class:UserLocal' => 'iTop bruger',
+	'Class:UserLocal+' => '',
+	'Class:UserLocal/Attribute:password' => 'Password',
+	'Class:UserLocal/Attribute:password+' => '',
+	'Attachments:TabTitle_Count' => 'Vedhæftninger (%1$d)',
+	'Attachments:EmptyTabTitle' => 'Vedhæftninger',
+	'Attachments:FieldsetTitle' => 'Vedhæftninger',
+	'Attachments:DeleteBtn' => 'Slet',
+	'Attachments:History_File_Added' => 'Vedhæftning %1$s tilføjet.',
+	'Attachments:History_File_Removed' => 'Vedhæftning %1$s fjernet.',
+	'Attachments:AddAttachment' => 'Tilføj vedhæftning: ',
+	'Attachments:UploadNotAllowedOnThisSystem' => 'Fil upload er IKKE tilladt på dette system.',
+	'Attachment:Max_Go' => '(Maks. fil størrelse: %1$s Go)',
+	'Attachment:Max_Mo' => '(Maks. fil størrelse: %1$s Mo)',
+	'Attachment:Max_Ko' => '(Maks. fil størrelse: %1$s Ko)',
+	'Attachments:NoAttachment' => 'Ingen vedhæftning.',
+	'Relation:impacts/Description' => 'Elementer påvirket af',
+	'Relation:impacts/DownStream' => 'Påvrikning...',
+	'Relation:impacts/UpStream' => 'Afhænger af...',
+	'Relation:depends on/Description' => 'Elementer dette element er afhængig af',
+	'Relation:depends on/DownStream' => 'Afhænger af...',
+	'Relation:depends on/UpStream' => 'Påvirker...',
+	'Class:Organization/Attribute:parent_name' => 'Parent navn',
+	'Class:Organization/Attribute:parent_name+' => '',
+	'Class:Organization/Attribute:deliverymodel_name' => 'Leverings model navn',
+	'Class:Organization/Attribute:deliverymodel_name+' => '',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Parent',
+	'Class:Organization/Attribute:parent_id_friendlyname+' => '',
+	'Class:Location/Attribute:org_name' => 'Navn på ejer organisation',
+	'Class:Location/Attribute:org_name+' => '',
+	'Class:Contact' => 'Kontakt',
+	'Class:Contact+' => '',
+	'Class:Contact/Attribute:name' => 'Navn',
+	'Class:Contact/Attribute:name+' => '',
+	'Class:Contact/Attribute:status' => 'Status',
+	'Class:Contact/Attribute:status+' => '',
+	'Class:Contact/Attribute:status/Value:active' => 'Aktiv',
+	'Class:Contact/Attribute:status/Value:active+' => '',
+	'Class:Contact/Attribute:status/Value:inactive' => 'Inaktiv',
+	'Class:Contact/Attribute:status/Value:inactive+' => '',
+	'Class:Contact/Attribute:org_id' => 'Organisation',
+	'Class:Contact/Attribute:org_id+' => '',
+	'Class:Contact/Attribute:org_name' => 'Organisation navn',
+	'Class:Contact/Attribute:org_name+' => '',
+	'Class:Contact/Attribute:email' => 'Email',
+	'Class:Contact/Attribute:email+' => '',
+	'Class:Contact/Attribute:phone' => 'Telefon',
+	'Class:Contact/Attribute:phone+' => '',
+	'Class:Contact/Attribute:notify' => 'Besked',
+	'Class:Contact/Attribute:notify+' => '',
+	'Class:Contact/Attribute:notify/Value:no' => 'nej',
+	'Class:Contact/Attribute:notify/Value:no+' => '',
+	'Class:Contact/Attribute:notify/Value:yes' => 'ja',
+	'Class:Contact/Attribute:notify/Value:yes+' => '',
+	'Class:Contact/Attribute:function' => 'Funktion',
+	'Class:Contact/Attribute:function+' => '',
+	'Class:Contact/Attribute:cis_list' => 'CIs',
+	'Class:Contact/Attribute:cis_list+' => '',
+	'Class:Contact/Attribute:finalclass' => 'Kontakt Type',
+	'Class:Contact/Attribute:finalclass+' => '',
+	'Class:Person/Attribute:name' => 'Efternavn',
+	'Class:Person/Attribute:name+' => '',
+	'Class:Person/Attribute:location_name' => 'Lokations navn',
+	'Class:Person/Attribute:location_name+' => '',
+	'Class:Person/Attribute:manager_name' => 'Manager navn',
+	'Class:Person/Attribute:manager_name+' => '',
+	'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly navn',
+	'Class:Person/Attribute:manager_id_friendlyname+' => '',
+	'Class:Document' => 'Dokument',
+	'Class:Document+' => '',
+	'Class:Document/Attribute:name' => 'Navn',
+	'Class:Document/Attribute:name+' => '',
+	'Class:Document/Attribute:org_id' => 'Organisation',
+	'Class:Document/Attribute:org_id+' => '',
+	'Class:Document/Attribute:org_name' => 'Organisations navn',
+	'Class:Document/Attribute:org_name+' => '',
+	'Class:Document/Attribute:documenttype_id' => 'Dokument type',
+	'Class:Document/Attribute:documenttype_id+' => '',
+	'Class:Document/Attribute:documenttype_name' => 'Dokument type navn',
+	'Class:Document/Attribute:documenttype_name+' => '',
+	'Class:Document/Attribute:description' => 'Beskrivelse',
+	'Class:Document/Attribute:description+' => '',
+	'Class:Document/Attribute:status' => 'Status',
+	'Class:Document/Attribute:status+' => '',
+	'Class:Document/Attribute:status/Value:draft' => 'Udkast',
+	'Class:Document/Attribute:status/Value:draft+' => '',
+	'Class:Document/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:Document/Attribute:status/Value:obsolete+' => '',
+	'Class:Document/Attribute:status/Value:published' => 'Udgivet',
+	'Class:Document/Attribute:status/Value:published+' => '',
+	'Class:Document/Attribute:cis_list' => 'CIs',
+	'Class:Document/Attribute:cis_list+' => '',
+	'Class:Document/Attribute:contracts_list' => 'Kontrakter',
+	'Class:Document/Attribute:contracts_list+' => '',
+	'Class:Document/Attribute:services_list' => 'Services',
+	'Class:Document/Attribute:services_list+' => '',
+	'Class:Document/Attribute:finalclass' => 'Dokument Type',
+	'Class:Document/Attribute:finalclass+' => '',
+	'Class:FunctionalCI' => 'Functional CI',
+	'Class:FunctionalCI+' => '',
+	'Class:FunctionalCI/Attribute:name' => 'Navn',
+	'Class:FunctionalCI/Attribute:name+' => '',
+	'Class:FunctionalCI/Attribute:description' => 'Beskrivelse',
+	'Class:FunctionalCI/Attribute:description+' => '',
+	'Class:FunctionalCI/Attribute:org_id' => 'Organisation',
+	'Class:FunctionalCI/Attribute:org_id+' => '',
+	'Class:FunctionalCI/Attribute:organization_name' => 'Organisations navn',
+	'Class:FunctionalCI/Attribute:organization_name+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity' => 'Forretnings kritiskhed',
+	'Class:FunctionalCI/Attribute:business_criticity+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high' => 'Høj',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:high+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low' => 'Lav',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:low+' => '',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium' => 'Medium',
+	'Class:FunctionalCI/Attribute:business_criticity/Value:medium+' => '',
+	'Class:FunctionalCI/Attribute:move2production' => 'Flyttet til produktion dato',
+	'Class:FunctionalCI/Attribute:move2production+' => '',
+	'Class:FunctionalCI/Attribute:contacts_list' => 'Kontakter',
+	'Class:FunctionalCI/Attribute:contacts_list+' => '',
+	'Class:FunctionalCI/Attribute:documents_list' => 'Dokumenter',
+	'Class:FunctionalCI/Attribute:documents_list+' => '',
+	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Applikations løsninger',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '',
+	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Leverandør kontrakter',
+	'Class:FunctionalCI/Attribute:providercontracts_list+' => '',
+	'Class:FunctionalCI/Attribute:services_list' => 'Services',
+	'Class:FunctionalCI/Attribute:services_list+' => '',
+	'Class:FunctionalCI/Attribute:softwares_list' => 'Software',
+	'Class:FunctionalCI/Attribute:softwares_list+' => '',
+	'Class:FunctionalCI/Attribute:tickets_list' => 'Billetter',
+	'Class:FunctionalCI/Attribute:tickets_list+' => '',
+	'Class:FunctionalCI/Attribute:finalclass' => 'CI Type',
+	'Class:FunctionalCI/Attribute:finalclass+' => '',
+	'Class:PhysicalDevice' => 'Fysiske Enheder',
+	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serie nummer',
+	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
+	'Class:PhysicalDevice/Attribute:location_id' => 'Lokation',
+	'Class:PhysicalDevice/Attribute:location_id+' => '',
+	'Class:PhysicalDevice/Attribute:location_name' => 'Lokations navn',
+	'Class:PhysicalDevice/Attribute:location_name+' => '',
+	'Class:PhysicalDevice/Attribute:status' => 'Status',
+	'Class:PhysicalDevice/Attribute:status+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:PhysicalDevice/Attribute:status/Value:implementation+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:production' => 'Produktion',
+	'Class:PhysicalDevice/Attribute:status/Value:production+' => '',
+	'Class:PhysicalDevice/Attribute:status/Value:stock' => 'Lager',
+	'Class:PhysicalDevice/Attribute:status/Value:stock+' => '',
+	'Class:PhysicalDevice/Attribute:brand_id' => 'Mærke',
+	'Class:PhysicalDevice/Attribute:brand_id+' => '',
+	'Class:PhysicalDevice/Attribute:brand_name' => 'Mærke Navn',
+	'Class:PhysicalDevice/Attribute:brand_name+' => '',
+	'Class:PhysicalDevice/Attribute:model_id' => 'Model',
+	'Class:PhysicalDevice/Attribute:model_id+' => '',
+	'Class:PhysicalDevice/Attribute:model_name' => 'Model navn',
+	'Class:PhysicalDevice/Attribute:model_name+' => '',
+	'Class:PhysicalDevice/Attribute:asset_number' => 'Aktiv nummer',
+	'Class:PhysicalDevice/Attribute:asset_number+' => '',
+	'Class:PhysicalDevice/Attribute:purchase_date' => 'Købs dato',
+	'Class:PhysicalDevice/Attribute:purchase_date+' => '',
+	'Class:PhysicalDevice/Attribute:end_of_warranty' => 'Slut på Garanti',
+	'Class:PhysicalDevice/Attribute:end_of_warranty+' => '',
+	'Class:TelephonyCI' => 'Telefoni CI',
+	'Class:TelephonyCI+' => '',
+	'Class:TelephonyCI/Attribute:phonenumber' => 'Telefon nummer',
+	'Class:TelephonyCI/Attribute:phonenumber+' => '',
+	'Class:ConnectableCI' => 'Connectable CI',
+	'Class:ConnectableCI+' => '',
+	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Netværks enheder',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => '',
+	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Netværks interfaces',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => '',
+	'Class:DatacenterDevice' => 'Datacenter Enhed',
+	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
+	'Class:DatacenterDevice/Attribute:rack_id+' => '',
+	'Class:DatacenterDevice/Attribute:rack_name' => 'Rack navn',
+	'Class:DatacenterDevice/Attribute:rack_name+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_id' => 'Enclosure',
+	'Class:DatacenterDevice/Attribute:enclosure_id+' => '',
+	'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure navn',
+	'Class:DatacenterDevice/Attribute:enclosure_name+' => '',
+	'Class:DatacenterDevice/Attribute:nb_u' => 'Rack enheder',
+	'Class:DatacenterDevice/Attribute:nb_u+' => 'Antal units som enheden optager',
+	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip',
+	'Class:DatacenterDevice/Attribute:managementip+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_id' => 'Power kilde A',
+	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerA_name' => 'Power kilde A navn',
+	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_id' => 'Power kilde B',
+	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
+	'Class:DatacenterDevice/Attribute:powerB_name' => 'Power kilde B navn',
+	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'FC porte',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => '',
+	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
+	'Class:DatacenterDevice/Attribute:san_list+' => '',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Netværks type navn',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS version navn',
+	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
+	'Class:Server/Attribute:osfamily_name' => 'OS familie navn',
+	'Class:Server/Attribute:osfamily_name+' => '',
+	'Class:Server/Attribute:osversion_name' => 'OS version navn',
+	'Class:Server/Attribute:osversion_name+' => '',
+	'Class:Server/Attribute:oslicence_name' => 'OS licens navn',
+	'Class:Server/Attribute:oslicence_name+' => '',
+	'Class:PC/Attribute:osfamily_name' => 'OS familie navn',
+	'Class:PC/Attribute:osfamily_name+' => '',
+	'Class:PC/Attribute:osversion_name' => 'OS version navn',
+	'Class:PC/Attribute:osversion_name+' => '',
+	'Class:PowerConnection' => 'Power Connection',
+	'Class:PowerConnection+' => '',
+	'Class:PDU/Attribute:rack_name' => 'Rack navn',
+	'Class:PDU/Attribute:rack_name+' => '',
+	'Class:PDU/Attribute:powerstart_name' => 'Power start navn',
+	'Class:PDU/Attribute:powerstart_name+' => '',
+	'Class:Enclosure/Attribute:rack_name' => 'Rack navn',
+	'Class:Enclosure/Attribute:rack_name+' => '',
+	'Class:SoftwareInstance' => 'Software Instance',
+	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance/Attribute:system_id' => 'System',
+	'Class:SoftwareInstance/Attribute:system_id+' => '',
+	'Class:SoftwareInstance/Attribute:system_name' => 'System navn',
+	'Class:SoftwareInstance/Attribute:system_name+' => '',
+	'Class:SoftwareInstance/Attribute:software_id' => 'Software',
+	'Class:SoftwareInstance/Attribute:software_id+' => '',
+	'Class:SoftwareInstance/Attribute:software_name' => 'Software navn',
+	'Class:SoftwareInstance/Attribute:software_name+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id' => 'Software licens',
+	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name' => 'Software licens navn',
+	'Class:SoftwareInstance/Attribute:softwarelicence_name+' => '',
+	'Class:SoftwareInstance/Attribute:path' => 'Sti',
+	'Class:SoftwareInstance/Attribute:path+' => '',
+	'Class:SoftwareInstance/Attribute:status' => 'Status',
+	'Class:SoftwareInstance/Attribute:status+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:active' => 'aktiv',
+	'Class:SoftwareInstance/Attribute:status/Value:active+' => '',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive' => 'inaktiv',
+	'Class:SoftwareInstance/Attribute:status/Value:inactive+' => '',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware navn',
+	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => 'DB server navn',
+	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web server navn',
+	'Class:WebApplication/Attribute:webserver_name+' => '',
+	'Class:VirtualDevice' => 'Virtuel Enhed',
+	'Class:VirtualDevice+' => '',
+	'Class:VirtualDevice/Attribute:status' => 'Status',
+	'Class:VirtualDevice/Attribute:status+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:VirtualDevice/Attribute:status/Value:implementation+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:VirtualDevice/Attribute:status/Value:obsolete+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:production' => 'Produktion',
+	'Class:VirtualDevice/Attribute:status/Value:production+' => '',
+	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Lager',
+	'Class:VirtualDevice/Attribute:status/Value:stock+' => '',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Logical volumes',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => '',
+	'Class:VirtualHost' => 'Virtual Host',
+	'Class:VirtualHost+' => '',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtuelle maskiner',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => '',
+	'Class:Hypervisor/Attribute:farm_name' => 'Farm navn',
+	'Class:Hypervisor/Attribute:farm_name+' => '',
+	'Class:Hypervisor/Attribute:server_name' => 'Server navn',
+	'Class:Hypervisor/Attribute:server_name+' => '',
+	'Class:VirtualMachine/Attribute:virtualhost_name' => 'Virtual host navn',
+	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS familie navn',
+	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'OS version navn',
+	'Class:VirtualMachine/Attribute:osversion_name+' => '',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS licens navn',
+	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Storage system navn',
+	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
+	'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume navn',
+	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
+	'Class:lnkServerToVolume/Attribute:server_name' => 'Server navn',
+	'Class:lnkServerToVolume/Attribute:server_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => 'Volume navn',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => 'Virtuel enhed navn',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => 'SAN switch navn',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Enhed navn',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
+	'Class:Tape/Attribute:tapelibrary_name' => 'Tape library navn',
+	'Class:Tape/Attribute:tapelibrary_name+' => '',
+	'Class:NASFileSystem/Attribute:nas_name' => 'NAS navn',
+	'Class:NASFileSystem/Attribute:nas_name+' => '',
+	'Class:Patch' => 'Patch',
+	'Class:Patch+' => '',
+	'Class:Patch/Attribute:name' => 'Navn',
+	'Class:Patch/Attribute:name+' => '',
+	'Class:Patch/Attribute:documents_list' => 'Dokumenter',
+	'Class:Patch/Attribute:documents_list+' => '',
+	'Class:Patch/Attribute:description' => 'Beskrivelse',
+	'Class:Patch/Attribute:description+' => '',
+	'Class:Patch/Attribute:finalclass' => 'Type',
+	'Class:Patch/Attribute:finalclass+' => '',
+	'Class:OSPatch/Attribute:osversion_name' => 'OS version navn',
+	'Class:OSPatch/Attribute:osversion_name+' => '',
+	'Class:SoftwarePatch/Attribute:software_name' => 'Software navn',
+	'Class:SoftwarePatch/Attribute:software_name+' => '',
+	'Class:Licence' => 'Licens',
+	'Class:Licence+' => '',
+	'Class:Licence/Attribute:name' => 'Navn',
+	'Class:Licence/Attribute:name+' => '',
+	'Class:Licence/Attribute:documents_list' => 'Dokumenter',
+	'Class:Licence/Attribute:documents_list+' => '',
+	'Class:Licence/Attribute:org_id' => 'Organisation',
+	'Class:Licence/Attribute:org_id+' => '',
+	'Class:Licence/Attribute:organization_name' => 'Organisation navn',
+	'Class:Licence/Attribute:organization_name+' => '',
+	'Class:Licence/Attribute:usage_limit' => 'Forbrugs grænse',
+	'Class:Licence/Attribute:usage_limit+' => '',
+	'Class:Licence/Attribute:description' => 'Beskrivelse',
+	'Class:Licence/Attribute:description+' => '',
+	'Class:Licence/Attribute:start_date' => 'Start dato',
+	'Class:Licence/Attribute:start_date+' => '',
+	'Class:Licence/Attribute:end_date' => 'Slut dato',
+	'Class:Licence/Attribute:end_date+' => '',
+	'Class:Licence/Attribute:licence_key' => 'Nøgle',
+	'Class:Licence/Attribute:licence_key+' => 'Licens nøgle',
+	'Class:Licence/Attribute:perpetual' => 'Fortløbende',
+	'Class:Licence/Attribute:perpetual+' => '',
+	'Class:Licence/Attribute:perpetual/Value:no' => 'nej',
+	'Class:Licence/Attribute:perpetual/Value:no+' => '',
+	'Class:Licence/Attribute:perpetual/Value:yes' => 'ja',
+	'Class:Licence/Attribute:perpetual/Value:yes+' => '',
+	'Class:Licence/Attribute:finalclass' => 'Type',
+	'Class:Licence/Attribute:finalclass+' => '',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS version navn',
+	'Class:OSLicence/Attribute:osversion_name+' => '',
+	'Class:SoftwareLicence/Attribute:software_name' => 'Software navn',
+	'Class:SoftwareLicence/Attribute:software_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => 'Licens navn',
+	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
+	'Class:lnkDocumentToLicence/Attribute:document_name' => 'Dokument navn',
+	'Class:lnkDocumentToLicence/Attribute:document_name+' => '',
+	'Class:Typology' => 'Typologi',
+	'Class:Typology+' => '',
+	'Class:Typology/Attribute:name' => 'Navn',
+	'Class:Typology/Attribute:name+' => '',
+	'Class:Typology/Attribute:finalclass' => 'Type',
+	'Class:Typology/Attribute:finalclass+' => '',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS familie navn',
+	'Class:OSVersion/Attribute:osfamily_name+' => '',
+	'Class:Model/Attribute:brand_name' => 'Mærke navn',
+	'Class:Model/Attribute:brand_name+' => '',
+	'Class:IOSVersion/Attribute:brand_name' => 'Mærke navn',
+	'Class:IOSVersion/Attribute:brand_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch navn',
+	'Class:lnkDocumentToPatch/Attribute:patch_name+' => '',
+	'Class:lnkDocumentToPatch/Attribute:document_name' => 'Dokument navn',
+	'Class:lnkDocumentToPatch/Attribute:document_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch navn',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance navn',
+	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch navn',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software navn',
+	'Class:lnkDocumentToSoftware/Attribute:software_name+' => '',
+	'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Dokument navn',
+	'Class:lnkDocumentToSoftware/Attribute:document_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Dokument navn',
+	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
+	'Class:Subnet/Attribute:org_name' => 'Navn',
+	'Class:Subnet/Attribute:org_name+' => '',
+	'Class:NetworkInterface' => 'Netværks Interface',
+	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface/Attribute:name' => 'Navn',
+	'Class:NetworkInterface/Attribute:name+' => '',
+	'Class:NetworkInterface/Attribute:finalclass' => 'Type',
+	'Class:NetworkInterface/Attribute:finalclass+' => '',
+	'Class:IPInterface' => 'IP Interface',
+	'Class:IPInterface+' => '',
+	'Class:IPInterface/Attribute:ipaddress' => 'IP adresse',
+	'Class:IPInterface/Attribute:ipaddress+' => '',
+	'Class:IPInterface/Attribute:macaddress' => 'MAC adresse',
+	'Class:IPInterface/Attribute:macaddress+' => '',
+	'Class:IPInterface/Attribute:comment' => 'Kommentar',
+	'Class:IPInterface/Attribute:coment+' => '',
+	'Class:IPInterface/Attribute:ipgateway' => 'IP gateway',
+	'Class:IPInterface/Attribute:ipgateway+' => '',
+	'Class:IPInterface/Attribute:ipmask' => 'IP maske',
+	'Class:IPInterface/Attribute:ipmask+' => '',
+	'Class:IPInterface/Attribute:speed' => 'Hastighed',
+	'Class:IPInterface/Attribute:speed+' => '',
+	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Enheds navn',
+	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
+	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtuel maskine navn',
+	'Class:LogicalInterface/Attribute:virtualmachine_name+' => '',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Enheds navn',
+	'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Netværks enheds navn',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Forbundet enheds navn',
+	'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Applikations løsnings navn',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'FunctionalCI navn',
+	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Forretnings proces navn',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Applikations løsnings navn',
+	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:team_name' => 'Team navn',
+	'Class:lnkPersonToTeam/Attribute:team_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:person_name' => 'Person navn',
+	'Class:lnkPersonToTeam/Attribute:person_name+' => '',
+	'Class:lnkPersonToTeam/Attribute:role_name' => 'Rolle navn',
+	'Class:lnkPersonToTeam/Attribute:role_name+' => '',
+	'Class:Group/Attribute:owner_name' => 'Navn',
+	'Class:Group/Attribute:owner_name+' => '',
+	'Class:Group/Attribute:parent_name' => 'Navn',
+	'Class:Group/Attribute:parent_name+' => '',
+	'Class:Group/Attribute:parent_id_friendlyname' => 'Parent Gruppe',
+	'Class:Group/Attribute:parent_id_friendlyname+' => '',
+	'Class:lnkGroupToCI/Attribute:group_name' => 'Navn',
+	'Class:lnkGroupToCI/Attribute:group_name+' => '',
+	'Class:lnkGroupToCI/Attribute:ci_name' => 'Navn',
+	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
+	'Menu:Catalogs' => 'Kataloger',
+	'Menu:Catalogs+' => '',
+	'Menu:Audit' => 'Audit',
+	'Menu:Audit+' => '',
+	'Menu:Organization' => 'Organisationer',
+	'Menu:Organization+' => '',
+	'Menu:Application' => 'Applikationer',
+	'Menu:Application+' => '',
+	'Menu:DBServer' => 'Database servere',
+	'Menu:DBServer+' => '',
+	'Menu:ConfigManagement' => 'Konfigurations Management',
+	'Menu:ConfigManagement+' => '',
+	'Menu:ConfigManagementOverview' => 'Overblik',
+	'Menu:ConfigManagementOverview+' => '',
+	'Menu:Contact' => 'Kontakter',
+	'Menu:Contact+' => '',
+	'Menu:Contact:Count' => '%1$d kontakter',
+	'Menu:Person' => 'Personer',
+	'Menu:Person+' => '',
+	'Menu:Team' => 'Teams',
+	'Menu:Team+' => '',
+	'Menu:Document' => 'Dokumenter',
+	'Menu:Document+' => '',
+	'Menu:Location' => 'Lokationer',
+	'Menu:Location+' => '',
+	'Menu:ConfigManagementCI' => 'Konfigurations emner',
+	'Menu:ConfigManagementCI+' => '',
+	'Menu:BusinessProcess' => 'Forretnings processer',
+	'Menu:BusinessProcess+' => '',
+	'Menu:ApplicationSolution' => 'Applikations løsninger',
+	'Menu:ApplicationSolution+' => '',
+	'Menu:ConfigManagementSoftware' => 'Applikations management',
+	'Menu:Licence' => 'Licenser',
+	'Menu:Licence+' => '',
+	'Menu:Patch' => 'Patches',
+	'Menu:Patch+' => '',
+	'Menu:ApplicationInstance' => 'Installeret software',
+	'Menu:ApplicationInstance+' => '',
+	'Menu:ConfigManagementHardware' => 'Infrastruktur management',
+	'Menu:Subnet' => 'Subnets',
+	'Menu:Subnet+' => '',
+	'Menu:NetworkDevice' => 'Netværks enheder',
+	'Menu:NetworkDevice+' => '',
+	'Menu:Server' => 'Servere',
+	'Menu:Server+' => '',
+	'Menu:Printer' => 'Printere',
+	'Menu:Printer+' => '',
+	'Menu:MobilePhone' => 'Mobil telefoner',
+	'Menu:MobilePhone+' => '',
+	'Menu:PC' => 'Personlige computere',
+	'Menu:PC+' => '',
+	'Menu:NewContact' => 'Ny kontakt',
+	'Menu:NewContact+' => '',
+	'Menu:SearchContacts' => 'Søg efter kontakt',
+	'Menu:SearchContacts+' => '',
+	'Menu:NewCI' => 'Ny CI',
+	'Menu:NewCI+' => '',
+	'Menu:SearchCIs' => 'Søg efter CIs',
+	'Menu:SearchCIs+' => '',
+	'Menu:ConfigManagement:Devices' => 'Enheder',
+	'Menu:ConfigManagement:AllDevices' => 'Infrastruktur',
+	'Menu:ConfigManagement:virtualization' => 'Virtualization',
+	'Menu:ConfigManagement:EndUsers' => 'Slut bruger enheder',
+	'Menu:ConfigManagement:SWAndApps' => 'Software og applikationer',
+	'Menu:ConfigManagement:Misc' => 'Forskelligt',
+	'Menu:Group' => 'Gruppe af CIs',
+	'Menu:Group+' => '',
+	'Menu:ConfigManagement:Shortcuts' => 'Genveje',
+	'Menu:ConfigManagement:AllContacts' => 'Alle kontakter: %1$d',
+	'Menu:Typology' => 'Typologi konfiguration',
+	'Menu:Typology+' => '',
+	'Menu:OSVersion' => 'OS versioner',
+	'Menu:OSVersion+' => '',
+	'Menu:Software' => 'Software katalog',
+	'Menu:Software+' => '',
+	'UI_WelcomeMenu_AllConfigItems' => 'Sammenfatning',
+	'Menu:ConfigManagement:Typology' => 'Typologi konfiguration',
+	'Server:baseinfo' => 'Generelle informationer',
+	'Server:Date' => 'Dato',
+	'Server:moreinfo' => 'Mere information',
+	'Server:otherinfo' => 'Andre informationer',
+	'Person:info' => 'Generelle informationer',
+	'Person:notifiy' => 'Underretning',
+	'Class:Subnet/Tab:IPUsage' => 'IP Brug',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces der har en IP i området: <em>%1$s</em> til <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Ledige IP',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Ledige IP: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Her er et udtræk af 10 ledige IP adresser',
+	'Menu:ServiceManagement' => 'Service Management',
+	'Menu:ServiceManagement+' => '',
+	'Menu:Service:Overview' => 'Overblik',
+	'Menu:Service:Overview+' => '',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Kontrakter efter service level',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Kontrakter efter status',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Kontrakter som udløber om mindre end 30 dage',
+	'Menu:ProviderContract' => 'Leverandør kontrakter',
+	'Menu:ProviderContract+' => '',
+	'Menu:CustomerContract' => 'Kunde kontrakter',
+	'Menu:CustomerContract+' => '',
+	'Menu:ServiceSubcategory' => 'Service subkategorier',
+	'Menu:ServiceSubcategory+' => '',
+	'Menu:Service' => 'Services',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'Sevice elementer',
+	'Menu:ServiceElement+' => '',
+	'Menu:SLA' => 'SLAer',
+	'Menu:SLA+' => '',
+	'Menu:SLT' => 'SLTer',
+	'Menu:SLT+' => '',
+	'Menu:DeliveryModel' => 'Leverings modeller',
+	'Menu:DeliveryModel+' => '',
+	'Menu:ServiceFamily' => 'Service familier',
+	'Menu:ServiceFamily+' => '',
+	'Menu:Procedure' => 'Procedure katalog',
+	'Menu:Procedure+' => '',
+	'Class:Contract' => 'Kontrakt',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => 'Navn',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => 'Kunde',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => 'Kunde navn',
+	'Class:Contract/Attribute:organization_name+' => '',
+	'Class:Contract/Attribute:contacts_list' => 'Kontakter',
+	'Class:Contract/Attribute:contacts_list+' => '',
+	'Class:Contract/Attribute:documents_list' => 'Dokumenter',
+	'Class:Contract/Attribute:documents_list+' => '',
+	'Class:Contract/Attribute:description' => 'Beskrivelse',
+	'Class:Contract/Attribute:description+' => '',
+	'Class:Contract/Attribute:start_date' => 'Start dato',
+	'Class:Contract/Attribute:start_date+' => '',
+	'Class:Contract/Attribute:end_date' => 'Slut dato',
+	'Class:Contract/Attribute:end_date+' => '',
+	'Class:Contract/Attribute:cost' => 'Omkostning',
+	'Class:Contract/Attribute:cost+' => '',
+	'Class:Contract/Attribute:cost_currency' => 'Omkostnings valuta',
+	'Class:Contract/Attribute:cost_currency+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dollars',
+	'Class:Contract/Attribute:cost_currency/Value:dollars+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
+	'Class:Contract/Attribute:cost_currency/Value:kroner' => 'Danske kroner',
+	'Class:Contract/Attribute:cost_currency/Value:kroner+' => '',
+	'Class:Contract/Attribute:contracttype_id' => 'Kontrakt type',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => 'Kontrakt type navn',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => 'Fakturerings frekvens',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => 'Omkostnings enhed',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'Leverandør',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'Leverandør navn',
+	'Class:Contract/Attribute:provider_name+' => '',
+	'Class:Contract/Attribute:status' => 'Status',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => 'Implementering',
+	'Class:Contract/Attribute:status/Value:implementation+' => '',
+	'Class:Contract/Attribute:status/Value:obsolete' => 'Forældet',
+	'Class:Contract/Attribute:status/Value:obsolete+' => '',
+	'Class:Contract/Attribute:status/Value:production' => 'Produktion',
+	'Class:Contract/Attribute:status/Value:production+' => '',
+	'Class:Contract/Attribute:finalclass' => 'Type',
+	'Class:Contract/Attribute:finalclass+' => '',
+	'Class:ProviderContract/Attribute:contracttype_id' => 'Kontrakt type',
+	'Class:ProviderContract/Attribute:contracttype_id+' => '',
+	'Class:ProviderContract/Attribute:contracttype_name' => 'Kontrakt type navn',
+	'Class:ProviderContract/Attribute:contracttype_name+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => 'Kontrakt navn',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => 'Kontrakt navn',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => 'Dokument navn',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+	'Class:Service/Attribute:organization_name' => 'Leverandør navn',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'Service Familie navn',
+	'Class:Service/Attribute:servicefamily_name+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'Service navn',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => 'Dokument navn',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'Service navn',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+	'Class:ServiceSubcategory/Attribute:service_name' => 'Service navn',
+	'Class:ServiceSubcategory/Attribute:service_name+' => '',
+	'Class:SLA/Attribute:organization_name' => 'Leverandør navn',
+	'Class:SLA/Attribute:organization_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA navn',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT navn',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Kunde kontrakt navn',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service navn',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA navn',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'Service navn',
+	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Leverandør kontrakt navn',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'Service navn',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => 'Organisations navn',
+	'Class:DeliveryModel/Attribute:organization_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => 'Leverings model navn',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => 'Kontakt navn',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Rolle navn',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+	'Class:Ticket/Attribute:org_name' => 'Organisation navn',
+	'Class:Ticket/Attribute:org_name+' => '',
+	'Class:Ticket/Attribute:caller_name' => 'Rekvirent navn',
+	'Class:Ticket/Attribute:caller_name+' => '',
+	'Class:Ticket/Attribute:team_name' => 'Team navn',
+	'Class:Ticket/Attribute:team_name+' => '',
+	'Class:Ticket/Attribute:agent_name' => 'Agent navn',
+	'Class:Ticket/Attribute:agent_name+' => '',
+	'Class:lnkContactToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkContactToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkContactToTicket/Attribute:contact_email' => 'Kontakt Email',
+	'Class:lnkContactToTicket/Attribute:contact_email+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'CI navn',
+	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name+' => '',
+	'Class:WorkOrder/Attribute:ticket_ref' => 'Billet ref',
+	'Class:WorkOrder/Attribute:ticket_ref+' => '',
+	'Class:WorkOrder/Attribute:team_name' => 'Team navn',
+	'Class:WorkOrder/Attribute:team_name+' => '',
+	'Class:WorkOrder/Attribute:agent_email' => 'Agent email',
+	'Class:WorkOrder/Attribute:agent_email+' => '',
+	'Ticket:baseinfo' => 'Generel Information',
+	'Ticket:date' => 'Datoer',
+	'Ticket:contact' => 'Kontakter',
+	'Ticket:moreinfo' => 'Mere Information',
+	'Ticket:relation' => 'Relationer',
+	'Ticket:log' => 'Kommunikation',
+	'Ticket:Type' => 'Kvalifikationer',
+	'Ticket:support' => 'Support',
+	'Ticket:resolution' => 'Løsning',
+	'Ticket:SLA' => 'SLA rapport',
+	'WorkOrder:Details' => 'Detaljer',
+	'WorkOrder:Moreinfo' => 'Flere informationer',
+	'Menu:ChangeManagement' => 'Change management',
+	'Menu:Change:Overview' => 'Overblik',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => 'Ny change',
+	'Menu:NewChange+' => '',
+	'Menu:SearchChanges' => 'Søg efter changes',
+	'Menu:SearchChanges+' => '',
+	'Menu:Change:Shortcuts' => 'Genveje',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => 'Changes der afventer accept',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => 'Changes der afventer godkendelse',
+	'Menu:WaitingApproval+' => '',
+	'Menu:Changes' => 'Åbne changes',
+	'Menu:Changes+' => '',
+	'Menu:MyChanges' => 'Changes tildelt til mig',
+	'Menu:MyChanges+' => '',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => 'Changes efter kategori for de sidste 7 dage',
+	'UI-ChangeManagementOverview-Last-7-days' => 'Antal af changes de sidste 7 dage',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => 'Changes efter domain de sidste 7 dage',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => 'Changes efter status de sidste 7 dage',
+	'Class:Change/Attribute:changemanager_email' => 'Change manager email',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_name' => 'Parent change ref',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:related_incident_list' => 'Relaterede incidents',
+	'Class:Change/Attribute:related_incident_list+' => '',
+	'Class:Change/Attribute:related_problems_list' => 'Relaterede problemer',
+	'Class:Change/Attribute:related_problems_list+' => '',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent change friendly name',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Menu:RequestManagement' => 'Helpdesk',
+	'Menu:RequestManagement+' => '',
+	'Menu:RequestManagementProvider' => 'Helpdesk leverandør',
+	'Menu:RequestManagementProvider+' => '',
+	'Menu:UserRequest:Provider' => 'Åbne anmodninger overført til leverandør',
+	'Menu:UserRequest:Provider+' => '',
+	'Menu:UserRequest:Overview' => 'Overblik',
+	'Menu:UserRequest:Overview+' => '',
+	'Menu:NewUserRequest' => 'Ny bruger anmodning',
+	'Menu:NewUserRequest+' => '',
+	'Menu:SearchUserRequests' => 'Søg efter bruger anmodninger',
+	'Menu:SearchUserRequests+' => '',
+	'Menu:UserRequest:Shortcuts' => 'Genveje',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => 'Anmodninger tildelt til mig',
+	'Menu:UserRequest:MyRequests+' => '',
+	'Menu:UserRequest:MySupportRequests' => 'Mine support kald',
+	'Menu:UserRequest:MySupportRequests+' => '',
+	'Menu:UserRequest:EscalatedRequests' => 'Hot anmodninger',
+	'Menu:UserRequest:EscalatedRequests+' => '',
+	'Menu:UserRequest:OpenRequests' => 'Alle åbne anmodninger',
+	'Menu:UserRequest:OpenRequests+' => '',
+	'UI:WelcomeMenu:MyAssignedCalls' => 'Anmodninger tildelt til mig',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => 'Anmodninger de sidste 14 dage (efter type)',
+	'UI-RequestManagementOverview-Last-14-days' => 'Anmodninger de sidste 14 dage (per dag)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Åbne anmodninger efter status',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Åbne anmodninger efter agent',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Åbne anmodninger efter type',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Åbne anmodninger efter organisation',
+	'Class:UserRequest:KnownErrorList' => 'Kendte Fejl (Known Errors)',
+	'Menu:UserRequest:MyWorkOrders' => 'Arbejds ordrer tildelt til mig',
+	'Menu:UserRequest:MyWorkOrders+' => '',
+	'Class:Problem:KnownProblemList' => 'Kendte problemer (Known problems)',
+	'Class:UserRequest/Attribute:approver_email' => 'Godkender Email',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'Service navn',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Service subkategori navn',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref anmodning',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => 'Parent problem',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref problem',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref change',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => 'parent_request_id_friendlyname',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Portal:TitleDetailsFor_Request' => 'Detaljer for anmodning',
+	'Portal:ButtonUpdate' => 'Opdater',
+	'Portal:ButtonClose' => 'Luk',
+	'Portal:ButtonReopen' => 'Genåben',
+	'Portal:ShowServices' => 'Service katalog',
+	'Portal:SelectRequestType' => 'Vælg en type af anmodning',
+	'Portal:SelectServiceElementFrom_Service' => 'Vælg et service element for %1$s',
+	'Portal:SelectRequestTemplate' => 'Vælg en skabelon for %1$s',
+	'Portal:ListServices' => 'Liste af services',
+	'Portal:TitleDetailsFor_Service' => 'Detaljer for Service',
+	'Portal:Button:CreateRequestFromService' => 'Opret en anmodning for denne service',
+	'Portal:ListOpenRequests' => 'Vis åbne anmodninger',
+	'Portal:UserRequest:MoreInfo' => 'Mere information',
+	'Portal:Details-Service-Element' => 'Service elementer',
+	'Portal:NoClosedTicket' => 'Ingen lukkede anmodninger',
+	'Portal:NoService' => 'Ingen service',
+	'Portal:ListOpenProblems' => 'Vis åbne problemer',
+	'Portal:ShowProblem' => 'Problemer',
+	'Portal:ShowFaqs' => 'FAQs',
+	'Portal:NoOpenProblem' => 'Ingen åbne problemer',
+	'Portal:SelectLanguage' => 'Skift sprog',
+	'Portal:LanguageChangedTo_Lang' => 'Sprog ændret til',
+	'Portal:ChooseYourFavoriteLanguage' => 'Vælg favorit sprog',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+));
 ?>
\ No newline at end of file
diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php
index ab8e2cc7d..f8f7da89c 100644
--- a/dictionaries/da.dictionary.itop.ui.php
+++ b/dictionaries/da.dictionary.itop.ui.php
@@ -1,1134 +1,1134 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @author Erik Bøg <erik@boegmoeller.dk>
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('DA DA', 'Danish', 'Dansk', array(
-	'Class:QueryOQL' => 'OQL forespørgsel',
-	'Class:QueryOQL+' => '',
-	'Class:QueryOQL/Attribute:oql' => 'Udtryk',
-	'Class:QueryOQL/Attribute:oql+' => '',
-	'Class:ShortcutOQL' => 'Søge resultat genvej',
-	'Class:ShortcutOQL+' => '',
-	'Class:ShortcutOQL/Attribute:oql' => 'Søgning',
-	'Class:ShortcutOQL/Attribute:oql+' => '',
-	'Class:AuditRule' => 'Audit-regel',
-	'Class:AuditRule+' => 'En regel til at efterprøve den angivne Audit-kategori med',
-	'Class:AuditRule/Attribute:name' => 'Regel Navn',
-	'Class:AuditRule/Attribute:name+' => 'Kort navn for denne regel',
-	'Class:AuditRule/Attribute:description' => 'Audit-regel beskrivelse',
-	'Class:AuditRule/Attribute:description+' => 'Udførlig beskrivelse af denne Audit-regel',
-	'Class:AuditRule/Attribute:query' => 'Søgning at udføre',
-	'Class:AuditRule/Attribute:query+' => 'Den OQL forespørgsel, der skal udføres',
-	'Class:AuditRule/Attribute:valid_flag' => 'Gyldige objekter?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'Sand, hvis reglen returnerer et gyldigt objekt, ellers Falsk',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'Falsk',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Falsk',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Sand',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'Sand',
-	'Class:AuditRule/Attribute:category_id' => 'Kategori',
-	'Class:AuditRule/Attribute:category_id+' => 'Kategori for denne regel',
-	'Class:AuditCategory' => 'Audit-kategori',
-	'Class:AuditCategory+' => 'Udsnit af alle Audits',
-	'Class:AuditCategory/Attribute:name' => 'Kategori navn',
-	'Class:AuditCategory/Attribute:name+' => 'Kort navn for denne kategori',
-	'Class:AuditCategory/Attribute:description' => 'Beskrivelse af Audit-kategori',
-	'Class:AuditCategory/Attribute:description+' => 'Udførlig beskrivelse af denne Audit-kategori',
-	'Class:AuditCategory/Attribute:definition_set' => 'Definition Set',
-	'Class:AuditCategory/Attribute:definition_set+' => 'OQL begreber, der definerer omfanget af objekter, der skal auditeres',
-	'Class:AuditCategory/Attribute:rules_list' => 'Audit-regler',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Audit-regler for denne kategori',
-	'Class:URP_Profiles' => 'Profil',
-	'Class:URP_Profiles+' => 'Brugerprofil',
-	'Class:URP_Profiles/Attribute:name' => 'Navn',
-	'Class:URP_Profiles/Attribute:name+' => 'Label',
-	'Class:URP_Profiles/Attribute:description' => 'Beskrivele',
-	'Class:URP_Profiles/Attribute:description+' => 'Kort beskrivelse',
-	'Class:URP_Profiles/Attribute:user_list' => 'Brugere',
-	'Class:URP_Profiles/Attribute:user_list+' => 'Personer, der har denne Rolle',
-	'Class:URP_UserProfile' => 'Brugerprofil',
-	'Class:URP_UserProfile+' => 'Brugerprofil',
-	'Class:URP_UserProfile/Attribute:userid' => 'Bruger',
-	'Class:URP_UserProfile/Attribute:userid+' => 'Brugerkonto',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'Anvend profil',
-	'Class:URP_UserProfile/Attribute:reason' => 'Begrundelse',
-	'Class:URP_UserProfile/Attribute:reason+' => 'Begrundelse, hvorfor denne bruger skal have denne profil',
-	'Class:URP_UserOrg' => 'Bruger organisation(er)',
-	'Class:URP_UserOrg+' => 'Tilladte organisation(er)',
-	'Class:URP_UserOrg/Attribute:userid' => 'Bruger',
-	'Class:URP_UserOrg/Attribute:userid+' => '',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organisation',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
-	'Class:URP_UserOrg/Attribute:reason' => 'Begrundelse',
-	'Class:URP_UserOrg/Attribute:reason+' => '',
-	'Class:AuditRule/Attribute:category_name' => 'Kategori',
-	'Class:AuditRule/Attribute:category_name+' => 'Kategorinavn for denne regel',
-	'Class:Query' => 'Forespørgsel',
-	'Class:Query+' => '',
-	'Class:Query/Attribute:name' => 'Navn',
-	'Class:Query/Attribute:name+' => '',
-	'Class:Query/Attribute:description' => 'Beskrivelse',
-	'Class:Query/Attribute:description+' => '',
-	'Class:Query/Attribute:fields' => 'Felter',
-	'Class:Query/Attribute:fields+' => '',
-	'Class:User' => 'Bruger',
-	'Class:User+' => 'Bruger log in',
-	'Class:User/Attribute:finalclass' => 'Type af brugerkonto',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => 'kontakt (person)',
-	'Class:User/Attribute:contactid+' => 'Personlige oplysninger og virksomheds data',
-	'Class:User/Attribute:last_name' => 'Efternavn',
-	'Class:User/Attribute:last_name+' => 'Kontaktens efternavn',
-	'Class:User/Attribute:first_name' => 'Fornavn',
-	'Class:User/Attribute:first_name+' => 'Kontaktens fornavn',
-	'Class:User/Attribute:email' => 'Email-adresse',
-	'Class:User/Attribute:email+' => 'Kontaktens Email-adresse',
-	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'Bruger navn',
-	'Class:User/Attribute:language' => 'Sprog',
-	'Class:User/Attribute:language+' => 'Bruger valgt sprog',
-	'Class:User/Attribute:language/Value:EN US' => 'Englsk',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'Fransk',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:profile_list' => 'Profiler',
-	'Class:User/Attribute:profile_list+' => 'Roller, rettighedsstyring for denne person',
-	'Class:User/Attribute:allowed_org_list' => 'Tilladte organisation(er)',
-	'Class:User/Attribute:allowed_org_list+' => 'Brugeren har tilladelse til at se data om følgende organisationer. Hvis ingen organisation er vist, er der ingen indskrænkninger',
-	'Class:User/Error:LoginMustBeUnique' => 'Login skal være entydig - "%1s" er allerede i brug.',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindst en profil skal knyttes til denne bruger.',
-	'Class:URP_Dimensions' => 'Dimension',
-	'Class:URP_Dimensions+' => 'Anvendelsesdimension (Fastlæggelse af siloer)',
-	'Class:URP_Dimensions/Attribute:name' => 'Navn',
-	'Class:URP_Dimensions/Attribute:name+' => 'Label',
-	'Class:URP_Dimensions/Attribute:description' => 'Beskrivelse',
-	'Class:URP_Dimensions/Attribute:description+' => 'Kort beskrivelse',
-	'Class:URP_Dimensions/Attribute:type' => 'Type',
-	'Class:URP_Dimensions/Attribute:type+' => 'Klassenavn eller datatype',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'Bruger login',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Profilnavn',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => '',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organisation',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
-	'Class:URP_ProfileProjection' => 'Profil_projection',
-	'Class:URP_ProfileProjection+' => 'Profilbillede',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimension',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'Anvendelsesdimension',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimension',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'Anvendelsesdimension',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profile',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'Profil vilkår',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Profil',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Profilnavn',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Værdi udtryk',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL-udtryk (Benyttes af $user) | konstant | | + Attribut-Code',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribut',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Mål for Attribut-kode (valgfri)',
-	'Class:URP_ClassProjection' => 'Klasse_projection',
-	'Class:URP_ClassProjection+' => 'Klassebillede',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimension',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'Anvendelsesdimension',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimension',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'Anvendelsesdimension',
-	'Class:URP_ClassProjection/Attribute:class' => 'Klasse',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Målklasse',
-	'Class:URP_ClassProjection/Attribute:value' => 'Værdi udtryk',
-	'Class:URP_ClassProjection/Attribute:value+' => 'OQL-udtryk (Benyttes af $this) | konstant | | + Attribut-Code',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribut',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Mål for Attribut-kode (valgfri)',
-	'Class:URP_ActionGrant' => 'Handlings godkendelser',
-	'Class:URP_ActionGrant+' => 'Tilladelser på klasser',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'Anvendelsesprofil',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profil',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'Anvendelsesprofil',
-	'Class:URP_ActionGrant/Attribute:class' => 'Klasse',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Målklasse',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Tilladelse',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'Tilladt eller nægtet?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Ja',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'Ja',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nej',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'Nej',
-	'Class:URP_ActionGrant/Attribute:action' => 'Handling',
-	'Class:URP_ActionGrant/Attribute:action+' => 'Handling som skal udføres på den valgte klasse',
-	'Class:URP_StimulusGrant' => 'Tilladels til påvirkning',
-	'Class:URP_StimulusGrant+' => 'Tilladelserne til påvirkning af livscyklus af objektet',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Anvendelsesprofil',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profil',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'Anvendelsesprofil',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Klasse',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'Målklasse',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Tilladelse',
-	'Class:URP_StimulusGrant/Attribute:permission+' => 'Tilladt eller nægtet?',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Js',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'Ja',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nej',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'Nej',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Påvirkning',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'Påvirknings-kode',
-	'Class:URP_AttributeGrant' => 'Godkendelse af Attributter',
-	'Class:URP_AttributeGrant+' => 'Godkendelse af Attributter',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Tillad handling',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'Tillad handling',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribut',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Attribut-kode',
-	'Menu:WelcomeMenu' => 'Velkomen',
-	'Menu:WelcomeMenu+' => 'Velkommen til iTop',
-	'Menu:WelcomeMenuPage' => 'Velkomen',
-	'Menu:WelcomeMenuPage+' => 'Velkommen til iTop',
-	'UI:WelcomeMenu:Title' => 'Velkommen til iTop',
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop er en komplet, OpenSource, webbaseret IT-Service-Management-Værktøj.</p>
-<ul>Den inkluderer:
-<li>En komplet CMDB (Configuration management database) til at dokumentere og styre IT-portfolioen.</li>
-<li>Et Incident management modul til brug for sporing og kommunikation omkring alle spørgsmål vedrørende IT.</li>
-<li>Et change management modul til planlægning og sporing af ændringer i IT miljøet.</li>
-<li>En "known error database" til brug for at mindske tiden for løsning af hændelser.</li>
-<li>Et outage modul til dokumentation for planlagt nedetid og advisering af relevante kontakter.</li>
-<li>Dashboards for hurtigt overblik over IT.</li>
-</ul>
-<p>Alle moduler kan installeres, step by step, uafhængigt af hinanden.</p>',
-	'UI:WelcomeMenu:RightBlock' => '<p>iTop er service udbyder orienteret, det tillader let IT teknikere at administrere flere kunder eller organisationer.
-<ul>iTop, leverer et feature-rich sæt af forretnings processer som:
-<li>Forøger IT administrationens effektivitet</li> 
-<li>Drives IT operations performance</li> 
-<li>Improves customer satisfaction and provides executives with insights into business performance.</li>
-</ul>
-</p>
-<p>iTop is completely open to be integrated within your current IT Management infrastructure.</p>
-<p>
-<ul>Adopting this new generation of IT Operational portal will help you to:
-<li>Better manage a more and more complex IT environment.</li>
-<li>Implement ITIL processes at your own pace.</li>
-<li>Manage the most important asset of your IT: Documentation.</li>
-</ul>
-</p>~~',
-	'UI:WelcomeMenu:AllOpenRequests' => 'Åbne anmodninger: %1$d',
-	'UI:WelcomeMenu:MyCalls' => 'Mine brugerhenvendelser',
-	'UI:WelcomeMenu:OpenIncidents' => 'Åbne Incidents: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => 'Configuration Items: %1$d',
-	'UI:WelcomeMenu:MyIncidents' => 'Incidents tildelt mig',
-	'UI:AllOrganizations' => ' Alle Organisationer',
-	'UI:YourSearch' => 'Din Søgning',
-	'UI:LoggedAsMessage' => 'Logget ind som %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logget ind som %1$s (Administrator)',
-	'UI:Button:Logoff' => 'Log ud',
-	'UI:Button:GlobalSearch' => 'Søg',
-	'UI:Button:Search' => ' Søg ',
-	'UI:Button:Query' => ' Forespørgsel ',
-	'UI:Button:Ok' => 'Ok',
-	'UI:Button:Save' => 'Gem',
-	'UI:Button:Cancel' => 'Afbryd',
-	'UI:Button:Apply' => 'Anvend',
-	'UI:Button:Back' => ' << Tilbage ',
-	'UI:Button:Restart' => ' |<< Start igen ',
-	'UI:Button:Next' => ' Næste >> ',
-	'UI:Button:Finish' => ' Afslut ',
-	'UI:Button:DoImport' => ' Kør Importen ! ',
-	'UI:Button:Done' => ' Færdig ',
-	'UI:Button:SimulateImport' => ' Simuler Importen ',
-	'UI:Button:Test' => 'Test!',
-	'UI:Button:Evaluate' => ' Evaluér ',
-	'UI:Button:Evaluate:Title' => ' Evaluér (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' Tilføj... ',
-	'UI:Button:BrowseObjects' => ' Gennemse... ',
-	'UI:Button:Add' => ' Tilføj ',
-	'UI:Button:AddToList' => ' << Tilføj ',
-	'UI:Button:RemoveFromList' => ' Fjern >> ',
-	'UI:Button:FilterList' => ' Filter... ',
-	'UI:Button:Create' => ' Opret ',
-	'UI:Button:Delete' => ' Slet! ',
-	'UI:Button:Rename' => ' Omdøb... ',
-	'UI:Button:ChangePassword' => ' Skift Password ',
-	'UI:Button:ResetPassword' => ' Reset Password ',
-	'UI:SearchToggle' => 'Søg',
-	'UI:ClickToCreateNew' => 'Opret nyt objekt af typen %1$s ',
-	'UI:SearchFor_Class' => 'Søg efter objekter af typen %1$s ',
-	'UI:NoObjectToDisplay' => 'Ingen objekter at vise.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parameter objekt_id er obligatorisk når link_attr er specificeret. Tjek definitionen af display skabelonen.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parameter objekt_id er obligatorisk når link_attr er specificeret. Tjek definitionen af display skabelonen.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by er obligatorisk. Tjek definitionen af display skabelonen.',
-	'UI:Error:InvalidGroupByFields' => 'Ugyldig liste af felter at gruppere efter: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'Fejl: ikke understøttet blokform: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Ukorrekt link definition: klassen af ​​objekter, der skal styres: %1$s blev ikke fundet som fremmednøgle i klassen %2$s',
-	'UI:Error:Object_Class_Id_NotFound' => 'Objekt: %1$s:%2$d ikke fundet.',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'Fejl: Circulær reference i afhængigheder mellem felterne, tjek datamodellen.',
-	'UI:Error:UploadedFileTooBig' => 'Den uploadede fil er for stor. (Max tilladt størrelse er %1$s). Kontakt din iTop administrator for at få ændret denne grænse limit. (Tjek PHP konfigurationen for upload_max_filesize og post_max_size på serveren).',
-	'UI:Error:UploadedFileTruncated.' => 'Den uploadede fil er blevet afkortet !',
-	'UI:Error:NoTmpDir' => 'Det midlertidige bibliotek er ikke defineret.',
-	'UI:Error:CannotWriteToTmp_Dir' => 'Kan ikke skrive den midlertidige fil til disken: upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload stoppet på grund af filtype. (Original fil navn = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'Fil upload fejlede, ukendt årsag. (Fejl kode = "%1$s").',
-	'UI:Error:1ParametersMissing' => 'Fejl: følgende parameter skal angives for denne operation: %1$s.',
-	'UI:Error:2ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s and %2$s.',
-	'UI:Error:3ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s, %2$s and %3$s.',
-	'UI:Error:4ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s, %2$s, %3$s and %4$s.',
-	'UI:Error:IncorrectOQLQuery_Message' => 'Fejl: Ukorrekt OQL forespørgsel: %1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Der opstod en fejl ved afvikling af forespørgslen: %1$s',
-	'UI:Error:ObjectAlreadyUpdated' => 'Fejl: objektet er allerede opdateret.',
-	'UI:Error:ObjectCannotBeUpdated' => 'Fejl: objektet kan ikke opdateres.',
-	'UI:Error:ObjectsAlreadyDeleted' => 'Fejl: objekterne er allerede slettet!',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Du har ikke tilladelse til at foretage en masse sletning af objekter i klassen %1$s',
-	'UI:Error:DeleteNotAllowedOn_Class' => 'Du har ikke tilladelse til at slette objekter af klassen %1$s',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Du har ikke tilladelse til at foretage en masse opdatering af objekter i klassen %1$s',
-	'UI:Error:ObjectAlreadyCloned' => 'Fejl: objektet er allerede klonet!',
-	'UI:Error:ObjectAlreadyCreated' => 'Fejl: objektet er allerede oprettet!',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Fejl: ikke lovlig påvirkning "%1$s" på objekt %2$s i tilstand "%3$s".',
-	'UI:GroupBy:Count' => 'Antal',
-	'UI:GroupBy:Count+' => 'Antal af elementer',
-	'UI:CountOfObjects' => '%1$d objekter opfylder kriteriet.',
-	'UI_CountOfObjectsShort' => '%1$d objekter.',
-	'UI:NoObject_Class_ToDisplay' => 'Ingen objekter af typen %1$s at vise.',
-	'UI:History:LastModified_On_By' => 'Sidst ændret den %1$s af %2$s.',
-	'UI:HistoryTab' => 'Historik',
-	'UI:NotificationsTab' => 'Bemærkninger',
-	'UI:History:BulkImports' => 'Historik',
-	'UI:History:BulkImports+' => '',
-	'UI:History:BulkImportDetails' => 'Ændringer som følge af CSV import foretaget den %1$s (af %2$s)',
-	'UI:History:Date' => 'Dato',
-	'UI:History:Date+' => 'Dato for ændring',
-	'UI:History:User' => 'Bruger',
-	'UI:History:User+' => 'Bruger, som gennemførte ændringen',
-	'UI:History:Changes' => 'Ændringer',
-	'UI:History:Changes+' => 'Ændringer som er gennemført på objektet',
-	'UI:History:StatsCreations' => 'Oprettet',
-	'UI:History:StatsCreations+' => 'Antal oprettede objekter',
-	'UI:History:StatsModifs' => 'Modified',
-	'UI:History:StatsModifs+' => 'Antal modificerede objekter',
-	'UI:History:StatsDeletes' => 'Slettet',
-	'UI:History:StatsDeletes+' => 'Antal slettede objekter',
-	'UI:Loading' => 'Henter...',
-	'UI:Menu:Actions' => 'Handlinger',
-	'UI:Menu:OtherActions' => 'Andre handlinger',
-	'UI:Menu:New' => 'Ny...',
-	'UI:Menu:Add' => 'Tilføj...',
-	'UI:Menu:Manage' => 'Administrer...',
-	'UI:Menu:EMail' => 'eMail',
-	'UI:Menu:CSVExport' => 'CSV Eksport...',
-	'UI:Menu:Modify' => 'Modificer...',
-	'UI:Menu:Delete' => 'Slet...',
-	'UI:Menu:BulkDelete' => 'Slet...',
-	'UI:UndefinedObject' => 'Ikke defineret',
-	'UI:Document:OpenInNewWindow:Download' => 'Åben i nyt vindue: %1$s, Download: %2$s',
-	'UI:SelectAllToggle+' => 'Alle vælg/fravælg',
-	'UI:SplitDateTime-Date' => 'Dato',
-	'UI:SplitDateTime-Time' => 'Tid',
-	'UI:TruncatedResults' => '%1$d objekter vist ud af %2$d',
-	'UI:DisplayAll' => 'Vis Alle',
-	'UI:CollapseList' => 'Fold sammen',
-	'UI:CountOfResults' => '%1$d objekt(er)',
-	'UI:ChangesLogTitle' => 'Ændrings log (%1$d):',
-	'UI:EmptyChangesLogTitle' => 'Ændrings log er tom',
-	'UI:SearchFor_Class_Objects' => 'Søg efter %1$s Objekter',
-	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
-	'UI:OQLQueryTab' => 'OQL Query',
-	'UI:SimpleSearchTab' => 'Simpel Søgning',
-	'UI:Details+' => 'Detaljer',
-	'UI:SearchValue:Any' => '* Enhver *',
-	'UI:SearchValue:Mixed' => '* Blandet *',
-	'UI:SearchValue:NbSelected' => '# Valgte',
-	'UI:SelectOne' => '-- Vælg venligst --',
-	'UI:Login:Welcome' => 'Velkommen til iTop!',
-	'UI:Login:IncorrectLoginPassword' => 'Ukorrekt login/adgangskode, venligst prøv igen.',
-	'UI:Login:IdentifyYourself' => 'Identificer dig før du fortsætter',
-	'UI:Login:UserNamePrompt' => 'Bruger Navn',
-	'UI:Login:PasswordPrompt' => 'Adgangskode',
-	'UI:Login:About' => 'Om',
-	'UI:Login:ChangeYourPassword' => 'Skift Adgangskode',
-	'UI:Login:OldPasswordPrompt' => 'Gammel Adgangskode',
-	'UI:Login:NewPasswordPrompt' => 'Ny Adgangskode',
-	'UI:Login:RetypeNewPasswordPrompt' => 'Gentag ny adgangskode',
-	'UI:Login:IncorrectOldPassword' => 'Fejl: den gamle adgangskode er forkert',
-	'UI:LogOffMenu' => 'Log ud',
-	'UI:LogOff:ThankYou' => 'Tak for at du brugte iTop',
-	'UI:LogOff:ClickHereToLoginAgain' => 'Klik her for at logge ind igen...',
-	'UI:ChangePwdMenu' => 'Skift Adgangskode...',
-	'UI:Login:PasswordChanged' => 'Adgangskode oprettet med success!',
-	'UI:AccessRO-All' => 'iTop er skrivebeskyttet',
-	'UI:AccessRO-Users' => 'iTop er skrivebeskyttet for slutbrugere',
-	'UI:ApplicationEnvironment' => 'Applikations miljø: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch' => 'Ny adgangskode og gentaget adgangskode passer ikke sammen!',
-	'UI:Button:Login' => 'Enter iTop',
-	'UI:Login:Error:AccessRestricted' => 'iTop adgang er begrænset. Venligst, kontakt en iTop administrator.',
-	'UI:Login:Error:AccessAdmin' => 'Adgang er begrænset til administratorer. Venligst, kontakt en iTop administrator.',
-	'UI:CSVImport:MappingSelectOne' => '-- Vælg venligst --',
-	'UI:CSVImport:MappingNotApplicable' => '-- ignorer dette felt --',
-	'UI:CSVImport:NoData' => 'Tomt data sæt..., venligst angiv nogle data!',
-	'UI:Title:DataPreview' => 'Data Preview',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'Fejl: Data indeholder kun en kolonne. Har du valgt den korrekte separator?',
-	'UI:CSVImport:FieldName' => 'Felt %1$d',
-	'UI:CSVImport:DataLine1' => 'Data Linje 1',
-	'UI:CSVImport:DataLine2' => 'Data Linje 2',
-	'UI:CSVImport:idField' => 'id (Primær Nøgle)',
-	'UI:Title:BulkImport' => 'iTop - Bulk import',
-	'UI:Title:BulkImport+' => 'CSV-Import assistent',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisering af %1$d objekter af klasse %2$s',
-	'UI:CSVImport:ClassesSelectOne' => '-- Vælg venligst --~~',
-	'UI:CSVImport:ErrorExtendedAttCode' => 'Intern fejl: "%1$s" er en ukorrekt kode fordi "%2$s" er IKKE en fremmed nøgle af klassen "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objekt(er) vil forblive uændrede.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objekt(er) vil blive ændret.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objekt(er) vil blive tilføjet.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objekt(er) har fejl.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objekt(er) forbliver uændrede.',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d objekt(er) blev ændret.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d objekt(er) blev tilføjet.',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$d objekt(er) har fejl.',
-	'UI:Title:CSVImportStep2' => 'Step 2 af 5: CSV data muligheder',
-	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Data mapping',
-	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Import simulering',
-	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Import fuldført',
-	'UI:CSVImport:LinesNotImported' => 'Linjer som ikke kunne loades:',
-	'UI:CSVImport:LinesNotImported+' => 'Dele som ikke kunne importeres, da de indeholder fejl',
-	'UI:CSVImport:SeparatorComma+' => ', (komma)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (semikolon)',
-	'UI:CSVImport:SeparatorTab+' => 'Tabulator',
-	'UI:CSVImport:SeparatorOther' => 'Andre:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (anførselstegn)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (enkelt citationstegn)',
-	'UI:CSVImport:QualifierOther' => 'Andre:',
-	'UI:CSVImport:TreatFirstLineAsHeader' => 'Betragt første linje som overskrift (kolonnenavne)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Spring %1$s linje(r) over i begyndelsen af filen.',
-	'UI:CSVImport:CSVDataPreview' => 'CSV Data eksempel',
-	'UI:CSVImport:SelectFile' => 'Vælg den fil , der skal importeres:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'Indlæs fra fil',
-	'UI:CSVImport:Tab:CopyPaste' => 'Kopier og indsæt data',
-	'UI:CSVImport:Tab:Templates' => 'Skabelon(er)',
-	'UI:CSVImport:PasteData' => 'Indsæt de data der skal importeres:',
-	'UI:CSVImport:PickClassForTemplate' => 'Vælg den skabelon der skal hentes: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Separator karakter:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Tekst qualifier karakter',
-	'UI:CSVImport:CommentsAndHeader' => 'Kommentarer og header',
-	'UI:CSVImport:SelectClass' => 'Vælg den klasse, der skal importeres: ',
-	'UI:CSVImport:AdvancedMode' => 'Advanceret tilstand',
-	'UI:CSVImport:AdvancedMode+' => 'I den avancerede tilstand, kan "ID" (primær nøgle) af objekter bruges til at opdatere eller omdøbe ojekter. Allers kan kolonnen "ID" (hvis nogen) kun bruges som en søgekriterium og kan ikke kombineres med andre søgekriterier.',
-	'UI:CSVImport:SelectAClassFirst' => 'For at konfigurere mapning, vælg først en klasse.',
-	'UI:CSVImport:HeaderFields' => 'Felter',
-	'UI:CSVImport:HeaderMappings' => 'Mapninger',
-	'UI:CSVImport:HeaderSearch' => 'Søg?',
-	'UI:CSVImport:AlertIncompleteMapping' => 'Vælg venligst en mapning for hvert felt.',
-	'UI:CSVImport:AlertNoSearchCriteria' => 'Vælg venligst mindst et søgekriterie',
-	'UI:CSVImport:Encoding' => 'Karakter encoding',
-	'UI:UniversalSearchTitle' => 'iTop - Universal Søgning',
-	'UI:UniversalSearch:Error' => 'Fejl: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => 'Vælg klasse at søge efter: ',
-	'UI:CSVReport-Value-Modified' => 'Ændret',
-	'UI:CSVReport-Value-SetIssue' => 'Kunne ikke ændres - årsag: %1$s',
-	'UI:CSVReport-Value-ChangeIssue' => 'Kunne ikke ændres til %1$s - årsag: %2$s',
-	'UI:CSVReport-Value-NoMatch' => 'No match',
-	'UI:CSVReport-Value-Missing' => 'Mangler obligatorisk værdi',
-	'UI:CSVReport-Value-Ambiguous' => 'Tvetydig: fandt %1$s objekter',
-	'UI:CSVReport-Row-Unchanged' => 'Uændret',
-	'UI:CSVReport-Row-Created' => 'Oprettet',
-	'UI:CSVReport-Row-Updated' => 'Opdateret %1$d kolonne(r)',
-	'UI:CSVReport-Row-Disappeared' => 'Forsvundet, ændrede %1$d kolonne(r)',
-	'UI:CSVReport-Row-Issue' => 'Emne: %1$s',
-	'UI:CSVReport-Value-Issue-Null' => 'Null ikke tilladt',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Objekt ikke fundet',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Fandt %1$d emner',
-	'UI:CSVReport-Value-Issue-Readonly' => 'Attributten \'%1$s\' er skrivebeskyttet og kan ikke ændres (nuværende værdi: %2$s, foreslået værdi: %3$s)',
-	'UI:CSVReport-Value-Issue-Format' => 'Fejl i behandling af input: %1$s',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Uventet værdi for attribut \'%1$s\': ingen emner fundet, tjek stavningen',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Uventet værdi for attribut \'%1$s\': %2$s',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributterne er ikke i overensstemmelse med hinanden: %1$s',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Uventet attribut værdi(er)',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kunne ikke oprettes, på grund af manglende fremmednøgle(r): %1$s',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'Forkert dato format',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'Fejl ved forening',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'Tvetydig forening',
-	'UI:CSVReport-Row-Issue-Internal' => 'Intern fejl: %1$s, %2$s',
-	'UI:CSVReport-Icon-Unchanged' => 'Uændret',
-	'UI:CSVReport-Icon-Modified' => 'Ændret',
-	'UI:CSVReport-Icon-Missing' => 'Mangler',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Mangler objekt: vil blive opdateret',
-	'UI:CSVReport-Object-MissingUpdated' => 'Manglende objekt: opdateret',
-	'UI:CSVReport-Icon-Created' => 'Oprettet',
-	'UI:CSVReport-Object-ToCreate' => 'Objekt vil blive oprettet',
-	'UI:CSVReport-Object-Created' => 'Objekt oprettet',
-	'UI:CSVReport-Icon-Error' => 'Fejl',
-	'UI:CSVReport-Object-Error' => 'FEJL: %1$s',
-	'UI:CSVReport-Object-Ambiguous' => 'TVETYDIG: %1$s',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% af de hentede objekter har fejl og vil blive ignoreret',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% af de hentede objekter vil blive oprettet.',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% af de hentede objekter vil blive ændret.',
-	'UI:CSVExport:AdvancedMode' => 'Advanceret tilstand',
-	'UI:CSVExport:AdvancedMode+' => '',
-	'UI:CSVExport:LostChars' => 'Encoding problem',
-	'UI:CSVExport:LostChars+' => '',
-	'UI:Audit:Title' => 'iTop - CMDB Audit',
-	'UI:Audit:InteractiveAudit' => 'Interaktiv Audit',
-	'UI:Audit:HeaderAuditRule' => 'Audit Regel',
-	'UI:Audit:HeaderNbObjects' => '# Objekt(er)',
-	'UI:Audit:HeaderNbErrors' => '# Fejl',
-	'UI:Audit:PercentageOk' => '% Ok',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Fejl i regel %1$s: %2$s.',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Fejl i kategorien %1$s: %2$s.',
-	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluering',
-	'UI:RunQuery:QueryExamples' => 'Query Eksempler',
-	'UI:RunQuery:HeaderPurpose' => 'Formål',
-	'UI:RunQuery:HeaderPurpose+' => 'Beskrivelse af forespørgslen',
-	'UI:RunQuery:HeaderOQLExpression' => 'OQL Udtryk',
-	'UI:RunQuery:HeaderOQLExpression+' => 'Forespørgslen i OQL syntaks',
-	'UI:RunQuery:ExpressionToEvaluate' => 'Udtryk der skal evalueres: ',
-	'UI:RunQuery:MoreInfo' => 'Mere information om forespørgslen: ',
-	'UI:RunQuery:DevelopedQuery' => 'Videreudviklet forespørgselsudtryk: ',
-	'UI:RunQuery:SerializedFilter' => 'Serielt filter: ',
-	'UI:RunQuery:Error' => 'Der opstod en fejl under afviklingen af forespøgrslen: %1$s',
-	'UI:Query:UrlForExcel' => 'URL til brug for MS-Excel web forespøgrsler',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Schema:Title' => 'iTop objekt skema',
-	'UI:Schema:CategoryMenuItem' => 'Kategori <b>%1$s</b>',
-	'UI:Schema:Relationships' => 'Relationer',
-	'UI:Schema:AbstractClass' => 'Abstrakt klasse: intet objekt fra denne klasse kan instantieres.',
-	'UI:Schema:NonAbstractClass' => 'Non abstrakt klasse: objekter fra denne klasse kan instantieres.',
-	'UI:Schema:ClassHierarchyTitle' => 'Klasse hierarki',
-	'UI:Schema:AllClasses' => 'Alle klasser',
-	'UI:Schema:ExternalKey_To' => 'Fremmednøgle til %1$s',
-	'UI:Schema:Columns_Description' => 'Kolonner: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'Standard: "%1$s"',
-	'UI:Schema:NullAllowed' => 'Null Tilladt',
-	'UI:Schema:NullNotAllowed' => 'Null IKKE Tilladt',
-	'UI:Schema:Attributes' => 'Attributter',
-	'UI:Schema:AttributeCode' => 'Attribut Kode',
-	'UI:Schema:AttributeCode+' => 'Interne kode for attributter',
-	'UI:Schema:Label' => 'Label',
-	'UI:Schema:Label+' => 'Label for attributten',
-	'UI:Schema:Type' => 'Type',
-	'UI:Schema:Type+' => 'Datatype for attributten',
-	'UI:Schema:Origin' => 'Oprindelse',
-	'UI:Schema:Origin+' => 'Basisklasse, hvor denne attribut er defineret',
-	'UI:Schema:Description' => 'Beskrivelse',
-	'UI:Schema:Description+' => 'Beskrivelse af disse attributter',
-	'UI:Schema:AllowedValues' => 'Tilladte værdier',
-	'UI:Schema:AllowedValues+' => '',
-	'UI:Schema:MoreInfo' => 'Mere information',
-	'UI:Schema:MoreInfo+' => 'Mere information om dette felt',
-	'UI:Schema:SearchCriteria' => 'Søgekriterie',
-	'UI:Schema:FilterCode' => 'Filter kode',
-	'UI:Schema:FilterCode+' => 'Kode for dette søgekriterie',
-	'UI:Schema:FilterDescription' => 'Beskrivelse',
-	'UI:Schema:FilterDescription+' => 'Beskrivelse af dette søgekriterie',
-	'UI:Schema:AvailOperators' => 'Tilgængelige operatorer',
-	'UI:Schema:AvailOperators+' => 'Mulige operatorer for dette søgekriterie',
-	'UI:Schema:ChildClasses' => 'Child klasser',
-	'UI:Schema:ReferencingClasses' => 'Refererende klasser',
-	'UI:Schema:RelatedClasses' => 'Relaterede klasser',
-	'UI:Schema:LifeCycle' => 'Livs cyclus',
-	'UI:Schema:Triggers' => 'Triggere',
-	'UI:Schema:Relation_Code_Description' => 'Relation <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Ned: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Op: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: udbred til %2$d niveauer, forespørgsel: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: udbred ikke til (%2$d niveauer), forespørsel: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s bliver refereret af klasse %2$s via feltet %3$s',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s er kædet til %2$s via %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n' => 'Klasser peger på %1$s (1:n links):',
-	'UI:Schema:Links:n-n' => 'Klasser kædet til %1$s (n:n links):',
-	'UI:Schema:Links:All' => 'Graf af alle relaterede klasser',
-	'UI:Schema:NoLifeCyle' => 'Der er ingen livscyclus defineret for denne klasse.',
-	'UI:Schema:LifeCycleTransitions' => 'Overgange',
-	'UI:Schema:LifeCyleAttributeOptions' => 'Attribut options',
-	'UI:Schema:LifeCycleHiddenAttribute' => 'Skjult',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Skrivebeskyttet',
-	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obligatorisk',
-	'UI:Schema:LifeCycleAttributeMustChange' => 'Skal ændres',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Bruger vil blive bedt om at ændre værdien',
-	'UI:Schema:LifeCycleEmptyList' => 'Tom liste',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => '',
-	'UI:Edit:TestQuery' => 'Test forespørgsel',
-	'UI:Combo:SelectValue' => '--- vælg en værdi ---',
-	'UI:Label:SelectedObjects' => 'Valgte objekter: ',
-	'UI:Label:AvailableObjects' => 'Tilgængelige objekter: ',
-	'UI:Link_Class_Attributes' => '%1$s attributer',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Tilføj %1$s objekter kædet til %2$s: %3$s',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Tilføj %1$s objekter til kæden til %2$s',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Administrer %1$s objekter kædet til %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Tilføj %1$ss...',
-	'UI:RemoveLinkedObjectsOf_Class' => 'Fjern valgte objekter',
-	'UI:Message:EmptyList:UseAdd' => 'Listen er tom, brug "Tilføj..." knappen for at tilføje elementer.',
-	'UI:Message:EmptyList:UseSearchForm' => 'Brug søgeformularen ovenfor, til søgning efter objekters som skal tilføjes.',
-	'UI:Wizard:FinalStepTitle' => 'Sidste skridt: bekræftelse',
-	'UI:Title:DeletionOf_Object' => 'Sletning af %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Massesletning af %1$d objekter af klassen %2$s',
-	'UI:Delete:NotAllowedToDelete' => 'Du har ikke tilladelse til at slette dette objekt',
-	'UI:Delete:NotAllowedToUpdate_Fields' => 'Du har ikke tilladelse til at opdatere følgende felt(er): %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'Dette objekt kunne ikke slettes, fordi den nuværende bruger ikke har tilstrækkelige rettigheder',
-	'UI:Error:CannotDeleteBecause' => 'Dette objekt kunne ikke slettes fordi: %1$s',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Dette objekt kunne ikke slettes, fordi nogle manuelle operationer skal udføres først',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Dette objekt kunne ikke slettes, fordi nogle manuelle operationer skal udføres først',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s på vegne af %2$s',
-	'UI:Delete:Deleted' => 'Slettet',
-	'UI:Delete:AutomaticallyDeleted' => 'Automatisk slettet',
-	'UI:Delete:AutomaticResetOf_Fields' => 'Automatisk reset af felt(er): %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => 'Oprydning af alle referencer til %1$s...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Oprydning af alle referencer til %1$d objekter af klasse %2$s...',
-	'UI:Delete:Done+' => '',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s slettet.',
-	'UI:Delete:ConfirmDeletionOf_Name' => 'Sletning af %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Sletning af %1$d objekter af klasse %2$s',
-	'UI:Delete:CannotDeleteBecause' => 'Kunne ikke slettes: %1$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Bør automatisk slettes, men dette ikke er muligt: %1$s',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Bør automatisk slettes, men dette ikke er muligt: %1$s',
-	'UI:Delete:WillBeDeletedAutomatically' => 'Vil automatisk blive slettet',
-	'UI:Delete:MustBeDeletedManually' => 'Skal slettes manuelt',
-	'UI:Delete:CannotUpdateBecause_Issue' => 'Skulle blive automatisk opdateret, men: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Vil blive automatisk opdateret (reset: %1$s)',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objekter/links refererer %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objekter/links refererer til nogle af de objekter som slettes',
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'For at sikre Database integritet, skal alle referencer slettes',
-	'UI:Delete:Consequence+' => '',
-	'UI:Delete:SorryDeletionNotAllowed' => 'Beklager, du har ikke tilladelse til at slette dette objekt, se the detaljeret forklaring ovenfor',
-	'UI:Delete:PleaseDoTheManualOperations' => 'Venligst foretag den manuelle opreration som er nævnt ovenfor, før sletning af objektet',
-	'UI:Delect:Confirm_Object' => 'Venligst bekræft at du ønsker at slette %1$s.',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Venligst bekræft at du ønsker at slette følgende %1$d objekter af klassen %2$s.',
-	'UI:WelcomeToITop' => 'Velkommen til iTop',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s detaljer',
-	'UI:ErrorPageTitle' => 'iTop - Fejl',
-	'UI:ObjectDoesNotExist' => 'Beklager, dette objekt eksisterer ikke (eller du har ikke tilladelse til at se det).',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'iTop - Søge Resultater',
-	'UI:SearchResultsTitle' => 'Søge Resultater',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => 'Intet at søge efter',
-	'UI:FullTextSearchTitle_Text' => 'Resultater for "%1$s":',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objekt(er) af klasse %2$s fundet.',
-	'UI:Search:NoObjectFound' => 'Intet objekt fundet.',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s ændring',
-	'UI:ModificationTitle_Class_Object' => 'Ændring af %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s ændring',
-	'UI:CloneTitle_Class_Object' => 'Clone af %1$s: <span class=\"hilite\">%2$s</span>~~',
-	'UI:CreationPageTitle_Class' => 'iTop - Oprettelse af ny %1$s ',
-	'UI:CreationTitle_Class' => 'Oprettelse af ny %1$s',
-	'UI:SelectTheTypeOf_Class_ToCreate' => 'Vælg type af %1$s for oprettelse:',
-	'UI:Class_Object_NotUpdated' => 'Ingen ændring, %1$s (%2$s) er <strong>not</strong> ændret.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) opdateret.',
-	'UI:BulkDeletePageTitle' => 'iTop - Massesletning',
-	'UI:BulkDeleteTitle' => 'Vælg objekt som ønskes slettet:',
-	'UI:PageTitle:ObjectCreated' => 'iTop Objekt Oprettet.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s oprettet.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Anvender %1$s på objekt: %2$s i tilstand %3$s for sluttilstand: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => 'Objektet kunne ikke skrives: %1$s',
-	'UI:PageTitle:FatalError' => 'iTop - Fatal Fejl',
-	'UI:SystemIntrusion' => 'Adgang nægtet. Du prøver at udføre en handling som du ikke har tilladelse til.',
-	'UI:FatalErrorMessage' => 'Fatal fejl, iTop kan ikke fortsætte.',
-	'UI:Error_Details' => 'Fejl: %1$s.',
-	'UI:PageTitle:ClassProjections' => 'iTop bruger styring - klasse projection',
-	'UI:PageTitle:ProfileProjections' => 'iTop bruger styring - profil projection',
-	'UI:UserManagement:Class' => 'Klasse',
-	'UI:UserManagement:Class+' => '',
-	'UI:UserManagement:ProjectedObject' => 'Objekt',
-	'UI:UserManagement:ProjectedObject+' => '',
-	'UI:UserManagement:AnyObject' => '* enhver *',
-	'UI:UserManagement:User' => 'Bruger',
-	'UI:UserManagement:User+' => '',
-	'UI:UserManagement:Profile' => 'Profil',
-	'UI:UserManagement:Profile+' => '',
-	'UI:UserManagement:Action:Read' => 'Læs',
-	'UI:UserManagement:Action:Read+' => '',
-	'UI:UserManagement:Action:Modify' => 'Ændring',
-	'UI:UserManagement:Action:Modify+' => '',
-	'UI:UserManagement:Action:Delete' => 'Slet',
-	'UI:UserManagement:Action:Delete+' => '',
-	'UI:UserManagement:Action:BulkRead' => 'Masselæsning (Export)',
-	'UI:UserManagement:Action:BulkRead+' => '',
-	'UI:UserManagement:Action:BulkModify' => 'Masseændring',
-	'UI:UserManagement:Action:BulkModify+' => '',
-	'UI:UserManagement:Action:BulkDelete' => 'Massesletning',
-	'UI:UserManagement:Action:BulkDelete+' => '',
-	'UI:UserManagement:Action:Stimuli' => 'Påvirkning',
-	'UI:UserManagement:Action:Stimuli+' => '',
-	'UI:UserManagement:Action' => 'Handling',
-	'UI:UserManagement:Action+' => '',
-	'UI:UserManagement:TitleActions' => 'Handlinger',
-	'UI:UserManagement:Permission' => 'Tilladelse',
-	'UI:UserManagement:Permission+' => '',
-	'UI:UserManagement:Attributes' => 'Attributter',
-	'UI:UserManagement:ActionAllowed:Yes' => 'Ja',
-	'UI:UserManagement:ActionAllowed:No' => 'Nej',
-	'UI:UserManagement:AdminProfile+' => '',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => '',
-	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link mellem %1$s and %2$s',
-	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link mellem %1$s og %2$s',
-	'Menu:AdminTools' => 'Admin værktøjer',
-	'Menu:AdminTools+' => '',
-	'Menu:AdminTools?' => 'Værktøjer kun tilgængelige for brugere med administrator profil',
-	'UI:ChangeManagementMenu' => 'Change Management',
-	'UI:ChangeManagementMenu+' => '',
-	'UI:ChangeManagementMenu:Title' => 'Changes Overblik',
-	'UI-ChangeManagementMenu-ChangesByType' => 'Changes efter type',
-	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes efter status',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changes efter workgroup',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changes endnu ikke tildelt',
-	'UI:ConfigurationManagementMenu' => 'Configuration Management',
-	'UI:ConfigurationManagementMenu+' => '',
-	'UI:ConfigurationManagementMenu:Title' => 'Infrastruktur Overblik',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastruktur objekter efter type',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastruktur objekter efter status',
-	'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
-	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items efter status',
-	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items efter type',
-	'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Anmodnings styring',
-	'UI-RequestManagementOverview-RequestByService' => 'Bruger anmodninger efter service',
-	'UI-RequestManagementOverview-RequestByPriority' => 'Bruger anmodninger efter prioritet',
-	'UI-RequestManagementOverview-RequestUnassigned' => 'Bruger anmodninger endnu ikke tildelt',
-	'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
-	'UI-IncidentManagementOverview-IncidentByService' => 'Incidents efter service',
-	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents efter prioritet',
-	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents endnu ikke tildelt',
-	'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management~~',
-	'UI-ChangeManagementOverview-ChangeByType' => 'Changes efter type',
-	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes endnu ikke tildelt',
-	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Udfald på grund af changes (ændringer)',
-	'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
-	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Kunde kontrakter til fornyelse indenfor 30 dage',
-	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Leverandør kontrakter til fornyelse indenfor 30 dage',
-	'UI:ContactsMenu' => 'Kontakter',
-	'UI:ContactsMenu+' => '',
-	'UI:ContactsMenu:Title' => 'Kontakter Overblik',
-	'UI-ContactsMenu-ContactsByLocation' => 'Kontakter efter lokation',
-	'UI-ContactsMenu-ContactsByType' => 'Kontakter efter type',
-	'UI-ContactsMenu-ContactsByStatus' => 'Kontakter efter status',
-	'Menu:CSVImportMenu' => 'CSV import',
-	'Menu:CSVImportMenu+' => '',
-	'Menu:DataModelMenu' => 'Data Model',
-	'Menu:DataModelMenu+' => '',
-	'Menu:ExportMenu' => 'Export',
-	'Menu:ExportMenu+' => '',
-	'Menu:NotificationsMenu' => 'Notifikationer',
-	'Menu:NotificationsMenu+' => '',
-	'UI:NotificationsMenu:Title' => 'Konfiguration af <span class="hilite">Notifikationer</span>~~',
-	'UI:NotificationsMenu:Help' => 'Hjælp',
-	'UI:NotificationsMenu:HelpContent' => '<p>I iTop er notifikationer fuldt modificerbare. De er baseret på to sæt af objekter: <i>triggers og handlinger</i>.</p>
-<p><i><b>Triggers</b></i> definerer hvornår en notifikation skal udføres. Der er 5 typer af triggers til at dække 3 forskellige faser for et objekts livscyclus:
-<ol>
-	<li>the "Ved objekts oprettelse" triggers udføres når et objekt af den specificerede klasse oprettes</li>
-	<li>the "Ved indtræden i en tilstand" triggers udløses før et objekt af den givne klasse indtræder i en specifik tilstand (kommende fra en anden tilstand)</li>
-	<li>the "Ved forladelse af en tilstand" triggers udløses når et objekt af den givne klasse forlader en specifik tilstand</li>
-	<li>the "Ved grænseværdi" triggers udløses når en grænseværdi for TTR eller TTO er nået</li>
-	<li>the "Ved portal opdatering" triggers udløses når en ticket opdateres fra portalen</li>
-</ol>
-</p>
-<p>
-<i><b>Handlinger</b></i> definer de handlinger som udføres når triggeren udløses. For nuværende er der kun en handling, som består af at sende en email besked.
-Sådanne handlinger definerer den skabelon som bruges til afsendelse af email såvel som andre parametre indhold i beskeden, modtger, vigtighed, etc.
-</p>
-<p>En speciel side: <a href="../setup/email.test.php" target="_blank">email.test.php</a> er til rådighed for test og problemløsning af PHP mail konfigurationen.</p>
-<p>For udførelse, handlinger skal være knyttet til triggers.
-Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" nummer, der specificerer i hvilken rækkefølge handlingerne udføres.</p>',
-	'UI:NotificationsMenu:Triggers' => 'Triggers',
-	'UI:NotificationsMenu:AvailableTriggers' => 'Tilgængelige triggers',
-	'UI:NotificationsMenu:OnCreate' => 'Når et objekt oprettes',
-	'UI:NotificationsMenu:OnStateEnter' => 'Når et objekt indtræder i en give tilstand',
-	'UI:NotificationsMenu:OnStateLeave' => 'Når et objekt forlader en give tilstand',
-	'UI:NotificationsMenu:Actions' => 'Handlinger',
-	'UI:NotificationsMenu:AvailableActions' => 'Tilgængelige handlinger',
-	'Menu:AuditCategories' => 'Audit Kategorier',
-	'Menu:AuditCategories+' => '',
-	'Menu:Notifications:Title' => 'Audit Kategorier',
-	'Menu:RunQueriesMenu' => 'Kør forespørgsler',
-	'Menu:RunQueriesMenu+' => '',
-	'Menu:QueryMenu' => 'Query parlør',
-	'Menu:QueryMenu+' => '',
-	'Menu:DataAdministration' => 'Data administration',
-	'Menu:DataAdministration+' => '',
-	'Menu:UniversalSearchMenu' => 'Universal Søgning',
-	'Menu:UniversalSearchMenu+' => '',
-	'Menu:ApplicationLogMenu' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu+' => '',
-	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
-	'Menu:UserManagementMenu' => 'Bruger styring',
-	'Menu:UserManagementMenu+' => '',
-	'Menu:ProfilesMenu' => 'Profiler',
-	'Menu:ProfilesMenu+' => '',
-	'Menu:ProfilesMenu:Title' => 'Profiler',
-	'Menu:UserAccountsMenu' => 'Bruger konti',
-	'Menu:UserAccountsMenu+' => '',
-	'Menu:UserAccountsMenu:Title' => 'Bruger konti',
-	'UI:iTopVersion:Short' => '%1$s version %2$s',
-	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
-	'UI:PropertiesTab' => 'Egenskaber',
-	'UI:OpenDocumentInNewWindow_' => 'Åbn dette dokument i et nyt vindue: %1$s',
-	'UI:DownloadDocument_' => 'Hent dette dokument: %1$s',
-	'UI:Document:NoPreview' => 'Forhåndsvisning er ikke tilgængelig for denne dokumenttype',
-	'UI:Download-CSV' => 'Download %1$s',
-	'UI:DeadlineMissedBy_duration' => 'Overskredet med %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',
-	'UI:Deadline_Minutes' => '%1$d min',
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',
-	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
-	'UI:Help' => 'Hjælp',
-	'UI:PasswordConfirm' => '(Bekræft)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Gem dette objekt, før der tilføjes flere %1$s objekter.',
-	'UI:DisplayThisMessageAtStartup' => 'Vis denne beksed ved start',
-	'UI:RelationshipGraph' => 'Grafisk visning',
-	'UI:RelationshipList' => 'Liste',
-	'UI:OperationCancelled' => 'Handling afbrudt',
-	'UI:ElementsDisplayed' => 'Filtrering',
-	'Portal:Title' => 'iTop bruger portal',
-	'Portal:NoRequestMgmt' => 'Kære %1$s, du er blevet omdirigeret til denne side, fordi din konto er konfigureret med profilen \'Portal user\'. Desværre er iTop ikke installeret med denne funktionalitet \'Request Management\'. Venligst kontakt din administrator.',
-	'Portal:Refresh' => 'Opdater',
-	'Portal:Back' => 'Tilbage',
-	'Portal:WelcomeUserOrg' => 'Velkommen %1$s, fra %2$s',
-	'Portal:ShowOngoing' => 'Vis åbne anmodninger',
-	'Portal:ShowClosed' => 'Vis lukkede anmodninger',
-	'Portal:CreateNewRequest' => 'Opret ny anmodning',
-	'Portal:CreateNewRequestItil' => 'Vytvořit nový požadavek',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => 'Skift password',
-	'Portal:Disconnect' => 'Disconnect',
-	'Portal:OpenRequests' => 'Mine åbne anmodninger',
-	'Portal:ClosedRequests' => 'Mine lukkede anmodninger',
-	'Portal:ResolvedRequests' => 'Mine løste anmodninger',
-	'Portal:SelectService' => 'Vælg en ydelse fra kataloget:',
-	'Portal:PleaseSelectOneService' => 'Vælg venligst en ydelse',
-	'Portal:SelectSubcategoryFrom_Service' => 'Vælg en under-kategori for ydelsen %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Vælg venligst en under-kategori',
-	'Portal:DescriptionOfTheRequest' => 'Indtast beskrivelse af din anmodning:',
-	'Portal:TitleRequestDetailsFor_Request' => 'Detaljer for anmodning %1$s:',
-	'Portal:NoOpenRequest' => 'Ingen anmodning i denne kategori',
-	'Portal:NoClosedRequest' => 'Ingen anmodning i denne kategori',
-	'Portal:Button:ReopenTicket' => 'Genåben denne ticket',
-	'Portal:Button:CloseTicket' => 'Luk denne ticket',
-	'Portal:Button:UpdateRequest' => 'Opdater denne anmodning',
-	'Portal:EnterYourCommentsOnTicket' => 'Indtast din kommentar til løsningen af denne:',
-	'Portal:ErrorNoContactForThisUser' => 'Fejl: nuværnede bruger er ikke tilknyttet en Kontact/Person. Kontakt venligst din administrator.',
-	'Portal:Attachments' => 'Vedhæftninger',
-	'Portal:AddAttachment' => ' Vedhæft fil ',
-	'Portal:RemoveAttachment' => ' Fjern vedhæftning ',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Vedhæftning #%1$d til %2$s (%3$s)',
-	'Enum:Undefined' => 'Udefineret',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Dage %2$s Timer %3$s Minutter %4$s Sekunder',
-	'UI:ModifyAllPageTitle' => 'Modificer Alle',
-	'UI:Modify_N_ObjectsOf_Class' => 'Ændrer %1$d objekter af klasse %2$s',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Ændrer %1$d objekter af klasse %2$s ud af %3$d',
-	'UI:Menu:ModifyAll' => 'Modificer...',
-	'UI:Button:ModifyAll' => 'Modificer Alle',
-	'UI:Button:PreviewModifications' => 'Preview Ændringer >>',
-	'UI:ModifiedObject' => 'Objekt Ændret',
-	'UI:BulkModifyStatus' => 'Operation',
-	'UI:BulkModifyStatus+' => '',
-	'UI:BulkModifyErrors' => 'Fejl (hvis nogen)',
-	'UI:BulkModifyErrors+' => '',
-	'UI:BulkModifyStatusOk' => 'Ok',
-	'UI:BulkModifyStatusError' => 'Fejl',
-	'UI:BulkModifyStatusModified' => 'Ændret',
-	'UI:BulkModifyStatusSkipped' => 'Sprunget over',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinkte værdier:',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d gang(e)',
-	'UI:BulkModify:N_MoreValues' => '%1$d flere værdier...',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Forsøger at skrivebeskytte feltet: %1$s',
-	'UI:FailedToApplyStimuli' => 'Handlingen fejlede.',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Ændrer %2$d objekter af klasse %3$s',
-	'UI:CaseLogTypeYourTextHere' => 'Skriv din tekst her:',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
-	'UI:CaseLog:InitialValue' => 'Begyndelses værdi:',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'Feltet %1$s er skrivebeskyttet, fordi det administreres af data synchronization. Værdien er ikke sat.',
-	'UI:ActionNotAllowed' => 'Du har ikke tilladelse til at foretage denne handling op disse objekter.',
-	'UI:BulkAction:NoObjectSelected' => 'Vælg venligst mindst et objekt for at foretage denne handling',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Feltet %1$s er skrivebeskyttet, fordi det administreres af data synchronization. Værdien forbliver uændret.',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objekter (%2$s objekter valgt).',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objekter.',
-	'UI:Pagination:PageSize' => '%1$s objekter per side',
-	'UI:Pagination:PagesLabel' => 'Sider:',
-	'UI:Pagination:All' => 'Alle',
-	'UI:HierarchyOf_Class' => 'Hierarchy af %1$s',
-	'UI:Preferences' => 'Indstillinger...',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'Favorit Organisationer',
-	'UI:FavoriteOrganizations+' => '',
-	'UI:FavoriteLanguage' => 'Sprog i brugergrænseflade',
-	'UI:Favorites:SelectYourLanguage' => 'Vælg dit foretrukne sprog',
-	'UI:FavoriteOtherSettings' => 'Andre indstillinger',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default længde for lister:  %1$s emner per side',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Enhver ændring vil blive kasseret.',
-	'UI:CancelConfirmationMessage' => 'Du vil miste dine ændringer. Fortsæt alligevel?',
-	'UI:AutoApplyConfirmationMessage' => 'Nogle ændringer er ikke gemt endnu. Ønsker du at itop skal tage hensyn til dem?',
-	'UI:Create_Class_InState' => 'Opret %1$s i tilstand: ',
-	'UI:OrderByHint_Values' => 'Sorterings orden: %1$s',
-	'UI:Menu:AddToDashboard' => 'Tilføj til Dashboard...',
-	'UI:Button:Refresh' => 'Opdater',
-	'UI:ConfigureThisList' => 'Konfigurer denne liste...',
-	'UI:ListConfigurationTitle' => 'Liste Konfiguration',
-	'UI:ColumnsAndSortOrder' => 'Kolonner og sortering:',
-	'UI:UseDefaultSettings' => 'Brug de anbefalede indstillinger',
-	'UI:UseSpecificSettings' => 'Brug følgende indstillinger:',
-	'UI:Display_X_ItemsPerPage' => 'Vis %1$s emner per side',
-	'UI:UseSavetheSettings' => 'Gem indstillinger',
-	'UI:OnlyForThisList' => 'Kun for denne liste',
-	'UI:ForAllLists' => 'For alle lister',
-	'UI:ExtKey_AsLink' => '%1$s (Link)',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
-	'UI:Button:MoveUp' => 'Ryk Op',
-	'UI:Button:MoveDown' => 'Ryk Ned',
-	'UI:OQL:UnknownClassAndFix' => 'Ukendt klasse "%1$s". Forsøg "%2$s" i stedet for.',
-	'UI:OQL:UnknownClassNoFix' => 'Ukendt klasse "%1$s"',
-	'UI:Dashboard:Edit' => 'Rediger denne side...',
-	'UI:Dashboard:Revert' => 'Tilbage til original version...',
-	'UI:Dashboard:RevertConfirm' => 'Enhver ændring foretaget i den oprindelige version vil blive tabt. Bekræft venligst at du ønsker dette.',
-	'UI:ExportDashBoard' => 'Exporter til fil',
-	'UI:ImportDashBoard' => 'Importer fra fil...',
-	'UI:ImportDashboardTitle' => 'Importer Fra Fil',
-	'UI:ImportDashboardText' => 'Vælg en dashboard fil til import:',
-	'UI:DashletCreation:Title' => 'Opret en ny Dashlet',
-	'UI:DashletCreation:Dashboard' => 'Dashboard',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type',
-	'UI:DashletCreation:EditNow' => 'Rediger Dashboard',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor',
-	'UI:DashboardEdit:DashboardTitle' => 'Titel',
-	'UI:DashboardEdit:Layout' => 'Layout',
-	'UI:DashboardEdit:Properties' => 'Dashboard Egenskaber',
-	'UI:DashboardEdit:Dashlets' => 'Tilgængelige Dashlets',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Egenskaber',
-	'UI:Form:Property' => 'Egenskab',
-	'UI:Form:Value' => 'Værdi',
-	'UI:DashletPlainText:Label' => 'Tekst',
-	'UI:DashletPlainText:Description' => 'Plain text (ingen formatering)',
-	'UI:DashletPlainText:Prop-Text' => 'Tekst',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Indtast venligst noget tekst her...',
-	'UI:DashletObjectList:Label' => 'Objekt liste',
-	'UI:DashletObjectList:Description' => 'Objekt liste dashlet',
-	'UI:DashletObjectList:Prop-Title' => 'Titel',
-	'UI:DashletObjectList:Prop-Query' => 'Forespørgsel',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-	'UI:DashletGroupBy:Prop-Title' => 'Titel',
-	'UI:DashletGroupBy:Prop-Query' => 'Forespørgsel',
-	'UI:DashletGroupBy:Prop-Style' => 'Style',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Grupper efter...',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Timer af %1$s (0-23)',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Måned af %1$s (1 - 12)',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Ugedag for %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Dag i måneden for %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (time)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (måned)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (ugedag)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dag i måned)',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Vælg venligst det felt, somobjekterne skal grupperes efter',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart',
-	'UI:DashletGroupByTable:Label' => 'Grupper Efter (tabel)',
-	'UI:DashletGroupByTable:Description' => 'Liste (Grupperet efter felt)',
-	'UI:DashletHeaderStatic:Label' => 'Header',
-	'UI:DashletHeaderStatic:Description' => 'Vis en horisontal separator',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakter',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikon',
-	'UI:DashletHeaderDynamic:Label' => 'Header med statistik',
-	'UI:DashletHeaderDynamic:Description' => 'Header med stats (grupperet efter...)',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Kontakter',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Ikon',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Undertitel',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Kontakter',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Forespørgsel',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gruper efter',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Værdier',
-	'UI:DashletBadge:Label' => 'Badge',
-	'UI:DashletBadge:Description' => 'Objekt Ikon med ny/søg',
-	'UI:DashletBadge:Prop-Class' => 'Klasse',
-	'DayOfWeek-Sunday' => 'Søndag',
-	'DayOfWeek-Monday' => 'Mandag',
-	'DayOfWeek-Tuesday' => 'Tirsdag',
-	'DayOfWeek-Wednesday' => 'Onsdag',
-	'DayOfWeek-Thursday' => 'Torsdag',
-	'DayOfWeek-Friday' => 'Fredag',
-	'DayOfWeek-Saturday' => 'Lørdag',
-	'UI:Menu:ShortcutList' => 'Opret Genvej...',
-	'UI:ShortcutRenameDlg:Title' => 'Omdøb genvej',
-	'UI:ShortcutListDlg:Title' => 'Opret en genvej for denne liste',
-	'UI:ShortcutDelete:Confirm' => 'Bekræft venligst at du ønsker at slette genvej(e).',
-	'Menu:MyShortcuts' => 'Mine Genveje',
-	'Class:Shortcut' => 'Genvej',
-	'Class:Shortcut+' => '',
-	'Class:Shortcut/Attribute:name' => 'Navn',
-	'Class:Shortcut/Attribute:name+' => '',
-	'UI:FillAllMandatoryFields' => 'Venligst udfyld alle obligatoriske felter.',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'BooleanLabel:yes' => 'yes~~',
-	'BooleanLabel:no' => 'no~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:TitleDetailsFor_Request' => 'Detaljer for anmodning',
-	'Portal:SelectRequestTemplate' => 'Vælg en skabelon for %1$s',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
-));
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @author Erik Bøg <erik@boegmoeller.dk>
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('DA DA', 'Danish', 'Dansk', array(
+	'Class:QueryOQL' => 'OQL forespørgsel',
+	'Class:QueryOQL+' => '',
+	'Class:QueryOQL/Attribute:oql' => 'Udtryk',
+	'Class:QueryOQL/Attribute:oql+' => '',
+	'Class:ShortcutOQL' => 'Søge resultat genvej',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'Søgning',
+	'Class:ShortcutOQL/Attribute:oql+' => '',
+	'Class:AuditRule' => 'Audit-regel',
+	'Class:AuditRule+' => 'En regel til at efterprøve den angivne Audit-kategori med',
+	'Class:AuditRule/Attribute:name' => 'Regel Navn',
+	'Class:AuditRule/Attribute:name+' => 'Kort navn for denne regel',
+	'Class:AuditRule/Attribute:description' => 'Audit-regel beskrivelse',
+	'Class:AuditRule/Attribute:description+' => 'Udførlig beskrivelse af denne Audit-regel',
+	'Class:AuditRule/Attribute:query' => 'Søgning at udføre',
+	'Class:AuditRule/Attribute:query+' => 'Den OQL forespørgsel, der skal udføres',
+	'Class:AuditRule/Attribute:valid_flag' => 'Gyldige objekter?',
+	'Class:AuditRule/Attribute:valid_flag+' => 'Sand, hvis reglen returnerer et gyldigt objekt, ellers Falsk',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'Falsk',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Falsk',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Sand',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'Sand',
+	'Class:AuditRule/Attribute:category_id' => 'Kategori',
+	'Class:AuditRule/Attribute:category_id+' => 'Kategori for denne regel',
+	'Class:AuditCategory' => 'Audit-kategori',
+	'Class:AuditCategory+' => 'Udsnit af alle Audits',
+	'Class:AuditCategory/Attribute:name' => 'Kategori navn',
+	'Class:AuditCategory/Attribute:name+' => 'Kort navn for denne kategori',
+	'Class:AuditCategory/Attribute:description' => 'Beskrivelse af Audit-kategori',
+	'Class:AuditCategory/Attribute:description+' => 'Udførlig beskrivelse af denne Audit-kategori',
+	'Class:AuditCategory/Attribute:definition_set' => 'Definition Set',
+	'Class:AuditCategory/Attribute:definition_set+' => 'OQL begreber, der definerer omfanget af objekter, der skal auditeres',
+	'Class:AuditCategory/Attribute:rules_list' => 'Audit-regler',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Audit-regler for denne kategori',
+	'Class:URP_Profiles' => 'Profil',
+	'Class:URP_Profiles+' => 'Brugerprofil',
+	'Class:URP_Profiles/Attribute:name' => 'Navn',
+	'Class:URP_Profiles/Attribute:name+' => 'Label',
+	'Class:URP_Profiles/Attribute:description' => 'Beskrivele',
+	'Class:URP_Profiles/Attribute:description+' => 'Kort beskrivelse',
+	'Class:URP_Profiles/Attribute:user_list' => 'Brugere',
+	'Class:URP_Profiles/Attribute:user_list+' => 'Personer, der har denne Rolle',
+	'Class:URP_UserProfile' => 'Brugerprofil',
+	'Class:URP_UserProfile+' => 'Brugerprofil',
+	'Class:URP_UserProfile/Attribute:userid' => 'Bruger',
+	'Class:URP_UserProfile/Attribute:userid+' => 'Brugerkonto',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'Anvend profil',
+	'Class:URP_UserProfile/Attribute:reason' => 'Begrundelse',
+	'Class:URP_UserProfile/Attribute:reason+' => 'Begrundelse, hvorfor denne bruger skal have denne profil',
+	'Class:URP_UserOrg' => 'Bruger organisation(er)',
+	'Class:URP_UserOrg+' => 'Tilladte organisation(er)',
+	'Class:URP_UserOrg/Attribute:userid' => 'Bruger',
+	'Class:URP_UserOrg/Attribute:userid+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organisation',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '',
+	'Class:URP_UserOrg/Attribute:reason' => 'Begrundelse',
+	'Class:URP_UserOrg/Attribute:reason+' => '',
+	'Class:AuditRule/Attribute:category_name' => 'Kategori',
+	'Class:AuditRule/Attribute:category_name+' => 'Kategorinavn for denne regel',
+	'Class:Query' => 'Forespørgsel',
+	'Class:Query+' => '',
+	'Class:Query/Attribute:name' => 'Navn',
+	'Class:Query/Attribute:name+' => '',
+	'Class:Query/Attribute:description' => 'Beskrivelse',
+	'Class:Query/Attribute:description+' => '',
+	'Class:Query/Attribute:fields' => 'Felter',
+	'Class:Query/Attribute:fields+' => '',
+	'Class:User' => 'Bruger',
+	'Class:User+' => 'Bruger log in',
+	'Class:User/Attribute:finalclass' => 'Type af brugerkonto',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'kontakt (person)',
+	'Class:User/Attribute:contactid+' => 'Personlige oplysninger og virksomheds data',
+	'Class:User/Attribute:last_name' => 'Efternavn',
+	'Class:User/Attribute:last_name+' => 'Kontaktens efternavn',
+	'Class:User/Attribute:first_name' => 'Fornavn',
+	'Class:User/Attribute:first_name+' => 'Kontaktens fornavn',
+	'Class:User/Attribute:email' => 'Email-adresse',
+	'Class:User/Attribute:email+' => 'Kontaktens Email-adresse',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => 'Bruger navn',
+	'Class:User/Attribute:language' => 'Sprog',
+	'Class:User/Attribute:language+' => 'Bruger valgt sprog',
+	'Class:User/Attribute:language/Value:EN US' => 'Englsk',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => 'Fransk',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:profile_list' => 'Profiler',
+	'Class:User/Attribute:profile_list+' => 'Roller, rettighedsstyring for denne person',
+	'Class:User/Attribute:allowed_org_list' => 'Tilladte organisation(er)',
+	'Class:User/Attribute:allowed_org_list+' => 'Brugeren har tilladelse til at se data om følgende organisationer. Hvis ingen organisation er vist, er der ingen indskrænkninger',
+	'Class:User/Error:LoginMustBeUnique' => 'Login skal være entydig - "%1s" er allerede i brug.',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Mindst en profil skal knyttes til denne bruger.',
+	'Class:URP_Dimensions' => 'Dimension',
+	'Class:URP_Dimensions+' => 'Anvendelsesdimension (Fastlæggelse af siloer)',
+	'Class:URP_Dimensions/Attribute:name' => 'Navn',
+	'Class:URP_Dimensions/Attribute:name+' => 'Label',
+	'Class:URP_Dimensions/Attribute:description' => 'Beskrivelse',
+	'Class:URP_Dimensions/Attribute:description+' => 'Kort beskrivelse',
+	'Class:URP_Dimensions/Attribute:type' => 'Type',
+	'Class:URP_Dimensions/Attribute:type+' => 'Klassenavn eller datatype',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'Bruger login',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profile+' => 'Profilnavn',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => '',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organisation',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '',
+	'Class:URP_ProfileProjection' => 'Profil_projection',
+	'Class:URP_ProfileProjection+' => 'Profilbillede',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimension',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'Anvendelsesdimension',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimension',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'Anvendelsesdimension',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profile',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'Profil vilkår',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profil',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'Profilnavn',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Værdi udtryk',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL-udtryk (Benyttes af $user) | konstant | | + Attribut-Code',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribut',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Mål for Attribut-kode (valgfri)',
+	'Class:URP_ClassProjection' => 'Klasse_projection',
+	'Class:URP_ClassProjection+' => 'Klassebillede',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimension',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'Anvendelsesdimension',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimension',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'Anvendelsesdimension',
+	'Class:URP_ClassProjection/Attribute:class' => 'Klasse',
+	'Class:URP_ClassProjection/Attribute:class+' => 'Målklasse',
+	'Class:URP_ClassProjection/Attribute:value' => 'Værdi udtryk',
+	'Class:URP_ClassProjection/Attribute:value+' => 'OQL-udtryk (Benyttes af $this) | konstant | | + Attribut-Code',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribut',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'Mål for Attribut-kode (valgfri)',
+	'Class:URP_ActionGrant' => 'Handlings godkendelser',
+	'Class:URP_ActionGrant+' => 'Tilladelser på klasser',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'Anvendelsesprofil',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'Anvendelsesprofil',
+	'Class:URP_ActionGrant/Attribute:class' => 'Klasse',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Målklasse',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Tilladelse',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'Tilladt eller nægtet?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Ja',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'Ja',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nej',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'Nej',
+	'Class:URP_ActionGrant/Attribute:action' => 'Handling',
+	'Class:URP_ActionGrant/Attribute:action+' => 'Handling som skal udføres på den valgte klasse',
+	'Class:URP_StimulusGrant' => 'Tilladels til påvirkning',
+	'Class:URP_StimulusGrant+' => 'Tilladelserne til påvirkning af livscyklus af objektet',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Anvendelsesprofil',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'Anvendelsesprofil',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Klasse',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'Målklasse',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Tilladelse',
+	'Class:URP_StimulusGrant/Attribute:permission+' => 'Tilladt eller nægtet?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Js',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'Ja',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nej',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'Nej',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Påvirkning',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'Påvirknings-kode',
+	'Class:URP_AttributeGrant' => 'Godkendelse af Attributter',
+	'Class:URP_AttributeGrant+' => 'Godkendelse af Attributter',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Tillad handling',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'Tillad handling',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribut',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Attribut-kode',
+	'Menu:WelcomeMenu' => 'Velkomen',
+	'Menu:WelcomeMenu+' => 'Velkommen til iTop',
+	'Menu:WelcomeMenuPage' => 'Velkomen',
+	'Menu:WelcomeMenuPage+' => 'Velkommen til iTop',
+	'UI:WelcomeMenu:Title' => 'Velkommen til iTop',
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop er en komplet, OpenSource, webbaseret IT-Service-Management-Værktøj.</p>
+<ul>Den inkluderer:
+<li>En komplet CMDB (Configuration management database) til at dokumentere og styre IT-portfolioen.</li>
+<li>Et Incident management modul til brug for sporing og kommunikation omkring alle spørgsmål vedrørende IT.</li>
+<li>Et change management modul til planlægning og sporing af ændringer i IT miljøet.</li>
+<li>En "known error database" til brug for at mindske tiden for løsning af hændelser.</li>
+<li>Et outage modul til dokumentation for planlagt nedetid og advisering af relevante kontakter.</li>
+<li>Dashboards for hurtigt overblik over IT.</li>
+</ul>
+<p>Alle moduler kan installeres, step by step, uafhængigt af hinanden.</p>',
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop er service udbyder orienteret, det tillader let IT teknikere at administrere flere kunder eller organisationer.
+<ul>iTop, leverer et feature-rich sæt af forretnings processer som:
+<li>Forøger IT administrationens effektivitet</li> 
+<li>Drives IT operations performance</li> 
+<li>Improves customer satisfaction and provides executives with insights into business performance.</li>
+</ul>
+</p>
+<p>iTop is completely open to be integrated within your current IT Management infrastructure.</p>
+<p>
+<ul>Adopting this new generation of IT Operational portal will help you to:
+<li>Better manage a more and more complex IT environment.</li>
+<li>Implement ITIL processes at your own pace.</li>
+<li>Manage the most important asset of your IT: Documentation.</li>
+</ul>
+</p>~~',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Åbne anmodninger: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Mine brugerhenvendelser',
+	'UI:WelcomeMenu:OpenIncidents' => 'Åbne Incidents: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Configuration Items: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Incidents tildelt mig',
+	'UI:AllOrganizations' => ' Alle Organisationer',
+	'UI:YourSearch' => 'Din Søgning',
+	'UI:LoggedAsMessage' => 'Logget ind som %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Logget ind som %1$s (Administrator)',
+	'UI:Button:Logoff' => 'Log ud',
+	'UI:Button:GlobalSearch' => 'Søg',
+	'UI:Button:Search' => ' Søg ',
+	'UI:Button:Query' => ' Forespørgsel ',
+	'UI:Button:Ok' => 'Ok',
+	'UI:Button:Save' => 'Gem',
+	'UI:Button:Cancel' => 'Afbryd',
+	'UI:Button:Apply' => 'Anvend',
+	'UI:Button:Back' => ' << Tilbage ',
+	'UI:Button:Restart' => ' |<< Start igen ',
+	'UI:Button:Next' => ' Næste >> ',
+	'UI:Button:Finish' => ' Afslut ',
+	'UI:Button:DoImport' => ' Kør Importen ! ',
+	'UI:Button:Done' => ' Færdig ',
+	'UI:Button:SimulateImport' => ' Simuler Importen ',
+	'UI:Button:Test' => 'Test!',
+	'UI:Button:Evaluate' => ' Evaluér ',
+	'UI:Button:Evaluate:Title' => ' Evaluér (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Tilføj... ',
+	'UI:Button:BrowseObjects' => ' Gennemse... ',
+	'UI:Button:Add' => ' Tilføj ',
+	'UI:Button:AddToList' => ' << Tilføj ',
+	'UI:Button:RemoveFromList' => ' Fjern >> ',
+	'UI:Button:FilterList' => ' Filter... ',
+	'UI:Button:Create' => ' Opret ',
+	'UI:Button:Delete' => ' Slet! ',
+	'UI:Button:Rename' => ' Omdøb... ',
+	'UI:Button:ChangePassword' => ' Skift Password ',
+	'UI:Button:ResetPassword' => ' Reset Password ',
+	'UI:SearchToggle' => 'Søg',
+	'UI:ClickToCreateNew' => 'Opret nyt objekt af typen %1$s ',
+	'UI:SearchFor_Class' => 'Søg efter objekter af typen %1$s ',
+	'UI:NoObjectToDisplay' => 'Ingen objekter at vise.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parameter objekt_id er obligatorisk når link_attr er specificeret. Tjek definitionen af display skabelonen.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parameter objekt_id er obligatorisk når link_attr er specificeret. Tjek definitionen af display skabelonen.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by er obligatorisk. Tjek definitionen af display skabelonen.',
+	'UI:Error:InvalidGroupByFields' => 'Ugyldig liste af felter at gruppere efter: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Fejl: ikke understøttet blokform: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Ukorrekt link definition: klassen af ​​objekter, der skal styres: %1$s blev ikke fundet som fremmednøgle i klassen %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Objekt: %1$s:%2$d ikke fundet.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Fejl: Circulær reference i afhængigheder mellem felterne, tjek datamodellen.',
+	'UI:Error:UploadedFileTooBig' => 'Den uploadede fil er for stor. (Max tilladt størrelse er %1$s). Kontakt din iTop administrator for at få ændret denne grænse limit. (Tjek PHP konfigurationen for upload_max_filesize og post_max_size på serveren).',
+	'UI:Error:UploadedFileTruncated.' => 'Den uploadede fil er blevet afkortet !',
+	'UI:Error:NoTmpDir' => 'Det midlertidige bibliotek er ikke defineret.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Kan ikke skrive den midlertidige fil til disken: upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload stoppet på grund af filtype. (Original fil navn = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Fil upload fejlede, ukendt årsag. (Fejl kode = "%1$s").',
+	'UI:Error:1ParametersMissing' => 'Fejl: følgende parameter skal angives for denne operation: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s and %2$s.',
+	'UI:Error:3ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s, %2$s and %3$s.',
+	'UI:Error:4ParametersMissing' => 'Fejl: følgende parametre skal angives for denne operation: %1$s, %2$s, %3$s and %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Fejl: Ukorrekt OQL forespørgsel: %1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Der opstod en fejl ved afvikling af forespørgslen: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Fejl: objektet er allerede opdateret.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Fejl: objektet kan ikke opdateres.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Fejl: objekterne er allerede slettet!',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Du har ikke tilladelse til at foretage en masse sletning af objekter i klassen %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'Du har ikke tilladelse til at slette objekter af klassen %1$s',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Du har ikke tilladelse til at foretage en masse opdatering af objekter i klassen %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Fejl: objektet er allerede klonet!',
+	'UI:Error:ObjectAlreadyCreated' => 'Fejl: objektet er allerede oprettet!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Fejl: ikke lovlig påvirkning "%1$s" på objekt %2$s i tilstand "%3$s".',
+	'UI:GroupBy:Count' => 'Antal',
+	'UI:GroupBy:Count+' => 'Antal af elementer',
+	'UI:CountOfObjects' => '%1$d objekter opfylder kriteriet.',
+	'UI_CountOfObjectsShort' => '%1$d objekter.',
+	'UI:NoObject_Class_ToDisplay' => 'Ingen objekter af typen %1$s at vise.',
+	'UI:History:LastModified_On_By' => 'Sidst ændret den %1$s af %2$s.',
+	'UI:HistoryTab' => 'Historik',
+	'UI:NotificationsTab' => 'Bemærkninger',
+	'UI:History:BulkImports' => 'Historik',
+	'UI:History:BulkImports+' => '',
+	'UI:History:BulkImportDetails' => 'Ændringer som følge af CSV import foretaget den %1$s (af %2$s)',
+	'UI:History:Date' => 'Dato',
+	'UI:History:Date+' => 'Dato for ændring',
+	'UI:History:User' => 'Bruger',
+	'UI:History:User+' => 'Bruger, som gennemførte ændringen',
+	'UI:History:Changes' => 'Ændringer',
+	'UI:History:Changes+' => 'Ændringer som er gennemført på objektet',
+	'UI:History:StatsCreations' => 'Oprettet',
+	'UI:History:StatsCreations+' => 'Antal oprettede objekter',
+	'UI:History:StatsModifs' => 'Modified',
+	'UI:History:StatsModifs+' => 'Antal modificerede objekter',
+	'UI:History:StatsDeletes' => 'Slettet',
+	'UI:History:StatsDeletes+' => 'Antal slettede objekter',
+	'UI:Loading' => 'Henter...',
+	'UI:Menu:Actions' => 'Handlinger',
+	'UI:Menu:OtherActions' => 'Andre handlinger',
+	'UI:Menu:New' => 'Ny...',
+	'UI:Menu:Add' => 'Tilføj...',
+	'UI:Menu:Manage' => 'Administrer...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'CSV Eksport...',
+	'UI:Menu:Modify' => 'Modificer...',
+	'UI:Menu:Delete' => 'Slet...',
+	'UI:Menu:BulkDelete' => 'Slet...',
+	'UI:UndefinedObject' => 'Ikke defineret',
+	'UI:Document:OpenInNewWindow:Download' => 'Åben i nyt vindue: %1$s, Download: %2$s',
+	'UI:SelectAllToggle+' => 'Alle vælg/fravælg',
+	'UI:SplitDateTime-Date' => 'Dato',
+	'UI:SplitDateTime-Time' => 'Tid',
+	'UI:TruncatedResults' => '%1$d objekter vist ud af %2$d',
+	'UI:DisplayAll' => 'Vis Alle',
+	'UI:CollapseList' => 'Fold sammen',
+	'UI:CountOfResults' => '%1$d objekt(er)',
+	'UI:ChangesLogTitle' => 'Ændrings log (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Ændrings log er tom',
+	'UI:SearchFor_Class_Objects' => 'Søg efter %1$s Objekter',
+	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryTab' => 'OQL Query',
+	'UI:SimpleSearchTab' => 'Simpel Søgning',
+	'UI:Details+' => 'Detaljer',
+	'UI:SearchValue:Any' => '* Enhver *',
+	'UI:SearchValue:Mixed' => '* Blandet *',
+	'UI:SearchValue:NbSelected' => '# Valgte',
+	'UI:SelectOne' => '-- Vælg venligst --',
+	'UI:Login:Welcome' => 'Velkommen til iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Ukorrekt login/adgangskode, venligst prøv igen.',
+	'UI:Login:IdentifyYourself' => 'Identificer dig før du fortsætter',
+	'UI:Login:UserNamePrompt' => 'Bruger Navn',
+	'UI:Login:PasswordPrompt' => 'Adgangskode',
+	'UI:Login:About' => 'Om',
+	'UI:Login:ChangeYourPassword' => 'Skift Adgangskode',
+	'UI:Login:OldPasswordPrompt' => 'Gammel Adgangskode',
+	'UI:Login:NewPasswordPrompt' => 'Ny Adgangskode',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Gentag ny adgangskode',
+	'UI:Login:IncorrectOldPassword' => 'Fejl: den gamle adgangskode er forkert',
+	'UI:LogOffMenu' => 'Log ud',
+	'UI:LogOff:ThankYou' => 'Tak for at du brugte iTop',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Klik her for at logge ind igen...',
+	'UI:ChangePwdMenu' => 'Skift Adgangskode...',
+	'UI:Login:PasswordChanged' => 'Adgangskode oprettet med success!',
+	'UI:AccessRO-All' => 'iTop er skrivebeskyttet',
+	'UI:AccessRO-Users' => 'iTop er skrivebeskyttet for slutbrugere',
+	'UI:ApplicationEnvironment' => 'Applikations miljø: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Ny adgangskode og gentaget adgangskode passer ikke sammen!',
+	'UI:Button:Login' => 'Enter iTop',
+	'UI:Login:Error:AccessRestricted' => 'iTop adgang er begrænset. Venligst, kontakt en iTop administrator.',
+	'UI:Login:Error:AccessAdmin' => 'Adgang er begrænset til administratorer. Venligst, kontakt en iTop administrator.',
+	'UI:CSVImport:MappingSelectOne' => '-- Vælg venligst --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignorer dette felt --',
+	'UI:CSVImport:NoData' => 'Tomt data sæt..., venligst angiv nogle data!',
+	'UI:Title:DataPreview' => 'Data Preview',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Fejl: Data indeholder kun en kolonne. Har du valgt den korrekte separator?',
+	'UI:CSVImport:FieldName' => 'Felt %1$d',
+	'UI:CSVImport:DataLine1' => 'Data Linje 1',
+	'UI:CSVImport:DataLine2' => 'Data Linje 2',
+	'UI:CSVImport:idField' => 'id (Primær Nøgle)',
+	'UI:Title:BulkImport' => 'iTop - Bulk import',
+	'UI:Title:BulkImport+' => 'CSV-Import assistent',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisering af %1$d objekter af klasse %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- Vælg venligst --~~',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Intern fejl: "%1$s" er en ukorrekt kode fordi "%2$s" er IKKE en fremmed nøgle af klassen "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objekt(er) vil forblive uændrede.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objekt(er) vil blive ændret.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objekt(er) vil blive tilføjet.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objekt(er) har fejl.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objekt(er) forbliver uændrede.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objekt(er) blev ændret.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objekt(er) blev tilføjet.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d objekt(er) har fejl.',
+	'UI:Title:CSVImportStep2' => 'Step 2 af 5: CSV data muligheder',
+	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Data mapping',
+	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Import simulering',
+	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Import fuldført',
+	'UI:CSVImport:LinesNotImported' => 'Linjer som ikke kunne loades:',
+	'UI:CSVImport:LinesNotImported+' => 'Dele som ikke kunne importeres, da de indeholder fejl',
+	'UI:CSVImport:SeparatorComma+' => ', (komma)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (semikolon)',
+	'UI:CSVImport:SeparatorTab+' => 'Tabulator',
+	'UI:CSVImport:SeparatorOther' => 'Andre:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (anførselstegn)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (enkelt citationstegn)',
+	'UI:CSVImport:QualifierOther' => 'Andre:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Betragt første linje som overskrift (kolonnenavne)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Spring %1$s linje(r) over i begyndelsen af filen.',
+	'UI:CSVImport:CSVDataPreview' => 'CSV Data eksempel',
+	'UI:CSVImport:SelectFile' => 'Vælg den fil , der skal importeres:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Indlæs fra fil',
+	'UI:CSVImport:Tab:CopyPaste' => 'Kopier og indsæt data',
+	'UI:CSVImport:Tab:Templates' => 'Skabelon(er)',
+	'UI:CSVImport:PasteData' => 'Indsæt de data der skal importeres:',
+	'UI:CSVImport:PickClassForTemplate' => 'Vælg den skabelon der skal hentes: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Separator karakter:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Tekst qualifier karakter',
+	'UI:CSVImport:CommentsAndHeader' => 'Kommentarer og header',
+	'UI:CSVImport:SelectClass' => 'Vælg den klasse, der skal importeres: ',
+	'UI:CSVImport:AdvancedMode' => 'Advanceret tilstand',
+	'UI:CSVImport:AdvancedMode+' => 'I den avancerede tilstand, kan "ID" (primær nøgle) af objekter bruges til at opdatere eller omdøbe ojekter. Allers kan kolonnen "ID" (hvis nogen) kun bruges som en søgekriterium og kan ikke kombineres med andre søgekriterier.',
+	'UI:CSVImport:SelectAClassFirst' => 'For at konfigurere mapning, vælg først en klasse.',
+	'UI:CSVImport:HeaderFields' => 'Felter',
+	'UI:CSVImport:HeaderMappings' => 'Mapninger',
+	'UI:CSVImport:HeaderSearch' => 'Søg?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Vælg venligst en mapning for hvert felt.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Vælg venligst mindst et søgekriterie',
+	'UI:CSVImport:Encoding' => 'Karakter encoding',
+	'UI:UniversalSearchTitle' => 'iTop - Universal Søgning',
+	'UI:UniversalSearch:Error' => 'Fejl: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Vælg klasse at søge efter: ',
+	'UI:CSVReport-Value-Modified' => 'Ændret',
+	'UI:CSVReport-Value-SetIssue' => 'Kunne ikke ændres - årsag: %1$s',
+	'UI:CSVReport-Value-ChangeIssue' => 'Kunne ikke ændres til %1$s - årsag: %2$s',
+	'UI:CSVReport-Value-NoMatch' => 'No match',
+	'UI:CSVReport-Value-Missing' => 'Mangler obligatorisk værdi',
+	'UI:CSVReport-Value-Ambiguous' => 'Tvetydig: fandt %1$s objekter',
+	'UI:CSVReport-Row-Unchanged' => 'Uændret',
+	'UI:CSVReport-Row-Created' => 'Oprettet',
+	'UI:CSVReport-Row-Updated' => 'Opdateret %1$d kolonne(r)',
+	'UI:CSVReport-Row-Disappeared' => 'Forsvundet, ændrede %1$d kolonne(r)',
+	'UI:CSVReport-Row-Issue' => 'Emne: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'Null ikke tilladt',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Objekt ikke fundet',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Fandt %1$d emner',
+	'UI:CSVReport-Value-Issue-Readonly' => 'Attributten \'%1$s\' er skrivebeskyttet og kan ikke ændres (nuværende værdi: %2$s, foreslået værdi: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => 'Fejl i behandling af input: %1$s',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Uventet værdi for attribut \'%1$s\': ingen emner fundet, tjek stavningen',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Uventet værdi for attribut \'%1$s\': %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributterne er ikke i overensstemmelse med hinanden: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Uventet attribut værdi(er)',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kunne ikke oprettes, på grund af manglende fremmednøgle(r): %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'Forkert dato format',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'Fejl ved forening',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'Tvetydig forening',
+	'UI:CSVReport-Row-Issue-Internal' => 'Intern fejl: %1$s, %2$s',
+	'UI:CSVReport-Icon-Unchanged' => 'Uændret',
+	'UI:CSVReport-Icon-Modified' => 'Ændret',
+	'UI:CSVReport-Icon-Missing' => 'Mangler',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Mangler objekt: vil blive opdateret',
+	'UI:CSVReport-Object-MissingUpdated' => 'Manglende objekt: opdateret',
+	'UI:CSVReport-Icon-Created' => 'Oprettet',
+	'UI:CSVReport-Object-ToCreate' => 'Objekt vil blive oprettet',
+	'UI:CSVReport-Object-Created' => 'Objekt oprettet',
+	'UI:CSVReport-Icon-Error' => 'Fejl',
+	'UI:CSVReport-Object-Error' => 'FEJL: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'TVETYDIG: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% af de hentede objekter har fejl og vil blive ignoreret',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% af de hentede objekter vil blive oprettet.',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% af de hentede objekter vil blive ændret.',
+	'UI:CSVExport:AdvancedMode' => 'Advanceret tilstand',
+	'UI:CSVExport:AdvancedMode+' => '',
+	'UI:CSVExport:LostChars' => 'Encoding problem',
+	'UI:CSVExport:LostChars+' => '',
+	'UI:Audit:Title' => 'iTop - CMDB Audit',
+	'UI:Audit:InteractiveAudit' => 'Interaktiv Audit',
+	'UI:Audit:HeaderAuditRule' => 'Audit Regel',
+	'UI:Audit:HeaderNbObjects' => '# Objekt(er)',
+	'UI:Audit:HeaderNbErrors' => '# Fejl',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Fejl i regel %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Fejl i kategorien %1$s: %2$s.',
+	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluering',
+	'UI:RunQuery:QueryExamples' => 'Query Eksempler',
+	'UI:RunQuery:HeaderPurpose' => 'Formål',
+	'UI:RunQuery:HeaderPurpose+' => 'Beskrivelse af forespørgslen',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL Udtryk',
+	'UI:RunQuery:HeaderOQLExpression+' => 'Forespørgslen i OQL syntaks',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Udtryk der skal evalueres: ',
+	'UI:RunQuery:MoreInfo' => 'Mere information om forespørgslen: ',
+	'UI:RunQuery:DevelopedQuery' => 'Videreudviklet forespørgselsudtryk: ',
+	'UI:RunQuery:SerializedFilter' => 'Serielt filter: ',
+	'UI:RunQuery:Error' => 'Der opstod en fejl under afviklingen af forespøgrslen: %1$s',
+	'UI:Query:UrlForExcel' => 'URL til brug for MS-Excel web forespøgrsler',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Schema:Title' => 'iTop objekt skema',
+	'UI:Schema:CategoryMenuItem' => 'Kategori <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relationer',
+	'UI:Schema:AbstractClass' => 'Abstrakt klasse: intet objekt fra denne klasse kan instantieres.',
+	'UI:Schema:NonAbstractClass' => 'Non abstrakt klasse: objekter fra denne klasse kan instantieres.',
+	'UI:Schema:ClassHierarchyTitle' => 'Klasse hierarki',
+	'UI:Schema:AllClasses' => 'Alle klasser',
+	'UI:Schema:ExternalKey_To' => 'Fremmednøgle til %1$s',
+	'UI:Schema:Columns_Description' => 'Kolonner: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Standard: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null Tilladt',
+	'UI:Schema:NullNotAllowed' => 'Null IKKE Tilladt',
+	'UI:Schema:Attributes' => 'Attributter',
+	'UI:Schema:AttributeCode' => 'Attribut Kode',
+	'UI:Schema:AttributeCode+' => 'Interne kode for attributter',
+	'UI:Schema:Label' => 'Label',
+	'UI:Schema:Label+' => 'Label for attributten',
+	'UI:Schema:Type' => 'Type',
+	'UI:Schema:Type+' => 'Datatype for attributten',
+	'UI:Schema:Origin' => 'Oprindelse',
+	'UI:Schema:Origin+' => 'Basisklasse, hvor denne attribut er defineret',
+	'UI:Schema:Description' => 'Beskrivelse',
+	'UI:Schema:Description+' => 'Beskrivelse af disse attributter',
+	'UI:Schema:AllowedValues' => 'Tilladte værdier',
+	'UI:Schema:AllowedValues+' => '',
+	'UI:Schema:MoreInfo' => 'Mere information',
+	'UI:Schema:MoreInfo+' => 'Mere information om dette felt',
+	'UI:Schema:SearchCriteria' => 'Søgekriterie',
+	'UI:Schema:FilterCode' => 'Filter kode',
+	'UI:Schema:FilterCode+' => 'Kode for dette søgekriterie',
+	'UI:Schema:FilterDescription' => 'Beskrivelse',
+	'UI:Schema:FilterDescription+' => 'Beskrivelse af dette søgekriterie',
+	'UI:Schema:AvailOperators' => 'Tilgængelige operatorer',
+	'UI:Schema:AvailOperators+' => 'Mulige operatorer for dette søgekriterie',
+	'UI:Schema:ChildClasses' => 'Child klasser',
+	'UI:Schema:ReferencingClasses' => 'Refererende klasser',
+	'UI:Schema:RelatedClasses' => 'Relaterede klasser',
+	'UI:Schema:LifeCycle' => 'Livs cyclus',
+	'UI:Schema:Triggers' => 'Triggere',
+	'UI:Schema:Relation_Code_Description' => 'Relation <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Ned: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Op: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: udbred til %2$d niveauer, forespørgsel: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: udbred ikke til (%2$d niveauer), forespørsel: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s bliver refereret af klasse %2$s via feltet %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s er kædet til %2$s via %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'Klasser peger på %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Klasser kædet til %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'Graf af alle relaterede klasser',
+	'UI:Schema:NoLifeCyle' => 'Der er ingen livscyclus defineret for denne klasse.',
+	'UI:Schema:LifeCycleTransitions' => 'Overgange',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Attribut options',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Skjult',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Skrivebeskyttet',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obligatorisk',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Skal ændres',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Bruger vil blive bedt om at ændre værdien',
+	'UI:Schema:LifeCycleEmptyList' => 'Tom liste',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => '',
+	'UI:Edit:TestQuery' => 'Test forespørgsel',
+	'UI:Combo:SelectValue' => '--- vælg en værdi ---',
+	'UI:Label:SelectedObjects' => 'Valgte objekter: ',
+	'UI:Label:AvailableObjects' => 'Tilgængelige objekter: ',
+	'UI:Link_Class_Attributes' => '%1$s attributer',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Tilføj %1$s objekter kædet til %2$s: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Tilføj %1$s objekter til kæden til %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Administrer %1$s objekter kædet til %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Tilføj %1$ss...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Fjern valgte objekter',
+	'UI:Message:EmptyList:UseAdd' => 'Listen er tom, brug "Tilføj..." knappen for at tilføje elementer.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Brug søgeformularen ovenfor, til søgning efter objekters som skal tilføjes.',
+	'UI:Wizard:FinalStepTitle' => 'Sidste skridt: bekræftelse',
+	'UI:Title:DeletionOf_Object' => 'Sletning af %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Massesletning af %1$d objekter af klassen %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'Du har ikke tilladelse til at slette dette objekt',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'Du har ikke tilladelse til at opdatere følgende felt(er): %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Dette objekt kunne ikke slettes, fordi den nuværende bruger ikke har tilstrækkelige rettigheder',
+	'UI:Error:CannotDeleteBecause' => 'Dette objekt kunne ikke slettes fordi: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Dette objekt kunne ikke slettes, fordi nogle manuelle operationer skal udføres først',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Dette objekt kunne ikke slettes, fordi nogle manuelle operationer skal udføres først',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s på vegne af %2$s',
+	'UI:Delete:Deleted' => 'Slettet',
+	'UI:Delete:AutomaticallyDeleted' => 'Automatisk slettet',
+	'UI:Delete:AutomaticResetOf_Fields' => 'Automatisk reset af felt(er): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Oprydning af alle referencer til %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Oprydning af alle referencer til %1$d objekter af klasse %2$s...',
+	'UI:Delete:Done+' => '',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s slettet.',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Sletning af %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Sletning af %1$d objekter af klasse %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Kunne ikke slettes: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Bør automatisk slettes, men dette ikke er muligt: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Bør automatisk slettes, men dette ikke er muligt: %1$s',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Vil automatisk blive slettet',
+	'UI:Delete:MustBeDeletedManually' => 'Skal slettes manuelt',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Skulle blive automatisk opdateret, men: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Vil blive automatisk opdateret (reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objekter/links refererer %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objekter/links refererer til nogle af de objekter som slettes',
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'For at sikre Database integritet, skal alle referencer slettes',
+	'UI:Delete:Consequence+' => '',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Beklager, du har ikke tilladelse til at slette dette objekt, se the detaljeret forklaring ovenfor',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Venligst foretag den manuelle opreration som er nævnt ovenfor, før sletning af objektet',
+	'UI:Delect:Confirm_Object' => 'Venligst bekræft at du ønsker at slette %1$s.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Venligst bekræft at du ønsker at slette følgende %1$d objekter af klassen %2$s.',
+	'UI:WelcomeToITop' => 'Velkommen til iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s detaljer',
+	'UI:ErrorPageTitle' => 'iTop - Fejl',
+	'UI:ObjectDoesNotExist' => 'Beklager, dette objekt eksisterer ikke (eller du har ikke tilladelse til at se det).',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'iTop - Søge Resultater',
+	'UI:SearchResultsTitle' => 'Søge Resultater',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => 'Intet at søge efter',
+	'UI:FullTextSearchTitle_Text' => 'Resultater for "%1$s":',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objekt(er) af klasse %2$s fundet.',
+	'UI:Search:NoObjectFound' => 'Intet objekt fundet.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s ændring',
+	'UI:ModificationTitle_Class_Object' => 'Ændring af %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s ændring',
+	'UI:CloneTitle_Class_Object' => 'Clone af %1$s: <span class=\"hilite\">%2$s</span>~~',
+	'UI:CreationPageTitle_Class' => 'iTop - Oprettelse af ny %1$s ',
+	'UI:CreationTitle_Class' => 'Oprettelse af ny %1$s',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Vælg type af %1$s for oprettelse:',
+	'UI:Class_Object_NotUpdated' => 'Ingen ændring, %1$s (%2$s) er <strong>not</strong> ændret.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) opdateret.',
+	'UI:BulkDeletePageTitle' => 'iTop - Massesletning',
+	'UI:BulkDeleteTitle' => 'Vælg objekt som ønskes slettet:',
+	'UI:PageTitle:ObjectCreated' => 'iTop Objekt Oprettet.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s oprettet.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Anvender %1$s på objekt: %2$s i tilstand %3$s for sluttilstand: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'Objektet kunne ikke skrives: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - Fatal Fejl',
+	'UI:SystemIntrusion' => 'Adgang nægtet. Du prøver at udføre en handling som du ikke har tilladelse til.',
+	'UI:FatalErrorMessage' => 'Fatal fejl, iTop kan ikke fortsætte.',
+	'UI:Error_Details' => 'Fejl: %1$s.',
+	'UI:PageTitle:ClassProjections' => 'iTop bruger styring - klasse projection',
+	'UI:PageTitle:ProfileProjections' => 'iTop bruger styring - profil projection',
+	'UI:UserManagement:Class' => 'Klasse',
+	'UI:UserManagement:Class+' => '',
+	'UI:UserManagement:ProjectedObject' => 'Objekt',
+	'UI:UserManagement:ProjectedObject+' => '',
+	'UI:UserManagement:AnyObject' => '* enhver *',
+	'UI:UserManagement:User' => 'Bruger',
+	'UI:UserManagement:User+' => '',
+	'UI:UserManagement:Profile' => 'Profil',
+	'UI:UserManagement:Profile+' => '',
+	'UI:UserManagement:Action:Read' => 'Læs',
+	'UI:UserManagement:Action:Read+' => '',
+	'UI:UserManagement:Action:Modify' => 'Ændring',
+	'UI:UserManagement:Action:Modify+' => '',
+	'UI:UserManagement:Action:Delete' => 'Slet',
+	'UI:UserManagement:Action:Delete+' => '',
+	'UI:UserManagement:Action:BulkRead' => 'Masselæsning (Export)',
+	'UI:UserManagement:Action:BulkRead+' => '',
+	'UI:UserManagement:Action:BulkModify' => 'Masseændring',
+	'UI:UserManagement:Action:BulkModify+' => '',
+	'UI:UserManagement:Action:BulkDelete' => 'Massesletning',
+	'UI:UserManagement:Action:BulkDelete+' => '',
+	'UI:UserManagement:Action:Stimuli' => 'Påvirkning',
+	'UI:UserManagement:Action:Stimuli+' => '',
+	'UI:UserManagement:Action' => 'Handling',
+	'UI:UserManagement:Action+' => '',
+	'UI:UserManagement:TitleActions' => 'Handlinger',
+	'UI:UserManagement:Permission' => 'Tilladelse',
+	'UI:UserManagement:Permission+' => '',
+	'UI:UserManagement:Attributes' => 'Attributter',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Ja',
+	'UI:UserManagement:ActionAllowed:No' => 'Nej',
+	'UI:UserManagement:AdminProfile+' => '',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => '',
+	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link mellem %1$s and %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link mellem %1$s og %2$s',
+	'Menu:AdminTools' => 'Admin værktøjer',
+	'Menu:AdminTools+' => '',
+	'Menu:AdminTools?' => 'Værktøjer kun tilgængelige for brugere med administrator profil',
+	'UI:ChangeManagementMenu' => 'Change Management',
+	'UI:ChangeManagementMenu+' => '',
+	'UI:ChangeManagementMenu:Title' => 'Changes Overblik',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Changes efter type',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes efter status',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changes efter workgroup',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changes endnu ikke tildelt',
+	'UI:ConfigurationManagementMenu' => 'Configuration Management',
+	'UI:ConfigurationManagementMenu+' => '',
+	'UI:ConfigurationManagementMenu:Title' => 'Infrastruktur Overblik',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastruktur objekter efter type',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastruktur objekter efter status',
+	'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items efter status',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items efter type',
+	'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Anmodnings styring',
+	'UI-RequestManagementOverview-RequestByService' => 'Bruger anmodninger efter service',
+	'UI-RequestManagementOverview-RequestByPriority' => 'Bruger anmodninger efter prioritet',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'Bruger anmodninger endnu ikke tildelt',
+	'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
+	'UI-IncidentManagementOverview-IncidentByService' => 'Incidents efter service',
+	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents efter prioritet',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents endnu ikke tildelt',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management~~',
+	'UI-ChangeManagementOverview-ChangeByType' => 'Changes efter type',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes endnu ikke tildelt',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Udfald på grund af changes (ændringer)',
+	'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Kunde kontrakter til fornyelse indenfor 30 dage',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Leverandør kontrakter til fornyelse indenfor 30 dage',
+	'UI:ContactsMenu' => 'Kontakter',
+	'UI:ContactsMenu+' => '',
+	'UI:ContactsMenu:Title' => 'Kontakter Overblik',
+	'UI-ContactsMenu-ContactsByLocation' => 'Kontakter efter lokation',
+	'UI-ContactsMenu-ContactsByType' => 'Kontakter efter type',
+	'UI-ContactsMenu-ContactsByStatus' => 'Kontakter efter status',
+	'Menu:CSVImportMenu' => 'CSV import',
+	'Menu:CSVImportMenu+' => '',
+	'Menu:DataModelMenu' => 'Data Model',
+	'Menu:DataModelMenu+' => '',
+	'Menu:ExportMenu' => 'Export',
+	'Menu:ExportMenu+' => '',
+	'Menu:NotificationsMenu' => 'Notifikationer',
+	'Menu:NotificationsMenu+' => '',
+	'UI:NotificationsMenu:Title' => 'Konfiguration af <span class="hilite">Notifikationer</span>~~',
+	'UI:NotificationsMenu:Help' => 'Hjælp',
+	'UI:NotificationsMenu:HelpContent' => '<p>I iTop er notifikationer fuldt modificerbare. De er baseret på to sæt af objekter: <i>triggers og handlinger</i>.</p>
+<p><i><b>Triggers</b></i> definerer hvornår en notifikation skal udføres. Der er 5 typer af triggers til at dække 3 forskellige faser for et objekts livscyclus:
+<ol>
+	<li>the "Ved objekts oprettelse" triggers udføres når et objekt af den specificerede klasse oprettes</li>
+	<li>the "Ved indtræden i en tilstand" triggers udløses før et objekt af den givne klasse indtræder i en specifik tilstand (kommende fra en anden tilstand)</li>
+	<li>the "Ved forladelse af en tilstand" triggers udløses når et objekt af den givne klasse forlader en specifik tilstand</li>
+	<li>the "Ved grænseværdi" triggers udløses når en grænseværdi for TTR eller TTO er nået</li>
+	<li>the "Ved portal opdatering" triggers udløses når en ticket opdateres fra portalen</li>
+</ol>
+</p>
+<p>
+<i><b>Handlinger</b></i> definer de handlinger som udføres når triggeren udløses. For nuværende er der kun en handling, som består af at sende en email besked.
+Sådanne handlinger definerer den skabelon som bruges til afsendelse af email såvel som andre parametre indhold i beskeden, modtger, vigtighed, etc.
+</p>
+<p>En speciel side: <a href="../setup/email.test.php" target="_blank">email.test.php</a> er til rådighed for test og problemløsning af PHP mail konfigurationen.</p>
+<p>For udførelse, handlinger skal være knyttet til triggers.
+Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge" nummer, der specificerer i hvilken rækkefølge handlingerne udføres.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Triggers',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Tilgængelige triggers',
+	'UI:NotificationsMenu:OnCreate' => 'Når et objekt oprettes',
+	'UI:NotificationsMenu:OnStateEnter' => 'Når et objekt indtræder i en give tilstand',
+	'UI:NotificationsMenu:OnStateLeave' => 'Når et objekt forlader en give tilstand',
+	'UI:NotificationsMenu:Actions' => 'Handlinger',
+	'UI:NotificationsMenu:AvailableActions' => 'Tilgængelige handlinger',
+	'Menu:AuditCategories' => 'Audit Kategorier',
+	'Menu:AuditCategories+' => '',
+	'Menu:Notifications:Title' => 'Audit Kategorier',
+	'Menu:RunQueriesMenu' => 'Kør forespørgsler',
+	'Menu:RunQueriesMenu+' => '',
+	'Menu:QueryMenu' => 'Query parlør',
+	'Menu:QueryMenu+' => '',
+	'Menu:DataAdministration' => 'Data administration',
+	'Menu:DataAdministration+' => '',
+	'Menu:UniversalSearchMenu' => 'Universal Søgning',
+	'Menu:UniversalSearchMenu+' => '',
+	'Menu:ApplicationLogMenu' => 'Log de l\'application',
+	'Menu:ApplicationLogMenu+' => '',
+	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
+	'Menu:UserManagementMenu' => 'Bruger styring',
+	'Menu:UserManagementMenu+' => '',
+	'Menu:ProfilesMenu' => 'Profiler',
+	'Menu:ProfilesMenu+' => '',
+	'Menu:ProfilesMenu:Title' => 'Profiler',
+	'Menu:UserAccountsMenu' => 'Bruger konti',
+	'Menu:UserAccountsMenu+' => '',
+	'Menu:UserAccountsMenu:Title' => 'Bruger konti',
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
+	'UI:PropertiesTab' => 'Egenskaber',
+	'UI:OpenDocumentInNewWindow_' => 'Åbn dette dokument i et nyt vindue: %1$s',
+	'UI:DownloadDocument_' => 'Hent dette dokument: %1$s',
+	'UI:Document:NoPreview' => 'Forhåndsvisning er ikke tilgængelig for denne dokumenttype',
+	'UI:Download-CSV' => 'Download %1$s',
+	'UI:DeadlineMissedBy_duration' => 'Overskredet med %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',
+	'UI:Deadline_Minutes' => '%1$d min',
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
+	'UI:Help' => 'Hjælp',
+	'UI:PasswordConfirm' => '(Bekræft)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Gem dette objekt, før der tilføjes flere %1$s objekter.',
+	'UI:DisplayThisMessageAtStartup' => 'Vis denne beksed ved start',
+	'UI:RelationshipGraph' => 'Grafisk visning',
+	'UI:RelationshipList' => 'Liste',
+	'UI:OperationCancelled' => 'Handling afbrudt',
+	'UI:ElementsDisplayed' => 'Filtrering',
+	'Portal:Title' => 'iTop bruger portal',
+	'Portal:NoRequestMgmt' => 'Kære %1$s, du er blevet omdirigeret til denne side, fordi din konto er konfigureret med profilen \'Portal user\'. Desværre er iTop ikke installeret med denne funktionalitet \'Request Management\'. Venligst kontakt din administrator.',
+	'Portal:Refresh' => 'Opdater',
+	'Portal:Back' => 'Tilbage',
+	'Portal:WelcomeUserOrg' => 'Velkommen %1$s, fra %2$s',
+	'Portal:ShowOngoing' => 'Vis åbne anmodninger',
+	'Portal:ShowClosed' => 'Vis lukkede anmodninger',
+	'Portal:CreateNewRequest' => 'Opret ny anmodning',
+	'Portal:CreateNewRequestItil' => 'Vytvořit nový požadavek',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => 'Skift password',
+	'Portal:Disconnect' => 'Disconnect',
+	'Portal:OpenRequests' => 'Mine åbne anmodninger',
+	'Portal:ClosedRequests' => 'Mine lukkede anmodninger',
+	'Portal:ResolvedRequests' => 'Mine løste anmodninger',
+	'Portal:SelectService' => 'Vælg en ydelse fra kataloget:',
+	'Portal:PleaseSelectOneService' => 'Vælg venligst en ydelse',
+	'Portal:SelectSubcategoryFrom_Service' => 'Vælg en under-kategori for ydelsen %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Vælg venligst en under-kategori',
+	'Portal:DescriptionOfTheRequest' => 'Indtast beskrivelse af din anmodning:',
+	'Portal:TitleRequestDetailsFor_Request' => 'Detaljer for anmodning %1$s:',
+	'Portal:NoOpenRequest' => 'Ingen anmodning i denne kategori',
+	'Portal:NoClosedRequest' => 'Ingen anmodning i denne kategori',
+	'Portal:Button:ReopenTicket' => 'Genåben denne ticket',
+	'Portal:Button:CloseTicket' => 'Luk denne ticket',
+	'Portal:Button:UpdateRequest' => 'Opdater denne anmodning',
+	'Portal:EnterYourCommentsOnTicket' => 'Indtast din kommentar til løsningen af denne:',
+	'Portal:ErrorNoContactForThisUser' => 'Fejl: nuværnede bruger er ikke tilknyttet en Kontact/Person. Kontakt venligst din administrator.',
+	'Portal:Attachments' => 'Vedhæftninger',
+	'Portal:AddAttachment' => ' Vedhæft fil ',
+	'Portal:RemoveAttachment' => ' Fjern vedhæftning ',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Vedhæftning #%1$d til %2$s (%3$s)',
+	'Enum:Undefined' => 'Udefineret',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Dage %2$s Timer %3$s Minutter %4$s Sekunder',
+	'UI:ModifyAllPageTitle' => 'Modificer Alle',
+	'UI:Modify_N_ObjectsOf_Class' => 'Ændrer %1$d objekter af klasse %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Ændrer %1$d objekter af klasse %2$s ud af %3$d',
+	'UI:Menu:ModifyAll' => 'Modificer...',
+	'UI:Button:ModifyAll' => 'Modificer Alle',
+	'UI:Button:PreviewModifications' => 'Preview Ændringer >>',
+	'UI:ModifiedObject' => 'Objekt Ændret',
+	'UI:BulkModifyStatus' => 'Operation',
+	'UI:BulkModifyStatus+' => '',
+	'UI:BulkModifyErrors' => 'Fejl (hvis nogen)',
+	'UI:BulkModifyErrors+' => '',
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Fejl',
+	'UI:BulkModifyStatusModified' => 'Ændret',
+	'UI:BulkModifyStatusSkipped' => 'Sprunget over',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinkte værdier:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d gang(e)',
+	'UI:BulkModify:N_MoreValues' => '%1$d flere værdier...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Forsøger at skrivebeskytte feltet: %1$s',
+	'UI:FailedToApplyStimuli' => 'Handlingen fejlede.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Ændrer %2$d objekter af klasse %3$s',
+	'UI:CaseLogTypeYourTextHere' => 'Skriv din tekst her:',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Begyndelses værdi:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'Feltet %1$s er skrivebeskyttet, fordi det administreres af data synchronization. Værdien er ikke sat.',
+	'UI:ActionNotAllowed' => 'Du har ikke tilladelse til at foretage denne handling op disse objekter.',
+	'UI:BulkAction:NoObjectSelected' => 'Vælg venligst mindst et objekt for at foretage denne handling',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Feltet %1$s er skrivebeskyttet, fordi det administreres af data synchronization. Værdien forbliver uændret.',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objekter (%2$s objekter valgt).',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objekter.',
+	'UI:Pagination:PageSize' => '%1$s objekter per side',
+	'UI:Pagination:PagesLabel' => 'Sider:',
+	'UI:Pagination:All' => 'Alle',
+	'UI:HierarchyOf_Class' => 'Hierarchy af %1$s',
+	'UI:Preferences' => 'Indstillinger...',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'Favorit Organisationer',
+	'UI:FavoriteOrganizations+' => '',
+	'UI:FavoriteLanguage' => 'Sprog i brugergrænseflade',
+	'UI:Favorites:SelectYourLanguage' => 'Vælg dit foretrukne sprog',
+	'UI:FavoriteOtherSettings' => 'Andre indstillinger',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default længde for lister:  %1$s emner per side',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Enhver ændring vil blive kasseret.',
+	'UI:CancelConfirmationMessage' => 'Du vil miste dine ændringer. Fortsæt alligevel?',
+	'UI:AutoApplyConfirmationMessage' => 'Nogle ændringer er ikke gemt endnu. Ønsker du at itop skal tage hensyn til dem?',
+	'UI:Create_Class_InState' => 'Opret %1$s i tilstand: ',
+	'UI:OrderByHint_Values' => 'Sorterings orden: %1$s',
+	'UI:Menu:AddToDashboard' => 'Tilføj til Dashboard...',
+	'UI:Button:Refresh' => 'Opdater',
+	'UI:ConfigureThisList' => 'Konfigurer denne liste...',
+	'UI:ListConfigurationTitle' => 'Liste Konfiguration',
+	'UI:ColumnsAndSortOrder' => 'Kolonner og sortering:',
+	'UI:UseDefaultSettings' => 'Brug de anbefalede indstillinger',
+	'UI:UseSpecificSettings' => 'Brug følgende indstillinger:',
+	'UI:Display_X_ItemsPerPage' => 'Vis %1$s emner per side',
+	'UI:UseSavetheSettings' => 'Gem indstillinger',
+	'UI:OnlyForThisList' => 'Kun for denne liste',
+	'UI:ForAllLists' => 'For alle lister',
+	'UI:ExtKey_AsLink' => '%1$s (Link)',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
+	'UI:Button:MoveUp' => 'Ryk Op',
+	'UI:Button:MoveDown' => 'Ryk Ned',
+	'UI:OQL:UnknownClassAndFix' => 'Ukendt klasse "%1$s". Forsøg "%2$s" i stedet for.',
+	'UI:OQL:UnknownClassNoFix' => 'Ukendt klasse "%1$s"',
+	'UI:Dashboard:Edit' => 'Rediger denne side...',
+	'UI:Dashboard:Revert' => 'Tilbage til original version...',
+	'UI:Dashboard:RevertConfirm' => 'Enhver ændring foretaget i den oprindelige version vil blive tabt. Bekræft venligst at du ønsker dette.',
+	'UI:ExportDashBoard' => 'Exporter til fil',
+	'UI:ImportDashBoard' => 'Importer fra fil...',
+	'UI:ImportDashboardTitle' => 'Importer Fra Fil',
+	'UI:ImportDashboardText' => 'Vælg en dashboard fil til import:',
+	'UI:DashletCreation:Title' => 'Opret en ny Dashlet',
+	'UI:DashletCreation:Dashboard' => 'Dashboard',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type',
+	'UI:DashletCreation:EditNow' => 'Rediger Dashboard',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor',
+	'UI:DashboardEdit:DashboardTitle' => 'Titel',
+	'UI:DashboardEdit:Layout' => 'Layout',
+	'UI:DashboardEdit:Properties' => 'Dashboard Egenskaber',
+	'UI:DashboardEdit:Dashlets' => 'Tilgængelige Dashlets',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Egenskaber',
+	'UI:Form:Property' => 'Egenskab',
+	'UI:Form:Value' => 'Værdi',
+	'UI:DashletPlainText:Label' => 'Tekst',
+	'UI:DashletPlainText:Description' => 'Plain text (ingen formatering)',
+	'UI:DashletPlainText:Prop-Text' => 'Tekst',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Indtast venligst noget tekst her...',
+	'UI:DashletObjectList:Label' => 'Objekt liste',
+	'UI:DashletObjectList:Description' => 'Objekt liste dashlet',
+	'UI:DashletObjectList:Prop-Title' => 'Titel',
+	'UI:DashletObjectList:Prop-Query' => 'Forespørgsel',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu',
+	'UI:DashletGroupBy:Prop-Title' => 'Titel',
+	'UI:DashletGroupBy:Prop-Query' => 'Forespørgsel',
+	'UI:DashletGroupBy:Prop-Style' => 'Style',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Grupper efter...',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Timer af %1$s (0-23)',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Måned af %1$s (1 - 12)',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Ugedag for %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Dag i måneden for %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (time)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (måned)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (ugedag)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dag i måned)',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Vælg venligst det felt, somobjekterne skal grupperes efter',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart',
+	'UI:DashletGroupByTable:Label' => 'Grupper Efter (tabel)',
+	'UI:DashletGroupByTable:Description' => 'Liste (Grupperet efter felt)',
+	'UI:DashletHeaderStatic:Label' => 'Header',
+	'UI:DashletHeaderStatic:Description' => 'Vis en horisontal separator',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Kontakter',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Ikon',
+	'UI:DashletHeaderDynamic:Label' => 'Header med statistik',
+	'UI:DashletHeaderDynamic:Description' => 'Header med stats (grupperet efter...)',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Kontakter',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Ikon',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Undertitel',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Kontakter',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Forespørgsel',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gruper efter',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Værdier',
+	'UI:DashletBadge:Label' => 'Badge',
+	'UI:DashletBadge:Description' => 'Objekt Ikon med ny/søg',
+	'UI:DashletBadge:Prop-Class' => 'Klasse',
+	'DayOfWeek-Sunday' => 'Søndag',
+	'DayOfWeek-Monday' => 'Mandag',
+	'DayOfWeek-Tuesday' => 'Tirsdag',
+	'DayOfWeek-Wednesday' => 'Onsdag',
+	'DayOfWeek-Thursday' => 'Torsdag',
+	'DayOfWeek-Friday' => 'Fredag',
+	'DayOfWeek-Saturday' => 'Lørdag',
+	'UI:Menu:ShortcutList' => 'Opret Genvej...',
+	'UI:ShortcutRenameDlg:Title' => 'Omdøb genvej',
+	'UI:ShortcutListDlg:Title' => 'Opret en genvej for denne liste',
+	'UI:ShortcutDelete:Confirm' => 'Bekræft venligst at du ønsker at slette genvej(e).',
+	'Menu:MyShortcuts' => 'Mine Genveje',
+	'Class:Shortcut' => 'Genvej',
+	'Class:Shortcut+' => '',
+	'Class:Shortcut/Attribute:name' => 'Navn',
+	'Class:Shortcut/Attribute:name+' => '',
+	'UI:FillAllMandatoryFields' => 'Venligst udfyld alle obligatoriske felter.',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'BooleanLabel:yes' => 'yes~~',
+	'BooleanLabel:no' => 'no~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:TitleDetailsFor_Request' => 'Detaljer for anmodning',
+	'Portal:SelectRequestTemplate' => 'Vælg en skabelon for %1$s',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+));
 ?>
\ No newline at end of file
diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php
index 90580134d..e8e2a7b58 100644
--- a/dictionaries/en.dictionary.itop.core.php
+++ b/dictionaries/en.dictionary.itop.core.php
@@ -1,899 +1,899 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Core:DeletedObjectLabel' => '%1s (deleted)',
-	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)',
-
-	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.',
-
-	'Core:AttributeLinkedSet' => 'Array of objects',
-	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass',
-
-	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class',
-
-	'Core:AttributeInteger' => 'Integer',
-	'Core:AttributeInteger+' => 'Numeric value (could be negative)',
-
-	'Core:AttributeDecimal' => 'Decimal',
-	'Core:AttributeDecimal+' => 'Decimal value (could be negative)',
-
-	'Core:AttributeBoolean' => 'Boolean',
-	'Core:AttributeBoolean+' => 'Boolean',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes',
-	'Core:AttributeBoolean/Value:no' => 'No',
-
-	'Core:AttributeArchiveFlag' => 'Archive flag',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode',
-	'Core:AttributeArchiveFlag/Value:no' => 'No',
-	'Core:AttributeArchiveFlag/Label' => 'Archived',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date',
-	'Core:AttributeArchiveDate/Label+' => '',
-
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete',
-
-	'Core:AttributeString' => 'String',
-	'Core:AttributeString+' => 'Alphanumeric string',
-
-	'Core:AttributeClass' => 'Class',
-	'Core:AttributeClass+' => 'Class',
-
-	'Core:AttributeApplicationLanguage' => 'User language',
-	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)',
-
-	'Core:AttributeFinalClass' => 'Class (auto)',
-	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)',
-
-	'Core:AttributePassword' => 'Password',
-	'Core:AttributePassword+' => 'Password of an external device',
-
- 	'Core:AttributeEncryptedString' => 'Encrypted string',
-	'Core:AttributeEncryptedString+' => 'String encrypted with a local key',
-
-	'Core:AttributeText' => 'Text',
-	'Core:AttributeText+' => 'Multiline character string',
-
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => 'HTML string',
-
-	'Core:AttributeEmailAddress' => 'Email address',
-	'Core:AttributeEmailAddress+' => 'Email address',
-
-	'Core:AttributeIPAddress' => 'IP address',
-	'Core:AttributeIPAddress+' => 'IP address',
-
-	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => 'Object Query Langage expression',
-
-	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings',
-
-	'Core:AttributeTemplateString' => 'Template string',
-	'Core:AttributeTemplateString+' => 'String containing placeholders',
-
-	'Core:AttributeTemplateText' => 'Template text',
-	'Core:AttributeTemplateText+' => 'Text containing placeholders',
-
-	'Core:AttributeTemplateHTML' => 'Template HTML',
-	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders',
-
-	'Core:AttributeDateTime' => 'Date/time',
-	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-If the time is omitted, it defaults to 00:00:00
-</p>',
-
-	'Core:AttributeDate' => 'Date',
-	'Core:AttributeDate+' => 'Date (year-month-day)',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>',
-
-	'Core:AttributeDeadline' => 'Deadline',
-	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time',
-
-	'Core:AttributeExternalKey' => 'External key',
-	'Core:AttributeExternalKey+' => 'External (or foreign) key',
-
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Key',
-	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent',
-
-	'Core:AttributeExternalField' => 'External field',
-	'Core:AttributeExternalField+' => 'Field mapped to an external key',
-
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => 'Absolute or relative URL as a text string',
-
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => 'Any binary content (document)',
-
-	'Core:AttributeOneWayPassword' => 'One way password',
-	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password',
-
-	'Core:AttributeTable' => 'Table',
-	'Core:AttributeTable+' => 'Indexed array having two dimensions',
-
-	'Core:AttributePropertySet' => 'Properties',
-	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)',
-
-	'Core:AttributeFriendlyName' => 'Friendly name',
-	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes',
-
-	'Core:FriendlyName-Label' => 'Full name',
-	'Core:FriendlyName-Description' => 'Full name',
-));
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'core/cmdb'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: CMDBChange
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChange' => 'Change',
-	'Class:CMDBChange+' => 'Changes tracking',
-	'Class:CMDBChange/Attribute:date' => 'date',
-	'Class:CMDBChange/Attribute:date+' => 'date and time at which the changes have been recorded',
-	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
-	'Class:CMDBChange/Attribute:userinfo+' => 'caller\'s defined information',
-));
-
-//
-// Class: CMDBChangeOp
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOp' => 'Change Operation',
-	'Class:CMDBChangeOp+' => 'Change operations tracking',
-	'Class:CMDBChangeOp/Attribute:change' => 'change',
-	'Class:CMDBChangeOp/Attribute:change+' => 'change',
-	'Class:CMDBChangeOp/Attribute:date' => 'date',
-	'Class:CMDBChangeOp/Attribute:date+' => 'date and time of the change',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'user',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => 'who made this change',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'object class',
-	'Class:CMDBChangeOp/Attribute:objclass+' => 'object class',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
-	'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp sub-class',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: CMDBChangeOpCreate
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOpCreate' => 'object creation',
-	'Class:CMDBChangeOpCreate+' => 'Object creation tracking',
-));
-
-//
-// Class: CMDBChangeOpDelete
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOpDelete' => 'object deletion',
-	'Class:CMDBChangeOpDelete+' => 'Object deletion tracking',
-));
-
-//
-// Class: CMDBChangeOpSetAttribute
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOpSetAttribute' => 'object change',
-	'Class:CMDBChangeOpSetAttribute+' => 'Object properties change tracking',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribute',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'code of the modified property',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeScalar
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => 'property change',
-	'Class:CMDBChangeOpSetAttributeScalar+' => 'Object scalar properties change tracking',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Previous value',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'previous value of the attribute',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'New value',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'new value of the attribute',
-));
-// Used by CMDBChangeOp... & derived classes
-Dict::Add('EN US', 'English', 'English', array(
-	'Change:ObjectCreated' => 'Object created',
-	'Change:ObjectDeleted' => 'Object deleted',
-	'Change:ObjectModified' => 'Object modified',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s set to %2$s (previous value: %3$s)',
-	'Change:AttName_SetTo' => '%1$s set to %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s appended to %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modified, previous value: %2$s',
-	'Change:AttName_Changed' => '%1$s modified',
-	'Change:AttName_EntryAdded' => '%1$s modified, new entry added: %2$s',
-	'Change:LinkSet:Added' => 'added %1$s',
-	'Change:LinkSet:Removed' => 'removed %1$s',
-	'Change:LinkSet:Modified' => 'modified %1$s',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeBlob
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => 'data change',
-	'Class:CMDBChangeOpSetAttributeBlob+' => 'data change tracking',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Previous data',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'previous contents of the attribute',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeText
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:CMDBChangeOpSetAttributeText' => 'text change',
-	'Class:CMDBChangeOpSetAttributeText+' => 'text change tracking',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Previous data',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'previous contents of the attribute',
-));
-
-//
-// Class: Event
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Event' => 'Log Event',
-	'Class:Event+' => 'An application internal event',
-	'Class:Event/Attribute:message' => 'Message',
-	'Class:Event/Attribute:message+' => 'short description of the event',
-	'Class:Event/Attribute:date' => 'Date',
-	'Class:Event/Attribute:date+' => 'date and time at which the changes have been recorded',
-	'Class:Event/Attribute:userinfo' => 'User info',
-	'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
-	'Class:Event/Attribute:finalclass' => 'Event sub-class',
-	'Class:Event/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: EventNotification
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EventNotification' => 'Notification event',
-	'Class:EventNotification+' => 'Trace of a notification that has been sent',
-	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
-	'Class:EventNotification/Attribute:trigger_id+' => 'user account',
-	'Class:EventNotification/Attribute:action_id' => 'user',
-	'Class:EventNotification/Attribute:action_id+' => 'user account',
-	'Class:EventNotification/Attribute:object_id' => 'Object id',
-	'Class:EventNotification/Attribute:object_id+' => 'object id (class defined by the trigger ?)',
-));
-
-//
-// Class: EventNotificationEmail
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EventNotificationEmail' => 'Email emission event',
-	'Class:EventNotificationEmail+' => 'Trace of an email that has been sent',
-	'Class:EventNotificationEmail/Attribute:to' => 'TO',
-	'Class:EventNotificationEmail/Attribute:to+' => 'TO',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:from' => 'From',
-	'Class:EventNotificationEmail/Attribute:from+' => 'Sender of the message',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Subject',
-	'Class:EventNotificationEmail/Attribute:subject+' => 'Subject',
-	'Class:EventNotificationEmail/Attribute:body' => 'Body',
-	'Class:EventNotificationEmail/Attribute:body+' => 'Body',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments',
-	'Class:EventNotificationEmail/Attribute:attachments+' => '',
-));
-
-//
-// Class: EventIssue
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EventIssue' => 'Issue event',
-	'Class:EventIssue+' => 'Trace of an issue (warning, error, etc.)',
-	'Class:EventIssue/Attribute:issue' => 'Issue',
-	'Class:EventIssue/Attribute:issue+' => 'What happened',
-	'Class:EventIssue/Attribute:impact' => 'Impact',
-	'Class:EventIssue/Attribute:impact+' => 'What are the consequences',
-	'Class:EventIssue/Attribute:page' => 'Page',
-	'Class:EventIssue/Attribute:page+' => 'HTTP entry point',
-	'Class:EventIssue/Attribute:arguments_post' => 'Posted arguments',
-	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
-	'Class:EventIssue/Attribute:arguments_get' => 'URL arguments',
-	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET arguments',
-	'Class:EventIssue/Attribute:callstack' => 'Callstack',
-	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
-	'Class:EventIssue/Attribute:data' => 'Data',
-	'Class:EventIssue/Attribute:data+' => 'More information',
-));
-
-//
-// Class: EventWebService
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EventWebService' => 'Web service event',
-	'Class:EventWebService+' => 'Trace of an web service call',
-	'Class:EventWebService/Attribute:verb' => 'Verb',
-	'Class:EventWebService/Attribute:verb+' => 'Name of the operation',
-	'Class:EventWebService/Attribute:result' => 'Result',
-	'Class:EventWebService/Attribute:result+' => 'Overall success/failure',
-	'Class:EventWebService/Attribute:log_info' => 'Info log',
-	'Class:EventWebService/Attribute:log_info+' => 'Result info log',
-	'Class:EventWebService/Attribute:log_warning' => 'Warning log',
-	'Class:EventWebService/Attribute:log_warning+' => 'Result warning log',
-	'Class:EventWebService/Attribute:log_error' => 'Error log',
-	'Class:EventWebService/Attribute:log_error+' => 'Result error log',
-	'Class:EventWebService/Attribute:data' => 'Data',
-	'Class:EventWebService/Attribute:data+' => 'Result data',
-));
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EventRestService' => 'REST/JSON call',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call',
-	'Class:EventRestService/Attribute:operation' => 'Operation',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'',
-	'Class:EventRestService/Attribute:version' => 'Version',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'',
-	'Class:EventRestService/Attribute:json_input' => 'Input',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'',
-	'Class:EventRestService/Attribute:code' => 'Code',
-	'Class:EventRestService/Attribute:code+' => 'Result code',
-	'Class:EventRestService/Attribute:json_output' => 'Response',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)',
-	'Class:EventRestService/Attribute:provider' => 'Provider',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation',
-));
-
-//
-// Class: EventLoginUsage
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:EventLoginUsage' => 'Login Usage',
-	'Class:EventLoginUsage+' => 'Connection to the application',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
-	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name',
-	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email',
-	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Action' => 'Custom Action',
-	'Class:Action+' => 'User defined action',
-	'Class:Action/Attribute:name' => 'Name',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Description',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Status',
-	'Class:Action/Attribute:status+' => 'In production or ?',
-	'Class:Action/Attribute:status/Value:test' => 'Being tested',
-	'Class:Action/Attribute:status/Value:test+' => 'Being tested',
-	'Class:Action/Attribute:status/Value:enabled' => 'In production',
-	'Class:Action/Attribute:status/Value:enabled+' => 'In production',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
-	'Class:Action/Attribute:status/Value:disabled+' => 'Inactive',
-	'Class:Action/Attribute:trigger_list' => 'Related Triggers',
-	'Class:Action/Attribute:trigger_list+' => 'Triggers linked to this action',
-	'Class:Action/Attribute:finalclass' => 'Action sub-class',
-	'Class:Action/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: ActionNotification
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ActionNotification' => 'Notification',
-	'Class:ActionNotification+' => 'Notification (abstract)',
-));
-
-//
-// Class: ActionEmail
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:ActionEmail' => 'Email notification',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient',
-	'Class:ActionEmail/Attribute:test_recipient+' => 'Detination in case status is set to "Test"',
-	'Class:ActionEmail/Attribute:from' => 'From',
-	'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header',
-	'Class:ActionEmail/Attribute:reply_to' => 'Reply to',
-	'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header',
-	'Class:ActionEmail/Attribute:to' => 'To',
-	'Class:ActionEmail/Attribute:to+' => 'Destination of the email',
-	'Class:ActionEmail/Attribute:cc' => 'Cc',
-	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
-	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
-	'Class:ActionEmail/Attribute:subject' => 'subject',
-	'Class:ActionEmail/Attribute:subject+' => 'Title of the email',
-	'Class:ActionEmail/Attribute:body' => 'body',
-	'Class:ActionEmail/Attribute:body+' => 'Contents of the email',
-	'Class:ActionEmail/Attribute:importance' => 'importance',
-	'Class:ActionEmail/Attribute:importance+' => 'Importance flag',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'low',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => 'low',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'high',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => 'high',
-));
-
-//
-// Class: Trigger
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Trigger' => 'Trigger',
-	'Class:Trigger+' => 'Custom event handler',
-	'Class:Trigger/Attribute:description' => 'Description',
-	'Class:Trigger/Attribute:description+' => 'one line description',
-	'Class:Trigger/Attribute:action_list' => 'Triggered actions',
-	'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated',
-	'Class:Trigger/Attribute:finalclass' => 'Trigger sub-class',
-	'Class:Trigger/Attribute:finalclass+' => 'Name of the final class',
-));
-
-//
-// Class: TriggerOnObject
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnObject' => 'Trigger (class dependent)',
-	'Class:TriggerOnObject+' => 'Trigger on a given class of objects',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Target class',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter',
-	'Class:TriggerOnObject/Attribute:filter+' => '',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"',
-));
-
-//
-// Class: TriggerOnPortalUpdate
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)',
-	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal',
-));
-
-//
-// Class: TriggerOnStateChange
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnStateChange' => 'Trigger (on state change)',
-	'Class:TriggerOnStateChange+' => 'Trigger on object state change',
-	'Class:TriggerOnStateChange/Attribute:state' => 'State',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-));
-
-//
-// Class: TriggerOnStateEnter
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnStateEnter' => 'Trigger (on entering a state)',
-	'Class:TriggerOnStateEnter+' => 'Trigger on object state change - entering',
-));
-
-//
-// Class: TriggerOnStateLeave
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnStateLeave' => 'Trigger (on leaving a state)',
-	'Class:TriggerOnStateLeave+' => 'Trigger on object state change - leaving',
-));
-
-//
-// Class: TriggerOnObjectCreate
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnObjectCreate' => 'Trigger (on object creation)',
-	'Class:TriggerOnObjectCreate+' => 'Trigger on object creation of [a child class of] the given class',
-));
-
-//
-// Class: TriggerOnThresholdReached
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)',
-	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
-));
-
-//
-// Class: lnkTriggerAction
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:lnkTriggerAction' => 'Action/Trigger',
-	'Class:lnkTriggerAction+' => 'Link between a trigger and an action',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Action',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'The action to be executed',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Action',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Order',
-	'Class:lnkTriggerAction/Attribute:order+' => 'Actions execution order',
-));
-
-//
-// Synchro Data Source
-//
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:SynchroDataSource/Attribute:name' => 'Name',
-	'Class:SynchroDataSource/Attribute:name+' => 'Name',
-	'Class:SynchroDataSource/Attribute:description' => 'Description',
-	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class',
-	'Class:SynchroDataSource/Attribute:user_id' => 'User',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy', //TODO enum values
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.',
-	'SynchroDataSource:Description' => 'Description',
-	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
-	'SynchroDataSource:Deletion' => 'Deletion rules',
-	'SynchroDataSource:Status' => 'Status',
-	'SynchroDataSource:Information' => 'Information',
-	'SynchroDataSource:Definition' => 'Definition',
-	'Core:SynchroAttributes' => 'Attributes',
-	'Core:SynchroStatus' => 'Status',
-	'Core:Synchro:ErrorsLabel' => 'Errors',	
-	'Core:Synchro:CreatedLabel' => 'Created',
-	'Core:Synchro:ModifiedLabel' => 'Modified',
-	'Core:Synchro:UnchangedLabel' => 'Unchanged',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Errors',
-	'Core:Synchro:ReconciledLabel' => 'Reconciled',
-	'Core:Synchro:ReconciledNewLabel' => 'Created',
-	'Core:SynchroReconcile:Yes' => 'Yes',
-	'Core:SynchroReconcile:No' => 'No',
-	'Core:SynchroUpdate:Yes' => 'Yes',
-	'Core:SynchroUpdate:No' => 'No',
-	'Core:Synchro:LastestStatus' => 'Latest Status',
-	'Core:Synchro:History' => 'Synchronization History',
-	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
-	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...',
-	'Menu:DataSources' => 'Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'All Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)',
-	'Core:Synchro:label_repl_new' => 'New (%1$s)',
-	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)', 
-	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Created (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)',
-	'Core:Synchro:History' => 'Synchronization History',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.',			
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete',			
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.',
-	'Core:SynchroReplica:PublicData' => 'Public Data',
-	'Core:SynchroReplica:PrivateDetails' => 'Private Details',
-	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
-	'Core:SynchroAtt:attcode' => 'Attribute',
-	'Core:SynchroAtt:attcode+' => 'Field of the object',
-	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?',
-	'Core:SynchroAtt:reconciliation+' => 'Used for searching',
-	'Core:SynchroAtt:update' => 'Update ?',
-	'Core:SynchroAtt:update+' => 'Used to update the object',
-	'Core:SynchroAtt:update_policy' => 'Update Policy',
-	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation',
-	'Core:SyncDataExchangeComment' => '(Data Synchro)',
-	'Core:Synchro:ListOfDataSources' => 'List of data sources:',
-	'Core:Synchro:LastSynchro' => 'Last synchronization:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s',
-	'TitleSynchroExecution' => 'Execution of the synchronization',
-	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s',
-	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.',
-	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
-	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
-	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
-	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
-	'Class:AsyncSendEmail' => 'Email (asynchronous)',
-	'Class:AsyncSendEmail/Attribute:to' => 'To',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Subject',
-	'Class:AsyncSendEmail/Attribute:body' => 'Body',
-	'Class:AsyncSendEmail/Attribute:header' => 'Header',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry',
-	'Class:SynchroDataSource' => 'Synchro Data Source',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody',
-	'Class:SynchroAttribute' => 'Synchro Attribute',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code',
-	'Class:SynchroAttribute/Attribute:update' => 'Update',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Class',
-	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute',
-	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator',
-	'Class:SynchroLog' => 'Synchr Log',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source',
-	'Class:SynchroLog/Attribute:start_date' => 'Start Date',
-	'Class:SynchroLog/Attribute:end_date' => 'End Date',
-	'Class:SynchroLog/Attribute:status' => 'Status',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Error',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged',
-	'Class:SynchroLog/Attribute:last_error' => 'Last error',
-	'Class:SynchroLog/Attribute:traces' => 'Traces',
-	'Class:SynchroReplica' => 'Synchro Replica',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen',
-	'Class:SynchroReplica/Attribute:status' => 'Status',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'New',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date',
-	'Class:appUserPreferences' => 'User Preferences',
-	'Class:appUserPreferences/Attribute:userid' => 'User',
-	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
-	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
-
-	// Attribute Duration
-	'Core:Duration_Seconds'	=> '%1$ds',	
-	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
-
-	// Explain working time computing
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%',
-	
-	// Bulk export
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:',
-	'Core:BulkExportOf_Class' => '%1$s Export',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s',
-	'Core:BulkExport:ExportResult' => 'Result of the export:',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported',
-	'Core:BulkExport:CheckAll' => 'Check All',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user',
-	'Core:BulkExport:CSVOptions' => 'CSV Options',
-	'Core:BulkExport:CSVLocalization' => 'Localization',
-	'Core:BulkExport:PDFOptions' => 'PDF Options',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:',
-	'Core:BulkExport:PageSize-A4' => 'A4',
-	'Core:BulkExport:PageSize-A3' => 'A3',
-	'Core:BulkExport:PageSize-Letter' => 'Letter',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)',
-	'Core:BulkExport:XMLOptions' => 'XML Options',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup',
-	'Core:BulkExport:DateTimeFormat' => 'Date and Time format',
-	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s',
-	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
-	'Core:Validator:Default' => 'Wrong format',
-	'Core:Validator:Mandatory' => 'Please, fill this field',
-	'Core:Validator:MustBeInteger' => 'Must be an integer',
-	'Core:Validator:MustSelectOne' => 'Please, select one',
-));
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Core:DeletedObjectLabel' => '%1s (deleted)',
+	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)',
+
+	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)',
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.',
+
+	'Core:AttributeLinkedSet' => 'Array of objects',
+	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass',
+
+	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class',
+
+	'Core:AttributeInteger' => 'Integer',
+	'Core:AttributeInteger+' => 'Numeric value (could be negative)',
+
+	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal+' => 'Decimal value (could be negative)',
+
+	'Core:AttributeBoolean' => 'Boolean',
+	'Core:AttributeBoolean+' => 'Boolean',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes',
+	'Core:AttributeBoolean/Value:no' => 'No',
+
+	'Core:AttributeArchiveFlag' => 'Archive flag',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode',
+	'Core:AttributeArchiveFlag/Value:no' => 'No',
+	'Core:AttributeArchiveFlag/Label' => 'Archived',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date',
+	'Core:AttributeArchiveDate/Label+' => '',
+
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete',
+
+	'Core:AttributeString' => 'String',
+	'Core:AttributeString+' => 'Alphanumeric string',
+
+	'Core:AttributeClass' => 'Class',
+	'Core:AttributeClass+' => 'Class',
+
+	'Core:AttributeApplicationLanguage' => 'User language',
+	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)',
+
+	'Core:AttributeFinalClass' => 'Class (auto)',
+	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)',
+
+	'Core:AttributePassword' => 'Password',
+	'Core:AttributePassword+' => 'Password of an external device',
+
+ 	'Core:AttributeEncryptedString' => 'Encrypted string',
+	'Core:AttributeEncryptedString+' => 'String encrypted with a local key',
+
+	'Core:AttributeText' => 'Text',
+	'Core:AttributeText+' => 'Multiline character string',
+
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'HTML string',
+
+	'Core:AttributeEmailAddress' => 'Email address',
+	'Core:AttributeEmailAddress+' => 'Email address',
+
+	'Core:AttributeIPAddress' => 'IP address',
+	'Core:AttributeIPAddress+' => 'IP address',
+
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => 'Object Query Langage expression',
+
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings',
+
+	'Core:AttributeTemplateString' => 'Template string',
+	'Core:AttributeTemplateString+' => 'String containing placeholders',
+
+	'Core:AttributeTemplateText' => 'Template text',
+	'Core:AttributeTemplateText+' => 'Text containing placeholders',
+
+	'Core:AttributeTemplateHTML' => 'Template HTML',
+	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders',
+
+	'Core:AttributeDateTime' => 'Date/time',
+	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>',
+
+	'Core:AttributeDate' => 'Date',
+	'Core:AttributeDate+' => 'Date (year-month-day)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>',
+
+	'Core:AttributeDeadline' => 'Deadline',
+	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time',
+
+	'Core:AttributeExternalKey' => 'External key',
+	'Core:AttributeExternalKey+' => 'External (or foreign) key',
+
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Key',
+	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent',
+
+	'Core:AttributeExternalField' => 'External field',
+	'Core:AttributeExternalField+' => 'Field mapped to an external key',
+
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => 'Absolute or relative URL as a text string',
+
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => 'Any binary content (document)',
+
+	'Core:AttributeOneWayPassword' => 'One way password',
+	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password',
+
+	'Core:AttributeTable' => 'Table',
+	'Core:AttributeTable+' => 'Indexed array having two dimensions',
+
+	'Core:AttributePropertySet' => 'Properties',
+	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)',
+
+	'Core:AttributeFriendlyName' => 'Friendly name',
+	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes',
+
+	'Core:FriendlyName-Label' => 'Full name',
+	'Core:FriendlyName-Description' => 'Full name',
+));
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChange' => 'Change',
+	'Class:CMDBChange+' => 'Changes tracking',
+	'Class:CMDBChange/Attribute:date' => 'date',
+	'Class:CMDBChange/Attribute:date+' => 'date and time at which the changes have been recorded',
+	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
+	'Class:CMDBChange/Attribute:userinfo+' => 'caller\'s defined information',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOp' => 'Change Operation',
+	'Class:CMDBChangeOp+' => 'Change operations tracking',
+	'Class:CMDBChangeOp/Attribute:change' => 'change',
+	'Class:CMDBChangeOp/Attribute:change+' => 'change',
+	'Class:CMDBChangeOp/Attribute:date' => 'date',
+	'Class:CMDBChangeOp/Attribute:date+' => 'date and time of the change',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'user',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'who made this change',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'object class',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'object class',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'CMDBChangeOp sub-class',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOpCreate' => 'object creation',
+	'Class:CMDBChangeOpCreate+' => 'Object creation tracking',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOpDelete' => 'object deletion',
+	'Class:CMDBChangeOpDelete+' => 'Object deletion tracking',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOpSetAttribute' => 'object change',
+	'Class:CMDBChangeOpSetAttribute+' => 'Object properties change tracking',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribute',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'code of the modified property',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => 'property change',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Object scalar properties change tracking',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Previous value',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'previous value of the attribute',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'New value',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'new value of the attribute',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('EN US', 'English', 'English', array(
+	'Change:ObjectCreated' => 'Object created',
+	'Change:ObjectDeleted' => 'Object deleted',
+	'Change:ObjectModified' => 'Object modified',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s set to %2$s (previous value: %3$s)',
+	'Change:AttName_SetTo' => '%1$s set to %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s appended to %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modified, previous value: %2$s',
+	'Change:AttName_Changed' => '%1$s modified',
+	'Change:AttName_EntryAdded' => '%1$s modified, new entry added: %2$s',
+	'Change:LinkSet:Added' => 'added %1$s',
+	'Change:LinkSet:Removed' => 'removed %1$s',
+	'Change:LinkSet:Modified' => 'modified %1$s',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => 'data change',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'data change tracking',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Previous data',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'previous contents of the attribute',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:CMDBChangeOpSetAttributeText' => 'text change',
+	'Class:CMDBChangeOpSetAttributeText+' => 'text change tracking',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Previous data',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'previous contents of the attribute',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Event' => 'Log Event',
+	'Class:Event+' => 'An application internal event',
+	'Class:Event/Attribute:message' => 'Message',
+	'Class:Event/Attribute:message+' => 'short description of the event',
+	'Class:Event/Attribute:date' => 'Date',
+	'Class:Event/Attribute:date+' => 'date and time at which the changes have been recorded',
+	'Class:Event/Attribute:userinfo' => 'User info',
+	'Class:Event/Attribute:userinfo+' => 'identification of the user that was doing the action that triggered this event',
+	'Class:Event/Attribute:finalclass' => 'Event sub-class',
+	'Class:Event/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventNotification' => 'Notification event',
+	'Class:EventNotification+' => 'Trace of a notification that has been sent',
+	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
+	'Class:EventNotification/Attribute:trigger_id+' => 'user account',
+	'Class:EventNotification/Attribute:action_id' => 'user',
+	'Class:EventNotification/Attribute:action_id+' => 'user account',
+	'Class:EventNotification/Attribute:object_id' => 'Object id',
+	'Class:EventNotification/Attribute:object_id+' => 'object id (class defined by the trigger ?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventNotificationEmail' => 'Email emission event',
+	'Class:EventNotificationEmail+' => 'Trace of an email that has been sent',
+	'Class:EventNotificationEmail/Attribute:to' => 'TO',
+	'Class:EventNotificationEmail/Attribute:to+' => 'TO',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:from' => 'From',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Sender of the message',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Subject',
+	'Class:EventNotificationEmail/Attribute:subject+' => 'Subject',
+	'Class:EventNotificationEmail/Attribute:body' => 'Body',
+	'Class:EventNotificationEmail/Attribute:body+' => 'Body',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments',
+	'Class:EventNotificationEmail/Attribute:attachments+' => '',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventIssue' => 'Issue event',
+	'Class:EventIssue+' => 'Trace of an issue (warning, error, etc.)',
+	'Class:EventIssue/Attribute:issue' => 'Issue',
+	'Class:EventIssue/Attribute:issue+' => 'What happened',
+	'Class:EventIssue/Attribute:impact' => 'Impact',
+	'Class:EventIssue/Attribute:impact+' => 'What are the consequences',
+	'Class:EventIssue/Attribute:page' => 'Page',
+	'Class:EventIssue/Attribute:page+' => 'HTTP entry point',
+	'Class:EventIssue/Attribute:arguments_post' => 'Posted arguments',
+	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL arguments',
+	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET arguments',
+	'Class:EventIssue/Attribute:callstack' => 'Callstack',
+	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
+	'Class:EventIssue/Attribute:data' => 'Data',
+	'Class:EventIssue/Attribute:data+' => 'More information',
+));
+
+//
+// Class: EventWebService
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventWebService' => 'Web service event',
+	'Class:EventWebService+' => 'Trace of an web service call',
+	'Class:EventWebService/Attribute:verb' => 'Verb',
+	'Class:EventWebService/Attribute:verb+' => 'Name of the operation',
+	'Class:EventWebService/Attribute:result' => 'Result',
+	'Class:EventWebService/Attribute:result+' => 'Overall success/failure',
+	'Class:EventWebService/Attribute:log_info' => 'Info log',
+	'Class:EventWebService/Attribute:log_info+' => 'Result info log',
+	'Class:EventWebService/Attribute:log_warning' => 'Warning log',
+	'Class:EventWebService/Attribute:log_warning+' => 'Result warning log',
+	'Class:EventWebService/Attribute:log_error' => 'Error log',
+	'Class:EventWebService/Attribute:log_error+' => 'Result error log',
+	'Class:EventWebService/Attribute:data' => 'Data',
+	'Class:EventWebService/Attribute:data+' => 'Result data',
+));
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventRestService' => 'REST/JSON call',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call',
+	'Class:EventRestService/Attribute:operation' => 'Operation',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'',
+	'Class:EventRestService/Attribute:version' => 'Version',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'',
+	'Class:EventRestService/Attribute:json_input' => 'Input',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'',
+	'Class:EventRestService/Attribute:code' => 'Code',
+	'Class:EventRestService/Attribute:code+' => 'Result code',
+	'Class:EventRestService/Attribute:json_output' => 'Response',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)',
+	'Class:EventRestService/Attribute:provider' => 'Provider',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation',
+));
+
+//
+// Class: EventLoginUsage
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:EventLoginUsage' => 'Login Usage',
+	'Class:EventLoginUsage+' => 'Connection to the application',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Action' => 'Custom Action',
+	'Class:Action+' => 'User defined action',
+	'Class:Action/Attribute:name' => 'Name',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Description',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Status',
+	'Class:Action/Attribute:status+' => 'In production or ?',
+	'Class:Action/Attribute:status/Value:test' => 'Being tested',
+	'Class:Action/Attribute:status/Value:test+' => 'Being tested',
+	'Class:Action/Attribute:status/Value:enabled' => 'In production',
+	'Class:Action/Attribute:status/Value:enabled+' => 'In production',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
+	'Class:Action/Attribute:status/Value:disabled+' => 'Inactive',
+	'Class:Action/Attribute:trigger_list' => 'Related Triggers',
+	'Class:Action/Attribute:trigger_list+' => 'Triggers linked to this action',
+	'Class:Action/Attribute:finalclass' => 'Action sub-class',
+	'Class:Action/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ActionNotification' => 'Notification',
+	'Class:ActionNotification+' => 'Notification (abstract)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:ActionEmail' => 'Email notification',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Detination in case status is set to "Test"',
+	'Class:ActionEmail/Attribute:from' => 'From',
+	'Class:ActionEmail/Attribute:from+' => 'Will be sent into the email header',
+	'Class:ActionEmail/Attribute:reply_to' => 'Reply to',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Will be sent into the email header',
+	'Class:ActionEmail/Attribute:to' => 'To',
+	'Class:ActionEmail/Attribute:to+' => 'Destination of the email',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
+	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
+	'Class:ActionEmail/Attribute:subject' => 'subject',
+	'Class:ActionEmail/Attribute:subject+' => 'Title of the email',
+	'Class:ActionEmail/Attribute:body' => 'body',
+	'Class:ActionEmail/Attribute:body+' => 'Contents of the email',
+	'Class:ActionEmail/Attribute:importance' => 'importance',
+	'Class:ActionEmail/Attribute:importance+' => 'Importance flag',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'low',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => 'low',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'high',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => 'high',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Trigger' => 'Trigger',
+	'Class:Trigger+' => 'Custom event handler',
+	'Class:Trigger/Attribute:description' => 'Description',
+	'Class:Trigger/Attribute:description+' => 'one line description',
+	'Class:Trigger/Attribute:action_list' => 'Triggered actions',
+	'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated',
+	'Class:Trigger/Attribute:finalclass' => 'Trigger sub-class',
+	'Class:Trigger/Attribute:finalclass+' => 'Name of the final class',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnObject' => 'Trigger (class dependent)',
+	'Class:TriggerOnObject+' => 'Trigger on a given class of objects',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Target class',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter',
+	'Class:TriggerOnObject/Attribute:filter+' => '',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class "%1$s"',
+));
+
+//
+// Class: TriggerOnPortalUpdate
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnStateChange' => 'Trigger (on state change)',
+	'Class:TriggerOnStateChange+' => 'Trigger on object state change',
+	'Class:TriggerOnStateChange/Attribute:state' => 'State',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnStateEnter' => 'Trigger (on entering a state)',
+	'Class:TriggerOnStateEnter+' => 'Trigger on object state change - entering',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnStateLeave' => 'Trigger (on leaving a state)',
+	'Class:TriggerOnStateLeave+' => 'Trigger on object state change - leaving',
+));
+
+//
+// Class: TriggerOnObjectCreate
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnObjectCreate' => 'Trigger (on object creation)',
+	'Class:TriggerOnObjectCreate+' => 'Trigger on object creation of [a child class of] the given class',
+));
+
+//
+// Class: TriggerOnThresholdReached
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)',
+	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:lnkTriggerAction' => 'Action/Trigger',
+	'Class:lnkTriggerAction+' => 'Link between a trigger and an action',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Action',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'The action to be executed',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Action',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Order',
+	'Class:lnkTriggerAction/Attribute:order+' => 'Actions execution order',
+));
+
+//
+// Synchro Data Source
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:SynchroDataSource/Attribute:name' => 'Name',
+	'Class:SynchroDataSource/Attribute:name+' => 'Name',
+	'Class:SynchroDataSource/Attribute:description' => 'Description',
+	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class',
+	'Class:SynchroDataSource/Attribute:user_id' => 'User',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy', //TODO enum values
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.',
+	'SynchroDataSource:Description' => 'Description',
+	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
+	'SynchroDataSource:Deletion' => 'Deletion rules',
+	'SynchroDataSource:Status' => 'Status',
+	'SynchroDataSource:Information' => 'Information',
+	'SynchroDataSource:Definition' => 'Definition',
+	'Core:SynchroAttributes' => 'Attributes',
+	'Core:SynchroStatus' => 'Status',
+	'Core:Synchro:ErrorsLabel' => 'Errors',	
+	'Core:Synchro:CreatedLabel' => 'Created',
+	'Core:Synchro:ModifiedLabel' => 'Modified',
+	'Core:Synchro:UnchangedLabel' => 'Unchanged',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errors',
+	'Core:Synchro:ReconciledLabel' => 'Reconciled',
+	'Core:Synchro:ReconciledNewLabel' => 'Created',
+	'Core:SynchroReconcile:Yes' => 'Yes',
+	'Core:SynchroReconcile:No' => 'No',
+	'Core:SynchroUpdate:Yes' => 'Yes',
+	'Core:SynchroUpdate:No' => 'No',
+	'Core:Synchro:LastestStatus' => 'Latest Status',
+	'Core:Synchro:History' => 'Synchronization History',
+	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...',
+	'Menu:DataSources' => 'Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'All Synchronization Data Sources', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)',
+	'Core:Synchro:label_repl_new' => 'New (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)', 
+	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Created (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)',
+	'Core:Synchro:History' => 'Synchronization History',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.',			
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete',			
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.',
+	'Core:SynchroReplica:PublicData' => 'Public Data',
+	'Core:SynchroReplica:PrivateDetails' => 'Private Details',
+	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
+	'Core:SynchroAtt:attcode' => 'Attribute',
+	'Core:SynchroAtt:attcode+' => 'Field of the object',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?',
+	'Core:SynchroAtt:reconciliation+' => 'Used for searching',
+	'Core:SynchroAtt:update' => 'Update ?',
+	'Core:SynchroAtt:update+' => 'Used to update the object',
+	'Core:SynchroAtt:update_policy' => 'Update Policy',
+	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)',
+	'Core:Synchro:ListOfDataSources' => 'List of data sources:',
+	'Core:Synchro:LastSynchro' => 'Last synchronization:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s',
+	'TitleSynchroExecution' => 'Execution of the synchronization',
+	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s',
+	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.',
+	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.',
+	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
+	'Class:AsyncSendEmail' => 'Email (asynchronous)',
+	'Class:AsyncSendEmail/Attribute:to' => 'To',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Subject',
+	'Class:AsyncSendEmail/Attribute:body' => 'Body',
+	'Class:AsyncSendEmail/Attribute:header' => 'Header',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry',
+	'Class:SynchroDataSource' => 'Synchro Data Source',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody',
+	'Class:SynchroAttribute' => 'Synchro Attribute',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code',
+	'Class:SynchroAttribute/Attribute:update' => 'Update',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Class',
+	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute',
+	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator',
+	'Class:SynchroLog' => 'Synchr Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroLog/Attribute:start_date' => 'Start Date',
+	'Class:SynchroLog/Attribute:end_date' => 'End Date',
+	'Class:SynchroLog/Attribute:status' => 'Status',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Error',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged',
+	'Class:SynchroLog/Attribute:last_error' => 'Last error',
+	'Class:SynchroLog/Attribute:traces' => 'Traces',
+	'Class:SynchroReplica' => 'Synchro Replica',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen',
+	'Class:SynchroReplica/Attribute:status' => 'Status',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'New',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date',
+	'Class:appUserPreferences' => 'User Preferences',
+	'Class:appUserPreferences/Attribute:userid' => 'User',
+	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
+
+	// Attribute Duration
+	'Core:Duration_Seconds'	=> '%1$ds',	
+	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
+
+	// Explain working time computing
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as "%1$s")',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for "%1$s"',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for "%1$s" at %2$d%%',
+	
+	// Bulk export
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter "%1$s"',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter "query". There is no Query Phrasebook corresponding to the id: "%1$s".',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:',
+	'Core:BulkExportOf_Class' => '%1$s Export',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s',
+	'Core:BulkExport:ExportResult' => 'Result of the export:',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported',
+	'Core:BulkExport:CheckAll' => 'Check All',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user',
+	'Core:BulkExport:CSVOptions' => 'CSV Options',
+	'Core:BulkExport:CSVLocalization' => 'Localization',
+	'Core:BulkExport:PDFOptions' => 'PDF Options',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:',
+	'Core:BulkExport:PageSize-A4' => 'A4',
+	'Core:BulkExport:PageSize-A3' => 'A3',
+	'Core:BulkExport:PageSize-Letter' => 'Letter',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)',
+	'Core:BulkExport:XMLOptions' => 'XML Options',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup',
+	'Core:BulkExport:DateTimeFormat' => 'Date and Time format',
+	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Default format (%1$s), e.g. %2$s',
+	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Custom format: %1$s',
+	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'YYYY', // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'YY', // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:Validator:Default' => 'Wrong format',
+	'Core:Validator:Mandatory' => 'Please, fill this field',
+	'Core:Validator:MustBeInteger' => 'Must be an integer',
+	'Core:Validator:MustSelectOne' => 'Please, select one',
+));
diff --git a/dictionaries/en.dictionary.itop.model.php b/dictionaries/en.dictionary.itop.model.php
index 122b08f12..ed0fb5e36 100644
--- a/dictionaries/en.dictionary.itop.model.php
+++ b/dictionaries/en.dictionary.itop.model.php
@@ -1,27 +1,27 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+?>
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index fc036fe5b..7ad318d1d 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -1,1530 +1,1530 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:AuditCategory' => 'Audit Category',
-	'Class:AuditCategory+' => 'A section inside the overall audit',
-	'Class:AuditCategory/Attribute:name' => 'Category Name',
-	'Class:AuditCategory/Attribute:name+' => 'Short name for this category',
-	'Class:AuditCategory/Attribute:description' => 'Audit Category Description',
-	'Class:AuditCategory/Attribute:description+' => 'Long description for this audit category',
-	'Class:AuditCategory/Attribute:definition_set' => 'Definition Set',
-	'Class:AuditCategory/Attribute:definition_set+' => 'OQL expression defining the set of objects to audit',
-	'Class:AuditCategory/Attribute:rules_list' => 'Audit Rules',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category',
-));
-
-//
-// Class: AuditRule
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:AuditRule' => 'Audit Rule',
-	'Class:AuditRule+' => 'A rule to check for a given Audit category',
-	'Class:AuditRule/Attribute:name' => 'Rule Name',
-	'Class:AuditRule/Attribute:name+' => 'Short name for this rule',
-	'Class:AuditRule/Attribute:description' => 'Audit Rule Description',
-	'Class:AuditRule/Attribute:description+' => 'Long description for this audit rule',
-	'Class:AuditRule/Attribute:query' => 'Query to Run',
-	'Class:AuditRule/Attribute:query+' => 'The OQL expression to run',
-	'Class:AuditRule/Attribute:valid_flag' => 'Valid objects?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'True if the rule returns the valid objects, false otherwise',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
-	'Class:AuditRule/Attribute:category_id' => 'Category',
-	'Class:AuditRule/Attribute:category_id+' => 'The category for this rule',
-	'Class:AuditRule/Attribute:category_name' => 'Category',
-	'Class:AuditRule/Attribute:category_name+' => 'Name of the category for this rule',
-));
-
-//
-// Class: QueryOQL
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:Query' => 'Query',
-	'Class:Query+' => 'A query is a data set defined in a dynamic way',
-	'Class:Query/Attribute:name' => 'Name',
-	'Class:Query/Attribute:name+' => 'Identifies the query',
-	'Class:Query/Attribute:description' => 'Description',
-	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)',
-	'Class:Query/Attribute:fields' => 'Fields',
-	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export',
-
-	'Class:QueryOQL' => 'OQL Query',
-	'Class:QueryOQL+' => 'A query based on the Object Query Language',
-	'Class:QueryOQL/Attribute:oql' => 'Expression',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:User' => 'User',
-	'Class:User+' => 'User login',
-	'Class:User/Attribute:finalclass' => 'Type of account',
-	'Class:User/Attribute:finalclass+' => 'Name of the final class',
-	'Class:User/Attribute:contactid' => 'Contact (person)',
-	'Class:User/Attribute:contactid+' => 'Personal details from the business data',
-	'Class:User/Attribute:last_name' => 'Last name',
-	'Class:User/Attribute:last_name+' => 'Name of the corresponding contact',
-	'Class:User/Attribute:first_name' => 'First name',
-	'Class:User/Attribute:first_name+' => 'First name of the corresponding contact',
-	'Class:User/Attribute:email' => 'Email',
-	'Class:User/Attribute:email+' => 'Email of the corresponding contact',
-	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'user identification string',
-	'Class:User/Attribute:language' => 'Language',
-	'Class:User/Attribute:language+' => 'user language',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:profile_list' => 'Profiles',
-	'Class:User/Attribute:profile_list+' => 'Roles, granting rights for that person',
-	'Class:User/Attribute:allowed_org_list' => 'Allowed Organizations',
-	'Class:User/Attribute:allowed_org_list+' => 'The end user is allowed to see data belonging to the following organizations. If no organization is specified, there is no restriction.',
-	'Class:User/Attribute:status' => 'Status',
-	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.',
-	'Class:User/Attribute:status/Value:enabled' => 'Enabled',
-	'Class:User/Attribute:status/Value:disabled' => 'Disabled',
-		
-	'Class:User/Error:LoginMustBeUnique' => 'Login must be unique - "%1s" is already being used.',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'At least one profile must be assigned to this user.',
-	'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'At least one organization must be assigned to this user.',
-	'Class:User/Error:OrganizationNotAllowed' => 'Organization not allowed.',
-	'Class:User/Error:UserOrganizationNotAllowed' => 'The user account does not belong to your allowed organizations.',
-	'Class:UserInternal' => 'User Internal',
-	'Class:UserInternal+' => 'User defined within iTop',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_Profiles' => 'Profile',
-	'Class:URP_Profiles+' => 'User profile',
-	'Class:URP_Profiles/Attribute:name' => 'Name',
-	'Class:URP_Profiles/Attribute:name+' => 'label',
-	'Class:URP_Profiles/Attribute:description' => 'Description',
-	'Class:URP_Profiles/Attribute:description+' => 'one line description',
-	'Class:URP_Profiles/Attribute:user_list' => 'Users',
-	'Class:URP_Profiles/Attribute:user_list+' => 'persons having this role',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_Dimensions' => 'dimension',
-	'Class:URP_Dimensions+' => 'application dimension (defining silos)',
-	'Class:URP_Dimensions/Attribute:name' => 'Name',
-	'Class:URP_Dimensions/Attribute:name+' => 'label',
-	'Class:URP_Dimensions/Attribute:description' => 'Description',
-	'Class:URP_Dimensions/Attribute:description+' => 'one line description',
-	'Class:URP_Dimensions/Attribute:type' => 'Type',
-	'Class:URP_Dimensions/Attribute:type+' => 'class name or data type (projection unit)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_UserProfile' => 'User to profile',
-	'Class:URP_UserProfile+' => 'user profiles',
-	'Class:URP_UserProfile/Attribute:userid' => 'User',
-	'Class:URP_UserProfile/Attribute:userid+' => 'user account',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'User\'s login',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Profile',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'usage profile',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profile',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Profile name',
-	'Class:URP_UserProfile/Attribute:reason' => 'Reason',
-	'Class:URP_UserProfile/Attribute:reason+' => 'explain why this person may have this role',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_UserOrg' => 'User organizations',
-	'Class:URP_UserOrg+' => 'Allowed organizations',
-	'Class:URP_UserOrg/Attribute:userid' => 'User',
-	'Class:URP_UserOrg/Attribute:userid+' => 'user account',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'User\'s login',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organization',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Allowed organization',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organization',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Allowed organization',
-	'Class:URP_UserOrg/Attribute:reason' => 'Reason',
-	'Class:URP_UserOrg/Attribute:reason+' => 'explain why this person is allowed to see the data belonging to this organization',
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_ProfileProjection' => 'profile_projection',
-	'Class:URP_ProfileProjection+' => 'profile projections',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimension',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'application dimension',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimension',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'application dimension',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profile',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'usage profile',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Profile',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Profile name',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Value expression',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant |  | +attribute code',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribute',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Target attribute code (optional)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_ClassProjection' => 'class_projection',
-	'Class:URP_ClassProjection+' => 'class projections',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimension',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'application dimension',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimension',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'application dimension',
-	'Class:URP_ClassProjection/Attribute:class' => 'Class',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Target class',
-	'Class:URP_ClassProjection/Attribute:value' => 'Value expression',
-	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant |  | +attribute code',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribute',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Target attribute code (optional)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_ActionGrant' => 'action_permission',
-	'Class:URP_ActionGrant+' => 'permissions on classes',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Profile',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'usage profile',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profile',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'usage profile',
-	'Class:URP_ActionGrant/Attribute:class' => 'Class',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Target class',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Permission',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'allowed or not allowed?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'yes',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'yes',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_ActionGrant/Attribute:action' => 'Action',
-	'Class:URP_ActionGrant/Attribute:action+' => 'operations to perform on the given class',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_StimulusGrant' => 'stimulus_permission',
-	'Class:URP_StimulusGrant+' => 'permissions on stimilus in the life cycle of the object',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profile',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => 'usage profile',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Class',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'Target class',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Permission',
-	'Class:URP_StimulusGrant/Attribute:permission+' => 'allowed or not allowed?',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'yes',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'yes',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'Class:URP_AttributeGrant' => 'attribute_permission',
-	'Class:URP_AttributeGrant+' => 'permissions at the attributes level',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Action grant',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'action grant',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribute',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribute code',
-));
-
-//
-// Expression to Natural language
-//
-Dict::Add('EN US', 'English', 'English', array(
-	'Expression:Unit:Short:DAY' => 'd',
-	'Expression:Unit:Short:WEEK' => 'w',
-	'Expression:Unit:Short:MONTH' => 'm',
-	'Expression:Unit:Short:YEAR' => 'y',
-));
-
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('EN US', 'English', 'English', array(
-	'BooleanLabel:yes' => 'yes',
-	'BooleanLabel:no' => 'no',
-    'UI:Login:Title' => 'iTop login',
-	'Menu:WelcomeMenu' => 'Welcome', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Welcome to iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Welcome', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Welcome to iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => 'Welcome to iTop',
-
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop is a complete, OpenSource, IT Operational Portal.</p>
-<ul>It includes:
-<li>A complete CMDB (Configuration management database) to document and manage the IT inventory.</li>
-<li>An Incident management module to track and communicate about all issues occurring in the IT.</li>
-<li>A change management module to plan and track the changes to the IT environment.</li>
-<li>A known error database to speed up the resolution of incidents.</li>
-<li>An outage module to document all planned outages and notify the appropriate contacts.</li>
-<li>Dashboards to quickly get an overview of your IT.</li>
-</ul>
-<p>All the modules can be setup, step by step, indepently of each other.</p>',
-
-	'UI:WelcomeMenu:RightBlock' => '<p>iTop is service provider oriented, it allows IT engineers to manage easily multiple customers or organizations.
-<ul>iTop, delivers a feature-rich set of business processes that:
-<li>Enhances IT management effectiveness</li> 
-<li>Drives IT operations performance</li> 
-<li>Improves customer satisfaction and provides executives with insights into business performance.</li>
-</ul>
-</p>
-<p>iTop is completely open to be integrated within your current IT Management infrastructure.</p>
-<p>
-<ul>Adopting this new generation of IT Operational portal will help you to:
-<li>Better manage a more and more complex IT environment.</li>
-<li>Implement ITIL processes at your own pace.</li>
-<li>Manage the most important asset of your IT: Documentation.</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => 'Open requests: %1$d',
-	'UI:WelcomeMenu:MyCalls' => 'My requests',
-	'UI:WelcomeMenu:OpenIncidents' => 'Open incidents: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => 'Configuration Items: %1$d',
-	'UI:WelcomeMenu:MyIncidents' => 'Incidents assigned to me',
-	'UI:AllOrganizations' => ' All Organizations ',
-	'UI:YourSearch' => 'Your Search',
-	'UI:LoggedAsMessage' => 'Logged in as %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logged in as %1$s (Administrator)',
-	'UI:Button:Logoff' => 'Log off',
-	'UI:Button:GlobalSearch' => 'Search',
-	'UI:Button:Search' => ' Search ',
-	'UI:Button:Query' => ' Query ',
-	'UI:Button:Ok' => 'Ok',
-	'UI:Button:Save' => 'Save',
-	'UI:Button:Cancel' => 'Cancel',
-	'UI:Button:Close' => 'Close',
-	'UI:Button:Apply' => 'Apply',
-	'UI:Button:Back' => ' << Back ',
-	'UI:Button:Restart' => ' |<< Restart ',
-	'UI:Button:Next' => ' Next >> ',
-	'UI:Button:Finish' => ' Finish ',
-	'UI:Button:DoImport' => ' Run the Import ! ',
-	'UI:Button:Done' => ' Done ',
-	'UI:Button:SimulateImport' => ' Simulate the Import ',
-	'UI:Button:Test' => 'Test!',
-	'UI:Button:Evaluate' => ' Evaluate ',
-	'UI:Button:Evaluate:Title' => ' Evaluate (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' Add... ',
-	'UI:Button:BrowseObjects' => ' Browse... ',
-	'UI:Button:Add' => ' Add ',
-	'UI:Button:AddToList' => ' << Add ',
-	'UI:Button:RemoveFromList' => ' Remove >> ',
-	'UI:Button:FilterList' => ' Filter... ',
-	'UI:Button:Create' => ' Create ',
-	'UI:Button:Delete' => ' Delete ! ',
-	'UI:Button:Rename' => ' Rename... ',
-	'UI:Button:ChangePassword' => ' Change Password ',
-	'UI:Button:ResetPassword' => ' Reset Password ',
-	'UI:Button:Insert' => 'Insert',
-	'UI:Button:More' => 'More',
-	'UI:Button:Less' => 'Less',
-	
-	'UI:SearchToggle' => 'Search',
-	'UI:ClickToCreateNew' => 'Create a new %1$s',
-	'UI:SearchFor_Class' => 'Search for %1$s objects',
-	'UI:NoObjectToDisplay' => 'No object to display.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parameter object_id is mandatory when link_attr is specified. Check the definition of the display template.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parameter target_attr is mandatory when link_attr is specified. Check the definition of the display template.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by is mandatory. Check the definition of the display template.',
-	'UI:Error:InvalidGroupByFields' => 'Invalid list of fields to group by: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'Error: unsupported style of block: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrect link definition: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
-	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d not found.',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'Error: Circular reference in the dependencies between the fields, check the data model.',
-	'UI:Error:UploadedFileTooBig' => 'The uploaded file is too big. (Max allowed size is %1$s). To modify this limit, contact your iTop administrator. (Check the PHP configuration for upload_max_filesize and post_max_size on the server).',
-	'UI:Error:UploadedFileTruncated.' => 'Uploaded file has been truncated !',
-	'UI:Error:NoTmpDir' => 'The temporary directory is not defined.',
-	'UI:Error:CannotWriteToTmp_Dir' => 'Unable to write the temporary file to the disk. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload stopped  by extension. (Original file name = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'File upload failed, unknown cause. (Error code = "%1$s").',
-	
-	'UI:Error:1ParametersMissing' => 'Error: the following parameter must be specified for this operation: %1$s.',
-	'UI:Error:2ParametersMissing' => 'Error: the following parameters must be specified for this operation: %1$s and %2$s.',
-	'UI:Error:3ParametersMissing' => 'Error: the following parameters must be specified for this operation: %1$s, %2$s and %3$s.',
-	'UI:Error:4ParametersMissing' => 'Error: the following parameters must be specified for this operation: %1$s, %2$s, %3$s and %4$s.',
-	'UI:Error:IncorrectOQLQuery_Message' => 'Error: incorrect OQL query: %1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'An error occured while running the query: %1$s',
-	'UI:Error:ObjectAlreadyUpdated' => 'Error: the object has already been updated.',
-	'UI:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated.',
-	'UI:Error:ObjectsAlreadyDeleted' => 'Error: objects have already been deleted!',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'You are not allowed to perform a bulk delete of objects of class %1$s',
-	'UI:Error:DeleteNotAllowedOn_Class' => 'You are not allowed to delete objects of class %1$s',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => 'You are not allowed to perform a bulk update of objects of class %1$s',
-	'UI:Error:ObjectAlreadyCloned' => 'Error: the object has already been cloned!',
-	'UI:Error:ObjectAlreadyCreated' => 'Error: the object has already been created!',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Error: invalid stimulus "%1$s" on object %2$s in state "%3$s".',
-	
-	
-	'UI:GroupBy:Count' => 'Count',
-	'UI:GroupBy:Count+' => 'Number of elements',
-	'UI:CountOfObjects' => '%1$d objects matching the criteria.',
-	'UI_CountOfObjectsShort' => '%1$d objects.',
-	'UI:NoObject_Class_ToDisplay' => 'No %1$s to display',
-	'UI:History:LastModified_On_By' => 'Last modified on %1$s by %2$s.',
-	'UI:HistoryTab' => 'History',
-	'UI:NotificationsTab' => 'Notifications',
-	'UI:History:BulkImports' => 'History',
-	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)',
-	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)',
-	'UI:History:Date' => 'Date',
-	'UI:History:Date+' => 'Date of the change',
-	'UI:History:User' => 'User',
-	'UI:History:User+' => 'User who made the change',
-	'UI:History:Changes' => 'Changes',
-	'UI:History:Changes+' => 'Changes made to the object',
-	'UI:History:StatsCreations' => 'Created',
-	'UI:History:StatsCreations+' => 'Count of objects created',
-	'UI:History:StatsModifs' => 'Modified',
-	'UI:History:StatsModifs+' => 'Count of objects modified',
-	'UI:History:StatsDeletes' => 'Deleted',
-	'UI:History:StatsDeletes+' => 'Count of objects deleted',
-	'UI:Loading' => 'Loading...',
-	'UI:Menu:Actions' => 'Actions',
-	'UI:Menu:OtherActions' => 'Other Actions',
-	'UI:Menu:New' => 'New...',
-	'UI:Menu:Add' => 'Add...',
-	'UI:Menu:Manage' => 'Manage...',
-	'UI:Menu:EMail' => 'eMail',
-	'UI:Menu:CSVExport' => 'CSV Export...',
-	'UI:Menu:Modify' => 'Modify...',
-	'UI:Menu:Delete' => 'Delete...',
-	'UI:Menu:BulkDelete' => 'Delete...',
-	'UI:UndefinedObject' => 'undefined',
-	'UI:Document:OpenInNewWindow:Download' => 'Open in new window: %1$s, Download: %2$s',
-	'UI:SplitDateTime-Date' => 'date',
-	'UI:SplitDateTime-Time' => 'time',
-	'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
-	'UI:DisplayAll' => 'Display All',
-	'UI:CollapseList' => 'Collapse',
-	'UI:CountOfResults' => '%1$d object(s)',
-	'UI:ChangesLogTitle' => 'Changes log (%1$d):',
-	'UI:EmptyChangesLogTitle' => 'Changes log is empty',
-	'UI:SearchFor_Class_Objects' => 'Search for %1$s Objects',
-	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
-	'UI:OQLQueryTab' => 'OQL Query',
-	'UI:SimpleSearchTab' => 'Simple Search',
-	'UI:Details+' => 'Details',
-	'UI:SearchValue:Any' => '* Any *',
-	'UI:SearchValue:Mixed' => '* mixed *',
-	'UI:SearchValue:NbSelected' => '# selected',
-	'UI:SearchValue:CheckAll' => 'Check All',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All',
-	'UI:SelectOne' => '-- select one --',
-	'UI:Login:Welcome' => 'Welcome to iTop!',
-	'UI:Login:IncorrectLoginPassword' => 'Incorrect login/password, please try again.',
-	'UI:Login:IdentifyYourself' => 'Identify yourself before continuing',
-	'UI:Login:UserNamePrompt' => 'User Name',
-	'UI:Login:PasswordPrompt' => 'Password',
-	'UI:Login:ForgotPwd' => 'Forgot your password?',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.',
-	'UI:Login:ResetPassword' => 'Send now!',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s',
-
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.',
-
-	'UI:ResetPwd-Title' => 'Reset password',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.',
-	'UI:ResetPwd-Ready' => 'The password has been changed.',
-	'UI:ResetPwd-Login' => 'Click here to login...',
-
-	'UI:Login:About' => '',
-	'UI:Login:ChangeYourPassword' => 'Change Your Password',
-	'UI:Login:OldPasswordPrompt' => 'Old password',
-	'UI:Login:NewPasswordPrompt' => 'New password',
-	'UI:Login:RetypeNewPasswordPrompt' => 'Retype new password',
-	'UI:Login:IncorrectOldPassword' => 'Error: the old password is incorrect',
-	'UI:LogOffMenu' => 'Log off',
-	'UI:LogOff:ThankYou' => 'Thank you for using iTop',
-	'UI:LogOff:ClickHereToLoginAgain' => 'Click here to login again...',
-	'UI:ChangePwdMenu' => 'Change Password...',
-	'UI:Login:PasswordChanged' => 'Password successfully set!',
-	'UI:AccessRO-All' => 'iTop is read-only',
-	'UI:AccessRO-Users' => 'iTop is read-only for end-users',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch' => 'New password and retyped new password do not match!',
-	'UI:Button:Login' => 'Enter iTop',
-	'UI:Login:Error:AccessRestricted' => 'iTop access is restricted. Please, contact an iTop administrator.',
-	'UI:Login:Error:AccessAdmin' => 'Access restricted to people having administrator privileges. Please, contact an iTop administrator.',
-	'UI:CSVImport:MappingSelectOne' => '-- select one --',
-	'UI:CSVImport:MappingNotApplicable' => '-- ignore this field --',
-	'UI:CSVImport:NoData' => 'Empty data set..., please provide some data!',
-	'UI:Title:DataPreview' => 'Data Preview',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: The data contains only one column. Did you select the appropriate separator character?',
-	'UI:CSVImport:FieldName' => 'Field %1$d',
-	'UI:CSVImport:DataLine1' => 'Data Line 1',
-	'UI:CSVImport:DataLine2' => 'Data Line 2',
-	'UI:CSVImport:idField' => 'id (Primary Key)',
-	'UI:Title:BulkImport' => 'iTop - Bulk import',
-	'UI:Title:BulkImport+' => 'CSV Import Wizard',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s',
-	'UI:CSVImport:ClassesSelectOne' => '-- select one --',
-	'UI:CSVImport:ErrorExtendedAttCode' => 'Internal error: "%1$s" is an incorrect code because "%2$s" is NOT an external key of the class "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objects(s) will stay unchanged.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objects(s) will be modified.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objects(s) will be added.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objects(s) will have errors.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objects(s) remained unchanged.',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d objects(s) were modified.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d objects(s) were added.',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$d objects(s) had errors.',
-	'UI:Title:CSVImportStep2' => 'Step 2 of 5: CSV data options',
-	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Data mapping',
-	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Import simulation',
-	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Import completed',
-	'UI:CSVImport:LinesNotImported' => 'Lines that could not be loaded:',
-	'UI:CSVImport:LinesNotImported+' => 'The following lines have not been imported because they contain errors',
-	'UI:CSVImport:SeparatorComma+' => ', (comma)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (semicolon)',
-	'UI:CSVImport:SeparatorTab+' => 'tab',
-	'UI:CSVImport:SeparatorOther' => 'other:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (double quote)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (simple quote)',
-	'UI:CSVImport:QualifierOther' => 'other:',
-	'UI:CSVImport:TreatFirstLineAsHeader' => 'Treat the first line as a header (column names)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Skip %1$s line(s) at the beginning of the file',
-	'UI:CSVImport:CSVDataPreview' => 'CSV Data Preview',
-	'UI:CSVImport:SelectFile' => 'Select the file to import:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'Load from a file',
-	'UI:CSVImport:Tab:CopyPaste' => 'Copy and paste data',
-	'UI:CSVImport:Tab:Templates' => 'Templates',
-	'UI:CSVImport:PasteData' => 'Paste the data to import:',
-	'UI:CSVImport:PickClassForTemplate' => 'Pick the template to download: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Separator character:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Text qualifier character',
-	'UI:CSVImport:CommentsAndHeader' => 'Comments and header',
-	'UI:CSVImport:SelectClass' => 'Select the class to import:',
-	'UI:CSVImport:AdvancedMode' => 'Advanced mode',
-	'UI:CSVImport:AdvancedMode+' => 'In advanced mode the "id" (primary key) of the objects can be used to update and rename objects.' .
-									'However the column "id" (if present) can only be used as a search criteria and can not be combined with any other search criteria.',
-	'UI:CSVImport:SelectAClassFirst' => 'To configure the mapping, select a class first.',
-	'UI:CSVImport:HeaderFields' => 'Fields',
-	'UI:CSVImport:HeaderMappings' => 'Mappings',
-	'UI:CSVImport:HeaderSearch' => 'Search?',
-	'UI:CSVImport:AlertIncompleteMapping' => 'Please select a mapping for every field.',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.',
-	'UI:CSVImport:AlertNoSearchCriteria' => 'Please select at least one search criteria',
-	'UI:CSVImport:Encoding' => 'Character encoding',	
-	'UI:UniversalSearchTitle' => 'iTop - Universal Search',
-	'UI:UniversalSearch:Error' => 'Error: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => 'Select the class to search: ',
-
-	'UI:CSVReport-Value-Modified' => 'Modified',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s',
-	'UI:CSVReport-Value-NoMatch' => 'No match',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged',
-	'UI:CSVReport-Row-Created' => 'created',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s',
-
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged',
-	'UI:CSVReport-Icon-Modified' => 'Modified',
-	'UI:CSVReport-Icon-Missing' => 'Missing',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated',
-	'UI:CSVReport-Icon-Created' => 'Created',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created',
-	'UI:CSVReport-Object-Created' => 'Object created',
-	'UI:CSVReport-Icon-Error' => 'Error',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.',
-
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.',
-	'UI:CSVExport:LostChars' => 'Encoding issue',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').',
-
-	'UI:Audit:Title' => 'iTop - CMDB Audit',
-	'UI:Audit:InteractiveAudit' => 'Interactive Audit',
-	'UI:Audit:HeaderAuditRule' => 'Audit Rule',
-	'UI:Audit:HeaderNbObjects' => '# Objects',
-	'UI:Audit:HeaderNbErrors' => '# Errors',
-	'UI:Audit:PercentageOk' => '% Ok',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.',
-
-	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluation',
-	'UI:RunQuery:QueryExamples' => 'Query Examples',
-	'UI:RunQuery:HeaderPurpose' => 'Purpose',
-	'UI:RunQuery:HeaderPurpose+' => 'Explanation about the query',
-	'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression',
-	'UI:RunQuery:HeaderOQLExpression+' => 'The query in OQL syntax',
-	'UI:RunQuery:ExpressionToEvaluate' => 'Expression to evaluate: ',
-	'UI:RunQuery:MoreInfo' => 'More information about the query: ',
-	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
-	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
-	'UI:RunQuery:Error' => 'An error occured while running the query: %1$s',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested here below points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. <br/>Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.',
-	'UI:Schema:Title' => 'iTop objects schema',
-	'UI:Schema:CategoryMenuItem' => 'Category <b>%1$s</b>',
-	'UI:Schema:Relationships' => 'Relationships',
-	'UI:Schema:AbstractClass' => 'Abstract class: no object from this class can be instantiated.',
-	'UI:Schema:NonAbstractClass' => 'Non abstract class: objects from this class can be instantiated.',
-	'UI:Schema:ClassHierarchyTitle' => 'Class hierarchy',
-	'UI:Schema:AllClasses' => 'All classes',
-	'UI:Schema:ExternalKey_To' => 'External key to %1$s',
-	'UI:Schema:Columns_Description' => 'Columns: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'Default: "%1$s"',
-	'UI:Schema:NullAllowed' => 'Null Allowed',
-	'UI:Schema:NullNotAllowed' => 'Null NOT Allowed',
-	'UI:Schema:Attributes' => 'Attributes',
-	'UI:Schema:AttributeCode' => 'Attribute Code',
-	'UI:Schema:AttributeCode+' => 'Internal code of the attribute',
-	'UI:Schema:Label' => 'Label',
-	'UI:Schema:Label+' => 'Label of the attribute',
-	'UI:Schema:Type' => 'Type',
-	
-	'UI:Schema:Type+' => 'Data type of the attribute',
-	'UI:Schema:Origin' => 'Origin',
-	'UI:Schema:Origin+' => 'The base class in which this attribute is defined',
-	'UI:Schema:Description' => 'Description',
-	'UI:Schema:Description+' => 'Description of the attribute',
-	'UI:Schema:AllowedValues' => 'Allowed values',
-	'UI:Schema:AllowedValues+' => 'Restrictions on the possible values for this attribute',
-	'UI:Schema:MoreInfo' => 'More info',
-	'UI:Schema:MoreInfo+' => 'More information about the field defined in the database',
-	'UI:Schema:SearchCriteria' => 'Search criteria',
-	'UI:Schema:FilterCode' => 'Filter code',
-	'UI:Schema:FilterCode+' => 'Code of this search criteria',
-	'UI:Schema:FilterDescription' => 'Description',
-	'UI:Schema:FilterDescription+' => 'Description of this search criteria',
-	'UI:Schema:AvailOperators' => 'Available operators',
-	'UI:Schema:AvailOperators+' => 'Possible operators for this search criteria',
-	'UI:Schema:ChildClasses' => 'Child classes',
-	'UI:Schema:ReferencingClasses' => 'Referencing classes',
-	'UI:Schema:RelatedClasses' => 'Related classes',
-	'UI:Schema:LifeCycle' => 'Life cycle',
-	'UI:Schema:Triggers' => 'Triggers',
-	'UI:Schema:Relation_Code_Description' => 'Relation <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: propagate to %2$d levels, query: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: does not propagates (%2$d levels), query: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s is referenced by the class %2$s via the field %3$s',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s is linked to %2$s via %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n' => 'Classes pointing to %1$s (1:n links):',
-	'UI:Schema:Links:n-n' => 'Classes linked to %1$s (n:n links):',
-	'UI:Schema:Links:All' => 'Graph of all related classes',
-	'UI:Schema:NoLifeCyle' => 'There is no life cycle defined for this class.',
-	'UI:Schema:LifeCycleTransitions' => 'States and Transitions',
-	'UI:Schema:LifeCyleAttributeOptions' => 'Attribute options',
-	'UI:Schema:LifeCycleHiddenAttribute' => 'Hidden',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Read-only',
-	'UI:Schema:LifeCycleMandatoryAttribute' => 'Mandatory',
-	'UI:Schema:LifeCycleAttributeMustChange' => 'Must change',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => 'User will be prompted to change the value',
-	'UI:Schema:LifeCycleEmptyList' => 'empty list',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => 'Type the first 3 characters...',
-	'UI:Edit:TestQuery' => 'Test query',
-	'UI:Combo:SelectValue' => '--- select a value ---',
-	'UI:Label:SelectedObjects' => 'Selected objects: ',
-	'UI:Label:AvailableObjects' => 'Available objects: ',
-	'UI:Link_Class_Attributes' => '%1$s attributes',
-	'UI:SelectAllToggle+' => 'Select All / Deselect All',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Add %1$s objects linked with %2$s: %3$s',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Add %1$s objects to link with the %2$s',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Manage %1$s objects linked with %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Add %1$ss...',
-	'UI:RemoveLinkedObjectsOf_Class' => 'Remove selected objects',
-	'UI:Message:EmptyList:UseAdd' => 'The list is empty, use the "Add..." button to add elements.',
-	'UI:Message:EmptyList:UseSearchForm' => 'Use the search form above to search for objects to be added.',
-	'UI:Wizard:FinalStepTitle' => 'Final step: confirmation',
-	'UI:Title:DeletionOf_Object' => 'Deletion of %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Bulk deletion of %1$d objects of class %2$s',
-	'UI:Delete:NotAllowedToDelete' => 'You are not allowed to delete this object',
-	'UI:Delete:NotAllowedToUpdate_Fields' => 'You are not allowed to update the following field(s): %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'This object could not be deleted because the current user do not have sufficient rights',
-	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'This object could not be deleted because some manual operations must be performed prior to that',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
-	'UI:Delete:Deleted' => 'deleted',
-	'UI:Delete:AutomaticallyDeleted' => 'automatically deleted',
-	'UI:Delete:AutomaticResetOf_Fields' => 'automatic reset of field(s): %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => 'Cleaning up all references to %1$s...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Cleaning up all references to %1$d objects of class %2$s...',
-	'UI:Delete:Done+' => 'What was done...',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s deleted.',
-	'UI:Delete:ConfirmDeletionOf_Name' => 'Deletion of %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Deletion of %1$d objects of class %2$s',
-	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s',
-	'UI:Delete:WillBeDeletedAutomatically' => 'Will be automaticaly deleted',
-	'UI:Delete:MustBeDeletedManually' => 'Must be deleted manually',
-	'UI:Delete:CannotUpdateBecause_Issue' => 'Should be automatically updated, but: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'will be automaticaly updated (reset: %1$s)',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objects/links are referencing %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objects/links are referencing some of the objects to be deleted',	
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'To ensure Database integrity, any reference should be further eliminated',
-	'UI:Delete:Consequence+' => 'What will be done',
-	'UI:Delete:SorryDeletionNotAllowed' => 'Sorry, you are not allowed to delete this object, see the detailed explanations above',
-	'UI:Delete:PleaseDoTheManualOperations' => 'Please perform the manual operations listed above prior to requesting the deletion of this object',
-	'UI:Delect:Confirm_Object' => 'Please confirm that you want to delete %1$s.',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Please confirm that you want to delete the following %1$d objects of class %2$s.',
-	'UI:WelcomeToITop' => 'Welcome to iTop',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s details',
-	'UI:ErrorPageTitle' => 'iTop - Error',
-	'UI:ObjectDoesNotExist' => 'Sorry, this object does not exist (or you are not allowed to view it).',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.',
-	'Tag:Archived' => 'Archived',
-	'Tag:Archived+' => 'Can be accessed only in archive mode',
-	'Tag:Obsolete' => 'Obsolete',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results',
-	'Tag:Synchronized' => 'Synchronized',
-	'ObjectRef:Archived' => 'Archived',
-	'ObjectRef:Obsolete' => 'Obsolete',
-	'UI:SearchResultsPageTitle' => 'iTop - Search Results',
-	'UI:SearchResultsTitle' => 'Search Results',
-	'UI:SearchResultsTitle+' => 'Full-text search results',
-	'UI:Search:NoSearch' => 'Nothing to search for',
-	'UI:Search:NeedleTooShort' => 'The search string "%1$s" is too short. Please type at least %2$d characters.',
-	'UI:Search:Ongoing' => 'Searching for "%1$s"',
-	'UI:Search:Enlarge' => 'Broaden the search',
-	'UI:FullTextSearchTitle_Text' => 'Results for "%1$s":',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d object(s) of class %2$s found.',
-	'UI:Search:NoObjectFound' => 'No object found.',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modification',
-	'UI:ModificationTitle_Class_Object' => 'Modification of %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s modification',
-	'UI:CloneTitle_Class_Object' => 'Clone of %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'iTop - Creation of a new %1$s ',
-	'UI:CreationTitle_Class' => 'Creation of a new %1$s',
-	'UI:SelectTheTypeOf_Class_ToCreate' => 'Select the type of %1$s to create:',
-	'UI:Class_Object_NotUpdated' => 'No change detected, %1$s (%2$s) has <strong>not</strong> been modified.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) updated.',
-	'UI:BulkDeletePageTitle' => 'iTop - Bulk Delete',
-	'UI:BulkDeleteTitle' => 'Select the objects you want to delete:',
-	'UI:PageTitle:ObjectCreated' => 'iTop Object Created.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s created.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Applying %1$s on object: %2$s in state %3$s to target state: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => 'The object could not be written: %1$s',
-	'UI:PageTitle:FatalError' => 'iTop - Fatal Error',
-	'UI:SystemIntrusion' => 'Access denied. You have requested an operation that is not allowed for you.',
-	'UI:FatalErrorMessage' => 'Fatal error, iTop cannot continue.',
-	'UI:Error_Details' => 'Error: %1$s.',
-
-	'UI:PageTitle:ClassProjections'	=> 'iTop user management - class projections',
-	'UI:PageTitle:ProfileProjections' => 'iTop user management - profile projections',
-	'UI:UserManagement:Class' => 'Class',
-	'UI:UserManagement:Class+' => 'Class of objects',
-	'UI:UserManagement:ProjectedObject' => 'Object',
-	'UI:UserManagement:ProjectedObject+' => 'Projected object',
-	'UI:UserManagement:AnyObject' => '* any *',
-	'UI:UserManagement:User' => 'User',
-	'UI:UserManagement:User+' => 'User involved in the projection',
-	'UI:UserManagement:Profile' => 'Profile',
-	'UI:UserManagement:Profile+' => 'Profile in which the projection is specified',
-	'UI:UserManagement:Action:Read' => 'Read',
-	'UI:UserManagement:Action:Read+' => 'Read/display objects',
-	'UI:UserManagement:Action:Modify' => 'Modify',
-	'UI:UserManagement:Action:Modify+' => 'Create and edit (modify) objects',
-	'UI:UserManagement:Action:Delete' => 'Delete',
-	'UI:UserManagement:Action:Delete+' => 'Delete objects',
-	'UI:UserManagement:Action:BulkRead' => 'Bulk Read (Export)',
-	'UI:UserManagement:Action:BulkRead+' => 'List objects or export massively',
-	'UI:UserManagement:Action:BulkModify' => 'Bulk Modify',
-	'UI:UserManagement:Action:BulkModify+' => 'Massively create/edit (CSV import)',
-	'UI:UserManagement:Action:BulkDelete' => 'Bulk Delete',
-	'UI:UserManagement:Action:BulkDelete+' => 'Massively delete objects',
-	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
-	'UI:UserManagement:Action:Stimuli+' => 'Allowed (compound) actions',
-	'UI:UserManagement:Action' => 'Action',
-	'UI:UserManagement:Action+' => 'Action performed by the user',
-	'UI:UserManagement:TitleActions' => 'Actions',
-	'UI:UserManagement:Permission' => 'Permission',
-	'UI:UserManagement:Permission+' => 'User\'s permissions',
-	'UI:UserManagement:Attributes' => 'Attributes',
-	'UI:UserManagement:ActionAllowed:Yes' => 'Yes',
-	'UI:UserManagement:ActionAllowed:No' => 'No',
-	'UI:UserManagement:AdminProfile+' => 'Administrators have full read/write access to all objects in the database.',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => 'No lifecycle has been defined for this class',
-	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link between %1$s and %2$s',
-	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link between %1$s and %2$s',
-	
-	'Menu:AdminTools' => 'Admin tools', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:ChangeManagementMenu' => 'Change Management',
-	'UI:ChangeManagementMenu+' => 'Change Management',
-	'UI:ChangeManagementMenu:Title' => 'Changes Overview',
-	'UI-ChangeManagementMenu-ChangesByType' => 'Changes by type',
-	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes by status',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changes by workgroup',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changes not yet assigned',
-
-	'UI:ConfigurationManagementMenu' => 'Configuration Management',
-	'UI:ConfigurationManagementMenu+' => 'Configuration Management',
-	'UI:ConfigurationManagementMenu:Title' => 'Infrastructure Overview',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
-
-'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items by status',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items by type',
-
-'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Request Management',
-'UI-RequestManagementOverview-RequestByService' => 'User Requests by service',
-'UI-RequestManagementOverview-RequestByPriority' => 'User Requests by priority',
-'UI-RequestManagementOverview-RequestUnassigned' => 'User Requests not yet assigned to an agent',
-
-'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
-'UI-IncidentManagementOverview-IncidentByService' => 'Incidents by service',
-'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents by priority',
-'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents not yet assigned to an agent',
-
-'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management',
-'UI-ChangeManagementOverview-ChangeByType' => 'Changes by type',
-'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes not yet assigned to an agent',
-'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages due to changes',
-
-'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Customer contracts to be renewed in 30 days',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider contracts to be renewed in 30 days',
-
-	'UI:ContactsMenu' => 'Contacts',
-	'UI:ContactsMenu+' => 'Contacts',
-	'UI:ContactsMenu:Title' => 'Contacts Overview',
-	'UI-ContactsMenu-ContactsByLocation' => 'Contacts by location',
-	'UI-ContactsMenu-ContactsByType' => 'Contacts by type',
-	'UI-ContactsMenu-ContactsByStatus' => 'Contacts by status',
-
-	'Menu:CSVImportMenu' => 'CSV import', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Bulk creation or update', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:DataModelMenu' => 'Data Model', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Overview of the Data Model', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:ExportMenu' => 'Export', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:NotificationsMenu' => 'Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuration of the Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:NotificationsMenu:Title' => 'Configuration of the <span class="hilite">Notifications</span>',
-	'UI:NotificationsMenu:Help' => 'Help',
-	'UI:NotificationsMenu:HelpContent' => '<p>In iTop the notifications are fully customizable. They are based on two sets of objects: <i>triggers and actions</i>.</p>
-<p><i><b>Triggers</b></i> define when a notification will be executed. There are 5 types of triggers for covering 3 differents phases of an object life cycle:
-<ol>
-	<li>the "on object creation" triggers get executed when an object of the specified class is created</li>
-	<li>the "on entering a state" triggers get executed before an object of the given class enters a specified state (coming from another state)</li>
-	<li>the "on leaving a state" triggers get executed when an object of the given class is leaving a specified state</li>
-	<li>the "on threshold" triggers get executed when a threshold for TTR or TTO has been reached</li>
-	<li>the "on portal update" triggers get executed when a ticket is updated from the portal</li>
-</ol>
-</p>
-<p>
-<i><b>Actions</b></i> define the actions to be performed when the triggers execute. For now there is only one kind of action consisting in sending an email message.
-Such actions also define the template to be used for sending the email as well as the other parameters of the message like the recipients, importance, etc.
-</p>
-<p>A special page: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is available for testing and troubleshooting your PHP mail configuration.</p>
-<p>To be executed, actions must be associated to triggers.
-When associated with a trigger, each action is given an "order" number, specifying in which order the actions are to be executed.</p>',
-	'UI:NotificationsMenu:Triggers' => 'Triggers',
-	'UI:NotificationsMenu:AvailableTriggers' => 'Available triggers',
-	'UI:NotificationsMenu:OnCreate' => 'When an object is created',
-	'UI:NotificationsMenu:OnStateEnter' => 'When an object enters a given state',
-	'UI:NotificationsMenu:OnStateLeave' => 'When an object leaves a given state',
-	'UI:NotificationsMenu:Actions' => 'Actions',
-	'UI:NotificationsMenu:AvailableActions' => 'Available actions',
-	
-	'Menu:AuditCategories' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:RunQueriesMenu' => 'Run Queries', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Run any query', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:QueryMenu' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:DataAdministration' => 'Data administration', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Data administration', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:UniversalSearchMenu' => 'Universal Search', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Search for anything...', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:UserManagementMenu' => 'User Management', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'User management', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)	
-
-	'UI:iTopVersion:Short' => '%1$s version %2$s',
-	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
-	'UI:PropertiesTab' => 'Properties',
-
-	'UI:OpenDocumentInNewWindow_' => 'Open this document in a new window: %1$s',
-	'UI:DownloadDocument_' => 'Download this document: %1$s',
-	'UI:Document:NoPreview' => 'No preview is available for this type of document',
-	'UI:Download-CSV' => 'Download %1$s',
-
-	'UI:DeadlineMissedBy_duration' => 'Missed  by %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',		
-	'UI:Deadline_Minutes' => '%1$d min',			
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
-	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
-	'UI:Help' => 'Help',
-	'UI:PasswordConfirm' => '(Confirm)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Before adding more %1$s objects, save this object.',
-	'UI:DisplayThisMessageAtStartup' => 'Display this message at startup',
-	'UI:RelationshipGraph' => 'Graphical view',
-	'UI:RelationshipList' => 'List',
-	'UI:RelationGroups' => 'Groups',
-	'UI:OperationCancelled' => 'Operation Cancelled',
-	'UI:ElementsDisplayed' => 'Filtering',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info',
-	'UI:Relation:NoneSelected' => 'None',
-	'UI:Relation:Zoom' => 'Zoom',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...',
-	'UI:Relation:DrillDown' => 'Details...',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s',
-	'UI:RelationOption:Untitled' => 'Untitled',
-	'UI:Relation:Key' => 'Key',
-	'UI:Relation:Comments' => 'Comments',
-	'UI:RelationOption:Title' => 'Title',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects',
-	'UI:RelationOption:Comments' => 'Comments',
-	'UI:Button:Export' => 'Export',
-	'UI:Relation:PDFExportPageFormat' => 'Page format',
-	'UI:PageFormat_A3' => 'A3',
-	'UI:PageFormat_A4' => 'A4',
-	'UI:PageFormat_Letter' => 'Letter',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation',
-	'UI:PageOrientation_Portrait' => 'Portrait',
-	'UI:PageOrientation_Landscape' => 'Landscape',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d',
-	'Portal:Title' => 'iTop user portal',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.',
-	'Portal:Refresh' => 'Refresh',
-	'Portal:Back' => 'Back',
-	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
-	'Portal:TitleDetailsFor_Request' => 'Details for request',
-	'Portal:ShowOngoing' => 'Show open requests',
-	'Portal:ShowClosed' => 'Show closed requests',
-	'Portal:CreateNewRequest' => 'Create a new request',
-	'Portal:CreateNewRequestItil' => 'Create a new request',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report',
-	'Portal:ChangeMyPassword' => 'Change my password',
-	'Portal:Disconnect' => 'Disconnect',
-	'Portal:OpenRequests' => 'My open requests',
-	'Portal:ClosedRequests'  => 'My closed requests',
-	'Portal:ResolvedRequests'  => 'My resolved requests',
-	'Portal:SelectService' => 'Select a service from the catalog:',
-	'Portal:PleaseSelectOneService' => 'Please select one service',
-	'Portal:SelectSubcategoryFrom_Service' => 'Select a sub-category for the service %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Please select one sub-category',
-	'Portal:DescriptionOfTheRequest' => 'Enter the description of your request:',
-	'Portal:TitleRequestDetailsFor_Request' => 'Details for request %1$s:',
-	'Portal:NoOpenRequest' => 'No request in this category',
-	'Portal:NoClosedRequest' => 'No request in this category',
-	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
-	'Portal:Button:CloseTicket' => 'Close this ticket',
-	'Portal:Button:UpdateRequest' => 'Update the request',
-	'Portal:EnterYourCommentsOnTicket' => 'Enter your comments about the resolution of this ticket:',
-	'Portal:ErrorNoContactForThisUser' => 'Error: the current user is not associated with a Contact/Person. Please contact your administrator.',
-	'Portal:Attachments' => 'Attachments',
-	'Portal:AddAttachment' => ' Add Attachment ',
-	'Portal:RemoveAttachment' => ' Remove Attachment ',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s',
-	'Enum:Undefined' => 'Undefined',	
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s d %2$s h %3$s min %4$s s',
-	'UI:ModifyAllPageTitle' => 'Modify All',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d',
-	'UI:Menu:ModifyAll' => 'Modify...',
-	'UI:Button:ModifyAll' => 'Modify All',
-	'UI:Button:PreviewModifications' => 'Preview Modifications >>',
-	'UI:ModifiedObject' => 'Object Modified',
-	'UI:BulkModifyStatus' => 'Operation',
-	'UI:BulkModifyStatus+' => 'Status of the operation',
-	'UI:BulkModifyErrors' => 'Errors (if any)',
-	'UI:BulkModifyErrors+' => 'Errors preventing the modification',	
-	'UI:BulkModifyStatusOk' => 'Ok',
-	'UI:BulkModifyStatusError' => 'Error',
-	'UI:BulkModifyStatusModified' => 'Modified',
-	'UI:BulkModifyStatusSkipped' => 'Skipped',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)',
-	'UI:BulkModify:N_MoreValues' => '%1$d more values...',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s',
-	'UI:FailedToApplyStimuli' => 'The action has failed.',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s',
-	'UI:CaseLogTypeYourTextHere' => 'Type your text here...',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
-	'UI:CaseLog:InitialValue' => 'Initial value:',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.',
-	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.',
-	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.',
-	'UI:Pagination:PageSize' => '%1$s objects per page',
-	'UI:Pagination:PagesLabel' => 'Pages:',
-	'UI:Pagination:All' => 'All',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s',
-	'UI:Preferences' => 'Preferences...',
-	'UI:ArchiveModeOn' => 'Activate archive mode',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode',
-	'UI:ArchiveMode:Banner' => 'Archive mode',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. '.
-								   'Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting "All Organizations" in the drop-down list.',
-	'UI:FavoriteLanguage' => 'Language of the User Interface',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language',
-	'UI:FavoriteOtherSettings' => 'Other Settings',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...',
-	'UI:Button:Refresh' => 'Refresh',
-	'UI:Button:GoPrint' => 'Print...',
-	'UI:ExplainPrintable' => 'Click onto the %1$s icon to hide items from the print.<br/>Use the "print preview" feature of your browser to preview before printing.<br/>Note: this header and the other tuning controls will not be printed.',
-
-	'UI:ConfigureThisList' => 'Configure This List...',
-	'UI:ListConfigurationTitle' => 'List Configuration',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:',
-	'UI:UseDefaultSettings' => 'Use the Default Settings',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page',
-	'UI:UseSavetheSettings' => 'Save the Settings',
-	'UI:OnlyForThisList' => 'Only for this list',
-	'UI:ForAllLists' => 'Default for all lists',
-	'UI:ExtKey_AsLink' => '%1$s (Link)',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
-	'UI:Button:MoveUp' => 'Move Up',
-	'UI:Button:MoveDown' => 'Move Down',
-
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class "%1$s". You may try "%2$s" instead.',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class "%1$s"',
-
-	'UI:Dashboard:Edit' => 'Edit This Page...',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.',
-	'UI:ExportDashBoard' => 'Export to a file',
-	'UI:ImportDashBoard' => 'Import from a file...',
-	'UI:ImportDashboardTitle' => 'Import From a File',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:',
-
-
-	'UI:DashletCreation:Title' => 'Create a new Dashlet',
-	'UI:DashletCreation:Dashboard' => 'Dashboard',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard',
-
-	'UI:DashboardEdit:Title' => 'Dashboard Editor',
-	'UI:DashboardEdit:DashboardTitle' => 'Title',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds',
-
-	'UI:DashboardEdit:Layout' => 'Layout',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets',	
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties',	
-
-	'UI:Form:Property' => 'Property',
-	'UI:Form:Value' => 'Value',
-
-	'UI:DashletUnknown:Label' => 'Unknown',
-	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)',
-	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.',
-	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.',
-	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").',
-	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)',
-
-	'UI:DashletProxy:Label' => 'Proxy',
-	'UI:DashletProxy:Description' => 'Proxy dashlet',
-	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").',
-	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)',
-
-	'UI:DashletPlainText:Label' => 'Text',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)',
-	'UI:DashletPlainText:Prop-Text' => 'Text',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...',
-
-	'UI:DashletObjectList:Label' => 'Object list',
-	'UI:DashletObjectList:Description' => 'Object list dashlet',
-	'UI:DashletObjectList:Prop-Title' => 'Title',
-	'UI:DashletObjectList:Prop-Query' => 'Query',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
-	'UI:DashletGroupBy:Prop-Title' => 'Title',
-	'UI:DashletGroupBy:Prop-Query' => 'Query',
-	'UI:DashletGroupBy:Prop-Style' => 'Style',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together',
-
-	'UI:DashletGroupByPie:Label' => 'Pie Chart',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)',
-
-	// New in 2.5
-	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function',
-	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute',
-	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction',
-	'UI:DashletGroupBy:Prop-OrderField' => 'Order by',
-	'UI:DashletGroupBy:Prop-Limit' => 'Limit',
-
-	'UI:DashletGroupBy:Order:asc' => 'Ascending',
-	'UI:DashletGroupBy:Order:desc' => 'Descending',
-
-	'UI:GroupBy:count' => 'Count',
-	'UI:GroupBy:count+' => 'Number of elements',
-	'UI:GroupBy:sum' => 'Sum',
-	'UI:GroupBy:sum+' => 'Sum of %1$s',
-	'UI:GroupBy:avg' => 'Average',
-	'UI:GroupBy:avg+' => 'Average of %1$s',
-	'UI:GroupBy:min' => 'Minimum',
-	'UI:GroupBy:min+' => 'Minimum of %1$s',
-	'UI:GroupBy:max' => 'Maximum',
-	'UI:GroupBy:max+' => 'Maximum of %1$s',
-	// ---
-
-	'UI:DashletHeaderStatic:Label' => 'Header',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon',
-
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values',
-
-	'UI:DashletBadge:Label' => 'Badge',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search',
-	'UI:DashletBadge:Prop-Class' => 'Class',
-
-	'DayOfWeek-Sunday' => 'Sunday',
-	'DayOfWeek-Monday' => 'Monday',
-	'DayOfWeek-Tuesday' => 'Tuesday',
-	'DayOfWeek-Wednesday' => 'Wednesday',
-	'DayOfWeek-Thursday' => 'Thursday',
-	'DayOfWeek-Friday' => 'Friday',
-	'DayOfWeek-Saturday' => 'Saturday',
-	'Month-01' => 'January',
-	'Month-02' => 'February',
-	'Month-03' => 'March',
-	'Month-04' => 'April',
-	'Month-05' => 'May',
-	'Month-06' => 'June',
-	'Month-07' => 'July',
-	'Month-08' => 'August',
-	'Month-09' => 'September',
-	'Month-10' => 'October',
-	'Month-11' => 'November',
-	'Month-12' => 'December',
-	
-	// Short version for the DatePicker
-	'DayOfWeek-Sunday-Min' => 'Su',
-	'DayOfWeek-Monday-Min' => 'Mo',
-	'DayOfWeek-Tuesday-Min' => 'Tu',
-	'DayOfWeek-Wednesday-Min' => 'We',
-	'DayOfWeek-Thursday-Min' => 'Th',
-	'DayOfWeek-Friday-Min' => 'Fr',
-	'DayOfWeek-Saturday-Min' => 'Sa',
-	'Month-01-Short' => 'Jan',
-	'Month-02-Short' => 'Feb',
-	'Month-03-Short' => 'Mar',
-	'Month-04-Short' => 'Apr',
-	'Month-05-Short' => 'May',
-	'Month-06-Short' => 'Jun',
-	'Month-07-Short' => 'Jul',
-	'Month-08-Short' => 'Aug',
-	'Month-09-Short' => 'Sep',
-	'Month-10-Short' => 'Oct',
-	'Month-11-Short' => 'Nov',
-	'Month-12-Short' => 'Dec',
-	'Calendar-FirstDayOfWeek' => 0, // 0 = Sunday, 1 = Monday, etc...
-	
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).',
-	'Menu:MyShortcuts' => 'My Shortcuts', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Class:Shortcut' => 'Shortcut',
-	'Class:Shortcut+' => '',
-	'Class:Shortcut/Attribute:name' => 'Name',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title',
-	'Class:ShortcutOQL' => 'Search result shortcut',
-	'Class:ShortcutOQL+' => '',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds',
-
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.',
-	'UI:ValueMustBeSet' => 'Please specify a value',
-	'UI:ValueMustBeChanged' => 'Please change the value',
-	'UI:ValueInvalidFormat' => 'Invalid format',
-
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?',
-	'UI:CSVImportError_items' => 'Errors: %1$d',
-	'UI:CSVImportCreated_items' => 'Created: %1$d',
-	'UI:CSVImportModified_items' => 'Modified: %1$d',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d',
-	'UI:CSVImport:DateAndTimeFormats' => 'Date and time format',
-	'UI:CSVImport:DefaultDateTimeFormat_Format_Example' => 'Default format: %1$s (e.g. %2$s)',
-	'UI:CSVImport:CustomDateTimeFormat' => 'Custom format: %1$s',
-	'UI:CSVImport:CustomDateTimeFormatTooltip' => 'Available placeholders:<table>
-<tr><td>Y</td><td>year (4 digits, e.g. 2016)</td></tr>
-<tr><td>y</td><td>year (2 digits, e.g. 16 for 2016)</td></tr>
-<tr><td>m</td><td>month (2 digits, e.g. 01..12)</td></tr>
-<tr><td>n</td><td>month (1 or 2 digits no leading zero, e.g. 1..12)</td></tr>
-<tr><td>d</td><td>day (2 digits, e.g. 01..31)</td></tr>
-<tr><td>j</td><td>day (1 or 2 digits no leading zero, e.g. 1..31)</td></tr>
-<tr><td>H</td><td>hour (24 hour, 2 digits, e.g. 00..23)</td></tr>
-<tr><td>h</td><td>hour (12 hour, 2 digits, e.g. 01..12)</td></tr>
-<tr><td>G</td><td>hour (24 hour, 1 or 2 digits no leading zero, e.g. 0..23)</td></tr>
-<tr><td>g</td><td>hour (12 hour, 1 or 2 digits no leading zero, e.g. 1..12)</td></tr>
-<tr><td>a</td><td>hour, am or pm (lowercase)</td></tr>
-<tr><td>A</td><td>hour, AM or PM (uppercase)</td></tr>
-<tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
-<tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
-</table>',
-		
-	'UI:Button:Remove' => 'Remove',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s',
-
-	'UI:AboutBox' => 'About iTop...',
-	'UI:About:Title' => 'About iTop',
-	'UI:About:DataModel' => 'Data model',
-	'UI:About:Support' => 'Support information',
-	'UI:About:Licenses' => 'Licenses',
-	'UI:About:InstallationOptions' => 'Installation options',
-	'UI:About:ManualExtensionSource' => 'Extension',
-	'UI:About:Extension_Version' => 'Version: %1$s',
-	'UI:About:RemoteExtensionSource' => 'Data',	
-	
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.',
-	'UI:DisconnectedDlgTitle' => 'Warning!',
-	'UI:LoginAgain' => 'Login again',
-	'UI:StayOnThePage' => 'Stay on this page',
-	
-	'ExcelExporter:ExportMenu' => 'Excel Export...',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export',
-	'ExcelExporter:ExportButton' => 'Export',
-	'ExcelExporter:DownloadButton' => 'Download %1$s',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...',
-	'ExcelExporter:Done' => 'Done.',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready',
-	'ExcelExport:PreparingExport' => 'Preparing the export...',
-	'ExcelExport:Statistics' => 'Statistics',
-	'portal:legacy_portal' => 'End-User Portal',
-	'portal:backoffice' => 'iTop Back-Office User Interface',
-
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !',
-	
-	'UI:Menu:ExportPDF' => 'Export as PDF...',
-	'UI:Menu:PrintableVersion' => 'Printer friendly version',
-	
-	'UI:BrowseInlineImages' => 'Browse images...',
-	'UI:UploadInlineImageLegend' => 'Upload a new image',
-	'UI:SelectInlineImageToUpload' => 'Select the image to upload',
-	'UI:AvailableInlineImagesLegend' => 'Available images',
-	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.',
-	
-	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize',
-	'UI:Button:ResetImage' => 'Recover the previous image',
-	'UI:Button:RemoveImage' => 'Remove the image',
-	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
-
-	// Search form
-	'UI:Search:Toggle' => 'Minimize / Expand',
-	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class',
-	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.',
-	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
-	// - Add new criteria button
-	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used',
-	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular',
-	'UI:Search:AddCriteria:List:Others:Title' => 'Others',
-	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.',
-
-	// - Criteria titles
-	//   - Default widget
-	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any',
-	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
-	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
-	'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
-	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contains %2$s',
-	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s starts with %2$s',
-	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s ends with %2$s',
-	'UI:Search:Criteria:Title:Default:RegExp' => '%1$s matches %2$s',
-	'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
-	'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
-	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
-	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
-	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
-	'UI:Search:Criteria:Title:Default:Between' => '%1$s between [%2$s]',
-	'UI:Search:Criteria:Title:Default:BetweenDates' => '%1$s [%2$s]',
-	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Any',
-	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s from %2$s',
-	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s until %2$s',
-	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any',
-	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s',
-	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s',
-	//   - Numeric widget
-	//   None yet
-	//   - DateTime widget
-	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
-	//   - Enum widget
-	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
-	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any',
-    //   - External key widget
-    'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
-    'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
-    'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
-    'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others',
-    'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any',
-    //   - Hierarchical key widget
-    'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined',
-    'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined',
-    'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
-    'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others',
-    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any',
-
-	// - Criteria operators
-	//   - Default widget
-	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
-	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
-	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals',
-	'UI:Search:Criteria:Operator:Default:Between' => 'Between',
-	//   - String widget
-	'UI:Search:Criteria:Operator:String:Contains' => 'Contains',
-	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with',
-	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with',
-	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.',
-	//   - Numeric widget
-	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
-	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals',  // > '>=',
-	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less',  // => '<',
-	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals',  // > '<=',
-	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different',  // => '≠',
-
-	// - Other translations
-	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
-	'UI:Search:Value:Search:Placeholder' => 'Search...',
-	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.',
-	'UI:Search:Value:Autocomplete:Wait' => 'Please wait...',
-	'UI:Search:Value:Autocomplete:NoResult' => 'No result.',
-	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
-	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles',
-
-	// - Widget other translations
-	'UI:Search:Criteria:Numeric:From' => 'From',
-	'UI:Search:Criteria:Numeric:Until' => 'To',
-	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any',
-	'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Any',
-	'UI:Search:Criteria:DateTime:From' => 'From',
-	'UI:Search:Criteria:DateTime:FromTime' => 'From',
-	'UI:Search:Criteria:DateTime:Until' => 'until',
-	'UI:Search:Criteria:DateTime:UntilTime' => 'until',
-	'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Any date',
-	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Any date',
-	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date',
-	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date',
-	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.',
-
-	'UI:Search:Criteria:Raw:Filtered' => 'Filtered',
-	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s',
-));
-
-//
-// Expression to Natural language
-//
-Dict::Add('EN US', 'English', 'English', array(
-	'Expression:Operator:AND' => ' AND ',
-	'Expression:Operator:OR' => ' OR ',
-
-	'Expression:Unit:Short:DAY' => 'd',
-	'Expression:Unit:Short:WEEK' => 'w',
-	'Expression:Unit:Short:MONTH' => 'm',
-	'Expression:Unit:Short:YEAR' => 'y',
-
-	'Expression:Unit:Long:DAY' => 'day(s)',
-	'Expression:Unit:Long:HOUR' => 'hour(s)',
-	'Expression:Unit:Long:MINUTE' => 'minute(s)',
-
-	'Expression:Verb:NOW' => 'now',
-));
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:AuditCategory' => 'Audit Category',
+	'Class:AuditCategory+' => 'A section inside the overall audit',
+	'Class:AuditCategory/Attribute:name' => 'Category Name',
+	'Class:AuditCategory/Attribute:name+' => 'Short name for this category',
+	'Class:AuditCategory/Attribute:description' => 'Audit Category Description',
+	'Class:AuditCategory/Attribute:description+' => 'Long description for this audit category',
+	'Class:AuditCategory/Attribute:definition_set' => 'Definition Set',
+	'Class:AuditCategory/Attribute:definition_set+' => 'OQL expression defining the set of objects to audit',
+	'Class:AuditCategory/Attribute:rules_list' => 'Audit Rules',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Audit rules for this category',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:AuditRule' => 'Audit Rule',
+	'Class:AuditRule+' => 'A rule to check for a given Audit category',
+	'Class:AuditRule/Attribute:name' => 'Rule Name',
+	'Class:AuditRule/Attribute:name+' => 'Short name for this rule',
+	'Class:AuditRule/Attribute:description' => 'Audit Rule Description',
+	'Class:AuditRule/Attribute:description+' => 'Long description for this audit rule',
+	'Class:AuditRule/Attribute:query' => 'Query to Run',
+	'Class:AuditRule/Attribute:query+' => 'The OQL expression to run',
+	'Class:AuditRule/Attribute:valid_flag' => 'Valid objects?',
+	'Class:AuditRule/Attribute:valid_flag+' => 'True if the rule returns the valid objects, false otherwise',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
+	'Class:AuditRule/Attribute:category_id' => 'Category',
+	'Class:AuditRule/Attribute:category_id+' => 'The category for this rule',
+	'Class:AuditRule/Attribute:category_name' => 'Category',
+	'Class:AuditRule/Attribute:category_name+' => 'Name of the category for this rule',
+));
+
+//
+// Class: QueryOQL
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:Query' => 'Query',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way',
+	'Class:Query/Attribute:name' => 'Name',
+	'Class:Query/Attribute:name+' => 'Identifies the query',
+	'Class:Query/Attribute:description' => 'Description',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)',
+	'Class:Query/Attribute:fields' => 'Fields',
+	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export',
+
+	'Class:QueryOQL' => 'OQL Query',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language',
+	'Class:QueryOQL/Attribute:oql' => 'Expression',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:User' => 'User',
+	'Class:User+' => 'User login',
+	'Class:User/Attribute:finalclass' => 'Type of account',
+	'Class:User/Attribute:finalclass+' => 'Name of the final class',
+	'Class:User/Attribute:contactid' => 'Contact (person)',
+	'Class:User/Attribute:contactid+' => 'Personal details from the business data',
+	'Class:User/Attribute:last_name' => 'Last name',
+	'Class:User/Attribute:last_name+' => 'Name of the corresponding contact',
+	'Class:User/Attribute:first_name' => 'First name',
+	'Class:User/Attribute:first_name+' => 'First name of the corresponding contact',
+	'Class:User/Attribute:email' => 'Email',
+	'Class:User/Attribute:email+' => 'Email of the corresponding contact',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => 'user identification string',
+	'Class:User/Attribute:language' => 'Language',
+	'Class:User/Attribute:language+' => 'user language',
+	'Class:User/Attribute:language/Value:EN US' => 'English',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => 'French',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:profile_list' => 'Profiles',
+	'Class:User/Attribute:profile_list+' => 'Roles, granting rights for that person',
+	'Class:User/Attribute:allowed_org_list' => 'Allowed Organizations',
+	'Class:User/Attribute:allowed_org_list+' => 'The end user is allowed to see data belonging to the following organizations. If no organization is specified, there is no restriction.',
+	'Class:User/Attribute:status' => 'Status',
+	'Class:User/Attribute:status+' => 'Whether the user account is enabled or disabled.',
+	'Class:User/Attribute:status/Value:enabled' => 'Enabled',
+	'Class:User/Attribute:status/Value:disabled' => 'Disabled',
+		
+	'Class:User/Error:LoginMustBeUnique' => 'Login must be unique - "%1s" is already being used.',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'At least one profile must be assigned to this user.',
+	'Class:User/Error:AtLeastOneOrganizationIsNeeded' => 'At least one organization must be assigned to this user.',
+	'Class:User/Error:OrganizationNotAllowed' => 'Organization not allowed.',
+	'Class:User/Error:UserOrganizationNotAllowed' => 'The user account does not belong to your allowed organizations.',
+	'Class:UserInternal' => 'User Internal',
+	'Class:UserInternal+' => 'User defined within iTop',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_Profiles' => 'Profile',
+	'Class:URP_Profiles+' => 'User profile',
+	'Class:URP_Profiles/Attribute:name' => 'Name',
+	'Class:URP_Profiles/Attribute:name+' => 'label',
+	'Class:URP_Profiles/Attribute:description' => 'Description',
+	'Class:URP_Profiles/Attribute:description+' => 'one line description',
+	'Class:URP_Profiles/Attribute:user_list' => 'Users',
+	'Class:URP_Profiles/Attribute:user_list+' => 'persons having this role',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_Dimensions' => 'dimension',
+	'Class:URP_Dimensions+' => 'application dimension (defining silos)',
+	'Class:URP_Dimensions/Attribute:name' => 'Name',
+	'Class:URP_Dimensions/Attribute:name+' => 'label',
+	'Class:URP_Dimensions/Attribute:description' => 'Description',
+	'Class:URP_Dimensions/Attribute:description+' => 'one line description',
+	'Class:URP_Dimensions/Attribute:type' => 'Type',
+	'Class:URP_Dimensions/Attribute:type+' => 'class name or data type (projection unit)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_UserProfile' => 'User to profile',
+	'Class:URP_UserProfile+' => 'user profiles',
+	'Class:URP_UserProfile/Attribute:userid' => 'User',
+	'Class:URP_UserProfile/Attribute:userid+' => 'user account',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'User\'s login',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profile',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'usage profile',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profile',
+	'Class:URP_UserProfile/Attribute:profile+' => 'Profile name',
+	'Class:URP_UserProfile/Attribute:reason' => 'Reason',
+	'Class:URP_UserProfile/Attribute:reason+' => 'explain why this person may have this role',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_UserOrg' => 'User organizations',
+	'Class:URP_UserOrg+' => 'Allowed organizations',
+	'Class:URP_UserOrg/Attribute:userid' => 'User',
+	'Class:URP_UserOrg/Attribute:userid+' => 'user account',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => 'User\'s login',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organization',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Allowed organization',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organization',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Allowed organization',
+	'Class:URP_UserOrg/Attribute:reason' => 'Reason',
+	'Class:URP_UserOrg/Attribute:reason+' => 'explain why this person is allowed to see the data belonging to this organization',
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => 'profile projections',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimension',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'application dimension',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimension',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'application dimension',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profile',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'usage profile',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profile',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'Profile name',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Value expression',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant |  | +attribute code',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribute',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Target attribute code (optional)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => 'class projections',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimension',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'application dimension',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimension',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'application dimension',
+	'Class:URP_ClassProjection/Attribute:class' => 'Class',
+	'Class:URP_ClassProjection/Attribute:class+' => 'Target class',
+	'Class:URP_ClassProjection/Attribute:value' => 'Value expression',
+	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant |  | +attribute code',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribute',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'Target attribute code (optional)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_ActionGrant' => 'action_permission',
+	'Class:URP_ActionGrant+' => 'permissions on classes',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profile',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'usage profile',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profile',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'usage profile',
+	'Class:URP_ActionGrant/Attribute:class' => 'Class',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Target class',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Permission',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'allowed or not allowed?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'yes',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'yes',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
+	'Class:URP_ActionGrant/Attribute:action' => 'Action',
+	'Class:URP_ActionGrant/Attribute:action+' => 'operations to perform on the given class',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => 'permissions on stimilus in the life cycle of the object',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profile',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'usage profile',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Class',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'Target class',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Permission',
+	'Class:URP_StimulusGrant/Attribute:permission+' => 'allowed or not allowed?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'yes',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'yes',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'no',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'Class:URP_AttributeGrant' => 'attribute_permission',
+	'Class:URP_AttributeGrant+' => 'permissions at the attributes level',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Action grant',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'action grant',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribute',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribute code',
+));
+
+//
+// Expression to Natural language
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Expression:Unit:Short:DAY' => 'd',
+	'Expression:Unit:Short:WEEK' => 'w',
+	'Expression:Unit:Short:MONTH' => 'm',
+	'Expression:Unit:Short:YEAR' => 'y',
+));
+
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('EN US', 'English', 'English', array(
+	'BooleanLabel:yes' => 'yes',
+	'BooleanLabel:no' => 'no',
+    'UI:Login:Title' => 'iTop login',
+	'Menu:WelcomeMenu' => 'Welcome', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Welcome to iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Welcome', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Welcome to iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => 'Welcome to iTop',
+
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop is a complete, OpenSource, IT Operational Portal.</p>
+<ul>It includes:
+<li>A complete CMDB (Configuration management database) to document and manage the IT inventory.</li>
+<li>An Incident management module to track and communicate about all issues occurring in the IT.</li>
+<li>A change management module to plan and track the changes to the IT environment.</li>
+<li>A known error database to speed up the resolution of incidents.</li>
+<li>An outage module to document all planned outages and notify the appropriate contacts.</li>
+<li>Dashboards to quickly get an overview of your IT.</li>
+</ul>
+<p>All the modules can be setup, step by step, indepently of each other.</p>',
+
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop is service provider oriented, it allows IT engineers to manage easily multiple customers or organizations.
+<ul>iTop, delivers a feature-rich set of business processes that:
+<li>Enhances IT management effectiveness</li> 
+<li>Drives IT operations performance</li> 
+<li>Improves customer satisfaction and provides executives with insights into business performance.</li>
+</ul>
+</p>
+<p>iTop is completely open to be integrated within your current IT Management infrastructure.</p>
+<p>
+<ul>Adopting this new generation of IT Operational portal will help you to:
+<li>Better manage a more and more complex IT environment.</li>
+<li>Implement ITIL processes at your own pace.</li>
+<li>Manage the most important asset of your IT: Documentation.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Open requests: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'My requests',
+	'UI:WelcomeMenu:OpenIncidents' => 'Open incidents: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Configuration Items: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Incidents assigned to me',
+	'UI:AllOrganizations' => ' All Organizations ',
+	'UI:YourSearch' => 'Your Search',
+	'UI:LoggedAsMessage' => 'Logged in as %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Logged in as %1$s (Administrator)',
+	'UI:Button:Logoff' => 'Log off',
+	'UI:Button:GlobalSearch' => 'Search',
+	'UI:Button:Search' => ' Search ',
+	'UI:Button:Query' => ' Query ',
+	'UI:Button:Ok' => 'Ok',
+	'UI:Button:Save' => 'Save',
+	'UI:Button:Cancel' => 'Cancel',
+	'UI:Button:Close' => 'Close',
+	'UI:Button:Apply' => 'Apply',
+	'UI:Button:Back' => ' << Back ',
+	'UI:Button:Restart' => ' |<< Restart ',
+	'UI:Button:Next' => ' Next >> ',
+	'UI:Button:Finish' => ' Finish ',
+	'UI:Button:DoImport' => ' Run the Import ! ',
+	'UI:Button:Done' => ' Done ',
+	'UI:Button:SimulateImport' => ' Simulate the Import ',
+	'UI:Button:Test' => 'Test!',
+	'UI:Button:Evaluate' => ' Evaluate ',
+	'UI:Button:Evaluate:Title' => ' Evaluate (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Add... ',
+	'UI:Button:BrowseObjects' => ' Browse... ',
+	'UI:Button:Add' => ' Add ',
+	'UI:Button:AddToList' => ' << Add ',
+	'UI:Button:RemoveFromList' => ' Remove >> ',
+	'UI:Button:FilterList' => ' Filter... ',
+	'UI:Button:Create' => ' Create ',
+	'UI:Button:Delete' => ' Delete ! ',
+	'UI:Button:Rename' => ' Rename... ',
+	'UI:Button:ChangePassword' => ' Change Password ',
+	'UI:Button:ResetPassword' => ' Reset Password ',
+	'UI:Button:Insert' => 'Insert',
+	'UI:Button:More' => 'More',
+	'UI:Button:Less' => 'Less',
+	
+	'UI:SearchToggle' => 'Search',
+	'UI:ClickToCreateNew' => 'Create a new %1$s',
+	'UI:SearchFor_Class' => 'Search for %1$s objects',
+	'UI:NoObjectToDisplay' => 'No object to display.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parameter object_id is mandatory when link_attr is specified. Check the definition of the display template.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parameter target_attr is mandatory when link_attr is specified. Check the definition of the display template.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by is mandatory. Check the definition of the display template.',
+	'UI:Error:InvalidGroupByFields' => 'Invalid list of fields to group by: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Error: unsupported style of block: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrect link definition: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d not found.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Error: Circular reference in the dependencies between the fields, check the data model.',
+	'UI:Error:UploadedFileTooBig' => 'The uploaded file is too big. (Max allowed size is %1$s). To modify this limit, contact your iTop administrator. (Check the PHP configuration for upload_max_filesize and post_max_size on the server).',
+	'UI:Error:UploadedFileTruncated.' => 'Uploaded file has been truncated !',
+	'UI:Error:NoTmpDir' => 'The temporary directory is not defined.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Unable to write the temporary file to the disk. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload stopped  by extension. (Original file name = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'File upload failed, unknown cause. (Error code = "%1$s").',
+	
+	'UI:Error:1ParametersMissing' => 'Error: the following parameter must be specified for this operation: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Error: the following parameters must be specified for this operation: %1$s and %2$s.',
+	'UI:Error:3ParametersMissing' => 'Error: the following parameters must be specified for this operation: %1$s, %2$s and %3$s.',
+	'UI:Error:4ParametersMissing' => 'Error: the following parameters must be specified for this operation: %1$s, %2$s, %3$s and %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Error: incorrect OQL query: %1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'An error occured while running the query: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Error: the object has already been updated.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Error: objects have already been deleted!',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'You are not allowed to perform a bulk delete of objects of class %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'You are not allowed to delete objects of class %1$s',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'You are not allowed to perform a bulk update of objects of class %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Error: the object has already been cloned!',
+	'UI:Error:ObjectAlreadyCreated' => 'Error: the object has already been created!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Error: invalid stimulus "%1$s" on object %2$s in state "%3$s".',
+	
+	
+	'UI:GroupBy:Count' => 'Count',
+	'UI:GroupBy:Count+' => 'Number of elements',
+	'UI:CountOfObjects' => '%1$d objects matching the criteria.',
+	'UI_CountOfObjectsShort' => '%1$d objects.',
+	'UI:NoObject_Class_ToDisplay' => 'No %1$s to display',
+	'UI:History:LastModified_On_By' => 'Last modified on %1$s by %2$s.',
+	'UI:HistoryTab' => 'History',
+	'UI:NotificationsTab' => 'Notifications',
+	'UI:History:BulkImports' => 'History',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)',
+	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)',
+	'UI:History:Date' => 'Date',
+	'UI:History:Date+' => 'Date of the change',
+	'UI:History:User' => 'User',
+	'UI:History:User+' => 'User who made the change',
+	'UI:History:Changes' => 'Changes',
+	'UI:History:Changes+' => 'Changes made to the object',
+	'UI:History:StatsCreations' => 'Created',
+	'UI:History:StatsCreations+' => 'Count of objects created',
+	'UI:History:StatsModifs' => 'Modified',
+	'UI:History:StatsModifs+' => 'Count of objects modified',
+	'UI:History:StatsDeletes' => 'Deleted',
+	'UI:History:StatsDeletes+' => 'Count of objects deleted',
+	'UI:Loading' => 'Loading...',
+	'UI:Menu:Actions' => 'Actions',
+	'UI:Menu:OtherActions' => 'Other Actions',
+	'UI:Menu:New' => 'New...',
+	'UI:Menu:Add' => 'Add...',
+	'UI:Menu:Manage' => 'Manage...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'CSV Export...',
+	'UI:Menu:Modify' => 'Modify...',
+	'UI:Menu:Delete' => 'Delete...',
+	'UI:Menu:BulkDelete' => 'Delete...',
+	'UI:UndefinedObject' => 'undefined',
+	'UI:Document:OpenInNewWindow:Download' => 'Open in new window: %1$s, Download: %2$s',
+	'UI:SplitDateTime-Date' => 'date',
+	'UI:SplitDateTime-Time' => 'time',
+	'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
+	'UI:DisplayAll' => 'Display All',
+	'UI:CollapseList' => 'Collapse',
+	'UI:CountOfResults' => '%1$d object(s)',
+	'UI:ChangesLogTitle' => 'Changes log (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Changes log is empty',
+	'UI:SearchFor_Class_Objects' => 'Search for %1$s Objects',
+	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryTab' => 'OQL Query',
+	'UI:SimpleSearchTab' => 'Simple Search',
+	'UI:Details+' => 'Details',
+	'UI:SearchValue:Any' => '* Any *',
+	'UI:SearchValue:Mixed' => '* mixed *',
+	'UI:SearchValue:NbSelected' => '# selected',
+	'UI:SearchValue:CheckAll' => 'Check All',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All',
+	'UI:SelectOne' => '-- select one --',
+	'UI:Login:Welcome' => 'Welcome to iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Incorrect login/password, please try again.',
+	'UI:Login:IdentifyYourself' => 'Identify yourself before continuing',
+	'UI:Login:UserNamePrompt' => 'User Name',
+	'UI:Login:PasswordPrompt' => 'Password',
+	'UI:Login:ForgotPwd' => 'Forgot your password?',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.',
+	'UI:Login:ResetPassword' => 'Send now!',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s',
+
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.',
+
+	'UI:ResetPwd-Title' => 'Reset password',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.',
+	'UI:ResetPwd-Ready' => 'The password has been changed.',
+	'UI:ResetPwd-Login' => 'Click here to login...',
+
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'Change Your Password',
+	'UI:Login:OldPasswordPrompt' => 'Old password',
+	'UI:Login:NewPasswordPrompt' => 'New password',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Retype new password',
+	'UI:Login:IncorrectOldPassword' => 'Error: the old password is incorrect',
+	'UI:LogOffMenu' => 'Log off',
+	'UI:LogOff:ThankYou' => 'Thank you for using iTop',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Click here to login again...',
+	'UI:ChangePwdMenu' => 'Change Password...',
+	'UI:Login:PasswordChanged' => 'Password successfully set!',
+	'UI:AccessRO-All' => 'iTop is read-only',
+	'UI:AccessRO-Users' => 'iTop is read-only for end-users',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'New password and retyped new password do not match!',
+	'UI:Button:Login' => 'Enter iTop',
+	'UI:Login:Error:AccessRestricted' => 'iTop access is restricted. Please, contact an iTop administrator.',
+	'UI:Login:Error:AccessAdmin' => 'Access restricted to people having administrator privileges. Please, contact an iTop administrator.',
+	'UI:CSVImport:MappingSelectOne' => '-- select one --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignore this field --',
+	'UI:CSVImport:NoData' => 'Empty data set..., please provide some data!',
+	'UI:Title:DataPreview' => 'Data Preview',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: The data contains only one column. Did you select the appropriate separator character?',
+	'UI:CSVImport:FieldName' => 'Field %1$d',
+	'UI:CSVImport:DataLine1' => 'Data Line 1',
+	'UI:CSVImport:DataLine2' => 'Data Line 2',
+	'UI:CSVImport:idField' => 'id (Primary Key)',
+	'UI:Title:BulkImport' => 'iTop - Bulk import',
+	'UI:Title:BulkImport+' => 'CSV Import Wizard',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- select one --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Internal error: "%1$s" is an incorrect code because "%2$s" is NOT an external key of the class "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objects(s) will stay unchanged.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objects(s) will be modified.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objects(s) will be added.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objects(s) will have errors.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objects(s) remained unchanged.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objects(s) were modified.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objects(s) were added.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d objects(s) had errors.',
+	'UI:Title:CSVImportStep2' => 'Step 2 of 5: CSV data options',
+	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Data mapping',
+	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Import simulation',
+	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Import completed',
+	'UI:CSVImport:LinesNotImported' => 'Lines that could not be loaded:',
+	'UI:CSVImport:LinesNotImported+' => 'The following lines have not been imported because they contain errors',
+	'UI:CSVImport:SeparatorComma+' => ', (comma)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (semicolon)',
+	'UI:CSVImport:SeparatorTab+' => 'tab',
+	'UI:CSVImport:SeparatorOther' => 'other:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (double quote)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (simple quote)',
+	'UI:CSVImport:QualifierOther' => 'other:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Treat the first line as a header (column names)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Skip %1$s line(s) at the beginning of the file',
+	'UI:CSVImport:CSVDataPreview' => 'CSV Data Preview',
+	'UI:CSVImport:SelectFile' => 'Select the file to import:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Load from a file',
+	'UI:CSVImport:Tab:CopyPaste' => 'Copy and paste data',
+	'UI:CSVImport:Tab:Templates' => 'Templates',
+	'UI:CSVImport:PasteData' => 'Paste the data to import:',
+	'UI:CSVImport:PickClassForTemplate' => 'Pick the template to download: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Separator character:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Text qualifier character',
+	'UI:CSVImport:CommentsAndHeader' => 'Comments and header',
+	'UI:CSVImport:SelectClass' => 'Select the class to import:',
+	'UI:CSVImport:AdvancedMode' => 'Advanced mode',
+	'UI:CSVImport:AdvancedMode+' => 'In advanced mode the "id" (primary key) of the objects can be used to update and rename objects.' .
+									'However the column "id" (if present) can only be used as a search criteria and can not be combined with any other search criteria.',
+	'UI:CSVImport:SelectAClassFirst' => 'To configure the mapping, select a class first.',
+	'UI:CSVImport:HeaderFields' => 'Fields',
+	'UI:CSVImport:HeaderMappings' => 'Mappings',
+	'UI:CSVImport:HeaderSearch' => 'Search?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Please select a mapping for every field.',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Please select at least one search criteria',
+	'UI:CSVImport:Encoding' => 'Character encoding',	
+	'UI:UniversalSearchTitle' => 'iTop - Universal Search',
+	'UI:UniversalSearch:Error' => 'Error: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Select the class to search: ',
+
+	'UI:CSVReport-Value-Modified' => 'Modified',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s',
+	'UI:CSVReport-Value-NoMatch' => 'No match',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged',
+	'UI:CSVReport-Row-Created' => 'created',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s',
+
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged',
+	'UI:CSVReport-Icon-Modified' => 'Modified',
+	'UI:CSVReport-Icon-Missing' => 'Missing',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated',
+	'UI:CSVReport-Icon-Created' => 'Created',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created',
+	'UI:CSVReport-Object-Created' => 'Object created',
+	'UI:CSVReport-Icon-Error' => 'Error',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.',
+
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.',
+	'UI:CSVExport:LostChars' => 'Encoding issue',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').',
+
+	'UI:Audit:Title' => 'iTop - CMDB Audit',
+	'UI:Audit:InteractiveAudit' => 'Interactive Audit',
+	'UI:Audit:HeaderAuditRule' => 'Audit Rule',
+	'UI:Audit:HeaderNbObjects' => '# Objects',
+	'UI:Audit:HeaderNbErrors' => '# Errors',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.',
+
+	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluation',
+	'UI:RunQuery:QueryExamples' => 'Query Examples',
+	'UI:RunQuery:HeaderPurpose' => 'Purpose',
+	'UI:RunQuery:HeaderPurpose+' => 'Explanation about the query',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression',
+	'UI:RunQuery:HeaderOQLExpression+' => 'The query in OQL syntax',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Expression to evaluate: ',
+	'UI:RunQuery:MoreInfo' => 'More information about the query: ',
+	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
+	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
+	'UI:RunQuery:Error' => 'An error occured while running the query: %1$s',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested here below points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. <br/>Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.',
+	'UI:Schema:Title' => 'iTop objects schema',
+	'UI:Schema:CategoryMenuItem' => 'Category <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relationships',
+	'UI:Schema:AbstractClass' => 'Abstract class: no object from this class can be instantiated.',
+	'UI:Schema:NonAbstractClass' => 'Non abstract class: objects from this class can be instantiated.',
+	'UI:Schema:ClassHierarchyTitle' => 'Class hierarchy',
+	'UI:Schema:AllClasses' => 'All classes',
+	'UI:Schema:ExternalKey_To' => 'External key to %1$s',
+	'UI:Schema:Columns_Description' => 'Columns: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Default: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null Allowed',
+	'UI:Schema:NullNotAllowed' => 'Null NOT Allowed',
+	'UI:Schema:Attributes' => 'Attributes',
+	'UI:Schema:AttributeCode' => 'Attribute Code',
+	'UI:Schema:AttributeCode+' => 'Internal code of the attribute',
+	'UI:Schema:Label' => 'Label',
+	'UI:Schema:Label+' => 'Label of the attribute',
+	'UI:Schema:Type' => 'Type',
+	
+	'UI:Schema:Type+' => 'Data type of the attribute',
+	'UI:Schema:Origin' => 'Origin',
+	'UI:Schema:Origin+' => 'The base class in which this attribute is defined',
+	'UI:Schema:Description' => 'Description',
+	'UI:Schema:Description+' => 'Description of the attribute',
+	'UI:Schema:AllowedValues' => 'Allowed values',
+	'UI:Schema:AllowedValues+' => 'Restrictions on the possible values for this attribute',
+	'UI:Schema:MoreInfo' => 'More info',
+	'UI:Schema:MoreInfo+' => 'More information about the field defined in the database',
+	'UI:Schema:SearchCriteria' => 'Search criteria',
+	'UI:Schema:FilterCode' => 'Filter code',
+	'UI:Schema:FilterCode+' => 'Code of this search criteria',
+	'UI:Schema:FilterDescription' => 'Description',
+	'UI:Schema:FilterDescription+' => 'Description of this search criteria',
+	'UI:Schema:AvailOperators' => 'Available operators',
+	'UI:Schema:AvailOperators+' => 'Possible operators for this search criteria',
+	'UI:Schema:ChildClasses' => 'Child classes',
+	'UI:Schema:ReferencingClasses' => 'Referencing classes',
+	'UI:Schema:RelatedClasses' => 'Related classes',
+	'UI:Schema:LifeCycle' => 'Life cycle',
+	'UI:Schema:Triggers' => 'Triggers',
+	'UI:Schema:Relation_Code_Description' => 'Relation <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: propagate to %2$d levels, query: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: does not propagates (%2$d levels), query: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s is referenced by the class %2$s via the field %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s is linked to %2$s via %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'Classes pointing to %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Classes linked to %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'Graph of all related classes',
+	'UI:Schema:NoLifeCyle' => 'There is no life cycle defined for this class.',
+	'UI:Schema:LifeCycleTransitions' => 'States and Transitions',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Attribute options',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Hidden',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Read-only',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Mandatory',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Must change',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'User will be prompted to change the value',
+	'UI:Schema:LifeCycleEmptyList' => 'empty list',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => 'Type the first 3 characters...',
+	'UI:Edit:TestQuery' => 'Test query',
+	'UI:Combo:SelectValue' => '--- select a value ---',
+	'UI:Label:SelectedObjects' => 'Selected objects: ',
+	'UI:Label:AvailableObjects' => 'Available objects: ',
+	'UI:Link_Class_Attributes' => '%1$s attributes',
+	'UI:SelectAllToggle+' => 'Select All / Deselect All',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Add %1$s objects linked with %2$s: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Add %1$s objects to link with the %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Manage %1$s objects linked with %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Add %1$ss...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Remove selected objects',
+	'UI:Message:EmptyList:UseAdd' => 'The list is empty, use the "Add..." button to add elements.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Use the search form above to search for objects to be added.',
+	'UI:Wizard:FinalStepTitle' => 'Final step: confirmation',
+	'UI:Title:DeletionOf_Object' => 'Deletion of %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Bulk deletion of %1$d objects of class %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'You are not allowed to delete this object',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'You are not allowed to update the following field(s): %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'This object could not be deleted because the current user do not have sufficient rights',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'This object could not be deleted because some manual operations must be performed prior to that',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
+	'UI:Delete:Deleted' => 'deleted',
+	'UI:Delete:AutomaticallyDeleted' => 'automatically deleted',
+	'UI:Delete:AutomaticResetOf_Fields' => 'automatic reset of field(s): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Cleaning up all references to %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Cleaning up all references to %1$d objects of class %2$s...',
+	'UI:Delete:Done+' => 'What was done...',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s deleted.',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Deletion of %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Deletion of %1$d objects of class %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Will be automaticaly deleted',
+	'UI:Delete:MustBeDeletedManually' => 'Must be deleted manually',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Should be automatically updated, but: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'will be automaticaly updated (reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objects/links are referencing %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objects/links are referencing some of the objects to be deleted',	
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'To ensure Database integrity, any reference should be further eliminated',
+	'UI:Delete:Consequence+' => 'What will be done',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Sorry, you are not allowed to delete this object, see the detailed explanations above',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Please perform the manual operations listed above prior to requesting the deletion of this object',
+	'UI:Delect:Confirm_Object' => 'Please confirm that you want to delete %1$s.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Please confirm that you want to delete the following %1$d objects of class %2$s.',
+	'UI:WelcomeToITop' => 'Welcome to iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s details',
+	'UI:ErrorPageTitle' => 'iTop - Error',
+	'UI:ObjectDoesNotExist' => 'Sorry, this object does not exist (or you are not allowed to view it).',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.',
+	'Tag:Archived' => 'Archived',
+	'Tag:Archived+' => 'Can be accessed only in archive mode',
+	'Tag:Obsolete' => 'Obsolete',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results',
+	'Tag:Synchronized' => 'Synchronized',
+	'ObjectRef:Archived' => 'Archived',
+	'ObjectRef:Obsolete' => 'Obsolete',
+	'UI:SearchResultsPageTitle' => 'iTop - Search Results',
+	'UI:SearchResultsTitle' => 'Search Results',
+	'UI:SearchResultsTitle+' => 'Full-text search results',
+	'UI:Search:NoSearch' => 'Nothing to search for',
+	'UI:Search:NeedleTooShort' => 'The search string "%1$s" is too short. Please type at least %2$d characters.',
+	'UI:Search:Ongoing' => 'Searching for "%1$s"',
+	'UI:Search:Enlarge' => 'Broaden the search',
+	'UI:FullTextSearchTitle_Text' => 'Results for "%1$s":',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d object(s) of class %2$s found.',
+	'UI:Search:NoObjectFound' => 'No object found.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modification',
+	'UI:ModificationTitle_Class_Object' => 'Modification of %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s modification',
+	'UI:CloneTitle_Class_Object' => 'Clone of %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - Creation of a new %1$s ',
+	'UI:CreationTitle_Class' => 'Creation of a new %1$s',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Select the type of %1$s to create:',
+	'UI:Class_Object_NotUpdated' => 'No change detected, %1$s (%2$s) has <strong>not</strong> been modified.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) updated.',
+	'UI:BulkDeletePageTitle' => 'iTop - Bulk Delete',
+	'UI:BulkDeleteTitle' => 'Select the objects you want to delete:',
+	'UI:PageTitle:ObjectCreated' => 'iTop Object Created.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s created.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Applying %1$s on object: %2$s in state %3$s to target state: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'The object could not be written: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - Fatal Error',
+	'UI:SystemIntrusion' => 'Access denied. You have requested an operation that is not allowed for you.',
+	'UI:FatalErrorMessage' => 'Fatal error, iTop cannot continue.',
+	'UI:Error_Details' => 'Error: %1$s.',
+
+	'UI:PageTitle:ClassProjections'	=> 'iTop user management - class projections',
+	'UI:PageTitle:ProfileProjections' => 'iTop user management - profile projections',
+	'UI:UserManagement:Class' => 'Class',
+	'UI:UserManagement:Class+' => 'Class of objects',
+	'UI:UserManagement:ProjectedObject' => 'Object',
+	'UI:UserManagement:ProjectedObject+' => 'Projected object',
+	'UI:UserManagement:AnyObject' => '* any *',
+	'UI:UserManagement:User' => 'User',
+	'UI:UserManagement:User+' => 'User involved in the projection',
+	'UI:UserManagement:Profile' => 'Profile',
+	'UI:UserManagement:Profile+' => 'Profile in which the projection is specified',
+	'UI:UserManagement:Action:Read' => 'Read',
+	'UI:UserManagement:Action:Read+' => 'Read/display objects',
+	'UI:UserManagement:Action:Modify' => 'Modify',
+	'UI:UserManagement:Action:Modify+' => 'Create and edit (modify) objects',
+	'UI:UserManagement:Action:Delete' => 'Delete',
+	'UI:UserManagement:Action:Delete+' => 'Delete objects',
+	'UI:UserManagement:Action:BulkRead' => 'Bulk Read (Export)',
+	'UI:UserManagement:Action:BulkRead+' => 'List objects or export massively',
+	'UI:UserManagement:Action:BulkModify' => 'Bulk Modify',
+	'UI:UserManagement:Action:BulkModify+' => 'Massively create/edit (CSV import)',
+	'UI:UserManagement:Action:BulkDelete' => 'Bulk Delete',
+	'UI:UserManagement:Action:BulkDelete+' => 'Massively delete objects',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => 'Allowed (compound) actions',
+	'UI:UserManagement:Action' => 'Action',
+	'UI:UserManagement:Action+' => 'Action performed by the user',
+	'UI:UserManagement:TitleActions' => 'Actions',
+	'UI:UserManagement:Permission' => 'Permission',
+	'UI:UserManagement:Permission+' => 'User\'s permissions',
+	'UI:UserManagement:Attributes' => 'Attributes',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Yes',
+	'UI:UserManagement:ActionAllowed:No' => 'No',
+	'UI:UserManagement:AdminProfile+' => 'Administrators have full read/write access to all objects in the database.',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => 'No lifecycle has been defined for this class',
+	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link between %1$s and %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link between %1$s and %2$s',
+	
+	'Menu:AdminTools' => 'Admin tools', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:ChangeManagementMenu' => 'Change Management',
+	'UI:ChangeManagementMenu+' => 'Change Management',
+	'UI:ChangeManagementMenu:Title' => 'Changes Overview',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Changes by type',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes by status',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changes by workgroup',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Changes not yet assigned',
+
+	'UI:ConfigurationManagementMenu' => 'Configuration Management',
+	'UI:ConfigurationManagementMenu+' => 'Configuration Management',
+	'UI:ConfigurationManagementMenu:Title' => 'Infrastructure Overview',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items by status',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items by type',
+
+'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Request Management',
+'UI-RequestManagementOverview-RequestByService' => 'User Requests by service',
+'UI-RequestManagementOverview-RequestByPriority' => 'User Requests by priority',
+'UI-RequestManagementOverview-RequestUnassigned' => 'User Requests not yet assigned to an agent',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management',
+'UI-IncidentManagementOverview-IncidentByService' => 'Incidents by service',
+'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidents by priority',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents not yet assigned to an agent',
+
+'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management',
+'UI-ChangeManagementOverview-ChangeByType' => 'Changes by type',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes not yet assigned to an agent',
+'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages due to changes',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Customer contracts to be renewed in 30 days',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider contracts to be renewed in 30 days',
+
+	'UI:ContactsMenu' => 'Contacts',
+	'UI:ContactsMenu+' => 'Contacts',
+	'UI:ContactsMenu:Title' => 'Contacts Overview',
+	'UI-ContactsMenu-ContactsByLocation' => 'Contacts by location',
+	'UI-ContactsMenu-ContactsByType' => 'Contacts by type',
+	'UI-ContactsMenu-ContactsByStatus' => 'Contacts by status',
+
+	'Menu:CSVImportMenu' => 'CSV import', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Bulk creation or update', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:DataModelMenu' => 'Data Model', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Overview of the Data Model', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:ExportMenu' => 'Export', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Export the results of any query in HTML, CSV or XML', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:NotificationsMenu' => 'Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Configuration of the Notifications', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:NotificationsMenu:Title' => 'Configuration of the <span class="hilite">Notifications</span>',
+	'UI:NotificationsMenu:Help' => 'Help',
+	'UI:NotificationsMenu:HelpContent' => '<p>In iTop the notifications are fully customizable. They are based on two sets of objects: <i>triggers and actions</i>.</p>
+<p><i><b>Triggers</b></i> define when a notification will be executed. There are 5 types of triggers for covering 3 differents phases of an object life cycle:
+<ol>
+	<li>the "on object creation" triggers get executed when an object of the specified class is created</li>
+	<li>the "on entering a state" triggers get executed before an object of the given class enters a specified state (coming from another state)</li>
+	<li>the "on leaving a state" triggers get executed when an object of the given class is leaving a specified state</li>
+	<li>the "on threshold" triggers get executed when a threshold for TTR or TTO has been reached</li>
+	<li>the "on portal update" triggers get executed when a ticket is updated from the portal</li>
+</ol>
+</p>
+<p>
+<i><b>Actions</b></i> define the actions to be performed when the triggers execute. For now there is only one kind of action consisting in sending an email message.
+Such actions also define the template to be used for sending the email as well as the other parameters of the message like the recipients, importance, etc.
+</p>
+<p>A special page: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is available for testing and troubleshooting your PHP mail configuration.</p>
+<p>To be executed, actions must be associated to triggers.
+When associated with a trigger, each action is given an "order" number, specifying in which order the actions are to be executed.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Triggers',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Available triggers',
+	'UI:NotificationsMenu:OnCreate' => 'When an object is created',
+	'UI:NotificationsMenu:OnStateEnter' => 'When an object enters a given state',
+	'UI:NotificationsMenu:OnStateLeave' => 'When an object leaves a given state',
+	'UI:NotificationsMenu:Actions' => 'Actions',
+	'UI:NotificationsMenu:AvailableActions' => 'Available actions',
+	
+	'Menu:AuditCategories' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Audit Categories', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:RunQueriesMenu' => 'Run Queries', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Run any query', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:QueryMenu' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Query phrasebook', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:DataAdministration' => 'Data administration', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Data administration', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:UniversalSearchMenu' => 'Universal Search', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Search for anything...', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:UserManagementMenu' => 'User Management', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'User management', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:ProfilesMenu' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profiles', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:UserAccountsMenu' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu+' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu:Title' => 'User Accounts', // Duplicated into itop-welcome-itil (will be removed from here...)	
+
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
+	'UI:PropertiesTab' => 'Properties',
+
+	'UI:OpenDocumentInNewWindow_' => 'Open this document in a new window: %1$s',
+	'UI:DownloadDocument_' => 'Download this document: %1$s',
+	'UI:Document:NoPreview' => 'No preview is available for this type of document',
+	'UI:Download-CSV' => 'Download %1$s',
+
+	'UI:DeadlineMissedBy_duration' => 'Missed  by %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',		
+	'UI:Deadline_Minutes' => '%1$d min',			
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
+	'UI:Help' => 'Help',
+	'UI:PasswordConfirm' => '(Confirm)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Before adding more %1$s objects, save this object.',
+	'UI:DisplayThisMessageAtStartup' => 'Display this message at startup',
+	'UI:RelationshipGraph' => 'Graphical view',
+	'UI:RelationshipList' => 'List',
+	'UI:RelationGroups' => 'Groups',
+	'UI:OperationCancelled' => 'Operation Cancelled',
+	'UI:ElementsDisplayed' => 'Filtering',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info',
+	'UI:Relation:NoneSelected' => 'None',
+	'UI:Relation:Zoom' => 'Zoom',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...',
+	'UI:Relation:DrillDown' => 'Details...',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s',
+	'UI:RelationOption:Untitled' => 'Untitled',
+	'UI:Relation:Key' => 'Key',
+	'UI:Relation:Comments' => 'Comments',
+	'UI:RelationOption:Title' => 'Title',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects',
+	'UI:RelationOption:Comments' => 'Comments',
+	'UI:Button:Export' => 'Export',
+	'UI:Relation:PDFExportPageFormat' => 'Page format',
+	'UI:PageFormat_A3' => 'A3',
+	'UI:PageFormat_A4' => 'A4',
+	'UI:PageFormat_Letter' => 'Letter',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation',
+	'UI:PageOrientation_Portrait' => 'Portrait',
+	'UI:PageOrientation_Landscape' => 'Landscape',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d',
+	'Portal:Title' => 'iTop user portal',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.',
+	'Portal:Refresh' => 'Refresh',
+	'Portal:Back' => 'Back',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:TitleDetailsFor_Request' => 'Details for request',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => 'Create a new request',
+	'Portal:CreateNewRequestItil' => 'Create a new request',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report',
+	'Portal:ChangeMyPassword' => 'Change my password',
+	'Portal:Disconnect' => 'Disconnect',
+	'Portal:OpenRequests' => 'My open requests',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests'  => 'My resolved requests',
+	'Portal:SelectService' => 'Select a service from the catalog:',
+	'Portal:PleaseSelectOneService' => 'Please select one service',
+	'Portal:SelectSubcategoryFrom_Service' => 'Select a sub-category for the service %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Please select one sub-category',
+	'Portal:DescriptionOfTheRequest' => 'Enter the description of your request:',
+	'Portal:TitleRequestDetailsFor_Request' => 'Details for request %1$s:',
+	'Portal:NoOpenRequest' => 'No request in this category',
+	'Portal:NoClosedRequest' => 'No request in this category',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
+	'Portal:Button:CloseTicket' => 'Close this ticket',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => 'Enter your comments about the resolution of this ticket:',
+	'Portal:ErrorNoContactForThisUser' => 'Error: the current user is not associated with a Contact/Person. Please contact your administrator.',
+	'Portal:Attachments' => 'Attachments',
+	'Portal:AddAttachment' => ' Add Attachment ',
+	'Portal:RemoveAttachment' => ' Remove Attachment ',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s',
+	'Enum:Undefined' => 'Undefined',	
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s d %2$s h %3$s min %4$s s',
+	'UI:ModifyAllPageTitle' => 'Modify All',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d',
+	'UI:Menu:ModifyAll' => 'Modify...',
+	'UI:Button:ModifyAll' => 'Modify All',
+	'UI:Button:PreviewModifications' => 'Preview Modifications >>',
+	'UI:ModifiedObject' => 'Object Modified',
+	'UI:BulkModifyStatus' => 'Operation',
+	'UI:BulkModifyStatus+' => 'Status of the operation',
+	'UI:BulkModifyErrors' => 'Errors (if any)',
+	'UI:BulkModifyErrors+' => 'Errors preventing the modification',	
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Error',
+	'UI:BulkModifyStatusModified' => 'Modified',
+	'UI:BulkModifyStatusSkipped' => 'Skipped',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)',
+	'UI:BulkModify:N_MoreValues' => '%1$d more values...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s',
+	'UI:FailedToApplyStimuli' => 'The action has failed.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s',
+	'UI:CaseLogTypeYourTextHere' => 'Type your text here...',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Initial value:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.',
+	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.',
+	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.',
+	'UI:Pagination:PageSize' => '%1$s objects per page',
+	'UI:Pagination:PagesLabel' => 'Pages:',
+	'UI:Pagination:All' => 'All',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s',
+	'UI:Preferences' => 'Preferences...',
+	'UI:ArchiveModeOn' => 'Activate archive mode',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode',
+	'UI:ArchiveMode:Banner' => 'Archive mode',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. '.
+								   'Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting "All Organizations" in the drop-down list.',
+	'UI:FavoriteLanguage' => 'Language of the User Interface',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language',
+	'UI:FavoriteOtherSettings' => 'Other Settings',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...',
+	'UI:Button:Refresh' => 'Refresh',
+	'UI:Button:GoPrint' => 'Print...',
+	'UI:ExplainPrintable' => 'Click onto the %1$s icon to hide items from the print.<br/>Use the "print preview" feature of your browser to preview before printing.<br/>Note: this header and the other tuning controls will not be printed.',
+
+	'UI:ConfigureThisList' => 'Configure This List...',
+	'UI:ListConfigurationTitle' => 'List Configuration',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:',
+	'UI:UseDefaultSettings' => 'Use the Default Settings',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page',
+	'UI:UseSavetheSettings' => 'Save the Settings',
+	'UI:OnlyForThisList' => 'Only for this list',
+	'UI:ForAllLists' => 'Default for all lists',
+	'UI:ExtKey_AsLink' => '%1$s (Link)',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
+	'UI:Button:MoveUp' => 'Move Up',
+	'UI:Button:MoveDown' => 'Move Down',
+
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class "%1$s". You may try "%2$s" instead.',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class "%1$s"',
+
+	'UI:Dashboard:Edit' => 'Edit This Page...',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.',
+	'UI:ExportDashBoard' => 'Export to a file',
+	'UI:ImportDashBoard' => 'Import from a file...',
+	'UI:ImportDashboardTitle' => 'Import From a File',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:',
+
+
+	'UI:DashletCreation:Title' => 'Create a new Dashlet',
+	'UI:DashletCreation:Dashboard' => 'Dashboard',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard',
+
+	'UI:DashboardEdit:Title' => 'Dashboard Editor',
+	'UI:DashboardEdit:DashboardTitle' => 'Title',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds',
+
+	'UI:DashboardEdit:Layout' => 'Layout',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets',	
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties',	
+
+	'UI:Form:Property' => 'Property',
+	'UI:Form:Value' => 'Value',
+
+	'UI:DashletUnknown:Label' => 'Unknown',
+	'UI:DashletUnknown:Description' => 'Unknown dashlet (might have been uninstalled)',
+	'UI:DashletUnknown:RenderText:View' => 'Unable to render this dashlet.',
+	'UI:DashletUnknown:RenderText:Edit' => 'Unable to render this dashlet (class "%1$s"). Check with your administrator if it is still available.',
+	'UI:DashletUnknown:RenderNoDataText:Edit' => 'No preview available for this dashlet (class "%1$s").',
+	'UI:DashletUnknown:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)',
+
+	'UI:DashletProxy:Label' => 'Proxy',
+	'UI:DashletProxy:Description' => 'Proxy dashlet',
+	'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").',
+	'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (shown as raw XML)',
+
+	'UI:DashletPlainText:Label' => 'Text',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)',
+	'UI:DashletPlainText:Prop-Text' => 'Text',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...',
+
+	'UI:DashletObjectList:Label' => 'Object list',
+	'UI:DashletObjectList:Description' => 'Object list dashlet',
+	'UI:DashletObjectList:Prop-Title' => 'Title',
+	'UI:DashletObjectList:Prop-Query' => 'Query',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu',
+
+	'UI:DashletGroupBy:Prop-Title' => 'Title',
+	'UI:DashletGroupBy:Prop-Query' => 'Query',
+	'UI:DashletGroupBy:Prop-Style' => 'Style',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together',
+
+	'UI:DashletGroupByPie:Label' => 'Pie Chart',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)',
+
+	// New in 2.5
+	'UI:DashletGroupBy:Prop-Function' => 'Aggregation function',
+	'UI:DashletGroupBy:Prop-FunctionAttribute' => 'Function attribute',
+	'UI:DashletGroupBy:Prop-OrderDirection' => 'Direction',
+	'UI:DashletGroupBy:Prop-OrderField' => 'Order by',
+	'UI:DashletGroupBy:Prop-Limit' => 'Limit',
+
+	'UI:DashletGroupBy:Order:asc' => 'Ascending',
+	'UI:DashletGroupBy:Order:desc' => 'Descending',
+
+	'UI:GroupBy:count' => 'Count',
+	'UI:GroupBy:count+' => 'Number of elements',
+	'UI:GroupBy:sum' => 'Sum',
+	'UI:GroupBy:sum+' => 'Sum of %1$s',
+	'UI:GroupBy:avg' => 'Average',
+	'UI:GroupBy:avg+' => 'Average of %1$s',
+	'UI:GroupBy:min' => 'Minimum',
+	'UI:GroupBy:min+' => 'Minimum of %1$s',
+	'UI:GroupBy:max' => 'Maximum',
+	'UI:GroupBy:max+' => 'Maximum of %1$s',
+	// ---
+
+	'UI:DashletHeaderStatic:Label' => 'Header',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon',
+
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values',
+
+	'UI:DashletBadge:Label' => 'Badge',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search',
+	'UI:DashletBadge:Prop-Class' => 'Class',
+
+	'DayOfWeek-Sunday' => 'Sunday',
+	'DayOfWeek-Monday' => 'Monday',
+	'DayOfWeek-Tuesday' => 'Tuesday',
+	'DayOfWeek-Wednesday' => 'Wednesday',
+	'DayOfWeek-Thursday' => 'Thursday',
+	'DayOfWeek-Friday' => 'Friday',
+	'DayOfWeek-Saturday' => 'Saturday',
+	'Month-01' => 'January',
+	'Month-02' => 'February',
+	'Month-03' => 'March',
+	'Month-04' => 'April',
+	'Month-05' => 'May',
+	'Month-06' => 'June',
+	'Month-07' => 'July',
+	'Month-08' => 'August',
+	'Month-09' => 'September',
+	'Month-10' => 'October',
+	'Month-11' => 'November',
+	'Month-12' => 'December',
+	
+	// Short version for the DatePicker
+	'DayOfWeek-Sunday-Min' => 'Su',
+	'DayOfWeek-Monday-Min' => 'Mo',
+	'DayOfWeek-Tuesday-Min' => 'Tu',
+	'DayOfWeek-Wednesday-Min' => 'We',
+	'DayOfWeek-Thursday-Min' => 'Th',
+	'DayOfWeek-Friday-Min' => 'Fr',
+	'DayOfWeek-Saturday-Min' => 'Sa',
+	'Month-01-Short' => 'Jan',
+	'Month-02-Short' => 'Feb',
+	'Month-03-Short' => 'Mar',
+	'Month-04-Short' => 'Apr',
+	'Month-05-Short' => 'May',
+	'Month-06-Short' => 'Jun',
+	'Month-07-Short' => 'Jul',
+	'Month-08-Short' => 'Aug',
+	'Month-09-Short' => 'Sep',
+	'Month-10-Short' => 'Oct',
+	'Month-11-Short' => 'Nov',
+	'Month-12-Short' => 'Dec',
+	'Calendar-FirstDayOfWeek' => 0, // 0 = Sunday, 1 = Monday, etc...
+	
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).',
+	'Menu:MyShortcuts' => 'My Shortcuts', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Class:Shortcut' => 'Shortcut',
+	'Class:Shortcut+' => '',
+	'Class:Shortcut/Attribute:name' => 'Name',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title',
+	'Class:ShortcutOQL' => 'Search result shortcut',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds',
+
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.',
+	'UI:ValueMustBeSet' => 'Please specify a value',
+	'UI:ValueMustBeChanged' => 'Please change the value',
+	'UI:ValueInvalidFormat' => 'Invalid format',
+
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?',
+	'UI:CSVImportError_items' => 'Errors: %1$d',
+	'UI:CSVImportCreated_items' => 'Created: %1$d',
+	'UI:CSVImportModified_items' => 'Modified: %1$d',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d',
+	'UI:CSVImport:DateAndTimeFormats' => 'Date and time format',
+	'UI:CSVImport:DefaultDateTimeFormat_Format_Example' => 'Default format: %1$s (e.g. %2$s)',
+	'UI:CSVImport:CustomDateTimeFormat' => 'Custom format: %1$s',
+	'UI:CSVImport:CustomDateTimeFormatTooltip' => 'Available placeholders:<table>
+<tr><td>Y</td><td>year (4 digits, e.g. 2016)</td></tr>
+<tr><td>y</td><td>year (2 digits, e.g. 16 for 2016)</td></tr>
+<tr><td>m</td><td>month (2 digits, e.g. 01..12)</td></tr>
+<tr><td>n</td><td>month (1 or 2 digits no leading zero, e.g. 1..12)</td></tr>
+<tr><td>d</td><td>day (2 digits, e.g. 01..31)</td></tr>
+<tr><td>j</td><td>day (1 or 2 digits no leading zero, e.g. 1..31)</td></tr>
+<tr><td>H</td><td>hour (24 hour, 2 digits, e.g. 00..23)</td></tr>
+<tr><td>h</td><td>hour (12 hour, 2 digits, e.g. 01..12)</td></tr>
+<tr><td>G</td><td>hour (24 hour, 1 or 2 digits no leading zero, e.g. 0..23)</td></tr>
+<tr><td>g</td><td>hour (12 hour, 1 or 2 digits no leading zero, e.g. 1..12)</td></tr>
+<tr><td>a</td><td>hour, am or pm (lowercase)</td></tr>
+<tr><td>A</td><td>hour, AM or PM (uppercase)</td></tr>
+<tr><td>i</td><td>minutes (2 digits, e.g. 00..59)</td></tr>
+<tr><td>s</td><td>seconds (2 digits, e.g. 00..59)</td></tr>
+</table>',
+		
+	'UI:Button:Remove' => 'Remove',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s',
+
+	'UI:AboutBox' => 'About iTop...',
+	'UI:About:Title' => 'About iTop',
+	'UI:About:DataModel' => 'Data model',
+	'UI:About:Support' => 'Support information',
+	'UI:About:Licenses' => 'Licenses',
+	'UI:About:InstallationOptions' => 'Installation options',
+	'UI:About:ManualExtensionSource' => 'Extension',
+	'UI:About:Extension_Version' => 'Version: %1$s',
+	'UI:About:RemoteExtensionSource' => 'Data',	
+	
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.',
+	'UI:DisconnectedDlgTitle' => 'Warning!',
+	'UI:LoginAgain' => 'Login again',
+	'UI:StayOnThePage' => 'Stay on this page',
+	
+	'ExcelExporter:ExportMenu' => 'Excel Export...',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export',
+	'ExcelExporter:ExportButton' => 'Export',
+	'ExcelExporter:DownloadButton' => 'Download %1$s',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...',
+	'ExcelExporter:Done' => 'Done.',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready',
+	'ExcelExport:PreparingExport' => 'Preparing the export...',
+	'ExcelExport:Statistics' => 'Statistics',
+	'portal:legacy_portal' => 'End-User Portal',
+	'portal:backoffice' => 'iTop Back-Office User Interface',
+
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !',
+	
+	'UI:Menu:ExportPDF' => 'Export as PDF...',
+	'UI:Menu:PrintableVersion' => 'Printer friendly version',
+	
+	'UI:BrowseInlineImages' => 'Browse images...',
+	'UI:UploadInlineImageLegend' => 'Upload a new image',
+	'UI:SelectInlineImageToUpload' => 'Select the image to upload',
+	'UI:AvailableInlineImagesLegend' => 'Available images',
+	'UI:NoInlineImage' => 'There is no image available on the server. Use the "Browse" button above to select an image from your computer and upload it to the server.',
+	
+	'UI:ToggleFullScreen' => 'Toggle Maximize / Minimize',
+	'UI:Button:ResetImage' => 'Recover the previous image',
+	'UI:Button:RemoveImage' => 'Remove the image',
+	'UI:UploadNotSupportedInThisMode' => 'The modification of images or files is not supported in this mode.',
+
+	// Search form
+	'UI:Search:Toggle' => 'Minimize / Expand',
+	'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class',
+	'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.',
+	'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',
+	// - Add new criteria button
+	'UI:Search:AddCriteria:List:RecentlyUsed:Title' => 'Recently used',
+	'UI:Search:AddCriteria:List:MostPopular:Title' => 'Most popular',
+	'UI:Search:AddCriteria:List:Others:Title' => 'Others',
+	'UI:Search:AddCriteria:List:RecentlyUsed:Placeholder' => 'None yet.',
+
+	// - Criteria titles
+	//   - Default widget
+	'UI:Search:Criteria:Title:Default:Any' => '%1$s: Any',
+	'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty',
+	'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty',
+	'UI:Search:Criteria:Title:Default:Equals' => '%1$s equals %2$s',
+	'UI:Search:Criteria:Title:Default:Contains' => '%1$s contains %2$s',
+	'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s starts with %2$s',
+	'UI:Search:Criteria:Title:Default:EndsWith' => '%1$s ends with %2$s',
+	'UI:Search:Criteria:Title:Default:RegExp' => '%1$s matches %2$s',
+	'UI:Search:Criteria:Title:Default:GreaterThan' => '%1$s > %2$s',
+	'UI:Search:Criteria:Title:Default:GreaterThanOrEquals' => '%1$s >= %2$s',
+	'UI:Search:Criteria:Title:Default:LessThan' => '%1$s < %2$s',
+	'UI:Search:Criteria:Title:Default:LessThanOrEquals' => '%1$s <= %2$s',
+	'UI:Search:Criteria:Title:Default:Different' => '%1$s ≠ %2$s',
+	'UI:Search:Criteria:Title:Default:Between' => '%1$s between [%2$s]',
+	'UI:Search:Criteria:Title:Default:BetweenDates' => '%1$s [%2$s]',
+	'UI:Search:Criteria:Title:Default:BetweenDates:All' => '%1$s: Any',
+	'UI:Search:Criteria:Title:Default:BetweenDates:From' => '%1$s from %2$s',
+	'UI:Search:Criteria:Title:Default:BetweenDates:Until' => '%1$s until %2$s',
+	'UI:Search:Criteria:Title:Default:Between:All' => '%1$s: Any',
+	'UI:Search:Criteria:Title:Default:Between:From' => '%1$s from %2$s',
+	'UI:Search:Criteria:Title:Default:Between:Until' => '%1$s up to %2$s',
+	//   - Numeric widget
+	//   None yet
+	//   - DateTime widget
+	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
+	//   - Enum widget
+	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others',
+	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: Any',
+    //   - External key widget
+    'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s is defined',
+    'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s is not defined',
+    'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
+    'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
+    'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others',
+    'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: Any',
+    //   - Hierarchical key widget
+    'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s is defined',
+    'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s is not defined',
+    'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
+    'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
+    'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others',
+    'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any',
+
+	// - Criteria operators
+	//   - Default widget
+	'UI:Search:Criteria:Operator:Default:Empty' => 'Is empty',
+	'UI:Search:Criteria:Operator:Default:NotEmpty' => 'Is not empty',
+	'UI:Search:Criteria:Operator:Default:Equals' => 'Equals',
+	'UI:Search:Criteria:Operator:Default:Between' => 'Between',
+	//   - String widget
+	'UI:Search:Criteria:Operator:String:Contains' => 'Contains',
+	'UI:Search:Criteria:Operator:String:StartsWith' => 'Starts with',
+	'UI:Search:Criteria:Operator:String:EndsWith' => 'Ends with',
+	'UI:Search:Criteria:Operator:String:RegExp' => 'Regular exp.',
+	//   - Numeric widget
+	'UI:Search:Criteria:Operator:Numeric:Equals' => 'Equals',  // => '=',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThan' => 'Greater',  // => '>',
+	'UI:Search:Criteria:Operator:Numeric:GreaterThanOrEquals' => 'Greater / equals',  // > '>=',
+	'UI:Search:Criteria:Operator:Numeric:LessThan' => 'Less',  // => '<',
+	'UI:Search:Criteria:Operator:Numeric:LessThanOrEquals' => 'Less / equals',  // > '<=',
+	'UI:Search:Criteria:Operator:Numeric:Different' => 'Different',  // => '≠',
+
+	// - Other translations
+	'UI:Search:Value:Filter:Placeholder' => 'Filter...',
+	'UI:Search:Value:Search:Placeholder' => 'Search...',
+	'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.',
+	'UI:Search:Value:Autocomplete:Wait' => 'Please wait...',
+	'UI:Search:Value:Autocomplete:NoResult' => 'No result.',
+	'UI:Search:Value:Toggler:CheckAllNone' => 'Check all / none',
+	'UI:Search:Value:Toggler:CheckAllNoneFiltered' => 'Check all / none visibles',
+
+	// - Widget other translations
+	'UI:Search:Criteria:Numeric:From' => 'From',
+	'UI:Search:Criteria:Numeric:Until' => 'To',
+	'UI:Search:Criteria:Numeric:PlaceholderFrom' => 'Any',
+	'UI:Search:Criteria:Numeric:PlaceholderUntil' => 'Any',
+	'UI:Search:Criteria:DateTime:From' => 'From',
+	'UI:Search:Criteria:DateTime:FromTime' => 'From',
+	'UI:Search:Criteria:DateTime:Until' => 'until',
+	'UI:Search:Criteria:DateTime:UntilTime' => 'until',
+	'UI:Search:Criteria:DateTime:PlaceholderFrom' => 'Any date',
+	'UI:Search:Criteria:DateTime:PlaceholderFromTime' => 'Any date',
+	'UI:Search:Criteria:DateTime:PlaceholderUntil' => 'Any date',
+	'UI:Search:Criteria:DateTime:PlaceholderUntilTime' => 'Any date',
+	'UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint' => 'Children of the selected objects will be included.',
+
+	'UI:Search:Criteria:Raw:Filtered' => 'Filtered',
+	'UI:Search:Criteria:Raw:FilteredOn' => 'Filtered on %1$s',
+));
+
+//
+// Expression to Natural language
+//
+Dict::Add('EN US', 'English', 'English', array(
+	'Expression:Operator:AND' => ' AND ',
+	'Expression:Operator:OR' => ' OR ',
+
+	'Expression:Unit:Short:DAY' => 'd',
+	'Expression:Unit:Short:WEEK' => 'w',
+	'Expression:Unit:Short:MONTH' => 'm',
+	'Expression:Unit:Short:YEAR' => 'y',
+
+	'Expression:Unit:Long:DAY' => 'day(s)',
+	'Expression:Unit:Long:HOUR' => 'hour(s)',
+	'Expression:Unit:Long:MINUTE' => 'minute(s)',
+
+	'Expression:Verb:NOW' => 'now',
+));
diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php
index f98cd1dee..8ef95fd83 100644
--- a/dictionaries/fr.dictionary.itop.core.php
+++ b/dictionaries/fr.dictionary.itop.core.php
@@ -1,760 +1,760 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('FR FR', 'French', 'Français', array(
-	'Core:DeletedObjectTip' => 'L\'objet a été effacé le %1$s (%2$s)',
-	'Core:UnknownObjectLabel' => 'Classe: %1$s, Identifiant: %2$d',
-	'Core:UnknownObjectTip' => 'L\'objet n\'a pu être trouvé. Il se peut que les archives aient été purgées après son effacement.',
-
-	'Class:ActionEmail' => 'Notification par mél',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test',
-	'Class:ActionEmail/Attribute:test_recipient+' => '',
-	'Class:ActionEmail/Attribute:from' => 'De',
-	'Class:ActionEmail/Attribute:from+' => '',
-	'Class:ActionEmail/Attribute:reply_to' => 'Répondre à',
-	'Class:ActionEmail/Attribute:reply_to+' => '',
-	'Class:ActionEmail/Attribute:to' => 'A',
-	'Class:ActionEmail/Attribute:to+' => '',
-	'Class:ActionEmail/Attribute:cc' => 'Copie',
-	'Class:ActionEmail/Attribute:cc+' => '',
-	'Class:ActionEmail/Attribute:bcc' => 'Copie Cachée',
-	'Class:ActionEmail/Attribute:bcc+' => '',
-	'Class:ActionEmail/Attribute:subject' => 'Sujet',
-	'Class:ActionEmail/Attribute:subject+' => '',
-	'Class:ActionEmail/Attribute:body' => 'Message',
-	'Class:ActionEmail/Attribute:body+' => '',
-	'Class:ActionEmail/Attribute:importance' => 'Importance',
-	'Class:ActionEmail/Attribute:importance+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'Haute',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'Basse',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normale',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
-	'Class:TriggerOnPortalUpdate' => 'Déclencheur sur mise à jour depuis le portail',
-	'Class:TriggerOnPortalUpdate+' => '',
-	'Class:TriggerOnStateEnter' => 'Déclencheur sur un objet entrant dans un état',
-	'Class:TriggerOnStateEnter+' => '',
-	'Class:TriggerOnStateLeave' => 'Déclencheur sur un objet quittant un état',
-	'Class:TriggerOnStateLeave+' => '',
-	'Class:TriggerOnObjectCreate' => 'Déclencheur sur la création d\'un objet',
-	'Class:TriggerOnObjectCreate+' => '',
-	'Class:lnkTriggerAction' => 'Actions-Déclencheur',
-	'Class:lnkTriggerAction+' => '',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Action',
-	'Class:lnkTriggerAction/Attribute:action_id+' => '',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Nom de l\'action',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Déclencheur',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Nom du déclencheur',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Ordre',
-	'Class:lnkTriggerAction/Attribute:order+' => '',
-	'Class:AsyncSendEmail' => 'Envoi d\'Email Asynchrone',
-	'Class:AsyncSendEmail+' => '',
-	'Class:AsyncSendEmail/Attribute:to' => 'A',
-	'Class:AsyncSendEmail/Attribute:to+' => '',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Sujet',
-	'Class:AsyncSendEmail/Attribute:subject+' => '',
-	'Class:AsyncSendEmail/Attribute:body' => 'Message',
-	'Class:AsyncSendEmail/Attribute:body+' => '',
-	'Class:AsyncSendEmail/Attribute:header' => 'En-tête',
-	'Class:AsyncSendEmail/Attribute:header+' => '',
-	'Class:CMDBChange' => 'Modification',
-	'Class:CMDBChange+' => '',
-	'Class:CMDBChange/Attribute:date' => 'Date',
-	'Class:CMDBChange/Attribute:date+' => '',
-	'Class:CMDBChange/Attribute:userinfo' => 'Autres informations',
-	'Class:CMDBChange/Attribute:userinfo+' => '',
-	'Class:CMDBChangeOp' => 'Operation de changement',
-	'Class:CMDBChangeOp+' => '',
-	'Class:CMDBChangeOp/Attribute:change' => 'Modification',
-	'Class:CMDBChangeOp/Attribute:change+' => '',
-	'Class:CMDBChangeOp/Attribute:date' => 'Date',
-	'Class:CMDBChangeOp/Attribute:date+' => '',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'Utilisateur',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'Type d\'objet',
-	'Class:CMDBChangeOp/Attribute:objclass+' => '',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'Clé',
-	'Class:CMDBChangeOp/Attribute:objkey+' => '',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'Type',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Nom de la classe instanciable',
-	'Class:CMDBChangeOpCreate' => 'Création de l\'objet',
-	'Class:CMDBChangeOpCreate+' => '',
-	'Class:CMDBChangeOpDelete' => 'Effacement de l\'objet',
-	'Class:CMDBChangeOpDelete+' => '',
-	'Class:CMDBChangeOpSetAttribute' => 'Modification de l\'objet',
-	'Class:CMDBChangeOpSetAttribute+' => '',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Champ',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar' => 'Modification de valeur',
-	'Class:CMDBChangeOpSetAttributeScalar+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Ancienne valeur',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Nouvelle valeur',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
-	'Class:CMDBChangeOpSetAttributeBlob' => 'Modification de données',
-	'Class:CMDBChangeOpSetAttributeBlob+' => '',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Ancienne valeur',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Mot de passe chiffré',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword+' => '',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Ancien mot de passe',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd+' => '',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Champ chiffré',
-	'Class:CMDBChangeOpSetAttributeEncrypted+' => '',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Ancienne valeur',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring+' => '',
-	'Class:CMDBChangeOpSetAttributeText' => 'Modification de texte',
-	'Class:CMDBChangeOpSetAttributeText+' => '',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Ancienne valeur',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Archive de journal',
-	'Class:CMDBChangeOpSetAttributeCaseLog+' => '',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Dernière entrée',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry+' => '',
-	'Class:Event' => 'Evènement',
-	'Class:Event+' => '',
-	'Class:Event/Attribute:message' => 'Message',
-	'Class:Event/Attribute:message+' => '',
-	'Class:Event/Attribute:date' => 'Date',
-	'Class:Event/Attribute:date+' => '',
-	'Class:Event/Attribute:userinfo' => 'Utilisateur',
-	'Class:Event/Attribute:userinfo+' => '',
-	'Class:Event/Attribute:finalclass' => 'Sous-classe d\'Evènement',
-	'Class:Event/Attribute:finalclass+' => 'Nom de la classe instanciable',
-	'Class:EventNotification' => 'Notification',
-	'Class:EventNotification+' => '',
-	'Class:EventNotification/Attribute:trigger_id' => 'Déclencheur',
-	'Class:EventNotification/Attribute:trigger_id+' => '',
-	'Class:EventNotification/Attribute:action_id' => 'Action',
-	'Class:EventNotification/Attribute:action_id+' => '',
-	'Class:EventNotification/Attribute:object_id' => 'Objet',
-	'Class:EventNotification/Attribute:object_id+' => '',
-	'Class:EventNotificationEmail' => 'Envoi d\'Email',
-	'Class:EventNotificationEmail+' => '',
-	'Class:EventNotificationEmail/Attribute:to' => 'A',
-	'Class:EventNotificationEmail/Attribute:to+' => '',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => '',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:bcc+' => '',
-	'Class:EventNotificationEmail/Attribute:from' => 'De',
-	'Class:EventNotificationEmail/Attribute:from+' => '',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Sujet',
-	'Class:EventNotificationEmail/Attribute:subject+' => '',
-	'Class:EventNotificationEmail/Attribute:body' => 'Message',
-	'Class:EventNotificationEmail/Attribute:body+' => '',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Pièces jointes',
-	'Class:EventNotificationEmail/Attribute:attachments+' => '',
-	'Class:EventIssue' => 'Erreur',
-	'Class:EventIssue+' => '',
-	'Class:EventIssue/Attribute:issue' => 'Erreur',
-	'Class:EventIssue/Attribute:issue+' => '',
-	'Class:EventIssue/Attribute:impact' => 'Impact',
-	'Class:EventIssue/Attribute:impact+' => '',
-	'Class:EventIssue/Attribute:page' => 'Page Web',
-	'Class:EventIssue/Attribute:page+' => '',
-	'Class:EventIssue/Attribute:arguments_post' => 'Arguments (POST)',
-	'Class:EventIssue/Attribute:arguments_post+' => '',
-	'Class:EventIssue/Attribute:arguments_get' => 'Arguments (GET)',
-	'Class:EventIssue/Attribute:arguments_get+' => '',
-	'Class:EventIssue/Attribute:callstack' => 'Pile d\'appel',
-	'Class:EventIssue/Attribute:callstack+' => '',
-	'Class:EventIssue/Attribute:data' => 'Données',
-	'Class:EventIssue/Attribute:data+' => '',
-	'Class:EventWebService' => 'Appel de webservice',
-	'Class:EventWebService+' => '',
-	'Class:EventWebService/Attribute:verb' => 'Verbe',
-	'Class:EventWebService/Attribute:verb+' => '',
-	'Class:EventWebService/Attribute:result' => 'Résultat',
-	'Class:EventWebService/Attribute:result+' => '',
-	'Class:EventWebService/Attribute:log_info' => 'Informations',
-	'Class:EventWebService/Attribute:log_info+' => '',
-	'Class:EventWebService/Attribute:log_warning' => 'Avertissement',
-	'Class:EventWebService/Attribute:log_warning+' => '',
-	'Class:EventWebService/Attribute:log_error' => 'Erreurs',
-	'Class:EventWebService/Attribute:log_error+' => '',
-	'Class:EventWebService/Attribute:data' => 'Données',
-	'Class:EventWebService/Attribute:data+' => '',
-	'Class:EventRestService' => 'Appel REST/JSON',
-	'Class:EventRestService+' => 'Trace de l\'appel au service REST/JSON (rest.php)',
-	'Class:EventRestService/Attribute:operation' => 'Opération',
-	'Class:EventRestService/Attribute:operation+' => 'Paramètre \'opération\'',
-	'Class:EventRestService/Attribute:version' => 'Version',
-	'Class:EventRestService/Attribute:version+' => 'Paramètre \'version\'',
-	'Class:EventRestService/Attribute:json_input' => 'Données d\'entrée',
-	'Class:EventRestService/Attribute:json_input+' => 'Paramètre \'json_data\'',
-	'Class:EventRestService/Attribute:code' => 'Code',
-	'Class:EventRestService/Attribute:code+' => 'Code de retour',
-	'Class:EventRestService/Attribute:json_output' => 'Réponse',
-	'Class:EventRestService/Attribute:json_output+' => 'Réponse HTTP (structure json)',
-	'Class:EventRestService/Attribute:provider' => 'Fournisseur',
-	'Class:EventRestService/Attribute:provider+' => 'Classe PHP qui a pris en charge l\'opération demandée',
-	'Class:EventLoginUsage' => 'Utilisation de l\'application',
-	'Class:EventLoginUsage+' => '',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
-	'Class:EventLoginUsage/Attribute:user_id+' => '',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'Nom de l\'utilisateur',
-	'Class:EventLoginUsage/Attribute:contact_name+' => '',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'Email',
-	'Class:EventLoginUsage/Attribute:contact_email+' => '',
-	'Class:SynchroDataSource' => 'Source de données',
-	'Class:SynchroDataSource+' => '',
-	'Class:SynchroDataSource/Attribute:name' => 'Nom',
-	'Class:SynchroDataSource/Attribute:name+' => '',
-	'Class:SynchroDataSource/Attribute:description' => 'Description',
-	'Class:SynchroDataSource/Attribute:description+' => '',
-	'Class:SynchroDataSource/Attribute:status' => 'Etat',
-	'Class:SynchroDataSource/Attribute:status+' => '',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implémentation',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation+' => '',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete+' => '',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production',
-	'Class:SynchroDataSource/Attribute:status/Value:production+' => '',
-	'Class:SynchroDataSource/Attribute:user_id' => 'Utilisateur',
-	'Class:SynchroDataSource/Attribute:user_id+' => 'Seul cet utilisateur (et les administrateurs) peuvent exécuter cette synchronisation',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact à notifier',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact à notifier en cas d\'erreur',
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Type cible',
-	'Class:SynchroDataSource/Attribute:scope_class+' => 'Type d\'objets à synchroniser',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restriction',
-	'Class:SynchroDataSource/Attribute:scope_restriction+' => '',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Obsolescence après',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Un objet est considéré comme obsolète s\'il n\'apparaît pas dans les données au delà de cette durée',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Politique de recherche',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utiliser les champs',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes+' => '',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utiliser la clé primaire',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action si zéro',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Créer',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erreur',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action si un',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erreur',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Mettre à jour',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action si plusieurs',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Créer',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erreur',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendre le premier',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politique d\'effacement',
-	'Class:SynchroDataSource/Attribute:delete_policy+' => 'Façon dont sont traités les objets obsolètes',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Effacer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Mettre à jour',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Mettre à jour puis effacer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Mise à jour',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Format: nom_de_champ:valeur; ...',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Durée de rétention',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Si la politique est \'Mettre à jour puis effacer\', les objets obsolètes sont encore conservés pendant cette durée avant d\'être effacés',
-
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Liste des champs',
-	'Class:SynchroDataSource/Attribute:attribute_list+' => '',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utilisateurs autorisés',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Quels utilisateurs sont autorisés à effacer des objets synchronisés',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Seulement les administrateurs',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators+' => '',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tous les utilisateurs autorisés',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody+' => '',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Personne',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody+' => '',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icône (hyperlien)',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlien vers une icône représentant l\'application source des données',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Application (hyperlien)',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Un hyperlien vers l\'application source des données. Paramètres possibles: $this->nom_de_champ$ et $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Table de données',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nom de la table stockant les données de cette source. Un nom par défaut est calculé automatiquement si ce champ est laissé vide.',
-	'Class:SynchroAttribute' => 'Champs de synchronisation',
-	'Class:SynchroAttribute+' => '',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Source de données',
-	'Class:SynchroAttribute/Attribute:sync_source_id+' => '',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Champ',
-	'Class:SynchroAttribute/Attribute:attcode+' => '',
-	'Class:SynchroAttribute/Attribute:update' => 'Mise à jour',
-	'Class:SynchroAttribute/Attribute:update+' => '',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Recherche',
-	'Class:SynchroAttribute/Attribute:reconcile+' => '',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Politique de mise à jour',
-	'Class:SynchroAttribute/Attribute:update_policy+' => '',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Maître (verrouillé)',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked+' => '',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Maître (non-verrouillé)',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked+' => '',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Ecrire si le champ est vide',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty+' => '',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Type',
-	'Class:SynchroAttribute/Attribute:finalclass+' => 'Nom de la classe instanciable',
-	'Class:SynchroAttExtKey' => 'Synchro Clé Externe',
-	'Class:SynchroAttExtKey+' => '',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Champ',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode+' => '',
-	'Class:SynchroAttLinkSet' => 'Synchro Linkset',
-	'Class:SynchroAttLinkSet+' => '',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Séparateur de colonnes',
-	'Class:SynchroAttLinkSet/Attribute:row_separator+' => '',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Séparateur de champs',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator+' => '',
-	'Class:SynchroLog' => 'Journal de Synchro',
-	'Class:SynchroLog+' => '',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Source de données',
-	'Class:SynchroLog/Attribute:sync_source_id+' => '',
-	'Class:SynchroLog/Attribute:start_date' => 'Date/heure de début',
-	'Class:SynchroLog/Attribute:start_date+' => '',
-	'Class:SynchroLog/Attribute:end_date' => 'Date/heure de fin',
-	'Class:SynchroLog/Attribute:end_date+' => '',
-	'Class:SynchroLog/Attribute:status' => 'Etat',
-	'Class:SynchroLog/Attribute:status+' => '',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Terminé Ok',
-	'Class:SynchroLog/Attribute:status/Value:completed+' => '',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Erreur',
-	'Class:SynchroLog/Attribute:status/Value:error+' => '',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'En cours',
-	'Class:SynchroLog/Attribute:status/Value:running+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb de réplicas vus',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb total de réplicas',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb d\'objets effacés',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb d\'erreurs lors de l\'effacement',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb d\'objets obsolètés',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb d\'erreurs lors de l\'obsolescence',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb d\'objets créés',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb d\'erreurs lors de la création',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb d\'objets mis à jour',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb d\erreurs lors de la mise à jour',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb d\'erreurs lors de la réconciliation',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb d\'objets disparus',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb d\'objets (nouveaux) mis à jour',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated+' => '',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb d\'objets (nouveaux) inchangés',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged+' => '',
-	'Class:SynchroLog/Attribute:last_error' => 'Dernière erreur',
-	'Class:SynchroLog/Attribute:last_error+' => '',
-	'Class:SynchroLog/Attribute:traces' => 'Traces',
-	'Class:SynchroLog/Attribute:traces+' => '',
-	'Class:SynchroReplica' => 'Réplica de Synchronisation',
-	'Class:SynchroReplica+' => '',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Source de données',
-	'Class:SynchroReplica/Attribute:sync_source_id+' => '',
-	'Class:SynchroReplica/Attribute:base_class' => 'Type de base',
-	'Class:SynchroReplica/Attribute:base_class+' => '',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Objet destination',
-	'Class:SynchroReplica/Attribute:dest_id+' => '',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Type de l\'objet',
-	'Class:SynchroReplica/Attribute:dest_class+' => '',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Dernière détection',
-	'Class:SynchroReplica/Attribute:status_last_seen+' => '',
-	'Class:SynchroReplica/Attribute:status' => 'Etat',
-	'Class:SynchroReplica/Attribute:status+' => '',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modifié',
-	'Class:SynchroReplica/Attribute:status/Value:modified+' => '',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nouveau',
-	'Class:SynchroReplica/Attribute:status/Value:new+' => '',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete+' => '',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphelin',
-	'Class:SynchroReplica/Attribute:status/Value:orphan+' => '',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronisé',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized+' => '',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Créé par la source ?',
-	'Class:SynchroReplica/Attribute:status_dest_creator+' => '',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Dernière erreur',
-	'Class:SynchroReplica/Attribute:status_last_error+' => '',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Avertissements',
-	'Class:SynchroReplica/Attribute:status_last_warning+' => '',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Date de création',
-	'Class:SynchroReplica/Attribute:info_creation_date+' => '',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Date de dernière modification',
-	'Class:SynchroReplica/Attribute:info_last_modified+' => '',
-	'Class:appUserPreferences' => 'Préférences utilisateur',
-	'Class:appUserPreferences+' => '',
-	'Class:appUserPreferences/Attribute:userid' => 'Utilisateur',
-	'Class:appUserPreferences/Attribute:userid+' => '',
-	'Class:appUserPreferences/Attribute:preferences' => 'Préférences',
-	'Class:appUserPreferences/Attribute:preferences+' => '',
-	'Core:AttributeLinkedSet' => 'Objets liés (1-n)',
-	'Core:AttributeLinkedSet+' => 'Liste d\'objets d\'une classe donnée et pointant sur l\'objet courant',
-	'Core:AttributeLinkedSetIndirect' => 'Objets liés (1-n)',
-	'Core:AttributeLinkedSetIndirect+' => 'Liste d\'objets d\'une classe donnée et liés à l\'objet courant via une classe intermédiaire',
-	'Core:AttributeInteger' => 'Nombre entier',
-	'Core:AttributeInteger+' => 'Valeur numérique entière',
-	'Core:AttributeDecimal' => 'Nombre décimal',
-	'Core:AttributeDecimal+' => 'Valeur numérique décimale',
-	'Core:AttributeBoolean' => 'Booléen',
-	'Core:AttributeBoolean+' => 'Booléen',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Oui',
-	'Core:AttributeBoolean/Value:no' => 'Non',
-	'Core:AttributeArchiveFlag' => 'Drapeau Archive',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Oui',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'Cet object n\'est visible que dans le mode Archive',
-	'Core:AttributeArchiveFlag/Value:no' => 'Non',
-	'Core:AttributeArchiveFlag/Label' => 'Archivé',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Date archivage',
-	'Core:AttributeArchiveDate/Label+' => '',
-	'Core:AttributeObsolescenceFlag' => 'Drapeau Obsolète',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Oui',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Cet objet est exclus de l\'analyse d\'impact, et n\'est pas affiché dans les résultats de recherche',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'Non',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolète',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Calculé dynamiquement en fonction d\'autres attributs de l\'objet',
-	'Core:AttributeObsolescenceDate/Label' => 'Date d\'obsolescence',
-	'Core:AttributeObsolescenceDate/Label+' => 'Date approximative du jour où l\'objet est devenu obsolète',
-
-	'Core:AttributeString' => 'Chaîne de caractères',
-	'Core:AttributeString+' => 'Chaîne de caractères (limitée à une ligne)',
-	'Core:AttributeClass' => 'Classe',
-	'Core:AttributeClass+' => 'Classe d\'objets',
-	'Core:AttributeApplicationLanguage' => 'Langue',
-	'Core:AttributeApplicationLanguage+' => 'Codes langue et pays (EN US)',
-	'Core:AttributeFinalClass' => 'Classe',
-	'Core:AttributeFinalClass+' => 'Classe réelle de l\'objet (attribut créé automatiquement)',
-	'Core:AttributePassword' => 'Mot de passe',
-	'Core:AttributePassword+' => 'Mot de passe qui peut être lu en clair',
-	'Core:AttributeEncryptedString' => 'Chaîne encryptée',
-	'Core:AttributeEncryptedString+' => 'Chaîne encryptée avec une clé locale',
-	'Core:AttributeText' => 'Texte',
-	'Core:AttributeText+' => 'Chaîne de caractères de plusieurs lignes',
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => 'Texte formaté en HTML',
-	'Core:AttributeEmailAddress' => 'Adresse électronique',
-	'Core:AttributeEmailAddress+' => 'Adresse électronique (xxxx@yyy.zzz)',
-	'Core:AttributeIPAddress' => 'Adresse IP',
-	'Core:AttributeIPAddress+' => 'Adresse IP',
-	'Core:AttributeOQL' => 'Expression OQL',
-	'Core:AttributeOQL+' => 'Expression formattée en "Object Query Language"',
-	'Core:AttributeEnum' => 'Enumération',
-	'Core:AttributeEnum+' => 'Valeur choisie parmi un liste de chaîne de caractères',
-	'Core:AttributeTemplateString' => 'Modèle de chaîne de caractères',
-	'Core:AttributeTemplateString+' => 'Chaîne de caractères d\'une ligne, contenant des espaces réservés pour des données iTop',
-	'Core:AttributeTemplateText' => 'Modèle de texte',
-	'Core:AttributeTemplateText+' => 'Texte contenant des espaces réservés pour des données iTop',
-	'Core:AttributeTemplateHTML' => 'Modèle HTML',
-	'Core:AttributeTemplateHTML+' => 'HTML contenant des espaces réservés pour des données iTop',
-	'Core:AttributeDateTime' => 'Date/heure',
-	'Core:AttributeDateTime+' => 'Date et heure (année-mois-jour hh:mm:ss)',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Format de date :<br/>
-	<b>%1$s</b><br/>
-	Exemple : %2$s
-</p>
-<p>
-Opérateurs :<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-Si l\'heure n\'est pas spécifiée, cela revient à 00:00:00 (minuit)
-</p>',
-	'Core:AttributeDate' => 'Date',
-	'Core:AttributeDate+' => 'Date (année-mois-jour)',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Format de date :<br/>
-	<b>%1$s</b><br/>
-	Exemple : %2$s
-</p>
-<p>
-Opérateurs :<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>',
-	'Core:AttributeDeadline' => 'Délai',
-	'Core:AttributeDeadline+' => 'Date/heure exprimée relativement à l\'heure courante',
-	'Core:AttributeExternalKey' => 'Clé externe',
-	'Core:AttributeExternalKey+' => 'Clé externe',
-	'Core:AttributeHierarchicalKey' => 'Clé externe (hiérarchie)',
-	'Core:AttributeHierarchicalKey+' => 'Clé externe vers le parent',
-	'Core:AttributeExternalField' => 'Attribut externe',
-	'Core:AttributeExternalField+' => 'Copie de la valeur d\'un attribut de l\'objet lié par une clé externe',
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => 'URL absolue ou relative',
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => 'Contenu binaire (document)',
-	'Core:AttributeOneWayPassword' => 'Mot de passe "one way"',
-	'Core:AttributeOneWayPassword+' => 'Mot de passe qui peut être vérifié mais jamais lu en clair',
-	'Core:AttributeTable' => 'Table',
-	'Core:AttributeTable+' => 'Tableau à deux dimensions',
-	'Core:AttributePropertySet' => 'Propriétés',
-	'Core:AttributePropertySet+' => 'Liste de propriétés (nom et valeur) non typées',
-
-	'Core:AttributeFriendlyName' => 'Nom usuel (convivial)',
-	'Core:AttributeFriendlyName+' => 'Attribut créé automatiquement ; sa valeur est calculée d\'après d\'autres attributs',
-
-	'Core:FriendlyName-Label' => 'Nom complet',
-	'Core:FriendlyName-Description' => 'Nom complet',
-
-	'Change:ObjectCreated' => 'Elément créé',
-	'Change:ObjectDeleted' => 'Elément effacé',
-	'Change:ObjectModified' => 'Elément modifié',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s modifié en %2$s (ancienne valeur: %3$s)',
-	'Change:AttName_SetTo' => '%1$s modifié en %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s ajouté à %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modifié, ancienne valeur: %2$s',
-	'Change:AttName_Changed' => '%1$s modifié',
-	'Change:AttName_EntryAdded' => '%1$s champ modifié, une nouvelle entrée a été ajoutée: %2$s',
-	'Change:LinkSet:Added' => 'ajout de %1$s',
-	'Change:LinkSet:Removed' => 'suppression de %1$s',
-	'Change:LinkSet:Modified' => 'modification de %1$s',
-	'Class:Action' => 'Action',
-	'Class:Action+' => 'Action spécifique',
-	'Class:Action/Attribute:name' => 'Nom',
-	'Class:Action/Attribute:name+' => 'Label',
-	'Class:Action/Attribute:description' => 'Description',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Etat',
-	'Class:Action/Attribute:status+' => '',
-	'Class:Action/Attribute:status/Value:test' => 'En test',
-	'Class:Action/Attribute:status/Value:test+' => '',
-	'Class:Action/Attribute:status/Value:enabled' => 'En production',
-	'Class:Action/Attribute:status/Value:enabled+' => '',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
-	'Class:Action/Attribute:status/Value:disabled+' => '',
-	'Class:Action/Attribute:trigger_list' => 'Déclencheurs liés',
-	'Class:Action/Attribute:trigger_list+' => '',
-	'Class:Action/Attribute:finalclass' => 'Sous-classe d\'Action',
-	'Class:Action/Attribute:finalclass+' => 'Nom de la classe instanciable',
-	'Class:ActionNotification' => 'notification',
-	'Class:ActionNotification+' => '',
-	'Class:Trigger' => 'Déclencheur',
-	'Class:Trigger+' => '',
-	'Class:Trigger/Attribute:description' => 'Description',
-	'Class:Trigger/Attribute:description+' => '',
-	'Class:Trigger/Attribute:action_list' => 'Actions déclenchées',
-	'Class:Trigger/Attribute:action_list+' => '',
-	'Class:Trigger/Attribute:finalclass' => 'Sous-classe de Déclencheur',
-	'Class:Trigger/Attribute:finalclass+' => 'Nom de la classe instanciable',
-	'Class:TriggerOnObject' => 'Déclencheur sur modification de données',
-	'Class:TriggerOnObject+' => '',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Classe cible',
-	'Class:TriggerOnObject/Attribute:target_class+' => 'label',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filtre',
-	'Class:TriggerOnObject/Attribute:filter+' => '',
-	'TriggerOnObject:WrongFilterQuery' => 'Requête de filtrage incorrecte: %1$s',
-	'TriggerOnObject:WrongFilterClass' => 'La requête de filtrage doit retourner des objets de la classe "%1$s"',
-	'Class:TriggerOnStateChange' => 'Déclencheur sur changement d\'état',
-	'Class:TriggerOnStateChange+' => '',
-	'Class:TriggerOnStateChange/Attribute:state' => 'Etat',
-	'Class:TriggerOnStateChange/Attribute:state+' => 'label',
-	'Class:TriggerOnThresholdReached' => 'Déclencheur sur dépassement de seuil',
-	'Class:TriggerOnThresholdReached+' => 'Déclencheur sur franchissement de seuil d\'un chronomètre',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Chronomètre',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Seuil',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Personne',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Uniquement les administrateurs',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tous les utilisateurs autorisés',
-	'SynchroDataSource:Description' => 'Description',
-	'SynchroDataSource:Reconciliation' => 'Recherche et réconciliation',
-	'SynchroDataSource:Deletion' => 'Règles d\'effacement',
-	'SynchroDataSource:Status' => 'Etat',
-	'SynchroDataSource:Information' => 'Information',
-	'SynchroDataSource:Definition' => 'Définition',
-	'Core:SynchroAttributes' => 'Champs',
-	'Core:SynchroStatus' => 'Etat',
-	'Core:Synchro:ErrorsLabel' => 'Erreurs',
-	'Core:Synchro:CreatedLabel' => 'Créations',
-	'Core:Synchro:ModifiedLabel' => 'Modifications',
-	'Core:Synchro:UnchangedLabel' => 'Sans changement',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Erreurs',
-	'Core:Synchro:ReconciledLabel' => 'Trouvés',
-	'Core:Synchro:ReconciledNewLabel' => 'Créations',
-	'Core:SynchroReconcile:Yes' => 'Oui',
-	'Core:SynchroReconcile:No' => 'Non',
-	'Core:SynchroUpdate:Yes' => 'Oui',
-	'Core:SynchroUpdate:No' => 'Non',
-	'Core:Synchro:LastestStatus' => 'Dernier état',
-	'Core:Synchro:History' => 'Historique de synchronisation',
-	'Core:Synchro:NeverRun' => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
-	'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à %1$s)',
-	'Menu:DataSources' => 'Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Core:Synchro:label_repl_ignored' => 'Ignorés (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Disparus (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Existants (%1$s)',
-	'Core:Synchro:label_repl_new' => 'Nouveau (%1$s)',
-	'Core:Synchro:label_obj_deleted' => 'Effacés (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Obsoletés (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Erreurs (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'Aucune action (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Sans changement (%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Mis à jour (%1$s)',
-	'Core:Synchro:label_obj_updated_errors' => 'Erreurs (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Sans changement (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Mis à jour (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Créations (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Erreurs (%1$s)',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica traités: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Si la politique de réconciliation n\'est pas la clé primaire, au moins une clé de recherche doit être spécifiée',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Pour que les objets soient effacés après avoir été obsoletés, il faut spécifier une durée de rétention',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Les objets obsolètes doivent être mis à jour, mais aucune information de mise à jour n\'est spécifiée',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'La table %1$s existe déjà dans la base de données. Veuillez utiliser un autre nom pour la table des données de cette source.',
-	'Core:SynchroReplica:PublicData' => 'Données synchronisées',
-	'Core:SynchroReplica:PrivateDetails' => 'Informations internes',
-	'Core:SynchroReplica:BackToDataSource' => 'Retourner aux détails de la source de données: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'Liste des réplica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (clé primaire)',
-	'Core:SynchroAtt:attcode' => 'Champ',
-	'Core:SynchroAtt:attcode+' => '',
-	'Core:SynchroAtt:reconciliation' => 'Réconciliation ?',
-	'Core:SynchroAtt:reconciliation+' => '',
-	'Core:SynchroAtt:update' => 'Mise  jour ?',
-	'Core:SynchroAtt:update+' => '',
-	'Core:SynchroAtt:update_policy' => 'Politique de mise à jour',
-	'Core:SynchroAtt:update_policy+' => '',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Clé de recherche',
-	'Core:SynchroAtt:reconciliation_attcode+' => '',
-	'Core:SyncDataExchangeComment' => '(Synchronisation)',
-	'Core:Synchro:ListOfDataSources' => 'Sources de données:',
-	'Core:Synchro:LastSynchro' => 'Dernière synchronisation:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'Cet objet est synchronisé avec une source de données',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Cet objet a été <b>créé</b> par la source de données %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Cet objet <b>peut être effacé/b> par la source de données %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Vous <b>ne pouvez pas effacer</b> cet objet car il est géré par le source de données %1$s',
-	'TitleSynchroExecution' => 'Exécution de la synchronisation',
-	'Class:SynchroDataSource:DataTable' => 'Table contenant les données: %1$s',
-	'Core:SyncDataSourceObsolete' => 'Cette source de données est obsolète. Opération annulée.',
-	'Core:SyncDataSourceAccessRestriction' => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
-	'Core:SyncTooManyMissingReplicas' => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s).',
-	'Core:SynchroReplica:TargetObject' => 'Objet Synchronisé : %1$s',
-	'Core:Duration_Seconds' => '%1$ds',
-	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sj %2$dh %3$dmin %4$ds',
-	'Core:ExplainWTC:ElapsedTime' => 'Temps écoulé (enregistré dans "%1$s")',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Temps écoulé pour "%1$s"',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Date/heure de butée pour "%1$s" à %2$d%%',
-	
-	'Core:BulkExport:MissingParameter_Param' => 'Il manque le paramètre "%1$s"',
-	'Core:BulkExport:InvalidParameter_Query' => 'Valeur incorrecte pour le paramètre "query". Il n\'existe aucune entrée dans le livre des requêtes pour l\'identifiant: "%1$s"',
-	'Core:BulkExport:ExportFormatPrompt' => 'Format d\'export:',
-	'Core:BulkExportOf_Class' => 'Export de %1$s',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Cliquez ici pour télécharger %1$s',
-	'Core:BulkExport:ExportResult' => 'Résultat de l\'export:',
-	'Core:BulkExport:RetrievingData' => 'Récupération des données...',
-	'Core:BulkExport:HTMLFormat' => 'Page Web (*.html)',
-	'Core:BulkExport:CSVFormat' => 'Fichier CSV (*.csv)',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 ou plus récent (*.xlsx)',
-	'Core:BulkExport:PDFFormat' => 'Document PDF (*.pdf)',
-	'Core:BulkExport:DragAndDropHelp' => 'Faites glisser les en-têtes des colonnes pour modifier leur ordre. Aperçu de %1$s lignes sur un total de %2$s lignes à exporter.',
-	'Core:BulkExport:EmptyPreview' => 'Selectionnez les colonnes à exporter dans la liste ci-dessus...',
-	'Core:BulkExport:ColumnsOrder' => 'Ordre des colonnes',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Colonnes de la classe %1$s',
-	'Core:BulkExport:NoFieldSelected' => 'Veuillez sélectionner au moins une colonne à exporter',
-	'Core:BulkExport:CheckAll' => 'Tout cocher',
-	'Core:BulkExport:UncheckAll' => 'Tout décocher',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export annulé par l\'utilisateur',
-	
-	'Core:BulkExport:CSVOptions' => 'Options du format CSV',
-	'Core:BulkExport:CSVLocalization' => 'Traduction',
-	'Core:BulkExport:PDFOptions' => 'Options du format PDF',
-	'Core:BulkExport:PDFPageFormat' => 'Format de page',
-	'Core:BulkExport:PDFPageSize' => 'Taille de page:',
-	'Core:BulkExport:PageSize-A4' => 'A4',
-	'Core:BulkExport:PageSize-A3' => 'A3',
-	'Core:BulkExport:PageSize-Letter' => 'Lettre (US)',
-	'Core:BulkExport:PDFPageOrientation' => 'Orientation de la page:',
-	'Core:BulkExport:PageOrientation-L' => 'Paysage',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait',
-	'Core:BulkExport:XMLFormat' => 'Fichier XML (*.xml)',
-	'Core:BulkExport:XMLOptions' => 'Options XML',
-	'Core:BulkExport:SpreadsheetFormat' => 'Format HTML pour Excel (*.html)',
-	'Core:BulkExport:SpreadsheetOptions' => 'Options du format HTML pour Excel',
-	'Core:BulkExport:OptionNoLocalize' => 'Ne pas traduire les valeurs (pour les champs de type "Enum")',
-	'Core:BulkExport:OptionLinkSets' => 'Inclure les objets liés',
-	'Core:BulkExport:OptionFormattedText' => 'Préserver le formatage du texte',
-	'Core:BulkExport:ScopeDefinition' => 'Définition des objets à exporter',
-	'Core:BulkExportLabelOQLExpression' => 'Requête OQL:',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Entrée du livre des requêtes:',
-	'Core:BulkExportMessageEmptyOQL' => 'Veuillez saisir une requête OQL valide.',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Veuillez sélectionner une entrée dans le livre des requêtes.',
-	'Core:BulkExportQueryPlaceholder' => 'Saisissez une requête OQL...',
-	'Core:BulkExportCanRunNonInteractive' => 'Cliquez ici pour exécuter l\'export en mode non-interactif.',
-	'Core:BulkExportLegacyExport' => 'Cliquez ici pour exécuter l\'ancienne version de l\'export.',
-	'Core:BulkExport:XLSXOptions' => 'Options du format Excel',
-	'Core:BulkExport:TextFormat' => 'Champs texte contenant des balises HTML',
-	'Core:BulkExport:DateTimeFormat' => 'Format de date et heure',
-	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Format par défaut (%1$s), ex. %2$s',
-	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Format spécial: %1$s',
-	'Core:DateTime:Placeholder_d' => 'JJ', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'J', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
-	'Core:DeletedObjectLabel' => '%1s (effacé)',
-	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
-	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
-	'Core:Validator:Default' => 'Format incorrect',
-	'Core:Validator:Mandatory' => 'Veuillez remplir ce champ',
-	'Core:Validator:MustBeInteger' => 'Ce champ ne peut contenir qu\'un nombre entier',
-	'Core:Validator:MustSelectOne' => 'Veuillez choisir une valeur',
-));
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('FR FR', 'French', 'Français', array(
+	'Core:DeletedObjectTip' => 'L\'objet a été effacé le %1$s (%2$s)',
+	'Core:UnknownObjectLabel' => 'Classe: %1$s, Identifiant: %2$d',
+	'Core:UnknownObjectTip' => 'L\'objet n\'a pu être trouvé. Il se peut que les archives aient été purgées après son effacement.',
+
+	'Class:ActionEmail' => 'Notification par mél',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test',
+	'Class:ActionEmail/Attribute:test_recipient+' => '',
+	'Class:ActionEmail/Attribute:from' => 'De',
+	'Class:ActionEmail/Attribute:from+' => '',
+	'Class:ActionEmail/Attribute:reply_to' => 'Répondre à',
+	'Class:ActionEmail/Attribute:reply_to+' => '',
+	'Class:ActionEmail/Attribute:to' => 'A',
+	'Class:ActionEmail/Attribute:to+' => '',
+	'Class:ActionEmail/Attribute:cc' => 'Copie',
+	'Class:ActionEmail/Attribute:cc+' => '',
+	'Class:ActionEmail/Attribute:bcc' => 'Copie Cachée',
+	'Class:ActionEmail/Attribute:bcc+' => '',
+	'Class:ActionEmail/Attribute:subject' => 'Sujet',
+	'Class:ActionEmail/Attribute:subject+' => '',
+	'Class:ActionEmail/Attribute:body' => 'Message',
+	'Class:ActionEmail/Attribute:body+' => '',
+	'Class:ActionEmail/Attribute:importance' => 'Importance',
+	'Class:ActionEmail/Attribute:importance+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'Haute',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'Basse',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normale',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
+	'Class:TriggerOnPortalUpdate' => 'Déclencheur sur mise à jour depuis le portail',
+	'Class:TriggerOnPortalUpdate+' => '',
+	'Class:TriggerOnStateEnter' => 'Déclencheur sur un objet entrant dans un état',
+	'Class:TriggerOnStateEnter+' => '',
+	'Class:TriggerOnStateLeave' => 'Déclencheur sur un objet quittant un état',
+	'Class:TriggerOnStateLeave+' => '',
+	'Class:TriggerOnObjectCreate' => 'Déclencheur sur la création d\'un objet',
+	'Class:TriggerOnObjectCreate+' => '',
+	'Class:lnkTriggerAction' => 'Actions-Déclencheur',
+	'Class:lnkTriggerAction+' => '',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Action',
+	'Class:lnkTriggerAction/Attribute:action_id+' => '',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Nom de l\'action',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Déclencheur',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Nom du déclencheur',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Ordre',
+	'Class:lnkTriggerAction/Attribute:order+' => '',
+	'Class:AsyncSendEmail' => 'Envoi d\'Email Asynchrone',
+	'Class:AsyncSendEmail+' => '',
+	'Class:AsyncSendEmail/Attribute:to' => 'A',
+	'Class:AsyncSendEmail/Attribute:to+' => '',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Sujet',
+	'Class:AsyncSendEmail/Attribute:subject+' => '',
+	'Class:AsyncSendEmail/Attribute:body' => 'Message',
+	'Class:AsyncSendEmail/Attribute:body+' => '',
+	'Class:AsyncSendEmail/Attribute:header' => 'En-tête',
+	'Class:AsyncSendEmail/Attribute:header+' => '',
+	'Class:CMDBChange' => 'Modification',
+	'Class:CMDBChange+' => '',
+	'Class:CMDBChange/Attribute:date' => 'Date',
+	'Class:CMDBChange/Attribute:date+' => '',
+	'Class:CMDBChange/Attribute:userinfo' => 'Autres informations',
+	'Class:CMDBChange/Attribute:userinfo+' => '',
+	'Class:CMDBChangeOp' => 'Operation de changement',
+	'Class:CMDBChangeOp+' => '',
+	'Class:CMDBChangeOp/Attribute:change' => 'Modification',
+	'Class:CMDBChangeOp/Attribute:change+' => '',
+	'Class:CMDBChangeOp/Attribute:date' => 'Date',
+	'Class:CMDBChangeOp/Attribute:date+' => '',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'Utilisateur',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'Type d\'objet',
+	'Class:CMDBChangeOp/Attribute:objclass+' => '',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'Clé',
+	'Class:CMDBChangeOp/Attribute:objkey+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'Type',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:CMDBChangeOpCreate' => 'Création de l\'objet',
+	'Class:CMDBChangeOpCreate+' => '',
+	'Class:CMDBChangeOpDelete' => 'Effacement de l\'objet',
+	'Class:CMDBChangeOpDelete+' => '',
+	'Class:CMDBChangeOpSetAttribute' => 'Modification de l\'objet',
+	'Class:CMDBChangeOpSetAttribute+' => '',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Champ',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Modification de valeur',
+	'Class:CMDBChangeOpSetAttributeScalar+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Ancienne valeur',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Nouvelle valeur',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'Modification de données',
+	'Class:CMDBChangeOpSetAttributeBlob+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Ancienne valeur',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Mot de passe chiffré',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword+' => '',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Ancien mot de passe',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd+' => '',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Champ chiffré',
+	'Class:CMDBChangeOpSetAttributeEncrypted+' => '',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Ancienne valeur',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring+' => '',
+	'Class:CMDBChangeOpSetAttributeText' => 'Modification de texte',
+	'Class:CMDBChangeOpSetAttributeText+' => '',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Ancienne valeur',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Archive de journal',
+	'Class:CMDBChangeOpSetAttributeCaseLog+' => '',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Dernière entrée',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry+' => '',
+	'Class:Event' => 'Evènement',
+	'Class:Event+' => '',
+	'Class:Event/Attribute:message' => 'Message',
+	'Class:Event/Attribute:message+' => '',
+	'Class:Event/Attribute:date' => 'Date',
+	'Class:Event/Attribute:date+' => '',
+	'Class:Event/Attribute:userinfo' => 'Utilisateur',
+	'Class:Event/Attribute:userinfo+' => '',
+	'Class:Event/Attribute:finalclass' => 'Sous-classe d\'Evènement',
+	'Class:Event/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:EventNotification' => 'Notification',
+	'Class:EventNotification+' => '',
+	'Class:EventNotification/Attribute:trigger_id' => 'Déclencheur',
+	'Class:EventNotification/Attribute:trigger_id+' => '',
+	'Class:EventNotification/Attribute:action_id' => 'Action',
+	'Class:EventNotification/Attribute:action_id+' => '',
+	'Class:EventNotification/Attribute:object_id' => 'Objet',
+	'Class:EventNotification/Attribute:object_id+' => '',
+	'Class:EventNotificationEmail' => 'Envoi d\'Email',
+	'Class:EventNotificationEmail+' => '',
+	'Class:EventNotificationEmail/Attribute:to' => 'A',
+	'Class:EventNotificationEmail/Attribute:to+' => '',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => '',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => '',
+	'Class:EventNotificationEmail/Attribute:from' => 'De',
+	'Class:EventNotificationEmail/Attribute:from+' => '',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Sujet',
+	'Class:EventNotificationEmail/Attribute:subject+' => '',
+	'Class:EventNotificationEmail/Attribute:body' => 'Message',
+	'Class:EventNotificationEmail/Attribute:body+' => '',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Pièces jointes',
+	'Class:EventNotificationEmail/Attribute:attachments+' => '',
+	'Class:EventIssue' => 'Erreur',
+	'Class:EventIssue+' => '',
+	'Class:EventIssue/Attribute:issue' => 'Erreur',
+	'Class:EventIssue/Attribute:issue+' => '',
+	'Class:EventIssue/Attribute:impact' => 'Impact',
+	'Class:EventIssue/Attribute:impact+' => '',
+	'Class:EventIssue/Attribute:page' => 'Page Web',
+	'Class:EventIssue/Attribute:page+' => '',
+	'Class:EventIssue/Attribute:arguments_post' => 'Arguments (POST)',
+	'Class:EventIssue/Attribute:arguments_post+' => '',
+	'Class:EventIssue/Attribute:arguments_get' => 'Arguments (GET)',
+	'Class:EventIssue/Attribute:arguments_get+' => '',
+	'Class:EventIssue/Attribute:callstack' => 'Pile d\'appel',
+	'Class:EventIssue/Attribute:callstack+' => '',
+	'Class:EventIssue/Attribute:data' => 'Données',
+	'Class:EventIssue/Attribute:data+' => '',
+	'Class:EventWebService' => 'Appel de webservice',
+	'Class:EventWebService+' => '',
+	'Class:EventWebService/Attribute:verb' => 'Verbe',
+	'Class:EventWebService/Attribute:verb+' => '',
+	'Class:EventWebService/Attribute:result' => 'Résultat',
+	'Class:EventWebService/Attribute:result+' => '',
+	'Class:EventWebService/Attribute:log_info' => 'Informations',
+	'Class:EventWebService/Attribute:log_info+' => '',
+	'Class:EventWebService/Attribute:log_warning' => 'Avertissement',
+	'Class:EventWebService/Attribute:log_warning+' => '',
+	'Class:EventWebService/Attribute:log_error' => 'Erreurs',
+	'Class:EventWebService/Attribute:log_error+' => '',
+	'Class:EventWebService/Attribute:data' => 'Données',
+	'Class:EventWebService/Attribute:data+' => '',
+	'Class:EventRestService' => 'Appel REST/JSON',
+	'Class:EventRestService+' => 'Trace de l\'appel au service REST/JSON (rest.php)',
+	'Class:EventRestService/Attribute:operation' => 'Opération',
+	'Class:EventRestService/Attribute:operation+' => 'Paramètre \'opération\'',
+	'Class:EventRestService/Attribute:version' => 'Version',
+	'Class:EventRestService/Attribute:version+' => 'Paramètre \'version\'',
+	'Class:EventRestService/Attribute:json_input' => 'Données d\'entrée',
+	'Class:EventRestService/Attribute:json_input+' => 'Paramètre \'json_data\'',
+	'Class:EventRestService/Attribute:code' => 'Code',
+	'Class:EventRestService/Attribute:code+' => 'Code de retour',
+	'Class:EventRestService/Attribute:json_output' => 'Réponse',
+	'Class:EventRestService/Attribute:json_output+' => 'Réponse HTTP (structure json)',
+	'Class:EventRestService/Attribute:provider' => 'Fournisseur',
+	'Class:EventRestService/Attribute:provider+' => 'Classe PHP qui a pris en charge l\'opération demandée',
+	'Class:EventLoginUsage' => 'Utilisation de l\'application',
+	'Class:EventLoginUsage+' => '',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => '',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Nom de l\'utilisateur',
+	'Class:EventLoginUsage/Attribute:contact_name+' => '',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Email',
+	'Class:EventLoginUsage/Attribute:contact_email+' => '',
+	'Class:SynchroDataSource' => 'Source de données',
+	'Class:SynchroDataSource+' => '',
+	'Class:SynchroDataSource/Attribute:name' => 'Nom',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Description',
+	'Class:SynchroDataSource/Attribute:description+' => '',
+	'Class:SynchroDataSource/Attribute:status' => 'Etat',
+	'Class:SynchroDataSource/Attribute:status+' => '',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implémentation',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation+' => '',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete+' => '',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production',
+	'Class:SynchroDataSource/Attribute:status/Value:production+' => '',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Utilisateur',
+	'Class:SynchroDataSource/Attribute:user_id+' => 'Seul cet utilisateur (et les administrateurs) peuvent exécuter cette synchronisation',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact à notifier',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact à notifier en cas d\'erreur',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Type cible',
+	'Class:SynchroDataSource/Attribute:scope_class+' => 'Type d\'objets à synchroniser',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restriction',
+	'Class:SynchroDataSource/Attribute:scope_restriction+' => '',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Obsolescence après',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Un objet est considéré comme obsolète s\'il n\'apparaît pas dans les données au delà de cette durée',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Politique de recherche',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy+' => '',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utiliser les champs',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes+' => '',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utiliser la clé primaire',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action si zéro',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Créer',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erreur',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action si un',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erreur',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Mettre à jour',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action si plusieurs',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Créer',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erreur',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendre le premier',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Politique d\'effacement',
+	'Class:SynchroDataSource/Attribute:delete_policy+' => 'Façon dont sont traités les objets obsolètes',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Effacer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Mettre à jour',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Mettre à jour puis effacer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Mise à jour',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Format: nom_de_champ:valeur; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Durée de rétention',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Si la politique est \'Mettre à jour puis effacer\', les objets obsolètes sont encore conservés pendant cette durée avant d\'être effacés',
+
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Liste des champs',
+	'Class:SynchroDataSource/Attribute:attribute_list+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utilisateurs autorisés',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Quels utilisateurs sont autorisés à effacer des objets synchronisés',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Seulement les administrateurs',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tous les utilisateurs autorisés',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Personne',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody+' => '',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icône (hyperlien)',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlien vers une icône représentant l\'application source des données',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Application (hyperlien)',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Un hyperlien vers l\'application source des données. Paramètres possibles: $this->nom_de_champ$ et $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Table de données',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nom de la table stockant les données de cette source. Un nom par défaut est calculé automatiquement si ce champ est laissé vide.',
+	'Class:SynchroAttribute' => 'Champs de synchronisation',
+	'Class:SynchroAttribute+' => '',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Source de données',
+	'Class:SynchroAttribute/Attribute:sync_source_id+' => '',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Champ',
+	'Class:SynchroAttribute/Attribute:attcode+' => '',
+	'Class:SynchroAttribute/Attribute:update' => 'Mise à jour',
+	'Class:SynchroAttribute/Attribute:update+' => '',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Recherche',
+	'Class:SynchroAttribute/Attribute:reconcile+' => '',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Politique de mise à jour',
+	'Class:SynchroAttribute/Attribute:update_policy+' => '',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Maître (verrouillé)',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked+' => '',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Maître (non-verrouillé)',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked+' => '',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Ecrire si le champ est vide',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty+' => '',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Type',
+	'Class:SynchroAttribute/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:SynchroAttExtKey' => 'Synchro Clé Externe',
+	'Class:SynchroAttExtKey+' => '',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Champ',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode+' => '',
+	'Class:SynchroAttLinkSet' => 'Synchro Linkset',
+	'Class:SynchroAttLinkSet+' => '',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Séparateur de colonnes',
+	'Class:SynchroAttLinkSet/Attribute:row_separator+' => '',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Séparateur de champs',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator+' => '',
+	'Class:SynchroLog' => 'Journal de Synchro',
+	'Class:SynchroLog+' => '',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Source de données',
+	'Class:SynchroLog/Attribute:sync_source_id+' => '',
+	'Class:SynchroLog/Attribute:start_date' => 'Date/heure de début',
+	'Class:SynchroLog/Attribute:start_date+' => '',
+	'Class:SynchroLog/Attribute:end_date' => 'Date/heure de fin',
+	'Class:SynchroLog/Attribute:end_date+' => '',
+	'Class:SynchroLog/Attribute:status' => 'Etat',
+	'Class:SynchroLog/Attribute:status+' => '',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Terminé Ok',
+	'Class:SynchroLog/Attribute:status/Value:completed+' => '',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Erreur',
+	'Class:SynchroLog/Attribute:status/Value:error+' => '',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'En cours',
+	'Class:SynchroLog/Attribute:status/Value:running+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb de réplicas vus',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb total de réplicas',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb d\'objets effacés',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb d\'erreurs lors de l\'effacement',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb d\'objets obsolètés',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb d\'erreurs lors de l\'obsolescence',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb d\'objets créés',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb d\'erreurs lors de la création',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb d\'objets mis à jour',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb d\erreurs lors de la mise à jour',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb d\'erreurs lors de la réconciliation',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb d\'objets disparus',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb d\'objets (nouveaux) mis à jour',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated+' => '',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb d\'objets (nouveaux) inchangés',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged+' => '',
+	'Class:SynchroLog/Attribute:last_error' => 'Dernière erreur',
+	'Class:SynchroLog/Attribute:last_error+' => '',
+	'Class:SynchroLog/Attribute:traces' => 'Traces',
+	'Class:SynchroLog/Attribute:traces+' => '',
+	'Class:SynchroReplica' => 'Réplica de Synchronisation',
+	'Class:SynchroReplica+' => '',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Source de données',
+	'Class:SynchroReplica/Attribute:sync_source_id+' => '',
+	'Class:SynchroReplica/Attribute:base_class' => 'Type de base',
+	'Class:SynchroReplica/Attribute:base_class+' => '',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Objet destination',
+	'Class:SynchroReplica/Attribute:dest_id+' => '',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Type de l\'objet',
+	'Class:SynchroReplica/Attribute:dest_class+' => '',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Dernière détection',
+	'Class:SynchroReplica/Attribute:status_last_seen+' => '',
+	'Class:SynchroReplica/Attribute:status' => 'Etat',
+	'Class:SynchroReplica/Attribute:status+' => '',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modifié',
+	'Class:SynchroReplica/Attribute:status/Value:modified+' => '',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nouveau',
+	'Class:SynchroReplica/Attribute:status/Value:new+' => '',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete+' => '',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphelin',
+	'Class:SynchroReplica/Attribute:status/Value:orphan+' => '',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronisé',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized+' => '',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Créé par la source ?',
+	'Class:SynchroReplica/Attribute:status_dest_creator+' => '',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Dernière erreur',
+	'Class:SynchroReplica/Attribute:status_last_error+' => '',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Avertissements',
+	'Class:SynchroReplica/Attribute:status_last_warning+' => '',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Date de création',
+	'Class:SynchroReplica/Attribute:info_creation_date+' => '',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Date de dernière modification',
+	'Class:SynchroReplica/Attribute:info_last_modified+' => '',
+	'Class:appUserPreferences' => 'Préférences utilisateur',
+	'Class:appUserPreferences+' => '',
+	'Class:appUserPreferences/Attribute:userid' => 'Utilisateur',
+	'Class:appUserPreferences/Attribute:userid+' => '',
+	'Class:appUserPreferences/Attribute:preferences' => 'Préférences',
+	'Class:appUserPreferences/Attribute:preferences+' => '',
+	'Core:AttributeLinkedSet' => 'Objets liés (1-n)',
+	'Core:AttributeLinkedSet+' => 'Liste d\'objets d\'une classe donnée et pointant sur l\'objet courant',
+	'Core:AttributeLinkedSetIndirect' => 'Objets liés (1-n)',
+	'Core:AttributeLinkedSetIndirect+' => 'Liste d\'objets d\'une classe donnée et liés à l\'objet courant via une classe intermédiaire',
+	'Core:AttributeInteger' => 'Nombre entier',
+	'Core:AttributeInteger+' => 'Valeur numérique entière',
+	'Core:AttributeDecimal' => 'Nombre décimal',
+	'Core:AttributeDecimal+' => 'Valeur numérique décimale',
+	'Core:AttributeBoolean' => 'Booléen',
+	'Core:AttributeBoolean+' => 'Booléen',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Oui',
+	'Core:AttributeBoolean/Value:no' => 'Non',
+	'Core:AttributeArchiveFlag' => 'Drapeau Archive',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Oui',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'Cet object n\'est visible que dans le mode Archive',
+	'Core:AttributeArchiveFlag/Value:no' => 'Non',
+	'Core:AttributeArchiveFlag/Label' => 'Archivé',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Date archivage',
+	'Core:AttributeArchiveDate/Label+' => '',
+	'Core:AttributeObsolescenceFlag' => 'Drapeau Obsolète',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Oui',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'Cet objet est exclus de l\'analyse d\'impact, et n\'est pas affiché dans les résultats de recherche',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'Non',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolète',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Calculé dynamiquement en fonction d\'autres attributs de l\'objet',
+	'Core:AttributeObsolescenceDate/Label' => 'Date d\'obsolescence',
+	'Core:AttributeObsolescenceDate/Label+' => 'Date approximative du jour où l\'objet est devenu obsolète',
+
+	'Core:AttributeString' => 'Chaîne de caractères',
+	'Core:AttributeString+' => 'Chaîne de caractères (limitée à une ligne)',
+	'Core:AttributeClass' => 'Classe',
+	'Core:AttributeClass+' => 'Classe d\'objets',
+	'Core:AttributeApplicationLanguage' => 'Langue',
+	'Core:AttributeApplicationLanguage+' => 'Codes langue et pays (EN US)',
+	'Core:AttributeFinalClass' => 'Classe',
+	'Core:AttributeFinalClass+' => 'Classe réelle de l\'objet (attribut créé automatiquement)',
+	'Core:AttributePassword' => 'Mot de passe',
+	'Core:AttributePassword+' => 'Mot de passe qui peut être lu en clair',
+	'Core:AttributeEncryptedString' => 'Chaîne encryptée',
+	'Core:AttributeEncryptedString+' => 'Chaîne encryptée avec une clé locale',
+	'Core:AttributeText' => 'Texte',
+	'Core:AttributeText+' => 'Chaîne de caractères de plusieurs lignes',
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'Texte formaté en HTML',
+	'Core:AttributeEmailAddress' => 'Adresse électronique',
+	'Core:AttributeEmailAddress+' => 'Adresse électronique (xxxx@yyy.zzz)',
+	'Core:AttributeIPAddress' => 'Adresse IP',
+	'Core:AttributeIPAddress+' => 'Adresse IP',
+	'Core:AttributeOQL' => 'Expression OQL',
+	'Core:AttributeOQL+' => 'Expression formattée en "Object Query Language"',
+	'Core:AttributeEnum' => 'Enumération',
+	'Core:AttributeEnum+' => 'Valeur choisie parmi un liste de chaîne de caractères',
+	'Core:AttributeTemplateString' => 'Modèle de chaîne de caractères',
+	'Core:AttributeTemplateString+' => 'Chaîne de caractères d\'une ligne, contenant des espaces réservés pour des données iTop',
+	'Core:AttributeTemplateText' => 'Modèle de texte',
+	'Core:AttributeTemplateText+' => 'Texte contenant des espaces réservés pour des données iTop',
+	'Core:AttributeTemplateHTML' => 'Modèle HTML',
+	'Core:AttributeTemplateHTML+' => 'HTML contenant des espaces réservés pour des données iTop',
+	'Core:AttributeDateTime' => 'Date/heure',
+	'Core:AttributeDateTime+' => 'Date et heure (année-mois-jour hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Format de date :<br/>
+	<b>%1$s</b><br/>
+	Exemple : %2$s
+</p>
+<p>
+Opérateurs :<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+Si l\'heure n\'est pas spécifiée, cela revient à 00:00:00 (minuit)
+</p>',
+	'Core:AttributeDate' => 'Date',
+	'Core:AttributeDate+' => 'Date (année-mois-jour)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Format de date :<br/>
+	<b>%1$s</b><br/>
+	Exemple : %2$s
+</p>
+<p>
+Opérateurs :<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>',
+	'Core:AttributeDeadline' => 'Délai',
+	'Core:AttributeDeadline+' => 'Date/heure exprimée relativement à l\'heure courante',
+	'Core:AttributeExternalKey' => 'Clé externe',
+	'Core:AttributeExternalKey+' => 'Clé externe',
+	'Core:AttributeHierarchicalKey' => 'Clé externe (hiérarchie)',
+	'Core:AttributeHierarchicalKey+' => 'Clé externe vers le parent',
+	'Core:AttributeExternalField' => 'Attribut externe',
+	'Core:AttributeExternalField+' => 'Copie de la valeur d\'un attribut de l\'objet lié par une clé externe',
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => 'URL absolue ou relative',
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => 'Contenu binaire (document)',
+	'Core:AttributeOneWayPassword' => 'Mot de passe "one way"',
+	'Core:AttributeOneWayPassword+' => 'Mot de passe qui peut être vérifié mais jamais lu en clair',
+	'Core:AttributeTable' => 'Table',
+	'Core:AttributeTable+' => 'Tableau à deux dimensions',
+	'Core:AttributePropertySet' => 'Propriétés',
+	'Core:AttributePropertySet+' => 'Liste de propriétés (nom et valeur) non typées',
+
+	'Core:AttributeFriendlyName' => 'Nom usuel (convivial)',
+	'Core:AttributeFriendlyName+' => 'Attribut créé automatiquement ; sa valeur est calculée d\'après d\'autres attributs',
+
+	'Core:FriendlyName-Label' => 'Nom complet',
+	'Core:FriendlyName-Description' => 'Nom complet',
+
+	'Change:ObjectCreated' => 'Elément créé',
+	'Change:ObjectDeleted' => 'Elément effacé',
+	'Change:ObjectModified' => 'Elément modifié',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s modifié en %2$s (ancienne valeur: %3$s)',
+	'Change:AttName_SetTo' => '%1$s modifié en %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s ajouté à %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modifié, ancienne valeur: %2$s',
+	'Change:AttName_Changed' => '%1$s modifié',
+	'Change:AttName_EntryAdded' => '%1$s champ modifié, une nouvelle entrée a été ajoutée: %2$s',
+	'Change:LinkSet:Added' => 'ajout de %1$s',
+	'Change:LinkSet:Removed' => 'suppression de %1$s',
+	'Change:LinkSet:Modified' => 'modification de %1$s',
+	'Class:Action' => 'Action',
+	'Class:Action+' => 'Action spécifique',
+	'Class:Action/Attribute:name' => 'Nom',
+	'Class:Action/Attribute:name+' => 'Label',
+	'Class:Action/Attribute:description' => 'Description',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Etat',
+	'Class:Action/Attribute:status+' => '',
+	'Class:Action/Attribute:status/Value:test' => 'En test',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'En production',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inactive',
+	'Class:Action/Attribute:status/Value:disabled+' => '',
+	'Class:Action/Attribute:trigger_list' => 'Déclencheurs liés',
+	'Class:Action/Attribute:trigger_list+' => '',
+	'Class:Action/Attribute:finalclass' => 'Sous-classe d\'Action',
+	'Class:Action/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:ActionNotification' => 'notification',
+	'Class:ActionNotification+' => '',
+	'Class:Trigger' => 'Déclencheur',
+	'Class:Trigger+' => '',
+	'Class:Trigger/Attribute:description' => 'Description',
+	'Class:Trigger/Attribute:description+' => '',
+	'Class:Trigger/Attribute:action_list' => 'Actions déclenchées',
+	'Class:Trigger/Attribute:action_list+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Sous-classe de Déclencheur',
+	'Class:Trigger/Attribute:finalclass+' => 'Nom de la classe instanciable',
+	'Class:TriggerOnObject' => 'Déclencheur sur modification de données',
+	'Class:TriggerOnObject+' => '',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Classe cible',
+	'Class:TriggerOnObject/Attribute:target_class+' => 'label',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filtre',
+	'Class:TriggerOnObject/Attribute:filter+' => '',
+	'TriggerOnObject:WrongFilterQuery' => 'Requête de filtrage incorrecte: %1$s',
+	'TriggerOnObject:WrongFilterClass' => 'La requête de filtrage doit retourner des objets de la classe "%1$s"',
+	'Class:TriggerOnStateChange' => 'Déclencheur sur changement d\'état',
+	'Class:TriggerOnStateChange+' => '',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Etat',
+	'Class:TriggerOnStateChange/Attribute:state+' => 'label',
+	'Class:TriggerOnThresholdReached' => 'Déclencheur sur dépassement de seuil',
+	'Class:TriggerOnThresholdReached+' => 'Déclencheur sur franchissement de seuil d\'un chronomètre',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Chronomètre',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Seuil',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Personne',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Uniquement les administrateurs',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tous les utilisateurs autorisés',
+	'SynchroDataSource:Description' => 'Description',
+	'SynchroDataSource:Reconciliation' => 'Recherche et réconciliation',
+	'SynchroDataSource:Deletion' => 'Règles d\'effacement',
+	'SynchroDataSource:Status' => 'Etat',
+	'SynchroDataSource:Information' => 'Information',
+	'SynchroDataSource:Definition' => 'Définition',
+	'Core:SynchroAttributes' => 'Champs',
+	'Core:SynchroStatus' => 'Etat',
+	'Core:Synchro:ErrorsLabel' => 'Erreurs',
+	'Core:Synchro:CreatedLabel' => 'Créations',
+	'Core:Synchro:ModifiedLabel' => 'Modifications',
+	'Core:Synchro:UnchangedLabel' => 'Sans changement',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Erreurs',
+	'Core:Synchro:ReconciledLabel' => 'Trouvés',
+	'Core:Synchro:ReconciledNewLabel' => 'Créations',
+	'Core:SynchroReconcile:Yes' => 'Oui',
+	'Core:SynchroReconcile:No' => 'Non',
+	'Core:SynchroUpdate:Yes' => 'Oui',
+	'Core:SynchroUpdate:No' => 'Non',
+	'Core:Synchro:LastestStatus' => 'Dernier état',
+	'Core:Synchro:History' => 'Historique de synchronisation',
+	'Core:Synchro:NeverRun' => 'Aucun historique, la synchronisation n\'a pas encore fonctionné',
+	'Core:Synchro:SynchroEndedOn_Date' => 'La dernière synchronisation s\'est terminée à: %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Synchronisation en cours (début à %1$s)',
+	'Menu:DataSources' => 'Synchronisation', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Core:Synchro:label_repl_ignored' => 'Ignorés (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Disparus (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Existants (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Nouveau (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Effacés (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoletés (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Erreurs (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Aucune action (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Sans changement (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Mis à jour (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Erreurs (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Sans changement (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Mis à jour (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Créations (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Erreurs (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica traités: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Si la politique de réconciliation n\'est pas la clé primaire, au moins une clé de recherche doit être spécifiée',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Pour que les objets soient effacés après avoir été obsoletés, il faut spécifier une durée de rétention',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Les objets obsolètes doivent être mis à jour, mais aucune information de mise à jour n\'est spécifiée',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'La table %1$s existe déjà dans la base de données. Veuillez utiliser un autre nom pour la table des données de cette source.',
+	'Core:SynchroReplica:PublicData' => 'Données synchronisées',
+	'Core:SynchroReplica:PrivateDetails' => 'Informations internes',
+	'Core:SynchroReplica:BackToDataSource' => 'Retourner aux détails de la source de données: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Liste des réplica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (clé primaire)',
+	'Core:SynchroAtt:attcode' => 'Champ',
+	'Core:SynchroAtt:attcode+' => '',
+	'Core:SynchroAtt:reconciliation' => 'Réconciliation ?',
+	'Core:SynchroAtt:reconciliation+' => '',
+	'Core:SynchroAtt:update' => 'Mise  jour ?',
+	'Core:SynchroAtt:update+' => '',
+	'Core:SynchroAtt:update_policy' => 'Politique de mise à jour',
+	'Core:SynchroAtt:update_policy+' => '',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Clé de recherche',
+	'Core:SynchroAtt:reconciliation_attcode+' => '',
+	'Core:SyncDataExchangeComment' => '(Synchronisation)',
+	'Core:Synchro:ListOfDataSources' => 'Sources de données:',
+	'Core:Synchro:LastSynchro' => 'Dernière synchronisation:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Cet objet est synchronisé avec une source de données',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Cet objet a été <b>créé</b> par la source de données %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Cet objet <b>peut être effacé/b> par la source de données %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Vous <b>ne pouvez pas effacer</b> cet objet car il est géré par le source de données %1$s',
+	'TitleSynchroExecution' => 'Exécution de la synchronisation',
+	'Class:SynchroDataSource:DataTable' => 'Table contenant les données: %1$s',
+	'Core:SyncDataSourceObsolete' => 'Cette source de données est obsolète. Opération annulée.',
+	'Core:SyncDataSourceAccessRestriction' => 'Seuls les administrateurs et l\'utilisateur spécifié dans la source de données peuvent exécuter cette synchronisation. Opération annulée.',
+	'Core:SyncTooManyMissingReplicas' => 'Tous les réplicas sont absents de l\'import. L\'import a-t-il réellement tourné. Opération annulée.',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erreur(s), %3$s avertissement(s).',
+	'Core:SynchroReplica:TargetObject' => 'Objet Synchronisé : %1$s',
+	'Core:Duration_Seconds' => '%1$ds',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sj %2$dh %3$dmin %4$ds',
+	'Core:ExplainWTC:ElapsedTime' => 'Temps écoulé (enregistré dans "%1$s")',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Temps écoulé pour "%1$s"',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Date/heure de butée pour "%1$s" à %2$d%%',
+	
+	'Core:BulkExport:MissingParameter_Param' => 'Il manque le paramètre "%1$s"',
+	'Core:BulkExport:InvalidParameter_Query' => 'Valeur incorrecte pour le paramètre "query". Il n\'existe aucune entrée dans le livre des requêtes pour l\'identifiant: "%1$s"',
+	'Core:BulkExport:ExportFormatPrompt' => 'Format d\'export:',
+	'Core:BulkExportOf_Class' => 'Export de %1$s',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Cliquez ici pour télécharger %1$s',
+	'Core:BulkExport:ExportResult' => 'Résultat de l\'export:',
+	'Core:BulkExport:RetrievingData' => 'Récupération des données...',
+	'Core:BulkExport:HTMLFormat' => 'Page Web (*.html)',
+	'Core:BulkExport:CSVFormat' => 'Fichier CSV (*.csv)',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 ou plus récent (*.xlsx)',
+	'Core:BulkExport:PDFFormat' => 'Document PDF (*.pdf)',
+	'Core:BulkExport:DragAndDropHelp' => 'Faites glisser les en-têtes des colonnes pour modifier leur ordre. Aperçu de %1$s lignes sur un total de %2$s lignes à exporter.',
+	'Core:BulkExport:EmptyPreview' => 'Selectionnez les colonnes à exporter dans la liste ci-dessus...',
+	'Core:BulkExport:ColumnsOrder' => 'Ordre des colonnes',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Colonnes de la classe %1$s',
+	'Core:BulkExport:NoFieldSelected' => 'Veuillez sélectionner au moins une colonne à exporter',
+	'Core:BulkExport:CheckAll' => 'Tout cocher',
+	'Core:BulkExport:UncheckAll' => 'Tout décocher',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export annulé par l\'utilisateur',
+	
+	'Core:BulkExport:CSVOptions' => 'Options du format CSV',
+	'Core:BulkExport:CSVLocalization' => 'Traduction',
+	'Core:BulkExport:PDFOptions' => 'Options du format PDF',
+	'Core:BulkExport:PDFPageFormat' => 'Format de page',
+	'Core:BulkExport:PDFPageSize' => 'Taille de page:',
+	'Core:BulkExport:PageSize-A4' => 'A4',
+	'Core:BulkExport:PageSize-A3' => 'A3',
+	'Core:BulkExport:PageSize-Letter' => 'Lettre (US)',
+	'Core:BulkExport:PDFPageOrientation' => 'Orientation de la page:',
+	'Core:BulkExport:PageOrientation-L' => 'Paysage',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait',
+	'Core:BulkExport:XMLFormat' => 'Fichier XML (*.xml)',
+	'Core:BulkExport:XMLOptions' => 'Options XML',
+	'Core:BulkExport:SpreadsheetFormat' => 'Format HTML pour Excel (*.html)',
+	'Core:BulkExport:SpreadsheetOptions' => 'Options du format HTML pour Excel',
+	'Core:BulkExport:OptionNoLocalize' => 'Ne pas traduire les valeurs (pour les champs de type "Enum")',
+	'Core:BulkExport:OptionLinkSets' => 'Inclure les objets liés',
+	'Core:BulkExport:OptionFormattedText' => 'Préserver le formatage du texte',
+	'Core:BulkExport:ScopeDefinition' => 'Définition des objets à exporter',
+	'Core:BulkExportLabelOQLExpression' => 'Requête OQL:',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Entrée du livre des requêtes:',
+	'Core:BulkExportMessageEmptyOQL' => 'Veuillez saisir une requête OQL valide.',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Veuillez sélectionner une entrée dans le livre des requêtes.',
+	'Core:BulkExportQueryPlaceholder' => 'Saisissez une requête OQL...',
+	'Core:BulkExportCanRunNonInteractive' => 'Cliquez ici pour exécuter l\'export en mode non-interactif.',
+	'Core:BulkExportLegacyExport' => 'Cliquez ici pour exécuter l\'ancienne version de l\'export.',
+	'Core:BulkExport:XLSXOptions' => 'Options du format Excel',
+	'Core:BulkExport:TextFormat' => 'Champs texte contenant des balises HTML',
+	'Core:BulkExport:DateTimeFormat' => 'Format de date et heure',
+	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Format par défaut (%1$s), ex. %2$s',
+	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Format spécial: %1$s',
+	'Core:DateTime:Placeholder_d' => 'JJ', // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'J', // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:DeletedObjectLabel' => '%1s (effacé)',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
+	'Core:Validator:Default' => 'Format incorrect',
+	'Core:Validator:Mandatory' => 'Veuillez remplir ce champ',
+	'Core:Validator:MustBeInteger' => 'Ce champ ne peut contenir qu\'un nombre entier',
+	'Core:Validator:MustSelectOne' => 'Veuillez choisir une valeur',
+));
diff --git a/dictionaries/hu.dictionary.itop.core.php b/dictionaries/hu.dictionary.itop.core.php
index c485e73a9..ae784d903 100755
--- a/dictionaries/hu.dictionary.itop.core.php
+++ b/dictionaries/hu.dictionary.itop.core.php
@@ -1,631 +1,631 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
-	'Class:ActionEmail' => 'E-mail értesítés',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Teszt címzett',
-	'Class:ActionEmail/Attribute:test_recipient+' => '',
-	'Class:ActionEmail/Attribute:from' => 'Feladó',
-	'Class:ActionEmail/Attribute:from+' => '',
-	'Class:ActionEmail/Attribute:reply_to' => 'Válasz',
-	'Class:ActionEmail/Attribute:reply_to+' => '',
-	'Class:ActionEmail/Attribute:to' => 'Címzett',
-	'Class:ActionEmail/Attribute:to+' => '',
-	'Class:ActionEmail/Attribute:cc' => 'Másolatot kap',
-	'Class:ActionEmail/Attribute:cc+' => '',
-	'Class:ActionEmail/Attribute:bcc' => 'Titkos másolatot kap',
-	'Class:ActionEmail/Attribute:bcc+' => '',
-	'Class:ActionEmail/Attribute:subject' => 'Tárgy',
-	'Class:ActionEmail/Attribute:subject+' => '',
-	'Class:ActionEmail/Attribute:body' => 'Szöveg',
-	'Class:ActionEmail/Attribute:body+' => '',
-	'Class:ActionEmail/Attribute:importance' => 'Fontosság',
-	'Class:ActionEmail/Attribute:importance+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'Fontos',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'Nem fontos',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normál',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
-	'Class:TriggerOnStateEnter' => 'Kiváltó ok (állapotba belépés)',
-	'Class:TriggerOnStateEnter+' => '',
-	'Class:TriggerOnStateLeave' => 'Kiváltó ok (állapot elhagyás)',
-	'Class:TriggerOnStateLeave+' => '',
-	'Class:TriggerOnObjectCreate' => 'Kiváltó ok (objektum létrehozás)',
-	'Class:TriggerOnObjectCreate+' => '',
-	'Class:lnkTriggerAction' => 'Akció / Kiváltó ok',
-	'Class:lnkTriggerAction+' => '',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Akció',
-	'Class:lnkTriggerAction/Attribute:action_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Kiváltó ok',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Sorrend',
-	'Class:lnkTriggerAction/Attribute:order+' => '',
-	'Class:AsyncSendEmail' => 'E-mail (aszinkron)',
-	'Class:AsyncSendEmail/Attribute:to' => 'Címzett',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Tárgy',
-	'Class:AsyncSendEmail/Attribute:body' => 'Szöveg',
-	'Class:AsyncSendEmail/Attribute:header' => 'Fejléc',
-	'Class:CMDBChange' => 'Változás',
-	'Class:CMDBChange+' => '',
-	'Class:CMDBChange/Attribute:date' => 'Dátum',
-	'Class:CMDBChange/Attribute:date+' => '',
-	'Class:CMDBChange/Attribute:userinfo' => 'Egyéb információ',
-	'Class:CMDBChange/Attribute:userinfo+' => '',
-	'Class:CMDBChangeOp' => 'Változtatás művelet',
-	'Class:CMDBChangeOp+' => '',
-	'Class:CMDBChangeOp/Attribute:change' => 'Válktozás',
-	'Class:CMDBChangeOp/Attribute:change+' => '',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'Objektum osztály',
-	'Class:CMDBChangeOp/Attribute:objclass+' => '',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'Objektum azonosító',
-	'Class:CMDBChangeOp/Attribute:objkey+' => '',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'Típus',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-	'Class:CMDBChangeOpCreate' => 'Objektum létrehozás',
-	'Class:CMDBChangeOpCreate+' => '',
-	'Class:CMDBChangeOpDelete' => 'Objektum törlés',
-	'Class:CMDBChangeOpDelete+' => '',
-	'Class:CMDBChangeOpSetAttribute' => 'Objektum változtatás',
-	'Class:CMDBChangeOpSetAttribute+' => '',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribútum',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar' => 'Tulajdonság változtatás',
-	'Class:CMDBChangeOpSetAttributeScalar+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Előző érték',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Új érték',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
-	'Class:CMDBChangeOpSetAttributeBlob' => 'Módosítás dátuma',
-	'Class:CMDBChangeOpSetAttributeBlob+' => '',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Előző adat',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Titkosított jelszó',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Előző érték',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Titkosított mező',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Előző érték',
-	'Class:CMDBChangeOpSetAttributeText' => 'Szöveg változás',
-	'Class:CMDBChangeOpSetAttributeText+' => '',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Előző adat',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Esemény napló',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Utolsó bejegyzés',
-	'Class:Event' => 'Napló esemény',
-	'Class:Event+' => '',
-	'Class:Event/Attribute:message' => 'Üzenet',
-	'Class:Event/Attribute:message+' => '',
-	'Class:Event/Attribute:date' => 'Dátum',
-	'Class:Event/Attribute:date+' => '',
-	'Class:Event/Attribute:userinfo' => 'Felhasználói információ',
-	'Class:Event/Attribute:userinfo+' => '',
-	'Class:Event/Attribute:finalclass' => 'Típus',
-	'Class:Event/Attribute:finalclass+' => '',
-	'Class:EventNotification' => 'Értesítés esemény',
-	'Class:EventNotification+' => '',
-	'Class:EventNotification/Attribute:trigger_id' => 'Kiváltó ok',
-	'Class:EventNotification/Attribute:trigger_id+' => '',
-	'Class:EventNotification/Attribute:action_id' => 'Felhasználó',
-	'Class:EventNotification/Attribute:action_id+' => '',
-	'Class:EventNotification/Attribute:object_id' => 'Objektum azonosító',
-	'Class:EventNotification/Attribute:object_id+' => '',
-	'Class:EventNotificationEmail' => 'E-mail küldés esemény',
-	'Class:EventNotificationEmail+' => '',
-	'Class:EventNotificationEmail/Attribute:to' => 'Címzett',
-	'Class:EventNotificationEmail/Attribute:to+' => '',
-	'Class:EventNotificationEmail/Attribute:cc' => 'Másolatot kap',
-	'Class:EventNotificationEmail/Attribute:cc+' => '',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'Titkos másolatot kap',
-	'Class:EventNotificationEmail/Attribute:bcc+' => '',
-	'Class:EventNotificationEmail/Attribute:from' => 'Feladó',
-	'Class:EventNotificationEmail/Attribute:from+' => '',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Tárgy',
-	'Class:EventNotificationEmail/Attribute:subject+' => '',
-	'Class:EventNotificationEmail/Attribute:body' => 'Szöveg',
-	'Class:EventNotificationEmail/Attribute:body+' => '',
-	'Class:EventIssue' => 'Kérés esemény',
-	'Class:EventIssue+' => '',
-	'Class:EventIssue/Attribute:issue' => 'Kérés',
-	'Class:EventIssue/Attribute:issue+' => '',
-	'Class:EventIssue/Attribute:impact' => 'Hatás',
-	'Class:EventIssue/Attribute:impact+' => '',
-	'Class:EventIssue/Attribute:page' => 'Oldal',
-	'Class:EventIssue/Attribute:page+' => '',
-	'Class:EventIssue/Attribute:arguments_post' => 'Kérés részletei',
-	'Class:EventIssue/Attribute:arguments_post+' => '',
-	'Class:EventIssue/Attribute:arguments_get' => 'URL ',
-	'Class:EventIssue/Attribute:arguments_get+' => '',
-	'Class:EventIssue/Attribute:callstack' => 'Híváslista',
-	'Class:EventIssue/Attribute:callstack+' => '',
-	'Class:EventIssue/Attribute:data' => 'Dátum',
-	'Class:EventIssue/Attribute:data+' => '',
-	'Class:EventWebService' => 'Web szolgáltatás esemény',
-	'Class:EventWebService+' => '',
-	'Class:EventWebService/Attribute:verb' => 'Kérés',
-	'Class:EventWebService/Attribute:verb+' => '',
-	'Class:EventWebService/Attribute:result' => 'Eredmény',
-	'Class:EventWebService/Attribute:result+' => '',
-	'Class:EventWebService/Attribute:log_info' => 'Info napló',
-	'Class:EventWebService/Attribute:log_info+' => '',
-	'Class:EventWebService/Attribute:log_warning' => 'Warning napló',
-	'Class:EventWebService/Attribute:log_warning+' => '',
-	'Class:EventWebService/Attribute:log_error' => 'Error napló',
-	'Class:EventWebService/Attribute:log_error+' => '',
-	'Class:EventWebService/Attribute:data' => 'Adat',
-	'Class:EventWebService/Attribute:data+' => '',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-	'Class:EventLoginUsage' => 'Belépés esemény',
-	'Class:EventLoginUsage+' => '',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Felhasználó név',
-	'Class:EventLoginUsage/Attribute:user_id+' => '',
-	'Class:SynchroDataSource' => 'Szinkron adatforrás',
-	'Class:SynchroDataSource/Attribute:name' => 'Neve',
-	'Class:SynchroDataSource/Attribute:name+' => '',
-	'Class:SynchroDataSource/Attribute:description' => 'Leírás',
-	'Class:SynchroDataSource/Attribute:status' => 'Státusz',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Megvalósított',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Elavult',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Éles üzemben',
-	'Class:SynchroDataSource/Attribute:user_id' => 'Felhasználó',
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Cél osztály',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Tartalom szűkítés',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Teljesen feltöltött intervallum',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Egyeztetési szabály',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'A következő attribútum használata',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Elsődleges kulcs használata',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Létrehozás',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hiba',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hiba',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Firssítés',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Létrehozás',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hiba',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (véletlen?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Törlési szabály',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Törlés',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Figyelmen kívül hagyás',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Frissítés',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Frissítés után törlés',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Szabályok frissítése',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Késleltetés időtartama',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribútum lista',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Engedélyezett felhasználók',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => '',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Csak rendszergazdák',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Mindenkinek engedélyezett az objektumok törlése',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Senki',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Ikonok URL-je',
-	'Class:SynchroDataSource/Attribute:url_icon+' => '',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Alkalmazások URL-je',
-	'Class:SynchroDataSource/Attribute:url_application+' => '',
-	'Class:SynchroAttribute' => 'Szinkron attribútumok',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Szinkron adatforrás',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Kód',
-	'Class:SynchroAttribute/Attribute:update' => 'Frissítés',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Egyeztetés',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Frissítési irányelv',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inicializálás ha üres',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Osztály',
-	'Class:SynchroAttExtKey' => 'Szinkron attribútum (ExtKey)',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Egyeztetés attribútuma',
-	'Class:SynchroAttLinkSet' => 'Szinkron attribútum (Linkset)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Sor elválasztó',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attribútum elválasztó',
-	'Class:SynchroLog' => 'Szinkron napló',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Szinkron adatforrás',
-	'Class:SynchroLog/Attribute:start_date' => 'Kezdés dátuma',
-	'Class:SynchroLog/Attribute:end_date' => 'Befejezés dátuma',
-	'Class:SynchroLog/Attribute:status' => 'Státusz',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Hibátlanul lefutott',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Hibás',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Még fut',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replikáció létrejött',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replikáció összesen',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objektumok törölve',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb hibái törlés közben',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objketumok elavultak',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb hibák elavulás közben',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objketumok létrehozva',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb hibák létrehozás közben',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objektum frissítve',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb hibák firssítés közben',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb hibák rekonsziliálás közben',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replikáció eltűnt',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objketumok frissítve',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objketumok változatlanok',
-	'Class:SynchroLog/Attribute:last_error' => 'Utolsó hiba',
-	'Class:SynchroLog/Attribute:traces' => 'Trace',
-	'Class:SynchroReplica' => 'Szinkron másolat',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Szinkron adatforrás',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Cél objektum azonosító',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Cél típusa',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Utolsó megtekintett',
-	'Class:SynchroReplica/Attribute:status' => 'Státusz',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Módosított',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'Új',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Elavult',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Árva',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Szinkronizált',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objektum létrehozott?',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Utolsó hiba',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Létrehozás dátuma',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Utolsó módosítás dátuma',
-	'Class:appUserPreferences' => 'Felhasználói beállítások',
-	'Class:appUserPreferences/Attribute:userid' => 'Felhasználó',
-	'Class:appUserPreferences/Attribute:preferences' => 'Beállítások',
-	'Core:AttributeLinkedSet' => 'Objektum tömbök',
-	'Core:AttributeLinkedSet+' => '',
-	'Core:AttributeLinkedSetIndirect' => 'Objektum tömbök (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => '',
-	'Core:AttributeInteger' => 'Integer',
-	'Core:AttributeInteger+' => '',
-	'Core:AttributeDecimal' => 'Decimal',
-	'Core:AttributeDecimal+' => '',
-	'Core:AttributeBoolean' => 'Boolean',
-	'Core:AttributeBoolean+' => '',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-	'Core:AttributeString' => 'String',
-	'Core:AttributeString+' => '',
-	'Core:AttributeClass' => 'Class',
-	'Core:AttributeClass+' => '',
-	'Core:AttributeApplicationLanguage' => 'Alkalmazás nyelve',
-	'Core:AttributeApplicationLanguage+' => '',
-	'Core:AttributeFinalClass' => 'Class (auto)',
-	'Core:AttributeFinalClass+' => '',
-	'Core:AttributePassword' => 'Jelszó',
-	'Core:AttributePassword+' => '',
-	'Core:AttributeEncryptedString' => 'Encrypted string',
-	'Core:AttributeEncryptedString+' => '',
-	'Core:AttributeText' => 'Text',
-	'Core:AttributeText+' => '',
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => '',
-	'Core:AttributeEmailAddress' => 'E-mail cím',
-	'Core:AttributeEmailAddress+' => '',
-	'Core:AttributeIPAddress' => 'IP cím',
-	'Core:AttributeIPAddress+' => '',
-	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => '',
-	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => '',
-	'Core:AttributeTemplateString' => 'Sablon szöveg',
-	'Core:AttributeTemplateString+' => '',
-	'Core:AttributeTemplateText' => 'Sablon szöveg',
-	'Core:AttributeTemplateText+' => '',
-	'Core:AttributeTemplateHTML' => 'Sablon HTML',
-	'Core:AttributeTemplateHTML+' => '',
-	'Core:AttributeDateTime' => 'Date/time',
-	'Core:AttributeDateTime+' => '',
-	'Core:AttributeDate' => 'Date',
-	'Core:AttributeDate+' => '',
-	'Core:AttributeDeadline' => 'Határidő',
-	'Core:AttributeDeadline+' => '',
-	'Core:AttributeExternalKey' => 'Külső kulcs',
-	'Core:AttributeExternalKey+' => '',
-	'Core:AttributeExternalField' => 'Külső mező',
-	'Core:AttributeExternalField+' => '',
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => '',
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => '',
-	'Core:AttributeOneWayPassword' => 'One way password',
-	'Core:AttributeOneWayPassword+' => '',
-	'Core:AttributeTable' => 'Table',
-	'Core:AttributeTable+' => '',
-	'Core:AttributePropertySet' => 'Tulajdonságok',
-	'Core:AttributePropertySet+' => '',
-	'Class:CMDBChangeOp/Attribute:date' => 'Dátum',
-	'Class:CMDBChangeOp/Attribute:date+' => '',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'Felhasználó',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
-	'Change:ObjectCreated' => 'Objektum létrehozva',
-	'Change:ObjectDeleted' => 'Objektum törölve',
-	'Change:ObjectModified' => 'Objektum módosítva',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s új értéke: %2$s (előző értéke: %3$s)',
-	'Change:AttName_SetTo' => '%1$s új értéke %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s hozzáfűzve %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s módosítva, előző érték: %2$s',
-	'Change:AttName_Changed' => '%1$s módosítva',
-	'Change:AttName_EntryAdded' => '%1$s módosítva, új bejegyzés hozzáadva.',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'Felhasználó neve',
-	'Class:EventLoginUsage/Attribute:contact_name+' => '',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'Felhasználó e-mail',
-	'Class:EventLoginUsage/Attribute:contact_email+' => '',
-	'Class:Action' => 'Egyedi akciók',
-	'Class:Action+' => '',
-	'Class:Action/Attribute:name' => 'Neve',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Leírás',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Státusz',
-	'Class:Action/Attribute:status+' => '',
-	'Class:Action/Attribute:status/Value:test' => 'Tesztelés alatt',
-	'Class:Action/Attribute:status/Value:test+' => '',
-	'Class:Action/Attribute:status/Value:enabled' => 'Éles üzemeben',
-	'Class:Action/Attribute:status/Value:enabled+' => '',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inaktív',
-	'Class:Action/Attribute:status/Value:disabled+' => '',
-	'Class:Action/Attribute:trigger_list' => 'Kapcsolódó kiváltó okok',
-	'Class:Action/Attribute:trigger_list+' => '',
-	'Class:Action/Attribute:finalclass' => 'Típus',
-	'Class:Action/Attribute:finalclass+' => '',
-	'Class:ActionNotification' => 'Értesítés',
-	'Class:ActionNotification+' => '',
-	'Class:Trigger' => 'Kiváltó ok',
-	'Class:Trigger+' => '',
-	'Class:Trigger/Attribute:description' => 'Leírás',
-	'Class:Trigger/Attribute:description+' => '',
-	'Class:Trigger/Attribute:action_list' => 'Kiváltott akció',
-	'Class:Trigger/Attribute:action_list+' => '',
-	'Class:Trigger/Attribute:finalclass' => 'Típus',
-	'Class:Trigger/Attribute:finalclass+' => '',
-	'Class:TriggerOnObject' => 'Kiváltó ok (osztály függő)',
-	'Class:TriggerOnObject+' => '',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Cél osztály',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-	'Class:TriggerOnStateChange' => 'Kiváltó ok (állapot változás)',
-	'Class:TriggerOnStateChange+' => '',
-	'Class:TriggerOnStateChange/Attribute:state' => 'Állapot',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Akció',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Kiváltó ok',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Senki',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Csak adminisztrátorok',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tíltott felhasználók',
-	'SynchroDataSource:Description' => 'Leírás',
-	'SynchroDataSource:Reconciliation' => 'Keresés &amp; rekponsziliálás',
-	'SynchroDataSource:Deletion' => 'Törlés szabályai',
-	'SynchroDataSource:Status' => 'Státusz',
-	'SynchroDataSource:Information' => 'Információ',
-	'SynchroDataSource:Definition' => 'Meghatározás',
-	'Core:SynchroAttributes' => 'Attribútumok',
-	'Core:SynchroStatus' => 'Státusz',
-	'Core:Synchro:ErrorsLabel' => 'Hibák',
-	'Core:Synchro:CreatedLabel' => 'Létrehozva',
-	'Core:Synchro:ModifiedLabel' => 'Módosítva',
-	'Core:Synchro:UnchangedLabel' => 'Változatlan',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Hibák',
-	'Core:Synchro:ReconciledLabel' => 'Rekonsziliált',
-	'Core:Synchro:ReconciledNewLabel' => 'Létrehozva',
-	'Core:SynchroReconcile:Yes' => 'Igen',
-	'Core:SynchroReconcile:No' => 'Nem',
-	'Core:SynchroUpdate:Yes' => 'Igen',
-	'Core:SynchroUpdate:No' => 'Nem',
-	'Core:Synchro:LastestStatus' => 'Utolsó státusz',
-	'Core:Synchro:History' => 'Szinkronizáció történet',
-	'Core:Synchro:NeverRun' => 'Ez a szinkronizáció még soha nem futott. Nincs még napló bejegyzés.',
-	'Core:Synchro:SynchroEndedOn_Date' => 'Az utolsó szinkronizáció lefutásának időpontja: %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Az szinkronizáció elindut %1$s, de még fut.',
-	'Menu:DataSources' => 'Szinkronizált adatforrások', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Core:Synchro:label_repl_ignored' => 'Figyelmen kívül hagyott (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Elveszett (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Létező (%1$s)',
-	'Core:Synchro:label_repl_new' => 'Új (%1$s)',
-	'Core:Synchro:label_obj_deleted' => 'Törölt (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Elavult (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Hibák (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'Beavatkozás nem szükséges (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Változatan (%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Frisített (%1$s)',
-	'Core:Synchro:label_obj_updated_errors' => 'Hibák (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Változatlan (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Frissített (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Létrehozott (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Hibák (%1$s)',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Másolat elkészítve: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Egyeztetéshez legalább egy kulcsot meg kell adni, egyébként az egyeztetés az elsődleges kulcs alapján történik.',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A törlés késleltetésének időtartamát meg kell adni, egyébként az objektum törölve lesz annak elavulttá minősítése után.',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Lejárt objektumok frissítése nem tud megtörténni.',
-	'Core:SynchroReplica:PublicData' => 'Publikus adatok',
-	'Core:SynchroReplica:PrivateDetails' => 'Privát adatok',
-	'Core:SynchroReplica:BackToDataSource' => 'Vissza a következő szinkron adatforráshoz: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'Másolatok listája',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'Azonosító (Elsődleges kulcs)',
-	'Core:SynchroAtt:attcode' => 'Attribútum',
-	'Core:SynchroAtt:attcode+' => '',
-	'Core:SynchroAtt:reconciliation' => 'Egyeztetés?',
-	'Core:SynchroAtt:reconciliation+' => '',
-	'Core:SynchroAtt:update' => 'Frissített?',
-	'Core:SynchroAtt:update+' => '',
-	'Core:SynchroAtt:update_policy' => 'Frissítési szabály',
-	'Core:SynchroAtt:update_policy+' => '',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Egyeztetés kulcsa',
-	'Core:SynchroAtt:reconciliation_attcode+' => '',
-	'Core:SyncDataExchangeComment' => '(DataExchange)',
-	'Core:Synchro:ListOfDataSources' => 'Adatforrások listája',
-	'Core:Synchro:LastSynchro' => 'Utolsó szimkronizáció',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'Az objektum szinkronizálva a külső adatforrással.',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Objektum <b>létrehozva</b> a következő adatforrásban: %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Objektum <b>törölhető</b> a következő külső adatforrásból: %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => '<b>Objektum nem törölhető</b> mert egy másik adatforrás (%1$s) tulajdona',
-	'TitleSynchroExecution' => 'Szinkronizáció végrehajtás',
-	'Class:SynchroDataSource:DataTable' => 'Adatbázis tábla: %1$s',
-	'Core:SyncDataSourceObsolete' => 'Az adatforrás elvalultnak van jelölve. Művelet visszavonva.',
-	'Core:SyncDataSourceAccessRestriction' => 'Csak az adminisztrátor vagy speciális jogokkal rendelkező felhasználó futtathatja a műveletet. Művelet visszavonva.',
-	'Core:SyncTooManyMissingReplicas' => 'Import során az összes másolat elveszett. Az import valóban lefutott? Művelet visszavonva.',
-	'Core:Duration_Seconds' => '%1$sds',
-	'Core:Duration_Minutes_Seconds' => '%1$sdmin %2$sds',
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$sdh %2$sdmin %3$sds',
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$sdh %3$sdmin %4$ds',
-	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
-	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
-	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
-	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-If the time is omitted, it defaults to 00:00:00
-</p>~~',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>~~',
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
-	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
-	'Core:AttributeFriendlyName' => 'Friendly name~~',
-	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
-	'Core:FriendlyName-Label' => 'Friendly name~~',
-	'Core:FriendlyName-Description' => 'Friendly name~~',
-	'Change:LinkSet:Added' => 'added %1$s~~',
-	'Change:LinkSet:Removed' => 'removed %1$s~~',
-	'Change:LinkSet:Modified' => 'modified %1$s~~',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
-	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)~~',
-	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal~~',
-	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
-	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify~~',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
-	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
-	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings~~',
-	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
+	'Class:ActionEmail' => 'E-mail értesítés',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Teszt címzett',
+	'Class:ActionEmail/Attribute:test_recipient+' => '',
+	'Class:ActionEmail/Attribute:from' => 'Feladó',
+	'Class:ActionEmail/Attribute:from+' => '',
+	'Class:ActionEmail/Attribute:reply_to' => 'Válasz',
+	'Class:ActionEmail/Attribute:reply_to+' => '',
+	'Class:ActionEmail/Attribute:to' => 'Címzett',
+	'Class:ActionEmail/Attribute:to+' => '',
+	'Class:ActionEmail/Attribute:cc' => 'Másolatot kap',
+	'Class:ActionEmail/Attribute:cc+' => '',
+	'Class:ActionEmail/Attribute:bcc' => 'Titkos másolatot kap',
+	'Class:ActionEmail/Attribute:bcc+' => '',
+	'Class:ActionEmail/Attribute:subject' => 'Tárgy',
+	'Class:ActionEmail/Attribute:subject+' => '',
+	'Class:ActionEmail/Attribute:body' => 'Szöveg',
+	'Class:ActionEmail/Attribute:body+' => '',
+	'Class:ActionEmail/Attribute:importance' => 'Fontosság',
+	'Class:ActionEmail/Attribute:importance+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'Fontos',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'Nem fontos',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normál',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '',
+	'Class:TriggerOnStateEnter' => 'Kiváltó ok (állapotba belépés)',
+	'Class:TriggerOnStateEnter+' => '',
+	'Class:TriggerOnStateLeave' => 'Kiváltó ok (állapot elhagyás)',
+	'Class:TriggerOnStateLeave+' => '',
+	'Class:TriggerOnObjectCreate' => 'Kiváltó ok (objektum létrehozás)',
+	'Class:TriggerOnObjectCreate+' => '',
+	'Class:lnkTriggerAction' => 'Akció / Kiváltó ok',
+	'Class:lnkTriggerAction+' => '',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Akció',
+	'Class:lnkTriggerAction/Attribute:action_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Kiváltó ok',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Sorrend',
+	'Class:lnkTriggerAction/Attribute:order+' => '',
+	'Class:AsyncSendEmail' => 'E-mail (aszinkron)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Címzett',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Tárgy',
+	'Class:AsyncSendEmail/Attribute:body' => 'Szöveg',
+	'Class:AsyncSendEmail/Attribute:header' => 'Fejléc',
+	'Class:CMDBChange' => 'Változás',
+	'Class:CMDBChange+' => '',
+	'Class:CMDBChange/Attribute:date' => 'Dátum',
+	'Class:CMDBChange/Attribute:date+' => '',
+	'Class:CMDBChange/Attribute:userinfo' => 'Egyéb információ',
+	'Class:CMDBChange/Attribute:userinfo+' => '',
+	'Class:CMDBChangeOp' => 'Változtatás művelet',
+	'Class:CMDBChangeOp+' => '',
+	'Class:CMDBChangeOp/Attribute:change' => 'Válktozás',
+	'Class:CMDBChangeOp/Attribute:change+' => '',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'Objektum osztály',
+	'Class:CMDBChangeOp/Attribute:objclass+' => '',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'Objektum azonosító',
+	'Class:CMDBChangeOp/Attribute:objkey+' => '',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'Típus',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+	'Class:CMDBChangeOpCreate' => 'Objektum létrehozás',
+	'Class:CMDBChangeOpCreate+' => '',
+	'Class:CMDBChangeOpDelete' => 'Objektum törlés',
+	'Class:CMDBChangeOpDelete+' => '',
+	'Class:CMDBChangeOpSetAttribute' => 'Objektum változtatás',
+	'Class:CMDBChangeOpSetAttribute+' => '',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribútum',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Tulajdonság változtatás',
+	'Class:CMDBChangeOpSetAttributeScalar+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Új érték',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob' => 'Módosítás dátuma',
+	'Class:CMDBChangeOpSetAttributeBlob+' => '',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Előző adat',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Titkosított jelszó',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Titkosított mező',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Előző érték',
+	'Class:CMDBChangeOpSetAttributeText' => 'Szöveg változás',
+	'Class:CMDBChangeOpSetAttributeText+' => '',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Előző adat',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Esemény napló',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Utolsó bejegyzés',
+	'Class:Event' => 'Napló esemény',
+	'Class:Event+' => '',
+	'Class:Event/Attribute:message' => 'Üzenet',
+	'Class:Event/Attribute:message+' => '',
+	'Class:Event/Attribute:date' => 'Dátum',
+	'Class:Event/Attribute:date+' => '',
+	'Class:Event/Attribute:userinfo' => 'Felhasználói információ',
+	'Class:Event/Attribute:userinfo+' => '',
+	'Class:Event/Attribute:finalclass' => 'Típus',
+	'Class:Event/Attribute:finalclass+' => '',
+	'Class:EventNotification' => 'Értesítés esemény',
+	'Class:EventNotification+' => '',
+	'Class:EventNotification/Attribute:trigger_id' => 'Kiváltó ok',
+	'Class:EventNotification/Attribute:trigger_id+' => '',
+	'Class:EventNotification/Attribute:action_id' => 'Felhasználó',
+	'Class:EventNotification/Attribute:action_id+' => '',
+	'Class:EventNotification/Attribute:object_id' => 'Objektum azonosító',
+	'Class:EventNotification/Attribute:object_id+' => '',
+	'Class:EventNotificationEmail' => 'E-mail küldés esemény',
+	'Class:EventNotificationEmail+' => '',
+	'Class:EventNotificationEmail/Attribute:to' => 'Címzett',
+	'Class:EventNotificationEmail/Attribute:to+' => '',
+	'Class:EventNotificationEmail/Attribute:cc' => 'Másolatot kap',
+	'Class:EventNotificationEmail/Attribute:cc+' => '',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'Titkos másolatot kap',
+	'Class:EventNotificationEmail/Attribute:bcc+' => '',
+	'Class:EventNotificationEmail/Attribute:from' => 'Feladó',
+	'Class:EventNotificationEmail/Attribute:from+' => '',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Tárgy',
+	'Class:EventNotificationEmail/Attribute:subject+' => '',
+	'Class:EventNotificationEmail/Attribute:body' => 'Szöveg',
+	'Class:EventNotificationEmail/Attribute:body+' => '',
+	'Class:EventIssue' => 'Kérés esemény',
+	'Class:EventIssue+' => '',
+	'Class:EventIssue/Attribute:issue' => 'Kérés',
+	'Class:EventIssue/Attribute:issue+' => '',
+	'Class:EventIssue/Attribute:impact' => 'Hatás',
+	'Class:EventIssue/Attribute:impact+' => '',
+	'Class:EventIssue/Attribute:page' => 'Oldal',
+	'Class:EventIssue/Attribute:page+' => '',
+	'Class:EventIssue/Attribute:arguments_post' => 'Kérés részletei',
+	'Class:EventIssue/Attribute:arguments_post+' => '',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL ',
+	'Class:EventIssue/Attribute:arguments_get+' => '',
+	'Class:EventIssue/Attribute:callstack' => 'Híváslista',
+	'Class:EventIssue/Attribute:callstack+' => '',
+	'Class:EventIssue/Attribute:data' => 'Dátum',
+	'Class:EventIssue/Attribute:data+' => '',
+	'Class:EventWebService' => 'Web szolgáltatás esemény',
+	'Class:EventWebService+' => '',
+	'Class:EventWebService/Attribute:verb' => 'Kérés',
+	'Class:EventWebService/Attribute:verb+' => '',
+	'Class:EventWebService/Attribute:result' => 'Eredmény',
+	'Class:EventWebService/Attribute:result+' => '',
+	'Class:EventWebService/Attribute:log_info' => 'Info napló',
+	'Class:EventWebService/Attribute:log_info+' => '',
+	'Class:EventWebService/Attribute:log_warning' => 'Warning napló',
+	'Class:EventWebService/Attribute:log_warning+' => '',
+	'Class:EventWebService/Attribute:log_error' => 'Error napló',
+	'Class:EventWebService/Attribute:log_error+' => '',
+	'Class:EventWebService/Attribute:data' => 'Adat',
+	'Class:EventWebService/Attribute:data+' => '',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+	'Class:EventLoginUsage' => 'Belépés esemény',
+	'Class:EventLoginUsage+' => '',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Felhasználó név',
+	'Class:EventLoginUsage/Attribute:user_id+' => '',
+	'Class:SynchroDataSource' => 'Szinkron adatforrás',
+	'Class:SynchroDataSource/Attribute:name' => 'Neve',
+	'Class:SynchroDataSource/Attribute:name+' => '',
+	'Class:SynchroDataSource/Attribute:description' => 'Leírás',
+	'Class:SynchroDataSource/Attribute:status' => 'Státusz',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Megvalósított',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Éles üzemben',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Felhasználó',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Cél osztály',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Tartalom szűkítés',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Teljesen feltöltött intervallum',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => '',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Egyeztetési szabály',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'A következő attribútum használata',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Elsődleges kulcs használata',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Létrehozás',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Firssítés',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => '',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Létrehozás',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Hiba',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (véletlen?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Törlési szabály',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Törlés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Figyelmen kívül hagyás',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Frissítés',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Frissítés után törlés',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Szabályok frissítése',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Késleltetés időtartama',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => '',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attribútum lista',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Engedélyezett felhasználók',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => '',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Csak rendszergazdák',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Mindenkinek engedélyezett az objektumok törlése',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Senki',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Ikonok URL-je',
+	'Class:SynchroDataSource/Attribute:url_icon+' => '',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Alkalmazások URL-je',
+	'Class:SynchroDataSource/Attribute:url_application+' => '',
+	'Class:SynchroAttribute' => 'Szinkron attribútumok',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Szinkron adatforrás',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Kód',
+	'Class:SynchroAttribute/Attribute:update' => 'Frissítés',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Egyeztetés',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Frissítési irányelv',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inicializálás ha üres',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Osztály',
+	'Class:SynchroAttExtKey' => 'Szinkron attribútum (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Egyeztetés attribútuma',
+	'Class:SynchroAttLinkSet' => 'Szinkron attribútum (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Sor elválasztó',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attribútum elválasztó',
+	'Class:SynchroLog' => 'Szinkron napló',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Szinkron adatforrás',
+	'Class:SynchroLog/Attribute:start_date' => 'Kezdés dátuma',
+	'Class:SynchroLog/Attribute:end_date' => 'Befejezés dátuma',
+	'Class:SynchroLog/Attribute:status' => 'Státusz',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Hibátlanul lefutott',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Hibás',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Még fut',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replikáció létrejött',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replikáció összesen',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objektumok törölve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb hibái törlés közben',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objketumok elavultak',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb hibák elavulás közben',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objketumok létrehozva',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb hibák létrehozás közben',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objektum frissítve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb hibák firssítés közben',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb hibák rekonsziliálás közben',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replikáció eltűnt',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objketumok frissítve',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objketumok változatlanok',
+	'Class:SynchroLog/Attribute:last_error' => 'Utolsó hiba',
+	'Class:SynchroLog/Attribute:traces' => 'Trace',
+	'Class:SynchroReplica' => 'Szinkron másolat',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Szinkron adatforrás',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Cél objektum azonosító',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Cél típusa',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Utolsó megtekintett',
+	'Class:SynchroReplica/Attribute:status' => 'Státusz',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Módosított',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Új',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Elavult',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Árva',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Szinkronizált',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objektum létrehozott?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Utolsó hiba',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Létrehozás dátuma',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Utolsó módosítás dátuma',
+	'Class:appUserPreferences' => 'Felhasználói beállítások',
+	'Class:appUserPreferences/Attribute:userid' => 'Felhasználó',
+	'Class:appUserPreferences/Attribute:preferences' => 'Beállítások',
+	'Core:AttributeLinkedSet' => 'Objektum tömbök',
+	'Core:AttributeLinkedSet+' => '',
+	'Core:AttributeLinkedSetIndirect' => 'Objektum tömbök (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => '',
+	'Core:AttributeInteger' => 'Integer',
+	'Core:AttributeInteger+' => '',
+	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal+' => '',
+	'Core:AttributeBoolean' => 'Boolean',
+	'Core:AttributeBoolean+' => '',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+	'Core:AttributeString' => 'String',
+	'Core:AttributeString+' => '',
+	'Core:AttributeClass' => 'Class',
+	'Core:AttributeClass+' => '',
+	'Core:AttributeApplicationLanguage' => 'Alkalmazás nyelve',
+	'Core:AttributeApplicationLanguage+' => '',
+	'Core:AttributeFinalClass' => 'Class (auto)',
+	'Core:AttributeFinalClass+' => '',
+	'Core:AttributePassword' => 'Jelszó',
+	'Core:AttributePassword+' => '',
+	'Core:AttributeEncryptedString' => 'Encrypted string',
+	'Core:AttributeEncryptedString+' => '',
+	'Core:AttributeText' => 'Text',
+	'Core:AttributeText+' => '',
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => '',
+	'Core:AttributeEmailAddress' => 'E-mail cím',
+	'Core:AttributeEmailAddress+' => '',
+	'Core:AttributeIPAddress' => 'IP cím',
+	'Core:AttributeIPAddress+' => '',
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => '',
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => '',
+	'Core:AttributeTemplateString' => 'Sablon szöveg',
+	'Core:AttributeTemplateString+' => '',
+	'Core:AttributeTemplateText' => 'Sablon szöveg',
+	'Core:AttributeTemplateText+' => '',
+	'Core:AttributeTemplateHTML' => 'Sablon HTML',
+	'Core:AttributeTemplateHTML+' => '',
+	'Core:AttributeDateTime' => 'Date/time',
+	'Core:AttributeDateTime+' => '',
+	'Core:AttributeDate' => 'Date',
+	'Core:AttributeDate+' => '',
+	'Core:AttributeDeadline' => 'Határidő',
+	'Core:AttributeDeadline+' => '',
+	'Core:AttributeExternalKey' => 'Külső kulcs',
+	'Core:AttributeExternalKey+' => '',
+	'Core:AttributeExternalField' => 'Külső mező',
+	'Core:AttributeExternalField+' => '',
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => '',
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => '',
+	'Core:AttributeOneWayPassword' => 'One way password',
+	'Core:AttributeOneWayPassword+' => '',
+	'Core:AttributeTable' => 'Table',
+	'Core:AttributeTable+' => '',
+	'Core:AttributePropertySet' => 'Tulajdonságok',
+	'Core:AttributePropertySet+' => '',
+	'Class:CMDBChangeOp/Attribute:date' => 'Dátum',
+	'Class:CMDBChangeOp/Attribute:date+' => '',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'Felhasználó',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '',
+	'Change:ObjectCreated' => 'Objektum létrehozva',
+	'Change:ObjectDeleted' => 'Objektum törölve',
+	'Change:ObjectModified' => 'Objektum módosítva',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s új értéke: %2$s (előző értéke: %3$s)',
+	'Change:AttName_SetTo' => '%1$s új értéke %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s hozzáfűzve %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s módosítva, előző érték: %2$s',
+	'Change:AttName_Changed' => '%1$s módosítva',
+	'Change:AttName_EntryAdded' => '%1$s módosítva, új bejegyzés hozzáadva.',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Felhasználó neve',
+	'Class:EventLoginUsage/Attribute:contact_name+' => '',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Felhasználó e-mail',
+	'Class:EventLoginUsage/Attribute:contact_email+' => '',
+	'Class:Action' => 'Egyedi akciók',
+	'Class:Action+' => '',
+	'Class:Action/Attribute:name' => 'Neve',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Leírás',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Státusz',
+	'Class:Action/Attribute:status+' => '',
+	'Class:Action/Attribute:status/Value:test' => 'Tesztelés alatt',
+	'Class:Action/Attribute:status/Value:test+' => '',
+	'Class:Action/Attribute:status/Value:enabled' => 'Éles üzemeben',
+	'Class:Action/Attribute:status/Value:enabled+' => '',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inaktív',
+	'Class:Action/Attribute:status/Value:disabled+' => '',
+	'Class:Action/Attribute:trigger_list' => 'Kapcsolódó kiváltó okok',
+	'Class:Action/Attribute:trigger_list+' => '',
+	'Class:Action/Attribute:finalclass' => 'Típus',
+	'Class:Action/Attribute:finalclass+' => '',
+	'Class:ActionNotification' => 'Értesítés',
+	'Class:ActionNotification+' => '',
+	'Class:Trigger' => 'Kiváltó ok',
+	'Class:Trigger+' => '',
+	'Class:Trigger/Attribute:description' => 'Leírás',
+	'Class:Trigger/Attribute:description+' => '',
+	'Class:Trigger/Attribute:action_list' => 'Kiváltott akció',
+	'Class:Trigger/Attribute:action_list+' => '',
+	'Class:Trigger/Attribute:finalclass' => 'Típus',
+	'Class:Trigger/Attribute:finalclass+' => '',
+	'Class:TriggerOnObject' => 'Kiváltó ok (osztály függő)',
+	'Class:TriggerOnObject+' => '',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Cél osztály',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnStateChange' => 'Kiváltó ok (állapot változás)',
+	'Class:TriggerOnStateChange+' => '',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Állapot',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Akció',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Kiváltó ok',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Senki',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Csak adminisztrátorok',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tíltott felhasználók',
+	'SynchroDataSource:Description' => 'Leírás',
+	'SynchroDataSource:Reconciliation' => 'Keresés &amp; rekponsziliálás',
+	'SynchroDataSource:Deletion' => 'Törlés szabályai',
+	'SynchroDataSource:Status' => 'Státusz',
+	'SynchroDataSource:Information' => 'Információ',
+	'SynchroDataSource:Definition' => 'Meghatározás',
+	'Core:SynchroAttributes' => 'Attribútumok',
+	'Core:SynchroStatus' => 'Státusz',
+	'Core:Synchro:ErrorsLabel' => 'Hibák',
+	'Core:Synchro:CreatedLabel' => 'Létrehozva',
+	'Core:Synchro:ModifiedLabel' => 'Módosítva',
+	'Core:Synchro:UnchangedLabel' => 'Változatlan',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Hibák',
+	'Core:Synchro:ReconciledLabel' => 'Rekonsziliált',
+	'Core:Synchro:ReconciledNewLabel' => 'Létrehozva',
+	'Core:SynchroReconcile:Yes' => 'Igen',
+	'Core:SynchroReconcile:No' => 'Nem',
+	'Core:SynchroUpdate:Yes' => 'Igen',
+	'Core:SynchroUpdate:No' => 'Nem',
+	'Core:Synchro:LastestStatus' => 'Utolsó státusz',
+	'Core:Synchro:History' => 'Szinkronizáció történet',
+	'Core:Synchro:NeverRun' => 'Ez a szinkronizáció még soha nem futott. Nincs még napló bejegyzés.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'Az utolsó szinkronizáció lefutásának időpontja: %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'Az szinkronizáció elindut %1$s, de még fut.',
+	'Menu:DataSources' => 'Szinkronizált adatforrások', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Core:Synchro:label_repl_ignored' => 'Figyelmen kívül hagyott (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Elveszett (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Létező (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Új (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Törölt (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Elavult (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Hibák (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Beavatkozás nem szükséges (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Változatan (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Frisített (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Hibák (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Változatlan (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Frissített (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Létrehozott (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Hibák (%1$s)',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Másolat elkészítve: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Egyeztetéshez legalább egy kulcsot meg kell adni, egyébként az egyeztetés az elsődleges kulcs alapján történik.',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A törlés késleltetésének időtartamát meg kell adni, egyébként az objektum törölve lesz annak elavulttá minősítése után.',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Lejárt objektumok frissítése nem tud megtörténni.',
+	'Core:SynchroReplica:PublicData' => 'Publikus adatok',
+	'Core:SynchroReplica:PrivateDetails' => 'Privát adatok',
+	'Core:SynchroReplica:BackToDataSource' => 'Vissza a következő szinkron adatforráshoz: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Másolatok listája',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'Azonosító (Elsődleges kulcs)',
+	'Core:SynchroAtt:attcode' => 'Attribútum',
+	'Core:SynchroAtt:attcode+' => '',
+	'Core:SynchroAtt:reconciliation' => 'Egyeztetés?',
+	'Core:SynchroAtt:reconciliation+' => '',
+	'Core:SynchroAtt:update' => 'Frissített?',
+	'Core:SynchroAtt:update+' => '',
+	'Core:SynchroAtt:update_policy' => 'Frissítési szabály',
+	'Core:SynchroAtt:update_policy+' => '',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Egyeztetés kulcsa',
+	'Core:SynchroAtt:reconciliation_attcode+' => '',
+	'Core:SyncDataExchangeComment' => '(DataExchange)',
+	'Core:Synchro:ListOfDataSources' => 'Adatforrások listája',
+	'Core:Synchro:LastSynchro' => 'Utolsó szimkronizáció',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Az objektum szinkronizálva a külső adatforrással.',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Objektum <b>létrehozva</b> a következő adatforrásban: %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Objektum <b>törölhető</b> a következő külső adatforrásból: %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => '<b>Objektum nem törölhető</b> mert egy másik adatforrás (%1$s) tulajdona',
+	'TitleSynchroExecution' => 'Szinkronizáció végrehajtás',
+	'Class:SynchroDataSource:DataTable' => 'Adatbázis tábla: %1$s',
+	'Core:SyncDataSourceObsolete' => 'Az adatforrás elvalultnak van jelölve. Művelet visszavonva.',
+	'Core:SyncDataSourceAccessRestriction' => 'Csak az adminisztrátor vagy speciális jogokkal rendelkező felhasználó futtathatja a műveletet. Művelet visszavonva.',
+	'Core:SyncTooManyMissingReplicas' => 'Import során az összes másolat elveszett. Az import valóban lefutott? Művelet visszavonva.',
+	'Core:Duration_Seconds' => '%1$sds',
+	'Core:Duration_Minutes_Seconds' => '%1$sdmin %2$sds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$sdh %2$sdmin %3$sds',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$sdh %3$sdmin %4$ds',
+	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
+	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
+	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>~~',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>~~',
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
+	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
+	'Core:AttributeFriendlyName' => 'Friendly name~~',
+	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
+	'Core:FriendlyName-Label' => 'Friendly name~~',
+	'Core:FriendlyName-Description' => 'Friendly name~~',
+	'Change:LinkSet:Added' => 'added %1$s~~',
+	'Change:LinkSet:Removed' => 'removed %1$s~~',
+	'Change:LinkSet:Modified' => 'modified %1$s~~',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
+	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)~~',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal~~',
+	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
+	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify~~',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings~~',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/it.dictionary.itop.core.php b/dictionaries/it.dictionary.itop.core.php
index 808d17ba4..3ce3f742c 100644
--- a/dictionaries/it.dictionary.itop.core.php
+++ b/dictionaries/it.dictionary.itop.core.php
@@ -1,879 +1,879 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Core:AttributeLinkedSet' => 'Array di oggetti',
-	'Core:AttributeLinkedSet+' => 'Ogni tipo di oggetto della stessa classe o sottoclasse',
-
-	'Core:AttributeLinkedSetIndirect' => 'Array di oggetti (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'ogni tipo di oggetti [sottoclasse] della stessa classe',
-
-	'Core:AttributeInteger' => 'Integer',
-	'Core:AttributeInteger+' => 'Valore numerico (non può essere negativo)',
-
-	'Core:AttributeDecimal' => 'Decimal',
-	'Core:AttributeDecimal+' => 'valore decimale (non può essere negativo)',
-
-	'Core:AttributeBoolean' => 'Booleano',
-	'Core:AttributeBoolean+' => 'Booleano',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
-	'Core:AttributeString' => 'Stringa',
-	'Core:AttributeString+' => 'Stringa alfanumerica',
-
-	'Core:AttributeClass' => 'Classe',
-	'Core:AttributeClass+' => 'Classe',
-
-	'Core:AttributeApplicationLanguage' => 'Lingua Utente',
-	'Core:AttributeApplicationLanguage+' => 'Lingua e Paese (EN US)',
-
-	'Core:AttributeFinalClass' => 'Classe (auto)',
-	'Core:AttributeFinalClass+' => 'Classe reale dell\'oggetto (automaticamente creata dal core)',
-
-	'Core:AttributePassword' => 'Password',
-	'Core:AttributePassword+' => 'Password per un dispositivo',
-
- 	'Core:AttributeEncryptedString' => 'Stringa criptata',
-	'Core:AttributeEncryptedString+' => 'Stringa cripta con una chiave locale',
-
-	'Core:AttributeText' => 'Testo',
-	'Core:AttributeText+' => 'Stringa di caratteri multilinea',
-
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => 'Stringa HTML',
-
-	'Core:AttributeEmailAddress' => 'Indirizzo Email',
-	'Core:AttributeEmailAddress+' => 'Indirizzo Email',
-
-	'Core:AttributeIPAddress' => 'Indirizzo IP',
-	'Core:AttributeIPAddress+' => 'Indirizzo IP',
-
-	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => 'Espressione Object Query Langage',
-
-	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => 'Lista di stringe alfanumeriche predefinite',
-
-	'Core:AttributeTemplateString' => 'Stringa Template',
-	'Core:AttributeTemplateString+' => 'Segnaposto contenente stringhe',
-
-	'Core:AttributeTemplateText' => 'Testo Template',
-	'Core:AttributeTemplateText+' => 'Segnaposto contenente testo',
-
-	'Core:AttributeTemplateHTML' => 'HTML Template',
-	'Core:AttributeTemplateHTML+' => 'Segnaposto contenente HTML',
-
-	'Core:AttributeDateTime' => 'Data/ora',
-	'Core:AttributeDateTime+' => 'Data e ora (anno-mese-giorno hh:mm:ss)',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Formato data:<br/>
-	<b>%1$s</b><br/>
-	Esempio: %2$s
-</p>
-<p>
-Operatori:<br/>
-	<b>&gt;</b><em>data</em><br/>
-	<b>&lt;</b><em>data</em><br/>
-	<b>[</b><em>data</em>,<em>data</em><b>]</b>
-</p>
-<p>
-Se \'oraè omessa, di default è 00:00:00
-</p>',
-
-	'Core:AttributeDate' => 'Data',
-	'Core:AttributeDate+' => 'Data (anno-mese-giorno)',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Formato data:<br/>
-	<b>%1$s</b><br/>
-	Esempio: %2$s
-</p>
-<p>
-Operatori:<br/>
-	<b>&gt;</b><em>data</em><br/>
-	<b>&lt;</b><em>data</em><br/>
-	<b>[</b><em>data</em>,<em>data</em><b>]</b>
-</p>',
-
-	'Core:AttributeDeadline' => 'Scadenza',
-	'Core:AttributeDeadline+' => 'Data visualizza relativa al tempo attuale',
-
-	'Core:AttributeExternalKey' => 'Chiave esterna',
-	'Core:AttributeExternalKey+' => 'Chiave esterna (o straniera)',
-
-	'Core:AttributeExternalField' => 'Campo esterno',
-	'Core:AttributeExternalField+' => 'Campo mappato con una chiave esterna',
-
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => 'URL assoluto o relativo, come una stringa di testo',
-
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => 'Ogni contenuto binario (documento)',
-
-	'Core:AttributeOneWayPassword' => 'Password a senso unico',
-	'Core:AttributeOneWayPassword+' => 'Password criptata (hashed) a senso unico',
-
-	'Core:AttributeTable' => 'Tabella',
-	'Core:AttributeTable+' => 'Array indicizzato a due dimensioni',
-
-	'Core:AttributePropertySet' => 'Proprietà',
-	'Core:AttributePropertySet+' => 'Elenco delle proprietà non tipizzati (nome and valore)',
-
-	'Core:AttributeFriendlyName' => 'Friendly name',
-	'Core:AttributeFriendlyName+' => 'Attributo creato automaticamente, il nome descrittivo viene calcolato dopo diversi attributi',
-
-	'Core:FriendlyName-Label' => 'Nome',
-	'Core:FriendlyName-Description' => 'Friendly name',
-));
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'core/cmdb'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: CMDBChange
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChange' => 'Cambio',
-	'Class:CMDBChange+' => 'Rilevamento delle modifiche',
-	'Class:CMDBChange/Attribute:date' => 'data',
-	'Class:CMDBChange/Attribute:date+' => 'data e l\'ora in cui i cambiamenti sono stati registrati',
-	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
-	'Class:CMDBChange/Attribute:userinfo+' => 'informazioni definite dal richiedente',
-));
-
-//
-// Class: CMDBChangeOp
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOp' => 'Operazione di cambio',
-	'Class:CMDBChangeOp+' => 'Rilevamento delle operazioni di cambio',
-	'Class:CMDBChangeOp/Attribute:change' => 'cambio',
-	'Class:CMDBChangeOp/Attribute:change+' => 'cambio',
-	'Class:CMDBChangeOp/Attribute:date' => 'data',
-	'Class:CMDBChangeOp/Attribute:date+' => 'data e ora del cambio',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'utente',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => 'chi ha fatto questo cambio',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'classe oggetto',
-	'Class:CMDBChangeOp/Attribute:objclass+' => 'classe oggetto',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'oggetto id',
-	'Class:CMDBChangeOp/Attribute:objkey+' => 'ooggetto id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'tipo',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CMDBChangeOpCreate
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOpCreate' => 'creazione oggetto',
-	'Class:CMDBChangeOpCreate+' => 'Rilevamento creazione oggetto',
-));
-
-//
-// Class: CMDBChangeOpDelete
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOpDelete' => 'cancellazione oggetto',
-	'Class:CMDBChangeOpDelete+' => 'Rilevamento cancellazione oggetto',
-));
-
-//
-// Class: CMDBChangeOpSetAttribute
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOpSetAttribute' => 'cambio oggetto',
-	'Class:CMDBChangeOpSetAttribute+' => 'Rilevamento modifiche delle proprietà dell\'oggetto',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attributo',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'ccodice della proprietà modificata',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeScalar
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => 'proprietà cambio',
-	'Class:CMDBChangeOpSetAttributeScalar+' => 'Rilevamento delle modifiche delle proprietà scalari dell\'oggetto',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valore precedente',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'valore precedente dell\'attributo',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Nuovo valore',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'nuovo valore dell\'attributo',
-));
-// Used by CMDBChangeOp... & derived classes
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Change:ObjectCreated' => 'Oggetto creato',
-	'Change:ObjectDeleted' => 'Oggetto cancellato',
-	'Change:ObjectModified' => 'Oggetto modificato',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s settato a %2$s (valore precedente: %3$s)',
-	'Change:AttName_SetTo' => '%1$s settato a  %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s allegato a %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modificato, valore precedente: %2$s',
-	'Change:AttName_Changed' => '%1$s modificato',
-	'Change:AttName_EntryAdded' => '%1$s modificato, nuova voce aggiunta: %2$s',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeBlob
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => 'dati del cambio',
-	'Class:CMDBChangeOpSetAttributeBlob+' => 'rilevamento dati del cambio',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Dati precedente',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'contenuto precedente dell\'attributo',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeText
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:CMDBChangeOpSetAttributeText' => 'cambio	testo',
-	'Class:CMDBChangeOpSetAttributeText+' => 'rilevamento cambio testo',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Dati precendenti',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'contenuto precedente dell\'attributo',
-));
-
-//
-// Class: Event
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Event' => 'Log Evento',
-	'Class:Event+' => 'Un\'applicazione evento interno',
-	'Class:Event/Attribute:message' => 'Messagio',
-	'Class:Event/Attribute:message+' => 'breve descrizione dell\'evento',
-	'Class:Event/Attribute:date' => 'Data',
-	'Class:Event/Attribute:date+' => 'data e ora a cui in cambio è stato registrato',
-	'Class:Event/Attribute:userinfo' => 'Info Utente',
-	'Class:Event/Attribute:userinfo+' => 'l\'identificazione dell\'utente che stava facendo l\'azione che ha attivato questo evento',
-	'Class:Event/Attribute:finalclass' => 'Tipo',
-	'Class:Event/Attribute:finalclass+' => '',
-));
-
-//
-// Class: EventNotification
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:EventNotification' => 'Notifica dell\'evento',
-	'Class:EventNotification+' => 'Traccia di una notifica che è stato inviato',
-	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
-	'Class:EventNotification/Attribute:trigger_id+' => 'account utente',
-	'Class:EventNotification/Attribute:action_id' => 'utente',
-	'Class:EventNotification/Attribute:action_id+' => 'account utente',
-	'Class:EventNotification/Attribute:object_id' => 'Id oggetto',
-	'Class:EventNotification/Attribute:object_id+' => 'Id oggetto (classe definita dal trigger ?)',
-));
-
-//
-// Class: EventNotificationEmail
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:EventNotificationEmail' => 'Emissione evento Email',
-	'Class:EventNotificationEmail+' => 'Traccia di una e-mail che è stato inviata',
-	'Class:EventNotificationEmail/Attribute:to' => 'A',
-	'Class:EventNotificationEmail/Attribute:to+' => 'A',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:from' => 'Da',
-	'Class:EventNotificationEmail/Attribute:from+' => 'Mittente del messaggio',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Oggetto',
-	'Class:EventNotificationEmail/Attribute:subject+' => 'Oggetto',
-	'Class:EventNotificationEmail/Attribute:body' => 'Corpo',
-	'Class:EventNotificationEmail/Attribute:body+' => 'Corpo',
-));
-
-//
-// Class: EventIssue
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:EventIssue' => 'Evento Problematico',
-	'Class:EventIssue+' => 'Traccia di un problema (avviso, errore, etc)',
-	'Class:EventIssue/Attribute:issue' => 'Problema',
-	'Class:EventIssue/Attribute:issue+' => 'Cosa è successo',
-	'Class:EventIssue/Attribute:impact' => 'Impatto',
-	'Class:EventIssue/Attribute:impact+' => 'Quali sono le conseguenze',
-	'Class:EventIssue/Attribute:page' => 'Pagina',
-	'Class:EventIssue/Attribute:page+' => 'Punto di ingresso HTTP',
-	'Class:EventIssue/Attribute:arguments_post' => 'Argomenti inviati',
-	'Class:EventIssue/Attribute:arguments_post+' => 'Argomenti POST HTTP',
-	'Class:EventIssue/Attribute:arguments_get' => 'Argomenti URL',
-	'Class:EventIssue/Attribute:arguments_get+' => 'Argomenti GET HTTP',
-	'Class:EventIssue/Attribute:callstack' => 'Pila di chiamate',
-	'Class:EventIssue/Attribute:callstack+' => 'Pila di chiamate',
-	'Class:EventIssue/Attribute:data' => 'Dati',
-	'Class:EventIssue/Attribute:data+' => 'Informazioni aggiuntive',
-));
-
-//
-// Classes: EventWebService and EventWebService
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:EventWebService' => 'Evento di servizio web',
-	'Class:EventWebService+' => 'Traccia di una chiamata di servizio web',
-	'Class:EventWebService/Attribute:verb' => 'Verbo',
-	'Class:EventWebService/Attribute:verb+' => 'Nome dell\'operazione',
-	'Class:EventWebService/Attribute:result' => 'Risultato',
-	'Class:EventWebService/Attribute:result+' => 'In generale successo/insuccesso',
-	'Class:EventWebService/Attribute:log_info' => 'Info log',
-	'Class:EventWebService/Attribute:log_info+' => 'Risultati info log',
-	'Class:EventWebService/Attribute:log_warning' => 'Warning log',
-	'Class:EventWebService/Attribute:log_warning+' => 'Risultati warning log',
-	'Class:EventWebService/Attribute:log_error' => 'Error log',
-	'Class:EventWebService/Attribute:log_error+' => 'Risultati error log',
-	'Class:EventWebService/Attribute:data' => 'Dati',
-	'Class:EventWebService/Attribute:data+' => 'Risultati dei dati',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-));
-
-//
-// Class: EventLoginUsage
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:EventLoginUsage' => 'Uso Login',
-	'Class:EventLoginUsage+' => 'Connessione all\'applicazione',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
-	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name',
-	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email',
-	'Class:EventLoginUsage/Attribute:contact_email+' => 'Indirizzo email dell\'utente',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Action' => 'Azione personalizzata',
-	'Class:Action+' => 'Azione definita dall\'utente',
-	'Class:Action/Attribute:name' => 'Nome',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Descrizione',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Stato',
-	'Class:Action/Attribute:status+' => 'In produzione o ?',
-	'Class:Action/Attribute:status/Value:test' => 'In fase di test',
-	'Class:Action/Attribute:status/Value:test+' => 'In fase di test',
-	'Class:Action/Attribute:status/Value:enabled' => 'In produzione',
-	'Class:Action/Attribute:status/Value:enabled+' => 'In produzione',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inattivo',
-	'Class:Action/Attribute:status/Value:disabled+' => 'Inattivo',
-	'Class:Action/Attribute:trigger_list' => 'Triggers correlati',
-	'Class:Action/Attribute:trigger_list+' => 'Triggers colleagati a questa azione',
-	'Class:Action/Attribute:finalclass' => 'Tipo',
-	'Class:Action/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ActionNotification
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:ActionNotification' => 'Notifica',
-	'Class:ActionNotification+' => 'Notifica (sommario)',
-));
-
-//
-// Class: ActionEmail
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:ActionEmail' => 'Email di notifica',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Test destinatario',
-	'Class:ActionEmail/Attribute:test_recipient+' => '',
-	'Class:ActionEmail/Attribute:from' => 'Da',
-	'Class:ActionEmail/Attribute:from+' => '',
-	'Class:ActionEmail/Attribute:reply_to' => 'Rispondi A',
-	'Class:ActionEmail/Attribute:reply_to+' => '',
-	'Class:ActionEmail/Attribute:to' => 'A',
-	'Class:ActionEmail/Attribute:to+' => 'Destinatario dell\'email',
-	'Class:ActionEmail/Attribute:cc' => 'Cc',
-	'Class:ActionEmail/Attribute:cc+' => 'Copia Carbone',
-	'Class:ActionEmail/Attribute:bcc' => 'BCC',
-	'Class:ActionEmail/Attribute:bcc+' => 'Copia Carbone Nascosta',
-	'Class:ActionEmail/Attribute:subject' => 'Oggetto',
-	'Class:ActionEmail/Attribute:subject+' => 'Titolo dell\'email',
-	'Class:ActionEmail/Attribute:body' => 'corpo',
-	'Class:ActionEmail/Attribute:body+' => 'Contenuto dell\'email',
-	'Class:ActionEmail/Attribute:importance' => 'Priorità',
-	'Class:ActionEmail/Attribute:importance+' => 'Priorità',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'bassa',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => 'bassa',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normale',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normale',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'alta',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => 'alta',
-));
-
-//
-// Class: Trigger
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Trigger' => 'Trigger',
-	'Class:Trigger+' => 'Gestore di eventi personalizzati',
-	'Class:Trigger/Attribute:description' => 'Descrizione',
-	'Class:Trigger/Attribute:description+' => 'una linea di descrizione',
-	'Class:Trigger/Attribute:action_list' => 'Azioni triggerate',
-	'Class:Trigger/Attribute:action_list+' => 'Azioni eseguite quando il trigger viene attivato ',
-	'Class:Trigger/Attribute:finalclass' => 'Tipo',
-	'Class:Trigger/Attribute:finalclass+' => '',
-));
-
-//
-// Class: TriggerOnObject
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnObject' => 'Trigger (classe dipendente)',
-	'Class:TriggerOnObject+' => 'Trigger su una determinata classe di oggetti',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Classe Bersaglio',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-));
-
-//
-// Class: TriggerOnPortalUpdate
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnPortalUpdate' => 'Trigger (dopo l\'aggiornamento dal portale )',
-	'Class:TriggerOnPortalUpdate+' => 'Trigger sull\'aggiornamento dell\'utente dal portale',
-));
-
-//
-// Class: TriggerOnStateChange
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnStateChange' => 'Trigger (su cambio stato)',
-	'Class:TriggerOnStateChange+' => 'Trigger su cambio stato di un oggetto',
-	'Class:TriggerOnStateChange/Attribute:state' => 'Stato',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-));
-
-//
-// Class: TriggerOnStateEnter
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnStateEnter' => 'Trigger (all\'entrata di uno stato)',
-	'Class:TriggerOnStateEnter+' => 'Trigger su cambio stato di un oggetto - entrata',
-));
-
-//
-// Class: TriggerOnStateLeave
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnStateLeave' => 'Trigger (all\'uscita di uno stato)',
-	'Class:TriggerOnStateLeave+' => 'Trigger su cambio stato di un oggetto - uscita',
-));
-
-//
-// Class: TriggerOnObjectCreate
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:TriggerOnObjectCreate' => 'Trigger (sulla creazione)',
-	'Class:TriggerOnObjectCreate+' => 'Trigger sulla creazione di un oggetto [una classe figlia di] di una data classe',
-));
-
-//
-// Class: lnkTriggerAction
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:lnkTriggerAction' => 'Azione/Trigger',
-	'Class:lnkTriggerAction+' => 'Collegamento tra trigger e azione',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Azione',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'Azione da eseguire',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Azione',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Ordine',
-	'Class:lnkTriggerAction/Attribute:order+' => 'Ordine di esecuzione delle azioni',
-));
-
-//
-// Synchro Data Source
-//
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:SynchroDataSource/Attribute:name' => 'Nome',
-	'Class:SynchroDataSource/Attribute:name+' => 'Nome',
-	'Class:SynchroDataSource/Attribute:description' => 'Descrizione',
-	'Class:SynchroDataSource/Attribute:status' => 'Stato', //TODO: enum values
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe bersaglio',
-	'Class:SynchroDataSource/Attribute:user_id' => 'Utente',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contatto a cui notificare',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contatto a cui notificare in caso di errore ',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icona del collegamento ipertestuale',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Una (piccola) immagine del collegamento ipertestuale che rappresenta l\'applicazione con cui è sincronizzato QiTop',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Collegamento ipertestuale all\'applicazione',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Collegamento ipertestuale all\'oggetto ITOP nell\'applicazione esterna con la quale QiTop è sincronizzato (se applicabile). Possibili segnaposto: $this->attribute$ e $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Policy di riconciliazione', //TODO enum values
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervallo di pieno carico',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Una ricarica completa di tutti i dati deve verificarsi almeno come specificato qui',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Azione su zero',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Azione da eseguire quando la ricerca non restituisce alcun oggetto',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Azione su uno',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Azione da eseguire quando la ricerca restituisce esattamente un oggetto',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Azione su molti',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Azione da eseguire quando la ricerca restituisce più di un oggetto',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utenti autorizati',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Chi è autorizato a cancellare gli oggetti sincronizzati',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utenti autorizati',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nessuno',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Solo l\'amministratore',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tutti gli utenti sono autorizzati',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Regole per l\'aggiornamento',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Sintassi: nome_del_campo:valore; ...',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Durata della conservazione',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo un oggetto obsoleto è tenuto prima di essere eliminato',
-	'SynchroDataSource:Description' => 'Descrizione',
-	'SynchroDataSource:Reconciliation' => 'Ricerca &amp; reconciliazione',
-	'SynchroDataSource:Deletion' => 'Regole di cancellazione',
-	'SynchroDataSource:Status' => 'Stato',
-	'SynchroDataSource:Information' => 'Informazione',
-	'SynchroDataSource:Definition' => 'Definizione',
-	'Core:SynchroAttributes' => 'Attributi',
-	'Core:SynchroStatus' => 'Stato',
-	'Core:Synchro:ErrorsLabel' => 'Errori',	
-	'Core:Synchro:CreatedLabel' => 'Creato',
-	'Core:Synchro:ModifiedLabel' => 'Modificato',
-	'Core:Synchro:UnchangedLabel' => 'Non Modificato',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Errori',
-	'Core:Synchro:ReconciledLabel' => 'Riconciliato',
-	'Core:Synchro:ReconciledNewLabel' => 'Creato',
-	'Core:SynchroReconcile:Yes' => 'Si',
-	'Core:SynchroReconcile:No' => 'No',
-	'Core:SynchroUpdate:Yes' => 'Si',
-	'Core:SynchroUpdate:No' => 'No',
-	'Core:Synchro:LastestStatus' => 'Ultimo stato',
-	'Core:Synchro:History' => 'Storia della sincronizzazione',
-	'Core:Synchro:NeverRun' => 'Questa sincronizzazione non è mai stata eseguita. Nessun Log ancora...',
-	'Core:Synchro:SynchroEndedOn_Date' => 'L\'ultima sincronizzazione si è conclusa il %1$s.~~',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La sincronizzazione è iniziata il %1$s è ancora in esecuzione...~~',
-	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Core:Synchro:label_repl_ignored' => 'Ignorato(%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Scomparso (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Esistente (%1$s)',
-	'Core:Synchro:label_repl_new' => 'Nuovo (%1$s)~~',
-	'Core:Synchro:label_obj_deleted' => 'Cancellato (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Obsoleto (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Errori (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'Nessuna Azione (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Non modificato(%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Aggiornato (%1$s)',
-	'Core:Synchro:label_obj_updated_errors' => 'Errori (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Non modificato (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Aggiornato (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Creato (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Errori (%1$s)',
-	'Core:Synchro:History' => 'Storia della sincronizzazione',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica processata: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Almeno una chiave riconciliazione deve essere specificata, o la policy di conciliazione deve essere quella di utilizzare la chiave primaria',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Deve essere specificato un periodo di conservazione di cancellazione , dato che gli oggetti devono essere eliminati dopo essere contrassegnati come obsoleti ',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Oggetti obsoleti devono essere aggiornati, ma nessun aggiornamento è specificato',
-	'Core:SynchroReplica:PublicData' => 'Dati Pubblici',
-	'Core:SynchroReplica:PrivateDetails' => 'Dettagli Privati',
-	'Core:SynchroReplica:BackToDataSource' => 'Torna indietro alla sorgente di sincronizzazione dei dati: %1$s~~',
-	'Core:SynchroReplica:ListOfReplicas' => 'Lista della Replica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Chiave Primaria)',
-	'Core:SynchroAtt:attcode' => 'Attributo',
-	'Core:SynchroAtt:attcode+' => 'Campo dell\'oggetto',
-	'Core:SynchroAtt:reconciliation' => 'Riconciliazione ?',
-	'Core:SynchroAtt:reconciliation+' => 'Usato per la ricerca',
-	'Core:SynchroAtt:update' => 'Aggiornamento ?',
-	'Core:SynchroAtt:update+' => 'Usato per aggiornare l\'oggetto',
-	'Core:SynchroAtt:update_policy' => 'Policy di aggiornamento',
-	'Core:SynchroAtt:update_policy+' => 'Comportamento del campo aggiornato',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Chiave di riconciliazione',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Codice attributo per la chiave esterna di riconciliazione',
-	'Core:SyncDataExchangeComment' => '(Scambio dati)',
-	'Core:Synchro:ListOfDataSources' => 'Lista delle sorgenti di dati:',
-	'Core:Synchro:LastSynchro' => 'Ultima sincronizzazione:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'Questo oggetto è sincronizzato con una sorgente esterna di dati',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'L\'oggetti è stato <b>creato</b> da una sorgente esterna di dati %1$s~~',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'L\'oggetti <b>può essere cancellato</b> da una sorgente esterna di dati %1$s~~',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Tu <b>non puoi cancellare l\'oggetto</b> perché è di proprietà della sorgente dati esterna %1$s~~',
-	'TitleSynchroExecution' => 'Esecuzione della sincronizzazione',
-	'Class:SynchroDataSource:DataTable' => 'Tabella del database: %1$s',
-	'Core:SyncDataSourceObsolete' => 'La fonte dei dati è contrassegnata come obsoleta. Operazione annullata',
-	'Core:SyncDataSourceAccessRestriction' => 'Solo amministratori o l\'utente specificato nella fonte dei dati può eseguire questa operazione. Operazione annullata',
-	'Core:SyncTooManyMissingReplicas' => 'Tutte le repliche sono mancanti dall\'importazione. Hai eseguito realmente l\'importazione? Operazione annullata',
-'Core:SyncSplitModeCLIOnly' => 'La sincronizzazione può essere eseguita in blocchi solo se eseguito in modalità CLI',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s repliche, %2$s errore(i), %3$s warning(s).',
-	'Core:SynchroReplica:TargetObject' => 'Oggetto Sincronizzato: %1$s',
-	'Class:AsyncSendEmail' => 'Email (asincrono)',
-	'Class:AsyncSendEmail/Attribute:to' => 'A',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Oggetto',
-	'Class:AsyncSendEmail/Attribute:body' => 'Corpo',
-	'Class:AsyncSendEmail/Attribute:header' => 'Intestazione',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Password criptata',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Valore Precedente',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Campo criptato',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valore Precedente',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Log della casistica',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Ultima voce',
-	'Class:SynchroDataSource' => 'Sorgente sincronizzazione dati',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementazione',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produzione',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Campo di restrizione',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utilizzare gli attributi',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utilizzare il campo della chiave primaria',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crea',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Errore',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Errore',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aggiornamento',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crea',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Errore',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendi il primo (casualmente?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Policy di cancellazione',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Cancella',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignora',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aggiorna',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi Cancella',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista degli attributi',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Solo Amministratore',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tutti sono autorizzati a cancellare gli oggetti',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nessuno',
-	'Class:SynchroAttribute' => 'Attributo di sincronizzazione',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Codice Attributo',
-	'Class:SynchroAttribute/Attribute:update' => 'Aggiorna',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Riconcilia',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Policy di Aggiornamento',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Bloccato',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Sbloccato',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inizializza se vuoto',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Classe',
-	'Class:SynchroAttExtKey' => 'Attributo di sincronizzazione (ExtKey)',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Attributo di riconciliazione',
-	'Class:SynchroAttLinkSet' => 'Attributo di sincronizzazione (Linkset)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Separatore di riga',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributi separatori',
-	'Class:SynchroLog' => 'Sincro Log',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
-	'Class:SynchroLog/Attribute:start_date' => 'Data di Inizio',
-	'Class:SynchroLog/Attribute:end_date' => 'Data di Fine',
-	'Class:SynchroLog/Attribute:status' => 'Stato',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completo',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Errore',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Ancora in esecuzione',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'N. di replica viste',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'N. di replica totali',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'N. di oggetti cancellati',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'N. di errori durante l\'eliminazione',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'N. di oggetti obsoleti',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'N. di errori durante l\'invecchiamento',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'N. di oggetti creati',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'N. di errori durante la creazione',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'N. di oggetti aggiornati',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'N. di errori durante l\'aggiornamento',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'N. di errori durante la riconcilazione',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'N. di repliche scomparse',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'N. di oggetti aggiornati',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'N. di oggetti non modificati',
-	'Class:SynchroLog/Attribute:last_error' => 'Ultimo eroore',
-	'Class:SynchroLog/Attribute:traces' => 'Tracce',
-	'Class:SynchroReplica' => 'Synchro Replica',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Oggetto di destinazione (ID)',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Tipo di destinazione',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Ultimo visto',
-	'Class:SynchroReplica/Attribute:status' => 'Stato',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificato',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nuovo',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orfano',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Sincronizzato',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Oggetto creato ?',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Utimo errore',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data di creazione',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Data di ultima modifica',
-	'Class:appUserPreferences' => 'Preferenze utente',
-	'Class:appUserPreferences/Attribute:userid' => 'Utente',
-	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
-	'Core:ExecProcess:Code1' => 'Comando errato o comando finito con errori (es. errato nome dello script)',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
-));
-
-//
-// Attribute Duration
-//
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Core:Duration_Seconds' => '%1$ds',
-	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$sec',
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sg %2$dh %3$dmin %4$ds',
-	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
-	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
-	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
-	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
-	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
-	'Change:LinkSet:Added' => 'added %1$s~~',
-	'Change:LinkSet:Removed' => 'removed %1$s~~',
-	'Change:LinkSet:Modified' => 'modified %1$s~~',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
-	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
-	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:DateTime:Placeholder_d' => 'GG', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'G', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Core:AttributeLinkedSet' => 'Array di oggetti',
+	'Core:AttributeLinkedSet+' => 'Ogni tipo di oggetto della stessa classe o sottoclasse',
+
+	'Core:AttributeLinkedSetIndirect' => 'Array di oggetti (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => 'ogni tipo di oggetti [sottoclasse] della stessa classe',
+
+	'Core:AttributeInteger' => 'Integer',
+	'Core:AttributeInteger+' => 'Valore numerico (non può essere negativo)',
+
+	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal+' => 'valore decimale (non può essere negativo)',
+
+	'Core:AttributeBoolean' => 'Booleano',
+	'Core:AttributeBoolean+' => 'Booleano',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+
+	'Core:AttributeString' => 'Stringa',
+	'Core:AttributeString+' => 'Stringa alfanumerica',
+
+	'Core:AttributeClass' => 'Classe',
+	'Core:AttributeClass+' => 'Classe',
+
+	'Core:AttributeApplicationLanguage' => 'Lingua Utente',
+	'Core:AttributeApplicationLanguage+' => 'Lingua e Paese (EN US)',
+
+	'Core:AttributeFinalClass' => 'Classe (auto)',
+	'Core:AttributeFinalClass+' => 'Classe reale dell\'oggetto (automaticamente creata dal core)',
+
+	'Core:AttributePassword' => 'Password',
+	'Core:AttributePassword+' => 'Password per un dispositivo',
+
+ 	'Core:AttributeEncryptedString' => 'Stringa criptata',
+	'Core:AttributeEncryptedString+' => 'Stringa cripta con una chiave locale',
+
+	'Core:AttributeText' => 'Testo',
+	'Core:AttributeText+' => 'Stringa di caratteri multilinea',
+
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'Stringa HTML',
+
+	'Core:AttributeEmailAddress' => 'Indirizzo Email',
+	'Core:AttributeEmailAddress+' => 'Indirizzo Email',
+
+	'Core:AttributeIPAddress' => 'Indirizzo IP',
+	'Core:AttributeIPAddress+' => 'Indirizzo IP',
+
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => 'Espressione Object Query Langage',
+
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => 'Lista di stringe alfanumeriche predefinite',
+
+	'Core:AttributeTemplateString' => 'Stringa Template',
+	'Core:AttributeTemplateString+' => 'Segnaposto contenente stringhe',
+
+	'Core:AttributeTemplateText' => 'Testo Template',
+	'Core:AttributeTemplateText+' => 'Segnaposto contenente testo',
+
+	'Core:AttributeTemplateHTML' => 'HTML Template',
+	'Core:AttributeTemplateHTML+' => 'Segnaposto contenente HTML',
+
+	'Core:AttributeDateTime' => 'Data/ora',
+	'Core:AttributeDateTime+' => 'Data e ora (anno-mese-giorno hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Formato data:<br/>
+	<b>%1$s</b><br/>
+	Esempio: %2$s
+</p>
+<p>
+Operatori:<br/>
+	<b>&gt;</b><em>data</em><br/>
+	<b>&lt;</b><em>data</em><br/>
+	<b>[</b><em>data</em>,<em>data</em><b>]</b>
+</p>
+<p>
+Se \'oraè omessa, di default è 00:00:00
+</p>',
+
+	'Core:AttributeDate' => 'Data',
+	'Core:AttributeDate+' => 'Data (anno-mese-giorno)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Formato data:<br/>
+	<b>%1$s</b><br/>
+	Esempio: %2$s
+</p>
+<p>
+Operatori:<br/>
+	<b>&gt;</b><em>data</em><br/>
+	<b>&lt;</b><em>data</em><br/>
+	<b>[</b><em>data</em>,<em>data</em><b>]</b>
+</p>',
+
+	'Core:AttributeDeadline' => 'Scadenza',
+	'Core:AttributeDeadline+' => 'Data visualizza relativa al tempo attuale',
+
+	'Core:AttributeExternalKey' => 'Chiave esterna',
+	'Core:AttributeExternalKey+' => 'Chiave esterna (o straniera)',
+
+	'Core:AttributeExternalField' => 'Campo esterno',
+	'Core:AttributeExternalField+' => 'Campo mappato con una chiave esterna',
+
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => 'URL assoluto o relativo, come una stringa di testo',
+
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => 'Ogni contenuto binario (documento)',
+
+	'Core:AttributeOneWayPassword' => 'Password a senso unico',
+	'Core:AttributeOneWayPassword+' => 'Password criptata (hashed) a senso unico',
+
+	'Core:AttributeTable' => 'Tabella',
+	'Core:AttributeTable+' => 'Array indicizzato a due dimensioni',
+
+	'Core:AttributePropertySet' => 'Proprietà',
+	'Core:AttributePropertySet+' => 'Elenco delle proprietà non tipizzati (nome and valore)',
+
+	'Core:AttributeFriendlyName' => 'Friendly name',
+	'Core:AttributeFriendlyName+' => 'Attributo creato automaticamente, il nome descrittivo viene calcolato dopo diversi attributi',
+
+	'Core:FriendlyName-Label' => 'Nome',
+	'Core:FriendlyName-Description' => 'Friendly name',
+));
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChange' => 'Cambio',
+	'Class:CMDBChange+' => 'Rilevamento delle modifiche',
+	'Class:CMDBChange/Attribute:date' => 'data',
+	'Class:CMDBChange/Attribute:date+' => 'data e l\'ora in cui i cambiamenti sono stati registrati',
+	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
+	'Class:CMDBChange/Attribute:userinfo+' => 'informazioni definite dal richiedente',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOp' => 'Operazione di cambio',
+	'Class:CMDBChangeOp+' => 'Rilevamento delle operazioni di cambio',
+	'Class:CMDBChangeOp/Attribute:change' => 'cambio',
+	'Class:CMDBChangeOp/Attribute:change+' => 'cambio',
+	'Class:CMDBChangeOp/Attribute:date' => 'data',
+	'Class:CMDBChangeOp/Attribute:date+' => 'data e ora del cambio',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'utente',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'chi ha fatto questo cambio',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'classe oggetto',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'classe oggetto',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'oggetto id',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'ooggetto id',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'tipo',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOpCreate' => 'creazione oggetto',
+	'Class:CMDBChangeOpCreate+' => 'Rilevamento creazione oggetto',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOpDelete' => 'cancellazione oggetto',
+	'Class:CMDBChangeOpDelete+' => 'Rilevamento cancellazione oggetto',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOpSetAttribute' => 'cambio oggetto',
+	'Class:CMDBChangeOpSetAttribute+' => 'Rilevamento modifiche delle proprietà dell\'oggetto',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attributo',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'ccodice della proprietà modificata',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => 'proprietà cambio',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Rilevamento delle modifiche delle proprietà scalari dell\'oggetto',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valore precedente',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'valore precedente dell\'attributo',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Nuovo valore',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'nuovo valore dell\'attributo',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Change:ObjectCreated' => 'Oggetto creato',
+	'Change:ObjectDeleted' => 'Oggetto cancellato',
+	'Change:ObjectModified' => 'Oggetto modificato',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s settato a %2$s (valore precedente: %3$s)',
+	'Change:AttName_SetTo' => '%1$s settato a  %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s allegato a %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modificato, valore precedente: %2$s',
+	'Change:AttName_Changed' => '%1$s modificato',
+	'Change:AttName_EntryAdded' => '%1$s modificato, nuova voce aggiunta: %2$s',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => 'dati del cambio',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'rilevamento dati del cambio',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Dati precedente',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'contenuto precedente dell\'attributo',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:CMDBChangeOpSetAttributeText' => 'cambio	testo',
+	'Class:CMDBChangeOpSetAttributeText+' => 'rilevamento cambio testo',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Dati precendenti',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'contenuto precedente dell\'attributo',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Event' => 'Log Evento',
+	'Class:Event+' => 'Un\'applicazione evento interno',
+	'Class:Event/Attribute:message' => 'Messagio',
+	'Class:Event/Attribute:message+' => 'breve descrizione dell\'evento',
+	'Class:Event/Attribute:date' => 'Data',
+	'Class:Event/Attribute:date+' => 'data e ora a cui in cambio è stato registrato',
+	'Class:Event/Attribute:userinfo' => 'Info Utente',
+	'Class:Event/Attribute:userinfo+' => 'l\'identificazione dell\'utente che stava facendo l\'azione che ha attivato questo evento',
+	'Class:Event/Attribute:finalclass' => 'Tipo',
+	'Class:Event/Attribute:finalclass+' => '',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:EventNotification' => 'Notifica dell\'evento',
+	'Class:EventNotification+' => 'Traccia di una notifica che è stato inviato',
+	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
+	'Class:EventNotification/Attribute:trigger_id+' => 'account utente',
+	'Class:EventNotification/Attribute:action_id' => 'utente',
+	'Class:EventNotification/Attribute:action_id+' => 'account utente',
+	'Class:EventNotification/Attribute:object_id' => 'Id oggetto',
+	'Class:EventNotification/Attribute:object_id+' => 'Id oggetto (classe definita dal trigger ?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:EventNotificationEmail' => 'Emissione evento Email',
+	'Class:EventNotificationEmail+' => 'Traccia di una e-mail che è stato inviata',
+	'Class:EventNotificationEmail/Attribute:to' => 'A',
+	'Class:EventNotificationEmail/Attribute:to+' => 'A',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:from' => 'Da',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Mittente del messaggio',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Oggetto',
+	'Class:EventNotificationEmail/Attribute:subject+' => 'Oggetto',
+	'Class:EventNotificationEmail/Attribute:body' => 'Corpo',
+	'Class:EventNotificationEmail/Attribute:body+' => 'Corpo',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:EventIssue' => 'Evento Problematico',
+	'Class:EventIssue+' => 'Traccia di un problema (avviso, errore, etc)',
+	'Class:EventIssue/Attribute:issue' => 'Problema',
+	'Class:EventIssue/Attribute:issue+' => 'Cosa è successo',
+	'Class:EventIssue/Attribute:impact' => 'Impatto',
+	'Class:EventIssue/Attribute:impact+' => 'Quali sono le conseguenze',
+	'Class:EventIssue/Attribute:page' => 'Pagina',
+	'Class:EventIssue/Attribute:page+' => 'Punto di ingresso HTTP',
+	'Class:EventIssue/Attribute:arguments_post' => 'Argomenti inviati',
+	'Class:EventIssue/Attribute:arguments_post+' => 'Argomenti POST HTTP',
+	'Class:EventIssue/Attribute:arguments_get' => 'Argomenti URL',
+	'Class:EventIssue/Attribute:arguments_get+' => 'Argomenti GET HTTP',
+	'Class:EventIssue/Attribute:callstack' => 'Pila di chiamate',
+	'Class:EventIssue/Attribute:callstack+' => 'Pila di chiamate',
+	'Class:EventIssue/Attribute:data' => 'Dati',
+	'Class:EventIssue/Attribute:data+' => 'Informazioni aggiuntive',
+));
+
+//
+// Classes: EventWebService and EventWebService
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:EventWebService' => 'Evento di servizio web',
+	'Class:EventWebService+' => 'Traccia di una chiamata di servizio web',
+	'Class:EventWebService/Attribute:verb' => 'Verbo',
+	'Class:EventWebService/Attribute:verb+' => 'Nome dell\'operazione',
+	'Class:EventWebService/Attribute:result' => 'Risultato',
+	'Class:EventWebService/Attribute:result+' => 'In generale successo/insuccesso',
+	'Class:EventWebService/Attribute:log_info' => 'Info log',
+	'Class:EventWebService/Attribute:log_info+' => 'Risultati info log',
+	'Class:EventWebService/Attribute:log_warning' => 'Warning log',
+	'Class:EventWebService/Attribute:log_warning+' => 'Risultati warning log',
+	'Class:EventWebService/Attribute:log_error' => 'Error log',
+	'Class:EventWebService/Attribute:log_error+' => 'Risultati error log',
+	'Class:EventWebService/Attribute:data' => 'Dati',
+	'Class:EventWebService/Attribute:data+' => 'Risultati dei dati',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+));
+
+//
+// Class: EventLoginUsage
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:EventLoginUsage' => 'Uso Login',
+	'Class:EventLoginUsage+' => 'Connessione all\'applicazione',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Indirizzo email dell\'utente',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Action' => 'Azione personalizzata',
+	'Class:Action+' => 'Azione definita dall\'utente',
+	'Class:Action/Attribute:name' => 'Nome',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Descrizione',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Stato',
+	'Class:Action/Attribute:status+' => 'In produzione o ?',
+	'Class:Action/Attribute:status/Value:test' => 'In fase di test',
+	'Class:Action/Attribute:status/Value:test+' => 'In fase di test',
+	'Class:Action/Attribute:status/Value:enabled' => 'In produzione',
+	'Class:Action/Attribute:status/Value:enabled+' => 'In produzione',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inattivo',
+	'Class:Action/Attribute:status/Value:disabled+' => 'Inattivo',
+	'Class:Action/Attribute:trigger_list' => 'Triggers correlati',
+	'Class:Action/Attribute:trigger_list+' => 'Triggers colleagati a questa azione',
+	'Class:Action/Attribute:finalclass' => 'Tipo',
+	'Class:Action/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:ActionNotification' => 'Notifica',
+	'Class:ActionNotification+' => 'Notifica (sommario)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:ActionEmail' => 'Email di notifica',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Test destinatario',
+	'Class:ActionEmail/Attribute:test_recipient+' => '',
+	'Class:ActionEmail/Attribute:from' => 'Da',
+	'Class:ActionEmail/Attribute:from+' => '',
+	'Class:ActionEmail/Attribute:reply_to' => 'Rispondi A',
+	'Class:ActionEmail/Attribute:reply_to+' => '',
+	'Class:ActionEmail/Attribute:to' => 'A',
+	'Class:ActionEmail/Attribute:to+' => 'Destinatario dell\'email',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Copia Carbone',
+	'Class:ActionEmail/Attribute:bcc' => 'BCC',
+	'Class:ActionEmail/Attribute:bcc+' => 'Copia Carbone Nascosta',
+	'Class:ActionEmail/Attribute:subject' => 'Oggetto',
+	'Class:ActionEmail/Attribute:subject+' => 'Titolo dell\'email',
+	'Class:ActionEmail/Attribute:body' => 'corpo',
+	'Class:ActionEmail/Attribute:body+' => 'Contenuto dell\'email',
+	'Class:ActionEmail/Attribute:importance' => 'Priorità',
+	'Class:ActionEmail/Attribute:importance+' => 'Priorità',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'bassa',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => 'bassa',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normale',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normale',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'alta',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => 'alta',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Trigger' => 'Trigger',
+	'Class:Trigger+' => 'Gestore di eventi personalizzati',
+	'Class:Trigger/Attribute:description' => 'Descrizione',
+	'Class:Trigger/Attribute:description+' => 'una linea di descrizione',
+	'Class:Trigger/Attribute:action_list' => 'Azioni triggerate',
+	'Class:Trigger/Attribute:action_list+' => 'Azioni eseguite quando il trigger viene attivato ',
+	'Class:Trigger/Attribute:finalclass' => 'Tipo',
+	'Class:Trigger/Attribute:finalclass+' => '',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnObject' => 'Trigger (classe dipendente)',
+	'Class:TriggerOnObject+' => 'Trigger su una determinata classe di oggetti',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Classe Bersaglio',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+));
+
+//
+// Class: TriggerOnPortalUpdate
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnPortalUpdate' => 'Trigger (dopo l\'aggiornamento dal portale )',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger sull\'aggiornamento dell\'utente dal portale',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnStateChange' => 'Trigger (su cambio stato)',
+	'Class:TriggerOnStateChange+' => 'Trigger su cambio stato di un oggetto',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Stato',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnStateEnter' => 'Trigger (all\'entrata di uno stato)',
+	'Class:TriggerOnStateEnter+' => 'Trigger su cambio stato di un oggetto - entrata',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnStateLeave' => 'Trigger (all\'uscita di uno stato)',
+	'Class:TriggerOnStateLeave+' => 'Trigger su cambio stato di un oggetto - uscita',
+));
+
+//
+// Class: TriggerOnObjectCreate
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:TriggerOnObjectCreate' => 'Trigger (sulla creazione)',
+	'Class:TriggerOnObjectCreate+' => 'Trigger sulla creazione di un oggetto [una classe figlia di] di una data classe',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:lnkTriggerAction' => 'Azione/Trigger',
+	'Class:lnkTriggerAction+' => 'Collegamento tra trigger e azione',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Azione',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'Azione da eseguire',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Azione',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Ordine',
+	'Class:lnkTriggerAction/Attribute:order+' => 'Ordine di esecuzione delle azioni',
+));
+
+//
+// Synchro Data Source
+//
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:SynchroDataSource/Attribute:name' => 'Nome',
+	'Class:SynchroDataSource/Attribute:name+' => 'Nome',
+	'Class:SynchroDataSource/Attribute:description' => 'Descrizione',
+	'Class:SynchroDataSource/Attribute:status' => 'Stato', //TODO: enum values
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe bersaglio',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Utente',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contatto a cui notificare',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contatto a cui notificare in caso di errore ',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icona del collegamento ipertestuale',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Una (piccola) immagine del collegamento ipertestuale che rappresenta l\'applicazione con cui è sincronizzato QiTop',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Collegamento ipertestuale all\'applicazione',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Collegamento ipertestuale all\'oggetto ITOP nell\'applicazione esterna con la quale QiTop è sincronizzato (se applicabile). Possibili segnaposto: $this->attribute$ e $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Policy di riconciliazione', //TODO enum values
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervallo di pieno carico',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Una ricarica completa di tutti i dati deve verificarsi almeno come specificato qui',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Azione su zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Azione da eseguire quando la ricerca non restituisce alcun oggetto',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Azione su uno',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Azione da eseguire quando la ricerca restituisce esattamente un oggetto',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Azione su molti',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Azione da eseguire quando la ricerca restituisce più di un oggetto',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utenti autorizati',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Chi è autorizato a cancellare gli oggetti sincronizzati',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Utenti autorizati',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nessuno',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Solo l\'amministratore',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Tutti gli utenti sono autorizzati',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Regole per l\'aggiornamento',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Sintassi: nome_del_campo:valore; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Durata della conservazione',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo un oggetto obsoleto è tenuto prima di essere eliminato',
+	'SynchroDataSource:Description' => 'Descrizione',
+	'SynchroDataSource:Reconciliation' => 'Ricerca &amp; reconciliazione',
+	'SynchroDataSource:Deletion' => 'Regole di cancellazione',
+	'SynchroDataSource:Status' => 'Stato',
+	'SynchroDataSource:Information' => 'Informazione',
+	'SynchroDataSource:Definition' => 'Definizione',
+	'Core:SynchroAttributes' => 'Attributi',
+	'Core:SynchroStatus' => 'Stato',
+	'Core:Synchro:ErrorsLabel' => 'Errori',	
+	'Core:Synchro:CreatedLabel' => 'Creato',
+	'Core:Synchro:ModifiedLabel' => 'Modificato',
+	'Core:Synchro:UnchangedLabel' => 'Non Modificato',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errori',
+	'Core:Synchro:ReconciledLabel' => 'Riconciliato',
+	'Core:Synchro:ReconciledNewLabel' => 'Creato',
+	'Core:SynchroReconcile:Yes' => 'Si',
+	'Core:SynchroReconcile:No' => 'No',
+	'Core:SynchroUpdate:Yes' => 'Si',
+	'Core:SynchroUpdate:No' => 'No',
+	'Core:Synchro:LastestStatus' => 'Ultimo stato',
+	'Core:Synchro:History' => 'Storia della sincronizzazione',
+	'Core:Synchro:NeverRun' => 'Questa sincronizzazione non è mai stata eseguita. Nessun Log ancora...',
+	'Core:Synchro:SynchroEndedOn_Date' => 'L\'ultima sincronizzazione si è conclusa il %1$s.~~',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'La sincronizzazione è iniziata il %1$s è ancora in esecuzione...~~',
+	'Menu:DataSources' => 'Sorgente di sincronizzazione dei dati', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Core:Synchro:label_repl_ignored' => 'Ignorato(%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Scomparso (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Esistente (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Nuovo (%1$s)~~',
+	'Core:Synchro:label_obj_deleted' => 'Cancellato (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleto (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errori (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Nessuna Azione (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Non modificato(%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Aggiornato (%1$s)',
+	'Core:Synchro:label_obj_updated_errors' => 'Errori (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Non modificato (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Aggiornato (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Creato (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Errori (%1$s)',
+	'Core:Synchro:History' => 'Storia della sincronizzazione',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica processata: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Almeno una chiave riconciliazione deve essere specificata, o la policy di conciliazione deve essere quella di utilizzare la chiave primaria',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Deve essere specificato un periodo di conservazione di cancellazione , dato che gli oggetti devono essere eliminati dopo essere contrassegnati come obsoleti ',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Oggetti obsoleti devono essere aggiornati, ma nessun aggiornamento è specificato',
+	'Core:SynchroReplica:PublicData' => 'Dati Pubblici',
+	'Core:SynchroReplica:PrivateDetails' => 'Dettagli Privati',
+	'Core:SynchroReplica:BackToDataSource' => 'Torna indietro alla sorgente di sincronizzazione dei dati: %1$s~~',
+	'Core:SynchroReplica:ListOfReplicas' => 'Lista della Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Chiave Primaria)',
+	'Core:SynchroAtt:attcode' => 'Attributo',
+	'Core:SynchroAtt:attcode+' => 'Campo dell\'oggetto',
+	'Core:SynchroAtt:reconciliation' => 'Riconciliazione ?',
+	'Core:SynchroAtt:reconciliation+' => 'Usato per la ricerca',
+	'Core:SynchroAtt:update' => 'Aggiornamento ?',
+	'Core:SynchroAtt:update+' => 'Usato per aggiornare l\'oggetto',
+	'Core:SynchroAtt:update_policy' => 'Policy di aggiornamento',
+	'Core:SynchroAtt:update_policy+' => 'Comportamento del campo aggiornato',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Chiave di riconciliazione',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Codice attributo per la chiave esterna di riconciliazione',
+	'Core:SyncDataExchangeComment' => '(Scambio dati)',
+	'Core:Synchro:ListOfDataSources' => 'Lista delle sorgenti di dati:',
+	'Core:Synchro:LastSynchro' => 'Ultima sincronizzazione:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Questo oggetto è sincronizzato con una sorgente esterna di dati',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'L\'oggetti è stato <b>creato</b> da una sorgente esterna di dati %1$s~~',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'L\'oggetti <b>può essere cancellato</b> da una sorgente esterna di dati %1$s~~',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Tu <b>non puoi cancellare l\'oggetto</b> perché è di proprietà della sorgente dati esterna %1$s~~',
+	'TitleSynchroExecution' => 'Esecuzione della sincronizzazione',
+	'Class:SynchroDataSource:DataTable' => 'Tabella del database: %1$s',
+	'Core:SyncDataSourceObsolete' => 'La fonte dei dati è contrassegnata come obsoleta. Operazione annullata',
+	'Core:SyncDataSourceAccessRestriction' => 'Solo amministratori o l\'utente specificato nella fonte dei dati può eseguire questa operazione. Operazione annullata',
+	'Core:SyncTooManyMissingReplicas' => 'Tutte le repliche sono mancanti dall\'importazione. Hai eseguito realmente l\'importazione? Operazione annullata',
+'Core:SyncSplitModeCLIOnly' => 'La sincronizzazione può essere eseguita in blocchi solo se eseguito in modalità CLI',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s repliche, %2$s errore(i), %3$s warning(s).',
+	'Core:SynchroReplica:TargetObject' => 'Oggetto Sincronizzato: %1$s',
+	'Class:AsyncSendEmail' => 'Email (asincrono)',
+	'Class:AsyncSendEmail/Attribute:to' => 'A',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Oggetto',
+	'Class:AsyncSendEmail/Attribute:body' => 'Corpo',
+	'Class:AsyncSendEmail/Attribute:header' => 'Intestazione',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Password criptata',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Valore Precedente',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Campo criptato',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valore Precedente',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Log della casistica',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Ultima voce',
+	'Class:SynchroDataSource' => 'Sorgente sincronizzazione dati',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementazione',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produzione',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Campo di restrizione',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Utilizzare gli attributi',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Utilizzare il campo della chiave primaria',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Crea',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Aggiornamento',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Crea',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Errore',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Prendi il primo (casualmente?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Policy di cancellazione',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Cancella',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignora',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Aggiorna',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Aggiorna e poi Cancella',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lista degli attributi',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Solo Amministratore',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Tutti sono autorizzati a cancellare gli oggetti',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nessuno',
+	'Class:SynchroAttribute' => 'Attributo di sincronizzazione',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Codice Attributo',
+	'Class:SynchroAttribute/Attribute:update' => 'Aggiorna',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Riconcilia',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Policy di Aggiornamento',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Bloccato',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Sbloccato',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Inizializza se vuoto',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Classe',
+	'Class:SynchroAttExtKey' => 'Attributo di sincronizzazione (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Attributo di riconciliazione',
+	'Class:SynchroAttLinkSet' => 'Attributo di sincronizzazione (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Separatore di riga',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributi separatori',
+	'Class:SynchroLog' => 'Sincro Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
+	'Class:SynchroLog/Attribute:start_date' => 'Data di Inizio',
+	'Class:SynchroLog/Attribute:end_date' => 'Data di Fine',
+	'Class:SynchroLog/Attribute:status' => 'Stato',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completo',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Errore',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Ancora in esecuzione',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'N. di replica viste',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'N. di replica totali',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'N. di oggetti cancellati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'N. di errori durante l\'eliminazione',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'N. di oggetti obsoleti',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'N. di errori durante l\'invecchiamento',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'N. di oggetti creati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'N. di errori durante la creazione',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'N. di oggetti aggiornati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'N. di errori durante l\'aggiornamento',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'N. di errori durante la riconcilazione',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'N. di repliche scomparse',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'N. di oggetti aggiornati',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'N. di oggetti non modificati',
+	'Class:SynchroLog/Attribute:last_error' => 'Ultimo eroore',
+	'Class:SynchroLog/Attribute:traces' => 'Tracce',
+	'Class:SynchroReplica' => 'Synchro Replica',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Sorgente dati per la sincronizzazione',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Oggetto di destinazione (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Tipo di destinazione',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Ultimo visto',
+	'Class:SynchroReplica/Attribute:status' => 'Stato',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificato',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nuovo',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orfano',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Sincronizzato',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Oggetto creato ?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Utimo errore',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data di creazione',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Data di ultima modifica',
+	'Class:appUserPreferences' => 'Preferenze utente',
+	'Class:appUserPreferences/Attribute:userid' => 'Utente',
+	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',
+	'Core:ExecProcess:Code1' => 'Comando errato o comando finito con errori (es. errato nome dello script)',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)',
+));
+
+//
+// Attribute Duration
+//
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Core:Duration_Seconds' => '%1$ds',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$sec',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sg %2$dh %3$dmin %4$ds',
+	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
+	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
+	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
+	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
+	'Change:LinkSet:Added' => 'added %1$s~~',
+	'Change:LinkSet:Removed' => 'removed %1$s~~',
+	'Change:LinkSet:Modified' => 'modified %1$s~~',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
+	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
+	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:DateTime:Placeholder_d' => 'GG', // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j' => 'G', // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
+	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
+	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
+	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
+	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
+	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
+	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php
index 98b9bc2e6..ddbd0749e 100644
--- a/dictionaries/it.dictionary.itop.ui.php
+++ b/dictionaries/it.dictionary.itop.ui.php
@@ -1,1249 +1,1249 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:AuditCategory' => 'Categoria di Audit',
-	'Class:AuditCategory+' => 'Una sezione all\'interno del controllo globale',
-	'Class:AuditCategory/Attribute:name' => 'Nome della categoria',
-	'Class:AuditCategory/Attribute:name+' => 'Abbreviazione per questa categoria',
-	'Class:AuditCategory/Attribute:description' => 'Descrizione della categoria di Audit',
-	'Class:AuditCategory/Attribute:description+' => 'Descrizione dettagliata della categoria di audit',
-	'Class:AuditCategory/Attribute:definition_set' => 'Insieme di definizione',
-	'Class:AuditCategory/Attribute:definition_set+' => 'Espressione OQLche definisce l\'insieme di oggetti da controllare',
-	'Class:AuditCategory/Attribute:rules_list' => 'Regole di Audit',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Regolele di audit per queste categorie',
-));
-
-//
-// Class: AuditRule
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:AuditRule' => 'Regola di Audit',
-	'Class:AuditRule+' => '',
-	'Class:AuditRule/Attribute:name' => 'Nome della regola',
-	'Class:AuditRule/Attribute:name+' => '',
-	'Class:AuditRule/Attribute:description' => 'Descrizione della regola di Audit',
-	'Class:AuditRule/Attribute:description+' => 'Descrizione dettagliata per questa regola di audit ',
-	'Class:AuditRule/Attribute:query' => 'Query da eseguire',
-	'Class:AuditRule/Attribute:query+' => 'Espressio OQL da eseguire',
-	'Class:AuditRule/Attribute:valid_flag' => 'Oggetti validi?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'Vero se la regola ritorna oggetti validi, falso altrimenti ',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'vero',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'vero',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'falso',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'falso',
-	'Class:AuditRule/Attribute:category_id' => 'Categoria',
-	'Class:AuditRule/Attribute:category_id+' => 'Categoria per questa regola',
-	'Class:AuditRule/Attribute:category_name' => 'Categoria',
-	'Class:AuditRule/Attribute:category_name+' => 'Nome della categoria per questa regola',
-));
-
-//
-// Class: QueryOQL
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:Query' => 'Query',
-	'Class:Query+' => 'Una query è un insieme di dati definito in modo dinamico',
-	'Class:Query/Attribute:name' => 'Nome',
-	'Class:Query/Attribute:name+' => 'Identificativi della query',
-	'Class:Query/Attribute:description' => 'Descrizione',
-	'Class:Query/Attribute:description+' => 'Descrizione dettagliata della query(scopo, usagoetc.)',
-	'Class:Query/Attribute:fields' => 'Campi',
-	'Class:Query/Attribute:fields+' => 'Lista di attributi separati da virgola (o alias.attributo) per l\'esportazione',
-
-	'Class:QueryOQL' => 'OQL Query',
-	'Class:QueryOQL+' => 'Una query basata su Object Query Language',
-	'Class:QueryOQL/Attribute:oql' => 'Espressione',
-	'Class:QueryOQL/Attribute:oql+' => 'Espressione OQL',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:User' => 'Utente',
-	'Class:User+' => 'Login Utente',
-	'Class:User/Attribute:finalclass' => 'Tipo di account',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => 'Contatto (persona)',
-	'Class:User/Attribute:contactid+' => 'Dettagli personali per dati aziendali',
-	'Class:User/Attribute:last_name' => 'Cognome',
-	'Class:User/Attribute:last_name+' => 'Cognome del contatto corrispondente',
-	'Class:User/Attribute:first_name' => 'Nome',
-	'Class:User/Attribute:first_name+' => 'Nome del contatto corrispondente',
-	'Class:User/Attribute:email' => 'Email',
-	'Class:User/Attribute:email+' => 'Email del contatto corrispondente',
-	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'Stringa di identificazione dell\'utente',
-	'Class:User/Attribute:language' => 'Lingua',
-	'Class:User/Attribute:language+' => 'Lingua utente',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:IT IT' => 'Italiano',
-	'Class:User/Attribute:language/Value:IT IT+' => 'Italiano (IT)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:profile_list' => 'Profili',
-	'Class:User/Attribute:profile_list+' => 'Regole per  la concessione dei diritti per quella persona',
-	'Class:User/Attribute:allowed_org_list' => 'Organizzazione Consentite',
-	'Class:User/Attribute:allowed_org_list+' => 'L\'utente finale è autorizzato a vedere i dati appartenenti alle seguenti organizzazioni. Se non è specificato organizzazione, vi è alcuna restrizione.',
-
-	'Class:User/Error:LoginMustBeUnique' => 'Il Login deve essere unico - "%1s" già usato',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Almeno un profilo deve essere assegnato all\'utente.',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_Profiles' => 'Profilo',
-	'Class:URP_Profiles+' => '',
-	'Class:URP_Profiles/Attribute:name' => 'Nome',
-	'Class:URP_Profiles/Attribute:name+' => '',
-	'Class:URP_Profiles/Attribute:description' => 'Descrizione',
-	'Class:URP_Profiles/Attribute:description+' => 'una linea di descrizione',
-	'Class:URP_Profiles/Attribute:user_list' => 'Utenti',
-	'Class:URP_Profiles/Attribute:user_list+' => 'Persone che hanno questo ruuolo',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_Dimensions' => 'dimensione',
-	'Class:URP_Dimensions+' => 'dimensione dell\'applicazione (definizione di silos))',
-	'Class:URP_Dimensions/Attribute:name' => 'Nome',
-	'Class:URP_Dimensions/Attribute:name+' => 'etichetta',
-	'Class:URP_Dimensions/Attribute:description' => 'Descrizione',
-	'Class:URP_Dimensions/Attribute:description+' => 'una linea di descrizione',
-	'Class:URP_Dimensions/Attribute:type' => 'Tipo',
-	'Class:URP_Dimensions/Attribute:type+' => 'nome della classe o tipo di dato (proiezione dell\'unità)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_UserProfile' => 'Utente da Profilare',
-	'Class:URP_UserProfile+' => '',
-	'Class:URP_UserProfile/Attribute:userid' => 'Utente',
-	'Class:URP_UserProfile/Attribute:userid+' => '',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'User\'s login',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Profilo',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'utilizzo del profilo',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profilo',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Nome del profilo',
-	'Class:URP_UserProfile/Attribute:reason' => 'Motivo',
-	'Class:URP_UserProfile/Attribute:reason+' => 'spiega perchè questo utente dovrebbe avere questo ruolo',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_UserOrg' => 'Organizzazione dell\'utente',
-	'Class:URP_UserOrg+' => '',
-	'Class:URP_UserOrg/Attribute:userid' => 'Utente',
-	'Class:URP_UserOrg/Attribute:userid+' => 'Account Utente',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login Utente',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organizazione',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Organizzazione permesse',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organizzazione',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Organizzazione permesse',
-	'Class:URP_UserOrg/Attribute:reason' => 'Motivo',
-	'Class:URP_UserOrg/Attribute:reason+' => '',
-
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_ProfileProjection' => 'profile_projection',
-	'Class:URP_ProfileProjection+' => 'proiezioni di profilo',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensione',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'dimensione applicazione',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensione',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'dimensione applicazione',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profilo',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'utilizzo di profilo',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Profilo',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Nome del profilo',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Valore dell\'espressione',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'Espressione OQL  (uso $user) | constante|  | +codice attributo',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attributo',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Codice attributo bersaglio (opzionale)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_ClassProjection' => 'class_projection',
-	'Class:URP_ClassProjection+' => 'proiezioni di classe',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensione',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'dimensione dell\'applicazione',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensione',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'dimensione applicazione',
-	'Class:URP_ClassProjection/Attribute:class' => 'Classe',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Classe bersaglio',
-	'Class:URP_ClassProjection/Attribute:value' => 'Valore dell\'espressione',
-	'Class:URP_ClassProjection/Attribute:value+' => 'Espressione OQL (uso $this) | constante|  | +codice attributo',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Attributo',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Codice attributo bersaglio (opzionale)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_ActionGrant' => 'azione_autorizzazione',
-	'Class:URP_ActionGrant+' => 'permesso su classi',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Profilo',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'Utilizzo del profilo',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profilo',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'Utilizzo del profilo',
-	'Class:URP_ActionGrant/Attribute:class' => 'Classe',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Classe bersaglio',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Autorizzazione',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'permesso non permesso',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'si',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'si',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_ActionGrant/Attribute:action' => 'Azione',
-	'Class:URP_ActionGrant/Attribute:action+' => 'operazioni da effettuare sulla data classe',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_ActionGrant/Attribute:action' => 'Azione',
-	'Class:URP_ActionGrant/Attribute:action+' => '',
-	'Class:URP_StimulusGrant' => 'stimulus_autorizzazione',
-	'Class:URP_StimulusGrant+' => '',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profilo',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => '',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Classe',
-	'Class:URP_StimulusGrant/Attribute:class+' => '',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Autorizzazione',
-	'Class:URP_StimulusGrant/Attribute:permission+' => '',
-'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'si',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'si',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'no',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'Codice per lo Stimolus',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'Class:URP_AttributeGrant' => 'attributo_autorizzazione',
-	'Class:URP_AttributeGrant+' => 'autorizzazioni a livello di attributi',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Azione di sovvenzione',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'azione di sovvenzione',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attributo',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'codice attributo',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'BooleanLabel:yes' => 'si',
-	'BooleanLabel:no' => 'no',
-	'Menu:WelcomeMenu' => 'Benveuto', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Benvenuto', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => 'Benveuto su iTop',
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop è un completo Portale Funzionale IT, Open Source.</p>
-<ul>Esso include:
-<li>Un completo CMDB (Configuration management database) per documentare e gestire l\'IT di inventario.</li>
-<li>Un modulo di gestione degli incidenti per monitorare e comunicare su tutte le problematiche che si verificano nel settore IT.</li>
-<li>Un modulo di gestione delle modifiche per pianificare e monitorare i cambiamenti all\'ambiente IT.</li>
-<li>Una banca dati errori noti per accelerare la risoluzione di incidenti.</li>
-<li>Un modulo di interruzione per documentare tutte le interruzioni pianificate e notificare gli opportuni contatti.</li>
-<li>Un cruscotto per ottenere rapidamente una panoramica del sistema IT.</li>
-</ul>
-<p>Tutti i moduli possono essere installati, passo dopo passo, indipendentemente l\'uno dall\'altro.</p>',
-	'UI:WelcomeMenu:RightBlock' => '<p>iTop è fornitore di servizi di orientamento, che consente ai progettisti di gestire più o organizzazioni o clienti con facilità.
-<ul>>iTop, offre un set ricco di funzionalità dei processi di business che:
-<li>Migliora l\'efficacia di gestione IT</li> 
-<li>Guida le prestazione delle operazioni IT</li> 
-<li>Migliora la soddisfazione del cliente e fornisce ai dirigenti un idea della performance del business.</li>
-</ul>
-</p>
-<p>iTop è completamente aperto per essere integrato all\'interno della vostra infrastruttura di gestione dell\'IT.</p>
-<p>
-<ul>L\'adozione di questa nuova generazione di portale funzionale IT vi aiuterà a:
-<li>Meglio gestire un ambiente IT sempre più complesso.</li>
-<li>Implementare i processi ITIL al proprio ritmo.</li>
-<li>Gestire la risorsa più importante della tua IT: Documentazione.</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => 'Apri le richieste: %1$d',
-	'UI:WelcomeMenu:MyCalls' => 'Le mie richieste',
-	'UI:WelcomeMenu:OpenIncidents' => 'Apri gli incidenti: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => 'Elementi di Configurazione (CI): %1$d',
-	'UI:WelcomeMenu:MyIncidents' => 'Incidenti assegnati a me',
-	'UI:AllOrganizations' => ' Tutte le Organizzazioni ',
-	'UI:YourSearch' => 'La tua Cerca',
-	'UI:LoggedAsMessage' => 'Logged come %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (Amministratore)',
-	'UI:Button:Logoff' => 'Log off',
-	'UI:Button:GlobalSearch' => 'Cerca',
-	'UI:Button:Search' => ' Cerca',
-	'UI:Button:Query' => ' Domanda',
-	'UI:Button:Ok' => 'Ok',
-	'UI:Button:Cancel' => 'Cancella',
-	'UI:Button:Apply' => 'Applica',
-	'UI:Button:Back' => ' << Indietro',
-	'UI:Button:Restart' => ' |<< Riavvia',
-	'UI:Button:Next' => ' Prossimo >> ',
-	'UI:Button:Finish' => ' Fine',
-	'UI:Button:DoImport' => ' Esegui le Imporazioni ! ~~',
-	'UI:Button:Done' => ' Fatto',
-	'UI:Button:SimulateImport' => ' Simula l\'Importazione ~~',
-	'UI:Button:Test' => 'Testa!',
-	'UI:Button:Evaluate' => ' Valuta',
-	'UI:Button:Evaluate:Title' => ' Valuta (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' Aggiungi... ~~',
-	'UI:Button:BrowseObjects' => ' Sfoglia... ~~',
-	'UI:Button:Add' => ' Aggiungi ~~',
-	'UI:Button:AddToList' => ' << Aggiungi ~~',
-	'UI:Button:RemoveFromList' => ' Rimuovi >> ~~',
-	'UI:Button:FilterList' => ' Filtra... ~~',
-	'UI:Button:Create' => ' Crea ~~',
-	'UI:Button:Delete' => ' Cancella ! ~~',
-	'UI:Button:ChangePassword' => ' Cambia Password ~~',
-	'UI:Button:ResetPassword' => ' Resetta Password ~~',
-	'UI:SearchToggle' => 'Cerca',
-	'UI:ClickToCreateNew' => 'Crea un nuovo %1$s~~',
-	'UI:SearchFor_Class' => 'Cerca l\'oggetto %1$s',
-	'UI:NoObjectToDisplay' => 'Nessun oggetto da mostrare.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'Object_id parametro è obbligatorio quando link_attr è specificato. Verificare la definizione del modello di display.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Target_attr parametro è obbligatorio quando link_attr è specificato. Verificare la definizione del modello di display.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'Il parametro è group_by obbligatoria. Verificare la definizione del modello di display.',
-	'UI:Error:InvalidGroupByFields' => 'Elenco di campi non valido per il raggruppamento: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'Errore: Stile non supportato di blocco: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Errata definizione di link: la classe di oggetti da gestire: %1$s non è stato trovato come chiave esterna nella classe %2$s',
-	'UI:Error:Object_Class_Id_NotFound' => 'Oggetto: %1$s:%2$d non trovato.',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'Errore: Riferimento circolare nelle dipendenze tra i campi, controllare il modello di dati.',
-	'UI:Error:UploadedFileTooBig' => 'Il file caricato è troppo grande. (dimensione massima consentita è di %1$s). Verificare di configurazione di PHP per upload_max_filesize e post_max_size.',
-	'UI:Error:UploadedFileTruncated.' => 'Il file caricato è stata troncato !',
-	'UI:Error:NoTmpDir' => 'La directory temporanea non è definita.',
-	'UI:Error:CannotWriteToTmp_Dir' => 'Impossibile scrivere il file temporaneo sul disco. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'Caricamento fermato per estensione. (Nome del file originale = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'Il caricamento del file non riuscito, causa sconosciuta. (Codice errore = "%1$s").',
-	'UI:Error:1ParametersMissing' => 'Errore: il seguente parametro deve essere specificato per questa operazione: %1$s.',
-	 'UI:Error:2ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s e %2$s.',
-        'UI:Error:3ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s e %3$s.',
-        'UI:Error:4ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s, %3$s e %4$s.',
-        'UI:Error:IncorrectOQLQuery_Message' => 'Errore: errata OQL query: %1$s',
-	 'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Si è verificato un errore durante l\'esecuzione della query: %1$s',
-        'UI:Error:ObjectAlreadyUpdated' => 'Errore: l\'oggetto è già stato aggiornato.',
-        'UI:Error:ObjectCannotBeUpdated' => 'Errore: oggetto non può essere aggiornato.',
-        'UI:Error:ObjectsAlreadyDeleted' => 'Errore: gli oggetti sono già stati eliminati!',
-        'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Non hai i permessi per eseguire una eliminazione collettiva degli oggetti della classe %1$s',
-        'UI:Error:DeleteNotAllowedOn_Class' => 'Non ti è permesso di eliminare gli oggetti della classe %1$s',
-        'UI:Error:BulkModifyNotAllowedOn_Class' => 'Non hai i permessi per eseguire un aggiornamento collettivo degli oggetti della classe %1$s',
-        'UI:Error:ObjectAlreadyCloned' => 'Errore: l\'oggetto è già stato clonato!',
-        'UI:Error:ObjectAlreadyCreated' => 'Errore: l\'oggetto è già stato creato!',
-        'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Errore: stimolo non valido "%1$s" su un oggetto %2$s nello stato "%3$s".',
-
-
-	'UI:GroupBy:Count' => 'Conteggio',
-	'UI:GroupBy:Count+' => '',
-	'UI:CountOfObjects' => '%1$d oggetti corrispondenti ai criteri.',
-	'UI_CountOfObjectsShort' => '%1$d oggetti.',
-        'UI:NoObject_Class_ToDisplay' => 'No %1$s da visualizzare',
-        'UI:History:LastModified_On_By' => 'Ultima modifica %1$s da %2$s.',
-        'UI:HistoryTab' => 'Storia',
-        'UI:NotificationsTab' => 'Notifiche',
-        'UI:History:BulkImports' => 'Storia',
-        'UI:History:BulkImports+' => 'Elenco delle importazioni CSV (primo ultimo)',
-        'UI:History:BulkImportDetails' => 'Modifiche derivanti dai importazione CSV eseguita su %1$s (da %2$s)',
-	'UI:History:Date' => 'Data',
-	'UI:History:Date+' => '',
-	'UI:History:User' => 'Utente',
-	'UI:History:User+' => '',
-	'UI:History:Changes' => 'Modifiche',
-	'UI:History:Changes+' => '',
-	'UI:History:StatsCreations' => 'Creato',
-	'UI:History:StatsCreations+' => '',
-	'UI:History:StatsModifs' => 'Modificato',
-	'UI:History:StatsModifs+' => '',
-	'UI:History:StatsDeletes' => 'Cancellato',
-	'UI:History:StatsDeletes+' => '',
-	'UI:Loading' => 'Caricamento...',
-	'UI:Menu:Actions' => 'Azioni',
-	'UI:Menu:OtherActions' => 'Altre Azioni',
-	'UI:Menu:New' => 'Nuovo...',
-	'UI:Menu:Add' => 'Aggiungi...',
-	'UI:Menu:Manage' => 'Gestischi...',
-	'UI:Menu:EMail' => 'eMail',
-	'UI:Menu:CSVExport' => 'CSV Export...',
-	'UI:Menu:Modify' => 'Modifica...',
-	'UI:Menu:Delete' => 'Cancella...',
-	'UI:Menu:Manage' => 'Gestisci...',
-	'UI:Menu:BulkDelete' => 'Cancella...',
-	'UI:UndefinedObject' => 'non definito',
-	'UI:Document:OpenInNewWindow:Download' => 'Apri in una nuova finestra: %1$s, Scarica: %2$s',
-	'UI:SelectAllToggle+' => '',
-	'UI:TruncatedResults' => '%1$d oggetti visualizzati su %2$d',
-	'UI:DisplayAll' => 'Mostra tutto',
-	'UI:CollapseList' => 'Collassa',
-	'UI:CountOfResults' => '%1$d oggetto(i)',
-	'UI:ChangesLogTitle' => 'Log delle modifiche (%1$d):',
-	'UI:EmptyChangesLogTitle' => 'Log delle modifiche è vuoto',
-	'UI:SearchFor_Class_Objects' => 'Cerca per  %1$s Oggetti',
-	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
-	'UI:OQLQueryTab' => 'OQL Query',
-	'UI:SimpleSearchTab' => 'Ricerca semplice',
-	'UI:Details+' => '',
-	'UI:SearchValue:Any' => '* Qualsiasi *',
-	'UI:SearchValue:Mixed' => '* misti *',
-	'UI:SelectOne' => '-- selezionare uno --',
-	'UI:Login:Welcome' => 'Benvenuti su iTop!',
-	'UI:Login:IncorrectLoginPassword' => 'Errato login/password, si prega di riprovare.',
-	'UI:Login:IdentifyYourself' => 'Identifica te stesso prima di continuare',
-	'UI:Login:UserNamePrompt' => 'Nome Utente',
-        'UI:Login:PasswordPrompt' => 'Password',
-        'UI:Login:ChangeYourPassword' => 'Cambia la tua password',
-        'UI:Login:OldPasswordPrompt' => 'Vecchia password',
-        'UI:Login:NewPasswordPrompt' => 'Nuova password',
-        'UI:Login:RetypeNewPasswordPrompt' => 'Riscrivi la nuova password',
-        'UI:Login:IncorrectOldPassword' => 'Errore: la vecchia password non è corretta',
-        'UI:LogOffMenu' => 'Log off',
-	'UI:LogOff:ThankYou' => 'Grazie per aver scelto iTop',
-	'UI:LogOff:ClickHereToLoginAgain' => 'Clicca qui per effettuare il login di nuovo...',
-        'UI:ChangePwdMenu' => 'Cambia Password...',
-        'UI:AccessRO-All' => 'iTop è di sola lettura',
-        'UI:AccessRO-Users' => 'iTop è di sola lettura per gli utenti finali',
-        'UI:Login:RetypePwdDoesNotMatch' => 'Nuova password e la nuova password digitata nuovamente non corrispondono !',
-        'UI:Button:Login' => 'Entra in iTop',
-
-	'UI:Login:Error:AccessRestricted' => 'L\'accesso a iTop è limitato. Si prega di contattare un amministratore iTop.',
-	'UI:Login:Error:AccessAdmin' => 'Accesso limitato alle persone che hanno privilegi di amministratore. Si prega di contattare un amministratore iTop.',
-	'UI:CSVImport:MappingSelectOne' => '-- seleziona uno --',
-	'UI:CSVImport:MappingNotApplicable' => '-- ignora questo campo --',
-	'UI:CSVImport:NoData' => 'Insieme di dati vuoto ..., si prega di fornire alcuni dati!',
-	'UI:Title:DataPreview' => 'Anteprima dati',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'Errore: I dati contengono solo una colonna. Avete selezionato il carattere separatore appropriato?',
-	'UI:CSVImport:FieldName' => 'Campo %1$d',
-	'UI:CSVImport:DataLine1' => 'Dati Linea 1',
-	'UI:CSVImport:DataLine2' => 'Dati Linea 2',
-	'UI:CSVImport:idField' => 'id (Chiave Primaria)',
-	'UI:Title:BulkImport' => 'iTop - importazione collettiva',
-	'UI:Title:BulkImport+' => '',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronizzazione di %1$d oggetti della classe %2$s',
-	'UI:CSVImport:ClassesSelectOne' => '-- seleziona uno --',
-	'UI:CSVImport:ErrorExtendedAttCode' => 'Errore interno: "%1$s" è un codice errato, perché "%2$s" NON è una chiave esterna della classe "%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d oggetto(i) rimarrà invariato.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d oggetto(i) sarà modificato.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d oggetto(i) sarà aggiunto.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d oggetto(i) avranno i errori.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d oggetto(i) è rimasto invariato.',
-	'UI:CSVImport:ObjectsWereModified' =>  '%1$d oggetto(i) sono stati modificati.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d oggetto(i) sono stati aggiunti.',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$d oggetto(i) hanno avuto errori.',
-	'UI:Title:CSVImportStep2' => 'Step 2 of 5: opzioni dati CVS',
-	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Mappatura dei dati',
-	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Importa simulazione',
-	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Importazione completata',
-	'UI:CSVImport:LinesNotImported' => 'Linee che non possono essere caricate:',
-	'UI:CSVImport:LinesNotImported+' => '',
-	'UI:CSVImport:SeparatorComma+' => '',
-	'UI:CSVImport:SeparatorSemicolon+' => '',
-	'UI:CSVImport:SeparatorTab+' => '',
-	'UI:CSVImport:SeparatorOther' => 'altri:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '',
-	'UI:CSVImport:QualifierSimpleQuote+' => '',
-	'UI:CSVImport:QualifierOther' => 'other:~~',
-	'UI:CSVImport:TreatFirstLineAsHeader' => 'Tratta la prima riga come intestazione (nomi di colonna)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Salta le linee %1$s all\'inzio del file',
-	'UI:CSVImport:CSVDataPreview' => 'CSV Anteprima dei dati',
-	'UI:CSVImport:SelectFile' => 'Selezionare il file da importare:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'Carica da un file',
-	'UI:CSVImport:Tab:CopyPaste' => 'Copia e incolla i dati',
-	'UI:CSVImport:Tab:Templates' => 'Modelli',
-	'UI:CSVImport:PasteData' => 'Incolla i dati da importare:',
-	'UI:CSVImport:PickClassForTemplate' =>  'Scegli il modello da scaricare: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Separatore di carattere:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Testo di qualificazione carattere',
-	'UI:CSVImport:CommentsAndHeader' => 'Commenti e intestazione',
-	'UI:CSVImport:SelectClass' => 'Selezionare la classe da importare:',
-	'UI:CSVImport:AdvancedMode' => 'Modalità avanzata',
-	'UI:CSVImport:AdvancedMode+' => '',
-	'UI:CSVImport:SelectAClassFirst' => 'Per configurare il mapping, selezionare prima una classe.',
-	'UI:CSVImport:HeaderFields' => 'Campi',
-	'UI:CSVImport:HeaderMappings' => 'Mappings',
-	'UI:CSVImport:HeaderSearch' => 'Cerca?',
-	'UI:CSVImport:AlertIncompleteMapping' => 'Per favore seleziona una mappatura per ogni campo.',
-	'UI:CSVImport:AlertNoSearchCriteria' => 'Per favore seleziona almeno un criterio di ricerca',
-	'UI:CSVImport:Encoding' => 'Codifica dei caratteri',
-	'UI:UniversalSearchTitle' => 'iTop - Ricerca Universale',
-	'UI:UniversalSearch:Error' => 'Errore: %1$s~~',
-	'UI:UniversalSearch:LabelSelectTheClass' => 'Seleziona la classe per la ricerca: ',
-	'UI:Audit:Title' => 'iTop - CMDB Audit~~',
-	'UI:Audit:InteractiveAudit' => 'Audit Interattivo',
-	'UI:Audit:HeaderAuditRule' => 'Regole di Audit',
-	'UI:Audit:HeaderNbObjects' => '# Oggetti',
-	'UI:Audit:HeaderNbErrors' => '# Errori',
-	'UI:Audit:PercentageOk' => '% Ok',
-	'UI:RunQuery:Title' => 'iTop - Valutazione Query OQL',
-	'UI:RunQuery:QueryExamples' => 'Esempi di Query',
-	'UI:RunQuery:HeaderPurpose' => 'Scopo',
-	'UI:RunQuery:HeaderPurpose+' => '',
-	'UI:RunQuery:HeaderOQLExpression' => 'Espressioni OQL',
-	'UI:RunQuery:HeaderOQLExpression+' => '',
-	'UI:RunQuery:ExpressionToEvaluate' => 'Espressione da valutare: ',
-	'UI:RunQuery:MoreInfo' => 'Maggiori informazioni sulla query: ',
-	'UI:RunQuery:DevelopedQuery' => 'Espressione della query riqualificata:',
-	'UI:RunQuery:SerializedFilter' => 'Filtro pubblicato: ',
-	'UI:RunQuery:Error' => 'Si è verificato un errore durante l\'esecuzione della query: %1$s',
-	'UI:Schema:Title' => 'iTop schema degli oggetti',
-	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
-	'UI:Schema:Relationships' => 'Relazioni',
-	'UI:Schema:AbstractClass' => 'Classe astratta: nessun oggetto da questa classe può essere istanziato.',
-	'UI:Schema:NonAbstractClass' => 'Classe non-astratta: oggetti da questa classe possono essere istanziati.',
-	'UI:Schema:ClassHierarchyTitle' => 'Gerarchia delle classi',
-	'UI:Schema:AllClasses' => 'Tutte le classi',
-	'UI:Schema:ExternalKey_To' => 'Chiave esterna  %1$s',
-	'UI:Schema:Columns_Description' => 'Colonne: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'Default: "%1$s"',
-	'UI:Schema:NullAllowed' => 'Null consentito',
-	'UI:Schema:NullNotAllowed' => 'Null NON consentito',
-	'UI:Schema:Attributes' => 'Attributi',
-	'UI:Schema:AttributeCode' => 'Codice attributo',
-	'UI:Schema:AttributeCode+' => '',
-	'UI:Schema:Label' =>  'Etichetta',
-	'UI:Schema:Label+' => '',
-	'UI:Schema:Type' => 'Tipo',
-	'UI:Schema:Type+' => '',
-	'UI:Schema:Origin' => 'Origine',
-	'UI:Schema:Origin+' => '',
-	'UI:Schema:Description' => 'Descrizione',
-	'UI:Schema:Description+' => '',
-	'UI:Schema:AllowedValues' => 'Valori consentiti',
-	'UI:Schema:AllowedValues+' => '',
-	'UI:Schema:MoreInfo' => 'Maggiori informazioni',
-	'UI:Schema:MoreInfo+' => '',
-	'UI:Schema:SearchCriteria' => 'Criteri di ricerca',
-	'UI:Schema:FilterCode' => 'Codice di filtro',
-	'UI:Schema:FilterCode+' => '',
-	'UI:Schema:FilterDescription' => 'Descrizione',
-	'UI:Schema:FilterDescription+' => '',
-	'UI:Schema:AvailOperators' => 'Operatori disponibili',
-	'UI:Schema:AvailOperators+' => '',
-	'UI:Schema:ChildClasses' => 'Classi figlio',
-	'UI:Schema:ReferencingClasses' => 'Classi di rifermento',
-	'UI:Schema:RelatedClasses' => 'Classi correlate',
-	'UI:Schema:LifeCycle' => 'Ciclo di vita',
-	'UI:Schema:Triggers' => 'Triggers',
-	'UI:Schema:Relation_Code_Description' => 'Relazione <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' =>  'Giù: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Su: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: propagato al livello %2$d, query: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: non si propaga a (%2$d livelli), query: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s fa riferimento la classe %2$s tramite il campo %3$s',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s è legata alla %2$s via %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n' => 'Classi che puntano a %1$s (1:n links):',
-	'UI:Schema:Links:n-n' => 'Classi legati alla %1$s (n:n links):',
-	'UI:Schema:Links:All' => 'Grafico di tutte le classi correlate',
-	'UI:Schema:NoLifeCyle' => 'Non vi è alcun ciclo di vita definito per questa classe.',
-	'UI:Schema:LifeCycleTransitions' => 'Transizioni',
-	'UI:Schema:LifeCyleAttributeOptions' => 'Opzioni per l\'attributo',
-	'UI:Schema:LifeCycleHiddenAttribute' => 'Nascosto',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Di sola lettura',
-	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obbigatorio',
-	'UI:Schema:LifeCycleAttributeMustChange' => 'Deve cambiare',
-	'UI:Schema:LifeCycleAttributeMustPrompt' =>  'All\'utente verrà richiesto di modificare il valore',
-	'UI:Schema:LifeCycleEmptyList' => 'lista vuota',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => '',
-	'UI:Combo:SelectValue' => '--- seleziona un valore ---',
-	'UI:Label:SelectedObjects' => 'oggetti selezionati: ',
-	'UI:Label:AvailableObjects' => 'Oggetti disponibili: ',
-	'UI:Link_Class_Attributes' => '%1$s attributi',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Aggiungi l\'oggeto %1$s collegato con %2$s: %3$s',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Aggiungi l\'oggeto %1$s al collegamento con %2$s',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gestisci l\'oggetto %1$s collegato con %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Aggiungi %1$s...',
-	'UI:RemoveLinkedObjectsOf_Class' => 'Rimuovi gli oggetti selezionati',
-	'UI:Message:EmptyList:UseAdd' => 'La lista è vuota, utilizzare il pulsante "Aggiungi ..." per aggiungere elementi.',
-	'UI:Message:EmptyList:UseSearchForm' => 'Utilizza il modulo di ricerca qui sopra per cercare oggetti da aggiungere.',
-	'UI:Wizard:FinalStepTitle' => 'Passo finale: la conferma',
-	'UI:Title:DeletionOf_Object' => 'Soppressione di %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Cancellazione collettiva di %1$d oggetti della classe %2$s',
-	'UI:Delete:NotAllowedToDelete' => 'Non ti è permesso di eliminare l\'oggetto',
-	'UI:Delete:NotAllowedToUpdate_Fields' =>  'Non hai i permessi per aggiornare il seguente campo(i): %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'Questo oggetto non può essere cancellato perché l\'utente corrente non dispone dei diritti necessari',
-	'UI:Error:CannotDeleteBecause' => 'Questo oggetto non può essere cancellato perchè: %1$s~~',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s a nome di %2$s',
-	'UI:Delete:Deleted' => 'deleted~~',
-	'UI:Delete:AutomaticallyDeleted' => 'automaticamente eliminato',
-	'UI:Delete:AutomaticResetOf_Fields' => 'ripristino automatico del campo(i): %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => 'Pulizia di tutti i riferimenti a %1$s...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Pulizia di tutti i riferimenti a %1$d oggetti di classe %2$s...',
-	'UI:Delete:Done+' => '',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s cancellato.',
-	'UI:Delete:ConfirmDeletionOf_Name' => 'Soppressione di %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Soppressione di %1$d oggetti di classe %2$s',
-	'UI:Delete:CannotDeleteBecause' => 'Non può essere cancellato: %1$s~~',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Dovrebbe essere eliminato automaticamente, ma questo non è fattibile: %1$s~~',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Deve essere cancellato manualmente, ma questo non è fattibile: %1$s~~',
-	'UI:Delete:WillBeDeletedAutomatically' => 'Sarà cancellato automaticamente',
-	'UI:Delete:MustBeDeletedManually' => 'Deve essere cancellato manualmente',
-	'UI:Delete:CannotUpdateBecause_Issue' => 'Dovrebbero essere automaticamente aggiornati, ma: %1$s~~',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Sarà automaticamente aggiornato (reset: %1$s)~~',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d oggetti/link fanno riferimento %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d oggetti / link fanno riferimento alcuni degli oggetti da eliminare', 
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Per garantire l\'integrità del database, ogni riferimento dovrebbe essere ulteriormente eliminato',
-	'UI:Delete:Consequence+' => '',
-	'UI:Delete:SorryDeletionNotAllowed' => 'Spiacenti, non sei autorizzato a cancellare questo oggetto, vedere le spiegazioni di cui sopra',
-	'UI:Delete:PleaseDoTheManualOperations' => 'Si prega di eseguire le operazioni manuali di cui sopra prima di richiedere la cancellazione di questo oggetto',
-	'UI:Delect:Confirm_Object' =>  'Si prega di confermare che si desidera eliminare %1$s.',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Si prega di confermare che si desidera eliminare i seguenti oggetti %1$d della classe %2$s.',
-	'UI:WelcomeToITop' =>  'Benvenuto su iTop',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s dettagli',
-	'UI:ErrorPageTitle' => 'iTop - Errore',
-	'UI:ObjectDoesNotExist' => 'Spiacenti, questo oggetto non esiste (o non si è autorizzati per vederlo).',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'iTop - Risultati della ricerca',
-	'UI:SearchResultsTitle' => 'Risultati della ricerca',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => 'Niente da ricercare',
-	'UI:FullTextSearchTitle_Text' => 'Risultati per "%1$s":',
-	'UI:Search:Count_ObjectsOf_Class_Found' => 'Trovato l\'oggetto(i) %1$d della classe %2$s.',
-	'UI:Search:NoObjectFound' => 'Nessun oggetto trovato.',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modifica',
-	'UI:ModificationTitle_Class_Object' => 'Modifica di %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s modifica',
-	'UI:CloneTitle_Class_Object' => 'Clone di %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'iTop - Creazione di un nuovo %1$s ',
-	'UI:CreationTitle_Class' => 'Creazione di un nuovo %1$s',
-	'UI:SelectTheTypeOf_Class_ToCreate' => 'Seleziona il tipo di %1$s da creare:',
-	'UI:Class_Object_NotUpdated' => 'Nessun cambiamento rilevato, %1$s (%2$s)  <strong>non</strong> è stato modificato.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) aggiornato.',
-	'UI:BulkDeletePageTitle' => 'iTop - Eliminazione collettiva',
-	'UI:BulkDeleteTitle' => 'Seleziona gli oggetti che si desidera eliminare:',
-	'UI:PageTitle:ObjectCreated' => 'iTop Oggetto Creato.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s creato.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Applicazione %1$s all\'oggetto: %2$s nello stato %3$s allo stato target: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => 'L\'oggetto non può essere scritto: %1$s~~',
-	'UI:PageTitle:FatalError' => 'iTop - Fatal Error',
-	'UI:SystemIntrusion' => 'Accesso negato. Hai cercato di eseguire un\'operazione che non ti è consentita.',
-	'UI:FatalErrorMessage' => 'Fatal error, iTop non può continuare.',
-	'UI:Error_Details' => 'Errore: %1$s.',
-	'UI:PageTitle:ClassProjections' => 'iTop gestione degli utenti - proiezioni classe',
-	'UI:PageTitle:ProfileProjections' => 'iTop gestione degli utenti - proiezioni profilo',
-	'UI:UserManagement:Class' => 'Classe',
-	'UI:UserManagement:Class+' => '',
-	'UI:UserManagement:ProjectedObject' => 'Oggetto',
-	'UI:UserManagement:ProjectedObject+' => '',
-	'UI:UserManagement:AnyObject' => '* qualsiasi *',
-	'UI:UserManagement:User' => 'Utente',
-	'UI:UserManagement:User+' => '',
-	'UI:UserManagement:Profile' => 'Profilo',
-	'UI:UserManagement:Profile+' => '',
-	'UI:UserManagement:Action:Read' => 'Leggi',
-	'UI:UserManagement:Action:Read+' => '',
-	'UI:UserManagement:Action:Modify' => 'Modifica',
-	'UI:UserManagement:Action:Modify+' => '',
-	'UI:UserManagement:Action:Delete' => 'Cancella',
-	'UI:UserManagement:Action:Delete+' => '',
-	'UI:UserManagement:Action:BulkRead' => 'Leggi Bulk (Export)',
-	'UI:UserManagement:Action:BulkRead+' => '',
-	'UI:UserManagement:Action:BulkModify' => 'Modifica Bulk',
-	'UI:UserManagement:Action:BulkModify+' => '',
-	'UI:UserManagement:Action:BulkDelete' => 'Cancella Bulk ',
-	'UI:UserManagement:Action:BulkDelete+' => '',
-	'UI:UserManagement:Action:Stimuli' => 'Stimoli',
-	'UI:UserManagement:Action:Stimuli+' => '',
-	'UI:UserManagement:Action' => 'Azione',
-	'UI:UserManagement:Action+' => '',
-	'UI:UserManagement:TitleActions' => 'Azioni',
-	'UI:UserManagement:Permission' => 'Autorizzazione',
-	'UI:UserManagement:Permission+' => '',
-	'UI:UserManagement:Attributes' => 'Attributi',
-	'UI:UserManagement:ActionAllowed:Yes' => 'Si',
-	'UI:UserManagement:ActionAllowed:No' => 'No',
-	'UI:UserManagement:AdminProfile+' => '',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => '',
-	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Collegamento tra %1$s e %2$s',
-	'UI:UserManagement:LinkBetween_User_And_Org' => 'Collegamento tra %1$s e %2$s',
-	'Menu:AdminTools' => 'Strumenti di amministrazione', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:ChangeManagementMenu' => 'Gestione Cambi',
-	'UI:ChangeManagementMenu+' => '',
-	'UI:ChangeManagementMenu:Title' => 'Panoramica dei cambi',
-	'UI-ChangeManagementMenu-ChangesByType' => 'Cambi per tipo',
-	'UI-ChangeManagementMenu-ChangesByStatus' => 'Cambi per stato',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Cambi per gruppi di lavoro',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Cambi non ancora assegnati',
-	'UI:ConfigurationManagementMenu' => 'Gestione Configurazione',
-	'UI:ConfigurationManagementMenu+' => '',
-	'UI:ConfigurationManagementMenu:Title' => 'Panoramica delle infrastrutture',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'Oggetti infrastruttutura per tipo',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Oggetti infrastruttutura per stato',
-	'UI:ConfigMgmtMenuOverview:Title' =>  'Cruscotto per Gestione configurazione',
-	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items per stato',
-	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items per tipo',
-	'UI:RequestMgmtMenuOverview:Title' => 'Cruscotto per Gestione Richieste',
-	'UI-RequestManagementOverview-RequestByService' => 'Richieste degli utenti per servizio',
-	'UI-RequestManagementOverview-RequestByPriority' => 'Richieste degli utenti per priorità',
-	'UI-RequestManagementOverview-RequestUnassigned' => 'Richieste degli utenti non ancora assegnate ad un agente',
-	'UI:IncidentMgmtMenuOverview:Title' => 'Cruscotto Gestione degli Incidenti',
-	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenti per servizio',
-	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenti per  priorità',
-	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidenti non ancora assegnati ad un agente',
-	'UI:ChangeMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
-	'UI-ChangeManagementOverview-ChangeByType' => 'Cambi per tipo',
-	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Cambi non ancora assegnati ad un agente',
-	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruzioni dovute ai cambi',
-	'UI:ServiceMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
-	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratti con i clienti da rinnovarsi in 30 giorni',
-	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratti con i fornitori da rinnovarsi in 30 giorni',
-	'UI:ContactsMenu' => 'Contatti',
-	'UI:ContactsMenu+' => '',
-	'UI:ContactsMenu:Title' => 'Contatti Panoramica',
-	'UI-ContactsMenu-ContactsByLocation' => 'Contatti per localizzazione',
-	'UI-ContactsMenu-ContactsByType' => 'Contatti per tipo',
-	'UI-ContactsMenu-ContactsByStatus' => 'Contatti per stato',
-	'Menu:CSVImportMenu' =>  'Importazione CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu' => 'Modello Dati', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu' => 'Esporta', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu' =>  'Notifiche', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:NotificationsMenu:Title' =>  'Configurazione delle <span class="hilite">Notifiche</span>',
-	'UI:NotificationsMenu:Help' => 'Aiuto',
-	'UI:NotificationsMenu:HelpContent' => '<p>In iTop le notifiche sono completamente personalizzabili. Essi si basano su due serie di oggetti: <i>trigger e azioni</i>.</p>
-<p><i><b>Triggers</b></i> per definire quando una notifica verrà eseguita. Ci sono 3 tipi di trigger per la copertura di 3 fasi differenti del ciclo di vita di un oggetto:
-<ol>
-	 <li>the "OnCreate" trigger vengono eseguiti quando un oggetto della classe specificata viene creata</li>
-	 <li>the "OnStateEnter" trigger vengono eseguiti prima che un oggetto della classe data entra in uno stato specifico (provenienti da un altro Stato)</li>
-	 <li>the "OnStateLeave" trigger vengono eseguiti quando un oggetto della classe lascia uno stato specificato</li>
-</ol>
-
-</p>
-<p>
-<i><b>Azioni</b></i> definire le azioni da eseguire quando il trigger vengono eseguiti. Per ora c\'è solo un tipo di azione consiste nel mandare un messaggio email.
-Inoltre, tali azioni definiscono il modello da utilizzare per l\'invio della e-mail così come gli altri parametri del messaggio come, l\'importanza dei destinatari, etc
-</p>
-<p>Una Pagina speciale: <a href="../setup/email.test.php" target="_blank">email.test.php</a> è disponibile per il testing e la risoluzione dei problemi di configurazione PHP mail.</p>
-<p>Per essere eseguite, le azioni devono essere associate ai trigger.
-Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine", che specifica in quale ordine le azioni devono essere eseguite.</p>',
-	'UI:NotificationsMenu:Triggers' => 'Triggers',
-	'UI:NotificationsMenu:AvailableTriggers' => 'Triggers Disponibili',
-	'UI:NotificationsMenu:OnCreate' => 'When an object is created~~',
-	'UI:NotificationsMenu:OnStateEnter' => 'Quando un oggetto viene creato',
-	'UI:NotificationsMenu:OnStateLeave' => 'Quando un oggetto lascia un determinato stato',
-	'UI:NotificationsMenu:Actions' => 'Azioni',
-	'UI:NotificationsMenu:AvailableActions' => 'Azioni disponibili',
-	'Menu:AuditCategories' => 'Categorie di Audit', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Categorie di Audit', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu' => 'Esegui query', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration' => 'Dati di amministrazione', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu' => 'Ricerca universale', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu' => 'Gestione degli utenti', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu' => 'Profili', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profili', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu' => 'Account utente', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Account utente', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => 'Versione %1$s %2$s',
-	'UI:iTopVersion:Long' => 'Versione %1$s %2$s-%3$s costruita il %4$s',
-	'UI:PropertiesTab' => 'Proprietà',
-	'UI:OpenDocumentInNewWindow_' => 'Apri questo documento in una nuova finestra: %1$s',
-	'UI:DownloadDocument_' => 'Scarica questo documento: %1$s',
-	'UI:Document:NoPreview' => 'Non è disponibile un\'anteprima per questo tipo di documento',
-	'UI:DeadlineMissedBy_duration' => 'Mancati %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',
-	'UI:Deadline_Minutes' => '%1$d min', 
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',  
-	'UI:Deadline_Days_Hours_Minutes' => '%1$dg %2$dh %3$dmin',
-	'UI:Help' => 'Aiuto',
-	'UI:PasswordConfirm' => '(Conferma)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Prima di aggiungere più %1$s oggetti, salva questo oggetto.',
-	'UI:DisplayThisMessageAtStartup' => 'Visualizza questo messaggio in fase di avvio',
-	'UI:RelationshipGraph' => 'Visualizzazione grafica',
-	'UI:RelationshipList' => 'Lista',
-	'UI:OperationCancelled' => 'Operazione Annullata',
-	'Portal:Title' => 'Portale Utente iTop',
-	'Portal:Refresh' => 'Ricarica',
-	'Portal:Back' => 'Indietro',
-	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
-	'Portal:ShowOngoing' => 'Show open requests',
-	'Portal:ShowClosed' => 'Show closed requests',
-	'Portal:CreateNewRequest' => 'Crea una nuova richiesta',
-	'Portal:CreateNewRequestItil' => 'Crea una nuova richiesta',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => 'Cambia la mia password',
-	'Portal:Disconnect' => 'Disconnetti',
-	'Portal:OpenRequests' => 'Le mie richieste aperte',
-	'Portal:ClosedRequests'  => 'My closed requests',
-	'Portal:ResolvedRequests' => 'Le mie richieste risolte',
-	'Portal:SelectService' => 'Seleziona un servizio dal catalogo:',
-	'Portal:PleaseSelectOneService' => 'Si prega di selezionare un servizio',
-	'Portal:SelectSubcategoryFrom_Service' => 'Seleziona una sotto-categoria per il servizio %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Si prega di selezionare una delle sottocategorie',
-	'Portal:DescriptionOfTheRequest' => 'Inserisci la descrizione della tua richiesta:',
-	'Portal:TitleRequestDetailsFor_Request' => 'Dettagli per la richiesta %1$s:',
-	'Portal:NoOpenRequest' => 'Nessuna richiesta in questa categoria.',
-	'Portal:NoClosedRequest' => 'Nessuna richiesta in questa categoria.',
-	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
-	'Portal:Button:CloseTicket' => 'Chiudi questo ticket',
-	'Portal:Button:UpdateRequest' => 'Update the request',
-	'Portal:EnterYourCommentsOnTicket' => 'Inserisci il tuo commento sulla risoluzione di questo ticket:',
-	'Portal:ErrorNoContactForThisUser' =>  'Errore: l\'utente corrente non è associato ad un Contatto/Persona. Si prega di contattare l\'amministratore.',
-	'Portal:Attachments' => 'Allegati',
-	'Portal:AddAttachment' => ' Aggiungi allegati ',
-	'Portal:RemoveAttachment' =>  ' Rimuovi allegati ',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Allegato #%1$d a %2$s (%3$s)',
-	'Enum:Undefined' => 'Non definito',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Giorni %2$s Ore %3$s Minuti %4$s Secondi',
-	'UI:ModifyAllPageTitle' => 'Modifica Tutto',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modifica %1$d oggetto della classe %2$s',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifica %1$d oggetto della classe %2$s fuori da %3$d~~',
-	'UI:Menu:ModifyAll' => 'Modifica...',
-	'UI:Button:ModifyAll' => 'Modifica tutto',
-	'UI:Button:PreviewModifications' => 'Anteprima Modifiche >>~~',
-	'UI:ModifiedObject' => 'Oggetto Modificato',
-	'UI:BulkModifyStatus' => 'Operazioni',
-	'UI:BulkModifyStatus+' => '',
-	'UI:BulkModifyErrors' => 'Errori (eventuali)',
-	'UI:BulkModifyErrors+' => '',
-	'UI:BulkModifyStatusOk' => 'Ok',
-	'UI:BulkModifyStatusError' => 'Errore',
-	'UI:BulkModifyStatusModified' => 'Modificato',
-	'UI:BulkModifyStatusSkipped' => 'Saltato',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d valori distinti:',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d volta(e)',
-	'UI:BulkModify:N_MoreValues' => '%1$d più valori...~~',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentativo di impostare il campo di sola lettura: %1$s',
-	'UI:FailedToApplyStimuli' => 'L\'azione non è riuscita.',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifica %2$d oggetti della classe %3$s~~',
-	'UI:CaseLogTypeYourTextHere' => 'Digitare il tuo testo qui:',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
-	'UI:CaseLog:InitialValue' => 'Valore iniziale:',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore non impostato.',
-	'UI:ActionNotAllowed' => 'Non hai i permessi per eseguire questa azione su questi oggetti.',
-	'UI:BulkAction:NoObjectSelected' => 'Si prega di selezionare almeno un oggetto per eseguire questa operazione',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore rimane invariato.',
-	'UI:Button:Refresh' => 'Ricarica',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile~~',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile~~',
-	'UI:Button:Save' => 'Save~~',
-	'UI:Button:Rename' => ' Rename... ~~',
-	'UI:SplitDateTime-Date' => 'date~~',
-	'UI:SplitDateTime-Time' => 'time~~',
-	'UI:SearchValue:NbSelected' => '# selected~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:CSVReport-Value-Modified' => 'Modified~~',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match~~',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
-	'UI:CSVReport-Row-Created' => 'created~~',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
-	'UI:CSVReport-Icon-Modified' => 'Modified~~',
-	'UI:CSVReport-Icon-Missing' => 'Missing~~',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
-	'UI:CSVReport-Icon-Created' => 'Created~~',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
-	'UI:CSVReport-Object-Created' => 'Object created~~',
-	'UI:CSVReport-Icon-Error' => 'Error~~',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
-	'UI:CSVExport:LostChars' => 'Encoding issue~~',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Edit:TestQuery' => 'Test query~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'Menu:QueryMenu' => 'Query phrasebook~~',
-	'Menu:QueryMenu+' => 'Query phrasebook~~',
-	'UI:Download-CSV' => 'Download %1$s~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:ElementsDisplayed' => 'Filtering~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
-	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
-	'UI:Pagination:PageSize' => '%1$s objects per page~~',
-	'UI:Pagination:PagesLabel' => 'Pages:~~',
-	'UI:Pagination:All' => 'All~~',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
-	'UI:Preferences' => 'Preferences...~~',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
-	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
-	'UI:FavoriteOtherSettings' => 'Other Settings~~',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
-	'UI:ConfigureThisList' => 'Configure This List...~~',
-	'UI:ListConfigurationTitle' => 'List Configuration~~',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
-	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
-	'UI:UseSavetheSettings' => 'Save the Settings~~',
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
-	'UI:Dashboard:Edit' => 'Edit This Page...~~',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
-	'UI:ExportDashBoard' => 'Export to a file~~',
-	'UI:ImportDashBoard' => 'Import from a file...~~',
-	'UI:ImportDashboardTitle' => 'Import From a File~~',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
-	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'UI:DashboardEdit:Layout' => 'Layout~~',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-	'UI:Form:Property' => 'Property~~',
-	'UI:Form:Value' => 'Value~~',
-	'UI:DashletPlainText:Label' => 'Text~~',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
-	'UI:DashletPlainText:Prop-Text' => 'Text~~',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-	'UI:DashletObjectList:Label' => 'Object list~~',
-	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
-	'UI:DashletObjectList:Prop-Title' => 'Title~~',
-	'UI:DashletObjectList:Prop-Query' => 'Query~~',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
-	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
-	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-	'UI:DashletHeaderStatic:Label' => 'Header~~',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-	'UI:DashletBadge:Label' => 'Badge~~',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
-	'UI:DashletBadge:Prop-Class' => 'Class~~',
-	'DayOfWeek-Sunday' => 'Sunday~~',
-	'DayOfWeek-Monday' => 'Monday~~',
-	'DayOfWeek-Tuesday' => 'Tuesday~~',
-	'DayOfWeek-Wednesday' => 'Wednesday~~',
-	'DayOfWeek-Thursday' => 'Thursday~~',
-	'DayOfWeek-Friday' => 'Friday~~',
-	'DayOfWeek-Saturday' => 'Saturday~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'My Shortcuts~~',
-	'Class:Shortcut' => 'Shortcut~~',
-	'Class:Shortcut/Attribute:name' => 'Name~~',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
-	'Class:ShortcutOQL' => 'Search result shortcut~~',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:AuditCategory' => 'Categoria di Audit',
+	'Class:AuditCategory+' => 'Una sezione all\'interno del controllo globale',
+	'Class:AuditCategory/Attribute:name' => 'Nome della categoria',
+	'Class:AuditCategory/Attribute:name+' => 'Abbreviazione per questa categoria',
+	'Class:AuditCategory/Attribute:description' => 'Descrizione della categoria di Audit',
+	'Class:AuditCategory/Attribute:description+' => 'Descrizione dettagliata della categoria di audit',
+	'Class:AuditCategory/Attribute:definition_set' => 'Insieme di definizione',
+	'Class:AuditCategory/Attribute:definition_set+' => 'Espressione OQLche definisce l\'insieme di oggetti da controllare',
+	'Class:AuditCategory/Attribute:rules_list' => 'Regole di Audit',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Regolele di audit per queste categorie',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:AuditRule' => 'Regola di Audit',
+	'Class:AuditRule+' => '',
+	'Class:AuditRule/Attribute:name' => 'Nome della regola',
+	'Class:AuditRule/Attribute:name+' => '',
+	'Class:AuditRule/Attribute:description' => 'Descrizione della regola di Audit',
+	'Class:AuditRule/Attribute:description+' => 'Descrizione dettagliata per questa regola di audit ',
+	'Class:AuditRule/Attribute:query' => 'Query da eseguire',
+	'Class:AuditRule/Attribute:query+' => 'Espressio OQL da eseguire',
+	'Class:AuditRule/Attribute:valid_flag' => 'Oggetti validi?',
+	'Class:AuditRule/Attribute:valid_flag+' => 'Vero se la regola ritorna oggetti validi, falso altrimenti ',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'vero',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'vero',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'falso',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'falso',
+	'Class:AuditRule/Attribute:category_id' => 'Categoria',
+	'Class:AuditRule/Attribute:category_id+' => 'Categoria per questa regola',
+	'Class:AuditRule/Attribute:category_name' => 'Categoria',
+	'Class:AuditRule/Attribute:category_name+' => 'Nome della categoria per questa regola',
+));
+
+//
+// Class: QueryOQL
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:Query' => 'Query',
+	'Class:Query+' => 'Una query è un insieme di dati definito in modo dinamico',
+	'Class:Query/Attribute:name' => 'Nome',
+	'Class:Query/Attribute:name+' => 'Identificativi della query',
+	'Class:Query/Attribute:description' => 'Descrizione',
+	'Class:Query/Attribute:description+' => 'Descrizione dettagliata della query(scopo, usagoetc.)',
+	'Class:Query/Attribute:fields' => 'Campi',
+	'Class:Query/Attribute:fields+' => 'Lista di attributi separati da virgola (o alias.attributo) per l\'esportazione',
+
+	'Class:QueryOQL' => 'OQL Query',
+	'Class:QueryOQL+' => 'Una query basata su Object Query Language',
+	'Class:QueryOQL/Attribute:oql' => 'Espressione',
+	'Class:QueryOQL/Attribute:oql+' => 'Espressione OQL',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:User' => 'Utente',
+	'Class:User+' => 'Login Utente',
+	'Class:User/Attribute:finalclass' => 'Tipo di account',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'Contatto (persona)',
+	'Class:User/Attribute:contactid+' => 'Dettagli personali per dati aziendali',
+	'Class:User/Attribute:last_name' => 'Cognome',
+	'Class:User/Attribute:last_name+' => 'Cognome del contatto corrispondente',
+	'Class:User/Attribute:first_name' => 'Nome',
+	'Class:User/Attribute:first_name+' => 'Nome del contatto corrispondente',
+	'Class:User/Attribute:email' => 'Email',
+	'Class:User/Attribute:email+' => 'Email del contatto corrispondente',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => 'Stringa di identificazione dell\'utente',
+	'Class:User/Attribute:language' => 'Lingua',
+	'Class:User/Attribute:language+' => 'Lingua utente',
+	'Class:User/Attribute:language/Value:EN US' => 'English',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:User/Attribute:language/Value:IT IT' => 'Italiano',
+	'Class:User/Attribute:language/Value:IT IT+' => 'Italiano (IT)',
+	'Class:User/Attribute:language/Value:FR FR' => 'French',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:profile_list' => 'Profili',
+	'Class:User/Attribute:profile_list+' => 'Regole per  la concessione dei diritti per quella persona',
+	'Class:User/Attribute:allowed_org_list' => 'Organizzazione Consentite',
+	'Class:User/Attribute:allowed_org_list+' => 'L\'utente finale è autorizzato a vedere i dati appartenenti alle seguenti organizzazioni. Se non è specificato organizzazione, vi è alcuna restrizione.',
+
+	'Class:User/Error:LoginMustBeUnique' => 'Il Login deve essere unico - "%1s" già usato',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Almeno un profilo deve essere assegnato all\'utente.',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_Profiles' => 'Profilo',
+	'Class:URP_Profiles+' => '',
+	'Class:URP_Profiles/Attribute:name' => 'Nome',
+	'Class:URP_Profiles/Attribute:name+' => '',
+	'Class:URP_Profiles/Attribute:description' => 'Descrizione',
+	'Class:URP_Profiles/Attribute:description+' => 'una linea di descrizione',
+	'Class:URP_Profiles/Attribute:user_list' => 'Utenti',
+	'Class:URP_Profiles/Attribute:user_list+' => 'Persone che hanno questo ruuolo',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_Dimensions' => 'dimensione',
+	'Class:URP_Dimensions+' => 'dimensione dell\'applicazione (definizione di silos))',
+	'Class:URP_Dimensions/Attribute:name' => 'Nome',
+	'Class:URP_Dimensions/Attribute:name+' => 'etichetta',
+	'Class:URP_Dimensions/Attribute:description' => 'Descrizione',
+	'Class:URP_Dimensions/Attribute:description+' => 'una linea di descrizione',
+	'Class:URP_Dimensions/Attribute:type' => 'Tipo',
+	'Class:URP_Dimensions/Attribute:type+' => 'nome della classe o tipo di dato (proiezione dell\'unità)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_UserProfile' => 'Utente da Profilare',
+	'Class:URP_UserProfile+' => '',
+	'Class:URP_UserProfile/Attribute:userid' => 'Utente',
+	'Class:URP_UserProfile/Attribute:userid+' => '',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'User\'s login',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profilo',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'utilizzo del profilo',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profilo',
+	'Class:URP_UserProfile/Attribute:profile+' => 'Nome del profilo',
+	'Class:URP_UserProfile/Attribute:reason' => 'Motivo',
+	'Class:URP_UserProfile/Attribute:reason+' => 'spiega perchè questo utente dovrebbe avere questo ruolo',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_UserOrg' => 'Organizzazione dell\'utente',
+	'Class:URP_UserOrg+' => '',
+	'Class:URP_UserOrg/Attribute:userid' => 'Utente',
+	'Class:URP_UserOrg/Attribute:userid+' => 'Account Utente',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login Utente',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organizazione',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Organizzazione permesse',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organizzazione',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Organizzazione permesse',
+	'Class:URP_UserOrg/Attribute:reason' => 'Motivo',
+	'Class:URP_UserOrg/Attribute:reason+' => '',
+
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => 'proiezioni di profilo',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensione',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'dimensione applicazione',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensione',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'dimensione applicazione',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profilo',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'utilizzo di profilo',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profilo',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'Nome del profilo',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Valore dell\'espressione',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'Espressione OQL  (uso $user) | constante|  | +codice attributo',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attributo',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Codice attributo bersaglio (opzionale)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => 'proiezioni di classe',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensione',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'dimensione dell\'applicazione',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensione',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'dimensione applicazione',
+	'Class:URP_ClassProjection/Attribute:class' => 'Classe',
+	'Class:URP_ClassProjection/Attribute:class+' => 'Classe bersaglio',
+	'Class:URP_ClassProjection/Attribute:value' => 'Valore dell\'espressione',
+	'Class:URP_ClassProjection/Attribute:value+' => 'Espressione OQL (uso $this) | constante|  | +codice attributo',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attributo',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'Codice attributo bersaglio (opzionale)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_ActionGrant' => 'azione_autorizzazione',
+	'Class:URP_ActionGrant+' => 'permesso su classi',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profilo',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'Utilizzo del profilo',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profilo',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'Utilizzo del profilo',
+	'Class:URP_ActionGrant/Attribute:class' => 'Classe',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Classe bersaglio',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Autorizzazione',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'permesso non permesso',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'si',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'si',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'no',
+	'Class:URP_ActionGrant/Attribute:action' => 'Azione',
+	'Class:URP_ActionGrant/Attribute:action+' => 'operazioni da effettuare sulla data classe',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_ActionGrant/Attribute:action' => 'Azione',
+	'Class:URP_ActionGrant/Attribute:action+' => '',
+	'Class:URP_StimulusGrant' => 'stimulus_autorizzazione',
+	'Class:URP_StimulusGrant+' => '',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profilo',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => '',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Classe',
+	'Class:URP_StimulusGrant/Attribute:class+' => '',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Autorizzazione',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '',
+'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'si',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'si',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'no',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'no',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'Codice per lo Stimolus',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'Class:URP_AttributeGrant' => 'attributo_autorizzazione',
+	'Class:URP_AttributeGrant+' => 'autorizzazioni a livello di attributi',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Azione di sovvenzione',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'azione di sovvenzione',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attributo',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'codice attributo',
+));
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', array(
+	'BooleanLabel:yes' => 'si',
+	'BooleanLabel:no' => 'no',
+	'Menu:WelcomeMenu' => 'Benveuto', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Benvenuto', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => 'Benveuto su iTop',
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop è un completo Portale Funzionale IT, Open Source.</p>
+<ul>Esso include:
+<li>Un completo CMDB (Configuration management database) per documentare e gestire l\'IT di inventario.</li>
+<li>Un modulo di gestione degli incidenti per monitorare e comunicare su tutte le problematiche che si verificano nel settore IT.</li>
+<li>Un modulo di gestione delle modifiche per pianificare e monitorare i cambiamenti all\'ambiente IT.</li>
+<li>Una banca dati errori noti per accelerare la risoluzione di incidenti.</li>
+<li>Un modulo di interruzione per documentare tutte le interruzioni pianificate e notificare gli opportuni contatti.</li>
+<li>Un cruscotto per ottenere rapidamente una panoramica del sistema IT.</li>
+</ul>
+<p>Tutti i moduli possono essere installati, passo dopo passo, indipendentemente l\'uno dall\'altro.</p>',
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop è fornitore di servizi di orientamento, che consente ai progettisti di gestire più o organizzazioni o clienti con facilità.
+<ul>>iTop, offre un set ricco di funzionalità dei processi di business che:
+<li>Migliora l\'efficacia di gestione IT</li> 
+<li>Guida le prestazione delle operazioni IT</li> 
+<li>Migliora la soddisfazione del cliente e fornisce ai dirigenti un idea della performance del business.</li>
+</ul>
+</p>
+<p>iTop è completamente aperto per essere integrato all\'interno della vostra infrastruttura di gestione dell\'IT.</p>
+<p>
+<ul>L\'adozione di questa nuova generazione di portale funzionale IT vi aiuterà a:
+<li>Meglio gestire un ambiente IT sempre più complesso.</li>
+<li>Implementare i processi ITIL al proprio ritmo.</li>
+<li>Gestire la risorsa più importante della tua IT: Documentazione.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Apri le richieste: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Le mie richieste',
+	'UI:WelcomeMenu:OpenIncidents' => 'Apri gli incidenti: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Elementi di Configurazione (CI): %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Incidenti assegnati a me',
+	'UI:AllOrganizations' => ' Tutte le Organizzazioni ',
+	'UI:YourSearch' => 'La tua Cerca',
+	'UI:LoggedAsMessage' => 'Logged come %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Logged come %1$s (Amministratore)',
+	'UI:Button:Logoff' => 'Log off',
+	'UI:Button:GlobalSearch' => 'Cerca',
+	'UI:Button:Search' => ' Cerca',
+	'UI:Button:Query' => ' Domanda',
+	'UI:Button:Ok' => 'Ok',
+	'UI:Button:Cancel' => 'Cancella',
+	'UI:Button:Apply' => 'Applica',
+	'UI:Button:Back' => ' << Indietro',
+	'UI:Button:Restart' => ' |<< Riavvia',
+	'UI:Button:Next' => ' Prossimo >> ',
+	'UI:Button:Finish' => ' Fine',
+	'UI:Button:DoImport' => ' Esegui le Imporazioni ! ~~',
+	'UI:Button:Done' => ' Fatto',
+	'UI:Button:SimulateImport' => ' Simula l\'Importazione ~~',
+	'UI:Button:Test' => 'Testa!',
+	'UI:Button:Evaluate' => ' Valuta',
+	'UI:Button:Evaluate:Title' => ' Valuta (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Aggiungi... ~~',
+	'UI:Button:BrowseObjects' => ' Sfoglia... ~~',
+	'UI:Button:Add' => ' Aggiungi ~~',
+	'UI:Button:AddToList' => ' << Aggiungi ~~',
+	'UI:Button:RemoveFromList' => ' Rimuovi >> ~~',
+	'UI:Button:FilterList' => ' Filtra... ~~',
+	'UI:Button:Create' => ' Crea ~~',
+	'UI:Button:Delete' => ' Cancella ! ~~',
+	'UI:Button:ChangePassword' => ' Cambia Password ~~',
+	'UI:Button:ResetPassword' => ' Resetta Password ~~',
+	'UI:SearchToggle' => 'Cerca',
+	'UI:ClickToCreateNew' => 'Crea un nuovo %1$s~~',
+	'UI:SearchFor_Class' => 'Cerca l\'oggetto %1$s',
+	'UI:NoObjectToDisplay' => 'Nessun oggetto da mostrare.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Object_id parametro è obbligatorio quando link_attr è specificato. Verificare la definizione del modello di display.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Target_attr parametro è obbligatorio quando link_attr è specificato. Verificare la definizione del modello di display.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Il parametro è group_by obbligatoria. Verificare la definizione del modello di display.',
+	'UI:Error:InvalidGroupByFields' => 'Elenco di campi non valido per il raggruppamento: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Errore: Stile non supportato di blocco: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Errata definizione di link: la classe di oggetti da gestire: %1$s non è stato trovato come chiave esterna nella classe %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Oggetto: %1$s:%2$d non trovato.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Errore: Riferimento circolare nelle dipendenze tra i campi, controllare il modello di dati.',
+	'UI:Error:UploadedFileTooBig' => 'Il file caricato è troppo grande. (dimensione massima consentita è di %1$s). Verificare di configurazione di PHP per upload_max_filesize e post_max_size.',
+	'UI:Error:UploadedFileTruncated.' => 'Il file caricato è stata troncato !',
+	'UI:Error:NoTmpDir' => 'La directory temporanea non è definita.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Impossibile scrivere il file temporaneo sul disco. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Caricamento fermato per estensione. (Nome del file originale = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Il caricamento del file non riuscito, causa sconosciuta. (Codice errore = "%1$s").',
+	'UI:Error:1ParametersMissing' => 'Errore: il seguente parametro deve essere specificato per questa operazione: %1$s.',
+	 'UI:Error:2ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s e %2$s.',
+        'UI:Error:3ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s e %3$s.',
+        'UI:Error:4ParametersMissing' => 'Errore: i seguenti parametri devono essere specificati per questa operazione: %1$s, %2$s, %3$s e %4$s.',
+        'UI:Error:IncorrectOQLQuery_Message' => 'Errore: errata OQL query: %1$s',
+	 'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Si è verificato un errore durante l\'esecuzione della query: %1$s',
+        'UI:Error:ObjectAlreadyUpdated' => 'Errore: l\'oggetto è già stato aggiornato.',
+        'UI:Error:ObjectCannotBeUpdated' => 'Errore: oggetto non può essere aggiornato.',
+        'UI:Error:ObjectsAlreadyDeleted' => 'Errore: gli oggetti sono già stati eliminati!',
+        'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Non hai i permessi per eseguire una eliminazione collettiva degli oggetti della classe %1$s',
+        'UI:Error:DeleteNotAllowedOn_Class' => 'Non ti è permesso di eliminare gli oggetti della classe %1$s',
+        'UI:Error:BulkModifyNotAllowedOn_Class' => 'Non hai i permessi per eseguire un aggiornamento collettivo degli oggetti della classe %1$s',
+        'UI:Error:ObjectAlreadyCloned' => 'Errore: l\'oggetto è già stato clonato!',
+        'UI:Error:ObjectAlreadyCreated' => 'Errore: l\'oggetto è già stato creato!',
+        'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Errore: stimolo non valido "%1$s" su un oggetto %2$s nello stato "%3$s".',
+
+
+	'UI:GroupBy:Count' => 'Conteggio',
+	'UI:GroupBy:Count+' => '',
+	'UI:CountOfObjects' => '%1$d oggetti corrispondenti ai criteri.',
+	'UI_CountOfObjectsShort' => '%1$d oggetti.',
+        'UI:NoObject_Class_ToDisplay' => 'No %1$s da visualizzare',
+        'UI:History:LastModified_On_By' => 'Ultima modifica %1$s da %2$s.',
+        'UI:HistoryTab' => 'Storia',
+        'UI:NotificationsTab' => 'Notifiche',
+        'UI:History:BulkImports' => 'Storia',
+        'UI:History:BulkImports+' => 'Elenco delle importazioni CSV (primo ultimo)',
+        'UI:History:BulkImportDetails' => 'Modifiche derivanti dai importazione CSV eseguita su %1$s (da %2$s)',
+	'UI:History:Date' => 'Data',
+	'UI:History:Date+' => '',
+	'UI:History:User' => 'Utente',
+	'UI:History:User+' => '',
+	'UI:History:Changes' => 'Modifiche',
+	'UI:History:Changes+' => '',
+	'UI:History:StatsCreations' => 'Creato',
+	'UI:History:StatsCreations+' => '',
+	'UI:History:StatsModifs' => 'Modificato',
+	'UI:History:StatsModifs+' => '',
+	'UI:History:StatsDeletes' => 'Cancellato',
+	'UI:History:StatsDeletes+' => '',
+	'UI:Loading' => 'Caricamento...',
+	'UI:Menu:Actions' => 'Azioni',
+	'UI:Menu:OtherActions' => 'Altre Azioni',
+	'UI:Menu:New' => 'Nuovo...',
+	'UI:Menu:Add' => 'Aggiungi...',
+	'UI:Menu:Manage' => 'Gestischi...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'CSV Export...',
+	'UI:Menu:Modify' => 'Modifica...',
+	'UI:Menu:Delete' => 'Cancella...',
+	'UI:Menu:Manage' => 'Gestisci...',
+	'UI:Menu:BulkDelete' => 'Cancella...',
+	'UI:UndefinedObject' => 'non definito',
+	'UI:Document:OpenInNewWindow:Download' => 'Apri in una nuova finestra: %1$s, Scarica: %2$s',
+	'UI:SelectAllToggle+' => '',
+	'UI:TruncatedResults' => '%1$d oggetti visualizzati su %2$d',
+	'UI:DisplayAll' => 'Mostra tutto',
+	'UI:CollapseList' => 'Collassa',
+	'UI:CountOfResults' => '%1$d oggetto(i)',
+	'UI:ChangesLogTitle' => 'Log delle modifiche (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Log delle modifiche è vuoto',
+	'UI:SearchFor_Class_Objects' => 'Cerca per  %1$s Oggetti',
+	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryTab' => 'OQL Query',
+	'UI:SimpleSearchTab' => 'Ricerca semplice',
+	'UI:Details+' => '',
+	'UI:SearchValue:Any' => '* Qualsiasi *',
+	'UI:SearchValue:Mixed' => '* misti *',
+	'UI:SelectOne' => '-- selezionare uno --',
+	'UI:Login:Welcome' => 'Benvenuti su iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Errato login/password, si prega di riprovare.',
+	'UI:Login:IdentifyYourself' => 'Identifica te stesso prima di continuare',
+	'UI:Login:UserNamePrompt' => 'Nome Utente',
+        'UI:Login:PasswordPrompt' => 'Password',
+        'UI:Login:ChangeYourPassword' => 'Cambia la tua password',
+        'UI:Login:OldPasswordPrompt' => 'Vecchia password',
+        'UI:Login:NewPasswordPrompt' => 'Nuova password',
+        'UI:Login:RetypeNewPasswordPrompt' => 'Riscrivi la nuova password',
+        'UI:Login:IncorrectOldPassword' => 'Errore: la vecchia password non è corretta',
+        'UI:LogOffMenu' => 'Log off',
+	'UI:LogOff:ThankYou' => 'Grazie per aver scelto iTop',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Clicca qui per effettuare il login di nuovo...',
+        'UI:ChangePwdMenu' => 'Cambia Password...',
+        'UI:AccessRO-All' => 'iTop è di sola lettura',
+        'UI:AccessRO-Users' => 'iTop è di sola lettura per gli utenti finali',
+        'UI:Login:RetypePwdDoesNotMatch' => 'Nuova password e la nuova password digitata nuovamente non corrispondono !',
+        'UI:Button:Login' => 'Entra in iTop',
+
+	'UI:Login:Error:AccessRestricted' => 'L\'accesso a iTop è limitato. Si prega di contattare un amministratore iTop.',
+	'UI:Login:Error:AccessAdmin' => 'Accesso limitato alle persone che hanno privilegi di amministratore. Si prega di contattare un amministratore iTop.',
+	'UI:CSVImport:MappingSelectOne' => '-- seleziona uno --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignora questo campo --',
+	'UI:CSVImport:NoData' => 'Insieme di dati vuoto ..., si prega di fornire alcuni dati!',
+	'UI:Title:DataPreview' => 'Anteprima dati',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Errore: I dati contengono solo una colonna. Avete selezionato il carattere separatore appropriato?',
+	'UI:CSVImport:FieldName' => 'Campo %1$d',
+	'UI:CSVImport:DataLine1' => 'Dati Linea 1',
+	'UI:CSVImport:DataLine2' => 'Dati Linea 2',
+	'UI:CSVImport:idField' => 'id (Chiave Primaria)',
+	'UI:Title:BulkImport' => 'iTop - importazione collettiva',
+	'UI:Title:BulkImport+' => '',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronizzazione di %1$d oggetti della classe %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- seleziona uno --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Errore interno: "%1$s" è un codice errato, perché "%2$s" NON è una chiave esterna della classe "%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d oggetto(i) rimarrà invariato.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d oggetto(i) sarà modificato.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d oggetto(i) sarà aggiunto.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d oggetto(i) avranno i errori.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d oggetto(i) è rimasto invariato.',
+	'UI:CSVImport:ObjectsWereModified' =>  '%1$d oggetto(i) sono stati modificati.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d oggetto(i) sono stati aggiunti.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d oggetto(i) hanno avuto errori.',
+	'UI:Title:CSVImportStep2' => 'Step 2 of 5: opzioni dati CVS',
+	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Mappatura dei dati',
+	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Importa simulazione',
+	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Importazione completata',
+	'UI:CSVImport:LinesNotImported' => 'Linee che non possono essere caricate:',
+	'UI:CSVImport:LinesNotImported+' => '',
+	'UI:CSVImport:SeparatorComma+' => '',
+	'UI:CSVImport:SeparatorSemicolon+' => '',
+	'UI:CSVImport:SeparatorTab+' => '',
+	'UI:CSVImport:SeparatorOther' => 'altri:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '',
+	'UI:CSVImport:QualifierSimpleQuote+' => '',
+	'UI:CSVImport:QualifierOther' => 'other:~~',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Tratta la prima riga come intestazione (nomi di colonna)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Salta le linee %1$s all\'inzio del file',
+	'UI:CSVImport:CSVDataPreview' => 'CSV Anteprima dei dati',
+	'UI:CSVImport:SelectFile' => 'Selezionare il file da importare:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Carica da un file',
+	'UI:CSVImport:Tab:CopyPaste' => 'Copia e incolla i dati',
+	'UI:CSVImport:Tab:Templates' => 'Modelli',
+	'UI:CSVImport:PasteData' => 'Incolla i dati da importare:',
+	'UI:CSVImport:PickClassForTemplate' =>  'Scegli il modello da scaricare: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Separatore di carattere:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Testo di qualificazione carattere',
+	'UI:CSVImport:CommentsAndHeader' => 'Commenti e intestazione',
+	'UI:CSVImport:SelectClass' => 'Selezionare la classe da importare:',
+	'UI:CSVImport:AdvancedMode' => 'Modalità avanzata',
+	'UI:CSVImport:AdvancedMode+' => '',
+	'UI:CSVImport:SelectAClassFirst' => 'Per configurare il mapping, selezionare prima una classe.',
+	'UI:CSVImport:HeaderFields' => 'Campi',
+	'UI:CSVImport:HeaderMappings' => 'Mappings',
+	'UI:CSVImport:HeaderSearch' => 'Cerca?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Per favore seleziona una mappatura per ogni campo.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Per favore seleziona almeno un criterio di ricerca',
+	'UI:CSVImport:Encoding' => 'Codifica dei caratteri',
+	'UI:UniversalSearchTitle' => 'iTop - Ricerca Universale',
+	'UI:UniversalSearch:Error' => 'Errore: %1$s~~',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Seleziona la classe per la ricerca: ',
+	'UI:Audit:Title' => 'iTop - CMDB Audit~~',
+	'UI:Audit:InteractiveAudit' => 'Audit Interattivo',
+	'UI:Audit:HeaderAuditRule' => 'Regole di Audit',
+	'UI:Audit:HeaderNbObjects' => '# Oggetti',
+	'UI:Audit:HeaderNbErrors' => '# Errori',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:RunQuery:Title' => 'iTop - Valutazione Query OQL',
+	'UI:RunQuery:QueryExamples' => 'Esempi di Query',
+	'UI:RunQuery:HeaderPurpose' => 'Scopo',
+	'UI:RunQuery:HeaderPurpose+' => '',
+	'UI:RunQuery:HeaderOQLExpression' => 'Espressioni OQL',
+	'UI:RunQuery:HeaderOQLExpression+' => '',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Espressione da valutare: ',
+	'UI:RunQuery:MoreInfo' => 'Maggiori informazioni sulla query: ',
+	'UI:RunQuery:DevelopedQuery' => 'Espressione della query riqualificata:',
+	'UI:RunQuery:SerializedFilter' => 'Filtro pubblicato: ',
+	'UI:RunQuery:Error' => 'Si è verificato un errore durante l\'esecuzione della query: %1$s',
+	'UI:Schema:Title' => 'iTop schema degli oggetti',
+	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relazioni',
+	'UI:Schema:AbstractClass' => 'Classe astratta: nessun oggetto da questa classe può essere istanziato.',
+	'UI:Schema:NonAbstractClass' => 'Classe non-astratta: oggetti da questa classe possono essere istanziati.',
+	'UI:Schema:ClassHierarchyTitle' => 'Gerarchia delle classi',
+	'UI:Schema:AllClasses' => 'Tutte le classi',
+	'UI:Schema:ExternalKey_To' => 'Chiave esterna  %1$s',
+	'UI:Schema:Columns_Description' => 'Colonne: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Default: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null consentito',
+	'UI:Schema:NullNotAllowed' => 'Null NON consentito',
+	'UI:Schema:Attributes' => 'Attributi',
+	'UI:Schema:AttributeCode' => 'Codice attributo',
+	'UI:Schema:AttributeCode+' => '',
+	'UI:Schema:Label' =>  'Etichetta',
+	'UI:Schema:Label+' => '',
+	'UI:Schema:Type' => 'Tipo',
+	'UI:Schema:Type+' => '',
+	'UI:Schema:Origin' => 'Origine',
+	'UI:Schema:Origin+' => '',
+	'UI:Schema:Description' => 'Descrizione',
+	'UI:Schema:Description+' => '',
+	'UI:Schema:AllowedValues' => 'Valori consentiti',
+	'UI:Schema:AllowedValues+' => '',
+	'UI:Schema:MoreInfo' => 'Maggiori informazioni',
+	'UI:Schema:MoreInfo+' => '',
+	'UI:Schema:SearchCriteria' => 'Criteri di ricerca',
+	'UI:Schema:FilterCode' => 'Codice di filtro',
+	'UI:Schema:FilterCode+' => '',
+	'UI:Schema:FilterDescription' => 'Descrizione',
+	'UI:Schema:FilterDescription+' => '',
+	'UI:Schema:AvailOperators' => 'Operatori disponibili',
+	'UI:Schema:AvailOperators+' => '',
+	'UI:Schema:ChildClasses' => 'Classi figlio',
+	'UI:Schema:ReferencingClasses' => 'Classi di rifermento',
+	'UI:Schema:RelatedClasses' => 'Classi correlate',
+	'UI:Schema:LifeCycle' => 'Ciclo di vita',
+	'UI:Schema:Triggers' => 'Triggers',
+	'UI:Schema:Relation_Code_Description' => 'Relazione <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' =>  'Giù: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Su: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: propagato al livello %2$d, query: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: non si propaga a (%2$d livelli), query: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s fa riferimento la classe %2$s tramite il campo %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s è legata alla %2$s via %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'Classi che puntano a %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Classi legati alla %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'Grafico di tutte le classi correlate',
+	'UI:Schema:NoLifeCyle' => 'Non vi è alcun ciclo di vita definito per questa classe.',
+	'UI:Schema:LifeCycleTransitions' => 'Transizioni',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Opzioni per l\'attributo',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Nascosto',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Di sola lettura',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obbigatorio',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Deve cambiare',
+	'UI:Schema:LifeCycleAttributeMustPrompt' =>  'All\'utente verrà richiesto di modificare il valore',
+	'UI:Schema:LifeCycleEmptyList' => 'lista vuota',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => '',
+	'UI:Combo:SelectValue' => '--- seleziona un valore ---',
+	'UI:Label:SelectedObjects' => 'oggetti selezionati: ',
+	'UI:Label:AvailableObjects' => 'Oggetti disponibili: ',
+	'UI:Link_Class_Attributes' => '%1$s attributi',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Aggiungi l\'oggeto %1$s collegato con %2$s: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Aggiungi l\'oggeto %1$s al collegamento con %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gestisci l\'oggetto %1$s collegato con %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Aggiungi %1$s...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Rimuovi gli oggetti selezionati',
+	'UI:Message:EmptyList:UseAdd' => 'La lista è vuota, utilizzare il pulsante "Aggiungi ..." per aggiungere elementi.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Utilizza il modulo di ricerca qui sopra per cercare oggetti da aggiungere.',
+	'UI:Wizard:FinalStepTitle' => 'Passo finale: la conferma',
+	'UI:Title:DeletionOf_Object' => 'Soppressione di %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Cancellazione collettiva di %1$d oggetti della classe %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'Non ti è permesso di eliminare l\'oggetto',
+	'UI:Delete:NotAllowedToUpdate_Fields' =>  'Non hai i permessi per aggiornare il seguente campo(i): %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Questo oggetto non può essere cancellato perché l\'utente corrente non dispone dei diritti necessari',
+	'UI:Error:CannotDeleteBecause' => 'Questo oggetto non può essere cancellato perchè: %1$s~~',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Questo oggetto non può essere cancellato perché alcune operazioni manuali devono essere effettuate prima di questo',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s a nome di %2$s',
+	'UI:Delete:Deleted' => 'deleted~~',
+	'UI:Delete:AutomaticallyDeleted' => 'automaticamente eliminato',
+	'UI:Delete:AutomaticResetOf_Fields' => 'ripristino automatico del campo(i): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Pulizia di tutti i riferimenti a %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Pulizia di tutti i riferimenti a %1$d oggetti di classe %2$s...',
+	'UI:Delete:Done+' => '',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s cancellato.',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Soppressione di %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Soppressione di %1$d oggetti di classe %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Non può essere cancellato: %1$s~~',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Dovrebbe essere eliminato automaticamente, ma questo non è fattibile: %1$s~~',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Deve essere cancellato manualmente, ma questo non è fattibile: %1$s~~',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Sarà cancellato automaticamente',
+	'UI:Delete:MustBeDeletedManually' => 'Deve essere cancellato manualmente',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Dovrebbero essere automaticamente aggiornati, ma: %1$s~~',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Sarà automaticamente aggiornato (reset: %1$s)~~',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d oggetti/link fanno riferimento %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d oggetti / link fanno riferimento alcuni degli oggetti da eliminare', 
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Per garantire l\'integrità del database, ogni riferimento dovrebbe essere ulteriormente eliminato',
+	'UI:Delete:Consequence+' => '',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Spiacenti, non sei autorizzato a cancellare questo oggetto, vedere le spiegazioni di cui sopra',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Si prega di eseguire le operazioni manuali di cui sopra prima di richiedere la cancellazione di questo oggetto',
+	'UI:Delect:Confirm_Object' =>  'Si prega di confermare che si desidera eliminare %1$s.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Si prega di confermare che si desidera eliminare i seguenti oggetti %1$d della classe %2$s.',
+	'UI:WelcomeToITop' =>  'Benvenuto su iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s dettagli',
+	'UI:ErrorPageTitle' => 'iTop - Errore',
+	'UI:ObjectDoesNotExist' => 'Spiacenti, questo oggetto non esiste (o non si è autorizzati per vederlo).',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'iTop - Risultati della ricerca',
+	'UI:SearchResultsTitle' => 'Risultati della ricerca',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => 'Niente da ricercare',
+	'UI:FullTextSearchTitle_Text' => 'Risultati per "%1$s":',
+	'UI:Search:Count_ObjectsOf_Class_Found' => 'Trovato l\'oggetto(i) %1$d della classe %2$s.',
+	'UI:Search:NoObjectFound' => 'Nessun oggetto trovato.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modifica',
+	'UI:ModificationTitle_Class_Object' => 'Modifica di %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - Clone %1$s - %2$s modifica',
+	'UI:CloneTitle_Class_Object' => 'Clone di %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - Creazione di un nuovo %1$s ',
+	'UI:CreationTitle_Class' => 'Creazione di un nuovo %1$s',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Seleziona il tipo di %1$s da creare:',
+	'UI:Class_Object_NotUpdated' => 'Nessun cambiamento rilevato, %1$s (%2$s)  <strong>non</strong> è stato modificato.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) aggiornato.',
+	'UI:BulkDeletePageTitle' => 'iTop - Eliminazione collettiva',
+	'UI:BulkDeleteTitle' => 'Seleziona gli oggetti che si desidera eliminare:',
+	'UI:PageTitle:ObjectCreated' => 'iTop Oggetto Creato.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s creato.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Applicazione %1$s all\'oggetto: %2$s nello stato %3$s allo stato target: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'L\'oggetto non può essere scritto: %1$s~~',
+	'UI:PageTitle:FatalError' => 'iTop - Fatal Error',
+	'UI:SystemIntrusion' => 'Accesso negato. Hai cercato di eseguire un\'operazione che non ti è consentita.',
+	'UI:FatalErrorMessage' => 'Fatal error, iTop non può continuare.',
+	'UI:Error_Details' => 'Errore: %1$s.',
+	'UI:PageTitle:ClassProjections' => 'iTop gestione degli utenti - proiezioni classe',
+	'UI:PageTitle:ProfileProjections' => 'iTop gestione degli utenti - proiezioni profilo',
+	'UI:UserManagement:Class' => 'Classe',
+	'UI:UserManagement:Class+' => '',
+	'UI:UserManagement:ProjectedObject' => 'Oggetto',
+	'UI:UserManagement:ProjectedObject+' => '',
+	'UI:UserManagement:AnyObject' => '* qualsiasi *',
+	'UI:UserManagement:User' => 'Utente',
+	'UI:UserManagement:User+' => '',
+	'UI:UserManagement:Profile' => 'Profilo',
+	'UI:UserManagement:Profile+' => '',
+	'UI:UserManagement:Action:Read' => 'Leggi',
+	'UI:UserManagement:Action:Read+' => '',
+	'UI:UserManagement:Action:Modify' => 'Modifica',
+	'UI:UserManagement:Action:Modify+' => '',
+	'UI:UserManagement:Action:Delete' => 'Cancella',
+	'UI:UserManagement:Action:Delete+' => '',
+	'UI:UserManagement:Action:BulkRead' => 'Leggi Bulk (Export)',
+	'UI:UserManagement:Action:BulkRead+' => '',
+	'UI:UserManagement:Action:BulkModify' => 'Modifica Bulk',
+	'UI:UserManagement:Action:BulkModify+' => '',
+	'UI:UserManagement:Action:BulkDelete' => 'Cancella Bulk ',
+	'UI:UserManagement:Action:BulkDelete+' => '',
+	'UI:UserManagement:Action:Stimuli' => 'Stimoli',
+	'UI:UserManagement:Action:Stimuli+' => '',
+	'UI:UserManagement:Action' => 'Azione',
+	'UI:UserManagement:Action+' => '',
+	'UI:UserManagement:TitleActions' => 'Azioni',
+	'UI:UserManagement:Permission' => 'Autorizzazione',
+	'UI:UserManagement:Permission+' => '',
+	'UI:UserManagement:Attributes' => 'Attributi',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Si',
+	'UI:UserManagement:ActionAllowed:No' => 'No',
+	'UI:UserManagement:AdminProfile+' => '',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => '',
+	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Collegamento tra %1$s e %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Collegamento tra %1$s e %2$s',
+	'Menu:AdminTools' => 'Strumenti di amministrazione', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Strumenti accessibile solo agli utenti con il profilo di amministratore', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:ChangeManagementMenu' => 'Gestione Cambi',
+	'UI:ChangeManagementMenu+' => '',
+	'UI:ChangeManagementMenu:Title' => 'Panoramica dei cambi',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Cambi per tipo',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Cambi per stato',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Cambi per gruppi di lavoro',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Cambi non ancora assegnati',
+	'UI:ConfigurationManagementMenu' => 'Gestione Configurazione',
+	'UI:ConfigurationManagementMenu+' => '',
+	'UI:ConfigurationManagementMenu:Title' => 'Panoramica delle infrastrutture',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Oggetti infrastruttutura per tipo',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Oggetti infrastruttutura per stato',
+	'UI:ConfigMgmtMenuOverview:Title' =>  'Cruscotto per Gestione configurazione',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items per stato',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items per tipo',
+	'UI:RequestMgmtMenuOverview:Title' => 'Cruscotto per Gestione Richieste',
+	'UI-RequestManagementOverview-RequestByService' => 'Richieste degli utenti per servizio',
+	'UI-RequestManagementOverview-RequestByPriority' => 'Richieste degli utenti per priorità',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'Richieste degli utenti non ancora assegnate ad un agente',
+	'UI:IncidentMgmtMenuOverview:Title' => 'Cruscotto Gestione degli Incidenti',
+	'UI-IncidentManagementOverview-IncidentByService' => 'Incidenti per servizio',
+	'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenti per  priorità',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidenti non ancora assegnati ad un agente',
+	'UI:ChangeMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
+	'UI-ChangeManagementOverview-ChangeByType' => 'Cambi per tipo',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'Cambi non ancora assegnati ad un agente',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interruzioni dovute ai cambi',
+	'UI:ServiceMgmtMenuOverview:Title' => 'Cruscotto per Gestione dei Cambi',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratti con i clienti da rinnovarsi in 30 giorni',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratti con i fornitori da rinnovarsi in 30 giorni',
+	'UI:ContactsMenu' => 'Contatti',
+	'UI:ContactsMenu+' => '',
+	'UI:ContactsMenu:Title' => 'Contatti Panoramica',
+	'UI-ContactsMenu-ContactsByLocation' => 'Contatti per localizzazione',
+	'UI-ContactsMenu-ContactsByType' => 'Contatti per tipo',
+	'UI-ContactsMenu-ContactsByStatus' => 'Contatti per stato',
+	'Menu:CSVImportMenu' =>  'Importazione CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'Modello Dati', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'Esporta', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' =>  'Notifiche', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:NotificationsMenu:Title' =>  'Configurazione delle <span class="hilite">Notifiche</span>',
+	'UI:NotificationsMenu:Help' => 'Aiuto',
+	'UI:NotificationsMenu:HelpContent' => '<p>In iTop le notifiche sono completamente personalizzabili. Essi si basano su due serie di oggetti: <i>trigger e azioni</i>.</p>
+<p><i><b>Triggers</b></i> per definire quando una notifica verrà eseguita. Ci sono 3 tipi di trigger per la copertura di 3 fasi differenti del ciclo di vita di un oggetto:
+<ol>
+	 <li>the "OnCreate" trigger vengono eseguiti quando un oggetto della classe specificata viene creata</li>
+	 <li>the "OnStateEnter" trigger vengono eseguiti prima che un oggetto della classe data entra in uno stato specifico (provenienti da un altro Stato)</li>
+	 <li>the "OnStateLeave" trigger vengono eseguiti quando un oggetto della classe lascia uno stato specificato</li>
+</ol>
+
+</p>
+<p>
+<i><b>Azioni</b></i> definire le azioni da eseguire quando il trigger vengono eseguiti. Per ora c\'è solo un tipo di azione consiste nel mandare un messaggio email.
+Inoltre, tali azioni definiscono il modello da utilizzare per l\'invio della e-mail così come gli altri parametri del messaggio come, l\'importanza dei destinatari, etc
+</p>
+<p>Una Pagina speciale: <a href="../setup/email.test.php" target="_blank">email.test.php</a> è disponibile per il testing e la risoluzione dei problemi di configurazione PHP mail.</p>
+<p>Per essere eseguite, le azioni devono essere associate ai trigger.
+Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine", che specifica in quale ordine le azioni devono essere eseguite.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Triggers',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Triggers Disponibili',
+	'UI:NotificationsMenu:OnCreate' => 'When an object is created~~',
+	'UI:NotificationsMenu:OnStateEnter' => 'Quando un oggetto viene creato',
+	'UI:NotificationsMenu:OnStateLeave' => 'Quando un oggetto lascia un determinato stato',
+	'UI:NotificationsMenu:Actions' => 'Azioni',
+	'UI:NotificationsMenu:AvailableActions' => 'Azioni disponibili',
+	'Menu:AuditCategories' => 'Categorie di Audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Categorie di Audit', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'Esegui query', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'Dati di amministrazione', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => 'Ricerca universale', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'Gestione degli utenti', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'Profili', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profili', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu' => 'Account utente', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu+' => '', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu:Title' => 'Account utente', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:iTopVersion:Short' => 'Versione %1$s %2$s',
+	'UI:iTopVersion:Long' => 'Versione %1$s %2$s-%3$s costruita il %4$s',
+	'UI:PropertiesTab' => 'Proprietà',
+	'UI:OpenDocumentInNewWindow_' => 'Apri questo documento in una nuova finestra: %1$s',
+	'UI:DownloadDocument_' => 'Scarica questo documento: %1$s',
+	'UI:Document:NoPreview' => 'Non è disponibile un\'anteprima per questo tipo di documento',
+	'UI:DeadlineMissedBy_duration' => 'Mancati %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',
+	'UI:Deadline_Minutes' => '%1$d min', 
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',  
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dg %2$dh %3$dmin',
+	'UI:Help' => 'Aiuto',
+	'UI:PasswordConfirm' => '(Conferma)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Prima di aggiungere più %1$s oggetti, salva questo oggetto.',
+	'UI:DisplayThisMessageAtStartup' => 'Visualizza questo messaggio in fase di avvio',
+	'UI:RelationshipGraph' => 'Visualizzazione grafica',
+	'UI:RelationshipList' => 'Lista',
+	'UI:OperationCancelled' => 'Operazione Annullata',
+	'Portal:Title' => 'Portale Utente iTop',
+	'Portal:Refresh' => 'Ricarica',
+	'Portal:Back' => 'Indietro',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => 'Crea una nuova richiesta',
+	'Portal:CreateNewRequestItil' => 'Crea una nuova richiesta',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => 'Cambia la mia password',
+	'Portal:Disconnect' => 'Disconnetti',
+	'Portal:OpenRequests' => 'Le mie richieste aperte',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests' => 'Le mie richieste risolte',
+	'Portal:SelectService' => 'Seleziona un servizio dal catalogo:',
+	'Portal:PleaseSelectOneService' => 'Si prega di selezionare un servizio',
+	'Portal:SelectSubcategoryFrom_Service' => 'Seleziona una sotto-categoria per il servizio %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Si prega di selezionare una delle sottocategorie',
+	'Portal:DescriptionOfTheRequest' => 'Inserisci la descrizione della tua richiesta:',
+	'Portal:TitleRequestDetailsFor_Request' => 'Dettagli per la richiesta %1$s:',
+	'Portal:NoOpenRequest' => 'Nessuna richiesta in questa categoria.',
+	'Portal:NoClosedRequest' => 'Nessuna richiesta in questa categoria.',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
+	'Portal:Button:CloseTicket' => 'Chiudi questo ticket',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => 'Inserisci il tuo commento sulla risoluzione di questo ticket:',
+	'Portal:ErrorNoContactForThisUser' =>  'Errore: l\'utente corrente non è associato ad un Contatto/Persona. Si prega di contattare l\'amministratore.',
+	'Portal:Attachments' => 'Allegati',
+	'Portal:AddAttachment' => ' Aggiungi allegati ',
+	'Portal:RemoveAttachment' =>  ' Rimuovi allegati ',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Allegato #%1$d a %2$s (%3$s)',
+	'Enum:Undefined' => 'Non definito',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Giorni %2$s Ore %3$s Minuti %4$s Secondi',
+	'UI:ModifyAllPageTitle' => 'Modifica Tutto',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifica %1$d oggetto della classe %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifica %1$d oggetto della classe %2$s fuori da %3$d~~',
+	'UI:Menu:ModifyAll' => 'Modifica...',
+	'UI:Button:ModifyAll' => 'Modifica tutto',
+	'UI:Button:PreviewModifications' => 'Anteprima Modifiche >>~~',
+	'UI:ModifiedObject' => 'Oggetto Modificato',
+	'UI:BulkModifyStatus' => 'Operazioni',
+	'UI:BulkModifyStatus+' => '',
+	'UI:BulkModifyErrors' => 'Errori (eventuali)',
+	'UI:BulkModifyErrors+' => '',
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Errore',
+	'UI:BulkModifyStatusModified' => 'Modificato',
+	'UI:BulkModifyStatusSkipped' => 'Saltato',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d valori distinti:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d volta(e)',
+	'UI:BulkModify:N_MoreValues' => '%1$d più valori...~~',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentativo di impostare il campo di sola lettura: %1$s',
+	'UI:FailedToApplyStimuli' => 'L\'azione non è riuscita.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifica %2$d oggetti della classe %3$s~~',
+	'UI:CaseLogTypeYourTextHere' => 'Digitare il tuo testo qui:',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
+	'UI:CaseLog:InitialValue' => 'Valore iniziale:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore non impostato.',
+	'UI:ActionNotAllowed' => 'Non hai i permessi per eseguire questa azione su questi oggetti.',
+	'UI:BulkAction:NoObjectSelected' => 'Si prega di selezionare almeno un oggetto per eseguire questa operazione',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Il campo %1$s on è scrivibile, perché è comandato dalla sincronizzazione dei dati. Valore rimane invariato.',
+	'UI:Button:Refresh' => 'Ricarica',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profile~~',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'usage profile~~',
+	'UI:Button:Save' => 'Save~~',
+	'UI:Button:Rename' => ' Rename... ~~',
+	'UI:SplitDateTime-Date' => 'date~~',
+	'UI:SplitDateTime-Time' => 'time~~',
+	'UI:SearchValue:NbSelected' => '# selected~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:CSVReport-Value-Modified' => 'Modified~~',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
+	'UI:CSVReport-Value-NoMatch' => 'No match~~',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
+	'UI:CSVReport-Row-Created' => 'created~~',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
+	'UI:CSVReport-Icon-Modified' => 'Modified~~',
+	'UI:CSVReport-Icon-Missing' => 'Missing~~',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
+	'UI:CSVReport-Icon-Created' => 'Created~~',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
+	'UI:CSVReport-Object-Created' => 'Object created~~',
+	'UI:CSVReport-Icon-Error' => 'Error~~',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
+	'UI:CSVExport:LostChars' => 'Encoding issue~~',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Edit:TestQuery' => 'Test query~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'UI:Download-CSV' => 'Download %1$s~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:ElementsDisplayed' => 'Filtering~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
+	'UI:Pagination:PageSize' => '%1$s objects per page~~',
+	'UI:Pagination:PagesLabel' => 'Pages:~~',
+	'UI:Pagination:All' => 'All~~',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
+	'UI:Preferences' => 'Preferences...~~',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
+	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
+	'UI:FavoriteOtherSettings' => 'Other Settings~~',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
+	'UI:ConfigureThisList' => 'Configure This List...~~',
+	'UI:ListConfigurationTitle' => 'List Configuration~~',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
+	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:UseSavetheSettings' => 'Save the Settings~~',
+	'UI:OnlyForThisList' => 'Only for this list~~',
+	'UI:ForAllLists' => 'Default for all lists~~',
+	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
+	'UI:Button:MoveUp' => 'Move Up~~',
+	'UI:Button:MoveDown' => 'Move Down~~',
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
+	'UI:ExportDashBoard' => 'Export to a file~~',
+	'UI:ImportDashBoard' => 'Import from a file...~~',
+	'UI:ImportDashboardTitle' => 'Import From a File~~',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
+	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
+	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
+	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'UI:DashboardEdit:Layout' => 'Layout~~',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
+	'UI:Form:Property' => 'Property~~',
+	'UI:Form:Value' => 'Value~~',
+	'UI:DashletPlainText:Label' => 'Text~~',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
+	'UI:DashletPlainText:Prop-Text' => 'Text~~',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
+	'UI:DashletObjectList:Label' => 'Object list~~',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
+	'UI:DashletObjectList:Prop-Title' => 'Title~~',
+	'UI:DashletObjectList:Prop-Query' => 'Query~~',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
+	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
+	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
+	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
+	'UI:DashletHeaderStatic:Label' => 'Header~~',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
+	'UI:DashletBadge:Prop-Class' => 'Class~~',
+	'DayOfWeek-Sunday' => 'Sunday~~',
+	'DayOfWeek-Monday' => 'Monday~~',
+	'DayOfWeek-Tuesday' => 'Tuesday~~',
+	'DayOfWeek-Wednesday' => 'Wednesday~~',
+	'DayOfWeek-Thursday' => 'Thursday~~',
+	'DayOfWeek-Friday' => 'Friday~~',
+	'DayOfWeek-Saturday' => 'Saturday~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Class:Shortcut' => 'Shortcut~~',
+	'Class:Shortcut/Attribute:name' => 'Name~~',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
+	'Class:ShortcutOQL' => 'Search result shortcut~~',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php
index 5bb0d1660..8a1deb723 100644
--- a/dictionaries/ja.dictionary.itop.ui.php
+++ b/dictionaries/ja.dictionary.itop.ui.php
@@ -1,1128 +1,1128 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:QueryOQL' => 'OQL クエリ',
-	'Class:QueryOQL+' => ' Object Query Language に基づいたクエリ',
-	'Class:QueryOQL/Attribute:oql' => '式',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL 式',
-	'Class:ShortcutOQL' => '検索結果ショートカット',
-	'Class:ShortcutOQL+' => '',
-	'Class:ShortcutOQL/Attribute:oql' => 'クエリ',
-	'Class:ShortcutOQL/Attribute:oql+' => '',
-	'Class:AuditRule' => '監査ルール',
-	'Class:AuditRule+' => '指定された監査カテゴリをチェックするためのルール',
-	'Class:AuditRule/Attribute:name' => 'ルール名',
-	'Class:AuditRule/Attribute:name+' => 'ルールの短縮名',
-	'Class:AuditRule/Attribute:description' => '監査ルール説明',
-	'Class:AuditRule/Attribute:description+' => 'この監査ルールの長い説明',
-	'Class:AuditRule/Attribute:query' => '実行するクエリ',
-	'Class:AuditRule/Attribute:query+' => '実行するOQL式',
-	'Class:AuditRule/Attribute:valid_flag' => '有効なオブジェクト',
-	'Class:AuditRule/Attribute:valid_flag+' => 'このルールが有効なオブジェクトを返す場合は真、そうでなければ偽',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => '偽',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '偽',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => '真',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '真',
-	'Class:AuditRule/Attribute:category_id' => 'カテゴリ',
-	'Class:AuditRule/Attribute:category_id+' => 'このルールのカテゴリ',
-	'Class:AuditCategory' => '監査カテゴリ',
-	'Class:AuditCategory+' => '監査全体の内部セクション',
-	'Class:AuditCategory/Attribute:name' => 'カテゴリ名',
-	'Class:AuditCategory/Attribute:name+' => 'カテゴリの短縮名',
-	'Class:AuditCategory/Attribute:description' => '監査カテゴリ説明',
-	'Class:AuditCategory/Attribute:description+' => '監査カテゴリの説明',
-	'Class:AuditCategory/Attribute:definition_set' => '定義セット',
-	'Class:AuditCategory/Attribute:definition_set+' => '監査するべきオブジェクトの集合を定義するOQL式',
-	'Class:AuditCategory/Attribute:rules_list' => '監査ルール',
-	'Class:AuditCategory/Attribute:rules_list+' => 'このカテゴリの監査ルール',
-	'Class:URP_Profiles' => 'プロフィール',
-	'Class:URP_Profiles+' => 'ユーザプロフィール',
-	'Class:URP_Profiles/Attribute:name' => '名前',
-	'Class:URP_Profiles/Attribute:name+' => 'ラベル',
-	'Class:URP_Profiles/Attribute:description' => '説明',
-	'Class:URP_Profiles/Attribute:description+' => '1行の説明',
-	'Class:URP_Profiles/Attribute:user_list' => 'ユーザー',
-	'Class:URP_Profiles/Attribute:user_list+' => 'この役割をもつ人',
-	'Class:URP_UserProfile' => 'ユーザープロフィール',
-	'Class:URP_UserProfile+' => 'ユーザープロフィール',
-	'Class:URP_UserProfile/Attribute:userid' => 'ユーザー',
-	'Class:URP_UserProfile/Attribute:userid+' => 'ユーザアカウント',
-	'Class:URP_UserProfile/Attribute:profileid' => 'プロフィール',
-	'Class:URP_UserProfile/Attribute:profileid+' => '使用プロフィール',
-	'Class:URP_UserProfile/Attribute:reason' => '理由',
-	'Class:URP_UserProfile/Attribute:reason+' => 'なぜ、この人物がこの役割を持つかを説明する',
-	'Class:URP_UserOrg' => 'ユーザー組織',
-	'Class:URP_UserOrg+' => '許可された組織',
-	'Class:URP_UserOrg/Attribute:userid' => 'ユーザー',
-	'Class:URP_UserOrg/Attribute:userid+' => 'ユーザーアカウント',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => '組織',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '許可された組織',
-	'Class:URP_UserOrg/Attribute:reason' => '理由',
-	'Class:URP_UserOrg/Attribute:reason+' => 'なぜこの人物がこの組織に属するデータを参照できるのかを説明する',
-	'Class:AuditRule/Attribute:category_name' => 'カテゴリ',
-	'Class:AuditRule/Attribute:category_name+' => 'このルールのカテゴリ名',
-	'Class:Query' => 'クエリ',
-	'Class:Query+' => 'クエリは動的な方法で定義されるデータセットです。',
-	'Class:Query/Attribute:name' => '名前',
-	'Class:Query/Attribute:name+' => 'クエリを識別します。',
-	'Class:Query/Attribute:description' => '説明',
-	'Class:Query/Attribute:description+' => 'クエリの長い説明（目的、使用方法等）',
-	'Class:Query/Attribute:fields' => 'フィールド',
-	'Class:Query/Attribute:fields+' => 'エクスポートする属性（またはエイリアス属性,alias.attribute）のコンマ区切り(CSV)リスト',
-	'Class:User' => 'ユーザー',
-	'Class:User+' => 'ユーザーログイン',
-	'Class:User/Attribute:finalclass' => 'アカウントタイプ',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => '連絡先(人物)',
-	'Class:User/Attribute:contactid+' => 'ビジネスデータから抽出した個人の詳細',
-	'Class:User/Attribute:last_name' => 'ラストネーム',
-	'Class:User/Attribute:last_name+' => '対応する連絡先の名前',
-	'Class:User/Attribute:first_name' => 'ファーストネーム',
-	'Class:User/Attribute:first_name+' => '対応する連絡先のファーストネーム',
-	'Class:User/Attribute:email' => 'メールアドレス',
-	'Class:User/Attribute:email+' => '対応する連絡先のメールアドレス',
-	'Class:User/Attribute:login' => 'ログイン',
-	'Class:User/Attribute:login+' => 'ユーザ識別文字列',
-	'Class:User/Attribute:language' => '言語',
-	'Class:User/Attribute:language+' => 'ユーザ使用言語',
-	'Class:User/Attribute:language/Value:EN US' => '英語',
-	'Class:User/Attribute:language/Value:EN US+' => '英語(米国)',
-	'Class:User/Attribute:language/Value:FR FR' => 'フランス語',
-	'Class:User/Attribute:language/Value:FR FR+' => 'フランス語(フランス)',
-	'Class:User/Attribute:profile_list' => 'プロフィール',
-	'Class:User/Attribute:profile_list+' => '役割、この人物に付与された権限',
-	'Class:User/Attribute:allowed_org_list' => '許可された組織',
-	'Class:User/Attribute:allowed_org_list+' => 'エンドユーザは以下の組織に属するデータの参照を許可されています。組織が指定されていなければ、制限はありません。',
-	'Class:User/Error:LoginMustBeUnique' => 'ログイン名は一意でないといけません。- "%1s" はすでに使われています。',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => '少なくとも1件のプロフィールがこのユーザに指定されなければなりません。',
-	'Class:URP_Dimensions' => 'ディメンション',
-	'Class:URP_Dimensions+' => 'アプリケーションディメンション(defining silos)',
-	'Class:URP_Dimensions/Attribute:name' => '名前',
-	'Class:URP_Dimensions/Attribute:name+' => 'ラベル',
-	'Class:URP_Dimensions/Attribute:description' => '説明',
-	'Class:URP_Dimensions/Attribute:description+' => '1行の説明',
-	'Class:URP_Dimensions/Attribute:type' => 'タイプ',
-	'Class:URP_Dimensions/Attribute:type+' => 'クラス名、もしくはデータ型(projection unit)',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'ログイン',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'ユーザーのログイン',
-	'Class:URP_UserProfile/Attribute:profile' => 'プロフィール',
-	'Class:URP_UserProfile/Attribute:profile+' => 'プロフィール名',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'ログイン',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'ユーザのログイン',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => '組織',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '許可された組織',
-	'Class:URP_ProfileProjection' => 'プロフィールプロジェクション',
-	'Class:URP_ProfileProjection+' => 'プロフィールプロジェクション',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'ディメンション',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'アプリケーションディメンション',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'ディメンション',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'アプリケーションディメンション',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'プロフィール',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => '使用プロフィール',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'プロフィール',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'プロフィール名',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Value式',
-	'Class:URP_ProfileProjection/Attribute:value+' => '($userを使う)OQL式 | 定数 |  | +属性コード',
-	'Class:URP_ProfileProjection/Attribute:attribute' => '属性',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'ターゲット属性コード (オプション)',
-	'Class:URP_ClassProjection' => 'クラスプロジェクション',
-	'Class:URP_ClassProjection+' => 'クラスのプロジェクション',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'ディメンション',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'アプリケーションディメンション',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'ディメンション',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'アプリケーションディメンション',
-	'Class:URP_ClassProjection/Attribute:class' => 'クラス',
-	'Class:URP_ClassProjection/Attribute:class+' => 'ターゲットクラス',
-	'Class:URP_ClassProjection/Attribute:value' => '値式',
-	'Class:URP_ClassProjection/Attribute:value+' => '($this を使った)OQL式 | 定数 |  | +属性コード',
-	'Class:URP_ClassProjection/Attribute:attribute' => '属性',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'ターゲット属性コード(オプション)',
-	'Class:URP_ActionGrant' => 'アクション権限',
-	'Class:URP_ActionGrant+' => 'クラスに対する権限',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'プロフィール',
-	'Class:URP_ActionGrant/Attribute:profileid+' => '使用プロフィール',
-	'Class:URP_ActionGrant/Attribute:profile' => 'プロフィール',
-	'Class:URP_ActionGrant/Attribute:profile+' => '使用プロフィール',
-	'Class:URP_ActionGrant/Attribute:class' => 'クラス',
-	'Class:URP_ActionGrant/Attribute:class+' => 'ターゲットクラス',
-	'Class:URP_ActionGrant/Attribute:permission' => '許可',
-	'Class:URP_ActionGrant/Attribute:permission+' => '許可の有無は?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'はい',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'はい',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'いいえ',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'いいえ',
-	'Class:URP_ActionGrant/Attribute:action' => 'アクション',
-	'Class:URP_ActionGrant/Attribute:action+' => '指定されたクラスに実行する操作',
-	'Class:URP_StimulusGrant' => 'シティミュラス権限',
-	'Class:URP_StimulusGrant+' => 'オブジェクトのライフサイクル中のシティミュラスにおける権限',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'プロフィール',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => '使用プロフィール',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'プロフィール',
-	'Class:URP_StimulusGrant/Attribute:profile+' => '使用プロフィール',
-	'Class:URP_StimulusGrant/Attribute:class' => 'クラス',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'ターゲットクラス',
-	'Class:URP_StimulusGrant/Attribute:permission' => '権限',
-	'Class:URP_StimulusGrant/Attribute:permission+' => '許可されているか、いないか。',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'はい',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'はい',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'いいえ',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'いいえ',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'シティミュラス',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'シティミュラスコード',
-	'Class:URP_AttributeGrant' => '属性権限',
-	'Class:URP_AttributeGrant+' => '属性レベルでの権限',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => '実行権限',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '実行権限',
-	'Class:URP_AttributeGrant/Attribute:attcode' => '属性',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => '属性コード',
-	'BooleanLabel:yes' => 'はい',
-	'BooleanLabel:no' => 'いいえ',
-	'Menu:WelcomeMenu' => 'ようこそ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'ようこそ、iTopへ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'ようこそ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'ようこそ、iTopへ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => 'ようこそ、iTopへ',
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTopは、オープンソースの、完結したIT運用ポータルです。</p>
-<ul>以下を含みます。
-<li>ITインベントリを文書化し、管理するための完全なCMDB(構成管理データベース)。</li>
-<li>IT環境で発生する出来事を追跡、共有するためのインシデント管理モジュール。</li>
-<li>IT環境への変更を計画、追跡するための変更管理モジュール。</li>
-<li>インシデントの解決をスピードアップするための既知のエラーデータベース。</li>
-<li>すべての計画停止を文書化し、適切な連絡先を通知するために停止モジュール。</li>
-<li>ITの概観を素早く得るためのダッシュボード。</li>
-</ul>
-<p>すべてのモジュールはお互いに独立しており、別個にセットアップが可能です。</p>',
-	'UI:WelcomeMenu:RightBlock' => '<p>iTopはサービスプロバイダ志向であり、ITエンジニアが複数の顧客や組織を簡単に管理できるようになります。
-<ul>iTopは、機能豊富な下記のビジネスプロセスのセットを提供します。
-<li>IT管理の実効性の強化。</li>
-<li>IT運用効率化の推進。</li>
-<li>顧客満足度の改善と、業績への洞察を経営経営幹部へ提供。</li>
-</ul>
-</p>
-<p>iTopは完全にオープンなので、あなたが今使っているIT管理インフラとの統合が可能です。</p>
-<p>
-<ul>この新世代IT運用ポータルの採用は、下記のお手伝いをします。
-<li>ますます複雑になるIT環境のより良い管理。</li>
-<li>あなたのペースでのITILプロセス実装。</li>
-<li>ITの中でもっとも重要な財産である「文書化」の管理。</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => '要求を開く: %1$d',
-	'UI:WelcomeMenu:MyCalls' => '担当中の要求',
-	'UI:WelcomeMenu:OpenIncidents' => 'インシデントを開く: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => '構成項目(CI): %1$d',
-	'UI:WelcomeMenu:MyIncidents' => '担当中のインシデント',
-	'UI:AllOrganizations' => '全ての組織',
-	'UI:YourSearch' => '検索',
-	'UI:LoggedAsMessage' => '%1$s としてログイン済み',
-	'UI:LoggedAsMessage+Admin' => '%1$s　(管理者)としてログイン済み',
-	'UI:Button:Logoff' => 'ログオフ',
-	'UI:Button:GlobalSearch' => '検索',
-	'UI:Button:Search' => '　検索　',
-	'UI:Button:Query' => ' クエリ',
-	'UI:Button:Ok' => 'OK',
-	'UI:Button:Save' => '　保存　',
-	'UI:Button:Cancel' => 'キャンセル',
-	'UI:Button:Apply' => '　適用　',
-	'UI:Button:Back' => ' << 戻る',
-	'UI:Button:Restart' => ' |<< リスタート',
-	'UI:Button:Next' => ' 次へ >> ',
-	'UI:Button:Finish' => ' 完了 ',
-	'UI:Button:DoImport' => ' インポート実行! ',
-	'UI:Button:Done' => ' 完了 ',
-	'UI:Button:SimulateImport' => ' インポートをシュミレート ',
-	'UI:Button:Test' => 'テスト実行!',
-	'UI:Button:Evaluate' => ' 評価 ',
-	'UI:Button:Evaluate:Title' => ' 評価 (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' 追加...',
-	'UI:Button:BrowseObjects' => 'ブラウズ...',
-	'UI:Button:Add' => ' 追加 ',
-	'UI:Button:AddToList' => ' << 追加 ',
-	'UI:Button:RemoveFromList' => '削除 >> ',
-	'UI:Button:FilterList' => ' フィルタ... ',
-	'UI:Button:Create' => ' 作成 ',
-	'UI:Button:Delete' => ' 削除! ',
-	'UI:Button:Rename' => ' 名前変更',
-	'UI:Button:ChangePassword' => ' パスワード変更 ',
-	'UI:Button:ResetPassword' => 'パスワードリセット ',
-	'UI:SearchToggle' => '検索（トグル↓↑)',
-	'UI:ClickToCreateNew' => '新規 %1$s を作成',
-	'UI:SearchFor_Class' => '%1$s オブジェクトを検索',
-	'UI:NoObjectToDisplay' => '表示するオブジェクトはありません。',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'link_attrが指定されている時は、object_idパラメータは必須です。表示テンプレートの定義を確認してください。',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'link_attrを指定する場合は、target_attrパラメータは必須です。表示テンプレートの定義を確認してください。',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'group_byパラメータは必須です。表示テンプレートの定義を確認してください。',
-	'UI:Error:InvalidGroupByFields' => '無効なフィールドリストです。 group by: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'エラー：サポートされていないブロックスタイル："%1$s"',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => '不正なリンク定義: 管理オブジェクトのクラス：%1$s は、クラス %2$s 中の外部キーとして見つかりません。',
-	'UI:Error:Object_Class_Id_NotFound' => 'オブジェクト：%1$s:%2$d が見つかりません。',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'エラー: フィールド間の依存関係に循環参照があります。データモデルを確認してください。',
-	'UI:Error:UploadedFileTooBig' => 'アップロードファイルが大きすぎます(上限は %1$s )。PHPの設定　upload_max_filesizeと、post_max_sizeを確認してください。',
-	'UI:Error:UploadedFileTruncated.' => 'アップロードファイルが切り捨てられました!',
-	'UI:Error:NoTmpDir' => '一時ディレクトリは定義されていません。',
-	'UI:Error:CannotWriteToTmp_Dir' => '一時ファイルをディスクに書き込めません。upload_tmp_dir = "%1$s"',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'extensionにより、アップロードを停止しました。(オリジナルのファイル名は"%1$s"です)。',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'ファイルのアップロードに失敗しました。原因は不明(エラーコード: "%1$s")です。',
-	'UI:Error:1ParametersMissing' => 'エラー: この操作には下記のパラメータを指定する必要があります：%1$s',
-	'UI:Error:2ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s , %2$s',
-	'UI:Error:3ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s',
-	'UI:Error:4ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s,%4$s',
-	'UI:Error:IncorrectOQLQuery_Message' => 'エラー：誤ったOQLクエリ:%1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'クエリ:%1$s 実行中にエラーが発生しました。',
-	'UI:Error:ObjectAlreadyUpdated' => 'エラー：このオブジェクトはすでに更新済みです。',
-	'UI:Error:ObjectCannotBeUpdated' => 'エラー：オブジェクトを更新できません。',
-	'UI:Error:ObjectsAlreadyDeleted' => 'エラー：オブジェクトは既に削除されています。',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => '%1$s クラスのオブジェクトに対するバルク削除の実行は許可されていません。',
-	'UI:Error:DeleteNotAllowedOn_Class' => '%1$s クラスのオブジェクトの削除は許可されていません。',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => '%1$s クラスのオブジェクトに対するバルクアップデートの実行は許可されていません。',
-	'UI:Error:ObjectAlreadyCloned' => 'エラー：このオブジェクトはすでに、クローンされています。',
-	'UI:Error:ObjectAlreadyCreated' => 'エラー：このオブジェクトは既に作成済みです。',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'エラー：状態"%3$s"のオブジェクト%2$s上の無効なスティミュラス"%1$s".',
-	'UI:GroupBy:Count' => 'カウント',
-	'UI:GroupBy:Count+' => '要素数',
-	'UI:CountOfObjects' => '%1$d 個のオブジェクトが条件にマッチしました。',
-	'UI_CountOfObjectsShort' => '%1$d オブジェクト。',
-	'UI:NoObject_Class_ToDisplay' => '表示する %1$s はありません。',
-	'UI:History:LastModified_On_By' => '%2$sによる最終更新 %1$s',
-	'UI:HistoryTab' => '履歴',
-	'UI:NotificationsTab' => '通知',
-	'UI:History:BulkImports' => '履歴',
-	'UI:History:BulkImports+' => 'CSVインポートのリスト(last first)',
-	'UI:History:BulkImportDetails' => '(%2$s により)実行された %1$s へCSVインポートによる変更結果',
-	'UI:History:Date' => '日付',
-	'UI:History:Date+' => '変更日',
-	'UI:History:User' => 'ユーザー',
-	'UI:History:User+' => 'この変更を行ったユーザー',
-	'UI:History:Changes' => '変更',
-	'UI:History:Changes+' => 'このオブジェクトを変更する',
-	'UI:History:StatsCreations' => '作成',
-	'UI:History:StatsCreations+' => '作成されたオブジェクト数',
-	'UI:History:StatsModifs' => '修正',
-	'UI:History:StatsModifs+' => '修正されたオブジェクト数',
-	'UI:History:StatsDeletes' => '削除',
-	'UI:History:StatsDeletes+' => '削除されたオブジェクト数',
-	'UI:Loading' => '読み込み...',
-	'UI:Menu:Actions' => '実行',
-	'UI:Menu:OtherActions' => 'その他の実行',
-	'UI:Menu:New' => '新規...',
-	'UI:Menu:Add' => '追加...',
-	'UI:Menu:Manage' => '管理...',
-	'UI:Menu:EMail' => 'Eメール',
-	'UI:Menu:CSVExport' => 'CSVエクスポート...',
-	'UI:Menu:Modify' => '修正...',
-	'UI:Menu:Delete' => '削除...',
-	'UI:Menu:BulkDelete' => '削除...',
-	'UI:UndefinedObject' => '未定義',
-	'UI:Document:OpenInNewWindow:Download' => '新規ウィンドウで開く: %1$s、 ダウンロード: %2$s',
-	'UI:SelectAllToggle+' => '全てを選択 / 全てを非選択',
-	'UI:SplitDateTime-Date' => '日付',
-	'UI:SplitDateTime-Time' => '時刻',
-	'UI:TruncatedResults' => '%2$d中%1$dのオブジェクトを表示',
-	'UI:DisplayAll' => 'すべて表示',
-	'UI:CollapseList' => '折りたたむ',
-	'UI:CountOfResults' => '%1$d オブジェクト',
-	'UI:ChangesLogTitle' => '変更履歴(%1$d)',
-	'UI:EmptyChangesLogTitle' => '変更履歴は空です。',
-	'UI:SearchFor_Class_Objects' => '%1$s オブジェクトを検索',
-	'UI:OQLQueryBuilderTitle' => 'OQLクエリビルダ',
-	'UI:OQLQueryTab' => 'OQLクエリ',
-	'UI:SimpleSearchTab' => '単純検索',
-	'UI:Details+' => '詳細',
-	'UI:SearchValue:Any' => '* 任意 *',
-	'UI:SearchValue:Mixed' => '* 混成 *',
-	'UI:SearchValue:NbSelected' => '# 選択',
-	'UI:SelectOne' => '-- 選んでください --',
-	'UI:Login:Welcome' => 'iTopへようこそ',
-	'UI:Login:IncorrectLoginPassword' => 'ログイン/パスワードが正しくありません。再度入力ください。',
-	'UI:Login:IdentifyYourself' => '続けて作業を行う前に認証を受けてください。',
-	'UI:Login:UserNamePrompt' => 'ユーザー名',
-	'UI:Login:PasswordPrompt' => 'パスワード',
-	'UI:Login:About' => '',
-	'UI:Login:ChangeYourPassword' => 'パスワードを変更してください',
-	'UI:Login:OldPasswordPrompt' => '古いパスワード',
-	'UI:Login:NewPasswordPrompt' => '新しいパスワード',
-	'UI:Login:RetypeNewPasswordPrompt' => '新しいパスワードを再度入力してください。',
-	'UI:Login:IncorrectOldPassword' => 'エラー：既存パスワードが正しくありません。',
-	'UI:LogOffMenu' => 'ログオフ',
-	'UI:LogOff:ThankYou' => 'iTopをご利用いただき、ありがとうございます。',
-	'UI:LogOff:ClickHereToLoginAgain' => '再度ログインするにはここをクリックしてください...',
-	'UI:ChangePwdMenu' => 'パスワードを変更する...',
-	'UI:Login:PasswordChanged' => 'パスワードは変更されました。',
-	'UI:AccessRO-All' => 'iTopは参照専用です。',
-	'UI:AccessRO-Users' => 'エンドユーザの方はiTopは参照専用です。',
-	'UI:ApplicationEnvironment' => 'アプリケーション環境: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch' => '2度入力された新しいパスワードが一致しません!',
-	'UI:Button:Login' => 'iTopへ入る',
-	'UI:Login:Error:AccessRestricted' => 'iTopへのアクセスは制限されています。iTop管理者に問い合わせしてください。',
-	'UI:Login:Error:AccessAdmin' => '管理者権限をもつユーザにアクセスが制限されています。iTop管理者に問い合わせしてください。',
-	'UI:CSVImport:MappingSelectOne' => '-- 選択ください --',
-	'UI:CSVImport:MappingNotApplicable' => '--このフィールドを無視する --',
-	'UI:CSVImport:NoData' => '空のデータセット..., データを提供してください。',
-	'UI:Title:DataPreview' => 'データプレビュー',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'エラー：このデータにはカラムが1つしか含まれていません。適切なセパレータ文字を選択しましたか。',
-	'UI:CSVImport:FieldName' => 'フィールド %1$d',
-	'UI:CSVImport:DataLine1' => 'データ行 1',
-	'UI:CSVImport:DataLine2' => 'データ行 2',
-	'UI:CSVImport:idField' => 'ID (主キー)',
-	'UI:Title:BulkImport' => 'iTop - バルクインポート',
-	'UI:Title:BulkImport+' => 'CSV インポートウィザード',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%2$s クラスの %1$d オブジェクトを同期',
-	'UI:CSVImport:ClassesSelectOne' => '--選択してください --',
-	'UI:CSVImport:ErrorExtendedAttCode' => '内部エラー： "%2$s" は"%3$s"クラスの外部キーではないので、"%1$s" は誤ったコードです。',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d オブジェクトは変更されません。',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d オブジェクトが修正されます。',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d オブジェクトが追加されます。',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d オブジェクトにエラーがあります。',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d オブジェクトは変更されていません。',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d オブジェクトが修正されました。',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d オブジェクトが追加されました。',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$s オブジェクトにエラーがあります。',
-	'UI:Title:CSVImportStep2' => 'ステップ2/5: CSVデータオプション',
-	'UI:Title:CSVImportStep3' => 'ステップ3/5: データマッピング',
-	'UI:Title:CSVImportStep4' => 'ステップ4/5: インポートシミュレーション',
-	'UI:Title:CSVImportStep5' => 'ステップ5/5: インポート完了',
-	'UI:CSVImport:LinesNotImported' => 'ロードできなかった行：',
-	'UI:CSVImport:LinesNotImported+' => '下記の行はエラーが含まれていたのでインポートされませんでした。',
-	'UI:CSVImport:SeparatorComma+' => ', (コンマ)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (セミコロン)',
-	'UI:CSVImport:SeparatorTab+' => 'タブ',
-	'UI:CSVImport:SeparatorOther' => 'その他:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (ダブルクォート)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (シングルクォート)',
-	'UI:CSVImport:QualifierOther' => 'その他：',
-	'UI:CSVImport:TreatFirstLineAsHeader' => '1行めをヘッダ(カラム名)として扱う。',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'ファイル最初の%1$s 行をスキップする',
-	'UI:CSVImport:CSVDataPreview' => 'CSVデータプレビュー',
-	'UI:CSVImport:SelectFile' => 'インポートするファイルを選択してください:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'ファイルからロード',
-	'UI:CSVImport:Tab:CopyPaste' => 'データをコピーとペースト',
-	'UI:CSVImport:Tab:Templates' => 'テンプレート',
-	'UI:CSVImport:PasteData' => 'インポートするデータをペーストしてください:',
-	'UI:CSVImport:PickClassForTemplate' => 'ダウンロードするテンプレートを選んでください',
-	'UI:CSVImport:SeparatorCharacter' => 'セパレータ文字',
-	'UI:CSVImport:TextQualifierCharacter' => 'テキスト修飾子文字',
-	'UI:CSVImport:CommentsAndHeader' => 'コメントとヘッダ',
-	'UI:CSVImport:SelectClass' => 'インポートするクラスを選択してください:',
-	'UI:CSVImport:AdvancedMode' => '拡張モード',
-	'UI:CSVImport:AdvancedMode+' => '拡張モードでは、オブジェクトの"id"(主キー)はオブジェクトの更新、リネームに使用可能です。しかしながら、"id"カラムは(たとえ存在しても)検索条件として使用可能なだけであり、他の検索条件と組み合わせて利用することはできません。',
-	'UI:CSVImport:SelectAClassFirst' => 'マッピングを設定するには、まず最初にクラスを選択してください。',
-	'UI:CSVImport:HeaderFields' => 'フィールド',
-	'UI:CSVImport:HeaderMappings' => 'マッピング',
-	'UI:CSVImport:HeaderSearch' => '検索しますか',
-	'UI:CSVImport:AlertIncompleteMapping' => 'すべてのフィールドのマッピングを選択してください。',
-	'UI:CSVImport:AlertNoSearchCriteria' => '少なくとも1つ以上の検索条件を選択してください。',
-	'UI:CSVImport:Encoding' => '文字エンコーディング',
-	'UI:UniversalSearchTitle' => 'iTop - ユニバーサル検索',
-	'UI:UniversalSearch:Error' => 'エラー：%1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => '検索するクラスを選択してください。',
-	'UI:CSVReport-Value-Modified' => '修正済み',
-	'UI:CSVReport-Value-SetIssue' => '変更出来ません - 理由: %1$s',
-	'UI:CSVReport-Value-ChangeIssue' => '%1$s へ変更出来ません - 理由: %2$s',
-	'UI:CSVReport-Value-NoMatch' => 'マッチしません',
-	'UI:CSVReport-Value-Missing' => '必須の値がありません',
-	'UI:CSVReport-Value-Ambiguous' => 'あいまいな値:  %1$s オブジェクト',
-	'UI:CSVReport-Row-Unchanged' => '未変更',
-	'UI:CSVReport-Row-Created' => '作成済み',
-	'UI:CSVReport-Row-Updated' => '更新 %1$d カラム',
-	'UI:CSVReport-Row-Disappeared' => '消去済み, 変更済み %1$d カラム',
-	'UI:CSVReport-Row-Issue' => '課題: %1$s',
-	'UI:CSVReport-Value-Issue-Null' => 'Null は許可されません',
-	'UI:CSVReport-Value-Issue-NotFound' => 'オブジェクトは見つかりません',
-	'UI:CSVReport-Value-Issue-FoundMany' => '%1$d マッチ',
-	'UI:CSVReport-Value-Issue-Readonly' => '属性 \'%1$s\' は、読み取り専用で、修正出来ません(現在の値: %2$s, 要求された値: %3$s)',
-	'UI:CSVReport-Value-Issue-Format' => '入力処理の失敗: %1$s',
-	'UI:CSVReport-Value-Issue-NoMatch' => '属性 \'%1$s\' への予期されない値 : マッチしません、文字列チェック',
-	'UI:CSVReport-Value-Issue-Unknown' => '属性 \'%1$s\' への予期されない値: %2$s',
-	'UI:CSVReport-Row-Issue-Inconsistent' => '属性がお互いに整合しません: %1$s',
-	'UI:CSVReport-Row-Issue-Attribute' => '予期されない属性値',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => '作成できません, 外部キーがありません: %1$s',
-	'UI:CSVReport-Row-Issue-DateFormat' => '間違ったデータフォーマット',
-	'UI:CSVReport-Row-Issue-Reconciliation' => '調整に失敗しました',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'あいまいな調整',
-	'UI:CSVReport-Row-Issue-Internal' => '内部エラー: %1$s, %2$s',
-	'UI:CSVReport-Icon-Unchanged' => '未変更',
-	'UI:CSVReport-Icon-Modified' => '修正済み',
-	'UI:CSVReport-Icon-Missing' => '不足',
-	'UI:CSVReport-Object-MissingToUpdate' => '不足オブジェクト: 更新されます',
-	'UI:CSVReport-Object-MissingUpdated' => '不足オブジェクト: 更新済み',
-	'UI:CSVReport-Icon-Created' => '作成済み',
-	'UI:CSVReport-Object-ToCreate' => 'オブジェクトは作成されます',
-	'UI:CSVReport-Object-Created' => 'オブジェクトは作成されました',
-	'UI:CSVReport-Icon-Error' => 'エラー',
-	'UI:CSVReport-Object-Error' => 'エラー: %1$s',
-	'UI:CSVReport-Object-Ambiguous' => 'あいまい: %1$s',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% ロードされたオブジェクトはエラーがあり、無視されます。',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% ロードされたオブジェクトは作成されます。',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of ロードされたオブジェクトは修正されます。',
-	'UI:CSVExport:AdvancedMode' => 'アドバンスドモード',
-	'UI:CSVExport:AdvancedMode+' => 'アドバンスドモードでは、エキスポートのためにいくつかのカラムが追加されます。: オブジェクトのid, 外部キーの id ,そして調整属性。',
-	'UI:CSVExport:LostChars' => 'エンコーディングの課題',
-	'UI:CSVExport:LostChars+' => 'ダウンロードファイルは %1$s でエンコードされます. iTop はこのフォーマットと整合性のない文字を検出しました。 これらの文字は代りの文字になります。（たとえばアクセント付き文字からはアクセント記号が無くなります。または、削除されます。 Webブラウザからコピー／ペーストが出来ます。 あるいは、システム管理者にエンコードの変更を問い合わせください。 (See parameter \'csv_file_default_charset\').',
-	'UI:Audit:Title' => 'iTop - CMDB 監査',
-	'UI:Audit:InteractiveAudit' => '対話型監査',
-	'UI:Audit:HeaderAuditRule' => '監査ルール',
-	'UI:Audit:HeaderNbObjects' => 'オブジェクト数',
-	'UI:Audit:HeaderNbErrors' => 'エラー数',
-	'UI:Audit:PercentageOk' => '% OK',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'ルール %1$s 中のOQLエラー: %2$s.',
-	'UI:Audit:ErrorIn_Category_Reason' => 'カテゴリ %1$s 中のOQLエラー: %2$s.',
-	'UI:RunQuery:Title' => 'iTop - OQLクエリ評価',
-	'UI:RunQuery:QueryExamples' => 'クエリの例',
-	'UI:RunQuery:HeaderPurpose' => '目的',
-	'UI:RunQuery:HeaderPurpose+' => 'クエリについての説明',
-	'UI:RunQuery:HeaderOQLExpression' => 'OQL式',
-	'UI:RunQuery:HeaderOQLExpression+' => 'OQL文法によるクエリ',
-	'UI:RunQuery:ExpressionToEvaluate' => '評価式',
-	'UI:RunQuery:MoreInfo' => 'クエリに関する追加情報',
-	'UI:RunQuery:DevelopedQuery' => 'クエリ式の再開発',
-	'UI:RunQuery:SerializedFilter' => 'シリアライズされたフィルタ：',
-	'UI:RunQuery:Error' => 'クエリ: %1$s 実行時にエラーが発生しました',
-	'UI:Query:UrlForExcel' => 'MS-Excel Webクエリに使用するURL',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Schema:Title' => 'iTop オブジェクトスキーマ',
-	'UI:Schema:CategoryMenuItem' => 'カテゴリ <b>%1$s</b>',
-	'UI:Schema:Relationships' => '関係',
-	'UI:Schema:AbstractClass' => '抽象クラス：このクラスのインスタンスを作成することはできません。',
-	'UI:Schema:NonAbstractClass' => '非抽象クラス：このクラスのインスタンスを作成できます。',
-	'UI:Schema:ClassHierarchyTitle' => 'クラス階層',
-	'UI:Schema:AllClasses' => '全クラス',
-	'UI:Schema:ExternalKey_To' => '%1$s への外部キー',
-	'UI:Schema:Columns_Description' => 'カラム： <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'デフォルト： "%1$s"',
-	'UI:Schema:NullAllowed' => 'Nullを許容',
-	'UI:Schema:NullNotAllowed' => 'Nullを非許容',
-	'UI:Schema:Attributes' => '属性',
-	'UI:Schema:AttributeCode' => '属性コード',
-	'UI:Schema:AttributeCode+' => '属性の内部コード',
-	'UI:Schema:Label' => 'ラベル',
-	'UI:Schema:Label+' => '属性のラベル',
-	'UI:Schema:Type' => '型',
-	'UI:Schema:Type+' => '属性のデータ型',
-	'UI:Schema:Origin' => 'オリジン',
-	'UI:Schema:Origin+' => 'この属性が定義されているベースクラス',
-	'UI:Schema:Description' => '説明',
-	'UI:Schema:Description+' => 'この属性の概要',
-	'UI:Schema:AllowedValues' => '可能な値',
-	'UI:Schema:AllowedValues+' => '本属性で可能な値の制限',
-	'UI:Schema:MoreInfo' => '追加情報',
-	'UI:Schema:MoreInfo+' => 'データベースに定義された本フィールドの追加情報',
-	'UI:Schema:SearchCriteria' => '検索条件',
-	'UI:Schema:FilterCode' => 'フィルタコード',
-	'UI:Schema:FilterCode+' => '本検索条件のコード',
-	'UI:Schema:FilterDescription' => '説明',
-	'UI:Schema:FilterDescription+' => '本検索条件の説明',
-	'UI:Schema:AvailOperators' => '利用可能な演算子',
-	'UI:Schema:AvailOperators+' => '本検索条件で利用可能な演算子',
-	'UI:Schema:ChildClasses' => '子クラス',
-	'UI:Schema:ReferencingClasses' => '参照クラス',
-	'UI:Schema:RelatedClasses' => '関係するクラス',
-	'UI:Schema:LifeCycle' => 'ライフサイクル',
-	'UI:Schema:Triggers' => 'トリガー',
-	'UI:Schema:Relation_Code_Description' => 'リレーション <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => '下へ: %1$s',
-	'UI:Schema:RelationUp_Description' => '上へ: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: %2$d レベルへ伝播、クエリ：%3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 伝播しない (%2$d レベル), クエリ: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s は%2$s クラスから %3$s フィールドにより参照されている',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s は %3$s::<em>%4$s</em>により%2$s へリンクされています。',
-	'UI:Schema:Links:1-n' => 'クラスは%1$sへポイントしています。(1:n リンク)',
-	'UI:Schema:Links:n-n' => 'クラスは%1$sへリンクしています。(n:n リンク)',
-	'UI:Schema:Links:All' => '関連する全クラスのグラフ表示',
-	'UI:Schema:NoLifeCyle' => 'このクラスにはライフサイクルが定義されていません。',
-	'UI:Schema:LifeCycleTransitions' => 'トランジション',
-	'UI:Schema:LifeCyleAttributeOptions' => '属性オプション',
-	'UI:Schema:LifeCycleHiddenAttribute' => '隠し',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => '参照のみ',
-	'UI:Schema:LifeCycleMandatoryAttribute' => '必須',
-	'UI:Schema:LifeCycleAttributeMustChange' => '変更必須',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => 'ユーザはこの値を変更するよう、促されます。',
-	'UI:Schema:LifeCycleEmptyList' => '空リスト',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => '最初の3文字をタイプしてください...',
-	'UI:Edit:TestQuery' => 'Test query',
-	'UI:Combo:SelectValue' => '--- 値を選んでください ---',
-	'UI:Label:SelectedObjects' => '選択されたオブジェクト: ',
-	'UI:Label:AvailableObjects' => '利用可能なオブジェクト: ',
-	'UI:Link_Class_Attributes' => '%1$s 属性',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s にリンクされた%1$sオブジェクトを追加：%3$s',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => '%1$s オブジェクトを%2$sとのリンクに追加',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s にリンクされた%1$sオブジェクトの管理: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => '%1$s を追加...',
-	'UI:RemoveLinkedObjectsOf_Class' => '選択されたオブジェクトを削除',
-	'UI:Message:EmptyList:UseAdd' => 'リストは空です。"追加..."ボタンを利用して要素を追加してください。',
-	'UI:Message:EmptyList:UseSearchForm' => '上の検索フォームを使って追加するオブジェクトを検索してください。',
-	'UI:Wizard:FinalStepTitle' => '最終ステップ：確認',
-	'UI:Title:DeletionOf_Object' => '%1$sの削除',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s クラスの%1$d個のオブジェクトをバルク削除',
-	'UI:Delete:NotAllowedToDelete' => 'このオブジェクトの削除は、許可されていません。',
-	'UI:Delete:NotAllowedToUpdate_Fields' => '以下のフィールドの更新は、許可されていません。: %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'カレントユーザは十分な権限を持っていないので、このオブジェクトは削除することができません。',
-	'UI:Error:CannotDeleteBecause' => 'このオブジェクトは、削除できません。理由: %1$s',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'いくつかの手動操作を先に実行する必要があるので、このオブジェクトは削除できません。',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'いくつかの手動操作を先に実行する必要があるので、このオブジェクトは削除できません。',
-	'UI:Archive_User_OnBehalfOf_User' => '%2$s の代りに %1$s',
-	'UI:Delete:Deleted' => '削除済み',
-	'UI:Delete:AutomaticallyDeleted' => '自動的に削除されました。',
-	'UI:Delete:AutomaticResetOf_Fields' => 'フィールドの自動リセット: %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => '%1$s への参照すべてをクリア',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s クラスの　%1$d個のオブジェクトへの参照をすべてクリア',
-	'UI:Delete:Done+' => '実行しました...',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s 削除しました。',
-	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s の削除',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$sクラスの%1$dオブジェクトの削除',
-	'UI:Delete:CannotDeleteBecause' => '削除できません: %1$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => '自動的に削除されるべきですが、出来ません。: %1$s',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => '手動で削除されるべきですが、出来ません。: %1$',
-	'UI:Delete:WillBeDeletedAutomatically' => '自動的に削除されます。',
-	'UI:Delete:MustBeDeletedManually' => '手動で削除されるべきです。',
-	'UI:Delete:CannotUpdateBecause_Issue' => '自動的に更新されるべきですが、しかし: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => '自動的に更新されます。(reset: %1$s)',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$dオブジェクト/リンクは%2$sを参照しています。',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$dオブジェクト/リンクは削除されるオブジェクトを参照しています。',
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'データベースの整合性を確保するために、いくつかの参照を削除する必要があります。',
-	'UI:Delete:Consequence+' => '行われます。',
-	'UI:Delete:SorryDeletionNotAllowed' => '申し訳ありませんが、あなたは、このオブジェクトを削除する権限がありません、上記の詳細な説明を参照してください。',
-	'UI:Delete:PleaseDoTheManualOperations' => 'このオブジェクトの削除を要求する前に、上記にリストされている手動操作を実行してください。',
-	'UI:Delect:Confirm_Object' => '%1$sを削除しようとしています。確認ください。',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => '以下の%2$sクラスの%1$dオブジェクトを削除しようとしています。確認ください。',
-	'UI:WelcomeToITop' => 'iTopへようこそ',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$sの詳細',
-	'UI:ErrorPageTitle' => 'iTop - エラー',
-	'UI:ObjectDoesNotExist' => '申し訳ございません。このオブジェクトは既に存在しません。(あるいは参照する権限がありません。)',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'iTop - 検索結果',
-	'UI:SearchResultsTitle' => '検索結果',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => '検索するものがありません。',
-	'UI:FullTextSearchTitle_Text' => '"%1$s"の結果：',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '%2$sクラスの%1$dオブジェクトが見つかりました。',
-	'UI:Search:NoObjectFound' => 'オブジェクトが見つかりませんでした。',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s 修正',
-	'UI:ModificationTitle_Class_Object' => '%1$sの修正： <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - クローン%1$s - %2$s 修正',
-	'UI:CloneTitle_Class_Object' => '%1$sのクローン：<span class=\"hilite">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'iTop - 新規%1$sを作成',
-	'UI:CreationTitle_Class' => '新規%1$sの作成',
-	'UI:SelectTheTypeOf_Class_ToCreate' => '作成する%1$sのタイプを選択:',
-	'UI:Class_Object_NotUpdated' => '変更は検出されませんでした。%1$s(%2$s)は修正されて<strong>いません</strong>',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) は更新されました。',
-	'UI:BulkDeletePageTitle' => 'iTop - バルク削除',
-	'UI:BulkDeleteTitle' => '削除するオブジェクトを選択してください。',
-	'UI:PageTitle:ObjectCreated' => 'iTopオブジェクトが作成されました。',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s が作成されました。',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '状態%3$sにあるオブジェクト：%2$sに、ターゲット状態:%4$sで、%1$sを適用します。',
-	'UI:ObjectCouldNotBeWritten' => 'そのオブジェクトへは書き込みできません: %1$s',
-	'UI:PageTitle:FatalError' => 'iTop - 致命的なエラー',
-	'UI:SystemIntrusion' => 'アクセスが拒否されました。あなたが許可されていない操作を実行しようとしています。',
-	'UI:FatalErrorMessage' => '致命的なエラー、ITOPを続行することはできません。',
-	'UI:Error_Details' => 'エラー：%1$s',
-	'UI:PageTitle:ClassProjections' => 'iTop ユーザ管理 - クラスプロジェクション',
-	'UI:PageTitle:ProfileProjections' => 'iTop ユーザ管理 - プロフィールプロジェクション',
-	'UI:UserManagement:Class' => 'クラス',
-	'UI:UserManagement:Class+' => 'オブジェクトのクラス',
-	'UI:UserManagement:ProjectedObject' => 'オブジェクト',
-	'UI:UserManagement:ProjectedObject+' => 'プロジェクトオブジェクト',
-	'UI:UserManagement:AnyObject' => '* 任意 *',
-	'UI:UserManagement:User' => 'ユーザ',
-	'UI:UserManagement:User+' => 'このプロジェクションに関与しているユーザー',
-	'UI:UserManagement:Profile' => 'プロフィール',
-	'UI:UserManagement:Profile+' => 'プロジェクションが指定されているプロフィール',
-	'UI:UserManagement:Action:Read' => '読み込み',
-	'UI:UserManagement:Action:Read+' => 'オブジェクトの読み込み/表示',
-	'UI:UserManagement:Action:Modify' => '修正',
-	'UI:UserManagement:Action:Modify+' => 'オブジェクトの作成、編集(修正)',
-	'UI:UserManagement:Action:Delete' => '削除',
-	'UI:UserManagement:Action:Delete+' => 'オブジェクトの削除',
-	'UI:UserManagement:Action:BulkRead' => '一括読み出し(エクスポート)',
-	'UI:UserManagement:Action:BulkRead+' => 'オブジェクトのリスト表示、もしくは一括エクスポート',
-	'UI:UserManagement:Action:BulkModify' => '一括修正',
-	'UI:UserManagement:Action:BulkModify+' => '一括作成/編集(CVSインポート)',
-	'UI:UserManagement:Action:BulkDelete' => '一括削除',
-	'UI:UserManagement:Action:BulkDelete+' => '複数オブジェクトをまとめて削除',
-	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
-	'UI:UserManagement:Action:Stimuli+' => '許可されている(複合)アクション',
-	'UI:UserManagement:Action' => 'アクション',
-	'UI:UserManagement:Action+' => 'ユーザが実行したアクション',
-	'UI:UserManagement:TitleActions' => 'アクション',
-	'UI:UserManagement:Permission' => 'パーミッション',
-	'UI:UserManagement:Permission+' => 'ユーザのパーミッション',
-	'UI:UserManagement:Attributes' => '属性',
-	'UI:UserManagement:ActionAllowed:Yes' => 'はい',
-	'UI:UserManagement:ActionAllowed:No' => 'いいえ',
-	'UI:UserManagement:AdminProfile+' => '管理者はデータベース中の全てのオブジェクトに対する全ての読み/書き権限を持っています。',
-	'UI:UserManagement:NoLifeCycleApplicable' => '該当なし',
-	'UI:UserManagement:NoLifeCycleApplicable+' => 'このクラスにはライフサイクルは定義されていません。',
-	'UI:UserManagement:GrantMatrix' => '権限マトリクス',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s と %2$s間のリンク',
-	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s と %2$s 間のリンク',
-	'Menu:AdminTools' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:ChangeManagementMenu' => '変更管理',
-	'UI:ChangeManagementMenu+' => '変更管理',
-	'UI:ChangeManagementMenu:Title' => '変更管理概要',
-	'UI-ChangeManagementMenu-ChangesByType' => 'タイプ別変更',
-	'UI-ChangeManagementMenu-ChangesByStatus' => '状態別変更',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'ワークグループ別変更',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'まだ割り当てられていない変更',
-	'UI:ConfigurationManagementMenu' => '構成管理',
-	'UI:ConfigurationManagementMenu+' => '構成管理',
-	'UI:ConfigurationManagementMenu:Title' => 'インフラ概要',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'タイプ別のインフラ',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => '状態別のインフラ',
-	'UI:ConfigMgmtMenuOverview:Title' => '構成管理ダッシュボード',
-	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '状態別構成項目(CI)',
-	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'タイプ別構成項目(CI)',
-	'UI:RequestMgmtMenuOverview:Title' => '要求管理ダッシュボード',
-	'UI-RequestManagementOverview-RequestByService' => 'サービス別要求',
-	'UI-RequestManagementOverview-RequestByPriority' => '優先度別要求',
-	'UI-RequestManagementOverview-RequestUnassigned' => 'エージェントへ未割り当て要求',
-	'UI:IncidentMgmtMenuOverview:Title' => 'インシデント管理ダッシュボード',
-	'UI-IncidentManagementOverview-IncidentByService' => 'サービス別インシデント',
-	'UI-IncidentManagementOverview-IncidentByPriority' => '優先度別インシデント',
-	'UI-IncidentManagementOverview-IncidentUnassigned' => 'エージェントへ未割り当てインシデント',
-	'UI:ChangeMgmtMenuOverview:Title' => '変更管理ダッシュボード',
-	'UI-ChangeManagementOverview-ChangeByType' => 'タイプ別変更内容',
-	'UI-ChangeManagementOverview-ChangeUnassigned' => 'エージェントへ未割り当て変更内容',
-	'UI-ChangeManagementOverview-ChangeWithOutage' => '変更に伴う停止',
-	'UI:ServiceMgmtMenuOverview:Title' => 'サービス管理ダッシュボード',
-	'UI-ServiceManagementOverview-CustomerContractToRenew' => '30日以内に契約更新が必要な顧客',
-	'UI-ServiceManagementOverview-ProviderContractToRenew' => '30日以内に契約更新が必要なプロバイダ',
-	'UI:ContactsMenu' => '連絡先',
-	'UI:ContactsMenu+' => '連絡先',
-	'UI:ContactsMenu:Title' => '連絡先概要',
-	'UI-ContactsMenu-ContactsByLocation' => '場所別連絡先',
-	'UI-ContactsMenu-ContactsByType' => 'タイプ別連絡先',
-	'UI-ContactsMenu-ContactsByStatus' => '状態別連絡先',
-	'Menu:CSVImportMenu' => 'CSV インポート', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '一括作成/一括更新', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu' => 'データモデル', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'データモデル概要', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu' => 'エクスポート', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu' => '通知', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '通知の設定', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:NotificationsMenu:Title' => '<span class="hilite">通知</span>の設定',
-	'UI:NotificationsMenu:Help' => 'ヘルプ',
-	'UI:NotificationsMenu:HelpContent' => '<p>iTopでは、通知はすべてカスタマイズが可能です。通知は<i>トリガーとアクション</i>という二つのオブジェクトがベースになっています。
-<p><i><b>トリガー</b></i>は、ある通知がいつ実行されるのか、を定義します。トリガーは3つのタイプに分類され、オブジェクトライフサイクルにおける3つの異なるフェーズに対応します：
-<ol>
-	<li>"onCreate"トリガーは、指定されたクラスのオブジェクトが作成されたときに実行されます。</li>
-	<li>"onStateEnter"トリガーは、指定されたクラスのオブジェクトが(他の状態から)指定された状態に入る前に実行されます。</li>
-	<li>"onStateLeave"トリガーは、指定されたクラスのオブジェクトが指定された状態から出る際に実行されます。</li>
-	<li>"onThreshold" トリガーは、TTR や TTO が閾値に達した時に実行されます。</li>
-	<li>the "on portal update" トリガーは、ポータルからチケットが更新された時に実行されます。</li>
-</ol>
-</p>
-<p>
-<i><b>アクション</b></i>はトリガーが実行される際の動作を定義します。例えば今、「メールを送信する」という動作で構成されるたった1種類だけのアクションがあるとします。
-このようなアクションは、受信者、重要度といったメッセージに付随する他のパラメータと同様、メール送信に利用されるテンプレートも定義します。
-</p>
-<p>特別なページ: <a href="../setup/email.test.php" target="_blank">email.test.php</p>は、PHPのメール設定をテストしたりトラブルシュートするのに利用可能であす。</p>
-<p>実行するには、アクションがトリガーに関連づけられている必要があります。
-トリガーに関連づけられると、各々のアクションは順番が与えられ、どの順序でアクションが実行されるかが指定されます。</p>',
-	'UI:NotificationsMenu:Triggers' => 'トリガー',
-	'UI:NotificationsMenu:AvailableTriggers' => '利用可能トリガー',
-	'UI:NotificationsMenu:OnCreate' => 'オブジェクトが作成された時',
-	'UI:NotificationsMenu:OnStateEnter' => 'オブジェクトが指定状態に入った時',
-	'UI:NotificationsMenu:OnStateLeave' => 'オブジェクトが指定状態から出た時',
-	'UI:NotificationsMenu:Actions' => 'アクション',
-	'UI:NotificationsMenu:AvailableActions' => '利用可能アクション',
-	'Menu:AuditCategories' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu' => 'クエリ実行', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '任意のクエリを実行', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu' => 'クエリのフレーズブック', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'クエリのフレーズブック', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration' => 'データ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'データ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu' => '全検索', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '何か...検索', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu' => 'ユーザ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'ユーザ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:iTopVersion:Short' => '%1$sバージョン%2$s',
-	'UI:iTopVersion:Long' => '%1$sバージョン%2$s-%3$s ビルド%4$s',
-	'UI:PropertiesTab' => 'プロパティ',
-	'UI:OpenDocumentInNewWindow_' => '新規ウィンドウでこ文章を開く: %1$s',
-	'UI:DownloadDocument_' => 'この文書をダウンロードする: %1$s',
-	'UI:Document:NoPreview' => 'このタイプの文書はプレビューできません。',
-	'UI:Download-CSV' => 'ダウンロード-CSV %1$s',
-	'UI:DeadlineMissedBy_duration' => '%1$s によって消去されました。',
-	'UI:Deadline_LessThan1Min' => ' < 1分',
-	'UI:Deadline_Minutes' => '%1$d 分',
-	'UI:Deadline_Hours_Minutes' => '%1$d時間%2$d分',
-	'UI:Deadline_Days_Hours_Minutes' => '%1$d日%2$d時間%3$d分',
-	'UI:Help' => 'ヘルプ',
-	'UI:PasswordConfirm' => '(確認)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '%1$sオブジェクトをさらに追加する前に、このオブジェクトを保存してください。',
-	'UI:DisplayThisMessageAtStartup' => '起動時にこのメッセージを表示する',
-	'UI:RelationshipGraph' => 'グラフィカル表示',
-	'UI:RelationshipList' => 'リスト',
-	'UI:OperationCancelled' => '操作はキャンセルされました',
-	'UI:ElementsDisplayed' => 'フィルターリング',
-	'Portal:Title' => 'iTopユーザポータル',
-	'Portal:NoRequestMgmt' => '%1$s さん, このページにリダイレクトされました。あなたのプロファイルは、「ポータルユーザ」として登録されています。残念ながら、iTop は、「要求管理」としてインストールされていません。管理者に問い合わせてください。',
-	'Portal:Refresh' => 'リフレッシュ',
-	'Portal:Back' => '戻る',
-	'Portal:WelcomeUserOrg' => 'ようこそ %1$s, %2$sより',
-	'Portal:TitleDetailsFor_Request' => '要求の詳細',
-	'Portal:ShowOngoing' => 'オープン中の要求を表示',
-	'Portal:ShowClosed' => 'クローズした要求を表示',
-	'Portal:CreateNewRequest' => '新規要求を作成',
-	'Portal:CreateNewRequestItil' => '新規要求を作成',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => 'パスワードを変更',
-	'Portal:Disconnect' => '切断する',
-	'Portal:OpenRequests' => '担当のオープン中の要求',
-	'Portal:ClosedRequests' => '担当のクローズした要求',
-	'Portal:ResolvedRequests' => '担当の解決済み要求',
-	'Portal:SelectService' => 'カタログからサービスを選択してください：',
-	'Portal:PleaseSelectOneService' => 'サービスを1つ選んでください',
-	'Portal:SelectSubcategoryFrom_Service' => 'サービス%1$sのサブカテゴリを選んでください:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'サブカテゴリを1つ選んでください',
-	'Portal:DescriptionOfTheRequest' => 'あなたの要求の説明を記入してください：',
-	'Portal:TitleRequestDetailsFor_Request' => '要求%1$sの詳細：',
-	'Portal:NoOpenRequest' => 'このカテゴリに要求はありません',
-	'Portal:NoClosedRequest' => 'このカテゴリにはクローズした要求はありません。',
-	'Portal:Button:ReopenTicket' => 'このチケットを再オープン',
-	'Portal:Button:CloseTicket' => 'このチケットをクローズ。',
-	'Portal:Button:UpdateRequest' => '要求を更新',
-	'Portal:EnterYourCommentsOnTicket' => 'このチケットの解決について、コメントを入力してください。',
-	'Portal:ErrorNoContactForThisUser' => 'エラー：現在のユーザは連絡先/人物に関連づけられていません。管理者に問い合わせてください。',
-	'Portal:Attachments' => '添付',
-	'Portal:AddAttachment' => ' 添付を追加 ',
-	'Portal:RemoveAttachment' => ' 添付を削除 ',
-	'Portal:Attachment_No_To_Ticket_Name' => '$2$s ($3$s)への添付 #%1$d',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s のテンプレートを選択',
-	'Enum:Undefined' => '未定義',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s 日 %2$s 時 %3$s 分 %4$s 秒',
-	'UI:ModifyAllPageTitle' => '全てを修正',
-	'UI:Modify_N_ObjectsOf_Class' => 'クラス%2$Sの%1$dオブジェクトを修正',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'クラス%2$sの%3$d中%1$dを修正',
-	'UI:Menu:ModifyAll' => '修正...',
-	'UI:Button:ModifyAll' => '全て修正',
-	'UI:Button:PreviewModifications' => '修正をプレビュー >>',
-	'UI:ModifiedObject' => '修正されたオブジェクト',
-	'UI:BulkModifyStatus' => '操作',
-	'UI:BulkModifyStatus+' => '操作の状態',
-	'UI:BulkModifyErrors' => 'エラー (もしあれば)',
-	'UI:BulkModifyErrors+' => '修正を出来ないようにしているエラー',
-	'UI:BulkModifyStatusOk' => 'Ok',
-	'UI:BulkModifyStatusError' => 'エラー',
-	'UI:BulkModifyStatusModified' => '修正',
-	'UI:BulkModifyStatusSkipped' => 'スキップ',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d 個の個別の値:',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d 回存在',
-	'UI:BulkModify:N_MoreValues' => '%1$d 個以上の値...',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => '読み込み専用フィールド %1$にセットしょうとしています。',
-	'UI:FailedToApplyStimuli' => 'アクションは失敗しました。',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: クラス%3$sの%2$dオブジェクトを修正',
-	'UI:CaseLogTypeYourTextHere' => 'テキストを入力ください:',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
-	'UI:CaseLog:InitialValue' => '初期値:',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'フィールド %1$s は、データの同期によってマスターリングされているため書き込み可能ではありません。値は設定されません。',
-	'UI:ActionNotAllowed' => 'あなたは、これらのオブジェクトへのこのアクションを許可されていません。',
-	'UI:BulkAction:NoObjectSelected' => 'この操作を実行するには、少なくとも1つのオブジェクトを選択してください。',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'フィールド %1$s はデータの同期によってマスターリングされているため、書き込み可能ではありません。値は変更されません。',
-	'UI:Pagination:HeaderSelection' => '全: %1$s オブジェクト (%2$s オブジェクト選択)。',
-	'UI:Pagination:HeaderNoSelection' => '全: %1$s オブジェクト。',
-	'UI:Pagination:PageSize' => '%1$s オブジェクト／ページ',
-	'UI:Pagination:PagesLabel' => 'ページ:',
-	'UI:Pagination:All' => '全',
-	'UI:HierarchyOf_Class' => '%1$s の階層',
-	'UI:Preferences' => 'プリファレンス...',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'クイックアクセス組織',
-	'UI:FavoriteOrganizations+' => '迅速なアクセスのためのドロップダウンメニューに表示したい組織は、以下のリストで確認してください。セキュリティ設定ではないことに注意してください。全ての組織のオブジェクトは、表示可能です。ドロップダウンリストで「すべての組織(All Organizations)」を選択することでアクセスすることができます。',
-	'UI:FavoriteLanguage' => 'ユーザインターフェースの言語',
-	'UI:Favorites:SelectYourLanguage' => '希望する言語を選択ください。',
-	'UI:FavoriteOtherSettings' => '他のセッティング',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'リストの規定の長さ: %1$s items 毎ページ',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => '全ての変更を破棄します。',
-	'UI:CancelConfirmationMessage' => '変更内容が失われます。 続けますか?',
-	'UI:AutoApplyConfirmationMessage' => '幾つかの変更は、まだ反映されていません。 それらの変更を反映させますか?。',
-	'UI:Create_Class_InState' => '%1$sを作成、ステート:',
-	'UI:OrderByHint_Values' => '並び順: %1$s',
-	'UI:Menu:AddToDashboard' => 'ダッシュボードに追加...',
-	'UI:Button:Refresh' => '再表示',
-	'UI:ConfigureThisList' => 'このリストを構成...',
-	'UI:ListConfigurationTitle' => 'リストコンフィギュレーション',
-	'UI:ColumnsAndSortOrder' => 'カラムと並び順:',
-	'UI:UseDefaultSettings' => '既定のセッティングを使用',
-	'UI:UseSpecificSettings' => '次のセッティングを使用:',
-	'UI:Display_X_ItemsPerPage' => '1ページに %1$s アイテムを表示',
-	'UI:UseSavetheSettings' => 'セッティングを保存',
-	'UI:OnlyForThisList' => 'このリストのみ',
-	'UI:ForAllLists' => 'すべてのリストのデフォルト',
-	'UI:ExtKey_AsLink' => '%1$s (Link)',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
-	'UI:Button:MoveUp' => '上へ',
-	'UI:Button:MoveDown' => '下へ',
-	'UI:OQL:UnknownClassAndFix' => '未知のクラス "%1$s"。 代りに "%2$s" を試すことが出来ます。',
-	'UI:OQL:UnknownClassNoFix' => '未知のクラス "%1$s"',
-	'UI:Dashboard:Edit' => 'このページを編集...',
-	'UI:Dashboard:Revert' => '元のバージョンに戻す...',
-	'UI:Dashboard:RevertConfirm' => '元のバージョンに加えられたすべての変更は失われます。この実行を望む事をご確認ください。',
-	'UI:ExportDashBoard' => 'ファイルへエキスポート',
-	'UI:ImportDashBoard' => 'ファイルからインポート...',
-	'UI:ImportDashboardTitle' => 'ファイルからインポート',
-	'UI:ImportDashboardText' => 'インポートするダッシュボードファイルを選択ください。:',
-	'UI:DashletCreation:Title' => '新しいダッシュレットを作成',
-	'UI:DashletCreation:Dashboard' => 'ダッシュボード',
-	'UI:DashletCreation:DashletType' => 'ダッシュレットタイプ',
-	'UI:DashletCreation:EditNow' => 'ダッシュレットの編集',
-	'UI:DashboardEdit:Title' => 'ダッシュボードエディター',
-	'UI:DashboardEdit:DashboardTitle' => '題名',
-	'UI:DashboardEdit:Layout' => 'レイアウト',
-	'UI:DashboardEdit:Properties' => 'ダッシュボードプロパティ',
-	'UI:DashboardEdit:Dashlets' => '利用可能なダッシュレット',
-	'UI:DashboardEdit:DashletProperties' => 'ダッシュレットプロパティ',
-	'UI:Form:Property' => 'プロパティ',
-	'UI:Form:Value' => '値',
-	'UI:DashletPlainText:Label' => 'テキスト',
-	'UI:DashletPlainText:Description' => 'プレーンテキスト (フォーマットなし)',
-	'UI:DashletPlainText:Prop-Text' => 'テキスト',
-	'UI:DashletPlainText:Prop-Text:Default' => 'ここにテキストを入力ください...',
-	'UI:DashletObjectList:Label' => 'オブジェクトリスト',
-	'UI:DashletObjectList:Description' => 'オブジェクトリストダッシュレット',
-	'UI:DashletObjectList:Prop-Title' => '題名',
-	'UI:DashletObjectList:Prop-Query' => 'クエリ',
-	'UI:DashletObjectList:Prop-Menu' => 'メニュー',
-	'UI:DashletGroupBy:Prop-Title' => '題名',
-	'UI:DashletGroupBy:Prop-Query' => 'クエリ',
-	'UI:DashletGroupBy:Prop-Style' => 'スタイル',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'グループ化(Group by...)',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => '時 %1$s (0-23)',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => '月 %1$s (1 - 12)',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => '%1$s 週の日',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => '%1$s 月の日',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (時)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (月)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (週の日)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (月の日)',
-	'UI:DashletGroupBy:MissingGroupBy' => 'グループ化されるオブジェクトのフィールドを選択ください。',
-	'UI:DashletGroupByPie:Label' => '円グラフ',
-	'UI:DashletGroupByPie:Description' => '円グラフ',
-	'UI:DashletGroupByBars:Label' => '棒グラフ',
-	'UI:DashletGroupByBars:Description' => '棒グラフ',
-	'UI:DashletGroupByTable:Label' => 'グループ化 (table)による',
-	'UI:DashletGroupByTable:Description' => 'リスト (フィールドでグループ化)',
-	'UI:DashletHeaderStatic:Label' => 'ヘッダー',
-	'UI:DashletHeaderStatic:Description' => '水平セパレータの表示',
-	'UI:DashletHeaderStatic:Prop-Title' => '題名',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => '連絡先',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'アイコン',
-	'UI:DashletHeaderDynamic:Label' => '統計付ヘッダー',
-	'UI:DashletHeaderDynamic:Description' => '状態付ヘッダー (..によるグループ化)',
-	'UI:DashletHeaderDynamic:Prop-Title' => '題名',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => '連絡先',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'アイコン',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'サブタイトル',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => '連絡先',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'クエリ',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'グループ化(Group by)',
-	'UI:DashletHeaderDynamic:Prop-Values' => '値',
-	'UI:DashletBadge:Label' => 'バッジ',
-	'UI:DashletBadge:Description' => '新規/検索付オブジェクトアイコン',
-	'UI:DashletBadge:Prop-Class' => 'クラス',
-	'DayOfWeek-Sunday' => '日',
-	'DayOfWeek-Monday' => '月',
-	'DayOfWeek-Tuesday' => '火',
-	'DayOfWeek-Wednesday' => '水',
-	'DayOfWeek-Thursday' => '木',
-	'DayOfWeek-Friday' => '金',
-	'DayOfWeek-Saturday' => '土',
-	'UI:Menu:ShortcutList' => 'ショートカットを作成',
-	'UI:ShortcutRenameDlg:Title' => 'ショートカットの名前変更',
-	'UI:ShortcutListDlg:Title' => 'このリストのショートカットを作成',
-	'UI:ShortcutDelete:Confirm' => 'このショートカットを本当に削除してもいいですか。',
-	'Menu:MyShortcuts' => '私のショートカット', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Class:Shortcut' => 'ショートカット',
-	'Class:Shortcut+' => '',
-	'Class:Shortcut/Attribute:name' => '名前',
-	'Class:Shortcut/Attribute:name+' => '',
-	'UI:FillAllMandatoryFields' => '全ての必須フィールドを入力ください。',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:QueryOQL' => 'OQL クエリ',
+	'Class:QueryOQL+' => ' Object Query Language に基づいたクエリ',
+	'Class:QueryOQL/Attribute:oql' => '式',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL 式',
+	'Class:ShortcutOQL' => '検索結果ショートカット',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'クエリ',
+	'Class:ShortcutOQL/Attribute:oql+' => '',
+	'Class:AuditRule' => '監査ルール',
+	'Class:AuditRule+' => '指定された監査カテゴリをチェックするためのルール',
+	'Class:AuditRule/Attribute:name' => 'ルール名',
+	'Class:AuditRule/Attribute:name+' => 'ルールの短縮名',
+	'Class:AuditRule/Attribute:description' => '監査ルール説明',
+	'Class:AuditRule/Attribute:description+' => 'この監査ルールの長い説明',
+	'Class:AuditRule/Attribute:query' => '実行するクエリ',
+	'Class:AuditRule/Attribute:query+' => '実行するOQL式',
+	'Class:AuditRule/Attribute:valid_flag' => '有効なオブジェクト',
+	'Class:AuditRule/Attribute:valid_flag+' => 'このルールが有効なオブジェクトを返す場合は真、そうでなければ偽',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => '偽',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '偽',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => '真',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => '真',
+	'Class:AuditRule/Attribute:category_id' => 'カテゴリ',
+	'Class:AuditRule/Attribute:category_id+' => 'このルールのカテゴリ',
+	'Class:AuditCategory' => '監査カテゴリ',
+	'Class:AuditCategory+' => '監査全体の内部セクション',
+	'Class:AuditCategory/Attribute:name' => 'カテゴリ名',
+	'Class:AuditCategory/Attribute:name+' => 'カテゴリの短縮名',
+	'Class:AuditCategory/Attribute:description' => '監査カテゴリ説明',
+	'Class:AuditCategory/Attribute:description+' => '監査カテゴリの説明',
+	'Class:AuditCategory/Attribute:definition_set' => '定義セット',
+	'Class:AuditCategory/Attribute:definition_set+' => '監査するべきオブジェクトの集合を定義するOQL式',
+	'Class:AuditCategory/Attribute:rules_list' => '監査ルール',
+	'Class:AuditCategory/Attribute:rules_list+' => 'このカテゴリの監査ルール',
+	'Class:URP_Profiles' => 'プロフィール',
+	'Class:URP_Profiles+' => 'ユーザプロフィール',
+	'Class:URP_Profiles/Attribute:name' => '名前',
+	'Class:URP_Profiles/Attribute:name+' => 'ラベル',
+	'Class:URP_Profiles/Attribute:description' => '説明',
+	'Class:URP_Profiles/Attribute:description+' => '1行の説明',
+	'Class:URP_Profiles/Attribute:user_list' => 'ユーザー',
+	'Class:URP_Profiles/Attribute:user_list+' => 'この役割をもつ人',
+	'Class:URP_UserProfile' => 'ユーザープロフィール',
+	'Class:URP_UserProfile+' => 'ユーザープロフィール',
+	'Class:URP_UserProfile/Attribute:userid' => 'ユーザー',
+	'Class:URP_UserProfile/Attribute:userid+' => 'ユーザアカウント',
+	'Class:URP_UserProfile/Attribute:profileid' => 'プロフィール',
+	'Class:URP_UserProfile/Attribute:profileid+' => '使用プロフィール',
+	'Class:URP_UserProfile/Attribute:reason' => '理由',
+	'Class:URP_UserProfile/Attribute:reason+' => 'なぜ、この人物がこの役割を持つかを説明する',
+	'Class:URP_UserOrg' => 'ユーザー組織',
+	'Class:URP_UserOrg+' => '許可された組織',
+	'Class:URP_UserOrg/Attribute:userid' => 'ユーザー',
+	'Class:URP_UserOrg/Attribute:userid+' => 'ユーザーアカウント',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => '組織',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '許可された組織',
+	'Class:URP_UserOrg/Attribute:reason' => '理由',
+	'Class:URP_UserOrg/Attribute:reason+' => 'なぜこの人物がこの組織に属するデータを参照できるのかを説明する',
+	'Class:AuditRule/Attribute:category_name' => 'カテゴリ',
+	'Class:AuditRule/Attribute:category_name+' => 'このルールのカテゴリ名',
+	'Class:Query' => 'クエリ',
+	'Class:Query+' => 'クエリは動的な方法で定義されるデータセットです。',
+	'Class:Query/Attribute:name' => '名前',
+	'Class:Query/Attribute:name+' => 'クエリを識別します。',
+	'Class:Query/Attribute:description' => '説明',
+	'Class:Query/Attribute:description+' => 'クエリの長い説明（目的、使用方法等）',
+	'Class:Query/Attribute:fields' => 'フィールド',
+	'Class:Query/Attribute:fields+' => 'エクスポートする属性（またはエイリアス属性,alias.attribute）のコンマ区切り(CSV)リスト',
+	'Class:User' => 'ユーザー',
+	'Class:User+' => 'ユーザーログイン',
+	'Class:User/Attribute:finalclass' => 'アカウントタイプ',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => '連絡先(人物)',
+	'Class:User/Attribute:contactid+' => 'ビジネスデータから抽出した個人の詳細',
+	'Class:User/Attribute:last_name' => 'ラストネーム',
+	'Class:User/Attribute:last_name+' => '対応する連絡先の名前',
+	'Class:User/Attribute:first_name' => 'ファーストネーム',
+	'Class:User/Attribute:first_name+' => '対応する連絡先のファーストネーム',
+	'Class:User/Attribute:email' => 'メールアドレス',
+	'Class:User/Attribute:email+' => '対応する連絡先のメールアドレス',
+	'Class:User/Attribute:login' => 'ログイン',
+	'Class:User/Attribute:login+' => 'ユーザ識別文字列',
+	'Class:User/Attribute:language' => '言語',
+	'Class:User/Attribute:language+' => 'ユーザ使用言語',
+	'Class:User/Attribute:language/Value:EN US' => '英語',
+	'Class:User/Attribute:language/Value:EN US+' => '英語(米国)',
+	'Class:User/Attribute:language/Value:FR FR' => 'フランス語',
+	'Class:User/Attribute:language/Value:FR FR+' => 'フランス語(フランス)',
+	'Class:User/Attribute:profile_list' => 'プロフィール',
+	'Class:User/Attribute:profile_list+' => '役割、この人物に付与された権限',
+	'Class:User/Attribute:allowed_org_list' => '許可された組織',
+	'Class:User/Attribute:allowed_org_list+' => 'エンドユーザは以下の組織に属するデータの参照を許可されています。組織が指定されていなければ、制限はありません。',
+	'Class:User/Error:LoginMustBeUnique' => 'ログイン名は一意でないといけません。- "%1s" はすでに使われています。',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => '少なくとも1件のプロフィールがこのユーザに指定されなければなりません。',
+	'Class:URP_Dimensions' => 'ディメンション',
+	'Class:URP_Dimensions+' => 'アプリケーションディメンション(defining silos)',
+	'Class:URP_Dimensions/Attribute:name' => '名前',
+	'Class:URP_Dimensions/Attribute:name+' => 'ラベル',
+	'Class:URP_Dimensions/Attribute:description' => '説明',
+	'Class:URP_Dimensions/Attribute:description+' => '1行の説明',
+	'Class:URP_Dimensions/Attribute:type' => 'タイプ',
+	'Class:URP_Dimensions/Attribute:type+' => 'クラス名、もしくはデータ型(projection unit)',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'ログイン',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'ユーザーのログイン',
+	'Class:URP_UserProfile/Attribute:profile' => 'プロフィール',
+	'Class:URP_UserProfile/Attribute:profile+' => 'プロフィール名',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'ログイン',
+	'Class:URP_UserOrg/Attribute:userlogin+' => 'ユーザのログイン',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => '組織',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '許可された組織',
+	'Class:URP_ProfileProjection' => 'プロフィールプロジェクション',
+	'Class:URP_ProfileProjection+' => 'プロフィールプロジェクション',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'ディメンション',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'アプリケーションディメンション',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'ディメンション',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'アプリケーションディメンション',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'プロフィール',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => '使用プロフィール',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'プロフィール',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'プロフィール名',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Value式',
+	'Class:URP_ProfileProjection/Attribute:value+' => '($userを使う)OQL式 | 定数 |  | +属性コード',
+	'Class:URP_ProfileProjection/Attribute:attribute' => '属性',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'ターゲット属性コード (オプション)',
+	'Class:URP_ClassProjection' => 'クラスプロジェクション',
+	'Class:URP_ClassProjection+' => 'クラスのプロジェクション',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'ディメンション',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'アプリケーションディメンション',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'ディメンション',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'アプリケーションディメンション',
+	'Class:URP_ClassProjection/Attribute:class' => 'クラス',
+	'Class:URP_ClassProjection/Attribute:class+' => 'ターゲットクラス',
+	'Class:URP_ClassProjection/Attribute:value' => '値式',
+	'Class:URP_ClassProjection/Attribute:value+' => '($this を使った)OQL式 | 定数 |  | +属性コード',
+	'Class:URP_ClassProjection/Attribute:attribute' => '属性',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'ターゲット属性コード(オプション)',
+	'Class:URP_ActionGrant' => 'アクション権限',
+	'Class:URP_ActionGrant+' => 'クラスに対する権限',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'プロフィール',
+	'Class:URP_ActionGrant/Attribute:profileid+' => '使用プロフィール',
+	'Class:URP_ActionGrant/Attribute:profile' => 'プロフィール',
+	'Class:URP_ActionGrant/Attribute:profile+' => '使用プロフィール',
+	'Class:URP_ActionGrant/Attribute:class' => 'クラス',
+	'Class:URP_ActionGrant/Attribute:class+' => 'ターゲットクラス',
+	'Class:URP_ActionGrant/Attribute:permission' => '許可',
+	'Class:URP_ActionGrant/Attribute:permission+' => '許可の有無は?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'はい',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'はい',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'いいえ',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'いいえ',
+	'Class:URP_ActionGrant/Attribute:action' => 'アクション',
+	'Class:URP_ActionGrant/Attribute:action+' => '指定されたクラスに実行する操作',
+	'Class:URP_StimulusGrant' => 'シティミュラス権限',
+	'Class:URP_StimulusGrant+' => 'オブジェクトのライフサイクル中のシティミュラスにおける権限',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'プロフィール',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => '使用プロフィール',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'プロフィール',
+	'Class:URP_StimulusGrant/Attribute:profile+' => '使用プロフィール',
+	'Class:URP_StimulusGrant/Attribute:class' => 'クラス',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'ターゲットクラス',
+	'Class:URP_StimulusGrant/Attribute:permission' => '権限',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '許可されているか、いないか。',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'はい',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'はい',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'いいえ',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'いいえ',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'シティミュラス',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'シティミュラスコード',
+	'Class:URP_AttributeGrant' => '属性権限',
+	'Class:URP_AttributeGrant+' => '属性レベルでの権限',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => '実行権限',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '実行権限',
+	'Class:URP_AttributeGrant/Attribute:attcode' => '属性',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => '属性コード',
+	'BooleanLabel:yes' => 'はい',
+	'BooleanLabel:no' => 'いいえ',
+	'Menu:WelcomeMenu' => 'ようこそ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'ようこそ、iTopへ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'ようこそ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'ようこそ、iTopへ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => 'ようこそ、iTopへ',
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTopは、オープンソースの、完結したIT運用ポータルです。</p>
+<ul>以下を含みます。
+<li>ITインベントリを文書化し、管理するための完全なCMDB(構成管理データベース)。</li>
+<li>IT環境で発生する出来事を追跡、共有するためのインシデント管理モジュール。</li>
+<li>IT環境への変更を計画、追跡するための変更管理モジュール。</li>
+<li>インシデントの解決をスピードアップするための既知のエラーデータベース。</li>
+<li>すべての計画停止を文書化し、適切な連絡先を通知するために停止モジュール。</li>
+<li>ITの概観を素早く得るためのダッシュボード。</li>
+</ul>
+<p>すべてのモジュールはお互いに独立しており、別個にセットアップが可能です。</p>',
+	'UI:WelcomeMenu:RightBlock' => '<p>iTopはサービスプロバイダ志向であり、ITエンジニアが複数の顧客や組織を簡単に管理できるようになります。
+<ul>iTopは、機能豊富な下記のビジネスプロセスのセットを提供します。
+<li>IT管理の実効性の強化。</li>
+<li>IT運用効率化の推進。</li>
+<li>顧客満足度の改善と、業績への洞察を経営経営幹部へ提供。</li>
+</ul>
+</p>
+<p>iTopは完全にオープンなので、あなたが今使っているIT管理インフラとの統合が可能です。</p>
+<p>
+<ul>この新世代IT運用ポータルの採用は、下記のお手伝いをします。
+<li>ますます複雑になるIT環境のより良い管理。</li>
+<li>あなたのペースでのITILプロセス実装。</li>
+<li>ITの中でもっとも重要な財産である「文書化」の管理。</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => '要求を開く: %1$d',
+	'UI:WelcomeMenu:MyCalls' => '担当中の要求',
+	'UI:WelcomeMenu:OpenIncidents' => 'インシデントを開く: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => '構成項目(CI): %1$d',
+	'UI:WelcomeMenu:MyIncidents' => '担当中のインシデント',
+	'UI:AllOrganizations' => '全ての組織',
+	'UI:YourSearch' => '検索',
+	'UI:LoggedAsMessage' => '%1$s としてログイン済み',
+	'UI:LoggedAsMessage+Admin' => '%1$s　(管理者)としてログイン済み',
+	'UI:Button:Logoff' => 'ログオフ',
+	'UI:Button:GlobalSearch' => '検索',
+	'UI:Button:Search' => '　検索　',
+	'UI:Button:Query' => ' クエリ',
+	'UI:Button:Ok' => 'OK',
+	'UI:Button:Save' => '　保存　',
+	'UI:Button:Cancel' => 'キャンセル',
+	'UI:Button:Apply' => '　適用　',
+	'UI:Button:Back' => ' << 戻る',
+	'UI:Button:Restart' => ' |<< リスタート',
+	'UI:Button:Next' => ' 次へ >> ',
+	'UI:Button:Finish' => ' 完了 ',
+	'UI:Button:DoImport' => ' インポート実行! ',
+	'UI:Button:Done' => ' 完了 ',
+	'UI:Button:SimulateImport' => ' インポートをシュミレート ',
+	'UI:Button:Test' => 'テスト実行!',
+	'UI:Button:Evaluate' => ' 評価 ',
+	'UI:Button:Evaluate:Title' => ' 評価 (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' 追加...',
+	'UI:Button:BrowseObjects' => 'ブラウズ...',
+	'UI:Button:Add' => ' 追加 ',
+	'UI:Button:AddToList' => ' << 追加 ',
+	'UI:Button:RemoveFromList' => '削除 >> ',
+	'UI:Button:FilterList' => ' フィルタ... ',
+	'UI:Button:Create' => ' 作成 ',
+	'UI:Button:Delete' => ' 削除! ',
+	'UI:Button:Rename' => ' 名前変更',
+	'UI:Button:ChangePassword' => ' パスワード変更 ',
+	'UI:Button:ResetPassword' => 'パスワードリセット ',
+	'UI:SearchToggle' => '検索（トグル↓↑)',
+	'UI:ClickToCreateNew' => '新規 %1$s を作成',
+	'UI:SearchFor_Class' => '%1$s オブジェクトを検索',
+	'UI:NoObjectToDisplay' => '表示するオブジェクトはありません。',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'link_attrが指定されている時は、object_idパラメータは必須です。表示テンプレートの定義を確認してください。',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'link_attrを指定する場合は、target_attrパラメータは必須です。表示テンプレートの定義を確認してください。',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'group_byパラメータは必須です。表示テンプレートの定義を確認してください。',
+	'UI:Error:InvalidGroupByFields' => '無効なフィールドリストです。 group by: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'エラー：サポートされていないブロックスタイル："%1$s"',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => '不正なリンク定義: 管理オブジェクトのクラス：%1$s は、クラス %2$s 中の外部キーとして見つかりません。',
+	'UI:Error:Object_Class_Id_NotFound' => 'オブジェクト：%1$s:%2$d が見つかりません。',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'エラー: フィールド間の依存関係に循環参照があります。データモデルを確認してください。',
+	'UI:Error:UploadedFileTooBig' => 'アップロードファイルが大きすぎます(上限は %1$s )。PHPの設定　upload_max_filesizeと、post_max_sizeを確認してください。',
+	'UI:Error:UploadedFileTruncated.' => 'アップロードファイルが切り捨てられました!',
+	'UI:Error:NoTmpDir' => '一時ディレクトリは定義されていません。',
+	'UI:Error:CannotWriteToTmp_Dir' => '一時ファイルをディスクに書き込めません。upload_tmp_dir = "%1$s"',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'extensionにより、アップロードを停止しました。(オリジナルのファイル名は"%1$s"です)。',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'ファイルのアップロードに失敗しました。原因は不明(エラーコード: "%1$s")です。',
+	'UI:Error:1ParametersMissing' => 'エラー: この操作には下記のパラメータを指定する必要があります：%1$s',
+	'UI:Error:2ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s , %2$s',
+	'UI:Error:3ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s',
+	'UI:Error:4ParametersMissing' => 'エラー：この操作には、下記のパラメータを指定する必要があります：%1$s, %2$s, %3$s,%4$s',
+	'UI:Error:IncorrectOQLQuery_Message' => 'エラー：誤ったOQLクエリ:%1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'クエリ:%1$s 実行中にエラーが発生しました。',
+	'UI:Error:ObjectAlreadyUpdated' => 'エラー：このオブジェクトはすでに更新済みです。',
+	'UI:Error:ObjectCannotBeUpdated' => 'エラー：オブジェクトを更新できません。',
+	'UI:Error:ObjectsAlreadyDeleted' => 'エラー：オブジェクトは既に削除されています。',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => '%1$s クラスのオブジェクトに対するバルク削除の実行は許可されていません。',
+	'UI:Error:DeleteNotAllowedOn_Class' => '%1$s クラスのオブジェクトの削除は許可されていません。',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => '%1$s クラスのオブジェクトに対するバルクアップデートの実行は許可されていません。',
+	'UI:Error:ObjectAlreadyCloned' => 'エラー：このオブジェクトはすでに、クローンされています。',
+	'UI:Error:ObjectAlreadyCreated' => 'エラー：このオブジェクトは既に作成済みです。',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'エラー：状態"%3$s"のオブジェクト%2$s上の無効なスティミュラス"%1$s".',
+	'UI:GroupBy:Count' => 'カウント',
+	'UI:GroupBy:Count+' => '要素数',
+	'UI:CountOfObjects' => '%1$d 個のオブジェクトが条件にマッチしました。',
+	'UI_CountOfObjectsShort' => '%1$d オブジェクト。',
+	'UI:NoObject_Class_ToDisplay' => '表示する %1$s はありません。',
+	'UI:History:LastModified_On_By' => '%2$sによる最終更新 %1$s',
+	'UI:HistoryTab' => '履歴',
+	'UI:NotificationsTab' => '通知',
+	'UI:History:BulkImports' => '履歴',
+	'UI:History:BulkImports+' => 'CSVインポートのリスト(last first)',
+	'UI:History:BulkImportDetails' => '(%2$s により)実行された %1$s へCSVインポートによる変更結果',
+	'UI:History:Date' => '日付',
+	'UI:History:Date+' => '変更日',
+	'UI:History:User' => 'ユーザー',
+	'UI:History:User+' => 'この変更を行ったユーザー',
+	'UI:History:Changes' => '変更',
+	'UI:History:Changes+' => 'このオブジェクトを変更する',
+	'UI:History:StatsCreations' => '作成',
+	'UI:History:StatsCreations+' => '作成されたオブジェクト数',
+	'UI:History:StatsModifs' => '修正',
+	'UI:History:StatsModifs+' => '修正されたオブジェクト数',
+	'UI:History:StatsDeletes' => '削除',
+	'UI:History:StatsDeletes+' => '削除されたオブジェクト数',
+	'UI:Loading' => '読み込み...',
+	'UI:Menu:Actions' => '実行',
+	'UI:Menu:OtherActions' => 'その他の実行',
+	'UI:Menu:New' => '新規...',
+	'UI:Menu:Add' => '追加...',
+	'UI:Menu:Manage' => '管理...',
+	'UI:Menu:EMail' => 'Eメール',
+	'UI:Menu:CSVExport' => 'CSVエクスポート...',
+	'UI:Menu:Modify' => '修正...',
+	'UI:Menu:Delete' => '削除...',
+	'UI:Menu:BulkDelete' => '削除...',
+	'UI:UndefinedObject' => '未定義',
+	'UI:Document:OpenInNewWindow:Download' => '新規ウィンドウで開く: %1$s、 ダウンロード: %2$s',
+	'UI:SelectAllToggle+' => '全てを選択 / 全てを非選択',
+	'UI:SplitDateTime-Date' => '日付',
+	'UI:SplitDateTime-Time' => '時刻',
+	'UI:TruncatedResults' => '%2$d中%1$dのオブジェクトを表示',
+	'UI:DisplayAll' => 'すべて表示',
+	'UI:CollapseList' => '折りたたむ',
+	'UI:CountOfResults' => '%1$d オブジェクト',
+	'UI:ChangesLogTitle' => '変更履歴(%1$d)',
+	'UI:EmptyChangesLogTitle' => '変更履歴は空です。',
+	'UI:SearchFor_Class_Objects' => '%1$s オブジェクトを検索',
+	'UI:OQLQueryBuilderTitle' => 'OQLクエリビルダ',
+	'UI:OQLQueryTab' => 'OQLクエリ',
+	'UI:SimpleSearchTab' => '単純検索',
+	'UI:Details+' => '詳細',
+	'UI:SearchValue:Any' => '* 任意 *',
+	'UI:SearchValue:Mixed' => '* 混成 *',
+	'UI:SearchValue:NbSelected' => '# 選択',
+	'UI:SelectOne' => '-- 選んでください --',
+	'UI:Login:Welcome' => 'iTopへようこそ',
+	'UI:Login:IncorrectLoginPassword' => 'ログイン/パスワードが正しくありません。再度入力ください。',
+	'UI:Login:IdentifyYourself' => '続けて作業を行う前に認証を受けてください。',
+	'UI:Login:UserNamePrompt' => 'ユーザー名',
+	'UI:Login:PasswordPrompt' => 'パスワード',
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'パスワードを変更してください',
+	'UI:Login:OldPasswordPrompt' => '古いパスワード',
+	'UI:Login:NewPasswordPrompt' => '新しいパスワード',
+	'UI:Login:RetypeNewPasswordPrompt' => '新しいパスワードを再度入力してください。',
+	'UI:Login:IncorrectOldPassword' => 'エラー：既存パスワードが正しくありません。',
+	'UI:LogOffMenu' => 'ログオフ',
+	'UI:LogOff:ThankYou' => 'iTopをご利用いただき、ありがとうございます。',
+	'UI:LogOff:ClickHereToLoginAgain' => '再度ログインするにはここをクリックしてください...',
+	'UI:ChangePwdMenu' => 'パスワードを変更する...',
+	'UI:Login:PasswordChanged' => 'パスワードは変更されました。',
+	'UI:AccessRO-All' => 'iTopは参照専用です。',
+	'UI:AccessRO-Users' => 'エンドユーザの方はiTopは参照専用です。',
+	'UI:ApplicationEnvironment' => 'アプリケーション環境: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => '2度入力された新しいパスワードが一致しません!',
+	'UI:Button:Login' => 'iTopへ入る',
+	'UI:Login:Error:AccessRestricted' => 'iTopへのアクセスは制限されています。iTop管理者に問い合わせしてください。',
+	'UI:Login:Error:AccessAdmin' => '管理者権限をもつユーザにアクセスが制限されています。iTop管理者に問い合わせしてください。',
+	'UI:CSVImport:MappingSelectOne' => '-- 選択ください --',
+	'UI:CSVImport:MappingNotApplicable' => '--このフィールドを無視する --',
+	'UI:CSVImport:NoData' => '空のデータセット..., データを提供してください。',
+	'UI:Title:DataPreview' => 'データプレビュー',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'エラー：このデータにはカラムが1つしか含まれていません。適切なセパレータ文字を選択しましたか。',
+	'UI:CSVImport:FieldName' => 'フィールド %1$d',
+	'UI:CSVImport:DataLine1' => 'データ行 1',
+	'UI:CSVImport:DataLine2' => 'データ行 2',
+	'UI:CSVImport:idField' => 'ID (主キー)',
+	'UI:Title:BulkImport' => 'iTop - バルクインポート',
+	'UI:Title:BulkImport+' => 'CSV インポートウィザード',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '%2$s クラスの %1$d オブジェクトを同期',
+	'UI:CSVImport:ClassesSelectOne' => '--選択してください --',
+	'UI:CSVImport:ErrorExtendedAttCode' => '内部エラー： "%2$s" は"%3$s"クラスの外部キーではないので、"%1$s" は誤ったコードです。',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d オブジェクトは変更されません。',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d オブジェクトが修正されます。',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d オブジェクトが追加されます。',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d オブジェクトにエラーがあります。',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d オブジェクトは変更されていません。',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d オブジェクトが修正されました。',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d オブジェクトが追加されました。',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$s オブジェクトにエラーがあります。',
+	'UI:Title:CSVImportStep2' => 'ステップ2/5: CSVデータオプション',
+	'UI:Title:CSVImportStep3' => 'ステップ3/5: データマッピング',
+	'UI:Title:CSVImportStep4' => 'ステップ4/5: インポートシミュレーション',
+	'UI:Title:CSVImportStep5' => 'ステップ5/5: インポート完了',
+	'UI:CSVImport:LinesNotImported' => 'ロードできなかった行：',
+	'UI:CSVImport:LinesNotImported+' => '下記の行はエラーが含まれていたのでインポートされませんでした。',
+	'UI:CSVImport:SeparatorComma+' => ', (コンマ)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (セミコロン)',
+	'UI:CSVImport:SeparatorTab+' => 'タブ',
+	'UI:CSVImport:SeparatorOther' => 'その他:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (ダブルクォート)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (シングルクォート)',
+	'UI:CSVImport:QualifierOther' => 'その他：',
+	'UI:CSVImport:TreatFirstLineAsHeader' => '1行めをヘッダ(カラム名)として扱う。',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'ファイル最初の%1$s 行をスキップする',
+	'UI:CSVImport:CSVDataPreview' => 'CSVデータプレビュー',
+	'UI:CSVImport:SelectFile' => 'インポートするファイルを選択してください:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'ファイルからロード',
+	'UI:CSVImport:Tab:CopyPaste' => 'データをコピーとペースト',
+	'UI:CSVImport:Tab:Templates' => 'テンプレート',
+	'UI:CSVImport:PasteData' => 'インポートするデータをペーストしてください:',
+	'UI:CSVImport:PickClassForTemplate' => 'ダウンロードするテンプレートを選んでください',
+	'UI:CSVImport:SeparatorCharacter' => 'セパレータ文字',
+	'UI:CSVImport:TextQualifierCharacter' => 'テキスト修飾子文字',
+	'UI:CSVImport:CommentsAndHeader' => 'コメントとヘッダ',
+	'UI:CSVImport:SelectClass' => 'インポートするクラスを選択してください:',
+	'UI:CSVImport:AdvancedMode' => '拡張モード',
+	'UI:CSVImport:AdvancedMode+' => '拡張モードでは、オブジェクトの"id"(主キー)はオブジェクトの更新、リネームに使用可能です。しかしながら、"id"カラムは(たとえ存在しても)検索条件として使用可能なだけであり、他の検索条件と組み合わせて利用することはできません。',
+	'UI:CSVImport:SelectAClassFirst' => 'マッピングを設定するには、まず最初にクラスを選択してください。',
+	'UI:CSVImport:HeaderFields' => 'フィールド',
+	'UI:CSVImport:HeaderMappings' => 'マッピング',
+	'UI:CSVImport:HeaderSearch' => '検索しますか',
+	'UI:CSVImport:AlertIncompleteMapping' => 'すべてのフィールドのマッピングを選択してください。',
+	'UI:CSVImport:AlertNoSearchCriteria' => '少なくとも1つ以上の検索条件を選択してください。',
+	'UI:CSVImport:Encoding' => '文字エンコーディング',
+	'UI:UniversalSearchTitle' => 'iTop - ユニバーサル検索',
+	'UI:UniversalSearch:Error' => 'エラー：%1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => '検索するクラスを選択してください。',
+	'UI:CSVReport-Value-Modified' => '修正済み',
+	'UI:CSVReport-Value-SetIssue' => '変更出来ません - 理由: %1$s',
+	'UI:CSVReport-Value-ChangeIssue' => '%1$s へ変更出来ません - 理由: %2$s',
+	'UI:CSVReport-Value-NoMatch' => 'マッチしません',
+	'UI:CSVReport-Value-Missing' => '必須の値がありません',
+	'UI:CSVReport-Value-Ambiguous' => 'あいまいな値:  %1$s オブジェクト',
+	'UI:CSVReport-Row-Unchanged' => '未変更',
+	'UI:CSVReport-Row-Created' => '作成済み',
+	'UI:CSVReport-Row-Updated' => '更新 %1$d カラム',
+	'UI:CSVReport-Row-Disappeared' => '消去済み, 変更済み %1$d カラム',
+	'UI:CSVReport-Row-Issue' => '課題: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'Null は許可されません',
+	'UI:CSVReport-Value-Issue-NotFound' => 'オブジェクトは見つかりません',
+	'UI:CSVReport-Value-Issue-FoundMany' => '%1$d マッチ',
+	'UI:CSVReport-Value-Issue-Readonly' => '属性 \'%1$s\' は、読み取り専用で、修正出来ません(現在の値: %2$s, 要求された値: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => '入力処理の失敗: %1$s',
+	'UI:CSVReport-Value-Issue-NoMatch' => '属性 \'%1$s\' への予期されない値 : マッチしません、文字列チェック',
+	'UI:CSVReport-Value-Issue-Unknown' => '属性 \'%1$s\' への予期されない値: %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => '属性がお互いに整合しません: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => '予期されない属性値',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => '作成できません, 外部キーがありません: %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => '間違ったデータフォーマット',
+	'UI:CSVReport-Row-Issue-Reconciliation' => '調整に失敗しました',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'あいまいな調整',
+	'UI:CSVReport-Row-Issue-Internal' => '内部エラー: %1$s, %2$s',
+	'UI:CSVReport-Icon-Unchanged' => '未変更',
+	'UI:CSVReport-Icon-Modified' => '修正済み',
+	'UI:CSVReport-Icon-Missing' => '不足',
+	'UI:CSVReport-Object-MissingToUpdate' => '不足オブジェクト: 更新されます',
+	'UI:CSVReport-Object-MissingUpdated' => '不足オブジェクト: 更新済み',
+	'UI:CSVReport-Icon-Created' => '作成済み',
+	'UI:CSVReport-Object-ToCreate' => 'オブジェクトは作成されます',
+	'UI:CSVReport-Object-Created' => 'オブジェクトは作成されました',
+	'UI:CSVReport-Icon-Error' => 'エラー',
+	'UI:CSVReport-Object-Error' => 'エラー: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'あいまい: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% ロードされたオブジェクトはエラーがあり、無視されます。',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% ロードされたオブジェクトは作成されます。',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of ロードされたオブジェクトは修正されます。',
+	'UI:CSVExport:AdvancedMode' => 'アドバンスドモード',
+	'UI:CSVExport:AdvancedMode+' => 'アドバンスドモードでは、エキスポートのためにいくつかのカラムが追加されます。: オブジェクトのid, 外部キーの id ,そして調整属性。',
+	'UI:CSVExport:LostChars' => 'エンコーディングの課題',
+	'UI:CSVExport:LostChars+' => 'ダウンロードファイルは %1$s でエンコードされます. iTop はこのフォーマットと整合性のない文字を検出しました。 これらの文字は代りの文字になります。（たとえばアクセント付き文字からはアクセント記号が無くなります。または、削除されます。 Webブラウザからコピー／ペーストが出来ます。 あるいは、システム管理者にエンコードの変更を問い合わせください。 (See parameter \'csv_file_default_charset\').',
+	'UI:Audit:Title' => 'iTop - CMDB 監査',
+	'UI:Audit:InteractiveAudit' => '対話型監査',
+	'UI:Audit:HeaderAuditRule' => '監査ルール',
+	'UI:Audit:HeaderNbObjects' => 'オブジェクト数',
+	'UI:Audit:HeaderNbErrors' => 'エラー数',
+	'UI:Audit:PercentageOk' => '% OK',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'ルール %1$s 中のOQLエラー: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'カテゴリ %1$s 中のOQLエラー: %2$s.',
+	'UI:RunQuery:Title' => 'iTop - OQLクエリ評価',
+	'UI:RunQuery:QueryExamples' => 'クエリの例',
+	'UI:RunQuery:HeaderPurpose' => '目的',
+	'UI:RunQuery:HeaderPurpose+' => 'クエリについての説明',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL式',
+	'UI:RunQuery:HeaderOQLExpression+' => 'OQL文法によるクエリ',
+	'UI:RunQuery:ExpressionToEvaluate' => '評価式',
+	'UI:RunQuery:MoreInfo' => 'クエリに関する追加情報',
+	'UI:RunQuery:DevelopedQuery' => 'クエリ式の再開発',
+	'UI:RunQuery:SerializedFilter' => 'シリアライズされたフィルタ：',
+	'UI:RunQuery:Error' => 'クエリ: %1$s 実行時にエラーが発生しました',
+	'UI:Query:UrlForExcel' => 'MS-Excel Webクエリに使用するURL',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Schema:Title' => 'iTop オブジェクトスキーマ',
+	'UI:Schema:CategoryMenuItem' => 'カテゴリ <b>%1$s</b>',
+	'UI:Schema:Relationships' => '関係',
+	'UI:Schema:AbstractClass' => '抽象クラス：このクラスのインスタンスを作成することはできません。',
+	'UI:Schema:NonAbstractClass' => '非抽象クラス：このクラスのインスタンスを作成できます。',
+	'UI:Schema:ClassHierarchyTitle' => 'クラス階層',
+	'UI:Schema:AllClasses' => '全クラス',
+	'UI:Schema:ExternalKey_To' => '%1$s への外部キー',
+	'UI:Schema:Columns_Description' => 'カラム： <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'デフォルト： "%1$s"',
+	'UI:Schema:NullAllowed' => 'Nullを許容',
+	'UI:Schema:NullNotAllowed' => 'Nullを非許容',
+	'UI:Schema:Attributes' => '属性',
+	'UI:Schema:AttributeCode' => '属性コード',
+	'UI:Schema:AttributeCode+' => '属性の内部コード',
+	'UI:Schema:Label' => 'ラベル',
+	'UI:Schema:Label+' => '属性のラベル',
+	'UI:Schema:Type' => '型',
+	'UI:Schema:Type+' => '属性のデータ型',
+	'UI:Schema:Origin' => 'オリジン',
+	'UI:Schema:Origin+' => 'この属性が定義されているベースクラス',
+	'UI:Schema:Description' => '説明',
+	'UI:Schema:Description+' => 'この属性の概要',
+	'UI:Schema:AllowedValues' => '可能な値',
+	'UI:Schema:AllowedValues+' => '本属性で可能な値の制限',
+	'UI:Schema:MoreInfo' => '追加情報',
+	'UI:Schema:MoreInfo+' => 'データベースに定義された本フィールドの追加情報',
+	'UI:Schema:SearchCriteria' => '検索条件',
+	'UI:Schema:FilterCode' => 'フィルタコード',
+	'UI:Schema:FilterCode+' => '本検索条件のコード',
+	'UI:Schema:FilterDescription' => '説明',
+	'UI:Schema:FilterDescription+' => '本検索条件の説明',
+	'UI:Schema:AvailOperators' => '利用可能な演算子',
+	'UI:Schema:AvailOperators+' => '本検索条件で利用可能な演算子',
+	'UI:Schema:ChildClasses' => '子クラス',
+	'UI:Schema:ReferencingClasses' => '参照クラス',
+	'UI:Schema:RelatedClasses' => '関係するクラス',
+	'UI:Schema:LifeCycle' => 'ライフサイクル',
+	'UI:Schema:Triggers' => 'トリガー',
+	'UI:Schema:Relation_Code_Description' => 'リレーション <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => '下へ: %1$s',
+	'UI:Schema:RelationUp_Description' => '上へ: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: %2$d レベルへ伝播、クエリ：%3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 伝播しない (%2$d レベル), クエリ: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s は%2$s クラスから %3$s フィールドにより参照されている',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s は %3$s::<em>%4$s</em>により%2$s へリンクされています。',
+	'UI:Schema:Links:1-n' => 'クラスは%1$sへポイントしています。(1:n リンク)',
+	'UI:Schema:Links:n-n' => 'クラスは%1$sへリンクしています。(n:n リンク)',
+	'UI:Schema:Links:All' => '関連する全クラスのグラフ表示',
+	'UI:Schema:NoLifeCyle' => 'このクラスにはライフサイクルが定義されていません。',
+	'UI:Schema:LifeCycleTransitions' => 'トランジション',
+	'UI:Schema:LifeCyleAttributeOptions' => '属性オプション',
+	'UI:Schema:LifeCycleHiddenAttribute' => '隠し',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => '参照のみ',
+	'UI:Schema:LifeCycleMandatoryAttribute' => '必須',
+	'UI:Schema:LifeCycleAttributeMustChange' => '変更必須',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'ユーザはこの値を変更するよう、促されます。',
+	'UI:Schema:LifeCycleEmptyList' => '空リスト',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => '最初の3文字をタイプしてください...',
+	'UI:Edit:TestQuery' => 'Test query',
+	'UI:Combo:SelectValue' => '--- 値を選んでください ---',
+	'UI:Label:SelectedObjects' => '選択されたオブジェクト: ',
+	'UI:Label:AvailableObjects' => '利用可能なオブジェクト: ',
+	'UI:Link_Class_Attributes' => '%1$s 属性',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s にリンクされた%1$sオブジェクトを追加：%3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => '%1$s オブジェクトを%2$sとのリンクに追加',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s にリンクされた%1$sオブジェクトの管理: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => '%1$s を追加...',
+	'UI:RemoveLinkedObjectsOf_Class' => '選択されたオブジェクトを削除',
+	'UI:Message:EmptyList:UseAdd' => 'リストは空です。"追加..."ボタンを利用して要素を追加してください。',
+	'UI:Message:EmptyList:UseSearchForm' => '上の検索フォームを使って追加するオブジェクトを検索してください。',
+	'UI:Wizard:FinalStepTitle' => '最終ステップ：確認',
+	'UI:Title:DeletionOf_Object' => '%1$sの削除',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s クラスの%1$d個のオブジェクトをバルク削除',
+	'UI:Delete:NotAllowedToDelete' => 'このオブジェクトの削除は、許可されていません。',
+	'UI:Delete:NotAllowedToUpdate_Fields' => '以下のフィールドの更新は、許可されていません。: %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'カレントユーザは十分な権限を持っていないので、このオブジェクトは削除することができません。',
+	'UI:Error:CannotDeleteBecause' => 'このオブジェクトは、削除できません。理由: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'いくつかの手動操作を先に実行する必要があるので、このオブジェクトは削除できません。',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'いくつかの手動操作を先に実行する必要があるので、このオブジェクトは削除できません。',
+	'UI:Archive_User_OnBehalfOf_User' => '%2$s の代りに %1$s',
+	'UI:Delete:Deleted' => '削除済み',
+	'UI:Delete:AutomaticallyDeleted' => '自動的に削除されました。',
+	'UI:Delete:AutomaticResetOf_Fields' => 'フィールドの自動リセット: %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => '%1$s への参照すべてをクリア',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s クラスの　%1$d個のオブジェクトへの参照をすべてクリア',
+	'UI:Delete:Done+' => '実行しました...',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s 削除しました。',
+	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s の削除',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$sクラスの%1$dオブジェクトの削除',
+	'UI:Delete:CannotDeleteBecause' => '削除できません: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => '自動的に削除されるべきですが、出来ません。: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => '手動で削除されるべきですが、出来ません。: %1$',
+	'UI:Delete:WillBeDeletedAutomatically' => '自動的に削除されます。',
+	'UI:Delete:MustBeDeletedManually' => '手動で削除されるべきです。',
+	'UI:Delete:CannotUpdateBecause_Issue' => '自動的に更新されるべきですが、しかし: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => '自動的に更新されます。(reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$dオブジェクト/リンクは%2$sを参照しています。',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$dオブジェクト/リンクは削除されるオブジェクトを参照しています。',
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'データベースの整合性を確保するために、いくつかの参照を削除する必要があります。',
+	'UI:Delete:Consequence+' => '行われます。',
+	'UI:Delete:SorryDeletionNotAllowed' => '申し訳ありませんが、あなたは、このオブジェクトを削除する権限がありません、上記の詳細な説明を参照してください。',
+	'UI:Delete:PleaseDoTheManualOperations' => 'このオブジェクトの削除を要求する前に、上記にリストされている手動操作を実行してください。',
+	'UI:Delect:Confirm_Object' => '%1$sを削除しようとしています。確認ください。',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => '以下の%2$sクラスの%1$dオブジェクトを削除しようとしています。確認ください。',
+	'UI:WelcomeToITop' => 'iTopへようこそ',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$sの詳細',
+	'UI:ErrorPageTitle' => 'iTop - エラー',
+	'UI:ObjectDoesNotExist' => '申し訳ございません。このオブジェクトは既に存在しません。(あるいは参照する権限がありません。)',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'iTop - 検索結果',
+	'UI:SearchResultsTitle' => '検索結果',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => '検索するものがありません。',
+	'UI:FullTextSearchTitle_Text' => '"%1$s"の結果：',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%2$sクラスの%1$dオブジェクトが見つかりました。',
+	'UI:Search:NoObjectFound' => 'オブジェクトが見つかりませんでした。',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s 修正',
+	'UI:ModificationTitle_Class_Object' => '%1$sの修正： <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - クローン%1$s - %2$s 修正',
+	'UI:CloneTitle_Class_Object' => '%1$sのクローン：<span class=\"hilite">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - 新規%1$sを作成',
+	'UI:CreationTitle_Class' => '新規%1$sの作成',
+	'UI:SelectTheTypeOf_Class_ToCreate' => '作成する%1$sのタイプを選択:',
+	'UI:Class_Object_NotUpdated' => '変更は検出されませんでした。%1$s(%2$s)は修正されて<strong>いません</strong>',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) は更新されました。',
+	'UI:BulkDeletePageTitle' => 'iTop - バルク削除',
+	'UI:BulkDeleteTitle' => '削除するオブジェクトを選択してください。',
+	'UI:PageTitle:ObjectCreated' => 'iTopオブジェクトが作成されました。',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s が作成されました。',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '状態%3$sにあるオブジェクト：%2$sに、ターゲット状態:%4$sで、%1$sを適用します。',
+	'UI:ObjectCouldNotBeWritten' => 'そのオブジェクトへは書き込みできません: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - 致命的なエラー',
+	'UI:SystemIntrusion' => 'アクセスが拒否されました。あなたが許可されていない操作を実行しようとしています。',
+	'UI:FatalErrorMessage' => '致命的なエラー、ITOPを続行することはできません。',
+	'UI:Error_Details' => 'エラー：%1$s',
+	'UI:PageTitle:ClassProjections' => 'iTop ユーザ管理 - クラスプロジェクション',
+	'UI:PageTitle:ProfileProjections' => 'iTop ユーザ管理 - プロフィールプロジェクション',
+	'UI:UserManagement:Class' => 'クラス',
+	'UI:UserManagement:Class+' => 'オブジェクトのクラス',
+	'UI:UserManagement:ProjectedObject' => 'オブジェクト',
+	'UI:UserManagement:ProjectedObject+' => 'プロジェクトオブジェクト',
+	'UI:UserManagement:AnyObject' => '* 任意 *',
+	'UI:UserManagement:User' => 'ユーザ',
+	'UI:UserManagement:User+' => 'このプロジェクションに関与しているユーザー',
+	'UI:UserManagement:Profile' => 'プロフィール',
+	'UI:UserManagement:Profile+' => 'プロジェクションが指定されているプロフィール',
+	'UI:UserManagement:Action:Read' => '読み込み',
+	'UI:UserManagement:Action:Read+' => 'オブジェクトの読み込み/表示',
+	'UI:UserManagement:Action:Modify' => '修正',
+	'UI:UserManagement:Action:Modify+' => 'オブジェクトの作成、編集(修正)',
+	'UI:UserManagement:Action:Delete' => '削除',
+	'UI:UserManagement:Action:Delete+' => 'オブジェクトの削除',
+	'UI:UserManagement:Action:BulkRead' => '一括読み出し(エクスポート)',
+	'UI:UserManagement:Action:BulkRead+' => 'オブジェクトのリスト表示、もしくは一括エクスポート',
+	'UI:UserManagement:Action:BulkModify' => '一括修正',
+	'UI:UserManagement:Action:BulkModify+' => '一括作成/編集(CVSインポート)',
+	'UI:UserManagement:Action:BulkDelete' => '一括削除',
+	'UI:UserManagement:Action:BulkDelete+' => '複数オブジェクトをまとめて削除',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => '許可されている(複合)アクション',
+	'UI:UserManagement:Action' => 'アクション',
+	'UI:UserManagement:Action+' => 'ユーザが実行したアクション',
+	'UI:UserManagement:TitleActions' => 'アクション',
+	'UI:UserManagement:Permission' => 'パーミッション',
+	'UI:UserManagement:Permission+' => 'ユーザのパーミッション',
+	'UI:UserManagement:Attributes' => '属性',
+	'UI:UserManagement:ActionAllowed:Yes' => 'はい',
+	'UI:UserManagement:ActionAllowed:No' => 'いいえ',
+	'UI:UserManagement:AdminProfile+' => '管理者はデータベース中の全てのオブジェクトに対する全ての読み/書き権限を持っています。',
+	'UI:UserManagement:NoLifeCycleApplicable' => '該当なし',
+	'UI:UserManagement:NoLifeCycleApplicable+' => 'このクラスにはライフサイクルは定義されていません。',
+	'UI:UserManagement:GrantMatrix' => '権限マトリクス',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s と %2$s間のリンク',
+	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s と %2$s 間のリンク',
+	'Menu:AdminTools' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '管理ツール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'このツールは管理者プロフィールを持つユーザのみアクセスが可能です。', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:ChangeManagementMenu' => '変更管理',
+	'UI:ChangeManagementMenu+' => '変更管理',
+	'UI:ChangeManagementMenu:Title' => '変更管理概要',
+	'UI-ChangeManagementMenu-ChangesByType' => 'タイプ別変更',
+	'UI-ChangeManagementMenu-ChangesByStatus' => '状態別変更',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'ワークグループ別変更',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'まだ割り当てられていない変更',
+	'UI:ConfigurationManagementMenu' => '構成管理',
+	'UI:ConfigurationManagementMenu+' => '構成管理',
+	'UI:ConfigurationManagementMenu:Title' => 'インフラ概要',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'タイプ別のインフラ',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => '状態別のインフラ',
+	'UI:ConfigMgmtMenuOverview:Title' => '構成管理ダッシュボード',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '状態別構成項目(CI)',
+	'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'タイプ別構成項目(CI)',
+	'UI:RequestMgmtMenuOverview:Title' => '要求管理ダッシュボード',
+	'UI-RequestManagementOverview-RequestByService' => 'サービス別要求',
+	'UI-RequestManagementOverview-RequestByPriority' => '優先度別要求',
+	'UI-RequestManagementOverview-RequestUnassigned' => 'エージェントへ未割り当て要求',
+	'UI:IncidentMgmtMenuOverview:Title' => 'インシデント管理ダッシュボード',
+	'UI-IncidentManagementOverview-IncidentByService' => 'サービス別インシデント',
+	'UI-IncidentManagementOverview-IncidentByPriority' => '優先度別インシデント',
+	'UI-IncidentManagementOverview-IncidentUnassigned' => 'エージェントへ未割り当てインシデント',
+	'UI:ChangeMgmtMenuOverview:Title' => '変更管理ダッシュボード',
+	'UI-ChangeManagementOverview-ChangeByType' => 'タイプ別変更内容',
+	'UI-ChangeManagementOverview-ChangeUnassigned' => 'エージェントへ未割り当て変更内容',
+	'UI-ChangeManagementOverview-ChangeWithOutage' => '変更に伴う停止',
+	'UI:ServiceMgmtMenuOverview:Title' => 'サービス管理ダッシュボード',
+	'UI-ServiceManagementOverview-CustomerContractToRenew' => '30日以内に契約更新が必要な顧客',
+	'UI-ServiceManagementOverview-ProviderContractToRenew' => '30日以内に契約更新が必要なプロバイダ',
+	'UI:ContactsMenu' => '連絡先',
+	'UI:ContactsMenu+' => '連絡先',
+	'UI:ContactsMenu:Title' => '連絡先概要',
+	'UI-ContactsMenu-ContactsByLocation' => '場所別連絡先',
+	'UI-ContactsMenu-ContactsByType' => 'タイプ別連絡先',
+	'UI-ContactsMenu-ContactsByStatus' => '状態別連絡先',
+	'Menu:CSVImportMenu' => 'CSV インポート', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '一括作成/一括更新', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu' => 'データモデル', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'データモデル概要', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu' => 'エクスポート', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '任意のクエリ結果をHTML、CSV、XMLでエクスポートする', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu' => '通知', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '通知の設定', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:NotificationsMenu:Title' => '<span class="hilite">通知</span>の設定',
+	'UI:NotificationsMenu:Help' => 'ヘルプ',
+	'UI:NotificationsMenu:HelpContent' => '<p>iTopでは、通知はすべてカスタマイズが可能です。通知は<i>トリガーとアクション</i>という二つのオブジェクトがベースになっています。
+<p><i><b>トリガー</b></i>は、ある通知がいつ実行されるのか、を定義します。トリガーは3つのタイプに分類され、オブジェクトライフサイクルにおける3つの異なるフェーズに対応します：
+<ol>
+	<li>"onCreate"トリガーは、指定されたクラスのオブジェクトが作成されたときに実行されます。</li>
+	<li>"onStateEnter"トリガーは、指定されたクラスのオブジェクトが(他の状態から)指定された状態に入る前に実行されます。</li>
+	<li>"onStateLeave"トリガーは、指定されたクラスのオブジェクトが指定された状態から出る際に実行されます。</li>
+	<li>"onThreshold" トリガーは、TTR や TTO が閾値に達した時に実行されます。</li>
+	<li>the "on portal update" トリガーは、ポータルからチケットが更新された時に実行されます。</li>
+</ol>
+</p>
+<p>
+<i><b>アクション</b></i>はトリガーが実行される際の動作を定義します。例えば今、「メールを送信する」という動作で構成されるたった1種類だけのアクションがあるとします。
+このようなアクションは、受信者、重要度といったメッセージに付随する他のパラメータと同様、メール送信に利用されるテンプレートも定義します。
+</p>
+<p>特別なページ: <a href="../setup/email.test.php" target="_blank">email.test.php</p>は、PHPのメール設定をテストしたりトラブルシュートするのに利用可能であす。</p>
+<p>実行するには、アクションがトリガーに関連づけられている必要があります。
+トリガーに関連づけられると、各々のアクションは順番が与えられ、どの順序でアクションが実行されるかが指定されます。</p>',
+	'UI:NotificationsMenu:Triggers' => 'トリガー',
+	'UI:NotificationsMenu:AvailableTriggers' => '利用可能トリガー',
+	'UI:NotificationsMenu:OnCreate' => 'オブジェクトが作成された時',
+	'UI:NotificationsMenu:OnStateEnter' => 'オブジェクトが指定状態に入った時',
+	'UI:NotificationsMenu:OnStateLeave' => 'オブジェクトが指定状態から出た時',
+	'UI:NotificationsMenu:Actions' => 'アクション',
+	'UI:NotificationsMenu:AvailableActions' => '利用可能アクション',
+	'Menu:AuditCategories' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => '監査カテゴリ', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu' => 'クエリ実行', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '任意のクエリを実行', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu' => 'クエリのフレーズブック', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'クエリのフレーズブック', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration' => 'データ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'データ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu' => '全検索', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '何か...検索', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu' => 'ユーザ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'ユーザ管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'プロフィール', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu+' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu:Title' => 'ユーザアカウント', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:iTopVersion:Short' => '%1$sバージョン%2$s',
+	'UI:iTopVersion:Long' => '%1$sバージョン%2$s-%3$s ビルド%4$s',
+	'UI:PropertiesTab' => 'プロパティ',
+	'UI:OpenDocumentInNewWindow_' => '新規ウィンドウでこ文章を開く: %1$s',
+	'UI:DownloadDocument_' => 'この文書をダウンロードする: %1$s',
+	'UI:Document:NoPreview' => 'このタイプの文書はプレビューできません。',
+	'UI:Download-CSV' => 'ダウンロード-CSV %1$s',
+	'UI:DeadlineMissedBy_duration' => '%1$s によって消去されました。',
+	'UI:Deadline_LessThan1Min' => ' < 1分',
+	'UI:Deadline_Minutes' => '%1$d 分',
+	'UI:Deadline_Hours_Minutes' => '%1$d時間%2$d分',
+	'UI:Deadline_Days_Hours_Minutes' => '%1$d日%2$d時間%3$d分',
+	'UI:Help' => 'ヘルプ',
+	'UI:PasswordConfirm' => '(確認)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '%1$sオブジェクトをさらに追加する前に、このオブジェクトを保存してください。',
+	'UI:DisplayThisMessageAtStartup' => '起動時にこのメッセージを表示する',
+	'UI:RelationshipGraph' => 'グラフィカル表示',
+	'UI:RelationshipList' => 'リスト',
+	'UI:OperationCancelled' => '操作はキャンセルされました',
+	'UI:ElementsDisplayed' => 'フィルターリング',
+	'Portal:Title' => 'iTopユーザポータル',
+	'Portal:NoRequestMgmt' => '%1$s さん, このページにリダイレクトされました。あなたのプロファイルは、「ポータルユーザ」として登録されています。残念ながら、iTop は、「要求管理」としてインストールされていません。管理者に問い合わせてください。',
+	'Portal:Refresh' => 'リフレッシュ',
+	'Portal:Back' => '戻る',
+	'Portal:WelcomeUserOrg' => 'ようこそ %1$s, %2$sより',
+	'Portal:TitleDetailsFor_Request' => '要求の詳細',
+	'Portal:ShowOngoing' => 'オープン中の要求を表示',
+	'Portal:ShowClosed' => 'クローズした要求を表示',
+	'Portal:CreateNewRequest' => '新規要求を作成',
+	'Portal:CreateNewRequestItil' => '新規要求を作成',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => 'パスワードを変更',
+	'Portal:Disconnect' => '切断する',
+	'Portal:OpenRequests' => '担当のオープン中の要求',
+	'Portal:ClosedRequests' => '担当のクローズした要求',
+	'Portal:ResolvedRequests' => '担当の解決済み要求',
+	'Portal:SelectService' => 'カタログからサービスを選択してください：',
+	'Portal:PleaseSelectOneService' => 'サービスを1つ選んでください',
+	'Portal:SelectSubcategoryFrom_Service' => 'サービス%1$sのサブカテゴリを選んでください:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'サブカテゴリを1つ選んでください',
+	'Portal:DescriptionOfTheRequest' => 'あなたの要求の説明を記入してください：',
+	'Portal:TitleRequestDetailsFor_Request' => '要求%1$sの詳細：',
+	'Portal:NoOpenRequest' => 'このカテゴリに要求はありません',
+	'Portal:NoClosedRequest' => 'このカテゴリにはクローズした要求はありません。',
+	'Portal:Button:ReopenTicket' => 'このチケットを再オープン',
+	'Portal:Button:CloseTicket' => 'このチケットをクローズ。',
+	'Portal:Button:UpdateRequest' => '要求を更新',
+	'Portal:EnterYourCommentsOnTicket' => 'このチケットの解決について、コメントを入力してください。',
+	'Portal:ErrorNoContactForThisUser' => 'エラー：現在のユーザは連絡先/人物に関連づけられていません。管理者に問い合わせてください。',
+	'Portal:Attachments' => '添付',
+	'Portal:AddAttachment' => ' 添付を追加 ',
+	'Portal:RemoveAttachment' => ' 添付を削除 ',
+	'Portal:Attachment_No_To_Ticket_Name' => '$2$s ($3$s)への添付 #%1$d',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s のテンプレートを選択',
+	'Enum:Undefined' => '未定義',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s 日 %2$s 時 %3$s 分 %4$s 秒',
+	'UI:ModifyAllPageTitle' => '全てを修正',
+	'UI:Modify_N_ObjectsOf_Class' => 'クラス%2$Sの%1$dオブジェクトを修正',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'クラス%2$sの%3$d中%1$dを修正',
+	'UI:Menu:ModifyAll' => '修正...',
+	'UI:Button:ModifyAll' => '全て修正',
+	'UI:Button:PreviewModifications' => '修正をプレビュー >>',
+	'UI:ModifiedObject' => '修正されたオブジェクト',
+	'UI:BulkModifyStatus' => '操作',
+	'UI:BulkModifyStatus+' => '操作の状態',
+	'UI:BulkModifyErrors' => 'エラー (もしあれば)',
+	'UI:BulkModifyErrors+' => '修正を出来ないようにしているエラー',
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'エラー',
+	'UI:BulkModifyStatusModified' => '修正',
+	'UI:BulkModifyStatusSkipped' => 'スキップ',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d 個の個別の値:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d 回存在',
+	'UI:BulkModify:N_MoreValues' => '%1$d 個以上の値...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => '読み込み専用フィールド %1$にセットしょうとしています。',
+	'UI:FailedToApplyStimuli' => 'アクションは失敗しました。',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: クラス%3$sの%2$dオブジェクトを修正',
+	'UI:CaseLogTypeYourTextHere' => 'テキストを入力ください:',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => '初期値:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'フィールド %1$s は、データの同期によってマスターリングされているため書き込み可能ではありません。値は設定されません。',
+	'UI:ActionNotAllowed' => 'あなたは、これらのオブジェクトへのこのアクションを許可されていません。',
+	'UI:BulkAction:NoObjectSelected' => 'この操作を実行するには、少なくとも1つのオブジェクトを選択してください。',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'フィールド %1$s はデータの同期によってマスターリングされているため、書き込み可能ではありません。値は変更されません。',
+	'UI:Pagination:HeaderSelection' => '全: %1$s オブジェクト (%2$s オブジェクト選択)。',
+	'UI:Pagination:HeaderNoSelection' => '全: %1$s オブジェクト。',
+	'UI:Pagination:PageSize' => '%1$s オブジェクト／ページ',
+	'UI:Pagination:PagesLabel' => 'ページ:',
+	'UI:Pagination:All' => '全',
+	'UI:HierarchyOf_Class' => '%1$s の階層',
+	'UI:Preferences' => 'プリファレンス...',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'クイックアクセス組織',
+	'UI:FavoriteOrganizations+' => '迅速なアクセスのためのドロップダウンメニューに表示したい組織は、以下のリストで確認してください。セキュリティ設定ではないことに注意してください。全ての組織のオブジェクトは、表示可能です。ドロップダウンリストで「すべての組織(All Organizations)」を選択することでアクセスすることができます。',
+	'UI:FavoriteLanguage' => 'ユーザインターフェースの言語',
+	'UI:Favorites:SelectYourLanguage' => '希望する言語を選択ください。',
+	'UI:FavoriteOtherSettings' => '他のセッティング',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'リストの規定の長さ: %1$s items 毎ページ',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => '全ての変更を破棄します。',
+	'UI:CancelConfirmationMessage' => '変更内容が失われます。 続けますか?',
+	'UI:AutoApplyConfirmationMessage' => '幾つかの変更は、まだ反映されていません。 それらの変更を反映させますか?。',
+	'UI:Create_Class_InState' => '%1$sを作成、ステート:',
+	'UI:OrderByHint_Values' => '並び順: %1$s',
+	'UI:Menu:AddToDashboard' => 'ダッシュボードに追加...',
+	'UI:Button:Refresh' => '再表示',
+	'UI:ConfigureThisList' => 'このリストを構成...',
+	'UI:ListConfigurationTitle' => 'リストコンフィギュレーション',
+	'UI:ColumnsAndSortOrder' => 'カラムと並び順:',
+	'UI:UseDefaultSettings' => '既定のセッティングを使用',
+	'UI:UseSpecificSettings' => '次のセッティングを使用:',
+	'UI:Display_X_ItemsPerPage' => '1ページに %1$s アイテムを表示',
+	'UI:UseSavetheSettings' => 'セッティングを保存',
+	'UI:OnlyForThisList' => 'このリストのみ',
+	'UI:ForAllLists' => 'すべてのリストのデフォルト',
+	'UI:ExtKey_AsLink' => '%1$s (Link)',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
+	'UI:Button:MoveUp' => '上へ',
+	'UI:Button:MoveDown' => '下へ',
+	'UI:OQL:UnknownClassAndFix' => '未知のクラス "%1$s"。 代りに "%2$s" を試すことが出来ます。',
+	'UI:OQL:UnknownClassNoFix' => '未知のクラス "%1$s"',
+	'UI:Dashboard:Edit' => 'このページを編集...',
+	'UI:Dashboard:Revert' => '元のバージョンに戻す...',
+	'UI:Dashboard:RevertConfirm' => '元のバージョンに加えられたすべての変更は失われます。この実行を望む事をご確認ください。',
+	'UI:ExportDashBoard' => 'ファイルへエキスポート',
+	'UI:ImportDashBoard' => 'ファイルからインポート...',
+	'UI:ImportDashboardTitle' => 'ファイルからインポート',
+	'UI:ImportDashboardText' => 'インポートするダッシュボードファイルを選択ください。:',
+	'UI:DashletCreation:Title' => '新しいダッシュレットを作成',
+	'UI:DashletCreation:Dashboard' => 'ダッシュボード',
+	'UI:DashletCreation:DashletType' => 'ダッシュレットタイプ',
+	'UI:DashletCreation:EditNow' => 'ダッシュレットの編集',
+	'UI:DashboardEdit:Title' => 'ダッシュボードエディター',
+	'UI:DashboardEdit:DashboardTitle' => '題名',
+	'UI:DashboardEdit:Layout' => 'レイアウト',
+	'UI:DashboardEdit:Properties' => 'ダッシュボードプロパティ',
+	'UI:DashboardEdit:Dashlets' => '利用可能なダッシュレット',
+	'UI:DashboardEdit:DashletProperties' => 'ダッシュレットプロパティ',
+	'UI:Form:Property' => 'プロパティ',
+	'UI:Form:Value' => '値',
+	'UI:DashletPlainText:Label' => 'テキスト',
+	'UI:DashletPlainText:Description' => 'プレーンテキスト (フォーマットなし)',
+	'UI:DashletPlainText:Prop-Text' => 'テキスト',
+	'UI:DashletPlainText:Prop-Text:Default' => 'ここにテキストを入力ください...',
+	'UI:DashletObjectList:Label' => 'オブジェクトリスト',
+	'UI:DashletObjectList:Description' => 'オブジェクトリストダッシュレット',
+	'UI:DashletObjectList:Prop-Title' => '題名',
+	'UI:DashletObjectList:Prop-Query' => 'クエリ',
+	'UI:DashletObjectList:Prop-Menu' => 'メニュー',
+	'UI:DashletGroupBy:Prop-Title' => '題名',
+	'UI:DashletGroupBy:Prop-Query' => 'クエリ',
+	'UI:DashletGroupBy:Prop-Style' => 'スタイル',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'グループ化(Group by...)',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => '時 %1$s (0-23)',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => '月 %1$s (1 - 12)',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => '%1$s 週の日',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => '%1$s 月の日',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (時)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (月)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (週の日)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (月の日)',
+	'UI:DashletGroupBy:MissingGroupBy' => 'グループ化されるオブジェクトのフィールドを選択ください。',
+	'UI:DashletGroupByPie:Label' => '円グラフ',
+	'UI:DashletGroupByPie:Description' => '円グラフ',
+	'UI:DashletGroupByBars:Label' => '棒グラフ',
+	'UI:DashletGroupByBars:Description' => '棒グラフ',
+	'UI:DashletGroupByTable:Label' => 'グループ化 (table)による',
+	'UI:DashletGroupByTable:Description' => 'リスト (フィールドでグループ化)',
+	'UI:DashletHeaderStatic:Label' => 'ヘッダー',
+	'UI:DashletHeaderStatic:Description' => '水平セパレータの表示',
+	'UI:DashletHeaderStatic:Prop-Title' => '題名',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => '連絡先',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'アイコン',
+	'UI:DashletHeaderDynamic:Label' => '統計付ヘッダー',
+	'UI:DashletHeaderDynamic:Description' => '状態付ヘッダー (..によるグループ化)',
+	'UI:DashletHeaderDynamic:Prop-Title' => '題名',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => '連絡先',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'アイコン',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'サブタイトル',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => '連絡先',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'クエリ',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'グループ化(Group by)',
+	'UI:DashletHeaderDynamic:Prop-Values' => '値',
+	'UI:DashletBadge:Label' => 'バッジ',
+	'UI:DashletBadge:Description' => '新規/検索付オブジェクトアイコン',
+	'UI:DashletBadge:Prop-Class' => 'クラス',
+	'DayOfWeek-Sunday' => '日',
+	'DayOfWeek-Monday' => '月',
+	'DayOfWeek-Tuesday' => '火',
+	'DayOfWeek-Wednesday' => '水',
+	'DayOfWeek-Thursday' => '木',
+	'DayOfWeek-Friday' => '金',
+	'DayOfWeek-Saturday' => '土',
+	'UI:Menu:ShortcutList' => 'ショートカットを作成',
+	'UI:ShortcutRenameDlg:Title' => 'ショートカットの名前変更',
+	'UI:ShortcutListDlg:Title' => 'このリストのショートカットを作成',
+	'UI:ShortcutDelete:Confirm' => 'このショートカットを本当に削除してもいいですか。',
+	'Menu:MyShortcuts' => '私のショートカット', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Class:Shortcut' => 'ショートカット',
+	'Class:Shortcut+' => '',
+	'Class:Shortcut/Attribute:name' => '名前',
+	'Class:Shortcut/Attribute:name+' => '',
+	'UI:FillAllMandatoryFields' => '全ての必須フィールドを入力ください。',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/nl.dictionary.itop.core.php b/dictionaries/nl.dictionary.itop.core.php
index d4f76712e..e81aebddb 100644
--- a/dictionaries/nl.dictionary.itop.core.php
+++ b/dictionaries/nl.dictionary.itop.core.php
@@ -1,885 +1,885 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Core:DeletedObjectLabel' => '%1s (verwijderd)',
-	'Core:DeletedObjectTip' => 'Het object is verwijderd op %1$s (%2$s)',
-
-	'Core:UnknownObjectLabel' => 'Object niet gevonden (klasse: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip' => 'Object kon niet worden gevonden. Het zou eerder verwijderd kunnen zijn en de log zou kunnen zijn opgeschoond.',
-
-	'Core:AttributeLinkedSet' => 'Reeks van objecten',
-	'Core:AttributeLinkedSet+' => 'Elke soort objecten van dezelfde klasse of subklasse',
-
-	'Core:AttributeLinkedSetIndirect' => 'Reeks van objecten (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'Elke soort objecten [subklasse] van dezelfde klasse',
-
-	'Core:AttributeInteger' => 'Integer',
-	'Core:AttributeInteger+' => 'Numerieke waarde (kan negatief zijn)',
-
-	'Core:AttributeDecimal' => 'Decimaal',
-	'Core:AttributeDecimal+' => 'Decimale waarde (kan negatief zijn)',
-
-	'Core:AttributeBoolean' => 'Boolean',
-	'Core:AttributeBoolean+' => 'Boolean',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
-	'Core:AttributeString' => 'String',
-	'Core:AttributeString+' => 'Alphanumerieke string',
-
-	'Core:AttributeClass' => 'Klasse',
-	'Core:AttributeClass+' => 'Klasse',
-
-	'Core:AttributeApplicationLanguage' => 'Taal van de gebruiker',
-	'Core:AttributeApplicationLanguage+' => 'Taal en land (EN US)',
-
-	'Core:AttributeFinalClass' => 'Klasse (auto)',
-	'Core:AttributeFinalClass+' => 'Echte klasse van het object (automatisch aangemaakt bij de kern)',
-
-	'Core:AttributePassword' => 'Wachtwoord',
-	'Core:AttributePassword+' => 'Wachtwoord van een extern apparaat',
-
- 	'Core:AttributeEncryptedString' => 'Gecodeerde string',
-	'Core:AttributeEncryptedString+' => 'String gecodeerd met een locale key',
-
-	'Core:AttributeText' => 'Text',
-	'Core:AttributeText+' => 'Multiline character string',
-
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => 'HTML string',
-
-	'Core:AttributeEmailAddress' => 'E-mailadres',
-	'Core:AttributeEmailAddress+' => 'E-mailadres',
-
-	'Core:AttributeIPAddress' => 'IP adres',
-	'Core:AttributeIPAddress+' => 'IP adres',
-
-	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => 'Object Query Langage expression',
-
-	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => 'Lijst van voorgedefineerde alphanumerieke strings',
-
-	'Core:AttributeTemplateString' => 'Template string',
-	'Core:AttributeTemplateString+' => 'String die de procurators bevat',
-
-	'Core:AttributeTemplateText' => 'Template text',
-	'Core:AttributeTemplateText+' => 'Text die de procurators bevat',
-
-	'Core:AttributeTemplateHTML' => 'Template HTML',
-	'Core:AttributeTemplateHTML+' => 'HTML die de procurators bevat',
-
-	'Core:AttributeDateTime' => 'Datum/tijd',
-	'Core:AttributeDateTime+' => 'Datum en tijd (jaar-maand-dag hh:mm:ss)',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-If the time is omitted, it defaults to 00:00:00
-</p>',
-
-	'Core:AttributeDate' => 'Date',
-	'Core:AttributeDate+' => 'Date (year-month-day)',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>',
-
-	'Core:AttributeDeadline' => 'Deadline',
-	'Core:AttributeDeadline+' => 'Datum, relatief weergegeven ten opzichte van het huidige tijdstip',
-
-	'Core:AttributeExternalKey' => 'Externe key',
-	'Core:AttributeExternalKey+' => 'Externe (of buitenlandse) key',
-
-	'Core:AttributeHierarchicalKey' => 'Hierarchische Key',
-	'Core:AttributeHierarchicalKey+' => 'Externe (of buitenlandse) key tot de parent',
-
-	'Core:AttributeExternalField' => 'Extern veld',
-	'Core:AttributeExternalField+' => 'Veld mapped tot een externe key',
-
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => '
-Absolute of relatieve URL als een text string',
-
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => 'Alle binaire inhoud (document)',
-
-	'Core:AttributeOneWayPassword' => 'One way wachtwoord',
-	'Core:AttributeOneWayPassword+' => 'One way gecodeerd (hashed) wachtwoord',
-
-	'Core:AttributeTable' => 'Tabel',
-	'Core:AttributeTable+' => 'Geïndexeerde reeks met twee dimensies',
-
-	'Core:AttributePropertySet' => 'Eigenschappen',
-	'Core:AttributePropertySet+' => 'Lijst van ongeschreven eigenschappen (naam en waarde)',
-
-	'Core:AttributeFriendlyName' => 'Friendly name',
-	'Core:AttributeFriendlyName+' => 'Automatisch aangemaakt attribuut; de friendly name is na verscheidene attributen verwerkt',
-
-	'Core:FriendlyName-Label' => 'Referentie',
-	'Core:FriendlyName-Description' => 'Referentie',
-));
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'core/cmdb'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: CMDBChange
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChange' => 'Aanpassing',
-	'Class:CMDBChange+' => 'Volgen van aanpassingen',
-	'Class:CMDBChange/Attribute:date' => 'datum',
-	'Class:CMDBChange/Attribute:date+' => 'De datum en tijd waarop de aanpassingen zijn waargenomen ',
-	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
-	'Class:CMDBChange/Attribute:userinfo+' => 'gedefineerde info van de gebruiker',
-));
-
-//
-// Class: CMDBChangeOp
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOp' => 'Pas de operatie aan',
-	'Class:CMDBChangeOp+' => 'Pas het volgen van de operatie aan',
-	'Class:CMDBChangeOp/Attribute:change' => 'Pas aan',
-	'Class:CMDBChangeOp/Attribute:change+' => 'Pas aan',
-	'Class:CMDBChangeOp/Attribute:date' => 'datum',
-	'Class:CMDBChangeOp/Attribute:date+' => 'datum en tijd van de aanpassing',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'gebruiker',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => 'wie heeft deze aanpassing doorgevoerd',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'objectklasse',
-	'Class:CMDBChangeOp/Attribute:objclass+' => 'objectklasse',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
-	'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'type',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CMDBChangeOpCreate
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOpCreate' => 'objectcreatie',
-	'Class:CMDBChangeOpCreate+' => 'Objectcreatie volgen',
-));
-
-//
-// Class: CMDBChangeOpDelete
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOpDelete' => 'verwijderen object',
-	'Class:CMDBChangeOpDelete+' => 'volgen van het verwijderen van objecten',
-));
-
-//
-// Class: CMDBChangeOpSetAttribute
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOpSetAttribute' => 'aanpassing van het object',
-	'Class:CMDBChangeOpSetAttribute+' => 'volgen van de aanpassing van de objecteigenschappen',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribuut',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'code van de aangepaste eigenschap',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeScalar
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => 'Aanpassing van de eigenschap',
-	'Class:CMDBChangeOpSetAttributeScalar+' => 'Volgen van de object scalar eigenschappen aanpassing',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Vorige waarde',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'Vorige waarde van het attribuut',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'New value',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'Nieuwe waarde van het attribuut',
-));
-// Used by CMDBChangeOp... & derived classes
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Change:ObjectCreated' => 'Object aangemaakt',
-	'Change:ObjectDeleted' => 'Object verwijderd',
-	'Change:ObjectModified' => 'Object aangepast',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s veranderd naar %2$s (vorige waarde: %3$s)',
-	'Change:AttName_SetTo' => '%1$s veranderd naar %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s toegevoegd aan %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s aangepast, vorige waarde: %2$s',
-	'Change:AttName_Changed' => '%1$s aangepast',
-	'Change:AttName_EntryAdded' => '%1$s aangepast, nieuwe entry toegevoegd: %2$s',
-	'Change:LinkSet:Added' => 'toegevoegd %1$s',
-	'Change:LinkSet:Removed' => 'verwijderd %1$s',
-	'Change:LinkSet:Modified' => 'aangepast %1$s',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeBlob
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => 'dataverandering',
-	'Class:CMDBChangeOpSetAttributeBlob+' => 'volgen dataverandering',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Vorige data',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'eerdere inhoud van het attribuut',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeText
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:CMDBChangeOpSetAttributeText' => 'tekstverandering',
-	'Class:CMDBChangeOpSetAttributeText+' => 'volgen tekstverandering',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Vorige data',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'eerdere inhoud van het attribuut',
-));
-
-//
-// Class: Event
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Event' => 'Log Event',
-	'Class:Event+' => 'Een intern event van de applicatie',
-	'Class:Event/Attribute:message' => 'Bericht',
-	'Class:Event/Attribute:message+' => 'Korte beschrijving van het event',
-	'Class:Event/Attribute:date' => 'Datum',
-	'Class:Event/Attribute:date+' => 'Datum en tijdstip waarop de veranderingen zijn vastgelegd',
-	'Class:Event/Attribute:userinfo' => 'Gebruikersinfo',
-	'Class:Event/Attribute:userinfo+' => 'Identificatie van de gebruiker die de actie uitvoerde die het event triggerde',
-	'Class:Event/Attribute:finalclass' => 'Type',
-	'Class:Event/Attribute:finalclass+' => '',
-));
-
-//
-// Class: EventNotification
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:EventNotification' => 'Notificatie van het event',
-	'Class:EventNotification+' => 'Spoor van de notificatie die is verstuurd',
-	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
-	'Class:EventNotification/Attribute:trigger_id+' => 'gebruikersaccount',
-	'Class:EventNotification/Attribute:action_id' => 'gebruiker',
-	'Class:EventNotification/Attribute:action_id+' => 'gebruikersaccount',
-	'Class:EventNotification/Attribute:object_id' => 'Object id',
-	'Class:EventNotification/Attribute:object_id+' => 'object id (klasse gedefineerd door de trigger?)',
-));
-
-//
-// Class: EventNotificationEmail
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:EventNotificationEmail' => 'E-mail emission event',
-	'Class:EventNotificationEmail+' => 'Spoor van de e-mail die is verstuurd',
-	'Class:EventNotificationEmail/Attribute:to' => 'AAN',
-	'Class:EventNotificationEmail/Attribute:to+' => 'AAN',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:from' => 'Van',
-	'Class:EventNotificationEmail/Attribute:from+' => 'Afzender van het bericht',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Onderwerp',
-	'Class:EventNotificationEmail/Attribute:subject+' => 'Onderwerp',
-	'Class:EventNotificationEmail/Attribute:body' => 'Body',
-	'Class:EventNotificationEmail/Attribute:body+' => 'Body',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Bijlagen',
-	'Class:EventNotificationEmail/Attribute:attachments+' => '',
-));
-
-//
-// Class: EventIssue
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:EventIssue' => 'Probleem van het event',
-	'Class:EventIssue+' => 'Spoor van een probleem (waarschuwing, error, etc.)',
-	'Class:EventIssue/Attribute:issue' => 'Probleem',
-	'Class:EventIssue/Attribute:issue+' => 'Wat is er gebeurd',
-	'Class:EventIssue/Attribute:impact' => 'Impact',
-	'Class:EventIssue/Attribute:impact+' => 'Wat zijn de consequenties',
-	'Class:EventIssue/Attribute:page' => 'Pagina',
-	'Class:EventIssue/Attribute:page+' => 'HTTP entry point',
-	'Class:EventIssue/Attribute:arguments_post' => 'Posted arguments',
-	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
-	'Class:EventIssue/Attribute:arguments_get' => 'URL arguments',
-	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET arguments',
-	'Class:EventIssue/Attribute:callstack' => 'Callstack',
-	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
-	'Class:EventIssue/Attribute:data' => 'Data',
-	'Class:EventIssue/Attribute:data+' => 'Meer informatie',
-));
-
-//
-// Classes: EventWebService and EventRestService
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:EventWebService' => 'Web service event',
-	'Class:EventWebService+' => 'Spor van een web service call',
-	'Class:EventWebService/Attribute:verb' => 'Werkwoord',
-	'Class:EventWebService/Attribute:verb+' => 'Naam van de operatie',
-	'Class:EventWebService/Attribute:result' => 'Resultaat',
-	'Class:EventWebService/Attribute:result+' => 'Totaal succes/falen',
-	'Class:EventWebService/Attribute:log_info' => 'Infolog',
-	'Class:EventWebService/Attribute:log_info+' => 'Resultaat infolog',
-	'Class:EventWebService/Attribute:log_warning' => 'Waarschuwingslog',
-	'Class:EventWebService/Attribute:log_warning+' => 'Resultaat waarschuwingslog',
-	'Class:EventWebService/Attribute:log_error' => 'Errorlog',
-	'Class:EventWebService/Attribute:log_error+' => 'Resultaat errorlog',
-	'Class:EventWebService/Attribute:data' => 'Data',
-	'Class:EventWebService/Attribute:data+' => 'Result data',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-));
-
-//
-// Class: EventLoginUsage
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:EventLoginUsage' => 'Login Gebruik',
-	'Class:EventLoginUsage+' => 'Verbinding met de applicatie',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
-	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'Gebruikersnaam',
-	'Class:EventLoginUsage/Attribute:contact_name+' => 'Gebruikersnaam',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'E-mail van de gebruiker',
-	'Class:EventLoginUsage/Attribute:contact_email+' => 'E-mailadres van de gebruiker',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Action' => 'Custom Actie',
-	'Class:Action+' => 'Gebruiker defineerd actie',
-	'Class:Action/Attribute:name' => 'Naam',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Beschrijving',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Status',
-	'Class:Action/Attribute:status+' => 'In productie of ?',
-	'Class:Action/Attribute:status/Value:test' => 'Wordt getest',
-	'Class:Action/Attribute:status/Value:test+' => 'Wordt getest',
-	'Class:Action/Attribute:status/Value:enabled' => 'In productie',
-	'Class:Action/Attribute:status/Value:enabled+' => 'In productie',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inactief',
-	'Class:Action/Attribute:status/Value:disabled+' => 'Inactief',
-	'Class:Action/Attribute:trigger_list' => 'Gerelateerde Triggers',
-	'Class:Action/Attribute:trigger_list+' => 'Triggers gelinkt aan deze actie',
-	'Class:Action/Attribute:finalclass' => 'Type',
-	'Class:Action/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ActionNotification
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ActionNotification' => 'Notificatie',
-	'Class:ActionNotification+' => 'Notificatie (abstract)',
-));
-
-//
-// Class: ActionEmail
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:ActionEmail' => 'E-mail notificatie',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Testontvanger',
-	'Class:ActionEmail/Attribute:test_recipient+' => 'Bestemming, in het geval dat de status op "Test" is gezet',
-	'Class:ActionEmail/Attribute:from' => 'Van',
-	'Class:ActionEmail/Attribute:from+' => 'Zal naar het e-mail kopje gestuurd worden',
-	'Class:ActionEmail/Attribute:reply_to' => 'Antwoord',
-	'Class:ActionEmail/Attribute:reply_to+' => 'Zal naar het e-mail kopje gestuurd worden',
-	'Class:ActionEmail/Attribute:to' => 'Naar',
-	'Class:ActionEmail/Attribute:to+' => 'Bestemming van de e-mail',
-	'Class:ActionEmail/Attribute:cc' => 'Cc',
-	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
-	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
-	'Class:ActionEmail/Attribute:subject' => 'onderwerp',
-	'Class:ActionEmail/Attribute:subject+' => 'Titel van de e-mail',
-	'Class:ActionEmail/Attribute:body' => 'body',
-	'Class:ActionEmail/Attribute:body+' => 'Inhoud van de e-mail',
-	'Class:ActionEmail/Attribute:importance' => 'Prioriteit',
-	'Class:ActionEmail/Attribute:importance+' => 'Prioriteitsvlag',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'laag',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => 'laag',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normaal',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normaal',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'hoog',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => 'hoog',
-));
-
-//
-// Class: Trigger
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Trigger' => 'Trigger',
-	'Class:Trigger+' => 'Custom event handler',
-	'Class:Trigger/Attribute:description' => 'Beschrijving',
-	'Class:Trigger/Attribute:description+' => 'Beschrijving in één regel',
-	'Class:Trigger/Attribute:action_list' => 'Getriggerde acties',
-	'Class:Trigger/Attribute:action_list+' => 'Acties uitgevoerd nadat de trigger is geactiveerd',
-	'Class:Trigger/Attribute:finalclass' => 'Type',
-	'Class:Trigger/Attribute:finalclass+' => '',
-));
-
-//
-// Class: TriggerOnObject
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnObject' => 'Trigger (afhankelijk van klasse)',
-	'Class:TriggerOnObject+' => 'Trigger op een bepaald klasse van objecten',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Targetklasse',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter',
-	'Class:TriggerOnObject/Attribute:filter+' => '',
-	'TriggerOnObject:WrongFilterQuery' => 'Verkeerde filter query: %1$s',
-	'TriggerOnObject:WrongFilterClass' => 'De filter query moet verwijzen naar objecten van klasse "%1$s"',
-));
-
-//
-// Class: TriggerOnPortalUpdate
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnPortalUpdate' => 'Trigger (wanneer geüpdatet vanuit het portaal)',
-	'Class:TriggerOnPortalUpdate+' => 'Trigger op de update van de eindgebruiker van het portaal',
-));
-
-//
-// Class: TriggerOnStateChange
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnStateChange' => 'Trigger (on state change)',
-	'Class:TriggerOnStateChange+' => 'Trigger on object state change',
-	'Class:TriggerOnStateChange/Attribute:state' => 'State',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-));
-
-//
-// Class: TriggerOnStateEnter
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnStateEnter' => 'Trigger (bij het binnenkomen in een state)',
-	'Class:TriggerOnStateEnter+' => 'Trigger bij de verandering van de state van het object - binnenkomend',
-));
-
-//
-// Class: TriggerOnStateLeave
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnStateLeave' => 'Trigger (bij het verlaten van een state)',
-	'Class:TriggerOnStateLeave+' => 'Trigger bij verandering van de state van het object - verlatend',
-));
-
-//
-// Class: TriggerOnObjectCreate
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnObjectCreate' => 'Trigger (bij de aanmaak van een object)',
-	'Class:TriggerOnObjectCreate+' => 'Trigger bij de aanmaak van een object van [de child klasse van] de bepaalde klasse',
-));
-
-//
-// Class: TriggerOnThresholdReached
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:TriggerOnThresholdReached' => 'Trigger (op threshold)',
-	'Class:TriggerOnThresholdReached+' => 'Trigger op Stop-Watch threshold bereikt',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
-));
-
-//
-// Class: lnkTriggerAction
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:lnkTriggerAction' => 'Actie/Trigger',
-	'Class:lnkTriggerAction+' => 'Link tussen een trigger en een actie',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Actie',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'De actie die moet worden uitgevoerd',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Actie',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Volgorde',
-	'Class:lnkTriggerAction/Attribute:order+' => 'De volgorde in het uitvoeren van de actie',
-));
-
-//
-// Synchro Data Source
-//
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:SynchroDataSource/Attribute:name' => 'Naam',
-	'Class:SynchroDataSource/Attribute:name+' => 'Naam',
-	'Class:SynchroDataSource/Attribute:description' => 'Beschrijving',
-	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Target klasse',
-	'Class:SynchroDataSource/Attribute:user_id' => 'Gebruiker',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact dat moet worden genotificeerd',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact dat moet worden genotificeerd in het geval van een error',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Hyperlink van de Icoon',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink een (kleine) afbeelding die de applicatie waarmee iTop is gesynchroniseerd',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Hyperlink van de applicatie',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink naar het iTop object in de externe applicatie waarmee iTop is gesynchroniseerd (indien toepasbaar). Mogelijke procurators: $this->attribute$ and $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy', //TODO enum values
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Het volledige herladen van alle data moet tenminste zo vaak gebeuren als hier staat gespecificeerd',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Actie op nul',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Actie die wordt ondernomen wanneer de zoekopdracht geen object geeft',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Actie op één',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action die wordt ondernomen wanneer de zoekopdracht precies één object geeft',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Actie op meerdere',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Actie die wordt ondernomen wanneer de zoekopdracht meerdere objecten geeft',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Gebruikers toegestaan',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Wie is geautoriseerd om gesynchroniseerde objecten te verwijderen',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Gebruikers toegestaan',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Niemand',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Alleen administrators',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Alle geautoriseerde gebruikers',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Updateregels',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retentietijd',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Hoe lang een overbodig object wordt bewaard voordat deze wordt verwijderd',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Datatabel',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Naam van de tabel waarin de gesynchroniseerde data wordt opgeslagen. Wanneer deze wordt leeggelaten zal een standaard naam worden opgegeven.',
-	'SynchroDataSource:Description' => 'Beschrijving',
-	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
-	'SynchroDataSource:Deletion' => 'Regels voor het verwijderen',
-	'SynchroDataSource:Status' => 'Status',
-	'SynchroDataSource:Information' => 'Informatie',
-	'SynchroDataSource:Definition' => 'Definitie',
-	'Core:SynchroAttributes' => 'Attributen',
-	'Core:SynchroStatus' => 'Status',
-	'Core:Synchro:ErrorsLabel' => 'Errors',	
-	'Core:Synchro:CreatedLabel' => 'Aangemaakt',
-	'Core:Synchro:ModifiedLabel' => 'Aangepast',
-	'Core:Synchro:UnchangedLabel' => 'Niet veranderd',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Errors',
-	'Core:Synchro:ReconciledLabel' => 'Reconciled',
-	'Core:Synchro:ReconciledNewLabel' => 'Aangemaakt',
-	'Core:SynchroReconcile:Yes' => 'Ja',
-	'Core:SynchroReconcile:No' => 'Nee',
-	'Core:SynchroUpdate:Yes' => 'Ja',
-	'Core:SynchroUpdate:No' => 'Nee',
-	'Core:Synchro:LastestStatus' => 'Laatste Status',
-	'Core:Synchro:History' => 'Synchronisatiegeschiedenis',
-	'Core:Synchro:NeverRun' => 'Deze synchro is nog niet gedaan. Er is nog geen log.',
-	'Core:Synchro:SynchroEndedOn_Date' => 'De laatste synchronisatie eindigde op %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'De synchronisatie is gestart op %1$s en is nog bezig...',
-	'Menu:DataSources' => 'Synchronisatie Data Sources',
-	'Menu:DataSources+' => 'Alle gesynchroniseerde Data Sources',
-	'Core:Synchro:label_repl_ignored' => 'Genegeerd (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Verdwenen (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Bestaand (%1$s)',
-	'Core:Synchro:label_repl_new' => 'Nieuw (%1$s)',
-	'Core:Synchro:label_obj_deleted' => 'Verwijderd (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Overbodig (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'Geen actie (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Onveranderd (%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Geüpdatet (%1$s)', 
-	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Onveranderd (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Geüpdatet (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Aangemaakt (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)',
-	'Core:Synchro:History' => 'Synchronizatiegeschiedenis',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica verwerkt: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Tenminste één reconciliation key moet worden gespecificeerd, of de reconciliation policy moet zijn dat de primary key wordt gebruikt.',			
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Een retention period voor het verwijderen moet worden gespecificeerd, omdat alle objecten verwijderd worden nadat ze gemarkeerd zijn als overbodig',			
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Overbodige objecten moeten worden geüpdatet, maar er is geen update gespecificeerd.',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'De tabel %1$s bestaat al in de database. Gebruik alstublieft een andere naam voor deze synchro datatabel.',
-	'Core:SynchroReplica:PublicData' => 'Publieke Data',
-	'Core:SynchroReplica:PrivateDetails' => 'Privé Details',
-	'Core:SynchroReplica:BackToDataSource' => 'Ga terug naar de Synchro Data Source: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'Lijst van Replica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
-	'Core:SynchroAtt:attcode' => 'Attribuut',
-	'Core:SynchroAtt:attcode+' => 'Veld van het object',
-	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?',
-	'Core:SynchroAtt:reconciliation+' => 'Gebruikt voor het zoeken',
-	'Core:SynchroAtt:update' => 'Update ?',
-	'Core:SynchroAtt:update+' => 'Gebruikt om het object te updaten',
-	'Core:SynchroAtt:update_policy' => 'Update Policy',
-	'Core:SynchroAtt:update_policy+' => 'Gedrag van het geüpdatete veld',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribuutcode voor de Reconciliation van de externe key',
-	'Core:SyncDataExchangeComment' => '(Data Synchro)',
-	'Core:Synchro:ListOfDataSources' => 'Lijst van data sources:',
-	'Core:Synchro:LastSynchro' => 'Laatste synchronisatie:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'Dit object is gesynchroniseerd met een externe data source',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Dit object is <b>aangemaakt</b> door een externe data source %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Dit object <b>kan worden verwijderd</b> door de externe data source %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'U <b>kunt dit object niet verwijderen</b> omdat het eigendom is van de externe data source %1$s',
-	'TitleSynchroExecution' => 'Uitvoering van de synchronisatie',
-	'Class:SynchroDataSource:DataTable' => 'Database tabel: %1$s',
-	'Core:SyncDataSourceObsolete' => 'De data source is gemarkeerd als overbodig. Operatie afgebroken.',
-	'Core:SyncDataSourceAccessRestriction' => 'Alleen administrators of de gebruiker gespecificeerd in de data source kan deze operatie uitvoeren. Operatie afgebroken.',
-	'Core:SyncTooManyMissingReplicas' => 'Alle records zijn een tijd niet gebruikt (alle objecten kunnen worden verwijderd). Controleer alstublieft of het proces dat in de synchronisatie tabel schrijft nog steeds bezig is. Operatie afgebroken.',
-	'Core:SyncSplitModeCLIOnly' => 'De synchronisatie kan alleen in delen uit worden gevoerd als deze wordt uitgevoerd in mode CLI',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
-	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
-	'Class:AsyncSendEmail' => 'E-mail (niet synchroon)',
-	'Class:AsyncSendEmail/Attribute:to' => 'Aan',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Onderwerp',
-	'Class:AsyncSendEmail/Attribute:body' => 'Body',
-	'Class:AsyncSendEmail/Attribute:header' => 'Kopje',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Gecodeerd wachtwoord',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Vorige waarde',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Gecodeerd veld',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Vorige waarde',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Laaste Entry',
-	'Class:SynchroDataSource' => 'Synchro Data Source',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementatie',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Overbodig',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Productie',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restrictie',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Gebruik de attributen',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Gebruik het veld van de primary_key',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Maak aan',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Maak aan',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Neem de eerste (random?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Verwijder Policy',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Verwijder',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Negeer',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lijst van attributen',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Alleen administrators',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Iedereen mag deze objecten verwijderen',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Niemand',
-	'Class:SynchroAttribute' => 'Synchro Attribute',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Attribuutcode',
-	'Class:SynchroAttribute/Attribute:update' => 'Update',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Gesloten',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Open',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Begin indien leeg',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Klasse',
-	'Class:SynchroAttExtKey' => 'Synchro Attribuut (ExtKey)',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribuut',
-	'Class:SynchroAttLinkSet' => 'Synchro Attribuut (Linkset)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator',
-	'Class:SynchroLog' => 'Synchr Log',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source',
-	'Class:SynchroLog/Attribute:start_date' => 'Begindatum',
-	'Class:SynchroLog/Attribute:end_date' => 'Einddatum',
-	'Class:SynchroLog/Attribute:status' => 'Status',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Compleet',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Error',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Nog bezig',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Aantal replicas gezien',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Totaal aantal replicas',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Aantal objecten verwijderd',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Aantal errors tijdens het verwijderen',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Aantal  objecten overbodig gemaakt',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Aantal errors tijdens het overbodig maken',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Aantal objecten aangemaakt',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Aantal errors tijdens het aanmaken',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Aantal objecten geüpdatet',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Aantal errors tijden het updaten',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Aantal errors tijdens de reconciliation',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Aantal replicas verdwenen',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Aantal objecten geüpdatet',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Aantal onveranderde objecten',
-	'Class:SynchroLog/Attribute:last_error' => 'Laaste error',
-	'Class:SynchroLog/Attribute:traces' => 'Sporen',
-	'Class:SynchroReplica' => 'Synchro Replica',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Bestemming van het object (ID)',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Type bestemming',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Laatst gezien',
-	'Class:SynchroReplica/Attribute:status' => 'Status',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Aangepast',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nieuw',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Overbodig',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Gesynchroniseerd',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object aangemaakt?',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Laatste Error',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Waarschuwingen',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Datum van aanmaken',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Datum van de laatste aanpassing',
-	'Class:appUserPreferences' => 'Gebruikersvoorkeuren',
-	'Class:appUserPreferences/Attribute:userid' => 'Gebruiker',
-	'Class:appUserPreferences/Attribute:preferences' => 'Voorkeuren',
-	'Core:ExecProcess:Code1' => 'Verkeerde command of command beëindigd met errors (bijvoorbeeld verkeerde scriptnaam)',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, of runtime)',
-));
-
-//
-// Attribute Duration
-//
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Core:Duration_Seconds'	=> '%1$ds',	
-	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Core:DeletedObjectLabel' => '%1s (verwijderd)',
+	'Core:DeletedObjectTip' => 'Het object is verwijderd op %1$s (%2$s)',
+
+	'Core:UnknownObjectLabel' => 'Object niet gevonden (klasse: %1$s, id: %2$d)',
+	'Core:UnknownObjectTip' => 'Object kon niet worden gevonden. Het zou eerder verwijderd kunnen zijn en de log zou kunnen zijn opgeschoond.',
+
+	'Core:AttributeLinkedSet' => 'Reeks van objecten',
+	'Core:AttributeLinkedSet+' => 'Elke soort objecten van dezelfde klasse of subklasse',
+
+	'Core:AttributeLinkedSetIndirect' => 'Reeks van objecten (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => 'Elke soort objecten [subklasse] van dezelfde klasse',
+
+	'Core:AttributeInteger' => 'Integer',
+	'Core:AttributeInteger+' => 'Numerieke waarde (kan negatief zijn)',
+
+	'Core:AttributeDecimal' => 'Decimaal',
+	'Core:AttributeDecimal+' => 'Decimale waarde (kan negatief zijn)',
+
+	'Core:AttributeBoolean' => 'Boolean',
+	'Core:AttributeBoolean+' => 'Boolean',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+
+	'Core:AttributeString' => 'String',
+	'Core:AttributeString+' => 'Alphanumerieke string',
+
+	'Core:AttributeClass' => 'Klasse',
+	'Core:AttributeClass+' => 'Klasse',
+
+	'Core:AttributeApplicationLanguage' => 'Taal van de gebruiker',
+	'Core:AttributeApplicationLanguage+' => 'Taal en land (EN US)',
+
+	'Core:AttributeFinalClass' => 'Klasse (auto)',
+	'Core:AttributeFinalClass+' => 'Echte klasse van het object (automatisch aangemaakt bij de kern)',
+
+	'Core:AttributePassword' => 'Wachtwoord',
+	'Core:AttributePassword+' => 'Wachtwoord van een extern apparaat',
+
+ 	'Core:AttributeEncryptedString' => 'Gecodeerde string',
+	'Core:AttributeEncryptedString+' => 'String gecodeerd met een locale key',
+
+	'Core:AttributeText' => 'Text',
+	'Core:AttributeText+' => 'Multiline character string',
+
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'HTML string',
+
+	'Core:AttributeEmailAddress' => 'E-mailadres',
+	'Core:AttributeEmailAddress+' => 'E-mailadres',
+
+	'Core:AttributeIPAddress' => 'IP adres',
+	'Core:AttributeIPAddress+' => 'IP adres',
+
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => 'Object Query Langage expression',
+
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => 'Lijst van voorgedefineerde alphanumerieke strings',
+
+	'Core:AttributeTemplateString' => 'Template string',
+	'Core:AttributeTemplateString+' => 'String die de procurators bevat',
+
+	'Core:AttributeTemplateText' => 'Template text',
+	'Core:AttributeTemplateText+' => 'Text die de procurators bevat',
+
+	'Core:AttributeTemplateHTML' => 'Template HTML',
+	'Core:AttributeTemplateHTML+' => 'HTML die de procurators bevat',
+
+	'Core:AttributeDateTime' => 'Datum/tijd',
+	'Core:AttributeDateTime+' => 'Datum en tijd (jaar-maand-dag hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>',
+
+	'Core:AttributeDate' => 'Date',
+	'Core:AttributeDate+' => 'Date (year-month-day)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>',
+
+	'Core:AttributeDeadline' => 'Deadline',
+	'Core:AttributeDeadline+' => 'Datum, relatief weergegeven ten opzichte van het huidige tijdstip',
+
+	'Core:AttributeExternalKey' => 'Externe key',
+	'Core:AttributeExternalKey+' => 'Externe (of buitenlandse) key',
+
+	'Core:AttributeHierarchicalKey' => 'Hierarchische Key',
+	'Core:AttributeHierarchicalKey+' => 'Externe (of buitenlandse) key tot de parent',
+
+	'Core:AttributeExternalField' => 'Extern veld',
+	'Core:AttributeExternalField+' => 'Veld mapped tot een externe key',
+
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => '
+Absolute of relatieve URL als een text string',
+
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => 'Alle binaire inhoud (document)',
+
+	'Core:AttributeOneWayPassword' => 'One way wachtwoord',
+	'Core:AttributeOneWayPassword+' => 'One way gecodeerd (hashed) wachtwoord',
+
+	'Core:AttributeTable' => 'Tabel',
+	'Core:AttributeTable+' => 'Geïndexeerde reeks met twee dimensies',
+
+	'Core:AttributePropertySet' => 'Eigenschappen',
+	'Core:AttributePropertySet+' => 'Lijst van ongeschreven eigenschappen (naam en waarde)',
+
+	'Core:AttributeFriendlyName' => 'Friendly name',
+	'Core:AttributeFriendlyName+' => 'Automatisch aangemaakt attribuut; de friendly name is na verscheidene attributen verwerkt',
+
+	'Core:FriendlyName-Label' => 'Referentie',
+	'Core:FriendlyName-Description' => 'Referentie',
+));
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChange' => 'Aanpassing',
+	'Class:CMDBChange+' => 'Volgen van aanpassingen',
+	'Class:CMDBChange/Attribute:date' => 'datum',
+	'Class:CMDBChange/Attribute:date+' => 'De datum en tijd waarop de aanpassingen zijn waargenomen ',
+	'Class:CMDBChange/Attribute:userinfo' => 'misc. info',
+	'Class:CMDBChange/Attribute:userinfo+' => 'gedefineerde info van de gebruiker',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOp' => 'Pas de operatie aan',
+	'Class:CMDBChangeOp+' => 'Pas het volgen van de operatie aan',
+	'Class:CMDBChangeOp/Attribute:change' => 'Pas aan',
+	'Class:CMDBChangeOp/Attribute:change+' => 'Pas aan',
+	'Class:CMDBChangeOp/Attribute:date' => 'datum',
+	'Class:CMDBChangeOp/Attribute:date+' => 'datum en tijd van de aanpassing',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'gebruiker',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'wie heeft deze aanpassing doorgevoerd',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'objectklasse',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'objectklasse',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'object id',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'object id',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'type',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOpCreate' => 'objectcreatie',
+	'Class:CMDBChangeOpCreate+' => 'Objectcreatie volgen',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOpDelete' => 'verwijderen object',
+	'Class:CMDBChangeOpDelete+' => 'volgen van het verwijderen van objecten',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOpSetAttribute' => 'aanpassing van het object',
+	'Class:CMDBChangeOpSetAttribute+' => 'volgen van de aanpassing van de objecteigenschappen',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Attribuut',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'code van de aangepaste eigenschap',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Aanpassing van de eigenschap',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Volgen van de object scalar eigenschappen aanpassing',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Vorige waarde',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'Vorige waarde van het attribuut',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'New value',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'Nieuwe waarde van het attribuut',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Change:ObjectCreated' => 'Object aangemaakt',
+	'Change:ObjectDeleted' => 'Object verwijderd',
+	'Change:ObjectModified' => 'Object aangepast',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s veranderd naar %2$s (vorige waarde: %3$s)',
+	'Change:AttName_SetTo' => '%1$s veranderd naar %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s toegevoegd aan %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s aangepast, vorige waarde: %2$s',
+	'Change:AttName_Changed' => '%1$s aangepast',
+	'Change:AttName_EntryAdded' => '%1$s aangepast, nieuwe entry toegevoegd: %2$s',
+	'Change:LinkSet:Added' => 'toegevoegd %1$s',
+	'Change:LinkSet:Removed' => 'verwijderd %1$s',
+	'Change:LinkSet:Modified' => 'aangepast %1$s',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => 'dataverandering',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'volgen dataverandering',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Vorige data',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'eerdere inhoud van het attribuut',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:CMDBChangeOpSetAttributeText' => 'tekstverandering',
+	'Class:CMDBChangeOpSetAttributeText+' => 'volgen tekstverandering',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Vorige data',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'eerdere inhoud van het attribuut',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Event' => 'Log Event',
+	'Class:Event+' => 'Een intern event van de applicatie',
+	'Class:Event/Attribute:message' => 'Bericht',
+	'Class:Event/Attribute:message+' => 'Korte beschrijving van het event',
+	'Class:Event/Attribute:date' => 'Datum',
+	'Class:Event/Attribute:date+' => 'Datum en tijdstip waarop de veranderingen zijn vastgelegd',
+	'Class:Event/Attribute:userinfo' => 'Gebruikersinfo',
+	'Class:Event/Attribute:userinfo+' => 'Identificatie van de gebruiker die de actie uitvoerde die het event triggerde',
+	'Class:Event/Attribute:finalclass' => 'Type',
+	'Class:Event/Attribute:finalclass+' => '',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:EventNotification' => 'Notificatie van het event',
+	'Class:EventNotification+' => 'Spoor van de notificatie die is verstuurd',
+	'Class:EventNotification/Attribute:trigger_id' => 'Trigger',
+	'Class:EventNotification/Attribute:trigger_id+' => 'gebruikersaccount',
+	'Class:EventNotification/Attribute:action_id' => 'gebruiker',
+	'Class:EventNotification/Attribute:action_id+' => 'gebruikersaccount',
+	'Class:EventNotification/Attribute:object_id' => 'Object id',
+	'Class:EventNotification/Attribute:object_id+' => 'object id (klasse gedefineerd door de trigger?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:EventNotificationEmail' => 'E-mail emission event',
+	'Class:EventNotificationEmail+' => 'Spoor van de e-mail die is verstuurd',
+	'Class:EventNotificationEmail/Attribute:to' => 'AAN',
+	'Class:EventNotificationEmail/Attribute:to+' => 'AAN',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:from' => 'Van',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Afzender van het bericht',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Onderwerp',
+	'Class:EventNotificationEmail/Attribute:subject+' => 'Onderwerp',
+	'Class:EventNotificationEmail/Attribute:body' => 'Body',
+	'Class:EventNotificationEmail/Attribute:body+' => 'Body',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Bijlagen',
+	'Class:EventNotificationEmail/Attribute:attachments+' => '',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:EventIssue' => 'Probleem van het event',
+	'Class:EventIssue+' => 'Spoor van een probleem (waarschuwing, error, etc.)',
+	'Class:EventIssue/Attribute:issue' => 'Probleem',
+	'Class:EventIssue/Attribute:issue+' => 'Wat is er gebeurd',
+	'Class:EventIssue/Attribute:impact' => 'Impact',
+	'Class:EventIssue/Attribute:impact+' => 'Wat zijn de consequenties',
+	'Class:EventIssue/Attribute:page' => 'Pagina',
+	'Class:EventIssue/Attribute:page+' => 'HTTP entry point',
+	'Class:EventIssue/Attribute:arguments_post' => 'Posted arguments',
+	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL arguments',
+	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET arguments',
+	'Class:EventIssue/Attribute:callstack' => 'Callstack',
+	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
+	'Class:EventIssue/Attribute:data' => 'Data',
+	'Class:EventIssue/Attribute:data+' => 'Meer informatie',
+));
+
+//
+// Classes: EventWebService and EventRestService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:EventWebService' => 'Web service event',
+	'Class:EventWebService+' => 'Spor van een web service call',
+	'Class:EventWebService/Attribute:verb' => 'Werkwoord',
+	'Class:EventWebService/Attribute:verb+' => 'Naam van de operatie',
+	'Class:EventWebService/Attribute:result' => 'Resultaat',
+	'Class:EventWebService/Attribute:result+' => 'Totaal succes/falen',
+	'Class:EventWebService/Attribute:log_info' => 'Infolog',
+	'Class:EventWebService/Attribute:log_info+' => 'Resultaat infolog',
+	'Class:EventWebService/Attribute:log_warning' => 'Waarschuwingslog',
+	'Class:EventWebService/Attribute:log_warning+' => 'Resultaat waarschuwingslog',
+	'Class:EventWebService/Attribute:log_error' => 'Errorlog',
+	'Class:EventWebService/Attribute:log_error+' => 'Resultaat errorlog',
+	'Class:EventWebService/Attribute:data' => 'Data',
+	'Class:EventWebService/Attribute:data+' => 'Result data',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+));
+
+//
+// Class: EventLoginUsage
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:EventLoginUsage' => 'Login Gebruik',
+	'Class:EventLoginUsage+' => 'Verbinding met de applicatie',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Gebruikersnaam',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'Gebruikersnaam',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'E-mail van de gebruiker',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'E-mailadres van de gebruiker',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Action' => 'Custom Actie',
+	'Class:Action+' => 'Gebruiker defineerd actie',
+	'Class:Action/Attribute:name' => 'Naam',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Beschrijving',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Status',
+	'Class:Action/Attribute:status+' => 'In productie of ?',
+	'Class:Action/Attribute:status/Value:test' => 'Wordt getest',
+	'Class:Action/Attribute:status/Value:test+' => 'Wordt getest',
+	'Class:Action/Attribute:status/Value:enabled' => 'In productie',
+	'Class:Action/Attribute:status/Value:enabled+' => 'In productie',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inactief',
+	'Class:Action/Attribute:status/Value:disabled+' => 'Inactief',
+	'Class:Action/Attribute:trigger_list' => 'Gerelateerde Triggers',
+	'Class:Action/Attribute:trigger_list+' => 'Triggers gelinkt aan deze actie',
+	'Class:Action/Attribute:finalclass' => 'Type',
+	'Class:Action/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ActionNotification' => 'Notificatie',
+	'Class:ActionNotification+' => 'Notificatie (abstract)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:ActionEmail' => 'E-mail notificatie',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Testontvanger',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Bestemming, in het geval dat de status op "Test" is gezet',
+	'Class:ActionEmail/Attribute:from' => 'Van',
+	'Class:ActionEmail/Attribute:from+' => 'Zal naar het e-mail kopje gestuurd worden',
+	'Class:ActionEmail/Attribute:reply_to' => 'Antwoord',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Zal naar het e-mail kopje gestuurd worden',
+	'Class:ActionEmail/Attribute:to' => 'Naar',
+	'Class:ActionEmail/Attribute:to+' => 'Bestemming van de e-mail',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
+	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
+	'Class:ActionEmail/Attribute:subject' => 'onderwerp',
+	'Class:ActionEmail/Attribute:subject+' => 'Titel van de e-mail',
+	'Class:ActionEmail/Attribute:body' => 'body',
+	'Class:ActionEmail/Attribute:body+' => 'Inhoud van de e-mail',
+	'Class:ActionEmail/Attribute:importance' => 'Prioriteit',
+	'Class:ActionEmail/Attribute:importance+' => 'Prioriteitsvlag',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'laag',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => 'laag',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normaal',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normaal',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'hoog',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => 'hoog',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Trigger' => 'Trigger',
+	'Class:Trigger+' => 'Custom event handler',
+	'Class:Trigger/Attribute:description' => 'Beschrijving',
+	'Class:Trigger/Attribute:description+' => 'Beschrijving in één regel',
+	'Class:Trigger/Attribute:action_list' => 'Getriggerde acties',
+	'Class:Trigger/Attribute:action_list+' => 'Acties uitgevoerd nadat de trigger is geactiveerd',
+	'Class:Trigger/Attribute:finalclass' => 'Type',
+	'Class:Trigger/Attribute:finalclass+' => '',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnObject' => 'Trigger (afhankelijk van klasse)',
+	'Class:TriggerOnObject+' => 'Trigger op een bepaald klasse van objecten',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Targetklasse',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter',
+	'Class:TriggerOnObject/Attribute:filter+' => '',
+	'TriggerOnObject:WrongFilterQuery' => 'Verkeerde filter query: %1$s',
+	'TriggerOnObject:WrongFilterClass' => 'De filter query moet verwijzen naar objecten van klasse "%1$s"',
+));
+
+//
+// Class: TriggerOnPortalUpdate
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnPortalUpdate' => 'Trigger (wanneer geüpdatet vanuit het portaal)',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger op de update van de eindgebruiker van het portaal',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnStateChange' => 'Trigger (on state change)',
+	'Class:TriggerOnStateChange+' => 'Trigger on object state change',
+	'Class:TriggerOnStateChange/Attribute:state' => 'State',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnStateEnter' => 'Trigger (bij het binnenkomen in een state)',
+	'Class:TriggerOnStateEnter+' => 'Trigger bij de verandering van de state van het object - binnenkomend',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnStateLeave' => 'Trigger (bij het verlaten van een state)',
+	'Class:TriggerOnStateLeave+' => 'Trigger bij verandering van de state van het object - verlatend',
+));
+
+//
+// Class: TriggerOnObjectCreate
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnObjectCreate' => 'Trigger (bij de aanmaak van een object)',
+	'Class:TriggerOnObjectCreate+' => 'Trigger bij de aanmaak van een object van [de child klasse van] de bepaalde klasse',
+));
+
+//
+// Class: TriggerOnThresholdReached
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:TriggerOnThresholdReached' => 'Trigger (op threshold)',
+	'Class:TriggerOnThresholdReached+' => 'Trigger op Stop-Watch threshold bereikt',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:lnkTriggerAction' => 'Actie/Trigger',
+	'Class:lnkTriggerAction+' => 'Link tussen een trigger en een actie',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Actie',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'De actie die moet worden uitgevoerd',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Actie',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Trigger',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Volgorde',
+	'Class:lnkTriggerAction/Attribute:order+' => 'De volgorde in het uitvoeren van de actie',
+));
+
+//
+// Synchro Data Source
+//
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:SynchroDataSource/Attribute:name' => 'Naam',
+	'Class:SynchroDataSource/Attribute:name+' => 'Naam',
+	'Class:SynchroDataSource/Attribute:description' => 'Beschrijving',
+	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target klasse',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Gebruiker',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact dat moet worden genotificeerd',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact dat moet worden genotificeerd in het geval van een error',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Hyperlink van de Icoon',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink een (kleine) afbeelding die de applicatie waarmee iTop is gesynchroniseerd',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Hyperlink van de applicatie',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink naar het iTop object in de externe applicatie waarmee iTop is gesynchroniseerd (indien toepasbaar). Mogelijke procurators: $this->attribute$ and $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy', //TODO enum values
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'Het volledige herladen van alle data moet tenminste zo vaak gebeuren als hier staat gespecificeerd',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Actie op nul',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Actie die wordt ondernomen wanneer de zoekopdracht geen object geeft',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Actie op één',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action die wordt ondernomen wanneer de zoekopdracht precies één object geeft',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Actie op meerdere',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Actie die wordt ondernomen wanneer de zoekopdracht meerdere objecten geeft',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Gebruikers toegestaan',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Wie is geautoriseerd om gesynchroniseerde objecten te verwijderen',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Gebruikers toegestaan',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Niemand',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Alleen administrators',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Alle geautoriseerde gebruikers',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Updateregels',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retentietijd',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Hoe lang een overbodig object wordt bewaard voordat deze wordt verwijderd',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Datatabel',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Naam van de tabel waarin de gesynchroniseerde data wordt opgeslagen. Wanneer deze wordt leeggelaten zal een standaard naam worden opgegeven.',
+	'SynchroDataSource:Description' => 'Beschrijving',
+	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation',
+	'SynchroDataSource:Deletion' => 'Regels voor het verwijderen',
+	'SynchroDataSource:Status' => 'Status',
+	'SynchroDataSource:Information' => 'Informatie',
+	'SynchroDataSource:Definition' => 'Definitie',
+	'Core:SynchroAttributes' => 'Attributen',
+	'Core:SynchroStatus' => 'Status',
+	'Core:Synchro:ErrorsLabel' => 'Errors',	
+	'Core:Synchro:CreatedLabel' => 'Aangemaakt',
+	'Core:Synchro:ModifiedLabel' => 'Aangepast',
+	'Core:Synchro:UnchangedLabel' => 'Niet veranderd',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errors',
+	'Core:Synchro:ReconciledLabel' => 'Reconciled',
+	'Core:Synchro:ReconciledNewLabel' => 'Aangemaakt',
+	'Core:SynchroReconcile:Yes' => 'Ja',
+	'Core:SynchroReconcile:No' => 'Nee',
+	'Core:SynchroUpdate:Yes' => 'Ja',
+	'Core:SynchroUpdate:No' => 'Nee',
+	'Core:Synchro:LastestStatus' => 'Laatste Status',
+	'Core:Synchro:History' => 'Synchronisatiegeschiedenis',
+	'Core:Synchro:NeverRun' => 'Deze synchro is nog niet gedaan. Er is nog geen log.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'De laatste synchronisatie eindigde op %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'De synchronisatie is gestart op %1$s en is nog bezig...',
+	'Menu:DataSources' => 'Synchronisatie Data Sources',
+	'Menu:DataSources+' => 'Alle gesynchroniseerde Data Sources',
+	'Core:Synchro:label_repl_ignored' => 'Genegeerd (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Verdwenen (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Bestaand (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Nieuw (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Verwijderd (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Overbodig (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Geen actie (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Onveranderd (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Geüpdatet (%1$s)', 
+	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Onveranderd (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Geüpdatet (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Aangemaakt (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)',
+	'Core:Synchro:History' => 'Synchronizatiegeschiedenis',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica verwerkt: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Tenminste één reconciliation key moet worden gespecificeerd, of de reconciliation policy moet zijn dat de primary key wordt gebruikt.',			
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Een retention period voor het verwijderen moet worden gespecificeerd, omdat alle objecten verwijderd worden nadat ze gemarkeerd zijn als overbodig',			
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Overbodige objecten moeten worden geüpdatet, maar er is geen update gespecificeerd.',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'De tabel %1$s bestaat al in de database. Gebruik alstublieft een andere naam voor deze synchro datatabel.',
+	'Core:SynchroReplica:PublicData' => 'Publieke Data',
+	'Core:SynchroReplica:PrivateDetails' => 'Privé Details',
+	'Core:SynchroReplica:BackToDataSource' => 'Ga terug naar de Synchro Data Source: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Lijst van Replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
+	'Core:SynchroAtt:attcode' => 'Attribuut',
+	'Core:SynchroAtt:attcode+' => 'Veld van het object',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?',
+	'Core:SynchroAtt:reconciliation+' => 'Gebruikt voor het zoeken',
+	'Core:SynchroAtt:update' => 'Update ?',
+	'Core:SynchroAtt:update+' => 'Gebruikt om het object te updaten',
+	'Core:SynchroAtt:update_policy' => 'Update Policy',
+	'Core:SynchroAtt:update_policy+' => 'Gedrag van het geüpdatete veld',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribuutcode voor de Reconciliation van de externe key',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)',
+	'Core:Synchro:ListOfDataSources' => 'Lijst van data sources:',
+	'Core:Synchro:LastSynchro' => 'Laatste synchronisatie:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Dit object is gesynchroniseerd met een externe data source',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'Dit object is <b>aangemaakt</b> door een externe data source %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'Dit object <b>kan worden verwijderd</b> door de externe data source %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'U <b>kunt dit object niet verwijderen</b> omdat het eigendom is van de externe data source %1$s',
+	'TitleSynchroExecution' => 'Uitvoering van de synchronisatie',
+	'Class:SynchroDataSource:DataTable' => 'Database tabel: %1$s',
+	'Core:SyncDataSourceObsolete' => 'De data source is gemarkeerd als overbodig. Operatie afgebroken.',
+	'Core:SyncDataSourceAccessRestriction' => 'Alleen administrators of de gebruiker gespecificeerd in de data source kan deze operatie uitvoeren. Operatie afgebroken.',
+	'Core:SyncTooManyMissingReplicas' => 'Alle records zijn een tijd niet gebruikt (alle objecten kunnen worden verwijderd). Controleer alstublieft of het proces dat in de synchronisatie tabel schrijft nog steeds bezig is. Operatie afgebroken.',
+	'Core:SyncSplitModeCLIOnly' => 'De synchronisatie kan alleen in delen uit worden gevoerd als deze wordt uitgevoerd in mode CLI',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s',
+	'Class:AsyncSendEmail' => 'E-mail (niet synchroon)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Aan',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Onderwerp',
+	'Class:AsyncSendEmail/Attribute:body' => 'Body',
+	'Class:AsyncSendEmail/Attribute:header' => 'Kopje',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Gecodeerd wachtwoord',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Vorige waarde',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Gecodeerd veld',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Vorige waarde',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Laaste Entry',
+	'Class:SynchroDataSource' => 'Synchro Data Source',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementatie',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Overbodig',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Productie',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restrictie',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Gebruik de attributen',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Gebruik het veld van de primary_key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Maak aan',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Maak aan',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Neem de eerste (random?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Verwijder Policy',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Verwijder',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Negeer',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Lijst van attributen',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Alleen administrators',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Iedereen mag deze objecten verwijderen',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Niemand',
+	'Class:SynchroAttribute' => 'Synchro Attribute',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribuutcode',
+	'Class:SynchroAttribute/Attribute:update' => 'Update',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Gesloten',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Open',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Begin indien leeg',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Klasse',
+	'Class:SynchroAttExtKey' => 'Synchro Attribuut (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribuut',
+	'Class:SynchroAttLinkSet' => 'Synchro Attribuut (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator',
+	'Class:SynchroLog' => 'Synchr Log',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroLog/Attribute:start_date' => 'Begindatum',
+	'Class:SynchroLog/Attribute:end_date' => 'Einddatum',
+	'Class:SynchroLog/Attribute:status' => 'Status',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Compleet',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Error',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Nog bezig',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Aantal replicas gezien',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Totaal aantal replicas',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Aantal objecten verwijderd',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Aantal errors tijdens het verwijderen',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Aantal  objecten overbodig gemaakt',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Aantal errors tijdens het overbodig maken',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Aantal objecten aangemaakt',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Aantal errors tijdens het aanmaken',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Aantal objecten geüpdatet',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Aantal errors tijden het updaten',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Aantal errors tijdens de reconciliation',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Aantal replicas verdwenen',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Aantal objecten geüpdatet',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Aantal onveranderde objecten',
+	'Class:SynchroLog/Attribute:last_error' => 'Laaste error',
+	'Class:SynchroLog/Attribute:traces' => 'Sporen',
+	'Class:SynchroReplica' => 'Synchro Replica',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Bestemming van het object (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Type bestemming',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Laatst gezien',
+	'Class:SynchroReplica/Attribute:status' => 'Status',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Aangepast',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Nieuw',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Overbodig',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Gesynchroniseerd',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object aangemaakt?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Laatste Error',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Waarschuwingen',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Datum van aanmaken',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Datum van de laatste aanpassing',
+	'Class:appUserPreferences' => 'Gebruikersvoorkeuren',
+	'Class:appUserPreferences/Attribute:userid' => 'Gebruiker',
+	'Class:appUserPreferences/Attribute:preferences' => 'Voorkeuren',
+	'Core:ExecProcess:Code1' => 'Verkeerde command of command beëindigd met errors (bijvoorbeeld verkeerde scriptnaam)',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, of runtime)',
+));
+
+//
+// Attribute Duration
+//
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Core:Duration_Seconds'	=> '%1$ds',	
+	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php
index 3ecb2cb8f..8acb7611d 100644
--- a/dictionaries/nl.dictionary.itop.ui.php
+++ b/dictionaries/nl.dictionary.itop.ui.php
@@ -1,1317 +1,1317 @@
-<?php 
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * @author	LinProfs <info@linprofs.com>
- * 
- * Linux & Open Source Professionals
- * http://www.linprofs.com
- * 
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands' , array(
-	'Class:AuditCategory' => 'Audit Categorie',
-	'Class:AuditCategory+' => 'Een onderdeel van de gehele audit',
-	'Class:AuditCategory/Attribute:name' => 'Categorienaam',
-	'Class:AuditCategory/Attribute:name+' => 'Afkorting van de naam van deze categorie',
-	'Class:AuditCategory/Attribute:description' => 'Audit categorie beschrijving' ,
-	'Class:AuditCategory/Attribute:description+' => 'Uitgebreide beschrijving van deze Audit categorie' ,
-	'Class:AuditCategory/Attribute:definition_set' => 'Definitie Set',
-	'Class:AuditCategory/Attribute:definition_set+' => 'OQL expression die de set van objecten naar audit defineert',
-	'Class:AuditCategory/Attribute:rules_list' => 'Audit Regels',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Audit regels voor deze categorie',
-));
-
-//
-// Class: AuditRule
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:AuditRule' => 'Audit Regel',
-	'Class:AuditRule+' => 'Een regel voor het controleren van een bepaalde Audit categorie',
-	'Class:AuditRule/Attribute:name' => 'Naam van de regel',
-	'Class:AuditRule/Attribute:name+' => 'Afkorting van de regel',
-	'Class:AuditRule/Attribute:description' => 'Audit Regel beschrijving',
-	'Class:AuditRule/Attribute:description+' => 'Uitgebreide beschrijving van deze Audit regel',
-	'Class:AuditRule/Attribute:query' => 'Query om te runnen',
-	'Class:AuditRule/Attribute:query+' => 'De OQL expression voor het runnen',
-	'Class:AuditRule/Attribute:valid_flag' => 'Geldige objecten?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'True als de regel de geldige objecten teruggeeft, anders false',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
-	'Class:AuditRule/Attribute:category_id' => 'Categorie',
-	'Class:AuditRule/Attribute:category_id+' => 'De categorie voor deze regel',
-	'Class:AuditRule/Attribute:category_name' => 'Categorie',
-	'Class:AuditRule/Attribute:category_name+' => 'Naam van de categorie voor deze regel',
-));
-
-//
-// Class: QueryOQL
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:Query' => 'Query',
-	'Class:Query+' => 'Een query is een data set die op een dynamische manier is gedefineerd',
-	'Class:Query/Attribute:name' => 'Naam',
-	'Class:Query/Attribute:name+' => 'Identificeerd de query',
-	'Class:Query/Attribute:description' => 'Beschrijving',
-	'Class:Query/Attribute:description+' => 'Uitgebreide beschrijving voor de query(doel, gebruik, etc.)',
-	'Class:Query/Attribute:fields' => 'Velden',
-	'Class:Query/Attribute:fields+' => 'Comma separated list van attributen (of alias.attribute) om te exporteren',
-
-	'Class:QueryOQL' => 'OQL Query',
-	'Class:QueryOQL+' => 'Een query gebaseerd op de Object Query Language',
-	'Class:QueryOQL/Attribute:oql' => 'Expressie',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL Expressie',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:User' => 'Gebruiker',
-	'Class:User+' => 'Gebruiker login',
-	'Class:User/Attribute:finalclass' => 'Accounttype',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => 'Contact (persoon)',
-	'Class:User/Attribute:contactid+' => 'Persoonlijke details van de business data',
-	'Class:User/Attribute:last_name' => 'Achternaam',
-	'Class:User/Attribute:last_name+' => 'Naam van het overeenkomende contact',
-	'Class:User/Attribute:first_name' => 'Voornaam',
-	'Class:User/Attribute:first_name+' => 'Voornaam van het overeenkomende contact',
-	'Class:User/Attribute:email' => 'Email',
-	'Class:User/Attribute:email+' => 'Email van het overeenkomende contact',
-	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'Identification string van de gebruiker',
-	'Class:User/Attribute:language' => 'Taal',
-	'Class:User/Attribute:language+' => 'Taal van de gebruiker',
-	'Class:User/Attribute:language/Value:EN US' => 'Engels',
-	'Class:User/Attribute:language/Value:EN US+' => 'Engels (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'Frans',
-	'Class:User/Attribute:language/Value:FR FR+' => 'Frans (Frankrijk)',
-	'Class:User/Attribute:profile_list' => 'Profielen',
-	'Class:User/Attribute:profile_list+' => 'Rollen, verlenen rechten aan deze persoon',
-	'Class:User/Attribute:allowed_org_list' => 'Mijn organisaties',
-	'Class:User/Attribute:allowed_org_list+' => 'De eindgebruiker heeft toestemming om data te zien van de volgende organisaties. Als er geen organisatie is gespecificeerd, is er geen restrictie.',
-
-	'Class:User/Error:LoginMustBeUnique' => 'Login moet uniek zijn- “%1s� is al in gebruik',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'In ieder geval een profiel moet toegewezen zijn aan deze gebruiker',
-
-	'Class:UserInternal' => 'Interne gebruiker',
-	'Class:UserInternal+' => 'Gebruiker gedefineerd in iTop',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_Profiles' => 'Profiel',
-	'Class:URP_Profiles+' => 'Gebruikersprofiel',
-	'Class:URP_Profiles/Attribute:name' => 'Naam',
-	'Class:URP_Profiles/Attribute:name+' => 'label',
-	'Class:URP_Profiles/Attribute:description' => 'Beschrijving',
-	'Class:URP_Profiles/Attribute:description+' => 'Beschrijving bestaand uit een regel',
-	'Class:URP_Profiles/Attribute:user_list' => 'Gebruikers',
-	'Class:URP_Profiles/Attribute:user_list+' => 'Gebruikers met deze rol',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_Dimensions' => 'Dimensie',
-	'Class:URP_Dimensions+' => 'Dimensie van de applicatie (defineert silos)',
-	'Class:URP_Dimensions/Attribute:name' => 'Naam',
-	'Class:URP_Dimensions/Attribute:name+' => 'label',
-	'Class:URP_Dimensions/Attribute:description' => 'Beschrijving',
-	'Class:URP_Dimensions/Attribute:description+' => 'Beschrijving bestaande uit een regel',
-	'Class:URP_Dimensions/Attribute:type' => 'Type',
-	'Class:URP_Dimensions/Attribute:type+' => 'Klassenaam of data type (projection unit)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_UserProfile' => 'Gebruiker naar profiel',
-	'Class:URP_UserProfile+' => 'Gebruikerprofielen',
-	'Class:URP_UserProfile/Attribute:userid' => 'Gebruiker',
-	'Class:URP_UserProfile/Attribute:userid+' => 'Gebruiker account',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'Login van de gebruiker',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Profiel',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'Gebruiksprofiel',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profiel',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Naam van het profiel',
-	'Class:URP_UserProfile/Attribute:reason' => 'Reden',
-	'Class:URP_UserProfile/Attribute:reason+' => 'Leg uit waarom deze persoon deze rol heeft',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_UserOrg' => 'Gebruikersorganisaties',
-	'Class:URP_UserOrg+' => 'Mijn organisaties',
-	'Class:URP_UserOrg/Attribute:userid' => 'Gebruiker',
-	'Class:URP_UserOrg/Attribute:userid+' => 'Account van de gebruiker',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login van de gebruiker',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organisatie',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Mijn organisatie',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Mijn organisatie',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Mijn organisatie',
-	'Class:URP_UserOrg/Attribute:reason' => 'Reden',
-	'Class:URP_UserOrg/Attribute:reason+' => 'Leg uit waarom deze persoon de data van deze organisatie mag inzien',
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_ProfileProjection' => 'profile_projection',
-	'Class:URP_ProfileProjection+' => 'profile projections',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensie',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'Dimensie van de applicatie',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensie',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'Dimensie van de applicatie',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profiel',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'Gebruiksprofiel',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Profiel',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Naam van het profiel',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Value expression',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (gebruikt $user) | constant |  | +attribute code',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribuut',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Target attribuutcode (optioneel)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_ClassProjection' => 'class_projection',
-	'Class:URP_ClassProjection+' => 'class projections',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensie',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'Dimensie van de applicatie',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensie',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'Dimensie van de applicatie',
-	'Class:URP_ClassProjection/Attribute:class' => 'Klasse',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Target klasse',
-	'Class:URP_ClassProjection/Attribute:value' => 'Value expression',
-	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (gebruikt $this) | constant |  | +attribute code',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribuut',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Target attribuutcode (optioneel)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_ActionGrant' => 'action_permission',
-	'Class:URP_ActionGrant+' => 'Toestemming aan klasses',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Profiel',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'Gebruiksprofiel',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profiel',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'Gebruiksprofiel',
-	'Class:URP_ActionGrant/Attribute:class' => 'Klasse',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Target klasse',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Toestemming',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'Toestemming of geen toestemming?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Ja',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'Ja',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nee',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'Nee',
-	'Class:URP_ActionGrant/Attribute:action' => 'Actie',
-	'Class:URP_ActionGrant/Attribute:action+' => 'Actie om te ondernemen op een bepaalde klasse',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_StimulusGrant' => 'stimulus_permission',
-	'Class:URP_StimulusGrant+' => 'Toegestane stimulus in de levenscyclus van het object',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profiel',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Gebruiksprofiel',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profiel',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'Gebruiksprofiel',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Klasse',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'Target klasse',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Toestemming',
-	'Class:URP_StimulusGrant/Attribute:permission+' => 'Toestemming of geen toestemming',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Ja',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'Ja',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nee',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'Nee',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'Class:URP_AttributeGrant' => 'attribute_permission',
-	'Class:URP_AttributeGrant+' => 'Toestemming op het niveau van de attributen',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Actie verleen',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'actie verleen',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribuut',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribuut code',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
-	'BooleanLabel:yes' => 'Ja',
-	'BooleanLabel:no' => 'Nee',
-	'Menu:WelcomeMenu' => 'Welkom',
-	'Menu:WelcomeMenu+' => 'Welkom in iTop',
-	'Menu:WelcomeMenuPage' => 'Welkom',
-	'Menu:WelcomeMenuPage+' => 'Welkom in iTop',
-	'UI:WelcomeMenu:Title' => 'Welkom in iTop',
-
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop is een compleet, OpenSource, IT Operationeel Portaal.</p>
-<ul>Inclusief:
-<li>Een complete CMDB (Configuration management database) voor het documenteren en managen van de IT inventaris.</li>
-<li>Een Incident management module voor het vinden van en communiceren over alle problemen die optreden binnen de IT.</li>
-<li>Een change management module voor het plannen en natrekken van de veranderingen in de IT omgeving.</li>
-<li>Een database met bekende errors om de oplossing van incidenten te versnellen.</li>
-<li>Een storingsmodule voor het documenteren van alle geplande storingen en voor het informeren van de juiste contacten.</li>
-<li>Dashboards om snel een overzicht te krijgen van uw IT.</li>
-</ul>
-<p>Alle modules kunnen apart, stap voor stap, volledig onafhankelijk van elkaar, worden opgezet.</p>',
-
-	'UI:WelcomeMenu:RightBlock' => '<p>iTop is georiënteerd op service providers, het zorgt ervoor dat IT engineers makkelijk meerdere klanten of organisaties kunnen managen.
-<ul>iTop, levert een uitgebreide set van zakenprocessen die:
-<li>De effectiveit van het IT management verbeterd</li> 
-<li>De prestatie van IT operaties verbeterd</li> 
-<li>De klanttevredenheid verhoogd en leidinggevenden inzicht biedt in hun business performance.</li>
-</ul>
-</p>
-<p>iTop is klaar om te worden geïntegreerd met uw huidige IT Management infrastructuur.</p>
-<p>
-<ul>De adoptie van dit IT Operational portaal van de nieuwste generatie zal u helpen met:
-<li>Het beter managen van een meer en meer complexe IT omgeving.</li>
-<li>Het implementeren van ITIL processen in uw eigen tempo.</li>
-<li>Het managen van het belangrijkste middel van uw IT: Documentatie.</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => 'Open aanvragen: %1$d',
-	'UI:WelcomeMenu:MyCalls' => 'Mijn aanvragen',
-	'UI:WelcomeMenu:OpenIncidents' => 'Open incidenten: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => 'Configuratie Items: %1$d',
-	'UI:WelcomeMenu:MyIncidents' => 'Aan mij toegewezen incidenten',
-	'UI:AllOrganizations' => ' Alle Organisaties ',
-	'UI:YourSearch' => 'Jouw zoekopdracht',
-	'UI:LoggedAsMessage' => 'Ingelogd als %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Ingelogd als %1$s (Administrator)',
-	'UI:Button:Logoff' => 'Log uit',
-	'UI:Button:GlobalSearch' => 'Zoek',
-	'UI:Button:Search' => ' Zoek ',
-	'UI:Button:Query' => ' Query ',
-	'UI:Button:Ok' => 'Ok',
-	'UI:Button:Save' => 'Opslaan',
-	'UI:Button:Cancel' => 'Annuleer',
-	'UI:Button:Apply' => 'Pas toe',
-	'UI:Button:Back' => ' << Vorige ',
-	'UI:Button:Restart' => ' |<< Herstart ',
-	'UI:Button:Next' => ' Volgende >> ',
-	'UI:Button:Finish' => ' Eindig ',
-	'UI:Button:DoImport' => ' Run de Import ! ',
-	'UI:Button:Done' => ' Klaar ',
-	'UI:Button:SimulateImport' => ' Simuleer de Import ',
-	'UI:Button:Test' => 'Test!',
-	'UI:Button:Evaluate' => ' Evalueer ',
-	'UI:Button:Evaluate:Title' => ' Evalueer (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' Voeg toe... ',
-	'UI:Button:BrowseObjects' => ' Browse... ',
-	'UI:Button:Add' => ' Voeg toe ',
-	'UI:Button:AddToList' => ' << Voeg toe ',
-	'UI:Button:RemoveFromList' => ' Verwijder >> ',
-	'UI:Button:FilterList' => ' Filter... ',
-	'UI:Button:Create' => ' Maak aan ',
-	'UI:Button:Delete' => ' Verwijder ! ',
-	'UI:Button:Rename' => ' Hernoem... ',
-	'UI:Button:ChangePassword' => ' Verander Password ',
-	'UI:Button:ResetPassword' => ' Reset Password ',
-	
-	'UI:SearchToggle' => 'Zoek',
-	'UI:ClickToCreateNew' => 'Maak een %1$s aan',
-	'UI:SearchFor_Class' => 'Zoek naar %1$s objecten',
-	'UI:NoObjectToDisplay' => 'Geen object om weer te geven.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parameter object_id is verplicht als link_attr is gespecificeerd. Controleer de definitie van het display template.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parameter target_attr is verplicht als link_attr is gespecificeerd. Controleer de definitie van het display template.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by is verplicht. Controleer de definitie van het display template.',
-	'UI:Error:InvalidGroupByFields' => 'Invalid list of fields to group by: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'Error: style of block wordt niet ondersteund: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrecte linkdefinitie: de klasse van objecten om te managen: %1$s is niet gevonden als external key in de klasse %2$s',
-	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d niet gevonden',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'Error: Circulaire referentie in  de afhankelijke variabelen tussen de velden, controleer het data model.',
-	'UI:Error:UploadedFileTooBig' => 'Het geüploade bestand is te groot. (Maximale grootte is %1$s). Contacteer uw iTop administrator om dit limiet aan te passen. (Check de PHP configuratie voor upload_max_filesize en post_max_size op de server).',
-	'UI:Error:UploadedFileTruncated.' => 'Het geüploade bestand is afkapt !',
-	'UI:Error:NoTmpDir' => 'De tijdelijke opslagruimte is niet gedefineerd.',
-	'UI:Error:CannotWriteToTmp_Dir' => 'Niet mogelijk om het tijdelijke bestand naar de schijf over te schrijven. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload gestopt door extension. (Original file name = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'Uploaden van bestand mislukt, oorzaak onbekend. (Error code = "%1$s").',
-	
-	'UI:Error:1ParametersMissing' => 'Error: de volgende parameter moet worden gespecificeerd voor deze actie: %1$s.',
-	'UI:Error:2ParametersMissing' => 'Error: de volgende parameters moeten worden gespecificeerd voor deze actie: %1$s and %2$s.',
-	'UI:Error:3ParametersMissing' => 'Error: de volgende parameters moeten worden gespecificeerd voor deze actie: %1$s, %2$s and %3$s.',
-	'UI:Error:4ParametersMissing' => 'Error: de volgende parameters moeten worden gespecificeerd voor deze actie: %1$s, %2$s, %3$s and %4$s.',
-	'UI:Error:IncorrectOQLQuery_Message' => 'Error: incorrecte OQL query: %1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Een error trad op tijdens het runnen van de query: %1$s',
-	'UI:Error:ObjectAlreadyUpdated' => 'Error: het object is al geupdatet.',
-	'UI:Error:ObjectCannotBeUpdated' => 'Error: het object kan niet worden geupdatet.',
-	'UI:Error:ObjectsAlreadyDeleted' => 'Error: objecten zijn al verwijderd',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'U bent niet gemachtigd tot het grootschalig verwijderen van objecten in klasse %1$s',
-	'UI:Error:DeleteNotAllowedOn_Class' => 'U bent niet gemachtigd objecten in klasse %1$s te verwijderen',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => 'U bent niet gemachtigd tot een grootschalige update van objecten in klasse %1$s',
-	'UI:Error:ObjectAlreadyCloned' => 'Error: het object is al gekloond!',
-	'UI:Error:ObjectAlreadyCreated' => 'Error: het object is al aangemaakt!',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Error: invalide stimulus "%1$s" op object %2$s in state "%3$s".',
-	
-	
-	'UI:GroupBy:Count' => 'Tel',
-	'UI:GroupBy:Count+' => 'Aantal elementen',
-	'UI:CountOfObjects' => '%1$d objecten voldoen aan de criteria.',
-	'UI_CountOfObjectsShort' => '%1$d objecten.',
-	'UI:NoObject_Class_ToDisplay' => 'Geen %1$s om weer te geven',
-	'UI:History:LastModified_On_By' => 'Laatst bewerkt op %1$s door %2$s.',
-	'UI:HistoryTab' => 'Geschiedenis',
-	'UI:NotificationsTab' => 'Notificaties',
-	'UI:History:BulkImports' => 'Geschiedenis',
-	'UI:History:BulkImports+' => 'Lijst van CSV imports (nieuwste import eerst)',
-	'UI:History:BulkImportDetails' => 'Veranderingen volgend op CSV import uitgevoerd op %1$s (door %2$s)',
-	'UI:History:Date' => 'Datum',
-	'UI:History:Date+' => 'Datum van verandering',
-	'UI:History:User' => 'Gebruiker',
-	'UI:History:User+' => 'Gebruiker die de verandering doorvoerde',
-	'UI:History:Changes' => 'Verandering',
-	'UI:History:Changes+' => 'Veranderingen gemaakt aan object',
-	'UI:History:StatsCreations' => 'Aangemaakt',
-	'UI:History:StatsCreations+' => 'Aantal aangemaakte objecten',
-	'UI:History:StatsModifs' => 'Aangepast',
-	'UI:History:StatsModifs+' => 'Aantal aangepaste objecten',
-	'UI:History:StatsDeletes' => 'Verwijderd',
-	'UI:History:StatsDeletes+' => 'Aantal verwijderde objecten',
-	'UI:Loading' => 'Laden...',
-	'UI:Menu:Actions' => 'Acties',
-	'UI:Menu:OtherActions' => 'Andere acties',
-	'UI:Menu:New' => 'Nieuw...',
-	'UI:Menu:Add' => 'Voeg toe...',
-	'UI:Menu:Manage' => 'Manage...',
-	'UI:Menu:EMail' => 'eMail',
-	'UI:Menu:CSVExport' => 'CSV Export...',
-	'UI:Menu:Modify' => 'Bewerk...',
-	'UI:Menu:Delete' => 'Verwijder...',
-	'UI:Menu:Manage' => 'Manage...',
-	'UI:Menu:BulkDelete' => 'Verwijder...',
-	'UI:UndefinedObject' => 'Ongedefineerd',
-	'UI:Document:OpenInNewWindow:Download' => 'Open in nieuw window: %1$s, Download: %2$s',
-	'UI:SelectAllToggle+' => 'Selecteer / Deselecteer Alles',
-	'UI:SplitDateTime-Date' => 'datum',
-	'UI:SplitDateTime-Time' => 'tijd',
-	'UI:TruncatedResults' => '%1$d objecten weergegeven buiten %2$d',
-	'UI:DisplayAll' => 'Geef Alles weer',
-	'UI:CollapseList' => 'Collapse',
-	'UI:CountOfResults' => '%1$d object(s)',
-	'UI:ChangesLogTitle' => 'Changes log (%1$d):',
-	'UI:EmptyChangesLogTitle' => 'Changes log is leeg',
-	'UI:SearchFor_Class_Objects' => 'Zoek naar %1$s Objecten',
-	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
-	'UI:OQLQueryTab' => 'OQL Query',
-	'UI:SimpleSearchTab' => 'Simple Search',
-	'UI:Details+' => 'Details',
-	'UI:SearchValue:Any' => '* Ieder *',
-	'UI:SearchValue:Mixed' => '* mixed *',
-	'UI:SearchValue:NbSelected' => '# geselecteerd',
-	'UI:SearchValue:CheckAll' => 'Check Alles',
-	'UI:SearchValue:UncheckAll' => 'Uncheck Alles',
-	'UI:SelectOne' => '-- selecteer een --',
-	'UI:Login:Welcome' => 'Welkom in iTop!',
-	'UI:Login:IncorrectLoginPassword' => 'Incorrect login/wachtwoord, probeer opnieuw.',
-	'UI:Login:IdentifyYourself' => 'Identificeer uzelf voordat u verder gaat',
-	'UI:Login:UserNamePrompt' => 'Gebruikersnaam',
-	'UI:Login:PasswordPrompt' => 'Wachtwoord',
-	'UI:Login:ForgotPwd' => 'Wachtwoord vergeten?',
-	'UI:Login:ForgotPwdForm' => 'Wachtwoord vergeten',
-	'UI:Login:ForgotPwdForm+' => 'iTop kan u een e-mail sturen waarin u de instructies voor het resetten van uw account kunt vinden.',
-	'UI:Login:ResetPassword' => 'Stuur nu!',
-	'UI:Login:ResetPwdFailed' => 'E-mail sturen mislukt: %1$s',
-
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is geen geldige login',
-	'UI:ResetPwd-Error-NotPossible' => 'externe accounts staan het resetten van het wachtwoord niet toe.',
-	'UI:ResetPwd-Error-FixedPwd' => 'deze account staat het resetten van het wachtwoord niet toe',
-	'UI:ResetPwd-Error-NoContact' => 'deze account is niet geassocieerd met een persoon.',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'deze account is niet geassocieerd met een persoon die beschikt over een e-mail attribuut. Neem alstublieft contact op met uw administrator.',
-	'UI:ResetPwd-Error-NoEmail' => 'Er mist een e-mailadres. Neem alstublieft contact op met uw administrator.',
-	'UI:ResetPwd-Error-Send' => 'Er is een technisch probleem bij het verzenden van de e-mail. Neem alstublieft contact op met uw administrator.',
-	'UI:ResetPwd-EmailSent' => 'Kijk alstublieft in uw mailbox en volg de insturcties...',
-	'UI:ResetPwd-EmailSubject' => 'Reset uw iTop wachtwoord',
-	'UI:ResetPwd-EmailBody' => '<body><p>U hebt een reset van uw iTop wachtwoord aangevraagd.</p><p>Klik op deze link (eenmalig gebruik) om <a href="%1$s">een nieuw wachtwoord in te voeren</a></p>.',
-
-	'UI:ResetPwd-Title' => 'Reset wachtwoord',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, of uw wachtwoord is al gereset, of u heeft al meerdere e-mails ontvangen. Zorg ervoor dat u de link in de laatst ontvangen e-mail gebruikt.',
-	'UI:ResetPwd-Error-EnterPassword' => 'Voer het nieuwe wachtwoord voor de account \'%1$s\' in.',
-	'UI:ResetPwd-Ready' => 'Het wachtwoord is veranderd',
-	'UI:ResetPwd-Login' => 'Klik hier om in te loggen',
-
-	'UI:Login:About' => '',
-	'UI:Login:ChangeYourPassword' => 'Verander uw wachtwoord',
-	'UI:Login:OldPasswordPrompt' => 'Oud wachtwoord',
-	'UI:Login:NewPasswordPrompt' => 'Nieuw wachtwoord',
-	'UI:Login:RetypeNewPasswordPrompt' => 'Herhaal nieuwe wachtwoord',
-	'UI:Login:IncorrectOldPassword' => 'Error: het oude wachtwoord is incorrect',
-	'UI:LogOffMenu' => 'Log uit',
-	'UI:LogOff:ThankYou' => 'Bedankt voor het gebruiken van iTop',
-	'UI:LogOff:ClickHereToLoginAgain' => 'Klik hier om in te loggen',
-	'UI:ChangePwdMenu' => 'Verander wachtwoord',
-	'UI:Login:PasswordChanged' => 'Wachtwoord succesvol veranderd',
-	'UI:AccessRO-All' => 'iTop is alleen-lezen',
-	'UI:AccessRO-Users' => 'iTop is alleen-lezen voor eindgebruikers',
-	'UI:ApplicationEnvironment' => 'Omgeving van de applicatie: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch' => 'Het nieuwe wachtwoord en de herhaling van het nieuwe wachtwoord komen niet overeen',
-	'UI:Button:Login' => 'Enter iTop',
-	'UI:Login:Error:AccessRestricted' => 'iTop toegang is verboden. Neem alstublieft contact op met een iTop administrator.',
-	'UI:Login:Error:AccessAdmin' => 'Alleen toegankelijk voor mensen met administrator rechten. Neem alstublieft contact op met een iTop administrator',
-	'UI:CSVImport:MappingSelectOne' => '-- Selecteer een --',
-	'UI:CSVImport:MappingNotApplicable' => '-- Negeer dit veld --',
-	'UI:CSVImport:NoData' => 'Lege data set..., voeg data toe',
-	'UI:Title:DataPreview' => 'Data Preview',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: De data bevat slechts een column. Hebt de juiste separator karakter geselecteerd?',
-	'UI:CSVImport:FieldName' => 'Veld %1$d',
-	'UI:CSVImport:DataLine1' => 'Data Line 1',
-	'UI:CSVImport:DataLine2' => 'Data Line 2',
-	'UI:CSVImport:idField' => 'id (Primary Key)',
-	'UI:Title:BulkImport' => 'iTop - Bulk import',
-	'UI:Title:BulkImport+' => 'CSV Import Wizard',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisatie van %1$d objecten van klasse %2$s',
-	'UI:CSVImport:ClassesSelectOne' => '-- selecteer een --',
-	'UI:CSVImport:ErrorExtendedAttCode' => 'Interne error: "%1$s" is een incorrecte code omdat "%2$s" geen externe key van klasse "%3$s" is',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objecten(s) zullen onveranderd blijven.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objecten(s) zullen worden veranderd.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objecten(s) zullen worden toegevoegd.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objecten(s) zullen errors hebben.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objecten(s) zijn onveranderd gebleven.',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d objecten(s) zijn veranderd.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d objecten(s) zijn toegevoegd.',
-	'UI:CSVImport:ObjectsHadErrors' => 'bij %1$d objecten(s) traden errors op.',
-	'UI:Title:CSVImportStep2' => 'Step 2 of 5: CSV data opties',
-	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Data mapping',
-	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Import simulatie',
-	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Import compleet',
-	'UI:CSVImport:LinesNotImported' => 'Regels die niet konden worden geladen:',
-	'UI:CSVImport:LinesNotImported+' => 'De volgende regels zijn niet geïmporteerd omdat ze fouten bevatten',
-	'UI:CSVImport:SeparatorComma+' => ', (komma)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (semicolon)',
-	'UI:CSVImport:SeparatorTab+' => 'tab',
-	'UI:CSVImport:SeparatorOther' => 'other:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (dubbele quote)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (enkele quote)',
-	'UI:CSVImport:QualifierOther' => 'anders:',
-	'UI:CSVImport:TreatFirstLineAsHeader' => 'Beschouw de eerste regel als kop (column naam)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Sla %1$s regels aan het begin van het bestand over',
-	'UI:CSVImport:CSVDataPreview' => 'CSV Data Preview',
-	'UI:CSVImport:SelectFile' => 'Selecteer het bestand om te importeren:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'Laad van een bestand',
-	'UI:CSVImport:Tab:CopyPaste' => 'Kopieer en plak data',
-	'UI:CSVImport:Tab:Templates' => 'Templates',
-	'UI:CSVImport:PasteData' => 'Plak data om te importeren:',
-	'UI:CSVImport:PickClassForTemplate' => 'Kies template om te downloaden: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Separator karakter:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Text qualifier karakter',
-	'UI:CSVImport:CommentsAndHeader' => 'Opmerkingen en kopje',
-	'UI:CSVImport:SelectClass' => 'Selecteer de klasse om te importeren:',
-	'UI:CSVImport:AdvancedMode' => 'Advanced mode',
-	'UI:CSVImport:AdvancedMode+' => 'In advanced mode kan het "id" (primary key) van de objecten worden gebruikt om deze te updaten en te hernoemen.' .
-									'De column "id" (indien beschikbaar)echter, kan alleen worden gebruikt als zoekcriterium en kan niet worden gecombineerd met andere zoekcriteria.',
-	'UI:CSVImport:SelectAClassFirst' => 'Om de mapping te configureren, moet u eerst een klasse selecteren.',
-	'UI:CSVImport:HeaderFields' => 'Velden',
-	'UI:CSVImport:HeaderMappings' => 'Mappings',
-	'UI:CSVImport:HeaderSearch' => 'Search?',
-	'UI:CSVImport:AlertIncompleteMapping' => 'Selecteer alstublieft een mapping voor ieder veld',
-	'UI:CSVImport:AlertMultipleMapping' => 'Zorg er alstublieft voor dat het veld slechts een keer gemapped is',
-	'UI:CSVImport:AlertNoSearchCriteria' => 'Selecteer alstublieft tenminste een zoekcriterium.',
-	'UI:CSVImport:Encoding' => 'Character encoding',	
-	'UI:UniversalSearchTitle' => 'iTop - Universele zoekopdracht',
-	'UI:UniversalSearch:Error' => 'Error: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => 'Selecteer de klasse om te zoeken: ',
-
-	'UI:CSVReport-Value-Modified' => 'Veranderd',
-	'UI:CSVReport-Value-SetIssue' => 'Kon niet worden veranderd- reden: %1$s',
-	'UI:CSVReport-Value-ChangeIssue' => 'Kon niet worden veranderd naar %1$s - reden: %2$s',
-	'UI:CSVReport-Value-NoMatch' => 'Geen overeenkomst',
-	'UI:CSVReport-Value-Missing' => 'Ontbrekende verplichte waarde',
-	'UI:CSVReport-Value-Ambiguous' => 'Onduidelijk: gevonden %1$s objecten',
-	'UI:CSVReport-Row-Unchanged' => 'onveranderd',
-	'UI:CSVReport-Row-Created' => 'gemaakt',
-	'UI:CSVReport-Row-Updated' => ' %1$d geupdatet cols',
-	'UI:CSVReport-Row-Disappeared' => 'verdwenen, %1$d veranderde cols',
-	'UI:CSVReport-Row-Issue' => 'Probleem: %1$s',
-	'UI:CSVReport-Value-Issue-Null' => 'Null niet toegestaan',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object niet gevonden',
-	'UI:CSVReport-Value-Issue-FoundMany' => ' %1$d Matches gevonden',
-	'UI:CSVReport-Value-Issue-Readonly' => 'Het attribuut \'%1$s\' is alleen-lezen en kan niet worden veranderd (huidige waarde: %2$s,voorgestelde waarde: %3$s)',
-	'UI:CSVReport-Value-Issue-Format' => 'Input %1$s verwerken mislukt',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Onverwachte waarde voor attribuut \'%1$s\': geen match gevonden, controleer spelling',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Onverwachte waarde voor attribuut \'%1$s\': %2$s',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributen komen niet met elkaar overeeen: %1$s',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Onverwachte attribuutwaarden',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kon niet worden gemaakt, door het ontbreken van externe code(s): %1$s',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'verkeerde date format',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'Verbeteren mislukt',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'Onduidelijke verbetering',
-	'UI:CSVReport-Row-Issue-Internal' => 'Interne error: %1$s, %2$s',
-
-	'UI:CSVReport-Icon-Unchanged' => 'Onveranderd',
-	'UI:CSVReport-Icon-Modified' => 'Aangepast',
-	'UI:CSVReport-Icon-Missing' => 'Missend',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missend object: zal worden geupdatet',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missend: geupdatet',
-	'UI:CSVReport-Icon-Created' => 'Aangemaakt',
-	'UI:CSVReport-Object-ToCreate' => 'Object zal worden aangemaakt',
-	'UI:CSVReport-Object-Created' => 'Object aangemaakt',
-	'UI:CSVReport-Icon-Error' => 'Error',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s',
-	'UI:CSVReport-Object-Ambiguous' => 'ONDUIDELIJK: %1$s',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% van de geladen objecten bevatten fouten en zullen worden genegeerd',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% van de geladen objecten zullen worden gemaakt',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% zullen worden aangepast.',
-
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode zijn verscheidene columns toegevoegd aan de export: het id van het object, het id van de externe codes en hun herstelattributen.',
-	'UI:CSVExport:LostChars' => 'Encoding probleem',
-	'UI:CSVExport:LostChars+' => 'Het gedownloade bestand zal worden gecodeerd in %1$s. iTop heeft een aantal karakters gedetecteerd die niet compatible zijn met deze format. Deze karakters zullen worden vervangen door een ander karakter (bijvoorbeeld karakters met accent, zullen het accent verliezen), of ze zullen worden verwijderd. U kunt data kopiëren en plakken van uw web browser. Ook kunt u de administrator contacteren om de codes te veranderen (Zie parameter \'csv_file_default_charset\').',
-
-	'UI:Audit:Title' => 'iTop - CMDB Audit',
-	'UI:Audit:InteractiveAudit' => 'Interactieve Audit',
-	'UI:Audit:HeaderAuditRule' => 'Audit Regel',
-	'UI:Audit:HeaderNbObjects' => '# Objecten',
-	'UI:Audit:HeaderNbErrors' => '# Errors',
-	'UI:Audit:PercentageOk' => '% Ok',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in de Regel %1$s: %2$s.',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in de Categorie %1$s: %2$s.',
-
-	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluatie',
-	'UI:RunQuery:QueryExamples' => 'Query Voorbeelden',
-	'UI:RunQuery:HeaderPurpose' => 'Doel',
-	'UI:RunQuery:HeaderPurpose+' => 'Uitleg over de query',
-	'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression',
-	'UI:RunQuery:HeaderOQLExpression+' => 'De query in OQL syntax',
-	'UI:RunQuery:ExpressionToEvaluate' => 'Expression om te evalueren: ',
-	'UI:RunQuery:MoreInfo' => 'Meer informatie over de query: ',
-	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
-	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
-	'UI:RunQuery:Error' => 'Een fout is opgetreden tijdens het runnen van query: %1$s',
-	'UI:Query:UrlForExcel' => 'URL om te gebruiken voor MS-Excel web queries',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Schema:Title' => 'iTop objecten schema',
-	'UI:Schema:CategoryMenuItem' => 'Categorie <b>%1$s</b>',
-	'UI:Schema:Relationships' => 'Relaties',
-	'UI:Schema:AbstractClass' => 'Abstracte klasse: objecten van deze klasse kunnen niet worden geïnstantieerd.',
-	'UI:Schema:NonAbstractClass' => 'Niet abstracte klasse: objecten van deze klasse kunnen worden geïnstantieerd.',
-	'UI:Schema:ClassHierarchyTitle' => 'Klasse hierarchie',
-	'UI:Schema:AllClasses' => 'Alle klassen',
-	'UI:Schema:ExternalKey_To' => 'Externe key voor %1$s',
-	'UI:Schema:Columns_Description' => 'Columns: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'Default: "%1$s"',
-	'UI:Schema:NullAllowed' => 'Null Allowed',
-	'UI:Schema:NullNotAllowed' => 'Null NOT Allowed',
-	'UI:Schema:Attributes' => 'Attributen',
-	'UI:Schema:AttributeCode' => 'Attribuutcode',
-	'UI:Schema:AttributeCode+' => 'Interne code van het attribuut',
-	'UI:Schema:Label' => 'Label',
-	'UI:Schema:Label+' => 'Label van het attribuut',
-	'UI:Schema:Type' => 'Type',
-	
-	'UI:Schema:Type+' => 'Data type van het attribuut',
-	'UI:Schema:Origin' => 'Oorsprong',
-	'UI:Schema:Origin+' => 'De basisklasse waarin dit attribuut is gedefineerd',
-	'UI:Schema:Description' => 'Beschrijving',
-	'UI:Schema:Description+' => 'Beschrijving van het attribuut',
-	'UI:Schema:AllowedValues' => 'Allowed values',
-	'UI:Schema:AllowedValues+' => 'Regels voor de mogelijke waarden van dit attribuut',
-	'UI:Schema:MoreInfo' => 'Meer informatie',
-	'UI:Schema:MoreInfo+' => 'Meer informatie over het veld gedefineerd in de database',
-	'UI:Schema:SearchCriteria' => 'Zoekcriteria',
-	'UI:Schema:FilterCode' => 'Filter code',
-	'UI:Schema:FilterCode+' => 'Code van deze zoekcriteria',
-	'UI:Schema:FilterDescription' => 'Beschrijving',
-	'UI:Schema:FilterDescription+' => 'Beschrijving van deze zoekcriteria',
-	'UI:Schema:AvailOperators' => 'Beschikbare medewerkers',
-	'UI:Schema:AvailOperators+' => 'Mogelijke medewerkes voor deze zoekcriteria',
-	'UI:Schema:ChildClasses' => 'Child klassen',
-	'UI:Schema:ReferencingClasses' => 'Refererende klassen',
-	'UI:Schema:RelatedClasses' => 'Gerelateerde klassen',
-	'UI:Schema:LifeCycle' => 'Levenscyclus',
-	'UI:Schema:Triggers' => 'Triggers',
-	'UI:Schema:Relation_Code_Description' => 'Relatie <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: propageer naar %2$d levels, query: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: propageert niet (%2$d levels), query: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s is aangeduid met klasse %2$s via het veld %3$s',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s is gelinkt met %2$s via %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n' => 'Klasses wijzend naar %1$s (1:n links):',
-	'UI:Schema:Links:n-n' => 'Klassen gelinkt aan %1$s (n:n links):',
-	'UI:Schema:Links:All' => 'Graph van alle gerelateerde klassen',
-	'UI:Schema:NoLifeCyle' => 'Er is geen levenscyclus gedefineerd voor deze klasse.',
-	'UI:Schema:LifeCycleTransitions' => 'Transities',
-	'UI:Schema:LifeCyleAttributeOptions' => 'Attribuut options',
-	'UI:Schema:LifeCycleHiddenAttribute' => 'Verborgen',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Alleen-lezen',
-	'UI:Schema:LifeCycleMandatoryAttribute' => 'Verplicht',
-	'UI:Schema:LifeCycleAttributeMustChange' => 'Moet worden veranderd',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Gebruiker zal worden gevraagd om de waarde te veranderen',
-	'UI:Schema:LifeCycleEmptyList' => 'lege lijst',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => 'Typ de eerste 3 karakters...',
-	'UI:Edit:TestQuery' => 'Test query',
-	'UI:Combo:SelectValue' => '--- selecteer een waarde ---',
-	'UI:Label:SelectedObjects' => 'Geselecteerde objecten: ',
-	'UI:Label:AvailableObjects' => 'Beschikbare objecten: ',
-	'UI:Link_Class_Attributes' => '%1$s attributen',
-	'UI:SelectAllToggle+' => 'Selecteer Alles / Deselecteer Alles',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Voeg %1$s objecten gelinkt met %2$s: %3$s toe',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Voeg %1$s objecten toe om te linken met de %2$s',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Manage %1$s objecten gelinkt met %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Voeg %1$s toe...',
-	'UI:RemoveLinkedObjectsOf_Class' => 'Verwijder geselecteerde objecten',
-	'UI:Message:EmptyList:UseAdd' => 'De lijst is leeg, gebruik de "Voeg toe..." knop om elementen toe te voegen.',
-	'UI:Message:EmptyList:UseSearchForm' => 'Gebruik het bovenstaande zoekveld om te zoeker naar objecten die u wilt toevoegen.',
-	'UI:Wizard:FinalStepTitle' => 'Laatste stap: bevestiging',
-	'UI:Title:DeletionOf_Object' => 'Verwijderen van %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Grootschalig verwijderen van %1$d objecten van klasse %2$s',
-	'UI:Delete:NotAllowedToDelete' => 'U bent niet gemachtigd om dit object te verwijderen',
-	'UI:Delete:NotAllowedToUpdate_Fields' => 'U bent niet gemachtigd om het/de volgende veld(en) te updaten: %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'Dit object kon niet worden verwijderd omdat de huidige gebruiker niet de juiste rechten heeft',
-	'UI:Error:CannotDeleteBecause' => 'Dit object kon niet worden verwijderd omdat: %1$s',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Dit object kon niet worden verwijderd omdat eerst enkele manuele handelingen moeten worden verricht',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Dit object kon niet worden verwijderd omdat eerst enkele manuele handelingen moeten worden verricht',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s vanwege %2$s',
-	'UI:Delete:Deleted' => 'verwijderd',
-	'UI:Delete:AutomaticallyDeleted' => 'automatisch verwijderd',
-	'UI:Delete:AutomaticResetOf_Fields' => 'automatische reset van veld(en): %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => 'Bezig met het opschonen van alle referenties naar %1$s...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Bezig met het opschonen van %1$d objecten van klasse %2$s...',
-	'UI:Delete:Done+' => 'Wat er is gebeurd...',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s verwijderd',
-	'UI:Delete:ConfirmDeletionOf_Name' => 'Verwijderen van %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Verwijderen van %1$d objecten van klasse %2$s',
-	'UI:Delete:CannotDeleteBecause' => 'Kon niet worden verwijderd: %1$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Zou automatisch moeten worden verwijderd, maar dat is niet mogelijk: %1$s',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Moet handmatig worden verwijderd, maar dat is niet mogelijk: %1$s',
-	'UI:Delete:WillBeDeletedAutomatically' => 'Zal automatisch worden verwijderd',
-	'UI:Delete:MustBeDeletedManually' => 'Moet handmatig worden verwijderd',
-	'UI:Delete:CannotUpdateBecause_Issue' => 'Zou automatisch moeten worden geupdatet, maar: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Zal automatisch worden geupdatet (reset: %1$s)',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objecten/links refereren naar %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objecten/links refereren naar sommige objecten die worden verwijderd',	
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Om Database integriteit te verzekeren, moet elke verdere referentie worden verwijderd',
-	'UI:Delete:Consequence+' => 'Wat er zal gebeuren',
-	'UI:Delete:SorryDeletionNotAllowed' => 'Sorry, u bent niet gemachtigd om dit object te verwijderen. Voor uitgebreide uitleg, zie hierboven',
-	'UI:Delete:PleaseDoTheManualOperations' => 'Verricht alstublieft eerst de manuele handelingen die hierboven staan beschreven voordat u dit object verwijdert',
-	'UI:Delect:Confirm_Object' => 'Bevestig dat u  %1$s wil verwijderen.',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Bevestig dat u de volgende %1$d objecten van klasse %2$s wilt verwijderen.',
-	'UI:WelcomeToITop' => 'Welcome in iTop',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s details',
-	'UI:ErrorPageTitle' => 'iTop - Error',
-	'UI:ObjectDoesNotExist' => 'Sorry, dit object bestaat niet (of u bent niet gemachtigd het te bekijken).',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'iTop - Zoekresultaten',
-	'UI:SearchResultsTitle' => 'Zoekresultaten',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => 'Geen zoekopdracht',
-	'UI:Search:NeedleTooShort' => 'De zoekopdracht "%1$s" is te kort. Type tenminste %2$d karakters.',
-	'UI:Search:Ongoing' => 'Zoeken naar "%1$s"',
-	'UI:Search:Enlarge' => 'Vergroot de zoekopdracht',
-	'UI:FullTextSearchTitle_Text' => 'Resultaten voor "%1$s":',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d object(en) van klasse %2$s gevonden.',
-	'UI:Search:NoObjectFound' => 'Geen object gevonden.',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modificatie',
-	'UI:ModificationTitle_Class_Object' => 'Modificatie van %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - Kloon %1$s - %2$s modificatie',
-	'UI:CloneTitle_Class_Object' => 'Kloon van %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'iTop - Nieuwe %1$s aangemaakt',
-	'UI:CreationTitle_Class' => '%1$s aanmaken',
-	'UI:SelectTheTypeOf_Class_ToCreate' => 'Selecteer het type %1$s dat moet worden aangemaakt:',
-	'UI:Class_Object_NotUpdated' => 'Geen verandering waargenomen, %1$s (%2$s) is <strong>not</strong> gemodificeerd.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) geupdatet.',
-	'UI:BulkDeletePageTitle' => 'iTop - Grootschalig verwijderen',
-	'UI:BulkDeleteTitle' => 'Selecteer de objecten die u wilt verwijderen:',
-	'UI:PageTitle:ObjectCreated' => 'iTop Object Aangemaakt.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s aangemaakt.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Bezig met het toepassen van %1$s op object: %2$s in state %3$s tot target state: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => 'Het object kon niet geschreven worden: %1$s',
-	'UI:PageTitle:FatalError' => 'iTop - Fatale Fout',
-	'UI:SystemIntrusion' => 'Toegang geweigerd. U hebt een actie aangevraagd waarvoor u niet gemachtigd bent.',
-	'UI:FatalErrorMessage' => 'Fatale error, iTop kan niet doorgaan.',
-	'UI:Error_Details' => 'Error: %1$s.',
-
-	'UI:PageTitle:ClassProjections'	=> 'iTop gebruikersmanagement - klasse projecties',
-	'UI:PageTitle:ProfileProjections' => 'iTop gebuikersmanagement - profiel projecties',
-	'UI:UserManagement:Class' => 'Klasse',
-	'UI:UserManagement:Class+' => 'Klasse van objecten',
-	'UI:UserManagement:ProjectedObject' => 'Object',
-	'UI:UserManagement:ProjectedObject+' => 'Projected object',
-	'UI:UserManagement:AnyObject' => '* elk *',
-	'UI:UserManagement:User' => 'Gebruiker',
-	'UI:UserManagement:User+' => 'Gebruiker bezig met de projectie',
-	'UI:UserManagement:Profile' => 'Profiel',
-	'UI:UserManagement:Profile+' => 'Profiel waarin de projectie is gespecificeerd',
-	'UI:UserManagement:Action:Read' => 'Lees',
-	'UI:UserManagement:Action:Read+' => 'Lees/display objecten',
-	'UI:UserManagement:Action:Modify' => 'Pas aan',
-	'UI:UserManagement:Action:Modify+' => 'Maak de objecten aan en edit ze',
-	'UI:UserManagement:Action:Delete' => 'Verwijder',
-	'UI:UserManagement:Action:Delete+' => 'Verwijder objecten',
-	'UI:UserManagement:Action:BulkRead' => 'Grootschalig lezen (Exporteer)',
-	'UI:UserManagement:Action:BulkRead+' => 'List de objecten of exporteer ze grootschalig',
-	'UI:UserManagement:Action:BulkModify' => 'Grootschalig aanpassen',
-	'UI:UserManagement:Action:BulkModify+' => 'Verander grootschalig/maak grootschalig aan (CSV import)',
-	'UI:UserManagement:Action:BulkDelete' => 'Grootschalig verwijderen',
-	'UI:UserManagement:Action:BulkDelete+' => 'Verwijder objecten grootschalig',
-	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
-	'UI:UserManagement:Action:Stimuli+' => 'Toegestane (compound) acties',
-	'UI:UserManagement:Action' => 'Actie',
-	'UI:UserManagement:Action+' => 'Actie uitgevoerd door de gebruiker',
-	'UI:UserManagement:TitleActions' => 'Acties',
-	'UI:UserManagement:Permission' => 'Toestemming',
-	'UI:UserManagement:Permission+' => 'De autorisaties van de gebruiker',
-	'UI:UserManagement:Attributes' => 'Attributen',
-	'UI:UserManagement:ActionAllowed:Yes' => 'Ja',
-	'UI:UserManagement:ActionAllowed:No' => 'Nee',
-	'UI:UserManagement:AdminProfile+' => 'Administrators hebben volledige lees/schrijf autorisatie in de database.',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => 'Er is geen levenscyclus gedefineerd voor deze klasse',
-	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link tussen %1$s en %2$s',
-	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link tussen %1$s en %2$s',
-	
-	'Menu:AdminTools' => 'Admin tools',
-	'Menu:AdminTools+' => 'Administratie tools',
-	'Menu:AdminTools?' => 'Tools die alleen toegankelijk zijn voor gebruikers met een administratorprofiel',
-
-	'UI:ChangeManagementMenu' => 'Change Management',
-	'UI:ChangeManagementMenu+' => 'Change Management',
-	'UI:ChangeManagementMenu:Title' => 'Changes Overzicht',
-	'UI-ChangeManagementMenu-ChangesByType' => 'Changes aan de hand van type',
-	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes aan de hand van type status',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changes aan de hand van werkgroep',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Nog niet toegewezen Changes',
-
-	'UI:ConfigurationManagementMenu' => 'Configuratie Management',
-	'UI:ConfigurationManagementMenu+' => 'Configuratie Management',
-	'UI:ConfigurationManagementMenu:Title' => 'Overzicht van de Infrastructuur',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'Objecten van de infrastructuur aan de hand van type',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objecten van de infrastructuur aan de hand van status',
-
-'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard voor Configuratie Management',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuratie Items aan de hand van status',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items aan de hand van type',
-
-'UI:RequestMgmtMenuOverview:Title' => 'Dashboard voor Request Management',
-'UI-RequestManagementOverview-RequestByService' => 'Gebruikersaanvragen aan de hand van dienst',
-'UI-RequestManagementOverview-RequestByPriority' => 'Gebruikersaanvragen aan de hand van prioriteit',
-'UI-RequestManagementOverview-RequestUnassigned' => 'Nog niet toegewezen gebruikersaanvragen',
-
-'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard voor Incident Management',
-'UI-IncidentManagementOverview-IncidentByService' => 'Incidenten aan de hand van dienst',
-'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenten aan de hand van prioriteit',
-'UI-IncidentManagementOverview-IncidentUnassigned' => 'Nog niet toegewezen incidenten',
-
-'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard voor Change Management',
-'UI-ChangeManagementOverview-ChangeByType' => 'Changes aan de hand van type',
-'UI-ChangeManagementOverview-ChangeUnassigned' => 'Nog niet toegewezen Changes',
-'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages door changes',
-
-'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard voor Service Management',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Klantencontracten die binnen 30 dagen vernieuwd moeten worden',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Providercontracten die binnen 30 dagen vernieuwd moeten worden',
-
-	'UI:ContactsMenu' => 'Contacten',
-	'UI:ContactsMenu+' => 'Contacten',
-	'UI:ContactsMenu:Title' => 'Overzicht van contacten',
-	'UI-ContactsMenu-ContactsByLocation' => 'Contacten aan de hand van location',
-	'UI-ContactsMenu-ContactsByType' => 'Contacten aan de hand van type',
-	'UI-ContactsMenu-ContactsByStatus' => 'Contacten aan de hand van status',
-
-	'Menu:DataModelMenu' => 'Data Model',
-	'Menu:DataModelMenu+' => 'Overzicht van het Data Model',
-	
-	'Menu:ExportMenu' => 'Exporteer',
-	'Menu:ExportMenu+' => 'Exporteer de resultaten van elke query in HTML, CSV or XML',
-	
-	'Menu:NotificationsMenu' => 'Notificaties',
-	'Menu:NotificationsMenu+' => 'Configuratie van de Notificaties',
-	'UI:NotificationsMenu:Title' => 'Configuratie van het <span class="hilite">Notifications</span>',
-	'UI:NotificationsMenu:Help' => 'Help',
-	'UI:NotificationsMenu:HelpContent' => '<p>In iTop zijn de notificaties volledig aan te passen. Ze zijn gebaseerd op twee sets van objecten: <i>triggers and actions</i>.</p>
-<p><i><b>Triggers</b></i> defineren wanneer een notificatie wordt verzonden. Er zijn 5 types triggers, die 3 verschillende fases in de levenscyclus van een object beslaan:
-<ol>
-	<li>de "on object creation" triggers worden uitgevoerd wanneer een object van een specifieke klasse is aangemaakt</li>
-	<li>de "on entering a state" triggers worden uitgevoerd voordat een object van een bepaalde klasse een gespecificeerde state ingaat (komend van een andere state)</li>
-	<li>de "on leaving a state" triggers worden uitgevoerd wanneer een object van een bepaalde klasse een gespecificeerde state verlaat</li>
-	<li>de "on threshold" triggers worden uitgevoerd wanneer een threshold voor TTR of TTO is bereikt</li>
-	<li>de "on portal update" triggers worden uitgevoerd wanneer een ticket is geupdatet vanuit het portal</li>
-</ol>
-</p>
-<p>
-<i><b>Actions</b></i> defileren de acties die worden ondernomen wanneer de triggers worden uitgevoerd. Op dit moment is er slechts een actie, bestaand uit het verzenden van een e-mail.
-Zulke acties defileren ook de template die moet worden gebruikt voor het versturen van de e-mail, net als andere parameters in het bericht, zoals de ontvangers, de prioriteit, etc. </p>
-<p>Een speciale pagina: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is beschikbaar voor het testen en de probleemoplossing van uw  PHP mail configuratie.</p>
-<p>Om te worden uitgevoerd moeten uw acties gekoppeld zijn aan triggers.
-Indien gekoppeld aan een Trigger, wordt aan elke actie een "orde" nummer gegeven, dat specificeert in welke volgorde de acties moeten worden uitgevoerd.</p>',
-	'UI:NotificationsMenu:Triggers' => 'Triggers',
-	'UI:NotificationsMenu:AvailableTriggers' => 'Beschikbare triggers',
-	'UI:NotificationsMenu:OnCreate' => 'Wanneer een object is aangemaakt',
-	'UI:NotificationsMenu:OnStateEnter' => 'Wanneer een object een bepaalde state ingaat',
-	'UI:NotificationsMenu:OnStateLeave' => 'Wanneer een object een bepaalde state verlaat',
-	'UI:NotificationsMenu:Actions' => 'Acties',
-	'UI:NotificationsMenu:AvailableActions' => 'Beschikbare acties',
-	
-	'Menu:AuditCategories' => 'Audit Categorieën',
-	'Menu:AuditCategories+' => 'Audit Categorieën',
-	'Menu:Notifications:Title' => 'Audit Categorieën',
-	
-	'Menu:RunQueriesMenu' => 'Queries uitvoeren',
-	'Menu:RunQueriesMenu+' => 'Voer een query uit',
-	
-	'Menu:QueryMenu' => 'Query phrasebook',
-	'Menu:QueryMenu+' => 'Query phrasebook',
-	
-	'Menu:UniversalSearchMenu' => 'Universele Zoekopdracht',
-	'Menu:UniversalSearchMenu+' => 'Zoek naar alles...',
-	
-	'Menu:ApplicationLogMenu' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu+' => 'Log de l\'application',
-	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
-
-	'Menu:UserManagementMenu' => 'Gebruikersmanagement',
-	'Menu:UserManagementMenu+' => 'Gebruikersmanagement',
-
-	'Menu:ProfilesMenu' => 'Profielen',
-	'Menu:ProfilesMenu+' => 'Profielen',
-	'Menu:ProfilesMenu:Title' => 'Profielen',
-
-	'Menu:UserAccountsMenu' => 'Gebruikersaccounts',
-	'Menu:UserAccountsMenu+' => 'Gebruikersaccounts',
-	'Menu:UserAccountsMenu:Title' => 'Gebruikersaccounts',	
-
-	'UI:iTopVersion:Short' => '%1$s versie %2$s',
-	'UI:iTopVersion:Long' => '%1$s versie %2$s-%3$s built on %4$s',
-	'UI:PropertiesTab' => 'Eigenschappen',
-
-	'UI:OpenDocumentInNewWindow_' => 'Open dit document in een nieuwe window: %1$s',
-	'UI:DownloadDocument_' => 'Download dit document: %1$s',
-	'UI:Document:NoPreview' => 'Er is geen preview beschikbaar voor dit type document',
-	'UI:Download-CSV' => 'Download %1$s',
-
-	'UI:DeadlineMissedBy_duration' => 'Gemist op %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',		
-	'UI:Deadline_Minutes' => '%1$d min',			
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
-	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
-	'UI:Help' => 'Help',
-	'UI:PasswordConfirm' => '(Bevestig)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Sla dit object op, voordat u meer %1$s objecten toevoegt.',
-	'UI:DisplayThisMessageAtStartup' => 'Geef dit bericht bij het opstarten weer',
-	'UI:RelationshipGraph' => 'Graphical view',
-	'UI:RelationshipList' => 'List',
-	'UI:OperationCancelled' => 'Operatie afgebroken',
-	'UI:ElementsDisplayed' => 'Filtering',
-
-	'Portal:Title' => 'iTop gebruikersportaal',
-	'Portal:NoRequestMgmt' => 'Beste %1$s, u bent naar deze pagina doorverwezen omdat uw account is geconfigureerd met het profiel \'Portal user\'. Helaas is iTop niet geïnstalleerd met de feature \'Request Management\'. Neem alstublieft contact op met uw administrator.',
-	'Portal:Refresh' => 'Herlaad',
-	'Portal:Back' => 'Vorige',
-	'Portal:WelcomeUserOrg' => 'Welkom %1$s, van %2$s',
-	'Portal:TitleDetailsFor_Request' => 'Details voor aanvraag',
-	'Portal:ShowOngoing' => 'Laat lopende aanvragen zien',
-	'Portal:ShowClosed' => 'Laat gesloten aanvragen zien',
-	'Portal:CreateNewRequest' => 'Maak een nieuwe aanvraag aan',
-	'Portal:CreateNewRequestItil' => 'Maak een nieuwe aanvraag aan',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => 'Verander mijn wachtwoord',
-	'Portal:Disconnect' => 'Disconnect',
-	'Portal:OpenRequests' => 'Mijn lopende aanvragen',
-	'Portal:ClosedRequests'  => 'Mijn gesloten aanvragen',
-	'Portal:ResolvedRequests'  => 'Mijn opgeloste aanvragen',
-	'Portal:SelectService' => 'Selecteer een dienst van de catalogus:',
-	'Portal:PleaseSelectOneService' => 'Selecteer alstublieft een dienst',
-	'Portal:SelectSubcategoryFrom_Service' => 'Selecteer een subcategorie voor de dienst %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Selecteer alstublieft een subcategorie',
-	'Portal:DescriptionOfTheRequest' => 'Voeg een beschrijving voor uw aanvraag toe:',
-	'Portal:TitleRequestDetailsFor_Request' => 'Details voor de aanvraag %1$s:',
-	'Portal:NoOpenRequest' => 'Geen aanvragen in deze categorie',
-	'Portal:NoClosedRequest' => 'Geen aanvragen in deze categorie',
-	'Portal:Button:ReopenTicket' => 'Heropen deze ticket',
-	'Portal:Button:CloseTicket' => 'Sluit deze ticket',
-	'Portal:Button:UpdateRequest' => 'Update de aanvraag',
-	'Portal:EnterYourCommentsOnTicket' => 'Voeg opmerkingen over het oplossen van deze ticket toe:',
-	'Portal:ErrorNoContactForThisUser' => 'Error: de huidige gebruiker is niet geassocieerd met een persoon/contact. Neem alstublieft contact op met uw administrator.',
-	'Portal:Attachments' => 'Bijlagen',
-	'Portal:AddAttachment' => ' Voeg bijlage toe ',
-	'Portal:RemoveAttachment' => ' Verwijder bijlage ',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Bijlage #%1$d to %2$s (%3$s)',
-	'Portal:SelectRequestTemplate' => 'Selecteer een template voor %1$s',
-	'Enum:Undefined' => 'Ongedefineerd',	
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Dagen %2$s Uren %3$s Minuten %4$s Seconden',
-	'UI:ModifyAllPageTitle' => 'Bewerk alles',
-	'UI:Modify_N_ObjectsOf_Class' => 'Bezig met het aanpassen van %1$d objecten van klasse %2$s',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Bezig met het aanpassen van %1$d objecten van klasse %2$s van de %3$d',
-	'UI:Menu:ModifyAll' => 'Bewerk...',
-	'UI:Button:ModifyAll' => 'Bewerk alles',
-	'UI:Button:PreviewModifications' => 'Preview van de bewerkingen >>',
-	'UI:ModifiedObject' => 'Object Bewerkt',
-	'UI:BulkModifyStatus' => 'Operatie',
-	'UI:BulkModifyStatus+' => 'Status van de operatie',
-	'UI:BulkModifyErrors' => 'Errors (indien van toepassing)',
-	'UI:BulkModifyErrors+' => 'Errors die de bewerking verhinderen',	
-	'UI:BulkModifyStatusOk' => 'Ok',
-	'UI:BulkModifyStatusError' => 'Error',
-	'UI:BulkModifyStatusModified' => 'Aangepast',
-	'UI:BulkModifyStatusSkipped' => 'Overgeslagen',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d keer',
-	'UI:BulkModify:N_MoreValues' => '%1$d meer waarden...',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Bezig met het plaatsen van het alleen-lezen veld: %1$s',
-	'UI:FailedToApplyStimuli' => 'De actie is mislukt.',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Bezig met het bewerken van %2$d objecten van klasse %3$s',
-	'UI:CaseLogTypeYourTextHere' => 'Typ uw text hier:',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
-	'UI:CaseLog:InitialValue' => 'Initiële waarde:',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'Het veld %1$s is niet beschrijfbaar omdat het onderdeel is van de data synchronisatie. Waarde niet opgegeven',
-	'UI:ActionNotAllowed' => 'U hebt geen toestemming om deze actie op deze objecten uit te voeren.',
-	'UI:BulkAction:NoObjectSelected' => 'Selecteer tenminste een object om deze actie uit te voeren',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Het veld %1$s is niets beschrijfbaar omdat het onderdeel is van de data synchronisatie. Waarde blijft onveranderd',
-	'UI:Pagination:HeaderSelection' => 'Totaal: %1$s objecten (%2$s objecten geselecteerd).',
-	'UI:Pagination:HeaderNoSelection' => 'Totaal: %1$s objecten.',
-	'UI:Pagination:PageSize' => '%1$s objecten per pagina',
-	'UI:Pagination:PagesLabel' => 'Paginas:',
-	'UI:Pagination:All' => 'Alles',
-	'UI:HierarchyOf_Class' => 'Hierarchie van %1$s',
-	'UI:Preferences' => 'Voorkeuren...',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'Favoriete Organizaties',
-	'UI:FavoriteOrganizations+' => 'Bekijk de organisaties die u wilt zijn in het drop-down menu voor een snelle toegang in de onderstaande lijst. '.
-								   'Merk op dat dit geen security instelling is, objecten van elke organisatie zijn nog steed zichtbaar en toegankelijk door "All Organizations" te selecteren in de drop-down list.',
-	'UI:FavoriteLanguage' => 'Taal van de Gebruikersinterface',
-	'UI:Favorites:SelectYourLanguage' => 'Selecteer uw taal',
-	'UI:FavoriteOtherSettings' => 'Overige instellingen',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Standaard lengte voor lijsten:  %1$s items per pagina',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Bewerkingen zullen worden genegeerd.',
-	'UI:CancelConfirmationMessage' => 'U zult uw aanpassingen verliezen. Wilt u alsnog doorgaan?',
-	'UI:AutoApplyConfirmationMessage' => 'Sommige veranderingen zijn nog niet doorgevoerd. Wilt u dat iTop deze meeneemt?',
-	'UI:Create_Class_InState' => 'Maak %1$s aan in state: ',
-	'UI:OrderByHint_Values' => 'Sorteervolgorde: %1$s',
-	'UI:Menu:AddToDashboard' => 'Voeg toe aan Dashboard...',
-	'UI:Button:Refresh' => 'Herlaad',
-
-	'UI:ConfigureThisList' => 'Configureer deze Lijst...',
-	'UI:ListConfigurationTitle' => 'Lijst Configuratie',
-	'UI:ColumnsAndSortOrder' => 'Columns en sorteervolgorde:',
-	'UI:UseDefaultSettings' => 'Gebruik de standaard instellingen',
-	'UI:UseSpecificSettings' => 'Gebruik de volgende instellingen:',
-	'UI:Display_X_ItemsPerPage' => 'Geef %1$s items per pagina weer',
-	'UI:UseSavetheSettings' => 'Sla de instellingen op',
-	'UI:OnlyForThisList' => 'Alleen voor deze lijst',
-	'UI:ForAllLists' => 'Standaard voor alle lijsten',
-	'UI:ExtKey_AsLink' => '%1$s (Link)',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
-	'UI:Button:MoveUp' => 'Ga omhoog',
-	'UI:Button:MoveDown' => 'Ga naar beneden',
-
-	'UI:OQL:UnknownClassAndFix' => 'Onbekende klasse "%1$s". U zou "%2$s" kunnen proberen.',
-	'UI:OQL:UnknownClassNoFix' => 'Onbekende klasse "%1$s"',
-
-	'UI:Dashboard:Edit' => 'Bewerk deze pagina...',
-	'UI:Dashboard:Revert' => 'Ga terug naar de originele versie...',
-	'UI:Dashboard:RevertConfirm' => 'Alle bewerkingen die zijn gemaakt aan de originele versie zullen verloren gaan. Bevestig dat u wilt doorgaan.',
-	'UI:ExportDashBoard' => 'Exporteer naar een bestand',
-	'UI:ImportDashBoard' => 'Importeer vanuit een bestand',
-	'UI:ImportDashboardTitle' => 'Importeer vanuit een bestand',
-	'UI:ImportDashboardText' => 'Selecteer een bestand van het dashboard om te importeren:',
-
-
-	'UI:DashletCreation:Title' => 'Maak een nieuwe Dashlet aan',
-	'UI:DashletCreation:Dashboard' => 'Dashboard',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type',
-	'UI:DashletCreation:EditNow' => 'Bewerk het Dashboard',
-
-	'UI:DashboardEdit:Title' => 'Dashboard Editor',
-	'UI:DashboardEdit:DashboardTitle' => 'Titel',
-	'UI:DashboardEdit:AutoReload' => 'Automatisch verversen',
-	'UI:DashboardEdit:AutoReloadSec' => 'Interval voor het automatisch verversen (seconden)',
-	'UI:DashboardEdit:AutoReloadSec+' => 'Het toegestane minimun is 5 seconden',
-
-	'UI:DashboardEdit:Layout' => 'Layout',
-	'UI:DashboardEdit:Properties' => 'Dashboard Eigenschappen',
-	'UI:DashboardEdit:Dashlets' => 'Beschikbare Dashlets',	
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Eigenschappen',	
-
-	'UI:Form:Property' => 'Eigenschap',
-	'UI:Form:Value' => 'Waarde',
-
-	'UI:DashletPlainText:Label' => 'Text',
-	'UI:DashletPlainText:Description' => 'Gewone text (niet geformatteerd)',
-	'UI:DashletPlainText:Prop-Text' => 'Text',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Voeg hier alstublieft wat text toe...',
-
-	'UI:DashletObjectList:Label' => 'Object lijst',
-	'UI:DashletObjectList:Description' => 'Object lijst dashlet',
-	'UI:DashletObjectList:Prop-Title' => 'Titel',
-	'UI:DashletObjectList:Prop-Query' => 'Query',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
-	'UI:DashletGroupBy:Prop-Title' => 'Titel',
-	'UI:DashletGroupBy:Prop-Query' => 'Query',
-	'UI:DashletGroupBy:Prop-Style' => 'Stijl',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Groepeer aan de hand van...',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Uur %1$s (0-23)',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Maand %1$s (1 - 12)',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Dag van de week voor %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Dag van de maand voor %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (uur)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (maand)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dag van de week)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dag van de maand)',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Selecteer alstublieft het veld waarin de objecten gegroepeerd moeten worden',
-
-	'UI:DashletGroupByPie:Label' => 'Cirkeldiagram',
-	'UI:DashletGroupByPie:Description' => 'Cirkeldiagram',
-	'UI:DashletGroupByBars:Label' => 'Staafdiagram',
-	'UI:DashletGroupByBars:Description' => 'Staafdiagram',
-	'UI:DashletGroupByTable:Label' => 'Groepeer aan de hand van (tabel)',
-	'UI:DashletGroupByTable:Description' => 'Lijst (Gegroepeerd aan de hand van een veld)',
-
-	'UI:DashletHeaderStatic:Label' => 'Kopje',
-	'UI:DashletHeaderStatic:Description' => 'Geeft een horizontale separator weer',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacten',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icoon',
-
-	'UI:DashletHeaderDynamic:Label' => 'Koje met gegevens',
-	'UI:DashletHeaderDynamic:Description' => 'Kopje met stats (gegroepeerd aan de hand van...)',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacten',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icoon',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitel',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacten',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gegroepeerd aan de hand van',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Waarden',
-
-	'UI:DashletBadge:Label' => 'Badge',
-	'UI:DashletBadge:Description' => 'Object Icoon met nieuw/zoek naar',
-	'UI:DashletBadge:Prop-Class' => 'Klasse',
-
-	'DayOfWeek-Sunday' => 'Zondag',
-	'DayOfWeek-Monday' => 'Maandag',
-	'DayOfWeek-Tuesday' => 'Dinsdag',
-	'DayOfWeek-Wednesday' => 'Woensdag',
-	'DayOfWeek-Thursday' => 'Donderdag',
-	'DayOfWeek-Friday' => 'Vrijdag',
-	'DayOfWeek-Saturday' => 'Zaterdag',
-	'Month-01' => 'Januari',
-	'Month-02' => 'Februari',
-	'Month-03' => 'Maart',
-	'Month-04' => 'April',
-	'Month-05' => 'Mei',
-	'Month-06' => 'Juni',
-	'Month-07' => 'Juli',
-	'Month-08' => 'Augustus',
-	'Month-09' => 'September',
-	'Month-10' => 'Oktober',
-	'Month-11' => 'November',
-	'Month-12' => 'December',
-
-	'UI:Menu:ShortcutList' => 'Maak een Snelkoppeling aan...',
-	'UI:ShortcutRenameDlg:Title' => 'Hernoem de snelkoppeling',
-	'UI:ShortcutListDlg:Title' => 'Maak een snelkoppeling voor de lijst aan',
-	'UI:ShortcutDelete:Confirm' => 'Bevestig dat u de snelkoppeling(en) wilt verwijderen.',
-	'Menu:MyShortcuts' => 'Mijn Snelkoppeling',
-	'Class:Shortcut' => 'Snelkoppeling',
-	'Class:Shortcut+' => '',
-	'Class:Shortcut/Attribute:name' => 'Naam',
-	'Class:Shortcut/Attribute:name+' => 'Label gebruikt in het menu en in de titel van de pagina',
-	'Class:ShortcutOQL' => 'Zoekresultaat snelkoppeling',
-	'Class:ShortcutOQL+' => '',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL die de lijst van objecten om naar te zoeken defineerd',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatisch verversen',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Onbruikbaar',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Interval van het automatisch verversen (seconden)',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec+' => 'Het toegestane minimum is 5 seconden',
-
-	'UI:FillAllMandatoryFields' => 'Vul alstublieft de verplichte velden in.',
-	
-	'UI:CSVImportConfirmTitle' => 'Bevestig alstublieft de actie',
-	'UI:CSVImportConfirmMessage' => 'Weet u zeker dat u dit wilt doen?',
-	'UI:CSVImportError_items' => 'Errors: %1$d',
-	'UI:CSVImportCreated_items' => 'Aangemaakt: %1$d',
-	'UI:CSVImportModified_items' => 'Bewerkt: %1$d',
-	'UI:CSVImportUnchanged_items' => 'Onveranderd: %1$d',
-
-	'UI:Button:Remove' => 'Verwijder',
-	'UI:AddAnExisting_Class' => 'Voeg objecten van type %1$s toe...',
-	'UI:SelectionOf_Class' => 'Selectie van objecten van type %1$s',
-
-	'UI:AboutBox' => 'Over iTop...',
-	'UI:About:Title' => 'Over iTop',
-	'UI:About:DataModel' => 'Data model',
-	'UI:About:Support' => 'Support informatie',
-	'UI:About:Licenses' => 'Licenties',
-	'UI:About:Modules' => 'Geïnstalleerde modules',
-	'Menu:CSVImportMenu' => 'CSV import~~',
-	'Menu:CSVImportMenu+' => 'Bulk creation or update~~',
-	'Menu:DataAdministration' => 'Data administratie',
-	'Menu:DataAdministration+' => 'Data administratie',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+<?php 
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * @author	LinProfs <info@linprofs.com>
+ * 
+ * Linux & Open Source Professionals
+ * http://www.linprofs.com
+ * 
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @licence	http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands' , array(
+	'Class:AuditCategory' => 'Audit Categorie',
+	'Class:AuditCategory+' => 'Een onderdeel van de gehele audit',
+	'Class:AuditCategory/Attribute:name' => 'Categorienaam',
+	'Class:AuditCategory/Attribute:name+' => 'Afkorting van de naam van deze categorie',
+	'Class:AuditCategory/Attribute:description' => 'Audit categorie beschrijving' ,
+	'Class:AuditCategory/Attribute:description+' => 'Uitgebreide beschrijving van deze Audit categorie' ,
+	'Class:AuditCategory/Attribute:definition_set' => 'Definitie Set',
+	'Class:AuditCategory/Attribute:definition_set+' => 'OQL expression die de set van objecten naar audit defineert',
+	'Class:AuditCategory/Attribute:rules_list' => 'Audit Regels',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Audit regels voor deze categorie',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:AuditRule' => 'Audit Regel',
+	'Class:AuditRule+' => 'Een regel voor het controleren van een bepaalde Audit categorie',
+	'Class:AuditRule/Attribute:name' => 'Naam van de regel',
+	'Class:AuditRule/Attribute:name+' => 'Afkorting van de regel',
+	'Class:AuditRule/Attribute:description' => 'Audit Regel beschrijving',
+	'Class:AuditRule/Attribute:description+' => 'Uitgebreide beschrijving van deze Audit regel',
+	'Class:AuditRule/Attribute:query' => 'Query om te runnen',
+	'Class:AuditRule/Attribute:query+' => 'De OQL expression voor het runnen',
+	'Class:AuditRule/Attribute:valid_flag' => 'Geldige objecten?',
+	'Class:AuditRule/Attribute:valid_flag+' => 'True als de regel de geldige objecten teruggeeft, anders false',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
+	'Class:AuditRule/Attribute:category_id' => 'Categorie',
+	'Class:AuditRule/Attribute:category_id+' => 'De categorie voor deze regel',
+	'Class:AuditRule/Attribute:category_name' => 'Categorie',
+	'Class:AuditRule/Attribute:category_name+' => 'Naam van de categorie voor deze regel',
+));
+
+//
+// Class: QueryOQL
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:Query' => 'Query',
+	'Class:Query+' => 'Een query is een data set die op een dynamische manier is gedefineerd',
+	'Class:Query/Attribute:name' => 'Naam',
+	'Class:Query/Attribute:name+' => 'Identificeerd de query',
+	'Class:Query/Attribute:description' => 'Beschrijving',
+	'Class:Query/Attribute:description+' => 'Uitgebreide beschrijving voor de query(doel, gebruik, etc.)',
+	'Class:Query/Attribute:fields' => 'Velden',
+	'Class:Query/Attribute:fields+' => 'Comma separated list van attributen (of alias.attribute) om te exporteren',
+
+	'Class:QueryOQL' => 'OQL Query',
+	'Class:QueryOQL+' => 'Een query gebaseerd op de Object Query Language',
+	'Class:QueryOQL/Attribute:oql' => 'Expressie',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expressie',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:User' => 'Gebruiker',
+	'Class:User+' => 'Gebruiker login',
+	'Class:User/Attribute:finalclass' => 'Accounttype',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'Contact (persoon)',
+	'Class:User/Attribute:contactid+' => 'Persoonlijke details van de business data',
+	'Class:User/Attribute:last_name' => 'Achternaam',
+	'Class:User/Attribute:last_name+' => 'Naam van het overeenkomende contact',
+	'Class:User/Attribute:first_name' => 'Voornaam',
+	'Class:User/Attribute:first_name+' => 'Voornaam van het overeenkomende contact',
+	'Class:User/Attribute:email' => 'Email',
+	'Class:User/Attribute:email+' => 'Email van het overeenkomende contact',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => 'Identification string van de gebruiker',
+	'Class:User/Attribute:language' => 'Taal',
+	'Class:User/Attribute:language+' => 'Taal van de gebruiker',
+	'Class:User/Attribute:language/Value:EN US' => 'Engels',
+	'Class:User/Attribute:language/Value:EN US+' => 'Engels (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => 'Frans',
+	'Class:User/Attribute:language/Value:FR FR+' => 'Frans (Frankrijk)',
+	'Class:User/Attribute:profile_list' => 'Profielen',
+	'Class:User/Attribute:profile_list+' => 'Rollen, verlenen rechten aan deze persoon',
+	'Class:User/Attribute:allowed_org_list' => 'Mijn organisaties',
+	'Class:User/Attribute:allowed_org_list+' => 'De eindgebruiker heeft toestemming om data te zien van de volgende organisaties. Als er geen organisatie is gespecificeerd, is er geen restrictie.',
+
+	'Class:User/Error:LoginMustBeUnique' => 'Login moet uniek zijn- “%1s� is al in gebruik',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'In ieder geval een profiel moet toegewezen zijn aan deze gebruiker',
+
+	'Class:UserInternal' => 'Interne gebruiker',
+	'Class:UserInternal+' => 'Gebruiker gedefineerd in iTop',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_Profiles' => 'Profiel',
+	'Class:URP_Profiles+' => 'Gebruikersprofiel',
+	'Class:URP_Profiles/Attribute:name' => 'Naam',
+	'Class:URP_Profiles/Attribute:name+' => 'label',
+	'Class:URP_Profiles/Attribute:description' => 'Beschrijving',
+	'Class:URP_Profiles/Attribute:description+' => 'Beschrijving bestaand uit een regel',
+	'Class:URP_Profiles/Attribute:user_list' => 'Gebruikers',
+	'Class:URP_Profiles/Attribute:user_list+' => 'Gebruikers met deze rol',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_Dimensions' => 'Dimensie',
+	'Class:URP_Dimensions+' => 'Dimensie van de applicatie (defineert silos)',
+	'Class:URP_Dimensions/Attribute:name' => 'Naam',
+	'Class:URP_Dimensions/Attribute:name+' => 'label',
+	'Class:URP_Dimensions/Attribute:description' => 'Beschrijving',
+	'Class:URP_Dimensions/Attribute:description+' => 'Beschrijving bestaande uit een regel',
+	'Class:URP_Dimensions/Attribute:type' => 'Type',
+	'Class:URP_Dimensions/Attribute:type+' => 'Klassenaam of data type (projection unit)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_UserProfile' => 'Gebruiker naar profiel',
+	'Class:URP_UserProfile+' => 'Gebruikerprofielen',
+	'Class:URP_UserProfile/Attribute:userid' => 'Gebruiker',
+	'Class:URP_UserProfile/Attribute:userid+' => 'Gebruiker account',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'Login van de gebruiker',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profiel',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'Gebruiksprofiel',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profiel',
+	'Class:URP_UserProfile/Attribute:profile+' => 'Naam van het profiel',
+	'Class:URP_UserProfile/Attribute:reason' => 'Reden',
+	'Class:URP_UserProfile/Attribute:reason+' => 'Leg uit waarom deze persoon deze rol heeft',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_UserOrg' => 'Gebruikersorganisaties',
+	'Class:URP_UserOrg+' => 'Mijn organisaties',
+	'Class:URP_UserOrg/Attribute:userid' => 'Gebruiker',
+	'Class:URP_UserOrg/Attribute:userid+' => 'Account van de gebruiker',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login van de gebruiker',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organisatie',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Mijn organisatie',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Mijn organisatie',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Mijn organisatie',
+	'Class:URP_UserOrg/Attribute:reason' => 'Reden',
+	'Class:URP_UserOrg/Attribute:reason+' => 'Leg uit waarom deze persoon de data van deze organisatie mag inzien',
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => 'profile projections',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensie',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'Dimensie van de applicatie',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensie',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'Dimensie van de applicatie',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profiel',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'Gebruiksprofiel',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profiel',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'Naam van het profiel',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Value expression',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (gebruikt $user) | constant |  | +attribute code',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribuut',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Target attribuutcode (optioneel)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => 'class projections',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensie',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'Dimensie van de applicatie',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensie',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'Dimensie van de applicatie',
+	'Class:URP_ClassProjection/Attribute:class' => 'Klasse',
+	'Class:URP_ClassProjection/Attribute:class+' => 'Target klasse',
+	'Class:URP_ClassProjection/Attribute:value' => 'Value expression',
+	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (gebruikt $this) | constant |  | +attribute code',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Attribuut',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'Target attribuutcode (optioneel)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_ActionGrant' => 'action_permission',
+	'Class:URP_ActionGrant+' => 'Toestemming aan klasses',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profiel',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'Gebruiksprofiel',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profiel',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'Gebruiksprofiel',
+	'Class:URP_ActionGrant/Attribute:class' => 'Klasse',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Target klasse',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Toestemming',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'Toestemming of geen toestemming?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Ja',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'Ja',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Nee',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'Nee',
+	'Class:URP_ActionGrant/Attribute:action' => 'Actie',
+	'Class:URP_ActionGrant/Attribute:action+' => 'Actie om te ondernemen op een bepaalde klasse',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => 'Toegestane stimulus in de levenscyclus van het object',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profiel',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Gebruiksprofiel',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profiel',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'Gebruiksprofiel',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Klasse',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'Target klasse',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Toestemming',
+	'Class:URP_StimulusGrant/Attribute:permission+' => 'Toestemming of geen toestemming',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Ja',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'Ja',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Nee',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'Nee',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Stimulus',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'stimulus code',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'Class:URP_AttributeGrant' => 'attribute_permission',
+	'Class:URP_AttributeGrant+' => 'Toestemming op het niveau van de attributen',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Actie verleen',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'actie verleen',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Attribuut',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'attribuut code',
+));
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
+	'BooleanLabel:yes' => 'Ja',
+	'BooleanLabel:no' => 'Nee',
+	'Menu:WelcomeMenu' => 'Welkom',
+	'Menu:WelcomeMenu+' => 'Welkom in iTop',
+	'Menu:WelcomeMenuPage' => 'Welkom',
+	'Menu:WelcomeMenuPage+' => 'Welkom in iTop',
+	'UI:WelcomeMenu:Title' => 'Welkom in iTop',
+
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop is een compleet, OpenSource, IT Operationeel Portaal.</p>
+<ul>Inclusief:
+<li>Een complete CMDB (Configuration management database) voor het documenteren en managen van de IT inventaris.</li>
+<li>Een Incident management module voor het vinden van en communiceren over alle problemen die optreden binnen de IT.</li>
+<li>Een change management module voor het plannen en natrekken van de veranderingen in de IT omgeving.</li>
+<li>Een database met bekende errors om de oplossing van incidenten te versnellen.</li>
+<li>Een storingsmodule voor het documenteren van alle geplande storingen en voor het informeren van de juiste contacten.</li>
+<li>Dashboards om snel een overzicht te krijgen van uw IT.</li>
+</ul>
+<p>Alle modules kunnen apart, stap voor stap, volledig onafhankelijk van elkaar, worden opgezet.</p>',
+
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop is georiënteerd op service providers, het zorgt ervoor dat IT engineers makkelijk meerdere klanten of organisaties kunnen managen.
+<ul>iTop, levert een uitgebreide set van zakenprocessen die:
+<li>De effectiveit van het IT management verbeterd</li> 
+<li>De prestatie van IT operaties verbeterd</li> 
+<li>De klanttevredenheid verhoogd en leidinggevenden inzicht biedt in hun business performance.</li>
+</ul>
+</p>
+<p>iTop is klaar om te worden geïntegreerd met uw huidige IT Management infrastructuur.</p>
+<p>
+<ul>De adoptie van dit IT Operational portaal van de nieuwste generatie zal u helpen met:
+<li>Het beter managen van een meer en meer complexe IT omgeving.</li>
+<li>Het implementeren van ITIL processen in uw eigen tempo.</li>
+<li>Het managen van het belangrijkste middel van uw IT: Documentatie.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Open aanvragen: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Mijn aanvragen',
+	'UI:WelcomeMenu:OpenIncidents' => 'Open incidenten: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Configuratie Items: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Aan mij toegewezen incidenten',
+	'UI:AllOrganizations' => ' Alle Organisaties ',
+	'UI:YourSearch' => 'Jouw zoekopdracht',
+	'UI:LoggedAsMessage' => 'Ingelogd als %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Ingelogd als %1$s (Administrator)',
+	'UI:Button:Logoff' => 'Log uit',
+	'UI:Button:GlobalSearch' => 'Zoek',
+	'UI:Button:Search' => ' Zoek ',
+	'UI:Button:Query' => ' Query ',
+	'UI:Button:Ok' => 'Ok',
+	'UI:Button:Save' => 'Opslaan',
+	'UI:Button:Cancel' => 'Annuleer',
+	'UI:Button:Apply' => 'Pas toe',
+	'UI:Button:Back' => ' << Vorige ',
+	'UI:Button:Restart' => ' |<< Herstart ',
+	'UI:Button:Next' => ' Volgende >> ',
+	'UI:Button:Finish' => ' Eindig ',
+	'UI:Button:DoImport' => ' Run de Import ! ',
+	'UI:Button:Done' => ' Klaar ',
+	'UI:Button:SimulateImport' => ' Simuleer de Import ',
+	'UI:Button:Test' => 'Test!',
+	'UI:Button:Evaluate' => ' Evalueer ',
+	'UI:Button:Evaluate:Title' => ' Evalueer (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Voeg toe... ',
+	'UI:Button:BrowseObjects' => ' Browse... ',
+	'UI:Button:Add' => ' Voeg toe ',
+	'UI:Button:AddToList' => ' << Voeg toe ',
+	'UI:Button:RemoveFromList' => ' Verwijder >> ',
+	'UI:Button:FilterList' => ' Filter... ',
+	'UI:Button:Create' => ' Maak aan ',
+	'UI:Button:Delete' => ' Verwijder ! ',
+	'UI:Button:Rename' => ' Hernoem... ',
+	'UI:Button:ChangePassword' => ' Verander Password ',
+	'UI:Button:ResetPassword' => ' Reset Password ',
+	
+	'UI:SearchToggle' => 'Zoek',
+	'UI:ClickToCreateNew' => 'Maak een %1$s aan',
+	'UI:SearchFor_Class' => 'Zoek naar %1$s objecten',
+	'UI:NoObjectToDisplay' => 'Geen object om weer te geven.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parameter object_id is verplicht als link_attr is gespecificeerd. Controleer de definitie van het display template.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parameter target_attr is verplicht als link_attr is gespecificeerd. Controleer de definitie van het display template.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parameter group_by is verplicht. Controleer de definitie van het display template.',
+	'UI:Error:InvalidGroupByFields' => 'Invalid list of fields to group by: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Error: style of block wordt niet ondersteund: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Incorrecte linkdefinitie: de klasse van objecten om te managen: %1$s is niet gevonden als external key in de klasse %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d niet gevonden',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Error: Circulaire referentie in  de afhankelijke variabelen tussen de velden, controleer het data model.',
+	'UI:Error:UploadedFileTooBig' => 'Het geüploade bestand is te groot. (Maximale grootte is %1$s). Contacteer uw iTop administrator om dit limiet aan te passen. (Check de PHP configuratie voor upload_max_filesize en post_max_size op de server).',
+	'UI:Error:UploadedFileTruncated.' => 'Het geüploade bestand is afkapt !',
+	'UI:Error:NoTmpDir' => 'De tijdelijke opslagruimte is niet gedefineerd.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Niet mogelijk om het tijdelijke bestand naar de schijf over te schrijven. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload gestopt door extension. (Original file name = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Uploaden van bestand mislukt, oorzaak onbekend. (Error code = "%1$s").',
+	
+	'UI:Error:1ParametersMissing' => 'Error: de volgende parameter moet worden gespecificeerd voor deze actie: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Error: de volgende parameters moeten worden gespecificeerd voor deze actie: %1$s and %2$s.',
+	'UI:Error:3ParametersMissing' => 'Error: de volgende parameters moeten worden gespecificeerd voor deze actie: %1$s, %2$s and %3$s.',
+	'UI:Error:4ParametersMissing' => 'Error: de volgende parameters moeten worden gespecificeerd voor deze actie: %1$s, %2$s, %3$s and %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Error: incorrecte OQL query: %1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Een error trad op tijdens het runnen van de query: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Error: het object is al geupdatet.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Error: het object kan niet worden geupdatet.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Error: objecten zijn al verwijderd',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'U bent niet gemachtigd tot het grootschalig verwijderen van objecten in klasse %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'U bent niet gemachtigd objecten in klasse %1$s te verwijderen',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'U bent niet gemachtigd tot een grootschalige update van objecten in klasse %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Error: het object is al gekloond!',
+	'UI:Error:ObjectAlreadyCreated' => 'Error: het object is al aangemaakt!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Error: invalide stimulus "%1$s" op object %2$s in state "%3$s".',
+	
+	
+	'UI:GroupBy:Count' => 'Tel',
+	'UI:GroupBy:Count+' => 'Aantal elementen',
+	'UI:CountOfObjects' => '%1$d objecten voldoen aan de criteria.',
+	'UI_CountOfObjectsShort' => '%1$d objecten.',
+	'UI:NoObject_Class_ToDisplay' => 'Geen %1$s om weer te geven',
+	'UI:History:LastModified_On_By' => 'Laatst bewerkt op %1$s door %2$s.',
+	'UI:HistoryTab' => 'Geschiedenis',
+	'UI:NotificationsTab' => 'Notificaties',
+	'UI:History:BulkImports' => 'Geschiedenis',
+	'UI:History:BulkImports+' => 'Lijst van CSV imports (nieuwste import eerst)',
+	'UI:History:BulkImportDetails' => 'Veranderingen volgend op CSV import uitgevoerd op %1$s (door %2$s)',
+	'UI:History:Date' => 'Datum',
+	'UI:History:Date+' => 'Datum van verandering',
+	'UI:History:User' => 'Gebruiker',
+	'UI:History:User+' => 'Gebruiker die de verandering doorvoerde',
+	'UI:History:Changes' => 'Verandering',
+	'UI:History:Changes+' => 'Veranderingen gemaakt aan object',
+	'UI:History:StatsCreations' => 'Aangemaakt',
+	'UI:History:StatsCreations+' => 'Aantal aangemaakte objecten',
+	'UI:History:StatsModifs' => 'Aangepast',
+	'UI:History:StatsModifs+' => 'Aantal aangepaste objecten',
+	'UI:History:StatsDeletes' => 'Verwijderd',
+	'UI:History:StatsDeletes+' => 'Aantal verwijderde objecten',
+	'UI:Loading' => 'Laden...',
+	'UI:Menu:Actions' => 'Acties',
+	'UI:Menu:OtherActions' => 'Andere acties',
+	'UI:Menu:New' => 'Nieuw...',
+	'UI:Menu:Add' => 'Voeg toe...',
+	'UI:Menu:Manage' => 'Manage...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'CSV Export...',
+	'UI:Menu:Modify' => 'Bewerk...',
+	'UI:Menu:Delete' => 'Verwijder...',
+	'UI:Menu:Manage' => 'Manage...',
+	'UI:Menu:BulkDelete' => 'Verwijder...',
+	'UI:UndefinedObject' => 'Ongedefineerd',
+	'UI:Document:OpenInNewWindow:Download' => 'Open in nieuw window: %1$s, Download: %2$s',
+	'UI:SelectAllToggle+' => 'Selecteer / Deselecteer Alles',
+	'UI:SplitDateTime-Date' => 'datum',
+	'UI:SplitDateTime-Time' => 'tijd',
+	'UI:TruncatedResults' => '%1$d objecten weergegeven buiten %2$d',
+	'UI:DisplayAll' => 'Geef Alles weer',
+	'UI:CollapseList' => 'Collapse',
+	'UI:CountOfResults' => '%1$d object(s)',
+	'UI:ChangesLogTitle' => 'Changes log (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Changes log is leeg',
+	'UI:SearchFor_Class_Objects' => 'Zoek naar %1$s Objecten',
+	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryTab' => 'OQL Query',
+	'UI:SimpleSearchTab' => 'Simple Search',
+	'UI:Details+' => 'Details',
+	'UI:SearchValue:Any' => '* Ieder *',
+	'UI:SearchValue:Mixed' => '* mixed *',
+	'UI:SearchValue:NbSelected' => '# geselecteerd',
+	'UI:SearchValue:CheckAll' => 'Check Alles',
+	'UI:SearchValue:UncheckAll' => 'Uncheck Alles',
+	'UI:SelectOne' => '-- selecteer een --',
+	'UI:Login:Welcome' => 'Welkom in iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Incorrect login/wachtwoord, probeer opnieuw.',
+	'UI:Login:IdentifyYourself' => 'Identificeer uzelf voordat u verder gaat',
+	'UI:Login:UserNamePrompt' => 'Gebruikersnaam',
+	'UI:Login:PasswordPrompt' => 'Wachtwoord',
+	'UI:Login:ForgotPwd' => 'Wachtwoord vergeten?',
+	'UI:Login:ForgotPwdForm' => 'Wachtwoord vergeten',
+	'UI:Login:ForgotPwdForm+' => 'iTop kan u een e-mail sturen waarin u de instructies voor het resetten van uw account kunt vinden.',
+	'UI:Login:ResetPassword' => 'Stuur nu!',
+	'UI:Login:ResetPwdFailed' => 'E-mail sturen mislukt: %1$s',
+
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is geen geldige login',
+	'UI:ResetPwd-Error-NotPossible' => 'externe accounts staan het resetten van het wachtwoord niet toe.',
+	'UI:ResetPwd-Error-FixedPwd' => 'deze account staat het resetten van het wachtwoord niet toe',
+	'UI:ResetPwd-Error-NoContact' => 'deze account is niet geassocieerd met een persoon.',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'deze account is niet geassocieerd met een persoon die beschikt over een e-mail attribuut. Neem alstublieft contact op met uw administrator.',
+	'UI:ResetPwd-Error-NoEmail' => 'Er mist een e-mailadres. Neem alstublieft contact op met uw administrator.',
+	'UI:ResetPwd-Error-Send' => 'Er is een technisch probleem bij het verzenden van de e-mail. Neem alstublieft contact op met uw administrator.',
+	'UI:ResetPwd-EmailSent' => 'Kijk alstublieft in uw mailbox en volg de insturcties...',
+	'UI:ResetPwd-EmailSubject' => 'Reset uw iTop wachtwoord',
+	'UI:ResetPwd-EmailBody' => '<body><p>U hebt een reset van uw iTop wachtwoord aangevraagd.</p><p>Klik op deze link (eenmalig gebruik) om <a href="%1$s">een nieuw wachtwoord in te voeren</a></p>.',
+
+	'UI:ResetPwd-Title' => 'Reset wachtwoord',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, of uw wachtwoord is al gereset, of u heeft al meerdere e-mails ontvangen. Zorg ervoor dat u de link in de laatst ontvangen e-mail gebruikt.',
+	'UI:ResetPwd-Error-EnterPassword' => 'Voer het nieuwe wachtwoord voor de account \'%1$s\' in.',
+	'UI:ResetPwd-Ready' => 'Het wachtwoord is veranderd',
+	'UI:ResetPwd-Login' => 'Klik hier om in te loggen',
+
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'Verander uw wachtwoord',
+	'UI:Login:OldPasswordPrompt' => 'Oud wachtwoord',
+	'UI:Login:NewPasswordPrompt' => 'Nieuw wachtwoord',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Herhaal nieuwe wachtwoord',
+	'UI:Login:IncorrectOldPassword' => 'Error: het oude wachtwoord is incorrect',
+	'UI:LogOffMenu' => 'Log uit',
+	'UI:LogOff:ThankYou' => 'Bedankt voor het gebruiken van iTop',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Klik hier om in te loggen',
+	'UI:ChangePwdMenu' => 'Verander wachtwoord',
+	'UI:Login:PasswordChanged' => 'Wachtwoord succesvol veranderd',
+	'UI:AccessRO-All' => 'iTop is alleen-lezen',
+	'UI:AccessRO-Users' => 'iTop is alleen-lezen voor eindgebruikers',
+	'UI:ApplicationEnvironment' => 'Omgeving van de applicatie: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Het nieuwe wachtwoord en de herhaling van het nieuwe wachtwoord komen niet overeen',
+	'UI:Button:Login' => 'Enter iTop',
+	'UI:Login:Error:AccessRestricted' => 'iTop toegang is verboden. Neem alstublieft contact op met een iTop administrator.',
+	'UI:Login:Error:AccessAdmin' => 'Alleen toegankelijk voor mensen met administrator rechten. Neem alstublieft contact op met een iTop administrator',
+	'UI:CSVImport:MappingSelectOne' => '-- Selecteer een --',
+	'UI:CSVImport:MappingNotApplicable' => '-- Negeer dit veld --',
+	'UI:CSVImport:NoData' => 'Lege data set..., voeg data toe',
+	'UI:Title:DataPreview' => 'Data Preview',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: De data bevat slechts een column. Hebt de juiste separator karakter geselecteerd?',
+	'UI:CSVImport:FieldName' => 'Veld %1$d',
+	'UI:CSVImport:DataLine1' => 'Data Line 1',
+	'UI:CSVImport:DataLine2' => 'Data Line 2',
+	'UI:CSVImport:idField' => 'id (Primary Key)',
+	'UI:Title:BulkImport' => 'iTop - Bulk import',
+	'UI:Title:BulkImport+' => 'CSV Import Wizard',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronisatie van %1$d objecten van klasse %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- selecteer een --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Interne error: "%1$s" is een incorrecte code omdat "%2$s" geen externe key van klasse "%3$s" is',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objecten(s) zullen onveranderd blijven.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objecten(s) zullen worden veranderd.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objecten(s) zullen worden toegevoegd.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objecten(s) zullen errors hebben.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objecten(s) zijn onveranderd gebleven.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objecten(s) zijn veranderd.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objecten(s) zijn toegevoegd.',
+	'UI:CSVImport:ObjectsHadErrors' => 'bij %1$d objecten(s) traden errors op.',
+	'UI:Title:CSVImportStep2' => 'Step 2 of 5: CSV data opties',
+	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Data mapping',
+	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Import simulatie',
+	'UI:Title:CSVImportStep5' => 'Step 5 of 5: Import compleet',
+	'UI:CSVImport:LinesNotImported' => 'Regels die niet konden worden geladen:',
+	'UI:CSVImport:LinesNotImported+' => 'De volgende regels zijn niet geïmporteerd omdat ze fouten bevatten',
+	'UI:CSVImport:SeparatorComma+' => ', (komma)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (semicolon)',
+	'UI:CSVImport:SeparatorTab+' => 'tab',
+	'UI:CSVImport:SeparatorOther' => 'other:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (dubbele quote)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (enkele quote)',
+	'UI:CSVImport:QualifierOther' => 'anders:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Beschouw de eerste regel als kop (column naam)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Sla %1$s regels aan het begin van het bestand over',
+	'UI:CSVImport:CSVDataPreview' => 'CSV Data Preview',
+	'UI:CSVImport:SelectFile' => 'Selecteer het bestand om te importeren:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Laad van een bestand',
+	'UI:CSVImport:Tab:CopyPaste' => 'Kopieer en plak data',
+	'UI:CSVImport:Tab:Templates' => 'Templates',
+	'UI:CSVImport:PasteData' => 'Plak data om te importeren:',
+	'UI:CSVImport:PickClassForTemplate' => 'Kies template om te downloaden: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Separator karakter:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Text qualifier karakter',
+	'UI:CSVImport:CommentsAndHeader' => 'Opmerkingen en kopje',
+	'UI:CSVImport:SelectClass' => 'Selecteer de klasse om te importeren:',
+	'UI:CSVImport:AdvancedMode' => 'Advanced mode',
+	'UI:CSVImport:AdvancedMode+' => 'In advanced mode kan het "id" (primary key) van de objecten worden gebruikt om deze te updaten en te hernoemen.' .
+									'De column "id" (indien beschikbaar)echter, kan alleen worden gebruikt als zoekcriterium en kan niet worden gecombineerd met andere zoekcriteria.',
+	'UI:CSVImport:SelectAClassFirst' => 'Om de mapping te configureren, moet u eerst een klasse selecteren.',
+	'UI:CSVImport:HeaderFields' => 'Velden',
+	'UI:CSVImport:HeaderMappings' => 'Mappings',
+	'UI:CSVImport:HeaderSearch' => 'Search?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Selecteer alstublieft een mapping voor ieder veld',
+	'UI:CSVImport:AlertMultipleMapping' => 'Zorg er alstublieft voor dat het veld slechts een keer gemapped is',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Selecteer alstublieft tenminste een zoekcriterium.',
+	'UI:CSVImport:Encoding' => 'Character encoding',	
+	'UI:UniversalSearchTitle' => 'iTop - Universele zoekopdracht',
+	'UI:UniversalSearch:Error' => 'Error: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Selecteer de klasse om te zoeken: ',
+
+	'UI:CSVReport-Value-Modified' => 'Veranderd',
+	'UI:CSVReport-Value-SetIssue' => 'Kon niet worden veranderd- reden: %1$s',
+	'UI:CSVReport-Value-ChangeIssue' => 'Kon niet worden veranderd naar %1$s - reden: %2$s',
+	'UI:CSVReport-Value-NoMatch' => 'Geen overeenkomst',
+	'UI:CSVReport-Value-Missing' => 'Ontbrekende verplichte waarde',
+	'UI:CSVReport-Value-Ambiguous' => 'Onduidelijk: gevonden %1$s objecten',
+	'UI:CSVReport-Row-Unchanged' => 'onveranderd',
+	'UI:CSVReport-Row-Created' => 'gemaakt',
+	'UI:CSVReport-Row-Updated' => ' %1$d geupdatet cols',
+	'UI:CSVReport-Row-Disappeared' => 'verdwenen, %1$d veranderde cols',
+	'UI:CSVReport-Row-Issue' => 'Probleem: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'Null niet toegestaan',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object niet gevonden',
+	'UI:CSVReport-Value-Issue-FoundMany' => ' %1$d Matches gevonden',
+	'UI:CSVReport-Value-Issue-Readonly' => 'Het attribuut \'%1$s\' is alleen-lezen en kan niet worden veranderd (huidige waarde: %2$s,voorgestelde waarde: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => 'Input %1$s verwerken mislukt',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Onverwachte waarde voor attribuut \'%1$s\': geen match gevonden, controleer spelling',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Onverwachte waarde voor attribuut \'%1$s\': %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributen komen niet met elkaar overeeen: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Onverwachte attribuutwaarden',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Kon niet worden gemaakt, door het ontbreken van externe code(s): %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'verkeerde date format',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'Verbeteren mislukt',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'Onduidelijke verbetering',
+	'UI:CSVReport-Row-Issue-Internal' => 'Interne error: %1$s, %2$s',
+
+	'UI:CSVReport-Icon-Unchanged' => 'Onveranderd',
+	'UI:CSVReport-Icon-Modified' => 'Aangepast',
+	'UI:CSVReport-Icon-Missing' => 'Missend',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missend object: zal worden geupdatet',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missend: geupdatet',
+	'UI:CSVReport-Icon-Created' => 'Aangemaakt',
+	'UI:CSVReport-Object-ToCreate' => 'Object zal worden aangemaakt',
+	'UI:CSVReport-Object-Created' => 'Object aangemaakt',
+	'UI:CSVReport-Icon-Error' => 'Error',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'ONDUIDELIJK: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% van de geladen objecten bevatten fouten en zullen worden genegeerd',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% van de geladen objecten zullen worden gemaakt',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% zullen worden aangepast.',
+
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode zijn verscheidene columns toegevoegd aan de export: het id van het object, het id van de externe codes en hun herstelattributen.',
+	'UI:CSVExport:LostChars' => 'Encoding probleem',
+	'UI:CSVExport:LostChars+' => 'Het gedownloade bestand zal worden gecodeerd in %1$s. iTop heeft een aantal karakters gedetecteerd die niet compatible zijn met deze format. Deze karakters zullen worden vervangen door een ander karakter (bijvoorbeeld karakters met accent, zullen het accent verliezen), of ze zullen worden verwijderd. U kunt data kopiëren en plakken van uw web browser. Ook kunt u de administrator contacteren om de codes te veranderen (Zie parameter \'csv_file_default_charset\').',
+
+	'UI:Audit:Title' => 'iTop - CMDB Audit',
+	'UI:Audit:InteractiveAudit' => 'Interactieve Audit',
+	'UI:Audit:HeaderAuditRule' => 'Audit Regel',
+	'UI:Audit:HeaderNbObjects' => '# Objecten',
+	'UI:Audit:HeaderNbErrors' => '# Errors',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in de Regel %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in de Categorie %1$s: %2$s.',
+
+	'UI:RunQuery:Title' => 'iTop - OQL Query Evaluatie',
+	'UI:RunQuery:QueryExamples' => 'Query Voorbeelden',
+	'UI:RunQuery:HeaderPurpose' => 'Doel',
+	'UI:RunQuery:HeaderPurpose+' => 'Uitleg over de query',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression',
+	'UI:RunQuery:HeaderOQLExpression+' => 'De query in OQL syntax',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Expression om te evalueren: ',
+	'UI:RunQuery:MoreInfo' => 'Meer informatie over de query: ',
+	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
+	'UI:RunQuery:SerializedFilter' => 'Serialized filter: ',
+	'UI:RunQuery:Error' => 'Een fout is opgetreden tijdens het runnen van query: %1$s',
+	'UI:Query:UrlForExcel' => 'URL om te gebruiken voor MS-Excel web queries',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Schema:Title' => 'iTop objecten schema',
+	'UI:Schema:CategoryMenuItem' => 'Categorie <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relaties',
+	'UI:Schema:AbstractClass' => 'Abstracte klasse: objecten van deze klasse kunnen niet worden geïnstantieerd.',
+	'UI:Schema:NonAbstractClass' => 'Niet abstracte klasse: objecten van deze klasse kunnen worden geïnstantieerd.',
+	'UI:Schema:ClassHierarchyTitle' => 'Klasse hierarchie',
+	'UI:Schema:AllClasses' => 'Alle klassen',
+	'UI:Schema:ExternalKey_To' => 'Externe key voor %1$s',
+	'UI:Schema:Columns_Description' => 'Columns: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Default: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Null Allowed',
+	'UI:Schema:NullNotAllowed' => 'Null NOT Allowed',
+	'UI:Schema:Attributes' => 'Attributen',
+	'UI:Schema:AttributeCode' => 'Attribuutcode',
+	'UI:Schema:AttributeCode+' => 'Interne code van het attribuut',
+	'UI:Schema:Label' => 'Label',
+	'UI:Schema:Label+' => 'Label van het attribuut',
+	'UI:Schema:Type' => 'Type',
+	
+	'UI:Schema:Type+' => 'Data type van het attribuut',
+	'UI:Schema:Origin' => 'Oorsprong',
+	'UI:Schema:Origin+' => 'De basisklasse waarin dit attribuut is gedefineerd',
+	'UI:Schema:Description' => 'Beschrijving',
+	'UI:Schema:Description+' => 'Beschrijving van het attribuut',
+	'UI:Schema:AllowedValues' => 'Allowed values',
+	'UI:Schema:AllowedValues+' => 'Regels voor de mogelijke waarden van dit attribuut',
+	'UI:Schema:MoreInfo' => 'Meer informatie',
+	'UI:Schema:MoreInfo+' => 'Meer informatie over het veld gedefineerd in de database',
+	'UI:Schema:SearchCriteria' => 'Zoekcriteria',
+	'UI:Schema:FilterCode' => 'Filter code',
+	'UI:Schema:FilterCode+' => 'Code van deze zoekcriteria',
+	'UI:Schema:FilterDescription' => 'Beschrijving',
+	'UI:Schema:FilterDescription+' => 'Beschrijving van deze zoekcriteria',
+	'UI:Schema:AvailOperators' => 'Beschikbare medewerkers',
+	'UI:Schema:AvailOperators+' => 'Mogelijke medewerkes voor deze zoekcriteria',
+	'UI:Schema:ChildClasses' => 'Child klassen',
+	'UI:Schema:ReferencingClasses' => 'Refererende klassen',
+	'UI:Schema:RelatedClasses' => 'Gerelateerde klassen',
+	'UI:Schema:LifeCycle' => 'Levenscyclus',
+	'UI:Schema:Triggers' => 'Triggers',
+	'UI:Schema:Relation_Code_Description' => 'Relatie <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: propageer naar %2$d levels, query: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: propageert niet (%2$d levels), query: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s is aangeduid met klasse %2$s via het veld %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s is gelinkt met %2$s via %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'Klasses wijzend naar %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Klassen gelinkt aan %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'Graph van alle gerelateerde klassen',
+	'UI:Schema:NoLifeCyle' => 'Er is geen levenscyclus gedefineerd voor deze klasse.',
+	'UI:Schema:LifeCycleTransitions' => 'Transities',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Attribuut options',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Verborgen',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Alleen-lezen',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Verplicht',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Moet worden veranderd',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Gebruiker zal worden gevraagd om de waarde te veranderen',
+	'UI:Schema:LifeCycleEmptyList' => 'lege lijst',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => 'Typ de eerste 3 karakters...',
+	'UI:Edit:TestQuery' => 'Test query',
+	'UI:Combo:SelectValue' => '--- selecteer een waarde ---',
+	'UI:Label:SelectedObjects' => 'Geselecteerde objecten: ',
+	'UI:Label:AvailableObjects' => 'Beschikbare objecten: ',
+	'UI:Link_Class_Attributes' => '%1$s attributen',
+	'UI:SelectAllToggle+' => 'Selecteer Alles / Deselecteer Alles',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Voeg %1$s objecten gelinkt met %2$s: %3$s toe',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Voeg %1$s objecten toe om te linken met de %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Manage %1$s objecten gelinkt met %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Voeg %1$s toe...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Verwijder geselecteerde objecten',
+	'UI:Message:EmptyList:UseAdd' => 'De lijst is leeg, gebruik de "Voeg toe..." knop om elementen toe te voegen.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Gebruik het bovenstaande zoekveld om te zoeker naar objecten die u wilt toevoegen.',
+	'UI:Wizard:FinalStepTitle' => 'Laatste stap: bevestiging',
+	'UI:Title:DeletionOf_Object' => 'Verwijderen van %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Grootschalig verwijderen van %1$d objecten van klasse %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'U bent niet gemachtigd om dit object te verwijderen',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'U bent niet gemachtigd om het/de volgende veld(en) te updaten: %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Dit object kon niet worden verwijderd omdat de huidige gebruiker niet de juiste rechten heeft',
+	'UI:Error:CannotDeleteBecause' => 'Dit object kon niet worden verwijderd omdat: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Dit object kon niet worden verwijderd omdat eerst enkele manuele handelingen moeten worden verricht',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Dit object kon niet worden verwijderd omdat eerst enkele manuele handelingen moeten worden verricht',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s vanwege %2$s',
+	'UI:Delete:Deleted' => 'verwijderd',
+	'UI:Delete:AutomaticallyDeleted' => 'automatisch verwijderd',
+	'UI:Delete:AutomaticResetOf_Fields' => 'automatische reset van veld(en): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Bezig met het opschonen van alle referenties naar %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Bezig met het opschonen van %1$d objecten van klasse %2$s...',
+	'UI:Delete:Done+' => 'Wat er is gebeurd...',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s verwijderd',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Verwijderen van %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Verwijderen van %1$d objecten van klasse %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Kon niet worden verwijderd: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Zou automatisch moeten worden verwijderd, maar dat is niet mogelijk: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Moet handmatig worden verwijderd, maar dat is niet mogelijk: %1$s',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Zal automatisch worden verwijderd',
+	'UI:Delete:MustBeDeletedManually' => 'Moet handmatig worden verwijderd',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Zou automatisch moeten worden geupdatet, maar: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'Zal automatisch worden geupdatet (reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objecten/links refereren naar %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objecten/links refereren naar sommige objecten die worden verwijderd',	
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Om Database integriteit te verzekeren, moet elke verdere referentie worden verwijderd',
+	'UI:Delete:Consequence+' => 'Wat er zal gebeuren',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Sorry, u bent niet gemachtigd om dit object te verwijderen. Voor uitgebreide uitleg, zie hierboven',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Verricht alstublieft eerst de manuele handelingen die hierboven staan beschreven voordat u dit object verwijdert',
+	'UI:Delect:Confirm_Object' => 'Bevestig dat u  %1$s wil verwijderen.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Bevestig dat u de volgende %1$d objecten van klasse %2$s wilt verwijderen.',
+	'UI:WelcomeToITop' => 'Welcome in iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s details',
+	'UI:ErrorPageTitle' => 'iTop - Error',
+	'UI:ObjectDoesNotExist' => 'Sorry, dit object bestaat niet (of u bent niet gemachtigd het te bekijken).',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'iTop - Zoekresultaten',
+	'UI:SearchResultsTitle' => 'Zoekresultaten',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => 'Geen zoekopdracht',
+	'UI:Search:NeedleTooShort' => 'De zoekopdracht "%1$s" is te kort. Type tenminste %2$d karakters.',
+	'UI:Search:Ongoing' => 'Zoeken naar "%1$s"',
+	'UI:Search:Enlarge' => 'Vergroot de zoekopdracht',
+	'UI:FullTextSearchTitle_Text' => 'Resultaten voor "%1$s":',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d object(en) van klasse %2$s gevonden.',
+	'UI:Search:NoObjectFound' => 'Geen object gevonden.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modificatie',
+	'UI:ModificationTitle_Class_Object' => 'Modificatie van %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - Kloon %1$s - %2$s modificatie',
+	'UI:CloneTitle_Class_Object' => 'Kloon van %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - Nieuwe %1$s aangemaakt',
+	'UI:CreationTitle_Class' => '%1$s aanmaken',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Selecteer het type %1$s dat moet worden aangemaakt:',
+	'UI:Class_Object_NotUpdated' => 'Geen verandering waargenomen, %1$s (%2$s) is <strong>not</strong> gemodificeerd.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) geupdatet.',
+	'UI:BulkDeletePageTitle' => 'iTop - Grootschalig verwijderen',
+	'UI:BulkDeleteTitle' => 'Selecteer de objecten die u wilt verwijderen:',
+	'UI:PageTitle:ObjectCreated' => 'iTop Object Aangemaakt.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s aangemaakt.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Bezig met het toepassen van %1$s op object: %2$s in state %3$s tot target state: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'Het object kon niet geschreven worden: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - Fatale Fout',
+	'UI:SystemIntrusion' => 'Toegang geweigerd. U hebt een actie aangevraagd waarvoor u niet gemachtigd bent.',
+	'UI:FatalErrorMessage' => 'Fatale error, iTop kan niet doorgaan.',
+	'UI:Error_Details' => 'Error: %1$s.',
+
+	'UI:PageTitle:ClassProjections'	=> 'iTop gebruikersmanagement - klasse projecties',
+	'UI:PageTitle:ProfileProjections' => 'iTop gebuikersmanagement - profiel projecties',
+	'UI:UserManagement:Class' => 'Klasse',
+	'UI:UserManagement:Class+' => 'Klasse van objecten',
+	'UI:UserManagement:ProjectedObject' => 'Object',
+	'UI:UserManagement:ProjectedObject+' => 'Projected object',
+	'UI:UserManagement:AnyObject' => '* elk *',
+	'UI:UserManagement:User' => 'Gebruiker',
+	'UI:UserManagement:User+' => 'Gebruiker bezig met de projectie',
+	'UI:UserManagement:Profile' => 'Profiel',
+	'UI:UserManagement:Profile+' => 'Profiel waarin de projectie is gespecificeerd',
+	'UI:UserManagement:Action:Read' => 'Lees',
+	'UI:UserManagement:Action:Read+' => 'Lees/display objecten',
+	'UI:UserManagement:Action:Modify' => 'Pas aan',
+	'UI:UserManagement:Action:Modify+' => 'Maak de objecten aan en edit ze',
+	'UI:UserManagement:Action:Delete' => 'Verwijder',
+	'UI:UserManagement:Action:Delete+' => 'Verwijder objecten',
+	'UI:UserManagement:Action:BulkRead' => 'Grootschalig lezen (Exporteer)',
+	'UI:UserManagement:Action:BulkRead+' => 'List de objecten of exporteer ze grootschalig',
+	'UI:UserManagement:Action:BulkModify' => 'Grootschalig aanpassen',
+	'UI:UserManagement:Action:BulkModify+' => 'Verander grootschalig/maak grootschalig aan (CSV import)',
+	'UI:UserManagement:Action:BulkDelete' => 'Grootschalig verwijderen',
+	'UI:UserManagement:Action:BulkDelete+' => 'Verwijder objecten grootschalig',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => 'Toegestane (compound) acties',
+	'UI:UserManagement:Action' => 'Actie',
+	'UI:UserManagement:Action+' => 'Actie uitgevoerd door de gebruiker',
+	'UI:UserManagement:TitleActions' => 'Acties',
+	'UI:UserManagement:Permission' => 'Toestemming',
+	'UI:UserManagement:Permission+' => 'De autorisaties van de gebruiker',
+	'UI:UserManagement:Attributes' => 'Attributen',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Ja',
+	'UI:UserManagement:ActionAllowed:No' => 'Nee',
+	'UI:UserManagement:AdminProfile+' => 'Administrators hebben volledige lees/schrijf autorisatie in de database.',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => 'Er is geen levenscyclus gedefineerd voor deze klasse',
+	'UI:UserManagement:GrantMatrix' => 'Grant Matrix',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link tussen %1$s en %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link tussen %1$s en %2$s',
+	
+	'Menu:AdminTools' => 'Admin tools',
+	'Menu:AdminTools+' => 'Administratie tools',
+	'Menu:AdminTools?' => 'Tools die alleen toegankelijk zijn voor gebruikers met een administratorprofiel',
+
+	'UI:ChangeManagementMenu' => 'Change Management',
+	'UI:ChangeManagementMenu+' => 'Change Management',
+	'UI:ChangeManagementMenu:Title' => 'Changes Overzicht',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Changes aan de hand van type',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Changes aan de hand van type status',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Changes aan de hand van werkgroep',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Nog niet toegewezen Changes',
+
+	'UI:ConfigurationManagementMenu' => 'Configuratie Management',
+	'UI:ConfigurationManagementMenu+' => 'Configuratie Management',
+	'UI:ConfigurationManagementMenu:Title' => 'Overzicht van de Infrastructuur',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Objecten van de infrastructuur aan de hand van type',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objecten van de infrastructuur aan de hand van status',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard voor Configuratie Management',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuratie Items aan de hand van status',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items aan de hand van type',
+
+'UI:RequestMgmtMenuOverview:Title' => 'Dashboard voor Request Management',
+'UI-RequestManagementOverview-RequestByService' => 'Gebruikersaanvragen aan de hand van dienst',
+'UI-RequestManagementOverview-RequestByPriority' => 'Gebruikersaanvragen aan de hand van prioriteit',
+'UI-RequestManagementOverview-RequestUnassigned' => 'Nog niet toegewezen gebruikersaanvragen',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard voor Incident Management',
+'UI-IncidentManagementOverview-IncidentByService' => 'Incidenten aan de hand van dienst',
+'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidenten aan de hand van prioriteit',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'Nog niet toegewezen incidenten',
+
+'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard voor Change Management',
+'UI-ChangeManagementOverview-ChangeByType' => 'Changes aan de hand van type',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'Nog niet toegewezen Changes',
+'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages door changes',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard voor Service Management',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Klantencontracten die binnen 30 dagen vernieuwd moeten worden',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Providercontracten die binnen 30 dagen vernieuwd moeten worden',
+
+	'UI:ContactsMenu' => 'Contacten',
+	'UI:ContactsMenu+' => 'Contacten',
+	'UI:ContactsMenu:Title' => 'Overzicht van contacten',
+	'UI-ContactsMenu-ContactsByLocation' => 'Contacten aan de hand van location',
+	'UI-ContactsMenu-ContactsByType' => 'Contacten aan de hand van type',
+	'UI-ContactsMenu-ContactsByStatus' => 'Contacten aan de hand van status',
+
+	'Menu:DataModelMenu' => 'Data Model',
+	'Menu:DataModelMenu+' => 'Overzicht van het Data Model',
+	
+	'Menu:ExportMenu' => 'Exporteer',
+	'Menu:ExportMenu+' => 'Exporteer de resultaten van elke query in HTML, CSV or XML',
+	
+	'Menu:NotificationsMenu' => 'Notificaties',
+	'Menu:NotificationsMenu+' => 'Configuratie van de Notificaties',
+	'UI:NotificationsMenu:Title' => 'Configuratie van het <span class="hilite">Notifications</span>',
+	'UI:NotificationsMenu:Help' => 'Help',
+	'UI:NotificationsMenu:HelpContent' => '<p>In iTop zijn de notificaties volledig aan te passen. Ze zijn gebaseerd op twee sets van objecten: <i>triggers and actions</i>.</p>
+<p><i><b>Triggers</b></i> defineren wanneer een notificatie wordt verzonden. Er zijn 5 types triggers, die 3 verschillende fases in de levenscyclus van een object beslaan:
+<ol>
+	<li>de "on object creation" triggers worden uitgevoerd wanneer een object van een specifieke klasse is aangemaakt</li>
+	<li>de "on entering a state" triggers worden uitgevoerd voordat een object van een bepaalde klasse een gespecificeerde state ingaat (komend van een andere state)</li>
+	<li>de "on leaving a state" triggers worden uitgevoerd wanneer een object van een bepaalde klasse een gespecificeerde state verlaat</li>
+	<li>de "on threshold" triggers worden uitgevoerd wanneer een threshold voor TTR of TTO is bereikt</li>
+	<li>de "on portal update" triggers worden uitgevoerd wanneer een ticket is geupdatet vanuit het portal</li>
+</ol>
+</p>
+<p>
+<i><b>Actions</b></i> defileren de acties die worden ondernomen wanneer de triggers worden uitgevoerd. Op dit moment is er slechts een actie, bestaand uit het verzenden van een e-mail.
+Zulke acties defileren ook de template die moet worden gebruikt voor het versturen van de e-mail, net als andere parameters in het bericht, zoals de ontvangers, de prioriteit, etc. </p>
+<p>Een speciale pagina: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is beschikbaar voor het testen en de probleemoplossing van uw  PHP mail configuratie.</p>
+<p>Om te worden uitgevoerd moeten uw acties gekoppeld zijn aan triggers.
+Indien gekoppeld aan een Trigger, wordt aan elke actie een "orde" nummer gegeven, dat specificeert in welke volgorde de acties moeten worden uitgevoerd.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Triggers',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Beschikbare triggers',
+	'UI:NotificationsMenu:OnCreate' => 'Wanneer een object is aangemaakt',
+	'UI:NotificationsMenu:OnStateEnter' => 'Wanneer een object een bepaalde state ingaat',
+	'UI:NotificationsMenu:OnStateLeave' => 'Wanneer een object een bepaalde state verlaat',
+	'UI:NotificationsMenu:Actions' => 'Acties',
+	'UI:NotificationsMenu:AvailableActions' => 'Beschikbare acties',
+	
+	'Menu:AuditCategories' => 'Audit Categorieën',
+	'Menu:AuditCategories+' => 'Audit Categorieën',
+	'Menu:Notifications:Title' => 'Audit Categorieën',
+	
+	'Menu:RunQueriesMenu' => 'Queries uitvoeren',
+	'Menu:RunQueriesMenu+' => 'Voer een query uit',
+	
+	'Menu:QueryMenu' => 'Query phrasebook',
+	'Menu:QueryMenu+' => 'Query phrasebook',
+	
+	'Menu:UniversalSearchMenu' => 'Universele Zoekopdracht',
+	'Menu:UniversalSearchMenu+' => 'Zoek naar alles...',
+	
+	'Menu:ApplicationLogMenu' => 'Log de l\'application',
+	'Menu:ApplicationLogMenu+' => 'Log de l\'application',
+	'Menu:ApplicationLogMenu:Title' => 'Log de l\'application',
+
+	'Menu:UserManagementMenu' => 'Gebruikersmanagement',
+	'Menu:UserManagementMenu+' => 'Gebruikersmanagement',
+
+	'Menu:ProfilesMenu' => 'Profielen',
+	'Menu:ProfilesMenu+' => 'Profielen',
+	'Menu:ProfilesMenu:Title' => 'Profielen',
+
+	'Menu:UserAccountsMenu' => 'Gebruikersaccounts',
+	'Menu:UserAccountsMenu+' => 'Gebruikersaccounts',
+	'Menu:UserAccountsMenu:Title' => 'Gebruikersaccounts',	
+
+	'UI:iTopVersion:Short' => '%1$s versie %2$s',
+	'UI:iTopVersion:Long' => '%1$s versie %2$s-%3$s built on %4$s',
+	'UI:PropertiesTab' => 'Eigenschappen',
+
+	'UI:OpenDocumentInNewWindow_' => 'Open dit document in een nieuwe window: %1$s',
+	'UI:DownloadDocument_' => 'Download dit document: %1$s',
+	'UI:Document:NoPreview' => 'Er is geen preview beschikbaar voor dit type document',
+	'UI:Download-CSV' => 'Download %1$s',
+
+	'UI:DeadlineMissedBy_duration' => 'Gemist op %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',		
+	'UI:Deadline_Minutes' => '%1$d min',			
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
+	'UI:Help' => 'Help',
+	'UI:PasswordConfirm' => '(Bevestig)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Sla dit object op, voordat u meer %1$s objecten toevoegt.',
+	'UI:DisplayThisMessageAtStartup' => 'Geef dit bericht bij het opstarten weer',
+	'UI:RelationshipGraph' => 'Graphical view',
+	'UI:RelationshipList' => 'List',
+	'UI:OperationCancelled' => 'Operatie afgebroken',
+	'UI:ElementsDisplayed' => 'Filtering',
+
+	'Portal:Title' => 'iTop gebruikersportaal',
+	'Portal:NoRequestMgmt' => 'Beste %1$s, u bent naar deze pagina doorverwezen omdat uw account is geconfigureerd met het profiel \'Portal user\'. Helaas is iTop niet geïnstalleerd met de feature \'Request Management\'. Neem alstublieft contact op met uw administrator.',
+	'Portal:Refresh' => 'Herlaad',
+	'Portal:Back' => 'Vorige',
+	'Portal:WelcomeUserOrg' => 'Welkom %1$s, van %2$s',
+	'Portal:TitleDetailsFor_Request' => 'Details voor aanvraag',
+	'Portal:ShowOngoing' => 'Laat lopende aanvragen zien',
+	'Portal:ShowClosed' => 'Laat gesloten aanvragen zien',
+	'Portal:CreateNewRequest' => 'Maak een nieuwe aanvraag aan',
+	'Portal:CreateNewRequestItil' => 'Maak een nieuwe aanvraag aan',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => 'Verander mijn wachtwoord',
+	'Portal:Disconnect' => 'Disconnect',
+	'Portal:OpenRequests' => 'Mijn lopende aanvragen',
+	'Portal:ClosedRequests'  => 'Mijn gesloten aanvragen',
+	'Portal:ResolvedRequests'  => 'Mijn opgeloste aanvragen',
+	'Portal:SelectService' => 'Selecteer een dienst van de catalogus:',
+	'Portal:PleaseSelectOneService' => 'Selecteer alstublieft een dienst',
+	'Portal:SelectSubcategoryFrom_Service' => 'Selecteer een subcategorie voor de dienst %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Selecteer alstublieft een subcategorie',
+	'Portal:DescriptionOfTheRequest' => 'Voeg een beschrijving voor uw aanvraag toe:',
+	'Portal:TitleRequestDetailsFor_Request' => 'Details voor de aanvraag %1$s:',
+	'Portal:NoOpenRequest' => 'Geen aanvragen in deze categorie',
+	'Portal:NoClosedRequest' => 'Geen aanvragen in deze categorie',
+	'Portal:Button:ReopenTicket' => 'Heropen deze ticket',
+	'Portal:Button:CloseTicket' => 'Sluit deze ticket',
+	'Portal:Button:UpdateRequest' => 'Update de aanvraag',
+	'Portal:EnterYourCommentsOnTicket' => 'Voeg opmerkingen over het oplossen van deze ticket toe:',
+	'Portal:ErrorNoContactForThisUser' => 'Error: de huidige gebruiker is niet geassocieerd met een persoon/contact. Neem alstublieft contact op met uw administrator.',
+	'Portal:Attachments' => 'Bijlagen',
+	'Portal:AddAttachment' => ' Voeg bijlage toe ',
+	'Portal:RemoveAttachment' => ' Verwijder bijlage ',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Bijlage #%1$d to %2$s (%3$s)',
+	'Portal:SelectRequestTemplate' => 'Selecteer een template voor %1$s',
+	'Enum:Undefined' => 'Ongedefineerd',	
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Dagen %2$s Uren %3$s Minuten %4$s Seconden',
+	'UI:ModifyAllPageTitle' => 'Bewerk alles',
+	'UI:Modify_N_ObjectsOf_Class' => 'Bezig met het aanpassen van %1$d objecten van klasse %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Bezig met het aanpassen van %1$d objecten van klasse %2$s van de %3$d',
+	'UI:Menu:ModifyAll' => 'Bewerk...',
+	'UI:Button:ModifyAll' => 'Bewerk alles',
+	'UI:Button:PreviewModifications' => 'Preview van de bewerkingen >>',
+	'UI:ModifiedObject' => 'Object Bewerkt',
+	'UI:BulkModifyStatus' => 'Operatie',
+	'UI:BulkModifyStatus+' => 'Status van de operatie',
+	'UI:BulkModifyErrors' => 'Errors (indien van toepassing)',
+	'UI:BulkModifyErrors+' => 'Errors die de bewerking verhinderen',	
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Error',
+	'UI:BulkModifyStatusModified' => 'Aangepast',
+	'UI:BulkModifyStatusSkipped' => 'Overgeslagen',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d keer',
+	'UI:BulkModify:N_MoreValues' => '%1$d meer waarden...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Bezig met het plaatsen van het alleen-lezen veld: %1$s',
+	'UI:FailedToApplyStimuli' => 'De actie is mislukt.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Bezig met het bewerken van %2$d objecten van klasse %3$s',
+	'UI:CaseLogTypeYourTextHere' => 'Typ uw text hier:',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Initiële waarde:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'Het veld %1$s is niet beschrijfbaar omdat het onderdeel is van de data synchronisatie. Waarde niet opgegeven',
+	'UI:ActionNotAllowed' => 'U hebt geen toestemming om deze actie op deze objecten uit te voeren.',
+	'UI:BulkAction:NoObjectSelected' => 'Selecteer tenminste een object om deze actie uit te voeren',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'Het veld %1$s is niets beschrijfbaar omdat het onderdeel is van de data synchronisatie. Waarde blijft onveranderd',
+	'UI:Pagination:HeaderSelection' => 'Totaal: %1$s objecten (%2$s objecten geselecteerd).',
+	'UI:Pagination:HeaderNoSelection' => 'Totaal: %1$s objecten.',
+	'UI:Pagination:PageSize' => '%1$s objecten per pagina',
+	'UI:Pagination:PagesLabel' => 'Paginas:',
+	'UI:Pagination:All' => 'Alles',
+	'UI:HierarchyOf_Class' => 'Hierarchie van %1$s',
+	'UI:Preferences' => 'Voorkeuren...',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'Favoriete Organizaties',
+	'UI:FavoriteOrganizations+' => 'Bekijk de organisaties die u wilt zijn in het drop-down menu voor een snelle toegang in de onderstaande lijst. '.
+								   'Merk op dat dit geen security instelling is, objecten van elke organisatie zijn nog steed zichtbaar en toegankelijk door "All Organizations" te selecteren in de drop-down list.',
+	'UI:FavoriteLanguage' => 'Taal van de Gebruikersinterface',
+	'UI:Favorites:SelectYourLanguage' => 'Selecteer uw taal',
+	'UI:FavoriteOtherSettings' => 'Overige instellingen',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Standaard lengte voor lijsten:  %1$s items per pagina',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Bewerkingen zullen worden genegeerd.',
+	'UI:CancelConfirmationMessage' => 'U zult uw aanpassingen verliezen. Wilt u alsnog doorgaan?',
+	'UI:AutoApplyConfirmationMessage' => 'Sommige veranderingen zijn nog niet doorgevoerd. Wilt u dat iTop deze meeneemt?',
+	'UI:Create_Class_InState' => 'Maak %1$s aan in state: ',
+	'UI:OrderByHint_Values' => 'Sorteervolgorde: %1$s',
+	'UI:Menu:AddToDashboard' => 'Voeg toe aan Dashboard...',
+	'UI:Button:Refresh' => 'Herlaad',
+
+	'UI:ConfigureThisList' => 'Configureer deze Lijst...',
+	'UI:ListConfigurationTitle' => 'Lijst Configuratie',
+	'UI:ColumnsAndSortOrder' => 'Columns en sorteervolgorde:',
+	'UI:UseDefaultSettings' => 'Gebruik de standaard instellingen',
+	'UI:UseSpecificSettings' => 'Gebruik de volgende instellingen:',
+	'UI:Display_X_ItemsPerPage' => 'Geef %1$s items per pagina weer',
+	'UI:UseSavetheSettings' => 'Sla de instellingen op',
+	'UI:OnlyForThisList' => 'Alleen voor deze lijst',
+	'UI:ForAllLists' => 'Standaard voor alle lijsten',
+	'UI:ExtKey_AsLink' => '%1$s (Link)',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
+	'UI:Button:MoveUp' => 'Ga omhoog',
+	'UI:Button:MoveDown' => 'Ga naar beneden',
+
+	'UI:OQL:UnknownClassAndFix' => 'Onbekende klasse "%1$s". U zou "%2$s" kunnen proberen.',
+	'UI:OQL:UnknownClassNoFix' => 'Onbekende klasse "%1$s"',
+
+	'UI:Dashboard:Edit' => 'Bewerk deze pagina...',
+	'UI:Dashboard:Revert' => 'Ga terug naar de originele versie...',
+	'UI:Dashboard:RevertConfirm' => 'Alle bewerkingen die zijn gemaakt aan de originele versie zullen verloren gaan. Bevestig dat u wilt doorgaan.',
+	'UI:ExportDashBoard' => 'Exporteer naar een bestand',
+	'UI:ImportDashBoard' => 'Importeer vanuit een bestand',
+	'UI:ImportDashboardTitle' => 'Importeer vanuit een bestand',
+	'UI:ImportDashboardText' => 'Selecteer een bestand van het dashboard om te importeren:',
+
+
+	'UI:DashletCreation:Title' => 'Maak een nieuwe Dashlet aan',
+	'UI:DashletCreation:Dashboard' => 'Dashboard',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type',
+	'UI:DashletCreation:EditNow' => 'Bewerk het Dashboard',
+
+	'UI:DashboardEdit:Title' => 'Dashboard Editor',
+	'UI:DashboardEdit:DashboardTitle' => 'Titel',
+	'UI:DashboardEdit:AutoReload' => 'Automatisch verversen',
+	'UI:DashboardEdit:AutoReloadSec' => 'Interval voor het automatisch verversen (seconden)',
+	'UI:DashboardEdit:AutoReloadSec+' => 'Het toegestane minimun is 5 seconden',
+
+	'UI:DashboardEdit:Layout' => 'Layout',
+	'UI:DashboardEdit:Properties' => 'Dashboard Eigenschappen',
+	'UI:DashboardEdit:Dashlets' => 'Beschikbare Dashlets',	
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Eigenschappen',	
+
+	'UI:Form:Property' => 'Eigenschap',
+	'UI:Form:Value' => 'Waarde',
+
+	'UI:DashletPlainText:Label' => 'Text',
+	'UI:DashletPlainText:Description' => 'Gewone text (niet geformatteerd)',
+	'UI:DashletPlainText:Prop-Text' => 'Text',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Voeg hier alstublieft wat text toe...',
+
+	'UI:DashletObjectList:Label' => 'Object lijst',
+	'UI:DashletObjectList:Description' => 'Object lijst dashlet',
+	'UI:DashletObjectList:Prop-Title' => 'Titel',
+	'UI:DashletObjectList:Prop-Query' => 'Query',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu',
+
+	'UI:DashletGroupBy:Prop-Title' => 'Titel',
+	'UI:DashletGroupBy:Prop-Query' => 'Query',
+	'UI:DashletGroupBy:Prop-Style' => 'Stijl',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Groepeer aan de hand van...',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Uur %1$s (0-23)',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Maand %1$s (1 - 12)',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Dag van de week voor %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Dag van de maand voor %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (uur)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (maand)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dag van de week)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dag van de maand)',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Selecteer alstublieft het veld waarin de objecten gegroepeerd moeten worden',
+
+	'UI:DashletGroupByPie:Label' => 'Cirkeldiagram',
+	'UI:DashletGroupByPie:Description' => 'Cirkeldiagram',
+	'UI:DashletGroupByBars:Label' => 'Staafdiagram',
+	'UI:DashletGroupByBars:Description' => 'Staafdiagram',
+	'UI:DashletGroupByTable:Label' => 'Groepeer aan de hand van (tabel)',
+	'UI:DashletGroupByTable:Description' => 'Lijst (Gegroepeerd aan de hand van een veld)',
+
+	'UI:DashletHeaderStatic:Label' => 'Kopje',
+	'UI:DashletHeaderStatic:Description' => 'Geeft een horizontale separator weer',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Titel',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacten',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icoon',
+
+	'UI:DashletHeaderDynamic:Label' => 'Koje met gegevens',
+	'UI:DashletHeaderDynamic:Description' => 'Kopje met stats (gegroepeerd aan de hand van...)',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Titel',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacten',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icoon',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitel',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacten',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Gegroepeerd aan de hand van',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Waarden',
+
+	'UI:DashletBadge:Label' => 'Badge',
+	'UI:DashletBadge:Description' => 'Object Icoon met nieuw/zoek naar',
+	'UI:DashletBadge:Prop-Class' => 'Klasse',
+
+	'DayOfWeek-Sunday' => 'Zondag',
+	'DayOfWeek-Monday' => 'Maandag',
+	'DayOfWeek-Tuesday' => 'Dinsdag',
+	'DayOfWeek-Wednesday' => 'Woensdag',
+	'DayOfWeek-Thursday' => 'Donderdag',
+	'DayOfWeek-Friday' => 'Vrijdag',
+	'DayOfWeek-Saturday' => 'Zaterdag',
+	'Month-01' => 'Januari',
+	'Month-02' => 'Februari',
+	'Month-03' => 'Maart',
+	'Month-04' => 'April',
+	'Month-05' => 'Mei',
+	'Month-06' => 'Juni',
+	'Month-07' => 'Juli',
+	'Month-08' => 'Augustus',
+	'Month-09' => 'September',
+	'Month-10' => 'Oktober',
+	'Month-11' => 'November',
+	'Month-12' => 'December',
+
+	'UI:Menu:ShortcutList' => 'Maak een Snelkoppeling aan...',
+	'UI:ShortcutRenameDlg:Title' => 'Hernoem de snelkoppeling',
+	'UI:ShortcutListDlg:Title' => 'Maak een snelkoppeling voor de lijst aan',
+	'UI:ShortcutDelete:Confirm' => 'Bevestig dat u de snelkoppeling(en) wilt verwijderen.',
+	'Menu:MyShortcuts' => 'Mijn Snelkoppeling',
+	'Class:Shortcut' => 'Snelkoppeling',
+	'Class:Shortcut+' => '',
+	'Class:Shortcut/Attribute:name' => 'Naam',
+	'Class:Shortcut/Attribute:name+' => 'Label gebruikt in het menu en in de titel van de pagina',
+	'Class:ShortcutOQL' => 'Zoekresultaat snelkoppeling',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL die de lijst van objecten om naar te zoeken defineerd',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatisch verversen',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Onbruikbaar',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Interval van het automatisch verversen (seconden)',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec+' => 'Het toegestane minimum is 5 seconden',
+
+	'UI:FillAllMandatoryFields' => 'Vul alstublieft de verplichte velden in.',
+	
+	'UI:CSVImportConfirmTitle' => 'Bevestig alstublieft de actie',
+	'UI:CSVImportConfirmMessage' => 'Weet u zeker dat u dit wilt doen?',
+	'UI:CSVImportError_items' => 'Errors: %1$d',
+	'UI:CSVImportCreated_items' => 'Aangemaakt: %1$d',
+	'UI:CSVImportModified_items' => 'Bewerkt: %1$d',
+	'UI:CSVImportUnchanged_items' => 'Onveranderd: %1$d',
+
+	'UI:Button:Remove' => 'Verwijder',
+	'UI:AddAnExisting_Class' => 'Voeg objecten van type %1$s toe...',
+	'UI:SelectionOf_Class' => 'Selectie van objecten van type %1$s',
+
+	'UI:AboutBox' => 'Over iTop...',
+	'UI:About:Title' => 'Over iTop',
+	'UI:About:DataModel' => 'Data model',
+	'UI:About:Support' => 'Support informatie',
+	'UI:About:Licenses' => 'Licenties',
+	'UI:About:Modules' => 'Geïnstalleerde modules',
+	'Menu:CSVImportMenu' => 'CSV import~~',
+	'Menu:CSVImportMenu+' => 'Bulk creation or update~~',
+	'Menu:DataAdministration' => 'Data administratie',
+	'Menu:DataAdministration+' => 'Data administratie',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/pt_br.dictionary.itop.core.php b/dictionaries/pt_br.dictionary.itop.core.php
index 1475e55e7..10491b69c 100644
--- a/dictionaries/pt_br.dictionary.itop.core.php
+++ b/dictionaries/pt_br.dictionary.itop.core.php
@@ -1,878 +1,878 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Core:DeletedObjectLabel' => '%1s (excluído)',
-	'Core:DeletedObjectTip' => 'O objeto foi excluído em %1$s (%2$s)',
-
-	'Core:UnknownObjectLabel' => 'Objeto não encontrado (classe: %1$s, id: %2$d)',
-	'Core:UnknownObjectTip' => 'O objeto não pode ser encontrado. Ele pode ter sido eliminado há algum tempo e o log foi removido desde então.',
-
-	'Core:AttributeLinkedSet' => 'Array de objetos',
-	'Core:AttributeLinkedSet+' => 'Qualquer tipo de objetos da mesma classe ou subclasses',
-
-	'Core:AttributeLinkedSetIndirect' => 'Array de objetos (N-N)',
-	'Core:AttributeLinkedSetIndirect+' => 'Qualquer tipo de objetos [sub-classe] da mesma classe',
-
-	'Core:AttributeInteger' => 'Inteiro',
-	'Core:AttributeInteger+' => 'Valor numérico (não pode ser negativo)',
-
-	'Core:AttributeDecimal' => 'Decimal',
-	'Core:AttributeDecimal+' => 'Valor decimal (não pode ser negativo)',
-
-	'Core:AttributeBoolean' => 'Boolean',
-	'Core:AttributeBoolean+' => 'Boolean',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-
-	'Core:AttributeString' => 'String',
-	'Core:AttributeString+' => 'Seqüência alfanumérica',
-
-	'Core:AttributeClass' => 'Classe',
-	'Core:AttributeClass+' => 'Classe',
-
-	'Core:AttributeApplicationLanguage' => 'Linguagem usuário',
-	'Core:AttributeApplicationLanguage+' => 'Linguagem e país (EN US)',
-
-	'Core:AttributeFinalClass' => 'Classe (auto)',
-	'Core:AttributeFinalClass+' => 'Classe real do objeto (criada automaticamente pelo sistema)',
-
-	'Core:AttributePassword' => 'Senha',
-	'Core:AttributePassword+' => 'Senha para o dispositivo externo',
-
- 	'Core:AttributeEncryptedString' => 'String encriptada',
-	'Core:AttributeEncryptedString+' => 'String encriptada com uma chave local',
-
-	'Core:AttributeText' => 'Texto',
-	'Core:AttributeText+' => 'Cadeia de caracteres Multi-linha',
-
-	'Core:AttributeHTML' => 'HTML',
-	'Core:AttributeHTML+' => 'HTML string',
-
-	'Core:AttributeEmailAddress' => 'Endereço email',
-	'Core:AttributeEmailAddress+' => 'Endereço email',
-
-	'Core:AttributeIPAddress' => 'Endereço IP',
-	'Core:AttributeIPAddress+' => 'Endereço IP',
-
-	'Core:AttributeOQL' => 'OQL',
-	'Core:AttributeOQL+' => 'Expressão Object Query Langage',
-
-	'Core:AttributeEnum' => 'Enum',
-	'Core:AttributeEnum+' => 'Lista de pré-definida seqüências alfanuméricas',
-
-	'Core:AttributeTemplateString' => 'Modelo string',
-	'Core:AttributeTemplateString+' => 'Espaço reservado contendo string',
-
-	'Core:AttributeTemplateText' => 'Template text',
-	'Core:AttributeTemplateText+' => 'Texto contendo espaços reservados',
-
-	'Core:AttributeTemplateHTML' => 'Modelo HTML',
-	'Core:AttributeTemplateHTML+' => 'HTML contendo espaços reservados',
-
-	'Core:AttributeDateTime' => 'Data/hora',
-	'Core:AttributeDateTime+' => 'Data e hora (ano-mês-dia hh:mm:ss)',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Data formato:<br/>
-	<b>%1$s</b><br/>
-	Exemplo: %2$s
-</p>
-<p>
-Operadores:<br/>
-	<b>&gt;</b><em>data</em><br/>
-	<b>&lt;</b><em>data</em><br/>
-	<b>[</b><em>data</em>,<em>data</em><b>]</b>
-</p>
-<p>
-Se o tempo for omitido, o padrão é 00:00:00
-</p>',
-
-	'Core:AttributeDate' => 'Data',
-	'Core:AttributeDate+' => 'Data (ano-mês-dia)',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Data formato:<br/>
-	<b>%1$s</b><br/>
-	Exemplo: %2$s
-</p>
-<p>
-Operadores:<br/>
-	<b>&gt;</b><em>data</em><br/>
-	<b>&lt;</b><em>data</em><br/>
-	<b>[</b><em>data</em>,<em>data</em><b>]</b>
-</p>',
-
-	'Core:AttributeDeadline' => 'Tempo determinado',
-	'Core:AttributeDeadline+' => 'Data, apresentada relativamente ao tempo atual',
-
-	'Core:AttributeExternalKey' => 'Chave externa',
-	'Core:AttributeExternalKey+' => 'Chave externa (ou foreign)',
-
-	'Core:AttributeHierarchicalKey' => 'Chave hierárquica',
-	'Core:AttributeHierarchicalKey+' => 'Chave externa (ou foreign) para o principal',
-
-	'Core:AttributeExternalField' => 'Campo externo',
-	'Core:AttributeExternalField+' => 'Campo mapeado para uma chave externa',
-
-	'Core:AttributeURL' => 'URL',
-	'Core:AttributeURL+' => 'URL absoluto ou relativo como um texto',
-
-	'Core:AttributeBlob' => 'Blob',
-	'Core:AttributeBlob+' => 'Qualquer conteúdo binário (documento)',
-
-	'Core:AttributeOneWayPassword' => 'Uma forma de senha',
-	'Core:AttributeOneWayPassword+' => 'Uma forma de senha encriptado',
-
-	'Core:AttributeTable' => 'Tabela',
-	'Core:AttributeTable+' => 'Matriz indexada tem duas dimensões',
-
-	'Core:AttributePropertySet' => 'Propriedades',
-	'Core:AttributePropertySet+' => 'Lista de propriedades sem categoria (nome e valor)',
-
-	'Core:AttributeFriendlyName' => 'Nome amigável',
-	'Core:AttributeFriendlyName+' => 'Atributo criado automaticamente; o nome amigável é gerado depois de vários atributos',
-
-	'Core:FriendlyName-Label' => 'Nome amigável',
-	'Core:FriendlyName-Description' => 'Nome amigável',
-));
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'core/cmdb'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: CMDBChange
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChange' => 'Mudanças',
-	'Class:CMDBChange+' => 'Rastreamento de mudanças',
-	'Class:CMDBChange/Attribute:date' => 'Data',
-	'Class:CMDBChange/Attribute:date+' => 'Data e hora em que as mudanças foram registrados',
-	'Class:CMDBChange/Attribute:userinfo' => 'Mais Informações',
-	'Class:CMDBChange/Attribute:userinfo+' => 'Informações solicitantes definidos',
-));
-
-//
-// Class: CMDBChangeOp
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOp' => 'Operações de mudanças',
-	'Class:CMDBChangeOp+' => 'Operações de controle de mudança',
-	'Class:CMDBChangeOp/Attribute:change' => 'Mudança',
-	'Class:CMDBChangeOp/Attribute:change+' => 'Mudança',
-	'Class:CMDBChangeOp/Attribute:date' => 'Data',
-	'Class:CMDBChangeOp/Attribute:date+' => 'Data e hora da mudança',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'Usuário',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => 'Quem fez essa mudança',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'Classe objeto',
-	'Class:CMDBChangeOp/Attribute:objclass+' => 'Classe objeto',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'ID objeto',
-	'Class:CMDBChangeOp/Attribute:objkey+' => 'ID objeto',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'tipo',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CMDBChangeOpCreate
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpCreate' => 'Criação do objeto',
-	'Class:CMDBChangeOpCreate+' => 'Rastreamento de criação do objeto',
-));
-
-//
-// Class: CMDBChangeOpDelete
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpDelete' => 'Objeto excluído',
-	'Class:CMDBChangeOpDelete+' => 'Rastreamento de exclusão do objeto',
-));
-
-//
-// Class: CMDBChangeOpSetAttribute
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttribute' => 'Objeto alterado',
-	'Class:CMDBChangeOpSetAttribute+' => 'Rastreamento alteração propriedade Objeto',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Atributo',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'Código da propriedade modificado',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeScalar
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => 'Propriedade alterado',
-	'Class:CMDBChangeOpSetAttributeScalar+' => 'Propriedades escalares objeto de controle de alterações',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valor anterior',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'valor anterior do atributo',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Novo valor',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'novo valor do atributo',
-));
-// Used by CMDBChangeOp... & derived classes
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Change:ObjectCreated' => 'Objeto criado',
-	'Change:ObjectDeleted' => 'Objeto excluído',
-	'Change:ObjectModified' => 'Objeto modificado',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s configurado para %2$s (valor anterior: %3$s)',
-	'Change:AttName_SetTo' => '%1$s configurado para %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s anexado ao %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modificado, valor anterior: %2$s',
-	'Change:AttName_Changed' => '%1$s modificado',
-	'Change:AttName_EntryAdded' => '%1$s modificado, nova entrada adicionada: %2$s',
-	'Change:LinkSet:Added' => 'adicionado %1$s',
-	'Change:LinkSet:Removed' => 'excluído %1$s',
-	'Change:LinkSet:Modified' => 'modificado %1$s',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeBlob
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => 'data mudança',
-	'Class:CMDBChangeOpSetAttributeBlob+' => 'controle de alterações de dados',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Valor anterior',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'conteúdo anterior do atributo',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeText
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:CMDBChangeOpSetAttributeText' => 'mudança texto',
-	'Class:CMDBChangeOpSetAttributeText+' => 'controle de alterações de texto',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Valor anterior',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'conteúdo anterior do atributo',
-));
-
-//
-// Class: Event
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Event' => 'Evento registros',
-	'Class:Event+' => 'Um evento interno do aplicativo',
-	'Class:Event/Attribute:message' => 'Mensagens',
-	'Class:Event/Attribute:message+' => 'pequena descrição deste evento',
-	'Class:Event/Attribute:date' => 'Data',
-	'Class:Event/Attribute:date+' => 'data e hora em que as mudanças foram registradas',
-	'Class:Event/Attribute:userinfo' => 'Informações usuário',
-	'Class:Event/Attribute:userinfo+' => 'identificação do usuário que estava fazendo a ação que desencadeou este evento',
-	'Class:Event/Attribute:finalclass' => 'Tipo',
-	'Class:Event/Attribute:finalclass+' => '',
-));
-
-//
-// Class: EventNotification
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventNotification' => 'Evento notificação',
-	'Class:EventNotification+' => 'Rastreamento de uma notificação que foi enviada',
-	'Class:EventNotification/Attribute:trigger_id' => 'Gatilho',
-	'Class:EventNotification/Attribute:trigger_id+' => 'conta usuário',
-	'Class:EventNotification/Attribute:action_id' => 'usuário',
-	'Class:EventNotification/Attribute:action_id+' => 'conta usuário',
-	'Class:EventNotification/Attribute:object_id' => 'Id objeto',
-	'Class:EventNotification/Attribute:object_id+' => 'Id objeto (classe definida pelo gatilho?)',
-));
-
-//
-// Class: EventNotificationEmail
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventNotificationEmail' => 'Evento envio email',
-	'Class:EventNotificationEmail+' => 'Rastreamento de um e-mail que foi enviado',
-	'Class:EventNotificationEmail/Attribute:to' => 'Para',
-	'Class:EventNotificationEmail/Attribute:to+' => 'Para',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'CCO',
-	'Class:EventNotificationEmail/Attribute:bcc+' => 'CCO',
-	'Class:EventNotificationEmail/Attribute:from' => 'De',
-	'Class:EventNotificationEmail/Attribute:from+' => 'Remetente da mensagem',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Assunto',
-	'Class:EventNotificationEmail/Attribute:subject+' => 'Assunto',
-	'Class:EventNotificationEmail/Attribute:body' => 'Corpo',
-	'Class:EventNotificationEmail/Attribute:body+' => 'Corpo',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Anexos',
-	'Class:EventNotificationEmail/Attribute:attachments+' => '',
-));
-
-//
-// Class: EventIssue
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventIssue' => 'Evento entrega',
-	'Class:EventIssue+' => 'Rastreamento de entrega (aviso, erro, etc.)',
-	'Class:EventIssue/Attribute:issue' => 'Entrega',
-	'Class:EventIssue/Attribute:issue+' => 'O que aconteceu',
-	'Class:EventIssue/Attribute:impact' => 'Impacto',
-	'Class:EventIssue/Attribute:impact+' => 'Quais são as consequências',
-	'Class:EventIssue/Attribute:page' => 'Página',
-	'Class:EventIssue/Attribute:page+' => 'HTTP ponto de entrada',
-	'Class:EventIssue/Attribute:arguments_post' => 'Argumentos postados',
-	'Class:EventIssue/Attribute:arguments_post+' => 'Argumentos HTTP POST',
-	'Class:EventIssue/Attribute:arguments_get' => 'Argumentos URL',
-	'Class:EventIssue/Attribute:arguments_get+' => 'Argumentos HTTP GET',
-	'Class:EventIssue/Attribute:callstack' => 'Quantidade solicitações',
-	'Class:EventIssue/Attribute:callstack+' => 'Quantidade de solicitações',
-	'Class:EventIssue/Attribute:data' => 'Dado',
-	'Class:EventIssue/Attribute:data+' => 'Mais informações',
-));
-
-//
-// Classes: EventWebService and EventRestService
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventWebService' => 'Evento Web service',
-	'Class:EventWebService+' => 'Rastreamento de uma solicitação de serviço web',
-	'Class:EventWebService/Attribute:verb' => 'Verbo',
-	'Class:EventWebService/Attribute:verb+' => 'Nome da operação',
-	'Class:EventWebService/Attribute:result' => 'Resultado',
-	'Class:EventWebService/Attribute:result+' => 'Sucesso/fracasso geral',
-	'Class:EventWebService/Attribute:log_info' => 'Log informação',
-	'Class:EventWebService/Attribute:log_info+' => 'Resultado log informação',
-	'Class:EventWebService/Attribute:log_warning' => 'Log de alerta',
-	'Class:EventWebService/Attribute:log_warning+' => 'Resultado log de alerta',
-	'Class:EventWebService/Attribute:log_error' => 'Log de erro',
-	'Class:EventWebService/Attribute:log_error+' => 'Resultado log de erro',
-	'Class:EventWebService/Attribute:data' => 'Dado',
-	'Class:EventWebService/Attribute:data+' => 'Resultado dado',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-));
-
-//
-// Class: EventLoginUsage
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:EventLoginUsage' => 'Login utilizado',
-	'Class:EventLoginUsage+' => 'Conexão com a aplicação',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
-	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'Nome usuário',
-	'Class:EventLoginUsage/Attribute:contact_name+' => 'Nome usuário',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'Email usuário',
-	'Class:EventLoginUsage/Attribute:contact_email+' => 'Endereço email deste usuário',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Action' => 'Ação personalizada',
-	'Class:Action+' => 'Ação definida pelo usuário',
-	'Class:Action/Attribute:name' => 'Nome',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Descrição',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Status',
-	'Class:Action/Attribute:status+' => 'Em produção ou ?',
-	'Class:Action/Attribute:status/Value:test' => 'sendo testado',
-	'Class:Action/Attribute:status/Value:test+' => 'sendo testado',
-	'Class:Action/Attribute:status/Value:enabled' => 'Em produção',
-	'Class:Action/Attribute:status/Value:enabled+' => 'Em produção',
-	'Class:Action/Attribute:status/Value:disabled' => 'Inativo',
-	'Class:Action/Attribute:status/Value:disabled+' => 'Inativo',
-	'Class:Action/Attribute:trigger_list' => 'Gatilhos relacionados',
-	'Class:Action/Attribute:trigger_list+' => 'Gatilhos ligados a esta ação',
-	'Class:Action/Attribute:finalclass' => 'Tipo',
-	'Class:Action/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ActionNotification
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ActionNotification' => 'Notificação',
-	'Class:ActionNotification+' => 'Notificação (resumo)',
-));
-
-//
-// Class: ActionEmail
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ActionEmail' => 'Notificação email',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Testar destinatário',
-	'Class:ActionEmail/Attribute:test_recipient+' => 'Destinatário em caso o estado está definido como "Teste"',
-	'Class:ActionEmail/Attribute:from' => 'De',
-	'Class:ActionEmail/Attribute:from+' => 'Será enviado para o cabeçalho de email',
-	'Class:ActionEmail/Attribute:reply_to' => 'Responder para',
-	'Class:ActionEmail/Attribute:reply_to+' => 'Será enviado para o cabeçalho de email',
-	'Class:ActionEmail/Attribute:to' => 'Para',
-	'Class:ActionEmail/Attribute:to+' => 'Destinatário para o email',
-	'Class:ActionEmail/Attribute:cc' => 'CC',
-	'Class:ActionEmail/Attribute:cc+' => 'CC',
-	'Class:ActionEmail/Attribute:bcc' => 'CCO',
-	'Class:ActionEmail/Attribute:bcc+' => 'CCO',
-	'Class:ActionEmail/Attribute:subject' => 'assunto',
-	'Class:ActionEmail/Attribute:subject+' => 'Título do email',
-	'Class:ActionEmail/Attribute:body' => 'corpo',
-	'Class:ActionEmail/Attribute:body+' => 'Conteúdo do email',
-	'Class:ActionEmail/Attribute:importance' => 'importância',
-	'Class:ActionEmail/Attribute:importance+' => 'Flag importância',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'baixo',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => 'baixo',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'alto',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => 'alto',
-));
-
-//
-// Class: Trigger
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Trigger' => 'Gatilho',
-	'Class:Trigger+' => 'Manipulador de eventos personalizado',
-	'Class:Trigger/Attribute:description' => 'Descrição',
-	'Class:Trigger/Attribute:description+' => 'uma linha descrição',
-	'Class:Trigger/Attribute:action_list' => 'Ações desencadeadas',
-	'Class:Trigger/Attribute:action_list+' => 'Ações executadas quando o gatilho é ativado',
-	'Class:Trigger/Attribute:finalclass' => 'Tipo',
-	'Class:Trigger/Attribute:finalclass+' => '',
-));
-
-//
-// Class: TriggerOnObject
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnObject' => 'Gatilho (classe dependente)',
-	'Class:TriggerOnObject+' => 'Gatilho em uma determinada classe de objetos',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Classe alvo',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-));
-
-//
-// Class: TriggerOnPortalUpdate
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnPortalUpdate' => 'Gatilho (quando atualizado a partir do portal)',
-	'Class:TriggerOnPortalUpdate+' => 'Gatilho de uma atualização do usuário final a partir do portal',
-));
-
-//
-// Class: TriggerOnStateChange
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnStateChange' => 'Gatilho (na mudança de estado)',
-	'Class:TriggerOnStateChange+' => 'Gatilho de mudança do estado do objeto',
-	'Class:TriggerOnStateChange/Attribute:state' => 'State',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-));
-
-//
-// Class: TriggerOnStateEnter
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnStateEnter' => 'Gatilho (ao entrar em um estado)',
-	'Class:TriggerOnStateEnter+' => 'Gatilho de mudança do estado do objeto - entrando',
-));
-
-//
-// Class: TriggerOnStateLeave
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnStateLeave' => 'Gatilho (para sair de um estado)',
-	'Class:TriggerOnStateLeave+' => 'Gatilho de mudança do estado do objeto - saindo',
-));
-
-//
-// Class: TriggerOnObjectCreates
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnObjectCreate' => 'Gatilho (na criação do objeto)',
-	'Class:TriggerOnObjectCreate+' => 'Gatilho de criação do objeto de [a classe filha] determinada classe',
-));
-
-//
-// Class: TriggerOnThresholdReached
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:TriggerOnThresholdReached' => 'Gatilho (na entrada)',
-	'Class:TriggerOnThresholdReached+' => 'Gatilho no cronômetro limite atingido',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Cronômetro',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Entrada',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
-));
-
-//
-// Class: lnkTriggerAction
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkTriggerAction' => 'Ações/Gatilho',
-	'Class:lnkTriggerAction+' => 'Ligação entre um Gatilho e uma Ação',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'Ação',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'Ação a ser executada',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'Ação',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Gatilho',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Gatilho',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Ordem',
-	'Class:lnkTriggerAction/Attribute:order+' => 'Ordem de execução das ações',
-));
-
-//
-// Synchro Data Source
-//
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SynchroDataSource/Attribute:name' => 'Nome',
-	'Class:SynchroDataSource/Attribute:name+' => 'Nome',
-	'Class:SynchroDataSource/Attribute:description' => 'Descrição',
-	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe alvo',
-	'Class:SynchroDataSource/Attribute:user_id' => 'Usuário',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contato para notificação',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contato para notificar em caso de erro',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icones hiperlink',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hiperlink de uma pequena imagem representando o aplicativo com o qual o iTop é sincronizado',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Hiperlink aplicativo',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperlink para o objeto na aplicação externa com a qual o iTop é sincronizado (se aplicável). As substituições possíveis: $this->attribute$ e $replica->primary_key$',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Política reconciliação', //TODO enum values
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervalo da carga plena',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A recarga completa de todos os dados devem ocorrer pelo menos tão frequentemente como especificado aqui',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Ação sobre zero',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Medidas tomadas quando a busca retorna nenhum objeto',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Ação em um',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Medidas tomadas quando a busca retorna exatamente um objeto',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Ação em muitos',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Medidas tomadas quando a busca retorna mais de um objeto',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Usuários permitidos',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Quem tem permissão para excluir objetos sincronizados',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Usuários permitidos',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Ninguém',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Somente Administradores',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Todos os usuários permitidos',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Regras de atualização',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Sintaxe: nome_do_campo:valor; ...',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Duração de retenção',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo um objeto obsoleto é mantida antes de ser excluído',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabela de dados',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nome da tabela para armazenar os dados de sincronização. Se for deixado vazio, um nome padrão será computado.',
-	'SynchroDataSource:Description' => 'Descrição',
-	'SynchroDataSource:Reconciliation' => 'Pesquisa &amp; reconciliação',
-	'SynchroDataSource:Deletion' => 'Regras de exclusão',
-	'SynchroDataSource:Status' => 'Status',
-	'SynchroDataSource:Information' => 'Informação',
-	'SynchroDataSource:Definition' => 'Definição',
-	'Core:SynchroAttributes' => 'Atributos',
-	'Core:SynchroStatus' => 'Status',
-	'Core:Synchro:ErrorsLabel' => 'Erros',	
-	'Core:Synchro:CreatedLabel' => 'Criado',
-	'Core:Synchro:ModifiedLabel' => 'Modificado',
-	'Core:Synchro:UnchangedLabel' => 'Inalterado',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Erros',
-	'Core:Synchro:ReconciledLabel' => 'Reconciliados',
-	'Core:Synchro:ReconciledNewLabel' => 'Criado',
-	'Core:SynchroReconcile:Yes' => 'Sim',
-	'Core:SynchroReconcile:No' => 'Não',
-	'Core:SynchroUpdate:Yes' => 'Sim',
-	'Core:SynchroUpdate:No' => 'Não',
-	'Core:Synchro:LastestStatus' => 'Último Status',
-	'Core:Synchro:History' => 'Histórico sincronização',
-	'Core:Synchro:NeverRun' => 'Este sincronismo nunca foi executado. Sem registo ainda.',
-	'Core:Synchro:SynchroEndedOn_Date' => 'A última sincronização terminou em %1$s.',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'A sincronização começou em %1$s ainda está em execução...',
-	'Menu:DataSources' => 'Fontes de dados de sincronização', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataSources+' => 'Todas fontes de dados de sincronização', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Core:Synchro:label_repl_ignored' => 'Ignoradas (%1$s)',
-	'Core:Synchro:label_repl_disappeared' => 'Desaparecido (%1$s)',
-	'Core:Synchro:label_repl_existing' => 'Saindo (%1$s)',
-	'Core:Synchro:label_repl_new' => 'Novo (%1$s)',
-	'Core:Synchro:label_obj_deleted' => 'Excluído (%1$s)',
-	'Core:Synchro:label_obj_obsoleted' => 'Obsoleto (%1$s)',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Erros (%1$s)',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'Nenhuma ação (%1$s)',
-	'Core:Synchro:label_obj_unchanged' => 'Inalterado (%1$s)',
-	'Core:Synchro:label_obj_updated' => 'Atualizado (%1$s)', 
-	'Core:Synchro:label_obj_updated_errors' => 'Erros (%1$s)',
-	'Core:Synchro:label_obj_new_unchanged' => 'Inalterado (%1$s)',
-	'Core:Synchro:label_obj_new_updated' => 'Atualizado (%1$s)',
-	'Core:Synchro:label_obj_created' => 'Criado (%1$s)',
-	'Core:Synchro:label_obj_new_errors' => 'Erros (%1$s)',
-	'Core:Synchro:History' => 'Histórico sincronização',
-	'Core:SynchroLogTitle' => '%1$s - %2$s',
-	'Core:Synchro:Nb_Replica' => 'Replica processado: %1$s',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Pelo menos uma chave de reconciliação deve ser especificado, ou a política de reconciliação deve ser a de usar a chave primária.',			
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Um período de retenção excluir deve ser especificado, já que objetos devem ser excluídos depois de ser marcado como obsoleto.',			
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Objetos obsoletos devem ser atualizados, mas nenhuma atualização é especificado.',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'A tabela %1$s já existe na base de dados. Por favor, use um outro nome para a tabela de dados sincronizada.',
-	'Core:SynchroReplica:PublicData' => 'Dados públicos',
-	'Core:SynchroReplica:PrivateDetails' => 'Detalhes privado',
-	'Core:SynchroReplica:BackToDataSource' => 'Voltar para a fonte de dados sincronização: %1$s',
-	'Core:SynchroReplica:ListOfReplicas' => 'Lista de replica',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'Id (chave primária)',
-	'Core:SynchroAtt:attcode' => 'Atributo',
-	'Core:SynchroAtt:attcode+' => 'Campo do objeto',
-	'Core:SynchroAtt:reconciliation' => 'Reconciliação?',
-	'Core:SynchroAtt:reconciliation+' => 'Usado para pesquisa',
-	'Core:SynchroAtt:update' => 'Atualizar?',
-	'Core:SynchroAtt:update+' => 'Usado para atualizar o objeto',
-	'Core:SynchroAtt:update_policy' => 'Política de atualização',
-	'Core:SynchroAtt:update_policy+' => 'Comportamento do campo atualizado',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Chave reconciliação',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Código atributo para a reconciliação chave externa',
-	'Core:SyncDataExchangeComment' => '(Sincronização dado)',
-	'Core:Synchro:ListOfDataSources' => 'Lista de fontes de dados:',
-	'Core:Synchro:LastSynchro' => 'Última sincronização:',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'Este objeto é sincronizado com uma fonte de dados externa',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'O objeto foi <b>criado</b> pela fonte de dados externa %1$s',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'O objeto <b>não pode ser excluído</b> pela fonte de dados externa %1$s',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Você <b>não pode excluir o objeto</b> porque é propriedade de uma fonte de dados externa %1$s',
-	'TitleSynchroExecution' => 'Execução da sincronização',
-	'Class:SynchroDataSource:DataTable' => 'Tabela base de dados: %1$s',
-	'Core:SyncDataSourceObsolete' => 'A fonte de dados é marcado como obsoleto. Operação cancelada.',
-	'Core:SyncDataSourceAccessRestriction' => 'Adminstradores ou apenas o usuário especificado na fonte de dados pode executar esta operação. Operação cancelada.',
-	'Core:SyncTooManyMissingReplicas' => 'Todos os registros foram intocado por algum tempo (todos os objetos podem ser apagados). Verifique se o processo que grava na tabela de sincronização ainda está em execução. Operação cancelada.',
-	'Core:SyncSplitModeCLIOnly' => 'A sincronização pode ser executado em pedaços só se for executado em modo CLI',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erro(s), %3$s alerta(s).',
-	'Core:SynchroReplica:TargetObject' => 'Objeto(s) sincronizado(s): %1$s',
-	'Class:AsyncSendEmail' => 'Email (assíncrono)',
-	'Class:AsyncSendEmail/Attribute:to' => 'Para',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Assunto',
-	'Class:AsyncSendEmail/Attribute:body' => 'Corpo',
-	'Class:AsyncSendEmail/Attribute:header' => 'Cabeçalho',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Senha criptograda',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Valor anterior',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Campo criptografado',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valor anterior',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Caso Log',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Última entrada',
-	'Class:SynchroDataSource' => 'Fonte de dados sincronização',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementação',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produção',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restrição de escopo',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use os atributos',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use o campo primary_key',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Criar',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erro',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erro',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Atualizar',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Criar',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erro',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'TPegue o primeiro (acaso?)',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política exclusão',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Excluir',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Atualizar',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Atualize quando excluído',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Listar atributos',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Somente administradores',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Permissão total para excluir esses objetos',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguém',
-	'Class:SynchroAttribute' => 'Atributo sincronização',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Fonte de dados',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Código atributo',
-	'Class:SynchroAttribute/Attribute:update' => 'Atualizar',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconciliar',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Política atualizar',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Trancado',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Destrancado',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Iniciando se vazio',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Classe',
-	'Class:SynchroAttExtKey' => 'Atributo sincronização (ExtKey)',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Atributo reconciliação',
-	'Class:SynchroAttLinkSet' => 'Atributo sincronização (Linkset)',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Separador de linhas',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Separador atributos',
-	'Class:SynchroLog' => 'Log sincronização',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Fonte de dados sincronização',
-	'Class:SynchroLog/Attribute:start_date' => 'Data início',
-	'Class:SynchroLog/Attribute:end_date' => 'Data final',
-	'Class:SynchroLog/Attribute:status' => 'Status',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completado',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Erro',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Ainda está em execução',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Número réplica vista',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Número réplica total',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Número objeto(s) excluído(s)',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Número de erros enquanto excluindo',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Número objeto(s) obsoleto(s)',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Número de erros enquanto obsoletos',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Número objeto(s) criado(s)',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Número de erros enquanto criando',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Número objeto(s) atualizado(s)',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Número de erros enquanto atualizando',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Número de erros durante reconciliação',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Número réplica desaparecida',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Número objetos atualizados',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Número objetos inalterados',
-	'Class:SynchroLog/Attribute:last_error' => 'Últimos erros',
-	'Class:SynchroLog/Attribute:traces' => 'Rastrear',
-	'Class:SynchroReplica' => 'Réplica sincronização',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Fonte de dados',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Objeto destino (ID)',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Tipo destino',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Visto pela última vez',
-	'Class:SynchroReplica/Attribute:status' => 'Status',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificado',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'Novo',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsoleto',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orfão',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Sincronizado',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objeto criado?',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Último Erro',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Alertas',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data criação',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Última data modificação',
-	'Class:appUserPreferences' => 'Preferência de usuário',
-	'Class:appUserPreferences/Attribute:userid' => 'Usuário',
-	'Class:appUserPreferences/Attribute:preferences' => 'Preferências',
-	'Core:ExecProcess:Code1' => 'Comando errado ou comando terminou com erros (por exemplo, nome do script errado)',
-	'Core:ExecProcess:Code255' => 'PHP erro (parsing, or runtime)',
-));
-
-//
-// Attribute Duration
-//
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Core:Duration_Seconds'	=> '%1$ds',	
-	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Core:DeletedObjectLabel' => '%1s (excluído)',
+	'Core:DeletedObjectTip' => 'O objeto foi excluído em %1$s (%2$s)',
+
+	'Core:UnknownObjectLabel' => 'Objeto não encontrado (classe: %1$s, id: %2$d)',
+	'Core:UnknownObjectTip' => 'O objeto não pode ser encontrado. Ele pode ter sido eliminado há algum tempo e o log foi removido desde então.',
+
+	'Core:AttributeLinkedSet' => 'Array de objetos',
+	'Core:AttributeLinkedSet+' => 'Qualquer tipo de objetos da mesma classe ou subclasses',
+
+	'Core:AttributeLinkedSetIndirect' => 'Array de objetos (N-N)',
+	'Core:AttributeLinkedSetIndirect+' => 'Qualquer tipo de objetos [sub-classe] da mesma classe',
+
+	'Core:AttributeInteger' => 'Inteiro',
+	'Core:AttributeInteger+' => 'Valor numérico (não pode ser negativo)',
+
+	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal+' => 'Valor decimal (não pode ser negativo)',
+
+	'Core:AttributeBoolean' => 'Boolean',
+	'Core:AttributeBoolean+' => 'Boolean',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+
+	'Core:AttributeString' => 'String',
+	'Core:AttributeString+' => 'Seqüência alfanumérica',
+
+	'Core:AttributeClass' => 'Classe',
+	'Core:AttributeClass+' => 'Classe',
+
+	'Core:AttributeApplicationLanguage' => 'Linguagem usuário',
+	'Core:AttributeApplicationLanguage+' => 'Linguagem e país (EN US)',
+
+	'Core:AttributeFinalClass' => 'Classe (auto)',
+	'Core:AttributeFinalClass+' => 'Classe real do objeto (criada automaticamente pelo sistema)',
+
+	'Core:AttributePassword' => 'Senha',
+	'Core:AttributePassword+' => 'Senha para o dispositivo externo',
+
+ 	'Core:AttributeEncryptedString' => 'String encriptada',
+	'Core:AttributeEncryptedString+' => 'String encriptada com uma chave local',
+
+	'Core:AttributeText' => 'Texto',
+	'Core:AttributeText+' => 'Cadeia de caracteres Multi-linha',
+
+	'Core:AttributeHTML' => 'HTML',
+	'Core:AttributeHTML+' => 'HTML string',
+
+	'Core:AttributeEmailAddress' => 'Endereço email',
+	'Core:AttributeEmailAddress+' => 'Endereço email',
+
+	'Core:AttributeIPAddress' => 'Endereço IP',
+	'Core:AttributeIPAddress+' => 'Endereço IP',
+
+	'Core:AttributeOQL' => 'OQL',
+	'Core:AttributeOQL+' => 'Expressão Object Query Langage',
+
+	'Core:AttributeEnum' => 'Enum',
+	'Core:AttributeEnum+' => 'Lista de pré-definida seqüências alfanuméricas',
+
+	'Core:AttributeTemplateString' => 'Modelo string',
+	'Core:AttributeTemplateString+' => 'Espaço reservado contendo string',
+
+	'Core:AttributeTemplateText' => 'Template text',
+	'Core:AttributeTemplateText+' => 'Texto contendo espaços reservados',
+
+	'Core:AttributeTemplateHTML' => 'Modelo HTML',
+	'Core:AttributeTemplateHTML+' => 'HTML contendo espaços reservados',
+
+	'Core:AttributeDateTime' => 'Data/hora',
+	'Core:AttributeDateTime+' => 'Data e hora (ano-mês-dia hh:mm:ss)',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Data formato:<br/>
+	<b>%1$s</b><br/>
+	Exemplo: %2$s
+</p>
+<p>
+Operadores:<br/>
+	<b>&gt;</b><em>data</em><br/>
+	<b>&lt;</b><em>data</em><br/>
+	<b>[</b><em>data</em>,<em>data</em><b>]</b>
+</p>
+<p>
+Se o tempo for omitido, o padrão é 00:00:00
+</p>',
+
+	'Core:AttributeDate' => 'Data',
+	'Core:AttributeDate+' => 'Data (ano-mês-dia)',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Data formato:<br/>
+	<b>%1$s</b><br/>
+	Exemplo: %2$s
+</p>
+<p>
+Operadores:<br/>
+	<b>&gt;</b><em>data</em><br/>
+	<b>&lt;</b><em>data</em><br/>
+	<b>[</b><em>data</em>,<em>data</em><b>]</b>
+</p>',
+
+	'Core:AttributeDeadline' => 'Tempo determinado',
+	'Core:AttributeDeadline+' => 'Data, apresentada relativamente ao tempo atual',
+
+	'Core:AttributeExternalKey' => 'Chave externa',
+	'Core:AttributeExternalKey+' => 'Chave externa (ou foreign)',
+
+	'Core:AttributeHierarchicalKey' => 'Chave hierárquica',
+	'Core:AttributeHierarchicalKey+' => 'Chave externa (ou foreign) para o principal',
+
+	'Core:AttributeExternalField' => 'Campo externo',
+	'Core:AttributeExternalField+' => 'Campo mapeado para uma chave externa',
+
+	'Core:AttributeURL' => 'URL',
+	'Core:AttributeURL+' => 'URL absoluto ou relativo como um texto',
+
+	'Core:AttributeBlob' => 'Blob',
+	'Core:AttributeBlob+' => 'Qualquer conteúdo binário (documento)',
+
+	'Core:AttributeOneWayPassword' => 'Uma forma de senha',
+	'Core:AttributeOneWayPassword+' => 'Uma forma de senha encriptado',
+
+	'Core:AttributeTable' => 'Tabela',
+	'Core:AttributeTable+' => 'Matriz indexada tem duas dimensões',
+
+	'Core:AttributePropertySet' => 'Propriedades',
+	'Core:AttributePropertySet+' => 'Lista de propriedades sem categoria (nome e valor)',
+
+	'Core:AttributeFriendlyName' => 'Nome amigável',
+	'Core:AttributeFriendlyName+' => 'Atributo criado automaticamente; o nome amigável é gerado depois de vários atributos',
+
+	'Core:FriendlyName-Label' => 'Nome amigável',
+	'Core:FriendlyName-Description' => 'Nome amigável',
+));
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChange' => 'Mudanças',
+	'Class:CMDBChange+' => 'Rastreamento de mudanças',
+	'Class:CMDBChange/Attribute:date' => 'Data',
+	'Class:CMDBChange/Attribute:date+' => 'Data e hora em que as mudanças foram registrados',
+	'Class:CMDBChange/Attribute:userinfo' => 'Mais Informações',
+	'Class:CMDBChange/Attribute:userinfo+' => 'Informações solicitantes definidos',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOp' => 'Operações de mudanças',
+	'Class:CMDBChangeOp+' => 'Operações de controle de mudança',
+	'Class:CMDBChangeOp/Attribute:change' => 'Mudança',
+	'Class:CMDBChangeOp/Attribute:change+' => 'Mudança',
+	'Class:CMDBChangeOp/Attribute:date' => 'Data',
+	'Class:CMDBChangeOp/Attribute:date+' => 'Data e hora da mudança',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'Usuário',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'Quem fez essa mudança',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'Classe objeto',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'Classe objeto',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'ID objeto',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'ID objeto',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'tipo',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOpCreate' => 'Criação do objeto',
+	'Class:CMDBChangeOpCreate+' => 'Rastreamento de criação do objeto',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOpDelete' => 'Objeto excluído',
+	'Class:CMDBChangeOpDelete+' => 'Rastreamento de exclusão do objeto',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOpSetAttribute' => 'Objeto alterado',
+	'Class:CMDBChangeOpSetAttribute+' => 'Rastreamento alteração propriedade Objeto',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Atributo',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'Código da propriedade modificado',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => 'Propriedade alterado',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Propriedades escalares objeto de controle de alterações',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'valor anterior do atributo',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Novo valor',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'novo valor do atributo',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Change:ObjectCreated' => 'Objeto criado',
+	'Change:ObjectDeleted' => 'Objeto excluído',
+	'Change:ObjectModified' => 'Objeto modificado',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s configurado para %2$s (valor anterior: %3$s)',
+	'Change:AttName_SetTo' => '%1$s configurado para %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s anexado ao %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modificado, valor anterior: %2$s',
+	'Change:AttName_Changed' => '%1$s modificado',
+	'Change:AttName_EntryAdded' => '%1$s modificado, nova entrada adicionada: %2$s',
+	'Change:LinkSet:Added' => 'adicionado %1$s',
+	'Change:LinkSet:Removed' => 'excluído %1$s',
+	'Change:LinkSet:Modified' => 'modificado %1$s',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => 'data mudança',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'controle de alterações de dados',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'conteúdo anterior do atributo',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:CMDBChangeOpSetAttributeText' => 'mudança texto',
+	'Class:CMDBChangeOpSetAttributeText+' => 'controle de alterações de texto',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'conteúdo anterior do atributo',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Event' => 'Evento registros',
+	'Class:Event+' => 'Um evento interno do aplicativo',
+	'Class:Event/Attribute:message' => 'Mensagens',
+	'Class:Event/Attribute:message+' => 'pequena descrição deste evento',
+	'Class:Event/Attribute:date' => 'Data',
+	'Class:Event/Attribute:date+' => 'data e hora em que as mudanças foram registradas',
+	'Class:Event/Attribute:userinfo' => 'Informações usuário',
+	'Class:Event/Attribute:userinfo+' => 'identificação do usuário que estava fazendo a ação que desencadeou este evento',
+	'Class:Event/Attribute:finalclass' => 'Tipo',
+	'Class:Event/Attribute:finalclass+' => '',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EventNotification' => 'Evento notificação',
+	'Class:EventNotification+' => 'Rastreamento de uma notificação que foi enviada',
+	'Class:EventNotification/Attribute:trigger_id' => 'Gatilho',
+	'Class:EventNotification/Attribute:trigger_id+' => 'conta usuário',
+	'Class:EventNotification/Attribute:action_id' => 'usuário',
+	'Class:EventNotification/Attribute:action_id+' => 'conta usuário',
+	'Class:EventNotification/Attribute:object_id' => 'Id objeto',
+	'Class:EventNotification/Attribute:object_id+' => 'Id objeto (classe definida pelo gatilho?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EventNotificationEmail' => 'Evento envio email',
+	'Class:EventNotificationEmail+' => 'Rastreamento de um e-mail que foi enviado',
+	'Class:EventNotificationEmail/Attribute:to' => 'Para',
+	'Class:EventNotificationEmail/Attribute:to+' => 'Para',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'CCO',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'CCO',
+	'Class:EventNotificationEmail/Attribute:from' => 'De',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Remetente da mensagem',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Assunto',
+	'Class:EventNotificationEmail/Attribute:subject+' => 'Assunto',
+	'Class:EventNotificationEmail/Attribute:body' => 'Corpo',
+	'Class:EventNotificationEmail/Attribute:body+' => 'Corpo',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Anexos',
+	'Class:EventNotificationEmail/Attribute:attachments+' => '',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EventIssue' => 'Evento entrega',
+	'Class:EventIssue+' => 'Rastreamento de entrega (aviso, erro, etc.)',
+	'Class:EventIssue/Attribute:issue' => 'Entrega',
+	'Class:EventIssue/Attribute:issue+' => 'O que aconteceu',
+	'Class:EventIssue/Attribute:impact' => 'Impacto',
+	'Class:EventIssue/Attribute:impact+' => 'Quais são as consequências',
+	'Class:EventIssue/Attribute:page' => 'Página',
+	'Class:EventIssue/Attribute:page+' => 'HTTP ponto de entrada',
+	'Class:EventIssue/Attribute:arguments_post' => 'Argumentos postados',
+	'Class:EventIssue/Attribute:arguments_post+' => 'Argumentos HTTP POST',
+	'Class:EventIssue/Attribute:arguments_get' => 'Argumentos URL',
+	'Class:EventIssue/Attribute:arguments_get+' => 'Argumentos HTTP GET',
+	'Class:EventIssue/Attribute:callstack' => 'Quantidade solicitações',
+	'Class:EventIssue/Attribute:callstack+' => 'Quantidade de solicitações',
+	'Class:EventIssue/Attribute:data' => 'Dado',
+	'Class:EventIssue/Attribute:data+' => 'Mais informações',
+));
+
+//
+// Classes: EventWebService and EventRestService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EventWebService' => 'Evento Web service',
+	'Class:EventWebService+' => 'Rastreamento de uma solicitação de serviço web',
+	'Class:EventWebService/Attribute:verb' => 'Verbo',
+	'Class:EventWebService/Attribute:verb+' => 'Nome da operação',
+	'Class:EventWebService/Attribute:result' => 'Resultado',
+	'Class:EventWebService/Attribute:result+' => 'Sucesso/fracasso geral',
+	'Class:EventWebService/Attribute:log_info' => 'Log informação',
+	'Class:EventWebService/Attribute:log_info+' => 'Resultado log informação',
+	'Class:EventWebService/Attribute:log_warning' => 'Log de alerta',
+	'Class:EventWebService/Attribute:log_warning+' => 'Resultado log de alerta',
+	'Class:EventWebService/Attribute:log_error' => 'Log de erro',
+	'Class:EventWebService/Attribute:log_error+' => 'Resultado log de erro',
+	'Class:EventWebService/Attribute:data' => 'Dado',
+	'Class:EventWebService/Attribute:data+' => 'Resultado dado',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+));
+
+//
+// Class: EventLoginUsage
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:EventLoginUsage' => 'Login utilizado',
+	'Class:EventLoginUsage+' => 'Conexão com a aplicação',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'Nome usuário',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'Nome usuário',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'Email usuário',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Endereço email deste usuário',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Action' => 'Ação personalizada',
+	'Class:Action+' => 'Ação definida pelo usuário',
+	'Class:Action/Attribute:name' => 'Nome',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Descrição',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Status',
+	'Class:Action/Attribute:status+' => 'Em produção ou ?',
+	'Class:Action/Attribute:status/Value:test' => 'sendo testado',
+	'Class:Action/Attribute:status/Value:test+' => 'sendo testado',
+	'Class:Action/Attribute:status/Value:enabled' => 'Em produção',
+	'Class:Action/Attribute:status/Value:enabled+' => 'Em produção',
+	'Class:Action/Attribute:status/Value:disabled' => 'Inativo',
+	'Class:Action/Attribute:status/Value:disabled+' => 'Inativo',
+	'Class:Action/Attribute:trigger_list' => 'Gatilhos relacionados',
+	'Class:Action/Attribute:trigger_list+' => 'Gatilhos ligados a esta ação',
+	'Class:Action/Attribute:finalclass' => 'Tipo',
+	'Class:Action/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ActionNotification' => 'Notificação',
+	'Class:ActionNotification+' => 'Notificação (resumo)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:ActionEmail' => 'Notificação email',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Testar destinatário',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Destinatário em caso o estado está definido como "Teste"',
+	'Class:ActionEmail/Attribute:from' => 'De',
+	'Class:ActionEmail/Attribute:from+' => 'Será enviado para o cabeçalho de email',
+	'Class:ActionEmail/Attribute:reply_to' => 'Responder para',
+	'Class:ActionEmail/Attribute:reply_to+' => 'Será enviado para o cabeçalho de email',
+	'Class:ActionEmail/Attribute:to' => 'Para',
+	'Class:ActionEmail/Attribute:to+' => 'Destinatário para o email',
+	'Class:ActionEmail/Attribute:cc' => 'CC',
+	'Class:ActionEmail/Attribute:cc+' => 'CC',
+	'Class:ActionEmail/Attribute:bcc' => 'CCO',
+	'Class:ActionEmail/Attribute:bcc+' => 'CCO',
+	'Class:ActionEmail/Attribute:subject' => 'assunto',
+	'Class:ActionEmail/Attribute:subject+' => 'Título do email',
+	'Class:ActionEmail/Attribute:body' => 'corpo',
+	'Class:ActionEmail/Attribute:body+' => 'Conteúdo do email',
+	'Class:ActionEmail/Attribute:importance' => 'importância',
+	'Class:ActionEmail/Attribute:importance+' => 'Flag importância',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'baixo',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => 'baixo',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'alto',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => 'alto',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Trigger' => 'Gatilho',
+	'Class:Trigger+' => 'Manipulador de eventos personalizado',
+	'Class:Trigger/Attribute:description' => 'Descrição',
+	'Class:Trigger/Attribute:description+' => 'uma linha descrição',
+	'Class:Trigger/Attribute:action_list' => 'Ações desencadeadas',
+	'Class:Trigger/Attribute:action_list+' => 'Ações executadas quando o gatilho é ativado',
+	'Class:Trigger/Attribute:finalclass' => 'Tipo',
+	'Class:Trigger/Attribute:finalclass+' => '',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnObject' => 'Gatilho (classe dependente)',
+	'Class:TriggerOnObject+' => 'Gatilho em uma determinada classe de objetos',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Classe alvo',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+));
+
+//
+// Class: TriggerOnPortalUpdate
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnPortalUpdate' => 'Gatilho (quando atualizado a partir do portal)',
+	'Class:TriggerOnPortalUpdate+' => 'Gatilho de uma atualização do usuário final a partir do portal',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnStateChange' => 'Gatilho (na mudança de estado)',
+	'Class:TriggerOnStateChange+' => 'Gatilho de mudança do estado do objeto',
+	'Class:TriggerOnStateChange/Attribute:state' => 'State',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnStateEnter' => 'Gatilho (ao entrar em um estado)',
+	'Class:TriggerOnStateEnter+' => 'Gatilho de mudança do estado do objeto - entrando',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnStateLeave' => 'Gatilho (para sair de um estado)',
+	'Class:TriggerOnStateLeave+' => 'Gatilho de mudança do estado do objeto - saindo',
+));
+
+//
+// Class: TriggerOnObjectCreates
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnObjectCreate' => 'Gatilho (na criação do objeto)',
+	'Class:TriggerOnObjectCreate+' => 'Gatilho de criação do objeto de [a classe filha] determinada classe',
+));
+
+//
+// Class: TriggerOnThresholdReached
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:TriggerOnThresholdReached' => 'Gatilho (na entrada)',
+	'Class:TriggerOnThresholdReached+' => 'Gatilho no cronômetro limite atingido',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Cronômetro',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code+' => '',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Entrada',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index+' => '',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:lnkTriggerAction' => 'Ações/Gatilho',
+	'Class:lnkTriggerAction+' => 'Ligação entre um Gatilho e uma Ação',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'Ação',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'Ação a ser executada',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'Ação',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Gatilho',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Gatilho',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Ordem',
+	'Class:lnkTriggerAction/Attribute:order+' => 'Ordem de execução das ações',
+));
+
+//
+// Synchro Data Source
+//
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:SynchroDataSource/Attribute:name' => 'Nome',
+	'Class:SynchroDataSource/Attribute:name+' => 'Nome',
+	'Class:SynchroDataSource/Attribute:description' => 'Descrição',
+	'Class:SynchroDataSource/Attribute:status' => 'Status', //TODO: enum values
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Classe alvo',
+	'Class:SynchroDataSource/Attribute:user_id' => 'Usuário',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contato para notificação',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contato para notificar em caso de erro',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icones hiperlink',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hiperlink de uma pequena imagem representando o aplicativo com o qual o iTop é sincronizado',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Hiperlink aplicativo',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hiperlink para o objeto na aplicação externa com a qual o iTop é sincronizado (se aplicável). As substituições possíveis: $this->attribute$ e $replica->primary_key$',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Política reconciliação', //TODO enum values
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Intervalo da carga plena',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A recarga completa de todos os dados devem ocorrer pelo menos tão frequentemente como especificado aqui',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Ação sobre zero',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Medidas tomadas quando a busca retorna nenhum objeto',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Ação em um',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Medidas tomadas quando a busca retorna exatamente um objeto',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Ação em muitos',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Medidas tomadas quando a busca retorna mais de um objeto',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Usuários permitidos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Quem tem permissão para excluir objetos sincronizados',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Usuários permitidos',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Ninguém',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Somente Administradores',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'Todos os usuários permitidos',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Regras de atualização',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Sintaxe: nome_do_campo:valor; ...',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Duração de retenção',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'Quanto tempo um objeto obsoleto é mantida antes de ser excluído',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Tabela de dados',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Nome da tabela para armazenar os dados de sincronização. Se for deixado vazio, um nome padrão será computado.',
+	'SynchroDataSource:Description' => 'Descrição',
+	'SynchroDataSource:Reconciliation' => 'Pesquisa &amp; reconciliação',
+	'SynchroDataSource:Deletion' => 'Regras de exclusão',
+	'SynchroDataSource:Status' => 'Status',
+	'SynchroDataSource:Information' => 'Informação',
+	'SynchroDataSource:Definition' => 'Definição',
+	'Core:SynchroAttributes' => 'Atributos',
+	'Core:SynchroStatus' => 'Status',
+	'Core:Synchro:ErrorsLabel' => 'Erros',	
+	'Core:Synchro:CreatedLabel' => 'Criado',
+	'Core:Synchro:ModifiedLabel' => 'Modificado',
+	'Core:Synchro:UnchangedLabel' => 'Inalterado',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Erros',
+	'Core:Synchro:ReconciledLabel' => 'Reconciliados',
+	'Core:Synchro:ReconciledNewLabel' => 'Criado',
+	'Core:SynchroReconcile:Yes' => 'Sim',
+	'Core:SynchroReconcile:No' => 'Não',
+	'Core:SynchroUpdate:Yes' => 'Sim',
+	'Core:SynchroUpdate:No' => 'Não',
+	'Core:Synchro:LastestStatus' => 'Último Status',
+	'Core:Synchro:History' => 'Histórico sincronização',
+	'Core:Synchro:NeverRun' => 'Este sincronismo nunca foi executado. Sem registo ainda.',
+	'Core:Synchro:SynchroEndedOn_Date' => 'A última sincronização terminou em %1$s.',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'A sincronização começou em %1$s ainda está em execução...',
+	'Menu:DataSources' => 'Fontes de dados de sincronização', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataSources+' => 'Todas fontes de dados de sincronização', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Core:Synchro:label_repl_ignored' => 'Ignoradas (%1$s)',
+	'Core:Synchro:label_repl_disappeared' => 'Desaparecido (%1$s)',
+	'Core:Synchro:label_repl_existing' => 'Saindo (%1$s)',
+	'Core:Synchro:label_repl_new' => 'Novo (%1$s)',
+	'Core:Synchro:label_obj_deleted' => 'Excluído (%1$s)',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleto (%1$s)',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Erros (%1$s)',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'Nenhuma ação (%1$s)',
+	'Core:Synchro:label_obj_unchanged' => 'Inalterado (%1$s)',
+	'Core:Synchro:label_obj_updated' => 'Atualizado (%1$s)', 
+	'Core:Synchro:label_obj_updated_errors' => 'Erros (%1$s)',
+	'Core:Synchro:label_obj_new_unchanged' => 'Inalterado (%1$s)',
+	'Core:Synchro:label_obj_new_updated' => 'Atualizado (%1$s)',
+	'Core:Synchro:label_obj_created' => 'Criado (%1$s)',
+	'Core:Synchro:label_obj_new_errors' => 'Erros (%1$s)',
+	'Core:Synchro:History' => 'Histórico sincronização',
+	'Core:SynchroLogTitle' => '%1$s - %2$s',
+	'Core:Synchro:Nb_Replica' => 'Replica processado: %1$s',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'Pelo menos uma chave de reconciliação deve ser especificado, ou a política de reconciliação deve ser a de usar a chave primária.',			
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'Um período de retenção excluir deve ser especificado, já que objetos devem ser excluídos depois de ser marcado como obsoleto.',			
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Objetos obsoletos devem ser atualizados, mas nenhuma atualização é especificado.',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'A tabela %1$s já existe na base de dados. Por favor, use um outro nome para a tabela de dados sincronizada.',
+	'Core:SynchroReplica:PublicData' => 'Dados públicos',
+	'Core:SynchroReplica:PrivateDetails' => 'Detalhes privado',
+	'Core:SynchroReplica:BackToDataSource' => 'Voltar para a fonte de dados sincronização: %1$s',
+	'Core:SynchroReplica:ListOfReplicas' => 'Lista de replica',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'Id (chave primária)',
+	'Core:SynchroAtt:attcode' => 'Atributo',
+	'Core:SynchroAtt:attcode+' => 'Campo do objeto',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliação?',
+	'Core:SynchroAtt:reconciliation+' => 'Usado para pesquisa',
+	'Core:SynchroAtt:update' => 'Atualizar?',
+	'Core:SynchroAtt:update+' => 'Usado para atualizar o objeto',
+	'Core:SynchroAtt:update_policy' => 'Política de atualização',
+	'Core:SynchroAtt:update_policy+' => 'Comportamento do campo atualizado',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Chave reconciliação',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Código atributo para a reconciliação chave externa',
+	'Core:SyncDataExchangeComment' => '(Sincronização dado)',
+	'Core:Synchro:ListOfDataSources' => 'Lista de fontes de dados:',
+	'Core:Synchro:LastSynchro' => 'Última sincronização:',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'Este objeto é sincronizado com uma fonte de dados externa',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'O objeto foi <b>criado</b> pela fonte de dados externa %1$s',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'O objeto <b>não pode ser excluído</b> pela fonte de dados externa %1$s',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'Você <b>não pode excluir o objeto</b> porque é propriedade de uma fonte de dados externa %1$s',
+	'TitleSynchroExecution' => 'Execução da sincronização',
+	'Class:SynchroDataSource:DataTable' => 'Tabela base de dados: %1$s',
+	'Core:SyncDataSourceObsolete' => 'A fonte de dados é marcado como obsoleto. Operação cancelada.',
+	'Core:SyncDataSourceAccessRestriction' => 'Adminstradores ou apenas o usuário especificado na fonte de dados pode executar esta operação. Operação cancelada.',
+	'Core:SyncTooManyMissingReplicas' => 'Todos os registros foram intocado por algum tempo (todos os objetos podem ser apagados). Verifique se o processo que grava na tabela de sincronização ainda está em execução. Operação cancelada.',
+	'Core:SyncSplitModeCLIOnly' => 'A sincronização pode ser executado em pedaços só se for executado em modo CLI',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s erro(s), %3$s alerta(s).',
+	'Core:SynchroReplica:TargetObject' => 'Objeto(s) sincronizado(s): %1$s',
+	'Class:AsyncSendEmail' => 'Email (assíncrono)',
+	'Class:AsyncSendEmail/Attribute:to' => 'Para',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Assunto',
+	'Class:AsyncSendEmail/Attribute:body' => 'Corpo',
+	'Class:AsyncSendEmail/Attribute:header' => 'Cabeçalho',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Senha criptograda',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Campo criptografado',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Valor anterior',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Caso Log',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Última entrada',
+	'Class:SynchroDataSource' => 'Fonte de dados sincronização',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementação',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Produção',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Restrição de escopo',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use os atributos',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use o campo primary_key',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Criar',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Atualizar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Criar',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Erro',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'TPegue o primeiro (acaso?)',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Política exclusão',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Excluir',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignorar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Atualizar',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Atualize quando excluído',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Listar atributos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Somente administradores',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Permissão total para excluir esses objetos',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Ninguém',
+	'Class:SynchroAttribute' => 'Atributo sincronização',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Fonte de dados',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Código atributo',
+	'Class:SynchroAttribute/Attribute:update' => 'Atualizar',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconciliar',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Política atualizar',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Trancado',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Destrancado',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Iniciando se vazio',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Classe',
+	'Class:SynchroAttExtKey' => 'Atributo sincronização (ExtKey)',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Atributo reconciliação',
+	'Class:SynchroAttLinkSet' => 'Atributo sincronização (Linkset)',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Separador de linhas',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Separador atributos',
+	'Class:SynchroLog' => 'Log sincronização',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Fonte de dados sincronização',
+	'Class:SynchroLog/Attribute:start_date' => 'Data início',
+	'Class:SynchroLog/Attribute:end_date' => 'Data final',
+	'Class:SynchroLog/Attribute:status' => 'Status',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completado',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Erro',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Ainda está em execução',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Número réplica vista',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Número réplica total',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Número objeto(s) excluído(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Número de erros enquanto excluindo',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Número objeto(s) obsoleto(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Número de erros enquanto obsoletos',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Número objeto(s) criado(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Número de erros enquanto criando',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Número objeto(s) atualizado(s)',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Número de erros enquanto atualizando',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Número de erros durante reconciliação',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Número réplica desaparecida',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Número objetos atualizados',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Número objetos inalterados',
+	'Class:SynchroLog/Attribute:last_error' => 'Últimos erros',
+	'Class:SynchroLog/Attribute:traces' => 'Rastrear',
+	'Class:SynchroReplica' => 'Réplica sincronização',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Fonte de dados',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Objeto destino (ID)',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Tipo destino',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Visto pela última vez',
+	'Class:SynchroReplica/Attribute:status' => 'Status',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modificado',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'Novo',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsoleto',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orfão',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Sincronizado',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Objeto criado?',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Último Erro',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Alertas',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data criação',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Última data modificação',
+	'Class:appUserPreferences' => 'Preferência de usuário',
+	'Class:appUserPreferences/Attribute:userid' => 'Usuário',
+	'Class:appUserPreferences/Attribute:preferences' => 'Preferências',
+	'Core:ExecProcess:Code1' => 'Comando errado ou comando terminou com erros (por exemplo, nome do script errado)',
+	'Core:ExecProcess:Code255' => 'PHP erro (parsing, or runtime)',
+));
+
+//
+// Attribute Duration
+//
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Core:Duration_Seconds'	=> '%1$ds',	
+	'Core:Duration_Minutes_Seconds'	=>'%1$dmin %2$ds',	
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds',		
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds',		
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php
index b95216522..69f23703a 100644
--- a/dictionaries/pt_br.dictionary.itop.ui.php
+++ b/dictionaries/pt_br.dictionary.itop.ui.php
@@ -1,1308 +1,1308 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:AuditCategory' => 'Categoria Auditoria',
-	'Class:AuditCategory+' => 'Uma seção dentro da auditoria',
-	'Class:AuditCategory/Attribute:name' => 'Nome',
-	'Class:AuditCategory/Attribute:name+' => 'Nome curto para esta categoria',
-	'Class:AuditCategory/Attribute:description' => 'Descrição',
-	'Class:AuditCategory/Attribute:description+' => 'Longa descrição para esta categoria de auditoria',
-	'Class:AuditCategory/Attribute:definition_set' => 'Definir Regra',
-	'Class:AuditCategory/Attribute:definition_set+' => 'Expressão OQL que define o conjunto de objetos para auditoria',
-	'Class:AuditCategory/Attribute:rules_list' => 'Regras Auditoria',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Regra auditoria para essa categoria',
-));
-
-//
-// Class: AuditRule
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:AuditRule' => 'Regra de auditoria',
-	'Class:AuditRule+' => 'Uma regra para verificar se uma determinada categoria de Auditoria',
-	'Class:AuditRule/Attribute:name' => 'Nome',
-	'Class:AuditRule/Attribute:name+' => 'Nome curto para esta regra',
-	'Class:AuditRule/Attribute:description' => 'Descrição',
-	'Class:AuditRule/Attribute:description+' => 'Descrição longa para essa regra',
-	'Class:AuditRule/Attribute:query' => 'Executar consulta',
-	'Class:AuditRule/Attribute:query+' => 'Executar a expressão OQL',
-	'Class:AuditRule/Attribute:valid_flag' => 'Objetos válidos?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'Verdadeiro se a regra retornar o objeto válido, falso caso contrário',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Verdadeiro',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'Verdadeiro',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'Falso',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Falso',
-	'Class:AuditRule/Attribute:category_id' => 'Categoria',
-	'Class:AuditRule/Attribute:category_id+' => 'A categoria para esta regra',
-	'Class:AuditRule/Attribute:category_name' => 'Categoria',
-	'Class:AuditRule/Attribute:category_name+' => 'Nome da categoria para essa regra',
-));
-
-//
-// Class: QueryOQL
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:Query' => 'Consulta',
-	'Class:Query+' => 'Uma consulta é um conjunto de dados definido de uma forma dinâmica',
-	'Class:Query/Attribute:name' => 'Nome',
-	'Class:Query/Attribute:name+' => 'Identificar a consulta',
-	'Class:Query/Attribute:description' => 'Descrição',
-	'Class:Query/Attribute:description+' => 'Descrição longa para a consulta (finalidade, uso, etc)',
-	'Class:Query/Attribute:fields' => 'Campos',
-	'Class:Query/Attribute:fields+' => 'Vírgula separando a lista de atributos (ou alias.attribute) para exportar.',
-
-	'Class:QueryOQL' => 'Consulta OQL',
-	'Class:QueryOQL+' => 'Uma consulta baseada no Object Query Language OQL',
-	'Class:QueryOQL/Attribute:oql' => 'Expressão',
-	'Class:QueryOQL/Attribute:oql+' => 'Expressão OQL',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:User' => 'Usuário',
-	'Class:User+' => 'Login',
-	'Class:User/Attribute:finalclass' => 'Tipo de conta',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => 'Contato (pessoa)',
-	'Class:User/Attribute:contactid+' => 'Dados pessoais a partir dos dados do negócio',
-	'Class:User/Attribute:last_name' => 'Último nome',
-	'Class:User/Attribute:last_name+' => 'Nome do contato correspondente',
-	'Class:User/Attribute:first_name' => 'Primeiro nome',
-	'Class:User/Attribute:first_name+' => 'Primeiro nome do contato correspondente',
-	'Class:User/Attribute:email' => 'Email',
-	'Class:User/Attribute:email+' => 'Email do contato correspondente',
-	'Class:User/Attribute:login' => 'Login',
-	'Class:User/Attribute:login+' => 'String de identificação do usuário',
-	'Class:User/Attribute:language' => 'Linguagem',
-	'Class:User/Attribute:language+' => 'Linguagem usuário',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:profile_list' => 'Perfil',
-	'Class:User/Attribute:profile_list+' => 'Regras, permissões de direito para essa pessoa',
-	'Class:User/Attribute:allowed_org_list' => 'Organizações permitidas',
-	'Class:User/Attribute:allowed_org_list+' => 'O usuário está permitido ver as informações para a(s) organização(ões) abaixo. Se nenhuma organização for especificada, não há restrição.',
-
-	'Class:User/Error:LoginMustBeUnique' => 'Login é único - "%1s" já está ativo',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Pelo menos um perfil deve ser atribuído a esse usuário.',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_Profiles' => 'Perfis',
-	'Class:URP_Profiles+' => 'Perfil do usuário',
-	'Class:URP_Profiles/Attribute:name' => 'Nome',
-	'Class:URP_Profiles/Attribute:name+' => 'label',
-	'Class:URP_Profiles/Attribute:description' => 'Descrição',
-	'Class:URP_Profiles/Attribute:description+' => 'uma linha descrição',
-	'Class:URP_Profiles/Attribute:user_list' => 'Usuários',
-	'Class:URP_Profiles/Attribute:user_list+' => 'Pessoas que possuem esse perfil',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_Dimensions' => 'dimensão',
-	'Class:URP_Dimensions+' => 'dimensão de aplicação (definição silos)',
-	'Class:URP_Dimensions/Attribute:name' => 'Nome',
-	'Class:URP_Dimensions/Attribute:name+' => 'label',
-	'Class:URP_Dimensions/Attribute:description' => 'Descrição',
-	'Class:URP_Dimensions/Attribute:description+' => 'uma linha descrição',
-	'Class:URP_Dimensions/Attribute:type' => 'Tipo',
-	'Class:URP_Dimensions/Attribute:type+' => 'nome classe ou tipo dado (unidade projeção)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_UserProfile' => 'Usuário para perfil',
-	'Class:URP_UserProfile+' => 'Perfil usuário',
-	'Class:URP_UserProfile/Attribute:userid' => 'Usuário',
-	'Class:URP_UserProfile/Attribute:userid+' => 'Conta usuário',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'Login',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Perfil',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'Perfil utilizado',
-	'Class:URP_UserProfile/Attribute:profile' => 'Perfil',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Nome perfil',
-	'Class:URP_UserProfile/Attribute:reason' => 'Função',
-	'Class:URP_UserProfile/Attribute:reason+' => 'Explicação por que esta pessoa teve ter esse perfil',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_UserOrg' => 'Organização usuário',
-	'Class:URP_UserOrg+' => 'Organizações permitidas',
-	'Class:URP_UserOrg/Attribute:userid' => 'Usário',
-	'Class:URP_UserOrg/Attribute:userid+' => 'Conta usuário',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organização',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Organização permitida',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organização',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Organização permitida',
-	'Class:URP_UserOrg/Attribute:reason' => 'Função',
-	'Class:URP_UserOrg/Attribute:reason+' => 'explicação por que essa pessoa é permitida ver as informações da organização abaixo',
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_ProfileProjection' => 'profile_projection',
-	'Class:URP_ProfileProjection+' => 'profile projections',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensão',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'Dimensão aplicação',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensão',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'Dimensão aplicação',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Perfil',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'Perfil utilizado',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Perfil',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Nome perfil',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Valor de expressão',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'Expressão OQL (usando $ user) | constante | | + código de atributo',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Atributo',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Código de atributo alvo (opcional)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_ClassProjection' => 'class_projection',
-	'Class:URP_ClassProjection+' => 'class projections',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensão',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'Dimensão aplicação',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensão',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'Dimensão aplicação',
-	'Class:URP_ClassProjection/Attribute:class' => 'Classe',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Classe alvoTarget class',
-	'Class:URP_ClassProjection/Attribute:value' => 'Expressão de valor',
-	'Class:URP_ClassProjection/Attribute:value+' => 'Expressão OQL (usando $ user) | constante | | + código de atributo',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Atributo',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Código de atributo alvo (opcional)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_ActionGrant' => 'action_permission',
-	'Class:URP_ActionGrant+' => 'Permissões de classes',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Perfil',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'Perfil utilizado',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Perfil',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'Perfil utilizado',
-	'Class:URP_ActionGrant/Attribute:class' => 'Classe',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Classe alvo',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Permissões',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'Permitido ou não permitido?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Sim',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'Sim',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Não',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'Não',
-	'Class:URP_ActionGrant/Attribute:action' => 'Ação',
-	'Class:URP_ActionGrant/Attribute:action+' => 'operações a realizar em determinada classe',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_StimulusGrant' => 'stimulus_permission',
-	'Class:URP_StimulusGrant+' => 'permissões de Incentivo do ciclo de vida do objeto',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Perfil',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Perfil utilizado',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Perfil',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'Perfil utilizado',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Classe',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'Classe alvo',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Permissão',
-	'Class:URP_StimulusGrant/Attribute:permission+' => 'Permitido ou não permitido?',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Sim',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'Sim',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Não',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'Não',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Incentivo',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'Código incentivo',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:URP_AttributeGrant' => 'attribute_permission',
-	'Class:URP_AttributeGrant+' => 'Permissões no nível de atributos',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Ação permissão',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'Ação permissão',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Atributo',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Código atributo',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'BooleanLabel:yes' => 'Sim',
-	'BooleanLabel:no' => 'Não',
-	'Menu:WelcomeMenu' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => 'Bem-vindo ao iTop',
-
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop é um completo, OpenSource, portal de operação IT.</p>
-<ul>Inclui:
-<li>completo CMDB (Configuration management database) documentar e gerenciar inventários IT</li>
-<li>módulo Gerenciador Incidentes para monitorar e comunicar sobre todas as questões que ocorrem na TI</li>
-<li>módulo Gerenciador Mudanças/Alterações para planejar e monitorar mudanças/alterações na TI</li>
-<li>base de dados com erros conhecidos para agilizar a solução de incidentes</li>
-<li>módulo Problemas para documentar todas as interrupções e notificar os contatos adequados</li>
-<li>painéis para obter rapidamente uma visão geral de TI</li>
-</ul>
-<p>Todos os módulos podem ser configurados, passo a passo, cada um, independente dos outros.</p>',
-
-	'UI:WelcomeMenu:RightBlock' => '<p>Um provedor de serviço, que permite gerenciar facilmente múltiplos clientes ou organizações.
-<ul>Oferece um conjunto rico em recursos de processos de negócios que:
-<li>melhora a eficácia da gestão de TI</li> 
-<li>melhora operações de TI</li> 
-<li>melhora a satisfação do cliente e fornece aos gestores uma visão sobre o desempenho dos negócios.</li>
-</ul>
-</p>
-<p>É completamente aberto para ser integrado com as infra-estruturas de IT atuais.</p>
-<p>
-<ul>Este portal em gestão de TI vai ajudar você a:
-<li>gerenciar melhor o complexo ambiente de TI</li>
-<li>implementar processos ITIL no seu próprio rítmo</li>
-<li>gerenciar o ativo mais importante de sua TI: Documentação</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => 'Solicitações abertas: %1$d',
-	'UI:WelcomeMenu:MyCalls' => 'Minhas solicitações',
-	'UI:WelcomeMenu:OpenIncidents' => 'Incidentes abertos: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => 'Itens de Configuração: %1$d',
-	'UI:WelcomeMenu:MyIncidents' => 'Incidentes atribuídos a mim',
-	'UI:AllOrganizations' => ' Todas organizações ',
-	'UI:YourSearch' => 'Sua pesquisa',
-	'UI:LoggedAsMessage' => 'Logado como %1$s',
-	'UI:LoggedAsMessage+Admin' => 'Logado como %1$s (Administrador)',
-	'UI:Button:Logoff' => 'Sair',
-	'UI:Button:GlobalSearch' => 'Pesquisar',
-	'UI:Button:Search' => ' Pesquisar ',
-	'UI:Button:Query' => ' Consultar ',
-	'UI:Button:Ok' => 'Ok',
-	'UI:Button:Save' => 'Salvar',
-	'UI:Button:Cancel' => 'Cancelar',
-	'UI:Button:Apply' => 'Aplicar',
-	'UI:Button:Back' => ' << Voltar ',
-	'UI:Button:Restart' => ' |<< Reiniciar ',
-	'UI:Button:Next' => ' Próximo >> ',
-	'UI:Button:Finish' => ' Finalizar ',
-	'UI:Button:DoImport' => ' Executar importação ! ',
-	'UI:Button:Done' => ' Concluir ',
-	'UI:Button:SimulateImport' => ' Simular a importação ',
-	'UI:Button:Test' => 'Testar!',
-	'UI:Button:Evaluate' => ' Avaliar ',
-	'UI:Button:Evaluate:Title' => ' Avaliar (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' Adicionar... ',
-	'UI:Button:BrowseObjects' => ' Navegar... ',
-	'UI:Button:Add' => ' Adicionar ',
-	'UI:Button:AddToList' => ' << Adicionar ',
-	'UI:Button:RemoveFromList' => ' Excluir >> ',
-	'UI:Button:FilterList' => ' Filtrar... ',
-	'UI:Button:Create' => ' Criar ',
-	'UI:Button:Delete' => ' Excluir ! ',
-	'UI:Button:Rename' => ' Renomear... ',
-	'UI:Button:ChangePassword' => ' Alterar senha ',
-	'UI:Button:ResetPassword' => ' Redefinir senha ',
-	
-	'UI:SearchToggle' => 'Pesquisar',
-	'UI:ClickToCreateNew' => 'Criar um(a) novo(a) %1$s',
-	'UI:SearchFor_Class' => 'Pesquisar por objeto(s) %1$s',
-	'UI:NoObjectToDisplay' => 'Nenhum objeto encontrado.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parâmetro Object_id é obrigatório quando link_attr é especificado. Verifique a definição do modelo de exibição.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parâmetro Target_attr é obrigatório quando link_attr é especificado. Verifique a definição do modelo de exibição.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parâmetro Group_by é obrigatório. Verifique a definição do modelo de exibição.',
-	'UI:Error:InvalidGroupByFields' => 'Lista inválida dos campos para agrupar por: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'Erro: o estilo não suportada do bloco: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Definição de ligação incorreta: a classe de objetos para gerenciar: %1$s não foi encontrado como uma chave externa na classe %2$s',
-	'UI:Error:Object_Class_Id_NotFound' => 'Objeto: %1$s:%2$d não encontrado.',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'Erro: Referência circular nas dependências entre os campos, verifique o modelo de dados.',
-	'UI:Error:UploadedFileTooBig' => 'O arquivo a ser carregado é muito grande. (Tamanho máximo permitido é de %1$s). Para modificar esse limite, contate o administrador do iTop. (Verifique a configuração do PHP para upload_max_filesize e post_max_size no servidor).',
-	'UI:Error:UploadedFileTruncated.' => 'Arquivo enviado tem sido truncado!',
-	'UI:Error:NoTmpDir' => 'Diretório temporário não está definido.',
-	'UI:Error:CannotWriteToTmp_Dir' => 'Não foi possível gravar o arquivo temporário para o disco. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload parou por extensão. (Nome do arquivo original = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'Arquivo carregado falhou, causa desconhecida. (Código erro = "%1$s").',
-	
-	'UI:Error:1ParametersMissing' => 'Erro: o parâmetro a seguir deve ser especificado para esta operação: %1$s.',
-	'UI:Error:2ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s e %2$s.',
-	'UI:Error:3ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s, %2$s e %3$s.',
-	'UI:Error:4ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s, %2$s, %3$s e %4$s.',
-	'UI:Error:IncorrectOQLQuery_Message' => 'Erro: incorreta consulta OQL: %1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Ocorreu um erro ao executar a consulta: %1$s',
-	'UI:Error:ObjectAlreadyUpdated' => 'Erro: o objeto já foi atualizado.',
-	'UI:Error:ObjectCannotBeUpdated' => 'Erro: objecto não pode ser atualizado.',
-	'UI:Error:ObjectsAlreadyDeleted' => 'Erro: objetos já foram apagados',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Você não tem permissão de executar exclusão em massa dos objetos da classe %1$s',
-	'UI:Error:DeleteNotAllowedOn_Class' => 'Você não tem permissão para excluir objeto(s) da classe %1$s',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Você não tem permissão de executar atualização em massa dos objetos da classe %1$s',
-	'UI:Error:ObjectAlreadyCloned' => 'Erro: o objeto já foi clonado.',
-	'UI:Error:ObjectAlreadyCreated' => 'Erro: o objeto já foi criado.',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Erro: invalid stimulus "%1$s" on object %2$s in state "%3$s".',
-	
-	
-	'UI:GroupBy:Count' => 'Número',
-	'UI:GroupBy:Count+' => 'Número de elementos',
-	'UI:CountOfObjects' => '%1$d objetos correspondem aos critérios.',
-	'UI_CountOfObjectsShort' => '%1$d objetos.',
-	'UI:NoObject_Class_ToDisplay' => 'Nenhum %1$s para mostrar',
-	'UI:History:LastModified_On_By' => 'Última modificação em %1$s por %2$s.',
-	'UI:HistoryTab' => 'Histórico',
-	'UI:NotificationsTab' => 'Notificação',
-	'UI:History:BulkImports' => 'Histórico',
-	'UI:History:BulkImports+' => 'Lista de importação CSV',
-	'UI:History:BulkImportDetails' => 'Alterações resultantes da importação CSV realizado em %1$s (por %2$s)',
-	'UI:History:Date' => 'Data',
-	'UI:History:Date+' => 'Data da alteração',
-	'UI:History:User' => 'Usuário',
-	'UI:History:User+' => 'Usuário que fez a alteração',
-	'UI:History:Changes' => 'Alteração',
-	'UI:History:Changes+' => 'Alteração feita no objeto',
-	'UI:History:StatsCreations' => 'Criado',
-	'UI:History:StatsCreations+' => 'Número de objetos criados',
-	'UI:History:StatsModifs' => 'Modificado',
-	'UI:History:StatsModifs+' => 'Número de objetos criados',
-	'UI:History:StatsDeletes' => 'Excluído',
-	'UI:History:StatsDeletes+' => 'Número de objetos excluídos',
-	'UI:Loading' => 'Carregando...',
-	'UI:Menu:Actions' => 'Ações',
-	'UI:Menu:OtherActions' => 'Outras ações',
-	'UI:Menu:New' => 'Novo...',
-	'UI:Menu:Add' => 'Adicionar...',
-	'UI:Menu:Manage' => 'Gerenciar...',
-	'UI:Menu:EMail' => 'eMail',
-	'UI:Menu:CSVExport' => 'Exportar CSV...',
-	'UI:Menu:Modify' => 'Modificar...',
-	'UI:Menu:Delete' => 'Excluir...',
-	'UI:Menu:Manage' => 'Gerenciar...',
-	'UI:Menu:BulkDelete' => 'Excluir...',
-	'UI:UndefinedObject' => 'indefinido',
-	'UI:Document:OpenInNewWindow:Download' => 'Abrir em uma nova janela: %1$s, Download: %2$s',
-	'UI:SelectAllToggle+' => 'Selecionar / Desmarcar todos',
-	'UI:SplitDateTime-Date' => 'data',
-	'UI:SplitDateTime-Time' => 'hora',
-	'UI:TruncatedResults' => '%1$d objetos apresentado fora do %2$d',
-	'UI:DisplayAll' => 'Mostrar todos',
-	'UI:CollapseList' => 'Colapso',
-	'UI:CountOfResults' => '%1$d objeto(s)',
-	'UI:ChangesLogTitle' => 'Alteração log (%1$d):',
-	'UI:EmptyChangesLogTitle' => 'Alteração log está limpo',
-	'UI:SearchFor_Class_Objects' => 'Pesquisa para objeto %1$s ',
-	'UI:OQLQueryBuilderTitle' => 'Construir consulta OQL',
-	'UI:OQLQueryTab' => 'Consulta OQL',
-	'UI:SimpleSearchTab' => 'Pesquisa simples',
-	'UI:Details+' => 'Detalhes',
-	'UI:SearchValue:Any' => '* qualquer *',
-	'UI:SearchValue:Mixed' => '* misturado *',
-	'UI:SearchValue:NbSelected' => '# selecionado',
-	'UI:SearchValue:CheckAll' => 'Marcar todos',
-	'UI:SearchValue:UncheckAll' => 'Desmarcar todos',
-	'UI:SelectOne' => '-- selecione um --',
-	'UI:Login:Welcome' => 'Bem-vindo ao iTop!',
-	'UI:Login:IncorrectLoginPassword' => 'Usuário/senha incorreto, tente novamente.',
-	'UI:Login:IdentifyYourself' => 'Identifique-se antes continuar',
-	'UI:Login:UserNamePrompt' => 'Usuário',
-	'UI:Login:PasswordPrompt' => 'Senha',
-	'UI:Login:ForgotPwd' => 'Esqueceu sua senha?',
-	'UI:Login:ForgotPwdForm' => 'Esqueceu sua senha',
-	'UI:Login:ForgotPwdForm+' => 'iTop pode enviar um e-mail em que você vai encontrar instruções para seguir para redefinir sua conta.',
-	'UI:Login:ResetPassword' => 'Enviar agora',
-	'UI:Login:ResetPwdFailed' => 'Falha para enviar email: %1$s',
-
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' não é um login válido',
-	'UI:ResetPwd-Error-NotPossible' => 'conta externa não é permitida alteração de senha.',
-	'UI:ResetPwd-Error-FixedPwd' => 'a conta não permite alterar senha.',
-	'UI:ResetPwd-Error-NoContact' => 'a conta não está associada a uma pessoa.',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'a conta não está associada a uma pessoa que contenha um endereço de e-mail. Por favor, contate o administrador.',
-	'UI:ResetPwd-Error-NoEmail' => 'faltando um endereço de e-mail. Por favor, contate o administrador.',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.',
-	'UI:ResetPwd-EmailSent' => 'Por favor, verifique seu email e siga as instruções...',
-	'UI:ResetPwd-EmailSubject' => 'Alterar a senha',
-	'UI:ResetPwd-EmailBody' => '<body><p>Você solicitou a alteração da senha do iTop.</p><p>Por favor, siga este link (passo simples) para <a href="%1$s">digitar a nova senha</a></p>.',
-
-	'UI:ResetPwd-Title' => 'Alterar senha',
-	'UI:ResetPwd-Error-InvalidToken' => 'Desculpe, a senha já foi alterada, ou deve ter recebido vários e-mails. Por favor, certifique-se que você use o link fornecido no último e-mail recebido.',
-	'UI:ResetPwd-Error-EnterPassword' => 'Digite a nova senha para a conta \'%1$s\'.',
-	'UI:ResetPwd-Ready' => 'A senha foi alterada com sucesso.',
-	'UI:ResetPwd-Login' => 'Clique para entrar...',
-
-	'UI:Login:About' => '',
-	'UI:Login:ChangeYourPassword' => 'Altere sua senha',
-	'UI:Login:OldPasswordPrompt' => 'Senha antiga',
-	'UI:Login:NewPasswordPrompt' => 'Nova senha',
-	'UI:Login:RetypeNewPasswordPrompt' => 'Repetir nova senha',
-	'UI:Login:IncorrectOldPassword' => 'Erro: senha antiga incorreta',
-	'UI:LogOffMenu' => 'Sair',
-	'UI:LogOff:ThankYou' => 'Obrigado por usar o sistema',
-	'UI:LogOff:ClickHereToLoginAgain' => 'Clique aqui para entrar novamente...',
-	'UI:ChangePwdMenu' => 'Alterar senha...',
-	'UI:Login:PasswordChanged' => 'Senha alterada com sucesso',
-	'UI:AccessRO-All' => 'Somente-leitura',
-	'UI:AccessRO-Users' => 'Somente leitura para usuário final',
-	'UI:ApplicationEnvironment' => 'Ambiente da aplicação: %1$s',
-	'UI:Login:RetypePwdDoesNotMatch' => 'Nova senha e Repetir nova senha são diferentes. Tente novamente!',
-	'UI:Button:Login' => 'Entrar iTop',
-	'UI:Login:Error:AccessRestricted' => 'Acesso restrito. Por favor, contacte o administrador.',
-	'UI:Login:Error:AccessAdmin' => 'Acesso restrito somente para privilégios administrativo. Por favor, contacte o administrador.',
-	'UI:CSVImport:MappingSelectOne' => '-- selecione um --',
-	'UI:CSVImport:MappingNotApplicable' => '-- ignore este campo --',
-	'UI:CSVImport:NoData' => 'Nenhum data configurado..., por favor providencie alguns dados!',
-	'UI:Title:DataPreview' => 'Visualizar dados',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: The data contains only one column. Did you select the appropriate separator character?',
-	'UI:CSVImport:FieldName' => 'Campo %1$d',
-	'UI:CSVImport:DataLine1' => 'Dados linha 1',
-	'UI:CSVImport:DataLine2' => 'Dados linha 2',
-	'UI:CSVImport:idField' => 'id (Chave primária)',
-	'UI:Title:BulkImport' => 'Importar em massa',
-	'UI:Title:BulkImport+' => 'CSV Ajuda Importação',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronização de %1$d objetos da classe %2$s',
-	'UI:CSVImport:ClassesSelectOne' => '-- selecione um --',
-	'UI:CSVImport:ErrorExtendedAttCode' => 'Erro interno: "%1$s" é um código incorreto porque "%2$s" não é uma chave externa da classe"%3$s"',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objetos permanecerão inalteradas.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objetos serão modificados.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objetos serão adicionados.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objetos terão erros.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objetos manteve-se inalteradas.',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d objetos foram modificados.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d objetos foram adicionados.',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$d objetos tinham erros.',
-	'UI:Title:CSVImportStep2' => 'Passo 2 de 5: Opções dados CSV',
-	'UI:Title:CSVImportStep3' => 'Passo 3 de 5: Mapeamento de dados',
-	'UI:Title:CSVImportStep4' => 'Passo 4 de 5: Simulação Importação',
-	'UI:Title:CSVImportStep5' => 'Passo 5 de 5: Importação completada',
-	'UI:CSVImport:LinesNotImported' => 'Linhas que não podem ser carregadas:',
-	'UI:CSVImport:LinesNotImported+' => 'As linhas a seguir não foram importadas, porque elas contêm erros',
-	'UI:CSVImport:SeparatorComma+' => ', (vírgula)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (ponto e vírgula)',
-	'UI:CSVImport:SeparatorTab+' => 'tab',
-	'UI:CSVImport:SeparatorOther' => 'outro:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (aspas duplas)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (aspas simples)',
-	'UI:CSVImport:QualifierOther' => 'outro:',
-	'UI:CSVImport:TreatFirstLineAsHeader' => 'Tratar a primeira linha como um cabeçalho (nomes de colunas)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Pular %1$s linha(s) no início do arquivo',
-	'UI:CSVImport:CSVDataPreview' => 'Visualizar dados CSV',
-	'UI:CSVImport:SelectFile' => 'Selecione o arquivo a importar:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'Carregar por um arquivo',
-	'UI:CSVImport:Tab:CopyPaste' => 'Copiar e colar dados',
-	'UI:CSVImport:Tab:Templates' => 'Modelos',
-	'UI:CSVImport:PasteData' => 'Colar os dados para importar:',
-	'UI:CSVImport:PickClassForTemplate' => 'Escolha o modelo para baixar: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Caracter separador:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Caracter qualificador de texto',
-	'UI:CSVImport:CommentsAndHeader' => 'Comentários e cabeçalho',
-	'UI:CSVImport:SelectClass' => 'Selecione a classe para importar:',
-	'UI:CSVImport:AdvancedMode' => 'Modo avançado',
-	'UI:CSVImport:AdvancedMode+' => 'No modo avançado o "id" (chave primária) dos objetos pode ser usado para atualizar e renomear objetos.' .
-									'No entanto, a coluna "id" (se houver) só pode ser usado como um critério de pesquisa e não pode ser combinado com qualquer outro critério de busca.',
-	'UI:CSVImport:SelectAClassFirst' => 'Para configurar o mapeamento, selecione uma classe primeira.',
-	'UI:CSVImport:HeaderFields' => 'Campos',
-	'UI:CSVImport:HeaderMappings' => 'Mapeamentos',
-	'UI:CSVImport:HeaderSearch' => 'Pesquisar?',
-	'UI:CSVImport:AlertIncompleteMapping' => 'Por favor, selecione um mapeamento para cada campo.',
-	'UI:CSVImport:AlertNoSearchCriteria' => 'Selecione ao menos um critério de busca',
-	'UI:CSVImport:Encoding' => 'Codificação de caracteres',	
-	'UI:UniversalSearchTitle' => 'Pesquisa Universal',
-	'UI:UniversalSearch:Error' => 'Erro: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => 'Selecione a classe para pesquisar: ',
-
-	'UI:CSVReport-Value-Modified' => 'Modificado',
-	'UI:CSVReport-Value-SetIssue' => 'Não pode ser modificado - razão: %1$s',
-	'UI:CSVReport-Value-ChangeIssue' => 'Não pode ser modificado para %1$s - razão: %2$s',
-	'UI:CSVReport-Value-NoMatch' => 'Não combina',
-	'UI:CSVReport-Value-Missing' => 'Faltando valor obrigatório',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged',
-	'UI:CSVReport-Row-Created' => 'criado',
-	'UI:CSVReport-Row-Updated' => 'atualizado colunas %1$d',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s',
-	'UI:CSVReport-Value-Issue-Null' => 'Nulo não permitido',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Objeto não encontrado',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Encontrado %1$d combinações',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s',
-
-	'UI:CSVReport-Icon-Unchanged' => 'Não modificado',
-	'UI:CSVReport-Icon-Modified' => 'Modificado',
-	'UI:CSVReport-Icon-Missing' => 'Missing',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated',
-	'UI:CSVReport-Icon-Created' => 'Criado',
-	'UI:CSVReport-Object-ToCreate' => 'Objeto acaba ser criado',
-	'UI:CSVReport-Object-Created' => 'Objeto criado',
-	'UI:CSVReport-Icon-Error' => 'Erro',
-	'UI:CSVReport-Object-Error' => 'ERRO: %1$s',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.',
-
-	'UI:CSVExport:AdvancedMode' => 'Modo avançado',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.',
-	'UI:CSVExport:LostChars' => 'Encoding issue',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').',
-
-	'UI:Audit:Title' => 'CMDB Auditoria',
-	'UI:Audit:InteractiveAudit' => 'Auditoria Interativa',
-	'UI:Audit:HeaderAuditRule' => 'Regra de auditoria',
-	'UI:Audit:HeaderNbObjects' => '# Objetos',
-	'UI:Audit:HeaderNbErrors' => '# Erros',
-	'UI:Audit:PercentageOk' => '% Ok',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL erro na regra %1$s: %2$s.',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL erro na categoria %1$s: %2$s.',
-
-	'UI:RunQuery:Title' => 'Avaliar consultas OQL',
-	'UI:RunQuery:QueryExamples' => 'Exemplos de consultas',
-	'UI:RunQuery:HeaderPurpose' => 'Propósito',
-	'UI:RunQuery:HeaderPurpose+' => 'Explicação sobre a consulta',
-	'UI:RunQuery:HeaderOQLExpression' => 'A consulta na sintaxe OQL',
-	'UI:RunQuery:HeaderOQLExpression+' => 'A consulta na sintaxe OQL',
-	'UI:RunQuery:ExpressionToEvaluate' => 'Expressão para avaliar: ',
-	'UI:RunQuery:MoreInfo' => 'Mais informações sobre a consulta: ',
-	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
-	'UI:RunQuery:SerializedFilter' => 'Filtro serializado: ',
-	'UI:RunQuery:Error' => 'Ocorreu um erro ao executar a consulta: %1$s',
-	'UI:Query:UrlForExcel' => 'URL a ser usada para consultas web MS-Excel',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Schema:Title' => 'Esquema de objetos',
-	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
-	'UI:Schema:Relationships' => 'Relações',
-	'UI:Schema:AbstractClass' => 'Classe abstrata: nenhum objeto desta classe pode ser instanciada.',
-	'UI:Schema:NonAbstractClass' => 'Classe não-abstrata: os objetos desta classe pode ser instanciada.',
-	'UI:Schema:ClassHierarchyTitle' => 'Hierarquia de classes',
-	'UI:Schema:AllClasses' => 'Todas classes',
-	'UI:Schema:ExternalKey_To' => 'Chave externa para %1$s',
-	'UI:Schema:Columns_Description' => 'Colunas: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'Padrão: "%1$s"',
-	'UI:Schema:NullAllowed' => 'Nulo permitido',
-	'UI:Schema:NullNotAllowed' => 'Nulo não permitido',
-	'UI:Schema:Attributes' => 'Atributos',
-	'UI:Schema:AttributeCode' => 'Código atributo',
-	'UI:Schema:AttributeCode+' => 'Código interno do atributo',
-	'UI:Schema:Label' => 'Label',
-	'UI:Schema:Label+' => 'Label of the attribute',
-	'UI:Schema:Type' => 'Tipo',
-	
-	'UI:Schema:Type+' => 'Tipo dado do atributo',
-	'UI:Schema:Origin' => 'Origem',
-	'UI:Schema:Origin+' => 'The base class in which this attribute is defined',
-	'UI:Schema:Description' => 'Descrição',
-	'UI:Schema:Description+' => 'Descrição do atributo',
-	'UI:Schema:AllowedValues' => 'Permitido valores',
-	'UI:Schema:AllowedValues+' => 'Restrições sobre os valores possíveis para este atributo',
-	'UI:Schema:MoreInfo' => 'Mais informações',
-	'UI:Schema:MoreInfo+' => 'Mais informações sobre o campo definido no banco de dados',
-	'UI:Schema:SearchCriteria' => 'Search criteria',
-	'UI:Schema:FilterCode' => 'Código filtro',
-	'UI:Schema:FilterCode+' => 'Código deste critério de pesquisa',
-	'UI:Schema:FilterDescription' => 'Descrição',
-	'UI:Schema:FilterDescription+' => 'Descrição do critério de pesquisa',
-	'UI:Schema:AvailOperators' => 'Operadores disponíveis',
-	'UI:Schema:AvailOperators+' => 'Operadores possíveis para estes critérios de pesquisa',
-	'UI:Schema:ChildClasses' => 'Classes filhas',
-	'UI:Schema:ReferencingClasses' => 'Classes de referência',
-	'UI:Schema:RelatedClasses' => 'Classes relacionadas',
-	'UI:Schema:LifeCycle' => 'Ciclo de vida',
-	'UI:Schema:Triggers' => 'Gatilho',
-	'UI:Schema:Relation_Code_Description' => 'Relação <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: propagar para %2$d níveis, consulta: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: não propagar para (%2$d levels), consulta: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s é referenciado pela classe %2$s via compo %3$s',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s está ligada à %2$s via %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n' => 'Classes apontando para %1$s (1:n links):',
-	'UI:Schema:Links:n-n' => 'Classes apontando para %1$s (n:n links):',
-	'UI:Schema:Links:All' => 'Gráfico de todas as classes relacionadas',
-	'UI:Schema:NoLifeCyle' => 'Não há ciclo de vida definido para esta classe.',
-	'UI:Schema:LifeCycleTransitions' => 'Transições',
-	'UI:Schema:LifeCyleAttributeOptions' => 'Opções de atributo',
-	'UI:Schema:LifeCycleHiddenAttribute' => 'Oculto',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Somente leitura',
-	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obrigatório',
-	'UI:Schema:LifeCycleAttributeMustChange' => 'Tem que mudar',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Usuário será solicitado para alterar o valor',
-	'UI:Schema:LifeCycleEmptyList' => 'Lista vazia',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => 'Tipo os 3 primeiro caracteres...',
-	'UI:Edit:TestQuery' => 'Testar consulta',
-	'UI:Combo:SelectValue' => '--- selecione um valor ---',
-	'UI:Label:SelectedObjects' => 'Selected objects: ',
-	'UI:Label:AvailableObjects' => 'Available objects: ',
-	'UI:Link_Class_Attributes' => '%1$s atributos',
-	'UI:SelectAllToggle+' => 'Marcar todas / Desmarcar todas',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Adicionar %1$s objetos vinculados com %2$s: %3$s',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Adicionar %1$s objetos vinculados com o %2$s',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gerenciar %1$s objetos vinculados com %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => 'Adicionar %1$s...',
-	'UI:RemoveLinkedObjectsOf_Class' => 'Excluir objetos selecionados',
-	'UI:Message:EmptyList:UseAdd' => 'A lista está vazia, use o botão "Adicionar..." para adicionar elementos.',
-	'UI:Message:EmptyList:UseSearchForm' => 'Use o formulário de busca acima para procurar objetos a ser adicionado.',
-	'UI:Wizard:FinalStepTitle' => 'Passo final: confirmação',
-	'UI:Title:DeletionOf_Object' => 'Excluindo de %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Exclusão em massa de %1$d objetos da classe %2$s',
-	'UI:Delete:NotAllowedToDelete' => 'Você não tem permissão para excluir este objeto.',
-	'UI:Delete:NotAllowedToUpdate_Fields' => 'Você não tem permissão para atualizar o(s) seguinte(s) campo(s): %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'Este objeto não pode ser apagado porque o usuário atual não tem direitos suficientes',
-	'UI:Error:CannotDeleteBecause' => 'Este objeto não pode ser excluído porque: %1$s',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Este objeto não pode ser excluído porque algumas operações manuais devem ser realizadas antes de que',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Este objeto não pode ser excluído porque algumas operações manuais devem ser realizadas antes de que',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s em nome de %2$s',
-	'UI:Delete:Deleted' => 'excluído',
-	'UI:Delete:AutomaticallyDeleted' => 'excluído automaticamente',
-	'UI:Delete:AutomaticResetOf_Fields' => 'reposição automática de campo(s): %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => 'Limpeza de todas as referências a %1$s...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Limpeza de todas as referências a %1$d objetos da classe %2$s...',
-	'UI:Delete:Done+' => 'O que foi feito...',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s excluído.',
-	'UI:Delete:ConfirmDeletionOf_Name' => 'Exclusão de %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Exclusão de %1$d objetos da classe %2$s',
-	'UI:Delete:CannotDeleteBecause' => 'Não pode ser excluído: %1$s',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Deve ser excluído automaticamente, mas isso não é viável: %1$s',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Devem ser excluído manualmente, mas isso não é viável: %1$s',
-	'UI:Delete:WillBeDeletedAutomatically' => 'Será automaticamente excluído',
-	'UI:Delete:MustBeDeletedManually' => 'Será manualmente excluído',
-	'UI:Delete:CannotUpdateBecause_Issue' => 'Devem ser atualizados automaticamente, mas: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'será automaticamente atualizada (redefinir: %1$s)',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objetos/links são referências %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objetos/links fazem referências a alguns dos objetos a serem excluídos',	
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Para garantir a integridade do banco de dados, qualquer referência deve ser eliminada',
-	'UI:Delete:Consequence+' => 'O que será feito',
-	'UI:Delete:SorryDeletionNotAllowed' => 'Por favor, realize as operações manuais listados acima antes de solicitar a exclusão do referido objeto',
-	'UI:Delete:PleaseDoTheManualOperations' => 'Por favor, realize as operações manuais listados acima antes de solicitar a exclusão do referido objeto',
-	'UI:Delect:Confirm_Object' => 'Por favor, confirme se você deseja excluir %1$s.',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Por favor, confirme que você deseja excluir o seguinte %1$d objetos da classe %2$s.',
-	'UI:WelcomeToITop' => 'Bem-vindo ao iTop',
-	'UI:DetailsPageTitle' => '%1$s - %2$s detalhes',
-	'UI:ErrorPageTitle' => 'Erro',
-	'UI:ObjectDoesNotExist' => 'Desculpe, este objeto não existe (ou você não tem permissão para vê-lo).',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'Resultado da pesquisa',
-	'UI:SearchResultsTitle' => 'Resultado da pesquisa',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => 'Nada a pesquisar de',
-	'UI:FullTextSearchTitle_Text' => 'Resultado para "%1$s":',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objeto(s) da classe %2$s encontrado(s).',
-	'UI:Search:NoObjectFound' => 'Nenhum objeto encontrado.',
-	'UI:ModificationPageTitle_Object_Class' => '%1$s - %2$s modificados',
-	'UI:ModificationTitle_Class_Object' => 'Modificação de %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'Clone %1$s - %2$s modificação',
-	'UI:CloneTitle_Class_Object' => 'Clone de %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'Criação de um(a) novo(a) %1$s ',
-	'UI:CreationTitle_Class' => 'Criação de um(a) novo(a) %1$s',
-	'UI:SelectTheTypeOf_Class_ToCreate' => 'Selecione o tipo de %1$s para criar:',
-	'UI:Class_Object_NotUpdated' => 'Nenhuma alteração detectado, %1$s (%2$s) <strong>não</strong> tenha sido modificado.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) atualizado.',
-	'UI:BulkDeletePageTitle' => 'Exclusão em massa',
-	'UI:BulkDeleteTitle' => 'Selecione os objetos que você deseja excluir:',
-	'UI:PageTitle:ObjectCreated' => 'Objeto criado.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s criado.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Aplicando %1$s em objeto: %2$s em estado %3$s a meta do estado: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => 'O objeto não pode ser gravado: %1$s',
-	'UI:PageTitle:FatalError' => 'Erro fatal',
-	'UI:SystemIntrusion' => 'Acesso negado. Você tem tentando realizar uma operação que não é permitido para você.',
-	'UI:FatalErrorMessage' => 'Erro fatal, o sistema não pode continuar.',
-	'UI:Error_Details' => 'Erro: %1$s.',
-
-	'UI:PageTitle:ClassProjections'	=> 'Gerenciamento Usuários - projeções de classe',
-	'UI:PageTitle:ProfileProjections' => 'Gerenciamento Usuários - projeções de classe',
-	'UI:UserManagement:Class' => 'Classe',
-	'UI:UserManagement:Class+' => 'Classe de objetos',
-	'UI:UserManagement:ProjectedObject' => 'Objeto',
-	'UI:UserManagement:ProjectedObject+' => 'Objetos projetados',
-	'UI:UserManagement:AnyObject' => '* qualquer *',
-	'UI:UserManagement:User' => 'Usuário',
-	'UI:UserManagement:User+' => 'Usuário(s) envolvido(s) na projeção',
-	'UI:UserManagement:Profile' => 'Perfis',
-	'UI:UserManagement:Profile+' => 'Perfil em que a projeção é especificado',
-	'UI:UserManagement:Action:Read' => 'Leitura',
-	'UI:UserManagement:Action:Read+' => 'Leitura/mostrar objetos',
-	'UI:UserManagement:Action:Modify' => 'Modificação',
-	'UI:UserManagement:Action:Modify+' => 'Criar e editar (modificar) objetos',
-	'UI:UserManagement:Action:Delete' => 'Excluir',
-	'UI:UserManagement:Action:Delete+' => 'Excluir objetos',
-	'UI:UserManagement:Action:BulkRead' => 'Leitura em massa (Exportar)',
-	'UI:UserManagement:Action:BulkRead+' => 'Listar objetos ou exportar em massa',
-	'UI:UserManagement:Action:BulkModify' => 'Modificar em massa',
-	'UI:UserManagement:Action:BulkModify+' => 'Criar/editar em massa (importar CSV)',
-	'UI:UserManagement:Action:BulkDelete' => 'Excluir em massa',
-	'UI:UserManagement:Action:BulkDelete+' => 'Excluir objeto(s) em massa',
-	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
-	'UI:UserManagement:Action:Stimuli+' => 'Permitido ações (composta)',
-	'UI:UserManagement:Action' => 'Ação',
-	'UI:UserManagement:Action+' => 'Ação realizada pelo usuário',
-	'UI:UserManagement:TitleActions' => 'Ações',
-	'UI:UserManagement:Permission' => 'Permissão',
-	'UI:UserManagement:Permission+' => 'Permissões usuários',
-	'UI:UserManagement:Attributes' => 'Atributos',
-	'UI:UserManagement:ActionAllowed:Yes' => 'Sim',
-	'UI:UserManagement:ActionAllowed:No' => 'Não',
-	'UI:UserManagement:AdminProfile+' => 'Administradores tem total acesso leitura/gravação para todos os objetos no banco de dados.',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => 'Ciclo de vida não tem sido definida para esta classe',
-	'UI:UserManagement:GrantMatrix' => 'Permissões concedidas',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link entre %1$s e %2$s',
-	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link entre %1$s e %2$s',
-	
-	'Menu:AdminTools' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com o perfil do administrador', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:ChangeManagementMenu' => 'Gerenciamento Mudanças',
-	'UI:ChangeManagementMenu+' => 'Gerenciamento Mudanças',
-	'UI:ChangeManagementMenu:Title' => 'Visão geral',
-	'UI-ChangeManagementMenu-ChangesByType' => 'Mudanças por tipo',
-	'UI-ChangeManagementMenu-ChangesByStatus' => 'Mudanças por status',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Mudanças por grupo de trabalho',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Mudanças ainda não atribuídas',
-
-	'UI:ConfigurationManagementMenu' => 'Gerenciamento Configurações',
-	'UI:ConfigurationManagementMenu+' => 'Gerenciamento Configurações',
-	'UI:ConfigurationManagementMenu:Title' => 'Visão geral',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'Objetos Infra-estrutura por tipo',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objetos Infra-estrutura por status',
-
-'UI:ConfigMgmtMenuOverview:Title' => 'Painel para Gerenciamento Configurações',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Itens de configuração por status',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Itens de configuração por tipo',
-
-'UI:RequestMgmtMenuOverview:Title' => 'Painel para Gerenciamento Solicitações',
-'UI-RequestManagementOverview-RequestByService' => 'Solicitações usuários por serviço',
-'UI-RequestManagementOverview-RequestByPriority' => 'Solicitações usuários por prioridade',
-'UI-RequestManagementOverview-RequestUnassigned' => 'Solicitações usuários não atribuídos a um agente',
-
-'UI:IncidentMgmtMenuOverview:Title' => 'Painel para Gerenciamento Incidentes',
-'UI-IncidentManagementOverview-IncidentByService' => 'Incidentes por serviço',
-'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidentes por prioridade',
-'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidentes por ainda atribuído a um agente',
-
-'UI:ChangeMgmtMenuOverview:Title' => 'Painel para Gerenciamento Mudanças',
-'UI-ChangeManagementOverview-ChangeByType' => 'Mudanças por tipo',
-'UI-ChangeManagementOverview-ChangeUnassigned' => 'Mudanças ainda não atribuído a um agente',
-'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interrupções devido a alterações',
-
-'UI:ServiceMgmtMenuOverview:Title' => 'Painel para Gerenciamento Serviços',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratos clientes a serem renovados em 30 dias',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratos provedores a serem renovados em 30 dias',
-
-	'UI:ContactsMenu' => 'Contatos',
-	'UI:ContactsMenu+' => 'Contatos',
-	'UI:ContactsMenu:Title' => 'Visão geral',
-	'UI-ContactsMenu-ContactsByLocation' => 'Contatos por localidade',
-	'UI-ContactsMenu-ContactsByType' => 'Contatos por tipo',
-	'UI-ContactsMenu-ContactsByStatus' => 'Contatos por status',
-
-	'Menu:CSVImportMenu' => 'Importar CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:DataModelMenu' => 'Modelo Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Visão geral do Modelo Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:ExportMenu' => 'Exportar', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:NotificationsMenu' => 'Notificações', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Configuração de Notificações', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:NotificationsMenu:Title' => 'Configuração de <span class="hilite">Notificações</span>',
-	'UI:NotificationsMenu:Help' => 'Ajuda',
-	'UI:NotificationsMenu:HelpContent' => '<p>As Notificações são totalmente personalizáveis​​. Elas são baseadas em dois conjuntos de objetos: <i>Gatilhos e Ações</i>.</p>
-<p><i><b>Gatilhos</b></i> define quando uma notificação será executado. Existem 3 tipos de gatilhos para cobrir três fases diferentes de um ciclo de vida do objeto:
-<ol>
-	<li>o "on object creation" é executado quando um objeto da classe especificada é criado</li>
-	<li>the "on entering a state" triggers get executed before an object of the given class enters a specified state (coming from another state)</li>
-	<li>the "on leaving a state" triggers get executed when an object of the given class is leaving a specified state</li>
-	<li>the "on threshold" triggers get executed when a threshold for TTR or TTO as been reached</li>
-	<li>the "on portal update" triggers get executed when a ticket is updated from the portal</li>
-</ol>
-</p>
-<p>
-<i><b>Ações</b></i> define the actions to be performed when the triggers execute. For now there is only one kind of action consisting in sending an email message.
-Such actions also define the template to be used for sending the email as well as the other parameters of the message like the recipients, importance, etc.
-</p>
-<p>A special page: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is available for testing and troubleshooting your PHP mail configuration.</p>
-<p>To be executed, actions must be associated to triggers.
-When associated with a trigger, each action is given an "order" number, specifying in which order the actions are to be executed.</p>',
-	'UI:NotificationsMenu:Triggers' => 'Gatilhos',
-	'UI:NotificationsMenu:AvailableTriggers' => 'Available triggers',
-	'UI:NotificationsMenu:OnCreate' => 'When an object is created',
-	'UI:NotificationsMenu:OnStateEnter' => 'When an object enters a given state',
-	'UI:NotificationsMenu:OnStateLeave' => 'When an object leaves a given state',
-	'UI:NotificationsMenu:Actions' => 'Ações',
-	'UI:NotificationsMenu:AvailableActions' => 'Available actions',
-	
-	'Menu:AuditCategories' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:RunQueriesMenu' => 'Executar consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:QueryMenu' => 'Consulta  definida', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:QueryMenu+' => 'Consulta  definida', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:DataAdministration' => 'Administração Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Administração Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:UniversalSearchMenu' => 'Pesquisa Universal', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Pesquisar por nada...', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:UserManagementMenu' => 'Gerenciamento Usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Gerenciamento Usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Contas usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Contas usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Contas usuários',	 // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:iTopVersion:Short' => '%1$s versão %2$s',
-	'UI:iTopVersion:Long' => '%1$s versão %2$s-%3$s construído %4$s',
-	'UI:PropertiesTab' => 'Propriedades',
-
-	'UI:OpenDocumentInNewWindow_' => 'Abrir este documento em uma nova janela: %1$s',
-	'UI:DownloadDocument_' => 'Baixar este documento: %1$s',
-	'UI:Document:NoPreview' => 'Nenhuma visualização está disponível para este documento',
-	'UI:Download-CSV' => 'Download %1$s',
-
-	'UI:DeadlineMissedBy_duration' => 'Perdida por %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',		
-	'UI:Deadline_Minutes' => '%1$d min',			
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
-	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
-	'UI:Help' => 'Ajuda',
-	'UI:PasswordConfirm' => '(Confirmar)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Antes de adicionar mais %1$s objetos, salvar este objeto.',
-	'UI:DisplayThisMessageAtStartup' => 'Exibir esta mensagem na inicialização',
-	'UI:RelationshipGraph' => 'Visualizar gráfico',
-	'UI:RelationshipList' => 'Listar',
-	'UI:OperationCancelled' => 'Operação cancelada',
-	'UI:ElementsDisplayed' => 'Filtrando',
-
-	'Portal:Title' => 'Portal do usuário',
-	'Portal:NoRequestMgmt' => 'Caro %1$ s, você foi redirecionado para esta página porque a sua conta é configurado com o perfil de \'usuário do Portal\'. Infelizmente, iTop não foi instalado com a função \'Gerenciamento de Solicitações\'. Por favor, contate o administrador.',
-	'Portal:Refresh' => 'Atualizar',
-	'Portal:Back' => 'Voltar',
-	'Portal:WelcomeUserOrg' => 'Bem-vindo %1$s, de %2$s',
-	'Portal:TitleDetailsFor_Request' => 'Detalhes para solicitação',
-	'Portal:ShowOngoing' => 'Mostrar solicitações abertas',
-	'Portal:ShowClosed' => 'Mostrar solicitações fechadas',
-	'Portal:CreateNewRequest' => 'Criar uma nova solicitação',
-	'Portal:CreateNewRequestItil' => 'Criar uma nova solicitação',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => 'Alterar minha senha',
-	'Portal:Disconnect' => 'Sair',
-	'Portal:OpenRequests' => 'Minhas solicitações abertas',
-	'Portal:ClosedRequests'  => 'Minhas solicitações fechadas',
-	'Portal:ResolvedRequests'  => 'Minhas solicitações resolvidas',
-	'Portal:SelectService' => 'Selecione um serviço de um catálogo:',
-	'Portal:PleaseSelectOneService' => 'Selecione um serviço',
-	'Portal:SelectSubcategoryFrom_Service' => 'Selecione um sub-serviço do serviço %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Selecione uma sub-categoria',
-	'Portal:DescriptionOfTheRequest' => 'Digite a descrição de sua solicitação:',
-	'Portal:TitleRequestDetailsFor_Request' => 'Detalhe da solicitação %1$s:',
-	'Portal:NoOpenRequest' => 'Nenhuma solicitação nesta categoria',
-	'Portal:NoClosedRequest' => 'Nenhuma solicitação nesta categoria',
-	'Portal:Button:ReopenTicket' => 'Re-abrir esta solicitação',
-	'Portal:Button:CloseTicket' => 'Fechar esta solicitação',
-	'Portal:Button:UpdateRequest' => 'Atualizar a solicitação',
-	'Portal:EnterYourCommentsOnTicket' => 'Digite seu comentário sobre a resolução/solução de sua solicitação:',
-	'Portal:ErrorNoContactForThisUser' => 'Erro: o usuário atual não esta associado com um contato/pessoa. Por favor, contacte o administrador.',
-	'Portal:Attachments' => 'Anexos',
-	'Portal:AddAttachment' => ' Adicionar anexo ',
-	'Portal:RemoveAttachment' => ' Remover anexo ',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Anexo #%1$d para %2$s (%3$s)',
-	'Enum:Undefined' => 'Indefinido',	
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s dias %2$s horas %3$s minutos %4$s segundos',
-	'UI:ModifyAllPageTitle' => 'Modificar todos',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modificando objeto %1$d da classe %2$s',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modificando objeto %1$d da classe %2$s fora de %3$d',
-	'UI:Menu:ModifyAll' => 'Modificar...',
-	'UI:Button:ModifyAll' => 'Modificar todos',
-	'UI:Button:PreviewModifications' => 'Visualizar modificações >>',
-	'UI:ModifiedObject' => 'Objeto modificado',
-	'UI:BulkModifyStatus' => 'Operação',
-	'UI:BulkModifyStatus+' => 'Status da operação',
-	'UI:BulkModifyErrors' => 'Erros (se qualquer)',
-	'UI:BulkModifyErrors+' => 'Erros que impedem a modificação',	
-	'UI:BulkModifyStatusOk' => 'Ok',
-	'UI:BulkModifyStatusError' => 'Erro',
-	'UI:BulkModifyStatusModified' => 'Modificado',
-	'UI:BulkModifyStatusSkipped' => 'Skipped',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d valores distintos:',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d tempo(s)',
-	'UI:BulkModify:N_MoreValues' => '%1$d mais valores...',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentativa de definir o campo somente leitura: %1$s',
-	'UI:FailedToApplyStimuli' => 'A ação falhou.',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: modificando objetos %2$d da classe %3$s',
-	'UI:CaseLogTypeYourTextHere' => 'Digite seu texto aqui:',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
-	'UI:CaseLog:InitialValue' => 'Valor inicial:',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'O campo %1$s não é editável, porque é originado pela sincronização de dados. Valor não definido.',
-	'UI:ActionNotAllowed' => 'Você não tem permissão para executar esta ação nesses objetos.',
-	'UI:BulkAction:NoObjectSelected' => 'Por favor, selecione pelo menos um objeto para realizar esta operação.',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'O campo %1$s não é editável, porque é originado pela sincronização de dados. Valor não definido.',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objetos (%2$s objetos selecionados).',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objetos.',
-	'UI:Pagination:PageSize' => '%1$s objetos por página',
-	'UI:Pagination:PagesLabel' => 'Páginas:',
-	'UI:Pagination:All' => 'Todos',
-	'UI:HierarchyOf_Class' => 'Hierarquia de %1$s',
-	'UI:Preferences' => 'Preferências...',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'Organizações favoritas',
-	'UI:FavoriteOrganizations+' => 'Confira na lista abaixo as organizações que você deseja ver no menu drop-down para um acesso rápido.'.
-'Note-se que esta não é uma configuração de segurança, objetos de qualquer organização ainda são visíveis e podem ser acessadas ao selecionar \"Todos Organizações\" na lista drop-down.',
-	'UI:FavoriteLanguage' => 'Idioma do painel do Usuário',
-	'UI:Favorites:SelectYourLanguage' => 'Selecione sua linguagem preferida',
-	'UI:FavoriteOtherSettings' => 'Outras configurações',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Quantidade padrão para listas:  %1$s itens por página',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Qualquer modificações serão descartados.',
-	'UI:CancelConfirmationMessage' => 'Você vai perder as suas alterações. Continuar mesmo assim?',
-	'UI:AutoApplyConfirmationMessage' => 'Algumas mudanças ainda não foram aplicadas. Você quer levá-los em conta?',
-	'UI:Create_Class_InState' => 'Criar o estado %1$s: ',
-	'UI:OrderByHint_Values' => 'Classificar por: %1$s',
-	'UI:Menu:AddToDashboard' => 'Adicionar ao painel...',
-	'UI:Button:Refresh' => 'Atualizar',
-
-	'UI:ConfigureThisList' => 'Configurar esta lista...',
-	'UI:ListConfigurationTitle' => 'Listar configuração',
-	'UI:ColumnsAndSortOrder' => 'Colunas e ordem de classificação:',
-	'UI:UseDefaultSettings' => 'Use a configuração padrão',
-	'UI:UseSpecificSettings' => 'Use as seguintes configurações:',
-	'UI:Display_X_ItemsPerPage' => 'Mostrar %1$s itens por página',
-	'UI:UseSavetheSettings' => 'Salvar configurações',
-	'UI:OnlyForThisList' => 'Somente para esta lista',
-	'UI:ForAllLists' => 'Para todas as listas',
-	'UI:ExtKey_AsLink' => '%1$s (Link)',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (nome amigável)',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
-	'UI:Button:MoveUp' => 'Mover acima',
-	'UI:Button:MoveDown' => 'Mover abaixo',
-
-	'UI:OQL:UnknownClassAndFix' => 'Classe desconhecida "%1$s". Você pode tentar "%2$s" em vez.',
-	'UI:OQL:UnknownClassNoFix' => 'Classe desconhecida "%1$s"',
-
-	'UI:Dashboard:Edit' => 'Editar esta página...',
-	'UI:Dashboard:Revert' => 'Reverter para versão original...',
-	'UI:Dashboard:RevertConfirm' => 'Cada alterações feitas na versão original será perdido. Por favor, confirme que você quer fazer isso.',
-	'UI:ExportDashBoard' => 'Exportar para um arquivo',
-	'UI:ImportDashBoard' => 'Importar pelo arquivo...',
-	'UI:ImportDashboardTitle' => 'Importar por um arquivo',
-	'UI:ImportDashboardText' => 'Selecione um arquivo do painel para importar:',
-
-
-	'UI:DashletCreation:Title' => 'Criar um novo Painel',
-	'UI:DashletCreation:Dashboard' => 'Painel',
-	'UI:DashletCreation:DashletType' => 'Tipo de painel',
-	'UI:DashletCreation:EditNow' => 'Editar o painel',
-
-	'UI:DashboardEdit:Title' => 'Editor',
-	'UI:DashboardEdit:DashboardTitle' => 'Título',
-	'UI:DashboardEdit:AutoReload' => 'Atualizar automaticamente',
-	'UI:DashboardEdit:AutoReloadSec' => 'Intervalo atualização automática (segundos)',
-	'UI:DashboardEdit:AutoReloadSec+' => 'O mínimo permitido é %1$d segundos',
-
-	'UI:DashboardEdit:Layout' => 'Layout',
-	'UI:DashboardEdit:Properties' => 'Propriedades',
-	'UI:DashboardEdit:Dashlets' => 'Painel disponível',	
-	'UI:DashboardEdit:DashletProperties' => 'Propriedades',	
-
-	'UI:Form:Property' => 'Propriedade',
-	'UI:Form:Value' => 'Valor',
-
-	'UI:DashletPlainText:Label' => 'Texto',
-	'UI:DashletPlainText:Description' => 'Texto puro (não formatado)',
-	'UI:DashletPlainText:Prop-Text' => 'Texto',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Por favor, insira algum texto aqui...',
-
-	'UI:DashletObjectList:Label' => 'Lista de objetos',
-	'UI:DashletObjectList:Description' => 'Lista objeto no painel',
-	'UI:DashletObjectList:Prop-Title' => 'Título',
-	'UI:DashletObjectList:Prop-Query' => 'Questão',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu',
-
-	'UI:DashletGroupBy:Prop-Title' => 'Título',
-	'UI:DashletGroupBy:Prop-Query' => 'Questão',
-	'UI:DashletGroupBy:Prop-Style' => 'Estilo',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Grupo por...',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hora de %1$s (0-23)',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Mês de %1$s (1 - 12)',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Dia da semana para %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Dia do mês para %1$s',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hora)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (mês)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dia da semana)',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dia do mês)',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Por favor, selecione o campo no qual os objetos serão agrupados',
-
-	'UI:DashletGroupByPie:Label' => 'Pie Chart',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart',
-	'UI:DashletGroupByTable:Label' => 'Grupo por (tabela)',
-	'UI:DashletGroupByTable:Description' => 'Listar (Agrupado por um campo)',
-
-	'UI:DashletHeaderStatic:Label' => 'Cabeçalho',
-	'UI:DashletHeaderStatic:Description' => 'Exibe um separador horizontal',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Título',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contatos',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Ícone',
-
-	'UI:DashletHeaderDynamic:Label' => 'Cabeçalho com estatísticas',
-	'UI:DashletHeaderDynamic:Description' => 'Cabeçalho com estatística (agrupado por...)',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Título',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contatos',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Ícone',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Sub-título',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contatos',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Consulta',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Grupo por',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Valores',
-
-	'UI:DashletBadge:Label' => 'Divisa',
-	'UI:DashletBadge:Description' => 'Ícone objeto com novo/pesquisa',
-	'UI:DashletBadge:Prop-Class' => 'Classe',
-
-	'DayOfWeek-Sunday' => 'Domingo',
-	'DayOfWeek-Monday' => 'Segunda',
-	'DayOfWeek-Tuesday' => 'Terça',
-	'DayOfWeek-Wednesday' => 'Quarta',
-	'DayOfWeek-Thursday' => 'Quinta',
-	'DayOfWeek-Friday' => 'Sexta',
-	'DayOfWeek-Saturday' => 'Sábado',
-	'Month-01' => 'Janeiro',
-	'Month-02' => 'Fevereiro',
-	'Month-03' => 'Março',
-	'Month-04' => 'Abril',
-	'Month-05' => 'Maio',
-	'Month-06' => 'Junho',
-	'Month-07' => 'Julho',
-	'Month-08' => 'Agosto',
-	'Month-09' => 'Setembro',
-	'Month-10' => 'Outubro',
-	'Month-11' => 'Novembro',
-	'Month-12' => 'Dezembro',
-
-	'UI:Menu:ShortcutList' => 'Criar um atalho...',
-	'UI:ShortcutRenameDlg:Title' => 'Renomear o atalho',
-	'UI:ShortcutListDlg:Title' => 'Criar um atalho para a lista',
-	'UI:ShortcutDelete:Confirm' => 'Por favor, confirme que você deseja excluir o(s) atalho(s).',
-	'Menu:MyShortcuts' => 'Meus atalhos', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Class:Shortcut' => 'Atalho',
-	'Class:Shortcut+' => '',
-	'Class:Shortcut/Attribute:name' => 'Nome',
-	'Class:Shortcut/Attribute:name+' => 'Nome usado no menu e título da página',
-	'Class:ShortcutOQL' => 'Resultado pesquisa atalho',
-	'Class:ShortcutOQL+' => '',
-	'Class:ShortcutOQL/Attribute:oql' => 'Consulta',
-	'Class:ShortcutOQL/Attribute:oql+' => 'definição da lista de objetos para procurar',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Atualizar automaticamente',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Desabilitado',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Avaliar',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Intervalo atualização automática (segundos)',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'O mínimo permitido é %1$d sgundos',
-
-	'UI:FillAllMandatoryFields' => 'Por favor, preencha todos os campos obrigatórios.',
-	'UI:CSVImportConfirmTitle' => 'Por favor, confirme a operação',
-	'UI:CSVImportConfirmMessage' => 'Tem certeza que deseja confirmar?',
-	'UI:CSVImportError_items' => 'Erros: %1$d',
-	'UI:CSVImportCreated_items' => 'Criado: %1$d',
-	'UI:CSVImportModified_items' => 'Alterado: %1$d',
-	'UI:CSVImportUnchanged_items' => 'Não alterado: %1$d',
-
-	'UI:Button:Remove' => 'Excluir',
-	'UI:AddAnExisting_Class' => 'Adicionar objetos do tipo %1$s...',
-	'UI:SelectionOf_Class' => 'Selecionar objetos do tipo %1$s',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:SelectRequestTemplate' => 'Selecione um modelo para %1$s',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:AuditCategory' => 'Categoria Auditoria',
+	'Class:AuditCategory+' => 'Uma seção dentro da auditoria',
+	'Class:AuditCategory/Attribute:name' => 'Nome',
+	'Class:AuditCategory/Attribute:name+' => 'Nome curto para esta categoria',
+	'Class:AuditCategory/Attribute:description' => 'Descrição',
+	'Class:AuditCategory/Attribute:description+' => 'Longa descrição para esta categoria de auditoria',
+	'Class:AuditCategory/Attribute:definition_set' => 'Definir Regra',
+	'Class:AuditCategory/Attribute:definition_set+' => 'Expressão OQL que define o conjunto de objetos para auditoria',
+	'Class:AuditCategory/Attribute:rules_list' => 'Regras Auditoria',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Regra auditoria para essa categoria',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:AuditRule' => 'Regra de auditoria',
+	'Class:AuditRule+' => 'Uma regra para verificar se uma determinada categoria de Auditoria',
+	'Class:AuditRule/Attribute:name' => 'Nome',
+	'Class:AuditRule/Attribute:name+' => 'Nome curto para esta regra',
+	'Class:AuditRule/Attribute:description' => 'Descrição',
+	'Class:AuditRule/Attribute:description+' => 'Descrição longa para essa regra',
+	'Class:AuditRule/Attribute:query' => 'Executar consulta',
+	'Class:AuditRule/Attribute:query+' => 'Executar a expressão OQL',
+	'Class:AuditRule/Attribute:valid_flag' => 'Objetos válidos?',
+	'Class:AuditRule/Attribute:valid_flag+' => 'Verdadeiro se a regra retornar o objeto válido, falso caso contrário',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'Verdadeiro',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'Verdadeiro',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'Falso',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Falso',
+	'Class:AuditRule/Attribute:category_id' => 'Categoria',
+	'Class:AuditRule/Attribute:category_id+' => 'A categoria para esta regra',
+	'Class:AuditRule/Attribute:category_name' => 'Categoria',
+	'Class:AuditRule/Attribute:category_name+' => 'Nome da categoria para essa regra',
+));
+
+//
+// Class: QueryOQL
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:Query' => 'Consulta',
+	'Class:Query+' => 'Uma consulta é um conjunto de dados definido de uma forma dinâmica',
+	'Class:Query/Attribute:name' => 'Nome',
+	'Class:Query/Attribute:name+' => 'Identificar a consulta',
+	'Class:Query/Attribute:description' => 'Descrição',
+	'Class:Query/Attribute:description+' => 'Descrição longa para a consulta (finalidade, uso, etc)',
+	'Class:Query/Attribute:fields' => 'Campos',
+	'Class:Query/Attribute:fields+' => 'Vírgula separando a lista de atributos (ou alias.attribute) para exportar.',
+
+	'Class:QueryOQL' => 'Consulta OQL',
+	'Class:QueryOQL+' => 'Uma consulta baseada no Object Query Language OQL',
+	'Class:QueryOQL/Attribute:oql' => 'Expressão',
+	'Class:QueryOQL/Attribute:oql+' => 'Expressão OQL',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:User' => 'Usuário',
+	'Class:User+' => 'Login',
+	'Class:User/Attribute:finalclass' => 'Tipo de conta',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'Contato (pessoa)',
+	'Class:User/Attribute:contactid+' => 'Dados pessoais a partir dos dados do negócio',
+	'Class:User/Attribute:last_name' => 'Último nome',
+	'Class:User/Attribute:last_name+' => 'Nome do contato correspondente',
+	'Class:User/Attribute:first_name' => 'Primeiro nome',
+	'Class:User/Attribute:first_name+' => 'Primeiro nome do contato correspondente',
+	'Class:User/Attribute:email' => 'Email',
+	'Class:User/Attribute:email+' => 'Email do contato correspondente',
+	'Class:User/Attribute:login' => 'Login',
+	'Class:User/Attribute:login+' => 'String de identificação do usuário',
+	'Class:User/Attribute:language' => 'Linguagem',
+	'Class:User/Attribute:language+' => 'Linguagem usuário',
+	'Class:User/Attribute:language/Value:EN US' => 'English',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => 'French',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:profile_list' => 'Perfil',
+	'Class:User/Attribute:profile_list+' => 'Regras, permissões de direito para essa pessoa',
+	'Class:User/Attribute:allowed_org_list' => 'Organizações permitidas',
+	'Class:User/Attribute:allowed_org_list+' => 'O usuário está permitido ver as informações para a(s) organização(ões) abaixo. Se nenhuma organização for especificada, não há restrição.',
+
+	'Class:User/Error:LoginMustBeUnique' => 'Login é único - "%1s" já está ativo',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'Pelo menos um perfil deve ser atribuído a esse usuário.',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_Profiles' => 'Perfis',
+	'Class:URP_Profiles+' => 'Perfil do usuário',
+	'Class:URP_Profiles/Attribute:name' => 'Nome',
+	'Class:URP_Profiles/Attribute:name+' => 'label',
+	'Class:URP_Profiles/Attribute:description' => 'Descrição',
+	'Class:URP_Profiles/Attribute:description+' => 'uma linha descrição',
+	'Class:URP_Profiles/Attribute:user_list' => 'Usuários',
+	'Class:URP_Profiles/Attribute:user_list+' => 'Pessoas que possuem esse perfil',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_Dimensions' => 'dimensão',
+	'Class:URP_Dimensions+' => 'dimensão de aplicação (definição silos)',
+	'Class:URP_Dimensions/Attribute:name' => 'Nome',
+	'Class:URP_Dimensions/Attribute:name+' => 'label',
+	'Class:URP_Dimensions/Attribute:description' => 'Descrição',
+	'Class:URP_Dimensions/Attribute:description+' => 'uma linha descrição',
+	'Class:URP_Dimensions/Attribute:type' => 'Tipo',
+	'Class:URP_Dimensions/Attribute:type+' => 'nome classe ou tipo dado (unidade projeção)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_UserProfile' => 'Usuário para perfil',
+	'Class:URP_UserProfile+' => 'Perfil usuário',
+	'Class:URP_UserProfile/Attribute:userid' => 'Usuário',
+	'Class:URP_UserProfile/Attribute:userid+' => 'Conta usuário',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Login',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'Login',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Perfil',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'Perfil utilizado',
+	'Class:URP_UserProfile/Attribute:profile' => 'Perfil',
+	'Class:URP_UserProfile/Attribute:profile+' => 'Nome perfil',
+	'Class:URP_UserProfile/Attribute:reason' => 'Função',
+	'Class:URP_UserProfile/Attribute:reason+' => 'Explicação por que esta pessoa teve ter esse perfil',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_UserOrg' => 'Organização usuário',
+	'Class:URP_UserOrg+' => 'Organizações permitidas',
+	'Class:URP_UserOrg/Attribute:userid' => 'Usário',
+	'Class:URP_UserOrg/Attribute:userid+' => 'Conta usuário',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Login',
+	'Class:URP_UserOrg/Attribute:userlogin+' => 'Login',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Organização',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Organização permitida',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Organização',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Organização permitida',
+	'Class:URP_UserOrg/Attribute:reason' => 'Função',
+	'Class:URP_UserOrg/Attribute:reason+' => 'explicação por que essa pessoa é permitida ver as informações da organização abaixo',
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => 'profile projections',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Dimensão',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'Dimensão aplicação',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Dimensão',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'Dimensão aplicação',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Perfil',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'Perfil utilizado',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Perfil',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'Nome perfil',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Valor de expressão',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'Expressão OQL (usando $ user) | constante | | + código de atributo',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Atributo',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Código de atributo alvo (opcional)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_ClassProjection' => 'class_projection',
+	'Class:URP_ClassProjection+' => 'class projections',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Dimensão',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'Dimensão aplicação',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Dimensão',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'Dimensão aplicação',
+	'Class:URP_ClassProjection/Attribute:class' => 'Classe',
+	'Class:URP_ClassProjection/Attribute:class+' => 'Classe alvoTarget class',
+	'Class:URP_ClassProjection/Attribute:value' => 'Expressão de valor',
+	'Class:URP_ClassProjection/Attribute:value+' => 'Expressão OQL (usando $ user) | constante | | + código de atributo',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Atributo',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'Código de atributo alvo (opcional)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_ActionGrant' => 'action_permission',
+	'Class:URP_ActionGrant+' => 'Permissões de classes',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Perfil',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'Perfil utilizado',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Perfil',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'Perfil utilizado',
+	'Class:URP_ActionGrant/Attribute:class' => 'Classe',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Classe alvo',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Permissões',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'Permitido ou não permitido?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'Sim',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'Sim',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'Não',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'Não',
+	'Class:URP_ActionGrant/Attribute:action' => 'Ação',
+	'Class:URP_ActionGrant/Attribute:action+' => 'operações a realizar em determinada classe',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_StimulusGrant' => 'stimulus_permission',
+	'Class:URP_StimulusGrant+' => 'permissões de Incentivo do ciclo de vida do objeto',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Perfil',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Perfil utilizado',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Perfil',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'Perfil utilizado',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Classe',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'Classe alvo',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Permissão',
+	'Class:URP_StimulusGrant/Attribute:permission+' => 'Permitido ou não permitido?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'Sim',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'Sim',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'Não',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'Não',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Incentivo',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'Código incentivo',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'Class:URP_AttributeGrant' => 'attribute_permission',
+	'Class:URP_AttributeGrant+' => 'Permissões no nível de atributos',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'Ação permissão',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'Ação permissão',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Atributo',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Código atributo',
+));
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
+	'BooleanLabel:yes' => 'Sim',
+	'BooleanLabel:no' => 'Não',
+	'Menu:WelcomeMenu' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'Bem-vindo ao iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => 'Bem-vindo ao iTop',
+
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop é um completo, OpenSource, portal de operação IT.</p>
+<ul>Inclui:
+<li>completo CMDB (Configuration management database) documentar e gerenciar inventários IT</li>
+<li>módulo Gerenciador Incidentes para monitorar e comunicar sobre todas as questões que ocorrem na TI</li>
+<li>módulo Gerenciador Mudanças/Alterações para planejar e monitorar mudanças/alterações na TI</li>
+<li>base de dados com erros conhecidos para agilizar a solução de incidentes</li>
+<li>módulo Problemas para documentar todas as interrupções e notificar os contatos adequados</li>
+<li>painéis para obter rapidamente uma visão geral de TI</li>
+</ul>
+<p>Todos os módulos podem ser configurados, passo a passo, cada um, independente dos outros.</p>',
+
+	'UI:WelcomeMenu:RightBlock' => '<p>Um provedor de serviço, que permite gerenciar facilmente múltiplos clientes ou organizações.
+<ul>Oferece um conjunto rico em recursos de processos de negócios que:
+<li>melhora a eficácia da gestão de TI</li> 
+<li>melhora operações de TI</li> 
+<li>melhora a satisfação do cliente e fornece aos gestores uma visão sobre o desempenho dos negócios.</li>
+</ul>
+</p>
+<p>É completamente aberto para ser integrado com as infra-estruturas de IT atuais.</p>
+<p>
+<ul>Este portal em gestão de TI vai ajudar você a:
+<li>gerenciar melhor o complexo ambiente de TI</li>
+<li>implementar processos ITIL no seu próprio rítmo</li>
+<li>gerenciar o ativo mais importante de sua TI: Documentação</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Solicitações abertas: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'Minhas solicitações',
+	'UI:WelcomeMenu:OpenIncidents' => 'Incidentes abertos: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Itens de Configuração: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Incidentes atribuídos a mim',
+	'UI:AllOrganizations' => ' Todas organizações ',
+	'UI:YourSearch' => 'Sua pesquisa',
+	'UI:LoggedAsMessage' => 'Logado como %1$s',
+	'UI:LoggedAsMessage+Admin' => 'Logado como %1$s (Administrador)',
+	'UI:Button:Logoff' => 'Sair',
+	'UI:Button:GlobalSearch' => 'Pesquisar',
+	'UI:Button:Search' => ' Pesquisar ',
+	'UI:Button:Query' => ' Consultar ',
+	'UI:Button:Ok' => 'Ok',
+	'UI:Button:Save' => 'Salvar',
+	'UI:Button:Cancel' => 'Cancelar',
+	'UI:Button:Apply' => 'Aplicar',
+	'UI:Button:Back' => ' << Voltar ',
+	'UI:Button:Restart' => ' |<< Reiniciar ',
+	'UI:Button:Next' => ' Próximo >> ',
+	'UI:Button:Finish' => ' Finalizar ',
+	'UI:Button:DoImport' => ' Executar importação ! ',
+	'UI:Button:Done' => ' Concluir ',
+	'UI:Button:SimulateImport' => ' Simular a importação ',
+	'UI:Button:Test' => 'Testar!',
+	'UI:Button:Evaluate' => ' Avaliar ',
+	'UI:Button:Evaluate:Title' => ' Avaliar (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Adicionar... ',
+	'UI:Button:BrowseObjects' => ' Navegar... ',
+	'UI:Button:Add' => ' Adicionar ',
+	'UI:Button:AddToList' => ' << Adicionar ',
+	'UI:Button:RemoveFromList' => ' Excluir >> ',
+	'UI:Button:FilterList' => ' Filtrar... ',
+	'UI:Button:Create' => ' Criar ',
+	'UI:Button:Delete' => ' Excluir ! ',
+	'UI:Button:Rename' => ' Renomear... ',
+	'UI:Button:ChangePassword' => ' Alterar senha ',
+	'UI:Button:ResetPassword' => ' Redefinir senha ',
+	
+	'UI:SearchToggle' => 'Pesquisar',
+	'UI:ClickToCreateNew' => 'Criar um(a) novo(a) %1$s',
+	'UI:SearchFor_Class' => 'Pesquisar por objeto(s) %1$s',
+	'UI:NoObjectToDisplay' => 'Nenhum objeto encontrado.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'Parâmetro Object_id é obrigatório quando link_attr é especificado. Verifique a definição do modelo de exibição.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'Parâmetro Target_attr é obrigatório quando link_attr é especificado. Verifique a definição do modelo de exibição.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'Parâmetro Group_by é obrigatório. Verifique a definição do modelo de exibição.',
+	'UI:Error:InvalidGroupByFields' => 'Lista inválida dos campos para agrupar por: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Erro: o estilo não suportada do bloco: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Definição de ligação incorreta: a classe de objetos para gerenciar: %1$s não foi encontrado como uma chave externa na classe %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Objeto: %1$s:%2$d não encontrado.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Erro: Referência circular nas dependências entre os campos, verifique o modelo de dados.',
+	'UI:Error:UploadedFileTooBig' => 'O arquivo a ser carregado é muito grande. (Tamanho máximo permitido é de %1$s). Para modificar esse limite, contate o administrador do iTop. (Verifique a configuração do PHP para upload_max_filesize e post_max_size no servidor).',
+	'UI:Error:UploadedFileTruncated.' => 'Arquivo enviado tem sido truncado!',
+	'UI:Error:NoTmpDir' => 'Diretório temporário não está definido.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Não foi possível gravar o arquivo temporário para o disco. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Upload parou por extensão. (Nome do arquivo original = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Arquivo carregado falhou, causa desconhecida. (Código erro = "%1$s").',
+	
+	'UI:Error:1ParametersMissing' => 'Erro: o parâmetro a seguir deve ser especificado para esta operação: %1$s.',
+	'UI:Error:2ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s e %2$s.',
+	'UI:Error:3ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s, %2$s e %3$s.',
+	'UI:Error:4ParametersMissing' => 'Erro: os seguintes parâmetros devem ser especificados para esta operação: %1$s, %2$s, %3$s e %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Erro: incorreta consulta OQL: %1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Ocorreu um erro ao executar a consulta: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Erro: o objeto já foi atualizado.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Erro: objecto não pode ser atualizado.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Erro: objetos já foram apagados',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => 'Você não tem permissão de executar exclusão em massa dos objetos da classe %1$s',
+	'UI:Error:DeleteNotAllowedOn_Class' => 'Você não tem permissão para excluir objeto(s) da classe %1$s',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => 'Você não tem permissão de executar atualização em massa dos objetos da classe %1$s',
+	'UI:Error:ObjectAlreadyCloned' => 'Erro: o objeto já foi clonado.',
+	'UI:Error:ObjectAlreadyCreated' => 'Erro: o objeto já foi criado.',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Erro: invalid stimulus "%1$s" on object %2$s in state "%3$s".',
+	
+	
+	'UI:GroupBy:Count' => 'Número',
+	'UI:GroupBy:Count+' => 'Número de elementos',
+	'UI:CountOfObjects' => '%1$d objetos correspondem aos critérios.',
+	'UI_CountOfObjectsShort' => '%1$d objetos.',
+	'UI:NoObject_Class_ToDisplay' => 'Nenhum %1$s para mostrar',
+	'UI:History:LastModified_On_By' => 'Última modificação em %1$s por %2$s.',
+	'UI:HistoryTab' => 'Histórico',
+	'UI:NotificationsTab' => 'Notificação',
+	'UI:History:BulkImports' => 'Histórico',
+	'UI:History:BulkImports+' => 'Lista de importação CSV',
+	'UI:History:BulkImportDetails' => 'Alterações resultantes da importação CSV realizado em %1$s (por %2$s)',
+	'UI:History:Date' => 'Data',
+	'UI:History:Date+' => 'Data da alteração',
+	'UI:History:User' => 'Usuário',
+	'UI:History:User+' => 'Usuário que fez a alteração',
+	'UI:History:Changes' => 'Alteração',
+	'UI:History:Changes+' => 'Alteração feita no objeto',
+	'UI:History:StatsCreations' => 'Criado',
+	'UI:History:StatsCreations+' => 'Número de objetos criados',
+	'UI:History:StatsModifs' => 'Modificado',
+	'UI:History:StatsModifs+' => 'Número de objetos criados',
+	'UI:History:StatsDeletes' => 'Excluído',
+	'UI:History:StatsDeletes+' => 'Número de objetos excluídos',
+	'UI:Loading' => 'Carregando...',
+	'UI:Menu:Actions' => 'Ações',
+	'UI:Menu:OtherActions' => 'Outras ações',
+	'UI:Menu:New' => 'Novo...',
+	'UI:Menu:Add' => 'Adicionar...',
+	'UI:Menu:Manage' => 'Gerenciar...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'Exportar CSV...',
+	'UI:Menu:Modify' => 'Modificar...',
+	'UI:Menu:Delete' => 'Excluir...',
+	'UI:Menu:Manage' => 'Gerenciar...',
+	'UI:Menu:BulkDelete' => 'Excluir...',
+	'UI:UndefinedObject' => 'indefinido',
+	'UI:Document:OpenInNewWindow:Download' => 'Abrir em uma nova janela: %1$s, Download: %2$s',
+	'UI:SelectAllToggle+' => 'Selecionar / Desmarcar todos',
+	'UI:SplitDateTime-Date' => 'data',
+	'UI:SplitDateTime-Time' => 'hora',
+	'UI:TruncatedResults' => '%1$d objetos apresentado fora do %2$d',
+	'UI:DisplayAll' => 'Mostrar todos',
+	'UI:CollapseList' => 'Colapso',
+	'UI:CountOfResults' => '%1$d objeto(s)',
+	'UI:ChangesLogTitle' => 'Alteração log (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'Alteração log está limpo',
+	'UI:SearchFor_Class_Objects' => 'Pesquisa para objeto %1$s ',
+	'UI:OQLQueryBuilderTitle' => 'Construir consulta OQL',
+	'UI:OQLQueryTab' => 'Consulta OQL',
+	'UI:SimpleSearchTab' => 'Pesquisa simples',
+	'UI:Details+' => 'Detalhes',
+	'UI:SearchValue:Any' => '* qualquer *',
+	'UI:SearchValue:Mixed' => '* misturado *',
+	'UI:SearchValue:NbSelected' => '# selecionado',
+	'UI:SearchValue:CheckAll' => 'Marcar todos',
+	'UI:SearchValue:UncheckAll' => 'Desmarcar todos',
+	'UI:SelectOne' => '-- selecione um --',
+	'UI:Login:Welcome' => 'Bem-vindo ao iTop!',
+	'UI:Login:IncorrectLoginPassword' => 'Usuário/senha incorreto, tente novamente.',
+	'UI:Login:IdentifyYourself' => 'Identifique-se antes continuar',
+	'UI:Login:UserNamePrompt' => 'Usuário',
+	'UI:Login:PasswordPrompt' => 'Senha',
+	'UI:Login:ForgotPwd' => 'Esqueceu sua senha?',
+	'UI:Login:ForgotPwdForm' => 'Esqueceu sua senha',
+	'UI:Login:ForgotPwdForm+' => 'iTop pode enviar um e-mail em que você vai encontrar instruções para seguir para redefinir sua conta.',
+	'UI:Login:ResetPassword' => 'Enviar agora',
+	'UI:Login:ResetPwdFailed' => 'Falha para enviar email: %1$s',
+
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' não é um login válido',
+	'UI:ResetPwd-Error-NotPossible' => 'conta externa não é permitida alteração de senha.',
+	'UI:ResetPwd-Error-FixedPwd' => 'a conta não permite alterar senha.',
+	'UI:ResetPwd-Error-NoContact' => 'a conta não está associada a uma pessoa.',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'a conta não está associada a uma pessoa que contenha um endereço de e-mail. Por favor, contate o administrador.',
+	'UI:ResetPwd-Error-NoEmail' => 'faltando um endereço de e-mail. Por favor, contate o administrador.',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.',
+	'UI:ResetPwd-EmailSent' => 'Por favor, verifique seu email e siga as instruções...',
+	'UI:ResetPwd-EmailSubject' => 'Alterar a senha',
+	'UI:ResetPwd-EmailBody' => '<body><p>Você solicitou a alteração da senha do iTop.</p><p>Por favor, siga este link (passo simples) para <a href="%1$s">digitar a nova senha</a></p>.',
+
+	'UI:ResetPwd-Title' => 'Alterar senha',
+	'UI:ResetPwd-Error-InvalidToken' => 'Desculpe, a senha já foi alterada, ou deve ter recebido vários e-mails. Por favor, certifique-se que você use o link fornecido no último e-mail recebido.',
+	'UI:ResetPwd-Error-EnterPassword' => 'Digite a nova senha para a conta \'%1$s\'.',
+	'UI:ResetPwd-Ready' => 'A senha foi alterada com sucesso.',
+	'UI:ResetPwd-Login' => 'Clique para entrar...',
+
+	'UI:Login:About' => '',
+	'UI:Login:ChangeYourPassword' => 'Altere sua senha',
+	'UI:Login:OldPasswordPrompt' => 'Senha antiga',
+	'UI:Login:NewPasswordPrompt' => 'Nova senha',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Repetir nova senha',
+	'UI:Login:IncorrectOldPassword' => 'Erro: senha antiga incorreta',
+	'UI:LogOffMenu' => 'Sair',
+	'UI:LogOff:ThankYou' => 'Obrigado por usar o sistema',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Clique aqui para entrar novamente...',
+	'UI:ChangePwdMenu' => 'Alterar senha...',
+	'UI:Login:PasswordChanged' => 'Senha alterada com sucesso',
+	'UI:AccessRO-All' => 'Somente-leitura',
+	'UI:AccessRO-Users' => 'Somente leitura para usuário final',
+	'UI:ApplicationEnvironment' => 'Ambiente da aplicação: %1$s',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Nova senha e Repetir nova senha são diferentes. Tente novamente!',
+	'UI:Button:Login' => 'Entrar iTop',
+	'UI:Login:Error:AccessRestricted' => 'Acesso restrito. Por favor, contacte o administrador.',
+	'UI:Login:Error:AccessAdmin' => 'Acesso restrito somente para privilégios administrativo. Por favor, contacte o administrador.',
+	'UI:CSVImport:MappingSelectOne' => '-- selecione um --',
+	'UI:CSVImport:MappingNotApplicable' => '-- ignore este campo --',
+	'UI:CSVImport:NoData' => 'Nenhum data configurado..., por favor providencie alguns dados!',
+	'UI:Title:DataPreview' => 'Visualizar dados',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Error: The data contains only one column. Did you select the appropriate separator character?',
+	'UI:CSVImport:FieldName' => 'Campo %1$d',
+	'UI:CSVImport:DataLine1' => 'Dados linha 1',
+	'UI:CSVImport:DataLine2' => 'Dados linha 2',
+	'UI:CSVImport:idField' => 'id (Chave primária)',
+	'UI:Title:BulkImport' => 'Importar em massa',
+	'UI:Title:BulkImport+' => 'CSV Ajuda Importação',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Sincronização de %1$d objetos da classe %2$s',
+	'UI:CSVImport:ClassesSelectOne' => '-- selecione um --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Erro interno: "%1$s" é um código incorreto porque "%2$s" não é uma chave externa da classe"%3$s"',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d objetos permanecerão inalteradas.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d objetos serão modificados.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d objetos serão adicionados.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d objetos terão erros.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d objetos manteve-se inalteradas.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d objetos foram modificados.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d objetos foram adicionados.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d objetos tinham erros.',
+	'UI:Title:CSVImportStep2' => 'Passo 2 de 5: Opções dados CSV',
+	'UI:Title:CSVImportStep3' => 'Passo 3 de 5: Mapeamento de dados',
+	'UI:Title:CSVImportStep4' => 'Passo 4 de 5: Simulação Importação',
+	'UI:Title:CSVImportStep5' => 'Passo 5 de 5: Importação completada',
+	'UI:CSVImport:LinesNotImported' => 'Linhas que não podem ser carregadas:',
+	'UI:CSVImport:LinesNotImported+' => 'As linhas a seguir não foram importadas, porque elas contêm erros',
+	'UI:CSVImport:SeparatorComma+' => ', (vírgula)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (ponto e vírgula)',
+	'UI:CSVImport:SeparatorTab+' => 'tab',
+	'UI:CSVImport:SeparatorOther' => 'outro:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (aspas duplas)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (aspas simples)',
+	'UI:CSVImport:QualifierOther' => 'outro:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'Tratar a primeira linha como um cabeçalho (nomes de colunas)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Pular %1$s linha(s) no início do arquivo',
+	'UI:CSVImport:CSVDataPreview' => 'Visualizar dados CSV',
+	'UI:CSVImport:SelectFile' => 'Selecione o arquivo a importar:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Carregar por um arquivo',
+	'UI:CSVImport:Tab:CopyPaste' => 'Copiar e colar dados',
+	'UI:CSVImport:Tab:Templates' => 'Modelos',
+	'UI:CSVImport:PasteData' => 'Colar os dados para importar:',
+	'UI:CSVImport:PickClassForTemplate' => 'Escolha o modelo para baixar: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Caracter separador:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Caracter qualificador de texto',
+	'UI:CSVImport:CommentsAndHeader' => 'Comentários e cabeçalho',
+	'UI:CSVImport:SelectClass' => 'Selecione a classe para importar:',
+	'UI:CSVImport:AdvancedMode' => 'Modo avançado',
+	'UI:CSVImport:AdvancedMode+' => 'No modo avançado o "id" (chave primária) dos objetos pode ser usado para atualizar e renomear objetos.' .
+									'No entanto, a coluna "id" (se houver) só pode ser usado como um critério de pesquisa e não pode ser combinado com qualquer outro critério de busca.',
+	'UI:CSVImport:SelectAClassFirst' => 'Para configurar o mapeamento, selecione uma classe primeira.',
+	'UI:CSVImport:HeaderFields' => 'Campos',
+	'UI:CSVImport:HeaderMappings' => 'Mapeamentos',
+	'UI:CSVImport:HeaderSearch' => 'Pesquisar?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Por favor, selecione um mapeamento para cada campo.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Selecione ao menos um critério de busca',
+	'UI:CSVImport:Encoding' => 'Codificação de caracteres',	
+	'UI:UniversalSearchTitle' => 'Pesquisa Universal',
+	'UI:UniversalSearch:Error' => 'Erro: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Selecione a classe para pesquisar: ',
+
+	'UI:CSVReport-Value-Modified' => 'Modificado',
+	'UI:CSVReport-Value-SetIssue' => 'Não pode ser modificado - razão: %1$s',
+	'UI:CSVReport-Value-ChangeIssue' => 'Não pode ser modificado para %1$s - razão: %2$s',
+	'UI:CSVReport-Value-NoMatch' => 'Não combina',
+	'UI:CSVReport-Value-Missing' => 'Faltando valor obrigatório',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged',
+	'UI:CSVReport-Row-Created' => 'criado',
+	'UI:CSVReport-Row-Updated' => 'atualizado colunas %1$d',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s',
+	'UI:CSVReport-Value-Issue-Null' => 'Nulo não permitido',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Objeto não encontrado',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Encontrado %1$d combinações',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s',
+
+	'UI:CSVReport-Icon-Unchanged' => 'Não modificado',
+	'UI:CSVReport-Icon-Modified' => 'Modificado',
+	'UI:CSVReport-Icon-Missing' => 'Missing',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated',
+	'UI:CSVReport-Icon-Created' => 'Criado',
+	'UI:CSVReport-Object-ToCreate' => 'Objeto acaba ser criado',
+	'UI:CSVReport-Object-Created' => 'Objeto criado',
+	'UI:CSVReport-Icon-Error' => 'Erro',
+	'UI:CSVReport-Object-Error' => 'ERRO: %1$s',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.',
+
+	'UI:CSVExport:AdvancedMode' => 'Modo avançado',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.',
+	'UI:CSVExport:LostChars' => 'Encoding issue',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').',
+
+	'UI:Audit:Title' => 'CMDB Auditoria',
+	'UI:Audit:InteractiveAudit' => 'Auditoria Interativa',
+	'UI:Audit:HeaderAuditRule' => 'Regra de auditoria',
+	'UI:Audit:HeaderNbObjects' => '# Objetos',
+	'UI:Audit:HeaderNbErrors' => '# Erros',
+	'UI:Audit:PercentageOk' => '% Ok',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL erro na regra %1$s: %2$s.',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL erro na categoria %1$s: %2$s.',
+
+	'UI:RunQuery:Title' => 'Avaliar consultas OQL',
+	'UI:RunQuery:QueryExamples' => 'Exemplos de consultas',
+	'UI:RunQuery:HeaderPurpose' => 'Propósito',
+	'UI:RunQuery:HeaderPurpose+' => 'Explicação sobre a consulta',
+	'UI:RunQuery:HeaderOQLExpression' => 'A consulta na sintaxe OQL',
+	'UI:RunQuery:HeaderOQLExpression+' => 'A consulta na sintaxe OQL',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Expressão para avaliar: ',
+	'UI:RunQuery:MoreInfo' => 'Mais informações sobre a consulta: ',
+	'UI:RunQuery:DevelopedQuery' => 'Redevelopped query expression: ',
+	'UI:RunQuery:SerializedFilter' => 'Filtro serializado: ',
+	'UI:RunQuery:Error' => 'Ocorreu um erro ao executar a consulta: %1$s',
+	'UI:Query:UrlForExcel' => 'URL a ser usada para consultas web MS-Excel',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Schema:Title' => 'Esquema de objetos',
+	'UI:Schema:CategoryMenuItem' => 'Categoria <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'Relações',
+	'UI:Schema:AbstractClass' => 'Classe abstrata: nenhum objeto desta classe pode ser instanciada.',
+	'UI:Schema:NonAbstractClass' => 'Classe não-abstrata: os objetos desta classe pode ser instanciada.',
+	'UI:Schema:ClassHierarchyTitle' => 'Hierarquia de classes',
+	'UI:Schema:AllClasses' => 'Todas classes',
+	'UI:Schema:ExternalKey_To' => 'Chave externa para %1$s',
+	'UI:Schema:Columns_Description' => 'Colunas: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Padrão: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Nulo permitido',
+	'UI:Schema:NullNotAllowed' => 'Nulo não permitido',
+	'UI:Schema:Attributes' => 'Atributos',
+	'UI:Schema:AttributeCode' => 'Código atributo',
+	'UI:Schema:AttributeCode+' => 'Código interno do atributo',
+	'UI:Schema:Label' => 'Label',
+	'UI:Schema:Label+' => 'Label of the attribute',
+	'UI:Schema:Type' => 'Tipo',
+	
+	'UI:Schema:Type+' => 'Tipo dado do atributo',
+	'UI:Schema:Origin' => 'Origem',
+	'UI:Schema:Origin+' => 'The base class in which this attribute is defined',
+	'UI:Schema:Description' => 'Descrição',
+	'UI:Schema:Description+' => 'Descrição do atributo',
+	'UI:Schema:AllowedValues' => 'Permitido valores',
+	'UI:Schema:AllowedValues+' => 'Restrições sobre os valores possíveis para este atributo',
+	'UI:Schema:MoreInfo' => 'Mais informações',
+	'UI:Schema:MoreInfo+' => 'Mais informações sobre o campo definido no banco de dados',
+	'UI:Schema:SearchCriteria' => 'Search criteria',
+	'UI:Schema:FilterCode' => 'Código filtro',
+	'UI:Schema:FilterCode+' => 'Código deste critério de pesquisa',
+	'UI:Schema:FilterDescription' => 'Descrição',
+	'UI:Schema:FilterDescription+' => 'Descrição do critério de pesquisa',
+	'UI:Schema:AvailOperators' => 'Operadores disponíveis',
+	'UI:Schema:AvailOperators+' => 'Operadores possíveis para estes critérios de pesquisa',
+	'UI:Schema:ChildClasses' => 'Classes filhas',
+	'UI:Schema:ReferencingClasses' => 'Classes de referência',
+	'UI:Schema:RelatedClasses' => 'Classes relacionadas',
+	'UI:Schema:LifeCycle' => 'Ciclo de vida',
+	'UI:Schema:Triggers' => 'Gatilho',
+	'UI:Schema:Relation_Code_Description' => 'Relação <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: propagar para %2$d níveis, consulta: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: não propagar para (%2$d levels), consulta: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s é referenciado pela classe %2$s via compo %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s está ligada à %2$s via %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => 'Classes apontando para %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Classes apontando para %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'Gráfico de todas as classes relacionadas',
+	'UI:Schema:NoLifeCyle' => 'Não há ciclo de vida definido para esta classe.',
+	'UI:Schema:LifeCycleTransitions' => 'Transições',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Opções de atributo',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Oculto',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Somente leitura',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Obrigatório',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Tem que mudar',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Usuário será solicitado para alterar o valor',
+	'UI:Schema:LifeCycleEmptyList' => 'Lista vazia',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => 'Tipo os 3 primeiro caracteres...',
+	'UI:Edit:TestQuery' => 'Testar consulta',
+	'UI:Combo:SelectValue' => '--- selecione um valor ---',
+	'UI:Label:SelectedObjects' => 'Selected objects: ',
+	'UI:Label:AvailableObjects' => 'Available objects: ',
+	'UI:Link_Class_Attributes' => '%1$s atributos',
+	'UI:SelectAllToggle+' => 'Marcar todas / Desmarcar todas',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => 'Adicionar %1$s objetos vinculados com %2$s: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => 'Adicionar %1$s objetos vinculados com o %2$s',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => 'Gerenciar %1$s objetos vinculados com %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => 'Adicionar %1$s...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Excluir objetos selecionados',
+	'UI:Message:EmptyList:UseAdd' => 'A lista está vazia, use o botão "Adicionar..." para adicionar elementos.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Use o formulário de busca acima para procurar objetos a ser adicionado.',
+	'UI:Wizard:FinalStepTitle' => 'Passo final: confirmação',
+	'UI:Title:DeletionOf_Object' => 'Excluindo de %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => 'Exclusão em massa de %1$d objetos da classe %2$s',
+	'UI:Delete:NotAllowedToDelete' => 'Você não tem permissão para excluir este objeto.',
+	'UI:Delete:NotAllowedToUpdate_Fields' => 'Você não tem permissão para atualizar o(s) seguinte(s) campo(s): %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Este objeto não pode ser apagado porque o usuário atual não tem direitos suficientes',
+	'UI:Error:CannotDeleteBecause' => 'Este objeto não pode ser excluído porque: %1$s',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Este objeto não pode ser excluído porque algumas operações manuais devem ser realizadas antes de que',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'Este objeto não pode ser excluído porque algumas operações manuais devem ser realizadas antes de que',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s em nome de %2$s',
+	'UI:Delete:Deleted' => 'excluído',
+	'UI:Delete:AutomaticallyDeleted' => 'excluído automaticamente',
+	'UI:Delete:AutomaticResetOf_Fields' => 'reposição automática de campo(s): %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => 'Limpeza de todas as referências a %1$s...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => 'Limpeza de todas as referências a %1$d objetos da classe %2$s...',
+	'UI:Delete:Done+' => 'O que foi feito...',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s excluído.',
+	'UI:Delete:ConfirmDeletionOf_Name' => 'Exclusão de %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => 'Exclusão de %1$d objetos da classe %2$s',
+	'UI:Delete:CannotDeleteBecause' => 'Não pode ser excluído: %1$s',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Deve ser excluído automaticamente, mas isso não é viável: %1$s',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Devem ser excluído manualmente, mas isso não é viável: %1$s',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Será automaticamente excluído',
+	'UI:Delete:MustBeDeletedManually' => 'Será manualmente excluído',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Devem ser atualizados automaticamente, mas: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'será automaticamente atualizada (redefinir: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d objetos/links são referências %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d objetos/links fazem referências a alguns dos objetos a serem excluídos',	
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Para garantir a integridade do banco de dados, qualquer referência deve ser eliminada',
+	'UI:Delete:Consequence+' => 'O que será feito',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Por favor, realize as operações manuais listados acima antes de solicitar a exclusão do referido objeto',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Por favor, realize as operações manuais listados acima antes de solicitar a exclusão do referido objeto',
+	'UI:Delect:Confirm_Object' => 'Por favor, confirme se você deseja excluir %1$s.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => 'Por favor, confirme que você deseja excluir o seguinte %1$d objetos da classe %2$s.',
+	'UI:WelcomeToITop' => 'Bem-vindo ao iTop',
+	'UI:DetailsPageTitle' => '%1$s - %2$s detalhes',
+	'UI:ErrorPageTitle' => 'Erro',
+	'UI:ObjectDoesNotExist' => 'Desculpe, este objeto não existe (ou você não tem permissão para vê-lo).',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'Resultado da pesquisa',
+	'UI:SearchResultsTitle' => 'Resultado da pesquisa',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => 'Nada a pesquisar de',
+	'UI:FullTextSearchTitle_Text' => 'Resultado para "%1$s":',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%1$d objeto(s) da classe %2$s encontrado(s).',
+	'UI:Search:NoObjectFound' => 'Nenhum objeto encontrado.',
+	'UI:ModificationPageTitle_Object_Class' => '%1$s - %2$s modificados',
+	'UI:ModificationTitle_Class_Object' => 'Modificação de %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'Clone %1$s - %2$s modificação',
+	'UI:CloneTitle_Class_Object' => 'Clone de %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'Criação de um(a) novo(a) %1$s ',
+	'UI:CreationTitle_Class' => 'Criação de um(a) novo(a) %1$s',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Selecione o tipo de %1$s para criar:',
+	'UI:Class_Object_NotUpdated' => 'Nenhuma alteração detectado, %1$s (%2$s) <strong>não</strong> tenha sido modificado.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) atualizado.',
+	'UI:BulkDeletePageTitle' => 'Exclusão em massa',
+	'UI:BulkDeleteTitle' => 'Selecione os objetos que você deseja excluir:',
+	'UI:PageTitle:ObjectCreated' => 'Objeto criado.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s criado.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => 'Aplicando %1$s em objeto: %2$s em estado %3$s a meta do estado: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'O objeto não pode ser gravado: %1$s',
+	'UI:PageTitle:FatalError' => 'Erro fatal',
+	'UI:SystemIntrusion' => 'Acesso negado. Você tem tentando realizar uma operação que não é permitido para você.',
+	'UI:FatalErrorMessage' => 'Erro fatal, o sistema não pode continuar.',
+	'UI:Error_Details' => 'Erro: %1$s.',
+
+	'UI:PageTitle:ClassProjections'	=> 'Gerenciamento Usuários - projeções de classe',
+	'UI:PageTitle:ProfileProjections' => 'Gerenciamento Usuários - projeções de classe',
+	'UI:UserManagement:Class' => 'Classe',
+	'UI:UserManagement:Class+' => 'Classe de objetos',
+	'UI:UserManagement:ProjectedObject' => 'Objeto',
+	'UI:UserManagement:ProjectedObject+' => 'Objetos projetados',
+	'UI:UserManagement:AnyObject' => '* qualquer *',
+	'UI:UserManagement:User' => 'Usuário',
+	'UI:UserManagement:User+' => 'Usuário(s) envolvido(s) na projeção',
+	'UI:UserManagement:Profile' => 'Perfis',
+	'UI:UserManagement:Profile+' => 'Perfil em que a projeção é especificado',
+	'UI:UserManagement:Action:Read' => 'Leitura',
+	'UI:UserManagement:Action:Read+' => 'Leitura/mostrar objetos',
+	'UI:UserManagement:Action:Modify' => 'Modificação',
+	'UI:UserManagement:Action:Modify+' => 'Criar e editar (modificar) objetos',
+	'UI:UserManagement:Action:Delete' => 'Excluir',
+	'UI:UserManagement:Action:Delete+' => 'Excluir objetos',
+	'UI:UserManagement:Action:BulkRead' => 'Leitura em massa (Exportar)',
+	'UI:UserManagement:Action:BulkRead+' => 'Listar objetos ou exportar em massa',
+	'UI:UserManagement:Action:BulkModify' => 'Modificar em massa',
+	'UI:UserManagement:Action:BulkModify+' => 'Criar/editar em massa (importar CSV)',
+	'UI:UserManagement:Action:BulkDelete' => 'Excluir em massa',
+	'UI:UserManagement:Action:BulkDelete+' => 'Excluir objeto(s) em massa',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => 'Permitido ações (composta)',
+	'UI:UserManagement:Action' => 'Ação',
+	'UI:UserManagement:Action+' => 'Ação realizada pelo usuário',
+	'UI:UserManagement:TitleActions' => 'Ações',
+	'UI:UserManagement:Permission' => 'Permissão',
+	'UI:UserManagement:Permission+' => 'Permissões usuários',
+	'UI:UserManagement:Attributes' => 'Atributos',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Sim',
+	'UI:UserManagement:ActionAllowed:No' => 'Não',
+	'UI:UserManagement:AdminProfile+' => 'Administradores tem total acesso leitura/gravação para todos os objetos no banco de dados.',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => 'Ciclo de vida não tem sido definida para esta classe',
+	'UI:UserManagement:GrantMatrix' => 'Permissões concedidas',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link entre %1$s e %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => 'Link entre %1$s e %2$s',
+	
+	'Menu:AdminTools' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Ferramentas Administrativas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Ferramentas acessíveis apenas para usuários com o perfil do administrador', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:ChangeManagementMenu' => 'Gerenciamento Mudanças',
+	'UI:ChangeManagementMenu+' => 'Gerenciamento Mudanças',
+	'UI:ChangeManagementMenu:Title' => 'Visão geral',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Mudanças por tipo',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Mudanças por status',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'Mudanças por grupo de trabalho',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Mudanças ainda não atribuídas',
+
+	'UI:ConfigurationManagementMenu' => 'Gerenciamento Configurações',
+	'UI:ConfigurationManagementMenu+' => 'Gerenciamento Configurações',
+	'UI:ConfigurationManagementMenu:Title' => 'Visão geral',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Objetos Infra-estrutura por tipo',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Objetos Infra-estrutura por status',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'Painel para Gerenciamento Configurações',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Itens de configuração por status',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Itens de configuração por tipo',
+
+'UI:RequestMgmtMenuOverview:Title' => 'Painel para Gerenciamento Solicitações',
+'UI-RequestManagementOverview-RequestByService' => 'Solicitações usuários por serviço',
+'UI-RequestManagementOverview-RequestByPriority' => 'Solicitações usuários por prioridade',
+'UI-RequestManagementOverview-RequestUnassigned' => 'Solicitações usuários não atribuídos a um agente',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'Painel para Gerenciamento Incidentes',
+'UI-IncidentManagementOverview-IncidentByService' => 'Incidentes por serviço',
+'UI-IncidentManagementOverview-IncidentByPriority' => 'Incidentes por prioridade',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidentes por ainda atribuído a um agente',
+
+'UI:ChangeMgmtMenuOverview:Title' => 'Painel para Gerenciamento Mudanças',
+'UI-ChangeManagementOverview-ChangeByType' => 'Mudanças por tipo',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'Mudanças ainda não atribuído a um agente',
+'UI-ChangeManagementOverview-ChangeWithOutage' => 'Interrupções devido a alterações',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'Painel para Gerenciamento Serviços',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Contratos clientes a serem renovados em 30 dias',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Contratos provedores a serem renovados em 30 dias',
+
+	'UI:ContactsMenu' => 'Contatos',
+	'UI:ContactsMenu+' => 'Contatos',
+	'UI:ContactsMenu:Title' => 'Visão geral',
+	'UI-ContactsMenu-ContactsByLocation' => 'Contatos por localidade',
+	'UI-ContactsMenu-ContactsByType' => 'Contatos por tipo',
+	'UI-ContactsMenu-ContactsByStatus' => 'Contatos por status',
+
+	'Menu:CSVImportMenu' => 'Importar CSV', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Criação ou atualização em massa', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:DataModelMenu' => 'Modelo Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Visão geral do Modelo Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:ExportMenu' => 'Exportar', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Exportar o resultado de qualquer consulta em HTML, CSV ou XML', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:NotificationsMenu' => 'Notificações', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Configuração de Notificações', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:NotificationsMenu:Title' => 'Configuração de <span class="hilite">Notificações</span>',
+	'UI:NotificationsMenu:Help' => 'Ajuda',
+	'UI:NotificationsMenu:HelpContent' => '<p>As Notificações são totalmente personalizáveis​​. Elas são baseadas em dois conjuntos de objetos: <i>Gatilhos e Ações</i>.</p>
+<p><i><b>Gatilhos</b></i> define quando uma notificação será executado. Existem 3 tipos de gatilhos para cobrir três fases diferentes de um ciclo de vida do objeto:
+<ol>
+	<li>o "on object creation" é executado quando um objeto da classe especificada é criado</li>
+	<li>the "on entering a state" triggers get executed before an object of the given class enters a specified state (coming from another state)</li>
+	<li>the "on leaving a state" triggers get executed when an object of the given class is leaving a specified state</li>
+	<li>the "on threshold" triggers get executed when a threshold for TTR or TTO as been reached</li>
+	<li>the "on portal update" triggers get executed when a ticket is updated from the portal</li>
+</ol>
+</p>
+<p>
+<i><b>Ações</b></i> define the actions to be performed when the triggers execute. For now there is only one kind of action consisting in sending an email message.
+Such actions also define the template to be used for sending the email as well as the other parameters of the message like the recipients, importance, etc.
+</p>
+<p>A special page: <a href="../setup/email.test.php" target="_blank">email.test.php</a> is available for testing and troubleshooting your PHP mail configuration.</p>
+<p>To be executed, actions must be associated to triggers.
+When associated with a trigger, each action is given an "order" number, specifying in which order the actions are to be executed.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Gatilhos',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Available triggers',
+	'UI:NotificationsMenu:OnCreate' => 'When an object is created',
+	'UI:NotificationsMenu:OnStateEnter' => 'When an object enters a given state',
+	'UI:NotificationsMenu:OnStateLeave' => 'When an object leaves a given state',
+	'UI:NotificationsMenu:Actions' => 'Ações',
+	'UI:NotificationsMenu:AvailableActions' => 'Available actions',
+	
+	'Menu:AuditCategories' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Categoria Auditorias', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:RunQueriesMenu' => 'Executar consultas', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Executar qualquer consulta', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:QueryMenu' => 'Consulta  definida', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:QueryMenu+' => 'Consulta  definida', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:DataAdministration' => 'Administração Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Administração Dados', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:UniversalSearchMenu' => 'Pesquisa Universal', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Pesquisar por nada...', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:UserManagementMenu' => 'Gerenciamento Usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Gerenciamento Usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:ProfilesMenu' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Perfis', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:UserAccountsMenu' => 'Contas usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu+' => 'Contas usuários', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu:Title' => 'Contas usuários',	 // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:iTopVersion:Short' => '%1$s versão %2$s',
+	'UI:iTopVersion:Long' => '%1$s versão %2$s-%3$s construído %4$s',
+	'UI:PropertiesTab' => 'Propriedades',
+
+	'UI:OpenDocumentInNewWindow_' => 'Abrir este documento em uma nova janela: %1$s',
+	'UI:DownloadDocument_' => 'Baixar este documento: %1$s',
+	'UI:Document:NoPreview' => 'Nenhuma visualização está disponível para este documento',
+	'UI:Download-CSV' => 'Download %1$s',
+
+	'UI:DeadlineMissedBy_duration' => 'Perdida por %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',		
+	'UI:Deadline_Minutes' => '%1$d min',			
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
+	'UI:Help' => 'Ajuda',
+	'UI:PasswordConfirm' => '(Confirmar)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Antes de adicionar mais %1$s objetos, salvar este objeto.',
+	'UI:DisplayThisMessageAtStartup' => 'Exibir esta mensagem na inicialização',
+	'UI:RelationshipGraph' => 'Visualizar gráfico',
+	'UI:RelationshipList' => 'Listar',
+	'UI:OperationCancelled' => 'Operação cancelada',
+	'UI:ElementsDisplayed' => 'Filtrando',
+
+	'Portal:Title' => 'Portal do usuário',
+	'Portal:NoRequestMgmt' => 'Caro %1$ s, você foi redirecionado para esta página porque a sua conta é configurado com o perfil de \'usuário do Portal\'. Infelizmente, iTop não foi instalado com a função \'Gerenciamento de Solicitações\'. Por favor, contate o administrador.',
+	'Portal:Refresh' => 'Atualizar',
+	'Portal:Back' => 'Voltar',
+	'Portal:WelcomeUserOrg' => 'Bem-vindo %1$s, de %2$s',
+	'Portal:TitleDetailsFor_Request' => 'Detalhes para solicitação',
+	'Portal:ShowOngoing' => 'Mostrar solicitações abertas',
+	'Portal:ShowClosed' => 'Mostrar solicitações fechadas',
+	'Portal:CreateNewRequest' => 'Criar uma nova solicitação',
+	'Portal:CreateNewRequestItil' => 'Criar uma nova solicitação',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => 'Alterar minha senha',
+	'Portal:Disconnect' => 'Sair',
+	'Portal:OpenRequests' => 'Minhas solicitações abertas',
+	'Portal:ClosedRequests'  => 'Minhas solicitações fechadas',
+	'Portal:ResolvedRequests'  => 'Minhas solicitações resolvidas',
+	'Portal:SelectService' => 'Selecione um serviço de um catálogo:',
+	'Portal:PleaseSelectOneService' => 'Selecione um serviço',
+	'Portal:SelectSubcategoryFrom_Service' => 'Selecione um sub-serviço do serviço %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Selecione uma sub-categoria',
+	'Portal:DescriptionOfTheRequest' => 'Digite a descrição de sua solicitação:',
+	'Portal:TitleRequestDetailsFor_Request' => 'Detalhe da solicitação %1$s:',
+	'Portal:NoOpenRequest' => 'Nenhuma solicitação nesta categoria',
+	'Portal:NoClosedRequest' => 'Nenhuma solicitação nesta categoria',
+	'Portal:Button:ReopenTicket' => 'Re-abrir esta solicitação',
+	'Portal:Button:CloseTicket' => 'Fechar esta solicitação',
+	'Portal:Button:UpdateRequest' => 'Atualizar a solicitação',
+	'Portal:EnterYourCommentsOnTicket' => 'Digite seu comentário sobre a resolução/solução de sua solicitação:',
+	'Portal:ErrorNoContactForThisUser' => 'Erro: o usuário atual não esta associado com um contato/pessoa. Por favor, contacte o administrador.',
+	'Portal:Attachments' => 'Anexos',
+	'Portal:AddAttachment' => ' Adicionar anexo ',
+	'Portal:RemoveAttachment' => ' Remover anexo ',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Anexo #%1$d para %2$s (%3$s)',
+	'Enum:Undefined' => 'Indefinido',	
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s dias %2$s horas %3$s minutos %4$s segundos',
+	'UI:ModifyAllPageTitle' => 'Modificar todos',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modificando objeto %1$d da classe %2$s',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modificando objeto %1$d da classe %2$s fora de %3$d',
+	'UI:Menu:ModifyAll' => 'Modificar...',
+	'UI:Button:ModifyAll' => 'Modificar todos',
+	'UI:Button:PreviewModifications' => 'Visualizar modificações >>',
+	'UI:ModifiedObject' => 'Objeto modificado',
+	'UI:BulkModifyStatus' => 'Operação',
+	'UI:BulkModifyStatus+' => 'Status da operação',
+	'UI:BulkModifyErrors' => 'Erros (se qualquer)',
+	'UI:BulkModifyErrors+' => 'Erros que impedem a modificação',	
+	'UI:BulkModifyStatusOk' => 'Ok',
+	'UI:BulkModifyStatusError' => 'Erro',
+	'UI:BulkModifyStatusModified' => 'Modificado',
+	'UI:BulkModifyStatusSkipped' => 'Skipped',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d valores distintos:',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d tempo(s)',
+	'UI:BulkModify:N_MoreValues' => '%1$d mais valores...',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Tentativa de definir o campo somente leitura: %1$s',
+	'UI:FailedToApplyStimuli' => 'A ação falhou.',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: modificando objetos %2$d da classe %3$s',
+	'UI:CaseLogTypeYourTextHere' => 'Digite seu texto aqui:',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:',
+	'UI:CaseLog:InitialValue' => 'Valor inicial:',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'O campo %1$s não é editável, porque é originado pela sincronização de dados. Valor não definido.',
+	'UI:ActionNotAllowed' => 'Você não tem permissão para executar esta ação nesses objetos.',
+	'UI:BulkAction:NoObjectSelected' => 'Por favor, selecione pelo menos um objeto para realizar esta operação.',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'O campo %1$s não é editável, porque é originado pela sincronização de dados. Valor não definido.',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objetos (%2$s objetos selecionados).',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objetos.',
+	'UI:Pagination:PageSize' => '%1$s objetos por página',
+	'UI:Pagination:PagesLabel' => 'Páginas:',
+	'UI:Pagination:All' => 'Todos',
+	'UI:HierarchyOf_Class' => 'Hierarquia de %1$s',
+	'UI:Preferences' => 'Preferências...',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'Organizações favoritas',
+	'UI:FavoriteOrganizations+' => 'Confira na lista abaixo as organizações que você deseja ver no menu drop-down para um acesso rápido.'.
+'Note-se que esta não é uma configuração de segurança, objetos de qualquer organização ainda são visíveis e podem ser acessadas ao selecionar \"Todos Organizações\" na lista drop-down.',
+	'UI:FavoriteLanguage' => 'Idioma do painel do Usuário',
+	'UI:Favorites:SelectYourLanguage' => 'Selecione sua linguagem preferida',
+	'UI:FavoriteOtherSettings' => 'Outras configurações',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Quantidade padrão para listas:  %1$s itens por página',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Qualquer modificações serão descartados.',
+	'UI:CancelConfirmationMessage' => 'Você vai perder as suas alterações. Continuar mesmo assim?',
+	'UI:AutoApplyConfirmationMessage' => 'Algumas mudanças ainda não foram aplicadas. Você quer levá-los em conta?',
+	'UI:Create_Class_InState' => 'Criar o estado %1$s: ',
+	'UI:OrderByHint_Values' => 'Classificar por: %1$s',
+	'UI:Menu:AddToDashboard' => 'Adicionar ao painel...',
+	'UI:Button:Refresh' => 'Atualizar',
+
+	'UI:ConfigureThisList' => 'Configurar esta lista...',
+	'UI:ListConfigurationTitle' => 'Listar configuração',
+	'UI:ColumnsAndSortOrder' => 'Colunas e ordem de classificação:',
+	'UI:UseDefaultSettings' => 'Use a configuração padrão',
+	'UI:UseSpecificSettings' => 'Use as seguintes configurações:',
+	'UI:Display_X_ItemsPerPage' => 'Mostrar %1$s itens por página',
+	'UI:UseSavetheSettings' => 'Salvar configurações',
+	'UI:OnlyForThisList' => 'Somente para esta lista',
+	'UI:ForAllLists' => 'Para todas as listas',
+	'UI:ExtKey_AsLink' => '%1$s (Link)',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (nome amigável)',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)',
+	'UI:Button:MoveUp' => 'Mover acima',
+	'UI:Button:MoveDown' => 'Mover abaixo',
+
+	'UI:OQL:UnknownClassAndFix' => 'Classe desconhecida "%1$s". Você pode tentar "%2$s" em vez.',
+	'UI:OQL:UnknownClassNoFix' => 'Classe desconhecida "%1$s"',
+
+	'UI:Dashboard:Edit' => 'Editar esta página...',
+	'UI:Dashboard:Revert' => 'Reverter para versão original...',
+	'UI:Dashboard:RevertConfirm' => 'Cada alterações feitas na versão original será perdido. Por favor, confirme que você quer fazer isso.',
+	'UI:ExportDashBoard' => 'Exportar para um arquivo',
+	'UI:ImportDashBoard' => 'Importar pelo arquivo...',
+	'UI:ImportDashboardTitle' => 'Importar por um arquivo',
+	'UI:ImportDashboardText' => 'Selecione um arquivo do painel para importar:',
+
+
+	'UI:DashletCreation:Title' => 'Criar um novo Painel',
+	'UI:DashletCreation:Dashboard' => 'Painel',
+	'UI:DashletCreation:DashletType' => 'Tipo de painel',
+	'UI:DashletCreation:EditNow' => 'Editar o painel',
+
+	'UI:DashboardEdit:Title' => 'Editor',
+	'UI:DashboardEdit:DashboardTitle' => 'Título',
+	'UI:DashboardEdit:AutoReload' => 'Atualizar automaticamente',
+	'UI:DashboardEdit:AutoReloadSec' => 'Intervalo atualização automática (segundos)',
+	'UI:DashboardEdit:AutoReloadSec+' => 'O mínimo permitido é %1$d segundos',
+
+	'UI:DashboardEdit:Layout' => 'Layout',
+	'UI:DashboardEdit:Properties' => 'Propriedades',
+	'UI:DashboardEdit:Dashlets' => 'Painel disponível',	
+	'UI:DashboardEdit:DashletProperties' => 'Propriedades',	
+
+	'UI:Form:Property' => 'Propriedade',
+	'UI:Form:Value' => 'Valor',
+
+	'UI:DashletPlainText:Label' => 'Texto',
+	'UI:DashletPlainText:Description' => 'Texto puro (não formatado)',
+	'UI:DashletPlainText:Prop-Text' => 'Texto',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Por favor, insira algum texto aqui...',
+
+	'UI:DashletObjectList:Label' => 'Lista de objetos',
+	'UI:DashletObjectList:Description' => 'Lista objeto no painel',
+	'UI:DashletObjectList:Prop-Title' => 'Título',
+	'UI:DashletObjectList:Prop-Query' => 'Questão',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu',
+
+	'UI:DashletGroupBy:Prop-Title' => 'Título',
+	'UI:DashletGroupBy:Prop-Query' => 'Questão',
+	'UI:DashletGroupBy:Prop-Style' => 'Estilo',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Grupo por...',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hora de %1$s (0-23)',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Mês de %1$s (1 - 12)',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Dia da semana para %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Dia do mês para %1$s',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hora)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (mês)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (dia da semana)',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (dia do mês)',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Por favor, selecione o campo no qual os objetos serão agrupados',
+
+	'UI:DashletGroupByPie:Label' => 'Pie Chart',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart',
+	'UI:DashletGroupByTable:Label' => 'Grupo por (tabela)',
+	'UI:DashletGroupByTable:Description' => 'Listar (Agrupado por um campo)',
+
+	'UI:DashletHeaderStatic:Label' => 'Cabeçalho',
+	'UI:DashletHeaderStatic:Description' => 'Exibe um separador horizontal',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Título',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contatos',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Ícone',
+
+	'UI:DashletHeaderDynamic:Label' => 'Cabeçalho com estatísticas',
+	'UI:DashletHeaderDynamic:Description' => 'Cabeçalho com estatística (agrupado por...)',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Título',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contatos',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Ícone',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Sub-título',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contatos',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Consulta',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Grupo por',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Valores',
+
+	'UI:DashletBadge:Label' => 'Divisa',
+	'UI:DashletBadge:Description' => 'Ícone objeto com novo/pesquisa',
+	'UI:DashletBadge:Prop-Class' => 'Classe',
+
+	'DayOfWeek-Sunday' => 'Domingo',
+	'DayOfWeek-Monday' => 'Segunda',
+	'DayOfWeek-Tuesday' => 'Terça',
+	'DayOfWeek-Wednesday' => 'Quarta',
+	'DayOfWeek-Thursday' => 'Quinta',
+	'DayOfWeek-Friday' => 'Sexta',
+	'DayOfWeek-Saturday' => 'Sábado',
+	'Month-01' => 'Janeiro',
+	'Month-02' => 'Fevereiro',
+	'Month-03' => 'Março',
+	'Month-04' => 'Abril',
+	'Month-05' => 'Maio',
+	'Month-06' => 'Junho',
+	'Month-07' => 'Julho',
+	'Month-08' => 'Agosto',
+	'Month-09' => 'Setembro',
+	'Month-10' => 'Outubro',
+	'Month-11' => 'Novembro',
+	'Month-12' => 'Dezembro',
+
+	'UI:Menu:ShortcutList' => 'Criar um atalho...',
+	'UI:ShortcutRenameDlg:Title' => 'Renomear o atalho',
+	'UI:ShortcutListDlg:Title' => 'Criar um atalho para a lista',
+	'UI:ShortcutDelete:Confirm' => 'Por favor, confirme que você deseja excluir o(s) atalho(s).',
+	'Menu:MyShortcuts' => 'Meus atalhos', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Class:Shortcut' => 'Atalho',
+	'Class:Shortcut+' => '',
+	'Class:Shortcut/Attribute:name' => 'Nome',
+	'Class:Shortcut/Attribute:name+' => 'Nome usado no menu e título da página',
+	'Class:ShortcutOQL' => 'Resultado pesquisa atalho',
+	'Class:ShortcutOQL+' => '',
+	'Class:ShortcutOQL/Attribute:oql' => 'Consulta',
+	'Class:ShortcutOQL/Attribute:oql+' => 'definição da lista de objetos para procurar',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Atualizar automaticamente',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Desabilitado',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Avaliar',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Intervalo atualização automática (segundos)',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'O mínimo permitido é %1$d sgundos',
+
+	'UI:FillAllMandatoryFields' => 'Por favor, preencha todos os campos obrigatórios.',
+	'UI:CSVImportConfirmTitle' => 'Por favor, confirme a operação',
+	'UI:CSVImportConfirmMessage' => 'Tem certeza que deseja confirmar?',
+	'UI:CSVImportError_items' => 'Erros: %1$d',
+	'UI:CSVImportCreated_items' => 'Criado: %1$d',
+	'UI:CSVImportModified_items' => 'Alterado: %1$d',
+	'UI:CSVImportUnchanged_items' => 'Não alterado: %1$d',
+
+	'UI:Button:Remove' => 'Excluir',
+	'UI:AddAnExisting_Class' => 'Adicionar objetos do tipo %1$s...',
+	'UI:SelectionOf_Class' => 'Selecionar objetos do tipo %1$s',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:SelectRequestTemplate' => 'Selecione um modelo para %1$s',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/tr.dictionary.itop.core.php b/dictionaries/tr.dictionary.itop.core.php
index 2a6912e46..0a3953060 100644
--- a/dictionaries/tr.dictionary.itop.core.php
+++ b/dictionaries/tr.dictionary.itop.core.php
@@ -1,803 +1,803 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'core/cmdb'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: CMDBChange
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChange' => 'Değişiklik',
-	'Class:CMDBChange+' => 'Değişiklik izleme',
-	'Class:CMDBChange/Attribute:date' => 'tarih',
-	'Class:CMDBChange/Attribute:date+' => 'değişikliğin yapıldığı tarih',
-	'Class:CMDBChange/Attribute:userinfo' => 'diğer bilgiler',
-	'Class:CMDBChange/Attribute:userinfo+' => 'ilave bilgiler',
-));
-
-//
-// Class: CMDBChangeOp
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOp' => 'Değişiklik işlemi',
-	'Class:CMDBChangeOp+' => 'Değişiklik izleme',
-	'Class:CMDBChangeOp/Attribute:change' => 'değişiklik',
-	'Class:CMDBChangeOp/Attribute:change+' => 'değişiklik',
-	'Class:CMDBChangeOp/Attribute:date' => 'tarih',
-	'Class:CMDBChangeOp/Attribute:date+' => 'değişikliğin yapıldığı zaman',
-	'Class:CMDBChangeOp/Attribute:userinfo' => 'kullanıcı',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => 'değişikliğ yapan',
-	'Class:CMDBChangeOp/Attribute:objclass' => 'nesne sınıfı',
-	'Class:CMDBChangeOp/Attribute:objclass+' => 'nesne sınıfı',
-	'Class:CMDBChangeOp/Attribute:objkey' => 'nesne no',
-	'Class:CMDBChangeOp/Attribute:objkey+' => 'nesne  no',
-	'Class:CMDBChangeOp/Attribute:finalclass' => 'tip',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CMDBChangeOpCreate
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOpCreate' => 'nesne yaratımı',
-	'Class:CMDBChangeOpCreate+' => 'Nesne Yaratım izleme',
-));
-
-//
-// Class: CMDBChangeOpDelete
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOpDelete' => 'nesne silimi',
-	'Class:CMDBChangeOpDelete+' => 'Nesne silme izleme',
-));
-
-//
-// Class: CMDBChangeOpSetAttribute
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOpSetAttribute' => 'nesne değişikliği',
-	'Class:CMDBChangeOpSetAttribute+' => 'Nesne değişiminin izlemesi',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Özellik',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'Değişen özelliğin kodu',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeScalar
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => 'özellik değişimi',
-	'Class:CMDBChangeOpSetAttributeScalar+' => 'Nesne özellik değişimi izleme',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Önceki değer',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'önceki değer',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Yeni değer',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'yeni değer',
-));
-// Used by CMDBChangeOp... & derived classes
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Change:ObjectCreated' => 'Nesne yaratıldı',
-	'Change:ObjectDeleted' => 'Nesne silindi',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s\'nin değeri %2$s olarak atandı (önceki değer: %3$s)',
-	'Change:AttName_SetTo' => '%1$s\'nin değeri %2$s olarak atandı',
-	'Change:Text_AppendedTo_AttName' => '%2$s\'ye %1$s eklendi',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$\'nin değeri deiştirildi, önceki değer: %2$s',
-	'Change:AttName_Changed' => '%1$s değiştirildi',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeBlob
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => 'tarih değişimi',
-	'Class:CMDBChangeOpSetAttributeBlob+' => 'tarih değişim izleme',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Önceki veri',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'önceki değer',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeText
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:CMDBChangeOpSetAttributeText' => 'metin değişikliği',
-	'Class:CMDBChangeOpSetAttributeText+' => 'metin değişikliği izleme',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Önceki veri',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'önceki değer',
-));
-
-//
-// Class: Event
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Event' => 'Olay kaydı',
-	'Class:Event+' => 'Uygulama olayı',
-	'Class:Event/Attribute:message' => 'mesaj',
-	'Class:Event/Attribute:message+' => 'Olay tanımlama',
-	'Class:Event/Attribute:date' => 'tarih',
-	'Class:Event/Attribute:date+' => 'değişiklik tarihi',
-	'Class:Event/Attribute:userinfo' => 'kullanıcı bigileri',
-	'Class:Event/Attribute:userinfo+' => 'olay anındaki kullanıcı',
-	'Class:Event/Attribute:finalclass' => 'tip',
-	'Class:Event/Attribute:finalclass+' => '',
-));
-
-//
-// Class: EventNotification
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:EventNotification' => 'Olay uyarımı',
-	'Class:EventNotification+' => 'Uyarının tarihçesi',
-	'Class:EventNotification/Attribute:trigger_id' => 'Uyarı tetikçisi',
-	'Class:EventNotification/Attribute:trigger_id+' => 'kullanıcı hesabı',
-	'Class:EventNotification/Attribute:action_id' => 'kullanıcı',
-	'Class:EventNotification/Attribute:action_id+' => 'kullanıcı hesabı',
-	'Class:EventNotification/Attribute:object_id' => 'Nesne belirleyicisi',
-	'Class:EventNotification/Attribute:object_id+' => 'nesne belirleyicisi (olayı tetikleyen nesne ?)',
-));
-
-//
-// Class: EventNotificationEmail
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:EventNotificationEmail' => 'E-posta gönderim işlemi',
-	'Class:EventNotificationEmail+' => 'Gönderilen E-posta tarihçesi',
-	'Class:EventNotificationEmail/Attribute:to' => 'Kime',
-	'Class:EventNotificationEmail/Attribute:to+' => 'Kime',
-	'Class:EventNotificationEmail/Attribute:cc' => 'Kopya',
-	'Class:EventNotificationEmail/Attribute:cc+' => 'Kopya',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'Gizli Kopya',
-	'Class:EventNotificationEmail/Attribute:bcc+' => 'Gizli Kopya',
-	'Class:EventNotificationEmail/Attribute:from' => 'Kimden',
-	'Class:EventNotificationEmail/Attribute:from+' => 'Mesajı gönderen',
-	'Class:EventNotificationEmail/Attribute:subject' => 'Konu',
-	'Class:EventNotificationEmail/Attribute:subject+' => 'Konu',
-	'Class:EventNotificationEmail/Attribute:body' => 'Mesaj',
-	'Class:EventNotificationEmail/Attribute:body+' => 'Mesaj',
-));
-
-//
-// Class: EventIssue
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:EventIssue' => 'Olay ekle',
-	'Class:EventIssue+' => 'Olay tipi (uyarı, hata, vb.)',
-	'Class:EventIssue/Attribute:issue' => 'Konu',
-	'Class:EventIssue/Attribute:issue+' => 'Olan',
-	'Class:EventIssue/Attribute:impact' => 'Etkisi',
-	'Class:EventIssue/Attribute:impact+' => 'Sonuçları',
-	'Class:EventIssue/Attribute:page' => 'Sayfa',
-	'Class:EventIssue/Attribute:page+' => 'HTTP giriş noktası',
-	'Class:EventIssue/Attribute:arguments_post' => 'Verilen değişkenlerin değerleri',
-	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP değişken değerleri',
-	'Class:EventIssue/Attribute:arguments_get' => 'URL POST değişken değerleri',
-	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET değişken değerleri',
-	'Class:EventIssue/Attribute:callstack' => 'Çağrım sırası',
-	'Class:EventIssue/Attribute:callstack+' => 'Çağrım sırası',
-	'Class:EventIssue/Attribute:data' => 'Veri',
-	'Class:EventIssue/Attribute:data+' => 'Diğer bilgiler',
-));
-
-//
-// Classes: EventWebService and EventRestService
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:EventWebService' => 'Web service olayı',
-	'Class:EventWebService+' => 'web service çağrım sırası',
-	'Class:EventWebService/Attribute:verb' => 'Fiil',
-	'Class:EventWebService/Attribute:verb+' => 'Operasyonun adı',
-	'Class:EventWebService/Attribute:result' => 'Sonuç',
-	'Class:EventWebService/Attribute:result+' => 'Genel başarı/başarısızlık',
-	'Class:EventWebService/Attribute:log_info' => 'Bilgi kaydı',
-	'Class:EventWebService/Attribute:log_info+' => 'Sonuç bilgi kaydı',
-	'Class:EventWebService/Attribute:log_warning' => 'Uyarı kaydı',
-	'Class:EventWebService/Attribute:log_warning+' => 'Sonuç uyarı kaydı',
-	'Class:EventWebService/Attribute:log_error' => 'Hata kaydı',
-	'Class:EventWebService/Attribute:log_error+' => 'Sonuç hata kaydı',
-	'Class:EventWebService/Attribute:data' => 'Veri',
-	'Class:EventWebService/Attribute:data+' => 'Sonuç veri',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Action' => 'Özel işlem',
-	'Class:Action+' => 'Kullanıcının tanımladığı işlemler',
-	'Class:Action/Attribute:name' => 'Adı',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => 'Tanımlama',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => 'Durum',
-	'Class:Action/Attribute:status+' => 'Kullanımda mı?',
-	'Class:Action/Attribute:status/Value:test' => 'Test aşamasında',
-	'Class:Action/Attribute:status/Value:test+' => 'Test aşamasında',
-	'Class:Action/Attribute:status/Value:enabled' => 'Kullanımda',
-	'Class:Action/Attribute:status/Value:enabled+' => 'Kullanımda',
-	'Class:Action/Attribute:status/Value:disabled' => 'Etkin değil',
-	'Class:Action/Attribute:status/Value:disabled+' => 'Etkin değil',
-	'Class:Action/Attribute:trigger_list' => 'İlgili tetikleyiciler',
-	'Class:Action/Attribute:trigger_list+' => 'İşleme bağlı tetikleyici',
-	'Class:Action/Attribute:finalclass' => 'Tip',
-	'Class:Action/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ActionNotification
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ActionNotification' => 'Bildirim',
-	'Class:ActionNotification+' => 'Bildirim (soyut)',
-));
-
-//
-// Class: ActionEmail
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:ActionEmail' => 'E-posta bildirimi',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => 'Test alıcısı',
-	'Class:ActionEmail/Attribute:test_recipient+' => 'Durumu "Test" olması durumundaki alıcı',
-	'Class:ActionEmail/Attribute:from' => 'Kimden',
-	'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek',
-	'Class:ActionEmail/Attribute:reply_to' => 'Yanıtla',
-	'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek',
-	'Class:ActionEmail/Attribute:to' => 'Kime',
-	'Class:ActionEmail/Attribute:to+' => 'E-posta alıcısı',
-	'Class:ActionEmail/Attribute:cc' => 'Kopya',
-	'Class:ActionEmail/Attribute:cc+' => 'Kopya',
-	'Class:ActionEmail/Attribute:bcc' => 'gizli kopya',
-	'Class:ActionEmail/Attribute:bcc+' => 'Gizli alıcı',
-	'Class:ActionEmail/Attribute:subject' => 'konu',
-	'Class:ActionEmail/Attribute:subject+' => 'E-posta konusu',
-	'Class:ActionEmail/Attribute:body' => 'E-posta içeriği',
-	'Class:ActionEmail/Attribute:body+' => 'E-posta içeriği',
-	'Class:ActionEmail/Attribute:importance' => 'önem derecesi',
-	'Class:ActionEmail/Attribute:importance+' => 'önem derecesi',
-	'Class:ActionEmail/Attribute:importance/Value:low' => 'düşük',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => 'düşük',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
-	'Class:ActionEmail/Attribute:importance/Value:high' => 'yüksek',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => 'yüksek',
-));
-
-//
-// Class: Trigger
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:Trigger' => 'Tetikleyici',
-	'Class:Trigger+' => 'Özel olay yürütücü',
-	'Class:Trigger/Attribute:description' => 'Tanımlama',
-	'Class:Trigger/Attribute:description+' => 'tek satır tanımlama',
-	'Class:Trigger/Attribute:action_list' => 'Tetiklenen işlemler',
-	'Class:Trigger/Attribute:action_list+' => 'Tetiklenen işlemler',
-	'Class:Trigger/Attribute:finalclass' => 'Tip',
-	'Class:Trigger/Attribute:finalclass+' => '',
-));
-
-//
-// Class: TriggerOnObject
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:TriggerOnObject' => 'Tetiklenen (sınıf bağımlılığı)',
-	'Class:TriggerOnObject+' => 'Verilen sınıflar üzerinde işlemleri gerçekleştir',
-	'Class:TriggerOnObject/Attribute:target_class' => 'Hedef sınıf',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-));
-
-//
-// Class: TriggerOnStateChange
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:TriggerOnStateChange' => 'Tetiklenen (durum değişikliğinde)',
-	'Class:TriggerOnStateChange+' => 'Durum değişikliğinde tetiklenen işlemler',
-	'Class:TriggerOnStateChange/Attribute:state' => 'Durum',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-));
-
-//
-// Class: TriggerOnStateEnter
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:TriggerOnStateEnter' => 'Tetiklenen (duruma girişte)',
-	'Class:TriggerOnStateEnter+' => 'Durum değişikliğinde tetiklenen işlemler (duruma giriş)',
-));
-
-//
-// Class: TriggerOnStateLeave
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:TriggerOnStateLeave' => 'Tetiklenen (durum çıkışında)',
-	'Class:TriggerOnStateLeave+' => 'Durum değişikliğinde tetiklenen işlemler (duruma çıkış)',
-));
-
-//
-// Class: TriggerOnObjectCreate
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:TriggerOnObjectCreate' => 'Tetiklenen (nesne yaratımında)',
-	'Class:TriggerOnObjectCreate+' => 'Verilen sınıf tipi nesne yaratımında tetiklenen işlemler',
-));
-
-//
-// Class: lnkTriggerAction
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:lnkTriggerAction' => 'İşlem/Tetikleme',
-	'Class:lnkTriggerAction+' => 'Tetikleme ve işlem arasındaki ilişki',
-	'Class:lnkTriggerAction/Attribute:action_id' => 'İşlem',
-	'Class:lnkTriggerAction/Attribute:action_id+' => 'Yapılacak işlem',
-	'Class:lnkTriggerAction/Attribute:action_name' => 'İşlem',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Tetikleme',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Tetikleme',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => 'Order',
-	'Class:lnkTriggerAction/Attribute:order+' => 'İşlem uygulama sırası',
-	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
-	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
-	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
-	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
-	'Core:AttributeLinkedSet' => 'Array of objects~~',
-	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass~~',
-	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)~~',
-	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class~~',
-	'Core:AttributeInteger' => 'Integer~~',
-	'Core:AttributeInteger+' => 'Numeric value (could be negative)~~',
-	'Core:AttributeDecimal' => 'Decimal~~',
-	'Core:AttributeDecimal+' => 'Decimal value (could be negative)~~',
-	'Core:AttributeBoolean' => 'Boolean~~',
-	'Core:AttributeBoolean+' => 'Boolean~~',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-	'Core:AttributeString' => 'String~~',
-	'Core:AttributeString+' => 'Alphanumeric string~~',
-	'Core:AttributeClass' => 'Class~~',
-	'Core:AttributeClass+' => 'Class~~',
-	'Core:AttributeApplicationLanguage' => 'User language~~',
-	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)~~',
-	'Core:AttributeFinalClass' => 'Class (auto)~~',
-	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)~~',
-	'Core:AttributePassword' => 'Password~~',
-	'Core:AttributePassword+' => 'Password of an external device~~',
-	'Core:AttributeEncryptedString' => 'Encrypted string~~',
-	'Core:AttributeEncryptedString+' => 'String encrypted with a local key~~',
-	'Core:AttributeText' => 'Text~~',
-	'Core:AttributeText+' => 'Multiline character string~~',
-	'Core:AttributeHTML' => 'HTML~~',
-	'Core:AttributeHTML+' => 'HTML string~~',
-	'Core:AttributeEmailAddress' => 'Email address~~',
-	'Core:AttributeEmailAddress+' => 'Email address~~',
-	'Core:AttributeIPAddress' => 'IP address~~',
-	'Core:AttributeIPAddress+' => 'IP address~~',
-	'Core:AttributeOQL' => 'OQL~~',
-	'Core:AttributeOQL+' => 'Object Query Langage expression~~',
-	'Core:AttributeEnum' => 'Enum~~',
-	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings~~',
-	'Core:AttributeTemplateString' => 'Template string~~',
-	'Core:AttributeTemplateString+' => 'String containing placeholders~~',
-	'Core:AttributeTemplateText' => 'Template text~~',
-	'Core:AttributeTemplateText+' => 'Text containing placeholders~~',
-	'Core:AttributeTemplateHTML' => 'Template HTML~~',
-	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders~~',
-	'Core:AttributeDateTime' => 'Date/time~~',
-	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)~~',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$ss</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-If the time is omitted, it defaults to 00:00:00
-</p>~~',
-	'Core:AttributeDate' => 'Date~~',
-	'Core:AttributeDate+' => 'Date (year-month-day)~~',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>~~',
-	'Core:AttributeDeadline' => 'Deadline~~',
-	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time~~',
-	'Core:AttributeExternalKey' => 'External key~~',
-	'Core:AttributeExternalKey+' => 'External (or foreign) key~~',
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
-	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
-	'Core:AttributeExternalField' => 'External field~~',
-	'Core:AttributeExternalField+' => 'Field mapped to an external key~~',
-	'Core:AttributeURL' => 'URL~~',
-	'Core:AttributeURL+' => 'Absolute or relative URL as a text string~~',
-	'Core:AttributeBlob' => 'Blob~~',
-	'Core:AttributeBlob+' => 'Any binary content (document)~~',
-	'Core:AttributeOneWayPassword' => 'One way password~~',
-	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password~~',
-	'Core:AttributeTable' => 'Table~~',
-	'Core:AttributeTable+' => 'Indexed array having two dimensions~~',
-	'Core:AttributePropertySet' => 'Properties~~',
-	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)~~',
-	'Core:AttributeFriendlyName' => 'Friendly name~~',
-	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
-	'Core:FriendlyName-Label' => 'Friendly name~~',
-	'Core:FriendlyName-Description' => 'Friendly name~~',
-	'Change:ObjectModified' => 'Object modified~~',
-	'Change:AttName_EntryAdded' => '%1$s modified, new entry added.~~',
-	'Change:LinkSet:Added' => 'added %1$s~~',
-	'Change:LinkSet:Removed' => 'removed %1$s~~',
-	'Change:LinkSet:Modified' => 'modified %1$s~~',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
-	'Class:EventLoginUsage' => 'Login Usage~~',
-	'Class:EventLoginUsage+' => 'Connection to the application~~',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login~~',
-	'Class:EventLoginUsage/Attribute:user_id+' => 'Login~~',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name~~',
-	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name~~',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email~~',
-	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User~~',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
-	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)~~',
-	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal~~',
-	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
-	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
-	'Class:SynchroDataSource/Attribute:name' => 'Name~~',
-	'Class:SynchroDataSource/Attribute:name+' => 'Name~~',
-	'Class:SynchroDataSource/Attribute:description' => 'Description~~',
-	'Class:SynchroDataSource/Attribute:status' => 'Status~~',
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class~~',
-	'Class:SynchroDataSource/Attribute:user_id' => 'User~~',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify~~',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink~~',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized~~',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink~~',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$~~',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy~~',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval~~',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object~~',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one~~',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted~~',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
-	'SynchroDataSource:Description' => 'Description~~',
-	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation~~',
-	'SynchroDataSource:Deletion' => 'Deletion rules~~',
-	'SynchroDataSource:Status' => 'Status~~',
-	'SynchroDataSource:Information' => 'Information~~',
-	'SynchroDataSource:Definition' => 'Definition~~',
-	'Core:SynchroAttributes' => 'Attributes~~',
-	'Core:SynchroStatus' => 'Status~~',
-	'Core:Synchro:ErrorsLabel' => 'Errors~~',
-	'Core:Synchro:CreatedLabel' => 'Created~~',
-	'Core:Synchro:ModifiedLabel' => 'Modified~~',
-	'Core:Synchro:UnchangedLabel' => 'Unchanged~~',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Errors~~',
-	'Core:Synchro:ReconciledLabel' => 'Reconciled~~',
-	'Core:Synchro:ReconciledNewLabel' => 'Created~~',
-	'Core:SynchroReconcile:Yes' => 'Yes~~',
-	'Core:SynchroReconcile:No' => 'No~~',
-	'Core:SynchroUpdate:Yes' => 'Yes~~',
-	'Core:SynchroUpdate:No' => 'No~~',
-	'Core:Synchro:LastestStatus' => 'Latest Status~~',
-	'Core:Synchro:History' => 'Synchronization History~~',
-	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.~~',
-	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.~~',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...~~',
-	'Menu:DataSources' => 'Synchronization Data Sources~~',
-	'Menu:DataSources+' => 'All Synchronization Data Sources~~',
-	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)~~',
-	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)~~',
-	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',
-	'Core:Synchro:label_repl_new' => 'New (%1$s)~~',
-	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)~~',
-	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)~~',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)~~',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)~~',
-	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)~~',
-	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)~~',
-	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)~~',
-	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)~~',
-	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)~~',
-	'Core:Synchro:label_obj_created' => 'Created (%1$s)~~',
-	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)~~',
-	'Core:SynchroLogTitle' => '%1$s - %2$s~~',
-	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s~~',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.~~',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete~~',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.~~',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
-	'Core:SynchroReplica:PublicData' => 'Public Data~~',
-	'Core:SynchroReplica:PrivateDetails' => 'Private Details~~',
-	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s~~',
-	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica~~',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)~~',
-	'Core:SynchroAtt:attcode' => 'Attribute~~',
-	'Core:SynchroAtt:attcode+' => 'Field of the object~~',
-	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?~~',
-	'Core:SynchroAtt:reconciliation+' => 'Used for searching~~',
-	'Core:SynchroAtt:update' => 'Update ?~~',
-	'Core:SynchroAtt:update+' => 'Used to update the object~~',
-	'Core:SynchroAtt:update_policy' => 'Update Policy~~',
-	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field~~',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key~~',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation~~',
-	'Core:SyncDataExchangeComment' => '(Data Synchro)~~',
-	'Core:Synchro:ListOfDataSources' => 'List of data sources:~~',
-	'Core:Synchro:LastSynchro' => 'Last synchronization:~~',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source~~',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s~~',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s~~',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s~~',
-	'TitleSynchroExecution' => 'Execution of the synchronization~~',
-	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s~~',
-	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.~~',
-	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.~~',
-	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.~~',
-	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
-	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
-	'Class:AsyncSendEmail' => 'Email (asynchronous)~~',
-	'Class:AsyncSendEmail/Attribute:to' => 'To~~',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Subject~~',
-	'Class:AsyncSendEmail/Attribute:body' => 'Body~~',
-	'Class:AsyncSendEmail/Attribute:header' => 'Header~~',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password~~',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value~~',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value~~',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log~~',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry~~',
-	'Class:SynchroDataSource' => 'Synchro Data Source~~',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation~~',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete~~',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production~~',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction~~',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes~~',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error~~',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error~~',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)~~',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete~~',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody~~',
-	'Class:SynchroAttribute' => 'Synchro Attribute~~',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source~~',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code~~',
-	'Class:SynchroAttribute/Attribute:update' => 'Update~~',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile~~',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy~~',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked~~',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked~~',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty~~',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Class~~',
-	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute~~',
-	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)~~',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator~~',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator~~',
-	'Class:SynchroLog' => 'Synchr Log~~',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source~~',
-	'Class:SynchroLog/Attribute:start_date' => 'Start Date~~',
-	'Class:SynchroLog/Attribute:end_date' => 'End Date~~',
-	'Class:SynchroLog/Attribute:status' => 'Status~~',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed~~',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Error~~',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged~~',
-	'Class:SynchroLog/Attribute:last_error' => 'Last error~~',
-	'Class:SynchroLog/Attribute:traces' => 'Traces~~',
-	'Class:SynchroReplica' => 'Synchro Replica~~',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source~~',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)~~',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type~~',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen~~',
-	'Class:SynchroReplica/Attribute:status' => 'Status~~',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified~~',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'New~~',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete~~',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan~~',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized~~',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?~~',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error~~',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings~~',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date~~',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date~~',
-	'Class:appUserPreferences' => 'User Preferences~~',
-	'Class:appUserPreferences/Attribute:userid' => 'User~~',
-	'Class:appUserPreferences/Attribute:preferences' => 'Prefs~~',
-	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
-	'Core:Duration_Seconds' => '%1$ds~~',
-	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds~~',
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds~~',
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds~~',
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChange' => 'Değişiklik',
+	'Class:CMDBChange+' => 'Değişiklik izleme',
+	'Class:CMDBChange/Attribute:date' => 'tarih',
+	'Class:CMDBChange/Attribute:date+' => 'değişikliğin yapıldığı tarih',
+	'Class:CMDBChange/Attribute:userinfo' => 'diğer bilgiler',
+	'Class:CMDBChange/Attribute:userinfo+' => 'ilave bilgiler',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOp' => 'Değişiklik işlemi',
+	'Class:CMDBChangeOp+' => 'Değişiklik izleme',
+	'Class:CMDBChangeOp/Attribute:change' => 'değişiklik',
+	'Class:CMDBChangeOp/Attribute:change+' => 'değişiklik',
+	'Class:CMDBChangeOp/Attribute:date' => 'tarih',
+	'Class:CMDBChangeOp/Attribute:date+' => 'değişikliğin yapıldığı zaman',
+	'Class:CMDBChangeOp/Attribute:userinfo' => 'kullanıcı',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => 'değişikliğ yapan',
+	'Class:CMDBChangeOp/Attribute:objclass' => 'nesne sınıfı',
+	'Class:CMDBChangeOp/Attribute:objclass+' => 'nesne sınıfı',
+	'Class:CMDBChangeOp/Attribute:objkey' => 'nesne no',
+	'Class:CMDBChangeOp/Attribute:objkey+' => 'nesne  no',
+	'Class:CMDBChangeOp/Attribute:finalclass' => 'tip',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOpCreate' => 'nesne yaratımı',
+	'Class:CMDBChangeOpCreate+' => 'Nesne Yaratım izleme',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOpDelete' => 'nesne silimi',
+	'Class:CMDBChangeOpDelete+' => 'Nesne silme izleme',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOpSetAttribute' => 'nesne değişikliği',
+	'Class:CMDBChangeOpSetAttribute+' => 'Nesne değişiminin izlemesi',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Özellik',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => 'Değişen özelliğin kodu',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => 'özellik değişimi',
+	'Class:CMDBChangeOpSetAttributeScalar+' => 'Nesne özellik değişimi izleme',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Önceki değer',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => 'önceki değer',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => 'Yeni değer',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'yeni değer',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Change:ObjectCreated' => 'Nesne yaratıldı',
+	'Change:ObjectDeleted' => 'Nesne silindi',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s\'nin değeri %2$s olarak atandı (önceki değer: %3$s)',
+	'Change:AttName_SetTo' => '%1$s\'nin değeri %2$s olarak atandı',
+	'Change:Text_AppendedTo_AttName' => '%2$s\'ye %1$s eklendi',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$\'nin değeri deiştirildi, önceki değer: %2$s',
+	'Change:AttName_Changed' => '%1$s değiştirildi',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => 'tarih değişimi',
+	'Class:CMDBChangeOpSetAttributeBlob+' => 'tarih değişim izleme',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Önceki veri',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => 'önceki değer',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:CMDBChangeOpSetAttributeText' => 'metin değişikliği',
+	'Class:CMDBChangeOpSetAttributeText+' => 'metin değişikliği izleme',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Önceki veri',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => 'önceki değer',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Event' => 'Olay kaydı',
+	'Class:Event+' => 'Uygulama olayı',
+	'Class:Event/Attribute:message' => 'mesaj',
+	'Class:Event/Attribute:message+' => 'Olay tanımlama',
+	'Class:Event/Attribute:date' => 'tarih',
+	'Class:Event/Attribute:date+' => 'değişiklik tarihi',
+	'Class:Event/Attribute:userinfo' => 'kullanıcı bigileri',
+	'Class:Event/Attribute:userinfo+' => 'olay anındaki kullanıcı',
+	'Class:Event/Attribute:finalclass' => 'tip',
+	'Class:Event/Attribute:finalclass+' => '',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:EventNotification' => 'Olay uyarımı',
+	'Class:EventNotification+' => 'Uyarının tarihçesi',
+	'Class:EventNotification/Attribute:trigger_id' => 'Uyarı tetikçisi',
+	'Class:EventNotification/Attribute:trigger_id+' => 'kullanıcı hesabı',
+	'Class:EventNotification/Attribute:action_id' => 'kullanıcı',
+	'Class:EventNotification/Attribute:action_id+' => 'kullanıcı hesabı',
+	'Class:EventNotification/Attribute:object_id' => 'Nesne belirleyicisi',
+	'Class:EventNotification/Attribute:object_id+' => 'nesne belirleyicisi (olayı tetikleyen nesne ?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:EventNotificationEmail' => 'E-posta gönderim işlemi',
+	'Class:EventNotificationEmail+' => 'Gönderilen E-posta tarihçesi',
+	'Class:EventNotificationEmail/Attribute:to' => 'Kime',
+	'Class:EventNotificationEmail/Attribute:to+' => 'Kime',
+	'Class:EventNotificationEmail/Attribute:cc' => 'Kopya',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'Kopya',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'Gizli Kopya',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'Gizli Kopya',
+	'Class:EventNotificationEmail/Attribute:from' => 'Kimden',
+	'Class:EventNotificationEmail/Attribute:from+' => 'Mesajı gönderen',
+	'Class:EventNotificationEmail/Attribute:subject' => 'Konu',
+	'Class:EventNotificationEmail/Attribute:subject+' => 'Konu',
+	'Class:EventNotificationEmail/Attribute:body' => 'Mesaj',
+	'Class:EventNotificationEmail/Attribute:body+' => 'Mesaj',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:EventIssue' => 'Olay ekle',
+	'Class:EventIssue+' => 'Olay tipi (uyarı, hata, vb.)',
+	'Class:EventIssue/Attribute:issue' => 'Konu',
+	'Class:EventIssue/Attribute:issue+' => 'Olan',
+	'Class:EventIssue/Attribute:impact' => 'Etkisi',
+	'Class:EventIssue/Attribute:impact+' => 'Sonuçları',
+	'Class:EventIssue/Attribute:page' => 'Sayfa',
+	'Class:EventIssue/Attribute:page+' => 'HTTP giriş noktası',
+	'Class:EventIssue/Attribute:arguments_post' => 'Verilen değişkenlerin değerleri',
+	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP değişken değerleri',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL POST değişken değerleri',
+	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET değişken değerleri',
+	'Class:EventIssue/Attribute:callstack' => 'Çağrım sırası',
+	'Class:EventIssue/Attribute:callstack+' => 'Çağrım sırası',
+	'Class:EventIssue/Attribute:data' => 'Veri',
+	'Class:EventIssue/Attribute:data+' => 'Diğer bilgiler',
+));
+
+//
+// Classes: EventWebService and EventRestService
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:EventWebService' => 'Web service olayı',
+	'Class:EventWebService+' => 'web service çağrım sırası',
+	'Class:EventWebService/Attribute:verb' => 'Fiil',
+	'Class:EventWebService/Attribute:verb+' => 'Operasyonun adı',
+	'Class:EventWebService/Attribute:result' => 'Sonuç',
+	'Class:EventWebService/Attribute:result+' => 'Genel başarı/başarısızlık',
+	'Class:EventWebService/Attribute:log_info' => 'Bilgi kaydı',
+	'Class:EventWebService/Attribute:log_info+' => 'Sonuç bilgi kaydı',
+	'Class:EventWebService/Attribute:log_warning' => 'Uyarı kaydı',
+	'Class:EventWebService/Attribute:log_warning+' => 'Sonuç uyarı kaydı',
+	'Class:EventWebService/Attribute:log_error' => 'Hata kaydı',
+	'Class:EventWebService/Attribute:log_error+' => 'Sonuç hata kaydı',
+	'Class:EventWebService/Attribute:data' => 'Veri',
+	'Class:EventWebService/Attribute:data+' => 'Sonuç veri',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Action' => 'Özel işlem',
+	'Class:Action+' => 'Kullanıcının tanımladığı işlemler',
+	'Class:Action/Attribute:name' => 'Adı',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => 'Tanımlama',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => 'Durum',
+	'Class:Action/Attribute:status+' => 'Kullanımda mı?',
+	'Class:Action/Attribute:status/Value:test' => 'Test aşamasında',
+	'Class:Action/Attribute:status/Value:test+' => 'Test aşamasında',
+	'Class:Action/Attribute:status/Value:enabled' => 'Kullanımda',
+	'Class:Action/Attribute:status/Value:enabled+' => 'Kullanımda',
+	'Class:Action/Attribute:status/Value:disabled' => 'Etkin değil',
+	'Class:Action/Attribute:status/Value:disabled+' => 'Etkin değil',
+	'Class:Action/Attribute:trigger_list' => 'İlgili tetikleyiciler',
+	'Class:Action/Attribute:trigger_list+' => 'İşleme bağlı tetikleyici',
+	'Class:Action/Attribute:finalclass' => 'Tip',
+	'Class:Action/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ActionNotification' => 'Bildirim',
+	'Class:ActionNotification+' => 'Bildirim (soyut)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:ActionEmail' => 'E-posta bildirimi',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => 'Test alıcısı',
+	'Class:ActionEmail/Attribute:test_recipient+' => 'Durumu "Test" olması durumundaki alıcı',
+	'Class:ActionEmail/Attribute:from' => 'Kimden',
+	'Class:ActionEmail/Attribute:from+' => 'e-posta başlığında gönderilecek',
+	'Class:ActionEmail/Attribute:reply_to' => 'Yanıtla',
+	'Class:ActionEmail/Attribute:reply_to+' => 'e-posta başlığında gönderilecek',
+	'Class:ActionEmail/Attribute:to' => 'Kime',
+	'Class:ActionEmail/Attribute:to+' => 'E-posta alıcısı',
+	'Class:ActionEmail/Attribute:cc' => 'Kopya',
+	'Class:ActionEmail/Attribute:cc+' => 'Kopya',
+	'Class:ActionEmail/Attribute:bcc' => 'gizli kopya',
+	'Class:ActionEmail/Attribute:bcc+' => 'Gizli alıcı',
+	'Class:ActionEmail/Attribute:subject' => 'konu',
+	'Class:ActionEmail/Attribute:subject+' => 'E-posta konusu',
+	'Class:ActionEmail/Attribute:body' => 'E-posta içeriği',
+	'Class:ActionEmail/Attribute:body+' => 'E-posta içeriği',
+	'Class:ActionEmail/Attribute:importance' => 'önem derecesi',
+	'Class:ActionEmail/Attribute:importance+' => 'önem derecesi',
+	'Class:ActionEmail/Attribute:importance/Value:low' => 'düşük',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => 'düşük',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => 'normal',
+	'Class:ActionEmail/Attribute:importance/Value:high' => 'yüksek',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => 'yüksek',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:Trigger' => 'Tetikleyici',
+	'Class:Trigger+' => 'Özel olay yürütücü',
+	'Class:Trigger/Attribute:description' => 'Tanımlama',
+	'Class:Trigger/Attribute:description+' => 'tek satır tanımlama',
+	'Class:Trigger/Attribute:action_list' => 'Tetiklenen işlemler',
+	'Class:Trigger/Attribute:action_list+' => 'Tetiklenen işlemler',
+	'Class:Trigger/Attribute:finalclass' => 'Tip',
+	'Class:Trigger/Attribute:finalclass+' => '',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:TriggerOnObject' => 'Tetiklenen (sınıf bağımlılığı)',
+	'Class:TriggerOnObject+' => 'Verilen sınıflar üzerinde işlemleri gerçekleştir',
+	'Class:TriggerOnObject/Attribute:target_class' => 'Hedef sınıf',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:TriggerOnStateChange' => 'Tetiklenen (durum değişikliğinde)',
+	'Class:TriggerOnStateChange+' => 'Durum değişikliğinde tetiklenen işlemler',
+	'Class:TriggerOnStateChange/Attribute:state' => 'Durum',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:TriggerOnStateEnter' => 'Tetiklenen (duruma girişte)',
+	'Class:TriggerOnStateEnter+' => 'Durum değişikliğinde tetiklenen işlemler (duruma giriş)',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:TriggerOnStateLeave' => 'Tetiklenen (durum çıkışında)',
+	'Class:TriggerOnStateLeave+' => 'Durum değişikliğinde tetiklenen işlemler (duruma çıkış)',
+));
+
+//
+// Class: TriggerOnObjectCreate
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:TriggerOnObjectCreate' => 'Tetiklenen (nesne yaratımında)',
+	'Class:TriggerOnObjectCreate+' => 'Verilen sınıf tipi nesne yaratımında tetiklenen işlemler',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:lnkTriggerAction' => 'İşlem/Tetikleme',
+	'Class:lnkTriggerAction+' => 'Tetikleme ve işlem arasındaki ilişki',
+	'Class:lnkTriggerAction/Attribute:action_id' => 'İşlem',
+	'Class:lnkTriggerAction/Attribute:action_id+' => 'Yapılacak işlem',
+	'Class:lnkTriggerAction/Attribute:action_name' => 'İşlem',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => 'Tetikleme',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => 'Tetikleme',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => 'Order',
+	'Class:lnkTriggerAction/Attribute:order+' => 'İşlem uygulama sırası',
+	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
+	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
+	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
+	'Core:AttributeLinkedSet' => 'Array of objects~~',
+	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass~~',
+	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)~~',
+	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class~~',
+	'Core:AttributeInteger' => 'Integer~~',
+	'Core:AttributeInteger+' => 'Numeric value (could be negative)~~',
+	'Core:AttributeDecimal' => 'Decimal~~',
+	'Core:AttributeDecimal+' => 'Decimal value (could be negative)~~',
+	'Core:AttributeBoolean' => 'Boolean~~',
+	'Core:AttributeBoolean+' => 'Boolean~~',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+	'Core:AttributeString' => 'String~~',
+	'Core:AttributeString+' => 'Alphanumeric string~~',
+	'Core:AttributeClass' => 'Class~~',
+	'Core:AttributeClass+' => 'Class~~',
+	'Core:AttributeApplicationLanguage' => 'User language~~',
+	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)~~',
+	'Core:AttributeFinalClass' => 'Class (auto)~~',
+	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)~~',
+	'Core:AttributePassword' => 'Password~~',
+	'Core:AttributePassword+' => 'Password of an external device~~',
+	'Core:AttributeEncryptedString' => 'Encrypted string~~',
+	'Core:AttributeEncryptedString+' => 'String encrypted with a local key~~',
+	'Core:AttributeText' => 'Text~~',
+	'Core:AttributeText+' => 'Multiline character string~~',
+	'Core:AttributeHTML' => 'HTML~~',
+	'Core:AttributeHTML+' => 'HTML string~~',
+	'Core:AttributeEmailAddress' => 'Email address~~',
+	'Core:AttributeEmailAddress+' => 'Email address~~',
+	'Core:AttributeIPAddress' => 'IP address~~',
+	'Core:AttributeIPAddress+' => 'IP address~~',
+	'Core:AttributeOQL' => 'OQL~~',
+	'Core:AttributeOQL+' => 'Object Query Langage expression~~',
+	'Core:AttributeEnum' => 'Enum~~',
+	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings~~',
+	'Core:AttributeTemplateString' => 'Template string~~',
+	'Core:AttributeTemplateString+' => 'String containing placeholders~~',
+	'Core:AttributeTemplateText' => 'Template text~~',
+	'Core:AttributeTemplateText+' => 'Text containing placeholders~~',
+	'Core:AttributeTemplateHTML' => 'Template HTML~~',
+	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders~~',
+	'Core:AttributeDateTime' => 'Date/time~~',
+	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)~~',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$ss</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>~~',
+	'Core:AttributeDate' => 'Date~~',
+	'Core:AttributeDate+' => 'Date (year-month-day)~~',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>~~',
+	'Core:AttributeDeadline' => 'Deadline~~',
+	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time~~',
+	'Core:AttributeExternalKey' => 'External key~~',
+	'Core:AttributeExternalKey+' => 'External (or foreign) key~~',
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
+	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
+	'Core:AttributeExternalField' => 'External field~~',
+	'Core:AttributeExternalField+' => 'Field mapped to an external key~~',
+	'Core:AttributeURL' => 'URL~~',
+	'Core:AttributeURL+' => 'Absolute or relative URL as a text string~~',
+	'Core:AttributeBlob' => 'Blob~~',
+	'Core:AttributeBlob+' => 'Any binary content (document)~~',
+	'Core:AttributeOneWayPassword' => 'One way password~~',
+	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password~~',
+	'Core:AttributeTable' => 'Table~~',
+	'Core:AttributeTable+' => 'Indexed array having two dimensions~~',
+	'Core:AttributePropertySet' => 'Properties~~',
+	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)~~',
+	'Core:AttributeFriendlyName' => 'Friendly name~~',
+	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
+	'Core:FriendlyName-Label' => 'Friendly name~~',
+	'Core:FriendlyName-Description' => 'Friendly name~~',
+	'Change:ObjectModified' => 'Object modified~~',
+	'Change:AttName_EntryAdded' => '%1$s modified, new entry added.~~',
+	'Change:LinkSet:Added' => 'added %1$s~~',
+	'Change:LinkSet:Removed' => 'removed %1$s~~',
+	'Change:LinkSet:Modified' => 'modified %1$s~~',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
+	'Class:EventLoginUsage' => 'Login Usage~~',
+	'Class:EventLoginUsage+' => 'Connection to the application~~',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login~~',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login~~',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name~~',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name~~',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email~~',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User~~',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
+	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)~~',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal~~',
+	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
+	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
+	'Class:SynchroDataSource/Attribute:name' => 'Name~~',
+	'Class:SynchroDataSource/Attribute:name+' => 'Name~~',
+	'Class:SynchroDataSource/Attribute:description' => 'Description~~',
+	'Class:SynchroDataSource/Attribute:status' => 'Status~~',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class~~',
+	'Class:SynchroDataSource/Attribute:user_id' => 'User~~',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify~~',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink~~',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized~~',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink~~',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object~~',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one~~',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted~~',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
+	'SynchroDataSource:Description' => 'Description~~',
+	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation~~',
+	'SynchroDataSource:Deletion' => 'Deletion rules~~',
+	'SynchroDataSource:Status' => 'Status~~',
+	'SynchroDataSource:Information' => 'Information~~',
+	'SynchroDataSource:Definition' => 'Definition~~',
+	'Core:SynchroAttributes' => 'Attributes~~',
+	'Core:SynchroStatus' => 'Status~~',
+	'Core:Synchro:ErrorsLabel' => 'Errors~~',
+	'Core:Synchro:CreatedLabel' => 'Created~~',
+	'Core:Synchro:ModifiedLabel' => 'Modified~~',
+	'Core:Synchro:UnchangedLabel' => 'Unchanged~~',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errors~~',
+	'Core:Synchro:ReconciledLabel' => 'Reconciled~~',
+	'Core:Synchro:ReconciledNewLabel' => 'Created~~',
+	'Core:SynchroReconcile:Yes' => 'Yes~~',
+	'Core:SynchroReconcile:No' => 'No~~',
+	'Core:SynchroUpdate:Yes' => 'Yes~~',
+	'Core:SynchroUpdate:No' => 'No~~',
+	'Core:Synchro:LastestStatus' => 'Latest Status~~',
+	'Core:Synchro:History' => 'Synchronization History~~',
+	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.~~',
+	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.~~',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...~~',
+	'Menu:DataSources' => 'Synchronization Data Sources~~',
+	'Menu:DataSources+' => 'All Synchronization Data Sources~~',
+	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)~~',
+	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)~~',
+	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',
+	'Core:Synchro:label_repl_new' => 'New (%1$s)~~',
+	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)~~',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)~~',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)~~',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)~~',
+	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)~~',
+	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)~~',
+	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)~~',
+	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)~~',
+	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)~~',
+	'Core:Synchro:label_obj_created' => 'Created (%1$s)~~',
+	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)~~',
+	'Core:SynchroLogTitle' => '%1$s - %2$s~~',
+	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s~~',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.~~',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete~~',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.~~',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
+	'Core:SynchroReplica:PublicData' => 'Public Data~~',
+	'Core:SynchroReplica:PrivateDetails' => 'Private Details~~',
+	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s~~',
+	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica~~',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)~~',
+	'Core:SynchroAtt:attcode' => 'Attribute~~',
+	'Core:SynchroAtt:attcode+' => 'Field of the object~~',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?~~',
+	'Core:SynchroAtt:reconciliation+' => 'Used for searching~~',
+	'Core:SynchroAtt:update' => 'Update ?~~',
+	'Core:SynchroAtt:update+' => 'Used to update the object~~',
+	'Core:SynchroAtt:update_policy' => 'Update Policy~~',
+	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field~~',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key~~',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation~~',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)~~',
+	'Core:Synchro:ListOfDataSources' => 'List of data sources:~~',
+	'Core:Synchro:LastSynchro' => 'Last synchronization:~~',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source~~',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s~~',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s~~',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s~~',
+	'TitleSynchroExecution' => 'Execution of the synchronization~~',
+	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s~~',
+	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.~~',
+	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.~~',
+	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.~~',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
+	'Class:AsyncSendEmail' => 'Email (asynchronous)~~',
+	'Class:AsyncSendEmail/Attribute:to' => 'To~~',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Subject~~',
+	'Class:AsyncSendEmail/Attribute:body' => 'Body~~',
+	'Class:AsyncSendEmail/Attribute:header' => 'Header~~',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password~~',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value~~',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log~~',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry~~',
+	'Class:SynchroDataSource' => 'Synchro Data Source~~',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation~~',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete~~',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production~~',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error~~',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error~~',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)~~',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete~~',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody~~',
+	'Class:SynchroAttribute' => 'Synchro Attribute~~',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code~~',
+	'Class:SynchroAttribute/Attribute:update' => 'Update~~',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile~~',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy~~',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked~~',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked~~',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty~~',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Class~~',
+	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute~~',
+	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)~~',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator~~',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator~~',
+	'Class:SynchroLog' => 'Synchr Log~~',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroLog/Attribute:start_date' => 'Start Date~~',
+	'Class:SynchroLog/Attribute:end_date' => 'End Date~~',
+	'Class:SynchroLog/Attribute:status' => 'Status~~',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed~~',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Error~~',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged~~',
+	'Class:SynchroLog/Attribute:last_error' => 'Last error~~',
+	'Class:SynchroLog/Attribute:traces' => 'Traces~~',
+	'Class:SynchroReplica' => 'Synchro Replica~~',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)~~',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type~~',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen~~',
+	'Class:SynchroReplica/Attribute:status' => 'Status~~',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified~~',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'New~~',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete~~',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan~~',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized~~',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?~~',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error~~',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings~~',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date~~',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date~~',
+	'Class:appUserPreferences' => 'User Preferences~~',
+	'Class:appUserPreferences/Attribute:userid' => 'User~~',
+	'Class:appUserPreferences/Attribute:preferences' => 'Prefs~~',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
+	'Core:Duration_Seconds' => '%1$ds~~',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds~~',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds~~',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds~~',
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php
index e19998ff5..c389baf87 100644
--- a/dictionaries/tr.dictionary.itop.ui.php
+++ b/dictionaries/tr.dictionary.itop.ui.php
@@ -1,1275 +1,1275 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:AuditCategory' => 'Denetleme Kategorisi',
-	'Class:AuditCategory+' => 'Denetlemedeki kategori',
-	'Class:AuditCategory/Attribute:name' => 'Kategori Adı',
-	'Class:AuditCategory/Attribute:name+' => 'Kategornin kısa adı',
-	'Class:AuditCategory/Attribute:description' => 'Kategori tanımlaması',
-	'Class:AuditCategory/Attribute:description+' => 'Kategori tanımlaması',
-	'Class:AuditCategory/Attribute:definition_set' => 'Tanımlama seti',
-	'Class:AuditCategory/Attribute:definition_set+' => 'Denetlenecek nesneler için OQL ifadesi',
-	'Class:AuditCategory/Attribute:rules_list' => 'Denetlem kuralları',
-	'Class:AuditCategory/Attribute:rules_list+' => 'Kategori için denetleme kuralları',
-));
-
-//
-// Class: AuditRule
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:AuditRule' => 'Denetleme Kuralı',
-	'Class:AuditRule+' => 'Denetleme Kategorisi kuralı',
-	'Class:AuditRule/Attribute:name' => 'Kural Adı',
-	'Class:AuditRule/Attribute:name+' => 'Kural Adı',
-	'Class:AuditRule/Attribute:description' => 'Kural tanımlaması',
-	'Class:AuditRule/Attribute:description+' => 'Kural tanımlaması',
-	'Class:AuditRule/Attribute:query' => 'Çalıştırılacak Sorgu',
-	'Class:AuditRule/Attribute:query+' => 'Çalıştırılcak OQL ifadesi',
-	'Class:AuditRule/Attribute:valid_flag' => 'Geçerli nesneler?',
-	'Class:AuditRule/Attribute:valid_flag+' => 'Kural geçerli nesne döndürüse doğru, diğer durumda yanlış',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'doğru',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'doğru',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'yanlış',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'yanlış',
-	'Class:AuditRule/Attribute:category_id' => 'Kategori',
-	'Class:AuditRule/Attribute:category_id+' => 'Kuralın kategorisi',
-	'Class:AuditRule/Attribute:category_name' => 'Kategori',
-	'Class:AuditRule/Attribute:category_name+' => 'Kural için kategori adı',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:User' => 'Kullanıcı',
-	'Class:User+' => 'Kullanıcı',
-	'Class:User/Attribute:finalclass' => 'Hesap tipi',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => 'İrtibat (kişi)',
-	'Class:User/Attribute:contactid+' => 'İrtibat detayları',
-	'Class:User/Attribute:last_name' => 'Soyadı',
-	'Class:User/Attribute:last_name+' => 'İrtibatın soyadı',
-	'Class:User/Attribute:first_name' => 'Adı',
-	'Class:User/Attribute:first_name+' => 'İrtibatın adı',
-	'Class:User/Attribute:email' => 'E-posta',
-	'Class:User/Attribute:email+' => 'Kişinin e-posta adresi',
-	'Class:User/Attribute:login' => 'Kullanıcı adı',
-	'Class:User/Attribute:login+' => 'Kullanıcı adı',
-	'Class:User/Attribute:language' => 'Dil',
-	'Class:User/Attribute:language+' => 'Dil',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:language/Value:TR TR' => 'Turkish',
-	'Class:User/Attribute:language/Value:TR TR+' => 'Turkish (Turkey)',
-	'Class:User/Attribute:profile_list' => 'Profiller',
-	'Class:User/Attribute:profile_list+' => 'Kullanıcı rolü',
-	'Class:User/Attribute:allowed_org_list' => 'Erişim yetkisi verilen kurumlar',
-	'Class:User/Attribute:allowed_org_list+' => 'Kullanıcın erişime yetkili olduğu kurumlar. Kurum tanımlanmaz ise sınırlama olmaz.',
-
-	'Class:User/Error:LoginMustBeUnique' => 'Kullanıcı adı tekil olmalı - "%1s" mevcut bir kullanıcıya ait.',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'En az bir profil kullanıcıya atanmalı',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_Profiles' => 'Profil',
-	'Class:URP_Profiles+' => 'Kullanıcı profili',
-	'Class:URP_Profiles/Attribute:name' => 'Adı',
-	'Class:URP_Profiles/Attribute:name+' => 'Profil adı',
-	'Class:URP_Profiles/Attribute:description' => 'Tanımlama',
-	'Class:URP_Profiles/Attribute:description+' => 'Profil tanımlama',
-	'Class:URP_Profiles/Attribute:user_list' => 'Kullanıcılar',
-	'Class:URP_Profiles/Attribute:user_list+' => 'bu rolü kullanan kullanıcılar',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_Dimensions' => 'boyut',
-	'Class:URP_Dimensions+' => 'uygulama boyutları (silo kullanımları)',
-	'Class:URP_Dimensions/Attribute:name' => 'Adı',
-	'Class:URP_Dimensions/Attribute:name+' => 'Boyut adı',
-	'Class:URP_Dimensions/Attribute:description' => 'Tanımlama',
-	'Class:URP_Dimensions/Attribute:description+' => 'Tanımlama',
-	'Class:URP_Dimensions/Attribute:type' => 'Tip',
-	'Class:URP_Dimensions/Attribute:type+' => 'sınıf adı veya veri tipi (projection unit)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_UserProfile' => 'Kullanıcı Profili',
-	'Class:URP_UserProfile+' => 'Kullanıcı Profili',
-	'Class:URP_UserProfile/Attribute:userid' => 'Kullanıcı',
-	'Class:URP_UserProfile/Attribute:userid+' => 'Kullanıcı hesabı',
-	'Class:URP_UserProfile/Attribute:userlogin' => 'Kullanıcı adı',
-	'Class:URP_UserProfile/Attribute:userlogin+' => 'Kullanıcı hesabı',
-	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
-	'Class:URP_UserProfile/Attribute:profileid+' => 'Kullanıcı profili',
-	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
-	'Class:URP_UserProfile/Attribute:profile+' => 'Profil adı',
-	'Class:URP_UserProfile/Attribute:reason' => 'Sebep',
-	'Class:URP_UserProfile/Attribute:reason+' => 'Kullanıcının bu rolü alma sebebini açıklayınız',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_UserOrg' => 'Kullanıcı Kurumu',
-	'Class:URP_UserOrg+' => 'İzin verilen kurumlar',
-	'Class:URP_UserOrg/Attribute:userid' => 'Kullanıcı',
-	'Class:URP_UserOrg/Attribute:userid+' => 'Kullanıcı hesabı',
-	'Class:URP_UserOrg/Attribute:userlogin' => 'Kullanıcı',
-	'Class:URP_UserOrg/Attribute:userlogin+' => 'Kullanıcı hesabı',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Kurum',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Erişim yetkisi kurumlar',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Kurumu',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Erişim yetkisi verilen kurumlar',
-	'Class:URP_UserOrg/Attribute:reason' => 'Sebep',
-	'Class:URP_UserOrg/Attribute:reason+' => 'Kullanıcının bu rolü alma sebebini açıklayınız',
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_ProfileProjection' => 'profile_projection',
-	'Class:URP_ProfileProjection+' => 'profile projections',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Boyut',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'uygulama boyutu',
-	'Class:URP_ProfileProjection/Attribute:dimension' => 'Boyut',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => 'uygulama boyutu',
-	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profil',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => 'profil kullanımı',
-	'Class:URP_ProfileProjection/Attribute:profile' => 'Profil',
-	'Class:URP_ProfileProjection/Attribute:profile+' => 'Profil adı',
-	'Class:URP_ProfileProjection/Attribute:value' => 'Değer ifadesi',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL ifadesi (kullanıcı $user) | sabit |  | +özellik kodu',
-	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribute',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Hedef özellik kodu (opsiyonel)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_ClassProjection' => 'sınıf projeksiyonu',
-	'Class:URP_ClassProjection+' => 'sınıf projeksiyonu',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Boyut',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'uygulama boyutu',
-	'Class:URP_ClassProjection/Attribute:dimension' => 'Boyut',
-	'Class:URP_ClassProjection/Attribute:dimension+' => 'uygulama boyutu',
-	'Class:URP_ClassProjection/Attribute:class' => 'Sınıf',
-	'Class:URP_ClassProjection/Attribute:class+' => 'Hedef sınıf',
-	'Class:URP_ClassProjection/Attribute:value' => 'Değer ifadesi',
-	'Class:URP_ClassProjection/Attribute:value+' => 'OQL ifadesi (kullanıcı $user) | sabit |  | +özellik kodu',
-	'Class:URP_ClassProjection/Attribute:attribute' => 'Özellik',
-	'Class:URP_ClassProjection/Attribute:attribute+' => 'Hedef özellik kodu (opsiyonel)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_ActionGrant' => 'işlem yetkileri',
-	'Class:URP_ActionGrant+' => 'sınıf üzerindeki yetkiler',
-	'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
-	'Class:URP_ActionGrant/Attribute:profileid+' => 'Kullanım profili',
-	'Class:URP_ActionGrant/Attribute:profile' => 'Profil',
-	'Class:URP_ActionGrant/Attribute:profile+' => 'Kullanım profili',
-	'Class:URP_ActionGrant/Attribute:class' => 'Sınıf',
-	'Class:URP_ActionGrant/Attribute:class+' => 'Hedef sınıf',
-	'Class:URP_ActionGrant/Attribute:permission' => 'Erişim yetkisi',
-	'Class:URP_ActionGrant/Attribute:permission+' => 'yetkili veya yetkisiz?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'evet',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'evet',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'hayır',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'hayır',
-	'Class:URP_ActionGrant/Attribute:action' => 'İşlem',
-	'Class:URP_ActionGrant/Attribute:action+' => 'verilen sınıf üzerinde uygulanacak işlemler',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_StimulusGrant' => 'uyarı yetkileri',
-	'Class:URP_StimulusGrant+' => 'nesnenin yaşam döngüsündeki uyarı yetkileri',
-	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Kullanım profili',
-	'Class:URP_StimulusGrant/Attribute:profile' => 'Profil',
-	'Class:URP_StimulusGrant/Attribute:profile+' => 'Kullanım profili',
-	'Class:URP_StimulusGrant/Attribute:class' => 'Sınıf',
-	'Class:URP_StimulusGrant/Attribute:class+' => 'Hedef sınıf',
-	'Class:URP_StimulusGrant/Attribute:permission' => 'Yetki',
-	'Class:URP_StimulusGrant/Attribute:permission+' => 'yetkili veya yetkisiz?',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'evet',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'evet',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'hayır',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'hayır',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Uyarı',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'uyarı kodu',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'Class:URP_AttributeGrant' => 'özellik yetkisi',
-	'Class:URP_AttributeGrant+' => 'özellik seviyesinde yetki',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'İzin verilen işlem',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'İşlem izni',
-	'Class:URP_AttributeGrant/Attribute:attcode' => 'Özellik',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Özellik kodu',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
-	'BooleanLabel:yes' => 'evet',
-	'BooleanLabel:no' => 'hayır',
-	'Menu:WelcomeMenu' => 'Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => 'iTop\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => 'iTop\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => 'iTop\'a Hoşgeldiniz',
-
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop açık kaynak Bilişim İşlem Potalıdır.</p>
-<ul>Kapsamı:
-<li>Bilişim altyapısının tanımlandığı ve dokümante edildiği Konfigürasyon Yönetimi CMDB (Configuration management database)modülü.</li>
-<li>Bilişim altyapısı ile ilgili tüm olayların takibi.</li>
-<li>Bilişim altyapısının değişim yönetimi.</li>
-<li>Bilinen hatalar bilgi kütüphanesi.</li>
-<li>Planlı kesintilerin kayıt altına alınması ve ilgililerin uyarılması.</li>
-<li>Özet gösterge ekranları</li>
-</ul>
-<p>Tüm modüller bağımsız olarak, adım adım kurulabilir.</p>',
-
-	'UI:WelcomeMenu:RightBlock' => '<p>iTop servis sağlayıcı maktığı ile hazırlanmış olup, birden fazla müşteri ve kuruma kolaylıkla hizmet vermeye imkan sağlar.
-<ul>iTop, zengin iş süreçleri tanımlama imkanıyla:
-<li>Bilişim yönetim etkinliğini</li>
-<li>Operasyon performansını</li>
-<li>Müşteri memnuniyetini ve yönetimin iş performansı hakkında bilgi sahibi olmasını sağlar.</li>
-</ul>
-</p>
-<p>iTop mevcut Bilşim altyapınızla entegre edilmeye açıktır.</p>
-<p>
-<ul>Yeni nesil operasyonel Bilişim portalı :
-<li>Bilişim ortamının daha iyi yönetilmesini.</li>
-<li>ITIL süreçlerinin kendi başınıza uygulanmaya.</li>
-<li>İşletmenin en önemli kaynağı olan dokümantasyonu yönetmesine imkan sağlar.</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => 'Açık istekler: %1$d',
-	'UI:WelcomeMenu:MyCalls' => 'İsteklerim',
-	'UI:WelcomeMenu:OpenIncidents' => 'Açık Arızalar: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => 'Konfigürasyon Kalemleri: %1$d',
-	'UI:WelcomeMenu:MyIncidents' => 'Bana atanan hatalar',
-	'UI:AllOrganizations' => ' Tüm Kurumlar ',
-	'UI:YourSearch' => 'Arama',
-	'UI:LoggedAsMessage' => '%1$s kullanıcısı ile bağlanıldı',
-	'UI:LoggedAsMessage+Admin' => '%1$s (Administrator) kullanıcısı ile bağlanıldı',
-	'UI:Button:Logoff' => 'Çıkış',
-	'UI:Button:GlobalSearch' => 'Arama',
-	'UI:Button:Search' => ' Arama ',
-	'UI:Button:Query' => ' Sorgu ',
-	'UI:Button:Ok' => 'Tamam',
-	'UI:Button:Cancel' => 'İptal',
-	'UI:Button:Apply' => 'Uygula',
-	'UI:Button:Back' => ' << Geri ',
-	'UI:Button:Next' => ' İleri >> ',
-	'UI:Button:Finish' => ' Bitir ',
-	'UI:Button:DoImport' => ' Dışardan Veri alı çalıştır ! ',
-	'UI:Button:Done' => ' Biiti ',
-	'UI:Button:SimulateImport' => ' Veri alışını simule et ',
-	'UI:Button:Test' => 'Test!',
-	'UI:Button:Evaluate' => ' Değerlendir ',
-	'UI:Button:Evaluate:Title' => ' Değerlendir (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' Ekle... ',
-	'UI:Button:BrowseObjects' => ' Listele... ',
-	'UI:Button:Add' => ' Ekle ',
-	'UI:Button:AddToList' => ' << Ekle ',
-	'UI:Button:RemoveFromList' => ' Sil >> ',
-	'UI:Button:FilterList' => ' Filtreleme... ',
-	'UI:Button:Create' => ' Yarat ',
-	'UI:Button:Delete' => ' Sil ! ',
-	'UI:Button:ChangePassword' => ' Şifre değiştir ',
-	'UI:Button:ResetPassword' => ' Şifreyi sıfırla ',
-
-	'UI:SearchToggle' => 'Ara',
-	'UI:ClickToCreateNew' => 'Yeni %1$s yarat',
-	'UI:SearchFor_Class' => '%1$s Arama',
-	'UI:NoObjectToDisplay' => 'Görüntülenecek nesne bulunamadı.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => 'link_attr tanımlandığında object_id alanı zorunludur. Görüntülme (Display) şablonun tanımlamasını kontrol ediniz.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => 'link_attr tanımlandığında target_attr alanı zorunludur. Görüntülme (Display) şablonun tanımlamasını kontrol ediniz.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => 'group_by alanı zorunludur. Görüntülme (Display) şablonun tanımlamasını kontrol ediniz.',
-	'UI:Error:InvalidGroupByFields' => 'group by geçersiz alan listesi: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => 'Hata: blok için desteklenmeyen stil: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Hatalı ilişki tanımı: yönetilecek sınıfa: %1$s ait ilişki anahtarı (an external key) sınıfında %2$s bulunamadı',
-	'UI:Error:Object_Class_Id_NotFound' => 'Nesne: %1$s:%2$d bulunamadı.',
-	'UI:Error:WizardCircularReferenceInDependencies' => 'Hata: Alanlar arasında döngüsel bağımlılık (Circular reference in the dependencies) tespit edildi. Veri modelinizi kontrol ediniz.',
-	'UI:Error:UploadedFileTooBig' => 'Yüklenmek istenen dosya çok büyük. (üst sınır %1$s). PHP configürasyonunu kontrol ediniz (upload_max_filesize ve post_max_size parametrelerini düzenleyiniz).',
-	'UI:Error:UploadedFileTruncated.' => 'Yüklenen dosyanın tamamı yüklenemedi !',
-	'UI:Error:NoTmpDir' => 'Gecici dizi (temporary directory) tanımlı değil.',
-	'UI:Error:CannotWriteToTmp_Dir' => 'Geçici dosya diske yazılamadı. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => 'Dosya yükleme dosya uzantısı nedeniyle duruduruldu. (Dosya adı = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => 'Dosya yükleme bilinmeyen bir sebeple başarısız oldu. (Hata kodu = "%1$s").',
-
-	'UI:Error:1ParametersMissing' => 'Hata: Bu operasyon için %1$s parametresi tanımlanmalı.',
-	'UI:Error:2ParametersMissing' => 'Hata: Bu operasyon için %1$s ve %2$s parametreleri tanımlanmalı.',
-	'UI:Error:3ParametersMissing' => 'Hata: Bu operasyon için %1$s, %2$s ve %3$s parametreleri tanımlanmalı.',
-	'UI:Error:4ParametersMissing' => 'Hata: Bu operasyon için %1$s, %2$s, %3$s ve %4$s parametreleri tanımlanmalı.',
-	'UI:Error:IncorrectOQLQuery_Message' => 'Hata: hatalı OQL sorgusu: %1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Sorgu sırasında hata oluştu: %1$s',
-	'UI:Error:ObjectAlreadyUpdated' => 'Hata: nesne hali hazırda güncellendi.',
-	'UI:Error:ObjectCannotBeUpdated' => 'Hata: nesne güncellenemedi.',
-	'UI:Error:ObjectsAlreadyDeleted' => 'Hata: nesne hali hazırda silinmiş!',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => '%1$s sınıfına ait nesnelerin toplu silimine yetkiniz yok.',
-	'UI:Error:DeleteNotAllowedOn_Class' => '%1$s sınıfına ait nesnelerin silimine yetkiniz yok.',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => '%1$s sınıfına ait nesnelerin toplu güncellenmesine yetkiniz yok.',
-	'UI:Error:ObjectAlreadyCloned' => 'Hata: nesne hali hazırda klonlanmış!',
-	'UI:Error:ObjectAlreadyCreated' => 'Hata: nesne hali hazırda yaratılmış!',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Hata: "%3$s" durumundaki %2$s nesnesi için "%1$s" uyarısı geçersizdir.',
-
-
-	'UI:GroupBy:Count' => 'Say',
-	'UI:GroupBy:Count+' => 'Eleman sayısı',
-	'UI:CountOfObjects' => 'Kritere uyan %1$d nesne bulundu.',
-	'UI_CountOfObjectsShort' => '%1$d nesne.',
-	'UI:NoObject_Class_ToDisplay' => '%1$s nesne listelenecek',
-	'UI:History:LastModified_On_By' => '%1$s tarihinde %2$s tarafından değiştirilmiş.',
-	'UI:HistoryTab' => 'Tarihçe',
-	'UI:NotificationsTab' => 'Uyarılar',
-	'UI:History:Date' => 'Tarih',
-	'UI:History:Date+' => 'Değişiklik tarihi',
-	'UI:History:User' => 'Kullanıcı',
-	'UI:History:User+' => 'Değişikliğ yapan kullanıcı',
-	'UI:History:Changes' => 'Değişiklikler',
-	'UI:History:Changes+' => 'Nesneye yapılan değişiklikler',
-	'UI:Loading' => 'Yükleniyor...',
-	'UI:Menu:Actions' => 'İşlemler',
-	'UI:Menu:OtherActions' => 'Diğer İşlemler',
-	'UI:Menu:New' => 'Yeni...',
-	'UI:Menu:Add' => 'Ekle...',
-	'UI:Menu:Manage' => 'Yönet...',
-	'UI:Menu:EMail' => 'e-posta',
-	'UI:Menu:CSVExport' => 'CSV olarak dışarı ver...',
-	'UI:Menu:Modify' => 'Düzenle...',
-	'UI:Menu:Delete' => 'Sil...',
-	'UI:Menu:Manage' => 'Yönet...',
-	'UI:Menu:BulkDelete' => 'Sil...',
-	'UI:UndefinedObject' => 'tanımsız',
-	'UI:Document:OpenInNewWindow:Download' => 'Yeni pencerede aç: %1$s, Karşıdan yükle: %2$s',
-	'UI:SelectAllToggle+' => 'Tümünü Seç / Tümünü seçme',
-	'UI:TruncatedResults' => '%1$d / %2$d',
-	'UI:DisplayAll' => 'Hepsini göster',
-	'UI:CollapseList' => 'Gizle',
-	'UI:CountOfResults' => '%1$d nesne',
-	'UI:ChangesLogTitle' => 'değişiklik kaydı (%1$d):',
-	'UI:EmptyChangesLogTitle' => 'deiğişiklik kaydı boş',
-	'UI:SearchFor_Class_Objects' => '%1$s nesnelerini ara',
-	'UI:OQLQueryBuilderTitle' => 'OQL Sorgu hazırlama',
-	'UI:OQLQueryTab' => 'OQL Sorgu',
-	'UI:SimpleSearchTab' => 'Basit arama',
-	'UI:Details+' => 'Detaylar',
-	'UI:SearchValue:Any' => '* Herhangi *',
-	'UI:SearchValue:Mixed' => '* karışık *',
-	'UI:SelectOne' => '-- Birini seçiniz --',
-	'UI:Login:Welcome' => 'iTop\'a Hoşgeldiniz!',
-	'UI:Login:IncorrectLoginPassword' => 'Hatalı kullanıcı/şifre tekrar deneyiniz.',
-	'UI:Login:IdentifyYourself' => 'Devam etmeden önce kendinizi tanıtınız',
-	'UI:Login:UserNamePrompt' => 'Kullanıcı Adı',
-	'UI:Login:PasswordPrompt' => 'Şifre',
-	'UI:Login:ChangeYourPassword' => 'Şifre Değiştir',
-	'UI:Login:OldPasswordPrompt' => 'Mevcut şifre',
-	'UI:Login:NewPasswordPrompt' => 'Yeni şifre',
-	'UI:Login:RetypeNewPasswordPrompt' => 'Yeni şifre tekrar',
-	'UI:Login:IncorrectOldPassword' => 'Hata: mevcut şifre hatalı',
-	'UI:LogOffMenu' => 'Çıkış',
-	'UI:LogOff:ThankYou' => 'iTop Kullanıdığınız için teşekkürler',
-	'UI:LogOff:ClickHereToLoginAgain' => 'Tekrar bağlanmak için tıklayınız...',
-	'UI:ChangePwdMenu' => 'Şifre değiştir...',
-	'UI:Login:RetypePwdDoesNotMatch' => 'Yeni şifre eşlenmedi !',
-	'UI:Button:Login' => 'iTop\'a Giriş',
-	'UI:Login:Error:AccessRestricted' => 'iTop erişim sınırlandırıldı. Sistem yöneticisi ile irtibata geçiniz',
-	'UI:Login:Error:AccessAdmin' => 'Erişim sistem yönetci hesaplaları ile mümkün. Sistem yöneticisi ile irtibata geçiniz.',
-	'UI:CSVImport:MappingSelectOne' => '-- Birini seçiniz --',
-	'UI:CSVImport:MappingNotApplicable' => '-- alanı ihmal et --',
-	'UI:CSVImport:NoData' => 'Boş veri seti..., veri giriniz!',
-	'UI:Title:DataPreview' => 'Veri öngörüntüleme',
-	'UI:CSVImport:ErrorOnlyOneColumn' => 'Hata: Veri sadece bir kolon içeriyor. Doğru ayıraç karakteri seçtiniz mi ?',
-	'UI:CSVImport:FieldName' => 'Alan %1$d',
-	'UI:CSVImport:DataLine1' => 'Veri Satırı 1',
-	'UI:CSVImport:DataLine2' => 'Veri Satırı 2',
-	'UI:CSVImport:idField' => 'id (Tekil anahtar)',
-	'UI:Title:BulkImport' => 'iTop - Toplu giriş',
-	'UI:Title:BulkImport+' => 'CSV içeri aktarma aracı',
-	'UI:CSVImport:ClassesSelectOne' => '-- Birini seçiniz --',
-	'UI:CSVImport:ErrorExtendedAttCode' => 'Hata: "%1$s" hatalı kod, çünkü "%2$s" ile "%3$s" tekil ilişkide değil',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d adet nesne değişmeyecek.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d adet nesne değiştirilecek.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d adet nesne eklenecek.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d adet nesnede hata oluştu.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d adet nesne değişmedi.',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d adet nesne güncellendi.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d adet nesne eklendi.',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$d adet nesnede hata tespit edildi.',
-	'UI:Title:CSVImportStep2' => 'Step 2 of 5: CSV veri seçenekleri',
-	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Veri eşleme',
-	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Verinin içeri aktarım simülasyonu',
-	'UI:Title:CSVImportStep5' => 'Step 5 of 5: İçeri aktarım tamamlandı',
-	'UI:CSVImport:LinesNotImported' => 'Satırlar yüklenemedi:',
-	'UI:CSVImport:LinesNotImported+' => 'Aşağıdaki satırlar hata nedeniyle yüklenemedi',
-	'UI:CSVImport:SeparatorComma+' => ', (virgül)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (noktalı virgül)',
-	'UI:CSVImport:SeparatorTab+' => 'tab',
-	'UI:CSVImport:SeparatorOther' => 'diğer:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (çift tırnak)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (tırnak)',
-	'UI:CSVImport:QualifierOther' => 'diğer:',
-	'UI:CSVImport:TreatFirstLineAsHeader' => 'İlk satırı başlık olarak değerlendir(kolon isimleri)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Skip %1$s line(s) at the beginning of the file',
-	'UI:CSVImport:CSVDataPreview' => 'CSV Veri Görüntüleme',
-	'UI:CSVImport:SelectFile' => 'İçeri aktarılacak dosyayı seçiniz:',
-	'UI:CSVImport:Tab:LoadFromFile' => 'Dosyadan oku',
-	'UI:CSVImport:Tab:CopyPaste' => 'Veriyi kopyala yapıştır',
-	'UI:CSVImport:Tab:Templates' => 'Şablonlar',
-	'UI:CSVImport:PasteData' => 'İçeri aktarılacak veriyi yapıştır:',
-	'UI:CSVImport:PickClassForTemplate' => 'İndirilecek şablonu seçiniz: ',
-	'UI:CSVImport:SeparatorCharacter' => 'Ayıraç karakteri:',
-	'UI:CSVImport:TextQualifierCharacter' => 'Metin belirteç karakteri',
-	'UI:CSVImport:CommentsAndHeader' => 'Yorum ve başlık',
-	'UI:CSVImport:SelectClass' => 'İçeri aktarılacak sınıfı seçiniz:',
-	'UI:CSVImport:AdvancedMode' => 'Uzman modu',
-	'UI:CSVImport:AdvancedMode+' => 'Uzman modunda (In advanced mode) "id" (primary key) alanı nesnenin güncellenmesi ve adının değiştirilmesi için kullanılabilir.' .
-									'"id" (mevcut ise) alanı tek sorgu kriteri olarak kullnılabilri ve diğer sorgu kriterleri ile birleştirilmez.',
-	'UI:CSVImport:SelectAClassFirst' => 'Eşlemeyi yapmak için önce sınıfı seçiniz.',
-	'UI:CSVImport:HeaderFields' => 'Alanlar',
-	'UI:CSVImport:HeaderMappings' => 'Eşlemeler',
-	'UI:CSVImport:HeaderSearch' => 'Arama?',
-	'UI:CSVImport:AlertIncompleteMapping' => 'Lütfen tüm alanlar için alan eşlemesini yapınız.',
-	'UI:CSVImport:AlertNoSearchCriteria' => 'Lütfen en az bir sorgu kriteri seçiniz.',
-	'UI:CSVImport:Encoding' => 'Karakter kodlaması',
-	'UI:UniversalSearchTitle' => 'iTop - Genel arama',
-	'UI:UniversalSearch:Error' => 'Hata: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => 'Aranacak sınıfı seçiniz: ',
-
-	'UI:Audit:Title' => 'iTop - CMDB Denetleme',
-	'UI:Audit:InteractiveAudit' => 'Etkileşimli Denetleme',
-	'UI:Audit:HeaderAuditRule' => 'Denetleme Kuralı',
-	'UI:Audit:HeaderNbObjects' => 'Nesne Sayısı',
-	'UI:Audit:HeaderNbErrors' => 'Hata sayısı',
-	'UI:Audit:PercentageOk' => '% Tamam',
-
-	'UI:RunQuery:Title' => 'iTop - OQL Sorgu değerlendirme',
-	'UI:RunQuery:QueryExamples' => 'Sorgu örnekleri',
-	'UI:RunQuery:HeaderPurpose' => 'Amaç',
-	'UI:RunQuery:HeaderPurpose+' => 'Sorgu açıklaması',
-	'UI:RunQuery:HeaderOQLExpression' => 'OQL ifadesi',
-	'UI:RunQuery:HeaderOQLExpression+' => 'OQL yapısında sorgu',
-	'UI:RunQuery:ExpressionToEvaluate' => 'Değerlendirilecek ifade: ',
-	'UI:RunQuery:MoreInfo' => 'Sorgu hakkında detaylı bilgi: ',
-	'UI:RunQuery:DevelopedQuery' => 'Yeniden düzenlenen sorgu: ',
-	'UI:RunQuery:SerializedFilter' => 'Özel filtre: ',
-	'UI:RunQuery:Error' => 'Sorgu sırasında hata oluştu: %1$s',
-
-	'UI:Schema:Title' => 'iTop objects schema',
-	'UI:Schema:CategoryMenuItem' => 'Kategori <b>%1$s</b>',
-	'UI:Schema:Relationships' => 'İlişkiler',
-	'UI:Schema:AbstractClass' => 'Soyut sınıf: bu sınıftan nesne türetilemez.',
-	'UI:Schema:NonAbstractClass' => 'Soyut olmayan sınıf: bu sınıftan nesne türetilebilir.',
-	'UI:Schema:ClassHierarchyTitle' => 'Sınıf ilişkisi',
-	'UI:Schema:AllClasses' => 'Tüm sınıflar',
-	'UI:Schema:ExternalKey_To' => 'Harici anahtar %1$s',
-	'UI:Schema:Columns_Description' => 'Kolonlar: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => 'Öndeğer: "%1$s"',
-	'UI:Schema:NullAllowed' => 'Boş olamaz',
-	'UI:Schema:NullNotAllowed' => 'Boş olabilir',
-	'UI:Schema:Attributes' => 'Özellikler',
-	'UI:Schema:AttributeCode' => 'Özellik kodu',
-	'UI:Schema:AttributeCode+' => 'Özellik için dahili kod',
-	'UI:Schema:Label' => 'Etiket',
-	'UI:Schema:Label+' => 'Özellik etiketi',
-	'UI:Schema:Type' => 'Tip',
-
-	'UI:Schema:Type+' => 'Özellik veri tipi',
-	'UI:Schema:Origin' => 'Kaynak',
-	'UI:Schema:Origin+' => 'Özelliğin tanımlandığı ana sınıf',
-	'UI:Schema:Description' => 'Tanımlama',
-	'UI:Schema:Description+' => 'Özellik tanımı',
-	'UI:Schema:AllowedValues' => 'Alabileceği değerler',
-	'UI:Schema:AllowedValues+' => 'Özelliğin alabileceği değer kısıtları',
-	'UI:Schema:MoreInfo' => 'Daha fazla bilgi',
-	'UI:Schema:MoreInfo+' => 'Veritabanında tanımlı alan için daha fazla bilgi',
-	'UI:Schema:SearchCriteria' => 'Arama kriteri',
-	'UI:Schema:FilterCode' => 'Filtreleme kodu',
-	'UI:Schema:FilterCode+' => 'Arama kriter kodu',
-	'UI:Schema:FilterDescription' => 'Tanımlama',
-	'UI:Schema:FilterDescription+' => 'Arama kiter kodu tanılaması',
-	'UI:Schema:AvailOperators' => 'Kullanılabilir işlemler',
-	'UI:Schema:AvailOperators+' => 'Arama kriteri için kullanılabilir işlemler',
-	'UI:Schema:ChildClasses' => 'Alt sınıflar',
-	'UI:Schema:ReferencingClasses' => 'Refrans sınıflar',
-	'UI:Schema:RelatedClasses' => 'İlgili sınıflar',
-	'UI:Schema:LifeCycle' => 'yaşam döngüsü',
-	'UI:Schema:Triggers' => 'Tetikleyiciler',
-	'UI:Schema:Relation_Code_Description' => 'İlişki <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Aşağı: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Yukarı: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: %2$d seviye öteler, sorgu: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: (%2$d seviye) ötelenmez, sorgu: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s  %2$s\'nın %3$s alanı ile ilişkilendirilmiştir',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s alanı %3$s::<em>%4$s</em> aracılığı %2$s ile ilişkilendirilmiştir',
-	'UI:Schema:Links:1-n' => 'Sınıf bağlantısı %1$s (1:n links):',
-	'UI:Schema:Links:n-n' => 'Sınıf bağlantısı %1$s (n:n links):',
-	'UI:Schema:Links:All' => 'İlişkili sınıfların grafiği',
-	'UI:Schema:NoLifeCyle' => 'Bu sınıf için yaşam döngüsü tanımlanmamış.',
-	'UI:Schema:LifeCycleTransitions' => 'Geçişler',
-	'UI:Schema:LifeCyleAttributeOptions' => 'Özellik seçenekleri',
-	'UI:Schema:LifeCycleHiddenAttribute' => 'Gizli',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Salt okunur',
-	'UI:Schema:LifeCycleMandatoryAttribute' => 'Zorunlu Alan',
-	'UI:Schema:LifeCycleAttributeMustChange' => 'Değiştirilmesi gereken',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Kullanıcıdan değeri değüiştirmesi istenir',
-	'UI:Schema:LifeCycleEmptyList' => 'boş liste',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => 'İlk 3 karakteri giriniz...',
-	'UI:Combo:SelectValue' => '--- değer seçiniz ---',
-	'UI:Label:SelectedObjects' => 'Seçilen nesneler: ',
-	'UI:Label:AvailableObjects' => 'Seçilebilir nesneler: ',
-	'UI:Link_Class_Attributes' => '%1$s özellikler',
-	'UI:SelectAllToggle+' => 'Tümünü seç / Tümünü seçme',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s: %3$s ile ilişkideki %1$s nesnelerini Ekle ',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => '%2$s ile %1$s arasında yeni bağlantı oluştur ',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s: %3$s ile bağlantılı %1$s nesnelerini yönet ',
-	'UI:AddLinkedObjectsOf_Class' => '%1$s nesnelerini ekle...',
-	'UI:RemoveLinkedObjectsOf_Class' => 'Seçili nesnleri sil',
-	'UI:Message:EmptyList:UseAdd' => 'Liste boş, Yeni nesne ekleme için "Yeni..." seçiniz.',
-	'UI:Message:EmptyList:UseSearchForm' => 'Eklemek istediğiniz nesneleri bulmak için yukarıdaki arama formunu kullanınız.',
-
-	'UI:Wizard:FinalStepTitle' => 'Final step: confirmation',
-	'UI:Title:DeletionOf_Object' => '%1$s silimi',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s sınıfına ait çoklu %1$d nesne silimi',
-	'UI:Delete:NotAllowedToDelete' => 'Bu nesneyi silmek için yetkiniz yok',
-	'UI:Delete:NotAllowedToUpdate_Fields' => '%1$s alanlarını güncellemek için yetkiniz yok',
-	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => 'Nesne yetersiz yetki nedeniyle silinemedi',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Bu nesneyi silmek için öncelikli dışarıdan yapılması gereken işlemler var',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
-	'UI:Delete:AutomaticallyDeleted' => 'otomatik olarak silindi',
-	'UI:Delete:AutomaticResetOf_Fields' => '%1$s alanlarını otomatik sıfırla',
-	'UI:Delete:CleaningUpRefencesTo_Object' => '%1$s nesnesine verilen tüm referansları temizle...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s sınıfına ait %1$d nesnesinin tüm referanslarını temizle ...',
-	'UI:Delete:Done+' => 'Ne yapıldı...',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s silindi.',
-	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s\'in silimi',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$s sınıfına ait %1$d nesnelerinin silimi ',
-//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Otomatik silimesini mi istiyorsunuz, ancak buna yetkiniz yok',
-//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Manuel silinmeli - ancak bu nesneyi silmeye yetkiniz yok, lütfen sistem yöneticisiyle irtibata geçiniz.',
-	'UI:Delete:WillBeDeletedAutomatically' => 'Otomatik olarak silinecek',
-	'UI:Delete:MustBeDeletedManually' => 'Manuel silinmeli',
-	'UI:Delete:CannotUpdateBecause_Issue' => 'Otomatik güncellenmeli, ancak: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'otomatik güncellenecek (reset: %1$s)',
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d nesne/ilişki %2$s\'yi referans ediyor',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d silinmek istenen nesne/bağlantıları referans veriyor',
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Veri tabanı doğruluğu(Database integrity) için yeni referans verilmesi engellenmelidir',
-	'UI:Delete:Consequence+' => 'Ne yapılacak',
-	'UI:Delete:SorryDeletionNotAllowed' => 'Bu nesneyi silmeye yetkiniz yok, yukarıdaki açıklamayı bakınız',
-	'UI:Delete:PleaseDoTheManualOperations' => 'Bu nesneyi silmeden önce yukarıdaki işlemleri manuel olarak yapınız',
-	'UI:Delect:Confirm_Object' => '%1$s\'i silmek istediğnizden emin misiniz?',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => '%1$d nesnesini (sınıfı %2$s) silmek istediğinizden emin misiniz?',
-	'UI:WelcomeToITop' => 'iTop\'a Hoşgeldiniz',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s detayları',
-	'UI:ErrorPageTitle' => 'iTop - Hata',
-	'UI:ObjectDoesNotExist' => 'Nesne mevcut değil veya yetkiniz yok.',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'iTop - Arama Sonuçları',
-	'UI:SearchResultsTitle' => 'Arama Sonuçları',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => 'Nothing to search for',
-	'UI:FullTextSearchTitle_Text' => '"%1$s" için arama sonuçları:',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s sınıfına ait %1$d nesne bulundu.',
-	'UI:Search:NoObjectFound' => 'Kayıt bulunamadı.',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modifikasyon',
-	'UI:ModificationTitle_Class_Object' => '%1$s: <span class=\"hilite\">%2$s</span> modifikasyonu',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - %1$s - %2$s modifikasyonunu klonlayınız',
-	'UI:CloneTitle_Class_Object' => '%1$s klonu: <span class=\"hilite\">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'iTop - Yeni %1$s yaratımı',
-	'UI:CreationTitle_Class' => 'Yeni %1$s yarat',
-	'UI:SelectTheTypeOf_Class_ToCreate' => 'Yaratılacak %1$s nesne tipini seçiniz',
-	'UI:Class_Object_NotUpdated' => 'Değişiklik tespit edilemedi, %1$s (%2$s) <strong>güncellenmedi</strong>.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) güncellendi.',
-	'UI:BulkDeletePageTitle' => 'iTop - Toplu silme işlemi',
-	'UI:BulkDeleteTitle' => 'Silmek istediğiniz nesneleri seçiniz:',
-	'UI:PageTitle:ObjectCreated' => 'iTop Nesne yaratıldı.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s yaratıldı.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '%1$s işlemi %2$s durumunda %3$s nesnesine uygulanır. Bir sonraki durum: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => 'Nesne kaydedilemedi: %1$s',
-	'UI:PageTitle:FatalError' => 'iTop - Kritik Hata',
-	'UI:SystemIntrusion' => 'Bu işlem için yetkiniz yok',
-	'UI:FatalErrorMessage' => 'Kritik Hata, iTop devam edemiyor.',
-	'UI:Error_Details' => 'Hata: %1$s.',
-
-	'UI:PageTitle:ClassProjections'	=> 'iTop Kullanıcı Yönetimi - sınıf koruması',
-	'UI:PageTitle:ProfileProjections' => 'iTop Kullanıcı Yönetimi - profil koruması',
-	'UI:UserManagement:Class' => 'Sınıf',
-	'UI:UserManagement:Class+' => 'Nesnin sınıfı',
-	'UI:UserManagement:ProjectedObject' => 'Nesne',
-	'UI:UserManagement:ProjectedObject+' => 'Projected object',
-	'UI:UserManagement:AnyObject' => '* herhangi *',
-	'UI:UserManagement:User' => 'Kullanıcı',
-	'UI:UserManagement:User+' => 'User involved in the projection',
-	'UI:UserManagement:Profile' => 'Profil',
-	'UI:UserManagement:Profile+' => 'Profile in which the projection is specified',
-	'UI:UserManagement:Action:Read' => 'Oku',
-	'UI:UserManagement:Action:Read+' => 'Nesneyi görüntüle',
-	'UI:UserManagement:Action:Modify' => 'Güncelle',
-	'UI:UserManagement:Action:Modify+' => 'Nesneyi yarat/güncelle',
-	'UI:UserManagement:Action:Delete' => 'Sil',
-	'UI:UserManagement:Action:Delete+' => 'Nesneleri sil',
-	'UI:UserManagement:Action:BulkRead' => 'Toplu oku (dışarı aktar)',
-	'UI:UserManagement:Action:BulkRead+' => 'Nesneleri listele veya toplu dışarı aktar',
-	'UI:UserManagement:Action:BulkModify' => 'Toplu güncelleme',
-	'UI:UserManagement:Action:BulkModify+' => 'Toplu yaratma/güncelleme(CSV içeri aktar)',
-	'UI:UserManagement:Action:BulkDelete' => 'Toplu Silim',
-	'UI:UserManagement:Action:BulkDelete+' => 'Nesneleri toplu olarak sil',
-	'UI:UserManagement:Action:Stimuli' => 'Uyarı',
-	'UI:UserManagement:Action:Stimuli+' => 'İzin verilen çoklu işlemler',
-	'UI:UserManagement:Action' => 'İşlem',
-	'UI:UserManagement:Action+' => 'İşlem kullanıcı tarafından yapıldı',
-	'UI:UserManagement:TitleActions' => 'İşlemler',
-	'UI:UserManagement:Permission' => 'Yetki',
-	'UI:UserManagement:Permission+' => 'Kullanıcı yetkileri',
-	'UI:UserManagement:Attributes' => 'Özellikler',
-	'UI:UserManagement:ActionAllowed:Yes' => 'Evet',
-	'UI:UserManagement:ActionAllowed:No' => 'Hayır',
-	'UI:UserManagement:AdminProfile+' => 'Sistem Yöneticisi tüm okuma/yazma işlemleri için yetkilidir.',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => 'Bu nesne için yaşam döngüsü tanımsız',
-	'UI:UserManagement:GrantMatrix' => 'Yetkiler',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s ve %2$s arasındaki ilişki',
-	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s ve %2$s arasındaki ilişki',
-
-	'Menu:AdminTools' => 'Yönetim Araçları', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => 'Yönetim Araçları', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:ChangeManagementMenu' => 'Değişiklik Yönetimi',
-	'UI:ChangeManagementMenu+' => 'Değişiklik Yönetimi',
-	'UI:ChangeManagementMenu:Title' => 'Değişiklik Özeti',
-	'UI-ChangeManagementMenu-ChangesByType' => 'Değişiklik tipine göre',
-	'UI-ChangeManagementMenu-ChangesByStatus' => 'Değişiklik durumuna göre',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'İş grubuna değişiklikler',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Atanmamış Değişiklikler',
-
-	'UI:ConfigurationManagementMenu' => 'Konfigürasyon Yönetimi',
-	'UI:ConfigurationManagementMenu+' => 'Konfigürasyon Yönetimi',
-	'UI:ConfigurationManagementMenu:Title' => 'Altyapı Özeti',
-	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
-
-'UI:ConfigMgmtMenuOverview:Title' => 'Konfigürasyon Yönetimi Gösterge Tablosu',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Durumlarına göre Konfigürasyon Kalemleri(KK)',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Tiplerine göre Konfigürasyon Kalemleri(KK)',
-
-'UI:RequestMgmtMenuOverview:Title' => 'Çağrı Yönetimi Gösterge Tablosu',
-'UI-RequestManagementOverview-RequestByService' => 'Hizmetlere göre çağrılar',
-'UI-RequestManagementOverview-RequestByPriority' => 'Önceliklere göre çağrılar',
-'UI-RequestManagementOverview-RequestUnassigned' => 'Henüz atanmamış çağrılar',
-
-'UI:IncidentMgmtMenuOverview:Title' => 'Arıza Gösterge Tablosu',
-'UI-IncidentManagementOverview-IncidentByService' => 'Servislere göre arızalar',
-'UI-IncidentManagementOverview-IncidentByPriority' => 'Önceliklere göre arızalar',
-'UI-IncidentManagementOverview-IncidentUnassigned' => 'Henüz atanmamış arızalar',
-
-'UI:ChangeMgmtMenuOverview:Title' => 'Değişiklik Yönetimi Gösterge Tablosu',
-'UI-ChangeManagementOverview-ChangeByType' => 'Tiplerine göre değişiklikler',
-'UI-ChangeManagementOverview-ChangeUnassigned' => 'Henüz atanmamış değişiklikler',
-'UI-ChangeManagementOverview-ChangeWithOutage' => 'Değişiklik nedeniyle devre dışı',
-
-'UI:ServiceMgmtMenuOverview:Title' => 'Hizmet Yönetimi Gösterge Tablosu',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => '30 gün içinde biten Müşteri Sözleşmeleri',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => '30 gün içinde biten Tedarikçi Sözleşmeleri',
-
-	'UI:ContactsMenu' => 'İrtibatlar',
-	'UI:ContactsMenu+' => 'İrtibatlar',
-	'UI:ContactsMenu:Title' => 'İrtibatlar Özetleri',
-	'UI-ContactsMenu-ContactsByLocation' => 'Yerleşkeye göre irtibatlar',
-	'UI-ContactsMenu-ContactsByType' => 'Tipine göre irtibatlar',
-	'UI-ContactsMenu-ContactsByStatus' => 'Durumuna göre irtibatlar',
-
-	'Menu:CSVImportMenu' => 'CSV dışardan al', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataModelMenu' => 'Veri Modeli', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => 'Veri Modeli Özeti', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ExportMenu' => 'Dışarı ver', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:NotificationsMenu' => 'Uyarılar', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:NotificationsMenu:Title' => '<span class="hilite">Uyarıların</span> yapılandırılması',
-	'UI:NotificationsMenu:Help' => 'Yardım',
-	'UI:NotificationsMenu:HelpContent' => '<p>In iTop uyarı mekanizması ihtiyaca göre uyarlanabilir. Uyarılar iki tip nesne üzerine kurulmuştur: <i>tetikleme (triggers) ve işlemler (actions)</i>.</p>
-<p><i><b>Triggers</b></i> uyarının ne zaman yapılacağını belirler. 3 tip tetikleme vardır ve nesnenin 3 durumuna ilişkilendirilmiştir:
-<ol>
-	<li>the "OnCreate" tetikleme nesne yaratıldığı zaman çalışır</li>
-	<li>the "OnStateEnter" tetikleme nesne belli bir duruma girişinde  çalışır</li>
-	<li>the "OnStateLeave" tetikleme nesne belli bir durumdan çıkışında  çalışır</li>
-</ol>
-</p>
-<p>
-<i><b>Actions</b></i> tetikleme olduğunda yapılacak işlemleri belirler. Şimdilik sadece e-posta gönderme işlemi yapılabilmektedir.
-E-posta için şablon tanımlanabilmektedir. Şablona parametreler girilebilmektedir (recipients, importance, etc.).
-</p>
-<p>Özel sayfa: <a href="../setup/email.test.php" target="_blank">email.test.php</a> PHP e-posta konfigürnunu test ediniz.</p>
-<p>İşlemin gerçekleşmesi için bir tetikleme ile ilişkilendirilmesi gerekir.
-Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçekleştirilir.</p>',
-	'UI:NotificationsMenu:Triggers' => 'Tetikleyiciler',
-	'UI:NotificationsMenu:AvailableTriggers' => 'Kullanılabilir tetikleyiciler',
-	'UI:NotificationsMenu:OnCreate' => 'Nesne yaratıldığında',
-	'UI:NotificationsMenu:OnStateEnter' => 'Nesnenin durumuna girişinde',
-	'UI:NotificationsMenu:OnStateLeave' => 'Nesnenin durumdan çıkışında',
-	'UI:NotificationsMenu:Actions' => 'İşlemler',
-	'UI:NotificationsMenu:AvailableActions' => 'Kullanılabilir işlemler',
-
-	'Menu:AuditCategories' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:RunQueriesMenu' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:DataAdministration' => 'Veri Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => 'Veri Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UniversalSearchMenu' => 'Genel sorgu', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:iTopVersion:Short' => '%1$s versiyonu %2$s',
-	'UI:iTopVersion:Long' => '%1$s  %4$s tarihli versiyonu %2$s-%3$s',
-	'UI:PropertiesTab' => 'Özellikler',
-
-	'UI:OpenDocumentInNewWindow_' => 'Dokümanı yeni pencerede aç: %1$s',
-	'UI:DownloadDocument_' => 'Dokümanı indir: %1$s',
-	'UI:Document:NoPreview' => 'Bu tip doküman için öngösterim mevcut değil',
-
-	'UI:DeadlineMissedBy_duration' => '%1$s ile kaçırıldı',
-	'UI:Deadline_LessThan1Min' => '< 1 dk.',
-	'UI:Deadline_Minutes' => '%1$d dk.',
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$ddk',
-	'UI:Deadline_Days_Hours_Minutes' => '%1$d gün %2$d saat %3$d dk',
-	'UI:Help' => 'Yardım',
-	'UI:PasswordConfirm' => '(Onay)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Yeni %1$s nesneleri eklemeden önce bu nesneyi kaydediniz.',
-	'UI:DisplayThisMessageAtStartup' => 'Bu mesajı başlangıçta göster',
-	'UI:RelationshipGraph' => 'Grafiksel gösterim',
-	'UI:RelationshipList' => 'List',
-
-	'Portal:Title' => 'iTop Kullanıcı Portalı',
-	'Portal:Refresh' => 'Yenile',
-	'Portal:Back' => 'Geri',
-	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
-	'Portal:ShowOngoing' => 'Show open requests',
-	'Portal:ShowClosed' => 'Show closed requests',
-	'Portal:CreateNewRequest' => 'Yeni istek yarat',
-	'Portal:CreateNewRequestItil' => 'Yeni istek yarat',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => 'Şifre değiştir',
-	'Portal:Disconnect' => 'Çıkış',
-	'Portal:OpenRequests' => 'Açık isteklerim',
-	'Portal:ClosedRequests'  => 'My closed requests',
-	'Portal:ResolvedRequests'  => 'Çözdüğüm istekler',
-	'Portal:SelectService' => 'Kataloğdan servis seçiniz:',
-	'Portal:PleaseSelectOneService' => 'Sevis seçiniz',
-	'Portal:SelectSubcategoryFrom_Service' => '%1$s servis için alt kategorsi seçiniz:',
-	'Portal:PleaseSelectAServiceSubCategory' => 'Alt kategori seçiniz',
-	'Portal:DescriptionOfTheRequest' => 'İstek tanımlaması:',
-	'Portal:TitleRequestDetailsFor_Request' => 'İsteğin detayı %1$s:',
-	'Portal:NoOpenRequest' => 'Bu kategoride istek yok.',
-	'Portal:NoClosedRequest' => 'Bu kategoride istek yok.',
-	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
-	'Portal:Button:CloseTicket' => 'Çağrıyı kapat',
-	'Portal:Button:UpdateRequest' => 'Update the request',
-	'Portal:EnterYourCommentsOnTicket' => 'İsteğin çözümüne yönelik açıklamalar:',
-	'Portal:ErrorNoContactForThisUser' => 'Hata: mevcut kullanıcının irtibat bilgisi yok. Sistem yöneticisi ile irtibata geçiniz.',
-
-	'Enum:Undefined' => 'Tanımsız',
-	'UI:Button:Refresh' => 'Yenile',
-	'Class:Query' => 'Query~~',
-	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
-	'Class:Query/Attribute:name' => 'Name~~',
-	'Class:Query/Attribute:name+' => 'Identifies the query~~',
-	'Class:Query/Attribute:description' => 'Description~~',
-	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
-	'Class:Query/Attribute:fields' => 'Fields~~',
-	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
-	'Class:QueryOQL' => 'OQL Query~~',
-	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
-	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:Button:Save' => 'Save~~',
-	'UI:Button:Restart' => ' |<< Restart ~~',
-	'UI:Button:Rename' => ' Rename... ~~',
-	'UI:History:BulkImports' => 'History~~',
-	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
-	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
-	'UI:History:StatsCreations' => 'Created~~',
-	'UI:History:StatsCreations+' => 'Count of objects created~~',
-	'UI:History:StatsModifs' => 'Modified~~',
-	'UI:History:StatsModifs+' => 'Count of objects modified~~',
-	'UI:History:StatsDeletes' => 'Deleted~~',
-	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
-	'UI:SplitDateTime-Date' => 'date~~',
-	'UI:SplitDateTime-Time' => 'time~~',
-	'UI:SearchValue:NbSelected' => '# selected~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
-	'UI:AccessRO-All' => 'iTop is read-only~~',
-	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:CSVReport-Value-Modified' => 'Modified~~',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match~~',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
-	'UI:CSVReport-Row-Created' => 'created~~',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
-	'UI:CSVReport-Icon-Modified' => 'Modified~~',
-	'UI:CSVReport-Icon-Missing' => 'Missing~~',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
-	'UI:CSVReport-Icon-Created' => 'Created~~',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
-	'UI:CSVReport-Object-Created' => 'Object created~~',
-	'UI:CSVReport-Icon-Error' => 'Error~~',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
-	'UI:CSVExport:LostChars' => 'Encoding issue~~',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Edit:TestQuery' => 'Test query~~',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
-	'UI:Delete:Deleted' => 'deleted~~',
-	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'Menu:QueryMenu' => 'Query phrasebook~~',
-	'Menu:QueryMenu+' => 'Query phrasebook~~',
-	'UI:Download-CSV' => 'Download %1$s~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:OperationCancelled' => 'Operation Cancelled~~',
-	'UI:ElementsDisplayed' => 'Filtering~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
-	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
-	'Portal:Attachments' => 'Attachments~~',
-	'Portal:AddAttachment' => ' Add Attachment ~~',
-	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
-	'UI:ModifyAllPageTitle' => 'Modify All~~',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
-	'UI:Menu:ModifyAll' => 'Modify...~~',
-	'UI:Button:ModifyAll' => 'Modify All~~',
-	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
-	'UI:ModifiedObject' => 'Object Modified~~',
-	'UI:BulkModifyStatus' => 'Operation~~',
-	'UI:BulkModifyStatus+' => 'Status of the operation~~',
-	'UI:BulkModifyErrors' => 'Errors (if any)~~',
-	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
-	'UI:BulkModifyStatusOk' => 'Ok~~',
-	'UI:BulkModifyStatusError' => 'Error~~',
-	'UI:BulkModifyStatusModified' => 'Modified~~',
-	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
-	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
-	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
-	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
-	'UI:CaseLog:InitialValue' => 'Initial value:~~',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.~~',
-	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.~~',
-	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation~~',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.~~',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
-	'UI:Pagination:PageSize' => '%1$s objects per page~~',
-	'UI:Pagination:PagesLabel' => 'Pages:~~',
-	'UI:Pagination:All' => 'All~~',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
-	'UI:Preferences' => 'Preferences...~~',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
-	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
-	'UI:FavoriteOtherSettings' => 'Other Settings~~',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
-	'UI:ConfigureThisList' => 'Configure This List...~~',
-	'UI:ListConfigurationTitle' => 'List Configuration~~',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
-	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
-	'UI:UseSavetheSettings' => 'Save the Settings~~',
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
-	'UI:Dashboard:Edit' => 'Edit This Page...~~',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
-	'UI:ExportDashBoard' => 'Export to a file~~',
-	'UI:ImportDashBoard' => 'Import from a file...~~',
-	'UI:ImportDashboardTitle' => 'Import From a File~~',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
-	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'UI:DashboardEdit:Layout' => 'Layout~~',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-	'UI:Form:Property' => 'Property~~',
-	'UI:Form:Value' => 'Value~~',
-	'UI:DashletPlainText:Label' => 'Text~~',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
-	'UI:DashletPlainText:Prop-Text' => 'Text~~',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-	'UI:DashletObjectList:Label' => 'Object list~~',
-	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
-	'UI:DashletObjectList:Prop-Title' => 'Title~~',
-	'UI:DashletObjectList:Prop-Query' => 'Query~~',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
-	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
-	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-	'UI:DashletHeaderStatic:Label' => 'Header~~',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-	'UI:DashletBadge:Label' => 'Badge~~',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
-	'UI:DashletBadge:Prop-Class' => 'Class~~',
-	'DayOfWeek-Sunday' => 'Sunday~~',
-	'DayOfWeek-Monday' => 'Monday~~',
-	'DayOfWeek-Tuesday' => 'Tuesday~~',
-	'DayOfWeek-Wednesday' => 'Wednesday~~',
-	'DayOfWeek-Thursday' => 'Thursday~~',
-	'DayOfWeek-Friday' => 'Friday~~',
-	'DayOfWeek-Saturday' => 'Saturday~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'My Shortcuts~~',
-	'Class:Shortcut' => 'Shortcut~~',
-	'Class:Shortcut/Attribute:name' => 'Name~~',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
-	'Class:ShortcutOQL' => 'Search result shortcut~~',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Izzet Sirin <izzet.sirin@htr.com.tr>
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:AuditCategory' => 'Denetleme Kategorisi',
+	'Class:AuditCategory+' => 'Denetlemedeki kategori',
+	'Class:AuditCategory/Attribute:name' => 'Kategori Adı',
+	'Class:AuditCategory/Attribute:name+' => 'Kategornin kısa adı',
+	'Class:AuditCategory/Attribute:description' => 'Kategori tanımlaması',
+	'Class:AuditCategory/Attribute:description+' => 'Kategori tanımlaması',
+	'Class:AuditCategory/Attribute:definition_set' => 'Tanımlama seti',
+	'Class:AuditCategory/Attribute:definition_set+' => 'Denetlenecek nesneler için OQL ifadesi',
+	'Class:AuditCategory/Attribute:rules_list' => 'Denetlem kuralları',
+	'Class:AuditCategory/Attribute:rules_list+' => 'Kategori için denetleme kuralları',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:AuditRule' => 'Denetleme Kuralı',
+	'Class:AuditRule+' => 'Denetleme Kategorisi kuralı',
+	'Class:AuditRule/Attribute:name' => 'Kural Adı',
+	'Class:AuditRule/Attribute:name+' => 'Kural Adı',
+	'Class:AuditRule/Attribute:description' => 'Kural tanımlaması',
+	'Class:AuditRule/Attribute:description+' => 'Kural tanımlaması',
+	'Class:AuditRule/Attribute:query' => 'Çalıştırılacak Sorgu',
+	'Class:AuditRule/Attribute:query+' => 'Çalıştırılcak OQL ifadesi',
+	'Class:AuditRule/Attribute:valid_flag' => 'Geçerli nesneler?',
+	'Class:AuditRule/Attribute:valid_flag+' => 'Kural geçerli nesne döndürüse doğru, diğer durumda yanlış',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'doğru',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'doğru',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'yanlış',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'yanlış',
+	'Class:AuditRule/Attribute:category_id' => 'Kategori',
+	'Class:AuditRule/Attribute:category_id+' => 'Kuralın kategorisi',
+	'Class:AuditRule/Attribute:category_name' => 'Kategori',
+	'Class:AuditRule/Attribute:category_name+' => 'Kural için kategori adı',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:User' => 'Kullanıcı',
+	'Class:User+' => 'Kullanıcı',
+	'Class:User/Attribute:finalclass' => 'Hesap tipi',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => 'İrtibat (kişi)',
+	'Class:User/Attribute:contactid+' => 'İrtibat detayları',
+	'Class:User/Attribute:last_name' => 'Soyadı',
+	'Class:User/Attribute:last_name+' => 'İrtibatın soyadı',
+	'Class:User/Attribute:first_name' => 'Adı',
+	'Class:User/Attribute:first_name+' => 'İrtibatın adı',
+	'Class:User/Attribute:email' => 'E-posta',
+	'Class:User/Attribute:email+' => 'Kişinin e-posta adresi',
+	'Class:User/Attribute:login' => 'Kullanıcı adı',
+	'Class:User/Attribute:login+' => 'Kullanıcı adı',
+	'Class:User/Attribute:language' => 'Dil',
+	'Class:User/Attribute:language+' => 'Dil',
+	'Class:User/Attribute:language/Value:EN US' => 'English',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => 'French',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:language/Value:TR TR' => 'Turkish',
+	'Class:User/Attribute:language/Value:TR TR+' => 'Turkish (Turkey)',
+	'Class:User/Attribute:profile_list' => 'Profiller',
+	'Class:User/Attribute:profile_list+' => 'Kullanıcı rolü',
+	'Class:User/Attribute:allowed_org_list' => 'Erişim yetkisi verilen kurumlar',
+	'Class:User/Attribute:allowed_org_list+' => 'Kullanıcın erişime yetkili olduğu kurumlar. Kurum tanımlanmaz ise sınırlama olmaz.',
+
+	'Class:User/Error:LoginMustBeUnique' => 'Kullanıcı adı tekil olmalı - "%1s" mevcut bir kullanıcıya ait.',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => 'En az bir profil kullanıcıya atanmalı',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_Profiles' => 'Profil',
+	'Class:URP_Profiles+' => 'Kullanıcı profili',
+	'Class:URP_Profiles/Attribute:name' => 'Adı',
+	'Class:URP_Profiles/Attribute:name+' => 'Profil adı',
+	'Class:URP_Profiles/Attribute:description' => 'Tanımlama',
+	'Class:URP_Profiles/Attribute:description+' => 'Profil tanımlama',
+	'Class:URP_Profiles/Attribute:user_list' => 'Kullanıcılar',
+	'Class:URP_Profiles/Attribute:user_list+' => 'bu rolü kullanan kullanıcılar',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_Dimensions' => 'boyut',
+	'Class:URP_Dimensions+' => 'uygulama boyutları (silo kullanımları)',
+	'Class:URP_Dimensions/Attribute:name' => 'Adı',
+	'Class:URP_Dimensions/Attribute:name+' => 'Boyut adı',
+	'Class:URP_Dimensions/Attribute:description' => 'Tanımlama',
+	'Class:URP_Dimensions/Attribute:description+' => 'Tanımlama',
+	'Class:URP_Dimensions/Attribute:type' => 'Tip',
+	'Class:URP_Dimensions/Attribute:type+' => 'sınıf adı veya veri tipi (projection unit)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_UserProfile' => 'Kullanıcı Profili',
+	'Class:URP_UserProfile+' => 'Kullanıcı Profili',
+	'Class:URP_UserProfile/Attribute:userid' => 'Kullanıcı',
+	'Class:URP_UserProfile/Attribute:userid+' => 'Kullanıcı hesabı',
+	'Class:URP_UserProfile/Attribute:userlogin' => 'Kullanıcı adı',
+	'Class:URP_UserProfile/Attribute:userlogin+' => 'Kullanıcı hesabı',
+	'Class:URP_UserProfile/Attribute:profileid' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profileid+' => 'Kullanıcı profili',
+	'Class:URP_UserProfile/Attribute:profile' => 'Profil',
+	'Class:URP_UserProfile/Attribute:profile+' => 'Profil adı',
+	'Class:URP_UserProfile/Attribute:reason' => 'Sebep',
+	'Class:URP_UserProfile/Attribute:reason+' => 'Kullanıcının bu rolü alma sebebini açıklayınız',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_UserOrg' => 'Kullanıcı Kurumu',
+	'Class:URP_UserOrg+' => 'İzin verilen kurumlar',
+	'Class:URP_UserOrg/Attribute:userid' => 'Kullanıcı',
+	'Class:URP_UserOrg/Attribute:userid+' => 'Kullanıcı hesabı',
+	'Class:URP_UserOrg/Attribute:userlogin' => 'Kullanıcı',
+	'Class:URP_UserOrg/Attribute:userlogin+' => 'Kullanıcı hesabı',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => 'Kurum',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => 'Erişim yetkisi kurumlar',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => 'Kurumu',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => 'Erişim yetkisi verilen kurumlar',
+	'Class:URP_UserOrg/Attribute:reason' => 'Sebep',
+	'Class:URP_UserOrg/Attribute:reason+' => 'Kullanıcının bu rolü alma sebebini açıklayınız',
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_ProfileProjection' => 'profile_projection',
+	'Class:URP_ProfileProjection+' => 'profile projections',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => 'Boyut',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => 'uygulama boyutu',
+	'Class:URP_ProfileProjection/Attribute:dimension' => 'Boyut',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => 'uygulama boyutu',
+	'Class:URP_ProfileProjection/Attribute:profileid' => 'Profil',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => 'profil kullanımı',
+	'Class:URP_ProfileProjection/Attribute:profile' => 'Profil',
+	'Class:URP_ProfileProjection/Attribute:profile+' => 'Profil adı',
+	'Class:URP_ProfileProjection/Attribute:value' => 'Değer ifadesi',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL ifadesi (kullanıcı $user) | sabit |  | +özellik kodu',
+	'Class:URP_ProfileProjection/Attribute:attribute' => 'Attribute',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => 'Hedef özellik kodu (opsiyonel)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_ClassProjection' => 'sınıf projeksiyonu',
+	'Class:URP_ClassProjection+' => 'sınıf projeksiyonu',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => 'Boyut',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => 'uygulama boyutu',
+	'Class:URP_ClassProjection/Attribute:dimension' => 'Boyut',
+	'Class:URP_ClassProjection/Attribute:dimension+' => 'uygulama boyutu',
+	'Class:URP_ClassProjection/Attribute:class' => 'Sınıf',
+	'Class:URP_ClassProjection/Attribute:class+' => 'Hedef sınıf',
+	'Class:URP_ClassProjection/Attribute:value' => 'Değer ifadesi',
+	'Class:URP_ClassProjection/Attribute:value+' => 'OQL ifadesi (kullanıcı $user) | sabit |  | +özellik kodu',
+	'Class:URP_ClassProjection/Attribute:attribute' => 'Özellik',
+	'Class:URP_ClassProjection/Attribute:attribute+' => 'Hedef özellik kodu (opsiyonel)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_ActionGrant' => 'işlem yetkileri',
+	'Class:URP_ActionGrant+' => 'sınıf üzerindeki yetkiler',
+	'Class:URP_ActionGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profileid+' => 'Kullanım profili',
+	'Class:URP_ActionGrant/Attribute:profile' => 'Profil',
+	'Class:URP_ActionGrant/Attribute:profile+' => 'Kullanım profili',
+	'Class:URP_ActionGrant/Attribute:class' => 'Sınıf',
+	'Class:URP_ActionGrant/Attribute:class+' => 'Hedef sınıf',
+	'Class:URP_ActionGrant/Attribute:permission' => 'Erişim yetkisi',
+	'Class:URP_ActionGrant/Attribute:permission+' => 'yetkili veya yetkisiz?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => 'evet',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => 'evet',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => 'hayır',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => 'hayır',
+	'Class:URP_ActionGrant/Attribute:action' => 'İşlem',
+	'Class:URP_ActionGrant/Attribute:action+' => 'verilen sınıf üzerinde uygulanacak işlemler',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_StimulusGrant' => 'uyarı yetkileri',
+	'Class:URP_StimulusGrant+' => 'nesnenin yaşam döngüsündeki uyarı yetkileri',
+	'Class:URP_StimulusGrant/Attribute:profileid' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => 'Kullanım profili',
+	'Class:URP_StimulusGrant/Attribute:profile' => 'Profil',
+	'Class:URP_StimulusGrant/Attribute:profile+' => 'Kullanım profili',
+	'Class:URP_StimulusGrant/Attribute:class' => 'Sınıf',
+	'Class:URP_StimulusGrant/Attribute:class+' => 'Hedef sınıf',
+	'Class:URP_StimulusGrant/Attribute:permission' => 'Yetki',
+	'Class:URP_StimulusGrant/Attribute:permission+' => 'yetkili veya yetkisiz?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => 'evet',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => 'evet',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => 'hayır',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => 'hayır',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => 'Uyarı',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => 'uyarı kodu',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'Class:URP_AttributeGrant' => 'özellik yetkisi',
+	'Class:URP_AttributeGrant+' => 'özellik seviyesinde yetki',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => 'İzin verilen işlem',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => 'İşlem izni',
+	'Class:URP_AttributeGrant/Attribute:attcode' => 'Özellik',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => 'Özellik kodu',
+));
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
+	'BooleanLabel:yes' => 'evet',
+	'BooleanLabel:no' => 'hayır',
+	'Menu:WelcomeMenu' => 'Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => 'iTop\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => 'Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => 'iTop\'a Hoşgeldiniz', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => 'iTop\'a Hoşgeldiniz',
+
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop açık kaynak Bilişim İşlem Potalıdır.</p>
+<ul>Kapsamı:
+<li>Bilişim altyapısının tanımlandığı ve dokümante edildiği Konfigürasyon Yönetimi CMDB (Configuration management database)modülü.</li>
+<li>Bilişim altyapısı ile ilgili tüm olayların takibi.</li>
+<li>Bilişim altyapısının değişim yönetimi.</li>
+<li>Bilinen hatalar bilgi kütüphanesi.</li>
+<li>Planlı kesintilerin kayıt altına alınması ve ilgililerin uyarılması.</li>
+<li>Özet gösterge ekranları</li>
+</ul>
+<p>Tüm modüller bağımsız olarak, adım adım kurulabilir.</p>',
+
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop servis sağlayıcı maktığı ile hazırlanmış olup, birden fazla müşteri ve kuruma kolaylıkla hizmet vermeye imkan sağlar.
+<ul>iTop, zengin iş süreçleri tanımlama imkanıyla:
+<li>Bilişim yönetim etkinliğini</li>
+<li>Operasyon performansını</li>
+<li>Müşteri memnuniyetini ve yönetimin iş performansı hakkında bilgi sahibi olmasını sağlar.</li>
+</ul>
+</p>
+<p>iTop mevcut Bilşim altyapınızla entegre edilmeye açıktır.</p>
+<p>
+<ul>Yeni nesil operasyonel Bilişim portalı :
+<li>Bilişim ortamının daha iyi yönetilmesini.</li>
+<li>ITIL süreçlerinin kendi başınıza uygulanmaya.</li>
+<li>İşletmenin en önemli kaynağı olan dokümantasyonu yönetmesine imkan sağlar.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => 'Açık istekler: %1$d',
+	'UI:WelcomeMenu:MyCalls' => 'İsteklerim',
+	'UI:WelcomeMenu:OpenIncidents' => 'Açık Arızalar: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => 'Konfigürasyon Kalemleri: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => 'Bana atanan hatalar',
+	'UI:AllOrganizations' => ' Tüm Kurumlar ',
+	'UI:YourSearch' => 'Arama',
+	'UI:LoggedAsMessage' => '%1$s kullanıcısı ile bağlanıldı',
+	'UI:LoggedAsMessage+Admin' => '%1$s (Administrator) kullanıcısı ile bağlanıldı',
+	'UI:Button:Logoff' => 'Çıkış',
+	'UI:Button:GlobalSearch' => 'Arama',
+	'UI:Button:Search' => ' Arama ',
+	'UI:Button:Query' => ' Sorgu ',
+	'UI:Button:Ok' => 'Tamam',
+	'UI:Button:Cancel' => 'İptal',
+	'UI:Button:Apply' => 'Uygula',
+	'UI:Button:Back' => ' << Geri ',
+	'UI:Button:Next' => ' İleri >> ',
+	'UI:Button:Finish' => ' Bitir ',
+	'UI:Button:DoImport' => ' Dışardan Veri alı çalıştır ! ',
+	'UI:Button:Done' => ' Biiti ',
+	'UI:Button:SimulateImport' => ' Veri alışını simule et ',
+	'UI:Button:Test' => 'Test!',
+	'UI:Button:Evaluate' => ' Değerlendir ',
+	'UI:Button:Evaluate:Title' => ' Değerlendir (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' Ekle... ',
+	'UI:Button:BrowseObjects' => ' Listele... ',
+	'UI:Button:Add' => ' Ekle ',
+	'UI:Button:AddToList' => ' << Ekle ',
+	'UI:Button:RemoveFromList' => ' Sil >> ',
+	'UI:Button:FilterList' => ' Filtreleme... ',
+	'UI:Button:Create' => ' Yarat ',
+	'UI:Button:Delete' => ' Sil ! ',
+	'UI:Button:ChangePassword' => ' Şifre değiştir ',
+	'UI:Button:ResetPassword' => ' Şifreyi sıfırla ',
+
+	'UI:SearchToggle' => 'Ara',
+	'UI:ClickToCreateNew' => 'Yeni %1$s yarat',
+	'UI:SearchFor_Class' => '%1$s Arama',
+	'UI:NoObjectToDisplay' => 'Görüntülenecek nesne bulunamadı.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => 'link_attr tanımlandığında object_id alanı zorunludur. Görüntülme (Display) şablonun tanımlamasını kontrol ediniz.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => 'link_attr tanımlandığında target_attr alanı zorunludur. Görüntülme (Display) şablonun tanımlamasını kontrol ediniz.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => 'group_by alanı zorunludur. Görüntülme (Display) şablonun tanımlamasını kontrol ediniz.',
+	'UI:Error:InvalidGroupByFields' => 'group by geçersiz alan listesi: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => 'Hata: blok için desteklenmeyen stil: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => 'Hatalı ilişki tanımı: yönetilecek sınıfa: %1$s ait ilişki anahtarı (an external key) sınıfında %2$s bulunamadı',
+	'UI:Error:Object_Class_Id_NotFound' => 'Nesne: %1$s:%2$d bulunamadı.',
+	'UI:Error:WizardCircularReferenceInDependencies' => 'Hata: Alanlar arasında döngüsel bağımlılık (Circular reference in the dependencies) tespit edildi. Veri modelinizi kontrol ediniz.',
+	'UI:Error:UploadedFileTooBig' => 'Yüklenmek istenen dosya çok büyük. (üst sınır %1$s). PHP configürasyonunu kontrol ediniz (upload_max_filesize ve post_max_size parametrelerini düzenleyiniz).',
+	'UI:Error:UploadedFileTruncated.' => 'Yüklenen dosyanın tamamı yüklenemedi !',
+	'UI:Error:NoTmpDir' => 'Gecici dizi (temporary directory) tanımlı değil.',
+	'UI:Error:CannotWriteToTmp_Dir' => 'Geçici dosya diske yazılamadı. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => 'Dosya yükleme dosya uzantısı nedeniyle duruduruldu. (Dosya adı = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => 'Dosya yükleme bilinmeyen bir sebeple başarısız oldu. (Hata kodu = "%1$s").',
+
+	'UI:Error:1ParametersMissing' => 'Hata: Bu operasyon için %1$s parametresi tanımlanmalı.',
+	'UI:Error:2ParametersMissing' => 'Hata: Bu operasyon için %1$s ve %2$s parametreleri tanımlanmalı.',
+	'UI:Error:3ParametersMissing' => 'Hata: Bu operasyon için %1$s, %2$s ve %3$s parametreleri tanımlanmalı.',
+	'UI:Error:4ParametersMissing' => 'Hata: Bu operasyon için %1$s, %2$s, %3$s ve %4$s parametreleri tanımlanmalı.',
+	'UI:Error:IncorrectOQLQuery_Message' => 'Hata: hatalı OQL sorgusu: %1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => 'Sorgu sırasında hata oluştu: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => 'Hata: nesne hali hazırda güncellendi.',
+	'UI:Error:ObjectCannotBeUpdated' => 'Hata: nesne güncellenemedi.',
+	'UI:Error:ObjectsAlreadyDeleted' => 'Hata: nesne hali hazırda silinmiş!',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => '%1$s sınıfına ait nesnelerin toplu silimine yetkiniz yok.',
+	'UI:Error:DeleteNotAllowedOn_Class' => '%1$s sınıfına ait nesnelerin silimine yetkiniz yok.',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => '%1$s sınıfına ait nesnelerin toplu güncellenmesine yetkiniz yok.',
+	'UI:Error:ObjectAlreadyCloned' => 'Hata: nesne hali hazırda klonlanmış!',
+	'UI:Error:ObjectAlreadyCreated' => 'Hata: nesne hali hazırda yaratılmış!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => 'Hata: "%3$s" durumundaki %2$s nesnesi için "%1$s" uyarısı geçersizdir.',
+
+
+	'UI:GroupBy:Count' => 'Say',
+	'UI:GroupBy:Count+' => 'Eleman sayısı',
+	'UI:CountOfObjects' => 'Kritere uyan %1$d nesne bulundu.',
+	'UI_CountOfObjectsShort' => '%1$d nesne.',
+	'UI:NoObject_Class_ToDisplay' => '%1$s nesne listelenecek',
+	'UI:History:LastModified_On_By' => '%1$s tarihinde %2$s tarafından değiştirilmiş.',
+	'UI:HistoryTab' => 'Tarihçe',
+	'UI:NotificationsTab' => 'Uyarılar',
+	'UI:History:Date' => 'Tarih',
+	'UI:History:Date+' => 'Değişiklik tarihi',
+	'UI:History:User' => 'Kullanıcı',
+	'UI:History:User+' => 'Değişikliğ yapan kullanıcı',
+	'UI:History:Changes' => 'Değişiklikler',
+	'UI:History:Changes+' => 'Nesneye yapılan değişiklikler',
+	'UI:Loading' => 'Yükleniyor...',
+	'UI:Menu:Actions' => 'İşlemler',
+	'UI:Menu:OtherActions' => 'Diğer İşlemler',
+	'UI:Menu:New' => 'Yeni...',
+	'UI:Menu:Add' => 'Ekle...',
+	'UI:Menu:Manage' => 'Yönet...',
+	'UI:Menu:EMail' => 'e-posta',
+	'UI:Menu:CSVExport' => 'CSV olarak dışarı ver...',
+	'UI:Menu:Modify' => 'Düzenle...',
+	'UI:Menu:Delete' => 'Sil...',
+	'UI:Menu:Manage' => 'Yönet...',
+	'UI:Menu:BulkDelete' => 'Sil...',
+	'UI:UndefinedObject' => 'tanımsız',
+	'UI:Document:OpenInNewWindow:Download' => 'Yeni pencerede aç: %1$s, Karşıdan yükle: %2$s',
+	'UI:SelectAllToggle+' => 'Tümünü Seç / Tümünü seçme',
+	'UI:TruncatedResults' => '%1$d / %2$d',
+	'UI:DisplayAll' => 'Hepsini göster',
+	'UI:CollapseList' => 'Gizle',
+	'UI:CountOfResults' => '%1$d nesne',
+	'UI:ChangesLogTitle' => 'değişiklik kaydı (%1$d):',
+	'UI:EmptyChangesLogTitle' => 'deiğişiklik kaydı boş',
+	'UI:SearchFor_Class_Objects' => '%1$s nesnelerini ara',
+	'UI:OQLQueryBuilderTitle' => 'OQL Sorgu hazırlama',
+	'UI:OQLQueryTab' => 'OQL Sorgu',
+	'UI:SimpleSearchTab' => 'Basit arama',
+	'UI:Details+' => 'Detaylar',
+	'UI:SearchValue:Any' => '* Herhangi *',
+	'UI:SearchValue:Mixed' => '* karışık *',
+	'UI:SelectOne' => '-- Birini seçiniz --',
+	'UI:Login:Welcome' => 'iTop\'a Hoşgeldiniz!',
+	'UI:Login:IncorrectLoginPassword' => 'Hatalı kullanıcı/şifre tekrar deneyiniz.',
+	'UI:Login:IdentifyYourself' => 'Devam etmeden önce kendinizi tanıtınız',
+	'UI:Login:UserNamePrompt' => 'Kullanıcı Adı',
+	'UI:Login:PasswordPrompt' => 'Şifre',
+	'UI:Login:ChangeYourPassword' => 'Şifre Değiştir',
+	'UI:Login:OldPasswordPrompt' => 'Mevcut şifre',
+	'UI:Login:NewPasswordPrompt' => 'Yeni şifre',
+	'UI:Login:RetypeNewPasswordPrompt' => 'Yeni şifre tekrar',
+	'UI:Login:IncorrectOldPassword' => 'Hata: mevcut şifre hatalı',
+	'UI:LogOffMenu' => 'Çıkış',
+	'UI:LogOff:ThankYou' => 'iTop Kullanıdığınız için teşekkürler',
+	'UI:LogOff:ClickHereToLoginAgain' => 'Tekrar bağlanmak için tıklayınız...',
+	'UI:ChangePwdMenu' => 'Şifre değiştir...',
+	'UI:Login:RetypePwdDoesNotMatch' => 'Yeni şifre eşlenmedi !',
+	'UI:Button:Login' => 'iTop\'a Giriş',
+	'UI:Login:Error:AccessRestricted' => 'iTop erişim sınırlandırıldı. Sistem yöneticisi ile irtibata geçiniz',
+	'UI:Login:Error:AccessAdmin' => 'Erişim sistem yönetci hesaplaları ile mümkün. Sistem yöneticisi ile irtibata geçiniz.',
+	'UI:CSVImport:MappingSelectOne' => '-- Birini seçiniz --',
+	'UI:CSVImport:MappingNotApplicable' => '-- alanı ihmal et --',
+	'UI:CSVImport:NoData' => 'Boş veri seti..., veri giriniz!',
+	'UI:Title:DataPreview' => 'Veri öngörüntüleme',
+	'UI:CSVImport:ErrorOnlyOneColumn' => 'Hata: Veri sadece bir kolon içeriyor. Doğru ayıraç karakteri seçtiniz mi ?',
+	'UI:CSVImport:FieldName' => 'Alan %1$d',
+	'UI:CSVImport:DataLine1' => 'Veri Satırı 1',
+	'UI:CSVImport:DataLine2' => 'Veri Satırı 2',
+	'UI:CSVImport:idField' => 'id (Tekil anahtar)',
+	'UI:Title:BulkImport' => 'iTop - Toplu giriş',
+	'UI:Title:BulkImport+' => 'CSV içeri aktarma aracı',
+	'UI:CSVImport:ClassesSelectOne' => '-- Birini seçiniz --',
+	'UI:CSVImport:ErrorExtendedAttCode' => 'Hata: "%1$s" hatalı kod, çünkü "%2$s" ile "%3$s" tekil ilişkide değil',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d adet nesne değişmeyecek.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d adet nesne değiştirilecek.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d adet nesne eklenecek.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d adet nesnede hata oluştu.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d adet nesne değişmedi.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d adet nesne güncellendi.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d adet nesne eklendi.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d adet nesnede hata tespit edildi.',
+	'UI:Title:CSVImportStep2' => 'Step 2 of 5: CSV veri seçenekleri',
+	'UI:Title:CSVImportStep3' => 'Step 3 of 5: Veri eşleme',
+	'UI:Title:CSVImportStep4' => 'Step 4 of 5: Verinin içeri aktarım simülasyonu',
+	'UI:Title:CSVImportStep5' => 'Step 5 of 5: İçeri aktarım tamamlandı',
+	'UI:CSVImport:LinesNotImported' => 'Satırlar yüklenemedi:',
+	'UI:CSVImport:LinesNotImported+' => 'Aşağıdaki satırlar hata nedeniyle yüklenemedi',
+	'UI:CSVImport:SeparatorComma+' => ', (virgül)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (noktalı virgül)',
+	'UI:CSVImport:SeparatorTab+' => 'tab',
+	'UI:CSVImport:SeparatorOther' => 'diğer:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (çift tırnak)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (tırnak)',
+	'UI:CSVImport:QualifierOther' => 'diğer:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => 'İlk satırı başlık olarak değerlendir(kolon isimleri)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => 'Skip %1$s line(s) at the beginning of the file',
+	'UI:CSVImport:CSVDataPreview' => 'CSV Veri Görüntüleme',
+	'UI:CSVImport:SelectFile' => 'İçeri aktarılacak dosyayı seçiniz:',
+	'UI:CSVImport:Tab:LoadFromFile' => 'Dosyadan oku',
+	'UI:CSVImport:Tab:CopyPaste' => 'Veriyi kopyala yapıştır',
+	'UI:CSVImport:Tab:Templates' => 'Şablonlar',
+	'UI:CSVImport:PasteData' => 'İçeri aktarılacak veriyi yapıştır:',
+	'UI:CSVImport:PickClassForTemplate' => 'İndirilecek şablonu seçiniz: ',
+	'UI:CSVImport:SeparatorCharacter' => 'Ayıraç karakteri:',
+	'UI:CSVImport:TextQualifierCharacter' => 'Metin belirteç karakteri',
+	'UI:CSVImport:CommentsAndHeader' => 'Yorum ve başlık',
+	'UI:CSVImport:SelectClass' => 'İçeri aktarılacak sınıfı seçiniz:',
+	'UI:CSVImport:AdvancedMode' => 'Uzman modu',
+	'UI:CSVImport:AdvancedMode+' => 'Uzman modunda (In advanced mode) "id" (primary key) alanı nesnenin güncellenmesi ve adının değiştirilmesi için kullanılabilir.' .
+									'"id" (mevcut ise) alanı tek sorgu kriteri olarak kullnılabilri ve diğer sorgu kriterleri ile birleştirilmez.',
+	'UI:CSVImport:SelectAClassFirst' => 'Eşlemeyi yapmak için önce sınıfı seçiniz.',
+	'UI:CSVImport:HeaderFields' => 'Alanlar',
+	'UI:CSVImport:HeaderMappings' => 'Eşlemeler',
+	'UI:CSVImport:HeaderSearch' => 'Arama?',
+	'UI:CSVImport:AlertIncompleteMapping' => 'Lütfen tüm alanlar için alan eşlemesini yapınız.',
+	'UI:CSVImport:AlertNoSearchCriteria' => 'Lütfen en az bir sorgu kriteri seçiniz.',
+	'UI:CSVImport:Encoding' => 'Karakter kodlaması',
+	'UI:UniversalSearchTitle' => 'iTop - Genel arama',
+	'UI:UniversalSearch:Error' => 'Hata: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => 'Aranacak sınıfı seçiniz: ',
+
+	'UI:Audit:Title' => 'iTop - CMDB Denetleme',
+	'UI:Audit:InteractiveAudit' => 'Etkileşimli Denetleme',
+	'UI:Audit:HeaderAuditRule' => 'Denetleme Kuralı',
+	'UI:Audit:HeaderNbObjects' => 'Nesne Sayısı',
+	'UI:Audit:HeaderNbErrors' => 'Hata sayısı',
+	'UI:Audit:PercentageOk' => '% Tamam',
+
+	'UI:RunQuery:Title' => 'iTop - OQL Sorgu değerlendirme',
+	'UI:RunQuery:QueryExamples' => 'Sorgu örnekleri',
+	'UI:RunQuery:HeaderPurpose' => 'Amaç',
+	'UI:RunQuery:HeaderPurpose+' => 'Sorgu açıklaması',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL ifadesi',
+	'UI:RunQuery:HeaderOQLExpression+' => 'OQL yapısında sorgu',
+	'UI:RunQuery:ExpressionToEvaluate' => 'Değerlendirilecek ifade: ',
+	'UI:RunQuery:MoreInfo' => 'Sorgu hakkında detaylı bilgi: ',
+	'UI:RunQuery:DevelopedQuery' => 'Yeniden düzenlenen sorgu: ',
+	'UI:RunQuery:SerializedFilter' => 'Özel filtre: ',
+	'UI:RunQuery:Error' => 'Sorgu sırasında hata oluştu: %1$s',
+
+	'UI:Schema:Title' => 'iTop objects schema',
+	'UI:Schema:CategoryMenuItem' => 'Kategori <b>%1$s</b>',
+	'UI:Schema:Relationships' => 'İlişkiler',
+	'UI:Schema:AbstractClass' => 'Soyut sınıf: bu sınıftan nesne türetilemez.',
+	'UI:Schema:NonAbstractClass' => 'Soyut olmayan sınıf: bu sınıftan nesne türetilebilir.',
+	'UI:Schema:ClassHierarchyTitle' => 'Sınıf ilişkisi',
+	'UI:Schema:AllClasses' => 'Tüm sınıflar',
+	'UI:Schema:ExternalKey_To' => 'Harici anahtar %1$s',
+	'UI:Schema:Columns_Description' => 'Kolonlar: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => 'Öndeğer: "%1$s"',
+	'UI:Schema:NullAllowed' => 'Boş olamaz',
+	'UI:Schema:NullNotAllowed' => 'Boş olabilir',
+	'UI:Schema:Attributes' => 'Özellikler',
+	'UI:Schema:AttributeCode' => 'Özellik kodu',
+	'UI:Schema:AttributeCode+' => 'Özellik için dahili kod',
+	'UI:Schema:Label' => 'Etiket',
+	'UI:Schema:Label+' => 'Özellik etiketi',
+	'UI:Schema:Type' => 'Tip',
+
+	'UI:Schema:Type+' => 'Özellik veri tipi',
+	'UI:Schema:Origin' => 'Kaynak',
+	'UI:Schema:Origin+' => 'Özelliğin tanımlandığı ana sınıf',
+	'UI:Schema:Description' => 'Tanımlama',
+	'UI:Schema:Description+' => 'Özellik tanımı',
+	'UI:Schema:AllowedValues' => 'Alabileceği değerler',
+	'UI:Schema:AllowedValues+' => 'Özelliğin alabileceği değer kısıtları',
+	'UI:Schema:MoreInfo' => 'Daha fazla bilgi',
+	'UI:Schema:MoreInfo+' => 'Veritabanında tanımlı alan için daha fazla bilgi',
+	'UI:Schema:SearchCriteria' => 'Arama kriteri',
+	'UI:Schema:FilterCode' => 'Filtreleme kodu',
+	'UI:Schema:FilterCode+' => 'Arama kriter kodu',
+	'UI:Schema:FilterDescription' => 'Tanımlama',
+	'UI:Schema:FilterDescription+' => 'Arama kiter kodu tanılaması',
+	'UI:Schema:AvailOperators' => 'Kullanılabilir işlemler',
+	'UI:Schema:AvailOperators+' => 'Arama kriteri için kullanılabilir işlemler',
+	'UI:Schema:ChildClasses' => 'Alt sınıflar',
+	'UI:Schema:ReferencingClasses' => 'Refrans sınıflar',
+	'UI:Schema:RelatedClasses' => 'İlgili sınıflar',
+	'UI:Schema:LifeCycle' => 'yaşam döngüsü',
+	'UI:Schema:Triggers' => 'Tetikleyiciler',
+	'UI:Schema:Relation_Code_Description' => 'İlişki <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Aşağı: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Yukarı: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: %2$d seviye öteler, sorgu: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: (%2$d seviye) ötelenmez, sorgu: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s  %2$s\'nın %3$s alanı ile ilişkilendirilmiştir',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s alanı %3$s::<em>%4$s</em> aracılığı %2$s ile ilişkilendirilmiştir',
+	'UI:Schema:Links:1-n' => 'Sınıf bağlantısı %1$s (1:n links):',
+	'UI:Schema:Links:n-n' => 'Sınıf bağlantısı %1$s (n:n links):',
+	'UI:Schema:Links:All' => 'İlişkili sınıfların grafiği',
+	'UI:Schema:NoLifeCyle' => 'Bu sınıf için yaşam döngüsü tanımlanmamış.',
+	'UI:Schema:LifeCycleTransitions' => 'Geçişler',
+	'UI:Schema:LifeCyleAttributeOptions' => 'Özellik seçenekleri',
+	'UI:Schema:LifeCycleHiddenAttribute' => 'Gizli',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => 'Salt okunur',
+	'UI:Schema:LifeCycleMandatoryAttribute' => 'Zorunlu Alan',
+	'UI:Schema:LifeCycleAttributeMustChange' => 'Değiştirilmesi gereken',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => 'Kullanıcıdan değeri değüiştirmesi istenir',
+	'UI:Schema:LifeCycleEmptyList' => 'boş liste',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => 'İlk 3 karakteri giriniz...',
+	'UI:Combo:SelectValue' => '--- değer seçiniz ---',
+	'UI:Label:SelectedObjects' => 'Seçilen nesneler: ',
+	'UI:Label:AvailableObjects' => 'Seçilebilir nesneler: ',
+	'UI:Link_Class_Attributes' => '%1$s özellikler',
+	'UI:SelectAllToggle+' => 'Tümünü seç / Tümünü seçme',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s: %3$s ile ilişkideki %1$s nesnelerini Ekle ',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => '%2$s ile %1$s arasında yeni bağlantı oluştur ',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '%2$s: %3$s ile bağlantılı %1$s nesnelerini yönet ',
+	'UI:AddLinkedObjectsOf_Class' => '%1$s nesnelerini ekle...',
+	'UI:RemoveLinkedObjectsOf_Class' => 'Seçili nesnleri sil',
+	'UI:Message:EmptyList:UseAdd' => 'Liste boş, Yeni nesne ekleme için "Yeni..." seçiniz.',
+	'UI:Message:EmptyList:UseSearchForm' => 'Eklemek istediğiniz nesneleri bulmak için yukarıdaki arama formunu kullanınız.',
+
+	'UI:Wizard:FinalStepTitle' => 'Final step: confirmation',
+	'UI:Title:DeletionOf_Object' => '%1$s silimi',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '%2$s sınıfına ait çoklu %1$d nesne silimi',
+	'UI:Delete:NotAllowedToDelete' => 'Bu nesneyi silmek için yetkiniz yok',
+	'UI:Delete:NotAllowedToUpdate_Fields' => '%1$s alanlarını güncellemek için yetkiniz yok',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => 'Nesne yetersiz yetki nedeniyle silinemedi',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => 'Bu nesneyi silmek için öncelikli dışarıdan yapılması gereken işlemler var',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
+	'UI:Delete:AutomaticallyDeleted' => 'otomatik olarak silindi',
+	'UI:Delete:AutomaticResetOf_Fields' => '%1$s alanlarını otomatik sıfırla',
+	'UI:Delete:CleaningUpRefencesTo_Object' => '%1$s nesnesine verilen tüm referansları temizle...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '%2$s sınıfına ait %1$d nesnesinin tüm referanslarını temizle ...',
+	'UI:Delete:Done+' => 'Ne yapıldı...',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s silindi.',
+	'UI:Delete:ConfirmDeletionOf_Name' => '%1$s\'in silimi',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '%2$s sınıfına ait %1$d nesnelerinin silimi ',
+//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Otomatik silimesini mi istiyorsunuz, ancak buna yetkiniz yok',
+//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Manuel silinmeli - ancak bu nesneyi silmeye yetkiniz yok, lütfen sistem yöneticisiyle irtibata geçiniz.',
+	'UI:Delete:WillBeDeletedAutomatically' => 'Otomatik olarak silinecek',
+	'UI:Delete:MustBeDeletedManually' => 'Manuel silinmeli',
+	'UI:Delete:CannotUpdateBecause_Issue' => 'Otomatik güncellenmeli, ancak: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => 'otomatik güncellenecek (reset: %1$s)',
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d nesne/ilişki %2$s\'yi referans ediyor',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d silinmek istenen nesne/bağlantıları referans veriyor',
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => 'Veri tabanı doğruluğu(Database integrity) için yeni referans verilmesi engellenmelidir',
+	'UI:Delete:Consequence+' => 'Ne yapılacak',
+	'UI:Delete:SorryDeletionNotAllowed' => 'Bu nesneyi silmeye yetkiniz yok, yukarıdaki açıklamayı bakınız',
+	'UI:Delete:PleaseDoTheManualOperations' => 'Bu nesneyi silmeden önce yukarıdaki işlemleri manuel olarak yapınız',
+	'UI:Delect:Confirm_Object' => '%1$s\'i silmek istediğnizden emin misiniz?',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => '%1$d nesnesini (sınıfı %2$s) silmek istediğinizden emin misiniz?',
+	'UI:WelcomeToITop' => 'iTop\'a Hoşgeldiniz',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s detayları',
+	'UI:ErrorPageTitle' => 'iTop - Hata',
+	'UI:ObjectDoesNotExist' => 'Nesne mevcut değil veya yetkiniz yok.',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'iTop - Arama Sonuçları',
+	'UI:SearchResultsTitle' => 'Arama Sonuçları',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => 'Nothing to search for',
+	'UI:FullTextSearchTitle_Text' => '"%1$s" için arama sonuçları:',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '%2$s sınıfına ait %1$d nesne bulundu.',
+	'UI:Search:NoObjectFound' => 'Kayıt bulunamadı.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s modifikasyon',
+	'UI:ModificationTitle_Class_Object' => '%1$s: <span class=\"hilite\">%2$s</span> modifikasyonu',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - %1$s - %2$s modifikasyonunu klonlayınız',
+	'UI:CloneTitle_Class_Object' => '%1$s klonu: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - Yeni %1$s yaratımı',
+	'UI:CreationTitle_Class' => 'Yeni %1$s yarat',
+	'UI:SelectTheTypeOf_Class_ToCreate' => 'Yaratılacak %1$s nesne tipini seçiniz',
+	'UI:Class_Object_NotUpdated' => 'Değişiklik tespit edilemedi, %1$s (%2$s) <strong>güncellenmedi</strong>.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) güncellendi.',
+	'UI:BulkDeletePageTitle' => 'iTop - Toplu silme işlemi',
+	'UI:BulkDeleteTitle' => 'Silmek istediğiniz nesneleri seçiniz:',
+	'UI:PageTitle:ObjectCreated' => 'iTop Nesne yaratıldı.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s yaratıldı.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '%1$s işlemi %2$s durumunda %3$s nesnesine uygulanır. Bir sonraki durum: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => 'Nesne kaydedilemedi: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - Kritik Hata',
+	'UI:SystemIntrusion' => 'Bu işlem için yetkiniz yok',
+	'UI:FatalErrorMessage' => 'Kritik Hata, iTop devam edemiyor.',
+	'UI:Error_Details' => 'Hata: %1$s.',
+
+	'UI:PageTitle:ClassProjections'	=> 'iTop Kullanıcı Yönetimi - sınıf koruması',
+	'UI:PageTitle:ProfileProjections' => 'iTop Kullanıcı Yönetimi - profil koruması',
+	'UI:UserManagement:Class' => 'Sınıf',
+	'UI:UserManagement:Class+' => 'Nesnin sınıfı',
+	'UI:UserManagement:ProjectedObject' => 'Nesne',
+	'UI:UserManagement:ProjectedObject+' => 'Projected object',
+	'UI:UserManagement:AnyObject' => '* herhangi *',
+	'UI:UserManagement:User' => 'Kullanıcı',
+	'UI:UserManagement:User+' => 'User involved in the projection',
+	'UI:UserManagement:Profile' => 'Profil',
+	'UI:UserManagement:Profile+' => 'Profile in which the projection is specified',
+	'UI:UserManagement:Action:Read' => 'Oku',
+	'UI:UserManagement:Action:Read+' => 'Nesneyi görüntüle',
+	'UI:UserManagement:Action:Modify' => 'Güncelle',
+	'UI:UserManagement:Action:Modify+' => 'Nesneyi yarat/güncelle',
+	'UI:UserManagement:Action:Delete' => 'Sil',
+	'UI:UserManagement:Action:Delete+' => 'Nesneleri sil',
+	'UI:UserManagement:Action:BulkRead' => 'Toplu oku (dışarı aktar)',
+	'UI:UserManagement:Action:BulkRead+' => 'Nesneleri listele veya toplu dışarı aktar',
+	'UI:UserManagement:Action:BulkModify' => 'Toplu güncelleme',
+	'UI:UserManagement:Action:BulkModify+' => 'Toplu yaratma/güncelleme(CSV içeri aktar)',
+	'UI:UserManagement:Action:BulkDelete' => 'Toplu Silim',
+	'UI:UserManagement:Action:BulkDelete+' => 'Nesneleri toplu olarak sil',
+	'UI:UserManagement:Action:Stimuli' => 'Uyarı',
+	'UI:UserManagement:Action:Stimuli+' => 'İzin verilen çoklu işlemler',
+	'UI:UserManagement:Action' => 'İşlem',
+	'UI:UserManagement:Action+' => 'İşlem kullanıcı tarafından yapıldı',
+	'UI:UserManagement:TitleActions' => 'İşlemler',
+	'UI:UserManagement:Permission' => 'Yetki',
+	'UI:UserManagement:Permission+' => 'Kullanıcı yetkileri',
+	'UI:UserManagement:Attributes' => 'Özellikler',
+	'UI:UserManagement:ActionAllowed:Yes' => 'Evet',
+	'UI:UserManagement:ActionAllowed:No' => 'Hayır',
+	'UI:UserManagement:AdminProfile+' => 'Sistem Yöneticisi tüm okuma/yazma işlemleri için yetkilidir.',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => 'Bu nesne için yaşam döngüsü tanımsız',
+	'UI:UserManagement:GrantMatrix' => 'Yetkiler',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => '%1$s ve %2$s arasındaki ilişki',
+	'UI:UserManagement:LinkBetween_User_And_Org' => '%1$s ve %2$s arasındaki ilişki',
+
+	'Menu:AdminTools' => 'Yönetim Araçları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => 'Yönetim Araçları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => 'Yönetici profiline izin verilen araçlar', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:ChangeManagementMenu' => 'Değişiklik Yönetimi',
+	'UI:ChangeManagementMenu+' => 'Değişiklik Yönetimi',
+	'UI:ChangeManagementMenu:Title' => 'Değişiklik Özeti',
+	'UI-ChangeManagementMenu-ChangesByType' => 'Değişiklik tipine göre',
+	'UI-ChangeManagementMenu-ChangesByStatus' => 'Değişiklik durumuna göre',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => 'İş grubuna değişiklikler',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => 'Atanmamış Değişiklikler',
+
+	'UI:ConfigurationManagementMenu' => 'Konfigürasyon Yönetimi',
+	'UI:ConfigurationManagementMenu+' => 'Konfigürasyon Yönetimi',
+	'UI:ConfigurationManagementMenu:Title' => 'Altyapı Özeti',
+	'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status',
+
+'UI:ConfigMgmtMenuOverview:Title' => 'Konfigürasyon Yönetimi Gösterge Tablosu',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Durumlarına göre Konfigürasyon Kalemleri(KK)',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Tiplerine göre Konfigürasyon Kalemleri(KK)',
+
+'UI:RequestMgmtMenuOverview:Title' => 'Çağrı Yönetimi Gösterge Tablosu',
+'UI-RequestManagementOverview-RequestByService' => 'Hizmetlere göre çağrılar',
+'UI-RequestManagementOverview-RequestByPriority' => 'Önceliklere göre çağrılar',
+'UI-RequestManagementOverview-RequestUnassigned' => 'Henüz atanmamış çağrılar',
+
+'UI:IncidentMgmtMenuOverview:Title' => 'Arıza Gösterge Tablosu',
+'UI-IncidentManagementOverview-IncidentByService' => 'Servislere göre arızalar',
+'UI-IncidentManagementOverview-IncidentByPriority' => 'Önceliklere göre arızalar',
+'UI-IncidentManagementOverview-IncidentUnassigned' => 'Henüz atanmamış arızalar',
+
+'UI:ChangeMgmtMenuOverview:Title' => 'Değişiklik Yönetimi Gösterge Tablosu',
+'UI-ChangeManagementOverview-ChangeByType' => 'Tiplerine göre değişiklikler',
+'UI-ChangeManagementOverview-ChangeUnassigned' => 'Henüz atanmamış değişiklikler',
+'UI-ChangeManagementOverview-ChangeWithOutage' => 'Değişiklik nedeniyle devre dışı',
+
+'UI:ServiceMgmtMenuOverview:Title' => 'Hizmet Yönetimi Gösterge Tablosu',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => '30 gün içinde biten Müşteri Sözleşmeleri',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => '30 gün içinde biten Tedarikçi Sözleşmeleri',
+
+	'UI:ContactsMenu' => 'İrtibatlar',
+	'UI:ContactsMenu+' => 'İrtibatlar',
+	'UI:ContactsMenu:Title' => 'İrtibatlar Özetleri',
+	'UI-ContactsMenu-ContactsByLocation' => 'Yerleşkeye göre irtibatlar',
+	'UI-ContactsMenu-ContactsByType' => 'Tipine göre irtibatlar',
+	'UI-ContactsMenu-ContactsByStatus' => 'Durumuna göre irtibatlar',
+
+	'Menu:CSVImportMenu' => 'CSV dışardan al', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => 'Çoklu yaratım veya güncelleme', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:DataModelMenu' => 'Veri Modeli', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => 'Veri Modeli Özeti', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:ExportMenu' => 'Dışarı ver', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => 'Sorgu sonucunu HTML, CSV veya XML olarak dışarı aktar', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:NotificationsMenu' => 'Uyarılar', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => 'Uyarıların yapılandırılması', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:NotificationsMenu:Title' => '<span class="hilite">Uyarıların</span> yapılandırılması',
+	'UI:NotificationsMenu:Help' => 'Yardım',
+	'UI:NotificationsMenu:HelpContent' => '<p>In iTop uyarı mekanizması ihtiyaca göre uyarlanabilir. Uyarılar iki tip nesne üzerine kurulmuştur: <i>tetikleme (triggers) ve işlemler (actions)</i>.</p>
+<p><i><b>Triggers</b></i> uyarının ne zaman yapılacağını belirler. 3 tip tetikleme vardır ve nesnenin 3 durumuna ilişkilendirilmiştir:
+<ol>
+	<li>the "OnCreate" tetikleme nesne yaratıldığı zaman çalışır</li>
+	<li>the "OnStateEnter" tetikleme nesne belli bir duruma girişinde  çalışır</li>
+	<li>the "OnStateLeave" tetikleme nesne belli bir durumdan çıkışında  çalışır</li>
+</ol>
+</p>
+<p>
+<i><b>Actions</b></i> tetikleme olduğunda yapılacak işlemleri belirler. Şimdilik sadece e-posta gönderme işlemi yapılabilmektedir.
+E-posta için şablon tanımlanabilmektedir. Şablona parametreler girilebilmektedir (recipients, importance, etc.).
+</p>
+<p>Özel sayfa: <a href="../setup/email.test.php" target="_blank">email.test.php</a> PHP e-posta konfigürnunu test ediniz.</p>
+<p>İşlemin gerçekleşmesi için bir tetikleme ile ilişkilendirilmesi gerekir.
+Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçekleştirilir.</p>',
+	'UI:NotificationsMenu:Triggers' => 'Tetikleyiciler',
+	'UI:NotificationsMenu:AvailableTriggers' => 'Kullanılabilir tetikleyiciler',
+	'UI:NotificationsMenu:OnCreate' => 'Nesne yaratıldığında',
+	'UI:NotificationsMenu:OnStateEnter' => 'Nesnenin durumuna girişinde',
+	'UI:NotificationsMenu:OnStateLeave' => 'Nesnenin durumdan çıkışında',
+	'UI:NotificationsMenu:Actions' => 'İşlemler',
+	'UI:NotificationsMenu:AvailableActions' => 'Kullanılabilir işlemler',
+
+	'Menu:AuditCategories' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => 'Denetleme Kategorileri', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:RunQueriesMenu' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => 'Sorgu çalıştır', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:DataAdministration' => 'Veri Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => 'Veri Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:UniversalSearchMenu' => 'Genel sorgu', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => 'Herhangi bir arama...', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:UserManagementMenu' => 'Kullanıcı Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => 'Kullanıcı Yönetimi', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:ProfilesMenu' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => 'Profiller', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:UserAccountsMenu' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu+' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu:Title' => 'Kullanıcı Hesapları', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:iTopVersion:Short' => '%1$s versiyonu %2$s',
+	'UI:iTopVersion:Long' => '%1$s  %4$s tarihli versiyonu %2$s-%3$s',
+	'UI:PropertiesTab' => 'Özellikler',
+
+	'UI:OpenDocumentInNewWindow_' => 'Dokümanı yeni pencerede aç: %1$s',
+	'UI:DownloadDocument_' => 'Dokümanı indir: %1$s',
+	'UI:Document:NoPreview' => 'Bu tip doküman için öngösterim mevcut değil',
+
+	'UI:DeadlineMissedBy_duration' => '%1$s ile kaçırıldı',
+	'UI:Deadline_LessThan1Min' => '< 1 dk.',
+	'UI:Deadline_Minutes' => '%1$d dk.',
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$ddk',
+	'UI:Deadline_Days_Hours_Minutes' => '%1$d gün %2$d saat %3$d dk',
+	'UI:Help' => 'Yardım',
+	'UI:PasswordConfirm' => '(Onay)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => 'Yeni %1$s nesneleri eklemeden önce bu nesneyi kaydediniz.',
+	'UI:DisplayThisMessageAtStartup' => 'Bu mesajı başlangıçta göster',
+	'UI:RelationshipGraph' => 'Grafiksel gösterim',
+	'UI:RelationshipList' => 'List',
+
+	'Portal:Title' => 'iTop Kullanıcı Portalı',
+	'Portal:Refresh' => 'Yenile',
+	'Portal:Back' => 'Geri',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => 'Yeni istek yarat',
+	'Portal:CreateNewRequestItil' => 'Yeni istek yarat',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => 'Şifre değiştir',
+	'Portal:Disconnect' => 'Çıkış',
+	'Portal:OpenRequests' => 'Açık isteklerim',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests'  => 'Çözdüğüm istekler',
+	'Portal:SelectService' => 'Kataloğdan servis seçiniz:',
+	'Portal:PleaseSelectOneService' => 'Sevis seçiniz',
+	'Portal:SelectSubcategoryFrom_Service' => '%1$s servis için alt kategorsi seçiniz:',
+	'Portal:PleaseSelectAServiceSubCategory' => 'Alt kategori seçiniz',
+	'Portal:DescriptionOfTheRequest' => 'İstek tanımlaması:',
+	'Portal:TitleRequestDetailsFor_Request' => 'İsteğin detayı %1$s:',
+	'Portal:NoOpenRequest' => 'Bu kategoride istek yok.',
+	'Portal:NoClosedRequest' => 'Bu kategoride istek yok.',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket',
+	'Portal:Button:CloseTicket' => 'Çağrıyı kapat',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => 'İsteğin çözümüne yönelik açıklamalar:',
+	'Portal:ErrorNoContactForThisUser' => 'Hata: mevcut kullanıcının irtibat bilgisi yok. Sistem yöneticisi ile irtibata geçiniz.',
+
+	'Enum:Undefined' => 'Tanımsız',
+	'UI:Button:Refresh' => 'Yenile',
+	'Class:Query' => 'Query~~',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
+	'Class:Query/Attribute:name' => 'Name~~',
+	'Class:Query/Attribute:name+' => 'Identifies the query~~',
+	'Class:Query/Attribute:description' => 'Description~~',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
+	'Class:Query/Attribute:fields' => 'Fields~~',
+	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
+	'Class:QueryOQL' => 'OQL Query~~',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
+	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:Button:Save' => 'Save~~',
+	'UI:Button:Restart' => ' |<< Restart ~~',
+	'UI:Button:Rename' => ' Rename... ~~',
+	'UI:History:BulkImports' => 'History~~',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
+	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
+	'UI:History:StatsCreations' => 'Created~~',
+	'UI:History:StatsCreations+' => 'Count of objects created~~',
+	'UI:History:StatsModifs' => 'Modified~~',
+	'UI:History:StatsModifs+' => 'Count of objects modified~~',
+	'UI:History:StatsDeletes' => 'Deleted~~',
+	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
+	'UI:SplitDateTime-Date' => 'date~~',
+	'UI:SplitDateTime-Time' => 'time~~',
+	'UI:SearchValue:NbSelected' => '# selected~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:AccessRO-All' => 'iTop is read-only~~',
+	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:CSVReport-Value-Modified' => 'Modified~~',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
+	'UI:CSVReport-Value-NoMatch' => 'No match~~',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
+	'UI:CSVReport-Row-Created' => 'created~~',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
+	'UI:CSVReport-Icon-Modified' => 'Modified~~',
+	'UI:CSVReport-Icon-Missing' => 'Missing~~',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
+	'UI:CSVReport-Icon-Created' => 'Created~~',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
+	'UI:CSVReport-Object-Created' => 'Object created~~',
+	'UI:CSVReport-Icon-Error' => 'Error~~',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
+	'UI:CSVExport:LostChars' => 'Encoding issue~~',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Edit:TestQuery' => 'Test query~~',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
+	'UI:Delete:Deleted' => 'deleted~~',
+	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'UI:Download-CSV' => 'Download %1$s~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:OperationCancelled' => 'Operation Cancelled~~',
+	'UI:ElementsDisplayed' => 'Filtering~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
+	'Portal:Attachments' => 'Attachments~~',
+	'Portal:AddAttachment' => ' Add Attachment ~~',
+	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
+	'UI:ModifyAllPageTitle' => 'Modify All~~',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
+	'UI:Menu:ModifyAll' => 'Modify...~~',
+	'UI:Button:ModifyAll' => 'Modify All~~',
+	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
+	'UI:ModifiedObject' => 'Object Modified~~',
+	'UI:BulkModifyStatus' => 'Operation~~',
+	'UI:BulkModifyStatus+' => 'Status of the operation~~',
+	'UI:BulkModifyErrors' => 'Errors (if any)~~',
+	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
+	'UI:BulkModifyStatusOk' => 'Ok~~',
+	'UI:BulkModifyStatusError' => 'Error~~',
+	'UI:BulkModifyStatusModified' => 'Modified~~',
+	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
+	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
+	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
+	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
+	'UI:CaseLog:InitialValue' => 'Initial value:~~',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.~~',
+	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.~~',
+	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation~~',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.~~',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
+	'UI:Pagination:PageSize' => '%1$s objects per page~~',
+	'UI:Pagination:PagesLabel' => 'Pages:~~',
+	'UI:Pagination:All' => 'All~~',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
+	'UI:Preferences' => 'Preferences...~~',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
+	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
+	'UI:FavoriteOtherSettings' => 'Other Settings~~',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
+	'UI:ConfigureThisList' => 'Configure This List...~~',
+	'UI:ListConfigurationTitle' => 'List Configuration~~',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
+	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:UseSavetheSettings' => 'Save the Settings~~',
+	'UI:OnlyForThisList' => 'Only for this list~~',
+	'UI:ForAllLists' => 'Default for all lists~~',
+	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
+	'UI:Button:MoveUp' => 'Move Up~~',
+	'UI:Button:MoveDown' => 'Move Down~~',
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
+	'UI:ExportDashBoard' => 'Export to a file~~',
+	'UI:ImportDashBoard' => 'Import from a file...~~',
+	'UI:ImportDashboardTitle' => 'Import From a File~~',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
+	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
+	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
+	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'UI:DashboardEdit:Layout' => 'Layout~~',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
+	'UI:Form:Property' => 'Property~~',
+	'UI:Form:Value' => 'Value~~',
+	'UI:DashletPlainText:Label' => 'Text~~',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
+	'UI:DashletPlainText:Prop-Text' => 'Text~~',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
+	'UI:DashletObjectList:Label' => 'Object list~~',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
+	'UI:DashletObjectList:Prop-Title' => 'Title~~',
+	'UI:DashletObjectList:Prop-Query' => 'Query~~',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
+	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
+	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
+	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
+	'UI:DashletHeaderStatic:Label' => 'Header~~',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
+	'UI:DashletBadge:Prop-Class' => 'Class~~',
+	'DayOfWeek-Sunday' => 'Sunday~~',
+	'DayOfWeek-Monday' => 'Monday~~',
+	'DayOfWeek-Tuesday' => 'Tuesday~~',
+	'DayOfWeek-Wednesday' => 'Wednesday~~',
+	'DayOfWeek-Thursday' => 'Thursday~~',
+	'DayOfWeek-Friday' => 'Friday~~',
+	'DayOfWeek-Saturday' => 'Saturday~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Class:Shortcut' => 'Shortcut~~',
+	'Class:Shortcut/Attribute:name' => 'Name~~',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
+	'Class:ShortcutOQL' => 'Search result shortcut~~',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/zh.dictionary.itop.core.php b/dictionaries/zh.dictionary.itop.core.php
index 3ccff12d7..187b46e79 100644
--- a/dictionaries/zh.dictionary.itop.core.php
+++ b/dictionaries/zh.dictionary.itop.core.php
@@ -1,802 +1,802 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'core/cmdb'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: CMDBChange
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChange' => '变更',
-	'Class:CMDBChange+' => '变更跟踪',
-	'Class:CMDBChange/Attribute:date' => '日期',
-	'Class:CMDBChange/Attribute:date+' => '变更被记录的日期和时间',
-	'Class:CMDBChange/Attribute:userinfo' => '杂项. 信息',
-	'Class:CMDBChange/Attribute:userinfo+' => '呼叫者已定义的信息',
-));
-
-//
-// Class: CMDBChangeOp
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOp' => '变更操作',
-	'Class:CMDBChangeOp+' => '变更操作跟踪',
-	'Class:CMDBChangeOp/Attribute:change' => '变更',
-	'Class:CMDBChangeOp/Attribute:change+' => '变更',
-	'Class:CMDBChangeOp/Attribute:date' => '日期',
-	'Class:CMDBChangeOp/Attribute:date+' => '变更的日期和时间',
-	'Class:CMDBChangeOp/Attribute:userinfo' => '用户',
-	'Class:CMDBChangeOp/Attribute:userinfo+' => '变更造成者',
-	'Class:CMDBChangeOp/Attribute:objclass' => '对象类',
-	'Class:CMDBChangeOp/Attribute:objclass+' => '对象类',
-	'Class:CMDBChangeOp/Attribute:objkey' => '对象 id',
-	'Class:CMDBChangeOp/Attribute:objkey+' => '对象 id',
-	'Class:CMDBChangeOp/Attribute:finalclass' => '类别',
-	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
-));
-
-//
-// Class: CMDBChangeOpCreate
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOpCreate' => '对象创建',
-	'Class:CMDBChangeOpCreate+' => '对象创建跟踪',
-));
-
-//
-// Class: CMDBChangeOpDelete
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOpDelete' => '对象删除',
-	'Class:CMDBChangeOpDelete+' => '对象删除跟踪',
-));
-
-//
-// Class: CMDBChangeOpSetAttribute
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOpSetAttribute' => '对象变更',
-	'Class:CMDBChangeOpSetAttribute+' => '对象属性变更跟踪',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => '属性',
-	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '被修改属性的编码',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeScalar
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOpSetAttributeScalar' => '属性变更',
-	'Class:CMDBChangeOpSetAttributeScalar+' => '对象标量属性变更跟踪',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => '原值',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '属性原值',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => '新值',
-	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '属性新值',
-));
-// Used by CMDBChangeOp... & derived classes
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Change:ObjectCreated' => 'Object created',
-	'Change:ObjectDeleted' => 'Object deleted',
-	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s set to %2$s (previous value: %3$s)',
-	'Change:AttName_SetTo' => '%1$s set to %2$s',
-	'Change:Text_AppendedTo_AttName' => '%1$s appended to %2$s',
-	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modified, previous value: %2$s',
-	'Change:AttName_Changed' => '%1$s modified',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeBlob
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOpSetAttributeBlob' => '数据变更',
-	'Class:CMDBChangeOpSetAttributeBlob+' => '数据变更跟踪',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => '原数据',
-	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '属性原来的内容',
-));
-
-//
-// Class: CMDBChangeOpSetAttributeText
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:CMDBChangeOpSetAttributeText' => '文本变更',
-	'Class:CMDBChangeOpSetAttributeText+' => '文本变更跟踪',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => '原数据',
-	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '属性原来的内容',
-));
-
-//
-// Class: Event
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Event' => '记录事项',
-	'Class:Event+' => '应用程序的内部事项',
-	'Class:Event/Attribute:message' => '消息',
-	'Class:Event/Attribute:message+' => '事项简述',
-	'Class:Event/Attribute:date' => '日期',
-	'Class:Event/Attribute:date+' => '变更被记录的日期和时间',
-	'Class:Event/Attribute:userinfo' => '用户信息',
-	'Class:Event/Attribute:userinfo+' => '用户标识, 该用户的活动触发了该事项',
-	'Class:Event/Attribute:finalclass' => '类别',
-	'Class:Event/Attribute:finalclass+' => '',
-));
-
-//
-// Class: EventNotification
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EventNotification' => '通知事项',
-	'Class:EventNotification+' => '被发送通知的踪迹',
-	'Class:EventNotification/Attribute:trigger_id' => '触发器',
-	'Class:EventNotification/Attribute:trigger_id+' => '用户帐户',
-	'Class:EventNotification/Attribute:action_id' => '用户',
-	'Class:EventNotification/Attribute:action_id+' => '用户帐户',
-	'Class:EventNotification/Attribute:object_id' => '对象 id',
-	'Class:EventNotification/Attribute:object_id+' => '对象 id (由触发器定义的类 ?)',
-));
-
-//
-// Class: EventNotificationEmail
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EventNotificationEmail' => 'Email 发出事项',
-	'Class:EventNotificationEmail+' => '被发送的Email的踪迹',
-	'Class:EventNotificationEmail/Attribute:to' => 'TO',
-	'Class:EventNotificationEmail/Attribute:to+' => 'TO',
-	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
-	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
-	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
-	'Class:EventNotificationEmail/Attribute:from' => 'From',
-	'Class:EventNotificationEmail/Attribute:from+' => '消息发送者',
-	'Class:EventNotificationEmail/Attribute:subject' => '主题',
-	'Class:EventNotificationEmail/Attribute:subject+' => '主题',
-	'Class:EventNotificationEmail/Attribute:body' => '邮件体',
-	'Class:EventNotificationEmail/Attribute:body+' => '邮件体',
-));
-
-//
-// Class: EventIssue
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EventIssue' => '议题事项',
-	'Class:EventIssue+' => '议题踪迹 (警告, 错误, 等等.)',
-	'Class:EventIssue/Attribute:issue' => '议题',
-	'Class:EventIssue/Attribute:issue+' => '发生了什么',
-	'Class:EventIssue/Attribute:impact' => '影响',
-	'Class:EventIssue/Attribute:impact+' => '结果是什么',
-	'Class:EventIssue/Attribute:page' => '页面',
-	'Class:EventIssue/Attribute:page+' => 'HTTP 入口',
-	'Class:EventIssue/Attribute:arguments_post' => 'Posted arguments',
-	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
-	'Class:EventIssue/Attribute:arguments_get' => 'URL arguments',
-	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET arguments',
-	'Class:EventIssue/Attribute:callstack' => 'Callstack',
-	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
-	'Class:EventIssue/Attribute:data' => 'Data',
-	'Class:EventIssue/Attribute:data+' => 'More information',
-));
-
-//
-// Classes: EventWebService and EventRestService
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:EventWebService' => 'Web 服务事项',
-	'Class:EventWebService+' => 'Web 服务调用的踪迹',
-	'Class:EventWebService/Attribute:verb' => 'Verb',
-	'Class:EventWebService/Attribute:verb+' => '操作的名称',
-	'Class:EventWebService/Attribute:result' => '结果',
-	'Class:EventWebService/Attribute:result+' => '概览 成功/失败',
-	'Class:EventWebService/Attribute:log_info' => '信息记录',
-	'Class:EventWebService/Attribute:log_info+' => '结果信息记录',
-	'Class:EventWebService/Attribute:log_warning' => '警告记录',
-	'Class:EventWebService/Attribute:log_warning+' => '结果警告记录',
-	'Class:EventWebService/Attribute:log_error' => '错误记录',
-	'Class:EventWebService/Attribute:log_error+' => '结果错误记录',
-	'Class:EventWebService/Attribute:data' => '数据',
-	'Class:EventWebService/Attribute:data+' => '结果数据',
-	'Class:EventRestService' => 'REST/JSON call~~',
-	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
-	'Class:EventRestService/Attribute:operation' => 'Operation~~',
-	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
-	'Class:EventRestService/Attribute:version' => 'Version~~',
-	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
-	'Class:EventRestService/Attribute:json_input' => 'Input~~',
-	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
-	'Class:EventRestService/Attribute:code' => 'Code~~',
-	'Class:EventRestService/Attribute:code+' => 'Result code~~',
-	'Class:EventRestService/Attribute:json_output' => 'Response~~',
-	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
-	'Class:EventRestService/Attribute:provider' => 'Provider~~',
-	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
-));
-
-//
-// Class: Action
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Action' => '客户化动作',
-	'Class:Action+' => '用户定义的动作',
-	'Class:Action/Attribute:name' => '名称',
-	'Class:Action/Attribute:name+' => '',
-	'Class:Action/Attribute:description' => '描述',
-	'Class:Action/Attribute:description+' => '',
-	'Class:Action/Attribute:status' => '状态',
-	'Class:Action/Attribute:status+' => '生产中 或 ?',
-	'Class:Action/Attribute:status/Value:test' => '测试中',
-	'Class:Action/Attribute:status/Value:test+' => '测试中',
-	'Class:Action/Attribute:status/Value:enabled' => '生产中',
-	'Class:Action/Attribute:status/Value:enabled+' => '生产中',
-	'Class:Action/Attribute:status/Value:disabled' => '非活动',
-	'Class:Action/Attribute:status/Value:disabled+' => '非活动',
-	'Class:Action/Attribute:trigger_list' => '相关触发器',
-	'Class:Action/Attribute:trigger_list+' => '关联到该动作的触发器',
-	'Class:Action/Attribute:finalclass' => '类别',
-	'Class:Action/Attribute:finalclass+' => '',
-));
-
-//
-// Class: ActionNotification
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ActionNotification' => '通知',
-	'Class:ActionNotification+' => '通知 (摘要)',
-));
-
-//
-// Class: ActionEmail
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:ActionEmail' => 'Email 通知',
-	'Class:ActionEmail+' => '',
-	'Class:ActionEmail/Attribute:test_recipient' => '测试收件人',
-	'Class:ActionEmail/Attribute:test_recipient+' => '状态被设置为"测试"时的目的地',
-	'Class:ActionEmail/Attribute:from' => '来自',
-	'Class:ActionEmail/Attribute:from+' => '将发送到邮件头',
-	'Class:ActionEmail/Attribute:reply_to' => '回复到',
-	'Class:ActionEmail/Attribute:reply_to+' => '将发送到邮件头',
-	'Class:ActionEmail/Attribute:to' => 'To',
-	'Class:ActionEmail/Attribute:to+' => '邮件的目的地',
-	'Class:ActionEmail/Attribute:cc' => 'Cc',
-	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
-	'Class:ActionEmail/Attribute:bcc' => 'bcc',
-	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
-	'Class:ActionEmail/Attribute:subject' => '主题',
-	'Class:ActionEmail/Attribute:subject+' => '邮件标题',
-	'Class:ActionEmail/Attribute:body' => '邮件体',
-	'Class:ActionEmail/Attribute:body+' => '邮件内容',
-	'Class:ActionEmail/Attribute:importance' => '重要',
-	'Class:ActionEmail/Attribute:importance+' => '重要标志',
-	'Class:ActionEmail/Attribute:importance/Value:low' => '低',
-	'Class:ActionEmail/Attribute:importance/Value:low+' => '低',
-	'Class:ActionEmail/Attribute:importance/Value:normal' => '一般',
-	'Class:ActionEmail/Attribute:importance/Value:normal+' => '一般',
-	'Class:ActionEmail/Attribute:importance/Value:high' => '高',
-	'Class:ActionEmail/Attribute:importance/Value:high+' => '高',
-));
-
-//
-// Class: Trigger
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:Trigger' => '触发器',
-	'Class:Trigger+' => '客户化事项句柄',
-	'Class:Trigger/Attribute:description' => '描述',
-	'Class:Trigger/Attribute:description+' => '单行描述',
-	'Class:Trigger/Attribute:action_list' => '被触发的动作',
-	'Class:Trigger/Attribute:action_list+' => '触发器击发时执行的动作',
-	'Class:Trigger/Attribute:finalclass' => '类别',
-	'Class:Trigger/Attribute:finalclass+' => '',
-));
-
-//
-// Class: TriggerOnObject
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TriggerOnObject' => '触发器 (类依赖的)',
-	'Class:TriggerOnObject+' => '在一个给定类对象上的触发器',
-	'Class:TriggerOnObject/Attribute:target_class' => '目标类',
-	'Class:TriggerOnObject/Attribute:target_class+' => '',
-));
-
-//
-// Class: TriggerOnStateChange
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TriggerOnStateChange' => '触发器 (状态变化时)',
-	'Class:TriggerOnStateChange+' => '对象状态变化时的触发器',
-	'Class:TriggerOnStateChange/Attribute:state' => '状态',
-	'Class:TriggerOnStateChange/Attribute:state+' => '',
-));
-
-//
-// Class: TriggerOnStateEnter
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TriggerOnStateEnter' => '触发器 (进入一个状态时)',
-	'Class:TriggerOnStateEnter+' => '对象状态变化时触发器 - 进入时',
-));
-
-//
-// Class: TriggerOnStateLeave
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TriggerOnStateLeave' => '触发器 (离开一个状态时)',
-	'Class:TriggerOnStateLeave+' => '对象状态变化时触发器 - 离开时',
-));
-
-//
-// Class: TriggerOnObjectCreate
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:TriggerOnObjectCreate' => '触发器 (对象创建时)',
-	'Class:TriggerOnObjectCreate+' => '一个给定类[子类]对象创建时触发器',
-));
-
-//
-// Class: lnkTriggerAction
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:lnkTriggerAction' => '动作/触发器',
-	'Class:lnkTriggerAction+' => '触发器和动作间的链接',
-	'Class:lnkTriggerAction/Attribute:action_id' => '动作',
-	'Class:lnkTriggerAction/Attribute:action_id+' => '要执行的动作',
-	'Class:lnkTriggerAction/Attribute:action_name' => '动作',
-	'Class:lnkTriggerAction/Attribute:action_name+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_id' => '触发器',
-	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
-	'Class:lnkTriggerAction/Attribute:trigger_name' => '触发器',
-	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
-	'Class:lnkTriggerAction/Attribute:order' => '顺序',
-	'Class:lnkTriggerAction/Attribute:order+' => '动作执行顺序',
-	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
-	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
-	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
-	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
-	'Core:AttributeLinkedSet' => 'Array of objects~~',
-	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass~~',
-	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)~~',
-	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class~~',
-	'Core:AttributeInteger' => 'Integer~~',
-	'Core:AttributeInteger+' => 'Numeric value (could be negative)~~',
-	'Core:AttributeDecimal' => 'Decimal~~',
-	'Core:AttributeDecimal+' => 'Decimal value (could be negative)~~',
-	'Core:AttributeBoolean' => 'Boolean~~',
-	'Core:AttributeBoolean+' => 'Boolean~~',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
-	'Core:AttributeBoolean/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag' => 'Archive flag~~',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
-	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
-	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
-	'Core:AttributeArchiveDate/Label+' => '',
-	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
-	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
-	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
-	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
-	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
-	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
-	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
-	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
-	'Core:AttributeString' => 'String~~',
-	'Core:AttributeString+' => 'Alphanumeric string~~',
-	'Core:AttributeClass' => 'Class~~',
-	'Core:AttributeClass+' => 'Class~~',
-	'Core:AttributeApplicationLanguage' => 'User language~~',
-	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)~~',
-	'Core:AttributeFinalClass' => 'Class (auto)~~',
-	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)~~',
-	'Core:AttributePassword' => 'Password~~',
-	'Core:AttributePassword+' => 'Password of an external device~~',
-	'Core:AttributeEncryptedString' => 'Encrypted string~~',
-	'Core:AttributeEncryptedString+' => 'String encrypted with a local key~~',
-	'Core:AttributeText' => 'Text~~',
-	'Core:AttributeText+' => 'Multiline character string~~',
-	'Core:AttributeHTML' => 'HTML~~',
-	'Core:AttributeHTML+' => 'HTML string~~',
-	'Core:AttributeEmailAddress' => 'Email address~~',
-	'Core:AttributeEmailAddress+' => 'Email address~~',
-	'Core:AttributeIPAddress' => 'IP address~~',
-	'Core:AttributeIPAddress+' => 'IP address~~',
-	'Core:AttributeOQL' => 'OQL~~',
-	'Core:AttributeOQL+' => 'Object Query Langage expression~~',
-	'Core:AttributeEnum' => 'Enum~~',
-	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings~~',
-	'Core:AttributeTemplateString' => 'Template string~~',
-	'Core:AttributeTemplateString+' => 'String containing placeholders~~',
-	'Core:AttributeTemplateText' => 'Template text~~',
-	'Core:AttributeTemplateText+' => 'Text containing placeholders~~',
-	'Core:AttributeTemplateHTML' => 'Template HTML~~',
-	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders~~',
-	'Core:AttributeDateTime' => 'Date/time~~',
-	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)~~',
-	'Core:AttributeDateTime?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>
-<p>
-If the time is omitted, it defaults to 00:00:00
-</p>~~',
-	'Core:AttributeDate' => 'Date~~',
-	'Core:AttributeDate+' => 'Date (year-month-day)~~',
-	'Core:AttributeDate?SmartSearch' => '
-<p>
-	Date format:<br/>
-	<b>%1$s</b><br/>
-	Example: %2$s
-</p>
-<p>
-Operators:<br/>
-	<b>&gt;</b><em>date</em><br/>
-	<b>&lt;</b><em>date</em><br/>
-	<b>[</b><em>date</em>,<em>date</em><b>]</b>
-</p>~~',
-	'Core:AttributeDeadline' => 'Deadline~~',
-	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time~~',
-	'Core:AttributeExternalKey' => 'External key~~',
-	'Core:AttributeExternalKey+' => 'External (or foreign) key~~',
-	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
-	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
-	'Core:AttributeExternalField' => 'External field~~',
-	'Core:AttributeExternalField+' => 'Field mapped to an external key~~',
-	'Core:AttributeURL' => 'URL~~',
-	'Core:AttributeURL+' => 'Absolute or relative URL as a text string~~',
-	'Core:AttributeBlob' => 'Blob~~',
-	'Core:AttributeBlob+' => 'Any binary content (document)~~',
-	'Core:AttributeOneWayPassword' => 'One way password~~',
-	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password~~',
-	'Core:AttributeTable' => 'Table~~',
-	'Core:AttributeTable+' => 'Indexed array having two dimensions~~',
-	'Core:AttributePropertySet' => 'Properties~~',
-	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)~~',
-	'Core:AttributeFriendlyName' => 'Friendly name~~',
-	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
-	'Core:FriendlyName-Label' => 'Friendly name~~',
-	'Core:FriendlyName-Description' => 'Friendly name~~',
-	'Change:ObjectModified' => 'Object modified~~',
-	'Change:AttName_EntryAdded' => '%1$s modified, new entry added.~~',
-	'Change:LinkSet:Added' => 'added %1$s~~',
-	'Change:LinkSet:Removed' => 'removed %1$s~~',
-	'Change:LinkSet:Modified' => 'modified %1$s~~',
-	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
-	'Class:EventLoginUsage' => 'Login Usage~~',
-	'Class:EventLoginUsage+' => 'Connection to the application~~',
-	'Class:EventLoginUsage/Attribute:user_id' => 'Login~~',
-	'Class:EventLoginUsage/Attribute:user_id+' => 'Login~~',
-	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name~~',
-	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name~~',
-	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email~~',
-	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User~~',
-	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
-	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
-	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
-	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)~~',
-	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal~~',
-	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
-	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
-	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
-	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
-	'Class:SynchroDataSource/Attribute:name' => 'Name~~',
-	'Class:SynchroDataSource/Attribute:name+' => 'Name~~',
-	'Class:SynchroDataSource/Attribute:description' => 'Description~~',
-	'Class:SynchroDataSource/Attribute:status' => 'Status~~',
-	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class~~',
-	'Class:SynchroDataSource/Attribute:user_id' => 'User~~',
-	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify~~',
-	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
-	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink~~',
-	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized~~',
-	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink~~',
-	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$~~',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy~~',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval~~',
-	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object~~',
-	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one~~',
-	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration~~',
-	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted~~',
-	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
-	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
-	'SynchroDataSource:Description' => 'Description~~',
-	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation~~',
-	'SynchroDataSource:Deletion' => 'Deletion rules~~',
-	'SynchroDataSource:Status' => 'Status~~',
-	'SynchroDataSource:Information' => 'Information~~',
-	'SynchroDataSource:Definition' => 'Definition~~',
-	'Core:SynchroAttributes' => 'Attributes~~',
-	'Core:SynchroStatus' => 'Status~~',
-	'Core:Synchro:ErrorsLabel' => 'Errors~~',
-	'Core:Synchro:CreatedLabel' => 'Created~~',
-	'Core:Synchro:ModifiedLabel' => 'Modified~~',
-	'Core:Synchro:UnchangedLabel' => 'Unchanged~~',
-	'Core:Synchro:ReconciledErrorsLabel' => 'Errors~~',
-	'Core:Synchro:ReconciledLabel' => 'Reconciled~~',
-	'Core:Synchro:ReconciledNewLabel' => 'Created~~',
-	'Core:SynchroReconcile:Yes' => 'Yes~~',
-	'Core:SynchroReconcile:No' => 'No~~',
-	'Core:SynchroUpdate:Yes' => 'Yes~~',
-	'Core:SynchroUpdate:No' => 'No~~',
-	'Core:Synchro:LastestStatus' => 'Latest Status~~',
-	'Core:Synchro:History' => 'Synchronization History~~',
-	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.~~',
-	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.~~',
-	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...~~',
-	'Menu:DataSources' => 'Synchronization Data Sources~~',
-	'Menu:DataSources+' => 'All Synchronization Data Sources~~',
-	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)~~',
-	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)~~',
-	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',
-	'Core:Synchro:label_repl_new' => 'New (%1$s)~~',
-	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)~~',
-	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)~~',
-	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)~~',
-	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)~~',
-	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)~~',
-	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)~~',
-	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)~~',
-	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)~~',
-	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)~~',
-	'Core:Synchro:label_obj_created' => 'Created (%1$s)~~',
-	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)~~',
-	'Core:SynchroLogTitle' => '%1$s - %2$s~~',
-	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s~~',
-	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
-	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.~~',
-	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete~~',
-	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.~~',
-	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
-	'Core:SynchroReplica:PublicData' => 'Public Data~~',
-	'Core:SynchroReplica:PrivateDetails' => 'Private Details~~',
-	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s~~',
-	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica~~',
-	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)~~',
-	'Core:SynchroAtt:attcode' => 'Attribute~~',
-	'Core:SynchroAtt:attcode+' => 'Field of the object~~',
-	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?~~',
-	'Core:SynchroAtt:reconciliation+' => 'Used for searching~~',
-	'Core:SynchroAtt:update' => 'Update ?~~',
-	'Core:SynchroAtt:update+' => 'Used to update the object~~',
-	'Core:SynchroAtt:update_policy' => 'Update Policy~~',
-	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field~~',
-	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key~~',
-	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation~~',
-	'Core:SyncDataExchangeComment' => '(Data Synchro)~~',
-	'Core:Synchro:ListOfDataSources' => 'List of data sources:~~',
-	'Core:Synchro:LastSynchro' => 'Last synchronization:~~',
-	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source~~',
-	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s~~',
-	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s~~',
-	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s~~',
-	'TitleSynchroExecution' => 'Execution of the synchronization~~',
-	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s~~',
-	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.~~',
-	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.~~',
-	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.~~',
-	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
-	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
-	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
-	'Class:AsyncSendEmail' => 'Email (asynchronous)~~',
-	'Class:AsyncSendEmail/Attribute:to' => 'To~~',
-	'Class:AsyncSendEmail/Attribute:subject' => 'Subject~~',
-	'Class:AsyncSendEmail/Attribute:body' => 'Body~~',
-	'Class:AsyncSendEmail/Attribute:header' => 'Header~~',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password~~',
-	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value~~',
-	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
-	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value~~',
-	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log~~',
-	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry~~',
-	'Class:SynchroDataSource' => 'Synchro Data Source~~',
-	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation~~',
-	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete~~',
-	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production~~',
-	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction~~',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes~~',
-	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create~~',
-	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error~~',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error~~',
-	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error~~',
-	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)~~',
-	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update~~',
-	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete~~',
-	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects~~',
-	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody~~',
-	'Class:SynchroAttribute' => 'Synchro Attribute~~',
-	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source~~',
-	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code~~',
-	'Class:SynchroAttribute/Attribute:update' => 'Update~~',
-	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile~~',
-	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy~~',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked~~',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked~~',
-	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty~~',
-	'Class:SynchroAttribute/Attribute:finalclass' => 'Class~~',
-	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
-	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute~~',
-	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)~~',
-	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator~~',
-	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator~~',
-	'Class:SynchroLog' => 'Synchr Log~~',
-	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source~~',
-	'Class:SynchroLog/Attribute:start_date' => 'Start Date~~',
-	'Class:SynchroLog/Attribute:end_date' => 'End Date~~',
-	'Class:SynchroLog/Attribute:status' => 'Status~~',
-	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed~~',
-	'Class:SynchroLog/Attribute:status/Value:error' => 'Error~~',
-	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation~~',
-	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated~~',
-	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged~~',
-	'Class:SynchroLog/Attribute:last_error' => 'Last error~~',
-	'Class:SynchroLog/Attribute:traces' => 'Traces~~',
-	'Class:SynchroReplica' => 'Synchro Replica~~',
-	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source~~',
-	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)~~',
-	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type~~',
-	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen~~',
-	'Class:SynchroReplica/Attribute:status' => 'Status~~',
-	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified~~',
-	'Class:SynchroReplica/Attribute:status/Value:new' => 'New~~',
-	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete~~',
-	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan~~',
-	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized~~',
-	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?~~',
-	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error~~',
-	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings~~',
-	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date~~',
-	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date~~',
-	'Class:appUserPreferences' => 'User Preferences~~',
-	'Class:appUserPreferences/Attribute:userid' => 'User~~',
-	'Class:appUserPreferences/Attribute:preferences' => 'Prefs~~',
-	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
-	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
-	'Core:Duration_Seconds' => '%1$ds~~',
-	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds~~',
-	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds~~',
-	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds~~',
-	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
-	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
-	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
-	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
-	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
-	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
-	'Core:BulkExportOf_Class' => '%1$s Export~~',
-	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
-	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
-	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
-	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
-	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
-	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
-	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
-	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
-	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
-	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
-	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
-	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
-	'Core:BulkExport:CheckAll' => 'Check All~~',
-	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
-	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
-	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
-	'Core:BulkExport:CSVLocalization' => 'Localization~~',
-	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
-	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
-	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
-	'Core:BulkExport:PageSize-A4' => 'A4~~',
-	'Core:BulkExport:PageSize-A3' => 'A3~~',
-	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
-	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
-	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
-	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
-	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
-	'Core:BulkExport:XMLOptions' => 'XML Options~~',
-	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
-	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
-	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
-	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
-	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
-	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
-	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
-	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
-	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
-	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
-	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
-	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
-	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
-	'Core:Validator:Default' => 'Wrong format~~',
-	'Core:Validator:Mandatory' => 'Please, fill this field~~',
-	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
-	'Core:Validator:MustSelectOne' => 'Please, select one~~',
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'core/cmdb'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: CMDBChange
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChange' => '变更',
+	'Class:CMDBChange+' => '变更跟踪',
+	'Class:CMDBChange/Attribute:date' => '日期',
+	'Class:CMDBChange/Attribute:date+' => '变更被记录的日期和时间',
+	'Class:CMDBChange/Attribute:userinfo' => '杂项. 信息',
+	'Class:CMDBChange/Attribute:userinfo+' => '呼叫者已定义的信息',
+));
+
+//
+// Class: CMDBChangeOp
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOp' => '变更操作',
+	'Class:CMDBChangeOp+' => '变更操作跟踪',
+	'Class:CMDBChangeOp/Attribute:change' => '变更',
+	'Class:CMDBChangeOp/Attribute:change+' => '变更',
+	'Class:CMDBChangeOp/Attribute:date' => '日期',
+	'Class:CMDBChangeOp/Attribute:date+' => '变更的日期和时间',
+	'Class:CMDBChangeOp/Attribute:userinfo' => '用户',
+	'Class:CMDBChangeOp/Attribute:userinfo+' => '变更造成者',
+	'Class:CMDBChangeOp/Attribute:objclass' => '对象类',
+	'Class:CMDBChangeOp/Attribute:objclass+' => '对象类',
+	'Class:CMDBChangeOp/Attribute:objkey' => '对象 id',
+	'Class:CMDBChangeOp/Attribute:objkey+' => '对象 id',
+	'Class:CMDBChangeOp/Attribute:finalclass' => '类别',
+	'Class:CMDBChangeOp/Attribute:finalclass+' => '',
+));
+
+//
+// Class: CMDBChangeOpCreate
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOpCreate' => '对象创建',
+	'Class:CMDBChangeOpCreate+' => '对象创建跟踪',
+));
+
+//
+// Class: CMDBChangeOpDelete
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOpDelete' => '对象删除',
+	'Class:CMDBChangeOpDelete+' => '对象删除跟踪',
+));
+
+//
+// Class: CMDBChangeOpSetAttribute
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOpSetAttribute' => '对象变更',
+	'Class:CMDBChangeOpSetAttribute+' => '对象属性变更跟踪',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => '属性',
+	'Class:CMDBChangeOpSetAttribute/Attribute:attcode+' => '被修改属性的编码',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeScalar
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOpSetAttributeScalar' => '属性变更',
+	'Class:CMDBChangeOpSetAttributeScalar+' => '对象标量属性变更跟踪',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => '原值',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue+' => '属性原值',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue' => '新值',
+	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => '属性新值',
+));
+// Used by CMDBChangeOp... & derived classes
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Change:ObjectCreated' => 'Object created',
+	'Change:ObjectDeleted' => 'Object deleted',
+	'Change:AttName_SetTo_NewValue_PreviousValue_OldValue' => '%1$s set to %2$s (previous value: %3$s)',
+	'Change:AttName_SetTo' => '%1$s set to %2$s',
+	'Change:Text_AppendedTo_AttName' => '%1$s appended to %2$s',
+	'Change:AttName_Changed_PreviousValue_OldValue' => '%1$s modified, previous value: %2$s',
+	'Change:AttName_Changed' => '%1$s modified',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeBlob
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOpSetAttributeBlob' => '数据变更',
+	'Class:CMDBChangeOpSetAttributeBlob+' => '数据变更跟踪',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => '原数据',
+	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata+' => '属性原来的内容',
+));
+
+//
+// Class: CMDBChangeOpSetAttributeText
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:CMDBChangeOpSetAttributeText' => '文本变更',
+	'Class:CMDBChangeOpSetAttributeText+' => '文本变更跟踪',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => '原数据',
+	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata+' => '属性原来的内容',
+));
+
+//
+// Class: Event
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Event' => '记录事项',
+	'Class:Event+' => '应用程序的内部事项',
+	'Class:Event/Attribute:message' => '消息',
+	'Class:Event/Attribute:message+' => '事项简述',
+	'Class:Event/Attribute:date' => '日期',
+	'Class:Event/Attribute:date+' => '变更被记录的日期和时间',
+	'Class:Event/Attribute:userinfo' => '用户信息',
+	'Class:Event/Attribute:userinfo+' => '用户标识, 该用户的活动触发了该事项',
+	'Class:Event/Attribute:finalclass' => '类别',
+	'Class:Event/Attribute:finalclass+' => '',
+));
+
+//
+// Class: EventNotification
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:EventNotification' => '通知事项',
+	'Class:EventNotification+' => '被发送通知的踪迹',
+	'Class:EventNotification/Attribute:trigger_id' => '触发器',
+	'Class:EventNotification/Attribute:trigger_id+' => '用户帐户',
+	'Class:EventNotification/Attribute:action_id' => '用户',
+	'Class:EventNotification/Attribute:action_id+' => '用户帐户',
+	'Class:EventNotification/Attribute:object_id' => '对象 id',
+	'Class:EventNotification/Attribute:object_id+' => '对象 id (由触发器定义的类 ?)',
+));
+
+//
+// Class: EventNotificationEmail
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:EventNotificationEmail' => 'Email 发出事项',
+	'Class:EventNotificationEmail+' => '被发送的Email的踪迹',
+	'Class:EventNotificationEmail/Attribute:to' => 'TO',
+	'Class:EventNotificationEmail/Attribute:to+' => 'TO',
+	'Class:EventNotificationEmail/Attribute:cc' => 'CC',
+	'Class:EventNotificationEmail/Attribute:cc+' => 'CC',
+	'Class:EventNotificationEmail/Attribute:bcc' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:bcc+' => 'BCC',
+	'Class:EventNotificationEmail/Attribute:from' => 'From',
+	'Class:EventNotificationEmail/Attribute:from+' => '消息发送者',
+	'Class:EventNotificationEmail/Attribute:subject' => '主题',
+	'Class:EventNotificationEmail/Attribute:subject+' => '主题',
+	'Class:EventNotificationEmail/Attribute:body' => '邮件体',
+	'Class:EventNotificationEmail/Attribute:body+' => '邮件体',
+));
+
+//
+// Class: EventIssue
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:EventIssue' => '议题事项',
+	'Class:EventIssue+' => '议题踪迹 (警告, 错误, 等等.)',
+	'Class:EventIssue/Attribute:issue' => '议题',
+	'Class:EventIssue/Attribute:issue+' => '发生了什么',
+	'Class:EventIssue/Attribute:impact' => '影响',
+	'Class:EventIssue/Attribute:impact+' => '结果是什么',
+	'Class:EventIssue/Attribute:page' => '页面',
+	'Class:EventIssue/Attribute:page+' => 'HTTP 入口',
+	'Class:EventIssue/Attribute:arguments_post' => 'Posted arguments',
+	'Class:EventIssue/Attribute:arguments_post+' => 'HTTP POST arguments',
+	'Class:EventIssue/Attribute:arguments_get' => 'URL arguments',
+	'Class:EventIssue/Attribute:arguments_get+' => 'HTTP GET arguments',
+	'Class:EventIssue/Attribute:callstack' => 'Callstack',
+	'Class:EventIssue/Attribute:callstack+' => 'Call stack',
+	'Class:EventIssue/Attribute:data' => 'Data',
+	'Class:EventIssue/Attribute:data+' => 'More information',
+));
+
+//
+// Classes: EventWebService and EventRestService
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:EventWebService' => 'Web 服务事项',
+	'Class:EventWebService+' => 'Web 服务调用的踪迹',
+	'Class:EventWebService/Attribute:verb' => 'Verb',
+	'Class:EventWebService/Attribute:verb+' => '操作的名称',
+	'Class:EventWebService/Attribute:result' => '结果',
+	'Class:EventWebService/Attribute:result+' => '概览 成功/失败',
+	'Class:EventWebService/Attribute:log_info' => '信息记录',
+	'Class:EventWebService/Attribute:log_info+' => '结果信息记录',
+	'Class:EventWebService/Attribute:log_warning' => '警告记录',
+	'Class:EventWebService/Attribute:log_warning+' => '结果警告记录',
+	'Class:EventWebService/Attribute:log_error' => '错误记录',
+	'Class:EventWebService/Attribute:log_error+' => '结果错误记录',
+	'Class:EventWebService/Attribute:data' => '数据',
+	'Class:EventWebService/Attribute:data+' => '结果数据',
+	'Class:EventRestService' => 'REST/JSON call~~',
+	'Class:EventRestService+' => 'Trace of a REST/JSON service call~~',
+	'Class:EventRestService/Attribute:operation' => 'Operation~~',
+	'Class:EventRestService/Attribute:operation+' => 'Argument \'operation\'~~',
+	'Class:EventRestService/Attribute:version' => 'Version~~',
+	'Class:EventRestService/Attribute:version+' => 'Argument \'version\'~~',
+	'Class:EventRestService/Attribute:json_input' => 'Input~~',
+	'Class:EventRestService/Attribute:json_input+' => 'Argument \'json_data\'~~',
+	'Class:EventRestService/Attribute:code' => 'Code~~',
+	'Class:EventRestService/Attribute:code+' => 'Result code~~',
+	'Class:EventRestService/Attribute:json_output' => 'Response~~',
+	'Class:EventRestService/Attribute:json_output+' => 'HTTP response (json)~~',
+	'Class:EventRestService/Attribute:provider' => 'Provider~~',
+	'Class:EventRestService/Attribute:provider+' => 'PHP class implementing the expected operation~~',
+));
+
+//
+// Class: Action
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Action' => '客户化动作',
+	'Class:Action+' => '用户定义的动作',
+	'Class:Action/Attribute:name' => '名称',
+	'Class:Action/Attribute:name+' => '',
+	'Class:Action/Attribute:description' => '描述',
+	'Class:Action/Attribute:description+' => '',
+	'Class:Action/Attribute:status' => '状态',
+	'Class:Action/Attribute:status+' => '生产中 或 ?',
+	'Class:Action/Attribute:status/Value:test' => '测试中',
+	'Class:Action/Attribute:status/Value:test+' => '测试中',
+	'Class:Action/Attribute:status/Value:enabled' => '生产中',
+	'Class:Action/Attribute:status/Value:enabled+' => '生产中',
+	'Class:Action/Attribute:status/Value:disabled' => '非活动',
+	'Class:Action/Attribute:status/Value:disabled+' => '非活动',
+	'Class:Action/Attribute:trigger_list' => '相关触发器',
+	'Class:Action/Attribute:trigger_list+' => '关联到该动作的触发器',
+	'Class:Action/Attribute:finalclass' => '类别',
+	'Class:Action/Attribute:finalclass+' => '',
+));
+
+//
+// Class: ActionNotification
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ActionNotification' => '通知',
+	'Class:ActionNotification+' => '通知 (摘要)',
+));
+
+//
+// Class: ActionEmail
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:ActionEmail' => 'Email 通知',
+	'Class:ActionEmail+' => '',
+	'Class:ActionEmail/Attribute:test_recipient' => '测试收件人',
+	'Class:ActionEmail/Attribute:test_recipient+' => '状态被设置为"测试"时的目的地',
+	'Class:ActionEmail/Attribute:from' => '来自',
+	'Class:ActionEmail/Attribute:from+' => '将发送到邮件头',
+	'Class:ActionEmail/Attribute:reply_to' => '回复到',
+	'Class:ActionEmail/Attribute:reply_to+' => '将发送到邮件头',
+	'Class:ActionEmail/Attribute:to' => 'To',
+	'Class:ActionEmail/Attribute:to+' => '邮件的目的地',
+	'Class:ActionEmail/Attribute:cc' => 'Cc',
+	'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy',
+	'Class:ActionEmail/Attribute:bcc' => 'bcc',
+	'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy',
+	'Class:ActionEmail/Attribute:subject' => '主题',
+	'Class:ActionEmail/Attribute:subject+' => '邮件标题',
+	'Class:ActionEmail/Attribute:body' => '邮件体',
+	'Class:ActionEmail/Attribute:body+' => '邮件内容',
+	'Class:ActionEmail/Attribute:importance' => '重要',
+	'Class:ActionEmail/Attribute:importance+' => '重要标志',
+	'Class:ActionEmail/Attribute:importance/Value:low' => '低',
+	'Class:ActionEmail/Attribute:importance/Value:low+' => '低',
+	'Class:ActionEmail/Attribute:importance/Value:normal' => '一般',
+	'Class:ActionEmail/Attribute:importance/Value:normal+' => '一般',
+	'Class:ActionEmail/Attribute:importance/Value:high' => '高',
+	'Class:ActionEmail/Attribute:importance/Value:high+' => '高',
+));
+
+//
+// Class: Trigger
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:Trigger' => '触发器',
+	'Class:Trigger+' => '客户化事项句柄',
+	'Class:Trigger/Attribute:description' => '描述',
+	'Class:Trigger/Attribute:description+' => '单行描述',
+	'Class:Trigger/Attribute:action_list' => '被触发的动作',
+	'Class:Trigger/Attribute:action_list+' => '触发器击发时执行的动作',
+	'Class:Trigger/Attribute:finalclass' => '类别',
+	'Class:Trigger/Attribute:finalclass+' => '',
+));
+
+//
+// Class: TriggerOnObject
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:TriggerOnObject' => '触发器 (类依赖的)',
+	'Class:TriggerOnObject+' => '在一个给定类对象上的触发器',
+	'Class:TriggerOnObject/Attribute:target_class' => '目标类',
+	'Class:TriggerOnObject/Attribute:target_class+' => '',
+));
+
+//
+// Class: TriggerOnStateChange
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:TriggerOnStateChange' => '触发器 (状态变化时)',
+	'Class:TriggerOnStateChange+' => '对象状态变化时的触发器',
+	'Class:TriggerOnStateChange/Attribute:state' => '状态',
+	'Class:TriggerOnStateChange/Attribute:state+' => '',
+));
+
+//
+// Class: TriggerOnStateEnter
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:TriggerOnStateEnter' => '触发器 (进入一个状态时)',
+	'Class:TriggerOnStateEnter+' => '对象状态变化时触发器 - 进入时',
+));
+
+//
+// Class: TriggerOnStateLeave
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:TriggerOnStateLeave' => '触发器 (离开一个状态时)',
+	'Class:TriggerOnStateLeave+' => '对象状态变化时触发器 - 离开时',
+));
+
+//
+// Class: TriggerOnObjectCreate
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:TriggerOnObjectCreate' => '触发器 (对象创建时)',
+	'Class:TriggerOnObjectCreate+' => '一个给定类[子类]对象创建时触发器',
+));
+
+//
+// Class: lnkTriggerAction
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:lnkTriggerAction' => '动作/触发器',
+	'Class:lnkTriggerAction+' => '触发器和动作间的链接',
+	'Class:lnkTriggerAction/Attribute:action_id' => '动作',
+	'Class:lnkTriggerAction/Attribute:action_id+' => '要执行的动作',
+	'Class:lnkTriggerAction/Attribute:action_name' => '动作',
+	'Class:lnkTriggerAction/Attribute:action_name+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_id' => '触发器',
+	'Class:lnkTriggerAction/Attribute:trigger_id+' => '',
+	'Class:lnkTriggerAction/Attribute:trigger_name' => '触发器',
+	'Class:lnkTriggerAction/Attribute:trigger_name+' => '',
+	'Class:lnkTriggerAction/Attribute:order' => '顺序',
+	'Class:lnkTriggerAction/Attribute:order+' => '动作执行顺序',
+	'Core:DeletedObjectLabel' => '%1s (deleted)~~',
+	'Core:DeletedObjectTip' => 'The object has been deleted on %1$s (%2$s)~~',
+	'Core:UnknownObjectLabel' => 'Object not found (class: %1$s, id: %2$d)~~',
+	'Core:UnknownObjectTip' => 'The object could not be found. It may have been deleted some time ago and the log has been purged since.~~',
+	'Core:AttributeLinkedSet' => 'Array of objects~~',
+	'Core:AttributeLinkedSet+' => 'Any kind of objects of the same class or subclass~~',
+	'Core:AttributeLinkedSetIndirect' => 'Array of objects (N-N)~~',
+	'Core:AttributeLinkedSetIndirect+' => 'Any kind of objects [subclass] of the same class~~',
+	'Core:AttributeInteger' => 'Integer~~',
+	'Core:AttributeInteger+' => 'Numeric value (could be negative)~~',
+	'Core:AttributeDecimal' => 'Decimal~~',
+	'Core:AttributeDecimal+' => 'Decimal value (could be negative)~~',
+	'Core:AttributeBoolean' => 'Boolean~~',
+	'Core:AttributeBoolean+' => 'Boolean~~',
+	'Core:AttributeBoolean/Value:null' => '',
+	'Core:AttributeBoolean/Value:yes' => 'Yes~~',
+	'Core:AttributeBoolean/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag' => 'Archive flag~~',
+	'Core:AttributeArchiveFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeArchiveFlag/Value:yes+' => 'This object is visible only in archive mode~~',
+	'Core:AttributeArchiveFlag/Value:no' => 'No~~',
+	'Core:AttributeArchiveFlag/Label' => 'Archived~~',
+	'Core:AttributeArchiveFlag/Label+' => '',
+	'Core:AttributeArchiveDate/Label' => 'Archive date~~',
+	'Core:AttributeArchiveDate/Label+' => '',
+	'Core:AttributeObsolescenceFlag' => 'Obsolescence flag~~',
+	'Core:AttributeObsolescenceFlag/Value:yes' => 'Yes~~',
+	'Core:AttributeObsolescenceFlag/Value:yes+' => 'This object is excluded from the impact analysis, and hidden from search results~~',
+	'Core:AttributeObsolescenceFlag/Value:no' => 'No~~',
+	'Core:AttributeObsolescenceFlag/Label' => 'Obsolete~~',
+	'Core:AttributeObsolescenceFlag/Label+' => 'Computed dynamically on other attributes~~',
+	'Core:AttributeObsolescenceDate/Label' => 'Obsolescence date~~',
+	'Core:AttributeObsolescenceDate/Label+' => 'Approximative date at which the object has been considered obsolete~~',
+	'Core:AttributeString' => 'String~~',
+	'Core:AttributeString+' => 'Alphanumeric string~~',
+	'Core:AttributeClass' => 'Class~~',
+	'Core:AttributeClass+' => 'Class~~',
+	'Core:AttributeApplicationLanguage' => 'User language~~',
+	'Core:AttributeApplicationLanguage+' => 'Language and country (EN US)~~',
+	'Core:AttributeFinalClass' => 'Class (auto)~~',
+	'Core:AttributeFinalClass+' => 'Real class of the object (automatically created by the core)~~',
+	'Core:AttributePassword' => 'Password~~',
+	'Core:AttributePassword+' => 'Password of an external device~~',
+	'Core:AttributeEncryptedString' => 'Encrypted string~~',
+	'Core:AttributeEncryptedString+' => 'String encrypted with a local key~~',
+	'Core:AttributeText' => 'Text~~',
+	'Core:AttributeText+' => 'Multiline character string~~',
+	'Core:AttributeHTML' => 'HTML~~',
+	'Core:AttributeHTML+' => 'HTML string~~',
+	'Core:AttributeEmailAddress' => 'Email address~~',
+	'Core:AttributeEmailAddress+' => 'Email address~~',
+	'Core:AttributeIPAddress' => 'IP address~~',
+	'Core:AttributeIPAddress+' => 'IP address~~',
+	'Core:AttributeOQL' => 'OQL~~',
+	'Core:AttributeOQL+' => 'Object Query Langage expression~~',
+	'Core:AttributeEnum' => 'Enum~~',
+	'Core:AttributeEnum+' => 'List of predefined alphanumeric strings~~',
+	'Core:AttributeTemplateString' => 'Template string~~',
+	'Core:AttributeTemplateString+' => 'String containing placeholders~~',
+	'Core:AttributeTemplateText' => 'Template text~~',
+	'Core:AttributeTemplateText+' => 'Text containing placeholders~~',
+	'Core:AttributeTemplateHTML' => 'Template HTML~~',
+	'Core:AttributeTemplateHTML+' => 'HTML containing placeholders~~',
+	'Core:AttributeDateTime' => 'Date/time~~',
+	'Core:AttributeDateTime+' => 'Date and time (year-month-day hh:mm:ss)~~',
+	'Core:AttributeDateTime?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>
+<p>
+If the time is omitted, it defaults to 00:00:00
+</p>~~',
+	'Core:AttributeDate' => 'Date~~',
+	'Core:AttributeDate+' => 'Date (year-month-day)~~',
+	'Core:AttributeDate?SmartSearch' => '
+<p>
+	Date format:<br/>
+	<b>%1$s</b><br/>
+	Example: %2$s
+</p>
+<p>
+Operators:<br/>
+	<b>&gt;</b><em>date</em><br/>
+	<b>&lt;</b><em>date</em><br/>
+	<b>[</b><em>date</em>,<em>date</em><b>]</b>
+</p>~~',
+	'Core:AttributeDeadline' => 'Deadline~~',
+	'Core:AttributeDeadline+' => 'Date, displayed relatively to the current time~~',
+	'Core:AttributeExternalKey' => 'External key~~',
+	'Core:AttributeExternalKey+' => 'External (or foreign) key~~',
+	'Core:AttributeHierarchicalKey' => 'Hierarchical Key~~',
+	'Core:AttributeHierarchicalKey+' => 'External (or foreign) key to the parent~~',
+	'Core:AttributeExternalField' => 'External field~~',
+	'Core:AttributeExternalField+' => 'Field mapped to an external key~~',
+	'Core:AttributeURL' => 'URL~~',
+	'Core:AttributeURL+' => 'Absolute or relative URL as a text string~~',
+	'Core:AttributeBlob' => 'Blob~~',
+	'Core:AttributeBlob+' => 'Any binary content (document)~~',
+	'Core:AttributeOneWayPassword' => 'One way password~~',
+	'Core:AttributeOneWayPassword+' => 'One way encrypted (hashed) password~~',
+	'Core:AttributeTable' => 'Table~~',
+	'Core:AttributeTable+' => 'Indexed array having two dimensions~~',
+	'Core:AttributePropertySet' => 'Properties~~',
+	'Core:AttributePropertySet+' => 'List of untyped properties (name and value)~~',
+	'Core:AttributeFriendlyName' => 'Friendly name~~',
+	'Core:AttributeFriendlyName+' => 'Attribute created automatically ; the friendly name is computed after several attributes~~',
+	'Core:FriendlyName-Label' => 'Friendly name~~',
+	'Core:FriendlyName-Description' => 'Friendly name~~',
+	'Change:ObjectModified' => 'Object modified~~',
+	'Change:AttName_EntryAdded' => '%1$s modified, new entry added.~~',
+	'Change:LinkSet:Added' => 'added %1$s~~',
+	'Change:LinkSet:Removed' => 'removed %1$s~~',
+	'Change:LinkSet:Modified' => 'modified %1$s~~',
+	'Class:EventNotificationEmail/Attribute:attachments' => 'Attachments~~',
+	'Class:EventLoginUsage' => 'Login Usage~~',
+	'Class:EventLoginUsage+' => 'Connection to the application~~',
+	'Class:EventLoginUsage/Attribute:user_id' => 'Login~~',
+	'Class:EventLoginUsage/Attribute:user_id+' => 'Login~~',
+	'Class:EventLoginUsage/Attribute:contact_name' => 'User Name~~',
+	'Class:EventLoginUsage/Attribute:contact_name+' => 'User Name~~',
+	'Class:EventLoginUsage/Attribute:contact_email' => 'User Email~~',
+	'Class:EventLoginUsage/Attribute:contact_email+' => 'Email Address of the User~~',
+	'Class:TriggerOnObject/Attribute:filter' => 'Filter~~',
+	'TriggerOnObject:WrongFilterQuery' => 'Wrong filter query: %1$s~~',
+	'TriggerOnObject:WrongFilterClass' => 'The filter query must return objects of class \"%1$s\"~~',
+	'Class:TriggerOnPortalUpdate' => 'Trigger (when updated from the portal)~~',
+	'Class:TriggerOnPortalUpdate+' => 'Trigger on a end-user\'s update from the portal~~',
+	'Class:TriggerOnThresholdReached' => 'Trigger (on threshold)~~',
+	'Class:TriggerOnThresholdReached+' => 'Trigger on Stop-Watch threshold reached~~',
+	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Stop watch~~',
+	'Class:TriggerOnThresholdReached/Attribute:threshold_index' => 'Threshold~~',
+	'Class:SynchroDataSource/Attribute:name' => 'Name~~',
+	'Class:SynchroDataSource/Attribute:name+' => 'Name~~',
+	'Class:SynchroDataSource/Attribute:description' => 'Description~~',
+	'Class:SynchroDataSource/Attribute:status' => 'Status~~',
+	'Class:SynchroDataSource/Attribute:scope_class' => 'Target class~~',
+	'Class:SynchroDataSource/Attribute:user_id' => 'User~~',
+	'Class:SynchroDataSource/Attribute:notify_contact_id' => 'Contact to notify~~',
+	'Class:SynchroDataSource/Attribute:notify_contact_id+' => 'Contact to notify in case of error~~',
+	'Class:SynchroDataSource/Attribute:url_icon' => 'Icon\'s hyperlink~~',
+	'Class:SynchroDataSource/Attribute:url_icon+' => 'Hyperlink a (small) image representing the application with which iTop is synchronized~~',
+	'Class:SynchroDataSource/Attribute:url_application' => 'Application\'s hyperlink~~',
+	'Class:SynchroDataSource/Attribute:url_application+' => 'Hyperlink to the iTop object in the external application with which iTop is synchronized (if applicable). Possible placeholders: $this->attribute$ and $replica->primary_key$~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy' => 'Reconciliation policy~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity' => 'Full load interval~~',
+	'Class:SynchroDataSource/Attribute:full_load_periodicity+' => 'A complete reload of all data must occur at least as often as specified here~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero' => 'Action on zero~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero+' => 'Action taken when the search returns no object~~',
+	'Class:SynchroDataSource/Attribute:action_on_one' => 'Action on one~~',
+	'Class:SynchroDataSource/Attribute:action_on_one+' => 'Action taken when the search returns exactly one object~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple' => 'Action on many~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple+' => 'Action taken when the search returns more than one object~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy' => 'Users allowed~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy+' => 'Who is allowed to delete synchronized objects~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:never' => 'Nobody~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:depends' => 'Administrators only~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:always' => 'All allowed users~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_update' => 'Update rules~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_update+' => 'Syntax: field_name:value; ...~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention' => 'Retention Duration~~',
+	'Class:SynchroDataSource/Attribute:delete_policy_retention+' => 'How much time an obsolete object is kept before being deleted~~',
+	'Class:SynchroDataSource/Attribute:database_table_name' => 'Data table~~',
+	'Class:SynchroDataSource/Attribute:database_table_name+' => 'Name of the table to store the synchronization data. If left empty, a default name will be computed.~~',
+	'SynchroDataSource:Description' => 'Description~~',
+	'SynchroDataSource:Reconciliation' => 'Search &amp; reconciliation~~',
+	'SynchroDataSource:Deletion' => 'Deletion rules~~',
+	'SynchroDataSource:Status' => 'Status~~',
+	'SynchroDataSource:Information' => 'Information~~',
+	'SynchroDataSource:Definition' => 'Definition~~',
+	'Core:SynchroAttributes' => 'Attributes~~',
+	'Core:SynchroStatus' => 'Status~~',
+	'Core:Synchro:ErrorsLabel' => 'Errors~~',
+	'Core:Synchro:CreatedLabel' => 'Created~~',
+	'Core:Synchro:ModifiedLabel' => 'Modified~~',
+	'Core:Synchro:UnchangedLabel' => 'Unchanged~~',
+	'Core:Synchro:ReconciledErrorsLabel' => 'Errors~~',
+	'Core:Synchro:ReconciledLabel' => 'Reconciled~~',
+	'Core:Synchro:ReconciledNewLabel' => 'Created~~',
+	'Core:SynchroReconcile:Yes' => 'Yes~~',
+	'Core:SynchroReconcile:No' => 'No~~',
+	'Core:SynchroUpdate:Yes' => 'Yes~~',
+	'Core:SynchroUpdate:No' => 'No~~',
+	'Core:Synchro:LastestStatus' => 'Latest Status~~',
+	'Core:Synchro:History' => 'Synchronization History~~',
+	'Core:Synchro:NeverRun' => 'This synchro was never run. No log yet.~~',
+	'Core:Synchro:SynchroEndedOn_Date' => 'The latest synchronization ended on %1$s.~~',
+	'Core:Synchro:SynchroRunningStartedOn_Date' => 'The synchronization started on %1$s is still running...~~',
+	'Menu:DataSources' => 'Synchronization Data Sources~~',
+	'Menu:DataSources+' => 'All Synchronization Data Sources~~',
+	'Core:Synchro:label_repl_ignored' => 'Ignored (%1$s)~~',
+	'Core:Synchro:label_repl_disappeared' => 'Disappeared (%1$s)~~',
+	'Core:Synchro:label_repl_existing' => 'Existing (%1$s)~~',
+	'Core:Synchro:label_repl_new' => 'New (%1$s)~~',
+	'Core:Synchro:label_obj_deleted' => 'Deleted (%1$s)~~',
+	'Core:Synchro:label_obj_obsoleted' => 'Obsoleted (%1$s)~~',
+	'Core:Synchro:label_obj_disappeared_errors' => 'Errors (%1$s)~~',
+	'Core:Synchro:label_obj_disappeared_no_action' => 'No Action (%1$s)~~',
+	'Core:Synchro:label_obj_unchanged' => 'Unchanged (%1$s)~~',
+	'Core:Synchro:label_obj_updated' => 'Updated (%1$s)~~',
+	'Core:Synchro:label_obj_updated_errors' => 'Errors (%1$s)~~',
+	'Core:Synchro:label_obj_new_unchanged' => 'Unchanged (%1$s)~~',
+	'Core:Synchro:label_obj_new_updated' => 'Updated (%1$s)~~',
+	'Core:Synchro:label_obj_created' => 'Created (%1$s)~~',
+	'Core:Synchro:label_obj_new_errors' => 'Errors (%1$s)~~',
+	'Core:SynchroLogTitle' => '%1$s - %2$s~~',
+	'Core:Synchro:Nb_Replica' => 'Replica processed: %1$s~~',
+	'Core:Synchro:Nb_Class:Objects' => '%1$s: %2$s~~',
+	'Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified' => 'At Least one reconciliation key must be specified, or the reconciliation policy must be to use the primary key.~~',
+	'Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified' => 'A delete retention period must be specified, since objects are to be deleted after being marked as obsolete~~',
+	'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.~~',
+	'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.~~',
+	'Core:SynchroReplica:PublicData' => 'Public Data~~',
+	'Core:SynchroReplica:PrivateDetails' => 'Private Details~~',
+	'Core:SynchroReplica:BackToDataSource' => 'Go Back to the Synchro Data Source: %1$s~~',
+	'Core:SynchroReplica:ListOfReplicas' => 'List of Replica~~',
+	'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)~~',
+	'Core:SynchroAtt:attcode' => 'Attribute~~',
+	'Core:SynchroAtt:attcode+' => 'Field of the object~~',
+	'Core:SynchroAtt:reconciliation' => 'Reconciliation ?~~',
+	'Core:SynchroAtt:reconciliation+' => 'Used for searching~~',
+	'Core:SynchroAtt:update' => 'Update ?~~',
+	'Core:SynchroAtt:update+' => 'Used to update the object~~',
+	'Core:SynchroAtt:update_policy' => 'Update Policy~~',
+	'Core:SynchroAtt:update_policy+' => 'Behavior of the updated field~~',
+	'Core:SynchroAtt:reconciliation_attcode' => 'Reconciliation Key~~',
+	'Core:SynchroAtt:reconciliation_attcode+' => 'Attribute Code for the External Key Reconciliation~~',
+	'Core:SyncDataExchangeComment' => '(Data Synchro)~~',
+	'Core:Synchro:ListOfDataSources' => 'List of data sources:~~',
+	'Core:Synchro:LastSynchro' => 'Last synchronization:~~',
+	'Core:Synchro:ThisObjectIsSynchronized' => 'This object is synchronized with an external data source~~',
+	'Core:Synchro:TheObjectWasCreatedBy_Source' => 'The object was <b>created</b> by the external data source %1$s~~',
+	'Core:Synchro:TheObjectCanBeDeletedBy_Source' => 'The object <b>can be deleted</b> by the external data source %1$s~~',
+	'Core:Synchro:TheObjectCannotBeDeletedByUser_Source' => 'You <b>cannot delete the object</b> because it is owned by the external data source %1$s~~',
+	'TitleSynchroExecution' => 'Execution of the synchronization~~',
+	'Class:SynchroDataSource:DataTable' => 'Database table: %1$s~~',
+	'Core:SyncDataSourceObsolete' => 'The data source is marked as obsolete. Operation cancelled.~~',
+	'Core:SyncDataSourceAccessRestriction' => 'Only adminstrators or the user specified in the data source can execute this operation. Operation cancelled.~~',
+	'Core:SyncTooManyMissingReplicas' => 'All records have been untouched for some time (all of the objects could be deleted). Please check that the process that writes into the synchronization table is still running. Operation cancelled.~~',
+	'Core:SyncSplitModeCLIOnly' => 'The synchronization can be executed in chunks only if run in mode CLI~~',
+	'Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings' => '%1$s replicas, %2$s error(s), %3$s warning(s).~~',
+	'Core:SynchroReplica:TargetObject' => 'Synchronized Object: %1$s~~',
+	'Class:AsyncSendEmail' => 'Email (asynchronous)~~',
+	'Class:AsyncSendEmail/Attribute:to' => 'To~~',
+	'Class:AsyncSendEmail/Attribute:subject' => 'Subject~~',
+	'Class:AsyncSendEmail/Attribute:body' => 'Body~~',
+	'Class:AsyncSendEmail/Attribute:header' => 'Header~~',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword' => 'Encrypted Password~~',
+	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => 'Previous Value~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted' => 'Encrypted Field~~',
+	'Class:CMDBChangeOpSetAttributeEncrypted/Attribute:prevstring' => 'Previous Value~~',
+	'Class:CMDBChangeOpSetAttributeCaseLog' => 'Case Log~~',
+	'Class:CMDBChangeOpSetAttributeCaseLog/Attribute:lastentry' => 'Last Entry~~',
+	'Class:SynchroDataSource' => 'Synchro Data Source~~',
+	'Class:SynchroDataSource/Attribute:status/Value:implementation' => 'Implementation~~',
+	'Class:SynchroDataSource/Attribute:status/Value:obsolete' => 'Obsolete~~',
+	'Class:SynchroDataSource/Attribute:status/Value:production' => 'Production~~',
+	'Class:SynchroDataSource/Attribute:scope_restriction' => 'Scope restriction~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_attributes' => 'Use the attributes~~',
+	'Class:SynchroDataSource/Attribute:reconciliation_policy/Value:use_primary_key' => 'Use the primary_key field~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:create' => 'Create~~',
+	'Class:SynchroDataSource/Attribute:action_on_zero/Value:error' => 'Error~~',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:error' => 'Error~~',
+	'Class:SynchroDataSource/Attribute:action_on_one/Value:update' => 'Update~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:create' => 'Create~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:error' => 'Error~~',
+	'Class:SynchroDataSource/Attribute:action_on_multiple/Value:take_first' => 'Take the first one (random?)~~',
+	'Class:SynchroDataSource/Attribute:delete_policy' => 'Delete Policy~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:delete' => 'Delete~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:ignore' => 'Ignore~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update' => 'Update~~',
+	'Class:SynchroDataSource/Attribute:delete_policy/Value:update_then_delete' => 'Update then Delete~~',
+	'Class:SynchroDataSource/Attribute:attribute_list' => 'Attributes List~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:administrators' => 'Administrators only~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:everybody' => 'Everybody allowed to delete such objects~~',
+	'Class:SynchroDataSource/Attribute:user_delete_policy/Value:nobody' => 'Nobody~~',
+	'Class:SynchroAttribute' => 'Synchro Attribute~~',
+	'Class:SynchroAttribute/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroAttribute/Attribute:attcode' => 'Attribute Code~~',
+	'Class:SynchroAttribute/Attribute:update' => 'Update~~',
+	'Class:SynchroAttribute/Attribute:reconcile' => 'Reconcile~~',
+	'Class:SynchroAttribute/Attribute:update_policy' => 'Update Policy~~',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => 'Locked~~',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => 'Unlocked~~',
+	'Class:SynchroAttribute/Attribute:update_policy/Value:write_if_empty' => 'Initialize if empty~~',
+	'Class:SynchroAttribute/Attribute:finalclass' => 'Class~~',
+	'Class:SynchroAttExtKey' => 'Synchro Attribute (ExtKey)~~',
+	'Class:SynchroAttExtKey/Attribute:reconciliation_attcode' => 'Reconciliation Attribute~~',
+	'Class:SynchroAttLinkSet' => 'Synchro Attribute (Linkset)~~',
+	'Class:SynchroAttLinkSet/Attribute:row_separator' => 'Rows separator~~',
+	'Class:SynchroAttLinkSet/Attribute:attribute_separator' => 'Attributes separator~~',
+	'Class:SynchroLog' => 'Synchr Log~~',
+	'Class:SynchroLog/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroLog/Attribute:start_date' => 'Start Date~~',
+	'Class:SynchroLog/Attribute:end_date' => 'End Date~~',
+	'Class:SynchroLog/Attribute:status' => 'Status~~',
+	'Class:SynchroLog/Attribute:status/Value:completed' => 'Completed~~',
+	'Class:SynchroLog/Attribute:status/Value:error' => 'Error~~',
+	'Class:SynchroLog/Attribute:status/Value:running' => 'Still Running~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_seen' => 'Nb replica seen~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_total' => 'Nb replica total~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted' => 'Nb objects deleted~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_deleted_errors' => 'Nb of errors while deleting~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted' => 'Nb objects obsoleted~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_obsoleted_errors' => 'Nb of errors while obsoleting~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created' => 'Nb objects created~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_created_errors' => 'Nb or errors while creating~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated' => 'Nb objects updated~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_updated_errors' => 'Nb errors while updating~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_reconciled_errors' => 'Nb of errors during reconciliation~~',
+	'Class:SynchroLog/Attribute:stats_nb_replica_disappeared_no_action' => 'Nb replica disappeared~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_updated' => 'Nb objects updated~~',
+	'Class:SynchroLog/Attribute:stats_nb_obj_new_unchanged' => 'Nb objects unchanged~~',
+	'Class:SynchroLog/Attribute:last_error' => 'Last error~~',
+	'Class:SynchroLog/Attribute:traces' => 'Traces~~',
+	'Class:SynchroReplica' => 'Synchro Replica~~',
+	'Class:SynchroReplica/Attribute:sync_source_id' => 'Synchro Data Source~~',
+	'Class:SynchroReplica/Attribute:dest_id' => 'Destination object (ID)~~',
+	'Class:SynchroReplica/Attribute:dest_class' => 'Destination type~~',
+	'Class:SynchroReplica/Attribute:status_last_seen' => 'Last seen~~',
+	'Class:SynchroReplica/Attribute:status' => 'Status~~',
+	'Class:SynchroReplica/Attribute:status/Value:modified' => 'Modified~~',
+	'Class:SynchroReplica/Attribute:status/Value:new' => 'New~~',
+	'Class:SynchroReplica/Attribute:status/Value:obsolete' => 'Obsolete~~',
+	'Class:SynchroReplica/Attribute:status/Value:orphan' => 'Orphan~~',
+	'Class:SynchroReplica/Attribute:status/Value:synchronized' => 'Synchronized~~',
+	'Class:SynchroReplica/Attribute:status_dest_creator' => 'Object Created ?~~',
+	'Class:SynchroReplica/Attribute:status_last_error' => 'Last Error~~',
+	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings~~',
+	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date~~',
+	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date~~',
+	'Class:appUserPreferences' => 'User Preferences~~',
+	'Class:appUserPreferences/Attribute:userid' => 'User~~',
+	'Class:appUserPreferences/Attribute:preferences' => 'Prefs~~',
+	'Core:ExecProcess:Code1' => 'Wrong command or command finished with errors (e.g. wrong script name)~~',
+	'Core:ExecProcess:Code255' => 'PHP Error (parsing, or runtime)~~',
+	'Core:Duration_Seconds' => '%1$ds~~',
+	'Core:Duration_Minutes_Seconds' => '%1$dmin %2$ds~~',
+	'Core:Duration_Hours_Minutes_Seconds' => '%1$dh %2$dmin %3$ds~~',
+	'Core:Duration_Days_Hours_Minutes_Seconds' => '%1$sd %2$dh %3$dmin %4$ds~~',
+	'Core:ExplainWTC:ElapsedTime' => 'Time elapsed (stored as \"%1$s\")~~',
+	'Core:ExplainWTC:StopWatch-TimeSpent' => 'Time spent for \"%1$s\"~~',
+	'Core:ExplainWTC:StopWatch-Deadline' => 'Deadline for \"%1$s\" at %2$d%%~~',
+	'Core:BulkExport:MissingParameter_Param' => 'Missing parameter \"%1$s\"~~',
+	'Core:BulkExport:InvalidParameter_Query' => 'Invalid value for the parameter \"query\". There is no Query Phrasebook corresponding to the id: \"%1$s\".~~',
+	'Core:BulkExport:ExportFormatPrompt' => 'Export format:~~',
+	'Core:BulkExportOf_Class' => '%1$s Export~~',
+	'Core:BulkExport:ClickHereToDownload_FileName' => 'Click here to download %1$s~~',
+	'Core:BulkExport:ExportResult' => 'Result of the export:~~',
+	'Core:BulkExport:RetrievingData' => 'Retrieving data...~~',
+	'Core:BulkExport:HTMLFormat' => 'Web Page (*.html)~~',
+	'Core:BulkExport:CSVFormat' => 'Comma Separated Values (*.csv)~~',
+	'Core:BulkExport:XLSXFormat' => 'Excel 2007 or newer (*.xlsx)~~',
+	'Core:BulkExport:PDFFormat' => 'PDF Document (*.pdf)~~',
+	'Core:BulkExport:DragAndDropHelp' => 'Drag and drop the columns\' headers to arrange the columns. Preview of %1$s lines. Total number of lines to export: %2$s.~~',
+	'Core:BulkExport:EmptyPreview' => 'Select the columns to be exported from the list above~~',
+	'Core:BulkExport:ColumnsOrder' => 'Columns order~~',
+	'Core:BulkExport:AvailableColumnsFrom_Class' => 'Available columns from %1$s~~',
+	'Core:BulkExport:NoFieldSelected' => 'Select at least one column to be exported~~',
+	'Core:BulkExport:CheckAll' => 'Check All~~',
+	'Core:BulkExport:UncheckAll' => 'Uncheck All~~',
+	'Core:BulkExport:ExportCancelledByUser' => 'Export cancelled by the user~~',
+	'Core:BulkExport:CSVOptions' => 'CSV Options~~',
+	'Core:BulkExport:CSVLocalization' => 'Localization~~',
+	'Core:BulkExport:PDFOptions' => 'PDF Options~~',
+	'Core:BulkExport:PDFPageFormat' => 'Page Format~~',
+	'Core:BulkExport:PDFPageSize' => 'Page Size:~~',
+	'Core:BulkExport:PageSize-A4' => 'A4~~',
+	'Core:BulkExport:PageSize-A3' => 'A3~~',
+	'Core:BulkExport:PageSize-Letter' => 'Letter~~',
+	'Core:BulkExport:PDFPageOrientation' => 'Page Orientation:~~',
+	'Core:BulkExport:PageOrientation-L' => 'Landscape~~',
+	'Core:BulkExport:PageOrientation-P' => 'Portrait~~',
+	'Core:BulkExport:XMLFormat' => 'XML file (*.xml)~~',
+	'Core:BulkExport:XMLOptions' => 'XML Options~~',
+	'Core:BulkExport:SpreadsheetFormat' => 'Spreadsheet HTML format (*.html)~~',
+	'Core:BulkExport:SpreadsheetOptions' => 'Spreadsheet Options~~',
+	'Core:BulkExport:OptionLinkSets' => 'Include linked objects~~',
+	'Core:BulkExport:OptionNoLocalize' => 'Do not localize the values (for Enumerated fields)~~',
+	'Core:BulkExport:OptionFormattedText' => 'Preserve text formatting~~',
+	'Core:BulkExport:ScopeDefinition' => 'Definition of the objects to export~~',
+	'Core:BulkExportLabelOQLExpression' => 'OQL Query:~~',
+	'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:~~',
+	'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.~~',
+	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.~~',
+	'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...~~',
+	'Core:BulkExportCanRunNonInteractive' => 'Click here to run the export in non-interactive mode.~~',
+	'Core:BulkExportLegacyExport' => 'Click here to access the legacy export.~~',
+	'Core:BulkExport:XLSXOptions' => 'Excel Options~~',
+	'Core:BulkExport:TextFormat' => 'Text fields containing some HTML markup~~',
+	'Core:Validator:Default' => 'Wrong format~~',
+	'Core:Validator:Mandatory' => 'Please, fill this field~~',
+	'Core:Validator:MustBeInteger' => 'Must be an integer~~',
+	'Core:Validator:MustSelectOne' => 'Please, select one~~',
 ));
\ No newline at end of file
diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php
index 09ef16124..b9aa25263 100644
--- a/dictionaries/zh.dictionary.itop.ui.php
+++ b/dictionaries/zh.dictionary.itop.ui.php
@@ -1,1278 +1,1278 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Localized data
- *
- * @author      Robert Deng <denglx@gmail.com>
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-  
-//////////////////////////////////////////////////////////////////////
-// Classes in 'gui'
-//////////////////////////////////////////////////////////////////////
-//
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'application'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: AuditCategory
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:AuditCategory' => '审计类目',
-	'Class:AuditCategory+' => '全部审计中的一个区段',
-	'Class:AuditCategory/Attribute:name' => '类目名称',
-	'Class:AuditCategory/Attribute:name+' => '类目简称',
-	'Class:AuditCategory/Attribute:description' => '审计类目描述',
-	'Class:AuditCategory/Attribute:description+' => '该审计类目的详细描述',
-	'Class:AuditCategory/Attribute:definition_set' => '定义',
-	'Class:AuditCategory/Attribute:definition_set+' => '定义用于审计的对象的OQL表达式',
-	'Class:AuditCategory/Attribute:rules_list' => '审计规则',
-	'Class:AuditCategory/Attribute:rules_list+' => '该类目的审计规则',
-));
-
-//
-// Class: AuditRule
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:AuditRule' => '审计规则',
-	'Class:AuditRule+' => '用于检查给定审计类目的规则',
-	'Class:AuditRule/Attribute:name' => '规则名称',
-	'Class:AuditRule/Attribute:name+' => '规则简称',
-	'Class:AuditRule/Attribute:description' => '审计规则描述',
-	'Class:AuditRule/Attribute:description+' => '审计规则详细描述',
-	'Class:AuditRule/Attribute:query' => '要运行的查询',
-	'Class:AuditRule/Attribute:query+' => '要运行的OQL表达式',
-	'Class:AuditRule/Attribute:valid_flag' => '有效对象?',
-	'Class:AuditRule/Attribute:valid_flag+' => '若规则返回有效对象则True,否则False',
-	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
-	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
-	'Class:AuditRule/Attribute:category_id' => '类目',
-	'Class:AuditRule/Attribute:category_id+' => '该规则对应的类目',
-	'Class:AuditRule/Attribute:category_name' => '类目',
-	'Class:AuditRule/Attribute:category_name+' => '该规则对应类目的名称',
-));
-
-//////////////////////////////////////////////////////////////////////
-// Classes in 'addon/userrights'
-//////////////////////////////////////////////////////////////////////
-//
-
-//
-// Class: User
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:User' => '用户',
-	'Class:User+' => '用户登录名',
-	'Class:User/Attribute:finalclass' => '帐户类别',
-	'Class:User/Attribute:finalclass+' => '',
-	'Class:User/Attribute:contactid' => '联系人 (个人)',
-	'Class:User/Attribute:contactid+' => '来自业务数据的个人明细信息',
-	'Class:User/Attribute:last_name' => '名',
-	'Class:User/Attribute:last_name+' => '对应联系人的名字',
-	'Class:User/Attribute:first_name' => '姓',
-	'Class:User/Attribute:first_name+' => '对应联系人的姓氏',
-	'Class:User/Attribute:email' => 'Email',
-	'Class:User/Attribute:email+' => '对应联系人的Email',
-	'Class:User/Attribute:login' => '登录名',
-	'Class:User/Attribute:login+' => '用户标识字符串',
-	'Class:User/Attribute:language' => '语言',
-	'Class:User/Attribute:language+' => '用户语言',
-	'Class:User/Attribute:language/Value:EN US' => 'English',
-	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
-	'Class:User/Attribute:language/Value:FR FR' => 'French',
-	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
-	'Class:User/Attribute:profile_list' => '简档',
-	'Class:User/Attribute:profile_list+' => '角色, 为该人员授权',
-	'Class:User/Attribute:allowed_org_list' => '被许可的组织',
-	'Class:User/Attribute:allowed_org_list+' => '终端用户被许可看到下述组织的数据. 如果没有指定的组织,则无限制.',
-
-	'Class:User/Error:LoginMustBeUnique' => '登录名必须唯一 - "%1s" 已经被使用.',
-	'Class:User/Error:AtLeastOneProfileIsNeeded' => '至少一个简档必须指定给该用户.',
-));
-
-//
-// Class: URP_Profiles
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_Profiles' => '简档',
-	'Class:URP_Profiles+' => '用户简档',
-	'Class:URP_Profiles/Attribute:name' => '名称',
-	'Class:URP_Profiles/Attribute:name+' => '标签',
-	'Class:URP_Profiles/Attribute:description' => '描述',
-	'Class:URP_Profiles/Attribute:description+' => '单行描述',
-	'Class:URP_Profiles/Attribute:user_list' => '用户',
-	'Class:URP_Profiles/Attribute:user_list+' => '拥有该角色的人员',
-));
-
-//
-// Class: URP_Dimensions
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_Dimensions' => '维度',
-	'Class:URP_Dimensions+' => '应用维度 (定义纵深)',
-	'Class:URP_Dimensions/Attribute:name' => '名称',
-	'Class:URP_Dimensions/Attribute:name+' => '标签',
-	'Class:URP_Dimensions/Attribute:description' => '描述',
-	'Class:URP_Dimensions/Attribute:description+' => '单行描述',
-	'Class:URP_Dimensions/Attribute:type' => '类别',
-	'Class:URP_Dimensions/Attribute:type+' => '类名称或数据类别 (投影单位)',
-));
-
-//
-// Class: URP_UserProfile
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_UserProfile' => '简档目标用户',
-	'Class:URP_UserProfile+' => '用户的简档',
-	'Class:URP_UserProfile/Attribute:userid' => '用户',
-	'Class:URP_UserProfile/Attribute:userid+' => '用户帐户',
-	'Class:URP_UserProfile/Attribute:userlogin' => '登录名',
-	'Class:URP_UserProfile/Attribute:userlogin+' => '用户的登录名',
-	'Class:URP_UserProfile/Attribute:profileid' => '简档',
-	'Class:URP_UserProfile/Attribute:profileid+' => '使用简档',
-	'Class:URP_UserProfile/Attribute:profile' => '简档',
-	'Class:URP_UserProfile/Attribute:profile+' => '简档名称',
-	'Class:URP_UserProfile/Attribute:reason' => '原因',
-	'Class:URP_UserProfile/Attribute:reason+' => '解释为什么该人员需要拥有该角色',
-));
-
-//
-// Class: URP_UserOrg
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_UserOrg' => '用户组织',
-	'Class:URP_UserOrg+' => '被许可的组织',
-	'Class:URP_UserOrg/Attribute:userid' => '用户',
-	'Class:URP_UserOrg/Attribute:userid+' => '用户帐户',
-	'Class:URP_UserOrg/Attribute:userlogin' => '登录名',
-	'Class:URP_UserOrg/Attribute:userlogin+' => '用户的登录名',
-	'Class:URP_UserOrg/Attribute:allowed_org_id' => '组织',
-	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '被许可的组织',
-	'Class:URP_UserOrg/Attribute:allowed_org_name' => '组织',
-	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '被许可的组织',
-	'Class:URP_UserOrg/Attribute:reason' => '原因',
-	'Class:URP_UserOrg/Attribute:reason+' => '解释为什么该人员被许可查阅该组织的数据',
-));
-
-//
-// Class: URP_ProfileProjection
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_ProfileProjection' => '简档投射',
-	'Class:URP_ProfileProjection+' => '简档投射',
-	'Class:URP_ProfileProjection/Attribute:dimensionid' => '维度',
-	'Class:URP_ProfileProjection/Attribute:dimensionid+' => '应用维度',
-	'Class:URP_ProfileProjection/Attribute:dimension' => '维度',
-	'Class:URP_ProfileProjection/Attribute:dimension+' => '应用维度',
-	'Class:URP_ProfileProjection/Attribute:profileid' => '简档',
-	'Class:URP_ProfileProjection/Attribute:profileid+' => '使用简档',
-	'Class:URP_ProfileProjection/Attribute:profile' => '简档',
-	'Class:URP_ProfileProjection/Attribute:profile+' => '简档名称',
-	'Class:URP_ProfileProjection/Attribute:value' => '值表达式',
-	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant |  | +attribute code',
-	'Class:URP_ProfileProjection/Attribute:attribute' => '属性',
-	'Class:URP_ProfileProjection/Attribute:attribute+' => '目标属性编码 (可选)',
-));
-
-//
-// Class: URP_ClassProjection
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_ClassProjection' => '类投射',
-	'Class:URP_ClassProjection+' => '类投射',
-	'Class:URP_ClassProjection/Attribute:dimensionid' => '维度',
-	'Class:URP_ClassProjection/Attribute:dimensionid+' => '应用维度',
-	'Class:URP_ClassProjection/Attribute:dimension' => '维度',
-	'Class:URP_ClassProjection/Attribute:dimension+' => '应用维度',
-	'Class:URP_ClassProjection/Attribute:class' => '类',
-	'Class:URP_ClassProjection/Attribute:class+' => '目标类',
-	'Class:URP_ClassProjection/Attribute:value' => '值表达式',
-	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant |  | +attribute code',
-	'Class:URP_ClassProjection/Attribute:attribute' => '属性',
-	'Class:URP_ClassProjection/Attribute:attribute+' => '目标属性编码 (可选)',
-));
-
-//
-// Class: URP_ActionGrant
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_ActionGrant' => '动作许可',
-	'Class:URP_ActionGrant+' => '类上的许可',
-	'Class:URP_ActionGrant/Attribute:profileid' => '简档',
-	'Class:URP_ActionGrant/Attribute:profileid+' => '使用简档',
-	'Class:URP_ActionGrant/Attribute:profile' => '简档',
-	'Class:URP_ActionGrant/Attribute:profile+' => '使用简档',
-	'Class:URP_ActionGrant/Attribute:class' => '类',
-	'Class:URP_ActionGrant/Attribute:class+' => '目标类',
-	'Class:URP_ActionGrant/Attribute:permission' => '许可',
-	'Class:URP_ActionGrant/Attribute:permission+' => '允许或不允许?',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => '是',
-	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => '是',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no' => '否',
-	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => '否',
-	'Class:URP_ActionGrant/Attribute:action' => '动作',
-	'Class:URP_ActionGrant/Attribute:action+' => '可用于给定类上的操作',
-));
-
-//
-// Class: URP_StimulusGrant
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_StimulusGrant' => '刺激许可',
-	'Class:URP_StimulusGrant+' => '对象生命周期中刺激的许可',
-	'Class:URP_StimulusGrant/Attribute:profileid' => '简档',
-	'Class:URP_StimulusGrant/Attribute:profileid+' => '使用简档',
-	'Class:URP_StimulusGrant/Attribute:profile' => '简档',
-	'Class:URP_StimulusGrant/Attribute:profile+' => '使用简档',
-	'Class:URP_StimulusGrant/Attribute:class' => '类',
-	'Class:URP_StimulusGrant/Attribute:class+' => '目标类',
-	'Class:URP_StimulusGrant/Attribute:permission' => '许可',
-	'Class:URP_StimulusGrant/Attribute:permission+' => '允许或不允许?',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => '是',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => '是',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => '否',
-	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => '否',
-	'Class:URP_StimulusGrant/Attribute:stimulus' => '刺激',
-	'Class:URP_StimulusGrant/Attribute:stimulus+' => '刺激编码',
-));
-
-//
-// Class: URP_AttributeGrant
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Class:URP_AttributeGrant' => '属性许可',
-	'Class:URP_AttributeGrant+' => '属性层次上的许可',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid' => '动作准许',
-	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '动作准许',
-	'Class:URP_AttributeGrant/Attribute:attcode' => '属性',
-	'Class:URP_AttributeGrant/Attribute:attcode+' => '属性编码',
-));
-
-//
-// String from the User Interface: menu, messages, buttons, etc...
-//
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'BooleanLabel:yes' => '是',
-	'BooleanLabel:no' => '否',
-	'Menu:WelcomeMenu' => '欢迎', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenu+' => '欢迎来到iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage' => '欢迎', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:WelcomeMenuPage+' => '欢迎来到iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:WelcomeMenu:Title' => '欢迎来到iTop',
-
-	'UI:WelcomeMenu:LeftBlock' => '<p>iTop 是完全的, 开发源码的, IT 操作门户.</p>
-<ul>系统包括:
-<li>完全的 CMDB (Configuration management database) 记录和管理 IT 资产清册.</li>
-<li>事件管理模块跟踪和传递所有发生在 IT 系统中的事件.</li>
-<li>变更管理模块规划和跟踪 IT 环境中发生的变化.</li>
-<li>已知的错误数据库加速事件的处理.</li>
-<li>停损模块记录所有计划的停机并通知对应的联系人.</li>
-<li>通过仪表板迅速获得 IT 的概览.</li>
-</ul>
-<p>所有模块可以各自独立地、一步一步地搭建.</p>',
-
-	'UI:WelcomeMenu:RightBlock' => '<p>iTop 是面向服务提供商的, 它使得 IT 工程师方便地管理多客户和多组织.
-<ul>iTop, 提供功能丰富的业务处理流程:
-<li>提高 IT 管理效率</li> 
-<li>驱动 IT 操作能力</li> 
-<li>提高用户满意度,从业务能力方面提供执行力.</li>
-</ul>
-</p>
-<p>iTop 是完全开放的,可被集成到您当前的IT管理架构中.</p>
-<p>
-<ul>利用这个新一代的 IT 操作门户, 可以帮助您:
-<li>更好地管理越来越复杂的 IT 环境.</li>
-<li>按照您的步骤实现 ITIL 流程.</li>
-<li>管理您的 IT 中最重要的设施: 文档化.</li>
-</ul>
-</p>',
-	'UI:WelcomeMenu:AllOpenRequests' => '待处理的请求: %1$d',
-	'UI:WelcomeMenu:MyCalls' => '我的请求',
-	'UI:WelcomeMenu:OpenIncidents' => '待处理的事件: %1$d',
-	'UI:WelcomeMenu:AllConfigItems' => '配置项: %1$d',
-	'UI:WelcomeMenu:MyIncidents' => '指派给我的事件',
-	'UI:AllOrganizations' => ' 所有组织 ',
-	'UI:YourSearch' => '您的搜索',
-	'UI:LoggedAsMessage' => '以 %1$s 登录',
-	'UI:LoggedAsMessage+Admin' => '以 %1$s 登录(Administrator)',
-	'UI:Button:Logoff' => '注销',
-	'UI:Button:GlobalSearch' => '搜索',
-	'UI:Button:Search' => '搜索',
-	'UI:Button:Query' => ' 查询 ',
-	'UI:Button:Ok' => '确认',
-	'UI:Button:Cancel' => '取消',
-	'UI:Button:Apply' => '应用',
-	'UI:Button:Back' => ' << Back ',
-	'UI:Button:Next' => ' Next >> ',
-	'UI:Button:Finish' => ' 结束 ',
-	'UI:Button:DoImport' => ' 运行导入 ! ',
-	'UI:Button:Done' => ' 完成 ',
-	'UI:Button:SimulateImport' => ' 激活导入 ',
-	'UI:Button:Test' => '测试!',
-	'UI:Button:Evaluate' => ' 评价 ',
-	'UI:Button:Evaluate:Title' => ' 评价 (Ctrl+Enter)',
-	'UI:Button:AddObject' => ' 添加... ',
-	'UI:Button:BrowseObjects' => ' 浏览... ',
-	'UI:Button:Add' => ' 添加 ',
-	'UI:Button:AddToList' => ' << 添加 ',
-	'UI:Button:RemoveFromList' => ' 移除 >> ',
-	'UI:Button:FilterList' => ' 过滤... ',
-	'UI:Button:Create' => ' 创建 ',
-	'UI:Button:Delete' => ' 删除 ! ',
-	'UI:Button:ChangePassword' => ' 改变密码 ',
-	'UI:Button:ResetPassword' => ' 重置密码 ',
-	
-	'UI:SearchToggle' => '搜索',
-	'UI:ClickToCreateNew' => '创建一个新的 %1$s',
-	'UI:SearchFor_Class' => '搜索 %1$s 对象',
-	'UI:NoObjectToDisplay' => '没有对象可显示.',
-	'UI:Error:MandatoryTemplateParameter_object_id' => '当link_attr被指定时,参数 object_id 是必须的. 检查显示模板的定义.',
-	'UI:Error:MandatoryTemplateParameter_target_attr' => '当 link_attr被指定时, 参数 target_attr 是必须的. 检查显示模板的定义.',
-	'UI:Error:MandatoryTemplateParameter_group_by' => '参数 group_by 是必须的. 检查显示模板的定义.',
-	'UI:Error:InvalidGroupByFields' => 'group by 的栏目列表是无效的: "%1$s".',
-	'UI:Error:UnsupportedStyleOfBlock' => '错误: 不被支持的 block 格式: "%1$s".',
-	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => '错误的链接定义: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
-	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d not found.',
-	'UI:Error:WizardCircularReferenceInDependencies' => '错误: 栏目之间的依赖性出现循环引用, 检查数据模型.',
-	'UI:Error:UploadedFileTooBig' => '上传文件太大. (允许的最大限制是 %1$s). 检查您的 PHP configuration 中 upload_max_filesize 和 post_max_size.',
-	'UI:Error:UploadedFileTruncated.' => '上传的文件被截断 !',
-	'UI:Error:NoTmpDir' => '临时目录未定义.',
-	'UI:Error:CannotWriteToTmp_Dir' => '无法向硬盘写入临时文件. upload_tmp_dir = "%1$s".',
-	'UI:Error:UploadStoppedByExtension_FileName' => '上传因为扩展名被停止. (Original file name = "%1$s").',
-	'UI:Error:UploadFailedUnknownCause_Code' => '文件上传失败, 未知原因. (Error code = "%1$s").',
-	
-	'UI:Error:1ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s.',
-	'UI:Error:2ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s and %2$s.',
-	'UI:Error:3ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s, %2$s and %3$s.',
-	'UI:Error:4ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s, %2$s, %3$s and %4$s.',
-	'UI:Error:IncorrectOQLQuery_Message' => '错误: 错误的 OQL 查询: %1$s',
-	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => '运行该查询时产生了一个错误: %1$s',
-	'UI:Error:ObjectAlreadyUpdated' => '错误: 该对象已被更新.',
-	'UI:Error:ObjectCannotBeUpdated' => '错误: 对象不能被更新.',
-	'UI:Error:ObjectsAlreadyDeleted' => '错误: 对象已被删除!',
-	'UI:Error:BulkDeleteNotAllowedOn_Class' => '您未被允许进行 %1$s 类对象的批量删除',
-	'UI:Error:DeleteNotAllowedOn_Class' => '您未被允许删除 %1$s 类的对象',
-	'UI:Error:BulkModifyNotAllowedOn_Class' => '您未被允许进行 %1$s 类对象的批量更新',
-	'UI:Error:ObjectAlreadyCloned' => '错误: 该对象已被克隆!',
-	'UI:Error:ObjectAlreadyCreated' => '错误: 该对象已被创建!',
-	'UI:Error:Invalid_Stimulus_On_Object_In_State' => '错误: 在对象 %2$s 的 "%3$s" 状态上的无效刺激 "%1$s" .',
-	
-	
-	'UI:GroupBy:Count' => '计数',
-	'UI:GroupBy:Count+' => '元素数量',
-	'UI:CountOfObjects' => '%1$d 个对象匹配给定的条件.',
-	'UI_CountOfObjectsShort' => '%1$d 个对象.',
-	'UI:NoObject_Class_ToDisplay' => '没有 %1$s 可以显示',
-	'UI:History:LastModified_On_By' => '最后修改 %1$s 被 %2$s.',
-	'UI:HistoryTab' => '历史',
-	'UI:NotificationsTab' => '通知',
-	'UI:History:Date' => '日期',
-	'UI:History:Date+' => '变更日期',
-	'UI:History:User' => '用户',
-	'UI:History:User+' => '造成变更的用户',
-	'UI:History:Changes' => '变更',
-	'UI:History:Changes+' => '对该对象所做的变更',
-	'UI:Loading' => '载入...',
-	'UI:Menu:Actions' => '动作',
-	'UI:Menu:OtherActions' => '其他操作',
-	'UI:Menu:New' => '新建...',
-	'UI:Menu:Add' => '添加...',
-	'UI:Menu:Manage' => '管理...',
-	'UI:Menu:EMail' => 'eMail',
-	'UI:Menu:CSVExport' => 'CSV 导出...',
-	'UI:Menu:Modify' => '修改...',
-	'UI:Menu:Delete' => '删除...',
-	'UI:Menu:Manage' => '管理...',
-	'UI:Menu:BulkDelete' => '删除...',
-	'UI:UndefinedObject' => '未定义',
-	'UI:Document:OpenInNewWindow:Download' => '在新窗口打开: %1$s, 下载: %2$s',
-	'UI:SelectAllToggle+' => '选择 / 清除选择 全部',
-	'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
-	'UI:DisplayAll' => '显示全部',
-	'UI:CollapseList' => '收缩',
-	'UI:CountOfResults' => '%1$d 个对象',
-	'UI:ChangesLogTitle' => '变更记录 (%1$d):',
-	'UI:EmptyChangesLogTitle' => '变更记录为空',
-	'UI:SearchFor_Class_Objects' => '搜索 %1$s 对象',
-	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
-	'UI:OQLQueryTab' => 'OQL 查询',
-	'UI:SimpleSearchTab' => '简单搜索',
-	'UI:Details+' => '明细',
-	'UI:SearchValue:Any' => '* 任何 *',
-	'UI:SearchValue:Mixed' => '* 混合 *',
-	'UI:SelectOne' => '-- 选择一个 --',
-	'UI:Login:Welcome' => '欢迎来到 iTop!',
-	'UI:Login:IncorrectLoginPassword' => '错误的登录名/密码, 请重试.',
-	'UI:Login:IdentifyYourself' => '在继续之前, 确定您自己的身份',
-	'UI:Login:UserNamePrompt' => '用户名称',
-	'UI:Login:PasswordPrompt' => '密码',
-	'UI:Login:ChangeYourPassword' => '改变您的密码',
-	'UI:Login:OldPasswordPrompt' => '旧密码',
-	'UI:Login:NewPasswordPrompt' => '新密码',
-	'UI:Login:RetypeNewPasswordPrompt' => '重复新密码',
-	'UI:Login:IncorrectOldPassword' => '错误: 旧密码错误',
-	'UI:LogOffMenu' => '注销',
-	'UI:LogOff:ThankYou' => '谢谢使用iTop',
-	'UI:LogOff:ClickHereToLoginAgain' => '点击这里再次登录...',
-	'UI:ChangePwdMenu' => '改变密码...',
-	'UI:Login:RetypePwdDoesNotMatch' => '新密码和重录的新密码不符!',
-	'UI:Button:Login' => '进入 iTop',
-	'UI:Login:Error:AccessRestricted' => 'iTop 访问被限制. 请联系iTop系统管理员.',
-	'UI:Login:Error:AccessAdmin' => '有系统管理员权限才能访问. 请联系iTop系统管理员.',
-	'UI:CSVImport:MappingSelectOne' => '-- 选择一个 --',
-	'UI:CSVImport:MappingNotApplicable' => '-- 忽略该栏 --',
-	'UI:CSVImport:NoData' => '空的数据..., 请提供数据!',
-	'UI:Title:DataPreview' => '数据预览',
-	'UI:CSVImport:ErrorOnlyOneColumn' => '错误: 数据仅包含一列. 您选择了合适的分隔字符了吗?',
-	'UI:CSVImport:FieldName' => '栏 %1$d',
-	'UI:CSVImport:DataLine1' => '数据行 1',
-	'UI:CSVImport:DataLine2' => '数据行 2',
-	'UI:CSVImport:idField' => 'id (主键)',
-	'UI:Title:BulkImport' => 'iTop - 大批量导入',
-	'UI:Title:BulkImport+' => 'CSV 导入 Wizard',
-	'UI:CSVImport:ClassesSelectOne' => '-- 选择一个 --',
-	'UI:CSVImport:ErrorExtendedAttCode' => '内部错误: "%1$s" 是错误的编码, 因为 "%2$s" 不是类 "%3$s" 的外部健',
-	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d 对象将保持不变.',
-	'UI:CSVImport:ObjectsWillBeModified' => '%1$d 对象将被修改.',
-	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d 对象将被添加.',
-	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d 对象将有错误.',
-	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d 对象保持不变.',
-	'UI:CSVImport:ObjectsWereModified' => '%1$d 对象已被修改.',
-	'UI:CSVImport:ObjectsWereAdded' => '%1$d 对象已被添加.',
-	'UI:CSVImport:ObjectsHadErrors' => '%1$d 对象已有错误.',
-	'UI:Title:CSVImportStep2' => '步骤 2 of 5: CSV 数据选项',
-	'UI:Title:CSVImportStep3' => '步骤 3 of 5: 数据映射',
-	'UI:Title:CSVImportStep4' => '步骤 4 of 5: 导入模拟',
-	'UI:Title:CSVImportStep5' => '步骤 5 of 5: 导入完成',
-	'UI:CSVImport:LinesNotImported' => '无法装载的行:',
-	'UI:CSVImport:LinesNotImported+' => '以下行无法导入因为其中包含错误',
-	'UI:CSVImport:SeparatorComma+' => ', (逗号)',
-	'UI:CSVImport:SeparatorSemicolon+' => '; (分号)',
-	'UI:CSVImport:SeparatorTab+' => 'tab',
-	'UI:CSVImport:SeparatorOther' => '其他:',
-	'UI:CSVImport:QualifierDoubleQuote+' => '" (双引号)',
-	'UI:CSVImport:QualifierSimpleQuote+' => '\' (单引号)',
-	'UI:CSVImport:QualifierOther' => '其他:',
-	'UI:CSVImport:TreatFirstLineAsHeader' => '将第一行视做标题头(列名称)',
-	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '跳过文件开始的 %1$s 行',
-	'UI:CSVImport:CSVDataPreview' => 'CSV 数据预览',
-	'UI:CSVImport:SelectFile' => '选择导入的文件:',
-	'UI:CSVImport:Tab:LoadFromFile' => '从文件装载',
-	'UI:CSVImport:Tab:CopyPaste' => '复制和粘贴数据',
-	'UI:CSVImport:Tab:Templates' => '模板',
-	'UI:CSVImport:PasteData' => '粘贴数据以导入:',
-	'UI:CSVImport:PickClassForTemplate' => '选择下载的模板: ',
-	'UI:CSVImport:SeparatorCharacter' => '分隔字符:',
-	'UI:CSVImport:TextQualifierCharacter' => '文本限定字符',
-	'UI:CSVImport:CommentsAndHeader' => '注释和头',
-	'UI:CSVImport:SelectClass' => '选择类以导入:',
-	'UI:CSVImport:AdvancedMode' => '高级模式',
-	'UI:CSVImport:AdvancedMode+' => '在高级模式中,对象的"id" (主键) 可以被用来修改和重命名对象.' .
-									'不管怎样,列 "id" (如果存在) 只能被用做一个搜索条件,不能与其它搜索条件混用.',
-	'UI:CSVImport:SelectAClassFirst' => '首先选择一个类以配置映射.',
-	'UI:CSVImport:HeaderFields' => '栏目',
-	'UI:CSVImport:HeaderMappings' => '映射',
-	'UI:CSVImport:HeaderSearch' => '搜索?',
-	'UI:CSVImport:AlertIncompleteMapping' => '请为每个栏选择一个映射.',
-	'UI:CSVImport:AlertNoSearchCriteria' => '请选择至少一个搜索条件',
-	'UI:CSVImport:Encoding' => '字符编码',	
-	'UI:UniversalSearchTitle' => 'iTop - 通用搜索',
-	'UI:UniversalSearch:Error' => '错误: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass' => '选择类以搜索: ',
-	
-	'UI:Audit:Title' => 'iTop - CMDB 审计',
-	'UI:Audit:InteractiveAudit' => '交互审计',
-	'UI:Audit:HeaderAuditRule' => '设计规则',
-	'UI:Audit:HeaderNbObjects' => '# 对象',
-	'UI:Audit:HeaderNbErrors' => '# 错误',
-	'UI:Audit:PercentageOk' => '% Ok',
-	
-	'UI:RunQuery:Title' => 'iTop - OQL 查询评估',
-	'UI:RunQuery:QueryExamples' => '查询样例',
-	'UI:RunQuery:HeaderPurpose' => '目的',
-	'UI:RunQuery:HeaderPurpose+' => '该查询的解释',
-	'UI:RunQuery:HeaderOQLExpression' => 'OQL 表达式',
-	'UI:RunQuery:HeaderOQLExpression+' => 'OQL 语法表示的查询',
-	'UI:RunQuery:ExpressionToEvaluate' => '待评估的表达式: ',
-	'UI:RunQuery:MoreInfo' => '该查询的更多信息: ',
-	'UI:RunQuery:DevelopedQuery' => '重新开发的查询表达式: ',
-	'UI:RunQuery:SerializedFilter' => '序列化的过滤器: ',
-	'UI:RunQuery:Error' => '运行该查询时产生了一个错误: %1$s',
-	
-	'UI:Schema:Title' => 'iTop 对象 schema',
-	'UI:Schema:CategoryMenuItem' => '类目 <b>%1$s</b>',
-	'UI:Schema:Relationships' => '关联',
-	'UI:Schema:AbstractClass' => '抽象类: 该类不能实例化对象.',
-	'UI:Schema:NonAbstractClass' => '非抽象类: 该类可以实例化对象.',
-	'UI:Schema:ClassHierarchyTitle' => '类层级',
-	'UI:Schema:AllClasses' => '所有类',
-	'UI:Schema:ExternalKey_To' => '%1$s的外部键',
-	'UI:Schema:Columns_Description' => '列: <em>%1$s</em>',
-	'UI:Schema:Default_Description' => '缺省: "%1$s"',
-	'UI:Schema:NullAllowed' => '允许空',
-	'UI:Schema:NullNotAllowed' => '不允许空',
-	'UI:Schema:Attributes' => '属性',
-	'UI:Schema:AttributeCode' => '属性编码',
-	'UI:Schema:AttributeCode+' => '属性的内部编码',
-	'UI:Schema:Label' => '标签',
-	'UI:Schema:Label+' => '属性标签',
-	'UI:Schema:Type' => '类别',
-	
-	'UI:Schema:Type+' => '属性的数据类型',
-	'UI:Schema:Origin' => '起源',
-	'UI:Schema:Origin+' => '该属性被定义的基类',
-	'UI:Schema:Description' => '描述',
-	'UI:Schema:Description+' => '属性的描述',
-	'UI:Schema:AllowedValues' => '允许值',
-	'UI:Schema:AllowedValues+' => '该属性取值的限制',
-	'UI:Schema:MoreInfo' => '更多信息',
-	'UI:Schema:MoreInfo+' => '该栏目在数据库中被定义的更多信息',
-	'UI:Schema:SearchCriteria' => '搜索条件',
-	'UI:Schema:FilterCode' => '过滤器编码',
-	'UI:Schema:FilterCode+' => '该搜索条件的编码',
-	'UI:Schema:FilterDescription' => '描述',
-	'UI:Schema:FilterDescription+' => '该搜索条件的描述',
-	'UI:Schema:AvailOperators' => '可用的算子',
-	'UI:Schema:AvailOperators+' => '该搜索条件可能的算子',
-	'UI:Schema:ChildClasses' => '子类',
-	'UI:Schema:ReferencingClasses' => '参考类',
-	'UI:Schema:RelatedClasses' => '关联类',
-	'UI:Schema:LifeCycle' => '生命周期',
-	'UI:Schema:Triggers' => '触发器',
-	'UI:Schema:Relation_Code_Description' => '关联 <em>%1$s</em> (%2$s)',
-	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
-	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
-	'UI:Schema:RelationPropagates' => '%1$s: 繁殖到 %2$d 个层级, 查询: %3$s',
-	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 没有繁殖 (%2$d 层级), 查询: %3$s',
-	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s 被类 %2$s 参照, 通过栏目 %3$s',
-	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s 被链接到 %2$s 通过 %3$s::<em>%4$s</em>',
-	'UI:Schema:Links:1-n' => '类指向 %1$s (1:n 链接):',
-	'UI:Schema:Links:n-n' => '类链接到 %1$s (n:n 链接):',
-	'UI:Schema:Links:All' => '全部相关类的图',
-	'UI:Schema:NoLifeCyle' => '该类没有生命周期的定义.',
-	'UI:Schema:LifeCycleTransitions' => '转换',
-	'UI:Schema:LifeCyleAttributeOptions' => '属性选项',
-	'UI:Schema:LifeCycleHiddenAttribute' => '隐藏',
-	'UI:Schema:LifeCycleReadOnlyAttribute' => '只读',
-	'UI:Schema:LifeCycleMandatoryAttribute' => '必须',
-	'UI:Schema:LifeCycleAttributeMustChange' => '必须变更',
-	'UI:Schema:LifeCycleAttributeMustPrompt' => '用户将被提示改变值',
-	'UI:Schema:LifeCycleEmptyList' => '空列表',
-	'UI:Schema:ClassFilter' => 'Class:~~',
-	'UI:Schema:DisplayLabel' => 'Display:~~',
-	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
-	'UI:Schema:DisplaySelector/Label' => 'Label~~',
-	'UI:Schema:DisplaySelector/Code' => 'Code~~',
-	'UI:Schema:Attribute/Filter' => 'Filter~~',
-	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
-	'UI:LinksWidget:Autocomplete+' => '输入前3个字符...',
-	'UI:Combo:SelectValue' => '--- 选择一个值 ---',
-	'UI:Label:SelectedObjects' => '被选对象: ',
-	'UI:Label:AvailableObjects' => '可用对象: ',
-	'UI:Link_Class_Attributes' => '%1$s 属性',
-	'UI:SelectAllToggle+' => '选择全部 / 清楚全部选择',
-	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '添加 %1$s 个对象, 链接 %2$s: %3$s',
-	'UI:AddObjectsOf_Class_LinkedWith_Class' => '添加 %1$s 个对象与 %2$s 链接',
-	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '管理 %1$s 个对象, 链接 %2$s: %3$s',
-	'UI:AddLinkedObjectsOf_Class' => '添加 %1$s...',
-	'UI:RemoveLinkedObjectsOf_Class' => '移除选择的对象',
-	'UI:Message:EmptyList:UseAdd' => '列表是空的, 使用 "添加..." 按扭以添加元素.',
-	'UI:Message:EmptyList:UseSearchForm' => '使用上面的搜索表单, 以搜索要添加的对象.',
-	
-	'UI:Wizard:FinalStepTitle' => '最后步骤: 确认',
-	'UI:Title:DeletionOf_Object' => '删除 %1$s',
-	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '批量删除 %1$d 个 %2$s 类的对象',
-	'UI:Delete:NotAllowedToDelete' => '您未被允许删除该对象',
-	'UI:Delete:NotAllowedToUpdate_Fields' => '您未被允许更新下述栏目: %1$s',
-	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
-	'UI:Error:NotEnoughRightsToDelete' => '该对象不能被删除, 因为当前用户没有足够权限',
-	'UI:Error:CannotDeleteBecauseOfDepencies' => '该对象不能被删除, 因为一些手工操作必须事先完成',
-	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
-	'UI:Delete:AutomaticallyDeleted' => '自动删除了',
-	'UI:Delete:AutomaticResetOf_Fields' => '自动重置栏目: %1$s',
-	'UI:Delete:CleaningUpRefencesTo_Object' => '清除所有对 %1$s 的参照...',
-	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '清除所有对 %2$s 类的 %1$d 个对象的参照...',
-	'UI:Delete:Done+' => '做了什么...',
-	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s 删除了.',
-	'UI:Delete:ConfirmDeletionOf_Name' => '删除 %1$s',
-	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '删除 %2$s 类的 %1$d 个对象',
-//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => '应该自动删除, 但您未被允许这样做',
-//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => '必须手工删除 - 但您未被允许删除该对象, 请联系您的应用程序系统管理员',
-	'UI:Delete:WillBeDeletedAutomatically' => '将被自动删除',
-	'UI:Delete:MustBeDeletedManually' => '必须手工删除',
-	'UI:Delete:CannotUpdateBecause_Issue' => '应该被自动更新, 但是: %1$s',
-	'UI:Delete:WillAutomaticallyUpdate_Fields' => '将被自动更新 (重置: %1$s)',	
-	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d 个对象/链接参照了 %2$s',
-	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d 个对象/链接参照了一些将删除的对象',	
-	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => '为确保数据库的完整性, 任何参照应该更进一步清除',
-	'UI:Delete:Consequence+' => '将做什么',
-	'UI:Delete:SorryDeletionNotAllowed' => '抱歉, 您未被允许删除该对象, 请看上述详细解释',
-	'UI:Delete:PleaseDoTheManualOperations' => '在要求删除该对象之前, 请先手工完成上述列出的操作',
-	'UI:Delect:Confirm_Object' => '请确认您要删除 %1$s.',
-	'UI:Delect:Confirm_Count_ObjectsOf_Class' => '请确认您要删除下列 %2$s 类的 %1$d 个对象.',
-	'UI:WelcomeToITop' => '欢迎来到 iTop',
-	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s 详细内容',
-	'UI:ErrorPageTitle' => 'iTop - 错误',
-	'UI:ObjectDoesNotExist' => '抱歉, 该对象不存在 (或您未被允许浏览该对象).',
-	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
-	'Tag:Archived' => 'Archived~~',
-	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
-	'Tag:Obsolete' => 'Obsolete~~',
-	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
-	'Tag:Synchronized' => 'Synchronized~~',
-	'ObjectRef:Archived' => 'Archived~~',
-	'ObjectRef:Obsolete' => 'Obsolete~~',
-	'UI:SearchResultsPageTitle' => 'iTop - 搜索结果',
-	'UI:SearchResultsTitle' => '搜索结果',
-	'UI:SearchResultsTitle+' => 'Full-text search results~~',
-	'UI:Search:NoSearch' => '没有可搜索的内容',
-	'UI:FullTextSearchTitle_Text' => '"%1$s" 的结果:',
-	'UI:Search:Count_ObjectsOf_Class_Found' => '发现 %2$s 类的 %1$d 个对象.',
-	'UI:Search:NoObjectFound' => '未发现对象.',
-	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s 修改',
-	'UI:ModificationTitle_Class_Object' => '修改 %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:ClonePageTitle_Object_Class' => 'iTop - 克隆 %1$s - %2$s 修改',
-	'UI:CloneTitle_Class_Object' => '克隆 %1$s: <span class=\"hilite\">%2$s</span>',
-	'UI:CreationPageTitle_Class' => 'iTop - 创建一个新的 %1$s ',
-	'UI:CreationTitle_Class' => '创建一个新的 %1$s',
-	'UI:SelectTheTypeOf_Class_ToCreate' => '选择要创建的 %1$s 的类别:',
-	'UI:Class_Object_NotUpdated' => '未发现变化, %1$s (%2$s) <strong>没有</strong> 被更新.',
-	'UI:Class_Object_Updated' => '%1$s (%2$s) 更新了.',
-	'UI:BulkDeletePageTitle' => 'iTop - 批量删除',
-	'UI:BulkDeleteTitle' => '选择您要删除的对象:',
-	'UI:PageTitle:ObjectCreated' => 'iTop 对象创建了.',
-	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s 创建了.',
-	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '应用 %1$s 在对象: %2$s 上, 从 %3$s 状态到目标状态: %4$s.',
-	'UI:ObjectCouldNotBeWritten' => '对象不能写入: %1$s',
-	'UI:PageTitle:FatalError' => 'iTop - 致命错误',
-	'UI:SystemIntrusion' => '访问被禁止. 您正尝试未被许可的操作.',
-	'UI:FatalErrorMessage' => '致命错误, iTop 无法继续.',
-	'UI:Error_Details' => '错误: %1$s.',
-
-	'UI:PageTitle:ClassProjections'	=> 'iTop 用户管理 - 类投射',
-	'UI:PageTitle:ProfileProjections' => 'iTop 用户管理 - 简档投射',
-	'UI:UserManagement:Class' => '类',
-	'UI:UserManagement:Class+' => '对象的类',
-	'UI:UserManagement:ProjectedObject' => '对象',
-	'UI:UserManagement:ProjectedObject+' => '被投射的对象',
-	'UI:UserManagement:AnyObject' => '* 任何 *',
-	'UI:UserManagement:User' => '用户',
-	'UI:UserManagement:User+' => '与该投射相关的用户',
-	'UI:UserManagement:Profile' => '简档',
-	'UI:UserManagement:Profile+' => '投射被指定的简档',
-	'UI:UserManagement:Action:Read' => '读',
-	'UI:UserManagement:Action:Read+' => '读/显示 对象',
-	'UI:UserManagement:Action:Modify' => '修改',
-	'UI:UserManagement:Action:Modify+' => '创建和编辑(修改)对象',
-	'UI:UserManagement:Action:Delete' => '删除',
-	'UI:UserManagement:Action:Delete+' => '删除对象',
-	'UI:UserManagement:Action:BulkRead' => '大批量读 (导出)',
-	'UI:UserManagement:Action:BulkRead+' => '列出对象或批量导出',
-	'UI:UserManagement:Action:BulkModify' => '批量修改',
-	'UI:UserManagement:Action:BulkModify+' => '批量创建/编辑 (CSV 导入)',
-	'UI:UserManagement:Action:BulkDelete' => '批量删除',
-	'UI:UserManagement:Action:BulkDelete+' => '批量删除对象',
-	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
-	'UI:UserManagement:Action:Stimuli+' => '许可的 (复合的) 动作',
-	'UI:UserManagement:Action' => '动作',
-	'UI:UserManagement:Action+' => '该用户进行的动作',
-	'UI:UserManagement:TitleActions' => '动作',
-	'UI:UserManagement:Permission' => '许可',
-	'UI:UserManagement:Permission+' => '用户的许可',
-	'UI:UserManagement:Attributes' => '属性',
-	'UI:UserManagement:ActionAllowed:Yes' => '是',
-	'UI:UserManagement:ActionAllowed:No' => '否',
-	'UI:UserManagement:AdminProfile+' => '系统管理员拥有数据库中所有对象的完全读/写访问权限.',
-	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
-	'UI:UserManagement:NoLifeCycleApplicable+' => '该类未定义生命周期',
-	'UI:UserManagement:GrantMatrix' => '授权矩阵',
-	'UI:UserManagement:LinkBetween_User_And_Profile' => '链接 %1$s 和 %2$s',
-	'UI:UserManagement:LinkBetween_User_And_Org' => '链接 %1$s 和 %2$s',
-	
-	'Menu:AdminTools' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools+' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AdminTools?' => '具有系统管理员简档的用户才能获得的工具', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:ChangeManagementMenu' => '变更管理',
-	'UI:ChangeManagementMenu+' => '变更管理',
-	'UI:ChangeManagementMenu:Title' => '变更概览',
-	'UI-ChangeManagementMenu-ChangesByType' => '按类别划分的变更',
-	'UI-ChangeManagementMenu-ChangesByStatus' => '按状态划分的变更',
-	'UI-ChangeManagementMenu-ChangesByWorkgroup' => '按工作组划分的变更',
-	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => '尚未指派的变更',
-
-	'UI:ConfigurationManagementMenu' => '配置管理',
-	'UI:ConfigurationManagementMenu+' => '配置管理',
-	'UI:ConfigurationManagementMenu:Title' => '基础架构概览',
-	'UI-ConfigurationManagementMenu-InfraByType' => '按类别划分基础架构对象',
-	'UI-ConfigurationManagementMenu-InfraByStatus' => '按状态划分基础架构对象',
-
-'UI:ConfigMgmtMenuOverview:Title' => '配置管理仪表板',
-'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '按状态配置项目',
-'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => '按类别配置项目',
-
-'UI:RequestMgmtMenuOverview:Title' => '请求管理仪表板',
-'UI-RequestManagementOverview-RequestByService' => '按服务划分用户请求',
-'UI-RequestManagementOverview-RequestByPriority' => '按优先级划分用户请求',
-'UI-RequestManagementOverview-RequestUnassigned' => '尚未指派办理人的用户请求',
-
-'UI:IncidentMgmtMenuOverview:Title' => '事件管理仪表板',
-'UI-IncidentManagementOverview-IncidentByService' => '按服务级划分事件',
-'UI-IncidentManagementOverview-IncidentByPriority' => '按优先级划分事件',
-'UI-IncidentManagementOverview-IncidentUnassigned' => '尚未指派办理人的事件',
-
-'UI:ChangeMgmtMenuOverview:Title' => '变更管理仪表板',
-'UI-ChangeManagementOverview-ChangeByType' => '按类别划分变更',
-'UI-ChangeManagementOverview-ChangeUnassigned' => '尚未指派办理人的变更',
-'UI-ChangeManagementOverview-ChangeWithOutage' => '变更引起的停机',
-
-'UI:ServiceMgmtMenuOverview:Title' => '服务管理仪表板',
-'UI-ServiceManagementOverview-CustomerContractToRenew' => '客户联系人需在30日内更新',
-'UI-ServiceManagementOverview-ProviderContractToRenew' => '供应商联系人需在30日内更新',
-
-	'UI:ContactsMenu' => '联系人',
-	'UI:ContactsMenu+' => '联系人',
-	'UI:ContactsMenu:Title' => '联系人概览',
-	'UI-ContactsMenu-ContactsByLocation' => '按地域划分联系人',
-	'UI-ContactsMenu-ContactsByType' => '按类别划分联系人',
-	'UI-ContactsMenu-ContactsByStatus' => '按状态划分联系人',
-
-	'Menu:CSVImportMenu' => 'CSV 导入', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:CSVImportMenu+' => '大批量创建或修改', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:DataModelMenu' => '数据模型', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataModelMenu+' => '数据模型概览', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:ExportMenu' => '导出', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ExportMenu+' => '以HTML, CSV or XML格式导出任何查询的结果', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:NotificationsMenu' => '通知', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:NotificationsMenu+' => '通知的配置', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'UI:NotificationsMenu:Title' => '配置 <span class="hilite">通知</span>',
-	'UI:NotificationsMenu:Help' => '帮助',
-	'UI:NotificationsMenu:HelpContent' => '<p>在 iTop 中, 通知可以被完全客户化定制. 它们是基于两个对象集: <i>触发器和动作</i>.</p>
-<p><i><b>触发器</b></i> 定义了什么时候一个通知将被执行. 有3种触发器, 覆盖了一个对象生命周期的3个阶段:
-<ol>
-	<li>"OnCreate" 触发器, 当某个特定类的对象创建时将触发</li>
-	<li>"OnStateEnter" 触发器, 在某个给定类的对象进入某个特定状态前将触发(从另外一个状态而来)</li>
-	<li>"OnStateLeave" 触发器, 在某个给定类的对象离开某个特定状态时将触发</li>
-</ol>
-</p>
-<p>
-<i><b>动作</b></i> 定义了触发器触发时要执行的动作. 目前, 仅有一种动作存在于发送邮件过程中.
-这些动作还定义了用于发送邮件及收件人,重要性等的模板.
-</p>
-<p>一个专门页面: <a href="../setup/email.test.php" target="_blank">email.test.php</a> 可用于测试和调试您的 PHP mail 配置.</p>
-<p>若要执行, 动作必须和触发器相关联.
-当与一个触发器关联时, 每个动作都被赋予一个顺序号, 规定了按什么样的顺序执行这些动作.</p>',
-	'UI:NotificationsMenu:Triggers' => '触发器',
-	'UI:NotificationsMenu:AvailableTriggers' => '可用的触发器',
-	'UI:NotificationsMenu:OnCreate' => '当一个对象被创建',
-	'UI:NotificationsMenu:OnStateEnter' => '当一个对象进入给定状态',
-	'UI:NotificationsMenu:OnStateLeave' => '当一个对象离开给定状态',
-	'UI:NotificationsMenu:Actions' => '动作',
-	'UI:NotificationsMenu:AvailableActions' => '有效的动作',
-	
-	'Menu:AuditCategories' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:AuditCategories+' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:Notifications:Title' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:RunQueriesMenu' => '运行查询', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:RunQueriesMenu+' => '运行任何查询', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:DataAdministration' => '数据管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:DataAdministration+' => '数据管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:UniversalSearchMenu' => '通用搜索', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UniversalSearchMenu+' => '搜索所有...', // Duplicated into itop-welcome-itil (will be removed from here...)
-	
-	'Menu:UserManagementMenu' => '用户管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserManagementMenu+' => '用户管理', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:ProfilesMenu' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu+' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:ProfilesMenu:Title' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'Menu:UserAccountsMenu' => '用户帐户', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu+' => '用户帐户', // Duplicated into itop-welcome-itil (will be removed from here...)
-	'Menu:UserAccountsMenu:Title' => '用户帐户',	 // Duplicated into itop-welcome-itil (will be removed from here...)
-
-	'UI:iTopVersion:Short' => '%1$s version %2$s',
-	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
-	'UI:PropertiesTab' => '属性',
-
-	'UI:OpenDocumentInNewWindow_' => '在新窗口打开文档: %1$s',
-	'UI:DownloadDocument_' => '下载该文档: %1$s',
-	'UI:Document:NoPreview' => '该类文档无法预览',
-
-	'UI:DeadlineMissedBy_duration' => 'Missed  by %1$s',
-	'UI:Deadline_LessThan1Min' => '< 1 min',		
-	'UI:Deadline_Minutes' => '%1$d min',			
-	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
-	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
-	'UI:Help' => '帮助',
-	'UI:PasswordConfirm' => '(确认)',
-	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '在添加更多 %1$s 对象前, 保存该对象.',
-	'UI:DisplayThisMessageAtStartup' => '在启动时显示该消息',
-	'UI:RelationshipGraph' => '图览',
-	'UI:RelationshipList' => '列表',
-
-	'Portal:Title' => 'iTop 用户门户',
-	'Portal:Refresh' => '刷新',
-	'Portal:Back' => '返回',
-	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
-	'Portal:ShowOngoing' => 'Show open requests',
-	'Portal:ShowClosed' => 'Show closed requests',
-	'Portal:CreateNewRequest' => '创建一个新的请求',
-	'Portal:CreateNewRequestItil' => '创建一个新的请求',
-	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
-	'Portal:ChangeMyPassword' => '改变我的密码',
-	'Portal:Disconnect' => '断开',
-	'Portal:OpenRequests' => '我的待解决的请求',
-	'Portal:ClosedRequests'  => 'My closed requests',
-	'Portal:ResolvedRequests'  => '我的已解决的请求',
-	'Portal:SelectService' => '从类目中选择一个服务:',
-	'Portal:PleaseSelectOneService' => '请选择一个服务',
-	'Portal:SelectSubcategoryFrom_Service' => '从服务中选择一个子类 %1$s:',
-	'Portal:PleaseSelectAServiceSubCategory' => '请选择一个子类',
-	'Portal:DescriptionOfTheRequest' => '输入您的请求描述:',
-	'Portal:TitleRequestDetailsFor_Request' => '请求明细内容 %1$s:',
-	'Portal:NoOpenRequest' => '该类目中没有请求.',
-	'Portal:NoClosedRequest' => 'No request in this category',
-	'Portal:Button:CloseTicket' => '关闭这个单据',
-	'Portal:Button:UpdateRequest' => 'Update the request',
-	'Portal:EnterYourCommentsOnTicket' => '输入您对于该单据解决情况的评述:',
-	'Portal:ErrorNoContactForThisUser' => '错误: 当前用户没有和一个联系人或人员关联. 请联系您的系统管理员.',
-	
-	'Enum:Undefined' => '未定义',
-	'UI:Button:Refresh' => '刷新',
-	'Class:Query' => 'Query~~',
-	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
-	'Class:Query/Attribute:name' => 'Name~~',
-	'Class:Query/Attribute:name+' => 'Identifies the query~~',
-	'Class:Query/Attribute:description' => 'Description~~',
-	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
-	'Class:Query/Attribute:fields' => 'Fields~~',
-	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
-	'Class:QueryOQL' => 'OQL Query~~',
-	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
-	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
-	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
-	'Class:UserInternal' => 'User Internal~~',
-	'Class:UserInternal+' => 'User defined within iTop~~',
-	'UI:Button:Save' => 'Save~~',
-	'UI:Button:Restart' => ' |<< Restart ~~',
-	'UI:Button:Rename' => ' Rename... ~~',
-	'UI:History:BulkImports' => 'History~~',
-	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
-	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
-	'UI:History:StatsCreations' => 'Created~~',
-	'UI:History:StatsCreations+' => 'Count of objects created~~',
-	'UI:History:StatsModifs' => 'Modified~~',
-	'UI:History:StatsModifs+' => 'Count of objects modified~~',
-	'UI:History:StatsDeletes' => 'Deleted~~',
-	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
-	'UI:SplitDateTime-Date' => 'date~~',
-	'UI:SplitDateTime-Time' => 'time~~',
-	'UI:SearchValue:NbSelected' => '# selected~~',
-	'UI:SearchValue:CheckAll' => 'Check All~~',
-	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
-	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
-	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
-	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
-	'UI:Login:ResetPassword' => 'Send now!~~',
-	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
-	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
-	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
-	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
-	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
-	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
-	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
-	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
-	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
-	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
-	'UI:ResetPwd-Title' => 'Reset password~~',
-	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
-	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
-	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
-	'UI:ResetPwd-Login' => 'Click here to login...~~',
-	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
-	'UI:AccessRO-All' => 'iTop is read-only~~',
-	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
-	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
-	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
-	'UI:CSVReport-Value-Modified' => 'Modified~~',
-	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
-	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
-	'UI:CSVReport-Value-NoMatch' => 'No match~~',
-	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
-	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
-	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
-	'UI:CSVReport-Row-Created' => 'created~~',
-	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
-	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
-	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
-	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
-	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
-	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
-	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
-	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
-	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
-	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
-	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
-	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
-	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
-	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
-	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
-	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
-	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
-	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
-	'UI:CSVReport-Icon-Modified' => 'Modified~~',
-	'UI:CSVReport-Icon-Missing' => 'Missing~~',
-	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
-	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
-	'UI:CSVReport-Icon-Created' => 'Created~~',
-	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
-	'UI:CSVReport-Object-Created' => 'Object created~~',
-	'UI:CSVReport-Icon-Error' => 'Error~~',
-	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
-	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
-	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
-	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
-	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
-	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
-	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
-	'UI:CSVExport:LostChars' => 'Encoding issue~~',
-	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
-	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
-	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
-	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
-	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
-	'UI:Edit:TestQuery' => 'Test query~~',
-	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
-	'UI:Delete:Deleted' => 'deleted~~',
-	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
-	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
-	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
-	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
-	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
-	'UI:Search:Enlarge' => 'Broaden the search~~',
-	'Menu:QueryMenu' => 'Query phrasebook~~',
-	'Menu:QueryMenu+' => 'Query phrasebook~~',
-	'UI:Download-CSV' => 'Download %1$s~~',
-	'UI:RelationGroups' => 'Groups~~',
-	'UI:OperationCancelled' => 'Operation Cancelled~~',
-	'UI:ElementsDisplayed' => 'Filtering~~',
-	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
-	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
-	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
-	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
-	'UI:Relation:NoneSelected' => 'None~~',
-	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
-	'UI:Relation:DrillDown' => 'Details...~~',
-	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
-	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
-	'UI:RelationOption:Untitled' => 'Untitled~~',
-	'UI:Relation:Key' => 'Key~~',
-	'UI:Relation:Comments' => 'Comments~~',
-	'UI:RelationOption:Title' => 'Title~~',
-	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
-	'UI:RelationOption:Comments' => 'Comments~~',
-	'UI:Button:Export' => 'Export~~',
-	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
-	'UI:PageFormat_A3' => 'A3~~',
-	'UI:PageFormat_A4' => 'A4~~',
-	'UI:PageFormat_Letter' => 'Letter~~',
-	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
-	'UI:PageOrientation_Portrait' => 'Portrait~~',
-	'UI:PageOrientation_Landscape' => 'Landscape~~',
-	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
-	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
-	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
-	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
-	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
-	'Portal:Button:ReopenTicket' => 'Reopen this ticket~~',
-	'Portal:Attachments' => 'Attachments~~',
-	'Portal:AddAttachment' => ' Add Attachment ~~',
-	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
-	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
-	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
-	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
-	'UI:ModifyAllPageTitle' => 'Modify All~~',
-	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
-	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
-	'UI:Menu:ModifyAll' => 'Modify...~~',
-	'UI:Button:ModifyAll' => 'Modify All~~',
-	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
-	'UI:ModifiedObject' => 'Object Modified~~',
-	'UI:BulkModifyStatus' => 'Operation~~',
-	'UI:BulkModifyStatus+' => 'Status of the operation~~',
-	'UI:BulkModifyErrors' => 'Errors (if any)~~',
-	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
-	'UI:BulkModifyStatusOk' => 'Ok~~',
-	'UI:BulkModifyStatusError' => 'Error~~',
-	'UI:BulkModifyStatusModified' => 'Modified~~',
-	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
-	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
-	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
-	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
-	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
-	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
-	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
-	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
-	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
-	'UI:CaseLog:InitialValue' => 'Initial value:~~',
-	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.~~',
-	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.~~',
-	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation~~',
-	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.~~',
-	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
-	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
-	'UI:Pagination:PageSize' => '%1$s objects per page~~',
-	'UI:Pagination:PagesLabel' => 'Pages:~~',
-	'UI:Pagination:All' => 'All~~',
-	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
-	'UI:Preferences' => 'Preferences...~~',
-	'UI:ArchiveModeOn' => 'Activate archive mode~~',
-	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
-	'UI:ArchiveMode:Banner' => 'Archive mode~~',
-	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
-	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
-	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
-	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
-	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
-	'UI:FavoriteOtherSettings' => 'Other Settings~~',
-	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
-	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
-	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
-	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
-	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
-	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
-	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
-	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
-	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
-	'UI:ConfigureThisList' => 'Configure This List...~~',
-	'UI:ListConfigurationTitle' => 'List Configuration~~',
-	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
-	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
-	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
-	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
-	'UI:UseSavetheSettings' => 'Save the Settings~~',
-	'UI:OnlyForThisList' => 'Only for this list~~',
-	'UI:ForAllLists' => 'Default for all lists~~',
-	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
-	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
-	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
-	'UI:Button:MoveUp' => 'Move Up~~',
-	'UI:Button:MoveDown' => 'Move Down~~',
-	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
-	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
-	'UI:Dashboard:Edit' => 'Edit This Page...~~',
-	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
-	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
-	'UI:ExportDashBoard' => 'Export to a file~~',
-	'UI:ImportDashBoard' => 'Import from a file...~~',
-	'UI:ImportDashboardTitle' => 'Import From a File~~',
-	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
-	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
-	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
-	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
-	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
-	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
-	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
-	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
-	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
-	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
-	'UI:DashboardEdit:Layout' => 'Layout~~',
-	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
-	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
-	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
-	'UI:Form:Property' => 'Property~~',
-	'UI:Form:Value' => 'Value~~',
-	'UI:DashletPlainText:Label' => 'Text~~',
-	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
-	'UI:DashletPlainText:Prop-Text' => 'Text~~',
-	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
-	'UI:DashletObjectList:Label' => 'Object list~~',
-	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
-	'UI:DashletObjectList:Prop-Title' => 'Title~~',
-	'UI:DashletObjectList:Prop-Query' => 'Query~~',
-	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
-	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
-	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
-	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
-	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
-	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
-	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
-	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
-	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
-	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
-	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
-	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
-	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
-	'UI:DashletHeaderStatic:Label' => 'Header~~',
-	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
-	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
-	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
-	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
-	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
-	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
-	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
-	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
-	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
-	'UI:DashletBadge:Label' => 'Badge~~',
-	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
-	'UI:DashletBadge:Prop-Class' => 'Class~~',
-	'DayOfWeek-Sunday' => 'Sunday~~',
-	'DayOfWeek-Monday' => 'Monday~~',
-	'DayOfWeek-Tuesday' => 'Tuesday~~',
-	'DayOfWeek-Wednesday' => 'Wednesday~~',
-	'DayOfWeek-Thursday' => 'Thursday~~',
-	'DayOfWeek-Friday' => 'Friday~~',
-	'DayOfWeek-Saturday' => 'Saturday~~',
-	'Month-01' => 'January~~',
-	'Month-02' => 'February~~',
-	'Month-03' => 'March~~',
-	'Month-04' => 'April~~',
-	'Month-05' => 'May~~',
-	'Month-06' => 'June~~',
-	'Month-07' => 'July~~',
-	'Month-08' => 'August~~',
-	'Month-09' => 'September~~',
-	'Month-10' => 'October~~',
-	'Month-11' => 'November~~',
-	'Month-12' => 'December~~',
-	'DayOfWeek-Sunday-Min' => 'Su~~',
-	'DayOfWeek-Monday-Min' => 'Mo~~',
-	'DayOfWeek-Tuesday-Min' => 'Tu~~',
-	'DayOfWeek-Wednesday-Min' => 'We~~',
-	'DayOfWeek-Thursday-Min' => 'Th~~',
-	'DayOfWeek-Friday-Min' => 'Fr~~',
-	'DayOfWeek-Saturday-Min' => 'Sa~~',
-	'Month-01-Short' => 'Jan~~',
-	'Month-02-Short' => 'Feb~~',
-	'Month-03-Short' => 'Mar~~',
-	'Month-04-Short' => 'Apr~~',
-	'Month-05-Short' => 'May~~',
-	'Month-06-Short' => 'Jun~~',
-	'Month-07-Short' => 'Jul~~',
-	'Month-08-Short' => 'Aug~~',
-	'Month-09-Short' => 'Sep~~',
-	'Month-10-Short' => 'Oct~~',
-	'Month-11-Short' => 'Nov~~',
-	'Month-12-Short' => 'Dec~~',
-	'Calendar-FirstDayOfWeek' => '0~~',
-	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
-	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
-	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
-	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
-	'Menu:MyShortcuts' => 'My Shortcuts~~',
-	'Class:Shortcut' => 'Shortcut~~',
-	'Class:Shortcut/Attribute:name' => 'Name~~',
-	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
-	'Class:ShortcutOQL' => 'Search result shortcut~~',
-	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
-	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
-	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
-	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
-	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
-	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
-	'UI:ValueMustBeSet' => 'Please specify a value~~',
-	'UI:ValueMustBeChanged' => 'Please change the value~~',
-	'UI:ValueInvalidFormat' => 'Invalid format~~',
-	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
-	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
-	'UI:CSVImportError_items' => 'Errors: %1$d~~',
-	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
-	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
-	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
-	'UI:Button:Remove' => 'Remove~~',
-	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
-	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
-	'UI:AboutBox' => 'About iTop...~~',
-	'UI:About:Title' => 'About iTop~~',
-	'UI:About:DataModel' => 'Data model~~',
-	'UI:About:Support' => 'Support information~~',
-	'UI:About:Licenses' => 'Licenses~~',
-	'UI:About:Modules' => 'Installed modules~~',
-	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
-	'UI:DisconnectedDlgTitle' => 'Warning!~~',
-	'UI:LoginAgain' => 'Login again~~',
-	'UI:StayOnThePage' => 'Stay on this page~~',
-	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
-	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
-	'ExcelExporter:ExportButton' => 'Export~~',
-	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
-	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
-	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
-	'ExcelExporter:Done' => 'Done.~~',
-	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
-	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
-	'ExcelExport:Statistics' => 'Statistics~~',
-	'portal:legacy_portal' => 'End-User Portal~~',
-	'portal:backoffice' => 'iTop Back-Office User Interface~~',
-	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
-	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
-	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
-	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
-	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
-	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
-	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
-));
-
-
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Localized data
+ *
+ * @author      Robert Deng <denglx@gmail.com>
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+  
+//////////////////////////////////////////////////////////////////////
+// Classes in 'gui'
+//////////////////////////////////////////////////////////////////////
+//
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'application'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: AuditCategory
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:AuditCategory' => '审计类目',
+	'Class:AuditCategory+' => '全部审计中的一个区段',
+	'Class:AuditCategory/Attribute:name' => '类目名称',
+	'Class:AuditCategory/Attribute:name+' => '类目简称',
+	'Class:AuditCategory/Attribute:description' => '审计类目描述',
+	'Class:AuditCategory/Attribute:description+' => '该审计类目的详细描述',
+	'Class:AuditCategory/Attribute:definition_set' => '定义',
+	'Class:AuditCategory/Attribute:definition_set+' => '定义用于审计的对象的OQL表达式',
+	'Class:AuditCategory/Attribute:rules_list' => '审计规则',
+	'Class:AuditCategory/Attribute:rules_list+' => '该类目的审计规则',
+));
+
+//
+// Class: AuditRule
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:AuditRule' => '审计规则',
+	'Class:AuditRule+' => '用于检查给定审计类目的规则',
+	'Class:AuditRule/Attribute:name' => '规则名称',
+	'Class:AuditRule/Attribute:name+' => '规则简称',
+	'Class:AuditRule/Attribute:description' => '审计规则描述',
+	'Class:AuditRule/Attribute:description+' => '审计规则详细描述',
+	'Class:AuditRule/Attribute:query' => '要运行的查询',
+	'Class:AuditRule/Attribute:query+' => '要运行的OQL表达式',
+	'Class:AuditRule/Attribute:valid_flag' => '有效对象?',
+	'Class:AuditRule/Attribute:valid_flag+' => '若规则返回有效对象则True,否则False',
+	'Class:AuditRule/Attribute:valid_flag/Value:true' => 'true',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+' => 'true',
+	'Class:AuditRule/Attribute:valid_flag/Value:false' => 'false',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'false',
+	'Class:AuditRule/Attribute:category_id' => '类目',
+	'Class:AuditRule/Attribute:category_id+' => '该规则对应的类目',
+	'Class:AuditRule/Attribute:category_name' => '类目',
+	'Class:AuditRule/Attribute:category_name+' => '该规则对应类目的名称',
+));
+
+//////////////////////////////////////////////////////////////////////
+// Classes in 'addon/userrights'
+//////////////////////////////////////////////////////////////////////
+//
+
+//
+// Class: User
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:User' => '用户',
+	'Class:User+' => '用户登录名',
+	'Class:User/Attribute:finalclass' => '帐户类别',
+	'Class:User/Attribute:finalclass+' => '',
+	'Class:User/Attribute:contactid' => '联系人 (个人)',
+	'Class:User/Attribute:contactid+' => '来自业务数据的个人明细信息',
+	'Class:User/Attribute:last_name' => '名',
+	'Class:User/Attribute:last_name+' => '对应联系人的名字',
+	'Class:User/Attribute:first_name' => '姓',
+	'Class:User/Attribute:first_name+' => '对应联系人的姓氏',
+	'Class:User/Attribute:email' => 'Email',
+	'Class:User/Attribute:email+' => '对应联系人的Email',
+	'Class:User/Attribute:login' => '登录名',
+	'Class:User/Attribute:login+' => '用户标识字符串',
+	'Class:User/Attribute:language' => '语言',
+	'Class:User/Attribute:language+' => '用户语言',
+	'Class:User/Attribute:language/Value:EN US' => 'English',
+	'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)',
+	'Class:User/Attribute:language/Value:FR FR' => 'French',
+	'Class:User/Attribute:language/Value:FR FR+' => 'French (France)',
+	'Class:User/Attribute:profile_list' => '简档',
+	'Class:User/Attribute:profile_list+' => '角色, 为该人员授权',
+	'Class:User/Attribute:allowed_org_list' => '被许可的组织',
+	'Class:User/Attribute:allowed_org_list+' => '终端用户被许可看到下述组织的数据. 如果没有指定的组织,则无限制.',
+
+	'Class:User/Error:LoginMustBeUnique' => '登录名必须唯一 - "%1s" 已经被使用.',
+	'Class:User/Error:AtLeastOneProfileIsNeeded' => '至少一个简档必须指定给该用户.',
+));
+
+//
+// Class: URP_Profiles
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_Profiles' => '简档',
+	'Class:URP_Profiles+' => '用户简档',
+	'Class:URP_Profiles/Attribute:name' => '名称',
+	'Class:URP_Profiles/Attribute:name+' => '标签',
+	'Class:URP_Profiles/Attribute:description' => '描述',
+	'Class:URP_Profiles/Attribute:description+' => '单行描述',
+	'Class:URP_Profiles/Attribute:user_list' => '用户',
+	'Class:URP_Profiles/Attribute:user_list+' => '拥有该角色的人员',
+));
+
+//
+// Class: URP_Dimensions
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_Dimensions' => '维度',
+	'Class:URP_Dimensions+' => '应用维度 (定义纵深)',
+	'Class:URP_Dimensions/Attribute:name' => '名称',
+	'Class:URP_Dimensions/Attribute:name+' => '标签',
+	'Class:URP_Dimensions/Attribute:description' => '描述',
+	'Class:URP_Dimensions/Attribute:description+' => '单行描述',
+	'Class:URP_Dimensions/Attribute:type' => '类别',
+	'Class:URP_Dimensions/Attribute:type+' => '类名称或数据类别 (投影单位)',
+));
+
+//
+// Class: URP_UserProfile
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_UserProfile' => '简档目标用户',
+	'Class:URP_UserProfile+' => '用户的简档',
+	'Class:URP_UserProfile/Attribute:userid' => '用户',
+	'Class:URP_UserProfile/Attribute:userid+' => '用户帐户',
+	'Class:URP_UserProfile/Attribute:userlogin' => '登录名',
+	'Class:URP_UserProfile/Attribute:userlogin+' => '用户的登录名',
+	'Class:URP_UserProfile/Attribute:profileid' => '简档',
+	'Class:URP_UserProfile/Attribute:profileid+' => '使用简档',
+	'Class:URP_UserProfile/Attribute:profile' => '简档',
+	'Class:URP_UserProfile/Attribute:profile+' => '简档名称',
+	'Class:URP_UserProfile/Attribute:reason' => '原因',
+	'Class:URP_UserProfile/Attribute:reason+' => '解释为什么该人员需要拥有该角色',
+));
+
+//
+// Class: URP_UserOrg
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_UserOrg' => '用户组织',
+	'Class:URP_UserOrg+' => '被许可的组织',
+	'Class:URP_UserOrg/Attribute:userid' => '用户',
+	'Class:URP_UserOrg/Attribute:userid+' => '用户帐户',
+	'Class:URP_UserOrg/Attribute:userlogin' => '登录名',
+	'Class:URP_UserOrg/Attribute:userlogin+' => '用户的登录名',
+	'Class:URP_UserOrg/Attribute:allowed_org_id' => '组织',
+	'Class:URP_UserOrg/Attribute:allowed_org_id+' => '被许可的组织',
+	'Class:URP_UserOrg/Attribute:allowed_org_name' => '组织',
+	'Class:URP_UserOrg/Attribute:allowed_org_name+' => '被许可的组织',
+	'Class:URP_UserOrg/Attribute:reason' => '原因',
+	'Class:URP_UserOrg/Attribute:reason+' => '解释为什么该人员被许可查阅该组织的数据',
+));
+
+//
+// Class: URP_ProfileProjection
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_ProfileProjection' => '简档投射',
+	'Class:URP_ProfileProjection+' => '简档投射',
+	'Class:URP_ProfileProjection/Attribute:dimensionid' => '维度',
+	'Class:URP_ProfileProjection/Attribute:dimensionid+' => '应用维度',
+	'Class:URP_ProfileProjection/Attribute:dimension' => '维度',
+	'Class:URP_ProfileProjection/Attribute:dimension+' => '应用维度',
+	'Class:URP_ProfileProjection/Attribute:profileid' => '简档',
+	'Class:URP_ProfileProjection/Attribute:profileid+' => '使用简档',
+	'Class:URP_ProfileProjection/Attribute:profile' => '简档',
+	'Class:URP_ProfileProjection/Attribute:profile+' => '简档名称',
+	'Class:URP_ProfileProjection/Attribute:value' => '值表达式',
+	'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant |  | +attribute code',
+	'Class:URP_ProfileProjection/Attribute:attribute' => '属性',
+	'Class:URP_ProfileProjection/Attribute:attribute+' => '目标属性编码 (可选)',
+));
+
+//
+// Class: URP_ClassProjection
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_ClassProjection' => '类投射',
+	'Class:URP_ClassProjection+' => '类投射',
+	'Class:URP_ClassProjection/Attribute:dimensionid' => '维度',
+	'Class:URP_ClassProjection/Attribute:dimensionid+' => '应用维度',
+	'Class:URP_ClassProjection/Attribute:dimension' => '维度',
+	'Class:URP_ClassProjection/Attribute:dimension+' => '应用维度',
+	'Class:URP_ClassProjection/Attribute:class' => '类',
+	'Class:URP_ClassProjection/Attribute:class+' => '目标类',
+	'Class:URP_ClassProjection/Attribute:value' => '值表达式',
+	'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant |  | +attribute code',
+	'Class:URP_ClassProjection/Attribute:attribute' => '属性',
+	'Class:URP_ClassProjection/Attribute:attribute+' => '目标属性编码 (可选)',
+));
+
+//
+// Class: URP_ActionGrant
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_ActionGrant' => '动作许可',
+	'Class:URP_ActionGrant+' => '类上的许可',
+	'Class:URP_ActionGrant/Attribute:profileid' => '简档',
+	'Class:URP_ActionGrant/Attribute:profileid+' => '使用简档',
+	'Class:URP_ActionGrant/Attribute:profile' => '简档',
+	'Class:URP_ActionGrant/Attribute:profile+' => '使用简档',
+	'Class:URP_ActionGrant/Attribute:class' => '类',
+	'Class:URP_ActionGrant/Attribute:class+' => '目标类',
+	'Class:URP_ActionGrant/Attribute:permission' => '许可',
+	'Class:URP_ActionGrant/Attribute:permission+' => '允许或不允许?',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes' => '是',
+	'Class:URP_ActionGrant/Attribute:permission/Value:yes+' => '是',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no' => '否',
+	'Class:URP_ActionGrant/Attribute:permission/Value:no+' => '否',
+	'Class:URP_ActionGrant/Attribute:action' => '动作',
+	'Class:URP_ActionGrant/Attribute:action+' => '可用于给定类上的操作',
+));
+
+//
+// Class: URP_StimulusGrant
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_StimulusGrant' => '刺激许可',
+	'Class:URP_StimulusGrant+' => '对象生命周期中刺激的许可',
+	'Class:URP_StimulusGrant/Attribute:profileid' => '简档',
+	'Class:URP_StimulusGrant/Attribute:profileid+' => '使用简档',
+	'Class:URP_StimulusGrant/Attribute:profile' => '简档',
+	'Class:URP_StimulusGrant/Attribute:profile+' => '使用简档',
+	'Class:URP_StimulusGrant/Attribute:class' => '类',
+	'Class:URP_StimulusGrant/Attribute:class+' => '目标类',
+	'Class:URP_StimulusGrant/Attribute:permission' => '许可',
+	'Class:URP_StimulusGrant/Attribute:permission+' => '允许或不允许?',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes' => '是',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:yes+' => '是',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no' => '否',
+	'Class:URP_StimulusGrant/Attribute:permission/Value:no+' => '否',
+	'Class:URP_StimulusGrant/Attribute:stimulus' => '刺激',
+	'Class:URP_StimulusGrant/Attribute:stimulus+' => '刺激编码',
+));
+
+//
+// Class: URP_AttributeGrant
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'Class:URP_AttributeGrant' => '属性许可',
+	'Class:URP_AttributeGrant+' => '属性层次上的许可',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid' => '动作准许',
+	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '动作准许',
+	'Class:URP_AttributeGrant/Attribute:attcode' => '属性',
+	'Class:URP_AttributeGrant/Attribute:attcode+' => '属性编码',
+));
+
+//
+// String from the User Interface: menu, messages, buttons, etc...
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+	'BooleanLabel:yes' => '是',
+	'BooleanLabel:no' => '否',
+	'Menu:WelcomeMenu' => '欢迎', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenu+' => '欢迎来到iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage' => '欢迎', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:WelcomeMenuPage+' => '欢迎来到iTop', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:WelcomeMenu:Title' => '欢迎来到iTop',
+
+	'UI:WelcomeMenu:LeftBlock' => '<p>iTop 是完全的, 开发源码的, IT 操作门户.</p>
+<ul>系统包括:
+<li>完全的 CMDB (Configuration management database) 记录和管理 IT 资产清册.</li>
+<li>事件管理模块跟踪和传递所有发生在 IT 系统中的事件.</li>
+<li>变更管理模块规划和跟踪 IT 环境中发生的变化.</li>
+<li>已知的错误数据库加速事件的处理.</li>
+<li>停损模块记录所有计划的停机并通知对应的联系人.</li>
+<li>通过仪表板迅速获得 IT 的概览.</li>
+</ul>
+<p>所有模块可以各自独立地、一步一步地搭建.</p>',
+
+	'UI:WelcomeMenu:RightBlock' => '<p>iTop 是面向服务提供商的, 它使得 IT 工程师方便地管理多客户和多组织.
+<ul>iTop, 提供功能丰富的业务处理流程:
+<li>提高 IT 管理效率</li> 
+<li>驱动 IT 操作能力</li> 
+<li>提高用户满意度,从业务能力方面提供执行力.</li>
+</ul>
+</p>
+<p>iTop 是完全开放的,可被集成到您当前的IT管理架构中.</p>
+<p>
+<ul>利用这个新一代的 IT 操作门户, 可以帮助您:
+<li>更好地管理越来越复杂的 IT 环境.</li>
+<li>按照您的步骤实现 ITIL 流程.</li>
+<li>管理您的 IT 中最重要的设施: 文档化.</li>
+</ul>
+</p>',
+	'UI:WelcomeMenu:AllOpenRequests' => '待处理的请求: %1$d',
+	'UI:WelcomeMenu:MyCalls' => '我的请求',
+	'UI:WelcomeMenu:OpenIncidents' => '待处理的事件: %1$d',
+	'UI:WelcomeMenu:AllConfigItems' => '配置项: %1$d',
+	'UI:WelcomeMenu:MyIncidents' => '指派给我的事件',
+	'UI:AllOrganizations' => ' 所有组织 ',
+	'UI:YourSearch' => '您的搜索',
+	'UI:LoggedAsMessage' => '以 %1$s 登录',
+	'UI:LoggedAsMessage+Admin' => '以 %1$s 登录(Administrator)',
+	'UI:Button:Logoff' => '注销',
+	'UI:Button:GlobalSearch' => '搜索',
+	'UI:Button:Search' => '搜索',
+	'UI:Button:Query' => ' 查询 ',
+	'UI:Button:Ok' => '确认',
+	'UI:Button:Cancel' => '取消',
+	'UI:Button:Apply' => '应用',
+	'UI:Button:Back' => ' << Back ',
+	'UI:Button:Next' => ' Next >> ',
+	'UI:Button:Finish' => ' 结束 ',
+	'UI:Button:DoImport' => ' 运行导入 ! ',
+	'UI:Button:Done' => ' 完成 ',
+	'UI:Button:SimulateImport' => ' 激活导入 ',
+	'UI:Button:Test' => '测试!',
+	'UI:Button:Evaluate' => ' 评价 ',
+	'UI:Button:Evaluate:Title' => ' 评价 (Ctrl+Enter)',
+	'UI:Button:AddObject' => ' 添加... ',
+	'UI:Button:BrowseObjects' => ' 浏览... ',
+	'UI:Button:Add' => ' 添加 ',
+	'UI:Button:AddToList' => ' << 添加 ',
+	'UI:Button:RemoveFromList' => ' 移除 >> ',
+	'UI:Button:FilterList' => ' 过滤... ',
+	'UI:Button:Create' => ' 创建 ',
+	'UI:Button:Delete' => ' 删除 ! ',
+	'UI:Button:ChangePassword' => ' 改变密码 ',
+	'UI:Button:ResetPassword' => ' 重置密码 ',
+	
+	'UI:SearchToggle' => '搜索',
+	'UI:ClickToCreateNew' => '创建一个新的 %1$s',
+	'UI:SearchFor_Class' => '搜索 %1$s 对象',
+	'UI:NoObjectToDisplay' => '没有对象可显示.',
+	'UI:Error:MandatoryTemplateParameter_object_id' => '当link_attr被指定时,参数 object_id 是必须的. 检查显示模板的定义.',
+	'UI:Error:MandatoryTemplateParameter_target_attr' => '当 link_attr被指定时, 参数 target_attr 是必须的. 检查显示模板的定义.',
+	'UI:Error:MandatoryTemplateParameter_group_by' => '参数 group_by 是必须的. 检查显示模板的定义.',
+	'UI:Error:InvalidGroupByFields' => 'group by 的栏目列表是无效的: "%1$s".',
+	'UI:Error:UnsupportedStyleOfBlock' => '错误: 不被支持的 block 格式: "%1$s".',
+	'UI:Error:IncorrectLinkDefinition_LinkedClass_Class' => '错误的链接定义: the class of objects to manage: %1$s was not found as an external key in the class %2$s',
+	'UI:Error:Object_Class_Id_NotFound' => 'Object: %1$s:%2$d not found.',
+	'UI:Error:WizardCircularReferenceInDependencies' => '错误: 栏目之间的依赖性出现循环引用, 检查数据模型.',
+	'UI:Error:UploadedFileTooBig' => '上传文件太大. (允许的最大限制是 %1$s). 检查您的 PHP configuration 中 upload_max_filesize 和 post_max_size.',
+	'UI:Error:UploadedFileTruncated.' => '上传的文件被截断 !',
+	'UI:Error:NoTmpDir' => '临时目录未定义.',
+	'UI:Error:CannotWriteToTmp_Dir' => '无法向硬盘写入临时文件. upload_tmp_dir = "%1$s".',
+	'UI:Error:UploadStoppedByExtension_FileName' => '上传因为扩展名被停止. (Original file name = "%1$s").',
+	'UI:Error:UploadFailedUnknownCause_Code' => '文件上传失败, 未知原因. (Error code = "%1$s").',
+	
+	'UI:Error:1ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s.',
+	'UI:Error:2ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s and %2$s.',
+	'UI:Error:3ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s, %2$s and %3$s.',
+	'UI:Error:4ParametersMissing' => '错误: 必须为该操作指定下述参数: %1$s, %2$s, %3$s and %4$s.',
+	'UI:Error:IncorrectOQLQuery_Message' => '错误: 错误的 OQL 查询: %1$s',
+	'UI:Error:AnErrorOccuredWhileRunningTheQuery_Message' => '运行该查询时产生了一个错误: %1$s',
+	'UI:Error:ObjectAlreadyUpdated' => '错误: 该对象已被更新.',
+	'UI:Error:ObjectCannotBeUpdated' => '错误: 对象不能被更新.',
+	'UI:Error:ObjectsAlreadyDeleted' => '错误: 对象已被删除!',
+	'UI:Error:BulkDeleteNotAllowedOn_Class' => '您未被允许进行 %1$s 类对象的批量删除',
+	'UI:Error:DeleteNotAllowedOn_Class' => '您未被允许删除 %1$s 类的对象',
+	'UI:Error:BulkModifyNotAllowedOn_Class' => '您未被允许进行 %1$s 类对象的批量更新',
+	'UI:Error:ObjectAlreadyCloned' => '错误: 该对象已被克隆!',
+	'UI:Error:ObjectAlreadyCreated' => '错误: 该对象已被创建!',
+	'UI:Error:Invalid_Stimulus_On_Object_In_State' => '错误: 在对象 %2$s 的 "%3$s" 状态上的无效刺激 "%1$s" .',
+	
+	
+	'UI:GroupBy:Count' => '计数',
+	'UI:GroupBy:Count+' => '元素数量',
+	'UI:CountOfObjects' => '%1$d 个对象匹配给定的条件.',
+	'UI_CountOfObjectsShort' => '%1$d 个对象.',
+	'UI:NoObject_Class_ToDisplay' => '没有 %1$s 可以显示',
+	'UI:History:LastModified_On_By' => '最后修改 %1$s 被 %2$s.',
+	'UI:HistoryTab' => '历史',
+	'UI:NotificationsTab' => '通知',
+	'UI:History:Date' => '日期',
+	'UI:History:Date+' => '变更日期',
+	'UI:History:User' => '用户',
+	'UI:History:User+' => '造成变更的用户',
+	'UI:History:Changes' => '变更',
+	'UI:History:Changes+' => '对该对象所做的变更',
+	'UI:Loading' => '载入...',
+	'UI:Menu:Actions' => '动作',
+	'UI:Menu:OtherActions' => '其他操作',
+	'UI:Menu:New' => '新建...',
+	'UI:Menu:Add' => '添加...',
+	'UI:Menu:Manage' => '管理...',
+	'UI:Menu:EMail' => 'eMail',
+	'UI:Menu:CSVExport' => 'CSV 导出...',
+	'UI:Menu:Modify' => '修改...',
+	'UI:Menu:Delete' => '删除...',
+	'UI:Menu:Manage' => '管理...',
+	'UI:Menu:BulkDelete' => '删除...',
+	'UI:UndefinedObject' => '未定义',
+	'UI:Document:OpenInNewWindow:Download' => '在新窗口打开: %1$s, 下载: %2$s',
+	'UI:SelectAllToggle+' => '选择 / 清除选择 全部',
+	'UI:TruncatedResults' => '%1$d objects displayed out of %2$d',
+	'UI:DisplayAll' => '显示全部',
+	'UI:CollapseList' => '收缩',
+	'UI:CountOfResults' => '%1$d 个对象',
+	'UI:ChangesLogTitle' => '变更记录 (%1$d):',
+	'UI:EmptyChangesLogTitle' => '变更记录为空',
+	'UI:SearchFor_Class_Objects' => '搜索 %1$s 对象',
+	'UI:OQLQueryBuilderTitle' => 'OQL Query Builder',
+	'UI:OQLQueryTab' => 'OQL 查询',
+	'UI:SimpleSearchTab' => '简单搜索',
+	'UI:Details+' => '明细',
+	'UI:SearchValue:Any' => '* 任何 *',
+	'UI:SearchValue:Mixed' => '* 混合 *',
+	'UI:SelectOne' => '-- 选择一个 --',
+	'UI:Login:Welcome' => '欢迎来到 iTop!',
+	'UI:Login:IncorrectLoginPassword' => '错误的登录名/密码, 请重试.',
+	'UI:Login:IdentifyYourself' => '在继续之前, 确定您自己的身份',
+	'UI:Login:UserNamePrompt' => '用户名称',
+	'UI:Login:PasswordPrompt' => '密码',
+	'UI:Login:ChangeYourPassword' => '改变您的密码',
+	'UI:Login:OldPasswordPrompt' => '旧密码',
+	'UI:Login:NewPasswordPrompt' => '新密码',
+	'UI:Login:RetypeNewPasswordPrompt' => '重复新密码',
+	'UI:Login:IncorrectOldPassword' => '错误: 旧密码错误',
+	'UI:LogOffMenu' => '注销',
+	'UI:LogOff:ThankYou' => '谢谢使用iTop',
+	'UI:LogOff:ClickHereToLoginAgain' => '点击这里再次登录...',
+	'UI:ChangePwdMenu' => '改变密码...',
+	'UI:Login:RetypePwdDoesNotMatch' => '新密码和重录的新密码不符!',
+	'UI:Button:Login' => '进入 iTop',
+	'UI:Login:Error:AccessRestricted' => 'iTop 访问被限制. 请联系iTop系统管理员.',
+	'UI:Login:Error:AccessAdmin' => '有系统管理员权限才能访问. 请联系iTop系统管理员.',
+	'UI:CSVImport:MappingSelectOne' => '-- 选择一个 --',
+	'UI:CSVImport:MappingNotApplicable' => '-- 忽略该栏 --',
+	'UI:CSVImport:NoData' => '空的数据..., 请提供数据!',
+	'UI:Title:DataPreview' => '数据预览',
+	'UI:CSVImport:ErrorOnlyOneColumn' => '错误: 数据仅包含一列. 您选择了合适的分隔字符了吗?',
+	'UI:CSVImport:FieldName' => '栏 %1$d',
+	'UI:CSVImport:DataLine1' => '数据行 1',
+	'UI:CSVImport:DataLine2' => '数据行 2',
+	'UI:CSVImport:idField' => 'id (主键)',
+	'UI:Title:BulkImport' => 'iTop - 大批量导入',
+	'UI:Title:BulkImport+' => 'CSV 导入 Wizard',
+	'UI:CSVImport:ClassesSelectOne' => '-- 选择一个 --',
+	'UI:CSVImport:ErrorExtendedAttCode' => '内部错误: "%1$s" 是错误的编码, 因为 "%2$s" 不是类 "%3$s" 的外部健',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d 对象将保持不变.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d 对象将被修改.',
+	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d 对象将被添加.',
+	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d 对象将有错误.',
+	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d 对象保持不变.',
+	'UI:CSVImport:ObjectsWereModified' => '%1$d 对象已被修改.',
+	'UI:CSVImport:ObjectsWereAdded' => '%1$d 对象已被添加.',
+	'UI:CSVImport:ObjectsHadErrors' => '%1$d 对象已有错误.',
+	'UI:Title:CSVImportStep2' => '步骤 2 of 5: CSV 数据选项',
+	'UI:Title:CSVImportStep3' => '步骤 3 of 5: 数据映射',
+	'UI:Title:CSVImportStep4' => '步骤 4 of 5: 导入模拟',
+	'UI:Title:CSVImportStep5' => '步骤 5 of 5: 导入完成',
+	'UI:CSVImport:LinesNotImported' => '无法装载的行:',
+	'UI:CSVImport:LinesNotImported+' => '以下行无法导入因为其中包含错误',
+	'UI:CSVImport:SeparatorComma+' => ', (逗号)',
+	'UI:CSVImport:SeparatorSemicolon+' => '; (分号)',
+	'UI:CSVImport:SeparatorTab+' => 'tab',
+	'UI:CSVImport:SeparatorOther' => '其他:',
+	'UI:CSVImport:QualifierDoubleQuote+' => '" (双引号)',
+	'UI:CSVImport:QualifierSimpleQuote+' => '\' (单引号)',
+	'UI:CSVImport:QualifierOther' => '其他:',
+	'UI:CSVImport:TreatFirstLineAsHeader' => '将第一行视做标题头(列名称)',
+	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '跳过文件开始的 %1$s 行',
+	'UI:CSVImport:CSVDataPreview' => 'CSV 数据预览',
+	'UI:CSVImport:SelectFile' => '选择导入的文件:',
+	'UI:CSVImport:Tab:LoadFromFile' => '从文件装载',
+	'UI:CSVImport:Tab:CopyPaste' => '复制和粘贴数据',
+	'UI:CSVImport:Tab:Templates' => '模板',
+	'UI:CSVImport:PasteData' => '粘贴数据以导入:',
+	'UI:CSVImport:PickClassForTemplate' => '选择下载的模板: ',
+	'UI:CSVImport:SeparatorCharacter' => '分隔字符:',
+	'UI:CSVImport:TextQualifierCharacter' => '文本限定字符',
+	'UI:CSVImport:CommentsAndHeader' => '注释和头',
+	'UI:CSVImport:SelectClass' => '选择类以导入:',
+	'UI:CSVImport:AdvancedMode' => '高级模式',
+	'UI:CSVImport:AdvancedMode+' => '在高级模式中,对象的"id" (主键) 可以被用来修改和重命名对象.' .
+									'不管怎样,列 "id" (如果存在) 只能被用做一个搜索条件,不能与其它搜索条件混用.',
+	'UI:CSVImport:SelectAClassFirst' => '首先选择一个类以配置映射.',
+	'UI:CSVImport:HeaderFields' => '栏目',
+	'UI:CSVImport:HeaderMappings' => '映射',
+	'UI:CSVImport:HeaderSearch' => '搜索?',
+	'UI:CSVImport:AlertIncompleteMapping' => '请为每个栏选择一个映射.',
+	'UI:CSVImport:AlertNoSearchCriteria' => '请选择至少一个搜索条件',
+	'UI:CSVImport:Encoding' => '字符编码',	
+	'UI:UniversalSearchTitle' => 'iTop - 通用搜索',
+	'UI:UniversalSearch:Error' => '错误: %1$s',
+	'UI:UniversalSearch:LabelSelectTheClass' => '选择类以搜索: ',
+	
+	'UI:Audit:Title' => 'iTop - CMDB 审计',
+	'UI:Audit:InteractiveAudit' => '交互审计',
+	'UI:Audit:HeaderAuditRule' => '设计规则',
+	'UI:Audit:HeaderNbObjects' => '# 对象',
+	'UI:Audit:HeaderNbErrors' => '# 错误',
+	'UI:Audit:PercentageOk' => '% Ok',
+	
+	'UI:RunQuery:Title' => 'iTop - OQL 查询评估',
+	'UI:RunQuery:QueryExamples' => '查询样例',
+	'UI:RunQuery:HeaderPurpose' => '目的',
+	'UI:RunQuery:HeaderPurpose+' => '该查询的解释',
+	'UI:RunQuery:HeaderOQLExpression' => 'OQL 表达式',
+	'UI:RunQuery:HeaderOQLExpression+' => 'OQL 语法表示的查询',
+	'UI:RunQuery:ExpressionToEvaluate' => '待评估的表达式: ',
+	'UI:RunQuery:MoreInfo' => '该查询的更多信息: ',
+	'UI:RunQuery:DevelopedQuery' => '重新开发的查询表达式: ',
+	'UI:RunQuery:SerializedFilter' => '序列化的过滤器: ',
+	'UI:RunQuery:Error' => '运行该查询时产生了一个错误: %1$s',
+	
+	'UI:Schema:Title' => 'iTop 对象 schema',
+	'UI:Schema:CategoryMenuItem' => '类目 <b>%1$s</b>',
+	'UI:Schema:Relationships' => '关联',
+	'UI:Schema:AbstractClass' => '抽象类: 该类不能实例化对象.',
+	'UI:Schema:NonAbstractClass' => '非抽象类: 该类可以实例化对象.',
+	'UI:Schema:ClassHierarchyTitle' => '类层级',
+	'UI:Schema:AllClasses' => '所有类',
+	'UI:Schema:ExternalKey_To' => '%1$s的外部键',
+	'UI:Schema:Columns_Description' => '列: <em>%1$s</em>',
+	'UI:Schema:Default_Description' => '缺省: "%1$s"',
+	'UI:Schema:NullAllowed' => '允许空',
+	'UI:Schema:NullNotAllowed' => '不允许空',
+	'UI:Schema:Attributes' => '属性',
+	'UI:Schema:AttributeCode' => '属性编码',
+	'UI:Schema:AttributeCode+' => '属性的内部编码',
+	'UI:Schema:Label' => '标签',
+	'UI:Schema:Label+' => '属性标签',
+	'UI:Schema:Type' => '类别',
+	
+	'UI:Schema:Type+' => '属性的数据类型',
+	'UI:Schema:Origin' => '起源',
+	'UI:Schema:Origin+' => '该属性被定义的基类',
+	'UI:Schema:Description' => '描述',
+	'UI:Schema:Description+' => '属性的描述',
+	'UI:Schema:AllowedValues' => '允许值',
+	'UI:Schema:AllowedValues+' => '该属性取值的限制',
+	'UI:Schema:MoreInfo' => '更多信息',
+	'UI:Schema:MoreInfo+' => '该栏目在数据库中被定义的更多信息',
+	'UI:Schema:SearchCriteria' => '搜索条件',
+	'UI:Schema:FilterCode' => '过滤器编码',
+	'UI:Schema:FilterCode+' => '该搜索条件的编码',
+	'UI:Schema:FilterDescription' => '描述',
+	'UI:Schema:FilterDescription+' => '该搜索条件的描述',
+	'UI:Schema:AvailOperators' => '可用的算子',
+	'UI:Schema:AvailOperators+' => '该搜索条件可能的算子',
+	'UI:Schema:ChildClasses' => '子类',
+	'UI:Schema:ReferencingClasses' => '参考类',
+	'UI:Schema:RelatedClasses' => '关联类',
+	'UI:Schema:LifeCycle' => '生命周期',
+	'UI:Schema:Triggers' => '触发器',
+	'UI:Schema:Relation_Code_Description' => '关联 <em>%1$s</em> (%2$s)',
+	'UI:Schema:RelationDown_Description' => 'Down: %1$s',
+	'UI:Schema:RelationUp_Description' => 'Up: %1$s',
+	'UI:Schema:RelationPropagates' => '%1$s: 繁殖到 %2$d 个层级, 查询: %3$s',
+	'UI:Schema:RelationDoesNotPropagate' => '%1$s: 没有繁殖 (%2$d 层级), 查询: %3$s',
+	'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s 被类 %2$s 参照, 通过栏目 %3$s',
+	'UI:Schema:Class_IsLinkedTo_Class_Via_ClassAndAttribute' => '%1$s 被链接到 %2$s 通过 %3$s::<em>%4$s</em>',
+	'UI:Schema:Links:1-n' => '类指向 %1$s (1:n 链接):',
+	'UI:Schema:Links:n-n' => '类链接到 %1$s (n:n 链接):',
+	'UI:Schema:Links:All' => '全部相关类的图',
+	'UI:Schema:NoLifeCyle' => '该类没有生命周期的定义.',
+	'UI:Schema:LifeCycleTransitions' => '转换',
+	'UI:Schema:LifeCyleAttributeOptions' => '属性选项',
+	'UI:Schema:LifeCycleHiddenAttribute' => '隐藏',
+	'UI:Schema:LifeCycleReadOnlyAttribute' => '只读',
+	'UI:Schema:LifeCycleMandatoryAttribute' => '必须',
+	'UI:Schema:LifeCycleAttributeMustChange' => '必须变更',
+	'UI:Schema:LifeCycleAttributeMustPrompt' => '用户将被提示改变值',
+	'UI:Schema:LifeCycleEmptyList' => '空列表',
+	'UI:Schema:ClassFilter' => 'Class:~~',
+	'UI:Schema:DisplayLabel' => 'Display:~~',
+	'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~',
+	'UI:Schema:DisplaySelector/Label' => 'Label~~',
+	'UI:Schema:DisplaySelector/Code' => 'Code~~',
+	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
+	'UI:LinksWidget:Autocomplete+' => '输入前3个字符...',
+	'UI:Combo:SelectValue' => '--- 选择一个值 ---',
+	'UI:Label:SelectedObjects' => '被选对象: ',
+	'UI:Label:AvailableObjects' => '可用对象: ',
+	'UI:Link_Class_Attributes' => '%1$s 属性',
+	'UI:SelectAllToggle+' => '选择全部 / 清楚全部选择',
+	'UI:AddObjectsOf_Class_LinkedWith_Class_Instance' => '添加 %1$s 个对象, 链接 %2$s: %3$s',
+	'UI:AddObjectsOf_Class_LinkedWith_Class' => '添加 %1$s 个对象与 %2$s 链接',
+	'UI:ManageObjectsOf_Class_LinkedWith_Class_Instance' => '管理 %1$s 个对象, 链接 %2$s: %3$s',
+	'UI:AddLinkedObjectsOf_Class' => '添加 %1$s...',
+	'UI:RemoveLinkedObjectsOf_Class' => '移除选择的对象',
+	'UI:Message:EmptyList:UseAdd' => '列表是空的, 使用 "添加..." 按扭以添加元素.',
+	'UI:Message:EmptyList:UseSearchForm' => '使用上面的搜索表单, 以搜索要添加的对象.',
+	
+	'UI:Wizard:FinalStepTitle' => '最后步骤: 确认',
+	'UI:Title:DeletionOf_Object' => '删除 %1$s',
+	'UI:Title:BulkDeletionOf_Count_ObjectsOf_Class' => '批量删除 %1$d 个 %2$s 类的对象',
+	'UI:Delete:NotAllowedToDelete' => '您未被允许删除该对象',
+	'UI:Delete:NotAllowedToUpdate_Fields' => '您未被允许更新下述栏目: %1$s',
+	'UI:Error:CannotDeleteBecause' => 'This object could not be deleted because: %1$s',
+	'UI:Error:NotEnoughRightsToDelete' => '该对象不能被删除, 因为当前用户没有足够权限',
+	'UI:Error:CannotDeleteBecauseOfDepencies' => '该对象不能被删除, 因为一些手工操作必须事先完成',
+	'UI:Archive_User_OnBehalfOf_User' => '%1$s on behalf of %2$s',
+	'UI:Delete:AutomaticallyDeleted' => '自动删除了',
+	'UI:Delete:AutomaticResetOf_Fields' => '自动重置栏目: %1$s',
+	'UI:Delete:CleaningUpRefencesTo_Object' => '清除所有对 %1$s 的参照...',
+	'UI:Delete:CleaningUpRefencesTo_Several_ObjectsOf_Class' => '清除所有对 %2$s 类的 %1$d 个对象的参照...',
+	'UI:Delete:Done+' => '做了什么...',
+	'UI:Delete:_Name_Class_Deleted' => '%1$s - %2$s 删除了.',
+	'UI:Delete:ConfirmDeletionOf_Name' => '删除 %1$s',
+	'UI:Delete:ConfirmDeletionOf_Count_ObjectsOf_Class' => '删除 %2$s 类的 %1$d 个对象',
+//	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => '应该自动删除, 但您未被允许这样做',
+//	'UI:Delete:MustBeDeletedManuallyButNotPossible' => '必须手工删除 - 但您未被允许删除该对象, 请联系您的应用程序系统管理员',
+	'UI:Delete:WillBeDeletedAutomatically' => '将被自动删除',
+	'UI:Delete:MustBeDeletedManually' => '必须手工删除',
+	'UI:Delete:CannotUpdateBecause_Issue' => '应该被自动更新, 但是: %1$s',
+	'UI:Delete:WillAutomaticallyUpdate_Fields' => '将被自动更新 (重置: %1$s)',	
+	'UI:Delete:Count_Objects/LinksReferencing_Object' => '%1$d 个对象/链接参照了 %2$s',
+	'UI:Delete:Count_Objects/LinksReferencingTheObjects' => '%1$d 个对象/链接参照了一些将删除的对象',	
+	'UI:Delete:ReferencesMustBeDeletedToEnsureIntegrity' => '为确保数据库的完整性, 任何参照应该更进一步清除',
+	'UI:Delete:Consequence+' => '将做什么',
+	'UI:Delete:SorryDeletionNotAllowed' => '抱歉, 您未被允许删除该对象, 请看上述详细解释',
+	'UI:Delete:PleaseDoTheManualOperations' => '在要求删除该对象之前, 请先手工完成上述列出的操作',
+	'UI:Delect:Confirm_Object' => '请确认您要删除 %1$s.',
+	'UI:Delect:Confirm_Count_ObjectsOf_Class' => '请确认您要删除下列 %2$s 类的 %1$d 个对象.',
+	'UI:WelcomeToITop' => '欢迎来到 iTop',
+	'UI:DetailsPageTitle' => 'iTop - %1$s - %2$s 详细内容',
+	'UI:ErrorPageTitle' => 'iTop - 错误',
+	'UI:ObjectDoesNotExist' => '抱歉, 该对象不存在 (或您未被允许浏览该对象).',
+	'UI:ObjectArchived' => 'This object has been archived. Please enable the archive mode or contact your administrator.~~',
+	'Tag:Archived' => 'Archived~~',
+	'Tag:Archived+' => 'Can be accessed only in archive mode~~',
+	'Tag:Obsolete' => 'Obsolete~~',
+	'Tag:Obsolete+' => 'Excluded from the impact analysis and search results~~',
+	'Tag:Synchronized' => 'Synchronized~~',
+	'ObjectRef:Archived' => 'Archived~~',
+	'ObjectRef:Obsolete' => 'Obsolete~~',
+	'UI:SearchResultsPageTitle' => 'iTop - 搜索结果',
+	'UI:SearchResultsTitle' => '搜索结果',
+	'UI:SearchResultsTitle+' => 'Full-text search results~~',
+	'UI:Search:NoSearch' => '没有可搜索的内容',
+	'UI:FullTextSearchTitle_Text' => '"%1$s" 的结果:',
+	'UI:Search:Count_ObjectsOf_Class_Found' => '发现 %2$s 类的 %1$d 个对象.',
+	'UI:Search:NoObjectFound' => '未发现对象.',
+	'UI:ModificationPageTitle_Object_Class' => 'iTop - %1$s - %2$s 修改',
+	'UI:ModificationTitle_Class_Object' => '修改 %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:ClonePageTitle_Object_Class' => 'iTop - 克隆 %1$s - %2$s 修改',
+	'UI:CloneTitle_Class_Object' => '克隆 %1$s: <span class=\"hilite\">%2$s</span>',
+	'UI:CreationPageTitle_Class' => 'iTop - 创建一个新的 %1$s ',
+	'UI:CreationTitle_Class' => '创建一个新的 %1$s',
+	'UI:SelectTheTypeOf_Class_ToCreate' => '选择要创建的 %1$s 的类别:',
+	'UI:Class_Object_NotUpdated' => '未发现变化, %1$s (%2$s) <strong>没有</strong> 被更新.',
+	'UI:Class_Object_Updated' => '%1$s (%2$s) 更新了.',
+	'UI:BulkDeletePageTitle' => 'iTop - 批量删除',
+	'UI:BulkDeleteTitle' => '选择您要删除的对象:',
+	'UI:PageTitle:ObjectCreated' => 'iTop 对象创建了.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s 创建了.',
+	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '应用 %1$s 在对象: %2$s 上, 从 %3$s 状态到目标状态: %4$s.',
+	'UI:ObjectCouldNotBeWritten' => '对象不能写入: %1$s',
+	'UI:PageTitle:FatalError' => 'iTop - 致命错误',
+	'UI:SystemIntrusion' => '访问被禁止. 您正尝试未被许可的操作.',
+	'UI:FatalErrorMessage' => '致命错误, iTop 无法继续.',
+	'UI:Error_Details' => '错误: %1$s.',
+
+	'UI:PageTitle:ClassProjections'	=> 'iTop 用户管理 - 类投射',
+	'UI:PageTitle:ProfileProjections' => 'iTop 用户管理 - 简档投射',
+	'UI:UserManagement:Class' => '类',
+	'UI:UserManagement:Class+' => '对象的类',
+	'UI:UserManagement:ProjectedObject' => '对象',
+	'UI:UserManagement:ProjectedObject+' => '被投射的对象',
+	'UI:UserManagement:AnyObject' => '* 任何 *',
+	'UI:UserManagement:User' => '用户',
+	'UI:UserManagement:User+' => '与该投射相关的用户',
+	'UI:UserManagement:Profile' => '简档',
+	'UI:UserManagement:Profile+' => '投射被指定的简档',
+	'UI:UserManagement:Action:Read' => '读',
+	'UI:UserManagement:Action:Read+' => '读/显示 对象',
+	'UI:UserManagement:Action:Modify' => '修改',
+	'UI:UserManagement:Action:Modify+' => '创建和编辑(修改)对象',
+	'UI:UserManagement:Action:Delete' => '删除',
+	'UI:UserManagement:Action:Delete+' => '删除对象',
+	'UI:UserManagement:Action:BulkRead' => '大批量读 (导出)',
+	'UI:UserManagement:Action:BulkRead+' => '列出对象或批量导出',
+	'UI:UserManagement:Action:BulkModify' => '批量修改',
+	'UI:UserManagement:Action:BulkModify+' => '批量创建/编辑 (CSV 导入)',
+	'UI:UserManagement:Action:BulkDelete' => '批量删除',
+	'UI:UserManagement:Action:BulkDelete+' => '批量删除对象',
+	'UI:UserManagement:Action:Stimuli' => 'Stimuli',
+	'UI:UserManagement:Action:Stimuli+' => '许可的 (复合的) 动作',
+	'UI:UserManagement:Action' => '动作',
+	'UI:UserManagement:Action+' => '该用户进行的动作',
+	'UI:UserManagement:TitleActions' => '动作',
+	'UI:UserManagement:Permission' => '许可',
+	'UI:UserManagement:Permission+' => '用户的许可',
+	'UI:UserManagement:Attributes' => '属性',
+	'UI:UserManagement:ActionAllowed:Yes' => '是',
+	'UI:UserManagement:ActionAllowed:No' => '否',
+	'UI:UserManagement:AdminProfile+' => '系统管理员拥有数据库中所有对象的完全读/写访问权限.',
+	'UI:UserManagement:NoLifeCycleApplicable' => 'N/A',
+	'UI:UserManagement:NoLifeCycleApplicable+' => '该类未定义生命周期',
+	'UI:UserManagement:GrantMatrix' => '授权矩阵',
+	'UI:UserManagement:LinkBetween_User_And_Profile' => '链接 %1$s 和 %2$s',
+	'UI:UserManagement:LinkBetween_User_And_Org' => '链接 %1$s 和 %2$s',
+	
+	'Menu:AdminTools' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools+' => '管理工具', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AdminTools?' => '具有系统管理员简档的用户才能获得的工具', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:ChangeManagementMenu' => '变更管理',
+	'UI:ChangeManagementMenu+' => '变更管理',
+	'UI:ChangeManagementMenu:Title' => '变更概览',
+	'UI-ChangeManagementMenu-ChangesByType' => '按类别划分的变更',
+	'UI-ChangeManagementMenu-ChangesByStatus' => '按状态划分的变更',
+	'UI-ChangeManagementMenu-ChangesByWorkgroup' => '按工作组划分的变更',
+	'UI-ChangeManagementMenu-ChangesNotYetAssigned' => '尚未指派的变更',
+
+	'UI:ConfigurationManagementMenu' => '配置管理',
+	'UI:ConfigurationManagementMenu+' => '配置管理',
+	'UI:ConfigurationManagementMenu:Title' => '基础架构概览',
+	'UI-ConfigurationManagementMenu-InfraByType' => '按类别划分基础架构对象',
+	'UI-ConfigurationManagementMenu-InfraByStatus' => '按状态划分基础架构对象',
+
+'UI:ConfigMgmtMenuOverview:Title' => '配置管理仪表板',
+'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => '按状态配置项目',
+'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => '按类别配置项目',
+
+'UI:RequestMgmtMenuOverview:Title' => '请求管理仪表板',
+'UI-RequestManagementOverview-RequestByService' => '按服务划分用户请求',
+'UI-RequestManagementOverview-RequestByPriority' => '按优先级划分用户请求',
+'UI-RequestManagementOverview-RequestUnassigned' => '尚未指派办理人的用户请求',
+
+'UI:IncidentMgmtMenuOverview:Title' => '事件管理仪表板',
+'UI-IncidentManagementOverview-IncidentByService' => '按服务级划分事件',
+'UI-IncidentManagementOverview-IncidentByPriority' => '按优先级划分事件',
+'UI-IncidentManagementOverview-IncidentUnassigned' => '尚未指派办理人的事件',
+
+'UI:ChangeMgmtMenuOverview:Title' => '变更管理仪表板',
+'UI-ChangeManagementOverview-ChangeByType' => '按类别划分变更',
+'UI-ChangeManagementOverview-ChangeUnassigned' => '尚未指派办理人的变更',
+'UI-ChangeManagementOverview-ChangeWithOutage' => '变更引起的停机',
+
+'UI:ServiceMgmtMenuOverview:Title' => '服务管理仪表板',
+'UI-ServiceManagementOverview-CustomerContractToRenew' => '客户联系人需在30日内更新',
+'UI-ServiceManagementOverview-ProviderContractToRenew' => '供应商联系人需在30日内更新',
+
+	'UI:ContactsMenu' => '联系人',
+	'UI:ContactsMenu+' => '联系人',
+	'UI:ContactsMenu:Title' => '联系人概览',
+	'UI-ContactsMenu-ContactsByLocation' => '按地域划分联系人',
+	'UI-ContactsMenu-ContactsByType' => '按类别划分联系人',
+	'UI-ContactsMenu-ContactsByStatus' => '按状态划分联系人',
+
+	'Menu:CSVImportMenu' => 'CSV 导入', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:CSVImportMenu+' => '大批量创建或修改', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:DataModelMenu' => '数据模型', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataModelMenu+' => '数据模型概览', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:ExportMenu' => '导出', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ExportMenu+' => '以HTML, CSV or XML格式导出任何查询的结果', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:NotificationsMenu' => '通知', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:NotificationsMenu+' => '通知的配置', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'UI:NotificationsMenu:Title' => '配置 <span class="hilite">通知</span>',
+	'UI:NotificationsMenu:Help' => '帮助',
+	'UI:NotificationsMenu:HelpContent' => '<p>在 iTop 中, 通知可以被完全客户化定制. 它们是基于两个对象集: <i>触发器和动作</i>.</p>
+<p><i><b>触发器</b></i> 定义了什么时候一个通知将被执行. 有3种触发器, 覆盖了一个对象生命周期的3个阶段:
+<ol>
+	<li>"OnCreate" 触发器, 当某个特定类的对象创建时将触发</li>
+	<li>"OnStateEnter" 触发器, 在某个给定类的对象进入某个特定状态前将触发(从另外一个状态而来)</li>
+	<li>"OnStateLeave" 触发器, 在某个给定类的对象离开某个特定状态时将触发</li>
+</ol>
+</p>
+<p>
+<i><b>动作</b></i> 定义了触发器触发时要执行的动作. 目前, 仅有一种动作存在于发送邮件过程中.
+这些动作还定义了用于发送邮件及收件人,重要性等的模板.
+</p>
+<p>一个专门页面: <a href="../setup/email.test.php" target="_blank">email.test.php</a> 可用于测试和调试您的 PHP mail 配置.</p>
+<p>若要执行, 动作必须和触发器相关联.
+当与一个触发器关联时, 每个动作都被赋予一个顺序号, 规定了按什么样的顺序执行这些动作.</p>',
+	'UI:NotificationsMenu:Triggers' => '触发器',
+	'UI:NotificationsMenu:AvailableTriggers' => '可用的触发器',
+	'UI:NotificationsMenu:OnCreate' => '当一个对象被创建',
+	'UI:NotificationsMenu:OnStateEnter' => '当一个对象进入给定状态',
+	'UI:NotificationsMenu:OnStateLeave' => '当一个对象离开给定状态',
+	'UI:NotificationsMenu:Actions' => '动作',
+	'UI:NotificationsMenu:AvailableActions' => '有效的动作',
+	
+	'Menu:AuditCategories' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:AuditCategories+' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:Notifications:Title' => '审计类目', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:RunQueriesMenu' => '运行查询', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:RunQueriesMenu+' => '运行任何查询', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:DataAdministration' => '数据管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:DataAdministration+' => '数据管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:UniversalSearchMenu' => '通用搜索', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UniversalSearchMenu+' => '搜索所有...', // Duplicated into itop-welcome-itil (will be removed from here...)
+	
+	'Menu:UserManagementMenu' => '用户管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserManagementMenu+' => '用户管理', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:ProfilesMenu' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu+' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:ProfilesMenu:Title' => '简档', // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'Menu:UserAccountsMenu' => '用户帐户', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu+' => '用户帐户', // Duplicated into itop-welcome-itil (will be removed from here...)
+	'Menu:UserAccountsMenu:Title' => '用户帐户',	 // Duplicated into itop-welcome-itil (will be removed from here...)
+
+	'UI:iTopVersion:Short' => '%1$s version %2$s',
+	'UI:iTopVersion:Long' => '%1$s version %2$s-%3$s built on %4$s',
+	'UI:PropertiesTab' => '属性',
+
+	'UI:OpenDocumentInNewWindow_' => '在新窗口打开文档: %1$s',
+	'UI:DownloadDocument_' => '下载该文档: %1$s',
+	'UI:Document:NoPreview' => '该类文档无法预览',
+
+	'UI:DeadlineMissedBy_duration' => 'Missed  by %1$s',
+	'UI:Deadline_LessThan1Min' => '< 1 min',		
+	'UI:Deadline_Minutes' => '%1$d min',			
+	'UI:Deadline_Hours_Minutes' => '%1$dh %2$dmin',			
+	'UI:Deadline_Days_Hours_Minutes' => '%1$dd %2$dh %3$dmin',
+	'UI:Help' => '帮助',
+	'UI:PasswordConfirm' => '(确认)',
+	'UI:BeforeAdding_Class_ObjectsSaveThisObject' => '在添加更多 %1$s 对象前, 保存该对象.',
+	'UI:DisplayThisMessageAtStartup' => '在启动时显示该消息',
+	'UI:RelationshipGraph' => '图览',
+	'UI:RelationshipList' => '列表',
+
+	'Portal:Title' => 'iTop 用户门户',
+	'Portal:Refresh' => '刷新',
+	'Portal:Back' => '返回',
+	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
+	'Portal:ShowOngoing' => 'Show open requests',
+	'Portal:ShowClosed' => 'Show closed requests',
+	'Portal:CreateNewRequest' => '创建一个新的请求',
+	'Portal:CreateNewRequestItil' => '创建一个新的请求',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
+	'Portal:ChangeMyPassword' => '改变我的密码',
+	'Portal:Disconnect' => '断开',
+	'Portal:OpenRequests' => '我的待解决的请求',
+	'Portal:ClosedRequests'  => 'My closed requests',
+	'Portal:ResolvedRequests'  => '我的已解决的请求',
+	'Portal:SelectService' => '从类目中选择一个服务:',
+	'Portal:PleaseSelectOneService' => '请选择一个服务',
+	'Portal:SelectSubcategoryFrom_Service' => '从服务中选择一个子类 %1$s:',
+	'Portal:PleaseSelectAServiceSubCategory' => '请选择一个子类',
+	'Portal:DescriptionOfTheRequest' => '输入您的请求描述:',
+	'Portal:TitleRequestDetailsFor_Request' => '请求明细内容 %1$s:',
+	'Portal:NoOpenRequest' => '该类目中没有请求.',
+	'Portal:NoClosedRequest' => 'No request in this category',
+	'Portal:Button:CloseTicket' => '关闭这个单据',
+	'Portal:Button:UpdateRequest' => 'Update the request',
+	'Portal:EnterYourCommentsOnTicket' => '输入您对于该单据解决情况的评述:',
+	'Portal:ErrorNoContactForThisUser' => '错误: 当前用户没有和一个联系人或人员关联. 请联系您的系统管理员.',
+	
+	'Enum:Undefined' => '未定义',
+	'UI:Button:Refresh' => '刷新',
+	'Class:Query' => 'Query~~',
+	'Class:Query+' => 'A query is a data set defined in a dynamic way~~',
+	'Class:Query/Attribute:name' => 'Name~~',
+	'Class:Query/Attribute:name+' => 'Identifies the query~~',
+	'Class:Query/Attribute:description' => 'Description~~',
+	'Class:Query/Attribute:description+' => 'Long description for the query (purpose, usage, etc.)~~',
+	'Class:Query/Attribute:fields' => 'Fields~~',
+	'Class:Query/Attribute:fields+' => 'Coma separated list of attributes (or alias.attribute) to export~~',
+	'Class:QueryOQL' => 'OQL Query~~',
+	'Class:QueryOQL+' => 'A query based on the Object Query Language~~',
+	'Class:QueryOQL/Attribute:oql' => 'Expression~~',
+	'Class:QueryOQL/Attribute:oql+' => 'OQL Expression~~',
+	'Class:UserInternal' => 'User Internal~~',
+	'Class:UserInternal+' => 'User defined within iTop~~',
+	'UI:Button:Save' => 'Save~~',
+	'UI:Button:Restart' => ' |<< Restart ~~',
+	'UI:Button:Rename' => ' Rename... ~~',
+	'UI:History:BulkImports' => 'History~~',
+	'UI:History:BulkImports+' => 'List of CSV imports (latest import first)~~',
+	'UI:History:BulkImportDetails' => 'Changes resulting from the CSV import performed on %1$s (by %2$s)~~',
+	'UI:History:StatsCreations' => 'Created~~',
+	'UI:History:StatsCreations+' => 'Count of objects created~~',
+	'UI:History:StatsModifs' => 'Modified~~',
+	'UI:History:StatsModifs+' => 'Count of objects modified~~',
+	'UI:History:StatsDeletes' => 'Deleted~~',
+	'UI:History:StatsDeletes+' => 'Count of objects deleted~~',
+	'UI:SplitDateTime-Date' => 'date~~',
+	'UI:SplitDateTime-Time' => 'time~~',
+	'UI:SearchValue:NbSelected' => '# selected~~',
+	'UI:SearchValue:CheckAll' => 'Check All~~',
+	'UI:SearchValue:UncheckAll' => 'Uncheck All~~',
+	'UI:Login:ForgotPwd' => 'Forgot your password?~~',
+	'UI:Login:ForgotPwdForm' => 'Forgot your password~~',
+	'UI:Login:ForgotPwdForm+' => 'iTop can send you an email in which you will find instructions to follow to reset your account.~~',
+	'UI:Login:ResetPassword' => 'Send now!~~',
+	'UI:Login:ResetPwdFailed' => 'Failed to send an email: %1$s~~',
+	'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' is not a valid login~~',
+	'UI:ResetPwd-Error-NotPossible' => 'external accounts do not allow password reset.~~',
+	'UI:ResetPwd-Error-FixedPwd' => 'the account does not allow password reset.~~',
+	'UI:ResetPwd-Error-NoContact' => 'the account is not associated to a person.~~',
+	'UI:ResetPwd-Error-NoEmailAtt' => 'the account is not associated to a person having an email attribute. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-NoEmail' => 'missing an email address. Please Contact your administrator.~~',
+	'UI:ResetPwd-Error-Send' => 'email transport technical issue. Please Contact your administrator.~~',
+	'UI:ResetPwd-EmailSent' => 'Please check your email box and follow the instructions...~~',
+	'UI:ResetPwd-EmailSubject' => 'Reset your iTop password~~',
+	'UI:ResetPwd-EmailBody' => '<body><p>You have requested to reset your iTop password.</p><p>Please follow this link (single usage) to <a href="%1$s">enter a new password</a></p>.~~',
+	'UI:ResetPwd-Title' => 'Reset password~~',
+	'UI:ResetPwd-Error-InvalidToken' => 'Sorry, either the password has already been reset, or you have received several emails. Please make sure that you use the link provided in the very last email received.~~',
+	'UI:ResetPwd-Error-EnterPassword' => 'Enter a new password for the account \'%1$s\'.~~',
+	'UI:ResetPwd-Ready' => 'The password has been changed.~~',
+	'UI:ResetPwd-Login' => 'Click here to login...~~',
+	'UI:Login:PasswordChanged' => 'Password successfully set!~~',
+	'UI:AccessRO-All' => 'iTop is read-only~~',
+	'UI:AccessRO-Users' => 'iTop is read-only for end-users~~',
+	'UI:ApplicationEnvironment' => 'Application environment: %1$s~~',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => 'Synchronization of %1$d objects of class %2$s~~',
+	'UI:CSVImport:AlertMultipleMapping' => 'Please make sure that a target field is mapped only once.~~',
+	'UI:CSVReport-Value-Modified' => 'Modified~~',
+	'UI:CSVReport-Value-SetIssue' => 'Could not be changed - reason: %1$s~~',
+	'UI:CSVReport-Value-ChangeIssue' => 'Could not be changed to %1$s - reason: %2$s~~',
+	'UI:CSVReport-Value-NoMatch' => 'No match~~',
+	'UI:CSVReport-Value-Missing' => 'Missing mandatory value~~',
+	'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects~~',
+	'UI:CSVReport-Row-Unchanged' => 'unchanged~~',
+	'UI:CSVReport-Row-Created' => 'created~~',
+	'UI:CSVReport-Row-Updated' => 'updated %1$d cols~~',
+	'UI:CSVReport-Row-Disappeared' => 'disappeared, changed %1$d cols~~',
+	'UI:CSVReport-Row-Issue' => 'Issue: %1$s~~',
+	'UI:CSVReport-Value-Issue-Null' => 'Null not allowed~~',
+	'UI:CSVReport-Value-Issue-NotFound' => 'Object not found~~',
+	'UI:CSVReport-Value-Issue-FoundMany' => 'Found %1$d matches~~',
+	'UI:CSVReport-Value-Issue-Readonly' => 'The attribute \'%1$s\' is read-only and cannot be modified (current value: %2$s, proposed value: %3$s)~~',
+	'UI:CSVReport-Value-Issue-Format' => 'Failed to process input: %1$s~~',
+	'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling~~',
+	'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s~~',
+	'UI:CSVReport-Row-Issue-Inconsistent' => 'Attributes not consistent with each others: %1$s~~',
+	'UI:CSVReport-Row-Issue-Attribute' => 'Unexpected attribute value(s)~~',
+	'UI:CSVReport-Row-Issue-MissingExtKey' => 'Could not be created, due to missing external key(s): %1$s~~',
+	'UI:CSVReport-Row-Issue-DateFormat' => 'wrong date format~~',
+	'UI:CSVReport-Row-Issue-Reconciliation' => 'failed to reconcile~~',
+	'UI:CSVReport-Row-Issue-Ambiguous' => 'ambiguous reconciliation~~',
+	'UI:CSVReport-Row-Issue-Internal' => 'Internal error: %1$s, %2$s~~',
+	'UI:CSVReport-Icon-Unchanged' => 'Unchanged~~',
+	'UI:CSVReport-Icon-Modified' => 'Modified~~',
+	'UI:CSVReport-Icon-Missing' => 'Missing~~',
+	'UI:CSVReport-Object-MissingToUpdate' => 'Missing object: will be updated~~',
+	'UI:CSVReport-Object-MissingUpdated' => 'Missing object: updated~~',
+	'UI:CSVReport-Icon-Created' => 'Created~~',
+	'UI:CSVReport-Object-ToCreate' => 'Object will be created~~',
+	'UI:CSVReport-Object-Created' => 'Object created~~',
+	'UI:CSVReport-Icon-Error' => 'Error~~',
+	'UI:CSVReport-Object-Error' => 'ERROR: %1$s~~',
+	'UI:CSVReport-Object-Ambiguous' => 'AMBIGUOUS: %1$s~~',
+	'UI:CSVReport-Stats-Errors' => '%1$.0f %% of the loaded objects have errors and will be ignored.~~',
+	'UI:CSVReport-Stats-Created' => '%1$.0f %% of the loaded objects will be created.~~',
+	'UI:CSVReport-Stats-Modified' => '%1$.0f %% of the loaded objects will be modified.~~',
+	'UI:CSVExport:AdvancedMode' => 'Advanced mode~~',
+	'UI:CSVExport:AdvancedMode+' => 'In advanced mode, several columns are added to the export: the id of the object, the id of external keys and their reconciliation attributes.~~',
+	'UI:CSVExport:LostChars' => 'Encoding issue~~',
+	'UI:CSVExport:LostChars+' => 'The downloaded file will be encoded into %1$s. iTop has detected some characters that are not compatible with this format. Those characters will either be replaced by a substitute (e.g. accentuated chars losing the accent), or they will be discarded. You can copy/paste the data from your web browser. Alternatively, you can contact your administrator to change the encoding (See parameter \'csv_file_default_charset\').~~',
+	'UI:Audit:ErrorIn_Rule_Reason' => 'OQL Error in the Rule %1$s: %2$s.~~',
+	'UI:Audit:ErrorIn_Category_Reason' => 'OQL Error in the Category %1$s: %2$s.~~',
+	'UI:Query:UrlForExcel' => 'URL to use for MS-Excel web queries~~',
+	'UI:Query:UrlV1' => 'The list of fields has been left unspecified. The page <em>export-V2.php</em> cannot be invoked without this information. Therefore, the URL suggested herebelow points to the legacy page: <em>export.php</em>. This legacy version of the export has the following limitation: the list of exported fields may vary depending on the output format and the data model of iTop. Should you want to garantee that the list of exported columns will remain stable on the long run, then you must specify a value for the attribute "Fields" and use the page <em>export-V2.php</em>.~~',
+	'UI:Edit:TestQuery' => 'Test query~~',
+	'UI:Error:CannotDeleteBecauseManualOpNeeded' => 'This object could not be deleted because some manual operations must be performed prior to that~~',
+	'UI:Delete:Deleted' => 'deleted~~',
+	'UI:Delete:CannotDeleteBecause' => 'Could not be deleted: %1$s~~',
+	'UI:Delete:ShouldBeDeletedAtomaticallyButNotPossible' => 'Should be automaticaly deleted, but this is not feasible: %1$s~~',
+	'UI:Delete:MustBeDeletedManuallyButNotPossible' => 'Must be deleted manually, but this is not feasible: %1$s~~',
+	'UI:Search:NeedleTooShort' => 'The search string \"%1$s\" is too short. Please type at least %2$d characters.~~',
+	'UI:Search:Ongoing' => 'Searching for \"%1$s\"~~',
+	'UI:Search:Enlarge' => 'Broaden the search~~',
+	'Menu:QueryMenu' => 'Query phrasebook~~',
+	'Menu:QueryMenu+' => 'Query phrasebook~~',
+	'UI:Download-CSV' => 'Download %1$s~~',
+	'UI:RelationGroups' => 'Groups~~',
+	'UI:OperationCancelled' => 'Operation Cancelled~~',
+	'UI:ElementsDisplayed' => 'Filtering~~',
+	'UI:RelationGroupNumber_N' => 'Group #%1$d~~',
+	'UI:Relation:ExportAsPDF' => 'Export as PDF...~~',
+	'UI:RelationOption:GroupingThreshold' => 'Grouping threshold~~',
+	'UI:Relation:AdditionalContextInfo' => 'Additional context info~~',
+	'UI:Relation:NoneSelected' => 'None~~',
+	'UI:Relation:ExportAsAttachment' => 'Export as Attachment...~~',
+	'UI:Relation:DrillDown' => 'Details...~~',
+	'UI:Relation:PDFExportOptions' => 'PDF Export Options~~',
+	'UI:Relation:AttachmentExportOptions_Name' => 'Options for Attachment to %1$s~~',
+	'UI:RelationOption:Untitled' => 'Untitled~~',
+	'UI:Relation:Key' => 'Key~~',
+	'UI:Relation:Comments' => 'Comments~~',
+	'UI:RelationOption:Title' => 'Title~~',
+	'UI:RelationOption:IncludeList' => 'Include the list of objects~~',
+	'UI:RelationOption:Comments' => 'Comments~~',
+	'UI:Button:Export' => 'Export~~',
+	'UI:Relation:PDFExportPageFormat' => 'Page format~~',
+	'UI:PageFormat_A3' => 'A3~~',
+	'UI:PageFormat_A4' => 'A4~~',
+	'UI:PageFormat_Letter' => 'Letter~~',
+	'UI:Relation:PDFExportPageOrientation' => 'Page orientation~~',
+	'UI:PageOrientation_Portrait' => 'Portrait~~',
+	'UI:PageOrientation_Landscape' => 'Landscape~~',
+	'UI:RelationTooltip:Redundancy' => 'Redundancy~~',
+	'UI:RelationTooltip:ImpactedItems_N_of_M' => '# of impacted items: %1$d / %2$d~~',
+	'UI:RelationTooltip:CriticalThreshold_N_of_M' => 'Critical threshold: %1$d / %2$d~~',
+	'Portal:NoRequestMgmt' => 'Dear %1$s, you have been redirected to this page because your account is configured with the profile \'Portal user\'. Unfortunately, iTop has not been installed with the feature \'Request Management\'. Please contact your administrator.~~',
+	'Portal:TitleDetailsFor_Request' => 'Details for request~~',
+	'Portal:Button:ReopenTicket' => 'Reopen this ticket~~',
+	'Portal:Attachments' => 'Attachments~~',
+	'Portal:AddAttachment' => ' Add Attachment ~~',
+	'Portal:RemoveAttachment' => ' Remove Attachment ~~',
+	'Portal:Attachment_No_To_Ticket_Name' => 'Attachment #%1$d to %2$s (%3$s)~~',
+	'Portal:SelectRequestTemplate' => 'Select a template for %1$s~~',
+	'UI:DurationForm_Days_Hours_Minutes_Seconds' => '%1$s Days %2$s Hours %3$s Minutes %4$s Seconds~~',
+	'UI:ModifyAllPageTitle' => 'Modify All~~',
+	'UI:Modify_N_ObjectsOf_Class' => 'Modifying %1$d objects of class %2$s~~',
+	'UI:Modify_M_ObjectsOf_Class_OutOf_N' => 'Modifying %1$d objects of class %2$s out of %3$d~~',
+	'UI:Menu:ModifyAll' => 'Modify...~~',
+	'UI:Button:ModifyAll' => 'Modify All~~',
+	'UI:Button:PreviewModifications' => 'Preview Modifications >>~~',
+	'UI:ModifiedObject' => 'Object Modified~~',
+	'UI:BulkModifyStatus' => 'Operation~~',
+	'UI:BulkModifyStatus+' => 'Status of the operation~~',
+	'UI:BulkModifyErrors' => 'Errors (if any)~~',
+	'UI:BulkModifyErrors+' => 'Errors preventing the modification~~',
+	'UI:BulkModifyStatusOk' => 'Ok~~',
+	'UI:BulkModifyStatusError' => 'Error~~',
+	'UI:BulkModifyStatusModified' => 'Modified~~',
+	'UI:BulkModifyStatusSkipped' => 'Skipped~~',
+	'UI:BulkModify_Count_DistinctValues' => '%1$d distinct values:~~',
+	'UI:BulkModify:Value_Exists_N_Times' => '%1$s, %2$d time(s)~~',
+	'UI:BulkModify:N_MoreValues' => '%1$d more values...~~',
+	'UI:AttemptingToSetAReadOnlyAttribute_Name' => 'Attempting to set the read-only field: %1$s~~',
+	'UI:FailedToApplyStimuli' => 'The action has failed.~~',
+	'UI:StimulusModify_N_ObjectsOf_Class' => '%1$s: Modifying %2$d objects of class %3$s~~',
+	'UI:CaseLogTypeYourTextHere' => 'Type your text here:~~',
+	'UI:CaseLog:Header_Date_UserName' => '%1$s - %2$s:~~',
+	'UI:CaseLog:InitialValue' => 'Initial value:~~',
+	'UI:AttemptingToSetASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value not set.~~',
+	'UI:ActionNotAllowed' => 'You are not allowed to perform this action on these objects.~~',
+	'UI:BulkAction:NoObjectSelected' => 'Please select at least one object to perform this operation~~',
+	'UI:AttemptingToChangeASlaveAttribute_Name' => 'The field %1$s is not writable because it is mastered by the data synchronization. Value remains unchanged.~~',
+	'UI:Pagination:HeaderSelection' => 'Total: %1$s objects (%2$s objects selected).~~',
+	'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.~~',
+	'UI:Pagination:PageSize' => '%1$s objects per page~~',
+	'UI:Pagination:PagesLabel' => 'Pages:~~',
+	'UI:Pagination:All' => 'All~~',
+	'UI:HierarchyOf_Class' => 'Hierarchy of %1$s~~',
+	'UI:Preferences' => 'Preferences...~~',
+	'UI:ArchiveModeOn' => 'Activate archive mode~~',
+	'UI:ArchiveModeOff' => 'Deactivate archive mode~~',
+	'UI:ArchiveMode:Banner' => 'Archive mode~~',
+	'UI:ArchiveMode:Banner+' => 'Archived objects are visible, and no modification is allowed~~',
+	'UI:FavoriteOrganizations' => 'Favorite Organizations~~',
+	'UI:FavoriteOrganizations+' => 'Check in the list below the organizations that you want to see in the drop-down menu for a quick access. Note that this is not a security setting, objects from any organization are still visible and can be accessed by selecting \"All Organizations\" in the drop-down list.~~',
+	'UI:FavoriteLanguage' => 'Language of the User Interface~~',
+	'UI:Favorites:SelectYourLanguage' => 'Select your preferred language~~',
+	'UI:FavoriteOtherSettings' => 'Other Settings~~',
+	'UI:Favorites:Default_X_ItemsPerPage' => 'Default length for lists:  %1$s items per page~~',
+	'UI:Favorites:ShowObsoleteData' => 'Show obsolete data~~',
+	'UI:Favorites:ShowObsoleteData+' => 'Show obsolete data in search results and lists of items to select~~',
+	'UI:NavigateAwayConfirmationMessage' => 'Any modification will be discarded.~~',
+	'UI:CancelConfirmationMessage' => 'You will loose your changes. Continue anyway?~~',
+	'UI:AutoApplyConfirmationMessage' => 'Some changes have not been applied yet. Do you want itop to take them into account?~~',
+	'UI:Create_Class_InState' => 'Create the %1$s in state: ~~',
+	'UI:OrderByHint_Values' => 'Sort order: %1$s~~',
+	'UI:Menu:AddToDashboard' => 'Add To Dashboard...~~',
+	'UI:ConfigureThisList' => 'Configure This List...~~',
+	'UI:ListConfigurationTitle' => 'List Configuration~~',
+	'UI:ColumnsAndSortOrder' => 'Columns and sort order:~~',
+	'UI:UseDefaultSettings' => 'Use the Default Settings~~',
+	'UI:UseSpecificSettings' => 'Use the Following Settings:~~',
+	'UI:Display_X_ItemsPerPage' => 'Display %1$s items per page~~',
+	'UI:UseSavetheSettings' => 'Save the Settings~~',
+	'UI:OnlyForThisList' => 'Only for this list~~',
+	'UI:ForAllLists' => 'Default for all lists~~',
+	'UI:ExtKey_AsLink' => '%1$s (Link)~~',
+	'UI:ExtKey_AsFriendlyName' => '%1$s (Friendly Name)~~',
+	'UI:ExtField_AsRemoteField' => '%1$s (%2$s)~~',
+	'UI:Button:MoveUp' => 'Move Up~~',
+	'UI:Button:MoveDown' => 'Move Down~~',
+	'UI:OQL:UnknownClassAndFix' => 'Unknown class \"%1$s\". You may try \"%2$s\" instead.~~',
+	'UI:OQL:UnknownClassNoFix' => 'Unknown class \"%1$s\"~~',
+	'UI:Dashboard:Edit' => 'Edit This Page...~~',
+	'UI:Dashboard:Revert' => 'Revert To Original Version...~~',
+	'UI:Dashboard:RevertConfirm' => 'Every changes made to the original version will be lost. Please confirm that you want to do this.~~',
+	'UI:ExportDashBoard' => 'Export to a file~~',
+	'UI:ImportDashBoard' => 'Import from a file...~~',
+	'UI:ImportDashboardTitle' => 'Import From a File~~',
+	'UI:ImportDashboardText' => 'Select a dashboard file to import:~~',
+	'UI:DashletCreation:Title' => 'Create a new Dashlet~~',
+	'UI:DashletCreation:Dashboard' => 'Dashboard~~',
+	'UI:DashletCreation:DashletType' => 'Dashlet Type~~',
+	'UI:DashletCreation:EditNow' => 'Edit the Dashboard~~',
+	'UI:DashboardEdit:Title' => 'Dashboard Editor~~',
+	'UI:DashboardEdit:DashboardTitle' => 'Title~~',
+	'UI:DashboardEdit:AutoReload' => 'Automatic refresh~~',
+	'UI:DashboardEdit:AutoReloadSec' => 'Automatic refresh interval (seconds)~~',
+	'UI:DashboardEdit:AutoReloadSec+' => 'The minimum allowed is %1$d seconds~~',
+	'UI:DashboardEdit:Layout' => 'Layout~~',
+	'UI:DashboardEdit:Properties' => 'Dashboard Properties~~',
+	'UI:DashboardEdit:Dashlets' => 'Available Dashlets~~',
+	'UI:DashboardEdit:DashletProperties' => 'Dashlet Properties~~',
+	'UI:Form:Property' => 'Property~~',
+	'UI:Form:Value' => 'Value~~',
+	'UI:DashletPlainText:Label' => 'Text~~',
+	'UI:DashletPlainText:Description' => 'Plain text (no formatting)~~',
+	'UI:DashletPlainText:Prop-Text' => 'Text~~',
+	'UI:DashletPlainText:Prop-Text:Default' => 'Please enter some text here...~~',
+	'UI:DashletObjectList:Label' => 'Object list~~',
+	'UI:DashletObjectList:Description' => 'Object list dashlet~~',
+	'UI:DashletObjectList:Prop-Title' => 'Title~~',
+	'UI:DashletObjectList:Prop-Query' => 'Query~~',
+	'UI:DashletObjectList:Prop-Menu' => 'Menu~~',
+	'UI:DashletGroupBy:Prop-Title' => 'Title~~',
+	'UI:DashletGroupBy:Prop-Query' => 'Query~~',
+	'UI:DashletGroupBy:Prop-Style' => 'Style~~',
+	'UI:DashletGroupBy:Prop-GroupBy' => 'Group by...~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Hour' => 'Hour of %1$s (0-23)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Month' => 'Month of %1$s (1 - 12)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfWeek' => 'Day of week for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:DayOfMonth' => 'Day of month for %1$s~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Hour' => '%1$s (hour)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-Month' => '%1$s (month)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek' => '%1$s (day of week)~~',
+	'UI:DashletGroupBy:Prop-GroupBy:Select-DayOfMonth' => '%1$s (day of month)~~',
+	'UI:DashletGroupBy:MissingGroupBy' => 'Please select the field on which the objects will be grouped together~~',
+	'UI:DashletGroupByPie:Label' => 'Pie Chart~~',
+	'UI:DashletGroupByPie:Description' => 'Pie Chart~~',
+	'UI:DashletGroupByBars:Label' => 'Bar Chart~~',
+	'UI:DashletGroupByBars:Description' => 'Bar Chart~~',
+	'UI:DashletGroupByTable:Label' => 'Group By (table)~~',
+	'UI:DashletGroupByTable:Description' => 'List (Grouped by a field)~~',
+	'UI:DashletHeaderStatic:Label' => 'Header~~',
+	'UI:DashletHeaderStatic:Description' => 'Displays an horizontal separator~~',
+	'UI:DashletHeaderStatic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderStatic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderStatic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Label' => 'Header with statistics~~',
+	'UI:DashletHeaderDynamic:Description' => 'Header with stats (grouped by...)~~',
+	'UI:DashletHeaderDynamic:Prop-Title' => 'Title~~',
+	'UI:DashletHeaderDynamic:Prop-Title:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Icon' => 'Icon~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle' => 'Subtitle~~',
+	'UI:DashletHeaderDynamic:Prop-Subtitle:Default' => 'Contacts~~',
+	'UI:DashletHeaderDynamic:Prop-Query' => 'Query~~',
+	'UI:DashletHeaderDynamic:Prop-GroupBy' => 'Group by~~',
+	'UI:DashletHeaderDynamic:Prop-Values' => 'Values~~',
+	'UI:DashletBadge:Label' => 'Badge~~',
+	'UI:DashletBadge:Description' => 'Object Icon with new/search~~',
+	'UI:DashletBadge:Prop-Class' => 'Class~~',
+	'DayOfWeek-Sunday' => 'Sunday~~',
+	'DayOfWeek-Monday' => 'Monday~~',
+	'DayOfWeek-Tuesday' => 'Tuesday~~',
+	'DayOfWeek-Wednesday' => 'Wednesday~~',
+	'DayOfWeek-Thursday' => 'Thursday~~',
+	'DayOfWeek-Friday' => 'Friday~~',
+	'DayOfWeek-Saturday' => 'Saturday~~',
+	'Month-01' => 'January~~',
+	'Month-02' => 'February~~',
+	'Month-03' => 'March~~',
+	'Month-04' => 'April~~',
+	'Month-05' => 'May~~',
+	'Month-06' => 'June~~',
+	'Month-07' => 'July~~',
+	'Month-08' => 'August~~',
+	'Month-09' => 'September~~',
+	'Month-10' => 'October~~',
+	'Month-11' => 'November~~',
+	'Month-12' => 'December~~',
+	'DayOfWeek-Sunday-Min' => 'Su~~',
+	'DayOfWeek-Monday-Min' => 'Mo~~',
+	'DayOfWeek-Tuesday-Min' => 'Tu~~',
+	'DayOfWeek-Wednesday-Min' => 'We~~',
+	'DayOfWeek-Thursday-Min' => 'Th~~',
+	'DayOfWeek-Friday-Min' => 'Fr~~',
+	'DayOfWeek-Saturday-Min' => 'Sa~~',
+	'Month-01-Short' => 'Jan~~',
+	'Month-02-Short' => 'Feb~~',
+	'Month-03-Short' => 'Mar~~',
+	'Month-04-Short' => 'Apr~~',
+	'Month-05-Short' => 'May~~',
+	'Month-06-Short' => 'Jun~~',
+	'Month-07-Short' => 'Jul~~',
+	'Month-08-Short' => 'Aug~~',
+	'Month-09-Short' => 'Sep~~',
+	'Month-10-Short' => 'Oct~~',
+	'Month-11-Short' => 'Nov~~',
+	'Month-12-Short' => 'Dec~~',
+	'Calendar-FirstDayOfWeek' => '0~~',
+	'UI:Menu:ShortcutList' => 'Create a Shortcut...~~',
+	'UI:ShortcutRenameDlg:Title' => 'Rename the shortcut~~',
+	'UI:ShortcutListDlg:Title' => 'Create a shortcut for the list~~',
+	'UI:ShortcutDelete:Confirm' => 'Please confirm that wou wish to delete the shortcut(s).~~',
+	'Menu:MyShortcuts' => 'My Shortcuts~~',
+	'Class:Shortcut' => 'Shortcut~~',
+	'Class:Shortcut/Attribute:name' => 'Name~~',
+	'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title~~',
+	'Class:ShortcutOQL' => 'Search result shortcut~~',
+	'Class:ShortcutOQL/Attribute:oql' => 'Query~~',
+	'Class:ShortcutOQL/Attribute:oql+' => 'OQL defining the list of objects to search for~~',
+	'Class:ShortcutOQL/Attribute:auto_reload' => 'Automatic refresh~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:none' => 'Disabled~~',
+	'Class:ShortcutOQL/Attribute:auto_reload/Value:custom' => 'Custom rate~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec' => 'Automatic refresh interval (seconds)~~',
+	'Class:ShortcutOQL/Attribute:auto_reload_sec/tip' => 'The minimum allowed is %1$d seconds~~',
+	'UI:FillAllMandatoryFields' => 'Please fill all mandatory fields.~~',
+	'UI:ValueMustBeSet' => 'Please specify a value~~',
+	'UI:ValueMustBeChanged' => 'Please change the value~~',
+	'UI:ValueInvalidFormat' => 'Invalid format~~',
+	'UI:CSVImportConfirmTitle' => 'Please confirm the operation~~',
+	'UI:CSVImportConfirmMessage' => 'Are you sure you want to do this?~~',
+	'UI:CSVImportError_items' => 'Errors: %1$d~~',
+	'UI:CSVImportCreated_items' => 'Created: %1$d~~',
+	'UI:CSVImportModified_items' => 'Modified: %1$d~~',
+	'UI:CSVImportUnchanged_items' => 'Unchanged: %1$d~~',
+	'UI:Button:Remove' => 'Remove~~',
+	'UI:AddAnExisting_Class' => 'Add objects of type %1$s...~~',
+	'UI:SelectionOf_Class' => 'Selection of objects of type %1$s~~',
+	'UI:AboutBox' => 'About iTop...~~',
+	'UI:About:Title' => 'About iTop~~',
+	'UI:About:DataModel' => 'Data model~~',
+	'UI:About:Support' => 'Support information~~',
+	'UI:About:Licenses' => 'Licenses~~',
+	'UI:About:Modules' => 'Installed modules~~',
+	'UI:DisconnectedDlgMessage' => 'You are disconnected. You must identify yourself to continue using the application.~~',
+	'UI:DisconnectedDlgTitle' => 'Warning!~~',
+	'UI:LoginAgain' => 'Login again~~',
+	'UI:StayOnThePage' => 'Stay on this page~~',
+	'ExcelExporter:ExportMenu' => 'Excel Export...~~',
+	'ExcelExporter:ExportDialogTitle' => 'Excel Export~~',
+	'ExcelExporter:ExportButton' => 'Export~~',
+	'ExcelExporter:DownloadButton' => 'Download %1$s~~',
+	'ExcelExporter:RetrievingData' => 'Retrieving data...~~',
+	'ExcelExporter:BuildingExcelFile' => 'Building the Excel file...~~',
+	'ExcelExporter:Done' => 'Done.~~',
+	'ExcelExport:AutoDownload' => 'Start the download automatically when the export is ready~~',
+	'ExcelExport:PreparingExport' => 'Preparing the export...~~',
+	'ExcelExport:Statistics' => 'Statistics~~',
+	'portal:legacy_portal' => 'End-User Portal~~',
+	'portal:backoffice' => 'iTop Back-Office User Interface~~',
+	'UI:CurrentObjectIsLockedBy_User' => 'The object is locked since it is currently being modified by %1$s.~~',
+	'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.~~',
+	'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.~~',
+	'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.~~',
+	'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.~~',
+	'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !~~',
+	'UI:Menu:ExportPDF' => 'Export as PDF...~~',
+));
+
+
+
+?>
diff --git a/images/logo-itop-dark-bg.svg b/images/logo-itop-dark-bg.svg
index 5f19c5ec1..98f047d9c 100644
--- a/images/logo-itop-dark-bg.svg
+++ b/images/logo-itop-dark-bg.svg
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
-<svg version="1.1" baseProfile="basic" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-	 y="0px" width="198.43px" height="85.04px" viewBox="0 0 198.43 85.04" xml:space="preserve">
-<g id="Layer_2" display="none">
-	<rect x="-1.658" y="-6.145" display="inline" width="207.663" height="99.234"/>
-</g>
-<g id="Layer_1">
-	<g>
-		<rect x="6" y="13.088" fill="#E87C1E" width="63" height="63"/>
-		<g>
-			<path fill="#FFFFFF" d="M79.051,33.36h10.297v30.5H79.051V33.36z"/>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M113.873,27.93V63.86h-10.656l0.071-35.931h-8.497v-9.433h27.65v9.433H113.873z"/>
-			<path fill="#FFFFFF" d="M120.209,46.219c0-8.353,4.896-18.722,15.841-18.722c10.945,0,15.841,10.369,15.841,18.722
-				S146.995,64.94,136.05,64.94C125.105,64.94,120.209,54.571,120.209,46.219z M130.649,46.219c0,6.265,2.017,10.081,5.4,10.081
-				s5.401-3.889,5.401-10.081c0-6.265-2.018-10.009-5.401-10.009S130.649,39.954,130.649,46.219z"/>
-			<path fill="#FFFFFF" d="M168.089,62.42v14.042h-10.513V28.577h10.513l-0.071,2.593c0,0,3.6-3.673,7.488-3.673
-				c9.36,0,13.465,10.009,13.465,17.498c0,8.064-2.52,19.945-14.977,19.945C170.609,64.94,168.089,62.42,168.089,62.42z
-				 M168.089,39.09v7.705c0,4.032,0.433,9.721,5.616,9.721c4.753,0,4.609-7.849,4.609-10.945c0-3.168-0.072-9.433-4.609-9.433
-				C170.754,36.138,169.674,37.722,168.089,39.09z"/>
-		</g>
-		<path fill="#E87C1E" d="M79,18.61h10.297v9.262H79V18.61z"/>
-		<g>
-			<g>
-				
-					<rect x="33.496" y="61.822" transform="matrix(0.7071 0.7071 -0.7071 0.7071 57.2161 -7.1075)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.383" height="7.381"/>
-				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="37.188" y1="28.905" x2="37.188" y2="60.994"/>
-				
-					<rect x="33.497" y="19.954" transform="matrix(0.7073 0.7069 -0.7069 0.7073 27.6001 -19.3671)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.381" height="7.383"/>
-			</g>
-			<g>
-				
-					<rect x="54.429" y="40.889" transform="matrix(0.7072 -0.707 0.707 0.7072 -14.501 54.1405)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.38"/>
-				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="21.514" y1="44.579" x2="53.604" y2="44.579"/>
-				
-					<rect x="12.564" y="40.889" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -26.7615 24.5502)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.38" height="7.38"/>
-			</g>
-			<g>
-				<rect x="48.297" y="55.69" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.381"/>
-				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="26.104" y1="33.496" x2="48.795" y2="56.187"/>
-				<rect x="18.694" y="26.086" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.383"/>
-			</g>
-			<g>
-				<rect x="48.297" y="26.086" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.383"/>
-				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="26.104" y1="55.66" x2="48.793" y2="32.971"/>
-				<rect x="18.694" y="55.69" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.381"/>
-			</g>
-			<g>
-				<path fill="#FFFFFF" stroke="#E77C24" stroke-width="1.8998" d="M46.094,37.725l0.012,13.496c0,2.094-3.992,3.792-8.918,3.792
-					c-4.928,0-8.921-1.698-8.921-3.792l0.019-13.478L46.094,37.725z"/>
-				<ellipse fill="#FFFFFF" stroke="#E77C24" stroke-width="1.8998" cx="37.186" cy="37.389" rx="8.919" ry="3.794"/>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
+<svg version="1.1" baseProfile="basic" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" width="198.43px" height="85.04px" viewBox="0 0 198.43 85.04" xml:space="preserve">
+<g id="Layer_2" display="none">
+	<rect x="-1.658" y="-6.145" display="inline" width="207.663" height="99.234"/>
+</g>
+<g id="Layer_1">
+	<g>
+		<rect x="6" y="13.088" fill="#E87C1E" width="63" height="63"/>
+		<g>
+			<path fill="#FFFFFF" d="M79.051,33.36h10.297v30.5H79.051V33.36z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M113.873,27.93V63.86h-10.656l0.071-35.931h-8.497v-9.433h27.65v9.433H113.873z"/>
+			<path fill="#FFFFFF" d="M120.209,46.219c0-8.353,4.896-18.722,15.841-18.722c10.945,0,15.841,10.369,15.841,18.722
+				S146.995,64.94,136.05,64.94C125.105,64.94,120.209,54.571,120.209,46.219z M130.649,46.219c0,6.265,2.017,10.081,5.4,10.081
+				s5.401-3.889,5.401-10.081c0-6.265-2.018-10.009-5.401-10.009S130.649,39.954,130.649,46.219z"/>
+			<path fill="#FFFFFF" d="M168.089,62.42v14.042h-10.513V28.577h10.513l-0.071,2.593c0,0,3.6-3.673,7.488-3.673
+				c9.36,0,13.465,10.009,13.465,17.498c0,8.064-2.52,19.945-14.977,19.945C170.609,64.94,168.089,62.42,168.089,62.42z
+				 M168.089,39.09v7.705c0,4.032,0.433,9.721,5.616,9.721c4.753,0,4.609-7.849,4.609-10.945c0-3.168-0.072-9.433-4.609-9.433
+				C170.754,36.138,169.674,37.722,168.089,39.09z"/>
+		</g>
+		<path fill="#E87C1E" d="M79,18.61h10.297v9.262H79V18.61z"/>
+		<g>
+			<g>
+				
+					<rect x="33.496" y="61.822" transform="matrix(0.7071 0.7071 -0.7071 0.7071 57.2161 -7.1075)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.383" height="7.381"/>
+				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="37.188" y1="28.905" x2="37.188" y2="60.994"/>
+				
+					<rect x="33.497" y="19.954" transform="matrix(0.7073 0.7069 -0.7069 0.7073 27.6001 -19.3671)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.381" height="7.383"/>
+			</g>
+			<g>
+				
+					<rect x="54.429" y="40.889" transform="matrix(0.7072 -0.707 0.707 0.7072 -14.501 54.1405)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.38"/>
+				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="21.514" y1="44.579" x2="53.604" y2="44.579"/>
+				
+					<rect x="12.564" y="40.889" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -26.7615 24.5502)" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.38" height="7.38"/>
+			</g>
+			<g>
+				<rect x="48.297" y="55.69" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.381"/>
+				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="26.104" y1="33.496" x2="48.795" y2="56.187"/>
+				<rect x="18.694" y="26.086" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.383"/>
+			</g>
+			<g>
+				<rect x="48.297" y="26.086" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.383"/>
+				<line fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" x1="26.104" y1="55.66" x2="48.793" y2="32.971"/>
+				<rect x="18.694" y="55.69" fill="#FFFFFF" stroke="#FFFFFF" stroke-width="1.8998" width="7.382" height="7.381"/>
+			</g>
+			<g>
+				<path fill="#FFFFFF" stroke="#E77C24" stroke-width="1.8998" d="M46.094,37.725l0.012,13.496c0,2.094-3.992,3.792-8.918,3.792
+					c-4.928,0-8.921-1.698-8.921-3.792l0.019-13.478L46.094,37.725z"/>
+				<ellipse fill="#FFFFFF" stroke="#E77C24" stroke-width="1.8998" cx="37.186" cy="37.389" rx="8.919" ry="3.794"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/index.php b/index.php
index b05fec861..6ee5341ba 100644
--- a/index.php
+++ b/index.php
@@ -1,32 +1,32 @@
-<?php
-$sConfigFile = 'conf/production/config-itop.php';
-$sStartPage = './pages/UI.php';
-$sSetupPage = './setup/index.php';
-
-/**
- * Check that the configuration file exists and has the appropriate access rights
- * If the file does not exist, launch the configuration wizard to create it
- */  
-if (file_exists(dirname(__FILE__).'/'.$sConfigFile))
-{
-	if (!is_readable($sConfigFile))
-	{
-		echo "<p><b>Error</b>: Unable to read the configuration file: '$sConfigFile'. Please check the access rights on this file.</p>";
-	}
-	else if (is_writable($sConfigFile))
-	{
-		echo "<p><b>Security Warning</b>: the configuration file '$sConfigFile' should be read-only.</p>";
-		echo "<p>Please modify the access rights to this file.</p>";
-		echo "<p>Click <a href=\"$sStartPage\">here</a> to ignore this warning and continue to run iTop.</p>";
-	}
-	else
-	{
-		header("Location: $sStartPage");
-	}
-}
-else
-{
-	// Config file does not exist, need to run the setup wizard to create it
-	header("Location: $sSetupPage");
-}
-?>
+<?php
+$sConfigFile = 'conf/production/config-itop.php';
+$sStartPage = './pages/UI.php';
+$sSetupPage = './setup/index.php';
+
+/**
+ * Check that the configuration file exists and has the appropriate access rights
+ * If the file does not exist, launch the configuration wizard to create it
+ */  
+if (file_exists(dirname(__FILE__).'/'.$sConfigFile))
+{
+	if (!is_readable($sConfigFile))
+	{
+		echo "<p><b>Error</b>: Unable to read the configuration file: '$sConfigFile'. Please check the access rights on this file.</p>";
+	}
+	else if (is_writable($sConfigFile))
+	{
+		echo "<p><b>Security Warning</b>: the configuration file '$sConfigFile' should be read-only.</p>";
+		echo "<p>Please modify the access rights to this file.</p>";
+		echo "<p>Click <a href=\"$sStartPage\">here</a> to ignore this warning and continue to run iTop.</p>";
+	}
+	else
+	{
+		header("Location: $sStartPage");
+	}
+}
+else
+{
+	// Config file does not exist, need to run the setup wizard to create it
+	header("Location: $sSetupPage");
+}
+?>
diff --git a/js/ajaxfileupload.js b/js/ajaxfileupload.js
index 74990ea75..9d0d8c34b 100644
--- a/js/ajaxfileupload.js
+++ b/js/ajaxfileupload.js
@@ -1,205 +1,205 @@
-
-jQuery.extend(
-{
-    createUploadIframe: function(id, uri)
-	{
-			//create frame
-            var frameId = 'jUploadFrame' + id;
-            var iframeHtml = '<iframe id="' + frameId + '" name="' + frameId + '" style="position:absolute; top:-9999px; left:-9999px"';
-			if(window.ActiveXObject)
-			{
-                if(typeof uri== 'boolean')
-                {
-					iframeHtml += ' src="' + 'javascript:false' + '"';
-                }
-                else if(typeof uri== 'string')
-                {
-					iframeHtml += ' src="' + uri + '"';
-                }	
-			}
-			iframeHtml += ' />';
-			jQuery(iframeHtml).appendTo(document.body);
-
-            return jQuery('#' + frameId).get(0);			
-    },
-    createUploadForm: function(id, fileElementId)
-	{
-		//create form	
-		var formId = 'jUploadForm' + id;
-		var fileId = 'jUploadFile' + id;
-		var form = jQuery('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');	
-		var oldElement = jQuery('#' + fileElementId);
-		var newElement = jQuery(oldElement).clone();
-		jQuery(oldElement).attr('id', fileId);
-		jQuery(oldElement).before(newElement);
-		jQuery(oldElement).appendTo(form);
-		//set attributes
-		jQuery(form).css('position', 'absolute');
-		jQuery(form).css('top', '-1200px');
-		jQuery(form).css('left', '-1200px');
-		jQuery(form).appendTo('body');		
-		return form;
-    },
-
-    ajaxFileUpload: function(s) {
-        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
-        s = jQuery.extend({}, jQuery.ajaxSettings, s);
-        var id = new Date().getTime();        
-		var form = jQuery.createUploadForm(id, s.fileElementId);
-		var io = jQuery.createUploadIframe(id, s.secureuri);
-		var frameId = 'jUploadFrame' + id;
-		var formId = 'jUploadForm' + id;		
-        // Watch for a new set of requests
-        if ( s.global && ! jQuery.active++ )
-		{
-			jQuery.event.trigger( "ajaxStart" );
-		}            
-        var requestDone = false;
-        // Create the request object
-        var xml = {};   
-        if ( s.global )
-            jQuery.event.trigger("ajaxSend", [xml, s]);
-        // Wait for a response to come back
-        var uploadCallback = function(isTimeout)
-		{			
-			var io = document.getElementById(frameId);
-            try 
-			{				
-				if(io.contentWindow)
-				{
-					 xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
-                	 xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
-					 
-				}else if(io.contentDocument)
-				{
-					 xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
-                	xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
-				}						
-            }
-            catch(e)
-			{
-				jQuery.handleError(s, xml, null, e);
-			}
-            if ( xml || isTimeout == "timeout") 
-			{				
-                requestDone = true;
-                var status;
-                try {
-                    status = isTimeout != "timeout" ? "success" : "error";
-                    // Make sure that the request was successful or notmodified
-                    if ( status != "error" )
-					{
-                        // process the data (runs the xml through httpData regardless of callback)
-                        var data = jQuery.uploadHttpData( xml, s.dataType );    
-                        // If a local callback was specified, fire it and pass it the data
-                        if ( s.success )
-                            s.success( data, status );
-    
-                        // Fire the global callback
-                        if( s.global )
-                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
-                    } else
-                        jQuery.handleError(s, xml, status);
-                } catch(e) 
-				{
-                    status = "error";
-                    jQuery.handleError(s, xml, status, e);
-                }
-
-                // The request was completed
-                if( s.global )
-                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
-
-                // Handle the global AJAX counter
-                if ( s.global && ! --jQuery.active )
-                    jQuery.event.trigger( "ajaxStop" );
-
-                // Process result
-                if ( s.complete )
-                    s.complete(xml, status);
-
-                jQuery(io).unbind();
-
-                setTimeout(function()
-									{	try 
-										{
-											jQuery(io).remove();
-											jQuery(form).remove();	
-											
-										} catch(e) 
-										{
-											jQuery.handleError(s, xml, null, e);
-										}									
-
-									}, 100);
-
-                xml = null;
-
-            }
-        };
-        // Timeout checker
-        if ( s.timeout > 0 ) 
-		{
-            setTimeout(function(){
-                // Check to see if the request is still happening
-                if( !requestDone ) uploadCallback( "timeout" );
-            }, s.timeout);
-        }
-        try 
-		{
-
-			var form = jQuery('#' + formId);
-			jQuery(form).attr('action', s.url);
-			jQuery(form).attr('method', 'POST');
-			jQuery(form).attr('target', frameId);
-            if(form.encoding)
-			{
-				jQuery(form).attr('encoding', 'multipart/form-data');      			
-            }
-            else
-			{	
-				jQuery(form).attr('enctype', 'multipart/form-data');			
-            }			
-            jQuery(form).submit();
-
-        } catch(e) 
-		{			
-            jQuery.handleError(s, xml, null, e);
-        }
-		
-		jQuery('#' + frameId).load(uploadCallback	);
-        return {abort: function () {}};	
-
-    },
-
-    uploadHttpData: function( r, type ) {
-        var data = !type;
-        data = type == "xml" || data ? r.responseXML : r.responseText;
-        // If the type is "script", eval it in global context
-        if ( type == "script" )
-            jQuery.globalEval( data );
-        // Get the JavaScript object, if JSON is used.
-        if ( type == "json" )
-            eval( "data = " + data );
-        // evaluate scripts within html
-        if ( type == "html" )
-            jQuery("<div>").html(data).evalScripts();
-
-        return data;
-    }
-});
-
-// handleError is deprecated since jQuery 1.5 !!
-jQuery.extend({
-    handleError: function( s, xhr, status, e ) {
-        // If a local callback was specified, fire it
-        if ( s.error )
-            s.error( xhr, status, e );
-        // If we have some XML response text (e.g. from an AJAX call) then log it in the console
-        else if(xhr.responseText)
-	{
-            //console.log(xhr.responseText);
-	}
-    }
-});
-
+
+jQuery.extend(
+{
+    createUploadIframe: function(id, uri)
+	{
+			//create frame
+            var frameId = 'jUploadFrame' + id;
+            var iframeHtml = '<iframe id="' + frameId + '" name="' + frameId + '" style="position:absolute; top:-9999px; left:-9999px"';
+			if(window.ActiveXObject)
+			{
+                if(typeof uri== 'boolean')
+                {
+					iframeHtml += ' src="' + 'javascript:false' + '"';
+                }
+                else if(typeof uri== 'string')
+                {
+					iframeHtml += ' src="' + uri + '"';
+                }	
+			}
+			iframeHtml += ' />';
+			jQuery(iframeHtml).appendTo(document.body);
+
+            return jQuery('#' + frameId).get(0);			
+    },
+    createUploadForm: function(id, fileElementId)
+	{
+		//create form	
+		var formId = 'jUploadForm' + id;
+		var fileId = 'jUploadFile' + id;
+		var form = jQuery('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');	
+		var oldElement = jQuery('#' + fileElementId);
+		var newElement = jQuery(oldElement).clone();
+		jQuery(oldElement).attr('id', fileId);
+		jQuery(oldElement).before(newElement);
+		jQuery(oldElement).appendTo(form);
+		//set attributes
+		jQuery(form).css('position', 'absolute');
+		jQuery(form).css('top', '-1200px');
+		jQuery(form).css('left', '-1200px');
+		jQuery(form).appendTo('body');		
+		return form;
+    },
+
+    ajaxFileUpload: function(s) {
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout		
+        s = jQuery.extend({}, jQuery.ajaxSettings, s);
+        var id = new Date().getTime();        
+		var form = jQuery.createUploadForm(id, s.fileElementId);
+		var io = jQuery.createUploadIframe(id, s.secureuri);
+		var frameId = 'jUploadFrame' + id;
+		var formId = 'jUploadForm' + id;		
+        // Watch for a new set of requests
+        if ( s.global && ! jQuery.active++ )
+		{
+			jQuery.event.trigger( "ajaxStart" );
+		}            
+        var requestDone = false;
+        // Create the request object
+        var xml = {};   
+        if ( s.global )
+            jQuery.event.trigger("ajaxSend", [xml, s]);
+        // Wait for a response to come back
+        var uploadCallback = function(isTimeout)
+		{			
+			var io = document.getElementById(frameId);
+            try 
+			{				
+				if(io.contentWindow)
+				{
+					 xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
+                	 xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
+					 
+				}else if(io.contentDocument)
+				{
+					 xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
+                	xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
+				}						
+            }
+            catch(e)
+			{
+				jQuery.handleError(s, xml, null, e);
+			}
+            if ( xml || isTimeout == "timeout") 
+			{				
+                requestDone = true;
+                var status;
+                try {
+                    status = isTimeout != "timeout" ? "success" : "error";
+                    // Make sure that the request was successful or notmodified
+                    if ( status != "error" )
+					{
+                        // process the data (runs the xml through httpData regardless of callback)
+                        var data = jQuery.uploadHttpData( xml, s.dataType );    
+                        // If a local callback was specified, fire it and pass it the data
+                        if ( s.success )
+                            s.success( data, status );
+    
+                        // Fire the global callback
+                        if( s.global )
+                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                    } else
+                        jQuery.handleError(s, xml, status);
+                } catch(e) 
+				{
+                    status = "error";
+                    jQuery.handleError(s, xml, status, e);
+                }
+
+                // The request was completed
+                if( s.global )
+                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                // Handle the global AJAX counter
+                if ( s.global && ! --jQuery.active )
+                    jQuery.event.trigger( "ajaxStop" );
+
+                // Process result
+                if ( s.complete )
+                    s.complete(xml, status);
+
+                jQuery(io).unbind();
+
+                setTimeout(function()
+									{	try 
+										{
+											jQuery(io).remove();
+											jQuery(form).remove();	
+											
+										} catch(e) 
+										{
+											jQuery.handleError(s, xml, null, e);
+										}									
+
+									}, 100);
+
+                xml = null;
+
+            }
+        };
+        // Timeout checker
+        if ( s.timeout > 0 ) 
+		{
+            setTimeout(function(){
+                // Check to see if the request is still happening
+                if( !requestDone ) uploadCallback( "timeout" );
+            }, s.timeout);
+        }
+        try 
+		{
+
+			var form = jQuery('#' + formId);
+			jQuery(form).attr('action', s.url);
+			jQuery(form).attr('method', 'POST');
+			jQuery(form).attr('target', frameId);
+            if(form.encoding)
+			{
+				jQuery(form).attr('encoding', 'multipart/form-data');      			
+            }
+            else
+			{	
+				jQuery(form).attr('enctype', 'multipart/form-data');			
+            }			
+            jQuery(form).submit();
+
+        } catch(e) 
+		{			
+            jQuery.handleError(s, xml, null, e);
+        }
+		
+		jQuery('#' + frameId).load(uploadCallback	);
+        return {abort: function () {}};	
+
+    },
+
+    uploadHttpData: function( r, type ) {
+        var data = !type;
+        data = type == "xml" || data ? r.responseXML : r.responseText;
+        // If the type is "script", eval it in global context
+        if ( type == "script" )
+            jQuery.globalEval( data );
+        // Get the JavaScript object, if JSON is used.
+        if ( type == "json" )
+            eval( "data = " + data );
+        // evaluate scripts within html
+        if ( type == "html" )
+            jQuery("<div>").html(data).evalScripts();
+
+        return data;
+    }
+});
+
+// handleError is deprecated since jQuery 1.5 !!
+jQuery.extend({
+    handleError: function( s, xhr, status, e ) {
+        // If a local callback was specified, fire it
+        if ( s.error )
+            s.error( xhr, status, e );
+        // If we have some XML response text (e.g. from an AJAX call) then log it in the console
+        else if(xhr.responseText)
+	{
+            //console.log(xhr.responseText);
+	}
+    }
+});
+
diff --git a/js/ckeditor/CHANGES.md b/js/ckeditor/CHANGES.md
index 6c4f55595..7b4747637 100644
--- a/js/ckeditor/CHANGES.md
+++ b/js/ckeditor/CHANGES.md
@@ -1,1304 +1,1304 @@
-CKEditor 4 Changelog
-====================
-
-## CKEditor 4.7.1
-
-New Features:
-
-* Added a new Mexican Spanish localization. Thanks to [David Alexandro Rodriguez](https://www.transifex.com/user/profile/darsco16/)!
-* [#413](https://github.com/ckeditor/ckeditor-dev/issues/413): Added Paste as Plain Text keyboard shortcut to the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) instructions.
-
-Fixed Issues:
-
-* [#515](https://github.com/ckeditor/ckeditor-dev/issues/515): [Chrome] Fixed: Mouse actions on CKEditor scrollbar throw an exception when the [Table Selection](http://ckeditor.com/addon/tableselection) plugin is loaded.
-* [#493](https://github.com/ckeditor/ckeditor-dev/issues/493): Fixed: Selection started from a nested table causes an error in the browser while scrolling down.
-* [#415](https://github.com/ckeditor/ckeditor-dev/issues/415): [Firefox] Fixed: <kbd>Enter</kbd> key breaks the table structure when pressed in a table selection.
-* [#457](https://github.com/ckeditor/ckeditor-dev/issues/457): Fixed: Error thrown when deleting content from the editor with no selection.
-* [#478](https://github.com/ckeditor/ckeditor-dev/issues/478): [Chrome] Fixed:  Error thrown by the [Enter Key](http://ckeditor.com/addon/enterkey) plugin when pressing <kbd>Enter</kbd> with no selection.
-* [#424](https://github.com/ckeditor/ckeditor-dev/issues/424): Fixed: Error thrown by [Tab Key Handling](http://ckeditor.com/addon/tab) and [Indent List](http://ckeditor.com/addon/indentlist) plugins when pressing <kbd>Tab</kbd> with no selection in inline editor.
-* [#476](https://github.com/ckeditor/ckeditor-dev/issues/476): Fixed: Anchors inserted with the [Link](http://ckeditor.com/addon/link) plugin on collapsed selection cannot be edited.
-* [#417](https://github.com/ckeditor/ckeditor-dev/issues/417): Fixed: The [Table Resize](http://ckeditor.com/addon/tableresize) plugin throws an error when used with a table with only header or footer rows.
-* [#523](https://github.com/ckeditor/ckeditor-dev/issues/523): Fixed: The [`editor.getCommandKeystroke`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getCommandKeystroke) method does not obtain the correct keystroke.
-* [#534](https://github.com/ckeditor/ckeditor-dev/issues/534): [IE] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not work in Quirks Mode.
-* [#450](https://github.com/ckeditor/ckeditor-dev/issues/450): Fixed: [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) incorrectly transforms the `margin` CSS property.
-
-## CKEditor 4.7
-
-**Important Notes:**
-
-* [#13793](http://dev.ckeditor.com/ticket/13793): The [`embed_provider`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-embed_provider) configuration option for the [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins is no longer preset by default.
-* The [UI Color](http://ckeditor.com/addon/uicolor) plugin now uses a custom color picker instead of the `YUI 2.7.0` library which has some known vulnerabilities (it's a security precaution, there was no security issue in CKEditor due to the way it was used).
-
-New Features:
-
-* [#16755](http://dev.ckeditor.com/ticket/16755): Added the [Table Selection](http://ckeditor.com/addon/tableselection) plugin that lets you select and manipulate an arbitrary rectangular table fragment (a few cells, a row or a column).
-* [#16961](http://dev.ckeditor.com/ticket/16961): Added support for pasting from Microsoft Excel.
-* [#13381](http://dev.ckeditor.com/ticket/13381): Dynamic code evaluation call in [`CKEDITOR.template`](http://docs.ckeditor.com/#!/api/CKEDITOR.template) removed. CKEditor can now be used with the `unsafe-eval` Content Security Policy. Thanks to [Caridy Patiño](http://caridy.name)!
-* [#16971](http://dev.ckeditor.com/ticket/16971): Added support for color in the `background` property containing also other styles for table cells in the [Table Tools](http://ckeditor.com/addon/tabletools) plugin.
-* [#16847](http://dev.ckeditor.com/ticket/16847): Added support for parsing and inlining any formatting created using the Microsoft Word style system to the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#16818](http://dev.ckeditor.com/ticket/16818): Added table cell height parsing in the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#16850](http://dev.ckeditor.com/ticket/16850): Added a new [`config.enableContextMenu`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enableContextMenu) configuration option for enabling and disabling the [context menu](http://ckeditor.com/addon/contextmenu).
-* [#16937](http://dev.ckeditor.com/ticket/16937): The `command` parameter in [CKEDITOR.editor.getCommandKeystroke](http://docs.ckeditor.dev/#!/api/CKEDITOR.editor-method-getCommandKeystroke) now also accepts a command name as an argument.
-* [#17010](http://dev.ckeditor.com/ticket/17010): The [`CKEDITOR.dom.range.shrink`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-shrink) method now allows for skipping bogus `<br>` elements.
-
-Fixed Issues:
-
-* [#16935](http://dev.ckeditor.com/ticket/16935): [Chrome] Fixed: Blurring the editor in [Source Mode](http://ckeditor.com/addon/sourcearea) throws an error.
-* [#16825](http://dev.ckeditor.com/ticket/16825): [Chrome] Fixed: Error thrown when destroying a focused inline editor.
-* [#16857](http://dev.ckeditor.com/ticket/16857): Fixed: <kbd>Ctrl+Shift+V</kbd> blocked by [Copy Formatting](http://ckeditor.com/addon/copyformatting).
-* [#16845](https://dev.ckeditor.com/ticket/16845): [IE] Fixed: Cursor jumps to the top of the scrolled editor after focusing it when the [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin is enabled.
-* [#16786](http://dev.ckeditor.com/ticket/16786): Fixed: Added missing translations for the [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin.
-* [#14714](http://dev.ckeditor.com/ticket/14714): [WebKit/Blink] Fixed: Exception thrown on refocusing a blurred inline editor.
-* [#16913](http://dev.ckeditor.com/ticket/16913): [Firefox, IE] Fixed: [Paste as Plain Text](http://ckeditor.com/addon/pastetext) keystroke does not work.
-* [#16968](http://dev.ckeditor.com/ticket/16968): Fixed: [Safari] [Paste as Plain Text](http://ckeditor.com/addon/pastetext) is not handled by the editor.
-* [#16912](http://dev.ckeditor.com/ticket/16912): Fixed: Exception thrown when a single image is pasted using [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#16821](http://dev.ckeditor.com/ticket/16821): Fixed: Extraneous `<span>` elements with `height` style stacked when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#16866](http://dev.ckeditor.com/ticket/16866): [IE, Edge] Fixed: Whitespaces not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#16860](http://dev.ckeditor.com/ticket/16860): Fixed: Paragraphs which only look like lists incorrectly transformed into them when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#16817](http://dev.ckeditor.com/ticket/16817): Fixed: When [pasting from Word](http://ckeditor.com/addon/pastefromword), paragraphs are transformed into lists with some corrupted data.
-* [#16833](http://dev.ckeditor.com/ticket/16833): [IE11] Fixed: Malformed list with headers [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#16826](http://dev.ckeditor.com/ticket/16826): [IE] Fixed: Superfluous paragraphs within lists [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#12465](http://dev.ckeditor.com/ticket/12465): Fixed: Cannot change the state of checkboxes or radio buttons if the properties dialog was invoked with a double-click.
-* [#13062](http://dev.ckeditor.com/ticket/13062): Fixed: Impossible to unlink when the caret is at the edge of the link.
-* [#13585](http://dev.ckeditor.com/ticket/13585): Fixed: Error when wrapping two adjacent `<div>` elements with a `<div>`.
-* [#16811](http://dev.ckeditor.com/ticket/16811): Fixed: Table alignment is not preserved by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#16810](http://dev.ckeditor.com/ticket/16810): Fixed: Vertical align in tables is not supported by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
-* [#11956](http://dev.ckeditor.com/ticket/11956): [Blink, IE] Fixed: [Link](http://ckeditor.com/addon/link) dialog does not open on a double click on the second word of the link with a background color or other styles.
-* [#10472](http://dev.ckeditor.com/ticket/10472): Fixed: Unable to use [Table Resize](http://ckeditor.com/addon/tableresize) on table header and footer.
-* [#14762](http://dev.ckeditor.com/ticket/14762): Fixed: Hovering over an empty table (without rows or cells) throws an error when the [Table Resize](http://ckeditor.com/addon/tableresize) plugin is active.
-* [#16777](https://dev.ckeditor.com/ticket/16777): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin does not allow to drop widgets into the editor.
-* [#14894](https://dev.ckeditor.com/ticket/14894): [Chrome] Fixed: The editor scrolls to the top after focusing or when a dialog is opened.
-* [#14769](https://dev.ckeditor.com/ticket/14769): Fixed: URLs with '-' in host are not detected by the [Auto Link](http://ckeditor.com/addon/autolink) plugin.
-* [#16804](https://dev.ckeditor.com/ticket/16804): Fixed: Focus is not on the first menu item when the user opens a context menu or a drop-down list from the editor toolbar.
-* [#14407](https://dev.ckeditor.com/ticket/14407): [IE] Fixed: Non-editable widgets can be edited.
-* [#16927](https://dev.ckeditor.com/ticket/16927): Fixed: An error thrown if a bundle containing the [Color Button](http://ckeditor.com/addon/colorbutton) plugin is run in ES5 strict mode. Thanks to [Igor Rubinovich](https://github.com/IgorRubinovich)!
-* [#16920](http://dev.ckeditor.com/ticket/16920): Fixed: Several plugins not using the [Dialog](http://ckeditor.com/addon/dialog) plugin as a direct dependency.
-* [PR#336](https://github.com/ckeditor/ckeditor-dev/pull/336): Fixed: Typo in [`CKEDITOR.getCss`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getCss) API documentation. Thanks to [knusperpixel](https://github.com/knusperpixel)!
-* [#17027](http://dev.ckeditor.com/ticket/17027): Fixed: Command event data should be initialized as an empty object.
-* Fixed the behavior of HTML parser when parsing `src`/`srcdoc` attributes of the `<iframe>` element in a CKEditor setup with ACF turned off and without the [Iframe Dialog](http://ckeditor.com/addon/iframe) plugin. The issue was originally reported as a security issue by [Sriramk21](https://twitter.com/sriramk21) from Pegasystems and was later downgraded by the security team into a normal issue due to the requirement of having ACF turned off. Disabling [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) is against [security best practices](http://docs.ckeditor.com/#!/guide/dev_best_practices-section-security), so the problem described above has not been considered a security issue as such.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
-	* Fixed: DOM Exception after clicking "Remove Language" on a selected word with enabled [Language](http://ckeditor.com/addon/language) plugin in SCAYT.
-* [#16958](http://dev.ckeditor.com/ticket/16958): Switched the default MathJax CDN provider for the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin from `cdn.mathjax.org` to [cdnjs](https://cdnjs.com/), due to closing of `cdn.mathjax.org` scheduled for April 30, 2017.
-* [#16954](http://dev.ckeditor.com/ticket/16954): Removed the paste dialog.
-* [#16982](http://dev.ckeditor.com/ticket/16982): Latest Safari now supports enhanced Clipboard API introduced in CKEditor 4.5.0.
-* [#17025](http://dev.ckeditor.com/ticket/17025): Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.4.2.
-
-## CKEditor 4.6.2
-
-New Features:
-
-* [#16733](http://dev.ckeditor.com/ticket/16733): Added a new pastel color palette for the [Color Button](http://ckeditor.com/addon/colorbutton) plugin and a new [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) configuration option for setting the number of rows in the color selector.
-* [#16752](http://dev.ckeditor.com/ticket/16752): Added a new Azerbaijani localization. Thanks to the [Azerbaijani language team](https://www.transifex.com/ckeditor/teams/11143/az/)!
-* [#13818](http://dev.ckeditor.com/ticket/13818): It is now possible to group [Widget](http://ckeditor.com/addon/widget) [style definitions](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles), so applying one style disables the other.
-
-Fixed Issues:
-
-* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
-* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
-* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#16682](http://dev.ckeditor.com/ticket/16682): [Edge] Fixed: A list gets [pasted from Word](http://ckeditor.com/addon/pastefromword) as a set of paragraphs. Added the [`config.pasteFromWord_heuristicsEdgeList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWord_heuristicsEdgeList) configuration option.
-* [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.
-* [#16728](http://dev.ckeditor.com/ticket/16728): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Quirks Mode.
-* [#16795](http://dev.ckeditor.com/ticket/16795): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Compatibility Mode.
-* [#16675](http://dev.ckeditor.com/ticket/16675): Fixed: Styles applied with [Copy Formatting](http://ckeditor.com/addon/copyformatting) to a single table cell are applied to the whole table.
-* [#16753](http://dev.ckeditor.com/ticket/16753): Fixed: [`element.setSize`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setSize) sets incorrect editor dimensions if the border width is represented as a fraction of pixels.
-* [#16705](http://dev.ckeditor.com/ticket/16705): [Firefox] Fixed: Unable to paste images as Base64 strings when using [Clipboard](http://ckeditor.com/addon/clipboard).
-* [#14869](http://dev.ckeditor.com/ticket/14869): Fixed: JavaScript error is thrown when trying to use [Find](http://ckeditor.com/addon/find) in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
-
-## CKEditor 4.6.1
-
-New Features:
-
-* [#16639](http://dev.ckeditor.com/ticket/16639): The `callback` parameter in the [CKEDITOR.ajax.post](http://docs.ckeditor.com/#!/api/CKEDITOR.ajax-method-post) method became optional.
-
-Fixed Issues:
-
-* [#11064](http://dev.ckeditor.com/ticket/11064): [Blink, WebKit] Fixed: Cannot select all editor content when a widget or a non-editable element is the first or last element of the content. Also fixes this issue in the [Select All](http://ckeditor.com/addon/selectall) plugin.
-* [#14755](http://dev.ckeditor.com/ticket/14755): [Blink, WebKit, IE8] Fixed: Browser hangs when a table is inserted in the place of a selected list with an empty last item.
-* [#16624](http://dev.ckeditor.com/ticket/16624): Fixed: Improved the [Color Button](http://ckeditor.com/addon/colorbutton) plugin which will now normalize the CSS `background` property if it only contains a color value. This fixes missing background colors when using [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#16600](http://dev.ckeditor.com/ticket/16600): [Blink, WebKit] Fixed: Error thrown occasionally by an uninitialized editable for multiple CKEditor instances on the same page.
-
-## CKEditor 4.6
-
-New Features:
-
-* [#14569](http://dev.ckeditor.com/ticket/14569): Added a new, flat, default CKEditor skin called [Moono-Lisa](http://ckeditor.com/addon/moono-lisa). Refreshed default colors available in the [Color Button](http://ckeditor.com/addon/colorbutton) plugin ([Text Color and Background Color](http://docs.ckeditor.com/#!/guide/dev_colorbutton) feature).
-* [#14707](http://dev.ckeditor.com/ticket/14707): Added a new [Copy Formatting](http://ckeditor.com/addon/copyformatting) feature to enable easy copying of styles between your document parts.
-* Introduced the completely rewritten [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin:
-	* Backward incompatibility: The [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) option now defaults to `false`. This option will be deprecated in the future. Use [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) to replicate the effect of setting it to `true`.
-	* Backward incompatibility: The [`config.pasteFromWordNumberedHeadingToList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordNumberedHeadingToList) and [`config.pasteFromWordRemoveStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveStyles) options were dropped and no longer have any effect on pasted content.
-	* Major improvements in preservation of list numbering, styling and indentation (nested lists with multiple levels).
-	* Major improvements in document structure parsing that fix plenty of issues with distorted or missing content after paste.
-* Added new translation: Occitan. Thanks to [Cédric Valmary](https://totenoc.eu/)!
-* [#10015](http://dev.ckeditor.com/ticket/10015): Keyboard shortcuts (relevant to the operating system in use) will now be displayed in tooltips and context menus.
-* [#13794](http://dev.ckeditor.com/ticket/13794): The [Upload Image](http://ckeditor.com/addon/uploadimage) feature now uses `uploaded.width/height` if set.
-* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin that lets you upload a file by drag&amp;dropping it into the editor content.
-* [#14449](http://dev.ckeditor.com/ticket/14449): Introduced the [Balloon Panel](http://ckeditor.com/addon/balloonpanel) plugin that lets you create stylish floating UI elements for the editor.
-* [#12077](https://dev.ckeditor.com/ticket/12077): Added support for the HTML5 `download` attribute in link (`<a>`) elements. Selecting the "Force Download" checkbox in the [Link](http://ckeditor.com/addon/link) dialog will cause the linked file to be downloaded automatically. Thanks to [sbusse](https://github.com/sbusse)!
-* [#13518](http://dev.ckeditor.com/ticket/13518): Introduced the [`additionalRequestParameters`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition-property-additionalRequestParameters) property for file uploads to make it possible to send additional information about the uploaded file to the server.
-* [#14889](http://dev.ckeditor.com/ticket/14889): Added the [`config.image2_altRequired`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_altRequired) option for the [Enhanced Image](http://ckeditor.com/addon/image2) plugin to allow making alternative text a mandatory field. Thanks to [Andrey Fedoseev](https://github.com/andreyfedoseev)!
-
-Fixed Issues:
-
-* [#9991](http://dev.ckeditor.com/ticket/9991): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) should only normalize input data.
-* [#7209](http://dev.ckeditor.com/ticket/7209): Fixed: Lists with 3 levels not [pasted from Word](http://ckeditor.com/addon/pastefromword) correctly.
-* [#14335](http://dev.ckeditor.com/ticket/14335): Fixed: Pasting a numbered list starting with a value different from "1" from Microsoft Word does not work correctly.
-* [#14542](http://dev.ckeditor.com/ticket/14542): Fixed: Copying a numbered list from Microsoft Word does not preserve list formatting.
-* [#14544](http://dev.ckeditor.com/ticket/14544): Fixed: Copying a nested list from Microsoft Word results in an empty list.
-* [#14660](http://dev.ckeditor.com/ticket/14660): Fixed: [Pasting text from  Word](http://ckeditor.com/addon/pastefromword) breaks the styling in some cases.
-* [#14867](http://dev.ckeditor.com/ticket/14867): [Firefox] Fixed: Text gets stripped when [pasting content from Word](http://ckeditor.com/addon/pastefromword).
-* [#2507](http://dev.ckeditor.com/ticket/2507): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not detect pasting a part of a paragraph.
-* [#3336](http://dev.ckeditor.com/ticket/3336): Fixed: Extra blank row added on top of the content [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#6115](http://dev.ckeditor.com/ticket/6115): Fixed: When Right-to-Left text direction is applied to a table [pasted from Word](http://ckeditor.com/addon/pastefromword), borders are missing on one side.
-* [#6342](http://dev.ckeditor.com/ticket/6342): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filters out a basic text style when it is [configured to use attributes](http://docs.ckeditor.com/#!/guide/dev_basicstyles-section-custom-basic-text-style-definition).
-* [#6457](http://dev.ckeditor.com/ticket/6457): [IE] Fixed: [Pasting from Word](http://ckeditor.com/addon/pastefromword) is extremely slow.
-* [#6789](http://dev.ckeditor.com/ticket/6789): Fixed: The `mso-list: ignore` style is not handled properly when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7262](http://dev.ckeditor.com/ticket/7262): Fixed: Lists in preformatted body disappear when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7662](http://dev.ckeditor.com/ticket/7662): [Opera] Fixed: Extra empty number/bullet shown in the editor body when editing a multi-level list [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#7807](http://dev.ckeditor.com/ticket/7807): Fixed: Last item in a list not converted to a `<li>` element after [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7950](http://dev.ckeditor.com/ticket/7950): [IE] Fixed: Content [from Word pasted](http://ckeditor.com/addon/pastefromword) differently than in other browsers.
-* [#7982](http://dev.ckeditor.com/ticket/7982): Fixed: Multi-level lists get split into smaller ones when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#8231](http://dev.ckeditor.com/ticket/8231): [WebKit, Opera] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts empty paragraphs.
-* [#8266](http://dev.ckeditor.com/ticket/8266): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts a blank line at the top.
-* [#8341](http://dev.ckeditor.com/ticket/8341), [#7646](http://dev.ckeditor.com/ticket/7646): Fixed: Faulty removal of empty `<span>` elements in [Paste from Word](http://ckeditor.com/addon/pastefromword) content cleanup breaking content formatting.
-* [#8754](http://dev.ckeditor.com/ticket/8754): [Firefox] Fixed: Incorrect pasting of multiple nested lists in [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#8983](http://dev.ckeditor.com/ticket/8983): Fixed: Alignment lost when [pasting from Word](http://ckeditor.com/addon/pastefromword) with [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) set to [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
-* [#9331](http://dev.ckeditor.com/ticket/9331): [IE] Fixed: [Pasting text from Word](http://ckeditor.com/addon/pastefromword) creates a simple Caesar cipher.
-* [#9422](http://dev.ckeditor.com/ticket/9422): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) leaves an unwanted `color:windowtext` style.
-* [#10011](http://dev.ckeditor.com/ticket/10011): [IE9-10] Fixed: [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) is ignored under certain conditions.
-* [#10643](http://dev.ckeditor.com/ticket/10643): Fixed: Differences between using <kbd>Ctrl+V</kbd> and pasting from the [Paste from Word](http://ckeditor.com/addon/pastefromword) dialog.
-* [#10784](http://dev.ckeditor.com/ticket/10784): Fixed: Lines missing when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#11294](http://dev.ckeditor.com/ticket/11294): [IE10] Fixed: Font size is not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#11627](http://dev.ckeditor.com/ticket/11627): Fixed: Missing words when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#12784](http://dev.ckeditor.com/ticket/12784): Fixed: Bulleted list with custom bullets gets changed to a numbered list when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#13174](http://dev.ckeditor.com/ticket/13174): Fixed: Data loss after [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#13828](http://dev.ckeditor.com/ticket/13828): Fixed: Widget classes should be added to the wrapper rather than the widget element.
-* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper to identify the widget type.
-* [#13519](http://dev.ckeditor.com/ticket/13519): Server response received when uploading files should be more flexible.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
- 	* Support for the new default Moono-Lisa skin.
- 	* [#121](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/121): Fixed: [Basic Styles](http://ckeditor.com/addon/basicstyles) do not work when SCAYT is enabled.
- 	* [#125](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/125): Fixed: Inline styles are not continued when writing multiple lines of styled text with SCAYT enabled.
- 	* [#127](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/127): Fixed: Uncaught TypeError after enabling SCAYT in the CKEditor `<div>` element.
- 	* [#128](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/128): Fixed: Error thrown after enabling SCAYT caused by conflicts with RequireJS.
-
-## CKEditor 4.5.11
-
-**Security Updates:**
-
-* [Severity: minor] Fixed the `target="_blank"` vulnerability reported by James Gaskell.
-
-	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
-
-  An upgrade is recommended.
-
-New Features:
-
-* [#14747](http://dev.ckeditor.com/ticket/14747): The [Enhanced Image](http://ckeditor.com/addon/image2) caption now supports the link `target` attribute.
-* [#7154](http://dev.ckeditor.com/ticket/7154): Added support for the "Display Text" field to the [Link](http://ckeditor.com/addon/link) dialog. Thanks to [Ryan Guill](https://github.com/ryanguill)!
-
-Fixed Issues:
-
-* [#13362](http://dev.ckeditor.com/ticket/13362): [Blink, WebKit] Fixed: Active widget element is not cached when it is losing focus and it is inside an editable element.
-* [#13755](http://dev.ckeditor.com/ticket/13755): [Edge] Fixed: Pasting images does not work.
-* [#13548](http://dev.ckeditor.com/ticket/13548): [IE] Fixed: Clicking the [elements path](http://ckeditor.com/addon/elementspath) disables Cut and Copy icons.
-* [#13812](http://dev.ckeditor.com/ticket/13812): Fixed: When aborting file upload the placeholder for image is left.
-* [#14659](http://dev.ckeditor.com/ticket/14659): [Blink] Fixed: Content scrolled to the top after closing the dialog in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
-* [#14825](http://dev.ckeditor.com/ticket/14825): [Edge] Fixed: Focusing the editor causes unwanted scrolling due to dropped support for the `setActive` method.
-
-## CKEditor 4.5.10
-
-Fixed Issues:
-
-* [#10750](http://dev.ckeditor.com/ticket/10750): Fixed: The editor does not escape the `font-style` family property correctly, removing quotes and whitespace from font names.
-* [#14413](http://dev.ckeditor.com/ticket/14413): Fixed: The [Auto Grow](http://ckeditor.com/addon/autogrow) plugin with the [`config.autoGrow_onStartup`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoGrow_onStartup) option set to `true` does not work properly for an editor that is not visible.
-* [#14451](http://dev.ckeditor.com/ticket/14451): Fixed: Numeric element ID not escaped properly. Thanks to [Jakub Chalupa](https://github.com/chaluja7)!
-* [#14590](http://dev.ckeditor.com/ticket/14590): Fixed: Additional line break appearing after inline elements when switching modes. Thanks to [dpidcock](https://github.com/dpidcock)!
-* [#14539](https://dev.ckeditor.com/ticket/14539): Fixed: JAWS reads "selected Blank" instead of "selected <widget name>" when selecting a widget.
-* [#14701](http://dev.ckeditor.com/ticket/14701): Fixed: More precise labels for [Enhanced Image](http://ckeditor.com/addon/image2) and [Placeholder](http://ckeditor.com/addon/placeholder) widgets.
-* [#14667](http://dev.ckeditor.com/ticket/14667): [IE] Fixed: Removing background color from selected text removes background color from the whole paragraph.
-* [#14252](http://dev.ckeditor.com/ticket/14252): [IE] Fixed: Styles drop-down list does not always reflect the current style of the text line.
-* [#14275](http://dev.ckeditor.com/ticket/14275): [IE9+] Fixed: `onerror` and `onload` events are not used in browsers it could have been used when loading scripts dynamically.
-
-## CKEditor 4.5.9
-
-Fixed Issues:
-
-* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets).
-* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances.
-* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `<body>` element and the `height` style for the `<html>` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin.
-* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `<iframe>` element.
-* [#14602](http://dev.ckeditor.com/ticket/14602): Fixed: The [`dom.element.removeAttribute()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeAttribute) method does not remove all attributes if no parameter is given.
-* [#8679](http://dev.ckeditor.com/ticket/8679): Fixed: Better focus indication and ability to style the selected color in the [color picker dialog](http://ckeditor.com/addon/colordialog).
-* [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
-* [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
-* [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
-
-## CKEditor 4.5.8
-
-New Features:
-
-* [#12440](http://dev.ckeditor.com/ticket/12440): Added the [`config.colorButton_enableAutomatic`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_enableAutomatic) option to allow hiding the "Automatic" option in the [color picker](http://ckeditor.com/addon/colorbutton).
-
-Fixed Issues:
-
-* [#10448](http://dev.ckeditor.com/ticket/10448): Fixed: Lack of scrollbar in the [right-to-left text direction](http://ckeditor.com/addon/bidi).
-* [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not comply with the HTML specification.
-* [#13756](http://dev.ckeditor.com/ticket/13756): [Edge] Fixed: Context menus are cut-off.
-
-## CKEditor 4.5.7
-
-New Features:
-
-* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization. Thanks to [Miro Grenda](https://twitter.com/mirogrenda)!
-
-Fixed Issues:
-
-* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
-	* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
-	* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
-	* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
-	* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
-* [#13884](http://dev.ckeditor.com/ticket/13884): [Firefox] Fixed: Copying and pasting a table results in just the first cell being pasted.
-* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Media Embed](http://ckeditor.com/addon/embed) dialog.
-
-## CKEditor 4.5.6
-
-New Features:
-
-* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies.
-* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type):
-	- New features:
-		- CKEditor [Language](http://ckeditor.com/addon/language) plugin support.
-		- CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support.
-		- [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support.
-		- **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality.
-	- Fixed issues:
-		* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core.
-		* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements.
-		* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting.
-		* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page.
-		* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content.
-		* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe.
-		* SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled.
-		* Issue with pasting SCAYT markup in CKEditor.
-		* SCAYT stops working after pressing the *Cancel* button in the WSC dialog.
-
-## CKEditor 4.5.5
-
-Fixed Issues:
-
-* [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: [Link](http://ckeditor.com/addon/link) plugin alters the `target` attribute value. Thanks to [SamZiemer](https://github.com/SamZiemer)!
-* [#12189](http://dev.ckeditor.com/ticket/12189): Fixed: The [Link](http://ckeditor.com/addon/link) plugin dialog does not display the subject of email links if the subject parameter is not lowercase.
-* [#9192](http://dev.ckeditor.com/ticket/9192): Fixed: An `undefined` string is appended to an email address added with the [Link](http://ckeditor.com/addon/link) plugin if subject and email body are empty and [`config.emailProtection`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-emailProtection) is set to `encode`.
-* [#13790](https://dev.ckeditor.com/ticket/13790): Fixed: It is not possible to destroy the editor `<iframe>` after the editor was detached from DOM. Thanks to [Stefan Rijnhart](https://github.com/StefanRijnhart)!
-* [#13803](https://dev.ckeditor.com/ticket/13803): Fixed: The editor cannot be destroyed before being fully initialized. Thanks to [Cyril Fluck](https://github.com/cyril-sf)!
-* [#13867](http://dev.ckeditor.com/ticket/13867): Fixed: CKEditor does not work when the `classList` polyfill is used.
-* [#13885](http://dev.ckeditor.com/ticket/13885): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) requires the [Link](http://ckeditor.com/addon/link) plugin to link an image.
-* [#13883](http://dev.ckeditor.com/ticket/13883): Fixed: Copying a table using the context menu strips off styles.
-* [#13872](http://dev.ckeditor.com/ticket/13872): Fixed: Cutting is possible in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode.
-* [#12848](http://dev.ckeditor.com/ticket/12848): [Blink] Fixed: Opening the [Find and Replace](http://ckeditor.com/addon/find) dialog window in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode throws an exception.
-* [#13879](http://dev.ckeditor.com/ticket/13879): Fixed: It is not possible to prevent the [`editor.drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop) event.
-* [#13361](http://dev.ckeditor.com/ticket/13361): Fixed: Skin images fail when the site path includes parentheses because the `background-image` path needs single quotes around the URL value.
-* [#13771](http://dev.ckeditor.com/ticket/13771): Fixed: The `contents.css` style is not used if the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin is missing.
-* [#13782](http://dev.ckeditor.com/ticket/13782): Fixed: Unclear log messages.
-* [#13919](http://dev.ckeditor.com/ticket/13919): [Edge] Fixed: Browser window crashes when accessing the `isContentEditable` property of an `<input>` DOM element.
-
-Other Changes:
-
-* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `bender.tools.createTestsForEditors` will also receive editor bot as a second parameter.
-
-## CKEditor 4.5.4
-
-New Features:
-
-* [#13632](http://dev.ckeditor.com/ticket/13632): Introduce error logging mechanism.
-* [#13730](http://dev.ckeditor.com/ticket/13730): Switch to the new error logging mechanism.
-
-Fixed Issues:
-
-* [#9856](http://dev.ckeditor.com/ticket/9856): Fixed: Cannot use the native context menu together with the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Mark Wade](https://github.com/mark-wade)!
-* [#12733](http://dev.ckeditor.com/ticket/12733): [IE9+] Fixed: Radio button `onChange` does not work. Thanks to [Iliya Kostadinov](https://github.com/iliyakostadinov)!
-* [#13142](http://dev.ckeditor.com/ticket/13142): [Edge] Fixed: *Ctrl+A* and then *Backspace* result in an empty `<div>` element.
-* [#13599](http://dev.ckeditor.com/ticket/13599): Fixed: Cross-editor drag and drop of an inline widget results in error/artifacts.
-* [#13640](http://dev.ckeditor.com/ticket/13640): [IE] Fixed: Dropping a widget outside the `<body>` element is not handled correctly.
-* [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
-* [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow the `<h1-6>` element to be a child of the `<summary>` element.
-* [#11724](http://dev.ckeditor.com/ticket/11724): [Touch devices] Fixed: Drop-downs often hide right after opening them.
-* [#13690](http://dev.ckeditor.com/ticket/13690): Fixed: Copying content from IE to Chrome adds an extra paragraph.
-* [#13284](http://dev.ckeditor.com/ticket/13284): Fixed: Cannot drag and drop a widget if the text caret is placed just after the widget instance.
-* [#13516](http://dev.ckeditor.com/ticket/13516): Fixed: CKEditor removes empty HTML5 anchors without the `name` attribute.
-* [#13765](http://dev.ckeditor.com/ticket/13765): [Safari 9] Fixed: Problems with rendering samples.
-
-Other Changes:
-
-* [#11725](http://dev.ckeditor.com/ticket/11725): Marked [`CKEDITOR.env.mobile`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-mobile) as deprecated. The reason is that it is no longer clear what "mobile" means.
-* [#13737](http://dev.ckeditor.com/ticket/13737): Upgraded [Bender.js](https://github.com/benderjs/benderjs) to 0.4.1.
-
-## CKEditor 4.5.3
-
-New Features:
-
-* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
-* [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.
-
-Fixed Issues:
-
-* [#13590](http://dev.ckeditor.com/ticket/13590): Fixed: Various issues related to the [Paste from Word](http://ckeditor.com/addon/pastefromword) feature. Fixes also:
-  * [#11215](http://dev.ckeditor.com/ticket/11215),
-  * [#8780](http://dev.ckeditor.com/ticket/8780),
-  * [#12762](http://dev.ckeditor.com/ticket/12762).
-* [#13386](http://dev.ckeditor.com/ticket/13386): [Edge] Fixed: Issues with selecting and editing images.
-* [#13568](http://dev.ckeditor.com/ticket/13568): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method returns invalid results for entire content selection.
-* [#13453](http://dev.ckeditor.com/ticket/13453): Fixed: Drag&drop of entire editor content throws an error.
-* [#13465](http://dev.ckeditor.com/ticket/13465): Fixed: Error is thrown and the widget is lost on drag&drop if it is the only content of the editor.
-* [#13414](http://dev.ckeditor.com/ticket/13414): Fixed: Content auto paragraphing in a nested editable despite editor configuration.
-* [#13429](http://dev.ckeditor.com/ticket/13429): Fixed: Incorrect selection after content insertion by the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
-* [#13388](http://dev.ckeditor.com/ticket/13388): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) integration with [Undo](http://ckeditor.com/addon/undo) is broken.
-
-Other Changes:
-
-* [#13637](https://dev.ckeditor.com/ticket/13637): Several icons were refactored.
-* Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.3.0 and introduced the ability to run tests via HTTPs ([#13265](https://dev.ckeditor.com/ticket/13265)).
-
-## CKEditor 4.5.2
-
-Fixed Issues:
-
-* [#13609](http://dev.ckeditor.com/ticket/13609): [Edge] Fixed: The browser crashes when switching to the source mode. Thanks to [Andrew Williams and Mark Smeed](http://webxsolution.com/)!
-* [PR#201](https://github.com/ckeditor/ckeditor-dev/pull/201): Fixed: Buttons in the toolbar configurator cause form submission. Thanks to [colemanw](https://github.com/colemanw)!
-* [#13422](http://dev.ckeditor.com/ticket/13422): Fixed: A monospaced font should be used in the `<textarea>` element storing editor configuration in the toolbar configurator.
-* [#13494](http://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in the toolbar configurator if plugin requirements are not met.
-* [#13409](http://dev.ckeditor.com/ticket/13409): Fixed: List elements incorrectly merged when pressing *Backspace* or *Delete*.
-* [#13434](http://dev.ckeditor.com/ticket/13434): Fixed: Dialog state indicator broken in Right–To–Left environments.
-* [#13460](http://dev.ckeditor.com/ticket/13460): [IE8] Fixed: Copying inline widgets is broken when [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) is disabled.
-* [#13495](http://dev.ckeditor.com/ticket/13495): [Firefox, IE] Fixed: Text is not word-wrapped in the Paste dialog window.
-* [#13528](http://dev.ckeditor.com/ticket/13528): [Firefox@Windows] Fixed: Content copied from Microsoft Word and other external applications is pasted as a plain text. Removed the `CKEDITOR.plugins.clipboard.isHtmlInExternalDataTransfer` property as the check must be dynamic.
-* [#13583](http://dev.ckeditor.com/ticket/13583): Fixed: [`DataTransfer.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer-method-getData) should work consistently in all browsers and should not strip valuable content. Fixed pasting tables from Microsoft Excel on Chrome.
-* [#13468](http://dev.ckeditor.com/ticket/13468): [IE] Fixed: Binding drag&drop `dataTransfer` does not work if `text` data was set in the meantime.
-* [#13451](http://dev.ckeditor.com/ticket/13451): [IE8-9] Fixed: One drag&drop operation may affect following ones.
-* [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after a drop on editor UI.
-* [#13129](http://dev.ckeditor.com/ticket/13129) Fixed: Block widget blurred after a drop followed by an undo.
-* [#13397](http://dev.ckeditor.com/ticket/13397): Fixed: Drag&drop of a widget inside its nested widget crashes the editor.
-* [#13385](http://dev.ckeditor.com/ticket/13385): Fixed: [`editor.getSnapshot()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSnapshot) may return a non-string value.
-* [#13419](http://dev.ckeditor.com/ticket/13419): Fixed: The [Auto Link](http://ckeditor.com/addon/autolink) plugin does not encode double quotes in URLs.
-* [#13420](http://dev.ckeditor.com/ticket/13420): Fixed: The [Auto Embed](http://ckeditor.com/addon/autoembed) plugin ignores encoded characters in URL parameters.
-* [#13410](http://dev.ckeditor.com/ticket/13410): Fixed: Error thrown in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin when undoing right after pasting a link.
-* [#13566](http://dev.ckeditor.com/ticket/13566): Fixed: Suppressed notifications in the [Media Embed Base](http://ckeditor.com/addon/embedbase) plugin.
-* [#11616](http://dev.ckeditor.com/ticket/11616): [Chrome] Fixed: Resizing the editor while it is not displayed breaks the editable. Fixes also [#9160](http://dev.ckeditor.com/ticket/9160) and [#9715](http://dev.ckeditor.com/ticket/9715).
-* [#11376](http://dev.ckeditor.com/ticket/11376): [IE11] Fixed: Loss of text when pasting bulleted lists from Microsoft Word.
-* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost when opening the panel.
-* [#13387](http://dev.ckeditor.com/ticket/13387): [Edge] Fixed: "Permission denied" error thrown when loading the editor with developer tools open.
-* [#13574](http://dev.ckeditor.com/ticket/13574): [Edge] Fixed: "Permission denied" error thrown when opening editor dialog windows.
-* [#13441](http://dev.ckeditor.com/ticket/13441): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin breaks the state of [Undo](http://ckeditor.com/addon/undo) commands after a paste.
-* [#13554](http://dev.ckeditor.com/ticket/13554): [Edge] Fixed: Paste dialog's iframe does not receive focus on show.
-* [#13440](http://dev.ckeditor.com/ticket/13440): [Edge] Fixed: Unable to paste a widget.
-
-Other Changes:
-
-* [#13421](http://dev.ckeditor.com/ticket/13421): UX improvements to notifications in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
-
-## CKEditor 4.5.1
-
-Fixed Issues:
-
-* [#13486](http://dev.ckeditor.com/ticket/13486): Fixed: The [Upload Image](http://ckeditor.com/addon/uploadimage) plugin should log an error, not throw an error when upload URL is not set.
-
-## CKEditor 4.5
-
-New Features:
-
-* [#13304](http://dev.ckeditor.com/ticket/13304): Added support for passing DOM elements to [`config.sharedSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-sharedSpaces). Thanks to [Undergrounder](https://github.com/Undergrounder)!
-* [#13215](http://dev.ckeditor.com/ticket/13215): Added ability to cancel fetching a resource by the Embed plugins.
-* [#13213](http://dev.ckeditor.com/ticket/13213): Added the [`dialog#setState()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-method-setState) method and used it in the [Embed](http://ckeditor.com/addon/embed) dialog to indicate that a resource is being loaded.
-* [#13337](http://dev.ckeditor.com/ticket/13337): Added the [`repository.onWidget()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-onWidget) method &mdash; a convenient way to listen to [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) events through the [repository](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository).
-* [#13214](http://dev.ckeditor.com/ticket/13214): Added support for pasting links that convert into embeddable resources on the fly.
-
-Fixed Issues:
-
-* [#13334](http://dev.ckeditor.com/ticket/13334): Fixed: Error after nesting widgets and playing with undo/redo.
-* [#13118](http://dev.ckeditor.com/ticket/13118): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method throws an error when called in the source mode.
-* [#13158](http://dev.ckeditor.com/ticket/13158): Fixed: Error after canceling a dialog when creating a widget.
-* [#13197](http://dev.ckeditor.com/ticket/13197): Fixed: Linked inline [Enhanced Image](http://ckeditor.com/addon/image2) alignment class is not transferred to the widget wrapper.
-* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: [Semantic Embed](http://ckeditor.com/addon/embedsemantic) does not support widget classes.
-* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
-* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done, notification update should be marked as important.
-* [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the [Image](http://ckeditor.com/addon/image) dialog seems to be never used.
-* [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are moved 10px to the right.
-* [#13280](http://dev.ckeditor.com/ticket/13280): [IE8] Fixed: Undo after inline widget drag&drop throws an error.
-* [#13186](http://dev.ckeditor.com/ticket/13186): Fixed: Content dropped into a nested editable is not filtered by [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf).
-* [#13140](http://dev.ckeditor.com/ticket/13140): Fixed: Error thrown when dropping a block widget right after itself.
-* [#13176](http://dev.ckeditor.com/ticket/13176): [IE8] Fixed: Errors on drag&drop of embed widgets.
-* [#13015](http://dev.ckeditor.com/ticket/13015): Fixed: Dropping an image file on [Enhanced Image](http://ckeditor.com/addon/image2) causes a page reload.
-* [#13080](http://dev.ckeditor.com/ticket/13080): Fixed: Ugly notification shown when the response contains HTML content.
-* [#13011](http://dev.ckeditor.com/ticket/13011): [IE8] Fixed: Anchors are duplicated on drag&drop in specific locations.
-* [#13105](http://dev.ckeditor.com/ticket/13105): Fixed: Various issues related to [`CKEDITOR.tools.htmlEncode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlEncode) and [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) methods.
-* [#11976](http://dev.ckeditor.com/ticket/11976): [Chrome] Fixed: Copy&paste and drag&drop lists from Microsoft Word.
-* [#13128](http://dev.ckeditor.com/ticket/13128): Fixed: Various issues with cloning element IDs:
-  * Fixed the default behavior of [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) and [`range.extractContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-extractContents) methods which now clone IDs similarly to their native counterparts.
-  * Added `cloneId` arguments to the above methods, [`range.splitBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-splitBlock) and [`element.breakParent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-breakParent). Mind the default values and special behavior in the `extractContents()` method!
-  * Fixed issues where IDs were lost on copy&paste and drag&drop.
-* Toolbar configurators:
-  * [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
-  * [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
-  * [#13136](http://dev.ckeditor.com/ticket/13136): Fixed: Autocompleter is far too intrusive.
-  * [#13133](http://dev.ckeditor.com/ticket/13133): Fixed: Tab leaves the editor.
-  * [#13173](http://dev.ckeditor.com/ticket/13173): Fixed: [`config.removeButtons`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-removeButtons) is ignored by the advanced toolbar configurator.
-
-Other Changes:
-
-* [#13119](http://dev.ckeditor.com/ticket/13119): Improved compatibility of editor skins ([Moono](http://ckeditor.com/addon/moono) and [Kama](http://ckeditor.com/addon/kama)) with external web page style sheets.
-* Toolbar configurators:
-  * [#13147](http://dev.ckeditor.com/ticket/13147): Added buttons to the sticky toolbar.
-  * [#13207](http://dev.ckeditor.com/ticket/13207): Used modal window to display toolbar configurator help.
-* [#13316](http://dev.ckeditor.com/ticket/13316): Made [`CKEDITOR.env.isCompatible`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-isCompatible) a blacklist rather than a whitelist. More about the change in the [Browser Compatibility](http://docs.ckeditor.com/#!/guide/dev_browsers) guide.
-* [#13398](http://dev.ckeditor.com/ticket/13398): Renamed `CKEDITOR.fileTools.UploadsRepository` to [`CKEDITOR.fileTools.UploadRepository`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadRepository) and changed all related properties.
-* [#13279](http://dev.ckeditor.com/ticket/13279): Reviewed CSS vendor prefixes.
-* [#13454](http://dev.ckeditor.com/ticket/13454): Removed unused `lang.image.alertUrl` token from the [Image](http://ckeditor.com/addon/image) plugin.
-
-## CKEditor 4.5 Beta
-
-New Features:
-
-* Clipboard (copy&paste, drag&drop) and file uploading features and improvements ([#11437](http://dev.ckeditor.com/ticket/11437)).
-
-  * Major features:
-    * Support for dropping and pasting files into the editor was introduced. Through a set of new facades for native APIs it is now possible to easily intercept and process inserted files.
-    * [File upload tools](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools) were introduced in order to simplify controlling the loading, uploading and handling server response, properly handle [new upload configuration](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uploadUrl) options, etc.
-    * [Upload Image](http://ckeditor.com/addon/uploadimage) widget was introduced to upload dropped images. A base class for the [upload widget](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition) was exposed, too, to make it simple to create new types of upload widgets which can handle any type of dropped file, show the upload progress and update the content when the process is done. It also handles editing and undo/redo operations when a file is being uploaded and integrates with the [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) to show progress and success or error.
-    * All drag and drop operations were integrated with the editor. All dropped content is passed through the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event and a set of new editor events was introduced &mdash; [`dragstart`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragstart), [`drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop), [`dragend`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragend).
-    * The [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) facade was introduced to unify access to data in various types and files. [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) is now always available in the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
-    * Switched from the pastebin to using the native clipboard access whenever possible. This solved many issues related to pastebin such as unnecessary scrolling or data loss. Additionally, on copy and cut from the editor the clipboard data is set. Therefore, on paste the editor has access to clean data, undisturbed by the browsers.
-    * Drag and drop of inline and block widgets was integrated with the standard clipboard APIs. By listening to drag events you will thus be notified about widgets, too. This opens a possibility to filter pasted and dropped widgets.
-    * The [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event can have the `range` parameter so it is possible to change the paste position in the listener or paste in the not selectable position. Also the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method now accepts `range` as an additional parameter.
-    * [#11621](http://dev.ckeditor.com/ticket/11621): A configurable [paste filter](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFilter) was introduced. The filter is by default turned to `'semantic-content'` on Webkit and Blink for all pasted content coming from external sources because of the low quality of HTML that these engines put into the clipboard. Internal and cross-editor paste is safe due to the change explained in the previous point.
-
-  * Other changes and related fixes:
-    * [#12095](http://dev.ckeditor.com/ticket/12095): On drag and copy of widgets [the same method](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) is used to get selected HTML as in the normal case. Thanks to that styles applied to inline widgets are not lost.
-    * [#11219](http://dev.ckeditor.com/ticket/11219): Fixed: Dragging a [captioned image](http://ckeditor.com/addon/image2) does not fire the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
-    * [#9554](http://dev.ckeditor.com/ticket/9554): [Webkit Mac] Fixed: Editor scrolls on paste.
-    * [#9898](http://dev.ckeditor.com/ticket/9898): [Webkit&Divarea] Fixed: Pasting causes undesirable scrolling.
-    * [#11993](http://dev.ckeditor.com/ticket/11993): [Chrome] Fixed: Pasting content scrolls the document.
-    * [#12613](http://dev.ckeditor.com/ticket/12613): Show the user that they can not drop on editor UI (toolbar, bottom bar).
-    * [#12851](http://dev.ckeditor.com/ticket/12851): [Blink/Webkit] Fixed: Formatting disappears when pasting content into cells.
-    * [#12914](http://dev.ckeditor.com/ticket/12914): Fixed: Copy/Paste of table broken in `div`-based editor.
-
-  * Browser support.<br>Browser support for related features varies significantly (see http://caniuse.com/clipboard).
-    * File APIs needed to operate and file upload is not supported in Internet Explorer 9 and below.
-    * Only Chrome and Safari on Mac OS support setting custom data items in the clipboard, so currently it is possible to recognize the origin of the copied content in these browsers only. All drag and drop operations can be identified thanks to the new Data Transfer facade.
-    * No Internet Explorer browser supports the standard clipboard API which results in small glitches like where only plain text can be dropped from outside the editor. Thanks to the new Data Transfer facade, internal and cross-editor drag and drop supports the full range of data.
-    * Direct access to clipboard could only be implemented in Chrome, Safari on Mac OS, Opera and Firefox. In other browsers the pastebin must still be used.
-
-* [#12875](http://dev.ckeditor.com/ticket/12875): Samples and toolbar configuration tools.
-  * The old set of samples shipped with every CKEditor package was replaced with a shiny new single-page sample. This change concluded a long term plan which started from introducing the [CKEditor SDK](http://sdk.ckeditor.com/) and [CKEditor Functionality Overview](http://docs.ckeditor.com/#!/guide/dev_features) section in the documentation which essentially redefined the old samples.
-  * Toolbar configurators with live previews were introduced. They will be shipped with every CKEditor package and are meant to help in configuring toolbar layouts.
-
-* [#10925](http://dev.ckeditor.com/ticket/10925): The [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins were introduced. Read more about the new features in the [Embedding Content](http://docs.ckeditor.com/#!/guide/dev_media_embed) article.
-* [#10931](http://dev.ckeditor.com/ticket/10931): Added support for nesting widgets. It is now possible to insert one widget into another widget's nested editable. Note that unless nested editable's [allowed content](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable.definition-property-allowedContent) is defined precisely, starting from CKEditor 4.5 some widget buttons may become enabled. This feature is not supported in IE8. Included issues:
-  * [#12018](http://dev.ckeditor.com/ticket/12018): Fixed and reviewed: Nested widgets garbage collection.
-  * [#12024](http://dev.ckeditor.com/ticket/12024): [Firefox] Fixed: Outline is extended to the left by unpositioned drag handlers.
-  * [#12006](http://dev.ckeditor.com/ticket/12006): Fixed: Drag and drop of nested block widgets.
-  * [#12008](http://dev.ckeditor.com/ticket/12008): Fixed various cases of inserting a single non-editable element using the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method. Fixes pasting a widget with a nested editable inside another widget's nested editable.
-
-* Notification system:
-  * [#11580](http://dev.ckeditor.com/ticket/11580): Introduced the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification).
-  * [#12810](http://dev.ckeditor.com/ticket/12810): Introduced a [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) for the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification) which simplifies displaying progress of many concurrent tasks.
-* [#11636](http://dev.ckeditor.com/ticket/11636): Introduced new, UX-focused, methods for getting selected HTML and deleting it &mdash; [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) and [`editor.extractSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-extractSelectedHtml).
-* [#12416](http://dev.ckeditor.com/ticket/12416): Added the [`widget.definition.upcastPriority`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-upcastPriority) property which gives more control over widget upcasting order to the widget author.
-* [#12036](http://dev.ckeditor.com/ticket/12036): Initialize the editor in [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode when the `<textarea>` element has a `readonly` attribute.
-* [#11905](http://dev.ckeditor.com/ticket/11905): The [`resize` event](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-resize) passes the current dimensions in its data.
-* [#12126](http://dev.ckeditor.com/ticket/12126): Introduced [`config.image_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image_prefillDimensions) and [`config.image2_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_prefillDimensions) to make pre-filling `width` and `height` configurable for the [Enhanced Image](http://ckeditor.com/addon/image2).
-* [#12746](http://dev.ckeditor.com/ticket/12746): Added a new configuration option to hide the [Enhanced Image](http://ckeditor.com/addon/image2) resizer.
-* [#12150](http://dev.ckeditor.com/ticket/12150): Exposed the [`getNestedEditable()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-static-method-getNestedEditable) and `is*` [widget helper](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) functions (see the static methods).
-* [#12448](http://dev.ckeditor.com/ticket/12448): Introduced the [`editable.insertHtmlIntoRange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertHtmlIntoRange) method.
-* [#12143](http://dev.ckeditor.com/ticket/12143): Added the [`config.floatSpacePreferRight`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-floatSpacePreferRight) configuration option that switches the alignment of the floating toolbar. Thanks to [InvisibleBacon](http://github.com/InvisibleBacon)!
-* [#10986](http://dev.ckeditor.com/ticket/10986): Added support for changing dialog input and textarea text directions by using the *Shift+Alt+Home/End* keystrokes. The direction is stored in the value of the input by prepending the [`\u202A`](http://unicode.org/cldr/utility/character.jsp?a=202A) or [`\u202B`](http://unicode.org/cldr/utility/character.jsp?a=202B) marker to it. Read more in the [documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog.definition.textInput-property-bidi). Thanks to [edithkk](https://github.com/edithkk)!
-* [#12770](http://dev.ckeditor.com/ticket/12770): Added support for passing [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget)'s startup data as a widget command's argument. Thanks to [Rebrov Boris](https://github.com/zipp3r) and [Tieme van Veen](https://github.com/tiemevanveen)!
-* [#11583](http://dev.ckeditor.com/ticket/11583): Added support for the HTML5 `required` attribute in various form elements. Thanks to [Steven Busse](https://github.com/sbusse)!
-
-Changes:
-
-* [#12858](http://dev.ckeditor.com/ticket/12858): Basic [Spartan](http://blogs.windows.com/bloggingwindows/2015/03/30/introducing-project-spartan-the-new-browser-built-for-windows-10/) browser compatibility. Full compatibility will be introduced later, because at the moment Spartan is still too unstable to be used for tests and we see many changes from version to version.
-* [#12948](http://dev.ckeditor.com/ticket/12948): The [`config.mathJaxLibrary`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-mathJaxLib) option does not default to the MathJax CDN any more. It needs to be configured to enable the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin now.
-* [#13069](http://dev.ckeditor.com/ticket/13069): Fixed inconsistencies between [`editable.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) and [`editable.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) when the `range` parameter is used. Now, the `editor.insertElement()` method works on a higher level, which means that it saves undo snapshots and sets the selection after insertion. Use the [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange) method directly for the pre 4.5 behavior of `editable.insertElement()`.
-* [#12870](http://dev.ckeditor.com/ticket/12870): Use [`editor.showNotification()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-showNotification) instead of `alert()` directly whenever possible. When the [Notification plugin](http://ckeditor.com/addon/notification) is loaded, the notification system is used automatically. Otherwise, the native `alert()` is displayed.
-* [#8024](http://dev.ckeditor.com/ticket/8024): Swapped behavior of the Split Cell Vertically and Horizontally features of the [Table Tools](http://ckeditor.com/addon/tabletools) plugin to be more intuitive. Thanks to [kevinisagit](https://github.com/kevinisagit)!
-* [#10903](http://dev.ckeditor.com/ticket/10903): Performance improvements for the [`dom.element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass), [`dom.element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass) and [`dom.element.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-hasClass) methods. Note: The previous implementation allowed passing multiple classes to `addClass()` although it was only a side effect of that implementation. The new implementation does not allow this.
-* [#11856](http://dev.ckeditor.com/ticket/11856): The jQuery adapter throws a meaningful error if CKEditor or jQuery are not loaded.
-
-Fixed issues:
-
-* [#11586](http://dev.ckeditor.com/ticket/11586): Fixed: [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) should not change the DOM in order not to affect selection.
-* [#12148](http://dev.ckeditor.com/ticket/12148): Fixed: [`dom.element.getChild()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getChild) should not modify a passed array.
-* [#12503](http://dev.ckeditor.com/ticket/12503): [Blink/Webkit] Fixed: Incorrect result of Select All and *Backspace* or *Delete*.
-* [#13001](http://dev.ckeditor.com/ticket/13001): [Firefox] Fixed: The `<br />` filler is placed in the wrong position by the [`range.fixBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-fixBlock) method due to quirky Firefox behavior.
-* [#13101](http://dev.ckeditor.com/ticket/13101): [IE8] Fixed: Colons are prepended to HTML5 element names when cloning them.
-
-## CKEditor 4.4.8
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the HTML parser reported by [Dheeraj Joshi](https://twitter.com/dheerajhere) and [Prem Kumar](https://twitter.com/iAmPr3m).
-
-	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
-
-**An upgrade is highly recommended!**
-
-Fixed Issues:
-
-* [#12899](http://dev.ckeditor.com/ticket/12899): Fixed: Corrected wrong tag ending for horizontal box definition in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin. Thanks to [mizafish](https://github.com/mizafish)!
-* [#13254](http://dev.ckeditor.com/ticket/13254): Fixed: Cannot outdent block after indent when using the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Jonathan Cottrill](https://github.com/jcttrll)!
-* [#13268](http://dev.ckeditor.com/ticket/13268): Fixed: Documentation for [`CKEDITOR.dom.text`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.text) is incorrect. Thanks to [Ben Kiefer](https://github.com/benkiefer)!
-* [#12739](http://dev.ckeditor.com/ticket/12739): Fixed: Link loses inline styles when edited without the [Advanced Tab for Dialogs](http://ckeditor.com/addon/dialogadvtab) plugin. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [#13292](http://dev.ckeditor.com/ticket/13292): Fixed: Protection pattern does not work in attribute in self-closing elements with no space before `/>`. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [PR#192](https://github.com/ckeditor/ckeditor-dev/pull/192): Fixed: Variable name typo in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin which caused [`CKEDITOR.ui.dialog.radio`](http://docs.ckeditor.com/#!/api/CKEDITOR.ui.dialog.radio) validation to not work. Thanks to [Florian Ludwig](https://github.com/FlorianLudwig)!
-* [#13232](http://dev.ckeditor.com/ticket/13232): [Safari] Fixed: The [`element.appendText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-appendText) method does not work properly for empty elements.
-* [#13233](http://dev.ckeditor.com/ticket/13233): Fixed: [HTMLDataProcessor](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) can process `foo:href` attributes.
-* [#12796](http://dev.ckeditor.com/ticket/12796): Fixed: The [Indent List](http://ckeditor.com/addon/indentlist) plugin unwraps parent `<li>` elements. Thanks to [Andrew Stucki](https://github.com/andrewstucki)!
-* [#12885](http://dev.ckeditor.com/ticket/12885): Added missing [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) parameter documentation.
-* [#11982](http://dev.ckeditor.com/ticket/11982): Fixed: Bullet added in a wrong position after the *Enter* key is pressed in a nested list.
-* [#13027](http://dev.ckeditor.com/ticket/13027): Fixed: Keyboard navigation in dialog windows with multiple tabs not following IBM CI 162 instructions or [ARIA Authoring Practices](http://www.w3.org/TR/2013/WD-wai-aria-practices-20130307/#tabpanel).
-* [#12256](http://dev.ckeditor.com/ticket/12256): Fixed: Basic styles classes are lost when pasting from Microsoft Word if [basic styles](http://ckeditor.com/addon/basicstyles) were configured to use classes.
-* [#12729](http://dev.ckeditor.com/ticket/12729): Fixed: Incorrect structure created when merging a block into a list item on *Backspace* and *Delete*.
-* [#13031](http://dev.ckeditor.com/ticket/13031): [Firefox] Fixed: No more line breaks in source view since Firefox 36.
-* [#13131](http://dev.ckeditor.com/ticket/13131): Fixed: The [Code Snippet](http://ckeditor.com/addon/codesnippet) plugin cannot be used without the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin.
-* [#9086](http://dev.ckeditor.com/ticket/9086): Fixed: Invalid ARIA property used on paste area `<iframe>`.
-* [#13164](http://dev.ckeditor.com/ticket/13164): Fixed: Error when inserting a hidden field.
-* [#13155](http://dev.ckeditor.com/ticket/13155): Fixed: Incorrect [Line Utilities](http://ckeditor.com/addon/lineutils) positioning when `<body>` has a margin.
-* [#13351](http://dev.ckeditor.com/ticket/13351): Fixed: Link lost when editing a linked image with the Link tab disabled. This also fixed a bug when inserting an image into a fully selected link would throw an error ([#12847](https://dev.ckeditor.com/ticket/12847)).
-* [#13344](http://dev.ckeditor.com/ticket/13344): [WebKit/Blink] Fixed: It is possible to remove or change editor content in [read-only mode](http://docs.ckeditor.com/#!/guide/dev_readonly).
-
-Other Changes:
-
-* [#12844](http://dev.ckeditor.com/ticket/12844) and [#13103](http://dev.ckeditor.com/ticket/13103): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.3`.
-* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licensing issues, `truncated-mathjax/` is now removed from the `tests/` directory. Now `bender.config.mathJaxLibPath` must be configured manually in order to run [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin tests.
-* [#13266](http://dev.ckeditor.com/ticket/13266): Added more shades of gray in the [Color Dialog](http://ckeditor.com/addon/colordialog) window. Thanks to [mizafish](https://github.com/mizafish)!
-
-
-## CKEditor 4.4.7
-
-Fixed Issues:
-
-* [#12825](http://dev.ckeditor.com/ticket/12825): Fixed: Preventing the [Table Resize](http://ckeditor.com/addon/tableresize) plugin from operating on elements outside the editor. Thanks to [Paul Martin](https://github.com/Paul-Martin)!
-* [#12157](http://dev.ckeditor.com/ticket/12157): Fixed: Lost text formatting on pressing *Tab* when the [`config.tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces) configuration option value was greater than zero.
-* [#12777](http://dev.ckeditor.com/ticket/12777): Fixed: The `table-layout` CSS property should be reset by skins. Thanks to [vita10gy](https://github.com/vita10gy)!
-* [#12812](http://dev.ckeditor.com/ticket/12812): Fixed: An uncaught security exception is thrown when [Line Utilities](http://ckeditor.com/addon/lineutils) are used in an inline editor loaded in a cross-domain `iframe`. Thanks to [Vitaliy Zurian](https://github.com/thecatontheflat)!
-* [#12735](http://dev.ckeditor.com/ticket/12735): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) should only apply when outputting data.
-* [#10032](http://dev.ckeditor.com/ticket/10032): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter is executed for every paste after using the button.
-* [#12597](http://dev.ckeditor.com/ticket/12597): [Blink/WebKit] Fixed: Multi-byte Japanese characters entry not working properly after *Shift+Enter*.
-* [#12387](http://dev.ckeditor.com/ticket/12387): Fixed: An error is thrown if a skin does not have the [`chameleon`](http://docs.ckeditor.com/#!/api/CKEDITOR.skin-method-chameleon) property defined and [`config.uiColor`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uiColor) is defined.
-* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when the editor is maximized results in incorrect drop-down panel position.
-* [#12850](http://dev.ckeditor.com/ticket/12850): [IEQM] Fixed: An error is thrown after focusing the editor.
-
-## CKEditor 4.4.6
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the HTML parser reported by [Maco Cortes](https://www.facebook.com/Maaacoooo).
-
-	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
-
-**An upgrade is highly recommended!**
-
-New Features:
-
-* [#12501](http://dev.ckeditor.com/ticket/12501): Allowed dashes in element names in the [string format of allowed content rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules-section-string-format).
-* [#12550](http://dev.ckeditor.com/ticket/12550): Added the `<main>` element to the [`CKEDITOR.dtd`](http://docs.ckeditor.com/#!/api/CKEDITOR.dtd).
-
-Fixed Issues:
-
-* [#12506](http://dev.ckeditor.com/ticket/12506): [Safari] Fixed: Cannot paste into inline editor if the page has `user-select: none` style. Thanks to [shaohua](https://github.com/shaohua)!
-* [#12683](http://dev.ckeditor.com/ticket/12683): Fixed: [Filter](http://docs.ckeditor.com/#!/guide/dev_acf) fails to remove custom tags. Thanks to [timselier](https://github.com/timselier)!
-* [#12489](http://dev.ckeditor.com/ticket/12489) and [#12491](http://dev.ckeditor.com/ticket/12491): Fixed: Various issues related to restoring the selection after performing operations on filler character. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4).
-* [#12621](http://dev.ckeditor.com/ticket/12621): Fixed: Cannot remove inline styles (bold, italic, etc.) in empty lines.
-* [#12630](http://dev.ckeditor.com/ticket/12630): [Chrome] Fixed: Selection is placed outside the paragraph when the [New Page](http://ckeditor.com/addon/newpage) button is clicked. This patch significantly simplified the way how the initial selection (a selection after the content of the editable is overwritten) is being fixed. That might have fixed many related scenarios in all browsers.
-* [#11647](http://dev.ckeditor.com/ticket/11647): Fixed: The [`editor.blur`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-blur) event is not fired on first blur after initializing the inline editor on an already focused element.
-* [#12601](http://dev.ckeditor.com/ticket/12601): Fixed: [Strikethrough](http://ckeditor.com/addon/basicstyles) button tooltip spelling.
-* [#12546](http://dev.ckeditor.com/ticket/12546): Fixed: The Preview tab in the [Document Properties](http://ckeditor.com/addon/docprops) dialog window is always disabled.
-* [#12300](http://dev.ckeditor.com/ticket/12300): Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event fired on first navigation key press after typing.
-* [#12141](http://dev.ckeditor.com/ticket/12141): Fixed: List items are lost when indenting a list item with content wrapped with a block element.
-* [#12515](http://dev.ckeditor.com/ticket/12515): Fixed: Cursor is in the wrong position when undoing after adding an image and typing some text.
-* [#12484](http://dev.ckeditor.com/ticket/12484): [Blink/WebKit] Fixed: DOM is changed outside the editor area in a certain case.
-* [#12688](http://dev.ckeditor.com/ticket/12688): Improved the tests of the [styles system](http://docs.ckeditor.com/#!/api/CKEDITOR.style) and fixed two minor issues.
-* [#12403](http://dev.ckeditor.com/ticket/12403): Fixed: Changing the [font](http://ckeditor.com/addon/font) style should not lead to nesting it in the previous style element.
-* [#12609](http://dev.ckeditor.com/ticket/12609): Fixed: Incorrect `config.magicline_putEverywhere` name used for a [Magic Line](http://ckeditor.com/addon/magicline) all-encompassing [`config.magicline_everywhere`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-magicline_everywhere) configuration option.
-
-
-## CKEditor 4.4.5
-
-New Features:
-
-* [#12279](http://dev.ckeditor.com/ticket/12279): Added a possibility to pass a custom evaluator to [`node.getAscendant()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.node-method-getAscendant).
-
-Fixed Issues:
-
-* [#12423](http://dev.ckeditor.com/ticket/12423): [Safari7.1+] Fixed: *Enter* key moved cursor to a strange position.
-* [#12381](http://dev.ckeditor.com/ticket/12381): [iOS] Fixed: Selection issue. Thanks to [Remiremi](https://github.com/Remiremi)!
-* [#10804](http://dev.ckeditor.com/ticket/10804): Fixed: `CKEDITOR_GETURL` is not used with some plugins where it should be used. Thanks to [Thomas Andraschko](https://github.com/tandraschko)!
-* [#9137](http://dev.ckeditor.com/ticket/9137): Fixed: The `<base>` tag is not created when `<head>` has an attribute. Thanks to [naoki.fujikawa](https://github.com/naoki-fujikawa)!
-* [#12377](http://dev.ckeditor.com/ticket/12377): Fixed: Errors thrown in the [Image](http://ckeditor.com/addon/image) plugin when removing preview from the dialog window definition. Thanks to [Axinet](https://github.com/Axinet)!
-* [#12162](http://dev.ckeditor.com/ticket/12162): Fixed: Auto paragraphing and *Enter* key in nested editables.
-* [#12315](http://dev.ckeditor.com/ticket/12315): Fixed: Marked [`config.autoParagraph`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoParagraph) as deprecated.
-* [#12113](http://dev.ckeditor.com/ticket/12113): Fixed: A [code snippet](http://ckeditor.com/addon/codesnippet) should be presented in the [elements path](http://ckeditor.com/addon/elementspath) as "code snippet" (translatable).
-* [#12311](http://dev.ckeditor.com/ticket/12311): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) should also remove `<cite>` elements.
-* [#12261](http://dev.ckeditor.com/ticket/12261): Fixed: Filter has to be destroyed and removed from [`CKEDITOR.filter.instances`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-static-property-instances) on editor destroy.
-* [#12398](http://dev.ckeditor.com/ticket/12398): Fixed: [Maximize](http://ckeditor.com/addon/maximize) does not work on an instance without a [title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
-* [#12097](http://dev.ckeditor.com/ticket/12097): Fixed: JAWS not reading the number of options correctly in the [Text Color and Background Color](http://ckeditor.com/addon/colorbutton) button menu.
-* [#12411](http://dev.ckeditor.com/ticket/12411): Fixed: [Page Break](http://ckeditor.com/addon/pagebreak) used directly in the editable breaks the editor.
-* [#12354](http://dev.ckeditor.com/ticket/12354): Fixed: Various issues in undo manager when holding keys.
-* [#12324](http://dev.ckeditor.com/ticket/12324): [IE8] Fixed: Undo steps are not recorded when changing the caret position by clicking below the body.
-* [#12332](http://dev.ckeditor.com/ticket/12332): Fixed: Lowered DOM events listeners' priorities in undo manager in order to avoid ambiguity.
-* [#12402](http://dev.ckeditor.com/ticket/12402): [Blink] Fixed: Workaround for Blink bug with `document.title` which breaks updating title in the full HTML mode.
-* [#12338](http://dev.ckeditor.com/ticket/12338): Fixed: The CKEditor package contains unoptimized images.
-
-
-## CKEditor 4.4.4
-
-Fixed Issues:
-
-* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of [UI Color](http://ckeditor.com/addon/uicolor) YUI styles. Thanks to [CasherWest](https://github.com/CasherWest)!
-* [#12263](http://dev.ckeditor.com/ticket/12263): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter does not properly normalize semicolons style text. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost when pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#111739](http://dev.ckeditor.com/ticket/11739): Fixed: `keypress` listeners should not be used in the undo manager. A complete rewrite of keyboard handling in the undo manager was made. Numerous smaller issues were fixed, among others:
-  * [#10926](http://dev.ckeditor.com/ticket/10926): [Chrome@Android] Fixed: Typing does not record snapshots and does not fire the [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
-  * [#11611](http://dev.ckeditor.com/ticket/11611): [Firefox] Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event is fired when pressing Arrow keys.
-  * [#12219](http://dev.ckeditor.com/ticket/12219): [Safari] Fixed: Some modifications of the [`UndoManager.locked`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-property-locked) property violate strict mode in the [Undo](http://ckeditor.com/addon/undo) plugin.
-* [#10916](http://dev.ckeditor.com/ticket/10916): Fixed: [Magic Line](http://ckeditor.com/addon/magicline) icon in Right-To-Left environments.
-* [#11970](http://dev.ckeditor.com/ticket/11970): [IE] Fixed: CKEditor `paste` event is not fired when pasting with *Shift+Ins*.
-* [#12111](http://dev.ckeditor.com/ticket/12111): Fixed: Linked image attributes are not read when opening the image dialog window by doubleclicking.
-* [#10030](http://dev.ckeditor.com/ticket/10030): [IE] Fixed: Prevented "Unspecified Error" thrown in various cases when IE8-9 does not allow access to `document.activeElement`.
-* [#12273](http://dev.ckeditor.com/ticket/12273): Fixed: Applying block style in a description list breaks it.
-* [#12218](http://dev.ckeditor.com/ticket/12218): Fixed: Minor syntax issue in CSS files.
-* [#12178](http://dev.ckeditor.com/ticket/12178): [Blink/WebKit] Fixed: Iterator does not return the block if the selection is located at the end of it.
-* [#12185](http://dev.ckeditor.com/ticket/12185): [IE9QM] Fixed: Error thrown when moving the mouse over focused editor's scrollbar.
-* [#12215](http://dev.ckeditor.com/ticket/12215): Fixed: Basepath resolution does not recognize semicolon as a query separator.
-* [#12135](http://dev.ckeditor.com/ticket/12135): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) does not work on widgets.
-* [#12298](http://dev.ckeditor.com/ticket/12298): [IE11] Fixed: Clicking below `<body>` in Compatibility Mode will no longer reset selection to the first line.
-* [#12204](http://dev.ckeditor.com/ticket/12204): Fixed: Editor's voice label is not affected by [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
-* [#11915](http://dev.ckeditor.com/ticket/11915): Fixed: With [SCAYT](http://ckeditor.com/addon/scayt) enabled, cursor moves to the beginning of the first highlighted, misspelled word after typing or pasting into the editor.
-* [SCAYT](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/69): Fixed: Error thrown in the console after enabling [SCAYT](http://ckeditor.com/addon/scayt) and trying to add a new image.
-
-
-Other Changes:
-
-* [#12296](http://dev.ckeditor.com/ticket/12296): Merged `benderjs-ckeditor` into the main CKEditor repository.
-
-## CKEditor 4.4.3
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the Preview plugin reported by Mario Heiderich of [Cure53](https://cure53.de/).
-
-**An upgrade is highly recommended!**
-
-New Features:
-
-* [#12164](http://dev.ckeditor.com/ticket/12164): Added the "Justify" option to the "Horizontal Alignment" drop-down in the Table Cell Properties dialog window.
-
-Fixed Issues:
-
-* [#12110](http://dev.ckeditor.com/ticket/12110): Fixed: Editor crash after deleting a table. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#11897](http://dev.ckeditor.com/ticket/11897): Fixed: *Enter* key used in an empty list item creates a new line instead of breaking the list. Thanks to [noam-si](https://github.com/noam-si)!
-* [#12140](http://dev.ckeditor.com/ticket/12140): Fixed: Double-clicking linked widgets opens two dialog windows.
-* [#12132](http://dev.ckeditor.com/ticket/12132): Fixed: Image is inserted with `width` and `height` styles even when they are not allowed.
-* [#9317](http://dev.ckeditor.com/ticket/9317): [IE] Fixed: [`config.disableObjectResizing`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableObjectResizing) does not work on IE. **Note**: We were not able to fix this issue on IE11+ because necessary events stopped working. See a [last resort workaround](http://dev.ckeditor.com/ticket/9317#comment:16) and make sure to [support our complaint to Microsoft](https://connect.microsoft.com/IE/feedback/details/742593/please-respect-execcommand-enableobjectresizing-in-contenteditable-elements).
-* [#9638](http://dev.ckeditor.com/ticket/9638): Fixed: There should be no information about accessibility help available under the *Alt+0* keyboard shortcut if the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) plugin is not available.
-* [#8117](http://dev.ckeditor.com/ticket/8117) and [#9186](http://dev.ckeditor.com/ticket/9186): Fixed: In HTML5 `<meta>` tags should be allowed everywhere, including inside the `<body>` element.
-* [#10422](http://dev.ckeditor.com/ticket/10422): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) not working properly if a function is specified.
-
-## CKEditor 4.4.2
-
-Important Notes:
-
-* The CKEditor testing environment is now publicly available. Read more about how to set up the environment and execute tests in the [CKEditor Testing Environment](http://docs.ckeditor.com/#!/guide/dev_tests) guide.
-	Please note that the [`tests/`](https://github.com/ckeditor/ckeditor-dev/tree/master/tests) directory which contains editor tests is not available in release packages. It can only be found in the development version of CKEditor on [GitHub](https://github.com/ckeditor/ckeditor-dev/).
-
-New Features:
-
-* [#11909](http://dev.ckeditor.com/ticket/11909): Introduced a parameter to prevent the [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) method from recording undo snapshots.
-
-Fixed Issues:
-
-* [#11757](http://dev.ckeditor.com/ticket/11757): Fixed: Imperfections in the [Moono](http://ckeditor.com/addon/moono) skin. Thanks to [danyaPostfactum](https://github.com/danyaPostfactum)!
-* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
-* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to [adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) configuration.
-* [#10867](http://dev.ckeditor.com/ticket/10867): Fixed: Issue with setting encoded URI as image link.
-* [#11983](http://dev.ckeditor.com/ticket/11983): Fixed: Clicking a nested widget does not focus it. Additionally, performance of the [`widget.repository.getByElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-getByElement) method was improved.
-* [#12000](http://dev.ckeditor.com/ticket/12000): Fixed: Nested widgets should be initialized on [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) and [`nestedEditable.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable-method-setData).
-* [#12022](http://dev.ckeditor.com/ticket/12022): Fixed: Outer widget's drag handler is not created at all if it has any nested widgets inside.
-* [#11960](http://dev.ckeditor.com/ticket/11960): [Blink/WebKit] Fixed: The caret should be scrolled into view on *Backspace* and *Delete* (covers only the merging blocks case).
-* [#11306](http://dev.ckeditor.com/ticket/11306): [OSX][Blink/WebKit] Fixed: No widget entries in the context menu on widget right-click.
-* [#11957](http://dev.ckeditor.com/ticket/11957): Fixed: Alignment labels in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window are not translated.
-* [#11980](http://dev.ckeditor.com/ticket/11980): [Blink/WebKit] Fixed: `<span>` elements created when joining adjacent elements (non-collapsed selection).
-* [#12009](http://dev.ckeditor.com/ticket/12009): [Nested widgets] Integration with the [Magic Line](http://ckeditor.com/addon/magicline) plugin.
-* [#11387](http://dev.ckeditor.com/ticket/11387): Fixed: `role="radiogroup"` should be applied only to radio inputs' container.
-* [#7975](http://dev.ckeditor.com/ticket/7975): [IE8] Fixed: Errors when trying to select an empty table cell.
-* [#11947](http://dev.ckeditor.com/ticket/11947): [Firefox+IE11] Fixed: *Shift+Enter* in lists produces two line breaks.
-* [#11972](http://dev.ckeditor.com/ticket/11972): Fixed: Feature detection in the [`element.setText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setText) method should not trigger the layout engine.
-* [#7634](http://dev.ckeditor.com/ticket/7634): Fixed: The [Flash Dialog](http://ckeditor.com/addon/flash) plugin omits the `allowFullScreen` parameter in the editor data if set to `true`.
-* [#11910](http://dev.ckeditor.com/ticket/11910): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) does not take [`config.baseHref`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-baseHref) into account when updating image dimensions.
-* [#11753](http://dev.ckeditor.com/ticket/11753): Fixed: Wrong [`checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method value after focusing or blurring a widget.
-* [#11830](http://dev.ckeditor.com/ticket/11830): Fixed: Impossible to pass some arguments to [CKBuilder](https://github.com/ckeditor/ckbuilder) when using the `/dev/builder/build.sh` script.
-* [#11945](http://dev.ckeditor.com/ticket/11945): Fixed: [Form Elements](http://ckeditor.com/addon/forms) plugin should not change a core method.
-* [#11384](http://dev.ckeditor.com/ticket/11384): [IE9+] Fixed: `IndexSizeError` thrown when pasting into a non-empty selection anchored in one text node.
-
-## CKEditor 4.4.1
-
-New Features:
-
-* [#9661](http://dev.ckeditor.com/ticket/9661): Added the option to [configure](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-linkJavaScriptLinksAllowed) anchor tags with JavaScript code in the `href` attribute.
-
-Fixed Issues:
-
-* [#11861](http://dev.ckeditor.com/ticket/11861): [WebKit/Blink] Fixed: Span elements created while joining adjacent elements. **Note:** This patch only covers cases when *Backspace* or *Delete* is pressed on a collapsed (empty) selection. The remaining case, with a non-empty selection, will be fixed in the next release.
-* [#10714](http://dev.ckeditor.com/ticket/10714): [iOS] Fixed: Selection and drop-downs are broken if a touch event listener is used due to a [WebKit bug](https://bugs.webkit.org/show_bug.cgi?id=128924). Thanks to [Arty Gus](https://github.com/artygus)!
-* [#11911](http://dev.ckeditor.com/ticket/11911): Fixed setting the `dir` attribute for a preloaded language in [CKEDITOR.lang](http://docs.ckeditor.com/#!/api/CKEDITOR.lang). Thanks to [Akash Mohapatra](https://github.com/akashmohapatra)!
-* [#11926](http://dev.ckeditor.com/ticket/11926): Fixed: [Code Snippet](http://ckeditor.com/addon/codesnippet) does not decode HTML entities when loading code from the `<code>` element.
-* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: Issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the `<title>` element.
-* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin dependency from the [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
-* [#11754](http://dev.ckeditor.com/ticket/11754): [Chrome] Fixed: Infinite loop when content includes not closed attributes.
-* [#11848](http://dev.ckeditor.com/ticket/11848): [IE] Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) throwing an exception when there was no selection in the editor.
-* [#11801](http://dev.ckeditor.com/ticket/11801): Fixed: Editor anchors unavailable when linking the [Enhanced Image](http://ckeditor.com/addon/image2) widget.
-* [#11626](http://dev.ckeditor.com/ticket/11626): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) sets invalid column width.
-* [#11872](http://dev.ckeditor.com/ticket/11872): Made [`element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass) chainable symmetrically to [`element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass).
-* [#11813](http://dev.ckeditor.com/ticket/11813): Fixed: Link lost while pasting a captioned image and restoring an undo snapshot ([Enhanced Image](http://ckeditor.com/addon/image2)).
-* [#11814](http://dev.ckeditor.com/ticket/11814): Fixed: _Link_ and _Unlink_ entries persistently displayed in the [Enhanced Image](http://ckeditor.com/addon/image2) context menu.
-* [#11839](http://dev.ckeditor.com/ticket/11839): [IE9] Fixed: The caret jumps out of the editable area when resizing the editor in the source mode.
-* [#11822](http://dev.ckeditor.com/ticket/11822): [WebKit] Fixed: Editing anchors by double-click is broken in some cases.
-* [#11823](http://dev.ckeditor.com/ticket/11823): [IE8] Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) throws an error over scrollbar.
-* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: It is not possible to change the language back to _Not set_ in the [Code Snippet](http://ckeditor.com/addon/codesnippet) dialog window.
-* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: [Filter](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied inside elements with the `contenteditable` attribute set to `true`.
-* [#11798](http://dev.ckeditor.com/ticket/11798): Fixed: Inserting a non-editable element inside a table cell breaks the table.
-* [#11793](http://dev.ckeditor.com/ticket/11793): Fixed: Drop-down is not "on" when clicking it while the editor is blurred.
-* [#11850](http://dev.ckeditor.com/ticket/11850): Fixed: Fake objects with the `contenteditable` attribute set to `false` are not downcasted properly.
-* [#11811](http://dev.ckeditor.com/ticket/11811): Fixed: Widget's data is not encoded correctly when passed to an attribute.
-* [#11777](http://dev.ckeditor.com/ticket/11777): Fixed encoding ampersand in the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin.
-* [#11880](http://dev.ckeditor.com/ticket/11880): [IE8-9] Fixed: Linked image has a default thick border.
-
-Other Changes:
-
-* [#11807](http://dev.ckeditor.com/ticket/11807): Updated jQuery version used in the sample to 1.11.0 and tested CKEditor jQuery Adapter with version 1.11.0 and 2.1.0.
-* [#9504](http://dev.ckeditor.com/ticket/9504): Stopped using deprecated `attribute.specified` in all browsers except Internet Explorer.
-* [#11809](http://dev.ckeditor.com/ticket/11809): Changed tab size in `<pre>` to 4 spaces.
-
-## CKEditor 4.4
-
-**Important Notes:**
-
-* Marked the [`editor.beforePaste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-beforePaste) event as deprecated.
-* The default class of captioned images has changed to `image` (was: `caption`). Please note that once edited in CKEditor 4.4+, all existing images of the `caption` class (`<figure class="caption">`) will be [filtered out](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) unless the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option is set to `caption`. For backward compatibility (i.e. when upgrading), it is highly recommended to use this setting, which also helps prevent CSS conflicts, etc. This does not apply to new CKEditor integrations.
-* Widgets without defined buttons are no longer registered automatically to the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter). Before CKEditor 4.4 widgets were registered to the ACF which was an incorrect behavior ([#11567](http://dev.ckeditor.com/ticket/11567)). This change should not have any impact on standard scenarios, but if your button does not execute the widget command, you need to set [`allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-allowedContent) and [`requiredContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-requiredContent) properties for it manually, because the editor will not be able to find them.
-* The [Show Borders](http://ckeditor.com/addon/showborders) plugin was added to the Standard installation package in order to ensure that unstyled tables are still visible for the user ([#11665](http://dev.ckeditor.com/ticket/11665)).
-* Since CKEditor 4.4 the editor instance should be passed to [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) methods to ensure full compatibility with other features (e.g. applying styles to widgets requires that). We ensured backward compatibility though, so the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) will work even when the editor instance is not provided.
-
-New Features:
-
-* [#11297](http://dev.ckeditor.com/ticket/11297): Styles can now be applied to widgets. The definition of a style which can be applied to a specific widget must contain two additional properties &mdash; `type` and `widget`. Read more in the [Widget Styles](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles) section of the "Syles Drop-down" guide. Note that by default, widgets support only classes and no other attributes or styles. Related changes and features:
-  * Introduced the [`CKEDITOR.style.addCustomHandler()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-static-method-addCustomHandler) method for registering custom style handlers.
-  * The [`CKEDITOR.style.apply()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-apply) and [`CKEDITOR.style.remove()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-remove) methods are now called with an editor instance instead of the document so they can be reused by the [`CKEDITOR.editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) and [`CKEDITOR.editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) methods. Backward compatibility was preserved, but from CKEditor 4.4 it is highly recommended to pass an editor instead of a document to these methods.
-  * Many new methods and properties were introduced in the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) to make the handling of styles by widgets fully customizable. See: [`widget.definition.styleableElements`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleableElements), [`widget.definition.styleToAllowedContentRule`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleToAllowedContentRules), [`widget.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-addClass), [`widget.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeClass), [`widget.getClasses()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-getClasses), [`widget.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-hasClass), [`widget.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-applyStyle), [`widget.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeStyle), [`widget.checkStyleActive()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-checkStyleActive).
-  * Integration with the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) required an introduction of the [`CKEDITOR.style.toAllowedContent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-toAllowedContentRules) method which can be implemented by the custom style handler and if exists, it is used by the [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) to translate a style to [allowed content rules](http://docs.ckeditor.com/#!/api/CKEDITOR.filter.allowedContentRules).
-* [#11300](http://dev.ckeditor.com/ticket/11300): Various changes in the [Enhanced Image](http://ckeditor.com/addon/image2) plugin:
-  * Introduced the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option to configure the class of captioned images.
-  * Introduced the [`config.image2_alignClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_alignClasses) option to configure the way images are aligned with CSS classes.
-  If this setting is defined, the editor produces classes instead of inline styles for aligned images.
-  * Default image caption can be translated (customized) with the `editor.lang.image2.captionPlaceholder` string.
-* [#11341](http://dev.ckeditor.com/ticket/11341): [Enhanced Image](http://ckeditor.com/addon/image2) plugin: It is now possible to add a link to any image type.
-* [#10202](http://dev.ckeditor.com/ticket/10202): Introduced wildcard support in the [Allowed Content Rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) format.
-* [#10276](http://dev.ckeditor.com/ticket/10276): Introduced blacklisting in the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
-* [#10480](http://dev.ckeditor.com/ticket/10480): Introduced code snippets with code highlighting. There are two versions available so far &mdash; the default [Code Snippet](http://ckeditor.com/addon/codesnippet) which uses the [highlight.js](http://highlightjs.org) library and the [Code Snippet GeSHi](http://ckeditor.com/addon/codesnippetgeshi) which uses the [GeSHi](http://qbnz.com/highlighter/) library.
-* [#11737](http://dev.ckeditor.com/ticket/11737): Introduced an option to prevent [filtering](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) of an element that matches custom criteria (see [`filter.addElementCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-method-addElementCallback)).
-* [#11532](http://dev.ckeditor.com/ticket/11532): Introduced the [`editor.addContentsCss()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addContentsCss) method that can be used for [adding custom CSS files](http://docs.ckeditor.com/#!/guide/plugin_sdk_styles).
-* [#11536](http://dev.ckeditor.com/ticket/11536): Added the [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) method for decoding HTML entities.
-* [#11225](http://dev.ckeditor.com/ticket/11225): Introduced the [`CKEDITOR.tools.transparentImageData`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-property-transparentImageData) property which contains transparent image data to be used in CSS or as image source.
-
-Other Changes:
-
-* [#11377](http://dev.ckeditor.com/ticket/11377): Unified internal representation of empty anchors using the [fake objects](http://ckeditor.com/addon/fakeobjects).
-* [#11422](http://dev.ckeditor.com/ticket/11422): Removed Firefox 3.x, Internet Explorer 6 and Opera 12.x leftovers in code.
-* [#5217](http://dev.ckeditor.com/ticket/5217): Setting data (including switching between modes) creates a new undo snapshot. Besides that:
-  * Introduced the [`editable.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-property-status) property.
-  * Introduced a new `forceUpdate` option for the [`editor.lockSnapshot`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-lockSnapshot) event.
-  * Fixed: Selection not being unlocked in inline editor after setting data ([#11500](http://dev.ckeditor.com/ticket/11500)).
-* The [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin was updated to the latest version.
-
-Fixed Issues:
-
-* [#10190](http://dev.ckeditor.com/ticket/10190): Fixed: Removing block style with [`editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) should result in a paragraph and not a div.
-* [#11727](http://dev.ckeditor.com/ticket/11727): Fixed: The editor tries to select a non-editable image which was clicked.
-
-## CKEditor 4.3.5
-
-New Features:
-
-* Added new translation: Tatar.
-
-Fixed Issues:
-
-* [#11677](http://dev.ckeditor.com/ticket/11677): Fixed: Undo/Redo keystrokes are blocked in the source mode.
-* [#11717](http://dev.ckeditor.com/ticket/11717): [Document Properties](http://ckeditor.com/addon/docprops) plugin requires the [Color Dialog](http://ckeditor.com/addon/colordialog) plugin to work.
-
-## CKEditor 4.3.4
-
-Fixed Issues:
-
-* [#11597](http://dev.ckeditor.com/ticket/11597): [IE11] Fixed: Error thrown when trying to open the [preview](http://ckeditor.com/addon/preview) using the keyboard.
-* [#11544](http://dev.ckeditor.com/ticket/11544): [Placeholders](http://ckeditor.com/addon/placeholder) will no longer be upcasted in parents not accepting `<span>` elements.
-* [#8663](http://dev.ckeditor.com/ticket/8663): Fixed [`element.renameNode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-renameNode) not clearing the [`element.getName()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getName) cache.
-* [#11574](http://dev.ckeditor.com/ticket/11574): Fixed: *Backspace* destroying the DOM structure if an inline editable is placed in a list item.
-* [#11603](http://dev.ckeditor.com/ticket/11603): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) attaches to tables outside the editable.
-* [#9205](http://dev.ckeditor.com/ticket/9205), [#7805](http://dev.ckeditor.com/ticket/7805), [#8216](http://dev.ckeditor.com/ticket/8216): Fixed: `{cke_protected_1}` appearing in data in various cases where HTML comments are placed next to `"` or `'`.
-* [#11635](http://dev.ckeditor.com/ticket/11635): Fixed: Some attributes are not protected before the content is passed through the fix bin.
-* [#11660](http://dev.ckeditor.com/ticket/11660): [IE] Fixed: Table content is lost when some extra markup is inside the table.
-* [#11641](http://dev.ckeditor.com/ticket/11641): Fixed: Switching between modes in the classic editor removes content styles for the inline editor.
-* [#11568](http://dev.ckeditor.com/ticket/11568): Fixed: [Styles](http://ckeditor.com/addon/stylescombo) drop-down list is not enabled on selection change.
-
-## CKEditor 4.3.3
-
-Fixed Issues:
-
-* [#11500](http://dev.ckeditor.com/ticket/11500): [WebKit/Blink] Fixed: Selection lost when setting data in another inline editor. Additionally, [`selection.removeAllRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-removeAllRanges) is now scoped to selection's [root](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-property-root).
-* [#11104](http://dev.ckeditor.com/ticket/11104): [IE] Fixed: Various issues with scrolling and selection when focusing widgets.
-* [#11487](http://dev.ckeditor.com/ticket/11487): Moving mouse over the [Enhanced Image](http://ckeditor.com/addon/image2) widget will no longer change the value returned by the [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method.
-* [#8673](http://dev.ckeditor.com/ticket/8673): [WebKit] Fixed: Cannot select and remove the [Page Break](http://ckeditor.com/addon/pagebreak).
-* [#11413](http://dev.ckeditor.com/ticket/11413): Fixed: Incorrect [`editor.execCommand()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-execCommand) behavior.
-* [#11438](http://dev.ckeditor.com/ticket/11438): Splitting table cells vertically is no longer changing table structure.
-* [#8899](http://dev.ckeditor.com/ticket/8899): Fixed: Links in the [About CKEditor](http://ckeditor.com/addon/about) dialog window now open in a new browser window or tab.
-* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed: [Menu button](http://ckeditor.com/addon/menubutton) panel not showing in the source mode.
-* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not canceled anymore after editing was triggered.
-* [#11253](http://dev.ckeditor.com/ticket/11253): [IE] Fixed: Clipped upload button in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#11359](http://dev.ckeditor.com/ticket/11359): Standardized the way anchors are discovered by the [Link](http://ckeditor.com/addon/link) plugin.
-* [#11058](http://dev.ckeditor.com/ticket/11058): [IE8] Fixed: Error when deleting a table row.
-* [#11508](http://dev.ckeditor.com/ticket/11508): Fixed: [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) discovering protected attributes within other attributes' values.
-* [#11533](http://dev.ckeditor.com/ticket/11533): Widgets: Avoid recurring upcasts if the DOM structure was modified during an upcast.
-* [#11400](http://dev.ckeditor.com/ticket/11400): Fixed: The [`domObject.removeAllListeners()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.domObject-method-removeAllListeners) method does not remove custom listeners completely.
-* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed: The [`selection.getRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) method does not override cached ranges when used with the `onlyEditables` argument.
-* [#11390](http://dev.ckeditor.com/ticket/11390): [IE] All [XML](http://ckeditor.com/addon/xml) plugin [methods](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) now work in IE10+.
-* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when Right-to-Left UI language is set.
-* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When [`config.fullPage`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fullPage) is set to `true`, entities are not encoded in editor output.
-* [#11004](http://dev.ckeditor.com/ticket/11004): Integrated [Enhanced Image](http://ckeditor.com/addon/image2) dialog window with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
-* [#11439](http://dev.ckeditor.com/ticket/11439): Fixed: Properties get cloned in the Cell Properties dialog window if multiple cells are selected.
-
-## CKEditor 4.3.2
-
-Fixed Issues:
-
-* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute.
-* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements:
-  * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty.
-  * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues.
-  * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations.
-  * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization.
-* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor.
-* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements:
-  * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support.
-  * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support.
-* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe.
-* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl).
-* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables.
-* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin.
-* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted.
-* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached.
-* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable.
-* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode.
-* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace.
-* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode.
-* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar.
-* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget.
-* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library.
-* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
-* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
-* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor.
-* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin.
-* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on.
-* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8.
-* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables.
-* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs.
-* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `<div>` element with `text-align: center` and an image inside is not recognised correctly.
-* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window.
-
-## CKEditor 4.3.1
-
-**Important Notes:**
-
-* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
-* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
-
-Fixed Issues:
-
-* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
-* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
-* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
-* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
-* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
-* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
-* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
-* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
-* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
-* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
-* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
-* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
-* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
-* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
-* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
-* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
-* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
-* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
-* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
-* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
-* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
-* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
-* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
-* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `<textarea>` element are not encoded.
-* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled buttons are not read by JAWS as disabled.
-* [#11200](http://dev.ckeditor.com/ticket/11200):  Added [Clipboard](http://ckeditor.com/addon/clipboard) plugin as a dependency for [Widget](http://ckeditor.com/addon/widget) to fix drag and drop.
-
-## CKEditor 4.3
-
-New Features:
-
-* [#10612](http://dev.ckeditor.com/ticket/10612): Internet Explorer 11 support.
-* [#10869](http://dev.ckeditor.com/ticket/10869): Widgets: Added better integration with the [Elements Path](http://ckeditor.com/addon/elementspath) plugin.
-* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: Added tooltip to the drag handle.
-* [#10933](http://dev.ckeditor.com/ticket/10933): Widgets: Introduced drag and drop of block widgets with the [Line Utilities](http://ckeditor.com/addon/lineutils) plugin.
-* [#10936](http://dev.ckeditor.com/ticket/10936): Widget System changes for easier integration with other dialog systems.
-* [#10895](http://dev.ckeditor.com/ticket/10895): [Enhanced Image](http://ckeditor.com/addon/image2): Added file browser integration.
-* [#11002](http://dev.ckeditor.com/ticket/11002): Added the [`draggable`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-draggable) option to disable drag and drop support for widgets.
-* [#10937](http://dev.ckeditor.com/ticket/10937): [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget improvements:
-  * loading indicator ([#10948](http://dev.ckeditor.com/ticket/10948)),
-  * applying paragraph changes (like font color change) to iframe ([#10841](http://dev.ckeditor.com/ticket/10841)),
-  * Firefox and IE9 clipboard fixes ([#10857](http://dev.ckeditor.com/ticket/10857)),
-  * fixing same origin policy issue ([#10840](http://dev.ckeditor.com/ticket/10840)),
-  * fixing undo bugs ([#10842](http://dev.ckeditor.com/ticket/10842), [#10930](http://dev.ckeditor.com/ticket/10930)),
-  * fixing other minor bugs.
-* [#10862](http://dev.ckeditor.com/ticket/10862): [Placeholder](http://ckeditor.com/addon/placeholder) plugin was rewritten as a widget.
-* [#10822](http://dev.ckeditor.com/ticket/10822): Added styles system integration with non-editable elements (for example widgets) and their nested editables. Styles cannot change non-editable content and are applied in nested editable only if allowed by its type and content filter.
-* [#10856](http://dev.ckeditor.com/ticket/10856): Menu buttons will now toggle the visibility of their panels when clicked multiple times. [Language](http://ckeditor.com/addon/language) plugin fixes: Added active language highlighting, added an option to remove the language.
-* [#10028](http://dev.ckeditor.com/ticket/10028): New [`config.dialog_noConfirmCancel`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-dialog_noConfirmCancel) configuration option that eliminates the need to confirm closing of a dialog window when the user changed any of its fields.
-* [#10848](http://dev.ckeditor.com/ticket/10848): Integrate remaining plugins ([Styles](http://ckeditor.com/addon/stylescombo), [Format](http://ckeditor.com/addon/format), [Font](http://ckeditor.com/addon/font), [Color Button](http://ckeditor.com/addon/colorbutton), [Language](http://ckeditor.com/addon/language) and [Indent](http://ckeditor.com/addon/indent)) with [active filter](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter).
-* [#10855](http://dev.ckeditor.com/ticket/10855): Change the extension of emoticons in the [BBCode](http://ckeditor.com/addon/bbcode) sample from GIF to PNG.
-
-Fixed Issues:
-
-* [#10831](http://dev.ckeditor.com/ticket/10831): [Enhanced Image](http://ckeditor.com/addon/image2): Merged `image2inline` and `image2block` into one `image2` widget.
-* [#10835](http://dev.ckeditor.com/ticket/10835): [Enhanced Image](http://ckeditor.com/addon/image2): Improved visibility of the resize handle.
-* [#10836](http://dev.ckeditor.com/ticket/10836): [Enhanced Image](http://ckeditor.com/addon/image2): Preserve custom mouse cursor while resizing the image.
-* [#10939](http://dev.ckeditor.com/ticket/10939): [Firefox] [Enhanced Image](http://ckeditor.com/addon/image2): hovering the image causes it to change.
-* [#10866](http://dev.ckeditor.com/ticket/10866): Fixed: Broken *Tab* key navigation in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#10833](http://dev.ckeditor.com/ticket/10833): Fixed: *Lock ratio* option should be on by default in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#10881](http://dev.ckeditor.com/ticket/10881): Various improvements to *Enter* key behavior in nested editables.
-* [#10879](http://dev.ckeditor.com/ticket/10879): [Remove Format](http://ckeditor.com/addon/removeformat) should not leak from a nested editable.
-* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [WebSpellChecker](http://ckeditor.com/addon/wsc) fails to apply changes if a nested editable was focused.
-* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [SCAYT](http://ckeditor.com/addon/wsc) blocks typing in nested editables.
-* [#11079](http://dev.ckeditor.com/ticket/11079): Add button icons to the [Placeholder](http://ckeditor.com/addon/placeholder) sample.
-* [#10870](http://dev.ckeditor.com/ticket/10870): The `paste` command is no longer being disabled when the clipboard is empty.
-* [#10854](http://dev.ckeditor.com/ticket/10854): Fixed: Firefox prepends `<br>` to `<body>`, so it is stripped by the HTML data processor.
-* [#10823](http://dev.ckeditor.com/ticket/10823): Fixed: [Link](http://ckeditor.com/addon/link) plugin does not work with non-editable content.
-* [#10828](http://dev.ckeditor.com/ticket/10828): [Magic Line](http://ckeditor.com/addon/magicline) integration with the Widget System.
-* [#10865](http://dev.ckeditor.com/ticket/10865): Improved hiding copybin, so copying widgets works smoothly.
-* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts use CSS reset.
-* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed: Block commands break on widgets; added the [`contentDomInvalidated`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-contentDomInvalidated) event.
-* [#10430](http://dev.ckeditor.com/ticket/10430): Resolve dependence of the [Image](http://ckeditor.com/addon/image) plugin on the [Form Elements](http://ckeditor.com/addon/forms) plugin.
-* [#10911](http://dev.ckeditor.com/ticket/10911): Fixed: Browser *Alt* hotkeys will no longer be blocked while a widget is focused.
-* [#11082](http://dev.ckeditor.com/ticket/11082): Fixed: Selected widget is not copied or cut when using toolbar buttons or context menu.
-* [#11083](http://dev.ckeditor.com/ticket/11083): Fixed list and div element application to block widgets.
-* [#10887](http://dev.ckeditor.com/ticket/10887): Internet Explorer 8 compatibility issues related to the Widget System.
-* [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widget drag and drop, because of seriously buggy native `range#moveToPoint` method.
-* [#11098](http://dev.ckeditor.com/ticket/11098): Fixed: Wrong selection position after undoing widget drag and drop.
-* [#11110](http://dev.ckeditor.com/ticket/11110): Fixed: IFrame and Flash objects are being incorrectly pasted in certain conditions.
-* [#11129](http://dev.ckeditor.com/ticket/11129): Page break is lost when loading data.
-* [#11123](http://dev.ckeditor.com/ticket/11123): [Firefox] Widget is destroyed after being dragged outside of `<body>`.
-* [#11124](http://dev.ckeditor.com/ticket/11124): Fixed the [Elements Path](http://ckeditor.com/addon/elementspath) in an editor using the [Div Editing Area](http://ckeditor.com/addon/divarea).
-
-## CKEditor 4.3 Beta
-
-New Features:
-
-* [#9764](http://dev.ckeditor.com/ticket/9764): Widget System.
-  * [Widget plugin](http://ckeditor.com/addon/widget) introducing the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget).
-  * New [`editor.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) and [`editor.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-shiftEnterMode) properties &ndash; normalized versions of [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) and [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
-  * Dynamic editor settings. Starting from CKEditor 4.3 Beta, *Enter* mode values and [content filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) instances may be changed dynamically (for example when the caret was placed in an element in which editor features should be adjusted). When you are implementing a new editor feature, you should base its behavior on [dynamic](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) or [static](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) *Enter* mode values depending on whether this feature works in selection context or globally on editor content.
-      * Dynamic *Enter* mode values &ndash; [`editor.setActiveEnterMode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveEnterMode) method, [`editor.activeEnterModeChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeEnterModeChange) event, and two properties: [`editor.activeEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) and [`editor.activeShiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeShiftEnterMode).
-      * Dynamic content filter instances &ndash; [`editor.setActiveFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveFilter) method, [`editor.activeFilterChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeFilterChange) event, and [`editor.activeFilter`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter) property.
-  * "Fake" selection was introduced. It makes it possible to virtually select any element when the real selection remains hidden. See the  [`selection.fake()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-fake) method.
-  * Default [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied to non-editable elements (elements with `contenteditable` attribute set to `false` and their descendants) anymore. To add a rule which will be applied to all elements you need to pass an additional argument to the [`filter.addRules()`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter-method-addRules) method.
-  * Dozens of new methods were introduced &ndash; most interesting ones:
-      * [`document.find()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-find),
-      * [`document.findOne()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-findOne),
-      * [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange),
-      * [`range.moveToClosestEditablePosition()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-moveToClosestEditablePosition),
-      * New methods for [`htmlParser.node`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.node) and [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element).
-* [#10659](http://dev.ckeditor.com/ticket/10659): New [Enhanced Image](http://ckeditor.com/addon/image2) plugin that introduces a widget with integrated image captions, an option to center images, and dynamic "click and drag" resizing.
-* [#10664](http://dev.ckeditor.com/ticket/10664): New [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin that introduces the MathJax widget.
-* [#7987](https://dev.ckeditor.com/ticket/7987): New [Language](http://ckeditor.com/addon/language) plugin that implements Language toolbar button to support [WCAG 3.1.2 Language of Parts](http://www.w3.org/TR/UNDERSTANDING-WCAG20/meaning-other-lang-id.html).
-* [#10708](http://dev.ckeditor.com/ticket/10708): New [smileys](http://ckeditor.com/addon/smiley).
-
-## CKEditor 4.2.3
-
-Fixed Issues:
-
-* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: Loading external jQuery library when opening the [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) sample directly from file.
-* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening the color palette.
-* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/WebKit] Fixed: A non-breaking space is created once a character is deleted and a regular space is typed.
-* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with the keyboard shortcut for [Magic Line](http://ckeditor.com/addon/magicline).
-* [#11096](http://dev.ckeditor.com/ticket/11096): Fixed: TypeError: Object has no method 'is'.
-
-## CKEditor 4.2.2
-
-Fixed Issues:
-
-* [#9314](http://dev.ckeditor.com/ticket/9314): Fixed: Incorrect error message on closing a dialog window without saving changs.
-* [#10308](http://dev.ckeditor.com/ticket/10308): [IE10] Fixed: Unspecified error when deleting a row.
-* [#10945](http://dev.ckeditor.com/ticket/10945): [Chrome] Fixed: Clicking with a mouse inside the editor does not show the caret.
-* [#10912](http://dev.ckeditor.com/ticket/10912): Prevent default action when content of a non-editable link is clicked.
-* [#10913](http://dev.ckeditor.com/ticket/10913): Fixed [`CKEDITOR.plugins.addExternal()`](http://docs.ckeditor.com/#!/api/CKEDITOR.resourceManager-method-addExternal) not handling paths including file name specified.
-* [#10666](http://dev.ckeditor.com/ticket/10666): Fixed [`CKEDITOR.tools.isArray()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-isArray) not working cross frame.
-* [#10910](http://dev.ckeditor.com/ticket/10910): [IE9] Fixed JavaScript error thrown in Compatibility Mode when clicking and/or typing in the editing area.
-* [#10868](http://dev.ckeditor.com/ticket/10868): [IE8] Prevent the browser from crashing when applying the Inline Quotation style.
-* [#10915](http://dev.ckeditor.com/ticket/10915): Fixed: Invalid CSS filter in the Kama skin.
-* [#10914](http://dev.ckeditor.com/ticket/10914): Plugins [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock) are now included in the build configuration.
-* [#10812](http://dev.ckeditor.com/ticket/10812): Fixed [`range.createBookmark2()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-createBookmark2) incorrectly normalizing offsets. This bug was causing many issues: [#10850](http://dev.ckeditor.com/ticket/10850), [#10842](http://dev.ckeditor.com/ticket/10842).
-* [#10951](http://dev.ckeditor.com/ticket/10951): Reviewed and optimized focus handling on panels (combo, menu buttons, color buttons, and context menu) to enhance accessibility. Fixed [#10705](http://dev.ckeditor.com/ticket/10705), [#10706](http://dev.ckeditor.com/ticket/10706) and [#10707](http://dev.ckeditor.com/ticket/10707).
-* [#10704](http://dev.ckeditor.com/ticket/10704): Fixed a JAWS issue with the Select Color dialog window title not being announced.
-* [#10753](http://dev.ckeditor.com/ticket/10753): The floating toolbar in inline instances now has a dedicated accessibility label.
-
-## CKEditor 4.2.1
-
-Fixed Issues:
-
-* [#10301](http://dev.ckeditor.com/ticket/10301): [IE9-10] Undo fails after 3+ consecutive paste actions with a JavaScript error.
-* [#10689](http://dev.ckeditor.com/ticket/10689): Save toolbar button saves only the first editor instance.
-* [#10368](http://dev.ckeditor.com/ticket/10368): Move language reading direction definition (`dir`) from main language file to core.
-* [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
-* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
-* [#9958](http://dev.ckeditor.com/ticket/9958): [IE9] Pressing the "OK" button will trigger the `onbeforeunload` event in the popup dialog.
-* [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from the Styles drop-down list not registering to the ACF in case when the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
-* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with Internet Explorer 10 Quirks Mode.
-* [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
-* [#10646](http://dev.ckeditor.com/ticket/10646): Removing a selected sublist or nested table with *Backspace/Delete* removes the parent element.
-* [#10623](http://dev.ckeditor.com/ticket/10623): [WebKit] Page is scrolled when opening a drop-down list.
-* [#10004](http://dev.ckeditor.com/ticket/10004): [ChromeVox] Button names are not announced.
-* [#10731](http://dev.ckeditor.com/ticket/10731): [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin breaks cloning of editor configuration.
-* It is now possible to set per instance [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin configuration instead of setting the configuration globally.
-
-## CKEditor 4.2
-
-**Important Notes:**
-
-* Dropped compatibility support for Internet Explorer 7 and Firefox 3.6.
-
-* Both the Basic and the Standard distribution packages will not contain the new [Indent Block](http://ckeditor.com/addon/indentblock) plugin. Because of this the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) might remove block indentations from existing contents. If you want to prevent this, either [add an appropriate ACF rule to your filter](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) or create a custom build based on the Basic/Standard package and add the Indent Block plugin in [CKBuilder](http://ckeditor.com/builder).
-
-New Features:
-
-* [#10027](http://dev.ckeditor.com/ticket/10027): Separated list and block indentation into two plugins: [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock).
-* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
-* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
-* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
-* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
-* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
-* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `<textarea>` elements &mdash; introduced [`editor.required`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-required) event.
-* [#10280](http://dev.ckeditor.com/ticket/10280): Ability to replace `<textarea>` elements with the inline editor.
-
-Fixed Issues:
-
-* [#10599](http://dev.ckeditor.com/ticket/10599): [Indent](http://ckeditor.com/addon/indent) plugin is no longer required by the [List](http://ckeditor.com/addon/list) plugin.
-* [#10370](http://dev.ckeditor.com/ticket/10370): Inconsistency in data events between framed and inline editors.
-* [#10438](http://dev.ckeditor.com/ticket/10438): [FF, IE] No selection is done on an editable element on executing [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData).
-
-## CKEditor 4.1.3
-
-New Features:
-
-* Added new translation: Indonesian.
-
-Fixed Issues:
-
-* [#10644](http://dev.ckeditor.com/ticket/10644): Fixed a critical bug when pasting plain text in Blink-based browsers.
-* [#5189](http://dev.ckeditor.com/ticket/5189): [Find/Replace](http://ckeditor.com/addon/find) dialog window: rename "Cancel" button to "Close".
-* [#10562](http://dev.ckeditor.com/ticket/10562): [Housekeeping] Unified CSS gradient filter formats in the [Moono](http://ckeditor.com/addon/moono) skin.
-* [#10537](http://dev.ckeditor.com/ticket/10537): Advanced Content Filter should register a default rule for [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
-* [#10610](http://dev.ckeditor.com/ticket/10610): [`CKEDITOR.dialog.addIframe()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-static-method-addIframe) incorrectly sets the iframe size in dialog windows.
-
-## CKEditor 4.1.2
-
-New Features:
-
-* Added new translation: Sinhala.
-
-Fixed Issues:
-
-* [#10339](http://dev.ckeditor.com/ticket/10339): Fixed: Error thrown when inserted data was totally stripped out after filtering and processing.
-* [#10298](http://dev.ckeditor.com/ticket/10298): Fixed: Data processor breaks attributes containing protected parts.
-* [#10367](http://dev.ckeditor.com/ticket/10367): Fixed: [`editable.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertText) loses characters when `RegExp` replace controls are being inserted.
-* [#10165](http://dev.ckeditor.com/ticket/10165): [IE] Access denied error when `document.domain` has been altered.
-* [#9761](http://dev.ckeditor.com/ticket/9761): Update the *Backspace* key state in [`keystrokeHandler.blockedKeystrokes`](http://docs.ckeditor.com/#!/api/CKEDITOR.keystrokeHandler-property-blockedKeystrokes) when calling [`editor.setReadOnly()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly).
-* [#6504](http://dev.ckeditor.com/ticket/6504): Fixed: Race condition while loading several [`config.customConfig`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-customConfig) files.
-* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) is [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
-* [#10360](http://dev.ckeditor.com/ticket/10360): Fixed: ARIA `role="application"` should not be used for dialog windows.
-* [#10361](http://dev.ckeditor.com/ticket/10361): Fixed: ARIA `role="application"` should not be used for floating panels.
-* [#10510](http://dev.ckeditor.com/ticket/10510): Introduced unique voice labels to differentiate between different editor instances.
-* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
-* [#10389](http://dev.ckeditor.com/ticket/10389): Fixed: Invalid HTML in the "Text and Table" template.
-* [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin user interface was changed to match CKEditor 4 style.
-
-## CKEditor 4.1.1
-
-New Features:
-
-* Added new translation: Albanian.
-
-Fixed Issues:
-
-* [#10172](http://dev.ckeditor.com/ticket/10172): Pressing *Delete* or *Backspace* in an empty table cell moves the cursor to the next/previous cell.
-* [#10219](http://dev.ckeditor.com/ticket/10219): Error thrown when destroying an editor instance in parallel with a `mouseup` event.
-* [#10265](http://dev.ckeditor.com/ticket/10265): Wrong loop type in the [File Browser](http://ckeditor.com/addon/filebrowser) plugin.
-* [#10249](http://dev.ckeditor.com/ticket/10249): Wrong undo/redo states at start.
-* [#10268](http://dev.ckeditor.com/ticket/10268): [Show Blocks](http://ckeditor.com/addon/showblocks) does not recover after switching to Source view.
-* [#9995](http://dev.ckeditor.com/ticket/9995): HTML code in the `<textarea>` should not be modified by the [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor).
-* [#10320](http://dev.ckeditor.com/ticket/10320): [Justify](http://ckeditor.com/addon/justify) plugin should add elements to Advanced Content Filter based on current [Enter mode](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode).
-* [#10260](http://dev.ckeditor.com/ticket/10260): Fixed: Advanced Content Filter blocks [`tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces). Unified `data-cke-*` attributes filtering.
-* [#10315](http://dev.ckeditor.com/ticket/10315): [WebKit] [Undo manager](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager) should not record snapshots after a filling character was added/removed.
-* [#10291](http://dev.ckeditor.com/ticket/10291): [WebKit] Space after a filling character should be secured.
-* [#10330](http://dev.ckeditor.com/ticket/10330): [WebKit] The filling character is not removed on `keydown` in specific cases.
-* [#10285](http://dev.ckeditor.com/ticket/10285): Fixed: Styled text pasted from MS Word causes an infinite loop.
-* [#10131](http://dev.ckeditor.com/ticket/10131): Fixed: [`undoManager.update()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-method-update) does not refresh the command state.
-* [#10337](http://dev.ckeditor.com/ticket/10337): Fixed: Unable to remove `<s>` using [Remove Format](http://ckeditor.com/addon/removeformat).
-
-## CKEditor 4.1
-
-Fixed Issues:
-
-* [#10192](http://dev.ckeditor.com/ticket/10192): Closing lists with the *Enter* key does not work with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) in several cases.
-* [#10191](http://dev.ckeditor.com/ticket/10191): Fixed allowed content rules unification, so the [`filter.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-property-allowedContent) property always contains rules in the same format.
-* [#10224](http://dev.ckeditor.com/ticket/10224): Advanced Content Filter does not remove non-empty `<a>` elements anymore.
-* Minor issues in plugin integration with Advanced Content Filter:
-  * [#10166](http://dev.ckeditor.com/ticket/10166): Added transformation from the `align` attribute to `float` style to preserve backward compatibility after the introduction of Advanced Content Filter.
-  * [#10195](http://dev.ckeditor.com/ticket/10195): [Image](http://ckeditor.com/addon/image) plugin no longer registers rules for links to Advanced Content Filter.
-  * [#10213](http://dev.ckeditor.com/ticket/10213): [Justify](http://ckeditor.com/addon/justify) plugin is now correctly registering rules to Advanced Content Filter when [`config.justifyClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-justifyClasses) is defined.
-
-## CKEditor 4.1 RC
-
-New Features:
-
-* [#9829](http://dev.ckeditor.com/ticket/9829): Advanced Content Filter - data and features activation based on editor configuration.
-
-  Brand new data filtering system that works in 2 modes:
-
-  * Based on loaded features (toolbar items, plugins) - the data will be filtered according to what the editor in its
-  current configuration can handle.
-  * Based on [`config.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent) rules - the data
-  will be filtered and the editor features (toolbar items, commands, keystrokes) will be enabled if they are allowed.
-
-  See the `datafiltering.html` sample, [guides](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) and [`CKEDITOR.filter` API documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
-* [#9387](http://dev.ckeditor.com/ticket/9387): Reintroduced [Shared Spaces](http://ckeditor.com/addon/sharedspace) - the ability to display toolbar and bottom editor space in selected locations and to share them by different editor instances.
-* [#9907](http://dev.ckeditor.com/ticket/9907): Added the [`contentPreview`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-contentPreview) event for preview data manipulation.
-* [#9713](http://dev.ckeditor.com/ticket/9713): Introduced the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin that brings raw HTML editing for inline editor instances.
-* Included in [#9829](http://dev.ckeditor.com/ticket/9829): Introduced new events, [`toHtml`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toHtml) and [`toDataFormat`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toDataFormat), allowing for better integration with data processing.
-* [#9981](http://dev.ckeditor.com/ticket/9981): Added ability to filter [`htmlParser.fragment`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.fragment), [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element) etc. by many [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter)s before writing structure to an HTML string.
-* Included in [#10103](http://dev.ckeditor.com/ticket/10103):
-  * Introduced the [`editor.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-status) property to make it easier to check the current status of the editor.
-  * Default [`command`](http://docs.ckeditor.com/#!/api/CKEDITOR.command) state is now [`CKEDITOR.TRISTATE_DISABLE`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-TRISTATE_DISABLED). It will be activated on [`editor.instanceReady`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-instanceReady) or immediately after being added if the editor is already initialized.
-* [#9796](http://dev.ckeditor.com/ticket/9796): Introduced `<s>` as a default tag for strikethrough, which replaces obsolete `<strike>` in HTML5.
-
-## CKEditor 4.0.3
-
-Fixed Issues:
-
-* [#10196](http://dev.ckeditor.com/ticket/10196): Fixed context menus not opening with keyboard shortcuts when [Autogrow](http://ckeditor.com/addon/autogrow) is enabled.
-* [#10212](http://dev.ckeditor.com/ticket/10212): [IE7-10] Undo command throws errors after multiple switches between Source and WYSIWYG view.
-* [#10219](http://dev.ckeditor.com/ticket/10219): [Inline editor] Error thrown after calling [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy).
-
-## CKEditor 4.0.2
-
-Fixed Issues:
-
-* [#9779](http://dev.ckeditor.com/ticket/9779): Fixed overriding [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl) with `CKEDITOR_GETURL`.
-* [#9772](http://dev.ckeditor.com/ticket/9772): Custom buttons in the dialog window footer have different look and size ([Moono](http://ckeditor.com/addon/moono), [Kama](http://ckeditor.com/addon/kama) skins).
-* [#9029](http://dev.ckeditor.com/ticket/9029): Custom styles added with the [`stylesSet.add()`](http://docs.ckeditor.com/#!/api/CKEDITOR.stylesSet-method-add) are displayed in the wrong order.
-* [#9887](http://dev.ckeditor.com/ticket/9887): Disable [Magic Line](http://ckeditor.com/addon/magicline) when [`editor.readOnly`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) is set.
-* [#9882](http://dev.ckeditor.com/ticket/9882): Fixed empty document title on [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) if set via the Document Properties dialog window.
-* [#9773](http://dev.ckeditor.com/ticket/9773): Fixed rendering problems with selection fields in the Kama skin.
-* [#9851](http://dev.ckeditor.com/ticket/9851): The [`selectionChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-selectionChange) event is not fired when mouse selection ended outside editable.
-* [#9903](http://dev.ckeditor.com/ticket/9903): [Inline editor] Bad positioning of floating space with page horizontal scroll.
-* [#9872](http://dev.ckeditor.com/ticket/9872): [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) returns `true` when called onload. Removed the obsolete `editor.mayBeDirty` flag.
-* [#9893](http://dev.ckeditor.com/ticket/9893): [IE] Fixed broken toolbar when editing mixed direction content in Quirks mode.
-* [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the [Link](http://ckeditor.com/addon/link) dialog window when the Anchor option is used and no anchors are available.
-* [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with [divarea](http://ckeditor.com/addon/divarea)-based editors.
-* [#9940](http://dev.ckeditor.com/ticket/9940): [Firefox] Navigating back to a page with the editor was making the entire page editable.
-* [#9966](http://dev.ckeditor.com/ticket/9966): Fixed: Unable to type square brackets with French keyboard layout. Changed [Magic Line](http://ckeditor.com/addon/magicline) keystrokes.
-* [#9507](http://dev.ckeditor.com/ticket/9507): [Firefox] Selection is moved before editable position when the editor is focused for the first time.
-* [#9947](http://dev.ckeditor.com/ticket/9947): [WebKit] Editor overflows parent container in some edge cases.
-* [#10105](http://dev.ckeditor.com/ticket/10105): Fixed: Broken [sourcearea](http://ckeditor.com/addon/sourcearea) view when an RTL language is set.
-* [#10123](http://dev.ckeditor.com/ticket/10123): [WebKit] Fixed: Several dialog windows have broken layout since the latest WebKit release.
-* [#10152](http://dev.ckeditor.com/ticket/10152): Fixed: Invalid ARIA property used on menu items.
-
-## CKEditor 4.0.1.1
-
-Fixed Issues:
-
-* Security update: Added protection against XSS attack and possible path disclosure in the PHP sample.
-
-## CKEditor 4.0.1
-
-Fixed Issues:
-
-* [#9655](http://dev.ckeditor.com/ticket/9655): Support for IE Quirks Mode in the new [Moono skin](http://ckeditor.com/addon/moono).
-* Accessibility issues (mainly in inline editor): [#9364](http://dev.ckeditor.com/ticket/9364), [#9368](http://dev.ckeditor.com/ticket/9368), [#9369](http://dev.ckeditor.com/ticket/9369), [#9370](http://dev.ckeditor.com/ticket/9370), [#9541](http://dev.ckeditor.com/ticket/9541), [#9543](http://dev.ckeditor.com/ticket/9543), [#9841](http://dev.ckeditor.com/ticket/9841), [#9844](http://dev.ckeditor.com/ticket/9844).
-* [Magic Line](http://ckeditor.com/addon/magicline) plugin:
-    * [#9481](http://dev.ckeditor.com/ticket/9481): Added accessibility support for Magic Line.
-    * [#9509](http://dev.ckeditor.com/ticket/9509): Added Magic Line support for forms.
-    * [#9573](http://dev.ckeditor.com/ticket/9573): Magic Line does not disappear on `mouseout` in a specific case.
-* [#9754](http://dev.ckeditor.com/ticket/9754): [WebKit] Cutting & pasting simple unformatted text generates an inline wrapper in WebKit browsers.
-* [#9456](http://dev.ckeditor.com/ticket/9456): [Chrome] Properly paste bullet list style from MS Word.
-* [#9699](http://dev.ckeditor.com/ticket/9699), [#9758](http://dev.ckeditor.com/ticket/9758): Improved selection locking when selecting by dragging.
-* Context menu:
-    * [#9712](http://dev.ckeditor.com/ticket/9712): Opening the context menu destroys editor focus.
-    * [#9366](http://dev.ckeditor.com/ticket/9366): Context menu should be displayed over the floating toolbar.
-    * [#9706](http://dev.ckeditor.com/ticket/9706): Context menu generates a JavaScript error in inline mode when the editor is attached to a header element.
-* [#9800](http://dev.ckeditor.com/ticket/9800): Hide float panel when resizing the window.
-* [#9721](http://dev.ckeditor.com/ticket/9721): Padding in content of div-based editor puts the editing area under the bottom UI space.
-* [#9528](http://dev.ckeditor.com/ticket/9528): Host page `box-sizing` style should not influence the editor UI elements.
-* [#9503](http://dev.ckeditor.com/ticket/9503): [Form Elements](http://ckeditor.com/addon/forms) plugin adds context menu listeners only on supported input types. Added support for `tel`, `email`, `search` and `url` input types.
-* [#9769](http://dev.ckeditor.com/ticket/9769): Improved floating toolbar positioning in a narrow window.
-* [#9875](http://dev.ckeditor.com/ticket/9875): Table dialog window does not populate width correctly.
-* [#8675](http://dev.ckeditor.com/ticket/8675): Deleting cells in a nested table removes the outer table cell.
-* [#9815](http://dev.ckeditor.com/ticket/9815): Cannot edit dialog window fields in an editor initialized in the jQuery UI modal dialog.
-* [#8888](http://dev.ckeditor.com/ticket/8888): CKEditor dialog windows do not show completely in a small window.
-* [#9360](http://dev.ckeditor.com/ticket/9360): [Inline editor] Blocks shown for a `<div>` element stay permanently even after the user exits editing the `<div>`.
-* [#9531](http://dev.ckeditor.com/ticket/9531): [Firefox & Inline editor] Toolbar is lost when closing the Format drop-down list by clicking its button.
-* [#9553](http://dev.ckeditor.com/ticket/9553): Table width incorrectly set when the `border-width` style is specified.
-* [#9594](http://dev.ckeditor.com/ticket/9594): Cannot tab past CKEditor when it is in read-only mode.
-* [#9658](http://dev.ckeditor.com/ticket/9658): [IE9] Justify not working on selected images.
-* [#9686](http://dev.ckeditor.com/ticket/9686): Added missing contents styles for `<pre>` elements.
-* [#9709](http://dev.ckeditor.com/ticket/9709): [Paste from Word](http://ckeditor.com/addon/pastefromword) should not depend on configuration from other styles.
-* [#9726](http://dev.ckeditor.com/ticket/9726): Removed [Color Dialog](http://ckeditor.com/addon/colordialog) plugin dependency from [Table Tools](http://ckeditor.com/addon/tabletools).
-* [#9765](http://dev.ckeditor.com/ticket/9765): Toolbar Collapse command documented incorrectly in the [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp) dialog window.
-* [#9771](http://dev.ckeditor.com/ticket/9771): [WebKit & Opera] Fixed scrolling issues when pasting.
-* [#9787](http://dev.ckeditor.com/ticket/9787): [IE9] `onChange` is not fired for checkboxes in dialogs.
-* [#9842](http://dev.ckeditor.com/ticket/9842): [Firefox 17] When opening a toolbar menu for the first time and pressing the *Down Arrow* key, focus goes to the next toolbar button instead of the menu options.
-* [#9847](http://dev.ckeditor.com/ticket/9847): [Elements Path](http://ckeditor.com/addon/elementspath) should not be initialized in the inline editor.
-* [#9853](http://dev.ckeditor.com/ticket/9853): [`editor.addRemoveFormatFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addRemoveFormatFilter) is exposed before it really works.
-* [#8893](http://dev.ckeditor.com/ticket/8893): Value of the [`pasteFromWordCleanupFile`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordCleanupFile) configuration option is now taken from the instance configuration.
-* [#9693](http://dev.ckeditor.com/ticket/9693): Removed "Live Preview" checkbox from UI color picker.
-
-
-## CKEditor 4.0
-
-The first stable release of the new CKEditor 4 code line.
-
-The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
-possible. The list of relevant changes can be found in the [API Changes page of
-the CKEditor 4 documentation][1].
-
-[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes"
+CKEditor 4 Changelog
+====================
+
+## CKEditor 4.7.1
+
+New Features:
+
+* Added a new Mexican Spanish localization. Thanks to [David Alexandro Rodriguez](https://www.transifex.com/user/profile/darsco16/)!
+* [#413](https://github.com/ckeditor/ckeditor-dev/issues/413): Added Paste as Plain Text keyboard shortcut to the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) instructions.
+
+Fixed Issues:
+
+* [#515](https://github.com/ckeditor/ckeditor-dev/issues/515): [Chrome] Fixed: Mouse actions on CKEditor scrollbar throw an exception when the [Table Selection](http://ckeditor.com/addon/tableselection) plugin is loaded.
+* [#493](https://github.com/ckeditor/ckeditor-dev/issues/493): Fixed: Selection started from a nested table causes an error in the browser while scrolling down.
+* [#415](https://github.com/ckeditor/ckeditor-dev/issues/415): [Firefox] Fixed: <kbd>Enter</kbd> key breaks the table structure when pressed in a table selection.
+* [#457](https://github.com/ckeditor/ckeditor-dev/issues/457): Fixed: Error thrown when deleting content from the editor with no selection.
+* [#478](https://github.com/ckeditor/ckeditor-dev/issues/478): [Chrome] Fixed:  Error thrown by the [Enter Key](http://ckeditor.com/addon/enterkey) plugin when pressing <kbd>Enter</kbd> with no selection.
+* [#424](https://github.com/ckeditor/ckeditor-dev/issues/424): Fixed: Error thrown by [Tab Key Handling](http://ckeditor.com/addon/tab) and [Indent List](http://ckeditor.com/addon/indentlist) plugins when pressing <kbd>Tab</kbd> with no selection in inline editor.
+* [#476](https://github.com/ckeditor/ckeditor-dev/issues/476): Fixed: Anchors inserted with the [Link](http://ckeditor.com/addon/link) plugin on collapsed selection cannot be edited.
+* [#417](https://github.com/ckeditor/ckeditor-dev/issues/417): Fixed: The [Table Resize](http://ckeditor.com/addon/tableresize) plugin throws an error when used with a table with only header or footer rows.
+* [#523](https://github.com/ckeditor/ckeditor-dev/issues/523): Fixed: The [`editor.getCommandKeystroke`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getCommandKeystroke) method does not obtain the correct keystroke.
+* [#534](https://github.com/ckeditor/ckeditor-dev/issues/534): [IE] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not work in Quirks Mode.
+* [#450](https://github.com/ckeditor/ckeditor-dev/issues/450): Fixed: [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) incorrectly transforms the `margin` CSS property.
+
+## CKEditor 4.7
+
+**Important Notes:**
+
+* [#13793](http://dev.ckeditor.com/ticket/13793): The [`embed_provider`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-embed_provider) configuration option for the [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins is no longer preset by default.
+* The [UI Color](http://ckeditor.com/addon/uicolor) plugin now uses a custom color picker instead of the `YUI 2.7.0` library which has some known vulnerabilities (it's a security precaution, there was no security issue in CKEditor due to the way it was used).
+
+New Features:
+
+* [#16755](http://dev.ckeditor.com/ticket/16755): Added the [Table Selection](http://ckeditor.com/addon/tableselection) plugin that lets you select and manipulate an arbitrary rectangular table fragment (a few cells, a row or a column).
+* [#16961](http://dev.ckeditor.com/ticket/16961): Added support for pasting from Microsoft Excel.
+* [#13381](http://dev.ckeditor.com/ticket/13381): Dynamic code evaluation call in [`CKEDITOR.template`](http://docs.ckeditor.com/#!/api/CKEDITOR.template) removed. CKEditor can now be used with the `unsafe-eval` Content Security Policy. Thanks to [Caridy Patiño](http://caridy.name)!
+* [#16971](http://dev.ckeditor.com/ticket/16971): Added support for color in the `background` property containing also other styles for table cells in the [Table Tools](http://ckeditor.com/addon/tabletools) plugin.
+* [#16847](http://dev.ckeditor.com/ticket/16847): Added support for parsing and inlining any formatting created using the Microsoft Word style system to the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
+* [#16818](http://dev.ckeditor.com/ticket/16818): Added table cell height parsing in the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
+* [#16850](http://dev.ckeditor.com/ticket/16850): Added a new [`config.enableContextMenu`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enableContextMenu) configuration option for enabling and disabling the [context menu](http://ckeditor.com/addon/contextmenu).
+* [#16937](http://dev.ckeditor.com/ticket/16937): The `command` parameter in [CKEDITOR.editor.getCommandKeystroke](http://docs.ckeditor.dev/#!/api/CKEDITOR.editor-method-getCommandKeystroke) now also accepts a command name as an argument.
+* [#17010](http://dev.ckeditor.com/ticket/17010): The [`CKEDITOR.dom.range.shrink`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-shrink) method now allows for skipping bogus `<br>` elements.
+
+Fixed Issues:
+
+* [#16935](http://dev.ckeditor.com/ticket/16935): [Chrome] Fixed: Blurring the editor in [Source Mode](http://ckeditor.com/addon/sourcearea) throws an error.
+* [#16825](http://dev.ckeditor.com/ticket/16825): [Chrome] Fixed: Error thrown when destroying a focused inline editor.
+* [#16857](http://dev.ckeditor.com/ticket/16857): Fixed: <kbd>Ctrl+Shift+V</kbd> blocked by [Copy Formatting](http://ckeditor.com/addon/copyformatting).
+* [#16845](https://dev.ckeditor.com/ticket/16845): [IE] Fixed: Cursor jumps to the top of the scrolled editor after focusing it when the [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin is enabled.
+* [#16786](http://dev.ckeditor.com/ticket/16786): Fixed: Added missing translations for the [Copy Formatting](http://ckeditor.com/addon/copyformatting) plugin.
+* [#14714](http://dev.ckeditor.com/ticket/14714): [WebKit/Blink] Fixed: Exception thrown on refocusing a blurred inline editor.
+* [#16913](http://dev.ckeditor.com/ticket/16913): [Firefox, IE] Fixed: [Paste as Plain Text](http://ckeditor.com/addon/pastetext) keystroke does not work.
+* [#16968](http://dev.ckeditor.com/ticket/16968): Fixed: [Safari] [Paste as Plain Text](http://ckeditor.com/addon/pastetext) is not handled by the editor.
+* [#16912](http://dev.ckeditor.com/ticket/16912): Fixed: Exception thrown when a single image is pasted using [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#16821](http://dev.ckeditor.com/ticket/16821): Fixed: Extraneous `<span>` elements with `height` style stacked when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#16866](http://dev.ckeditor.com/ticket/16866): [IE, Edge] Fixed: Whitespaces not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#16860](http://dev.ckeditor.com/ticket/16860): Fixed: Paragraphs which only look like lists incorrectly transformed into them when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#16817](http://dev.ckeditor.com/ticket/16817): Fixed: When [pasting from Word](http://ckeditor.com/addon/pastefromword), paragraphs are transformed into lists with some corrupted data.
+* [#16833](http://dev.ckeditor.com/ticket/16833): [IE11] Fixed: Malformed list with headers [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#16826](http://dev.ckeditor.com/ticket/16826): [IE] Fixed: Superfluous paragraphs within lists [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#12465](http://dev.ckeditor.com/ticket/12465): Fixed: Cannot change the state of checkboxes or radio buttons if the properties dialog was invoked with a double-click.
+* [#13062](http://dev.ckeditor.com/ticket/13062): Fixed: Impossible to unlink when the caret is at the edge of the link.
+* [#13585](http://dev.ckeditor.com/ticket/13585): Fixed: Error when wrapping two adjacent `<div>` elements with a `<div>`.
+* [#16811](http://dev.ckeditor.com/ticket/16811): Fixed: Table alignment is not preserved by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
+* [#16810](http://dev.ckeditor.com/ticket/16810): Fixed: Vertical align in tables is not supported by the [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin.
+* [#11956](http://dev.ckeditor.com/ticket/11956): [Blink, IE] Fixed: [Link](http://ckeditor.com/addon/link) dialog does not open on a double click on the second word of the link with a background color or other styles.
+* [#10472](http://dev.ckeditor.com/ticket/10472): Fixed: Unable to use [Table Resize](http://ckeditor.com/addon/tableresize) on table header and footer.
+* [#14762](http://dev.ckeditor.com/ticket/14762): Fixed: Hovering over an empty table (without rows or cells) throws an error when the [Table Resize](http://ckeditor.com/addon/tableresize) plugin is active.
+* [#16777](https://dev.ckeditor.com/ticket/16777): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin does not allow to drop widgets into the editor.
+* [#14894](https://dev.ckeditor.com/ticket/14894): [Chrome] Fixed: The editor scrolls to the top after focusing or when a dialog is opened.
+* [#14769](https://dev.ckeditor.com/ticket/14769): Fixed: URLs with '-' in host are not detected by the [Auto Link](http://ckeditor.com/addon/autolink) plugin.
+* [#16804](https://dev.ckeditor.com/ticket/16804): Fixed: Focus is not on the first menu item when the user opens a context menu or a drop-down list from the editor toolbar.
+* [#14407](https://dev.ckeditor.com/ticket/14407): [IE] Fixed: Non-editable widgets can be edited.
+* [#16927](https://dev.ckeditor.com/ticket/16927): Fixed: An error thrown if a bundle containing the [Color Button](http://ckeditor.com/addon/colorbutton) plugin is run in ES5 strict mode. Thanks to [Igor Rubinovich](https://github.com/IgorRubinovich)!
+* [#16920](http://dev.ckeditor.com/ticket/16920): Fixed: Several plugins not using the [Dialog](http://ckeditor.com/addon/dialog) plugin as a direct dependency.
+* [PR#336](https://github.com/ckeditor/ckeditor-dev/pull/336): Fixed: Typo in [`CKEDITOR.getCss`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getCss) API documentation. Thanks to [knusperpixel](https://github.com/knusperpixel)!
+* [#17027](http://dev.ckeditor.com/ticket/17027): Fixed: Command event data should be initialized as an empty object.
+* Fixed the behavior of HTML parser when parsing `src`/`srcdoc` attributes of the `<iframe>` element in a CKEditor setup with ACF turned off and without the [Iframe Dialog](http://ckeditor.com/addon/iframe) plugin. The issue was originally reported as a security issue by [Sriramk21](https://twitter.com/sriramk21) from Pegasystems and was later downgraded by the security team into a normal issue due to the requirement of having ACF turned off. Disabling [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) is against [security best practices](http://docs.ckeditor.com/#!/guide/dev_best_practices-section-security), so the problem described above has not been considered a security issue as such.
+
+Other Changes:
+
+* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
+	* Fixed: DOM Exception after clicking "Remove Language" on a selected word with enabled [Language](http://ckeditor.com/addon/language) plugin in SCAYT.
+* [#16958](http://dev.ckeditor.com/ticket/16958): Switched the default MathJax CDN provider for the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin from `cdn.mathjax.org` to [cdnjs](https://cdnjs.com/), due to closing of `cdn.mathjax.org` scheduled for April 30, 2017.
+* [#16954](http://dev.ckeditor.com/ticket/16954): Removed the paste dialog.
+* [#16982](http://dev.ckeditor.com/ticket/16982): Latest Safari now supports enhanced Clipboard API introduced in CKEditor 4.5.0.
+* [#17025](http://dev.ckeditor.com/ticket/17025): Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.4.2.
+
+## CKEditor 4.6.2
+
+New Features:
+
+* [#16733](http://dev.ckeditor.com/ticket/16733): Added a new pastel color palette for the [Color Button](http://ckeditor.com/addon/colorbutton) plugin and a new [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) configuration option for setting the number of rows in the color selector.
+* [#16752](http://dev.ckeditor.com/ticket/16752): Added a new Azerbaijani localization. Thanks to the [Azerbaijani language team](https://www.transifex.com/ckeditor/teams/11143/az/)!
+* [#13818](http://dev.ckeditor.com/ticket/13818): It is now possible to group [Widget](http://ckeditor.com/addon/widget) [style definitions](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles), so applying one style disables the other.
+
+Fixed Issues:
+
+* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
+* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
+* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#16682](http://dev.ckeditor.com/ticket/16682): [Edge] Fixed: A list gets [pasted from Word](http://ckeditor.com/addon/pastefromword) as a set of paragraphs. Added the [`config.pasteFromWord_heuristicsEdgeList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWord_heuristicsEdgeList) configuration option.
+* [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.
+* [#16728](http://dev.ckeditor.com/ticket/16728): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Quirks Mode.
+* [#16795](http://dev.ckeditor.com/ticket/16795): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Compatibility Mode.
+* [#16675](http://dev.ckeditor.com/ticket/16675): Fixed: Styles applied with [Copy Formatting](http://ckeditor.com/addon/copyformatting) to a single table cell are applied to the whole table.
+* [#16753](http://dev.ckeditor.com/ticket/16753): Fixed: [`element.setSize`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setSize) sets incorrect editor dimensions if the border width is represented as a fraction of pixels.
+* [#16705](http://dev.ckeditor.com/ticket/16705): [Firefox] Fixed: Unable to paste images as Base64 strings when using [Clipboard](http://ckeditor.com/addon/clipboard).
+* [#14869](http://dev.ckeditor.com/ticket/14869): Fixed: JavaScript error is thrown when trying to use [Find](http://ckeditor.com/addon/find) in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
+
+## CKEditor 4.6.1
+
+New Features:
+
+* [#16639](http://dev.ckeditor.com/ticket/16639): The `callback` parameter in the [CKEDITOR.ajax.post](http://docs.ckeditor.com/#!/api/CKEDITOR.ajax-method-post) method became optional.
+
+Fixed Issues:
+
+* [#11064](http://dev.ckeditor.com/ticket/11064): [Blink, WebKit] Fixed: Cannot select all editor content when a widget or a non-editable element is the first or last element of the content. Also fixes this issue in the [Select All](http://ckeditor.com/addon/selectall) plugin.
+* [#14755](http://dev.ckeditor.com/ticket/14755): [Blink, WebKit, IE8] Fixed: Browser hangs when a table is inserted in the place of a selected list with an empty last item.
+* [#16624](http://dev.ckeditor.com/ticket/16624): Fixed: Improved the [Color Button](http://ckeditor.com/addon/colorbutton) plugin which will now normalize the CSS `background` property if it only contains a color value. This fixes missing background colors when using [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#16600](http://dev.ckeditor.com/ticket/16600): [Blink, WebKit] Fixed: Error thrown occasionally by an uninitialized editable for multiple CKEditor instances on the same page.
+
+## CKEditor 4.6
+
+New Features:
+
+* [#14569](http://dev.ckeditor.com/ticket/14569): Added a new, flat, default CKEditor skin called [Moono-Lisa](http://ckeditor.com/addon/moono-lisa). Refreshed default colors available in the [Color Button](http://ckeditor.com/addon/colorbutton) plugin ([Text Color and Background Color](http://docs.ckeditor.com/#!/guide/dev_colorbutton) feature).
+* [#14707](http://dev.ckeditor.com/ticket/14707): Added a new [Copy Formatting](http://ckeditor.com/addon/copyformatting) feature to enable easy copying of styles between your document parts.
+* Introduced the completely rewritten [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin:
+	* Backward incompatibility: The [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) option now defaults to `false`. This option will be deprecated in the future. Use [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) to replicate the effect of setting it to `true`.
+	* Backward incompatibility: The [`config.pasteFromWordNumberedHeadingToList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordNumberedHeadingToList) and [`config.pasteFromWordRemoveStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveStyles) options were dropped and no longer have any effect on pasted content.
+	* Major improvements in preservation of list numbering, styling and indentation (nested lists with multiple levels).
+	* Major improvements in document structure parsing that fix plenty of issues with distorted or missing content after paste.
+* Added new translation: Occitan. Thanks to [Cédric Valmary](https://totenoc.eu/)!
+* [#10015](http://dev.ckeditor.com/ticket/10015): Keyboard shortcuts (relevant to the operating system in use) will now be displayed in tooltips and context menus.
+* [#13794](http://dev.ckeditor.com/ticket/13794): The [Upload Image](http://ckeditor.com/addon/uploadimage) feature now uses `uploaded.width/height` if set.
+* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin that lets you upload a file by drag&amp;dropping it into the editor content.
+* [#14449](http://dev.ckeditor.com/ticket/14449): Introduced the [Balloon Panel](http://ckeditor.com/addon/balloonpanel) plugin that lets you create stylish floating UI elements for the editor.
+* [#12077](https://dev.ckeditor.com/ticket/12077): Added support for the HTML5 `download` attribute in link (`<a>`) elements. Selecting the "Force Download" checkbox in the [Link](http://ckeditor.com/addon/link) dialog will cause the linked file to be downloaded automatically. Thanks to [sbusse](https://github.com/sbusse)!
+* [#13518](http://dev.ckeditor.com/ticket/13518): Introduced the [`additionalRequestParameters`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition-property-additionalRequestParameters) property for file uploads to make it possible to send additional information about the uploaded file to the server.
+* [#14889](http://dev.ckeditor.com/ticket/14889): Added the [`config.image2_altRequired`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_altRequired) option for the [Enhanced Image](http://ckeditor.com/addon/image2) plugin to allow making alternative text a mandatory field. Thanks to [Andrey Fedoseev](https://github.com/andreyfedoseev)!
+
+Fixed Issues:
+
+* [#9991](http://dev.ckeditor.com/ticket/9991): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) should only normalize input data.
+* [#7209](http://dev.ckeditor.com/ticket/7209): Fixed: Lists with 3 levels not [pasted from Word](http://ckeditor.com/addon/pastefromword) correctly.
+* [#14335](http://dev.ckeditor.com/ticket/14335): Fixed: Pasting a numbered list starting with a value different from "1" from Microsoft Word does not work correctly.
+* [#14542](http://dev.ckeditor.com/ticket/14542): Fixed: Copying a numbered list from Microsoft Word does not preserve list formatting.
+* [#14544](http://dev.ckeditor.com/ticket/14544): Fixed: Copying a nested list from Microsoft Word results in an empty list.
+* [#14660](http://dev.ckeditor.com/ticket/14660): Fixed: [Pasting text from  Word](http://ckeditor.com/addon/pastefromword) breaks the styling in some cases.
+* [#14867](http://dev.ckeditor.com/ticket/14867): [Firefox] Fixed: Text gets stripped when [pasting content from Word](http://ckeditor.com/addon/pastefromword).
+* [#2507](http://dev.ckeditor.com/ticket/2507): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not detect pasting a part of a paragraph.
+* [#3336](http://dev.ckeditor.com/ticket/3336): Fixed: Extra blank row added on top of the content [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#6115](http://dev.ckeditor.com/ticket/6115): Fixed: When Right-to-Left text direction is applied to a table [pasted from Word](http://ckeditor.com/addon/pastefromword), borders are missing on one side.
+* [#6342](http://dev.ckeditor.com/ticket/6342): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filters out a basic text style when it is [configured to use attributes](http://docs.ckeditor.com/#!/guide/dev_basicstyles-section-custom-basic-text-style-definition).
+* [#6457](http://dev.ckeditor.com/ticket/6457): [IE] Fixed: [Pasting from Word](http://ckeditor.com/addon/pastefromword) is extremely slow.
+* [#6789](http://dev.ckeditor.com/ticket/6789): Fixed: The `mso-list: ignore` style is not handled properly when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7262](http://dev.ckeditor.com/ticket/7262): Fixed: Lists in preformatted body disappear when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7662](http://dev.ckeditor.com/ticket/7662): [Opera] Fixed: Extra empty number/bullet shown in the editor body when editing a multi-level list [pasted from Word](http://ckeditor.com/addon/pastefromword).
+* [#7807](http://dev.ckeditor.com/ticket/7807): Fixed: Last item in a list not converted to a `<li>` element after [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#7950](http://dev.ckeditor.com/ticket/7950): [IE] Fixed: Content [from Word pasted](http://ckeditor.com/addon/pastefromword) differently than in other browsers.
+* [#7982](http://dev.ckeditor.com/ticket/7982): Fixed: Multi-level lists get split into smaller ones when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#8231](http://dev.ckeditor.com/ticket/8231): [WebKit, Opera] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts empty paragraphs.
+* [#8266](http://dev.ckeditor.com/ticket/8266): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts a blank line at the top.
+* [#8341](http://dev.ckeditor.com/ticket/8341), [#7646](http://dev.ckeditor.com/ticket/7646): Fixed: Faulty removal of empty `<span>` elements in [Paste from Word](http://ckeditor.com/addon/pastefromword) content cleanup breaking content formatting.
+* [#8754](http://dev.ckeditor.com/ticket/8754): [Firefox] Fixed: Incorrect pasting of multiple nested lists in [Paste from Word](http://ckeditor.com/addon/pastefromword).
+* [#8983](http://dev.ckeditor.com/ticket/8983): Fixed: Alignment lost when [pasting from Word](http://ckeditor.com/addon/pastefromword) with [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) set to [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
+* [#9331](http://dev.ckeditor.com/ticket/9331): [IE] Fixed: [Pasting text from Word](http://ckeditor.com/addon/pastefromword) creates a simple Caesar cipher.
+* [#9422](http://dev.ckeditor.com/ticket/9422): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) leaves an unwanted `color:windowtext` style.
+* [#10011](http://dev.ckeditor.com/ticket/10011): [IE9-10] Fixed: [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) is ignored under certain conditions.
+* [#10643](http://dev.ckeditor.com/ticket/10643): Fixed: Differences between using <kbd>Ctrl+V</kbd> and pasting from the [Paste from Word](http://ckeditor.com/addon/pastefromword) dialog.
+* [#10784](http://dev.ckeditor.com/ticket/10784): Fixed: Lines missing when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#11294](http://dev.ckeditor.com/ticket/11294): [IE10] Fixed: Font size is not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#11627](http://dev.ckeditor.com/ticket/11627): Fixed: Missing words when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#12784](http://dev.ckeditor.com/ticket/12784): Fixed: Bulleted list with custom bullets gets changed to a numbered list when [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#13174](http://dev.ckeditor.com/ticket/13174): Fixed: Data loss after [pasting from Word](http://ckeditor.com/addon/pastefromword).
+* [#13828](http://dev.ckeditor.com/ticket/13828): Fixed: Widget classes should be added to the wrapper rather than the widget element.
+* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper to identify the widget type.
+* [#13519](http://dev.ckeditor.com/ticket/13519): Server response received when uploading files should be more flexible.
+
+Other Changes:
+
+* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
+ 	* Support for the new default Moono-Lisa skin.
+ 	* [#121](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/121): Fixed: [Basic Styles](http://ckeditor.com/addon/basicstyles) do not work when SCAYT is enabled.
+ 	* [#125](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/125): Fixed: Inline styles are not continued when writing multiple lines of styled text with SCAYT enabled.
+ 	* [#127](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/127): Fixed: Uncaught TypeError after enabling SCAYT in the CKEditor `<div>` element.
+ 	* [#128](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/128): Fixed: Error thrown after enabling SCAYT caused by conflicts with RequireJS.
+
+## CKEditor 4.5.11
+
+**Security Updates:**
+
+* [Severity: minor] Fixed the `target="_blank"` vulnerability reported by James Gaskell.
+
+	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
+
+  An upgrade is recommended.
+
+New Features:
+
+* [#14747](http://dev.ckeditor.com/ticket/14747): The [Enhanced Image](http://ckeditor.com/addon/image2) caption now supports the link `target` attribute.
+* [#7154](http://dev.ckeditor.com/ticket/7154): Added support for the "Display Text" field to the [Link](http://ckeditor.com/addon/link) dialog. Thanks to [Ryan Guill](https://github.com/ryanguill)!
+
+Fixed Issues:
+
+* [#13362](http://dev.ckeditor.com/ticket/13362): [Blink, WebKit] Fixed: Active widget element is not cached when it is losing focus and it is inside an editable element.
+* [#13755](http://dev.ckeditor.com/ticket/13755): [Edge] Fixed: Pasting images does not work.
+* [#13548](http://dev.ckeditor.com/ticket/13548): [IE] Fixed: Clicking the [elements path](http://ckeditor.com/addon/elementspath) disables Cut and Copy icons.
+* [#13812](http://dev.ckeditor.com/ticket/13812): Fixed: When aborting file upload the placeholder for image is left.
+* [#14659](http://dev.ckeditor.com/ticket/14659): [Blink] Fixed: Content scrolled to the top after closing the dialog in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
+* [#14825](http://dev.ckeditor.com/ticket/14825): [Edge] Fixed: Focusing the editor causes unwanted scrolling due to dropped support for the `setActive` method.
+
+## CKEditor 4.5.10
+
+Fixed Issues:
+
+* [#10750](http://dev.ckeditor.com/ticket/10750): Fixed: The editor does not escape the `font-style` family property correctly, removing quotes and whitespace from font names.
+* [#14413](http://dev.ckeditor.com/ticket/14413): Fixed: The [Auto Grow](http://ckeditor.com/addon/autogrow) plugin with the [`config.autoGrow_onStartup`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoGrow_onStartup) option set to `true` does not work properly for an editor that is not visible.
+* [#14451](http://dev.ckeditor.com/ticket/14451): Fixed: Numeric element ID not escaped properly. Thanks to [Jakub Chalupa](https://github.com/chaluja7)!
+* [#14590](http://dev.ckeditor.com/ticket/14590): Fixed: Additional line break appearing after inline elements when switching modes. Thanks to [dpidcock](https://github.com/dpidcock)!
+* [#14539](https://dev.ckeditor.com/ticket/14539): Fixed: JAWS reads "selected Blank" instead of "selected <widget name>" when selecting a widget.
+* [#14701](http://dev.ckeditor.com/ticket/14701): Fixed: More precise labels for [Enhanced Image](http://ckeditor.com/addon/image2) and [Placeholder](http://ckeditor.com/addon/placeholder) widgets.
+* [#14667](http://dev.ckeditor.com/ticket/14667): [IE] Fixed: Removing background color from selected text removes background color from the whole paragraph.
+* [#14252](http://dev.ckeditor.com/ticket/14252): [IE] Fixed: Styles drop-down list does not always reflect the current style of the text line.
+* [#14275](http://dev.ckeditor.com/ticket/14275): [IE9+] Fixed: `onerror` and `onload` events are not used in browsers it could have been used when loading scripts dynamically.
+
+## CKEditor 4.5.9
+
+Fixed Issues:
+
+* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets).
+* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances.
+* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `<body>` element and the `height` style for the `<html>` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin.
+* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `<iframe>` element.
+* [#14602](http://dev.ckeditor.com/ticket/14602): Fixed: The [`dom.element.removeAttribute()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeAttribute) method does not remove all attributes if no parameter is given.
+* [#8679](http://dev.ckeditor.com/ticket/8679): Fixed: Better focus indication and ability to style the selected color in the [color picker dialog](http://ckeditor.com/addon/colordialog).
+* [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
+* [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
+* [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
+
+## CKEditor 4.5.8
+
+New Features:
+
+* [#12440](http://dev.ckeditor.com/ticket/12440): Added the [`config.colorButton_enableAutomatic`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_enableAutomatic) option to allow hiding the "Automatic" option in the [color picker](http://ckeditor.com/addon/colorbutton).
+
+Fixed Issues:
+
+* [#10448](http://dev.ckeditor.com/ticket/10448): Fixed: Lack of scrollbar in the [right-to-left text direction](http://ckeditor.com/addon/bidi).
+* [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not comply with the HTML specification.
+* [#13756](http://dev.ckeditor.com/ticket/13756): [Edge] Fixed: Context menus are cut-off.
+
+## CKEditor 4.5.7
+
+New Features:
+
+* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization. Thanks to [Miro Grenda](https://twitter.com/mirogrenda)!
+
+Fixed Issues:
+
+* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
+	* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
+	* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
+	* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
+	* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
+* [#13884](http://dev.ckeditor.com/ticket/13884): [Firefox] Fixed: Copying and pasting a table results in just the first cell being pasted.
+* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Media Embed](http://ckeditor.com/addon/embed) dialog.
+
+## CKEditor 4.5.6
+
+New Features:
+
+* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies.
+* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication.
+
+Other Changes:
+
+* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type):
+	- New features:
+		- CKEditor [Language](http://ckeditor.com/addon/language) plugin support.
+		- CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support.
+		- [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support.
+		- **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality.
+	- Fixed issues:
+		* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core.
+		* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements.
+		* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting.
+		* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page.
+		* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content.
+		* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe.
+		* SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled.
+		* Issue with pasting SCAYT markup in CKEditor.
+		* SCAYT stops working after pressing the *Cancel* button in the WSC dialog.
+
+## CKEditor 4.5.5
+
+Fixed Issues:
+
+* [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: [Link](http://ckeditor.com/addon/link) plugin alters the `target` attribute value. Thanks to [SamZiemer](https://github.com/SamZiemer)!
+* [#12189](http://dev.ckeditor.com/ticket/12189): Fixed: The [Link](http://ckeditor.com/addon/link) plugin dialog does not display the subject of email links if the subject parameter is not lowercase.
+* [#9192](http://dev.ckeditor.com/ticket/9192): Fixed: An `undefined` string is appended to an email address added with the [Link](http://ckeditor.com/addon/link) plugin if subject and email body are empty and [`config.emailProtection`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-emailProtection) is set to `encode`.
+* [#13790](https://dev.ckeditor.com/ticket/13790): Fixed: It is not possible to destroy the editor `<iframe>` after the editor was detached from DOM. Thanks to [Stefan Rijnhart](https://github.com/StefanRijnhart)!
+* [#13803](https://dev.ckeditor.com/ticket/13803): Fixed: The editor cannot be destroyed before being fully initialized. Thanks to [Cyril Fluck](https://github.com/cyril-sf)!
+* [#13867](http://dev.ckeditor.com/ticket/13867): Fixed: CKEditor does not work when the `classList` polyfill is used.
+* [#13885](http://dev.ckeditor.com/ticket/13885): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) requires the [Link](http://ckeditor.com/addon/link) plugin to link an image.
+* [#13883](http://dev.ckeditor.com/ticket/13883): Fixed: Copying a table using the context menu strips off styles.
+* [#13872](http://dev.ckeditor.com/ticket/13872): Fixed: Cutting is possible in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode.
+* [#12848](http://dev.ckeditor.com/ticket/12848): [Blink] Fixed: Opening the [Find and Replace](http://ckeditor.com/addon/find) dialog window in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode throws an exception.
+* [#13879](http://dev.ckeditor.com/ticket/13879): Fixed: It is not possible to prevent the [`editor.drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop) event.
+* [#13361](http://dev.ckeditor.com/ticket/13361): Fixed: Skin images fail when the site path includes parentheses because the `background-image` path needs single quotes around the URL value.
+* [#13771](http://dev.ckeditor.com/ticket/13771): Fixed: The `contents.css` style is not used if the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin is missing.
+* [#13782](http://dev.ckeditor.com/ticket/13782): Fixed: Unclear log messages.
+* [#13919](http://dev.ckeditor.com/ticket/13919): [Edge] Fixed: Browser window crashes when accessing the `isContentEditable` property of an `<input>` DOM element.
+
+Other Changes:
+
+* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `bender.tools.createTestsForEditors` will also receive editor bot as a second parameter.
+
+## CKEditor 4.5.4
+
+New Features:
+
+* [#13632](http://dev.ckeditor.com/ticket/13632): Introduce error logging mechanism.
+* [#13730](http://dev.ckeditor.com/ticket/13730): Switch to the new error logging mechanism.
+
+Fixed Issues:
+
+* [#9856](http://dev.ckeditor.com/ticket/9856): Fixed: Cannot use the native context menu together with the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Mark Wade](https://github.com/mark-wade)!
+* [#12733](http://dev.ckeditor.com/ticket/12733): [IE9+] Fixed: Radio button `onChange` does not work. Thanks to [Iliya Kostadinov](https://github.com/iliyakostadinov)!
+* [#13142](http://dev.ckeditor.com/ticket/13142): [Edge] Fixed: *Ctrl+A* and then *Backspace* result in an empty `<div>` element.
+* [#13599](http://dev.ckeditor.com/ticket/13599): Fixed: Cross-editor drag and drop of an inline widget results in error/artifacts.
+* [#13640](http://dev.ckeditor.com/ticket/13640): [IE] Fixed: Dropping a widget outside the `<body>` element is not handled correctly.
+* [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
+* [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow the `<h1-6>` element to be a child of the `<summary>` element.
+* [#11724](http://dev.ckeditor.com/ticket/11724): [Touch devices] Fixed: Drop-downs often hide right after opening them.
+* [#13690](http://dev.ckeditor.com/ticket/13690): Fixed: Copying content from IE to Chrome adds an extra paragraph.
+* [#13284](http://dev.ckeditor.com/ticket/13284): Fixed: Cannot drag and drop a widget if the text caret is placed just after the widget instance.
+* [#13516](http://dev.ckeditor.com/ticket/13516): Fixed: CKEditor removes empty HTML5 anchors without the `name` attribute.
+* [#13765](http://dev.ckeditor.com/ticket/13765): [Safari 9] Fixed: Problems with rendering samples.
+
+Other Changes:
+
+* [#11725](http://dev.ckeditor.com/ticket/11725): Marked [`CKEDITOR.env.mobile`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-mobile) as deprecated. The reason is that it is no longer clear what "mobile" means.
+* [#13737](http://dev.ckeditor.com/ticket/13737): Upgraded [Bender.js](https://github.com/benderjs/benderjs) to 0.4.1.
+
+## CKEditor 4.5.3
+
+New Features:
+
+* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
+* [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.
+
+Fixed Issues:
+
+* [#13590](http://dev.ckeditor.com/ticket/13590): Fixed: Various issues related to the [Paste from Word](http://ckeditor.com/addon/pastefromword) feature. Fixes also:
+  * [#11215](http://dev.ckeditor.com/ticket/11215),
+  * [#8780](http://dev.ckeditor.com/ticket/8780),
+  * [#12762](http://dev.ckeditor.com/ticket/12762).
+* [#13386](http://dev.ckeditor.com/ticket/13386): [Edge] Fixed: Issues with selecting and editing images.
+* [#13568](http://dev.ckeditor.com/ticket/13568): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method returns invalid results for entire content selection.
+* [#13453](http://dev.ckeditor.com/ticket/13453): Fixed: Drag&drop of entire editor content throws an error.
+* [#13465](http://dev.ckeditor.com/ticket/13465): Fixed: Error is thrown and the widget is lost on drag&drop if it is the only content of the editor.
+* [#13414](http://dev.ckeditor.com/ticket/13414): Fixed: Content auto paragraphing in a nested editable despite editor configuration.
+* [#13429](http://dev.ckeditor.com/ticket/13429): Fixed: Incorrect selection after content insertion by the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
+* [#13388](http://dev.ckeditor.com/ticket/13388): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) integration with [Undo](http://ckeditor.com/addon/undo) is broken.
+
+Other Changes:
+
+* [#13637](https://dev.ckeditor.com/ticket/13637): Several icons were refactored.
+* Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.3.0 and introduced the ability to run tests via HTTPs ([#13265](https://dev.ckeditor.com/ticket/13265)).
+
+## CKEditor 4.5.2
+
+Fixed Issues:
+
+* [#13609](http://dev.ckeditor.com/ticket/13609): [Edge] Fixed: The browser crashes when switching to the source mode. Thanks to [Andrew Williams and Mark Smeed](http://webxsolution.com/)!
+* [PR#201](https://github.com/ckeditor/ckeditor-dev/pull/201): Fixed: Buttons in the toolbar configurator cause form submission. Thanks to [colemanw](https://github.com/colemanw)!
+* [#13422](http://dev.ckeditor.com/ticket/13422): Fixed: A monospaced font should be used in the `<textarea>` element storing editor configuration in the toolbar configurator.
+* [#13494](http://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in the toolbar configurator if plugin requirements are not met.
+* [#13409](http://dev.ckeditor.com/ticket/13409): Fixed: List elements incorrectly merged when pressing *Backspace* or *Delete*.
+* [#13434](http://dev.ckeditor.com/ticket/13434): Fixed: Dialog state indicator broken in Right–To–Left environments.
+* [#13460](http://dev.ckeditor.com/ticket/13460): [IE8] Fixed: Copying inline widgets is broken when [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) is disabled.
+* [#13495](http://dev.ckeditor.com/ticket/13495): [Firefox, IE] Fixed: Text is not word-wrapped in the Paste dialog window.
+* [#13528](http://dev.ckeditor.com/ticket/13528): [Firefox@Windows] Fixed: Content copied from Microsoft Word and other external applications is pasted as a plain text. Removed the `CKEDITOR.plugins.clipboard.isHtmlInExternalDataTransfer` property as the check must be dynamic.
+* [#13583](http://dev.ckeditor.com/ticket/13583): Fixed: [`DataTransfer.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer-method-getData) should work consistently in all browsers and should not strip valuable content. Fixed pasting tables from Microsoft Excel on Chrome.
+* [#13468](http://dev.ckeditor.com/ticket/13468): [IE] Fixed: Binding drag&drop `dataTransfer` does not work if `text` data was set in the meantime.
+* [#13451](http://dev.ckeditor.com/ticket/13451): [IE8-9] Fixed: One drag&drop operation may affect following ones.
+* [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after a drop on editor UI.
+* [#13129](http://dev.ckeditor.com/ticket/13129) Fixed: Block widget blurred after a drop followed by an undo.
+* [#13397](http://dev.ckeditor.com/ticket/13397): Fixed: Drag&drop of a widget inside its nested widget crashes the editor.
+* [#13385](http://dev.ckeditor.com/ticket/13385): Fixed: [`editor.getSnapshot()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSnapshot) may return a non-string value.
+* [#13419](http://dev.ckeditor.com/ticket/13419): Fixed: The [Auto Link](http://ckeditor.com/addon/autolink) plugin does not encode double quotes in URLs.
+* [#13420](http://dev.ckeditor.com/ticket/13420): Fixed: The [Auto Embed](http://ckeditor.com/addon/autoembed) plugin ignores encoded characters in URL parameters.
+* [#13410](http://dev.ckeditor.com/ticket/13410): Fixed: Error thrown in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin when undoing right after pasting a link.
+* [#13566](http://dev.ckeditor.com/ticket/13566): Fixed: Suppressed notifications in the [Media Embed Base](http://ckeditor.com/addon/embedbase) plugin.
+* [#11616](http://dev.ckeditor.com/ticket/11616): [Chrome] Fixed: Resizing the editor while it is not displayed breaks the editable. Fixes also [#9160](http://dev.ckeditor.com/ticket/9160) and [#9715](http://dev.ckeditor.com/ticket/9715).
+* [#11376](http://dev.ckeditor.com/ticket/11376): [IE11] Fixed: Loss of text when pasting bulleted lists from Microsoft Word.
+* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost when opening the panel.
+* [#13387](http://dev.ckeditor.com/ticket/13387): [Edge] Fixed: "Permission denied" error thrown when loading the editor with developer tools open.
+* [#13574](http://dev.ckeditor.com/ticket/13574): [Edge] Fixed: "Permission denied" error thrown when opening editor dialog windows.
+* [#13441](http://dev.ckeditor.com/ticket/13441): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin breaks the state of [Undo](http://ckeditor.com/addon/undo) commands after a paste.
+* [#13554](http://dev.ckeditor.com/ticket/13554): [Edge] Fixed: Paste dialog's iframe does not receive focus on show.
+* [#13440](http://dev.ckeditor.com/ticket/13440): [Edge] Fixed: Unable to paste a widget.
+
+Other Changes:
+
+* [#13421](http://dev.ckeditor.com/ticket/13421): UX improvements to notifications in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
+
+## CKEditor 4.5.1
+
+Fixed Issues:
+
+* [#13486](http://dev.ckeditor.com/ticket/13486): Fixed: The [Upload Image](http://ckeditor.com/addon/uploadimage) plugin should log an error, not throw an error when upload URL is not set.
+
+## CKEditor 4.5
+
+New Features:
+
+* [#13304](http://dev.ckeditor.com/ticket/13304): Added support for passing DOM elements to [`config.sharedSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-sharedSpaces). Thanks to [Undergrounder](https://github.com/Undergrounder)!
+* [#13215](http://dev.ckeditor.com/ticket/13215): Added ability to cancel fetching a resource by the Embed plugins.
+* [#13213](http://dev.ckeditor.com/ticket/13213): Added the [`dialog#setState()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-method-setState) method and used it in the [Embed](http://ckeditor.com/addon/embed) dialog to indicate that a resource is being loaded.
+* [#13337](http://dev.ckeditor.com/ticket/13337): Added the [`repository.onWidget()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-onWidget) method &mdash; a convenient way to listen to [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) events through the [repository](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository).
+* [#13214](http://dev.ckeditor.com/ticket/13214): Added support for pasting links that convert into embeddable resources on the fly.
+
+Fixed Issues:
+
+* [#13334](http://dev.ckeditor.com/ticket/13334): Fixed: Error after nesting widgets and playing with undo/redo.
+* [#13118](http://dev.ckeditor.com/ticket/13118): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method throws an error when called in the source mode.
+* [#13158](http://dev.ckeditor.com/ticket/13158): Fixed: Error after canceling a dialog when creating a widget.
+* [#13197](http://dev.ckeditor.com/ticket/13197): Fixed: Linked inline [Enhanced Image](http://ckeditor.com/addon/image2) alignment class is not transferred to the widget wrapper.
+* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: [Semantic Embed](http://ckeditor.com/addon/embedsemantic) does not support widget classes.
+* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
+* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done, notification update should be marked as important.
+* [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the [Image](http://ckeditor.com/addon/image) dialog seems to be never used.
+* [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are moved 10px to the right.
+* [#13280](http://dev.ckeditor.com/ticket/13280): [IE8] Fixed: Undo after inline widget drag&drop throws an error.
+* [#13186](http://dev.ckeditor.com/ticket/13186): Fixed: Content dropped into a nested editable is not filtered by [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf).
+* [#13140](http://dev.ckeditor.com/ticket/13140): Fixed: Error thrown when dropping a block widget right after itself.
+* [#13176](http://dev.ckeditor.com/ticket/13176): [IE8] Fixed: Errors on drag&drop of embed widgets.
+* [#13015](http://dev.ckeditor.com/ticket/13015): Fixed: Dropping an image file on [Enhanced Image](http://ckeditor.com/addon/image2) causes a page reload.
+* [#13080](http://dev.ckeditor.com/ticket/13080): Fixed: Ugly notification shown when the response contains HTML content.
+* [#13011](http://dev.ckeditor.com/ticket/13011): [IE8] Fixed: Anchors are duplicated on drag&drop in specific locations.
+* [#13105](http://dev.ckeditor.com/ticket/13105): Fixed: Various issues related to [`CKEDITOR.tools.htmlEncode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlEncode) and [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) methods.
+* [#11976](http://dev.ckeditor.com/ticket/11976): [Chrome] Fixed: Copy&paste and drag&drop lists from Microsoft Word.
+* [#13128](http://dev.ckeditor.com/ticket/13128): Fixed: Various issues with cloning element IDs:
+  * Fixed the default behavior of [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) and [`range.extractContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-extractContents) methods which now clone IDs similarly to their native counterparts.
+  * Added `cloneId` arguments to the above methods, [`range.splitBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-splitBlock) and [`element.breakParent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-breakParent). Mind the default values and special behavior in the `extractContents()` method!
+  * Fixed issues where IDs were lost on copy&paste and drag&drop.
+* Toolbar configurators:
+  * [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
+  * [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
+  * [#13136](http://dev.ckeditor.com/ticket/13136): Fixed: Autocompleter is far too intrusive.
+  * [#13133](http://dev.ckeditor.com/ticket/13133): Fixed: Tab leaves the editor.
+  * [#13173](http://dev.ckeditor.com/ticket/13173): Fixed: [`config.removeButtons`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-removeButtons) is ignored by the advanced toolbar configurator.
+
+Other Changes:
+
+* [#13119](http://dev.ckeditor.com/ticket/13119): Improved compatibility of editor skins ([Moono](http://ckeditor.com/addon/moono) and [Kama](http://ckeditor.com/addon/kama)) with external web page style sheets.
+* Toolbar configurators:
+  * [#13147](http://dev.ckeditor.com/ticket/13147): Added buttons to the sticky toolbar.
+  * [#13207](http://dev.ckeditor.com/ticket/13207): Used modal window to display toolbar configurator help.
+* [#13316](http://dev.ckeditor.com/ticket/13316): Made [`CKEDITOR.env.isCompatible`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-isCompatible) a blacklist rather than a whitelist. More about the change in the [Browser Compatibility](http://docs.ckeditor.com/#!/guide/dev_browsers) guide.
+* [#13398](http://dev.ckeditor.com/ticket/13398): Renamed `CKEDITOR.fileTools.UploadsRepository` to [`CKEDITOR.fileTools.UploadRepository`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadRepository) and changed all related properties.
+* [#13279](http://dev.ckeditor.com/ticket/13279): Reviewed CSS vendor prefixes.
+* [#13454](http://dev.ckeditor.com/ticket/13454): Removed unused `lang.image.alertUrl` token from the [Image](http://ckeditor.com/addon/image) plugin.
+
+## CKEditor 4.5 Beta
+
+New Features:
+
+* Clipboard (copy&paste, drag&drop) and file uploading features and improvements ([#11437](http://dev.ckeditor.com/ticket/11437)).
+
+  * Major features:
+    * Support for dropping and pasting files into the editor was introduced. Through a set of new facades for native APIs it is now possible to easily intercept and process inserted files.
+    * [File upload tools](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools) were introduced in order to simplify controlling the loading, uploading and handling server response, properly handle [new upload configuration](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uploadUrl) options, etc.
+    * [Upload Image](http://ckeditor.com/addon/uploadimage) widget was introduced to upload dropped images. A base class for the [upload widget](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition) was exposed, too, to make it simple to create new types of upload widgets which can handle any type of dropped file, show the upload progress and update the content when the process is done. It also handles editing and undo/redo operations when a file is being uploaded and integrates with the [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) to show progress and success or error.
+    * All drag and drop operations were integrated with the editor. All dropped content is passed through the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event and a set of new editor events was introduced &mdash; [`dragstart`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragstart), [`drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop), [`dragend`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragend).
+    * The [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) facade was introduced to unify access to data in various types and files. [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) is now always available in the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
+    * Switched from the pastebin to using the native clipboard access whenever possible. This solved many issues related to pastebin such as unnecessary scrolling or data loss. Additionally, on copy and cut from the editor the clipboard data is set. Therefore, on paste the editor has access to clean data, undisturbed by the browsers.
+    * Drag and drop of inline and block widgets was integrated with the standard clipboard APIs. By listening to drag events you will thus be notified about widgets, too. This opens a possibility to filter pasted and dropped widgets.
+    * The [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event can have the `range` parameter so it is possible to change the paste position in the listener or paste in the not selectable position. Also the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method now accepts `range` as an additional parameter.
+    * [#11621](http://dev.ckeditor.com/ticket/11621): A configurable [paste filter](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFilter) was introduced. The filter is by default turned to `'semantic-content'` on Webkit and Blink for all pasted content coming from external sources because of the low quality of HTML that these engines put into the clipboard. Internal and cross-editor paste is safe due to the change explained in the previous point.
+
+  * Other changes and related fixes:
+    * [#12095](http://dev.ckeditor.com/ticket/12095): On drag and copy of widgets [the same method](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) is used to get selected HTML as in the normal case. Thanks to that styles applied to inline widgets are not lost.
+    * [#11219](http://dev.ckeditor.com/ticket/11219): Fixed: Dragging a [captioned image](http://ckeditor.com/addon/image2) does not fire the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
+    * [#9554](http://dev.ckeditor.com/ticket/9554): [Webkit Mac] Fixed: Editor scrolls on paste.
+    * [#9898](http://dev.ckeditor.com/ticket/9898): [Webkit&Divarea] Fixed: Pasting causes undesirable scrolling.
+    * [#11993](http://dev.ckeditor.com/ticket/11993): [Chrome] Fixed: Pasting content scrolls the document.
+    * [#12613](http://dev.ckeditor.com/ticket/12613): Show the user that they can not drop on editor UI (toolbar, bottom bar).
+    * [#12851](http://dev.ckeditor.com/ticket/12851): [Blink/Webkit] Fixed: Formatting disappears when pasting content into cells.
+    * [#12914](http://dev.ckeditor.com/ticket/12914): Fixed: Copy/Paste of table broken in `div`-based editor.
+
+  * Browser support.<br>Browser support for related features varies significantly (see http://caniuse.com/clipboard).
+    * File APIs needed to operate and file upload is not supported in Internet Explorer 9 and below.
+    * Only Chrome and Safari on Mac OS support setting custom data items in the clipboard, so currently it is possible to recognize the origin of the copied content in these browsers only. All drag and drop operations can be identified thanks to the new Data Transfer facade.
+    * No Internet Explorer browser supports the standard clipboard API which results in small glitches like where only plain text can be dropped from outside the editor. Thanks to the new Data Transfer facade, internal and cross-editor drag and drop supports the full range of data.
+    * Direct access to clipboard could only be implemented in Chrome, Safari on Mac OS, Opera and Firefox. In other browsers the pastebin must still be used.
+
+* [#12875](http://dev.ckeditor.com/ticket/12875): Samples and toolbar configuration tools.
+  * The old set of samples shipped with every CKEditor package was replaced with a shiny new single-page sample. This change concluded a long term plan which started from introducing the [CKEditor SDK](http://sdk.ckeditor.com/) and [CKEditor Functionality Overview](http://docs.ckeditor.com/#!/guide/dev_features) section in the documentation which essentially redefined the old samples.
+  * Toolbar configurators with live previews were introduced. They will be shipped with every CKEditor package and are meant to help in configuring toolbar layouts.
+
+* [#10925](http://dev.ckeditor.com/ticket/10925): The [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins were introduced. Read more about the new features in the [Embedding Content](http://docs.ckeditor.com/#!/guide/dev_media_embed) article.
+* [#10931](http://dev.ckeditor.com/ticket/10931): Added support for nesting widgets. It is now possible to insert one widget into another widget's nested editable. Note that unless nested editable's [allowed content](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable.definition-property-allowedContent) is defined precisely, starting from CKEditor 4.5 some widget buttons may become enabled. This feature is not supported in IE8. Included issues:
+  * [#12018](http://dev.ckeditor.com/ticket/12018): Fixed and reviewed: Nested widgets garbage collection.
+  * [#12024](http://dev.ckeditor.com/ticket/12024): [Firefox] Fixed: Outline is extended to the left by unpositioned drag handlers.
+  * [#12006](http://dev.ckeditor.com/ticket/12006): Fixed: Drag and drop of nested block widgets.
+  * [#12008](http://dev.ckeditor.com/ticket/12008): Fixed various cases of inserting a single non-editable element using the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method. Fixes pasting a widget with a nested editable inside another widget's nested editable.
+
+* Notification system:
+  * [#11580](http://dev.ckeditor.com/ticket/11580): Introduced the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification).
+  * [#12810](http://dev.ckeditor.com/ticket/12810): Introduced a [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) for the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification) which simplifies displaying progress of many concurrent tasks.
+* [#11636](http://dev.ckeditor.com/ticket/11636): Introduced new, UX-focused, methods for getting selected HTML and deleting it &mdash; [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) and [`editor.extractSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-extractSelectedHtml).
+* [#12416](http://dev.ckeditor.com/ticket/12416): Added the [`widget.definition.upcastPriority`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-upcastPriority) property which gives more control over widget upcasting order to the widget author.
+* [#12036](http://dev.ckeditor.com/ticket/12036): Initialize the editor in [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode when the `<textarea>` element has a `readonly` attribute.
+* [#11905](http://dev.ckeditor.com/ticket/11905): The [`resize` event](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-resize) passes the current dimensions in its data.
+* [#12126](http://dev.ckeditor.com/ticket/12126): Introduced [`config.image_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image_prefillDimensions) and [`config.image2_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_prefillDimensions) to make pre-filling `width` and `height` configurable for the [Enhanced Image](http://ckeditor.com/addon/image2).
+* [#12746](http://dev.ckeditor.com/ticket/12746): Added a new configuration option to hide the [Enhanced Image](http://ckeditor.com/addon/image2) resizer.
+* [#12150](http://dev.ckeditor.com/ticket/12150): Exposed the [`getNestedEditable()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-static-method-getNestedEditable) and `is*` [widget helper](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) functions (see the static methods).
+* [#12448](http://dev.ckeditor.com/ticket/12448): Introduced the [`editable.insertHtmlIntoRange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertHtmlIntoRange) method.
+* [#12143](http://dev.ckeditor.com/ticket/12143): Added the [`config.floatSpacePreferRight`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-floatSpacePreferRight) configuration option that switches the alignment of the floating toolbar. Thanks to [InvisibleBacon](http://github.com/InvisibleBacon)!
+* [#10986](http://dev.ckeditor.com/ticket/10986): Added support for changing dialog input and textarea text directions by using the *Shift+Alt+Home/End* keystrokes. The direction is stored in the value of the input by prepending the [`\u202A`](http://unicode.org/cldr/utility/character.jsp?a=202A) or [`\u202B`](http://unicode.org/cldr/utility/character.jsp?a=202B) marker to it. Read more in the [documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog.definition.textInput-property-bidi). Thanks to [edithkk](https://github.com/edithkk)!
+* [#12770](http://dev.ckeditor.com/ticket/12770): Added support for passing [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget)'s startup data as a widget command's argument. Thanks to [Rebrov Boris](https://github.com/zipp3r) and [Tieme van Veen](https://github.com/tiemevanveen)!
+* [#11583](http://dev.ckeditor.com/ticket/11583): Added support for the HTML5 `required` attribute in various form elements. Thanks to [Steven Busse](https://github.com/sbusse)!
+
+Changes:
+
+* [#12858](http://dev.ckeditor.com/ticket/12858): Basic [Spartan](http://blogs.windows.com/bloggingwindows/2015/03/30/introducing-project-spartan-the-new-browser-built-for-windows-10/) browser compatibility. Full compatibility will be introduced later, because at the moment Spartan is still too unstable to be used for tests and we see many changes from version to version.
+* [#12948](http://dev.ckeditor.com/ticket/12948): The [`config.mathJaxLibrary`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-mathJaxLib) option does not default to the MathJax CDN any more. It needs to be configured to enable the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin now.
+* [#13069](http://dev.ckeditor.com/ticket/13069): Fixed inconsistencies between [`editable.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) and [`editable.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) when the `range` parameter is used. Now, the `editor.insertElement()` method works on a higher level, which means that it saves undo snapshots and sets the selection after insertion. Use the [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange) method directly for the pre 4.5 behavior of `editable.insertElement()`.
+* [#12870](http://dev.ckeditor.com/ticket/12870): Use [`editor.showNotification()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-showNotification) instead of `alert()` directly whenever possible. When the [Notification plugin](http://ckeditor.com/addon/notification) is loaded, the notification system is used automatically. Otherwise, the native `alert()` is displayed.
+* [#8024](http://dev.ckeditor.com/ticket/8024): Swapped behavior of the Split Cell Vertically and Horizontally features of the [Table Tools](http://ckeditor.com/addon/tabletools) plugin to be more intuitive. Thanks to [kevinisagit](https://github.com/kevinisagit)!
+* [#10903](http://dev.ckeditor.com/ticket/10903): Performance improvements for the [`dom.element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass), [`dom.element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass) and [`dom.element.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-hasClass) methods. Note: The previous implementation allowed passing multiple classes to `addClass()` although it was only a side effect of that implementation. The new implementation does not allow this.
+* [#11856](http://dev.ckeditor.com/ticket/11856): The jQuery adapter throws a meaningful error if CKEditor or jQuery are not loaded.
+
+Fixed issues:
+
+* [#11586](http://dev.ckeditor.com/ticket/11586): Fixed: [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) should not change the DOM in order not to affect selection.
+* [#12148](http://dev.ckeditor.com/ticket/12148): Fixed: [`dom.element.getChild()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getChild) should not modify a passed array.
+* [#12503](http://dev.ckeditor.com/ticket/12503): [Blink/Webkit] Fixed: Incorrect result of Select All and *Backspace* or *Delete*.
+* [#13001](http://dev.ckeditor.com/ticket/13001): [Firefox] Fixed: The `<br />` filler is placed in the wrong position by the [`range.fixBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-fixBlock) method due to quirky Firefox behavior.
+* [#13101](http://dev.ckeditor.com/ticket/13101): [IE8] Fixed: Colons are prepended to HTML5 element names when cloning them.
+
+## CKEditor 4.4.8
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the HTML parser reported by [Dheeraj Joshi](https://twitter.com/dheerajhere) and [Prem Kumar](https://twitter.com/iAmPr3m).
+
+	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
+
+**An upgrade is highly recommended!**
+
+Fixed Issues:
+
+* [#12899](http://dev.ckeditor.com/ticket/12899): Fixed: Corrected wrong tag ending for horizontal box definition in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin. Thanks to [mizafish](https://github.com/mizafish)!
+* [#13254](http://dev.ckeditor.com/ticket/13254): Fixed: Cannot outdent block after indent when using the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Jonathan Cottrill](https://github.com/jcttrll)!
+* [#13268](http://dev.ckeditor.com/ticket/13268): Fixed: Documentation for [`CKEDITOR.dom.text`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.text) is incorrect. Thanks to [Ben Kiefer](https://github.com/benkiefer)!
+* [#12739](http://dev.ckeditor.com/ticket/12739): Fixed: Link loses inline styles when edited without the [Advanced Tab for Dialogs](http://ckeditor.com/addon/dialogadvtab) plugin. Thanks to [Віталій Крутько](https://github.com/asmforce)!
+* [#13292](http://dev.ckeditor.com/ticket/13292): Fixed: Protection pattern does not work in attribute in self-closing elements with no space before `/>`. Thanks to [Віталій Крутько](https://github.com/asmforce)!
+* [PR#192](https://github.com/ckeditor/ckeditor-dev/pull/192): Fixed: Variable name typo in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin which caused [`CKEDITOR.ui.dialog.radio`](http://docs.ckeditor.com/#!/api/CKEDITOR.ui.dialog.radio) validation to not work. Thanks to [Florian Ludwig](https://github.com/FlorianLudwig)!
+* [#13232](http://dev.ckeditor.com/ticket/13232): [Safari] Fixed: The [`element.appendText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-appendText) method does not work properly for empty elements.
+* [#13233](http://dev.ckeditor.com/ticket/13233): Fixed: [HTMLDataProcessor](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) can process `foo:href` attributes.
+* [#12796](http://dev.ckeditor.com/ticket/12796): Fixed: The [Indent List](http://ckeditor.com/addon/indentlist) plugin unwraps parent `<li>` elements. Thanks to [Andrew Stucki](https://github.com/andrewstucki)!
+* [#12885](http://dev.ckeditor.com/ticket/12885): Added missing [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) parameter documentation.
+* [#11982](http://dev.ckeditor.com/ticket/11982): Fixed: Bullet added in a wrong position after the *Enter* key is pressed in a nested list.
+* [#13027](http://dev.ckeditor.com/ticket/13027): Fixed: Keyboard navigation in dialog windows with multiple tabs not following IBM CI 162 instructions or [ARIA Authoring Practices](http://www.w3.org/TR/2013/WD-wai-aria-practices-20130307/#tabpanel).
+* [#12256](http://dev.ckeditor.com/ticket/12256): Fixed: Basic styles classes are lost when pasting from Microsoft Word if [basic styles](http://ckeditor.com/addon/basicstyles) were configured to use classes.
+* [#12729](http://dev.ckeditor.com/ticket/12729): Fixed: Incorrect structure created when merging a block into a list item on *Backspace* and *Delete*.
+* [#13031](http://dev.ckeditor.com/ticket/13031): [Firefox] Fixed: No more line breaks in source view since Firefox 36.
+* [#13131](http://dev.ckeditor.com/ticket/13131): Fixed: The [Code Snippet](http://ckeditor.com/addon/codesnippet) plugin cannot be used without the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin.
+* [#9086](http://dev.ckeditor.com/ticket/9086): Fixed: Invalid ARIA property used on paste area `<iframe>`.
+* [#13164](http://dev.ckeditor.com/ticket/13164): Fixed: Error when inserting a hidden field.
+* [#13155](http://dev.ckeditor.com/ticket/13155): Fixed: Incorrect [Line Utilities](http://ckeditor.com/addon/lineutils) positioning when `<body>` has a margin.
+* [#13351](http://dev.ckeditor.com/ticket/13351): Fixed: Link lost when editing a linked image with the Link tab disabled. This also fixed a bug when inserting an image into a fully selected link would throw an error ([#12847](https://dev.ckeditor.com/ticket/12847)).
+* [#13344](http://dev.ckeditor.com/ticket/13344): [WebKit/Blink] Fixed: It is possible to remove or change editor content in [read-only mode](http://docs.ckeditor.com/#!/guide/dev_readonly).
+
+Other Changes:
+
+* [#12844](http://dev.ckeditor.com/ticket/12844) and [#13103](http://dev.ckeditor.com/ticket/13103): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.3`.
+* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licensing issues, `truncated-mathjax/` is now removed from the `tests/` directory. Now `bender.config.mathJaxLibPath` must be configured manually in order to run [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin tests.
+* [#13266](http://dev.ckeditor.com/ticket/13266): Added more shades of gray in the [Color Dialog](http://ckeditor.com/addon/colordialog) window. Thanks to [mizafish](https://github.com/mizafish)!
+
+
+## CKEditor 4.4.7
+
+Fixed Issues:
+
+* [#12825](http://dev.ckeditor.com/ticket/12825): Fixed: Preventing the [Table Resize](http://ckeditor.com/addon/tableresize) plugin from operating on elements outside the editor. Thanks to [Paul Martin](https://github.com/Paul-Martin)!
+* [#12157](http://dev.ckeditor.com/ticket/12157): Fixed: Lost text formatting on pressing *Tab* when the [`config.tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces) configuration option value was greater than zero.
+* [#12777](http://dev.ckeditor.com/ticket/12777): Fixed: The `table-layout` CSS property should be reset by skins. Thanks to [vita10gy](https://github.com/vita10gy)!
+* [#12812](http://dev.ckeditor.com/ticket/12812): Fixed: An uncaught security exception is thrown when [Line Utilities](http://ckeditor.com/addon/lineutils) are used in an inline editor loaded in a cross-domain `iframe`. Thanks to [Vitaliy Zurian](https://github.com/thecatontheflat)!
+* [#12735](http://dev.ckeditor.com/ticket/12735): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) should only apply when outputting data.
+* [#10032](http://dev.ckeditor.com/ticket/10032): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter is executed for every paste after using the button.
+* [#12597](http://dev.ckeditor.com/ticket/12597): [Blink/WebKit] Fixed: Multi-byte Japanese characters entry not working properly after *Shift+Enter*.
+* [#12387](http://dev.ckeditor.com/ticket/12387): Fixed: An error is thrown if a skin does not have the [`chameleon`](http://docs.ckeditor.com/#!/api/CKEDITOR.skin-method-chameleon) property defined and [`config.uiColor`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uiColor) is defined.
+* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when the editor is maximized results in incorrect drop-down panel position.
+* [#12850](http://dev.ckeditor.com/ticket/12850): [IEQM] Fixed: An error is thrown after focusing the editor.
+
+## CKEditor 4.4.6
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the HTML parser reported by [Maco Cortes](https://www.facebook.com/Maaacoooo).
+
+	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
+
+**An upgrade is highly recommended!**
+
+New Features:
+
+* [#12501](http://dev.ckeditor.com/ticket/12501): Allowed dashes in element names in the [string format of allowed content rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules-section-string-format).
+* [#12550](http://dev.ckeditor.com/ticket/12550): Added the `<main>` element to the [`CKEDITOR.dtd`](http://docs.ckeditor.com/#!/api/CKEDITOR.dtd).
+
+Fixed Issues:
+
+* [#12506](http://dev.ckeditor.com/ticket/12506): [Safari] Fixed: Cannot paste into inline editor if the page has `user-select: none` style. Thanks to [shaohua](https://github.com/shaohua)!
+* [#12683](http://dev.ckeditor.com/ticket/12683): Fixed: [Filter](http://docs.ckeditor.com/#!/guide/dev_acf) fails to remove custom tags. Thanks to [timselier](https://github.com/timselier)!
+* [#12489](http://dev.ckeditor.com/ticket/12489) and [#12491](http://dev.ckeditor.com/ticket/12491): Fixed: Various issues related to restoring the selection after performing operations on filler character. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4).
+* [#12621](http://dev.ckeditor.com/ticket/12621): Fixed: Cannot remove inline styles (bold, italic, etc.) in empty lines.
+* [#12630](http://dev.ckeditor.com/ticket/12630): [Chrome] Fixed: Selection is placed outside the paragraph when the [New Page](http://ckeditor.com/addon/newpage) button is clicked. This patch significantly simplified the way how the initial selection (a selection after the content of the editable is overwritten) is being fixed. That might have fixed many related scenarios in all browsers.
+* [#11647](http://dev.ckeditor.com/ticket/11647): Fixed: The [`editor.blur`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-blur) event is not fired on first blur after initializing the inline editor on an already focused element.
+* [#12601](http://dev.ckeditor.com/ticket/12601): Fixed: [Strikethrough](http://ckeditor.com/addon/basicstyles) button tooltip spelling.
+* [#12546](http://dev.ckeditor.com/ticket/12546): Fixed: The Preview tab in the [Document Properties](http://ckeditor.com/addon/docprops) dialog window is always disabled.
+* [#12300](http://dev.ckeditor.com/ticket/12300): Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event fired on first navigation key press after typing.
+* [#12141](http://dev.ckeditor.com/ticket/12141): Fixed: List items are lost when indenting a list item with content wrapped with a block element.
+* [#12515](http://dev.ckeditor.com/ticket/12515): Fixed: Cursor is in the wrong position when undoing after adding an image and typing some text.
+* [#12484](http://dev.ckeditor.com/ticket/12484): [Blink/WebKit] Fixed: DOM is changed outside the editor area in a certain case.
+* [#12688](http://dev.ckeditor.com/ticket/12688): Improved the tests of the [styles system](http://docs.ckeditor.com/#!/api/CKEDITOR.style) and fixed two minor issues.
+* [#12403](http://dev.ckeditor.com/ticket/12403): Fixed: Changing the [font](http://ckeditor.com/addon/font) style should not lead to nesting it in the previous style element.
+* [#12609](http://dev.ckeditor.com/ticket/12609): Fixed: Incorrect `config.magicline_putEverywhere` name used for a [Magic Line](http://ckeditor.com/addon/magicline) all-encompassing [`config.magicline_everywhere`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-magicline_everywhere) configuration option.
+
+
+## CKEditor 4.4.5
+
+New Features:
+
+* [#12279](http://dev.ckeditor.com/ticket/12279): Added a possibility to pass a custom evaluator to [`node.getAscendant()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.node-method-getAscendant).
+
+Fixed Issues:
+
+* [#12423](http://dev.ckeditor.com/ticket/12423): [Safari7.1+] Fixed: *Enter* key moved cursor to a strange position.
+* [#12381](http://dev.ckeditor.com/ticket/12381): [iOS] Fixed: Selection issue. Thanks to [Remiremi](https://github.com/Remiremi)!
+* [#10804](http://dev.ckeditor.com/ticket/10804): Fixed: `CKEDITOR_GETURL` is not used with some plugins where it should be used. Thanks to [Thomas Andraschko](https://github.com/tandraschko)!
+* [#9137](http://dev.ckeditor.com/ticket/9137): Fixed: The `<base>` tag is not created when `<head>` has an attribute. Thanks to [naoki.fujikawa](https://github.com/naoki-fujikawa)!
+* [#12377](http://dev.ckeditor.com/ticket/12377): Fixed: Errors thrown in the [Image](http://ckeditor.com/addon/image) plugin when removing preview from the dialog window definition. Thanks to [Axinet](https://github.com/Axinet)!
+* [#12162](http://dev.ckeditor.com/ticket/12162): Fixed: Auto paragraphing and *Enter* key in nested editables.
+* [#12315](http://dev.ckeditor.com/ticket/12315): Fixed: Marked [`config.autoParagraph`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoParagraph) as deprecated.
+* [#12113](http://dev.ckeditor.com/ticket/12113): Fixed: A [code snippet](http://ckeditor.com/addon/codesnippet) should be presented in the [elements path](http://ckeditor.com/addon/elementspath) as "code snippet" (translatable).
+* [#12311](http://dev.ckeditor.com/ticket/12311): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) should also remove `<cite>` elements.
+* [#12261](http://dev.ckeditor.com/ticket/12261): Fixed: Filter has to be destroyed and removed from [`CKEDITOR.filter.instances`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-static-property-instances) on editor destroy.
+* [#12398](http://dev.ckeditor.com/ticket/12398): Fixed: [Maximize](http://ckeditor.com/addon/maximize) does not work on an instance without a [title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
+* [#12097](http://dev.ckeditor.com/ticket/12097): Fixed: JAWS not reading the number of options correctly in the [Text Color and Background Color](http://ckeditor.com/addon/colorbutton) button menu.
+* [#12411](http://dev.ckeditor.com/ticket/12411): Fixed: [Page Break](http://ckeditor.com/addon/pagebreak) used directly in the editable breaks the editor.
+* [#12354](http://dev.ckeditor.com/ticket/12354): Fixed: Various issues in undo manager when holding keys.
+* [#12324](http://dev.ckeditor.com/ticket/12324): [IE8] Fixed: Undo steps are not recorded when changing the caret position by clicking below the body.
+* [#12332](http://dev.ckeditor.com/ticket/12332): Fixed: Lowered DOM events listeners' priorities in undo manager in order to avoid ambiguity.
+* [#12402](http://dev.ckeditor.com/ticket/12402): [Blink] Fixed: Workaround for Blink bug with `document.title` which breaks updating title in the full HTML mode.
+* [#12338](http://dev.ckeditor.com/ticket/12338): Fixed: The CKEditor package contains unoptimized images.
+
+
+## CKEditor 4.4.4
+
+Fixed Issues:
+
+* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of [UI Color](http://ckeditor.com/addon/uicolor) YUI styles. Thanks to [CasherWest](https://github.com/CasherWest)!
+* [#12263](http://dev.ckeditor.com/ticket/12263): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter does not properly normalize semicolons style text. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
+* [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost when pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
+* [#111739](http://dev.ckeditor.com/ticket/11739): Fixed: `keypress` listeners should not be used in the undo manager. A complete rewrite of keyboard handling in the undo manager was made. Numerous smaller issues were fixed, among others:
+  * [#10926](http://dev.ckeditor.com/ticket/10926): [Chrome@Android] Fixed: Typing does not record snapshots and does not fire the [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
+  * [#11611](http://dev.ckeditor.com/ticket/11611): [Firefox] Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event is fired when pressing Arrow keys.
+  * [#12219](http://dev.ckeditor.com/ticket/12219): [Safari] Fixed: Some modifications of the [`UndoManager.locked`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-property-locked) property violate strict mode in the [Undo](http://ckeditor.com/addon/undo) plugin.
+* [#10916](http://dev.ckeditor.com/ticket/10916): Fixed: [Magic Line](http://ckeditor.com/addon/magicline) icon in Right-To-Left environments.
+* [#11970](http://dev.ckeditor.com/ticket/11970): [IE] Fixed: CKEditor `paste` event is not fired when pasting with *Shift+Ins*.
+* [#12111](http://dev.ckeditor.com/ticket/12111): Fixed: Linked image attributes are not read when opening the image dialog window by doubleclicking.
+* [#10030](http://dev.ckeditor.com/ticket/10030): [IE] Fixed: Prevented "Unspecified Error" thrown in various cases when IE8-9 does not allow access to `document.activeElement`.
+* [#12273](http://dev.ckeditor.com/ticket/12273): Fixed: Applying block style in a description list breaks it.
+* [#12218](http://dev.ckeditor.com/ticket/12218): Fixed: Minor syntax issue in CSS files.
+* [#12178](http://dev.ckeditor.com/ticket/12178): [Blink/WebKit] Fixed: Iterator does not return the block if the selection is located at the end of it.
+* [#12185](http://dev.ckeditor.com/ticket/12185): [IE9QM] Fixed: Error thrown when moving the mouse over focused editor's scrollbar.
+* [#12215](http://dev.ckeditor.com/ticket/12215): Fixed: Basepath resolution does not recognize semicolon as a query separator.
+* [#12135](http://dev.ckeditor.com/ticket/12135): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) does not work on widgets.
+* [#12298](http://dev.ckeditor.com/ticket/12298): [IE11] Fixed: Clicking below `<body>` in Compatibility Mode will no longer reset selection to the first line.
+* [#12204](http://dev.ckeditor.com/ticket/12204): Fixed: Editor's voice label is not affected by [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
+* [#11915](http://dev.ckeditor.com/ticket/11915): Fixed: With [SCAYT](http://ckeditor.com/addon/scayt) enabled, cursor moves to the beginning of the first highlighted, misspelled word after typing or pasting into the editor.
+* [SCAYT](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/69): Fixed: Error thrown in the console after enabling [SCAYT](http://ckeditor.com/addon/scayt) and trying to add a new image.
+
+
+Other Changes:
+
+* [#12296](http://dev.ckeditor.com/ticket/12296): Merged `benderjs-ckeditor` into the main CKEditor repository.
+
+## CKEditor 4.4.3
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the Preview plugin reported by Mario Heiderich of [Cure53](https://cure53.de/).
+
+**An upgrade is highly recommended!**
+
+New Features:
+
+* [#12164](http://dev.ckeditor.com/ticket/12164): Added the "Justify" option to the "Horizontal Alignment" drop-down in the Table Cell Properties dialog window.
+
+Fixed Issues:
+
+* [#12110](http://dev.ckeditor.com/ticket/12110): Fixed: Editor crash after deleting a table. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
+* [#11897](http://dev.ckeditor.com/ticket/11897): Fixed: *Enter* key used in an empty list item creates a new line instead of breaking the list. Thanks to [noam-si](https://github.com/noam-si)!
+* [#12140](http://dev.ckeditor.com/ticket/12140): Fixed: Double-clicking linked widgets opens two dialog windows.
+* [#12132](http://dev.ckeditor.com/ticket/12132): Fixed: Image is inserted with `width` and `height` styles even when they are not allowed.
+* [#9317](http://dev.ckeditor.com/ticket/9317): [IE] Fixed: [`config.disableObjectResizing`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableObjectResizing) does not work on IE. **Note**: We were not able to fix this issue on IE11+ because necessary events stopped working. See a [last resort workaround](http://dev.ckeditor.com/ticket/9317#comment:16) and make sure to [support our complaint to Microsoft](https://connect.microsoft.com/IE/feedback/details/742593/please-respect-execcommand-enableobjectresizing-in-contenteditable-elements).
+* [#9638](http://dev.ckeditor.com/ticket/9638): Fixed: There should be no information about accessibility help available under the *Alt+0* keyboard shortcut if the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) plugin is not available.
+* [#8117](http://dev.ckeditor.com/ticket/8117) and [#9186](http://dev.ckeditor.com/ticket/9186): Fixed: In HTML5 `<meta>` tags should be allowed everywhere, including inside the `<body>` element.
+* [#10422](http://dev.ckeditor.com/ticket/10422): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) not working properly if a function is specified.
+
+## CKEditor 4.4.2
+
+Important Notes:
+
+* The CKEditor testing environment is now publicly available. Read more about how to set up the environment and execute tests in the [CKEditor Testing Environment](http://docs.ckeditor.com/#!/guide/dev_tests) guide.
+	Please note that the [`tests/`](https://github.com/ckeditor/ckeditor-dev/tree/master/tests) directory which contains editor tests is not available in release packages. It can only be found in the development version of CKEditor on [GitHub](https://github.com/ckeditor/ckeditor-dev/).
+
+New Features:
+
+* [#11909](http://dev.ckeditor.com/ticket/11909): Introduced a parameter to prevent the [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) method from recording undo snapshots.
+
+Fixed Issues:
+
+* [#11757](http://dev.ckeditor.com/ticket/11757): Fixed: Imperfections in the [Moono](http://ckeditor.com/addon/moono) skin. Thanks to [danyaPostfactum](https://github.com/danyaPostfactum)!
+* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
+* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to [adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) configuration.
+* [#10867](http://dev.ckeditor.com/ticket/10867): Fixed: Issue with setting encoded URI as image link.
+* [#11983](http://dev.ckeditor.com/ticket/11983): Fixed: Clicking a nested widget does not focus it. Additionally, performance of the [`widget.repository.getByElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-getByElement) method was improved.
+* [#12000](http://dev.ckeditor.com/ticket/12000): Fixed: Nested widgets should be initialized on [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) and [`nestedEditable.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable-method-setData).
+* [#12022](http://dev.ckeditor.com/ticket/12022): Fixed: Outer widget's drag handler is not created at all if it has any nested widgets inside.
+* [#11960](http://dev.ckeditor.com/ticket/11960): [Blink/WebKit] Fixed: The caret should be scrolled into view on *Backspace* and *Delete* (covers only the merging blocks case).
+* [#11306](http://dev.ckeditor.com/ticket/11306): [OSX][Blink/WebKit] Fixed: No widget entries in the context menu on widget right-click.
+* [#11957](http://dev.ckeditor.com/ticket/11957): Fixed: Alignment labels in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window are not translated.
+* [#11980](http://dev.ckeditor.com/ticket/11980): [Blink/WebKit] Fixed: `<span>` elements created when joining adjacent elements (non-collapsed selection).
+* [#12009](http://dev.ckeditor.com/ticket/12009): [Nested widgets] Integration with the [Magic Line](http://ckeditor.com/addon/magicline) plugin.
+* [#11387](http://dev.ckeditor.com/ticket/11387): Fixed: `role="radiogroup"` should be applied only to radio inputs' container.
+* [#7975](http://dev.ckeditor.com/ticket/7975): [IE8] Fixed: Errors when trying to select an empty table cell.
+* [#11947](http://dev.ckeditor.com/ticket/11947): [Firefox+IE11] Fixed: *Shift+Enter* in lists produces two line breaks.
+* [#11972](http://dev.ckeditor.com/ticket/11972): Fixed: Feature detection in the [`element.setText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setText) method should not trigger the layout engine.
+* [#7634](http://dev.ckeditor.com/ticket/7634): Fixed: The [Flash Dialog](http://ckeditor.com/addon/flash) plugin omits the `allowFullScreen` parameter in the editor data if set to `true`.
+* [#11910](http://dev.ckeditor.com/ticket/11910): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) does not take [`config.baseHref`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-baseHref) into account when updating image dimensions.
+* [#11753](http://dev.ckeditor.com/ticket/11753): Fixed: Wrong [`checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method value after focusing or blurring a widget.
+* [#11830](http://dev.ckeditor.com/ticket/11830): Fixed: Impossible to pass some arguments to [CKBuilder](https://github.com/ckeditor/ckbuilder) when using the `/dev/builder/build.sh` script.
+* [#11945](http://dev.ckeditor.com/ticket/11945): Fixed: [Form Elements](http://ckeditor.com/addon/forms) plugin should not change a core method.
+* [#11384](http://dev.ckeditor.com/ticket/11384): [IE9+] Fixed: `IndexSizeError` thrown when pasting into a non-empty selection anchored in one text node.
+
+## CKEditor 4.4.1
+
+New Features:
+
+* [#9661](http://dev.ckeditor.com/ticket/9661): Added the option to [configure](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-linkJavaScriptLinksAllowed) anchor tags with JavaScript code in the `href` attribute.
+
+Fixed Issues:
+
+* [#11861](http://dev.ckeditor.com/ticket/11861): [WebKit/Blink] Fixed: Span elements created while joining adjacent elements. **Note:** This patch only covers cases when *Backspace* or *Delete* is pressed on a collapsed (empty) selection. The remaining case, with a non-empty selection, will be fixed in the next release.
+* [#10714](http://dev.ckeditor.com/ticket/10714): [iOS] Fixed: Selection and drop-downs are broken if a touch event listener is used due to a [WebKit bug](https://bugs.webkit.org/show_bug.cgi?id=128924). Thanks to [Arty Gus](https://github.com/artygus)!
+* [#11911](http://dev.ckeditor.com/ticket/11911): Fixed setting the `dir` attribute for a preloaded language in [CKEDITOR.lang](http://docs.ckeditor.com/#!/api/CKEDITOR.lang). Thanks to [Akash Mohapatra](https://github.com/akashmohapatra)!
+* [#11926](http://dev.ckeditor.com/ticket/11926): Fixed: [Code Snippet](http://ckeditor.com/addon/codesnippet) does not decode HTML entities when loading code from the `<code>` element.
+* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: Issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the `<title>` element.
+* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin dependency from the [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
+* [#11754](http://dev.ckeditor.com/ticket/11754): [Chrome] Fixed: Infinite loop when content includes not closed attributes.
+* [#11848](http://dev.ckeditor.com/ticket/11848): [IE] Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) throwing an exception when there was no selection in the editor.
+* [#11801](http://dev.ckeditor.com/ticket/11801): Fixed: Editor anchors unavailable when linking the [Enhanced Image](http://ckeditor.com/addon/image2) widget.
+* [#11626](http://dev.ckeditor.com/ticket/11626): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) sets invalid column width.
+* [#11872](http://dev.ckeditor.com/ticket/11872): Made [`element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass) chainable symmetrically to [`element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass).
+* [#11813](http://dev.ckeditor.com/ticket/11813): Fixed: Link lost while pasting a captioned image and restoring an undo snapshot ([Enhanced Image](http://ckeditor.com/addon/image2)).
+* [#11814](http://dev.ckeditor.com/ticket/11814): Fixed: _Link_ and _Unlink_ entries persistently displayed in the [Enhanced Image](http://ckeditor.com/addon/image2) context menu.
+* [#11839](http://dev.ckeditor.com/ticket/11839): [IE9] Fixed: The caret jumps out of the editable area when resizing the editor in the source mode.
+* [#11822](http://dev.ckeditor.com/ticket/11822): [WebKit] Fixed: Editing anchors by double-click is broken in some cases.
+* [#11823](http://dev.ckeditor.com/ticket/11823): [IE8] Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) throws an error over scrollbar.
+* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: It is not possible to change the language back to _Not set_ in the [Code Snippet](http://ckeditor.com/addon/codesnippet) dialog window.
+* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: [Filter](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied inside elements with the `contenteditable` attribute set to `true`.
+* [#11798](http://dev.ckeditor.com/ticket/11798): Fixed: Inserting a non-editable element inside a table cell breaks the table.
+* [#11793](http://dev.ckeditor.com/ticket/11793): Fixed: Drop-down is not "on" when clicking it while the editor is blurred.
+* [#11850](http://dev.ckeditor.com/ticket/11850): Fixed: Fake objects with the `contenteditable` attribute set to `false` are not downcasted properly.
+* [#11811](http://dev.ckeditor.com/ticket/11811): Fixed: Widget's data is not encoded correctly when passed to an attribute.
+* [#11777](http://dev.ckeditor.com/ticket/11777): Fixed encoding ampersand in the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin.
+* [#11880](http://dev.ckeditor.com/ticket/11880): [IE8-9] Fixed: Linked image has a default thick border.
+
+Other Changes:
+
+* [#11807](http://dev.ckeditor.com/ticket/11807): Updated jQuery version used in the sample to 1.11.0 and tested CKEditor jQuery Adapter with version 1.11.0 and 2.1.0.
+* [#9504](http://dev.ckeditor.com/ticket/9504): Stopped using deprecated `attribute.specified` in all browsers except Internet Explorer.
+* [#11809](http://dev.ckeditor.com/ticket/11809): Changed tab size in `<pre>` to 4 spaces.
+
+## CKEditor 4.4
+
+**Important Notes:**
+
+* Marked the [`editor.beforePaste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-beforePaste) event as deprecated.
+* The default class of captioned images has changed to `image` (was: `caption`). Please note that once edited in CKEditor 4.4+, all existing images of the `caption` class (`<figure class="caption">`) will be [filtered out](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) unless the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option is set to `caption`. For backward compatibility (i.e. when upgrading), it is highly recommended to use this setting, which also helps prevent CSS conflicts, etc. This does not apply to new CKEditor integrations.
+* Widgets without defined buttons are no longer registered automatically to the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter). Before CKEditor 4.4 widgets were registered to the ACF which was an incorrect behavior ([#11567](http://dev.ckeditor.com/ticket/11567)). This change should not have any impact on standard scenarios, but if your button does not execute the widget command, you need to set [`allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-allowedContent) and [`requiredContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-requiredContent) properties for it manually, because the editor will not be able to find them.
+* The [Show Borders](http://ckeditor.com/addon/showborders) plugin was added to the Standard installation package in order to ensure that unstyled tables are still visible for the user ([#11665](http://dev.ckeditor.com/ticket/11665)).
+* Since CKEditor 4.4 the editor instance should be passed to [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) methods to ensure full compatibility with other features (e.g. applying styles to widgets requires that). We ensured backward compatibility though, so the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) will work even when the editor instance is not provided.
+
+New Features:
+
+* [#11297](http://dev.ckeditor.com/ticket/11297): Styles can now be applied to widgets. The definition of a style which can be applied to a specific widget must contain two additional properties &mdash; `type` and `widget`. Read more in the [Widget Styles](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles) section of the "Syles Drop-down" guide. Note that by default, widgets support only classes and no other attributes or styles. Related changes and features:
+  * Introduced the [`CKEDITOR.style.addCustomHandler()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-static-method-addCustomHandler) method for registering custom style handlers.
+  * The [`CKEDITOR.style.apply()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-apply) and [`CKEDITOR.style.remove()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-remove) methods are now called with an editor instance instead of the document so they can be reused by the [`CKEDITOR.editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) and [`CKEDITOR.editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) methods. Backward compatibility was preserved, but from CKEditor 4.4 it is highly recommended to pass an editor instead of a document to these methods.
+  * Many new methods and properties were introduced in the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) to make the handling of styles by widgets fully customizable. See: [`widget.definition.styleableElements`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleableElements), [`widget.definition.styleToAllowedContentRule`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleToAllowedContentRules), [`widget.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-addClass), [`widget.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeClass), [`widget.getClasses()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-getClasses), [`widget.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-hasClass), [`widget.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-applyStyle), [`widget.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeStyle), [`widget.checkStyleActive()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-checkStyleActive).
+  * Integration with the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) required an introduction of the [`CKEDITOR.style.toAllowedContent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-toAllowedContentRules) method which can be implemented by the custom style handler and if exists, it is used by the [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) to translate a style to [allowed content rules](http://docs.ckeditor.com/#!/api/CKEDITOR.filter.allowedContentRules).
+* [#11300](http://dev.ckeditor.com/ticket/11300): Various changes in the [Enhanced Image](http://ckeditor.com/addon/image2) plugin:
+  * Introduced the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option to configure the class of captioned images.
+  * Introduced the [`config.image2_alignClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_alignClasses) option to configure the way images are aligned with CSS classes.
+  If this setting is defined, the editor produces classes instead of inline styles for aligned images.
+  * Default image caption can be translated (customized) with the `editor.lang.image2.captionPlaceholder` string.
+* [#11341](http://dev.ckeditor.com/ticket/11341): [Enhanced Image](http://ckeditor.com/addon/image2) plugin: It is now possible to add a link to any image type.
+* [#10202](http://dev.ckeditor.com/ticket/10202): Introduced wildcard support in the [Allowed Content Rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) format.
+* [#10276](http://dev.ckeditor.com/ticket/10276): Introduced blacklisting in the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
+* [#10480](http://dev.ckeditor.com/ticket/10480): Introduced code snippets with code highlighting. There are two versions available so far &mdash; the default [Code Snippet](http://ckeditor.com/addon/codesnippet) which uses the [highlight.js](http://highlightjs.org) library and the [Code Snippet GeSHi](http://ckeditor.com/addon/codesnippetgeshi) which uses the [GeSHi](http://qbnz.com/highlighter/) library.
+* [#11737](http://dev.ckeditor.com/ticket/11737): Introduced an option to prevent [filtering](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) of an element that matches custom criteria (see [`filter.addElementCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-method-addElementCallback)).
+* [#11532](http://dev.ckeditor.com/ticket/11532): Introduced the [`editor.addContentsCss()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addContentsCss) method that can be used for [adding custom CSS files](http://docs.ckeditor.com/#!/guide/plugin_sdk_styles).
+* [#11536](http://dev.ckeditor.com/ticket/11536): Added the [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) method for decoding HTML entities.
+* [#11225](http://dev.ckeditor.com/ticket/11225): Introduced the [`CKEDITOR.tools.transparentImageData`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-property-transparentImageData) property which contains transparent image data to be used in CSS or as image source.
+
+Other Changes:
+
+* [#11377](http://dev.ckeditor.com/ticket/11377): Unified internal representation of empty anchors using the [fake objects](http://ckeditor.com/addon/fakeobjects).
+* [#11422](http://dev.ckeditor.com/ticket/11422): Removed Firefox 3.x, Internet Explorer 6 and Opera 12.x leftovers in code.
+* [#5217](http://dev.ckeditor.com/ticket/5217): Setting data (including switching between modes) creates a new undo snapshot. Besides that:
+  * Introduced the [`editable.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-property-status) property.
+  * Introduced a new `forceUpdate` option for the [`editor.lockSnapshot`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-lockSnapshot) event.
+  * Fixed: Selection not being unlocked in inline editor after setting data ([#11500](http://dev.ckeditor.com/ticket/11500)).
+* The [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin was updated to the latest version.
+
+Fixed Issues:
+
+* [#10190](http://dev.ckeditor.com/ticket/10190): Fixed: Removing block style with [`editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) should result in a paragraph and not a div.
+* [#11727](http://dev.ckeditor.com/ticket/11727): Fixed: The editor tries to select a non-editable image which was clicked.
+
+## CKEditor 4.3.5
+
+New Features:
+
+* Added new translation: Tatar.
+
+Fixed Issues:
+
+* [#11677](http://dev.ckeditor.com/ticket/11677): Fixed: Undo/Redo keystrokes are blocked in the source mode.
+* [#11717](http://dev.ckeditor.com/ticket/11717): [Document Properties](http://ckeditor.com/addon/docprops) plugin requires the [Color Dialog](http://ckeditor.com/addon/colordialog) plugin to work.
+
+## CKEditor 4.3.4
+
+Fixed Issues:
+
+* [#11597](http://dev.ckeditor.com/ticket/11597): [IE11] Fixed: Error thrown when trying to open the [preview](http://ckeditor.com/addon/preview) using the keyboard.
+* [#11544](http://dev.ckeditor.com/ticket/11544): [Placeholders](http://ckeditor.com/addon/placeholder) will no longer be upcasted in parents not accepting `<span>` elements.
+* [#8663](http://dev.ckeditor.com/ticket/8663): Fixed [`element.renameNode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-renameNode) not clearing the [`element.getName()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getName) cache.
+* [#11574](http://dev.ckeditor.com/ticket/11574): Fixed: *Backspace* destroying the DOM structure if an inline editable is placed in a list item.
+* [#11603](http://dev.ckeditor.com/ticket/11603): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) attaches to tables outside the editable.
+* [#9205](http://dev.ckeditor.com/ticket/9205), [#7805](http://dev.ckeditor.com/ticket/7805), [#8216](http://dev.ckeditor.com/ticket/8216): Fixed: `{cke_protected_1}` appearing in data in various cases where HTML comments are placed next to `"` or `'`.
+* [#11635](http://dev.ckeditor.com/ticket/11635): Fixed: Some attributes are not protected before the content is passed through the fix bin.
+* [#11660](http://dev.ckeditor.com/ticket/11660): [IE] Fixed: Table content is lost when some extra markup is inside the table.
+* [#11641](http://dev.ckeditor.com/ticket/11641): Fixed: Switching between modes in the classic editor removes content styles for the inline editor.
+* [#11568](http://dev.ckeditor.com/ticket/11568): Fixed: [Styles](http://ckeditor.com/addon/stylescombo) drop-down list is not enabled on selection change.
+
+## CKEditor 4.3.3
+
+Fixed Issues:
+
+* [#11500](http://dev.ckeditor.com/ticket/11500): [WebKit/Blink] Fixed: Selection lost when setting data in another inline editor. Additionally, [`selection.removeAllRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-removeAllRanges) is now scoped to selection's [root](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-property-root).
+* [#11104](http://dev.ckeditor.com/ticket/11104): [IE] Fixed: Various issues with scrolling and selection when focusing widgets.
+* [#11487](http://dev.ckeditor.com/ticket/11487): Moving mouse over the [Enhanced Image](http://ckeditor.com/addon/image2) widget will no longer change the value returned by the [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method.
+* [#8673](http://dev.ckeditor.com/ticket/8673): [WebKit] Fixed: Cannot select and remove the [Page Break](http://ckeditor.com/addon/pagebreak).
+* [#11413](http://dev.ckeditor.com/ticket/11413): Fixed: Incorrect [`editor.execCommand()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-execCommand) behavior.
+* [#11438](http://dev.ckeditor.com/ticket/11438): Splitting table cells vertically is no longer changing table structure.
+* [#8899](http://dev.ckeditor.com/ticket/8899): Fixed: Links in the [About CKEditor](http://ckeditor.com/addon/about) dialog window now open in a new browser window or tab.
+* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed: [Menu button](http://ckeditor.com/addon/menubutton) panel not showing in the source mode.
+* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not canceled anymore after editing was triggered.
+* [#11253](http://dev.ckeditor.com/ticket/11253): [IE] Fixed: Clipped upload button in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
+* [#11359](http://dev.ckeditor.com/ticket/11359): Standardized the way anchors are discovered by the [Link](http://ckeditor.com/addon/link) plugin.
+* [#11058](http://dev.ckeditor.com/ticket/11058): [IE8] Fixed: Error when deleting a table row.
+* [#11508](http://dev.ckeditor.com/ticket/11508): Fixed: [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) discovering protected attributes within other attributes' values.
+* [#11533](http://dev.ckeditor.com/ticket/11533): Widgets: Avoid recurring upcasts if the DOM structure was modified during an upcast.
+* [#11400](http://dev.ckeditor.com/ticket/11400): Fixed: The [`domObject.removeAllListeners()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.domObject-method-removeAllListeners) method does not remove custom listeners completely.
+* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed: The [`selection.getRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) method does not override cached ranges when used with the `onlyEditables` argument.
+* [#11390](http://dev.ckeditor.com/ticket/11390): [IE] All [XML](http://ckeditor.com/addon/xml) plugin [methods](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) now work in IE10+.
+* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when Right-to-Left UI language is set.
+* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When [`config.fullPage`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fullPage) is set to `true`, entities are not encoded in editor output.
+* [#11004](http://dev.ckeditor.com/ticket/11004): Integrated [Enhanced Image](http://ckeditor.com/addon/image2) dialog window with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
+* [#11439](http://dev.ckeditor.com/ticket/11439): Fixed: Properties get cloned in the Cell Properties dialog window if multiple cells are selected.
+
+## CKEditor 4.3.2
+
+Fixed Issues:
+
+* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute.
+* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements:
+  * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty.
+  * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues.
+  * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations.
+  * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization.
+* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor.
+* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements:
+  * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support.
+  * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support.
+* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe.
+* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl).
+* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables.
+* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin.
+* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted.
+* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached.
+* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable.
+* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode.
+* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace.
+* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode.
+* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar.
+* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget.
+* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library.
+* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
+* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
+* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor.
+* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin.
+* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on.
+* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8.
+* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables.
+* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs.
+* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `<div>` element with `text-align: center` and an image inside is not recognised correctly.
+* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window.
+
+## CKEditor 4.3.1
+
+**Important Notes:**
+
+* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
+* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
+
+Fixed Issues:
+
+* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
+* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
+* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
+* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
+* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
+* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
+* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
+* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
+* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
+* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
+* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
+* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
+* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
+* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
+* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
+* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
+* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
+* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
+* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
+* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
+* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
+* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
+* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
+* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `<textarea>` element are not encoded.
+* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled buttons are not read by JAWS as disabled.
+* [#11200](http://dev.ckeditor.com/ticket/11200):  Added [Clipboard](http://ckeditor.com/addon/clipboard) plugin as a dependency for [Widget](http://ckeditor.com/addon/widget) to fix drag and drop.
+
+## CKEditor 4.3
+
+New Features:
+
+* [#10612](http://dev.ckeditor.com/ticket/10612): Internet Explorer 11 support.
+* [#10869](http://dev.ckeditor.com/ticket/10869): Widgets: Added better integration with the [Elements Path](http://ckeditor.com/addon/elementspath) plugin.
+* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: Added tooltip to the drag handle.
+* [#10933](http://dev.ckeditor.com/ticket/10933): Widgets: Introduced drag and drop of block widgets with the [Line Utilities](http://ckeditor.com/addon/lineutils) plugin.
+* [#10936](http://dev.ckeditor.com/ticket/10936): Widget System changes for easier integration with other dialog systems.
+* [#10895](http://dev.ckeditor.com/ticket/10895): [Enhanced Image](http://ckeditor.com/addon/image2): Added file browser integration.
+* [#11002](http://dev.ckeditor.com/ticket/11002): Added the [`draggable`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-draggable) option to disable drag and drop support for widgets.
+* [#10937](http://dev.ckeditor.com/ticket/10937): [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget improvements:
+  * loading indicator ([#10948](http://dev.ckeditor.com/ticket/10948)),
+  * applying paragraph changes (like font color change) to iframe ([#10841](http://dev.ckeditor.com/ticket/10841)),
+  * Firefox and IE9 clipboard fixes ([#10857](http://dev.ckeditor.com/ticket/10857)),
+  * fixing same origin policy issue ([#10840](http://dev.ckeditor.com/ticket/10840)),
+  * fixing undo bugs ([#10842](http://dev.ckeditor.com/ticket/10842), [#10930](http://dev.ckeditor.com/ticket/10930)),
+  * fixing other minor bugs.
+* [#10862](http://dev.ckeditor.com/ticket/10862): [Placeholder](http://ckeditor.com/addon/placeholder) plugin was rewritten as a widget.
+* [#10822](http://dev.ckeditor.com/ticket/10822): Added styles system integration with non-editable elements (for example widgets) and their nested editables. Styles cannot change non-editable content and are applied in nested editable only if allowed by its type and content filter.
+* [#10856](http://dev.ckeditor.com/ticket/10856): Menu buttons will now toggle the visibility of their panels when clicked multiple times. [Language](http://ckeditor.com/addon/language) plugin fixes: Added active language highlighting, added an option to remove the language.
+* [#10028](http://dev.ckeditor.com/ticket/10028): New [`config.dialog_noConfirmCancel`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-dialog_noConfirmCancel) configuration option that eliminates the need to confirm closing of a dialog window when the user changed any of its fields.
+* [#10848](http://dev.ckeditor.com/ticket/10848): Integrate remaining plugins ([Styles](http://ckeditor.com/addon/stylescombo), [Format](http://ckeditor.com/addon/format), [Font](http://ckeditor.com/addon/font), [Color Button](http://ckeditor.com/addon/colorbutton), [Language](http://ckeditor.com/addon/language) and [Indent](http://ckeditor.com/addon/indent)) with [active filter](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter).
+* [#10855](http://dev.ckeditor.com/ticket/10855): Change the extension of emoticons in the [BBCode](http://ckeditor.com/addon/bbcode) sample from GIF to PNG.
+
+Fixed Issues:
+
+* [#10831](http://dev.ckeditor.com/ticket/10831): [Enhanced Image](http://ckeditor.com/addon/image2): Merged `image2inline` and `image2block` into one `image2` widget.
+* [#10835](http://dev.ckeditor.com/ticket/10835): [Enhanced Image](http://ckeditor.com/addon/image2): Improved visibility of the resize handle.
+* [#10836](http://dev.ckeditor.com/ticket/10836): [Enhanced Image](http://ckeditor.com/addon/image2): Preserve custom mouse cursor while resizing the image.
+* [#10939](http://dev.ckeditor.com/ticket/10939): [Firefox] [Enhanced Image](http://ckeditor.com/addon/image2): hovering the image causes it to change.
+* [#10866](http://dev.ckeditor.com/ticket/10866): Fixed: Broken *Tab* key navigation in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
+* [#10833](http://dev.ckeditor.com/ticket/10833): Fixed: *Lock ratio* option should be on by default in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
+* [#10881](http://dev.ckeditor.com/ticket/10881): Various improvements to *Enter* key behavior in nested editables.
+* [#10879](http://dev.ckeditor.com/ticket/10879): [Remove Format](http://ckeditor.com/addon/removeformat) should not leak from a nested editable.
+* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [WebSpellChecker](http://ckeditor.com/addon/wsc) fails to apply changes if a nested editable was focused.
+* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [SCAYT](http://ckeditor.com/addon/wsc) blocks typing in nested editables.
+* [#11079](http://dev.ckeditor.com/ticket/11079): Add button icons to the [Placeholder](http://ckeditor.com/addon/placeholder) sample.
+* [#10870](http://dev.ckeditor.com/ticket/10870): The `paste` command is no longer being disabled when the clipboard is empty.
+* [#10854](http://dev.ckeditor.com/ticket/10854): Fixed: Firefox prepends `<br>` to `<body>`, so it is stripped by the HTML data processor.
+* [#10823](http://dev.ckeditor.com/ticket/10823): Fixed: [Link](http://ckeditor.com/addon/link) plugin does not work with non-editable content.
+* [#10828](http://dev.ckeditor.com/ticket/10828): [Magic Line](http://ckeditor.com/addon/magicline) integration with the Widget System.
+* [#10865](http://dev.ckeditor.com/ticket/10865): Improved hiding copybin, so copying widgets works smoothly.
+* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts use CSS reset.
+* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed: Block commands break on widgets; added the [`contentDomInvalidated`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-contentDomInvalidated) event.
+* [#10430](http://dev.ckeditor.com/ticket/10430): Resolve dependence of the [Image](http://ckeditor.com/addon/image) plugin on the [Form Elements](http://ckeditor.com/addon/forms) plugin.
+* [#10911](http://dev.ckeditor.com/ticket/10911): Fixed: Browser *Alt* hotkeys will no longer be blocked while a widget is focused.
+* [#11082](http://dev.ckeditor.com/ticket/11082): Fixed: Selected widget is not copied or cut when using toolbar buttons or context menu.
+* [#11083](http://dev.ckeditor.com/ticket/11083): Fixed list and div element application to block widgets.
+* [#10887](http://dev.ckeditor.com/ticket/10887): Internet Explorer 8 compatibility issues related to the Widget System.
+* [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widget drag and drop, because of seriously buggy native `range#moveToPoint` method.
+* [#11098](http://dev.ckeditor.com/ticket/11098): Fixed: Wrong selection position after undoing widget drag and drop.
+* [#11110](http://dev.ckeditor.com/ticket/11110): Fixed: IFrame and Flash objects are being incorrectly pasted in certain conditions.
+* [#11129](http://dev.ckeditor.com/ticket/11129): Page break is lost when loading data.
+* [#11123](http://dev.ckeditor.com/ticket/11123): [Firefox] Widget is destroyed after being dragged outside of `<body>`.
+* [#11124](http://dev.ckeditor.com/ticket/11124): Fixed the [Elements Path](http://ckeditor.com/addon/elementspath) in an editor using the [Div Editing Area](http://ckeditor.com/addon/divarea).
+
+## CKEditor 4.3 Beta
+
+New Features:
+
+* [#9764](http://dev.ckeditor.com/ticket/9764): Widget System.
+  * [Widget plugin](http://ckeditor.com/addon/widget) introducing the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget).
+  * New [`editor.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) and [`editor.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-shiftEnterMode) properties &ndash; normalized versions of [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) and [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
+  * Dynamic editor settings. Starting from CKEditor 4.3 Beta, *Enter* mode values and [content filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) instances may be changed dynamically (for example when the caret was placed in an element in which editor features should be adjusted). When you are implementing a new editor feature, you should base its behavior on [dynamic](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) or [static](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) *Enter* mode values depending on whether this feature works in selection context or globally on editor content.
+      * Dynamic *Enter* mode values &ndash; [`editor.setActiveEnterMode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveEnterMode) method, [`editor.activeEnterModeChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeEnterModeChange) event, and two properties: [`editor.activeEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) and [`editor.activeShiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeShiftEnterMode).
+      * Dynamic content filter instances &ndash; [`editor.setActiveFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveFilter) method, [`editor.activeFilterChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeFilterChange) event, and [`editor.activeFilter`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter) property.
+  * "Fake" selection was introduced. It makes it possible to virtually select any element when the real selection remains hidden. See the  [`selection.fake()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-fake) method.
+  * Default [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied to non-editable elements (elements with `contenteditable` attribute set to `false` and their descendants) anymore. To add a rule which will be applied to all elements you need to pass an additional argument to the [`filter.addRules()`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter-method-addRules) method.
+  * Dozens of new methods were introduced &ndash; most interesting ones:
+      * [`document.find()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-find),
+      * [`document.findOne()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-findOne),
+      * [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange),
+      * [`range.moveToClosestEditablePosition()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-moveToClosestEditablePosition),
+      * New methods for [`htmlParser.node`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.node) and [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element).
+* [#10659](http://dev.ckeditor.com/ticket/10659): New [Enhanced Image](http://ckeditor.com/addon/image2) plugin that introduces a widget with integrated image captions, an option to center images, and dynamic "click and drag" resizing.
+* [#10664](http://dev.ckeditor.com/ticket/10664): New [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin that introduces the MathJax widget.
+* [#7987](https://dev.ckeditor.com/ticket/7987): New [Language](http://ckeditor.com/addon/language) plugin that implements Language toolbar button to support [WCAG 3.1.2 Language of Parts](http://www.w3.org/TR/UNDERSTANDING-WCAG20/meaning-other-lang-id.html).
+* [#10708](http://dev.ckeditor.com/ticket/10708): New [smileys](http://ckeditor.com/addon/smiley).
+
+## CKEditor 4.2.3
+
+Fixed Issues:
+
+* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: Loading external jQuery library when opening the [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) sample directly from file.
+* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening the color palette.
+* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/WebKit] Fixed: A non-breaking space is created once a character is deleted and a regular space is typed.
+* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with the keyboard shortcut for [Magic Line](http://ckeditor.com/addon/magicline).
+* [#11096](http://dev.ckeditor.com/ticket/11096): Fixed: TypeError: Object has no method 'is'.
+
+## CKEditor 4.2.2
+
+Fixed Issues:
+
+* [#9314](http://dev.ckeditor.com/ticket/9314): Fixed: Incorrect error message on closing a dialog window without saving changs.
+* [#10308](http://dev.ckeditor.com/ticket/10308): [IE10] Fixed: Unspecified error when deleting a row.
+* [#10945](http://dev.ckeditor.com/ticket/10945): [Chrome] Fixed: Clicking with a mouse inside the editor does not show the caret.
+* [#10912](http://dev.ckeditor.com/ticket/10912): Prevent default action when content of a non-editable link is clicked.
+* [#10913](http://dev.ckeditor.com/ticket/10913): Fixed [`CKEDITOR.plugins.addExternal()`](http://docs.ckeditor.com/#!/api/CKEDITOR.resourceManager-method-addExternal) not handling paths including file name specified.
+* [#10666](http://dev.ckeditor.com/ticket/10666): Fixed [`CKEDITOR.tools.isArray()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-isArray) not working cross frame.
+* [#10910](http://dev.ckeditor.com/ticket/10910): [IE9] Fixed JavaScript error thrown in Compatibility Mode when clicking and/or typing in the editing area.
+* [#10868](http://dev.ckeditor.com/ticket/10868): [IE8] Prevent the browser from crashing when applying the Inline Quotation style.
+* [#10915](http://dev.ckeditor.com/ticket/10915): Fixed: Invalid CSS filter in the Kama skin.
+* [#10914](http://dev.ckeditor.com/ticket/10914): Plugins [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock) are now included in the build configuration.
+* [#10812](http://dev.ckeditor.com/ticket/10812): Fixed [`range.createBookmark2()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-createBookmark2) incorrectly normalizing offsets. This bug was causing many issues: [#10850](http://dev.ckeditor.com/ticket/10850), [#10842](http://dev.ckeditor.com/ticket/10842).
+* [#10951](http://dev.ckeditor.com/ticket/10951): Reviewed and optimized focus handling on panels (combo, menu buttons, color buttons, and context menu) to enhance accessibility. Fixed [#10705](http://dev.ckeditor.com/ticket/10705), [#10706](http://dev.ckeditor.com/ticket/10706) and [#10707](http://dev.ckeditor.com/ticket/10707).
+* [#10704](http://dev.ckeditor.com/ticket/10704): Fixed a JAWS issue with the Select Color dialog window title not being announced.
+* [#10753](http://dev.ckeditor.com/ticket/10753): The floating toolbar in inline instances now has a dedicated accessibility label.
+
+## CKEditor 4.2.1
+
+Fixed Issues:
+
+* [#10301](http://dev.ckeditor.com/ticket/10301): [IE9-10] Undo fails after 3+ consecutive paste actions with a JavaScript error.
+* [#10689](http://dev.ckeditor.com/ticket/10689): Save toolbar button saves only the first editor instance.
+* [#10368](http://dev.ckeditor.com/ticket/10368): Move language reading direction definition (`dir`) from main language file to core.
+* [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
+* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
+* [#9958](http://dev.ckeditor.com/ticket/9958): [IE9] Pressing the "OK" button will trigger the `onbeforeunload` event in the popup dialog.
+* [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from the Styles drop-down list not registering to the ACF in case when the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
+* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with Internet Explorer 10 Quirks Mode.
+* [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
+* [#10646](http://dev.ckeditor.com/ticket/10646): Removing a selected sublist or nested table with *Backspace/Delete* removes the parent element.
+* [#10623](http://dev.ckeditor.com/ticket/10623): [WebKit] Page is scrolled when opening a drop-down list.
+* [#10004](http://dev.ckeditor.com/ticket/10004): [ChromeVox] Button names are not announced.
+* [#10731](http://dev.ckeditor.com/ticket/10731): [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin breaks cloning of editor configuration.
+* It is now possible to set per instance [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin configuration instead of setting the configuration globally.
+
+## CKEditor 4.2
+
+**Important Notes:**
+
+* Dropped compatibility support for Internet Explorer 7 and Firefox 3.6.
+
+* Both the Basic and the Standard distribution packages will not contain the new [Indent Block](http://ckeditor.com/addon/indentblock) plugin. Because of this the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) might remove block indentations from existing contents. If you want to prevent this, either [add an appropriate ACF rule to your filter](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) or create a custom build based on the Basic/Standard package and add the Indent Block plugin in [CKBuilder](http://ckeditor.com/builder).
+
+New Features:
+
+* [#10027](http://dev.ckeditor.com/ticket/10027): Separated list and block indentation into two plugins: [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock).
+* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
+* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
+* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
+* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
+* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
+* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `<textarea>` elements &mdash; introduced [`editor.required`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-required) event.
+* [#10280](http://dev.ckeditor.com/ticket/10280): Ability to replace `<textarea>` elements with the inline editor.
+
+Fixed Issues:
+
+* [#10599](http://dev.ckeditor.com/ticket/10599): [Indent](http://ckeditor.com/addon/indent) plugin is no longer required by the [List](http://ckeditor.com/addon/list) plugin.
+* [#10370](http://dev.ckeditor.com/ticket/10370): Inconsistency in data events between framed and inline editors.
+* [#10438](http://dev.ckeditor.com/ticket/10438): [FF, IE] No selection is done on an editable element on executing [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData).
+
+## CKEditor 4.1.3
+
+New Features:
+
+* Added new translation: Indonesian.
+
+Fixed Issues:
+
+* [#10644](http://dev.ckeditor.com/ticket/10644): Fixed a critical bug when pasting plain text in Blink-based browsers.
+* [#5189](http://dev.ckeditor.com/ticket/5189): [Find/Replace](http://ckeditor.com/addon/find) dialog window: rename "Cancel" button to "Close".
+* [#10562](http://dev.ckeditor.com/ticket/10562): [Housekeeping] Unified CSS gradient filter formats in the [Moono](http://ckeditor.com/addon/moono) skin.
+* [#10537](http://dev.ckeditor.com/ticket/10537): Advanced Content Filter should register a default rule for [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
+* [#10610](http://dev.ckeditor.com/ticket/10610): [`CKEDITOR.dialog.addIframe()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-static-method-addIframe) incorrectly sets the iframe size in dialog windows.
+
+## CKEditor 4.1.2
+
+New Features:
+
+* Added new translation: Sinhala.
+
+Fixed Issues:
+
+* [#10339](http://dev.ckeditor.com/ticket/10339): Fixed: Error thrown when inserted data was totally stripped out after filtering and processing.
+* [#10298](http://dev.ckeditor.com/ticket/10298): Fixed: Data processor breaks attributes containing protected parts.
+* [#10367](http://dev.ckeditor.com/ticket/10367): Fixed: [`editable.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertText) loses characters when `RegExp` replace controls are being inserted.
+* [#10165](http://dev.ckeditor.com/ticket/10165): [IE] Access denied error when `document.domain` has been altered.
+* [#9761](http://dev.ckeditor.com/ticket/9761): Update the *Backspace* key state in [`keystrokeHandler.blockedKeystrokes`](http://docs.ckeditor.com/#!/api/CKEDITOR.keystrokeHandler-property-blockedKeystrokes) when calling [`editor.setReadOnly()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly).
+* [#6504](http://dev.ckeditor.com/ticket/6504): Fixed: Race condition while loading several [`config.customConfig`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-customConfig) files.
+* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) is [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
+* [#10360](http://dev.ckeditor.com/ticket/10360): Fixed: ARIA `role="application"` should not be used for dialog windows.
+* [#10361](http://dev.ckeditor.com/ticket/10361): Fixed: ARIA `role="application"` should not be used for floating panels.
+* [#10510](http://dev.ckeditor.com/ticket/10510): Introduced unique voice labels to differentiate between different editor instances.
+* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
+* [#10389](http://dev.ckeditor.com/ticket/10389): Fixed: Invalid HTML in the "Text and Table" template.
+* [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin user interface was changed to match CKEditor 4 style.
+
+## CKEditor 4.1.1
+
+New Features:
+
+* Added new translation: Albanian.
+
+Fixed Issues:
+
+* [#10172](http://dev.ckeditor.com/ticket/10172): Pressing *Delete* or *Backspace* in an empty table cell moves the cursor to the next/previous cell.
+* [#10219](http://dev.ckeditor.com/ticket/10219): Error thrown when destroying an editor instance in parallel with a `mouseup` event.
+* [#10265](http://dev.ckeditor.com/ticket/10265): Wrong loop type in the [File Browser](http://ckeditor.com/addon/filebrowser) plugin.
+* [#10249](http://dev.ckeditor.com/ticket/10249): Wrong undo/redo states at start.
+* [#10268](http://dev.ckeditor.com/ticket/10268): [Show Blocks](http://ckeditor.com/addon/showblocks) does not recover after switching to Source view.
+* [#9995](http://dev.ckeditor.com/ticket/9995): HTML code in the `<textarea>` should not be modified by the [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor).
+* [#10320](http://dev.ckeditor.com/ticket/10320): [Justify](http://ckeditor.com/addon/justify) plugin should add elements to Advanced Content Filter based on current [Enter mode](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode).
+* [#10260](http://dev.ckeditor.com/ticket/10260): Fixed: Advanced Content Filter blocks [`tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces). Unified `data-cke-*` attributes filtering.
+* [#10315](http://dev.ckeditor.com/ticket/10315): [WebKit] [Undo manager](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager) should not record snapshots after a filling character was added/removed.
+* [#10291](http://dev.ckeditor.com/ticket/10291): [WebKit] Space after a filling character should be secured.
+* [#10330](http://dev.ckeditor.com/ticket/10330): [WebKit] The filling character is not removed on `keydown` in specific cases.
+* [#10285](http://dev.ckeditor.com/ticket/10285): Fixed: Styled text pasted from MS Word causes an infinite loop.
+* [#10131](http://dev.ckeditor.com/ticket/10131): Fixed: [`undoManager.update()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-method-update) does not refresh the command state.
+* [#10337](http://dev.ckeditor.com/ticket/10337): Fixed: Unable to remove `<s>` using [Remove Format](http://ckeditor.com/addon/removeformat).
+
+## CKEditor 4.1
+
+Fixed Issues:
+
+* [#10192](http://dev.ckeditor.com/ticket/10192): Closing lists with the *Enter* key does not work with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) in several cases.
+* [#10191](http://dev.ckeditor.com/ticket/10191): Fixed allowed content rules unification, so the [`filter.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-property-allowedContent) property always contains rules in the same format.
+* [#10224](http://dev.ckeditor.com/ticket/10224): Advanced Content Filter does not remove non-empty `<a>` elements anymore.
+* Minor issues in plugin integration with Advanced Content Filter:
+  * [#10166](http://dev.ckeditor.com/ticket/10166): Added transformation from the `align` attribute to `float` style to preserve backward compatibility after the introduction of Advanced Content Filter.
+  * [#10195](http://dev.ckeditor.com/ticket/10195): [Image](http://ckeditor.com/addon/image) plugin no longer registers rules for links to Advanced Content Filter.
+  * [#10213](http://dev.ckeditor.com/ticket/10213): [Justify](http://ckeditor.com/addon/justify) plugin is now correctly registering rules to Advanced Content Filter when [`config.justifyClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-justifyClasses) is defined.
+
+## CKEditor 4.1 RC
+
+New Features:
+
+* [#9829](http://dev.ckeditor.com/ticket/9829): Advanced Content Filter - data and features activation based on editor configuration.
+
+  Brand new data filtering system that works in 2 modes:
+
+  * Based on loaded features (toolbar items, plugins) - the data will be filtered according to what the editor in its
+  current configuration can handle.
+  * Based on [`config.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent) rules - the data
+  will be filtered and the editor features (toolbar items, commands, keystrokes) will be enabled if they are allowed.
+
+  See the `datafiltering.html` sample, [guides](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) and [`CKEDITOR.filter` API documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
+* [#9387](http://dev.ckeditor.com/ticket/9387): Reintroduced [Shared Spaces](http://ckeditor.com/addon/sharedspace) - the ability to display toolbar and bottom editor space in selected locations and to share them by different editor instances.
+* [#9907](http://dev.ckeditor.com/ticket/9907): Added the [`contentPreview`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-contentPreview) event for preview data manipulation.
+* [#9713](http://dev.ckeditor.com/ticket/9713): Introduced the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin that brings raw HTML editing for inline editor instances.
+* Included in [#9829](http://dev.ckeditor.com/ticket/9829): Introduced new events, [`toHtml`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toHtml) and [`toDataFormat`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toDataFormat), allowing for better integration with data processing.
+* [#9981](http://dev.ckeditor.com/ticket/9981): Added ability to filter [`htmlParser.fragment`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.fragment), [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element) etc. by many [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter)s before writing structure to an HTML string.
+* Included in [#10103](http://dev.ckeditor.com/ticket/10103):
+  * Introduced the [`editor.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-status) property to make it easier to check the current status of the editor.
+  * Default [`command`](http://docs.ckeditor.com/#!/api/CKEDITOR.command) state is now [`CKEDITOR.TRISTATE_DISABLE`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-TRISTATE_DISABLED). It will be activated on [`editor.instanceReady`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-instanceReady) or immediately after being added if the editor is already initialized.
+* [#9796](http://dev.ckeditor.com/ticket/9796): Introduced `<s>` as a default tag for strikethrough, which replaces obsolete `<strike>` in HTML5.
+
+## CKEditor 4.0.3
+
+Fixed Issues:
+
+* [#10196](http://dev.ckeditor.com/ticket/10196): Fixed context menus not opening with keyboard shortcuts when [Autogrow](http://ckeditor.com/addon/autogrow) is enabled.
+* [#10212](http://dev.ckeditor.com/ticket/10212): [IE7-10] Undo command throws errors after multiple switches between Source and WYSIWYG view.
+* [#10219](http://dev.ckeditor.com/ticket/10219): [Inline editor] Error thrown after calling [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy).
+
+## CKEditor 4.0.2
+
+Fixed Issues:
+
+* [#9779](http://dev.ckeditor.com/ticket/9779): Fixed overriding [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl) with `CKEDITOR_GETURL`.
+* [#9772](http://dev.ckeditor.com/ticket/9772): Custom buttons in the dialog window footer have different look and size ([Moono](http://ckeditor.com/addon/moono), [Kama](http://ckeditor.com/addon/kama) skins).
+* [#9029](http://dev.ckeditor.com/ticket/9029): Custom styles added with the [`stylesSet.add()`](http://docs.ckeditor.com/#!/api/CKEDITOR.stylesSet-method-add) are displayed in the wrong order.
+* [#9887](http://dev.ckeditor.com/ticket/9887): Disable [Magic Line](http://ckeditor.com/addon/magicline) when [`editor.readOnly`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) is set.
+* [#9882](http://dev.ckeditor.com/ticket/9882): Fixed empty document title on [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) if set via the Document Properties dialog window.
+* [#9773](http://dev.ckeditor.com/ticket/9773): Fixed rendering problems with selection fields in the Kama skin.
+* [#9851](http://dev.ckeditor.com/ticket/9851): The [`selectionChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-selectionChange) event is not fired when mouse selection ended outside editable.
+* [#9903](http://dev.ckeditor.com/ticket/9903): [Inline editor] Bad positioning of floating space with page horizontal scroll.
+* [#9872](http://dev.ckeditor.com/ticket/9872): [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) returns `true` when called onload. Removed the obsolete `editor.mayBeDirty` flag.
+* [#9893](http://dev.ckeditor.com/ticket/9893): [IE] Fixed broken toolbar when editing mixed direction content in Quirks mode.
+* [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the [Link](http://ckeditor.com/addon/link) dialog window when the Anchor option is used and no anchors are available.
+* [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with [divarea](http://ckeditor.com/addon/divarea)-based editors.
+* [#9940](http://dev.ckeditor.com/ticket/9940): [Firefox] Navigating back to a page with the editor was making the entire page editable.
+* [#9966](http://dev.ckeditor.com/ticket/9966): Fixed: Unable to type square brackets with French keyboard layout. Changed [Magic Line](http://ckeditor.com/addon/magicline) keystrokes.
+* [#9507](http://dev.ckeditor.com/ticket/9507): [Firefox] Selection is moved before editable position when the editor is focused for the first time.
+* [#9947](http://dev.ckeditor.com/ticket/9947): [WebKit] Editor overflows parent container in some edge cases.
+* [#10105](http://dev.ckeditor.com/ticket/10105): Fixed: Broken [sourcearea](http://ckeditor.com/addon/sourcearea) view when an RTL language is set.
+* [#10123](http://dev.ckeditor.com/ticket/10123): [WebKit] Fixed: Several dialog windows have broken layout since the latest WebKit release.
+* [#10152](http://dev.ckeditor.com/ticket/10152): Fixed: Invalid ARIA property used on menu items.
+
+## CKEditor 4.0.1.1
+
+Fixed Issues:
+
+* Security update: Added protection against XSS attack and possible path disclosure in the PHP sample.
+
+## CKEditor 4.0.1
+
+Fixed Issues:
+
+* [#9655](http://dev.ckeditor.com/ticket/9655): Support for IE Quirks Mode in the new [Moono skin](http://ckeditor.com/addon/moono).
+* Accessibility issues (mainly in inline editor): [#9364](http://dev.ckeditor.com/ticket/9364), [#9368](http://dev.ckeditor.com/ticket/9368), [#9369](http://dev.ckeditor.com/ticket/9369), [#9370](http://dev.ckeditor.com/ticket/9370), [#9541](http://dev.ckeditor.com/ticket/9541), [#9543](http://dev.ckeditor.com/ticket/9543), [#9841](http://dev.ckeditor.com/ticket/9841), [#9844](http://dev.ckeditor.com/ticket/9844).
+* [Magic Line](http://ckeditor.com/addon/magicline) plugin:
+    * [#9481](http://dev.ckeditor.com/ticket/9481): Added accessibility support for Magic Line.
+    * [#9509](http://dev.ckeditor.com/ticket/9509): Added Magic Line support for forms.
+    * [#9573](http://dev.ckeditor.com/ticket/9573): Magic Line does not disappear on `mouseout` in a specific case.
+* [#9754](http://dev.ckeditor.com/ticket/9754): [WebKit] Cutting & pasting simple unformatted text generates an inline wrapper in WebKit browsers.
+* [#9456](http://dev.ckeditor.com/ticket/9456): [Chrome] Properly paste bullet list style from MS Word.
+* [#9699](http://dev.ckeditor.com/ticket/9699), [#9758](http://dev.ckeditor.com/ticket/9758): Improved selection locking when selecting by dragging.
+* Context menu:
+    * [#9712](http://dev.ckeditor.com/ticket/9712): Opening the context menu destroys editor focus.
+    * [#9366](http://dev.ckeditor.com/ticket/9366): Context menu should be displayed over the floating toolbar.
+    * [#9706](http://dev.ckeditor.com/ticket/9706): Context menu generates a JavaScript error in inline mode when the editor is attached to a header element.
+* [#9800](http://dev.ckeditor.com/ticket/9800): Hide float panel when resizing the window.
+* [#9721](http://dev.ckeditor.com/ticket/9721): Padding in content of div-based editor puts the editing area under the bottom UI space.
+* [#9528](http://dev.ckeditor.com/ticket/9528): Host page `box-sizing` style should not influence the editor UI elements.
+* [#9503](http://dev.ckeditor.com/ticket/9503): [Form Elements](http://ckeditor.com/addon/forms) plugin adds context menu listeners only on supported input types. Added support for `tel`, `email`, `search` and `url` input types.
+* [#9769](http://dev.ckeditor.com/ticket/9769): Improved floating toolbar positioning in a narrow window.
+* [#9875](http://dev.ckeditor.com/ticket/9875): Table dialog window does not populate width correctly.
+* [#8675](http://dev.ckeditor.com/ticket/8675): Deleting cells in a nested table removes the outer table cell.
+* [#9815](http://dev.ckeditor.com/ticket/9815): Cannot edit dialog window fields in an editor initialized in the jQuery UI modal dialog.
+* [#8888](http://dev.ckeditor.com/ticket/8888): CKEditor dialog windows do not show completely in a small window.
+* [#9360](http://dev.ckeditor.com/ticket/9360): [Inline editor] Blocks shown for a `<div>` element stay permanently even after the user exits editing the `<div>`.
+* [#9531](http://dev.ckeditor.com/ticket/9531): [Firefox & Inline editor] Toolbar is lost when closing the Format drop-down list by clicking its button.
+* [#9553](http://dev.ckeditor.com/ticket/9553): Table width incorrectly set when the `border-width` style is specified.
+* [#9594](http://dev.ckeditor.com/ticket/9594): Cannot tab past CKEditor when it is in read-only mode.
+* [#9658](http://dev.ckeditor.com/ticket/9658): [IE9] Justify not working on selected images.
+* [#9686](http://dev.ckeditor.com/ticket/9686): Added missing contents styles for `<pre>` elements.
+* [#9709](http://dev.ckeditor.com/ticket/9709): [Paste from Word](http://ckeditor.com/addon/pastefromword) should not depend on configuration from other styles.
+* [#9726](http://dev.ckeditor.com/ticket/9726): Removed [Color Dialog](http://ckeditor.com/addon/colordialog) plugin dependency from [Table Tools](http://ckeditor.com/addon/tabletools).
+* [#9765](http://dev.ckeditor.com/ticket/9765): Toolbar Collapse command documented incorrectly in the [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp) dialog window.
+* [#9771](http://dev.ckeditor.com/ticket/9771): [WebKit & Opera] Fixed scrolling issues when pasting.
+* [#9787](http://dev.ckeditor.com/ticket/9787): [IE9] `onChange` is not fired for checkboxes in dialogs.
+* [#9842](http://dev.ckeditor.com/ticket/9842): [Firefox 17] When opening a toolbar menu for the first time and pressing the *Down Arrow* key, focus goes to the next toolbar button instead of the menu options.
+* [#9847](http://dev.ckeditor.com/ticket/9847): [Elements Path](http://ckeditor.com/addon/elementspath) should not be initialized in the inline editor.
+* [#9853](http://dev.ckeditor.com/ticket/9853): [`editor.addRemoveFormatFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addRemoveFormatFilter) is exposed before it really works.
+* [#8893](http://dev.ckeditor.com/ticket/8893): Value of the [`pasteFromWordCleanupFile`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordCleanupFile) configuration option is now taken from the instance configuration.
+* [#9693](http://dev.ckeditor.com/ticket/9693): Removed "Live Preview" checkbox from UI color picker.
+
+
+## CKEditor 4.0
+
+The first stable release of the new CKEditor 4 code line.
+
+The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
+possible. The list of relevant changes can be found in the [API Changes page of
+the CKEditor 4 documentation][1].
+
+[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes"
diff --git a/js/ckeditor/LICENSE.md b/js/ckeditor/LICENSE.md
index 044e7daf9..d6f58ca44 100644
--- a/js/ckeditor/LICENSE.md
+++ b/js/ckeditor/LICENSE.md
@@ -1,1420 +1,1420 @@
-Software License Agreement
-==========================
-
-CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-   (See Appendix A)
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-   (See Appendix B)
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-   (See Appendix C)
-
-You are not required to, but if you want to explicitly declare the
-license you have chosen to be bound to when using, reproducing,
-modifying and distributing this software, just include a text file
-titled "legal.txt" in your version of this software, indicating your
-license choice. In any case, your choice will not restrict any
-recipient of your version of this software to use, reproduce, modify
-and distribute this software under any of the above licenses.
-
-Sources of Intellectual Property Included in CKEditor
------------------------------------------------------
-
-Where not otherwise indicated, all CKEditor content is authored by
-CKSource engineers and consists of CKSource-owned intellectual
-property. In some specific instances, CKEditor will incorporate work
-done by developers outside of CKSource with their express permission.
-
-The following libraries are included in CKEditor under the MIT license (see Appendix D):
-
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
-* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
-* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
-
-Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):
-
-* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
-
-The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):
-
-* Font Awesome (included in the toolbar configurator) - Copyright (C) 2012 by Dave Gandy.
-
-The following libraries are included in CKEditor under the BSD-3 License (see Appendix F):
-
-* highlight.js (included in the `codesnippet` plugin) - Copyright (c) 2006, Ivan Sagalaev.
-* YUI Library (included in the `uicolor` plugin) - Copyright (c) 2009, Yahoo! Inc.
-
-
-Trademarks
-----------
-
-CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
-and product names are trademarks, registered trademarks or service
-marks of their respective holders.
-
----
-
-Appendix A: The GPL License
----------------------------
-
-```
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software-to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-GNU GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-```
-
-Appendix B: The LGPL License
-----------------------------
-
-```
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software-to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages-typically libraries-of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-GNU LESSER GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
-```
-
-Appendix C: The MPL License
----------------------------
-
-```
-MOZILLA PUBLIC LICENSE
-Version 1.1
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-```
-
-Appendix D: The MIT License
----------------------------
-
-```
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-```
-
-Appendix E: The SIL Open Font License Version 1.1
----------------------------------------------
-
-```
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-```
-
-Appendix F: The BSD-3 License
------------------------------
-
-```
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-```
-
+Software License Agreement
+==========================
+
+CKEditor - The text editor for Internet - http://ckeditor.com
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+
+Licensed under the terms of any of the following licenses at your
+choice:
+
+ - GNU General Public License Version 2 or later (the "GPL")
+   http://www.gnu.org/licenses/gpl.html
+   (See Appendix A)
+
+ - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+   http://www.gnu.org/licenses/lgpl.html
+   (See Appendix B)
+
+ - Mozilla Public License Version 1.1 or later (the "MPL")
+   http://www.mozilla.org/MPL/MPL-1.1.html
+   (See Appendix C)
+
+You are not required to, but if you want to explicitly declare the
+license you have chosen to be bound to when using, reproducing,
+modifying and distributing this software, just include a text file
+titled "legal.txt" in your version of this software, indicating your
+license choice. In any case, your choice will not restrict any
+recipient of your version of this software to use, reproduce, modify
+and distribute this software under any of the above licenses.
+
+Sources of Intellectual Property Included in CKEditor
+-----------------------------------------------------
+
+Where not otherwise indicated, all CKEditor content is authored by
+CKSource engineers and consists of CKSource-owned intellectual
+property. In some specific instances, CKEditor will incorporate work
+done by developers outside of CKSource with their express permission.
+
+The following libraries are included in CKEditor under the MIT license (see Appendix D):
+
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
+* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
+* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
+
+Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):
+
+* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
+
+The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):
+
+* Font Awesome (included in the toolbar configurator) - Copyright (C) 2012 by Dave Gandy.
+
+The following libraries are included in CKEditor under the BSD-3 License (see Appendix F):
+
+* highlight.js (included in the `codesnippet` plugin) - Copyright (c) 2006, Ivan Sagalaev.
+* YUI Library (included in the `uicolor` plugin) - Copyright (c) 2009, Yahoo! Inc.
+
+
+Trademarks
+----------
+
+CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
+and product names are trademarks, registered trademarks or service
+marks of their respective holders.
+
+---
+
+Appendix A: The GPL License
+---------------------------
+
+```
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software-to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+```
+
+Appendix B: The LGPL License
+----------------------------
+
+```
+GNU LESSER GENERAL PUBLIC LICENSE
+Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software-to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages-typically libraries-of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+GNU LESSER GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+END OF TERMS AND CONDITIONS
+```
+
+Appendix C: The MPL License
+---------------------------
+
+```
+MOZILLA PUBLIC LICENSE
+Version 1.1
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+```
+
+Appendix D: The MIT License
+---------------------------
+
+```
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+```
+
+Appendix E: The SIL Open Font License Version 1.1
+---------------------------------------------
+
+```
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+```
+
+Appendix F: The BSD-3 License
+-----------------------------
+
+```
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
+
diff --git a/js/ckeditor/contents.css b/js/ckeditor/contents.css
index b86d63eff..523154441 100644
--- a/js/ckeditor/contents.css
+++ b/js/ckeditor/contents.css
@@ -1,213 +1,213 @@
-/*
-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-
-body
-{
-	/* Font */
-	font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
-	font-size: 12px;
-
-	/* Text color */
-	color: #333;
-
-	/* Remove the background color to make it transparent */
-	background-color: #fff;
-
-	margin: 5px 10px; /* Changed. Original value was 20px */
-}
-
-.cke_editable
-{
-	font-size: 13px;
-	line-height: 1.4; /* Changed. Original value was 1.6 */
-
-	/* Fix for missing scrollbars with RTL texts. (#10488) */
-	word-wrap: break-word;
-}
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-a
-{
-	color: #0782C1;
-}
-
-ol,ul,dl
-{
-	/* IE7: reset rtl list margin. (#7334) */
-	*margin-right: 0px;
-	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
-	padding: 0 40px;
-}
-
-h1,h2,h3,h4,h5,h6
-{
-	font-weight: normal;
-	line-height: 1.2;
-}
-
-hr
-{
-	border: 0px;
-	border-top: 1px solid #ccc;
-}
-
-img.right
-{
-	border: 1px solid #ccc;
-	float: right;
-	margin-left: 15px;
-	padding: 5px;
-}
-
-img.left
-{
-	border: 1px solid #ccc;
-	float: left;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-pre
-{
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-.marker
-{
-	background-color: Yellow;
-}
-
-span[lang]
-{
-	font-style: italic;
-}
-
-figure
-{
-	text-align: center;
-	border: solid 1px #ccc;
-	border-radius: 2px;
-	background: rgba(0,0,0,0.05);
-	padding: 10px;
-	margin: 10px 20px;
-	display: inline-block;
-}
-
-figure > figcaption
-{
-	text-align: center;
-	display: block; /* For IE8 */
-}
-
-a > img {
-	padding: 1px;
-	margin: 1px;
-	border: none;
-	outline: 1px solid #0782C1;
-}
-
-p {
-	margin-top: 0.25em;
-	margin-bottom: 0.25em;
-}
-
-/* Widget Styles */
-.code-featured
-{
-	border: 5px solid red;
-}
-
-.math-featured
-{
-	padding: 20px;
-	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
-	background-color: rgba(255, 0, 0, 0.05);
-	margin: 10px;
-}
-
-.image-clean
-{
-	border: 0;
-	background: none;
-	padding: 0;
-}
-
-.image-clean > figcaption
-{
-	font-size: .9em;
-	text-align: right;
-}
-
-.image-grayscale
-{
-	background-color: white;
-	color: #666;
-}
-
-.image-grayscale img, img.image-grayscale
-{
-	filter: grayscale(100%);
-}
-
-.embed-240p
-{
-	max-width: 426px;
-	max-height: 240px;
-	margin:0 auto;
-}
-
-.embed-360p
-{
-	max-width: 640px;
-	max-height: 360px;
-	margin:0 auto;
-}
-
-.embed-480p
-{
-	max-width: 854px;
-	max-height: 480px;
-	margin:0 auto;
-}
-
-.embed-720p
-{
-	max-width: 1280px;
-	max-height: 720px;
-	margin:0 auto;
-}
-
-.embed-1080p
-{
-	max-width: 1920px;
-	max-height: 1080px;
-	margin:0 auto;
-}
+/*
+Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
+	font-size: 12px;
+
+	/* Text color */
+	color: #333;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+
+	margin: 5px 10px; /* Changed. Original value was 20px */
+}
+
+.cke_editable
+{
+	font-size: 13px;
+	line-height: 1.4; /* Changed. Original value was 1.6 */
+
+	/* Fix for missing scrollbars with RTL texts. (#10488) */
+	word-wrap: break-word;
+}
+
+blockquote
+{
+	font-style: italic;
+	font-family: Georgia, Times, "Times New Roman", serif;
+	padding: 2px 0;
+	border-style: solid;
+	border-color: #ccc;
+	border-width: 0;
+}
+
+.cke_contents_ltr blockquote
+{
+	padding-left: 20px;
+	padding-right: 8px;
+	border-left-width: 5px;
+}
+
+.cke_contents_rtl blockquote
+{
+	padding-left: 8px;
+	padding-right: 20px;
+	border-right-width: 5px;
+}
+
+a
+{
+	color: #0782C1;
+}
+
+ol,ul,dl
+{
+	/* IE7: reset rtl list margin. (#7334) */
+	*margin-right: 0px;
+	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
+	padding: 0 40px;
+}
+
+h1,h2,h3,h4,h5,h6
+{
+	font-weight: normal;
+	line-height: 1.2;
+}
+
+hr
+{
+	border: 0px;
+	border-top: 1px solid #ccc;
+}
+
+img.right
+{
+	border: 1px solid #ccc;
+	float: right;
+	margin-left: 15px;
+	padding: 5px;
+}
+
+img.left
+{
+	border: 1px solid #ccc;
+	float: left;
+	margin-right: 15px;
+	padding: 5px;
+}
+
+pre
+{
+	white-space: pre-wrap; /* CSS 2.1 */
+	word-wrap: break-word; /* IE7 */
+	-moz-tab-size: 4;
+	tab-size: 4;
+}
+
+.marker
+{
+	background-color: Yellow;
+}
+
+span[lang]
+{
+	font-style: italic;
+}
+
+figure
+{
+	text-align: center;
+	border: solid 1px #ccc;
+	border-radius: 2px;
+	background: rgba(0,0,0,0.05);
+	padding: 10px;
+	margin: 10px 20px;
+	display: inline-block;
+}
+
+figure > figcaption
+{
+	text-align: center;
+	display: block; /* For IE8 */
+}
+
+a > img {
+	padding: 1px;
+	margin: 1px;
+	border: none;
+	outline: 1px solid #0782C1;
+}
+
+p {
+	margin-top: 0.25em;
+	margin-bottom: 0.25em;
+}
+
+/* Widget Styles */
+.code-featured
+{
+	border: 5px solid red;
+}
+
+.math-featured
+{
+	padding: 20px;
+	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
+	background-color: rgba(255, 0, 0, 0.05);
+	margin: 10px;
+}
+
+.image-clean
+{
+	border: 0;
+	background: none;
+	padding: 0;
+}
+
+.image-clean > figcaption
+{
+	font-size: .9em;
+	text-align: right;
+}
+
+.image-grayscale
+{
+	background-color: white;
+	color: #666;
+}
+
+.image-grayscale img, img.image-grayscale
+{
+	filter: grayscale(100%);
+}
+
+.embed-240p
+{
+	max-width: 426px;
+	max-height: 240px;
+	margin:0 auto;
+}
+
+.embed-360p
+{
+	max-width: 640px;
+	max-height: 360px;
+	margin:0 auto;
+}
+
+.embed-480p
+{
+	max-width: 854px;
+	max-height: 480px;
+	margin:0 auto;
+}
+
+.embed-720p
+{
+	max-width: 1280px;
+	max-height: 720px;
+	margin:0 auto;
+}
+
+.embed-1080p
+{
+	max-width: 1920px;
+	max-height: 1080px;
+	margin:0 auto;
+}
diff --git a/js/ckeditor/lang/de.js b/js/ckeditor/lang/de.js
index 6c4df97e2..882cfaf3b 100644
--- a/js/ckeditor/lang/de.js
+++ b/js/ckeditor/lang/de.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.lang['de']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verloren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leer","35":"Ende","36":"Pos1","46":"Entfernen","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"blockquote":{"toolbar":"Zitatblock"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"notification":{"closed":"Benachrichtigung geschlossen."},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteNotification":"Ihr Browser verhindert das Einfügen über diesen Weg. Zum einfügen drücken Sie %1."},"contextmenu":{"options":"Kontextmenüoptionen"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Größe zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Herunterladen erzwingen","displayText":"Anzeigetext","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Größe änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"pastetext":{"button":"Als Klartext einfügen","pasteNotification":"Ihr Browser verhindert das Einfügen von Text über diesen Weg. Zum einfügen drücken Sie %1."},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"removeformat":{"toolbar":"Formatierung entfernen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"Über SCAYT","btn_dictionaries":"Wörterbücher","btn_disable":"SCAYT ausschalten","btn_enable":"SCAYT einschalten","btn_langs":"Sprachen","btn_options":"Optionen","text_title":"Rechtschreibprüfung während der Texteingabe (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"wsc":{"btnIgnore":"Ignorieren","btnIgnoreAll":"Alle Ignorieren","btnReplace":"Ersetzen","btnReplaceAll":"Alle Ersetzen","btnUndo":"Rückgängig","changeTo":"Ändern in","errorLoading":"Fehler beim laden des Dienstanbieters: %s.","ieSpellDownload":"Rechtschreibprüfung nicht installiert. Möchten Sie sie jetzt herunterladen?","manyChanges":"Rechtschreibprüfung abgeschlossen - %1 Wörter geändert","noChanges":"Rechtschreibprüfung abgeschlossen - keine Worte geändert","noMispell":"Rechtschreibprüfung abgeschlossen - keine Fehler gefunden","noSuggestions":" - keine Vorschläge - ","notAvailable":"Entschuldigung, aber dieser Dienst steht im Moment nicht zur Verfügung.","notInDic":"Nicht im Wörterbuch","oneChange":"Rechtschreibprüfung abgeschlossen - ein Wort geändert","progress":"Rechtschreibprüfung läuft...","title":"Rechtschreibprüfung","toolbar":"Rechtschreibprüfung"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiß","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiß","1ABC9C":"Strong Cyan","2ECC71":"Smaragdgrün","3498DB":"Bright Blue","9B59B6":"Amethystblau","4E5F70":"Graublau","F1C40F":"Vivid Yellow","16A085":"Dunkelcyan","27AE60":"Dunkelsmaragdgrün","2980B9":"Strong Blue","8E44AD":"Dunkelviolett","2C3E50":"Entsättigtes blau","F39C12":"Orange","E67E22":"Möhrenfarben","E74C3C":"Blassrot","ECF0F1":"Glänzendes Silber","95A5A6":"Helles Graublau","DDD":"Hellgrau","D35400":"Kürbisfarben","C0392B":"Strong Red","BDC3C7":"Silber","7F8C8D":"Graucyan","999":"Dunkelgrau"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 Steuerelement"},"filetools":{"loadError":"Während des Lesens der Datei ist ein Fehler aufgetreten.","networkError":"Während des Hochladens der Datei ist ein Netzwerkfehler aufgetreten.","httpError404":"Während des Hochladens der Datei ist ein HTTP-Fehler aufgetreten (404: Datei nicht gefunden).","httpError403":"Während des Hochladens der Datei ist ein HTTP-Fehler aufgetreten (403: Verboten).","httpError":"Während des Hochladens der Datei ist ein HTTP-Fehler aufgetreten (Fehlerstatus: %1).","noUrlError":"Hochlade-URL ist nicht definiert.","responseError":"Falsche Antwort des Servers."},"uploadwidget":{"abort":"Hochladen durch den Benutzer abgebrochen.","doneOne":"Datei erfolgreich hochgeladen.","doneMany":"%1 Dateien erfolgreich hochgeladen.","uploadOne":"Datei wird hochgeladen ({percentage}%)...","uploadMany":"Dateien werden hochgeladen, {current} von {max} fertig ({percentage}%)..."},"font":{"fontSize":{"label":"Größe","voiceLabel":"Schrifgröße","panelTitle":"Schriftgröße"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"justify":{"block":"Blocksatz","center":"Zentriert","left":"Linksbündig","right":"Rechtsbündig"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"}};
\ No newline at end of file
diff --git a/js/ckeditor/lang/en.js b/js/ckeditor/lang/en.js
index 86a9b85ab..4d0d2dfca 100644
--- a/js/ckeditor/lang/en.js
+++ b/js/ckeditor/lang/en.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"notification":{"closed":"Notification closed."},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Your browser doesn't allow you to paste this way. Press %1 to paste."},"contextmenu":{"options":"Context Menu Options"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Your browser does not allow you to paste plain text this way. Press %1 to paste."},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"removeformat":{"toolbar":"Remove Format"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"justify":{"block":"Justify","center":"Center","left":"Align Left","right":"Align Right"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/js/ckeditor/lang/es.js b/js/ckeditor/lang/es.js
index 83ef1cccb..80c5f1d5e 100644
--- a/js/ckeditor/lang/es.js
+++ b/js/ckeditor/lang/es.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.lang['es']={"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Ingresar","16":"Mayús.","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Suprimir","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"blockquote":{"toolbar":"Cita"},"button":{"selectedLabel":"%1 (Seleccionado)"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"notification":{"closed":"Notificación cerrada."},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteNotification":"Your browser doesn't allow you to paste this way. Press %1 to paste."},"contextmenu":{"options":"Opciones del menú contextual"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"image":{"alt":"Texto Alternativo","border":"Borde","btnUpload":"Enviar al Servidor","button2Img":"¿Desea convertir el botón de imagen en una simple imagen?","hSpace":"Esp.Horiz","img2Button":"¿Desea convertir la imagen en un botón de imagen?","infoTab":"Información de Imagen","linkTab":"Vínculo","lockRatio":"Proporcional","menu":"Propiedades de Imagen","resetSize":"Tamaño Original","title":"Propiedades de Imagen","titleButton":"Propiedades de Botón de Imagen","upload":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","vSpace":"Esp.Vert","validateBorder":"El borde debe ser un número.","validateHSpace":"El espaciado horizontal debe ser un número.","validateVSpace":"El espaciado vertical debe ser un número."},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"fakeobjects":{"anchor":"Ancla","flash":"Animación flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"link":{"acccessKey":"Tecla de Acceso","advanced":"Avanzado","advisoryContentType":"Tipo de Contenido","advisoryTitle":"Título","anchor":{"toolbar":"Referencia","menu":"Propiedades de Referencia","title":"Propiedades de Referencia","name":"Nombre de la Referencia","errorName":"Por favor, complete el nombre de la Referencia","remove":"Quitar Referencia"},"anchorId":"Por ID de elemento","anchorName":"Por Nombre de Referencia","charset":"Fuente de caracteres vinculado","cssClasses":"Clases de hojas de estilo","download":"Force Download","displayText":"Display Text","emailAddress":"Dirección de E-Mail","emailBody":"Cuerpo del Mensaje","emailSubject":"Título del Mensaje","id":"Id","info":"Información de Vínculo","langCode":"Código idioma","langDir":"Orientación","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar Vínculo","name":"Nombre","noAnchors":"(No hay referencias disponibles en el documento)","noEmail":"Por favor escriba la dirección de e-mail","noUrl":"Por favor escriba el vínculo URL","other":"<otro>","popupDependent":"Dependiente (Netscape)","popupFeatures":"Características de Ventana Emergente","popupFullScreen":"Pantalla Completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Barra de ubicación","popupMenuBar":"Barra de Menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de Herramientas","popupTop":"Posición Derecha","rel":"Relación","selectAnchor":"Seleccionar una referencia","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nombre del Marco Destino","targetPopup":"<ventana emergente>","targetPopupName":"Nombre de Ventana Emergente","title":"Vínculo","toAnchor":"Referencia en esta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Insertar/Editar Vínculo","type":"Tipo de vínculo","unlink":"Eliminar Vínculo","upload":"Cargar"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"magicline":{"title":"Insertar párrafo aquí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"pastetext":{"button":"Pegar como Texto Plano","pasteNotification":"Your browser does not allow you to paste plain text this way. Press %1 to paste."},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"removeformat":{"toolbar":"Eliminar Formato"},"sourcearea":{"toolbar":"Fuente HTML"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"scayt":{"btn_about":"Acerca de Corrector","btn_dictionaries":"Diccionarios","btn_disable":"Desactivar Corrector","btn_enable":"Activar Corrector","btn_langs":"Idiomas","btn_options":"Opciones","text_title":"Comprobar Ortografía Mientras Escribe"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Todo","btnReplace":"Reemplazar","btnReplaceAll":"Reemplazar Todo","btnUndo":"Deshacer","changeTo":"Cambiar a","errorLoading":"Error cargando la aplicación del servidor: %s.","ieSpellDownload":"Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?","manyChanges":"Control finalizado: se ha cambiado %1 palabras","noChanges":"Control finalizado: no se ha cambiado ninguna palabra","noMispell":"Control finalizado: no se encontraron errores","noSuggestions":"- No hay sugerencias -","notAvailable":"Lo sentimos pero el servicio no está disponible.","notInDic":"No se encuentra en el Diccionario","oneChange":"Control finalizado: se ha cambiado una palabra","progress":"Control de Ortografía en progreso...","title":"Comprobar ortografía","toolbar":"Ortografía"},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de Fondo","colors":{"000":"Negro","800000":"Marrón oscuro","8B4513":"Marrón tierra","2F4F4F":"Pizarra Oscuro","008080":"Azul verdoso","000080":"Azul marino","4B0082":"Añil","696969":"Gris oscuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Oro oscuro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio-oscuro","800080":"Púrpura","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa claro","ADD8E6":"Azul claro","DDA0DD":"Violeta claro","D3D3D3":"Gris claro","FFF0F5":"Lavanda rojizo","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Miel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Blanco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Más Colores...","panelTitle":"Colores","textColorTitle":"Color de Texto"},"widget":{"move":"Dar clic y arrastrar para mover","label":"reproductor %1"},"filetools":{"loadError":"Ha ocurrido un error durante la lectura del archivo.","networkError":"Error de red ocurrido durante carga de archivo.","httpError404":"Un error HTTP ha ocurrido durante la carga del archivo (404: Archivo no encontrado).","httpError403":"Un error HTTP ha ocurrido durante la carga del archivo (403: Prohibido).","httpError":"Error HTTP ocurrido durante la carga del archivo (Estado del error: %1).","noUrlError":"URL cargada no está definida.","responseError":"Respueta del servidor incorrecta."},"uploadwidget":{"abort":"Carga abortada por el usuario.","doneOne":"Archivo cargado exitósamente.","doneMany":"%1 archivos exitósamente cargados.","uploadOne":"Cargando archivo ({percentage}%)...","uploadMany":"Cargando archivos, {current} de {max} hecho ({percentage}%)..."},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de fuente","panelTitle":"Tamaño"},"label":"Fuente","panelTitle":"Fuente","voiceLabel":"Fuente"},"justify":{"block":"Justificado","center":"Centrar","left":"Alinear a Izquierda","right":"Alinear a Derecha"},"colordialog":{"clear":"Borrar","highlight":"Muestra","options":"Opciones de colores","selected":"Elegido","title":"Elegir color"}};
\ No newline at end of file
diff --git a/js/ckeditor/lang/fr.js b/js/ckeditor/lang/fr.js
index 505db5b3a..871f17d8e 100644
--- a/js/ckeditor/lang/fr.js
+++ b/js/ckeditor/lang/fr.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.lang['fr']={"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Télécharger","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centrer","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retour arrière","13":"Entrée","16":"Majuscule","17":"Ctrl","18":"Alt","32":"Espace","35":"Fin","36":"Origine","46":"Supprimer","224":"Commande"},"keyboardShortcut":"Raccourci clavier"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour obtenir de l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor (en anglais)"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"blockquote":{"toolbar":"Citation"},"button":{"selectedLabel":"%1 (Sélectionné)"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"notification":{"closed":"Notification fermée."},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteNotification":"Your browser doesn't allow you to paste this way. Press %1 to paste."},"contextmenu":{"options":"Options du menu contextuel"},"elementspath":{"eleLabel":"Chemin des éléments","eleTitle":"Élément %1"},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Division","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Préformaté"},"horizontalrule":{"toolbar":"Ligne horizontale"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Voulez-vous transformer le bouton avec image sélectionné en simple image ?","hSpace":"Espacement horizontal","img2Button":"Voulez-vous transformer l'image sélectionnée en bouton avec image ?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","resetSize":"Réinitialiser la taille","title":"Propriétés de l'image","titleButton":"Propriétés du bouton avec image","upload":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un nombre entier.","validateHSpace":"L'espacement horizontal doit être un nombre entier.","validateVSpace":"L'espacement vertical doit être un nombre entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ invisible","iframe":"Cadre de contenu incorporé","unknown":"Objet inconnu"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu (indicatif)","advisoryTitle":"Infobulle","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez entrer le nom de l'ancre.","remove":"Supprimer l'ancre"},"anchorId":"Par ID d'élément","anchorName":"Par nom d'ancre","charset":"Encodage de la ressource liée","cssClasses":"Classes de style","download":"Forcer le téléchargement","displayText":"Afficher le texte","emailAddress":"Adresse électronique","emailBody":"Corps du message","emailSubject":"Sujet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"Gauche à droite","langDirRTL":"Droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Aucune ancre disponible dans ce document)","noEmail":"Veuillez entrer l'adresse électronique","noUrl":"Veuillez entrer l'URL du lien","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre surgissante","popupFullScreen":"Plein écran (IE)","popupLeft":"À gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"En haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Indice de tabulation","target":"Cible","targetFrame":"<cadre>","targetFrameName":"Nom du cadre affecté","targetPopup":"<fenêtre surgissante>","targetPopupName":"Nom de la fenêtre surgissante","title":"Lien","toAnchor":"Ancre","toEmail":"Courriel","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"magicline":{"title":"Insérer un paragraphe ici"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"pastetext":{"button":"Coller comme texte brut","pasteNotification":"Your browser does not allow you to paste plain text this way. Press %1 to paste."},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller ?","error":"Les données collées n'ont pas pu être nettoyées à cause d'une erreur interne","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionner un caractère","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"A propos de SCAYT","btn_dictionaries":"Dictionnaires","btn_disable":"Désactiver SCAYT","btn_enable":"Activer SCAYT","btn_langs":"Langues","btn_options":"Options","text_title":"Vérification de l'Orthographe en Cours de Frappe (SCAYT)"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en forme","panelTitle1":"Styles de bloc","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Rétablir","undo":"Annuler"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer tout","btnReplace":"Remplacer","btnReplaceAll":"Remplacer tout","btnUndo":"Annuler","changeTo":"Modifier pour","errorLoading":"Erreur du chargement du service depuis l'hôte : %s.","ieSpellDownload":"La vérification d'orthographe n'est pas installée. Voulez-vous la télécharger maintenant?","manyChanges":"Vérification de l'orthographe terminée : %1 mots corrigés.","noChanges":"Vérification de l'orthographe terminée : Aucun mot corrigé.","noMispell":"Vérification de l'orthographe terminée : aucune erreur trouvée.","noSuggestions":"- Aucune suggestion -","notAvailable":"Désolé, le service est indisponible actuellement.","notInDic":"N'existe pas dans le dictionnaire.","oneChange":"Vérification de l'orthographe terminée : Un seul mot corrigé.","progress":"Vérification de l'orthographe en cours...","title":"Vérifier l'orthographe","toolbar":"Vérifier l'orthographe"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur d'arrière-plan","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun de selle","2F4F4F":"Gris sombre d'ardoise","008080":"Canard","000080":"Bleu marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Or terni","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu royal","800080":"Violet","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris tamisé","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Lime","AFEEEE":"Turquoise clair","ADD8E6":"Bleu clair","DDA0DD":"Prune","D3D3D3":"Gris clair","FFF0F5":"Fard lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune clair","F0FFF0":"Vert rosée","F0FFFF":"Azur","F0F8FF":"Bleu Alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Cyan dur","2ECC71":"Émeraude","3498DB":"Bleu brillant","9B59B6":"Améthyste","4E5F70":"Bleu-gris","F1C40F":"Jaune vif","16A085":"Cyan foncé","27AE60":"Émeraude foncée","2980B9":"Bleu dur","8E44AD":"Violet foncé","2C3E50":"Bleu désaturé","F39C12":"Orange","E67E22":"Carotte","E74C3C":"Rouge pâle","ECF0F1":"Argent brillant","95A5A6":"Cyan-gris clair","DDD":"Gris clair","D35400":"Citrouille","C0392B":"Rouge dur","BDC3C7":"Argent","7F8C8D":"Cyan-gris","999":"Gris foncé"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur du texte"},"widget":{"move":"Cliquer et glisser pour déplacer","label":"Élément %1"},"filetools":{"loadError":"Une erreur est survenue lors de la lecture du fichier.","networkError":"Une erreur réseau est survenue lors du téléversement du fichier.","httpError404":"Une erreur HTTP est survenue durant le téléversement du fichier (404 : fichier non trouvé).","httpError403":"Une erreur HTTP est survenue durant le téléversement du fichier (403 : accès refusé).","httpError":"Une erreur HTTP est survenue durant le téléversement du fichier (erreur : %1).","noUrlError":"L'URL de téléversement n'est pas spécifiée.","responseError":"Réponse du serveur incorrecte."},"uploadwidget":{"abort":"Téléversement interrompu par l'utilisateur.","doneOne":"Fichier téléversé avec succès.","doneMany":"%1 fichiers téléversés avec succès.","uploadOne":"Téléversement du fichier en cours ({percentage} %)…","uploadMany":"Téléversement des fichiers en cours, {current} sur {max} effectués ({percentage} %)…"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille de police","panelTitle":"Taille de police"},"label":"Police","panelTitle":"Style de police","voiceLabel":"Police"},"justify":{"block":"Justifier","center":"Centrer","left":"Aligner à gauche","right":"Aligner à droite"},"colordialog":{"clear":"Effacer","highlight":"Pointée","options":"Options de couleur","selected":"Couleur choisie","title":"Sélectionner une couleur"}};
\ No newline at end of file
diff --git a/js/ckeditor/lang/it.js b/js/ckeditor/lang/it.js
index e0baf121f..74e1f1f49 100644
--- a/js/ckeditor/lang/it.js
+++ b/js/ckeditor/lang/it.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.lang['it']={"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>","keyboard":{"8":"Backspace","13":"Invio","16":"Maiusc","17":"Ctrl","18":"Alt","32":"Spazio","35":"Fine","36":"Inizio","46":"Canc","224":"Comando"},"keyboardShortcut":"Scorciatoia da tastiera"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"blockquote":{"toolbar":"Citazione"},"button":{"selectedLabel":"%1 (selezionato)"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"notification":{"closed":"Notifica chiusa."},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteNotification":"Il browser non permette di incollare in questo modo. Premere %1 per incollare."},"contextmenu":{"options":"Opzioni del menù contestuale"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"image":{"alt":"Testo alternativo","border":"Bordo","btnUpload":"Invia al server","button2Img":"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?","hSpace":"HSpace","img2Button":"Vuoi trasferomare l'immagine selezionata in un bottone immagine?","infoTab":"Informazioni immagine","linkTab":"Collegamento","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","resetSize":"Reimposta dimensione","title":"Proprietà immagine","titleButton":"Proprietà bottone immagine","upload":"Carica","urlMissing":"Manca l'URL dell'immagine.","vSpace":"VSpace","validateBorder":"Il campo Bordo deve essere un numero intero.","validateHSpace":"Il campo HSpace deve essere un numero intero.","validateVSpace":"Il campo VSpace deve essere un numero intero."},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"fakeobjects":{"anchor":"Ancora","flash":"Animazione Flash","hiddenfield":"Campo Nascosto","iframe":"IFrame","unknown":"Oggetto sconosciuto"},"link":{"acccessKey":"Scorciatoia da tastiera","advanced":"Avanzate","advisoryContentType":"Tipo della risorsa collegata","advisoryTitle":"Titolo","anchor":{"toolbar":"Inserisci/Modifica Ancora","menu":"Proprietà ancora","title":"Proprietà ancora","name":"Nome ancora","errorName":"Inserici il nome dell'ancora","remove":"Rimuovi l'ancora"},"anchorId":"Per id elemento","anchorName":"Per Nome","charset":"Set di caretteri della risorsa collegata","cssClasses":"Nome classe CSS","download":"Forza scaricamento","displayText":"Mostra testo","emailAddress":"Indirizzo E-Mail","emailBody":"Corpo del messaggio","emailSubject":"Oggetto del messaggio","id":"Id","info":"Informazioni collegamento","langCode":"Direzione scrittura","langDir":"Direzione scrittura","langDirLTR":"Da Sinistra a Destra (LTR)","langDirRTL":"Da Destra a Sinistra (RTL)","menu":"Modifica collegamento","name":"Nome","noAnchors":"(Nessuna ancora disponibile nel documento)","noEmail":"Devi inserire un'indirizzo e-mail","noUrl":"Devi inserire l'URL del collegamento","other":"<altro>","popupDependent":"Dipendente (Netscape)","popupFeatures":"Caratteristiche finestra popup","popupFullScreen":"A tutto schermo (IE)","popupLeft":"Posizione da sinistra","popupLocationBar":"Barra degli indirizzi","popupMenuBar":"Barra del menu","popupResizable":"Ridimensionabile","popupScrollBars":"Barre di scorrimento","popupStatusBar":"Barra di stato","popupToolbar":"Barra degli strumenti","popupTop":"Posizione dall'alto","rel":"Relazioni","selectAnchor":"Scegli Ancora","styles":"Stile","tabIndex":"Ordine di tabulazione","target":"Destinazione","targetFrame":"<riquadro>","targetFrameName":"Nome del riquadro di destinazione","targetPopup":"<finestra popup>","targetPopupName":"Nome finestra popup","title":"Collegamento","toAnchor":"Ancora nel testo","toEmail":"E-Mail","toUrl":"URL","toolbar":"Collegamento","type":"Tipo di Collegamento","unlink":"Elimina collegamento","upload":"Carica"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"magicline":{"title":"Inserisci paragrafo qui"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"pastetext":{"button":"Incolla come testo semplice","pasteNotification":"Il browser non permette di incollare il testo semplice in questo modo. Premere %1 per incollare."},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"removeformat":{"toolbar":"Elimina formattazione"},"sourcearea":{"toolbar":"Sorgente"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"scayt":{"btn_about":"About COMS","btn_dictionaries":"Dizionari","btn_disable":"Disabilita COMS","btn_enable":"Abilita COMS","btn_langs":"Lingue","btn_options":"Opzioni","text_title":"Controllo Ortografico Mentre Scrivi"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"undo":{"redo":"Ripristina","undo":"Annulla"},"wsc":{"btnIgnore":"Ignora","btnIgnoreAll":"Ignora tutto","btnReplace":"Cambia","btnReplaceAll":"Cambia tutto","btnUndo":"Annulla","changeTo":"Cambia in","errorLoading":"Errore nel caricamento dell'host col servizio applicativo: %s.","ieSpellDownload":"Contollo ortografico non installato. Lo vuoi scaricare ora?","manyChanges":"Controllo ortografico completato: %1 parole cambiate","noChanges":"Controllo ortografico completato: nessuna parola cambiata","noMispell":"Controllo ortografico completato: nessun errore trovato","noSuggestions":"- Nessun suggerimento -","notAvailable":"Il servizio non è momentaneamente disponibile.","notInDic":"Non nel dizionario","oneChange":"Controllo ortografico completato: 1 parola cambiata","progress":"Controllo ortografico in corso","title":"Controllo ortografico","toolbar":"Correttore ortografico"},"colorbutton":{"auto":"Automatico","bgColorTitle":"Colore sfondo","colors":{"000":"Nero","800000":"Marrone Castagna","8B4513":"Marrone Cuoio","2F4F4F":"Grigio Fumo di Londra","008080":"Acquamarina","000080":"Blu Oceano","4B0082":"Indigo","696969":"Grigio Scuro","B22222":"Giallo Fiamma","A52A2A":"Marrone","DAA520":"Giallo Mimosa","006400":"Verde Scuro","40E0D0":"Turchese","0000CD":"Blue Scuro","800080":"Viola","808080":"Grigio","F00":"Rosso","FF8C00":"Arancio Scuro","FFD700":"Oro","008000":"Verde","0FF":"Ciano","00F":"Blu","EE82EE":"Violetto","A9A9A9":"Grigio Scuro","FFA07A":"Salmone","FFA500":"Arancio","FFFF00":"Giallo","00FF00":"Lime","AFEEEE":"Turchese Chiaro","ADD8E6":"Blu Chiaro","DDA0DD":"Rosso Ciliegia","D3D3D3":"Grigio Chiaro","FFF0F5":"Lavanda Chiara","FAEBD7":"Bianco Antico","FFFFE0":"Giallo Chiaro","F0FFF0":"Verde Mela","F0FFFF":"Azzurro","F0F8FF":"Celeste","E6E6FA":"Lavanda","FFF":"Bianco","1ABC9C":"Ciano intenso","2ECC71":"Smeraldo","3498DB":"Blu luminoso","9B59B6":"Ametista","4E5F70":"Blu grigiastro","F1C40F":"Giallo vivido","16A085":"Ciano scuro","27AE60":"Smeraldo scuro","2980B9":"Blu intenso","8E44AD":"Viola scuro","2C3E50":"Blu desaturato","F39C12":"Arancio","E67E22":"Carota","E74C3C":"Rosso pallido","ECF0F1":"Argento luminoso","95A5A6":"Ciano grigiastro chiaro","DDD":"Grigio chiaro","D35400":"Zucca","C0392B":"Rosso intenso","BDC3C7":"Argento","7F8C8D":"Ciano grigiastro","999":"Grigio scuro"},"more":"Altri colori...","panelTitle":"Colori","textColorTitle":"Colore testo"},"widget":{"move":"Fare clic e trascinare per spostare","label":"Widget %1"},"filetools":{"loadError":"Si è verificato un errore durante la lettura del file.","networkError":"Si è verificato un errore di rete durante il caricamento del file.","httpError404":"Si è verificato un errore HTTP durante il caricamento del file (404: file non trovato).","httpError403":"Si è verificato un errore HTTP durante il caricamento del file (403: accesso negato).","httpError":"Si è verificato un errore HTTP durante il caricamento del file (stato dell'errore: %1).","noUrlError":"L'URL per il caricamento non è stato definito.","responseError":"La risposta del server non è corretta."},"uploadwidget":{"abort":"Caricamento interrotto dall'utente.","doneOne":"Il file è stato caricato correttamente.","doneMany":"%1 file sono stati caricati correttamente.","uploadOne":"Caricamento del file ({percentage}%)...","uploadMany":"Caricamento dei file, {current} di {max} completati ({percentage}%)..."},"font":{"fontSize":{"label":"Dimensione","voiceLabel":"Dimensione Carattere","panelTitle":"Dimensione"},"label":"Carattere","panelTitle":"Carattere","voiceLabel":"Carattere"},"justify":{"block":"Giustifica","center":"Centra","left":"Allinea a sinistra","right":"Allinea a destra"},"colordialog":{"clear":"cancella","highlight":"Evidenzia","options":"Opzioni colore","selected":"Seleziona il colore","title":"Selezionare il colore"}};
\ No newline at end of file
diff --git a/js/ckeditor/lang/pt-br.js b/js/ckeditor/lang/pt-br.js
index b41afcef2..b9bbc22f7 100644
--- a/js/ckeditor/lang/pt-br.js
+++ b/js/ckeditor/lang/pt-br.js
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
+/*
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
 */
 CKEDITOR.lang['pt-br']={"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Tecla Retroceder","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tecla Espaço","35":"End","36":"Home","46":"Delete","224":"Comando"},"keyboardShortcut":"Atalho do teclado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"blockquote":{"toolbar":"Citação"},"button":{"selectedLabel":"%1 (Selecionado)"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"notification":{"closed":"Notificação fechada."},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteNotification":"Your browser doesn't allow you to paste this way. Press %1 to paste."},"contextmenu":{"options":"Opções Menu de Contexto"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"image":{"alt":"Texto Alternativo","border":"Borda","btnUpload":"Enviar para o Servidor","button2Img":"Deseja transformar o botão de imagem em uma imagem comum?","hSpace":"HSpace","img2Button":"Deseja transformar a imagem em um botão de imagem?","infoTab":"Informações da Imagem","linkTab":"Link","lockRatio":"Travar Proporções","menu":"Formatar Imagem","resetSize":"Redefinir para o Tamanho Original","title":"Formatar Imagem","titleButton":"Formatar Botão de Imagem","upload":"Enviar","urlMissing":"URL da imagem está faltando.","vSpace":"VSpace","validateBorder":"A borda deve ser um número inteiro.","validateHSpace":"O HSpace deve ser um número inteiro.","validateVSpace":"O VSpace deve ser um número inteiro."},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"fakeobjects":{"anchor":"Âncora","flash":"Animação em Flash","hiddenfield":"Campo Oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"link":{"acccessKey":"Chave de Acesso","advanced":"Avançado","advisoryContentType":"Tipo de Conteúdo","advisoryTitle":"Título","anchor":{"toolbar":"Inserir/Editar Âncora","menu":"Formatar Âncora","title":"Formatar Âncora","name":"Nome da Âncora","errorName":"Por favor, digite o nome da âncora","remove":"Remover Âncora"},"anchorId":"Id da âncora","anchorName":"Nome da âncora","charset":"Charset do Link","cssClasses":"Classe de CSS","download":"Forçar Download","displayText":"Exibir Texto","emailAddress":"Endereço E-Mail","emailBody":"Corpo da Mensagem","emailSubject":"Assunto da Mensagem","id":"Id","info":"Informações","langCode":"Direção do idioma","langDir":"Direção do idioma","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","menu":"Editar Link","name":"Nome","noAnchors":"(Não há âncoras no documento)","noEmail":"Por favor, digite o endereço de e-mail","noUrl":"Por favor, digite o endereço do Link","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Propriedades da Janela Pop-up","popupFullScreen":"Modo Tela Cheia (IE)","popupLeft":"Esquerda","popupLocationBar":"Barra de Endereços","popupMenuBar":"Barra de Menus","popupResizable":"Redimensionável","popupScrollBars":"Barras de Rolagem","popupStatusBar":"Barra de Status","popupToolbar":"Barra de Ferramentas","popupTop":"Topo","rel":"Tipo de Relação","selectAnchor":"Selecione uma âncora","styles":"Estilos","tabIndex":"Índice de Tabulação","target":"Destino","targetFrame":"<frame>","targetFrameName":"Nome do Frame de Destino","targetPopup":"<janela popup>","targetPopupName":"Nome da Janela Pop-up","title":"Editar Link","toAnchor":"Âncora nesta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserir/Editar Link","type":"Tipo de hiperlink","unlink":"Remover Link","upload":"Enviar ao Servidor"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"magicline":{"title":"Insera um parágrafo aqui"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"pastetext":{"button":"Colar como Texto sem Formatação","pasteNotification":"Your browser does not allow you to paste plain text this way. Press %1 to paste."},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"removeformat":{"toolbar":"Remover Formatação"},"sourcearea":{"toolbar":"Código-Fonte"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"scayt":{"btn_about":"Sobre a correção ortográfica durante a digitação","btn_dictionaries":"Dicionários","btn_disable":"Desabilitar correção ortográfica durante a digitação","btn_enable":"Habilitar correção ortográfica durante a digitação","btn_langs":"Idiomas","btn_options":"Opções","text_title":"Correção ortográfica durante a digitação"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"undo":{"redo":"Refazer","undo":"Desfazer"},"wsc":{"btnIgnore":"Ignorar uma vez","btnIgnoreAll":"Ignorar Todas","btnReplace":"Alterar","btnReplaceAll":"Alterar Todas","btnUndo":"Desfazer","changeTo":"Alterar para","errorLoading":"Erro carregando servidor de aplicação: %s.","ieSpellDownload":"A verificação ortográfica não foi instalada. Você gostaria de realizar o download agora?","manyChanges":"Verificação ortográfica encerrada: %1 palavras foram alteradas","noChanges":"Verificação ortográfica encerrada: Não houve alterações","noMispell":"Verificação encerrada: Não foram encontrados erros de ortografia","noSuggestions":"-sem sugestões de ortografia-","notAvailable":"Desculpe, o serviço não está disponível no momento.","notInDic":"Não encontrada","oneChange":"Verificação ortográfica encerrada: Uma palavra foi alterada","progress":"Verificação ortográfica em andamento...","title":"Corretor Ortográfico","toolbar":"Verificar Ortografia"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do Plano de Fundo","colors":{"000":"Preto","800000":"Foquete","8B4513":"Marrom 1","2F4F4F":"Cinza 1","008080":"Cerceta","000080":"Azul Marinho","4B0082":"Índigo","696969":"Cinza 2","B22222":"Tijolo de Fogo","A52A2A":"Marrom 2","DAA520":"Vara Dourada","006400":"Verde Escuro","40E0D0":"Turquesa","0000CD":"Azul Médio","800080":"Roxo","808080":"Cinza 3","F00":"Vermelho","FF8C00":"Laranja Escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza Escuro","FFA07A":"Salmão Claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa Pálido","ADD8E6":"Azul Claro","DDA0DD":"Ameixa","D3D3D3":"Cinza Claro","FFF0F5":"Lavanda 1","FAEBD7":"Branco Antiguidade","FFFFE0":"Amarelo Claro","F0FFF0":"Orvalho","F0FFFF":"Azure","F0F8FF":"Azul Alice","E6E6FA":"Lavanda 2","FFF":"Branco","1ABC9C":"Ciano Forte","2ECC71":"Esmeralda","3498DB":"Azul Brilhante","9B59B6":"Ametista","4E5F70":"Azul acinzentado","F1C40F":"Amarelo Vívido","16A085":"Ciano Escuro","27AE60":"Esmeralda Escura","2980B9":"Azul Forte","8E44AD":"Violeta Escura","2C3E50":"Azul Dessaturado","F39C12":"Laranja","E67E22":"Laranja Cenoura","E74C3C":"Vermelho Pálido","ECF0F1":"Prata Brilhante","95A5A6":"Ciano Acinzentado Claro ","DDD":"Cinza Claro","D35400":"Abóbora","C0392B":"Vermelho Forte","BDC3C7":"Prata","7F8C8D":"Ciano Acinzentado","999":"Cinza Escuro"},"more":"Mais Cores...","panelTitle":"Cores","textColorTitle":"Cor do Texto"},"widget":{"move":"Click e arraste para mover","label":"%1 widget"},"filetools":{"loadError":"Um erro ocorreu durante a leitura do arquivo.","networkError":"Um erro de rede ocorreu durante o envio do arquivo.","httpError404":"Um erro HTTP ocorreu durante o envio do arquivo (404: Arquivo não encontrado).","httpError403":"Um erro HTTP ocorreu durante o envio do arquivo (403: Proibido).","httpError":"Um erro HTTP ocorreu durante o envio do arquivo (status do erro: %1)","noUrlError":"A URL de upload não está definida.","responseError":"Resposta incorreta do servidor."},"uploadwidget":{"abort":"Envio cancelado pelo usuário.","doneOne":"Arquivo enviado com sucesso.","doneMany":"Enviados %1 arquivos com sucesso.","uploadOne":"Enviando arquivo({percentage}%)...","uploadMany":"Enviando arquivos, {current} de {max} completos ({percentage}%)..."},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da fonte","panelTitle":"Tamanho"},"label":"Fonte","panelTitle":"Fonte","voiceLabel":"Fonte"},"justify":{"block":"Justificado","center":"Centralizar","left":"Alinhar Esquerda","right":"Alinhar Direita"},"colordialog":{"clear":"Limpar","highlight":"Grifar","options":"Opções de Cor","selected":"Cor Selecionada","title":"Selecione uma Cor"}};
\ No newline at end of file
diff --git a/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
index 28e8dae97..58f07c35c 100644
--- a/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+++ b/js/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
@@ -1,25 +1,25 @@
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-
-cs.js      Found: 30 Missing: 0
-cy.js      Found: 30 Missing: 0
-da.js      Found: 12 Missing: 18
-de.js      Found: 30 Missing: 0
-el.js      Found: 25 Missing: 5
-eo.js      Found: 30 Missing: 0
-fa.js      Found: 30 Missing: 0
-fi.js      Found: 30 Missing: 0
-fr.js      Found: 30 Missing: 0
-gu.js      Found: 12 Missing: 18
-he.js      Found: 30 Missing: 0
-it.js      Found: 30 Missing: 0
-mk.js      Found: 5 Missing: 25
-nb.js      Found: 30 Missing: 0
-nl.js      Found: 30 Missing: 0
-no.js      Found: 30 Missing: 0
-pt-br.js   Found: 30 Missing: 0
-ro.js      Found: 6 Missing: 24
-tr.js      Found: 30 Missing: 0
-ug.js      Found: 27 Missing: 3
-vi.js      Found: 6 Missing: 24
-zh-cn.js   Found: 30 Missing: 0
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+
+cs.js      Found: 30 Missing: 0
+cy.js      Found: 30 Missing: 0
+da.js      Found: 12 Missing: 18
+de.js      Found: 30 Missing: 0
+el.js      Found: 25 Missing: 5
+eo.js      Found: 30 Missing: 0
+fa.js      Found: 30 Missing: 0
+fi.js      Found: 30 Missing: 0
+fr.js      Found: 30 Missing: 0
+gu.js      Found: 12 Missing: 18
+he.js      Found: 30 Missing: 0
+it.js      Found: 30 Missing: 0
+mk.js      Found: 5 Missing: 25
+nb.js      Found: 30 Missing: 0
+nl.js      Found: 30 Missing: 0
+no.js      Found: 30 Missing: 0
+pt-br.js   Found: 30 Missing: 0
+ro.js      Found: 6 Missing: 24
+tr.js      Found: 30 Missing: 0
+ug.js      Found: 27 Missing: 3
+vi.js      Found: 6 Missing: 24
+zh-cn.js   Found: 30 Missing: 0
diff --git a/js/ckeditor/plugins/colordialog/dialogs/colordialog.css b/js/ckeditor/plugins/colordialog/dialogs/colordialog.css
index 3ec0d2a91..e284ba089 100644
--- a/js/ckeditor/plugins/colordialog/dialogs/colordialog.css
+++ b/js/ckeditor/plugins/colordialog/dialogs/colordialog.css
@@ -1,20 +1,20 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-.cke_colordialog_colorcell {
-	width: 12px; /* All cells have equal width which depends on parent width (in this case table parent). Width works more like max-width. */
-	height: 14px;
-	padding: 1px; /* Padding is replaced by border for focused cells. Prevents 'jumping' when adding borders. */
-}
-
-.cke_colordialog_colorcell.cke_colordialog_focused_light,
-.cke_colordialog_colorcell.cke_colordialog_focused_dark {
-	padding: 0; /* Shrink cell to allow 1px border indicating focus. */
-	border: 1px dotted #000;
-}
-
-.cke_colordialog_colorcell.cke_colordialog_focused_dark {
-	border-color: #FFF;
-}
+/**
+ * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
+ */
+
+.cke_colordialog_colorcell {
+	width: 12px; /* All cells have equal width which depends on parent width (in this case table parent). Width works more like max-width. */
+	height: 14px;
+	padding: 1px; /* Padding is replaced by border for focused cells. Prevents 'jumping' when adding borders. */
+}
+
+.cke_colordialog_colorcell.cke_colordialog_focused_light,
+.cke_colordialog_colorcell.cke_colordialog_focused_dark {
+	padding: 0; /* Shrink cell to allow 1px border indicating focus. */
+	border: 1px dotted #000;
+}
+
+.cke_colordialog_colorcell.cke_colordialog_focused_dark {
+	border-color: #FFF;
+}
diff --git a/js/ckeditor/plugins/confighelper/docs/install.html b/js/ckeditor/plugins/confighelper/docs/install.html
index 01c5314e7..5e62bb4e8 100644
--- a/js/ckeditor/plugins/confighelper/docs/install.html
+++ b/js/ckeditor/plugins/confighelper/docs/install.html
@@ -1,124 +1,124 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-	"http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Configuration Helper plugin</title>
-<link href="styles.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h1>Configuration Helper Plugin for CKEditor</h1>
-
-<h2>Introduction</h2>
-<p>This plugin tries to help setup <a href="http://www.ckeditor.com">CKEditor</a> by providing additional configuration options to perform some
-kind of common tasks.</p>
-<p>Currently if offers a "removeDialogFields" that allows to remove individual fields in the dialogs (versus removing whole tabs with
-<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.removeDialogTabs">removeDialogTabs</a>, and "dialogFieldsDefaultValues"
-defines default values for dialog fields.</p>
-
-<h3 id="contact">Author:</h3>
-<p><a href="mailto:amla70@gmail.com">Alfonso Mart&iacute;nez de Lizarrondo</a></p>
-
-<h3>Version history: </h3>
-<ol>
-  <li>1.0: 26-February-2012. First version.</li>
-  <li>1.1: 16-February-2012. Added placeholder.</li>
-  <li>1.2: 23-April-2012. Added hideDialogFields.</li>
-  <li>1.3: 1-December-2012. Compatibility with CKEditor 4.</li>
-  <li>1.4: 28-March-2013. Compatibility of the "placeholder" attribute with the inline mode of CKEditor 4.</li>
-  <li>1.5: 16-April-2013. Version 1.4 was broken in CKEditor 3.</li>
-  <li>1.6: 16-August-2013. Handle the setData method to update the "placeholder" status</li>
-  <li>1.7: 6-October-2013. <a href="https://github.com/AlfonsoML/confighelper/pull/2">Patch by bfavors</a> to fix handling placeholder on initial load of editor</li>
-  <li>1.8: 9-March-2014. <a href="http://ckeditor.com/comment/reply/128664/130294">Check for IE11 by Russel Ward</a><br>
-		Set caret into the empty paragraph correctly on first focus, <a href="https://github.com/AlfonsoML/confighelper/pull/5">patch by glanchow</a>
-	</li>
-  <li>1.8.1: 5-April-2014. <a href="https://github.com/AlfonsoML/confighelper/issues/6">Fix IE8 & IE9 problem with "inline textarea" if it's empty on start</a>
-	</li>
-  <li>1.8.2: 12-April-2014. <a href="https://github.com/AlfonsoML/confighelper/pull/8">Protect detection of empty content</a>. Thanks to tanihito.
-	</li>
-  <li>1.8.3: 30-November-2014. Force SCAYT to use the language that it's specified as the language for the contents.<br>
-			<a href="https://github.com/AlfonsoML/confighelper/pull/13">Listen to the contentDom event to avoid problems when calling setData in WYSIWYG mode</a>. Thanks to noam-si.
-	</li>
-</ol>
-
-<h2>Installation</h2>
-<h3>1. Copying the files</h3>
-<p>Extract the contents of the zip in you plugins directory, so it ends up like
-    this<br>
-    <!--<img src="installation.png" alt="Screenshot of installation" width="311" height="346" longdesc="#install">-->
-    </p>
-<pre id="--install">
-ckeditor\
-	...
-	images\
-	lang\
-	plugins\
-		...
-		confighelper\
-			plugin.js
-			docs\
-				install.html
-		...
-	skins\
-	themes\
-</pre>
-<h3>2. Adding it to CKEditor</h3>
-<p>Now add the plugin in your <em>config.js</em> or custom js configuration
-file:
-<code>config.extraPlugins='confighelper'; </code>
-</p>
-
-<h3>3. Configuration</h3>
-<h4>config.removeDialogFields</h4>
-<p>This entry is a string, the fields are defined as dialogName + ":" + tab + ":" + field. Fields are joined with semicolons.
-In order to learn the name of the parameters you can use the "Developer Tools plugin", launch that sample and open the dialog that you want to customize.
-Now a little popup with appear showing the info about that field, for example:
-<pre><u>Element Information</u>
-Dialog window name : image
-Tab name : info
-Element ID : txtBorder
-Element type : text
-</pre>
-so in order to remove the class attribute for images the config is:
-<pre>config.removeDialogFields="image:info:txtBorder";</pre>
-removing another field
-<pre>config.removeDialogFields="image:info:txtBorder;image:info:txtHSpace";</pre>
-
-<h4>config.dialogFieldsDefaultValues</h4>
-<p>This setting uses directly a JSON object as the configuration value, first an object that has the dialog names as properties, each property is
-a new object with the name of the tabs and finally each property name maps to the field name and it's value is the default value to use for the field.</p>
-<p>An example might be much better as I might have messed up something in the description:</p>
-<pre>config.dialogFieldsDefaultValues =
-{
-	image:
-		{
-			advanced:
-				{
-					txtGenClass : 'myClass',
-					txtGenTitle : 'Image title'
-				}
-		}
-};
-</pre>
-
-<h4>config.placeholder</h4>
-<p>This a text that will be shown when the editor is empty following the HTML5 placeholder attribute. When the user focus the editor, the content is
-cleared automatically.</p>
-<p>The value can be set in the configuration or as an attribute of the replaced element</p>
-<pre>config.placeholder = 'Type here...';</pre>
-
-<h4>config.hideDialogFields</h4>
-<p>This entry uses the same sintax that the 'removeDialogFields' option. The difference is that some fields can't be removed easily as other parts of the dialog
-might not be ready and might try to always use it, generating a javascript error. In other cases the layout might be broken if the field is removed instead of hidden.<br>
-In those cases it's possible to hide the fields using this entry, and the preview in the image dialog is an example of such a field.</p>
-<pre>config.hideDialogFields="image:info:htmlPreview";</pre>
-
-<!--
-<h2>Final notes</h2>
--->
-
-<h2>Disclaimers</h2>
-<p>CKEditor is  &copy; CKSource.com</p>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Configuration Helper plugin</title>
+<link href="styles.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+<h1>Configuration Helper Plugin for CKEditor</h1>
+
+<h2>Introduction</h2>
+<p>This plugin tries to help setup <a href="http://www.ckeditor.com">CKEditor</a> by providing additional configuration options to perform some
+kind of common tasks.</p>
+<p>Currently if offers a "removeDialogFields" that allows to remove individual fields in the dialogs (versus removing whole tabs with
+<a href="http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.removeDialogTabs">removeDialogTabs</a>, and "dialogFieldsDefaultValues"
+defines default values for dialog fields.</p>
+
+<h3 id="contact">Author:</h3>
+<p><a href="mailto:amla70@gmail.com">Alfonso Mart&iacute;nez de Lizarrondo</a></p>
+
+<h3>Version history: </h3>
+<ol>
+  <li>1.0: 26-February-2012. First version.</li>
+  <li>1.1: 16-February-2012. Added placeholder.</li>
+  <li>1.2: 23-April-2012. Added hideDialogFields.</li>
+  <li>1.3: 1-December-2012. Compatibility with CKEditor 4.</li>
+  <li>1.4: 28-March-2013. Compatibility of the "placeholder" attribute with the inline mode of CKEditor 4.</li>
+  <li>1.5: 16-April-2013. Version 1.4 was broken in CKEditor 3.</li>
+  <li>1.6: 16-August-2013. Handle the setData method to update the "placeholder" status</li>
+  <li>1.7: 6-October-2013. <a href="https://github.com/AlfonsoML/confighelper/pull/2">Patch by bfavors</a> to fix handling placeholder on initial load of editor</li>
+  <li>1.8: 9-March-2014. <a href="http://ckeditor.com/comment/reply/128664/130294">Check for IE11 by Russel Ward</a><br>
+		Set caret into the empty paragraph correctly on first focus, <a href="https://github.com/AlfonsoML/confighelper/pull/5">patch by glanchow</a>
+	</li>
+  <li>1.8.1: 5-April-2014. <a href="https://github.com/AlfonsoML/confighelper/issues/6">Fix IE8 & IE9 problem with "inline textarea" if it's empty on start</a>
+	</li>
+  <li>1.8.2: 12-April-2014. <a href="https://github.com/AlfonsoML/confighelper/pull/8">Protect detection of empty content</a>. Thanks to tanihito.
+	</li>
+  <li>1.8.3: 30-November-2014. Force SCAYT to use the language that it's specified as the language for the contents.<br>
+			<a href="https://github.com/AlfonsoML/confighelper/pull/13">Listen to the contentDom event to avoid problems when calling setData in WYSIWYG mode</a>. Thanks to noam-si.
+	</li>
+</ol>
+
+<h2>Installation</h2>
+<h3>1. Copying the files</h3>
+<p>Extract the contents of the zip in you plugins directory, so it ends up like
+    this<br>
+    <!--<img src="installation.png" alt="Screenshot of installation" width="311" height="346" longdesc="#install">-->
+    </p>
+<pre id="--install">
+ckeditor\
+	...
+	images\
+	lang\
+	plugins\
+		...
+		confighelper\
+			plugin.js
+			docs\
+				install.html
+		...
+	skins\
+	themes\
+</pre>
+<h3>2. Adding it to CKEditor</h3>
+<p>Now add the plugin in your <em>config.js</em> or custom js configuration
+file:
+<code>config.extraPlugins='confighelper'; </code>
+</p>
+
+<h3>3. Configuration</h3>
+<h4>config.removeDialogFields</h4>
+<p>This entry is a string, the fields are defined as dialogName + ":" + tab + ":" + field. Fields are joined with semicolons.
+In order to learn the name of the parameters you can use the "Developer Tools plugin", launch that sample and open the dialog that you want to customize.
+Now a little popup with appear showing the info about that field, for example:
+<pre><u>Element Information</u>
+Dialog window name : image
+Tab name : info
+Element ID : txtBorder
+Element type : text
+</pre>
+so in order to remove the class attribute for images the config is:
+<pre>config.removeDialogFields="image:info:txtBorder";</pre>
+removing another field
+<pre>config.removeDialogFields="image:info:txtBorder;image:info:txtHSpace";</pre>
+
+<h4>config.dialogFieldsDefaultValues</h4>
+<p>This setting uses directly a JSON object as the configuration value, first an object that has the dialog names as properties, each property is
+a new object with the name of the tabs and finally each property name maps to the field name and it's value is the default value to use for the field.</p>
+<p>An example might be much better as I might have messed up something in the description:</p>
+<pre>config.dialogFieldsDefaultValues =
+{
+	image:
+		{
+			advanced:
+				{
+					txtGenClass : 'myClass',
+					txtGenTitle : 'Image title'
+				}
+		}
+};
+</pre>
+
+<h4>config.placeholder</h4>
+<p>This a text that will be shown when the editor is empty following the HTML5 placeholder attribute. When the user focus the editor, the content is
+cleared automatically.</p>
+<p>The value can be set in the configuration or as an attribute of the replaced element</p>
+<pre>config.placeholder = 'Type here...';</pre>
+
+<h4>config.hideDialogFields</h4>
+<p>This entry uses the same sintax that the 'removeDialogFields' option. The difference is that some fields can't be removed easily as other parts of the dialog
+might not be ready and might try to always use it, generating a javascript error. In other cases the layout might be broken if the field is removed instead of hidden.<br>
+In those cases it's possible to hide the fields using this entry, and the preview in the image dialog is an example of such a field.</p>
+<pre>config.hideDialogFields="image:info:htmlPreview";</pre>
+
+<!--
+<h2>Final notes</h2>
+-->
+
+<h2>Disclaimers</h2>
+<p>CKEditor is  &copy; CKSource.com</p>
+</body>
+</html>
diff --git a/js/ckeditor/plugins/confighelper/docs/styles.css b/js/ckeditor/plugins/confighelper/docs/styles.css
index 37029eac8..2f8c577ac 100644
--- a/js/ckeditor/plugins/confighelper/docs/styles.css
+++ b/js/ckeditor/plugins/confighelper/docs/styles.css
@@ -1,59 +1,59 @@
-body {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 90%;
-}
-h1 {
-	text-align:center;
-	font-size:180%;
-}
-h2 {
-	border-bottom:2px solid #CCC;
-	margin:1em 0 0.4em 0;
-}
-h3 {
-	margin-bottom:0.4em;
-}
-p {
-	margin:0 0 1em 1em;
-	text-align:justify;
-}
-ol {
-	margin:0 0 1.2em 1em;
-	padding:0;
-	list-style-type:none;
-}
-ol li {
-	margin:0.2em 0;
-}
-pre, code {
-	font-size:100%;
-	font-family:"Courier New", Courier, mono;
-	background-color: #CCCCCC;
-	border:1px solid #999;
-	padding:0.2em 1em;
-	margin: 0.4em 0;
-	display:block;
-	white-space: pre;
-	overflow: auto;
-}
-form {
-	margin:0 0 0 1em;
-}
-span.key {
-	color: #006600;
-}
-#install {
-	display:none
-}
-#languages ul {
-	display:inline;
-	list-style-type:none;
-	margin:0;
-	padding:0;
-}
-#languages li {
-	display:inline;
-	margin:0;
-	padding:0;
-	vertical-align:bottom;
-}
+body {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 90%;
+}
+h1 {
+	text-align:center;
+	font-size:180%;
+}
+h2 {
+	border-bottom:2px solid #CCC;
+	margin:1em 0 0.4em 0;
+}
+h3 {
+	margin-bottom:0.4em;
+}
+p {
+	margin:0 0 1em 1em;
+	text-align:justify;
+}
+ol {
+	margin:0 0 1.2em 1em;
+	padding:0;
+	list-style-type:none;
+}
+ol li {
+	margin:0.2em 0;
+}
+pre, code {
+	font-size:100%;
+	font-family:"Courier New", Courier, mono;
+	background-color: #CCCCCC;
+	border:1px solid #999;
+	padding:0.2em 1em;
+	margin: 0.4em 0;
+	display:block;
+	white-space: pre;
+	overflow: auto;
+}
+form {
+	margin:0 0 0 1em;
+}
+span.key {
+	color: #006600;
+}
+#install {
+	display:none
+}
+#languages ul {
+	display:inline;
+	list-style-type:none;
+	margin:0;
+	padding:0;
+}
+#languages li {
+	display:inline;
+	margin:0;
+	padding:0;
+	vertical-align:bottom;
+}
diff --git a/js/ckeditor/plugins/scayt/CHANGELOG.md b/js/ckeditor/plugins/scayt/CHANGELOG.md
index d956208b3..05cf2ddc7 100644
--- a/js/ckeditor/plugins/scayt/CHANGELOG.md
+++ b/js/ckeditor/plugins/scayt/CHANGELOG.md
@@ -1,20 +1,20 @@
-SCAYT plugin for CKEditor 4 Changelog
-====================
-### CKEditor 4.5.6
-
-New Features:
-* CKEditor [language addon](http://ckeditor.com/addon/language) support
-* CKEditor [placeholder addon](http://ckeditor.com/addon/placeholder) support
-* Drag and Drop support
-* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25
-
-Fixed issues:
-* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core.
-* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements
-* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting
-* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page
-* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content
-* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe
-* SCAYT stops working when CKEditor Undo plug-in not enabled
-* Issue with pasting SCAYT markup in CKEditor
-* [#32](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/32) SCAYT stops working after pressing Cancel button in WSC dialog
+SCAYT plugin for CKEditor 4 Changelog
+====================
+### CKEditor 4.5.6
+
+New Features:
+* CKEditor [language addon](http://ckeditor.com/addon/language) support
+* CKEditor [placeholder addon](http://ckeditor.com/addon/placeholder) support
+* Drag and Drop support
+* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25
+
+Fixed issues:
+* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core.
+* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements
+* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting
+* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page
+* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content
+* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe
+* SCAYT stops working when CKEditor Undo plug-in not enabled
+* Issue with pasting SCAYT markup in CKEditor
+* [#32](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/32) SCAYT stops working after pressing Cancel button in WSC dialog
diff --git a/js/ckeditor/plugins/scayt/LICENSE.md b/js/ckeditor/plugins/scayt/LICENSE.md
index 844ab4de0..610c80780 100644
--- a/js/ckeditor/plugins/scayt/LICENSE.md
+++ b/js/ckeditor/plugins/scayt/LICENSE.md
@@ -1,28 +1,28 @@
-Software License Agreement
-==========================
-
-**CKEditor SCAYT Plugin**
-Copyright &copy; 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved.
-
-Licensed under the terms of any of the following licenses at your choice:
-
-*   GNU General Public License Version 2 or later (the "GPL"):
-    http://www.gnu.org/licenses/gpl.html
-
-*   GNU Lesser General Public License Version 2.1 or later (the "LGPL"):
-    http://www.gnu.org/licenses/lgpl.html
-
-*   Mozilla Public License Version 1.1 or later (the "MPL"):
-    http://www.mozilla.org/MPL/MPL-1.1.html
-
-You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice.
-
-Sources of Intellectual Property Included in this plugin
---------------------------------------------------------
-
-Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission.
-
-Trademarks
-----------
-
-CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
+Software License Agreement
+==========================
+
+**CKEditor SCAYT Plugin**
+Copyright &copy; 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved.
+
+Licensed under the terms of any of the following licenses at your choice:
+
+*   GNU General Public License Version 2 or later (the "GPL"):
+    http://www.gnu.org/licenses/gpl.html
+
+*   GNU Lesser General Public License Version 2.1 or later (the "LGPL"):
+    http://www.gnu.org/licenses/lgpl.html
+
+*   Mozilla Public License Version 1.1 or later (the "MPL"):
+    http://www.mozilla.org/MPL/MPL-1.1.html
+
+You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice.
+
+Sources of Intellectual Property Included in this plugin
+--------------------------------------------------------
+
+Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission.
+
+Trademarks
+----------
+
+CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
diff --git a/js/ckeditor/plugins/scayt/README.md b/js/ckeditor/plugins/scayt/README.md
index 1231d91ec..1b3de25d3 100644
--- a/js/ckeditor/plugins/scayt/README.md
+++ b/js/ckeditor/plugins/scayt/README.md
@@ -1,25 +1,25 @@
-CKEditor SCAYT Plugin
-=====================
-
-This plugin brings Spell Check As You Type (SCAYT) into up to CKEditor 4+.
-
-SCAYT is a "installation-less", using the web-services of [WebSpellChecker.net](http://www.webspellchecker.net/). It's an out of the box solution.
-
-Installation
-------------
-
-1. Clone/copy this repository contents in a new "plugins/scayt" folder in your CKEditor installation.
-2. Enable the "scayt" plugin in the CKEditor configuration file (config.js):
-
-        config.extraPlugins = 'scayt';
-
-That's all. SCAYT will appear on the editor toolbar and will be ready to use.
-
-License
--------
-
-Licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
-
-See LICENSE.md for more information.
-
-Developed in cooperation with [WebSpellChecker.net](http://www.webspellchecker.net/).
+CKEditor SCAYT Plugin
+=====================
+
+This plugin brings Spell Check As You Type (SCAYT) into up to CKEditor 4+.
+
+SCAYT is a "installation-less", using the web-services of [WebSpellChecker.net](http://www.webspellchecker.net/). It's an out of the box solution.
+
+Installation
+------------
+
+1. Clone/copy this repository contents in a new "plugins/scayt" folder in your CKEditor installation.
+2. Enable the "scayt" plugin in the CKEditor configuration file (config.js):
+
+        config.extraPlugins = 'scayt';
+
+That's all. SCAYT will appear on the editor toolbar and will be ready to use.
+
+License
+-------
+
+Licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
+
+See LICENSE.md for more information.
+
+Developed in cooperation with [WebSpellChecker.net](http://www.webspellchecker.net/).
diff --git a/js/ckeditor/plugins/scayt/dialogs/dialog.css b/js/ckeditor/plugins/scayt/dialogs/dialog.css
index aef75684f..427c4b42d 100644
--- a/js/ckeditor/plugins/scayt/dialogs/dialog.css
+++ b/js/ckeditor/plugins/scayt/dialogs/dialog.css
@@ -1,23 +1,23 @@
-div.cke_dialog_ui_scaytItemList {
-	border: 1px solid #c9cccf;
-}
-
-.cke_scaytItemList-child {
-	position: relative;
-	padding: 6px 30px 6px 5px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-.cke_scaytItemList-child:hover {
-	background: #ebebeb;
-}
-
-.cke_scaytItemList-child .cke_scaytItemList_remove {
-	position: absolute;
-	top: 0;
-	right: 5px;
-	width: 26px;
-	height: 26px;
-}
+div.cke_dialog_ui_scaytItemList {
+	border: 1px solid #c9cccf;
+}
+
+.cke_scaytItemList-child {
+	position: relative;
+	padding: 6px 30px 6px 5px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.cke_scaytItemList-child:hover {
+	background: #ebebeb;
+}
+
+.cke_scaytItemList-child .cke_scaytItemList_remove {
+	position: absolute;
+	top: 0;
+	right: 5px;
+	width: 26px;
+	height: 26px;
+}
diff --git a/js/ckeditor/plugins/scayt/dialogs/toolbar.css b/js/ckeditor/plugins/scayt/dialogs/toolbar.css
index ecabdac9d..861f43e3b 100644
--- a/js/ckeditor/plugins/scayt/dialogs/toolbar.css
+++ b/js/ckeditor/plugins/scayt/dialogs/toolbar.css
@@ -1,71 +1,71 @@
-a
-{
-	text-decoration:none;
-	padding: 2px 4px 4px 6px;
-	display : block;
-	border-width: 1px;
-	border-style: solid;
-	margin : 0px;
-}
-
-a.cke_scayt_toogle:hover,
-a.cke_scayt_toogle:focus,
-a.cke_scayt_toogle:active
-{
-	border-color: #316ac5;
-	background-color: #dff1ff;
-	color : #000;
-	cursor: pointer;
-	margin : 0px;
-}
-a.cke_scayt_toogle {
-	color : #316ac5;
-	border-color: #fff;
-}
-.scayt_enabled a.cke_scayt_item {
-	color : #316ac5;
-	border-color: #fff;
-	margin : 0px;
-}
-.scayt_disabled a.cke_scayt_item {
-	color : gray;
-	border-color : #fff;
-}
-.scayt_enabled a.cke_scayt_item:hover,
-.scayt_enabled a.cke_scayt_item:focus,
-.scayt_enabled a.cke_scayt_item:active
-{
-	border-color: #316ac5;
-	background-color: #dff1ff;
-	color : #000;
-	cursor: pointer;
-}
-.scayt_disabled a.cke_scayt_item:hover,
-.scayt_disabled a.cke_scayt_item:focus,
-.scayt_disabled a.cke_scayt_item:active
-{
-	border-color: gray;
-	background-color: #dff1ff;
-	color : gray;
-	cursor: no-drop;
-}
-.cke_scayt_set_on, .cke_scayt_set_off
-{
-	display: none;
-}
-.scayt_enabled .cke_scayt_set_on
-{
-	display: none;
-}
-.scayt_disabled .cke_scayt_set_on
-{
-	display: inline;
-}
-.scayt_disabled .cke_scayt_set_off
-{
-	display: none;
-}
-.scayt_enabled  .cke_scayt_set_off
-{
-	display: inline;
-}
+a
+{
+	text-decoration:none;
+	padding: 2px 4px 4px 6px;
+	display : block;
+	border-width: 1px;
+	border-style: solid;
+	margin : 0px;
+}
+
+a.cke_scayt_toogle:hover,
+a.cke_scayt_toogle:focus,
+a.cke_scayt_toogle:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+	color : #000;
+	cursor: pointer;
+	margin : 0px;
+}
+a.cke_scayt_toogle {
+	color : #316ac5;
+	border-color: #fff;
+}
+.scayt_enabled a.cke_scayt_item {
+	color : #316ac5;
+	border-color: #fff;
+	margin : 0px;
+}
+.scayt_disabled a.cke_scayt_item {
+	color : gray;
+	border-color : #fff;
+}
+.scayt_enabled a.cke_scayt_item:hover,
+.scayt_enabled a.cke_scayt_item:focus,
+.scayt_enabled a.cke_scayt_item:active
+{
+	border-color: #316ac5;
+	background-color: #dff1ff;
+	color : #000;
+	cursor: pointer;
+}
+.scayt_disabled a.cke_scayt_item:hover,
+.scayt_disabled a.cke_scayt_item:focus,
+.scayt_disabled a.cke_scayt_item:active
+{
+	border-color: gray;
+	background-color: #dff1ff;
+	color : gray;
+	cursor: no-drop;
+}
+.cke_scayt_set_on, .cke_scayt_set_off
+{
+	display: none;
+}
+.scayt_enabled .cke_scayt_set_on
+{
+	display: none;
+}
+.scayt_disabled .cke_scayt_set_on
+{
+	display: inline;
+}
+.scayt_disabled .cke_scayt_set_off
+{
+	display: none;
+}
+.scayt_enabled  .cke_scayt_set_off
+{
+	display: inline;
+}
diff --git a/js/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css b/js/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
index 8d624be47..53f522205 100644
--- a/js/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
+++ b/js/ckeditor/plugins/scayt/skins/moono-lisa/scayt.css
@@ -1,25 +1,25 @@
-.scayt-lang-list > div
-{
-    padding-bottom: 6px !important;
-}
-
-.scayt-lang-list > div input
-{
-    margin-right: 4px;
-}
-
-#scayt_about_
-{
-    margin: 30px auto 0 auto;
-}
-
-#scayt_about_ p
-{
-	text-align: center;
-	margin-bottom: 10px;
-}
-
-.cke_dialog_contents_body div[name=dictionaries] .cke_dialog_ui_hbox_last > a.cke_dialog_ui_button
-{
-    margin-top: 0;
-}
+.scayt-lang-list > div
+{
+    padding-bottom: 6px !important;
+}
+
+.scayt-lang-list > div input
+{
+    margin-right: 4px;
+}
+
+#scayt_about_
+{
+    margin: 30px auto 0 auto;
+}
+
+#scayt_about_ p
+{
+	text-align: center;
+	margin-bottom: 10px;
+}
+
+.cke_dialog_contents_body div[name=dictionaries] .cke_dialog_ui_hbox_last > a.cke_dialog_ui_button
+{
+    margin-top: 0;
+}
diff --git a/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
index 795239bbc..58f21b07c 100644
--- a/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+++ b/js/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
@@ -1,20 +1,20 @@
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-
-cs.js      Found: 118 Missing: 0
-cy.js      Found: 118 Missing: 0
-de.js      Found: 118 Missing: 0
-el.js      Found: 16 Missing: 102
-eo.js      Found: 118 Missing: 0
-et.js      Found: 31 Missing: 87
-fa.js      Found: 24 Missing: 94
-fi.js      Found: 23 Missing: 95
-fr.js      Found: 118 Missing: 0
-hr.js      Found: 23 Missing: 95
-it.js      Found: 118 Missing: 0
-nb.js      Found: 118 Missing: 0
-nl.js      Found: 118 Missing: 0
-no.js      Found: 118 Missing: 0
-tr.js      Found: 118 Missing: 0
-ug.js      Found: 39 Missing: 79
-zh-cn.js   Found: 118 Missing: 0
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+
+cs.js      Found: 118 Missing: 0
+cy.js      Found: 118 Missing: 0
+de.js      Found: 118 Missing: 0
+el.js      Found: 16 Missing: 102
+eo.js      Found: 118 Missing: 0
+et.js      Found: 31 Missing: 87
+fa.js      Found: 24 Missing: 94
+fi.js      Found: 23 Missing: 95
+fr.js      Found: 118 Missing: 0
+hr.js      Found: 23 Missing: 95
+it.js      Found: 118 Missing: 0
+nb.js      Found: 118 Missing: 0
+nl.js      Found: 118 Missing: 0
+no.js      Found: 118 Missing: 0
+tr.js      Found: 118 Missing: 0
+ug.js      Found: 39 Missing: 79
+zh-cn.js   Found: 118 Missing: 0
diff --git a/js/ckeditor/plugins/wsc/LICENSE.md b/js/ckeditor/plugins/wsc/LICENSE.md
index 6096de233..c7d374ad1 100644
--- a/js/ckeditor/plugins/wsc/LICENSE.md
+++ b/js/ckeditor/plugins/wsc/LICENSE.md
@@ -1,28 +1,28 @@
-Software License Agreement
-==========================
-
-**CKEditor WSC Plugin**
-Copyright &copy; 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved.
-
-Licensed under the terms of any of the following licenses at your choice:
-
-*   GNU General Public License Version 2 or later (the "GPL"):
-    http://www.gnu.org/licenses/gpl.html
-
-*   GNU Lesser General Public License Version 2.1 or later (the "LGPL"):
-    http://www.gnu.org/licenses/lgpl.html
-
-*   Mozilla Public License Version 1.1 or later (the "MPL"):
-    http://www.mozilla.org/MPL/MPL-1.1.html
-
-You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice.
-
-Sources of Intellectual Property Included in this plugin
---------------------------------------------------------
-
-Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission.
-
-Trademarks
-----------
-
-CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
+Software License Agreement
+==========================
+
+**CKEditor WSC Plugin**
+Copyright &copy; 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved.
+
+Licensed under the terms of any of the following licenses at your choice:
+
+*   GNU General Public License Version 2 or later (the "GPL"):
+    http://www.gnu.org/licenses/gpl.html
+
+*   GNU Lesser General Public License Version 2.1 or later (the "LGPL"):
+    http://www.gnu.org/licenses/lgpl.html
+
+*   Mozilla Public License Version 1.1 or later (the "MPL"):
+    http://www.mozilla.org/MPL/MPL-1.1.html
+
+You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice.
+
+Sources of Intellectual Property Included in this plugin
+--------------------------------------------------------
+
+Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission.
+
+Trademarks
+----------
+
+CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
diff --git a/js/ckeditor/plugins/wsc/README.md b/js/ckeditor/plugins/wsc/README.md
index 346e2ab19..46eeafb09 100644
--- a/js/ckeditor/plugins/wsc/README.md
+++ b/js/ckeditor/plugins/wsc/README.md
@@ -1,25 +1,25 @@
-CKEditor WebSpellChecker Plugin
-===============================
-
-This plugin brings Web Spell Checker (WSC) into CKEditor.
-
-WSC is "installation-less", using the web-services of [WebSpellChecker.net](http://www.webspellchecker.net/). It's an out of the box solution.
-
-Installation
-------------
-
-1. Clone/copy this repository contents in a new "plugins/wsc" folder in your CKEditor installation.
-2. Enable the "wsc" plugin in the CKEditor configuration file (config.js):
-
-        config.extraPlugins = 'wsc';
-
-That's all. WSC will appear on the editor toolbar and will be ready to use.
-
-License
--------
-
-Licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
-
-See LICENSE.md for more information.
-
-Developed in cooperation with [WebSpellChecker.net](http://www.webspellchecker.net/).
+CKEditor WebSpellChecker Plugin
+===============================
+
+This plugin brings Web Spell Checker (WSC) into CKEditor.
+
+WSC is "installation-less", using the web-services of [WebSpellChecker.net](http://www.webspellchecker.net/). It's an out of the box solution.
+
+Installation
+------------
+
+1. Clone/copy this repository contents in a new "plugins/wsc" folder in your CKEditor installation.
+2. Enable the "wsc" plugin in the CKEditor configuration file (config.js):
+
+        config.extraPlugins = 'wsc';
+
+That's all. WSC will appear on the editor toolbar and will be ready to use.
+
+License
+-------
+
+Licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
+
+See LICENSE.md for more information.
+
+Developed in cooperation with [WebSpellChecker.net](http://www.webspellchecker.net/).
diff --git a/js/ckeditor/plugins/wsc/dialogs/ciframe.html b/js/ckeditor/plugins/wsc/dialogs/ciframe.html
index 8e4e6bc9a..5809fbefe 100644
--- a/js/ckeditor/plugins/wsc/dialogs/ciframe.html
+++ b/js/ckeditor/plugins/wsc/dialogs/ciframe.html
@@ -1,66 +1,66 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!--
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
--->
-<html>
-<head>
-	<title></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript">
-
-function gup( name )
-{
-	name = name.replace( /[\[]/, '\\\[' ).replace( /[\]]/, '\\\]' ) ;
-	var regexS = '[\\?&]' + name + '=([^&#]*)' ;
-	var regex = new RegExp( regexS ) ;
-	var results = regex.exec( window.location.href ) ;
-
-	if ( results )
-		return results[ 1 ] ;
-	else
-		return '' ;
-}
-
-var interval;
-
-function sendData2Master()
-{
-	var destination = window.parent.parent ;
-	try
-	{
-		if ( destination.XDTMaster )
-		{
-			var t = destination.XDTMaster.read( [ gup( 'cmd' ), gup( 'data' ) ] ) ;
-			window.clearInterval( interval ) ;
-		}
-	}
-	catch (e) {}
-}
-
-function OnMessage (event) {
-	        var message = event.data;
-	        var destination = window.parent.parent;
-	        destination.XDTMaster.read( [ 'end', message, 'fpm' ] ) ;
-}
-
-function listenPostMessage() {
-    if (window.addEventListener) { // all browsers except IE before version 9
-            window.addEventListener ("message", OnMessage, false);
-    }else {
-            if (window.attachEvent) { // IE before version 9
-                        window.attachEvent("onmessage", OnMessage);
-                }
-        }
-}
-
-function onLoad()
-{
-	interval = window.setInterval( sendData2Master, 100 );
-	listenPostMessage();
-}
-
-</script>
-</head>
-<body onload="onLoad()"><p></p></body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!--
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html>
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<script type="text/javascript">
+
+function gup( name )
+{
+	name = name.replace( /[\[]/, '\\\[' ).replace( /[\]]/, '\\\]' ) ;
+	var regexS = '[\\?&]' + name + '=([^&#]*)' ;
+	var regex = new RegExp( regexS ) ;
+	var results = regex.exec( window.location.href ) ;
+
+	if ( results )
+		return results[ 1 ] ;
+	else
+		return '' ;
+}
+
+var interval;
+
+function sendData2Master()
+{
+	var destination = window.parent.parent ;
+	try
+	{
+		if ( destination.XDTMaster )
+		{
+			var t = destination.XDTMaster.read( [ gup( 'cmd' ), gup( 'data' ) ] ) ;
+			window.clearInterval( interval ) ;
+		}
+	}
+	catch (e) {}
+}
+
+function OnMessage (event) {
+	        var message = event.data;
+	        var destination = window.parent.parent;
+	        destination.XDTMaster.read( [ 'end', message, 'fpm' ] ) ;
+}
+
+function listenPostMessage() {
+    if (window.addEventListener) { // all browsers except IE before version 9
+            window.addEventListener ("message", OnMessage, false);
+    }else {
+            if (window.attachEvent) { // IE before version 9
+                        window.attachEvent("onmessage", OnMessage);
+                }
+        }
+}
+
+function onLoad()
+{
+	interval = window.setInterval( sendData2Master, 100 );
+	listenPostMessage();
+}
+
+</script>
+</head>
+<body onload="onLoad()"><p></p></body>
+</html>
diff --git a/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
index 19c7c9ccf..d5fc6bba4 100644
--- a/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
+++ b/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
@@ -1,52 +1,52 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
--->
-<html>
-<head>
-	<title></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<script type="text/javascript">
-
-function doLoadScript( url )
-{
-	if ( !url )
-		return false ;
-
-	var s = document.createElement( "script" ) ;
-	s.type = "text/javascript" ;
-	s.src = url ;
-	document.getElementsByTagName( "head" )[ 0 ].appendChild( s ) ;
-
-	return true ;
-}
-
-var opener;
-function tryLoad()
-{
-	opener = window.parent;
-
-	// get access to global parameters
-	var oParams = window.opener.oldFramesetPageParams;
-
-	// make frameset rows string prepare
-	var sFramesetRows = ( parseInt( oParams.firstframeh, 10 ) || '30') + ",*," + ( parseInt( oParams.thirdframeh, 10 ) || '150' ) + ',0' ;
-	document.getElementById( 'itFrameset' ).rows = sFramesetRows ;
-
-	// dynamic including init frames and crossdomain transport code
-	// from config sproxy_js_frameset url
-	var addScriptUrl = oParams.sproxy_js_frameset ;
-	doLoadScript( addScriptUrl ) ;
-}
-
-	</script>
-</head>
-
-<frameset id="itFrameset" onload="tryLoad();" border="0" rows="30,*,*,0">
-    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="2" src="" name="navbar"></frame>
-    <frame scrolling="auto" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="0" src="" name="mid"></frame>
-    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="bot"></frame>
-    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="spellsuggestall"></frame>
-</frameset>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
+<!--
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+-->
+<html>
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<script type="text/javascript">
+
+function doLoadScript( url )
+{
+	if ( !url )
+		return false ;
+
+	var s = document.createElement( "script" ) ;
+	s.type = "text/javascript" ;
+	s.src = url ;
+	document.getElementsByTagName( "head" )[ 0 ].appendChild( s ) ;
+
+	return true ;
+}
+
+var opener;
+function tryLoad()
+{
+	opener = window.parent;
+
+	// get access to global parameters
+	var oParams = window.opener.oldFramesetPageParams;
+
+	// make frameset rows string prepare
+	var sFramesetRows = ( parseInt( oParams.firstframeh, 10 ) || '30') + ",*," + ( parseInt( oParams.thirdframeh, 10 ) || '150' ) + ',0' ;
+	document.getElementById( 'itFrameset' ).rows = sFramesetRows ;
+
+	// dynamic including init frames and crossdomain transport code
+	// from config sproxy_js_frameset url
+	var addScriptUrl = oParams.sproxy_js_frameset ;
+	doLoadScript( addScriptUrl ) ;
+}
+
+	</script>
+</head>
+
+<frameset id="itFrameset" onload="tryLoad();" border="0" rows="30,*,*,0">
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="2" src="" name="navbar"></frame>
+    <frame scrolling="auto" framespacing="0" frameborder="0" noresize="noresize" marginheight="0" marginwidth="0" src="" name="mid"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="bot"></frame>
+    <frame scrolling="no" framespacing="0" frameborder="0" noresize="noresize" marginheight="1" marginwidth="1" src="" name="spellsuggestall"></frame>
+</frameset>
+</html>
diff --git a/js/ckeditor/plugins/wsc/dialogs/wsc.css b/js/ckeditor/plugins/wsc/dialogs/wsc.css
index 2a622f225..1056b45f2 100644
--- a/js/ckeditor/plugins/wsc/dialogs/wsc.css
+++ b/js/ckeditor/plugins/wsc/dialogs/wsc.css
@@ -1,82 +1,82 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-html, body
-{
-	background-color: transparent;
-	margin: 0px;
-	padding: 0px;
-}
-
-body
-{
-	padding: 10px;
-}
-
-body, td, input, select, textarea
-{
-	font-size: 11px;
-	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
-}
-
-.midtext
-{
-	padding:0px;
-	margin:10px;
-}
-
-.midtext p
-{
-	padding:0px;
-	margin:10px;
-}
-
-.Button
-{
-	border: #737357 1px solid;
-	color: #3b3b1f;
-	background-color: #c7c78f;
-}
-
-.PopupTabArea
-{
-	color: #737357;
-	background-color: #e3e3c7;
-}
-
-.PopupTitleBorder
-{
-	border-bottom: #d5d59d 1px solid;
-}
-.PopupTabEmptyArea
-{
-	padding-left: 10px;
-	border-bottom: #d5d59d 1px solid;
-}
-
-.PopupTab, .PopupTabSelected
-{
-	border-right: #d5d59d 1px solid;
-	border-top: #d5d59d 1px solid;
-	border-left: #d5d59d 1px solid;
-	padding: 3px 5px 3px 5px;
-	color: #737357;
-}
-
-.PopupTab
-{
-	margin-top: 1px;
-	border-bottom: #d5d59d 1px solid;
-	cursor: pointer;
-}
-
-.PopupTabSelected
-{
-	font-weight: bold;
-	cursor: default;
-	padding-top: 4px;
-	border-bottom: #f1f1e3 1px solid;
-	background-color: #f1f1e3;
-}
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+html, body
+{
+	background-color: transparent;
+	margin: 0px;
+	padding: 0px;
+}
+
+body
+{
+	padding: 10px;
+}
+
+body, td, input, select, textarea
+{
+	font-size: 11px;
+	font-family: 'Microsoft Sans Serif' , Arial, Helvetica, Verdana;
+}
+
+.midtext
+{
+	padding:0px;
+	margin:10px;
+}
+
+.midtext p
+{
+	padding:0px;
+	margin:10px;
+}
+
+.Button
+{
+	border: #737357 1px solid;
+	color: #3b3b1f;
+	background-color: #c7c78f;
+}
+
+.PopupTabArea
+{
+	color: #737357;
+	background-color: #e3e3c7;
+}
+
+.PopupTitleBorder
+{
+	border-bottom: #d5d59d 1px solid;
+}
+.PopupTabEmptyArea
+{
+	padding-left: 10px;
+	border-bottom: #d5d59d 1px solid;
+}
+
+.PopupTab, .PopupTabSelected
+{
+	border-right: #d5d59d 1px solid;
+	border-top: #d5d59d 1px solid;
+	border-left: #d5d59d 1px solid;
+	padding: 3px 5px 3px 5px;
+	color: #737357;
+}
+
+.PopupTab
+{
+	margin-top: 1px;
+	border-bottom: #d5d59d 1px solid;
+	cursor: pointer;
+}
+
+.PopupTabSelected
+{
+	font-weight: bold;
+	cursor: default;
+	padding-top: 4px;
+	border-bottom: #f1f1e3 1px solid;
+	background-color: #f1f1e3;
+}
diff --git a/js/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css b/js/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
index d8b20de78..a48a08f9f 100644
--- a/js/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
+++ b/js/ckeditor/plugins/wsc/skins/moono-lisa/wsc.css
@@ -1,43 +1,43 @@
-.cke_dialog_body #overlayBlock,
-.cke_dialog_body #no_check_over
-{
-    top: 39px !important;
-}
-
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_vbox td > .cke_dialog_ui_button:first-child
-{
-    margin-top: 4px;
-}
-
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select > label
-{
-    margin-left: 0;
-}
-
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select div.cke_dialog_ui_input_select
-{
-    width: 140px !important;
-}
-
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select,
-div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select
-{
-    margin-top: 1px;
-}
-
-div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select:focus,
-div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select:focus
-{
-    margin-top: 0;
-}
-
-div[name=GrammTab] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button,
-div[name=Thesaurus] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button
-{
-    margin-top: 4px !important;
-}
-
-div[name=Thesaurus] div.cke_dialog_ui_input_select
-{
-    width: 180px !important;
-}
+.cke_dialog_body #overlayBlock,
+.cke_dialog_body #no_check_over
+{
+    top: 39px !important;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_vbox td > .cke_dialog_ui_button:first-child
+{
+    margin-top: 4px;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select > label
+{
+    margin-left: 0;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select div.cke_dialog_ui_input_select
+{
+    width: 140px !important;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select,
+div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select
+{
+    margin-top: 1px;
+}
+
+div[name=SpellTab] .wsc-spelltab-bottom .cke_dialog_ui_hbox_first .cke_dialog_ui_select select.cke_dialog_ui_input_select:focus,
+div[name=Thesaurus] div.cke_dialog_ui_input_select select.cke_dialog_ui_input_select:focus
+{
+    margin-top: 0;
+}
+
+div[name=GrammTab] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button,
+div[name=Thesaurus] .cke_dialog_ui_vbox tbody > tr:first-child .cke_dialog_ui_button
+{
+    margin-top: 4px !important;
+}
+
+div[name=Thesaurus] div.cke_dialog_ui_input_select
+{
+    width: 180px !important;
+}
diff --git a/js/ckeditor/skins/flat/dialog.css b/js/ckeditor/skins/flat/dialog.css
index 120c4fedd..d4fdc4eb7 100644
--- a/js/ckeditor/skins/flat/dialog.css
+++ b/js/ckeditor/skins/flat/dialog.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/dialog_ie.css b/js/ckeditor/skins/flat/dialog_ie.css
index 030cdc21e..441cc05a1 100644
--- a/js/ckeditor/skins/flat/dialog_ie.css
+++ b/js/ckeditor/skins/flat/dialog_ie.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/dialog_ie7.css b/js/ckeditor/skins/flat/dialog_ie7.css
index 94e7982a6..192bc1954 100644
--- a/js/ckeditor/skins/flat/dialog_ie7.css
+++ b/js/ckeditor/skins/flat/dialog_ie7.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_title{zoom:1}.cke_dialog_footer{border-top:1px solid #bfbfbf}.cke_dialog_footer_buttons{position:static}.cke_dialog_footer_buttons a.cke_dialog_ui_button{vertical-align:top}.cke_dialog .cke_resizer_ltr{padding-left:4px}.cke_dialog .cke_resizer_rtl{padding-right:4px}.cke_dialog_ui_input_text,.cke_dialog_ui_input_password,.cke_dialog_ui_input_textarea,.cke_dialog_ui_input_select{padding:0!important}.cke_dialog_ui_checkbox_input,.cke_dialog_ui_ratio_input,.cke_btn_reset,.cke_btn_locked,.cke_btn_unlocked{border:1px solid transparent!important}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/dialog_ie8.css b/js/ckeditor/skins/flat/dialog_ie8.css
index 58fed6e19..39b27d7f2 100644
--- a/js/ckeditor/skins/flat/dialog_ie8.css
+++ b/js/ckeditor/skins/flat/dialog_ie8.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{display:block}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/dialog_iequirks.css b/js/ckeditor/skins/flat/dialog_iequirks.css
index df23a0739..9da9658a6 100644
--- a/js/ckeditor/skins/flat/dialog_iequirks.css
+++ b/js/ckeditor/skins/flat/dialog_iequirks.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover,a.cke_dialog_tab:focus{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus,{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5;opacity:.8;filter:alpha(opacity = 80)}.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 10px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:18px;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:3px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:25px;line-height:25px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:3px 3px 3px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/editor.css b/js/ckeditor/skins/flat/editor.css
index f7e348f8e..ee1b071d2 100644
--- a/js/ckeditor/skins/flat/editor.css
+++ b/js/ckeditor/skins/flat/editor.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;padding:0}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{padding:6px 8px 2px;white-space:normal;border-bottom:1px solid #fff;background:#f2f2f2}.cke_bottom{border-top:1px solid #fff;padding:0 8px;position:relative;background:#f2f2f2}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:8px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;margin-top:4px}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;background:#cfd1cf}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #eee;border-bottom-color:#979797;background:#fff}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{background:#aaa}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{background:#bbb}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#ddd}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;background:#e4e4e4}.cke_toolbox_collapser:hover{background:#ccc}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border-top:1px solid #eee;border-bottom:1px solid #979797;background:#fff}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ddd;border-top-color:#ddd;outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{background:#b5b5b5;border-top-color:#b5b5b5}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{background:#bbb;border-top-color:#bbb}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:0}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:5px 8px 4px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_path_item{border-right:1px solid #fff}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1032px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1056px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1176px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1176px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/editor_gecko.css b/js/ckeditor/skins/flat/editor_gecko.css
index a4fb4c5f8..c880dc1dd 100644
--- a/js/ckeditor/skins/flat/editor_gecko.css
+++ b/js/ckeditor/skins/flat/editor_gecko.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;padding:0}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{padding:6px 8px 2px;white-space:normal;border-bottom:1px solid #fff;background:#f2f2f2}.cke_bottom{border-top:1px solid #fff;padding:0 8px;position:relative;background:#f2f2f2}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:8px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;margin-top:4px}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;background:#cfd1cf}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #eee;border-bottom-color:#979797;background:#fff}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{background:#aaa}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{background:#bbb}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#ddd}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;background:#e4e4e4}.cke_toolbox_collapser:hover{background:#ccc}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border-top:1px solid #eee;border-bottom:1px solid #979797;background:#fff}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ddd;border-top-color:#ddd;outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{background:#b5b5b5;border-top-color:#b5b5b5}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{background:#bbb;border-top-color:#bbb}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:0}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:5px 8px 4px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_path_item{border-right:1px solid #fff}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1032px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1056px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1176px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1176px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/editor_ie.css b/js/ckeditor/skins/flat/editor_ie.css
index ce3246ae7..333dac653 100644
--- a/js/ckeditor/skins/flat/editor_ie.css
+++ b/js/ckeditor/skins/flat/editor_ie.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;padding:0}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{padding:6px 8px 2px;white-space:normal;border-bottom:1px solid #fff;background:#f2f2f2}.cke_bottom{border-top:1px solid #fff;padding:0 8px;position:relative;background:#f2f2f2}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:8px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;margin-top:4px}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;background:#cfd1cf}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #eee;border-bottom-color:#979797;background:#fff}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{background:#aaa}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{background:#bbb}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#ddd}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;background:#e4e4e4}.cke_toolbox_collapser:hover{background:#ccc}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border-top:1px solid #eee;border-bottom:1px solid #979797;background:#fff}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ddd;border-top-color:#ddd;outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{background:#b5b5b5;border-top-color:#b5b5b5}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{background:#bbb;border-top-color:#bbb}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:0}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:5px 8px 4px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_path_item{border-right:1px solid #fff}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1032px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1056px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1176px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1176px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/editor_ie7.css b/js/ckeditor/skins/flat/editor_ie7.css
index 08b0e963d..529b12d38 100644
--- a/js/ckeditor/skins/flat/editor_ie7.css
+++ b/js/ckeditor/skins/flat/editor_ie7.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;padding:0}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{padding:6px 8px 2px;white-space:normal;border-bottom:1px solid #fff;background:#f2f2f2}.cke_bottom{border-top:1px solid #fff;padding:0 8px;position:relative;background:#f2f2f2}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:8px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;margin-top:4px}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;background:#cfd1cf}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #eee;border-bottom-color:#979797;background:#fff}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{background:#aaa}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{background:#bbb}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#ddd}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;background:#e4e4e4}.cke_toolbox_collapser:hover{background:#ccc}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border-top:1px solid #eee;border-bottom:1px solid #979797;background:#fff}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ddd;border-top-color:#ddd;outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{background:#b5b5b5;border-top-color:#b5b5b5}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{background:#bbb;border-top-color:#bbb}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:0}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:5px 8px 4px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_path_item{border-right:1px solid #fff}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_toolbox{display:inline-block;padding-bottom:5px;height:100%}.cke_rtl .cke_toolbox{padding-bottom:0}.cke_toolbar{margin-bottom:5px}.cke_rtl .cke_toolbar{margin-bottom:0}.cke_toolgroup{height:26px}.cke_toolgroup,.cke_combo{position:relative}a.cke_button{float:none;vertical-align:top}.cke_toolbar_separator{display:inline-block;float:none;vertical-align:top;background-color:#c0c0c0}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_rtl .cke_button_arrow{padding-top:8px;margin-right:2px}.cke_rtl .cke_combo_inlinelabel{display:table-cell;vertical-align:middle}.cke_menubutton{display:block;height:24px}.cke_menubutton_inner{display:block;position:relative}.cke_menubutton_icon{height:16px;width:16px}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:inline-block}.cke_menubutton_label{width:auto;vertical-align:top;line-height:24px;height:24px;margin:0 10px 0 0}.cke_menuarrow{width:5px;height:6px;padding:0;position:absolute;right:8px;top:10px;background-position:0 0}.cke_rtl .cke_menubutton_icon{position:absolute;right:0;top:0}.cke_rtl .cke_menubutton_label{float:right;clear:both;margin:0 24px 0 10px}.cke_hc .cke_rtl .cke_menubutton_label{margin-right:0}.cke_rtl .cke_menuarrow{left:8px;right:auto;background-position:0 -24px}.cke_hc .cke_menuarrow{top:5px;padding:0 5px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{position:relative}.cke_wysiwyg_div{padding-top:0!important;padding-bottom:0!important}.cke_button__about_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1032px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1056px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1176px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1176px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/editor_ie8.css b/js/ckeditor/skins/flat/editor_ie8.css
index 8558c5572..c4fb06f97 100644
--- a/js/ckeditor/skins/flat/editor_ie8.css
+++ b/js/ckeditor/skins/flat/editor_ie8.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;padding:0}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{padding:6px 8px 2px;white-space:normal;border-bottom:1px solid #fff;background:#f2f2f2}.cke_bottom{border-top:1px solid #fff;padding:0 8px;position:relative;background:#f2f2f2}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:8px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;margin-top:4px}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;background:#cfd1cf}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #eee;border-bottom-color:#979797;background:#fff}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{background:#aaa}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{background:#bbb}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#ddd}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;background:#e4e4e4}.cke_toolbox_collapser:hover{background:#ccc}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border-top:1px solid #eee;border-bottom:1px solid #979797;background:#fff}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ddd;border-top-color:#ddd;outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{background:#b5b5b5;border-top-color:#b5b5b5}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{background:#bbb;border-top-color:#bbb}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:0}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:5px 8px 4px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_path_item{border-right:1px solid #fff}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_button__about_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1032px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1056px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1176px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1176px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/editor_iequirks.css b/js/ckeditor/skins/flat/editor_iequirks.css
index 61e67869a..d99d45647 100644
--- a/js/ckeditor/skins/flat/editor_iequirks.css
+++ b/js/ckeditor/skins/flat/editor_iequirks.css
@@ -1,5 +1,5 @@
-/*
-Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
+/*
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
 .cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;padding:0}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{padding:6px 8px 2px;white-space:normal;border-bottom:1px solid #fff;background:#f2f2f2}.cke_bottom{border-top:1px solid #fff;padding:0 8px;position:relative;background:#f2f2f2}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:8px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;margin-top:4px}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;background:#cfd1cf}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #eee;border-bottom-color:#979797;background:#fff}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{background:#aaa}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{background:#bbb}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#ddd}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;background:#e4e4e4}.cke_toolbox_collapser:hover{background:#ccc}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0 6px 5px 0;border-top:1px solid #eee;border-bottom:1px solid #979797;background:#fff}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ddd;border-top-color:#ddd;outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{background:#b5b5b5;border-top-color:#b5b5b5}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{background:#bbb;border-top-color:#bbb}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:0}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:5px 8px 4px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_path_item{border-right:1px solid #fff}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1032px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1056px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=08ffd39) no-repeat 0 -1176px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=08ffd39) no-repeat 0 -1176px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/js/ckeditor/skins/flat/readme.md b/js/ckeditor/skins/flat/readme.md
index ea6d89085..905109341 100644
--- a/js/ckeditor/skins/flat/readme.md
+++ b/js/ckeditor/skins/flat/readme.md
@@ -1,8 +1,8 @@
-"Flat" Skin
-====================
-
-This skin is a modification from Moono without the radius-corner and gradients.
-Keep all the structrue unchanged.
-
-Dongxu Ren
-03/17/2015
+"Flat" Skin
+====================
+
+This skin is a modification from Moono without the radius-corner and gradients.
+Keep all the structrue unchanged.
+
+Dongxu Ren
+03/17/2015
diff --git a/js/ckeditor/styles.js b/js/ckeditor/styles.js
index ecf04b79d..0b55aa8e6 100644
--- a/js/ckeditor/styles.js
+++ b/js/ckeditor/styles.js
@@ -1,139 +1,139 @@
-/**
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-// This file contains style definitions that can be used by CKEditor plugins.
-//
-// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
-// list containing all styles in the editor toolbar. Other plugins, like
-// the "div" plugin, use a subset of the styles for their features.
-//
-// If you do not have plugins that depend on this file in your editor build, you can simply
-// ignore it. Otherwise it is strongly recommended to customize this file to match your
-// website requirements and design properly.
-//
-// For more information refer to: http://docs.ckeditor.com/#!/guide/dev_styles-section-style-rules
-
-CKEDITOR.stylesSet.add( 'default', [
-	/* Block styles */
-
-	// These styles are already available in the "Format" drop-down list ("format" plugin),
-	// so they are not needed here by default. You may enable them to avoid
-	// placing the "Format" combo in the toolbar, maintaining the same features.
-	/*
-	{ name: 'Paragraph',		element: 'p' },
-	{ name: 'Heading 1',		element: 'h1' },
-	{ name: 'Heading 2',		element: 'h2' },
-	{ name: 'Heading 3',		element: 'h3' },
-	{ name: 'Heading 4',		element: 'h4' },
-	{ name: 'Heading 5',		element: 'h5' },
-	{ name: 'Heading 6',		element: 'h6' },
-	{ name: 'Preformatted Text',element: 'pre' },
-	{ name: 'Address',			element: 'address' },
-	*/
-
-	{ name: 'Italic Title',		element: 'h2', styles: { 'font-style': 'italic' } },
-	{ name: 'Subtitle',			element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
-	{
-		name: 'Special Container',
-		element: 'div',
-		styles: {
-			padding: '5px 10px',
-			'background-color': '#eee',
-			border: '1px solid #ccc'
-		}
-	},
-
-	/* Inline styles */
-
-	// These are core styles available as toolbar buttons. You may opt enabling
-	// some of them in the Styles drop-down list, removing them from the toolbar.
-	// (This requires the "stylescombo" plugin.)
-	/*
-	{ name: 'Strong',			element: 'strong', overrides: 'b' },
-	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
-	{ name: 'Underline',		element: 'u' },
-	{ name: 'Strikethrough',	element: 'strike' },
-	{ name: 'Subscript',		element: 'sub' },
-	{ name: 'Superscript',		element: 'sup' },
-	*/
-
-	{ name: 'Underline',			element: 'u' },
-
-	{ name: 'Marker',			element: 'span', styles: { 'background-color': '#ff0' } },
-
-	{ name: 'Big',				element: 'big' },
-	{ name: 'Small',			element: 'small' },
-	{ name: 'Typewriter',		element: 'tt' },
-
-	{ name: 'Computer Code',	element: 'code' },
-	{ name: 'Keyboard Phrase',	element: 'kbd' },
-	{ name: 'Sample Text',		element: 'samp' },
-	{ name: 'Variable',			element: 'var' },
-
-	{ name: 'Deleted Text',		element: 'del' },
-	{ name: 'Inserted Text',	element: 'ins' },
-
-	{ name: 'Cited Work',		element: 'cite' },
-	{ name: 'Inline Quotation',	element: 'q' },
-
-	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
-	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
-
-	/* Object styles */
-
-	{
-		name: 'Styled Image (left)',
-		element: 'img',
-		attributes: { 'class': 'left' }
-	},
-
-	{
-		name: 'Styled Image (right)',
-		element: 'img',
-		attributes: { 'class': 'right' }
-	},
-
-	{
-		name: 'Compact Table',
-		element: 'table',
-		attributes: {
-			cellpadding: '5',
-			cellspacing: '0',
-			border: '1',
-			bordercolor: '#ccc'
-		},
-		styles: {
-			'border-collapse': 'collapse'
-		}
-	},
-
-	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
-	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } },
-
-	/* Widget styles */
-
-	{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
-	{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
-
-	{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
-
-	{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
-
-	{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
-
-	// Adding space after the style name is an intended workaround. For now, there
-	// is no option to create two styles with the same name for different widget types. See http://dev.ckeditor.com/ticket/16664.
-	{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
-
-] );
-
+/**
+ * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
+ */
+
+// This file contains style definitions that can be used by CKEditor plugins.
+//
+// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
+// list containing all styles in the editor toolbar. Other plugins, like
+// the "div" plugin, use a subset of the styles for their features.
+//
+// If you do not have plugins that depend on this file in your editor build, you can simply
+// ignore it. Otherwise it is strongly recommended to customize this file to match your
+// website requirements and design properly.
+//
+// For more information refer to: http://docs.ckeditor.com/#!/guide/dev_styles-section-style-rules
+
+CKEDITOR.stylesSet.add( 'default', [
+	/* Block styles */
+
+	// These styles are already available in the "Format" drop-down list ("format" plugin),
+	// so they are not needed here by default. You may enable them to avoid
+	// placing the "Format" combo in the toolbar, maintaining the same features.
+	/*
+	{ name: 'Paragraph',		element: 'p' },
+	{ name: 'Heading 1',		element: 'h1' },
+	{ name: 'Heading 2',		element: 'h2' },
+	{ name: 'Heading 3',		element: 'h3' },
+	{ name: 'Heading 4',		element: 'h4' },
+	{ name: 'Heading 5',		element: 'h5' },
+	{ name: 'Heading 6',		element: 'h6' },
+	{ name: 'Preformatted Text',element: 'pre' },
+	{ name: 'Address',			element: 'address' },
+	*/
+
+	{ name: 'Italic Title',		element: 'h2', styles: { 'font-style': 'italic' } },
+	{ name: 'Subtitle',			element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
+	{
+		name: 'Special Container',
+		element: 'div',
+		styles: {
+			padding: '5px 10px',
+			'background-color': '#eee',
+			border: '1px solid #ccc'
+		}
+	},
+
+	/* Inline styles */
+
+	// These are core styles available as toolbar buttons. You may opt enabling
+	// some of them in the Styles drop-down list, removing them from the toolbar.
+	// (This requires the "stylescombo" plugin.)
+	/*
+	{ name: 'Strong',			element: 'strong', overrides: 'b' },
+	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
+	{ name: 'Underline',		element: 'u' },
+	{ name: 'Strikethrough',	element: 'strike' },
+	{ name: 'Subscript',		element: 'sub' },
+	{ name: 'Superscript',		element: 'sup' },
+	*/
+
+	{ name: 'Underline',			element: 'u' },
+
+	{ name: 'Marker',			element: 'span', styles: { 'background-color': '#ff0' } },
+
+	{ name: 'Big',				element: 'big' },
+	{ name: 'Small',			element: 'small' },
+	{ name: 'Typewriter',		element: 'tt' },
+
+	{ name: 'Computer Code',	element: 'code' },
+	{ name: 'Keyboard Phrase',	element: 'kbd' },
+	{ name: 'Sample Text',		element: 'samp' },
+	{ name: 'Variable',			element: 'var' },
+
+	{ name: 'Deleted Text',		element: 'del' },
+	{ name: 'Inserted Text',	element: 'ins' },
+
+	{ name: 'Cited Work',		element: 'cite' },
+	{ name: 'Inline Quotation',	element: 'q' },
+
+	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
+	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
+
+	/* Object styles */
+
+	{
+		name: 'Styled Image (left)',
+		element: 'img',
+		attributes: { 'class': 'left' }
+	},
+
+	{
+		name: 'Styled Image (right)',
+		element: 'img',
+		attributes: { 'class': 'right' }
+	},
+
+	{
+		name: 'Compact Table',
+		element: 'table',
+		attributes: {
+			cellpadding: '5',
+			cellspacing: '0',
+			border: '1',
+			bordercolor: '#ccc'
+		},
+		styles: {
+			'border-collapse': 'collapse'
+		}
+	},
+
+	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
+	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } },
+
+	/* Widget styles */
+
+	{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
+	{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
+
+	{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
+
+	{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
+
+	{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
+	{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
+	{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
+	{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
+	{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
+
+	// Adding space after the style name is an intended workaround. For now, there
+	// is no option to create two styles with the same name for different widget types. See http://dev.ckeditor.com/ticket/16664.
+	{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
+	{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
+	{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
+	{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
+	{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
+
+] );
+
diff --git a/js/forms-json-utils.js b/js/forms-json-utils.js
index f00e37385..b7d1f5bac 100644
--- a/js/forms-json-utils.js
+++ b/js/forms-json-utils.js
@@ -1,512 +1,512 @@
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-// ID of the (hidden) form field used to store the JSON representation of the
-// object being edited in this page
-var sJsonFieldId = 'json_object';
-
-// The memory representation of the object
-var oObj = {};
-
-// Mapping between the fields of the form and the attribute of the current object
-// If aFieldsMap[2] contains 'foo' it means that oObj.foo corresponds to the field
-// of Id 'att_2' in the form 
-var aFieldsMap = new Array;
-
-window.bInSubmit = false; // For handling form cancellation via OnBeforeUnload events
-
-// Update the whole object from the form and also update its
-// JSON (serialized) representation in the (hidden) field
-function UpdateObjectFromForm(aFieldsMap, oObj)
-{
-	for(i=0; i<aFieldsMap.length; i++)
-	{
-		var oElement = document.getElementById('att_'+i);
-		var sFieldName = aFieldsMap[i];
-		oObj['m_aCurrValues'][sFieldName] = oElement.value;
-		sJSON = JSON.stringify(oObj);
-		var oJSON = document.getElementById(sJsonFieldId);
-		oJSON.value = sJSON;
-	}
-	return oObj;
-}
-
-// Update the specified field from the current object
-function UpdateFieldFromObject(idField, aFieldsMap, oObj)
-{
-	var oElement = document.getElementById('att_'+idField);
-	oElement.value = oObj['m_aCurrValues'][aFieldsMap[idField]];
-}
-// Update all the fields of the Form from the current object
-function UpdateFormFromObject(aFieldsMap, oObj)
-{
-	for(i=0; i<aFieldsMap.length; i++)
-	{
-		UpdateFieldFromForm(i, aFieldsMap, oObj);
-	}
-}
-
-// This function is meant to be called from the AJAX page
-// It reloads the object (oObj) from the JSON representation
-// and also updates the form field that contains the JSON
-// representation of the object
-function ReloadObjectFromServer(sJSON)
-{
-	//console.log('JSON value:', sJSON);
-	var oJSON = document.getElementById(sJsonFieldId);
-	oJSON.value = sJSON;
-	oObj = JSON.parse( '(' + sJSON + ')' );
-	return oObj;	
-}
-
-function GoToStep(iCurrentStep, iNextStep)
-{
-	var oCurrentStep = document.getElementById('wizStep'+iCurrentStep);
-	if (iNextStep > iCurrentStep)
-	{
-		// Check the values when moving forward
-		if (CheckFields('wizStep'+iCurrentStep, true))
-		{
-			oCurrentStep.style.display = 'none';
-			ActivateStep(iNextStep);
-		}
-	}
-	else
-	{
-		oCurrentStep.style.display = 'none';
-		ActivateStep(iNextStep);
-	}
-}
-
-function ActivateStep(iTargetStep)
-{
-	UpdateObjectFromForm(aFieldsMap, oObj);
-	var oNextStep = document.getElementById('wizStep'+(iTargetStep));
-	window.location.href='#step'+iTargetStep;
-	// If a handler for entering this step exists, call it
-	if (typeof(this['OnEnterStep'+iTargetStep]) == 'function')
-	{
-		eval( 'OnEnterStep'+iTargetStep+'();');
-	}
-	oNextStep.style.display = '';
-	G_iCurrentStep = iTargetStep;
-	//$('#wizStep'+(iTargetStep)).block({ message: null });
-}
-
-function OnUnload(sTransactionId, sObjClass, iObjKey, sToken)
-{
-	if (!window.bInSubmit)
-	{
-		// If it's not a submit, then it's a "cancel" (Pressing the Cancel button, closing the window, using the back button...)
-		// IMPORTANT: the ajax request MUST BE synchronous to be executed in this context
-		$.ajax({
-			url: GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-			async: false,
-			method: 'POST',
-			data: {operation: 'on_form_cancel', transaction_id: sTransactionId, obj_class: sObjClass, obj_key: iObjKey, token: sToken }
-		});
-	}
-}
-
-function OnSubmit(sFormId)
-{
-	window.bInSubmit=true; // This is a submit, make sure that when the page gets unloaded we don't cancel the action
-	var bResult = CheckFields(sFormId, true);
-	if (!bResult)
-	{
-		window.bInSubmit = false; // Submit is/will be canceled
-	}
-	return bResult;
-}
-
-// Store the result of the form validation... there may be several forms per page, beware
-var oFormErrors = { err_form0: 0 };
-
-function CheckFields(sFormId, bDisplayAlert)
-{
-	$('#'+sFormId+' :submit').attr('disable', 'disabled');
-	$('#'+sFormId+' :button[type=submit]').attr('disable', 'disabled');
-	firstErrorId = '';
-	
-	// The two 'fields' below will be updated when the 'validate' event is processed
-	oFormErrors['err_'+sFormId] = 0;		// Number of errors encountered when validating the form
-	oFormErrors['input_'+sFormId] = null;	// First 'input' with an error, to set the focus to it
-	$('#'+sFormId+' :input').each( function()
-	{
-		validateEventResult = $(this).trigger('validate', sFormId);
-	}
-	);
-	if(oFormErrors['err_'+sFormId] > 0)
-	{
-		if (bDisplayAlert)
-		{
-			alert(Dict.S('UI:FillAllMandatoryFields'));
-		}
-		$('#'+sFormId+' :submit').attr('disable', '');
-		$('#'+sFormId+' :button[type=submit]').attr('disable', '');
-		if (oFormErrors['input_'+sFormId] != null)
-		{
-			$('#'+oFormErrors['input_'+sFormId]).focus();
-		}
-	}
-	return (oFormErrors['err_'+sFormId] == 0); // If no error, submit the form
-}
-
-function ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain)
-{
-	if (bValid)
-	{
-		// Visual feedback - none when it's Ok
-		$('#v_'+sFieldId).html(''); //<img src="../images/validation_ok.png" />');
-	}
-	else
-	{
-		// Report the error...
-		oFormErrors['err_'+sFormId]++;
-		if (oFormErrors['input_'+sFormId] == null)
-		{
-			// Let's remember the first input with an error, so that we can put back the focus on it later
-			oFormErrors['input_'+sFormId] = sFieldId;
-		}
-		// Visual feedback
-		$('#v_'+sFieldId).html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
-		$('#v_'+sFieldId).tooltip({
-			items: 'span',
-			tooltipClass: 'form_field_error',
-			content: function() {
-				return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
-			}
-		});
-	}
-}
-
-function ValidateField(sFieldId, sPattern, bMandatory, sFormId, nullValue, originalValue)
-{
-	var bValid = true;
-	var sExplain = '';
-	if ($('#'+sFieldId).attr('disabled'))
-	{
-		bValid = true; // disabled fields are not checked
-	}
-	else
-	{
-		var currentVal = $('#'+sFieldId).val();
-
-		if (currentVal == '$$NULL$$') // Convention to indicate a non-valid value since it may have to be passed as text
-		{
-			bValid = false;
-		}
-		else if (bMandatory && (currentVal == nullValue))
-		{
-			bValid = false;
-			sExplain = Dict.S('UI:ValueMustBeSet');
-		}
-		else if ((originalValue != undefined) && (currentVal == originalValue))
-		{
-			bValid = false;
-			if (originalValue == nullValue)
-			{
-				sExplain = Dict.S('UI:ValueMustBeSet');
-			}
-			else
-			{
-				sExplain = Dict.S('UI:ValueMustBeChanged');
-			}
-		}
-		else if (currentVal == nullValue)
-		{
-			// An empty field is Ok...
-			bValid = true;
-		}
-		else if (sPattern != '')
-		{
-			re = new RegExp(sPattern);
-			//console.log('Validating field: '+sFieldId + ' current value: '+currentVal + ' pattern: '+sPattern );
-			bValid = re.test(currentVal);
-			sExplain = Dict.S('UI:ValueInvalidFormat');
-		}
-	}
-	ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain);
-	//console.log('Form: '+sFormId+' Validating field: '+sFieldId + ' current value: '+currentVal+' pattern: '+sPattern+' result: '+bValid );
-	return true; // Do not stop propagation ??
-}
-
-function ValidateCKEditField(sFieldId, sPattern, bMandatory, sFormId, nullValue, originalValue)
-{
-	var bValid;
-	var sExplain = '';
-	var sTextContent;
-
-	if ($('#'+sFieldId).attr('disabled'))
-	{
-		bValid = true; // disabled fields are not checked
-	}
-	else
-	{
-		// Get the contents without the tags
-		var oFormattedContents = $("#cke_"+sFieldId+" iframe");
-		if (oFormattedContents.length == 0)
-		{
-			var oSourceContents = $("#cke_"+sFieldId+" textarea.cke_source");
-			sTextContent = oSourceContents.val();
-		}
-		else
-		{
-			sTextContent = oFormattedContents.contents().find("body").text();
-			
-			if (sTextContent == '')
-			{
-				// No plain text, maybe there is just an image...
-				var oImg = oFormattedContents.contents().find("body img");
-				if (oImg.length != 0)
-				{
-					sTextContent = 'image';
-				}
-			}
-		}
-
-		// Get the original value without the tags
-		var oFormattedOriginalContents = (originalValue !== undefined) ? $('<div></div>').html(originalValue) : undefined;
-		var sTextOriginalContents = (oFormattedOriginalContents !== undefined) ? oFormattedOriginalContents.text() : undefined;
-	
-		if (bMandatory && (sTextContent == nullValue))
-		{
-			bValid = false;
-			sExplain = Dict.S('UI:ValueMustBeSet');
-		}
-		else if ((sTextOriginalContents != undefined) && (sTextContent == sTextOriginalContents))
-		{
-			bValid = false;
-			if (sTextOriginalContents == nullValue)
-			{
-				sExplain = Dict.S('UI:ValueMustBeSet');
-			}
-			else
-			{
-				// Note: value change check is not working well yet as the HTML to Text conversion is not exactly the same when done from the PHP value or the CKEditor value.
-				sExplain = Dict.S('UI:ValueMustBeChanged');
-			}
-		}
-		else
-		{
-			bValid = true;
-		}
-	}
-
-	ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain);
-
-	// We need to check periodically as CKEditor doesn't trigger our events. More details in UIHTMLEditorWidget::Display() @ line 92
-	setTimeout(function(){ValidateCKEditField(sFieldId, sPattern, bMandatory, sFormId, nullValue, originalValue);}, 500);
-}
-
-/*
-function UpdateDependentFields(aFieldNames)
-{
-	//console.log('UpdateDependentFields:');
-	//console.log(aFieldNames);
-	index = 0;
-	oWizardHelper.ResetQuery();
-	oWizardHelper.UpdateWizard();
-	while(index < aFieldNames.length )
-	{
-		sAttCode = aFieldNames[index];
-		sFieldId = oWizardHelper.GetFieldId(sAttCode);
-		$('#v_'+sFieldId).html('<img src="../images/indicator.gif" />');
-		oWizardHelper.RequestAllowedValues(sAttCode);
-		index++;
-	}
-	oWizardHelper.AjaxQueryServer();
-}
-*/
-
-function ResetPwd(id)
-{
-	// Reset the values of the password fields
-	$('#'+id).val('*****');
-	$('#'+id+'_confirm').val('*****');
-	// And reset the flag, to tell it that the password remains unchanged
-	$('#'+id+'_changed').val(0);
-	// Visual feedback, None when it's Ok
-	$('#v_'+id).html('');
-}
-
-// Called whenever the content of a one way encrypted password changes
-function PasswordFieldChanged(id)
-{
-	// Set the flag, to tell that the password changed
-	$('#'+id+'_changed').val(1);
-}
-
-// Special validation function for one way encrypted password fields
-function ValidatePasswordField(id, sFormId)
-{
-	var bChanged = $('#'+id+'_changed').val();
-	if (bChanged)
-	{
-		if ($('#'+id).val() != $('#'+id+'_confirm').val())
-		{
-			oFormErrors['err_'+sFormId]++;
-			if (oFormErrors['input_'+sFormId] == null)
-			{
-				// Let's remember the first input with an error, so that we can put back the focus on it later
-				oFormErrors['input_'+sFormId] = id;
-			}
-			// Visual feedback
-			$('#v_'+id).html('<img src="../images/validation_error.png"  style="vertical-align:middle"/>');
-			return false;
-		}
-	}
-	$('#v_'+id).html(''); //<img src="../images/validation_ok.png" />');
-	return true;
-}
-
-//Special validation function for case log fields, taking into account the history
-// to determine if the field is empty or not
-function ValidateCaseLogField(sFieldId, bMandatory, sFormId, nullValue, originalValue)
-{
-	var bValid = true;
-	var sExplain = '';
-	var sTextContent;
-	
-	if ($('#'+sFieldId).attr('disabled'))
-	{
-		bValid = true; // disabled fields are not checked
-	}
-	else
-	{
-		// Get the contents (with tags)
-		// Note: For CaseLog we can't retrieve the formatted contents from CKEditor (unlike in ValidateCKEditorField() method) because of the place holder.
-		sTextContent = $('#' + sFieldId).val();
-		var count = $('#'+sFieldId+'_count').val();
-
-		if (bMandatory && (count == 0) && (sTextContent == nullValue))
-		{
-			// No previous entry and no content typed
-			bValid = false;
-			sExplain = Dict.S('UI:ValueMustBeSet');
-		}
-		else if ((originalValue != undefined) && (sTextContent == originalValue))
-		{
-			bValid = false;
-			sExplain = Dict.S('UI:ValueMustBeChanged');
-		}
-	}
-	ReportFieldValidationStatus(sFieldId, sFormId, bValid, '' /* sExplain */);
-
-	// We need to check periodically as CKEditor doesn't trigger our events. More details in UIHTMLEditorWidget::Display() @ line 92
-	setTimeout(function(){ValidateCaseLogField(sFieldId, bMandatory, sFormId, nullValue, originalValue);}, 500);
-}
-
-// Validate the inputs depending on the current setting
-function ValidateRedundancySettings(sFieldId, sFormId)
-{
-	var bValid = true;
-	var sExplain = '';
-
-	$('#'+sFieldId+' :input[type="radio"]:checked').parent().find(':input[type="string"]').each(function (){
-		var sValue = $(this).val().trim();
-		if (sValue == '')
-		{
-			bValid = false;
-			sExplain = Dict.S('UI:ValueMustBeSet');
-		}
-		else
-		{
-			// There is something... check if it is a number
-			re = new RegExp('^[0-9]+$');
-			bValid = re.test(sValue);
-			if (bValid)
-			{
-				var iValue = parseInt(sValue , 10);
-				if ($(this).hasClass('redundancy-min-up-percent'))
-				{
-					// A percentage
-					if ((iValue < 0) || (iValue > 100))
-					{
-						bValid = false;
-					}
-				}
-				else if ($(this).hasClass('redundancy-min-up-count'))
-				{
-					// A count
-					if (iValue < 0)
-					{
-						bValid = false;
-					}
-				}
-
-			}
-			if (!bValid)
-			{
-				sExplain = Dict.S('UI:ValueInvalidFormat');
-			}
-		}
-	});
-
-	ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain);
-	return bValid;
-}
-
-//Special validation function for custom fields
-function ValidateCustomFields(sFieldId, sFormId)
-{
-	var oFieldSet = $('#'+sFieldId+'_console_form').console_form_handler('option', 'field_set');
-    bValid = oFieldSet.triggerHandler('validate');
-	ReportFieldValidationStatus(sFieldId, sFormId, bValid, '');
-	return bValid;
-}
-
-// Manage a 'duration' field
-function UpdateDuration(iId)
-{
-	var iDays = parseInt($('#'+iId+'_d').val(), 10);
-	var iHours = parseInt($('#'+iId+'_h').val(), 10);
-	var iMinutes = parseInt($('#'+iId+'_m').val(), 10);
-	var iSeconds = parseInt($('#'+iId+'_s').val(), 10);
-	
-	var iDuration = (((iDays*24)+ iHours)*60+ iMinutes)*60 + iSeconds;
-	$('#'+iId).val(iDuration);
-	$('#'+iId).trigger('change');
-	return true;
-}
-
-// Called when filling an autocomplete field
-function OnAutoComplete(id, event, data, formatted)
-{
-	if (data)
-	{
-		// A valid match was found: data[0] => label, data[1] => value
-		if (data[1] != $('#'+id).val())
-		{
-			$('#'+id).val(data[1]);
-			$('#'+id).trigger('change');
-			$('#'+id).trigger('extkeychange');
-		}
-	}
-	else
-	{
-		if ($('#label_'+id).val() == '')
-		{
-			$('#'+id).val(''); // Empty value
-		}
-		else
-		{
-			$('#'+id).val('$$NULL$$'); // Convention: not a valid value
-		}
-		$('#'+id).trigger('change');
-	}
-}
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+// ID of the (hidden) form field used to store the JSON representation of the
+// object being edited in this page
+var sJsonFieldId = 'json_object';
+
+// The memory representation of the object
+var oObj = {};
+
+// Mapping between the fields of the form and the attribute of the current object
+// If aFieldsMap[2] contains 'foo' it means that oObj.foo corresponds to the field
+// of Id 'att_2' in the form 
+var aFieldsMap = new Array;
+
+window.bInSubmit = false; // For handling form cancellation via OnBeforeUnload events
+
+// Update the whole object from the form and also update its
+// JSON (serialized) representation in the (hidden) field
+function UpdateObjectFromForm(aFieldsMap, oObj)
+{
+	for(i=0; i<aFieldsMap.length; i++)
+	{
+		var oElement = document.getElementById('att_'+i);
+		var sFieldName = aFieldsMap[i];
+		oObj['m_aCurrValues'][sFieldName] = oElement.value;
+		sJSON = JSON.stringify(oObj);
+		var oJSON = document.getElementById(sJsonFieldId);
+		oJSON.value = sJSON;
+	}
+	return oObj;
+}
+
+// Update the specified field from the current object
+function UpdateFieldFromObject(idField, aFieldsMap, oObj)
+{
+	var oElement = document.getElementById('att_'+idField);
+	oElement.value = oObj['m_aCurrValues'][aFieldsMap[idField]];
+}
+// Update all the fields of the Form from the current object
+function UpdateFormFromObject(aFieldsMap, oObj)
+{
+	for(i=0; i<aFieldsMap.length; i++)
+	{
+		UpdateFieldFromForm(i, aFieldsMap, oObj);
+	}
+}
+
+// This function is meant to be called from the AJAX page
+// It reloads the object (oObj) from the JSON representation
+// and also updates the form field that contains the JSON
+// representation of the object
+function ReloadObjectFromServer(sJSON)
+{
+	//console.log('JSON value:', sJSON);
+	var oJSON = document.getElementById(sJsonFieldId);
+	oJSON.value = sJSON;
+	oObj = JSON.parse( '(' + sJSON + ')' );
+	return oObj;	
+}
+
+function GoToStep(iCurrentStep, iNextStep)
+{
+	var oCurrentStep = document.getElementById('wizStep'+iCurrentStep);
+	if (iNextStep > iCurrentStep)
+	{
+		// Check the values when moving forward
+		if (CheckFields('wizStep'+iCurrentStep, true))
+		{
+			oCurrentStep.style.display = 'none';
+			ActivateStep(iNextStep);
+		}
+	}
+	else
+	{
+		oCurrentStep.style.display = 'none';
+		ActivateStep(iNextStep);
+	}
+}
+
+function ActivateStep(iTargetStep)
+{
+	UpdateObjectFromForm(aFieldsMap, oObj);
+	var oNextStep = document.getElementById('wizStep'+(iTargetStep));
+	window.location.href='#step'+iTargetStep;
+	// If a handler for entering this step exists, call it
+	if (typeof(this['OnEnterStep'+iTargetStep]) == 'function')
+	{
+		eval( 'OnEnterStep'+iTargetStep+'();');
+	}
+	oNextStep.style.display = '';
+	G_iCurrentStep = iTargetStep;
+	//$('#wizStep'+(iTargetStep)).block({ message: null });
+}
+
+function OnUnload(sTransactionId, sObjClass, iObjKey, sToken)
+{
+	if (!window.bInSubmit)
+	{
+		// If it's not a submit, then it's a "cancel" (Pressing the Cancel button, closing the window, using the back button...)
+		// IMPORTANT: the ajax request MUST BE synchronous to be executed in this context
+		$.ajax({
+			url: GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+			async: false,
+			method: 'POST',
+			data: {operation: 'on_form_cancel', transaction_id: sTransactionId, obj_class: sObjClass, obj_key: iObjKey, token: sToken }
+		});
+	}
+}
+
+function OnSubmit(sFormId)
+{
+	window.bInSubmit=true; // This is a submit, make sure that when the page gets unloaded we don't cancel the action
+	var bResult = CheckFields(sFormId, true);
+	if (!bResult)
+	{
+		window.bInSubmit = false; // Submit is/will be canceled
+	}
+	return bResult;
+}
+
+// Store the result of the form validation... there may be several forms per page, beware
+var oFormErrors = { err_form0: 0 };
+
+function CheckFields(sFormId, bDisplayAlert)
+{
+	$('#'+sFormId+' :submit').attr('disable', 'disabled');
+	$('#'+sFormId+' :button[type=submit]').attr('disable', 'disabled');
+	firstErrorId = '';
+	
+	// The two 'fields' below will be updated when the 'validate' event is processed
+	oFormErrors['err_'+sFormId] = 0;		// Number of errors encountered when validating the form
+	oFormErrors['input_'+sFormId] = null;	// First 'input' with an error, to set the focus to it
+	$('#'+sFormId+' :input').each( function()
+	{
+		validateEventResult = $(this).trigger('validate', sFormId);
+	}
+	);
+	if(oFormErrors['err_'+sFormId] > 0)
+	{
+		if (bDisplayAlert)
+		{
+			alert(Dict.S('UI:FillAllMandatoryFields'));
+		}
+		$('#'+sFormId+' :submit').attr('disable', '');
+		$('#'+sFormId+' :button[type=submit]').attr('disable', '');
+		if (oFormErrors['input_'+sFormId] != null)
+		{
+			$('#'+oFormErrors['input_'+sFormId]).focus();
+		}
+	}
+	return (oFormErrors['err_'+sFormId] == 0); // If no error, submit the form
+}
+
+function ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain)
+{
+	if (bValid)
+	{
+		// Visual feedback - none when it's Ok
+		$('#v_'+sFieldId).html(''); //<img src="../images/validation_ok.png" />');
+	}
+	else
+	{
+		// Report the error...
+		oFormErrors['err_'+sFormId]++;
+		if (oFormErrors['input_'+sFormId] == null)
+		{
+			// Let's remember the first input with an error, so that we can put back the focus on it later
+			oFormErrors['input_'+sFormId] = sFieldId;
+		}
+		// Visual feedback
+		$('#v_'+sFieldId).html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
+		$('#v_'+sFieldId).tooltip({
+			items: 'span',
+			tooltipClass: 'form_field_error',
+			content: function() {
+				return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
+			}
+		});
+	}
+}
+
+function ValidateField(sFieldId, sPattern, bMandatory, sFormId, nullValue, originalValue)
+{
+	var bValid = true;
+	var sExplain = '';
+	if ($('#'+sFieldId).attr('disabled'))
+	{
+		bValid = true; // disabled fields are not checked
+	}
+	else
+	{
+		var currentVal = $('#'+sFieldId).val();
+
+		if (currentVal == '$$NULL$$') // Convention to indicate a non-valid value since it may have to be passed as text
+		{
+			bValid = false;
+		}
+		else if (bMandatory && (currentVal == nullValue))
+		{
+			bValid = false;
+			sExplain = Dict.S('UI:ValueMustBeSet');
+		}
+		else if ((originalValue != undefined) && (currentVal == originalValue))
+		{
+			bValid = false;
+			if (originalValue == nullValue)
+			{
+				sExplain = Dict.S('UI:ValueMustBeSet');
+			}
+			else
+			{
+				sExplain = Dict.S('UI:ValueMustBeChanged');
+			}
+		}
+		else if (currentVal == nullValue)
+		{
+			// An empty field is Ok...
+			bValid = true;
+		}
+		else if (sPattern != '')
+		{
+			re = new RegExp(sPattern);
+			//console.log('Validating field: '+sFieldId + ' current value: '+currentVal + ' pattern: '+sPattern );
+			bValid = re.test(currentVal);
+			sExplain = Dict.S('UI:ValueInvalidFormat');
+		}
+	}
+	ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain);
+	//console.log('Form: '+sFormId+' Validating field: '+sFieldId + ' current value: '+currentVal+' pattern: '+sPattern+' result: '+bValid );
+	return true; // Do not stop propagation ??
+}
+
+function ValidateCKEditField(sFieldId, sPattern, bMandatory, sFormId, nullValue, originalValue)
+{
+	var bValid;
+	var sExplain = '';
+	var sTextContent;
+
+	if ($('#'+sFieldId).attr('disabled'))
+	{
+		bValid = true; // disabled fields are not checked
+	}
+	else
+	{
+		// Get the contents without the tags
+		var oFormattedContents = $("#cke_"+sFieldId+" iframe");
+		if (oFormattedContents.length == 0)
+		{
+			var oSourceContents = $("#cke_"+sFieldId+" textarea.cke_source");
+			sTextContent = oSourceContents.val();
+		}
+		else
+		{
+			sTextContent = oFormattedContents.contents().find("body").text();
+			
+			if (sTextContent == '')
+			{
+				// No plain text, maybe there is just an image...
+				var oImg = oFormattedContents.contents().find("body img");
+				if (oImg.length != 0)
+				{
+					sTextContent = 'image';
+				}
+			}
+		}
+
+		// Get the original value without the tags
+		var oFormattedOriginalContents = (originalValue !== undefined) ? $('<div></div>').html(originalValue) : undefined;
+		var sTextOriginalContents = (oFormattedOriginalContents !== undefined) ? oFormattedOriginalContents.text() : undefined;
+	
+		if (bMandatory && (sTextContent == nullValue))
+		{
+			bValid = false;
+			sExplain = Dict.S('UI:ValueMustBeSet');
+		}
+		else if ((sTextOriginalContents != undefined) && (sTextContent == sTextOriginalContents))
+		{
+			bValid = false;
+			if (sTextOriginalContents == nullValue)
+			{
+				sExplain = Dict.S('UI:ValueMustBeSet');
+			}
+			else
+			{
+				// Note: value change check is not working well yet as the HTML to Text conversion is not exactly the same when done from the PHP value or the CKEditor value.
+				sExplain = Dict.S('UI:ValueMustBeChanged');
+			}
+		}
+		else
+		{
+			bValid = true;
+		}
+	}
+
+	ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain);
+
+	// We need to check periodically as CKEditor doesn't trigger our events. More details in UIHTMLEditorWidget::Display() @ line 92
+	setTimeout(function(){ValidateCKEditField(sFieldId, sPattern, bMandatory, sFormId, nullValue, originalValue);}, 500);
+}
+
+/*
+function UpdateDependentFields(aFieldNames)
+{
+	//console.log('UpdateDependentFields:');
+	//console.log(aFieldNames);
+	index = 0;
+	oWizardHelper.ResetQuery();
+	oWizardHelper.UpdateWizard();
+	while(index < aFieldNames.length )
+	{
+		sAttCode = aFieldNames[index];
+		sFieldId = oWizardHelper.GetFieldId(sAttCode);
+		$('#v_'+sFieldId).html('<img src="../images/indicator.gif" />');
+		oWizardHelper.RequestAllowedValues(sAttCode);
+		index++;
+	}
+	oWizardHelper.AjaxQueryServer();
+}
+*/
+
+function ResetPwd(id)
+{
+	// Reset the values of the password fields
+	$('#'+id).val('*****');
+	$('#'+id+'_confirm').val('*****');
+	// And reset the flag, to tell it that the password remains unchanged
+	$('#'+id+'_changed').val(0);
+	// Visual feedback, None when it's Ok
+	$('#v_'+id).html('');
+}
+
+// Called whenever the content of a one way encrypted password changes
+function PasswordFieldChanged(id)
+{
+	// Set the flag, to tell that the password changed
+	$('#'+id+'_changed').val(1);
+}
+
+// Special validation function for one way encrypted password fields
+function ValidatePasswordField(id, sFormId)
+{
+	var bChanged = $('#'+id+'_changed').val();
+	if (bChanged)
+	{
+		if ($('#'+id).val() != $('#'+id+'_confirm').val())
+		{
+			oFormErrors['err_'+sFormId]++;
+			if (oFormErrors['input_'+sFormId] == null)
+			{
+				// Let's remember the first input with an error, so that we can put back the focus on it later
+				oFormErrors['input_'+sFormId] = id;
+			}
+			// Visual feedback
+			$('#v_'+id).html('<img src="../images/validation_error.png"  style="vertical-align:middle"/>');
+			return false;
+		}
+	}
+	$('#v_'+id).html(''); //<img src="../images/validation_ok.png" />');
+	return true;
+}
+
+//Special validation function for case log fields, taking into account the history
+// to determine if the field is empty or not
+function ValidateCaseLogField(sFieldId, bMandatory, sFormId, nullValue, originalValue)
+{
+	var bValid = true;
+	var sExplain = '';
+	var sTextContent;
+	
+	if ($('#'+sFieldId).attr('disabled'))
+	{
+		bValid = true; // disabled fields are not checked
+	}
+	else
+	{
+		// Get the contents (with tags)
+		// Note: For CaseLog we can't retrieve the formatted contents from CKEditor (unlike in ValidateCKEditorField() method) because of the place holder.
+		sTextContent = $('#' + sFieldId).val();
+		var count = $('#'+sFieldId+'_count').val();
+
+		if (bMandatory && (count == 0) && (sTextContent == nullValue))
+		{
+			// No previous entry and no content typed
+			bValid = false;
+			sExplain = Dict.S('UI:ValueMustBeSet');
+		}
+		else if ((originalValue != undefined) && (sTextContent == originalValue))
+		{
+			bValid = false;
+			sExplain = Dict.S('UI:ValueMustBeChanged');
+		}
+	}
+	ReportFieldValidationStatus(sFieldId, sFormId, bValid, '' /* sExplain */);
+
+	// We need to check periodically as CKEditor doesn't trigger our events. More details in UIHTMLEditorWidget::Display() @ line 92
+	setTimeout(function(){ValidateCaseLogField(sFieldId, bMandatory, sFormId, nullValue, originalValue);}, 500);
+}
+
+// Validate the inputs depending on the current setting
+function ValidateRedundancySettings(sFieldId, sFormId)
+{
+	var bValid = true;
+	var sExplain = '';
+
+	$('#'+sFieldId+' :input[type="radio"]:checked').parent().find(':input[type="string"]').each(function (){
+		var sValue = $(this).val().trim();
+		if (sValue == '')
+		{
+			bValid = false;
+			sExplain = Dict.S('UI:ValueMustBeSet');
+		}
+		else
+		{
+			// There is something... check if it is a number
+			re = new RegExp('^[0-9]+$');
+			bValid = re.test(sValue);
+			if (bValid)
+			{
+				var iValue = parseInt(sValue , 10);
+				if ($(this).hasClass('redundancy-min-up-percent'))
+				{
+					// A percentage
+					if ((iValue < 0) || (iValue > 100))
+					{
+						bValid = false;
+					}
+				}
+				else if ($(this).hasClass('redundancy-min-up-count'))
+				{
+					// A count
+					if (iValue < 0)
+					{
+						bValid = false;
+					}
+				}
+
+			}
+			if (!bValid)
+			{
+				sExplain = Dict.S('UI:ValueInvalidFormat');
+			}
+		}
+	});
+
+	ReportFieldValidationStatus(sFieldId, sFormId, bValid, sExplain);
+	return bValid;
+}
+
+//Special validation function for custom fields
+function ValidateCustomFields(sFieldId, sFormId)
+{
+	var oFieldSet = $('#'+sFieldId+'_console_form').console_form_handler('option', 'field_set');
+    bValid = oFieldSet.triggerHandler('validate');
+	ReportFieldValidationStatus(sFieldId, sFormId, bValid, '');
+	return bValid;
+}
+
+// Manage a 'duration' field
+function UpdateDuration(iId)
+{
+	var iDays = parseInt($('#'+iId+'_d').val(), 10);
+	var iHours = parseInt($('#'+iId+'_h').val(), 10);
+	var iMinutes = parseInt($('#'+iId+'_m').val(), 10);
+	var iSeconds = parseInt($('#'+iId+'_s').val(), 10);
+	
+	var iDuration = (((iDays*24)+ iHours)*60+ iMinutes)*60 + iSeconds;
+	$('#'+iId).val(iDuration);
+	$('#'+iId).trigger('change');
+	return true;
+}
+
+// Called when filling an autocomplete field
+function OnAutoComplete(id, event, data, formatted)
+{
+	if (data)
+	{
+		// A valid match was found: data[0] => label, data[1] => value
+		if (data[1] != $('#'+id).val())
+		{
+			$('#'+id).val(data[1]);
+			$('#'+id).trigger('change');
+			$('#'+id).trigger('extkeychange');
+		}
+	}
+	else
+	{
+		if ($('#label_'+id).val() == '')
+		{
+			$('#'+id).val(''); // Empty value
+		}
+		else
+		{
+			$('#'+id).val('$$NULL$$'); // Convention: not a valid value
+		}
+		$('#'+id).trigger('change');
+	}
+}
diff --git a/js/jquery-migrate-1.4.1.min.js b/js/jquery-migrate-1.4.1.min.js
index 76b67302f..f3a242a82 100644
--- a/js/jquery-migrate-1.4.1.min.js
+++ b/js/jquery-migrate-1.4.1.min.js
@@ -1,752 +1,752 @@
-/*!
- * jQuery Migrate - v1.4.1 - 2016-05-19
- * Copyright jQuery Foundation and other contributors
- */
-(function( jQuery, window, undefined ) {
-// See http://bugs.jquery.com/ticket/13335
-// "use strict";
-
-
-	jQuery.migrateVersion = "1.4.1";
-
-
-	var warnedAbout = {};
-
-// List of warnings already given; public read only
-	jQuery.migrateWarnings = [];
-
-// Set to true to prevent console output; migrateWarnings still maintained
-jQuery.migrateMute = true;
-
-// Show a message on the console so devs know we're active
-	if ( window.console && window.console.log ) {
-		window.console.log( "JQMIGRATE: Migrate is installed" +
-			( jQuery.migrateMute ? "" : " with logging active" ) +
-			", version " + jQuery.migrateVersion );
-	}
-
-// Set to false to disable traces that appear with warnings
-	if ( jQuery.migrateTrace === undefined ) {
-		jQuery.migrateTrace = true;
-	}
-
-// Forget any warnings we've already given; public
-	jQuery.migrateReset = function() {
-		warnedAbout = {};
-		jQuery.migrateWarnings.length = 0;
-	};
-
-	function migrateWarn( msg) {
-		var console = window.console;
-		if ( !warnedAbout[ msg ] ) {
-			warnedAbout[ msg ] = true;
-			jQuery.migrateWarnings.push( msg );
-			if ( console && console.warn && !jQuery.migrateMute ) {
-				console.warn( "JQMIGRATE: " + msg );
-				if ( jQuery.migrateTrace && console.trace ) {
-					console.trace();
-				}
-			}
-		}
-	}
-
-	function migrateWarnProp( obj, prop, value, msg ) {
-		if ( Object.defineProperty ) {
-			// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
-			// allow property to be overwritten in case some other plugin wants it
-			try {
-				Object.defineProperty( obj, prop, {
-					configurable: true,
-					enumerable: true,
-					get: function() {
-						migrateWarn( msg );
-						return value;
-					},
-					set: function( newValue ) {
-						migrateWarn( msg );
-						value = newValue;
-					}
-				});
-				return;
-			} catch( err ) {
-				// IE8 is a dope about Object.defineProperty, can't warn there
-			}
-		}
-
-		// Non-ES5 (or broken) browser; just set the property
-		jQuery._definePropertyBroken = true;
-		obj[ prop ] = value;
-	}
-
-	if ( document.compatMode === "BackCompat" ) {
-		// jQuery has never supported or tested Quirks Mode
-		migrateWarn( "jQuery is not compatible with Quirks Mode" );
-	}
-
-
-	var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
-		oldAttr = jQuery.attr,
-		valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
-			function() { return null; },
-		valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
-			function() { return undefined; },
-		rnoType = /^(?:input|button)$/i,
-		rnoAttrNodeType = /^[238]$/,
-		rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-		ruseDefault = /^(?:checked|selected)$/i;
-
-// jQuery.attrFn
-	migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
-
-	jQuery.attr = function( elem, name, value, pass ) {
-		var lowerName = name.toLowerCase(),
-			nType = elem && elem.nodeType;
-
-		if ( pass ) {
-			// Since pass is used internally, we only warn for new jQuery
-			// versions where there isn't a pass arg in the formal params
-			if ( oldAttr.length < 4 ) {
-				migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
-			}
-			if ( elem && !rnoAttrNodeType.test( nType ) &&
-				(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
-				return jQuery( elem )[ name ]( value );
-			}
-		}
-
-		// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
-		// for disconnected elements we don't warn on $( "<button>", { type: "button" } ).
-		if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
-			migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
-		}
-
-		// Restore boolHook for boolean property/attribute synchronization
-		if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
-			jQuery.attrHooks[ lowerName ] = {
-				get: function( elem, name ) {
-					// Align boolean attributes with corresponding properties
-					// Fall back to attribute presence where some booleans are not supported
-					var attrNode,
-						property = jQuery.prop( elem, name );
-					return property === true || typeof property !== "boolean" &&
-					( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-
-						name.toLowerCase() :
-						undefined;
-				},
-				set: function( elem, value, name ) {
-					var propName;
-					if ( value === false ) {
-						// Remove boolean attributes when set to false
-						jQuery.removeAttr( elem, name );
-					} else {
-						// value is true since we know at this point it's type boolean and not false
-						// Set boolean attributes to the same name and set the DOM property
-						propName = jQuery.propFix[ name ] || name;
-						if ( propName in elem ) {
-							// Only set the IDL specifically if it already exists on the element
-							elem[ propName ] = true;
-						}
-
-						elem.setAttribute( name, name.toLowerCase() );
-					}
-					return name;
-				}
-			};
-
-			// Warn only for attributes that can remain distinct from their properties post-1.9
-			if ( ruseDefault.test( lowerName ) ) {
-				migrateWarn( "jQuery.fn.attr('" + lowerName + "') might use property instead of attribute" );
-			}
-		}
-
-		return oldAttr.call( jQuery, elem, name, value );
-	};
-
-// attrHooks: value
-	jQuery.attrHooks.value = {
-		get: function( elem, name ) {
-			var nodeName = ( elem.nodeName || "" ).toLowerCase();
-			if ( nodeName === "button" ) {
-				return valueAttrGet.apply( this, arguments );
-			}
-			if ( nodeName !== "input" && nodeName !== "option" ) {
-				migrateWarn("jQuery.fn.attr('value') no longer gets properties");
-			}
-			return name in elem ?
-				elem.value :
-				null;
-		},
-		set: function( elem, value ) {
-			var nodeName = ( elem.nodeName || "" ).toLowerCase();
-			if ( nodeName === "button" ) {
-				return valueAttrSet.apply( this, arguments );
-			}
-			if ( nodeName !== "input" && nodeName !== "option" ) {
-				migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
-			}
-			// Does not return so that setAttribute is also used
-			elem.value = value;
-		}
-	};
-
-
-	var matched, browser,
-		oldInit = jQuery.fn.init,
-		oldFind = jQuery.find,
-		oldParseJSON = jQuery.parseJSON,
-		rspaceAngle = /^\s*</,
-		rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
-		rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,
-		// Note: XSS check is done below after string is trimmed
-		rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
-
-// $(html) "looks like html" rule change
-	jQuery.fn.init = function( selector, context, rootjQuery ) {
-		var match, ret;
-
-		if ( selector && typeof selector === "string" ) {
-			if ( !jQuery.isPlainObject( context ) &&
-				(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
-
-				// This is an HTML string according to the "old" rules; is it still?
-				if ( !rspaceAngle.test( selector ) ) {
-					migrateWarn("$(html) HTML strings must start with '<' character");
-				}
-				if ( match[ 3 ] ) {
-					migrateWarn("$(html) HTML text after last tag is ignored");
-				}
-
-				// Consistently reject any HTML-like string starting with a hash (gh-9521)
-				// Note that this may break jQuery 1.6.x code that otherwise would work.
-				if ( match[ 0 ].charAt( 0 ) === "#" ) {
-					migrateWarn("HTML string cannot start with a '#' character");
-					jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
-				}
-
-				// Now process using loose rules; let pre-1.8 play too
-				// Is this a jQuery context? parseHTML expects a DOM element (#178)
-				if ( context && context.context && context.context.nodeType ) {
-					context = context.context;
-				}
-
-				if ( jQuery.parseHTML ) {
-					return oldInit.call( this,
-						jQuery.parseHTML( match[ 2 ], context && context.ownerDocument ||
-							context || document, true ), context, rootjQuery );
-				}
-			}
-		}
-
-		ret = oldInit.apply( this, arguments );
-
-		// Fill in selector and context properties so .live() works
-		if ( selector && selector.selector !== undefined ) {
-			// A jQuery object, copy its properties
-			ret.selector = selector.selector;
-			ret.context = selector.context;
-
-		} else {
-			ret.selector = typeof selector === "string" ? selector : "";
-			if ( selector ) {
-				ret.context = selector.nodeType? selector : context || document;
-			}
-		}
-
-		return ret;
-	};
-	jQuery.fn.init.prototype = jQuery.fn;
-
-	jQuery.find = function( selector ) {
-		var args = Array.prototype.slice.call( arguments );
-
-		// Support: PhantomJS 1.x
-		// String#match fails to match when used with a //g RegExp, only on some strings
-		if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
-
-			// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
-			// First see if qS thinks it's a valid selector, if so avoid a false positive
-			try {
-				document.querySelector( selector );
-			} catch ( err1 ) {
-
-				// Didn't *look* valid to qSA, warn and try quoting what we think is the value
-				selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
-					return "[" + attr + op + "\"" + value + "\"]";
-				} );
-
-				// If the regexp *may* have created an invalid selector, don't update it
-				// Note that there may be false alarms if selector uses jQuery extensions
-				try {
-					document.querySelector( selector );
-					migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
-					args[ 0 ] = selector;
-				} catch ( err2 ) {
-					migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
-				}
-			}
-		}
-
-		return oldFind.apply( this, args );
-	};
-
-// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
-	var findProp;
-	for ( findProp in oldFind ) {
-		if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
-			jQuery.find[ findProp ] = oldFind[ findProp ];
-		}
-	}
-
-// Let $.parseJSON(falsy_value) return null
-	jQuery.parseJSON = function( json ) {
-		if ( !json ) {
-			migrateWarn("jQuery.parseJSON requires a valid JSON string");
-			return null;
-		}
-		return oldParseJSON.apply( this, arguments );
-	};
-
-	jQuery.uaMatch = function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-			/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-			/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-			/(msie) ([\w.]+)/.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-			[];
-
-		return {
-			browser: match[ 1 ] || "",
-			version: match[ 2 ] || "0"
-		};
-	};
-
-// Don't clobber any existing jQuery.browser in case it's different
-	if ( !jQuery.browser ) {
-		matched = jQuery.uaMatch( navigator.userAgent );
-		browser = {};
-
-		if ( matched.browser ) {
-			browser[ matched.browser ] = true;
-			browser.version = matched.version;
-		}
-
-		// Chrome is Webkit, but Webkit is also Safari.
-		if ( browser.chrome ) {
-			browser.webkit = true;
-		} else if ( browser.webkit ) {
-			browser.safari = true;
-		}
-
-		jQuery.browser = browser;
-	}
-
-// Warn if the code tries to get jQuery.browser
-	migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
-
-// jQuery.boxModel deprecated in 1.3, jQuery.support.boxModel deprecated in 1.7
-	jQuery.boxModel = jQuery.support.boxModel = (document.compatMode === "CSS1Compat");
-	migrateWarnProp( jQuery, "boxModel", jQuery.boxModel, "jQuery.boxModel is deprecated" );
-	migrateWarnProp( jQuery.support, "boxModel", jQuery.support.boxModel, "jQuery.support.boxModel is deprecated" );
-
-	jQuery.sub = function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			var instance = jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-			return instance instanceof jQuerySub ?
-				instance :
-				jQuerySub( instance );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		migrateWarn( "jQuery.sub() is deprecated" );
-		return jQuerySub;
-	};
-
-// The number of elements contained in the matched element set
-	jQuery.fn.size = function() {
-		migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
-		return this.length;
-	};
-
-
-	var internalSwapCall = false;
-
-// If this version of jQuery has .swap(), don't false-alarm on internal uses
-	if ( jQuery.swap ) {
-		jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
-			var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
-
-			if ( oldHook ) {
-				jQuery.cssHooks[ name ].get = function() {
-					var ret;
-
-					internalSwapCall = true;
-					ret = oldHook.apply( this, arguments );
-					internalSwapCall = false;
-					return ret;
-				};
-			}
-		});
-	}
-
-	jQuery.swap = function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
-
-		if ( !internalSwapCall ) {
-			migrateWarn( "jQuery.swap() is undocumented and deprecated" );
-		}
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.apply( elem, args || [] );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	};
-
-
-// Ensure that $.ajax gets the new parseJSON defined in core.js
-	jQuery.ajaxSetup({
-		converters: {
-			"text json": jQuery.parseJSON
-		}
-	});
-
-
-	var oldFnData = jQuery.fn.data;
-
-	jQuery.fn.data = function( name ) {
-		var ret, evt,
-			elem = this[0];
-
-		// Handles 1.7 which has this behavior and 1.8 which doesn't
-		if ( elem && name === "events" && arguments.length === 1 ) {
-			ret = jQuery.data( elem, name );
-			evt = jQuery._data( elem, name );
-			if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
-				migrateWarn("Use of jQuery.fn.data('events') is deprecated");
-				return evt;
-			}
-		}
-		return oldFnData.apply( this, arguments );
-	};
-
-
-	var rscriptType = /\/(java|ecma)script/i;
-
-// Since jQuery.clean is used internally on older versions, we only shim if it's missing
-	if ( !jQuery.clean ) {
-		jQuery.clean = function( elems, context, fragment, scripts ) {
-			// Set context per 1.8 logic
-			context = context || document;
-			context = !context.nodeType && context[0] || context;
-			context = context.ownerDocument || context;
-
-			migrateWarn("jQuery.clean() is deprecated");
-
-			var i, elem, handleScript, jsTags,
-				ret = [];
-
-			jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
-
-			// Complex logic lifted directly from jQuery 1.8
-			if ( fragment ) {
-				// Special handling of each script element
-				handleScript = function( elem ) {
-					// Check if we consider it executable
-					if ( !elem.type || rscriptType.test( elem.type ) ) {
-						// Detach the script and store it in the scripts array (if provided) or the fragment
-						// Return truthy to indicate that it has been handled
-						return scripts ?
-							scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
-							fragment.appendChild( elem );
-					}
-				};
-
-				for ( i = 0; (elem = ret[i]) != null; i++ ) {
-					// Check if we're done after handling an executable script
-					if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
-						// Append to fragment and handle embedded scripts
-						fragment.appendChild( elem );
-						if ( typeof elem.getElementsByTagName !== "undefined" ) {
-							// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
-							jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
-
-							// Splice the scripts into ret after their former ancestor and advance our index beyond them
-							ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-							i += jsTags.length;
-						}
-					}
-				}
-			}
-
-			return ret;
-		};
-	}
-
-	var eventAdd = jQuery.event.add,
-		eventRemove = jQuery.event.remove,
-		eventTrigger = jQuery.event.trigger,
-		oldToggle = jQuery.fn.toggle,
-		oldLive = jQuery.fn.live,
-		oldDie = jQuery.fn.die,
-		oldLoad = jQuery.fn.load,
-		ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
-		rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
-		rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
-		hoverHack = function( events ) {
-			if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
-				return events;
-			}
-			if ( rhoverHack.test( events ) ) {
-				migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
-			}
-			return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-		};
-
-// Event props removed in 1.9, put them back if needed; no practical way to warn them
-	if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
-		jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
-	}
-
-// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
-	if ( jQuery.event.dispatch ) {
-		migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
-	}
-
-// Support for 'hover' pseudo-event and ajax event warnings
-	jQuery.event.add = function( elem, types, handler, data, selector ){
-		if ( elem !== document && rajaxEvent.test( types ) ) {
-			migrateWarn( "AJAX events should be attached to document: " + types );
-		}
-		eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
-	};
-	jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
-		eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
-	};
-
-	jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
-
-		jQuery.fn[ name ] = function() {
-			var args = Array.prototype.slice.call( arguments, 0 );
-
-			// If this is an ajax load() the first arg should be the string URL;
-			// technically this could also be the "Anything" arg of the event .load()
-			// which just goes to show why this dumb signature has been deprecated!
-			// jQuery custom builds that exclude the Ajax module justifiably die here.
-			if ( name === "load" && typeof args[ 0 ] === "string" ) {
-				return oldLoad.apply( this, args );
-			}
-
-			migrateWarn( "jQuery.fn." + name + "() is deprecated" );
-
-			args.splice( 0, 0, name );
-			if ( arguments.length ) {
-				return this.bind.apply( this, args );
-			}
-
-			// Use .triggerHandler here because:
-			// - load and unload events don't need to bubble, only applied to window or image
-			// - error event should not bubble to window, although it does pre-1.7
-			// See http://bugs.jquery.com/ticket/11820
-			this.triggerHandler.apply( this, args );
-			return this;
-		};
-
-	});
-
-	jQuery.fn.toggle = function( fn, fn2 ) {
-
-		// Don't mess with animation or css toggles
-		if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
-			return oldToggle.apply( this, arguments );
-		}
-		migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
-
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-				// Make sure that clicks stop
-				event.preventDefault();
-
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
-
-		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
-		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
-
-		return this.click( toggler );
-	};
-
-	jQuery.fn.live = function( types, data, fn ) {
-		migrateWarn("jQuery.fn.live() is deprecated");
-		if ( oldLive ) {
-			return oldLive.apply( this, arguments );
-		}
-		jQuery( this.context ).on( types, this.selector, data, fn );
-		return this;
-	};
-
-	jQuery.fn.die = function( types, fn ) {
-		migrateWarn("jQuery.fn.die() is deprecated");
-		if ( oldDie ) {
-			return oldDie.apply( this, arguments );
-		}
-		jQuery( this.context ).off( types, this.selector || "**", fn );
-		return this;
-	};
-
-// Turn global events into document-triggered events
-	jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
-		if ( !elem && !rajaxEvent.test( event ) ) {
-			migrateWarn( "Global events are undocumented and deprecated" );
-		}
-		return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
-	};
-	jQuery.each( ajaxEvents.split("|"),
-		function( _, name ) {
-			jQuery.event.special[ name ] = {
-				setup: function() {
-					var elem = this;
-
-					// The document needs no shimming; must be !== for oldIE
-					if ( elem !== document ) {
-						jQuery.event.add( document, name + "." + jQuery.guid, function() {
-							jQuery.event.trigger( name, Array.prototype.slice.call( arguments, 1 ), elem, true );
-						});
-						jQuery._data( this, name, jQuery.guid++ );
-					}
-					return false;
-				},
-				teardown: function() {
-					if ( this !== document ) {
-						jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
-					}
-					return false;
-				}
-			};
-		}
-	);
-
-	jQuery.event.special.ready = {
-		setup: function() {
-			if ( this === document ) {
-				migrateWarn( "'ready' event is deprecated" );
-			}
-		}
-	};
-
-	var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
-		oldFnFind = jQuery.fn.find;
-
-	jQuery.fn.andSelf = function() {
-		migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
-		return oldSelf.apply( this, arguments );
-	};
-
-	jQuery.fn.find = function( selector ) {
-		var ret = oldFnFind.apply( this, arguments );
-		ret.context = this.context;
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	};
-
-
-// jQuery 1.6 did not support Callbacks, do not warn there
-	if ( jQuery.Callbacks ) {
-
-		var oldDeferred = jQuery.Deferred,
-			tuples = [
-				// action, add listener, callbacks, .then handlers, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"),
-					jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"),
-					jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory"),
-					jQuery.Callbacks("memory") ]
-			];
-
-		jQuery.Deferred = function( func ) {
-			var deferred = oldDeferred(),
-				promise = deferred.promise();
-
-			deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
-				var fns = arguments;
-
-				migrateWarn( "deferred.pipe() is deprecated" );
-
-				return jQuery.Deferred(function( newDefer ) {
-					jQuery.each( tuples, function( i, tuple ) {
-						var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-						// deferred.done(function() { bind to newDefer or newDefer.resolve })
-						// deferred.fail(function() { bind to newDefer or newDefer.reject })
-						// deferred.progress(function() { bind to newDefer or newDefer.notify })
-						deferred[ tuple[1] ](function() {
-							var returned = fn && fn.apply( this, arguments );
-							if ( returned && jQuery.isFunction( returned.promise ) ) {
-								returned.promise()
-									.done( newDefer.resolve )
-									.fail( newDefer.reject )
-									.progress( newDefer.notify );
-							} else {
-								newDefer[ tuple[ 0 ] + "With" ](
-									this === promise ? newDefer.promise() : this,
-									fn ? [ returned ] : arguments
-								);
-							}
-						});
-					});
-					fns = null;
-				}).promise();
-
-			};
-
-			deferred.isResolved = function() {
-				migrateWarn( "deferred.isResolved is deprecated" );
-				return deferred.state() === "resolved";
-			};
-
-			deferred.isRejected = function() {
-				migrateWarn( "deferred.isRejected is deprecated" );
-				return deferred.state() === "rejected";
-			};
-
-			if ( func ) {
-				func.call( deferred, deferred );
-			}
-
-			return deferred;
-		};
-
-	}
-
-})( jQuery, window );
+/*!
+ * jQuery Migrate - v1.4.1 - 2016-05-19
+ * Copyright jQuery Foundation and other contributors
+ */
+(function( jQuery, window, undefined ) {
+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
+
+
+	jQuery.migrateVersion = "1.4.1";
+
+
+	var warnedAbout = {};
+
+// List of warnings already given; public read only
+	jQuery.migrateWarnings = [];
+
+// Set to true to prevent console output; migrateWarnings still maintained
+jQuery.migrateMute = true;
+
+// Show a message on the console so devs know we're active
+	if ( window.console && window.console.log ) {
+		window.console.log( "JQMIGRATE: Migrate is installed" +
+			( jQuery.migrateMute ? "" : " with logging active" ) +
+			", version " + jQuery.migrateVersion );
+	}
+
+// Set to false to disable traces that appear with warnings
+	if ( jQuery.migrateTrace === undefined ) {
+		jQuery.migrateTrace = true;
+	}
+
+// Forget any warnings we've already given; public
+	jQuery.migrateReset = function() {
+		warnedAbout = {};
+		jQuery.migrateWarnings.length = 0;
+	};
+
+	function migrateWarn( msg) {
+		var console = window.console;
+		if ( !warnedAbout[ msg ] ) {
+			warnedAbout[ msg ] = true;
+			jQuery.migrateWarnings.push( msg );
+			if ( console && console.warn && !jQuery.migrateMute ) {
+				console.warn( "JQMIGRATE: " + msg );
+				if ( jQuery.migrateTrace && console.trace ) {
+					console.trace();
+				}
+			}
+		}
+	}
+
+	function migrateWarnProp( obj, prop, value, msg ) {
+		if ( Object.defineProperty ) {
+			// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
+			// allow property to be overwritten in case some other plugin wants it
+			try {
+				Object.defineProperty( obj, prop, {
+					configurable: true,
+					enumerable: true,
+					get: function() {
+						migrateWarn( msg );
+						return value;
+					},
+					set: function( newValue ) {
+						migrateWarn( msg );
+						value = newValue;
+					}
+				});
+				return;
+			} catch( err ) {
+				// IE8 is a dope about Object.defineProperty, can't warn there
+			}
+		}
+
+		// Non-ES5 (or broken) browser; just set the property
+		jQuery._definePropertyBroken = true;
+		obj[ prop ] = value;
+	}
+
+	if ( document.compatMode === "BackCompat" ) {
+		// jQuery has never supported or tested Quirks Mode
+		migrateWarn( "jQuery is not compatible with Quirks Mode" );
+	}
+
+
+	var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
+		oldAttr = jQuery.attr,
+		valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
+			function() { return null; },
+		valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
+			function() { return undefined; },
+		rnoType = /^(?:input|button)$/i,
+		rnoAttrNodeType = /^[238]$/,
+		rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+		ruseDefault = /^(?:checked|selected)$/i;
+
+// jQuery.attrFn
+	migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
+
+	jQuery.attr = function( elem, name, value, pass ) {
+		var lowerName = name.toLowerCase(),
+			nType = elem && elem.nodeType;
+
+		if ( pass ) {
+			// Since pass is used internally, we only warn for new jQuery
+			// versions where there isn't a pass arg in the formal params
+			if ( oldAttr.length < 4 ) {
+				migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
+			}
+			if ( elem && !rnoAttrNodeType.test( nType ) &&
+				(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
+				return jQuery( elem )[ name ]( value );
+			}
+		}
+
+		// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
+		// for disconnected elements we don't warn on $( "<button>", { type: "button" } ).
+		if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
+			migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
+		}
+
+		// Restore boolHook for boolean property/attribute synchronization
+		if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
+			jQuery.attrHooks[ lowerName ] = {
+				get: function( elem, name ) {
+					// Align boolean attributes with corresponding properties
+					// Fall back to attribute presence where some booleans are not supported
+					var attrNode,
+						property = jQuery.prop( elem, name );
+					return property === true || typeof property !== "boolean" &&
+					( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
+
+						name.toLowerCase() :
+						undefined;
+				},
+				set: function( elem, value, name ) {
+					var propName;
+					if ( value === false ) {
+						// Remove boolean attributes when set to false
+						jQuery.removeAttr( elem, name );
+					} else {
+						// value is true since we know at this point it's type boolean and not false
+						// Set boolean attributes to the same name and set the DOM property
+						propName = jQuery.propFix[ name ] || name;
+						if ( propName in elem ) {
+							// Only set the IDL specifically if it already exists on the element
+							elem[ propName ] = true;
+						}
+
+						elem.setAttribute( name, name.toLowerCase() );
+					}
+					return name;
+				}
+			};
+
+			// Warn only for attributes that can remain distinct from their properties post-1.9
+			if ( ruseDefault.test( lowerName ) ) {
+				migrateWarn( "jQuery.fn.attr('" + lowerName + "') might use property instead of attribute" );
+			}
+		}
+
+		return oldAttr.call( jQuery, elem, name, value );
+	};
+
+// attrHooks: value
+	jQuery.attrHooks.value = {
+		get: function( elem, name ) {
+			var nodeName = ( elem.nodeName || "" ).toLowerCase();
+			if ( nodeName === "button" ) {
+				return valueAttrGet.apply( this, arguments );
+			}
+			if ( nodeName !== "input" && nodeName !== "option" ) {
+				migrateWarn("jQuery.fn.attr('value') no longer gets properties");
+			}
+			return name in elem ?
+				elem.value :
+				null;
+		},
+		set: function( elem, value ) {
+			var nodeName = ( elem.nodeName || "" ).toLowerCase();
+			if ( nodeName === "button" ) {
+				return valueAttrSet.apply( this, arguments );
+			}
+			if ( nodeName !== "input" && nodeName !== "option" ) {
+				migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
+			}
+			// Does not return so that setAttribute is also used
+			elem.value = value;
+		}
+	};
+
+
+	var matched, browser,
+		oldInit = jQuery.fn.init,
+		oldFind = jQuery.find,
+		oldParseJSON = jQuery.parseJSON,
+		rspaceAngle = /^\s*</,
+		rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
+		rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,
+		// Note: XSS check is done below after string is trimmed
+		rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
+
+// $(html) "looks like html" rule change
+	jQuery.fn.init = function( selector, context, rootjQuery ) {
+		var match, ret;
+
+		if ( selector && typeof selector === "string" ) {
+			if ( !jQuery.isPlainObject( context ) &&
+				(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
+
+				// This is an HTML string according to the "old" rules; is it still?
+				if ( !rspaceAngle.test( selector ) ) {
+					migrateWarn("$(html) HTML strings must start with '<' character");
+				}
+				if ( match[ 3 ] ) {
+					migrateWarn("$(html) HTML text after last tag is ignored");
+				}
+
+				// Consistently reject any HTML-like string starting with a hash (gh-9521)
+				// Note that this may break jQuery 1.6.x code that otherwise would work.
+				if ( match[ 0 ].charAt( 0 ) === "#" ) {
+					migrateWarn("HTML string cannot start with a '#' character");
+					jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+				}
+
+				// Now process using loose rules; let pre-1.8 play too
+				// Is this a jQuery context? parseHTML expects a DOM element (#178)
+				if ( context && context.context && context.context.nodeType ) {
+					context = context.context;
+				}
+
+				if ( jQuery.parseHTML ) {
+					return oldInit.call( this,
+						jQuery.parseHTML( match[ 2 ], context && context.ownerDocument ||
+							context || document, true ), context, rootjQuery );
+				}
+			}
+		}
+
+		ret = oldInit.apply( this, arguments );
+
+		// Fill in selector and context properties so .live() works
+		if ( selector && selector.selector !== undefined ) {
+			// A jQuery object, copy its properties
+			ret.selector = selector.selector;
+			ret.context = selector.context;
+
+		} else {
+			ret.selector = typeof selector === "string" ? selector : "";
+			if ( selector ) {
+				ret.context = selector.nodeType? selector : context || document;
+			}
+		}
+
+		return ret;
+	};
+	jQuery.fn.init.prototype = jQuery.fn;
+
+	jQuery.find = function( selector ) {
+		var args = Array.prototype.slice.call( arguments );
+
+		// Support: PhantomJS 1.x
+		// String#match fails to match when used with a //g RegExp, only on some strings
+		if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
+
+			// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
+			// First see if qS thinks it's a valid selector, if so avoid a false positive
+			try {
+				document.querySelector( selector );
+			} catch ( err1 ) {
+
+				// Didn't *look* valid to qSA, warn and try quoting what we think is the value
+				selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
+					return "[" + attr + op + "\"" + value + "\"]";
+				} );
+
+				// If the regexp *may* have created an invalid selector, don't update it
+				// Note that there may be false alarms if selector uses jQuery extensions
+				try {
+					document.querySelector( selector );
+					migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
+					args[ 0 ] = selector;
+				} catch ( err2 ) {
+					migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
+				}
+			}
+		}
+
+		return oldFind.apply( this, args );
+	};
+
+// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
+	var findProp;
+	for ( findProp in oldFind ) {
+		if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
+			jQuery.find[ findProp ] = oldFind[ findProp ];
+		}
+	}
+
+// Let $.parseJSON(falsy_value) return null
+	jQuery.parseJSON = function( json ) {
+		if ( !json ) {
+			migrateWarn("jQuery.parseJSON requires a valid JSON string");
+			return null;
+		}
+		return oldParseJSON.apply( this, arguments );
+	};
+
+	jQuery.uaMatch = function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
+			/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
+			/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
+			/(msie) ([\w.]+)/.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
+			[];
+
+		return {
+			browser: match[ 1 ] || "",
+			version: match[ 2 ] || "0"
+		};
+	};
+
+// Don't clobber any existing jQuery.browser in case it's different
+	if ( !jQuery.browser ) {
+		matched = jQuery.uaMatch( navigator.userAgent );
+		browser = {};
+
+		if ( matched.browser ) {
+			browser[ matched.browser ] = true;
+			browser.version = matched.version;
+		}
+
+		// Chrome is Webkit, but Webkit is also Safari.
+		if ( browser.chrome ) {
+			browser.webkit = true;
+		} else if ( browser.webkit ) {
+			browser.safari = true;
+		}
+
+		jQuery.browser = browser;
+	}
+
+// Warn if the code tries to get jQuery.browser
+	migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
+
+// jQuery.boxModel deprecated in 1.3, jQuery.support.boxModel deprecated in 1.7
+	jQuery.boxModel = jQuery.support.boxModel = (document.compatMode === "CSS1Compat");
+	migrateWarnProp( jQuery, "boxModel", jQuery.boxModel, "jQuery.boxModel is deprecated" );
+	migrateWarnProp( jQuery.support, "boxModel", jQuery.support.boxModel, "jQuery.support.boxModel is deprecated" );
+
+	jQuery.sub = function() {
+		function jQuerySub( selector, context ) {
+			return new jQuerySub.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySub, this );
+		jQuerySub.superclass = this;
+		jQuerySub.fn = jQuerySub.prototype = this();
+		jQuerySub.fn.constructor = jQuerySub;
+		jQuerySub.sub = this.sub;
+		jQuerySub.fn.init = function init( selector, context ) {
+			var instance = jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+			return instance instanceof jQuerySub ?
+				instance :
+				jQuerySub( instance );
+		};
+		jQuerySub.fn.init.prototype = jQuerySub.fn;
+		var rootjQuerySub = jQuerySub(document);
+		migrateWarn( "jQuery.sub() is deprecated" );
+		return jQuerySub;
+	};
+
+// The number of elements contained in the matched element set
+	jQuery.fn.size = function() {
+		migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
+		return this.length;
+	};
+
+
+	var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+	if ( jQuery.swap ) {
+		jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+			var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+			if ( oldHook ) {
+				jQuery.cssHooks[ name ].get = function() {
+					var ret;
+
+					internalSwapCall = true;
+					ret = oldHook.apply( this, arguments );
+					internalSwapCall = false;
+					return ret;
+				};
+			}
+		});
+	}
+
+	jQuery.swap = function( elem, options, callback, args ) {
+		var ret, name,
+			old = {};
+
+		if ( !internalSwapCall ) {
+			migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+		}
+
+		// Remember the old values, and insert the new ones
+		for ( name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		ret = callback.apply( elem, args || [] );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+
+		return ret;
+	};
+
+
+// Ensure that $.ajax gets the new parseJSON defined in core.js
+	jQuery.ajaxSetup({
+		converters: {
+			"text json": jQuery.parseJSON
+		}
+	});
+
+
+	var oldFnData = jQuery.fn.data;
+
+	jQuery.fn.data = function( name ) {
+		var ret, evt,
+			elem = this[0];
+
+		// Handles 1.7 which has this behavior and 1.8 which doesn't
+		if ( elem && name === "events" && arguments.length === 1 ) {
+			ret = jQuery.data( elem, name );
+			evt = jQuery._data( elem, name );
+			if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
+				migrateWarn("Use of jQuery.fn.data('events') is deprecated");
+				return evt;
+			}
+		}
+		return oldFnData.apply( this, arguments );
+	};
+
+
+	var rscriptType = /\/(java|ecma)script/i;
+
+// Since jQuery.clean is used internally on older versions, we only shim if it's missing
+	if ( !jQuery.clean ) {
+		jQuery.clean = function( elems, context, fragment, scripts ) {
+			// Set context per 1.8 logic
+			context = context || document;
+			context = !context.nodeType && context[0] || context;
+			context = context.ownerDocument || context;
+
+			migrateWarn("jQuery.clean() is deprecated");
+
+			var i, elem, handleScript, jsTags,
+				ret = [];
+
+			jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
+
+			// Complex logic lifted directly from jQuery 1.8
+			if ( fragment ) {
+				// Special handling of each script element
+				handleScript = function( elem ) {
+					// Check if we consider it executable
+					if ( !elem.type || rscriptType.test( elem.type ) ) {
+						// Detach the script and store it in the scripts array (if provided) or the fragment
+						// Return truthy to indicate that it has been handled
+						return scripts ?
+							scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
+							fragment.appendChild( elem );
+					}
+				};
+
+				for ( i = 0; (elem = ret[i]) != null; i++ ) {
+					// Check if we're done after handling an executable script
+					if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
+						// Append to fragment and handle embedded scripts
+						fragment.appendChild( elem );
+						if ( typeof elem.getElementsByTagName !== "undefined" ) {
+							// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
+							jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
+
+							// Splice the scripts into ret after their former ancestor and advance our index beyond them
+							ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+							i += jsTags.length;
+						}
+					}
+				}
+			}
+
+			return ret;
+		};
+	}
+
+	var eventAdd = jQuery.event.add,
+		eventRemove = jQuery.event.remove,
+		eventTrigger = jQuery.event.trigger,
+		oldToggle = jQuery.fn.toggle,
+		oldLive = jQuery.fn.live,
+		oldDie = jQuery.fn.die,
+		oldLoad = jQuery.fn.load,
+		ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
+		rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
+		rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
+		hoverHack = function( events ) {
+			if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
+				return events;
+			}
+			if ( rhoverHack.test( events ) ) {
+				migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
+			}
+			return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
+		};
+
+// Event props removed in 1.9, put them back if needed; no practical way to warn them
+	if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
+		jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
+	}
+
+// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
+	if ( jQuery.event.dispatch ) {
+		migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
+	}
+
+// Support for 'hover' pseudo-event and ajax event warnings
+	jQuery.event.add = function( elem, types, handler, data, selector ){
+		if ( elem !== document && rajaxEvent.test( types ) ) {
+			migrateWarn( "AJAX events should be attached to document: " + types );
+		}
+		eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
+	};
+	jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
+		eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
+	};
+
+	jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+		jQuery.fn[ name ] = function() {
+			var args = Array.prototype.slice.call( arguments, 0 );
+
+			// If this is an ajax load() the first arg should be the string URL;
+			// technically this could also be the "Anything" arg of the event .load()
+			// which just goes to show why this dumb signature has been deprecated!
+			// jQuery custom builds that exclude the Ajax module justifiably die here.
+			if ( name === "load" && typeof args[ 0 ] === "string" ) {
+				return oldLoad.apply( this, args );
+			}
+
+			migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+			args.splice( 0, 0, name );
+			if ( arguments.length ) {
+				return this.bind.apply( this, args );
+			}
+
+			// Use .triggerHandler here because:
+			// - load and unload events don't need to bubble, only applied to window or image
+			// - error event should not bubble to window, although it does pre-1.7
+			// See http://bugs.jquery.com/ticket/11820
+			this.triggerHandler.apply( this, args );
+			return this;
+		};
+
+	});
+
+	jQuery.fn.toggle = function( fn, fn2 ) {
+
+		// Don't mess with animation or css toggles
+		if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
+			return oldToggle.apply( this, arguments );
+		}
+		migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
+
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			guid = fn.guid || jQuery.guid++,
+			i = 0,
+			toggler = function( event ) {
+				// Figure out which function to execute
+				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+				// Make sure that clicks stop
+				event.preventDefault();
+
+				// and execute the function
+				return args[ lastToggle ].apply( this, arguments ) || false;
+			};
+
+		// link all the functions, so any of them can unbind this click handler
+		toggler.guid = guid;
+		while ( i < args.length ) {
+			args[ i++ ].guid = guid;
+		}
+
+		return this.click( toggler );
+	};
+
+	jQuery.fn.live = function( types, data, fn ) {
+		migrateWarn("jQuery.fn.live() is deprecated");
+		if ( oldLive ) {
+			return oldLive.apply( this, arguments );
+		}
+		jQuery( this.context ).on( types, this.selector, data, fn );
+		return this;
+	};
+
+	jQuery.fn.die = function( types, fn ) {
+		migrateWarn("jQuery.fn.die() is deprecated");
+		if ( oldDie ) {
+			return oldDie.apply( this, arguments );
+		}
+		jQuery( this.context ).off( types, this.selector || "**", fn );
+		return this;
+	};
+
+// Turn global events into document-triggered events
+	jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
+		if ( !elem && !rajaxEvent.test( event ) ) {
+			migrateWarn( "Global events are undocumented and deprecated" );
+		}
+		return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
+	};
+	jQuery.each( ajaxEvents.split("|"),
+		function( _, name ) {
+			jQuery.event.special[ name ] = {
+				setup: function() {
+					var elem = this;
+
+					// The document needs no shimming; must be !== for oldIE
+					if ( elem !== document ) {
+						jQuery.event.add( document, name + "." + jQuery.guid, function() {
+							jQuery.event.trigger( name, Array.prototype.slice.call( arguments, 1 ), elem, true );
+						});
+						jQuery._data( this, name, jQuery.guid++ );
+					}
+					return false;
+				},
+				teardown: function() {
+					if ( this !== document ) {
+						jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
+					}
+					return false;
+				}
+			};
+		}
+	);
+
+	jQuery.event.special.ready = {
+		setup: function() {
+			if ( this === document ) {
+				migrateWarn( "'ready' event is deprecated" );
+			}
+		}
+	};
+
+	var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
+		oldFnFind = jQuery.fn.find;
+
+	jQuery.fn.andSelf = function() {
+		migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+		return oldSelf.apply( this, arguments );
+	};
+
+	jQuery.fn.find = function( selector ) {
+		var ret = oldFnFind.apply( this, arguments );
+		ret.context = this.context;
+		ret.selector = this.selector ? this.selector + " " + selector : selector;
+		return ret;
+	};
+
+
+// jQuery 1.6 did not support Callbacks, do not warn there
+	if ( jQuery.Callbacks ) {
+
+		var oldDeferred = jQuery.Deferred,
+			tuples = [
+				// action, add listener, callbacks, .then handlers, final state
+				[ "resolve", "done", jQuery.Callbacks("once memory"),
+					jQuery.Callbacks("once memory"), "resolved" ],
+				[ "reject", "fail", jQuery.Callbacks("once memory"),
+					jQuery.Callbacks("once memory"), "rejected" ],
+				[ "notify", "progress", jQuery.Callbacks("memory"),
+					jQuery.Callbacks("memory") ]
+			];
+
+		jQuery.Deferred = function( func ) {
+			var deferred = oldDeferred(),
+				promise = deferred.promise();
+
+			deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+				var fns = arguments;
+
+				migrateWarn( "deferred.pipe() is deprecated" );
+
+				return jQuery.Deferred(function( newDefer ) {
+					jQuery.each( tuples, function( i, tuple ) {
+						var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+						// deferred.done(function() { bind to newDefer or newDefer.resolve })
+						// deferred.fail(function() { bind to newDefer or newDefer.reject })
+						// deferred.progress(function() { bind to newDefer or newDefer.notify })
+						deferred[ tuple[1] ](function() {
+							var returned = fn && fn.apply( this, arguments );
+							if ( returned && jQuery.isFunction( returned.promise ) ) {
+								returned.promise()
+									.done( newDefer.resolve )
+									.fail( newDefer.reject )
+									.progress( newDefer.notify );
+							} else {
+								newDefer[ tuple[ 0 ] + "With" ](
+									this === promise ? newDefer.promise() : this,
+									fn ? [ returned ] : arguments
+								);
+							}
+						});
+					});
+					fns = null;
+				}).promise();
+
+			};
+
+			deferred.isResolved = function() {
+				migrateWarn( "deferred.isResolved is deprecated" );
+				return deferred.state() === "resolved";
+			};
+
+			deferred.isRejected = function() {
+				migrateWarn( "deferred.isRejected is deprecated" );
+				return deferred.state() === "rejected";
+			};
+
+			if ( func ) {
+				func.call( deferred, deferred );
+			}
+
+			return deferred;
+		};
+
+	}
+
+})( jQuery, window );
diff --git a/js/jquery-ui-timepicker-addon.js b/js/jquery-ui-timepicker-addon.js
index 6e0e8f41c..c20eaa757 100644
--- a/js/jquery-ui-timepicker-addon.js
+++ b/js/jquery-ui-timepicker-addon.js
@@ -1,2269 +1,2269 @@
-/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
-* http://trentrichardson.com/examples/timepicker
-* Copyright (c) 2015 Trent Richardson; Licensed MIT */
-(function (factory) {
-	if (typeof define === 'function' && define.amd) {
-		define(['jquery', 'jquery-ui'], factory);
-	} else {
-		factory(jQuery);
-	}
-}(function ($) {
-
-	/*
-	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
-	*/
-	$.ui.timepicker = $.ui.timepicker || {};
-	if ($.ui.timepicker.version) {
-		return;
-	}
-
-	/*
-	* Extend jQueryUI, get it started with our version number
-	*/
-	$.extend($.ui, {
-		timepicker: {
-			version: "1.6.1"
-		}
-	});
-
-	/* 
-	* Timepicker manager.
-	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
-	* Settings for (groups of) time pickers are maintained in an instance object,
-	* allowing multiple different settings on the same page.
-	*/
-	var Timepicker = function () {
-		this.regional = []; // Available regional settings, indexed by language code
-		this.regional[''] = { // Default regional settings
-			currentText: 'Now',
-			closeText: 'Done',
-			amNames: ['AM', 'A'],
-			pmNames: ['PM', 'P'],
-			timeFormat: 'HH:mm',
-			timeSuffix: '',
-			timeOnlyTitle: 'Choose Time',
-			timeText: 'Time',
-			hourText: 'Hour',
-			minuteText: 'Minute',
-			secondText: 'Second',
-			millisecText: 'Millisecond',
-			microsecText: 'Microsecond',
-			timezoneText: 'Time Zone',
-			isRTL: false
-		};
-		this._defaults = { // Global defaults for all the datetime picker instances
-			showButtonPanel: true,
-			timeOnly: false,
-			timeOnlyShowDate: false,
-			showHour: null,
-			showMinute: null,
-			showSecond: null,
-			showMillisec: null,
-			showMicrosec: null,
-			showTimezone: null,
-			showTime: true,
-			stepHour: 1,
-			stepMinute: 1,
-			stepSecond: 1,
-			stepMillisec: 1,
-			stepMicrosec: 1,
-			hour: 0,
-			minute: 0,
-			second: 0,
-			millisec: 0,
-			microsec: 0,
-			timezone: null,
-			hourMin: 0,
-			minuteMin: 0,
-			secondMin: 0,
-			millisecMin: 0,
-			microsecMin: 0,
-			hourMax: 23,
-			minuteMax: 59,
-			secondMax: 59,
-			millisecMax: 999,
-			microsecMax: 999,
-			minDateTime: null,
-			maxDateTime: null,
-			maxTime: null,
-			minTime: null,
-			onSelect: null,
-			hourGrid: 0,
-			minuteGrid: 0,
-			secondGrid: 0,
-			millisecGrid: 0,
-			microsecGrid: 0,
-			alwaysSetTime: true,
-			separator: ' ',
-			altFieldTimeOnly: true,
-			altTimeFormat: null,
-			altSeparator: null,
-			altTimeSuffix: null,
-			altRedirectFocus: true,
-			pickerTimeFormat: null,
-			pickerTimeSuffix: null,
-			showTimepicker: true,
-			timezoneList: null,
-			addSliderAccess: false,
-			sliderAccessArgs: null,
-			controlType: 'slider',
-			oneLine: false,
-			defaultValue: null,
-			parse: 'strict',
-			afterInject: null
-		};
-		$.extend(this._defaults, this.regional['']);
-	};
-
-	$.extend(Timepicker.prototype, {
-		$input: null,
-		$altInput: null,
-		$timeObj: null,
-		inst: null,
-		hour_slider: null,
-		minute_slider: null,
-		second_slider: null,
-		millisec_slider: null,
-		microsec_slider: null,
-		timezone_select: null,
-		maxTime: null,
-		minTime: null,
-		hour: 0,
-		minute: 0,
-		second: 0,
-		millisec: 0,
-		microsec: 0,
-		timezone: null,
-		hourMinOriginal: null,
-		minuteMinOriginal: null,
-		secondMinOriginal: null,
-		millisecMinOriginal: null,
-		microsecMinOriginal: null,
-		hourMaxOriginal: null,
-		minuteMaxOriginal: null,
-		secondMaxOriginal: null,
-		millisecMaxOriginal: null,
-		microsecMaxOriginal: null,
-		ampm: '',
-		formattedDate: '',
-		formattedTime: '',
-		formattedDateTime: '',
-		timezoneList: null,
-		units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
-		support: {},
-		control: null,
-
-		/* 
-		* Override the default settings for all instances of the time picker.
-		* @param  {Object} settings  object - the new settings to use as defaults (anonymous object)
-		* @return {Object} the manager object
-		*/
-		setDefaults: function (settings) {
-			extendRemove(this._defaults, settings || {});
-			return this;
-		},
-
-		/*
-		* Create a new Timepicker instance
-		*/
-		_newInst: function ($input, opts) {
-			var tp_inst = new Timepicker(),
-				inlineSettings = {},
-				fns = {},
-				overrides, i;
-
-			for (var attrName in this._defaults) {
-				if (this._defaults.hasOwnProperty(attrName)) {
-					var attrValue = $input.attr('time:' + attrName);
-					if (attrValue) {
-						try {
-							inlineSettings[attrName] = eval(attrValue);
-						} catch (err) {
-							inlineSettings[attrName] = attrValue;
-						}
-					}
-				}
-			}
-
-			overrides = {
-				beforeShow: function (input, dp_inst) {
-					if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
-						return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
-					}
-				},
-				onChangeMonthYear: function (year, month, dp_inst) {
-					// Update the time as well : this prevents the time from disappearing from the $input field.
-					// tp_inst._updateDateTime(dp_inst);
-					if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
-						tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
-					}
-				},
-				onClose: function (dateText, dp_inst) {
-					if (tp_inst.timeDefined === true && $input.val() !== '') {
-						tp_inst._updateDateTime(dp_inst);
-					}
-					if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
-						tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
-					}
-				}
-			};
-			for (i in overrides) {
-				if (overrides.hasOwnProperty(i)) {
-					fns[i] = opts[i] || this._defaults[i] || null;
-				}
-			}
-
-			tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
-				evnts: fns,
-				timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
-			});
-			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
-				return val.toUpperCase();
-			});
-			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
-				return val.toUpperCase();
-			});
-
-			// detect which units are supported
-			tp_inst.support = detectSupport(
-					tp_inst._defaults.timeFormat + 
-					(tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
-					(tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
-
-			// controlType is string - key to our this._controls
-			if (typeof(tp_inst._defaults.controlType) === 'string') {
-				if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
-					tp_inst._defaults.controlType = 'select';
-				}
-				tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
-			}
-			// controlType is an object and must implement create, options, value methods
-			else {
-				tp_inst.control = tp_inst._defaults.controlType;
-			}
-
-			// prep the timezone options
-			var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
-					0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
-			if (tp_inst._defaults.timezoneList !== null) {
-				timezoneList = tp_inst._defaults.timezoneList;
-			}
-			var tzl = timezoneList.length, tzi = 0, tzv = null;
-			if (tzl > 0 && typeof timezoneList[0] !== 'object') {
-				for (; tzi < tzl; tzi++) {
-					tzv = timezoneList[tzi];
-					timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
-				}
-			}
-			tp_inst._defaults.timezoneList = timezoneList;
-
-			// set the default units
-			tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
-							((new Date()).getTimezoneOffset() * -1);
-			tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
-							tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
-			tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
-							tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
-			tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
-							tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
-			tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
-							tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
-			tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
-							tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
-			tp_inst.ampm = '';
-			tp_inst.$input = $input;
-
-			if (tp_inst._defaults.altField) {
-				tp_inst.$altInput = $(tp_inst._defaults.altField);
-				if (tp_inst._defaults.altRedirectFocus === true) {
-					tp_inst.$altInput.css({
-						cursor: 'pointer'
-					}).focus(function () {
-						$input.trigger("focus");
-					});
-				}
-			}
-
-			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
-				tp_inst._defaults.minDate = new Date();
-			}
-			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
-				tp_inst._defaults.maxDate = new Date();
-			}
-
-			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
-			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
-				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
-			}
-			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
-				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
-			}
-			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
-				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
-			}
-			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
-				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
-			}
-			tp_inst.$input.bind('focus', function () {
-				tp_inst._onFocus();
-			});
-
-			return tp_inst;
-		},
-
-		/*
-		* add our sliders to the calendar
-		*/
-		_addTimePicker: function (dp_inst) {
-			var currDT = $.trim((this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val());
-
-			this.timeDefined = this._parseTime(currDT);
-			this._limitMinMaxDateTime(dp_inst, false);
-			this._injectTimePicker();
-			this._afterInject();
-		},
-
-		/*
-		* parse the time string from input value or _setTime
-		*/
-		_parseTime: function (timeString, withDate) {
-			if (!this.inst) {
-				this.inst = $.datepicker._getInst(this.$input[0]);
-			}
-
-			if (withDate || !this._defaults.timeOnly) {
-				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
-				try {
-					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
-					if (!parseRes.timeObj) {
-						return false;
-					}
-					$.extend(this, parseRes.timeObj);
-				} catch (err) {
-					$.timepicker.log("Error parsing the date/time string: " + err +
-									"\ndate/time string = " + timeString +
-									"\ntimeFormat = " + this._defaults.timeFormat +
-									"\ndateFormat = " + dp_dateFormat);
-					return false;
-				}
-				return true;
-			} else {
-				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
-				if (!timeObj) {
-					return false;
-				}
-				$.extend(this, timeObj);
-				return true;
-			}
-		},
-
-		/*
-		* Handle callback option after injecting timepicker
-		*/
-		_afterInject: function() {
-			var o = this.inst.settings;
-			if ($.isFunction(o.afterInject)) {
-				o.afterInject.call(this);
-			}
-		},
-
-		/*
-		* generate and inject html for timepicker into ui datepicker
-		*/
-		_injectTimePicker: function () {
-			var $dp = this.inst.dpDiv,
-				o = this.inst.settings,
-				tp_inst = this,
-				litem = '',
-				uitem = '',
-				show = null,
-				max = {},
-				gridSize = {},
-				size = null,
-				i = 0,
-				l = 0;
-
-			// Prevent displaying twice
-			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
-				var noDisplay = ' ui_tpicker_unit_hide',
-					html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + (o.oneLine && o.controlType === 'select' ? ' ui-timepicker-oneLine' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label' + ((o.showTime) ? '' : noDisplay) + '">' + o.timeText + '</dt>' +
-								'<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"><input class="ui_tpicker_time_input" ' + (o.timeInput ? '' : 'disabled') + '/></dd>';
-
-				// Create the markup
-				for (i = 0, l = this.units.length; i < l; i++) {
-					litem = this.units[i];
-					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
-					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
-
-					// Added by Peter Medeiros:
-					// - Figure out what the hour/minute/second max should be based on the step values.
-					// - Example: if stepMinute is 15, then minMax is 45.
-					max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
-					gridSize[litem] = 0;
-
-					html += '<dt class="ui_tpicker_' + litem + '_label' + (show ? '' : noDisplay) + '">' + o[litem + 'Text'] + '</dt>' +
-								'<dd class="ui_tpicker_' + litem + (show ? '' : noDisplay) + '"><div class="ui_tpicker_' + litem + '_slider' + (show ? '' : noDisplay) + '"></div>';
-
-					if (show && o[litem + 'Grid'] > 0) {
-						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
-
-						if (litem === 'hour') {
-							for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
-								gridSize[litem]++;
-								var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
-								html += '<td data-for="' + litem + '">' + tmph + '</td>';
-							}
-						}
-						else {
-							for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
-								gridSize[litem]++;
-								html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
-							}
-						}
-
-						html += '</tr></table></div>';
-					}
-					html += '</dd>';
-				}
-				
-				// Timezone
-				var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
-				html += '<dt class="ui_tpicker_timezone_label' + (showTz ? '' : noDisplay) + '">' + o.timezoneText + '</dt>';
-				html += '<dd class="ui_tpicker_timezone' + (showTz ? '' : noDisplay) + '"></dd>';
-
-				// Create the elements from string
-				html += '</dl></div>';
-				var $tp = $(html);
-
-				// if we only want time picker...
-				if (o.timeOnly === true) {
-					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
-					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
-				}
-				
-				// add sliders, adjust grids, add events
-				for (i = 0, l = tp_inst.units.length; i < l; i++) {
-					litem = tp_inst.units[i];
-					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
-					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
-
-					// add the slider
-					tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
-
-					// adjust the grid and add click event
-					if (show && o[litem + 'Grid'] > 0) {
-						size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
-						$tp.find('.ui_tpicker_' + litem + ' table').css({
-							width: size + "%",
-							marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
-							marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
-							borderCollapse: 'collapse'
-						}).find("td").click(function (e) {
-								var $t = $(this),
-									h = $t.html(),
-									n = parseInt(h.replace(/[^0-9]/g), 10),
-									ap = h.replace(/[^apm]/ig),
-									f = $t.data('for'); // loses scope, so we use data-for
-
-								if (f === 'hour') {
-									if (ap.indexOf('p') !== -1 && n < 12) {
-										n += 12;
-									}
-									else {
-										if (ap.indexOf('a') !== -1 && n === 12) {
-											n = 0;
-										}
-									}
-								}
-								
-								tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
-
-								tp_inst._onTimeChange();
-								tp_inst._onSelectHandler();
-							}).css({
-								cursor: 'pointer',
-								width: (100 / gridSize[litem]) + '%',
-								textAlign: 'center',
-								overflow: 'hidden'
-							});
-					} // end if grid > 0
-				} // end for loop
-
-				// Add timezone options
-				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
-				$.fn.append.apply(this.timezone_select,
-				$.map(o.timezoneList, function (val, idx) {
-					return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
-				}));
-				if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
-					var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
-					if (local_timezone === this.timezone) {
-						selectLocalTimezone(tp_inst);
-					} else {
-						this.timezone_select.val(this.timezone);
-					}
-				} else {
-					if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
-						this.timezone_select.val(o.timezone);
-					} else {
-						selectLocalTimezone(tp_inst);
-					}
-				}
-				this.timezone_select.change(function () {
-					tp_inst._onTimeChange();
-					tp_inst._onSelectHandler();
-					tp_inst._afterInject();
-				});
-				// End timezone options
-				
-				// inject timepicker into datepicker
-				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
-				if ($buttonPanel.length) {
-					$buttonPanel.before($tp);
-				} else {
-					$dp.append($tp);
-				}
-
-				this.$timeObj = $tp.find('.ui_tpicker_time_input');
-				this.$timeObj.change(function () {
-					var timeFormat = tp_inst.inst.settings.timeFormat;
-					var parsedTime = $.datepicker.parseTime(timeFormat, this.value);
-					var update = new Date();
-					if (parsedTime) {
-						update.setHours(parsedTime.hour);
-						update.setMinutes(parsedTime.minute);
-						update.setSeconds(parsedTime.second);
-						$.datepicker._setTime(tp_inst.inst, update);
-					} else {
-						this.value = tp_inst.formattedTime;
-						this.blur();
-					}
-				});
-
-				if (this.inst !== null) {
-					var timeDefined = this.timeDefined;
-					this._onTimeChange();
-					this.timeDefined = timeDefined;
-				}
-
-				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
-				if (this._defaults.addSliderAccess) {
-					var sliderAccessArgs = this._defaults.sliderAccessArgs,
-						rtl = this._defaults.isRTL;
-					sliderAccessArgs.isRTL = rtl;
-						
-					setTimeout(function () { // fix for inline mode
-						if ($tp.find('.ui-slider-access').length === 0) {
-							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
-
-							// fix any grids since sliders are shorter
-							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
-							if (sliderAccessWidth) {
-								$tp.find('table:visible').each(function () {
-									var $g = $(this),
-										oldWidth = $g.outerWidth(),
-										oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
-										newWidth = oldWidth - sliderAccessWidth,
-										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
-										css = { width: newWidth, marginRight: 0, marginLeft: 0 };
-									css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
-									$g.css(css);
-								});
-							}
-						}
-					}, 10);
-				}
-				// end slideAccess integration
-
-				tp_inst._limitMinMaxDateTime(this.inst, true);
-			}
-		},
-
-		/*
-		* This function tries to limit the ability to go outside the
-		* min/max date range
-		*/
-		_limitMinMaxDateTime: function (dp_inst, adjustSliders) {
-			var o = this._defaults,
-				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
-
-			if (!this._defaults.showTimepicker) {
-				return;
-			} // No time so nothing to check here
-
-			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
-				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
-					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
-
-				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
-					this.hourMinOriginal = o.hourMin;
-					this.minuteMinOriginal = o.minuteMin;
-					this.secondMinOriginal = o.secondMin;
-					this.millisecMinOriginal = o.millisecMin;
-					this.microsecMinOriginal = o.microsecMin;
-				}
-
-				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
-					this._defaults.hourMin = minDateTime.getHours();
-					if (this.hour <= this._defaults.hourMin) {
-						this.hour = this._defaults.hourMin;
-						this._defaults.minuteMin = minDateTime.getMinutes();
-						if (this.minute <= this._defaults.minuteMin) {
-							this.minute = this._defaults.minuteMin;
-							this._defaults.secondMin = minDateTime.getSeconds();
-							if (this.second <= this._defaults.secondMin) {
-								this.second = this._defaults.secondMin;
-								this._defaults.millisecMin = minDateTime.getMilliseconds();
-								if (this.millisec <= this._defaults.millisecMin) {
-									this.millisec = this._defaults.millisecMin;
-									this._defaults.microsecMin = minDateTime.getMicroseconds();
-								} else {
-									if (this.microsec < this._defaults.microsecMin) {
-										this.microsec = this._defaults.microsecMin;
-									}
-									this._defaults.microsecMin = this.microsecMinOriginal;
-								}
-							} else {
-								this._defaults.millisecMin = this.millisecMinOriginal;
-								this._defaults.microsecMin = this.microsecMinOriginal;
-							}
-						} else {
-							this._defaults.secondMin = this.secondMinOriginal;
-							this._defaults.millisecMin = this.millisecMinOriginal;
-							this._defaults.microsecMin = this.microsecMinOriginal;
-						}
-					} else {
-						this._defaults.minuteMin = this.minuteMinOriginal;
-						this._defaults.secondMin = this.secondMinOriginal;
-						this._defaults.millisecMin = this.millisecMinOriginal;
-						this._defaults.microsecMin = this.microsecMinOriginal;
-					}
-				} else {
-					this._defaults.hourMin = this.hourMinOriginal;
-					this._defaults.minuteMin = this.minuteMinOriginal;
-					this._defaults.secondMin = this.secondMinOriginal;
-					this._defaults.millisecMin = this.millisecMinOriginal;
-					this._defaults.microsecMin = this.microsecMinOriginal;
-				}
-			}
-
-			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
-				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
-					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
-
-				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
-					this.hourMaxOriginal = o.hourMax;
-					this.minuteMaxOriginal = o.minuteMax;
-					this.secondMaxOriginal = o.secondMax;
-					this.millisecMaxOriginal = o.millisecMax;
-					this.microsecMaxOriginal = o.microsecMax;
-				}
-
-				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
-					this._defaults.hourMax = maxDateTime.getHours();
-					if (this.hour >= this._defaults.hourMax) {
-						this.hour = this._defaults.hourMax;
-						this._defaults.minuteMax = maxDateTime.getMinutes();
-						if (this.minute >= this._defaults.minuteMax) {
-							this.minute = this._defaults.minuteMax;
-							this._defaults.secondMax = maxDateTime.getSeconds();
-							if (this.second >= this._defaults.secondMax) {
-								this.second = this._defaults.secondMax;
-								this._defaults.millisecMax = maxDateTime.getMilliseconds();
-								if (this.millisec >= this._defaults.millisecMax) {
-									this.millisec = this._defaults.millisecMax;
-									this._defaults.microsecMax = maxDateTime.getMicroseconds();
-								} else {
-									if (this.microsec > this._defaults.microsecMax) {
-										this.microsec = this._defaults.microsecMax;
-									}
-									this._defaults.microsecMax = this.microsecMaxOriginal;
-								}
-							} else {
-								this._defaults.millisecMax = this.millisecMaxOriginal;
-								this._defaults.microsecMax = this.microsecMaxOriginal;
-							}
-						} else {
-							this._defaults.secondMax = this.secondMaxOriginal;
-							this._defaults.millisecMax = this.millisecMaxOriginal;
-							this._defaults.microsecMax = this.microsecMaxOriginal;
-						}
-					} else {
-						this._defaults.minuteMax = this.minuteMaxOriginal;
-						this._defaults.secondMax = this.secondMaxOriginal;
-						this._defaults.millisecMax = this.millisecMaxOriginal;
-						this._defaults.microsecMax = this.microsecMaxOriginal;
-					}
-				} else {
-					this._defaults.hourMax = this.hourMaxOriginal;
-					this._defaults.minuteMax = this.minuteMaxOriginal;
-					this._defaults.secondMax = this.secondMaxOriginal;
-					this._defaults.millisecMax = this.millisecMaxOriginal;
-					this._defaults.microsecMax = this.microsecMaxOriginal;
-				}
-			}
-
-			if (dp_inst.settings.minTime!==null) {				
-				var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);				
-				if (this.hour<tempMinTime.getHours()) {
-					this.hour=this._defaults.hourMin=tempMinTime.getHours();
-					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();							
-				} else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
-					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
-				} else {						
-					if (this._defaults.hourMin<tempMinTime.getHours()) {
-						this._defaults.hourMin=tempMinTime.getHours();
-						this._defaults.minuteMin=tempMinTime.getMinutes();					
-					} else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
-						this._defaults.minuteMin=tempMinTime.getMinutes();						
-					} else {
-						this._defaults.minuteMin=0;
-					}
-				}				
-			}
-			
-			if (dp_inst.settings.maxTime!==null) {				
-				var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
-				if (this.hour>tempMaxTime.getHours()) {
-					this.hour=this._defaults.hourMax=tempMaxTime.getHours();						
-					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
-				} else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {							
-					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();						
-				} else {
-					if (this._defaults.hourMax>tempMaxTime.getHours()) {
-						this._defaults.hourMax=tempMaxTime.getHours();
-						this._defaults.minuteMax=tempMaxTime.getMinutes();					
-					} else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
-						this._defaults.minuteMax=tempMaxTime.getMinutes();						
-					} else {
-						this._defaults.minuteMax=59;
-					}
-				}						
-			}
-			
-			if (adjustSliders !== undefined && adjustSliders === true) {
-				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
-					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
-					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
-					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
-					microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
-
-				if (this.hour_slider) {
-					this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour });
-					this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
-				}
-				if (this.minute_slider) {
-					this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute });
-					this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
-				}
-				if (this.second_slider) {
-					this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond });
-					this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
-				}
-				if (this.millisec_slider) {
-					this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec });
-					this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
-				}
-				if (this.microsec_slider) {
-					this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec });
-					this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
-				}
-			}
-
-		},
-
-		/*
-		* when a slider moves, set the internal time...
-		* on time change is also called when the time is updated in the text field
-		*/
-		_onTimeChange: function () {
-			if (!this._defaults.showTimepicker) {
-                                return;
-			}
-			var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
-				minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
-				second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
-				millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
-				microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
-				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
-				o = this._defaults,
-				pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
-				pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
-
-			if (typeof(hour) === 'object') {
-				hour = false;
-			}
-			if (typeof(minute) === 'object') {
-				minute = false;
-			}
-			if (typeof(second) === 'object') {
-				second = false;
-			}
-			if (typeof(millisec) === 'object') {
-				millisec = false;
-			}
-			if (typeof(microsec) === 'object') {
-				microsec = false;
-			}
-			if (typeof(timezone) === 'object') {
-				timezone = false;
-			}
-
-			if (hour !== false) {
-				hour = parseInt(hour, 10);
-			}
-			if (minute !== false) {
-				minute = parseInt(minute, 10);
-			}
-			if (second !== false) {
-				second = parseInt(second, 10);
-			}
-			if (millisec !== false) {
-				millisec = parseInt(millisec, 10);
-			}
-			if (microsec !== false) {
-				microsec = parseInt(microsec, 10);
-			}
-			if (timezone !== false) {
-				timezone = timezone.toString();
-			}
-
-			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
-
-			// If the update was done in the input field, the input field should not be updated.
-			// If the update was done using the sliders, update the input field.
-			var hasChanged = (
-						hour !== parseInt(this.hour,10) || // sliders should all be numeric
-						minute !== parseInt(this.minute,10) || 
-						second !== parseInt(this.second,10) || 
-						millisec !== parseInt(this.millisec,10) || 
-						microsec !== parseInt(this.microsec,10) || 
-						(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || 
-						(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
-					);
-
-			if (hasChanged) {
-
-				if (hour !== false) {
-					this.hour = hour;
-				}
-				if (minute !== false) {
-					this.minute = minute;
-				}
-				if (second !== false) {
-					this.second = second;
-				}
-				if (millisec !== false) {
-					this.millisec = millisec;
-				}
-				if (microsec !== false) {
-					this.microsec = microsec;
-				}
-				if (timezone !== false) {
-					this.timezone = timezone;
-				}
-
-				if (!this.inst) {
-					this.inst = $.datepicker._getInst(this.$input[0]);
-				}
-
-				this._limitMinMaxDateTime(this.inst, true);
-			}
-			if (this.support.ampm) {
-				this.ampm = ampm;
-			}
-
-			// Updates the time within the timepicker
-			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
-			if (this.$timeObj) {
-				var sPos = this.$timeObj[0].selectionStart;
-				var ePos = this.$timeObj[0].selectionEnd;
-				if (pickerTimeFormat === o.timeFormat) {
-					this.$timeObj.val(this.formattedTime + pickerTimeSuffix);
-				}
-				else {
-					this.$timeObj.val($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
-				}
-				this.$timeObj[0].setSelectionRange(sPos, ePos);
-			}
-
-			this.timeDefined = true;
-			if (hasChanged) {
-				this._updateDateTime();
-				//this.$input.focus(); // may automatically open the picker on setDate
-			}
-		},
-
-		/*
-		* call custom onSelect.
-		* bind to sliders slidestop, and grid click.
-		*/
-		_onSelectHandler: function () {
-			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
-			var inputEl = this.$input ? this.$input[0] : null;
-			if (onSelect && inputEl) {
-				onSelect.apply(inputEl, [this.formattedDateTime, this]);
-			}
-		},
-
-		/*
-		* update our input with the new date time..
-		*/
-		_updateDateTime: function (dp_inst) {
-			dp_inst = this.inst || dp_inst;
-			var dtTmp = (dp_inst.currentYear > 0? 
-							new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) : 
-							new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-				dt = $.datepicker._daylightSavingAdjust(dtTmp),
-				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
-				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
-				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
-				formatCfg = $.datepicker._getFormatConfig(dp_inst),
-				timeAvailable = dt !== null && this.timeDefined;
-			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
-			var formattedDateTime = this.formattedDate;
-			
-			// if a slider was changed but datepicker doesn't have a value yet, set it
-			if (dp_inst.lastVal === "") {
-                dp_inst.currentYear = dp_inst.selectedYear;
-                dp_inst.currentMonth = dp_inst.selectedMonth;
-                dp_inst.currentDay = dp_inst.selectedDay;
-            }
-
-			/*
-			* remove following lines to force every changes in date picker to change the input value
-			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
-			* If the user manually empty the value in the input field, the date picker will never change selected value.
-			*/
-			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
-			//	return;
-			//}
-
-			if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
-				formattedDateTime = this.formattedTime;
-			} else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
-				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
-			}
-
-			this.formattedDateTime = formattedDateTime;
-
-			if (!this._defaults.showTimepicker) {
-				this.$input.val(this.formattedDate);
-			} else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
-				this.$altInput.val(this.formattedTime);
-				this.$input.val(this.formattedDate);
-			} else if (this.$altInput) {
-				this.$input.val(formattedDateTime);
-				var altFormattedDateTime = '',
-					altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator,
-					altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
-				
-				if (!this._defaults.timeOnly) {
-					if (this._defaults.altFormat) {
-						altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
-					}
-					else {
-						altFormattedDateTime = this.formattedDate;
-					}
-
-					if (altFormattedDateTime) {
-						altFormattedDateTime += altSeparator;
-					}
-				}
-
-				if (this._defaults.altTimeFormat !== null) {
-					altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
-				}
-				else {
-					altFormattedDateTime += this.formattedTime + altTimeSuffix;
-				}
-				this.$altInput.val(altFormattedDateTime);
-			} else {
-				this.$input.val(formattedDateTime);
-			}
-
-			this.$input.trigger("change");
-		},
-
-		_onFocus: function () {
-			if (!this.$input.val() && this._defaults.defaultValue) {
-				this.$input.val(this._defaults.defaultValue);
-				var inst = $.datepicker._getInst(this.$input.get(0)),
-					tp_inst = $.datepicker._get(inst, 'timepicker');
-				if (tp_inst) {
-					if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
-						try {
-							$.datepicker._updateDatepicker(inst);
-						} catch (err) {
-							$.timepicker.log(err);
-						}
-					}
-				}
-			}
-		},
-
-		/*
-		* Small abstraction to control types
-		* We can add more, just be sure to follow the pattern: create, options, value
-		*/
-		_controls: {
-			// slider methods
-			slider: {
-				create: function (tp_inst, obj, unit, val, min, max, step) {
-					var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
-					return obj.prop('slide', null).slider({
-						orientation: "horizontal",
-						value: rtl ? val * -1 : val,
-						min: rtl ? max * -1 : min,
-						max: rtl ? min * -1 : max,
-						step: step,
-						slide: function (event, ui) {
-							tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
-							tp_inst._onTimeChange();
-						},
-						stop: function (event, ui) {
-							tp_inst._onSelectHandler();
-						}
-					});	
-				},
-				options: function (tp_inst, obj, unit, opts, val) {
-					if (tp_inst._defaults.isRTL) {
-						if (typeof(opts) === 'string') {
-							if (opts === 'min' || opts === 'max') {
-								if (val !== undefined) {
-									return obj.slider(opts, val * -1);
-								}
-								return Math.abs(obj.slider(opts));
-							}
-							return obj.slider(opts);
-						}
-						var min = opts.min, 
-							max = opts.max;
-						opts.min = opts.max = null;
-						if (min !== undefined) {
-							opts.max = min * -1;
-						}
-						if (max !== undefined) {
-							opts.min = max * -1;
-						}
-						return obj.slider(opts);
-					}
-					if (typeof(opts) === 'string' && val !== undefined) {
-						return obj.slider(opts, val);
-					}
-					return obj.slider(opts);
-				},
-				value: function (tp_inst, obj, unit, val) {
-					if (tp_inst._defaults.isRTL) {
-						if (val !== undefined) {
-							return obj.slider('value', val * -1);
-						}
-						return Math.abs(obj.slider('value'));
-					}
-					if (val !== undefined) {
-						return obj.slider('value', val);
-					}
-					return obj.slider('value');
-				}
-			},
-			// select methods
-			select: {
-				create: function (tp_inst, obj, unit, val, min, max, step) {
-					var sel = '<select class="ui-timepicker-select ui-state-default ui-corner-all" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
-						format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
-
-					for (var i = min; i <= max; i += step) {
-						sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
-						if (unit === 'hour') {
-							format = format.replace(/'.'/g, '');
-							sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
-						}
-						else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
-						else {sel += '0' + i.toString(); }
-						sel += '</option>';
-					}
-					sel += '</select>';
-
-					obj.children('select').remove();
-
-					$(sel).appendTo(obj).change(function (e) {
-						tp_inst._onTimeChange();
-						tp_inst._onSelectHandler();
-						tp_inst._afterInject();
-					});
-
-					return obj;
-				},
-				options: function (tp_inst, obj, unit, opts, val) {
-					var o = {},
-						$t = obj.children('select');
-					if (typeof(opts) === 'string') {
-						if (val === undefined) {
-							return $t.data(opts);
-						}
-						o[opts] = val;	
-					}
-					else { o = opts; }
-					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
-				},
-				value: function (tp_inst, obj, unit, val) {
-					var $t = obj.children('select');
-					if (val !== undefined) {
-						return $t.val(val);
-					}
-					return $t.val();
-				}
-			}
-		} // end _controls
-
-	});
-
-	$.fn.extend({
-		/*
-		* shorthand just to use timepicker.
-		*/
-		timepicker: function (o) {
-			o = o || {};
-			var tmp_args = Array.prototype.slice.call(arguments);
-
-			if (typeof o === 'object') {
-				tmp_args[0] = $.extend(o, {
-					timeOnly: true
-				});
-			}
-
-			return $(this).each(function () {
-				$.fn.datetimepicker.apply($(this), tmp_args);
-			});
-		},
-
-		/*
-		* extend timepicker to datepicker
-		*/
-		datetimepicker: function (o) {
-			o = o || {};
-			var tmp_args = arguments;
-
-			if (typeof(o) === 'string') {
-				if (o === 'getDate'  || (o === 'option' && tmp_args.length === 2 && typeof (tmp_args[1]) === 'string')) {
-					return $.fn.datepicker.apply($(this[0]), tmp_args);
-				} else {
-					return this.each(function () {
-						var $t = $(this);
-						$t.datepicker.apply($t, tmp_args);
-					});
-				}
-			} else {
-				return this.each(function () {
-					var $t = $(this);
-					$t.datepicker($.timepicker._newInst($t, o)._defaults);
-				});
-			}
-		}
-	});
-
-	/*
-	* Public Utility to parse date and time
-	*/
-	$.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
-		if (parseRes.timeObj) {
-			var t = parseRes.timeObj;
-			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
-			parseRes.date.setMicroseconds(t.microsec);
-		}
-
-		return parseRes.date;
-	};
-
-	/*
-	* Public utility to parse time
-	*/
-	$.datepicker.parseTime = function (timeFormat, timeString, options) {
-		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
-			iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
-
-		// Strict parse requires the timeString to match the timeFormat exactly
-		var strictParse = function (f, s, o) {
-
-			// pattern for standard and localized AM/PM markers
-			var getPatternAmpm = function (amNames, pmNames) {
-				var markers = [];
-				if (amNames) {
-					$.merge(markers, amNames);
-				}
-				if (pmNames) {
-					$.merge(markers, pmNames);
-				}
-				markers = $.map(markers, function (val) {
-					return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
-				});
-				return '(' + markers.join('|') + ')?';
-			};
-
-			// figure out position of time elements.. cause js cant do named captures
-			var getFormatPositions = function (timeFormat) {
-				var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
-					orders = {
-						h: -1,
-						m: -1,
-						s: -1,
-						l: -1,
-						c: -1,
-						t: -1,
-						z: -1
-					};
-
-				if (finds) {
-					for (var i = 0; i < finds.length; i++) {
-						if (orders[finds[i].toString().charAt(0)] === -1) {
-							orders[finds[i].toString().charAt(0)] = i + 1;
-						}
-					}
-				}
-				return orders;
-			};
-
-			var regstr = '^' + f.toString()
-					.replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
-							var ml = match.length;
-							switch (match.charAt(0).toLowerCase()) {
-							case 'h':
-								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
-							case 'm':
-								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
-							case 's':
-								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
-							case 'l':
-								return '(\\d?\\d?\\d)';
-							case 'c':
-								return '(\\d?\\d?\\d)';
-							case 'z':
-								return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
-							case 't':
-								return getPatternAmpm(o.amNames, o.pmNames);
-							default:    // literal escaped in quotes
-								return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
-							}
-						})
-					.replace(/\s/g, '\\s?') +
-					o.timeSuffix + '$',
-				order = getFormatPositions(f),
-				ampm = '',
-				treg;
-
-			treg = s.match(new RegExp(regstr, 'i'));
-
-			var resTime = {
-				hour: 0,
-				minute: 0,
-				second: 0,
-				millisec: 0,
-				microsec: 0
-			};
-
-			if (treg) {
-				if (order.t !== -1) {
-					if (treg[order.t] === undefined || treg[order.t].length === 0) {
-						ampm = '';
-						resTime.ampm = '';
-					} else {
-						ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM';
-						resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
-					}
-				}
-
-				if (order.h !== -1) {
-					if (ampm === 'AM' && treg[order.h] === '12') {
-						resTime.hour = 0; // 12am = 0 hour
-					} else {
-						if (ampm === 'PM' && treg[order.h] !== '12') {
-							resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
-						} else {
-							resTime.hour = Number(treg[order.h]);
-						}
-					}
-				}
-
-				if (order.m !== -1) {
-					resTime.minute = Number(treg[order.m]);
-				}
-				if (order.s !== -1) {
-					resTime.second = Number(treg[order.s]);
-				}
-				if (order.l !== -1) {
-					resTime.millisec = Number(treg[order.l]);
-				}
-				if (order.c !== -1) {
-					resTime.microsec = Number(treg[order.c]);
-				}
-				if (order.z !== -1 && treg[order.z] !== undefined) {
-					resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
-				}
-
-
-				return resTime;
-			}
-			return false;
-		};// end strictParse
-
-		// First try JS Date, if that fails, use strictParse
-		var looseParse = function (f, s, o) {
-			try {
-				var d = new Date('2012-01-01 ' + s);
-				if (isNaN(d.getTime())) {
-					d = new Date('2012-01-01T' + s);
-					if (isNaN(d.getTime())) {
-						d = new Date('01/01/2012 ' + s);
-						if (isNaN(d.getTime())) {
-							throw "Unable to parse time with native Date: " + s;
-						}
-					}
-				}
-
-				return {
-					hour: d.getHours(),
-					minute: d.getMinutes(),
-					second: d.getSeconds(),
-					millisec: d.getMilliseconds(),
-					microsec: d.getMicroseconds(),
-					timezone: d.getTimezoneOffset() * -1
-				};
-			}
-			catch (err) {
-				try {
-					return strictParse(f, s, o);
-				}
-				catch (err2) {
-					$.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
-				}				
-			}
-			return false;
-		}; // end looseParse
-		
-		if (typeof o.parse === "function") {
-			return o.parse(timeFormat, timeString, o);
-		}
-		if (o.parse === 'loose') {
-			return looseParse(timeFormat, timeString, o);
-		}
-		return strictParse(timeFormat, timeString, o);
-	};
-
-	/**
-	 * Public utility to format the time
-	 * @param {string} format format of the time
-	 * @param {Object} time Object not a Date for timezones
-	 * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
-	 * @returns {string} the formatted time
-	 */
-	$.datepicker.formatTime = function (format, time, options) {
-		options = options || {};
-		options = $.extend({}, $.timepicker._defaults, options);
-		time = $.extend({
-			hour: 0,
-			minute: 0,
-			second: 0,
-			millisec: 0,
-			microsec: 0,
-			timezone: null
-		}, time);
-
-		var tmptime = format,
-			ampmName = options.amNames[0],
-			hour = parseInt(time.hour, 10);
-
-		if (hour > 11) {
-			ampmName = options.pmNames[0];
-		}
-
-		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
-			switch (match) {
-			case 'HH':
-				return ('0' + hour).slice(-2);
-			case 'H':
-				return hour;
-			case 'hh':
-				return ('0' + convert24to12(hour)).slice(-2);
-			case 'h':
-				return convert24to12(hour);
-			case 'mm':
-				return ('0' + time.minute).slice(-2);
-			case 'm':
-				return time.minute;
-			case 'ss':
-				return ('0' + time.second).slice(-2);
-			case 's':
-				return time.second;
-			case 'l':
-				return ('00' + time.millisec).slice(-3);
-			case 'c':
-				return ('00' + time.microsec).slice(-3);
-			case 'z':
-				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
-			case 'Z':
-				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
-			case 'T':
-				return ampmName.charAt(0).toUpperCase();
-			case 'TT':
-				return ampmName.toUpperCase();
-			case 't':
-				return ampmName.charAt(0).toLowerCase();
-			case 'tt':
-				return ampmName.toLowerCase();
-			default:
-				return match.replace(/'/g, "");
-			}
-		});
-
-		return tmptime;
-	};
-
-	/*
-	* the bad hack :/ override datepicker so it doesn't close on select
-	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
-	*/
-	$.datepicker._base_selectDate = $.datepicker._selectDate;
-	$.datepicker._selectDate = function (id, dateStr) {
-		var inst = this._getInst($(id)[0]),
-			tp_inst = this._get(inst, 'timepicker'),
-			was_inline;
-
-		if (tp_inst && inst.settings.showTimepicker) {
-			tp_inst._limitMinMaxDateTime(inst, true);
-			was_inline = inst.inline;
-			inst.inline = inst.stay_open = true;
-			//This way the onSelect handler called from calendarpicker get the full dateTime
-			this._base_selectDate(id, dateStr);
-			inst.inline = was_inline;
-			inst.stay_open = false;
-			this._notifyChange(inst);
-			this._updateDatepicker(inst);
-		} else {
-			this._base_selectDate(id, dateStr);
-		}
-	};
-
-	/*
-	* second bad hack :/ override datepicker so it triggers an event when changing the input field
-	* and does not redraw the datepicker on every selectDate event
-	*/
-	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
-	$.datepicker._updateDatepicker = function (inst) {
-
-		// don't popup the datepicker if there is another instance already opened
-		var input = inst.input[0];
-		if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
-			return;
-		}
-
-		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
-
-			this._base_updateDatepicker(inst);
-
-			// Reload the time control when changing something in the input text field.
-			var tp_inst = this._get(inst, 'timepicker');
-			if (tp_inst) {
-				tp_inst._addTimePicker(inst);
-			}
-		}
-	};
-
-	/*
-	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
-	*/
-	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
-	$.datepicker._doKeyPress = function (event) {
-		var inst = $.datepicker._getInst(event.target),
-			tp_inst = $.datepicker._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			if ($.datepicker._get(inst, 'constrainInput')) {
-				var ampm = tp_inst.support.ampm,
-					tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
-					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
-					datetimeChars = tp_inst._defaults.timeFormat.toString()
-											.replace(/[hms]/g, '')
-											.replace(/TT/g, ampm ? 'APM' : '')
-											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
-											.replace(/tT/g, ampm ? 'AaPpMm' : '')
-											.replace(/T/g, ampm ? 'AP' : '')
-											.replace(/tt/g, ampm ? 'apm' : '')
-											.replace(/t/g, ampm ? 'ap' : '') + 
-											" " + tp_inst._defaults.separator + 
-											tp_inst._defaults.timeSuffix + 
-											(tz ? tp_inst._defaults.timezoneList.join('') : '') + 
-											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + 
-											dateChars,
-					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
-				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
-			}
-		}
-
-		return $.datepicker._base_doKeyPress(event);
-	};
-
-	/*
-	* Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
-	* Update any alternate field to synchronise with the main field.
-	*/
-	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
-	$.datepicker._updateAlternate = function (inst) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var altField = tp_inst._defaults.altField;
-			if (altField) { // update alternate field too
-				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
-					date = this._getDate(inst),
-					formatCfg = $.datepicker._getFormatConfig(inst),
-					altFormattedDateTime = '', 
-					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 
-					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
-					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
-				
-				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
-				if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
-					if (tp_inst._defaults.altFormat) {
-						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
-					}
-					else {
-						altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
-					}
-				}
-				$(altField).val( inst.input.val() ? altFormattedDateTime : "");
-			}
-		}
-		else {
-			$.datepicker._base_updateAlternate(inst);	
-		}
-	};
-
-	/*
-	* Override key up event to sync manual input changes.
-	*/
-	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
-	$.datepicker._doKeyUp = function (event) {
-		var inst = $.datepicker._getInst(event.target),
-			tp_inst = $.datepicker._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
-				try {
-					$.datepicker._updateDatepicker(inst);
-				} catch (err) {
-					$.timepicker.log(err);
-				}
-			}
-		}
-
-		return $.datepicker._base_doKeyUp(event);
-	};
-
-	/*
-	* override "Today" button to also grab the time and set it to input field.
-	*/
-	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
-	$.datepicker._gotoToday = function (id) {
-		var inst = this._getInst($(id)[0]);
-		this._base_gotoToday(id);
-		var tp_inst = this._get(inst, 'timepicker');
-		var tzoffset = $.timepicker.timezoneOffsetNumber(tp_inst.timezone);
-		var now = new Date();
-		if (typeof tzoffset == 'string')
-		{
-			tzoffset = parseInt(tzoffset, 10);
-		}
-		console.log(tzoffset, now.getTimezoneOffset(), now);
-		now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + tzoffset);
-		this._setTime(inst, now);
-		this._setDate(inst, now);
-		tp_inst._onSelectHandler();
-	};
-
-	/*
-	* Disable & enable the Time in the datetimepicker
-	*/
-	$.datepicker._disableTimepickerDatepicker = function (target) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-		if (tp_inst) {
-			inst.settings.showTimepicker = false;
-			tp_inst._defaults.showTimepicker = false;
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	$.datepicker._enableTimepickerDatepicker = function (target) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
-		if (tp_inst) {
-			inst.settings.showTimepicker = true;
-			tp_inst._defaults.showTimepicker = true;
-			tp_inst._addTimePicker(inst); // Could be disabled on page load
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	/*
-	* Create our own set time function
-	*/
-	$.datepicker._setTime = function (inst, date) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var defaults = tp_inst._defaults;
-
-			// calling _setTime with no date sets time to defaults
-			tp_inst.hour = date ? date.getHours() : defaults.hour;
-			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
-			tp_inst.second = date ? date.getSeconds() : defaults.second;
-			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
-			tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
-
-			//check if within min/max times.. 
-			tp_inst._limitMinMaxDateTime(inst, true);
-
-			tp_inst._onTimeChange();
-			tp_inst._updateDateTime(inst);
-		}
-	};
-
-	/*
-	* Create new public method to set only time, callable as $().datepicker('setTime', date)
-	*/
-	$.datepicker._setTimeDatepicker = function (target, date, withDate) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			this._setDateFromField(inst);
-			var tp_date;
-			if (date) {
-				if (typeof date === "string") {
-					tp_inst._parseTime(date, withDate);
-					tp_date = new Date();
-					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-					tp_date.setMicroseconds(tp_inst.microsec);
-				} else {
-					tp_date = new Date(date.getTime());
-					tp_date.setMicroseconds(date.getMicroseconds());
-				}
-				if (tp_date.toString() === 'Invalid Date') {
-					tp_date = undefined;
-				}
-				this._setTime(inst, tp_date);
-			}
-		}
-
-	};
-
-	/*
-	* override setDate() to allow setting time too within Date object
-	*/
-	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
-	$.datepicker._setDateDatepicker = function (target, _date) {
-		var inst = this._getInst(target);
-		var date = _date;
-		if (!inst) {
-			return;
-		}
-
-		if (typeof(_date) === 'string') {
-			date = new Date(_date);
-			if (!date.getTime()) {
-				this._base_setDateDatepicker.apply(this, arguments);
-				date = $(target).datepicker('getDate');
-			}
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		var tp_date;
-		if (date instanceof Date) {
-			tp_date = new Date(date.getTime());
-			tp_date.setMicroseconds(date.getMicroseconds());
-		} else {
-			tp_date = date;
-		}
-		
-		// This is important if you are using the timezone option, javascript's Date 
-		// object will only return the timezone offset for the current locale, so we 
-		// adjust it accordingly.  If not using timezone option this won't matter..
-		// If a timezone is different in tp, keep the timezone as is
-		if (tp_inst && tp_date) {
-			// look out for DST if tz wasn't specified
-			if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
-				tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
-			}
-			date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
-			tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
-		}
-
-		this._updateDatepicker(inst);
-		this._base_setDateDatepicker.apply(this, arguments);
-		this._setTimeDatepicker(target, tp_date, true);
-	};
-
-	/*
-	* override getDate() to allow getting time too within Date object
-	*/
-	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
-	$.datepicker._getDateDatepicker = function (target, noDefault) {
-		var inst = this._getInst(target);
-		if (!inst) {
-			return;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-
-		if (tp_inst) {
-			// if it hasn't yet been defined, grab from field
-			if (inst.lastVal === undefined) {
-				this._setDateFromField(inst, noDefault);
-			}
-
-			var date = this._getDate(inst);
-			var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
-			if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
-				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
-				date.setMicroseconds(tp_inst.microsec);
-
-				// This is important if you are using the timezone option, javascript's Date 
-				// object will only return the timezone offset for the current locale, so we 
-				// adjust it accordingly.  If not using timezone option this won't matter..
-				if (tp_inst.timezone != null) {
-					// look out for DST if tz wasn't specified
-					if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
-						tp_inst.timezone = date.getTimezoneOffset() * -1;
-					}
-					date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
-				}
-			}
-			return date;
-		}
-		return this._base_getDateDatepicker(target, noDefault);
-	};
-
-	/*
-	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
-	* An option in datapicker to ignore extra format characters would be nicer.
-	*/
-	$.datepicker._base_parseDate = $.datepicker.parseDate;
-	$.datepicker.parseDate = function (format, value, settings) {
-		var date;
-		try {
-			date = this._base_parseDate(format, value, settings);
-		} catch (err) {
-			// Hack!  The error message ends with a colon, a space, and
-			// the "extra" characters.  We rely on that instead of
-			// attempting to perfectly reproduce the parsing algorithm.
-			if (err.indexOf(":") >= 0) {
-				date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
-				$.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
-			} else {
-				throw err;
-			}
-		}
-		return date;
-	};
-
-	/*
-	* override formatDate to set date with time to the input
-	*/
-	$.datepicker._base_formatDate = $.datepicker._formatDate;
-	$.datepicker._formatDate = function (inst, day, month, year) {
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			tp_inst._updateDateTime(inst);
-			return tp_inst.$input.val();
-		}
-		return this._base_formatDate(inst);
-	};
-
-	/*
-	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
-	*/
-	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
-	$.datepicker._optionDatepicker = function (target, name, value) {
-		var inst = this._getInst(target),
-			name_clone;
-		if (!inst) {
-			return null;
-		}
-
-		var tp_inst = this._get(inst, 'timepicker');
-		if (tp_inst) {
-			var min = null,
-				max = null,
-				onselect = null,
-				overrides = tp_inst._defaults.evnts,
-				fns = {},
-				prop,
-				ret,
-				oldVal,
-				$target;
-			if (typeof name === 'string') { // if min/max was set with the string
-				if (name === 'minDate' || name === 'minDateTime') {
-					min = value;
-				} else if (name === 'maxDate' || name === 'maxDateTime') {
-					max = value;
-				} else if (name === 'onSelect') {
-					onselect = value;
-				} else if (overrides.hasOwnProperty(name)) {
-					if (typeof (value) === 'undefined') {
-						return overrides[name];
-					}
-					fns[name] = value;
-					name_clone = {}; //empty results in exiting function after overrides updated
-				}
-			} else if (typeof name === 'object') { //if min/max was set with the JSON
-				if (name.minDate) {
-					min = name.minDate;
-				} else if (name.minDateTime) {
-					min = name.minDateTime;
-				} else if (name.maxDate) {
-					max = name.maxDate;
-				} else if (name.maxDateTime) {
-					max = name.maxDateTime;
-				}
-				for (prop in overrides) {
-					if (overrides.hasOwnProperty(prop) && name[prop]) {
-						fns[prop] = name[prop];
-					}
-				}
-			}
-			for (prop in fns) {
-				if (fns.hasOwnProperty(prop)) {
-					overrides[prop] = fns[prop];
-					if (!name_clone) { name_clone = $.extend({}, name); }
-					delete name_clone[prop];
-				}
-			}
-			if (name_clone && isEmptyObject(name_clone)) { return; }
-			if (min) { //if min was set
-				if (min === 0) {
-					min = new Date();
-				} else {
-					min = new Date(min);
-				}
-				tp_inst._defaults.minDate = min;
-				tp_inst._defaults.minDateTime = min;
-			} else if (max) { //if max was set
-				if (max === 0) {
-					max = new Date();
-				} else {
-					max = new Date(max);
-				}
-				tp_inst._defaults.maxDate = max;
-				tp_inst._defaults.maxDateTime = max;
-			} else if (onselect) {
-				tp_inst._defaults.onSelect = onselect;
-			}
-
-			// Datepicker will override our date when we call _base_optionDatepicker when 
-			// calling minDate/maxDate, so we will first grab the value, call 
-			// _base_optionDatepicker, then set our value back.
-			if(min || max){
-				$target = $(target);
-				oldVal = $target.datetimepicker('getDate');
-				ret = this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
-				$target.datetimepicker('setDate', oldVal);
-				return ret;
-			}
-		}
-		if (value === undefined) {
-			return this._base_optionDatepicker.call($.datepicker, target, name);
-		}
-		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
-	};
-	
-	/*
-	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
-	* it will return false for all objects
-	*/
-	var isEmptyObject = function (obj) {
-		var prop;
-		for (prop in obj) {
-			if (obj.hasOwnProperty(prop)) {
-				return false;
-			}
-		}
-		return true;
-	};
-
-	/*
-	* jQuery extend now ignores nulls!
-	*/
-	var extendRemove = function (target, props) {
-		$.extend(target, props);
-		for (var name in props) {
-			if (props[name] === null || props[name] === undefined) {
-				target[name] = props[name];
-			}
-		}
-		return target;
-	};
-
-	/*
-	* Determine by the time format which units are supported
-	* Returns an object of booleans for each unit
-	*/
-	var detectSupport = function (timeFormat) {
-		var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
-			isIn = function (f, t) { // does the format contain the token?
-					return f.indexOf(t) !== -1 ? true : false;
-				};
-		return {
-				hour: isIn(tf, 'h'),
-				minute: isIn(tf, 'm'),
-				second: isIn(tf, 's'),
-				millisec: isIn(tf, 'l'),
-				microsec: isIn(tf, 'c'),
-				timezone: isIn(tf, 'z'),
-				ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
-				iso8601: isIn(timeFormat, 'Z')
-			};
-	};
-
-	/*
-	* Converts 24 hour format into 12 hour
-	* Returns 12 hour without leading 0
-	*/
-	var convert24to12 = function (hour) {
-		hour %= 12;
-
-		if (hour === 0) {
-			hour = 12;
-		}
-
-		return String(hour);
-	};
-
-	var computeEffectiveSetting = function (settings, property) {
-		return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
-	};
-
-	/*
-	* Splits datetime string into date and time substrings.
-	* Throws exception when date can't be parsed
-	* Returns {dateString: dateString, timeString: timeString}
-	*/
-	var splitDateTime = function (dateTimeString, timeSettings) {
-		// The idea is to get the number separator occurrences in datetime and the time format requested (since time has
-		// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
-		var separator = computeEffectiveSetting(timeSettings, 'separator'),
-			format = computeEffectiveSetting(timeSettings, 'timeFormat'),
-			timeParts = format.split(separator), // how many occurrences of separator may be in our format?
-			timePartsLen = timeParts.length,
-			allParts = dateTimeString.split(separator),
-			allPartsLen = allParts.length;
-
-		if (allPartsLen > 1) {
-			return {
-				dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
-				timeString: allParts.splice(0, timePartsLen).join(separator)
-			};
-		}
-
-		return {
-			dateString: dateTimeString,
-			timeString: ''
-		};
-	};
-
-	/*
-	* Internal function to parse datetime interval
-	* Returns: {date: Date, timeObj: Object}, where
-	*   date - parsed date without time (type Date)
-	*   timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
-	*/
-	var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
-		var date,
-			parts,
-			parsedTime;
-
-		parts = splitDateTime(dateTimeString, timeSettings);
-		date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
-
-		if (parts.timeString === '') {
-			return {
-				date: date
-			};
-		}
-
-		parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
-
-		if (!parsedTime) {
-			throw 'Wrong time format';
-		}
-
-		return {
-			date: date,
-			timeObj: parsedTime
-		};
-	};
-
-	/*
-	* Internal function to set timezone_select to the local timezone
-	*/
-	var selectLocalTimezone = function (tp_inst, date) {
-		if (tp_inst && tp_inst.timezone_select) {
-			var now = date || new Date();
-			tp_inst.timezone_select.val(-now.getTimezoneOffset());
-		}
-	};
-
-	/*
-	* Create a Singleton Instance
-	*/
-	$.timepicker = new Timepicker();
-
-	/**
-	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
-	 * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
-	 * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
-	 * @return {string}
-	 */
-	$.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
-		if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
-			return tzMinutes;
-		}
-
-		var off = tzMinutes,
-			minutes = off % 60,
-			hours = (off - minutes) / 60,
-			iso = iso8601 ? ':' : '',
-			tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
-		
-		if (tz === '+00:00') {
-			return 'Z';
-		}
-		return tz;
-	};
-
-	/**
-	 * Get the number in minutes that represents a timezone string
-	 * @param  {string} tzString formatted like "+0500", "-1245", "Z"
-	 * @return {number} the offset minutes or the original string if it doesn't match expectations
-	 */
-	$.timepicker.timezoneOffsetNumber = function (tzString) {
-		var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
-
-		if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
-			return 0;
-		}
-
-		if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
-			return tzString;
-		}
-
-		return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
-					((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
-					parseInt(normalized.substr(3, 2), 10))); // minutes
-	};
-
-	/**
-	 * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
-	 * @param  {Date} date
-	 * @param  {string} toTimezone formatted like "+0500", "-1245"
-	 * @return {Date}
-	 */
-	$.timepicker.timezoneAdjust = function (date, toTimezone) {
-		var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
-		if (!isNaN(toTz)) {
-			date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
-		}
-		return date;
-	};
-
-	/**
-	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * n.b. The input value must be correctly formatted (reformatting is not supported)
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the timepicker() call
-	 * @return {jQuery}
-	 */
-	$.timepicker.timeRange = function (startTime, endTime, options) {
-		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @param  {string} method Can be used to specify the type of picker to be added
-	 * @return {jQuery}
-	 */
-	$.timepicker.datetimeRange = function (startTime, endTime, options) {
-		$.timepicker.handleRange('datetimepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @return {jQuery}
-	 */
-	$.timepicker.dateRange = function (startTime, endTime, options) {
-		$.timepicker.handleRange('datepicker', startTime, endTime, options);
-	};
-
-	/**
-	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
-	 * enforce date range limits.
-	 * @param  {string} method Can be used to specify the type of picker to be added
-	 * @param  {Element} startTime
-	 * @param  {Element} endTime
-	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
-	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
-	 * @return {jQuery}
-	 */
-	$.timepicker.handleRange = function (method, startTime, endTime, options) {
-		options = $.extend({}, {
-			minInterval: 0, // min allowed interval in milliseconds
-			maxInterval: 0, // max allowed interval in milliseconds
-			start: {},      // options for start picker
-			end: {}         // options for end picker
-		}, options);
-
-		// for the mean time this fixes an issue with calling getDate with timepicker()
-		var timeOnly = false;
-		if(method === 'timepicker'){
-			timeOnly = true;
-			method = 'datetimepicker';
-		}
-
-		function checkDates(changed, other) {
-			var startdt = startTime[method]('getDate'),
-				enddt = endTime[method]('getDate'),
-				changeddt = changed[method]('getDate');
-
-			if (startdt !== null) {
-				var minDate = new Date(startdt.getTime()),
-					maxDate = new Date(startdt.getTime());
-
-				minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
-				maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
-
-				if (options.minInterval > 0 && minDate > enddt) { // minInterval check
-					endTime[method]('setDate', minDate);
-				}
-				else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
-					endTime[method]('setDate', maxDate);
-				}
-				else if (startdt > enddt) {
-					other[method]('setDate', changeddt);
-				}
-			}
-		}
-
-		function selected(changed, other, option) {
-			if (!changed.val()) {
-				return;
-			}
-			var date = changed[method].call(changed, 'getDate');
-			if (date !== null && options.minInterval > 0) {
-				if (option === 'minDate') {
-					date.setMilliseconds(date.getMilliseconds() + options.minInterval);
-				}
-				if (option === 'maxDate') {
-					date.setMilliseconds(date.getMilliseconds() - options.minInterval);
-				}
-			}
-			
-			if (date.getTime) {
-				other[method].call(other, 'option', option, date);
-			}
-		}
-
-		$.fn[method].call(startTime, $.extend({
-			timeOnly: timeOnly,
-			onClose: function (dateText, inst) {
-				checkDates($(this), endTime);
-			},
-			onSelect: function (selectedDateTime) {
-				selected($(this), endTime, 'minDate');
-			}
-		}, options, options.start));
-		$.fn[method].call(endTime, $.extend({
-			timeOnly: timeOnly,
-			onClose: function (dateText, inst) {
-				checkDates($(this), startTime);
-			},
-			onSelect: function (selectedDateTime) {
-				selected($(this), startTime, 'maxDate');
-			}
-		}, options, options.end));
-
-		checkDates(startTime, endTime);
-		
-		selected(startTime, endTime, 'minDate');
-		selected(endTime, startTime, 'maxDate');
-
-		return $([startTime.get(0), endTime.get(0)]);
-	};
-
-	/**
-	 * Log error or data to the console during error or debugging
-	 * @param  {Object} err pass any type object to log to the console during error or debugging
-	 * @return {void}
-	 */
-	$.timepicker.log = function () {
-		if (window.console) {
-			window.console.log.apply(window.console, Array.prototype.slice.call(arguments));
-		}
-	};
-
-	/*
-	 * Add util object to allow access to private methods for testability.
-	 */
-	$.timepicker._util = {
-		_extendRemove: extendRemove,
-		_isEmptyObject: isEmptyObject,
-		_convert24to12: convert24to12,
-		_detectSupport: detectSupport,
-		_selectLocalTimezone: selectLocalTimezone,
-		_computeEffectiveSetting: computeEffectiveSetting,
-		_splitDateTime: splitDateTime,
-		_parseDateTimeInternal: parseDateTimeInternal
-	};
-
-	/*
-	* Microsecond support
-	*/
-	if (!Date.prototype.getMicroseconds) {
-		Date.prototype.microseconds = 0;
-		Date.prototype.getMicroseconds = function () { return this.microseconds; };
-		Date.prototype.setMicroseconds = function (m) {
-			this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
-			this.microseconds = m % 1000;
-			return this;
-		};
-	}
-
-	/*
-	* Keep up with the version
-	*/
-	$.timepicker.version = "1.6.1";
-
-}));
+/*! jQuery Timepicker Addon - v1.6.1 - 2015-11-14
+* http://trentrichardson.com/examples/timepicker
+* Copyright (c) 2015 Trent Richardson; Licensed MIT */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(['jquery', 'jquery-ui'], factory);
+	} else {
+		factory(jQuery);
+	}
+}(function ($) {
+
+	/*
+	* Lets not redefine timepicker, Prevent "Uncaught RangeError: Maximum call stack size exceeded"
+	*/
+	$.ui.timepicker = $.ui.timepicker || {};
+	if ($.ui.timepicker.version) {
+		return;
+	}
+
+	/*
+	* Extend jQueryUI, get it started with our version number
+	*/
+	$.extend($.ui, {
+		timepicker: {
+			version: "1.6.1"
+		}
+	});
+
+	/* 
+	* Timepicker manager.
+	* Use the singleton instance of this class, $.timepicker, to interact with the time picker.
+	* Settings for (groups of) time pickers are maintained in an instance object,
+	* allowing multiple different settings on the same page.
+	*/
+	var Timepicker = function () {
+		this.regional = []; // Available regional settings, indexed by language code
+		this.regional[''] = { // Default regional settings
+			currentText: 'Now',
+			closeText: 'Done',
+			amNames: ['AM', 'A'],
+			pmNames: ['PM', 'P'],
+			timeFormat: 'HH:mm',
+			timeSuffix: '',
+			timeOnlyTitle: 'Choose Time',
+			timeText: 'Time',
+			hourText: 'Hour',
+			minuteText: 'Minute',
+			secondText: 'Second',
+			millisecText: 'Millisecond',
+			microsecText: 'Microsecond',
+			timezoneText: 'Time Zone',
+			isRTL: false
+		};
+		this._defaults = { // Global defaults for all the datetime picker instances
+			showButtonPanel: true,
+			timeOnly: false,
+			timeOnlyShowDate: false,
+			showHour: null,
+			showMinute: null,
+			showSecond: null,
+			showMillisec: null,
+			showMicrosec: null,
+			showTimezone: null,
+			showTime: true,
+			stepHour: 1,
+			stepMinute: 1,
+			stepSecond: 1,
+			stepMillisec: 1,
+			stepMicrosec: 1,
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			microsec: 0,
+			timezone: null,
+			hourMin: 0,
+			minuteMin: 0,
+			secondMin: 0,
+			millisecMin: 0,
+			microsecMin: 0,
+			hourMax: 23,
+			minuteMax: 59,
+			secondMax: 59,
+			millisecMax: 999,
+			microsecMax: 999,
+			minDateTime: null,
+			maxDateTime: null,
+			maxTime: null,
+			minTime: null,
+			onSelect: null,
+			hourGrid: 0,
+			minuteGrid: 0,
+			secondGrid: 0,
+			millisecGrid: 0,
+			microsecGrid: 0,
+			alwaysSetTime: true,
+			separator: ' ',
+			altFieldTimeOnly: true,
+			altTimeFormat: null,
+			altSeparator: null,
+			altTimeSuffix: null,
+			altRedirectFocus: true,
+			pickerTimeFormat: null,
+			pickerTimeSuffix: null,
+			showTimepicker: true,
+			timezoneList: null,
+			addSliderAccess: false,
+			sliderAccessArgs: null,
+			controlType: 'slider',
+			oneLine: false,
+			defaultValue: null,
+			parse: 'strict',
+			afterInject: null
+		};
+		$.extend(this._defaults, this.regional['']);
+	};
+
+	$.extend(Timepicker.prototype, {
+		$input: null,
+		$altInput: null,
+		$timeObj: null,
+		inst: null,
+		hour_slider: null,
+		minute_slider: null,
+		second_slider: null,
+		millisec_slider: null,
+		microsec_slider: null,
+		timezone_select: null,
+		maxTime: null,
+		minTime: null,
+		hour: 0,
+		minute: 0,
+		second: 0,
+		millisec: 0,
+		microsec: 0,
+		timezone: null,
+		hourMinOriginal: null,
+		minuteMinOriginal: null,
+		secondMinOriginal: null,
+		millisecMinOriginal: null,
+		microsecMinOriginal: null,
+		hourMaxOriginal: null,
+		minuteMaxOriginal: null,
+		secondMaxOriginal: null,
+		millisecMaxOriginal: null,
+		microsecMaxOriginal: null,
+		ampm: '',
+		formattedDate: '',
+		formattedTime: '',
+		formattedDateTime: '',
+		timezoneList: null,
+		units: ['hour', 'minute', 'second', 'millisec', 'microsec'],
+		support: {},
+		control: null,
+
+		/* 
+		* Override the default settings for all instances of the time picker.
+		* @param  {Object} settings  object - the new settings to use as defaults (anonymous object)
+		* @return {Object} the manager object
+		*/
+		setDefaults: function (settings) {
+			extendRemove(this._defaults, settings || {});
+			return this;
+		},
+
+		/*
+		* Create a new Timepicker instance
+		*/
+		_newInst: function ($input, opts) {
+			var tp_inst = new Timepicker(),
+				inlineSettings = {},
+				fns = {},
+				overrides, i;
+
+			for (var attrName in this._defaults) {
+				if (this._defaults.hasOwnProperty(attrName)) {
+					var attrValue = $input.attr('time:' + attrName);
+					if (attrValue) {
+						try {
+							inlineSettings[attrName] = eval(attrValue);
+						} catch (err) {
+							inlineSettings[attrName] = attrValue;
+						}
+					}
+				}
+			}
+
+			overrides = {
+				beforeShow: function (input, dp_inst) {
+					if ($.isFunction(tp_inst._defaults.evnts.beforeShow)) {
+						return tp_inst._defaults.evnts.beforeShow.call($input[0], input, dp_inst, tp_inst);
+					}
+				},
+				onChangeMonthYear: function (year, month, dp_inst) {
+					// Update the time as well : this prevents the time from disappearing from the $input field.
+					// tp_inst._updateDateTime(dp_inst);
+					if ($.isFunction(tp_inst._defaults.evnts.onChangeMonthYear)) {
+						tp_inst._defaults.evnts.onChangeMonthYear.call($input[0], year, month, dp_inst, tp_inst);
+					}
+				},
+				onClose: function (dateText, dp_inst) {
+					if (tp_inst.timeDefined === true && $input.val() !== '') {
+						tp_inst._updateDateTime(dp_inst);
+					}
+					if ($.isFunction(tp_inst._defaults.evnts.onClose)) {
+						tp_inst._defaults.evnts.onClose.call($input[0], dateText, dp_inst, tp_inst);
+					}
+				}
+			};
+			for (i in overrides) {
+				if (overrides.hasOwnProperty(i)) {
+					fns[i] = opts[i] || this._defaults[i] || null;
+				}
+			}
+
+			tp_inst._defaults = $.extend({}, this._defaults, inlineSettings, opts, overrides, {
+				evnts: fns,
+				timepicker: tp_inst // add timepicker as a property of datepicker: $.datepicker._get(dp_inst, 'timepicker');
+			});
+			tp_inst.amNames = $.map(tp_inst._defaults.amNames, function (val) {
+				return val.toUpperCase();
+			});
+			tp_inst.pmNames = $.map(tp_inst._defaults.pmNames, function (val) {
+				return val.toUpperCase();
+			});
+
+			// detect which units are supported
+			tp_inst.support = detectSupport(
+					tp_inst._defaults.timeFormat + 
+					(tp_inst._defaults.pickerTimeFormat ? tp_inst._defaults.pickerTimeFormat : '') +
+					(tp_inst._defaults.altTimeFormat ? tp_inst._defaults.altTimeFormat : ''));
+
+			// controlType is string - key to our this._controls
+			if (typeof(tp_inst._defaults.controlType) === 'string') {
+				if (tp_inst._defaults.controlType === 'slider' && typeof($.ui.slider) === 'undefined') {
+					tp_inst._defaults.controlType = 'select';
+				}
+				tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];
+			}
+			// controlType is an object and must implement create, options, value methods
+			else {
+				tp_inst.control = tp_inst._defaults.controlType;
+			}
+
+			// prep the timezone options
+			var timezoneList = [-720, -660, -600, -570, -540, -480, -420, -360, -300, -270, -240, -210, -180, -120, -60,
+					0, 60, 120, 180, 210, 240, 270, 300, 330, 345, 360, 390, 420, 480, 525, 540, 570, 600, 630, 660, 690, 720, 765, 780, 840];
+			if (tp_inst._defaults.timezoneList !== null) {
+				timezoneList = tp_inst._defaults.timezoneList;
+			}
+			var tzl = timezoneList.length, tzi = 0, tzv = null;
+			if (tzl > 0 && typeof timezoneList[0] !== 'object') {
+				for (; tzi < tzl; tzi++) {
+					tzv = timezoneList[tzi];
+					timezoneList[tzi] = { value: tzv, label: $.timepicker.timezoneOffsetString(tzv, tp_inst.support.iso8601) };
+				}
+			}
+			tp_inst._defaults.timezoneList = timezoneList;
+
+			// set the default units
+			tp_inst.timezone = tp_inst._defaults.timezone !== null ? $.timepicker.timezoneOffsetNumber(tp_inst._defaults.timezone) :
+							((new Date()).getTimezoneOffset() * -1);
+			tp_inst.hour = tp_inst._defaults.hour < tp_inst._defaults.hourMin ? tp_inst._defaults.hourMin :
+							tp_inst._defaults.hour > tp_inst._defaults.hourMax ? tp_inst._defaults.hourMax : tp_inst._defaults.hour;
+			tp_inst.minute = tp_inst._defaults.minute < tp_inst._defaults.minuteMin ? tp_inst._defaults.minuteMin :
+							tp_inst._defaults.minute > tp_inst._defaults.minuteMax ? tp_inst._defaults.minuteMax : tp_inst._defaults.minute;
+			tp_inst.second = tp_inst._defaults.second < tp_inst._defaults.secondMin ? tp_inst._defaults.secondMin :
+							tp_inst._defaults.second > tp_inst._defaults.secondMax ? tp_inst._defaults.secondMax : tp_inst._defaults.second;
+			tp_inst.millisec = tp_inst._defaults.millisec < tp_inst._defaults.millisecMin ? tp_inst._defaults.millisecMin :
+							tp_inst._defaults.millisec > tp_inst._defaults.millisecMax ? tp_inst._defaults.millisecMax : tp_inst._defaults.millisec;
+			tp_inst.microsec = tp_inst._defaults.microsec < tp_inst._defaults.microsecMin ? tp_inst._defaults.microsecMin :
+							tp_inst._defaults.microsec > tp_inst._defaults.microsecMax ? tp_inst._defaults.microsecMax : tp_inst._defaults.microsec;
+			tp_inst.ampm = '';
+			tp_inst.$input = $input;
+
+			if (tp_inst._defaults.altField) {
+				tp_inst.$altInput = $(tp_inst._defaults.altField);
+				if (tp_inst._defaults.altRedirectFocus === true) {
+					tp_inst.$altInput.css({
+						cursor: 'pointer'
+					}).focus(function () {
+						$input.trigger("focus");
+					});
+				}
+			}
+
+			if (tp_inst._defaults.minDate === 0 || tp_inst._defaults.minDateTime === 0) {
+				tp_inst._defaults.minDate = new Date();
+			}
+			if (tp_inst._defaults.maxDate === 0 || tp_inst._defaults.maxDateTime === 0) {
+				tp_inst._defaults.maxDate = new Date();
+			}
+
+			// datepicker needs minDate/maxDate, timepicker needs minDateTime/maxDateTime..
+			if (tp_inst._defaults.minDate !== undefined && tp_inst._defaults.minDate instanceof Date) {
+				tp_inst._defaults.minDateTime = new Date(tp_inst._defaults.minDate.getTime());
+			}
+			if (tp_inst._defaults.minDateTime !== undefined && tp_inst._defaults.minDateTime instanceof Date) {
+				tp_inst._defaults.minDate = new Date(tp_inst._defaults.minDateTime.getTime());
+			}
+			if (tp_inst._defaults.maxDate !== undefined && tp_inst._defaults.maxDate instanceof Date) {
+				tp_inst._defaults.maxDateTime = new Date(tp_inst._defaults.maxDate.getTime());
+			}
+			if (tp_inst._defaults.maxDateTime !== undefined && tp_inst._defaults.maxDateTime instanceof Date) {
+				tp_inst._defaults.maxDate = new Date(tp_inst._defaults.maxDateTime.getTime());
+			}
+			tp_inst.$input.bind('focus', function () {
+				tp_inst._onFocus();
+			});
+
+			return tp_inst;
+		},
+
+		/*
+		* add our sliders to the calendar
+		*/
+		_addTimePicker: function (dp_inst) {
+			var currDT = $.trim((this.$altInput && this._defaults.altFieldTimeOnly) ? this.$input.val() + ' ' + this.$altInput.val() : this.$input.val());
+
+			this.timeDefined = this._parseTime(currDT);
+			this._limitMinMaxDateTime(dp_inst, false);
+			this._injectTimePicker();
+			this._afterInject();
+		},
+
+		/*
+		* parse the time string from input value or _setTime
+		*/
+		_parseTime: function (timeString, withDate) {
+			if (!this.inst) {
+				this.inst = $.datepicker._getInst(this.$input[0]);
+			}
+
+			if (withDate || !this._defaults.timeOnly) {
+				var dp_dateFormat = $.datepicker._get(this.inst, 'dateFormat');
+				try {
+					var parseRes = parseDateTimeInternal(dp_dateFormat, this._defaults.timeFormat, timeString, $.datepicker._getFormatConfig(this.inst), this._defaults);
+					if (!parseRes.timeObj) {
+						return false;
+					}
+					$.extend(this, parseRes.timeObj);
+				} catch (err) {
+					$.timepicker.log("Error parsing the date/time string: " + err +
+									"\ndate/time string = " + timeString +
+									"\ntimeFormat = " + this._defaults.timeFormat +
+									"\ndateFormat = " + dp_dateFormat);
+					return false;
+				}
+				return true;
+			} else {
+				var timeObj = $.datepicker.parseTime(this._defaults.timeFormat, timeString, this._defaults);
+				if (!timeObj) {
+					return false;
+				}
+				$.extend(this, timeObj);
+				return true;
+			}
+		},
+
+		/*
+		* Handle callback option after injecting timepicker
+		*/
+		_afterInject: function() {
+			var o = this.inst.settings;
+			if ($.isFunction(o.afterInject)) {
+				o.afterInject.call(this);
+			}
+		},
+
+		/*
+		* generate and inject html for timepicker into ui datepicker
+		*/
+		_injectTimePicker: function () {
+			var $dp = this.inst.dpDiv,
+				o = this.inst.settings,
+				tp_inst = this,
+				litem = '',
+				uitem = '',
+				show = null,
+				max = {},
+				gridSize = {},
+				size = null,
+				i = 0,
+				l = 0;
+
+			// Prevent displaying twice
+			if ($dp.find("div.ui-timepicker-div").length === 0 && o.showTimepicker) {
+				var noDisplay = ' ui_tpicker_unit_hide',
+					html = '<div class="ui-timepicker-div' + (o.isRTL ? ' ui-timepicker-rtl' : '') + (o.oneLine && o.controlType === 'select' ? ' ui-timepicker-oneLine' : '') + '"><dl>' + '<dt class="ui_tpicker_time_label' + ((o.showTime) ? '' : noDisplay) + '">' + o.timeText + '</dt>' +
+								'<dd class="ui_tpicker_time '+ ((o.showTime) ? '' : noDisplay) + '"><input class="ui_tpicker_time_input" ' + (o.timeInput ? '' : 'disabled') + '/></dd>';
+
+				// Create the markup
+				for (i = 0, l = this.units.length; i < l; i++) {
+					litem = this.units[i];
+					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+					// Added by Peter Medeiros:
+					// - Figure out what the hour/minute/second max should be based on the step values.
+					// - Example: if stepMinute is 15, then minMax is 45.
+					max[litem] = parseInt((o[litem + 'Max'] - ((o[litem + 'Max'] - o[litem + 'Min']) % o['step' + uitem])), 10);
+					gridSize[litem] = 0;
+
+					html += '<dt class="ui_tpicker_' + litem + '_label' + (show ? '' : noDisplay) + '">' + o[litem + 'Text'] + '</dt>' +
+								'<dd class="ui_tpicker_' + litem + (show ? '' : noDisplay) + '"><div class="ui_tpicker_' + litem + '_slider' + (show ? '' : noDisplay) + '"></div>';
+
+					if (show && o[litem + 'Grid'] > 0) {
+						html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>';
+
+						if (litem === 'hour') {
+							for (var h = o[litem + 'Min']; h <= max[litem]; h += parseInt(o[litem + 'Grid'], 10)) {
+								gridSize[litem]++;
+								var tmph = $.datepicker.formatTime(this.support.ampm ? 'hht' : 'HH', {hour: h}, o);
+								html += '<td data-for="' + litem + '">' + tmph + '</td>';
+							}
+						}
+						else {
+							for (var m = o[litem + 'Min']; m <= max[litem]; m += parseInt(o[litem + 'Grid'], 10)) {
+								gridSize[litem]++;
+								html += '<td data-for="' + litem + '">' + ((m < 10) ? '0' : '') + m + '</td>';
+							}
+						}
+
+						html += '</tr></table></div>';
+					}
+					html += '</dd>';
+				}
+				
+				// Timezone
+				var showTz = o.showTimezone !== null ? o.showTimezone : this.support.timezone;
+				html += '<dt class="ui_tpicker_timezone_label' + (showTz ? '' : noDisplay) + '">' + o.timezoneText + '</dt>';
+				html += '<dd class="ui_tpicker_timezone' + (showTz ? '' : noDisplay) + '"></dd>';
+
+				// Create the elements from string
+				html += '</dl></div>';
+				var $tp = $(html);
+
+				// if we only want time picker...
+				if (o.timeOnly === true) {
+					$tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all">' + '<div class="ui-datepicker-title">' + o.timeOnlyTitle + '</div>' + '</div>');
+					$dp.find('.ui-datepicker-header, .ui-datepicker-calendar').hide();
+				}
+				
+				// add sliders, adjust grids, add events
+				for (i = 0, l = tp_inst.units.length; i < l; i++) {
+					litem = tp_inst.units[i];
+					uitem = litem.substr(0, 1).toUpperCase() + litem.substr(1);
+					show = o['show' + uitem] !== null ? o['show' + uitem] : this.support[litem];
+
+					// add the slider
+					tp_inst[litem + '_slider'] = tp_inst.control.create(tp_inst, $tp.find('.ui_tpicker_' + litem + '_slider'), litem, tp_inst[litem], o[litem + 'Min'], max[litem], o['step' + uitem]);
+
+					// adjust the grid and add click event
+					if (show && o[litem + 'Grid'] > 0) {
+						size = 100 * gridSize[litem] * o[litem + 'Grid'] / (max[litem] - o[litem + 'Min']);
+						$tp.find('.ui_tpicker_' + litem + ' table').css({
+							width: size + "%",
+							marginLeft: o.isRTL ? '0' : ((size / (-2 * gridSize[litem])) + "%"),
+							marginRight: o.isRTL ? ((size / (-2 * gridSize[litem])) + "%") : '0',
+							borderCollapse: 'collapse'
+						}).find("td").click(function (e) {
+								var $t = $(this),
+									h = $t.html(),
+									n = parseInt(h.replace(/[^0-9]/g), 10),
+									ap = h.replace(/[^apm]/ig),
+									f = $t.data('for'); // loses scope, so we use data-for
+
+								if (f === 'hour') {
+									if (ap.indexOf('p') !== -1 && n < 12) {
+										n += 12;
+									}
+									else {
+										if (ap.indexOf('a') !== -1 && n === 12) {
+											n = 0;
+										}
+									}
+								}
+								
+								tp_inst.control.value(tp_inst, tp_inst[f + '_slider'], litem, n);
+
+								tp_inst._onTimeChange();
+								tp_inst._onSelectHandler();
+							}).css({
+								cursor: 'pointer',
+								width: (100 / gridSize[litem]) + '%',
+								textAlign: 'center',
+								overflow: 'hidden'
+							});
+					} // end if grid > 0
+				} // end for loop
+
+				// Add timezone options
+				this.timezone_select = $tp.find('.ui_tpicker_timezone').append('<select></select>').find("select");
+				$.fn.append.apply(this.timezone_select,
+				$.map(o.timezoneList, function (val, idx) {
+					return $("<option />").val(typeof val === "object" ? val.value : val).text(typeof val === "object" ? val.label : val);
+				}));
+				if (typeof(this.timezone) !== "undefined" && this.timezone !== null && this.timezone !== "") {
+					var local_timezone = (new Date(this.inst.selectedYear, this.inst.selectedMonth, this.inst.selectedDay, 12)).getTimezoneOffset() * -1;
+					if (local_timezone === this.timezone) {
+						selectLocalTimezone(tp_inst);
+					} else {
+						this.timezone_select.val(this.timezone);
+					}
+				} else {
+					if (typeof(this.hour) !== "undefined" && this.hour !== null && this.hour !== "") {
+						this.timezone_select.val(o.timezone);
+					} else {
+						selectLocalTimezone(tp_inst);
+					}
+				}
+				this.timezone_select.change(function () {
+					tp_inst._onTimeChange();
+					tp_inst._onSelectHandler();
+					tp_inst._afterInject();
+				});
+				// End timezone options
+				
+				// inject timepicker into datepicker
+				var $buttonPanel = $dp.find('.ui-datepicker-buttonpane');
+				if ($buttonPanel.length) {
+					$buttonPanel.before($tp);
+				} else {
+					$dp.append($tp);
+				}
+
+				this.$timeObj = $tp.find('.ui_tpicker_time_input');
+				this.$timeObj.change(function () {
+					var timeFormat = tp_inst.inst.settings.timeFormat;
+					var parsedTime = $.datepicker.parseTime(timeFormat, this.value);
+					var update = new Date();
+					if (parsedTime) {
+						update.setHours(parsedTime.hour);
+						update.setMinutes(parsedTime.minute);
+						update.setSeconds(parsedTime.second);
+						$.datepicker._setTime(tp_inst.inst, update);
+					} else {
+						this.value = tp_inst.formattedTime;
+						this.blur();
+					}
+				});
+
+				if (this.inst !== null) {
+					var timeDefined = this.timeDefined;
+					this._onTimeChange();
+					this.timeDefined = timeDefined;
+				}
+
+				// slideAccess integration: http://trentrichardson.com/2011/11/11/jquery-ui-sliders-and-touch-accessibility/
+				if (this._defaults.addSliderAccess) {
+					var sliderAccessArgs = this._defaults.sliderAccessArgs,
+						rtl = this._defaults.isRTL;
+					sliderAccessArgs.isRTL = rtl;
+						
+					setTimeout(function () { // fix for inline mode
+						if ($tp.find('.ui-slider-access').length === 0) {
+							$tp.find('.ui-slider:visible').sliderAccess(sliderAccessArgs);
+
+							// fix any grids since sliders are shorter
+							var sliderAccessWidth = $tp.find('.ui-slider-access:eq(0)').outerWidth(true);
+							if (sliderAccessWidth) {
+								$tp.find('table:visible').each(function () {
+									var $g = $(this),
+										oldWidth = $g.outerWidth(),
+										oldMarginLeft = $g.css(rtl ? 'marginRight' : 'marginLeft').toString().replace('%', ''),
+										newWidth = oldWidth - sliderAccessWidth,
+										newMarginLeft = ((oldMarginLeft * newWidth) / oldWidth) + '%',
+										css = { width: newWidth, marginRight: 0, marginLeft: 0 };
+									css[rtl ? 'marginRight' : 'marginLeft'] = newMarginLeft;
+									$g.css(css);
+								});
+							}
+						}
+					}, 10);
+				}
+				// end slideAccess integration
+
+				tp_inst._limitMinMaxDateTime(this.inst, true);
+			}
+		},
+
+		/*
+		* This function tries to limit the ability to go outside the
+		* min/max date range
+		*/
+		_limitMinMaxDateTime: function (dp_inst, adjustSliders) {
+			var o = this._defaults,
+				dp_date = new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay);
+
+			if (!this._defaults.showTimepicker) {
+				return;
+			} // No time so nothing to check here
+
+			if ($.datepicker._get(dp_inst, 'minDateTime') !== null && $.datepicker._get(dp_inst, 'minDateTime') !== undefined && dp_date) {
+				var minDateTime = $.datepicker._get(dp_inst, 'minDateTime'),
+					minDateTimeDate = new Date(minDateTime.getFullYear(), minDateTime.getMonth(), minDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMinOriginal === null || this.minuteMinOriginal === null || this.secondMinOriginal === null || this.millisecMinOriginal === null || this.microsecMinOriginal === null) {
+					this.hourMinOriginal = o.hourMin;
+					this.minuteMinOriginal = o.minuteMin;
+					this.secondMinOriginal = o.secondMin;
+					this.millisecMinOriginal = o.millisecMin;
+					this.microsecMinOriginal = o.microsecMin;
+				}
+
+				if (dp_inst.settings.timeOnly || minDateTimeDate.getTime() === dp_date.getTime()) {
+					this._defaults.hourMin = minDateTime.getHours();
+					if (this.hour <= this._defaults.hourMin) {
+						this.hour = this._defaults.hourMin;
+						this._defaults.minuteMin = minDateTime.getMinutes();
+						if (this.minute <= this._defaults.minuteMin) {
+							this.minute = this._defaults.minuteMin;
+							this._defaults.secondMin = minDateTime.getSeconds();
+							if (this.second <= this._defaults.secondMin) {
+								this.second = this._defaults.secondMin;
+								this._defaults.millisecMin = minDateTime.getMilliseconds();
+								if (this.millisec <= this._defaults.millisecMin) {
+									this.millisec = this._defaults.millisecMin;
+									this._defaults.microsecMin = minDateTime.getMicroseconds();
+								} else {
+									if (this.microsec < this._defaults.microsecMin) {
+										this.microsec = this._defaults.microsecMin;
+									}
+									this._defaults.microsecMin = this.microsecMinOriginal;
+								}
+							} else {
+								this._defaults.millisecMin = this.millisecMinOriginal;
+								this._defaults.microsecMin = this.microsecMinOriginal;
+							}
+						} else {
+							this._defaults.secondMin = this.secondMinOriginal;
+							this._defaults.millisecMin = this.millisecMinOriginal;
+							this._defaults.microsecMin = this.microsecMinOriginal;
+						}
+					} else {
+						this._defaults.minuteMin = this.minuteMinOriginal;
+						this._defaults.secondMin = this.secondMinOriginal;
+						this._defaults.millisecMin = this.millisecMinOriginal;
+						this._defaults.microsecMin = this.microsecMinOriginal;
+					}
+				} else {
+					this._defaults.hourMin = this.hourMinOriginal;
+					this._defaults.minuteMin = this.minuteMinOriginal;
+					this._defaults.secondMin = this.secondMinOriginal;
+					this._defaults.millisecMin = this.millisecMinOriginal;
+					this._defaults.microsecMin = this.microsecMinOriginal;
+				}
+			}
+
+			if ($.datepicker._get(dp_inst, 'maxDateTime') !== null && $.datepicker._get(dp_inst, 'maxDateTime') !== undefined && dp_date) {
+				var maxDateTime = $.datepicker._get(dp_inst, 'maxDateTime'),
+					maxDateTimeDate = new Date(maxDateTime.getFullYear(), maxDateTime.getMonth(), maxDateTime.getDate(), 0, 0, 0, 0);
+
+				if (this.hourMaxOriginal === null || this.minuteMaxOriginal === null || this.secondMaxOriginal === null || this.millisecMaxOriginal === null) {
+					this.hourMaxOriginal = o.hourMax;
+					this.minuteMaxOriginal = o.minuteMax;
+					this.secondMaxOriginal = o.secondMax;
+					this.millisecMaxOriginal = o.millisecMax;
+					this.microsecMaxOriginal = o.microsecMax;
+				}
+
+				if (dp_inst.settings.timeOnly || maxDateTimeDate.getTime() === dp_date.getTime()) {
+					this._defaults.hourMax = maxDateTime.getHours();
+					if (this.hour >= this._defaults.hourMax) {
+						this.hour = this._defaults.hourMax;
+						this._defaults.minuteMax = maxDateTime.getMinutes();
+						if (this.minute >= this._defaults.minuteMax) {
+							this.minute = this._defaults.minuteMax;
+							this._defaults.secondMax = maxDateTime.getSeconds();
+							if (this.second >= this._defaults.secondMax) {
+								this.second = this._defaults.secondMax;
+								this._defaults.millisecMax = maxDateTime.getMilliseconds();
+								if (this.millisec >= this._defaults.millisecMax) {
+									this.millisec = this._defaults.millisecMax;
+									this._defaults.microsecMax = maxDateTime.getMicroseconds();
+								} else {
+									if (this.microsec > this._defaults.microsecMax) {
+										this.microsec = this._defaults.microsecMax;
+									}
+									this._defaults.microsecMax = this.microsecMaxOriginal;
+								}
+							} else {
+								this._defaults.millisecMax = this.millisecMaxOriginal;
+								this._defaults.microsecMax = this.microsecMaxOriginal;
+							}
+						} else {
+							this._defaults.secondMax = this.secondMaxOriginal;
+							this._defaults.millisecMax = this.millisecMaxOriginal;
+							this._defaults.microsecMax = this.microsecMaxOriginal;
+						}
+					} else {
+						this._defaults.minuteMax = this.minuteMaxOriginal;
+						this._defaults.secondMax = this.secondMaxOriginal;
+						this._defaults.millisecMax = this.millisecMaxOriginal;
+						this._defaults.microsecMax = this.microsecMaxOriginal;
+					}
+				} else {
+					this._defaults.hourMax = this.hourMaxOriginal;
+					this._defaults.minuteMax = this.minuteMaxOriginal;
+					this._defaults.secondMax = this.secondMaxOriginal;
+					this._defaults.millisecMax = this.millisecMaxOriginal;
+					this._defaults.microsecMax = this.microsecMaxOriginal;
+				}
+			}
+
+			if (dp_inst.settings.minTime!==null) {				
+				var tempMinTime=new Date("01/01/1970 " + dp_inst.settings.minTime);				
+				if (this.hour<tempMinTime.getHours()) {
+					this.hour=this._defaults.hourMin=tempMinTime.getHours();
+					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();							
+				} else if (this.hour===tempMinTime.getHours() && this.minute<tempMinTime.getMinutes()) {
+					this.minute=this._defaults.minuteMin=tempMinTime.getMinutes();
+				} else {						
+					if (this._defaults.hourMin<tempMinTime.getHours()) {
+						this._defaults.hourMin=tempMinTime.getHours();
+						this._defaults.minuteMin=tempMinTime.getMinutes();					
+					} else if (this._defaults.hourMin===tempMinTime.getHours()===this.hour && this._defaults.minuteMin<tempMinTime.getMinutes()) {
+						this._defaults.minuteMin=tempMinTime.getMinutes();						
+					} else {
+						this._defaults.minuteMin=0;
+					}
+				}				
+			}
+			
+			if (dp_inst.settings.maxTime!==null) {				
+				var tempMaxTime=new Date("01/01/1970 " + dp_inst.settings.maxTime);
+				if (this.hour>tempMaxTime.getHours()) {
+					this.hour=this._defaults.hourMax=tempMaxTime.getHours();						
+					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();
+				} else if (this.hour===tempMaxTime.getHours() && this.minute>tempMaxTime.getMinutes()) {							
+					this.minute=this._defaults.minuteMax=tempMaxTime.getMinutes();						
+				} else {
+					if (this._defaults.hourMax>tempMaxTime.getHours()) {
+						this._defaults.hourMax=tempMaxTime.getHours();
+						this._defaults.minuteMax=tempMaxTime.getMinutes();					
+					} else if (this._defaults.hourMax===tempMaxTime.getHours()===this.hour && this._defaults.minuteMax>tempMaxTime.getMinutes()) {
+						this._defaults.minuteMax=tempMaxTime.getMinutes();						
+					} else {
+						this._defaults.minuteMax=59;
+					}
+				}						
+			}
+			
+			if (adjustSliders !== undefined && adjustSliders === true) {
+				var hourMax = parseInt((this._defaults.hourMax - ((this._defaults.hourMax - this._defaults.hourMin) % this._defaults.stepHour)), 10),
+					minMax = parseInt((this._defaults.minuteMax - ((this._defaults.minuteMax - this._defaults.minuteMin) % this._defaults.stepMinute)), 10),
+					secMax = parseInt((this._defaults.secondMax - ((this._defaults.secondMax - this._defaults.secondMin) % this._defaults.stepSecond)), 10),
+					millisecMax = parseInt((this._defaults.millisecMax - ((this._defaults.millisecMax - this._defaults.millisecMin) % this._defaults.stepMillisec)), 10),
+					microsecMax = parseInt((this._defaults.microsecMax - ((this._defaults.microsecMax - this._defaults.microsecMin) % this._defaults.stepMicrosec)), 10);
+
+				if (this.hour_slider) {
+					this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax, step: this._defaults.stepHour });
+					this.control.value(this, this.hour_slider, 'hour', this.hour - (this.hour % this._defaults.stepHour));
+				}
+				if (this.minute_slider) {
+					this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax, step: this._defaults.stepMinute });
+					this.control.value(this, this.minute_slider, 'minute', this.minute - (this.minute % this._defaults.stepMinute));
+				}
+				if (this.second_slider) {
+					this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax, step: this._defaults.stepSecond });
+					this.control.value(this, this.second_slider, 'second', this.second - (this.second % this._defaults.stepSecond));
+				}
+				if (this.millisec_slider) {
+					this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax, step: this._defaults.stepMillisec });
+					this.control.value(this, this.millisec_slider, 'millisec', this.millisec - (this.millisec % this._defaults.stepMillisec));
+				}
+				if (this.microsec_slider) {
+					this.control.options(this, this.microsec_slider, 'microsec', { min: this._defaults.microsecMin, max: microsecMax, step: this._defaults.stepMicrosec });
+					this.control.value(this, this.microsec_slider, 'microsec', this.microsec - (this.microsec % this._defaults.stepMicrosec));
+				}
+			}
+
+		},
+
+		/*
+		* when a slider moves, set the internal time...
+		* on time change is also called when the time is updated in the text field
+		*/
+		_onTimeChange: function () {
+			if (!this._defaults.showTimepicker) {
+                                return;
+			}
+			var hour = (this.hour_slider) ? this.control.value(this, this.hour_slider, 'hour') : false,
+				minute = (this.minute_slider) ? this.control.value(this, this.minute_slider, 'minute') : false,
+				second = (this.second_slider) ? this.control.value(this, this.second_slider, 'second') : false,
+				millisec = (this.millisec_slider) ? this.control.value(this, this.millisec_slider, 'millisec') : false,
+				microsec = (this.microsec_slider) ? this.control.value(this, this.microsec_slider, 'microsec') : false,
+				timezone = (this.timezone_select) ? this.timezone_select.val() : false,
+				o = this._defaults,
+				pickerTimeFormat = o.pickerTimeFormat || o.timeFormat,
+				pickerTimeSuffix = o.pickerTimeSuffix || o.timeSuffix;
+
+			if (typeof(hour) === 'object') {
+				hour = false;
+			}
+			if (typeof(minute) === 'object') {
+				minute = false;
+			}
+			if (typeof(second) === 'object') {
+				second = false;
+			}
+			if (typeof(millisec) === 'object') {
+				millisec = false;
+			}
+			if (typeof(microsec) === 'object') {
+				microsec = false;
+			}
+			if (typeof(timezone) === 'object') {
+				timezone = false;
+			}
+
+			if (hour !== false) {
+				hour = parseInt(hour, 10);
+			}
+			if (minute !== false) {
+				minute = parseInt(minute, 10);
+			}
+			if (second !== false) {
+				second = parseInt(second, 10);
+			}
+			if (millisec !== false) {
+				millisec = parseInt(millisec, 10);
+			}
+			if (microsec !== false) {
+				microsec = parseInt(microsec, 10);
+			}
+			if (timezone !== false) {
+				timezone = timezone.toString();
+			}
+
+			var ampm = o[hour < 12 ? 'amNames' : 'pmNames'][0];
+
+			// If the update was done in the input field, the input field should not be updated.
+			// If the update was done using the sliders, update the input field.
+			var hasChanged = (
+						hour !== parseInt(this.hour,10) || // sliders should all be numeric
+						minute !== parseInt(this.minute,10) || 
+						second !== parseInt(this.second,10) || 
+						millisec !== parseInt(this.millisec,10) || 
+						microsec !== parseInt(this.microsec,10) || 
+						(this.ampm.length > 0 && (hour < 12) !== ($.inArray(this.ampm.toUpperCase(), this.amNames) !== -1)) || 
+						(this.timezone !== null && timezone !== this.timezone.toString()) // could be numeric or "EST" format, so use toString()
+					);
+
+			if (hasChanged) {
+
+				if (hour !== false) {
+					this.hour = hour;
+				}
+				if (minute !== false) {
+					this.minute = minute;
+				}
+				if (second !== false) {
+					this.second = second;
+				}
+				if (millisec !== false) {
+					this.millisec = millisec;
+				}
+				if (microsec !== false) {
+					this.microsec = microsec;
+				}
+				if (timezone !== false) {
+					this.timezone = timezone;
+				}
+
+				if (!this.inst) {
+					this.inst = $.datepicker._getInst(this.$input[0]);
+				}
+
+				this._limitMinMaxDateTime(this.inst, true);
+			}
+			if (this.support.ampm) {
+				this.ampm = ampm;
+			}
+
+			// Updates the time within the timepicker
+			this.formattedTime = $.datepicker.formatTime(o.timeFormat, this, o);
+			if (this.$timeObj) {
+				var sPos = this.$timeObj[0].selectionStart;
+				var ePos = this.$timeObj[0].selectionEnd;
+				if (pickerTimeFormat === o.timeFormat) {
+					this.$timeObj.val(this.formattedTime + pickerTimeSuffix);
+				}
+				else {
+					this.$timeObj.val($.datepicker.formatTime(pickerTimeFormat, this, o) + pickerTimeSuffix);
+				}
+				this.$timeObj[0].setSelectionRange(sPos, ePos);
+			}
+
+			this.timeDefined = true;
+			if (hasChanged) {
+				this._updateDateTime();
+				//this.$input.focus(); // may automatically open the picker on setDate
+			}
+		},
+
+		/*
+		* call custom onSelect.
+		* bind to sliders slidestop, and grid click.
+		*/
+		_onSelectHandler: function () {
+			var onSelect = this._defaults.onSelect || this.inst.settings.onSelect;
+			var inputEl = this.$input ? this.$input[0] : null;
+			if (onSelect && inputEl) {
+				onSelect.apply(inputEl, [this.formattedDateTime, this]);
+			}
+		},
+
+		/*
+		* update our input with the new date time..
+		*/
+		_updateDateTime: function (dp_inst) {
+			dp_inst = this.inst || dp_inst;
+			var dtTmp = (dp_inst.currentYear > 0? 
+							new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay) : 
+							new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+				dt = $.datepicker._daylightSavingAdjust(dtTmp),
+				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.selectedYear, dp_inst.selectedMonth, dp_inst.selectedDay)),
+				//dt = $.datepicker._daylightSavingAdjust(new Date(dp_inst.currentYear, dp_inst.currentMonth, dp_inst.currentDay)),
+				dateFmt = $.datepicker._get(dp_inst, 'dateFormat'),
+				formatCfg = $.datepicker._getFormatConfig(dp_inst),
+				timeAvailable = dt !== null && this.timeDefined;
+			this.formattedDate = $.datepicker.formatDate(dateFmt, (dt === null ? new Date() : dt), formatCfg);
+			var formattedDateTime = this.formattedDate;
+			
+			// if a slider was changed but datepicker doesn't have a value yet, set it
+			if (dp_inst.lastVal === "") {
+                dp_inst.currentYear = dp_inst.selectedYear;
+                dp_inst.currentMonth = dp_inst.selectedMonth;
+                dp_inst.currentDay = dp_inst.selectedDay;
+            }
+
+			/*
+			* remove following lines to force every changes in date picker to change the input value
+			* Bug descriptions: when an input field has a default value, and click on the field to pop up the date picker. 
+			* If the user manually empty the value in the input field, the date picker will never change selected value.
+			*/
+			//if (dp_inst.lastVal !== undefined && (dp_inst.lastVal.length > 0 && this.$input.val().length === 0)) {
+			//	return;
+			//}
+
+			if (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === false) {
+				formattedDateTime = this.formattedTime;
+			} else if ((this._defaults.timeOnly !== true && (this._defaults.alwaysSetTime || timeAvailable)) || (this._defaults.timeOnly === true && this._defaults.timeOnlyShowDate === true)) {
+				formattedDateTime += this._defaults.separator + this.formattedTime + this._defaults.timeSuffix;
+			}
+
+			this.formattedDateTime = formattedDateTime;
+
+			if (!this._defaults.showTimepicker) {
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput && this._defaults.timeOnly === false && this._defaults.altFieldTimeOnly === true) {
+				this.$altInput.val(this.formattedTime);
+				this.$input.val(this.formattedDate);
+			} else if (this.$altInput) {
+				this.$input.val(formattedDateTime);
+				var altFormattedDateTime = '',
+					altSeparator = this._defaults.altSeparator !== null ? this._defaults.altSeparator : this._defaults.separator,
+					altTimeSuffix = this._defaults.altTimeSuffix !== null ? this._defaults.altTimeSuffix : this._defaults.timeSuffix;
+				
+				if (!this._defaults.timeOnly) {
+					if (this._defaults.altFormat) {
+						altFormattedDateTime = $.datepicker.formatDate(this._defaults.altFormat, (dt === null ? new Date() : dt), formatCfg);
+					}
+					else {
+						altFormattedDateTime = this.formattedDate;
+					}
+
+					if (altFormattedDateTime) {
+						altFormattedDateTime += altSeparator;
+					}
+				}
+
+				if (this._defaults.altTimeFormat !== null) {
+					altFormattedDateTime += $.datepicker.formatTime(this._defaults.altTimeFormat, this, this._defaults) + altTimeSuffix;
+				}
+				else {
+					altFormattedDateTime += this.formattedTime + altTimeSuffix;
+				}
+				this.$altInput.val(altFormattedDateTime);
+			} else {
+				this.$input.val(formattedDateTime);
+			}
+
+			this.$input.trigger("change");
+		},
+
+		_onFocus: function () {
+			if (!this.$input.val() && this._defaults.defaultValue) {
+				this.$input.val(this._defaults.defaultValue);
+				var inst = $.datepicker._getInst(this.$input.get(0)),
+					tp_inst = $.datepicker._get(inst, 'timepicker');
+				if (tp_inst) {
+					if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+						try {
+							$.datepicker._updateDatepicker(inst);
+						} catch (err) {
+							$.timepicker.log(err);
+						}
+					}
+				}
+			}
+		},
+
+		/*
+		* Small abstraction to control types
+		* We can add more, just be sure to follow the pattern: create, options, value
+		*/
+		_controls: {
+			// slider methods
+			slider: {
+				create: function (tp_inst, obj, unit, val, min, max, step) {
+					var rtl = tp_inst._defaults.isRTL; // if rtl go -60->0 instead of 0->60
+					return obj.prop('slide', null).slider({
+						orientation: "horizontal",
+						value: rtl ? val * -1 : val,
+						min: rtl ? max * -1 : min,
+						max: rtl ? min * -1 : max,
+						step: step,
+						slide: function (event, ui) {
+							tp_inst.control.value(tp_inst, $(this), unit, rtl ? ui.value * -1 : ui.value);
+							tp_inst._onTimeChange();
+						},
+						stop: function (event, ui) {
+							tp_inst._onSelectHandler();
+						}
+					});	
+				},
+				options: function (tp_inst, obj, unit, opts, val) {
+					if (tp_inst._defaults.isRTL) {
+						if (typeof(opts) === 'string') {
+							if (opts === 'min' || opts === 'max') {
+								if (val !== undefined) {
+									return obj.slider(opts, val * -1);
+								}
+								return Math.abs(obj.slider(opts));
+							}
+							return obj.slider(opts);
+						}
+						var min = opts.min, 
+							max = opts.max;
+						opts.min = opts.max = null;
+						if (min !== undefined) {
+							opts.max = min * -1;
+						}
+						if (max !== undefined) {
+							opts.min = max * -1;
+						}
+						return obj.slider(opts);
+					}
+					if (typeof(opts) === 'string' && val !== undefined) {
+						return obj.slider(opts, val);
+					}
+					return obj.slider(opts);
+				},
+				value: function (tp_inst, obj, unit, val) {
+					if (tp_inst._defaults.isRTL) {
+						if (val !== undefined) {
+							return obj.slider('value', val * -1);
+						}
+						return Math.abs(obj.slider('value'));
+					}
+					if (val !== undefined) {
+						return obj.slider('value', val);
+					}
+					return obj.slider('value');
+				}
+			},
+			// select methods
+			select: {
+				create: function (tp_inst, obj, unit, val, min, max, step) {
+					var sel = '<select class="ui-timepicker-select ui-state-default ui-corner-all" data-unit="' + unit + '" data-min="' + min + '" data-max="' + max + '" data-step="' + step + '">',
+						format = tp_inst._defaults.pickerTimeFormat || tp_inst._defaults.timeFormat;
+
+					for (var i = min; i <= max; i += step) {
+						sel += '<option value="' + i + '"' + (i === val ? ' selected' : '') + '>';
+						if (unit === 'hour') {
+							format = format.replace(/'.'/g, '');
+							sel += $.datepicker.formatTime($.trim(format.replace(/[^ht ]/ig, '')), {hour: i}, tp_inst._defaults);
+						}
+						else if (unit === 'millisec' || unit === 'microsec' || i >= 10) { sel += i; }
+						else {sel += '0' + i.toString(); }
+						sel += '</option>';
+					}
+					sel += '</select>';
+
+					obj.children('select').remove();
+
+					$(sel).appendTo(obj).change(function (e) {
+						tp_inst._onTimeChange();
+						tp_inst._onSelectHandler();
+						tp_inst._afterInject();
+					});
+
+					return obj;
+				},
+				options: function (tp_inst, obj, unit, opts, val) {
+					var o = {},
+						$t = obj.children('select');
+					if (typeof(opts) === 'string') {
+						if (val === undefined) {
+							return $t.data(opts);
+						}
+						o[opts] = val;	
+					}
+					else { o = opts; }
+					return tp_inst.control.create(tp_inst, obj, $t.data('unit'), $t.val(), o.min>=0 ? o.min : $t.data('min'), o.max || $t.data('max'), o.step || $t.data('step'));
+				},
+				value: function (tp_inst, obj, unit, val) {
+					var $t = obj.children('select');
+					if (val !== undefined) {
+						return $t.val(val);
+					}
+					return $t.val();
+				}
+			}
+		} // end _controls
+
+	});
+
+	$.fn.extend({
+		/*
+		* shorthand just to use timepicker.
+		*/
+		timepicker: function (o) {
+			o = o || {};
+			var tmp_args = Array.prototype.slice.call(arguments);
+
+			if (typeof o === 'object') {
+				tmp_args[0] = $.extend(o, {
+					timeOnly: true
+				});
+			}
+
+			return $(this).each(function () {
+				$.fn.datetimepicker.apply($(this), tmp_args);
+			});
+		},
+
+		/*
+		* extend timepicker to datepicker
+		*/
+		datetimepicker: function (o) {
+			o = o || {};
+			var tmp_args = arguments;
+
+			if (typeof(o) === 'string') {
+				if (o === 'getDate'  || (o === 'option' && tmp_args.length === 2 && typeof (tmp_args[1]) === 'string')) {
+					return $.fn.datepicker.apply($(this[0]), tmp_args);
+				} else {
+					return this.each(function () {
+						var $t = $(this);
+						$t.datepicker.apply($t, tmp_args);
+					});
+				}
+			} else {
+				return this.each(function () {
+					var $t = $(this);
+					$t.datepicker($.timepicker._newInst($t, o)._defaults);
+				});
+			}
+		}
+	});
+
+	/*
+	* Public Utility to parse date and time
+	*/
+	$.datepicker.parseDateTime = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var parseRes = parseDateTimeInternal(dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings);
+		if (parseRes.timeObj) {
+			var t = parseRes.timeObj;
+			parseRes.date.setHours(t.hour, t.minute, t.second, t.millisec);
+			parseRes.date.setMicroseconds(t.microsec);
+		}
+
+		return parseRes.date;
+	};
+
+	/*
+	* Public utility to parse time
+	*/
+	$.datepicker.parseTime = function (timeFormat, timeString, options) {
+		var o = extendRemove(extendRemove({}, $.timepicker._defaults), options || {}),
+			iso8601 = (timeFormat.replace(/\'.*?\'/g, '').indexOf('Z') !== -1);
+
+		// Strict parse requires the timeString to match the timeFormat exactly
+		var strictParse = function (f, s, o) {
+
+			// pattern for standard and localized AM/PM markers
+			var getPatternAmpm = function (amNames, pmNames) {
+				var markers = [];
+				if (amNames) {
+					$.merge(markers, amNames);
+				}
+				if (pmNames) {
+					$.merge(markers, pmNames);
+				}
+				markers = $.map(markers, function (val) {
+					return val.replace(/[.*+?|()\[\]{}\\]/g, '\\$&');
+				});
+				return '(' + markers.join('|') + ')?';
+			};
+
+			// figure out position of time elements.. cause js cant do named captures
+			var getFormatPositions = function (timeFormat) {
+				var finds = timeFormat.toLowerCase().match(/(h{1,2}|m{1,2}|s{1,2}|l{1}|c{1}|t{1,2}|z|'.*?')/g),
+					orders = {
+						h: -1,
+						m: -1,
+						s: -1,
+						l: -1,
+						c: -1,
+						t: -1,
+						z: -1
+					};
+
+				if (finds) {
+					for (var i = 0; i < finds.length; i++) {
+						if (orders[finds[i].toString().charAt(0)] === -1) {
+							orders[finds[i].toString().charAt(0)] = i + 1;
+						}
+					}
+				}
+				return orders;
+			};
+
+			var regstr = '^' + f.toString()
+					.replace(/([hH]{1,2}|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+							var ml = match.length;
+							switch (match.charAt(0).toLowerCase()) {
+							case 'h':
+								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+							case 'm':
+								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+							case 's':
+								return ml === 1 ? '(\\d?\\d)' : '(\\d{' + ml + '})';
+							case 'l':
+								return '(\\d?\\d?\\d)';
+							case 'c':
+								return '(\\d?\\d?\\d)';
+							case 'z':
+								return '(z|[-+]\\d\\d:?\\d\\d|\\S+)?';
+							case 't':
+								return getPatternAmpm(o.amNames, o.pmNames);
+							default:    // literal escaped in quotes
+								return '(' + match.replace(/\'/g, "").replace(/(\.|\$|\^|\\|\/|\(|\)|\[|\]|\?|\+|\*)/g, function (m) { return "\\" + m; }) + ')?';
+							}
+						})
+					.replace(/\s/g, '\\s?') +
+					o.timeSuffix + '$',
+				order = getFormatPositions(f),
+				ampm = '',
+				treg;
+
+			treg = s.match(new RegExp(regstr, 'i'));
+
+			var resTime = {
+				hour: 0,
+				minute: 0,
+				second: 0,
+				millisec: 0,
+				microsec: 0
+			};
+
+			if (treg) {
+				if (order.t !== -1) {
+					if (treg[order.t] === undefined || treg[order.t].length === 0) {
+						ampm = '';
+						resTime.ampm = '';
+					} else {
+						ampm = $.inArray(treg[order.t].toUpperCase(), $.map(o.amNames, function (x,i) { return x.toUpperCase(); })) !== -1 ? 'AM' : 'PM';
+						resTime.ampm = o[ampm === 'AM' ? 'amNames' : 'pmNames'][0];
+					}
+				}
+
+				if (order.h !== -1) {
+					if (ampm === 'AM' && treg[order.h] === '12') {
+						resTime.hour = 0; // 12am = 0 hour
+					} else {
+						if (ampm === 'PM' && treg[order.h] !== '12') {
+							resTime.hour = parseInt(treg[order.h], 10) + 12; // 12pm = 12 hour, any other pm = hour + 12
+						} else {
+							resTime.hour = Number(treg[order.h]);
+						}
+					}
+				}
+
+				if (order.m !== -1) {
+					resTime.minute = Number(treg[order.m]);
+				}
+				if (order.s !== -1) {
+					resTime.second = Number(treg[order.s]);
+				}
+				if (order.l !== -1) {
+					resTime.millisec = Number(treg[order.l]);
+				}
+				if (order.c !== -1) {
+					resTime.microsec = Number(treg[order.c]);
+				}
+				if (order.z !== -1 && treg[order.z] !== undefined) {
+					resTime.timezone = $.timepicker.timezoneOffsetNumber(treg[order.z]);
+				}
+
+
+				return resTime;
+			}
+			return false;
+		};// end strictParse
+
+		// First try JS Date, if that fails, use strictParse
+		var looseParse = function (f, s, o) {
+			try {
+				var d = new Date('2012-01-01 ' + s);
+				if (isNaN(d.getTime())) {
+					d = new Date('2012-01-01T' + s);
+					if (isNaN(d.getTime())) {
+						d = new Date('01/01/2012 ' + s);
+						if (isNaN(d.getTime())) {
+							throw "Unable to parse time with native Date: " + s;
+						}
+					}
+				}
+
+				return {
+					hour: d.getHours(),
+					minute: d.getMinutes(),
+					second: d.getSeconds(),
+					millisec: d.getMilliseconds(),
+					microsec: d.getMicroseconds(),
+					timezone: d.getTimezoneOffset() * -1
+				};
+			}
+			catch (err) {
+				try {
+					return strictParse(f, s, o);
+				}
+				catch (err2) {
+					$.timepicker.log("Unable to parse \ntimeString: " + s + "\ntimeFormat: " + f);
+				}				
+			}
+			return false;
+		}; // end looseParse
+		
+		if (typeof o.parse === "function") {
+			return o.parse(timeFormat, timeString, o);
+		}
+		if (o.parse === 'loose') {
+			return looseParse(timeFormat, timeString, o);
+		}
+		return strictParse(timeFormat, timeString, o);
+	};
+
+	/**
+	 * Public utility to format the time
+	 * @param {string} format format of the time
+	 * @param {Object} time Object not a Date for timezones
+	 * @param {Object} [options] essentially the regional[].. amNames, pmNames, ampm
+	 * @returns {string} the formatted time
+	 */
+	$.datepicker.formatTime = function (format, time, options) {
+		options = options || {};
+		options = $.extend({}, $.timepicker._defaults, options);
+		time = $.extend({
+			hour: 0,
+			minute: 0,
+			second: 0,
+			millisec: 0,
+			microsec: 0,
+			timezone: null
+		}, time);
+
+		var tmptime = format,
+			ampmName = options.amNames[0],
+			hour = parseInt(time.hour, 10);
+
+		if (hour > 11) {
+			ampmName = options.pmNames[0];
+		}
+
+		tmptime = tmptime.replace(/(?:HH?|hh?|mm?|ss?|[tT]{1,2}|[zZ]|[lc]|'.*?')/g, function (match) {
+			switch (match) {
+			case 'HH':
+				return ('0' + hour).slice(-2);
+			case 'H':
+				return hour;
+			case 'hh':
+				return ('0' + convert24to12(hour)).slice(-2);
+			case 'h':
+				return convert24to12(hour);
+			case 'mm':
+				return ('0' + time.minute).slice(-2);
+			case 'm':
+				return time.minute;
+			case 'ss':
+				return ('0' + time.second).slice(-2);
+			case 's':
+				return time.second;
+			case 'l':
+				return ('00' + time.millisec).slice(-3);
+			case 'c':
+				return ('00' + time.microsec).slice(-3);
+			case 'z':
+				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, false);
+			case 'Z':
+				return $.timepicker.timezoneOffsetString(time.timezone === null ? options.timezone : time.timezone, true);
+			case 'T':
+				return ampmName.charAt(0).toUpperCase();
+			case 'TT':
+				return ampmName.toUpperCase();
+			case 't':
+				return ampmName.charAt(0).toLowerCase();
+			case 'tt':
+				return ampmName.toLowerCase();
+			default:
+				return match.replace(/'/g, "");
+			}
+		});
+
+		return tmptime;
+	};
+
+	/*
+	* the bad hack :/ override datepicker so it doesn't close on select
+	// inspired: http://stackoverflow.com/questions/1252512/jquery-datepicker-prevent-closing-picker-when-clicking-a-date/1762378#1762378
+	*/
+	$.datepicker._base_selectDate = $.datepicker._selectDate;
+	$.datepicker._selectDate = function (id, dateStr) {
+		var inst = this._getInst($(id)[0]),
+			tp_inst = this._get(inst, 'timepicker'),
+			was_inline;
+
+		if (tp_inst && inst.settings.showTimepicker) {
+			tp_inst._limitMinMaxDateTime(inst, true);
+			was_inline = inst.inline;
+			inst.inline = inst.stay_open = true;
+			//This way the onSelect handler called from calendarpicker get the full dateTime
+			this._base_selectDate(id, dateStr);
+			inst.inline = was_inline;
+			inst.stay_open = false;
+			this._notifyChange(inst);
+			this._updateDatepicker(inst);
+		} else {
+			this._base_selectDate(id, dateStr);
+		}
+	};
+
+	/*
+	* second bad hack :/ override datepicker so it triggers an event when changing the input field
+	* and does not redraw the datepicker on every selectDate event
+	*/
+	$.datepicker._base_updateDatepicker = $.datepicker._updateDatepicker;
+	$.datepicker._updateDatepicker = function (inst) {
+
+		// don't popup the datepicker if there is another instance already opened
+		var input = inst.input[0];
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst && $.datepicker._datepickerShowing && $.datepicker._lastInput !== input) {
+			return;
+		}
+
+		if (typeof(inst.stay_open) !== 'boolean' || inst.stay_open === false) {
+
+			this._base_updateDatepicker(inst);
+
+			// Reload the time control when changing something in the input text field.
+			var tp_inst = this._get(inst, 'timepicker');
+			if (tp_inst) {
+				tp_inst._addTimePicker(inst);
+			}
+		}
+	};
+
+	/*
+	* third bad hack :/ override datepicker so it allows spaces and colon in the input field
+	*/
+	$.datepicker._base_doKeyPress = $.datepicker._doKeyPress;
+	$.datepicker._doKeyPress = function (event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if ($.datepicker._get(inst, 'constrainInput')) {
+				var ampm = tp_inst.support.ampm,
+					tz = tp_inst._defaults.showTimezone !== null ? tp_inst._defaults.showTimezone : tp_inst.support.timezone,
+					dateChars = $.datepicker._possibleChars($.datepicker._get(inst, 'dateFormat')),
+					datetimeChars = tp_inst._defaults.timeFormat.toString()
+											.replace(/[hms]/g, '')
+											.replace(/TT/g, ampm ? 'APM' : '')
+											.replace(/Tt/g, ampm ? 'AaPpMm' : '')
+											.replace(/tT/g, ampm ? 'AaPpMm' : '')
+											.replace(/T/g, ampm ? 'AP' : '')
+											.replace(/tt/g, ampm ? 'apm' : '')
+											.replace(/t/g, ampm ? 'ap' : '') + 
+											" " + tp_inst._defaults.separator + 
+											tp_inst._defaults.timeSuffix + 
+											(tz ? tp_inst._defaults.timezoneList.join('') : '') + 
+											(tp_inst._defaults.amNames.join('')) + (tp_inst._defaults.pmNames.join('')) + 
+											dateChars,
+					chr = String.fromCharCode(event.charCode === undefined ? event.keyCode : event.charCode);
+				return event.ctrlKey || (chr < ' ' || !dateChars || datetimeChars.indexOf(chr) > -1);
+			}
+		}
+
+		return $.datepicker._base_doKeyPress(event);
+	};
+
+	/*
+	* Fourth bad hack :/ override _updateAlternate function used in inline mode to init altField
+	* Update any alternate field to synchronise with the main field.
+	*/
+	$.datepicker._base_updateAlternate = $.datepicker._updateAlternate;
+	$.datepicker._updateAlternate = function (inst) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var altField = tp_inst._defaults.altField;
+			if (altField) { // update alternate field too
+				var altFormat = tp_inst._defaults.altFormat || tp_inst._defaults.dateFormat,
+					date = this._getDate(inst),
+					formatCfg = $.datepicker._getFormatConfig(inst),
+					altFormattedDateTime = '', 
+					altSeparator = tp_inst._defaults.altSeparator ? tp_inst._defaults.altSeparator : tp_inst._defaults.separator, 
+					altTimeSuffix = tp_inst._defaults.altTimeSuffix ? tp_inst._defaults.altTimeSuffix : tp_inst._defaults.timeSuffix,
+					altTimeFormat = tp_inst._defaults.altTimeFormat !== null ? tp_inst._defaults.altTimeFormat : tp_inst._defaults.timeFormat;
+				
+				altFormattedDateTime += $.datepicker.formatTime(altTimeFormat, tp_inst, tp_inst._defaults) + altTimeSuffix;
+				if (!tp_inst._defaults.timeOnly && !tp_inst._defaults.altFieldTimeOnly && date !== null) {
+					if (tp_inst._defaults.altFormat) {
+						altFormattedDateTime = $.datepicker.formatDate(tp_inst._defaults.altFormat, date, formatCfg) + altSeparator + altFormattedDateTime;
+					}
+					else {
+						altFormattedDateTime = tp_inst.formattedDate + altSeparator + altFormattedDateTime;
+					}
+				}
+				$(altField).val( inst.input.val() ? altFormattedDateTime : "");
+			}
+		}
+		else {
+			$.datepicker._base_updateAlternate(inst);	
+		}
+	};
+
+	/*
+	* Override key up event to sync manual input changes.
+	*/
+	$.datepicker._base_doKeyUp = $.datepicker._doKeyUp;
+	$.datepicker._doKeyUp = function (event) {
+		var inst = $.datepicker._getInst(event.target),
+			tp_inst = $.datepicker._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			if (tp_inst._defaults.timeOnly && (inst.input.val() !== inst.lastVal)) {
+				try {
+					$.datepicker._updateDatepicker(inst);
+				} catch (err) {
+					$.timepicker.log(err);
+				}
+			}
+		}
+
+		return $.datepicker._base_doKeyUp(event);
+	};
+
+	/*
+	* override "Today" button to also grab the time and set it to input field.
+	*/
+	$.datepicker._base_gotoToday = $.datepicker._gotoToday;
+	$.datepicker._gotoToday = function (id) {
+		var inst = this._getInst($(id)[0]);
+		this._base_gotoToday(id);
+		var tp_inst = this._get(inst, 'timepicker');
+		var tzoffset = $.timepicker.timezoneOffsetNumber(tp_inst.timezone);
+		var now = new Date();
+		if (typeof tzoffset == 'string')
+		{
+			tzoffset = parseInt(tzoffset, 10);
+		}
+		console.log(tzoffset, now.getTimezoneOffset(), now);
+		now.setMinutes(now.getMinutes() + now.getTimezoneOffset() + tzoffset);
+		this._setTime(inst, now);
+		this._setDate(inst, now);
+		tp_inst._onSelectHandler();
+	};
+
+	/*
+	* Disable & enable the Time in the datetimepicker
+	*/
+	$.datepicker._disableTimepickerDatepicker = function (target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			inst.settings.showTimepicker = false;
+			tp_inst._defaults.showTimepicker = false;
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	$.datepicker._enableTimepickerDatepicker = function (target) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		$(target).datepicker('getDate'); // Init selected[Year|Month|Day]
+		if (tp_inst) {
+			inst.settings.showTimepicker = true;
+			tp_inst._defaults.showTimepicker = true;
+			tp_inst._addTimePicker(inst); // Could be disabled on page load
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create our own set time function
+	*/
+	$.datepicker._setTime = function (inst, date) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var defaults = tp_inst._defaults;
+
+			// calling _setTime with no date sets time to defaults
+			tp_inst.hour = date ? date.getHours() : defaults.hour;
+			tp_inst.minute = date ? date.getMinutes() : defaults.minute;
+			tp_inst.second = date ? date.getSeconds() : defaults.second;
+			tp_inst.millisec = date ? date.getMilliseconds() : defaults.millisec;
+			tp_inst.microsec = date ? date.getMicroseconds() : defaults.microsec;
+
+			//check if within min/max times.. 
+			tp_inst._limitMinMaxDateTime(inst, true);
+
+			tp_inst._onTimeChange();
+			tp_inst._updateDateTime(inst);
+		}
+	};
+
+	/*
+	* Create new public method to set only time, callable as $().datepicker('setTime', date)
+	*/
+	$.datepicker._setTimeDatepicker = function (target, date, withDate) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			this._setDateFromField(inst);
+			var tp_date;
+			if (date) {
+				if (typeof date === "string") {
+					tp_inst._parseTime(date, withDate);
+					tp_date = new Date();
+					tp_date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+					tp_date.setMicroseconds(tp_inst.microsec);
+				} else {
+					tp_date = new Date(date.getTime());
+					tp_date.setMicroseconds(date.getMicroseconds());
+				}
+				if (tp_date.toString() === 'Invalid Date') {
+					tp_date = undefined;
+				}
+				this._setTime(inst, tp_date);
+			}
+		}
+
+	};
+
+	/*
+	* override setDate() to allow setting time too within Date object
+	*/
+	$.datepicker._base_setDateDatepicker = $.datepicker._setDateDatepicker;
+	$.datepicker._setDateDatepicker = function (target, _date) {
+		var inst = this._getInst(target);
+		var date = _date;
+		if (!inst) {
+			return;
+		}
+
+		if (typeof(_date) === 'string') {
+			date = new Date(_date);
+			if (!date.getTime()) {
+				this._base_setDateDatepicker.apply(this, arguments);
+				date = $(target).datepicker('getDate');
+			}
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		var tp_date;
+		if (date instanceof Date) {
+			tp_date = new Date(date.getTime());
+			tp_date.setMicroseconds(date.getMicroseconds());
+		} else {
+			tp_date = date;
+		}
+		
+		// This is important if you are using the timezone option, javascript's Date 
+		// object will only return the timezone offset for the current locale, so we 
+		// adjust it accordingly.  If not using timezone option this won't matter..
+		// If a timezone is different in tp, keep the timezone as is
+		if (tp_inst && tp_date) {
+			// look out for DST if tz wasn't specified
+			if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+				tp_inst.timezone = tp_date.getTimezoneOffset() * -1;
+			}
+			date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+			tp_date = $.timepicker.timezoneAdjust(tp_date, tp_inst.timezone);
+		}
+
+		this._updateDatepicker(inst);
+		this._base_setDateDatepicker.apply(this, arguments);
+		this._setTimeDatepicker(target, tp_date, true);
+	};
+
+	/*
+	* override getDate() to allow getting time too within Date object
+	*/
+	$.datepicker._base_getDateDatepicker = $.datepicker._getDateDatepicker;
+	$.datepicker._getDateDatepicker = function (target, noDefault) {
+		var inst = this._getInst(target);
+		if (!inst) {
+			return;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+
+		if (tp_inst) {
+			// if it hasn't yet been defined, grab from field
+			if (inst.lastVal === undefined) {
+				this._setDateFromField(inst, noDefault);
+			}
+
+			var date = this._getDate(inst);
+			var currDT = $.trim((tp_inst.$altInput && tp_inst._defaults.altFieldTimeOnly) ? tp_inst.$input.val() + ' ' + tp_inst.$altInput.val() : tp_inst.$input.val());
+			if (date && tp_inst._parseTime(currDT, !inst.settings.timeOnly)) {
+				date.setHours(tp_inst.hour, tp_inst.minute, tp_inst.second, tp_inst.millisec);
+				date.setMicroseconds(tp_inst.microsec);
+
+				// This is important if you are using the timezone option, javascript's Date 
+				// object will only return the timezone offset for the current locale, so we 
+				// adjust it accordingly.  If not using timezone option this won't matter..
+				if (tp_inst.timezone != null) {
+					// look out for DST if tz wasn't specified
+					if (!tp_inst.support.timezone && tp_inst._defaults.timezone === null) {
+						tp_inst.timezone = date.getTimezoneOffset() * -1;
+					}
+					date = $.timepicker.timezoneAdjust(date, tp_inst.timezone);
+				}
+			}
+			return date;
+		}
+		return this._base_getDateDatepicker(target, noDefault);
+	};
+
+	/*
+	* override parseDate() because UI 1.8.14 throws an error about "Extra characters"
+	* An option in datapicker to ignore extra format characters would be nicer.
+	*/
+	$.datepicker._base_parseDate = $.datepicker.parseDate;
+	$.datepicker.parseDate = function (format, value, settings) {
+		var date;
+		try {
+			date = this._base_parseDate(format, value, settings);
+		} catch (err) {
+			// Hack!  The error message ends with a colon, a space, and
+			// the "extra" characters.  We rely on that instead of
+			// attempting to perfectly reproduce the parsing algorithm.
+			if (err.indexOf(":") >= 0) {
+				date = this._base_parseDate(format, value.substring(0, value.length - (err.length - err.indexOf(':') - 2)), settings);
+				$.timepicker.log("Error parsing the date string: " + err + "\ndate string = " + value + "\ndate format = " + format);
+			} else {
+				throw err;
+			}
+		}
+		return date;
+	};
+
+	/*
+	* override formatDate to set date with time to the input
+	*/
+	$.datepicker._base_formatDate = $.datepicker._formatDate;
+	$.datepicker._formatDate = function (inst, day, month, year) {
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			tp_inst._updateDateTime(inst);
+			return tp_inst.$input.val();
+		}
+		return this._base_formatDate(inst);
+	};
+
+	/*
+	* override options setter to add time to maxDate(Time) and minDate(Time). MaxDate
+	*/
+	$.datepicker._base_optionDatepicker = $.datepicker._optionDatepicker;
+	$.datepicker._optionDatepicker = function (target, name, value) {
+		var inst = this._getInst(target),
+			name_clone;
+		if (!inst) {
+			return null;
+		}
+
+		var tp_inst = this._get(inst, 'timepicker');
+		if (tp_inst) {
+			var min = null,
+				max = null,
+				onselect = null,
+				overrides = tp_inst._defaults.evnts,
+				fns = {},
+				prop,
+				ret,
+				oldVal,
+				$target;
+			if (typeof name === 'string') { // if min/max was set with the string
+				if (name === 'minDate' || name === 'minDateTime') {
+					min = value;
+				} else if (name === 'maxDate' || name === 'maxDateTime') {
+					max = value;
+				} else if (name === 'onSelect') {
+					onselect = value;
+				} else if (overrides.hasOwnProperty(name)) {
+					if (typeof (value) === 'undefined') {
+						return overrides[name];
+					}
+					fns[name] = value;
+					name_clone = {}; //empty results in exiting function after overrides updated
+				}
+			} else if (typeof name === 'object') { //if min/max was set with the JSON
+				if (name.minDate) {
+					min = name.minDate;
+				} else if (name.minDateTime) {
+					min = name.minDateTime;
+				} else if (name.maxDate) {
+					max = name.maxDate;
+				} else if (name.maxDateTime) {
+					max = name.maxDateTime;
+				}
+				for (prop in overrides) {
+					if (overrides.hasOwnProperty(prop) && name[prop]) {
+						fns[prop] = name[prop];
+					}
+				}
+			}
+			for (prop in fns) {
+				if (fns.hasOwnProperty(prop)) {
+					overrides[prop] = fns[prop];
+					if (!name_clone) { name_clone = $.extend({}, name); }
+					delete name_clone[prop];
+				}
+			}
+			if (name_clone && isEmptyObject(name_clone)) { return; }
+			if (min) { //if min was set
+				if (min === 0) {
+					min = new Date();
+				} else {
+					min = new Date(min);
+				}
+				tp_inst._defaults.minDate = min;
+				tp_inst._defaults.minDateTime = min;
+			} else if (max) { //if max was set
+				if (max === 0) {
+					max = new Date();
+				} else {
+					max = new Date(max);
+				}
+				tp_inst._defaults.maxDate = max;
+				tp_inst._defaults.maxDateTime = max;
+			} else if (onselect) {
+				tp_inst._defaults.onSelect = onselect;
+			}
+
+			// Datepicker will override our date when we call _base_optionDatepicker when 
+			// calling minDate/maxDate, so we will first grab the value, call 
+			// _base_optionDatepicker, then set our value back.
+			if(min || max){
+				$target = $(target);
+				oldVal = $target.datetimepicker('getDate');
+				ret = this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+				$target.datetimepicker('setDate', oldVal);
+				return ret;
+			}
+		}
+		if (value === undefined) {
+			return this._base_optionDatepicker.call($.datepicker, target, name);
+		}
+		return this._base_optionDatepicker.call($.datepicker, target, name_clone || name, value);
+	};
+	
+	/*
+	* jQuery isEmptyObject does not check hasOwnProperty - if someone has added to the object prototype,
+	* it will return false for all objects
+	*/
+	var isEmptyObject = function (obj) {
+		var prop;
+		for (prop in obj) {
+			if (obj.hasOwnProperty(prop)) {
+				return false;
+			}
+		}
+		return true;
+	};
+
+	/*
+	* jQuery extend now ignores nulls!
+	*/
+	var extendRemove = function (target, props) {
+		$.extend(target, props);
+		for (var name in props) {
+			if (props[name] === null || props[name] === undefined) {
+				target[name] = props[name];
+			}
+		}
+		return target;
+	};
+
+	/*
+	* Determine by the time format which units are supported
+	* Returns an object of booleans for each unit
+	*/
+	var detectSupport = function (timeFormat) {
+		var tf = timeFormat.replace(/'.*?'/g, '').toLowerCase(), // removes literals
+			isIn = function (f, t) { // does the format contain the token?
+					return f.indexOf(t) !== -1 ? true : false;
+				};
+		return {
+				hour: isIn(tf, 'h'),
+				minute: isIn(tf, 'm'),
+				second: isIn(tf, 's'),
+				millisec: isIn(tf, 'l'),
+				microsec: isIn(tf, 'c'),
+				timezone: isIn(tf, 'z'),
+				ampm: isIn(tf, 't') && isIn(timeFormat, 'h'),
+				iso8601: isIn(timeFormat, 'Z')
+			};
+	};
+
+	/*
+	* Converts 24 hour format into 12 hour
+	* Returns 12 hour without leading 0
+	*/
+	var convert24to12 = function (hour) {
+		hour %= 12;
+
+		if (hour === 0) {
+			hour = 12;
+		}
+
+		return String(hour);
+	};
+
+	var computeEffectiveSetting = function (settings, property) {
+		return settings && settings[property] ? settings[property] : $.timepicker._defaults[property];
+	};
+
+	/*
+	* Splits datetime string into date and time substrings.
+	* Throws exception when date can't be parsed
+	* Returns {dateString: dateString, timeString: timeString}
+	*/
+	var splitDateTime = function (dateTimeString, timeSettings) {
+		// The idea is to get the number separator occurrences in datetime and the time format requested (since time has
+		// fewer unknowns, mostly numbers and am/pm). We will use the time pattern to split.
+		var separator = computeEffectiveSetting(timeSettings, 'separator'),
+			format = computeEffectiveSetting(timeSettings, 'timeFormat'),
+			timeParts = format.split(separator), // how many occurrences of separator may be in our format?
+			timePartsLen = timeParts.length,
+			allParts = dateTimeString.split(separator),
+			allPartsLen = allParts.length;
+
+		if (allPartsLen > 1) {
+			return {
+				dateString: allParts.splice(0, allPartsLen - timePartsLen).join(separator),
+				timeString: allParts.splice(0, timePartsLen).join(separator)
+			};
+		}
+
+		return {
+			dateString: dateTimeString,
+			timeString: ''
+		};
+	};
+
+	/*
+	* Internal function to parse datetime interval
+	* Returns: {date: Date, timeObj: Object}, where
+	*   date - parsed date without time (type Date)
+	*   timeObj = {hour: , minute: , second: , millisec: , microsec: } - parsed time. Optional
+	*/
+	var parseDateTimeInternal = function (dateFormat, timeFormat, dateTimeString, dateSettings, timeSettings) {
+		var date,
+			parts,
+			parsedTime;
+
+		parts = splitDateTime(dateTimeString, timeSettings);
+		date = $.datepicker._base_parseDate(dateFormat, parts.dateString, dateSettings);
+
+		if (parts.timeString === '') {
+			return {
+				date: date
+			};
+		}
+
+		parsedTime = $.datepicker.parseTime(timeFormat, parts.timeString, timeSettings);
+
+		if (!parsedTime) {
+			throw 'Wrong time format';
+		}
+
+		return {
+			date: date,
+			timeObj: parsedTime
+		};
+	};
+
+	/*
+	* Internal function to set timezone_select to the local timezone
+	*/
+	var selectLocalTimezone = function (tp_inst, date) {
+		if (tp_inst && tp_inst.timezone_select) {
+			var now = date || new Date();
+			tp_inst.timezone_select.val(-now.getTimezoneOffset());
+		}
+	};
+
+	/*
+	* Create a Singleton Instance
+	*/
+	$.timepicker = new Timepicker();
+
+	/**
+	 * Get the timezone offset as string from a date object (eg '+0530' for UTC+5.5)
+	 * @param {number} tzMinutes if not a number, less than -720 (-1200), or greater than 840 (+1400) this value is returned
+	 * @param {boolean} iso8601 if true formats in accordance to iso8601 "+12:45"
+	 * @return {string}
+	 */
+	$.timepicker.timezoneOffsetString = function (tzMinutes, iso8601) {
+		if (isNaN(tzMinutes) || tzMinutes > 840 || tzMinutes < -720) {
+			return tzMinutes;
+		}
+
+		var off = tzMinutes,
+			minutes = off % 60,
+			hours = (off - minutes) / 60,
+			iso = iso8601 ? ':' : '',
+			tz = (off >= 0 ? '+' : '-') + ('0' + Math.abs(hours)).slice(-2) + iso + ('0' + Math.abs(minutes)).slice(-2);
+		
+		if (tz === '+00:00') {
+			return 'Z';
+		}
+		return tz;
+	};
+
+	/**
+	 * Get the number in minutes that represents a timezone string
+	 * @param  {string} tzString formatted like "+0500", "-1245", "Z"
+	 * @return {number} the offset minutes or the original string if it doesn't match expectations
+	 */
+	$.timepicker.timezoneOffsetNumber = function (tzString) {
+		var normalized = tzString.toString().replace(':', ''); // excuse any iso8601, end up with "+1245"
+
+		if (normalized.toUpperCase() === 'Z') { // if iso8601 with Z, its 0 minute offset
+			return 0;
+		}
+
+		if (!/^(\-|\+)\d{4}$/.test(normalized)) { // possibly a user defined tz, so just give it back
+			return tzString;
+		}
+
+		return ((normalized.substr(0, 1) === '-' ? -1 : 1) * // plus or minus
+					((parseInt(normalized.substr(1, 2), 10) * 60) + // hours (converted to minutes)
+					parseInt(normalized.substr(3, 2), 10))); // minutes
+	};
+
+	/**
+	 * No way to set timezone in js Date, so we must adjust the minutes to compensate. (think setDate, getDate)
+	 * @param  {Date} date
+	 * @param  {string} toTimezone formatted like "+0500", "-1245"
+	 * @return {Date}
+	 */
+	$.timepicker.timezoneAdjust = function (date, toTimezone) {
+		var toTz = $.timepicker.timezoneOffsetNumber(toTimezone);
+		if (!isNaN(toTz)) {
+			date.setMinutes(date.getMinutes() + -date.getTimezoneOffset() - toTz);
+		}
+		return date;
+	};
+
+	/**
+	 * Calls `timepicker()` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * n.b. The input value must be correctly formatted (reformatting is not supported)
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the timepicker() call
+	 * @return {jQuery}
+	 */
+	$.timepicker.timeRange = function (startTime, endTime, options) {
+		return $.timepicker.handleRange('timepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `datetimepicker` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @param  {string} method Can be used to specify the type of picker to be added
+	 * @return {jQuery}
+	 */
+	$.timepicker.datetimeRange = function (startTime, endTime, options) {
+		$.timepicker.handleRange('datetimepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `datepicker` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @return {jQuery}
+	 */
+	$.timepicker.dateRange = function (startTime, endTime, options) {
+		$.timepicker.handleRange('datepicker', startTime, endTime, options);
+	};
+
+	/**
+	 * Calls `method` on the `startTime` and `endTime` elements, and configures them to
+	 * enforce date range limits.
+	 * @param  {string} method Can be used to specify the type of picker to be added
+	 * @param  {Element} startTime
+	 * @param  {Element} endTime
+	 * @param  {Object} options Options for the `timepicker()` call. Also supports `reformat`,
+	 *   a boolean value that can be used to reformat the input values to the `dateFormat`.
+	 * @return {jQuery}
+	 */
+	$.timepicker.handleRange = function (method, startTime, endTime, options) {
+		options = $.extend({}, {
+			minInterval: 0, // min allowed interval in milliseconds
+			maxInterval: 0, // max allowed interval in milliseconds
+			start: {},      // options for start picker
+			end: {}         // options for end picker
+		}, options);
+
+		// for the mean time this fixes an issue with calling getDate with timepicker()
+		var timeOnly = false;
+		if(method === 'timepicker'){
+			timeOnly = true;
+			method = 'datetimepicker';
+		}
+
+		function checkDates(changed, other) {
+			var startdt = startTime[method]('getDate'),
+				enddt = endTime[method]('getDate'),
+				changeddt = changed[method]('getDate');
+
+			if (startdt !== null) {
+				var minDate = new Date(startdt.getTime()),
+					maxDate = new Date(startdt.getTime());
+
+				minDate.setMilliseconds(minDate.getMilliseconds() + options.minInterval);
+				maxDate.setMilliseconds(maxDate.getMilliseconds() + options.maxInterval);
+
+				if (options.minInterval > 0 && minDate > enddt) { // minInterval check
+					endTime[method]('setDate', minDate);
+				}
+				else if (options.maxInterval > 0 && maxDate < enddt) { // max interval check
+					endTime[method]('setDate', maxDate);
+				}
+				else if (startdt > enddt) {
+					other[method]('setDate', changeddt);
+				}
+			}
+		}
+
+		function selected(changed, other, option) {
+			if (!changed.val()) {
+				return;
+			}
+			var date = changed[method].call(changed, 'getDate');
+			if (date !== null && options.minInterval > 0) {
+				if (option === 'minDate') {
+					date.setMilliseconds(date.getMilliseconds() + options.minInterval);
+				}
+				if (option === 'maxDate') {
+					date.setMilliseconds(date.getMilliseconds() - options.minInterval);
+				}
+			}
+			
+			if (date.getTime) {
+				other[method].call(other, 'option', option, date);
+			}
+		}
+
+		$.fn[method].call(startTime, $.extend({
+			timeOnly: timeOnly,
+			onClose: function (dateText, inst) {
+				checkDates($(this), endTime);
+			},
+			onSelect: function (selectedDateTime) {
+				selected($(this), endTime, 'minDate');
+			}
+		}, options, options.start));
+		$.fn[method].call(endTime, $.extend({
+			timeOnly: timeOnly,
+			onClose: function (dateText, inst) {
+				checkDates($(this), startTime);
+			},
+			onSelect: function (selectedDateTime) {
+				selected($(this), startTime, 'maxDate');
+			}
+		}, options, options.end));
+
+		checkDates(startTime, endTime);
+		
+		selected(startTime, endTime, 'minDate');
+		selected(endTime, startTime, 'maxDate');
+
+		return $([startTime.get(0), endTime.get(0)]);
+	};
+
+	/**
+	 * Log error or data to the console during error or debugging
+	 * @param  {Object} err pass any type object to log to the console during error or debugging
+	 * @return {void}
+	 */
+	$.timepicker.log = function () {
+		if (window.console) {
+			window.console.log.apply(window.console, Array.prototype.slice.call(arguments));
+		}
+	};
+
+	/*
+	 * Add util object to allow access to private methods for testability.
+	 */
+	$.timepicker._util = {
+		_extendRemove: extendRemove,
+		_isEmptyObject: isEmptyObject,
+		_convert24to12: convert24to12,
+		_detectSupport: detectSupport,
+		_selectLocalTimezone: selectLocalTimezone,
+		_computeEffectiveSetting: computeEffectiveSetting,
+		_splitDateTime: splitDateTime,
+		_parseDateTimeInternal: parseDateTimeInternal
+	};
+
+	/*
+	* Microsecond support
+	*/
+	if (!Date.prototype.getMicroseconds) {
+		Date.prototype.microseconds = 0;
+		Date.prototype.getMicroseconds = function () { return this.microseconds; };
+		Date.prototype.setMicroseconds = function (m) {
+			this.setMilliseconds(this.getMilliseconds() + Math.floor(m / 1000));
+			this.microseconds = m % 1000;
+			return this;
+		};
+	}
+
+	/*
+	* Keep up with the version
+	*/
+	$.timepicker.version = "1.6.1";
+
+}));
diff --git a/js/jquery.layout.js b/js/jquery.layout.js
index 60d930ece..34fcc79d7 100755
--- a/js/jquery.layout.js
+++ b/js/jquery.layout.js
@@ -1,5939 +1,5939 @@
-/**
- * @preserve
- * jquery.layout 1.3.0 - Release Candidate 30.79
- * $Date: 2013-01-12 08:00:00 (Sat, 12 Jan 2013) $
- * $Rev: 303007 $
- *
- * Copyright (c) 2013 Kevin Dalman (http://allpro.net)
- * Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * SEE: http://layout.jquery-dev.net/LICENSE.txt
- * 
- * Changelog: http://layout.jquery-dev.net/changelog.cfm#1.3.0.rc30.79
- *
- * Docs: http://layout.jquery-dev.net/documentation.html
- * Tips: http://layout.jquery-dev.net/tips.html
- * Help: http://groups.google.com/group/jquery-ui-layout
- */
-
-/* JavaDoc Info: http://code.google.com/closure/compiler/docs/js-for-compiler.html
- * {!Object}	non-nullable type (never NULL)
- * {?string}	nullable type (sometimes NULL) - default for {Object}
- * {number=}	optional parameter
- * {*}			ALL types
- */
-/*	TODO for jQ 2.0 
- *	change .andSelf() to .addBack()
- *	$.fn.disableSelection won't work
- */
-
-// NOTE: For best readability, view with a fixed-width font and tabs equal to 4-chars
-
-;(function ($) {
-
-// alias Math methods - used a lot!
-var	min		= Math.min
-,	max		= Math.max
-,	round	= Math.floor
-
-,	isStr	=  function (v) { return $.type(v) === "string"; }
-
-	/**
-	* @param {!Object}			Instance
-	* @param {Array.<string>}	a_fn
-	*/
-,	runPluginCallbacks = function (Instance, a_fn) {
-		if ($.isArray(a_fn))
-			for (var i=0, c=a_fn.length; i<c; i++) {
-				var fn = a_fn[i];
-				try {
-					if (isStr(fn)) // 'name' of a function
-						fn = eval(fn);
-					if ($.isFunction(fn))
-						g(fn)( Instance );
-				} catch (ex) {}
-			}
-		function g (f) { return f; }; // compiler hack
-	}
-;
-
-/*
- *	GENERIC $.layout METHODS - used by all layouts
- */
-$.layout = {
-
-	version:	"1.3.rc30.79"
-,	revision:	0.033007 // 1.3.0 final = 1.0300 - major(n+).minor(nn)+patch(nn+)
-
-	// $.layout.browser REPLACES $.browser
-,	browser:	{} // set below
-
-	// *PREDEFINED* EFFECTS & DEFAULTS 
-	// MUST list effect here - OR MUST set an fxSettings option (can be an empty hash: {})
-,	effects: {
-
-	//	Pane Open/Close Animations
-		slide: {
-			all:	{ duration:  "fast"	} // eg: duration: 1000, easing: "easeOutBounce"
-		,	north:	{ direction: "up"	}
-		,	south:	{ direction: "down"	}
-		,	east:	{ direction: "right"}
-		,	west:	{ direction: "left"	}
-		}
-	,	drop: {
-			all:	{ duration:  "slow"	}
-		,	north:	{ direction: "up"	}
-		,	south:	{ direction: "down"	}
-		,	east:	{ direction: "right"}
-		,	west:	{ direction: "left"	}
-		}
-	,	scale: {
-			all:	{ duration:	"fast"	}
-		}
-	//	these are not recommended, but can be used
-	,	blind:		{}
-	,	clip:		{}
-	,	explode:	{}
-	,	fade:		{}
-	,	fold:		{}
-	,	puff:		{}
-
-	//	Pane Resize Animations
-	,	size: {
-			all:	{ easing:	"swing"	}
-		}
-	}
-
-	// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
-,	config: {
-		optionRootKeys:	"effects,panes,north,south,west,east,center".split(",")
-	,	allPanes:		"north,south,west,east,center".split(",")
-	,	borderPanes:	"north,south,west,east".split(",")
-	,	oppositeEdge: {
-			north:	"south"
-		,	south:	"north"
-		,	east: 	"west"
-		,	west: 	"east"
-		}
-	//	offscreen data
-	,	offscreenCSS:	{ left: "-99999px", right: "auto" } // used by hide/close if useOffscreenClose=true
-	,	offscreenReset:	"offscreenReset" // key used for data
-	//	CSS used in multiple places
-	,	hidden:		{ visibility: "hidden" }
-	,	visible:	{ visibility: "visible" }
-	//	layout element settings
-	,	resizers: {
-			cssReq: {
-				position: 	"absolute"
-			,	padding: 	0
-			,	margin: 	0
-			,	fontSize:	"1px"
-			,	textAlign:	"left"	// to counter-act "center" alignment!
-			,	overflow: 	"hidden" // prevent toggler-button from overflowing
-			//	SEE $.layout.defaults.zIndexes.resizer_normal
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				background: "#DDD"
-			,	border:		"none"
-			}
-		}
-	,	togglers: {
-			cssReq: {
-				position: 	"absolute"
-			,	display: 	"block"
-			,	padding: 	0
-			,	margin: 	0
-			,	overflow:	"hidden"
-			,	textAlign:	"center"
-			,	fontSize:	"1px"
-			,	cursor: 	"pointer"
-			,	zIndex: 	1
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				background: "#AAA"
-			}
-		}
-	,	content: {
-			cssReq: {
-				position:	"relative" /* contain floated or positioned elements */
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				overflow:	"auto"
-			,	padding:	"10px"
-			}
-		,	cssDemoPane: { // DEMO CSS - REMOVE scrolling from 'pane' when it has a content-div
-				overflow:	"hidden"
-			,	padding:	0
-			}
-		}
-	,	panes: { // defaults for ALL panes - overridden by 'per-pane settings' below
-			cssReq: {
-				position: 	"absolute"
-			,	margin:		0
-			//	$.layout.defaults.zIndexes.pane_normal
-			}
-		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
-				padding:	"10px"
-			,	background:	"#FFF"
-			,	border:		"1px solid #BBB"
-			,	overflow:	"auto"
-			}
-		}
-	,	north: {
-			side:			"top"
-		,	sizeType:		"Height"
-		,	dir:			"horz"
-		,	cssReq: {
-				top: 		0
-			,	bottom: 	"auto"
-			,	left: 		0
-			,	right: 		0
-			,	width: 		"auto"
-			//	height: 	DYNAMIC
-			}
-		}
-	,	south: {
-			side:			"bottom"
-		,	sizeType:		"Height"
-		,	dir:			"horz"
-		,	cssReq: {
-				top: 		"auto"
-			,	bottom: 	0
-			,	left: 		0
-			,	right: 		0
-			,	width: 		"auto"
-			//	height: 	DYNAMIC
-			}
-		}
-	,	east: {
-			side:			"right"
-		,	sizeType:		"Width"
-		,	dir:			"vert"
-		,	cssReq: {
-				left: 		"auto"
-			,	right: 		0
-			,	top: 		"auto" // DYNAMIC
-			,	bottom: 	"auto" // DYNAMIC
-			,	height: 	"auto"
-			//	width: 		DYNAMIC
-			}
-		}
-	,	west: {
-			side:			"left"
-		,	sizeType:		"Width"
-		,	dir:			"vert"
-		,	cssReq: {
-				left: 		0
-			,	right: 		"auto"
-			,	top: 		"auto" // DYNAMIC
-			,	bottom: 	"auto" // DYNAMIC
-			,	height: 	"auto"
-			//	width: 		DYNAMIC
-			}
-		}
-	,	center: {
-			dir:			"center"
-		,	cssReq: {
-				left: 		"auto" // DYNAMIC
-			,	right: 		"auto" // DYNAMIC
-			,	top: 		"auto" // DYNAMIC
-			,	bottom: 	"auto" // DYNAMIC
-			,	height: 	"auto"
-			,	width: 		"auto"
-			}
-		}
-	}
-
-	// CALLBACK FUNCTION NAMESPACE - used to store reusable callback functions
-,	callbacks: {}
-
-,	getParentPaneElem: function (el) {
-		// must pass either a container or pane element
-		var $el = $(el)
-		,	layout = $el.data("layout") || $el.data("parentLayout");
-		if (layout) {
-			var $cont = layout.container;
-			// see if this container is directly-nested inside an outer-pane
-			if ($cont.data("layoutPane")) return $cont;
-			var $pane = $cont.closest("."+ $.layout.defaults.panes.paneClass);
-			// if a pane was found, return it
-			if ($pane.data("layoutPane")) return $pane;
-		}
-		return null;
-	}
-
-,	getParentPaneInstance: function (el) {
-		// must pass either a container or pane element
-		var $pane = $.layout.getParentPaneElem(el);
-		return $pane ? $pane.data("layoutPane") : null;
-	}
-
-,	getParentLayoutInstance: function (el) {
-		// must pass either a container or pane element
-		var $pane = $.layout.getParentPaneElem(el);
-		return $pane ? $pane.data("parentLayout") : null;
-	}
-
-,	getEventObject: function (evt) {
-		return typeof evt === "object" && evt.stopPropagation ? evt : null;
-	}
-,	parsePaneName: function (evt_or_pane) {
-		var evt = $.layout.getEventObject( evt_or_pane )
-		,	pane = evt_or_pane;
-		if (evt) {
-			// ALWAYS stop propagation of events triggered in Layout!
-			evt.stopPropagation();
-			pane = $(this).data("layoutEdge");
-		}
-		if (pane && !/^(west|east|north|south|center)$/.test(pane)) {
-			$.layout.msg('LAYOUT ERROR - Invalid pane-name: "'+ pane +'"');
-			pane = "error";
-		}
-		return pane;
-	}
-
-
-	// LAYOUT-PLUGIN REGISTRATION
-	// more plugins can added beyond this default list
-,	plugins: {
-		draggable:		!!$.fn.draggable // resizing
-	,	effects: {
-			core:		!!$.effects		// animimations (specific effects tested by initOptions)
-		,	slide:		$.effects && ($.effects.slide || ($.effects.effect && $.effects.effect.slide)) // default effect
-		}
-	}
-
-//	arrays of plugin or other methods to be triggered for events in *each layout* - will be passed 'Instance'
-,	onCreate:	[]	// runs when layout is just starting to be created - right after options are set
-,	onLoad:		[]	// runs after layout container and global events init, but before initPanes is called
-,	onReady:	[]	// runs after initialization *completes* - ie, after initPanes completes successfully
-,	onDestroy:	[]	// runs after layout is destroyed
-,	onUnload:	[]	// runs after layout is destroyed OR when page unloads
-,	afterOpen:	[]	// runs after setAsOpen() completes
-,	afterClose:	[]	// runs after setAsClosed() completes
-
-	/*
-	*	GENERIC UTILITY METHODS
-	*/
-
-	// calculate and return the scrollbar width, as an integer
-,	scrollbarWidth:		function () { return window.scrollbarWidth  || $.layout.getScrollbarSize('width'); }
-,	scrollbarHeight:	function () { return window.scrollbarHeight || $.layout.getScrollbarSize('height'); }
-,	getScrollbarSize:	function (dim) {
-		var $c	= $('<div style="position: absolute; top: -10000px; left: -10000px; width: 100px; height: 100px; overflow: scroll;"></div>').appendTo("body");
-		var d	= { width: $c.css("width") - $c[0].clientWidth, height: $c.height() - $c[0].clientHeight };
-		$c.remove();
-		window.scrollbarWidth	= d.width;
-		window.scrollbarHeight	= d.height;
-		return dim.match(/^(width|height)$/) ? d[dim] : d;
-	}
-
-
-	/**
-	* Returns hash container 'display' and 'visibility'
-	*
-	* @see	$.swap() - swaps CSS, runs callback, resets CSS
-	* @param  {!Object}		$E				jQuery element
-	* @param  {boolean=}	[force=false]	Run even if display != none
-	* @return {!Object}						Returns current style props, if applicable
-	*/
-,	showInvisibly: function ($E, force) {
-		if ($E && $E.length && (force || $E.css("display") === "none")) { // only if not *already hidden*
-			var s = $E[0].style
-				// save ONLY the 'style' props because that is what we must restore
-			,	CSS = { display: s.display || '', visibility: s.visibility || '' };
-			// show element 'invisibly' so can be measured
-			$E.css({ display: "block", visibility: "hidden" });
-			return CSS;
-		}
-		return {};
-	}
-
-	/**
-	* Returns data for setting size of an element (container or a pane).
-	*
-	* @see  _create(), onWindowResize() for container, plus others for pane
-	* @return JSON  Returns a hash of all dimensions: top, bottom, left, right, outerWidth, innerHeight, etc
-	*/
-,	getElementDimensions: function ($E, inset) {
-		var
-		//	dimensions hash - start with current data IF passed
-			d	= { css: {}, inset: {} }
-		,	x	= d.css			// CSS hash
-		,	i	= { bottom: 0 }	// TEMP insets (bottom = complier hack)
-		,	N	= $.layout.cssNum
-		,	off = $E.offset()
-		,	b, p, ei			// TEMP border, padding
-		;
-		d.offsetLeft = off.left;
-		d.offsetTop  = off.top;
-
-		if (!inset) inset = {}; // simplify logic below
-
-		$.each("Left,Right,Top,Bottom".split(","), function (idx, e) { // e = edge
-			b = x["border" + e] = $.layout.borderWidth($E, e);
-			p = x["padding"+ e] = $.layout.cssNum($E, "padding"+e);
-			ei = e.toLowerCase();
-			d.inset[ei] = inset[ei] >= 0 ? inset[ei] : p; // any missing insetX value = paddingX
-			i[ei] = d.inset[ei] + b; // total offset of content from outer side
-		});
-
-		x.width		= $E.width();
-		x.height	= $E.height();
-		x.top		= N($E,"top",true);
-		x.bottom	= N($E,"bottom",true);
-		x.left		= N($E,"left",true);
-		x.right		= N($E,"right",true);
-
-		d.outerWidth	= $E.outerWidth();
-		d.outerHeight	= $E.outerHeight();
-		// calc the TRUE inner-dimensions, even in quirks-mode!
-		d.innerWidth	= max(0, d.outerWidth  - i.left - i.right);
-		d.innerHeight	= max(0, d.outerHeight - i.top  - i.bottom);
-		// layoutWidth/Height is used in calcs for manual resizing
-		// layoutW/H only differs from innerW/H when in quirks-mode - then is like outerW/H
-		d.layoutWidth	= $E.innerWidth();
-		d.layoutHeight	= $E.innerHeight();
-
-		//if ($E.prop('tagName') === 'BODY') { debugData( d, $E.prop('tagName') ); } // DEBUG
-
-		//d.visible	= $E.is(":visible");// && x.width > 0 && x.height > 0;
-
-		return d;
-	}
-
-,	getElementStyles: function ($E, list) {
-		var
-			CSS	= {}
-		,	style	= $E[0].style
-		,	props	= list.split(",")
-		,	sides	= "Top,Bottom,Left,Right".split(",")
-		,	attrs	= "Color,Style,Width".split(",")
-		,	p, s, a, i, j, k
-		;
-		for (i=0; i < props.length; i++) {
-			p = props[i];
-			if (p.match(/(border|padding|margin)$/))
-				for (j=0; j < 4; j++) {
-					s = sides[j];
-					if (p === "border")
-						for (k=0; k < 3; k++) {
-							a = attrs[k];
-							CSS[p+s+a] = style[p+s+a];
-						}
-					else
-						CSS[p+s] = style[p+s];
-				}
-			else
-				CSS[p] = style[p];
-		};
-		return CSS
-	}
-
-	/**
-	* Return the innerWidth for the current browser/doctype
-	*
-	* @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	* @param  {Array.<Object>}	$E  Must pass a jQuery object - first element is processed
-	* @param  {number=}			outerWidth (optional) Can pass a width, allowing calculations BEFORE element is resized
-	* @return {number}			Returns the innerWidth of the elem by subtracting padding and borders
-	*/
-,	cssWidth: function ($E, outerWidth) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerWidth <= 0) return 0;
-
-		var bs	= !$.layout.browser.boxModel ? "border-box" : $.support.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	W	= outerWidth
-		;
-		// strip border and/or padding from outerWidth to get CSS Width
-		if (bs !== "border-box")
-			W -= (b($E, "Left") + b($E, "Right"));
-		if (bs === "content-box")
-			W -= (n($E, "paddingLeft") + n($E, "paddingRight"));
-		return max(0,W);
-	}
-
-	/**
-	* Return the innerHeight for the current browser/doctype
-	*
-	* @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
-	* @param  {Array.<Object>}	$E  Must pass a jQuery object - first element is processed
-	* @param  {number=}			outerHeight  (optional) Can pass a width, allowing calculations BEFORE element is resized
-	* @return {number}			Returns the innerHeight of the elem by subtracting padding and borders
-	*/
-,	cssHeight: function ($E, outerHeight) {
-		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
-		if (outerHeight <= 0) return 0;
-
-		var bs	= !$.layout.browser.boxModel ? "border-box" : $.support.boxSizing ? $E.css("boxSizing") : "content-box"
-		,	b	= $.layout.borderWidth
-		,	n	= $.layout.cssNum
-		,	H	= outerHeight
-		;
-		// strip border and/or padding from outerHeight to get CSS Height
-		if (bs !== "border-box")
-			H -= (b($E, "Top") + b($E, "Bottom"));
-		if (bs === "content-box")
-			H -= (n($E, "paddingTop") + n($E, "paddingBottom"));
-		return max(0,H);
-	}
-
-	/**
-	* Returns the 'current CSS numeric value' for a CSS property - 0 if property does not exist
-	*
-	* @see  Called by many methods
-	* @param {Array.<Object>}	$E					Must pass a jQuery object - first element is processed
-	* @param {string}			prop				The name of the CSS property, eg: top, width, etc.
-	* @param {boolean=}			[allowAuto=false]	true = return 'auto' if that is value; false = return 0
-	* @return {(string|number)}						Usually used to get an integer value for position (top, left) or size (height, width)
-	*/
-,	cssNum: function ($E, prop, allowAuto) {
-		if (!$E.jquery) $E = $($E);
-		var CSS = $.layout.showInvisibly($E)
-		,	p	= $.css($E[0], prop, true)
-		,	v	= allowAuto && p=="auto" ? p : Math.round(parseFloat(p) || 0);
-		$E.css( CSS ); // RESET
-		return v;
-	}
-
-,	borderWidth: function (el, side) {
-		if (el.jquery) el = el[0];
-		var b = "border"+ side.substr(0,1).toUpperCase() + side.substr(1); // left => Left
-		return $.css(el, b+"Style", true) === "none" ? 0 : Math.round(parseFloat($.css(el, b+"Width", true)) || 0);
-	}
-
-	/**
-	* Mouse-tracking utility - FUTURE REFERENCE
-	*
-	* init: if (!window.mouse) {
-	*			window.mouse = { x: 0, y: 0 };
-	*			$(document).mousemove( $.layout.trackMouse );
-	*		}
-	*
-	* @param {Object}		evt
-	*
-,	trackMouse: function (evt) {
-		window.mouse = { x: evt.clientX, y: evt.clientY };
-	}
-	*/
-
-	/**
-	* SUBROUTINE for preventPrematureSlideClose option
-	*
-	* @param {Object}		evt
-	* @param {Object=}		el
-	*/
-,	isMouseOverElem: function (evt, el) {
-		var
-			$E	= $(el || this)
-		,	d	= $E.offset()
-		,	T	= d.top
-		,	L	= d.left
-		,	R	= L + $E.outerWidth()
-		,	B	= T + $E.outerHeight()
-		,	x	= evt.pageX	// evt.clientX ?
-		,	y	= evt.pageY	// evt.clientY ?
-		;
-		// if X & Y are < 0, probably means is over an open SELECT
-		return ($.layout.browser.msie && x < 0 && y < 0) || ((x >= L && x <= R) && (y >= T && y <= B));
-	}
-
-	/**
-	* Message/Logging Utility
-	*
-	* @example $.layout.msg("My message");				// log text
-	* @example $.layout.msg("My message", true);		// alert text
-	* @example $.layout.msg({ foo: "bar" }, "Title");	// log hash-data, with custom title
-	* @example $.layout.msg({ foo: "bar" }, true, "Title", { sort: false }); -OR-
-	* @example $.layout.msg({ foo: "bar" }, "Title", { sort: false, display: true }); // alert hash-data
-	*
-	* @param {(Object|string)}			info			String message OR Hash/Array
-	* @param {(Boolean|string|Object)=}	[popup=false]	True means alert-box - can be skipped
-	* @param {(Object|string)=}			[debugTitle=""]	Title for Hash data - can be skipped
-	* @param {Object=}					[debugOpts]		Extra options for debug output
-	*/
-,	msg: function (info, popup, debugTitle, debugOpts) {
-		if ($.isPlainObject(info) && window.debugData) {
-			if (typeof popup === "string") {
-				debugOpts	= debugTitle;
-				debugTitle	= popup;
-			}
-			else if (typeof debugTitle === "object") {
-				debugOpts	= debugTitle;
-				debugTitle	= null;
-			}
-			var t = debugTitle || "log( <object> )"
-			,	o = $.extend({ sort: false, returnHTML: false, display: false }, debugOpts);
-			if (popup === true || o.display)
-				debugData( info, t, o );
-			else if (window.console)
-				console.log(debugData( info, t, o ));
-		}
-		else if (popup)
-			alert(info);
-		else if (window.console)
-			console.log(info);
-		else {
-			var id	= "#layoutLogger"
-			,	$l = $(id);
-			if (!$l.length)
-				$l = createLog();
-			$l.children("ul").append('<li style="padding: 4px 10px; margin: 0; border-top: 1px solid #CCC;">'+ info.replace(/\</g,"&lt;").replace(/\>/g,"&gt;") +'</li>');
-		}
-
-		function createLog () {
-			var pos = $.support.fixedPosition ? 'fixed' : 'absolute'
-			,	$e = $('<div id="layoutLogger" style="position: '+ pos +'; top: 5px; z-index: 999999; max-width: 25%; overflow: hidden; border: 1px solid #000; border-radius: 5px; background: #FBFBFB; box-shadow: 0 2px 10px rgba(0,0,0,0.3);">'
-				+	'<div style="font-size: 13px; font-weight: bold; padding: 5px 10px; background: #F6F6F6; border-radius: 5px 5px 0 0; cursor: move;">'
-				+	'<span style="float: right; padding-left: 7px; cursor: pointer;" title="Remove Console" onclick="$(this).closest(\'#layoutLogger\').remove()">X</span>Layout console.log</div>'
-				+	'<ul style="font-size: 13px; font-weight: none; list-style: none; margin: 0; padding: 0 0 2px;"></ul>'
-				+ '</div>'
-				).appendTo("body");
-			$e.css('left', $(window).width() - $e.outerWidth() - 5)
-			if ($.ui.draggable) $e.draggable({ handle: ':first-child' });
-			return $e;
-		};
-	}
-
-};
-
-
-/*
- *	$.layout.browser REPLACES removed $.browser, with extra data
- *	Parsing code here adapted from jQuery 1.8 $.browse
- */
-var u = navigator.userAgent.toLowerCase()
-,	m = /(chrome)[ \/]([\w.]+)/.exec( u )
-	||	/(webkit)[ \/]([\w.]+)/.exec( u )
-	||	/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( u )
-	||	/(msie) ([\w.]+)/.exec( u )
-	||	u.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( u )
-	||	[]
-,	b = m[1] || ""
-,	v = m[2] || 0
-,	ie = b === "msie"
-;
-$.layout.browser = {
-	version:	v
-,	safari:		b === "webkit"	// webkit (NOT chrome) = safari
-,	webkit:		b === "chrome"	// chrome = webkit
-,	msie:		ie
-,	isIE6:		ie && v == 6
-	// ONLY IE reverts to old box-model - update for older jQ onReady
-,	boxModel:	!ie || $.support.boxModel !== false
-};
-if (b) $.layout.browser[b] = true; // set CURRENT browser
-/*	OLD versions of jQuery only set $.support.boxModel after page is loaded
- *	so if this is IE, use support.boxModel to test for quirks-mode (ONLY IE changes boxModel) */
-if (ie) $(function(){ $.layout.browser.boxModel = $.support.boxModel; });
-
-
-// DEFAULT OPTIONS
-$.layout.defaults = {
-/*
- *	LAYOUT & LAYOUT-CONTAINER OPTIONS
- *	- none of these options are applicable to individual panes
- */
-	name:						""			// Not required, but useful for buttons and used for the state-cookie
-,	containerClass:				"ui-layout-container" // layout-container element
-,	inset:						null		// custom container-inset values (override padding)
-,	scrollToBookmarkOnLoad:		true		// after creating a layout, scroll to bookmark in URL (.../page.htm#myBookmark)
-,	resizeWithWindow:			true		// bind thisLayout.resizeAll() to the window.resize event
-,	resizeWithWindowDelay:		200			// delay calling resizeAll because makes window resizing very jerky
-,	resizeWithWindowMaxDelay:	0			// 0 = none - force resize every XX ms while window is being resized
-,	maskPanesEarly:				false		// true = create pane-masks on resizer.mouseDown instead of waiting for resizer.dragstart
-,	onresizeall_start:			null		// CALLBACK when resizeAll() STARTS	- NOT pane-specific
-,	onresizeall_end:			null		// CALLBACK when resizeAll() ENDS	- NOT pane-specific
-,	onload_start:				null		// CALLBACK when Layout inits - after options initialized, but before elements
-,	onload_end:					null		// CALLBACK when Layout inits - after EVERYTHING has been initialized
-,	onunload_start:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	onunload_end:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
-,	initPanes:					true		// false = DO NOT initialize the panes onLoad - will init later
-,	showErrorMessages:			true		// enables fatal error messages to warn developers of common errors
-,	showDebugMessages:			false		// display console-and-alert debug msgs - IF this Layout version _has_ debugging code!
-//	Changing this zIndex value will cause other zIndex values to automatically change
-,	zIndex:						null		// the PANE zIndex - resizers and masks will be +1
-//	DO NOT CHANGE the zIndex values below unless you clearly understand their relationships
-,	zIndexes: {								// set _default_ z-index values here...
-		pane_normal:			0			// normal z-index for panes
-	,	content_mask:			1			// applied to overlays used to mask content INSIDE panes during resizing
-	,	resizer_normal:			2			// normal z-index for resizer-bars
-	,	pane_sliding:			100			// applied to *BOTH* the pane and its resizer when a pane is 'slid open'
-	,	pane_animate:			1000		// applied to the pane when being animated - not applied to the resizer
-	,	resizer_drag:			10000		// applied to the CLONED resizer-bar when being 'dragged'
-	}
-,	errors: {
-		pane:					"pane"		// description of "layout pane element" - used only in error messages
-	,	selector:				"selector"	// description of "jQuery-selector" - used only in error messages
-	,	addButtonError:			"Error Adding Button\nInvalid "
-	,	containerMissing:		"UI Layout Initialization Error\nThe specified layout-container does not exist."
-	,	centerPaneMissing:		"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element."
-	,	noContainerHeight:		"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!"
-	,	callbackError:			"UI Layout Callback Error\nThe EVENT callback is not a valid function."
-	}
-/*
- *	PANE DEFAULT SETTINGS
- *	- settings under the 'panes' key become the default settings for *all panes*
- *	- ALL pane-options can also be set specifically for each panes, which will override these 'default values'
- */
-,	panes: { // default options for 'all panes' - will be overridden by 'per-pane settings'
-		applyDemoStyles: 		false		// NOTE: renamed from applyDefaultStyles for clarity
-	,	closable:				true		// pane can open & close
-	,	resizable:				true		// when open, pane can be resized 
-	,	slidable:				true		// when closed, pane can 'slide open' over other panes - closes on mouse-out
-	,	initClosed:				false		// true = init pane as 'closed'
-	,	initHidden: 			false 		// true = init pane as 'hidden' - no resizer-bar/spacing
-	//	SELECTORS
-	//,	paneSelector:			""			// MUST be pane-specific - jQuery selector for pane
-	,	contentSelector:		".ui-layout-content" // INNER div/element to auto-size so only it scrolls, not the entire pane!
-	,	contentIgnoreSelector:	".ui-layout-ignore"	// element(s) to 'ignore' when measuring 'content'
-	,	findNestedContent:		false		// true = $P.find(contentSelector), false = $P.children(contentSelector)
-	//	GENERIC ROOT-CLASSES - for auto-generated classNames
-	,	paneClass:				"ui-layout-pane"	// Layout Pane
-	,	resizerClass:			"ui-layout-resizer"	// Resizer Bar
-	,	togglerClass:			"ui-layout-toggler"	// Toggler Button
-	,	buttonClass:			"ui-layout-button"	// CUSTOM Buttons	- eg: '[ui-layout-button]-toggle/-open/-close/-pin'
-	//	ELEMENT SIZE & SPACING
-	//,	size:					100			// MUST be pane-specific -initial size of pane
-	,	minSize:				0			// when manually resizing a pane
-	,	maxSize:				0			// ditto, 0 = no limit
-	,	spacing_open:			6			// space between pane and adjacent panes - when pane is 'open'
-	,	spacing_closed:			6			// ditto - when pane is 'closed'
-	,	togglerLength_open:		50			// Length = WIDTH of toggler button on north/south sides - HEIGHT on east/west sides
-	,	togglerLength_closed: 	50			// 100% OR -1 means 'full height/width of resizer bar' - 0 means 'hidden'
-	,	togglerAlign_open:		"center"	// top/left, bottom/right, center, OR...
-	,	togglerAlign_closed:	"center"	// 1 => nn = offset from top/left, -1 => -nn == offset from bottom/right
-	,	togglerContent_open:	""			// text or HTML to put INSIDE the toggler
-	,	togglerContent_closed:	""			// ditto
-	//	RESIZING OPTIONS
-	,	resizerDblClickToggle:	true		// 
-	,	autoResize:				true		// IF size is 'auto' or a percentage, then recalc 'pixel size' whenever the layout resizes
-	,	autoReopen:				true		// IF a pane was auto-closed due to noRoom, reopen it when there is room? False = leave it closed
-	,	resizerDragOpacity:		1			// option for ui.draggable
-	//,	resizerCursor:			""			// MUST be pane-specific - cursor when over resizer-bar
-	,	maskContents:			false		// true = add DIV-mask over-or-inside this pane so can 'drag' over IFRAMES
-	,	maskObjects:			false		// true = add IFRAME-mask over-or-inside this pane to cover objects/applets - content-mask will overlay this mask
-	,	maskZindex:				null		// will override zIndexes.content_mask if specified - not applicable to iframe-panes
-	,	resizingGrid:			false		// grid size that the resizers will snap-to during resizing, eg: [20,20]
-	,	livePaneResizing:		false		// true = LIVE Resizing as resizer is dragged
-	,	liveContentResizing:	false		// true = re-measure header/footer heights as resizer is dragged
-	,	liveResizingTolerance:	1			// how many px change before pane resizes, to control performance
-	//	SLIDING OPTIONS
-	,	sliderCursor:			"pointer"	// cursor when resizer-bar will trigger 'sliding'
-	,	slideTrigger_open:		"click"		// click, dblclick, mouseenter
-	,	slideTrigger_close:		"mouseleave"// click, mouseleave
-	,	slideDelay_open:		300			// applies only for mouseenter event - 0 = instant open
-	,	slideDelay_close:		300			// applies only for mouseleave event (300ms is the minimum!)
-	,	hideTogglerOnSlide:		false		// when pane is slid-open, should the toggler show?
-	,	preventQuickSlideClose:	$.layout.browser.webkit // Chrome triggers slideClosed as it is opening
-	,	preventPrematureSlideClose: false	// handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-	//	PANE-SPECIFIC TIPS & MESSAGES
-	,	tips: {
-			Open:				"Open"		// eg: "Open Pane"
-		,	Close:				"Close"
-		,	Resize:				"Resize"
-		,	Slide:				"Slide Open"
-		,	Pin:				"Pin"
-		,	Unpin:				"Un-Pin"
-		,	noRoomToOpen:		"Not enough room to show this panel."	// alert if user tries to open a pane that cannot
-		,	minSizeWarning:		"Panel has reached its minimum size"	// displays in browser statusbar
-		,	maxSizeWarning:		"Panel has reached its maximum size"	// ditto
-		}
-	//	HOT-KEYS & MISC
-	,	showOverflowOnHover:	false		// will bind allowOverflow() utility to pane.onMouseOver
-	,	enableCursorHotkey:		true		// enabled 'cursor' hotkeys
-	//,	customHotkey:			""			// MUST be pane-specific - EITHER a charCode OR a character
-	,	customHotkeyModifier:	"SHIFT"		// either 'SHIFT', 'CTRL' or 'CTRL+SHIFT' - NOT 'ALT'
-	//	PANE ANIMATION
-	//	NOTE: fxSss_open, fxSss_close & fxSss_size options (eg: fxName_open) are auto-generated if not passed
-	,	fxName:					"slide" 	// ('none' or blank), slide, drop, scale -- only relevant to 'open' & 'close', NOT 'size'
-	,	fxSpeed:				null		// slow, normal, fast, 200, nnn - if passed, will OVERRIDE fxSettings.duration
-	,	fxSettings:				{}			// can be passed, eg: { easing: "easeOutBounce", duration: 1500 }
-	,	fxOpacityFix:			true		// tries to fix opacity in IE to restore anti-aliasing after animation
-	,	animatePaneSizing:		false		// true = animate resizing after dragging resizer-bar OR sizePane() is called
-	/*  NOTE: Action-specific FX options are auto-generated from the options above if not specifically set:
-		fxName_open:			"slide"		// 'Open' pane animation
-		fnName_close:			"slide"		// 'Close' pane animation
-		fxName_size:			"slide"		// 'Size' pane animation - when animatePaneSizing = true
-		fxSpeed_open:			null
-		fxSpeed_close:			null
-		fxSpeed_size:			null
-		fxSettings_open:		{}
-		fxSettings_close:		{}
-		fxSettings_size:		{}
-	*/
-	//	CHILD/NESTED LAYOUTS
-	,	children:				null		// Layout-options for nested/child layout - even {} is valid as options
-	,	containerSelector:		''			// if child is NOT 'directly nested', a selector to find it/them (can have more than one child layout!)
-	,	initChildren:			true		// true = child layout will be created as soon as _this_ layout completes initialization
-	,	destroyChildren:		true		// true = destroy child-layout if this pane is destroyed
-	,	resizeChildren:			true		// true = trigger child-layout.resizeAll() when this pane is resized
-	//	EVENT TRIGGERING
-	,	triggerEventsOnLoad:	false		// true = trigger onopen OR onclose callbacks when layout initializes
-	,	triggerEventsDuringLiveResize: true	// true = trigger onresize callback REPEATEDLY if livePaneResizing==true
-	//	PANE CALLBACKS
-	,	onshow_start:			null		// CALLBACK when pane STARTS to Show	- BEFORE onopen/onhide_start
-	,	onshow_end:				null		// CALLBACK when pane ENDS being Shown	- AFTER  onopen/onhide_end
-	,	onhide_start:			null		// CALLBACK when pane STARTS to Close	- BEFORE onclose_start
-	,	onhide_end:				null		// CALLBACK when pane ENDS being Closed	- AFTER  onclose_end
-	,	onopen_start:			null		// CALLBACK when pane STARTS to Open
-	,	onopen_end:				null		// CALLBACK when pane ENDS being Opened
-	,	onclose_start:			null		// CALLBACK when pane STARTS to Close
-	,	onclose_end:			null		// CALLBACK when pane ENDS being Closed
-	,	onresize_start:			null		// CALLBACK when pane STARTS being Resized ***FOR ANY REASON***
-	,	onresize_end:			null		// CALLBACK when pane ENDS being Resized ***FOR ANY REASON***
-	,	onsizecontent_start:	null		// CALLBACK when sizing of content-element STARTS
-	,	onsizecontent_end:		null		// CALLBACK when sizing of content-element ENDS
-	,	onswap_start:			null		// CALLBACK when pane STARTS to Swap
-	,	onswap_end:				null		// CALLBACK when pane ENDS being Swapped
-	,	ondrag_start:			null		// CALLBACK when pane STARTS being ***MANUALLY*** Resized
-	,	ondrag_end:				null		// CALLBACK when pane ENDS being ***MANUALLY*** Resized
-	}
-/*
- *	PANE-SPECIFIC SETTINGS
- *	- options listed below MUST be specified per-pane - they CANNOT be set under 'panes'
- *	- all options under the 'panes' key can also be set specifically for any pane
- *	- most options under the 'panes' key apply only to 'border-panes' - NOT the the center-pane
- */
-,	north: {
-		paneSelector:			".ui-layout-north"
-	,	size:					"auto"		// eg: "auto", "30%", .30, 200
-	,	resizerCursor:			"n-resize"	// custom = url(myCursor.cur)
-	,	customHotkey:			""			// EITHER a charCode (43) OR a character ("o")
-	}
-,	south: {
-		paneSelector:			".ui-layout-south"
-	,	size:					"auto"
-	,	resizerCursor:			"s-resize"
-	,	customHotkey:			""
-	}
-,	east: {
-		paneSelector:			".ui-layout-east"
-	,	size:					200
-	,	resizerCursor:			"e-resize"
-	,	customHotkey:			""
-	}
-,	west: {
-		paneSelector:			".ui-layout-west"
-	,	size:					200
-	,	resizerCursor:			"w-resize"
-	,	customHotkey:			""
-	}
-,	center: {
-		paneSelector:			".ui-layout-center"
-	,	minWidth:				0
-	,	minHeight:				0
-	}
-};
-
-$.layout.optionsMap = {
-	// layout/global options - NOT pane-options
-	layout: ("name,instanceKey,stateManagement,effects,inset,zIndexes,errors,"
-	+	"zIndex,scrollToBookmarkOnLoad,showErrorMessages,maskPanesEarly,"
-	+	"outset,resizeWithWindow,resizeWithWindowDelay,resizeWithWindowMaxDelay,"
-	+	"onresizeall,onresizeall_start,onresizeall_end,onload,onload_start,onload_end,onunload,onunload_start,onunload_end").split(",")
-//	borderPanes: [ ALL options that are NOT specified as 'layout' ]
-	// default.panes options that apply to the center-pane (most options apply _only_ to border-panes)
-,	center: ("paneClass,contentSelector,contentIgnoreSelector,findNestedContent,applyDemoStyles,triggerEventsOnLoad,"
-	+	"showOverflowOnHover,maskContents,maskObjects,liveContentResizing,"
-	+	"containerSelector,children,initChildren,resizeChildren,destroyChildren,"
-	+	"onresize,onresize_start,onresize_end,onsizecontent,onsizecontent_start,onsizecontent_end").split(",")
-	// options that MUST be specifically set 'per-pane' - CANNOT set in the panes (defaults) key
-,	noDefault: ("paneSelector,resizerCursor,customHotkey").split(",")
-};
-
-/**
- * Processes options passed in converts flat-format data into subkey (JSON) format
- * In flat-format, subkeys are _currently_ separated with 2 underscores, like north__optName
- * Plugins may also call this method so they can transform their own data
- *
- * @param  {!Object}	hash			Data/options passed by user - may be a single level or nested levels
- * @param  {boolean=}	[addKeys=false]	Should the primary layout.options keys be added if they do not exist?
- * @return {Object}						Returns hash of minWidth & minHeight
- */
-$.layout.transformData = function (hash, addKeys) {
-	var	json = addKeys ? { panes: {}, center: {} } : {} // init return object
-	,	branch, optKey, keys, key, val, i, c;
-
-	if (typeof hash !== "object") return json; // no options passed
-
-	// convert all 'flat-keys' to 'sub-key' format
-	for (optKey in hash) {
-		branch	= json;
-		val		= hash[ optKey ];
-		keys	= optKey.split("__"); // eg: west__size or north__fxSettings__duration
-		c		= keys.length - 1;
-		// convert underscore-delimited to subkeys
-		for (i=0; i <= c; i++) {
-			key = keys[i];
-			if (i === c) {	// last key = value
-				if ($.isPlainObject( val ))
-					branch[key] = $.layout.transformData( val ); // RECURSE
-				else
-					branch[key] = val;
-			}
-			else {
-				if (!branch[key])
-					branch[key] = {}; // create the subkey
-				// recurse to sub-key for next loop - if not done
-				branch = branch[key];
-			}
-		}
-	}
-	return json;
-};
-
-// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
-$.layout.backwardCompatibility = {
-	// data used by renameOldOptions()
-	map: {
-	//	OLD Option Name:			NEW Option Name
-		applyDefaultStyles:			"applyDemoStyles"
-	//	CHILD/NESTED LAYOUTS
-	,	childOptions:				"children"
-	,	initChildLayout:			"initChildren"
-	,	destroyChildLayout:			"destroyChildren"
-	,	resizeChildLayout:			"resizeChildren"
-	,	resizeNestedLayout:			"resizeChildren"
-	//	MISC Options
-	,	resizeWhileDragging:		"livePaneResizing"
-	,	resizeContentWhileDragging:	"liveContentResizing"
-	,	triggerEventsWhileDragging:	"triggerEventsDuringLiveResize"
-	,	maskIframesOnResize:		"maskContents"
-	//	STATE MANAGEMENT
-	,	useStateCookie:				"stateManagement.enabled"
-	,	"cookie.autoLoad":			"stateManagement.autoLoad"
-	,	"cookie.autoSave":			"stateManagement.autoSave"
-	,	"cookie.keys":				"stateManagement.stateKeys"
-	,	"cookie.name":				"stateManagement.cookie.name"
-	,	"cookie.domain":			"stateManagement.cookie.domain"
-	,	"cookie.path":				"stateManagement.cookie.path"
-	,	"cookie.expires":			"stateManagement.cookie.expires"
-	,	"cookie.secure":			"stateManagement.cookie.secure"
-	//	OLD Language options
-	,	noRoomToOpenTip:			"tips.noRoomToOpen"
-	,	togglerTip_open:			"tips.Close"	// open   = Close
-	,	togglerTip_closed:			"tips.Open"		// closed = Open
-	,	resizerTip:					"tips.Resize"
-	,	sliderTip:					"tips.Slide"
-	}
-
-/**
-* @param {Object}	opts
-*/
-,	renameOptions: function (opts) {
-		var map = $.layout.backwardCompatibility.map
-		,	oldData, newData, value
-		;
-		for (var itemPath in map) {
-			oldData	= getBranch( itemPath );
-			value	= oldData.branch[ oldData.key ];
-			if (value !== undefined) {
-				newData = getBranch( map[itemPath], true );
-				newData.branch[ newData.key ] = value;
-				delete oldData.branch[ oldData.key ];
-			}
-		}
-
-		/**
-		* @param {string}	path
-		* @param {boolean=}	[create=false]	Create path if does not exist
-		*/
-		function getBranch (path, create) {
-			var a = path.split(".") // split keys into array
-			,	c = a.length - 1
-			,	D = { branch: opts, key: a[c] } // init branch at top & set key (last item)
-			,	i = 0, k, undef;
-			for (; i<c; i++) { // skip the last key (data)
-				k = a[i];
-				if (D.branch[ k ] == undefined) { // child-key does not exist
-					if (create) {
-						D.branch = D.branch[ k ] = {}; // create child-branch
-					}
-					else // can't go any farther
-						D.branch = {}; // branch is undefined
-				}
-				else
-					D.branch = D.branch[ k ]; // get child-branch
-			}
-			return D;
-		};
-	}
-
-/**
-* @param {Object}	opts
-*/
-,	renameAllOptions: function (opts) {
-		var ren = $.layout.backwardCompatibility.renameOptions;
-		// rename root (layout) options
-		ren( opts );
-		// rename 'defaults' to 'panes'
-		if (opts.defaults) {
-			if (typeof opts.panes !== "object")
-				opts.panes = {};
-			$.extend(true, opts.panes, opts.defaults);
-			delete opts.defaults;
-		}
-		// rename options in the the options.panes key
-		if (opts.panes) ren( opts.panes );
-		// rename options inside *each pane key*, eg: options.west
-		$.each($.layout.config.allPanes, function (i, pane) {
-			if (opts[pane]) ren( opts[pane] );
-		});	
-		return opts;
-	}
-};
-
-
-
-
-/*	============================================================
- *	BEGIN WIDGET: $( selector ).layout( {options} );
- *	============================================================
- */
-$.fn.layout = function (opts) {
-	var
-
-	// local aliases to global data
-	browser	= $.layout.browser
-,	_c		= $.layout.config
-
-	// local aliases to utlity methods
-,	cssW	= $.layout.cssWidth
-,	cssH	= $.layout.cssHeight
-,	elDims	= $.layout.getElementDimensions
-,	styles	= $.layout.getElementStyles
-,	evtObj	= $.layout.getEventObject
-,	evtPane	= $.layout.parsePaneName
-
-/**
- * options - populated by initOptions()
- */
-,	options = $.extend(true, {}, $.layout.defaults)
-,	effects	= options.effects = $.extend(true, {}, $.layout.effects)
-
-/**
- * layout-state object
- */
-,	state = {
-		// generate unique ID to use for event.namespace so can unbind only events added by 'this layout'
-		id:				"layout"+ $.now()	// code uses alias: sID
-	,	initialized:	false
-	,	paneResizing:	false
-	,	panesSliding:	{}
-	,	container:	{ 	// list all keys referenced in code to avoid compiler error msgs
-			innerWidth:		0
-		,	innerHeight:	0
-		,	outerWidth:		0
-		,	outerHeight:	0
-		,	layoutWidth:	0
-		,	layoutHeight:	0
-		}
-	,	north:		{ childIdx: 0 }
-	,	south:		{ childIdx: 0 }
-	,	east:		{ childIdx: 0 }
-	,	west:		{ childIdx: 0 }
-	,	center:		{ childIdx: 0 }
-	}
-
-/**
- * parent/child-layout pointers
- */
-//,	hasParentLayout	= false	- exists ONLY inside Instance so can be set externally
-,	children = {
-		north:		null
-	,	south:		null
-	,	east:		null
-	,	west:		null
-	,	center:		null
-	}
-
-/*
- * ###########################
- *  INTERNAL HELPER FUNCTIONS
- * ###########################
- */
-
-	/**
-	* Manages all internal timers
-	*/
-,	timer = {
-		data:	{}
-	,	set:	function (s, fn, ms) { timer.clear(s); timer.data[s] = setTimeout(fn, ms); }
-	,	clear:	function (s) { var t=timer.data; if (t[s]) {clearTimeout(t[s]); delete t[s];} }
-	}
-
-	/**
-	* Alert or console.log a message - IF option is enabled.
-	*
-	* @param {(string|!Object)}	msg				Message (or debug-data) to display
-	* @param {boolean=}			[popup=false]	True by default, means 'alert', false means use console.log
-	* @param {boolean=}			[debug=false]	True means is a widget debugging message
-	*/
-,	_log = function (msg, popup, debug) {
-		var o = options;
-		if ((o.showErrorMessages && !debug) || (debug && o.showDebugMessages))
-			$.layout.msg( o.name +' / '+ msg, (popup !== false) );
-		return false;
-	}
-
-	/**
-	* Executes a Callback function after a trigger event, like resize, open or close
-	*
-	* @param {string}				evtName					Name of the layout callback, eg "onresize_start"
-	* @param {(string|boolean)=}	[pane=""]				This is passed only so we can pass the 'pane object' to the callback
-	* @param {(string|boolean)=}	[skipBoundEvents=false]	True = do not run events bound to the elements - only the callbacks set in options
-	*/
-,	_runCallbacks = function (evtName, pane, skipBoundEvents) {
-		var	hasPane	= pane && isStr(pane)
-		,	s		= hasPane ? state[pane] : state
-		,	o		= hasPane ? options[pane] : options
-		,	lName	= options.name
-			// names like onopen and onopen_end separate are interchangeable in options...
-		,	lng		= evtName + (evtName.match(/_/) ? "" : "_end")
-		,	shrt	= lng.match(/_end$/) ? lng.substr(0, lng.length - 4) : ""
-		,	fn		= o[lng] || o[shrt]
-		,	retVal	= "NC" // NC = No Callback
-		,	args	= []
-		,	$P
-		;
-		if ( !hasPane && $.type(pane) === 'boolean' ) {
-			skipBoundEvents = pane; // allow pane param to be skipped for Layout callback
-			pane = "";
-		}
-
-		// first trigger the callback set in the options
-		if (fn) {
-			try {
-				// convert function name (string) to function object
-				if (isStr( fn )) {
-					if (fn.match(/,/)) {
-						// function name cannot contain a comma, 
-						// so must be a function name AND a parameter to pass
-						args = fn.split(",")
-						,	fn = eval(args[0]);
-					}
-					else // just the name of an external function?
-						fn = eval(fn);
-				}
-				// execute the callback, if exists
-				if ($.isFunction( fn )) {
-					if (args.length)
-						retVal = g(fn)(args[1]); // pass the argument parsed from 'list'
-					else if ( hasPane )
-						// pass data: pane-name, pane-element, pane-state, pane-options, and layout-name
-						retVal = g(fn)( pane, $Ps[pane], s, o, lName );
-					else // must be a layout/container callback - pass suitable info
-						retVal = g(fn)( Instance, s, o, lName );
-				}
-			}
-			catch (ex) {
-				_log( options.errors.callbackError.replace(/EVENT/, $.trim((pane || "") +" "+ lng)), false );
-				if ($.type(ex) === 'string' && string.length)
-					_log('Exception:  '+ ex, false );
-			}
-		}
-
-		// trigger additional events bound directly to the pane
-		if (!skipBoundEvents && retVal !== false) {
-			if ( hasPane ) { // PANE events can be bound to each pane-elements
-				$P	= $Ps[pane];
-				o	= options[pane];
-				s	= state[pane];
-				$P.triggerHandler('layoutpane'+ lng, [ pane, $P, s, o, lName ]);
-				if (shrt)
-					$P.triggerHandler('layoutpane'+ shrt, [ pane, $P, s, o, lName ]);
-			}
-			else { // LAYOUT events can be bound to the container-element
-				$N.triggerHandler('layout'+ lng, [ Instance, s, o, lName ]);
-				if (shrt)
-					$N.triggerHandler('layout'+ shrt, [ Instance, s, o, lName ]);
-			}
-		}
-
-		// ALWAYS resizeChildren after an onresize_end event - even during initialization
-		// IGNORE onsizecontent_end event because causes child-layouts to resize TWICE
-		if (hasPane && evtName === "onresize_end") // BAD: || evtName === "onsizecontent_end"
-			resizeChildren(pane+"", true); // compiler hack -force string
-
-		return retVal;
-
-		function g (f) { return f; }; // compiler hack
-	}
-
-
-	/**
-	* cure iframe display issues in IE & other browsers
-	*/
-,	_fixIframe = function (pane) {
-		if (browser.mozilla) return; // skip FireFox - it auto-refreshes iframes onShow
-		var $P = $Ps[pane];
-		// if the 'pane' is an iframe, do it
-		if (state[pane].tagName === "IFRAME")
-			$P.css(_c.hidden).css(_c.visible); 
-		else // ditto for any iframes INSIDE the pane
-			$P.find('IFRAME').css(_c.hidden).css(_c.visible);
-	}
-
-	/**
-	* @param  {string}		pane		Can accept ONLY a 'pane' (east, west, etc)
-	* @param  {number=}		outerSize	(optional) Can pass a width, allowing calculations BEFORE element is resized
-	* @return {number}		Returns the innerHeight/Width of el by subtracting padding and borders
-	*/
-,	cssSize = function (pane, outerSize) {
-		var fn = _c[pane].dir=="horz" ? cssH : cssW;
-		return fn($Ps[pane], outerSize);
-	}
-
-	/**
-	* @param  {string}		pane		Can accept ONLY a 'pane' (east, west, etc)
-	* @return {Object}		Returns hash of minWidth & minHeight
-	*/
-,	cssMinDims = function (pane) {
-		// minWidth/Height means CSS width/height = 1px
-		var	$P	= $Ps[pane]
-		,	dir	= _c[pane].dir
-		,	d	= {
-				minWidth:	1001 - cssW($P, 1000)
-			,	minHeight:	1001 - cssH($P, 1000)
-			}
-		;
-		if (dir === "horz") d.minSize = d.minHeight;
-		if (dir === "vert") d.minSize = d.minWidth;
-		return d;
-	}
-
-	// TODO: see if these methods can be made more useful...
-	// TODO: *maybe* return cssW/H from these so caller can use this info
-
-	/**
-	* @param {(string|!Object)}		el
-	* @param {number=}				outerWidth
-	* @param {boolean=}				[autoHide=false]
-	*/
-,	setOuterWidth = function (el, outerWidth, autoHide) {
-		var $E = el, w;
-		if (isStr(el)) $E = $Ps[el]; // west
-		else if (!el.jquery) $E = $(el);
-		w = cssW($E, outerWidth);
-		$E.css({ width: w });
-		if (w > 0) {
-			if (autoHide && $E.data('autoHidden') && $E.innerHeight() > 0) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					// make hidden, then visible to 'refresh' display after animation
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-	/**
-	* @param {(string|!Object)}		el
-	* @param {number=}				outerHeight
-	* @param {boolean=}				[autoHide=false]
-	*/
-,	setOuterHeight = function (el, outerHeight, autoHide) {
-		var $E = el, h;
-		if (isStr(el)) $E = $Ps[el]; // west
-		else if (!el.jquery) $E = $(el);
-		h = cssH($E, outerHeight);
-		$E.css({ height: h, visibility: "visible" }); // may have been 'hidden' by sizeContent
-		if (h > 0 && $E.innerWidth() > 0) {
-			if (autoHide && $E.data('autoHidden')) {
-				$E.show().data('autoHidden', false);
-				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
-					$E.css(_c.hidden).css(_c.visible);
-			}
-		}
-		else if (autoHide && !$E.data('autoHidden'))
-			$E.hide().data('autoHidden', true);
-	}
-
-
-	/**
-	* Converts any 'size' params to a pixel/integer size, if not already
-	* If 'auto' or a decimal/percentage is passed as 'size', a pixel-size is calculated
-	*
-	/**
-	* @param  {string}				pane
-	* @param  {(string|number)=}	size
-	* @param  {string=}				[dir]
-	* @return {number}
-	*/
-,	_parseSize = function (pane, size, dir) {
-		if (!dir) dir = _c[pane].dir;
-
-		if (isStr(size) && size.match(/%/))
-			size = (size === '100%') ? -1 : parseInt(size, 10) / 100; // convert % to decimal
-
-		if (size === 0)
-			return 0;
-		else if (size >= 1)
-			return parseInt(size, 10);
-
-		var o = options, avail = 0;
-		if (dir=="horz") // north or south or center.minHeight
-			avail = sC.innerHeight - ($Ps.north ? o.north.spacing_open : 0) - ($Ps.south ? o.south.spacing_open : 0);
-		else if (dir=="vert") // east or west or center.minWidth
-			avail = sC.innerWidth - ($Ps.west ? o.west.spacing_open : 0) - ($Ps.east ? o.east.spacing_open : 0);
-
-		if (size === -1) // -1 == 100%
-			return avail;
-		else if (size > 0) // percentage, eg: .25
-			return round(avail * size);
-		else if (pane=="center")
-			return 0;
-		else { // size < 0 || size=='auto' || size==Missing || size==Invalid
-			// auto-size the pane
-			var	dim	= (dir === "horz" ? "height" : "width")
-			,	$P	= $Ps[pane]
-			,	$C	= dim === 'height' ? $Cs[pane] : false
-			,	vis	= $.layout.showInvisibly($P) // show pane invisibly if hidden
-			,	szP	= $P.css(dim) // SAVE current pane size
-			,	szC	= $C ? $C.css(dim) : 0 // SAVE current content size
-			;
-			$P.css(dim, "auto");
-			if ($C) $C.css(dim, "auto");
-			size = (dim === "height") ? $P.outerHeight() : $P.outerWidth(); // MEASURE
-			$P.css(dim, szP).css(vis); // RESET size & visibility
-			if ($C) $C.css(dim, szC);
-			return size;
-		}
-	}
-
-	/**
-	* Calculates current 'size' (outer-width or outer-height) of a border-pane - optionally with 'pane-spacing' added
-	*
-	* @param  {(string|!Object)}	pane
-	* @param  {boolean=}			[inclSpace=false]
-	* @return {number}				Returns EITHER Width for east/west panes OR Height for north/south panes
-	*/
-,	getPaneSize = function (pane, inclSpace) {
-		var 
-			$P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	oSp	= (inclSpace ? o.spacing_open : 0)
-		,	cSp	= (inclSpace ? o.spacing_closed : 0)
-		;
-		if (!$P || s.isHidden)
-			return 0;
-		else if (s.isClosed || (s.isSliding && inclSpace))
-			return cSp;
-		else if (_c[pane].dir === "horz")
-			return $P.outerHeight() + oSp;
-		else // dir === "vert"
-			return $P.outerWidth() + oSp;
-	}
-
-	/**
-	* Calculate min/max pane dimensions and limits for resizing
-	*
-	* @param  {string}		pane
-	* @param  {boolean=}	[slide=false]
-	*/
-,	setSizeLimits = function (pane, slide) {
-		if (!isInitialized()) return;
-		var 
-			o				= options[pane]
-		,	s				= state[pane]
-		,	c				= _c[pane]
-		,	dir				= c.dir
-		,	type			= c.sizeType.toLowerCase()
-		,	isSliding		= (slide != undefined ? slide : s.isSliding) // only open() passes 'slide' param
-		,	$P				= $Ps[pane]
-		,	paneSpacing		= o.spacing_open
-		//	measure the pane on the *opposite side* from this pane
-		,	altPane			= _c.oppositeEdge[pane]
-		,	altS			= state[altPane]
-		,	$altP			= $Ps[altPane]
-		,	altPaneSize		= (!$altP || altS.isVisible===false || altS.isSliding ? 0 : (dir=="horz" ? $altP.outerHeight() : $altP.outerWidth()))
-		,	altPaneSpacing	= ((!$altP || altS.isHidden ? 0 : options[altPane][ altS.isClosed !== false ? "spacing_closed" : "spacing_open" ]) || 0)
-		//	limitSize prevents this pane from 'overlapping' opposite pane
-		,	containerSize	= (dir=="horz" ? sC.innerHeight : sC.innerWidth)
-		,	minCenterDims	= cssMinDims("center")
-		,	minCenterSize	= dir=="horz" ? max(options.center.minHeight, minCenterDims.minHeight) : max(options.center.minWidth, minCenterDims.minWidth)
-		//	if pane is 'sliding', then ignore center and alt-pane sizes - because 'overlays' them
-		,	limitSize		= (containerSize - paneSpacing - (isSliding ? 0 : (_parseSize("center", minCenterSize, dir) + altPaneSize + altPaneSpacing)))
-		,	minSize			= s.minSize = max( _parseSize(pane, o.minSize), cssMinDims(pane).minSize )
-		,	maxSize			= s.maxSize = min( (o.maxSize ? _parseSize(pane, o.maxSize) : 100000), limitSize )
-		,	r				= s.resizerPosition = {} // used to set resizing limits
-		,	top				= sC.inset.top
-		,	left			= sC.inset.left
-		,	W				= sC.innerWidth
-		,	H				= sC.innerHeight
-		,	rW				= o.spacing_open // subtract resizer-width to get top/left position for south/east
-		;
-		switch (pane) {
-			case "north":	r.min = top + minSize;
-							r.max = top + maxSize;
-							break;
-			case "west":	r.min = left + minSize;
-							r.max = left + maxSize;
-							break;
-			case "south":	r.min = top + H - maxSize - rW;
-							r.max = top + H - minSize - rW;
-							break;
-			case "east":	r.min = left + W - maxSize - rW;
-							r.max = left + W - minSize - rW;
-							break;
-		};
-	}
-
-	/**
-	* Returns data for setting the size/position of center pane. Also used to set Height for east/west panes
-	*
-	* @return JSON  Returns a hash of all dimensions: top, bottom, left, right, (outer) width and (outer) height
-	*/
-,	calcNewCenterPaneDims = function () {
-		var d = {
-			top:	getPaneSize("north", true) // true = include 'spacing' value for pane
-		,	bottom:	getPaneSize("south", true)
-		,	left:	getPaneSize("west", true)
-		,	right:	getPaneSize("east", true)
-		,	width:	0
-		,	height:	0
-		};
-
-		// NOTE: sC = state.container
-		// calc center-pane outer dimensions
-		d.width		= sC.innerWidth - d.left - d.right;  // outerWidth
-		d.height	= sC.innerHeight - d.bottom - d.top; // outerHeight
-		// add the 'container border/padding' to get final positions relative to the container
-		d.top		+= sC.inset.top;
-		d.bottom	+= sC.inset.bottom;
-		d.left		+= sC.inset.left;
-		d.right		+= sC.inset.right;
-
-		return d;
-	}
-
-
-	/**
-	* @param {!Object}		el
-	* @param {boolean=}		[allStates=false]
-	*/
-,	getHoverClasses = function (el, allStates) {
-		var
-			$El		= $(el)
-		,	type	= $El.data("layoutRole")
-		,	pane	= $El.data("layoutEdge")
-		,	o		= options[pane]
-		,	root	= o[type +"Class"]
-		,	_pane	= "-"+ pane // eg: "-west"
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_slide	= "-sliding"
-		,	_hover	= "-hover " // NOTE the trailing space
-		,	_state	= $El.hasClass(root+_closed) ? _closed : _open
-		,	_alt	= _state === _closed ? _open : _closed
-		,	classes = (root+_hover) + (root+_pane+_hover) + (root+_state+_hover) + (root+_pane+_state+_hover)
-		;
-		if (allStates) // when 'removing' classes, also remove alternate-state classes
-			classes += (root+_alt+_hover) + (root+_pane+_alt+_hover);
-
-		if (type=="resizer" && $El.hasClass(root+_slide))
-			classes += (root+_slide+_hover) + (root+_pane+_slide+_hover);
-
-		return $.trim(classes);
-	}
-,	addHover	= function (evt, el) {
-		var $E = $(el || this);
-		if (evt && $E.data("layoutRole") === "toggler")
-			evt.stopPropagation(); // prevent triggering 'slide' on Resizer-bar
-		$E.addClass( getHoverClasses($E) );
-	}
-,	removeHover	= function (evt, el) {
-		var $E = $(el || this);
-		$E.removeClass( getHoverClasses($E, true) );
-	}
-
-,	onResizerEnter	= function (evt) { // ALSO called by toggler.mouseenter
-		var pane	= $(this).data("layoutEdge")
-		,	s		= state[pane]
-		;
-		// ignore closed-panes and mouse moving back & forth over resizer!
-		// also ignore if ANY pane is currently resizing
-		if ( s.isClosed || s.isResizing || state.paneResizing ) return;
-
-		if ($.fn.disableSelection)
-			$("body").disableSelection();
-		if (options.maskPanesEarly)
-			showMasks( pane, { resizing: true });
-	}
-,	onResizerLeave	= function (evt, el) {
-		var	e		= el || this // el is only passed when called by the timer
-		,	pane	= $(e).data("layoutEdge")
-		,	name	= pane +"ResizerLeave"
-		;
-		timer.clear(pane+"_openSlider"); // cancel slideOpen timer, if set
-		timer.clear(name); // cancel enableSelection timer - may re/set below
-		// this method calls itself on a timer because it needs to allow
-		// enough time for dragging to kick-in and set the isResizing flag
-		// dragging has a 100ms delay set, so this delay must be >100
-		if (!el) // 1st call - mouseleave event
-			timer.set(name, function(){ onResizerLeave(evt, e); }, 200);
-		// if user is resizing, then dragStop will enableSelection(), so can skip it here
-		else if ( !state.paneResizing ) { // 2nd call - by timer
-			if ($.fn.enableSelection)
-				$("body").enableSelection();
-			if (options.maskPanesEarly)
-				hideMasks();
-		}
-	}
-
-/*
- * ###########################
- *   INITIALIZATION METHODS
- * ###########################
- */
-
-	/**
-	* Initialize the layout - called automatically whenever an instance of layout is created
-	*
-	* @see  none - triggered onInit
-	* @return  mixed	true = fully initialized | false = panes not initialized (yet) | 'cancel' = abort
-	*/
-,	_create = function () {
-		// initialize config/options
-		initOptions();
-		var o = options
-		,	s = state;
-
-		// TEMP state so isInitialized returns true during init process
-		s.creatingLayout = true;
-
-		// init plugins for this layout, if there are any (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onCreate );
-
-		// options & state have been initialized, so now run beforeLoad callback
-		// onload will CANCEL layout creation if it returns false
-		if (false === _runCallbacks("onload_start"))
-			return 'cancel';
-
-		// initialize the container element
-		_initContainer();
-
-		// bind hotkey function - keyDown - if required
-		initHotkeys();
-
-		// bind window.onunload
-		$(window).bind("unload."+ sID, unload);
-
-		// init plugins for this layout, if there are any (eg: customButtons)
-		runPluginCallbacks( Instance, $.layout.onLoad );
-
-		// if layout elements are hidden, then layout WILL NOT complete initialization!
-		// initLayoutElements will set initialized=true and run the onload callback IF successful
-		if (o.initPanes) _initLayoutElements();
-
-		delete s.creatingLayout;
-
-		return state.initialized;
-	}
-
-	/**
-	* Initialize the layout IF not already
-	*
-	* @see  All methods in Instance run this test
-	* @return  boolean	true = layoutElements have been initialized | false = panes are not initialized (yet)
-	*/
-,	isInitialized = function () {
-		if (state.initialized || state.creatingLayout) return true;	// already initialized
-		else return _initLayoutElements();	// try to init panes NOW
-	}
-
-	/**
-	* Initialize the layout - called automatically whenever an instance of layout is created
-	*
-	* @see  _create() & isInitialized
-	* @param {boolean=}		[retry=false]	// indicates this is a 2nd try
-	* @return  An object pointer to the instance created
-	*/
-,	_initLayoutElements = function (retry) {
-		// initialize config/options
-		var o = options;
-		// CANNOT init panes inside a hidden container!
-		if (!$N.is(":visible")) {
-			// handle Chrome bug where popup window 'has no height'
-			// if layout is BODY element, try again in 50ms
-			// SEE: http://layout.jquery-dev.net/samples/test_popup_window.html
-			if ( !retry && browser.webkit && $N[0].tagName === "BODY" )
-				setTimeout(function(){ _initLayoutElements(true); }, 50);
-			return false;
-		}
-
-		// a center pane is required, so make sure it exists
-		if (!getPane("center").length) {
-			return _log( o.errors.centerPaneMissing );
-		}
-
-		// TEMP state so isInitialized returns true during init process
-		state.creatingLayout = true;
-
-		// update Container dims
-		$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-
-		// initialize all layout elements
-		initPanes();	// size & position panes - calls initHandles() - which calls initResizable()
-
-		if (o.scrollToBookmarkOnLoad) {
-			var l = self.location;
-			if (l.hash) l.replace( l.hash ); // scrollTo Bookmark
-		}
-
-		// check to see if this layout 'nested' inside a pane
-		if (Instance.hasParentLayout)
-			o.resizeWithWindow = false;
-		// bind resizeAll() for 'this layout instance' to window.resize event
-		else if (o.resizeWithWindow)
-			$(window).bind("resize."+ sID, windowResize);
-
-		delete state.creatingLayout;
-		state.initialized = true;
-
-		// init plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onReady );
-
-		// now run the onload callback, if exists
-		_runCallbacks("onload_end");
-
-		return true; // elements initialized successfully
-	}
-
-	/**
-	* Initialize nested layouts for a specific pane - can optionally pass layout-options
-	*
-	* @param {(string|Object)}	evt_or_pane	The pane being opened, ie: north, south, east, or west
-	* @param {Object=}			[opts]		Layout-options - if passed, will OVERRRIDE options[pane].children
-	* @return  An object pointer to the layout instance created - or null
-	*/
-,	createChildren = function (evt_or_pane, opts) {
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		;
-		if (!$P) return;
-		var	$C	= $Cs[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	sm	= options.stateManagement || {}
-		,	cos = opts ? (o.children = opts) : o.children
-		;
-		if ( $.isPlainObject( cos ) )
-			cos = [ cos ]; // convert a hash to a 1-elem array
-		else if (!cos || !$.isArray( cos ))
-			return;
-
-		$.each( cos, function (idx, co) {
-			if ( !$.isPlainObject( co ) ) return;
-
-			// determine which element is supposed to be the 'child container'
-			// if pane has a 'containerSelector' OR a 'content-div', use those instead of the pane
-			var $containers = co.containerSelector ? $P.find( co.containerSelector ) : ($C || $P);
-
-			$containers.each(function(){
-				var $cont	= $(this)
-				,	child	= $cont.data("layout") //	see if a child-layout ALREADY exists on this element
-				;
-				// if no layout exists, but children are set, try to create the layout now
-				if (!child) {
-					// TODO: see about moving this to the stateManagement plugin, as a method
-					// set a unique child-instance key for this layout, if not already set
-					setInstanceKey({ container: $cont, options: co }, s );
-					// If THIS layout has a hash in stateManagement.autoLoad,
-					// then see if it also contains state-data for this child-layout
-					// If so, copy the stateData to child.options.stateManagement.autoLoad
-					if ( sm.includeChildren && state.stateData[pane] ) {
-						//	THIS layout's state was cached when its state was loaded
-						var	paneChildren = state.stateData[pane].children || {}
-						,	childState	= paneChildren[ co.instanceKey ]
-						,	co_sm		= co.stateManagement || (co.stateManagement = { autoLoad: true })
-						;
-						// COPY the stateData into the autoLoad key
-						if ( co_sm.autoLoad === true && childState ) {
-							co_sm.autoSave			= false; // disable autoSave because saving handled by parent-layout
-							co_sm.includeChildren	= true;  // cascade option - FOR NOW
-							co_sm.autoLoad = $.extend(true, {}, childState); // COPY the state-hash
-						}
-					}
-
-					// create the layout
-					child = $cont.layout( co );
-
-					// if successful, update data
-					if (child) {
-						// add the child and update all layout-pointers
-						// MAY have already been done by child-layout calling parent.refreshChildren()
-						refreshChildren( pane, child );
-					}
-				}
-			});
-		});
-	}
-
-,	setInstanceKey = function (child, parentPaneState) {
-		// create a named key for use in state and instance branches
-		var	$c	= child.container
-		,	o	= child.options
-		,	sm	= o.stateManagement
-		,	key	= o.instanceKey || $c.data("layoutInstanceKey")
-		;
-		if (!key) key = (sm && sm.cookie ? sm.cookie.name : '') || o.name; // look for a name/key
-		if (!key) key = "layout"+ (++parentPaneState.childIdx);	// if no name/key found, generate one
-		else key = key.replace(/[^\w-]/gi, '_').replace(/_{2,}/g, '_');	 // ensure is valid as a hash key
-		o.instanceKey = key;
-		$c.data("layoutInstanceKey", key); // useful if layout is destroyed and then recreated
-		return key;
-	}
-
-	/**
-	* @param {string}		pane		The pane being opened, ie: north, south, east, or west
-	* @param {Object=}		newChild	New child-layout Instance to add to this pane
-	*/
-,	refreshChildren = function (pane, newChild) {
-		var	$P	= $Ps[pane]
-		,	pC	= children[pane]
-		,	s	= state[pane]
-		,	o
-		;
-		// check for destroy()ed layouts and update the child pointers & arrays
-		if ($.isPlainObject( pC )) {
-			$.each( pC, function (key, child) {
-				if (child.destroyed) delete pC[key]
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC ))
-				pC = children[pane] = null; // clear children hash
-		}
-
-		// see if there is a directly-nested layout inside this pane
-		// if there is, then there can be only ONE child-layout, so check that...
-		if (!newChild && !pC) {
-			newChild = $P.data("layout");
-		}
-
-		// if a newChild instance was passed, add it to children[pane]
-		if (newChild) {
-			// update child.state
-			newChild.hasParentLayout = true; // set parent-flag in child
-			// instanceKey is a key-name used in both state and children
-			o = newChild.options;
-			// set a unique child-instance key for this layout, if not already set
-			setInstanceKey( newChild, s );
-			// add pointer to pane.children hash
-			if (!pC) pC = children[pane] = {}; // create an empty children hash
-			pC[ o.instanceKey ] = newChild.container.data("layout"); // add childLayout instance
-		}
-
-		// ALWAYS refresh the pane.children alias, even if null
-		Instance[pane].children = children[pane];
-
-		// if newChild was NOT passed - see if there is a child layout NOW
-		if (!newChild) {
-			createChildren(pane); // MAY create a child and re-call this method
-		}
-	}
-
-,	windowResize = function () {
-		var	o = options
-		,	delay = Number(o.resizeWithWindowDelay);
-		if (delay < 10) delay = 100; // MUST have a delay!
-		// resizing uses a delay-loop because the resize event fires repeatly - except in FF, but delay anyway
-		timer.clear("winResize"); // if already running
-		timer.set("winResize", function(){
-			timer.clear("winResize");
-			timer.clear("winResizeRepeater");
-			var dims = elDims( $N, o.inset );
-			// only trigger resizeAll() if container has changed size
-			if (dims.innerWidth !== sC.innerWidth || dims.innerHeight !== sC.innerHeight)
-				resizeAll();
-		}, delay);
-		// ALSO set fixed-delay timer, if not already running
-		if (!timer.data["winResizeRepeater"]) setWindowResizeRepeater();
-	}
-
-,	setWindowResizeRepeater = function () {
-		var delay = Number(options.resizeWithWindowMaxDelay);
-		if (delay > 0)
-			timer.set("winResizeRepeater", function(){ setWindowResizeRepeater(); resizeAll(); }, delay);
-	}
-
-,	unload = function () {
-		var o = options;
-
-		_runCallbacks("onunload_start");
-
-		// trigger plugin callabacks for this layout (eg: stateManagement)
-		runPluginCallbacks( Instance, $.layout.onUnload );
-
-		_runCallbacks("onunload_end");
-	}
-
-	/**
-	* Validate and initialize container CSS and events
-	*
-	* @see  _create()
-	*/
-,	_initContainer = function () {
-		var
-			N		= $N[0]	
-		,	$H		= $("html")
-		,	tag		= sC.tagName = N.tagName
-		,	id		= sC.id = N.id
-		,	cls		= sC.className = N.className
-		,	o		= options
-		,	name	= o.name
-		,	props	= "position,margin,padding,border"
-		,	css		= "layoutCSS"
-		,	CSS		= {}
-		,	hid		= "hidden" // used A LOT!
-		//	see if this container is a 'pane' inside an outer-layout
-		,	parent	= $N.data("parentLayout")	// parent-layout Instance
-		,	pane	= $N.data("layoutEdge")		// pane-name in parent-layout
-		,	isChild	= parent && pane
-		,	num		= $.layout.cssNum
-		,	$parent, n
-		;
-		// sC = state.container
-		sC.selector = $N.selector.split(".slice")[0];
-		sC.ref		= (o.name ? o.name +' layout / ' : '') + tag + (id ? "#"+id : cls ? '.['+cls+']' : ''); // used in messages
-		sC.isBody	= (tag === "BODY");
-
-		// try to find a parent-layout
-		if (!isChild && !sC.isBody) {
-			$parent = $N.closest("."+ $.layout.defaults.panes.paneClass);
-			parent	= $parent.data("parentLayout");
-			pane	= $parent.data("layoutEdge");
-			isChild	= parent && pane;
-		}
-
-		$N	.data({
-				layout: Instance
-			,	layoutContainer: sID // FLAG to indicate this is a layout-container - contains unique internal ID
-			})
-			.addClass(o.containerClass)
-		;
-		var layoutMethods = {
-			destroy:	''
-		,	initPanes:	''
-		,	resizeAll:	'resizeAll'
-		,	resize:		'resizeAll'
-		};
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in layoutMethods) {
-			$N.bind("layout"+ name.toLowerCase() +"."+ sID, Instance[ layoutMethods[name] || name ]);
-		}
-
-		// if this container is another layout's 'pane', then set child/parent pointers
-		if (isChild) {
-			// update parent flag
-			Instance.hasParentLayout = true;
-			// set pointers to THIS child-layout (Instance) in parent-layout
-			parent.refreshChildren( pane, Instance );
-		}
-
-		// SAVE original container CSS for use in destroy()
-		if (!$N.data(css)) {
-			// handle props like overflow different for BODY & HTML - has 'system default' values
-			if (sC.isBody) {
-				// SAVE <BODY> CSS
-				$N.data(css, $.extend( styles($N, props), {
-					height:		$N.css("height")
-				,	overflow:	$N.css("overflow")
-				,	overflowX:	$N.css("overflowX")
-				,	overflowY:	$N.css("overflowY")
-				}));
-				// ALSO SAVE <HTML> CSS
-				$H.data(css, $.extend( styles($H, 'padding'), {
-					height:		"auto" // FF would return a fixed px-size!
-				,	overflow:	$H.css("overflow")
-				,	overflowX:	$H.css("overflowX")
-				,	overflowY:	$H.css("overflowY")
-				}));
-			}
-			else // handle props normally for non-body elements
-				$N.data(css, styles($N, props+",top,bottom,left,right,width,height,overflow,overflowX,overflowY") );
-		}
-
-		try {
-			// common container CSS
-			CSS = {
-				overflow:	hid
-			,	overflowX:	hid
-			,	overflowY:	hid
-			};
-			$N.css( CSS );
-
-			if (o.inset && !$.isPlainObject(o.inset)) {
-				// can specify a single number for equal outset all-around
-				n = parseInt(o.inset, 10) || 0
-				o.inset = {
-					top:	n
-				,	bottom:	n
-				,	left:	n
-				,	right:	n
-				};
-			}
-
-			// format html & body if this is a full page layout
-			if (sC.isBody) {
-				// if HTML has padding, use this as an outer-spacing around BODY
-				if (!o.outset) {
-					// use padding from parent-elem (HTML) as outset
-					o.outset = {
-						top:	num($H, "paddingTop")
-					,	bottom:	num($H, "paddingBottom")
-					,	left:	num($H, "paddingLeft")
-					,	right:	num($H, "paddingRight")
-					};
-				}
-				else if (!$.isPlainObject(o.outset)) {
-					// can specify a single number for equal outset all-around
-					n = parseInt(o.outset, 10) || 0
-					o.outset = {
-						top:	n
-					,	bottom:	n
-					,	left:	n
-					,	right:	n
-					};
-				}
-				// HTML
-				$H.css( CSS ).css({
-					height:		"100%"
-				,	border:		"none"	// no border or padding allowed when using height = 100%
-				,	padding:	0		// ditto
-				,	margin:		0
-				});
-				// BODY
-				if (browser.isIE6) {
-					// IE6 CANNOT use the trick of setting absolute positioning on all 4 sides - must have 'height'
-					$N.css({
-						width:		"100%"
-					,	height:		"100%"
-					,	border:		"none"	// no border or padding allowed when using height = 100%
-					,	padding:	0		// ditto
-					,	margin:		0
-					,	position:	"relative"
-					});
-					// convert body padding to an inset option - the border cannot be measured in IE6!
-					if (!o.inset) o.inset = elDims( $N ).inset;
-				}
-				else { // use absolute positioning for BODY to allow borders & padding without overflow
-					$N.css({
-						width:		"auto"
-					,	height:		"auto"
-					,	margin:		0
-					,	position:	"absolute"	// allows for border and padding on BODY
-					});
-					// apply edge-positioning created above
-					$N.css( o.outset );
-				}
-				// set current layout-container dimensions
-				$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
-			}
-			else {
-				// container MUST have 'position'
-				var	p = $N.css("position");
-				if (!p || !p.match(/(fixed|absolute|relative)/))
-					$N.css("position","relative");
-
-				// set current layout-container dimensions
-				if ( $N.is(":visible") ) {
-					$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT change insetX (padding) values
-					if (sC.innerHeight < 1) // container has no 'height' - warn developer
-						_log( o.errors.noContainerHeight.replace(/CONTAINER/, sC.ref) );
-				}
-			}
-
-			// if container has min-width/height, then enable scrollbar(s)
-			if ( num($N, "minWidth")  ) $N.parent().css("overflowX","auto");
-			if ( num($N, "minHeight") ) $N.parent().css("overflowY","auto");
-
-		} catch (ex) {}
-	}
-
-	/**
-	* Bind layout hotkeys - if options enabled
-	*
-	* @see  _create() and addPane()
-	* @param {string=}	[panes=""]	The edge(s) to process
-	*/
-,	initHotkeys = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-		// bind keyDown to capture hotkeys, if option enabled for ANY pane
-		$.each(panes, function (i, pane) {
-			var o = options[pane];
-			if (o.enableCursorHotkey || o.customHotkey) {
-				$(document).bind("keydown."+ sID, keyDown); // only need to bind this ONCE
-				return false; // BREAK - binding was done
-			}
-		});
-	}
-
-	/**
-	* Build final OPTIONS data
-	*
-	* @see  _create()
-	*/
-,	initOptions = function () {
-		var data, d, pane, key, val, i, c, o;
-
-		// reprocess user's layout-options to have correct options sub-key structure
-		opts = $.layout.transformData( opts, true ); // panes = default subkey
-
-		// auto-rename old options for backward compatibility
-		opts = $.layout.backwardCompatibility.renameAllOptions( opts );
-
-		// if user-options has 'panes' key (pane-defaults), clean it...
-		if (!$.isEmptyObject(opts.panes)) {
-			// REMOVE any pane-defaults that MUST be set per-pane
-			data = $.layout.optionsMap.noDefault;
-			for (i=0, c=data.length; i<c; i++) {
-				key = data[i];
-				delete opts.panes[key]; // OK if does not exist
-			}
-			// REMOVE any layout-options specified under opts.panes
-			data = $.layout.optionsMap.layout;
-			for (i=0, c=data.length; i<c; i++) {
-				key = data[i];
-				delete opts.panes[key]; // OK if does not exist
-			}
-		}
-
-		// MOVE any NON-layout-options from opts-root to opts.panes
-		data = $.layout.optionsMap.layout;
-		var rootKeys = $.layout.config.optionRootKeys;
-		for (key in opts) {
-			val = opts[key];
-			if ($.inArray(key, rootKeys) < 0 && $.inArray(key, data) < 0) {
-				if (!opts.panes[key])
-					opts.panes[key] = $.isPlainObject(val) ? $.extend(true, {}, val) : val;
-				delete opts[key]
-			}
-		}
-
-		// START by updating ALL options from opts
-		$.extend(true, options, opts);
-
-		// CREATE final options (and config) for EACH pane
-		$.each(_c.allPanes, function (i, pane) {
-
-			// apply 'pane-defaults' to CONFIG.[PANE]
-			_c[pane] = $.extend(true, {}, _c.panes, _c[pane]);
-
-			d = options.panes;
-			o = options[pane];
-
-			// center-pane uses SOME keys in defaults.panes branch
-			if (pane === 'center') {
-				// ONLY copy keys from opts.panes listed in: $.layout.optionsMap.center
-				data = $.layout.optionsMap.center;		// list of 'center-pane keys'
-				for (i=0, c=data.length; i<c; i++) {	// loop the list...
-					key = data[i];
-					// only need to use pane-default if pane-specific value not set
-					if (!opts.center[key] && (opts.panes[key] || !o[key]))
-						o[key] = d[key]; // pane-default
-				}
-			}
-			else {
-				// border-panes use ALL keys in defaults.panes branch
-				o = options[pane] = $.extend(true, {}, d, o); // re-apply pane-specific opts AFTER pane-defaults
-				createFxOptions( pane );
-				// ensure all border-pane-specific base-classes exist
-				if (!o.resizerClass)	o.resizerClass	= "ui-layout-resizer";
-				if (!o.togglerClass)	o.togglerClass	= "ui-layout-toggler";
-			}
-			// ensure we have base pane-class (ALL panes)
-			if (!o.paneClass) o.paneClass = "ui-layout-pane";
-		});
-
-		// update options.zIndexes if a zIndex-option specified
-		var zo	= opts.zIndex
-		,	z	= options.zIndexes;
-		if (zo > 0) {
-			z.pane_normal		= zo;
-			z.content_mask		= max(zo+1, z.content_mask);	// MIN = +1
-			z.resizer_normal	= max(zo+2, z.resizer_normal);	// MIN = +2
-		}
-
-		// DELETE 'panes' key now that we are done - values were copied to EACH pane
-		delete options.panes;
-
-
-		function createFxOptions ( pane ) {
-			var	o = options[pane]
-			,	d = options.panes;
-			// ensure fxSettings key to avoid errors
-			if (!o.fxSettings) o.fxSettings = {};
-			if (!d.fxSettings) d.fxSettings = {};
-
-			$.each(["_open","_close","_size"], function (i,n) { 
-				var
-					sName		= "fxName"+ n
-				,	sSpeed		= "fxSpeed"+ n
-				,	sSettings	= "fxSettings"+ n
-					// recalculate fxName according to specificity rules
-				,	fxName = o[sName] =
-						o[sName]	// options.west.fxName_open
-					||	d[sName]	// options.panes.fxName_open
-					||	o.fxName	// options.west.fxName
-					||	d.fxName	// options.panes.fxName
-					||	"none"		// MEANS $.layout.defaults.panes.fxName == "" || false || null || 0
-				,	fxExists	= $.effects && ($.effects[fxName] || ($.effects.effect && $.effects.effect[fxName]))
-				;
-				// validate fxName to ensure is valid effect - MUST have effect-config data in options.effects
-				if (fxName === "none" || !options.effects[fxName] || !fxExists)
-					fxName = o[sName] = "none"; // effect not loaded OR unrecognized fxName
-
-				// set vars for effects subkeys to simplify logic
-				var	fx		= options.effects[fxName] || {}	// effects.slide
-				,	fx_all	= fx.all	|| null				// effects.slide.all
-				,	fx_pane	= fx[pane]	|| null				// effects.slide.west
-				;
-				// create fxSpeed[_open|_close|_size]
-				o[sSpeed] =
-					o[sSpeed]				// options.west.fxSpeed_open
-				||	d[sSpeed]				// options.west.fxSpeed_open
-				||	o.fxSpeed				// options.west.fxSpeed
-				||	d.fxSpeed				// options.panes.fxSpeed
-				||	null					// DEFAULT - let fxSetting.duration control speed
-				;
-				// create fxSettings[_open|_close|_size]
-				o[sSettings] = $.extend(
-					true
-				,	{}
-				,	fx_all					// effects.slide.all
-				,	fx_pane					// effects.slide.west
-				,	d.fxSettings			// options.panes.fxSettings
-				,	o.fxSettings			// options.west.fxSettings
-				,	d[sSettings]			// options.panes.fxSettings_open
-				,	o[sSettings]			// options.west.fxSettings_open
-				);
-			});
-
-			// DONE creating action-specific-settings for this pane,
-			// so DELETE generic options - are no longer meaningful
-			delete o.fxName;
-			delete o.fxSpeed;
-			delete o.fxSettings;
-		}
-	}
-
-	/**
-	* Initialize module objects, styling, size and position for all panes
-	*
-	* @see  _initElements()
-	* @param {string}	pane		The pane to process
-	*/
-,	getPane = function (pane) {
-		var sel = options[pane].paneSelector
-		if (sel.substr(0,1)==="#") // ID selector
-			// NOTE: elements selected 'by ID' DO NOT have to be 'children'
-			return $N.find(sel).eq(0);
-		else { // class or other selector
-			var $P = $N.children(sel).eq(0);
-			// look for the pane nested inside a 'form' element
-			return $P.length ? $P : $N.children("form:first").children(sel).eq(0);
-		}
-	}
-
-	/**
-	* @param {Object=}		evt
-	*/
-,	initPanes = function (evt) {
-		// stopPropagation if called by trigger("layoutinitpanes") - use evtPane utility 
-		evtPane(evt);
-
-		// NOTE: do north & south FIRST so we can measure their height - do center LAST
-		$.each(_c.allPanes, function (idx, pane) {
-			addPane( pane, true );
-		});
-
-		// init the pane-handles NOW in case we have to hide or close the pane below
-		initHandles();
-
-		// now that all panes have been initialized and initially-sized,
-		// make sure there is really enough space available for each pane
-		$.each(_c.borderPanes, function (i, pane) {
-			if ($Ps[pane] && state[pane].isVisible) { // pane is OPEN
-				setSizeLimits(pane);
-				makePaneFit(pane); // pane may be Closed, Hidden or Resized by makePaneFit()
-			}
-		});
-		// size center-pane AGAIN in case we 'closed' a border-pane in loop above
-		sizeMidPanes("center");
-
-		//	Chrome/Webkit sometimes fires callbacks BEFORE it completes resizing!
-		//	Before RC30.3, there was a 10ms delay here, but that caused layout 
-		//	to load asynchrously, which is BAD, so try skipping delay for now
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		$.each(_c.allPanes, function (idx, pane) {
-			afterInitPane(pane);
-		});
-	}
-
-	/**
-	* Add a pane to the layout - subroutine of initPanes()
-	*
-	* @see  initPanes()
-	* @param {string}	pane			The pane to process
-	* @param {boolean=}	[force=false]	Size content after init
-	*/
-,	addPane = function (pane, force) {
-		if (!force && !isInitialized()) return;
-		var
-			o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	dir		= c.dir
-		,	fx		= s.fx
-		,	spacing	= o.spacing_open || 0
-		,	isCenter = (pane === "center")
-		,	CSS		= {}
-		,	$P		= $Ps[pane]
-		,	size, minSize, maxSize, child
-		;
-		// if pane-pointer already exists, remove the old one first
-		if ($P)
-			removePane( pane, false, true, false );
-		else
-			$Cs[pane] = false; // init
-
-		$P = $Ps[pane] = getPane(pane);
-		if (!$P.length) {
-			$Ps[pane] = false; // logic
-			return;
-		}
-
-		// SAVE original Pane CSS
-		if (!$P.data("layoutCSS")) {
-			var props = "position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border";
-			$P.data("layoutCSS", styles($P, props));
-		}
-
-		// create alias for pane data in Instance - initHandles will add more
-		Instance[pane] = {
-			name:		pane
-		,	pane:		$Ps[pane]
-		,	content:	$Cs[pane]
-		,	options:	options[pane]
-		,	state:		state[pane]
-		,	children:	children[pane]
-		};
-
-		// add classes, attributes & events
-		$P	.data({
-				parentLayout:	Instance		// pointer to Layout Instance
-			,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-			,	layoutEdge:		pane
-			,	layoutRole:		"pane"
-			})
-			.css(c.cssReq).css("zIndex", options.zIndexes.pane_normal)
-			.css(o.applyDemoStyles ? c.cssDemo : {}) // demo styles
-			.addClass( o.paneClass +" "+ o.paneClass+"-"+pane ) // default = "ui-layout-pane ui-layout-pane-west" - may be a dupe of 'paneSelector'
-			.bind("mouseenter."+ sID, addHover )
-			.bind("mouseleave."+ sID, removeHover )
-			;
-		var paneMethods = {
-				hide:				''
-			,	show:				''
-			,	toggle:				''
-			,	close:				''
-			,	open:				''
-			,	slideOpen:			''
-			,	slideClose:			''
-			,	slideToggle:		''
-			,	size:				'sizePane'
-			,	sizePane:			'sizePane'
-			,	sizeContent:		''
-			,	sizeHandles:		''
-			,	enableClosable:		''
-			,	disableClosable:	''
-			,	enableSlideable:	''
-			,	disableSlideable:	''
-			,	enableResizable:	''
-			,	disableResizable:	''
-			,	swapPanes:			'swapPanes'
-			,	swap:				'swapPanes'
-			,	move:				'swapPanes'
-			,	removePane:			'removePane'
-			,	remove:				'removePane'
-			,	createChildren:		''
-			,	resizeChildren:		''
-			,	resizeAll:			'resizeAll'
-			,	resizeLayout:		'resizeAll'
-			}
-		,	name;
-		// loop hash and bind all methods - include layoutID namespacing
-		for (name in paneMethods) {
-			$P.bind("layoutpane"+ name.toLowerCase() +"."+ sID, Instance[ paneMethods[name] || name ]);
-		}
-
-		// see if this pane has a 'scrolling-content element'
-		initContent(pane, false); // false = do NOT sizeContent() - called later
-
-		if (!isCenter) {
-			// call _parseSize AFTER applying pane classes & styles - but before making visible (if hidden)
-			// if o.size is auto or not valid, then MEASURE the pane and use that as its 'size'
-			size	= s.size = _parseSize(pane, o.size);
-			minSize	= _parseSize(pane,o.minSize) || 1;
-			maxSize	= _parseSize(pane,o.maxSize) || 100000;
-			if (size > 0) size = max(min(size, maxSize), minSize);
-			s.autoResize = o.autoResize; // used with percentage sizes
-
-			// state for border-panes
-			s.isClosed  = false; // true = pane is closed
-			s.isSliding = false; // true = pane is currently open by 'sliding' over adjacent panes
-			s.isResizing= false; // true = pane is in process of being resized
-			s.isHidden	= false; // true = pane is hidden - no spacing, resizer or toggler is visible!
-
-			// array for 'pin buttons' whose classNames are auto-updated on pane-open/-close
-			if (!s.pins) s.pins = [];
-		}
-		//	states common to ALL panes
-		s.tagName	= $P[0].tagName;
-		s.edge		= pane;		// useful if pane is (or about to be) 'swapped' - easy find out where it is (or is going)
-		s.noRoom	= false;	// true = pane 'automatically' hidden due to insufficient room - will unhide automatically
-		s.isVisible	= true;		// false = pane is invisible - closed OR hidden - simplify logic
-
-		// init pane positioning
-		setPanePosition( pane );
-
-		// if pane is not visible, 
-		if (dir === "horz") // north or south pane
-			CSS.height = cssH($P, size);
-		else if (dir === "vert") // east or west pane
-			CSS.width = cssW($P, size);
-		//else if (isCenter) {}
-
-		$P.css(CSS); // apply size -- top, bottom & height will be set by sizeMidPanes
-		if (dir != "horz") sizeMidPanes(pane, true); // true = skipCallback
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			initHandles( pane );
-			initHotkeys( pane );
-		}
-
-		// close or hide the pane if specified in settings
-		if (o.initClosed && o.closable && !o.initHidden)
-			close(pane, true, true); // true, true = force, noAnimation
-		else if (o.initHidden || o.initClosed)
-			hide(pane); // will be completely invisible - no resizer or spacing
-		else if (!s.noRoom)
-			// make the pane visible - in case was initially hidden
-			$P.css("display","block");
-		// ELSE setAsOpen() - called later by initHandles()
-
-		// RESET visibility now - pane will appear IF display:block
-		$P.css("visibility","visible");
-
-		// check option for auto-handling of pop-ups & drop-downs
-		if (o.showOverflowOnHover)
-			$P.hover( allowOverflow, resetOverflow );
-
-		// if manually adding a pane AFTER layout initialization, then...
-		if (state.initialized) {
-			afterInitPane( pane );
-		}
-	}
-
-,	afterInitPane = function (pane) {
-		var	$P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		;
-		if (!$P) return;
-
-		// see if there is a directly-nested layout inside this pane
-		if ($P.data("layout"))
-			refreshChildren( pane, $P.data("layout") );
-
-		// process pane contents and callbacks, and init/resize child-layout if exists
-		if (s.isVisible) { // pane is OPEN
-			if (state.initialized) // this pane was added AFTER layout was created
-				resizeAll(); // will also sizeContent
-			else
-				sizeContent(pane);
-
-			if (o.triggerEventsOnLoad)
-				_runCallbacks("onresize_end", pane);
-			else // automatic if onresize called, otherwise call it specifically
-				// resize child - IF inner-layout already exists (created before this layout)
-				resizeChildren(pane, true); // a previously existing childLayout
-		}
-
-		// init childLayouts - even if pane is not visible
-		if (o.initChildren && o.children)
-			createChildren(pane);
-	}
-
-	/**
-	* @param {string=}	panes		The pane(s) to process
-	*/
-,	setPanePosition = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	side =  _c[pane].side
-			,	CSS	= {}
-			;
-			if (!$P) return; // pane does not exist - skip
-
-			// set css-position to account for container borders & padding
-			switch (pane) {
-				case "north": 	CSS.top 	= sC.inset.top;
-								CSS.left 	= sC.inset.left;
-								CSS.right	= sC.inset.right;
-								break;
-				case "south": 	CSS.bottom	= sC.inset.bottom;
-								CSS.left 	= sC.inset.left;
-								CSS.right 	= sC.inset.right;
-								break;
-				case "west": 	CSS.left 	= sC.inset.left; // top, bottom & height set by sizeMidPanes()
-								break;
-				case "east": 	CSS.right 	= sC.inset.right; // ditto
-								break;
-				case "center":	// top, left, width & height set by sizeMidPanes()
-			}
-			// apply position
-			$P.css(CSS); 
-
-			// update resizer position
-			if ($R && s.isClosed)
-				$R.css(side, sC.inset[side]);
-			else if ($R && !s.isHidden)
-				$R.css(side, sC.inset[side] + getPaneSize(pane));
-		});
-	}
-
-	/**
-	* Initialize module objects, styling, size and position for all resize bars and toggler buttons
-	*
-	* @see  _create()
-	* @param {string=}	[panes=""]	The edge(s) to process
-	*/
-,	initHandles = function (panes) {
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
-		$.each(panes, function (i, pane) {
-			var $P		= $Ps[pane];
-			$Rs[pane]	= false; // INIT
-			$Ts[pane]	= false;
-			if (!$P) return; // pane does not exist - skip
-
-			var	o		= options[pane]
-			,	s		= state[pane]
-			,	c		= _c[pane]
-			,	paneId	= o.paneSelector.substr(0,1) === "#" ? o.paneSelector.substr(1) : ""
-			,	rClass	= o.resizerClass
-			,	tClass	= o.togglerClass
-			,	spacing	= (s.isVisible ? o.spacing_open : o.spacing_closed)
-			,	_pane	= "-"+ pane // used for classNames
-			,	_state	= (s.isVisible ? "-open" : "-closed") // used for classNames
-			,	I		= Instance[pane]
-				// INIT RESIZER BAR
-			,	$R		= I.resizer = $Rs[pane] = $("<div></div>")
-				// INIT TOGGLER BUTTON
-			,	$T		= I.toggler = (o.closable ? $Ts[pane] = $("<div></div>") : false)
-			;
-
-			//if (s.isVisible && o.resizable) ... handled by initResizable
-			if (!s.isVisible && o.slidable)
-				$R.attr("title", o.tips.Slide).css("cursor", o.sliderCursor);
-
-			$R	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "paneLeft-resizer"
-				.attr("id", paneId ? paneId +"-resizer" : "" )
-				.data({
-					parentLayout:	Instance
-				,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				,	layoutRole:		"resizer"
-				})
-				.css(_c.resizers.cssReq).css("zIndex", options.zIndexes.resizer_normal)
-				.css(o.applyDemoStyles ? _c.resizers.cssDemo : {}) // add demo styles
-				.addClass(rClass +" "+ rClass+_pane)
-				.hover(addHover, removeHover) // ALWAYS add hover-classes, even if resizing is not enabled - handle with CSS instead
-				.hover(onResizerEnter, onResizerLeave) // ALWAYS NEED resizer.mouseleave to balance toggler.mouseenter
-				.appendTo($N) // append DIV to container
-			;
-			if (o.resizerDblClickToggle)
-				$R.bind("dblclick."+ sID, toggle );
-
-			if ($T) {
-				$T	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "#paneLeft-toggler"
-					.attr("id", paneId ? paneId +"-toggler" : "" )
-					.data({
-						parentLayout:	Instance
-					,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-					,	layoutEdge:		pane
-					,	layoutRole:		"toggler"
-					})
-					.css(_c.togglers.cssReq) // add base/required styles
-					.css(o.applyDemoStyles ? _c.togglers.cssDemo : {}) // add demo styles
-					.addClass(tClass +" "+ tClass+_pane)
-					.hover(addHover, removeHover) // ALWAYS add hover-classes, even if toggling is not enabled - handle with CSS instead
-					.bind("mouseenter", onResizerEnter) // NEED toggler.mouseenter because mouseenter MAY NOT fire on resizer
-					.appendTo($R) // append SPAN to resizer DIV
-				;
-				// ADD INNER-SPANS TO TOGGLER
-				if (o.togglerContent_open) // ui-layout-open
-					$("<span>"+ o.togglerContent_open +"</span>")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.data("layoutRole", "togglerContent")
-						.data("layoutEdge", pane)
-						.addClass("content content-open")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-open instead!
-					;
-				if (o.togglerContent_closed) // ui-layout-closed
-					$("<span>"+ o.togglerContent_closed +"</span>")
-						.data({
-							layoutEdge:		pane
-						,	layoutRole:		"togglerContent"
-						})
-						.addClass("content content-closed")
-						.css("display","none")
-						.appendTo( $T )
-						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-closed instead!
-					;
-				// ADD TOGGLER.click/.hover
-				enableClosable(pane);
-			}
-
-			// add Draggable events
-			initResizable(pane);
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS - eg: class="resizer resizer-west resizer-open"
-			if (s.isVisible)
-				setAsOpen(pane);	// onOpen will be called, but NOT onResize
-			else {
-				setAsClosed(pane);	// onClose will be called
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-		});
-
-		// SET ALL HANDLE DIMENSIONS
-		sizeHandles();
-	}
-
-
-	/**
-	* Initialize scrolling ui-layout-content div - if exists
-	*
-	* @see  initPane() - or externally after an Ajax injection
-	* @param {string}	pane			The pane to process
-	* @param {boolean=}	[resize=true]	Size content after init
-	*/
-,	initContent = function (pane, resize) {
-		if (!isInitialized()) return;
-		var 
-			o	= options[pane]
-		,	sel	= o.contentSelector
-		,	I	= Instance[pane]
-		,	$P	= $Ps[pane]
-		,	$C
-		;
-		if (sel) $C = I.content = $Cs[pane] = (o.findNestedContent)
-			? $P.find(sel).eq(0) // match 1-element only
-			: $P.children(sel).eq(0)
-		;
-		if ($C && $C.length) {
-			$C.data("layoutRole", "content");
-			// SAVE original Content CSS
-			if (!$C.data("layoutCSS"))
-				$C.data("layoutCSS", styles($C, "height"));
-			$C.css( _c.content.cssReq );
-			if (o.applyDemoStyles) {
-				$C.css( _c.content.cssDemo ); // add padding & overflow: auto to content-div
-				$P.css( _c.content.cssDemoPane ); // REMOVE padding/scrolling from pane
-			}
-			// ensure no vertical scrollbar on pane - will mess up measurements
-			if ($P.css("overflowX").match(/(scroll|auto)/)) {
-				$P.css("overflow", "hidden");
-			}
-			state[pane].content = {}; // init content state
-			if (resize !== false) sizeContent(pane);
-			// sizeContent() is called AFTER init of all elements
-		}
-		else
-			I.content = $Cs[pane] = false;
-	}
-
-
-	/**
-	* Add resize-bars to all panes that specify it in options
-	* -dependancy: $.fn.resizable - will skip if not found
-	*
-	* @see  _create()
-	* @param {string=}	[panes=""]	The edge(s) to process
-	*/
-,	initResizable = function (panes) {
-		var	draggingAvailable = $.layout.plugins.draggable
-		,	side // set in start()
-		;
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (idx, pane) {
-			var o = options[pane];
-			if (!draggingAvailable || !$Ps[pane] || !o.resizable) {
-				o.resizable = false;
-				return true; // skip to next
-			}
-
-			var s		= state[pane]
-			,	z		= options.zIndexes
-			,	c		= _c[pane]
-			,	side	= c.dir=="horz" ? "top" : "left"
-			,	$P 		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	base	= o.resizerClass
-			,	lastPos	= 0 // used when live-resizing
-			,	r, live // set in start because may change
-			//	'drag' classes are applied to the ORIGINAL resizer-bar while dragging is in process
-			,	resizerClass		= base+"-drag"				// resizer-drag
-			,	resizerPaneClass	= base+"-"+pane+"-drag"		// resizer-north-drag
-			//	'helper' class is applied to the CLONED resizer-bar while it is being dragged
-			,	helperClass			= base+"-dragging"			// resizer-dragging
-			,	helperPaneClass		= base+"-"+pane+"-dragging" // resizer-north-dragging
-			,	helperLimitClass	= base+"-dragging-limit"	// resizer-drag
-			,	helperPaneLimitClass = base+"-"+pane+"-dragging-limit"	// resizer-north-drag
-			,	helperClassesSet	= false 					// logic var
-			;
-
-			if (!s.isClosed)
-				$R.attr("title", o.tips.Resize)
-				  .css("cursor", o.resizerCursor); // n-resize, s-resize, etc
-
-			$R.draggable({
-				containment:	$N[0] // limit resizing to layout container
-			,	axis:			(c.dir=="horz" ? "y" : "x") // limit resizing to horz or vert axis
-			,	delay:			0
-			,	distance:		1
-			,	grid:			o.resizingGrid
-			//	basic format for helper - style it using class: .ui-draggable-dragging
-			,	helper:			"clone"
-			,	opacity:		o.resizerDragOpacity
-			,	addClasses:		false // avoid ui-state-disabled class when disabled
-			//,	iframeFix:		o.draggableIframeFix // TODO: consider using when bug is fixed
-			,	zIndex:			z.resizer_drag
-
-			,	start: function (e, ui) {
-					// REFRESH options & state pointers in case we used swapPanes
-					o = options[pane];
-					s = state[pane];
-					// re-read options
-					live = o.livePaneResizing;
-
-					// ondrag_start callback - will CANCEL hide if returns false
-					// TODO: dragging CANNOT be cancelled like this, so see if there is a way?
-					if (false === _runCallbacks("ondrag_start", pane)) return false;
-
-					s.isResizing		= true; // prevent pane from closing while resizing
-					state.paneResizing	= pane; // easy to see if ANY pane is resizing
-					timer.clear(pane+"_closeSlider"); // just in case already triggered
-
-					// SET RESIZER LIMITS - used in drag()
-					setSizeLimits(pane); // update pane/resizer state
-					r = s.resizerPosition;
-					lastPos = ui.position[ side ]
-
-					$R.addClass( resizerClass +" "+ resizerPaneClass ); // add drag classes
-					helperClassesSet = false; // reset logic var - see drag()
-
-					// DISABLE TEXT SELECTION (probably already done by resizer.mouseOver)
-					$('body').disableSelection(); 
-
-					// MASK PANES CONTAINING IFRAMES, APPLETS OR OTHER TROUBLESOME ELEMENTS
-					showMasks( pane, { resizing: true });
-				}
-
-			,	drag: function (e, ui) {
-					if (!helperClassesSet) { // can only add classes after clone has been added to the DOM
-						//$(".ui-draggable-dragging")
-						ui.helper
-							.addClass( helperClass +" "+ helperPaneClass ) // add helper classes
-							.css({ right: "auto", bottom: "auto" })	// fix dir="rtl" issue
-							.children().css("visibility","hidden")	// hide toggler inside dragged resizer-bar
-						;
-						helperClassesSet = true;
-						// draggable bug!? RE-SET zIndex to prevent E/W resize-bar showing through N/S pane!
-						if (s.isSliding) $Ps[pane].css("zIndex", z.pane_sliding);
-					}
-					// CONTAIN RESIZER-BAR TO RESIZING LIMITS
-					var limit = 0;
-					if (ui.position[side] < r.min) {
-						ui.position[side] = r.min;
-						limit = -1;
-					}
-					else if (ui.position[side] > r.max) {
-						ui.position[side] = r.max;
-						limit = 1;
-					}
-					// ADD/REMOVE dragging-limit CLASS
-					if (limit) {
-						ui.helper.addClass( helperLimitClass +" "+ helperPaneLimitClass ); // at dragging-limit
-						window.defaultStatus = (limit>0 && pane.match(/(north|west)/)) || (limit<0 && pane.match(/(south|east)/)) ? o.tips.maxSizeWarning : o.tips.minSizeWarning;
-					}
-					else {
-						ui.helper.removeClass( helperLimitClass +" "+ helperPaneLimitClass ); // not at dragging-limit
-						window.defaultStatus = "";
-					}
-					// DYNAMICALLY RESIZE PANES IF OPTION ENABLED
-					// won't trigger unless resizer has actually moved!
-					if (live && Math.abs(ui.position[side] - lastPos) >= o.liveResizingTolerance) {
-						lastPos = ui.position[side];
-						resizePanes(e, ui, pane)
-					}
-				}
-
-			,	stop: function (e, ui) {
-					$('body').enableSelection(); // RE-ENABLE TEXT SELECTION
-					window.defaultStatus = ""; // clear 'resizing limit' message from statusbar
-					$R.removeClass( resizerClass +" "+ resizerPaneClass ); // remove drag classes from Resizer
-					s.isResizing		= false;
-					state.paneResizing	= false; // easy to see if ANY pane is resizing
-					resizePanes(e, ui, pane, true); // true = resizingDone
-				}
-
-			});
-		});
-
-		/**
-		* resizePanes
-		*
-		* Sub-routine called from stop() - and drag() if livePaneResizing
-		*
-		* @param {!Object}		evt
-		* @param {!Object}		ui
-		* @param {string}		pane
-		* @param {boolean=}		[resizingDone=false]
-		*/
-		var resizePanes = function (evt, ui, pane, resizingDone) {
-			var	dragPos	= ui.position
-			,	c		= _c[pane]
-			,	o		= options[pane]
-			,	s		= state[pane]
-			,	resizerPos
-			;
-			switch (pane) {
-				case "north":	resizerPos = dragPos.top; break;
-				case "west":	resizerPos = dragPos.left; break;
-				case "south":	resizerPos = sC.layoutHeight - dragPos.top  - o.spacing_open; break;
-				case "east":	resizerPos = sC.layoutWidth  - dragPos.left - o.spacing_open; break;
-			};
-			// remove container margin from resizer position to get the pane size
-			var newSize = resizerPos - sC.inset[c.side];
-
-			// Disable OR Resize Mask(s) created in drag.start
-			if (!resizingDone) {
-				// ensure we meet liveResizingTolerance criteria
-				if (Math.abs(newSize - s.size) < o.liveResizingTolerance)
-					return; // SKIP resize this time
-				// resize the pane
-				manualSizePane(pane, newSize, false, true); // true = noAnimation
-				sizeMasks(); // resize all visible masks
-			}
-			else { // resizingDone
-				// ondrag_end callback
-				if (false !== _runCallbacks("ondrag_end", pane))
-					manualSizePane(pane, newSize, false, true); // true = noAnimation
-				hideMasks(true); // true = force hiding all masks even if one is 'sliding'
-				if (s.isSliding) // RE-SHOW 'object-masks' so objects won't show through sliding pane
-					showMasks( pane, { resizing: true });
-			}
-		};
-	}
-
-	/**
-	*	sizeMask
-	*
-	*	Needed to overlay a DIV over an IFRAME-pane because mask CANNOT be *inside* the pane
-	*	Called when mask created, and during livePaneResizing
-	*/
-,	sizeMask = function () {
-		var $M		= $(this)
-		,	pane	= $M.data("layoutMask") // eg: "west"
-		,	s		= state[pane]
-		;
-		// only masks over an IFRAME-pane need manual resizing
-		if (s.tagName == "IFRAME" && s.isVisible) // no need to mask closed/hidden panes
-			$M.css({
-				top:	s.offsetTop
-			,	left:	s.offsetLeft
-			,	width:	s.outerWidth
-			,	height:	s.outerHeight
-			});
-		/* ALT Method...
-		var $P = $Ps[pane];
-		$M.css( $P.position() ).css({ width: $P[0].offsetWidth, height: $P[0].offsetHeight });
-		*/
-	}
-,	sizeMasks = function () {
-		$Ms.each( sizeMask ); // resize all 'visible' masks
-	}
-
-	/**
-	* @param {string}	pane		The pane being resized, animated or isSliding
-	* @param {Object=}	[args]		(optional) Options: which masks to apply, and to which panes
-	*/
-,	showMasks = function (pane, args) {
-		var	c		= _c[pane]
-		,	panes	=  ["center"]
-		,	z		= options.zIndexes
-		,	a		= $.extend({
-						objectsOnly:	false
-					,	animation:		false
-					,	resizing:		true
-					,	sliding:		state[pane].isSliding
-					},	args )
-		,	o, s
-		;
-		if (a.resizing)
-			panes.push( pane );
-		if (a.sliding)
-			panes.push( _c.oppositeEdge[pane] ); // ADD the oppositeEdge-pane
-
-		if (c.dir === "horz") {
-			panes.push("west");
-			panes.push("east");
-		}
-
-		$.each(panes, function(i,p){
-			s = state[p];
-			o = options[p];
-			if (s.isVisible && ( o.maskObjects || (!a.objectsOnly && o.maskContents) )) {
-				getMasks(p).each(function(){
-					sizeMask.call(this);
-					this.style.zIndex = s.isSliding ? z.pane_sliding+1 : z.pane_normal+1
-					this.style.display = "block";
-				});
-			}
-		});
-	}
-
-	/**
-	* @param {boolean=}	force		Hide masks even if a pane is sliding
-	*/
-,	hideMasks = function (force) {
-		// ensure no pane is resizing - could be a timing issue
-		if (force || !state.paneResizing) {
-			$Ms.hide(); // hide ALL masks
-		}
-		// if ANY pane is sliding, then DO NOT remove masks from panes with maskObjects enabled
-		else if (!force && !$.isEmptyObject( state.panesSliding )) {
-			var	i = $Ms.length - 1
-			,	p, $M;
-			for (; i >= 0; i--) {
-				$M	= $Ms.eq(i);
-				p	= $M.data("layoutMask");
-				if (!options[p].maskObjects) {
-					$M.hide();
-				}
-			}
-		}
-	}
-
-	/**
-	* @param {string}	pane
-	*/
-,	getMasks = function (pane) {
-		var $Masks	= $([])
-		,	$M, i = 0, c = $Ms.length
-		;
-		for (; i<c; i++) {
-			$M = $Ms.eq(i);
-			if ($M.data("layoutMask") === pane)
-				$Masks = $Masks.add( $M );
-		}
-		if ($Masks.length)
-			return $Masks;
-		else
-			return createMasks(pane);
-	}
-
-	/**
-	* createMasks
-	*
-	* Generates both DIV (ALWAYS used) and IFRAME (optional) elements as masks
-	* An IFRAME mask is created *under* the DIV when maskObjects=true, because a DIV cannot mask an applet
-	*
-	* @param {string}	pane
-	*/
-,	createMasks = function (pane) {
-		var
-			$P		= $Ps[pane]
-		,	s		= state[pane]
-		,	o		= options[pane]
-		,	z		= options.zIndexes
-		//,	objMask	= o.maskObjects && s.tagName != "IFRAME" // check for option
-		,	$Masks	= $([])
-		,	isIframe, el, $M, css, i
-		;
-		if (!o.maskContents && !o.maskObjects) return $Masks;
-		// if o.maskObjects=true, then loop TWICE to create BOTH kinds of mask, else only create a DIV
-		for (i=0; i < (o.maskObjects ? 2 : 1); i++) {
-			isIframe = o.maskObjects && i==0;
-			el = document.createElement( isIframe ? "iframe" : "div" );
-			$M = $(el).data("layoutMask", pane); // add data to relate mask to pane
-			el.className = "ui-layout-mask ui-layout-mask-"+ pane; // for user styling
-			css = el.style;
-			// styles common to both DIVs and IFRAMES
-			css.display		= "block";
-			css.position	= "absolute";
-			css.background	= "#FFF";
-			if (isIframe) { // IFRAME-only props
-				el.frameborder = 0;
-				el.src		= "about:blank";
-				//el.allowTransparency = true; - for IE, but breaks masking ability!
-				css.opacity	= 0;
-				css.filter	= "Alpha(Opacity='0')";
-				css.border	= 0;
-			}
-			// if pane is an IFRAME, then must mask the pane itself
-			if (s.tagName == "IFRAME") {
-				// NOTE sizing done by a subroutine so can be called during live-resizing
-				css.zIndex	= z.pane_normal+1; // 1-higher than pane
-				$N.append( el ); // append to LAYOUT CONTAINER
-			}
-			// otherwise put masks *inside the pane* to mask its contents
-			else {
-				$M.addClass("ui-layout-mask-inside-pane");
-				css.zIndex	= o.maskZindex || z.content_mask; // usually 1, but customizable
-				css.top		= 0;
-				css.left	= 0;
-				css.width	= "100%";
-				css.height	= "100%";
-				$P.append( el ); // append INSIDE pane element
-			}
-			// add to return object
-			$Masks = $Masks.add( el );
-			// add Mask to cached array so can be resized & reused
-			$Ms = $Ms.add( el );
-		}
-		return $Masks;
-	}
-
-
-	/**
-	* Destroy this layout and reset all elements
-	*
-	* @param {boolean=}	[destroyChildren=false]		Destory Child-Layouts first?
-	*/
-,	destroy = function (evt_or_destroyChildren, destroyChildren) {
-		// UNBIND layout events and remove global object
-		$(window).unbind("."+ sID);		// resize & unload
-		$(document).unbind("."+ sID);	// keyDown (hotkeys)
-
-		if (typeof evt_or_destroyChildren === "object")
-			// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
-			evtPane(evt_or_destroyChildren);
-		else // no event, so transfer 1st param to destroyChildren param
-			destroyChildren = evt_or_destroyChildren;
-
-		// need to look for parent layout BEFORE we remove the container data, else skips a level
-		//var parentPane = Instance.hasParentLayout ? $.layout.getParentPaneInstance( $N ) : null;
-
-		// reset layout-container
-		$N	.clearQueue()
-			.removeData("layout")
-			.removeData("layoutContainer")
-			.removeClass(options.containerClass)
-			.unbind("."+ sID) // remove ALL Layout events
-		;
-
-		// remove all mask elements that have been created
-		$Ms.remove();
-
-		// loop all panes to remove layout classes, attributes and bindings
-		$.each(_c.allPanes, function (i, pane) {
-			removePane( pane, false, true, destroyChildren ); // true = skipResize
-		});
-
-		// do NOT reset container CSS if is a 'pane' (or 'content') in an outer-layout - ie, THIS layout is 'nested'
-		var css = "layoutCSS";
-		if ($N.data(css) && !$N.data("layoutRole")) // RESET CSS
-			$N.css( $N.data(css) ).removeData(css);
-
-		// for full-page layouts, also reset the <HTML> CSS
-		if (sC.tagName === "BODY" && ($N = $("html")).data(css)) // RESET <HTML> CSS
-			$N.css( $N.data(css) ).removeData(css);
-
-		// trigger plugins for this layout, if there are any
-		runPluginCallbacks( Instance, $.layout.onDestroy );
-
-		// trigger state-management and onunload callback
-		unload();
-
-		// clear the Instance of everything except for container & options (so could recreate)
-		// RE-CREATE: myLayout = myLayout.container.layout( myLayout.options );
-		for (var n in Instance)
-			if (!n.match(/^(container|options)$/)) delete Instance[ n ];
-		// add a 'destroyed' flag to make it easy to check
-		Instance.destroyed = true;
-
-		// if this is a child layout, CLEAR the child-pointer in the parent
-		/* for now the pointer REMAINS, but with only container, options and destroyed keys
-		if (parentPane) {
-			var layout	= parentPane.pane.data("parentLayout")
-			,	key		= layout.options.instanceKey || 'error';
-			// THIS SYNTAX MAY BE WRONG!
-			parentPane.children[key] = layout.children[ parentPane.name ].children[key] = null;
-		}
-		*/
-
-		return Instance; // for coding convenience
-	}
-
-	/**
-	* Remove a pane from the layout - subroutine of destroy()
-	*
-	* @see  destroy()
-	* @param {(string|Object)}	evt_or_pane			The pane to process
-	* @param {boolean=}			[remove=false]		Remove the DOM element?
-	* @param {boolean=}			[skipResize=false]	Skip calling resizeAll()?
-	* @param {boolean=}			[destroyChild=true]	Destroy Child-layouts? If not passed, obeys options setting
-	*/
-,	removePane = function (evt_or_pane, remove, skipResize, destroyChild) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$C	= $Cs[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		;
-		// NOTE: elements can still exist even after remove()
-		//		so check for missing data(), which is cleared by removed()
-		if ($P && $.isEmptyObject( $P.data() )) $P = false;
-		if ($C && $.isEmptyObject( $C.data() )) $C = false;
-		if ($R && $.isEmptyObject( $R.data() )) $R = false;
-		if ($T && $.isEmptyObject( $T.data() )) $T = false;
-
-		if ($P) $P.stop(true, true);
-
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	d	= "layout"
-		,	css	= "layoutCSS"
-		,	pC	= children[pane]
-		,	hasChildren	= $.isPlainObject( pC ) && !$.isEmptyObject( pC )
-		,	destroy		= destroyChild !== undefined ? destroyChild : o.destroyChildren
-		;
-		// FIRST destroy the child-layout(s)
-		if (hasChildren && destroy) {
-			$.each( pC, function (key, child) {
-				if (!child.destroyed)
-					child.destroy(true);// tell child-layout to destroy ALL its child-layouts too
-				if (child.destroyed)	// destroy was successful
-					delete pC[key];
-			});
-			// if no more children, remove the children hash
-			if ($.isEmptyObject( pC )) {
-				pC = children[pane] = null; // clear children hash
-				hasChildren = false;
-			}
-		}
-
-		// Note: can't 'remove' a pane element with non-destroyed children
-		if ($P && remove && !hasChildren)
-			$P.remove(); // remove the pane-element and everything inside it
-		else if ($P && $P[0]) {
-			//	create list of ALL pane-classes that need to be removed
-			var	root	= o.paneClass // default="ui-layout-pane"
-			,	pRoot	= root +"-"+ pane // eg: "ui-layout-pane-west"
-			,	_open	= "-open"
-			,	_sliding= "-sliding"
-			,	_closed	= "-closed"
-			,	classes	= [	root, root+_open, root+_closed, root+_sliding,		// generic classes
-							pRoot, pRoot+_open, pRoot+_closed, pRoot+_sliding ]	// pane-specific classes
-			;
-			$.merge(classes, getHoverClasses($P, true)); // ADD hover-classes
-			// remove all Layout classes from pane-element
-			$P	.removeClass( classes.join(" ") ) // remove ALL pane-classes
-				.removeData("parentLayout")
-				.removeData("layoutPane")
-				.removeData("layoutRole")
-				.removeData("layoutEdge")
-				.removeData("autoHidden")	// in case set
-				.unbind("."+ sID) // remove ALL Layout events
-				// TODO: remove these extra unbind commands when jQuery is fixed
-				//.unbind("mouseenter"+ sID)
-				//.unbind("mouseleave"+ sID)
-			;
-			// do NOT reset CSS if this pane/content is STILL the container of a nested layout!
-			// the nested layout will reset its 'container' CSS when/if it is destroyed
-			if (hasChildren && $C) {
-				// a content-div may not have a specific width, so give it one to contain the Layout
-				$C.width( $C.width() );
-				$.each( pC, function (key, child) {
-					child.resizeAll(); // resize the Layout
-				});
-			}
-			else if ($C)
-				$C.css( $C.data(css) ).removeData(css).removeData("layoutRole");
-			// remove pane AFTER content in case there was a nested layout
-			if (!$P.data(d))
-				$P.css( $P.data(css) ).removeData(css);
-		}
-
-		// REMOVE pane resizer and toggler elements
-		if ($T) $T.remove();
-		if ($R) $R.remove();
-
-		// CLEAR all pointers and state data
-		Instance[pane] = $Ps[pane] = $Cs[pane] = $Rs[pane] = $Ts[pane] = false;
-		s = { removed: true };
-
-		if (!skipResize)
-			resizeAll();
-	}
-
-
-/*
- * ###########################
- *	   ACTION METHODS
- * ###########################
- */
-
-	/**
-	* @param {string}	pane
-	*/
-,	_hidePane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	s	= $P[0].style
-		;
-		if (o.useOffscreenClose) {
-			if (!$P.data(_c.offscreenReset))
-				$P.data(_c.offscreenReset, { left: s.left, right: s.right });
-			$P.css( _c.offscreenCSS );
-		}
-		else
-			$P.hide().removeData(_c.offscreenReset);
-	}
-
-	/**
-	* @param {string}	pane
-	*/
-,	_showPane = function (pane) {
-		var $P	= $Ps[pane]
-		,	o	= options[pane]
-		,	off	= _c.offscreenCSS
-		,	old	= $P.data(_c.offscreenReset)
-		,	s	= $P[0].style
-		;
-		$P	.show() // ALWAYS show, just in case
-			.removeData(_c.offscreenReset);
-		if (o.useOffscreenClose && old) {
-			if (s.left == off.left)
-				s.left = old.left;
-			if (s.right == off.right)
-				s.right = old.right;
-		}
-	}
-
-
-	/**
-	* Completely 'hides' a pane, including its spacing - as if it does not exist
-	* The pane is not actually 'removed' from the source, so can use 'show' to un-hide it
-	*
-	* @param {(string|Object)}	evt_or_pane			The pane being hidden, ie: north, south, east, or west
-	* @param {boolean=}			[noAnimation=false]	
-	*/
-,	hide = function (evt_or_pane, noAnimation) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (!$P || s.isHidden) return; // pane does not exist OR is already hidden
-
-		// onhide_start callback - will CANCEL hide if returns false
-		if (state.initialized && false === _runCallbacks("onhide_start", pane)) return;
-
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now hide the elements
-		if ($R) $R.hide(); // hide resizer-bar
-		if (!state.initialized || s.isClosed) {
-			s.isClosed = true; // to trigger open-animation on show()
-			s.isHidden  = true;
-			s.isVisible = false;
-			if (!state.initialized)
-				_hidePane(pane); // no animation when loading page
-			sizeMidPanes(_c[pane].dir === "horz" ? "" : "center");
-			if (state.initialized || o.triggerEventsOnLoad)
-				_runCallbacks("onhide_end", pane);
-		}
-		else {
-			s.isHiding = true; // used by onclose
-			close(pane, false, noAnimation); // adjust all panes to fit
-		}
-	}
-
-	/**
-	* Show a hidden pane - show as 'closed' by default unless openPane = true
-	*
-	* @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	* @param {boolean=}			[openPane=false]
-	* @param {boolean=}			[noAnimation=false]
-	* @param {boolean=}			[noAlert=false]
-	*/
-,	show = function (evt_or_pane, openPane, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		;
-		if (!$P || !s.isHidden) return; // pane does not exist OR is not hidden
-
-		// onshow_start callback - will CANCEL show if returns false
-		if (false === _runCallbacks("onshow_start", pane)) return;
-
-		s.isShowing = true; // used by onopen/onclose
-		//s.isHidden  = false; - will be set by open/close - if not cancelled
-		s.isSliding = false; // just in case
-		delete state.panesSliding[pane];
-
-		// now show the elements
-		//if ($R) $R.show(); - will be shown by open/close
-		if (openPane === false)
-			close(pane, true); // true = force
-		else
-			open(pane, false, noAnimation, noAlert); // adjust all panes to fit
-	}
-
-
-	/**
-	* Toggles a pane open/closed by calling either open or close
-	*
-	* @param {(string|Object)}	evt_or_pane		The pane being toggled, ie: north, south, east, or west
-	* @param {boolean=}			[slide=false]
-	*/
-,	toggle = function (evt_or_pane, slide) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		;
-		if (evt) // called from to $R.dblclick OR triggerPaneEvent
-			evt.stopImmediatePropagation();
-		if (s.isHidden)
-			show(pane); // will call 'open' after unhiding it
-		else if (s.isClosed)
-			open(pane, !!slide);
-		else
-			close(pane);
-	}
-
-
-	/**
-	* Utility method used during init or other auto-processes
-	*
-	* @param {string}	pane   The pane being closed
-	* @param {boolean=}	[setHandles=false]
-	*/
-,	_closePane = function (pane, setHandles) {
-		var
-			$P	= $Ps[pane]
-		,	s	= state[pane]
-		;
-		_hidePane(pane);
-		s.isClosed = true;
-		s.isVisible = false;
-		if (setHandles) setAsClosed(pane);
-	}
-
-	/**
-	* Close the specified pane (animation optional), and resize all other panes as needed
-	*
-	* @param {(string|Object)}	evt_or_pane			The pane being closed, ie: north, south, east, or west
-	* @param {boolean=}			[force=false]
-	* @param {boolean=}			[noAnimation=false]
-	* @param {boolean=}			[skipCallback=false]
-	*/
-,	close = function (evt_or_pane, force, noAnimation, skipCallback) {
-		var	pane = evtPane.call(this, evt_or_pane);
-		// if pane has been initialized, but NOT the complete layout, close pane instantly
-		if (!state.initialized && $Ps[pane]) {
-			_closePane(pane, true); // INIT pane as closed
-			return;
-		}
-		if (!isInitialized()) return;
-
-		var
-			$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing, isHiding, wasSliding;
-
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.closable && !s.isShowing && !s.isHiding)	// invalid request // (!o.resizable && !o.closable) ???
-			||	(!force && s.isClosed && !s.isShowing)			// already closed
-			) return queueNext();
-
-			// onclose_start callback - will CANCEL hide if returns false
-			// SKIP if just 'showing' a hidden pane as 'closed'
-			var abort = !s.isShowing && false === _runCallbacks("onclose_start", pane);
-
-			// transfer logic vars to temp vars
-			isShowing	= s.isShowing;
-			isHiding	= s.isHiding;
-			wasSliding	= s.isSliding;
-			// now clear the logic vars (REQUIRED before aborting)
-			delete s.isShowing;
-			delete s.isHiding;
-
-			if (abort) return queueNext();
-
-			doFX		= !noAnimation && !s.isClosed && (o.fxName_close != "none");
-			s.isMoving	= true;
-			s.isClosed	= true;
-			s.isVisible	= false;
-			// update isHidden BEFORE sizing panes
-			if (isHiding) s.isHidden = true;
-			else if (isShowing) s.isHidden = false;
-
-			if (s.isSliding) // pane is being closed, so UNBIND trigger events
-				bindStopSlidingEvents(pane, false); // will set isSliding=false
-			else // resize panes adjacent to this one
-				sizeMidPanes(_c[pane].dir === "horz" ? "" : "center", false); // false = NOT skipCallback
-
-			// if this pane has a resizer bar, move it NOW - before animation
-			setAsClosed(pane);
-
-			// CLOSE THE PANE
-			if (doFX) { // animate the close
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-				$P.hide( o.fxName_close, o.fxSettings_close, o.fxSpeed_close, function () {
-					lockPaneForFX(pane, false); // undo
-					if (s.isClosed) close_2();
-					queueNext();
-				});
-			}
-			else { // hide the pane without animation
-				_hidePane(pane);
-				close_2();
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function close_2 () {
-			s.isMoving	= false;
-			bindStartSlidingEvents(pane, true); // will enable if o.slidable = true
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane );
-			}
-
-			if (!skipCallback && (state.initialized || o.triggerEventsOnLoad)) {
-				// onclose callback - UNLESS just 'showing' a hidden pane as 'closed'
-				if (!isShowing)	_runCallbacks("onclose_end", pane);
-				// onhide OR onshow callback
-				if (isShowing)	_runCallbacks("onshow_end", pane);
-				if (isHiding)	_runCallbacks("onhide_end", pane);
-			}
-		}
-	}
-
-	/**
-	* @param {string}	pane	The pane just closed, ie: north, south, east, or west
-	*/
-,	setAsClosed = function (pane) {
-		if (!$Rs[pane]) return; // handles not initialized yet!
-		var
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_sliding= "-sliding"
-		,	_closed	= "-closed"
-		;
-		$R
-			.css(side, sC.inset[side]) // move the resizer
-			.removeClass( rClass+_open +" "+ rClass+_pane+_open )
-			.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-			.addClass( rClass+_closed +" "+ rClass+_pane+_closed )
-		;
-		// DISABLE 'resizing' when closed - do this BEFORE bindStartSlidingEvents?
-		if (o.resizable && $.layout.plugins.draggable)
-			$R
-				.draggable("disable")
-				.removeClass("ui-state-disabled") // do NOT apply disabled styling - not suitable here
-				.css("cursor", "default")
-				.attr("title","")
-			;
-
-		// if pane has a toggler button, adjust that too
-		if ($T) {
-			$T
-				.removeClass( tClass+_open +" "+ tClass+_pane+_open )
-				.addClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.attr("title", o.tips.Open) // may be blank
-			;
-			// toggler-content - if exists
-			$T.children(".content-open").hide();
-			$T.children(".content-closed").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, false);
-
-		if (state.initialized) {
-			// resize 'length' and position togglers for adjacent panes
-			sizeHandles();
-		}
-	}
-
-	/**
-	* Open the specified pane (animation optional), and resize all other panes as needed
-	*
-	* @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
-	* @param {boolean=}			[slide=false]
-	* @param {boolean=}			[noAnimation=false]
-	* @param {boolean=}			[noAlert=false]
-	*/
-,	open = function (evt_or_pane, slide, noAnimation, noAlert) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	doFX, isShowing
-		;
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-
-			if ( !$P
-			||	(!o.resizable && !o.closable && !s.isShowing)	// invalid request
-			||	(s.isVisible && !s.isSliding)					// already open
-			) return queueNext();
-
-			// pane can ALSO be unhidden by just calling show(), so handle this scenario
-			if (s.isHidden && !s.isShowing) {
-				queueNext(); // call before show() because it needs the queue free
-				show(pane, true);
-				return;
-			}
-
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else
-				// make sure there is enough space available to open the pane
-				setSizeLimits(pane, slide);
-
-			// onopen_start callback - will CANCEL open if returns false
-			var cbReturn = _runCallbacks("onopen_start", pane);
-
-			if (cbReturn === "abort")
-				return queueNext();
-
-			// update pane-state again in case options were changed in onopen_start
-			if (cbReturn !== "NC") // NC = "No Callback"
-				setSizeLimits(pane, slide);
-
-			if (s.minSize > s.maxSize) { // INSUFFICIENT ROOM FOR PANE TO OPEN!
-				syncPinBtns(pane, false); // make sure pin-buttons are reset
-				if (!noAlert && o.tips.noRoomToOpen)
-					alert(o.tips.noRoomToOpen);
-				return queueNext(); // ABORT
-			}
-
-			if (slide) // START Sliding - will set isSliding=true
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (s.isSliding) // PIN PANE (stop sliding) - open pane 'normally' instead
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - will set isSliding=false
-			else if (o.slidable)
-				bindStartSlidingEvents(pane, false); // UNBIND trigger events
-
-			s.noRoom = false; // will be reset by makePaneFit if 'noRoom'
-			makePaneFit(pane);
-
-			// transfer logic var to temp var
-			isShowing = s.isShowing;
-			// now clear the logic var
-			delete s.isShowing;
-
-			doFX		= !noAnimation && s.isClosed && (o.fxName_open != "none");
-			s.isMoving	= true;
-			s.isVisible	= true;
-			s.isClosed	= false;
-			// update isHidden BEFORE sizing panes - WHY??? Old?
-			if (isShowing) s.isHidden = false;
-
-			if (doFX) { // ANIMATE
-				// mask adjacent panes with objects
-				lockPaneForFX(pane, true);	// need to set left/top so animation will work
-					$P.show( o.fxName_open, o.fxSettings_open, o.fxSpeed_open, function() {
-					lockPaneForFX(pane, false); // undo
-					if (s.isVisible) open_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				_showPane(pane);// just show pane and...
-				open_2();		// continue
-				queueNext();
-			};
-		});
-
-		// SUBROUTINE
-		function open_2 () {
-			s.isMoving	= false;
-
-			// cure iframe display issues
-			_fixIframe(pane);
-
-			// NOTE: if isSliding, then other panes are NOT 'resized'
-			if (!s.isSliding) { // resize all panes adjacent to this one
-				sizeMidPanes(_c[pane].dir=="vert" ? "center" : "", false); // false = NOT skipCallback
-			}
-
-			// set classes, position handles and execute callbacks...
-			setAsOpen(pane);
-		};
-	
-	}
-
-	/**
-	* @param {string}	pane		The pane just opened, ie: north, south, east, or west
-	* @param {boolean=}	[skipCallback=false]
-	*/
-,	setAsOpen = function (pane, skipCallback) {
-		var 
-			$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	$T		= $Ts[pane]
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	side	= _c[pane].side
-		,	rClass	= o.resizerClass
-		,	tClass	= o.togglerClass
-		,	_pane	= "-"+ pane // used for classNames
-		,	_open	= "-open"
-		,	_closed	= "-closed"
-		,	_sliding= "-sliding"
-		;
-		$R
-			.css(side, sC.inset[side] + getPaneSize(pane)) // move the resizer
-			.removeClass( rClass+_closed +" "+ rClass+_pane+_closed )
-			.addClass( rClass+_open +" "+ rClass+_pane+_open )
-		;
-		if (s.isSliding)
-			$R.addClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-		else // in case 'was sliding'
-			$R.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
-
-		removeHover( 0, $R ); // remove hover classes
-		if (o.resizable && $.layout.plugins.draggable)
-			$R	.draggable("enable")
-				.css("cursor", o.resizerCursor)
-				.attr("title", o.tips.Resize);
-		else if (!s.isSliding)
-			$R.css("cursor", "default"); // n-resize, s-resize, etc
-
-		// if pane also has a toggler button, adjust that too
-		if ($T) {
-			$T	.removeClass( tClass+_closed +" "+ tClass+_pane+_closed )
-				.addClass( tClass+_open +" "+ tClass+_pane+_open )
-				.attr("title", o.tips.Close); // may be blank
-			removeHover( 0, $T ); // remove hover classes
-			// toggler-content - if exists
-			$T.children(".content-closed").hide();
-			$T.children(".content-open").css("display","block");
-		}
-
-		// sync any 'pin buttons'
-		syncPinBtns(pane, !s.isSliding);
-
-		// update pane-state dimensions - BEFORE resizing content
-		$.extend(s, elDims($P));
-
-		if (state.initialized) {
-			// resize resizer & toggler sizes for all panes
-			sizeHandles();
-			// resize content every time pane opens - to be sure
-			sizeContent(pane, true); // true = remeasure headers/footers, even if 'pane.isMoving'
-		}
-
-		if (!skipCallback && (state.initialized || o.triggerEventsOnLoad) && $P.is(":visible")) {
-			// onopen callback
-			_runCallbacks("onopen_end", pane);
-			// onshow callback - TODO: should this be here?
-			if (s.isShowing) _runCallbacks("onshow_end", pane);
-
-			// ALSO call onresize because layout-size *may* have changed while pane was closed
-			if (state.initialized)
-				_runCallbacks("onresize_end", pane);
-		}
-
-		// TODO: Somehow sizePane("north") is being called after this point???
-	}
-
-
-	/**
-	* slideOpen / slideClose / slideToggle
-	*
-	* Pass-though methods for sliding
-	*/
-,	slideOpen = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	s		= state[pane]
-		,	delay	= options[pane].slideDelay_open
-		;
-		// prevent event from triggering on NEW resizer binding created below
-		if (evt) evt.stopImmediatePropagation();
-
-		if (s.isClosed && evt && evt.type === "mouseenter" && delay > 0)
-			// trigger = mouseenter - use a delay
-			timer.set(pane+"_openSlider", open_NOW, delay);
-		else
-			open_NOW(); // will unbind events if is already open
-
-		/**
-		* SUBROUTINE for timed open
-		*/
-		function open_NOW () {
-			if (!s.isClosed) // skip if no longer closed!
-				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
-			else if (!s.isMoving)
-				open(pane, true); // true = slide - open() will handle binding
-		};
-	}
-
-,	slideClose = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	evt		= evtObj(evt_or_pane)
-		,	pane	= evtPane.call(this, evt_or_pane)
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	delay	= s.isMoving ? 1000 : 300 // MINIMUM delay - option may override
-		;
-		if (s.isClosed || s.isResizing)
-			return; // skip if already closed OR in process of resizing
-		else if (o.slideTrigger_close === "click")
-			close_NOW(); // close immediately onClick
-		else if (o.preventQuickSlideClose && s.isMoving)
-			return; // handle Chrome quick-close on slide-open
-		else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
-			return; // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
-		else if (evt) // trigger = mouseleave - use a delay
-			// 1 sec delay if 'opening', else .3 sec
-			timer.set(pane+"_closeSlider", close_NOW, max(o.slideDelay_close, delay));
-		else // called programically
-			close_NOW();
-
-		/**
-		* SUBROUTINE for timed close
-		*/
-		function close_NOW () {
-			if (s.isClosed) // skip 'close' if already closed!
-				bindStopSlidingEvents(pane, false); // UNBIND trigger events - TODO: is this needed here?
-			else if (!s.isMoving)
-				close(pane); // close will handle unbinding
-		};
-	}
-
-	/**
-	* @param {(string|Object)}	evt_or_pane		The pane being opened, ie: north, south, east, or west
-	*/
-,	slideToggle = function (evt_or_pane) {
-		var pane = evtPane.call(this, evt_or_pane);
-		toggle(pane, true);
-	}
-
-
-	/**
-	* Must set left/top on East/South panes so animation will work properly
-	*
-	* @param {string}	pane	The pane to lock, 'east' or 'south' - any other is ignored!
-	* @param {boolean}	doLock  true = set left/top, false = remove
-	*/
-,	lockPaneForFX = function (pane, doLock) {
-		var $P	= $Ps[pane]
-		,	s	= state[pane]
-		,	o	= options[pane]
-		,	z	= options.zIndexes
-		;
-		if (doLock) {
-			showMasks( pane, { animation: true, objectsOnly: true });
-			$P.css({ zIndex: z.pane_animate }); // overlay all elements during animation
-			if (pane=="south")
-				$P.css({ top: sC.inset.top + sC.innerHeight - $P.outerHeight() });
-			else if (pane=="east")
-				$P.css({ left: sC.inset.left + sC.innerWidth - $P.outerWidth() });
-		}
-		else { // animation DONE - RESET CSS
-			hideMasks();
-			$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-			if (pane=="south")
-				$P.css({ top: "auto" });
-			// if pane is positioned 'off-screen', then DO NOT screw with it!
-			else if (pane=="east" && !$P.css("left").match(/\-99999/))
-				$P.css({ left: "auto" });
-			// fix anti-aliasing in IE - only needed for animations that change opacity
-			if (browser.msie && o.fxOpacityFix && o.fxName_open != "slide" && $P.css("filter") && $P.css("opacity") == 1)
-				$P[0].style.removeAttribute('filter');
-		}
-	}
-
-
-	/**
-	* Toggle sliding functionality of a specific pane on/off by adding removing 'slide open' trigger
-	*
-	* @see  open(), close()
-	* @param {string}	pane	The pane to enable/disable, 'north', 'south', etc.
-	* @param {boolean}	enable	Enable or Disable sliding?
-	*/
-,	bindStartSlidingEvents = function (pane, enable) {
-		var o		= options[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	evtName	= o.slideTrigger_open.toLowerCase()
-		;
-		if (!$R || (enable && !o.slidable)) return;
-
-		// make sure we have a valid event
-		if (evtName.match(/mouseover/))
-			evtName = o.slideTrigger_open = "mouseenter";
-		else if (!evtName.match(/(click|dblclick|mouseenter)/)) 
-			evtName = o.slideTrigger_open = "click";
-
-		// must remove double-click-toggle when using dblclick-slide
-		if (o.resizerDblClickToggle && evtName.match(/click/)) {
-			$R[enable ? "unbind" : "bind"]('dblclick.'+ sID, toggle)
-		}
-
-		$R
-			// add or remove event
-			[enable ? "bind" : "unbind"](evtName +'.'+ sID, slideOpen)
-			// set the appropriate cursor & title/tip
-			.css("cursor", enable ? o.sliderCursor : "default")
-			.attr("title", enable ? o.tips.Slide : "")
-		;
-	}
-
-	/**
-	* Add or remove 'mouseleave' events to 'slide close' when pane is 'sliding' open or closed
-	* Also increases zIndex when pane is sliding open
-	* See bindStartSlidingEvents for code to control 'slide open'
-	*
-	* @see  slideOpen(), slideClose()
-	* @param {string}	pane	The pane to process, 'north', 'south', etc.
-	* @param {boolean}	enable	Enable or Disable events?
-	*/
-,	bindStopSlidingEvents = function (pane, enable) {
-		var	o		= options[pane]
-		,	s		= state[pane]
-		,	c		= _c[pane]
-		,	z		= options.zIndexes
-		,	evtName	= o.slideTrigger_close.toLowerCase()
-		,	action	= (enable ? "bind" : "unbind")
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		;
-		timer.clear(pane+"_closeSlider"); // just in case
-
-		if (enable) {
-			s.isSliding = true;
-			state.panesSliding[pane] = true;
-			// remove 'slideOpen' event from resizer
-			// ALSO will raise the zIndex of the pane & resizer
-			bindStartSlidingEvents(pane, false);
-		}
-		else {
-			s.isSliding = false;
-			delete state.panesSliding[pane];
-		}
-
-		// RE/SET zIndex - increases when pane is sliding-open, resets to normal when not
-		$P.css("zIndex", enable ? z.pane_sliding : z.pane_normal);
-		$R.css("zIndex", enable ? z.pane_sliding+2 : z.resizer_normal); // NOTE: mask = pane_sliding+1
-
-		// make sure we have a valid event
-		if (!evtName.match(/(click|mouseleave)/))
-			evtName = o.slideTrigger_close = "mouseleave"; // also catches 'mouseout'
-
-		// add/remove slide triggers
-		$R[action](evtName, slideClose); // base event on resize
-		// need extra events for mouseleave
-		if (evtName === "mouseleave") {
-			// also close on pane.mouseleave
-			$P[action]("mouseleave."+ sID, slideClose);
-			// cancel timer when mouse moves between 'pane' and 'resizer'
-			$R[action]("mouseenter."+ sID, cancelMouseOut);
-			$P[action]("mouseenter."+ sID, cancelMouseOut);
-		}
-
-		if (!enable)
-			timer.clear(pane+"_closeSlider");
-		else if (evtName === "click" && !o.resizable) {
-			// IF pane is not resizable (which already has a cursor and tip) 
-			// then set the a cursor & title/tip on resizer when sliding
-			$R.css("cursor", enable ? o.sliderCursor : "default");
-			$R.attr("title", enable ? o.tips.Close : ""); // use Toggler-tip, eg: "Close Pane"
-		}
-
-		// SUBROUTINE for mouseleave timer clearing
-		function cancelMouseOut (evt) {
-			timer.clear(pane+"_closeSlider");
-			evt.stopPropagation();
-		}
-	}
-
-
-	/**
-	* Hides/closes a pane if there is insufficient room - reverses this when there is room again
-	* MUST have already called setSizeLimits() before calling this method
-	*
-	* @param {string}	pane					The pane being resized
-	* @param {boolean=}	[isOpening=false]		Called from onOpen?
-	* @param {boolean=}	[skipCallback=false]	Should the onresize callback be run?
-	* @param {boolean=}	[force=false]
-	*/
-,	makePaneFit = function (pane, isOpening, skipCallback, force) {
-		var	o	= options[pane]
-		,	s	= state[pane]
-		,	c	= _c[pane]
-		,	$P	= $Ps[pane]
-		,	$R	= $Rs[pane]
-		,	isSidePane 	= c.dir==="vert"
-		,	hasRoom		= false
-		;
-		// special handling for center & east/west panes
-		if (pane === "center" || (isSidePane && s.noVerticalRoom)) {
-			// see if there is enough room to display the pane
-			// ERROR: hasRoom = s.minHeight <= s.maxHeight && (isSidePane || s.minWidth <= s.maxWidth);
-			hasRoom = (s.maxHeight >= 0);
-			if (hasRoom && s.noRoom) { // previously hidden due to noRoom, so show now
-				_showPane(pane);
-				if ($R) $R.show();
-				s.isVisible = true;
-				s.noRoom = false;
-				if (isSidePane) s.noVerticalRoom = false;
-				_fixIframe(pane);
-			}
-			else if (!hasRoom && !s.noRoom) { // not currently hidden, so hide now
-				_hidePane(pane);
-				if ($R) $R.hide();
-				s.isVisible = false;
-				s.noRoom = true;
-			}
-		}
-
-		// see if there is enough room to fit the border-pane
-		if (pane === "center") {
-			// ignore center in this block
-		}
-		else if (s.minSize <= s.maxSize) { // pane CAN fit
-			hasRoom = true;
-			if (s.size > s.maxSize) // pane is too big - shrink it
-				sizePane(pane, s.maxSize, skipCallback, true, force); // true = noAnimation
-			else if (s.size < s.minSize) // pane is too small - enlarge it
-				sizePane(pane, s.minSize, skipCallback, true, force); // true = noAnimation
-			// need s.isVisible because new pseudoClose method keeps pane visible, but off-screen
-			else if ($R && s.isVisible && $P.is(":visible")) {
-				// make sure resizer-bar is positioned correctly
-				// handles situation where nested layout was 'hidden' when initialized
-				var	pos = s.size + sC.inset[c.side];
-				if ($.layout.cssNum( $R, c.side ) != pos) $R.css( c.side, pos );
-			}
-
-			// if was previously hidden due to noRoom, then RESET because NOW there is room
-			if (s.noRoom) {
-				// s.noRoom state will be set by open or show
-				if (s.wasOpen && o.closable) {
-					if (o.autoReopen)
-						open(pane, false, true, true); // true = noAnimation, true = noAlert
-					else // leave the pane closed, so just update state
-						s.noRoom = false;
-				}
-				else
-					show(pane, s.wasOpen, true, true); // true = noAnimation, true = noAlert
-			}
-		}
-		else { // !hasRoom - pane CANNOT fit
-			if (!s.noRoom) { // pane not set as noRoom yet, so hide or close it now...
-				s.noRoom = true; // update state
-				s.wasOpen = !s.isClosed && !s.isSliding;
-				if (s.isClosed){} // SKIP
-				else if (o.closable) // 'close' if possible
-					close(pane, true, true); // true = force, true = noAnimation
-				else // 'hide' pane if cannot just be closed
-					hide(pane, true); // true = noAnimation
-			}
-		}
-	}
-
-
-	/**
-	* manualSizePane is an exposed flow-through method allowing extra code when pane is 'manually resized'
-	*
-	* @param {(string|Object)}	evt_or_pane				The pane being resized
-	* @param {number}			size					The *desired* new size for this pane - will be validated
-	* @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	* @param {boolean=}			[noAnimation=false]
-	* @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	*/
-,	manualSizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	o	= options[pane]
-		,	s	= state[pane]
-		//	if resizing callbacks have been delayed and resizing is now DONE, force resizing to complete...
-		,	forceResize = force || (o.livePaneResizing && !s.isResizing)
-		;
-		// ANY call to manualSizePane disables autoResize - ie, percentage sizing
-		s.autoResize = false;
-		// flow-through...
-		sizePane(pane, size, skipCallback, noAnimation, forceResize); // will animate resize if option enabled
-	}
-
-	/**
-	* sizePane is called only by internal methods whenever a pane needs to be resized
-	*
-	* @param {(string|Object)}	evt_or_pane				The pane being resized
-	* @param {number}			size					The *desired* new size for this pane - will be validated
-	* @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
-	* @param {boolean=}			[noAnimation=false]
-	* @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
-	*/
-,	sizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
-		if (!isInitialized()) return;
-		var	pane	= evtPane.call(this, evt_or_pane) // probably NEVER called from event?
-		,	o		= options[pane]
-		,	s		= state[pane]
-		,	$P		= $Ps[pane]
-		,	$R		= $Rs[pane]
-		,	side	= _c[pane].side
-		,	dimName	= _c[pane].sizeType.toLowerCase()
-		,	skipResizeWhileDragging = s.isResizing && !o.triggerEventsDuringLiveResize
-		,	doFX	= noAnimation !== true && o.animatePaneSizing
-		,	oldSize, newSize
-		;
-		// QUEUE in case another action/animation is in progress
-		$N.queue(function( queueNext ){
-			// calculate 'current' min/max sizes
-			setSizeLimits(pane); // update pane-state
-			oldSize = s.size;
-			size = _parseSize(pane, size); // handle percentages & auto
-			size = max(size, _parseSize(pane, o.minSize));
-			size = min(size, s.maxSize);
-			if (size < s.minSize) { // not enough room for pane!
-				queueNext(); // call before makePaneFit() because it needs the queue free
-				makePaneFit(pane, false, skipCallback);	// will hide or close pane
-				return;
-			}
-
-			// IF newSize is same as oldSize, then nothing to do - abort
-			if (!force && size === oldSize)
-				return queueNext();
-
-			s.newSize = size;
-
-			// onresize_start callback CANNOT cancel resizing because this would break the layout!
-			if (!skipCallback && state.initialized && s.isVisible)
-				_runCallbacks("onresize_start", pane);
-
-			// resize the pane, and make sure its visible
-			newSize = cssSize(pane, size);
-
-			if (doFX && $P.is(":visible")) { // ANIMATE
-				var fx		= $.layout.effects.size[pane] || $.layout.effects.size.all
-				,	easing	= o.fxSettings_size.easing || fx.easing
-				,	z		= options.zIndexes
-				,	props	= {};
-				props[ dimName ] = newSize +'px';
-				s.isMoving = true;
-				// overlay all elements during animation
-				$P.css({ zIndex: z.pane_animate })
-				  .show().animate( props, o.fxSpeed_size, easing, function(){
-					// reset zIndex after animation
-					$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
-					s.isMoving = false;
-					delete s.newSize;
-					sizePane_2(); // continue
-					queueNext();
-				});
-			}
-			else { // no animation
-				$P.css( dimName, newSize );	// resize pane
-				delete s.newSize;
-				// if pane is visible, then 
-				if ($P.is(":visible"))
-					sizePane_2(); // continue
-				else {
-					// pane is NOT VISIBLE, so just update state data...
-					// when pane is *next opened*, it will have the new size
-					s.size = size;				// update state.size
-					$.extend(s, elDims($P));	// update state dimensions
-				}
-				queueNext();
-			};
-
-		});
-
-		// SUBROUTINE
-		function sizePane_2 () {
-			/*	Panes are sometimes not sized precisely in some browsers!?
-			 *	This code will resize the pane up to 3 times to nudge the pane to the correct size
-			 */
-			var	actual	= dimName==='width' ? $P.outerWidth() : $P.outerHeight()
-			,	tries	= [{
-						   	pane:		pane
-						,	count:		1
-						,	target:		size
-						,	actual:		actual
-						,	correct:	(size === actual)
-						,	attempt:	size
-						,	cssSize:	newSize
-						}]
-			,	lastTry = tries[0]
-			,	thisTry	= {}
-			,	msg		= 'Inaccurate size after resizing the '+ pane +'-pane.'
-			;
-			while ( !lastTry.correct ) {
-				thisTry = { pane: pane, count: lastTry.count+1, target: size };
-
-				if (lastTry.actual > size)
-					thisTry.attempt = max(0, lastTry.attempt - (lastTry.actual - size));
-				else // lastTry.actual < size
-					thisTry.attempt = max(0, lastTry.attempt + (size - lastTry.actual));
-
-				thisTry.cssSize = cssSize(pane, thisTry.attempt);
-				$P.css( dimName, thisTry.cssSize );
-
-				thisTry.actual	= dimName=='width' ? $P.outerWidth() : $P.outerHeight();
-				thisTry.correct	= (size === thisTry.actual);
-
-				// log attempts and alert the user of this *non-fatal error* (if showDebugMessages)
-				if ( tries.length === 1) {
-					_log(msg, false, true);
-					_log(lastTry, false, true);
-				}
-				_log(thisTry, false, true);
-				// after 4 tries, is as close as its gonna get!
-				if (tries.length > 3) break;
-
-				tries.push( thisTry );
-				lastTry = tries[ tries.length - 1 ];
-			}
-			// END TESTING CODE
-
-			// update pane-state dimensions
-			s.size	= size;
-			$.extend(s, elDims($P));
-
-			if (s.isVisible && $P.is(":visible")) {
-				// reposition the resizer-bar
-				if ($R) $R.css( side, size + sC.inset[side] );
-				// resize the content-div
-				sizeContent(pane);
-			}
-
-			if (!skipCallback && !skipResizeWhileDragging && state.initialized && s.isVisible)
-				_runCallbacks("onresize_end", pane);
-
-			// resize all the adjacent panes, and adjust their toggler buttons
-			// when skipCallback passed, it means the controlling method will handle 'other panes'
-			if (!skipCallback) {
-				// also no callback if live-resize is in progress and NOT triggerEventsDuringLiveResize
-				if (!s.isSliding) sizeMidPanes(_c[pane].dir=="horz" ? "" : "center", skipResizeWhileDragging, force);
-				sizeHandles();
-			}
-
-			// if opposite-pane was autoClosed, see if it can be autoOpened now
-			var altPane = _c.oppositeEdge[pane];
-			if (size < oldSize && state[ altPane ].noRoom) {
-				setSizeLimits( altPane );
-				makePaneFit( altPane, false, skipCallback );
-			}
-
-			// DEBUG - ALERT user/developer so they know there was a sizing problem
-			if (tries.length > 1)
-				_log(msg +'\nSee the Error Console for details.', true, true);
-		}
-	}
-
-	/**
-	* @see  initPanes(), sizePane(), 	resizeAll(), open(), close(), hide()
-	* @param {(Array.<string>|string)}	panes					The pane(s) being resized, comma-delmited string
-	* @param {boolean=}					[skipCallback=false]	Should the onresize callback be run?
-	* @param {boolean=}					[force=false]
-	*/
-,	sizeMidPanes = function (panes, skipCallback, force) {
-		panes = (panes ? panes : "east,west,center").split(",");
-
-		$.each(panes, function (i, pane) {
-			if (!$Ps[pane]) return; // NO PANE - skip
-			var 
-				o		= options[pane]
-			,	s		= state[pane]
-			,	$P		= $Ps[pane]
-			,	$R		= $Rs[pane]
-			,	isCenter= (pane=="center")
-			,	hasRoom	= true
-			,	CSS		= {}
-			//	if pane is not visible, show it invisibly NOW rather than for *each call* in this script
-			,	visCSS	= $.layout.showInvisibly($P)
-
-			,	newCenter	= calcNewCenterPaneDims()
-			;
-
-			// update pane-state dimensions
-			$.extend(s, elDims($P));
-
-			if (pane === "center") {
-				if (!force && s.isVisible && newCenter.width === s.outerWidth && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// set state for makePaneFit() logic
-				$.extend(s, cssMinDims(pane), {
-					maxWidth:	newCenter.width
-				,	maxHeight:	newCenter.height
-				});
-				CSS = newCenter;
-				s.newWidth	= CSS.width;
-				s.newHeight	= CSS.height;
-				// convert OUTER width/height to CSS width/height 
-				CSS.width	= cssW($P, CSS.width);
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, CSS.height);
-				hasRoom		= CSS.width >= 0 && CSS.height >= 0; // height >= 0 = ALWAYS TRUE NOW
-
-				// during layout init, try to shrink east/west panes to make room for center
-				if (!state.initialized && o.minWidth > newCenter.width) {
-					var
-						reqPx	= o.minWidth - s.outerWidth
-					,	minE	= options.east.minSize || 0
-					,	minW	= options.west.minSize || 0
-					,	sizeE	= state.east.size
-					,	sizeW	= state.west.size
-					,	newE	= sizeE
-					,	newW	= sizeW
-					;
-					if (reqPx > 0 && state.east.isVisible && sizeE > minE) {
-						newE = max( sizeE-minE, sizeE-reqPx );
-						reqPx -= sizeE-newE;
-					}
-					if (reqPx > 0 && state.west.isVisible && sizeW > minW) {
-						newW = max( sizeW-minW, sizeW-reqPx );
-						reqPx -= sizeW-newW;
-					}
-					// IF we found enough extra space, then resize the border panes as calculated
-					if (reqPx === 0) {
-						if (sizeE && sizeE != minE)
-							sizePane('east', newE, true, true, force); // true = skipCallback/noAnimation - initPanes will handle when done
-						if (sizeW && sizeW != minW)
-							sizePane('west', newW, true, true, force); // true = skipCallback/noAnimation
-						// now start over!
-						sizeMidPanes('center', skipCallback, force);
-						$P.css(visCSS);
-						return; // abort this loop
-					}
-				}
-			}
-			else { // for east and west, set only the height, which is same as center height
-				// set state.min/maxWidth/Height for makePaneFit() logic
-				if (s.isVisible && !s.noVerticalRoom)
-					$.extend(s, elDims($P), cssMinDims(pane))
-				if (!force && !s.noVerticalRoom && newCenter.height === s.outerHeight) {
-					$P.css(visCSS);
-					return true; // SKIP - pane already the correct size
-				}
-				// east/west have same top, bottom & height as center
-				CSS.top		= newCenter.top;
-				CSS.bottom	= newCenter.bottom;
-				s.newSize	= newCenter.height
-				// NEW - allow pane to extend 'below' visible area rather than hide it
-				CSS.height	= cssH($P, newCenter.height);
-				s.maxHeight	= CSS.height;
-				hasRoom		= (s.maxHeight >= 0); // ALWAYS TRUE NOW
-				if (!hasRoom) s.noVerticalRoom = true; // makePaneFit() logic
-			}
-
-			if (hasRoom) {
-				// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-				if (!skipCallback && state.initialized)
-					_runCallbacks("onresize_start", pane);
-
-				$P.css(CSS); // apply the CSS to pane
-				if (pane !== "center")
-					sizeHandles(pane); // also update resizer length
-				if (s.noRoom && !s.isClosed && !s.isHidden)
-					makePaneFit(pane); // will re-open/show auto-closed/hidden pane
-				if (s.isVisible) {
-					$.extend(s, elDims($P)); // update pane dimensions
-					if (state.initialized) sizeContent(pane); // also resize the contents, if exists
-				}
-			}
-			else if (!s.noRoom && s.isVisible) // no room for pane
-				makePaneFit(pane); // will hide or close pane
-
-			// reset visibility, if necessary
-			$P.css(visCSS);
-
-			delete s.newSize;
-			delete s.newWidth;
-			delete s.newHeight;
-
-			if (!s.isVisible)
-				return true; // DONE - next pane
-
-			/*
-			* Extra CSS for IE6 or IE7 in Quirks-mode - add 'width' to NORTH/SOUTH panes
-			* Normally these panes have only 'left' & 'right' positions so pane auto-sizes
-			* ALSO required when pane is an IFRAME because will NOT default to 'full width'
-			*	TODO: Can I use width:100% for a north/south iframe?
-			*	TODO: Sounds like a job for $P.outerWidth( sC.innerWidth ) SETTER METHOD
-			*/
-			if (pane === "center") { // finished processing midPanes
-				var fix = browser.isIE6 || !browser.boxModel;
-				if ($Ps.north && (fix || state.north.tagName=="IFRAME")) 
-					$Ps.north.css("width", cssW($Ps.north, sC.innerWidth));
-				if ($Ps.south && (fix || state.south.tagName=="IFRAME"))
-					$Ps.south.css("width", cssW($Ps.south, sC.innerWidth));
-			}
-
-			// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
-			if (!skipCallback && state.initialized)
-				_runCallbacks("onresize_end", pane);
-		});
-	}
-
-
-	/**
-	* @see  window.onresize(), callbacks or custom code
-	* @param {(Object|boolean)=}	evt_or_refresh	If 'true', then also reset pane-positioning
-	*/
-,	resizeAll = function (evt_or_refresh) {
-		var	oldW	= sC.innerWidth
-		,	oldH	= sC.innerHeight
-		;
-		// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
-		evtPane(evt_or_refresh);
-
-		// cannot size layout when 'container' is hidden or collapsed
-		if (!$N.is(":visible")) return;
-
-		if (!state.initialized) {
-			_initLayoutElements();
-			return; // no need to resize since we just initialized!
-		}
-
-		if (evt_or_refresh === true && $.isPlainObject(options.outset)) {
-			// update container CSS in case outset option has changed
-			$N.css( options.outset );
-		}
-		// UPDATE container dimensions
-		$.extend(sC, elDims( $N, options.inset ));
-		if (!sC.outerHeight) return;
-
-		// if 'true' passed, refresh pane & handle positioning too
-		if (evt_or_refresh === true) {
-			setPanePosition();
-		}
-
-		// onresizeall_start will CANCEL resizing if returns false
-		// state.container has already been set, so user can access this info for calcuations
-		if (false === _runCallbacks("onresizeall_start")) return false;
-
-		var	// see if container is now 'smaller' than before
-			shrunkH	= (sC.innerHeight < oldH)
-		,	shrunkW	= (sC.innerWidth < oldW)
-		,	$P, o, s
-		;
-		// NOTE special order for sizing: S-N-E-W
-		$.each(["south","north","east","west"], function (i, pane) {
-			if (!$Ps[pane]) return; // no pane - SKIP
-			o = options[pane];
-			s = state[pane];
-			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
-				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
-			else {
-				setSizeLimits(pane);
-				makePaneFit(pane, false, true, true); // true=skipCallback/forceResize
-			}
-		});
-
-		sizeMidPanes("", true, true); // true=skipCallback/forceResize
-		sizeHandles(); // reposition the toggler elements
-
-		// trigger all individual pane callbacks AFTER layout has finished resizing
-		$.each(_c.allPanes, function (i, pane) {
-			$P = $Ps[pane];
-			if (!$P) return; // SKIP
-			if (state[pane].isVisible) // undefined for non-existent panes
-				_runCallbacks("onresize_end", pane); // callback - if exists
-		});
-
-		_runCallbacks("onresizeall_end");
-		//_triggerLayoutEvent(pane, 'resizeall');
-	}
-
-	/**
-	* Whenever a pane resizes or opens that has a nested layout, trigger resizeAll
-	*
-	* @param {(string|Object)}	evt_or_pane		The pane just resized or opened
-	*/
-,	resizeChildren = function (evt_or_pane, skipRefresh) {
-		var	pane = evtPane.call(this, evt_or_pane);
-
-		if (!options[pane].resizeChildren) return;
-
-		// ensure the pane-children are up-to-date
-		if (!skipRefresh) refreshChildren( pane );
-		var pC = children[pane];
-		if ($.isPlainObject( pC )) {
-			// resize one or more children
-			$.each( pC, function (key, child) {
-				if (!child.destroyed) child.resizeAll();
-			});
-		}
-	}
-
-	/**
-	* IF pane has a content-div, then resize all elements inside pane to fit pane-height
-	*
-	* @param {(string|Object)}	evt_or_panes		The pane(s) being resized
-	* @param {boolean=}			[remeasure=false]	Should the content (header/footer) be remeasured?
-	*/
-,	sizeContent = function (evt_or_panes, remeasure) {
-		if (!isInitialized()) return;
-
-		var panes = evtPane.call(this, evt_or_panes);
-		panes = panes ? panes.split(",") : _c.allPanes;
-
-		$.each(panes, function (idx, pane) {
-			var
-				$P	= $Ps[pane]
-			,	$C	= $Cs[pane]
-			,	o	= options[pane]
-			,	s	= state[pane]
-			,	m	= s.content // m = measurements
-			;
-			if (!$P || !$C || !$P.is(":visible")) return true; // NOT VISIBLE - skip
-
-			// if content-element was REMOVED, update OR remove the pointer
-			if (!$C.length) {
-				initContent(pane, false);	// false = do NOT sizeContent() - already there!
-				if (!$C) return;			// no replacement element found - pointer have been removed
-			}
-
-			// onsizecontent_start will CANCEL resizing if returns false
-			if (false === _runCallbacks("onsizecontent_start", pane)) return;
-
-			// skip re-measuring offsets if live-resizing
-			if ((!s.isMoving && !s.isResizing) || o.liveContentResizing || remeasure || m.top == undefined) {
-				_measure();
-				// if any footers are below pane-bottom, they may not measure correctly,
-				// so allow pane overflow and re-measure
-				if (m.hiddenFooters > 0 && $P.css("overflow") === "hidden") {
-					$P.css("overflow", "visible");
-					_measure(); // remeasure while overflowing
-					$P.css("overflow", "hidden");
-				}
-			}
-			// NOTE: spaceAbove/Below *includes* the pane paddingTop/Bottom, but not pane.borders
-			var newH = s.innerHeight - (m.spaceAbove - s.css.paddingTop) - (m.spaceBelow - s.css.paddingBottom);
-
-			if (!$C.is(":visible") || m.height != newH) {
-				// size the Content element to fit new pane-size - will autoHide if not enough room
-				setOuterHeight($C, newH, true); // true=autoHide
-				m.height = newH; // save new height
-			};
-
-			if (state.initialized)
-				_runCallbacks("onsizecontent_end", pane);
-
-			function _below ($E) {
-				return max(s.css.paddingBottom, (parseInt($E.css("marginBottom"), 10) || 0));
-			};
-
-			function _measure () {
-				var
-					ignore	= options[pane].contentIgnoreSelector
-				,	$Fs		= $C.nextAll().not(".ui-layout-mask").not(ignore || ":lt(0)") // not :lt(0) = ALL
-				,	$Fs_vis	= $Fs.filter(':visible')
-				,	$F		= $Fs_vis.filter(':last')
-				;
-				m = {
-					top:			$C[0].offsetTop
-				,	height:			$C.outerHeight()
-				,	numFooters:		$Fs.length
-				,	hiddenFooters:	$Fs.length - $Fs_vis.length
-				,	spaceBelow:		0 // correct if no content footer ($E)
-				}
-					m.spaceAbove	= m.top; // just for state - not used in calc
-					m.bottom		= m.top + m.height;
-				if ($F.length)
-					//spaceBelow = (LastFooter.top + LastFooter.height) [footerBottom] - Content.bottom + max(LastFooter.marginBottom, pane.paddingBotom)
-					m.spaceBelow = ($F[0].offsetTop + $F.outerHeight()) - m.bottom + _below($F);
-				else // no footer - check marginBottom on Content element itself
-					m.spaceBelow = _below($C);
-			};
-		});
-	}
-
-
-	/**
-	* Called every time a pane is opened, closed, or resized to slide the togglers to 'center' and adjust their length if necessary
-	*
-	* @see  initHandles(), open(), close(), resizeAll()
-	* @param {(string|Object)=}		evt_or_panes	The pane(s) being resized
-	*/
-,	sizeHandles = function (evt_or_panes) {
-		var panes = evtPane.call(this, evt_or_panes)
-		panes = panes ? panes.split(",") : _c.borderPanes;
-
-		$.each(panes, function (i, pane) {
-			var 
-				o	= options[pane]
-			,	s	= state[pane]
-			,	$P	= $Ps[pane]
-			,	$R	= $Rs[pane]
-			,	$T	= $Ts[pane]
-			,	$TC
-			;
-			if (!$P || !$R) return;
-
-			var
-				dir			= _c[pane].dir
-			,	_state		= (s.isClosed ? "_closed" : "_open")
-			,	spacing		= o["spacing"+ _state]
-			,	togAlign	= o["togglerAlign"+ _state]
-			,	togLen		= o["togglerLength"+ _state]
-			,	paneLen
-			,	left
-			,	offset
-			,	CSS = {}
-			;
-
-			if (spacing === 0) {
-				$R.hide();
-				return;
-			}
-			else if (!s.noRoom && !s.isHidden) // skip if resizer was hidden for any reason
-				$R.show(); // in case was previously hidden
-
-			// Resizer Bar is ALWAYS same width/height of pane it is attached to
-			if (dir === "horz") { // north/south
-				//paneLen = $P.outerWidth(); // s.outerWidth || 
-				paneLen = sC.innerWidth; // handle offscreen-panes
-				s.resizerLength = paneLen;
-				left = $.layout.cssNum($P, "left")
-				$R.css({
-					width:	cssW($R, paneLen) // account for borders & padding
-				,	height:	cssH($R, spacing) // ditto
-				,	left:	left > -9999 ? left : sC.inset.left // handle offscreen-panes
-				});
-			}
-			else { // east/west
-				paneLen = $P.outerHeight(); // s.outerHeight || 
-				s.resizerLength = paneLen;
-				$R.css({
-					height:	cssH($R, paneLen) // account for borders & padding
-				,	width:	cssW($R, spacing) // ditto
-				,	top:	sC.inset.top + getPaneSize("north", true) // TODO: what if no North pane?
-				//,	top:	$.layout.cssNum($Ps["center"], "top")
-				});
-			}
-
-			// remove hover classes
-			removeHover( o, $R );
-
-			if ($T) {
-				if (togLen === 0 || (s.isSliding && o.hideTogglerOnSlide)) {
-					$T.hide(); // always HIDE the toggler when 'sliding'
-					return;
-				}
-				else
-					$T.show(); // in case was previously hidden
-
-				if (!(togLen > 0) || togLen === "100%" || togLen > paneLen) {
-					togLen = paneLen;
-					offset = 0;
-				}
-				else { // calculate 'offset' based on options.PANE.togglerAlign_open/closed
-					if (isStr(togAlign)) {
-						switch (togAlign) {
-							case "top":
-							case "left":	offset = 0;
-											break;
-							case "bottom":
-							case "right":	offset = paneLen - togLen;
-											break;
-							case "middle":
-							case "center":
-							default:		offset = round((paneLen - togLen) / 2); // 'default' catches typos
-						}
-					}
-					else { // togAlign = number
-						var x = parseInt(togAlign, 10); //
-						if (togAlign >= 0) offset = x;
-						else offset = paneLen - togLen + x; // NOTE: x is negative!
-					}
-				}
-
-				if (dir === "horz") { // north/south
-					var width = cssW($T, togLen);
-					$T.css({
-						width:	width  // account for borders & padding
-					,	height:	cssH($T, spacing) // ditto
-					,	left:	offset // TODO: VERIFY that toggler  positions correctly for ALL values
-					,	top:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginLeft", round((width-$TC.outerWidth())/2)); // could be negative
-					});
-				}
-				else { // east/west
-					var height = cssH($T, togLen);
-					$T.css({
-						height:	height // account for borders & padding
-					,	width:	cssW($T, spacing) // ditto
-					,	top:	offset // POSITION the toggler
-					,	left:	0
-					});
-					// CENTER the toggler content SPAN
-					$T.children(".content").each(function(){
-						$TC = $(this);
-						$TC.css("marginTop", round((height-$TC.outerHeight())/2)); // could be negative
-					});
-				}
-
-				// remove ALL hover classes
-				removeHover( 0, $T );
-			}
-
-			// DONE measuring and sizing this resizer/toggler, so can be 'hidden' now
-			if (!state.initialized && (o.initHidden || s.isHidden)) {
-				$R.hide();
-				if ($T) $T.hide();
-			}
-		});
-	}
-
-
-	/**
-	* @param {(string|Object)}	evt_or_pane
-	*/
-,	enableClosable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		,	o	= options[pane]
-		;
-		if (!$T) return;
-		o.closable = true;
-		$T	.bind("click."+ sID, function(evt){ evt.stopPropagation(); toggle(pane); })
-			.css("visibility", "visible")
-			.css("cursor", "pointer")
-			.attr("title", state[pane].isClosed ? o.tips.Open : o.tips.Close) // may be blank
-			.show();
-	}
-	/**
-	* @param {(string|Object)}	evt_or_pane
-	* @param {boolean=}			[hide=false]
-	*/
-,	disableClosable = function (evt_or_pane, hide) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$T	= $Ts[pane]
-		;
-		if (!$T) return;
-		options[pane].closable = false;
-		// is closable is disable, then pane MUST be open!
-		if (state[pane].isClosed) open(pane, false, true);
-		$T	.unbind("."+ sID)
-			.css("visibility", hide ? "hidden" : "visible") // instead of hide(), which creates logic issues
-			.css("cursor", "default")
-			.attr("title", "");
-	}
-
-
-	/**
-	* @param {(string|Object)}	evt_or_pane
-	*/
-,	enableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].slidable = true; 
-		if (state[pane].isClosed)
-			bindStartSlidingEvents(pane, true);
-	}
-	/**
-	* @param {(string|Object)}	evt_or_pane
-	*/
-,	disableSlidable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R) return;
-		options[pane].slidable = false; 
-		if (state[pane].isSliding)
-			close(pane, false, true);
-		else {
-			bindStartSlidingEvents(pane, false);
-			$R	.css("cursor", "default")
-				.attr("title", "");
-			removeHover(null, $R[0]); // in case currently hovered
-		}
-	}
-
-
-	/**
-	* @param {(string|Object)}	evt_or_pane
-	*/
-,	enableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		,	o	= options[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		o.resizable = true; 
-		$R.draggable("enable");
-		if (!state[pane].isClosed)
-			$R	.css("cursor", o.resizerCursor)
-			 	.attr("title", o.tips.Resize);
-	}
-	/**
-	* @param {(string|Object)}	evt_or_pane
-	*/
-,	disableResizable = function (evt_or_pane) {
-		if (!isInitialized()) return;
-		var	pane = evtPane.call(this, evt_or_pane)
-		,	$R	= $Rs[pane]
-		;
-		if (!$R || !$R.data('draggable')) return;
-		options[pane].resizable = false; 
-		$R	.draggable("disable")
-			.css("cursor", "default")
-			.attr("title", "");
-		removeHover(null, $R[0]); // in case currently hovered
-	}
-
-
-	/**
-	* Move a pane from source-side (eg, west) to target-side (eg, east)
-	* If pane exists on target-side, move that to source-side, ie, 'swap' the panes
-	*
-	* @param {(string|Object)}	evt_or_pane1	The pane/edge being swapped
-	* @param {string}			pane2			ditto
-	*/
-,	swapPanes = function (evt_or_pane1, pane2) {
-		if (!isInitialized()) return;
-		var pane1 = evtPane.call(this, evt_or_pane1);
-		// change state.edge NOW so callbacks can know where pane is headed...
-		state[pane1].edge = pane2;
-		state[pane2].edge = pane1;
-		// run these even if NOT state.initialized
-		if (false === _runCallbacks("onswap_start", pane1)
-		 ||	false === _runCallbacks("onswap_start", pane2)
-		) {
-			state[pane1].edge = pane1; // reset
-			state[pane2].edge = pane2;
-			return;
-		}
-
-		var
-			oPane1	= copy( pane1 )
-		,	oPane2	= copy( pane2 )
-		,	sizes	= {}
-		;
-		sizes[pane1] = oPane1 ? oPane1.state.size : 0;
-		sizes[pane2] = oPane2 ? oPane2.state.size : 0;
-
-		// clear pointers & state
-		$Ps[pane1] = false; 
-		$Ps[pane2] = false;
-		state[pane1] = {};
-		state[pane2] = {};
-		
-		// ALWAYS remove the resizer & toggler elements
-		if ($Ts[pane1]) $Ts[pane1].remove();
-		if ($Ts[pane2]) $Ts[pane2].remove();
-		if ($Rs[pane1]) $Rs[pane1].remove();
-		if ($Rs[pane2]) $Rs[pane2].remove();
-		$Rs[pane1] = $Rs[pane2] = $Ts[pane1] = $Ts[pane2] = false;
-
-		// transfer element pointers and data to NEW Layout keys
-		move( oPane1, pane2 );
-		move( oPane2, pane1 );
-
-		// cleanup objects
-		oPane1 = oPane2 = sizes = null;
-
-		// make panes 'visible' again
-		if ($Ps[pane1]) $Ps[pane1].css(_c.visible);
-		if ($Ps[pane2]) $Ps[pane2].css(_c.visible);
-
-		// fix any size discrepancies caused by swap
-		resizeAll();
-
-		// run these even if NOT state.initialized
-		_runCallbacks("onswap_end", pane1);
-		_runCallbacks("onswap_end", pane2);
-
-		return;
-
-		function copy (n) { // n = pane
-			var
-				$P	= $Ps[n]
-			,	$C	= $Cs[n]
-			;
-			return !$P ? false : {
-				pane:		n
-			,	P:			$P ? $P[0] : false
-			,	C:			$C ? $C[0] : false
-			,	state:		$.extend(true, {}, state[n])
-			,	options:	$.extend(true, {}, options[n])
-			}
-		};
-
-		function move (oPane, pane) {
-			if (!oPane) return;
-			var
-				P		= oPane.P
-			,	C		= oPane.C
-			,	oldPane = oPane.pane
-			,	c		= _c[pane]
-			//	save pane-options that should be retained
-			,	s		= $.extend(true, {}, state[pane])
-			,	o		= options[pane]
-			//	RETAIN side-specific FX Settings - more below
-			,	fx		= { resizerCursor: o.resizerCursor }
-			,	re, size, pos
-			;
-			$.each("fxName,fxSpeed,fxSettings".split(","), function (i, k) {
-				fx[k +"_open"]  = o[k +"_open"];
-				fx[k +"_close"] = o[k +"_close"];
-				fx[k +"_size"]  = o[k +"_size"];
-			});
-
-			// update object pointers and attributes
-			$Ps[pane] = $(P)
-				.data({
-					layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
-				,	layoutEdge:		pane
-				})
-				.css(_c.hidden)
-				.css(c.cssReq)
-			;
-			$Cs[pane] = C ? $(C) : false;
-
-			// set options and state
-			options[pane]	= $.extend(true, {}, oPane.options, fx);
-			state[pane]		= $.extend(true, {}, oPane.state);
-
-			// change classNames on the pane, eg: ui-layout-pane-east ==> ui-layout-pane-west
-			re = new RegExp(o.paneClass +"-"+ oldPane, "g");
-			P.className = P.className.replace(re, o.paneClass +"-"+ pane);
-
-			// ALWAYS regenerate the resizer & toggler elements
-			initHandles(pane); // create the required resizer & toggler
-
-			// if moving to different orientation, then keep 'target' pane size
-			if (c.dir != _c[oldPane].dir) {
-				size = sizes[pane] || 0;
-				setSizeLimits(pane); // update pane-state
-				size = max(size, state[pane].minSize);
-				// use manualSizePane to disable autoResize - not useful after panes are swapped
-				manualSizePane(pane, size, true, true); // true/true = skipCallback/noAnimation
-			}
-			else // move the resizer here
-				$Rs[pane].css(c.side, sC.inset[c.side] + (state[pane].isVisible ? getPaneSize(pane) : 0));
-
-
-			// ADD CLASSNAMES & SLIDE-BINDINGS
-			if (oPane.state.isVisible && !s.isVisible)
-				setAsOpen(pane, true); // true = skipCallback
-			else {
-				setAsClosed(pane);
-				bindStartSlidingEvents(pane, true); // will enable events IF option is set
-			}
-
-			// DESTROY the object
-			oPane = null;
-		};
-	}
-
-
-	/**
-	* INTERNAL method to sync pin-buttons when pane is opened or closed
-	* Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	*
-	* @see  open(), setAsOpen(), setAsClosed()
-	* @param {string}	pane   These are the params returned to callbacks by layout()
-	* @param {boolean}	doPin  True means set the pin 'down', False means 'up'
-	*/
-,	syncPinBtns = function (pane, doPin) {
-		if ($.layout.plugins.buttons)
-			$.each(state[pane].pins, function (i, selector) {
-				$.layout.buttons.setPinState(Instance, $(selector), pane, doPin);
-			});
-	}
-
-;	// END var DECLARATIONS
-
-	/**
-	* Capture keys when enableCursorHotkey - toggle pane if hotkey pressed
-	*
-	* @see  document.keydown()
-	*/
-	function keyDown (evt) {
-		if (!evt) return true;
-		var code = evt.keyCode;
-		if (code < 33) return true; // ignore special keys: ENTER, TAB, etc
-
-		var
-			PANE = {
-				38: "north" // Up Cursor	- $.ui.keyCode.UP
-			,	40: "south" // Down Cursor	- $.ui.keyCode.DOWN
-			,	37: "west"  // Left Cursor	- $.ui.keyCode.LEFT
-			,	39: "east"  // Right Cursor	- $.ui.keyCode.RIGHT
-			}
-		,	ALT		= evt.altKey // no worky!
-		,	SHIFT	= evt.shiftKey
-		,	CTRL	= evt.ctrlKey
-		,	CURSOR	= (CTRL && code >= 37 && code <= 40)
-		,	o, k, m, pane
-		;
-
-		if (CURSOR && options[PANE[code]].enableCursorHotkey) // valid cursor-hotkey
-			pane = PANE[code];
-		else if (CTRL || SHIFT) // check to see if this matches a custom-hotkey
-			$.each(_c.borderPanes, function (i, p) { // loop each pane to check its hotkey
-				o = options[p];
-				k = o.customHotkey;
-				m = o.customHotkeyModifier; // if missing or invalid, treated as "CTRL+SHIFT"
-				if ((SHIFT && m=="SHIFT") || (CTRL && m=="CTRL") || (CTRL && SHIFT)) { // Modifier matches
-					if (k && code === (isNaN(k) || k <= 9 ? k.toUpperCase().charCodeAt(0) : k)) { // Key matches
-						pane = p;
-						return false; // BREAK
-					}
-				}
-			});
-
-		// validate pane
-		if (!pane || !$Ps[pane] || !options[pane].closable || state[pane].isHidden)
-			return true;
-
-		toggle(pane);
-
-		evt.stopPropagation();
-		evt.returnValue = false; // CANCEL key
-		return false;
-	};
-
-
-/*
- * ######################################
- *	UTILITY METHODS
- *	called externally or by initButtons
- * ######################################
- */
-
-	/**
-	* Change/reset a pane overflow setting & zIndex to allow popups/drop-downs to work
-	*
-	* @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	*/
-	function allowOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		;
-
-		// if pane is already raised, then reset it before doing it again!
-		// this would happen if allowOverflow is attached to BOTH the pane and an element 
-		if (s.cssSaved)
-			resetOverflow(pane); // reset previous CSS before continuing
-
-		// if pane is raised by sliding or resizing, or its closed, then abort
-		if (s.isSliding || s.isResizing || s.isClosed) {
-			s.cssSaved = false;
-			return;
-		}
-
-		var
-			newCSS	= { zIndex: (options.zIndexes.resizer_normal + 1) }
-		,	curCSS	= {}
-		,	of		= $P.css("overflow")
-		,	ofX		= $P.css("overflowX")
-		,	ofY		= $P.css("overflowY")
-		;
-		// determine which, if any, overflow settings need to be changed
-		if (of != "visible") {
-			curCSS.overflow = of;
-			newCSS.overflow = "visible";
-		}
-		if (ofX && !ofX.match(/(visible|auto)/)) {
-			curCSS.overflowX = ofX;
-			newCSS.overflowX = "visible";
-		}
-		if (ofY && !ofY.match(/(visible|auto)/)) {
-			curCSS.overflowY = ofX;
-			newCSS.overflowY = "visible";
-		}
-
-		// save the current overflow settings - even if blank!
-		s.cssSaved = curCSS;
-
-		// apply new CSS to raise zIndex and, if necessary, make overflow 'visible'
-		$P.css( newCSS );
-
-		// make sure the zIndex of all other panes is normal
-		$.each(_c.allPanes, function(i, p) {
-			if (p != pane) resetOverflow(p);
-		});
-
-	};
-	/**
-	* @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
-	*/
-	function resetOverflow (el) {
-		if (!isInitialized()) return;
-		if (this && this.tagName) el = this; // BOUND to element
-		var $P;
-		if (isStr(el))
-			$P = $Ps[el];
-		else if ($(el).data("layoutRole"))
-			$P = $(el);
-		else
-			$(el).parents().each(function(){
-				if ($(this).data("layoutRole")) {
-					$P = $(this);
-					return false; // BREAK
-				}
-			});
-		if (!$P || !$P.length) return; // INVALID
-
-		var
-			pane	= $P.data("layoutEdge")
-		,	s		= state[pane]
-		,	CSS		= s.cssSaved || {}
-		;
-		// reset the zIndex
-		if (!s.isSliding && !s.isResizing)
-			$P.css("zIndex", options.zIndexes.pane_normal);
-
-		// reset Overflow - if necessary
-		$P.css( CSS );
-
-		// clear var
-		s.cssSaved = false;
-	};
-
-/*
- * #####################
- * CREATE/RETURN LAYOUT
- * #####################
- */
-
-	// validate that container exists
-	var $N = $(this).eq(0); // FIRST matching Container element
-	if (!$N.length) {
-		return _log( options.errors.containerMissing );
-	};
-
-	// Users retrieve Instance of a layout with: $N.layout() OR $N.data("layout")
-	// return the Instance-pointer if layout has already been initialized
-	if ($N.data("layoutContainer") && $N.data("layout"))
-		return $N.data("layout"); // cached pointer
-
-	// init global vars
-	var 
-		$Ps	= {}	// Panes x5		- set in initPanes()
-	,	$Cs	= {}	// Content x5	- set in initPanes()
-	,	$Rs	= {}	// Resizers x4	- set in initHandles()
-	,	$Ts	= {}	// Togglers x4	- set in initHandles()
-	,	$Ms	= $([])	// Masks - up to 2 masks per pane (IFRAME + DIV)
-	//	aliases for code brevity
-	,	sC	= state.container // alias for easy access to 'container dimensions'
-	,	sID	= state.id // alias for unique layout ID/namespace - eg: "layout435"
-	;
-
-	// create Instance object to expose data & option Properties, and primary action Methods
-	var Instance = {
-	//	layout data
-		options:			options			// property - options hash
-	,	state:				state			// property - dimensions hash
-	//	object pointers
-	,	container:			$N				// property - object pointers for layout container
-	,	panes:				$Ps				// property - object pointers for ALL Panes: panes.north, panes.center
-	,	contents:			$Cs				// property - object pointers for ALL Content: contents.north, contents.center
-	,	resizers:			$Rs				// property - object pointers for ALL Resizers, eg: resizers.north
-	,	togglers:			$Ts				// property - object pointers for ALL Togglers, eg: togglers.north
-	//	border-pane open/close
-	,	hide:				hide			// method - ditto
-	,	show:				show			// method - ditto
-	,	toggle:				toggle			// method - pass a 'pane' ("north", "west", etc)
-	,	open:				open			// method - ditto
-	,	close:				close			// method - ditto
-	,	slideOpen:			slideOpen		// method - ditto
-	,	slideClose:			slideClose		// method - ditto
-	,	slideToggle:		slideToggle		// method - ditto
-	//	pane actions
-	,	setSizeLimits:		setSizeLimits	// method - pass a 'pane' - update state min/max data
-	,	_sizePane:			sizePane		// method -intended for user by plugins only!
-	,	sizePane:			manualSizePane	// method - pass a 'pane' AND an 'outer-size' in pixels or percent, or 'auto'
-	,	sizeContent:		sizeContent		// method - pass a 'pane'
-	,	swapPanes:			swapPanes		// method - pass TWO 'panes' - will swap them
-	,	showMasks:			showMasks		// method - pass a 'pane' OR list of panes - default = all panes with mask option set
-	,	hideMasks:			hideMasks		// method - ditto'
-	//	pane element methods
-	,	initContent:		initContent		// method - ditto
-	,	addPane:			addPane			// method - pass a 'pane'
-	,	removePane:			removePane		// method - pass a 'pane' to remove from layout, add 'true' to delete the pane-elem
-	,	createChildren:		createChildren	// method - pass a 'pane' and (optional) layout-options (OVERRIDES options[pane].children
-	,	refreshChildren:	refreshChildren	// method - pass a 'pane' and a layout-instance
-	//	special pane option setting
-	,	enableClosable:		enableClosable	// method - pass a 'pane'
-	,	disableClosable:	disableClosable	// method - ditto
-	,	enableSlidable:		enableSlidable	// method - ditto
-	,	disableSlidable:	disableSlidable	// method - ditto
-	,	enableResizable:	enableResizable	// method - ditto
-	,	disableResizable:	disableResizable// method - ditto
-	//	utility methods for panes
-	,	allowOverflow:		allowOverflow	// utility - pass calling element (this)
-	,	resetOverflow:		resetOverflow	// utility - ditto
-	//	layout control
-	,	destroy:			destroy			// method - no parameters
-	,	initPanes:			isInitialized	// method - no parameters
-	,	resizeAll:			resizeAll		// method - no parameters
-	//	callback triggering
-	,	runCallbacks:		_runCallbacks	// method - pass evtName & pane (if a pane-event), eg: trigger("onopen", "west")
-	//	alias collections of options, state and children - created in addPane and extended elsewhere
-	,	hasParentLayout:	false			// set by initContainer()
-	,	children:			children		// pointers to child-layouts, eg: Instance.children.west.layoutName
-	,	north:				false			// alias group: { name: pane, pane: $Ps[pane], options: options[pane], state: state[pane], children: children[pane] }
-	,	south:				false			// ditto
-	,	west:				false			// ditto
-	,	east:				false			// ditto
-	,	center:				false			// ditto
-	};
-
-	// create the border layout NOW
-	if (_create() === 'cancel') // onload_start callback returned false to CANCEL layout creation
-		return null;
-	else // true OR false -- if layout-elements did NOT init (hidden or do not exist), can auto-init later
-		return Instance; // return the Instance object
-
-}
-
-
-})( jQuery );
-// END Layout - keep internal vars internal!
-
-
-
-// START Plugins - shared wrapper, no global vars
-(function ($) {
-
-
-/**
- * jquery.layout.state 1.0
- * $Date: 2011-07-16 08:00:00 (Sat, 16 July 2011) $
- *
- * Copyright (c) 2012 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.3.0.rc30.1 or higher
- * @requires: $.ui.cookie (above)
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- */
-/*
- *	State-management options stored in options.stateManagement, which includes a .cookie hash
- *	Default options saves ALL KEYS for ALL PANES, ie: pane.size, pane.isClosed, pane.isHidden
- *
- *	// STATE/COOKIE OPTIONS
- *	@example $(el).layout({
-				stateManagement: {
-					enabled:	true
-				,	stateKeys:	"east.size,west.size,east.isClosed,west.isClosed"
-				,	cookie:		{ name: "appLayout", path: "/" }
-				}
-			})
- *	@example $(el).layout({ stateManagement__enabled: true }) // enable auto-state-management using cookies
- *	@example $(el).layout({ stateManagement__cookie: { name: "appLayout", path: "/" } })
- *	@example $(el).layout({ stateManagement__cookie__name: "appLayout", stateManagement__cookie__path: "/" })
- *
- *	// STATE/COOKIE METHODS
- *	@example myLayout.saveCookie( "west.isClosed,north.size,south.isHidden", {expires: 7} );
- *	@example myLayout.loadCookie();
- *	@example myLayout.deleteCookie();
- *	@example var JSON = myLayout.readState();	// CURRENT Layout State
- *	@example var JSON = myLayout.readCookie();	// SAVED Layout State (from cookie)
- *	@example var JSON = myLayout.state.stateData;	// LAST LOADED Layout State (cookie saved in layout.state hash)
- *
- *	CUSTOM STATE-MANAGEMENT (eg, saved in a database)
- *	@example var JSON = myLayout.readState( "west.isClosed,north.size,south.isHidden" );
- *	@example myLayout.loadState( JSON );
- */
-
-/**
- *	UI COOKIE UTILITY
- *
- *	A $.cookie OR $.ui.cookie namespace *should be standard*, but until then...
- *	This creates $.ui.cookie so Layout does not need the cookie.jquery.js plugin
- *	NOTE: This utility is REQUIRED by the layout.state plugin
- *
- *	Cookie methods in Layout are created as part of State Management 
- */
-if (!$.ui) $.ui = {};
-$.ui.cookie = {
-
-	// cookieEnabled is not in DOM specs, but DOES works in all browsers,including IE6
-	acceptsCookies: !!navigator.cookieEnabled
-
-,	read: function (name) {
-		var	c		= document.cookie
-		,	cs		= c ? c.split(';') : []
-		,	pair	// loop var
-		;
-		for (var i=0, n=cs.length; i < n; i++) {
-			pair = $.trim(cs[i]).split('='); // name=value pair
-			if (pair[0] == name) // found the layout cookie
-				return decodeURIComponent(pair[1]);
-		}
-		return null;
-	}
-
-,	write: function (name, val, cookieOpts) {
-		var	params	= ""
-		,	date	= ""
-		,	clear	= false
-		,	o		= cookieOpts || {}
-		,	x		= o.expires  || null
-		,	t		= $.type(x)
-		;
-		if (t === "date")
-			date = x;
-		else if (t === "string" && x > 0) {
-			x = parseInt(x,10);
-			t = "number";
-		}
-		if (t === "number") {
-			date = new Date();
-			if (x > 0)
-				date.setDate(date.getDate() + x);
-			else {
-				date.setFullYear(1970);
-				clear = true;
-			}
-		}
-		if (date)		params += ";expires="+ date.toUTCString();
-		if (o.path)		params += ";path="+ o.path;
-		if (o.domain)	params += ";domain="+ o.domain;
-		if (o.secure)	params += ";secure";
-		document.cookie = name +"="+ (clear ? "" : encodeURIComponent( val )) + params; // write or clear cookie
-	}
-
-,	clear: function (name) {
-		$.ui.cookie.write(name, "", {expires: -1});
-	}
-
-};
-// if cookie.jquery.js is not loaded, create an alias to replicate it
-// this may be useful to other plugins or code dependent on that plugin
-if (!$.cookie) $.cookie = function (k, v, o) {
-	var C = $.ui.cookie;
-	if (v === null)
-		C.clear(k);
-	else if (v === undefined)
-		return C.read(k);
-	else
-		C.write(k, v, o);
-};
-
-
-// tell Layout that the state plugin is available
-$.layout.plugins.stateManagement = true;
-
-//	Add State-Management options to layout.defaults
-$.layout.config.optionRootKeys.push("stateManagement");
-$.layout.defaults.stateManagement = {
-	enabled:		false	// true = enable state-management, even if not using cookies
-,	autoSave:		true	// Save a state-cookie when page exits?
-,	autoLoad:		true	// Load the state-cookie when Layout inits?
-,	animateLoad:	true	// animate panes when loading state into an active layout
-,	includeChildren: true	// recurse into child layouts to include their state as well
-	// List state-data to save - must be pane-specific
-,	stateKeys:	"north.size,south.size,east.size,west.size,"+
-				"north.isClosed,south.isClosed,east.isClosed,west.isClosed,"+
-				"north.isHidden,south.isHidden,east.isHidden,west.isHidden"
-,	cookie: {
-		name:	""	// If not specified, will use Layout.name, else just "Layout"
-	,	domain:	""	// blank = current domain
-	,	path:	""	// blank = current page, "/" = entire website
-	,	expires: ""	// 'days' to keep cookie - leave blank for 'session cookie'
-	,	secure:	false
-	}
-};
-// Set stateManagement as a layout-option, NOT a pane-option
-$.layout.optionsMap.layout.push("stateManagement");
-
-/*
- *	State Management methods
- */
-$.layout.state = {
-
-	/**
-	 * Get the current layout state and save it to a cookie
-	 *
-	 * myLayout.saveCookie( keys, cookieOpts )
-	 *
-	 * @param {Object}			inst
-	 * @param {(string|Array)=}	keys
-	 * @param {Object=}			cookieOpts
-	 */
-	saveCookie: function (inst, keys, cookieOpts) {
-		var o	= inst.options
-		,	sm	= o.stateManagement
-		,	oC	= $.extend(true, {}, sm.cookie, cookieOpts || null)
-		,	data = inst.state.stateData = inst.readState( keys || sm.stateKeys ) // read current panes-state
-		;
-		$.ui.cookie.write( oC.name || o.name || "Layout", $.layout.state.encodeJSON(data), oC );
-		return $.extend(true, {}, data); // return COPY of state.stateData data
-	}
-
-	/**
-	 * Remove the state cookie
-	 *
-	 * @param {Object}	inst
-	 */
-,	deleteCookie: function (inst) {
-		var o = inst.options;
-		$.ui.cookie.clear( o.stateManagement.cookie.name || o.name || "Layout" );
-	}
-
-	/**
-	 * Read & return data from the cookie - as JSON
-	 *
-	 * @param {Object}	inst
-	 */
-,	readCookie: function (inst) {
-		var o = inst.options;
-		var c = $.ui.cookie.read( o.stateManagement.cookie.name || o.name || "Layout" );
-		// convert cookie string back to a hash and return it
-		return c ? $.layout.state.decodeJSON(c) : {};
-	}
-
-	/**
-	 * Get data from the cookie and USE IT to loadState
-	 *
-	 * @param {Object}	inst
-	 */
-,	loadCookie: function (inst) {
-		var c = $.layout.state.readCookie(inst); // READ the cookie
-		if (c) {
-			inst.state.stateData = $.extend(true, {}, c); // SET state.stateData
-			inst.loadState(c); // LOAD the retrieved state
-		}
-		return c;
-	}
-
-	/**
-	 * Update layout options from the cookie, if one exists
-	 *
-	 * @param {Object}		inst
-	 * @param {Object=}		stateData
-	 * @param {boolean=}	animate
-	 */
-,	loadState: function (inst, data, opts) {
-		if (!$.isPlainObject( data ) || $.isEmptyObject( data )) return;
-
-		// normalize data & cache in the state object
-		data = inst.state.stateData = $.layout.transformData( data ); // panes = default subkey
-
-		// add missing/default state-restore options
-		var smo = inst.options.stateManagement;
-		opts = $.extend({
-			animateLoad:		false //smo.animateLoad
-		,	includeChildren:	smo.includeChildren
-		}, opts );
-
-		if (!inst.state.initialized) {
-			/*
-			 *	layout NOT initialized, so just update its options
-			 */
-			// MUST remove pane.children keys before applying to options
-			// use a copy so we don't remove keys from original data
-			var o = $.extend(true, {}, data);
-			//delete o.center; // center has no state-data - only children
-			$.each($.layout.config.allPanes, function (idx, pane) {
-				if (o[pane]) delete o[pane].children;		   
-			 });
-			// update CURRENT layout-options with saved state data
-			$.extend(true, inst.options, o);
-		}
-		else {
-			/*
-			 *	layout already initialized, so modify layout's configuration
-			 */
-			var noAnimate = !opts.animateLoad
-			,	o, c, h, state, open
-			;
-			$.each($.layout.config.borderPanes, function (idx, pane) {
-				o = data[ pane ];
-				if (!$.isPlainObject( o )) return; // no key, skip pane
-
-				s	= o.size;
-				c	= o.initClosed;
-				h	= o.initHidden;
-				ar	= o.autoResize
-				state	= inst.state[pane];
-				open	= state.isVisible;
-
-				// reset autoResize
-				if (ar)
-					state.autoResize = ar;
-				// resize BEFORE opening
-				if (!open)
-					inst._sizePane(pane, s, false, false, false); // false=skipCallback/noAnimation/forceResize
-				// open/close as necessary - DO NOT CHANGE THIS ORDER!
-				if (h === true)			inst.hide(pane, noAnimate);
-				else if (c === true)	inst.close(pane, false, noAnimate);
-				else if (c === false)	inst.open (pane, false, noAnimate);
-				else if (h === false)	inst.show (pane, false, noAnimate);
-				// resize AFTER any other actions
-				if (open)
-					inst._sizePane(pane, s, false, false, noAnimate); // animate resize if option passed
-			});
-
-			/*
-			 *	RECURSE INTO CHILD-LAYOUTS
-			 */
-			if (opts.includeChildren) {
-				var paneStateChildren, childState;
-				$.each(inst.children, function (pane, paneChildren) {
-					paneStateChildren = data[pane] ? data[pane].children : 0;
-					if (paneStateChildren && paneChildren) {
-						$.each(paneChildren, function (stateKey, child) {
-							childState = paneStateChildren[stateKey];
-							if (child && childState)
-								child.loadState( childState );
-						});
-					}
-				});
-			}
-		}
-	}
-
-	/**
-	 * Get the *current layout state* and return it as a hash
-	 *
-	 * @param {Object=}		inst	// Layout instance to get state for
-	 * @param {object=}		[opts]	// State-Managements override options
-	 */
-,	readState: function (inst, opts) {
-		// backward compatility
-		if ($.type(opts) === 'string') opts = { keys: opts };
-		if (!opts) opts = {};
-		var	sm		= inst.options.stateManagement
-		,	ic		= opts.includeChildren
-		,	recurse	= ic !== undefined ? ic : sm.includeChildren
-		,	keys	= opts.stateKeys || sm.stateKeys
-		,	alt		= { isClosed: 'initClosed', isHidden: 'initHidden' }
-		,	state	= inst.state
-		,	panes	= $.layout.config.allPanes
-		,	data	= {}
-		,	pair, pane, key, val
-		,	ps, pC, child, array, count, branch
-		;
-		if ($.isArray(keys)) keys = keys.join(",");
-		// convert keys to an array and change delimiters from '__' to '.'
-		keys = keys.replace(/__/g, ".").split(',');
-		// loop keys and create a data hash
-		for (var i=0, n=keys.length; i < n; i++) {
-			pair = keys[i].split(".");
-			pane = pair[0];
-			key  = pair[1];
-			if ($.inArray(pane, panes) < 0) continue; // bad pane!
-			val = state[ pane ][ key ];
-			if (val == undefined) continue;
-			if (key=="isClosed" && state[pane]["isSliding"])
-				val = true; // if sliding, then *really* isClosed
-			( data[pane] || (data[pane]={}) )[ alt[key] ? alt[key] : key ] = val;
-		}
-
-		// recurse into the child-layouts for each pane
-		if (recurse) {
-			$.each(panes, function (idx, pane) {
-				pC = inst.children[pane];
-				ps = state.stateData[pane];
-				if ($.isPlainObject( pC ) && !$.isEmptyObject( pC )) {
-					// ensure a key exists for this 'pane', eg: branch = data.center
-					branch = data[pane] || (data[pane] = {});
-					if (!branch.children) branch.children = {};
-					$.each( pC, function (key, child) {
-						// ONLY read state from an initialize layout
-						if ( child.state.initialized )
-							branch.children[ key ] = $.layout.state.readState( child );
-						// if we have PREVIOUS (onLoad) state for this child-layout, KEEP IT!
-						else if ( ps && ps.children && ps.children[ key ] ) {
-							branch.children[ key ] = $.extend(true, {}, ps.children[ key ] );
-						}
-					});
-				}
-			});
-		}
-
-		return data;
-	}
-
-	/**
-	 *	Stringify a JSON hash so can save in a cookie or db-field
-	 */
-,	encodeJSON: function (JSON) {
-		return parse(JSON);
-		function parse (h) {
-			var D=[], i=0, k, v, t // k = key, v = value
-			,	a = $.isArray(h)
-			;
-			for (k in h) {
-				v = h[k];
-				t = typeof v;
-				if (t == 'string')		// STRING - add quotes
-					v = '"'+ v +'"';
-				else if (t == 'object')	// SUB-KEY - recurse into it
-					v = parse(v);
-				D[i++] = (!a ? '"'+ k +'":' : '') + v;
-			}
-			return (a ? '[' : '{') + D.join(',') + (a ? ']' : '}');
-		};
-	}
-
-	/**
-	 *	Convert stringified JSON back to a hash object
-	 *	@see		$.parseJSON(), adding in jQuery 1.4.1
-	 */
-,	decodeJSON: function (str) {
-		try { return $.parseJSON ? $.parseJSON(str) : window["eval"]("("+ str +")") || {}; }
-		catch (e) { return {}; }
-	}
-
-
-,	_create: function (inst) {
-		var _	= $.layout.state
-		,	o	= inst.options
-		,	sm	= o.stateManagement
-		;
-		//	ADD State-Management plugin methods to inst
-		 $.extend( inst, {
-		//	readCookie - update options from cookie - returns hash of cookie data
-			readCookie:		function () { return _.readCookie(inst); }
-		//	deleteCookie
-		,	deleteCookie:	function () { _.deleteCookie(inst); }
-		//	saveCookie - optionally pass keys-list and cookie-options (hash)
-		,	saveCookie:		function (keys, cookieOpts) { return _.saveCookie(inst, keys, cookieOpts); }
-		//	loadCookie - readCookie and use to loadState() - returns hash of cookie data
-		,	loadCookie:		function () { return _.loadCookie(inst); }
-		//	loadState - pass a hash of state to use to update options
-		,	loadState:		function (stateData, opts) { _.loadState(inst, stateData, opts); }
-		//	readState - returns hash of current layout-state
-		,	readState:		function (keys) { return _.readState(inst, keys); }
-		//	add JSON utility methods too...
-		,	encodeJSON:		_.encodeJSON
-		,	decodeJSON:		_.decodeJSON
-		});
-
-		// init state.stateData key, even if plugin is initially disabled
-		inst.state.stateData = {};
-
-		// autoLoad MUST BE one of: data-array, data-hash, callback-function, or TRUE
-		if ( !sm.autoLoad ) return;
-
-		//	When state-data exists in the autoLoad key USE IT,
-		//	even if stateManagement.enabled == false
-		if ($.isPlainObject( sm.autoLoad )) {
-			if (!$.isEmptyObject( sm.autoLoad )) {
-				inst.loadState( sm.autoLoad );
-			}
-		}
-		else if ( sm.enabled ) {
-			// update the options from cookie or callback
-			// if options is a function, call it to get stateData
-			if ($.isFunction( sm.autoLoad )) {
-				var d = {};
-				try {
-					d = sm.autoLoad( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
-				} catch (e) {}
-				if (d && $.isPlainObject( d ) && !$.isEmptyObject( d ))
-					inst.loadState(d);
-			}
-			else // any other truthy value will trigger loadCookie
-				inst.loadCookie();
-		}
-	}
-
-,	_unload: function (inst) {
-		var sm = inst.options.stateManagement;
-		if (sm.enabled && sm.autoSave) {
-			// if options is a function, call it to save the stateData
-			if ($.isFunction( sm.autoSave )) {
-				try {
-					sm.autoSave( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
-				} catch (e) {}
-			}
-			else // any truthy value will trigger saveCookie
-				inst.saveCookie();
-		}
-	}
-
-};
-
-// add state initialization method to Layout's onCreate array of functions
-$.layout.onCreate.push( $.layout.state._create );
-$.layout.onUnload.push( $.layout.state._unload );
-
-
-
-
-/**
- * jquery.layout.buttons 1.0
- * $Date: 2011-07-16 08:00:00 (Sat, 16 July 2011) $
- *
- * Copyright (c) 2012 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.3.0.rc30.1 or higher
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- *
- * Docs: [ to come ]
- * Tips: [ to come ]
- */
-
-// tell Layout that the state plugin is available
-$.layout.plugins.buttons = true;
-
-//	Add buttons options to layout.defaults
-$.layout.defaults.autoBindCustomButtons = false;
-// Specify autoBindCustomButtons as a layout-option, NOT a pane-option
-$.layout.optionsMap.layout.push("autoBindCustomButtons");
-
-/*
- *	Button methods
- */
-$.layout.buttons = {
-
-	/**
-	* Searches for .ui-layout-button-xxx elements and auto-binds them as layout-buttons
-	*
-	* @see  _create()
-	*
-	* @param  {Object}		inst	Layout Instance object
-	*/
-	init: function (inst) {
-		var pre		= "ui-layout-button-"
-		,	layout	= inst.options.name || ""
-		,	name;
-		$.each("toggle,open,close,pin,toggle-slide,open-slide".split(","), function (i, action) {
-			$.each($.layout.config.borderPanes, function (ii, pane) {
-				$("."+pre+action+"-"+pane).each(function(){
-					// if button was previously 'bound', data.layoutName was set, but is blank if layout has no 'name'
-					name = $(this).data("layoutName") || $(this).attr("layoutName");
-					if (name == undefined || name === layout)
-						inst.bindButton(this, action, pane);
-				});
-			});
-		});
-	}
-
-	/**
-	* Helper function to validate params received by addButton utilities
-	*
-	* Two classes are added to the element, based on the buttonClass...
-	* The type of button is appended to create the 2nd className:
-	*  - ui-layout-button-pin		// action btnClass
-	*  - ui-layout-button-pin-west	// action btnClass + pane
-	*  - ui-layout-button-toggle
-	*  - ui-layout-button-open
-	*  - ui-layout-button-close
-	*
-	* @param {Object}			inst		Layout Instance object
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the button is for: 'north', 'south', etc.
-	*
-	* @return {Array.<Object>}	If both params valid, the element matching 'selector' in a jQuery wrapper - otherwise returns null
-	*/
-,	get: function (inst, selector, pane, action) {
-		var $E	= $(selector)
-		,	o	= inst.options
-		,	err	= o.errors.addButtonError
-		;
-		if (!$E.length) { // element not found
-			$.layout.msg(err +" "+ o.errors.selector +": "+ selector, true);
-		}
-		else if ($.inArray(pane, $.layout.config.borderPanes) < 0) { // invalid 'pane' sepecified
-			$.layout.msg(err +" "+ o.errors.pane +": "+ pane, true);
-			$E = $("");  // NO BUTTON
-		}
-		else { // VALID
-			var btn = o[pane].buttonClass +"-"+ action;
-			$E	.addClass( btn +" "+ btn +"-"+ pane )
-				.data("layoutName", o.name); // add layout identifier - even if blank!
-		}
-		return $E;
-	}
-
-
-	/**
-	* NEW syntax for binding layout-buttons - will eventually replace addToggle, addOpen, etc.
-	*
-	* @param {Object}			inst		Layout Instance object
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}			action
-	* @param {string}			pane
-	*/
-,	bind: function (inst, selector, action, pane) {
-		var _ = $.layout.buttons;
-		switch (action.toLowerCase()) {
-			case "toggle":			_.addToggle	(inst, selector, pane); break;	
-			case "open":			_.addOpen	(inst, selector, pane); break;
-			case "close":			_.addClose	(inst, selector, pane); break;
-			case "pin":				_.addPin	(inst, selector, pane); break;
-			case "toggle-slide":	_.addToggle	(inst, selector, pane, true); break;	
-			case "open-slide":		_.addOpen	(inst, selector, pane, true); break;
-		}
-		return inst;
-	}
-
-	/**
-	* Add a custom Toggler button for a pane
-	*
-	* @param {Object}			inst		Layout Instance object
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}  			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @param {boolean=}			slide 		true = slide-open, false = pin-open
-	*/
-,	addToggle: function (inst, selector, pane, slide) {
-		$.layout.buttons.get(inst, selector, pane, "toggle")
-			.click(function(evt){
-				inst.toggle(pane, !!slide);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Open button for a pane
-	*
-	* @param {Object}			inst		Layout Instance object
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}			pane 		Name of the pane the button is for: 'north', 'south', etc.
-	* @param {boolean=}			slide 		true = slide-open, false = pin-open
-	*/
-,	addOpen: function (inst, selector, pane, slide) {
-		$.layout.buttons.get(inst, selector, pane, "open")
-			.attr("title", inst.options[pane].tips.Open)
-			.click(function (evt) {
-				inst.open(pane, !!slide);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Close button for a pane
-	*
-	* @param {Object}			inst		Layout Instance object
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the button is for: 'north', 'south', etc.
-	*/
-,	addClose: function (inst, selector, pane) {
-		$.layout.buttons.get(inst, selector, pane, "close")
-			.attr("title", inst.options[pane].tips.Close)
-			.click(function (evt) {
-				inst.close(pane);
-				evt.stopPropagation();
-			});
-		return inst;
-	}
-
-	/**
-	* Add a custom Pin button for a pane
-	*
-	* Four classes are added to the element, based on the paneClass for the associated pane...
-	* Assuming the default paneClass and the pin is 'up', these classes are added for a west-pane pin:
-	*  - ui-layout-pane-pin
-	*  - ui-layout-pane-west-pin
-	*  - ui-layout-pane-pin-up
-	*  - ui-layout-pane-west-pin-up
-	*
-	* @param {Object}			inst		Layout Instance object
-	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
-	* @param {string}   		pane 		Name of the pane the pin is for: 'north', 'south', etc.
-	*/
-,	addPin: function (inst, selector, pane) {
-		var	_	= $.layout.buttons
-		,	$E	= _.get(inst, selector, pane, "pin");
-		if ($E.length) {
-			var s = inst.state[pane];
-			$E.click(function (evt) {
-				_.setPinState(inst, $(this), pane, (s.isSliding || s.isClosed));
-				if (s.isSliding || s.isClosed) inst.open( pane ); // change from sliding to open
-				else inst.close( pane ); // slide-closed
-				evt.stopPropagation();
-			});
-			// add up/down pin attributes and classes
-			_.setPinState(inst, $E, pane, (!s.isClosed && !s.isSliding));
-			// add this pin to the pane data so we can 'sync it' automatically
-			// PANE.pins key is an array so we can store multiple pins for each pane
-			s.pins.push( selector ); // just save the selector string
-		}
-		return inst;
-	}
-
-	/**
-	* Change the class of the pin button to make it look 'up' or 'down'
-	*
-	* @see  addPin(), syncPins()
-	*
-	* @param {Object}			inst	Layout Instance object
-	* @param {Array.<Object>}	$Pin	The pin-span element in a jQuery wrapper
-	* @param {string}			pane	These are the params returned to callbacks by layout()
-	* @param {boolean}			doPin	true = set the pin 'down', false = set it 'up'
-	*/
-,	setPinState: function (inst, $Pin, pane, doPin) {
-		var updown = $Pin.attr("pin");
-		if (updown && doPin === (updown=="down")) return; // already in correct state
-		var
-			o		= inst.options[pane]
-		,	pin		= o.buttonClass +"-pin"
-		,	side	= pin +"-"+ pane
-		,	UP		= pin +"-up "+	side +"-up"
-		,	DN		= pin +"-down "+side +"-down"
-		;
-		$Pin
-			.attr("pin", doPin ? "down" : "up") // logic
-			.attr("title", doPin ? o.tips.Unpin : o.tips.Pin)
-			.removeClass( doPin ? UP : DN ) 
-			.addClass( doPin ? DN : UP ) 
-		;
-	}
-
-	/**
-	* INTERNAL function to sync 'pin buttons' when pane is opened or closed
-	* Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
-	*
-	* @see  open(), close()
-	*
-	* @param {Object}			inst	Layout Instance object
-	* @param {string}	pane	These are the params returned to callbacks by layout()
-	* @param {boolean}	doPin	True means set the pin 'down', False means 'up'
-	*/
-,	syncPinBtns: function (inst, pane, doPin) {
-		// REAL METHOD IS _INSIDE_ LAYOUT - THIS IS HERE JUST FOR REFERENCE
-		$.each(inst.state[pane].pins, function (i, selector) {
-			$.layout.buttons.setPinState(inst, $(selector), pane, doPin);
-		});
-	}
-
-
-,	_load: function (inst) {
-		var	_	= $.layout.buttons;
-		// ADD Button methods to Layout Instance
-		// Note: sel = jQuery Selector string
-		$.extend( inst, {
-			bindButton:		function (sel, action, pane) { return _.bind(inst, sel, action, pane); }
-		//	DEPRECATED METHODS
-		,	addToggleBtn:	function (sel, pane, slide) { return _.addToggle(inst, sel, pane, slide); }
-		,	addOpenBtn:		function (sel, pane, slide) { return _.addOpen(inst, sel, pane, slide); }
-		,	addCloseBtn:	function (sel, pane) { return _.addClose(inst, sel, pane); }
-		,	addPinBtn:		function (sel, pane) { return _.addPin(inst, sel, pane); }
-		});
-
-		// init state array to hold pin-buttons
-		for (var i=0; i<4; i++) {
-			var pane = $.layout.config.borderPanes[i];
-			inst.state[pane].pins = [];
-		}
-
-		// auto-init buttons onLoad if option is enabled
-		if ( inst.options.autoBindCustomButtons )
-			_.init(inst);
-	}
-
-,	_unload: function (inst) {
-		// TODO: unbind all buttons???
-	}
-
-};
-
-// add initialization method to Layout's onLoad array of functions
-$.layout.onLoad.push(  $.layout.buttons._load );
-//$.layout.onUnload.push( $.layout.buttons._unload );
-
-
-
-/**
- * jquery.layout.browserZoom 1.0
- * $Date: 2011-12-29 08:00:00 (Thu, 29 Dec 2011) $
- *
- * Copyright (c) 2012 
- *   Kevin Dalman (http://allpro.net)
- *
- * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
- *
- * @requires: UI Layout 1.3.0.rc30.1 or higher
- *
- * @see: http://groups.google.com/group/jquery-ui-layout
- *
- * TODO: Extend logic to handle other problematic zooming in browsers
- * TODO: Add hotkey/mousewheel bindings to _instantly_ respond to these zoom event
- */
-
-// tell Layout that the plugin is available
-$.layout.plugins.browserZoom = true;
-
-$.layout.defaults.browserZoomCheckInterval = 1000;
-$.layout.optionsMap.layout.push("browserZoomCheckInterval");
-
-/*
- *	browserZoom methods
- */
-$.layout.browserZoom = {
-
-	_init: function (inst) {
-		// abort if browser does not need this check
-		if ($.layout.browserZoom.ratio() !== false)
-			$.layout.browserZoom._setTimer(inst);
-	}
-
-,	_setTimer: function (inst) {
-		// abort if layout destroyed or browser does not need this check
-		if (inst.destroyed) return;
-		var o	= inst.options
-		,	s	= inst.state
-		//	don't need check if inst has parentLayout, but check occassionally in case parent destroyed!
-		//	MINIMUM 100ms interval, for performance
-		,	ms	= inst.hasParentLayout ?  5000 : Math.max( o.browserZoomCheckInterval, 100 )
-		;
-		// set the timer
-		setTimeout(function(){
-			if (inst.destroyed || !o.resizeWithWindow) return;
-			var d = $.layout.browserZoom.ratio();
-			if (d !== s.browserZoom) {
-				s.browserZoom = d;
-				inst.resizeAll();
-			}
-			// set a NEW timeout
-			$.layout.browserZoom._setTimer(inst);
-		}
-		,	ms );
-	}
-
-,	ratio: function () {
-		var w	= window
-		,	s	= screen
-		,	d	= document
-		,	dE	= d.documentElement || d.body
-		,	b	= $.layout.browser
-		,	v	= b.version
-		,	r, sW, cW
-		;
-		// we can ignore all browsers that fire window.resize event onZoom
-		if ((b.msie && v > 8)
-		||	!b.msie
-		) return false; // don't need to track zoom
-
-		if (s.deviceXDPI && s.systemXDPI) // syntax compiler hack
-			return calc(s.deviceXDPI, s.systemXDPI);
-		// everything below is just for future reference!
-		if (b.webkit && (r = d.body.getBoundingClientRect))
-			return calc((r.left - r.right), d.body.offsetWidth);
-		if (b.webkit && (sW = w.outerWidth))
-			return calc(sW, w.innerWidth);
-		if ((sW = s.width) && (cW = dE.clientWidth))
-			return calc(sW, cW);
-		return false; // no match, so cannot - or don't need to - track zoom
-
-		function calc (x,y) { return (parseInt(x,10) / parseInt(y,10) * 100).toFixed(); }
-	}
-
-};
-// add initialization method to Layout's onLoad array of functions
-$.layout.onReady.push( $.layout.browserZoom._init );
-
-
+/**
+ * @preserve
+ * jquery.layout 1.3.0 - Release Candidate 30.79
+ * $Date: 2013-01-12 08:00:00 (Sat, 12 Jan 2013) $
+ * $Rev: 303007 $
+ *
+ * Copyright (c) 2013 Kevin Dalman (http://allpro.net)
+ * Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
+ *
+ * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
+ * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
+ *
+ * SEE: http://layout.jquery-dev.net/LICENSE.txt
+ * 
+ * Changelog: http://layout.jquery-dev.net/changelog.cfm#1.3.0.rc30.79
+ *
+ * Docs: http://layout.jquery-dev.net/documentation.html
+ * Tips: http://layout.jquery-dev.net/tips.html
+ * Help: http://groups.google.com/group/jquery-ui-layout
+ */
+
+/* JavaDoc Info: http://code.google.com/closure/compiler/docs/js-for-compiler.html
+ * {!Object}	non-nullable type (never NULL)
+ * {?string}	nullable type (sometimes NULL) - default for {Object}
+ * {number=}	optional parameter
+ * {*}			ALL types
+ */
+/*	TODO for jQ 2.0 
+ *	change .andSelf() to .addBack()
+ *	$.fn.disableSelection won't work
+ */
+
+// NOTE: For best readability, view with a fixed-width font and tabs equal to 4-chars
+
+;(function ($) {
+
+// alias Math methods - used a lot!
+var	min		= Math.min
+,	max		= Math.max
+,	round	= Math.floor
+
+,	isStr	=  function (v) { return $.type(v) === "string"; }
+
+	/**
+	* @param {!Object}			Instance
+	* @param {Array.<string>}	a_fn
+	*/
+,	runPluginCallbacks = function (Instance, a_fn) {
+		if ($.isArray(a_fn))
+			for (var i=0, c=a_fn.length; i<c; i++) {
+				var fn = a_fn[i];
+				try {
+					if (isStr(fn)) // 'name' of a function
+						fn = eval(fn);
+					if ($.isFunction(fn))
+						g(fn)( Instance );
+				} catch (ex) {}
+			}
+		function g (f) { return f; }; // compiler hack
+	}
+;
+
+/*
+ *	GENERIC $.layout METHODS - used by all layouts
+ */
+$.layout = {
+
+	version:	"1.3.rc30.79"
+,	revision:	0.033007 // 1.3.0 final = 1.0300 - major(n+).minor(nn)+patch(nn+)
+
+	// $.layout.browser REPLACES $.browser
+,	browser:	{} // set below
+
+	// *PREDEFINED* EFFECTS & DEFAULTS 
+	// MUST list effect here - OR MUST set an fxSettings option (can be an empty hash: {})
+,	effects: {
+
+	//	Pane Open/Close Animations
+		slide: {
+			all:	{ duration:  "fast"	} // eg: duration: 1000, easing: "easeOutBounce"
+		,	north:	{ direction: "up"	}
+		,	south:	{ direction: "down"	}
+		,	east:	{ direction: "right"}
+		,	west:	{ direction: "left"	}
+		}
+	,	drop: {
+			all:	{ duration:  "slow"	}
+		,	north:	{ direction: "up"	}
+		,	south:	{ direction: "down"	}
+		,	east:	{ direction: "right"}
+		,	west:	{ direction: "left"	}
+		}
+	,	scale: {
+			all:	{ duration:	"fast"	}
+		}
+	//	these are not recommended, but can be used
+	,	blind:		{}
+	,	clip:		{}
+	,	explode:	{}
+	,	fade:		{}
+	,	fold:		{}
+	,	puff:		{}
+
+	//	Pane Resize Animations
+	,	size: {
+			all:	{ easing:	"swing"	}
+		}
+	}
+
+	// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
+,	config: {
+		optionRootKeys:	"effects,panes,north,south,west,east,center".split(",")
+	,	allPanes:		"north,south,west,east,center".split(",")
+	,	borderPanes:	"north,south,west,east".split(",")
+	,	oppositeEdge: {
+			north:	"south"
+		,	south:	"north"
+		,	east: 	"west"
+		,	west: 	"east"
+		}
+	//	offscreen data
+	,	offscreenCSS:	{ left: "-99999px", right: "auto" } // used by hide/close if useOffscreenClose=true
+	,	offscreenReset:	"offscreenReset" // key used for data
+	//	CSS used in multiple places
+	,	hidden:		{ visibility: "hidden" }
+	,	visible:	{ visibility: "visible" }
+	//	layout element settings
+	,	resizers: {
+			cssReq: {
+				position: 	"absolute"
+			,	padding: 	0
+			,	margin: 	0
+			,	fontSize:	"1px"
+			,	textAlign:	"left"	// to counter-act "center" alignment!
+			,	overflow: 	"hidden" // prevent toggler-button from overflowing
+			//	SEE $.layout.defaults.zIndexes.resizer_normal
+			}
+		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
+				background: "#DDD"
+			,	border:		"none"
+			}
+		}
+	,	togglers: {
+			cssReq: {
+				position: 	"absolute"
+			,	display: 	"block"
+			,	padding: 	0
+			,	margin: 	0
+			,	overflow:	"hidden"
+			,	textAlign:	"center"
+			,	fontSize:	"1px"
+			,	cursor: 	"pointer"
+			,	zIndex: 	1
+			}
+		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
+				background: "#AAA"
+			}
+		}
+	,	content: {
+			cssReq: {
+				position:	"relative" /* contain floated or positioned elements */
+			}
+		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
+				overflow:	"auto"
+			,	padding:	"10px"
+			}
+		,	cssDemoPane: { // DEMO CSS - REMOVE scrolling from 'pane' when it has a content-div
+				overflow:	"hidden"
+			,	padding:	0
+			}
+		}
+	,	panes: { // defaults for ALL panes - overridden by 'per-pane settings' below
+			cssReq: {
+				position: 	"absolute"
+			,	margin:		0
+			//	$.layout.defaults.zIndexes.pane_normal
+			}
+		,	cssDemo: { // DEMO CSS - applied if: options.PANE.applyDemoStyles=true
+				padding:	"10px"
+			,	background:	"#FFF"
+			,	border:		"1px solid #BBB"
+			,	overflow:	"auto"
+			}
+		}
+	,	north: {
+			side:			"top"
+		,	sizeType:		"Height"
+		,	dir:			"horz"
+		,	cssReq: {
+				top: 		0
+			,	bottom: 	"auto"
+			,	left: 		0
+			,	right: 		0
+			,	width: 		"auto"
+			//	height: 	DYNAMIC
+			}
+		}
+	,	south: {
+			side:			"bottom"
+		,	sizeType:		"Height"
+		,	dir:			"horz"
+		,	cssReq: {
+				top: 		"auto"
+			,	bottom: 	0
+			,	left: 		0
+			,	right: 		0
+			,	width: 		"auto"
+			//	height: 	DYNAMIC
+			}
+		}
+	,	east: {
+			side:			"right"
+		,	sizeType:		"Width"
+		,	dir:			"vert"
+		,	cssReq: {
+				left: 		"auto"
+			,	right: 		0
+			,	top: 		"auto" // DYNAMIC
+			,	bottom: 	"auto" // DYNAMIC
+			,	height: 	"auto"
+			//	width: 		DYNAMIC
+			}
+		}
+	,	west: {
+			side:			"left"
+		,	sizeType:		"Width"
+		,	dir:			"vert"
+		,	cssReq: {
+				left: 		0
+			,	right: 		"auto"
+			,	top: 		"auto" // DYNAMIC
+			,	bottom: 	"auto" // DYNAMIC
+			,	height: 	"auto"
+			//	width: 		DYNAMIC
+			}
+		}
+	,	center: {
+			dir:			"center"
+		,	cssReq: {
+				left: 		"auto" // DYNAMIC
+			,	right: 		"auto" // DYNAMIC
+			,	top: 		"auto" // DYNAMIC
+			,	bottom: 	"auto" // DYNAMIC
+			,	height: 	"auto"
+			,	width: 		"auto"
+			}
+		}
+	}
+
+	// CALLBACK FUNCTION NAMESPACE - used to store reusable callback functions
+,	callbacks: {}
+
+,	getParentPaneElem: function (el) {
+		// must pass either a container or pane element
+		var $el = $(el)
+		,	layout = $el.data("layout") || $el.data("parentLayout");
+		if (layout) {
+			var $cont = layout.container;
+			// see if this container is directly-nested inside an outer-pane
+			if ($cont.data("layoutPane")) return $cont;
+			var $pane = $cont.closest("."+ $.layout.defaults.panes.paneClass);
+			// if a pane was found, return it
+			if ($pane.data("layoutPane")) return $pane;
+		}
+		return null;
+	}
+
+,	getParentPaneInstance: function (el) {
+		// must pass either a container or pane element
+		var $pane = $.layout.getParentPaneElem(el);
+		return $pane ? $pane.data("layoutPane") : null;
+	}
+
+,	getParentLayoutInstance: function (el) {
+		// must pass either a container or pane element
+		var $pane = $.layout.getParentPaneElem(el);
+		return $pane ? $pane.data("parentLayout") : null;
+	}
+
+,	getEventObject: function (evt) {
+		return typeof evt === "object" && evt.stopPropagation ? evt : null;
+	}
+,	parsePaneName: function (evt_or_pane) {
+		var evt = $.layout.getEventObject( evt_or_pane )
+		,	pane = evt_or_pane;
+		if (evt) {
+			// ALWAYS stop propagation of events triggered in Layout!
+			evt.stopPropagation();
+			pane = $(this).data("layoutEdge");
+		}
+		if (pane && !/^(west|east|north|south|center)$/.test(pane)) {
+			$.layout.msg('LAYOUT ERROR - Invalid pane-name: "'+ pane +'"');
+			pane = "error";
+		}
+		return pane;
+	}
+
+
+	// LAYOUT-PLUGIN REGISTRATION
+	// more plugins can added beyond this default list
+,	plugins: {
+		draggable:		!!$.fn.draggable // resizing
+	,	effects: {
+			core:		!!$.effects		// animimations (specific effects tested by initOptions)
+		,	slide:		$.effects && ($.effects.slide || ($.effects.effect && $.effects.effect.slide)) // default effect
+		}
+	}
+
+//	arrays of plugin or other methods to be triggered for events in *each layout* - will be passed 'Instance'
+,	onCreate:	[]	// runs when layout is just starting to be created - right after options are set
+,	onLoad:		[]	// runs after layout container and global events init, but before initPanes is called
+,	onReady:	[]	// runs after initialization *completes* - ie, after initPanes completes successfully
+,	onDestroy:	[]	// runs after layout is destroyed
+,	onUnload:	[]	// runs after layout is destroyed OR when page unloads
+,	afterOpen:	[]	// runs after setAsOpen() completes
+,	afterClose:	[]	// runs after setAsClosed() completes
+
+	/*
+	*	GENERIC UTILITY METHODS
+	*/
+
+	// calculate and return the scrollbar width, as an integer
+,	scrollbarWidth:		function () { return window.scrollbarWidth  || $.layout.getScrollbarSize('width'); }
+,	scrollbarHeight:	function () { return window.scrollbarHeight || $.layout.getScrollbarSize('height'); }
+,	getScrollbarSize:	function (dim) {
+		var $c	= $('<div style="position: absolute; top: -10000px; left: -10000px; width: 100px; height: 100px; overflow: scroll;"></div>').appendTo("body");
+		var d	= { width: $c.css("width") - $c[0].clientWidth, height: $c.height() - $c[0].clientHeight };
+		$c.remove();
+		window.scrollbarWidth	= d.width;
+		window.scrollbarHeight	= d.height;
+		return dim.match(/^(width|height)$/) ? d[dim] : d;
+	}
+
+
+	/**
+	* Returns hash container 'display' and 'visibility'
+	*
+	* @see	$.swap() - swaps CSS, runs callback, resets CSS
+	* @param  {!Object}		$E				jQuery element
+	* @param  {boolean=}	[force=false]	Run even if display != none
+	* @return {!Object}						Returns current style props, if applicable
+	*/
+,	showInvisibly: function ($E, force) {
+		if ($E && $E.length && (force || $E.css("display") === "none")) { // only if not *already hidden*
+			var s = $E[0].style
+				// save ONLY the 'style' props because that is what we must restore
+			,	CSS = { display: s.display || '', visibility: s.visibility || '' };
+			// show element 'invisibly' so can be measured
+			$E.css({ display: "block", visibility: "hidden" });
+			return CSS;
+		}
+		return {};
+	}
+
+	/**
+	* Returns data for setting size of an element (container or a pane).
+	*
+	* @see  _create(), onWindowResize() for container, plus others for pane
+	* @return JSON  Returns a hash of all dimensions: top, bottom, left, right, outerWidth, innerHeight, etc
+	*/
+,	getElementDimensions: function ($E, inset) {
+		var
+		//	dimensions hash - start with current data IF passed
+			d	= { css: {}, inset: {} }
+		,	x	= d.css			// CSS hash
+		,	i	= { bottom: 0 }	// TEMP insets (bottom = complier hack)
+		,	N	= $.layout.cssNum
+		,	off = $E.offset()
+		,	b, p, ei			// TEMP border, padding
+		;
+		d.offsetLeft = off.left;
+		d.offsetTop  = off.top;
+
+		if (!inset) inset = {}; // simplify logic below
+
+		$.each("Left,Right,Top,Bottom".split(","), function (idx, e) { // e = edge
+			b = x["border" + e] = $.layout.borderWidth($E, e);
+			p = x["padding"+ e] = $.layout.cssNum($E, "padding"+e);
+			ei = e.toLowerCase();
+			d.inset[ei] = inset[ei] >= 0 ? inset[ei] : p; // any missing insetX value = paddingX
+			i[ei] = d.inset[ei] + b; // total offset of content from outer side
+		});
+
+		x.width		= $E.width();
+		x.height	= $E.height();
+		x.top		= N($E,"top",true);
+		x.bottom	= N($E,"bottom",true);
+		x.left		= N($E,"left",true);
+		x.right		= N($E,"right",true);
+
+		d.outerWidth	= $E.outerWidth();
+		d.outerHeight	= $E.outerHeight();
+		// calc the TRUE inner-dimensions, even in quirks-mode!
+		d.innerWidth	= max(0, d.outerWidth  - i.left - i.right);
+		d.innerHeight	= max(0, d.outerHeight - i.top  - i.bottom);
+		// layoutWidth/Height is used in calcs for manual resizing
+		// layoutW/H only differs from innerW/H when in quirks-mode - then is like outerW/H
+		d.layoutWidth	= $E.innerWidth();
+		d.layoutHeight	= $E.innerHeight();
+
+		//if ($E.prop('tagName') === 'BODY') { debugData( d, $E.prop('tagName') ); } // DEBUG
+
+		//d.visible	= $E.is(":visible");// && x.width > 0 && x.height > 0;
+
+		return d;
+	}
+
+,	getElementStyles: function ($E, list) {
+		var
+			CSS	= {}
+		,	style	= $E[0].style
+		,	props	= list.split(",")
+		,	sides	= "Top,Bottom,Left,Right".split(",")
+		,	attrs	= "Color,Style,Width".split(",")
+		,	p, s, a, i, j, k
+		;
+		for (i=0; i < props.length; i++) {
+			p = props[i];
+			if (p.match(/(border|padding|margin)$/))
+				for (j=0; j < 4; j++) {
+					s = sides[j];
+					if (p === "border")
+						for (k=0; k < 3; k++) {
+							a = attrs[k];
+							CSS[p+s+a] = style[p+s+a];
+						}
+					else
+						CSS[p+s] = style[p+s];
+				}
+			else
+				CSS[p] = style[p];
+		};
+		return CSS
+	}
+
+	/**
+	* Return the innerWidth for the current browser/doctype
+	*
+	* @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
+	* @param  {Array.<Object>}	$E  Must pass a jQuery object - first element is processed
+	* @param  {number=}			outerWidth (optional) Can pass a width, allowing calculations BEFORE element is resized
+	* @return {number}			Returns the innerWidth of the elem by subtracting padding and borders
+	*/
+,	cssWidth: function ($E, outerWidth) {
+		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
+		if (outerWidth <= 0) return 0;
+
+		var bs	= !$.layout.browser.boxModel ? "border-box" : $.support.boxSizing ? $E.css("boxSizing") : "content-box"
+		,	b	= $.layout.borderWidth
+		,	n	= $.layout.cssNum
+		,	W	= outerWidth
+		;
+		// strip border and/or padding from outerWidth to get CSS Width
+		if (bs !== "border-box")
+			W -= (b($E, "Left") + b($E, "Right"));
+		if (bs === "content-box")
+			W -= (n($E, "paddingLeft") + n($E, "paddingRight"));
+		return max(0,W);
+	}
+
+	/**
+	* Return the innerHeight for the current browser/doctype
+	*
+	* @see  initPanes(), sizeMidPanes(), initHandles(), sizeHandles()
+	* @param  {Array.<Object>}	$E  Must pass a jQuery object - first element is processed
+	* @param  {number=}			outerHeight  (optional) Can pass a width, allowing calculations BEFORE element is resized
+	* @return {number}			Returns the innerHeight of the elem by subtracting padding and borders
+	*/
+,	cssHeight: function ($E, outerHeight) {
+		// a 'calculated' outerHeight can be passed so borders and/or padding are removed if needed
+		if (outerHeight <= 0) return 0;
+
+		var bs	= !$.layout.browser.boxModel ? "border-box" : $.support.boxSizing ? $E.css("boxSizing") : "content-box"
+		,	b	= $.layout.borderWidth
+		,	n	= $.layout.cssNum
+		,	H	= outerHeight
+		;
+		// strip border and/or padding from outerHeight to get CSS Height
+		if (bs !== "border-box")
+			H -= (b($E, "Top") + b($E, "Bottom"));
+		if (bs === "content-box")
+			H -= (n($E, "paddingTop") + n($E, "paddingBottom"));
+		return max(0,H);
+	}
+
+	/**
+	* Returns the 'current CSS numeric value' for a CSS property - 0 if property does not exist
+	*
+	* @see  Called by many methods
+	* @param {Array.<Object>}	$E					Must pass a jQuery object - first element is processed
+	* @param {string}			prop				The name of the CSS property, eg: top, width, etc.
+	* @param {boolean=}			[allowAuto=false]	true = return 'auto' if that is value; false = return 0
+	* @return {(string|number)}						Usually used to get an integer value for position (top, left) or size (height, width)
+	*/
+,	cssNum: function ($E, prop, allowAuto) {
+		if (!$E.jquery) $E = $($E);
+		var CSS = $.layout.showInvisibly($E)
+		,	p	= $.css($E[0], prop, true)
+		,	v	= allowAuto && p=="auto" ? p : Math.round(parseFloat(p) || 0);
+		$E.css( CSS ); // RESET
+		return v;
+	}
+
+,	borderWidth: function (el, side) {
+		if (el.jquery) el = el[0];
+		var b = "border"+ side.substr(0,1).toUpperCase() + side.substr(1); // left => Left
+		return $.css(el, b+"Style", true) === "none" ? 0 : Math.round(parseFloat($.css(el, b+"Width", true)) || 0);
+	}
+
+	/**
+	* Mouse-tracking utility - FUTURE REFERENCE
+	*
+	* init: if (!window.mouse) {
+	*			window.mouse = { x: 0, y: 0 };
+	*			$(document).mousemove( $.layout.trackMouse );
+	*		}
+	*
+	* @param {Object}		evt
+	*
+,	trackMouse: function (evt) {
+		window.mouse = { x: evt.clientX, y: evt.clientY };
+	}
+	*/
+
+	/**
+	* SUBROUTINE for preventPrematureSlideClose option
+	*
+	* @param {Object}		evt
+	* @param {Object=}		el
+	*/
+,	isMouseOverElem: function (evt, el) {
+		var
+			$E	= $(el || this)
+		,	d	= $E.offset()
+		,	T	= d.top
+		,	L	= d.left
+		,	R	= L + $E.outerWidth()
+		,	B	= T + $E.outerHeight()
+		,	x	= evt.pageX	// evt.clientX ?
+		,	y	= evt.pageY	// evt.clientY ?
+		;
+		// if X & Y are < 0, probably means is over an open SELECT
+		return ($.layout.browser.msie && x < 0 && y < 0) || ((x >= L && x <= R) && (y >= T && y <= B));
+	}
+
+	/**
+	* Message/Logging Utility
+	*
+	* @example $.layout.msg("My message");				// log text
+	* @example $.layout.msg("My message", true);		// alert text
+	* @example $.layout.msg({ foo: "bar" }, "Title");	// log hash-data, with custom title
+	* @example $.layout.msg({ foo: "bar" }, true, "Title", { sort: false }); -OR-
+	* @example $.layout.msg({ foo: "bar" }, "Title", { sort: false, display: true }); // alert hash-data
+	*
+	* @param {(Object|string)}			info			String message OR Hash/Array
+	* @param {(Boolean|string|Object)=}	[popup=false]	True means alert-box - can be skipped
+	* @param {(Object|string)=}			[debugTitle=""]	Title for Hash data - can be skipped
+	* @param {Object=}					[debugOpts]		Extra options for debug output
+	*/
+,	msg: function (info, popup, debugTitle, debugOpts) {
+		if ($.isPlainObject(info) && window.debugData) {
+			if (typeof popup === "string") {
+				debugOpts	= debugTitle;
+				debugTitle	= popup;
+			}
+			else if (typeof debugTitle === "object") {
+				debugOpts	= debugTitle;
+				debugTitle	= null;
+			}
+			var t = debugTitle || "log( <object> )"
+			,	o = $.extend({ sort: false, returnHTML: false, display: false }, debugOpts);
+			if (popup === true || o.display)
+				debugData( info, t, o );
+			else if (window.console)
+				console.log(debugData( info, t, o ));
+		}
+		else if (popup)
+			alert(info);
+		else if (window.console)
+			console.log(info);
+		else {
+			var id	= "#layoutLogger"
+			,	$l = $(id);
+			if (!$l.length)
+				$l = createLog();
+			$l.children("ul").append('<li style="padding: 4px 10px; margin: 0; border-top: 1px solid #CCC;">'+ info.replace(/\</g,"&lt;").replace(/\>/g,"&gt;") +'</li>');
+		}
+
+		function createLog () {
+			var pos = $.support.fixedPosition ? 'fixed' : 'absolute'
+			,	$e = $('<div id="layoutLogger" style="position: '+ pos +'; top: 5px; z-index: 999999; max-width: 25%; overflow: hidden; border: 1px solid #000; border-radius: 5px; background: #FBFBFB; box-shadow: 0 2px 10px rgba(0,0,0,0.3);">'
+				+	'<div style="font-size: 13px; font-weight: bold; padding: 5px 10px; background: #F6F6F6; border-radius: 5px 5px 0 0; cursor: move;">'
+				+	'<span style="float: right; padding-left: 7px; cursor: pointer;" title="Remove Console" onclick="$(this).closest(\'#layoutLogger\').remove()">X</span>Layout console.log</div>'
+				+	'<ul style="font-size: 13px; font-weight: none; list-style: none; margin: 0; padding: 0 0 2px;"></ul>'
+				+ '</div>'
+				).appendTo("body");
+			$e.css('left', $(window).width() - $e.outerWidth() - 5)
+			if ($.ui.draggable) $e.draggable({ handle: ':first-child' });
+			return $e;
+		};
+	}
+
+};
+
+
+/*
+ *	$.layout.browser REPLACES removed $.browser, with extra data
+ *	Parsing code here adapted from jQuery 1.8 $.browse
+ */
+var u = navigator.userAgent.toLowerCase()
+,	m = /(chrome)[ \/]([\w.]+)/.exec( u )
+	||	/(webkit)[ \/]([\w.]+)/.exec( u )
+	||	/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( u )
+	||	/(msie) ([\w.]+)/.exec( u )
+	||	u.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( u )
+	||	[]
+,	b = m[1] || ""
+,	v = m[2] || 0
+,	ie = b === "msie"
+;
+$.layout.browser = {
+	version:	v
+,	safari:		b === "webkit"	// webkit (NOT chrome) = safari
+,	webkit:		b === "chrome"	// chrome = webkit
+,	msie:		ie
+,	isIE6:		ie && v == 6
+	// ONLY IE reverts to old box-model - update for older jQ onReady
+,	boxModel:	!ie || $.support.boxModel !== false
+};
+if (b) $.layout.browser[b] = true; // set CURRENT browser
+/*	OLD versions of jQuery only set $.support.boxModel after page is loaded
+ *	so if this is IE, use support.boxModel to test for quirks-mode (ONLY IE changes boxModel) */
+if (ie) $(function(){ $.layout.browser.boxModel = $.support.boxModel; });
+
+
+// DEFAULT OPTIONS
+$.layout.defaults = {
+/*
+ *	LAYOUT & LAYOUT-CONTAINER OPTIONS
+ *	- none of these options are applicable to individual panes
+ */
+	name:						""			// Not required, but useful for buttons and used for the state-cookie
+,	containerClass:				"ui-layout-container" // layout-container element
+,	inset:						null		// custom container-inset values (override padding)
+,	scrollToBookmarkOnLoad:		true		// after creating a layout, scroll to bookmark in URL (.../page.htm#myBookmark)
+,	resizeWithWindow:			true		// bind thisLayout.resizeAll() to the window.resize event
+,	resizeWithWindowDelay:		200			// delay calling resizeAll because makes window resizing very jerky
+,	resizeWithWindowMaxDelay:	0			// 0 = none - force resize every XX ms while window is being resized
+,	maskPanesEarly:				false		// true = create pane-masks on resizer.mouseDown instead of waiting for resizer.dragstart
+,	onresizeall_start:			null		// CALLBACK when resizeAll() STARTS	- NOT pane-specific
+,	onresizeall_end:			null		// CALLBACK when resizeAll() ENDS	- NOT pane-specific
+,	onload_start:				null		// CALLBACK when Layout inits - after options initialized, but before elements
+,	onload_end:					null		// CALLBACK when Layout inits - after EVERYTHING has been initialized
+,	onunload_start:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
+,	onunload_end:				null		// CALLBACK when Layout is destroyed OR onWindowUnload
+,	initPanes:					true		// false = DO NOT initialize the panes onLoad - will init later
+,	showErrorMessages:			true		// enables fatal error messages to warn developers of common errors
+,	showDebugMessages:			false		// display console-and-alert debug msgs - IF this Layout version _has_ debugging code!
+//	Changing this zIndex value will cause other zIndex values to automatically change
+,	zIndex:						null		// the PANE zIndex - resizers and masks will be +1
+//	DO NOT CHANGE the zIndex values below unless you clearly understand their relationships
+,	zIndexes: {								// set _default_ z-index values here...
+		pane_normal:			0			// normal z-index for panes
+	,	content_mask:			1			// applied to overlays used to mask content INSIDE panes during resizing
+	,	resizer_normal:			2			// normal z-index for resizer-bars
+	,	pane_sliding:			100			// applied to *BOTH* the pane and its resizer when a pane is 'slid open'
+	,	pane_animate:			1000		// applied to the pane when being animated - not applied to the resizer
+	,	resizer_drag:			10000		// applied to the CLONED resizer-bar when being 'dragged'
+	}
+,	errors: {
+		pane:					"pane"		// description of "layout pane element" - used only in error messages
+	,	selector:				"selector"	// description of "jQuery-selector" - used only in error messages
+	,	addButtonError:			"Error Adding Button\nInvalid "
+	,	containerMissing:		"UI Layout Initialization Error\nThe specified layout-container does not exist."
+	,	centerPaneMissing:		"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element."
+	,	noContainerHeight:		"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!"
+	,	callbackError:			"UI Layout Callback Error\nThe EVENT callback is not a valid function."
+	}
+/*
+ *	PANE DEFAULT SETTINGS
+ *	- settings under the 'panes' key become the default settings for *all panes*
+ *	- ALL pane-options can also be set specifically for each panes, which will override these 'default values'
+ */
+,	panes: { // default options for 'all panes' - will be overridden by 'per-pane settings'
+		applyDemoStyles: 		false		// NOTE: renamed from applyDefaultStyles for clarity
+	,	closable:				true		// pane can open & close
+	,	resizable:				true		// when open, pane can be resized 
+	,	slidable:				true		// when closed, pane can 'slide open' over other panes - closes on mouse-out
+	,	initClosed:				false		// true = init pane as 'closed'
+	,	initHidden: 			false 		// true = init pane as 'hidden' - no resizer-bar/spacing
+	//	SELECTORS
+	//,	paneSelector:			""			// MUST be pane-specific - jQuery selector for pane
+	,	contentSelector:		".ui-layout-content" // INNER div/element to auto-size so only it scrolls, not the entire pane!
+	,	contentIgnoreSelector:	".ui-layout-ignore"	// element(s) to 'ignore' when measuring 'content'
+	,	findNestedContent:		false		// true = $P.find(contentSelector), false = $P.children(contentSelector)
+	//	GENERIC ROOT-CLASSES - for auto-generated classNames
+	,	paneClass:				"ui-layout-pane"	// Layout Pane
+	,	resizerClass:			"ui-layout-resizer"	// Resizer Bar
+	,	togglerClass:			"ui-layout-toggler"	// Toggler Button
+	,	buttonClass:			"ui-layout-button"	// CUSTOM Buttons	- eg: '[ui-layout-button]-toggle/-open/-close/-pin'
+	//	ELEMENT SIZE & SPACING
+	//,	size:					100			// MUST be pane-specific -initial size of pane
+	,	minSize:				0			// when manually resizing a pane
+	,	maxSize:				0			// ditto, 0 = no limit
+	,	spacing_open:			6			// space between pane and adjacent panes - when pane is 'open'
+	,	spacing_closed:			6			// ditto - when pane is 'closed'
+	,	togglerLength_open:		50			// Length = WIDTH of toggler button on north/south sides - HEIGHT on east/west sides
+	,	togglerLength_closed: 	50			// 100% OR -1 means 'full height/width of resizer bar' - 0 means 'hidden'
+	,	togglerAlign_open:		"center"	// top/left, bottom/right, center, OR...
+	,	togglerAlign_closed:	"center"	// 1 => nn = offset from top/left, -1 => -nn == offset from bottom/right
+	,	togglerContent_open:	""			// text or HTML to put INSIDE the toggler
+	,	togglerContent_closed:	""			// ditto
+	//	RESIZING OPTIONS
+	,	resizerDblClickToggle:	true		// 
+	,	autoResize:				true		// IF size is 'auto' or a percentage, then recalc 'pixel size' whenever the layout resizes
+	,	autoReopen:				true		// IF a pane was auto-closed due to noRoom, reopen it when there is room? False = leave it closed
+	,	resizerDragOpacity:		1			// option for ui.draggable
+	//,	resizerCursor:			""			// MUST be pane-specific - cursor when over resizer-bar
+	,	maskContents:			false		// true = add DIV-mask over-or-inside this pane so can 'drag' over IFRAMES
+	,	maskObjects:			false		// true = add IFRAME-mask over-or-inside this pane to cover objects/applets - content-mask will overlay this mask
+	,	maskZindex:				null		// will override zIndexes.content_mask if specified - not applicable to iframe-panes
+	,	resizingGrid:			false		// grid size that the resizers will snap-to during resizing, eg: [20,20]
+	,	livePaneResizing:		false		// true = LIVE Resizing as resizer is dragged
+	,	liveContentResizing:	false		// true = re-measure header/footer heights as resizer is dragged
+	,	liveResizingTolerance:	1			// how many px change before pane resizes, to control performance
+	//	SLIDING OPTIONS
+	,	sliderCursor:			"pointer"	// cursor when resizer-bar will trigger 'sliding'
+	,	slideTrigger_open:		"click"		// click, dblclick, mouseenter
+	,	slideTrigger_close:		"mouseleave"// click, mouseleave
+	,	slideDelay_open:		300			// applies only for mouseenter event - 0 = instant open
+	,	slideDelay_close:		300			// applies only for mouseleave event (300ms is the minimum!)
+	,	hideTogglerOnSlide:		false		// when pane is slid-open, should the toggler show?
+	,	preventQuickSlideClose:	$.layout.browser.webkit // Chrome triggers slideClosed as it is opening
+	,	preventPrematureSlideClose: false	// handle incorrect mouseleave trigger, like when over a SELECT-list in IE
+	//	PANE-SPECIFIC TIPS & MESSAGES
+	,	tips: {
+			Open:				"Open"		// eg: "Open Pane"
+		,	Close:				"Close"
+		,	Resize:				"Resize"
+		,	Slide:				"Slide Open"
+		,	Pin:				"Pin"
+		,	Unpin:				"Un-Pin"
+		,	noRoomToOpen:		"Not enough room to show this panel."	// alert if user tries to open a pane that cannot
+		,	minSizeWarning:		"Panel has reached its minimum size"	// displays in browser statusbar
+		,	maxSizeWarning:		"Panel has reached its maximum size"	// ditto
+		}
+	//	HOT-KEYS & MISC
+	,	showOverflowOnHover:	false		// will bind allowOverflow() utility to pane.onMouseOver
+	,	enableCursorHotkey:		true		// enabled 'cursor' hotkeys
+	//,	customHotkey:			""			// MUST be pane-specific - EITHER a charCode OR a character
+	,	customHotkeyModifier:	"SHIFT"		// either 'SHIFT', 'CTRL' or 'CTRL+SHIFT' - NOT 'ALT'
+	//	PANE ANIMATION
+	//	NOTE: fxSss_open, fxSss_close & fxSss_size options (eg: fxName_open) are auto-generated if not passed
+	,	fxName:					"slide" 	// ('none' or blank), slide, drop, scale -- only relevant to 'open' & 'close', NOT 'size'
+	,	fxSpeed:				null		// slow, normal, fast, 200, nnn - if passed, will OVERRIDE fxSettings.duration
+	,	fxSettings:				{}			// can be passed, eg: { easing: "easeOutBounce", duration: 1500 }
+	,	fxOpacityFix:			true		// tries to fix opacity in IE to restore anti-aliasing after animation
+	,	animatePaneSizing:		false		// true = animate resizing after dragging resizer-bar OR sizePane() is called
+	/*  NOTE: Action-specific FX options are auto-generated from the options above if not specifically set:
+		fxName_open:			"slide"		// 'Open' pane animation
+		fnName_close:			"slide"		// 'Close' pane animation
+		fxName_size:			"slide"		// 'Size' pane animation - when animatePaneSizing = true
+		fxSpeed_open:			null
+		fxSpeed_close:			null
+		fxSpeed_size:			null
+		fxSettings_open:		{}
+		fxSettings_close:		{}
+		fxSettings_size:		{}
+	*/
+	//	CHILD/NESTED LAYOUTS
+	,	children:				null		// Layout-options for nested/child layout - even {} is valid as options
+	,	containerSelector:		''			// if child is NOT 'directly nested', a selector to find it/them (can have more than one child layout!)
+	,	initChildren:			true		// true = child layout will be created as soon as _this_ layout completes initialization
+	,	destroyChildren:		true		// true = destroy child-layout if this pane is destroyed
+	,	resizeChildren:			true		// true = trigger child-layout.resizeAll() when this pane is resized
+	//	EVENT TRIGGERING
+	,	triggerEventsOnLoad:	false		// true = trigger onopen OR onclose callbacks when layout initializes
+	,	triggerEventsDuringLiveResize: true	// true = trigger onresize callback REPEATEDLY if livePaneResizing==true
+	//	PANE CALLBACKS
+	,	onshow_start:			null		// CALLBACK when pane STARTS to Show	- BEFORE onopen/onhide_start
+	,	onshow_end:				null		// CALLBACK when pane ENDS being Shown	- AFTER  onopen/onhide_end
+	,	onhide_start:			null		// CALLBACK when pane STARTS to Close	- BEFORE onclose_start
+	,	onhide_end:				null		// CALLBACK when pane ENDS being Closed	- AFTER  onclose_end
+	,	onopen_start:			null		// CALLBACK when pane STARTS to Open
+	,	onopen_end:				null		// CALLBACK when pane ENDS being Opened
+	,	onclose_start:			null		// CALLBACK when pane STARTS to Close
+	,	onclose_end:			null		// CALLBACK when pane ENDS being Closed
+	,	onresize_start:			null		// CALLBACK when pane STARTS being Resized ***FOR ANY REASON***
+	,	onresize_end:			null		// CALLBACK when pane ENDS being Resized ***FOR ANY REASON***
+	,	onsizecontent_start:	null		// CALLBACK when sizing of content-element STARTS
+	,	onsizecontent_end:		null		// CALLBACK when sizing of content-element ENDS
+	,	onswap_start:			null		// CALLBACK when pane STARTS to Swap
+	,	onswap_end:				null		// CALLBACK when pane ENDS being Swapped
+	,	ondrag_start:			null		// CALLBACK when pane STARTS being ***MANUALLY*** Resized
+	,	ondrag_end:				null		// CALLBACK when pane ENDS being ***MANUALLY*** Resized
+	}
+/*
+ *	PANE-SPECIFIC SETTINGS
+ *	- options listed below MUST be specified per-pane - they CANNOT be set under 'panes'
+ *	- all options under the 'panes' key can also be set specifically for any pane
+ *	- most options under the 'panes' key apply only to 'border-panes' - NOT the the center-pane
+ */
+,	north: {
+		paneSelector:			".ui-layout-north"
+	,	size:					"auto"		// eg: "auto", "30%", .30, 200
+	,	resizerCursor:			"n-resize"	// custom = url(myCursor.cur)
+	,	customHotkey:			""			// EITHER a charCode (43) OR a character ("o")
+	}
+,	south: {
+		paneSelector:			".ui-layout-south"
+	,	size:					"auto"
+	,	resizerCursor:			"s-resize"
+	,	customHotkey:			""
+	}
+,	east: {
+		paneSelector:			".ui-layout-east"
+	,	size:					200
+	,	resizerCursor:			"e-resize"
+	,	customHotkey:			""
+	}
+,	west: {
+		paneSelector:			".ui-layout-west"
+	,	size:					200
+	,	resizerCursor:			"w-resize"
+	,	customHotkey:			""
+	}
+,	center: {
+		paneSelector:			".ui-layout-center"
+	,	minWidth:				0
+	,	minHeight:				0
+	}
+};
+
+$.layout.optionsMap = {
+	// layout/global options - NOT pane-options
+	layout: ("name,instanceKey,stateManagement,effects,inset,zIndexes,errors,"
+	+	"zIndex,scrollToBookmarkOnLoad,showErrorMessages,maskPanesEarly,"
+	+	"outset,resizeWithWindow,resizeWithWindowDelay,resizeWithWindowMaxDelay,"
+	+	"onresizeall,onresizeall_start,onresizeall_end,onload,onload_start,onload_end,onunload,onunload_start,onunload_end").split(",")
+//	borderPanes: [ ALL options that are NOT specified as 'layout' ]
+	// default.panes options that apply to the center-pane (most options apply _only_ to border-panes)
+,	center: ("paneClass,contentSelector,contentIgnoreSelector,findNestedContent,applyDemoStyles,triggerEventsOnLoad,"
+	+	"showOverflowOnHover,maskContents,maskObjects,liveContentResizing,"
+	+	"containerSelector,children,initChildren,resizeChildren,destroyChildren,"
+	+	"onresize,onresize_start,onresize_end,onsizecontent,onsizecontent_start,onsizecontent_end").split(",")
+	// options that MUST be specifically set 'per-pane' - CANNOT set in the panes (defaults) key
+,	noDefault: ("paneSelector,resizerCursor,customHotkey").split(",")
+};
+
+/**
+ * Processes options passed in converts flat-format data into subkey (JSON) format
+ * In flat-format, subkeys are _currently_ separated with 2 underscores, like north__optName
+ * Plugins may also call this method so they can transform their own data
+ *
+ * @param  {!Object}	hash			Data/options passed by user - may be a single level or nested levels
+ * @param  {boolean=}	[addKeys=false]	Should the primary layout.options keys be added if they do not exist?
+ * @return {Object}						Returns hash of minWidth & minHeight
+ */
+$.layout.transformData = function (hash, addKeys) {
+	var	json = addKeys ? { panes: {}, center: {} } : {} // init return object
+	,	branch, optKey, keys, key, val, i, c;
+
+	if (typeof hash !== "object") return json; // no options passed
+
+	// convert all 'flat-keys' to 'sub-key' format
+	for (optKey in hash) {
+		branch	= json;
+		val		= hash[ optKey ];
+		keys	= optKey.split("__"); // eg: west__size or north__fxSettings__duration
+		c		= keys.length - 1;
+		// convert underscore-delimited to subkeys
+		for (i=0; i <= c; i++) {
+			key = keys[i];
+			if (i === c) {	// last key = value
+				if ($.isPlainObject( val ))
+					branch[key] = $.layout.transformData( val ); // RECURSE
+				else
+					branch[key] = val;
+			}
+			else {
+				if (!branch[key])
+					branch[key] = {}; // create the subkey
+				// recurse to sub-key for next loop - if not done
+				branch = branch[key];
+			}
+		}
+	}
+	return json;
+};
+
+// INTERNAL CONFIG DATA - DO NOT CHANGE THIS!
+$.layout.backwardCompatibility = {
+	// data used by renameOldOptions()
+	map: {
+	//	OLD Option Name:			NEW Option Name
+		applyDefaultStyles:			"applyDemoStyles"
+	//	CHILD/NESTED LAYOUTS
+	,	childOptions:				"children"
+	,	initChildLayout:			"initChildren"
+	,	destroyChildLayout:			"destroyChildren"
+	,	resizeChildLayout:			"resizeChildren"
+	,	resizeNestedLayout:			"resizeChildren"
+	//	MISC Options
+	,	resizeWhileDragging:		"livePaneResizing"
+	,	resizeContentWhileDragging:	"liveContentResizing"
+	,	triggerEventsWhileDragging:	"triggerEventsDuringLiveResize"
+	,	maskIframesOnResize:		"maskContents"
+	//	STATE MANAGEMENT
+	,	useStateCookie:				"stateManagement.enabled"
+	,	"cookie.autoLoad":			"stateManagement.autoLoad"
+	,	"cookie.autoSave":			"stateManagement.autoSave"
+	,	"cookie.keys":				"stateManagement.stateKeys"
+	,	"cookie.name":				"stateManagement.cookie.name"
+	,	"cookie.domain":			"stateManagement.cookie.domain"
+	,	"cookie.path":				"stateManagement.cookie.path"
+	,	"cookie.expires":			"stateManagement.cookie.expires"
+	,	"cookie.secure":			"stateManagement.cookie.secure"
+	//	OLD Language options
+	,	noRoomToOpenTip:			"tips.noRoomToOpen"
+	,	togglerTip_open:			"tips.Close"	// open   = Close
+	,	togglerTip_closed:			"tips.Open"		// closed = Open
+	,	resizerTip:					"tips.Resize"
+	,	sliderTip:					"tips.Slide"
+	}
+
+/**
+* @param {Object}	opts
+*/
+,	renameOptions: function (opts) {
+		var map = $.layout.backwardCompatibility.map
+		,	oldData, newData, value
+		;
+		for (var itemPath in map) {
+			oldData	= getBranch( itemPath );
+			value	= oldData.branch[ oldData.key ];
+			if (value !== undefined) {
+				newData = getBranch( map[itemPath], true );
+				newData.branch[ newData.key ] = value;
+				delete oldData.branch[ oldData.key ];
+			}
+		}
+
+		/**
+		* @param {string}	path
+		* @param {boolean=}	[create=false]	Create path if does not exist
+		*/
+		function getBranch (path, create) {
+			var a = path.split(".") // split keys into array
+			,	c = a.length - 1
+			,	D = { branch: opts, key: a[c] } // init branch at top & set key (last item)
+			,	i = 0, k, undef;
+			for (; i<c; i++) { // skip the last key (data)
+				k = a[i];
+				if (D.branch[ k ] == undefined) { // child-key does not exist
+					if (create) {
+						D.branch = D.branch[ k ] = {}; // create child-branch
+					}
+					else // can't go any farther
+						D.branch = {}; // branch is undefined
+				}
+				else
+					D.branch = D.branch[ k ]; // get child-branch
+			}
+			return D;
+		};
+	}
+
+/**
+* @param {Object}	opts
+*/
+,	renameAllOptions: function (opts) {
+		var ren = $.layout.backwardCompatibility.renameOptions;
+		// rename root (layout) options
+		ren( opts );
+		// rename 'defaults' to 'panes'
+		if (opts.defaults) {
+			if (typeof opts.panes !== "object")
+				opts.panes = {};
+			$.extend(true, opts.panes, opts.defaults);
+			delete opts.defaults;
+		}
+		// rename options in the the options.panes key
+		if (opts.panes) ren( opts.panes );
+		// rename options inside *each pane key*, eg: options.west
+		$.each($.layout.config.allPanes, function (i, pane) {
+			if (opts[pane]) ren( opts[pane] );
+		});	
+		return opts;
+	}
+};
+
+
+
+
+/*	============================================================
+ *	BEGIN WIDGET: $( selector ).layout( {options} );
+ *	============================================================
+ */
+$.fn.layout = function (opts) {
+	var
+
+	// local aliases to global data
+	browser	= $.layout.browser
+,	_c		= $.layout.config
+
+	// local aliases to utlity methods
+,	cssW	= $.layout.cssWidth
+,	cssH	= $.layout.cssHeight
+,	elDims	= $.layout.getElementDimensions
+,	styles	= $.layout.getElementStyles
+,	evtObj	= $.layout.getEventObject
+,	evtPane	= $.layout.parsePaneName
+
+/**
+ * options - populated by initOptions()
+ */
+,	options = $.extend(true, {}, $.layout.defaults)
+,	effects	= options.effects = $.extend(true, {}, $.layout.effects)
+
+/**
+ * layout-state object
+ */
+,	state = {
+		// generate unique ID to use for event.namespace so can unbind only events added by 'this layout'
+		id:				"layout"+ $.now()	// code uses alias: sID
+	,	initialized:	false
+	,	paneResizing:	false
+	,	panesSliding:	{}
+	,	container:	{ 	// list all keys referenced in code to avoid compiler error msgs
+			innerWidth:		0
+		,	innerHeight:	0
+		,	outerWidth:		0
+		,	outerHeight:	0
+		,	layoutWidth:	0
+		,	layoutHeight:	0
+		}
+	,	north:		{ childIdx: 0 }
+	,	south:		{ childIdx: 0 }
+	,	east:		{ childIdx: 0 }
+	,	west:		{ childIdx: 0 }
+	,	center:		{ childIdx: 0 }
+	}
+
+/**
+ * parent/child-layout pointers
+ */
+//,	hasParentLayout	= false	- exists ONLY inside Instance so can be set externally
+,	children = {
+		north:		null
+	,	south:		null
+	,	east:		null
+	,	west:		null
+	,	center:		null
+	}
+
+/*
+ * ###########################
+ *  INTERNAL HELPER FUNCTIONS
+ * ###########################
+ */
+
+	/**
+	* Manages all internal timers
+	*/
+,	timer = {
+		data:	{}
+	,	set:	function (s, fn, ms) { timer.clear(s); timer.data[s] = setTimeout(fn, ms); }
+	,	clear:	function (s) { var t=timer.data; if (t[s]) {clearTimeout(t[s]); delete t[s];} }
+	}
+
+	/**
+	* Alert or console.log a message - IF option is enabled.
+	*
+	* @param {(string|!Object)}	msg				Message (or debug-data) to display
+	* @param {boolean=}			[popup=false]	True by default, means 'alert', false means use console.log
+	* @param {boolean=}			[debug=false]	True means is a widget debugging message
+	*/
+,	_log = function (msg, popup, debug) {
+		var o = options;
+		if ((o.showErrorMessages && !debug) || (debug && o.showDebugMessages))
+			$.layout.msg( o.name +' / '+ msg, (popup !== false) );
+		return false;
+	}
+
+	/**
+	* Executes a Callback function after a trigger event, like resize, open or close
+	*
+	* @param {string}				evtName					Name of the layout callback, eg "onresize_start"
+	* @param {(string|boolean)=}	[pane=""]				This is passed only so we can pass the 'pane object' to the callback
+	* @param {(string|boolean)=}	[skipBoundEvents=false]	True = do not run events bound to the elements - only the callbacks set in options
+	*/
+,	_runCallbacks = function (evtName, pane, skipBoundEvents) {
+		var	hasPane	= pane && isStr(pane)
+		,	s		= hasPane ? state[pane] : state
+		,	o		= hasPane ? options[pane] : options
+		,	lName	= options.name
+			// names like onopen and onopen_end separate are interchangeable in options...
+		,	lng		= evtName + (evtName.match(/_/) ? "" : "_end")
+		,	shrt	= lng.match(/_end$/) ? lng.substr(0, lng.length - 4) : ""
+		,	fn		= o[lng] || o[shrt]
+		,	retVal	= "NC" // NC = No Callback
+		,	args	= []
+		,	$P
+		;
+		if ( !hasPane && $.type(pane) === 'boolean' ) {
+			skipBoundEvents = pane; // allow pane param to be skipped for Layout callback
+			pane = "";
+		}
+
+		// first trigger the callback set in the options
+		if (fn) {
+			try {
+				// convert function name (string) to function object
+				if (isStr( fn )) {
+					if (fn.match(/,/)) {
+						// function name cannot contain a comma, 
+						// so must be a function name AND a parameter to pass
+						args = fn.split(",")
+						,	fn = eval(args[0]);
+					}
+					else // just the name of an external function?
+						fn = eval(fn);
+				}
+				// execute the callback, if exists
+				if ($.isFunction( fn )) {
+					if (args.length)
+						retVal = g(fn)(args[1]); // pass the argument parsed from 'list'
+					else if ( hasPane )
+						// pass data: pane-name, pane-element, pane-state, pane-options, and layout-name
+						retVal = g(fn)( pane, $Ps[pane], s, o, lName );
+					else // must be a layout/container callback - pass suitable info
+						retVal = g(fn)( Instance, s, o, lName );
+				}
+			}
+			catch (ex) {
+				_log( options.errors.callbackError.replace(/EVENT/, $.trim((pane || "") +" "+ lng)), false );
+				if ($.type(ex) === 'string' && string.length)
+					_log('Exception:  '+ ex, false );
+			}
+		}
+
+		// trigger additional events bound directly to the pane
+		if (!skipBoundEvents && retVal !== false) {
+			if ( hasPane ) { // PANE events can be bound to each pane-elements
+				$P	= $Ps[pane];
+				o	= options[pane];
+				s	= state[pane];
+				$P.triggerHandler('layoutpane'+ lng, [ pane, $P, s, o, lName ]);
+				if (shrt)
+					$P.triggerHandler('layoutpane'+ shrt, [ pane, $P, s, o, lName ]);
+			}
+			else { // LAYOUT events can be bound to the container-element
+				$N.triggerHandler('layout'+ lng, [ Instance, s, o, lName ]);
+				if (shrt)
+					$N.triggerHandler('layout'+ shrt, [ Instance, s, o, lName ]);
+			}
+		}
+
+		// ALWAYS resizeChildren after an onresize_end event - even during initialization
+		// IGNORE onsizecontent_end event because causes child-layouts to resize TWICE
+		if (hasPane && evtName === "onresize_end") // BAD: || evtName === "onsizecontent_end"
+			resizeChildren(pane+"", true); // compiler hack -force string
+
+		return retVal;
+
+		function g (f) { return f; }; // compiler hack
+	}
+
+
+	/**
+	* cure iframe display issues in IE & other browsers
+	*/
+,	_fixIframe = function (pane) {
+		if (browser.mozilla) return; // skip FireFox - it auto-refreshes iframes onShow
+		var $P = $Ps[pane];
+		// if the 'pane' is an iframe, do it
+		if (state[pane].tagName === "IFRAME")
+			$P.css(_c.hidden).css(_c.visible); 
+		else // ditto for any iframes INSIDE the pane
+			$P.find('IFRAME').css(_c.hidden).css(_c.visible);
+	}
+
+	/**
+	* @param  {string}		pane		Can accept ONLY a 'pane' (east, west, etc)
+	* @param  {number=}		outerSize	(optional) Can pass a width, allowing calculations BEFORE element is resized
+	* @return {number}		Returns the innerHeight/Width of el by subtracting padding and borders
+	*/
+,	cssSize = function (pane, outerSize) {
+		var fn = _c[pane].dir=="horz" ? cssH : cssW;
+		return fn($Ps[pane], outerSize);
+	}
+
+	/**
+	* @param  {string}		pane		Can accept ONLY a 'pane' (east, west, etc)
+	* @return {Object}		Returns hash of minWidth & minHeight
+	*/
+,	cssMinDims = function (pane) {
+		// minWidth/Height means CSS width/height = 1px
+		var	$P	= $Ps[pane]
+		,	dir	= _c[pane].dir
+		,	d	= {
+				minWidth:	1001 - cssW($P, 1000)
+			,	minHeight:	1001 - cssH($P, 1000)
+			}
+		;
+		if (dir === "horz") d.minSize = d.minHeight;
+		if (dir === "vert") d.minSize = d.minWidth;
+		return d;
+	}
+
+	// TODO: see if these methods can be made more useful...
+	// TODO: *maybe* return cssW/H from these so caller can use this info
+
+	/**
+	* @param {(string|!Object)}		el
+	* @param {number=}				outerWidth
+	* @param {boolean=}				[autoHide=false]
+	*/
+,	setOuterWidth = function (el, outerWidth, autoHide) {
+		var $E = el, w;
+		if (isStr(el)) $E = $Ps[el]; // west
+		else if (!el.jquery) $E = $(el);
+		w = cssW($E, outerWidth);
+		$E.css({ width: w });
+		if (w > 0) {
+			if (autoHide && $E.data('autoHidden') && $E.innerHeight() > 0) {
+				$E.show().data('autoHidden', false);
+				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
+					// make hidden, then visible to 'refresh' display after animation
+					$E.css(_c.hidden).css(_c.visible);
+			}
+		}
+		else if (autoHide && !$E.data('autoHidden'))
+			$E.hide().data('autoHidden', true);
+	}
+
+	/**
+	* @param {(string|!Object)}		el
+	* @param {number=}				outerHeight
+	* @param {boolean=}				[autoHide=false]
+	*/
+,	setOuterHeight = function (el, outerHeight, autoHide) {
+		var $E = el, h;
+		if (isStr(el)) $E = $Ps[el]; // west
+		else if (!el.jquery) $E = $(el);
+		h = cssH($E, outerHeight);
+		$E.css({ height: h, visibility: "visible" }); // may have been 'hidden' by sizeContent
+		if (h > 0 && $E.innerWidth() > 0) {
+			if (autoHide && $E.data('autoHidden')) {
+				$E.show().data('autoHidden', false);
+				if (!browser.mozilla) // FireFox refreshes iframes - IE does not
+					$E.css(_c.hidden).css(_c.visible);
+			}
+		}
+		else if (autoHide && !$E.data('autoHidden'))
+			$E.hide().data('autoHidden', true);
+	}
+
+
+	/**
+	* Converts any 'size' params to a pixel/integer size, if not already
+	* If 'auto' or a decimal/percentage is passed as 'size', a pixel-size is calculated
+	*
+	/**
+	* @param  {string}				pane
+	* @param  {(string|number)=}	size
+	* @param  {string=}				[dir]
+	* @return {number}
+	*/
+,	_parseSize = function (pane, size, dir) {
+		if (!dir) dir = _c[pane].dir;
+
+		if (isStr(size) && size.match(/%/))
+			size = (size === '100%') ? -1 : parseInt(size, 10) / 100; // convert % to decimal
+
+		if (size === 0)
+			return 0;
+		else if (size >= 1)
+			return parseInt(size, 10);
+
+		var o = options, avail = 0;
+		if (dir=="horz") // north or south or center.minHeight
+			avail = sC.innerHeight - ($Ps.north ? o.north.spacing_open : 0) - ($Ps.south ? o.south.spacing_open : 0);
+		else if (dir=="vert") // east or west or center.minWidth
+			avail = sC.innerWidth - ($Ps.west ? o.west.spacing_open : 0) - ($Ps.east ? o.east.spacing_open : 0);
+
+		if (size === -1) // -1 == 100%
+			return avail;
+		else if (size > 0) // percentage, eg: .25
+			return round(avail * size);
+		else if (pane=="center")
+			return 0;
+		else { // size < 0 || size=='auto' || size==Missing || size==Invalid
+			// auto-size the pane
+			var	dim	= (dir === "horz" ? "height" : "width")
+			,	$P	= $Ps[pane]
+			,	$C	= dim === 'height' ? $Cs[pane] : false
+			,	vis	= $.layout.showInvisibly($P) // show pane invisibly if hidden
+			,	szP	= $P.css(dim) // SAVE current pane size
+			,	szC	= $C ? $C.css(dim) : 0 // SAVE current content size
+			;
+			$P.css(dim, "auto");
+			if ($C) $C.css(dim, "auto");
+			size = (dim === "height") ? $P.outerHeight() : $P.outerWidth(); // MEASURE
+			$P.css(dim, szP).css(vis); // RESET size & visibility
+			if ($C) $C.css(dim, szC);
+			return size;
+		}
+	}
+
+	/**
+	* Calculates current 'size' (outer-width or outer-height) of a border-pane - optionally with 'pane-spacing' added
+	*
+	* @param  {(string|!Object)}	pane
+	* @param  {boolean=}			[inclSpace=false]
+	* @return {number}				Returns EITHER Width for east/west panes OR Height for north/south panes
+	*/
+,	getPaneSize = function (pane, inclSpace) {
+		var 
+			$P	= $Ps[pane]
+		,	o	= options[pane]
+		,	s	= state[pane]
+		,	oSp	= (inclSpace ? o.spacing_open : 0)
+		,	cSp	= (inclSpace ? o.spacing_closed : 0)
+		;
+		if (!$P || s.isHidden)
+			return 0;
+		else if (s.isClosed || (s.isSliding && inclSpace))
+			return cSp;
+		else if (_c[pane].dir === "horz")
+			return $P.outerHeight() + oSp;
+		else // dir === "vert"
+			return $P.outerWidth() + oSp;
+	}
+
+	/**
+	* Calculate min/max pane dimensions and limits for resizing
+	*
+	* @param  {string}		pane
+	* @param  {boolean=}	[slide=false]
+	*/
+,	setSizeLimits = function (pane, slide) {
+		if (!isInitialized()) return;
+		var 
+			o				= options[pane]
+		,	s				= state[pane]
+		,	c				= _c[pane]
+		,	dir				= c.dir
+		,	type			= c.sizeType.toLowerCase()
+		,	isSliding		= (slide != undefined ? slide : s.isSliding) // only open() passes 'slide' param
+		,	$P				= $Ps[pane]
+		,	paneSpacing		= o.spacing_open
+		//	measure the pane on the *opposite side* from this pane
+		,	altPane			= _c.oppositeEdge[pane]
+		,	altS			= state[altPane]
+		,	$altP			= $Ps[altPane]
+		,	altPaneSize		= (!$altP || altS.isVisible===false || altS.isSliding ? 0 : (dir=="horz" ? $altP.outerHeight() : $altP.outerWidth()))
+		,	altPaneSpacing	= ((!$altP || altS.isHidden ? 0 : options[altPane][ altS.isClosed !== false ? "spacing_closed" : "spacing_open" ]) || 0)
+		//	limitSize prevents this pane from 'overlapping' opposite pane
+		,	containerSize	= (dir=="horz" ? sC.innerHeight : sC.innerWidth)
+		,	minCenterDims	= cssMinDims("center")
+		,	minCenterSize	= dir=="horz" ? max(options.center.minHeight, minCenterDims.minHeight) : max(options.center.minWidth, minCenterDims.minWidth)
+		//	if pane is 'sliding', then ignore center and alt-pane sizes - because 'overlays' them
+		,	limitSize		= (containerSize - paneSpacing - (isSliding ? 0 : (_parseSize("center", minCenterSize, dir) + altPaneSize + altPaneSpacing)))
+		,	minSize			= s.minSize = max( _parseSize(pane, o.minSize), cssMinDims(pane).minSize )
+		,	maxSize			= s.maxSize = min( (o.maxSize ? _parseSize(pane, o.maxSize) : 100000), limitSize )
+		,	r				= s.resizerPosition = {} // used to set resizing limits
+		,	top				= sC.inset.top
+		,	left			= sC.inset.left
+		,	W				= sC.innerWidth
+		,	H				= sC.innerHeight
+		,	rW				= o.spacing_open // subtract resizer-width to get top/left position for south/east
+		;
+		switch (pane) {
+			case "north":	r.min = top + minSize;
+							r.max = top + maxSize;
+							break;
+			case "west":	r.min = left + minSize;
+							r.max = left + maxSize;
+							break;
+			case "south":	r.min = top + H - maxSize - rW;
+							r.max = top + H - minSize - rW;
+							break;
+			case "east":	r.min = left + W - maxSize - rW;
+							r.max = left + W - minSize - rW;
+							break;
+		};
+	}
+
+	/**
+	* Returns data for setting the size/position of center pane. Also used to set Height for east/west panes
+	*
+	* @return JSON  Returns a hash of all dimensions: top, bottom, left, right, (outer) width and (outer) height
+	*/
+,	calcNewCenterPaneDims = function () {
+		var d = {
+			top:	getPaneSize("north", true) // true = include 'spacing' value for pane
+		,	bottom:	getPaneSize("south", true)
+		,	left:	getPaneSize("west", true)
+		,	right:	getPaneSize("east", true)
+		,	width:	0
+		,	height:	0
+		};
+
+		// NOTE: sC = state.container
+		// calc center-pane outer dimensions
+		d.width		= sC.innerWidth - d.left - d.right;  // outerWidth
+		d.height	= sC.innerHeight - d.bottom - d.top; // outerHeight
+		// add the 'container border/padding' to get final positions relative to the container
+		d.top		+= sC.inset.top;
+		d.bottom	+= sC.inset.bottom;
+		d.left		+= sC.inset.left;
+		d.right		+= sC.inset.right;
+
+		return d;
+	}
+
+
+	/**
+	* @param {!Object}		el
+	* @param {boolean=}		[allStates=false]
+	*/
+,	getHoverClasses = function (el, allStates) {
+		var
+			$El		= $(el)
+		,	type	= $El.data("layoutRole")
+		,	pane	= $El.data("layoutEdge")
+		,	o		= options[pane]
+		,	root	= o[type +"Class"]
+		,	_pane	= "-"+ pane // eg: "-west"
+		,	_open	= "-open"
+		,	_closed	= "-closed"
+		,	_slide	= "-sliding"
+		,	_hover	= "-hover " // NOTE the trailing space
+		,	_state	= $El.hasClass(root+_closed) ? _closed : _open
+		,	_alt	= _state === _closed ? _open : _closed
+		,	classes = (root+_hover) + (root+_pane+_hover) + (root+_state+_hover) + (root+_pane+_state+_hover)
+		;
+		if (allStates) // when 'removing' classes, also remove alternate-state classes
+			classes += (root+_alt+_hover) + (root+_pane+_alt+_hover);
+
+		if (type=="resizer" && $El.hasClass(root+_slide))
+			classes += (root+_slide+_hover) + (root+_pane+_slide+_hover);
+
+		return $.trim(classes);
+	}
+,	addHover	= function (evt, el) {
+		var $E = $(el || this);
+		if (evt && $E.data("layoutRole") === "toggler")
+			evt.stopPropagation(); // prevent triggering 'slide' on Resizer-bar
+		$E.addClass( getHoverClasses($E) );
+	}
+,	removeHover	= function (evt, el) {
+		var $E = $(el || this);
+		$E.removeClass( getHoverClasses($E, true) );
+	}
+
+,	onResizerEnter	= function (evt) { // ALSO called by toggler.mouseenter
+		var pane	= $(this).data("layoutEdge")
+		,	s		= state[pane]
+		;
+		// ignore closed-panes and mouse moving back & forth over resizer!
+		// also ignore if ANY pane is currently resizing
+		if ( s.isClosed || s.isResizing || state.paneResizing ) return;
+
+		if ($.fn.disableSelection)
+			$("body").disableSelection();
+		if (options.maskPanesEarly)
+			showMasks( pane, { resizing: true });
+	}
+,	onResizerLeave	= function (evt, el) {
+		var	e		= el || this // el is only passed when called by the timer
+		,	pane	= $(e).data("layoutEdge")
+		,	name	= pane +"ResizerLeave"
+		;
+		timer.clear(pane+"_openSlider"); // cancel slideOpen timer, if set
+		timer.clear(name); // cancel enableSelection timer - may re/set below
+		// this method calls itself on a timer because it needs to allow
+		// enough time for dragging to kick-in and set the isResizing flag
+		// dragging has a 100ms delay set, so this delay must be >100
+		if (!el) // 1st call - mouseleave event
+			timer.set(name, function(){ onResizerLeave(evt, e); }, 200);
+		// if user is resizing, then dragStop will enableSelection(), so can skip it here
+		else if ( !state.paneResizing ) { // 2nd call - by timer
+			if ($.fn.enableSelection)
+				$("body").enableSelection();
+			if (options.maskPanesEarly)
+				hideMasks();
+		}
+	}
+
+/*
+ * ###########################
+ *   INITIALIZATION METHODS
+ * ###########################
+ */
+
+	/**
+	* Initialize the layout - called automatically whenever an instance of layout is created
+	*
+	* @see  none - triggered onInit
+	* @return  mixed	true = fully initialized | false = panes not initialized (yet) | 'cancel' = abort
+	*/
+,	_create = function () {
+		// initialize config/options
+		initOptions();
+		var o = options
+		,	s = state;
+
+		// TEMP state so isInitialized returns true during init process
+		s.creatingLayout = true;
+
+		// init plugins for this layout, if there are any (eg: stateManagement)
+		runPluginCallbacks( Instance, $.layout.onCreate );
+
+		// options & state have been initialized, so now run beforeLoad callback
+		// onload will CANCEL layout creation if it returns false
+		if (false === _runCallbacks("onload_start"))
+			return 'cancel';
+
+		// initialize the container element
+		_initContainer();
+
+		// bind hotkey function - keyDown - if required
+		initHotkeys();
+
+		// bind window.onunload
+		$(window).bind("unload."+ sID, unload);
+
+		// init plugins for this layout, if there are any (eg: customButtons)
+		runPluginCallbacks( Instance, $.layout.onLoad );
+
+		// if layout elements are hidden, then layout WILL NOT complete initialization!
+		// initLayoutElements will set initialized=true and run the onload callback IF successful
+		if (o.initPanes) _initLayoutElements();
+
+		delete s.creatingLayout;
+
+		return state.initialized;
+	}
+
+	/**
+	* Initialize the layout IF not already
+	*
+	* @see  All methods in Instance run this test
+	* @return  boolean	true = layoutElements have been initialized | false = panes are not initialized (yet)
+	*/
+,	isInitialized = function () {
+		if (state.initialized || state.creatingLayout) return true;	// already initialized
+		else return _initLayoutElements();	// try to init panes NOW
+	}
+
+	/**
+	* Initialize the layout - called automatically whenever an instance of layout is created
+	*
+	* @see  _create() & isInitialized
+	* @param {boolean=}		[retry=false]	// indicates this is a 2nd try
+	* @return  An object pointer to the instance created
+	*/
+,	_initLayoutElements = function (retry) {
+		// initialize config/options
+		var o = options;
+		// CANNOT init panes inside a hidden container!
+		if (!$N.is(":visible")) {
+			// handle Chrome bug where popup window 'has no height'
+			// if layout is BODY element, try again in 50ms
+			// SEE: http://layout.jquery-dev.net/samples/test_popup_window.html
+			if ( !retry && browser.webkit && $N[0].tagName === "BODY" )
+				setTimeout(function(){ _initLayoutElements(true); }, 50);
+			return false;
+		}
+
+		// a center pane is required, so make sure it exists
+		if (!getPane("center").length) {
+			return _log( o.errors.centerPaneMissing );
+		}
+
+		// TEMP state so isInitialized returns true during init process
+		state.creatingLayout = true;
+
+		// update Container dims
+		$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
+
+		// initialize all layout elements
+		initPanes();	// size & position panes - calls initHandles() - which calls initResizable()
+
+		if (o.scrollToBookmarkOnLoad) {
+			var l = self.location;
+			if (l.hash) l.replace( l.hash ); // scrollTo Bookmark
+		}
+
+		// check to see if this layout 'nested' inside a pane
+		if (Instance.hasParentLayout)
+			o.resizeWithWindow = false;
+		// bind resizeAll() for 'this layout instance' to window.resize event
+		else if (o.resizeWithWindow)
+			$(window).bind("resize."+ sID, windowResize);
+
+		delete state.creatingLayout;
+		state.initialized = true;
+
+		// init plugins for this layout, if there are any
+		runPluginCallbacks( Instance, $.layout.onReady );
+
+		// now run the onload callback, if exists
+		_runCallbacks("onload_end");
+
+		return true; // elements initialized successfully
+	}
+
+	/**
+	* Initialize nested layouts for a specific pane - can optionally pass layout-options
+	*
+	* @param {(string|Object)}	evt_or_pane	The pane being opened, ie: north, south, east, or west
+	* @param {Object=}			[opts]		Layout-options - if passed, will OVERRRIDE options[pane].children
+	* @return  An object pointer to the layout instance created - or null
+	*/
+,	createChildren = function (evt_or_pane, opts) {
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$P	= $Ps[pane]
+		;
+		if (!$P) return;
+		var	$C	= $Cs[pane]
+		,	s	= state[pane]
+		,	o	= options[pane]
+		,	sm	= options.stateManagement || {}
+		,	cos = opts ? (o.children = opts) : o.children
+		;
+		if ( $.isPlainObject( cos ) )
+			cos = [ cos ]; // convert a hash to a 1-elem array
+		else if (!cos || !$.isArray( cos ))
+			return;
+
+		$.each( cos, function (idx, co) {
+			if ( !$.isPlainObject( co ) ) return;
+
+			// determine which element is supposed to be the 'child container'
+			// if pane has a 'containerSelector' OR a 'content-div', use those instead of the pane
+			var $containers = co.containerSelector ? $P.find( co.containerSelector ) : ($C || $P);
+
+			$containers.each(function(){
+				var $cont	= $(this)
+				,	child	= $cont.data("layout") //	see if a child-layout ALREADY exists on this element
+				;
+				// if no layout exists, but children are set, try to create the layout now
+				if (!child) {
+					// TODO: see about moving this to the stateManagement plugin, as a method
+					// set a unique child-instance key for this layout, if not already set
+					setInstanceKey({ container: $cont, options: co }, s );
+					// If THIS layout has a hash in stateManagement.autoLoad,
+					// then see if it also contains state-data for this child-layout
+					// If so, copy the stateData to child.options.stateManagement.autoLoad
+					if ( sm.includeChildren && state.stateData[pane] ) {
+						//	THIS layout's state was cached when its state was loaded
+						var	paneChildren = state.stateData[pane].children || {}
+						,	childState	= paneChildren[ co.instanceKey ]
+						,	co_sm		= co.stateManagement || (co.stateManagement = { autoLoad: true })
+						;
+						// COPY the stateData into the autoLoad key
+						if ( co_sm.autoLoad === true && childState ) {
+							co_sm.autoSave			= false; // disable autoSave because saving handled by parent-layout
+							co_sm.includeChildren	= true;  // cascade option - FOR NOW
+							co_sm.autoLoad = $.extend(true, {}, childState); // COPY the state-hash
+						}
+					}
+
+					// create the layout
+					child = $cont.layout( co );
+
+					// if successful, update data
+					if (child) {
+						// add the child and update all layout-pointers
+						// MAY have already been done by child-layout calling parent.refreshChildren()
+						refreshChildren( pane, child );
+					}
+				}
+			});
+		});
+	}
+
+,	setInstanceKey = function (child, parentPaneState) {
+		// create a named key for use in state and instance branches
+		var	$c	= child.container
+		,	o	= child.options
+		,	sm	= o.stateManagement
+		,	key	= o.instanceKey || $c.data("layoutInstanceKey")
+		;
+		if (!key) key = (sm && sm.cookie ? sm.cookie.name : '') || o.name; // look for a name/key
+		if (!key) key = "layout"+ (++parentPaneState.childIdx);	// if no name/key found, generate one
+		else key = key.replace(/[^\w-]/gi, '_').replace(/_{2,}/g, '_');	 // ensure is valid as a hash key
+		o.instanceKey = key;
+		$c.data("layoutInstanceKey", key); // useful if layout is destroyed and then recreated
+		return key;
+	}
+
+	/**
+	* @param {string}		pane		The pane being opened, ie: north, south, east, or west
+	* @param {Object=}		newChild	New child-layout Instance to add to this pane
+	*/
+,	refreshChildren = function (pane, newChild) {
+		var	$P	= $Ps[pane]
+		,	pC	= children[pane]
+		,	s	= state[pane]
+		,	o
+		;
+		// check for destroy()ed layouts and update the child pointers & arrays
+		if ($.isPlainObject( pC )) {
+			$.each( pC, function (key, child) {
+				if (child.destroyed) delete pC[key]
+			});
+			// if no more children, remove the children hash
+			if ($.isEmptyObject( pC ))
+				pC = children[pane] = null; // clear children hash
+		}
+
+		// see if there is a directly-nested layout inside this pane
+		// if there is, then there can be only ONE child-layout, so check that...
+		if (!newChild && !pC) {
+			newChild = $P.data("layout");
+		}
+
+		// if a newChild instance was passed, add it to children[pane]
+		if (newChild) {
+			// update child.state
+			newChild.hasParentLayout = true; // set parent-flag in child
+			// instanceKey is a key-name used in both state and children
+			o = newChild.options;
+			// set a unique child-instance key for this layout, if not already set
+			setInstanceKey( newChild, s );
+			// add pointer to pane.children hash
+			if (!pC) pC = children[pane] = {}; // create an empty children hash
+			pC[ o.instanceKey ] = newChild.container.data("layout"); // add childLayout instance
+		}
+
+		// ALWAYS refresh the pane.children alias, even if null
+		Instance[pane].children = children[pane];
+
+		// if newChild was NOT passed - see if there is a child layout NOW
+		if (!newChild) {
+			createChildren(pane); // MAY create a child and re-call this method
+		}
+	}
+
+,	windowResize = function () {
+		var	o = options
+		,	delay = Number(o.resizeWithWindowDelay);
+		if (delay < 10) delay = 100; // MUST have a delay!
+		// resizing uses a delay-loop because the resize event fires repeatly - except in FF, but delay anyway
+		timer.clear("winResize"); // if already running
+		timer.set("winResize", function(){
+			timer.clear("winResize");
+			timer.clear("winResizeRepeater");
+			var dims = elDims( $N, o.inset );
+			// only trigger resizeAll() if container has changed size
+			if (dims.innerWidth !== sC.innerWidth || dims.innerHeight !== sC.innerHeight)
+				resizeAll();
+		}, delay);
+		// ALSO set fixed-delay timer, if not already running
+		if (!timer.data["winResizeRepeater"]) setWindowResizeRepeater();
+	}
+
+,	setWindowResizeRepeater = function () {
+		var delay = Number(options.resizeWithWindowMaxDelay);
+		if (delay > 0)
+			timer.set("winResizeRepeater", function(){ setWindowResizeRepeater(); resizeAll(); }, delay);
+	}
+
+,	unload = function () {
+		var o = options;
+
+		_runCallbacks("onunload_start");
+
+		// trigger plugin callabacks for this layout (eg: stateManagement)
+		runPluginCallbacks( Instance, $.layout.onUnload );
+
+		_runCallbacks("onunload_end");
+	}
+
+	/**
+	* Validate and initialize container CSS and events
+	*
+	* @see  _create()
+	*/
+,	_initContainer = function () {
+		var
+			N		= $N[0]	
+		,	$H		= $("html")
+		,	tag		= sC.tagName = N.tagName
+		,	id		= sC.id = N.id
+		,	cls		= sC.className = N.className
+		,	o		= options
+		,	name	= o.name
+		,	props	= "position,margin,padding,border"
+		,	css		= "layoutCSS"
+		,	CSS		= {}
+		,	hid		= "hidden" // used A LOT!
+		//	see if this container is a 'pane' inside an outer-layout
+		,	parent	= $N.data("parentLayout")	// parent-layout Instance
+		,	pane	= $N.data("layoutEdge")		// pane-name in parent-layout
+		,	isChild	= parent && pane
+		,	num		= $.layout.cssNum
+		,	$parent, n
+		;
+		// sC = state.container
+		sC.selector = $N.selector.split(".slice")[0];
+		sC.ref		= (o.name ? o.name +' layout / ' : '') + tag + (id ? "#"+id : cls ? '.['+cls+']' : ''); // used in messages
+		sC.isBody	= (tag === "BODY");
+
+		// try to find a parent-layout
+		if (!isChild && !sC.isBody) {
+			$parent = $N.closest("."+ $.layout.defaults.panes.paneClass);
+			parent	= $parent.data("parentLayout");
+			pane	= $parent.data("layoutEdge");
+			isChild	= parent && pane;
+		}
+
+		$N	.data({
+				layout: Instance
+			,	layoutContainer: sID // FLAG to indicate this is a layout-container - contains unique internal ID
+			})
+			.addClass(o.containerClass)
+		;
+		var layoutMethods = {
+			destroy:	''
+		,	initPanes:	''
+		,	resizeAll:	'resizeAll'
+		,	resize:		'resizeAll'
+		};
+		// loop hash and bind all methods - include layoutID namespacing
+		for (name in layoutMethods) {
+			$N.bind("layout"+ name.toLowerCase() +"."+ sID, Instance[ layoutMethods[name] || name ]);
+		}
+
+		// if this container is another layout's 'pane', then set child/parent pointers
+		if (isChild) {
+			// update parent flag
+			Instance.hasParentLayout = true;
+			// set pointers to THIS child-layout (Instance) in parent-layout
+			parent.refreshChildren( pane, Instance );
+		}
+
+		// SAVE original container CSS for use in destroy()
+		if (!$N.data(css)) {
+			// handle props like overflow different for BODY & HTML - has 'system default' values
+			if (sC.isBody) {
+				// SAVE <BODY> CSS
+				$N.data(css, $.extend( styles($N, props), {
+					height:		$N.css("height")
+				,	overflow:	$N.css("overflow")
+				,	overflowX:	$N.css("overflowX")
+				,	overflowY:	$N.css("overflowY")
+				}));
+				// ALSO SAVE <HTML> CSS
+				$H.data(css, $.extend( styles($H, 'padding'), {
+					height:		"auto" // FF would return a fixed px-size!
+				,	overflow:	$H.css("overflow")
+				,	overflowX:	$H.css("overflowX")
+				,	overflowY:	$H.css("overflowY")
+				}));
+			}
+			else // handle props normally for non-body elements
+				$N.data(css, styles($N, props+",top,bottom,left,right,width,height,overflow,overflowX,overflowY") );
+		}
+
+		try {
+			// common container CSS
+			CSS = {
+				overflow:	hid
+			,	overflowX:	hid
+			,	overflowY:	hid
+			};
+			$N.css( CSS );
+
+			if (o.inset && !$.isPlainObject(o.inset)) {
+				// can specify a single number for equal outset all-around
+				n = parseInt(o.inset, 10) || 0
+				o.inset = {
+					top:	n
+				,	bottom:	n
+				,	left:	n
+				,	right:	n
+				};
+			}
+
+			// format html & body if this is a full page layout
+			if (sC.isBody) {
+				// if HTML has padding, use this as an outer-spacing around BODY
+				if (!o.outset) {
+					// use padding from parent-elem (HTML) as outset
+					o.outset = {
+						top:	num($H, "paddingTop")
+					,	bottom:	num($H, "paddingBottom")
+					,	left:	num($H, "paddingLeft")
+					,	right:	num($H, "paddingRight")
+					};
+				}
+				else if (!$.isPlainObject(o.outset)) {
+					// can specify a single number for equal outset all-around
+					n = parseInt(o.outset, 10) || 0
+					o.outset = {
+						top:	n
+					,	bottom:	n
+					,	left:	n
+					,	right:	n
+					};
+				}
+				// HTML
+				$H.css( CSS ).css({
+					height:		"100%"
+				,	border:		"none"	// no border or padding allowed when using height = 100%
+				,	padding:	0		// ditto
+				,	margin:		0
+				});
+				// BODY
+				if (browser.isIE6) {
+					// IE6 CANNOT use the trick of setting absolute positioning on all 4 sides - must have 'height'
+					$N.css({
+						width:		"100%"
+					,	height:		"100%"
+					,	border:		"none"	// no border or padding allowed when using height = 100%
+					,	padding:	0		// ditto
+					,	margin:		0
+					,	position:	"relative"
+					});
+					// convert body padding to an inset option - the border cannot be measured in IE6!
+					if (!o.inset) o.inset = elDims( $N ).inset;
+				}
+				else { // use absolute positioning for BODY to allow borders & padding without overflow
+					$N.css({
+						width:		"auto"
+					,	height:		"auto"
+					,	margin:		0
+					,	position:	"absolute"	// allows for border and padding on BODY
+					});
+					// apply edge-positioning created above
+					$N.css( o.outset );
+				}
+				// set current layout-container dimensions
+				$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT include insetX values
+			}
+			else {
+				// container MUST have 'position'
+				var	p = $N.css("position");
+				if (!p || !p.match(/(fixed|absolute|relative)/))
+					$N.css("position","relative");
+
+				// set current layout-container dimensions
+				if ( $N.is(":visible") ) {
+					$.extend(sC, elDims( $N, o.inset )); // passing inset means DO NOT change insetX (padding) values
+					if (sC.innerHeight < 1) // container has no 'height' - warn developer
+						_log( o.errors.noContainerHeight.replace(/CONTAINER/, sC.ref) );
+				}
+			}
+
+			// if container has min-width/height, then enable scrollbar(s)
+			if ( num($N, "minWidth")  ) $N.parent().css("overflowX","auto");
+			if ( num($N, "minHeight") ) $N.parent().css("overflowY","auto");
+
+		} catch (ex) {}
+	}
+
+	/**
+	* Bind layout hotkeys - if options enabled
+	*
+	* @see  _create() and addPane()
+	* @param {string=}	[panes=""]	The edge(s) to process
+	*/
+,	initHotkeys = function (panes) {
+		panes = panes ? panes.split(",") : _c.borderPanes;
+		// bind keyDown to capture hotkeys, if option enabled for ANY pane
+		$.each(panes, function (i, pane) {
+			var o = options[pane];
+			if (o.enableCursorHotkey || o.customHotkey) {
+				$(document).bind("keydown."+ sID, keyDown); // only need to bind this ONCE
+				return false; // BREAK - binding was done
+			}
+		});
+	}
+
+	/**
+	* Build final OPTIONS data
+	*
+	* @see  _create()
+	*/
+,	initOptions = function () {
+		var data, d, pane, key, val, i, c, o;
+
+		// reprocess user's layout-options to have correct options sub-key structure
+		opts = $.layout.transformData( opts, true ); // panes = default subkey
+
+		// auto-rename old options for backward compatibility
+		opts = $.layout.backwardCompatibility.renameAllOptions( opts );
+
+		// if user-options has 'panes' key (pane-defaults), clean it...
+		if (!$.isEmptyObject(opts.panes)) {
+			// REMOVE any pane-defaults that MUST be set per-pane
+			data = $.layout.optionsMap.noDefault;
+			for (i=0, c=data.length; i<c; i++) {
+				key = data[i];
+				delete opts.panes[key]; // OK if does not exist
+			}
+			// REMOVE any layout-options specified under opts.panes
+			data = $.layout.optionsMap.layout;
+			for (i=0, c=data.length; i<c; i++) {
+				key = data[i];
+				delete opts.panes[key]; // OK if does not exist
+			}
+		}
+
+		// MOVE any NON-layout-options from opts-root to opts.panes
+		data = $.layout.optionsMap.layout;
+		var rootKeys = $.layout.config.optionRootKeys;
+		for (key in opts) {
+			val = opts[key];
+			if ($.inArray(key, rootKeys) < 0 && $.inArray(key, data) < 0) {
+				if (!opts.panes[key])
+					opts.panes[key] = $.isPlainObject(val) ? $.extend(true, {}, val) : val;
+				delete opts[key]
+			}
+		}
+
+		// START by updating ALL options from opts
+		$.extend(true, options, opts);
+
+		// CREATE final options (and config) for EACH pane
+		$.each(_c.allPanes, function (i, pane) {
+
+			// apply 'pane-defaults' to CONFIG.[PANE]
+			_c[pane] = $.extend(true, {}, _c.panes, _c[pane]);
+
+			d = options.panes;
+			o = options[pane];
+
+			// center-pane uses SOME keys in defaults.panes branch
+			if (pane === 'center') {
+				// ONLY copy keys from opts.panes listed in: $.layout.optionsMap.center
+				data = $.layout.optionsMap.center;		// list of 'center-pane keys'
+				for (i=0, c=data.length; i<c; i++) {	// loop the list...
+					key = data[i];
+					// only need to use pane-default if pane-specific value not set
+					if (!opts.center[key] && (opts.panes[key] || !o[key]))
+						o[key] = d[key]; // pane-default
+				}
+			}
+			else {
+				// border-panes use ALL keys in defaults.panes branch
+				o = options[pane] = $.extend(true, {}, d, o); // re-apply pane-specific opts AFTER pane-defaults
+				createFxOptions( pane );
+				// ensure all border-pane-specific base-classes exist
+				if (!o.resizerClass)	o.resizerClass	= "ui-layout-resizer";
+				if (!o.togglerClass)	o.togglerClass	= "ui-layout-toggler";
+			}
+			// ensure we have base pane-class (ALL panes)
+			if (!o.paneClass) o.paneClass = "ui-layout-pane";
+		});
+
+		// update options.zIndexes if a zIndex-option specified
+		var zo	= opts.zIndex
+		,	z	= options.zIndexes;
+		if (zo > 0) {
+			z.pane_normal		= zo;
+			z.content_mask		= max(zo+1, z.content_mask);	// MIN = +1
+			z.resizer_normal	= max(zo+2, z.resizer_normal);	// MIN = +2
+		}
+
+		// DELETE 'panes' key now that we are done - values were copied to EACH pane
+		delete options.panes;
+
+
+		function createFxOptions ( pane ) {
+			var	o = options[pane]
+			,	d = options.panes;
+			// ensure fxSettings key to avoid errors
+			if (!o.fxSettings) o.fxSettings = {};
+			if (!d.fxSettings) d.fxSettings = {};
+
+			$.each(["_open","_close","_size"], function (i,n) { 
+				var
+					sName		= "fxName"+ n
+				,	sSpeed		= "fxSpeed"+ n
+				,	sSettings	= "fxSettings"+ n
+					// recalculate fxName according to specificity rules
+				,	fxName = o[sName] =
+						o[sName]	// options.west.fxName_open
+					||	d[sName]	// options.panes.fxName_open
+					||	o.fxName	// options.west.fxName
+					||	d.fxName	// options.panes.fxName
+					||	"none"		// MEANS $.layout.defaults.panes.fxName == "" || false || null || 0
+				,	fxExists	= $.effects && ($.effects[fxName] || ($.effects.effect && $.effects.effect[fxName]))
+				;
+				// validate fxName to ensure is valid effect - MUST have effect-config data in options.effects
+				if (fxName === "none" || !options.effects[fxName] || !fxExists)
+					fxName = o[sName] = "none"; // effect not loaded OR unrecognized fxName
+
+				// set vars for effects subkeys to simplify logic
+				var	fx		= options.effects[fxName] || {}	// effects.slide
+				,	fx_all	= fx.all	|| null				// effects.slide.all
+				,	fx_pane	= fx[pane]	|| null				// effects.slide.west
+				;
+				// create fxSpeed[_open|_close|_size]
+				o[sSpeed] =
+					o[sSpeed]				// options.west.fxSpeed_open
+				||	d[sSpeed]				// options.west.fxSpeed_open
+				||	o.fxSpeed				// options.west.fxSpeed
+				||	d.fxSpeed				// options.panes.fxSpeed
+				||	null					// DEFAULT - let fxSetting.duration control speed
+				;
+				// create fxSettings[_open|_close|_size]
+				o[sSettings] = $.extend(
+					true
+				,	{}
+				,	fx_all					// effects.slide.all
+				,	fx_pane					// effects.slide.west
+				,	d.fxSettings			// options.panes.fxSettings
+				,	o.fxSettings			// options.west.fxSettings
+				,	d[sSettings]			// options.panes.fxSettings_open
+				,	o[sSettings]			// options.west.fxSettings_open
+				);
+			});
+
+			// DONE creating action-specific-settings for this pane,
+			// so DELETE generic options - are no longer meaningful
+			delete o.fxName;
+			delete o.fxSpeed;
+			delete o.fxSettings;
+		}
+	}
+
+	/**
+	* Initialize module objects, styling, size and position for all panes
+	*
+	* @see  _initElements()
+	* @param {string}	pane		The pane to process
+	*/
+,	getPane = function (pane) {
+		var sel = options[pane].paneSelector
+		if (sel.substr(0,1)==="#") // ID selector
+			// NOTE: elements selected 'by ID' DO NOT have to be 'children'
+			return $N.find(sel).eq(0);
+		else { // class or other selector
+			var $P = $N.children(sel).eq(0);
+			// look for the pane nested inside a 'form' element
+			return $P.length ? $P : $N.children("form:first").children(sel).eq(0);
+		}
+	}
+
+	/**
+	* @param {Object=}		evt
+	*/
+,	initPanes = function (evt) {
+		// stopPropagation if called by trigger("layoutinitpanes") - use evtPane utility 
+		evtPane(evt);
+
+		// NOTE: do north & south FIRST so we can measure their height - do center LAST
+		$.each(_c.allPanes, function (idx, pane) {
+			addPane( pane, true );
+		});
+
+		// init the pane-handles NOW in case we have to hide or close the pane below
+		initHandles();
+
+		// now that all panes have been initialized and initially-sized,
+		// make sure there is really enough space available for each pane
+		$.each(_c.borderPanes, function (i, pane) {
+			if ($Ps[pane] && state[pane].isVisible) { // pane is OPEN
+				setSizeLimits(pane);
+				makePaneFit(pane); // pane may be Closed, Hidden or Resized by makePaneFit()
+			}
+		});
+		// size center-pane AGAIN in case we 'closed' a border-pane in loop above
+		sizeMidPanes("center");
+
+		//	Chrome/Webkit sometimes fires callbacks BEFORE it completes resizing!
+		//	Before RC30.3, there was a 10ms delay here, but that caused layout 
+		//	to load asynchrously, which is BAD, so try skipping delay for now
+
+		// process pane contents and callbacks, and init/resize child-layout if exists
+		$.each(_c.allPanes, function (idx, pane) {
+			afterInitPane(pane);
+		});
+	}
+
+	/**
+	* Add a pane to the layout - subroutine of initPanes()
+	*
+	* @see  initPanes()
+	* @param {string}	pane			The pane to process
+	* @param {boolean=}	[force=false]	Size content after init
+	*/
+,	addPane = function (pane, force) {
+		if (!force && !isInitialized()) return;
+		var
+			o		= options[pane]
+		,	s		= state[pane]
+		,	c		= _c[pane]
+		,	dir		= c.dir
+		,	fx		= s.fx
+		,	spacing	= o.spacing_open || 0
+		,	isCenter = (pane === "center")
+		,	CSS		= {}
+		,	$P		= $Ps[pane]
+		,	size, minSize, maxSize, child
+		;
+		// if pane-pointer already exists, remove the old one first
+		if ($P)
+			removePane( pane, false, true, false );
+		else
+			$Cs[pane] = false; // init
+
+		$P = $Ps[pane] = getPane(pane);
+		if (!$P.length) {
+			$Ps[pane] = false; // logic
+			return;
+		}
+
+		// SAVE original Pane CSS
+		if (!$P.data("layoutCSS")) {
+			var props = "position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border";
+			$P.data("layoutCSS", styles($P, props));
+		}
+
+		// create alias for pane data in Instance - initHandles will add more
+		Instance[pane] = {
+			name:		pane
+		,	pane:		$Ps[pane]
+		,	content:	$Cs[pane]
+		,	options:	options[pane]
+		,	state:		state[pane]
+		,	children:	children[pane]
+		};
+
+		// add classes, attributes & events
+		$P	.data({
+				parentLayout:	Instance		// pointer to Layout Instance
+			,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
+			,	layoutEdge:		pane
+			,	layoutRole:		"pane"
+			})
+			.css(c.cssReq).css("zIndex", options.zIndexes.pane_normal)
+			.css(o.applyDemoStyles ? c.cssDemo : {}) // demo styles
+			.addClass( o.paneClass +" "+ o.paneClass+"-"+pane ) // default = "ui-layout-pane ui-layout-pane-west" - may be a dupe of 'paneSelector'
+			.bind("mouseenter."+ sID, addHover )
+			.bind("mouseleave."+ sID, removeHover )
+			;
+		var paneMethods = {
+				hide:				''
+			,	show:				''
+			,	toggle:				''
+			,	close:				''
+			,	open:				''
+			,	slideOpen:			''
+			,	slideClose:			''
+			,	slideToggle:		''
+			,	size:				'sizePane'
+			,	sizePane:			'sizePane'
+			,	sizeContent:		''
+			,	sizeHandles:		''
+			,	enableClosable:		''
+			,	disableClosable:	''
+			,	enableSlideable:	''
+			,	disableSlideable:	''
+			,	enableResizable:	''
+			,	disableResizable:	''
+			,	swapPanes:			'swapPanes'
+			,	swap:				'swapPanes'
+			,	move:				'swapPanes'
+			,	removePane:			'removePane'
+			,	remove:				'removePane'
+			,	createChildren:		''
+			,	resizeChildren:		''
+			,	resizeAll:			'resizeAll'
+			,	resizeLayout:		'resizeAll'
+			}
+		,	name;
+		// loop hash and bind all methods - include layoutID namespacing
+		for (name in paneMethods) {
+			$P.bind("layoutpane"+ name.toLowerCase() +"."+ sID, Instance[ paneMethods[name] || name ]);
+		}
+
+		// see if this pane has a 'scrolling-content element'
+		initContent(pane, false); // false = do NOT sizeContent() - called later
+
+		if (!isCenter) {
+			// call _parseSize AFTER applying pane classes & styles - but before making visible (if hidden)
+			// if o.size is auto or not valid, then MEASURE the pane and use that as its 'size'
+			size	= s.size = _parseSize(pane, o.size);
+			minSize	= _parseSize(pane,o.minSize) || 1;
+			maxSize	= _parseSize(pane,o.maxSize) || 100000;
+			if (size > 0) size = max(min(size, maxSize), minSize);
+			s.autoResize = o.autoResize; // used with percentage sizes
+
+			// state for border-panes
+			s.isClosed  = false; // true = pane is closed
+			s.isSliding = false; // true = pane is currently open by 'sliding' over adjacent panes
+			s.isResizing= false; // true = pane is in process of being resized
+			s.isHidden	= false; // true = pane is hidden - no spacing, resizer or toggler is visible!
+
+			// array for 'pin buttons' whose classNames are auto-updated on pane-open/-close
+			if (!s.pins) s.pins = [];
+		}
+		//	states common to ALL panes
+		s.tagName	= $P[0].tagName;
+		s.edge		= pane;		// useful if pane is (or about to be) 'swapped' - easy find out where it is (or is going)
+		s.noRoom	= false;	// true = pane 'automatically' hidden due to insufficient room - will unhide automatically
+		s.isVisible	= true;		// false = pane is invisible - closed OR hidden - simplify logic
+
+		// init pane positioning
+		setPanePosition( pane );
+
+		// if pane is not visible, 
+		if (dir === "horz") // north or south pane
+			CSS.height = cssH($P, size);
+		else if (dir === "vert") // east or west pane
+			CSS.width = cssW($P, size);
+		//else if (isCenter) {}
+
+		$P.css(CSS); // apply size -- top, bottom & height will be set by sizeMidPanes
+		if (dir != "horz") sizeMidPanes(pane, true); // true = skipCallback
+
+		// if manually adding a pane AFTER layout initialization, then...
+		if (state.initialized) {
+			initHandles( pane );
+			initHotkeys( pane );
+		}
+
+		// close or hide the pane if specified in settings
+		if (o.initClosed && o.closable && !o.initHidden)
+			close(pane, true, true); // true, true = force, noAnimation
+		else if (o.initHidden || o.initClosed)
+			hide(pane); // will be completely invisible - no resizer or spacing
+		else if (!s.noRoom)
+			// make the pane visible - in case was initially hidden
+			$P.css("display","block");
+		// ELSE setAsOpen() - called later by initHandles()
+
+		// RESET visibility now - pane will appear IF display:block
+		$P.css("visibility","visible");
+
+		// check option for auto-handling of pop-ups & drop-downs
+		if (o.showOverflowOnHover)
+			$P.hover( allowOverflow, resetOverflow );
+
+		// if manually adding a pane AFTER layout initialization, then...
+		if (state.initialized) {
+			afterInitPane( pane );
+		}
+	}
+
+,	afterInitPane = function (pane) {
+		var	$P	= $Ps[pane]
+		,	s	= state[pane]
+		,	o	= options[pane]
+		;
+		if (!$P) return;
+
+		// see if there is a directly-nested layout inside this pane
+		if ($P.data("layout"))
+			refreshChildren( pane, $P.data("layout") );
+
+		// process pane contents and callbacks, and init/resize child-layout if exists
+		if (s.isVisible) { // pane is OPEN
+			if (state.initialized) // this pane was added AFTER layout was created
+				resizeAll(); // will also sizeContent
+			else
+				sizeContent(pane);
+
+			if (o.triggerEventsOnLoad)
+				_runCallbacks("onresize_end", pane);
+			else // automatic if onresize called, otherwise call it specifically
+				// resize child - IF inner-layout already exists (created before this layout)
+				resizeChildren(pane, true); // a previously existing childLayout
+		}
+
+		// init childLayouts - even if pane is not visible
+		if (o.initChildren && o.children)
+			createChildren(pane);
+	}
+
+	/**
+	* @param {string=}	panes		The pane(s) to process
+	*/
+,	setPanePosition = function (panes) {
+		panes = panes ? panes.split(",") : _c.borderPanes;
+
+		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
+		$.each(panes, function (i, pane) {
+			var $P	= $Ps[pane]
+			,	$R	= $Rs[pane]
+			,	o	= options[pane]
+			,	s	= state[pane]
+			,	side =  _c[pane].side
+			,	CSS	= {}
+			;
+			if (!$P) return; // pane does not exist - skip
+
+			// set css-position to account for container borders & padding
+			switch (pane) {
+				case "north": 	CSS.top 	= sC.inset.top;
+								CSS.left 	= sC.inset.left;
+								CSS.right	= sC.inset.right;
+								break;
+				case "south": 	CSS.bottom	= sC.inset.bottom;
+								CSS.left 	= sC.inset.left;
+								CSS.right 	= sC.inset.right;
+								break;
+				case "west": 	CSS.left 	= sC.inset.left; // top, bottom & height set by sizeMidPanes()
+								break;
+				case "east": 	CSS.right 	= sC.inset.right; // ditto
+								break;
+				case "center":	// top, left, width & height set by sizeMidPanes()
+			}
+			// apply position
+			$P.css(CSS); 
+
+			// update resizer position
+			if ($R && s.isClosed)
+				$R.css(side, sC.inset[side]);
+			else if ($R && !s.isHidden)
+				$R.css(side, sC.inset[side] + getPaneSize(pane));
+		});
+	}
+
+	/**
+	* Initialize module objects, styling, size and position for all resize bars and toggler buttons
+	*
+	* @see  _create()
+	* @param {string=}	[panes=""]	The edge(s) to process
+	*/
+,	initHandles = function (panes) {
+		panes = panes ? panes.split(",") : _c.borderPanes;
+
+		// create toggler DIVs for each pane, and set object pointers for them, eg: $R.north = north toggler DIV
+		$.each(panes, function (i, pane) {
+			var $P		= $Ps[pane];
+			$Rs[pane]	= false; // INIT
+			$Ts[pane]	= false;
+			if (!$P) return; // pane does not exist - skip
+
+			var	o		= options[pane]
+			,	s		= state[pane]
+			,	c		= _c[pane]
+			,	paneId	= o.paneSelector.substr(0,1) === "#" ? o.paneSelector.substr(1) : ""
+			,	rClass	= o.resizerClass
+			,	tClass	= o.togglerClass
+			,	spacing	= (s.isVisible ? o.spacing_open : o.spacing_closed)
+			,	_pane	= "-"+ pane // used for classNames
+			,	_state	= (s.isVisible ? "-open" : "-closed") // used for classNames
+			,	I		= Instance[pane]
+				// INIT RESIZER BAR
+			,	$R		= I.resizer = $Rs[pane] = $("<div></div>")
+				// INIT TOGGLER BUTTON
+			,	$T		= I.toggler = (o.closable ? $Ts[pane] = $("<div></div>") : false)
+			;
+
+			//if (s.isVisible && o.resizable) ... handled by initResizable
+			if (!s.isVisible && o.slidable)
+				$R.attr("title", o.tips.Slide).css("cursor", o.sliderCursor);
+
+			$R	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "paneLeft-resizer"
+				.attr("id", paneId ? paneId +"-resizer" : "" )
+				.data({
+					parentLayout:	Instance
+				,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
+				,	layoutEdge:		pane
+				,	layoutRole:		"resizer"
+				})
+				.css(_c.resizers.cssReq).css("zIndex", options.zIndexes.resizer_normal)
+				.css(o.applyDemoStyles ? _c.resizers.cssDemo : {}) // add demo styles
+				.addClass(rClass +" "+ rClass+_pane)
+				.hover(addHover, removeHover) // ALWAYS add hover-classes, even if resizing is not enabled - handle with CSS instead
+				.hover(onResizerEnter, onResizerLeave) // ALWAYS NEED resizer.mouseleave to balance toggler.mouseenter
+				.appendTo($N) // append DIV to container
+			;
+			if (o.resizerDblClickToggle)
+				$R.bind("dblclick."+ sID, toggle );
+
+			if ($T) {
+				$T	// if paneSelector is an ID, then create a matching ID for the resizer, eg: "#paneLeft" => "#paneLeft-toggler"
+					.attr("id", paneId ? paneId +"-toggler" : "" )
+					.data({
+						parentLayout:	Instance
+					,	layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
+					,	layoutEdge:		pane
+					,	layoutRole:		"toggler"
+					})
+					.css(_c.togglers.cssReq) // add base/required styles
+					.css(o.applyDemoStyles ? _c.togglers.cssDemo : {}) // add demo styles
+					.addClass(tClass +" "+ tClass+_pane)
+					.hover(addHover, removeHover) // ALWAYS add hover-classes, even if toggling is not enabled - handle with CSS instead
+					.bind("mouseenter", onResizerEnter) // NEED toggler.mouseenter because mouseenter MAY NOT fire on resizer
+					.appendTo($R) // append SPAN to resizer DIV
+				;
+				// ADD INNER-SPANS TO TOGGLER
+				if (o.togglerContent_open) // ui-layout-open
+					$("<span>"+ o.togglerContent_open +"</span>")
+						.data({
+							layoutEdge:		pane
+						,	layoutRole:		"togglerContent"
+						})
+						.data("layoutRole", "togglerContent")
+						.data("layoutEdge", pane)
+						.addClass("content content-open")
+						.css("display","none")
+						.appendTo( $T )
+						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-open instead!
+					;
+				if (o.togglerContent_closed) // ui-layout-closed
+					$("<span>"+ o.togglerContent_closed +"</span>")
+						.data({
+							layoutEdge:		pane
+						,	layoutRole:		"togglerContent"
+						})
+						.addClass("content content-closed")
+						.css("display","none")
+						.appendTo( $T )
+						//.hover( addHover, removeHover ) // use ui-layout-toggler-west-hover .content-closed instead!
+					;
+				// ADD TOGGLER.click/.hover
+				enableClosable(pane);
+			}
+
+			// add Draggable events
+			initResizable(pane);
+
+			// ADD CLASSNAMES & SLIDE-BINDINGS - eg: class="resizer resizer-west resizer-open"
+			if (s.isVisible)
+				setAsOpen(pane);	// onOpen will be called, but NOT onResize
+			else {
+				setAsClosed(pane);	// onClose will be called
+				bindStartSlidingEvents(pane, true); // will enable events IF option is set
+			}
+
+		});
+
+		// SET ALL HANDLE DIMENSIONS
+		sizeHandles();
+	}
+
+
+	/**
+	* Initialize scrolling ui-layout-content div - if exists
+	*
+	* @see  initPane() - or externally after an Ajax injection
+	* @param {string}	pane			The pane to process
+	* @param {boolean=}	[resize=true]	Size content after init
+	*/
+,	initContent = function (pane, resize) {
+		if (!isInitialized()) return;
+		var 
+			o	= options[pane]
+		,	sel	= o.contentSelector
+		,	I	= Instance[pane]
+		,	$P	= $Ps[pane]
+		,	$C
+		;
+		if (sel) $C = I.content = $Cs[pane] = (o.findNestedContent)
+			? $P.find(sel).eq(0) // match 1-element only
+			: $P.children(sel).eq(0)
+		;
+		if ($C && $C.length) {
+			$C.data("layoutRole", "content");
+			// SAVE original Content CSS
+			if (!$C.data("layoutCSS"))
+				$C.data("layoutCSS", styles($C, "height"));
+			$C.css( _c.content.cssReq );
+			if (o.applyDemoStyles) {
+				$C.css( _c.content.cssDemo ); // add padding & overflow: auto to content-div
+				$P.css( _c.content.cssDemoPane ); // REMOVE padding/scrolling from pane
+			}
+			// ensure no vertical scrollbar on pane - will mess up measurements
+			if ($P.css("overflowX").match(/(scroll|auto)/)) {
+				$P.css("overflow", "hidden");
+			}
+			state[pane].content = {}; // init content state
+			if (resize !== false) sizeContent(pane);
+			// sizeContent() is called AFTER init of all elements
+		}
+		else
+			I.content = $Cs[pane] = false;
+	}
+
+
+	/**
+	* Add resize-bars to all panes that specify it in options
+	* -dependancy: $.fn.resizable - will skip if not found
+	*
+	* @see  _create()
+	* @param {string=}	[panes=""]	The edge(s) to process
+	*/
+,	initResizable = function (panes) {
+		var	draggingAvailable = $.layout.plugins.draggable
+		,	side // set in start()
+		;
+		panes = panes ? panes.split(",") : _c.borderPanes;
+
+		$.each(panes, function (idx, pane) {
+			var o = options[pane];
+			if (!draggingAvailable || !$Ps[pane] || !o.resizable) {
+				o.resizable = false;
+				return true; // skip to next
+			}
+
+			var s		= state[pane]
+			,	z		= options.zIndexes
+			,	c		= _c[pane]
+			,	side	= c.dir=="horz" ? "top" : "left"
+			,	$P 		= $Ps[pane]
+			,	$R		= $Rs[pane]
+			,	base	= o.resizerClass
+			,	lastPos	= 0 // used when live-resizing
+			,	r, live // set in start because may change
+			//	'drag' classes are applied to the ORIGINAL resizer-bar while dragging is in process
+			,	resizerClass		= base+"-drag"				// resizer-drag
+			,	resizerPaneClass	= base+"-"+pane+"-drag"		// resizer-north-drag
+			//	'helper' class is applied to the CLONED resizer-bar while it is being dragged
+			,	helperClass			= base+"-dragging"			// resizer-dragging
+			,	helperPaneClass		= base+"-"+pane+"-dragging" // resizer-north-dragging
+			,	helperLimitClass	= base+"-dragging-limit"	// resizer-drag
+			,	helperPaneLimitClass = base+"-"+pane+"-dragging-limit"	// resizer-north-drag
+			,	helperClassesSet	= false 					// logic var
+			;
+
+			if (!s.isClosed)
+				$R.attr("title", o.tips.Resize)
+				  .css("cursor", o.resizerCursor); // n-resize, s-resize, etc
+
+			$R.draggable({
+				containment:	$N[0] // limit resizing to layout container
+			,	axis:			(c.dir=="horz" ? "y" : "x") // limit resizing to horz or vert axis
+			,	delay:			0
+			,	distance:		1
+			,	grid:			o.resizingGrid
+			//	basic format for helper - style it using class: .ui-draggable-dragging
+			,	helper:			"clone"
+			,	opacity:		o.resizerDragOpacity
+			,	addClasses:		false // avoid ui-state-disabled class when disabled
+			//,	iframeFix:		o.draggableIframeFix // TODO: consider using when bug is fixed
+			,	zIndex:			z.resizer_drag
+
+			,	start: function (e, ui) {
+					// REFRESH options & state pointers in case we used swapPanes
+					o = options[pane];
+					s = state[pane];
+					// re-read options
+					live = o.livePaneResizing;
+
+					// ondrag_start callback - will CANCEL hide if returns false
+					// TODO: dragging CANNOT be cancelled like this, so see if there is a way?
+					if (false === _runCallbacks("ondrag_start", pane)) return false;
+
+					s.isResizing		= true; // prevent pane from closing while resizing
+					state.paneResizing	= pane; // easy to see if ANY pane is resizing
+					timer.clear(pane+"_closeSlider"); // just in case already triggered
+
+					// SET RESIZER LIMITS - used in drag()
+					setSizeLimits(pane); // update pane/resizer state
+					r = s.resizerPosition;
+					lastPos = ui.position[ side ]
+
+					$R.addClass( resizerClass +" "+ resizerPaneClass ); // add drag classes
+					helperClassesSet = false; // reset logic var - see drag()
+
+					// DISABLE TEXT SELECTION (probably already done by resizer.mouseOver)
+					$('body').disableSelection(); 
+
+					// MASK PANES CONTAINING IFRAMES, APPLETS OR OTHER TROUBLESOME ELEMENTS
+					showMasks( pane, { resizing: true });
+				}
+
+			,	drag: function (e, ui) {
+					if (!helperClassesSet) { // can only add classes after clone has been added to the DOM
+						//$(".ui-draggable-dragging")
+						ui.helper
+							.addClass( helperClass +" "+ helperPaneClass ) // add helper classes
+							.css({ right: "auto", bottom: "auto" })	// fix dir="rtl" issue
+							.children().css("visibility","hidden")	// hide toggler inside dragged resizer-bar
+						;
+						helperClassesSet = true;
+						// draggable bug!? RE-SET zIndex to prevent E/W resize-bar showing through N/S pane!
+						if (s.isSliding) $Ps[pane].css("zIndex", z.pane_sliding);
+					}
+					// CONTAIN RESIZER-BAR TO RESIZING LIMITS
+					var limit = 0;
+					if (ui.position[side] < r.min) {
+						ui.position[side] = r.min;
+						limit = -1;
+					}
+					else if (ui.position[side] > r.max) {
+						ui.position[side] = r.max;
+						limit = 1;
+					}
+					// ADD/REMOVE dragging-limit CLASS
+					if (limit) {
+						ui.helper.addClass( helperLimitClass +" "+ helperPaneLimitClass ); // at dragging-limit
+						window.defaultStatus = (limit>0 && pane.match(/(north|west)/)) || (limit<0 && pane.match(/(south|east)/)) ? o.tips.maxSizeWarning : o.tips.minSizeWarning;
+					}
+					else {
+						ui.helper.removeClass( helperLimitClass +" "+ helperPaneLimitClass ); // not at dragging-limit
+						window.defaultStatus = "";
+					}
+					// DYNAMICALLY RESIZE PANES IF OPTION ENABLED
+					// won't trigger unless resizer has actually moved!
+					if (live && Math.abs(ui.position[side] - lastPos) >= o.liveResizingTolerance) {
+						lastPos = ui.position[side];
+						resizePanes(e, ui, pane)
+					}
+				}
+
+			,	stop: function (e, ui) {
+					$('body').enableSelection(); // RE-ENABLE TEXT SELECTION
+					window.defaultStatus = ""; // clear 'resizing limit' message from statusbar
+					$R.removeClass( resizerClass +" "+ resizerPaneClass ); // remove drag classes from Resizer
+					s.isResizing		= false;
+					state.paneResizing	= false; // easy to see if ANY pane is resizing
+					resizePanes(e, ui, pane, true); // true = resizingDone
+				}
+
+			});
+		});
+
+		/**
+		* resizePanes
+		*
+		* Sub-routine called from stop() - and drag() if livePaneResizing
+		*
+		* @param {!Object}		evt
+		* @param {!Object}		ui
+		* @param {string}		pane
+		* @param {boolean=}		[resizingDone=false]
+		*/
+		var resizePanes = function (evt, ui, pane, resizingDone) {
+			var	dragPos	= ui.position
+			,	c		= _c[pane]
+			,	o		= options[pane]
+			,	s		= state[pane]
+			,	resizerPos
+			;
+			switch (pane) {
+				case "north":	resizerPos = dragPos.top; break;
+				case "west":	resizerPos = dragPos.left; break;
+				case "south":	resizerPos = sC.layoutHeight - dragPos.top  - o.spacing_open; break;
+				case "east":	resizerPos = sC.layoutWidth  - dragPos.left - o.spacing_open; break;
+			};
+			// remove container margin from resizer position to get the pane size
+			var newSize = resizerPos - sC.inset[c.side];
+
+			// Disable OR Resize Mask(s) created in drag.start
+			if (!resizingDone) {
+				// ensure we meet liveResizingTolerance criteria
+				if (Math.abs(newSize - s.size) < o.liveResizingTolerance)
+					return; // SKIP resize this time
+				// resize the pane
+				manualSizePane(pane, newSize, false, true); // true = noAnimation
+				sizeMasks(); // resize all visible masks
+			}
+			else { // resizingDone
+				// ondrag_end callback
+				if (false !== _runCallbacks("ondrag_end", pane))
+					manualSizePane(pane, newSize, false, true); // true = noAnimation
+				hideMasks(true); // true = force hiding all masks even if one is 'sliding'
+				if (s.isSliding) // RE-SHOW 'object-masks' so objects won't show through sliding pane
+					showMasks( pane, { resizing: true });
+			}
+		};
+	}
+
+	/**
+	*	sizeMask
+	*
+	*	Needed to overlay a DIV over an IFRAME-pane because mask CANNOT be *inside* the pane
+	*	Called when mask created, and during livePaneResizing
+	*/
+,	sizeMask = function () {
+		var $M		= $(this)
+		,	pane	= $M.data("layoutMask") // eg: "west"
+		,	s		= state[pane]
+		;
+		// only masks over an IFRAME-pane need manual resizing
+		if (s.tagName == "IFRAME" && s.isVisible) // no need to mask closed/hidden panes
+			$M.css({
+				top:	s.offsetTop
+			,	left:	s.offsetLeft
+			,	width:	s.outerWidth
+			,	height:	s.outerHeight
+			});
+		/* ALT Method...
+		var $P = $Ps[pane];
+		$M.css( $P.position() ).css({ width: $P[0].offsetWidth, height: $P[0].offsetHeight });
+		*/
+	}
+,	sizeMasks = function () {
+		$Ms.each( sizeMask ); // resize all 'visible' masks
+	}
+
+	/**
+	* @param {string}	pane		The pane being resized, animated or isSliding
+	* @param {Object=}	[args]		(optional) Options: which masks to apply, and to which panes
+	*/
+,	showMasks = function (pane, args) {
+		var	c		= _c[pane]
+		,	panes	=  ["center"]
+		,	z		= options.zIndexes
+		,	a		= $.extend({
+						objectsOnly:	false
+					,	animation:		false
+					,	resizing:		true
+					,	sliding:		state[pane].isSliding
+					},	args )
+		,	o, s
+		;
+		if (a.resizing)
+			panes.push( pane );
+		if (a.sliding)
+			panes.push( _c.oppositeEdge[pane] ); // ADD the oppositeEdge-pane
+
+		if (c.dir === "horz") {
+			panes.push("west");
+			panes.push("east");
+		}
+
+		$.each(panes, function(i,p){
+			s = state[p];
+			o = options[p];
+			if (s.isVisible && ( o.maskObjects || (!a.objectsOnly && o.maskContents) )) {
+				getMasks(p).each(function(){
+					sizeMask.call(this);
+					this.style.zIndex = s.isSliding ? z.pane_sliding+1 : z.pane_normal+1
+					this.style.display = "block";
+				});
+			}
+		});
+	}
+
+	/**
+	* @param {boolean=}	force		Hide masks even if a pane is sliding
+	*/
+,	hideMasks = function (force) {
+		// ensure no pane is resizing - could be a timing issue
+		if (force || !state.paneResizing) {
+			$Ms.hide(); // hide ALL masks
+		}
+		// if ANY pane is sliding, then DO NOT remove masks from panes with maskObjects enabled
+		else if (!force && !$.isEmptyObject( state.panesSliding )) {
+			var	i = $Ms.length - 1
+			,	p, $M;
+			for (; i >= 0; i--) {
+				$M	= $Ms.eq(i);
+				p	= $M.data("layoutMask");
+				if (!options[p].maskObjects) {
+					$M.hide();
+				}
+			}
+		}
+	}
+
+	/**
+	* @param {string}	pane
+	*/
+,	getMasks = function (pane) {
+		var $Masks	= $([])
+		,	$M, i = 0, c = $Ms.length
+		;
+		for (; i<c; i++) {
+			$M = $Ms.eq(i);
+			if ($M.data("layoutMask") === pane)
+				$Masks = $Masks.add( $M );
+		}
+		if ($Masks.length)
+			return $Masks;
+		else
+			return createMasks(pane);
+	}
+
+	/**
+	* createMasks
+	*
+	* Generates both DIV (ALWAYS used) and IFRAME (optional) elements as masks
+	* An IFRAME mask is created *under* the DIV when maskObjects=true, because a DIV cannot mask an applet
+	*
+	* @param {string}	pane
+	*/
+,	createMasks = function (pane) {
+		var
+			$P		= $Ps[pane]
+		,	s		= state[pane]
+		,	o		= options[pane]
+		,	z		= options.zIndexes
+		//,	objMask	= o.maskObjects && s.tagName != "IFRAME" // check for option
+		,	$Masks	= $([])
+		,	isIframe, el, $M, css, i
+		;
+		if (!o.maskContents && !o.maskObjects) return $Masks;
+		// if o.maskObjects=true, then loop TWICE to create BOTH kinds of mask, else only create a DIV
+		for (i=0; i < (o.maskObjects ? 2 : 1); i++) {
+			isIframe = o.maskObjects && i==0;
+			el = document.createElement( isIframe ? "iframe" : "div" );
+			$M = $(el).data("layoutMask", pane); // add data to relate mask to pane
+			el.className = "ui-layout-mask ui-layout-mask-"+ pane; // for user styling
+			css = el.style;
+			// styles common to both DIVs and IFRAMES
+			css.display		= "block";
+			css.position	= "absolute";
+			css.background	= "#FFF";
+			if (isIframe) { // IFRAME-only props
+				el.frameborder = 0;
+				el.src		= "about:blank";
+				//el.allowTransparency = true; - for IE, but breaks masking ability!
+				css.opacity	= 0;
+				css.filter	= "Alpha(Opacity='0')";
+				css.border	= 0;
+			}
+			// if pane is an IFRAME, then must mask the pane itself
+			if (s.tagName == "IFRAME") {
+				// NOTE sizing done by a subroutine so can be called during live-resizing
+				css.zIndex	= z.pane_normal+1; // 1-higher than pane
+				$N.append( el ); // append to LAYOUT CONTAINER
+			}
+			// otherwise put masks *inside the pane* to mask its contents
+			else {
+				$M.addClass("ui-layout-mask-inside-pane");
+				css.zIndex	= o.maskZindex || z.content_mask; // usually 1, but customizable
+				css.top		= 0;
+				css.left	= 0;
+				css.width	= "100%";
+				css.height	= "100%";
+				$P.append( el ); // append INSIDE pane element
+			}
+			// add to return object
+			$Masks = $Masks.add( el );
+			// add Mask to cached array so can be resized & reused
+			$Ms = $Ms.add( el );
+		}
+		return $Masks;
+	}
+
+
+	/**
+	* Destroy this layout and reset all elements
+	*
+	* @param {boolean=}	[destroyChildren=false]		Destory Child-Layouts first?
+	*/
+,	destroy = function (evt_or_destroyChildren, destroyChildren) {
+		// UNBIND layout events and remove global object
+		$(window).unbind("."+ sID);		// resize & unload
+		$(document).unbind("."+ sID);	// keyDown (hotkeys)
+
+		if (typeof evt_or_destroyChildren === "object")
+			// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
+			evtPane(evt_or_destroyChildren);
+		else // no event, so transfer 1st param to destroyChildren param
+			destroyChildren = evt_or_destroyChildren;
+
+		// need to look for parent layout BEFORE we remove the container data, else skips a level
+		//var parentPane = Instance.hasParentLayout ? $.layout.getParentPaneInstance( $N ) : null;
+
+		// reset layout-container
+		$N	.clearQueue()
+			.removeData("layout")
+			.removeData("layoutContainer")
+			.removeClass(options.containerClass)
+			.unbind("."+ sID) // remove ALL Layout events
+		;
+
+		// remove all mask elements that have been created
+		$Ms.remove();
+
+		// loop all panes to remove layout classes, attributes and bindings
+		$.each(_c.allPanes, function (i, pane) {
+			removePane( pane, false, true, destroyChildren ); // true = skipResize
+		});
+
+		// do NOT reset container CSS if is a 'pane' (or 'content') in an outer-layout - ie, THIS layout is 'nested'
+		var css = "layoutCSS";
+		if ($N.data(css) && !$N.data("layoutRole")) // RESET CSS
+			$N.css( $N.data(css) ).removeData(css);
+
+		// for full-page layouts, also reset the <HTML> CSS
+		if (sC.tagName === "BODY" && ($N = $("html")).data(css)) // RESET <HTML> CSS
+			$N.css( $N.data(css) ).removeData(css);
+
+		// trigger plugins for this layout, if there are any
+		runPluginCallbacks( Instance, $.layout.onDestroy );
+
+		// trigger state-management and onunload callback
+		unload();
+
+		// clear the Instance of everything except for container & options (so could recreate)
+		// RE-CREATE: myLayout = myLayout.container.layout( myLayout.options );
+		for (var n in Instance)
+			if (!n.match(/^(container|options)$/)) delete Instance[ n ];
+		// add a 'destroyed' flag to make it easy to check
+		Instance.destroyed = true;
+
+		// if this is a child layout, CLEAR the child-pointer in the parent
+		/* for now the pointer REMAINS, but with only container, options and destroyed keys
+		if (parentPane) {
+			var layout	= parentPane.pane.data("parentLayout")
+			,	key		= layout.options.instanceKey || 'error';
+			// THIS SYNTAX MAY BE WRONG!
+			parentPane.children[key] = layout.children[ parentPane.name ].children[key] = null;
+		}
+		*/
+
+		return Instance; // for coding convenience
+	}
+
+	/**
+	* Remove a pane from the layout - subroutine of destroy()
+	*
+	* @see  destroy()
+	* @param {(string|Object)}	evt_or_pane			The pane to process
+	* @param {boolean=}			[remove=false]		Remove the DOM element?
+	* @param {boolean=}			[skipResize=false]	Skip calling resizeAll()?
+	* @param {boolean=}			[destroyChild=true]	Destroy Child-layouts? If not passed, obeys options setting
+	*/
+,	removePane = function (evt_or_pane, remove, skipResize, destroyChild) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$P	= $Ps[pane]
+		,	$C	= $Cs[pane]
+		,	$R	= $Rs[pane]
+		,	$T	= $Ts[pane]
+		;
+		// NOTE: elements can still exist even after remove()
+		//		so check for missing data(), which is cleared by removed()
+		if ($P && $.isEmptyObject( $P.data() )) $P = false;
+		if ($C && $.isEmptyObject( $C.data() )) $C = false;
+		if ($R && $.isEmptyObject( $R.data() )) $R = false;
+		if ($T && $.isEmptyObject( $T.data() )) $T = false;
+
+		if ($P) $P.stop(true, true);
+
+		var	o	= options[pane]
+		,	s	= state[pane]
+		,	d	= "layout"
+		,	css	= "layoutCSS"
+		,	pC	= children[pane]
+		,	hasChildren	= $.isPlainObject( pC ) && !$.isEmptyObject( pC )
+		,	destroy		= destroyChild !== undefined ? destroyChild : o.destroyChildren
+		;
+		// FIRST destroy the child-layout(s)
+		if (hasChildren && destroy) {
+			$.each( pC, function (key, child) {
+				if (!child.destroyed)
+					child.destroy(true);// tell child-layout to destroy ALL its child-layouts too
+				if (child.destroyed)	// destroy was successful
+					delete pC[key];
+			});
+			// if no more children, remove the children hash
+			if ($.isEmptyObject( pC )) {
+				pC = children[pane] = null; // clear children hash
+				hasChildren = false;
+			}
+		}
+
+		// Note: can't 'remove' a pane element with non-destroyed children
+		if ($P && remove && !hasChildren)
+			$P.remove(); // remove the pane-element and everything inside it
+		else if ($P && $P[0]) {
+			//	create list of ALL pane-classes that need to be removed
+			var	root	= o.paneClass // default="ui-layout-pane"
+			,	pRoot	= root +"-"+ pane // eg: "ui-layout-pane-west"
+			,	_open	= "-open"
+			,	_sliding= "-sliding"
+			,	_closed	= "-closed"
+			,	classes	= [	root, root+_open, root+_closed, root+_sliding,		// generic classes
+							pRoot, pRoot+_open, pRoot+_closed, pRoot+_sliding ]	// pane-specific classes
+			;
+			$.merge(classes, getHoverClasses($P, true)); // ADD hover-classes
+			// remove all Layout classes from pane-element
+			$P	.removeClass( classes.join(" ") ) // remove ALL pane-classes
+				.removeData("parentLayout")
+				.removeData("layoutPane")
+				.removeData("layoutRole")
+				.removeData("layoutEdge")
+				.removeData("autoHidden")	// in case set
+				.unbind("."+ sID) // remove ALL Layout events
+				// TODO: remove these extra unbind commands when jQuery is fixed
+				//.unbind("mouseenter"+ sID)
+				//.unbind("mouseleave"+ sID)
+			;
+			// do NOT reset CSS if this pane/content is STILL the container of a nested layout!
+			// the nested layout will reset its 'container' CSS when/if it is destroyed
+			if (hasChildren && $C) {
+				// a content-div may not have a specific width, so give it one to contain the Layout
+				$C.width( $C.width() );
+				$.each( pC, function (key, child) {
+					child.resizeAll(); // resize the Layout
+				});
+			}
+			else if ($C)
+				$C.css( $C.data(css) ).removeData(css).removeData("layoutRole");
+			// remove pane AFTER content in case there was a nested layout
+			if (!$P.data(d))
+				$P.css( $P.data(css) ).removeData(css);
+		}
+
+		// REMOVE pane resizer and toggler elements
+		if ($T) $T.remove();
+		if ($R) $R.remove();
+
+		// CLEAR all pointers and state data
+		Instance[pane] = $Ps[pane] = $Cs[pane] = $Rs[pane] = $Ts[pane] = false;
+		s = { removed: true };
+
+		if (!skipResize)
+			resizeAll();
+	}
+
+
+/*
+ * ###########################
+ *	   ACTION METHODS
+ * ###########################
+ */
+
+	/**
+	* @param {string}	pane
+	*/
+,	_hidePane = function (pane) {
+		var $P	= $Ps[pane]
+		,	o	= options[pane]
+		,	s	= $P[0].style
+		;
+		if (o.useOffscreenClose) {
+			if (!$P.data(_c.offscreenReset))
+				$P.data(_c.offscreenReset, { left: s.left, right: s.right });
+			$P.css( _c.offscreenCSS );
+		}
+		else
+			$P.hide().removeData(_c.offscreenReset);
+	}
+
+	/**
+	* @param {string}	pane
+	*/
+,	_showPane = function (pane) {
+		var $P	= $Ps[pane]
+		,	o	= options[pane]
+		,	off	= _c.offscreenCSS
+		,	old	= $P.data(_c.offscreenReset)
+		,	s	= $P[0].style
+		;
+		$P	.show() // ALWAYS show, just in case
+			.removeData(_c.offscreenReset);
+		if (o.useOffscreenClose && old) {
+			if (s.left == off.left)
+				s.left = old.left;
+			if (s.right == off.right)
+				s.right = old.right;
+		}
+	}
+
+
+	/**
+	* Completely 'hides' a pane, including its spacing - as if it does not exist
+	* The pane is not actually 'removed' from the source, so can use 'show' to un-hide it
+	*
+	* @param {(string|Object)}	evt_or_pane			The pane being hidden, ie: north, south, east, or west
+	* @param {boolean=}			[noAnimation=false]	
+	*/
+,	hide = function (evt_or_pane, noAnimation) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	o	= options[pane]
+		,	s	= state[pane]
+		,	$P	= $Ps[pane]
+		,	$R	= $Rs[pane]
+		;
+		if (!$P || s.isHidden) return; // pane does not exist OR is already hidden
+
+		// onhide_start callback - will CANCEL hide if returns false
+		if (state.initialized && false === _runCallbacks("onhide_start", pane)) return;
+
+		s.isSliding = false; // just in case
+		delete state.panesSliding[pane];
+
+		// now hide the elements
+		if ($R) $R.hide(); // hide resizer-bar
+		if (!state.initialized || s.isClosed) {
+			s.isClosed = true; // to trigger open-animation on show()
+			s.isHidden  = true;
+			s.isVisible = false;
+			if (!state.initialized)
+				_hidePane(pane); // no animation when loading page
+			sizeMidPanes(_c[pane].dir === "horz" ? "" : "center");
+			if (state.initialized || o.triggerEventsOnLoad)
+				_runCallbacks("onhide_end", pane);
+		}
+		else {
+			s.isHiding = true; // used by onclose
+			close(pane, false, noAnimation); // adjust all panes to fit
+		}
+	}
+
+	/**
+	* Show a hidden pane - show as 'closed' by default unless openPane = true
+	*
+	* @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
+	* @param {boolean=}			[openPane=false]
+	* @param {boolean=}			[noAnimation=false]
+	* @param {boolean=}			[noAlert=false]
+	*/
+,	show = function (evt_or_pane, openPane, noAnimation, noAlert) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	o	= options[pane]
+		,	s	= state[pane]
+		,	$P	= $Ps[pane]
+		,	$R	= $Rs[pane]
+		;
+		if (!$P || !s.isHidden) return; // pane does not exist OR is not hidden
+
+		// onshow_start callback - will CANCEL show if returns false
+		if (false === _runCallbacks("onshow_start", pane)) return;
+
+		s.isShowing = true; // used by onopen/onclose
+		//s.isHidden  = false; - will be set by open/close - if not cancelled
+		s.isSliding = false; // just in case
+		delete state.panesSliding[pane];
+
+		// now show the elements
+		//if ($R) $R.show(); - will be shown by open/close
+		if (openPane === false)
+			close(pane, true); // true = force
+		else
+			open(pane, false, noAnimation, noAlert); // adjust all panes to fit
+	}
+
+
+	/**
+	* Toggles a pane open/closed by calling either open or close
+	*
+	* @param {(string|Object)}	evt_or_pane		The pane being toggled, ie: north, south, east, or west
+	* @param {boolean=}			[slide=false]
+	*/
+,	toggle = function (evt_or_pane, slide) {
+		if (!isInitialized()) return;
+		var	evt		= evtObj(evt_or_pane)
+		,	pane	= evtPane.call(this, evt_or_pane)
+		,	s		= state[pane]
+		;
+		if (evt) // called from to $R.dblclick OR triggerPaneEvent
+			evt.stopImmediatePropagation();
+		if (s.isHidden)
+			show(pane); // will call 'open' after unhiding it
+		else if (s.isClosed)
+			open(pane, !!slide);
+		else
+			close(pane);
+	}
+
+
+	/**
+	* Utility method used during init or other auto-processes
+	*
+	* @param {string}	pane   The pane being closed
+	* @param {boolean=}	[setHandles=false]
+	*/
+,	_closePane = function (pane, setHandles) {
+		var
+			$P	= $Ps[pane]
+		,	s	= state[pane]
+		;
+		_hidePane(pane);
+		s.isClosed = true;
+		s.isVisible = false;
+		if (setHandles) setAsClosed(pane);
+	}
+
+	/**
+	* Close the specified pane (animation optional), and resize all other panes as needed
+	*
+	* @param {(string|Object)}	evt_or_pane			The pane being closed, ie: north, south, east, or west
+	* @param {boolean=}			[force=false]
+	* @param {boolean=}			[noAnimation=false]
+	* @param {boolean=}			[skipCallback=false]
+	*/
+,	close = function (evt_or_pane, force, noAnimation, skipCallback) {
+		var	pane = evtPane.call(this, evt_or_pane);
+		// if pane has been initialized, but NOT the complete layout, close pane instantly
+		if (!state.initialized && $Ps[pane]) {
+			_closePane(pane, true); // INIT pane as closed
+			return;
+		}
+		if (!isInitialized()) return;
+
+		var
+			$P	= $Ps[pane]
+		,	$R	= $Rs[pane]
+		,	$T	= $Ts[pane]
+		,	o	= options[pane]
+		,	s	= state[pane]
+		,	c	= _c[pane]
+		,	doFX, isShowing, isHiding, wasSliding;
+
+		// QUEUE in case another action/animation is in progress
+		$N.queue(function( queueNext ){
+
+			if ( !$P
+			||	(!o.closable && !s.isShowing && !s.isHiding)	// invalid request // (!o.resizable && !o.closable) ???
+			||	(!force && s.isClosed && !s.isShowing)			// already closed
+			) return queueNext();
+
+			// onclose_start callback - will CANCEL hide if returns false
+			// SKIP if just 'showing' a hidden pane as 'closed'
+			var abort = !s.isShowing && false === _runCallbacks("onclose_start", pane);
+
+			// transfer logic vars to temp vars
+			isShowing	= s.isShowing;
+			isHiding	= s.isHiding;
+			wasSliding	= s.isSliding;
+			// now clear the logic vars (REQUIRED before aborting)
+			delete s.isShowing;
+			delete s.isHiding;
+
+			if (abort) return queueNext();
+
+			doFX		= !noAnimation && !s.isClosed && (o.fxName_close != "none");
+			s.isMoving	= true;
+			s.isClosed	= true;
+			s.isVisible	= false;
+			// update isHidden BEFORE sizing panes
+			if (isHiding) s.isHidden = true;
+			else if (isShowing) s.isHidden = false;
+
+			if (s.isSliding) // pane is being closed, so UNBIND trigger events
+				bindStopSlidingEvents(pane, false); // will set isSliding=false
+			else // resize panes adjacent to this one
+				sizeMidPanes(_c[pane].dir === "horz" ? "" : "center", false); // false = NOT skipCallback
+
+			// if this pane has a resizer bar, move it NOW - before animation
+			setAsClosed(pane);
+
+			// CLOSE THE PANE
+			if (doFX) { // animate the close
+				lockPaneForFX(pane, true);	// need to set left/top so animation will work
+				$P.hide( o.fxName_close, o.fxSettings_close, o.fxSpeed_close, function () {
+					lockPaneForFX(pane, false); // undo
+					if (s.isClosed) close_2();
+					queueNext();
+				});
+			}
+			else { // hide the pane without animation
+				_hidePane(pane);
+				close_2();
+				queueNext();
+			};
+		});
+
+		// SUBROUTINE
+		function close_2 () {
+			s.isMoving	= false;
+			bindStartSlidingEvents(pane, true); // will enable if o.slidable = true
+
+			// if opposite-pane was autoClosed, see if it can be autoOpened now
+			var altPane = _c.oppositeEdge[pane];
+			if (state[ altPane ].noRoom) {
+				setSizeLimits( altPane );
+				makePaneFit( altPane );
+			}
+
+			if (!skipCallback && (state.initialized || o.triggerEventsOnLoad)) {
+				// onclose callback - UNLESS just 'showing' a hidden pane as 'closed'
+				if (!isShowing)	_runCallbacks("onclose_end", pane);
+				// onhide OR onshow callback
+				if (isShowing)	_runCallbacks("onshow_end", pane);
+				if (isHiding)	_runCallbacks("onhide_end", pane);
+			}
+		}
+	}
+
+	/**
+	* @param {string}	pane	The pane just closed, ie: north, south, east, or west
+	*/
+,	setAsClosed = function (pane) {
+		if (!$Rs[pane]) return; // handles not initialized yet!
+		var
+			$P		= $Ps[pane]
+		,	$R		= $Rs[pane]
+		,	$T		= $Ts[pane]
+		,	o		= options[pane]
+		,	s		= state[pane]
+		,	side	= _c[pane].side
+		,	rClass	= o.resizerClass
+		,	tClass	= o.togglerClass
+		,	_pane	= "-"+ pane // used for classNames
+		,	_open	= "-open"
+		,	_sliding= "-sliding"
+		,	_closed	= "-closed"
+		;
+		$R
+			.css(side, sC.inset[side]) // move the resizer
+			.removeClass( rClass+_open +" "+ rClass+_pane+_open )
+			.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
+			.addClass( rClass+_closed +" "+ rClass+_pane+_closed )
+		;
+		// DISABLE 'resizing' when closed - do this BEFORE bindStartSlidingEvents?
+		if (o.resizable && $.layout.plugins.draggable)
+			$R
+				.draggable("disable")
+				.removeClass("ui-state-disabled") // do NOT apply disabled styling - not suitable here
+				.css("cursor", "default")
+				.attr("title","")
+			;
+
+		// if pane has a toggler button, adjust that too
+		if ($T) {
+			$T
+				.removeClass( tClass+_open +" "+ tClass+_pane+_open )
+				.addClass( tClass+_closed +" "+ tClass+_pane+_closed )
+				.attr("title", o.tips.Open) // may be blank
+			;
+			// toggler-content - if exists
+			$T.children(".content-open").hide();
+			$T.children(".content-closed").css("display","block");
+		}
+
+		// sync any 'pin buttons'
+		syncPinBtns(pane, false);
+
+		if (state.initialized) {
+			// resize 'length' and position togglers for adjacent panes
+			sizeHandles();
+		}
+	}
+
+	/**
+	* Open the specified pane (animation optional), and resize all other panes as needed
+	*
+	* @param {(string|Object)}	evt_or_pane			The pane being opened, ie: north, south, east, or west
+	* @param {boolean=}			[slide=false]
+	* @param {boolean=}			[noAnimation=false]
+	* @param {boolean=}			[noAlert=false]
+	*/
+,	open = function (evt_or_pane, slide, noAnimation, noAlert) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$P	= $Ps[pane]
+		,	$R	= $Rs[pane]
+		,	$T	= $Ts[pane]
+		,	o	= options[pane]
+		,	s	= state[pane]
+		,	c	= _c[pane]
+		,	doFX, isShowing
+		;
+		// QUEUE in case another action/animation is in progress
+		$N.queue(function( queueNext ){
+
+			if ( !$P
+			||	(!o.resizable && !o.closable && !s.isShowing)	// invalid request
+			||	(s.isVisible && !s.isSliding)					// already open
+			) return queueNext();
+
+			// pane can ALSO be unhidden by just calling show(), so handle this scenario
+			if (s.isHidden && !s.isShowing) {
+				queueNext(); // call before show() because it needs the queue free
+				show(pane, true);
+				return;
+			}
+
+			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
+				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
+			else
+				// make sure there is enough space available to open the pane
+				setSizeLimits(pane, slide);
+
+			// onopen_start callback - will CANCEL open if returns false
+			var cbReturn = _runCallbacks("onopen_start", pane);
+
+			if (cbReturn === "abort")
+				return queueNext();
+
+			// update pane-state again in case options were changed in onopen_start
+			if (cbReturn !== "NC") // NC = "No Callback"
+				setSizeLimits(pane, slide);
+
+			if (s.minSize > s.maxSize) { // INSUFFICIENT ROOM FOR PANE TO OPEN!
+				syncPinBtns(pane, false); // make sure pin-buttons are reset
+				if (!noAlert && o.tips.noRoomToOpen)
+					alert(o.tips.noRoomToOpen);
+				return queueNext(); // ABORT
+			}
+
+			if (slide) // START Sliding - will set isSliding=true
+				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
+			else if (s.isSliding) // PIN PANE (stop sliding) - open pane 'normally' instead
+				bindStopSlidingEvents(pane, false); // UNBIND trigger events - will set isSliding=false
+			else if (o.slidable)
+				bindStartSlidingEvents(pane, false); // UNBIND trigger events
+
+			s.noRoom = false; // will be reset by makePaneFit if 'noRoom'
+			makePaneFit(pane);
+
+			// transfer logic var to temp var
+			isShowing = s.isShowing;
+			// now clear the logic var
+			delete s.isShowing;
+
+			doFX		= !noAnimation && s.isClosed && (o.fxName_open != "none");
+			s.isMoving	= true;
+			s.isVisible	= true;
+			s.isClosed	= false;
+			// update isHidden BEFORE sizing panes - WHY??? Old?
+			if (isShowing) s.isHidden = false;
+
+			if (doFX) { // ANIMATE
+				// mask adjacent panes with objects
+				lockPaneForFX(pane, true);	// need to set left/top so animation will work
+					$P.show( o.fxName_open, o.fxSettings_open, o.fxSpeed_open, function() {
+					lockPaneForFX(pane, false); // undo
+					if (s.isVisible) open_2(); // continue
+					queueNext();
+				});
+			}
+			else { // no animation
+				_showPane(pane);// just show pane and...
+				open_2();		// continue
+				queueNext();
+			};
+		});
+
+		// SUBROUTINE
+		function open_2 () {
+			s.isMoving	= false;
+
+			// cure iframe display issues
+			_fixIframe(pane);
+
+			// NOTE: if isSliding, then other panes are NOT 'resized'
+			if (!s.isSliding) { // resize all panes adjacent to this one
+				sizeMidPanes(_c[pane].dir=="vert" ? "center" : "", false); // false = NOT skipCallback
+			}
+
+			// set classes, position handles and execute callbacks...
+			setAsOpen(pane);
+		};
+	
+	}
+
+	/**
+	* @param {string}	pane		The pane just opened, ie: north, south, east, or west
+	* @param {boolean=}	[skipCallback=false]
+	*/
+,	setAsOpen = function (pane, skipCallback) {
+		var 
+			$P		= $Ps[pane]
+		,	$R		= $Rs[pane]
+		,	$T		= $Ts[pane]
+		,	o		= options[pane]
+		,	s		= state[pane]
+		,	side	= _c[pane].side
+		,	rClass	= o.resizerClass
+		,	tClass	= o.togglerClass
+		,	_pane	= "-"+ pane // used for classNames
+		,	_open	= "-open"
+		,	_closed	= "-closed"
+		,	_sliding= "-sliding"
+		;
+		$R
+			.css(side, sC.inset[side] + getPaneSize(pane)) // move the resizer
+			.removeClass( rClass+_closed +" "+ rClass+_pane+_closed )
+			.addClass( rClass+_open +" "+ rClass+_pane+_open )
+		;
+		if (s.isSliding)
+			$R.addClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
+		else // in case 'was sliding'
+			$R.removeClass( rClass+_sliding +" "+ rClass+_pane+_sliding )
+
+		removeHover( 0, $R ); // remove hover classes
+		if (o.resizable && $.layout.plugins.draggable)
+			$R	.draggable("enable")
+				.css("cursor", o.resizerCursor)
+				.attr("title", o.tips.Resize);
+		else if (!s.isSliding)
+			$R.css("cursor", "default"); // n-resize, s-resize, etc
+
+		// if pane also has a toggler button, adjust that too
+		if ($T) {
+			$T	.removeClass( tClass+_closed +" "+ tClass+_pane+_closed )
+				.addClass( tClass+_open +" "+ tClass+_pane+_open )
+				.attr("title", o.tips.Close); // may be blank
+			removeHover( 0, $T ); // remove hover classes
+			// toggler-content - if exists
+			$T.children(".content-closed").hide();
+			$T.children(".content-open").css("display","block");
+		}
+
+		// sync any 'pin buttons'
+		syncPinBtns(pane, !s.isSliding);
+
+		// update pane-state dimensions - BEFORE resizing content
+		$.extend(s, elDims($P));
+
+		if (state.initialized) {
+			// resize resizer & toggler sizes for all panes
+			sizeHandles();
+			// resize content every time pane opens - to be sure
+			sizeContent(pane, true); // true = remeasure headers/footers, even if 'pane.isMoving'
+		}
+
+		if (!skipCallback && (state.initialized || o.triggerEventsOnLoad) && $P.is(":visible")) {
+			// onopen callback
+			_runCallbacks("onopen_end", pane);
+			// onshow callback - TODO: should this be here?
+			if (s.isShowing) _runCallbacks("onshow_end", pane);
+
+			// ALSO call onresize because layout-size *may* have changed while pane was closed
+			if (state.initialized)
+				_runCallbacks("onresize_end", pane);
+		}
+
+		// TODO: Somehow sizePane("north") is being called after this point???
+	}
+
+
+	/**
+	* slideOpen / slideClose / slideToggle
+	*
+	* Pass-though methods for sliding
+	*/
+,	slideOpen = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	evt		= evtObj(evt_or_pane)
+		,	pane	= evtPane.call(this, evt_or_pane)
+		,	s		= state[pane]
+		,	delay	= options[pane].slideDelay_open
+		;
+		// prevent event from triggering on NEW resizer binding created below
+		if (evt) evt.stopImmediatePropagation();
+
+		if (s.isClosed && evt && evt.type === "mouseenter" && delay > 0)
+			// trigger = mouseenter - use a delay
+			timer.set(pane+"_openSlider", open_NOW, delay);
+		else
+			open_NOW(); // will unbind events if is already open
+
+		/**
+		* SUBROUTINE for timed open
+		*/
+		function open_NOW () {
+			if (!s.isClosed) // skip if no longer closed!
+				bindStopSlidingEvents(pane, true); // BIND trigger events to close sliding-pane
+			else if (!s.isMoving)
+				open(pane, true); // true = slide - open() will handle binding
+		};
+	}
+
+,	slideClose = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	evt		= evtObj(evt_or_pane)
+		,	pane	= evtPane.call(this, evt_or_pane)
+		,	o		= options[pane]
+		,	s		= state[pane]
+		,	delay	= s.isMoving ? 1000 : 300 // MINIMUM delay - option may override
+		;
+		if (s.isClosed || s.isResizing)
+			return; // skip if already closed OR in process of resizing
+		else if (o.slideTrigger_close === "click")
+			close_NOW(); // close immediately onClick
+		else if (o.preventQuickSlideClose && s.isMoving)
+			return; // handle Chrome quick-close on slide-open
+		else if (o.preventPrematureSlideClose && evt && $.layout.isMouseOverElem(evt, $Ps[pane]))
+			return; // handle incorrect mouseleave trigger, like when over a SELECT-list in IE
+		else if (evt) // trigger = mouseleave - use a delay
+			// 1 sec delay if 'opening', else .3 sec
+			timer.set(pane+"_closeSlider", close_NOW, max(o.slideDelay_close, delay));
+		else // called programically
+			close_NOW();
+
+		/**
+		* SUBROUTINE for timed close
+		*/
+		function close_NOW () {
+			if (s.isClosed) // skip 'close' if already closed!
+				bindStopSlidingEvents(pane, false); // UNBIND trigger events - TODO: is this needed here?
+			else if (!s.isMoving)
+				close(pane); // close will handle unbinding
+		};
+	}
+
+	/**
+	* @param {(string|Object)}	evt_or_pane		The pane being opened, ie: north, south, east, or west
+	*/
+,	slideToggle = function (evt_or_pane) {
+		var pane = evtPane.call(this, evt_or_pane);
+		toggle(pane, true);
+	}
+
+
+	/**
+	* Must set left/top on East/South panes so animation will work properly
+	*
+	* @param {string}	pane	The pane to lock, 'east' or 'south' - any other is ignored!
+	* @param {boolean}	doLock  true = set left/top, false = remove
+	*/
+,	lockPaneForFX = function (pane, doLock) {
+		var $P	= $Ps[pane]
+		,	s	= state[pane]
+		,	o	= options[pane]
+		,	z	= options.zIndexes
+		;
+		if (doLock) {
+			showMasks( pane, { animation: true, objectsOnly: true });
+			$P.css({ zIndex: z.pane_animate }); // overlay all elements during animation
+			if (pane=="south")
+				$P.css({ top: sC.inset.top + sC.innerHeight - $P.outerHeight() });
+			else if (pane=="east")
+				$P.css({ left: sC.inset.left + sC.innerWidth - $P.outerWidth() });
+		}
+		else { // animation DONE - RESET CSS
+			hideMasks();
+			$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
+			if (pane=="south")
+				$P.css({ top: "auto" });
+			// if pane is positioned 'off-screen', then DO NOT screw with it!
+			else if (pane=="east" && !$P.css("left").match(/\-99999/))
+				$P.css({ left: "auto" });
+			// fix anti-aliasing in IE - only needed for animations that change opacity
+			if (browser.msie && o.fxOpacityFix && o.fxName_open != "slide" && $P.css("filter") && $P.css("opacity") == 1)
+				$P[0].style.removeAttribute('filter');
+		}
+	}
+
+
+	/**
+	* Toggle sliding functionality of a specific pane on/off by adding removing 'slide open' trigger
+	*
+	* @see  open(), close()
+	* @param {string}	pane	The pane to enable/disable, 'north', 'south', etc.
+	* @param {boolean}	enable	Enable or Disable sliding?
+	*/
+,	bindStartSlidingEvents = function (pane, enable) {
+		var o		= options[pane]
+		,	$P		= $Ps[pane]
+		,	$R		= $Rs[pane]
+		,	evtName	= o.slideTrigger_open.toLowerCase()
+		;
+		if (!$R || (enable && !o.slidable)) return;
+
+		// make sure we have a valid event
+		if (evtName.match(/mouseover/))
+			evtName = o.slideTrigger_open = "mouseenter";
+		else if (!evtName.match(/(click|dblclick|mouseenter)/)) 
+			evtName = o.slideTrigger_open = "click";
+
+		// must remove double-click-toggle when using dblclick-slide
+		if (o.resizerDblClickToggle && evtName.match(/click/)) {
+			$R[enable ? "unbind" : "bind"]('dblclick.'+ sID, toggle)
+		}
+
+		$R
+			// add or remove event
+			[enable ? "bind" : "unbind"](evtName +'.'+ sID, slideOpen)
+			// set the appropriate cursor & title/tip
+			.css("cursor", enable ? o.sliderCursor : "default")
+			.attr("title", enable ? o.tips.Slide : "")
+		;
+	}
+
+	/**
+	* Add or remove 'mouseleave' events to 'slide close' when pane is 'sliding' open or closed
+	* Also increases zIndex when pane is sliding open
+	* See bindStartSlidingEvents for code to control 'slide open'
+	*
+	* @see  slideOpen(), slideClose()
+	* @param {string}	pane	The pane to process, 'north', 'south', etc.
+	* @param {boolean}	enable	Enable or Disable events?
+	*/
+,	bindStopSlidingEvents = function (pane, enable) {
+		var	o		= options[pane]
+		,	s		= state[pane]
+		,	c		= _c[pane]
+		,	z		= options.zIndexes
+		,	evtName	= o.slideTrigger_close.toLowerCase()
+		,	action	= (enable ? "bind" : "unbind")
+		,	$P		= $Ps[pane]
+		,	$R		= $Rs[pane]
+		;
+		timer.clear(pane+"_closeSlider"); // just in case
+
+		if (enable) {
+			s.isSliding = true;
+			state.panesSliding[pane] = true;
+			// remove 'slideOpen' event from resizer
+			// ALSO will raise the zIndex of the pane & resizer
+			bindStartSlidingEvents(pane, false);
+		}
+		else {
+			s.isSliding = false;
+			delete state.panesSliding[pane];
+		}
+
+		// RE/SET zIndex - increases when pane is sliding-open, resets to normal when not
+		$P.css("zIndex", enable ? z.pane_sliding : z.pane_normal);
+		$R.css("zIndex", enable ? z.pane_sliding+2 : z.resizer_normal); // NOTE: mask = pane_sliding+1
+
+		// make sure we have a valid event
+		if (!evtName.match(/(click|mouseleave)/))
+			evtName = o.slideTrigger_close = "mouseleave"; // also catches 'mouseout'
+
+		// add/remove slide triggers
+		$R[action](evtName, slideClose); // base event on resize
+		// need extra events for mouseleave
+		if (evtName === "mouseleave") {
+			// also close on pane.mouseleave
+			$P[action]("mouseleave."+ sID, slideClose);
+			// cancel timer when mouse moves between 'pane' and 'resizer'
+			$R[action]("mouseenter."+ sID, cancelMouseOut);
+			$P[action]("mouseenter."+ sID, cancelMouseOut);
+		}
+
+		if (!enable)
+			timer.clear(pane+"_closeSlider");
+		else if (evtName === "click" && !o.resizable) {
+			// IF pane is not resizable (which already has a cursor and tip) 
+			// then set the a cursor & title/tip on resizer when sliding
+			$R.css("cursor", enable ? o.sliderCursor : "default");
+			$R.attr("title", enable ? o.tips.Close : ""); // use Toggler-tip, eg: "Close Pane"
+		}
+
+		// SUBROUTINE for mouseleave timer clearing
+		function cancelMouseOut (evt) {
+			timer.clear(pane+"_closeSlider");
+			evt.stopPropagation();
+		}
+	}
+
+
+	/**
+	* Hides/closes a pane if there is insufficient room - reverses this when there is room again
+	* MUST have already called setSizeLimits() before calling this method
+	*
+	* @param {string}	pane					The pane being resized
+	* @param {boolean=}	[isOpening=false]		Called from onOpen?
+	* @param {boolean=}	[skipCallback=false]	Should the onresize callback be run?
+	* @param {boolean=}	[force=false]
+	*/
+,	makePaneFit = function (pane, isOpening, skipCallback, force) {
+		var	o	= options[pane]
+		,	s	= state[pane]
+		,	c	= _c[pane]
+		,	$P	= $Ps[pane]
+		,	$R	= $Rs[pane]
+		,	isSidePane 	= c.dir==="vert"
+		,	hasRoom		= false
+		;
+		// special handling for center & east/west panes
+		if (pane === "center" || (isSidePane && s.noVerticalRoom)) {
+			// see if there is enough room to display the pane
+			// ERROR: hasRoom = s.minHeight <= s.maxHeight && (isSidePane || s.minWidth <= s.maxWidth);
+			hasRoom = (s.maxHeight >= 0);
+			if (hasRoom && s.noRoom) { // previously hidden due to noRoom, so show now
+				_showPane(pane);
+				if ($R) $R.show();
+				s.isVisible = true;
+				s.noRoom = false;
+				if (isSidePane) s.noVerticalRoom = false;
+				_fixIframe(pane);
+			}
+			else if (!hasRoom && !s.noRoom) { // not currently hidden, so hide now
+				_hidePane(pane);
+				if ($R) $R.hide();
+				s.isVisible = false;
+				s.noRoom = true;
+			}
+		}
+
+		// see if there is enough room to fit the border-pane
+		if (pane === "center") {
+			// ignore center in this block
+		}
+		else if (s.minSize <= s.maxSize) { // pane CAN fit
+			hasRoom = true;
+			if (s.size > s.maxSize) // pane is too big - shrink it
+				sizePane(pane, s.maxSize, skipCallback, true, force); // true = noAnimation
+			else if (s.size < s.minSize) // pane is too small - enlarge it
+				sizePane(pane, s.minSize, skipCallback, true, force); // true = noAnimation
+			// need s.isVisible because new pseudoClose method keeps pane visible, but off-screen
+			else if ($R && s.isVisible && $P.is(":visible")) {
+				// make sure resizer-bar is positioned correctly
+				// handles situation where nested layout was 'hidden' when initialized
+				var	pos = s.size + sC.inset[c.side];
+				if ($.layout.cssNum( $R, c.side ) != pos) $R.css( c.side, pos );
+			}
+
+			// if was previously hidden due to noRoom, then RESET because NOW there is room
+			if (s.noRoom) {
+				// s.noRoom state will be set by open or show
+				if (s.wasOpen && o.closable) {
+					if (o.autoReopen)
+						open(pane, false, true, true); // true = noAnimation, true = noAlert
+					else // leave the pane closed, so just update state
+						s.noRoom = false;
+				}
+				else
+					show(pane, s.wasOpen, true, true); // true = noAnimation, true = noAlert
+			}
+		}
+		else { // !hasRoom - pane CANNOT fit
+			if (!s.noRoom) { // pane not set as noRoom yet, so hide or close it now...
+				s.noRoom = true; // update state
+				s.wasOpen = !s.isClosed && !s.isSliding;
+				if (s.isClosed){} // SKIP
+				else if (o.closable) // 'close' if possible
+					close(pane, true, true); // true = force, true = noAnimation
+				else // 'hide' pane if cannot just be closed
+					hide(pane, true); // true = noAnimation
+			}
+		}
+	}
+
+
+	/**
+	* manualSizePane is an exposed flow-through method allowing extra code when pane is 'manually resized'
+	*
+	* @param {(string|Object)}	evt_or_pane				The pane being resized
+	* @param {number}			size					The *desired* new size for this pane - will be validated
+	* @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
+	* @param {boolean=}			[noAnimation=false]
+	* @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
+	*/
+,	manualSizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	o	= options[pane]
+		,	s	= state[pane]
+		//	if resizing callbacks have been delayed and resizing is now DONE, force resizing to complete...
+		,	forceResize = force || (o.livePaneResizing && !s.isResizing)
+		;
+		// ANY call to manualSizePane disables autoResize - ie, percentage sizing
+		s.autoResize = false;
+		// flow-through...
+		sizePane(pane, size, skipCallback, noAnimation, forceResize); // will animate resize if option enabled
+	}
+
+	/**
+	* sizePane is called only by internal methods whenever a pane needs to be resized
+	*
+	* @param {(string|Object)}	evt_or_pane				The pane being resized
+	* @param {number}			size					The *desired* new size for this pane - will be validated
+	* @param {boolean=}			[skipCallback=false]	Should the onresize callback be run?
+	* @param {boolean=}			[noAnimation=false]
+	* @param {boolean=}			[force=false]			Force resizing even if does not seem necessary
+	*/
+,	sizePane = function (evt_or_pane, size, skipCallback, noAnimation, force) {
+		if (!isInitialized()) return;
+		var	pane	= evtPane.call(this, evt_or_pane) // probably NEVER called from event?
+		,	o		= options[pane]
+		,	s		= state[pane]
+		,	$P		= $Ps[pane]
+		,	$R		= $Rs[pane]
+		,	side	= _c[pane].side
+		,	dimName	= _c[pane].sizeType.toLowerCase()
+		,	skipResizeWhileDragging = s.isResizing && !o.triggerEventsDuringLiveResize
+		,	doFX	= noAnimation !== true && o.animatePaneSizing
+		,	oldSize, newSize
+		;
+		// QUEUE in case another action/animation is in progress
+		$N.queue(function( queueNext ){
+			// calculate 'current' min/max sizes
+			setSizeLimits(pane); // update pane-state
+			oldSize = s.size;
+			size = _parseSize(pane, size); // handle percentages & auto
+			size = max(size, _parseSize(pane, o.minSize));
+			size = min(size, s.maxSize);
+			if (size < s.minSize) { // not enough room for pane!
+				queueNext(); // call before makePaneFit() because it needs the queue free
+				makePaneFit(pane, false, skipCallback);	// will hide or close pane
+				return;
+			}
+
+			// IF newSize is same as oldSize, then nothing to do - abort
+			if (!force && size === oldSize)
+				return queueNext();
+
+			s.newSize = size;
+
+			// onresize_start callback CANNOT cancel resizing because this would break the layout!
+			if (!skipCallback && state.initialized && s.isVisible)
+				_runCallbacks("onresize_start", pane);
+
+			// resize the pane, and make sure its visible
+			newSize = cssSize(pane, size);
+
+			if (doFX && $P.is(":visible")) { // ANIMATE
+				var fx		= $.layout.effects.size[pane] || $.layout.effects.size.all
+				,	easing	= o.fxSettings_size.easing || fx.easing
+				,	z		= options.zIndexes
+				,	props	= {};
+				props[ dimName ] = newSize +'px';
+				s.isMoving = true;
+				// overlay all elements during animation
+				$P.css({ zIndex: z.pane_animate })
+				  .show().animate( props, o.fxSpeed_size, easing, function(){
+					// reset zIndex after animation
+					$P.css({ zIndex: (s.isSliding ? z.pane_sliding : z.pane_normal) });
+					s.isMoving = false;
+					delete s.newSize;
+					sizePane_2(); // continue
+					queueNext();
+				});
+			}
+			else { // no animation
+				$P.css( dimName, newSize );	// resize pane
+				delete s.newSize;
+				// if pane is visible, then 
+				if ($P.is(":visible"))
+					sizePane_2(); // continue
+				else {
+					// pane is NOT VISIBLE, so just update state data...
+					// when pane is *next opened*, it will have the new size
+					s.size = size;				// update state.size
+					$.extend(s, elDims($P));	// update state dimensions
+				}
+				queueNext();
+			};
+
+		});
+
+		// SUBROUTINE
+		function sizePane_2 () {
+			/*	Panes are sometimes not sized precisely in some browsers!?
+			 *	This code will resize the pane up to 3 times to nudge the pane to the correct size
+			 */
+			var	actual	= dimName==='width' ? $P.outerWidth() : $P.outerHeight()
+			,	tries	= [{
+						   	pane:		pane
+						,	count:		1
+						,	target:		size
+						,	actual:		actual
+						,	correct:	(size === actual)
+						,	attempt:	size
+						,	cssSize:	newSize
+						}]
+			,	lastTry = tries[0]
+			,	thisTry	= {}
+			,	msg		= 'Inaccurate size after resizing the '+ pane +'-pane.'
+			;
+			while ( !lastTry.correct ) {
+				thisTry = { pane: pane, count: lastTry.count+1, target: size };
+
+				if (lastTry.actual > size)
+					thisTry.attempt = max(0, lastTry.attempt - (lastTry.actual - size));
+				else // lastTry.actual < size
+					thisTry.attempt = max(0, lastTry.attempt + (size - lastTry.actual));
+
+				thisTry.cssSize = cssSize(pane, thisTry.attempt);
+				$P.css( dimName, thisTry.cssSize );
+
+				thisTry.actual	= dimName=='width' ? $P.outerWidth() : $P.outerHeight();
+				thisTry.correct	= (size === thisTry.actual);
+
+				// log attempts and alert the user of this *non-fatal error* (if showDebugMessages)
+				if ( tries.length === 1) {
+					_log(msg, false, true);
+					_log(lastTry, false, true);
+				}
+				_log(thisTry, false, true);
+				// after 4 tries, is as close as its gonna get!
+				if (tries.length > 3) break;
+
+				tries.push( thisTry );
+				lastTry = tries[ tries.length - 1 ];
+			}
+			// END TESTING CODE
+
+			// update pane-state dimensions
+			s.size	= size;
+			$.extend(s, elDims($P));
+
+			if (s.isVisible && $P.is(":visible")) {
+				// reposition the resizer-bar
+				if ($R) $R.css( side, size + sC.inset[side] );
+				// resize the content-div
+				sizeContent(pane);
+			}
+
+			if (!skipCallback && !skipResizeWhileDragging && state.initialized && s.isVisible)
+				_runCallbacks("onresize_end", pane);
+
+			// resize all the adjacent panes, and adjust their toggler buttons
+			// when skipCallback passed, it means the controlling method will handle 'other panes'
+			if (!skipCallback) {
+				// also no callback if live-resize is in progress and NOT triggerEventsDuringLiveResize
+				if (!s.isSliding) sizeMidPanes(_c[pane].dir=="horz" ? "" : "center", skipResizeWhileDragging, force);
+				sizeHandles();
+			}
+
+			// if opposite-pane was autoClosed, see if it can be autoOpened now
+			var altPane = _c.oppositeEdge[pane];
+			if (size < oldSize && state[ altPane ].noRoom) {
+				setSizeLimits( altPane );
+				makePaneFit( altPane, false, skipCallback );
+			}
+
+			// DEBUG - ALERT user/developer so they know there was a sizing problem
+			if (tries.length > 1)
+				_log(msg +'\nSee the Error Console for details.', true, true);
+		}
+	}
+
+	/**
+	* @see  initPanes(), sizePane(), 	resizeAll(), open(), close(), hide()
+	* @param {(Array.<string>|string)}	panes					The pane(s) being resized, comma-delmited string
+	* @param {boolean=}					[skipCallback=false]	Should the onresize callback be run?
+	* @param {boolean=}					[force=false]
+	*/
+,	sizeMidPanes = function (panes, skipCallback, force) {
+		panes = (panes ? panes : "east,west,center").split(",");
+
+		$.each(panes, function (i, pane) {
+			if (!$Ps[pane]) return; // NO PANE - skip
+			var 
+				o		= options[pane]
+			,	s		= state[pane]
+			,	$P		= $Ps[pane]
+			,	$R		= $Rs[pane]
+			,	isCenter= (pane=="center")
+			,	hasRoom	= true
+			,	CSS		= {}
+			//	if pane is not visible, show it invisibly NOW rather than for *each call* in this script
+			,	visCSS	= $.layout.showInvisibly($P)
+
+			,	newCenter	= calcNewCenterPaneDims()
+			;
+
+			// update pane-state dimensions
+			$.extend(s, elDims($P));
+
+			if (pane === "center") {
+				if (!force && s.isVisible && newCenter.width === s.outerWidth && newCenter.height === s.outerHeight) {
+					$P.css(visCSS);
+					return true; // SKIP - pane already the correct size
+				}
+				// set state for makePaneFit() logic
+				$.extend(s, cssMinDims(pane), {
+					maxWidth:	newCenter.width
+				,	maxHeight:	newCenter.height
+				});
+				CSS = newCenter;
+				s.newWidth	= CSS.width;
+				s.newHeight	= CSS.height;
+				// convert OUTER width/height to CSS width/height 
+				CSS.width	= cssW($P, CSS.width);
+				// NEW - allow pane to extend 'below' visible area rather than hide it
+				CSS.height	= cssH($P, CSS.height);
+				hasRoom		= CSS.width >= 0 && CSS.height >= 0; // height >= 0 = ALWAYS TRUE NOW
+
+				// during layout init, try to shrink east/west panes to make room for center
+				if (!state.initialized && o.minWidth > newCenter.width) {
+					var
+						reqPx	= o.minWidth - s.outerWidth
+					,	minE	= options.east.minSize || 0
+					,	minW	= options.west.minSize || 0
+					,	sizeE	= state.east.size
+					,	sizeW	= state.west.size
+					,	newE	= sizeE
+					,	newW	= sizeW
+					;
+					if (reqPx > 0 && state.east.isVisible && sizeE > minE) {
+						newE = max( sizeE-minE, sizeE-reqPx );
+						reqPx -= sizeE-newE;
+					}
+					if (reqPx > 0 && state.west.isVisible && sizeW > minW) {
+						newW = max( sizeW-minW, sizeW-reqPx );
+						reqPx -= sizeW-newW;
+					}
+					// IF we found enough extra space, then resize the border panes as calculated
+					if (reqPx === 0) {
+						if (sizeE && sizeE != minE)
+							sizePane('east', newE, true, true, force); // true = skipCallback/noAnimation - initPanes will handle when done
+						if (sizeW && sizeW != minW)
+							sizePane('west', newW, true, true, force); // true = skipCallback/noAnimation
+						// now start over!
+						sizeMidPanes('center', skipCallback, force);
+						$P.css(visCSS);
+						return; // abort this loop
+					}
+				}
+			}
+			else { // for east and west, set only the height, which is same as center height
+				// set state.min/maxWidth/Height for makePaneFit() logic
+				if (s.isVisible && !s.noVerticalRoom)
+					$.extend(s, elDims($P), cssMinDims(pane))
+				if (!force && !s.noVerticalRoom && newCenter.height === s.outerHeight) {
+					$P.css(visCSS);
+					return true; // SKIP - pane already the correct size
+				}
+				// east/west have same top, bottom & height as center
+				CSS.top		= newCenter.top;
+				CSS.bottom	= newCenter.bottom;
+				s.newSize	= newCenter.height
+				// NEW - allow pane to extend 'below' visible area rather than hide it
+				CSS.height	= cssH($P, newCenter.height);
+				s.maxHeight	= CSS.height;
+				hasRoom		= (s.maxHeight >= 0); // ALWAYS TRUE NOW
+				if (!hasRoom) s.noVerticalRoom = true; // makePaneFit() logic
+			}
+
+			if (hasRoom) {
+				// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
+				if (!skipCallback && state.initialized)
+					_runCallbacks("onresize_start", pane);
+
+				$P.css(CSS); // apply the CSS to pane
+				if (pane !== "center")
+					sizeHandles(pane); // also update resizer length
+				if (s.noRoom && !s.isClosed && !s.isHidden)
+					makePaneFit(pane); // will re-open/show auto-closed/hidden pane
+				if (s.isVisible) {
+					$.extend(s, elDims($P)); // update pane dimensions
+					if (state.initialized) sizeContent(pane); // also resize the contents, if exists
+				}
+			}
+			else if (!s.noRoom && s.isVisible) // no room for pane
+				makePaneFit(pane); // will hide or close pane
+
+			// reset visibility, if necessary
+			$P.css(visCSS);
+
+			delete s.newSize;
+			delete s.newWidth;
+			delete s.newHeight;
+
+			if (!s.isVisible)
+				return true; // DONE - next pane
+
+			/*
+			* Extra CSS for IE6 or IE7 in Quirks-mode - add 'width' to NORTH/SOUTH panes
+			* Normally these panes have only 'left' & 'right' positions so pane auto-sizes
+			* ALSO required when pane is an IFRAME because will NOT default to 'full width'
+			*	TODO: Can I use width:100% for a north/south iframe?
+			*	TODO: Sounds like a job for $P.outerWidth( sC.innerWidth ) SETTER METHOD
+			*/
+			if (pane === "center") { // finished processing midPanes
+				var fix = browser.isIE6 || !browser.boxModel;
+				if ($Ps.north && (fix || state.north.tagName=="IFRAME")) 
+					$Ps.north.css("width", cssW($Ps.north, sC.innerWidth));
+				if ($Ps.south && (fix || state.south.tagName=="IFRAME"))
+					$Ps.south.css("width", cssW($Ps.south, sC.innerWidth));
+			}
+
+			// resizeAll passes skipCallback because it triggers callbacks after ALL panes are resized
+			if (!skipCallback && state.initialized)
+				_runCallbacks("onresize_end", pane);
+		});
+	}
+
+
+	/**
+	* @see  window.onresize(), callbacks or custom code
+	* @param {(Object|boolean)=}	evt_or_refresh	If 'true', then also reset pane-positioning
+	*/
+,	resizeAll = function (evt_or_refresh) {
+		var	oldW	= sC.innerWidth
+		,	oldH	= sC.innerHeight
+		;
+		// stopPropagation if called by trigger("layoutdestroy") - use evtPane utility 
+		evtPane(evt_or_refresh);
+
+		// cannot size layout when 'container' is hidden or collapsed
+		if (!$N.is(":visible")) return;
+
+		if (!state.initialized) {
+			_initLayoutElements();
+			return; // no need to resize since we just initialized!
+		}
+
+		if (evt_or_refresh === true && $.isPlainObject(options.outset)) {
+			// update container CSS in case outset option has changed
+			$N.css( options.outset );
+		}
+		// UPDATE container dimensions
+		$.extend(sC, elDims( $N, options.inset ));
+		if (!sC.outerHeight) return;
+
+		// if 'true' passed, refresh pane & handle positioning too
+		if (evt_or_refresh === true) {
+			setPanePosition();
+		}
+
+		// onresizeall_start will CANCEL resizing if returns false
+		// state.container has already been set, so user can access this info for calcuations
+		if (false === _runCallbacks("onresizeall_start")) return false;
+
+		var	// see if container is now 'smaller' than before
+			shrunkH	= (sC.innerHeight < oldH)
+		,	shrunkW	= (sC.innerWidth < oldW)
+		,	$P, o, s
+		;
+		// NOTE special order for sizing: S-N-E-W
+		$.each(["south","north","east","west"], function (i, pane) {
+			if (!$Ps[pane]) return; // no pane - SKIP
+			o = options[pane];
+			s = state[pane];
+			if (s.autoResize && s.size != o.size) // resize pane to original size set in options
+				sizePane(pane, o.size, true, true, true); // true=skipCallback/noAnimation/forceResize
+			else {
+				setSizeLimits(pane);
+				makePaneFit(pane, false, true, true); // true=skipCallback/forceResize
+			}
+		});
+
+		sizeMidPanes("", true, true); // true=skipCallback/forceResize
+		sizeHandles(); // reposition the toggler elements
+
+		// trigger all individual pane callbacks AFTER layout has finished resizing
+		$.each(_c.allPanes, function (i, pane) {
+			$P = $Ps[pane];
+			if (!$P) return; // SKIP
+			if (state[pane].isVisible) // undefined for non-existent panes
+				_runCallbacks("onresize_end", pane); // callback - if exists
+		});
+
+		_runCallbacks("onresizeall_end");
+		//_triggerLayoutEvent(pane, 'resizeall');
+	}
+
+	/**
+	* Whenever a pane resizes or opens that has a nested layout, trigger resizeAll
+	*
+	* @param {(string|Object)}	evt_or_pane		The pane just resized or opened
+	*/
+,	resizeChildren = function (evt_or_pane, skipRefresh) {
+		var	pane = evtPane.call(this, evt_or_pane);
+
+		if (!options[pane].resizeChildren) return;
+
+		// ensure the pane-children are up-to-date
+		if (!skipRefresh) refreshChildren( pane );
+		var pC = children[pane];
+		if ($.isPlainObject( pC )) {
+			// resize one or more children
+			$.each( pC, function (key, child) {
+				if (!child.destroyed) child.resizeAll();
+			});
+		}
+	}
+
+	/**
+	* IF pane has a content-div, then resize all elements inside pane to fit pane-height
+	*
+	* @param {(string|Object)}	evt_or_panes		The pane(s) being resized
+	* @param {boolean=}			[remeasure=false]	Should the content (header/footer) be remeasured?
+	*/
+,	sizeContent = function (evt_or_panes, remeasure) {
+		if (!isInitialized()) return;
+
+		var panes = evtPane.call(this, evt_or_panes);
+		panes = panes ? panes.split(",") : _c.allPanes;
+
+		$.each(panes, function (idx, pane) {
+			var
+				$P	= $Ps[pane]
+			,	$C	= $Cs[pane]
+			,	o	= options[pane]
+			,	s	= state[pane]
+			,	m	= s.content // m = measurements
+			;
+			if (!$P || !$C || !$P.is(":visible")) return true; // NOT VISIBLE - skip
+
+			// if content-element was REMOVED, update OR remove the pointer
+			if (!$C.length) {
+				initContent(pane, false);	// false = do NOT sizeContent() - already there!
+				if (!$C) return;			// no replacement element found - pointer have been removed
+			}
+
+			// onsizecontent_start will CANCEL resizing if returns false
+			if (false === _runCallbacks("onsizecontent_start", pane)) return;
+
+			// skip re-measuring offsets if live-resizing
+			if ((!s.isMoving && !s.isResizing) || o.liveContentResizing || remeasure || m.top == undefined) {
+				_measure();
+				// if any footers are below pane-bottom, they may not measure correctly,
+				// so allow pane overflow and re-measure
+				if (m.hiddenFooters > 0 && $P.css("overflow") === "hidden") {
+					$P.css("overflow", "visible");
+					_measure(); // remeasure while overflowing
+					$P.css("overflow", "hidden");
+				}
+			}
+			// NOTE: spaceAbove/Below *includes* the pane paddingTop/Bottom, but not pane.borders
+			var newH = s.innerHeight - (m.spaceAbove - s.css.paddingTop) - (m.spaceBelow - s.css.paddingBottom);
+
+			if (!$C.is(":visible") || m.height != newH) {
+				// size the Content element to fit new pane-size - will autoHide if not enough room
+				setOuterHeight($C, newH, true); // true=autoHide
+				m.height = newH; // save new height
+			};
+
+			if (state.initialized)
+				_runCallbacks("onsizecontent_end", pane);
+
+			function _below ($E) {
+				return max(s.css.paddingBottom, (parseInt($E.css("marginBottom"), 10) || 0));
+			};
+
+			function _measure () {
+				var
+					ignore	= options[pane].contentIgnoreSelector
+				,	$Fs		= $C.nextAll().not(".ui-layout-mask").not(ignore || ":lt(0)") // not :lt(0) = ALL
+				,	$Fs_vis	= $Fs.filter(':visible')
+				,	$F		= $Fs_vis.filter(':last')
+				;
+				m = {
+					top:			$C[0].offsetTop
+				,	height:			$C.outerHeight()
+				,	numFooters:		$Fs.length
+				,	hiddenFooters:	$Fs.length - $Fs_vis.length
+				,	spaceBelow:		0 // correct if no content footer ($E)
+				}
+					m.spaceAbove	= m.top; // just for state - not used in calc
+					m.bottom		= m.top + m.height;
+				if ($F.length)
+					//spaceBelow = (LastFooter.top + LastFooter.height) [footerBottom] - Content.bottom + max(LastFooter.marginBottom, pane.paddingBotom)
+					m.spaceBelow = ($F[0].offsetTop + $F.outerHeight()) - m.bottom + _below($F);
+				else // no footer - check marginBottom on Content element itself
+					m.spaceBelow = _below($C);
+			};
+		});
+	}
+
+
+	/**
+	* Called every time a pane is opened, closed, or resized to slide the togglers to 'center' and adjust their length if necessary
+	*
+	* @see  initHandles(), open(), close(), resizeAll()
+	* @param {(string|Object)=}		evt_or_panes	The pane(s) being resized
+	*/
+,	sizeHandles = function (evt_or_panes) {
+		var panes = evtPane.call(this, evt_or_panes)
+		panes = panes ? panes.split(",") : _c.borderPanes;
+
+		$.each(panes, function (i, pane) {
+			var 
+				o	= options[pane]
+			,	s	= state[pane]
+			,	$P	= $Ps[pane]
+			,	$R	= $Rs[pane]
+			,	$T	= $Ts[pane]
+			,	$TC
+			;
+			if (!$P || !$R) return;
+
+			var
+				dir			= _c[pane].dir
+			,	_state		= (s.isClosed ? "_closed" : "_open")
+			,	spacing		= o["spacing"+ _state]
+			,	togAlign	= o["togglerAlign"+ _state]
+			,	togLen		= o["togglerLength"+ _state]
+			,	paneLen
+			,	left
+			,	offset
+			,	CSS = {}
+			;
+
+			if (spacing === 0) {
+				$R.hide();
+				return;
+			}
+			else if (!s.noRoom && !s.isHidden) // skip if resizer was hidden for any reason
+				$R.show(); // in case was previously hidden
+
+			// Resizer Bar is ALWAYS same width/height of pane it is attached to
+			if (dir === "horz") { // north/south
+				//paneLen = $P.outerWidth(); // s.outerWidth || 
+				paneLen = sC.innerWidth; // handle offscreen-panes
+				s.resizerLength = paneLen;
+				left = $.layout.cssNum($P, "left")
+				$R.css({
+					width:	cssW($R, paneLen) // account for borders & padding
+				,	height:	cssH($R, spacing) // ditto
+				,	left:	left > -9999 ? left : sC.inset.left // handle offscreen-panes
+				});
+			}
+			else { // east/west
+				paneLen = $P.outerHeight(); // s.outerHeight || 
+				s.resizerLength = paneLen;
+				$R.css({
+					height:	cssH($R, paneLen) // account for borders & padding
+				,	width:	cssW($R, spacing) // ditto
+				,	top:	sC.inset.top + getPaneSize("north", true) // TODO: what if no North pane?
+				//,	top:	$.layout.cssNum($Ps["center"], "top")
+				});
+			}
+
+			// remove hover classes
+			removeHover( o, $R );
+
+			if ($T) {
+				if (togLen === 0 || (s.isSliding && o.hideTogglerOnSlide)) {
+					$T.hide(); // always HIDE the toggler when 'sliding'
+					return;
+				}
+				else
+					$T.show(); // in case was previously hidden
+
+				if (!(togLen > 0) || togLen === "100%" || togLen > paneLen) {
+					togLen = paneLen;
+					offset = 0;
+				}
+				else { // calculate 'offset' based on options.PANE.togglerAlign_open/closed
+					if (isStr(togAlign)) {
+						switch (togAlign) {
+							case "top":
+							case "left":	offset = 0;
+											break;
+							case "bottom":
+							case "right":	offset = paneLen - togLen;
+											break;
+							case "middle":
+							case "center":
+							default:		offset = round((paneLen - togLen) / 2); // 'default' catches typos
+						}
+					}
+					else { // togAlign = number
+						var x = parseInt(togAlign, 10); //
+						if (togAlign >= 0) offset = x;
+						else offset = paneLen - togLen + x; // NOTE: x is negative!
+					}
+				}
+
+				if (dir === "horz") { // north/south
+					var width = cssW($T, togLen);
+					$T.css({
+						width:	width  // account for borders & padding
+					,	height:	cssH($T, spacing) // ditto
+					,	left:	offset // TODO: VERIFY that toggler  positions correctly for ALL values
+					,	top:	0
+					});
+					// CENTER the toggler content SPAN
+					$T.children(".content").each(function(){
+						$TC = $(this);
+						$TC.css("marginLeft", round((width-$TC.outerWidth())/2)); // could be negative
+					});
+				}
+				else { // east/west
+					var height = cssH($T, togLen);
+					$T.css({
+						height:	height // account for borders & padding
+					,	width:	cssW($T, spacing) // ditto
+					,	top:	offset // POSITION the toggler
+					,	left:	0
+					});
+					// CENTER the toggler content SPAN
+					$T.children(".content").each(function(){
+						$TC = $(this);
+						$TC.css("marginTop", round((height-$TC.outerHeight())/2)); // could be negative
+					});
+				}
+
+				// remove ALL hover classes
+				removeHover( 0, $T );
+			}
+
+			// DONE measuring and sizing this resizer/toggler, so can be 'hidden' now
+			if (!state.initialized && (o.initHidden || s.isHidden)) {
+				$R.hide();
+				if ($T) $T.hide();
+			}
+		});
+	}
+
+
+	/**
+	* @param {(string|Object)}	evt_or_pane
+	*/
+,	enableClosable = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$T	= $Ts[pane]
+		,	o	= options[pane]
+		;
+		if (!$T) return;
+		o.closable = true;
+		$T	.bind("click."+ sID, function(evt){ evt.stopPropagation(); toggle(pane); })
+			.css("visibility", "visible")
+			.css("cursor", "pointer")
+			.attr("title", state[pane].isClosed ? o.tips.Open : o.tips.Close) // may be blank
+			.show();
+	}
+	/**
+	* @param {(string|Object)}	evt_or_pane
+	* @param {boolean=}			[hide=false]
+	*/
+,	disableClosable = function (evt_or_pane, hide) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$T	= $Ts[pane]
+		;
+		if (!$T) return;
+		options[pane].closable = false;
+		// is closable is disable, then pane MUST be open!
+		if (state[pane].isClosed) open(pane, false, true);
+		$T	.unbind("."+ sID)
+			.css("visibility", hide ? "hidden" : "visible") // instead of hide(), which creates logic issues
+			.css("cursor", "default")
+			.attr("title", "");
+	}
+
+
+	/**
+	* @param {(string|Object)}	evt_or_pane
+	*/
+,	enableSlidable = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$R	= $Rs[pane]
+		;
+		if (!$R || !$R.data('draggable')) return;
+		options[pane].slidable = true; 
+		if (state[pane].isClosed)
+			bindStartSlidingEvents(pane, true);
+	}
+	/**
+	* @param {(string|Object)}	evt_or_pane
+	*/
+,	disableSlidable = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$R	= $Rs[pane]
+		;
+		if (!$R) return;
+		options[pane].slidable = false; 
+		if (state[pane].isSliding)
+			close(pane, false, true);
+		else {
+			bindStartSlidingEvents(pane, false);
+			$R	.css("cursor", "default")
+				.attr("title", "");
+			removeHover(null, $R[0]); // in case currently hovered
+		}
+	}
+
+
+	/**
+	* @param {(string|Object)}	evt_or_pane
+	*/
+,	enableResizable = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$R	= $Rs[pane]
+		,	o	= options[pane]
+		;
+		if (!$R || !$R.data('draggable')) return;
+		o.resizable = true; 
+		$R.draggable("enable");
+		if (!state[pane].isClosed)
+			$R	.css("cursor", o.resizerCursor)
+			 	.attr("title", o.tips.Resize);
+	}
+	/**
+	* @param {(string|Object)}	evt_or_pane
+	*/
+,	disableResizable = function (evt_or_pane) {
+		if (!isInitialized()) return;
+		var	pane = evtPane.call(this, evt_or_pane)
+		,	$R	= $Rs[pane]
+		;
+		if (!$R || !$R.data('draggable')) return;
+		options[pane].resizable = false; 
+		$R	.draggable("disable")
+			.css("cursor", "default")
+			.attr("title", "");
+		removeHover(null, $R[0]); // in case currently hovered
+	}
+
+
+	/**
+	* Move a pane from source-side (eg, west) to target-side (eg, east)
+	* If pane exists on target-side, move that to source-side, ie, 'swap' the panes
+	*
+	* @param {(string|Object)}	evt_or_pane1	The pane/edge being swapped
+	* @param {string}			pane2			ditto
+	*/
+,	swapPanes = function (evt_or_pane1, pane2) {
+		if (!isInitialized()) return;
+		var pane1 = evtPane.call(this, evt_or_pane1);
+		// change state.edge NOW so callbacks can know where pane is headed...
+		state[pane1].edge = pane2;
+		state[pane2].edge = pane1;
+		// run these even if NOT state.initialized
+		if (false === _runCallbacks("onswap_start", pane1)
+		 ||	false === _runCallbacks("onswap_start", pane2)
+		) {
+			state[pane1].edge = pane1; // reset
+			state[pane2].edge = pane2;
+			return;
+		}
+
+		var
+			oPane1	= copy( pane1 )
+		,	oPane2	= copy( pane2 )
+		,	sizes	= {}
+		;
+		sizes[pane1] = oPane1 ? oPane1.state.size : 0;
+		sizes[pane2] = oPane2 ? oPane2.state.size : 0;
+
+		// clear pointers & state
+		$Ps[pane1] = false; 
+		$Ps[pane2] = false;
+		state[pane1] = {};
+		state[pane2] = {};
+		
+		// ALWAYS remove the resizer & toggler elements
+		if ($Ts[pane1]) $Ts[pane1].remove();
+		if ($Ts[pane2]) $Ts[pane2].remove();
+		if ($Rs[pane1]) $Rs[pane1].remove();
+		if ($Rs[pane2]) $Rs[pane2].remove();
+		$Rs[pane1] = $Rs[pane2] = $Ts[pane1] = $Ts[pane2] = false;
+
+		// transfer element pointers and data to NEW Layout keys
+		move( oPane1, pane2 );
+		move( oPane2, pane1 );
+
+		// cleanup objects
+		oPane1 = oPane2 = sizes = null;
+
+		// make panes 'visible' again
+		if ($Ps[pane1]) $Ps[pane1].css(_c.visible);
+		if ($Ps[pane2]) $Ps[pane2].css(_c.visible);
+
+		// fix any size discrepancies caused by swap
+		resizeAll();
+
+		// run these even if NOT state.initialized
+		_runCallbacks("onswap_end", pane1);
+		_runCallbacks("onswap_end", pane2);
+
+		return;
+
+		function copy (n) { // n = pane
+			var
+				$P	= $Ps[n]
+			,	$C	= $Cs[n]
+			;
+			return !$P ? false : {
+				pane:		n
+			,	P:			$P ? $P[0] : false
+			,	C:			$C ? $C[0] : false
+			,	state:		$.extend(true, {}, state[n])
+			,	options:	$.extend(true, {}, options[n])
+			}
+		};
+
+		function move (oPane, pane) {
+			if (!oPane) return;
+			var
+				P		= oPane.P
+			,	C		= oPane.C
+			,	oldPane = oPane.pane
+			,	c		= _c[pane]
+			//	save pane-options that should be retained
+			,	s		= $.extend(true, {}, state[pane])
+			,	o		= options[pane]
+			//	RETAIN side-specific FX Settings - more below
+			,	fx		= { resizerCursor: o.resizerCursor }
+			,	re, size, pos
+			;
+			$.each("fxName,fxSpeed,fxSettings".split(","), function (i, k) {
+				fx[k +"_open"]  = o[k +"_open"];
+				fx[k +"_close"] = o[k +"_close"];
+				fx[k +"_size"]  = o[k +"_size"];
+			});
+
+			// update object pointers and attributes
+			$Ps[pane] = $(P)
+				.data({
+					layoutPane:		Instance[pane]	// NEW pointer to pane-alias-object
+				,	layoutEdge:		pane
+				})
+				.css(_c.hidden)
+				.css(c.cssReq)
+			;
+			$Cs[pane] = C ? $(C) : false;
+
+			// set options and state
+			options[pane]	= $.extend(true, {}, oPane.options, fx);
+			state[pane]		= $.extend(true, {}, oPane.state);
+
+			// change classNames on the pane, eg: ui-layout-pane-east ==> ui-layout-pane-west
+			re = new RegExp(o.paneClass +"-"+ oldPane, "g");
+			P.className = P.className.replace(re, o.paneClass +"-"+ pane);
+
+			// ALWAYS regenerate the resizer & toggler elements
+			initHandles(pane); // create the required resizer & toggler
+
+			// if moving to different orientation, then keep 'target' pane size
+			if (c.dir != _c[oldPane].dir) {
+				size = sizes[pane] || 0;
+				setSizeLimits(pane); // update pane-state
+				size = max(size, state[pane].minSize);
+				// use manualSizePane to disable autoResize - not useful after panes are swapped
+				manualSizePane(pane, size, true, true); // true/true = skipCallback/noAnimation
+			}
+			else // move the resizer here
+				$Rs[pane].css(c.side, sC.inset[c.side] + (state[pane].isVisible ? getPaneSize(pane) : 0));
+
+
+			// ADD CLASSNAMES & SLIDE-BINDINGS
+			if (oPane.state.isVisible && !s.isVisible)
+				setAsOpen(pane, true); // true = skipCallback
+			else {
+				setAsClosed(pane);
+				bindStartSlidingEvents(pane, true); // will enable events IF option is set
+			}
+
+			// DESTROY the object
+			oPane = null;
+		};
+	}
+
+
+	/**
+	* INTERNAL method to sync pin-buttons when pane is opened or closed
+	* Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
+	*
+	* @see  open(), setAsOpen(), setAsClosed()
+	* @param {string}	pane   These are the params returned to callbacks by layout()
+	* @param {boolean}	doPin  True means set the pin 'down', False means 'up'
+	*/
+,	syncPinBtns = function (pane, doPin) {
+		if ($.layout.plugins.buttons)
+			$.each(state[pane].pins, function (i, selector) {
+				$.layout.buttons.setPinState(Instance, $(selector), pane, doPin);
+			});
+	}
+
+;	// END var DECLARATIONS
+
+	/**
+	* Capture keys when enableCursorHotkey - toggle pane if hotkey pressed
+	*
+	* @see  document.keydown()
+	*/
+	function keyDown (evt) {
+		if (!evt) return true;
+		var code = evt.keyCode;
+		if (code < 33) return true; // ignore special keys: ENTER, TAB, etc
+
+		var
+			PANE = {
+				38: "north" // Up Cursor	- $.ui.keyCode.UP
+			,	40: "south" // Down Cursor	- $.ui.keyCode.DOWN
+			,	37: "west"  // Left Cursor	- $.ui.keyCode.LEFT
+			,	39: "east"  // Right Cursor	- $.ui.keyCode.RIGHT
+			}
+		,	ALT		= evt.altKey // no worky!
+		,	SHIFT	= evt.shiftKey
+		,	CTRL	= evt.ctrlKey
+		,	CURSOR	= (CTRL && code >= 37 && code <= 40)
+		,	o, k, m, pane
+		;
+
+		if (CURSOR && options[PANE[code]].enableCursorHotkey) // valid cursor-hotkey
+			pane = PANE[code];
+		else if (CTRL || SHIFT) // check to see if this matches a custom-hotkey
+			$.each(_c.borderPanes, function (i, p) { // loop each pane to check its hotkey
+				o = options[p];
+				k = o.customHotkey;
+				m = o.customHotkeyModifier; // if missing or invalid, treated as "CTRL+SHIFT"
+				if ((SHIFT && m=="SHIFT") || (CTRL && m=="CTRL") || (CTRL && SHIFT)) { // Modifier matches
+					if (k && code === (isNaN(k) || k <= 9 ? k.toUpperCase().charCodeAt(0) : k)) { // Key matches
+						pane = p;
+						return false; // BREAK
+					}
+				}
+			});
+
+		// validate pane
+		if (!pane || !$Ps[pane] || !options[pane].closable || state[pane].isHidden)
+			return true;
+
+		toggle(pane);
+
+		evt.stopPropagation();
+		evt.returnValue = false; // CANCEL key
+		return false;
+	};
+
+
+/*
+ * ######################################
+ *	UTILITY METHODS
+ *	called externally or by initButtons
+ * ######################################
+ */
+
+	/**
+	* Change/reset a pane overflow setting & zIndex to allow popups/drop-downs to work
+	*
+	* @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
+	*/
+	function allowOverflow (el) {
+		if (!isInitialized()) return;
+		if (this && this.tagName) el = this; // BOUND to element
+		var $P;
+		if (isStr(el))
+			$P = $Ps[el];
+		else if ($(el).data("layoutRole"))
+			$P = $(el);
+		else
+			$(el).parents().each(function(){
+				if ($(this).data("layoutRole")) {
+					$P = $(this);
+					return false; // BREAK
+				}
+			});
+		if (!$P || !$P.length) return; // INVALID
+
+		var
+			pane	= $P.data("layoutEdge")
+		,	s		= state[pane]
+		;
+
+		// if pane is already raised, then reset it before doing it again!
+		// this would happen if allowOverflow is attached to BOTH the pane and an element 
+		if (s.cssSaved)
+			resetOverflow(pane); // reset previous CSS before continuing
+
+		// if pane is raised by sliding or resizing, or its closed, then abort
+		if (s.isSliding || s.isResizing || s.isClosed) {
+			s.cssSaved = false;
+			return;
+		}
+
+		var
+			newCSS	= { zIndex: (options.zIndexes.resizer_normal + 1) }
+		,	curCSS	= {}
+		,	of		= $P.css("overflow")
+		,	ofX		= $P.css("overflowX")
+		,	ofY		= $P.css("overflowY")
+		;
+		// determine which, if any, overflow settings need to be changed
+		if (of != "visible") {
+			curCSS.overflow = of;
+			newCSS.overflow = "visible";
+		}
+		if (ofX && !ofX.match(/(visible|auto)/)) {
+			curCSS.overflowX = ofX;
+			newCSS.overflowX = "visible";
+		}
+		if (ofY && !ofY.match(/(visible|auto)/)) {
+			curCSS.overflowY = ofX;
+			newCSS.overflowY = "visible";
+		}
+
+		// save the current overflow settings - even if blank!
+		s.cssSaved = curCSS;
+
+		// apply new CSS to raise zIndex and, if necessary, make overflow 'visible'
+		$P.css( newCSS );
+
+		// make sure the zIndex of all other panes is normal
+		$.each(_c.allPanes, function(i, p) {
+			if (p != pane) resetOverflow(p);
+		});
+
+	};
+	/**
+	* @param {Object=}   [el]	(optional) Can also be 'bound' to a click, mouseOver, or other event
+	*/
+	function resetOverflow (el) {
+		if (!isInitialized()) return;
+		if (this && this.tagName) el = this; // BOUND to element
+		var $P;
+		if (isStr(el))
+			$P = $Ps[el];
+		else if ($(el).data("layoutRole"))
+			$P = $(el);
+		else
+			$(el).parents().each(function(){
+				if ($(this).data("layoutRole")) {
+					$P = $(this);
+					return false; // BREAK
+				}
+			});
+		if (!$P || !$P.length) return; // INVALID
+
+		var
+			pane	= $P.data("layoutEdge")
+		,	s		= state[pane]
+		,	CSS		= s.cssSaved || {}
+		;
+		// reset the zIndex
+		if (!s.isSliding && !s.isResizing)
+			$P.css("zIndex", options.zIndexes.pane_normal);
+
+		// reset Overflow - if necessary
+		$P.css( CSS );
+
+		// clear var
+		s.cssSaved = false;
+	};
+
+/*
+ * #####################
+ * CREATE/RETURN LAYOUT
+ * #####################
+ */
+
+	// validate that container exists
+	var $N = $(this).eq(0); // FIRST matching Container element
+	if (!$N.length) {
+		return _log( options.errors.containerMissing );
+	};
+
+	// Users retrieve Instance of a layout with: $N.layout() OR $N.data("layout")
+	// return the Instance-pointer if layout has already been initialized
+	if ($N.data("layoutContainer") && $N.data("layout"))
+		return $N.data("layout"); // cached pointer
+
+	// init global vars
+	var 
+		$Ps	= {}	// Panes x5		- set in initPanes()
+	,	$Cs	= {}	// Content x5	- set in initPanes()
+	,	$Rs	= {}	// Resizers x4	- set in initHandles()
+	,	$Ts	= {}	// Togglers x4	- set in initHandles()
+	,	$Ms	= $([])	// Masks - up to 2 masks per pane (IFRAME + DIV)
+	//	aliases for code brevity
+	,	sC	= state.container // alias for easy access to 'container dimensions'
+	,	sID	= state.id // alias for unique layout ID/namespace - eg: "layout435"
+	;
+
+	// create Instance object to expose data & option Properties, and primary action Methods
+	var Instance = {
+	//	layout data
+		options:			options			// property - options hash
+	,	state:				state			// property - dimensions hash
+	//	object pointers
+	,	container:			$N				// property - object pointers for layout container
+	,	panes:				$Ps				// property - object pointers for ALL Panes: panes.north, panes.center
+	,	contents:			$Cs				// property - object pointers for ALL Content: contents.north, contents.center
+	,	resizers:			$Rs				// property - object pointers for ALL Resizers, eg: resizers.north
+	,	togglers:			$Ts				// property - object pointers for ALL Togglers, eg: togglers.north
+	//	border-pane open/close
+	,	hide:				hide			// method - ditto
+	,	show:				show			// method - ditto
+	,	toggle:				toggle			// method - pass a 'pane' ("north", "west", etc)
+	,	open:				open			// method - ditto
+	,	close:				close			// method - ditto
+	,	slideOpen:			slideOpen		// method - ditto
+	,	slideClose:			slideClose		// method - ditto
+	,	slideToggle:		slideToggle		// method - ditto
+	//	pane actions
+	,	setSizeLimits:		setSizeLimits	// method - pass a 'pane' - update state min/max data
+	,	_sizePane:			sizePane		// method -intended for user by plugins only!
+	,	sizePane:			manualSizePane	// method - pass a 'pane' AND an 'outer-size' in pixels or percent, or 'auto'
+	,	sizeContent:		sizeContent		// method - pass a 'pane'
+	,	swapPanes:			swapPanes		// method - pass TWO 'panes' - will swap them
+	,	showMasks:			showMasks		// method - pass a 'pane' OR list of panes - default = all panes with mask option set
+	,	hideMasks:			hideMasks		// method - ditto'
+	//	pane element methods
+	,	initContent:		initContent		// method - ditto
+	,	addPane:			addPane			// method - pass a 'pane'
+	,	removePane:			removePane		// method - pass a 'pane' to remove from layout, add 'true' to delete the pane-elem
+	,	createChildren:		createChildren	// method - pass a 'pane' and (optional) layout-options (OVERRIDES options[pane].children
+	,	refreshChildren:	refreshChildren	// method - pass a 'pane' and a layout-instance
+	//	special pane option setting
+	,	enableClosable:		enableClosable	// method - pass a 'pane'
+	,	disableClosable:	disableClosable	// method - ditto
+	,	enableSlidable:		enableSlidable	// method - ditto
+	,	disableSlidable:	disableSlidable	// method - ditto
+	,	enableResizable:	enableResizable	// method - ditto
+	,	disableResizable:	disableResizable// method - ditto
+	//	utility methods for panes
+	,	allowOverflow:		allowOverflow	// utility - pass calling element (this)
+	,	resetOverflow:		resetOverflow	// utility - ditto
+	//	layout control
+	,	destroy:			destroy			// method - no parameters
+	,	initPanes:			isInitialized	// method - no parameters
+	,	resizeAll:			resizeAll		// method - no parameters
+	//	callback triggering
+	,	runCallbacks:		_runCallbacks	// method - pass evtName & pane (if a pane-event), eg: trigger("onopen", "west")
+	//	alias collections of options, state and children - created in addPane and extended elsewhere
+	,	hasParentLayout:	false			// set by initContainer()
+	,	children:			children		// pointers to child-layouts, eg: Instance.children.west.layoutName
+	,	north:				false			// alias group: { name: pane, pane: $Ps[pane], options: options[pane], state: state[pane], children: children[pane] }
+	,	south:				false			// ditto
+	,	west:				false			// ditto
+	,	east:				false			// ditto
+	,	center:				false			// ditto
+	};
+
+	// create the border layout NOW
+	if (_create() === 'cancel') // onload_start callback returned false to CANCEL layout creation
+		return null;
+	else // true OR false -- if layout-elements did NOT init (hidden or do not exist), can auto-init later
+		return Instance; // return the Instance object
+
+}
+
+
+})( jQuery );
+// END Layout - keep internal vars internal!
+
+
+
+// START Plugins - shared wrapper, no global vars
+(function ($) {
+
+
+/**
+ * jquery.layout.state 1.0
+ * $Date: 2011-07-16 08:00:00 (Sat, 16 July 2011) $
+ *
+ * Copyright (c) 2012 
+ *   Kevin Dalman (http://allpro.net)
+ *
+ * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
+ * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
+ *
+ * @requires: UI Layout 1.3.0.rc30.1 or higher
+ * @requires: $.ui.cookie (above)
+ *
+ * @see: http://groups.google.com/group/jquery-ui-layout
+ */
+/*
+ *	State-management options stored in options.stateManagement, which includes a .cookie hash
+ *	Default options saves ALL KEYS for ALL PANES, ie: pane.size, pane.isClosed, pane.isHidden
+ *
+ *	// STATE/COOKIE OPTIONS
+ *	@example $(el).layout({
+				stateManagement: {
+					enabled:	true
+				,	stateKeys:	"east.size,west.size,east.isClosed,west.isClosed"
+				,	cookie:		{ name: "appLayout", path: "/" }
+				}
+			})
+ *	@example $(el).layout({ stateManagement__enabled: true }) // enable auto-state-management using cookies
+ *	@example $(el).layout({ stateManagement__cookie: { name: "appLayout", path: "/" } })
+ *	@example $(el).layout({ stateManagement__cookie__name: "appLayout", stateManagement__cookie__path: "/" })
+ *
+ *	// STATE/COOKIE METHODS
+ *	@example myLayout.saveCookie( "west.isClosed,north.size,south.isHidden", {expires: 7} );
+ *	@example myLayout.loadCookie();
+ *	@example myLayout.deleteCookie();
+ *	@example var JSON = myLayout.readState();	// CURRENT Layout State
+ *	@example var JSON = myLayout.readCookie();	// SAVED Layout State (from cookie)
+ *	@example var JSON = myLayout.state.stateData;	// LAST LOADED Layout State (cookie saved in layout.state hash)
+ *
+ *	CUSTOM STATE-MANAGEMENT (eg, saved in a database)
+ *	@example var JSON = myLayout.readState( "west.isClosed,north.size,south.isHidden" );
+ *	@example myLayout.loadState( JSON );
+ */
+
+/**
+ *	UI COOKIE UTILITY
+ *
+ *	A $.cookie OR $.ui.cookie namespace *should be standard*, but until then...
+ *	This creates $.ui.cookie so Layout does not need the cookie.jquery.js plugin
+ *	NOTE: This utility is REQUIRED by the layout.state plugin
+ *
+ *	Cookie methods in Layout are created as part of State Management 
+ */
+if (!$.ui) $.ui = {};
+$.ui.cookie = {
+
+	// cookieEnabled is not in DOM specs, but DOES works in all browsers,including IE6
+	acceptsCookies: !!navigator.cookieEnabled
+
+,	read: function (name) {
+		var	c		= document.cookie
+		,	cs		= c ? c.split(';') : []
+		,	pair	// loop var
+		;
+		for (var i=0, n=cs.length; i < n; i++) {
+			pair = $.trim(cs[i]).split('='); // name=value pair
+			if (pair[0] == name) // found the layout cookie
+				return decodeURIComponent(pair[1]);
+		}
+		return null;
+	}
+
+,	write: function (name, val, cookieOpts) {
+		var	params	= ""
+		,	date	= ""
+		,	clear	= false
+		,	o		= cookieOpts || {}
+		,	x		= o.expires  || null
+		,	t		= $.type(x)
+		;
+		if (t === "date")
+			date = x;
+		else if (t === "string" && x > 0) {
+			x = parseInt(x,10);
+			t = "number";
+		}
+		if (t === "number") {
+			date = new Date();
+			if (x > 0)
+				date.setDate(date.getDate() + x);
+			else {
+				date.setFullYear(1970);
+				clear = true;
+			}
+		}
+		if (date)		params += ";expires="+ date.toUTCString();
+		if (o.path)		params += ";path="+ o.path;
+		if (o.domain)	params += ";domain="+ o.domain;
+		if (o.secure)	params += ";secure";
+		document.cookie = name +"="+ (clear ? "" : encodeURIComponent( val )) + params; // write or clear cookie
+	}
+
+,	clear: function (name) {
+		$.ui.cookie.write(name, "", {expires: -1});
+	}
+
+};
+// if cookie.jquery.js is not loaded, create an alias to replicate it
+// this may be useful to other plugins or code dependent on that plugin
+if (!$.cookie) $.cookie = function (k, v, o) {
+	var C = $.ui.cookie;
+	if (v === null)
+		C.clear(k);
+	else if (v === undefined)
+		return C.read(k);
+	else
+		C.write(k, v, o);
+};
+
+
+// tell Layout that the state plugin is available
+$.layout.plugins.stateManagement = true;
+
+//	Add State-Management options to layout.defaults
+$.layout.config.optionRootKeys.push("stateManagement");
+$.layout.defaults.stateManagement = {
+	enabled:		false	// true = enable state-management, even if not using cookies
+,	autoSave:		true	// Save a state-cookie when page exits?
+,	autoLoad:		true	// Load the state-cookie when Layout inits?
+,	animateLoad:	true	// animate panes when loading state into an active layout
+,	includeChildren: true	// recurse into child layouts to include their state as well
+	// List state-data to save - must be pane-specific
+,	stateKeys:	"north.size,south.size,east.size,west.size,"+
+				"north.isClosed,south.isClosed,east.isClosed,west.isClosed,"+
+				"north.isHidden,south.isHidden,east.isHidden,west.isHidden"
+,	cookie: {
+		name:	""	// If not specified, will use Layout.name, else just "Layout"
+	,	domain:	""	// blank = current domain
+	,	path:	""	// blank = current page, "/" = entire website
+	,	expires: ""	// 'days' to keep cookie - leave blank for 'session cookie'
+	,	secure:	false
+	}
+};
+// Set stateManagement as a layout-option, NOT a pane-option
+$.layout.optionsMap.layout.push("stateManagement");
+
+/*
+ *	State Management methods
+ */
+$.layout.state = {
+
+	/**
+	 * Get the current layout state and save it to a cookie
+	 *
+	 * myLayout.saveCookie( keys, cookieOpts )
+	 *
+	 * @param {Object}			inst
+	 * @param {(string|Array)=}	keys
+	 * @param {Object=}			cookieOpts
+	 */
+	saveCookie: function (inst, keys, cookieOpts) {
+		var o	= inst.options
+		,	sm	= o.stateManagement
+		,	oC	= $.extend(true, {}, sm.cookie, cookieOpts || null)
+		,	data = inst.state.stateData = inst.readState( keys || sm.stateKeys ) // read current panes-state
+		;
+		$.ui.cookie.write( oC.name || o.name || "Layout", $.layout.state.encodeJSON(data), oC );
+		return $.extend(true, {}, data); // return COPY of state.stateData data
+	}
+
+	/**
+	 * Remove the state cookie
+	 *
+	 * @param {Object}	inst
+	 */
+,	deleteCookie: function (inst) {
+		var o = inst.options;
+		$.ui.cookie.clear( o.stateManagement.cookie.name || o.name || "Layout" );
+	}
+
+	/**
+	 * Read & return data from the cookie - as JSON
+	 *
+	 * @param {Object}	inst
+	 */
+,	readCookie: function (inst) {
+		var o = inst.options;
+		var c = $.ui.cookie.read( o.stateManagement.cookie.name || o.name || "Layout" );
+		// convert cookie string back to a hash and return it
+		return c ? $.layout.state.decodeJSON(c) : {};
+	}
+
+	/**
+	 * Get data from the cookie and USE IT to loadState
+	 *
+	 * @param {Object}	inst
+	 */
+,	loadCookie: function (inst) {
+		var c = $.layout.state.readCookie(inst); // READ the cookie
+		if (c) {
+			inst.state.stateData = $.extend(true, {}, c); // SET state.stateData
+			inst.loadState(c); // LOAD the retrieved state
+		}
+		return c;
+	}
+
+	/**
+	 * Update layout options from the cookie, if one exists
+	 *
+	 * @param {Object}		inst
+	 * @param {Object=}		stateData
+	 * @param {boolean=}	animate
+	 */
+,	loadState: function (inst, data, opts) {
+		if (!$.isPlainObject( data ) || $.isEmptyObject( data )) return;
+
+		// normalize data & cache in the state object
+		data = inst.state.stateData = $.layout.transformData( data ); // panes = default subkey
+
+		// add missing/default state-restore options
+		var smo = inst.options.stateManagement;
+		opts = $.extend({
+			animateLoad:		false //smo.animateLoad
+		,	includeChildren:	smo.includeChildren
+		}, opts );
+
+		if (!inst.state.initialized) {
+			/*
+			 *	layout NOT initialized, so just update its options
+			 */
+			// MUST remove pane.children keys before applying to options
+			// use a copy so we don't remove keys from original data
+			var o = $.extend(true, {}, data);
+			//delete o.center; // center has no state-data - only children
+			$.each($.layout.config.allPanes, function (idx, pane) {
+				if (o[pane]) delete o[pane].children;		   
+			 });
+			// update CURRENT layout-options with saved state data
+			$.extend(true, inst.options, o);
+		}
+		else {
+			/*
+			 *	layout already initialized, so modify layout's configuration
+			 */
+			var noAnimate = !opts.animateLoad
+			,	o, c, h, state, open
+			;
+			$.each($.layout.config.borderPanes, function (idx, pane) {
+				o = data[ pane ];
+				if (!$.isPlainObject( o )) return; // no key, skip pane
+
+				s	= o.size;
+				c	= o.initClosed;
+				h	= o.initHidden;
+				ar	= o.autoResize
+				state	= inst.state[pane];
+				open	= state.isVisible;
+
+				// reset autoResize
+				if (ar)
+					state.autoResize = ar;
+				// resize BEFORE opening
+				if (!open)
+					inst._sizePane(pane, s, false, false, false); // false=skipCallback/noAnimation/forceResize
+				// open/close as necessary - DO NOT CHANGE THIS ORDER!
+				if (h === true)			inst.hide(pane, noAnimate);
+				else if (c === true)	inst.close(pane, false, noAnimate);
+				else if (c === false)	inst.open (pane, false, noAnimate);
+				else if (h === false)	inst.show (pane, false, noAnimate);
+				// resize AFTER any other actions
+				if (open)
+					inst._sizePane(pane, s, false, false, noAnimate); // animate resize if option passed
+			});
+
+			/*
+			 *	RECURSE INTO CHILD-LAYOUTS
+			 */
+			if (opts.includeChildren) {
+				var paneStateChildren, childState;
+				$.each(inst.children, function (pane, paneChildren) {
+					paneStateChildren = data[pane] ? data[pane].children : 0;
+					if (paneStateChildren && paneChildren) {
+						$.each(paneChildren, function (stateKey, child) {
+							childState = paneStateChildren[stateKey];
+							if (child && childState)
+								child.loadState( childState );
+						});
+					}
+				});
+			}
+		}
+	}
+
+	/**
+	 * Get the *current layout state* and return it as a hash
+	 *
+	 * @param {Object=}		inst	// Layout instance to get state for
+	 * @param {object=}		[opts]	// State-Managements override options
+	 */
+,	readState: function (inst, opts) {
+		// backward compatility
+		if ($.type(opts) === 'string') opts = { keys: opts };
+		if (!opts) opts = {};
+		var	sm		= inst.options.stateManagement
+		,	ic		= opts.includeChildren
+		,	recurse	= ic !== undefined ? ic : sm.includeChildren
+		,	keys	= opts.stateKeys || sm.stateKeys
+		,	alt		= { isClosed: 'initClosed', isHidden: 'initHidden' }
+		,	state	= inst.state
+		,	panes	= $.layout.config.allPanes
+		,	data	= {}
+		,	pair, pane, key, val
+		,	ps, pC, child, array, count, branch
+		;
+		if ($.isArray(keys)) keys = keys.join(",");
+		// convert keys to an array and change delimiters from '__' to '.'
+		keys = keys.replace(/__/g, ".").split(',');
+		// loop keys and create a data hash
+		for (var i=0, n=keys.length; i < n; i++) {
+			pair = keys[i].split(".");
+			pane = pair[0];
+			key  = pair[1];
+			if ($.inArray(pane, panes) < 0) continue; // bad pane!
+			val = state[ pane ][ key ];
+			if (val == undefined) continue;
+			if (key=="isClosed" && state[pane]["isSliding"])
+				val = true; // if sliding, then *really* isClosed
+			( data[pane] || (data[pane]={}) )[ alt[key] ? alt[key] : key ] = val;
+		}
+
+		// recurse into the child-layouts for each pane
+		if (recurse) {
+			$.each(panes, function (idx, pane) {
+				pC = inst.children[pane];
+				ps = state.stateData[pane];
+				if ($.isPlainObject( pC ) && !$.isEmptyObject( pC )) {
+					// ensure a key exists for this 'pane', eg: branch = data.center
+					branch = data[pane] || (data[pane] = {});
+					if (!branch.children) branch.children = {};
+					$.each( pC, function (key, child) {
+						// ONLY read state from an initialize layout
+						if ( child.state.initialized )
+							branch.children[ key ] = $.layout.state.readState( child );
+						// if we have PREVIOUS (onLoad) state for this child-layout, KEEP IT!
+						else if ( ps && ps.children && ps.children[ key ] ) {
+							branch.children[ key ] = $.extend(true, {}, ps.children[ key ] );
+						}
+					});
+				}
+			});
+		}
+
+		return data;
+	}
+
+	/**
+	 *	Stringify a JSON hash so can save in a cookie or db-field
+	 */
+,	encodeJSON: function (JSON) {
+		return parse(JSON);
+		function parse (h) {
+			var D=[], i=0, k, v, t // k = key, v = value
+			,	a = $.isArray(h)
+			;
+			for (k in h) {
+				v = h[k];
+				t = typeof v;
+				if (t == 'string')		// STRING - add quotes
+					v = '"'+ v +'"';
+				else if (t == 'object')	// SUB-KEY - recurse into it
+					v = parse(v);
+				D[i++] = (!a ? '"'+ k +'":' : '') + v;
+			}
+			return (a ? '[' : '{') + D.join(',') + (a ? ']' : '}');
+		};
+	}
+
+	/**
+	 *	Convert stringified JSON back to a hash object
+	 *	@see		$.parseJSON(), adding in jQuery 1.4.1
+	 */
+,	decodeJSON: function (str) {
+		try { return $.parseJSON ? $.parseJSON(str) : window["eval"]("("+ str +")") || {}; }
+		catch (e) { return {}; }
+	}
+
+
+,	_create: function (inst) {
+		var _	= $.layout.state
+		,	o	= inst.options
+		,	sm	= o.stateManagement
+		;
+		//	ADD State-Management plugin methods to inst
+		 $.extend( inst, {
+		//	readCookie - update options from cookie - returns hash of cookie data
+			readCookie:		function () { return _.readCookie(inst); }
+		//	deleteCookie
+		,	deleteCookie:	function () { _.deleteCookie(inst); }
+		//	saveCookie - optionally pass keys-list and cookie-options (hash)
+		,	saveCookie:		function (keys, cookieOpts) { return _.saveCookie(inst, keys, cookieOpts); }
+		//	loadCookie - readCookie and use to loadState() - returns hash of cookie data
+		,	loadCookie:		function () { return _.loadCookie(inst); }
+		//	loadState - pass a hash of state to use to update options
+		,	loadState:		function (stateData, opts) { _.loadState(inst, stateData, opts); }
+		//	readState - returns hash of current layout-state
+		,	readState:		function (keys) { return _.readState(inst, keys); }
+		//	add JSON utility methods too...
+		,	encodeJSON:		_.encodeJSON
+		,	decodeJSON:		_.decodeJSON
+		});
+
+		// init state.stateData key, even if plugin is initially disabled
+		inst.state.stateData = {};
+
+		// autoLoad MUST BE one of: data-array, data-hash, callback-function, or TRUE
+		if ( !sm.autoLoad ) return;
+
+		//	When state-data exists in the autoLoad key USE IT,
+		//	even if stateManagement.enabled == false
+		if ($.isPlainObject( sm.autoLoad )) {
+			if (!$.isEmptyObject( sm.autoLoad )) {
+				inst.loadState( sm.autoLoad );
+			}
+		}
+		else if ( sm.enabled ) {
+			// update the options from cookie or callback
+			// if options is a function, call it to get stateData
+			if ($.isFunction( sm.autoLoad )) {
+				var d = {};
+				try {
+					d = sm.autoLoad( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
+				} catch (e) {}
+				if (d && $.isPlainObject( d ) && !$.isEmptyObject( d ))
+					inst.loadState(d);
+			}
+			else // any other truthy value will trigger loadCookie
+				inst.loadCookie();
+		}
+	}
+
+,	_unload: function (inst) {
+		var sm = inst.options.stateManagement;
+		if (sm.enabled && sm.autoSave) {
+			// if options is a function, call it to save the stateData
+			if ($.isFunction( sm.autoSave )) {
+				try {
+					sm.autoSave( inst, inst.state, inst.options, inst.options.name || '' ); // try to get data from fn
+				} catch (e) {}
+			}
+			else // any truthy value will trigger saveCookie
+				inst.saveCookie();
+		}
+	}
+
+};
+
+// add state initialization method to Layout's onCreate array of functions
+$.layout.onCreate.push( $.layout.state._create );
+$.layout.onUnload.push( $.layout.state._unload );
+
+
+
+
+/**
+ * jquery.layout.buttons 1.0
+ * $Date: 2011-07-16 08:00:00 (Sat, 16 July 2011) $
+ *
+ * Copyright (c) 2012 
+ *   Kevin Dalman (http://allpro.net)
+ *
+ * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
+ * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
+ *
+ * @requires: UI Layout 1.3.0.rc30.1 or higher
+ *
+ * @see: http://groups.google.com/group/jquery-ui-layout
+ *
+ * Docs: [ to come ]
+ * Tips: [ to come ]
+ */
+
+// tell Layout that the state plugin is available
+$.layout.plugins.buttons = true;
+
+//	Add buttons options to layout.defaults
+$.layout.defaults.autoBindCustomButtons = false;
+// Specify autoBindCustomButtons as a layout-option, NOT a pane-option
+$.layout.optionsMap.layout.push("autoBindCustomButtons");
+
+/*
+ *	Button methods
+ */
+$.layout.buttons = {
+
+	/**
+	* Searches for .ui-layout-button-xxx elements and auto-binds them as layout-buttons
+	*
+	* @see  _create()
+	*
+	* @param  {Object}		inst	Layout Instance object
+	*/
+	init: function (inst) {
+		var pre		= "ui-layout-button-"
+		,	layout	= inst.options.name || ""
+		,	name;
+		$.each("toggle,open,close,pin,toggle-slide,open-slide".split(","), function (i, action) {
+			$.each($.layout.config.borderPanes, function (ii, pane) {
+				$("."+pre+action+"-"+pane).each(function(){
+					// if button was previously 'bound', data.layoutName was set, but is blank if layout has no 'name'
+					name = $(this).data("layoutName") || $(this).attr("layoutName");
+					if (name == undefined || name === layout)
+						inst.bindButton(this, action, pane);
+				});
+			});
+		});
+	}
+
+	/**
+	* Helper function to validate params received by addButton utilities
+	*
+	* Two classes are added to the element, based on the buttonClass...
+	* The type of button is appended to create the 2nd className:
+	*  - ui-layout-button-pin		// action btnClass
+	*  - ui-layout-button-pin-west	// action btnClass + pane
+	*  - ui-layout-button-toggle
+	*  - ui-layout-button-open
+	*  - ui-layout-button-close
+	*
+	* @param {Object}			inst		Layout Instance object
+	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
+	* @param {string}   		pane 		Name of the pane the button is for: 'north', 'south', etc.
+	*
+	* @return {Array.<Object>}	If both params valid, the element matching 'selector' in a jQuery wrapper - otherwise returns null
+	*/
+,	get: function (inst, selector, pane, action) {
+		var $E	= $(selector)
+		,	o	= inst.options
+		,	err	= o.errors.addButtonError
+		;
+		if (!$E.length) { // element not found
+			$.layout.msg(err +" "+ o.errors.selector +": "+ selector, true);
+		}
+		else if ($.inArray(pane, $.layout.config.borderPanes) < 0) { // invalid 'pane' sepecified
+			$.layout.msg(err +" "+ o.errors.pane +": "+ pane, true);
+			$E = $("");  // NO BUTTON
+		}
+		else { // VALID
+			var btn = o[pane].buttonClass +"-"+ action;
+			$E	.addClass( btn +" "+ btn +"-"+ pane )
+				.data("layoutName", o.name); // add layout identifier - even if blank!
+		}
+		return $E;
+	}
+
+
+	/**
+	* NEW syntax for binding layout-buttons - will eventually replace addToggle, addOpen, etc.
+	*
+	* @param {Object}			inst		Layout Instance object
+	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
+	* @param {string}			action
+	* @param {string}			pane
+	*/
+,	bind: function (inst, selector, action, pane) {
+		var _ = $.layout.buttons;
+		switch (action.toLowerCase()) {
+			case "toggle":			_.addToggle	(inst, selector, pane); break;	
+			case "open":			_.addOpen	(inst, selector, pane); break;
+			case "close":			_.addClose	(inst, selector, pane); break;
+			case "pin":				_.addPin	(inst, selector, pane); break;
+			case "toggle-slide":	_.addToggle	(inst, selector, pane, true); break;	
+			case "open-slide":		_.addOpen	(inst, selector, pane, true); break;
+		}
+		return inst;
+	}
+
+	/**
+	* Add a custom Toggler button for a pane
+	*
+	* @param {Object}			inst		Layout Instance object
+	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
+	* @param {string}  			pane 		Name of the pane the button is for: 'north', 'south', etc.
+	* @param {boolean=}			slide 		true = slide-open, false = pin-open
+	*/
+,	addToggle: function (inst, selector, pane, slide) {
+		$.layout.buttons.get(inst, selector, pane, "toggle")
+			.click(function(evt){
+				inst.toggle(pane, !!slide);
+				evt.stopPropagation();
+			});
+		return inst;
+	}
+
+	/**
+	* Add a custom Open button for a pane
+	*
+	* @param {Object}			inst		Layout Instance object
+	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
+	* @param {string}			pane 		Name of the pane the button is for: 'north', 'south', etc.
+	* @param {boolean=}			slide 		true = slide-open, false = pin-open
+	*/
+,	addOpen: function (inst, selector, pane, slide) {
+		$.layout.buttons.get(inst, selector, pane, "open")
+			.attr("title", inst.options[pane].tips.Open)
+			.click(function (evt) {
+				inst.open(pane, !!slide);
+				evt.stopPropagation();
+			});
+		return inst;
+	}
+
+	/**
+	* Add a custom Close button for a pane
+	*
+	* @param {Object}			inst		Layout Instance object
+	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
+	* @param {string}   		pane 		Name of the pane the button is for: 'north', 'south', etc.
+	*/
+,	addClose: function (inst, selector, pane) {
+		$.layout.buttons.get(inst, selector, pane, "close")
+			.attr("title", inst.options[pane].tips.Close)
+			.click(function (evt) {
+				inst.close(pane);
+				evt.stopPropagation();
+			});
+		return inst;
+	}
+
+	/**
+	* Add a custom Pin button for a pane
+	*
+	* Four classes are added to the element, based on the paneClass for the associated pane...
+	* Assuming the default paneClass and the pin is 'up', these classes are added for a west-pane pin:
+	*  - ui-layout-pane-pin
+	*  - ui-layout-pane-west-pin
+	*  - ui-layout-pane-pin-up
+	*  - ui-layout-pane-west-pin-up
+	*
+	* @param {Object}			inst		Layout Instance object
+	* @param {(string|!Object)}	selector	jQuery selector (or element) for button, eg: ".ui-layout-north .toggle-button"
+	* @param {string}   		pane 		Name of the pane the pin is for: 'north', 'south', etc.
+	*/
+,	addPin: function (inst, selector, pane) {
+		var	_	= $.layout.buttons
+		,	$E	= _.get(inst, selector, pane, "pin");
+		if ($E.length) {
+			var s = inst.state[pane];
+			$E.click(function (evt) {
+				_.setPinState(inst, $(this), pane, (s.isSliding || s.isClosed));
+				if (s.isSliding || s.isClosed) inst.open( pane ); // change from sliding to open
+				else inst.close( pane ); // slide-closed
+				evt.stopPropagation();
+			});
+			// add up/down pin attributes and classes
+			_.setPinState(inst, $E, pane, (!s.isClosed && !s.isSliding));
+			// add this pin to the pane data so we can 'sync it' automatically
+			// PANE.pins key is an array so we can store multiple pins for each pane
+			s.pins.push( selector ); // just save the selector string
+		}
+		return inst;
+	}
+
+	/**
+	* Change the class of the pin button to make it look 'up' or 'down'
+	*
+	* @see  addPin(), syncPins()
+	*
+	* @param {Object}			inst	Layout Instance object
+	* @param {Array.<Object>}	$Pin	The pin-span element in a jQuery wrapper
+	* @param {string}			pane	These are the params returned to callbacks by layout()
+	* @param {boolean}			doPin	true = set the pin 'down', false = set it 'up'
+	*/
+,	setPinState: function (inst, $Pin, pane, doPin) {
+		var updown = $Pin.attr("pin");
+		if (updown && doPin === (updown=="down")) return; // already in correct state
+		var
+			o		= inst.options[pane]
+		,	pin		= o.buttonClass +"-pin"
+		,	side	= pin +"-"+ pane
+		,	UP		= pin +"-up "+	side +"-up"
+		,	DN		= pin +"-down "+side +"-down"
+		;
+		$Pin
+			.attr("pin", doPin ? "down" : "up") // logic
+			.attr("title", doPin ? o.tips.Unpin : o.tips.Pin)
+			.removeClass( doPin ? UP : DN ) 
+			.addClass( doPin ? DN : UP ) 
+		;
+	}
+
+	/**
+	* INTERNAL function to sync 'pin buttons' when pane is opened or closed
+	* Unpinned means the pane is 'sliding' - ie, over-top of the adjacent panes
+	*
+	* @see  open(), close()
+	*
+	* @param {Object}			inst	Layout Instance object
+	* @param {string}	pane	These are the params returned to callbacks by layout()
+	* @param {boolean}	doPin	True means set the pin 'down', False means 'up'
+	*/
+,	syncPinBtns: function (inst, pane, doPin) {
+		// REAL METHOD IS _INSIDE_ LAYOUT - THIS IS HERE JUST FOR REFERENCE
+		$.each(inst.state[pane].pins, function (i, selector) {
+			$.layout.buttons.setPinState(inst, $(selector), pane, doPin);
+		});
+	}
+
+
+,	_load: function (inst) {
+		var	_	= $.layout.buttons;
+		// ADD Button methods to Layout Instance
+		// Note: sel = jQuery Selector string
+		$.extend( inst, {
+			bindButton:		function (sel, action, pane) { return _.bind(inst, sel, action, pane); }
+		//	DEPRECATED METHODS
+		,	addToggleBtn:	function (sel, pane, slide) { return _.addToggle(inst, sel, pane, slide); }
+		,	addOpenBtn:		function (sel, pane, slide) { return _.addOpen(inst, sel, pane, slide); }
+		,	addCloseBtn:	function (sel, pane) { return _.addClose(inst, sel, pane); }
+		,	addPinBtn:		function (sel, pane) { return _.addPin(inst, sel, pane); }
+		});
+
+		// init state array to hold pin-buttons
+		for (var i=0; i<4; i++) {
+			var pane = $.layout.config.borderPanes[i];
+			inst.state[pane].pins = [];
+		}
+
+		// auto-init buttons onLoad if option is enabled
+		if ( inst.options.autoBindCustomButtons )
+			_.init(inst);
+	}
+
+,	_unload: function (inst) {
+		// TODO: unbind all buttons???
+	}
+
+};
+
+// add initialization method to Layout's onLoad array of functions
+$.layout.onLoad.push(  $.layout.buttons._load );
+//$.layout.onUnload.push( $.layout.buttons._unload );
+
+
+
+/**
+ * jquery.layout.browserZoom 1.0
+ * $Date: 2011-12-29 08:00:00 (Thu, 29 Dec 2011) $
+ *
+ * Copyright (c) 2012 
+ *   Kevin Dalman (http://allpro.net)
+ *
+ * Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
+ * and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
+ *
+ * @requires: UI Layout 1.3.0.rc30.1 or higher
+ *
+ * @see: http://groups.google.com/group/jquery-ui-layout
+ *
+ * TODO: Extend logic to handle other problematic zooming in browsers
+ * TODO: Add hotkey/mousewheel bindings to _instantly_ respond to these zoom event
+ */
+
+// tell Layout that the plugin is available
+$.layout.plugins.browserZoom = true;
+
+$.layout.defaults.browserZoomCheckInterval = 1000;
+$.layout.optionsMap.layout.push("browserZoomCheckInterval");
+
+/*
+ *	browserZoom methods
+ */
+$.layout.browserZoom = {
+
+	_init: function (inst) {
+		// abort if browser does not need this check
+		if ($.layout.browserZoom.ratio() !== false)
+			$.layout.browserZoom._setTimer(inst);
+	}
+
+,	_setTimer: function (inst) {
+		// abort if layout destroyed or browser does not need this check
+		if (inst.destroyed) return;
+		var o	= inst.options
+		,	s	= inst.state
+		//	don't need check if inst has parentLayout, but check occassionally in case parent destroyed!
+		//	MINIMUM 100ms interval, for performance
+		,	ms	= inst.hasParentLayout ?  5000 : Math.max( o.browserZoomCheckInterval, 100 )
+		;
+		// set the timer
+		setTimeout(function(){
+			if (inst.destroyed || !o.resizeWithWindow) return;
+			var d = $.layout.browserZoom.ratio();
+			if (d !== s.browserZoom) {
+				s.browserZoom = d;
+				inst.resizeAll();
+			}
+			// set a NEW timeout
+			$.layout.browserZoom._setTimer(inst);
+		}
+		,	ms );
+	}
+
+,	ratio: function () {
+		var w	= window
+		,	s	= screen
+		,	d	= document
+		,	dE	= d.documentElement || d.body
+		,	b	= $.layout.browser
+		,	v	= b.version
+		,	r, sW, cW
+		;
+		// we can ignore all browsers that fire window.resize event onZoom
+		if ((b.msie && v > 8)
+		||	!b.msie
+		) return false; // don't need to track zoom
+
+		if (s.deviceXDPI && s.systemXDPI) // syntax compiler hack
+			return calc(s.deviceXDPI, s.systemXDPI);
+		// everything below is just for future reference!
+		if (b.webkit && (r = d.body.getBoundingClientRect))
+			return calc((r.left - r.right), d.body.offsetWidth);
+		if (b.webkit && (sW = w.outerWidth))
+			return calc(sW, w.innerWidth);
+		if ((sW = s.width) && (cW = dE.clientWidth))
+			return calc(sW, cW);
+		return false; // no match, so cannot - or don't need to - track zoom
+
+		function calc (x,y) { return (parseInt(x,10) / parseInt(y,10) * 100).toFixed(); }
+	}
+
+};
+// add initialization method to Layout's onLoad array of functions
+$.layout.onReady.push( $.layout.browserZoom._init );
+
+
 })( jQuery );
\ No newline at end of file
diff --git a/js/jquery.layout.min.js b/js/jquery.layout.min.js
index 161d53617..3f0dfea40 100755
--- a/js/jquery.layout.min.js
+++ b/js/jquery.layout.min.js
@@ -1,142 +1,142 @@
-/*
- jquery.layout 1.3.0 - Release Candidate 30.79
- $Date: 2013-01-01 08:00:00 (Tue, 1 Jan 2013) $
- $Rev: 303007 $
-
- Copyright (c) 2013 Kevin Dalman (http://allpro.net)
- Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
-
- Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
- and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
-
- SEE: http://layout.jquery-dev.net/LICENSE.txt
-
- Changelog: http://layout.jquery-dev.net/changelog.cfm#1.3.0.rc30.79
-
- Docs: http://layout.jquery-dev.net/documentation.html
- Tips: http://layout.jquery-dev.net/tips.html
- Help: http://groups.google.com/group/jquery-ui-layout
-*/
-(function(b){var a=Math.min,d=Math.max,c=Math.floor,f=function(a){return"string"===b.type(a)},j=function(a,d){if(b.isArray(d))for(var c=0,j=d.length;c<j;c++){var h=d[c];try{f(h)&&(h=eval(h)),b.isFunction(h)&&h(a)}catch(k){}}};b.layout={version:"1.3.rc30.79",revision:0.033007,browser:{},effects:{slide:{all:{duration:"fast"},north:{direction:"up"},south:{direction:"down"},east:{direction:"right"},west:{direction:"left"}},drop:{all:{duration:"slow"},north:{direction:"up"},south:{direction:"down"},east:{direction:"right"},
-west:{direction:"left"}},scale:{all:{duration:"fast"}},blind:{},clip:{},explode:{},fade:{},fold:{},puff:{},size:{all:{easing:"swing"}}},config:{optionRootKeys:"effects panes north south west east center".split(" "),allPanes:["north","south","west","east","center"],borderPanes:["north","south","west","east"],oppositeEdge:{north:"south",south:"north",east:"west",west:"east"},offscreenCSS:{left:"-99999px",right:"auto"},offscreenReset:"offscreenReset",hidden:{visibility:"hidden"},visible:{visibility:"visible"},
-resizers:{cssReq:{position:"absolute",padding:0,margin:0,fontSize:"1px",textAlign:"left",overflow:"hidden"},cssDemo:{background:"#DDD",border:"none"}},togglers:{cssReq:{position:"absolute",display:"block",padding:0,margin:0,overflow:"hidden",textAlign:"center",fontSize:"1px",cursor:"pointer",zIndex:1},cssDemo:{background:"#AAA"}},content:{cssReq:{position:"relative"},cssDemo:{overflow:"auto",padding:"10px"},cssDemoPane:{overflow:"hidden",padding:0}},panes:{cssReq:{position:"absolute",margin:0},cssDemo:{padding:"10px",
-background:"#FFF",border:"1px solid #BBB",overflow:"auto"}},north:{side:"top",sizeType:"Height",dir:"horz",cssReq:{top:0,bottom:"auto",left:0,right:0,width:"auto"}},south:{side:"bottom",sizeType:"Height",dir:"horz",cssReq:{top:"auto",bottom:0,left:0,right:0,width:"auto"}},east:{side:"right",sizeType:"Width",dir:"vert",cssReq:{left:"auto",right:0,top:"auto",bottom:"auto",height:"auto"}},west:{side:"left",sizeType:"Width",dir:"vert",cssReq:{left:0,right:"auto",top:"auto",bottom:"auto",height:"auto"}},
-center:{dir:"center",cssReq:{left:"auto",right:"auto",top:"auto",bottom:"auto",height:"auto",width:"auto"}}},callbacks:{},getParentPaneElem:function(a){a=b(a);if(a=a.data("layout")||a.data("parentLayout")){a=a.container;if(a.data("layoutPane"))return a;a=a.closest("."+b.layout.defaults.panes.paneClass);if(a.data("layoutPane"))return a}return null},getParentPaneInstance:function(a){return(a=b.layout.getParentPaneElem(a))?a.data("layoutPane"):null},getParentLayoutInstance:function(a){return(a=b.layout.getParentPaneElem(a))?
-a.data("parentLayout"):null},getEventObject:function(b){return"object"===typeof b&&b.stopPropagation?b:null},parsePaneName:function(a){var d=b.layout.getEventObject(a);d&&(d.stopPropagation(),a=b(this).data("layoutEdge"));a&&!/^(west|east|north|south|center)$/.test(a)&&(b.layout.msg('LAYOUT ERROR - Invalid pane-name: "'+a+'"'),a="error");return a},plugins:{draggable:!!b.fn.draggable,effects:{core:!!b.effects,slide:b.effects&&(b.effects.slide||b.effects.effect&&b.effects.effect.slide)}},onCreate:[],
-onLoad:[],onReady:[],onDestroy:[],onUnload:[],afterOpen:[],afterClose:[],scrollbarWidth:function(){return window.scrollbarWidth||b.layout.getScrollbarSize("width")},scrollbarHeight:function(){return window.scrollbarHeight||b.layout.getScrollbarSize("height")},getScrollbarSize:function(a){var d=b('<div style="position: absolute; top: -10000px; left: -10000px; width: 100px; height: 100px; overflow: scroll;"></div>').appendTo("body"),c={width:d.css("width")-d[0].clientWidth,height:d.height()-d[0].clientHeight};
-d.remove();window.scrollbarWidth=c.width;window.scrollbarHeight=c.height;return a.match(/^(width|height)$/)?c[a]:c},showInvisibly:function(b,a){if(b&&b.length&&(a||"none"===b.css("display"))){var d=b[0].style,d={display:d.display||"",visibility:d.visibility||""};b.css({display:"block",visibility:"hidden"});return d}return{}},getElementDimensions:function(a,c){var f={css:{},inset:{}},j=f.css,h={bottom:0},k=b.layout.cssNum,p=a.offset(),O,R,D;f.offsetLeft=p.left;f.offsetTop=p.top;c||(c={});b.each(["Left",
-"Right","Top","Bottom"],function(d,k){O=j["border"+k]=b.layout.borderWidth(a,k);R=j["padding"+k]=b.layout.cssNum(a,"padding"+k);D=k.toLowerCase();f.inset[D]=0<=c[D]?c[D]:R;h[D]=f.inset[D]+O});j.width=a.width();j.height=a.height();j.top=k(a,"top",!0);j.bottom=k(a,"bottom",!0);j.left=k(a,"left",!0);j.right=k(a,"right",!0);f.outerWidth=a.outerWidth();f.outerHeight=a.outerHeight();f.innerWidth=d(0,f.outerWidth-h.left-h.right);f.innerHeight=d(0,f.outerHeight-h.top-h.bottom);f.layoutWidth=a.innerWidth();
-f.layoutHeight=a.innerHeight();return f},getElementStyles:function(b,a){var d={},c=b[0].style,f=a.split(","),k=["Top","Bottom","Left","Right"],j=["Color","Style","Width"],h,p,D,x,A,r;for(x=0;x<f.length;x++)if(h=f[x],h.match(/(border|padding|margin)$/))for(A=0;4>A;A++)if(p=k[A],"border"===h)for(r=0;3>r;r++)D=j[r],d[h+p+D]=c[h+p+D];else d[h+p]=c[h+p];else d[h]=c[h];return d},cssWidth:function(a,c){if(0>=c)return 0;var f=!b.layout.browser.boxModel?"border-box":b.support.boxSizing?a.css("boxSizing"):
-"content-box",j=b.layout.borderWidth,h=b.layout.cssNum,k=c;"border-box"!==f&&(k-=j(a,"Left")+j(a,"Right"));"content-box"===f&&(k-=h(a,"paddingLeft")+h(a,"paddingRight"));return d(0,k)},cssHeight:function(a,c){if(0>=c)return 0;var f=!b.layout.browser.boxModel?"border-box":b.support.boxSizing?a.css("boxSizing"):"content-box",j=b.layout.borderWidth,h=b.layout.cssNum,k=c;"border-box"!==f&&(k-=j(a,"Top")+j(a,"Bottom"));"content-box"===f&&(k-=h(a,"paddingTop")+h(a,"paddingBottom"));return d(0,k)},cssNum:function(a,
-d,c){a.jquery||(a=b(a));var f=b.layout.showInvisibly(a);d=b.css(a[0],d,!0);c=c&&"auto"==d?d:Math.round(parseFloat(d)||0);a.css(f);return c},borderWidth:function(a,d){a.jquery&&(a=a[0]);var c="border"+d.substr(0,1).toUpperCase()+d.substr(1);return"none"===b.css(a,c+"Style",!0)?0:Math.round(parseFloat(b.css(a,c+"Width",!0))||0)},isMouseOverElem:function(a,d){var c=b(d||this),f=c.offset(),j=f.top,f=f.left,k=f+c.outerWidth(),c=j+c.outerHeight(),h=a.pageX,p=a.pageY;return b.layout.browser.msie&&0>h&&0>
-p||h>=f&&h<=k&&p>=j&&p<=c},msg:function(a,d,c,f){b.isPlainObject(a)&&window.debugData?("string"===typeof d?(f=c,c=d):"object"===typeof c&&(f=c,c=null),c=c||"log( <object> )",f=b.extend({sort:!1,returnHTML:!1,display:!1},f),!0===d||f.display?debugData(a,c,f):window.console&&console.log(debugData(a,c,f))):d?alert(a):window.console?console.log(a):(d=b("#layoutLogger"),d.length||(d=b('<div id="layoutLogger" style="position: '+(b.support.fixedPosition?"fixed":"absolute")+'; top: 5px; z-index: 999999; max-width: 25%; overflow: hidden; border: 1px solid #000; border-radius: 5px; background: #FBFBFB; box-shadow: 0 2px 10px rgba(0,0,0,0.3);"><div style="font-size: 13px; font-weight: bold; padding: 5px 10px; background: #F6F6F6; border-radius: 5px 5px 0 0; cursor: move;"><span style="float: right; padding-left: 7px; cursor: pointer;" title="Remove Console" onclick="$(this).closest(\'#layoutLogger\').remove()">X</span>Layout console.log</div><ul style="font-size: 13px; font-weight: none; list-style: none; margin: 0; padding: 0 0 2px;"></ul></div>').appendTo("body"),
-d.css("left",b(window).width()-d.outerWidth()-5),b.ui.draggable&&d.draggable({handle:":first-child"})),d.children("ul").append('<li style="padding: 4px 10px; margin: 0; border-top: 1px solid #CCC;">'+a.replace(/\</g,"&lt;").replace(/\>/g,"&gt;")+"</li>"))}};var h=navigator.userAgent.toLowerCase(),p=/(chrome)[ \/]([\w.]+)/.exec(h)||/(webkit)[ \/]([\w.]+)/.exec(h)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(h)||/(msie) ([\w.]+)/.exec(h)||0>h.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(h)||
-[],h=p[1]||"",p=p[2]||0,x="msie"===h;b.layout.browser={version:p,safari:"webkit"===h,webkit:"chrome"===h,msie:x,isIE6:x&&6==p,boxModel:!x||!1!==b.support.boxModel};h&&(b.layout.browser[h]=!0);x&&b(function(){b.layout.browser.boxModel=b.support.boxModel});b.layout.defaults={name:"",containerClass:"ui-layout-container",inset:null,scrollToBookmarkOnLoad:!0,resizeWithWindow:!0,resizeWithWindowDelay:200,resizeWithWindowMaxDelay:0,maskPanesEarly:!1,onresizeall_start:null,onresizeall_end:null,onload_start:null,
-onload_end:null,onunload_start:null,onunload_end:null,initPanes:!0,showErrorMessages:!0,showDebugMessages:!1,zIndex:null,zIndexes:{pane_normal:0,content_mask:1,resizer_normal:2,pane_sliding:100,pane_animate:1E3,resizer_drag:1E4},errors:{pane:"pane",selector:"selector",addButtonError:"Error Adding Button\nInvalid ",containerMissing:"UI Layout Initialization Error\nThe specified layout-container does not exist.",centerPaneMissing:"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element.",
-noContainerHeight:"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!",callbackError:"UI Layout Callback Error\nThe EVENT callback is not a valid function."},panes:{applyDemoStyles:!1,closable:!0,resizable:!0,slidable:!0,initClosed:!1,initHidden:!1,contentSelector:".ui-layout-content",contentIgnoreSelector:".ui-layout-ignore",findNestedContent:!1,paneClass:"ui-layout-pane",resizerClass:"ui-layout-resizer",togglerClass:"ui-layout-toggler",
-buttonClass:"ui-layout-button",minSize:0,maxSize:0,spacing_open:6,spacing_closed:6,togglerLength_open:50,togglerLength_closed:50,togglerAlign_open:"center",togglerAlign_closed:"center",togglerContent_open:"",togglerContent_closed:"",resizerDblClickToggle:!0,autoResize:!0,autoReopen:!0,resizerDragOpacity:1,maskContents:!1,maskObjects:!1,maskZindex:null,resizingGrid:!1,livePaneResizing:!1,liveContentResizing:!1,liveResizingTolerance:1,sliderCursor:"pointer",slideTrigger_open:"click",slideTrigger_close:"mouseleave",
-slideDelay_open:300,slideDelay_close:300,hideTogglerOnSlide:!1,preventQuickSlideClose:b.layout.browser.webkit,preventPrematureSlideClose:!1,tips:{Open:"Open",Close:"Close",Resize:"Resize",Slide:"Slide Open",Pin:"Pin",Unpin:"Un-Pin",noRoomToOpen:"Not enough room to show this panel.",minSizeWarning:"Panel has reached its minimum size",maxSizeWarning:"Panel has reached its maximum size"},showOverflowOnHover:!1,enableCursorHotkey:!0,customHotkeyModifier:"SHIFT",fxName:"slide",fxSpeed:null,fxSettings:{},
-fxOpacityFix:!0,animatePaneSizing:!1,children:null,containerSelector:"",initChildren:!0,destroyChildren:!0,resizeChildren:!0,triggerEventsOnLoad:!1,triggerEventsDuringLiveResize:!0,onshow_start:null,onshow_end:null,onhide_start:null,onhide_end:null,onopen_start:null,onopen_end:null,onclose_start:null,onclose_end:null,onresize_start:null,onresize_end:null,onsizecontent_start:null,onsizecontent_end:null,onswap_start:null,onswap_end:null,ondrag_start:null,ondrag_end:null},north:{paneSelector:".ui-layout-north",
-size:"auto",resizerCursor:"n-resize",customHotkey:""},south:{paneSelector:".ui-layout-south",size:"auto",resizerCursor:"s-resize",customHotkey:""},east:{paneSelector:".ui-layout-east",size:200,resizerCursor:"e-resize",customHotkey:""},west:{paneSelector:".ui-layout-west",size:200,resizerCursor:"w-resize",customHotkey:""},center:{paneSelector:".ui-layout-center",minWidth:0,minHeight:0}};b.layout.optionsMap={layout:"name instanceKey stateManagement effects inset zIndexes errors zIndex scrollToBookmarkOnLoad showErrorMessages maskPanesEarly outset resizeWithWindow resizeWithWindowDelay resizeWithWindowMaxDelay onresizeall onresizeall_start onresizeall_end onload onload_start onload_end onunload onunload_start onunload_end".split(" "),
-center:"paneClass contentSelector contentIgnoreSelector findNestedContent applyDemoStyles triggerEventsOnLoad showOverflowOnHover maskContents maskObjects liveContentResizing containerSelector children initChildren resizeChildren destroyChildren onresize onresize_start onresize_end onsizecontent onsizecontent_start onsizecontent_end".split(" "),noDefault:["paneSelector","resizerCursor","customHotkey"]};b.layout.transformData=function(a,d){var c=d?{panes:{},center:{}}:{},f,j,k,h,p,x,D;if("object"!==
-typeof a)return c;for(j in a){f=c;p=a[j];k=j.split("__");D=k.length-1;for(x=0;x<=D;x++)h=k[x],x===D?f[h]=b.isPlainObject(p)?b.layout.transformData(p):p:(f[h]||(f[h]={}),f=f[h])}return c};b.layout.backwardCompatibility={map:{applyDefaultStyles:"applyDemoStyles",childOptions:"children",initChildLayout:"initChildren",destroyChildLayout:"destroyChildren",resizeChildLayout:"resizeChildren",resizeNestedLayout:"resizeChildren",resizeWhileDragging:"livePaneResizing",resizeContentWhileDragging:"liveContentResizing",
-triggerEventsWhileDragging:"triggerEventsDuringLiveResize",maskIframesOnResize:"maskContents",useStateCookie:"stateManagement.enabled","cookie.autoLoad":"stateManagement.autoLoad","cookie.autoSave":"stateManagement.autoSave","cookie.keys":"stateManagement.stateKeys","cookie.name":"stateManagement.cookie.name","cookie.domain":"stateManagement.cookie.domain","cookie.path":"stateManagement.cookie.path","cookie.expires":"stateManagement.cookie.expires","cookie.secure":"stateManagement.cookie.secure",
-noRoomToOpenTip:"tips.noRoomToOpen",togglerTip_open:"tips.Close",togglerTip_closed:"tips.Open",resizerTip:"tips.Resize",sliderTip:"tips.Slide"},renameOptions:function(a){function d(b,c){for(var f=b.split("."),k=f.length-1,j={branch:a,key:f[k]},r=0,q;r<k;r++)q=f[r],j.branch=void 0==j.branch[q]?c?j.branch[q]={}:{}:j.branch[q];return j}var c=b.layout.backwardCompatibility.map,f,j,k,h;for(h in c)f=d(h),k=f.branch[f.key],void 0!==k&&(j=d(c[h],!0),j.branch[j.key]=k,delete f.branch[f.key])},renameAllOptions:function(a){var d=
-b.layout.backwardCompatibility.renameOptions;d(a);a.defaults&&("object"!==typeof a.panes&&(a.panes={}),b.extend(!0,a.panes,a.defaults),delete a.defaults);a.panes&&d(a.panes);b.each(b.layout.config.allPanes,function(b,c){a[c]&&d(a[c])});return a}};b.fn.layout=function(h){function p(e){if(!e)return!0;var w=e.keyCode;if(33>w)return!0;var m={38:"north",40:"south",37:"west",39:"east"},a=e.shiftKey,g=e.ctrlKey,t,n,d,c;g&&(37<=w&&40>=w)&&r[m[w]].enableCursorHotkey?c=m[w]:(g||a)&&b.each(k.borderPanes,function(e,
-b){t=r[b];n=t.customHotkey;d=t.customHotkeyModifier;if(a&&"SHIFT"==d||g&&"CTRL"==d||g&&a)if(n&&w===(isNaN(n)||9>=n?n.toUpperCase().charCodeAt(0):n))return c=b,!1});if(!c||!y[c]||!r[c].closable||q[c].isHidden)return!0;na(c);e.stopPropagation();return e.returnValue=!1}function x(e){if(H()){this&&this.tagName&&(e=this);var w;f(e)?w=y[e]:b(e).data("layoutRole")?w=b(e):b(e).parents().each(function(){if(b(this).data("layoutRole"))return w=b(this),!1});if(w&&w.length){var m=w.data("layoutEdge");e=q[m];e.cssSaved&&
-X(m);if(e.isSliding||e.isResizing||e.isClosed)e.cssSaved=!1;else{var a={zIndex:r.zIndexes.resizer_normal+1},g={},t=w.css("overflow"),n=w.css("overflowX"),d=w.css("overflowY");"visible"!=t&&(g.overflow=t,a.overflow="visible");n&&!n.match(/(visible|auto)/)&&(g.overflowX=n,a.overflowX="visible");d&&!d.match(/(visible|auto)/)&&(g.overflowY=n,a.overflowY="visible");e.cssSaved=g;w.css(a);b.each(k.allPanes,function(e,b){b!=m&&X(b)})}}}}function X(e){if(H()){this&&this.tagName&&(e=this);var w;f(e)?w=y[e]:
-b(e).data("layoutRole")?w=b(e):b(e).parents().each(function(){if(b(this).data("layoutRole"))return w=b(this),!1});if(w&&w.length){e=w.data("layoutEdge");e=q[e];var m=e.cssSaved||{};!e.isSliding&&!e.isResizing&&w.css("zIndex",r.zIndexes.pane_normal);w.css(m);e.cssSaved=!1}}}var G=b.layout.browser,k=b.layout.config,Q=b.layout.cssWidth,O=b.layout.cssHeight,R=b.layout.getElementDimensions,D=b.layout.getElementStyles,Ma=b.layout.getEventObject,A=b.layout.parsePaneName,r=b.extend(!0,{},b.layout.defaults);
-r.effects=b.extend(!0,{},b.layout.effects);var q={id:"layout"+b.now(),initialized:!1,paneResizing:!1,panesSliding:{},container:{innerWidth:0,innerHeight:0,outerWidth:0,outerHeight:0,layoutWidth:0,layoutHeight:0},north:{childIdx:0},south:{childIdx:0},east:{childIdx:0},west:{childIdx:0},center:{childIdx:0}},ba={north:null,south:null,east:null,west:null,center:null},M={data:{},set:function(e,b,m){M.clear(e);M.data[e]=setTimeout(b,m)},clear:function(e){var b=M.data;b[e]&&(clearTimeout(b[e]),delete b[e])}},
-ca=function(e,w,m){var a=r;(a.showErrorMessages&&!m||m&&a.showDebugMessages)&&b.layout.msg(a.name+" / "+e,!1!==w);return!1},C=function(e,w,m){var a=w&&f(w),g=a?q[w]:q,t=a?r[w]:r,n=r.name,d=e+(e.match(/_/)?"":"_end"),c=d.match(/_end$/)?d.substr(0,d.length-4):"",l=t[d]||t[c],h="NC",k=[];!a&&"boolean"===b.type(w)&&(m=w,w="");if(l)try{f(l)&&(l.match(/,/)?(k=l.split(","),l=eval(k[0])):l=eval(l)),b.isFunction(l)&&(h=k.length?l(k[1]):a?l(w,y[w],g,t,n):l(z,g,t,n))}catch(j){ca(r.errors.callbackError.replace(/EVENT/,
-b.trim((w||"")+" "+d)),!1),"string"===b.type(j)&&string.length&&ca("Exception:  "+j,!1)}!m&&!1!==h&&(a?(m=y[w],t=r[w],g=q[w],m.triggerHandler("layoutpane"+d,[w,m,g,t,n]),c&&m.triggerHandler("layoutpane"+c,[w,m,g,t,n])):(u.triggerHandler("layout"+d,[z,g,t,n]),c&&u.triggerHandler("layout"+c,[z,g,t,n])));a&&"onresize_end"===e&&db(w+"",!0);return h},eb=function(e){if(!G.mozilla){var b=y[e];"IFRAME"===q[e].tagName?b.css(k.hidden).css(k.visible):b.find("IFRAME").css(k.hidden).css(k.visible)}},ya=function(e){var b=
-y[e];e=k[e].dir;b={minWidth:1001-Q(b,1E3),minHeight:1001-O(b,1E3)};"horz"===e&&(b.minSize=b.minHeight);"vert"===e&&(b.minSize=b.minWidth);return b},fa=function(e,w,m){m||(m=k[e].dir);f(w)&&w.match(/%/)&&(w="100%"===w?-1:parseInt(w,10)/100);if(0===w)return 0;if(1<=w)return parseInt(w,10);var a=r,g=0;"horz"==m?g=v.innerHeight-(y.north?a.north.spacing_open:0)-(y.south?a.south.spacing_open:0):"vert"==m&&(g=v.innerWidth-(y.west?a.west.spacing_open:0)-(y.east?a.east.spacing_open:0));if(-1===w)return g;
-if(0<w)return c(g*w);if("center"==e)return 0;m="horz"===m?"height":"width";a=y[e];e="height"===m?U[e]:!1;var g=b.layout.showInvisibly(a),t=a.css(m),n=e?e.css(m):0;a.css(m,"auto");e&&e.css(m,"auto");w="height"===m?a.outerHeight():a.outerWidth();a.css(m,t).css(g);e&&e.css(m,n);return w},ga=function(e,b){var a=y[e],E=r[e],g=q[e],t=b?E.spacing_open:0,E=b?E.spacing_closed:0;return!a||g.isHidden?0:g.isClosed||g.isSliding&&b?E:"horz"===k[e].dir?a.outerHeight()+t:a.outerWidth()+t},Y=function(e,b){if(H()){var m=
-r[e],E=q[e],g=k[e],t=g.dir;g.sizeType.toLowerCase();var g=void 0!=b?b:E.isSliding,n=m.spacing_open,c=k.oppositeEdge[e],f=q[c],l=y[c],h=!l||!1===f.isVisible||f.isSliding?0:"horz"==t?l.outerHeight():l.outerWidth(),c=(!l||f.isHidden?0:r[c][!1!==f.isClosed?"spacing_closed":"spacing_open"])||0,f="horz"==t?v.innerHeight:v.innerWidth,l=ya("center"),l="horz"==t?d(r.center.minHeight,l.minHeight):d(r.center.minWidth,l.minWidth),g=f-n-(g?0:fa("center",l,t)+h+c),t=E.minSize=d(fa(e,m.minSize),ya(e).minSize),g=
-E.maxSize=a(m.maxSize?fa(e,m.maxSize):1E5,g),E=E.resizerPosition={},n=v.inset.top,h=v.inset.left,c=v.innerWidth,f=v.innerHeight,m=m.spacing_open;switch(e){case "north":E.min=n+t;E.max=n+g;break;case "west":E.min=h+t;E.max=h+g;break;case "south":E.min=n+f-g-m;E.max=n+f-t-m;break;case "east":E.min=h+c-g-m,E.max=h+c-t-m}}},Na=function(e,a){var m=b(e),E=m.data("layoutRole"),g=m.data("layoutEdge"),t=r[g][E+"Class"],g="-"+g,n=m.hasClass(t+"-closed")?"-closed":"-open",d="-closed"===n?"-open":"-closed",n=
-t+"-hover "+(t+g+"-hover ")+(t+n+"-hover ")+(t+g+n+"-hover ");a&&(n+=t+d+"-hover "+(t+g+d+"-hover "));"resizer"==E&&m.hasClass(t+"-sliding")&&(n+=t+"-sliding-hover "+(t+g+"-sliding-hover "));return b.trim(n)},Oa=function(e,a){var m=b(a||this);e&&"toggler"===m.data("layoutRole")&&e.stopPropagation();m.addClass(Na(m))},da=function(e,a){var m=b(a||this);m.removeClass(Na(m,!0))},fb=function(){var e=b(this).data("layoutEdge"),a=q[e];!a.isClosed&&(!a.isResizing&&!q.paneResizing)&&(b.fn.disableSelection&&
-b("body").disableSelection(),r.maskPanesEarly&&va(e,{resizing:!0}))},gb=function(e,a){var m=a||this,E=b(m).data("layoutEdge"),g=E+"ResizerLeave";M.clear(E+"_openSlider");M.clear(g);a?q.paneResizing||(b.fn.enableSelection&&b("body").enableSelection(),r.maskPanesEarly&&za()):M.set(g,function(){gb(e,m)},200)},H=function(){return q.initialized||q.creatingLayout?!0:Aa()},Aa=function(e){var a=r;if(!u.is(":visible"))return!e&&(G.webkit&&"BODY"===u[0].tagName)&&setTimeout(function(){Aa(!0)},50),!1;if(!hb("center").length)return ca(a.errors.centerPaneMissing);
-q.creatingLayout=!0;b.extend(v,R(u,a.inset));A(void 0);b.each(k.allPanes,function(e,b){ib(b,!0)});Pa();b.each(k.borderPanes,function(e,b){y[b]&&q[b].isVisible&&(Y(b),ha(b))});ia("center");b.each(k.allPanes,function(e,b){jb(b)});a.scrollToBookmarkOnLoad&&(e=self.location,e.hash&&e.replace(e.hash));z.hasParentLayout?a.resizeWithWindow=!1:a.resizeWithWindow&&b(window).bind("resize."+K,Ab);delete q.creatingLayout;q.initialized=!0;j(z,b.layout.onReady);C("onload_end");return!0},Qa=function(e,a){var m=
-A.call(this,e),d=y[m];if(d){var g=U[m],t=q[m],n=r[m],c=r.stateManagement||{},n=a?n.children=a:n.children;if(b.isPlainObject(n))n=[n];else if(!n||!b.isArray(n))return;b.each(n,function(e,a){b.isPlainObject(a)&&(a.containerSelector?d.find(a.containerSelector):g||d).each(function(){var e=b(this),g=e.data("layout");if(!g){kb({container:e,options:a},t);if(c.includeChildren&&q.stateData[m]){var g=(q.stateData[m].children||{})[a.instanceKey],w=a.stateManagement||(a.stateManagement={autoLoad:!0});!0===w.autoLoad&&
-g&&(w.autoSave=!1,w.includeChildren=!0,w.autoLoad=b.extend(!0,{},g))}(g=e.layout(a))&&Ba(m,g)}})})}},kb=function(e,b){var a=e.container,d=e.options,g=d.stateManagement,t=d.instanceKey||a.data("layoutInstanceKey");t||(t=(g&&g.cookie?g.cookie.name:"")||d.name);t=t?t.replace(/[^\w-]/gi,"_").replace(/_{2,}/g,"_"):"layout"+ ++b.childIdx;d.instanceKey=t;a.data("layoutInstanceKey",t);return t},Ba=function(e,a){var m=y[e],d=ba[e],g=q[e];b.isPlainObject(d)&&(b.each(d,function(e,b){b.destroyed&&delete d[e]}),
-b.isEmptyObject(d)&&(d=ba[e]=null));!a&&!d&&(a=m.data("layout"));a&&(a.hasParentLayout=!0,m=a.options,kb(a,g),d||(d=ba[e]={}),d[m.instanceKey]=a.container.data("layout"));z[e].children=ba[e];a||Qa(e)},Ab=function(){var e=r,b=Number(e.resizeWithWindowDelay);10>b&&(b=100);M.clear("winResize");M.set("winResize",function(){M.clear("winResize");M.clear("winResizeRepeater");var b=R(u,e.inset);(b.innerWidth!==v.innerWidth||b.innerHeight!==v.innerHeight)&&oa()},b);M.data.winResizeRepeater||lb()},lb=function(){var e=
-Number(r.resizeWithWindowMaxDelay);0<e&&M.set("winResizeRepeater",function(){lb();oa()},e)},mb=function(){C("onunload_start");j(z,b.layout.onUnload);C("onunload_end")},nb=function(e){e=e?e.split(","):k.borderPanes;b.each(e,function(e,a){var d=r[a];if(d.enableCursorHotkey||d.customHotkey)return b(document).bind("keydown."+K,p),!1})},hb=function(e){e=r[e].paneSelector;if("#"===e.substr(0,1))return u.find(e).eq(0);var b=u.children(e).eq(0);return b.length?b:u.children("form:first").children(e).eq(0)},
-ib=function(e,b){if(b||H()){var m=r[e],c=q[e],g=k[e],t=g.dir,n="center"===e,f={},h=y[e],l,j;h?Ra(e,!1,!0,!1):U[e]=!1;h=y[e]=hb(e);if(h.length){h.data("layoutCSS")||h.data("layoutCSS",D(h,"position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border"));z[e]={name:e,pane:y[e],content:U[e],options:r[e],state:q[e],children:ba[e]};h.data({parentLayout:z,layoutPane:z[e],layoutEdge:e,layoutRole:"pane"}).css(g.cssReq).css("zIndex",r.zIndexes.pane_normal).css(m.applyDemoStyles?
-g.cssDemo:{}).addClass(m.paneClass+" "+m.paneClass+"-"+e).bind("mouseenter."+K,Oa).bind("mouseleave."+K,da);g={hide:"",show:"",toggle:"",close:"",open:"",slideOpen:"",slideClose:"",slideToggle:"",size:"sizePane",sizePane:"sizePane",sizeContent:"",sizeHandles:"",enableClosable:"",disableClosable:"",enableSlideable:"",disableSlideable:"",enableResizable:"",disableResizable:"",swapPanes:"swapPanes",swap:"swapPanes",move:"swapPanes",removePane:"removePane",remove:"removePane",createChildren:"",resizeChildren:"",
-resizeAll:"resizeAll",resizeLayout:"resizeAll"};for(j in g)h.bind("layoutpane"+j.toLowerCase()+"."+K,z[g[j]||j]);Sa(e,!1);n||(l=c.size=fa(e,m.size),n=fa(e,m.minSize)||1,j=fa(e,m.maxSize)||1E5,0<l&&(l=d(a(l,j),n)),c.autoResize=m.autoResize,c.isClosed=!1,c.isSliding=!1,c.isResizing=!1,c.isHidden=!1,c.pins||(c.pins=[]));c.tagName=h[0].tagName;c.edge=e;c.noRoom=!1;c.isVisible=!0;ob(e);"horz"===t?f.height=O(h,l):"vert"===t&&(f.width=Q(h,l));h.css(f);"horz"!=t&&ia(e,!0);q.initialized&&(Pa(e),nb(e));m.initClosed&&
-m.closable&&!m.initHidden?ja(e,!0,!0):m.initHidden||m.initClosed?Ta(e):c.noRoom||h.css("display","block");h.css("visibility","visible");m.showOverflowOnHover&&h.hover(x,X);q.initialized&&jb(e)}else y[e]=!1}},jb=function(e){var b=y[e],a=q[e],d=r[e];b&&(b.data("layout")&&Ba(e,b.data("layout")),a.isVisible&&(q.initialized?oa():pa(e),d.triggerEventsOnLoad?C("onresize_end",e):db(e,!0)),d.initChildren&&d.children&&Qa(e))},ob=function(e){e=e?e.split(","):k.borderPanes;b.each(e,function(e,b){var a=y[b],g=
-F[b],d=q[b],c=k[b].side,f={};if(a){switch(b){case "north":f.top=v.inset.top;f.left=v.inset.left;f.right=v.inset.right;break;case "south":f.bottom=v.inset.bottom;f.left=v.inset.left;f.right=v.inset.right;break;case "west":f.left=v.inset.left;break;case "east":f.right=v.inset.right}a.css(f);g&&d.isClosed?g.css(c,v.inset[c]):g&&!d.isHidden&&g.css(c,v.inset[c]+ga(b))}})},Pa=function(e){e=e?e.split(","):k.borderPanes;b.each(e,function(e,a){var d=y[a];F[a]=!1;P[a]=!1;if(d){var g=r[a],d=q[a],c="#"===g.paneSelector.substr(0,
-1)?g.paneSelector.substr(1):"",n=g.resizerClass,f=g.togglerClass,h="-"+a,l=z[a],j=l.resizer=F[a]=b("<div></div>"),l=l.toggler=g.closable?P[a]=b("<div></div>"):!1;!d.isVisible&&g.slidable&&j.attr("title",g.tips.Slide).css("cursor",g.sliderCursor);j.attr("id",c?c+"-resizer":"").data({parentLayout:z,layoutPane:z[a],layoutEdge:a,layoutRole:"resizer"}).css(k.resizers.cssReq).css("zIndex",r.zIndexes.resizer_normal).css(g.applyDemoStyles?k.resizers.cssDemo:{}).addClass(n+" "+n+h).hover(Oa,da).hover(fb,gb).appendTo(u);
-g.resizerDblClickToggle&&j.bind("dblclick."+K,na);l&&(l.attr("id",c?c+"-toggler":"").data({parentLayout:z,layoutPane:z[a],layoutEdge:a,layoutRole:"toggler"}).css(k.togglers.cssReq).css(g.applyDemoStyles?k.togglers.cssDemo:{}).addClass(f+" "+f+h).hover(Oa,da).bind("mouseenter",fb).appendTo(j),g.togglerContent_open&&b("<span>"+g.togglerContent_open+"</span>").data({layoutEdge:a,layoutRole:"togglerContent"}).data("layoutRole","togglerContent").data("layoutEdge",a).addClass("content content-open").css("display",
-"none").appendTo(l),g.togglerContent_closed&&b("<span>"+g.togglerContent_closed+"</span>").data({layoutEdge:a,layoutRole:"togglerContent"}).addClass("content content-closed").css("display","none").appendTo(l),pb(a));var g=a,B=b.layout.plugins.draggable,g=g?g.split(","):k.borderPanes;b.each(g,function(e,a){var g=r[a];if(!B||!y[a]||!g.resizable)return g.resizable=!1,!0;var m=q[a],w=r.zIndexes,d=k[a],c="horz"==d.dir?"top":"left",t=F[a],n=g.resizerClass,f=0,l,h,E=n+"-drag",j=n+"-"+a+"-drag",J=n+"-dragging",
-zb=n+"-"+a+"-dragging",cb=n+"-dragging-limit",v=n+"-"+a+"-dragging-limit",x=!1;m.isClosed||t.attr("title",g.tips.Resize).css("cursor",g.resizerCursor);t.draggable({containment:u[0],axis:"horz"==d.dir?"y":"x",delay:0,distance:1,grid:g.resizingGrid,helper:"clone",opacity:g.resizerDragOpacity,addClasses:!1,zIndex:w.resizer_drag,start:function(e,w){g=r[a];m=q[a];h=g.livePaneResizing;if(!1===C("ondrag_start",a))return!1;m.isResizing=!0;q.paneResizing=a;M.clear(a+"_closeSlider");Y(a);l=m.resizerPosition;
-f=w.position[c];t.addClass(E+" "+j);x=!1;b("body").disableSelection();va(a,{resizing:!0})},drag:function(e,b){x||(b.helper.addClass(J+" "+zb).css({right:"auto",bottom:"auto"}).children().css("visibility","hidden"),x=!0,m.isSliding&&y[a].css("zIndex",w.pane_sliding));var d=0;b.position[c]<l.min?(b.position[c]=l.min,d=-1):b.position[c]>l.max&&(b.position[c]=l.max,d=1);d?(b.helper.addClass(cb+" "+v),window.defaultStatus=0<d&&a.match(/(north|west)/)||0>d&&a.match(/(south|east)/)?g.tips.maxSizeWarning:
-g.tips.minSizeWarning):(b.helper.removeClass(cb+" "+v),window.defaultStatus="");h&&Math.abs(b.position[c]-f)>=g.liveResizingTolerance&&(f=b.position[c],p(e,b,a))},stop:function(e,g){b("body").enableSelection();window.defaultStatus="";t.removeClass(E+" "+j);m.isResizing=!1;q.paneResizing=!1;p(e,g,a,!0)}})});var p=function(b,e,a,g){var m=e.position,w=k[a];b=r[a];e=q[a];var d;switch(a){case "north":d=m.top;break;case "west":d=m.left;break;case "south":d=v.layoutHeight-m.top-b.spacing_open;break;case "east":d=
-v.layoutWidth-m.left-b.spacing_open}d-=v.inset[w.side];g?(!1!==C("ondrag_end",a)&&Ca(a,d,!1,!0),za(!0),e.isSliding&&va(a,{resizing:!0})):Math.abs(d-e.size)<b.liveResizingTolerance||(Ca(a,d,!1,!0),ea.each(qb))};d.isVisible?Ua(a):(Da(a),ma(a,!0))}});qa()},Sa=function(b,a){if(H()){var m=r[b],d=m.contentSelector,g=z[b],c=y[b],n;d&&(n=g.content=U[b]=m.findNestedContent?c.find(d).eq(0):c.children(d).eq(0));n&&n.length?(n.data("layoutRole","content"),n.data("layoutCSS")||n.data("layoutCSS",D(n,"height")),
-n.css(k.content.cssReq),m.applyDemoStyles&&(n.css(k.content.cssDemo),c.css(k.content.cssDemoPane)),c.css("overflowX").match(/(scroll|auto)/)&&c.css("overflow","hidden"),q[b].content={},!1!==a&&pa(b)):g.content=U[b]=!1}},qb=function(){var e=b(this),a=e.data("layoutMask"),a=q[a];"IFRAME"==a.tagName&&a.isVisible&&e.css({top:a.offsetTop,left:a.offsetLeft,width:a.outerWidth,height:a.outerHeight})},va=function(e,a){var m=k[e],d=["center"],g=r.zIndexes,c=b.extend({objectsOnly:!1,animation:!1,resizing:!0,
-sliding:q[e].isSliding},a),n,f;c.resizing&&d.push(e);c.sliding&&d.push(k.oppositeEdge[e]);"horz"===m.dir&&(d.push("west"),d.push("east"));b.each(d,function(e,a){f=q[a];n=r[a];if(f.isVisible&&(n.maskObjects||!c.objectsOnly&&n.maskContents)){for(var m=b([]),d,w=0,h=ea.length;w<h;w++)d=ea.eq(w),d.data("layoutMask")===a&&(m=m.add(d));if(!m.length){m=y[a];d=q[a];var w=r[a],h=r.zIndexes,j=b([]),E,k,v,p,x;if(w.maskContents||w.maskObjects)for(x=0;x<(w.maskObjects?2:1);x++)E=w.maskObjects&&0==x,k=document.createElement(E?
-"iframe":"div"),v=b(k).data("layoutMask",a),k.className="ui-layout-mask ui-layout-mask-"+a,p=k.style,p.display="block",p.position="absolute",p.background="#FFF",E&&(k.frameborder=0,k.src="about:blank",p.opacity=0,p.filter="Alpha(Opacity='0')",p.border=0),"IFRAME"==d.tagName?(p.zIndex=h.pane_normal+1,u.append(k)):(v.addClass("ui-layout-mask-inside-pane"),p.zIndex=w.maskZindex||h.content_mask,p.top=0,p.left=0,p.width="100%",p.height="100%",m.append(k)),j=j.add(k),ea=ea.add(k);m=j}m.each(function(){qb.call(this);
-this.style.zIndex=f.isSliding?g.pane_sliding+1:g.pane_normal+1;this.style.display="block"})}})},za=function(a){if(a||!q.paneResizing)ea.hide();else if(!a&&!b.isEmptyObject(q.panesSliding)){a=ea.length-1;for(var d,m;0<=a;a--)m=ea.eq(a),d=m.data("layoutMask"),r[d].maskObjects||m.hide()}},Ra=function(a,d,m,c){if(H()){a=A.call(this,a);var g=y[a],t=U[a],n=F[a],f=P[a];g&&b.isEmptyObject(g.data())&&(g=!1);t&&b.isEmptyObject(t.data())&&(t=!1);n&&b.isEmptyObject(n.data())&&(n=!1);f&&b.isEmptyObject(f.data())&&
-(f=!1);g&&g.stop(!0,!0);var h=r[a],l=ba[a],j=b.isPlainObject(l)&&!b.isEmptyObject(l);c=void 0!==c?c:h.destroyChildren;j&&c&&(b.each(l,function(a,b){b.destroyed||b.destroy(!0);b.destroyed&&delete l[a]}),b.isEmptyObject(l)&&(l=ba[a]=null,j=!1));g&&d&&!j?g.remove():g&&g[0]&&(d=h.paneClass,c=d+"-"+a,d=[d,d+"-open",d+"-closed",d+"-sliding",c,c+"-open",c+"-closed",c+"-sliding"],b.merge(d,Na(g,!0)),g.removeClass(d.join(" ")).removeData("parentLayout").removeData("layoutPane").removeData("layoutRole").removeData("layoutEdge").removeData("autoHidden").unbind("."+
-K),j&&t?(t.width(t.width()),b.each(l,function(a,b){b.resizeAll()})):t&&t.css(t.data("layoutCSS")).removeData("layoutCSS").removeData("layoutRole"),g.data("layout")||g.css(g.data("layoutCSS")).removeData("layoutCSS"));f&&f.remove();n&&n.remove();z[a]=y[a]=U[a]=F[a]=P[a]=!1;m||oa()}},Ea=function(a){var b=y[a],d=b[0].style;r[a].useOffscreenClose?(b.data(k.offscreenReset)||b.data(k.offscreenReset,{left:d.left,right:d.right}),b.css(k.offscreenCSS)):b.hide().removeData(k.offscreenReset)},rb=function(a){var b=
-y[a];a=r[a];var d=k.offscreenCSS,c=b.data(k.offscreenReset),g=b[0].style;b.show().removeData(k.offscreenReset);a.useOffscreenClose&&c&&(g.left==d.left&&(g.left=c.left),g.right==d.right&&(g.right=c.right))},Ta=function(a,b){if(H()){var d=A.call(this,a),c=r[d],g=q[d],t=F[d];y[d]&&!g.isHidden&&!(q.initialized&&!1===C("onhide_start",d))&&(g.isSliding=!1,delete q.panesSliding[d],t&&t.hide(),!q.initialized||g.isClosed?(g.isClosed=!0,g.isHidden=!0,g.isVisible=!1,q.initialized||Ea(d),ia("horz"===k[d].dir?
-"":"center"),(q.initialized||c.triggerEventsOnLoad)&&C("onhide_end",d)):(g.isHiding=!0,ja(d,!1,b)))}},Fa=function(a,b,d,c){if(H()){a=A.call(this,a);var g=q[a];y[a]&&g.isHidden&&!1!==C("onshow_start",a)&&(g.isShowing=!0,g.isSliding=!1,delete q.panesSliding[a],!1===b?ja(a,!0):ra(a,!1,d,c))}},na=function(a,b){if(H()){var d=Ma(a),c=A.call(this,a),g=q[c];d&&d.stopImmediatePropagation();g.isHidden?Fa(c):g.isClosed?ra(c,!!b):ja(c)}},ja=function(a,b,d,c){function g(){l.isMoving=!1;ma(t,!0);var a=k.oppositeEdge[t];
-q[a].noRoom&&(Y(a),ha(a));if(!c&&(q.initialized||h.triggerEventsOnLoad))p||C("onclose_end",t),p&&C("onshow_end",t),v&&C("onhide_end",t)}var t=A.call(this,a);if(!q.initialized&&y[t]){a=t;var n=q[a];Ea(a);n.isClosed=!0;n.isVisible=!1;Da(a)}else if(H()){var f=y[t],h=r[t],l=q[t],j,p,v;u.queue(function(a){if(!f||!h.closable&&!l.isShowing&&!l.isHiding||!b&&l.isClosed&&!l.isShowing)return a();var e=!l.isShowing&&!1===C("onclose_start",t);p=l.isShowing;v=l.isHiding;delete l.isShowing;delete l.isHiding;if(e)return a();
-j=!d&&!l.isClosed&&"none"!=h.fxName_close;l.isMoving=!0;l.isClosed=!0;l.isVisible=!1;v?l.isHidden=!0:p&&(l.isHidden=!1);l.isSliding?wa(t,!1):ia("horz"===k[t].dir?"":"center",!1);Da(t);j?(Ga(t,!0),f.hide(h.fxName_close,h.fxSettings_close,h.fxSpeed_close,function(){Ga(t,!1);l.isClosed&&g();a()})):(Ea(t),g(),a())})}},Da=function(a){if(F[a]){var d=F[a],c=P[a],f=r[a],g=k[a].side,t=f.resizerClass,n=f.togglerClass,h="-"+a;d.css(g,v.inset[g]).removeClass(t+"-open "+t+h+"-open").removeClass(t+"-sliding "+
-t+h+"-sliding").addClass(t+"-closed "+t+h+"-closed");f.resizable&&b.layout.plugins.draggable&&d.draggable("disable").removeClass("ui-state-disabled").css("cursor","default").attr("title","");c&&(c.removeClass(n+"-open "+n+h+"-open").addClass(n+"-closed "+n+h+"-closed").attr("title",f.tips.Open),c.children(".content-open").hide(),c.children(".content-closed").css("display","block"));Va(a,!1);q.initialized&&qa()}},ra=function(a,b,d,c){function g(){j.isMoving=!1;eb(f);j.isSliding||ia("vert"==k[f].dir?
-"center":"",!1);Ua(f)}if(H()){var f=A.call(this,a),n=y[f],h=r[f],j=q[f],l,p;u.queue(function(a){if(!n||!h.resizable&&!h.closable&&!j.isShowing||j.isVisible&&!j.isSliding)return a();if(j.isHidden&&!j.isShowing)a(),Fa(f,!0);else{j.autoResize&&j.size!=h.size?ka(f,h.size,!0,!0,!0):Y(f,b);var e=C("onopen_start",f);if("abort"===e)return a();"NC"!==e&&Y(f,b);if(j.minSize>j.maxSize)return Va(f,!1),!c&&h.tips.noRoomToOpen&&alert(h.tips.noRoomToOpen),a();b?wa(f,!0):j.isSliding?wa(f,!1):h.slidable&&ma(f,!1);
-j.noRoom=!1;ha(f);p=j.isShowing;delete j.isShowing;l=!d&&j.isClosed&&"none"!=h.fxName_open;j.isMoving=!0;j.isVisible=!0;j.isClosed=!1;p&&(j.isHidden=!1);l?(Ga(f,!0),n.show(h.fxName_open,h.fxSettings_open,h.fxSpeed_open,function(){Ga(f,!1);j.isVisible&&g();a()})):(rb(f),g(),a())}})}},Ua=function(a,d){var c=y[a],f=F[a],g=P[a],h=r[a],n=q[a],j=k[a].side,p=h.resizerClass,l=h.togglerClass,u="-"+a;f.css(j,v.inset[j]+ga(a)).removeClass(p+"-closed "+p+u+"-closed").addClass(p+"-open "+p+u+"-open");n.isSliding?
-f.addClass(p+"-sliding "+p+u+"-sliding"):f.removeClass(p+"-sliding "+p+u+"-sliding");da(0,f);h.resizable&&b.layout.plugins.draggable?f.draggable("enable").css("cursor",h.resizerCursor).attr("title",h.tips.Resize):n.isSliding||f.css("cursor","default");g&&(g.removeClass(l+"-closed "+l+u+"-closed").addClass(l+"-open "+l+u+"-open").attr("title",h.tips.Close),da(0,g),g.children(".content-closed").hide(),g.children(".content-open").css("display","block"));Va(a,!n.isSliding);b.extend(n,R(c));q.initialized&&
-(qa(),pa(a,!0));if(!d&&(q.initialized||h.triggerEventsOnLoad)&&c.is(":visible"))C("onopen_end",a),n.isShowing&&C("onshow_end",a),q.initialized&&C("onresize_end",a)},sb=function(a){function b(){g.isClosed?g.isMoving||ra(c,!0):wa(c,!0)}if(H()){var d=Ma(a),c=A.call(this,a),g=q[c];a=r[c].slideDelay_open;d&&d.stopImmediatePropagation();g.isClosed&&d&&"mouseenter"===d.type&&0<a?M.set(c+"_openSlider",b,a):b()}},Wa=function(a){function c(){g.isClosed?wa(f,!1):g.isMoving||ja(f)}if(H()){var m=Ma(a),f=A.call(this,
-a);a=r[f];var g=q[f],h=g.isMoving?1E3:300;!g.isClosed&&!g.isResizing&&("click"===a.slideTrigger_close?c():a.preventQuickSlideClose&&g.isMoving||a.preventPrematureSlideClose&&m&&b.layout.isMouseOverElem(m,y[f])||(m?M.set(f+"_closeSlider",c,d(a.slideDelay_close,h)):c()))}},Ga=function(a,b){var d=y[a],c=q[a],g=r[a],f=r.zIndexes;b?(va(a,{animation:!0,objectsOnly:!0}),d.css({zIndex:f.pane_animate}),"south"==a?d.css({top:v.inset.top+v.innerHeight-d.outerHeight()}):"east"==a&&d.css({left:v.inset.left+v.innerWidth-
-d.outerWidth()})):(za(),d.css({zIndex:c.isSliding?f.pane_sliding:f.pane_normal}),"south"==a?d.css({top:"auto"}):"east"==a&&!d.css("left").match(/\-99999/)&&d.css({left:"auto"}),G.msie&&(g.fxOpacityFix&&"slide"!=g.fxName_open&&d.css("filter")&&1==d.css("opacity"))&&d[0].style.removeAttribute("filter"))},ma=function(a,b){var d=r[a],c=F[a],g=d.slideTrigger_open.toLowerCase();if(c&&(!b||d.slidable)){g.match(/mouseover/)?g=d.slideTrigger_open="mouseenter":g.match(/(click|dblclick|mouseenter)/)||(g=d.slideTrigger_open=
-"click");if(d.resizerDblClickToggle&&g.match(/click/))c[b?"unbind":"bind"]("dblclick."+K,na);c[b?"bind":"unbind"](g+"."+K,sb).css("cursor",b?d.sliderCursor:"default").attr("title",b?d.tips.Slide:"")}},wa=function(a,b){function d(b){M.clear(a+"_closeSlider");b.stopPropagation()}var c=r[a],g=q[a],f=r.zIndexes,h=c.slideTrigger_close.toLowerCase(),j=b?"bind":"unbind",k=y[a],l=F[a];M.clear(a+"_closeSlider");b?(g.isSliding=!0,q.panesSliding[a]=!0,ma(a,!1)):(g.isSliding=!1,delete q.panesSliding[a]);k.css("zIndex",
-b?f.pane_sliding:f.pane_normal);l.css("zIndex",b?f.pane_sliding+2:f.resizer_normal);h.match(/(click|mouseleave)/)||(h=c.slideTrigger_close="mouseleave");l[j](h,Wa);"mouseleave"===h&&(k[j]("mouseleave."+K,Wa),l[j]("mouseenter."+K,d),k[j]("mouseenter."+K,d));b?"click"===h&&!c.resizable&&(l.css("cursor",b?c.sliderCursor:"default"),l.attr("title",b?c.tips.Close:"")):M.clear(a+"_closeSlider")},ha=function(a,d,c,f){d=r[a];var g=q[a],h=k[a],n=y[a],j=F[a],p="vert"===h.dir,l=!1;if("center"===a||p&&g.noVerticalRoom)(l=
-0<=g.maxHeight)&&g.noRoom?(rb(a),j&&j.show(),g.isVisible=!0,g.noRoom=!1,p&&(g.noVerticalRoom=!1),eb(a)):!l&&!g.noRoom&&(Ea(a),j&&j.hide(),g.isVisible=!1,g.noRoom=!0);"center"!==a&&(g.minSize<=g.maxSize?(g.size>g.maxSize?ka(a,g.maxSize,c,!0,f):g.size<g.minSize?ka(a,g.minSize,c,!0,f):j&&(g.isVisible&&n.is(":visible"))&&(c=g.size+v.inset[h.side],b.layout.cssNum(j,h.side)!=c&&j.css(h.side,c)),g.noRoom&&(g.wasOpen&&d.closable?d.autoReopen?ra(a,!1,!0,!0):g.noRoom=!1:Fa(a,g.wasOpen,!0,!0))):g.noRoom||(g.noRoom=
-!0,g.wasOpen=!g.isClosed&&!g.isSliding,g.isClosed||(d.closable?ja(a,!0,!0):Ta(a,!0))))},Ca=function(a,b,d,c,g){if(H()){a=A.call(this,a);var f=r[a],h=q[a];g=g||f.livePaneResizing&&!h.isResizing;h.autoResize=!1;ka(a,b,d,c,g)}},ka=function(e,c,f,h,g){function j(){for(var a="width"===ua?l.outerWidth():l.outerHeight(),a=[{pane:n,count:1,target:c,actual:a,correct:c===a,attempt:c,cssSize:D}],e=a[0],h={},t="Inaccurate size after resizing the "+n+"-pane.";!e.correct;){h={pane:n,count:e.count+1,target:c};h.attempt=
-e.actual>c?d(0,e.attempt-(e.actual-c)):d(0,e.attempt+(c-e.actual));h.cssSize=("horz"==k[n].dir?O:Q)(y[n],h.attempt);l.css(ua,h.cssSize);h.actual="width"==ua?l.outerWidth():l.outerHeight();h.correct=c===h.actual;1===a.length&&(ca(t,!1,!0),ca(e,!1,!0));ca(h,!1,!0);if(3<a.length)break;a.push(h);e=a[a.length-1]}J.size=c;b.extend(J,R(l));J.isVisible&&l.is(":visible")&&(x&&x.css(B,c+v.inset[B]),pa(n));!f&&(!Z&&q.initialized&&J.isVisible)&&C("onresize_end",n);f||(J.isSliding||ia("horz"==k[n].dir?"":"center",
-Z,g),qa());e=k.oppositeEdge[n];c<G&&q[e].noRoom&&(Y(e),ha(e,!1,f));1<a.length&&ca(t+"\nSee the Error Console for details.",!0,!0)}if(H()){var n=A.call(this,e),p=r[n],J=q[n],l=y[n],x=F[n],B=k[n].side,ua=k[n].sizeType.toLowerCase(),Z=J.isResizing&&!p.triggerEventsDuringLiveResize,z=!0!==h&&p.animatePaneSizing,G,D;u.queue(function(e){Y(n);G=J.size;c=fa(n,c);c=d(c,fa(n,p.minSize));c=a(c,J.maxSize);if(c<J.minSize)e(),ha(n,!1,f);else{if(!g&&c===G)return e();J.newSize=c;!f&&(q.initialized&&J.isVisible)&&
-C("onresize_start",n);D=("horz"==k[n].dir?O:Q)(y[n],c);if(z&&l.is(":visible")){var h=b.layout.effects.size[n]||b.layout.effects.size.all,h=p.fxSettings_size.easing||h.easing,v=r.zIndexes,u={};u[ua]=D+"px";J.isMoving=!0;l.css({zIndex:v.pane_animate}).show().animate(u,p.fxSpeed_size,h,function(){l.css({zIndex:J.isSliding?v.pane_sliding:v.pane_normal});J.isMoving=!1;delete J.newSize;j();e()})}else l.css(ua,D),delete J.newSize,l.is(":visible")?j():(J.size=c,b.extend(J,R(l))),e()}})}},ia=function(a,c,
-f){a=(a?a:"east,west,center").split(",");b.each(a,function(a,e){if(y[e]){var h=r[e],j=q[e],k=y[e],p=!0,l={},u=b.layout.showInvisibly(k),B={top:ga("north",!0),bottom:ga("south",!0),left:ga("west",!0),right:ga("east",!0),width:0,height:0};B.width=v.innerWidth-B.left-B.right;B.height=v.innerHeight-B.bottom-B.top;B.top+=v.inset.top;B.bottom+=v.inset.bottom;B.left+=v.inset.left;B.right+=v.inset.right;b.extend(j,R(k));if("center"===e){if(!f&&j.isVisible&&B.width===j.outerWidth&&B.height===j.outerHeight)return k.css(u),
-!0;b.extend(j,ya(e),{maxWidth:B.width,maxHeight:B.height});l=B;j.newWidth=l.width;j.newHeight=l.height;l.width=Q(k,l.width);l.height=O(k,l.height);p=0<=l.width&&0<=l.height;if(!q.initialized&&h.minWidth>B.width){var h=h.minWidth-j.outerWidth,B=r.east.minSize||0,x=r.west.minSize||0,Z=q.east.size,z=q.west.size,A=Z,D=z;0<h&&(q.east.isVisible&&Z>B)&&(A=d(Z-B,Z-h),h-=Z-A);0<h&&(q.west.isVisible&&z>x)&&(D=d(z-x,z-h),h-=z-D);if(0===h){Z&&Z!=B&&ka("east",A,!0,!0,f);z&&z!=x&&ka("west",D,!0,!0,f);ia("center",
-c,f);k.css(u);return}}}else{j.isVisible&&!j.noVerticalRoom&&b.extend(j,R(k),ya(e));if(!f&&!j.noVerticalRoom&&B.height===j.outerHeight)return k.css(u),!0;l.top=B.top;l.bottom=B.bottom;j.newSize=B.height;l.height=O(k,B.height);j.maxHeight=l.height;p=0<=j.maxHeight;p||(j.noVerticalRoom=!0)}p?(!c&&q.initialized&&C("onresize_start",e),k.css(l),"center"!==e&&qa(e),j.noRoom&&(!j.isClosed&&!j.isHidden)&&ha(e),j.isVisible&&(b.extend(j,R(k)),q.initialized&&pa(e))):!j.noRoom&&j.isVisible&&ha(e);k.css(u);delete j.newSize;
-delete j.newWidth;delete j.newHeight;if(!j.isVisible)return!0;"center"===e&&(j=G.isIE6||!G.boxModel,y.north&&(j||"IFRAME"==q.north.tagName)&&y.north.css("width",Q(y.north,v.innerWidth)),y.south&&(j||"IFRAME"==q.south.tagName)&&y.south.css("width",Q(y.south,v.innerWidth)));!c&&q.initialized&&C("onresize_end",e)}})},oa=function(a){A(a);if(u.is(":visible"))if(q.initialized){if(!0===a&&b.isPlainObject(r.outset)&&u.css(r.outset),b.extend(v,R(u,r.inset)),v.outerHeight){!0===a&&ob();if(!1===C("onresizeall_start"))return!1;
-var d,c,f;b.each(["south","north","east","west"],function(a,b){y[b]&&(c=r[b],f=q[b],f.autoResize&&f.size!=c.size?ka(b,c.size,!0,!0,!0):(Y(b),ha(b,!1,!0,!0)))});ia("",!0,!0);qa();b.each(k.allPanes,function(a,b){(d=y[b])&&q[b].isVisible&&C("onresize_end",b)});C("onresizeall_end")}}else Aa()},db=function(a,d){var c=A.call(this,a);r[c].resizeChildren&&(d||Ba(c),c=ba[c],b.isPlainObject(c)&&b.each(c,function(a,b){b.destroyed||b.resizeAll()}))},pa=function(a,c){if(H()){var h=A.call(this,a),h=h?h.split(","):
-k.allPanes;b.each(h,function(a,e){function h(a){return d(u.css.paddingBottom,parseInt(a.css("marginBottom"),10)||0)}function j(){var a=r[e].contentIgnoreSelector,a=p.nextAll().not(".ui-layout-mask").not(a||":lt(0)"),b=a.filter(":visible"),d=b.filter(":last");v={top:p[0].offsetTop,height:p.outerHeight(),numFooters:a.length,hiddenFooters:a.length-b.length,spaceBelow:0};v.spaceAbove=v.top;v.bottom=v.top+v.height;v.spaceBelow=d.length?d[0].offsetTop+d.outerHeight()-v.bottom+h(d):h(p)}var m=y[e],p=U[e],
-l=r[e],u=q[e],v=u.content;if(!m||!p||!m.is(":visible"))return!0;if(!p.length&&(Sa(e,!1),!p))return;if(!1!==C("onsizecontent_start",e)){if(!u.isMoving&&!u.isResizing||l.liveContentResizing||c||void 0==v.top)j(),0<v.hiddenFooters&&"hidden"===m.css("overflow")&&(m.css("overflow","visible"),j(),m.css("overflow","hidden"));m=u.innerHeight-(v.spaceAbove-u.css.paddingTop)-(v.spaceBelow-u.css.paddingBottom);if(!p.is(":visible")||v.height!=m){var x=p,l=x;f(x)?l=y[x]:x.jquery||(l=b(x));x=O(l,m);l.css({height:x,
-visibility:"visible"});0<x&&0<l.innerWidth()?l.data("autoHidden")&&(l.show().data("autoHidden",!1),G.mozilla||l.css(k.hidden).css(k.visible)):l.data("autoHidden")||l.hide().data("autoHidden",!0);v.height=m}q.initialized&&C("onsizecontent_end",e)}})}},qa=function(a){a=(a=A.call(this,a))?a.split(","):k.borderPanes;b.each(a,function(a,d){var e=r[d],g=q[d],h=y[d],j=F[d],p=P[d],u;if(h&&j){var l=k[d].dir,x=g.isClosed?"_closed":"_open",B=e["spacing"+x],z=e["togglerAlign"+x],x=e["togglerLength"+x],A;if(0===
-B)j.hide();else{!g.noRoom&&!g.isHidden&&j.show();"horz"===l?(A=v.innerWidth,g.resizerLength=A,h=b.layout.cssNum(h,"left"),j.css({width:Q(j,A),height:O(j,B),left:-9999<h?h:v.inset.left})):(A=h.outerHeight(),g.resizerLength=A,j.css({height:O(j,A),width:Q(j,B),top:v.inset.top+ga("north",!0)}));da(e,j);if(p){if(0===x||g.isSliding&&e.hideTogglerOnSlide){p.hide();return}p.show();if(!(0<x)||"100%"===x||x>A)x=A,z=0;else if(f(z))switch(z){case "top":case "left":z=0;break;case "bottom":case "right":z=A-x;break;
-default:z=c((A-x)/2)}else h=parseInt(z,10),z=0<=z?h:A-x+h;if("horz"===l){var D=Q(p,x);p.css({width:D,height:O(p,B),left:z,top:0});p.children(".content").each(function(){u=b(this);u.css("marginLeft",c((D-u.outerWidth())/2))})}else{var C=O(p,x);p.css({height:C,width:Q(p,B),top:z,left:0});p.children(".content").each(function(){u=b(this);u.css("marginTop",c((C-u.outerHeight())/2))})}da(0,p)}if(!q.initialized&&(e.initHidden||g.isHidden))j.hide(),p&&p.hide()}}})},pb=function(a){if(H()){var b=A.call(this,
-a);a=P[b];var d=r[b];a&&(d.closable=!0,a.bind("click."+K,function(a){a.stopPropagation();na(b)}).css("visibility","visible").css("cursor","pointer").attr("title",q[b].isClosed?d.tips.Open:d.tips.Close).show())}},Va=function(a,d){b.layout.plugins.buttons&&b.each(q[a].pins,function(c,f){b.layout.buttons.setPinState(z,b(f),a,d)})},u=b(this).eq(0);if(!u.length)return ca(r.errors.containerMissing);if(u.data("layoutContainer")&&u.data("layout"))return u.data("layout");var y={},U={},F={},P={},ea=b([]),v=
-q.container,K=q.id,z={options:r,state:q,container:u,panes:y,contents:U,resizers:F,togglers:P,hide:Ta,show:Fa,toggle:na,open:ra,close:ja,slideOpen:sb,slideClose:Wa,slideToggle:function(a){a=A.call(this,a);na(a,!0)},setSizeLimits:Y,_sizePane:ka,sizePane:Ca,sizeContent:pa,swapPanes:function(a,c){function f(a){var d=y[a],c=U[a];return!d?!1:{pane:a,P:d?d[0]:!1,C:c?c[0]:!1,state:b.extend(!0,{},q[a]),options:b.extend(!0,{},r[a])}}function h(a,c){if(a){var e=a.P,f=a.C,g=a.pane,j=k[c],m=b.extend(!0,{},q[c]),
-n=r[c],w={resizerCursor:n.resizerCursor};b.each(["fxName","fxSpeed","fxSettings"],function(a,b){w[b+"_open"]=n[b+"_open"];w[b+"_close"]=n[b+"_close"];w[b+"_size"]=n[b+"_size"]});y[c]=b(e).data({layoutPane:z[c],layoutEdge:c}).css(k.hidden).css(j.cssReq);U[c]=f?b(f):!1;r[c]=b.extend(!0,{},a.options,w);q[c]=b.extend(!0,{},a.state);e.className=e.className.replace(RegExp(n.paneClass+"-"+g,"g"),n.paneClass+"-"+c);Pa(c);j.dir!=k[g].dir?(e=p[c]||0,Y(c),e=d(e,q[c].minSize),Ca(c,e,!0,!0)):F[c].css(j.side,v.inset[j.side]+
-(q[c].isVisible?ga(c):0));a.state.isVisible&&!m.isVisible?Ua(c,!0):(Da(c),ma(c,!0));a=null}}if(H()){var g=A.call(this,a);q[g].edge=c;q[c].edge=g;if(!1===C("onswap_start",g)||!1===C("onswap_start",c))q[g].edge=g,q[c].edge=c;else{var j=f(g),n=f(c),p={};p[g]=j?j.state.size:0;p[c]=n?n.state.size:0;y[g]=!1;y[c]=!1;q[g]={};q[c]={};P[g]&&P[g].remove();P[c]&&P[c].remove();F[g]&&F[g].remove();F[c]&&F[c].remove();F[g]=F[c]=P[g]=P[c]=!1;h(j,c);h(n,g);j=n=p=null;y[g]&&y[g].css(k.visible);y[c]&&y[c].css(k.visible);
-oa();C("onswap_end",g);C("onswap_end",c)}}},showMasks:va,hideMasks:za,initContent:Sa,addPane:ib,removePane:Ra,createChildren:Qa,refreshChildren:Ba,enableClosable:pb,disableClosable:function(a,b){if(H()){var c=A.call(this,a),d=P[c];d&&(r[c].closable=!1,q[c].isClosed&&ra(c,!1,!0),d.unbind("."+K).css("visibility",b?"hidden":"visible").css("cursor","default").attr("title",""))}},enableSlidable:function(a){if(H()){a=A.call(this,a);var b=F[a];b&&b.data("draggable")&&(r[a].slidable=!0,q[a].isClosed&&ma(a,
-!0))}},disableSlidable:function(a){if(H()){a=A.call(this,a);var b=F[a];b&&(r[a].slidable=!1,q[a].isSliding?ja(a,!1,!0):(ma(a,!1),b.css("cursor","default").attr("title",""),da(null,b[0])))}},enableResizable:function(a){if(H()){a=A.call(this,a);var b=F[a],c=r[a];b&&b.data("draggable")&&(c.resizable=!0,b.draggable("enable"),q[a].isClosed||b.css("cursor",c.resizerCursor).attr("title",c.tips.Resize))}},disableResizable:function(a){if(H()){a=A.call(this,a);var b=F[a];b&&b.data("draggable")&&(r[a].resizable=
-!1,b.draggable("disable").css("cursor","default").attr("title",""),da(null,b[0]))}},allowOverflow:x,resetOverflow:X,destroy:function(a,c){b(window).unbind("."+K);b(document).unbind("."+K);"object"===typeof a?A(a):c=a;u.clearQueue().removeData("layout").removeData("layoutContainer").removeClass(r.containerClass).unbind("."+K);ea.remove();b.each(k.allPanes,function(a,b){Ra(b,!1,!0,c)});u.data("layoutCSS")&&!u.data("layoutRole")&&u.css(u.data("layoutCSS")).removeData("layoutCSS");"BODY"===v.tagName&&
-(u=b("html")).data("layoutCSS")&&u.css(u.data("layoutCSS")).removeData("layoutCSS");j(z,b.layout.onDestroy);mb();for(var d in z)d.match(/^(container|options)$/)||delete z[d];z.destroyed=!0;return z},initPanes:H,resizeAll:oa,runCallbacks:C,hasParentLayout:!1,children:ba,north:!1,south:!1,west:!1,east:!1,center:!1},Xa;var V,Ya,N,Ha,la,sa,W;h=b.layout.transformData(h,!0);h=b.layout.backwardCompatibility.renameAllOptions(h);if(!b.isEmptyObject(h.panes)){V=b.layout.optionsMap.noDefault;la=0;for(sa=V.length;la<
-sa;la++)N=V[la],delete h.panes[N];V=b.layout.optionsMap.layout;la=0;for(sa=V.length;la<sa;la++)N=V[la],delete h.panes[N]}V=b.layout.optionsMap.layout;var Bb=b.layout.config.optionRootKeys;for(N in h)Ha=h[N],0>b.inArray(N,Bb)&&0>b.inArray(N,V)&&(h.panes[N]||(h.panes[N]=b.isPlainObject(Ha)?b.extend(!0,{},Ha):Ha),delete h[N]);b.extend(!0,r,h);b.each(k.allPanes,function(a,c){k[c]=b.extend(!0,{},k.panes,k[c]);Ya=r.panes;W=r[c];if("center"===c){V=b.layout.optionsMap.center;a=0;for(sa=V.length;a<sa;a++)if(N=
-V[a],!h.center[N]&&(h.panes[N]||!W[N]))W[N]=Ya[N]}else{W=r[c]=b.extend(!0,{},Ya,W);var d=r[c],f=r.panes;d.fxSettings||(d.fxSettings={});f.fxSettings||(f.fxSettings={});b.each(["_open","_close","_size"],function(a,e){var h="fxName"+e,j="fxSpeed"+e,k="fxSettings"+e,l=d[h]=d[h]||f[h]||d.fxName||f.fxName||"none",p=b.effects&&(b.effects[l]||b.effects.effect&&b.effects.effect[l]);if("none"===l||!r.effects[l]||!p)l=d[h]="none";l=r.effects[l]||{};h=l.all||null;l=l[c]||null;d[j]=d[j]||f[j]||d.fxSpeed||f.fxSpeed||
-null;d[k]=b.extend(!0,{},h,l,f.fxSettings,d.fxSettings,f[k],d[k])});delete d.fxName;delete d.fxSpeed;delete d.fxSettings;W.resizerClass||(W.resizerClass="ui-layout-resizer");W.togglerClass||(W.togglerClass="ui-layout-toggler")}W.paneClass||(W.paneClass="ui-layout-pane")});var Ia=h.zIndex,xa=r.zIndexes;0<Ia&&(xa.pane_normal=Ia,xa.content_mask=d(Ia+1,xa.content_mask),xa.resizer_normal=d(Ia+2,xa.resizer_normal));delete r.panes;var Cb=r,tb=q;tb.creatingLayout=!0;j(z,b.layout.onCreate);if(!1===C("onload_start"))Xa=
-"cancel";else{var Za=u[0],$=b("html"),ub=v.tagName=Za.tagName,vb=v.id=Za.id,wb=v.className=Za.className,L=r,Ja=L.name,$a={},Ka=u.data("parentLayout"),La=u.data("layoutEdge"),ab=Ka&&La,ta=b.layout.cssNum,bb,aa;v.selector=u.selector.split(".slice")[0];v.ref=(L.name?L.name+" layout / ":"")+ub+(vb?"#"+vb:wb?".["+wb+"]":"");v.isBody="BODY"===ub;!ab&&!v.isBody&&(bb=u.closest("."+b.layout.defaults.panes.paneClass),Ka=bb.data("parentLayout"),La=bb.data("layoutEdge"),ab=Ka&&La);u.data({layout:z,layoutContainer:K}).addClass(L.containerClass);
-var xb={destroy:"",initPanes:"",resizeAll:"resizeAll",resize:"resizeAll"};for(Ja in xb)u.bind("layout"+Ja.toLowerCase()+"."+K,z[xb[Ja]||Ja]);ab&&(z.hasParentLayout=!0,Ka.refreshChildren(La,z));u.data("layoutCSS")||(v.isBody?(u.data("layoutCSS",b.extend(D(u,"position,margin,padding,border"),{height:u.css("height"),overflow:u.css("overflow"),overflowX:u.css("overflowX"),overflowY:u.css("overflowY")})),$.data("layoutCSS",b.extend(D($,"padding"),{height:"auto",overflow:$.css("overflow"),overflowX:$.css("overflowX"),
-overflowY:$.css("overflowY")}))):u.data("layoutCSS",D(u,"position,margin,padding,border,top,bottom,left,right,width,height,overflow,overflowX,overflowY")));try{$a={overflow:"hidden",overflowX:"hidden",overflowY:"hidden"};u.css($a);L.inset&&!b.isPlainObject(L.inset)&&(aa=parseInt(L.inset,10)||0,L.inset={top:aa,bottom:aa,left:aa,right:aa});if(v.isBody)L.outset?b.isPlainObject(L.outset)||(aa=parseInt(L.outset,10)||0,L.outset={top:aa,bottom:aa,left:aa,right:aa}):L.outset={top:ta($,"paddingTop"),bottom:ta($,
-"paddingBottom"),left:ta($,"paddingLeft"),right:ta($,"paddingRight")},$.css($a).css({height:"100%",border:"none",padding:0,margin:0}),G.isIE6?(u.css({width:"100%",height:"100%",border:"none",padding:0,margin:0,position:"relative"}),L.inset||(L.inset=R(u).inset)):(u.css({width:"auto",height:"auto",margin:0,position:"absolute"}),u.css(L.outset)),b.extend(v,R(u,L.inset));else{var yb=u.css("position");(!yb||!yb.match(/(fixed|absolute|relative)/))&&u.css("position","relative");u.is(":visible")&&(b.extend(v,
-R(u,L.inset)),1>v.innerHeight&&ca(L.errors.noContainerHeight.replace(/CONTAINER/,v.ref)))}ta(u,"minWidth")&&u.parent().css("overflowX","auto");ta(u,"minHeight")&&u.parent().css("overflowY","auto")}catch(Db){}nb();b(window).bind("unload."+K,mb);j(z,b.layout.onLoad);Cb.initPanes&&Aa();delete tb.creatingLayout;Xa=q.initialized}return"cancel"===Xa?null:z}})(jQuery);
-(function(b){b.ui||(b.ui={});b.ui.cookie={acceptsCookies:!!navigator.cookieEnabled,read:function(a){for(var d=document.cookie,d=d?d.split(";"):[],c,f=0,j=d.length;f<j;f++)if(c=b.trim(d[f]).split("="),c[0]==a)return decodeURIComponent(c[1]);return null},write:function(a,d,c){var f="",j="",h=!1;c=c||{};var p=c.expires||null,x=b.type(p);"date"===x?j=p:"string"===x&&0<p&&(p=parseInt(p,10),x="number");"number"===x&&(j=new Date,0<p?j.setDate(j.getDate()+p):(j.setFullYear(1970),h=!0));j&&(f+=";expires="+
-j.toUTCString());c.path&&(f+=";path="+c.path);c.domain&&(f+=";domain="+c.domain);c.secure&&(f+=";secure");document.cookie=a+"="+(h?"":encodeURIComponent(d))+f},clear:function(a){b.ui.cookie.write(a,"",{expires:-1})}};b.cookie||(b.cookie=function(a,d,c){var f=b.ui.cookie;if(null===d)f.clear(a);else{if(void 0===d)return f.read(a);f.write(a,d,c)}});b.layout.plugins.stateManagement=!0;b.layout.config.optionRootKeys.push("stateManagement");b.layout.defaults.stateManagement={enabled:!1,autoSave:!0,autoLoad:!0,
-animateLoad:!0,includeChildren:!0,stateKeys:"north.size,south.size,east.size,west.size,north.isClosed,south.isClosed,east.isClosed,west.isClosed,north.isHidden,south.isHidden,east.isHidden,west.isHidden",cookie:{name:"",domain:"",path:"",expires:"",secure:!1}};b.layout.optionsMap.layout.push("stateManagement");b.layout.state={saveCookie:function(a,d,c){var f=a.options,j=f.stateManagement;c=b.extend(!0,{},j.cookie,c||null);a=a.state.stateData=a.readState(d||j.stateKeys);b.ui.cookie.write(c.name||f.name||
-"Layout",b.layout.state.encodeJSON(a),c);return b.extend(!0,{},a)},deleteCookie:function(a){a=a.options;b.ui.cookie.clear(a.stateManagement.cookie.name||a.name||"Layout")},readCookie:function(a){a=a.options;return(a=b.ui.cookie.read(a.stateManagement.cookie.name||a.name||"Layout"))?b.layout.state.decodeJSON(a):{}},loadCookie:function(a){var d=b.layout.state.readCookie(a);d&&(a.state.stateData=b.extend(!0,{},d),a.loadState(d));return d},loadState:function(a,d,c){if(b.isPlainObject(d)&&!b.isEmptyObject(d))if(d=
-a.state.stateData=b.layout.transformData(d),c=b.extend({animateLoad:!1,includeChildren:a.options.stateManagement.includeChildren},c),a.state.initialized){var f=!c.animateLoad,j,h,p,x;b.each(b.layout.config.borderPanes,function(c,G){S=d[G];b.isPlainObject(S)&&(s=S.size,j=S.initClosed,h=S.initHidden,ar=S.autoResize,p=a.state[G],x=p.isVisible,ar&&(p.autoResize=ar),x||a._sizePane(G,s,!1,!1,!1),!0===h?a.hide(G,f):!0===j?a.close(G,!1,f):!1===j?a.open(G,!1,f):!1===h&&a.show(G,!1,f),x&&a._sizePane(G,s,!1,
-!1,f))});if(c.includeChildren){var I,T;b.each(a.children,function(a,c){(I=d[a]?d[a].children:0)&&c&&b.each(c,function(a,b){T=I[a];b&&T&&b.loadState(T)})})}}else{var S=b.extend(!0,{},d);b.each(b.layout.config.allPanes,function(a,b){S[b]&&delete S[b].children});b.extend(!0,a.options,S)}},readState:function(a,d){"string"===b.type(d)&&(d={keys:d});d||(d={});var c=a.options.stateManagement,f=d.includeChildren,f=void 0!==f?f:c.includeChildren,c=d.stateKeys||c.stateKeys,j={isClosed:"initClosed",isHidden:"initHidden"},
-h=a.state,p=b.layout.config.allPanes,x={},I,T,S,X,G,k;b.isArray(c)&&(c=c.join(","));for(var c=c.replace(/__/g,".").split(","),Q=0,O=c.length;Q<O;Q++)I=c[Q].split("."),T=I[0],I=I[1],0>b.inArray(T,p)||(S=h[T][I],void 0!=S&&("isClosed"==I&&h[T].isSliding&&(S=!0),(x[T]||(x[T]={}))[j[I]?j[I]:I]=S));f&&b.each(p,function(c,d){G=a.children[d];X=h.stateData[d];b.isPlainObject(G)&&!b.isEmptyObject(G)&&(k=x[d]||(x[d]={}),k.children||(k.children={}),b.each(G,function(a,c){c.state.initialized?k.children[a]=b.layout.state.readState(c):
-X&&(X.children&&X.children[a])&&(k.children[a]=b.extend(!0,{},X.children[a]))}))});return x},encodeJSON:function(a){function d(a){var f=[],j=0,h,p,x,I=b.isArray(a);for(h in a)p=a[h],x=typeof p,"string"==x?p='"'+p+'"':"object"==x&&(p=d(p)),f[j++]=(!I?'"'+h+'":':"")+p;return(I?"[":"{")+f.join(",")+(I?"]":"}")}return d(a)},decodeJSON:function(a){try{return b.parseJSON?b.parseJSON(a):window.eval("("+a+")")||{}}catch(d){return{}}},_create:function(a){var d=b.layout.state,c=a.options.stateManagement;b.extend(a,
-{readCookie:function(){return d.readCookie(a)},deleteCookie:function(){d.deleteCookie(a)},saveCookie:function(b,c){return d.saveCookie(a,b,c)},loadCookie:function(){return d.loadCookie(a)},loadState:function(b,c){d.loadState(a,b,c)},readState:function(b){return d.readState(a,b)},encodeJSON:d.encodeJSON,decodeJSON:d.decodeJSON});a.state.stateData={};if(c.autoLoad)if(b.isPlainObject(c.autoLoad))b.isEmptyObject(c.autoLoad)||a.loadState(c.autoLoad);else if(c.enabled)if(b.isFunction(c.autoLoad)){var f=
-{};try{f=c.autoLoad(a,a.state,a.options,a.options.name||"")}catch(j){}f&&(b.isPlainObject(f)&&!b.isEmptyObject(f))&&a.loadState(f)}else a.loadCookie()},_unload:function(a){var d=a.options.stateManagement;if(d.enabled&&d.autoSave)if(b.isFunction(d.autoSave))try{d.autoSave(a,a.state,a.options,a.options.name||"")}catch(c){}else a.saveCookie()}};b.layout.onCreate.push(b.layout.state._create);b.layout.onUnload.push(b.layout.state._unload);b.layout.plugins.buttons=!0;b.layout.defaults.autoBindCustomButtons=
-!1;b.layout.optionsMap.layout.push("autoBindCustomButtons");b.layout.buttons={init:function(a){var d=a.options.name||"",c;b.each("toggle open close pin toggle-slide open-slide".split(" "),function(f,j){b.each(b.layout.config.borderPanes,function(f,p){b(".ui-layout-button-"+j+"-"+p).each(function(){c=b(this).data("layoutName")||b(this).attr("layoutName");(void 0==c||c===d)&&a.bindButton(this,j,p)})})})},get:function(a,d,c,f){var j=b(d);a=a.options;var h=a.errors.addButtonError;j.length?0>b.inArray(c,
-b.layout.config.borderPanes)?(b.layout.msg(h+" "+a.errors.pane+": "+c,!0),j=b("")):(d=a[c].buttonClass+"-"+f,j.addClass(d+" "+d+"-"+c).data("layoutName",a.name)):b.layout.msg(h+" "+a.errors.selector+": "+d,!0);return j},bind:function(a,d,c,f){var j=b.layout.buttons;switch(c.toLowerCase()){case "toggle":j.addToggle(a,d,f);break;case "open":j.addOpen(a,d,f);break;case "close":j.addClose(a,d,f);break;case "pin":j.addPin(a,d,f);break;case "toggle-slide":j.addToggle(a,d,f,!0);break;case "open-slide":j.addOpen(a,
-d,f,!0)}return a},addToggle:function(a,d,c,f){b.layout.buttons.get(a,d,c,"toggle").click(function(b){a.toggle(c,!!f);b.stopPropagation()});return a},addOpen:function(a,d,c,f){b.layout.buttons.get(a,d,c,"open").attr("title",a.options[c].tips.Open).click(function(b){a.open(c,!!f);b.stopPropagation()});return a},addClose:function(a,d,c){b.layout.buttons.get(a,d,c,"close").attr("title",a.options[c].tips.Close).click(function(b){a.close(c);b.stopPropagation()});return a},addPin:function(a,d,c){var f=b.layout.buttons,
-j=f.get(a,d,c,"pin");if(j.length){var h=a.state[c];j.click(function(d){f.setPinState(a,b(this),c,h.isSliding||h.isClosed);h.isSliding||h.isClosed?a.open(c):a.close(c);d.stopPropagation()});f.setPinState(a,j,c,!h.isClosed&&!h.isSliding);h.pins.push(d)}return a},setPinState:function(a,b,c,f){var j=b.attr("pin");if(!(j&&f===("down"==j))){a=a.options[c];var j=a.buttonClass+"-pin",h=j+"-"+c;c=j+"-up "+h+"-up";j=j+"-down "+h+"-down";b.attr("pin",f?"down":"up").attr("title",f?a.tips.Unpin:a.tips.Pin).removeClass(f?
-c:j).addClass(f?j:c)}},syncPinBtns:function(a,d,c){b.each(a.state[d].pins,function(f,j){b.layout.buttons.setPinState(a,b(j),d,c)})},_load:function(a){var d=b.layout.buttons;b.extend(a,{bindButton:function(b,c,h){return d.bind(a,b,c,h)},addToggleBtn:function(b,c,h){return d.addToggle(a,b,c,h)},addOpenBtn:function(b,c,h){return d.addOpen(a,b,c,h)},addCloseBtn:function(b,c){return d.addClose(a,b,c)},addPinBtn:function(b,c){return d.addPin(a,b,c)}});for(var c=0;4>c;c++)a.state[b.layout.config.borderPanes[c]].pins=
-[];a.options.autoBindCustomButtons&&d.init(a)},_unload:function(){}};b.layout.onLoad.push(b.layout.buttons._load);b.layout.plugins.browserZoom=!0;b.layout.defaults.browserZoomCheckInterval=1E3;b.layout.optionsMap.layout.push("browserZoomCheckInterval");b.layout.browserZoom={_init:function(a){!1!==b.layout.browserZoom.ratio()&&b.layout.browserZoom._setTimer(a)},_setTimer:function(a){if(!a.destroyed){var d=a.options,c=a.state,f=a.hasParentLayout?5E3:Math.max(d.browserZoomCheckInterval,100);setTimeout(function(){if(!a.destroyed&&
-d.resizeWithWindow){var f=b.layout.browserZoom.ratio();f!==c.browserZoom&&(c.browserZoom=f,a.resizeAll());b.layout.browserZoom._setTimer(a)}},f)}},ratio:function(){function a(a,b){return(100*(parseInt(a,10)/parseInt(b,10))).toFixed()}var d=window,c=screen,f=document,j=f.documentElement||f.body,h=b.layout.browser,p=h.version,x,I,T;return h.msie&&8<p||!h.msie?!1:c.deviceXDPI&&c.systemXDPI?a(c.deviceXDPI,c.systemXDPI):h.webkit&&(x=f.body.getBoundingClientRect)?a(x.left-x.right,f.body.offsetWidth):h.webkit&&
+/*
+ jquery.layout 1.3.0 - Release Candidate 30.79
+ $Date: 2013-01-01 08:00:00 (Tue, 1 Jan 2013) $
+ $Rev: 303007 $
+
+ Copyright (c) 2013 Kevin Dalman (http://allpro.net)
+ Based on work by Fabrizio Balliano (http://www.fabrizioballiano.net)
+
+ Dual licensed under the GPL (http://www.gnu.org/licenses/gpl.html)
+ and MIT (http://www.opensource.org/licenses/mit-license.php) licenses.
+
+ SEE: http://layout.jquery-dev.net/LICENSE.txt
+
+ Changelog: http://layout.jquery-dev.net/changelog.cfm#1.3.0.rc30.79
+
+ Docs: http://layout.jquery-dev.net/documentation.html
+ Tips: http://layout.jquery-dev.net/tips.html
+ Help: http://groups.google.com/group/jquery-ui-layout
+*/
+(function(b){var a=Math.min,d=Math.max,c=Math.floor,f=function(a){return"string"===b.type(a)},j=function(a,d){if(b.isArray(d))for(var c=0,j=d.length;c<j;c++){var h=d[c];try{f(h)&&(h=eval(h)),b.isFunction(h)&&h(a)}catch(k){}}};b.layout={version:"1.3.rc30.79",revision:0.033007,browser:{},effects:{slide:{all:{duration:"fast"},north:{direction:"up"},south:{direction:"down"},east:{direction:"right"},west:{direction:"left"}},drop:{all:{duration:"slow"},north:{direction:"up"},south:{direction:"down"},east:{direction:"right"},
+west:{direction:"left"}},scale:{all:{duration:"fast"}},blind:{},clip:{},explode:{},fade:{},fold:{},puff:{},size:{all:{easing:"swing"}}},config:{optionRootKeys:"effects panes north south west east center".split(" "),allPanes:["north","south","west","east","center"],borderPanes:["north","south","west","east"],oppositeEdge:{north:"south",south:"north",east:"west",west:"east"},offscreenCSS:{left:"-99999px",right:"auto"},offscreenReset:"offscreenReset",hidden:{visibility:"hidden"},visible:{visibility:"visible"},
+resizers:{cssReq:{position:"absolute",padding:0,margin:0,fontSize:"1px",textAlign:"left",overflow:"hidden"},cssDemo:{background:"#DDD",border:"none"}},togglers:{cssReq:{position:"absolute",display:"block",padding:0,margin:0,overflow:"hidden",textAlign:"center",fontSize:"1px",cursor:"pointer",zIndex:1},cssDemo:{background:"#AAA"}},content:{cssReq:{position:"relative"},cssDemo:{overflow:"auto",padding:"10px"},cssDemoPane:{overflow:"hidden",padding:0}},panes:{cssReq:{position:"absolute",margin:0},cssDemo:{padding:"10px",
+background:"#FFF",border:"1px solid #BBB",overflow:"auto"}},north:{side:"top",sizeType:"Height",dir:"horz",cssReq:{top:0,bottom:"auto",left:0,right:0,width:"auto"}},south:{side:"bottom",sizeType:"Height",dir:"horz",cssReq:{top:"auto",bottom:0,left:0,right:0,width:"auto"}},east:{side:"right",sizeType:"Width",dir:"vert",cssReq:{left:"auto",right:0,top:"auto",bottom:"auto",height:"auto"}},west:{side:"left",sizeType:"Width",dir:"vert",cssReq:{left:0,right:"auto",top:"auto",bottom:"auto",height:"auto"}},
+center:{dir:"center",cssReq:{left:"auto",right:"auto",top:"auto",bottom:"auto",height:"auto",width:"auto"}}},callbacks:{},getParentPaneElem:function(a){a=b(a);if(a=a.data("layout")||a.data("parentLayout")){a=a.container;if(a.data("layoutPane"))return a;a=a.closest("."+b.layout.defaults.panes.paneClass);if(a.data("layoutPane"))return a}return null},getParentPaneInstance:function(a){return(a=b.layout.getParentPaneElem(a))?a.data("layoutPane"):null},getParentLayoutInstance:function(a){return(a=b.layout.getParentPaneElem(a))?
+a.data("parentLayout"):null},getEventObject:function(b){return"object"===typeof b&&b.stopPropagation?b:null},parsePaneName:function(a){var d=b.layout.getEventObject(a);d&&(d.stopPropagation(),a=b(this).data("layoutEdge"));a&&!/^(west|east|north|south|center)$/.test(a)&&(b.layout.msg('LAYOUT ERROR - Invalid pane-name: "'+a+'"'),a="error");return a},plugins:{draggable:!!b.fn.draggable,effects:{core:!!b.effects,slide:b.effects&&(b.effects.slide||b.effects.effect&&b.effects.effect.slide)}},onCreate:[],
+onLoad:[],onReady:[],onDestroy:[],onUnload:[],afterOpen:[],afterClose:[],scrollbarWidth:function(){return window.scrollbarWidth||b.layout.getScrollbarSize("width")},scrollbarHeight:function(){return window.scrollbarHeight||b.layout.getScrollbarSize("height")},getScrollbarSize:function(a){var d=b('<div style="position: absolute; top: -10000px; left: -10000px; width: 100px; height: 100px; overflow: scroll;"></div>').appendTo("body"),c={width:d.css("width")-d[0].clientWidth,height:d.height()-d[0].clientHeight};
+d.remove();window.scrollbarWidth=c.width;window.scrollbarHeight=c.height;return a.match(/^(width|height)$/)?c[a]:c},showInvisibly:function(b,a){if(b&&b.length&&(a||"none"===b.css("display"))){var d=b[0].style,d={display:d.display||"",visibility:d.visibility||""};b.css({display:"block",visibility:"hidden"});return d}return{}},getElementDimensions:function(a,c){var f={css:{},inset:{}},j=f.css,h={bottom:0},k=b.layout.cssNum,p=a.offset(),O,R,D;f.offsetLeft=p.left;f.offsetTop=p.top;c||(c={});b.each(["Left",
+"Right","Top","Bottom"],function(d,k){O=j["border"+k]=b.layout.borderWidth(a,k);R=j["padding"+k]=b.layout.cssNum(a,"padding"+k);D=k.toLowerCase();f.inset[D]=0<=c[D]?c[D]:R;h[D]=f.inset[D]+O});j.width=a.width();j.height=a.height();j.top=k(a,"top",!0);j.bottom=k(a,"bottom",!0);j.left=k(a,"left",!0);j.right=k(a,"right",!0);f.outerWidth=a.outerWidth();f.outerHeight=a.outerHeight();f.innerWidth=d(0,f.outerWidth-h.left-h.right);f.innerHeight=d(0,f.outerHeight-h.top-h.bottom);f.layoutWidth=a.innerWidth();
+f.layoutHeight=a.innerHeight();return f},getElementStyles:function(b,a){var d={},c=b[0].style,f=a.split(","),k=["Top","Bottom","Left","Right"],j=["Color","Style","Width"],h,p,D,x,A,r;for(x=0;x<f.length;x++)if(h=f[x],h.match(/(border|padding|margin)$/))for(A=0;4>A;A++)if(p=k[A],"border"===h)for(r=0;3>r;r++)D=j[r],d[h+p+D]=c[h+p+D];else d[h+p]=c[h+p];else d[h]=c[h];return d},cssWidth:function(a,c){if(0>=c)return 0;var f=!b.layout.browser.boxModel?"border-box":b.support.boxSizing?a.css("boxSizing"):
+"content-box",j=b.layout.borderWidth,h=b.layout.cssNum,k=c;"border-box"!==f&&(k-=j(a,"Left")+j(a,"Right"));"content-box"===f&&(k-=h(a,"paddingLeft")+h(a,"paddingRight"));return d(0,k)},cssHeight:function(a,c){if(0>=c)return 0;var f=!b.layout.browser.boxModel?"border-box":b.support.boxSizing?a.css("boxSizing"):"content-box",j=b.layout.borderWidth,h=b.layout.cssNum,k=c;"border-box"!==f&&(k-=j(a,"Top")+j(a,"Bottom"));"content-box"===f&&(k-=h(a,"paddingTop")+h(a,"paddingBottom"));return d(0,k)},cssNum:function(a,
+d,c){a.jquery||(a=b(a));var f=b.layout.showInvisibly(a);d=b.css(a[0],d,!0);c=c&&"auto"==d?d:Math.round(parseFloat(d)||0);a.css(f);return c},borderWidth:function(a,d){a.jquery&&(a=a[0]);var c="border"+d.substr(0,1).toUpperCase()+d.substr(1);return"none"===b.css(a,c+"Style",!0)?0:Math.round(parseFloat(b.css(a,c+"Width",!0))||0)},isMouseOverElem:function(a,d){var c=b(d||this),f=c.offset(),j=f.top,f=f.left,k=f+c.outerWidth(),c=j+c.outerHeight(),h=a.pageX,p=a.pageY;return b.layout.browser.msie&&0>h&&0>
+p||h>=f&&h<=k&&p>=j&&p<=c},msg:function(a,d,c,f){b.isPlainObject(a)&&window.debugData?("string"===typeof d?(f=c,c=d):"object"===typeof c&&(f=c,c=null),c=c||"log( <object> )",f=b.extend({sort:!1,returnHTML:!1,display:!1},f),!0===d||f.display?debugData(a,c,f):window.console&&console.log(debugData(a,c,f))):d?alert(a):window.console?console.log(a):(d=b("#layoutLogger"),d.length||(d=b('<div id="layoutLogger" style="position: '+(b.support.fixedPosition?"fixed":"absolute")+'; top: 5px; z-index: 999999; max-width: 25%; overflow: hidden; border: 1px solid #000; border-radius: 5px; background: #FBFBFB; box-shadow: 0 2px 10px rgba(0,0,0,0.3);"><div style="font-size: 13px; font-weight: bold; padding: 5px 10px; background: #F6F6F6; border-radius: 5px 5px 0 0; cursor: move;"><span style="float: right; padding-left: 7px; cursor: pointer;" title="Remove Console" onclick="$(this).closest(\'#layoutLogger\').remove()">X</span>Layout console.log</div><ul style="font-size: 13px; font-weight: none; list-style: none; margin: 0; padding: 0 0 2px;"></ul></div>').appendTo("body"),
+d.css("left",b(window).width()-d.outerWidth()-5),b.ui.draggable&&d.draggable({handle:":first-child"})),d.children("ul").append('<li style="padding: 4px 10px; margin: 0; border-top: 1px solid #CCC;">'+a.replace(/\</g,"&lt;").replace(/\>/g,"&gt;")+"</li>"))}};var h=navigator.userAgent.toLowerCase(),p=/(chrome)[ \/]([\w.]+)/.exec(h)||/(webkit)[ \/]([\w.]+)/.exec(h)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(h)||/(msie) ([\w.]+)/.exec(h)||0>h.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(h)||
+[],h=p[1]||"",p=p[2]||0,x="msie"===h;b.layout.browser={version:p,safari:"webkit"===h,webkit:"chrome"===h,msie:x,isIE6:x&&6==p,boxModel:!x||!1!==b.support.boxModel};h&&(b.layout.browser[h]=!0);x&&b(function(){b.layout.browser.boxModel=b.support.boxModel});b.layout.defaults={name:"",containerClass:"ui-layout-container",inset:null,scrollToBookmarkOnLoad:!0,resizeWithWindow:!0,resizeWithWindowDelay:200,resizeWithWindowMaxDelay:0,maskPanesEarly:!1,onresizeall_start:null,onresizeall_end:null,onload_start:null,
+onload_end:null,onunload_start:null,onunload_end:null,initPanes:!0,showErrorMessages:!0,showDebugMessages:!1,zIndex:null,zIndexes:{pane_normal:0,content_mask:1,resizer_normal:2,pane_sliding:100,pane_animate:1E3,resizer_drag:1E4},errors:{pane:"pane",selector:"selector",addButtonError:"Error Adding Button\nInvalid ",containerMissing:"UI Layout Initialization Error\nThe specified layout-container does not exist.",centerPaneMissing:"UI Layout Initialization Error\nThe center-pane element does not exist.\nThe center-pane is a required element.",
+noContainerHeight:"UI Layout Initialization Warning\nThe layout-container \"CONTAINER\" has no height.\nTherefore the layout is 0-height and hence 'invisible'!",callbackError:"UI Layout Callback Error\nThe EVENT callback is not a valid function."},panes:{applyDemoStyles:!1,closable:!0,resizable:!0,slidable:!0,initClosed:!1,initHidden:!1,contentSelector:".ui-layout-content",contentIgnoreSelector:".ui-layout-ignore",findNestedContent:!1,paneClass:"ui-layout-pane",resizerClass:"ui-layout-resizer",togglerClass:"ui-layout-toggler",
+buttonClass:"ui-layout-button",minSize:0,maxSize:0,spacing_open:6,spacing_closed:6,togglerLength_open:50,togglerLength_closed:50,togglerAlign_open:"center",togglerAlign_closed:"center",togglerContent_open:"",togglerContent_closed:"",resizerDblClickToggle:!0,autoResize:!0,autoReopen:!0,resizerDragOpacity:1,maskContents:!1,maskObjects:!1,maskZindex:null,resizingGrid:!1,livePaneResizing:!1,liveContentResizing:!1,liveResizingTolerance:1,sliderCursor:"pointer",slideTrigger_open:"click",slideTrigger_close:"mouseleave",
+slideDelay_open:300,slideDelay_close:300,hideTogglerOnSlide:!1,preventQuickSlideClose:b.layout.browser.webkit,preventPrematureSlideClose:!1,tips:{Open:"Open",Close:"Close",Resize:"Resize",Slide:"Slide Open",Pin:"Pin",Unpin:"Un-Pin",noRoomToOpen:"Not enough room to show this panel.",minSizeWarning:"Panel has reached its minimum size",maxSizeWarning:"Panel has reached its maximum size"},showOverflowOnHover:!1,enableCursorHotkey:!0,customHotkeyModifier:"SHIFT",fxName:"slide",fxSpeed:null,fxSettings:{},
+fxOpacityFix:!0,animatePaneSizing:!1,children:null,containerSelector:"",initChildren:!0,destroyChildren:!0,resizeChildren:!0,triggerEventsOnLoad:!1,triggerEventsDuringLiveResize:!0,onshow_start:null,onshow_end:null,onhide_start:null,onhide_end:null,onopen_start:null,onopen_end:null,onclose_start:null,onclose_end:null,onresize_start:null,onresize_end:null,onsizecontent_start:null,onsizecontent_end:null,onswap_start:null,onswap_end:null,ondrag_start:null,ondrag_end:null},north:{paneSelector:".ui-layout-north",
+size:"auto",resizerCursor:"n-resize",customHotkey:""},south:{paneSelector:".ui-layout-south",size:"auto",resizerCursor:"s-resize",customHotkey:""},east:{paneSelector:".ui-layout-east",size:200,resizerCursor:"e-resize",customHotkey:""},west:{paneSelector:".ui-layout-west",size:200,resizerCursor:"w-resize",customHotkey:""},center:{paneSelector:".ui-layout-center",minWidth:0,minHeight:0}};b.layout.optionsMap={layout:"name instanceKey stateManagement effects inset zIndexes errors zIndex scrollToBookmarkOnLoad showErrorMessages maskPanesEarly outset resizeWithWindow resizeWithWindowDelay resizeWithWindowMaxDelay onresizeall onresizeall_start onresizeall_end onload onload_start onload_end onunload onunload_start onunload_end".split(" "),
+center:"paneClass contentSelector contentIgnoreSelector findNestedContent applyDemoStyles triggerEventsOnLoad showOverflowOnHover maskContents maskObjects liveContentResizing containerSelector children initChildren resizeChildren destroyChildren onresize onresize_start onresize_end onsizecontent onsizecontent_start onsizecontent_end".split(" "),noDefault:["paneSelector","resizerCursor","customHotkey"]};b.layout.transformData=function(a,d){var c=d?{panes:{},center:{}}:{},f,j,k,h,p,x,D;if("object"!==
+typeof a)return c;for(j in a){f=c;p=a[j];k=j.split("__");D=k.length-1;for(x=0;x<=D;x++)h=k[x],x===D?f[h]=b.isPlainObject(p)?b.layout.transformData(p):p:(f[h]||(f[h]={}),f=f[h])}return c};b.layout.backwardCompatibility={map:{applyDefaultStyles:"applyDemoStyles",childOptions:"children",initChildLayout:"initChildren",destroyChildLayout:"destroyChildren",resizeChildLayout:"resizeChildren",resizeNestedLayout:"resizeChildren",resizeWhileDragging:"livePaneResizing",resizeContentWhileDragging:"liveContentResizing",
+triggerEventsWhileDragging:"triggerEventsDuringLiveResize",maskIframesOnResize:"maskContents",useStateCookie:"stateManagement.enabled","cookie.autoLoad":"stateManagement.autoLoad","cookie.autoSave":"stateManagement.autoSave","cookie.keys":"stateManagement.stateKeys","cookie.name":"stateManagement.cookie.name","cookie.domain":"stateManagement.cookie.domain","cookie.path":"stateManagement.cookie.path","cookie.expires":"stateManagement.cookie.expires","cookie.secure":"stateManagement.cookie.secure",
+noRoomToOpenTip:"tips.noRoomToOpen",togglerTip_open:"tips.Close",togglerTip_closed:"tips.Open",resizerTip:"tips.Resize",sliderTip:"tips.Slide"},renameOptions:function(a){function d(b,c){for(var f=b.split("."),k=f.length-1,j={branch:a,key:f[k]},r=0,q;r<k;r++)q=f[r],j.branch=void 0==j.branch[q]?c?j.branch[q]={}:{}:j.branch[q];return j}var c=b.layout.backwardCompatibility.map,f,j,k,h;for(h in c)f=d(h),k=f.branch[f.key],void 0!==k&&(j=d(c[h],!0),j.branch[j.key]=k,delete f.branch[f.key])},renameAllOptions:function(a){var d=
+b.layout.backwardCompatibility.renameOptions;d(a);a.defaults&&("object"!==typeof a.panes&&(a.panes={}),b.extend(!0,a.panes,a.defaults),delete a.defaults);a.panes&&d(a.panes);b.each(b.layout.config.allPanes,function(b,c){a[c]&&d(a[c])});return a}};b.fn.layout=function(h){function p(e){if(!e)return!0;var w=e.keyCode;if(33>w)return!0;var m={38:"north",40:"south",37:"west",39:"east"},a=e.shiftKey,g=e.ctrlKey,t,n,d,c;g&&(37<=w&&40>=w)&&r[m[w]].enableCursorHotkey?c=m[w]:(g||a)&&b.each(k.borderPanes,function(e,
+b){t=r[b];n=t.customHotkey;d=t.customHotkeyModifier;if(a&&"SHIFT"==d||g&&"CTRL"==d||g&&a)if(n&&w===(isNaN(n)||9>=n?n.toUpperCase().charCodeAt(0):n))return c=b,!1});if(!c||!y[c]||!r[c].closable||q[c].isHidden)return!0;na(c);e.stopPropagation();return e.returnValue=!1}function x(e){if(H()){this&&this.tagName&&(e=this);var w;f(e)?w=y[e]:b(e).data("layoutRole")?w=b(e):b(e).parents().each(function(){if(b(this).data("layoutRole"))return w=b(this),!1});if(w&&w.length){var m=w.data("layoutEdge");e=q[m];e.cssSaved&&
+X(m);if(e.isSliding||e.isResizing||e.isClosed)e.cssSaved=!1;else{var a={zIndex:r.zIndexes.resizer_normal+1},g={},t=w.css("overflow"),n=w.css("overflowX"),d=w.css("overflowY");"visible"!=t&&(g.overflow=t,a.overflow="visible");n&&!n.match(/(visible|auto)/)&&(g.overflowX=n,a.overflowX="visible");d&&!d.match(/(visible|auto)/)&&(g.overflowY=n,a.overflowY="visible");e.cssSaved=g;w.css(a);b.each(k.allPanes,function(e,b){b!=m&&X(b)})}}}}function X(e){if(H()){this&&this.tagName&&(e=this);var w;f(e)?w=y[e]:
+b(e).data("layoutRole")?w=b(e):b(e).parents().each(function(){if(b(this).data("layoutRole"))return w=b(this),!1});if(w&&w.length){e=w.data("layoutEdge");e=q[e];var m=e.cssSaved||{};!e.isSliding&&!e.isResizing&&w.css("zIndex",r.zIndexes.pane_normal);w.css(m);e.cssSaved=!1}}}var G=b.layout.browser,k=b.layout.config,Q=b.layout.cssWidth,O=b.layout.cssHeight,R=b.layout.getElementDimensions,D=b.layout.getElementStyles,Ma=b.layout.getEventObject,A=b.layout.parsePaneName,r=b.extend(!0,{},b.layout.defaults);
+r.effects=b.extend(!0,{},b.layout.effects);var q={id:"layout"+b.now(),initialized:!1,paneResizing:!1,panesSliding:{},container:{innerWidth:0,innerHeight:0,outerWidth:0,outerHeight:0,layoutWidth:0,layoutHeight:0},north:{childIdx:0},south:{childIdx:0},east:{childIdx:0},west:{childIdx:0},center:{childIdx:0}},ba={north:null,south:null,east:null,west:null,center:null},M={data:{},set:function(e,b,m){M.clear(e);M.data[e]=setTimeout(b,m)},clear:function(e){var b=M.data;b[e]&&(clearTimeout(b[e]),delete b[e])}},
+ca=function(e,w,m){var a=r;(a.showErrorMessages&&!m||m&&a.showDebugMessages)&&b.layout.msg(a.name+" / "+e,!1!==w);return!1},C=function(e,w,m){var a=w&&f(w),g=a?q[w]:q,t=a?r[w]:r,n=r.name,d=e+(e.match(/_/)?"":"_end"),c=d.match(/_end$/)?d.substr(0,d.length-4):"",l=t[d]||t[c],h="NC",k=[];!a&&"boolean"===b.type(w)&&(m=w,w="");if(l)try{f(l)&&(l.match(/,/)?(k=l.split(","),l=eval(k[0])):l=eval(l)),b.isFunction(l)&&(h=k.length?l(k[1]):a?l(w,y[w],g,t,n):l(z,g,t,n))}catch(j){ca(r.errors.callbackError.replace(/EVENT/,
+b.trim((w||"")+" "+d)),!1),"string"===b.type(j)&&string.length&&ca("Exception:  "+j,!1)}!m&&!1!==h&&(a?(m=y[w],t=r[w],g=q[w],m.triggerHandler("layoutpane"+d,[w,m,g,t,n]),c&&m.triggerHandler("layoutpane"+c,[w,m,g,t,n])):(u.triggerHandler("layout"+d,[z,g,t,n]),c&&u.triggerHandler("layout"+c,[z,g,t,n])));a&&"onresize_end"===e&&db(w+"",!0);return h},eb=function(e){if(!G.mozilla){var b=y[e];"IFRAME"===q[e].tagName?b.css(k.hidden).css(k.visible):b.find("IFRAME").css(k.hidden).css(k.visible)}},ya=function(e){var b=
+y[e];e=k[e].dir;b={minWidth:1001-Q(b,1E3),minHeight:1001-O(b,1E3)};"horz"===e&&(b.minSize=b.minHeight);"vert"===e&&(b.minSize=b.minWidth);return b},fa=function(e,w,m){m||(m=k[e].dir);f(w)&&w.match(/%/)&&(w="100%"===w?-1:parseInt(w,10)/100);if(0===w)return 0;if(1<=w)return parseInt(w,10);var a=r,g=0;"horz"==m?g=v.innerHeight-(y.north?a.north.spacing_open:0)-(y.south?a.south.spacing_open:0):"vert"==m&&(g=v.innerWidth-(y.west?a.west.spacing_open:0)-(y.east?a.east.spacing_open:0));if(-1===w)return g;
+if(0<w)return c(g*w);if("center"==e)return 0;m="horz"===m?"height":"width";a=y[e];e="height"===m?U[e]:!1;var g=b.layout.showInvisibly(a),t=a.css(m),n=e?e.css(m):0;a.css(m,"auto");e&&e.css(m,"auto");w="height"===m?a.outerHeight():a.outerWidth();a.css(m,t).css(g);e&&e.css(m,n);return w},ga=function(e,b){var a=y[e],E=r[e],g=q[e],t=b?E.spacing_open:0,E=b?E.spacing_closed:0;return!a||g.isHidden?0:g.isClosed||g.isSliding&&b?E:"horz"===k[e].dir?a.outerHeight()+t:a.outerWidth()+t},Y=function(e,b){if(H()){var m=
+r[e],E=q[e],g=k[e],t=g.dir;g.sizeType.toLowerCase();var g=void 0!=b?b:E.isSliding,n=m.spacing_open,c=k.oppositeEdge[e],f=q[c],l=y[c],h=!l||!1===f.isVisible||f.isSliding?0:"horz"==t?l.outerHeight():l.outerWidth(),c=(!l||f.isHidden?0:r[c][!1!==f.isClosed?"spacing_closed":"spacing_open"])||0,f="horz"==t?v.innerHeight:v.innerWidth,l=ya("center"),l="horz"==t?d(r.center.minHeight,l.minHeight):d(r.center.minWidth,l.minWidth),g=f-n-(g?0:fa("center",l,t)+h+c),t=E.minSize=d(fa(e,m.minSize),ya(e).minSize),g=
+E.maxSize=a(m.maxSize?fa(e,m.maxSize):1E5,g),E=E.resizerPosition={},n=v.inset.top,h=v.inset.left,c=v.innerWidth,f=v.innerHeight,m=m.spacing_open;switch(e){case "north":E.min=n+t;E.max=n+g;break;case "west":E.min=h+t;E.max=h+g;break;case "south":E.min=n+f-g-m;E.max=n+f-t-m;break;case "east":E.min=h+c-g-m,E.max=h+c-t-m}}},Na=function(e,a){var m=b(e),E=m.data("layoutRole"),g=m.data("layoutEdge"),t=r[g][E+"Class"],g="-"+g,n=m.hasClass(t+"-closed")?"-closed":"-open",d="-closed"===n?"-open":"-closed",n=
+t+"-hover "+(t+g+"-hover ")+(t+n+"-hover ")+(t+g+n+"-hover ");a&&(n+=t+d+"-hover "+(t+g+d+"-hover "));"resizer"==E&&m.hasClass(t+"-sliding")&&(n+=t+"-sliding-hover "+(t+g+"-sliding-hover "));return b.trim(n)},Oa=function(e,a){var m=b(a||this);e&&"toggler"===m.data("layoutRole")&&e.stopPropagation();m.addClass(Na(m))},da=function(e,a){var m=b(a||this);m.removeClass(Na(m,!0))},fb=function(){var e=b(this).data("layoutEdge"),a=q[e];!a.isClosed&&(!a.isResizing&&!q.paneResizing)&&(b.fn.disableSelection&&
+b("body").disableSelection(),r.maskPanesEarly&&va(e,{resizing:!0}))},gb=function(e,a){var m=a||this,E=b(m).data("layoutEdge"),g=E+"ResizerLeave";M.clear(E+"_openSlider");M.clear(g);a?q.paneResizing||(b.fn.enableSelection&&b("body").enableSelection(),r.maskPanesEarly&&za()):M.set(g,function(){gb(e,m)},200)},H=function(){return q.initialized||q.creatingLayout?!0:Aa()},Aa=function(e){var a=r;if(!u.is(":visible"))return!e&&(G.webkit&&"BODY"===u[0].tagName)&&setTimeout(function(){Aa(!0)},50),!1;if(!hb("center").length)return ca(a.errors.centerPaneMissing);
+q.creatingLayout=!0;b.extend(v,R(u,a.inset));A(void 0);b.each(k.allPanes,function(e,b){ib(b,!0)});Pa();b.each(k.borderPanes,function(e,b){y[b]&&q[b].isVisible&&(Y(b),ha(b))});ia("center");b.each(k.allPanes,function(e,b){jb(b)});a.scrollToBookmarkOnLoad&&(e=self.location,e.hash&&e.replace(e.hash));z.hasParentLayout?a.resizeWithWindow=!1:a.resizeWithWindow&&b(window).bind("resize."+K,Ab);delete q.creatingLayout;q.initialized=!0;j(z,b.layout.onReady);C("onload_end");return!0},Qa=function(e,a){var m=
+A.call(this,e),d=y[m];if(d){var g=U[m],t=q[m],n=r[m],c=r.stateManagement||{},n=a?n.children=a:n.children;if(b.isPlainObject(n))n=[n];else if(!n||!b.isArray(n))return;b.each(n,function(e,a){b.isPlainObject(a)&&(a.containerSelector?d.find(a.containerSelector):g||d).each(function(){var e=b(this),g=e.data("layout");if(!g){kb({container:e,options:a},t);if(c.includeChildren&&q.stateData[m]){var g=(q.stateData[m].children||{})[a.instanceKey],w=a.stateManagement||(a.stateManagement={autoLoad:!0});!0===w.autoLoad&&
+g&&(w.autoSave=!1,w.includeChildren=!0,w.autoLoad=b.extend(!0,{},g))}(g=e.layout(a))&&Ba(m,g)}})})}},kb=function(e,b){var a=e.container,d=e.options,g=d.stateManagement,t=d.instanceKey||a.data("layoutInstanceKey");t||(t=(g&&g.cookie?g.cookie.name:"")||d.name);t=t?t.replace(/[^\w-]/gi,"_").replace(/_{2,}/g,"_"):"layout"+ ++b.childIdx;d.instanceKey=t;a.data("layoutInstanceKey",t);return t},Ba=function(e,a){var m=y[e],d=ba[e],g=q[e];b.isPlainObject(d)&&(b.each(d,function(e,b){b.destroyed&&delete d[e]}),
+b.isEmptyObject(d)&&(d=ba[e]=null));!a&&!d&&(a=m.data("layout"));a&&(a.hasParentLayout=!0,m=a.options,kb(a,g),d||(d=ba[e]={}),d[m.instanceKey]=a.container.data("layout"));z[e].children=ba[e];a||Qa(e)},Ab=function(){var e=r,b=Number(e.resizeWithWindowDelay);10>b&&(b=100);M.clear("winResize");M.set("winResize",function(){M.clear("winResize");M.clear("winResizeRepeater");var b=R(u,e.inset);(b.innerWidth!==v.innerWidth||b.innerHeight!==v.innerHeight)&&oa()},b);M.data.winResizeRepeater||lb()},lb=function(){var e=
+Number(r.resizeWithWindowMaxDelay);0<e&&M.set("winResizeRepeater",function(){lb();oa()},e)},mb=function(){C("onunload_start");j(z,b.layout.onUnload);C("onunload_end")},nb=function(e){e=e?e.split(","):k.borderPanes;b.each(e,function(e,a){var d=r[a];if(d.enableCursorHotkey||d.customHotkey)return b(document).bind("keydown."+K,p),!1})},hb=function(e){e=r[e].paneSelector;if("#"===e.substr(0,1))return u.find(e).eq(0);var b=u.children(e).eq(0);return b.length?b:u.children("form:first").children(e).eq(0)},
+ib=function(e,b){if(b||H()){var m=r[e],c=q[e],g=k[e],t=g.dir,n="center"===e,f={},h=y[e],l,j;h?Ra(e,!1,!0,!1):U[e]=!1;h=y[e]=hb(e);if(h.length){h.data("layoutCSS")||h.data("layoutCSS",D(h,"position,top,left,bottom,right,width,height,overflow,zIndex,display,backgroundColor,padding,margin,border"));z[e]={name:e,pane:y[e],content:U[e],options:r[e],state:q[e],children:ba[e]};h.data({parentLayout:z,layoutPane:z[e],layoutEdge:e,layoutRole:"pane"}).css(g.cssReq).css("zIndex",r.zIndexes.pane_normal).css(m.applyDemoStyles?
+g.cssDemo:{}).addClass(m.paneClass+" "+m.paneClass+"-"+e).bind("mouseenter."+K,Oa).bind("mouseleave."+K,da);g={hide:"",show:"",toggle:"",close:"",open:"",slideOpen:"",slideClose:"",slideToggle:"",size:"sizePane",sizePane:"sizePane",sizeContent:"",sizeHandles:"",enableClosable:"",disableClosable:"",enableSlideable:"",disableSlideable:"",enableResizable:"",disableResizable:"",swapPanes:"swapPanes",swap:"swapPanes",move:"swapPanes",removePane:"removePane",remove:"removePane",createChildren:"",resizeChildren:"",
+resizeAll:"resizeAll",resizeLayout:"resizeAll"};for(j in g)h.bind("layoutpane"+j.toLowerCase()+"."+K,z[g[j]||j]);Sa(e,!1);n||(l=c.size=fa(e,m.size),n=fa(e,m.minSize)||1,j=fa(e,m.maxSize)||1E5,0<l&&(l=d(a(l,j),n)),c.autoResize=m.autoResize,c.isClosed=!1,c.isSliding=!1,c.isResizing=!1,c.isHidden=!1,c.pins||(c.pins=[]));c.tagName=h[0].tagName;c.edge=e;c.noRoom=!1;c.isVisible=!0;ob(e);"horz"===t?f.height=O(h,l):"vert"===t&&(f.width=Q(h,l));h.css(f);"horz"!=t&&ia(e,!0);q.initialized&&(Pa(e),nb(e));m.initClosed&&
+m.closable&&!m.initHidden?ja(e,!0,!0):m.initHidden||m.initClosed?Ta(e):c.noRoom||h.css("display","block");h.css("visibility","visible");m.showOverflowOnHover&&h.hover(x,X);q.initialized&&jb(e)}else y[e]=!1}},jb=function(e){var b=y[e],a=q[e],d=r[e];b&&(b.data("layout")&&Ba(e,b.data("layout")),a.isVisible&&(q.initialized?oa():pa(e),d.triggerEventsOnLoad?C("onresize_end",e):db(e,!0)),d.initChildren&&d.children&&Qa(e))},ob=function(e){e=e?e.split(","):k.borderPanes;b.each(e,function(e,b){var a=y[b],g=
+F[b],d=q[b],c=k[b].side,f={};if(a){switch(b){case "north":f.top=v.inset.top;f.left=v.inset.left;f.right=v.inset.right;break;case "south":f.bottom=v.inset.bottom;f.left=v.inset.left;f.right=v.inset.right;break;case "west":f.left=v.inset.left;break;case "east":f.right=v.inset.right}a.css(f);g&&d.isClosed?g.css(c,v.inset[c]):g&&!d.isHidden&&g.css(c,v.inset[c]+ga(b))}})},Pa=function(e){e=e?e.split(","):k.borderPanes;b.each(e,function(e,a){var d=y[a];F[a]=!1;P[a]=!1;if(d){var g=r[a],d=q[a],c="#"===g.paneSelector.substr(0,
+1)?g.paneSelector.substr(1):"",n=g.resizerClass,f=g.togglerClass,h="-"+a,l=z[a],j=l.resizer=F[a]=b("<div></div>"),l=l.toggler=g.closable?P[a]=b("<div></div>"):!1;!d.isVisible&&g.slidable&&j.attr("title",g.tips.Slide).css("cursor",g.sliderCursor);j.attr("id",c?c+"-resizer":"").data({parentLayout:z,layoutPane:z[a],layoutEdge:a,layoutRole:"resizer"}).css(k.resizers.cssReq).css("zIndex",r.zIndexes.resizer_normal).css(g.applyDemoStyles?k.resizers.cssDemo:{}).addClass(n+" "+n+h).hover(Oa,da).hover(fb,gb).appendTo(u);
+g.resizerDblClickToggle&&j.bind("dblclick."+K,na);l&&(l.attr("id",c?c+"-toggler":"").data({parentLayout:z,layoutPane:z[a],layoutEdge:a,layoutRole:"toggler"}).css(k.togglers.cssReq).css(g.applyDemoStyles?k.togglers.cssDemo:{}).addClass(f+" "+f+h).hover(Oa,da).bind("mouseenter",fb).appendTo(j),g.togglerContent_open&&b("<span>"+g.togglerContent_open+"</span>").data({layoutEdge:a,layoutRole:"togglerContent"}).data("layoutRole","togglerContent").data("layoutEdge",a).addClass("content content-open").css("display",
+"none").appendTo(l),g.togglerContent_closed&&b("<span>"+g.togglerContent_closed+"</span>").data({layoutEdge:a,layoutRole:"togglerContent"}).addClass("content content-closed").css("display","none").appendTo(l),pb(a));var g=a,B=b.layout.plugins.draggable,g=g?g.split(","):k.borderPanes;b.each(g,function(e,a){var g=r[a];if(!B||!y[a]||!g.resizable)return g.resizable=!1,!0;var m=q[a],w=r.zIndexes,d=k[a],c="horz"==d.dir?"top":"left",t=F[a],n=g.resizerClass,f=0,l,h,E=n+"-drag",j=n+"-"+a+"-drag",J=n+"-dragging",
+zb=n+"-"+a+"-dragging",cb=n+"-dragging-limit",v=n+"-"+a+"-dragging-limit",x=!1;m.isClosed||t.attr("title",g.tips.Resize).css("cursor",g.resizerCursor);t.draggable({containment:u[0],axis:"horz"==d.dir?"y":"x",delay:0,distance:1,grid:g.resizingGrid,helper:"clone",opacity:g.resizerDragOpacity,addClasses:!1,zIndex:w.resizer_drag,start:function(e,w){g=r[a];m=q[a];h=g.livePaneResizing;if(!1===C("ondrag_start",a))return!1;m.isResizing=!0;q.paneResizing=a;M.clear(a+"_closeSlider");Y(a);l=m.resizerPosition;
+f=w.position[c];t.addClass(E+" "+j);x=!1;b("body").disableSelection();va(a,{resizing:!0})},drag:function(e,b){x||(b.helper.addClass(J+" "+zb).css({right:"auto",bottom:"auto"}).children().css("visibility","hidden"),x=!0,m.isSliding&&y[a].css("zIndex",w.pane_sliding));var d=0;b.position[c]<l.min?(b.position[c]=l.min,d=-1):b.position[c]>l.max&&(b.position[c]=l.max,d=1);d?(b.helper.addClass(cb+" "+v),window.defaultStatus=0<d&&a.match(/(north|west)/)||0>d&&a.match(/(south|east)/)?g.tips.maxSizeWarning:
+g.tips.minSizeWarning):(b.helper.removeClass(cb+" "+v),window.defaultStatus="");h&&Math.abs(b.position[c]-f)>=g.liveResizingTolerance&&(f=b.position[c],p(e,b,a))},stop:function(e,g){b("body").enableSelection();window.defaultStatus="";t.removeClass(E+" "+j);m.isResizing=!1;q.paneResizing=!1;p(e,g,a,!0)}})});var p=function(b,e,a,g){var m=e.position,w=k[a];b=r[a];e=q[a];var d;switch(a){case "north":d=m.top;break;case "west":d=m.left;break;case "south":d=v.layoutHeight-m.top-b.spacing_open;break;case "east":d=
+v.layoutWidth-m.left-b.spacing_open}d-=v.inset[w.side];g?(!1!==C("ondrag_end",a)&&Ca(a,d,!1,!0),za(!0),e.isSliding&&va(a,{resizing:!0})):Math.abs(d-e.size)<b.liveResizingTolerance||(Ca(a,d,!1,!0),ea.each(qb))};d.isVisible?Ua(a):(Da(a),ma(a,!0))}});qa()},Sa=function(b,a){if(H()){var m=r[b],d=m.contentSelector,g=z[b],c=y[b],n;d&&(n=g.content=U[b]=m.findNestedContent?c.find(d).eq(0):c.children(d).eq(0));n&&n.length?(n.data("layoutRole","content"),n.data("layoutCSS")||n.data("layoutCSS",D(n,"height")),
+n.css(k.content.cssReq),m.applyDemoStyles&&(n.css(k.content.cssDemo),c.css(k.content.cssDemoPane)),c.css("overflowX").match(/(scroll|auto)/)&&c.css("overflow","hidden"),q[b].content={},!1!==a&&pa(b)):g.content=U[b]=!1}},qb=function(){var e=b(this),a=e.data("layoutMask"),a=q[a];"IFRAME"==a.tagName&&a.isVisible&&e.css({top:a.offsetTop,left:a.offsetLeft,width:a.outerWidth,height:a.outerHeight})},va=function(e,a){var m=k[e],d=["center"],g=r.zIndexes,c=b.extend({objectsOnly:!1,animation:!1,resizing:!0,
+sliding:q[e].isSliding},a),n,f;c.resizing&&d.push(e);c.sliding&&d.push(k.oppositeEdge[e]);"horz"===m.dir&&(d.push("west"),d.push("east"));b.each(d,function(e,a){f=q[a];n=r[a];if(f.isVisible&&(n.maskObjects||!c.objectsOnly&&n.maskContents)){for(var m=b([]),d,w=0,h=ea.length;w<h;w++)d=ea.eq(w),d.data("layoutMask")===a&&(m=m.add(d));if(!m.length){m=y[a];d=q[a];var w=r[a],h=r.zIndexes,j=b([]),E,k,v,p,x;if(w.maskContents||w.maskObjects)for(x=0;x<(w.maskObjects?2:1);x++)E=w.maskObjects&&0==x,k=document.createElement(E?
+"iframe":"div"),v=b(k).data("layoutMask",a),k.className="ui-layout-mask ui-layout-mask-"+a,p=k.style,p.display="block",p.position="absolute",p.background="#FFF",E&&(k.frameborder=0,k.src="about:blank",p.opacity=0,p.filter="Alpha(Opacity='0')",p.border=0),"IFRAME"==d.tagName?(p.zIndex=h.pane_normal+1,u.append(k)):(v.addClass("ui-layout-mask-inside-pane"),p.zIndex=w.maskZindex||h.content_mask,p.top=0,p.left=0,p.width="100%",p.height="100%",m.append(k)),j=j.add(k),ea=ea.add(k);m=j}m.each(function(){qb.call(this);
+this.style.zIndex=f.isSliding?g.pane_sliding+1:g.pane_normal+1;this.style.display="block"})}})},za=function(a){if(a||!q.paneResizing)ea.hide();else if(!a&&!b.isEmptyObject(q.panesSliding)){a=ea.length-1;for(var d,m;0<=a;a--)m=ea.eq(a),d=m.data("layoutMask"),r[d].maskObjects||m.hide()}},Ra=function(a,d,m,c){if(H()){a=A.call(this,a);var g=y[a],t=U[a],n=F[a],f=P[a];g&&b.isEmptyObject(g.data())&&(g=!1);t&&b.isEmptyObject(t.data())&&(t=!1);n&&b.isEmptyObject(n.data())&&(n=!1);f&&b.isEmptyObject(f.data())&&
+(f=!1);g&&g.stop(!0,!0);var h=r[a],l=ba[a],j=b.isPlainObject(l)&&!b.isEmptyObject(l);c=void 0!==c?c:h.destroyChildren;j&&c&&(b.each(l,function(a,b){b.destroyed||b.destroy(!0);b.destroyed&&delete l[a]}),b.isEmptyObject(l)&&(l=ba[a]=null,j=!1));g&&d&&!j?g.remove():g&&g[0]&&(d=h.paneClass,c=d+"-"+a,d=[d,d+"-open",d+"-closed",d+"-sliding",c,c+"-open",c+"-closed",c+"-sliding"],b.merge(d,Na(g,!0)),g.removeClass(d.join(" ")).removeData("parentLayout").removeData("layoutPane").removeData("layoutRole").removeData("layoutEdge").removeData("autoHidden").unbind("."+
+K),j&&t?(t.width(t.width()),b.each(l,function(a,b){b.resizeAll()})):t&&t.css(t.data("layoutCSS")).removeData("layoutCSS").removeData("layoutRole"),g.data("layout")||g.css(g.data("layoutCSS")).removeData("layoutCSS"));f&&f.remove();n&&n.remove();z[a]=y[a]=U[a]=F[a]=P[a]=!1;m||oa()}},Ea=function(a){var b=y[a],d=b[0].style;r[a].useOffscreenClose?(b.data(k.offscreenReset)||b.data(k.offscreenReset,{left:d.left,right:d.right}),b.css(k.offscreenCSS)):b.hide().removeData(k.offscreenReset)},rb=function(a){var b=
+y[a];a=r[a];var d=k.offscreenCSS,c=b.data(k.offscreenReset),g=b[0].style;b.show().removeData(k.offscreenReset);a.useOffscreenClose&&c&&(g.left==d.left&&(g.left=c.left),g.right==d.right&&(g.right=c.right))},Ta=function(a,b){if(H()){var d=A.call(this,a),c=r[d],g=q[d],t=F[d];y[d]&&!g.isHidden&&!(q.initialized&&!1===C("onhide_start",d))&&(g.isSliding=!1,delete q.panesSliding[d],t&&t.hide(),!q.initialized||g.isClosed?(g.isClosed=!0,g.isHidden=!0,g.isVisible=!1,q.initialized||Ea(d),ia("horz"===k[d].dir?
+"":"center"),(q.initialized||c.triggerEventsOnLoad)&&C("onhide_end",d)):(g.isHiding=!0,ja(d,!1,b)))}},Fa=function(a,b,d,c){if(H()){a=A.call(this,a);var g=q[a];y[a]&&g.isHidden&&!1!==C("onshow_start",a)&&(g.isShowing=!0,g.isSliding=!1,delete q.panesSliding[a],!1===b?ja(a,!0):ra(a,!1,d,c))}},na=function(a,b){if(H()){var d=Ma(a),c=A.call(this,a),g=q[c];d&&d.stopImmediatePropagation();g.isHidden?Fa(c):g.isClosed?ra(c,!!b):ja(c)}},ja=function(a,b,d,c){function g(){l.isMoving=!1;ma(t,!0);var a=k.oppositeEdge[t];
+q[a].noRoom&&(Y(a),ha(a));if(!c&&(q.initialized||h.triggerEventsOnLoad))p||C("onclose_end",t),p&&C("onshow_end",t),v&&C("onhide_end",t)}var t=A.call(this,a);if(!q.initialized&&y[t]){a=t;var n=q[a];Ea(a);n.isClosed=!0;n.isVisible=!1;Da(a)}else if(H()){var f=y[t],h=r[t],l=q[t],j,p,v;u.queue(function(a){if(!f||!h.closable&&!l.isShowing&&!l.isHiding||!b&&l.isClosed&&!l.isShowing)return a();var e=!l.isShowing&&!1===C("onclose_start",t);p=l.isShowing;v=l.isHiding;delete l.isShowing;delete l.isHiding;if(e)return a();
+j=!d&&!l.isClosed&&"none"!=h.fxName_close;l.isMoving=!0;l.isClosed=!0;l.isVisible=!1;v?l.isHidden=!0:p&&(l.isHidden=!1);l.isSliding?wa(t,!1):ia("horz"===k[t].dir?"":"center",!1);Da(t);j?(Ga(t,!0),f.hide(h.fxName_close,h.fxSettings_close,h.fxSpeed_close,function(){Ga(t,!1);l.isClosed&&g();a()})):(Ea(t),g(),a())})}},Da=function(a){if(F[a]){var d=F[a],c=P[a],f=r[a],g=k[a].side,t=f.resizerClass,n=f.togglerClass,h="-"+a;d.css(g,v.inset[g]).removeClass(t+"-open "+t+h+"-open").removeClass(t+"-sliding "+
+t+h+"-sliding").addClass(t+"-closed "+t+h+"-closed");f.resizable&&b.layout.plugins.draggable&&d.draggable("disable").removeClass("ui-state-disabled").css("cursor","default").attr("title","");c&&(c.removeClass(n+"-open "+n+h+"-open").addClass(n+"-closed "+n+h+"-closed").attr("title",f.tips.Open),c.children(".content-open").hide(),c.children(".content-closed").css("display","block"));Va(a,!1);q.initialized&&qa()}},ra=function(a,b,d,c){function g(){j.isMoving=!1;eb(f);j.isSliding||ia("vert"==k[f].dir?
+"center":"",!1);Ua(f)}if(H()){var f=A.call(this,a),n=y[f],h=r[f],j=q[f],l,p;u.queue(function(a){if(!n||!h.resizable&&!h.closable&&!j.isShowing||j.isVisible&&!j.isSliding)return a();if(j.isHidden&&!j.isShowing)a(),Fa(f,!0);else{j.autoResize&&j.size!=h.size?ka(f,h.size,!0,!0,!0):Y(f,b);var e=C("onopen_start",f);if("abort"===e)return a();"NC"!==e&&Y(f,b);if(j.minSize>j.maxSize)return Va(f,!1),!c&&h.tips.noRoomToOpen&&alert(h.tips.noRoomToOpen),a();b?wa(f,!0):j.isSliding?wa(f,!1):h.slidable&&ma(f,!1);
+j.noRoom=!1;ha(f);p=j.isShowing;delete j.isShowing;l=!d&&j.isClosed&&"none"!=h.fxName_open;j.isMoving=!0;j.isVisible=!0;j.isClosed=!1;p&&(j.isHidden=!1);l?(Ga(f,!0),n.show(h.fxName_open,h.fxSettings_open,h.fxSpeed_open,function(){Ga(f,!1);j.isVisible&&g();a()})):(rb(f),g(),a())}})}},Ua=function(a,d){var c=y[a],f=F[a],g=P[a],h=r[a],n=q[a],j=k[a].side,p=h.resizerClass,l=h.togglerClass,u="-"+a;f.css(j,v.inset[j]+ga(a)).removeClass(p+"-closed "+p+u+"-closed").addClass(p+"-open "+p+u+"-open");n.isSliding?
+f.addClass(p+"-sliding "+p+u+"-sliding"):f.removeClass(p+"-sliding "+p+u+"-sliding");da(0,f);h.resizable&&b.layout.plugins.draggable?f.draggable("enable").css("cursor",h.resizerCursor).attr("title",h.tips.Resize):n.isSliding||f.css("cursor","default");g&&(g.removeClass(l+"-closed "+l+u+"-closed").addClass(l+"-open "+l+u+"-open").attr("title",h.tips.Close),da(0,g),g.children(".content-closed").hide(),g.children(".content-open").css("display","block"));Va(a,!n.isSliding);b.extend(n,R(c));q.initialized&&
+(qa(),pa(a,!0));if(!d&&(q.initialized||h.triggerEventsOnLoad)&&c.is(":visible"))C("onopen_end",a),n.isShowing&&C("onshow_end",a),q.initialized&&C("onresize_end",a)},sb=function(a){function b(){g.isClosed?g.isMoving||ra(c,!0):wa(c,!0)}if(H()){var d=Ma(a),c=A.call(this,a),g=q[c];a=r[c].slideDelay_open;d&&d.stopImmediatePropagation();g.isClosed&&d&&"mouseenter"===d.type&&0<a?M.set(c+"_openSlider",b,a):b()}},Wa=function(a){function c(){g.isClosed?wa(f,!1):g.isMoving||ja(f)}if(H()){var m=Ma(a),f=A.call(this,
+a);a=r[f];var g=q[f],h=g.isMoving?1E3:300;!g.isClosed&&!g.isResizing&&("click"===a.slideTrigger_close?c():a.preventQuickSlideClose&&g.isMoving||a.preventPrematureSlideClose&&m&&b.layout.isMouseOverElem(m,y[f])||(m?M.set(f+"_closeSlider",c,d(a.slideDelay_close,h)):c()))}},Ga=function(a,b){var d=y[a],c=q[a],g=r[a],f=r.zIndexes;b?(va(a,{animation:!0,objectsOnly:!0}),d.css({zIndex:f.pane_animate}),"south"==a?d.css({top:v.inset.top+v.innerHeight-d.outerHeight()}):"east"==a&&d.css({left:v.inset.left+v.innerWidth-
+d.outerWidth()})):(za(),d.css({zIndex:c.isSliding?f.pane_sliding:f.pane_normal}),"south"==a?d.css({top:"auto"}):"east"==a&&!d.css("left").match(/\-99999/)&&d.css({left:"auto"}),G.msie&&(g.fxOpacityFix&&"slide"!=g.fxName_open&&d.css("filter")&&1==d.css("opacity"))&&d[0].style.removeAttribute("filter"))},ma=function(a,b){var d=r[a],c=F[a],g=d.slideTrigger_open.toLowerCase();if(c&&(!b||d.slidable)){g.match(/mouseover/)?g=d.slideTrigger_open="mouseenter":g.match(/(click|dblclick|mouseenter)/)||(g=d.slideTrigger_open=
+"click");if(d.resizerDblClickToggle&&g.match(/click/))c[b?"unbind":"bind"]("dblclick."+K,na);c[b?"bind":"unbind"](g+"."+K,sb).css("cursor",b?d.sliderCursor:"default").attr("title",b?d.tips.Slide:"")}},wa=function(a,b){function d(b){M.clear(a+"_closeSlider");b.stopPropagation()}var c=r[a],g=q[a],f=r.zIndexes,h=c.slideTrigger_close.toLowerCase(),j=b?"bind":"unbind",k=y[a],l=F[a];M.clear(a+"_closeSlider");b?(g.isSliding=!0,q.panesSliding[a]=!0,ma(a,!1)):(g.isSliding=!1,delete q.panesSliding[a]);k.css("zIndex",
+b?f.pane_sliding:f.pane_normal);l.css("zIndex",b?f.pane_sliding+2:f.resizer_normal);h.match(/(click|mouseleave)/)||(h=c.slideTrigger_close="mouseleave");l[j](h,Wa);"mouseleave"===h&&(k[j]("mouseleave."+K,Wa),l[j]("mouseenter."+K,d),k[j]("mouseenter."+K,d));b?"click"===h&&!c.resizable&&(l.css("cursor",b?c.sliderCursor:"default"),l.attr("title",b?c.tips.Close:"")):M.clear(a+"_closeSlider")},ha=function(a,d,c,f){d=r[a];var g=q[a],h=k[a],n=y[a],j=F[a],p="vert"===h.dir,l=!1;if("center"===a||p&&g.noVerticalRoom)(l=
+0<=g.maxHeight)&&g.noRoom?(rb(a),j&&j.show(),g.isVisible=!0,g.noRoom=!1,p&&(g.noVerticalRoom=!1),eb(a)):!l&&!g.noRoom&&(Ea(a),j&&j.hide(),g.isVisible=!1,g.noRoom=!0);"center"!==a&&(g.minSize<=g.maxSize?(g.size>g.maxSize?ka(a,g.maxSize,c,!0,f):g.size<g.minSize?ka(a,g.minSize,c,!0,f):j&&(g.isVisible&&n.is(":visible"))&&(c=g.size+v.inset[h.side],b.layout.cssNum(j,h.side)!=c&&j.css(h.side,c)),g.noRoom&&(g.wasOpen&&d.closable?d.autoReopen?ra(a,!1,!0,!0):g.noRoom=!1:Fa(a,g.wasOpen,!0,!0))):g.noRoom||(g.noRoom=
+!0,g.wasOpen=!g.isClosed&&!g.isSliding,g.isClosed||(d.closable?ja(a,!0,!0):Ta(a,!0))))},Ca=function(a,b,d,c,g){if(H()){a=A.call(this,a);var f=r[a],h=q[a];g=g||f.livePaneResizing&&!h.isResizing;h.autoResize=!1;ka(a,b,d,c,g)}},ka=function(e,c,f,h,g){function j(){for(var a="width"===ua?l.outerWidth():l.outerHeight(),a=[{pane:n,count:1,target:c,actual:a,correct:c===a,attempt:c,cssSize:D}],e=a[0],h={},t="Inaccurate size after resizing the "+n+"-pane.";!e.correct;){h={pane:n,count:e.count+1,target:c};h.attempt=
+e.actual>c?d(0,e.attempt-(e.actual-c)):d(0,e.attempt+(c-e.actual));h.cssSize=("horz"==k[n].dir?O:Q)(y[n],h.attempt);l.css(ua,h.cssSize);h.actual="width"==ua?l.outerWidth():l.outerHeight();h.correct=c===h.actual;1===a.length&&(ca(t,!1,!0),ca(e,!1,!0));ca(h,!1,!0);if(3<a.length)break;a.push(h);e=a[a.length-1]}J.size=c;b.extend(J,R(l));J.isVisible&&l.is(":visible")&&(x&&x.css(B,c+v.inset[B]),pa(n));!f&&(!Z&&q.initialized&&J.isVisible)&&C("onresize_end",n);f||(J.isSliding||ia("horz"==k[n].dir?"":"center",
+Z,g),qa());e=k.oppositeEdge[n];c<G&&q[e].noRoom&&(Y(e),ha(e,!1,f));1<a.length&&ca(t+"\nSee the Error Console for details.",!0,!0)}if(H()){var n=A.call(this,e),p=r[n],J=q[n],l=y[n],x=F[n],B=k[n].side,ua=k[n].sizeType.toLowerCase(),Z=J.isResizing&&!p.triggerEventsDuringLiveResize,z=!0!==h&&p.animatePaneSizing,G,D;u.queue(function(e){Y(n);G=J.size;c=fa(n,c);c=d(c,fa(n,p.minSize));c=a(c,J.maxSize);if(c<J.minSize)e(),ha(n,!1,f);else{if(!g&&c===G)return e();J.newSize=c;!f&&(q.initialized&&J.isVisible)&&
+C("onresize_start",n);D=("horz"==k[n].dir?O:Q)(y[n],c);if(z&&l.is(":visible")){var h=b.layout.effects.size[n]||b.layout.effects.size.all,h=p.fxSettings_size.easing||h.easing,v=r.zIndexes,u={};u[ua]=D+"px";J.isMoving=!0;l.css({zIndex:v.pane_animate}).show().animate(u,p.fxSpeed_size,h,function(){l.css({zIndex:J.isSliding?v.pane_sliding:v.pane_normal});J.isMoving=!1;delete J.newSize;j();e()})}else l.css(ua,D),delete J.newSize,l.is(":visible")?j():(J.size=c,b.extend(J,R(l))),e()}})}},ia=function(a,c,
+f){a=(a?a:"east,west,center").split(",");b.each(a,function(a,e){if(y[e]){var h=r[e],j=q[e],k=y[e],p=!0,l={},u=b.layout.showInvisibly(k),B={top:ga("north",!0),bottom:ga("south",!0),left:ga("west",!0),right:ga("east",!0),width:0,height:0};B.width=v.innerWidth-B.left-B.right;B.height=v.innerHeight-B.bottom-B.top;B.top+=v.inset.top;B.bottom+=v.inset.bottom;B.left+=v.inset.left;B.right+=v.inset.right;b.extend(j,R(k));if("center"===e){if(!f&&j.isVisible&&B.width===j.outerWidth&&B.height===j.outerHeight)return k.css(u),
+!0;b.extend(j,ya(e),{maxWidth:B.width,maxHeight:B.height});l=B;j.newWidth=l.width;j.newHeight=l.height;l.width=Q(k,l.width);l.height=O(k,l.height);p=0<=l.width&&0<=l.height;if(!q.initialized&&h.minWidth>B.width){var h=h.minWidth-j.outerWidth,B=r.east.minSize||0,x=r.west.minSize||0,Z=q.east.size,z=q.west.size,A=Z,D=z;0<h&&(q.east.isVisible&&Z>B)&&(A=d(Z-B,Z-h),h-=Z-A);0<h&&(q.west.isVisible&&z>x)&&(D=d(z-x,z-h),h-=z-D);if(0===h){Z&&Z!=B&&ka("east",A,!0,!0,f);z&&z!=x&&ka("west",D,!0,!0,f);ia("center",
+c,f);k.css(u);return}}}else{j.isVisible&&!j.noVerticalRoom&&b.extend(j,R(k),ya(e));if(!f&&!j.noVerticalRoom&&B.height===j.outerHeight)return k.css(u),!0;l.top=B.top;l.bottom=B.bottom;j.newSize=B.height;l.height=O(k,B.height);j.maxHeight=l.height;p=0<=j.maxHeight;p||(j.noVerticalRoom=!0)}p?(!c&&q.initialized&&C("onresize_start",e),k.css(l),"center"!==e&&qa(e),j.noRoom&&(!j.isClosed&&!j.isHidden)&&ha(e),j.isVisible&&(b.extend(j,R(k)),q.initialized&&pa(e))):!j.noRoom&&j.isVisible&&ha(e);k.css(u);delete j.newSize;
+delete j.newWidth;delete j.newHeight;if(!j.isVisible)return!0;"center"===e&&(j=G.isIE6||!G.boxModel,y.north&&(j||"IFRAME"==q.north.tagName)&&y.north.css("width",Q(y.north,v.innerWidth)),y.south&&(j||"IFRAME"==q.south.tagName)&&y.south.css("width",Q(y.south,v.innerWidth)));!c&&q.initialized&&C("onresize_end",e)}})},oa=function(a){A(a);if(u.is(":visible"))if(q.initialized){if(!0===a&&b.isPlainObject(r.outset)&&u.css(r.outset),b.extend(v,R(u,r.inset)),v.outerHeight){!0===a&&ob();if(!1===C("onresizeall_start"))return!1;
+var d,c,f;b.each(["south","north","east","west"],function(a,b){y[b]&&(c=r[b],f=q[b],f.autoResize&&f.size!=c.size?ka(b,c.size,!0,!0,!0):(Y(b),ha(b,!1,!0,!0)))});ia("",!0,!0);qa();b.each(k.allPanes,function(a,b){(d=y[b])&&q[b].isVisible&&C("onresize_end",b)});C("onresizeall_end")}}else Aa()},db=function(a,d){var c=A.call(this,a);r[c].resizeChildren&&(d||Ba(c),c=ba[c],b.isPlainObject(c)&&b.each(c,function(a,b){b.destroyed||b.resizeAll()}))},pa=function(a,c){if(H()){var h=A.call(this,a),h=h?h.split(","):
+k.allPanes;b.each(h,function(a,e){function h(a){return d(u.css.paddingBottom,parseInt(a.css("marginBottom"),10)||0)}function j(){var a=r[e].contentIgnoreSelector,a=p.nextAll().not(".ui-layout-mask").not(a||":lt(0)"),b=a.filter(":visible"),d=b.filter(":last");v={top:p[0].offsetTop,height:p.outerHeight(),numFooters:a.length,hiddenFooters:a.length-b.length,spaceBelow:0};v.spaceAbove=v.top;v.bottom=v.top+v.height;v.spaceBelow=d.length?d[0].offsetTop+d.outerHeight()-v.bottom+h(d):h(p)}var m=y[e],p=U[e],
+l=r[e],u=q[e],v=u.content;if(!m||!p||!m.is(":visible"))return!0;if(!p.length&&(Sa(e,!1),!p))return;if(!1!==C("onsizecontent_start",e)){if(!u.isMoving&&!u.isResizing||l.liveContentResizing||c||void 0==v.top)j(),0<v.hiddenFooters&&"hidden"===m.css("overflow")&&(m.css("overflow","visible"),j(),m.css("overflow","hidden"));m=u.innerHeight-(v.spaceAbove-u.css.paddingTop)-(v.spaceBelow-u.css.paddingBottom);if(!p.is(":visible")||v.height!=m){var x=p,l=x;f(x)?l=y[x]:x.jquery||(l=b(x));x=O(l,m);l.css({height:x,
+visibility:"visible"});0<x&&0<l.innerWidth()?l.data("autoHidden")&&(l.show().data("autoHidden",!1),G.mozilla||l.css(k.hidden).css(k.visible)):l.data("autoHidden")||l.hide().data("autoHidden",!0);v.height=m}q.initialized&&C("onsizecontent_end",e)}})}},qa=function(a){a=(a=A.call(this,a))?a.split(","):k.borderPanes;b.each(a,function(a,d){var e=r[d],g=q[d],h=y[d],j=F[d],p=P[d],u;if(h&&j){var l=k[d].dir,x=g.isClosed?"_closed":"_open",B=e["spacing"+x],z=e["togglerAlign"+x],x=e["togglerLength"+x],A;if(0===
+B)j.hide();else{!g.noRoom&&!g.isHidden&&j.show();"horz"===l?(A=v.innerWidth,g.resizerLength=A,h=b.layout.cssNum(h,"left"),j.css({width:Q(j,A),height:O(j,B),left:-9999<h?h:v.inset.left})):(A=h.outerHeight(),g.resizerLength=A,j.css({height:O(j,A),width:Q(j,B),top:v.inset.top+ga("north",!0)}));da(e,j);if(p){if(0===x||g.isSliding&&e.hideTogglerOnSlide){p.hide();return}p.show();if(!(0<x)||"100%"===x||x>A)x=A,z=0;else if(f(z))switch(z){case "top":case "left":z=0;break;case "bottom":case "right":z=A-x;break;
+default:z=c((A-x)/2)}else h=parseInt(z,10),z=0<=z?h:A-x+h;if("horz"===l){var D=Q(p,x);p.css({width:D,height:O(p,B),left:z,top:0});p.children(".content").each(function(){u=b(this);u.css("marginLeft",c((D-u.outerWidth())/2))})}else{var C=O(p,x);p.css({height:C,width:Q(p,B),top:z,left:0});p.children(".content").each(function(){u=b(this);u.css("marginTop",c((C-u.outerHeight())/2))})}da(0,p)}if(!q.initialized&&(e.initHidden||g.isHidden))j.hide(),p&&p.hide()}}})},pb=function(a){if(H()){var b=A.call(this,
+a);a=P[b];var d=r[b];a&&(d.closable=!0,a.bind("click."+K,function(a){a.stopPropagation();na(b)}).css("visibility","visible").css("cursor","pointer").attr("title",q[b].isClosed?d.tips.Open:d.tips.Close).show())}},Va=function(a,d){b.layout.plugins.buttons&&b.each(q[a].pins,function(c,f){b.layout.buttons.setPinState(z,b(f),a,d)})},u=b(this).eq(0);if(!u.length)return ca(r.errors.containerMissing);if(u.data("layoutContainer")&&u.data("layout"))return u.data("layout");var y={},U={},F={},P={},ea=b([]),v=
+q.container,K=q.id,z={options:r,state:q,container:u,panes:y,contents:U,resizers:F,togglers:P,hide:Ta,show:Fa,toggle:na,open:ra,close:ja,slideOpen:sb,slideClose:Wa,slideToggle:function(a){a=A.call(this,a);na(a,!0)},setSizeLimits:Y,_sizePane:ka,sizePane:Ca,sizeContent:pa,swapPanes:function(a,c){function f(a){var d=y[a],c=U[a];return!d?!1:{pane:a,P:d?d[0]:!1,C:c?c[0]:!1,state:b.extend(!0,{},q[a]),options:b.extend(!0,{},r[a])}}function h(a,c){if(a){var e=a.P,f=a.C,g=a.pane,j=k[c],m=b.extend(!0,{},q[c]),
+n=r[c],w={resizerCursor:n.resizerCursor};b.each(["fxName","fxSpeed","fxSettings"],function(a,b){w[b+"_open"]=n[b+"_open"];w[b+"_close"]=n[b+"_close"];w[b+"_size"]=n[b+"_size"]});y[c]=b(e).data({layoutPane:z[c],layoutEdge:c}).css(k.hidden).css(j.cssReq);U[c]=f?b(f):!1;r[c]=b.extend(!0,{},a.options,w);q[c]=b.extend(!0,{},a.state);e.className=e.className.replace(RegExp(n.paneClass+"-"+g,"g"),n.paneClass+"-"+c);Pa(c);j.dir!=k[g].dir?(e=p[c]||0,Y(c),e=d(e,q[c].minSize),Ca(c,e,!0,!0)):F[c].css(j.side,v.inset[j.side]+
+(q[c].isVisible?ga(c):0));a.state.isVisible&&!m.isVisible?Ua(c,!0):(Da(c),ma(c,!0));a=null}}if(H()){var g=A.call(this,a);q[g].edge=c;q[c].edge=g;if(!1===C("onswap_start",g)||!1===C("onswap_start",c))q[g].edge=g,q[c].edge=c;else{var j=f(g),n=f(c),p={};p[g]=j?j.state.size:0;p[c]=n?n.state.size:0;y[g]=!1;y[c]=!1;q[g]={};q[c]={};P[g]&&P[g].remove();P[c]&&P[c].remove();F[g]&&F[g].remove();F[c]&&F[c].remove();F[g]=F[c]=P[g]=P[c]=!1;h(j,c);h(n,g);j=n=p=null;y[g]&&y[g].css(k.visible);y[c]&&y[c].css(k.visible);
+oa();C("onswap_end",g);C("onswap_end",c)}}},showMasks:va,hideMasks:za,initContent:Sa,addPane:ib,removePane:Ra,createChildren:Qa,refreshChildren:Ba,enableClosable:pb,disableClosable:function(a,b){if(H()){var c=A.call(this,a),d=P[c];d&&(r[c].closable=!1,q[c].isClosed&&ra(c,!1,!0),d.unbind("."+K).css("visibility",b?"hidden":"visible").css("cursor","default").attr("title",""))}},enableSlidable:function(a){if(H()){a=A.call(this,a);var b=F[a];b&&b.data("draggable")&&(r[a].slidable=!0,q[a].isClosed&&ma(a,
+!0))}},disableSlidable:function(a){if(H()){a=A.call(this,a);var b=F[a];b&&(r[a].slidable=!1,q[a].isSliding?ja(a,!1,!0):(ma(a,!1),b.css("cursor","default").attr("title",""),da(null,b[0])))}},enableResizable:function(a){if(H()){a=A.call(this,a);var b=F[a],c=r[a];b&&b.data("draggable")&&(c.resizable=!0,b.draggable("enable"),q[a].isClosed||b.css("cursor",c.resizerCursor).attr("title",c.tips.Resize))}},disableResizable:function(a){if(H()){a=A.call(this,a);var b=F[a];b&&b.data("draggable")&&(r[a].resizable=
+!1,b.draggable("disable").css("cursor","default").attr("title",""),da(null,b[0]))}},allowOverflow:x,resetOverflow:X,destroy:function(a,c){b(window).unbind("."+K);b(document).unbind("."+K);"object"===typeof a?A(a):c=a;u.clearQueue().removeData("layout").removeData("layoutContainer").removeClass(r.containerClass).unbind("."+K);ea.remove();b.each(k.allPanes,function(a,b){Ra(b,!1,!0,c)});u.data("layoutCSS")&&!u.data("layoutRole")&&u.css(u.data("layoutCSS")).removeData("layoutCSS");"BODY"===v.tagName&&
+(u=b("html")).data("layoutCSS")&&u.css(u.data("layoutCSS")).removeData("layoutCSS");j(z,b.layout.onDestroy);mb();for(var d in z)d.match(/^(container|options)$/)||delete z[d];z.destroyed=!0;return z},initPanes:H,resizeAll:oa,runCallbacks:C,hasParentLayout:!1,children:ba,north:!1,south:!1,west:!1,east:!1,center:!1},Xa;var V,Ya,N,Ha,la,sa,W;h=b.layout.transformData(h,!0);h=b.layout.backwardCompatibility.renameAllOptions(h);if(!b.isEmptyObject(h.panes)){V=b.layout.optionsMap.noDefault;la=0;for(sa=V.length;la<
+sa;la++)N=V[la],delete h.panes[N];V=b.layout.optionsMap.layout;la=0;for(sa=V.length;la<sa;la++)N=V[la],delete h.panes[N]}V=b.layout.optionsMap.layout;var Bb=b.layout.config.optionRootKeys;for(N in h)Ha=h[N],0>b.inArray(N,Bb)&&0>b.inArray(N,V)&&(h.panes[N]||(h.panes[N]=b.isPlainObject(Ha)?b.extend(!0,{},Ha):Ha),delete h[N]);b.extend(!0,r,h);b.each(k.allPanes,function(a,c){k[c]=b.extend(!0,{},k.panes,k[c]);Ya=r.panes;W=r[c];if("center"===c){V=b.layout.optionsMap.center;a=0;for(sa=V.length;a<sa;a++)if(N=
+V[a],!h.center[N]&&(h.panes[N]||!W[N]))W[N]=Ya[N]}else{W=r[c]=b.extend(!0,{},Ya,W);var d=r[c],f=r.panes;d.fxSettings||(d.fxSettings={});f.fxSettings||(f.fxSettings={});b.each(["_open","_close","_size"],function(a,e){var h="fxName"+e,j="fxSpeed"+e,k="fxSettings"+e,l=d[h]=d[h]||f[h]||d.fxName||f.fxName||"none",p=b.effects&&(b.effects[l]||b.effects.effect&&b.effects.effect[l]);if("none"===l||!r.effects[l]||!p)l=d[h]="none";l=r.effects[l]||{};h=l.all||null;l=l[c]||null;d[j]=d[j]||f[j]||d.fxSpeed||f.fxSpeed||
+null;d[k]=b.extend(!0,{},h,l,f.fxSettings,d.fxSettings,f[k],d[k])});delete d.fxName;delete d.fxSpeed;delete d.fxSettings;W.resizerClass||(W.resizerClass="ui-layout-resizer");W.togglerClass||(W.togglerClass="ui-layout-toggler")}W.paneClass||(W.paneClass="ui-layout-pane")});var Ia=h.zIndex,xa=r.zIndexes;0<Ia&&(xa.pane_normal=Ia,xa.content_mask=d(Ia+1,xa.content_mask),xa.resizer_normal=d(Ia+2,xa.resizer_normal));delete r.panes;var Cb=r,tb=q;tb.creatingLayout=!0;j(z,b.layout.onCreate);if(!1===C("onload_start"))Xa=
+"cancel";else{var Za=u[0],$=b("html"),ub=v.tagName=Za.tagName,vb=v.id=Za.id,wb=v.className=Za.className,L=r,Ja=L.name,$a={},Ka=u.data("parentLayout"),La=u.data("layoutEdge"),ab=Ka&&La,ta=b.layout.cssNum,bb,aa;v.selector=u.selector.split(".slice")[0];v.ref=(L.name?L.name+" layout / ":"")+ub+(vb?"#"+vb:wb?".["+wb+"]":"");v.isBody="BODY"===ub;!ab&&!v.isBody&&(bb=u.closest("."+b.layout.defaults.panes.paneClass),Ka=bb.data("parentLayout"),La=bb.data("layoutEdge"),ab=Ka&&La);u.data({layout:z,layoutContainer:K}).addClass(L.containerClass);
+var xb={destroy:"",initPanes:"",resizeAll:"resizeAll",resize:"resizeAll"};for(Ja in xb)u.bind("layout"+Ja.toLowerCase()+"."+K,z[xb[Ja]||Ja]);ab&&(z.hasParentLayout=!0,Ka.refreshChildren(La,z));u.data("layoutCSS")||(v.isBody?(u.data("layoutCSS",b.extend(D(u,"position,margin,padding,border"),{height:u.css("height"),overflow:u.css("overflow"),overflowX:u.css("overflowX"),overflowY:u.css("overflowY")})),$.data("layoutCSS",b.extend(D($,"padding"),{height:"auto",overflow:$.css("overflow"),overflowX:$.css("overflowX"),
+overflowY:$.css("overflowY")}))):u.data("layoutCSS",D(u,"position,margin,padding,border,top,bottom,left,right,width,height,overflow,overflowX,overflowY")));try{$a={overflow:"hidden",overflowX:"hidden",overflowY:"hidden"};u.css($a);L.inset&&!b.isPlainObject(L.inset)&&(aa=parseInt(L.inset,10)||0,L.inset={top:aa,bottom:aa,left:aa,right:aa});if(v.isBody)L.outset?b.isPlainObject(L.outset)||(aa=parseInt(L.outset,10)||0,L.outset={top:aa,bottom:aa,left:aa,right:aa}):L.outset={top:ta($,"paddingTop"),bottom:ta($,
+"paddingBottom"),left:ta($,"paddingLeft"),right:ta($,"paddingRight")},$.css($a).css({height:"100%",border:"none",padding:0,margin:0}),G.isIE6?(u.css({width:"100%",height:"100%",border:"none",padding:0,margin:0,position:"relative"}),L.inset||(L.inset=R(u).inset)):(u.css({width:"auto",height:"auto",margin:0,position:"absolute"}),u.css(L.outset)),b.extend(v,R(u,L.inset));else{var yb=u.css("position");(!yb||!yb.match(/(fixed|absolute|relative)/))&&u.css("position","relative");u.is(":visible")&&(b.extend(v,
+R(u,L.inset)),1>v.innerHeight&&ca(L.errors.noContainerHeight.replace(/CONTAINER/,v.ref)))}ta(u,"minWidth")&&u.parent().css("overflowX","auto");ta(u,"minHeight")&&u.parent().css("overflowY","auto")}catch(Db){}nb();b(window).bind("unload."+K,mb);j(z,b.layout.onLoad);Cb.initPanes&&Aa();delete tb.creatingLayout;Xa=q.initialized}return"cancel"===Xa?null:z}})(jQuery);
+(function(b){b.ui||(b.ui={});b.ui.cookie={acceptsCookies:!!navigator.cookieEnabled,read:function(a){for(var d=document.cookie,d=d?d.split(";"):[],c,f=0,j=d.length;f<j;f++)if(c=b.trim(d[f]).split("="),c[0]==a)return decodeURIComponent(c[1]);return null},write:function(a,d,c){var f="",j="",h=!1;c=c||{};var p=c.expires||null,x=b.type(p);"date"===x?j=p:"string"===x&&0<p&&(p=parseInt(p,10),x="number");"number"===x&&(j=new Date,0<p?j.setDate(j.getDate()+p):(j.setFullYear(1970),h=!0));j&&(f+=";expires="+
+j.toUTCString());c.path&&(f+=";path="+c.path);c.domain&&(f+=";domain="+c.domain);c.secure&&(f+=";secure");document.cookie=a+"="+(h?"":encodeURIComponent(d))+f},clear:function(a){b.ui.cookie.write(a,"",{expires:-1})}};b.cookie||(b.cookie=function(a,d,c){var f=b.ui.cookie;if(null===d)f.clear(a);else{if(void 0===d)return f.read(a);f.write(a,d,c)}});b.layout.plugins.stateManagement=!0;b.layout.config.optionRootKeys.push("stateManagement");b.layout.defaults.stateManagement={enabled:!1,autoSave:!0,autoLoad:!0,
+animateLoad:!0,includeChildren:!0,stateKeys:"north.size,south.size,east.size,west.size,north.isClosed,south.isClosed,east.isClosed,west.isClosed,north.isHidden,south.isHidden,east.isHidden,west.isHidden",cookie:{name:"",domain:"",path:"",expires:"",secure:!1}};b.layout.optionsMap.layout.push("stateManagement");b.layout.state={saveCookie:function(a,d,c){var f=a.options,j=f.stateManagement;c=b.extend(!0,{},j.cookie,c||null);a=a.state.stateData=a.readState(d||j.stateKeys);b.ui.cookie.write(c.name||f.name||
+"Layout",b.layout.state.encodeJSON(a),c);return b.extend(!0,{},a)},deleteCookie:function(a){a=a.options;b.ui.cookie.clear(a.stateManagement.cookie.name||a.name||"Layout")},readCookie:function(a){a=a.options;return(a=b.ui.cookie.read(a.stateManagement.cookie.name||a.name||"Layout"))?b.layout.state.decodeJSON(a):{}},loadCookie:function(a){var d=b.layout.state.readCookie(a);d&&(a.state.stateData=b.extend(!0,{},d),a.loadState(d));return d},loadState:function(a,d,c){if(b.isPlainObject(d)&&!b.isEmptyObject(d))if(d=
+a.state.stateData=b.layout.transformData(d),c=b.extend({animateLoad:!1,includeChildren:a.options.stateManagement.includeChildren},c),a.state.initialized){var f=!c.animateLoad,j,h,p,x;b.each(b.layout.config.borderPanes,function(c,G){S=d[G];b.isPlainObject(S)&&(s=S.size,j=S.initClosed,h=S.initHidden,ar=S.autoResize,p=a.state[G],x=p.isVisible,ar&&(p.autoResize=ar),x||a._sizePane(G,s,!1,!1,!1),!0===h?a.hide(G,f):!0===j?a.close(G,!1,f):!1===j?a.open(G,!1,f):!1===h&&a.show(G,!1,f),x&&a._sizePane(G,s,!1,
+!1,f))});if(c.includeChildren){var I,T;b.each(a.children,function(a,c){(I=d[a]?d[a].children:0)&&c&&b.each(c,function(a,b){T=I[a];b&&T&&b.loadState(T)})})}}else{var S=b.extend(!0,{},d);b.each(b.layout.config.allPanes,function(a,b){S[b]&&delete S[b].children});b.extend(!0,a.options,S)}},readState:function(a,d){"string"===b.type(d)&&(d={keys:d});d||(d={});var c=a.options.stateManagement,f=d.includeChildren,f=void 0!==f?f:c.includeChildren,c=d.stateKeys||c.stateKeys,j={isClosed:"initClosed",isHidden:"initHidden"},
+h=a.state,p=b.layout.config.allPanes,x={},I,T,S,X,G,k;b.isArray(c)&&(c=c.join(","));for(var c=c.replace(/__/g,".").split(","),Q=0,O=c.length;Q<O;Q++)I=c[Q].split("."),T=I[0],I=I[1],0>b.inArray(T,p)||(S=h[T][I],void 0!=S&&("isClosed"==I&&h[T].isSliding&&(S=!0),(x[T]||(x[T]={}))[j[I]?j[I]:I]=S));f&&b.each(p,function(c,d){G=a.children[d];X=h.stateData[d];b.isPlainObject(G)&&!b.isEmptyObject(G)&&(k=x[d]||(x[d]={}),k.children||(k.children={}),b.each(G,function(a,c){c.state.initialized?k.children[a]=b.layout.state.readState(c):
+X&&(X.children&&X.children[a])&&(k.children[a]=b.extend(!0,{},X.children[a]))}))});return x},encodeJSON:function(a){function d(a){var f=[],j=0,h,p,x,I=b.isArray(a);for(h in a)p=a[h],x=typeof p,"string"==x?p='"'+p+'"':"object"==x&&(p=d(p)),f[j++]=(!I?'"'+h+'":':"")+p;return(I?"[":"{")+f.join(",")+(I?"]":"}")}return d(a)},decodeJSON:function(a){try{return b.parseJSON?b.parseJSON(a):window.eval("("+a+")")||{}}catch(d){return{}}},_create:function(a){var d=b.layout.state,c=a.options.stateManagement;b.extend(a,
+{readCookie:function(){return d.readCookie(a)},deleteCookie:function(){d.deleteCookie(a)},saveCookie:function(b,c){return d.saveCookie(a,b,c)},loadCookie:function(){return d.loadCookie(a)},loadState:function(b,c){d.loadState(a,b,c)},readState:function(b){return d.readState(a,b)},encodeJSON:d.encodeJSON,decodeJSON:d.decodeJSON});a.state.stateData={};if(c.autoLoad)if(b.isPlainObject(c.autoLoad))b.isEmptyObject(c.autoLoad)||a.loadState(c.autoLoad);else if(c.enabled)if(b.isFunction(c.autoLoad)){var f=
+{};try{f=c.autoLoad(a,a.state,a.options,a.options.name||"")}catch(j){}f&&(b.isPlainObject(f)&&!b.isEmptyObject(f))&&a.loadState(f)}else a.loadCookie()},_unload:function(a){var d=a.options.stateManagement;if(d.enabled&&d.autoSave)if(b.isFunction(d.autoSave))try{d.autoSave(a,a.state,a.options,a.options.name||"")}catch(c){}else a.saveCookie()}};b.layout.onCreate.push(b.layout.state._create);b.layout.onUnload.push(b.layout.state._unload);b.layout.plugins.buttons=!0;b.layout.defaults.autoBindCustomButtons=
+!1;b.layout.optionsMap.layout.push("autoBindCustomButtons");b.layout.buttons={init:function(a){var d=a.options.name||"",c;b.each("toggle open close pin toggle-slide open-slide".split(" "),function(f,j){b.each(b.layout.config.borderPanes,function(f,p){b(".ui-layout-button-"+j+"-"+p).each(function(){c=b(this).data("layoutName")||b(this).attr("layoutName");(void 0==c||c===d)&&a.bindButton(this,j,p)})})})},get:function(a,d,c,f){var j=b(d);a=a.options;var h=a.errors.addButtonError;j.length?0>b.inArray(c,
+b.layout.config.borderPanes)?(b.layout.msg(h+" "+a.errors.pane+": "+c,!0),j=b("")):(d=a[c].buttonClass+"-"+f,j.addClass(d+" "+d+"-"+c).data("layoutName",a.name)):b.layout.msg(h+" "+a.errors.selector+": "+d,!0);return j},bind:function(a,d,c,f){var j=b.layout.buttons;switch(c.toLowerCase()){case "toggle":j.addToggle(a,d,f);break;case "open":j.addOpen(a,d,f);break;case "close":j.addClose(a,d,f);break;case "pin":j.addPin(a,d,f);break;case "toggle-slide":j.addToggle(a,d,f,!0);break;case "open-slide":j.addOpen(a,
+d,f,!0)}return a},addToggle:function(a,d,c,f){b.layout.buttons.get(a,d,c,"toggle").click(function(b){a.toggle(c,!!f);b.stopPropagation()});return a},addOpen:function(a,d,c,f){b.layout.buttons.get(a,d,c,"open").attr("title",a.options[c].tips.Open).click(function(b){a.open(c,!!f);b.stopPropagation()});return a},addClose:function(a,d,c){b.layout.buttons.get(a,d,c,"close").attr("title",a.options[c].tips.Close).click(function(b){a.close(c);b.stopPropagation()});return a},addPin:function(a,d,c){var f=b.layout.buttons,
+j=f.get(a,d,c,"pin");if(j.length){var h=a.state[c];j.click(function(d){f.setPinState(a,b(this),c,h.isSliding||h.isClosed);h.isSliding||h.isClosed?a.open(c):a.close(c);d.stopPropagation()});f.setPinState(a,j,c,!h.isClosed&&!h.isSliding);h.pins.push(d)}return a},setPinState:function(a,b,c,f){var j=b.attr("pin");if(!(j&&f===("down"==j))){a=a.options[c];var j=a.buttonClass+"-pin",h=j+"-"+c;c=j+"-up "+h+"-up";j=j+"-down "+h+"-down";b.attr("pin",f?"down":"up").attr("title",f?a.tips.Unpin:a.tips.Pin).removeClass(f?
+c:j).addClass(f?j:c)}},syncPinBtns:function(a,d,c){b.each(a.state[d].pins,function(f,j){b.layout.buttons.setPinState(a,b(j),d,c)})},_load:function(a){var d=b.layout.buttons;b.extend(a,{bindButton:function(b,c,h){return d.bind(a,b,c,h)},addToggleBtn:function(b,c,h){return d.addToggle(a,b,c,h)},addOpenBtn:function(b,c,h){return d.addOpen(a,b,c,h)},addCloseBtn:function(b,c){return d.addClose(a,b,c)},addPinBtn:function(b,c){return d.addPin(a,b,c)}});for(var c=0;4>c;c++)a.state[b.layout.config.borderPanes[c]].pins=
+[];a.options.autoBindCustomButtons&&d.init(a)},_unload:function(){}};b.layout.onLoad.push(b.layout.buttons._load);b.layout.plugins.browserZoom=!0;b.layout.defaults.browserZoomCheckInterval=1E3;b.layout.optionsMap.layout.push("browserZoomCheckInterval");b.layout.browserZoom={_init:function(a){!1!==b.layout.browserZoom.ratio()&&b.layout.browserZoom._setTimer(a)},_setTimer:function(a){if(!a.destroyed){var d=a.options,c=a.state,f=a.hasParentLayout?5E3:Math.max(d.browserZoomCheckInterval,100);setTimeout(function(){if(!a.destroyed&&
+d.resizeWithWindow){var f=b.layout.browserZoom.ratio();f!==c.browserZoom&&(c.browserZoom=f,a.resizeAll());b.layout.browserZoom._setTimer(a)}},f)}},ratio:function(){function a(a,b){return(100*(parseInt(a,10)/parseInt(b,10))).toFixed()}var d=window,c=screen,f=document,j=f.documentElement||f.body,h=b.layout.browser,p=h.version,x,I,T;return h.msie&&8<p||!h.msie?!1:c.deviceXDPI&&c.systemXDPI?a(c.deviceXDPI,c.systemXDPI):h.webkit&&(x=f.body.getBoundingClientRect)?a(x.left-x.right,f.body.offsetWidth):h.webkit&&
 (I=d.outerWidth)?a(I,d.innerWidth):(I=c.width)&&(T=j.clientWidth)?a(I,T):!1}};b.layout.onReady.push(b.layout.browserZoom._init)})(jQuery);
\ No newline at end of file
diff --git a/js/jquery.tablehover.js b/js/jquery.tablehover.js
index d538d324a..9deb2f4da 100644
--- a/js/jquery.tablehover.js
+++ b/js/jquery.tablehover.js
@@ -1,426 +1,426 @@
-/*
- * jQuery tableHover plugin
- * Version: 0.1.3
- *
- * Copyright (c) 2007 Roman Weich
- * http://p.sohei.org
- *
- * Dual licensed under the MIT and GPL licenses 
- * (This means that you can choose the license that best suits your project, and use it accordingly):
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Changelog: 
- * v 0.1.3 - 2007-09-04
- *	- fix: highlight did not work when the hovered table cell had child elements inside
- * v 0.1.2 - 2007-08-13
- *	- fix/change: changed event binding routine, as is got really slow with jquery 1.1.3.1
- *	-change: added new option "ignoreCols", through which columns can be excluded from the highlighting process
- * v 0.1.1 - 2007-06-05
- *	- fix: errors when using the plugin on a table not having a theader or tfoot
- * v 0.1.0 - 2007-05-31
- */
-
-(function($)
-{
-	/**
-	 * Calculates the actual cellIndex value of all cells in the table and stores it in the realCell property of each cell.
-	 * Thats done because the cellIndex value isn't correct when colspans or rowspans are used.
-	 * Originally created by Matt Kruse for his table library - Big Thanks! (see http://www.javascripttoolbox.com/)
-	 * @param {element} table	The table element.
-	 */
-	var fixCellIndexes = function(table) 
-	{
-		var rows = table.rows;
-		var len = rows.length;
-		var matrix = [];
-		for ( var i = 0; i < len; i++ )
-		{
-			var cells = rows[i].cells;
-			var clen = cells.length;
-			for ( var j = 0; j < clen; j++ )
-			{
-				var c = cells[j];
-				var rowSpan = c.rowSpan || 1;
-				var colSpan = c.colSpan || 1;
-				var firstAvailCol = -1;
-				if ( !matrix[i] )
-				{ 
-					matrix[i] = []; 
-				}
-				var m = matrix[i];
-				// Find first available column in the first row
-				while ( m[++firstAvailCol] ) {}
-				c.realIndex = firstAvailCol;
-				for ( var k = i; k < i + rowSpan; k++ )
-				{
-					if ( !matrix[k] )
-					{ 
-						matrix[k] = []; 
-					}
-					var matrixrow = matrix[k];
-					for ( var l = firstAvailCol; l < firstAvailCol + colSpan; l++ )
-					{
-						matrixrow[l] = 1;
-					}
-				}
-			}
-		}
-	};
-
-	/**
-	 * Sets the rowIndex of each row in the table. 
-	 * Opera seems to get that wrong using document order instead of logical order on the tfoot-tbody part.
-	 * @param {element} table	The table element.
-	 */
-	var fixRowIndexes = function(tbl) 
-	{
-		var v = 0, i, k, r = ( tbl.tHead ) ? tbl.tHead.rows : 0;
-		if ( r )
-		{
-			for ( i = 0; i < r.length; i++ )
-			{
-				r[i].realRIndex = v++;
-			}
-		}
-		for ( k = 0; k < tbl.tBodies.length; k++ )
-		{
-			r = tbl.tBodies[k].rows;
-			if ( r )
-			{
-				for ( i = 0; i < r.length; i++ )
-				{
-					r[i].realRIndex = v++;
-				}
-			}
-		}
-		r = ( tbl.tFoot ) ? tbl.tFoot.rows : 0;
-		if ( r )
-		{
-			for ( i = 0; i < r.length; i++ )
-			{
-				r[i].realRIndex = v++;
-			}
-		}
-	};
-
-	/**
-	 * Highlights table rows and/or columns on mouse over.
-	 * Fixes the highlight of the currently highlighted rows/columns on click.
-	 * Works on tables with rowspans and colspans.
-	 *
-	 * @param {map} options			An object for optional settings (options described below).
-	 *
-	 * @option {boolean} allowHead		Allow highlighting when hovering over the table header.
-	 *							Default value: true
-	 * @option {boolean} allowBody		Allow highlighting when hovering over the table body.
-	 *							Default value: true
-	 * @option {boolean} allowFoot		Allow highlighting when hovering over the table footer.
-	 *							Default value: true
-	 *
-	 * @option {boolean} headRows		If true the rows in the table header will be highlighted when hovering over them.
-	 *							Default value: false
-	 * @option {boolean} bodyRows		If true the rows in the table body will be highlighted when hovering over them.
-	 *							Default value: true
-	 * @option {boolean} footRows		If true the rows in the table footer will be highlighted when hovering over them.
-	 *							Default value: false
-	 * @option {boolean} spanRows		When hovering over a cell spanning over more than one row, highlight all spanned rows.
-	 *							Default value: true
-	 *
-	 * @option {boolean} headCols		If true the cells in the table header (matching the currently hovered column) will be highlighted.
-	 *							Default value: false
-	 * @option {boolean} bodyCols		If true the cells in the table body (matching the currently hovered column) will be highlighted.
-	 *							Default value: true
-	 * @option {boolean} footCols		If true the cells in the table footer (matching the currently hovered column) will be highlighted.
-	 *							Default value: false
-	 * @option {boolean} spanCols		When hovering over a cell spanning over more than one column, highlight all spanned columns.
-	 *							Default value: true
-	 * @option {array} ignoreCols		An array of numbers. Each column with the matching column index won't be included in the highlighting process.
-	 *							Index starting at 1!
-	 *							Default value: [] (empty array)
-	 *
-	 * @option {boolean} headCells		Set a special highlight class to the cell the mouse pointer is currently pointing at (inside the table header only).
-	 *							Default value: false
-	 * @option {boolean} bodyCells		Set a special highlight class to the cell the mouse pointer is currently pointing at (inside the table body only).
-	 *							Default value: true
-	 * @option {boolean} footCells		Set a special highlight class to the cell the mouse pointer is currently pointing at (inside the table footer only).
-	 *							Default value: false
-	 *
-	 * @option {string} rowClass			The css class set to the currently highlighted row.
-	 *							Default value: 'hover'
-	 * @option {string} colClass			The css class set to the currently highlighted column.
-	 *							Default value: '' (empty string)
-	 * @option {string} cellClass			The css class set to the currently highlighted cell.
-	 *							Default value: '' (empty string)
-	 * @option {string} clickClass		The css class set to the currently highlighted row and column on mouse click.
-	 *							Default value: '' (empty string)
-	 *
-	 * @example $('#table').tableHover({});
-	 * @desc Add simple row highlighting to #table with default settings.
-	 *
-	 * @example $('#table').tableHover({rowClass: "someclass", colClass: "someotherclass"});
-	 * @desc Add row and columnhighlighting to #table and set the specified css classes to the highlighted cells.
-	 *
-	 * @example $('#table').tableHover({clickClass: "someclickclass"});
-	 * @desc Add simple row highlighting to #table and set the specified css class on the cells when clicked.
-	 *
-	 * @example $('#table').tableHover({allowBody: false, allowFoot: false, allowHead: true, colClass: "someclass"});
-	 * @desc Add column highlighting on #table only highlighting the cells when hovering over the table header.
-	 *
-	 * @example $('#table').tableHover({bodyCols: false, footCols: false, headCols: true, colClass: "someclass"});
-	 * @desc Add column highlighting on #table only for the cells in the header.
-	 *
-	 * @type jQuery
-	 *
-	 * @name tableHover
-	 * @cat Plugins/tableHover
-	 * @author Roman Weich (http://p.sohei.org)
-	 */
-	$.fn.tableHover = function(options)
-	{
-		var settings = $.extend({
-				allowHead : true,
-				allowBody : true,
-				allowFoot : true,
-
-				headRows : false,
-				bodyRows : true,
-				footRows : false,
-				spanRows : true,
-
-				headCols : false,
-				bodyCols : true,
-				footCols : false,
-				spanCols : true,
-				ignoreCols : [],
-
-				headCells : false,
-				bodyCells : true,
-				footCells : false,
-				//css classes,,
-				rowClass : 'hover',
-				colClass : '',
-				cellClass : '',
-				clickClass : ''
-			}, options);
-
-		return this.each(function() 
-        {
-			var colIndex = [], rowIndex = [], tbl = this, r, rCnt = 0, lastClick = [-1, -1];
-
-			if ( !tbl.tBodies || !tbl.tBodies.length )
-			{
-				return;
-			}
-
-			/**
-			 * Adds all rows and each of their cells to the row and column indexes.
-			 * @param {array} rows		An array of table row elements to add.
-			 * @param {string} nodeName	Defines whether the rows are in the header, body or footer of the table.
-			 */
-			var addToIndex = function(rows, nodeName)
-			{
-				var c, row, rowI, cI, rI, s;
-				//loop through the rows
-				for ( rowI = 0; rowI < rows.length; rowI++, rCnt++ )
-				{
-					row = rows[rowI];
-					//each cell
-					for ( cI = 0; cI < row.cells.length; cI++ )
-					{
-						c = row.cells[cI];
-						//add to rowindex
-						if ( (nodeName == 'TBODY' && settings.bodyRows) 
-							|| (nodeName == 'TFOOT' && settings.footRows) 
-							|| (nodeName == 'THEAD' && settings.headRows) )
-						{
-							s = c.rowSpan;
-							while ( --s >= 0 )
-							{
-								rowIndex[rCnt + s].push(c);
-							}
-						}
-						//add do colindex
-						if ( (nodeName == 'TBODY' && settings.bodyCols)
-								|| (nodeName == 'THEAD' && settings.headCols) 
-								|| (nodeName == 'TFOOT' && settings.footCols) )
-						{
-							s = c.colSpan;
-							while ( --s >= 0 )
-							{
-								rI = c.realIndex + s;
-								if ( $.inArray(rI + 1, settings.ignoreCols) > -1 )
-								{
-									break;//dont highlight the columns in the ignoreCols array
-								}
-								if ( !colIndex[rI] )
-								{
-									colIndex[rI] = [];
-								}
-								colIndex[rI].push(c);
-							}
-						}
-						//allow hover for the cell?
-						if ( (nodeName == 'TBODY' && settings.allowBody) 
-								|| (nodeName == 'THEAD' && settings.allowHead) 
-								|| (nodeName == 'TFOOT' && settings.allowFoot) )
-						{
-							c.thover = true;
-						}
-					}
-				}
-			};
-
-			/**
-			 * Mouseover event handling. Set the highlight to the rows/cells.
-			 */
-			var over = function(e)
-			{
-				var p = e.target;
-				while ( p != this && p.thover !== true )
-				{
-					p = p.parentNode;
-				}
-				if ( p.thover === true )
-				{
-					highlight(p, true);
-				}
-			};
-
-			/**
-			 * Mouseout event handling. Remove the highlight from the rows/cells.
-			 */
-			var out = function(e)
-			{
-				var p = e.target;
-				while ( p != this && p.thover !== true )
-				{
-					p = p.parentNode;
-				}
-				if ( p.thover === true )
-				{
-					highlight(p, false);
-				}
-			};
-			
-			/**
-			 * Mousedown event handling. Sets or removes the clickClass css style to the currently highlighted rows/cells.
-			 */
-			var click = function(e)
-			{
-				if ( e.target.thover && settings.clickClass != '' )
-				{
-					var x = e.target.realIndex, y = e.target.parentNode.realRIndex, s = '';
-					//unclick
-					$('td.' + settings.clickClass + ', th.' + settings.clickClass, tbl).removeClass(settings.clickClass);
-					if ( x != lastClick[0] || y != lastClick[1] )
-					{
-						//click..
-						if ( settings.rowClass != '' )
-						{
-							s += ',.' + settings.rowClass;
-						}
-						if ( settings.colClass != '' )
-						{
-							s += ',.' + settings.colClass;
-						}
-						if ( settings.cellClass != '' )
-						{
-							s += ',.' + settings.cellClass;
-						}
-						if ( s != '' )
-						{
-							$('td, th', tbl).filter(s.substring(1)).addClass(settings.clickClass);
-						}
-						lastClick = [x, y];
-					}
-					else
-					{
-						lastClick = [-1, -1];
-					}
-				}
-			};
-			
-			/**
-			 * Adds or removes the highlight to/from the columns and rows.
-			 * @param {element} cell	The cell with the mouseover/mouseout event.
-			 * @param {boolean} on		Defines whether the style will be set or removed.
-			 */
-			var highlight = function(cell, on)
-			{
-				if ( on ) //create dummy funcs - dont want to test for on==true all the time
-				{
-					$.fn.tableHoverHover = $.fn.addClass;
-				}
-				else
-				{
-					$.fn.tableHoverHover = $.fn.removeClass;
-				}
-				//highlight columns
-				var h = colIndex[cell.realIndex] || [], rH = [], i = 0, rI, nn;
-				if ( settings.colClass != '' )
-				{
-					while ( settings.spanCols && ++i < cell.colSpan && colIndex[cell.realIndex + i] )
-					{
-						h = h.concat(colIndex[cell.realIndex + i]);
-					}
-					$(h).tableHoverHover(settings.colClass);
-				}
-				//highlight rows
-				if ( settings.rowClass != '' )
-				{
-					rI = cell.parentNode.realRIndex;
-					if ( rowIndex[rI] )
-					{
-						rH = rH.concat(rowIndex[rI]);
-					}
-					i = 0;
-					while ( settings.spanRows && ++i < cell.rowSpan )
-					{
-						if ( rowIndex[rI + i] )
-						{
-							rH = rH.concat(rowIndex[rI + i]);
-						}
-					}
-					$(rH).tableHoverHover(settings.rowClass);
-				}
-				//highlight cell
-				if ( settings.cellClass != '' )
-				{
-					nn = cell.parentNode.parentNode.nodeName.toUpperCase();
-					if ( (nn == 'TBODY' && settings.bodyCells)
-							|| (nn == 'THEAD' && settings.headCells)
-							|| (nn == 'TFOOT' && settings.footCells) )
-					{
-						$(cell).tableHoverHover(settings.cellClass);
-					}
-				}
-			};
-
-			fixCellIndexes(tbl);
-			fixRowIndexes(tbl);
-
-			//init rowIndex
-			for ( r = 0; r < tbl.rows.length; r++ )
-			{
-				rowIndex[r] = [];
-			}
-			//add header cells to index
-			if ( tbl.tHead )
-			{
-				addToIndex(tbl.tHead.rows, 'THEAD');
-			}
-			//create index - loop through the bodies
-			for ( r = 0; r < tbl.tBodies.length; r++ )
-			{
-				addToIndex(tbl.tBodies[r].rows, 'TBODY');
-			}
-			//add footer cells to index
-			if ( tbl.tFoot )
-			{
-				addToIndex(tbl.tFoot.rows, 'TFOOT');
-			}
-			$(this).bind('mouseover', over).bind('mouseout', out).click(click);
-		});
-	};
-})(jQuery); 
+/*
+ * jQuery tableHover plugin
+ * Version: 0.1.3
+ *
+ * Copyright (c) 2007 Roman Weich
+ * http://p.sohei.org
+ *
+ * Dual licensed under the MIT and GPL licenses 
+ * (This means that you can choose the license that best suits your project, and use it accordingly):
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Changelog: 
+ * v 0.1.3 - 2007-09-04
+ *	- fix: highlight did not work when the hovered table cell had child elements inside
+ * v 0.1.2 - 2007-08-13
+ *	- fix/change: changed event binding routine, as is got really slow with jquery 1.1.3.1
+ *	-change: added new option "ignoreCols", through which columns can be excluded from the highlighting process
+ * v 0.1.1 - 2007-06-05
+ *	- fix: errors when using the plugin on a table not having a theader or tfoot
+ * v 0.1.0 - 2007-05-31
+ */
+
+(function($)
+{
+	/**
+	 * Calculates the actual cellIndex value of all cells in the table and stores it in the realCell property of each cell.
+	 * Thats done because the cellIndex value isn't correct when colspans or rowspans are used.
+	 * Originally created by Matt Kruse for his table library - Big Thanks! (see http://www.javascripttoolbox.com/)
+	 * @param {element} table	The table element.
+	 */
+	var fixCellIndexes = function(table) 
+	{
+		var rows = table.rows;
+		var len = rows.length;
+		var matrix = [];
+		for ( var i = 0; i < len; i++ )
+		{
+			var cells = rows[i].cells;
+			var clen = cells.length;
+			for ( var j = 0; j < clen; j++ )
+			{
+				var c = cells[j];
+				var rowSpan = c.rowSpan || 1;
+				var colSpan = c.colSpan || 1;
+				var firstAvailCol = -1;
+				if ( !matrix[i] )
+				{ 
+					matrix[i] = []; 
+				}
+				var m = matrix[i];
+				// Find first available column in the first row
+				while ( m[++firstAvailCol] ) {}
+				c.realIndex = firstAvailCol;
+				for ( var k = i; k < i + rowSpan; k++ )
+				{
+					if ( !matrix[k] )
+					{ 
+						matrix[k] = []; 
+					}
+					var matrixrow = matrix[k];
+					for ( var l = firstAvailCol; l < firstAvailCol + colSpan; l++ )
+					{
+						matrixrow[l] = 1;
+					}
+				}
+			}
+		}
+	};
+
+	/**
+	 * Sets the rowIndex of each row in the table. 
+	 * Opera seems to get that wrong using document order instead of logical order on the tfoot-tbody part.
+	 * @param {element} table	The table element.
+	 */
+	var fixRowIndexes = function(tbl) 
+	{
+		var v = 0, i, k, r = ( tbl.tHead ) ? tbl.tHead.rows : 0;
+		if ( r )
+		{
+			for ( i = 0; i < r.length; i++ )
+			{
+				r[i].realRIndex = v++;
+			}
+		}
+		for ( k = 0; k < tbl.tBodies.length; k++ )
+		{
+			r = tbl.tBodies[k].rows;
+			if ( r )
+			{
+				for ( i = 0; i < r.length; i++ )
+				{
+					r[i].realRIndex = v++;
+				}
+			}
+		}
+		r = ( tbl.tFoot ) ? tbl.tFoot.rows : 0;
+		if ( r )
+		{
+			for ( i = 0; i < r.length; i++ )
+			{
+				r[i].realRIndex = v++;
+			}
+		}
+	};
+
+	/**
+	 * Highlights table rows and/or columns on mouse over.
+	 * Fixes the highlight of the currently highlighted rows/columns on click.
+	 * Works on tables with rowspans and colspans.
+	 *
+	 * @param {map} options			An object for optional settings (options described below).
+	 *
+	 * @option {boolean} allowHead		Allow highlighting when hovering over the table header.
+	 *							Default value: true
+	 * @option {boolean} allowBody		Allow highlighting when hovering over the table body.
+	 *							Default value: true
+	 * @option {boolean} allowFoot		Allow highlighting when hovering over the table footer.
+	 *							Default value: true
+	 *
+	 * @option {boolean} headRows		If true the rows in the table header will be highlighted when hovering over them.
+	 *							Default value: false
+	 * @option {boolean} bodyRows		If true the rows in the table body will be highlighted when hovering over them.
+	 *							Default value: true
+	 * @option {boolean} footRows		If true the rows in the table footer will be highlighted when hovering over them.
+	 *							Default value: false
+	 * @option {boolean} spanRows		When hovering over a cell spanning over more than one row, highlight all spanned rows.
+	 *							Default value: true
+	 *
+	 * @option {boolean} headCols		If true the cells in the table header (matching the currently hovered column) will be highlighted.
+	 *							Default value: false
+	 * @option {boolean} bodyCols		If true the cells in the table body (matching the currently hovered column) will be highlighted.
+	 *							Default value: true
+	 * @option {boolean} footCols		If true the cells in the table footer (matching the currently hovered column) will be highlighted.
+	 *							Default value: false
+	 * @option {boolean} spanCols		When hovering over a cell spanning over more than one column, highlight all spanned columns.
+	 *							Default value: true
+	 * @option {array} ignoreCols		An array of numbers. Each column with the matching column index won't be included in the highlighting process.
+	 *							Index starting at 1!
+	 *							Default value: [] (empty array)
+	 *
+	 * @option {boolean} headCells		Set a special highlight class to the cell the mouse pointer is currently pointing at (inside the table header only).
+	 *							Default value: false
+	 * @option {boolean} bodyCells		Set a special highlight class to the cell the mouse pointer is currently pointing at (inside the table body only).
+	 *							Default value: true
+	 * @option {boolean} footCells		Set a special highlight class to the cell the mouse pointer is currently pointing at (inside the table footer only).
+	 *							Default value: false
+	 *
+	 * @option {string} rowClass			The css class set to the currently highlighted row.
+	 *							Default value: 'hover'
+	 * @option {string} colClass			The css class set to the currently highlighted column.
+	 *							Default value: '' (empty string)
+	 * @option {string} cellClass			The css class set to the currently highlighted cell.
+	 *							Default value: '' (empty string)
+	 * @option {string} clickClass		The css class set to the currently highlighted row and column on mouse click.
+	 *							Default value: '' (empty string)
+	 *
+	 * @example $('#table').tableHover({});
+	 * @desc Add simple row highlighting to #table with default settings.
+	 *
+	 * @example $('#table').tableHover({rowClass: "someclass", colClass: "someotherclass"});
+	 * @desc Add row and columnhighlighting to #table and set the specified css classes to the highlighted cells.
+	 *
+	 * @example $('#table').tableHover({clickClass: "someclickclass"});
+	 * @desc Add simple row highlighting to #table and set the specified css class on the cells when clicked.
+	 *
+	 * @example $('#table').tableHover({allowBody: false, allowFoot: false, allowHead: true, colClass: "someclass"});
+	 * @desc Add column highlighting on #table only highlighting the cells when hovering over the table header.
+	 *
+	 * @example $('#table').tableHover({bodyCols: false, footCols: false, headCols: true, colClass: "someclass"});
+	 * @desc Add column highlighting on #table only for the cells in the header.
+	 *
+	 * @type jQuery
+	 *
+	 * @name tableHover
+	 * @cat Plugins/tableHover
+	 * @author Roman Weich (http://p.sohei.org)
+	 */
+	$.fn.tableHover = function(options)
+	{
+		var settings = $.extend({
+				allowHead : true,
+				allowBody : true,
+				allowFoot : true,
+
+				headRows : false,
+				bodyRows : true,
+				footRows : false,
+				spanRows : true,
+
+				headCols : false,
+				bodyCols : true,
+				footCols : false,
+				spanCols : true,
+				ignoreCols : [],
+
+				headCells : false,
+				bodyCells : true,
+				footCells : false,
+				//css classes,,
+				rowClass : 'hover',
+				colClass : '',
+				cellClass : '',
+				clickClass : ''
+			}, options);
+
+		return this.each(function() 
+        {
+			var colIndex = [], rowIndex = [], tbl = this, r, rCnt = 0, lastClick = [-1, -1];
+
+			if ( !tbl.tBodies || !tbl.tBodies.length )
+			{
+				return;
+			}
+
+			/**
+			 * Adds all rows and each of their cells to the row and column indexes.
+			 * @param {array} rows		An array of table row elements to add.
+			 * @param {string} nodeName	Defines whether the rows are in the header, body or footer of the table.
+			 */
+			var addToIndex = function(rows, nodeName)
+			{
+				var c, row, rowI, cI, rI, s;
+				//loop through the rows
+				for ( rowI = 0; rowI < rows.length; rowI++, rCnt++ )
+				{
+					row = rows[rowI];
+					//each cell
+					for ( cI = 0; cI < row.cells.length; cI++ )
+					{
+						c = row.cells[cI];
+						//add to rowindex
+						if ( (nodeName == 'TBODY' && settings.bodyRows) 
+							|| (nodeName == 'TFOOT' && settings.footRows) 
+							|| (nodeName == 'THEAD' && settings.headRows) )
+						{
+							s = c.rowSpan;
+							while ( --s >= 0 )
+							{
+								rowIndex[rCnt + s].push(c);
+							}
+						}
+						//add do colindex
+						if ( (nodeName == 'TBODY' && settings.bodyCols)
+								|| (nodeName == 'THEAD' && settings.headCols) 
+								|| (nodeName == 'TFOOT' && settings.footCols) )
+						{
+							s = c.colSpan;
+							while ( --s >= 0 )
+							{
+								rI = c.realIndex + s;
+								if ( $.inArray(rI + 1, settings.ignoreCols) > -1 )
+								{
+									break;//dont highlight the columns in the ignoreCols array
+								}
+								if ( !colIndex[rI] )
+								{
+									colIndex[rI] = [];
+								}
+								colIndex[rI].push(c);
+							}
+						}
+						//allow hover for the cell?
+						if ( (nodeName == 'TBODY' && settings.allowBody) 
+								|| (nodeName == 'THEAD' && settings.allowHead) 
+								|| (nodeName == 'TFOOT' && settings.allowFoot) )
+						{
+							c.thover = true;
+						}
+					}
+				}
+			};
+
+			/**
+			 * Mouseover event handling. Set the highlight to the rows/cells.
+			 */
+			var over = function(e)
+			{
+				var p = e.target;
+				while ( p != this && p.thover !== true )
+				{
+					p = p.parentNode;
+				}
+				if ( p.thover === true )
+				{
+					highlight(p, true);
+				}
+			};
+
+			/**
+			 * Mouseout event handling. Remove the highlight from the rows/cells.
+			 */
+			var out = function(e)
+			{
+				var p = e.target;
+				while ( p != this && p.thover !== true )
+				{
+					p = p.parentNode;
+				}
+				if ( p.thover === true )
+				{
+					highlight(p, false);
+				}
+			};
+			
+			/**
+			 * Mousedown event handling. Sets or removes the clickClass css style to the currently highlighted rows/cells.
+			 */
+			var click = function(e)
+			{
+				if ( e.target.thover && settings.clickClass != '' )
+				{
+					var x = e.target.realIndex, y = e.target.parentNode.realRIndex, s = '';
+					//unclick
+					$('td.' + settings.clickClass + ', th.' + settings.clickClass, tbl).removeClass(settings.clickClass);
+					if ( x != lastClick[0] || y != lastClick[1] )
+					{
+						//click..
+						if ( settings.rowClass != '' )
+						{
+							s += ',.' + settings.rowClass;
+						}
+						if ( settings.colClass != '' )
+						{
+							s += ',.' + settings.colClass;
+						}
+						if ( settings.cellClass != '' )
+						{
+							s += ',.' + settings.cellClass;
+						}
+						if ( s != '' )
+						{
+							$('td, th', tbl).filter(s.substring(1)).addClass(settings.clickClass);
+						}
+						lastClick = [x, y];
+					}
+					else
+					{
+						lastClick = [-1, -1];
+					}
+				}
+			};
+			
+			/**
+			 * Adds or removes the highlight to/from the columns and rows.
+			 * @param {element} cell	The cell with the mouseover/mouseout event.
+			 * @param {boolean} on		Defines whether the style will be set or removed.
+			 */
+			var highlight = function(cell, on)
+			{
+				if ( on ) //create dummy funcs - dont want to test for on==true all the time
+				{
+					$.fn.tableHoverHover = $.fn.addClass;
+				}
+				else
+				{
+					$.fn.tableHoverHover = $.fn.removeClass;
+				}
+				//highlight columns
+				var h = colIndex[cell.realIndex] || [], rH = [], i = 0, rI, nn;
+				if ( settings.colClass != '' )
+				{
+					while ( settings.spanCols && ++i < cell.colSpan && colIndex[cell.realIndex + i] )
+					{
+						h = h.concat(colIndex[cell.realIndex + i]);
+					}
+					$(h).tableHoverHover(settings.colClass);
+				}
+				//highlight rows
+				if ( settings.rowClass != '' )
+				{
+					rI = cell.parentNode.realRIndex;
+					if ( rowIndex[rI] )
+					{
+						rH = rH.concat(rowIndex[rI]);
+					}
+					i = 0;
+					while ( settings.spanRows && ++i < cell.rowSpan )
+					{
+						if ( rowIndex[rI + i] )
+						{
+							rH = rH.concat(rowIndex[rI + i]);
+						}
+					}
+					$(rH).tableHoverHover(settings.rowClass);
+				}
+				//highlight cell
+				if ( settings.cellClass != '' )
+				{
+					nn = cell.parentNode.parentNode.nodeName.toUpperCase();
+					if ( (nn == 'TBODY' && settings.bodyCells)
+							|| (nn == 'THEAD' && settings.headCells)
+							|| (nn == 'TFOOT' && settings.footCells) )
+					{
+						$(cell).tableHoverHover(settings.cellClass);
+					}
+				}
+			};
+
+			fixCellIndexes(tbl);
+			fixRowIndexes(tbl);
+
+			//init rowIndex
+			for ( r = 0; r < tbl.rows.length; r++ )
+			{
+				rowIndex[r] = [];
+			}
+			//add header cells to index
+			if ( tbl.tHead )
+			{
+				addToIndex(tbl.tHead.rows, 'THEAD');
+			}
+			//create index - loop through the bodies
+			for ( r = 0; r < tbl.tBodies.length; r++ )
+			{
+				addToIndex(tbl.tBodies[r].rows, 'TBODY');
+			}
+			//add footer cells to index
+			if ( tbl.tFoot )
+			{
+				addToIndex(tbl.tFoot.rows, 'TFOOT');
+			}
+			$(this).bind('mouseover', over).bind('mouseout', out).click(click);
+		});
+	};
+})(jQuery); 
diff --git a/js/jquery.tablesorter.js b/js/jquery.tablesorter.js
index 1036f0612..8a38c4ed4 100644
--- a/js/jquery.tablesorter.js
+++ b/js/jquery.tablesorter.js
@@ -1,1033 +1,1033 @@
-/*
- * 
- * TableSorter 2.0 - Client-side table sorting with ease!
- * Version 2.0.5b
- * @requires jQuery v1.2.3
- * 
- * Copyright (c) 2007 Christian Bach
- * Examples and docs at: http://tablesorter.com
- * Dual licensed under the MIT and GPL licenses:
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * 
- * Denis Flaven: Modified to add the fakesorton event that simulates a sorton without sorting the table
- * sabello : Updated to remove .browser use (deprecated in jQuery 1.3 and removed in 1.9)
- */
-/**
- * 
- * @description Create a sortable table with multi-column sorting capabilitys
- * 
- * @example $('table').tablesorter();
- * @desc Create a simple tablesorter interface.
- * 
- * @example $('table').tablesorter({ sortList:[[0,0],[1,0]] });
- * @desc Create a tablesorter interface and sort on the first and secound column column headers.
- * 
- * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } });
- *          
- * @desc Create a tablesorter interface and disableing the first and second  column headers.
- *      
- * 
- * @example $('table').tablesorter({ headers: { 0: {sorter:"integer"}, 1: {sorter:"currency"} } });
- * 
- * @desc Create a tablesorter interface and set a column parser for the first
- *       and second column.
- * 
- * 
- * @param Object
- *            settings An object literal containing key/value pairs to provide
- *            optional settings.
- * 
- * 
- * @option String cssHeader (optional) A string of the class name to be appended
- *         to sortable tr elements in the thead of the table. Default value:
- *         "header"
- * 
- * @option String cssAsc (optional) A string of the class name to be appended to
- *         sortable tr elements in the thead on a ascending sort. Default value:
- *         "headerSortUp"
- * 
- * @option String cssDesc (optional) A string of the class name to be appended
- *         to sortable tr elements in the thead on a descending sort. Default
- *         value: "headerSortDown"
- * 
- * @option String sortInitialOrder (optional) A string of the inital sorting
- *         order can be asc or desc. Default value: "asc"
- * 
- * @option String sortMultisortKey (optional) A string of the multi-column sort
- *         key. Default value: "shiftKey"
- * 
- * @option String textExtraction (optional) A string of the text-extraction
- *         method to use. For complex html structures inside td cell set this
- *         option to "complex", on large tables the complex option can be slow.
- *         Default value: "simple"
- * 
- * @option Object headers (optional) An array containing the forces sorting
- *         rules. This option let's you specify a default sorting rule. Default
- *         value: null
- * 
- * @option Array sortList (optional) An array containing the forces sorting
- *         rules. This option let's you specify a default sorting rule. Default
- *         value: null
- * 
- * @option Array sortForce (optional) An array containing forced sorting rules.
- *         This option let's you specify a default sorting rule, which is
- *         prepended to user-selected rules. Default value: null
- * 
- * @option Boolean sortLocaleCompare (optional) Boolean flag indicating whatever
- *         to use String.localeCampare method or not. Default set to true.
- * 
- * 
- * @option Array sortAppend (optional) An array containing forced sorting rules.
- *         This option let's you specify a default sorting rule, which is
- *         appended to user-selected rules. Default value: null
- * 
- * @option Boolean widthFixed (optional) Boolean flag indicating if tablesorter
- *         should apply fixed widths to the table columns. This is usefull when
- *         using the pager companion plugin. This options requires the dimension
- *         jquery plugin. Default value: false
- * 
- * @option Boolean cancelSelection (optional) Boolean flag indicating if
- *         tablesorter should cancel selection of the table headers text.
- *         Default value: true
- * 
- * @option Boolean debug (optional) Boolean flag indicating if tablesorter
- *         should display debuging information usefull for development.
- * 
- * @type jQuery
- * 
- * @name tablesorter
- * 
- * @cat Plugins/Tablesorter
- * 
- * @author Christian Bach/christian.bach@polyester.se
- */
-
-(function ($) {
-    $.extend({
-        tablesorter: new
-        function () {
-
-            var parsers = [],
-                widgets = [];
-
-            this.defaults = {
-                cssHeader: "header",
-                cssAsc: "headerSortUp",
-                cssDesc: "headerSortDown",
-                cssChildRow: "expand-child",
-                sortInitialOrder: "asc",
-                sortMultiSortKey: "shiftKey",
-                sortForce: null,
-                sortAppend: null,
-                sortLocaleCompare: true,
-                textExtraction: "simple",
-                parsers: {}, widgets: [],
-                widgetZebra: {
-                    css: ["even", "odd"]
-                }, headers: {}, widthFixed: false,
-                cancelSelection: true,
-                sortList: [],
-                headerList: [],
-                dateFormat: "us",
-                decimal: '/\.|\,/g',
-                onRenderHeader: null,
-                selectorHeaders: 'thead th',
-                debug: false
-            };
-
-            /* debuging utils */
-
-            function benchmark(s, d) {
-                log(s + "," + (new Date().getTime() - d.getTime()) + "ms");
-            }
-
-            this.benchmark = benchmark;
-
-            function log(s) {
-                if (typeof console != "undefined" && typeof console.debug != "undefined") {
-                    console.log(s);
-                } else {
-                    alert(s);
-                }
-            }
-
-            /* parsers utils */
-
-            function buildParserCache(table, $headers) {
-
-                if (table.config.debug) {
-                    var parsersDebug = "";
-                }
-
-                if (table.tBodies.length == 0) return; // In the case of empty tables
-                var rows = table.tBodies[0].rows;
-
-                if (rows[0]) {
-
-                    var list = [],
-                        cells = rows[0].cells,
-                        l = cells.length;
-
-                    for (var i = 0; i < l; i++) {
-
-                        var p = false;
-
-                        if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) {
-
-                            p = getParserById($($headers[i]).metadata().sorter);
-
-                        } else if ((table.config.headers[i] && table.config.headers[i].sorter)) {
-
-                            p = getParserById(table.config.headers[i].sorter);
-                        }
-                        if (!p) {
-
-                            p = detectParserForColumn(table, rows, -1, i);
-                        }
-
-                        if (table.config.debug) {
-                            parsersDebug += "column:" + i + " parser:" + p.id + "\n";
-                        }
-
-                        list.push(p);
-                    }
-                }
-
-                if (table.config.debug) {
-                    log(parsersDebug);
-                }
-
-                return list;
-            };
-
-            function detectParserForColumn(table, rows, rowIndex, cellIndex) {
-                var l = parsers.length,
-                    node = false,
-                    nodeValue = false,
-                    keepLooking = true;
-                while (nodeValue == '' && keepLooking) {
-                    rowIndex++;
-                    if (rows[rowIndex]) {
-                        node = getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex);
-                        nodeValue = trimAndGetNodeText(table.config, node);
-                        if (table.config.debug) {
-                            log('Checking if value was empty on row:' + rowIndex);
-                        }
-                    } else {
-                        keepLooking = false;
-                    }
-                }
-                for (var i = 1; i < l; i++) {
-                    if (parsers[i].is(nodeValue, table, node)) {
-                        return parsers[i];
-                    }
-                }
-                // 0 is always the generic parser (text)
-                return parsers[0];
-            }
-
-            function getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex) {
-                return rows[rowIndex].cells[cellIndex];
-            }
-
-            function trimAndGetNodeText(config, node) {
-                return $.trim(getElementText(config, node));
-            }
-
-            function getParserById(name) {
-                var l = parsers.length;
-                for (var i = 0; i < l; i++) {
-                    if (parsers[i].id.toLowerCase() == name.toLowerCase()) {
-                        return parsers[i];
-                    }
-                }
-                return false;
-            }
-
-            /* utils */
-
-            function buildCache(table) {
-
-                if (table.config.debug) {
-                    var cacheTime = new Date();
-                }
-
-                var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0,
-                    totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0,
-                    parsers = table.config.parsers,
-                    cache = {
-                        row: [],
-                        normalized: []
-                    };
-
-                for (var i = 0; i < totalRows; ++i) {
-
-                    /** Add the table data to main data array */
-                    var c = $(table.tBodies[0].rows[i]),
-                        cols = [];
-
-                    // if this is a child row, add it to the last row's children and
-                    // continue to the next row
-                    if (c.hasClass(table.config.cssChildRow)) {
-                        cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add(c);
-                        // go to the next for loop
-                        continue;
-                    }
-
-                    cache.row.push(c);
-
-                    for (var j = 0; j < totalCells; ++j) {
-                        cols.push(parsers[j].format(getElementText(table.config, c[0].cells[j]), table, c[0].cells[j]));
-                    }
-
-                    cols.push(cache.normalized.length); // add position for rowCache
-                    cache.normalized.push(cols);
-                    cols = null;
-                };
-
-                if (table.config.debug) {
-                    benchmark("Building cache for " + totalRows + " rows:", cacheTime);
-                }
-
-                return cache;
-            };
-
-            function getElementText(config, node) {
-
-                var text = "";
-
-                if (!node) return "";
-
-                if (!config.supportsTextContent) config.supportsTextContent = node.textContent || false;
-
-                if (config.textExtraction == "simple") {
-                    if (config.supportsTextContent) {
-                        text = node.textContent;
-                    } else {
-                        if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) {
-                            text = node.childNodes[0].innerHTML;
-                        } else {
-                            text = node.innerHTML;
-                        }
-                    }
-                } else {
-                    if (typeof(config.textExtraction) == "function") {
-                        text = config.textExtraction(node);
-                    } else {
-                        text = $(node).text();
-                    }
-                }
-                return text;
-            }
-
-            function appendToTable(table, cache) {
-
-                if (table.config.debug) {
-                    var appendTime = new Date()
-                }
-
-                var c = cache,
-                    r = c.row,
-                    n = c.normalized,
-                    totalRows = n.length,
-                    checkCell = (n[0].length - 1),
-                    tableBody = $(table.tBodies[0]),
-                    rows = [];
-
-
-                for (var i = 0; i < totalRows; i++) {
-                    var pos = n[i][checkCell];
-
-                    rows.push(r[pos]);
-
-                    if (!table.config.appender) {
-
-                        //var o = ;
-                        var l = r[pos].length;
-                        for (var j = 0; j < l; j++) {
-                            tableBody[0].appendChild(r[pos][j]);
-                        }
-
-                        // 
-                    }
-                }
-
-
-
-                if (table.config.appender) {
-
-                    table.config.appender(table, rows);
-                }
-
-                rows = null;
-
-                if (table.config.debug) {
-                    benchmark("Rebuilt table:", appendTime);
-                }
-
-                // apply table widgets
-                applyWidget(table);
-
-                // trigger sortend
-                setTimeout(function () {
-                    $(table).trigger("sortEnd");
-                }, 0);
-
-            };
-
-            function buildHeaders(table) {
-
-                if (table.config.debug) {
-                    var time = new Date();
-                }
-
-                var meta = ($.metadata) ? true : false;
-                
-                var header_index = computeTableHeaderCellIndexes(table);
-
-                $tableHeaders = $(table.config.selectorHeaders, table).each(function (index) {
-
-                    this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
-                    // this.column = index;
-                    this.order = formatSortingOrder(table.config.sortInitialOrder);
-                    
-					
-					this.count = this.order;
-
-                    if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true;
-					if (checkHeaderOptionsSortingLocked(table, index)) this.order = this.lockedOrder = checkHeaderOptionsSortingLocked(table, index);
-
-                    if (!this.sortDisabled) {
-                        var $th = $(this).addClass(table.config.cssHeader);
-                        if (table.config.onRenderHeader) table.config.onRenderHeader.apply($th);
-                    }
-
-                    // add cell to headerList
-                    table.config.headerList[index] = this;
-                });
-
-                if (table.config.debug) {
-                    benchmark("Built headers:", time);
-                    log($tableHeaders);
-                }
-
-                return $tableHeaders;
-
-            };
-
-            // from:
-            // http://www.javascripttoolbox.com/lib/table/examples.php
-            // http://www.javascripttoolbox.com/temp/table_cellindex.html
-
-
-            function computeTableHeaderCellIndexes(t) {
-                var matrix = [];
-                var lookup = {};
-                var thead = t.getElementsByTagName('THEAD')[0];
-                var trs = thead.getElementsByTagName('TR');
-
-                for (var i = 0; i < trs.length; i++) {
-                    var cells = trs[i].cells;
-                    for (var j = 0; j < cells.length; j++) {
-                        var c = cells[j];
-
-                        var rowIndex = c.parentNode.rowIndex;
-                        var cellId = rowIndex + "-" + c.cellIndex;
-                        var rowSpan = c.rowSpan || 1;
-                        var colSpan = c.colSpan || 1
-                        var firstAvailCol;
-                        if (typeof(matrix[rowIndex]) == "undefined") {
-                            matrix[rowIndex] = [];
-                        }
-                        // Find first available column in the first row
-                        for (var k = 0; k < matrix[rowIndex].length + 1; k++) {
-                            if (typeof(matrix[rowIndex][k]) == "undefined") {
-                                firstAvailCol = k;
-                                break;
-                            }
-                        }
-                        lookup[cellId] = firstAvailCol;
-                        for (var k = rowIndex; k < rowIndex + rowSpan; k++) {
-                            if (typeof(matrix[k]) == "undefined") {
-                                matrix[k] = [];
-                            }
-                            var matrixrow = matrix[k];
-                            for (var l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
-                                matrixrow[l] = "x";
-                            }
-                        }
-                    }
-                }
-                return lookup;
-            }
-
-            function checkCellColSpan(table, rows, row) {
-                var arr = [],
-                    r = table.tHead.rows,
-                    c = r[row].cells;
-
-                for (var i = 0; i < c.length; i++) {
-                    var cell = c[i];
-
-                    if (cell.colSpan > 1) {
-                        arr = arr.concat(checkCellColSpan(table, headerArr, row++));
-                    } else {
-                        if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) {
-                            arr.push(cell);
-                        }
-                        // headerArr[row] = (i+row);
-                    }
-                }
-                return arr;
-            };
-
-            function checkHeaderMetadata(cell) {
-                if (($.metadata) && ($(cell).metadata().sorter === false)) {
-                    return true;
-                };
-                return false;
-            }
-
-            function checkHeaderOptions(table, i) {
-                if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) {
-                    return true;
-                };
-                return false;
-            }
-			
-			 function checkHeaderOptionsSortingLocked(table, i) {
-                if ((table.config.headers[i]) && (table.config.headers[i].lockedOrder)) return table.config.headers[i].lockedOrder;
-                return false;
-            }
-			
-            function applyWidget(table) {
-                var c = table.config.widgets;
-                var l = c.length;
-                for (var i = 0; i < l; i++) {
-
-                    getWidgetById(c[i]).format(table);
-                }
-
-            }
-
-            function getWidgetById(name) {
-                var l = widgets.length;
-                for (var i = 0; i < l; i++) {
-                    if (widgets[i].id.toLowerCase() == name.toLowerCase()) {
-                        return widgets[i];
-                    }
-                }
-            };
-
-            function formatSortingOrder(v) {
-                if (typeof(v) != "Number") {
-                    return (v.toLowerCase() == "desc") ? 1 : 0;
-                } else {
-                    return (v == 1) ? 1 : 0;
-                }
-            }
-
-            function isValueInArray(v, a) {
-                var l = a.length;
-                for (var i = 0; i < l; i++) {
-                    if (a[i][0] == v) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-
-            function setHeadersCss(table, $headers, list, css) {
-                // remove all header information
-                $headers.removeClass(css[0]).removeClass(css[1]);
-
-                var h = [];
-                $headers.each(function (offset) {
-                    if (!this.sortDisabled) {
-                        h[this.column] = $(this);
-                    }
-                });
-
-                var l = list.length;
-                for (var i = 0; i < l; i++) {
-                    h[list[i][0]].addClass(css[list[i][1]]);
-                }
-            }
-
-            function fixColumnWidth(table, $headers) {
-                var c = table.config;
-                if (c.widthFixed) {
-                    var colgroup = $('<colgroup>');
-                    $("tr:first td", table.tBodies[0]).each(function () {
-                        colgroup.append($('<col>').css('width', $(this).width()));
-                    });
-                    $(table).prepend(colgroup);
-                };
-            }
-
-            function updateHeaderSortCount(table, sortList) {
-                var c = table.config,
-                    l = sortList.length;
-                for (var i = 0; i < l; i++) {
-                    var s = sortList[i],
-                        o = c.headerList[s[0]];
-                    o.count = s[1];
-                    o.count++;
-                }
-            }
-
-            /* sorting methods */
-
-            function multisort(table, sortList, cache) {
-
-                if (table.config.debug) {
-                    var sortTime = new Date();
-                }
-
-                var dynamicExp = "var sortWrapper = function(a,b) {",
-                    l = sortList.length;
-
-                // TODO: inline functions.
-                for (var i = 0; i < l; i++) {
-
-                    var c = sortList[i][0];
-                    var order = sortList[i][1];
-                    // var s = (getCachedSortType(table.config.parsers,c) == "text") ?
-                    // ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ?
-                    // "sortNumeric" : "sortNumericDesc");
-                    // var s = (table.config.parsers[c].type == "text") ? ((order == 0)
-                    // ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ?
-                    // makeSortNumeric(c) : makeSortNumericDesc(c));
-                    var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c));
-                    var e = "e" + i;
-
-                    dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c
-                    // + "]); ";
-                    dynamicExp += "if(" + e + ") { return " + e + "; } ";
-                    dynamicExp += "else { ";
-
-                }
-
-                // if value is the same keep orignal order
-                var orgOrderCol = cache.normalized[0].length - 1;
-                dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];";
-
-                for (var i = 0; i < l; i++) {
-                    dynamicExp += "}; ";
-                }
-
-                dynamicExp += "return 0; ";
-                dynamicExp += "}; ";
-
-                if (table.config.debug) {
-                    benchmark("Evaling expression:" + dynamicExp, new Date());
-                }
-
-                eval(dynamicExp);
-
-                cache.normalized.sort(sortWrapper);
-
-                if (table.config.debug) {
-                    benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime);
-                }
-
-                return cache;
-            };
-
-            function makeSortFunction(type, direction, index) {
-                var a = "a[" + index + "]",
-                    b = "b[" + index + "]";
-                if (type == 'text' && direction == 'asc') {
-                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
-                } else if (type == 'text' && direction == 'desc') {
-                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
-                } else if (type == 'numeric' && direction == 'asc') {
-                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));";
-                } else if (type == 'numeric' && direction == 'desc') {
-                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));";
-                }
-            };
-
-            function makeSortText(i) {
-                return "((a[" + i + "] < b[" + i + "]) ? -1 : ((a[" + i + "] > b[" + i + "]) ? 1 : 0));";
-            };
-
-            function makeSortTextDesc(i) {
-                return "((b[" + i + "] < a[" + i + "]) ? -1 : ((b[" + i + "] > a[" + i + "]) ? 1 : 0));";
-            };
-
-            function makeSortNumeric(i) {
-                return "a[" + i + "]-b[" + i + "];";
-            };
-
-            function makeSortNumericDesc(i) {
-                return "b[" + i + "]-a[" + i + "];";
-            };
-
-            function sortText(a, b) {
-                if (table.config.sortLocaleCompare) return a.localeCompare(b);
-                return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-            };
-
-            function sortTextDesc(a, b) {
-                if (table.config.sortLocaleCompare) return b.localeCompare(a);
-                return ((b < a) ? -1 : ((b > a) ? 1 : 0));
-            };
-
-            function sortNumeric(a, b) {
-                return a - b;
-            };
-
-            function sortNumericDesc(a, b) {
-                return b - a;
-            };
-
-            function getCachedSortType(parsers, i) {
-                return parsers[i].type;
-            }; /* public methods */
-            this.construct = function (settings) {
-                return this.each(function () {
-                    // if no thead or tbody quit.
-                    if (!this.tHead || !this.tBodies) return;
-                    // declare
-                    var $this, $document, $headers, cache, config, shiftDown = 0,
-                        sortOrder;
-                    // new blank config object
-                    this.config = {};
-                    // merge and extend.
-                    config = $.extend(this.config, $.tablesorter.defaults, settings);
-                    // store common expression for speed
-                    $this = $(this);
-                    // save the settings where they read
-                    $.data(this, "tablesorter", config);
-                    // build headers
-                    $headers = buildHeaders(this);
-                    // try to auto detect column type, and store in tables config
-                    this.config.parsers = buildParserCache(this, $headers);
-                    // build the cache for the tbody cells
-                    cache = buildCache(this);
-                    // get the css class names, could be done else where.
-                    var sortCSS = [config.cssDesc, config.cssAsc];
-                    // fixate columns if the users supplies the fixedWidth option
-                    fixColumnWidth(this);
-                    // apply event handling to headers
-                    // this is to big, perhaps break it out?
-                    $headers.click(
-
-                    function (e) {
-                        var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0;
-                        if (!this.sortDisabled && totalRows > 0) {
-                            // Only call sortStart if sorting is
-                            // enabled.
-                            $this.trigger("sortStart");
-                            // store exp, for speed
-                            var $cell = $(this);
-                            // get current column index
-                            var i = this.column;
-                            // get current column sort order
-                            this.order = this.count++ % 2;
-							// always sort on the locked order.
-							if(this.lockedOrder) this.order = this.lockedOrder;
-							
-							// user only whants to sort on one
-                            // column
-                            if (!e[config.sortMultiSortKey]) {
-                                // flush the sort list
-                                config.sortList = [];
-                                if (config.sortForce != null) {
-                                    var a = config.sortForce;
-                                    for (var j = 0; j < a.length; j++) {
-                                        if (a[j][0] != i) {
-                                            config.sortList.push(a[j]);
-                                        }
-                                    }
-                                }
-                                // add column to sort list
-                                config.sortList.push([i, this.order]);
-                                // multi column sorting
-                            } else {
-                                // the user has clicked on an all
-                                // ready sortet column.
-                                if (isValueInArray(i, config.sortList)) {
-                                    // revers the sorting direction
-                                    // for all tables.
-                                    for (var j = 0; j < config.sortList.length; j++) {
-                                        var s = config.sortList[j],
-                                            o = config.headerList[s[0]];
-                                        if (s[0] == i) {
-                                            o.count = s[1];
-                                            o.count++;
-                                            s[1] = o.count % 2;
-                                        }
-                                    }
-                                } else {
-                                    // add column to sort list array
-                                    config.sortList.push([i, this.order]);
-                                }
-                            };
-                            setTimeout(function () {
-                                // set css for headers
-                                setHeadersCss($this[0], $headers, config.sortList, sortCSS);
-                                appendToTable(
-	                                $this[0], multisort(
-	                                $this[0], config.sortList, cache)
-								);
-                            }, 1);
-                            // stop normal event by returning false
-                            return false;
-                        }
-                        // cancel selection
-                    }).mousedown(function () {
-                        if (config.cancelSelection) {
-                            this.onselectstart = function () {
-                                return false
-                            };
-                            return false;
-                        }
-                    });
-                    // apply easy methods that trigger binded events
-                    $this.bind("update", function () {
-                        var me = this;
-                        setTimeout(function () {
-                            // rebuild parsers.
-                            me.config.parsers = buildParserCache(
-                            me, $headers);
-                            // rebuild the cache map
-                            cache = buildCache(me);
-                        }, 1);
-                    }).bind("updateCell", function (e, cell) {
-                        var config = this.config;
-                        // get position from the dom.
-                        var pos = [(cell.parentNode.rowIndex - 1), cell.cellIndex];
-                        // update cache
-                        cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format(
-                        getElementText(config, cell), cell);
-                    }).bind("fakesorton", function (e, list) {
-                        config.sortList = list;
-                        // update and store the sortlist
-                        var sortList = config.sortList;
-                        // update header count index
-                        updateHeaderSortCount(this, sortList);
-                        // set css for headers
-                        setHeadersCss(this, $headers, sortList, sortCSS);
-                    }).bind("sorton", function (e, list) {
-                        $(this).trigger("sortStart");
-                        config.sortList = list;
-                        // update and store the sortlist
-                        var sortList = config.sortList;
-                        // update header count index
-                        updateHeaderSortCount(this, sortList);
-                        // set css for headers
-                        setHeadersCss(this, $headers, sortList, sortCSS);
-                        // sort the table and append it to the dom
-                        appendToTable(this, multisort(this, sortList, cache));
-                    }).bind("appendCache", function () {
-                        appendToTable(this, cache);
-                    }).bind("applyWidgetId", function (e, id) {
-                        getWidgetById(id).format(this);
-                    }).bind("applyWidgets", function () {
-                        // apply widgets
-                        applyWidget(this);
-                    });
-                    if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) {
-                        config.sortList = $(this).metadata().sortlist;
-                    }
-                    // if user has supplied a sort list to constructor.
-                    if (config.sortList.length > 0) {
-                        $this.trigger("sorton", [config.sortList]);
-                    }
-                    // apply widgets
-                    applyWidget(this);
-                });
-            };
-            this.addParser = function (parser) {
-                var l = parsers.length,
-                    a = true;
-                for (var i = 0; i < l; i++) {
-                    if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) {
-                        a = false;
-                    }
-                }
-                if (a) {
-                    parsers.push(parser);
-                };
-            };
-            this.addWidget = function (widget) {
-                widgets.push(widget);
-            };
-            this.formatFloat = function (s) {
-                var i = parseFloat(s);
-                return (isNaN(i)) ? 0 : i;
-            };
-            this.formatInt = function (s) {
-                var i = parseInt(s);
-                return (isNaN(i)) ? 0 : i;
-            };
-            this.isDigit = function (s, config) {
-                // replace all an wanted chars and match.
-                return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, '')));
-            };
-            this.clearTableBody = function (table) {
-                table.tBodies[0].innerHTML = "";
-            };
-        }
-    });
-
-    // extend plugin scope
-    $.fn.extend({
-        tablesorter: $.tablesorter.construct
-    });
-
-    // make shortcut
-    var ts = $.tablesorter;
-
-    // add default parsers
-    ts.addParser({
-        id: "text",
-        is: function (s) {
-            return true;
-        }, format: function (s) {
-            return $.trim(s.toLocaleLowerCase());
-        }, type: "text"
-    });
-
-    ts.addParser({
-        id: "digit",
-        is: function (s, table) {
-            var c = table.config;
-            return $.tablesorter.isDigit(s, c);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s);
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "currency",
-        is: function (s) {
-            return /^[£$€?.]/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), ""));
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "ipAddress",
-        is: function (s) {
-            return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);
-        }, format: function (s) {
-            var a = s.split("."),
-                r = "",
-                l = a.length;
-            for (var i = 0; i < l; i++) {
-                var item = a[i];
-                if (item.length == 2) {
-                    r += "0" + item;
-                } else {
-                    r += item;
-                }
-            }
-            return $.tablesorter.formatFloat(r);
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "url",
-        is: function (s) {
-            return /^(https?|ftp|file):\/\/$/.test(s);
-        }, format: function (s) {
-            return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), ''));
-        }, type: "text"
-    });
-
-    ts.addParser({
-        id: "isoDate",
-        is: function (s) {
-            return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(
-            new RegExp(/-/g), "/")).getTime() : "0");
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "percent",
-        is: function (s) {
-            return /\%$/.test($.trim(s));
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), ""));
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "usLongDate",
-        is: function (s) {
-            return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(new Date(s).getTime());
-        }, type: "numeric"
-    });
-
-    ts.addParser({
-        id: "shortDate",
-        is: function (s) {
-            return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);
-        }, format: function (s, table) {
-            var c = table.config;
-            s = s.replace(/\-/g, "/");
-            if (c.dateFormat == "us") {
-                // reformat the string in ISO format
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2");
-            } else if (c.dateFormat == "uk") {
-                // reformat the string in ISO format
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1");
-            } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
-                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3");
-            }
-            return $.tablesorter.formatFloat(new Date(s).getTime());
-        }, type: "numeric"
-    });
-    ts.addParser({
-        id: "time",
-        is: function (s) {
-            return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);
-        }, format: function (s) {
-            return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime());
-        }, type: "numeric"
-    });
-    ts.addParser({
-        id: "metadata",
-        is: function (s) {
-            return false;
-        }, format: function (s, table, cell) {
-            var c = table.config,
-                p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
-            return $(cell).metadata()[p];
-        }, type: "numeric"
-    });
-    // add default widgets
-    ts.addWidget({
-        id: "zebra",
-        format: function (table) {
-            if (table.config.debug) {
-                var time = new Date();
-            }
-            var $tr, row = -1,
-                odd;
-            // loop through the visible rows
-            $("tr:visible", table.tBodies[0]).each(function (i) {
-                $tr = $(this);
-                // style children rows the same way the parent
-                // row was styled
-                if (!$tr.hasClass(table.config.cssChildRow)) row++;
-                odd = (row % 2 == 0);
-                $tr.removeClass(
-                table.config.widgetZebra.css[odd ? 0 : 1]).addClass(
-                table.config.widgetZebra.css[odd ? 1 : 0])
-            });
-            if (table.config.debug) {
-                $.tablesorter.benchmark("Applying Zebra widget", time);
-            }
-        }
-    });
+/*
+ * 
+ * TableSorter 2.0 - Client-side table sorting with ease!
+ * Version 2.0.5b
+ * @requires jQuery v1.2.3
+ * 
+ * Copyright (c) 2007 Christian Bach
+ * Examples and docs at: http://tablesorter.com
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ * 
+ * Denis Flaven: Modified to add the fakesorton event that simulates a sorton without sorting the table
+ * sabello : Updated to remove .browser use (deprecated in jQuery 1.3 and removed in 1.9)
+ */
+/**
+ * 
+ * @description Create a sortable table with multi-column sorting capabilitys
+ * 
+ * @example $('table').tablesorter();
+ * @desc Create a simple tablesorter interface.
+ * 
+ * @example $('table').tablesorter({ sortList:[[0,0],[1,0]] });
+ * @desc Create a tablesorter interface and sort on the first and secound column column headers.
+ * 
+ * @example $('table').tablesorter({ headers: { 0: { sorter: false}, 1: {sorter: false} } });
+ *          
+ * @desc Create a tablesorter interface and disableing the first and second  column headers.
+ *      
+ * 
+ * @example $('table').tablesorter({ headers: { 0: {sorter:"integer"}, 1: {sorter:"currency"} } });
+ * 
+ * @desc Create a tablesorter interface and set a column parser for the first
+ *       and second column.
+ * 
+ * 
+ * @param Object
+ *            settings An object literal containing key/value pairs to provide
+ *            optional settings.
+ * 
+ * 
+ * @option String cssHeader (optional) A string of the class name to be appended
+ *         to sortable tr elements in the thead of the table. Default value:
+ *         "header"
+ * 
+ * @option String cssAsc (optional) A string of the class name to be appended to
+ *         sortable tr elements in the thead on a ascending sort. Default value:
+ *         "headerSortUp"
+ * 
+ * @option String cssDesc (optional) A string of the class name to be appended
+ *         to sortable tr elements in the thead on a descending sort. Default
+ *         value: "headerSortDown"
+ * 
+ * @option String sortInitialOrder (optional) A string of the inital sorting
+ *         order can be asc or desc. Default value: "asc"
+ * 
+ * @option String sortMultisortKey (optional) A string of the multi-column sort
+ *         key. Default value: "shiftKey"
+ * 
+ * @option String textExtraction (optional) A string of the text-extraction
+ *         method to use. For complex html structures inside td cell set this
+ *         option to "complex", on large tables the complex option can be slow.
+ *         Default value: "simple"
+ * 
+ * @option Object headers (optional) An array containing the forces sorting
+ *         rules. This option let's you specify a default sorting rule. Default
+ *         value: null
+ * 
+ * @option Array sortList (optional) An array containing the forces sorting
+ *         rules. This option let's you specify a default sorting rule. Default
+ *         value: null
+ * 
+ * @option Array sortForce (optional) An array containing forced sorting rules.
+ *         This option let's you specify a default sorting rule, which is
+ *         prepended to user-selected rules. Default value: null
+ * 
+ * @option Boolean sortLocaleCompare (optional) Boolean flag indicating whatever
+ *         to use String.localeCampare method or not. Default set to true.
+ * 
+ * 
+ * @option Array sortAppend (optional) An array containing forced sorting rules.
+ *         This option let's you specify a default sorting rule, which is
+ *         appended to user-selected rules. Default value: null
+ * 
+ * @option Boolean widthFixed (optional) Boolean flag indicating if tablesorter
+ *         should apply fixed widths to the table columns. This is usefull when
+ *         using the pager companion plugin. This options requires the dimension
+ *         jquery plugin. Default value: false
+ * 
+ * @option Boolean cancelSelection (optional) Boolean flag indicating if
+ *         tablesorter should cancel selection of the table headers text.
+ *         Default value: true
+ * 
+ * @option Boolean debug (optional) Boolean flag indicating if tablesorter
+ *         should display debuging information usefull for development.
+ * 
+ * @type jQuery
+ * 
+ * @name tablesorter
+ * 
+ * @cat Plugins/Tablesorter
+ * 
+ * @author Christian Bach/christian.bach@polyester.se
+ */
+
+(function ($) {
+    $.extend({
+        tablesorter: new
+        function () {
+
+            var parsers = [],
+                widgets = [];
+
+            this.defaults = {
+                cssHeader: "header",
+                cssAsc: "headerSortUp",
+                cssDesc: "headerSortDown",
+                cssChildRow: "expand-child",
+                sortInitialOrder: "asc",
+                sortMultiSortKey: "shiftKey",
+                sortForce: null,
+                sortAppend: null,
+                sortLocaleCompare: true,
+                textExtraction: "simple",
+                parsers: {}, widgets: [],
+                widgetZebra: {
+                    css: ["even", "odd"]
+                }, headers: {}, widthFixed: false,
+                cancelSelection: true,
+                sortList: [],
+                headerList: [],
+                dateFormat: "us",
+                decimal: '/\.|\,/g',
+                onRenderHeader: null,
+                selectorHeaders: 'thead th',
+                debug: false
+            };
+
+            /* debuging utils */
+
+            function benchmark(s, d) {
+                log(s + "," + (new Date().getTime() - d.getTime()) + "ms");
+            }
+
+            this.benchmark = benchmark;
+
+            function log(s) {
+                if (typeof console != "undefined" && typeof console.debug != "undefined") {
+                    console.log(s);
+                } else {
+                    alert(s);
+                }
+            }
+
+            /* parsers utils */
+
+            function buildParserCache(table, $headers) {
+
+                if (table.config.debug) {
+                    var parsersDebug = "";
+                }
+
+                if (table.tBodies.length == 0) return; // In the case of empty tables
+                var rows = table.tBodies[0].rows;
+
+                if (rows[0]) {
+
+                    var list = [],
+                        cells = rows[0].cells,
+                        l = cells.length;
+
+                    for (var i = 0; i < l; i++) {
+
+                        var p = false;
+
+                        if ($.metadata && ($($headers[i]).metadata() && $($headers[i]).metadata().sorter)) {
+
+                            p = getParserById($($headers[i]).metadata().sorter);
+
+                        } else if ((table.config.headers[i] && table.config.headers[i].sorter)) {
+
+                            p = getParserById(table.config.headers[i].sorter);
+                        }
+                        if (!p) {
+
+                            p = detectParserForColumn(table, rows, -1, i);
+                        }
+
+                        if (table.config.debug) {
+                            parsersDebug += "column:" + i + " parser:" + p.id + "\n";
+                        }
+
+                        list.push(p);
+                    }
+                }
+
+                if (table.config.debug) {
+                    log(parsersDebug);
+                }
+
+                return list;
+            };
+
+            function detectParserForColumn(table, rows, rowIndex, cellIndex) {
+                var l = parsers.length,
+                    node = false,
+                    nodeValue = false,
+                    keepLooking = true;
+                while (nodeValue == '' && keepLooking) {
+                    rowIndex++;
+                    if (rows[rowIndex]) {
+                        node = getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex);
+                        nodeValue = trimAndGetNodeText(table.config, node);
+                        if (table.config.debug) {
+                            log('Checking if value was empty on row:' + rowIndex);
+                        }
+                    } else {
+                        keepLooking = false;
+                    }
+                }
+                for (var i = 1; i < l; i++) {
+                    if (parsers[i].is(nodeValue, table, node)) {
+                        return parsers[i];
+                    }
+                }
+                // 0 is always the generic parser (text)
+                return parsers[0];
+            }
+
+            function getNodeFromRowAndCellIndex(rows, rowIndex, cellIndex) {
+                return rows[rowIndex].cells[cellIndex];
+            }
+
+            function trimAndGetNodeText(config, node) {
+                return $.trim(getElementText(config, node));
+            }
+
+            function getParserById(name) {
+                var l = parsers.length;
+                for (var i = 0; i < l; i++) {
+                    if (parsers[i].id.toLowerCase() == name.toLowerCase()) {
+                        return parsers[i];
+                    }
+                }
+                return false;
+            }
+
+            /* utils */
+
+            function buildCache(table) {
+
+                if (table.config.debug) {
+                    var cacheTime = new Date();
+                }
+
+                var totalRows = (table.tBodies[0] && table.tBodies[0].rows.length) || 0,
+                    totalCells = (table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length) || 0,
+                    parsers = table.config.parsers,
+                    cache = {
+                        row: [],
+                        normalized: []
+                    };
+
+                for (var i = 0; i < totalRows; ++i) {
+
+                    /** Add the table data to main data array */
+                    var c = $(table.tBodies[0].rows[i]),
+                        cols = [];
+
+                    // if this is a child row, add it to the last row's children and
+                    // continue to the next row
+                    if (c.hasClass(table.config.cssChildRow)) {
+                        cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add(c);
+                        // go to the next for loop
+                        continue;
+                    }
+
+                    cache.row.push(c);
+
+                    for (var j = 0; j < totalCells; ++j) {
+                        cols.push(parsers[j].format(getElementText(table.config, c[0].cells[j]), table, c[0].cells[j]));
+                    }
+
+                    cols.push(cache.normalized.length); // add position for rowCache
+                    cache.normalized.push(cols);
+                    cols = null;
+                };
+
+                if (table.config.debug) {
+                    benchmark("Building cache for " + totalRows + " rows:", cacheTime);
+                }
+
+                return cache;
+            };
+
+            function getElementText(config, node) {
+
+                var text = "";
+
+                if (!node) return "";
+
+                if (!config.supportsTextContent) config.supportsTextContent = node.textContent || false;
+
+                if (config.textExtraction == "simple") {
+                    if (config.supportsTextContent) {
+                        text = node.textContent;
+                    } else {
+                        if (node.childNodes[0] && node.childNodes[0].hasChildNodes()) {
+                            text = node.childNodes[0].innerHTML;
+                        } else {
+                            text = node.innerHTML;
+                        }
+                    }
+                } else {
+                    if (typeof(config.textExtraction) == "function") {
+                        text = config.textExtraction(node);
+                    } else {
+                        text = $(node).text();
+                    }
+                }
+                return text;
+            }
+
+            function appendToTable(table, cache) {
+
+                if (table.config.debug) {
+                    var appendTime = new Date()
+                }
+
+                var c = cache,
+                    r = c.row,
+                    n = c.normalized,
+                    totalRows = n.length,
+                    checkCell = (n[0].length - 1),
+                    tableBody = $(table.tBodies[0]),
+                    rows = [];
+
+
+                for (var i = 0; i < totalRows; i++) {
+                    var pos = n[i][checkCell];
+
+                    rows.push(r[pos]);
+
+                    if (!table.config.appender) {
+
+                        //var o = ;
+                        var l = r[pos].length;
+                        for (var j = 0; j < l; j++) {
+                            tableBody[0].appendChild(r[pos][j]);
+                        }
+
+                        // 
+                    }
+                }
+
+
+
+                if (table.config.appender) {
+
+                    table.config.appender(table, rows);
+                }
+
+                rows = null;
+
+                if (table.config.debug) {
+                    benchmark("Rebuilt table:", appendTime);
+                }
+
+                // apply table widgets
+                applyWidget(table);
+
+                // trigger sortend
+                setTimeout(function () {
+                    $(table).trigger("sortEnd");
+                }, 0);
+
+            };
+
+            function buildHeaders(table) {
+
+                if (table.config.debug) {
+                    var time = new Date();
+                }
+
+                var meta = ($.metadata) ? true : false;
+                
+                var header_index = computeTableHeaderCellIndexes(table);
+
+                $tableHeaders = $(table.config.selectorHeaders, table).each(function (index) {
+
+                    this.column = header_index[this.parentNode.rowIndex + "-" + this.cellIndex];
+                    // this.column = index;
+                    this.order = formatSortingOrder(table.config.sortInitialOrder);
+                    
+					
+					this.count = this.order;
+
+                    if (checkHeaderMetadata(this) || checkHeaderOptions(table, index)) this.sortDisabled = true;
+					if (checkHeaderOptionsSortingLocked(table, index)) this.order = this.lockedOrder = checkHeaderOptionsSortingLocked(table, index);
+
+                    if (!this.sortDisabled) {
+                        var $th = $(this).addClass(table.config.cssHeader);
+                        if (table.config.onRenderHeader) table.config.onRenderHeader.apply($th);
+                    }
+
+                    // add cell to headerList
+                    table.config.headerList[index] = this;
+                });
+
+                if (table.config.debug) {
+                    benchmark("Built headers:", time);
+                    log($tableHeaders);
+                }
+
+                return $tableHeaders;
+
+            };
+
+            // from:
+            // http://www.javascripttoolbox.com/lib/table/examples.php
+            // http://www.javascripttoolbox.com/temp/table_cellindex.html
+
+
+            function computeTableHeaderCellIndexes(t) {
+                var matrix = [];
+                var lookup = {};
+                var thead = t.getElementsByTagName('THEAD')[0];
+                var trs = thead.getElementsByTagName('TR');
+
+                for (var i = 0; i < trs.length; i++) {
+                    var cells = trs[i].cells;
+                    for (var j = 0; j < cells.length; j++) {
+                        var c = cells[j];
+
+                        var rowIndex = c.parentNode.rowIndex;
+                        var cellId = rowIndex + "-" + c.cellIndex;
+                        var rowSpan = c.rowSpan || 1;
+                        var colSpan = c.colSpan || 1
+                        var firstAvailCol;
+                        if (typeof(matrix[rowIndex]) == "undefined") {
+                            matrix[rowIndex] = [];
+                        }
+                        // Find first available column in the first row
+                        for (var k = 0; k < matrix[rowIndex].length + 1; k++) {
+                            if (typeof(matrix[rowIndex][k]) == "undefined") {
+                                firstAvailCol = k;
+                                break;
+                            }
+                        }
+                        lookup[cellId] = firstAvailCol;
+                        for (var k = rowIndex; k < rowIndex + rowSpan; k++) {
+                            if (typeof(matrix[k]) == "undefined") {
+                                matrix[k] = [];
+                            }
+                            var matrixrow = matrix[k];
+                            for (var l = firstAvailCol; l < firstAvailCol + colSpan; l++) {
+                                matrixrow[l] = "x";
+                            }
+                        }
+                    }
+                }
+                return lookup;
+            }
+
+            function checkCellColSpan(table, rows, row) {
+                var arr = [],
+                    r = table.tHead.rows,
+                    c = r[row].cells;
+
+                for (var i = 0; i < c.length; i++) {
+                    var cell = c[i];
+
+                    if (cell.colSpan > 1) {
+                        arr = arr.concat(checkCellColSpan(table, headerArr, row++));
+                    } else {
+                        if (table.tHead.length == 1 || (cell.rowSpan > 1 || !r[row + 1])) {
+                            arr.push(cell);
+                        }
+                        // headerArr[row] = (i+row);
+                    }
+                }
+                return arr;
+            };
+
+            function checkHeaderMetadata(cell) {
+                if (($.metadata) && ($(cell).metadata().sorter === false)) {
+                    return true;
+                };
+                return false;
+            }
+
+            function checkHeaderOptions(table, i) {
+                if ((table.config.headers[i]) && (table.config.headers[i].sorter === false)) {
+                    return true;
+                };
+                return false;
+            }
+			
+			 function checkHeaderOptionsSortingLocked(table, i) {
+                if ((table.config.headers[i]) && (table.config.headers[i].lockedOrder)) return table.config.headers[i].lockedOrder;
+                return false;
+            }
+			
+            function applyWidget(table) {
+                var c = table.config.widgets;
+                var l = c.length;
+                for (var i = 0; i < l; i++) {
+
+                    getWidgetById(c[i]).format(table);
+                }
+
+            }
+
+            function getWidgetById(name) {
+                var l = widgets.length;
+                for (var i = 0; i < l; i++) {
+                    if (widgets[i].id.toLowerCase() == name.toLowerCase()) {
+                        return widgets[i];
+                    }
+                }
+            };
+
+            function formatSortingOrder(v) {
+                if (typeof(v) != "Number") {
+                    return (v.toLowerCase() == "desc") ? 1 : 0;
+                } else {
+                    return (v == 1) ? 1 : 0;
+                }
+            }
+
+            function isValueInArray(v, a) {
+                var l = a.length;
+                for (var i = 0; i < l; i++) {
+                    if (a[i][0] == v) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            function setHeadersCss(table, $headers, list, css) {
+                // remove all header information
+                $headers.removeClass(css[0]).removeClass(css[1]);
+
+                var h = [];
+                $headers.each(function (offset) {
+                    if (!this.sortDisabled) {
+                        h[this.column] = $(this);
+                    }
+                });
+
+                var l = list.length;
+                for (var i = 0; i < l; i++) {
+                    h[list[i][0]].addClass(css[list[i][1]]);
+                }
+            }
+
+            function fixColumnWidth(table, $headers) {
+                var c = table.config;
+                if (c.widthFixed) {
+                    var colgroup = $('<colgroup>');
+                    $("tr:first td", table.tBodies[0]).each(function () {
+                        colgroup.append($('<col>').css('width', $(this).width()));
+                    });
+                    $(table).prepend(colgroup);
+                };
+            }
+
+            function updateHeaderSortCount(table, sortList) {
+                var c = table.config,
+                    l = sortList.length;
+                for (var i = 0; i < l; i++) {
+                    var s = sortList[i],
+                        o = c.headerList[s[0]];
+                    o.count = s[1];
+                    o.count++;
+                }
+            }
+
+            /* sorting methods */
+
+            function multisort(table, sortList, cache) {
+
+                if (table.config.debug) {
+                    var sortTime = new Date();
+                }
+
+                var dynamicExp = "var sortWrapper = function(a,b) {",
+                    l = sortList.length;
+
+                // TODO: inline functions.
+                for (var i = 0; i < l; i++) {
+
+                    var c = sortList[i][0];
+                    var order = sortList[i][1];
+                    // var s = (getCachedSortType(table.config.parsers,c) == "text") ?
+                    // ((order == 0) ? "sortText" : "sortTextDesc") : ((order == 0) ?
+                    // "sortNumeric" : "sortNumericDesc");
+                    // var s = (table.config.parsers[c].type == "text") ? ((order == 0)
+                    // ? makeSortText(c) : makeSortTextDesc(c)) : ((order == 0) ?
+                    // makeSortNumeric(c) : makeSortNumericDesc(c));
+                    var s = (table.config.parsers[c].type == "text") ? ((order == 0) ? makeSortFunction("text", "asc", c) : makeSortFunction("text", "desc", c)) : ((order == 0) ? makeSortFunction("numeric", "asc", c) : makeSortFunction("numeric", "desc", c));
+                    var e = "e" + i;
+
+                    dynamicExp += "var " + e + " = " + s; // + "(a[" + c + "],b[" + c
+                    // + "]); ";
+                    dynamicExp += "if(" + e + ") { return " + e + "; } ";
+                    dynamicExp += "else { ";
+
+                }
+
+                // if value is the same keep orignal order
+                var orgOrderCol = cache.normalized[0].length - 1;
+                dynamicExp += "return a[" + orgOrderCol + "]-b[" + orgOrderCol + "];";
+
+                for (var i = 0; i < l; i++) {
+                    dynamicExp += "}; ";
+                }
+
+                dynamicExp += "return 0; ";
+                dynamicExp += "}; ";
+
+                if (table.config.debug) {
+                    benchmark("Evaling expression:" + dynamicExp, new Date());
+                }
+
+                eval(dynamicExp);
+
+                cache.normalized.sort(sortWrapper);
+
+                if (table.config.debug) {
+                    benchmark("Sorting on " + sortList.toString() + " and dir " + order + " time:", sortTime);
+                }
+
+                return cache;
+            };
+
+            function makeSortFunction(type, direction, index) {
+                var a = "a[" + index + "]",
+                    b = "b[" + index + "]";
+                if (type == 'text' && direction == 'asc') {
+                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + a + " < " + b + ") ? -1 : 1 )));";
+                } else if (type == 'text' && direction == 'desc') {
+                    return "(" + a + " == " + b + " ? 0 : (" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : (" + b + " < " + a + ") ? -1 : 1 )));";
+                } else if (type == 'numeric' && direction == 'asc') {
+                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + a + " - " + b + "));";
+                } else if (type == 'numeric' && direction == 'desc') {
+                    return "(" + a + " === null && " + b + " === null) ? 0 :(" + a + " === null ? Number.POSITIVE_INFINITY : (" + b + " === null ? Number.NEGATIVE_INFINITY : " + b + " - " + a + "));";
+                }
+            };
+
+            function makeSortText(i) {
+                return "((a[" + i + "] < b[" + i + "]) ? -1 : ((a[" + i + "] > b[" + i + "]) ? 1 : 0));";
+            };
+
+            function makeSortTextDesc(i) {
+                return "((b[" + i + "] < a[" + i + "]) ? -1 : ((b[" + i + "] > a[" + i + "]) ? 1 : 0));";
+            };
+
+            function makeSortNumeric(i) {
+                return "a[" + i + "]-b[" + i + "];";
+            };
+
+            function makeSortNumericDesc(i) {
+                return "b[" + i + "]-a[" + i + "];";
+            };
+
+            function sortText(a, b) {
+                if (table.config.sortLocaleCompare) return a.localeCompare(b);
+                return ((a < b) ? -1 : ((a > b) ? 1 : 0));
+            };
+
+            function sortTextDesc(a, b) {
+                if (table.config.sortLocaleCompare) return b.localeCompare(a);
+                return ((b < a) ? -1 : ((b > a) ? 1 : 0));
+            };
+
+            function sortNumeric(a, b) {
+                return a - b;
+            };
+
+            function sortNumericDesc(a, b) {
+                return b - a;
+            };
+
+            function getCachedSortType(parsers, i) {
+                return parsers[i].type;
+            }; /* public methods */
+            this.construct = function (settings) {
+                return this.each(function () {
+                    // if no thead or tbody quit.
+                    if (!this.tHead || !this.tBodies) return;
+                    // declare
+                    var $this, $document, $headers, cache, config, shiftDown = 0,
+                        sortOrder;
+                    // new blank config object
+                    this.config = {};
+                    // merge and extend.
+                    config = $.extend(this.config, $.tablesorter.defaults, settings);
+                    // store common expression for speed
+                    $this = $(this);
+                    // save the settings where they read
+                    $.data(this, "tablesorter", config);
+                    // build headers
+                    $headers = buildHeaders(this);
+                    // try to auto detect column type, and store in tables config
+                    this.config.parsers = buildParserCache(this, $headers);
+                    // build the cache for the tbody cells
+                    cache = buildCache(this);
+                    // get the css class names, could be done else where.
+                    var sortCSS = [config.cssDesc, config.cssAsc];
+                    // fixate columns if the users supplies the fixedWidth option
+                    fixColumnWidth(this);
+                    // apply event handling to headers
+                    // this is to big, perhaps break it out?
+                    $headers.click(
+
+                    function (e) {
+                        var totalRows = ($this[0].tBodies[0] && $this[0].tBodies[0].rows.length) || 0;
+                        if (!this.sortDisabled && totalRows > 0) {
+                            // Only call sortStart if sorting is
+                            // enabled.
+                            $this.trigger("sortStart");
+                            // store exp, for speed
+                            var $cell = $(this);
+                            // get current column index
+                            var i = this.column;
+                            // get current column sort order
+                            this.order = this.count++ % 2;
+							// always sort on the locked order.
+							if(this.lockedOrder) this.order = this.lockedOrder;
+							
+							// user only whants to sort on one
+                            // column
+                            if (!e[config.sortMultiSortKey]) {
+                                // flush the sort list
+                                config.sortList = [];
+                                if (config.sortForce != null) {
+                                    var a = config.sortForce;
+                                    for (var j = 0; j < a.length; j++) {
+                                        if (a[j][0] != i) {
+                                            config.sortList.push(a[j]);
+                                        }
+                                    }
+                                }
+                                // add column to sort list
+                                config.sortList.push([i, this.order]);
+                                // multi column sorting
+                            } else {
+                                // the user has clicked on an all
+                                // ready sortet column.
+                                if (isValueInArray(i, config.sortList)) {
+                                    // revers the sorting direction
+                                    // for all tables.
+                                    for (var j = 0; j < config.sortList.length; j++) {
+                                        var s = config.sortList[j],
+                                            o = config.headerList[s[0]];
+                                        if (s[0] == i) {
+                                            o.count = s[1];
+                                            o.count++;
+                                            s[1] = o.count % 2;
+                                        }
+                                    }
+                                } else {
+                                    // add column to sort list array
+                                    config.sortList.push([i, this.order]);
+                                }
+                            };
+                            setTimeout(function () {
+                                // set css for headers
+                                setHeadersCss($this[0], $headers, config.sortList, sortCSS);
+                                appendToTable(
+	                                $this[0], multisort(
+	                                $this[0], config.sortList, cache)
+								);
+                            }, 1);
+                            // stop normal event by returning false
+                            return false;
+                        }
+                        // cancel selection
+                    }).mousedown(function () {
+                        if (config.cancelSelection) {
+                            this.onselectstart = function () {
+                                return false
+                            };
+                            return false;
+                        }
+                    });
+                    // apply easy methods that trigger binded events
+                    $this.bind("update", function () {
+                        var me = this;
+                        setTimeout(function () {
+                            // rebuild parsers.
+                            me.config.parsers = buildParserCache(
+                            me, $headers);
+                            // rebuild the cache map
+                            cache = buildCache(me);
+                        }, 1);
+                    }).bind("updateCell", function (e, cell) {
+                        var config = this.config;
+                        // get position from the dom.
+                        var pos = [(cell.parentNode.rowIndex - 1), cell.cellIndex];
+                        // update cache
+                        cache.normalized[pos[0]][pos[1]] = config.parsers[pos[1]].format(
+                        getElementText(config, cell), cell);
+                    }).bind("fakesorton", function (e, list) {
+                        config.sortList = list;
+                        // update and store the sortlist
+                        var sortList = config.sortList;
+                        // update header count index
+                        updateHeaderSortCount(this, sortList);
+                        // set css for headers
+                        setHeadersCss(this, $headers, sortList, sortCSS);
+                    }).bind("sorton", function (e, list) {
+                        $(this).trigger("sortStart");
+                        config.sortList = list;
+                        // update and store the sortlist
+                        var sortList = config.sortList;
+                        // update header count index
+                        updateHeaderSortCount(this, sortList);
+                        // set css for headers
+                        setHeadersCss(this, $headers, sortList, sortCSS);
+                        // sort the table and append it to the dom
+                        appendToTable(this, multisort(this, sortList, cache));
+                    }).bind("appendCache", function () {
+                        appendToTable(this, cache);
+                    }).bind("applyWidgetId", function (e, id) {
+                        getWidgetById(id).format(this);
+                    }).bind("applyWidgets", function () {
+                        // apply widgets
+                        applyWidget(this);
+                    });
+                    if ($.metadata && ($(this).metadata() && $(this).metadata().sortlist)) {
+                        config.sortList = $(this).metadata().sortlist;
+                    }
+                    // if user has supplied a sort list to constructor.
+                    if (config.sortList.length > 0) {
+                        $this.trigger("sorton", [config.sortList]);
+                    }
+                    // apply widgets
+                    applyWidget(this);
+                });
+            };
+            this.addParser = function (parser) {
+                var l = parsers.length,
+                    a = true;
+                for (var i = 0; i < l; i++) {
+                    if (parsers[i].id.toLowerCase() == parser.id.toLowerCase()) {
+                        a = false;
+                    }
+                }
+                if (a) {
+                    parsers.push(parser);
+                };
+            };
+            this.addWidget = function (widget) {
+                widgets.push(widget);
+            };
+            this.formatFloat = function (s) {
+                var i = parseFloat(s);
+                return (isNaN(i)) ? 0 : i;
+            };
+            this.formatInt = function (s) {
+                var i = parseInt(s);
+                return (isNaN(i)) ? 0 : i;
+            };
+            this.isDigit = function (s, config) {
+                // replace all an wanted chars and match.
+                return /^[-+]?\d*$/.test($.trim(s.replace(/[,.']/g, '')));
+            };
+            this.clearTableBody = function (table) {
+                table.tBodies[0].innerHTML = "";
+            };
+        }
+    });
+
+    // extend plugin scope
+    $.fn.extend({
+        tablesorter: $.tablesorter.construct
+    });
+
+    // make shortcut
+    var ts = $.tablesorter;
+
+    // add default parsers
+    ts.addParser({
+        id: "text",
+        is: function (s) {
+            return true;
+        }, format: function (s) {
+            return $.trim(s.toLocaleLowerCase());
+        }, type: "text"
+    });
+
+    ts.addParser({
+        id: "digit",
+        is: function (s, table) {
+            var c = table.config;
+            return $.tablesorter.isDigit(s, c);
+        }, format: function (s) {
+            return $.tablesorter.formatFloat(s);
+        }, type: "numeric"
+    });
+
+    ts.addParser({
+        id: "currency",
+        is: function (s) {
+            return /^[£$€?.]/.test(s);
+        }, format: function (s) {
+            return $.tablesorter.formatFloat(s.replace(new RegExp(/[£$€]/g), ""));
+        }, type: "numeric"
+    });
+
+    ts.addParser({
+        id: "ipAddress",
+        is: function (s) {
+            return /^\d{2,3}[\.]\d{2,3}[\.]\d{2,3}[\.]\d{2,3}$/.test(s);
+        }, format: function (s) {
+            var a = s.split("."),
+                r = "",
+                l = a.length;
+            for (var i = 0; i < l; i++) {
+                var item = a[i];
+                if (item.length == 2) {
+                    r += "0" + item;
+                } else {
+                    r += item;
+                }
+            }
+            return $.tablesorter.formatFloat(r);
+        }, type: "numeric"
+    });
+
+    ts.addParser({
+        id: "url",
+        is: function (s) {
+            return /^(https?|ftp|file):\/\/$/.test(s);
+        }, format: function (s) {
+            return jQuery.trim(s.replace(new RegExp(/(https?|ftp|file):\/\//), ''));
+        }, type: "text"
+    });
+
+    ts.addParser({
+        id: "isoDate",
+        is: function (s) {
+            return /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(s);
+        }, format: function (s) {
+            return $.tablesorter.formatFloat((s != "") ? new Date(s.replace(
+            new RegExp(/-/g), "/")).getTime() : "0");
+        }, type: "numeric"
+    });
+
+    ts.addParser({
+        id: "percent",
+        is: function (s) {
+            return /\%$/.test($.trim(s));
+        }, format: function (s) {
+            return $.tablesorter.formatFloat(s.replace(new RegExp(/%/g), ""));
+        }, type: "numeric"
+    });
+
+    ts.addParser({
+        id: "usLongDate",
+        is: function (s) {
+            return s.match(new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/));
+        }, format: function (s) {
+            return $.tablesorter.formatFloat(new Date(s).getTime());
+        }, type: "numeric"
+    });
+
+    ts.addParser({
+        id: "shortDate",
+        is: function (s) {
+            return /\d{1,2}[\/\-]\d{1,2}[\/\-]\d{2,4}/.test(s);
+        }, format: function (s, table) {
+            var c = table.config;
+            s = s.replace(/\-/g, "/");
+            if (c.dateFormat == "us") {
+                // reformat the string in ISO format
+                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$1/$2");
+            } else if (c.dateFormat == "uk") {
+                // reformat the string in ISO format
+                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{4})/, "$3/$2/$1");
+            } else if (c.dateFormat == "dd/mm/yy" || c.dateFormat == "dd-mm-yy") {
+                s = s.replace(/(\d{1,2})[\/\-](\d{1,2})[\/\-](\d{2})/, "$1/$2/$3");
+            }
+            return $.tablesorter.formatFloat(new Date(s).getTime());
+        }, type: "numeric"
+    });
+    ts.addParser({
+        id: "time",
+        is: function (s) {
+            return /^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/.test(s);
+        }, format: function (s) {
+            return $.tablesorter.formatFloat(new Date("2000/01/01 " + s).getTime());
+        }, type: "numeric"
+    });
+    ts.addParser({
+        id: "metadata",
+        is: function (s) {
+            return false;
+        }, format: function (s, table, cell) {
+            var c = table.config,
+                p = (!c.parserMetadataName) ? 'sortValue' : c.parserMetadataName;
+            return $(cell).metadata()[p];
+        }, type: "numeric"
+    });
+    // add default widgets
+    ts.addWidget({
+        id: "zebra",
+        format: function (table) {
+            if (table.config.debug) {
+                var time = new Date();
+            }
+            var $tr, row = -1,
+                odd;
+            // loop through the visible rows
+            $("tr:visible", table.tBodies[0]).each(function (i) {
+                $tr = $(this);
+                // style children rows the same way the parent
+                // row was styled
+                if (!$tr.hasClass(table.config.cssChildRow)) row++;
+                odd = (row % 2 == 0);
+                $tr.removeClass(
+                table.config.widgetZebra.css[odd ? 0 : 1]).addClass(
+                table.config.widgetZebra.css[odd ? 1 : 0])
+            });
+            if (table.config.debug) {
+                $.tablesorter.benchmark("Applying Zebra widget", time);
+            }
+        }
+    });
 })(jQuery);
\ No newline at end of file
diff --git a/js/jquery.tablesorter.pager.js b/js/jquery.tablesorter.pager.js
index b5b02be59..ebe30949d 100644
--- a/js/jquery.tablesorter.pager.js
+++ b/js/jquery.tablesorter.pager.js
@@ -1,530 +1,530 @@
-function sprintf(format, etc) {
-    var arg = arguments;
-    var i = 1;
-    return format.replace(/%((%)|s)/g, function (m) { return m[2] || arg[i++] })
-}
-
-
-(function($) {
-	$.extend({
-		tablesorterPager: new function() {
-			
-			function updatePageDisplay(c) {
-				var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages);	
-			}
-			
-			function setPageSize(table,size, bReload) {
-				var c = table.config;
-				if (c != undefined)
-				{
-					c.selectedSize = size;
-					if (size == -1)
-					{
-						size = c.totalRows;
-					}
-					c.size = size;
-					c.totalPages = Math.ceil(c.totalRows / c.size);
-					c.pagerPositionSet = false;
-					if (bReload)
-					{
-						moveToPage(table);
-					}
-					fixPosition(table);					
-				}
-			}
-			
-			function fixPosition(table) {
-				var c = table.config;
-				if(!c.pagerPositionSet && c.positionFixed) {
-					var c = table.config, o = $(table);
-					if(o.offset) {
-						c.container.css({
-							top: o.offset().top + o.height() + 'px',
-							position: 'absolute'
-						});
-					}
-					c.pagerPositionSet = true;
-				}
-			}
-			
-			function moveToFirstPage(table) {
-				var c = table.config;
-				c.page = 0;
-				moveToPage(table);
-			}
-			
-			function moveToLastPage(table) {
-				var c = table.config;
-				c.page = (c.totalPages-1);
-				moveToPage(table);
-			}
-			
-			function moveToNextPage(table) {
-				var c = table.config;
-				c.page++;
-				if(c.page >= (c.totalPages-1)) {
-					c.page = (c.totalPages-1);
-				}
-				moveToPage(table);
-			}
-			
-			function moveToPrevPage(table) {
-				var c = table.config;
-				c.page--;
-				if(c.page <= 0) {
-					c.page = 0;
-				}
-				moveToPage(table);
-			}
-						
-			
-			function moveToPage(table) {
-				var c = table.config;
-				if(c.page < 0 || c.page > (c.totalPages-1)) {
-					c.page = 0;
-				}
-				
-				renderTable(table,c.rowsCopy);
-			}
-
-			function checkAll(table, pager, value)
-			{
-				// Mark all the displayed items as check or unchecked depending on the value
-				$(table).find(':checkbox[name^=selectObj]').prop('checked', value);
-				// Set the 'selectionMode' for the future objects to load
-				if (value)
-				{
-					table.config.selectionMode = 'negative';
-				}
-				else
-				{
-					table.config.selectionMode = 'positive';
-				}
-				$(pager).find(':input[name=selectionMode]').val(table.config.selectionMode);
-				// Reset the list of saved selection...
-				resetStoredSelection(pager);
-				updateCounter(table, pager);
-				return true;
-			}
-			
-			function resetStoredSelection(pager)
-			{
-				$(':input[name^=storedSelection]', pager).remove();
-			}
-			
-			function storeSelection(table, pager, id, value)
-			{
-				var valueToStore = value;
-				if (table.config.selectionMode == 'negative')
-				{
-					valueToStore = !(valueToStore);
-				}
-				if (valueToStore)
-				{
-					if (table.config.select_mode == 'single')
-					{
-						$(':input[name^=storedSelection]', pager).remove(); // Remove any previous selection
-					}
-					if ($('#'+id, pager).length ==0)
-					{
-						$(pager).append($('<input type="hidden" id="'+id+'" name="storedSelection[]" value="'+id+'"></input>'));
-					}
-				}	
-				else
-				{
-					if ($('#'+id, pager).length !=0)
-					{
-						$('#'+id, pager).remove();
-					}
-				}
-				updateCounter(table, pager);
-			}
-			
-			function loadSelection(table, pager)
-			{
-				table.config.selectionMode = $(pager).find(':input[name=selectionMode]').val();
-				updateCounter(table, pager);
-			}
-			
-			function updateCounter(table, pager)
-			{
-				var ex = $(':input[name^=storedSelection]', pager).length;
-				var s = ex;
-				if (table.config.selectionMode == 'negative')
-				{
-					s = table.config.totalRows - ex;
-				}
-				pager.parent().closest('table').find('.selectedCount').text(s);
-				if (table.config.cssCount != '')
-				{
-					$(table.config.cssCount).val(s);
-					$(table.config.cssCount).trigger('change');
-				}
-			}
-			
-			function getData(table, start, end)
-			{
-				if (table.ajax_request)
-				{
-					table.ajax_request.abort();
-					table.ajax_request = null;
-				}
-
-				var c = table.config;
-				var s = c.sortList[0];
-				var s_col = null;
-				var s_order = null;
-				if (s != undefined)
-				{
-					s_col = s[0];
-					s_order = (s[1] == 0) ? 'asc' : 'desc';
-				}
-
-				var oDataTable = $(table).closest('table.itop-datatable');
-				var oConfig = {
-					sort_index: s_col,
-					sort_order: s_order,
-					page_size: table.config.selectedSize
-				};
-				oDataTable.datatable('UpdateState', oConfig);
-
-				$('#loading', table.config.container).html('<img src="../images/indicator.gif" />');
-				table.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+"pages/ajax.render.php"),
-						{ operation: 'pagination',
-						  filter: c.filter,
-						  extra_param: c.extra_params,
-						  start: start,
-						  end: end,
-						  sort_col: s_col,
-						  sort_order: s_order,
-						  select_mode: c.select_mode,
-						  display_key: c.displayKey,
-						  columns: c.columns,
-						  class_aliases: c.class_aliases
-						},
-					    function(data)
-					    {
-							table.ajax_request = null; // Ajax request completed
-							oData = $(data);
-							var tableBody = $(table.tBodies[0]);
-							
-							// clear the table body
-							
-							$.tablesorter.clearTableBody(table);
-							
-							for(var i = 0; i < end-start; i++) {
-								
-								//tableBody.append(rows[i]);
-								
-								//var o = rows[i];
-								var r = $(oData[i]);
-								var l = r.length;
-								for(var j=0; j < l; j++) {
-									
-									//tableBody[0].appendChild(r);
-									tableBody[0].appendChild(r[j]);
-
-								}
-							}
-							
-							fixPosition(table,tableBody);
-							applySelection(table);
-							
-							$(table).trigger("applyWidgets");
-							
-							if( c.page >= c.totalPages ) {
-			        			moveToLastPage(table);
-							}
-							
-							updatePageDisplay(c);
-							updateCounter(table, table.config.container);
-							renderPager(table, table.config.container);
-							$(table).tableHover();
-							$('#loading', table.config.container).empty();
-
-							saveParams(table.config);
-					   });
-			}
-			
-			function applySelection(table)
-			{
-				var c = table.config;
-				if (c == undefined) return;
-				
-				if (c.selectionMode == 'negative')
-				{
-					$(table).find(':checkbox[name^=selectObj]').prop('checked', true);;
-				}
-				
-				if (table.config.select_mode == 'multiple')
-				{
-					$(table).find(':checkbox[name^=selectObj]').each(function() {
-						var id = parseInt(this.value, 10);
-						if ($('#'+id, table.config.container).length > 0)
-						{
-							if (c.selectionMode == 'positive')
-							{
-								$(this).prop('checked', true);;
-							}
-							else
-							{
-								$(this).prop('checked', false);;
-							}
-						}
-					});
-
-					$(table).find(':checkbox[name^=selectObj]').change(function() {
-						storeSelection(table, table.config.container, this.value, this.checked);
-					});
-				}
-				else if (table.config.select_mode == 'single')
-				{
-					$(table).find('input[name^=selectObject]:radio').each(function() {
-						var id = parseInt(this.value, 10);
-						if ($('#'+id, table.config.container).length > 0)
-						{
-							if (c.selectionMode == 'positive')
-							{
-								$(this).prop('checked', true);
-							}
-							else
-							{
-								$(this).prop('checked', false);
-							}
-						}
-					});
-
-					$(table).find('input[name^=selectObject]:radio').change(function() {
-						storeSelection(table, table.config.container, this.value, this.checked);
-					});
-				}
-			}
-			
-			function renderPager(table, pager)
-			{
-				var c = table.config;
-				var aPages = [0]; // first page
-				var s = c.page - 1;
-				var nb = Math.ceil(c.totalRows / c.size);
-				if (s < 1)
-				{
-					s = 1;
-				}
-				var e = s +3;
-				if (e >= nb)
-				{
-					e = nb;
-					if ((e - 4) > 1)
-					{
-						s = e - 4;
-					}
-				}
-				for(var i=s; i<e; i++)
-				{
-					aPages.push(i);
-				}
-				if ((nb > 1) && (nb > i))
-				{
-					aPages.push(nb - 1); // very last page					
-				}
-				
-				txt = '';
-				for(i=0; i<aPages.length; i++)
-				{
-					var page = 1+aPages[i];
-					var link = '';
-					var sDotsAfter = '';
-					var sDotsBefore = '';
-					if ((i == 0) && (aPages.length > 1) && (aPages[i+1] != aPages[i]+1))
-					{
-						sDotsAfter = '...'; // Gap between the last 2 page numbers
-					}
-					if ((i == aPages.length-1) && (aPages.length > 1) && (aPages[i-1] != aPages[i]-1))
-					{
-						sDotsBefore = '...'; // Gap between the first 2 page numbers
-					}
-					if (aPages[i] != c.page)
-					{
-						link = ' <span page="'+aPages[i]+'" id="gotopage_'+aPages[i]+'">'+sDotsBefore+page+sDotsAfter+'</span> ';
-					}
-					else
-					{
-						link = ' <span class="curr_page" page="'+aPages[i]+'">'+sDotsBefore+page+sDotsAfter+'</span> ';
-					}
-					txt += link;
-				}
-				txt += '';
-				$('#total', pager).text(c.totalRows);
-				$('#index', pager).html(txt);
-				for(i=0; i<aPages.length; i++)
-				{
-					$('#gotopage_'+aPages[i], pager).click(function(){
-						var idx = $(this).attr('page');
-						table.config.page = idx;
-						moveToPage(table);
-					});
-				}
-			}
-			
-			function renderTable(table) {
-				
-				var c = table.config;
-				//var l = rows.length;
-				var s = (c.page * c.size);
-				var e = (s + c.size);
-				if(e > c.totalRows ) {
-					e = c.totalRows;
-				}
-				
-				getData(table, s, e);				
-			}
-			
-			this.appender = function(table,rows) {
-				
-				var c = table.config;
-				
-				if (c.totalRows == 0)
-				{
-					c.totalRows = rows.length;
-				}
-				c.totalPages = Math.ceil(c.totalRows / c.size);
-				
-				renderTable(table,rows);
-			};
-			
-			function saveParams(config) {
-				
-				var sPagerId = config.container.attr('id');
-
-				var params = { size: config.selectedSize, page: config.page, sortList: config.sortList };
-				if (window.pager_params == undefined)
-				{
-					window.pager_params = {};
-				}
-				window.pager_params[sPagerId] = params;
-			};
-
-			function restoreParams(table) {
-				
-				var sPagerId = config.container.attr('id');
-				if (window.pager_params != undefined)
-				{
-					params = window.pager_params[sPagerId];
-
-					if (params != undefined)
-					{
-						$(table.config.cssPageSize, table.config.container).val(params.size);
-						setPageSize(table, params.size, false); // false => don't trigger a reload
-						if (table.config.sortList != params.sortList)
-						{
-							$(table).trigger("sorton", [params.sortList]); // triggers a reload anyway
-						}
-					}
-				}
-			};
-						
-			this.defaults = {
-				size: 10,
-				offset: 0,
-				page: 0,
-				totalRows: 0,
-				totalPages: 0,
-				container: null,
-				cssNext: '.next',
-				cssPrev: '.prev',
-				cssFirst: '.first',
-				cssLast: '.last',
-				cssPageDisplay: '.pagedisplay',
-				cssPageSize: '.pagesize',
-				cssCount: '',
-				seperator: "/",
-				positionFixed: false,
-				appender: this.appender,
-				filter: '',
-				extra_params: '',
-				select_mode: '',
-				totalSelected: 0,
-				selectionMode: 'positive',
-				displayKey: true,
-				columns: {},
-				class_aliases: {}
-			};
-			
-			this.construct = function(settings) {
-				
-				return this.each(function() {
-
-					try
-					{
-						config = $.extend(this.config, $.tablesorterPager.defaults, settings);
-
-						var table = this, pager = config.container;
-				
-						this.ajax_request = null;
-					
-						config.selectedSize = parseInt($(".pagesize",pager).val());
-
-						setPageSize(table,config.selectedSize, false);
-						restoreParams(table, config);
-					
-						//$(this).trigger("appendCache"); // Load the data
-						//console.log($.tablesorterPager);
-						applySelection(table);
-
-						$('.gotopage',pager).click(function() {
-							var idx = $(this).attr('page');
-							table.config.page = idx;
-							moveToPage(table);
-						});
-
-						$(config.cssFirst,pager).click(function() {
-							moveToFirstPage(table);
-							return false;
-						});
-						$(config.cssNext,pager).click(function() {
-							moveToNextPage(table);
-							return false;
-						});
-						$(config.cssPrev,pager).click(function() {
-							moveToPrevPage(table);
-							return false;
-						});
-						$(config.cssLast,pager).click(function() {
-							moveToLastPage(table);
-							return false;
-						});
-						$(config.cssPageSize,pager).change(function() {
-							setPageSize(table,parseInt($(this).val()), true);
-							return false;
-						});
-						$(table).find(':checkbox.checkAll').removeAttr('onclick').click(function() {
-							return checkAll(table, pager, this.checked);
-						});
-					
-						$(table).bind('load_selection', function() {
-							loadSelection(table, pager);
-							applySelection(table);
-						});
-						$(table).bind('check_all', function() {
-							// update header checkbox
-							$(table).find("thead>tr>th>input:checkbox").prop("checked", true);
-							checkAll(table, pager, true);
-						});
-					}
-					catch(err)
-					{
-						if (console && console.log)
-						{
-							console.log(err);
-						}
-					}
-				});
-			};
-		}
-	});
-	// extend plugin scope
-	$.fn.extend({
-        tablesorterPager: $.tablesorterPager.construct
-	});
-	
-})(jQuery);
+function sprintf(format, etc) {
+    var arg = arguments;
+    var i = 1;
+    return format.replace(/%((%)|s)/g, function (m) { return m[2] || arg[i++] })
+}
+
+
+(function($) {
+	$.extend({
+		tablesorterPager: new function() {
+			
+			function updatePageDisplay(c) {
+				var s = $(c.cssPageDisplay,c.container).val((c.page+1) + c.seperator + c.totalPages);	
+			}
+			
+			function setPageSize(table,size, bReload) {
+				var c = table.config;
+				if (c != undefined)
+				{
+					c.selectedSize = size;
+					if (size == -1)
+					{
+						size = c.totalRows;
+					}
+					c.size = size;
+					c.totalPages = Math.ceil(c.totalRows / c.size);
+					c.pagerPositionSet = false;
+					if (bReload)
+					{
+						moveToPage(table);
+					}
+					fixPosition(table);					
+				}
+			}
+			
+			function fixPosition(table) {
+				var c = table.config;
+				if(!c.pagerPositionSet && c.positionFixed) {
+					var c = table.config, o = $(table);
+					if(o.offset) {
+						c.container.css({
+							top: o.offset().top + o.height() + 'px',
+							position: 'absolute'
+						});
+					}
+					c.pagerPositionSet = true;
+				}
+			}
+			
+			function moveToFirstPage(table) {
+				var c = table.config;
+				c.page = 0;
+				moveToPage(table);
+			}
+			
+			function moveToLastPage(table) {
+				var c = table.config;
+				c.page = (c.totalPages-1);
+				moveToPage(table);
+			}
+			
+			function moveToNextPage(table) {
+				var c = table.config;
+				c.page++;
+				if(c.page >= (c.totalPages-1)) {
+					c.page = (c.totalPages-1);
+				}
+				moveToPage(table);
+			}
+			
+			function moveToPrevPage(table) {
+				var c = table.config;
+				c.page--;
+				if(c.page <= 0) {
+					c.page = 0;
+				}
+				moveToPage(table);
+			}
+						
+			
+			function moveToPage(table) {
+				var c = table.config;
+				if(c.page < 0 || c.page > (c.totalPages-1)) {
+					c.page = 0;
+				}
+				
+				renderTable(table,c.rowsCopy);
+			}
+
+			function checkAll(table, pager, value)
+			{
+				// Mark all the displayed items as check or unchecked depending on the value
+				$(table).find(':checkbox[name^=selectObj]').prop('checked', value);
+				// Set the 'selectionMode' for the future objects to load
+				if (value)
+				{
+					table.config.selectionMode = 'negative';
+				}
+				else
+				{
+					table.config.selectionMode = 'positive';
+				}
+				$(pager).find(':input[name=selectionMode]').val(table.config.selectionMode);
+				// Reset the list of saved selection...
+				resetStoredSelection(pager);
+				updateCounter(table, pager);
+				return true;
+			}
+			
+			function resetStoredSelection(pager)
+			{
+				$(':input[name^=storedSelection]', pager).remove();
+			}
+			
+			function storeSelection(table, pager, id, value)
+			{
+				var valueToStore = value;
+				if (table.config.selectionMode == 'negative')
+				{
+					valueToStore = !(valueToStore);
+				}
+				if (valueToStore)
+				{
+					if (table.config.select_mode == 'single')
+					{
+						$(':input[name^=storedSelection]', pager).remove(); // Remove any previous selection
+					}
+					if ($('#'+id, pager).length ==0)
+					{
+						$(pager).append($('<input type="hidden" id="'+id+'" name="storedSelection[]" value="'+id+'"></input>'));
+					}
+				}	
+				else
+				{
+					if ($('#'+id, pager).length !=0)
+					{
+						$('#'+id, pager).remove();
+					}
+				}
+				updateCounter(table, pager);
+			}
+			
+			function loadSelection(table, pager)
+			{
+				table.config.selectionMode = $(pager).find(':input[name=selectionMode]').val();
+				updateCounter(table, pager);
+			}
+			
+			function updateCounter(table, pager)
+			{
+				var ex = $(':input[name^=storedSelection]', pager).length;
+				var s = ex;
+				if (table.config.selectionMode == 'negative')
+				{
+					s = table.config.totalRows - ex;
+				}
+				pager.parent().closest('table').find('.selectedCount').text(s);
+				if (table.config.cssCount != '')
+				{
+					$(table.config.cssCount).val(s);
+					$(table.config.cssCount).trigger('change');
+				}
+			}
+			
+			function getData(table, start, end)
+			{
+				if (table.ajax_request)
+				{
+					table.ajax_request.abort();
+					table.ajax_request = null;
+				}
+
+				var c = table.config;
+				var s = c.sortList[0];
+				var s_col = null;
+				var s_order = null;
+				if (s != undefined)
+				{
+					s_col = s[0];
+					s_order = (s[1] == 0) ? 'asc' : 'desc';
+				}
+
+				var oDataTable = $(table).closest('table.itop-datatable');
+				var oConfig = {
+					sort_index: s_col,
+					sort_order: s_order,
+					page_size: table.config.selectedSize
+				};
+				oDataTable.datatable('UpdateState', oConfig);
+
+				$('#loading', table.config.container).html('<img src="../images/indicator.gif" />');
+				table.ajax_request = $.post(AddAppContext(GetAbsoluteUrlAppRoot()+"pages/ajax.render.php"),
+						{ operation: 'pagination',
+						  filter: c.filter,
+						  extra_param: c.extra_params,
+						  start: start,
+						  end: end,
+						  sort_col: s_col,
+						  sort_order: s_order,
+						  select_mode: c.select_mode,
+						  display_key: c.displayKey,
+						  columns: c.columns,
+						  class_aliases: c.class_aliases
+						},
+					    function(data)
+					    {
+							table.ajax_request = null; // Ajax request completed
+							oData = $(data);
+							var tableBody = $(table.tBodies[0]);
+							
+							// clear the table body
+							
+							$.tablesorter.clearTableBody(table);
+							
+							for(var i = 0; i < end-start; i++) {
+								
+								//tableBody.append(rows[i]);
+								
+								//var o = rows[i];
+								var r = $(oData[i]);
+								var l = r.length;
+								for(var j=0; j < l; j++) {
+									
+									//tableBody[0].appendChild(r);
+									tableBody[0].appendChild(r[j]);
+
+								}
+							}
+							
+							fixPosition(table,tableBody);
+							applySelection(table);
+							
+							$(table).trigger("applyWidgets");
+							
+							if( c.page >= c.totalPages ) {
+			        			moveToLastPage(table);
+							}
+							
+							updatePageDisplay(c);
+							updateCounter(table, table.config.container);
+							renderPager(table, table.config.container);
+							$(table).tableHover();
+							$('#loading', table.config.container).empty();
+
+							saveParams(table.config);
+					   });
+			}
+			
+			function applySelection(table)
+			{
+				var c = table.config;
+				if (c == undefined) return;
+				
+				if (c.selectionMode == 'negative')
+				{
+					$(table).find(':checkbox[name^=selectObj]').prop('checked', true);;
+				}
+				
+				if (table.config.select_mode == 'multiple')
+				{
+					$(table).find(':checkbox[name^=selectObj]').each(function() {
+						var id = parseInt(this.value, 10);
+						if ($('#'+id, table.config.container).length > 0)
+						{
+							if (c.selectionMode == 'positive')
+							{
+								$(this).prop('checked', true);;
+							}
+							else
+							{
+								$(this).prop('checked', false);;
+							}
+						}
+					});
+
+					$(table).find(':checkbox[name^=selectObj]').change(function() {
+						storeSelection(table, table.config.container, this.value, this.checked);
+					});
+				}
+				else if (table.config.select_mode == 'single')
+				{
+					$(table).find('input[name^=selectObject]:radio').each(function() {
+						var id = parseInt(this.value, 10);
+						if ($('#'+id, table.config.container).length > 0)
+						{
+							if (c.selectionMode == 'positive')
+							{
+								$(this).prop('checked', true);
+							}
+							else
+							{
+								$(this).prop('checked', false);
+							}
+						}
+					});
+
+					$(table).find('input[name^=selectObject]:radio').change(function() {
+						storeSelection(table, table.config.container, this.value, this.checked);
+					});
+				}
+			}
+			
+			function renderPager(table, pager)
+			{
+				var c = table.config;
+				var aPages = [0]; // first page
+				var s = c.page - 1;
+				var nb = Math.ceil(c.totalRows / c.size);
+				if (s < 1)
+				{
+					s = 1;
+				}
+				var e = s +3;
+				if (e >= nb)
+				{
+					e = nb;
+					if ((e - 4) > 1)
+					{
+						s = e - 4;
+					}
+				}
+				for(var i=s; i<e; i++)
+				{
+					aPages.push(i);
+				}
+				if ((nb > 1) && (nb > i))
+				{
+					aPages.push(nb - 1); // very last page					
+				}
+				
+				txt = '';
+				for(i=0; i<aPages.length; i++)
+				{
+					var page = 1+aPages[i];
+					var link = '';
+					var sDotsAfter = '';
+					var sDotsBefore = '';
+					if ((i == 0) && (aPages.length > 1) && (aPages[i+1] != aPages[i]+1))
+					{
+						sDotsAfter = '...'; // Gap between the last 2 page numbers
+					}
+					if ((i == aPages.length-1) && (aPages.length > 1) && (aPages[i-1] != aPages[i]-1))
+					{
+						sDotsBefore = '...'; // Gap between the first 2 page numbers
+					}
+					if (aPages[i] != c.page)
+					{
+						link = ' <span page="'+aPages[i]+'" id="gotopage_'+aPages[i]+'">'+sDotsBefore+page+sDotsAfter+'</span> ';
+					}
+					else
+					{
+						link = ' <span class="curr_page" page="'+aPages[i]+'">'+sDotsBefore+page+sDotsAfter+'</span> ';
+					}
+					txt += link;
+				}
+				txt += '';
+				$('#total', pager).text(c.totalRows);
+				$('#index', pager).html(txt);
+				for(i=0; i<aPages.length; i++)
+				{
+					$('#gotopage_'+aPages[i], pager).click(function(){
+						var idx = $(this).attr('page');
+						table.config.page = idx;
+						moveToPage(table);
+					});
+				}
+			}
+			
+			function renderTable(table) {
+				
+				var c = table.config;
+				//var l = rows.length;
+				var s = (c.page * c.size);
+				var e = (s + c.size);
+				if(e > c.totalRows ) {
+					e = c.totalRows;
+				}
+				
+				getData(table, s, e);				
+			}
+			
+			this.appender = function(table,rows) {
+				
+				var c = table.config;
+				
+				if (c.totalRows == 0)
+				{
+					c.totalRows = rows.length;
+				}
+				c.totalPages = Math.ceil(c.totalRows / c.size);
+				
+				renderTable(table,rows);
+			};
+			
+			function saveParams(config) {
+				
+				var sPagerId = config.container.attr('id');
+
+				var params = { size: config.selectedSize, page: config.page, sortList: config.sortList };
+				if (window.pager_params == undefined)
+				{
+					window.pager_params = {};
+				}
+				window.pager_params[sPagerId] = params;
+			};
+
+			function restoreParams(table) {
+				
+				var sPagerId = config.container.attr('id');
+				if (window.pager_params != undefined)
+				{
+					params = window.pager_params[sPagerId];
+
+					if (params != undefined)
+					{
+						$(table.config.cssPageSize, table.config.container).val(params.size);
+						setPageSize(table, params.size, false); // false => don't trigger a reload
+						if (table.config.sortList != params.sortList)
+						{
+							$(table).trigger("sorton", [params.sortList]); // triggers a reload anyway
+						}
+					}
+				}
+			};
+						
+			this.defaults = {
+				size: 10,
+				offset: 0,
+				page: 0,
+				totalRows: 0,
+				totalPages: 0,
+				container: null,
+				cssNext: '.next',
+				cssPrev: '.prev',
+				cssFirst: '.first',
+				cssLast: '.last',
+				cssPageDisplay: '.pagedisplay',
+				cssPageSize: '.pagesize',
+				cssCount: '',
+				seperator: "/",
+				positionFixed: false,
+				appender: this.appender,
+				filter: '',
+				extra_params: '',
+				select_mode: '',
+				totalSelected: 0,
+				selectionMode: 'positive',
+				displayKey: true,
+				columns: {},
+				class_aliases: {}
+			};
+			
+			this.construct = function(settings) {
+				
+				return this.each(function() {
+
+					try
+					{
+						config = $.extend(this.config, $.tablesorterPager.defaults, settings);
+
+						var table = this, pager = config.container;
+				
+						this.ajax_request = null;
+					
+						config.selectedSize = parseInt($(".pagesize",pager).val());
+
+						setPageSize(table,config.selectedSize, false);
+						restoreParams(table, config);
+					
+						//$(this).trigger("appendCache"); // Load the data
+						//console.log($.tablesorterPager);
+						applySelection(table);
+
+						$('.gotopage',pager).click(function() {
+							var idx = $(this).attr('page');
+							table.config.page = idx;
+							moveToPage(table);
+						});
+
+						$(config.cssFirst,pager).click(function() {
+							moveToFirstPage(table);
+							return false;
+						});
+						$(config.cssNext,pager).click(function() {
+							moveToNextPage(table);
+							return false;
+						});
+						$(config.cssPrev,pager).click(function() {
+							moveToPrevPage(table);
+							return false;
+						});
+						$(config.cssLast,pager).click(function() {
+							moveToLastPage(table);
+							return false;
+						});
+						$(config.cssPageSize,pager).change(function() {
+							setPageSize(table,parseInt($(this).val()), true);
+							return false;
+						});
+						$(table).find(':checkbox.checkAll').removeAttr('onclick').click(function() {
+							return checkAll(table, pager, this.checked);
+						});
+					
+						$(table).bind('load_selection', function() {
+							loadSelection(table, pager);
+							applySelection(table);
+						});
+						$(table).bind('check_all', function() {
+							// update header checkbox
+							$(table).find("thead>tr>th>input:checkbox").prop("checked", true);
+							checkAll(table, pager, true);
+						});
+					}
+					catch(err)
+					{
+						if (console && console.log)
+						{
+							console.log(err);
+						}
+					}
+				});
+			};
+		}
+	});
+	// extend plugin scope
+	$.fn.extend({
+        tablesorterPager: $.tablesorterPager.construct
+	});
+	
+})(jQuery);
diff --git a/js/json.js b/js/json.js
index 85fd0e1f5..04a182dfa 100644
--- a/js/json.js
+++ b/js/json.js
@@ -1,473 +1,473 @@
-/*
-    http://www.JSON.org/json2.js
-    2008-06-15
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    See http://www.JSON.org/js.html
-
-    This file creates a global JSON object containing two methods: stringify
-    and parse.
-
-
-        JSON.stringify(value, replacer, space)
-            value       any JavaScript value, usually an object or array.
-
-            replacer    an optional parameter that determines how object
-                        values are stringified for objects without a toJSON
-                        method. It can be a function or an array.
-
-            space       an optional parameter that specifies the indentation
-                        of nested structures. If it is omitted, the text will
-                        be packed without extra whitespace. If it is a number,
-                        it will specify the number of spaces to indent at each
-                        level. If it is a string (such as '\t' or '&nbsp;'),
-                        it contains the characters used to indent at each level.
-
-            This method produces a JSON text from a JavaScript value.
-
-            When an object value is found, if the object contains a toJSON
-            method, its toJSON method will be called and the result will be
-            stringified. A toJSON method does not serialize: it returns the
-            value represented by the name/value pair that should be serialized,
-            or undefined if nothing should be serialized. The toJSON method
-            will be passed the key associated with the value, and this will be
-            bound to the object holding the key.
-
-            For example, this would serialize Dates as ISO strings.
-
-                Date.prototype.toJSON = function (key) {
-                    function f(n) {
-                        // Format integers to have at least two digits.
-                        return n < 10 ? '0' + n : n;
-                    }
-
-                    return this.getUTCFullYear()   + '-' +
-                         f(this.getUTCMonth() + 1) + '-' +
-                         f(this.getUTCDate())      + 'T' +
-                         f(this.getUTCHours())     + ':' +
-                         f(this.getUTCMinutes())   + ':' +
-                         f(this.getUTCSeconds())   + 'Z';
-                };
-
-            You can provide an optional replacer method. It will be passed the
-            key and value of each member, with this bound to the containing
-            object. The value that is returned from your method will be
-            serialized. If your method returns undefined, then the member will
-            be excluded from the serialization.
-
-            If the replacer parameter is an array, then it will be used to
-            select the members to be serialized. It filters the results such
-            that only members with keys listed in the replacer array are
-            stringified.
-
-            Values that do not have JSON representations, such as undefined or
-            functions, will not be serialized. Such values in objects will be
-            dropped; in arrays they will be replaced with null. You can use
-            a replacer function to replace those with JSON values.
-            JSON.stringify(undefined) returns undefined.
-
-            The optional space parameter produces a stringification of the
-            value that is filled with line breaks and indentation to make it
-            easier to read.
-
-            If the space parameter is a non-empty string, then that string will
-            be used for indentation. If the space parameter is a number, then
-            then indentation will be that many spaces.
-
-            Example:
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}]);
-            // text is '["e",{"pluribus":"unum"}]'
-
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
-            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
-            text = JSON.stringify([new Date()], function (key, value) {
-                return this[key] instanceof Date ?
-                    'Date(' + this[key] + ')' : value;
-            });
-            // text is '["Date(---current time---)"]'
-
-
-        JSON.parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = JSON.parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
-                var d;
-                if (typeof value === 'string' &&
-                        value.slice(0, 5) === 'Date(' &&
-                        value.slice(-1) === ')') {
-                    d = new Date(value.slice(5, -1));
-                    if (d) {
-                        return d;
-                    }
-                }
-                return value;
-            });
-
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD THIRD PARTY
-    CODE INTO YOUR PAGES.
-*/
-
-/*jslint evil: true */
-
-/*global JSON */
-
-/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", call,
-    charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, getUTCMinutes,
-    getUTCMonth, getUTCSeconds, hasOwnProperty, join, lastIndex, length,
-    parse, propertyIsEnumerable, prototype, push, replace, slice, stringify,
-    test, toJSON, toString
-*/
-
-if (!this.JSON) {
-
-// Create a JSON object only if one does not already exist. We create the
-// object in a closure to avoid global variables.
-
-    JSON = function () {
-
-        function f(n) {
-            // Format integers to have at least two digits.
-            return n < 10 ? '0' + n : n;
-        }
-
-        Date.prototype.toJSON = function (key) {
-
-            return this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z';
-        };
-
-        var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-            escapeable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-            gap,
-            indent,
-            meta = {    // table of character substitutions
-                '\b': '\\b',
-                '\t': '\\t',
-                '\n': '\\n',
-                '\f': '\\f',
-                '\r': '\\r',
-                '"' : '\\"',
-                '\\': '\\\\'
-            },
-            rep;
-
-
-        function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
-            escapeable.lastIndex = 0;
-            return escapeable.test(string) ?
-                '"' + string.replace(escapeable, function (a) {
-                    var c = meta[a];
-                    if (typeof c === 'string') {
-                        return c;
-                    }
-                    return '\\u' + ('0000' +
-                            (+(a.charCodeAt(0))).toString(16)).slice(-4);
-                }) + '"' :
-                '"' + string + '"';
-        }
-
-
-        function str(key, holder) {
-
-// Produce a string from holder[key].
-
-            var i,          // The loop counter.
-                k,          // The member key.
-                v,          // The member value.
-                length,
-                mind = gap,
-                partial,
-                value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
-            if (value && typeof value === 'object' &&
-                    typeof value.toJSON === 'function') {
-                value = value.toJSON(key);
-            }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
-            if (typeof rep === 'function') {
-                value = rep.call(holder, key, value);
-            }
-
-// What happens next depends on the value's type.
-
-            switch (typeof value) {
-            case 'string':
-                return quote(value);
-
-            case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-                return isFinite(value) ? String(value) : 'null';
-
-            case 'boolean':
-            case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-                return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-            case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-                if (!value) {
-                    return 'null';
-                }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-                gap += indent;
-                partial = [];
-
-// If the object has a dontEnum length property, we'll treat it as an array.
-
-                if (typeof value.length === 'number' &&
-                        !(value.propertyIsEnumerable('length'))) {
-
-// The object is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-                    length = value.length;
-                    for (i = 0; i < length; i += 1) {
-                        partial[i] = str(i, value) || 'null';
-                    }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-                    v = partial.length === 0 ? '[]' :
-                        gap ? '[\n' + gap +
-                                partial.join(',\n' + gap) + '\n' +
-                                    mind + ']' :
-                              '[' + partial.join(',') + ']';
-                    gap = mind;
-                    return v;
-                }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-                if (rep && typeof rep === 'object') {
-                    length = rep.length;
-                    for (i = 0; i < length; i += 1) {
-                        k = rep[i];
-                        if (typeof k === 'string') {
-                            v = str(k, value, rep);
-                            if (v) {
-                                partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                            }
-                        }
-                    }
-                } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-                    for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
-                            v = str(k, value, rep);
-                            if (v) {
-                                partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                            }
-                        }
-                    }
-                }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-                v = partial.length === 0 ? '{}' :
-                    gap ? '{\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                            mind + '}' :
-                          '{' + partial.join(',') + '}';
-                gap = mind;
-                return v;
-            }
-        }
-
-
-// Return the JSON object containing the stringify, parse, and quote methods.
-
-        return {
-            stringify: function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-                var i;
-                gap = '';
-                indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-                if (typeof space === 'number') {
-                    for (i = 0; i < space; i += 1) {
-                        indent += ' ';
-                    }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-                } else if (typeof space === 'string') {
-                    indent = space;
-                }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-                rep = replacer;
-                if (replacer && typeof replacer !== 'function' &&
-                        (typeof replacer !== 'object' ||
-                         typeof replacer.length !== 'number')) {
-                    throw new Error('JSON.stringify');
-                }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-                return str('', {'': value});
-            },
-
-
-            parse: function (text, reviver) {
-
-// The parse method takes a text and an optional reviver function, and returns
-// a JavaScript value if the text is a valid JSON text.
-
-                var j;
-
-                function walk(holder, key) {
-
-// The walk method is used to recursively walk the resulting structure so
-// that modifications can be made.
-
-                    var k, v, value = holder[key];
-                    if (value && typeof value === 'object') {
-                        for (k in value) {
-                            if (Object.hasOwnProperty.call(value, k)) {
-                                v = walk(value, k);
-                                if (v !== undefined) {
-                                    value[k] = v;
-                                } else {
-                                    delete value[k];
-                                }
-                            }
-                        }
-                    }
-                    return reviver.call(holder, key, value);
-                }
-
-
-// Parsing happens in four stages. In the first stage, we replace certain
-// Unicode characters with escape sequences. JavaScript handles many characters
-// incorrectly, either silently deleting them, or treating them as line endings.
-
-                cx.lastIndex = 0;
-                if (cx.test(text)) {
-                    text = text.replace(cx, function (a) {
-                        return '\\u' + ('0000' +
-                                (+(a.charCodeAt(0))).toString(16)).slice(-4);
-                    });
-                }
-
-// In the second stage, we run the text against
-// regular expressions that look for non-JSON patterns. We are especially
-// concerned with '()' and 'new' because they can cause invocation, and '='
-// because it can cause mutation. But just to be safe, we want to reject all
-// unexpected forms.
-
-// We split the second stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace all backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-                if (/^[\],:{}\s]*$/.test(text.replace(/\\["\\\/bfnrtu]/g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the third stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
-                    j = eval('(' + text + ')');
-
-// In the optional fourth stage, we recursively walk the new structure, passing
-// each name/value pair to a reviver function for possible transformation.
-
-                    return typeof reviver === 'function' ?
-                        walk({'': j}, '') : j;
-                }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
-                throw new SyntaxError('JSON.parse');
-            }
-        };
-    }();
-}
+/*
+    http://www.JSON.org/json2.js
+    2008-06-15
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects without a toJSON
+                        method. It can be a function or an array.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the object holding the key.
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array, then it will be used to
+            select the members to be serialized. It filters the results such
+            that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            then indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD THIRD PARTY
+    CODE INTO YOUR PAGES.
+*/
+
+/*jslint evil: true */
+
+/*global JSON */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", call,
+    charCodeAt, getUTCDate, getUTCFullYear, getUTCHours, getUTCMinutes,
+    getUTCMonth, getUTCSeconds, hasOwnProperty, join, lastIndex, length,
+    parse, propertyIsEnumerable, prototype, push, replace, slice, stringify,
+    test, toJSON, toString
+*/
+
+if (!this.JSON) {
+
+// Create a JSON object only if one does not already exist. We create the
+// object in a closure to avoid global variables.
+
+    JSON = function () {
+
+        function f(n) {
+            // Format integers to have at least two digits.
+            return n < 10 ? '0' + n : n;
+        }
+
+        Date.prototype.toJSON = function (key) {
+
+            return this.getUTCFullYear()   + '-' +
+                 f(this.getUTCMonth() + 1) + '-' +
+                 f(this.getUTCDate())      + 'T' +
+                 f(this.getUTCHours())     + ':' +
+                 f(this.getUTCMinutes())   + ':' +
+                 f(this.getUTCSeconds())   + 'Z';
+        };
+
+        var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+            escapeable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+            gap,
+            indent,
+            meta = {    // table of character substitutions
+                '\b': '\\b',
+                '\t': '\\t',
+                '\n': '\\n',
+                '\f': '\\f',
+                '\r': '\\r',
+                '"' : '\\"',
+                '\\': '\\\\'
+            },
+            rep;
+
+
+        function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+            escapeable.lastIndex = 0;
+            return escapeable.test(string) ?
+                '"' + string.replace(escapeable, function (a) {
+                    var c = meta[a];
+                    if (typeof c === 'string') {
+                        return c;
+                    }
+                    return '\\u' + ('0000' +
+                            (+(a.charCodeAt(0))).toString(16)).slice(-4);
+                }) + '"' :
+                '"' + string + '"';
+        }
+
+
+        function str(key, holder) {
+
+// Produce a string from holder[key].
+
+            var i,          // The loop counter.
+                k,          // The member key.
+                v,          // The member value.
+                length,
+                mind = gap,
+                partial,
+                value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+            if (value && typeof value === 'object' &&
+                    typeof value.toJSON === 'function') {
+                value = value.toJSON(key);
+            }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+            if (typeof rep === 'function') {
+                value = rep.call(holder, key, value);
+            }
+
+// What happens next depends on the value's type.
+
+            switch (typeof value) {
+            case 'string':
+                return quote(value);
+
+            case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+                return isFinite(value) ? String(value) : 'null';
+
+            case 'boolean':
+            case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+                return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+            case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+                if (!value) {
+                    return 'null';
+                }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+                gap += indent;
+                partial = [];
+
+// If the object has a dontEnum length property, we'll treat it as an array.
+
+                if (typeof value.length === 'number' &&
+                        !(value.propertyIsEnumerable('length'))) {
+
+// The object is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                    length = value.length;
+                    for (i = 0; i < length; i += 1) {
+                        partial[i] = str(i, value) || 'null';
+                    }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                    v = partial.length === 0 ? '[]' :
+                        gap ? '[\n' + gap +
+                                partial.join(',\n' + gap) + '\n' +
+                                    mind + ']' :
+                              '[' + partial.join(',') + ']';
+                    gap = mind;
+                    return v;
+                }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+                if (rep && typeof rep === 'object') {
+                    length = rep.length;
+                    for (i = 0; i < length; i += 1) {
+                        k = rep[i];
+                        if (typeof k === 'string') {
+                            v = str(k, value, rep);
+                            if (v) {
+                                partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                            }
+                        }
+                    }
+                } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                    for (k in value) {
+                        if (Object.hasOwnProperty.call(value, k)) {
+                            v = str(k, value, rep);
+                            if (v) {
+                                partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                            }
+                        }
+                    }
+                }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+                v = partial.length === 0 ? '{}' :
+                    gap ? '{\n' + gap +
+                            partial.join(',\n' + gap) + '\n' +
+                            mind + '}' :
+                          '{' + partial.join(',') + '}';
+                gap = mind;
+                return v;
+            }
+        }
+
+
+// Return the JSON object containing the stringify, parse, and quote methods.
+
+        return {
+            stringify: function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+                var i;
+                gap = '';
+                indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+                if (typeof space === 'number') {
+                    for (i = 0; i < space; i += 1) {
+                        indent += ' ';
+                    }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+                } else if (typeof space === 'string') {
+                    indent = space;
+                }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+                rep = replacer;
+                if (replacer && typeof replacer !== 'function' &&
+                        (typeof replacer !== 'object' ||
+                         typeof replacer.length !== 'number')) {
+                    throw new Error('JSON.stringify');
+                }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+                return str('', {'': value});
+            },
+
+
+            parse: function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+                var j;
+
+                function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                    var k, v, value = holder[key];
+                    if (value && typeof value === 'object') {
+                        for (k in value) {
+                            if (Object.hasOwnProperty.call(value, k)) {
+                                v = walk(value, k);
+                                if (v !== undefined) {
+                                    value[k] = v;
+                                } else {
+                                    delete value[k];
+                                }
+                            }
+                        }
+                    }
+                    return reviver.call(holder, key, value);
+                }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+                cx.lastIndex = 0;
+                if (cx.test(text)) {
+                    text = text.replace(cx, function (a) {
+                        return '\\u' + ('0000' +
+                                (+(a.charCodeAt(0))).toString(16)).slice(-4);
+                    });
+                }
+
+// In the second stage, we run the text against
+// regular expressions that look for non-JSON patterns. We are especially
+// concerned with '()' and 'new' because they can cause invocation, and '='
+// because it can cause mutation. But just to be safe, we want to reject all
+// unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace all backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+                if (/^[\],:{}\s]*$/.test(text.replace(/\\["\\\/bfnrtu]/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                    j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                    return typeof reviver === 'function' ?
+                        walk({'': j}, '') : j;
+                }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+                throw new SyntaxError('JSON.parse');
+            }
+        };
+    }();
+}
diff --git a/js/linkswidget.js b/js/linkswidget.js
index a295b198a..d9d252ac8 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -1,471 +1,471 @@
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-// JavaScript Document
-function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizHelper, sExtKeyToRemote, bDoSearch)
-{
-	this.id = id;
-	this.iInputId = iInputId;
-	this.sClass = sClass;
-	this.sAttCode = sAttCode;
-	this.sSuffix = sSuffix;
-	this.bDuplicates = bDuplicates;
-	this.oWizardHelper = oWizHelper;
-	this.sExtKeyToRemote = sExtKeyToRemote;
-    this.iMaxAddedId = 0;
-	this.aAdded = [];
-	this.aRemoved = [];
-	this.aModified = {};
-	this.bDoSearch = bDoSearch; // false if the search is not launched
-	var me = this;
-
-	this.Init = function()
-	{
-		// make sure that the form is clean
-		$('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; });
-		$('#'+this.id+'_btnRemove').attr('disabled','disabled');
-
-		$('#linkedset_'+me.id).on('remove', function() {
-			// prevent having the dlg div twice
-			$('#dlg_'+me.id).remove();
-		});
-
-        $('#linkedset_'+me.id+' :input').off('change').on('change', function() {
-			if (!($(this).hasClass('selection')) && !($(this).hasClass('select_all'))) {
-				var oCheckbox = $(this).closest('tr').find('.selection');
-				var iLink = oCheckbox.attr('data-link-id');
-				var iUniqueId = oCheckbox.attr('data-unique-id');
-				var sAttCode = $(this).closest('.attribute-edit').attr('data-attcode');
-				var value = $(this).val();
-				return me.OnValueChange(iLink, iUniqueId, sAttCode, value);
-			}
-			return true;
-        });
-
-		var oInput = $('#'+this.iInputId);
-		oInput.bind('update_value', function() { $(this).val(me.GetUpdatedValue()); });
-		oInput.closest('form').submit(function() { return me.OnFormSubmit(); });
-	};
-	
-	this.RemoveSelected = function()
-	{
-		var my_id = '#'+me.id;
-		$('#linkedset_'+me.id+' .selection:checked').each(function() {
-			$(my_id+'_row_'+this.value).remove();
-			var iLink = $(this).attr('data-link-id');
-			if (iLink > 0)
-			{
-				me.aRemoved.push(iLink);
-				if (me.aModified.hasOwnProperty(iLink))
-				{
-					delete me.aModified[iLink];
-				}
-			}
-			else
-			{
-				var iUniqueId = $(this).attr('data-unique-id');
-				me.aAdded[iUniqueId] = null;
-			}
-		});
-		// Disable the button since all the selected items have been removed
-		$(my_id+'_btnRemove').attr('disabled','disabled');
-		// Re-run the zebra plugin to properly highlight the remaining lines & and take into account the removed ones
-		$('#linkedset_'+this.id+' .listResults').trigger('update').trigger("applyWidgets");
-		
-		if ($('#linkedset_'+this.id+' .selection').length == 0)
-		{
-			// All items were removed: add a dummy hidden input to make sure that the linkset will be updated (emptied) when posted
-			$('#'+me.id+'_empty_row').show();
-		}
-	};
-
-	this.OnSelectChange = function()
-	{
-		var nbChecked = $('#linkedset_'+me.id+' .selection:checked').length;
-		if (nbChecked > 0)
-		{
-			$('#'+me.id+'_btnRemove').removeAttr('disabled');
-		}
-		else
-		{
-			$('#'+me.id+'_btnRemove').attr('disabled','disabled');
-		}
-	};
-	
-	this.AddObjects  = function()
-	{
-		var me = this;
-		$('#'+me.id+'_indicatorAdd').html('&nbsp;<img src="../images/indicator.gif"/>');
-		me.oWizardHelper.UpdateWizard();
-		var theMap = { sAttCode: me.sAttCode,
-				   iInputId: me.iInputId,
-				   sSuffix: me.sSuffix,
-				   bDuplicates: me.bDuplicates,
-				   'class' : me.sClass,
-				   operation: 'addObjects',
-				   json: me.oWizardHelper.ToJSON()
-				 };
-
-		// Gather the already linked target objects
-		theMap.aAlreadyLinked = [];
-		$('#linkedset_'+me.id+' .selection:input').each(function (i) {
-			var iRemote = $(this).attr('data-remote-id');
-			theMap.aAlreadyLinked.push(iRemote);
-		});
-
-		$.ajax({
-				"url": GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-				"method": "POST",
-				"data": theMap,
-				"dataType": "html"
-			})
-			.done(function (data)
-			{
-				$('#dlg_'+me.id).html(data);
-				$('#dlg_'+me.id).dialog('open');
-				me.UpdateSizes(null, null);
-				if (me.bDoSearch)
-				{
-					me.SearchObjectsToAdd();
-				}
-				else
-				{
-					$('#count_'+me.id).change(function () {
-						var c = this.value;
-						me.UpdateButtons(c);
-					});
-				}
-				$('#'+me.id+'_indicatorAdd').html('');
-			})
-		;
-	};
-	
-	this.SearchObjectsToAdd = function()
-	{
-		$('#count_'+me.id).change(function () {
-			var c = this.value;
-			me.UpdateButtons(c);
-		});
-		me.UpdateSizes(null, null);
-
-		$("#fs_SearchFormToAdd_"+me.id).trigger('itop.search.form.submit');
-
-		return false; // Don't submit the form, stay in the current page !
-
-		var theMap = { sAttCode: me.sAttCode,
-					   iInputId: me.iInputId,
-					   sSuffix: me.sSuffix,
-					   bDuplicates: me.bDuplicates
-					 };
-		
-		me.UpdateButtons(0);
-		// Gather the parameters from the search form
-		$('#SearchFormToAdd_'+me.id+' :input').each( function() {
-				if (this.name != '')
-				{
-					var val = $(this).val(); // supports multiselect as well
-					if (val !== null)
-					{
-						theMap[this.name] = val;					
-					}
-				}
-		});
-		
-		// Gather the already linked target objects
-		theMap.aAlreadyLinked = [];
-		$('#linkedset_'+me.id+' .selection:input').each(function(i) {
-			var iRemote = $(this).attr('data-remote-id');
-			theMap.aAlreadyLinked.push(iRemote);
-		});
-		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
-		theMap['class'] = me.sClass;
-		theMap.operation = 'searchObjectsToAdd'; // Override what is defined in the form itself
-		
-		sSearchAreaId = '#SearchResultsToAdd_'+me.id;
-		$(sSearchAreaId).block();
-		
-		// Run the query and display the results
-		$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
-			function(data)
-			{
-				$(sSearchAreaId).html(data);
-				$(sSearchAreaId+' .listResults').tableHover();
-				$('#count_'+me.id).change(function(){
-					var c = this.value;
-					me.UpdateButtons(c);
-				});
-				me.UpdateSizes(null, null);
-				$(sSearchAreaId).unblock();		
-			},
-			'html'
-		);
-
-		return false; // Don't submit the form, stay in the current page !
-	};
-
-	this.UpdateButtons = function(iCount)
-	{
-		var okBtn = $('#btn_ok_'+me.id);
-		if (iCount > 0)
-		{
-			okBtn.removeAttr('disabled');
-		}
-		else
-		{
-			okBtn.attr('disabled', 'disabled');
-		}
-	};
-	
-	this.DoAddObjects = function()
-	{
-		var theMap = { sAttCode: me.sAttCode,
-				   	   iInputId: me.iInputId,
-				   	   sSuffix: me.sSuffix,
-				   	   bDuplicates: me.bDuplicates,
-				   	   'class': me.sClass
-				 	 };
-		
-		// Gather the parameters from the search form
-		var context = $('#SearchResultsToAdd_'+me.id);
-		var selectionMode = $(':input[name=selectionMode]', context);
-		if (selectionMode.length > 0)
-		{
-			// Paginated table retrieve the mode and the exceptions
-			var sMode = selectionMode.val();
-			theMap['selectionMode'] = sMode;
-			$('#fs_SearchFormToAdd_'+me.id+' :input').each(
-					function(i)
-					{
-						theMap[this.name] = this.value;
-					}
-				);
-			theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
-			theMap['class'] = me.sClass;
-			$(' :input[name^=storedSelection]', context).each(function() {
-				if (theMap[this.name] == undefined)
-				{
-					theMap[this.name] = [];
-				}
-				theMap[this.name].push(this.value);
-				$(this).remove(); // Remove the selection for the next time the dialog re-opens
-			});
-			// Retrieve the 'filter' definition
-			var table = $('#ResultsToAdd_'+me.id).find('table.listResults')[0];
-			theMap['filter'] = table.config.filter;
-			theMap['extra_params'] = table.config.extra_params;
-		}
-//		else
-//		{
-			// Normal table, retrieve all the checked check-boxes
-			$(':checked[name^=selectObject]', context).each(
-				function(i)
-				{
-					if ( (this.name != '') && ((this.type != 'checkbox') || (this.checked)) ) 
-					{
-						arrayExpr = /\[\]$/;
-						if (arrayExpr.test(this.name))
-						{
-							// Array
-							if (theMap[this.name] == undefined)
-							{
-								theMap[this.name] = [];
-							}
-							theMap[this.name].push(this.value);
-						}
-						else
-						{
-							theMap[this.name] = this.value;
-						}						
-					}
-					$(this).parents('tr:first').remove(); // Remove the whole line, so that, next time the dialog gets displayed it's no longer there
-				}
-			);
-//		}
-		
-		theMap['operation'] = 'doAddObjects';
-        theMap['max_added_id'] = this.iMaxAddedId;
-		if (me.oWizardHelper == null)
-		{
-			theMap['json'] = '';
-		}
-		else
-		{
-			// Not inside a "search form", updating a real object
-			me.oWizardHelper.UpdateWizard();
-			theMap['json'] = me.oWizardHelper.ToJSON();
-		}
-		$('#busy_'+me.iInputId).html('&nbsp;<img src="../images/indicator.gif"/>');
-		// Run the query and display the results
-		$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
-			function(data)
-			{
-				if (data != '')
-				{
-					$('#'+me.id+'_empty_row').hide();
-					$('#linkedset_'+me.id+' .listResults tbody').prepend(data);
-					$('#linkedset_'+me.id+' .listResults').trigger('update');
-					$('#linkedset_'+me.id+' .listResults').tableHover();
-					$('#linkedset_'+me.id+' .listResults').trigger('update').trigger("applyWidgets"); // table is already sortable, just refresh it
-					$('#linkedset_'+me.id+' :input').each( function() { $(this).trigger('validate', ''); }); // Validate newly added form fields...
-					$('#busy_'+me.iInputId).html('');
-				}
-			},
-			'html'
-		);
-		$('#dlg_'+me.id).dialog('close');
-		return false;
-	};
-
-    this.OnLinkAdded = function(iAddedId, iRemote)
-    {
-        // Assumption: this identifier will be higher than the previous one
-        me.iMaxAddedId = iAddedId;
-		var sFormPrefix = me.iInputId;
-		oAdded = {};
-		oAdded['formPrefix'] = sFormPrefix;
-		oAdded['attr_' + sFormPrefix + this.sExtKeyToRemote] = iRemote;
-        me.aAdded[iAddedId] = oAdded;
-        $('#linkedset_'+me.id+' :input').off('change').on('change', function() {
-			if (!($(this).hasClass('selection'))) {
-				var oCheckbox = $(this).closest('tr').find('.selection');
-				var iLink = oCheckbox.attr('data-link-id');
-				var iUniqueId = oCheckbox.attr('data-unique-id');
-				var sAttCode = $(this).closest('.attribute-edit').attr('data-attcode');
-				var value = $(this).val();
-				return me.OnValueChange(iLink, iUniqueId, sAttCode, value);
-			}
-			return true;
-        });
-    };
-
-	this.UpdateSizes = function(event, ui)
-	{
-		var dlg = $('#dlg_'+me.id);
-		var searchForm = $('#SearchFormToAdd_'+me.id);
-		var results = $('#SearchResultsToAdd_'+me.id);
-		var padding_right = 0;
-		if (dlg.css('padding-right'))
-		{
-			padding_right = parseInt(dlg.css('padding-right').replace('px', ''));			
-		}
-		var padding_left = 0;
-		if (dlg.css('padding-left'))
-		{
-			padding_left = parseInt(dlg.css('padding-left').replace('px', ''));			
-		}
-		var padding_top = 0;
-		if (dlg.css('padding-top'))
-		{
-			padding_top = parseInt(dlg.css('padding-top').replace('px', ''));			
-		}
-		var padding_bottom = 0;
-		if (dlg.css('padding-bottom'))
-		{
-			padding_bottom = parseInt(dlg.css('padding-bottom').replace('px', ''));			
-		}
-		width = dlg.innerWidth() - padding_right - padding_left - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
-		height = dlg.innerHeight() - padding_top - padding_bottom -22;
-		wizard = dlg.find('.wizContainer:first');
-		wizard.width(width);
-		wizard.height(height);
-		form_height = searchForm.outerHeight();
-		results.height(height - form_height - 40); // Leave some space for the buttons
-	};
-	
-	this.GetUpdatedValue = function()
-	{
-		var sSelector = '#linkedset_'+me.id+' :input[name^=attr_'+me.id+']';
-		var aIndexes = [];
-		var aValues = [];
-		$(sSelector).each(function() {
-			var re = /\[([^\[]+)\]\[(.+)\]/;
-			var aMatches = [];
-			if (aMatches = this.name.match(re))
-			{
-				var idx = aMatches[1];
-				var index = jQuery.inArray(idx, aIndexes);
-				if (index == -1)
-				{
-					aIndexes.push(idx);
-					index = jQuery.inArray(idx, aIndexes);
-					aValues[index] = {};
-				}
-				var value = $(this).val();
-				if (aMatches[2] == "id")
-				{
-					var iId = parseInt(aMatches[1], 10);
-					if (iId < 0)
-					{
-						aValues[index][me.sExtKeyToRemote] = -iId;
-					}
-					else
-					{
-						aValues[index]['id'] = value;						
-					}
-				}
-				else
-				{
-					aValues[index][aMatches[2]] = value;					
-				}
-			}
-		});
-		return JSON.stringify(aValues);
-	};
-
-	this.OnValueChange = function(iLink, iUniqueId, sAttCode, value)
-	{
-		var sFormPrefix = me.iInputId;
-        if (iLink > 0) {
-            // Modifying an existing link
-            var oModified = me.aModified[iLink];
-            if (oModified == undefined) {
-                // Still not marked as modified
-                oModified = {};
-                oModified['formPrefix'] = sFormPrefix;
-            }
-            // Weird formatting, aligned with the output of the direct links widget (new links to be created)
-            oModified['attr_' + sFormPrefix + sAttCode] = value;
-            me.aModified[iLink] = oModified;
-        }
-        else {
-            // Modifying a newly added link - the structure should already be up to date
-            me.aAdded[iUniqueId]['attr_' + sFormPrefix + sAttCode] = value;
-        }
-	};
-
-	this.OnFormSubmit = function()
-	{
-		var oDiv = $('#linkedset_'+me.id);
-
-		var sToBeDeleted = JSON.stringify(me.aRemoved);
-		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbd">').val(sToBeDeleted).appendTo(oDiv);
-
-
-		var sToBeModified = JSON.stringify(me.aModified);
-		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbm">').val(sToBeModified).appendTo(oDiv);
-
-		var aToBeCreated = [];
-		me.aAdded.forEach(function(oAdded){
-			if (oAdded != null)
-			{
-				aToBeCreated.push(oAdded);
-			}
-		});
-		var sToBeCreated = JSON.stringify(aToBeCreated);
-		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbc">').val(sToBeCreated).appendTo(oDiv);
-	};
-}
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+// JavaScript Document
+function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizHelper, sExtKeyToRemote, bDoSearch)
+{
+	this.id = id;
+	this.iInputId = iInputId;
+	this.sClass = sClass;
+	this.sAttCode = sAttCode;
+	this.sSuffix = sSuffix;
+	this.bDuplicates = bDuplicates;
+	this.oWizardHelper = oWizHelper;
+	this.sExtKeyToRemote = sExtKeyToRemote;
+    this.iMaxAddedId = 0;
+	this.aAdded = [];
+	this.aRemoved = [];
+	this.aModified = {};
+	this.bDoSearch = bDoSearch; // false if the search is not launched
+	var me = this;
+
+	this.Init = function()
+	{
+		// make sure that the form is clean
+		$('#linkedset_'+this.id+' .selection').each( function() { this.checked = false; });
+		$('#'+this.id+'_btnRemove').attr('disabled','disabled');
+
+		$('#linkedset_'+me.id).on('remove', function() {
+			// prevent having the dlg div twice
+			$('#dlg_'+me.id).remove();
+		});
+
+        $('#linkedset_'+me.id+' :input').off('change').on('change', function() {
+			if (!($(this).hasClass('selection')) && !($(this).hasClass('select_all'))) {
+				var oCheckbox = $(this).closest('tr').find('.selection');
+				var iLink = oCheckbox.attr('data-link-id');
+				var iUniqueId = oCheckbox.attr('data-unique-id');
+				var sAttCode = $(this).closest('.attribute-edit').attr('data-attcode');
+				var value = $(this).val();
+				return me.OnValueChange(iLink, iUniqueId, sAttCode, value);
+			}
+			return true;
+        });
+
+		var oInput = $('#'+this.iInputId);
+		oInput.bind('update_value', function() { $(this).val(me.GetUpdatedValue()); });
+		oInput.closest('form').submit(function() { return me.OnFormSubmit(); });
+	};
+	
+	this.RemoveSelected = function()
+	{
+		var my_id = '#'+me.id;
+		$('#linkedset_'+me.id+' .selection:checked').each(function() {
+			$(my_id+'_row_'+this.value).remove();
+			var iLink = $(this).attr('data-link-id');
+			if (iLink > 0)
+			{
+				me.aRemoved.push(iLink);
+				if (me.aModified.hasOwnProperty(iLink))
+				{
+					delete me.aModified[iLink];
+				}
+			}
+			else
+			{
+				var iUniqueId = $(this).attr('data-unique-id');
+				me.aAdded[iUniqueId] = null;
+			}
+		});
+		// Disable the button since all the selected items have been removed
+		$(my_id+'_btnRemove').attr('disabled','disabled');
+		// Re-run the zebra plugin to properly highlight the remaining lines & and take into account the removed ones
+		$('#linkedset_'+this.id+' .listResults').trigger('update').trigger("applyWidgets");
+		
+		if ($('#linkedset_'+this.id+' .selection').length == 0)
+		{
+			// All items were removed: add a dummy hidden input to make sure that the linkset will be updated (emptied) when posted
+			$('#'+me.id+'_empty_row').show();
+		}
+	};
+
+	this.OnSelectChange = function()
+	{
+		var nbChecked = $('#linkedset_'+me.id+' .selection:checked').length;
+		if (nbChecked > 0)
+		{
+			$('#'+me.id+'_btnRemove').removeAttr('disabled');
+		}
+		else
+		{
+			$('#'+me.id+'_btnRemove').attr('disabled','disabled');
+		}
+	};
+	
+	this.AddObjects  = function()
+	{
+		var me = this;
+		$('#'+me.id+'_indicatorAdd').html('&nbsp;<img src="../images/indicator.gif"/>');
+		me.oWizardHelper.UpdateWizard();
+		var theMap = { sAttCode: me.sAttCode,
+				   iInputId: me.iInputId,
+				   sSuffix: me.sSuffix,
+				   bDuplicates: me.bDuplicates,
+				   'class' : me.sClass,
+				   operation: 'addObjects',
+				   json: me.oWizardHelper.ToJSON()
+				 };
+
+		// Gather the already linked target objects
+		theMap.aAlreadyLinked = [];
+		$('#linkedset_'+me.id+' .selection:input').each(function (i) {
+			var iRemote = $(this).attr('data-remote-id');
+			theMap.aAlreadyLinked.push(iRemote);
+		});
+
+		$.ajax({
+				"url": GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+				"method": "POST",
+				"data": theMap,
+				"dataType": "html"
+			})
+			.done(function (data)
+			{
+				$('#dlg_'+me.id).html(data);
+				$('#dlg_'+me.id).dialog('open');
+				me.UpdateSizes(null, null);
+				if (me.bDoSearch)
+				{
+					me.SearchObjectsToAdd();
+				}
+				else
+				{
+					$('#count_'+me.id).change(function () {
+						var c = this.value;
+						me.UpdateButtons(c);
+					});
+				}
+				$('#'+me.id+'_indicatorAdd').html('');
+			})
+		;
+	};
+	
+	this.SearchObjectsToAdd = function()
+	{
+		$('#count_'+me.id).change(function () {
+			var c = this.value;
+			me.UpdateButtons(c);
+		});
+		me.UpdateSizes(null, null);
+
+		$("#fs_SearchFormToAdd_"+me.id).trigger('itop.search.form.submit');
+
+		return false; // Don't submit the form, stay in the current page !
+
+		var theMap = { sAttCode: me.sAttCode,
+					   iInputId: me.iInputId,
+					   sSuffix: me.sSuffix,
+					   bDuplicates: me.bDuplicates
+					 };
+		
+		me.UpdateButtons(0);
+		// Gather the parameters from the search form
+		$('#SearchFormToAdd_'+me.id+' :input').each( function() {
+				if (this.name != '')
+				{
+					var val = $(this).val(); // supports multiselect as well
+					if (val !== null)
+					{
+						theMap[this.name] = val;					
+					}
+				}
+		});
+		
+		// Gather the already linked target objects
+		theMap.aAlreadyLinked = [];
+		$('#linkedset_'+me.id+' .selection:input').each(function(i) {
+			var iRemote = $(this).attr('data-remote-id');
+			theMap.aAlreadyLinked.push(iRemote);
+		});
+		theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
+		theMap['class'] = me.sClass;
+		theMap.operation = 'searchObjectsToAdd'; // Override what is defined in the form itself
+		
+		sSearchAreaId = '#SearchResultsToAdd_'+me.id;
+		$(sSearchAreaId).block();
+		
+		// Run the query and display the results
+		$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
+			function(data)
+			{
+				$(sSearchAreaId).html(data);
+				$(sSearchAreaId+' .listResults').tableHover();
+				$('#count_'+me.id).change(function(){
+					var c = this.value;
+					me.UpdateButtons(c);
+				});
+				me.UpdateSizes(null, null);
+				$(sSearchAreaId).unblock();		
+			},
+			'html'
+		);
+
+		return false; // Don't submit the form, stay in the current page !
+	};
+
+	this.UpdateButtons = function(iCount)
+	{
+		var okBtn = $('#btn_ok_'+me.id);
+		if (iCount > 0)
+		{
+			okBtn.removeAttr('disabled');
+		}
+		else
+		{
+			okBtn.attr('disabled', 'disabled');
+		}
+	};
+	
+	this.DoAddObjects = function()
+	{
+		var theMap = { sAttCode: me.sAttCode,
+				   	   iInputId: me.iInputId,
+				   	   sSuffix: me.sSuffix,
+				   	   bDuplicates: me.bDuplicates,
+				   	   'class': me.sClass
+				 	 };
+		
+		// Gather the parameters from the search form
+		var context = $('#SearchResultsToAdd_'+me.id);
+		var selectionMode = $(':input[name=selectionMode]', context);
+		if (selectionMode.length > 0)
+		{
+			// Paginated table retrieve the mode and the exceptions
+			var sMode = selectionMode.val();
+			theMap['selectionMode'] = sMode;
+			$('#fs_SearchFormToAdd_'+me.id+' :input').each(
+					function(i)
+					{
+						theMap[this.name] = this.value;
+					}
+				);
+			theMap['sRemoteClass'] = theMap['class'];  // swap 'class' (defined in the form) and 'remoteClass'
+			theMap['class'] = me.sClass;
+			$(' :input[name^=storedSelection]', context).each(function() {
+				if (theMap[this.name] == undefined)
+				{
+					theMap[this.name] = [];
+				}
+				theMap[this.name].push(this.value);
+				$(this).remove(); // Remove the selection for the next time the dialog re-opens
+			});
+			// Retrieve the 'filter' definition
+			var table = $('#ResultsToAdd_'+me.id).find('table.listResults')[0];
+			theMap['filter'] = table.config.filter;
+			theMap['extra_params'] = table.config.extra_params;
+		}
+//		else
+//		{
+			// Normal table, retrieve all the checked check-boxes
+			$(':checked[name^=selectObject]', context).each(
+				function(i)
+				{
+					if ( (this.name != '') && ((this.type != 'checkbox') || (this.checked)) ) 
+					{
+						arrayExpr = /\[\]$/;
+						if (arrayExpr.test(this.name))
+						{
+							// Array
+							if (theMap[this.name] == undefined)
+							{
+								theMap[this.name] = [];
+							}
+							theMap[this.name].push(this.value);
+						}
+						else
+						{
+							theMap[this.name] = this.value;
+						}						
+					}
+					$(this).parents('tr:first').remove(); // Remove the whole line, so that, next time the dialog gets displayed it's no longer there
+				}
+			);
+//		}
+		
+		theMap['operation'] = 'doAddObjects';
+        theMap['max_added_id'] = this.iMaxAddedId;
+		if (me.oWizardHelper == null)
+		{
+			theMap['json'] = '';
+		}
+		else
+		{
+			// Not inside a "search form", updating a real object
+			me.oWizardHelper.UpdateWizard();
+			theMap['json'] = me.oWizardHelper.ToJSON();
+		}
+		$('#busy_'+me.iInputId).html('&nbsp;<img src="../images/indicator.gif"/>');
+		// Run the query and display the results
+		$.post( GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', theMap, 
+			function(data)
+			{
+				if (data != '')
+				{
+					$('#'+me.id+'_empty_row').hide();
+					$('#linkedset_'+me.id+' .listResults tbody').prepend(data);
+					$('#linkedset_'+me.id+' .listResults').trigger('update');
+					$('#linkedset_'+me.id+' .listResults').tableHover();
+					$('#linkedset_'+me.id+' .listResults').trigger('update').trigger("applyWidgets"); // table is already sortable, just refresh it
+					$('#linkedset_'+me.id+' :input').each( function() { $(this).trigger('validate', ''); }); // Validate newly added form fields...
+					$('#busy_'+me.iInputId).html('');
+				}
+			},
+			'html'
+		);
+		$('#dlg_'+me.id).dialog('close');
+		return false;
+	};
+
+    this.OnLinkAdded = function(iAddedId, iRemote)
+    {
+        // Assumption: this identifier will be higher than the previous one
+        me.iMaxAddedId = iAddedId;
+		var sFormPrefix = me.iInputId;
+		oAdded = {};
+		oAdded['formPrefix'] = sFormPrefix;
+		oAdded['attr_' + sFormPrefix + this.sExtKeyToRemote] = iRemote;
+        me.aAdded[iAddedId] = oAdded;
+        $('#linkedset_'+me.id+' :input').off('change').on('change', function() {
+			if (!($(this).hasClass('selection'))) {
+				var oCheckbox = $(this).closest('tr').find('.selection');
+				var iLink = oCheckbox.attr('data-link-id');
+				var iUniqueId = oCheckbox.attr('data-unique-id');
+				var sAttCode = $(this).closest('.attribute-edit').attr('data-attcode');
+				var value = $(this).val();
+				return me.OnValueChange(iLink, iUniqueId, sAttCode, value);
+			}
+			return true;
+        });
+    };
+
+	this.UpdateSizes = function(event, ui)
+	{
+		var dlg = $('#dlg_'+me.id);
+		var searchForm = $('#SearchFormToAdd_'+me.id);
+		var results = $('#SearchResultsToAdd_'+me.id);
+		var padding_right = 0;
+		if (dlg.css('padding-right'))
+		{
+			padding_right = parseInt(dlg.css('padding-right').replace('px', ''));			
+		}
+		var padding_left = 0;
+		if (dlg.css('padding-left'))
+		{
+			padding_left = parseInt(dlg.css('padding-left').replace('px', ''));			
+		}
+		var padding_top = 0;
+		if (dlg.css('padding-top'))
+		{
+			padding_top = parseInt(dlg.css('padding-top').replace('px', ''));			
+		}
+		var padding_bottom = 0;
+		if (dlg.css('padding-bottom'))
+		{
+			padding_bottom = parseInt(dlg.css('padding-bottom').replace('px', ''));			
+		}
+		width = dlg.innerWidth() - padding_right - padding_left - 22; // 5 (margin-left) + 5 (padding-left) + 5 (padding-right) + 5 (margin-right) + 2 for rounding !
+		height = dlg.innerHeight() - padding_top - padding_bottom -22;
+		wizard = dlg.find('.wizContainer:first');
+		wizard.width(width);
+		wizard.height(height);
+		form_height = searchForm.outerHeight();
+		results.height(height - form_height - 40); // Leave some space for the buttons
+	};
+	
+	this.GetUpdatedValue = function()
+	{
+		var sSelector = '#linkedset_'+me.id+' :input[name^=attr_'+me.id+']';
+		var aIndexes = [];
+		var aValues = [];
+		$(sSelector).each(function() {
+			var re = /\[([^\[]+)\]\[(.+)\]/;
+			var aMatches = [];
+			if (aMatches = this.name.match(re))
+			{
+				var idx = aMatches[1];
+				var index = jQuery.inArray(idx, aIndexes);
+				if (index == -1)
+				{
+					aIndexes.push(idx);
+					index = jQuery.inArray(idx, aIndexes);
+					aValues[index] = {};
+				}
+				var value = $(this).val();
+				if (aMatches[2] == "id")
+				{
+					var iId = parseInt(aMatches[1], 10);
+					if (iId < 0)
+					{
+						aValues[index][me.sExtKeyToRemote] = -iId;
+					}
+					else
+					{
+						aValues[index]['id'] = value;						
+					}
+				}
+				else
+				{
+					aValues[index][aMatches[2]] = value;					
+				}
+			}
+		});
+		return JSON.stringify(aValues);
+	};
+
+	this.OnValueChange = function(iLink, iUniqueId, sAttCode, value)
+	{
+		var sFormPrefix = me.iInputId;
+        if (iLink > 0) {
+            // Modifying an existing link
+            var oModified = me.aModified[iLink];
+            if (oModified == undefined) {
+                // Still not marked as modified
+                oModified = {};
+                oModified['formPrefix'] = sFormPrefix;
+            }
+            // Weird formatting, aligned with the output of the direct links widget (new links to be created)
+            oModified['attr_' + sFormPrefix + sAttCode] = value;
+            me.aModified[iLink] = oModified;
+        }
+        else {
+            // Modifying a newly added link - the structure should already be up to date
+            me.aAdded[iUniqueId]['attr_' + sFormPrefix + sAttCode] = value;
+        }
+	};
+
+	this.OnFormSubmit = function()
+	{
+		var oDiv = $('#linkedset_'+me.id);
+
+		var sToBeDeleted = JSON.stringify(me.aRemoved);
+		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbd">').val(sToBeDeleted).appendTo(oDiv);
+
+
+		var sToBeModified = JSON.stringify(me.aModified);
+		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbm">').val(sToBeModified).appendTo(oDiv);
+
+		var aToBeCreated = [];
+		me.aAdded.forEach(function(oAdded){
+			if (oAdded != null)
+			{
+				aToBeCreated.push(oAdded);
+			}
+		});
+		var sToBeCreated = JSON.stringify(aToBeCreated);
+		$('<input type="hidden" name="attr_'+me.sAttCode+'_tbc">').val(sToBeCreated).appendTo(oDiv);
+	};
+}
diff --git a/js/themes/flora/flora.accordion.css b/js/themes/flora/flora.accordion.css
index 4bee95175..7f2313dd1 100644
--- a/js/themes/flora/flora.accordion.css
+++ b/js/themes/flora/flora.accordion.css
@@ -1,12 +1,12 @@
-ul.ui-accordion-container { margin: 0; padding: 0; list-style-type: none; }
-ul.ui-accordion-container li { position: relative; margin: 0; margin-bottom: 2px; padding: 0; background-image: url(i/accordion-left.png); background-repeat: no-repeat; }
-ul.ui-accordion-container li a.ui-accordion-link { display: block; padding-left: 5px; margin-right: 3px; height: 28px; background-image: url(i/accordion-middle.png); color: #000; text-decoration: none; line-height: 28px; }
-ul.ui-accordion-container li div.ui-accordion-right { background-image: url(i/accordion-right.png); position: absolute; top: 0px; right: 0px; height: 28px; width: 3px;  }
-
-ul.ui-accordion-container li:hover { background-image: url(i/accordion-left-over.png); }
-ul.ui-accordion-container li:hover a.ui-accordion-link { background-image: url(i/accordion-middle-over.png); }
-ul.ui-accordion-container li:hover div.ui-accordion-right { background-image: url(i/accordion-right-over.png); }
-
-ul.ui-accordion-container li.active { background-image: url(i/accordion-left-act.png); }
-ul.ui-accordion-container li.active a.ui-accordion-link { background-image: url(i/accordion-middle-act.png); }
+ul.ui-accordion-container { margin: 0; padding: 0; list-style-type: none; }
+ul.ui-accordion-container li { position: relative; margin: 0; margin-bottom: 2px; padding: 0; background-image: url(i/accordion-left.png); background-repeat: no-repeat; }
+ul.ui-accordion-container li a.ui-accordion-link { display: block; padding-left: 5px; margin-right: 3px; height: 28px; background-image: url(i/accordion-middle.png); color: #000; text-decoration: none; line-height: 28px; }
+ul.ui-accordion-container li div.ui-accordion-right { background-image: url(i/accordion-right.png); position: absolute; top: 0px; right: 0px; height: 28px; width: 3px;  }
+
+ul.ui-accordion-container li:hover { background-image: url(i/accordion-left-over.png); }
+ul.ui-accordion-container li:hover a.ui-accordion-link { background-image: url(i/accordion-middle-over.png); }
+ul.ui-accordion-container li:hover div.ui-accordion-right { background-image: url(i/accordion-right-over.png); }
+
+ul.ui-accordion-container li.active { background-image: url(i/accordion-left-act.png); }
+ul.ui-accordion-container li.active a.ui-accordion-link { background-image: url(i/accordion-middle-act.png); }
 ul.ui-accordion-container li.active div.ui-accordion-right { background-image: url(i/accordion-right-act.png); }
\ No newline at end of file
diff --git a/js/themes/flora/flora.all.css b/js/themes/flora/flora.all.css
index fed27deb7..0fb55dfcd 100644
--- a/js/themes/flora/flora.all.css
+++ b/js/themes/flora/flora.all.css
@@ -1,9 +1,9 @@
-@import "flora.css";
-@import "flora.shadow.css";
-@import "flora.resizable.css";
-@import "flora.slider.css";
-@import "flora.accordion.css";
-@import "flora.tabs.css";
-@import "flora.dialog.css";
-@import "flora.tablesorter.css";
-@import "flora.calendar.css";
+@import "flora.css";
+@import "flora.shadow.css";
+@import "flora.resizable.css";
+@import "flora.slider.css";
+@import "flora.accordion.css";
+@import "flora.tabs.css";
+@import "flora.dialog.css";
+@import "flora.tablesorter.css";
+@import "flora.calendar.css";
diff --git a/js/themes/flora/flora.calendar.css b/js/themes/flora/flora.calendar.css
index dedcf0ca6..b8f432b58 100644
--- a/js/themes/flora/flora.calendar.css
+++ b/js/themes/flora/flora.calendar.css
@@ -1,167 +1,167 @@
-/* Main Style Sheet for jQuery Calendar */
-#calendar_div, .calendar_inline {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	padding: 0;
-	margin: 0;
-	background: #ddd;
-}
-#calendar_div {
-	display: none;
-	border: 1px solid #FF9900;
-	z-index: 10; /*must have*/ 
-}
-#calendar_div, .calendar_control, .calendar_links, .calendar_header, .calendar {
-	width: 185px;
-}
-.calendar_inline {
-	float: left;
-	display: block;
-	border: 0;
-}
-.calendar_dialog {
-	padding: 5px !important;
-	border: 4px ridge #ddd !important;
-}
-button.calendar_trigger {
-	width: 25px;
-}
-img.calendar_trigger {
-	margin: 2px;
-	vertical-align: middle;
-}
-.calendar_prompt {
-	float: left;
-	width: 181px;
-	padding: 2px;
-	background: #ddd;
-	color: #000;
-}
-* html .calendar_prompt {
-	width: 185px;
-}
-.calendar_control, .calendar_links, .calendar_header, .calendar {
-	clear: both;
-	float: left;
-	color: #fff;
-}
-.calendar_control {
-	background: #FF9900;
-}
-.calendar_links {
-	background: #E0F4D7;
-}
-.calendar_control, .calendar_links {
-	font-weight: bold;
-	font-size: 80%;
-	letter-spacing: 1px;
-}
-.calendar_links label { /* disabled links */
-	padding: 2px 5px;
-	color: #888;
-}
-.calendar_clear, .calendar_prev {
-	float: left;
-}
-.calendar_current {
-	float: left;
-	width: 35%;
-	text-align: center;
-}
-.calendar_close, .calendar_next {
-	float: right;
-}
-.calendar_header {
-	background: #83C948;
-	text-align: center;
-	font-weight: bold;
-}
-.calendar_header select {
-	background: #83C948;
-	color: #000;
-	border: 0px;
-	font-weight: bold;
-}
-.calendar {
-	background: #ccc;
-	text-align: center;
-	font-size: 100%;
-}
-.calendar a {
-	display: block;
-	width: 100%;
-}
-.calendar .calendar_titleRow {
-	background: #B1DB87;
-	color: #000 !important;
-}
-.calendar .calendar_daysRow {
-	background: #FFF;
-	color: #666;
-}
-.calendar .calendar_daysCell {
-	color: #000;
-	border: 1px solid #ddd;
-}
-#calendar .calendar_daysCell a{
-	display: block;
-}
-.calendar .calendar_weekEndCell {
-	background: #E0F4D7;
-}
-.calendar .calendar_daysCellOver {
-	background: #fff;
-	border: 1px solid #777;
-}
-.calendar .calendar_unselectable {
-	color: #888;
-}
-.calendar_today {
-	background: #ccc !important;
-}
-.calendar_currentDay {
-	background: #999 !important;
-}
-
-/* ________ CALENDAR LINKS _______
-
-** Reset link properties and then override them with !important */
-#calendar_div a, .calendar_inline a {
-	cursor: pointer;
-	margin: 0;
-	padding: 0;
-	background: none;
-	color: #000;
-}
-.calendar_inline .calendar_links a {
-	padding: 0 5px !important;
-}
-.calendar_control a, .calendar_links a {
-	padding: 2px 5px !important;
-	color: #000 !important;
-}
-.calendar_titleRow a {
-	color: #000 !important;
-}
-.calendar_control a:hover {
-	/*background: #fdd !important;*/
-	color: #333 !important;
-}
-.calendar_links a:hover, .calendar_titleRow a:hover {
-	background: #FFF !important;
-	color: #333 !important;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.calendar_cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 193px; /*must have to match width and borders*/
-    height: 200px; /*must have to match maximum height*/ 
-}
+/* Main Style Sheet for jQuery Calendar */
+#calendar_div, .calendar_inline {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	padding: 0;
+	margin: 0;
+	background: #ddd;
+}
+#calendar_div {
+	display: none;
+	border: 1px solid #FF9900;
+	z-index: 10; /*must have*/ 
+}
+#calendar_div, .calendar_control, .calendar_links, .calendar_header, .calendar {
+	width: 185px;
+}
+.calendar_inline {
+	float: left;
+	display: block;
+	border: 0;
+}
+.calendar_dialog {
+	padding: 5px !important;
+	border: 4px ridge #ddd !important;
+}
+button.calendar_trigger {
+	width: 25px;
+}
+img.calendar_trigger {
+	margin: 2px;
+	vertical-align: middle;
+}
+.calendar_prompt {
+	float: left;
+	width: 181px;
+	padding: 2px;
+	background: #ddd;
+	color: #000;
+}
+* html .calendar_prompt {
+	width: 185px;
+}
+.calendar_control, .calendar_links, .calendar_header, .calendar {
+	clear: both;
+	float: left;
+	color: #fff;
+}
+.calendar_control {
+	background: #FF9900;
+}
+.calendar_links {
+	background: #E0F4D7;
+}
+.calendar_control, .calendar_links {
+	font-weight: bold;
+	font-size: 80%;
+	letter-spacing: 1px;
+}
+.calendar_links label { /* disabled links */
+	padding: 2px 5px;
+	color: #888;
+}
+.calendar_clear, .calendar_prev {
+	float: left;
+}
+.calendar_current {
+	float: left;
+	width: 35%;
+	text-align: center;
+}
+.calendar_close, .calendar_next {
+	float: right;
+}
+.calendar_header {
+	background: #83C948;
+	text-align: center;
+	font-weight: bold;
+}
+.calendar_header select {
+	background: #83C948;
+	color: #000;
+	border: 0px;
+	font-weight: bold;
+}
+.calendar {
+	background: #ccc;
+	text-align: center;
+	font-size: 100%;
+}
+.calendar a {
+	display: block;
+	width: 100%;
+}
+.calendar .calendar_titleRow {
+	background: #B1DB87;
+	color: #000 !important;
+}
+.calendar .calendar_daysRow {
+	background: #FFF;
+	color: #666;
+}
+.calendar .calendar_daysCell {
+	color: #000;
+	border: 1px solid #ddd;
+}
+#calendar .calendar_daysCell a{
+	display: block;
+}
+.calendar .calendar_weekEndCell {
+	background: #E0F4D7;
+}
+.calendar .calendar_daysCellOver {
+	background: #fff;
+	border: 1px solid #777;
+}
+.calendar .calendar_unselectable {
+	color: #888;
+}
+.calendar_today {
+	background: #ccc !important;
+}
+.calendar_currentDay {
+	background: #999 !important;
+}
+
+/* ________ CALENDAR LINKS _______
+
+** Reset link properties and then override them with !important */
+#calendar_div a, .calendar_inline a {
+	cursor: pointer;
+	margin: 0;
+	padding: 0;
+	background: none;
+	color: #000;
+}
+.calendar_inline .calendar_links a {
+	padding: 0 5px !important;
+}
+.calendar_control a, .calendar_links a {
+	padding: 2px 5px !important;
+	color: #000 !important;
+}
+.calendar_titleRow a {
+	color: #000 !important;
+}
+.calendar_control a:hover {
+	/*background: #fdd !important;*/
+	color: #333 !important;
+}
+.calendar_links a:hover, .calendar_titleRow a:hover {
+	background: #FFF !important;
+	color: #333 !important;
+}
+
+/* ___________ IE6 IFRAME FIX ________ */
+
+.calendar_cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 193px; /*must have to match width and borders*/
+    height: 200px; /*must have to match maximum height*/ 
+}
diff --git a/js/themes/flora/flora.css b/js/themes/flora/flora.css
index b38529688..9ad039fd9 100644
--- a/js/themes/flora/flora.css
+++ b/js/themes/flora/flora.css
@@ -1,2 +1,2 @@
-.ui-wrapper { border: 1px solid #50A029; }
+.ui-wrapper { border: 1px solid #50A029; }
 .ui-wrapper input,textarea { border: 0; }
\ No newline at end of file
diff --git a/js/themes/flora/flora.dialog.css b/js/themes/flora/flora.dialog.css
index 43dcec6e9..d3d348d5b 100644
--- a/js/themes/flora/flora.dialog.css
+++ b/js/themes/flora/flora.dialog.css
@@ -1,86 +1,86 @@
-/* This file skins dialog */
-
-.flora .ui-dialog,
-.flora.ui-dialog {
-	background-color: #e6f7d4;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar,
-.flora.ui-dialog .ui-dialog-titlebar {
-	border-bottom: 1px solid #d8d2aa;
-	background: #ff9900 url(i/dialog-title.gif) repeat-x;
-	padding: 0px;
-	cursor: move;
-	height: 28px;
-	_height: 29px;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar-close,
-.flora.ui-dialog .ui-dialog-titlebar-close {
-	width: 16px;
-	height: 16px;
-	background: url(i/dialog-titlebar-close.png) no-repeat;
-	position:absolute;
-	top: 6px;
-	right: 7px;
-	cursor: default;
-}
-
-.flora .ui-dialog .ui-dialog-titlebar-close-hover,
-.flora.ui-dialog .ui-dialog-titlebar-close-hover {
-	background: url(i/dialog-titlebar-close-hover.png) no-repeat;
-}
-
-.flora .ui-dialog .ui-dialog-title,
-.flora.ui-dialog .ui-dialog-title {
-	margin-left: 5px;
-	color: white;
-	font-weight: bold;
-	position: relative;
-	top: 7px;
-	left: 4px;
-}
-
-.flora .ui-dialog .ui-dialog-content,
-.flora.ui-dialog .ui-dialog-content {
-	margin: 1.2em;
-}
-
-.flora .ui-dialog .ui-dialog-buttonpane,
-.flora.ui-dialog .ui-dialog-buttonpane {
-	position: absolute;
-	bottom: 8px;
-	right: 12px;
-	width: 100%;
-	text-align: right;
-}
-
-.flora .ui-dialog .ui-dialog-buttonpane button,
-.flora.ui-dialog .ui-dialog-buttonpane button {
-	margin: 6px;
-}
-
-/* Dialog handle styles */
-.flora .ui-dialog .ui-resizable-n,
-.flora.ui-dialog .ui-resizable-n { cursor: n-resize; height: 6px; width: 100%; top: 0px; left: 0px; background: transparent url(i/dialog-n.gif) repeat scroll center top; }
-
-.flora .ui-dialog .ui-resizable-s,
-.flora.ui-dialog .ui-resizable-s { cursor: s-resize; height: 8px; width: 100%; bottom: 0px; left: 0px; background: transparent url(i/dialog-s.gif) repeat scroll center top; }
-
-.flora .ui-dialog .ui-resizable-e,
-.flora.ui-dialog .ui-resizable-e { cursor: e-resize; width: 7px; right: 0px; top: 0px; height: 100%; background: transparent url(i/dialog-e.gif) repeat scroll right center; }
-
-.flora .ui-dialog .ui-resizable-w,
-.flora.ui-dialog .ui-resizable-w { cursor: w-resize; width: 7px; left: 0px; top: 0px; height: 100%; background: transparent url(i/dialog-w.gif) repeat scroll right center; }
-
-.flora .ui-dialog .ui-resizable-se,
-.flora.ui-dialog .ui-resizable-se { cursor: se-resize; width: 9px; height: 9px; right: 0px; bottom: 0px; background: transparent url(i/dialog-se.gif); }
-
-.flora .ui-dialog .ui-resizable-sw,
-.flora.ui-dialog .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: 0px; bottom: 0px; background: transparent url(i/dialog-sw.gif); }
-
-.flora .ui-dialog .ui-resizable-nw,
-.flora.ui-dialog .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 29px; left: 0px; top: 0px; background: transparent url(i/dialog-nw.gif); }
-
-.flora .ui-dialog .ui-resizable-ne,
-.flora.ui-dialog .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 29px; right: 0px; top: 0px; background: transparent url(i/dialog-ne.gif); }
+/* This file skins dialog */
+
+.flora .ui-dialog,
+.flora.ui-dialog {
+	background-color: #e6f7d4;
+}
+
+.flora .ui-dialog .ui-dialog-titlebar,
+.flora.ui-dialog .ui-dialog-titlebar {
+	border-bottom: 1px solid #d8d2aa;
+	background: #ff9900 url(i/dialog-title.gif) repeat-x;
+	padding: 0px;
+	cursor: move;
+	height: 28px;
+	_height: 29px;
+}
+
+.flora .ui-dialog .ui-dialog-titlebar-close,
+.flora.ui-dialog .ui-dialog-titlebar-close {
+	width: 16px;
+	height: 16px;
+	background: url(i/dialog-titlebar-close.png) no-repeat;
+	position:absolute;
+	top: 6px;
+	right: 7px;
+	cursor: default;
+}
+
+.flora .ui-dialog .ui-dialog-titlebar-close-hover,
+.flora.ui-dialog .ui-dialog-titlebar-close-hover {
+	background: url(i/dialog-titlebar-close-hover.png) no-repeat;
+}
+
+.flora .ui-dialog .ui-dialog-title,
+.flora.ui-dialog .ui-dialog-title {
+	margin-left: 5px;
+	color: white;
+	font-weight: bold;
+	position: relative;
+	top: 7px;
+	left: 4px;
+}
+
+.flora .ui-dialog .ui-dialog-content,
+.flora.ui-dialog .ui-dialog-content {
+	margin: 1.2em;
+}
+
+.flora .ui-dialog .ui-dialog-buttonpane,
+.flora.ui-dialog .ui-dialog-buttonpane {
+	position: absolute;
+	bottom: 8px;
+	right: 12px;
+	width: 100%;
+	text-align: right;
+}
+
+.flora .ui-dialog .ui-dialog-buttonpane button,
+.flora.ui-dialog .ui-dialog-buttonpane button {
+	margin: 6px;
+}
+
+/* Dialog handle styles */
+.flora .ui-dialog .ui-resizable-n,
+.flora.ui-dialog .ui-resizable-n { cursor: n-resize; height: 6px; width: 100%; top: 0px; left: 0px; background: transparent url(i/dialog-n.gif) repeat scroll center top; }
+
+.flora .ui-dialog .ui-resizable-s,
+.flora.ui-dialog .ui-resizable-s { cursor: s-resize; height: 8px; width: 100%; bottom: 0px; left: 0px; background: transparent url(i/dialog-s.gif) repeat scroll center top; }
+
+.flora .ui-dialog .ui-resizable-e,
+.flora.ui-dialog .ui-resizable-e { cursor: e-resize; width: 7px; right: 0px; top: 0px; height: 100%; background: transparent url(i/dialog-e.gif) repeat scroll right center; }
+
+.flora .ui-dialog .ui-resizable-w,
+.flora.ui-dialog .ui-resizable-w { cursor: w-resize; width: 7px; left: 0px; top: 0px; height: 100%; background: transparent url(i/dialog-w.gif) repeat scroll right center; }
+
+.flora .ui-dialog .ui-resizable-se,
+.flora.ui-dialog .ui-resizable-se { cursor: se-resize; width: 9px; height: 9px; right: 0px; bottom: 0px; background: transparent url(i/dialog-se.gif); }
+
+.flora .ui-dialog .ui-resizable-sw,
+.flora.ui-dialog .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: 0px; bottom: 0px; background: transparent url(i/dialog-sw.gif); }
+
+.flora .ui-dialog .ui-resizable-nw,
+.flora.ui-dialog .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 29px; left: 0px; top: 0px; background: transparent url(i/dialog-nw.gif); }
+
+.flora .ui-dialog .ui-resizable-ne,
+.flora.ui-dialog .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 29px; right: 0px; top: 0px; background: transparent url(i/dialog-ne.gif); }
diff --git a/js/themes/flora/flora.resizable.css b/js/themes/flora/flora.resizable.css
index 5e30c0c2c..9c9a5433d 100644
--- a/js/themes/flora/flora.resizable.css
+++ b/js/themes/flora/flora.resizable.css
@@ -1,20 +1,20 @@
-/* This file skins resizables */
-
-.ui-resizable { position: relative; }
-
-/* Global handle styles */
-.ui-resizable-handle { position: absolute; display: none; font-size: 0.1px; }
-.ui-resizable .ui-resizable-handle { display: block; }
-body .ui-resizable-disabled .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */
-body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */
-
-.ui-resizable-n { cursor: n-resize; height: 6px; width: 100%; top: 0px; left: 0px; background: transparent url(i/resizable-n.gif) repeat scroll center top; }
-.ui-resizable-s { cursor: s-resize; height: 6px; width: 100%; bottom: 0px; left: 0px; background: transparent url(i/resizable-s.gif) repeat scroll center top; }
-
-.ui-resizable-e { cursor: e-resize; width: 6px; right: 0px; top: 0px; height: 100%; background: transparent url(i/resizable-e.gif) repeat scroll right center; }
-.ui-resizable-w { cursor: w-resize; width: 6px; left: 0px; top: 0px; height: 100%; background: transparent url(i/resizable-w.gif) repeat scroll right center; }
-
-.ui-resizable-se { cursor: se-resize; width: 9px; height: 9px; right: 0px; bottom: 0px; background: transparent url(i/resizable-se.gif); }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: 0px; bottom: 0px; background: transparent url(i/resizable-sw.gif); }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: 0px; top: 0px; background: transparent url(i/resizable-nw.gif); }
+/* This file skins resizables */
+
+.ui-resizable { position: relative; }
+
+/* Global handle styles */
+.ui-resizable-handle { position: absolute; display: none; font-size: 0.1px; }
+.ui-resizable .ui-resizable-handle { display: block; }
+body .ui-resizable-disabled .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */
+body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body' to make it more specific (css order) */
+
+.ui-resizable-n { cursor: n-resize; height: 6px; width: 100%; top: 0px; left: 0px; background: transparent url(i/resizable-n.gif) repeat scroll center top; }
+.ui-resizable-s { cursor: s-resize; height: 6px; width: 100%; bottom: 0px; left: 0px; background: transparent url(i/resizable-s.gif) repeat scroll center top; }
+
+.ui-resizable-e { cursor: e-resize; width: 6px; right: 0px; top: 0px; height: 100%; background: transparent url(i/resizable-e.gif) repeat scroll right center; }
+.ui-resizable-w { cursor: w-resize; width: 6px; left: 0px; top: 0px; height: 100%; background: transparent url(i/resizable-w.gif) repeat scroll right center; }
+
+.ui-resizable-se { cursor: se-resize; width: 9px; height: 9px; right: 0px; bottom: 0px; background: transparent url(i/resizable-se.gif); }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: 0px; bottom: 0px; background: transparent url(i/resizable-sw.gif); }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: 0px; top: 0px; background: transparent url(i/resizable-nw.gif); }
 .ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: 0px; top: 0px; background: transparent url(i/resizable-ne.gif); }
\ No newline at end of file
diff --git a/js/themes/flora/flora.shadow.css b/js/themes/flora/flora.shadow.css
index 6c08d44fb..c56e29b05 100644
--- a/js/themes/flora/flora.shadow.css
+++ b/js/themes/flora/flora.shadow.css
@@ -1,33 +1,33 @@
-/*
-.ui-shadow {
-background:transparent url(i/shadow.png) no-repeat scroll right bottom;
-height: 100px;
-margin: 10px;
-position: relative;
-}
-
-.ui-shadow-ne {
-background:transparent url(i/shadow.png) no-repeat scroll right top;
-width: 6px;
-height: 6px;
-position: absolute;
-top: -6px;
-right: 0px;
-}
-
-.ui-shadow-sw {
-background:transparent url(i/shadow.png) no-repeat scroll left bottom;
-width: 6px;
-height: 6px;
-position: absolute;
-bottom: 0px;
-left: -6px;
-}
-*/
-
-
-
-
-.ui-shadow { position:relative; }
-.ui-shadow-color { background:#030; position:absolute; } /* Can be overidden via js */
-
+/*
+.ui-shadow {
+background:transparent url(i/shadow.png) no-repeat scroll right bottom;
+height: 100px;
+margin: 10px;
+position: relative;
+}
+
+.ui-shadow-ne {
+background:transparent url(i/shadow.png) no-repeat scroll right top;
+width: 6px;
+height: 6px;
+position: absolute;
+top: -6px;
+right: 0px;
+}
+
+.ui-shadow-sw {
+background:transparent url(i/shadow.png) no-repeat scroll left bottom;
+width: 6px;
+height: 6px;
+position: absolute;
+bottom: 0px;
+left: -6px;
+}
+*/
+
+
+
+
+.ui-shadow { position:relative; }
+.ui-shadow-color { background:#030; position:absolute; } /* Can be overidden via js */
+
diff --git a/js/themes/flora/flora.slider.css b/js/themes/flora/flora.slider.css
index b04ace982..07136a345 100644
--- a/js/themes/flora/flora.slider.css
+++ b/js/themes/flora/flora.slider.css
@@ -1,8 +1,8 @@
-/* This file skins sliders */
-
-.ui-slider-handle { position: absolute; height: 23px; width: 12px; top: 0px; left: 0px; background-image: url(i/slider-handle.gif);  }
-.ui-slider-disabled .ui-slider-handle { opacity: 0.5; filter: alpha(opacity=50); }
-
-/* Default slider backgrounds */
-.ui-slider-1 { width: 200px; height: 23px; position: relative; background-image: url(i/slider-bg-1.png); background-repeat: no-repeat; background-position: center center; }
+/* This file skins sliders */
+
+.ui-slider-handle { position: absolute; height: 23px; width: 12px; top: 0px; left: 0px; background-image: url(i/slider-handle.gif);  }
+.ui-slider-disabled .ui-slider-handle { opacity: 0.5; filter: alpha(opacity=50); }
+
+/* Default slider backgrounds */
+.ui-slider-1 { width: 200px; height: 23px; position: relative; background-image: url(i/slider-bg-1.png); background-repeat: no-repeat; background-position: center center; }
 .ui-slider-2 { width: 200px; height: 23px; position: relative; background-image: url(i/slider-bg-2.png); background-repeat: no-repeat; background-position: center center; }
\ No newline at end of file
diff --git a/js/themes/flora/flora.tablesorter.css b/js/themes/flora/flora.tablesorter.css
index 7d805a766..7854f8bec 100644
--- a/js/themes/flora/flora.tablesorter.css
+++ b/js/themes/flora/flora.tablesorter.css
@@ -1,40 +1,40 @@
-/* This file skins tableSorter */
-
-table.tablesorter {
-	font-family:arial;
-	background-color: #CDCDCD;
-	margin:10px 0pt 15px;
-	font-size: 8pt;
-	width: 100%;
-	text-align: left;
-}
-table.tablesorter thead tr th, table.tablesorter tfoot tr th {
-	background-color: #B1DB87;
-	border: 1px solid #FFF;
-	font-size: 8pt;
-	padding: 4px;
-}
-table.tablesorter thead tr .header {
-	background-image: url(i/bg.gif);
-	background-repeat: no-repeat;
-	background-position: center right;
-	cursor: pointer;
-}
-table.tablesorter tbody td {
-	color: #3D3D3D;
-	padding: 4px;
-	background-color: #FFF;
-	vertical-align: top;
-}
-table.tablesorter tbody tr.odd td {
-	background-color:#E0F4D7;
-}
-table.tablesorter thead tr .headerSortUp {
-	background-image: url(i/asc.gif);
-}
-table.tablesorter thead tr .headerSortDown {
-	background-image: url(i/desc.gif);
-}
-table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
-background-color: #83C948;
-}
+/* This file skins tableSorter */
+
+table.tablesorter {
+	font-family:arial;
+	background-color: #CDCDCD;
+	margin:10px 0pt 15px;
+	font-size: 8pt;
+	width: 100%;
+	text-align: left;
+}
+table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+	background-color: #B1DB87;
+	border: 1px solid #FFF;
+	font-size: 8pt;
+	padding: 4px;
+}
+table.tablesorter thead tr .header {
+	background-image: url(i/bg.gif);
+	background-repeat: no-repeat;
+	background-position: center right;
+	cursor: pointer;
+}
+table.tablesorter tbody td {
+	color: #3D3D3D;
+	padding: 4px;
+	background-color: #FFF;
+	vertical-align: top;
+}
+table.tablesorter tbody tr.odd td {
+	background-color:#E0F4D7;
+}
+table.tablesorter thead tr .headerSortUp {
+	background-image: url(i/asc.gif);
+}
+table.tablesorter thead tr .headerSortDown {
+	background-image: url(i/desc.gif);
+}
+table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
+background-color: #83C948;
+}
diff --git a/js/utils.js b/js/utils.js
index 5f1ebaa8c..d521c2dfe 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -1,718 +1,718 @@
-// Some general purpose JS functions for the iTop application
-
-//IE 8 compatibility, copied from: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/IndexOf
-if (!Array.prototype.indexOf) {
-
-	if (false) // deactivated since it causes troubles: for(k in aData) => returns the indexOf function as first element on empty arrays !
-	{
-		Array.prototype.indexOf = function (searchElement /*, fromIndex */) {
-			"use strict";
-			if (this == null) {
-				throw new TypeError();
-			}
-			var t = Object(this);
-			var len = t.length >>> 0;
-			if (len === 0) {
-				return -1;
-			}
-			var n = 0;
-			if (arguments.length > 1) {
-				n = Number(arguments[1]);
-				if (n != n) { // shortcut for verifying if it's NaN
-					n = 0;
-				} else if (n != 0 && n != Infinity && n != -Infinity) {
-					n = (n > 0 || -1) * Math.floor(Math.abs(n));
-				}
-			}
-			if (n >= len) {
-				return -1;
-			}
-			var k = n >= 0 ? n : Math.max(len-Math.abs(n), 0);
-			for (; k < len; k++) {
-				if (k in t && t[k] === searchElement) {
-					return k;
-				}
-			}
-			return -1;
-		}
-	}
-}
-// Polyfill for Array.from for IE
-// Copied from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from
-if (!Array.from) {
-  Array.from = (function () {
-    var toStr = Object.prototype.toString;
-    var isCallable = function (fn) {
-      return typeof fn === 'function' || toStr.call(fn) === '[object Function]';
-    };
-    var toInteger = function (value) {
-      var number = Number(value);
-      if (isNaN(number)) { return 0; }
-      if (number === 0 || !isFinite(number)) { return number; }
-      return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
-    };
-    var maxSafeInteger = Math.pow(2, 53) - 1;
-    var toLength = function (value) {
-      var len = toInteger(value);
-      return Math.min(Math.max(len, 0), maxSafeInteger);
-    };
-
-    // The length property of the from method is 1.
-    return function from(arrayLike/*, mapFn, thisArg */) {
-      // 1. Let C be the this value.
-      var C = this;
-
-      // 2. Let items be ToObject(arrayLike).
-      var items = Object(arrayLike);
-
-      // 3. ReturnIfAbrupt(items).
-      if (arrayLike == null) {
-        throw new TypeError('Array.from requires an array-like object - not null or undefined');
-      }
-
-      // 4. If mapfn is undefined, then let mapping be false.
-      var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
-      var T;
-      if (typeof mapFn !== 'undefined') {
-        // 5. else
-        // 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
-        if (!isCallable(mapFn)) {
-          throw new TypeError('Array.from: when provided, the second argument must be a function');
-        }
-
-        // 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined.
-        if (arguments.length > 2) {
-          T = arguments[2];
-        }
-      }
-
-      // 10. Let lenValue be Get(items, "length").
-      // 11. Let len be ToLength(lenValue).
-      var len = toLength(items.length);
-
-      // 13. If IsConstructor(C) is true, then
-      // 13. a. Let A be the result of calling the [[Construct]] internal method 
-      // of C with an argument list containing the single item len.
-      // 14. a. Else, Let A be ArrayCreate(len).
-      var A = isCallable(C) ? Object(new C(len)) : new Array(len);
-
-      // 16. Let k be 0.
-      var k = 0;
-      // 17. Repeat, while k < len… (also steps a - h)
-      var kValue;
-      while (k < len) {
-        kValue = items[k];
-        if (mapFn) {
-          A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k);
-        } else {
-          A[k] = kValue;
-        }
-        k += 1;
-      }
-      // 18. Let putStatus be Put(A, "length", len, true).
-      A.length = len;
-      // 20. Return A.
-      return A;
-    };
-  }());
-}
-
-/**
- * Reload a truncated list
- */
-aTruncatedLists = {}; // To keep track of the list being loaded, each member is an ajaxRequest object
-
-function ReloadTruncatedList(divId, sSerializedFilter, sExtraParams) {
-	$('#'+divId).block();
-	//$('#'+divId).blockUI();
-	if (aTruncatedLists[divId] != undefined) {
-		try {
-			aAjaxRequest = aTruncatedLists[divId];
-			aAjaxRequest.abort();
-		}
-		catch (e) {
-			// Do nothing special, just continue
-			console.log('Uh,uh, exception !');
-		}
-	}
-	aTruncatedLists[divId] = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style=list',
-		{operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams},
-		function (data) {
-			aTruncatedLists[divId] = undefined;
-			if (data.length > 0) {
-				$('#'+divId).html(data);
-				$('#'+divId+' .listResults').tableHover(); // hover tables
-				$('#'+divId+' .listResults').each(function () {
-					var table = $(this);
-					var id = $(this).parent();
-					aTruncatedLists[divId] = undefined;
-					var checkbox = (table.find('th:first :checkbox').length > 0);
-					if (checkbox) {
-						// There is a checkbox in the first column, don't make it sortable
-						table.tablesorter({headers: {0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']}).tablesorterPager({container: $("#pager")}); // sortable and zebra tables
-					}
-					else {
-						// There is NO checkbox in the first column, all columns are considered sortable
-						table.tablesorter({widgets: ['myZebra', 'truncatedList']}).tablesorterPager({container: $("#pager"), totalRows: 97, filter: sSerializedFilter, extra_params: sExtraParams}); // sortable and zebra tables
-					}
-				});
-				$('#'+divId).unblock();
-			}
-		}
-	);
-}
-
-/**
- * Truncate a previously expanded list !
- */
-function TruncateList(divId, iLimit, sNewLabel, sLinkLabel) {
-	$('#'+divId).block();
-	var iCount = 0;
-	$('#'+divId+' table.listResults tr:gt('+iLimit+')').each(function () {
-		$(this).remove();
-	});
-	$('#lbl_'+divId).html(sNewLabel);
-	$('#'+divId+' table.listResults tr:last td').addClass('truncated');
-	$('#'+divId+' table.listResults').addClass('truncated');
-	$('#trc_'+divId).html(sLinkLabel);
-	$('#'+divId+' .listResults').trigger("update"); //  Reset the cache
-	$('#'+divId).unblock();
-}
-
-/**
- * Reload any block -- used for periodic auto-reload
- */
-function ReloadBlock(divId, sStyle, sSerializedFilter, sExtraParams) {
-	// Check if the user is not editing the list properties right now
-	var bDialogOpen = false;
-	var oDataTable = $('#'+divId+' :itop-datatable');
-	var bIsDataTable = false;
-	if (oDataTable.length > 0) {
-		bDialogOpen = oDataTable.datatable('IsDialogOpen');
-		bIsDataTable = true;
-	}
-	if (!bDialogOpen) {
-		if (bIsDataTable) {
-			oDataTable.datatable('DoRefresh');
-		}
-		else {
-			$('#'+divId).block();
-
-			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style='+sStyle,
-				{operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams},
-				function (data) {
-					$('#'+divId).empty();
-					$('#'+divId).append(data);
-					$('#'+divId).removeClass('loading');
-				}
-			);
-		}
-	}
-}
-
-function SaveGroupBySortOrder(sTableId, aValues) {
-	var sDashboardId = $('#'+sTableId).closest('.dashboard_contents').attr('id');
-	var sPrefKey = 'GroupBy_'+sDashboardId+'_'+sTableId;
-	if (aValues.length != 0) {
-		$sValue = JSON.stringify(aValues);
-		if (GetUserPreference(sPrefKey, null) != $sValue) {
-			SetUserPreference(sPrefKey, $sValue, true);
-		}
-	}
-}
-
-function LoadGroupBySortOrder(sTableId) {
-	var sDashboardId = $('#'+sTableId).closest('.dashboard_contents').attr('id');
-	var sPrefKey = 'GroupBy_'+sDashboardId+'_'+sTableId;
-	var sValues = GetUserPreference(sPrefKey, null);
-	if (sValues != null) {
-		aValues = JSON.parse(sValues);
-		window.setTimeout(function () {
-			$('#'+sTableId+' table.listResults').trigger('sorton', [aValues]);
-		}, 50);
-	}
-
-}
-
-/**
- * Update the display and value of a file input widget when the user picks a new file
- */
-function UpdateFileName(id, sNewFileName) {
-	var aPath = sNewFileName.split('\\');
-	var sNewFileName = aPath[aPath.length-1];
-
-	$('#'+id).val(sNewFileName);
-	$('#'+id).trigger('validate');
-	$('#name_'+id).text(sNewFileName);
-	return true;
-}
-
-/**
- * Reload a search form for the specified class
- */
-function ReloadSearchForm(divId, sClassName, sBaseClass, sContext, sTableId, sExtraParams) {
-	var oDiv = $('#ds_'+divId);
-	oDiv.block();
-	// deprecated in jQuery 1.8 
-	//var oFormEvents = $('#ds_'+divId+' form').data('events');
-	var oForm = $('#ds_'+divId+' form');
-	var oFormEvents = $._data(oForm[0], "events");
-
-	// Save the submit handlers
-	aSubmit = new Array();
-	if ((oFormEvents != null) && (oFormEvents.submit != undefined)) {
-		for (var index = 0; index < oFormEvents.submit.length; index++) {
-			aSubmit [index] = {data: oFormEvents.submit[index].data, namespace: oFormEvents.submit[index].namespace, handler: oFormEvents.submit[index].handler};
-		}
-	}
-	sAction = $('#ds_'+divId+' form').attr('action');
-
-	// Save the current values in the form
-	var oMap = {};
-	$('#ds_'+divId+" form :input[name!='']").each(function () {
-		oMap[this.name] = this.value;
-	});
-	oMap.operation = 'search_form';
-	oMap.className = sClassName;
-	oMap.baseClass = sBaseClass;
-	oMap.currentId = divId;
-	oMap._table_id_ = sTableId;
-	oMap.action = sAction;
-	if(sExtraParams['selection_mode'])
-	{
-		oMap.selection_mode = sExtraParams['selection_mode'];
-	}
-	if(sExtraParams['result_list_outer_selector'])
-	{
-		oMap.result_list_outer_selector = sExtraParams['result_list_outer_selector'];
-	}
-	if(sExtraParams['cssCount'])
-	{
-		oMap.css_count = sExtraParams['cssCount'];
-		$(sExtraParams['cssCount']).val(0).trigger('change');
-	}
-	if(sExtraParams['table_inner_id'])
-	{
-		oMap.table_inner_id = sExtraParams['table_inner_id'];
-	}
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,
-		function (data) {
-			oDiv.empty();
-			oDiv.append(data);
-			oDiv.unblock();
-			oDiv.parent().resize(); // Inform the parent that the form has just been (potentially) resized
-			oDiv.find('form').triggerHandler('itop.search.form.reloaded');
-		}
-	);
-}
-
-/**
- * Stores - in a persistent way - user specific preferences
- * depends on a global variable oUserPreferences created/filled by the iTopWebPage
- * that acts as a local -write through- cache
- */
-function SetUserPreference(sPreferenceCode, sPrefValue, bPersistent) {
-	sPreviousValue = undefined;
-	try {
-		sPreviousValue = oUserPreferences[sPreferenceCode];
-	}
-	catch (err) {
-		sPreviousValue = undefined;
-	}
-	oUserPreferences[sPreferenceCode] = sPrefValue;
-	if (bPersistent && (sPrefValue != sPreviousValue)) {
-		ajax_request = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-			{operation: 'set_pref', code: sPreferenceCode, value: sPrefValue}); // Make it persistent
-	}
-}
-
-/**
- * Get user specific preferences
- * depends on a global variable oUserPreferences created/filled by the iTopWebPage
- * that acts as a local -write through- cache
- */
-function GetUserPreference(sPreferenceCode, sDefaultValue) {
-	var value = sDefaultValue;
-	if (oUserPreferences[sPreferenceCode] != undefined) {
-		value = oUserPreferences[sPreferenceCode];
-	}
-	return value;
-}
-
-/**
- * Check/uncheck a whole list of checkboxes
- */
-function CheckAll(sSelector, bValue) {
-	var value = bValue;
-	$(sSelector).each(function () {
-		if (this.checked != value) {
-			this.checked = value;
-			$(this).trigger('change');
-		}
-	});
-}
-
-
-/**
- * Toggle (enabled/disabled) the specified field of a form
- */
-function ToogleField(value, field_id) {
-	if (value) {
-		$('#'+field_id).removeAttr('disabled');
-		// In case the field is rendered as a div containing several inputs (e.g. RedundancySettings)
-		$('#'+field_id+' :input').removeAttr('disabled');
-	}
-	else {
-		$('#'+field_id).attr('disabled', 'disabled');
-		// In case the field is rendered as a div containing several inputs (e.g. RedundancySettings)
-		$('#'+field_id+' :input').attr('disabled', 'disabled');
-	}
-	$('#'+field_id).trigger('update');
-	$('#'+field_id).trigger('validate');
-}
-
-/**
- * For the fields that cannot be visually disabled, they can be blocked
- * @return
- */
-function BlockField(field_id, bBlocked) {
-	if (bBlocked) {
-		$('#'+field_id).block({message: ' ** disabled ** '});
-	}
-	else {
-		$('#'+field_id).unblock();
-	}
-}
-
-/**
- * Updates (enables/disables) a "duration" field
- */
-function ToggleDurationField(field_id) {
-	// Toggle all the subfields that compose the "duration" input
-	aSubFields = new Array('d', 'h', 'm', 's');
-
-	if ($('#'+field_id).attr('disabled')) {
-		for (var i = 0; i < aSubFields.length; i++) {
-			$('#'+field_id+'_'+aSubFields[i]).attr('disabled', 'disabled');
-		}
-	}
-	else {
-		for (var i = 0; i < aSubFields.length; i++) {
-			$('#'+field_id+'_'+aSubFields[i]).removeAttr('disabled');
-		}
-	}
-}
-
-/**
- * PropagateCheckBox
- */
-function PropagateCheckBox(bCurrValue, aFieldsList, bCheck) {
-	if (bCurrValue == bCheck) {
-		for (var i = 0; i < aFieldsList.length; i++) {
-			var sFieldId = aFieldsList[i];
-			$('#enable_'+sFieldId).attr('checked', bCheck);
-			ToogleField(bCheck, sFieldId);
-
-			// Cascade propagation
-            $('#enable_'+sFieldId).trigger('change');
-		}
-	}
-}
-
-function FixTableSorter(table) {
-	if (table[0].config == undefined) {
-		// Table is not sort-able, let's fix it
-		var checkbox = (table.find('th:first :checkbox').length > 0);
-		if (checkbox) {
-			// There is a checkbox in the first column, don't make it sort-able
-			table.tablesorter({headers: {0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']}); // sort-able and zebra tables
-		}
-		else {
-			// There is NO checkbox in the first column, all columns are considered sort-able
-			table.tablesorter({widgets: ['myZebra', 'truncatedList']}); // sort-able and zebra tables
-		}
-	}
-}
-
-function DashletCreationDlg(sOQL, sContext) {
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'dashlet_creation_dlg', oql: sOQL}, function (data) {
-		$('body').append(data);
-	});
-	return false;
-}
-
-function ShortcutListDlg(sOQL, sDataTableId, sContext) {
-	var sDataTableName = 'datatable_'+sDataTableId;
-	var oTableSettings = {
-		oColumns: $('#'+sDataTableName).datatable('option', 'oColumns'),
-		iPageSize: $('#'+sDataTableName).datatable('option', 'iPageSize')
-	};
-	var sTableSettings = JSON.stringify(oTableSettings);
-
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'shortcut_list_dlg', oql: sOQL, table_settings: sTableSettings}, function (data) {
-		$('body').append(data);
-	});
-	return false;
-}
-
-function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle) {
-	var aFields = [];
-	if (sDataTableId != '') {
-		var sDataTableName = 'datatable_'+sDataTableId;
-		var oColumns = $('#'+sDataTableName).datatable('option', 'oColumns');
-		for (var j in oColumns) {
-			for (var k in oColumns[j]) {
-				if (oColumns[j][k].checked) {
-					var sCode = oColumns[j][k].code;
-					if (sCode == '_key_') {
-						sCode = 'id';
-					}
-					aFields.push(j+'.'+sCode);
-				}
-			}
-		}
-	}
-
-	var oParams = {
-		interactive: 1,
-		mode: 'dialog',
-		expression: sOQL,
-		suggested_fields: aFields.join(','),
-		dialog_title: sDlgTitle
-	};
-
-	if (sFormat !== null) {
-		oParams.format = sFormat;
-	}
-
-	$.post(GetAbsoluteUrlAppRoot()+'webservices/export-v2.php', oParams, function (data) {
-		$('body').append(data);
-	});
-	return false;
-}
-
-function ExportToggleFormat(sFormat) {
-	$('.form_part').hide();
-	for (k in window.aFormParts[sFormat]) {
-		$('#form_part_'+window.aFormParts[sFormat][k]).show().trigger('form-part-activate');
-	}
-}
-
-function ExportStartExport() {
-	var oParams = {};
-	$('.form_part:visible :input').each(function () {
-		if (this.name != '') {
-			if ((this.type == 'radio') || (this.type == 'checkbox')) {
-				if (this.checked) {
-					oParams[this.name] = $(this).val();
-				}
-			}
-			else {
-				oParams[this.name] = $(this).val();
-			}
-		}
-	});
-	$(':itop-tabularfieldsselector:visible').tabularfieldsselector('close_all_tooltips');
-	$('#export-form').hide();
-	$('#export-feedback').show();
-	oParams.operation = 'export_build';
-	oParams.format = $('#export-form :input[name=format]').val();
-	var sQueryMode = $(':input[name=query_mode]:checked').val();
-	if ($(':input[name=query_mode]:checked').length > 0) {
-		if (sQueryMode == 'oql') {
-			oParams.expression = $('#export-form :input[name=expression]').val();
-		}
-		else {
-			oParams.query = $('#export-form :input[name=query]').val();
-		}
-	}
-	else {
-		oParams.expression = $('#export-form :input[name=expression]').val();
-		oParams.query = $('#export-form :input[name=query]').val();
-	}
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
-			if (data == null) {
-				ExportError('Export failed (no data provided), please contact your administrator');
-			}
-			else {
-				ExportRun(data);
-			}
-		}, 'json')
-		.fail(function () {
-			ExportError('Export failed, please contact your administrator');
-		});
-}
-
-function ExportError(sMessage) {
-	$('.export-message').html(sMessage);
-	$('.export-progress-bar').hide();
-	$('#export-btn').hide();
-}
-
-function ExportRun(data) {
-	switch (data.code) {
-		case 'run':
-			// Continue
-			$('.export-progress-bar').progressbar({value: data.percentage});
-			$('.export-message').html(data.message);
-			oParams = {};
-			oParams.token = data.token;
-			var sDataState = $('#export-form').attr('data-state');
-			if (sDataState == 'cancelled') {
-				oParams.operation = 'export_cancel';
-			}
-			else {
-				oParams.operation = 'export_build';
-			}
-
-			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
-					ExportRun(data);
-				},
-				'json');
-			break;
-
-		case 'done':
-			$('#export-btn').hide();
-			sMessage = '<a href="'+GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=export_download&token='+data.token+'" target="_blank">'+data.message+'</a>';
-			$('.export-message').html(sMessage);
-			$('.export-progress-bar').hide();
-			$('#export-btn').hide();
-			$('#export-form').attr('data-state', 'done');
-			if (data.text_result != undefined) {
-				if (data.mime_type == 'text/html') {
-					$('#export_content').parent().html(data.text_result);
-					$('#export_text_result').show();
-					$('#export_text_result .listResults').tableHover();
-					$('#export_text_result .listResults').tablesorter({widgets: ['myZebra']});
-				}
-				else {
-					if ($('#export_text_result').closest('ui-dialog').length == 0) {
-						// not inside a dialog box, adjust the height... approximately
-						var jPane = $('#export_text_result').closest('.ui-layout-content');
-						var iTotalHeight = jPane.height();
-						jPane.children(':visible').each(function () {
-							if ($(this).attr('id') != '') {
-								iTotalHeight -= $(this).height();
-							}
-						});
-						$('#export_content').height(iTotalHeight-80);
-					}
-					$('#export_content').val(data.text_result);
-					$('#export_text_result').show();
-				}
-			}
-			$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
-			break;
-
-		case 'error':
-			$('#export-form').attr('data-state', 'error');
-			$('.export-progress-bar').progressbar({value: data.percentage});
-			$('.export-message').html(data.message);
-			$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
-			$('#export-btn').hide();
-		default:
-	}
-}
-
-function ExportInitButton(sSelector) {
-	$(sSelector).on('click', function () {
-		var sDataState = $('#export-form').attr('data-state');
-		switch (sDataState) {
-			case 'not-yet-started':
-				$('.form_part:visible').each(function () {
-					$('#export-form').data('validation_messages', []);
-					var ret = $(this).trigger('validate');
-				});
-				var aMessages = $('#export-form').data('validation_messages');
-
-				if (aMessages.length > 0) {
-					alert(aMessages.join(''));
-					return;
-				}
-				if ($(this).hasClass('ui-button')) {
-					$(this).button('option', 'label', Dict.S('UI:Button:Cancel'));
-				}
-				else {
-					$(this).html(Dict.S('UI:Button:Cancel'));
-				}
-				$('#export-form').attr('data-state', 'running');
-				ExportStartExport();
-				break;
-
-			case 'running':
-				if ($(this).hasClass('ui-button')) {
-					$(this).button('disable');
-				}
-				else {
-					$(this).attr('disabled', 'disabled');
-				}
-				$('#export-form').attr('data-state', 'cancelled');
-				break;
-
-			case 'done':
-			case 'error':
-				$('#interactive_export_dlg').dialog('close');
-				break;
-
-			default:
-			// Do nothing
-		}
-	});
-}
-
-function DisplayHistory(sSelector, sFilter, iCount, iStart) {
-	$(sSelector).block();
-	var oParams = {operation: 'history_from_filter', filter: sFilter, start: iStart, count: iCount};
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
-			$(sSelector).html(data).unblock();
-		}
-	);
-}
-
-// Very simple equivalent to format: placeholders are %1$s %2$d ...
-function Format() {
-	var args = [];
-	var str = '';
-	if (arguments[0] instanceof Array) {
-		str = arguments[0][0].toString();
-		args = arguments[0];
-	}
-	else {
-		str = arguments[0].toString();
-		if (arguments.length > 1) {
-			var t = typeof arguments[1];
-			args = ("string" === t || "number" === t) ? Array.prototype.slice.call(arguments) : arguments[1];
-		}
-	}
-	var key;
-	for (key in args) {
-		str = str.replace(new RegExp("\\%"+key+"\\$.", "gi"), args[key]);
-	}
-
-	return str;
-}
-
-/**
- * Enable to access translation keys client side.
- * The called keys needs to be exported using \WebPage::add_dict_entry
- */
-var Dict = {};
-if (typeof aDictEntries == 'undefined') {
-	Dict._entries = {}; // Entries have not been loaded (we are in the setup ?)
-}
-else {
-	Dict._entries = aDictEntries; // Entries were loaded asynchronously via their own js files	
-}
-Dict.S = function (sEntry) {
-	if (sEntry in Dict._entries) {
-		return Dict._entries[sEntry];
-	}
-	else {
-		return sEntry;
-	}
-};
-Dict.Format = function () {
-	var args = Array.from(arguments);
-	args[0] = Dict.S(arguments[0]);
-	return Format(args);
+// Some general purpose JS functions for the iTop application
+
+//IE 8 compatibility, copied from: https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/IndexOf
+if (!Array.prototype.indexOf) {
+
+	if (false) // deactivated since it causes troubles: for(k in aData) => returns the indexOf function as first element on empty arrays !
+	{
+		Array.prototype.indexOf = function (searchElement /*, fromIndex */) {
+			"use strict";
+			if (this == null) {
+				throw new TypeError();
+			}
+			var t = Object(this);
+			var len = t.length >>> 0;
+			if (len === 0) {
+				return -1;
+			}
+			var n = 0;
+			if (arguments.length > 1) {
+				n = Number(arguments[1]);
+				if (n != n) { // shortcut for verifying if it's NaN
+					n = 0;
+				} else if (n != 0 && n != Infinity && n != -Infinity) {
+					n = (n > 0 || -1) * Math.floor(Math.abs(n));
+				}
+			}
+			if (n >= len) {
+				return -1;
+			}
+			var k = n >= 0 ? n : Math.max(len-Math.abs(n), 0);
+			for (; k < len; k++) {
+				if (k in t && t[k] === searchElement) {
+					return k;
+				}
+			}
+			return -1;
+		}
+	}
+}
+// Polyfill for Array.from for IE
+// Copied from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/from
+if (!Array.from) {
+  Array.from = (function () {
+    var toStr = Object.prototype.toString;
+    var isCallable = function (fn) {
+      return typeof fn === 'function' || toStr.call(fn) === '[object Function]';
+    };
+    var toInteger = function (value) {
+      var number = Number(value);
+      if (isNaN(number)) { return 0; }
+      if (number === 0 || !isFinite(number)) { return number; }
+      return (number > 0 ? 1 : -1) * Math.floor(Math.abs(number));
+    };
+    var maxSafeInteger = Math.pow(2, 53) - 1;
+    var toLength = function (value) {
+      var len = toInteger(value);
+      return Math.min(Math.max(len, 0), maxSafeInteger);
+    };
+
+    // The length property of the from method is 1.
+    return function from(arrayLike/*, mapFn, thisArg */) {
+      // 1. Let C be the this value.
+      var C = this;
+
+      // 2. Let items be ToObject(arrayLike).
+      var items = Object(arrayLike);
+
+      // 3. ReturnIfAbrupt(items).
+      if (arrayLike == null) {
+        throw new TypeError('Array.from requires an array-like object - not null or undefined');
+      }
+
+      // 4. If mapfn is undefined, then let mapping be false.
+      var mapFn = arguments.length > 1 ? arguments[1] : void undefined;
+      var T;
+      if (typeof mapFn !== 'undefined') {
+        // 5. else
+        // 5. a If IsCallable(mapfn) is false, throw a TypeError exception.
+        if (!isCallable(mapFn)) {
+          throw new TypeError('Array.from: when provided, the second argument must be a function');
+        }
+
+        // 5. b. If thisArg was supplied, let T be thisArg; else let T be undefined.
+        if (arguments.length > 2) {
+          T = arguments[2];
+        }
+      }
+
+      // 10. Let lenValue be Get(items, "length").
+      // 11. Let len be ToLength(lenValue).
+      var len = toLength(items.length);
+
+      // 13. If IsConstructor(C) is true, then
+      // 13. a. Let A be the result of calling the [[Construct]] internal method 
+      // of C with an argument list containing the single item len.
+      // 14. a. Else, Let A be ArrayCreate(len).
+      var A = isCallable(C) ? Object(new C(len)) : new Array(len);
+
+      // 16. Let k be 0.
+      var k = 0;
+      // 17. Repeat, while k < len… (also steps a - h)
+      var kValue;
+      while (k < len) {
+        kValue = items[k];
+        if (mapFn) {
+          A[k] = typeof T === 'undefined' ? mapFn(kValue, k) : mapFn.call(T, kValue, k);
+        } else {
+          A[k] = kValue;
+        }
+        k += 1;
+      }
+      // 18. Let putStatus be Put(A, "length", len, true).
+      A.length = len;
+      // 20. Return A.
+      return A;
+    };
+  }());
+}
+
+/**
+ * Reload a truncated list
+ */
+aTruncatedLists = {}; // To keep track of the list being loaded, each member is an ajaxRequest object
+
+function ReloadTruncatedList(divId, sSerializedFilter, sExtraParams) {
+	$('#'+divId).block();
+	//$('#'+divId).blockUI();
+	if (aTruncatedLists[divId] != undefined) {
+		try {
+			aAjaxRequest = aTruncatedLists[divId];
+			aAjaxRequest.abort();
+		}
+		catch (e) {
+			// Do nothing special, just continue
+			console.log('Uh,uh, exception !');
+		}
+	}
+	aTruncatedLists[divId] = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style=list',
+		{operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams},
+		function (data) {
+			aTruncatedLists[divId] = undefined;
+			if (data.length > 0) {
+				$('#'+divId).html(data);
+				$('#'+divId+' .listResults').tableHover(); // hover tables
+				$('#'+divId+' .listResults').each(function () {
+					var table = $(this);
+					var id = $(this).parent();
+					aTruncatedLists[divId] = undefined;
+					var checkbox = (table.find('th:first :checkbox').length > 0);
+					if (checkbox) {
+						// There is a checkbox in the first column, don't make it sortable
+						table.tablesorter({headers: {0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']}).tablesorterPager({container: $("#pager")}); // sortable and zebra tables
+					}
+					else {
+						// There is NO checkbox in the first column, all columns are considered sortable
+						table.tablesorter({widgets: ['myZebra', 'truncatedList']}).tablesorterPager({container: $("#pager"), totalRows: 97, filter: sSerializedFilter, extra_params: sExtraParams}); // sortable and zebra tables
+					}
+				});
+				$('#'+divId).unblock();
+			}
+		}
+	);
+}
+
+/**
+ * Truncate a previously expanded list !
+ */
+function TruncateList(divId, iLimit, sNewLabel, sLinkLabel) {
+	$('#'+divId).block();
+	var iCount = 0;
+	$('#'+divId+' table.listResults tr:gt('+iLimit+')').each(function () {
+		$(this).remove();
+	});
+	$('#lbl_'+divId).html(sNewLabel);
+	$('#'+divId+' table.listResults tr:last td').addClass('truncated');
+	$('#'+divId+' table.listResults').addClass('truncated');
+	$('#trc_'+divId).html(sLinkLabel);
+	$('#'+divId+' .listResults').trigger("update"); //  Reset the cache
+	$('#'+divId).unblock();
+}
+
+/**
+ * Reload any block -- used for periodic auto-reload
+ */
+function ReloadBlock(divId, sStyle, sSerializedFilter, sExtraParams) {
+	// Check if the user is not editing the list properties right now
+	var bDialogOpen = false;
+	var oDataTable = $('#'+divId+' :itop-datatable');
+	var bIsDataTable = false;
+	if (oDataTable.length > 0) {
+		bDialogOpen = oDataTable.datatable('IsDialogOpen');
+		bIsDataTable = true;
+	}
+	if (!bDialogOpen) {
+		if (bIsDataTable) {
+			oDataTable.datatable('DoRefresh');
+		}
+		else {
+			$('#'+divId).block();
+
+			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?style='+sStyle,
+				{operation: 'ajax', filter: sSerializedFilter, extra_params: sExtraParams},
+				function (data) {
+					$('#'+divId).empty();
+					$('#'+divId).append(data);
+					$('#'+divId).removeClass('loading');
+				}
+			);
+		}
+	}
+}
+
+function SaveGroupBySortOrder(sTableId, aValues) {
+	var sDashboardId = $('#'+sTableId).closest('.dashboard_contents').attr('id');
+	var sPrefKey = 'GroupBy_'+sDashboardId+'_'+sTableId;
+	if (aValues.length != 0) {
+		$sValue = JSON.stringify(aValues);
+		if (GetUserPreference(sPrefKey, null) != $sValue) {
+			SetUserPreference(sPrefKey, $sValue, true);
+		}
+	}
+}
+
+function LoadGroupBySortOrder(sTableId) {
+	var sDashboardId = $('#'+sTableId).closest('.dashboard_contents').attr('id');
+	var sPrefKey = 'GroupBy_'+sDashboardId+'_'+sTableId;
+	var sValues = GetUserPreference(sPrefKey, null);
+	if (sValues != null) {
+		aValues = JSON.parse(sValues);
+		window.setTimeout(function () {
+			$('#'+sTableId+' table.listResults').trigger('sorton', [aValues]);
+		}, 50);
+	}
+
+}
+
+/**
+ * Update the display and value of a file input widget when the user picks a new file
+ */
+function UpdateFileName(id, sNewFileName) {
+	var aPath = sNewFileName.split('\\');
+	var sNewFileName = aPath[aPath.length-1];
+
+	$('#'+id).val(sNewFileName);
+	$('#'+id).trigger('validate');
+	$('#name_'+id).text(sNewFileName);
+	return true;
+}
+
+/**
+ * Reload a search form for the specified class
+ */
+function ReloadSearchForm(divId, sClassName, sBaseClass, sContext, sTableId, sExtraParams) {
+	var oDiv = $('#ds_'+divId);
+	oDiv.block();
+	// deprecated in jQuery 1.8 
+	//var oFormEvents = $('#ds_'+divId+' form').data('events');
+	var oForm = $('#ds_'+divId+' form');
+	var oFormEvents = $._data(oForm[0], "events");
+
+	// Save the submit handlers
+	aSubmit = new Array();
+	if ((oFormEvents != null) && (oFormEvents.submit != undefined)) {
+		for (var index = 0; index < oFormEvents.submit.length; index++) {
+			aSubmit [index] = {data: oFormEvents.submit[index].data, namespace: oFormEvents.submit[index].namespace, handler: oFormEvents.submit[index].handler};
+		}
+	}
+	sAction = $('#ds_'+divId+' form').attr('action');
+
+	// Save the current values in the form
+	var oMap = {};
+	$('#ds_'+divId+" form :input[name!='']").each(function () {
+		oMap[this.name] = this.value;
+	});
+	oMap.operation = 'search_form';
+	oMap.className = sClassName;
+	oMap.baseClass = sBaseClass;
+	oMap.currentId = divId;
+	oMap._table_id_ = sTableId;
+	oMap.action = sAction;
+	if(sExtraParams['selection_mode'])
+	{
+		oMap.selection_mode = sExtraParams['selection_mode'];
+	}
+	if(sExtraParams['result_list_outer_selector'])
+	{
+		oMap.result_list_outer_selector = sExtraParams['result_list_outer_selector'];
+	}
+	if(sExtraParams['cssCount'])
+	{
+		oMap.css_count = sExtraParams['cssCount'];
+		$(sExtraParams['cssCount']).val(0).trigger('change');
+	}
+	if(sExtraParams['table_inner_id'])
+	{
+		oMap.table_inner_id = sExtraParams['table_inner_id'];
+	}
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,
+		function (data) {
+			oDiv.empty();
+			oDiv.append(data);
+			oDiv.unblock();
+			oDiv.parent().resize(); // Inform the parent that the form has just been (potentially) resized
+			oDiv.find('form').triggerHandler('itop.search.form.reloaded');
+		}
+	);
+}
+
+/**
+ * Stores - in a persistent way - user specific preferences
+ * depends on a global variable oUserPreferences created/filled by the iTopWebPage
+ * that acts as a local -write through- cache
+ */
+function SetUserPreference(sPreferenceCode, sPrefValue, bPersistent) {
+	sPreviousValue = undefined;
+	try {
+		sPreviousValue = oUserPreferences[sPreferenceCode];
+	}
+	catch (err) {
+		sPreviousValue = undefined;
+	}
+	oUserPreferences[sPreferenceCode] = sPrefValue;
+	if (bPersistent && (sPrefValue != sPreviousValue)) {
+		ajax_request = $.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+			{operation: 'set_pref', code: sPreferenceCode, value: sPrefValue}); // Make it persistent
+	}
+}
+
+/**
+ * Get user specific preferences
+ * depends on a global variable oUserPreferences created/filled by the iTopWebPage
+ * that acts as a local -write through- cache
+ */
+function GetUserPreference(sPreferenceCode, sDefaultValue) {
+	var value = sDefaultValue;
+	if (oUserPreferences[sPreferenceCode] != undefined) {
+		value = oUserPreferences[sPreferenceCode];
+	}
+	return value;
+}
+
+/**
+ * Check/uncheck a whole list of checkboxes
+ */
+function CheckAll(sSelector, bValue) {
+	var value = bValue;
+	$(sSelector).each(function () {
+		if (this.checked != value) {
+			this.checked = value;
+			$(this).trigger('change');
+		}
+	});
+}
+
+
+/**
+ * Toggle (enabled/disabled) the specified field of a form
+ */
+function ToogleField(value, field_id) {
+	if (value) {
+		$('#'+field_id).removeAttr('disabled');
+		// In case the field is rendered as a div containing several inputs (e.g. RedundancySettings)
+		$('#'+field_id+' :input').removeAttr('disabled');
+	}
+	else {
+		$('#'+field_id).attr('disabled', 'disabled');
+		// In case the field is rendered as a div containing several inputs (e.g. RedundancySettings)
+		$('#'+field_id+' :input').attr('disabled', 'disabled');
+	}
+	$('#'+field_id).trigger('update');
+	$('#'+field_id).trigger('validate');
+}
+
+/**
+ * For the fields that cannot be visually disabled, they can be blocked
+ * @return
+ */
+function BlockField(field_id, bBlocked) {
+	if (bBlocked) {
+		$('#'+field_id).block({message: ' ** disabled ** '});
+	}
+	else {
+		$('#'+field_id).unblock();
+	}
+}
+
+/**
+ * Updates (enables/disables) a "duration" field
+ */
+function ToggleDurationField(field_id) {
+	// Toggle all the subfields that compose the "duration" input
+	aSubFields = new Array('d', 'h', 'm', 's');
+
+	if ($('#'+field_id).attr('disabled')) {
+		for (var i = 0; i < aSubFields.length; i++) {
+			$('#'+field_id+'_'+aSubFields[i]).attr('disabled', 'disabled');
+		}
+	}
+	else {
+		for (var i = 0; i < aSubFields.length; i++) {
+			$('#'+field_id+'_'+aSubFields[i]).removeAttr('disabled');
+		}
+	}
+}
+
+/**
+ * PropagateCheckBox
+ */
+function PropagateCheckBox(bCurrValue, aFieldsList, bCheck) {
+	if (bCurrValue == bCheck) {
+		for (var i = 0; i < aFieldsList.length; i++) {
+			var sFieldId = aFieldsList[i];
+			$('#enable_'+sFieldId).attr('checked', bCheck);
+			ToogleField(bCheck, sFieldId);
+
+			// Cascade propagation
+            $('#enable_'+sFieldId).trigger('change');
+		}
+	}
+}
+
+function FixTableSorter(table) {
+	if (table[0].config == undefined) {
+		// Table is not sort-able, let's fix it
+		var checkbox = (table.find('th:first :checkbox').length > 0);
+		if (checkbox) {
+			// There is a checkbox in the first column, don't make it sort-able
+			table.tablesorter({headers: {0: {sorter: false}}, widgets: ['myZebra', 'truncatedList']}); // sort-able and zebra tables
+		}
+		else {
+			// There is NO checkbox in the first column, all columns are considered sort-able
+			table.tablesorter({widgets: ['myZebra', 'truncatedList']}); // sort-able and zebra tables
+		}
+	}
+}
+
+function DashletCreationDlg(sOQL, sContext) {
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'dashlet_creation_dlg', oql: sOQL}, function (data) {
+		$('body').append(data);
+	});
+	return false;
+}
+
+function ShortcutListDlg(sOQL, sDataTableId, sContext) {
+	var sDataTableName = 'datatable_'+sDataTableId;
+	var oTableSettings = {
+		oColumns: $('#'+sDataTableName).datatable('option', 'oColumns'),
+		iPageSize: $('#'+sDataTableName).datatable('option', 'iPageSize')
+	};
+	var sTableSettings = JSON.stringify(oTableSettings);
+
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, {operation: 'shortcut_list_dlg', oql: sOQL, table_settings: sTableSettings}, function (data) {
+		$('body').append(data);
+	});
+	return false;
+}
+
+function ExportListDlg(sOQL, sDataTableId, sFormat, sDlgTitle) {
+	var aFields = [];
+	if (sDataTableId != '') {
+		var sDataTableName = 'datatable_'+sDataTableId;
+		var oColumns = $('#'+sDataTableName).datatable('option', 'oColumns');
+		for (var j in oColumns) {
+			for (var k in oColumns[j]) {
+				if (oColumns[j][k].checked) {
+					var sCode = oColumns[j][k].code;
+					if (sCode == '_key_') {
+						sCode = 'id';
+					}
+					aFields.push(j+'.'+sCode);
+				}
+			}
+		}
+	}
+
+	var oParams = {
+		interactive: 1,
+		mode: 'dialog',
+		expression: sOQL,
+		suggested_fields: aFields.join(','),
+		dialog_title: sDlgTitle
+	};
+
+	if (sFormat !== null) {
+		oParams.format = sFormat;
+	}
+
+	$.post(GetAbsoluteUrlAppRoot()+'webservices/export-v2.php', oParams, function (data) {
+		$('body').append(data);
+	});
+	return false;
+}
+
+function ExportToggleFormat(sFormat) {
+	$('.form_part').hide();
+	for (k in window.aFormParts[sFormat]) {
+		$('#form_part_'+window.aFormParts[sFormat][k]).show().trigger('form-part-activate');
+	}
+}
+
+function ExportStartExport() {
+	var oParams = {};
+	$('.form_part:visible :input').each(function () {
+		if (this.name != '') {
+			if ((this.type == 'radio') || (this.type == 'checkbox')) {
+				if (this.checked) {
+					oParams[this.name] = $(this).val();
+				}
+			}
+			else {
+				oParams[this.name] = $(this).val();
+			}
+		}
+	});
+	$(':itop-tabularfieldsselector:visible').tabularfieldsselector('close_all_tooltips');
+	$('#export-form').hide();
+	$('#export-feedback').show();
+	oParams.operation = 'export_build';
+	oParams.format = $('#export-form :input[name=format]').val();
+	var sQueryMode = $(':input[name=query_mode]:checked').val();
+	if ($(':input[name=query_mode]:checked').length > 0) {
+		if (sQueryMode == 'oql') {
+			oParams.expression = $('#export-form :input[name=expression]').val();
+		}
+		else {
+			oParams.query = $('#export-form :input[name=query]').val();
+		}
+	}
+	else {
+		oParams.expression = $('#export-form :input[name=expression]').val();
+		oParams.query = $('#export-form :input[name=query]').val();
+	}
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
+			if (data == null) {
+				ExportError('Export failed (no data provided), please contact your administrator');
+			}
+			else {
+				ExportRun(data);
+			}
+		}, 'json')
+		.fail(function () {
+			ExportError('Export failed, please contact your administrator');
+		});
+}
+
+function ExportError(sMessage) {
+	$('.export-message').html(sMessage);
+	$('.export-progress-bar').hide();
+	$('#export-btn').hide();
+}
+
+function ExportRun(data) {
+	switch (data.code) {
+		case 'run':
+			// Continue
+			$('.export-progress-bar').progressbar({value: data.percentage});
+			$('.export-message').html(data.message);
+			oParams = {};
+			oParams.token = data.token;
+			var sDataState = $('#export-form').attr('data-state');
+			if (sDataState == 'cancelled') {
+				oParams.operation = 'export_cancel';
+			}
+			else {
+				oParams.operation = 'export_build';
+			}
+
+			$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
+					ExportRun(data);
+				},
+				'json');
+			break;
+
+		case 'done':
+			$('#export-btn').hide();
+			sMessage = '<a href="'+GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=export_download&token='+data.token+'" target="_blank">'+data.message+'</a>';
+			$('.export-message').html(sMessage);
+			$('.export-progress-bar').hide();
+			$('#export-btn').hide();
+			$('#export-form').attr('data-state', 'done');
+			if (data.text_result != undefined) {
+				if (data.mime_type == 'text/html') {
+					$('#export_content').parent().html(data.text_result);
+					$('#export_text_result').show();
+					$('#export_text_result .listResults').tableHover();
+					$('#export_text_result .listResults').tablesorter({widgets: ['myZebra']});
+				}
+				else {
+					if ($('#export_text_result').closest('ui-dialog').length == 0) {
+						// not inside a dialog box, adjust the height... approximately
+						var jPane = $('#export_text_result').closest('.ui-layout-content');
+						var iTotalHeight = jPane.height();
+						jPane.children(':visible').each(function () {
+							if ($(this).attr('id') != '') {
+								iTotalHeight -= $(this).height();
+							}
+						});
+						$('#export_content').height(iTotalHeight-80);
+					}
+					$('#export_content').val(data.text_result);
+					$('#export_text_result').show();
+				}
+			}
+			$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
+			break;
+
+		case 'error':
+			$('#export-form').attr('data-state', 'error');
+			$('.export-progress-bar').progressbar({value: data.percentage});
+			$('.export-message').html(data.message);
+			$('#export-dlg-submit').button('option', 'label', Dict.S('UI:Button:Done')).button('enable');
+			$('#export-btn').hide();
+		default:
+	}
+}
+
+function ExportInitButton(sSelector) {
+	$(sSelector).on('click', function () {
+		var sDataState = $('#export-form').attr('data-state');
+		switch (sDataState) {
+			case 'not-yet-started':
+				$('.form_part:visible').each(function () {
+					$('#export-form').data('validation_messages', []);
+					var ret = $(this).trigger('validate');
+				});
+				var aMessages = $('#export-form').data('validation_messages');
+
+				if (aMessages.length > 0) {
+					alert(aMessages.join(''));
+					return;
+				}
+				if ($(this).hasClass('ui-button')) {
+					$(this).button('option', 'label', Dict.S('UI:Button:Cancel'));
+				}
+				else {
+					$(this).html(Dict.S('UI:Button:Cancel'));
+				}
+				$('#export-form').attr('data-state', 'running');
+				ExportStartExport();
+				break;
+
+			case 'running':
+				if ($(this).hasClass('ui-button')) {
+					$(this).button('disable');
+				}
+				else {
+					$(this).attr('disabled', 'disabled');
+				}
+				$('#export-form').attr('data-state', 'cancelled');
+				break;
+
+			case 'done':
+			case 'error':
+				$('#interactive_export_dlg').dialog('close');
+				break;
+
+			default:
+			// Do nothing
+		}
+	});
+}
+
+function DisplayHistory(sSelector, sFilter, iCount, iStart) {
+	$(sSelector).block();
+	var oParams = {operation: 'history_from_filter', filter: sFilter, start: iStart, count: iCount};
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php', oParams, function (data) {
+			$(sSelector).html(data).unblock();
+		}
+	);
+}
+
+// Very simple equivalent to format: placeholders are %1$s %2$d ...
+function Format() {
+	var args = [];
+	var str = '';
+	if (arguments[0] instanceof Array) {
+		str = arguments[0][0].toString();
+		args = arguments[0];
+	}
+	else {
+		str = arguments[0].toString();
+		if (arguments.length > 1) {
+			var t = typeof arguments[1];
+			args = ("string" === t || "number" === t) ? Array.prototype.slice.call(arguments) : arguments[1];
+		}
+	}
+	var key;
+	for (key in args) {
+		str = str.replace(new RegExp("\\%"+key+"\\$.", "gi"), args[key]);
+	}
+
+	return str;
+}
+
+/**
+ * Enable to access translation keys client side.
+ * The called keys needs to be exported using \WebPage::add_dict_entry
+ */
+var Dict = {};
+if (typeof aDictEntries == 'undefined') {
+	Dict._entries = {}; // Entries have not been loaded (we are in the setup ?)
+}
+else {
+	Dict._entries = aDictEntries; // Entries were loaded asynchronously via their own js files	
+}
+Dict.S = function (sEntry) {
+	if (sEntry in Dict._entries) {
+		return Dict._entries[sEntry];
+	}
+	else {
+		return sEntry;
+	}
+};
+Dict.Format = function () {
+	var args = Array.from(arguments);
+	args[0] = Dict.S(arguments[0]);
+	return Format(args);
 }
\ No newline at end of file
diff --git a/js/wizard.utils.js b/js/wizard.utils.js
index d392c36dc..5017b9ab0 100644
--- a/js/wizard.utils.js
+++ b/js/wizard.utils.js
@@ -1,147 +1,147 @@
-//
-// Set of functions to manage the controls in a wizard
-//
-function UpdateObjectList(sClass, sId, sExtKeyToRemote)
-{
-	aRelatedObjectIds = GetObjectIds(sId, sExtKeyToRemote);
-	if (aRelatedObjectIds.length == 0)
-	{
-		aRelatedObjectIds[0] = 0;
-	}
-	var oql = "SELECT "+sClass+" AS c WHERE c.id IN (" + aRelatedObjectIds.join(", ") + ")";
-	$.post(GetAbsoluteUrlAppRoot()+"ajax.render.php?style=list&encoding=oql",
-	   { operation: "ajax", filter: oql },
-	   function(data){
-		 $("#related_objects_"+sId).empty();
-		 $("#related_objects_"+sId).append(data);
-		 $("#related_objects_"+sId).removeClass("loading");
-		});
-}
-
-function AddObject(sClass, sId, sExtKeyToRemote)
-{
-	var sCurrentObjectId = new String($('#ac_current_object_id_'+sId).val());
-	// Display the additional dialog
-	$('#LinkDlg_'+sId).dialog('open');
-	return;
-}
-
-function ManageObjects(sTitle, sClass, sId, sExtKeyToRemote)
-{
-	aObjList = GetObjectIds(sId, sExtKeyToRemote);
-	if (aObjList.length == 0)
-	{
-		aObjList[0] = 0;
-	}
-	Manage_LoadSelect('selected_objects_'+sId, 'SELECT '+sClass+' WHERE id IN (' + aObjList.join(', ') + ')'); // id is a reserved keyword always representing the primary key
-	Manage_LoadSelect('available_objects_'+sId, 'SELECT '+sClass+' WHERE id NOT IN (' + aObjList.join(', ') + ')');
-	$('#ManageObjectsDlg_'+sId).dialog('option', {title: sTitle});
-	$('#ManageObjectsDlg_'+sId).dialog('open');
-}
-
-function Manage_LoadSelect(sSelectedId, sFilter)
-{
- 	$('#'+sSelectedId).addClass('loading');
-	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-	   { operation: 'combo_options', filter: sFilter },
-	   function(data){
-		 $('#'+sSelectedId).empty();
-		 $('#'+sSelectedId).append(data);
-		 $('#'+sSelectedId).removeClass('loading');
-		}
-	 );
-}
-
-function Manage_SwapSelectedObjects(oSourceSelect, oDestinationSelect, sId)
-{
-	j = oDestinationSelect.options.length;
-	for (i=oSourceSelect.length-1;i>=0;i--) // Count down because we are removing the indexes from the combo
-	{
-		if (oSourceSelect.options[i].selected)
-		{
-			var newOption = document.createElement('option');
-			newOption.text = oSourceSelect.options[i].text;
-			newOption.value = oSourceSelect.options[i].value;
-			oDestinationSelect.options[j++] = newOption;
-			oSourceSelect.remove(i);
-		}
-	}
-	Manage_UpdateButtons(sId);
-}
-
-function Manage_UpdateButtons(sId)
-{
-	var oSrc = document.getElementById('available_objects_'+sId);
-	var oAddBtn = document.getElementById('btn_add_objects_'+sId)
-	var oDst = document.getElementById('selected_objects_'+sId);
-	var oRemoveBtn = document.getElementById('btn_remove_objects_'+sId)
-	if (oSrc.selectedIndex == -1)
-	{
-		oAddBtn.disabled = true;
-	}
-	else
-	{
-		oAddBtn.disabled = false;
-	}
-	if (oDst.selectedIndex == -1)
-	{
-		oRemoveBtn.disabled = true;
-	}
-	else
-	{
-		oRemoveBtn.disabled = false;
-	}
-}
-
-function Manage_AddObjects(sId)
-{
-	var oSrc = document.getElementById('available_objects_'+sId);
-	var oDst = document.getElementById('selected_objects_'+sId);
-	Manage_SwapSelectedObjects(oSrc, oDst, sId);
-}
-
-function Manage_RemoveObjects(sId)
-{
-	var oSrc = document.getElementById('selected_objects_'+sId);
-	var oDst = document.getElementById('available_objects_'+sId);
-	Manage_SwapSelectedObjects(oSrc, oDst, sId);
-}
-
-//function Manage_Ok(sClass, sExtKeyToRemote)
-//{
-//	var objectsToAdd = document.getElementById('selected_objects');
-//	var aSelectedObjects = new Array();
-//	for (i=0; i<objectsToAdd.length;i++)
-//	{
-//		aSelectedObjects[aSelectedObjects.length] = objectsToAdd.options[i].value;
-//	}
-//	$('#related_object_ids').val(aSelectedObjects.join(' '));
-//	UpdateObjectList(sClass, sExtKeyToRemote);
-//}
-
-function FilterLeft(sClass)
-{
-	alert('Not Yet Implemented');
-}
-
-function FilterRight(sClass)
-{
-	alert('Not Yet Implemented');
-}
-
-function GetObjectIds(sInputId, sExtKeyToRemote)
-{
-	aLinkedIds = new Array;
-	sLinkedSet = $('#'+sInputId).val();
-	//console.log('(sInputId: '+sInputId+') => sLinkedSet: '+sLinkedSet);
-	if (sLinkedSet != '')
-	{
-		aLinkedSet = JSON.parse(sLinkedSet);
-		for(i=0; i<aLinkedSet.length; i++)
-		{
-			aLinkedIds[aLinkedIds.length] = aLinkedSet[i][sExtKeyToRemote];
-		}
-	}
-	return aLinkedIds;
-}
-
+//
+// Set of functions to manage the controls in a wizard
+//
+function UpdateObjectList(sClass, sId, sExtKeyToRemote)
+{
+	aRelatedObjectIds = GetObjectIds(sId, sExtKeyToRemote);
+	if (aRelatedObjectIds.length == 0)
+	{
+		aRelatedObjectIds[0] = 0;
+	}
+	var oql = "SELECT "+sClass+" AS c WHERE c.id IN (" + aRelatedObjectIds.join(", ") + ")";
+	$.post(GetAbsoluteUrlAppRoot()+"ajax.render.php?style=list&encoding=oql",
+	   { operation: "ajax", filter: oql },
+	   function(data){
+		 $("#related_objects_"+sId).empty();
+		 $("#related_objects_"+sId).append(data);
+		 $("#related_objects_"+sId).removeClass("loading");
+		});
+}
+
+function AddObject(sClass, sId, sExtKeyToRemote)
+{
+	var sCurrentObjectId = new String($('#ac_current_object_id_'+sId).val());
+	// Display the additional dialog
+	$('#LinkDlg_'+sId).dialog('open');
+	return;
+}
+
+function ManageObjects(sTitle, sClass, sId, sExtKeyToRemote)
+{
+	aObjList = GetObjectIds(sId, sExtKeyToRemote);
+	if (aObjList.length == 0)
+	{
+		aObjList[0] = 0;
+	}
+	Manage_LoadSelect('selected_objects_'+sId, 'SELECT '+sClass+' WHERE id IN (' + aObjList.join(', ') + ')'); // id is a reserved keyword always representing the primary key
+	Manage_LoadSelect('available_objects_'+sId, 'SELECT '+sClass+' WHERE id NOT IN (' + aObjList.join(', ') + ')');
+	$('#ManageObjectsDlg_'+sId).dialog('option', {title: sTitle});
+	$('#ManageObjectsDlg_'+sId).dialog('open');
+}
+
+function Manage_LoadSelect(sSelectedId, sFilter)
+{
+ 	$('#'+sSelectedId).addClass('loading');
+	$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+	   { operation: 'combo_options', filter: sFilter },
+	   function(data){
+		 $('#'+sSelectedId).empty();
+		 $('#'+sSelectedId).append(data);
+		 $('#'+sSelectedId).removeClass('loading');
+		}
+	 );
+}
+
+function Manage_SwapSelectedObjects(oSourceSelect, oDestinationSelect, sId)
+{
+	j = oDestinationSelect.options.length;
+	for (i=oSourceSelect.length-1;i>=0;i--) // Count down because we are removing the indexes from the combo
+	{
+		if (oSourceSelect.options[i].selected)
+		{
+			var newOption = document.createElement('option');
+			newOption.text = oSourceSelect.options[i].text;
+			newOption.value = oSourceSelect.options[i].value;
+			oDestinationSelect.options[j++] = newOption;
+			oSourceSelect.remove(i);
+		}
+	}
+	Manage_UpdateButtons(sId);
+}
+
+function Manage_UpdateButtons(sId)
+{
+	var oSrc = document.getElementById('available_objects_'+sId);
+	var oAddBtn = document.getElementById('btn_add_objects_'+sId)
+	var oDst = document.getElementById('selected_objects_'+sId);
+	var oRemoveBtn = document.getElementById('btn_remove_objects_'+sId)
+	if (oSrc.selectedIndex == -1)
+	{
+		oAddBtn.disabled = true;
+	}
+	else
+	{
+		oAddBtn.disabled = false;
+	}
+	if (oDst.selectedIndex == -1)
+	{
+		oRemoveBtn.disabled = true;
+	}
+	else
+	{
+		oRemoveBtn.disabled = false;
+	}
+}
+
+function Manage_AddObjects(sId)
+{
+	var oSrc = document.getElementById('available_objects_'+sId);
+	var oDst = document.getElementById('selected_objects_'+sId);
+	Manage_SwapSelectedObjects(oSrc, oDst, sId);
+}
+
+function Manage_RemoveObjects(sId)
+{
+	var oSrc = document.getElementById('selected_objects_'+sId);
+	var oDst = document.getElementById('available_objects_'+sId);
+	Manage_SwapSelectedObjects(oSrc, oDst, sId);
+}
+
+//function Manage_Ok(sClass, sExtKeyToRemote)
+//{
+//	var objectsToAdd = document.getElementById('selected_objects');
+//	var aSelectedObjects = new Array();
+//	for (i=0; i<objectsToAdd.length;i++)
+//	{
+//		aSelectedObjects[aSelectedObjects.length] = objectsToAdd.options[i].value;
+//	}
+//	$('#related_object_ids').val(aSelectedObjects.join(' '));
+//	UpdateObjectList(sClass, sExtKeyToRemote);
+//}
+
+function FilterLeft(sClass)
+{
+	alert('Not Yet Implemented');
+}
+
+function FilterRight(sClass)
+{
+	alert('Not Yet Implemented');
+}
+
+function GetObjectIds(sInputId, sExtKeyToRemote)
+{
+	aLinkedIds = new Array;
+	sLinkedSet = $('#'+sInputId).val();
+	//console.log('(sInputId: '+sInputId+') => sLinkedSet: '+sLinkedSet);
+	if (sLinkedSet != '')
+	{
+		aLinkedSet = JSON.parse(sLinkedSet);
+		for(i=0; i<aLinkedSet.length; i++)
+		{
+			aLinkedIds[aLinkedIds.length] = aLinkedSet[i][sExtKeyToRemote];
+		}
+	}
+	return aLinkedIds;
+}
+
diff --git a/js/wizardhelper.js b/js/wizardhelper.js
index cfe22ac1c..611cbd398 100644
--- a/js/wizardhelper.js
+++ b/js/wizardhelper.js
@@ -1,261 +1,261 @@
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-// Wizard Helper JavaScript class to communicate with the WizardHelper PHP class
-
-if (!Array.prototype.indexOf) // Emulation of the indexOf function for IE and old browsers
-{
-	Array.prototype.indexOf = function(elt /*, from*/)
-	{
-		var len = this.length;
-		var from = Number(arguments[1]) || 0;
-		from = (from < 0) ? Math.ceil(from) : Math.floor(from);
-
-		if (from < 0) from += len;
-		for (; from < len; from++)
-		{
-			if (from in this && this[from] === elt) return from;
-		}
-		return -1;
-	};
-}
-
-function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus)
-{
-	this.m_oData = { 'm_sClass' : '',
-					 'm_oFieldsMap': {},
-					 'm_oCurrentValues': {},
-					 'm_aDefaultValueRequested': [],
-					 'm_aAllowedValuesRequested': [],
-					 'm_oDefaultValue': {},
-					 'm_oAllowedValues': {},
-					 'm_iFieldsCount' : 0,
-					 'm_sFormPrefix' : sFormPrefix,
-					 'm_sState': sState
-					};
-	this.m_oData.m_sClass = sClass;
-
-	// Setting optional transition data
-	if(sInitialState !== undefined)
-	{
-		this.m_oData.m_sInitialState = sInitialState;
-	}
-	if(sStimulus !== undefined)
-	{
-		this.m_oData.m_sStimulus = sStimulus;
-	}
-
-	// Methods
-	this.SetFieldsMap = function (oFieldsMap)
-	{
-		this.m_oData.m_oFieldsMap = oFieldsMap;
-	};
-	
-	this.SetFieldsCount = function (count)
-	{
-		this.m_oData.m_iFieldsCount = count;
-	};
-	
-	this.GetFieldId = function(sFieldName)
-	{
-		id = this.m_oData.m_oFieldsMap[sFieldName];
-		return id;
-	};
-
-	this.RequestDefaultValue = function (sFieldName)
-	{
-		currentValue = this.UpdateCurrentValue(sFieldName);
-		if (currentValue == null)
-		{
-			this.m_oData.m_aDefaultValueRequested.push(sFieldName);
-		}
-	};
-	
-	this.RequestAllowedValues = function (sFieldName)
-	{
-		this.m_oData.m_aAllowedValuesRequested.push(sFieldName);
-	};
-	
-	this.SetCurrentValue = function (sFieldName, currentValue)
-	{
-		this.m_oData.m_oCurrentValues[sFieldName] = currentValue;
-	};
-	
-	this.ToJSON = function ()
-	{
-		return JSON.stringify(this.m_oData);
-	};
-	
-	this.FromJSON = function (sJSON)
-	{
-		//console.log('Parsing JSON:'+sJSON);
-		this.m_oData = JSON.parse(sJSON);
-	};
-
-	this.ResetQuery = function ()
-	{
-		this.m_oData.m_aDefaultValueRequested = [];
-		this.m_oData.m_oDefaultValue = {};
-		this.m_oData.m_aAllowedValuesRequested = [];
-		this.m_oData.m_oAllowedValues = {};
-	};
-	
-	this.UpdateFields = function ()
-	{
-		var aRefreshed = [];
-		//console.log('** UpdateFields **');
-		// Set the full HTML for the input field
-		for(i=0; i<this.m_oData.m_aAllowedValuesRequested.length; i++)
-		{
-			var sAttCode = this.m_oData.m_aAllowedValuesRequested[i];
-			var sFieldId = this.m_oData.m_oFieldsMap[sAttCode];
-			var bDisabled = $('#'+sFieldId).attr('disabled');
-			//console.log('Setting #field_'+sFieldId+' to: '+this.m_oData.m_oAllowedValues[sAttCode]);
-			$('#field_'+sFieldId).html(this.m_oData.m_oAllowedValues[sAttCode]);
-			if (bDisabled)
-			{
-				$('#'+sFieldId).attr('disabled', 'disabled');
-				//$('#'+sFieldId).trigger('update'); // Propagate the disable
-			}
-			aRefreshed.push(sFieldId);
-		}
-		// Set the actual value of the input
-		for(i=0; i<this.m_oData.m_aDefaultValueRequested.length; i++)
-		{
-			sAttCode = this.m_oData.m_aDefaultValueRequested[i];
-			defaultValue = this.m_oData.m_oDefaultValue[sAttCode];
-			sFieldId = this.m_oData.m_oFieldsMap[sAttCode];	
-			$('#'+sFieldId).val(defaultValue);
-			if (!aRefreshed.indexOf(sFieldId))
-			{
-				aRefreshed.push(sFieldId);
-			}
-		}
-		// For each "refreshed" field, asynchronously trigger a change in case there are dependent fields to update
-		for(i=0; i<aRefreshed.length; i++)
-		{
-			var sString = "$('#"+aRefreshed[i]+"').trigger('change').trigger('update');";
-			window.setTimeout(sString, 1); // Synchronous 'trigger' does nothing, call it asynchronously
-		}
-	};
-	
-	this.UpdateWizard = function ()
-	{
-		//console.log('** UpdateWizard **')
-		for(sFieldCode in this.m_oData.m_oFieldsMap)
-		{
-			sCleanFieldCode = sFieldCode.replace('"', '');
-			//console.log(sFieldCode);
-			this.UpdateCurrentValue(sCleanFieldCode);
-		}
-	};
-	
-	this.UpdateWizardToJSON = function ()
-	{
-		this.UpdateWizard();
-		return this.ToJSON();
-	};
-	
-	this.AjaxQueryServer = function ()
-	{
-		//console.log('data sent:', this.ToJSON());
-		//console.log('oWizard:', this);
-		$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-		   { operation: 'wizard_helper', json_obj: this.ToJSON() },
-			function(html){
-				$('#ajax_content').html(html);
-				$('.blockUI').parent().unblock();
-				//console.log('data received:', oWizardHelper);
-				//oWizardHelper.FromJSON(json_data);
-				//oWizardHelper.UpdateFields(); // Is done directly in the html provided by ajax.render.php
-				//console.log(oWizardHelper);
-				//$('#wizStep'+ G_iCurrentStep).unblock( {fadeOut: 0} );
-			});
-	};
-	
-	this.Preview = function (divId)
-	{
-		//console.log('data sent:', this.ToJSON());
-		//console.log('oWizard:', this);
-		$('#'+divId).load(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=wizard_helper_preview',
-		   	{'json_obj': this.ToJSON()},
-			function(responseText, textStatus, XMLHttpRequest){
-				$('#wizStep'+ G_iCurrentStep).unblock( {fadeOut: 0} );
-			});
-	};
-	
-	this.UpdateCurrentValue = function (sFieldCode)
-	{
-		$('#'+this.m_oData.m_oFieldsMap[sFieldCode]).trigger('update_value'); // Give the widget a chance to update its value (if it is aware of this event)
-		value = $('#'+this.m_oData.m_oFieldsMap[sFieldCode]).val();
-		if (value == '')
-		{
-			value = null;
-		}
-		this.m_oData.m_oCurrentValues[sFieldCode] = value;
-		return value;		
-	};
-
-	this.UpdateDependentFields = function(aFieldNames)
-	{
-		index = 0;
-		this.ResetQuery();
-		this.UpdateWizard();
-		while(index < aFieldNames.length )
-		{
-			sAttCode = aFieldNames[index];
-			sFieldId = this.GetFieldId(sAttCode);
-			if (sFieldId !== undefined) {
-				$('#fstatus_' + sFieldId).html('<img src="../images/indicator.gif" />');
-				$('#field_' + sFieldId).find('div').block({
-					message: '',
-					overlayCSS: {backgroundColor: '#f1f1f1', opacity: 0.3}
-				});
-				this.RequestAllowedValues(sAttCode);
-			}
-			index++;
-		}
-		this.AjaxQueryServer();
-	};
-	
-	this.ReloadObjectCreationForm = function(sFormId, sTargetState)
-	{
-		$('#'+sFormId).block();
-		this.UpdateWizard();
-		this.ResetQuery();
-		var sTransactionId = $('input[name=transaction_id]').val();
-		$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
-			{ json_obj: this.ToJSON(), operation: 'obj_creation_form', target_state: sTargetState, transaction_id: sTransactionId },
-			function(data)
-			{
-				// Delete any previous instances of CKEditor
-				$('#'+sFormId).find('.htmlEditor').each(function() {
-					var sId = $(this).attr('id');
-					var editorInst = CKEDITOR.instances[sId];
-				    if (editorInst.status == 'ready')
-				    {
-				    	editorInst.destroy(true);
-				    }
-				});
-
-				$('#'+sFormId).html(data);
-				onDelayedReady();
-				$('#'+sFormId).unblock();
-			}
-		);		
-	};
-}
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+// Wizard Helper JavaScript class to communicate with the WizardHelper PHP class
+
+if (!Array.prototype.indexOf) // Emulation of the indexOf function for IE and old browsers
+{
+	Array.prototype.indexOf = function(elt /*, from*/)
+	{
+		var len = this.length;
+		var from = Number(arguments[1]) || 0;
+		from = (from < 0) ? Math.ceil(from) : Math.floor(from);
+
+		if (from < 0) from += len;
+		for (; from < len; from++)
+		{
+			if (from in this && this[from] === elt) return from;
+		}
+		return -1;
+	};
+}
+
+function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus)
+{
+	this.m_oData = { 'm_sClass' : '',
+					 'm_oFieldsMap': {},
+					 'm_oCurrentValues': {},
+					 'm_aDefaultValueRequested': [],
+					 'm_aAllowedValuesRequested': [],
+					 'm_oDefaultValue': {},
+					 'm_oAllowedValues': {},
+					 'm_iFieldsCount' : 0,
+					 'm_sFormPrefix' : sFormPrefix,
+					 'm_sState': sState
+					};
+	this.m_oData.m_sClass = sClass;
+
+	// Setting optional transition data
+	if(sInitialState !== undefined)
+	{
+		this.m_oData.m_sInitialState = sInitialState;
+	}
+	if(sStimulus !== undefined)
+	{
+		this.m_oData.m_sStimulus = sStimulus;
+	}
+
+	// Methods
+	this.SetFieldsMap = function (oFieldsMap)
+	{
+		this.m_oData.m_oFieldsMap = oFieldsMap;
+	};
+	
+	this.SetFieldsCount = function (count)
+	{
+		this.m_oData.m_iFieldsCount = count;
+	};
+	
+	this.GetFieldId = function(sFieldName)
+	{
+		id = this.m_oData.m_oFieldsMap[sFieldName];
+		return id;
+	};
+
+	this.RequestDefaultValue = function (sFieldName)
+	{
+		currentValue = this.UpdateCurrentValue(sFieldName);
+		if (currentValue == null)
+		{
+			this.m_oData.m_aDefaultValueRequested.push(sFieldName);
+		}
+	};
+	
+	this.RequestAllowedValues = function (sFieldName)
+	{
+		this.m_oData.m_aAllowedValuesRequested.push(sFieldName);
+	};
+	
+	this.SetCurrentValue = function (sFieldName, currentValue)
+	{
+		this.m_oData.m_oCurrentValues[sFieldName] = currentValue;
+	};
+	
+	this.ToJSON = function ()
+	{
+		return JSON.stringify(this.m_oData);
+	};
+	
+	this.FromJSON = function (sJSON)
+	{
+		//console.log('Parsing JSON:'+sJSON);
+		this.m_oData = JSON.parse(sJSON);
+	};
+
+	this.ResetQuery = function ()
+	{
+		this.m_oData.m_aDefaultValueRequested = [];
+		this.m_oData.m_oDefaultValue = {};
+		this.m_oData.m_aAllowedValuesRequested = [];
+		this.m_oData.m_oAllowedValues = {};
+	};
+	
+	this.UpdateFields = function ()
+	{
+		var aRefreshed = [];
+		//console.log('** UpdateFields **');
+		// Set the full HTML for the input field
+		for(i=0; i<this.m_oData.m_aAllowedValuesRequested.length; i++)
+		{
+			var sAttCode = this.m_oData.m_aAllowedValuesRequested[i];
+			var sFieldId = this.m_oData.m_oFieldsMap[sAttCode];
+			var bDisabled = $('#'+sFieldId).attr('disabled');
+			//console.log('Setting #field_'+sFieldId+' to: '+this.m_oData.m_oAllowedValues[sAttCode]);
+			$('#field_'+sFieldId).html(this.m_oData.m_oAllowedValues[sAttCode]);
+			if (bDisabled)
+			{
+				$('#'+sFieldId).attr('disabled', 'disabled');
+				//$('#'+sFieldId).trigger('update'); // Propagate the disable
+			}
+			aRefreshed.push(sFieldId);
+		}
+		// Set the actual value of the input
+		for(i=0; i<this.m_oData.m_aDefaultValueRequested.length; i++)
+		{
+			sAttCode = this.m_oData.m_aDefaultValueRequested[i];
+			defaultValue = this.m_oData.m_oDefaultValue[sAttCode];
+			sFieldId = this.m_oData.m_oFieldsMap[sAttCode];	
+			$('#'+sFieldId).val(defaultValue);
+			if (!aRefreshed.indexOf(sFieldId))
+			{
+				aRefreshed.push(sFieldId);
+			}
+		}
+		// For each "refreshed" field, asynchronously trigger a change in case there are dependent fields to update
+		for(i=0; i<aRefreshed.length; i++)
+		{
+			var sString = "$('#"+aRefreshed[i]+"').trigger('change').trigger('update');";
+			window.setTimeout(sString, 1); // Synchronous 'trigger' does nothing, call it asynchronously
+		}
+	};
+	
+	this.UpdateWizard = function ()
+	{
+		//console.log('** UpdateWizard **')
+		for(sFieldCode in this.m_oData.m_oFieldsMap)
+		{
+			sCleanFieldCode = sFieldCode.replace('"', '');
+			//console.log(sFieldCode);
+			this.UpdateCurrentValue(sCleanFieldCode);
+		}
+	};
+	
+	this.UpdateWizardToJSON = function ()
+	{
+		this.UpdateWizard();
+		return this.ToJSON();
+	};
+	
+	this.AjaxQueryServer = function ()
+	{
+		//console.log('data sent:', this.ToJSON());
+		//console.log('oWizard:', this);
+		$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+		   { operation: 'wizard_helper', json_obj: this.ToJSON() },
+			function(html){
+				$('#ajax_content').html(html);
+				$('.blockUI').parent().unblock();
+				//console.log('data received:', oWizardHelper);
+				//oWizardHelper.FromJSON(json_data);
+				//oWizardHelper.UpdateFields(); // Is done directly in the html provided by ajax.render.php
+				//console.log(oWizardHelper);
+				//$('#wizStep'+ G_iCurrentStep).unblock( {fadeOut: 0} );
+			});
+	};
+	
+	this.Preview = function (divId)
+	{
+		//console.log('data sent:', this.ToJSON());
+		//console.log('oWizard:', this);
+		$('#'+divId).load(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?operation=wizard_helper_preview',
+		   	{'json_obj': this.ToJSON()},
+			function(responseText, textStatus, XMLHttpRequest){
+				$('#wizStep'+ G_iCurrentStep).unblock( {fadeOut: 0} );
+			});
+	};
+	
+	this.UpdateCurrentValue = function (sFieldCode)
+	{
+		$('#'+this.m_oData.m_oFieldsMap[sFieldCode]).trigger('update_value'); // Give the widget a chance to update its value (if it is aware of this event)
+		value = $('#'+this.m_oData.m_oFieldsMap[sFieldCode]).val();
+		if (value == '')
+		{
+			value = null;
+		}
+		this.m_oData.m_oCurrentValues[sFieldCode] = value;
+		return value;		
+	};
+
+	this.UpdateDependentFields = function(aFieldNames)
+	{
+		index = 0;
+		this.ResetQuery();
+		this.UpdateWizard();
+		while(index < aFieldNames.length )
+		{
+			sAttCode = aFieldNames[index];
+			sFieldId = this.GetFieldId(sAttCode);
+			if (sFieldId !== undefined) {
+				$('#fstatus_' + sFieldId).html('<img src="../images/indicator.gif" />');
+				$('#field_' + sFieldId).find('div').block({
+					message: '',
+					overlayCSS: {backgroundColor: '#f1f1f1', opacity: 0.3}
+				});
+				this.RequestAllowedValues(sAttCode);
+			}
+			index++;
+		}
+		this.AjaxQueryServer();
+	};
+	
+	this.ReloadObjectCreationForm = function(sFormId, sTargetState)
+	{
+		$('#'+sFormId).block();
+		this.UpdateWizard();
+		this.ResetQuery();
+		var sTransactionId = $('input[name=transaction_id]').val();
+		$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php',
+			{ json_obj: this.ToJSON(), operation: 'obj_creation_form', target_state: sTargetState, transaction_id: sTransactionId },
+			function(data)
+			{
+				// Delete any previous instances of CKEditor
+				$('#'+sFormId).find('.htmlEditor').each(function() {
+					var sId = $(this).attr('id');
+					var editorInst = CKEDITOR.instances[sId];
+				    if (editorInst.status == 'ready')
+				    {
+				    	editorInst.destroy(true);
+				    }
+				});
+
+				$('#'+sFormId).html(data);
+				onDelayedReady();
+				$('#'+sFormId).unblock();
+			}
+		);		
+	};
+}
diff --git a/license.txt b/license.txt
index 70eec1ee0..dba13ed2d 100755
--- a/license.txt
+++ b/license.txt
@@ -1,661 +1,661 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/log/.htaccess b/log/.htaccess
index 89682e1f9..782472c78 100644
--- a/log/.htaccess
+++ b/log/.htaccess
@@ -1,13 +1,13 @@
-# Apache 2.4
-<ifModule mod_authz_core.c>
-Require all denied
-</ifModule>
-
-# Apache 2.2
-<ifModule !mod_authz_core.c>
-deny from all
-Satisfy All
-</ifModule>
-
-# Apache 2.2 and 2.4
-IndexIgnore *
+# Apache 2.4
+<ifModule mod_authz_core.c>
+Require all denied
+</ifModule>
+
+# Apache 2.2
+<ifModule !mod_authz_core.c>
+deny from all
+Satisfy All
+</ifModule>
+
+# Apache 2.2 and 2.4
+IndexIgnore *
diff --git a/log/index.php b/log/index.php
index f4609aaef..112807643 100644
--- a/log/index.php
+++ b/log/index.php
@@ -1,2 +1,2 @@
-<?php
-echo 'Access denied';
+<?php
+echo 'Access denied';
diff --git a/log/web.config b/log/web.config
index 68aa91a67..599a5f260 100644
--- a/log/web.config
+++ b/log/web.config
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <system.web>
-          <authorization>
-                  <deny users="*" /> <!-- Denies all users -->
-          </authorization>
-  </system.web>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.web>
+          <authorization>
+                  <deny users="*" /> <!-- Denies all users -->
+          </authorization>
+  </system.web>
 </configuration>
\ No newline at end of file
diff --git a/pages/UniversalSearch.php b/pages/UniversalSearch.php
index 91e99e34c..04da4fe69 100644
--- a/pages/UniversalSearch.php
+++ b/pages/UniversalSearch.php
@@ -1,135 +1,135 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Analytical search
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-require_once(APPROOT.'/application/applicationcontext.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
-
-$oAppContext = new ApplicationContext();
-
-$oP = new iTopWebPage(Dict::S('UI:UniversalSearchTitle'));
-$oP->add_linked_script("../js/json.js");
-$oP->add_linked_script("../js/forms-json-utils.js");
-$oP->add_linked_script("../js/wizardhelper.js");
-$oP->add_linked_script("../js/wizard.utils.js");
-$oP->add_linked_script("../js/linkswidget.js");
-$oP->add_linked_script("../js/extkeywidget.js");
-$oP->add_linked_script("../js/jquery.blockUI.js");
-		
-// From now on the context is limited to the the selected organization ??
-
-// Now render the content of the page
-$sBaseClass = utils::ReadParam('baseClass', 'Organization', false, 'class');
-$sClass = utils::ReadParam('class', $sBaseClass, false, 'class');
-$sOQLClause = utils::ReadParam('oql_clause', '', false, 'raw_data');
-$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
-$sOperation = utils::ReadParam('operation', '');
-
-$oP->SetBreadCrumbEntry('ui-tool-universalsearch', Dict::S('Menu:UniversalSearchMenu'), Dict::S('Menu:UniversalSearchMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
-
-
-
-//$sSearchHeaderForceDropdown
-$sSearchHeaderForceDropdown = '<select  id="select_class" name="baseClass" onChange="this.form.submit();">';
-$aClassLabels = array();
-foreach(MetaModel::GetClasses('bizmodel') as $sCurrentClass)
-{
-	$aClassLabels[$sCurrentClass] = MetaModel::GetName($sCurrentClass);
-}
-asort($aClassLabels);
-foreach($aClassLabels as $sCurrentClass => $sLabel)
-{
-	$sDescription = MetaModel::GetClassDescription($sCurrentClass);
-	$sSelected = ($sCurrentClass == $sBaseClass) ? " SELECTED" : "";
-	$sSearchHeaderForceDropdown .= "<option value=\"$sCurrentClass\" title=\"$sDescription\"$sSelected>$sLabel</option>";
-}
-$sSearchHeaderForceDropdown .= "</select>\n";
-//end of $sSearchHeaderForceDropdown
-
-
-try 
-{
-	if ($sOperation == 'search_form')
-	{
-			$sOQL = "SELECT $sClass $sOQLClause";
-			$oFilter = DBObjectSearch::FromOQL($sOQL);
-	}
-	else
-	{
-		// Second part: advanced search form:
-		if (!empty($sFilter))
-		{
-			$oFilter = DBSearch::unserialize($sFilter);
-		}
-		else if (!empty($sClass))
-		{
-			$oFilter = new DBObjectSearch($sClass);
-		}
-	}
-}
-catch (CoreException $e)
-{
-	$oFilter = new DBObjectSearch($sClass);
-	$oP->P("<b>".Dict::Format('UI:UniversalSearch:Error', $e->getHtmlDesc())."</b>");
-}
-
-if ($oFilter != null)
-{
-	$oSet = new CMDBObjectSet($oFilter);
-	$oBlock = new DisplayBlock($oFilter, 'search', false);
-	$aExtraParams = $oAppContext->GetAsHash();
-	$aExtraParams['open'] = true;
-	$aExtraParams['baseClass'] = $sBaseClass;
-	$aExtraParams['action'] = utils::GetAbsoluteUrlAppRoot().'pages/UniversalSearch.php';
-	$aExtraParams['table_id'] = '1';
-	$aExtraParams['search_header_force_dropdown'] = $sSearchHeaderForceDropdown;
-	//$aExtraParams['class'] = $sClassName;
-	$oBlock->Display($oP, 0, $aExtraParams);
-
-	// Search results	
-	$oResultBlock = new DisplayBlock($oFilter, 'list', false);
-	$oResultBlock->Display($oP, 1);
-
-	// Breadcrumb
-	//$iCount = $oBlock->GetDisplayedCount();
-	$sPageId = "ui-search-".$oFilter->GetClass();
-	$sLabel = MetaModel::GetName($oFilter->GetClass());
-	$oP->SetBreadCrumbEntry($sPageId, $sLabel, '', '', '../images/breadcrumb-search.png');
-
-	// Menu node
-	$sFilter = $oFilter->ToOQL();
-	$oP->add("\n<!-- $sFilter -->\n");
-}
-$oP->add("</div>\n");
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Analytical search
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+require_once(APPROOT.'/application/applicationcontext.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+ApplicationMenu::CheckMenuIdEnabled('UniversalSearchMenu');
+
+$oAppContext = new ApplicationContext();
+
+$oP = new iTopWebPage(Dict::S('UI:UniversalSearchTitle'));
+$oP->add_linked_script("../js/json.js");
+$oP->add_linked_script("../js/forms-json-utils.js");
+$oP->add_linked_script("../js/wizardhelper.js");
+$oP->add_linked_script("../js/wizard.utils.js");
+$oP->add_linked_script("../js/linkswidget.js");
+$oP->add_linked_script("../js/extkeywidget.js");
+$oP->add_linked_script("../js/jquery.blockUI.js");
+		
+// From now on the context is limited to the the selected organization ??
+
+// Now render the content of the page
+$sBaseClass = utils::ReadParam('baseClass', 'Organization', false, 'class');
+$sClass = utils::ReadParam('class', $sBaseClass, false, 'class');
+$sOQLClause = utils::ReadParam('oql_clause', '', false, 'raw_data');
+$sFilter = utils::ReadParam('filter', '', false, 'raw_data');
+$sOperation = utils::ReadParam('operation', '');
+
+$oP->SetBreadCrumbEntry('ui-tool-universalsearch', Dict::S('Menu:UniversalSearchMenu'), Dict::S('Menu:UniversalSearchMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+
+
+
+//$sSearchHeaderForceDropdown
+$sSearchHeaderForceDropdown = '<select  id="select_class" name="baseClass" onChange="this.form.submit();">';
+$aClassLabels = array();
+foreach(MetaModel::GetClasses('bizmodel') as $sCurrentClass)
+{
+	$aClassLabels[$sCurrentClass] = MetaModel::GetName($sCurrentClass);
+}
+asort($aClassLabels);
+foreach($aClassLabels as $sCurrentClass => $sLabel)
+{
+	$sDescription = MetaModel::GetClassDescription($sCurrentClass);
+	$sSelected = ($sCurrentClass == $sBaseClass) ? " SELECTED" : "";
+	$sSearchHeaderForceDropdown .= "<option value=\"$sCurrentClass\" title=\"$sDescription\"$sSelected>$sLabel</option>";
+}
+$sSearchHeaderForceDropdown .= "</select>\n";
+//end of $sSearchHeaderForceDropdown
+
+
+try 
+{
+	if ($sOperation == 'search_form')
+	{
+			$sOQL = "SELECT $sClass $sOQLClause";
+			$oFilter = DBObjectSearch::FromOQL($sOQL);
+	}
+	else
+	{
+		// Second part: advanced search form:
+		if (!empty($sFilter))
+		{
+			$oFilter = DBSearch::unserialize($sFilter);
+		}
+		else if (!empty($sClass))
+		{
+			$oFilter = new DBObjectSearch($sClass);
+		}
+	}
+}
+catch (CoreException $e)
+{
+	$oFilter = new DBObjectSearch($sClass);
+	$oP->P("<b>".Dict::Format('UI:UniversalSearch:Error', $e->getHtmlDesc())."</b>");
+}
+
+if ($oFilter != null)
+{
+	$oSet = new CMDBObjectSet($oFilter);
+	$oBlock = new DisplayBlock($oFilter, 'search', false);
+	$aExtraParams = $oAppContext->GetAsHash();
+	$aExtraParams['open'] = true;
+	$aExtraParams['baseClass'] = $sBaseClass;
+	$aExtraParams['action'] = utils::GetAbsoluteUrlAppRoot().'pages/UniversalSearch.php';
+	$aExtraParams['table_id'] = '1';
+	$aExtraParams['search_header_force_dropdown'] = $sSearchHeaderForceDropdown;
+	//$aExtraParams['class'] = $sClassName;
+	$oBlock->Display($oP, 0, $aExtraParams);
+
+	// Search results	
+	$oResultBlock = new DisplayBlock($oFilter, 'list', false);
+	$oResultBlock->Display($oP, 1);
+
+	// Breadcrumb
+	//$iCount = $oBlock->GetDisplayedCount();
+	$sPageId = "ui-search-".$oFilter->GetClass();
+	$sLabel = MetaModel::GetName($oFilter->GetClass());
+	$oP->SetBreadCrumbEntry($sPageId, $sLabel, '', '', '../images/breadcrumb-search.png');
+
+	// Menu node
+	$sFilter = $oFilter->ToOQL();
+	$oP->add("\n<!-- $sFilter -->\n");
+}
+$oP->add("</div>\n");
+$oP->output();
+?>
diff --git a/pages/audit.php b/pages/audit.php
index 4ef25cc23..d4558bef1 100644
--- a/pages/audit.php
+++ b/pages/audit.php
@@ -1,434 +1,434 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Execute and shows the data quality audit
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-/**
- * Adds the context parameters to the audit rule query
- *
- * @param DBSearch $oFilter
- * @param ApplicationContext $oAppContext
- *
- * @throws \CoreException
- * @throws \CoreWarning
- * @throws \Exception
- */
-function FilterByContext(DBSearch &$oFilter, ApplicationContext $oAppContext)
-{
-	$sObjClass = $oFilter->GetClass();		
-	$aContextParams = $oAppContext->GetNames();
-	$aCallSpec = array($sObjClass, 'MapContextParam');
-	if (is_callable($aCallSpec))
-	{
-		foreach($aContextParams as $sParamName)
-		{
-			$sValue = $oAppContext->GetCurrentValue($sParamName, null);
-			if ($sValue != null)
-			{
-				$sAttCode = call_user_func($aCallSpec, $sParamName); // Returns null when there is no mapping for this parameter
-				if ( ($sAttCode != null) && MetaModel::IsValidAttCode($sObjClass, $sAttCode))
-				{
-					// Check if the condition points to a hierarchical key
-                    $bConditionAdded = false;
-					if ($sAttCode == 'id')
-					{
-						// Filtering on the objects themselves
-						$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sObjClass);
-						
-						if ($sHierarchicalKeyCode !== false)
-						{
-							$oRootFilter = new DBObjectSearch($sObjClass);
-							$oRootFilter->AddCondition($sAttCode, $sValue);
-							$oFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
-							$bConditionAdded = true;
-						}
-					}
-					else
-					{
-						$oAttDef = MetaModel::GetAttributeDef($sObjClass, $sAttCode);
-						$bConditionAdded = false;
-						if ($oAttDef->IsExternalKey())
-						{
-							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
-							
-							if ($sHierarchicalKeyCode !== false)
-							{
-								$oRootFilter = new DBObjectSearch($oAttDef->GetTargetClass());
-								$oRootFilter->AddCondition('id', $sValue);
-								$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
-								$oHKFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
-								$oFilter->AddCondition_PointingTo($oHKFilter, $sAttCode);
-								$bConditionAdded = true;
-							}
-						}
-					}
-					if (!$bConditionAdded)
-					{
-						$oFilter->AddCondition($sAttCode, $sValue);
-					}
-				}
-			}
-		}
-	}
-}
-
-/**
- * @param int $iRuleId Audit rule ID
- * @param DBObjectSearch $oDefinitionFilter Created from the audit category's OQL
- * @param ApplicationContext $oAppContext
- *
- * @return mixed
- * @throws \ArchivedObjectException
- * @throws \CoreException
- * @throws \OQLException
- */
-function GetRuleResultFilter($iRuleId, $oDefinitionFilter, $oAppContext)
-{
-	$oRule = MetaModel::GetObject('AuditRule', $iRuleId);
-	$sOql = $oRule->Get('query');
-	$oRuleFilter = DBObjectSearch::FromOQL($sOql);
-	$oRuleFilter->UpdateContextFromUser();
-	FilterByContext($oRuleFilter, $oAppContext); // Not needed since this filter is a subset of the definition filter, but may speedup things
-
-	if ($oRule->Get('valid_flag') == 'false')
-	{
-		// The query returns directly the invalid elements
-		$oFilter = $oRuleFilter->Intersect($oDefinitionFilter);
-	}
-	else
-	{
-		// The query returns only the valid elements, all the others are invalid
-		// Warning : we're generating a `WHERE ID IN`... query, and this could be very slow if there are lots of id !
-		$aValidRows = $oRuleFilter->ToDataArray(array('id'));
-		$aValidIds = array();
-		foreach($aValidRows as $aRow)
-		{
-			$aValidIds[] = $aRow['id'];
-		}
-		/** @var \DBObjectSearch $oFilter */
-		$oFilter = $oDefinitionFilter->DeepClone();
-		if (count($aValidIds) > 0)
-		{
-			$aInDefSet = array();
-			foreach($oDefinitionFilter->ToDataArray(array('id')) as $aRow)
-			{
-				$aInDefSet[] = $aRow['id'];
-			}
-			$aInvalids = array_diff($aInDefSet, $aValidIds);
-			if (count($aInvalids) > 0)
-			{
-				$oFilter->AddConditionForInOperatorUsingParam('id', $aInvalids, true);
-			}
-			else
-			{
-				$oFilter->AddCondition('id', 0, '=');
-			}
-		}
-	}
-	return $oFilter;
-}
-
-function GetReportColor($iTotal, $iErrors)
-{
-	$sResult = 'red';
-	if ( ($iTotal == 0) || ($iErrors / $iTotal) <= 0.05 )
-	{
-		$sResult = 'green';
-	}
-	else if ( ($iErrors / $iTotal) <= 0.25 )
-	{
-		$sResult = 'orange';
-	}
-	return $sResult;
-}
-
-try
-{
-	require_once('../approot.inc.php');
-	require_once(APPROOT.'/application/application.inc.php');
-	require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-	require_once(APPROOT.'/application/csvpage.class.inc.php');
-
-	
-	require_once(APPROOT.'/application/startup.inc.php');
-	$operation = utils::ReadParam('operation', '');
-	$oAppContext = new ApplicationContext();
-	
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-	
-	$oP = new iTopWebPage(Dict::S('UI:Audit:Title'));
-
-	switch($operation)
-	{
-		case 'csv':
-		$oP->DisableBreadCrumb();
-		// Big result sets cause long OQL that cannot be passed (serialized) as a GET parameter
-		// Therefore we don't use the standard "search_oql" operation of UI.php to display the CSV
-		$iCategory = utils::ReadParam('category', '');
-		$iRuleIndex = utils::ReadParam('rule', 0);
-	
-		$oAuditCategory = MetaModel::GetObject('AuditCategory', $iCategory);
-		$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
-		$oDefinitionFilter->UpdateContextFromUser();
-		FilterByContext($oDefinitionFilter, $oAppContext);
-		$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
-		$oFilter = GetRuleResultFilter($iRuleIndex, $oDefinitionFilter, $oAppContext);
-		$oErrorObjectSet = new CMDBObjectSet($oFilter);
-		$oAuditRule = MetaModel::GetObject('AuditRule', $iRuleIndex);
-		$sFileName = utils::ReadParam('filename', null, true, 'string');
-		$bAdvanced = utils::ReadParam('advanced', false);
-		$sAdvanced = $bAdvanced ? '&advanced=1' : '';
-		
-		if ($sFileName != null)
-		{
-			$oP = new CSVPage("iTop - Export");
-			$sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset');
-			$sCSVData = cmdbAbstractObject::GetSetAsCSV($oErrorObjectSet, array('localize_values' => true, 'fields_advanced' => $bAdvanced), $sCharset);
-			if ($sCharset == 'UTF-8')
-			{
-				$sOutputData = UTF8_BOM.$sCSVData;
-			}
-			else
-			{
-				$sOutputData = $sCSVData;
-			}
-			if ($sFileName == '')
-			{
-				// Plain text => Firefox will NOT propose to download the file
-				$oP->add_header("Content-type: text/plain; charset=$sCharset");
-			}
-			else
-			{
-				$sCSVName = basename($sFileName); // pseudo sanitization, just in case
-				// Force the name of the downloaded file, since windows gives precedence to the extension over of the mime type
-				$oP->add_header("Content-disposition: attachment; filename=\"$sCSVName\"");
-				$oP->add_header("Content-type: text/csv; charset=$sCharset");
-			}
-			$oP->add($sOutputData);
-			$oP->TrashUnexpectedOutput();
-			$oP->output();
-			exit;
-		}
-		else
-		{
-			$oP->add('<div class="page_header"><h1>Audit Errors: <span class="hilite">'.$oAuditRule->Get('description').'</span></h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/stop.png"/></div>');
-			$oP->p('<a href="./audit.php?'.$oAppContext->GetForLink().'">[Back to audit results]</a>');
-		    $sBlockId = 'audit_errors';
-			$oP->p("<div id=\"$sBlockId\" style=\"clear:both\">\n");
-			$oBlock = DisplayBlock::FromObjectSet($oErrorObjectSet, 'csv', array('show_obsolete_data' => true));
-			$oBlock->Display($oP, 1);
-			$oP->p("</div>\n");    
-			// Adjust the size of the Textarea containing the CSV to fit almost all the remaining space
-			$oP->add_ready_script(" $('#1>textarea').height(400);"); // adjust the size of the block			
-			$sExportUrl = utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey();
-			$oP->add_ready_script("$('a[href*=\"webservices/export.php?expression=\"]').attr('href', '".$sExportUrl."&filename=audit.csv".$sAdvanced."');");
-			$oP->add_ready_script("$('#1 :checkbox').removeAttr('onclick').click( function() { var sAdvanced = ''; if (this.checked) sAdvanced = '&advanced=1'; window.location.href='$sExportUrl'+sAdvanced; } );");
-		}
-		break;
-						
-		case 'errors':
-		$sTitle = 'Audit Errors';
-		$oP->SetBreadCrumbEntry('ui-tool-auditerrors', $sTitle, '', '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
-		$iCategory = utils::ReadParam('category', '');
-		$iRuleIndex = utils::ReadParam('rule', 0);
-	
-		$oAuditCategory = MetaModel::GetObject('AuditCategory', $iCategory);
-		$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
-		$oDefinitionFilter->UpdateContextFromUser();
-		FilterByContext($oDefinitionFilter, $oAppContext);
-		$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
-		$oFilter = GetRuleResultFilter($iRuleIndex, $oDefinitionFilter, $oAppContext);
-		$oErrorObjectSet = new CMDBObjectSet($oFilter);
-		$oAuditRule = MetaModel::GetObject('AuditRule', $iRuleIndex);
-		$oP->add('<div class="page_header"><h1>Audit Errors: <span class="hilite">'.$oAuditRule->Get('description').'</span></h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/stop.png"/></div>');
-		$oP->p('<a href="./audit.php?'.$oAppContext->GetForLink().'">[Back to audit results]</a>');
-	    $sBlockId = 'audit_errors';
-		$oP->p("<div id=\"$sBlockId\" style=\"clear:both\">\n");
-		$oBlock = DisplayBlock::FromObjectSet($oErrorObjectSet, 'list', array('show_obsolete_data' => true));
-		$oBlock->Display($oP, 1);
-		$oP->p("</div>\n");
-		$sExportUrl = utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey();
-		$oP->add_ready_script("$('a[href*=\"pages/UI.php?operation=search\"]').attr('href', '".$sExportUrl."')");
-		break;
-		
-		case 'audit':
-		default:
-		$oP->SetBreadCrumbEntry('ui-tool-audit', Dict::S('Menu:Audit'), Dict::S('UI:Audit:InteractiveAudit'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
-		$oP->add('<div class="page_header"><h1>'.Dict::S('UI:Audit:InteractiveAudit').'</h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/clean.png"/></div>');
-		$oAuditFilter = new DBObjectSearch('AuditCategory');
-		$oCategoriesSet = new DBObjectSet($oAuditFilter);
-		$oP->add("<table style=\"margin-top: 1em; padding: 0px; border-top: 3px solid #f6f6f1; border-left: 3px solid #f6f6f1; border-bottom: 3px solid #e6e6e1;	border-right: 3px solid #e6e6e1;\">\n");
-		$oP->add("<tr><td>\n");
-		$oP->add("<table>\n");
-		$oP->add("<tr>\n");
-		$oP->add("<th><img src=\"../images/minus.gif\"></th><th class=\"alignLeft\">".Dict::S('UI:Audit:HeaderAuditRule')."</th><th>".Dict::S('UI:Audit:HeaderNbObjects')."</th><th>".Dict::S('UI:Audit:HeaderNbErrors')."</th><th>".Dict::S('UI:Audit:PercentageOk')."</th>\n");
-		$oP->add("</tr>\n");
-		while($oAuditCategory = $oCategoriesSet->fetch())
-		{
-			try
-			{
-				$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
-				$oDefinitionFilter->UpdateContextFromUser();
-				FilterByContext($oDefinitionFilter, $oAppContext);
-				
-				$aObjectsWithErrors = array();
-				if (!empty($currentOrganization))
-				{
-					if (MetaModel::IsValidFilterCode($oDefinitionFilter->GetClass(), 'org_id'))
-					{
-						$oDefinitionFilter->AddCondition('org_id', $currentOrganization, '=');
-					}
-				}
-				$aResults = array();
-				$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
-				$iCount = $oDefinitionSet->Count();
-				$oRulesFilter = new DBObjectSearch('AuditRule');
-				$oRulesFilter->AddCondition('category_id', $oAuditCategory->GetKey(), '=');
-				$oRulesSet = new DBObjectSet($oRulesFilter);
-				while($oAuditRule = $oRulesSet->fetch() )
-				{
-					$aRow = array();
-					$aRow['description'] = $oAuditRule->GetName();
-					if ($iCount == 0)
-					{
-						// nothing to check, really !
-						$aRow['nb_errors'] = "<a href=\"audit.php?operation=errors&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."\">0</a>"; 
-						$aRow['percent_ok'] = '100.00';
-						$aRow['class'] = GetReportColor($iCount, 0);
-					}
-					else
-					{
-						try
-						{
-							$oFilter = GetRuleResultFilter($oAuditRule->GetKey(), $oDefinitionFilter, $oAppContext);
-							$aErrors = $oFilter->ToDataArray(array('id'));
-							$iErrorsCount = count($aErrors);
-							foreach($aErrors as $aErrorRow)
-							{
-								$aObjectsWithErrors[$aErrorRow['id']] = true;
-							}
-							$aRow['nb_errors'] = ($iErrorsCount == 0) ? '0' : "<a href=\"?operation=errors&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."&".$oAppContext->GetForLink()."\">$iErrorsCount</a> <a href=\"?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."&".$oAppContext->GetForLink()."\">(CSV)</a>"; 
-							$aRow['percent_ok'] = sprintf('%.2f', 100.0 * (($iCount - $iErrorsCount) / $iCount));
-							$aRow['class'] = GetReportColor($iCount, $iErrorsCount);							
-						}
-						catch(Exception $e)
-						{
-							$aRow['nb_errors'] = "OQL Error"; 
-							$aRow['percent_ok'] = 'n/a';
-							$aRow['class'] = 'red';
-							$sMessage = Dict::Format('UI:Audit:ErrorIn_Rule_Reason', $oAuditRule->GetHyperlink(), $e->getMessage());
-							$oP->p("<img style=\"vertical-align:middle\" src=\"../images/stop-mid.png\"/>&nbsp;".$sMessage);
-						}
-					}
-					$aResults[] = $aRow;
-				}
-				$iTotalErrors = count($aObjectsWithErrors);
-				$sOverallPercentOk = ($iCount == 0) ? '100.00' : sprintf('%.2f', 100.0 * (($iCount - $iTotalErrors) / $iCount));
-				$sClass = GetReportColor($iCount, $iTotalErrors);
-			}
-			catch(Exception $e)
-			{
-				$aRow = array();
-				$aRow['description'] = "OQL error";
-				$aRow['nb_errors'] = "n/a"; 
-				$aRow['percent_ok'] = '';
-				$aRow['class'] = 'red';				
-				$sMessage = Dict::Format('UI:Audit:ErrorIn_Category_Reason', $oAuditCategory->GetHyperlink(), $e->getMessage());
-				$oP->p("<img style=\"vertical-align:middle\" src=\"../images/stop-mid.png\"/>&nbsp;".$sMessage);
-				$aResults[] = $aRow;					
-
-				$sClass = 'red';
-				$iTotalErrors = 'n/a';
-				$sOverallPercentOk = '';
-			}
-			$oP->add("<tr>\n");
-			$oP->add("<th><img src=\"../images/minus.gif\"></th><th class=\"alignLeft\">".$oAuditCategory->GetName()."</th><th class=\"alignRight\">$iCount</th><th class=\"alignRight\">$iTotalErrors</th><th class=\"alignRight $sClass\">$sOverallPercentOk %</th>\n");
-			$oP->add("</tr>\n");
-			foreach($aResults as $aRow)
-			{
-				$oP->add("<tr>\n");
-				$oP->add("<td>&nbsp;</td><td colspan=\"2\">".$aRow['description']."</td><td class=\"alignRight\">".$aRow['nb_errors']."</td><td class=\"alignRight ".$aRow['class']."\">".$aRow['percent_ok']." %</td>\n");
-				$oP->add("</tr>\n");
-			}
-		}
-		$oP->add("</table>\n");
-		$oP->add("</td></tr>\n");
-		$oP->add("</table>\n");
-	}
-	$oP->output();
-}
-catch(CoreException $e)
-{
-	require_once(APPROOT.'/setup/setuppage.class.inc.php');
-	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
-	$oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc()));	
-	$oP->output();
-
-	if (MetaModel::IsLogEnabledIssue())
-	{
-		if (MetaModel::IsValidClass('EventIssue'))
-		{
-			$oLog = new EventIssue();
-
-			$oLog->Set('message', $e->getMessage());
-			$oLog->Set('userinfo', '');
-			$oLog->Set('issue', $e->GetIssue());
-			$oLog->Set('impact', 'Page could not be displayed');
-			$oLog->Set('callstack', $e->getTrace());
-			$oLog->Set('data', $e->getContextData());
-			$oLog->DBInsertNoReload();
-		}
-
-		IssueLog::Error($e->getMessage());
-	}
-
-	// For debugging only
-	//throw $e;
-}
-catch(Exception $e)
-{
-	require_once(APPROOT.'/setup/setuppage.class.inc.php');
-	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
-	$oP->error(Dict::Format('UI:Error_Details', $e->getMessage()));	
-	$oP->output();
-
-	if (MetaModel::IsLogEnabledIssue())
-	{
-		if (MetaModel::IsValidClass('EventIssue'))
-		{
-			$oLog = new EventIssue();
-
-			$oLog->Set('message', $e->getMessage());
-			$oLog->Set('userinfo', '');
-			$oLog->Set('issue', 'PHP Exception');
-			$oLog->Set('impact', 'Page could not be displayed');
-			$oLog->Set('callstack', $e->getTrace());
-			$oLog->Set('data', array());
-			$oLog->DBInsertNoReload();
-		}
-
-		IssueLog::Error($e->getMessage());
-	}
-}
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Execute and shows the data quality audit
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+/**
+ * Adds the context parameters to the audit rule query
+ *
+ * @param DBSearch $oFilter
+ * @param ApplicationContext $oAppContext
+ *
+ * @throws \CoreException
+ * @throws \CoreWarning
+ * @throws \Exception
+ */
+function FilterByContext(DBSearch &$oFilter, ApplicationContext $oAppContext)
+{
+	$sObjClass = $oFilter->GetClass();		
+	$aContextParams = $oAppContext->GetNames();
+	$aCallSpec = array($sObjClass, 'MapContextParam');
+	if (is_callable($aCallSpec))
+	{
+		foreach($aContextParams as $sParamName)
+		{
+			$sValue = $oAppContext->GetCurrentValue($sParamName, null);
+			if ($sValue != null)
+			{
+				$sAttCode = call_user_func($aCallSpec, $sParamName); // Returns null when there is no mapping for this parameter
+				if ( ($sAttCode != null) && MetaModel::IsValidAttCode($sObjClass, $sAttCode))
+				{
+					// Check if the condition points to a hierarchical key
+                    $bConditionAdded = false;
+					if ($sAttCode == 'id')
+					{
+						// Filtering on the objects themselves
+						$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sObjClass);
+						
+						if ($sHierarchicalKeyCode !== false)
+						{
+							$oRootFilter = new DBObjectSearch($sObjClass);
+							$oRootFilter->AddCondition($sAttCode, $sValue);
+							$oFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
+							$bConditionAdded = true;
+						}
+					}
+					else
+					{
+						$oAttDef = MetaModel::GetAttributeDef($sObjClass, $sAttCode);
+						$bConditionAdded = false;
+						if ($oAttDef->IsExternalKey())
+						{
+							$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
+							
+							if ($sHierarchicalKeyCode !== false)
+							{
+								$oRootFilter = new DBObjectSearch($oAttDef->GetTargetClass());
+								$oRootFilter->AddCondition('id', $sValue);
+								$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
+								$oHKFilter->AddCondition_PointingTo($oRootFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
+								$oFilter->AddCondition_PointingTo($oHKFilter, $sAttCode);
+								$bConditionAdded = true;
+							}
+						}
+					}
+					if (!$bConditionAdded)
+					{
+						$oFilter->AddCondition($sAttCode, $sValue);
+					}
+				}
+			}
+		}
+	}
+}
+
+/**
+ * @param int $iRuleId Audit rule ID
+ * @param DBObjectSearch $oDefinitionFilter Created from the audit category's OQL
+ * @param ApplicationContext $oAppContext
+ *
+ * @return mixed
+ * @throws \ArchivedObjectException
+ * @throws \CoreException
+ * @throws \OQLException
+ */
+function GetRuleResultFilter($iRuleId, $oDefinitionFilter, $oAppContext)
+{
+	$oRule = MetaModel::GetObject('AuditRule', $iRuleId);
+	$sOql = $oRule->Get('query');
+	$oRuleFilter = DBObjectSearch::FromOQL($sOql);
+	$oRuleFilter->UpdateContextFromUser();
+	FilterByContext($oRuleFilter, $oAppContext); // Not needed since this filter is a subset of the definition filter, but may speedup things
+
+	if ($oRule->Get('valid_flag') == 'false')
+	{
+		// The query returns directly the invalid elements
+		$oFilter = $oRuleFilter->Intersect($oDefinitionFilter);
+	}
+	else
+	{
+		// The query returns only the valid elements, all the others are invalid
+		// Warning : we're generating a `WHERE ID IN`... query, and this could be very slow if there are lots of id !
+		$aValidRows = $oRuleFilter->ToDataArray(array('id'));
+		$aValidIds = array();
+		foreach($aValidRows as $aRow)
+		{
+			$aValidIds[] = $aRow['id'];
+		}
+		/** @var \DBObjectSearch $oFilter */
+		$oFilter = $oDefinitionFilter->DeepClone();
+		if (count($aValidIds) > 0)
+		{
+			$aInDefSet = array();
+			foreach($oDefinitionFilter->ToDataArray(array('id')) as $aRow)
+			{
+				$aInDefSet[] = $aRow['id'];
+			}
+			$aInvalids = array_diff($aInDefSet, $aValidIds);
+			if (count($aInvalids) > 0)
+			{
+				$oFilter->AddConditionForInOperatorUsingParam('id', $aInvalids, true);
+			}
+			else
+			{
+				$oFilter->AddCondition('id', 0, '=');
+			}
+		}
+	}
+	return $oFilter;
+}
+
+function GetReportColor($iTotal, $iErrors)
+{
+	$sResult = 'red';
+	if ( ($iTotal == 0) || ($iErrors / $iTotal) <= 0.05 )
+	{
+		$sResult = 'green';
+	}
+	else if ( ($iErrors / $iTotal) <= 0.25 )
+	{
+		$sResult = 'orange';
+	}
+	return $sResult;
+}
+
+try
+{
+	require_once('../approot.inc.php');
+	require_once(APPROOT.'/application/application.inc.php');
+	require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+	require_once(APPROOT.'/application/csvpage.class.inc.php');
+
+	
+	require_once(APPROOT.'/application/startup.inc.php');
+	$operation = utils::ReadParam('operation', '');
+	$oAppContext = new ApplicationContext();
+	
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+	
+	$oP = new iTopWebPage(Dict::S('UI:Audit:Title'));
+
+	switch($operation)
+	{
+		case 'csv':
+		$oP->DisableBreadCrumb();
+		// Big result sets cause long OQL that cannot be passed (serialized) as a GET parameter
+		// Therefore we don't use the standard "search_oql" operation of UI.php to display the CSV
+		$iCategory = utils::ReadParam('category', '');
+		$iRuleIndex = utils::ReadParam('rule', 0);
+	
+		$oAuditCategory = MetaModel::GetObject('AuditCategory', $iCategory);
+		$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
+		$oDefinitionFilter->UpdateContextFromUser();
+		FilterByContext($oDefinitionFilter, $oAppContext);
+		$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
+		$oFilter = GetRuleResultFilter($iRuleIndex, $oDefinitionFilter, $oAppContext);
+		$oErrorObjectSet = new CMDBObjectSet($oFilter);
+		$oAuditRule = MetaModel::GetObject('AuditRule', $iRuleIndex);
+		$sFileName = utils::ReadParam('filename', null, true, 'string');
+		$bAdvanced = utils::ReadParam('advanced', false);
+		$sAdvanced = $bAdvanced ? '&advanced=1' : '';
+		
+		if ($sFileName != null)
+		{
+			$oP = new CSVPage("iTop - Export");
+			$sCharset = MetaModel::GetConfig()->Get('csv_file_default_charset');
+			$sCSVData = cmdbAbstractObject::GetSetAsCSV($oErrorObjectSet, array('localize_values' => true, 'fields_advanced' => $bAdvanced), $sCharset);
+			if ($sCharset == 'UTF-8')
+			{
+				$sOutputData = UTF8_BOM.$sCSVData;
+			}
+			else
+			{
+				$sOutputData = $sCSVData;
+			}
+			if ($sFileName == '')
+			{
+				// Plain text => Firefox will NOT propose to download the file
+				$oP->add_header("Content-type: text/plain; charset=$sCharset");
+			}
+			else
+			{
+				$sCSVName = basename($sFileName); // pseudo sanitization, just in case
+				// Force the name of the downloaded file, since windows gives precedence to the extension over of the mime type
+				$oP->add_header("Content-disposition: attachment; filename=\"$sCSVName\"");
+				$oP->add_header("Content-type: text/csv; charset=$sCharset");
+			}
+			$oP->add($sOutputData);
+			$oP->TrashUnexpectedOutput();
+			$oP->output();
+			exit;
+		}
+		else
+		{
+			$oP->add('<div class="page_header"><h1>Audit Errors: <span class="hilite">'.$oAuditRule->Get('description').'</span></h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/stop.png"/></div>');
+			$oP->p('<a href="./audit.php?'.$oAppContext->GetForLink().'">[Back to audit results]</a>');
+		    $sBlockId = 'audit_errors';
+			$oP->p("<div id=\"$sBlockId\" style=\"clear:both\">\n");
+			$oBlock = DisplayBlock::FromObjectSet($oErrorObjectSet, 'csv', array('show_obsolete_data' => true));
+			$oBlock->Display($oP, 1);
+			$oP->p("</div>\n");    
+			// Adjust the size of the Textarea containing the CSV to fit almost all the remaining space
+			$oP->add_ready_script(" $('#1>textarea').height(400);"); // adjust the size of the block			
+			$sExportUrl = utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey();
+			$oP->add_ready_script("$('a[href*=\"webservices/export.php?expression=\"]').attr('href', '".$sExportUrl."&filename=audit.csv".$sAdvanced."');");
+			$oP->add_ready_script("$('#1 :checkbox').removeAttr('onclick').click( function() { var sAdvanced = ''; if (this.checked) sAdvanced = '&advanced=1'; window.location.href='$sExportUrl'+sAdvanced; } );");
+		}
+		break;
+						
+		case 'errors':
+		$sTitle = 'Audit Errors';
+		$oP->SetBreadCrumbEntry('ui-tool-auditerrors', $sTitle, '', '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+		$iCategory = utils::ReadParam('category', '');
+		$iRuleIndex = utils::ReadParam('rule', 0);
+	
+		$oAuditCategory = MetaModel::GetObject('AuditCategory', $iCategory);
+		$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
+		$oDefinitionFilter->UpdateContextFromUser();
+		FilterByContext($oDefinitionFilter, $oAppContext);
+		$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
+		$oFilter = GetRuleResultFilter($iRuleIndex, $oDefinitionFilter, $oAppContext);
+		$oErrorObjectSet = new CMDBObjectSet($oFilter);
+		$oAuditRule = MetaModel::GetObject('AuditRule', $iRuleIndex);
+		$oP->add('<div class="page_header"><h1>Audit Errors: <span class="hilite">'.$oAuditRule->Get('description').'</span></h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/stop.png"/></div>');
+		$oP->p('<a href="./audit.php?'.$oAppContext->GetForLink().'">[Back to audit results]</a>');
+	    $sBlockId = 'audit_errors';
+		$oP->p("<div id=\"$sBlockId\" style=\"clear:both\">\n");
+		$oBlock = DisplayBlock::FromObjectSet($oErrorObjectSet, 'list', array('show_obsolete_data' => true));
+		$oBlock->Display($oP, 1);
+		$oP->p("</div>\n");
+		$sExportUrl = utils::GetAbsoluteUrlAppRoot()."pages/audit.php?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey();
+		$oP->add_ready_script("$('a[href*=\"pages/UI.php?operation=search\"]').attr('href', '".$sExportUrl."')");
+		break;
+		
+		case 'audit':
+		default:
+		$oP->SetBreadCrumbEntry('ui-tool-audit', Dict::S('Menu:Audit'), Dict::S('UI:Audit:InteractiveAudit'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+		$oP->add('<div class="page_header"><h1>'.Dict::S('UI:Audit:InteractiveAudit').'</h1><img style="margin-top: -20px; margin-right: 10px; float: right;" src="../images/clean.png"/></div>');
+		$oAuditFilter = new DBObjectSearch('AuditCategory');
+		$oCategoriesSet = new DBObjectSet($oAuditFilter);
+		$oP->add("<table style=\"margin-top: 1em; padding: 0px; border-top: 3px solid #f6f6f1; border-left: 3px solid #f6f6f1; border-bottom: 3px solid #e6e6e1;	border-right: 3px solid #e6e6e1;\">\n");
+		$oP->add("<tr><td>\n");
+		$oP->add("<table>\n");
+		$oP->add("<tr>\n");
+		$oP->add("<th><img src=\"../images/minus.gif\"></th><th class=\"alignLeft\">".Dict::S('UI:Audit:HeaderAuditRule')."</th><th>".Dict::S('UI:Audit:HeaderNbObjects')."</th><th>".Dict::S('UI:Audit:HeaderNbErrors')."</th><th>".Dict::S('UI:Audit:PercentageOk')."</th>\n");
+		$oP->add("</tr>\n");
+		while($oAuditCategory = $oCategoriesSet->fetch())
+		{
+			try
+			{
+				$oDefinitionFilter = DBObjectSearch::FromOQL($oAuditCategory->Get('definition_set'));
+				$oDefinitionFilter->UpdateContextFromUser();
+				FilterByContext($oDefinitionFilter, $oAppContext);
+				
+				$aObjectsWithErrors = array();
+				if (!empty($currentOrganization))
+				{
+					if (MetaModel::IsValidFilterCode($oDefinitionFilter->GetClass(), 'org_id'))
+					{
+						$oDefinitionFilter->AddCondition('org_id', $currentOrganization, '=');
+					}
+				}
+				$aResults = array();
+				$oDefinitionSet = new CMDBObjectSet($oDefinitionFilter);
+				$iCount = $oDefinitionSet->Count();
+				$oRulesFilter = new DBObjectSearch('AuditRule');
+				$oRulesFilter->AddCondition('category_id', $oAuditCategory->GetKey(), '=');
+				$oRulesSet = new DBObjectSet($oRulesFilter);
+				while($oAuditRule = $oRulesSet->fetch() )
+				{
+					$aRow = array();
+					$aRow['description'] = $oAuditRule->GetName();
+					if ($iCount == 0)
+					{
+						// nothing to check, really !
+						$aRow['nb_errors'] = "<a href=\"audit.php?operation=errors&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."\">0</a>"; 
+						$aRow['percent_ok'] = '100.00';
+						$aRow['class'] = GetReportColor($iCount, 0);
+					}
+					else
+					{
+						try
+						{
+							$oFilter = GetRuleResultFilter($oAuditRule->GetKey(), $oDefinitionFilter, $oAppContext);
+							$aErrors = $oFilter->ToDataArray(array('id'));
+							$iErrorsCount = count($aErrors);
+							foreach($aErrors as $aErrorRow)
+							{
+								$aObjectsWithErrors[$aErrorRow['id']] = true;
+							}
+							$aRow['nb_errors'] = ($iErrorsCount == 0) ? '0' : "<a href=\"?operation=errors&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."&".$oAppContext->GetForLink()."\">$iErrorsCount</a> <a href=\"?operation=csv&category=".$oAuditCategory->GetKey()."&rule=".$oAuditRule->GetKey()."&".$oAppContext->GetForLink()."\">(CSV)</a>"; 
+							$aRow['percent_ok'] = sprintf('%.2f', 100.0 * (($iCount - $iErrorsCount) / $iCount));
+							$aRow['class'] = GetReportColor($iCount, $iErrorsCount);							
+						}
+						catch(Exception $e)
+						{
+							$aRow['nb_errors'] = "OQL Error"; 
+							$aRow['percent_ok'] = 'n/a';
+							$aRow['class'] = 'red';
+							$sMessage = Dict::Format('UI:Audit:ErrorIn_Rule_Reason', $oAuditRule->GetHyperlink(), $e->getMessage());
+							$oP->p("<img style=\"vertical-align:middle\" src=\"../images/stop-mid.png\"/>&nbsp;".$sMessage);
+						}
+					}
+					$aResults[] = $aRow;
+				}
+				$iTotalErrors = count($aObjectsWithErrors);
+				$sOverallPercentOk = ($iCount == 0) ? '100.00' : sprintf('%.2f', 100.0 * (($iCount - $iTotalErrors) / $iCount));
+				$sClass = GetReportColor($iCount, $iTotalErrors);
+			}
+			catch(Exception $e)
+			{
+				$aRow = array();
+				$aRow['description'] = "OQL error";
+				$aRow['nb_errors'] = "n/a"; 
+				$aRow['percent_ok'] = '';
+				$aRow['class'] = 'red';				
+				$sMessage = Dict::Format('UI:Audit:ErrorIn_Category_Reason', $oAuditCategory->GetHyperlink(), $e->getMessage());
+				$oP->p("<img style=\"vertical-align:middle\" src=\"../images/stop-mid.png\"/>&nbsp;".$sMessage);
+				$aResults[] = $aRow;					
+
+				$sClass = 'red';
+				$iTotalErrors = 'n/a';
+				$sOverallPercentOk = '';
+			}
+			$oP->add("<tr>\n");
+			$oP->add("<th><img src=\"../images/minus.gif\"></th><th class=\"alignLeft\">".$oAuditCategory->GetName()."</th><th class=\"alignRight\">$iCount</th><th class=\"alignRight\">$iTotalErrors</th><th class=\"alignRight $sClass\">$sOverallPercentOk %</th>\n");
+			$oP->add("</tr>\n");
+			foreach($aResults as $aRow)
+			{
+				$oP->add("<tr>\n");
+				$oP->add("<td>&nbsp;</td><td colspan=\"2\">".$aRow['description']."</td><td class=\"alignRight\">".$aRow['nb_errors']."</td><td class=\"alignRight ".$aRow['class']."\">".$aRow['percent_ok']." %</td>\n");
+				$oP->add("</tr>\n");
+			}
+		}
+		$oP->add("</table>\n");
+		$oP->add("</td></tr>\n");
+		$oP->add("</table>\n");
+	}
+	$oP->output();
+}
+catch(CoreException $e)
+{
+	require_once(APPROOT.'/setup/setuppage.class.inc.php');
+	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
+	$oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc()));	
+	$oP->output();
+
+	if (MetaModel::IsLogEnabledIssue())
+	{
+		if (MetaModel::IsValidClass('EventIssue'))
+		{
+			$oLog = new EventIssue();
+
+			$oLog->Set('message', $e->getMessage());
+			$oLog->Set('userinfo', '');
+			$oLog->Set('issue', $e->GetIssue());
+			$oLog->Set('impact', 'Page could not be displayed');
+			$oLog->Set('callstack', $e->getTrace());
+			$oLog->Set('data', $e->getContextData());
+			$oLog->DBInsertNoReload();
+		}
+
+		IssueLog::Error($e->getMessage());
+	}
+
+	// For debugging only
+	//throw $e;
+}
+catch(Exception $e)
+{
+	require_once(APPROOT.'/setup/setuppage.class.inc.php');
+	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
+	$oP->error(Dict::Format('UI:Error_Details', $e->getMessage()));	
+	$oP->output();
+
+	if (MetaModel::IsLogEnabledIssue())
+	{
+		if (MetaModel::IsValidClass('EventIssue'))
+		{
+			$oLog = new EventIssue();
+
+			$oLog->Set('message', $e->getMessage());
+			$oLog->Set('userinfo', '');
+			$oLog->Set('issue', 'PHP Exception');
+			$oLog->Set('impact', 'Page could not be displayed');
+			$oLog->Set('callstack', $e->getTrace());
+			$oLog->Set('data', array());
+			$oLog->DBInsertNoReload();
+		}
+
+		IssueLog::Error($e->getMessage());
+	}
+}
diff --git a/pages/exec.php b/pages/exec.php
index 0ece3c4a6..c13a2abed 100644
--- a/pages/exec.php
+++ b/pages/exec.php
@@ -1,77 +1,77 @@
-<?php
-// Copyright (C) 2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Execute a module page - this is an alternative to invoking /myItop/env-production/myModule/somePage.php
- *
- * The recommended way to build an URL to a module page is to invoke utils::GetAbsoluteUrlModulePage()
- * or its javascript equivalent GetAbsoluteUrlModulePage()
- * 
- * To be compatible with this mechanism, the called page must include approot
- * with an absolute path OR not include it at all (losing the direct access to the page)
- * if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
- * require_once(__DIR__.'/../../approot.inc.php');
- *  
- * @copyright   Copyright (C) 2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-
-// Needed to read the parameters (with sanitization)
-require_once(APPROOT.'application/utils.inc.php');
-require_once(APPROOT.'core/metamodel.class.php');
-
-utils::InitTimeZone();
-
-$sModule = utils::ReadParam('exec_module', '');
-if ($sModule == '')
-{
-	echo "Missing argument 'exec_module'";
-	exit;
-}
-$sModule = basename($sModule); // protect against ../.. ...
-
-$sPage = utils::ReadParam('exec_page', '', false, 'raw_data');
-if ($sPage == '')
-{
-	echo "Missing argument 'exec_page'";
-	exit;
-}
-$sPage = basename($sPage); // protect against ../.. ...
-
-session_name('itop-'.md5(APPROOT));
-session_start();
-$sEnvironment = utils::ReadParam('exec_env', utils::GetCurrentEnvironment());
-session_write_close();
-
-$sTargetPage = APPROOT.'env-'.$sEnvironment.'/'.$sModule.'/'.$sPage;
-
-if (!file_exists($sTargetPage))
-{
-	// Do not recall the parameters (security takes precedence)
-	echo "Wrong module, page name or environment...";
-	exit;
-}
-
-/////////////////////////////////////////
-//
-// GO!
-//
-require_once($sTargetPage);
+<?php
+// Copyright (C) 2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Execute a module page - this is an alternative to invoking /myItop/env-production/myModule/somePage.php
+ *
+ * The recommended way to build an URL to a module page is to invoke utils::GetAbsoluteUrlModulePage()
+ * or its javascript equivalent GetAbsoluteUrlModulePage()
+ * 
+ * To be compatible with this mechanism, the called page must include approot
+ * with an absolute path OR not include it at all (losing the direct access to the page)
+ * if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+ * require_once(__DIR__.'/../../approot.inc.php');
+ *  
+ * @copyright   Copyright (C) 2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+
+// Needed to read the parameters (with sanitization)
+require_once(APPROOT.'application/utils.inc.php');
+require_once(APPROOT.'core/metamodel.class.php');
+
+utils::InitTimeZone();
+
+$sModule = utils::ReadParam('exec_module', '');
+if ($sModule == '')
+{
+	echo "Missing argument 'exec_module'";
+	exit;
+}
+$sModule = basename($sModule); // protect against ../.. ...
+
+$sPage = utils::ReadParam('exec_page', '', false, 'raw_data');
+if ($sPage == '')
+{
+	echo "Missing argument 'exec_page'";
+	exit;
+}
+$sPage = basename($sPage); // protect against ../.. ...
+
+session_name('itop-'.md5(APPROOT));
+session_start();
+$sEnvironment = utils::ReadParam('exec_env', utils::GetCurrentEnvironment());
+session_write_close();
+
+$sTargetPage = APPROOT.'env-'.$sEnvironment.'/'.$sModule.'/'.$sPage;
+
+if (!file_exists($sTargetPage))
+{
+	// Do not recall the parameters (security takes precedence)
+	echo "Wrong module, page name or environment...";
+	exit;
+}
+
+/////////////////////////////////////////
+//
+// GO!
+//
+require_once($sTargetPage);
diff --git a/pages/graphviz.php b/pages/graphviz.php
index 608026424..0a1aa9b3a 100644
--- a/pages/graphviz.php
+++ b/pages/graphviz.php
@@ -1,163 +1,163 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Renders a graph of the class' lifecycle as a png (directly in the HTTP response)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-
-/**
- * Escape a label (string) in a manner suitable for use with graphviz' DOT syntax
- * @param string $s The string to escape
- * @return string The escaped string
- */
-function GraphvizEscape($s)
-{
-	$s = str_replace('"', '\\"', $s);
-	return $s;
-}
-
-/**
- * Helper to generate a Graphviz code for displaying the life cycle of a class
- * @param string $sClass The class to display
- * @return string The Graph description in Graphviz/Dot syntax   
- */
-function GraphvizLifecycle($sClass)
-{
-	$sDotFileContent = "";
-	$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-	if (empty($sStateAttCode))
-	{
-		//$oPage->p("no lifecycle for this class");
-	}
-	else
-	{
-		$aStates = MetaModel::EnumStates($sClass);
-		$aStimuli = MetaModel::EnumStimuli($sClass);
-		$sDotFileContent .= "digraph finite_state_machine {
-	graph [bgcolor = \"#eeeeee\"];
-	rankdir=LR;
-	node [ fontname=Verdana style=filled fillcolor=\"#ffffff\" ];
-	edge [ fontname=Verdana ];
-";
-		$aStatesLinks = array();
-		foreach ($aStates as $sStateCode => $aStateDef)
-		{
-			$aStatesLinks[$sStateCode] = array('in' => 0, 'out' => 0);
-		}
-		
-		foreach ($aStates as $sStateCode => $aStateDef)
-		{
-			$sStateLabel = MetaModel::GetStateLabel($sClass, $sStateCode);
-			$sStateDescription = MetaModel::GetStateDescription($sClass, $sStateCode);
-			foreach(MetaModel::EnumTransitions($sClass, $sStateCode) as $sStimulusCode => $aTransitionDef)
-			{
-				$aStatesLinks[$sStateCode]['out']++;
-				$aStatesLinks[$aTransitionDef['target_state']]['in']++;
-				$sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel();
-				$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $aTransitionDef['target_state']);
-				$sDotFileContent .= "\t$sStateCode -> {$aTransitionDef['target_state']} [ label=\"".GraphvizEscape($sStimulusLabel)."\"];\n";
-			}
-		}
-		foreach($aStates as $sStateCode => $aStateDef)
-		{
-			if (($aStatesLinks[$sStateCode]['out'] > 0) || ($aStatesLinks[$sStateCode]['in'] > 0))
-			{
-				// Show only reachable states
-				$sStateLabel = str_replace(' ', '\n', MetaModel::GetStateLabel($sClass, $sStateCode));
-				if ( ($aStatesLinks[$sStateCode]['in'] == 0) || ($aStatesLinks[$sStateCode]['out'] == 0))
-				{
-					// End or Start state, make it look different
-					$sDotFileContent .= "\t$sStateCode [ shape=doublecircle,label=\"".GraphvizEscape($sStateLabel)."\"];\n";
-				}
-				else
-				{
-					$sDotFileContent .= "\t$sStateCode [ shape=circle,label=\"".GraphvizEscape($sStateLabel)."\"];\n";
-				}
-			}
-		}
-		$sDotFileContent .= "}\n";
-	}
-	return $sDotFileContent;
-}
-
-$sClass = utils::ReadParam('class', '', false, 'class');
-$oReflection = new ReflectionClass($sClass);
-$sDeclarationFile = $oReflection->getFileName();
-$sModuleDir = dirname($sDeclarationFile);
-
-$sImageFilePath = $sModuleDir."/lifecycle/".$sClass.".png";
-$sDotExecutable = MetaModel::GetConfig()->Get('graphviz_path');
-if (file_exists($sDotExecutable))
-{
-	// create the file with Graphviz
-	$sImageFilePath = APPROOT."data/lifecycle/".$sClass.".png";
-	if (!is_dir(APPROOT."data"))
-	{
-		@mkdir(APPROOT."data");
-	}
-	if (!is_dir(APPROOT."data/lifecycle"))
-	{
-		@mkdir(APPROOT."data/lifecycle");
-	}
-	$sDotDescription = GraphvizLifecycle($sClass);
-	$sDotFilePath = APPROOT."data/lifecycle/{$sClass}.dot";
-	
-	$rFile = @fopen($sDotFilePath, "w");
-	@fwrite($rFile, $sDotDescription);
-	@fclose($rFile);
-	$aOutput = array();
-	$CommandLine = "\"$sDotExecutable\" -v -Tpng < \"$sDotFilePath\" -o \"$sImageFilePath\" 2>&1";
-	
-	exec($CommandLine, $aOutput, $iRetCode);
-	if ($iRetCode != 0)
-	{
-		header('Content-type: text/html');
-		echo "<p><b>Error:</b></p>";
-		echo "<p>The command: <pre>$CommandLine</pre> returned $iRetCode</p>";
-		echo "<p>The output of the command is:<pre>\n".implode("\n", $aOutput)."</pre></p>";
-		echo "<hr>";
-		echo "<p>Content of the '".basename($sDotFilePath)."' file:<pre>\n$sDotDescription</pre>";
-	}
-	else
-	{
-		header('Content-type: image/png');
-		echo file_get_contents($sImageFilePath);
-	}
-	@unlink($sDotFilePath);
-}
-else
-{
-	header('Content-type: image/png');
-	echo file_get_contents($sImageFilePath);
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Renders a graph of the class' lifecycle as a png (directly in the HTTP response)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+
+/**
+ * Escape a label (string) in a manner suitable for use with graphviz' DOT syntax
+ * @param string $s The string to escape
+ * @return string The escaped string
+ */
+function GraphvizEscape($s)
+{
+	$s = str_replace('"', '\\"', $s);
+	return $s;
+}
+
+/**
+ * Helper to generate a Graphviz code for displaying the life cycle of a class
+ * @param string $sClass The class to display
+ * @return string The Graph description in Graphviz/Dot syntax   
+ */
+function GraphvizLifecycle($sClass)
+{
+	$sDotFileContent = "";
+	$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
+	if (empty($sStateAttCode))
+	{
+		//$oPage->p("no lifecycle for this class");
+	}
+	else
+	{
+		$aStates = MetaModel::EnumStates($sClass);
+		$aStimuli = MetaModel::EnumStimuli($sClass);
+		$sDotFileContent .= "digraph finite_state_machine {
+	graph [bgcolor = \"#eeeeee\"];
+	rankdir=LR;
+	node [ fontname=Verdana style=filled fillcolor=\"#ffffff\" ];
+	edge [ fontname=Verdana ];
+";
+		$aStatesLinks = array();
+		foreach ($aStates as $sStateCode => $aStateDef)
+		{
+			$aStatesLinks[$sStateCode] = array('in' => 0, 'out' => 0);
+		}
+		
+		foreach ($aStates as $sStateCode => $aStateDef)
+		{
+			$sStateLabel = MetaModel::GetStateLabel($sClass, $sStateCode);
+			$sStateDescription = MetaModel::GetStateDescription($sClass, $sStateCode);
+			foreach(MetaModel::EnumTransitions($sClass, $sStateCode) as $sStimulusCode => $aTransitionDef)
+			{
+				$aStatesLinks[$sStateCode]['out']++;
+				$aStatesLinks[$aTransitionDef['target_state']]['in']++;
+				$sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel();
+				$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $aTransitionDef['target_state']);
+				$sDotFileContent .= "\t$sStateCode -> {$aTransitionDef['target_state']} [ label=\"".GraphvizEscape($sStimulusLabel)."\"];\n";
+			}
+		}
+		foreach($aStates as $sStateCode => $aStateDef)
+		{
+			if (($aStatesLinks[$sStateCode]['out'] > 0) || ($aStatesLinks[$sStateCode]['in'] > 0))
+			{
+				// Show only reachable states
+				$sStateLabel = str_replace(' ', '\n', MetaModel::GetStateLabel($sClass, $sStateCode));
+				if ( ($aStatesLinks[$sStateCode]['in'] == 0) || ($aStatesLinks[$sStateCode]['out'] == 0))
+				{
+					// End or Start state, make it look different
+					$sDotFileContent .= "\t$sStateCode [ shape=doublecircle,label=\"".GraphvizEscape($sStateLabel)."\"];\n";
+				}
+				else
+				{
+					$sDotFileContent .= "\t$sStateCode [ shape=circle,label=\"".GraphvizEscape($sStateLabel)."\"];\n";
+				}
+			}
+		}
+		$sDotFileContent .= "}\n";
+	}
+	return $sDotFileContent;
+}
+
+$sClass = utils::ReadParam('class', '', false, 'class');
+$oReflection = new ReflectionClass($sClass);
+$sDeclarationFile = $oReflection->getFileName();
+$sModuleDir = dirname($sDeclarationFile);
+
+$sImageFilePath = $sModuleDir."/lifecycle/".$sClass.".png";
+$sDotExecutable = MetaModel::GetConfig()->Get('graphviz_path');
+if (file_exists($sDotExecutable))
+{
+	// create the file with Graphviz
+	$sImageFilePath = APPROOT."data/lifecycle/".$sClass.".png";
+	if (!is_dir(APPROOT."data"))
+	{
+		@mkdir(APPROOT."data");
+	}
+	if (!is_dir(APPROOT."data/lifecycle"))
+	{
+		@mkdir(APPROOT."data/lifecycle");
+	}
+	$sDotDescription = GraphvizLifecycle($sClass);
+	$sDotFilePath = APPROOT."data/lifecycle/{$sClass}.dot";
+	
+	$rFile = @fopen($sDotFilePath, "w");
+	@fwrite($rFile, $sDotDescription);
+	@fclose($rFile);
+	$aOutput = array();
+	$CommandLine = "\"$sDotExecutable\" -v -Tpng < \"$sDotFilePath\" -o \"$sImageFilePath\" 2>&1";
+	
+	exec($CommandLine, $aOutput, $iRetCode);
+	if ($iRetCode != 0)
+	{
+		header('Content-type: text/html');
+		echo "<p><b>Error:</b></p>";
+		echo "<p>The command: <pre>$CommandLine</pre> returned $iRetCode</p>";
+		echo "<p>The output of the command is:<pre>\n".implode("\n", $aOutput)."</pre></p>";
+		echo "<hr>";
+		echo "<p>Content of the '".basename($sDotFilePath)."' file:<pre>\n$sDotDescription</pre>";
+	}
+	else
+	{
+		header('Content-type: image/png');
+		echo file_get_contents($sImageFilePath);
+	}
+	@unlink($sDotFilePath);
+}
+else
+{
+	header('Content-type: image/png');
+	echo file_get_contents($sImageFilePath);
+}
+
+?>
diff --git a/pages/index.php b/pages/index.php
index d326d8048..7e4fc5ca3 100644
--- a/pages/index.php
+++ b/pages/index.php
@@ -1,3 +1,3 @@
-<?php
-header('Location: ../index.php');
-?>
+<?php
+header('Location: ../index.php');
+?>
diff --git a/pages/navigator.php b/pages/navigator.php
index 92b28feac..683df1740 100755
--- a/pages/navigator.php
+++ b/pages/navigator.php
@@ -1,81 +1,81 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Display the Flash navigator, in the whole pane
- */
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-
-$sOperation = utils::ReadParam('operation', 'menu');
-$oAppContext = new ApplicationContext();
-
-$oP = new iTopWebPage("iTop - Navigator");
-
-// Main program
-$sClass = utils::ReadParam('class', '');
-$id = utils::ReadParam('id', 0);
-$sRelation = utils::ReadParam('relation', 'neighbours');
-
-try
-{
-	$width = 1000;
-	$height = 700;
-	$sDrillUrl = urlencode(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details');
-//	$sParams = "pWidth=$width&pHeight=$height&drillUrl=".urlencode('../pages/UI.php?operation=details')."&displayController=false&xmlUrl=".urlencode("./xml.navigator.php")."&obj_class=$sClass&obj_id=$id&relation=$sRelation";
-	
-//	$oP->add("<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0\" width=\"$width\" height=\"$height\" id=\"navigator\" align=\"middle\">
-//	<param name=\"allowScriptAccess\" value=\"sameDomain\" />
-//	<param name=\"allowFullScreen\" value=\"false\" />
-//	<param name=\"FlashVars\" value=\"$sParams\" />
-//	<param name=\"movie\" value=\"../images/navigator.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"bgcolor\" value=\"#ffffff\" />
-//	<embed src=\"../images/navigator.swf\" flashVars=\"$sParams\" quality=\"high\" bgcolor=\"#ffffff\" width=\"$width\" height=\"$height\" name=\"navigator\" align=\"middle\" allowScriptAccess=\"sameDomain\" allowFullScreen=\"false\" type=\"application/x-shockwave-flash\" pluginspage=\"http://www.adobe.com/go/getflashplayer\" />
-//	</object>\n");
-	
-	$oP->add("<div id=\"navigator\">If the chart does not display, <a href=\"http://get.adobe.com/flash/\" target=\"_blank\">install Flash</a></div>\n");
-	$oP->add_ready_script(<<<EOF
-var iWidth = $('.ui-layout-content').width();
-var iHeight = $('.ui-layout-content').height();
-swfobject.embedSWF("../navigator/navigator.swf", "navigator", "100%", "100%","9.0.0", "expressInstall.swf",
-				   { pWidth: iWidth, pHeight: iHeight, drillUrl: '$sDrillUrl', displayController: false, obj_class: '$sClass', obj_id: $id, relation: '$sRelation'},
-				   {wmode: 'transparent'}
-				   );
-EOF
-);
-
-}
-catch(CoreException $e)
-{
-	$oP->p('<b>An error occured while running the query:</b>');
-	$oP->p($e->getHtmlDesc());
-}
-catch(Exception $e)
-{
-	$oP->p('<b>An error occured while running the query:</b>');
-	$oP->p($e->getMessage());
-}
-
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Display the Flash navigator, in the whole pane
+ */
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+
+$sOperation = utils::ReadParam('operation', 'menu');
+$oAppContext = new ApplicationContext();
+
+$oP = new iTopWebPage("iTop - Navigator");
+
+// Main program
+$sClass = utils::ReadParam('class', '');
+$id = utils::ReadParam('id', 0);
+$sRelation = utils::ReadParam('relation', 'neighbours');
+
+try
+{
+	$width = 1000;
+	$height = 700;
+	$sDrillUrl = urlencode(utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=details');
+//	$sParams = "pWidth=$width&pHeight=$height&drillUrl=".urlencode('../pages/UI.php?operation=details')."&displayController=false&xmlUrl=".urlencode("./xml.navigator.php")."&obj_class=$sClass&obj_id=$id&relation=$sRelation";
+	
+//	$oP->add("<object classid=\"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0\" width=\"$width\" height=\"$height\" id=\"navigator\" align=\"middle\">
+//	<param name=\"allowScriptAccess\" value=\"sameDomain\" />
+//	<param name=\"allowFullScreen\" value=\"false\" />
+//	<param name=\"FlashVars\" value=\"$sParams\" />
+//	<param name=\"movie\" value=\"../images/navigator.swf\" /><param name=\"quality\" value=\"high\" /><param name=\"bgcolor\" value=\"#ffffff\" />
+//	<embed src=\"../images/navigator.swf\" flashVars=\"$sParams\" quality=\"high\" bgcolor=\"#ffffff\" width=\"$width\" height=\"$height\" name=\"navigator\" align=\"middle\" allowScriptAccess=\"sameDomain\" allowFullScreen=\"false\" type=\"application/x-shockwave-flash\" pluginspage=\"http://www.adobe.com/go/getflashplayer\" />
+//	</object>\n");
+	
+	$oP->add("<div id=\"navigator\">If the chart does not display, <a href=\"http://get.adobe.com/flash/\" target=\"_blank\">install Flash</a></div>\n");
+	$oP->add_ready_script(<<<EOF
+var iWidth = $('.ui-layout-content').width();
+var iHeight = $('.ui-layout-content').height();
+swfobject.embedSWF("../navigator/navigator.swf", "navigator", "100%", "100%","9.0.0", "expressInstall.swf",
+				   { pWidth: iWidth, pHeight: iHeight, drillUrl: '$sDrillUrl', displayController: false, obj_class: '$sClass', obj_id: $id, relation: '$sRelation'},
+				   {wmode: 'transparent'}
+				   );
+EOF
+);
+
+}
+catch(CoreException $e)
+{
+	$oP->p('<b>An error occured while running the query:</b>');
+	$oP->p($e->getHtmlDesc());
+}
+catch(Exception $e)
+{
+	$oP->p('<b>An error occured while running the query:</b>');
+	$oP->p($e->getMessage());
+}
+
+$oP->output();
+?>
diff --git a/pages/notifications.php b/pages/notifications.php
index 093b76b3c..384db331a 100644
--- a/pages/notifications.php
+++ b/pages/notifications.php
@@ -1,106 +1,106 @@
-<?php
-// Copyright (C) 2013-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Page to configuration the notifications (triggers and actions)
- *
- * @copyright   Copyright (C) 2013-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-ApplicationMenu::CheckMenuIdEnabled("NotificationsMenu");
-
-// Main program
-//
-$oP = new iTopWebPage(Dict::S('Menu:NotificationsMenu+'));
-
-$oP->add('<div class="page_header" style="padding:0.5em;">');
-$oP->add('<h1>'.dict::S('UI:NotificationsMenu:Title').'</h1>');
-$oP->add('</div>');
-
-$oP->SetBreadCrumbEntry('ui-tool-notifications', Dict::S('Menu:NotificationsMenu'), Dict::S('Menu:NotificationsMenu+'), '', '../images/bell.png');
-
-$oP->StartCollapsibleSection(Dict::S('UI:NotificationsMenu:Help'), true, 'notifications-home');
-$oP->add('<div style="padding: 1em; font-size:10pt;background:#E8F3CF;margin-top: 0.25em;">');
-$oP->add('<img src="../images/bell.png" style="margin-top: -60px; margin-right: 10px; float: right;">');
-$oP->add(Dict::S('UI:NotificationsMenu:HelpContent'));
-$oP->add('</div>');
-$oP->add('');
-$oP->add('');
-$oP->EndCollapsibleSection();
-
-$oP->add('<p>&nbsp;</p>');
-
-
-$oP->AddTabContainer('Tabs_0');
-$oP->SetCurrentTabContainer('Tabs_0');
-
-$oP->SetCurrentTab(Dict::S('UI:NotificationsMenu:Triggers'));
-$oP->add('<h2>'.Dict::S('UI:NotificationsMenu:AvailableTriggers').'</h2>');
-$oFilter = new DBObjectSearch('Trigger');
-$aParams = array();
-$oBlock = new DisplayBlock($oFilter, 'list', false, $aParams);
-$oBlock->Display($oP, 'block_0', $aParams);
-
-
-$aActionClasses = array();
-foreach(MetaModel::EnumChildClasses('Action', ENUM_CHILD_CLASSES_EXCLUDETOP) as $sActionClass)
-{
-	if (!MetaModel::IsAbstract($sActionClass))
-	{
-		$aActionClasses[] = $sActionClass;
-	}
-}
-
-$oP->SetCurrentTab(Dict::S('UI:NotificationsMenu:Actions'));
-
-if (count($aActionClasses) == 1)
-{
-	// Preserve old style
-	$oP->add('<h2>'.Dict::S('UI:NotificationsMenu:AvailableActions').'</h2>');
-}
-
-$iBlock = 0;
-foreach($aActionClasses as $sActionClass)
-{
-	if (count($aActionClasses) > 1)
-	{
-		// New style
-		$oP->add('<h2>'.MetaModel::GetName($sActionClass).'</h2>');
-	}
-	$oFilter = new DBObjectSearch($sActionClass);
-	$oFilter->AddCondition('finalclass', $sActionClass); // derived classes will be further processed
-	$aParams = array();
-	$oBlock = new DisplayBlock($oFilter, 'list', false, $aParams);
-	$oBlock->Display($oP, 'block_action_'.$iBlock, $aParams);
-	$iBlock++;
-}
-
-$oP->SetCurrentTab('');
-$oP->SetCurrentTabContainer('');
-
+<?php
+// Copyright (C) 2013-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Page to configuration the notifications (triggers and actions)
+ *
+ * @copyright   Copyright (C) 2013-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+ApplicationMenu::CheckMenuIdEnabled("NotificationsMenu");
+
+// Main program
+//
+$oP = new iTopWebPage(Dict::S('Menu:NotificationsMenu+'));
+
+$oP->add('<div class="page_header" style="padding:0.5em;">');
+$oP->add('<h1>'.dict::S('UI:NotificationsMenu:Title').'</h1>');
+$oP->add('</div>');
+
+$oP->SetBreadCrumbEntry('ui-tool-notifications', Dict::S('Menu:NotificationsMenu'), Dict::S('Menu:NotificationsMenu+'), '', '../images/bell.png');
+
+$oP->StartCollapsibleSection(Dict::S('UI:NotificationsMenu:Help'), true, 'notifications-home');
+$oP->add('<div style="padding: 1em; font-size:10pt;background:#E8F3CF;margin-top: 0.25em;">');
+$oP->add('<img src="../images/bell.png" style="margin-top: -60px; margin-right: 10px; float: right;">');
+$oP->add(Dict::S('UI:NotificationsMenu:HelpContent'));
+$oP->add('</div>');
+$oP->add('');
+$oP->add('');
+$oP->EndCollapsibleSection();
+
+$oP->add('<p>&nbsp;</p>');
+
+
+$oP->AddTabContainer('Tabs_0');
+$oP->SetCurrentTabContainer('Tabs_0');
+
+$oP->SetCurrentTab(Dict::S('UI:NotificationsMenu:Triggers'));
+$oP->add('<h2>'.Dict::S('UI:NotificationsMenu:AvailableTriggers').'</h2>');
+$oFilter = new DBObjectSearch('Trigger');
+$aParams = array();
+$oBlock = new DisplayBlock($oFilter, 'list', false, $aParams);
+$oBlock->Display($oP, 'block_0', $aParams);
+
+
+$aActionClasses = array();
+foreach(MetaModel::EnumChildClasses('Action', ENUM_CHILD_CLASSES_EXCLUDETOP) as $sActionClass)
+{
+	if (!MetaModel::IsAbstract($sActionClass))
+	{
+		$aActionClasses[] = $sActionClass;
+	}
+}
+
+$oP->SetCurrentTab(Dict::S('UI:NotificationsMenu:Actions'));
+
+if (count($aActionClasses) == 1)
+{
+	// Preserve old style
+	$oP->add('<h2>'.Dict::S('UI:NotificationsMenu:AvailableActions').'</h2>');
+}
+
+$iBlock = 0;
+foreach($aActionClasses as $sActionClass)
+{
+	if (count($aActionClasses) > 1)
+	{
+		// New style
+		$oP->add('<h2>'.MetaModel::GetName($sActionClass).'</h2>');
+	}
+	$oFilter = new DBObjectSearch($sActionClass);
+	$oFilter->AddCondition('finalclass', $sActionClass); // derived classes will be further processed
+	$aParams = array();
+	$oBlock = new DisplayBlock($oFilter, 'list', false, $aParams);
+	$oBlock->Display($oP, 'block_action_'.$iBlock, $aParams);
+	$iBlock++;
+}
+
+$oP->SetCurrentTab('');
+$oP->SetCurrentTabContainer('');
+
 $oP->output();
\ No newline at end of file
diff --git a/pages/opensearch.xml.php b/pages/opensearch.xml.php
index aab0ab646..1c4d791af 100644
--- a/pages/opensearch.xml.php
+++ b/pages/opensearch.xml.php
@@ -1,45 +1,45 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * ???
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/startup.inc.php');
-
-
-$sFullUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
-$sICOFullUrl = utils::GetAbsoluteUrlAppRoot().'/images/iTop-icon.ico';
-$sPNGFullUrl = utils::GetAbsoluteUrlAppRoot().'images/iTop-icon.png';
-header('Content-type: text/xml');
-?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
-<ShortName>iTop</ShortName>
-<Contact>webmaster@itop.com</Contact>
-<Description>Search in iTop</Description>
-<InputEncoding>UTF-8</InputEncoding>
-<Url type="text/html" method="get" template="<?php echo $sFullUrl;?>?text={searchTerms}&amp;operation=full_text"/>
-<moz:SearchForm><?php echo $sFullUrl;?></moz:SearchForm>
-<Image height="16" width="16" type="image/x-icon"><?php echo $sICOFullUrl;?></Image>
-<Image height="64" width="64" type="image/png"><?php echo $sPNGFullUrl;?></Image>
-</OpenSearchDescription>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * ???
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+
+
+$sFullUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
+$sICOFullUrl = utils::GetAbsoluteUrlAppRoot().'/images/iTop-icon.ico';
+$sPNGFullUrl = utils::GetAbsoluteUrlAppRoot().'images/iTop-icon.png';
+header('Content-type: text/xml');
+?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
+<ShortName>iTop</ShortName>
+<Contact>webmaster@itop.com</Contact>
+<Description>Search in iTop</Description>
+<InputEncoding>UTF-8</InputEncoding>
+<Url type="text/html" method="get" template="<?php echo $sFullUrl;?>?text={searchTerms}&amp;operation=full_text"/>
+<moz:SearchForm><?php echo $sFullUrl;?></moz:SearchForm>
+<Image height="16" width="16" type="image/x-icon"><?php echo $sICOFullUrl;?></Image>
+<Image height="64" width="64" type="image/png"><?php echo $sPNGFullUrl;?></Image>
+</OpenSearchDescription>
diff --git a/pages/run_query.php b/pages/run_query.php
index 22e919d93..71e963842 100644
--- a/pages/run_query.php
+++ b/pages/run_query.php
@@ -1,275 +1,275 @@
-<?php
-// Copyright (C) 2010-2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Tools to design OQL queries and test them
- *
- * @copyright   Copyright (C) 2010-2016 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-require_once(APPROOT.'/application/startup.inc.php');
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-ApplicationMenu::CheckMenuIdEnabled('RunQueriesMenu');
-
-function ShowExamples($oP, $sExpression)
-{
-	$bUsingExample = false;
-
-	$aExamples = array(
-		'Pedagogic examples' => array(
-			"Web applications" => "SELECT WebApplication",
-			"Person having an 'A' in their name" => "SELECT Person AS B WHERE B.name LIKE '%A%'",
-			"Servers having a name like dbserver1.demo.com or dbserver023.foo.fr" => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\..+\\\\.[a-z]{2,3}$'",
-			"Changes planned on new year's day" => "SELECT Change AS ch WHERE ch.start_date >= '2009-12-31' AND ch.end_date <= '2010-01-01'",
-			"IPs in a range" => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')",
-			"Persons below a given root organization" => "SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1",
-		),
-		'Usefull examples' => array(
-			"NW interfaces of equipment in production for customer 'Demo'" => "SELECT PhysicalInterface AS if JOIN DatacenterDevice AS dev ON if.connectableci_id = dev.id WHERE dev.status = 'production' AND dev.organization_name = 'Demo'",
-			"My tickets" => "SELECT Ticket AS t WHERE t.agent_id = :current_contact_id",
-			"People being owner of an active ticket" => "SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",
-			"Contracts terminating in the next thirty days" => "SELECT Contract AS c WHERE c.end_date > NOW() AND c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)",
-			"Orphan tickets (opened one hour ago, still not assigned)" => "SELECT UserRequest AS u WHERE u.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND u.status = 'new'",
-			"Long lasting incidents (duration > 8 hours)" => "SELECT UserRequest AS u WHERE u.close_date > DATE_ADD(u.start_date, INTERVAL 8 HOUR)",
-		),
-	);
-
-	$aDisplayData = array();
-	$oAppContext = new ApplicationContext();
-	$sContext = $oAppContext->GetForForm();
-	foreach($aExamples as $sTopic => $aQueries)
-	{
-		foreach($aQueries as $sDescription => $sOql)
-		{
-			$sHighlight = '';
-			$sDisable = '';
-			if ($sOql == $sExpression)
-			{
-				// this one is currently being tested, highlight it
-				$sHighlight = "background-color:yellow;";
-				$sDisable = 'disabled';
-				// and remember we are testing a query of the list
-				$bUsingExample = true;
-			}
-			//$aDisplayData[$sTopic][] = array(
-			$aDisplayData[Dict::S('UI:RunQuery:QueryExamples')][] = array(
-				'desc' => "<div style=\"$sHighlight\">".htmlentities($sDescription, ENT_QUOTES, 'UTF-8')."</div>",
-				'oql' => "<div style=\"$sHighlight\">".htmlentities($sOql, ENT_QUOTES, 'UTF-8')."</div>",
-				'go' => "<form method=\"get\"><input type=\"hidden\" name=\"expression\" value=\"$sOql\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Test')."\" $sDisable>$sContext</form>\n",
-			);
-		}
-	}
-	$aDisplayConfig = array();
-	$aDisplayConfig['desc'] = array('label' => Dict::S('UI:RunQuery:HeaderPurpose'), 'description' => Dict::S('UI:RunQuery:HeaderPurpose+'));
-	$aDisplayConfig['oql'] = array('label' => Dict::S('UI:RunQuery:HeaderOQLExpression'), 'description' => Dict::S('UI:RunQuery:HeaderOQLExpression+'));
-	$aDisplayConfig['go'] = array('label' => '', 'description' => '');
-
-	foreach ($aDisplayData as $sTopic => $aQueriesDisplayData)
-	{
-		$bShowOpened = $bUsingExample;
-		$oP->StartCollapsibleSection($sTopic, $bShowOpened);
-		$oP->table($aDisplayConfig, $aQueriesDisplayData);
-		$oP->EndCollapsibleSection();
-	}
-}
-
-$sOperation = utils::ReadParam('operation', 'menu');
-$oAppContext = new ApplicationContext();
-
-$oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'));
-$oP->SetBreadCrumbEntry('ui-tool-runquery', Dict::S('Menu:RunQueriesMenu'), Dict::S('Menu:RunQueriesMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
-
-// Main program
-$sExpression = utils::ReadParam('expression', '', false, 'raw_data');
-$sEncoding = utils::ReadParam('encoding', 'oql');
-
-ShowExamples($oP, $sExpression);
-
-try
-{
-	if ($sEncoding == 'crypted')
-	{
-		// Translate $sExpression into a oql expression
-		$sClearText = base64_decode($sExpression);
-		echo "<strong>FYI: '$sClearText'</strong><br/>\n";
-		$oFilter = DBObjectSearch::unserialize($sExpression);
-		$sExpression = $oFilter->ToOQL();
-	}
-	else
-	{
-		// leave $sExpression as is
-	}
-
-	$oFilter = null;
-	$aArgs = array();
-	$sSyntaxError = null;
-
-	if (!empty($sExpression))
-	{
-		try
-		{
-			$oFilter = DBObjectSearch::FromOQL($sExpression);
-		}
-		catch(Exception $e)
-		{
-			if ($e instanceof OqlException)
-			{
-				$sSyntaxError = $e->getHtmlDesc();
-			}
-			else
-			{
-				$sSyntaxError = $e->getMessage();
-			}
-		}
-
-		if ($oFilter)
-		{
-			$aArgs = array();
-			foreach($oFilter->GetQueryParams() as $sParam => $foo)
-			{
-				$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
-				if (!is_null($value))
-				{
-					$aArgs[$sParam] = $value;
-				}
-				else
-				{
-					$aArgs[$sParam] = '';
-				}
-			}
-			$oFilter->SetInternalParams($aArgs);
-		}
-		elseif ($sSyntaxError)
-		{
-			// Query arguments taken from the page args
-		}
-	}
-
-	$oP->add("<form method=\"post\">\n");
-	$oP->add(Dict::S('UI:RunQuery:ExpressionToEvaluate')."<br/>\n");
-	$oP->add("<textarea cols=\"120\" rows=\"8\" id=\"expression\" name=\"expression\">".htmlentities($sExpression, ENT_QUOTES, 'UTF-8')."</textarea>\n");
-	$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
-	$oP->add_ready_script(<<<EOF
-$("#expression").select();
-$("#expression").on("keydown", null, "ctrl+return", function() {
-	$(this).closest("form").submit();
-});
-EOF
-	);
-
-	if (count($aArgs) > 0)
-	{
-		$oP->add("<div class=\"wizContainer\">\n");
-		$oP->add("<h3>Query arguments</h3>\n");
-		foreach($aArgs as $sParam => $sValue)
-		{
-			$oP->p("$sParam: <input type=\"string\" name=\"arg_$sParam\" value=\"$sValue\">\n");
-		}
-		$oP->add("</div>\n"); 
-	}
-
-	$oP->add("<input type=\"submit\" value=\"".Dict::S('UI:Button:Evaluate')."\" title=\"".Dict::S('UI:Button:Evaluate:Title')."\">\n");
-	$oP->add($oAppContext->GetForForm());
-	$oP->add("</form>\n");
-
-	if ($oFilter)
-	{
-		$oP->add("<h3>Query results</h3>\n");
-		
-		$oResultBlock = new DisplayBlock($oFilter, 'list', false);
-		$oResultBlock->Display($oP, 'runquery');
-
-		// Breadcrumb
-		//$iCount = $oResultBlock->GetDisplayedCount();
-		$sPageId = "ui-search-".$oFilter->GetClass();
-		$sLabel = MetaModel::GetName($oFilter->GetClass());
-		$aArgs = array();
-		foreach (array_merge($_POST, $_GET) as $sKey => $value)
-		{
-			if (is_array($value))
-			{
-				$aItems = array();
-				foreach($value as $sItemKey => $sItemValue)
-				{
-					$aArgs[] = $sKey.'['.$sItemKey.']='.urlencode($sItemValue);
-				}
-			}
-			else
-			{
-				$aArgs[] = $sKey.'='.urlencode($value);
-			}
-		}
-		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/run_query.php?'.implode('&', $aArgs);
-		$oP->SetBreadCrumbEntry($sPageId, $sLabel, $oFilter->ToOQL(true), $sUrl, '../images/breadcrumb-search.png');
-
-		$oP->p('');
-		$oP->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false, 'runQuery');
-		$oP->p(Dict::S('UI:RunQuery:DevelopedQuery').htmlentities($oFilter->ToOQL(), ENT_QUOTES, 'UTF-8'));
-		$oP->p(Dict::S('UI:RunQuery:SerializedFilter').$oFilter->serialize());
-		$oP->EndCollapsibleSection();
-	}
-	elseif ($sSyntaxError)
-	{
-		if ($e instanceof OqlException)
-		{
-			$sWrongWord = $e->GetWrongWord();
-			$aSuggestedWords = $e->GetSuggestions();
-			if (count($aSuggestedWords) > 0)
-			{
-				$sSuggestedWord = OqlException::FindClosestString($sWrongWord, $aSuggestedWords);
-		
-				if (strlen($sSuggestedWord) > 0)
-				{
-					$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->GetIssue().' <em>'.$sWrongWord).'</em></b>');
-					$sBefore = substr($sExpression, 0, $e->GetColumn());
-					$sAfter = substr($sExpression, $e->GetColumn() + strlen($sWrongWord));
-					$sFixedExpression = $sBefore.$sSuggestedWord.$sAfter;
-					$sFixedExpressionHtml = $sBefore.'<span style="background-color:yellow">'.$sSuggestedWord.'</span>'.$sAfter;
-					$oP->p("Suggesting: $sFixedExpressionHtml");
-					$oP->add('<button onClick="$(\'textarea[name=expression]\').val(\''.htmlentities(addslashes($sFixedExpression)).'\');">Use this query</button>');
-				}
-				else
-				{
-					$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
-				}
-			}
-			else
-			{
-				$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
-			}
-		}
-		else
-		{
-			$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
-		}
-	}
-}
-catch(Exception $e)
-{
-	$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
-}
-
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Tools to design OQL queries and test them
+ *
+ * @copyright   Copyright (C) 2010-2016 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+ApplicationMenu::CheckMenuIdEnabled('RunQueriesMenu');
+
+function ShowExamples($oP, $sExpression)
+{
+	$bUsingExample = false;
+
+	$aExamples = array(
+		'Pedagogic examples' => array(
+			"Web applications" => "SELECT WebApplication",
+			"Person having an 'A' in their name" => "SELECT Person AS B WHERE B.name LIKE '%A%'",
+			"Servers having a name like dbserver1.demo.com or dbserver023.foo.fr" => "SELECT Server WHERE name REGEXP '^dbserver[0-9]+\\\\..+\\\\.[a-z]{2,3}$'",
+			"Changes planned on new year's day" => "SELECT Change AS ch WHERE ch.start_date >= '2009-12-31' AND ch.end_date <= '2010-01-01'",
+			"IPs in a range" => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')",
+			"Persons below a given root organization" => "SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1",
+		),
+		'Usefull examples' => array(
+			"NW interfaces of equipment in production for customer 'Demo'" => "SELECT PhysicalInterface AS if JOIN DatacenterDevice AS dev ON if.connectableci_id = dev.id WHERE dev.status = 'production' AND dev.organization_name = 'Demo'",
+			"My tickets" => "SELECT Ticket AS t WHERE t.agent_id = :current_contact_id",
+			"People being owner of an active ticket" => "SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",
+			"Contracts terminating in the next thirty days" => "SELECT Contract AS c WHERE c.end_date > NOW() AND c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY)",
+			"Orphan tickets (opened one hour ago, still not assigned)" => "SELECT UserRequest AS u WHERE u.start_date < DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND u.status = 'new'",
+			"Long lasting incidents (duration > 8 hours)" => "SELECT UserRequest AS u WHERE u.close_date > DATE_ADD(u.start_date, INTERVAL 8 HOUR)",
+		),
+	);
+
+	$aDisplayData = array();
+	$oAppContext = new ApplicationContext();
+	$sContext = $oAppContext->GetForForm();
+	foreach($aExamples as $sTopic => $aQueries)
+	{
+		foreach($aQueries as $sDescription => $sOql)
+		{
+			$sHighlight = '';
+			$sDisable = '';
+			if ($sOql == $sExpression)
+			{
+				// this one is currently being tested, highlight it
+				$sHighlight = "background-color:yellow;";
+				$sDisable = 'disabled';
+				// and remember we are testing a query of the list
+				$bUsingExample = true;
+			}
+			//$aDisplayData[$sTopic][] = array(
+			$aDisplayData[Dict::S('UI:RunQuery:QueryExamples')][] = array(
+				'desc' => "<div style=\"$sHighlight\">".htmlentities($sDescription, ENT_QUOTES, 'UTF-8')."</div>",
+				'oql' => "<div style=\"$sHighlight\">".htmlentities($sOql, ENT_QUOTES, 'UTF-8')."</div>",
+				'go' => "<form method=\"get\"><input type=\"hidden\" name=\"expression\" value=\"$sOql\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Test')."\" $sDisable>$sContext</form>\n",
+			);
+		}
+	}
+	$aDisplayConfig = array();
+	$aDisplayConfig['desc'] = array('label' => Dict::S('UI:RunQuery:HeaderPurpose'), 'description' => Dict::S('UI:RunQuery:HeaderPurpose+'));
+	$aDisplayConfig['oql'] = array('label' => Dict::S('UI:RunQuery:HeaderOQLExpression'), 'description' => Dict::S('UI:RunQuery:HeaderOQLExpression+'));
+	$aDisplayConfig['go'] = array('label' => '', 'description' => '');
+
+	foreach ($aDisplayData as $sTopic => $aQueriesDisplayData)
+	{
+		$bShowOpened = $bUsingExample;
+		$oP->StartCollapsibleSection($sTopic, $bShowOpened);
+		$oP->table($aDisplayConfig, $aQueriesDisplayData);
+		$oP->EndCollapsibleSection();
+	}
+}
+
+$sOperation = utils::ReadParam('operation', 'menu');
+$oAppContext = new ApplicationContext();
+
+$oP = new iTopWebPage(Dict::S('UI:RunQuery:Title'));
+$oP->SetBreadCrumbEntry('ui-tool-runquery', Dict::S('Menu:RunQueriesMenu'), Dict::S('Menu:RunQueriesMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+
+// Main program
+$sExpression = utils::ReadParam('expression', '', false, 'raw_data');
+$sEncoding = utils::ReadParam('encoding', 'oql');
+
+ShowExamples($oP, $sExpression);
+
+try
+{
+	if ($sEncoding == 'crypted')
+	{
+		// Translate $sExpression into a oql expression
+		$sClearText = base64_decode($sExpression);
+		echo "<strong>FYI: '$sClearText'</strong><br/>\n";
+		$oFilter = DBObjectSearch::unserialize($sExpression);
+		$sExpression = $oFilter->ToOQL();
+	}
+	else
+	{
+		// leave $sExpression as is
+	}
+
+	$oFilter = null;
+	$aArgs = array();
+	$sSyntaxError = null;
+
+	if (!empty($sExpression))
+	{
+		try
+		{
+			$oFilter = DBObjectSearch::FromOQL($sExpression);
+		}
+		catch(Exception $e)
+		{
+			if ($e instanceof OqlException)
+			{
+				$sSyntaxError = $e->getHtmlDesc();
+			}
+			else
+			{
+				$sSyntaxError = $e->getMessage();
+			}
+		}
+
+		if ($oFilter)
+		{
+			$aArgs = array();
+			foreach($oFilter->GetQueryParams() as $sParam => $foo)
+			{
+				$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
+				if (!is_null($value))
+				{
+					$aArgs[$sParam] = $value;
+				}
+				else
+				{
+					$aArgs[$sParam] = '';
+				}
+			}
+			$oFilter->SetInternalParams($aArgs);
+		}
+		elseif ($sSyntaxError)
+		{
+			// Query arguments taken from the page args
+		}
+	}
+
+	$oP->add("<form method=\"post\">\n");
+	$oP->add(Dict::S('UI:RunQuery:ExpressionToEvaluate')."<br/>\n");
+	$oP->add("<textarea cols=\"120\" rows=\"8\" id=\"expression\" name=\"expression\">".htmlentities($sExpression, ENT_QUOTES, 'UTF-8')."</textarea>\n");
+	$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
+	$oP->add_ready_script(<<<EOF
+$("#expression").select();
+$("#expression").on("keydown", null, "ctrl+return", function() {
+	$(this).closest("form").submit();
+});
+EOF
+	);
+
+	if (count($aArgs) > 0)
+	{
+		$oP->add("<div class=\"wizContainer\">\n");
+		$oP->add("<h3>Query arguments</h3>\n");
+		foreach($aArgs as $sParam => $sValue)
+		{
+			$oP->p("$sParam: <input type=\"string\" name=\"arg_$sParam\" value=\"$sValue\">\n");
+		}
+		$oP->add("</div>\n"); 
+	}
+
+	$oP->add("<input type=\"submit\" value=\"".Dict::S('UI:Button:Evaluate')."\" title=\"".Dict::S('UI:Button:Evaluate:Title')."\">\n");
+	$oP->add($oAppContext->GetForForm());
+	$oP->add("</form>\n");
+
+	if ($oFilter)
+	{
+		$oP->add("<h3>Query results</h3>\n");
+		
+		$oResultBlock = new DisplayBlock($oFilter, 'list', false);
+		$oResultBlock->Display($oP, 'runquery');
+
+		// Breadcrumb
+		//$iCount = $oResultBlock->GetDisplayedCount();
+		$sPageId = "ui-search-".$oFilter->GetClass();
+		$sLabel = MetaModel::GetName($oFilter->GetClass());
+		$aArgs = array();
+		foreach (array_merge($_POST, $_GET) as $sKey => $value)
+		{
+			if (is_array($value))
+			{
+				$aItems = array();
+				foreach($value as $sItemKey => $sItemValue)
+				{
+					$aArgs[] = $sKey.'['.$sItemKey.']='.urlencode($sItemValue);
+				}
+			}
+			else
+			{
+				$aArgs[] = $sKey.'='.urlencode($value);
+			}
+		}
+		$sUrl = utils::GetAbsoluteUrlAppRoot().'pages/run_query.php?'.implode('&', $aArgs);
+		$oP->SetBreadCrumbEntry($sPageId, $sLabel, $oFilter->ToOQL(true), $sUrl, '../images/breadcrumb-search.png');
+
+		$oP->p('');
+		$oP->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false, 'runQuery');
+		$oP->p(Dict::S('UI:RunQuery:DevelopedQuery').htmlentities($oFilter->ToOQL(), ENT_QUOTES, 'UTF-8'));
+		$oP->p(Dict::S('UI:RunQuery:SerializedFilter').$oFilter->serialize());
+		$oP->EndCollapsibleSection();
+	}
+	elseif ($sSyntaxError)
+	{
+		if ($e instanceof OqlException)
+		{
+			$sWrongWord = $e->GetWrongWord();
+			$aSuggestedWords = $e->GetSuggestions();
+			if (count($aSuggestedWords) > 0)
+			{
+				$sSuggestedWord = OqlException::FindClosestString($sWrongWord, $aSuggestedWords);
+		
+				if (strlen($sSuggestedWord) > 0)
+				{
+					$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->GetIssue().' <em>'.$sWrongWord).'</em></b>');
+					$sBefore = substr($sExpression, 0, $e->GetColumn());
+					$sAfter = substr($sExpression, $e->GetColumn() + strlen($sWrongWord));
+					$sFixedExpression = $sBefore.$sSuggestedWord.$sAfter;
+					$sFixedExpressionHtml = $sBefore.'<span style="background-color:yellow">'.$sSuggestedWord.'</span>'.$sAfter;
+					$oP->p("Suggesting: $sFixedExpressionHtml");
+					$oP->add('<button onClick="$(\'textarea[name=expression]\').val(\''.htmlentities(addslashes($sFixedExpression)).'\');">Use this query</button>');
+				}
+				else
+				{
+					$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
+				}
+			}
+			else
+			{
+				$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getHtmlDesc()).'</b>');
+			}
+		}
+		else
+		{
+			$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
+		}
+	}
+}
+catch(Exception $e)
+{
+	$oP->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
+}
+
+$oP->output();
+?>
diff --git a/pages/schema.php b/pages/schema.php
index f73633820..e4a8758aa 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -1,1121 +1,1121 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Presentation of the data model
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-ApplicationMenu::CheckMenuIdEnabled('DataModelMenu');
-
-/**
- * Helper for this page -> link to a class
- */
-function MakeClassHLink($sClass, $sContext)
-{
-	return "<a href=\"schema.php?operation=details_class&class=$sClass{$sContext}\" title=\"".html_entity_decode(MetaModel::GetClassDescription($sClass),ENT_QUOTES,'UTF-8')."\"><span class=\"attrLabel\">".MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" .$sClass."</span><span class=\"parenthesis\">)</span></a>";
-}
-
-/**
- * Helper for this page -> link to a class
- */
-function MakeRelationHLink($sRelCode, $sContext)
-{
-	$sDesc = MetaModel::GetRelationDescription($sRelCode);
-	return "<a href=\"schema.php?operation=details_relation&relcode=$sRelCode{$sContext}\" title=\"$sDesc\">".$sRelCode."</a>";
-}
-
-/**
- * Helper for the global list and the details of a given class
- */
-function DisplaySubclasses($oPage, $sClass, $sContext)
-{
-	$aChildClasses = MetaModel::EnumChildClasses($sClass);
-	if (count($aChildClasses) != 0)
-	{
-		$oPage->add("<ul>\n");
-		$aOrderedClasses = array();
-		foreach($aChildClasses as $sClassName)
-		{
-			// Skip indirect childs, they will be handled somewhere else
-			if (MetaModel::GetParentPersistentClass($sClassName) == $sClass)
-			{
-					$aOrderedClasses[$sClassName] = MetaModel::GetName($sClassName);
-			}
-		}
-		// Sort on the display name
-		asort($aOrderedClasses);
-		foreach($aOrderedClasses as $sClassName => $sDisplayName)
-		{
-			// Skip indirect childs, they will be handled somewhere else
-			if (MetaModel::GetParentPersistentClass($sClassName) == $sClass)
-			{
-					$oPage->add("<li class=\"open\">".MakeClassHLink($sClassName, $sContext)."\n");
-					DisplaySubclasses($oPage, $sClassName, $sContext);
-					$oPage->add("</li>\n");
-			}
-		}
-		$oPage->add("</ul>\n");
-	}
-}
-
-/**
- * Helper for the lifecycle details of a given class
- */
-function DisplayLifecycle($oPage, $sClass)
-{
-	$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
-	if (empty($sStateAttCode))
-	{
-		$oPage->p(Dict::S('UI:Schema:NoLifeCyle'));
-	}
-	else
-	{
-		$aStates = MetaModel::EnumStates($sClass);
-		$aStimuli = MetaModel::EnumStimuli($sClass);
-		$oPage->add("<img id=\"img-lifecycle\" attr=\"$sClass lifecycle graph\" src=\"".utils::GetAbsoluteUrlAppRoot()."pages/graphviz.php?class=$sClass\">\n");
-		$oPage->add_ready_script(
-			<<<EOF
-			$("#img-lifecycle").attr('href',$("#img-lifecycle").attr('src'));
-			$("#img-lifecycle").magnificPopup({type: 'image', closeOnContentClick: true});
-EOF
-
-		);
-		$oPage->add("<button id=\"lifecycleOpenAll\">Open All</button> <button id=\"lifecycleCloseAll\">Close All</button>");
-		$oPage->add_ready_script(
-			<<<EOF
-			$("#lifecycleOpenAll").on('click',function(){
-				$('#LifeCycleList').find('.expandable-hitarea').click();
-				$('#LifeCycleAttrOptList').find('.expandable-hitarea').click();
-			});	
-				
-			$("#lifecycleCloseAll").on('click',function(){
-				$('#LifeCycleList').find('.collapsable-hitarea').click();
-				$('#LifeCycleAttrOptList').find('.collapsable-hitarea').click();
-			});	
-EOF
-		);
-		$oPage->add("<h3>".Dict::S('UI:Schema:LifeCycleTransitions')."</h3>\n");
-		$oPage->add("<ul id=\"LifeCycleList\" >\n");
-		foreach ($aStates as $sStateCode => $aStateDef)
-		{
-			$sStateLabel = MetaModel::GetStateLabel($sClass, $sStateCode);
-			$sStateDescription = MetaModel::GetStateDescription($sClass, $sStateCode);
-			$oPage->add("<li class=\"closed\"><span class=\"attrLabel\">$sStateLabel </span><span style=\"color:grey;\"><span class=\"parenthesis\">(</span><span class=\"attrCode\">$sStateCode</span><span class=\"parenthesis\">) </span>$sStateDescription</span>\n");
-			$oPage->add("<ul class=\"closed\">\n");
-			foreach(MetaModel::EnumTransitions($sClass, $sStateCode) as $sStimulusCode => $aTransitionDef)
-			{
-				$sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel();
-				$sTargetState = $aTransitionDef['target_state'];
-				$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $sTargetState);
-				if (count($aTransitionDef['actions']) > 0)
-				{
-					$aActionsDesc = array();
-					foreach ($aTransitionDef['actions'] as $actionHandler)
-					{
-						if (is_string($actionHandler))
-						{
-							$aActionsDesc[] = $actionHandler;
-						}
-						else
-						{
-							$aParamsDesc = array();
-							foreach ($actionHandler['params'] as $aParamData)
-							{
-								$aParamsDesc[] = $aParamData['type'].':'.$aParamData['value'];
-							}
-							$aActionsDesc[] = $actionHandler['verb'].'('.implode(', ', $aParamsDesc).')';
-						}
-					}
-					$sActions = " <em>(".implode(', ', $aActionsDesc).")</em>";
-				}
-				else
-				{
-					$sActions = "";
-				}
-
-				$oPage->add("<li class=\"closed\"><span class=\"attrLabel\" title=\"code: $sStimulusCode\" style=\"color:red;font-weight:bold;\">$sStimulusLabel</span>
-								<span style=\"color:grey;\"><span class=\"parenthesis\">(</span><span class=\"attrCode\">$sStimulusCode</span><span class=\"parenthesis\">)</span> </span>
-								=&gt;
-								<span class=\"attrLabel\">$sTargetStateLabel </span><span style=\"color:grey;\"><span class=\"parenthesis\">(</span> <span class=\"attrCode\">$sTargetState</span> <span class=\"parenthesis\">)</span></span> $sActions</li>\n");
-			}
-			$oPage->add("</ul></li>\n");
-		}
-		$oPage->add("</ul>\n");
-		$oPage->add("<h3>".Dict::S('UI:Schema:LifeCyleAttributeOptions')."</h3>\n");
-		$oPage->add("<ul id=\"LifeCycleAttrOptList\">\n");
-		foreach ($aStates as $sStateCode => $aStateDef)
-		{
-			$sStateLabel = MetaModel::GetStateLabel($sClass, $sStateCode);
-			$sStateDescription = MetaModel::GetStateDescription($sClass, $sStateCode);
-            $oPage->add("<li class=\"closed\"><span class=\"attrLabel\">$sStateLabel </span><span style=\"color:grey;\"><span class=\"parenthesis\">(</span><span class=\"attrCode\">$sStateCode</span><span class=\"parenthesis\">) </span>$sStateDescription</span>\n");
-			if (count($aStates[$sStateCode]['attribute_list']) > 0)
-			{
-				$oPage->add("<ul>\n");
-				foreach($aStates[$sStateCode]['attribute_list'] as $sAttCode => $iOptions)
-				{
-					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-					$sAttLabel = $oAttDef->GetLabel();
-	
-					$aOptions = array();
-					if ($iOptions & OPT_ATT_HIDDEN) $aOptions[] = Dict::S('UI:Schema:LifeCycleHiddenAttribute');
-					if ($iOptions & OPT_ATT_READONLY) $aOptions[] = Dict::S('UI:Schema:LifeCycleReadOnlyAttribute');
-					if ($iOptions & OPT_ATT_MANDATORY) $aOptions[] = Dict::S('UI:Schema:LifeCycleMandatoryAttribute');
-					if ($iOptions & OPT_ATT_MUSTCHANGE) $aOptions[] = Dict::S('UI:Schema:LifeCycleAttributeMustChange');
-					if ($iOptions & OPT_ATT_MUSTPROMPT) $aOptions[] = Dict::S('UI:Schema:LifeCycleAttributeMustPrompt');
-					if (count($aOptions))
-					{
-						$sOptions = implode(', ', $aOptions);
-					}
-					else
-					{
-						$sOptions = "";
-					}
-	
-					$oPage->add("<li class=\"closed\"><span style=\"color:purple;font-weight=bold;\">$sAttLabel</span> $sOptions</li>\n");
-				}
-				$oPage->add("</ul></li>\n");
-			}
-			else
-			{
-				$oPage->p("<em>".Dict::S('UI:Schema:LifeCycleEmptyList')."</em>");
-			}
-		}
-		$oPage->add("</ul>\n");
-        $oPage->add_ready_script('$("#LifeCycleList").treeview({collapsed: true,});');
-        $oPage->add_ready_script('$("#LifeCycleAttrOptList").treeview({collapsed: true,});');
-    }
-}
-
-
-/**
- * Helper for the trigger
- */
-function DisplayTriggers($oPage, $sClass)
-{
-	$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-	$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObject WHERE target_class IN ('$sClassList')"));
-	cmdbAbstractObject::DisplaySet($oPage, $oSet, array('block_id' => 'triggers'));
-}
-
-
-/**
- * Display the list of classes from the business model
- */
-function DisplayClassesList($oPage, $sContext)
-{
-	$oPage->add("<h1>".Dict::S('UI:Schema:Title')."</h1>\n");
-
-    $oPage->add("<label for='search-model'>" . Dict::S('UI:Schema:ClassFilter') ."</label><br/><input type=\"text\" id=\"search-model\" autofocus=\"autofocus\"/>");
-    $oPage->add("<div id=\"delDataModelSearch\"> <i class=\"fa fa-times-circle\"></i></div>");
-	$oPage->add("<ul id=\"ClassesList\" class=\"treeview fileview\">\n");
-	$oPage->add_ready_script(
-		<<<EOF
-        $("#search-model").result(function(e,f,g,h){
-		   	//$(this).trigger(jQuery.Event('input'));
-		   	var preUrl = "?operation=details_class&class=";
-			var sufUrl = "&c[menu]=DataModelMenu";
-			var code = '';
-		   	switch($("#displaySelector").val()){
-				case 'labelandcode':
-					var id = autocompleteClassLabelAndCode.indexOf(g);
-					if(id != undefined)
-						code = autocompleteClassCode[id];
-				break;
-				case 'label':
-					var id = autocompleteClassLabel.indexOf(g);
-					if(id != undefined)
-						code = autocompleteClassCode[id];
-				break;
-				case 'code':
-					var id = autocompleteClassCode.indexOf(g);
-					if(id != undefined)
-						code = autocompleteClassCode[id];
-				break;
-			}
-			if(code != '')
-				window.location = preUrl + code + sufUrl;
-		});
-		$("#search-model").on('input', function() {
-			var search_result = [];
-			$("#ClassesList").find("li").each(function(){
-				if( ! ~$(this).children("a").text().toLowerCase().indexOf($("#search-model").val().toLowerCase())){
-					$(this).hide();
-				}
-				else{
-					search_result.push($(this));
-				}
-			});
-			search_result.forEach(function(e){
-				e.show();
-				e.find('ul > li').show();
-				e.parents().show();
-			});
-		});
-		$("#delDataModelSearch").on ('click', function(){
-			$("#search-model").val("");
-			$("#search-model").trigger('input');
-		});
-EOF
-
-	);
-	// Get all the "root" classes for display
-	$aRootClasses = array();
-	foreach(MetaModel::GetClasses() as $sClassName)
-	{
-		if (MetaModel::IsRootClass($sClassName))
-		{
-			$aRootClasses[$sClassName] = MetaModel::GetName($sClassName);
-		}
-		elseif (MetaModel::IsStandaloneClass($sClassName))
-		{
-			$aRootClasses[$sClassName] = MetaModel::GetName($sClassName);
-		}
-        $sLabelClassName = MetaModel::GetName($sClassName);
-		//Fetch classes names for autocomplete purpose
-        $oPage->add_script(
-            <<<EOF
-	autocompleteClassLabelAndCode.push("$sLabelClassName ($sClassName)");
-	autocompleteClassLabel.push("$sLabelClassName");
-	autocompleteClassCode.push("$sClassName");
-EOF
-        );
-	}
-	// Sort them alphabetically on their display name
-	asort($aRootClasses);
-	foreach($aRootClasses as $sClassName => $sDisplayName)
-	{
-		if (MetaModel::IsRootClass($sClassName))
-		{
-			$oPage->add("<li class=\"open\">".MakeClassHLink($sClassName, $sContext)."\n");
-			DisplaySubclasses($oPage, $sClassName, $sContext);
-			$oPage->add("</li>\n");
-		}
-		elseif (MetaModel::IsStandaloneClass($sClassName))
-		{
-			$oPage->add("<li>".MakeClassHLink($sClassName, $sContext)."</li>\n");
-		}
-	}
-	$oPage->add("</ul>\n");
-	$oPage->add_ready_script('$("#ClassesList").treeview();');
-}
-
-
-/**
- * Helper for the list of classes related to the given class in a graphical way
- */
-function DisplayRelatedClassesGraph($oPage, $sClass)
-{
-    try
-    {
-        $bOnTheLeft = true;
-        $bSkipLinkingClasses = false;
-		// 1) Fetching referencing classes data
-	    //
-        $aData = array();
-        $aOrigins = array('_' => true);
-        $aRefs = MetaModel::EnumReferencingClasses($sClass, $bSkipLinkingClasses);
-        $sSelfReference = "false";
-        if (count($aRefs) != 0)
-        {
-            foreach ($aRefs as $sRemoteClass => $aRemoteKeys)
-            {
-                foreach ($aRemoteKeys as $sExtKeyAttCode => $oExtKeyAttDef)
-                {
-                	if($sRemoteClass != $sClass)
-					{
-						// ref_prefix to avoid collision between attributes labels that refer to this class and local attributes label that references other classes
-                        $aAttribute = array('label' => 'ref_'.$sExtKeyAttCode);
-                        // Test if a distant attribut exists and if it uses a link class
-                        if(!($oExtKeyAttDef->GetMirrorLinkAttribute() == null ? false : $oExtKeyAttDef->GetMirrorLinkAttribute() instanceof AttributeLinkedSetIndirect))
-                        {
-                            $aAttribute['related'] = $sRemoteClass;
-                            $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
-                            $aAttribute['related_position'] = $bOnTheLeft ? -1 : 1;
-                            $aAttribute['relation_type'] = 0;
-                            $bOnTheLeft = !$bOnTheLeft; // Toggle the side
-                            $sOrigin = MetaModel::GetAttributeOrigin($sRemoteClass, $sExtKeyAttCode);
-                            $aAttribute['origin'] = $sOrigin;
-                            $aOrigins[$sOrigin] = true;
-                            $aData[$sExtKeyAttCode . $sRemoteClass] = $aAttribute;
-                        }
-                    }
-                }
-            }
-        }
-
-        // 2) Fetching referenced classes data
-        //
-        $aDataRef = array(array('label' => $sClass, 'icon' => MetaModel::GetClassIcon($sClass, false), 'origin_index' => 0, 'alphabetical_index' => 0, 'origin' => '_'));
-        $bOnTheLeft = true;
-        $aOriginsRef = array('_' => true);
-        foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-        {
-            $aAttribute = array('label' => $sAttCode);
-            if ($oAttDef->IsLinkSet())
-            {
-                if ($oAttDef->IsIndirect())
-                {
-                    $sRemoteAttDef = $oAttDef->GetExtKeyToRemote();
-                    $aAttribute['related'] = MetaModel::GetAttributeDef($oAttDef->GetLinkedClass(), $sRemoteAttDef)->GetTargetClass();
-                    $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
-                    $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
-                    $aAttribute['relation_type'] = 0; //
-	                $aAttribute['tooltip_data']['class'] = $oAttDef->GetLinkedClass();
-	                $aAttribute['tooltip_data']['to_remote'] = $sRemoteAttDef;
-	                $aAttribute['tooltip_data']['to_me'] = $oAttDef->GetExtKeyToMe();
-
-                    $bOnTheLeft = !$bOnTheLeft; // Toggle the side
-                }
-                else
-                {
-                    $aAttribute['related'] = $oAttDef->GetLinkedClass();
-                    $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
-                    $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
-                    $aAttribute['relation_type'] = 1;
-                    $bOnTheLeft = !$bOnTheLeft; // Toggle the side
-                }
-
-            }
-            else if ($oAttDef->IsHierarchicalKey())
-            {
-                $aAttribute['related'] = $sClass;
-                $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
-                $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
-                $aAttribute['relation_type'] = 2;
-                $bOnTheLeft = !$bOnTheLeft; // Toggle the side
-                $sSelfReference = "true";
-            }
-            else if ($oAttDef->IsExternalKey())
-            {
-                $aAttribute['related'] = $oAttDef->GetTargetClass();
-                $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
-                $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
-                $aAttribute['relation_type'] = 3;
-
-                $bOnTheLeft = !$bOnTheLeft; // Toggle the side
-            }
-            if ($oAttDef->IsLinkSet() || $oAttDef->IsHierarchicalKey() || $oAttDef->IsExternalKey()){
-                $sOrigin = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
-
-				$aAttribute['origin'] = $sOrigin;
-	            $aOriginsRef[$sOrigin] = true;
-	            $aDataRef[$sAttCode] = $aAttribute;
-
-			}
-
-        }
-
-
-        //sort referencing data
-
-	    $aOrigins = array_keys($aOrigins);
-	    $idx = 0;
-
-		$bOnTheLeft = true;
-	    foreach($aData as $sAttCode => $aAttribute)
-	    {
-	    	$is_also_referenced = false;
-		    foreach($aDataRef as $sAttCodeRef => $aAttributeRef)
-		    {
-		    	if(!empty($aDataRef[$sAttCodeRef]['related']) && ($aData[$sAttCode]['related'] == $aDataRef[$sAttCodeRef]['related']))
-				    $is_also_referenced = true;
-		    }
-		    if(!$is_also_referenced)
-		    {
-			    $aData[$sAttCode]['related_position'] = ($bOnTheLeft) ? -1 : 1;
-			    $bOnTheLeft = !$bOnTheLeft;
-			    $aData[$sAttCode]['origin_index'] = ($aData[$sAttCode]['related_position'] == -1) ? ++$idx : $idx;
-		    }
-		    else
-		    {
-		    	unset($aData[$sAttCode]);
-		    }
-	    }
-	    ksort($aData);
-	    $idx = 0;
-	    $aFinalDataReferencing = array();
-	    foreach($aData as $sAttCode => $aAttribute)
-	    {
-		    $aData[$sAttCode]['alphabetical_index'] = $aAttribute['related_position'] == 1 ? ++$idx : $idx;
-		    $aFinalDataReferencing[] = $aData[$sAttCode];
-	    }
-	    $sDataReferencing = json_encode($aFinalDataReferencing);
-	    $sOriginsReferencing = json_encode(array_keys($aOrigins));
-
-	    //sort referenced data
-
-	    $idx = 1;
-        foreach($aDataRef as $sAttCode => $aAttribute)
-        {
-            $aDataRef[$sAttCode]['origin_index'] = $idx++;
-        }
-
-        $idx = 1;
-        $aFinalData = array();
-        foreach($aDataRef as $sAttCode => $aAttribute)
-        {
-            $aDataRef[$sAttCode]['alphabetical_index'] = $idx++;
-            $aFinalData[] = $aDataRef[$sAttCode];
-        }
-
-        $sData = json_encode($aFinalData);
-
-	    // 3) Processing data and building graph
-	    //
-        $oPage->add(
-            <<<EOF
-<div id="dataModelGraph">
-<svg class="dataModelSchema" width="100%" height="800">
-</svg>
-</div>
-EOF
-        );
-        $oPage->add_ready_script(
-            <<<EOF
-
-var data = $sData;
-var dataref = $sDataReferencing;
-/**
- * sDataReferencing's data size ceil'd to the next even number
- * in order to keep the same display if classes nb is even/not even
- */
-var datareflen = Math.ceil(dataref.length/2)*2;
-var isSelfReferencing = $sSelfReference;
-
-//Link that will be opened when a class is clicked
-var refClassLinkpre = "?operation=details_class&class=";
-var refClassLinksuf = "&c[menu]=DataModelMenu#tabbedContent_0=1";
-			
-var aOriginsref = $sOriginsReferencing;
-		
-var margins = {top: 50, left: 100 };
-var cellHeight = 24;
-var cellWidth =  Math.max(3*48, 8*d3.max(data, function(d) { return d.label.length; }));
-var relatedCellWidth = Math.max(3*48, Math.max(8*d3.max(data, function(d) { return d.related ? d.related.length : 0; }) || 0,8*d3.max(dataref, function(d) { return d.related ? d.related.length : 0; }) ) || 0);
-var gap = 70;
-var schema = d3.select(".dataModelSchema")
-    .attr("height", cellHeight * (data.length + dataref.length + (1 + dataref.length%2)*1.5) + 2*margins.top);
-
-var divD3 = d3.select("#dataModelGraph").append("div")
-	.attr("class","tooltipD3")
-	.style("opacity",0);
-
-// 1) Horn construction (top lines used to display referencing classes which doesn't have a linkset attribute)
-//
-if(dataref.length > 1)
-{
-schema.append("path")
-		.attr("d", "M"+(margins.left + relatedCellWidth + gap + cellWidth*0.75)+" "+ (margins.top + cellHeight + cellHeight*(datareflen+1.5)) +" l 0 "+ cellHeight*-datareflen+"")
-		.attr("fill", "transparent")
-		.attr("stroke", "black")
-		.attr("stroke-linecap", "round")
-		.attr("stroke-width", 2);
-}
-if(dataref.length > 0)
-{
-schema.append("path")
-		.attr("d", "M"+(margins.left + relatedCellWidth + gap + cellWidth*0.25)+" "+ (margins.top + cellHeight + cellHeight*(datareflen+1.5)) +" l 0 "+ cellHeight*-datareflen+"")
-		.attr("fill", "transparent")
-		.attr("stroke", "black")
-		.attr("stroke-linecap", "round")
-		.attr("stroke-width", 2);
-}
-
-//loop + arrow to show that a class has a hierarchical attribute
-if(isSelfReferencing == true)
-{
-	schema.append("path")
-			.attr("d", "M"+(margins.left + relatedCellWidth + gap + cellWidth/1.9)+" "+ (margins.top  + cellHeight*(datareflen+1.5))+" a 20 20 0 1 0 20 0  m-10 0l-5 3 m5 -3 l-5 -3")
-			.attr("id", "selfreferencing")
-			.attr("fill", "transparent")
-			.attr("stroke", "black")
-			.attr("stroke-linecap", "round")
-			.attr("stroke-width", 2)
-			.attr("transform", "rotate(95, "+ (margins.left + relatedCellWidth + gap + cellWidth/1.9) + ", " + ((margins.top  + cellHeight*(datareflen+1.5))+10)+")");
-}
-
-// 2) Classes linked to horns (classes referencing us)
-//
-var fieldref = schema.selectAll("g")
-    .data(dataref, function(d) { return d.label + d.related } )
-    .enter().append("g")
-    .attr("transform", function(d, i) { return "translate(" + (margins.left + relatedCellWidth + gap + cellWidth/2) + "," + (margins.top + d.origin_index*cellHeight*2) + ")"; });
-
-
-fieldref.filter(function(d) {
-	return (d.related != null);
-}).append("a")
-	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf})
-	.append("rect")
-		.attr("x", -relatedCellWidth/2)
-		.attr("width", relatedCellWidth)
-		.attr("height", cellHeight)
-		.attr("fill", "#fff")
-		.attr("stroke", "#000")
-		.attr("stroke-width", 1)
-		.attr("transform", function(d, i) { return "translate("+ d.related_position*(relatedCellWidth/2+cellWidth/2+gap) +", 0)"; });
-
-fieldref.filter(function(d) {
-	return (d.related != null);
-}).append("a")
-	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf })
-	.append("text")
-		.attr("x", 0)
-		.attr("y", cellHeight / 2)
-		.attr("dy", ".35em")
-		.text(function(d) { return d.related ? d.related : ''; })
-		.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap)) +", 0)"; });
-	
-fieldref.filter(function(d) {
-	return (d.related != null);
-}).append("path")
-    .attr("d", "M"+(cellWidth/2 - cellWidth*0.25)+" "+cellHeight/2+" h"+(gap-2 + cellWidth*0.25))
-	.attr("fill", "transparent")
-	.attr("stroke", "black")
-	.attr("stroke-linecap", "round")
-	.attr("stroke-width", 2)
-	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(180, 0, "+(cellHeight/2)+")" : ""});
-		
-fieldref.filter(function(d) {
-	return (d.related != null);
-}).append("path")
-    .attr("d", "M"+cellWidth/1.9*-1+" "+cellHeight/2+" m-10 0l-5 3 m5 -3 l-5 -3")
-	.attr("fill", "transparent")
-	.attr("stroke", "black")
-	.attr("stroke-linecap", "round")
-	.attr("stroke-width", 2)
-	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(360, 0, "+(cellHeight/2)+")" : "rotate(180, 0, "+(cellHeight/2)+")"});
-		
-fieldref.filter(function(d) {
-	return (d.related != null);
-}).append("svg:image")
-   .attr("x", -relatedCellWidth/2)
-   .attr("width", cellHeight)
-	.attr("height", cellHeight)
-    .attr("xlink:href", function(d, i) { return d.related_icon })
-	.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap) - 12)+", -" + cellHeight/2+" )"; });	
-
-
-// 3) Main class rectangle and attributes rectangles
-//
-var field = schema.selectAll("g")
-    .data(data, function(d) { return d.label } )
-    .enter().append("g")
-    .attr("transform", function(d, i) { return "translate(" + (margins.left + relatedCellWidth + gap + cellWidth/2) + "," + (margins.top + (datareflen+1.5)*cellHeight + d.origin_index*cellHeight) + ")"; });
-
-field.append("rect")
-    .attr("x", -cellWidth/2)
-    .attr("width", cellWidth)
-    .attr("class", function(d, i){return (d.relation_type == 2 ? "selfattr" : "extattr");}) 
-	.attr("height", cellHeight)
-	.attr("fill", "#fff")
-	.attr("stroke", "#000")
-	.attr("stroke-width", 1);
-			
-field.append("text")
-    .attr("x", 0)
-    .attr("y", cellHeight / 2)
-    .attr("dy", ".35em")
-    .text(function(d) { return d.label; });
-    
-field.append("text")
-    .attr("x", function(d){ return 7*d.label.length/2 })
-    .attr("y", cellHeight / 2)
-    .attr("dy", ".35em")
-    .attr("class", function(d, i){return (d.relation_type == 2 ? "selfattrtxt" : "");}) 
-    .text(function(d) { return ((d.relation_type == 2) ? '\uf01e' : '' ); });
-
-
-// 4) Classes that our main class is refering to
-//
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type != 2);
-}).append("a")
-	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf})
-	.append("rect")
-		.attr("x", -relatedCellWidth/2)
-		.attr("width", relatedCellWidth)
-		.attr("height", cellHeight)
-		.attr("fill", "#fff")
-		.attr("stroke", "#000")
-		.attr("stroke-width", 1)
-		.attr("transform", function(d, i) { return "translate("+ d.related_position*(relatedCellWidth/2+cellWidth/2+gap) +", 0)"; });
-
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type != 2);
-}).append("a")
-	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf})
-	.append("text")
-		.attr("x", 0)
-		.attr("y", cellHeight / 2)
-		.attr("dy", ".35em")
-		.text(function(d) { return d.related ? d.related : ''; })
-		.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap)) +", 0)"; });
-
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type != 2);
-}).append("path")
-    .attr("d", "M"+cellWidth/2+" "+cellHeight/2+" h"+(gap-2))
-	.attr("fill", "transparent")
-	.attr("stroke", "black")
-	.attr("stroke-linecap", "round")
-	.attr("stroke-width", 2)
-	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(180, 0, "+(cellHeight/2)+")" : ""});
-		
-		
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type == 3 || d.relation_type == 0);
-}).append("path")
-    .attr("d","M"+ (gap - 2 + cellWidth/2) +" "+cellHeight/2+" m-10 0l-5 3 m5 -3 l-5 -3")
-	.attr("fill", "transparent")
-	.attr("stroke", "black")
-	.attr("stroke-linecap", "round")
-	.attr("stroke-width", 2)
-	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(180, 0, "+(cellHeight/2)+")" : ""});
-		
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type == 1 || d.relation_type == 0);
-}).append("path")
-    .attr("d", "M"+cellWidth/1.9*-1+" "+cellHeight/2+" m-10 0l-5 3 m5 -3 l-5 -3")
-	.attr("fill", "transparent")
-	.attr("stroke", "black")
-	.attr("stroke-linecap", "round")
-	.attr("stroke-width", 2)
-	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(360, 0, "+(cellHeight/2)+")" : "rotate(180, 0, "+(cellHeight/2)+")"});				
-			
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type == 0);
-}).append("circle")
-    .attr("r", 5)
-    .attr("cy", cellHeight/2)
-	.on('mouseover',function(d){
-		divD3.transition()
-			.duration(200)
-			.style("opacity","1");
-		divD3.style("left", (d3.event.pageX - 7*d['tooltip_data']['class'].length/2) + "px");
-		divD3.style("top", (d3.event.pageY - 65) + "px");
-		divD3.html( '<div id="tooltipD3_top">' + d['tooltip_data']['class'] + '</div><span id="tooltipD3_left"> <i class="fa fa-caret-left"></i> '
-		 			+  ( (d.related_position < 0) ? d['tooltip_data']['to_remote'] : d['tooltip_data']['to_me'] ) +  '</span><span id="tooltipD3_right"> <br/>'
-		 			+ ( (d.related_position < 0) ? d['tooltip_data']['to_me'] : d['tooltip_data']['to_remote'] ) + ' <i class="fa fa-caret-right"></i></span>');
-	})
-	.on('mouseout',function(d){
-		divD3.transition()
-			.duration(500)
-			.style("opacity","0");
-	})
-	.attr("transform", function(d, i) { return "translate("+ d.related_position*(cellWidth+gap+2)/2 +", 0)"; });
-			
-
-			
-field.filter(function(d) {
-	return (d.related != null) && (d.relation_type != 2);
-}).append("svg:image")
-   .attr("x", -relatedCellWidth/2)
-   .attr("width", cellHeight)
-	.attr("height", cellHeight)
-    .attr("xlink:href", function(d, i) { return d.related_icon })
-	.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap) - 12)+", -" + cellHeight/2+" )"; });
-						
-field.append("rect")
-    .attr("x", -cellWidth/2 - 5)
-    .attr("width", 5)
-	.attr("height", cellHeight)
-	.attr("fill", function(d) { return aColors(aOrigins.indexOf(d.origin)); } )
-	.attr("stroke-width", 0)
-	.attr("class","liseret");
-			
-field.filter(function(d) {
-	return (d.icon != null);
-}).append("svg:image")
-    .attr("x", -cellWidth/2)
-    .attr("width", 36)
-	.attr("height", 36)
-    .attr("xlink:href", function(d, i) { return d.icon })
-	.attr("transform", "translate(-12, -24)");
-			
-EOF
-        );
-    }
-    catch(Exception $e)
-    {
-        $oPage->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
-    }
-}
-
-/**
- * Display the details of a given class of objects
- */
-function DisplayClassDetails($oPage, $sClass, $sContext)
-{
-	DisplayClassHeader($oPage, $sClass);
-	$aParentClasses = array();
-	foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
-	{
-		$aParentClasses[] = MakeClassHLink($sParentClass, $sContext);
-	}
-	if (count($aParentClasses) > 0)
-	{
-		$sParents = implode(' &gt;&gt; ', $aParentClasses)." &gt;&gt; <b>$sClass</b>";
-	}
-	else
-	{
-		$sParents = '';
-	}
-	$oPage->p("[<a href=\"schema.php?operation=list{$sContext}\">".Dict::S('UI:Schema:AllClasses')."</a>] $sParents");
-
-	if (MetaModel::HasChildrenClasses($sClass))
-	{
-		$oPage->add("<ul id=\"ClassHierarchy\">");
-		$oPage->add("<li class=\"closed\">".$sClass."\n");
-		DisplaySubclasses($oPage, $sClass,$sContext);
-		$oPage->add("</li>\n");
-		$oPage->add("</ul>\n");
-		$oPage->add_ready_script('$("#ClassHierarchy").treeview();');	
-	}
-	$oPage->p('');
-	$oPage->add("</div>");
-
-	$oPage->AddTabContainer('details');
-	$oPage->SetCurrentTabContainer('details');
-	// List the attributes of the object
-	$aForwardChangeTracking = MetaModel::GetTrackForwardExternalKeys($sClass);
-	$aDetails = array();
-
-	$aOrigins = array();
-	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
-	{
-		if ($oAttDef->IsExternalKey())
-		{
-		   $sValue = Dict::Format('UI:Schema:ExternalKey_To',MakeClassHLink($oAttDef->GetTargetClass(), $sContext));
-			if (array_key_exists($sAttCode, $aForwardChangeTracking))
-			{
-				$oLinkSet = $aForwardChangeTracking[$sAttCode];
-				$sRemoteClass = $oLinkSet->GetHostClass();
-				$sValue = $sValue."<span title=\"Forward changes to $sRemoteClass\">*</span>";
-			}
-		}
-		elseif ($oAttDef->IsLinkSet())
-		{
-			$sValue = MakeClassHLink($oAttDef->GetLinkedClass(), $sContext);
-		}
-		else
-		{
-		   $sValue = $oAttDef->GetDescription();
-		}
-		$sType = get_class($oAttDef);
-		$sTypeDict = $oAttDef->GetType();
-        $sTypeDesc = $oAttDef->GetTypeDesc();
-
-        $sOrigin = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
-        $aOrigins[$sOrigin] = true;
-        $sAllowedValues = "";
-		$sMoreInfo = "";
-		$sDefaultNullValue = '""';
-		$aCols = array();
-		foreach($oAttDef->GetSQLColumns() as $sCol => $sFieldDesc)
-		{
-			$aCols[] = "$sCol: $sFieldDesc";
-		}
-		if (count($aCols) > 0)
-		{
-
-			$aMoreInfo = array();
-			if($oAttDef->IsNullAllowed())
-			{
-				$aMoreInfo[] = Dict::S('UI:Schema:NullAllowed');
-				$sDefaultNullValue = (!is_null($oAttDef->GetNullValue()) ? $oAttDef->GetNullValue() : null );
-				if(!is_null($sDefaultNullValue) && !is_string($sDefaultNullValue))
-				{
-					$sDefaultNullValue = json_encode($sDefaultNullValue);
-				}
-				$sDefaultNullValue = (!is_null($sDefaultNullValue) ? json_encode(Dict::Format('UI:Schema:DefaultNullValue', $sDefaultNullValue)) : '""' );
-			}
-			else
-			{
-				$aMoreInfo[] = Dict::S('UI:Schema:NullNotAllowed');
-			}
-			if($oAttDef->GetDefaultValue())
-			{
-				$sDefaultValue = $oAttDef->GetDefaultValue();
-				if(!is_string($sDefaultValue))
-				{
-					$sDefaultValue = json_encode($sDefaultValue);
-				}
-				$aMoreInfo[] = Dict::Format("UI:Schema:Default_Description", $sDefaultValue);
-			}
-			$sMoreInfo .= implode(', ', $aMoreInfo);
-		}
-        $sAttrCode = $oAttDef->GetCode();
-        $sIsEnumValues = 'false';
-        $sAllowedValuesEscpd = '""';
-		if ($oAttDef instanceof AttributeEnum)
-		{
-			// Display localized values for the enum (which depend on the localization provided by the class)
-			$aLocalizedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, array());
-			$aDescription = array();
-			foreach($aLocalizedValues as $val => $sDisplay)
-			{
-				$aDescription[] = "<span class=\"attrLabel\">". $sDisplay ."</span>  <span class=\"parenthesis\">(</span><span class=\"attrCode\">" . $val . "</span><span class=\"parenthesis\">)</span>";
-			}
-			$sAllowedValues = implode(', ', $aDescription);
-            $sIsEnumValues = 'true';
-		}
-		elseif (is_object($oAllowedValuesDef = $oAttDef->GetValuesDef()))
-		{
-			$sAllowedValues = trim( $oAllowedValuesDef->GetValuesDescription(), "Filter : ");
-            $sAllowedValuesEscpd = json_encode($sAllowedValues);
-
-            $sFilterURL = urlencode($sAllowedValues);
-			$sAllowedValues = "<span id=\"values" . $sAttrCode ."\"><a href=\"run_query.php?expression=" . $sFilterURL . "\">⚵</a>" . Dict::S('UI:Schema:Attribute/Filter') . "</span>";
-        }
-		else
-		{
-			$sAllowedValues = '';
-		}
-		$sAttrValueEscpd = json_encode($sValue);
-		$sAttrTypeDescEscpd = json_encode($sTypeDesc);
-		$sAttrOriginEscpd = json_encode($sOrigin);
-
-		$aDetails[] = array('code' => "<span id=\"attr". $sAttrCode."\"><span class=\"attrLabel\">". $oAttDef->GetLabel() ."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" . $oAttDef->GetCode() ."</span><span class=\"parenthesis\">)</span></span>",
-							'type' =>  "<span id=\"type". $sAttrCode."\"><span class=\"attrLabel\">". $sTypeDict ."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" . $sType ."</span><span class=\"parenthesis\">)</span></span>",
-							'origincolor' => "<span class=\"originColor" . $sOrigin ."\"></span>",
-            				'origin' => "<span id=\"origin" . $sAttrCode ."\">$sOrigin</span>",
-							'values' => $sAllowedValues,
-							'moreinfo' => "<span id=\"moreinfo" . $sAttrCode . "\"> $sMoreInfo</span>");
-		//tooltip construction
-        $oPage->add_ready_script(
-            <<<EOF
-            	if($sAttrValueEscpd != ''){
-		       		$('#attr$sAttrCode').qtip( { content: $sAttrValueEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
-		       	}
-		       	if($sAttrTypeDescEscpd != ''){
-		      	  $('#type$sAttrCode').qtip( { content: $sAttrTypeDescEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
-				}
-				if($sAttrOriginEscpd != ''){
-					$('#originColor$sAttrCode').parent().qtip( { content: $sAttrOriginEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
-				}
-				if( !$sIsEnumValues && $sAllowedValuesEscpd != ''){
-					$('#values$sAttrCode').qtip( { content: $sAllowedValuesEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
-				}
-				if($sDefaultNullValue != ''){
-					$('#moreinfo$sAttrCode').qtip( { content: $sDefaultNullValue, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
-				}
-EOF
-
-		);
-
-    }
-
-	$oPage->SetCurrentTab(Dict::S('UI:Schema:Attributes'));
-	$aConfig = array( 'origincolor' => array('label' => "", 'description' => ""),
-        			  'code' => array('label' => Dict::S('UI:Schema:AttributeCode'), 'description' => Dict::S('UI:Schema:AttributeCode+')),
-					  'type' => array('label' => Dict::S('UI:Schema:Type'), 'description' => Dict::S('UI:Schema:Type+')),
-					  'values' => array('label' => Dict::S('UI:Schema:AllowedValues'), 'description' => Dict::S('UI:Schema:AllowedValues+')),
-					  'moreinfo' => array('label' => Dict::S('UI:Schema:MoreInfo'), 'description' => Dict::S('UI:Schema:MoreInfo+')),
-					  'origin' => array('label' => Dict::S('UI:Schema:Origin'), 'description' => Dict::S('UI:Schema:Origin+')),
-	);
-	$oPage->table($aConfig, $aDetails);
-    $sOrigins = json_encode(array_keys($aOrigins));
-
-    //color calculation in order to keep 1 color for 1 extended class. Colors are interpolated and will be used for
-	// graph scheme color too
-    $oPage->add_ready_script(
-        <<< EOF
-				var aOrigins = $sOrigins;
-				var aColors = d3.scale.linear().domain([1,aOrigins.length])
-				  .interpolate(d3.interpolateHcl)
-				  .range([d3.rgb("#007AFF"), d3.rgb('#FFF500')]);		
-				$.each(aOrigins,function(idx, origin){
-					$('.originColor'+origin).parent().css('background-color',aColors(aOrigins.indexOf(origin)));
-				});
-				Array.prototype.forEach.call($(".listResults").find('td:nth-child(1),th:nth-child(1)'), function(e){
-					$(e).removeClass("header").addClass("originColor");
-				});
-
-EOF
-    );
-
-    $oPage->SetCurrentTab(Dict::S('UI:Schema:RelatedClasses'));
-    DisplayRelatedClassesGraph($oPage, $sClass);
-    $oPage->SetCurrentTab(Dict::S('UI:Schema:ChildClasses'));
-
-    DisplaySubclasses($oPage, $sClass, $sContext);
-
-    $oPage->SetCurrentTab(Dict::S('UI:Schema:LifeCycle'));
-	DisplayLifecycle($oPage, $sClass, $sContext);
-
-	$oPage->SetCurrentTab(Dict::S('UI:Schema:Triggers'));
-	DisplayTriggers($oPage, $sClass, $sContext);
-
-	$oPage->SetCurrentTab();
-	$oPage->SetCurrentTabContainer();
-}
-
-
-/**
- * Display the dropdown that allow to select the attributes/class display granularity
- */
-function DisplayGranularityDisplayer($oPage){
-
-	$oPage->add("
-		<label id=\"displaySelectorLabel\"> <h1> ". Dict::S('UI:Schema:DisplayLabel') .
-		"<select id=\"displaySelector\">
-			<option value=\"labelandcode\">" . Dict::S('UI:Schema:DisplaySelector/LabelAndCode') . "</option>
-			<option value=\"label\">" . Dict::S('UI:Schema:DisplaySelector/Label') . "</option>
-			<option value=\"code\">" . Dict::S('UI:Schema:DisplaySelector/Code') . "</option>
-		</select> </h1></label>
-		 <br/>");
-	$sDisplayDropDownValue = htmlentities(appUserPreferences::GetPref('datamodel_viewer_display_granularity','labelandcode'),ENT_QUOTES,"UTF-8");
-
-//granularity displayer listener
-	$oPage->add_ready_script(
-		<<<EOF
-        var parenthesisHider = function(){
-        	if ( ($('#labelEnabler').is(':checked') && !$('#codeEnabler').is(':checked')) || ($('#codeEnabler').is(':checked') && !$('#labelEnabler').is(':checked')))
-        	{
-        		$('.parenthesis').toggle();
-        	}
-        };
-		$('#displaySelector').on(
-		'change', function(){
-			switch($(this).val()){
-				case 'labelandcode':
-					$('.attrCode').show();
-					$('.attrLabel').show();
-					$('.parenthesis').show();
-					$("#search-model").autocomplete(autocompleteClassLabelAndCode, {scroll:true, matchContains:true});
-				break;
-				case 'label':
-					$('.attrCode').hide();
-					$('.attrLabel').show();
-					$('.parenthesis').hide();
-					$("#search-model").autocomplete(autocompleteClassLabel, {scroll:true, matchContains:true});
-				break;
-				case 'code':
-					$('.attrCode').show();
-					$('.attrLabel').hide();
-					$('.parenthesis').hide();
-					$("#search-model").autocomplete(autocompleteClassCode, {scroll:true, matchContains:true});
-				break;
-			}
-			SetUserPreference("datamodel_viewer_display_granularity", $('#displaySelector').val(), true);
-		});
-		$('#displaySelector').val("$sDisplayDropDownValue").trigger("change");
-EOF
-	);
-}
-/**
- * Display the header of the class details page
- */
-function DisplayClassHeader($oPage, $sClass){
-	//scrollable class name / icon
-	$oPage->add("<div id=\"dataModelScrollableDiv\">");
-	$oPage->add("<div id=\"dataModelScrollableClassIcon\">" . MetaModel::GetClassIcon($sClass) . "</div>");
-	$oPage->add("<h2 id=\"dataModelScrollableClassName\"><span class=\"attrLabel\">" . MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" .$sClass."</span><span class=\"parenthesis\">)</span></h2>");
-	$oPage->add("</div>");
-
-//content header
-	$oPage->add("<div id=\"dataModelHeader\">");
-	DisplayGranularityDisplayer($oPage);
-	$oPage->add("<div id=\"dataModelClassIcon\">" . MetaModel::GetClassIcon($sClass) . "</div>");
-	$sClassDescritpion = MetaModel::GetClassDescription($sClass);
-
-	$oPage->add("<h2 id=\"classDetailsClassName\"><span class=\"attrLabel\">".MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" .$sClass."</span><span class=\"parenthesis\">)</span>" . ($sClassDescritpion == "" ? "" : " - " . $sClassDescritpion) . "</h2>\n");
-	if (MetaModel::IsAbstract($sClass))
-	{
-		$oPage->p(Dict::S('UI:Schema:AbstractClass'));
-	}
-}
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//                                             MAIN BLOCK                                                             //
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Display the menu on the left
-$oAppContext = new ApplicationContext();
-$sContext = $oAppContext->GetForLink();
-if (!empty($sContext))
-{
-	$sContext = '&'.$sContext;
-}
-$operation = utils::ReadParam('operation', '');
-
-$oPage = new iTopWebPage(Dict::S('UI:Schema:Title'));
-$oPage->no_cache();
-
-$oPage->SetBreadCrumbEntry('ui-tool-datamodel', Dict::S('Menu:DataModelMenu'), Dict::S('Menu:DataModelMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
-$oPage->add_script(
-    <<<EOF
-	var autocompleteClassLabelAndCode = [];
-	var autocompleteClassLabel = [];
-	var autocompleteClassCode = [];
-EOF
-);
-
-$oPage->add(" <div class='ui-widget'> </div><div id='dataModelSplitPane'>");
-$oPage->add("<div class='ui-layout-west data-model-viewer'> ");
-DisplayClassesList($oPage, $sContext);
-$oPage->add("</div>");
-$oPage->add("<div class='ui-layout-center data-model-viewer'>");
-
-switch($operation)
-{
-	case 'details_class':
-	$sClass = utils::ReadParam('class', '', false, 'class');
-	//if we want to see class details & class is given then display it, otherwise act default (just show the class list)
-	if($sClass != '')
-	{
-		$oPage->add_ready_script(
-			<<<EOF
-$('#search-model').val('$sClass');
-$('#search-model').trigger("input");
-
-EOF
-);
-		DisplayClassDetails($oPage, $sClass, $sContext);
-		break;
-	}
-	default:
-		DisplayGranularityDisplayer($oPage);
-}
-$oPage->add("</div>");
-$oPage->add("</div>");
-//split the page in 2 panels
-$oPage->add_init_script(
-<<<EOF
-		$('#dataModelSplitPane').layout({
-		west : {size: "20%", minSize : 200,paneSize : 600}
-		});
-		// Layout
-EOF
-
-);
-
-$oPage->output();
-?>
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Presentation of the data model
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+ApplicationMenu::CheckMenuIdEnabled('DataModelMenu');
+
+/**
+ * Helper for this page -> link to a class
+ */
+function MakeClassHLink($sClass, $sContext)
+{
+	return "<a href=\"schema.php?operation=details_class&class=$sClass{$sContext}\" title=\"".html_entity_decode(MetaModel::GetClassDescription($sClass),ENT_QUOTES,'UTF-8')."\"><span class=\"attrLabel\">".MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" .$sClass."</span><span class=\"parenthesis\">)</span></a>";
+}
+
+/**
+ * Helper for this page -> link to a class
+ */
+function MakeRelationHLink($sRelCode, $sContext)
+{
+	$sDesc = MetaModel::GetRelationDescription($sRelCode);
+	return "<a href=\"schema.php?operation=details_relation&relcode=$sRelCode{$sContext}\" title=\"$sDesc\">".$sRelCode."</a>";
+}
+
+/**
+ * Helper for the global list and the details of a given class
+ */
+function DisplaySubclasses($oPage, $sClass, $sContext)
+{
+	$aChildClasses = MetaModel::EnumChildClasses($sClass);
+	if (count($aChildClasses) != 0)
+	{
+		$oPage->add("<ul>\n");
+		$aOrderedClasses = array();
+		foreach($aChildClasses as $sClassName)
+		{
+			// Skip indirect childs, they will be handled somewhere else
+			if (MetaModel::GetParentPersistentClass($sClassName) == $sClass)
+			{
+					$aOrderedClasses[$sClassName] = MetaModel::GetName($sClassName);
+			}
+		}
+		// Sort on the display name
+		asort($aOrderedClasses);
+		foreach($aOrderedClasses as $sClassName => $sDisplayName)
+		{
+			// Skip indirect childs, they will be handled somewhere else
+			if (MetaModel::GetParentPersistentClass($sClassName) == $sClass)
+			{
+					$oPage->add("<li class=\"open\">".MakeClassHLink($sClassName, $sContext)."\n");
+					DisplaySubclasses($oPage, $sClassName, $sContext);
+					$oPage->add("</li>\n");
+			}
+		}
+		$oPage->add("</ul>\n");
+	}
+}
+
+/**
+ * Helper for the lifecycle details of a given class
+ */
+function DisplayLifecycle($oPage, $sClass)
+{
+	$sStateAttCode = MetaModel::GetStateAttributeCode($sClass);
+	if (empty($sStateAttCode))
+	{
+		$oPage->p(Dict::S('UI:Schema:NoLifeCyle'));
+	}
+	else
+	{
+		$aStates = MetaModel::EnumStates($sClass);
+		$aStimuli = MetaModel::EnumStimuli($sClass);
+		$oPage->add("<img id=\"img-lifecycle\" attr=\"$sClass lifecycle graph\" src=\"".utils::GetAbsoluteUrlAppRoot()."pages/graphviz.php?class=$sClass\">\n");
+		$oPage->add_ready_script(
+			<<<EOF
+			$("#img-lifecycle").attr('href',$("#img-lifecycle").attr('src'));
+			$("#img-lifecycle").magnificPopup({type: 'image', closeOnContentClick: true});
+EOF
+
+		);
+		$oPage->add("<button id=\"lifecycleOpenAll\">Open All</button> <button id=\"lifecycleCloseAll\">Close All</button>");
+		$oPage->add_ready_script(
+			<<<EOF
+			$("#lifecycleOpenAll").on('click',function(){
+				$('#LifeCycleList').find('.expandable-hitarea').click();
+				$('#LifeCycleAttrOptList').find('.expandable-hitarea').click();
+			});	
+				
+			$("#lifecycleCloseAll").on('click',function(){
+				$('#LifeCycleList').find('.collapsable-hitarea').click();
+				$('#LifeCycleAttrOptList').find('.collapsable-hitarea').click();
+			});	
+EOF
+		);
+		$oPage->add("<h3>".Dict::S('UI:Schema:LifeCycleTransitions')."</h3>\n");
+		$oPage->add("<ul id=\"LifeCycleList\" >\n");
+		foreach ($aStates as $sStateCode => $aStateDef)
+		{
+			$sStateLabel = MetaModel::GetStateLabel($sClass, $sStateCode);
+			$sStateDescription = MetaModel::GetStateDescription($sClass, $sStateCode);
+			$oPage->add("<li class=\"closed\"><span class=\"attrLabel\">$sStateLabel </span><span style=\"color:grey;\"><span class=\"parenthesis\">(</span><span class=\"attrCode\">$sStateCode</span><span class=\"parenthesis\">) </span>$sStateDescription</span>\n");
+			$oPage->add("<ul class=\"closed\">\n");
+			foreach(MetaModel::EnumTransitions($sClass, $sStateCode) as $sStimulusCode => $aTransitionDef)
+			{
+				$sStimulusLabel = $aStimuli[$sStimulusCode]->GetLabel();
+				$sTargetState = $aTransitionDef['target_state'];
+				$sTargetStateLabel = MetaModel::GetStateLabel($sClass, $sTargetState);
+				if (count($aTransitionDef['actions']) > 0)
+				{
+					$aActionsDesc = array();
+					foreach ($aTransitionDef['actions'] as $actionHandler)
+					{
+						if (is_string($actionHandler))
+						{
+							$aActionsDesc[] = $actionHandler;
+						}
+						else
+						{
+							$aParamsDesc = array();
+							foreach ($actionHandler['params'] as $aParamData)
+							{
+								$aParamsDesc[] = $aParamData['type'].':'.$aParamData['value'];
+							}
+							$aActionsDesc[] = $actionHandler['verb'].'('.implode(', ', $aParamsDesc).')';
+						}
+					}
+					$sActions = " <em>(".implode(', ', $aActionsDesc).")</em>";
+				}
+				else
+				{
+					$sActions = "";
+				}
+
+				$oPage->add("<li class=\"closed\"><span class=\"attrLabel\" title=\"code: $sStimulusCode\" style=\"color:red;font-weight:bold;\">$sStimulusLabel</span>
+								<span style=\"color:grey;\"><span class=\"parenthesis\">(</span><span class=\"attrCode\">$sStimulusCode</span><span class=\"parenthesis\">)</span> </span>
+								=&gt;
+								<span class=\"attrLabel\">$sTargetStateLabel </span><span style=\"color:grey;\"><span class=\"parenthesis\">(</span> <span class=\"attrCode\">$sTargetState</span> <span class=\"parenthesis\">)</span></span> $sActions</li>\n");
+			}
+			$oPage->add("</ul></li>\n");
+		}
+		$oPage->add("</ul>\n");
+		$oPage->add("<h3>".Dict::S('UI:Schema:LifeCyleAttributeOptions')."</h3>\n");
+		$oPage->add("<ul id=\"LifeCycleAttrOptList\">\n");
+		foreach ($aStates as $sStateCode => $aStateDef)
+		{
+			$sStateLabel = MetaModel::GetStateLabel($sClass, $sStateCode);
+			$sStateDescription = MetaModel::GetStateDescription($sClass, $sStateCode);
+            $oPage->add("<li class=\"closed\"><span class=\"attrLabel\">$sStateLabel </span><span style=\"color:grey;\"><span class=\"parenthesis\">(</span><span class=\"attrCode\">$sStateCode</span><span class=\"parenthesis\">) </span>$sStateDescription</span>\n");
+			if (count($aStates[$sStateCode]['attribute_list']) > 0)
+			{
+				$oPage->add("<ul>\n");
+				foreach($aStates[$sStateCode]['attribute_list'] as $sAttCode => $iOptions)
+				{
+					$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+					$sAttLabel = $oAttDef->GetLabel();
+	
+					$aOptions = array();
+					if ($iOptions & OPT_ATT_HIDDEN) $aOptions[] = Dict::S('UI:Schema:LifeCycleHiddenAttribute');
+					if ($iOptions & OPT_ATT_READONLY) $aOptions[] = Dict::S('UI:Schema:LifeCycleReadOnlyAttribute');
+					if ($iOptions & OPT_ATT_MANDATORY) $aOptions[] = Dict::S('UI:Schema:LifeCycleMandatoryAttribute');
+					if ($iOptions & OPT_ATT_MUSTCHANGE) $aOptions[] = Dict::S('UI:Schema:LifeCycleAttributeMustChange');
+					if ($iOptions & OPT_ATT_MUSTPROMPT) $aOptions[] = Dict::S('UI:Schema:LifeCycleAttributeMustPrompt');
+					if (count($aOptions))
+					{
+						$sOptions = implode(', ', $aOptions);
+					}
+					else
+					{
+						$sOptions = "";
+					}
+	
+					$oPage->add("<li class=\"closed\"><span style=\"color:purple;font-weight=bold;\">$sAttLabel</span> $sOptions</li>\n");
+				}
+				$oPage->add("</ul></li>\n");
+			}
+			else
+			{
+				$oPage->p("<em>".Dict::S('UI:Schema:LifeCycleEmptyList')."</em>");
+			}
+		}
+		$oPage->add("</ul>\n");
+        $oPage->add_ready_script('$("#LifeCycleList").treeview({collapsed: true,});');
+        $oPage->add_ready_script('$("#LifeCycleAttrOptList").treeview({collapsed: true,});');
+    }
+}
+
+
+/**
+ * Helper for the trigger
+ */
+function DisplayTriggers($oPage, $sClass)
+{
+	$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
+	$oSet = new CMDBObjectSet(DBObjectSearch::FromOQL("SELECT TriggerOnObject WHERE target_class IN ('$sClassList')"));
+	cmdbAbstractObject::DisplaySet($oPage, $oSet, array('block_id' => 'triggers'));
+}
+
+
+/**
+ * Display the list of classes from the business model
+ */
+function DisplayClassesList($oPage, $sContext)
+{
+	$oPage->add("<h1>".Dict::S('UI:Schema:Title')."</h1>\n");
+
+    $oPage->add("<label for='search-model'>" . Dict::S('UI:Schema:ClassFilter') ."</label><br/><input type=\"text\" id=\"search-model\" autofocus=\"autofocus\"/>");
+    $oPage->add("<div id=\"delDataModelSearch\"> <i class=\"fa fa-times-circle\"></i></div>");
+	$oPage->add("<ul id=\"ClassesList\" class=\"treeview fileview\">\n");
+	$oPage->add_ready_script(
+		<<<EOF
+        $("#search-model").result(function(e,f,g,h){
+		   	//$(this).trigger(jQuery.Event('input'));
+		   	var preUrl = "?operation=details_class&class=";
+			var sufUrl = "&c[menu]=DataModelMenu";
+			var code = '';
+		   	switch($("#displaySelector").val()){
+				case 'labelandcode':
+					var id = autocompleteClassLabelAndCode.indexOf(g);
+					if(id != undefined)
+						code = autocompleteClassCode[id];
+				break;
+				case 'label':
+					var id = autocompleteClassLabel.indexOf(g);
+					if(id != undefined)
+						code = autocompleteClassCode[id];
+				break;
+				case 'code':
+					var id = autocompleteClassCode.indexOf(g);
+					if(id != undefined)
+						code = autocompleteClassCode[id];
+				break;
+			}
+			if(code != '')
+				window.location = preUrl + code + sufUrl;
+		});
+		$("#search-model").on('input', function() {
+			var search_result = [];
+			$("#ClassesList").find("li").each(function(){
+				if( ! ~$(this).children("a").text().toLowerCase().indexOf($("#search-model").val().toLowerCase())){
+					$(this).hide();
+				}
+				else{
+					search_result.push($(this));
+				}
+			});
+			search_result.forEach(function(e){
+				e.show();
+				e.find('ul > li').show();
+				e.parents().show();
+			});
+		});
+		$("#delDataModelSearch").on ('click', function(){
+			$("#search-model").val("");
+			$("#search-model").trigger('input');
+		});
+EOF
+
+	);
+	// Get all the "root" classes for display
+	$aRootClasses = array();
+	foreach(MetaModel::GetClasses() as $sClassName)
+	{
+		if (MetaModel::IsRootClass($sClassName))
+		{
+			$aRootClasses[$sClassName] = MetaModel::GetName($sClassName);
+		}
+		elseif (MetaModel::IsStandaloneClass($sClassName))
+		{
+			$aRootClasses[$sClassName] = MetaModel::GetName($sClassName);
+		}
+        $sLabelClassName = MetaModel::GetName($sClassName);
+		//Fetch classes names for autocomplete purpose
+        $oPage->add_script(
+            <<<EOF
+	autocompleteClassLabelAndCode.push("$sLabelClassName ($sClassName)");
+	autocompleteClassLabel.push("$sLabelClassName");
+	autocompleteClassCode.push("$sClassName");
+EOF
+        );
+	}
+	// Sort them alphabetically on their display name
+	asort($aRootClasses);
+	foreach($aRootClasses as $sClassName => $sDisplayName)
+	{
+		if (MetaModel::IsRootClass($sClassName))
+		{
+			$oPage->add("<li class=\"open\">".MakeClassHLink($sClassName, $sContext)."\n");
+			DisplaySubclasses($oPage, $sClassName, $sContext);
+			$oPage->add("</li>\n");
+		}
+		elseif (MetaModel::IsStandaloneClass($sClassName))
+		{
+			$oPage->add("<li>".MakeClassHLink($sClassName, $sContext)."</li>\n");
+		}
+	}
+	$oPage->add("</ul>\n");
+	$oPage->add_ready_script('$("#ClassesList").treeview();');
+}
+
+
+/**
+ * Helper for the list of classes related to the given class in a graphical way
+ */
+function DisplayRelatedClassesGraph($oPage, $sClass)
+{
+    try
+    {
+        $bOnTheLeft = true;
+        $bSkipLinkingClasses = false;
+		// 1) Fetching referencing classes data
+	    //
+        $aData = array();
+        $aOrigins = array('_' => true);
+        $aRefs = MetaModel::EnumReferencingClasses($sClass, $bSkipLinkingClasses);
+        $sSelfReference = "false";
+        if (count($aRefs) != 0)
+        {
+            foreach ($aRefs as $sRemoteClass => $aRemoteKeys)
+            {
+                foreach ($aRemoteKeys as $sExtKeyAttCode => $oExtKeyAttDef)
+                {
+                	if($sRemoteClass != $sClass)
+					{
+						// ref_prefix to avoid collision between attributes labels that refer to this class and local attributes label that references other classes
+                        $aAttribute = array('label' => 'ref_'.$sExtKeyAttCode);
+                        // Test if a distant attribut exists and if it uses a link class
+                        if(!($oExtKeyAttDef->GetMirrorLinkAttribute() == null ? false : $oExtKeyAttDef->GetMirrorLinkAttribute() instanceof AttributeLinkedSetIndirect))
+                        {
+                            $aAttribute['related'] = $sRemoteClass;
+                            $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
+                            $aAttribute['related_position'] = $bOnTheLeft ? -1 : 1;
+                            $aAttribute['relation_type'] = 0;
+                            $bOnTheLeft = !$bOnTheLeft; // Toggle the side
+                            $sOrigin = MetaModel::GetAttributeOrigin($sRemoteClass, $sExtKeyAttCode);
+                            $aAttribute['origin'] = $sOrigin;
+                            $aOrigins[$sOrigin] = true;
+                            $aData[$sExtKeyAttCode . $sRemoteClass] = $aAttribute;
+                        }
+                    }
+                }
+            }
+        }
+
+        // 2) Fetching referenced classes data
+        //
+        $aDataRef = array(array('label' => $sClass, 'icon' => MetaModel::GetClassIcon($sClass, false), 'origin_index' => 0, 'alphabetical_index' => 0, 'origin' => '_'));
+        $bOnTheLeft = true;
+        $aOriginsRef = array('_' => true);
+        foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+        {
+            $aAttribute = array('label' => $sAttCode);
+            if ($oAttDef->IsLinkSet())
+            {
+                if ($oAttDef->IsIndirect())
+                {
+                    $sRemoteAttDef = $oAttDef->GetExtKeyToRemote();
+                    $aAttribute['related'] = MetaModel::GetAttributeDef($oAttDef->GetLinkedClass(), $sRemoteAttDef)->GetTargetClass();
+                    $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
+                    $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
+                    $aAttribute['relation_type'] = 0; //
+	                $aAttribute['tooltip_data']['class'] = $oAttDef->GetLinkedClass();
+	                $aAttribute['tooltip_data']['to_remote'] = $sRemoteAttDef;
+	                $aAttribute['tooltip_data']['to_me'] = $oAttDef->GetExtKeyToMe();
+
+                    $bOnTheLeft = !$bOnTheLeft; // Toggle the side
+                }
+                else
+                {
+                    $aAttribute['related'] = $oAttDef->GetLinkedClass();
+                    $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
+                    $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
+                    $aAttribute['relation_type'] = 1;
+                    $bOnTheLeft = !$bOnTheLeft; // Toggle the side
+                }
+
+            }
+            else if ($oAttDef->IsHierarchicalKey())
+            {
+                $aAttribute['related'] = $sClass;
+                $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
+                $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
+                $aAttribute['relation_type'] = 2;
+                $bOnTheLeft = !$bOnTheLeft; // Toggle the side
+                $sSelfReference = "true";
+            }
+            else if ($oAttDef->IsExternalKey())
+            {
+                $aAttribute['related'] = $oAttDef->GetTargetClass();
+                $aAttribute['related_icon'] = MetaModel::GetClassIcon($aAttribute['related'], false);
+                $aAttribute['related_position'] = $bOnTheLeft  ? 1 : -1;
+                $aAttribute['relation_type'] = 3;
+
+                $bOnTheLeft = !$bOnTheLeft; // Toggle the side
+            }
+            if ($oAttDef->IsLinkSet() || $oAttDef->IsHierarchicalKey() || $oAttDef->IsExternalKey()){
+                $sOrigin = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
+
+				$aAttribute['origin'] = $sOrigin;
+	            $aOriginsRef[$sOrigin] = true;
+	            $aDataRef[$sAttCode] = $aAttribute;
+
+			}
+
+        }
+
+
+        //sort referencing data
+
+	    $aOrigins = array_keys($aOrigins);
+	    $idx = 0;
+
+		$bOnTheLeft = true;
+	    foreach($aData as $sAttCode => $aAttribute)
+	    {
+	    	$is_also_referenced = false;
+		    foreach($aDataRef as $sAttCodeRef => $aAttributeRef)
+		    {
+		    	if(!empty($aDataRef[$sAttCodeRef]['related']) && ($aData[$sAttCode]['related'] == $aDataRef[$sAttCodeRef]['related']))
+				    $is_also_referenced = true;
+		    }
+		    if(!$is_also_referenced)
+		    {
+			    $aData[$sAttCode]['related_position'] = ($bOnTheLeft) ? -1 : 1;
+			    $bOnTheLeft = !$bOnTheLeft;
+			    $aData[$sAttCode]['origin_index'] = ($aData[$sAttCode]['related_position'] == -1) ? ++$idx : $idx;
+		    }
+		    else
+		    {
+		    	unset($aData[$sAttCode]);
+		    }
+	    }
+	    ksort($aData);
+	    $idx = 0;
+	    $aFinalDataReferencing = array();
+	    foreach($aData as $sAttCode => $aAttribute)
+	    {
+		    $aData[$sAttCode]['alphabetical_index'] = $aAttribute['related_position'] == 1 ? ++$idx : $idx;
+		    $aFinalDataReferencing[] = $aData[$sAttCode];
+	    }
+	    $sDataReferencing = json_encode($aFinalDataReferencing);
+	    $sOriginsReferencing = json_encode(array_keys($aOrigins));
+
+	    //sort referenced data
+
+	    $idx = 1;
+        foreach($aDataRef as $sAttCode => $aAttribute)
+        {
+            $aDataRef[$sAttCode]['origin_index'] = $idx++;
+        }
+
+        $idx = 1;
+        $aFinalData = array();
+        foreach($aDataRef as $sAttCode => $aAttribute)
+        {
+            $aDataRef[$sAttCode]['alphabetical_index'] = $idx++;
+            $aFinalData[] = $aDataRef[$sAttCode];
+        }
+
+        $sData = json_encode($aFinalData);
+
+	    // 3) Processing data and building graph
+	    //
+        $oPage->add(
+            <<<EOF
+<div id="dataModelGraph">
+<svg class="dataModelSchema" width="100%" height="800">
+</svg>
+</div>
+EOF
+        );
+        $oPage->add_ready_script(
+            <<<EOF
+
+var data = $sData;
+var dataref = $sDataReferencing;
+/**
+ * sDataReferencing's data size ceil'd to the next even number
+ * in order to keep the same display if classes nb is even/not even
+ */
+var datareflen = Math.ceil(dataref.length/2)*2;
+var isSelfReferencing = $sSelfReference;
+
+//Link that will be opened when a class is clicked
+var refClassLinkpre = "?operation=details_class&class=";
+var refClassLinksuf = "&c[menu]=DataModelMenu#tabbedContent_0=1";
+			
+var aOriginsref = $sOriginsReferencing;
+		
+var margins = {top: 50, left: 100 };
+var cellHeight = 24;
+var cellWidth =  Math.max(3*48, 8*d3.max(data, function(d) { return d.label.length; }));
+var relatedCellWidth = Math.max(3*48, Math.max(8*d3.max(data, function(d) { return d.related ? d.related.length : 0; }) || 0,8*d3.max(dataref, function(d) { return d.related ? d.related.length : 0; }) ) || 0);
+var gap = 70;
+var schema = d3.select(".dataModelSchema")
+    .attr("height", cellHeight * (data.length + dataref.length + (1 + dataref.length%2)*1.5) + 2*margins.top);
+
+var divD3 = d3.select("#dataModelGraph").append("div")
+	.attr("class","tooltipD3")
+	.style("opacity",0);
+
+// 1) Horn construction (top lines used to display referencing classes which doesn't have a linkset attribute)
+//
+if(dataref.length > 1)
+{
+schema.append("path")
+		.attr("d", "M"+(margins.left + relatedCellWidth + gap + cellWidth*0.75)+" "+ (margins.top + cellHeight + cellHeight*(datareflen+1.5)) +" l 0 "+ cellHeight*-datareflen+"")
+		.attr("fill", "transparent")
+		.attr("stroke", "black")
+		.attr("stroke-linecap", "round")
+		.attr("stroke-width", 2);
+}
+if(dataref.length > 0)
+{
+schema.append("path")
+		.attr("d", "M"+(margins.left + relatedCellWidth + gap + cellWidth*0.25)+" "+ (margins.top + cellHeight + cellHeight*(datareflen+1.5)) +" l 0 "+ cellHeight*-datareflen+"")
+		.attr("fill", "transparent")
+		.attr("stroke", "black")
+		.attr("stroke-linecap", "round")
+		.attr("stroke-width", 2);
+}
+
+//loop + arrow to show that a class has a hierarchical attribute
+if(isSelfReferencing == true)
+{
+	schema.append("path")
+			.attr("d", "M"+(margins.left + relatedCellWidth + gap + cellWidth/1.9)+" "+ (margins.top  + cellHeight*(datareflen+1.5))+" a 20 20 0 1 0 20 0  m-10 0l-5 3 m5 -3 l-5 -3")
+			.attr("id", "selfreferencing")
+			.attr("fill", "transparent")
+			.attr("stroke", "black")
+			.attr("stroke-linecap", "round")
+			.attr("stroke-width", 2)
+			.attr("transform", "rotate(95, "+ (margins.left + relatedCellWidth + gap + cellWidth/1.9) + ", " + ((margins.top  + cellHeight*(datareflen+1.5))+10)+")");
+}
+
+// 2) Classes linked to horns (classes referencing us)
+//
+var fieldref = schema.selectAll("g")
+    .data(dataref, function(d) { return d.label + d.related } )
+    .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(" + (margins.left + relatedCellWidth + gap + cellWidth/2) + "," + (margins.top + d.origin_index*cellHeight*2) + ")"; });
+
+
+fieldref.filter(function(d) {
+	return (d.related != null);
+}).append("a")
+	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf})
+	.append("rect")
+		.attr("x", -relatedCellWidth/2)
+		.attr("width", relatedCellWidth)
+		.attr("height", cellHeight)
+		.attr("fill", "#fff")
+		.attr("stroke", "#000")
+		.attr("stroke-width", 1)
+		.attr("transform", function(d, i) { return "translate("+ d.related_position*(relatedCellWidth/2+cellWidth/2+gap) +", 0)"; });
+
+fieldref.filter(function(d) {
+	return (d.related != null);
+}).append("a")
+	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf })
+	.append("text")
+		.attr("x", 0)
+		.attr("y", cellHeight / 2)
+		.attr("dy", ".35em")
+		.text(function(d) { return d.related ? d.related : ''; })
+		.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap)) +", 0)"; });
+	
+fieldref.filter(function(d) {
+	return (d.related != null);
+}).append("path")
+    .attr("d", "M"+(cellWidth/2 - cellWidth*0.25)+" "+cellHeight/2+" h"+(gap-2 + cellWidth*0.25))
+	.attr("fill", "transparent")
+	.attr("stroke", "black")
+	.attr("stroke-linecap", "round")
+	.attr("stroke-width", 2)
+	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(180, 0, "+(cellHeight/2)+")" : ""});
+		
+fieldref.filter(function(d) {
+	return (d.related != null);
+}).append("path")
+    .attr("d", "M"+cellWidth/1.9*-1+" "+cellHeight/2+" m-10 0l-5 3 m5 -3 l-5 -3")
+	.attr("fill", "transparent")
+	.attr("stroke", "black")
+	.attr("stroke-linecap", "round")
+	.attr("stroke-width", 2)
+	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(360, 0, "+(cellHeight/2)+")" : "rotate(180, 0, "+(cellHeight/2)+")"});
+		
+fieldref.filter(function(d) {
+	return (d.related != null);
+}).append("svg:image")
+   .attr("x", -relatedCellWidth/2)
+   .attr("width", cellHeight)
+	.attr("height", cellHeight)
+    .attr("xlink:href", function(d, i) { return d.related_icon })
+	.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap) - 12)+", -" + cellHeight/2+" )"; });	
+
+
+// 3) Main class rectangle and attributes rectangles
+//
+var field = schema.selectAll("g")
+    .data(data, function(d) { return d.label } )
+    .enter().append("g")
+    .attr("transform", function(d, i) { return "translate(" + (margins.left + relatedCellWidth + gap + cellWidth/2) + "," + (margins.top + (datareflen+1.5)*cellHeight + d.origin_index*cellHeight) + ")"; });
+
+field.append("rect")
+    .attr("x", -cellWidth/2)
+    .attr("width", cellWidth)
+    .attr("class", function(d, i){return (d.relation_type == 2 ? "selfattr" : "extattr");}) 
+	.attr("height", cellHeight)
+	.attr("fill", "#fff")
+	.attr("stroke", "#000")
+	.attr("stroke-width", 1);
+			
+field.append("text")
+    .attr("x", 0)
+    .attr("y", cellHeight / 2)
+    .attr("dy", ".35em")
+    .text(function(d) { return d.label; });
+    
+field.append("text")
+    .attr("x", function(d){ return 7*d.label.length/2 })
+    .attr("y", cellHeight / 2)
+    .attr("dy", ".35em")
+    .attr("class", function(d, i){return (d.relation_type == 2 ? "selfattrtxt" : "");}) 
+    .text(function(d) { return ((d.relation_type == 2) ? '\uf01e' : '' ); });
+
+
+// 4) Classes that our main class is refering to
+//
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type != 2);
+}).append("a")
+	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf})
+	.append("rect")
+		.attr("x", -relatedCellWidth/2)
+		.attr("width", relatedCellWidth)
+		.attr("height", cellHeight)
+		.attr("fill", "#fff")
+		.attr("stroke", "#000")
+		.attr("stroke-width", 1)
+		.attr("transform", function(d, i) { return "translate("+ d.related_position*(relatedCellWidth/2+cellWidth/2+gap) +", 0)"; });
+
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type != 2);
+}).append("a")
+	.attr("xlink:href",function(d){ return refClassLinkpre + d.related + refClassLinksuf})
+	.append("text")
+		.attr("x", 0)
+		.attr("y", cellHeight / 2)
+		.attr("dy", ".35em")
+		.text(function(d) { return d.related ? d.related : ''; })
+		.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap)) +", 0)"; });
+
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type != 2);
+}).append("path")
+    .attr("d", "M"+cellWidth/2+" "+cellHeight/2+" h"+(gap-2))
+	.attr("fill", "transparent")
+	.attr("stroke", "black")
+	.attr("stroke-linecap", "round")
+	.attr("stroke-width", 2)
+	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(180, 0, "+(cellHeight/2)+")" : ""});
+		
+		
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type == 3 || d.relation_type == 0);
+}).append("path")
+    .attr("d","M"+ (gap - 2 + cellWidth/2) +" "+cellHeight/2+" m-10 0l-5 3 m5 -3 l-5 -3")
+	.attr("fill", "transparent")
+	.attr("stroke", "black")
+	.attr("stroke-linecap", "round")
+	.attr("stroke-width", 2)
+	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(180, 0, "+(cellHeight/2)+")" : ""});
+		
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type == 1 || d.relation_type == 0);
+}).append("path")
+    .attr("d", "M"+cellWidth/1.9*-1+" "+cellHeight/2+" m-10 0l-5 3 m5 -3 l-5 -3")
+	.attr("fill", "transparent")
+	.attr("stroke", "black")
+	.attr("stroke-linecap", "round")
+	.attr("stroke-width", 2)
+	.attr("transform", function(d, i) { return (d.related_position < 0) ? "rotate(360, 0, "+(cellHeight/2)+")" : "rotate(180, 0, "+(cellHeight/2)+")"});				
+			
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type == 0);
+}).append("circle")
+    .attr("r", 5)
+    .attr("cy", cellHeight/2)
+	.on('mouseover',function(d){
+		divD3.transition()
+			.duration(200)
+			.style("opacity","1");
+		divD3.style("left", (d3.event.pageX - 7*d['tooltip_data']['class'].length/2) + "px");
+		divD3.style("top", (d3.event.pageY - 65) + "px");
+		divD3.html( '<div id="tooltipD3_top">' + d['tooltip_data']['class'] + '</div><span id="tooltipD3_left"> <i class="fa fa-caret-left"></i> '
+		 			+  ( (d.related_position < 0) ? d['tooltip_data']['to_remote'] : d['tooltip_data']['to_me'] ) +  '</span><span id="tooltipD3_right"> <br/>'
+		 			+ ( (d.related_position < 0) ? d['tooltip_data']['to_me'] : d['tooltip_data']['to_remote'] ) + ' <i class="fa fa-caret-right"></i></span>');
+	})
+	.on('mouseout',function(d){
+		divD3.transition()
+			.duration(500)
+			.style("opacity","0");
+	})
+	.attr("transform", function(d, i) { return "translate("+ d.related_position*(cellWidth+gap+2)/2 +", 0)"; });
+			
+
+			
+field.filter(function(d) {
+	return (d.related != null) && (d.relation_type != 2);
+}).append("svg:image")
+   .attr("x", -relatedCellWidth/2)
+   .attr("width", cellHeight)
+	.attr("height", cellHeight)
+    .attr("xlink:href", function(d, i) { return d.related_icon })
+	.attr("transform", function(d, i) { return "translate("+ (d.related_position*(relatedCellWidth/2+cellWidth/2+gap) - 12)+", -" + cellHeight/2+" )"; });
+						
+field.append("rect")
+    .attr("x", -cellWidth/2 - 5)
+    .attr("width", 5)
+	.attr("height", cellHeight)
+	.attr("fill", function(d) { return aColors(aOrigins.indexOf(d.origin)); } )
+	.attr("stroke-width", 0)
+	.attr("class","liseret");
+			
+field.filter(function(d) {
+	return (d.icon != null);
+}).append("svg:image")
+    .attr("x", -cellWidth/2)
+    .attr("width", 36)
+	.attr("height", 36)
+    .attr("xlink:href", function(d, i) { return d.icon })
+	.attr("transform", "translate(-12, -24)");
+			
+EOF
+        );
+    }
+    catch(Exception $e)
+    {
+        $oPage->p('<b>'.Dict::Format('UI:RunQuery:Error', $e->getMessage()).'</b>');
+    }
+}
+
+/**
+ * Display the details of a given class of objects
+ */
+function DisplayClassDetails($oPage, $sClass, $sContext)
+{
+	DisplayClassHeader($oPage, $sClass);
+	$aParentClasses = array();
+	foreach(MetaModel::EnumParentClasses($sClass) as $sParentClass)
+	{
+		$aParentClasses[] = MakeClassHLink($sParentClass, $sContext);
+	}
+	if (count($aParentClasses) > 0)
+	{
+		$sParents = implode(' &gt;&gt; ', $aParentClasses)." &gt;&gt; <b>$sClass</b>";
+	}
+	else
+	{
+		$sParents = '';
+	}
+	$oPage->p("[<a href=\"schema.php?operation=list{$sContext}\">".Dict::S('UI:Schema:AllClasses')."</a>] $sParents");
+
+	if (MetaModel::HasChildrenClasses($sClass))
+	{
+		$oPage->add("<ul id=\"ClassHierarchy\">");
+		$oPage->add("<li class=\"closed\">".$sClass."\n");
+		DisplaySubclasses($oPage, $sClass,$sContext);
+		$oPage->add("</li>\n");
+		$oPage->add("</ul>\n");
+		$oPage->add_ready_script('$("#ClassHierarchy").treeview();');	
+	}
+	$oPage->p('');
+	$oPage->add("</div>");
+
+	$oPage->AddTabContainer('details');
+	$oPage->SetCurrentTabContainer('details');
+	// List the attributes of the object
+	$aForwardChangeTracking = MetaModel::GetTrackForwardExternalKeys($sClass);
+	$aDetails = array();
+
+	$aOrigins = array();
+	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
+	{
+		if ($oAttDef->IsExternalKey())
+		{
+		   $sValue = Dict::Format('UI:Schema:ExternalKey_To',MakeClassHLink($oAttDef->GetTargetClass(), $sContext));
+			if (array_key_exists($sAttCode, $aForwardChangeTracking))
+			{
+				$oLinkSet = $aForwardChangeTracking[$sAttCode];
+				$sRemoteClass = $oLinkSet->GetHostClass();
+				$sValue = $sValue."<span title=\"Forward changes to $sRemoteClass\">*</span>";
+			}
+		}
+		elseif ($oAttDef->IsLinkSet())
+		{
+			$sValue = MakeClassHLink($oAttDef->GetLinkedClass(), $sContext);
+		}
+		else
+		{
+		   $sValue = $oAttDef->GetDescription();
+		}
+		$sType = get_class($oAttDef);
+		$sTypeDict = $oAttDef->GetType();
+        $sTypeDesc = $oAttDef->GetTypeDesc();
+
+        $sOrigin = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
+        $aOrigins[$sOrigin] = true;
+        $sAllowedValues = "";
+		$sMoreInfo = "";
+		$sDefaultNullValue = '""';
+		$aCols = array();
+		foreach($oAttDef->GetSQLColumns() as $sCol => $sFieldDesc)
+		{
+			$aCols[] = "$sCol: $sFieldDesc";
+		}
+		if (count($aCols) > 0)
+		{
+
+			$aMoreInfo = array();
+			if($oAttDef->IsNullAllowed())
+			{
+				$aMoreInfo[] = Dict::S('UI:Schema:NullAllowed');
+				$sDefaultNullValue = (!is_null($oAttDef->GetNullValue()) ? $oAttDef->GetNullValue() : null );
+				if(!is_null($sDefaultNullValue) && !is_string($sDefaultNullValue))
+				{
+					$sDefaultNullValue = json_encode($sDefaultNullValue);
+				}
+				$sDefaultNullValue = (!is_null($sDefaultNullValue) ? json_encode(Dict::Format('UI:Schema:DefaultNullValue', $sDefaultNullValue)) : '""' );
+			}
+			else
+			{
+				$aMoreInfo[] = Dict::S('UI:Schema:NullNotAllowed');
+			}
+			if($oAttDef->GetDefaultValue())
+			{
+				$sDefaultValue = $oAttDef->GetDefaultValue();
+				if(!is_string($sDefaultValue))
+				{
+					$sDefaultValue = json_encode($sDefaultValue);
+				}
+				$aMoreInfo[] = Dict::Format("UI:Schema:Default_Description", $sDefaultValue);
+			}
+			$sMoreInfo .= implode(', ', $aMoreInfo);
+		}
+        $sAttrCode = $oAttDef->GetCode();
+        $sIsEnumValues = 'false';
+        $sAllowedValuesEscpd = '""';
+		if ($oAttDef instanceof AttributeEnum)
+		{
+			// Display localized values for the enum (which depend on the localization provided by the class)
+			$aLocalizedValues = MetaModel::GetAllowedValues_att($sClass, $sAttCode, array());
+			$aDescription = array();
+			foreach($aLocalizedValues as $val => $sDisplay)
+			{
+				$aDescription[] = "<span class=\"attrLabel\">". $sDisplay ."</span>  <span class=\"parenthesis\">(</span><span class=\"attrCode\">" . $val . "</span><span class=\"parenthesis\">)</span>";
+			}
+			$sAllowedValues = implode(', ', $aDescription);
+            $sIsEnumValues = 'true';
+		}
+		elseif (is_object($oAllowedValuesDef = $oAttDef->GetValuesDef()))
+		{
+			$sAllowedValues = trim( $oAllowedValuesDef->GetValuesDescription(), "Filter : ");
+            $sAllowedValuesEscpd = json_encode($sAllowedValues);
+
+            $sFilterURL = urlencode($sAllowedValues);
+			$sAllowedValues = "<span id=\"values" . $sAttrCode ."\"><a href=\"run_query.php?expression=" . $sFilterURL . "\">⚵</a>" . Dict::S('UI:Schema:Attribute/Filter') . "</span>";
+        }
+		else
+		{
+			$sAllowedValues = '';
+		}
+		$sAttrValueEscpd = json_encode($sValue);
+		$sAttrTypeDescEscpd = json_encode($sTypeDesc);
+		$sAttrOriginEscpd = json_encode($sOrigin);
+
+		$aDetails[] = array('code' => "<span id=\"attr". $sAttrCode."\"><span class=\"attrLabel\">". $oAttDef->GetLabel() ."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" . $oAttDef->GetCode() ."</span><span class=\"parenthesis\">)</span></span>",
+							'type' =>  "<span id=\"type". $sAttrCode."\"><span class=\"attrLabel\">". $sTypeDict ."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" . $sType ."</span><span class=\"parenthesis\">)</span></span>",
+							'origincolor' => "<span class=\"originColor" . $sOrigin ."\"></span>",
+            				'origin' => "<span id=\"origin" . $sAttrCode ."\">$sOrigin</span>",
+							'values' => $sAllowedValues,
+							'moreinfo' => "<span id=\"moreinfo" . $sAttrCode . "\"> $sMoreInfo</span>");
+		//tooltip construction
+        $oPage->add_ready_script(
+            <<<EOF
+            	if($sAttrValueEscpd != ''){
+		       		$('#attr$sAttrCode').qtip( { content: $sAttrValueEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
+		       	}
+		       	if($sAttrTypeDescEscpd != ''){
+		      	  $('#type$sAttrCode').qtip( { content: $sAttrTypeDescEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
+				}
+				if($sAttrOriginEscpd != ''){
+					$('#originColor$sAttrCode').parent().qtip( { content: $sAttrOriginEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
+				}
+				if( !$sIsEnumValues && $sAllowedValuesEscpd != ''){
+					$('#values$sAttrCode').qtip( { content: $sAllowedValuesEscpd, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
+				}
+				if($sDefaultNullValue != ''){
+					$('#moreinfo$sAttrCode').qtip( { content: $sDefaultNullValue, show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
+				}
+EOF
+
+		);
+
+    }
+
+	$oPage->SetCurrentTab(Dict::S('UI:Schema:Attributes'));
+	$aConfig = array( 'origincolor' => array('label' => "", 'description' => ""),
+        			  'code' => array('label' => Dict::S('UI:Schema:AttributeCode'), 'description' => Dict::S('UI:Schema:AttributeCode+')),
+					  'type' => array('label' => Dict::S('UI:Schema:Type'), 'description' => Dict::S('UI:Schema:Type+')),
+					  'values' => array('label' => Dict::S('UI:Schema:AllowedValues'), 'description' => Dict::S('UI:Schema:AllowedValues+')),
+					  'moreinfo' => array('label' => Dict::S('UI:Schema:MoreInfo'), 'description' => Dict::S('UI:Schema:MoreInfo+')),
+					  'origin' => array('label' => Dict::S('UI:Schema:Origin'), 'description' => Dict::S('UI:Schema:Origin+')),
+	);
+	$oPage->table($aConfig, $aDetails);
+    $sOrigins = json_encode(array_keys($aOrigins));
+
+    //color calculation in order to keep 1 color for 1 extended class. Colors are interpolated and will be used for
+	// graph scheme color too
+    $oPage->add_ready_script(
+        <<< EOF
+				var aOrigins = $sOrigins;
+				var aColors = d3.scale.linear().domain([1,aOrigins.length])
+				  .interpolate(d3.interpolateHcl)
+				  .range([d3.rgb("#007AFF"), d3.rgb('#FFF500')]);		
+				$.each(aOrigins,function(idx, origin){
+					$('.originColor'+origin).parent().css('background-color',aColors(aOrigins.indexOf(origin)));
+				});
+				Array.prototype.forEach.call($(".listResults").find('td:nth-child(1),th:nth-child(1)'), function(e){
+					$(e).removeClass("header").addClass("originColor");
+				});
+
+EOF
+    );
+
+    $oPage->SetCurrentTab(Dict::S('UI:Schema:RelatedClasses'));
+    DisplayRelatedClassesGraph($oPage, $sClass);
+    $oPage->SetCurrentTab(Dict::S('UI:Schema:ChildClasses'));
+
+    DisplaySubclasses($oPage, $sClass, $sContext);
+
+    $oPage->SetCurrentTab(Dict::S('UI:Schema:LifeCycle'));
+	DisplayLifecycle($oPage, $sClass, $sContext);
+
+	$oPage->SetCurrentTab(Dict::S('UI:Schema:Triggers'));
+	DisplayTriggers($oPage, $sClass, $sContext);
+
+	$oPage->SetCurrentTab();
+	$oPage->SetCurrentTabContainer();
+}
+
+
+/**
+ * Display the dropdown that allow to select the attributes/class display granularity
+ */
+function DisplayGranularityDisplayer($oPage){
+
+	$oPage->add("
+		<label id=\"displaySelectorLabel\"> <h1> ". Dict::S('UI:Schema:DisplayLabel') .
+		"<select id=\"displaySelector\">
+			<option value=\"labelandcode\">" . Dict::S('UI:Schema:DisplaySelector/LabelAndCode') . "</option>
+			<option value=\"label\">" . Dict::S('UI:Schema:DisplaySelector/Label') . "</option>
+			<option value=\"code\">" . Dict::S('UI:Schema:DisplaySelector/Code') . "</option>
+		</select> </h1></label>
+		 <br/>");
+	$sDisplayDropDownValue = htmlentities(appUserPreferences::GetPref('datamodel_viewer_display_granularity','labelandcode'),ENT_QUOTES,"UTF-8");
+
+//granularity displayer listener
+	$oPage->add_ready_script(
+		<<<EOF
+        var parenthesisHider = function(){
+        	if ( ($('#labelEnabler').is(':checked') && !$('#codeEnabler').is(':checked')) || ($('#codeEnabler').is(':checked') && !$('#labelEnabler').is(':checked')))
+        	{
+        		$('.parenthesis').toggle();
+        	}
+        };
+		$('#displaySelector').on(
+		'change', function(){
+			switch($(this).val()){
+				case 'labelandcode':
+					$('.attrCode').show();
+					$('.attrLabel').show();
+					$('.parenthesis').show();
+					$("#search-model").autocomplete(autocompleteClassLabelAndCode, {scroll:true, matchContains:true});
+				break;
+				case 'label':
+					$('.attrCode').hide();
+					$('.attrLabel').show();
+					$('.parenthesis').hide();
+					$("#search-model").autocomplete(autocompleteClassLabel, {scroll:true, matchContains:true});
+				break;
+				case 'code':
+					$('.attrCode').show();
+					$('.attrLabel').hide();
+					$('.parenthesis').hide();
+					$("#search-model").autocomplete(autocompleteClassCode, {scroll:true, matchContains:true});
+				break;
+			}
+			SetUserPreference("datamodel_viewer_display_granularity", $('#displaySelector').val(), true);
+		});
+		$('#displaySelector').val("$sDisplayDropDownValue").trigger("change");
+EOF
+	);
+}
+/**
+ * Display the header of the class details page
+ */
+function DisplayClassHeader($oPage, $sClass){
+	//scrollable class name / icon
+	$oPage->add("<div id=\"dataModelScrollableDiv\">");
+	$oPage->add("<div id=\"dataModelScrollableClassIcon\">" . MetaModel::GetClassIcon($sClass) . "</div>");
+	$oPage->add("<h2 id=\"dataModelScrollableClassName\"><span class=\"attrLabel\">" . MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" .$sClass."</span><span class=\"parenthesis\">)</span></h2>");
+	$oPage->add("</div>");
+
+//content header
+	$oPage->add("<div id=\"dataModelHeader\">");
+	DisplayGranularityDisplayer($oPage);
+	$oPage->add("<div id=\"dataModelClassIcon\">" . MetaModel::GetClassIcon($sClass) . "</div>");
+	$sClassDescritpion = MetaModel::GetClassDescription($sClass);
+
+	$oPage->add("<h2 id=\"classDetailsClassName\"><span class=\"attrLabel\">".MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">" .$sClass."</span><span class=\"parenthesis\">)</span>" . ($sClassDescritpion == "" ? "" : " - " . $sClassDescritpion) . "</h2>\n");
+	if (MetaModel::IsAbstract($sClass))
+	{
+		$oPage->p(Dict::S('UI:Schema:AbstractClass'));
+	}
+}
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//                                             MAIN BLOCK                                                             //
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// Display the menu on the left
+$oAppContext = new ApplicationContext();
+$sContext = $oAppContext->GetForLink();
+if (!empty($sContext))
+{
+	$sContext = '&'.$sContext;
+}
+$operation = utils::ReadParam('operation', '');
+
+$oPage = new iTopWebPage(Dict::S('UI:Schema:Title'));
+$oPage->no_cache();
+
+$oPage->SetBreadCrumbEntry('ui-tool-datamodel', Dict::S('Menu:DataModelMenu'), Dict::S('Menu:DataModelMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
+$oPage->add_script(
+    <<<EOF
+	var autocompleteClassLabelAndCode = [];
+	var autocompleteClassLabel = [];
+	var autocompleteClassCode = [];
+EOF
+);
+
+$oPage->add(" <div class='ui-widget'> </div><div id='dataModelSplitPane'>");
+$oPage->add("<div class='ui-layout-west data-model-viewer'> ");
+DisplayClassesList($oPage, $sContext);
+$oPage->add("</div>");
+$oPage->add("<div class='ui-layout-center data-model-viewer'>");
+
+switch($operation)
+{
+	case 'details_class':
+	$sClass = utils::ReadParam('class', '', false, 'class');
+	//if we want to see class details & class is given then display it, otherwise act default (just show the class list)
+	if($sClass != '')
+	{
+		$oPage->add_ready_script(
+			<<<EOF
+$('#search-model').val('$sClass');
+$('#search-model').trigger("input");
+
+EOF
+);
+		DisplayClassDetails($oPage, $sClass, $sContext);
+		break;
+	}
+	default:
+		DisplayGranularityDisplayer($oPage);
+}
+$oPage->add("</div>");
+$oPage->add("</div>");
+//split the page in 2 panels
+$oPage->add_init_script(
+<<<EOF
+		$('#dataModelSplitPane').layout({
+		west : {size: "20%", minSize : 200,paneSize : 600}
+		});
+		// Layout
+EOF
+
+);
+
+$oPage->output();
+?>
diff --git a/portal/index.php b/portal/index.php
index 57cdd5eca..e246ab6d0 100644
--- a/portal/index.php
+++ b/portal/index.php
@@ -1,1473 +1,1473 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * iTop User Portal main page
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/nicewebpage.class.inc.php');
-require_once(APPROOT.'/application/wizardhelper.class.inc.php');
-
-
-/**
- * Helper to determine the supported types of tickets
- */
-function GetTicketClasses()
-{
-	$aClasses = array();
-	foreach (explode(',', MetaModel::GetConfig()->Get('portal_tickets')) as $sRawClass)
-	{
-		$sRawClass = trim($sRawClass);
-		if (!MetaModel::IsValidClass($sRawClass))
-		{
-			throw new Exception("Class '$sRawClass' is not a valid class, please review your configuration (portal_tickets)");
-		}
-		if (!MetaModel::IsParentClass('Ticket', $sRawClass))
-		{
-			throw new Exception("Class '$sRawClass' does not inherit from Ticket, please review your configuration (portal_tickets)");
-		}
-		$aClasses[] = $sRawClass;
-	}
-	return $aClasses;
-} 
-
-
-/**
- * Helper to protect the portal against malicious usages
- * Throws an exception if the current user is not allowed to view the object details  
- */
-function ValidateObject($oObject)
-{
-	if (IsPowerUser())
-	{
-		$sValidationDefine = 'PORTAL_'.strtoupper(get_class($oObject)).'_DISPLAY_POWERUSER_QUERY';
-	}
-	else
-	{
-		$sValidationDefine = 'PORTAL_'.strtoupper(get_class($oObject)).'_DISPLAY_QUERY';
-	}
-	if (defined($sValidationDefine))
-	{
-		$sValidationOql = constant($sValidationDefine);
-		$oSearch = DBObjectSearch::FromOQL($sValidationOql);
-		$oSearch->AddCondition('id', $oObject->GetKey());
-
-		if ($iUser = UserRights::GetContactId())
-		{
-			$oContact = MetaModel::GetObject('Contact', $iUser);
-			$aArgs = $oContact->ToArgs('contact');
-		}
-		else
-		{
-			$aArgs = array();
-		}
-	
-		$oSet = new DBObjectSet($oSearch, array(), $aArgs);
-		if ($oSet->Count() == 0)
-		{
-			throw new SecurityException('You are not allowed to access the object '.get_class($oObject).'::'.$oObject->GetKey());
-		}
-	}
-}
-
-
-/**
- * Helper to get the relevant constant 
- */
-function GetConstant($sClass, $sName)
-{
-	$sConstName = 'PORTAL_'.strtoupper($sClass).'_'.$sName;
-	if (defined($sConstName))
-	{
-		return constant($sConstName);
-	}
-	else
-	{
-		throw new Exception("Missing portal constant '$sConstName'");
-	}
-}
-
-/**
- * Helper to determine the ticket class given the service subcategory
- */
-function ComputeClass($iSubSvcId)
-{
-	$aClasses = GetTicketClasses();
-	if ((PORTAL_SET_TYPE_FROM == '') || (PORTAL_TYPE_TO_CLASS == ''))
-	{
-		// return the first enabled class
-		$sClass = reset($aClasses);
-	}
-	else
-	{
-		$oServiceSubcat = MetaModel::GetObject('ServiceSubcategory', $iSubSvcId, true, true /* allow all data*/);
-		$sTicketType = $oServiceSubcat->Get(PORTAL_SET_TYPE_FROM);
-		$aMapping = json_decode(PORTAL_TYPE_TO_CLASS, true);
-		if (!array_key_exists($sTicketType, $aMapping))
-		{
-			throw new Exception("Ticket type '$sTicketType' not found in the mapping (".implode(', ', array_keys($aMapping))."). Please contact your administrator.");
-		}
-		$sClass = $aMapping[$sTicketType];
-		if (!in_array($sClass, $aClasses))
-		{
-			throw new Exception("Service subcategory #$iSubSvcId has a ticket type ($sClass) that is not known by the portal, please contact your administrator.");
-		}
-	}
-	return $sClass;
-}
-
-/**
- * Helper to limit the service categories depending on the current settings
- */
-function RestrictSubcategories(&$oSearch)
-{
-	$aMapping = (PORTAL_TYPE_TO_CLASS == '') ? array() : json_decode(PORTAL_TYPE_TO_CLASS, true);
-	foreach($aMapping as $sTicketType => $sClass)
-	{
-		if (!in_array($sClass, GetTicketClasses()))
-		{
-			// Exclude this value for the result set
-			$oSearch->AddCondition(PORTAL_SET_TYPE_FROM, $sTicketType, '!=');
-		}
-	}
-}
- 
-
-/**
- * Displays the portal main menu
- * @param WebPage $oP The current web page
- * @return void
- */
-function DisplayMainMenu(WebPage $oP)
-{
-	$oP->AddMenuButton('showongoing', 'Portal:ShowOngoing', '../portal/index.php?operation=show_ongoing');
-	$oP->AddMenuButton('newrequest', 'Portal:CreateNewRequest', '../portal/index.php?operation=create_request');
-	$oP->AddMenuButton('showclosed', 'Portal:ShowClosed', '../portal/index.php?operation=show_closed');
-	if (UserRights::CanChangePassword())
-	{
-		$oP->AddMenuButton('change_pwd', 'Portal:ChangeMyPassword', '../portal/index.php?loginop=change_pwd');
-	}
-}
-
-/**
- * Displays the current tickets
- * @param WebPage $oP The current web page
- * @return void
- */
-function ShowOngoingTickets(WebPage $oP)
-{
-	$oP->add("<div id=\"open_requests\">\n");
-	$oP->add("<h1 id=\"title_open_requests\">".Dict::S('Portal:OpenRequests')."</h1>\n");
-	ListOpenRequests($oP);
-	$oP->add("</div>\n");
-
-	$oP->add("<div id=\"#div_resolved_requests\">\n");
-	$oP->add("<h1 id=\"#resolved_requests\">".Dict::S('Portal:ResolvedRequests')."</h1>\n");
-	ListResolvedRequests($oP);
-	$oP->add("</div>\n");
-}
-
-/**
- * Displays the closed tickets
- * @param WebPage $oP The current web page
- * @return void
- */
-function ShowClosedTickets(WebPage $oP)
-{
-	$oP->add("<div id=\"#closed_tickets\">\n");
-	//$oP->add("<h1 id=\"#closed_tickets\">".Dict::S('Portal:ListClosedTickets')."</h1>\n");
-	ListClosedTickets($oP);
-	$oP->add("</div>\n");
-}
-
-/**
- * Displays the form to select a Service Category Id (among the valid ones for the specified user Organization)
- * @param WebPage $oP Web page for the form output
- * @param Organization $oUserOrg The organization of the current user
- * @return void
- */
-function SelectServiceCategory($oP, $oUserOrg)
-{
-	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
-	
-	$oSearch = DBObjectSearch::FromOQL(PORTAL_SERVICECATEGORY_QUERY);
-	$oSearch->AllowAllData(); // In case the user has the rights on his org only
-	$oSet = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
-	if ($oSet->Count() == 1)
-	{
-		$oService = $oSet->Fetch();
-		$iSvcCategory = $oService->GetKey();
-		// Only one Category, skip this step in the wizard
-		SelectServiceSubCategory($oP, $oUserOrg, $iSvcCategory);
-	}
-	else
-	{
-		$oP->add("<div class=\"wizContainer\" id=\"form_select_service\">\n");
-		$oP->WizardFormStart('request_wizard', 1);
-
-		$oP->add("<h1 id=\"select_category\">".Dict::S('Portal:SelectService')."</h1>\n");
-		$oP->add("<table>\n");
-		while($oService = $oSet->Fetch())
-		{
-			$id = $oService->GetKey();
-			$sChecked = "";
-			if (isset($aParameters['service_id']) && ($id == $aParameters['service_id']))
-			{
-				$sChecked = "checked";
-			}
-			$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"service_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"service_$id\">".$oService->GetName()."</label></b></p>");
-			$oP->p("<p>".$oService->GetAsHTML('description')."</p></td></tr>");		
-		}
-		$oP->add("</table>\n");	
-	
-		$oP->DumpHiddenParams($aParameters, array('service_id'));
-		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
-		$oP->WizardFormButtons(BUTTON_NEXT | BUTTON_CANCEL); // NO back button since it's the first step of the Wizard
-		$oP->WizardFormEnd();
-		$oP->WizardCheckSelectionOnSubmit(Dict::S('Portal:PleaseSelectOneService'));
-		$oP->add("</div>\n");
-	}
-}
-
-/**
- * Displays the form to select a Service Subcategory Id (among the valid ones for the specified user Organization)
- * and based on the page's parameter 'service_id'
- * @param WebPage $oP Web page for the form output
- * @param Organization $oUserOrg The organization of the current user
- * @param $iSvcId Id of the selected service in case of pass-through (when there is only one service)
- * @return void
- */
-function SelectServiceSubCategory($oP, $oUserOrg, $iSvcId = null)
-{
-	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
-	if ($iSvcId == null)
-	{
-		$iSvcId = $aParameters['service_id'];
-	}
-	else
-	{
-		$aParameters['service_id'] = $iSvcId;
-	}
-	$iDefaultSubSvcId = isset($aParameters['servicesubcategory_id']) ? $aParameters['servicesubcategory_id'] : 0;
-
-	$iDefaultWizNext = 2;
-
-	$oSearch = DBObjectSearch::FromOQL(PORTAL_SERVICE_SUBCATEGORY_QUERY);
-	RestrictSubcategories($oSearch);
-	$oSearch->AllowAllData(); // In case the user has the rights on his org only
-	$oSet = new CMDBObjectSet($oSearch, array(), array('svc_id' => $iSvcId, 'org_id' => $oUserOrg->GetKey()));
-	if ($oSet->Count() == 1)
-	{
-		// Only one sub service, skip this step of the wizard
-		$oSubService = $oSet->Fetch();
-		$iSubSvdId = $oSubService->GetKey();
-		SelectRequestTemplate($oP, $oUserOrg, $iSvcId, $iSubSvdId);
-	}
-	else
-	{
-		$oServiceCategory = MetaModel::GetObject('Service', $iSvcId, false, true /* allow all data*/);
-		if (is_object($oServiceCategory))
-		{
-			$oP->add("<div class=\"wizContainer\" id=\"form_select_servicesubcategory\">\n");
-			$oP->add("<h1 id=\"select_subcategory\">".Dict::Format('Portal:SelectSubcategoryFrom_Service', $oServiceCategory->GetName())."</h1>\n");
-			$oP->WizardFormStart('request_wizard', $iDefaultWizNext);
-			$oP->add("<table>\n");
-			while($oSubService = $oSet->Fetch())
-			{
-				$id = $oSubService->GetKey();
-				$sChecked = "";
-				if ($id == $iDefaultSubSvcId)
-				{
-					$sChecked = "checked";
-				}
-	
-				$oP->add("<tr>");
-	
-				$oP->add("<td style=\"vertical-align:top\">");
-				$oP->add("<p><input name=\"attr_servicesubcategory_id\" $sChecked type=\"radio\" id=\"servicesubcategory_$id\" value=\"$id\"></p>");
-				$oP->add("</td>");
-	
-				$oP->add("<td style=\"vertical-align:top\">");
-				$oP->add("<p><b><label for=\"servicesubcategory_$id\">".$oSubService->GetName()."</label></b></p>");
-				$oP->add("<p>".$oSubService->GetAsHTML('description')."</p>");
-				$oP->add("</td>");
-				$oP->add("</tr>");
-			}
-			$oP->add("</table>\n");	
-			$oP->DumpHiddenParams($aParameters, array('servicesubcategory_id'));
-			$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
-			$oP->WizardFormButtons(BUTTON_BACK | BUTTON_NEXT | BUTTON_CANCEL); //Back button automatically discarded if on the first page
-			$oP->WizardFormEnd();
-			$oP->WizardCheckSelectionOnSubmit(Dict::S('Portal:PleaseSelectAServiceSubCategory'));
-			$oP->add("</div>\n");
-		}
-		else
-		{
-			$oP->p("Error: Invalid Service: id = $iSvcId");
-		}
-	}
-}
-
-/**
- * Displays the form to select a Template
- * @param WebPage $oP Web page for the form output
- * @param Organization $oUserOrg The organization of the current user
- * @param $iSvcId Id of the selected service in case of pass-through (when there is only one service)
- * @param integer $iSubSvcId The identifier of the sub-service (fall through when there is only one sub-service)
- * @return void
- */
-function SelectRequestTemplate($oP, $oUserOrg, $iSvcId = null, $iSubSvcId = null)
-{
-	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
-
-	if (!is_null($iSvcId))
-	{
-		$aParameters['service_id'] = $iSvcId;
-	}
-	if (!is_null($iSubSvcId))
-	{
-		$aParameters['servicesubcategory_id'] = $iSubSvcId;
-	}
-
-	$iDefaultTemplate = isset($aParameters['template_id']) ? $aParameters['template_id'] : 0;
-	if (MetaModel::IsValidClass('Template'))
-	{
-		$sClass = ComputeClass($aParameters['servicesubcategory_id']);
-		try
-		{
-			$sOql = GetConstant($sClass, 'TEMPLATE_QUERY');
-		}
-		catch(Exception $e)
-		{
-			// Backward compatibility
-			$sOql = REQUEST_TEMPLATE_QUERY;
-		}
-		$oSearch = DBObjectSearch::FromOQL($sOql);
-		$oSearch->AllowAllData();
-		$oSet = new CMDBObjectSet($oSearch, array(), array(
-			'service_id' => $aParameters['service_id'],
-			'servicesubcategory_id' => $aParameters['servicesubcategory_id']
-		));
-		if ($oSet->Count() == 0)
-		{
-			RequestCreationForm($oP, $oUserOrg, $aParameters['service_id'], $aParameters['servicesubcategory_id'], 0);
-			return;
-		}
-		elseif ($oSet->Count() == 1)
-		{
-			$oTemplate = $oSet->Fetch();
-			$iTemplateId = $oTemplate->GetKey();
-			RequestCreationForm($oP, $oUserOrg, $aParameters['service_id'], $aParameters['servicesubcategory_id'], $iTemplateId);
-			return;
-		}
-
-		$oServiceSubCategory = MetaModel::GetObject('ServiceSubcategory', $aParameters['servicesubcategory_id'], false);
-		if (is_object($oServiceSubCategory))
-		{
-			$oP->add("<div class=\"wizContainer\" id=\"form_select_servicesubcategory\">\n");
-			$oP->add("<h1 id=\"select_template\">".Dict::Format('Portal:SelectRequestTemplate', $oServiceSubCategory->GetName())."</h1>\n");
-			$oP->WizardFormStart('request_wizard', 3);
-			$oP->add("<table>\n");
-			while($oTemplate = $oSet->Fetch())
-			{
-				$id = $oTemplate->GetKey();
-				$sChecked = "";
-				if ($id == $iDefaultTemplate)
-				{
-					$sChecked = "checked";
-				}
-				$oP->add("<tr>");
-
-				$oP->add("<td style=\"vertical-align:top\">");
-				$oP->p("<input name=\"attr_template_id\" $sChecked type=\"radio\" id=\"template_$id\" value=\"$id\">");
-				$oP->add("</td>");
-
-				$oP->add("<td style=\"vertical-align:top\">");
-				$oP->p("<b><label for=\"template_$id\">".$oTemplate->GetAsHTML('label')."</label></b>");
-				$oP->p($oTemplate->GetAsHTML('description'));
-				$oP->add("</td>");
-
-				$oP->add("</tr>");
-			}
-			$oP->add("</table>\n");	
-			$oP->DumpHiddenParams($aParameters, array('template_id'));
-			$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
-			$oP->WizardFormButtons(BUTTON_BACK | BUTTON_NEXT | BUTTON_CANCEL); //Back button automatically discarded if on the first page
-			$oP->WizardCheckSelectionOnSubmit(Dict::S('Portal:PleaseSelectATemplate'));
-			$oP->WizardFormEnd();
-			$oP->add("</div>\n");
-		}
-		else
-		{
-			$oP->p("Error: Invalid servicesubcategory_id = ".$aParameters['servicesubcategory_id']);
-		}
-	}
-	else
-	{
-		RequestCreationForm($oP, $oUserOrg, $aParameters['service_id'], $aParameters['servicesubcategory_id']);
-		return;
-	}
-}
-
-/**
- * Displays the form for the final step of the ticket creation
- * @param WebPage $oP The current web page for the form output
- * @param Organization $oUserOrg The organization of the current user
- * @param integer $iSvcId The identifier of the service (fall through when there is only one service)
- * @param integer $iSubSvcId The identifier of the sub-service (fall through when there is only one sub-service)
- * @param integer $iTemplateId The identifier of the template (fall through when there is only one template)
- * @return void
- */
-function RequestCreationForm($oP, $oUserOrg, $iSvcId = null, $iSubSvcId = null, $iTemplateId = null)
-{
-	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
-	if (!is_null($iSvcId))
-	{
-		$aParameters['service_id'] = $iSvcId;
-	}
-	if (!is_null($iSubSvcId))
-	{
-		$aParameters['servicesubcategory_id'] = $iSubSvcId;
-	}
-	if (!is_null($iTemplateId))
-	{
-		$aParameters['template_id'] = $iTemplateId;
-	}
-	
-	$sDescription = '';
-	if (isset($aParameters['template_id']) && ($aParameters['template_id'] != 0))
-	{
-		$aTemplateFields = array();
-		$oTemplate = MetaModel::GetObject('Template', $aParameters['template_id'], false);
-		if (is_object($oTemplate))
-		{
-			$oFieldSearch = DBObjectSearch::FromOQL('SELECT TemplateField WHERE template_id = :template_id');
-			$oFieldSearch->AllowAllData();
-			$oFieldSet = new DBObjectSet($oFieldSearch, array('order' => true), array('template_id' => $oTemplate->GetKey()));
-			while($oField = $oFieldSet->Fetch())
-			{
-				$sAttCode = $oField->Get('code');
-				if (isset($aParameters[$sAttCode]))
-				{
-					$oField->Set('initial_value', $aParameters[$sAttCode]);
-				}
-				$aTemplateFields[$sAttCode] = $oField;
-			}
-		}
-	}
-
-	$oServiceCategory = MetaModel::GetObject('Service', $aParameters['service_id'], false, true /* allow all data*/);
-	$oServiceSubCategory = MetaModel::GetObject('ServiceSubcategory', $aParameters['servicesubcategory_id'], false, true /* allow all data*/);
-	if (is_object($oServiceCategory) && is_object($oServiceSubCategory))
-	{
-		$sClass = ComputeClass($oServiceSubCategory->GetKey());
-		$oRequest = MetaModel::NewObject($sClass);
-		$oRequest->Set('org_id', $oUserOrg->GetKey());
-		$oRequest->Set('caller_id', UserRights::GetContactId());
-		$oRequest->Set('service_id', $aParameters['service_id']);
-		$oRequest->Set('servicesubcategory_id', $aParameters['servicesubcategory_id']);
-
-		$oAttDef = MetaModel::GetAttributeDef($sClass, 'service_id');
-		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $oServiceCategory->GetName());
-
-		$oAttDef = MetaModel::GetAttributeDef($sClass, 'servicesubcategory_id');
-		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $oServiceSubCategory->GetName());
-
-		$aList = explode(',', GetConstant($sClass, 'FORM_ATTRIBUTES'));
-
-		$iFlags = 0;
-		foreach($aList as $sAttCode)
-		{
-			$value = '';
-			if (isset($aParameters[$sAttCode]))
-			{
-				$value = $aParameters[$sAttCode];
-				$oRequest->Set($sAttCode, $value);
-			}
-		}
-		$aFieldsMap = array();
-		foreach($aList as $sAttCode)
-		{
-			$value = '';
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			$iFlags = $oRequest->GetAttributeFlags($sAttCode);
-			if (isset($aParameters[$sAttCode]))
-			{
-				$value = $aParameters[$sAttCode];
-			}
-			$aArgs = array('this' => $oRequest);
-				
-			$sInputId = 'attr_'.$sAttCode;
-			$aFieldsMap[$sAttCode] = $sInputId;
-			$sValue = "<span id=\"field_{$sInputId}\">".$oRequest->GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $value, '', 'attr_'.$sAttCode, '', $iFlags, $aArgs).'</span>';
-			$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $sValue);
-		}
-		$aHidden = array();
-		if (!empty($aTemplateFields))
-		{
-			foreach ($aTemplateFields as $sAttCode =>  $oField)
-			{
-				$sValue = $oField->GetFormElement($oP, $sClass);
-				if ($oField->Get('input_type') == 'hidden')
-				{
-					$aHidden[] = $sValue;
-				}
-				else
-				{
-					$aDetails[] = array('label' => $oField->GetAsHTML('label'), 'value' => $sValue);
-				}
-			}
-		}
-
-		$oP->add_script(
-<<<EOF
-// Create the object once at the beginning of the page...
-	var oWizardHelper = new WizardHelper('$sClass', '');
-EOF
-);
-
-		$oP->add_linked_script("../js/json.js");
-		$oP->add_linked_script("../js/forms-json-utils.js");
-		$oP->add_linked_script("../js/wizardhelper.js");
-		$oP->add_linked_script("../js/wizard.utils.js");
-		$oP->add_linked_script("../js/linkswidget.js");
-		$oP->add_linked_script("../js/extkeywidget.js");
-		$oP->add_linked_script("../js/jquery.blockUI.js");
-		$oP->add("<div class=\"wizContainer\" id=\"form_request_description\">\n");
-		$oP->add("<h1 id=\"title_request_form\">".Dict::S('Portal:DescriptionOfTheRequest')."</h1>\n");
-		$oP->WizardFormStart('request_form', 4);
-
-		$oP->details($aDetails);
-
-		// Add hidden fields for known values, enabling dependant attributes to be computed correctly
-		//
-		foreach($oRequest->ListChanges() as $sAttCode => $value)
-		{
-			if (!in_array($sAttCode, $aList))
-			{
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-				if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
-				{
-					$sValue = htmlentities($oRequest->Get($sAttCode), ENT_QUOTES, 'UTF-8');
-					$oP->add("<input type=\"hidden\" id=\"attr_$sAttCode\" name=\"attr_$sAttCode\" value=\"$sValue\">");
-					$aFieldsMap[$sAttCode] = 'attr_'.$sAttCode;
-				}
-			}
-		}
-		if (isset($aParameters['template_id']) && ($aParameters['template_id'] != 0))
-		{
-			$oP->add("<input type=\"hidden\" name=\"attr_template_id\" value=\"{$aParameters['template_id']}\">");
-		}
-		$oP->add(implode("\n", $aHidden));
-		$oAttPlugin = new AttachmentPlugIn();
-		$oAttPlugin->OnDisplayRelations($oRequest, $oP, true /* edit */);
-
-		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
-		$oP->WizardFormButtons(BUTTON_BACK | BUTTON_FINISH | BUTTON_CANCEL); //Back button automatically discarded if on the first page
-		$oP->WizardFormEnd();
-		$oP->add("</div>\n");
-		$iFieldsCount = count($aFieldsMap);
-		$sJsonFieldsMap = json_encode($aFieldsMap);
-
-		$oP->add_ready_script(
-<<<EOF
-		oWizardHelper.SetFieldsMap($sJsonFieldsMap);
-		oWizardHelper.SetFieldsCount($iFieldsCount);
-
-		// Starts the validation when the page is ready
-		CheckFields('request_form', false);
-		$('#request_form').submit( function() {
-			return OnSubmit('request_form');
-		});
-EOF
-);
-		// Enable the button to upload images (or cut and paste of images)
-		$oP->add_ready_script(InlineImage::EnableCKEditorImageUpload($oRequest, utils::GetUploadTempId($oP->GetTransactionId())));
-	}
-	else
-	{
-		// User not authorized to use this service ?
-		//ShowOngoingTickets($oP);
-	}
-}
-
-/**
- * Validate the parameters and create the ticket object (based on the page's POSTed parameters)
- * @param WebPage $oP The current web page for the  output
- * @param Organization $oUserOrg The organization of the current user
- * @return void
- */
-function DoCreateRequest($oP, $oUserOrg)
-{
-	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
-	$sTransactionId = utils::ReadPostedParam('transaction_id', '');
-	if (!utils::IsTransactionValid($sTransactionId))
-	{
-		$oP->add("<h1>".Dict::S('UI:Error:ObjectAlreadyCreated')."</h1>\n");
-		//ShowOngoingTickets($oP);
-		return;
-	}
-		
-	// Validate the parameters
-	// 1) ServiceCategory
-	$oSearch = DBObjectSearch::FromOQL(PORTAL_VALIDATE_SERVICECATEGORY_QUERY);
-	$oSearch->AllowAllData(); // In case the user has the rights on his org only
-	$oSet = new CMDBObjectSet($oSearch, array(), array('id' => $aParameters['service_id'], 'org_id' => $oUserOrg->GetKey()));
-	if ($oSet->Count() != 1)
-	{
-		// Invalid service for the current user !
-		throw new Exception("Invalid Service Category: id={$aParameters['service_id']} - count: ".$oSet->Count());
-	}
-	$oServiceCategory = $oSet->Fetch();
-	
-	// 2) Service Subcategory
-	$oSearch = DBObjectSearch::FromOQL(PORTAL_VALIDATE_SERVICESUBCATEGORY_QUERY);
-	RestrictSubcategories($oSearch);
-	$oSearch->AllowAllData(); // In case the user has the rights on his org only
-	$oSet = new CMDBObjectSet($oSearch, array(), array('service_id' => $aParameters['service_id'], 'id' =>$aParameters['servicesubcategory_id'],'org_id' => $oUserOrg->GetKey() ));
-	if ($oSet->Count() != 1)
-	{
-		// Invalid subcategory
-		throw new Exception("Invalid ServiceSubcategory: id={$aParameters['servicesubcategory_id']} for service category ".$oServiceCategory->GetName()."({$aParameters['service_id']}) - count: ".$oSet->Count());
-	}
-	$oServiceSubCategory = $oSet->Fetch();
-
-	$sClass = ComputeClass($oServiceSubCategory->GetKey());
-	$oRequest = MetaModel::NewObject($sClass);
-	$aAttList = array_merge(explode(',', GetConstant($sClass, 'FORM_ATTRIBUTES')), array('service_id', 'servicesubcategory_id'));
-	$oRequest->UpdateObjectFromPostedForm('' /* form prefix */, $aAttList);
-	$oRequest->Set('org_id', $oUserOrg->GetKey());
-	$oRequest->Set('caller_id', UserRights::GetContactId());
-
-	if (isset($aParameters['moreinfo']))
-	{
-		// There is a template, insert it into the description
-		$sLogAttCode = GetConstant($sClass, 'PUBLIC_LOG');
-		$oRequest->Set($sLogAttCode, $aParameters['moreinfo']);
-	}
-
-	$sTypeAttCode = GetConstant($sClass, 'TYPE');
-	if (($sTypeAttCode != '') && (PORTAL_SET_TYPE_FROM != ''))
-	{
-		$oRequest->Set($sTypeAttCode, $oServiceSubCategory->Get(PORTAL_SET_TYPE_FROM));
-	}
-	if (MetaModel::IsValidAttCode($sClass, 'origin'))
-	{
-		$oRequest->Set('origin', 'portal');
-	}
-
-	$oAttPlugin = new AttachmentPlugIn();
-	$oAttPlugin->OnFormSubmit($oRequest);
-
-	list($bRes, $aIssues) = $oRequest->CheckToWrite();
-	if ($bRes)
-	{
-		if (isset($aParameters['template_id']))
-		{
-			$oTemplate = MetaModel::GetObject('Template', $aParameters['template_id']);
-			$sLogAttCode = GetConstant($sClass, 'PUBLIC_LOG');
-			$oRequest->Set($sLogAttCode, $oTemplate->GetPostedValuesAsText($oRequest)."\n");
-			$oRequest->DBInsertNoReload();
-			$oTemplate->RecordExtraDataFromPostedForm($oRequest);
-		}
-		else
-		{
-			$oRequest->DBInsertNoReload();
-		}
-		$oP->add("<h1>".Dict::Format('UI:Title:Object_Of_Class_Created', $oRequest->GetName(), MetaModel::GetName($sClass))."</h1>\n");
-
-		//DisplayObject($oP, $oRequest, $oUserOrg);
-		ShowOngoingTickets($oP);
-	}
-	else
-	{
-		RequestCreationForm($oP, $oUserOrg);
-		$sIssueDesc = Dict::Format('UI:ObjectCouldNotBeWritten', implode(', ', $aIssues));
-		$oP->add_ready_script("alert('".addslashes($sIssueDesc)."');");
-	}	
-}
-
-/**
- * Prompts the user for creating a new request
- * @param WebPage $oP The current web page
- * @return void
- */
-function CreateRequest(WebPage $oP, Organization $oUserOrg)
-{
-	switch($oP->GetWizardStep())
-	{
-		case 0:
-		default:
-		SelectServiceCategory($oP, $oUserOrg);
-		break;
-		
-		case 1:
-		SelectServiceSubCategory($oP, $oUserOrg);
-		break;
-
-		case 2:
-		SelectRequestTemplate($oP, $oUserOrg);
-		break;
-		
-		case 3:
-		RequestCreationForm($oP, $oUserOrg);
-		break;
-
-		case 4:
-		DoCreateRequest($oP, $oUserOrg);
-		break;
-	}
-}
-
-/**
- * Helper to display lists (UserRequest, Incident, etc.)
- * Adjust the presentation depending on the following cases:
- * - no item at all
- * - items of one class only
- * - items of several classes    
- */ 
-function DisplayRequestLists(WebPage $oP, $aClassToSet)
-{
-	$iNotEmpty = 0; // Count of types for which there are some items to display
-	foreach ($aClassToSet as $sClass => $oSet)
-	{
-		if ($oSet->Count() > 0)
-		{
-			$iNotEmpty++;
-		}
-	}
-	if ($iNotEmpty == 0)
-	{
-		$oP->p(Dict::S('Portal:NoOpenRequest'));
-	}
-	else
-	{
-		foreach ($aClassToSet as $sClass => $oSet)
-		{
-			if ($iNotEmpty > 1)
-			{
-				// Differentiate the sublists
-				$oP->add("<h2>".MetaModel::GetName($sClass)."</h2>\n");
-			}
-			if ($oSet->Count() > 0)
-			{
-				$sZList = GetConstant($sClass, 'LIST_ZLIST');
-				$aZList =  explode(',', $sZList);
-				$oP->DisplaySet($oSet, $aZList, Dict::S('Portal:NoOpenRequest'));
-			}
-		}
-	}
-}
-
-
-/**
- * Lists all the currently opened User Requests for the current user
- * @param WebPage $oP The current web page
- * @return void
- */
-function ListOpenRequests(WebPage $oP)
-{
-	$oUserOrg = GetUserOrg();
-
-	$aClassToSet = array();
-	$iUser = UserRights::GetContactId();
-	$oContact = MetaModel::GetObject('Contact', UserRights::GetContactId());
-	foreach (GetTicketClasses() as $sClass)
-	{
-		if (IsPowerUser())
-		{
-			$sValidationDefine = 'PORTAL_'.strtoupper($sClass).'_DISPLAY_POWERUSER_QUERY';
-		}
-		else
-		{
-			$sValidationDefine = 'PORTAL_'.strtoupper($sClass).'_DISPLAY_QUERY';
-		}
-		if (defined($sValidationDefine))
-		{
-			$sOQL = constant($sValidationDefine);
-			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			$sOQLCondition = $oSearch->GetClassAlias().".status NOT IN ('closed', 'resolved')";
-			$oExpr = Expression::FromOQL($sOQLCondition);
-			$oSearch->AddConditionExpression($oExpr);
-		}
-		else
-		{
-			$sOQL = "SELECT $sClass WHERE org_id = :org_id AND status NOT IN ('closed', 'resolved')";
-			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			if ($iUser > 0 && !IsPowerUser())
-			{
-				$oSearch->AddCondition('caller_id', $iUser);
-			}
-		}
-		$aClassToSet[$sClass] = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey(), 'caller_id' => $iUser, 'contact' => $oContact));
-	}
-	DisplayRequestLists($oP, $aClassToSet);
-}
-
-/**
- * Lists all the currently resolved (not yet closed) User Requests for the current user
- * @param WebPage $oP The current web page
- * @return void
- */
-function ListResolvedRequests(WebPage $oP)
-{
-	$oUserOrg = GetUserOrg();
-
-	$aClassToSet = array();
-	foreach (GetTicketClasses() as $sClass)
-	{
-		$sOQL = "SELECT $sClass WHERE org_id = :org_id AND status = 'resolved'";
-		$oSearch = DBObjectSearch::FromOQL($sOQL);
-		$iUser = UserRights::GetContactId();
-		if ($iUser > 0 && !IsPowerUser())
-		{
-			$oSearch->AddCondition('caller_id', $iUser);
-		}
-		$aClassToSet[$sClass] = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
-	}
-	DisplayRequestLists($oP, $aClassToSet);
-}
-
-/**
- * Lists all the currently closed tickets
- * @param WebPage $oP The current web page
- * @return void
- */
-function ListClosedTickets(WebPage $oP)
-{
-	$aAttSpecs = explode(',', PORTAL_TICKETS_SEARCH_CRITERIA);
-	// Remove the caller_id form the search criteria if the user is not a Portal Power User
-	// since the user is only allowed to see her/his own tickets
-	foreach($aAttSpecs as $idx => $sAttCode)
-	{
-		if (($sAttCode == 'caller_id') && !IsPowerUser())
-		{
-			unset($aAttSpecs[$idx]);
-		}
-	}
-	$aClasses = GetTicketClasses();
-	$sMainClass = reset($aClasses);
-	$oP->DisplaySearchForm($sMainClass, $aAttSpecs, array('operation' => 'show_closed'), 'search_', false /* => not closed */);
-
-	$oUserOrg = GetUserOrg();
-
-	$oP->add("<h1>".Dict::S('Portal:ClosedRequests')."</h1>\n");
-
-	$aClassToSet = array();
-	foreach (GetTicketClasses() as $sClass)
-	{
-		$oSearch = $oP->PostedParamsToFilter($sClass, $aAttSpecs, 'search_');
-		if(is_null($oSearch))
-		{
-			$oSearch = new DBObjectSearch($sClass);
-		}
-		$oSearch->AddCondition('org_id', $oUserOrg->GetKey());
-		$oSearch->AddCondition('status', 'closed');
-		$iUser = UserRights::GetContactId();
-		if ($iUser > 0 && !IsPowerUser())
-		{
-			$oSearch->AddCondition('caller_id', $iUser);
-		}
-		$aClassToSet[$sClass] = new CMDBObjectSet($oSearch);
-	}
-	DisplayRequestLists($oP, $aClassToSet);
-}
-
-
-/**
- * Display an object - to be customized
- * @param WebPage $oP The current web page
- * @param Object $oObj Any kind of object
- * @param Object $oUserOrg The organization of the logged in user 
- * @return void
- */
-function DisplayObject($oP, $oObj, $oUserOrg)
-{
-	if (in_array(get_class($oObj), GetTicketClasses()))
-	{
-		ShowDetailsRequest($oP, $oObj);
-	}
-	else
-	{
-		throw new Exception("The class ".get_class($oObj)." is not handled through the portal");
-	}
-}
-
-/**
- * Displays the details of a request
- * @param WebPage $oP The current web page
- * @param Object $oObj The target object
- * @return void
- */
-function ShowDetailsRequest(WebPage $oP, $oObj)
-{	
-	$sClass = get_class($oObj);
-	$sLogAttCode = GetConstant($sClass, 'PUBLIC_LOG');
-	$sUserCommentAttCode = GetConstant($sClass, 'USER_COMMENT');
-
-	$bIsReopenButton = false;
-	$bIsCloseButton = false;
-	$bIsEscalateButton = false;
-	$bEditAttachments = false;
-	$aEditAtt = array(); // List of attributes editable in the main form
-	if (!MetaModel::DBIsReadOnly())
-	{
-		switch($oObj->GetState())
-		{						
-			case 'resolved':
-			$aEditAtt = array();
-			$aTransitions = $oObj->EnumTransitions();
-			$oSet = DBObjectSet::FromObject($oObj);
-			// Add the "Reopen" button if this is valid action
-			if (array_key_exists('ev_reopen', $aTransitions) && UserRights::IsStimulusAllowed($sClass, 'ev_reopen', $oSet))
-			{
-				$bIsReopenButton = true;
-				MakeStimulusForm($oP, $oObj, 'ev_reopen', array($sLogAttCode));
-			}
-			// Add the "Close" button if this is valid action
-			if (array_key_exists('ev_close', $aTransitions) && UserRights::IsStimulusAllowed($sClass, 'ev_close', $oSet))
-			{
-				$bIsCloseButton = true;
-				MakeStimulusForm($oP, $oObj, 'ev_close', array('user_satisfaction', $sUserCommentAttCode));
-			}
-			break;
-	
-			case 'closed':
-			// By convention 'closed' is the final state of a ticket and nothing can be done in such a state
-			break;
-
-			default:
-			// In all other states, the only possible action is to update the ticket (both the case log and the attachments)
-			// This update is possible only if the case log field is not read-only or hidden in the current state
-			$iFlags = $oObj->GetAttributeFlags($sLogAttCode);
-			$bReadOnly = (($iFlags & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) != 0);
-			if ($bReadOnly)
-			{
-				$aEditAtt = array();
-				$bEditAttachments = false;				
-			}
-			else
-			{
-				$aEditAtt = array(
-					$sLogAttCode => '????'
-				);
-				$bEditAttachments = true;
-			}
-			break;
-		}
-	}
-
-// REFACTORISER LA MISE EN FORME
-	$oP->add("<h1 id=\"title_request_details\">".$oObj->GetIcon()."&nbsp;".Dict::Format('Portal:TitleRequestDetailsFor_Request', $oObj->GetName())."</h1>\n");
-
-	$aAttList = json_decode(GetConstant($sClass, 'DETAILS_ZLIST'), true);
-
-	switch($oObj->GetState())
-	{
-		case 'closed':
-		$aAttList['centered'][] = 'user_satisfaction';
-		$aAttList['centered'][] = $sUserCommentAttCode;
-	}
-
-	// Remove the edited attribute from the shown attributes
-	//
-	foreach($aEditAtt as $sAttCode => $foo)
-	{
-		foreach($aAttList as $col => $aColumn)
-		{
-			if (in_array($sAttCode, $aColumn))
-			{
-				if(($index = array_search($sAttCode, $aColumn)) !== false)
-				{
-					unset($aAttList[$col][$index]);
-				}
-			}
-		}
-	}
-
-	$oP->add("<div class=\"wizContainer\" id=\"form_commment_request\">\n");
-	$oP->WizardFormStart('request_form', null);
-
-	$oP->add('<div id="request_details">');
-	$oP->add('<table id="request_details_table">');
-
-	$oP->add('<tr>');
-	$oP->add('<td style="vertical-align:top;">');
-	$oP->DisplayObjectDetails($oObj, $aAttList['col:left']);
-	$oP->add('</td>');
-	$oP->add('<td style="vertical-align:top;">');
-	$oP->DisplayObjectDetails($oObj, $aAttList['col:right']);
-	$oP->add('</td>');
-	$oP->add('</tr>');
-	if (array_key_exists('centered', $aAttList))
-	{
-		$oP->add('<tr>');
-		$oP->add('<td style="vertical-align:top;" colspan="2">');
-		$oP->DisplayObjectDetails($oObj, $aAttList['centered']);
-		$oP->add('</td>');
-		$oP->add('</tr>');
-	}
-
-// REFACTORISER
-	$oP->add('<tr>');
-	$oP->add('<td colspan="2" style="vertical-align:top;">');
-	$oAttPlugin = new AttachmentPlugIn();
-	if ($bEditAttachments)
-	{
-		$oAttPlugin->EnableDelete(false);
-		$oAttPlugin->OnDisplayRelations($oObj, $oP, true /* edit */);
-	}
-	else
-	{
-		$oAttPlugin->OnDisplayRelations($oObj, $oP, false /* read */);
-	}
-	$oP->add('</td>');
-	$oP->add('</tr>');
-
-	$oP->add('<tr>');
-	$oP->add('<td colspan="2" style="vertical-align:top;">');
-
-	//$oP->add("<form action=\"../portal/index.php\" id=\"request_form\" method=\"post\">\n");
-	//$oP->add('<table id=""><tr><td style="vertical-align:top;">');
-	//$oP->add("<h1 id=\"title_request_details\">".Dict::Format('Portal:CommentsFor_Request', $oObj->GetName())."</h1>\n");
-	$oP->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">");
-	$oP->add("<input type=\"hidden\" name=\"id\" value=\"".$oObj->GetKey()."\">");
-	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"update_request\">");
-	$oP->add("<input type=\"hidden\" id=\"stimulus_to_apply\" name=\"apply_stimulus\" value=\"\">\n");
-	$oP->add_script(
-<<<EOF
-	function SetStimulusToApply(sStimulusCode)
-	{
-		$('#stimulus_to_apply').val(sStimulusCode);
-	}
-EOF
-);
-	$aEditFields = array(); // Intermediate array to avoid code duplication while splitting btw ticket_log and the rest
-	foreach($aEditAtt as $sAttCode => $foo)
-	{
-		$sValue = $oObj->Get($sAttCode);
-		$sDisplayValue = $oObj->GetEditValue($sAttCode);
-		$aArgs = array('this' => $oObj, 'formPrefix' => '');
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		$sInputId = 'input_'.$sAttCode;
-		$sHTMLValue = "<span id=\"field_{$sInputId}\">".cmdbAbstractObject::GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', 0 /*$iFlags*/, $aArgs).'</span>';
-
-		$aEditFields[$sAttCode] = array(
-			'label' => MetaModel::GetLabel($sClass, $sAttCode),
-			'value' => $sHTMLValue
-		);
-	}
-	foreach($aEditFields as $sAttCode => $aFieldSpec)
-	{
-		if ($sAttCode == $sLogAttCode)
-		{
-			// Skip, the public log will be displayed below the buttons
-			continue;
-		}
-		$oP->add("<div class=\"edit_item\">");
-		$oP->add('<h1>'.$aFieldSpec['label'].'</h1>');
-		$oP->add($aFieldSpec['value']);
-		$oP->add('</div>');
-	}
-	if($bIsReopenButton)
-	{
-		$sStimulusCode = 'ev_reopen';
-		$sTitle = addslashes(Dict::S('Portal:Button:ReopenTicket'));
-		$sOk = addslashes(Dict::S('UI:Button:Ok'));
-		$oP->p('<input type="button" onClick="RunStimulusDialog(\''.$sStimulusCode.'\', \''.$sTitle.'\', \''.$sOk.'\');" value="'.$sTitle.'...">');
-	}
-	if($bIsCloseButton)
-	{
-		$sStimulusCode = 'ev_close';
-		$sTitle = addslashes(Dict::S('Portal:Button:CloseTicket'));
-		$sOk = addslashes(Dict::S('UI:Button:Ok'));
-		$oP->p('<input type="button" onClick="RunStimulusDialog(\''.$sStimulusCode.'\', \''.$sTitle.'\', \''.$sOk.'\');" value="'.$sTitle.'...">');
-	}
-	elseif (count($aEditAtt) > 0)
-	{
-		$oP->p('<input type="submit" value="'.Dict::S('Portal:Button:UpdateRequest').'">');
-	}
-	
-	if ($bIsEscalateButton)
-	{
-		$sStimulusCode = 'ev_timeout';
-		$oP->p('<input type="submit" onClick="SetStimulusToApply(\''.$sStimulusCode.'\');" value="'.Dict::S('Portal:ButtonEscalate').'">');
-	}
-
-	$oP->add('</td>');
-	$oP->add('</tr>');
-
-	$oP->add('<tr>');
-	$oP->add('<td colspan="2" style="vertical-align:top;">');
-	if (isset($aEditFields[$sLogAttCode]))
-	{
-		$oP->add("<div class=\"edit_item\">");
-		$oP->add('<h1>'.$aEditFields[$sLogAttCode]['label'].'</h1>');
-		$oP->add($aEditFields[$sLogAttCode]['value']);
-		$oP->add('</div>');
-		// Replace the text area with CKEditor
-		// 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()
-		$aConfig = array();
-		$sLanguage = strtolower(trim(UserRights::GetUserLanguage()));
-		$aConfig['language'] = $sLanguage;
-		$aConfig['contentsLanguage'] = $sLanguage;
-		$aConfig['extraPlugins'] = 'disabler';
-		$aConfig['placeholder'] = Dict::S('UI:CaseLogTypeYourTextHere');
-		$sConfigJS = json_encode($aConfig);
-		
-		$oP->add_ready_script("$('#input_$sLogAttCode').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit
-	}
-	else
-	{
-		$oP->add('<h1>'.MetaModel::GetLabel($sClass, $sLogAttCode).'</h1>');
-		$oP->add($oObj->GetAsHTML($sLogAttCode));
-	}
-	$oP->add('</td>');
-	$oP->add('</tr>');
-
-	$oP->add('</table>');
-	$oP->add('</div>');
-
-	// Enable the button to upload images (or cut and paste of images)
-	$oP->add_ready_script(InlineImage::EnableCKEditorImageUpload($oObj, utils::GetUploadTempId($oP->GetTransactionId())));
-	$oP->WizardFormEnd();
-	$oP->add('</div>');
-}
-
-/**
- * Create form to apply a stimulus
- * @param WebPage $oP The current web page
- * @param Object $oObj The target object
- * @param String $sStimulusCode Stimulus that will be applied
- * @param Array $aEditAtt List of attributes to edit
- * @return void
- */
-function MakeStimulusForm(WebPage $oP, $oObj, $sStimulusCode, $aEditAtt)
-{
-	static $bHasStimulusForm = false;
-
-	$sDialogId = $sStimulusCode."_dialog";
-	$sFormId = $sStimulusCode."_form";
-	$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-
-	$oP->add('<div id="'.$sDialogId.'" style="display: none;">');
-	$sClass = get_class($oObj);
-
-	$oP->add('<form id="'.$sFormId.'" method="post">');
-	$sTransactionId = utils::GetNewTransactionId();
-	$oP->add("<input type=\"hidden\" id=\"transaction_id\" name=\"transaction_id\" value=\"$sTransactionId\">\n");
-	$oP->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">");
-	$oP->add("<input type=\"hidden\" name=\"id\" value=\"".$oObj->GetKey()."\">");
-	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"update_request\">");
-	$oP->add("<input type=\"hidden\" id=\"stimulus_to_apply\" name=\"apply_stimulus\" value=\"$sStimulusCode\">\n");
-
-	$aTransitions = $oObj->EnumTransitions();
-	$aStimuli = MetaModel::EnumStimuli($sClass);
-	if (!isset($aTransitions[$sStimulusCode]))
-	{
-		// Invalid stimulus
-		throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulusCode, $oObj->GetName(), $oObj->GetStateLabel()));
-	}
-
-	// Compute the attribute flags in the target state
-	$aTransition = $aTransitions[$sStimulusCode];
-	$sTargetState = $aTransition['target_state'];
-	$aTargetStates = MetaModel::EnumStates($sClass);
-	$aTargetState = $aTargetStates[$sTargetState];
-	$aExpectedAttributes = $aTargetState['attribute_list'];
-
-	foreach($aEditAtt as $sAttCode)
-	{
-		$sValue = $oObj->Get($sAttCode);
-		$sDisplayValue = $oObj->GetEditValue($sAttCode);
-		$aArgs = array('this' => $oObj, 'formPrefix' => '');
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-		$sInputId = 'input_'.$sAttCode;
-		$iFlags = array_key_exists($sAttCode, $aExpectedAttributes) ? $aExpectedAttributes[$sAttCode] : 0;
-		$sHTMLValue = "<span id=\"field_{$sStimulusCode}_{$sInputId}\">".cmdbAbstractObject::GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'</span>';
-
-		$oP->add('<h1>'.MetaModel::GetLabel($sClass, $sAttCode).'</h1>');
-		$oP->add($sHTMLValue);
-	}
-	$oP->add('</form>');
-	$oP->add('</div>');
-
-	if (!$bHasStimulusForm)
-	{
-		$bHasStimulusForm = true;
-		$oP->add_script(
-<<<EOF
-
-function RunStimulusDialog(sStimulusCode, sTitle, sOkButtonLabel)
-{
-	var sWidth = 'auto';
-	if (sStimulusCode == 'ev_reopen')
-	{
-		// Avoid having a dialog spanning the complete width of the window
-		// just because it contains a CaseLog entry
-		sWidth = '80%';
-	}
-				
-	$('#'+sStimulusCode+'_dialog').dialog({
-		height: 'auto',
-		width: sWidth,
-		modal: true,
-		title: sTitle,
-		buttons: [
-		{ text: sOkButtonLabel, click: function() {
-			$(this).find('#'+sStimulusCode+'_form').submit();
-		} },
-		{ text: "$sCancelButtonLabel", click: function() {
-			$(this).dialog( "close" );
-		} }
-		]
-	});
-	// Start the validation
-	CheckFields(sStimulusCode+'_form', false);
-	$('#'+sStimulusCode+'_form').submit( function() {
-		return OnSubmit(sStimulusCode+'_form');
-	});
-}
-EOF
-		);
-	}
-}
-
-/**
- * Get The organization of the current user (i.e. the organization of its contact)
- * @param WebPage $oP The current page, for errors output
- * @return Organization The user's org or null in case of problem...
- */
-function GetUserOrg()
-{
-	$oOrg = null;
-	$iContactId = UserRights::GetContactId();
-	$oContact = MetaModel::GetObject('Contact', $iContactId, false); // false => Can fail
-	if (is_object($oContact))
-	{
-		$oOrg = MetaModel::GetObject('Organization', $oContact->Get('org_id'), false); // false => can fail
-	}
-	else
-	{
-		throw new Exception(Dict::S('Portal:ErrorNoContactForThisUser'));
-	}
-	return $oOrg;
-}
-
-/**
- * Determine if the current user can be considered as being a portal power user
- */ 
-function IsPowerUSer()
-{
-	$iUserID = UserRights::GetUserId();
-	$sOQLprofile = "SELECT URP_Profiles AS p JOIN URP_UserProfile AS up ON up.profileid=p.id WHERE up.userid = :user AND p.name = :profile";
-	$oProfileSet = new DBObjectSet(
-		DBObjectSearch::FromOQL($sOQLprofile),
-		array(),
-		array(
-			'user' => $iUserID,
-			'profile' => PORTAL_POWER_USER_PROFILE,
-		)
-	);	
-	$bRes = ($oProfileSet->count() > 0);
-	return $bRes;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// Main program
-//
-///////////////////////////////////////////////////////////////////////////////
-
-try
-{
-	require_once(APPROOT.'/application/startup.inc.php');
-	require_once(APPROOT.'/application/portalwebpage.class.inc.php');
-	$oAppContext = new ApplicationContext();
-	$sOperation = utils::ReadParam('operation', '');
-
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-	LoginWebPage::DoLogin(false /* bMustBeAdmin */, true /* IsAllowedToPortalUsers */); // Check user rights and prompt if needed
-
-	ApplicationContext::SetUrlMakerClass('MyPortalURLMaker');
-
-	utils::InitArchiveMode();
-
-	$aClasses = explode(',', MetaModel::GetConfig()->Get('portal_tickets'));
-	$sMainClass = trim(reset($aClasses));
-	if (!class_exists($sMainClass))
-	{
-		$oP = new WebPage(Dict::S('Portal:Title'));
-		$oP->p(dict::Format('Portal:NoRequestMgmt', UserRights::GetUserFriendlyName()));
-	}
-	else
-	{
-		$oUserOrg = GetUserOrg();
-	
-		$sCode = $oUserOrg->Get('code');
-		$sAlternateStylesheet = '';
-		if (@file_exists("./$sCode/portal.css"))
-		{
-			$sAlternateStylesheet = "$sCode";
-		}
-	
-		$oP = new PortalWebPage(Dict::S('Portal:Title'), $sAlternateStylesheet);
-	
-	   $oP->EnableDisconnectButton(utils::CanLogOff());
-	   $oP->SetWelcomeMessage(Dict::Format('Portal:WelcomeUserOrg', UserRights::GetUserFriendlyName(), $oUserOrg->GetName()));
-	
-		if (is_object($oUserOrg))
-		{
-			switch($sOperation)
-			{
-				case 'show_closed':
-				$oP->set_title(Dict::S('Portal:ShowClosed'));
-				DisplayMainMenu($oP);
-				ShowClosedTickets($oP);
-				break;
-						
-				case 'create_request':
-				$oP->set_title(Dict::S('Portal:CreateNewRequest'));
-				DisplayMainMenu($oP);
-				if (!MetaModel::DBIsReadOnly())
-				{
-					CreateRequest($oP, $oUserOrg);
-				}
-				break;
-						
-				case 'details':
-				$oP->set_title(Dict::S('Portal:TitleDetailsFor_Request'));
-				DisplayMainMenu($oP);
-				$oObj = $oP->FindObjectFromArgs(GetTicketClasses());
-				ValidateObject($oObj);
-				DisplayObject($oP, $oObj, $oUserOrg);
-				break;
-				
-				case 'update_request':
-				$oP->set_title(Dict::S('Portal:TitleDetailsFor_Request'));
-				DisplayMainMenu($oP);
-				if (!MetaModel::DBIsReadOnly())
-				{
-					$oObj = $oP->FindObjectFromArgs(GetTicketClasses());
-					ValidateObject($oObj);
-					$aAttList = array(
-						GetConstant(get_class($oObj), 'PUBLIC_LOG'),
-						'user_satisfaction',
-						GetConstant(get_class($oObj), 'USER_COMMENT')
-					);
-					try
-					{
-						$oP->DoUpdateObjectFromPostedForm($oObj, $aAttList);
-						$oObj->Reload(); // Make sure the object is in good shape to be displayed
-					}
-					catch(TransactionException $e)
-					{
-						$oP->add("<h1>".Dict::S('UI:Error:ObjectAlreadyUpdated')."</h1>\n");
-					}
-					DisplayObject($oP, $oObj, $oUserOrg);
-				}
-				break;
-	
-				case 'show_ongoing':
-				default:
-				$oP->set_title(Dict::S('Portal:ShowOngoing'));
-				DisplayMainMenu($oP);
-				ShowOngoingTickets($oP);
-			} 
-		}
-	}
-	$oP->output();
-}
-catch(CoreException $e)
-{
-	require_once(APPROOT.'/setup/setuppage.class.inc.php');
-	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
-	$oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc()));	
-	//$oP->p($e->getTraceAsString());	
-	$oP->output();
-
-	if (MetaModel::IsLogEnabledIssue())
-	{
-		if (MetaModel::IsValidClass('EventIssue'))
-		{
-			try
-			{
-				$oLog = new EventIssue();
-	
-				$oLog->Set('message', $e->getMessage());
-				$oLog->Set('userinfo', '');
-				$oLog->Set('issue', $e->GetIssue());
-				$oLog->Set('impact', 'Page could not be displayed');
-				$oLog->Set('callstack', $e->getTrace());
-				$oLog->Set('data', $e->getContextData());
-				$oLog->DBInsertNoReload();
-			}
-			catch(Exception $e)
-			{
-				IssueLog::Error("Failed to log issue into the DB");
-			}
-		}
-
-		IssueLog::Error($e->getMessage());
-	}
-
-	// For debugging only
-	//throw $e;
-}
-catch(Exception $e)
-{
-	require_once(APPROOT.'/setup/setuppage.class.inc.php');
-	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
-	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
-	$oP->error(Dict::Format('UI:Error_Details', $e->getMessage()));	
-	//$oP->p($e->getTraceAsString());	
-	$oP->output();
-
-	if (MetaModel::IsLogEnabledIssue())
-	{
-		if (MetaModel::IsValidClass('EventIssue'))
-		{
-			try
-			{
-				$oLog = new EventIssue();
-	
-				$oLog->Set('message', $e->getMessage());
-				$oLog->Set('userinfo', '');
-				$oLog->Set('issue', 'PHP Exception');
-				$oLog->Set('impact', 'Page could not be displayed');
-				$oLog->Set('callstack', $e->getTrace());
-				$oLog->Set('data', array());
-				$oLog->DBInsertNoReload();
-			}
-			catch(Exception $e)
-			{
-				IssueLog::Error("Failed to log issue into the DB");
-			}
-		}
-
-		IssueLog::Error($e->getMessage());
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * iTop User Portal main page
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/nicewebpage.class.inc.php');
+require_once(APPROOT.'/application/wizardhelper.class.inc.php');
+
+
+/**
+ * Helper to determine the supported types of tickets
+ */
+function GetTicketClasses()
+{
+	$aClasses = array();
+	foreach (explode(',', MetaModel::GetConfig()->Get('portal_tickets')) as $sRawClass)
+	{
+		$sRawClass = trim($sRawClass);
+		if (!MetaModel::IsValidClass($sRawClass))
+		{
+			throw new Exception("Class '$sRawClass' is not a valid class, please review your configuration (portal_tickets)");
+		}
+		if (!MetaModel::IsParentClass('Ticket', $sRawClass))
+		{
+			throw new Exception("Class '$sRawClass' does not inherit from Ticket, please review your configuration (portal_tickets)");
+		}
+		$aClasses[] = $sRawClass;
+	}
+	return $aClasses;
+} 
+
+
+/**
+ * Helper to protect the portal against malicious usages
+ * Throws an exception if the current user is not allowed to view the object details  
+ */
+function ValidateObject($oObject)
+{
+	if (IsPowerUser())
+	{
+		$sValidationDefine = 'PORTAL_'.strtoupper(get_class($oObject)).'_DISPLAY_POWERUSER_QUERY';
+	}
+	else
+	{
+		$sValidationDefine = 'PORTAL_'.strtoupper(get_class($oObject)).'_DISPLAY_QUERY';
+	}
+	if (defined($sValidationDefine))
+	{
+		$sValidationOql = constant($sValidationDefine);
+		$oSearch = DBObjectSearch::FromOQL($sValidationOql);
+		$oSearch->AddCondition('id', $oObject->GetKey());
+
+		if ($iUser = UserRights::GetContactId())
+		{
+			$oContact = MetaModel::GetObject('Contact', $iUser);
+			$aArgs = $oContact->ToArgs('contact');
+		}
+		else
+		{
+			$aArgs = array();
+		}
+	
+		$oSet = new DBObjectSet($oSearch, array(), $aArgs);
+		if ($oSet->Count() == 0)
+		{
+			throw new SecurityException('You are not allowed to access the object '.get_class($oObject).'::'.$oObject->GetKey());
+		}
+	}
+}
+
+
+/**
+ * Helper to get the relevant constant 
+ */
+function GetConstant($sClass, $sName)
+{
+	$sConstName = 'PORTAL_'.strtoupper($sClass).'_'.$sName;
+	if (defined($sConstName))
+	{
+		return constant($sConstName);
+	}
+	else
+	{
+		throw new Exception("Missing portal constant '$sConstName'");
+	}
+}
+
+/**
+ * Helper to determine the ticket class given the service subcategory
+ */
+function ComputeClass($iSubSvcId)
+{
+	$aClasses = GetTicketClasses();
+	if ((PORTAL_SET_TYPE_FROM == '') || (PORTAL_TYPE_TO_CLASS == ''))
+	{
+		// return the first enabled class
+		$sClass = reset($aClasses);
+	}
+	else
+	{
+		$oServiceSubcat = MetaModel::GetObject('ServiceSubcategory', $iSubSvcId, true, true /* allow all data*/);
+		$sTicketType = $oServiceSubcat->Get(PORTAL_SET_TYPE_FROM);
+		$aMapping = json_decode(PORTAL_TYPE_TO_CLASS, true);
+		if (!array_key_exists($sTicketType, $aMapping))
+		{
+			throw new Exception("Ticket type '$sTicketType' not found in the mapping (".implode(', ', array_keys($aMapping))."). Please contact your administrator.");
+		}
+		$sClass = $aMapping[$sTicketType];
+		if (!in_array($sClass, $aClasses))
+		{
+			throw new Exception("Service subcategory #$iSubSvcId has a ticket type ($sClass) that is not known by the portal, please contact your administrator.");
+		}
+	}
+	return $sClass;
+}
+
+/**
+ * Helper to limit the service categories depending on the current settings
+ */
+function RestrictSubcategories(&$oSearch)
+{
+	$aMapping = (PORTAL_TYPE_TO_CLASS == '') ? array() : json_decode(PORTAL_TYPE_TO_CLASS, true);
+	foreach($aMapping as $sTicketType => $sClass)
+	{
+		if (!in_array($sClass, GetTicketClasses()))
+		{
+			// Exclude this value for the result set
+			$oSearch->AddCondition(PORTAL_SET_TYPE_FROM, $sTicketType, '!=');
+		}
+	}
+}
+ 
+
+/**
+ * Displays the portal main menu
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function DisplayMainMenu(WebPage $oP)
+{
+	$oP->AddMenuButton('showongoing', 'Portal:ShowOngoing', '../portal/index.php?operation=show_ongoing');
+	$oP->AddMenuButton('newrequest', 'Portal:CreateNewRequest', '../portal/index.php?operation=create_request');
+	$oP->AddMenuButton('showclosed', 'Portal:ShowClosed', '../portal/index.php?operation=show_closed');
+	if (UserRights::CanChangePassword())
+	{
+		$oP->AddMenuButton('change_pwd', 'Portal:ChangeMyPassword', '../portal/index.php?loginop=change_pwd');
+	}
+}
+
+/**
+ * Displays the current tickets
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function ShowOngoingTickets(WebPage $oP)
+{
+	$oP->add("<div id=\"open_requests\">\n");
+	$oP->add("<h1 id=\"title_open_requests\">".Dict::S('Portal:OpenRequests')."</h1>\n");
+	ListOpenRequests($oP);
+	$oP->add("</div>\n");
+
+	$oP->add("<div id=\"#div_resolved_requests\">\n");
+	$oP->add("<h1 id=\"#resolved_requests\">".Dict::S('Portal:ResolvedRequests')."</h1>\n");
+	ListResolvedRequests($oP);
+	$oP->add("</div>\n");
+}
+
+/**
+ * Displays the closed tickets
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function ShowClosedTickets(WebPage $oP)
+{
+	$oP->add("<div id=\"#closed_tickets\">\n");
+	//$oP->add("<h1 id=\"#closed_tickets\">".Dict::S('Portal:ListClosedTickets')."</h1>\n");
+	ListClosedTickets($oP);
+	$oP->add("</div>\n");
+}
+
+/**
+ * Displays the form to select a Service Category Id (among the valid ones for the specified user Organization)
+ * @param WebPage $oP Web page for the form output
+ * @param Organization $oUserOrg The organization of the current user
+ * @return void
+ */
+function SelectServiceCategory($oP, $oUserOrg)
+{
+	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+	
+	$oSearch = DBObjectSearch::FromOQL(PORTAL_SERVICECATEGORY_QUERY);
+	$oSearch->AllowAllData(); // In case the user has the rights on his org only
+	$oSet = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
+	if ($oSet->Count() == 1)
+	{
+		$oService = $oSet->Fetch();
+		$iSvcCategory = $oService->GetKey();
+		// Only one Category, skip this step in the wizard
+		SelectServiceSubCategory($oP, $oUserOrg, $iSvcCategory);
+	}
+	else
+	{
+		$oP->add("<div class=\"wizContainer\" id=\"form_select_service\">\n");
+		$oP->WizardFormStart('request_wizard', 1);
+
+		$oP->add("<h1 id=\"select_category\">".Dict::S('Portal:SelectService')."</h1>\n");
+		$oP->add("<table>\n");
+		while($oService = $oSet->Fetch())
+		{
+			$id = $oService->GetKey();
+			$sChecked = "";
+			if (isset($aParameters['service_id']) && ($id == $aParameters['service_id']))
+			{
+				$sChecked = "checked";
+			}
+			$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"service_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"service_$id\">".$oService->GetName()."</label></b></p>");
+			$oP->p("<p>".$oService->GetAsHTML('description')."</p></td></tr>");		
+		}
+		$oP->add("</table>\n");	
+	
+		$oP->DumpHiddenParams($aParameters, array('service_id'));
+		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
+		$oP->WizardFormButtons(BUTTON_NEXT | BUTTON_CANCEL); // NO back button since it's the first step of the Wizard
+		$oP->WizardFormEnd();
+		$oP->WizardCheckSelectionOnSubmit(Dict::S('Portal:PleaseSelectOneService'));
+		$oP->add("</div>\n");
+	}
+}
+
+/**
+ * Displays the form to select a Service Subcategory Id (among the valid ones for the specified user Organization)
+ * and based on the page's parameter 'service_id'
+ * @param WebPage $oP Web page for the form output
+ * @param Organization $oUserOrg The organization of the current user
+ * @param $iSvcId Id of the selected service in case of pass-through (when there is only one service)
+ * @return void
+ */
+function SelectServiceSubCategory($oP, $oUserOrg, $iSvcId = null)
+{
+	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+	if ($iSvcId == null)
+	{
+		$iSvcId = $aParameters['service_id'];
+	}
+	else
+	{
+		$aParameters['service_id'] = $iSvcId;
+	}
+	$iDefaultSubSvcId = isset($aParameters['servicesubcategory_id']) ? $aParameters['servicesubcategory_id'] : 0;
+
+	$iDefaultWizNext = 2;
+
+	$oSearch = DBObjectSearch::FromOQL(PORTAL_SERVICE_SUBCATEGORY_QUERY);
+	RestrictSubcategories($oSearch);
+	$oSearch->AllowAllData(); // In case the user has the rights on his org only
+	$oSet = new CMDBObjectSet($oSearch, array(), array('svc_id' => $iSvcId, 'org_id' => $oUserOrg->GetKey()));
+	if ($oSet->Count() == 1)
+	{
+		// Only one sub service, skip this step of the wizard
+		$oSubService = $oSet->Fetch();
+		$iSubSvdId = $oSubService->GetKey();
+		SelectRequestTemplate($oP, $oUserOrg, $iSvcId, $iSubSvdId);
+	}
+	else
+	{
+		$oServiceCategory = MetaModel::GetObject('Service', $iSvcId, false, true /* allow all data*/);
+		if (is_object($oServiceCategory))
+		{
+			$oP->add("<div class=\"wizContainer\" id=\"form_select_servicesubcategory\">\n");
+			$oP->add("<h1 id=\"select_subcategory\">".Dict::Format('Portal:SelectSubcategoryFrom_Service', $oServiceCategory->GetName())."</h1>\n");
+			$oP->WizardFormStart('request_wizard', $iDefaultWizNext);
+			$oP->add("<table>\n");
+			while($oSubService = $oSet->Fetch())
+			{
+				$id = $oSubService->GetKey();
+				$sChecked = "";
+				if ($id == $iDefaultSubSvcId)
+				{
+					$sChecked = "checked";
+				}
+	
+				$oP->add("<tr>");
+	
+				$oP->add("<td style=\"vertical-align:top\">");
+				$oP->add("<p><input name=\"attr_servicesubcategory_id\" $sChecked type=\"radio\" id=\"servicesubcategory_$id\" value=\"$id\"></p>");
+				$oP->add("</td>");
+	
+				$oP->add("<td style=\"vertical-align:top\">");
+				$oP->add("<p><b><label for=\"servicesubcategory_$id\">".$oSubService->GetName()."</label></b></p>");
+				$oP->add("<p>".$oSubService->GetAsHTML('description')."</p>");
+				$oP->add("</td>");
+				$oP->add("</tr>");
+			}
+			$oP->add("</table>\n");	
+			$oP->DumpHiddenParams($aParameters, array('servicesubcategory_id'));
+			$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
+			$oP->WizardFormButtons(BUTTON_BACK | BUTTON_NEXT | BUTTON_CANCEL); //Back button automatically discarded if on the first page
+			$oP->WizardFormEnd();
+			$oP->WizardCheckSelectionOnSubmit(Dict::S('Portal:PleaseSelectAServiceSubCategory'));
+			$oP->add("</div>\n");
+		}
+		else
+		{
+			$oP->p("Error: Invalid Service: id = $iSvcId");
+		}
+	}
+}
+
+/**
+ * Displays the form to select a Template
+ * @param WebPage $oP Web page for the form output
+ * @param Organization $oUserOrg The organization of the current user
+ * @param $iSvcId Id of the selected service in case of pass-through (when there is only one service)
+ * @param integer $iSubSvcId The identifier of the sub-service (fall through when there is only one sub-service)
+ * @return void
+ */
+function SelectRequestTemplate($oP, $oUserOrg, $iSvcId = null, $iSubSvcId = null)
+{
+	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+
+	if (!is_null($iSvcId))
+	{
+		$aParameters['service_id'] = $iSvcId;
+	}
+	if (!is_null($iSubSvcId))
+	{
+		$aParameters['servicesubcategory_id'] = $iSubSvcId;
+	}
+
+	$iDefaultTemplate = isset($aParameters['template_id']) ? $aParameters['template_id'] : 0;
+	if (MetaModel::IsValidClass('Template'))
+	{
+		$sClass = ComputeClass($aParameters['servicesubcategory_id']);
+		try
+		{
+			$sOql = GetConstant($sClass, 'TEMPLATE_QUERY');
+		}
+		catch(Exception $e)
+		{
+			// Backward compatibility
+			$sOql = REQUEST_TEMPLATE_QUERY;
+		}
+		$oSearch = DBObjectSearch::FromOQL($sOql);
+		$oSearch->AllowAllData();
+		$oSet = new CMDBObjectSet($oSearch, array(), array(
+			'service_id' => $aParameters['service_id'],
+			'servicesubcategory_id' => $aParameters['servicesubcategory_id']
+		));
+		if ($oSet->Count() == 0)
+		{
+			RequestCreationForm($oP, $oUserOrg, $aParameters['service_id'], $aParameters['servicesubcategory_id'], 0);
+			return;
+		}
+		elseif ($oSet->Count() == 1)
+		{
+			$oTemplate = $oSet->Fetch();
+			$iTemplateId = $oTemplate->GetKey();
+			RequestCreationForm($oP, $oUserOrg, $aParameters['service_id'], $aParameters['servicesubcategory_id'], $iTemplateId);
+			return;
+		}
+
+		$oServiceSubCategory = MetaModel::GetObject('ServiceSubcategory', $aParameters['servicesubcategory_id'], false);
+		if (is_object($oServiceSubCategory))
+		{
+			$oP->add("<div class=\"wizContainer\" id=\"form_select_servicesubcategory\">\n");
+			$oP->add("<h1 id=\"select_template\">".Dict::Format('Portal:SelectRequestTemplate', $oServiceSubCategory->GetName())."</h1>\n");
+			$oP->WizardFormStart('request_wizard', 3);
+			$oP->add("<table>\n");
+			while($oTemplate = $oSet->Fetch())
+			{
+				$id = $oTemplate->GetKey();
+				$sChecked = "";
+				if ($id == $iDefaultTemplate)
+				{
+					$sChecked = "checked";
+				}
+				$oP->add("<tr>");
+
+				$oP->add("<td style=\"vertical-align:top\">");
+				$oP->p("<input name=\"attr_template_id\" $sChecked type=\"radio\" id=\"template_$id\" value=\"$id\">");
+				$oP->add("</td>");
+
+				$oP->add("<td style=\"vertical-align:top\">");
+				$oP->p("<b><label for=\"template_$id\">".$oTemplate->GetAsHTML('label')."</label></b>");
+				$oP->p($oTemplate->GetAsHTML('description'));
+				$oP->add("</td>");
+
+				$oP->add("</tr>");
+			}
+			$oP->add("</table>\n");	
+			$oP->DumpHiddenParams($aParameters, array('template_id'));
+			$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
+			$oP->WizardFormButtons(BUTTON_BACK | BUTTON_NEXT | BUTTON_CANCEL); //Back button automatically discarded if on the first page
+			$oP->WizardCheckSelectionOnSubmit(Dict::S('Portal:PleaseSelectATemplate'));
+			$oP->WizardFormEnd();
+			$oP->add("</div>\n");
+		}
+		else
+		{
+			$oP->p("Error: Invalid servicesubcategory_id = ".$aParameters['servicesubcategory_id']);
+		}
+	}
+	else
+	{
+		RequestCreationForm($oP, $oUserOrg, $aParameters['service_id'], $aParameters['servicesubcategory_id']);
+		return;
+	}
+}
+
+/**
+ * Displays the form for the final step of the ticket creation
+ * @param WebPage $oP The current web page for the form output
+ * @param Organization $oUserOrg The organization of the current user
+ * @param integer $iSvcId The identifier of the service (fall through when there is only one service)
+ * @param integer $iSubSvcId The identifier of the sub-service (fall through when there is only one sub-service)
+ * @param integer $iTemplateId The identifier of the template (fall through when there is only one template)
+ * @return void
+ */
+function RequestCreationForm($oP, $oUserOrg, $iSvcId = null, $iSubSvcId = null, $iTemplateId = null)
+{
+	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+	if (!is_null($iSvcId))
+	{
+		$aParameters['service_id'] = $iSvcId;
+	}
+	if (!is_null($iSubSvcId))
+	{
+		$aParameters['servicesubcategory_id'] = $iSubSvcId;
+	}
+	if (!is_null($iTemplateId))
+	{
+		$aParameters['template_id'] = $iTemplateId;
+	}
+	
+	$sDescription = '';
+	if (isset($aParameters['template_id']) && ($aParameters['template_id'] != 0))
+	{
+		$aTemplateFields = array();
+		$oTemplate = MetaModel::GetObject('Template', $aParameters['template_id'], false);
+		if (is_object($oTemplate))
+		{
+			$oFieldSearch = DBObjectSearch::FromOQL('SELECT TemplateField WHERE template_id = :template_id');
+			$oFieldSearch->AllowAllData();
+			$oFieldSet = new DBObjectSet($oFieldSearch, array('order' => true), array('template_id' => $oTemplate->GetKey()));
+			while($oField = $oFieldSet->Fetch())
+			{
+				$sAttCode = $oField->Get('code');
+				if (isset($aParameters[$sAttCode]))
+				{
+					$oField->Set('initial_value', $aParameters[$sAttCode]);
+				}
+				$aTemplateFields[$sAttCode] = $oField;
+			}
+		}
+	}
+
+	$oServiceCategory = MetaModel::GetObject('Service', $aParameters['service_id'], false, true /* allow all data*/);
+	$oServiceSubCategory = MetaModel::GetObject('ServiceSubcategory', $aParameters['servicesubcategory_id'], false, true /* allow all data*/);
+	if (is_object($oServiceCategory) && is_object($oServiceSubCategory))
+	{
+		$sClass = ComputeClass($oServiceSubCategory->GetKey());
+		$oRequest = MetaModel::NewObject($sClass);
+		$oRequest->Set('org_id', $oUserOrg->GetKey());
+		$oRequest->Set('caller_id', UserRights::GetContactId());
+		$oRequest->Set('service_id', $aParameters['service_id']);
+		$oRequest->Set('servicesubcategory_id', $aParameters['servicesubcategory_id']);
+
+		$oAttDef = MetaModel::GetAttributeDef($sClass, 'service_id');
+		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $oServiceCategory->GetName());
+
+		$oAttDef = MetaModel::GetAttributeDef($sClass, 'servicesubcategory_id');
+		$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $oServiceSubCategory->GetName());
+
+		$aList = explode(',', GetConstant($sClass, 'FORM_ATTRIBUTES'));
+
+		$iFlags = 0;
+		foreach($aList as $sAttCode)
+		{
+			$value = '';
+			if (isset($aParameters[$sAttCode]))
+			{
+				$value = $aParameters[$sAttCode];
+				$oRequest->Set($sAttCode, $value);
+			}
+		}
+		$aFieldsMap = array();
+		foreach($aList as $sAttCode)
+		{
+			$value = '';
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			$iFlags = $oRequest->GetAttributeFlags($sAttCode);
+			if (isset($aParameters[$sAttCode]))
+			{
+				$value = $aParameters[$sAttCode];
+			}
+			$aArgs = array('this' => $oRequest);
+				
+			$sInputId = 'attr_'.$sAttCode;
+			$aFieldsMap[$sAttCode] = $sInputId;
+			$sValue = "<span id=\"field_{$sInputId}\">".$oRequest->GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $value, '', 'attr_'.$sAttCode, '', $iFlags, $aArgs).'</span>';
+			$aDetails[] = array('label' => $oAttDef->GetLabel(), 'value' => $sValue);
+		}
+		$aHidden = array();
+		if (!empty($aTemplateFields))
+		{
+			foreach ($aTemplateFields as $sAttCode =>  $oField)
+			{
+				$sValue = $oField->GetFormElement($oP, $sClass);
+				if ($oField->Get('input_type') == 'hidden')
+				{
+					$aHidden[] = $sValue;
+				}
+				else
+				{
+					$aDetails[] = array('label' => $oField->GetAsHTML('label'), 'value' => $sValue);
+				}
+			}
+		}
+
+		$oP->add_script(
+<<<EOF
+// Create the object once at the beginning of the page...
+	var oWizardHelper = new WizardHelper('$sClass', '');
+EOF
+);
+
+		$oP->add_linked_script("../js/json.js");
+		$oP->add_linked_script("../js/forms-json-utils.js");
+		$oP->add_linked_script("../js/wizardhelper.js");
+		$oP->add_linked_script("../js/wizard.utils.js");
+		$oP->add_linked_script("../js/linkswidget.js");
+		$oP->add_linked_script("../js/extkeywidget.js");
+		$oP->add_linked_script("../js/jquery.blockUI.js");
+		$oP->add("<div class=\"wizContainer\" id=\"form_request_description\">\n");
+		$oP->add("<h1 id=\"title_request_form\">".Dict::S('Portal:DescriptionOfTheRequest')."</h1>\n");
+		$oP->WizardFormStart('request_form', 4);
+
+		$oP->details($aDetails);
+
+		// Add hidden fields for known values, enabling dependant attributes to be computed correctly
+		//
+		foreach($oRequest->ListChanges() as $sAttCode => $value)
+		{
+			if (!in_array($sAttCode, $aList))
+			{
+				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+				if ($oAttDef->IsScalar() && $oAttDef->IsWritable())
+				{
+					$sValue = htmlentities($oRequest->Get($sAttCode), ENT_QUOTES, 'UTF-8');
+					$oP->add("<input type=\"hidden\" id=\"attr_$sAttCode\" name=\"attr_$sAttCode\" value=\"$sValue\">");
+					$aFieldsMap[$sAttCode] = 'attr_'.$sAttCode;
+				}
+			}
+		}
+		if (isset($aParameters['template_id']) && ($aParameters['template_id'] != 0))
+		{
+			$oP->add("<input type=\"hidden\" name=\"attr_template_id\" value=\"{$aParameters['template_id']}\">");
+		}
+		$oP->add(implode("\n", $aHidden));
+		$oAttPlugin = new AttachmentPlugIn();
+		$oAttPlugin->OnDisplayRelations($oRequest, $oP, true /* edit */);
+
+		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_request\">");
+		$oP->WizardFormButtons(BUTTON_BACK | BUTTON_FINISH | BUTTON_CANCEL); //Back button automatically discarded if on the first page
+		$oP->WizardFormEnd();
+		$oP->add("</div>\n");
+		$iFieldsCount = count($aFieldsMap);
+		$sJsonFieldsMap = json_encode($aFieldsMap);
+
+		$oP->add_ready_script(
+<<<EOF
+		oWizardHelper.SetFieldsMap($sJsonFieldsMap);
+		oWizardHelper.SetFieldsCount($iFieldsCount);
+
+		// Starts the validation when the page is ready
+		CheckFields('request_form', false);
+		$('#request_form').submit( function() {
+			return OnSubmit('request_form');
+		});
+EOF
+);
+		// Enable the button to upload images (or cut and paste of images)
+		$oP->add_ready_script(InlineImage::EnableCKEditorImageUpload($oRequest, utils::GetUploadTempId($oP->GetTransactionId())));
+	}
+	else
+	{
+		// User not authorized to use this service ?
+		//ShowOngoingTickets($oP);
+	}
+}
+
+/**
+ * Validate the parameters and create the ticket object (based on the page's POSTed parameters)
+ * @param WebPage $oP The current web page for the  output
+ * @param Organization $oUserOrg The organization of the current user
+ * @return void
+ */
+function DoCreateRequest($oP, $oUserOrg)
+{
+	$aParameters = $oP->ReadAllParams(PORTAL_ALL_PARAMS.',template_id');
+	$sTransactionId = utils::ReadPostedParam('transaction_id', '');
+	if (!utils::IsTransactionValid($sTransactionId))
+	{
+		$oP->add("<h1>".Dict::S('UI:Error:ObjectAlreadyCreated')."</h1>\n");
+		//ShowOngoingTickets($oP);
+		return;
+	}
+		
+	// Validate the parameters
+	// 1) ServiceCategory
+	$oSearch = DBObjectSearch::FromOQL(PORTAL_VALIDATE_SERVICECATEGORY_QUERY);
+	$oSearch->AllowAllData(); // In case the user has the rights on his org only
+	$oSet = new CMDBObjectSet($oSearch, array(), array('id' => $aParameters['service_id'], 'org_id' => $oUserOrg->GetKey()));
+	if ($oSet->Count() != 1)
+	{
+		// Invalid service for the current user !
+		throw new Exception("Invalid Service Category: id={$aParameters['service_id']} - count: ".$oSet->Count());
+	}
+	$oServiceCategory = $oSet->Fetch();
+	
+	// 2) Service Subcategory
+	$oSearch = DBObjectSearch::FromOQL(PORTAL_VALIDATE_SERVICESUBCATEGORY_QUERY);
+	RestrictSubcategories($oSearch);
+	$oSearch->AllowAllData(); // In case the user has the rights on his org only
+	$oSet = new CMDBObjectSet($oSearch, array(), array('service_id' => $aParameters['service_id'], 'id' =>$aParameters['servicesubcategory_id'],'org_id' => $oUserOrg->GetKey() ));
+	if ($oSet->Count() != 1)
+	{
+		// Invalid subcategory
+		throw new Exception("Invalid ServiceSubcategory: id={$aParameters['servicesubcategory_id']} for service category ".$oServiceCategory->GetName()."({$aParameters['service_id']}) - count: ".$oSet->Count());
+	}
+	$oServiceSubCategory = $oSet->Fetch();
+
+	$sClass = ComputeClass($oServiceSubCategory->GetKey());
+	$oRequest = MetaModel::NewObject($sClass);
+	$aAttList = array_merge(explode(',', GetConstant($sClass, 'FORM_ATTRIBUTES')), array('service_id', 'servicesubcategory_id'));
+	$oRequest->UpdateObjectFromPostedForm('' /* form prefix */, $aAttList);
+	$oRequest->Set('org_id', $oUserOrg->GetKey());
+	$oRequest->Set('caller_id', UserRights::GetContactId());
+
+	if (isset($aParameters['moreinfo']))
+	{
+		// There is a template, insert it into the description
+		$sLogAttCode = GetConstant($sClass, 'PUBLIC_LOG');
+		$oRequest->Set($sLogAttCode, $aParameters['moreinfo']);
+	}
+
+	$sTypeAttCode = GetConstant($sClass, 'TYPE');
+	if (($sTypeAttCode != '') && (PORTAL_SET_TYPE_FROM != ''))
+	{
+		$oRequest->Set($sTypeAttCode, $oServiceSubCategory->Get(PORTAL_SET_TYPE_FROM));
+	}
+	if (MetaModel::IsValidAttCode($sClass, 'origin'))
+	{
+		$oRequest->Set('origin', 'portal');
+	}
+
+	$oAttPlugin = new AttachmentPlugIn();
+	$oAttPlugin->OnFormSubmit($oRequest);
+
+	list($bRes, $aIssues) = $oRequest->CheckToWrite();
+	if ($bRes)
+	{
+		if (isset($aParameters['template_id']))
+		{
+			$oTemplate = MetaModel::GetObject('Template', $aParameters['template_id']);
+			$sLogAttCode = GetConstant($sClass, 'PUBLIC_LOG');
+			$oRequest->Set($sLogAttCode, $oTemplate->GetPostedValuesAsText($oRequest)."\n");
+			$oRequest->DBInsertNoReload();
+			$oTemplate->RecordExtraDataFromPostedForm($oRequest);
+		}
+		else
+		{
+			$oRequest->DBInsertNoReload();
+		}
+		$oP->add("<h1>".Dict::Format('UI:Title:Object_Of_Class_Created', $oRequest->GetName(), MetaModel::GetName($sClass))."</h1>\n");
+
+		//DisplayObject($oP, $oRequest, $oUserOrg);
+		ShowOngoingTickets($oP);
+	}
+	else
+	{
+		RequestCreationForm($oP, $oUserOrg);
+		$sIssueDesc = Dict::Format('UI:ObjectCouldNotBeWritten', implode(', ', $aIssues));
+		$oP->add_ready_script("alert('".addslashes($sIssueDesc)."');");
+	}	
+}
+
+/**
+ * Prompts the user for creating a new request
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function CreateRequest(WebPage $oP, Organization $oUserOrg)
+{
+	switch($oP->GetWizardStep())
+	{
+		case 0:
+		default:
+		SelectServiceCategory($oP, $oUserOrg);
+		break;
+		
+		case 1:
+		SelectServiceSubCategory($oP, $oUserOrg);
+		break;
+
+		case 2:
+		SelectRequestTemplate($oP, $oUserOrg);
+		break;
+		
+		case 3:
+		RequestCreationForm($oP, $oUserOrg);
+		break;
+
+		case 4:
+		DoCreateRequest($oP, $oUserOrg);
+		break;
+	}
+}
+
+/**
+ * Helper to display lists (UserRequest, Incident, etc.)
+ * Adjust the presentation depending on the following cases:
+ * - no item at all
+ * - items of one class only
+ * - items of several classes    
+ */ 
+function DisplayRequestLists(WebPage $oP, $aClassToSet)
+{
+	$iNotEmpty = 0; // Count of types for which there are some items to display
+	foreach ($aClassToSet as $sClass => $oSet)
+	{
+		if ($oSet->Count() > 0)
+		{
+			$iNotEmpty++;
+		}
+	}
+	if ($iNotEmpty == 0)
+	{
+		$oP->p(Dict::S('Portal:NoOpenRequest'));
+	}
+	else
+	{
+		foreach ($aClassToSet as $sClass => $oSet)
+		{
+			if ($iNotEmpty > 1)
+			{
+				// Differentiate the sublists
+				$oP->add("<h2>".MetaModel::GetName($sClass)."</h2>\n");
+			}
+			if ($oSet->Count() > 0)
+			{
+				$sZList = GetConstant($sClass, 'LIST_ZLIST');
+				$aZList =  explode(',', $sZList);
+				$oP->DisplaySet($oSet, $aZList, Dict::S('Portal:NoOpenRequest'));
+			}
+		}
+	}
+}
+
+
+/**
+ * Lists all the currently opened User Requests for the current user
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function ListOpenRequests(WebPage $oP)
+{
+	$oUserOrg = GetUserOrg();
+
+	$aClassToSet = array();
+	$iUser = UserRights::GetContactId();
+	$oContact = MetaModel::GetObject('Contact', UserRights::GetContactId());
+	foreach (GetTicketClasses() as $sClass)
+	{
+		if (IsPowerUser())
+		{
+			$sValidationDefine = 'PORTAL_'.strtoupper($sClass).'_DISPLAY_POWERUSER_QUERY';
+		}
+		else
+		{
+			$sValidationDefine = 'PORTAL_'.strtoupper($sClass).'_DISPLAY_QUERY';
+		}
+		if (defined($sValidationDefine))
+		{
+			$sOQL = constant($sValidationDefine);
+			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$sOQLCondition = $oSearch->GetClassAlias().".status NOT IN ('closed', 'resolved')";
+			$oExpr = Expression::FromOQL($sOQLCondition);
+			$oSearch->AddConditionExpression($oExpr);
+		}
+		else
+		{
+			$sOQL = "SELECT $sClass WHERE org_id = :org_id AND status NOT IN ('closed', 'resolved')";
+			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			if ($iUser > 0 && !IsPowerUser())
+			{
+				$oSearch->AddCondition('caller_id', $iUser);
+			}
+		}
+		$aClassToSet[$sClass] = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey(), 'caller_id' => $iUser, 'contact' => $oContact));
+	}
+	DisplayRequestLists($oP, $aClassToSet);
+}
+
+/**
+ * Lists all the currently resolved (not yet closed) User Requests for the current user
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function ListResolvedRequests(WebPage $oP)
+{
+	$oUserOrg = GetUserOrg();
+
+	$aClassToSet = array();
+	foreach (GetTicketClasses() as $sClass)
+	{
+		$sOQL = "SELECT $sClass WHERE org_id = :org_id AND status = 'resolved'";
+		$oSearch = DBObjectSearch::FromOQL($sOQL);
+		$iUser = UserRights::GetContactId();
+		if ($iUser > 0 && !IsPowerUser())
+		{
+			$oSearch->AddCondition('caller_id', $iUser);
+		}
+		$aClassToSet[$sClass] = new CMDBObjectSet($oSearch, array(), array('org_id' => $oUserOrg->GetKey()));
+	}
+	DisplayRequestLists($oP, $aClassToSet);
+}
+
+/**
+ * Lists all the currently closed tickets
+ * @param WebPage $oP The current web page
+ * @return void
+ */
+function ListClosedTickets(WebPage $oP)
+{
+	$aAttSpecs = explode(',', PORTAL_TICKETS_SEARCH_CRITERIA);
+	// Remove the caller_id form the search criteria if the user is not a Portal Power User
+	// since the user is only allowed to see her/his own tickets
+	foreach($aAttSpecs as $idx => $sAttCode)
+	{
+		if (($sAttCode == 'caller_id') && !IsPowerUser())
+		{
+			unset($aAttSpecs[$idx]);
+		}
+	}
+	$aClasses = GetTicketClasses();
+	$sMainClass = reset($aClasses);
+	$oP->DisplaySearchForm($sMainClass, $aAttSpecs, array('operation' => 'show_closed'), 'search_', false /* => not closed */);
+
+	$oUserOrg = GetUserOrg();
+
+	$oP->add("<h1>".Dict::S('Portal:ClosedRequests')."</h1>\n");
+
+	$aClassToSet = array();
+	foreach (GetTicketClasses() as $sClass)
+	{
+		$oSearch = $oP->PostedParamsToFilter($sClass, $aAttSpecs, 'search_');
+		if(is_null($oSearch))
+		{
+			$oSearch = new DBObjectSearch($sClass);
+		}
+		$oSearch->AddCondition('org_id', $oUserOrg->GetKey());
+		$oSearch->AddCondition('status', 'closed');
+		$iUser = UserRights::GetContactId();
+		if ($iUser > 0 && !IsPowerUser())
+		{
+			$oSearch->AddCondition('caller_id', $iUser);
+		}
+		$aClassToSet[$sClass] = new CMDBObjectSet($oSearch);
+	}
+	DisplayRequestLists($oP, $aClassToSet);
+}
+
+
+/**
+ * Display an object - to be customized
+ * @param WebPage $oP The current web page
+ * @param Object $oObj Any kind of object
+ * @param Object $oUserOrg The organization of the logged in user 
+ * @return void
+ */
+function DisplayObject($oP, $oObj, $oUserOrg)
+{
+	if (in_array(get_class($oObj), GetTicketClasses()))
+	{
+		ShowDetailsRequest($oP, $oObj);
+	}
+	else
+	{
+		throw new Exception("The class ".get_class($oObj)." is not handled through the portal");
+	}
+}
+
+/**
+ * Displays the details of a request
+ * @param WebPage $oP The current web page
+ * @param Object $oObj The target object
+ * @return void
+ */
+function ShowDetailsRequest(WebPage $oP, $oObj)
+{	
+	$sClass = get_class($oObj);
+	$sLogAttCode = GetConstant($sClass, 'PUBLIC_LOG');
+	$sUserCommentAttCode = GetConstant($sClass, 'USER_COMMENT');
+
+	$bIsReopenButton = false;
+	$bIsCloseButton = false;
+	$bIsEscalateButton = false;
+	$bEditAttachments = false;
+	$aEditAtt = array(); // List of attributes editable in the main form
+	if (!MetaModel::DBIsReadOnly())
+	{
+		switch($oObj->GetState())
+		{						
+			case 'resolved':
+			$aEditAtt = array();
+			$aTransitions = $oObj->EnumTransitions();
+			$oSet = DBObjectSet::FromObject($oObj);
+			// Add the "Reopen" button if this is valid action
+			if (array_key_exists('ev_reopen', $aTransitions) && UserRights::IsStimulusAllowed($sClass, 'ev_reopen', $oSet))
+			{
+				$bIsReopenButton = true;
+				MakeStimulusForm($oP, $oObj, 'ev_reopen', array($sLogAttCode));
+			}
+			// Add the "Close" button if this is valid action
+			if (array_key_exists('ev_close', $aTransitions) && UserRights::IsStimulusAllowed($sClass, 'ev_close', $oSet))
+			{
+				$bIsCloseButton = true;
+				MakeStimulusForm($oP, $oObj, 'ev_close', array('user_satisfaction', $sUserCommentAttCode));
+			}
+			break;
+	
+			case 'closed':
+			// By convention 'closed' is the final state of a ticket and nothing can be done in such a state
+			break;
+
+			default:
+			// In all other states, the only possible action is to update the ticket (both the case log and the attachments)
+			// This update is possible only if the case log field is not read-only or hidden in the current state
+			$iFlags = $oObj->GetAttributeFlags($sLogAttCode);
+			$bReadOnly = (($iFlags & (OPT_ATT_READONLY | OPT_ATT_HIDDEN)) != 0);
+			if ($bReadOnly)
+			{
+				$aEditAtt = array();
+				$bEditAttachments = false;				
+			}
+			else
+			{
+				$aEditAtt = array(
+					$sLogAttCode => '????'
+				);
+				$bEditAttachments = true;
+			}
+			break;
+		}
+	}
+
+// REFACTORISER LA MISE EN FORME
+	$oP->add("<h1 id=\"title_request_details\">".$oObj->GetIcon()."&nbsp;".Dict::Format('Portal:TitleRequestDetailsFor_Request', $oObj->GetName())."</h1>\n");
+
+	$aAttList = json_decode(GetConstant($sClass, 'DETAILS_ZLIST'), true);
+
+	switch($oObj->GetState())
+	{
+		case 'closed':
+		$aAttList['centered'][] = 'user_satisfaction';
+		$aAttList['centered'][] = $sUserCommentAttCode;
+	}
+
+	// Remove the edited attribute from the shown attributes
+	//
+	foreach($aEditAtt as $sAttCode => $foo)
+	{
+		foreach($aAttList as $col => $aColumn)
+		{
+			if (in_array($sAttCode, $aColumn))
+			{
+				if(($index = array_search($sAttCode, $aColumn)) !== false)
+				{
+					unset($aAttList[$col][$index]);
+				}
+			}
+		}
+	}
+
+	$oP->add("<div class=\"wizContainer\" id=\"form_commment_request\">\n");
+	$oP->WizardFormStart('request_form', null);
+
+	$oP->add('<div id="request_details">');
+	$oP->add('<table id="request_details_table">');
+
+	$oP->add('<tr>');
+	$oP->add('<td style="vertical-align:top;">');
+	$oP->DisplayObjectDetails($oObj, $aAttList['col:left']);
+	$oP->add('</td>');
+	$oP->add('<td style="vertical-align:top;">');
+	$oP->DisplayObjectDetails($oObj, $aAttList['col:right']);
+	$oP->add('</td>');
+	$oP->add('</tr>');
+	if (array_key_exists('centered', $aAttList))
+	{
+		$oP->add('<tr>');
+		$oP->add('<td style="vertical-align:top;" colspan="2">');
+		$oP->DisplayObjectDetails($oObj, $aAttList['centered']);
+		$oP->add('</td>');
+		$oP->add('</tr>');
+	}
+
+// REFACTORISER
+	$oP->add('<tr>');
+	$oP->add('<td colspan="2" style="vertical-align:top;">');
+	$oAttPlugin = new AttachmentPlugIn();
+	if ($bEditAttachments)
+	{
+		$oAttPlugin->EnableDelete(false);
+		$oAttPlugin->OnDisplayRelations($oObj, $oP, true /* edit */);
+	}
+	else
+	{
+		$oAttPlugin->OnDisplayRelations($oObj, $oP, false /* read */);
+	}
+	$oP->add('</td>');
+	$oP->add('</tr>');
+
+	$oP->add('<tr>');
+	$oP->add('<td colspan="2" style="vertical-align:top;">');
+
+	//$oP->add("<form action=\"../portal/index.php\" id=\"request_form\" method=\"post\">\n");
+	//$oP->add('<table id=""><tr><td style="vertical-align:top;">');
+	//$oP->add("<h1 id=\"title_request_details\">".Dict::Format('Portal:CommentsFor_Request', $oObj->GetName())."</h1>\n");
+	$oP->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">");
+	$oP->add("<input type=\"hidden\" name=\"id\" value=\"".$oObj->GetKey()."\">");
+	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"update_request\">");
+	$oP->add("<input type=\"hidden\" id=\"stimulus_to_apply\" name=\"apply_stimulus\" value=\"\">\n");
+	$oP->add_script(
+<<<EOF
+	function SetStimulusToApply(sStimulusCode)
+	{
+		$('#stimulus_to_apply').val(sStimulusCode);
+	}
+EOF
+);
+	$aEditFields = array(); // Intermediate array to avoid code duplication while splitting btw ticket_log and the rest
+	foreach($aEditAtt as $sAttCode => $foo)
+	{
+		$sValue = $oObj->Get($sAttCode);
+		$sDisplayValue = $oObj->GetEditValue($sAttCode);
+		$aArgs = array('this' => $oObj, 'formPrefix' => '');
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		$sInputId = 'input_'.$sAttCode;
+		$sHTMLValue = "<span id=\"field_{$sInputId}\">".cmdbAbstractObject::GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', 0 /*$iFlags*/, $aArgs).'</span>';
+
+		$aEditFields[$sAttCode] = array(
+			'label' => MetaModel::GetLabel($sClass, $sAttCode),
+			'value' => $sHTMLValue
+		);
+	}
+	foreach($aEditFields as $sAttCode => $aFieldSpec)
+	{
+		if ($sAttCode == $sLogAttCode)
+		{
+			// Skip, the public log will be displayed below the buttons
+			continue;
+		}
+		$oP->add("<div class=\"edit_item\">");
+		$oP->add('<h1>'.$aFieldSpec['label'].'</h1>');
+		$oP->add($aFieldSpec['value']);
+		$oP->add('</div>');
+	}
+	if($bIsReopenButton)
+	{
+		$sStimulusCode = 'ev_reopen';
+		$sTitle = addslashes(Dict::S('Portal:Button:ReopenTicket'));
+		$sOk = addslashes(Dict::S('UI:Button:Ok'));
+		$oP->p('<input type="button" onClick="RunStimulusDialog(\''.$sStimulusCode.'\', \''.$sTitle.'\', \''.$sOk.'\');" value="'.$sTitle.'...">');
+	}
+	if($bIsCloseButton)
+	{
+		$sStimulusCode = 'ev_close';
+		$sTitle = addslashes(Dict::S('Portal:Button:CloseTicket'));
+		$sOk = addslashes(Dict::S('UI:Button:Ok'));
+		$oP->p('<input type="button" onClick="RunStimulusDialog(\''.$sStimulusCode.'\', \''.$sTitle.'\', \''.$sOk.'\');" value="'.$sTitle.'...">');
+	}
+	elseif (count($aEditAtt) > 0)
+	{
+		$oP->p('<input type="submit" value="'.Dict::S('Portal:Button:UpdateRequest').'">');
+	}
+	
+	if ($bIsEscalateButton)
+	{
+		$sStimulusCode = 'ev_timeout';
+		$oP->p('<input type="submit" onClick="SetStimulusToApply(\''.$sStimulusCode.'\');" value="'.Dict::S('Portal:ButtonEscalate').'">');
+	}
+
+	$oP->add('</td>');
+	$oP->add('</tr>');
+
+	$oP->add('<tr>');
+	$oP->add('<td colspan="2" style="vertical-align:top;">');
+	if (isset($aEditFields[$sLogAttCode]))
+	{
+		$oP->add("<div class=\"edit_item\">");
+		$oP->add('<h1>'.$aEditFields[$sLogAttCode]['label'].'</h1>');
+		$oP->add($aEditFields[$sLogAttCode]['value']);
+		$oP->add('</div>');
+		// Replace the text area with CKEditor
+		// 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()
+		$aConfig = array();
+		$sLanguage = strtolower(trim(UserRights::GetUserLanguage()));
+		$aConfig['language'] = $sLanguage;
+		$aConfig['contentsLanguage'] = $sLanguage;
+		$aConfig['extraPlugins'] = 'disabler';
+		$aConfig['placeholder'] = Dict::S('UI:CaseLogTypeYourTextHere');
+		$sConfigJS = json_encode($aConfig);
+		
+		$oP->add_ready_script("$('#input_$sLogAttCode').ckeditor(function() { /* callback code */ }, $sConfigJS);"); // Transform $iId into a CKEdit
+	}
+	else
+	{
+		$oP->add('<h1>'.MetaModel::GetLabel($sClass, $sLogAttCode).'</h1>');
+		$oP->add($oObj->GetAsHTML($sLogAttCode));
+	}
+	$oP->add('</td>');
+	$oP->add('</tr>');
+
+	$oP->add('</table>');
+	$oP->add('</div>');
+
+	// Enable the button to upload images (or cut and paste of images)
+	$oP->add_ready_script(InlineImage::EnableCKEditorImageUpload($oObj, utils::GetUploadTempId($oP->GetTransactionId())));
+	$oP->WizardFormEnd();
+	$oP->add('</div>');
+}
+
+/**
+ * Create form to apply a stimulus
+ * @param WebPage $oP The current web page
+ * @param Object $oObj The target object
+ * @param String $sStimulusCode Stimulus that will be applied
+ * @param Array $aEditAtt List of attributes to edit
+ * @return void
+ */
+function MakeStimulusForm(WebPage $oP, $oObj, $sStimulusCode, $aEditAtt)
+{
+	static $bHasStimulusForm = false;
+
+	$sDialogId = $sStimulusCode."_dialog";
+	$sFormId = $sStimulusCode."_form";
+	$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
+
+	$oP->add('<div id="'.$sDialogId.'" style="display: none;">');
+	$sClass = get_class($oObj);
+
+	$oP->add('<form id="'.$sFormId.'" method="post">');
+	$sTransactionId = utils::GetNewTransactionId();
+	$oP->add("<input type=\"hidden\" id=\"transaction_id\" name=\"transaction_id\" value=\"$sTransactionId\">\n");
+	$oP->add("<input type=\"hidden\" name=\"class\" value=\"$sClass\">");
+	$oP->add("<input type=\"hidden\" name=\"id\" value=\"".$oObj->GetKey()."\">");
+	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"update_request\">");
+	$oP->add("<input type=\"hidden\" id=\"stimulus_to_apply\" name=\"apply_stimulus\" value=\"$sStimulusCode\">\n");
+
+	$aTransitions = $oObj->EnumTransitions();
+	$aStimuli = MetaModel::EnumStimuli($sClass);
+	if (!isset($aTransitions[$sStimulusCode]))
+	{
+		// Invalid stimulus
+		throw new ApplicationException(Dict::Format('UI:Error:Invalid_Stimulus_On_Object_In_State', $sStimulusCode, $oObj->GetName(), $oObj->GetStateLabel()));
+	}
+
+	// Compute the attribute flags in the target state
+	$aTransition = $aTransitions[$sStimulusCode];
+	$sTargetState = $aTransition['target_state'];
+	$aTargetStates = MetaModel::EnumStates($sClass);
+	$aTargetState = $aTargetStates[$sTargetState];
+	$aExpectedAttributes = $aTargetState['attribute_list'];
+
+	foreach($aEditAtt as $sAttCode)
+	{
+		$sValue = $oObj->Get($sAttCode);
+		$sDisplayValue = $oObj->GetEditValue($sAttCode);
+		$aArgs = array('this' => $oObj, 'formPrefix' => '');
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+		$sInputId = 'input_'.$sAttCode;
+		$iFlags = array_key_exists($sAttCode, $aExpectedAttributes) ? $aExpectedAttributes[$sAttCode] : 0;
+		$sHTMLValue = "<span id=\"field_{$sStimulusCode}_{$sInputId}\">".cmdbAbstractObject::GetFormElementForField($oP, $sClass, $sAttCode, $oAttDef, $sValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'</span>';
+
+		$oP->add('<h1>'.MetaModel::GetLabel($sClass, $sAttCode).'</h1>');
+		$oP->add($sHTMLValue);
+	}
+	$oP->add('</form>');
+	$oP->add('</div>');
+
+	if (!$bHasStimulusForm)
+	{
+		$bHasStimulusForm = true;
+		$oP->add_script(
+<<<EOF
+
+function RunStimulusDialog(sStimulusCode, sTitle, sOkButtonLabel)
+{
+	var sWidth = 'auto';
+	if (sStimulusCode == 'ev_reopen')
+	{
+		// Avoid having a dialog spanning the complete width of the window
+		// just because it contains a CaseLog entry
+		sWidth = '80%';
+	}
+				
+	$('#'+sStimulusCode+'_dialog').dialog({
+		height: 'auto',
+		width: sWidth,
+		modal: true,
+		title: sTitle,
+		buttons: [
+		{ text: sOkButtonLabel, click: function() {
+			$(this).find('#'+sStimulusCode+'_form').submit();
+		} },
+		{ text: "$sCancelButtonLabel", click: function() {
+			$(this).dialog( "close" );
+		} }
+		]
+	});
+	// Start the validation
+	CheckFields(sStimulusCode+'_form', false);
+	$('#'+sStimulusCode+'_form').submit( function() {
+		return OnSubmit(sStimulusCode+'_form');
+	});
+}
+EOF
+		);
+	}
+}
+
+/**
+ * Get The organization of the current user (i.e. the organization of its contact)
+ * @param WebPage $oP The current page, for errors output
+ * @return Organization The user's org or null in case of problem...
+ */
+function GetUserOrg()
+{
+	$oOrg = null;
+	$iContactId = UserRights::GetContactId();
+	$oContact = MetaModel::GetObject('Contact', $iContactId, false); // false => Can fail
+	if (is_object($oContact))
+	{
+		$oOrg = MetaModel::GetObject('Organization', $oContact->Get('org_id'), false); // false => can fail
+	}
+	else
+	{
+		throw new Exception(Dict::S('Portal:ErrorNoContactForThisUser'));
+	}
+	return $oOrg;
+}
+
+/**
+ * Determine if the current user can be considered as being a portal power user
+ */ 
+function IsPowerUSer()
+{
+	$iUserID = UserRights::GetUserId();
+	$sOQLprofile = "SELECT URP_Profiles AS p JOIN URP_UserProfile AS up ON up.profileid=p.id WHERE up.userid = :user AND p.name = :profile";
+	$oProfileSet = new DBObjectSet(
+		DBObjectSearch::FromOQL($sOQLprofile),
+		array(),
+		array(
+			'user' => $iUserID,
+			'profile' => PORTAL_POWER_USER_PROFILE,
+		)
+	);	
+	$bRes = ($oProfileSet->count() > 0);
+	return $bRes;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+//
+// Main program
+//
+///////////////////////////////////////////////////////////////////////////////
+
+try
+{
+	require_once(APPROOT.'/application/startup.inc.php');
+	require_once(APPROOT.'/application/portalwebpage.class.inc.php');
+	$oAppContext = new ApplicationContext();
+	$sOperation = utils::ReadParam('operation', '');
+
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLogin(false /* bMustBeAdmin */, true /* IsAllowedToPortalUsers */); // Check user rights and prompt if needed
+
+	ApplicationContext::SetUrlMakerClass('MyPortalURLMaker');
+
+	utils::InitArchiveMode();
+
+	$aClasses = explode(',', MetaModel::GetConfig()->Get('portal_tickets'));
+	$sMainClass = trim(reset($aClasses));
+	if (!class_exists($sMainClass))
+	{
+		$oP = new WebPage(Dict::S('Portal:Title'));
+		$oP->p(dict::Format('Portal:NoRequestMgmt', UserRights::GetUserFriendlyName()));
+	}
+	else
+	{
+		$oUserOrg = GetUserOrg();
+	
+		$sCode = $oUserOrg->Get('code');
+		$sAlternateStylesheet = '';
+		if (@file_exists("./$sCode/portal.css"))
+		{
+			$sAlternateStylesheet = "$sCode";
+		}
+	
+		$oP = new PortalWebPage(Dict::S('Portal:Title'), $sAlternateStylesheet);
+	
+	   $oP->EnableDisconnectButton(utils::CanLogOff());
+	   $oP->SetWelcomeMessage(Dict::Format('Portal:WelcomeUserOrg', UserRights::GetUserFriendlyName(), $oUserOrg->GetName()));
+	
+		if (is_object($oUserOrg))
+		{
+			switch($sOperation)
+			{
+				case 'show_closed':
+				$oP->set_title(Dict::S('Portal:ShowClosed'));
+				DisplayMainMenu($oP);
+				ShowClosedTickets($oP);
+				break;
+						
+				case 'create_request':
+				$oP->set_title(Dict::S('Portal:CreateNewRequest'));
+				DisplayMainMenu($oP);
+				if (!MetaModel::DBIsReadOnly())
+				{
+					CreateRequest($oP, $oUserOrg);
+				}
+				break;
+						
+				case 'details':
+				$oP->set_title(Dict::S('Portal:TitleDetailsFor_Request'));
+				DisplayMainMenu($oP);
+				$oObj = $oP->FindObjectFromArgs(GetTicketClasses());
+				ValidateObject($oObj);
+				DisplayObject($oP, $oObj, $oUserOrg);
+				break;
+				
+				case 'update_request':
+				$oP->set_title(Dict::S('Portal:TitleDetailsFor_Request'));
+				DisplayMainMenu($oP);
+				if (!MetaModel::DBIsReadOnly())
+				{
+					$oObj = $oP->FindObjectFromArgs(GetTicketClasses());
+					ValidateObject($oObj);
+					$aAttList = array(
+						GetConstant(get_class($oObj), 'PUBLIC_LOG'),
+						'user_satisfaction',
+						GetConstant(get_class($oObj), 'USER_COMMENT')
+					);
+					try
+					{
+						$oP->DoUpdateObjectFromPostedForm($oObj, $aAttList);
+						$oObj->Reload(); // Make sure the object is in good shape to be displayed
+					}
+					catch(TransactionException $e)
+					{
+						$oP->add("<h1>".Dict::S('UI:Error:ObjectAlreadyUpdated')."</h1>\n");
+					}
+					DisplayObject($oP, $oObj, $oUserOrg);
+				}
+				break;
+	
+				case 'show_ongoing':
+				default:
+				$oP->set_title(Dict::S('Portal:ShowOngoing'));
+				DisplayMainMenu($oP);
+				ShowOngoingTickets($oP);
+			} 
+		}
+	}
+	$oP->output();
+}
+catch(CoreException $e)
+{
+	require_once(APPROOT.'/setup/setuppage.class.inc.php');
+	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
+	$oP->error(Dict::Format('UI:Error_Details', $e->getHtmlDesc()));	
+	//$oP->p($e->getTraceAsString());	
+	$oP->output();
+
+	if (MetaModel::IsLogEnabledIssue())
+	{
+		if (MetaModel::IsValidClass('EventIssue'))
+		{
+			try
+			{
+				$oLog = new EventIssue();
+	
+				$oLog->Set('message', $e->getMessage());
+				$oLog->Set('userinfo', '');
+				$oLog->Set('issue', $e->GetIssue());
+				$oLog->Set('impact', 'Page could not be displayed');
+				$oLog->Set('callstack', $e->getTrace());
+				$oLog->Set('data', $e->getContextData());
+				$oLog->DBInsertNoReload();
+			}
+			catch(Exception $e)
+			{
+				IssueLog::Error("Failed to log issue into the DB");
+			}
+		}
+
+		IssueLog::Error($e->getMessage());
+	}
+
+	// For debugging only
+	//throw $e;
+}
+catch(Exception $e)
+{
+	require_once(APPROOT.'/setup/setuppage.class.inc.php');
+	$oP = new SetupPage(Dict::S('UI:PageTitle:FatalError'));
+	$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");	
+	$oP->error(Dict::Format('UI:Error_Details', $e->getMessage()));	
+	//$oP->p($e->getTraceAsString());	
+	$oP->output();
+
+	if (MetaModel::IsLogEnabledIssue())
+	{
+		if (MetaModel::IsValidClass('EventIssue'))
+		{
+			try
+			{
+				$oLog = new EventIssue();
+	
+				$oLog->Set('message', $e->getMessage());
+				$oLog->Set('userinfo', '');
+				$oLog->Set('issue', 'PHP Exception');
+				$oLog->Set('impact', 'Page could not be displayed');
+				$oLog->Set('callstack', $e->getTrace());
+				$oLog->Set('data', array());
+				$oLog->DBInsertNoReload();
+			}
+			catch(Exception $e)
+			{
+				IssueLog::Error("Failed to log issue into the DB");
+			}
+		}
+
+		IssueLog::Error($e->getMessage());
+	}
+}
+?>
diff --git a/portal/readme.txt b/portal/readme.txt
index 45972d92c..94bbf3d17 100644
--- a/portal/readme.txt
+++ b/portal/readme.txt
@@ -1,72 +1,72 @@
-
---- Customization of the portal
-
-This is the way it is working now and is highly subject to change...
-
-
-Configuration (itop-config.php)
-===============================
-portal_tickets: CSV value to specify which ticket classes are enabled (default to 'UserRequest') 
-
-
-Common constants (XML)
-======================
-PORTAL_POWER_USER_PROFILE: Name of the profile that determines who can see the ticket of her organization (not only the tickets she is caller for)
-PORTAL_SERVICECATEGORY_QUERY: OQL to list the services (parameters available: org_id)
-PORTAL_SERVICE_SUBCATEGORY_QUERY: OQL to list the service subcategories (parameters available: org_id, svc_id)
-PORTAL_VALIDATE_SERVICECATEGORY_QUERY: OQL to check the service again (security against malicious HTTP POSTs)
-PORTAL_VALIDATE_SERVICESUBCATEGORY_QUERY: OQL to check the service again (security against malicious HTTP POSTs)
-PORTAL_ALL_PARAMS: parameters that the wizard will kindly propagate through its pages (mixing should not be a problem, default value could be cleaned a little...)
-PORTAL_SET_TYPE_FROM: attribute of the class ServiceSubcategory determining the request type
-PORTAL_TYPE_TO_CLASS: optional mapping from the request types to ticket classes
-PORTAL_TICKETS_SEARCH_CRITERIA: comma separated list of search criteria (attcodes) for closed tickets
-PORTAL_TICKETS_SEARCH_FILTER_attcode: an OQL query to limit the list of values available in the search form (drop-down list). One define per entry in PORTAL_TICKETS_SEARCH_CRITERIA
-
-
-Caution: Hardcoded stuff
-========================
-Classes Service and ServiceSubcategory
-A user can update a ticket (new/assigned)
-A user can close a ticket (resolved) (user_satisfaction is hardcoded though user_comment is not)
-
-
-Constants depending on the class of ticket
-==========================================
-For each ticket class enabled, you will have to define these constants:
-
-PORTAL_<TICKET-CLASS>_PUBLIC_LOG: name of the public log attribute
-PORTAL_<TICKET-CLASS>_USER_COMMENT: name of the user comment attribute (legacy, used to be user_commmmment)
-PORTAL_<TICKET-CLASS>_FORM_ATTRIBUTES: attributes proposed to the end-user in the edition form
-PORTAL_<TICKET-CLASS>_TYPE: optional attribute to be set with the value of "request type"
-PORTAL_<TICKET-CLASS>_LIST_ZLIST: list of attribute displayed in the lists (opened and resolved)
-PORTAL_<TICKET-CLASS>_CLOSED_ZLIST: list of attribute displayed in the list of closed tickets
-PORTAL_<TICKET-CLASS>_DETAILS_ZLIST: selection and presentation of attributes in the page that shows their details
-PORTAL_<TICKET-CLASS>_DISPLAY_QUERY: selection of displayable objects (use parameters contact->attcode to check things against the user/contact)
-PORTAL_<TICKET-CLASS>_DISPLAY_POWERUSER_QUERY: selection of displayable objects for power users (use parameters contact->attcode to check things against the user/contact)
-
-
-How to add a type of ticket (example: Incident)
-===============================================
-1) Add it to the list of supported tickets classes: itop-config.php/portal_tickets
-2) Define PORTAL_SET_TYPE_FROM (if not already done) as the attribute of ServiceSubcategory, that will define the request type, depending on the user selection
-3) Map the different values of this request type (in class ServiceSubcategory) to the supported ticket classes
-YOU MUST MAKE SURE THAT ANY OF THE VALUE HAS A MAPPING SO AS TO EXCLUDE SUBCATEGORIES IF THE CORRESPONDING CLASS ARE NOT ENABLED IN THE CONFIG.
-4) Make sure that the queries PORTAL_SERVICE_SUBCATEGORY_QUERY and PORTAL_VALIDATE_SERVICESUBCATEGORY_QUERY will not exclude the expected type
-5) Define the various constants for this class (PORTAL_<MY-CLASS>_XXXX).
-6) Adjust PORTAL_TICKETS_SEARCH_CRITERIA. Those criteria are common to all types of tickets. Giving too many criteria can lead to confusion.
-7) Test, test and re-test!!!
-
-
-How to copy the request type to the ticket
-==========================================
-1) Define PORTAL_SET_TYPE_FROM (if not already done) as the attribute of ServiceSubcategory, that will define the request type, depending on the user selection
-2) Define PORTAL_<TICKET-CLASS>_TYPE as the tiket attribute code to which the request type will be copied as is. There is no mapping.
-
-
-Behavior of the lists when handling several types of tickets
-============================================================
-There are three lists: opened tickets, resolved tickets and closed tickets.
-The following explanation applies to any of those lists.
- * If no item has been found, one single message is displayed (no request of this category).
- * If a number of items of only one category have been found, the list is displayed as is.
- * Otherwise, there are several types of tickets to display. Each sub-list is preceeded by the name of the corresponding class.
+
+--- Customization of the portal
+
+This is the way it is working now and is highly subject to change...
+
+
+Configuration (itop-config.php)
+===============================
+portal_tickets: CSV value to specify which ticket classes are enabled (default to 'UserRequest') 
+
+
+Common constants (XML)
+======================
+PORTAL_POWER_USER_PROFILE: Name of the profile that determines who can see the ticket of her organization (not only the tickets she is caller for)
+PORTAL_SERVICECATEGORY_QUERY: OQL to list the services (parameters available: org_id)
+PORTAL_SERVICE_SUBCATEGORY_QUERY: OQL to list the service subcategories (parameters available: org_id, svc_id)
+PORTAL_VALIDATE_SERVICECATEGORY_QUERY: OQL to check the service again (security against malicious HTTP POSTs)
+PORTAL_VALIDATE_SERVICESUBCATEGORY_QUERY: OQL to check the service again (security against malicious HTTP POSTs)
+PORTAL_ALL_PARAMS: parameters that the wizard will kindly propagate through its pages (mixing should not be a problem, default value could be cleaned a little...)
+PORTAL_SET_TYPE_FROM: attribute of the class ServiceSubcategory determining the request type
+PORTAL_TYPE_TO_CLASS: optional mapping from the request types to ticket classes
+PORTAL_TICKETS_SEARCH_CRITERIA: comma separated list of search criteria (attcodes) for closed tickets
+PORTAL_TICKETS_SEARCH_FILTER_attcode: an OQL query to limit the list of values available in the search form (drop-down list). One define per entry in PORTAL_TICKETS_SEARCH_CRITERIA
+
+
+Caution: Hardcoded stuff
+========================
+Classes Service and ServiceSubcategory
+A user can update a ticket (new/assigned)
+A user can close a ticket (resolved) (user_satisfaction is hardcoded though user_comment is not)
+
+
+Constants depending on the class of ticket
+==========================================
+For each ticket class enabled, you will have to define these constants:
+
+PORTAL_<TICKET-CLASS>_PUBLIC_LOG: name of the public log attribute
+PORTAL_<TICKET-CLASS>_USER_COMMENT: name of the user comment attribute (legacy, used to be user_commmmment)
+PORTAL_<TICKET-CLASS>_FORM_ATTRIBUTES: attributes proposed to the end-user in the edition form
+PORTAL_<TICKET-CLASS>_TYPE: optional attribute to be set with the value of "request type"
+PORTAL_<TICKET-CLASS>_LIST_ZLIST: list of attribute displayed in the lists (opened and resolved)
+PORTAL_<TICKET-CLASS>_CLOSED_ZLIST: list of attribute displayed in the list of closed tickets
+PORTAL_<TICKET-CLASS>_DETAILS_ZLIST: selection and presentation of attributes in the page that shows their details
+PORTAL_<TICKET-CLASS>_DISPLAY_QUERY: selection of displayable objects (use parameters contact->attcode to check things against the user/contact)
+PORTAL_<TICKET-CLASS>_DISPLAY_POWERUSER_QUERY: selection of displayable objects for power users (use parameters contact->attcode to check things against the user/contact)
+
+
+How to add a type of ticket (example: Incident)
+===============================================
+1) Add it to the list of supported tickets classes: itop-config.php/portal_tickets
+2) Define PORTAL_SET_TYPE_FROM (if not already done) as the attribute of ServiceSubcategory, that will define the request type, depending on the user selection
+3) Map the different values of this request type (in class ServiceSubcategory) to the supported ticket classes
+YOU MUST MAKE SURE THAT ANY OF THE VALUE HAS A MAPPING SO AS TO EXCLUDE SUBCATEGORIES IF THE CORRESPONDING CLASS ARE NOT ENABLED IN THE CONFIG.
+4) Make sure that the queries PORTAL_SERVICE_SUBCATEGORY_QUERY and PORTAL_VALIDATE_SERVICESUBCATEGORY_QUERY will not exclude the expected type
+5) Define the various constants for this class (PORTAL_<MY-CLASS>_XXXX).
+6) Adjust PORTAL_TICKETS_SEARCH_CRITERIA. Those criteria are common to all types of tickets. Giving too many criteria can lead to confusion.
+7) Test, test and re-test!!!
+
+
+How to copy the request type to the ticket
+==========================================
+1) Define PORTAL_SET_TYPE_FROM (if not already done) as the attribute of ServiceSubcategory, that will define the request type, depending on the user selection
+2) Define PORTAL_<TICKET-CLASS>_TYPE as the tiket attribute code to which the request type will be copied as is. There is no mapping.
+
+
+Behavior of the lists when handling several types of tickets
+============================================================
+There are three lists: opened tickets, resolved tickets and closed tickets.
+The following explanation applies to any of those lists.
+ * If no item has been found, one single message is displayed (no request of this category).
+ * If a number of items of only one category have been found, the list is displayed as is.
+ * Otherwise, there are several types of tickets to display. Each sub-list is preceeded by the name of the corresponding class.
diff --git a/readme.txt b/readme.txt
index cdea4e5ce..dd559cd0a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,18 +1,18 @@
-iTop - version 2.5.1 - 10-Oct-2018
-Readme file
-
-iTop 2.5.1 is the 35th release of iTop.
-
-Changes since the previous version
--------------------------------------------------------------------
-https://wiki.openitop.org/doku.php?id=2_5_0:release:change_log
-
-
-New features
--------------------------------------------------------------------
-https://wiki.openitop.org/doku.php?id=2_5_0:release:2_5_whats_new
-
-
-Migration notes
--------------------------------------------------------------------
-https://wiki.openitop.org/doku.php?id=2_5_0:install:240_to_250_migration_notes
+iTop - version 2.5.1 - 10-Oct-2018
+Readme file
+
+iTop 2.5.1 is the 35th release of iTop.
+
+Changes since the previous version
+-------------------------------------------------------------------
+https://wiki.openitop.org/doku.php?id=2_5_0:release:change_log
+
+
+New features
+-------------------------------------------------------------------
+https://wiki.openitop.org/doku.php?id=2_5_0:release:2_5_whats_new
+
+
+Migration notes
+-------------------------------------------------------------------
+https://wiki.openitop.org/doku.php?id=2_5_0:install:240_to_250_migration_notes
diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php
index e39e6ff03..8f6786f9c 100644
--- a/setup/ajax.dataloader.php
+++ b/setup/ajax.dataloader.php
@@ -1,182 +1,182 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Does load data from XML files (currently used in the setup only)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * This page is called to perform "asynchronously" the setup actions
- * parameters
- * 'operation': one of 'compile_data_model', 'update_db_schema', 'after_db_creation', 'file'
- * 
- * if 'operation' == 'update_db_schema': 
- * 'mode': install | upgrade
- * 
- *  if 'operation' == 'after_db_creation':
- * 'mode': install | upgrade
- * 
- * if 'operation' == 'file': 
- * 'file': string Name of the file to load
- * 'session_status': string 'start', 'continue' or 'end'
- * 'percent': integer 0..100 the percentage of completion once the file has been loaded 
- */ 
-define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/setup/setuppage.class.inc.php');
-require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');
-
-ini_set('max_execution_time', max(3600, ini_get('max_execution_time'))); // Under Windows SQL/backup operations are part of the timeout and require extra time
-date_default_timezone_set('Europe/Paris'); // Just to avoid a warning if the timezone is not set in php.ini
-
-$sMemoryLimit = trim(ini_get('memory_limit'));
-if (empty($sMemoryLimit))
-{
-	// On some PHP installations, memory_limit does not exist as a PHP setting!
-	// (encountered on a 5.2.0 under Windows)
-	// In that case, ini_set will not work, let's keep track of this and proceed with the data load
-	SetupPage::log_info("No memory limit has been defined in this instance of PHP");		
-}
-else
-{
-	// Check that the limit will allow us to load the data
-	//
-	$iMemoryLimit = utils::ConvertToBytes($sMemoryLimit);
-	if ($iMemoryLimit < SAFE_MINIMUM_MEMORY)
-	{
-		if (ini_set('memory_limit', SAFE_MINIMUM_MEMORY) === FALSE)
-		{
-			SetupPage::log_error("memory_limit is too small: $iMemoryLimit and can not be increased by the script itself.");		
-		}
-		else
-		{
-			SetupPage::log_info("memory_limit increased from $iMemoryLimit to ".SAFE_MINIMUM_MEMORY.".");		
-		}
-	}
-
-}
-
-
-function FatalErrorCatcher($sOutput)
-{ 
-	if ( preg_match('|<phpfatalerror>.*</phpfatalerror>|s', $sOutput, $aMatches) )
-	{
-		header("HTTP/1.0 500 Internal server error.");
-		$errors = '';
-		foreach ($aMatches as $sMatch)
-		{
-			$errors .= strip_tags($sMatch)."\n";
-		}
-		$sOutput = "$errors\n";
-		// Logging to a file does not work if the whole memory is exhausted...		
-		//SetupPage::log_error("Fatal error - in $__FILE__ , $errors");
-	}
-	return $sOutput;
-}
-
-//Define some bogus, invalid HTML tags that no sane
-//person would ever put in an actual document and tell
-//PHP to delimit fatal error warnings with them.
-ini_set('error_prepend_string', '<phpfatalerror>');
-ini_set('error_append_string', '</phpfatalerror>');
-
-// Starts the capture of the ouput, and sets a filter to capture the fatal errors.
-ob_start('FatalErrorCatcher'); // Start capturing the output, and pass it through the fatal error catcher
-
-require_once(APPROOT.'/core/config.class.inc.php');
-require_once(APPROOT.'/core/log.class.inc.php');
-require_once(APPROOT.'/core/kpi.class.inc.php');
-require_once(APPROOT.'/core/cmdbsource.class.inc.php');
-require_once('./xmldataloader.class.inc.php');
-require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
-
-
-// Never cache this page
-header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
-header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
-
-/**
- * Main program
- */
-$sOperation = Utils::ReadParam('operation', '');
-try
-{
-	switch($sOperation)
-	{
-		case 'async_action':
-		ini_set('max_execution_time', max(240, ini_get('max_execution_time')));
-		// While running the setup it is desirable to see any error that may happen
-		ini_set('display_errors', true);
-		ini_set('display_startup_errors', true);
-		
-		require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
-		require_once(APPROOT.'/setup/wizardsteps.class.inc.php');
-		
-		$sClass = utils::ReadParam('step_class', '');
-		$sState = utils::ReadParam('step_state', '');
-		$sActionCode = utils::ReadParam('code', '');
-		$aParams = utils::ReadParam('params', array(), false, 'raw_data');
-		$oPage = new ajax_page('');
-		$oDummyController = new WizardController('');
-		if (is_subclass_of($sClass, 'WizardStep'))
-		{
-			$oStep = new $sClass($oDummyController, $sState);
-			$sConfigFile = utils::GetConfigFilePath();
-			if (file_exists($sConfigFile) && !is_writable($sConfigFile) && $oStep->RequiresWritableConfig())
-			{
-				$oPage->error("<b>Error:</b> the configuration file '".$sConfigFile."' already exists and cannot be overwritten.");
-				$oPage->p("The wizard cannot modify the configuration file for you. If you want to upgrade ".ITOP_APPLICATION.", make sure that the file '<b>".realpath($sConfigFile)."</b>' can be modified by the web server.");
-				$oPage->output();
-			}
-			else
-			{
-				$oStep->AsyncAction($oPage, $sActionCode, $aParams);
-			}
-		}
-		$oPage->output();
-		break;
-
-		default:
-		throw(new Exception("Error unsupported operation '$sOperation'"));
-	}
-}
-catch(Exception $e)
-{
-	header("HTTP/1.0 500 Internal server error.");
-	echo "<p>An error happened while processing the installation:</p>\n";
-	echo '<p>'.$e."</p>\n";
-	SetupPage::log_error("An error happened while processing the installation: ".$e);
-}
-
-if (function_exists('memory_get_peak_usage'))
-{
-	if ($sOperation == 'file')
-	{
-		SetupPage::log_info("loading file '$sFileName', peak memory usage. ".memory_get_peak_usage());
-	}
-	else
-	{
-		SetupPage::log_info("operation '$sOperation', peak memory usage. ".memory_get_peak_usage());
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Does load data from XML files (currently used in the setup only)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * This page is called to perform "asynchronously" the setup actions
+ * parameters
+ * 'operation': one of 'compile_data_model', 'update_db_schema', 'after_db_creation', 'file'
+ * 
+ * if 'operation' == 'update_db_schema': 
+ * 'mode': install | upgrade
+ * 
+ *  if 'operation' == 'after_db_creation':
+ * 'mode': install | upgrade
+ * 
+ * if 'operation' == 'file': 
+ * 'file': string Name of the file to load
+ * 'session_status': string 'start', 'continue' or 'end'
+ * 'percent': integer 0..100 the percentage of completion once the file has been loaded 
+ */ 
+define('SAFE_MINIMUM_MEMORY', 64*1024*1024);
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/setup/setuppage.class.inc.php');
+require_once(APPROOT.'/setup/moduleinstaller.class.inc.php');
+
+ini_set('max_execution_time', max(3600, ini_get('max_execution_time'))); // Under Windows SQL/backup operations are part of the timeout and require extra time
+date_default_timezone_set('Europe/Paris'); // Just to avoid a warning if the timezone is not set in php.ini
+
+$sMemoryLimit = trim(ini_get('memory_limit'));
+if (empty($sMemoryLimit))
+{
+	// On some PHP installations, memory_limit does not exist as a PHP setting!
+	// (encountered on a 5.2.0 under Windows)
+	// In that case, ini_set will not work, let's keep track of this and proceed with the data load
+	SetupPage::log_info("No memory limit has been defined in this instance of PHP");		
+}
+else
+{
+	// Check that the limit will allow us to load the data
+	//
+	$iMemoryLimit = utils::ConvertToBytes($sMemoryLimit);
+	if ($iMemoryLimit < SAFE_MINIMUM_MEMORY)
+	{
+		if (ini_set('memory_limit', SAFE_MINIMUM_MEMORY) === FALSE)
+		{
+			SetupPage::log_error("memory_limit is too small: $iMemoryLimit and can not be increased by the script itself.");		
+		}
+		else
+		{
+			SetupPage::log_info("memory_limit increased from $iMemoryLimit to ".SAFE_MINIMUM_MEMORY.".");		
+		}
+	}
+
+}
+
+
+function FatalErrorCatcher($sOutput)
+{ 
+	if ( preg_match('|<phpfatalerror>.*</phpfatalerror>|s', $sOutput, $aMatches) )
+	{
+		header("HTTP/1.0 500 Internal server error.");
+		$errors = '';
+		foreach ($aMatches as $sMatch)
+		{
+			$errors .= strip_tags($sMatch)."\n";
+		}
+		$sOutput = "$errors\n";
+		// Logging to a file does not work if the whole memory is exhausted...		
+		//SetupPage::log_error("Fatal error - in $__FILE__ , $errors");
+	}
+	return $sOutput;
+}
+
+//Define some bogus, invalid HTML tags that no sane
+//person would ever put in an actual document and tell
+//PHP to delimit fatal error warnings with them.
+ini_set('error_prepend_string', '<phpfatalerror>');
+ini_set('error_append_string', '</phpfatalerror>');
+
+// Starts the capture of the ouput, and sets a filter to capture the fatal errors.
+ob_start('FatalErrorCatcher'); // Start capturing the output, and pass it through the fatal error catcher
+
+require_once(APPROOT.'/core/config.class.inc.php');
+require_once(APPROOT.'/core/log.class.inc.php');
+require_once(APPROOT.'/core/kpi.class.inc.php');
+require_once(APPROOT.'/core/cmdbsource.class.inc.php');
+require_once('./xmldataloader.class.inc.php');
+require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
+
+
+// Never cache this page
+header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
+header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+
+/**
+ * Main program
+ */
+$sOperation = Utils::ReadParam('operation', '');
+try
+{
+	switch($sOperation)
+	{
+		case 'async_action':
+		ini_set('max_execution_time', max(240, ini_get('max_execution_time')));
+		// While running the setup it is desirable to see any error that may happen
+		ini_set('display_errors', true);
+		ini_set('display_startup_errors', true);
+		
+		require_once(APPROOT.'/setup/wizardcontroller.class.inc.php');
+		require_once(APPROOT.'/setup/wizardsteps.class.inc.php');
+		
+		$sClass = utils::ReadParam('step_class', '');
+		$sState = utils::ReadParam('step_state', '');
+		$sActionCode = utils::ReadParam('code', '');
+		$aParams = utils::ReadParam('params', array(), false, 'raw_data');
+		$oPage = new ajax_page('');
+		$oDummyController = new WizardController('');
+		if (is_subclass_of($sClass, 'WizardStep'))
+		{
+			$oStep = new $sClass($oDummyController, $sState);
+			$sConfigFile = utils::GetConfigFilePath();
+			if (file_exists($sConfigFile) && !is_writable($sConfigFile) && $oStep->RequiresWritableConfig())
+			{
+				$oPage->error("<b>Error:</b> the configuration file '".$sConfigFile."' already exists and cannot be overwritten.");
+				$oPage->p("The wizard cannot modify the configuration file for you. If you want to upgrade ".ITOP_APPLICATION.", make sure that the file '<b>".realpath($sConfigFile)."</b>' can be modified by the web server.");
+				$oPage->output();
+			}
+			else
+			{
+				$oStep->AsyncAction($oPage, $sActionCode, $aParams);
+			}
+		}
+		$oPage->output();
+		break;
+
+		default:
+		throw(new Exception("Error unsupported operation '$sOperation'"));
+	}
+}
+catch(Exception $e)
+{
+	header("HTTP/1.0 500 Internal server error.");
+	echo "<p>An error happened while processing the installation:</p>\n";
+	echo '<p>'.$e."</p>\n";
+	SetupPage::log_error("An error happened while processing the installation: ".$e);
+}
+
+if (function_exists('memory_get_peak_usage'))
+{
+	if ($sOperation == 'file')
+	{
+		SetupPage::log_info("loading file '$sFileName', peak memory usage. ".memory_get_peak_usage());
+	}
+	else
+	{
+		SetupPage::log_info("operation '$sOperation', peak memory usage. ".memory_get_peak_usage());
+	}
+}
+?>
diff --git a/setup/email.test.php b/setup/email.test.php
index 4f435fc0a..da19a4880 100644
--- a/setup/email.test.php
+++ b/setup/email.test.php
@@ -1,285 +1,285 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Emailing: helper for the admins to troubleshoot email issues
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Wizard to configure and initialize the iTop application
- */
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/core/email.class.inc.php');
-require_once('./setuppage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
-
-$sOperation = Utils::ReadParam('operation', 'step1');
-$oP = new SetupPage('iTop email test utility');
-
-
-/**
- * Helper to check server setting required to send an email
- */  
-function CheckEmailSetting($oP)
-{
-	$bRet = true;
-
-	if (function_exists('php_ini_loaded_file')) // PHP >= 5.2.4
-	{
-		$sPhpIniFile = php_ini_loaded_file();
-	}
-	else
-	{
-		$sPhpIniFile = 'php.ini';
-	}
-
-	$sTransport = MetaModel::GetConfig()->Get('email_transport');
-	switch($sTransport)
-	{
-		case 'PHPMail':
-		$oP->info("iTop is configured to use PHP's <a style=\"background:transparent;padding:0;color:#000;text-decoration:underline;\" href=\"http://www.php.net/manual/en/function.mail.php\" target=\"_blank\">mail</a> function to send emails.");
-		$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
-		if ($bIsWindows)
-		{	
-			$sSmtpServer = ini_get('SMTP');
-			if (empty($sSmtpServer))
-			{
-				$oP->error("The SMTP server is not defined. Please add the 'SMTP' directive into $sPhpIniFile");
-				$bRet = false;
-			}
-			else if (strcasecmp($sSmtpServer, 'localhost') == 0)
-			{
-				$oP->warning("Your SMTP server is configured to 'localhost'. You might want to set or change the 'SMTP' directive into $sPhpIniFile");
-			}
-			else
-			{
-				$oP->info("Your SMTP server: <strong>$sSmtpServer</strong>. To change this value, modify the 'SMTP' directive into $sPhpIniFile");
-			}
-	
-			$iSmtpPort = (int) ini_get('smtp_port');
-			if (empty($iSmtpPort))
-			{
-				$oP->info("The SMTP port is not defined. Please add the 'smtp_port' directive into $sPhpIniFile");
-				$bRet = false;
-			}
-			else if ($iSmtpPort == 25)
-			{
-				$oP->info("Your SMTP port is configured to the default value: 25. You might want to set or change the 'smtp_port' directive into $sPhpIniFile");
-			}
-			else
-			{
-				$oP->info("Your SMTP port is configured to $iSmtpPort. You might want to set or change the 'smtp_port' directive into $sPhpIniFile");
-			}
-		}
-		else
-		{
-			// Not a windows system
-			$sSendMail = ini_get('sendmail_path');
-			if (empty($sSendMail))
-			{
-				$oP->error("The command to send mail is not defined. Please add the 'sendmail_path' directive into $sPhpIniFile. A recommended setting is <em>sendmail_path=sendmail -t -i</em>");
-				$bRet = false;
-			}
-			else
-			{
-				$oP->info("The command to send mail is: <strong>$sSendMail</strong>. To change this value, modify the 'sendmail_path' directive into $sPhpIniFile");
-			}
-		}
-		break;
-		
-		case 'SMTP':
-		$oP->info("iTop is configured to use the <b>SMTP</b> transport.");
-		$sHost = MetaModel::GetConfig()->Get('email_transport_smtp.host');
-		$sPort = MetaModel::GetConfig()->Get('email_transport_smtp.port');
-		$sEncryption = MetaModel::GetConfig()->Get('email_transport_smtp.encryption');
-		$sDisplayEncryption = empty($sEncryption) ? '<em>no encryption</em> ' : $sEncryption;
-		$sUserName = MetaModel::GetConfig()->Get('email_transport_smtp.username');
-		$sDisplayUserName = empty($sUserName) ? '<em>no user</em> ' : $sUserName;
-		$sPassword = MetaModel::GetConfig()->Get('email_transport_smtp.password');
-		$sDisplayPassword = empty($sPassword) ? '<em>no password</em> ' : str_repeat('*', strlen($sPassword));
-		$oP->info("SMTP configuration (from config-itop.php): host: $sHost, port: $sPort, user: $sDisplayUserName, password: $sDisplayPassword, encryption: $sDisplayEncryption.");
-		if (($sHost == 'localhost') && ($sPort == '25') && ($sUserName == '') && ($sPassword == '') )
-		{
-			$oP->warning("The default settings may not be suitable for your environment. You may want to ajust these values by editing iTop's configuration file (".APPROOT."conf/production/config-itop.php).");
-		}
-		break;
-		
-		case 'Null':
-		$oP->warning("iTop is configured to use the <b>Null</b> transport: emails sending will have no effect.");
-		$bRet = false;
-		break;
-		
-		case 'LogFile':
-		$oP->warning("iTop is configured to use the <b>LogFile</b> transport: emails will <em>not</em> be sent but logged to the file: '".APPROOT."/log/mail.log'.");
-		$bRet = true;
-		break;
-		
-		default:
-		$oP->error("Unknown transport '$sTransport' configured.");
-		$bRet = false;
-	}
-	if ($bRet)
-	{
-		$oP->ok("PHP settings are ok to proceed with a test of the email");
-	}
-	$bConfigAsync = MetaModel::GetConfig()->Get('email_asynchronous');
-	if ($bConfigAsync)
-	{
-		$oP->warning("iTop is configured to send emails <em>asynchronously</em>. Make sure that cron.php is scheduled to run in the background, otherwise regular emails will <em>not</em> be sent. For the purpose of this test, the email will be sent <em>synchronously</em>.");
-	}
-	
-	return $bRet;
-}
-
-
-/**
- * Display the form for the first step of the test wizard
- * which consists in a basic check of the configuration and display of a form for testing
- */  
-function DisplayStep1(SetupPage $oP)
-{
-	$sNextOperation = 'step2';
-	$oP->add("<h1>iTop email test</h1>\n");
-	$oP->add("<h2>Checking prerequisites</h2>\n");
-	if (CheckEmailSetting($oP))
-	{
-		$sRedStar = '<span class="hilite">*</span>';
-		$oP->add("<h2>Try to send an email</h2>\n");
-		$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Sending an email...', 10)\">\n");
-		// Form goes here
-		$oP->add("<fieldset><legend>Test recipient</legend>\n");
-		$aForm = array();
-		$aForm[] = array(
-			'label' => "To$sRedStar:",
-			'input' => "<input id=\"to\" type=\"text\" name=\"to\" value=\"\">",
-			'help' => ' email address (e.g. john.foo@worldcompany.com)',
-		);
-		$aForm[] = array(
-			'label' => "From:",
-			'input' => "<input id=\"from\" type=\"text\" name=\"from\" value=\"\">",
-			'help' => ' defaults to the configuration param "email_default_sender_address" or "To" field.',
-		);
-		$oP->form($aForm);
-		$oP->add("</fieldset>\n");
-		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"$sNextOperation\">\n");
-		$oP->add("<div>\n");
-		$oP->add("<button style=\"float:left\" type=\"button\" onclick=\"window.location.reload()\">Refresh</button>\n");
-		$oP->add("<button style=\"float:right\" type=\"submit\">Next >></button>\n");
-		$oP->add("<div style=\"clear:both;\"></div>\n");
-		$oP->add("</div>\n");
-		$oP->add("</form>\n");
-	}
-}
-
-/**
- * Display the form for the second step of the configuration wizard
- * which consists in sending an email, which maybe a problem under Windows
- */  
-function DisplayStep2(SetupPage $oP, $sFrom, $sTo)
-{
-	//$sNextOperation = 'step3';
-	$oP->add("<h1>iTop configuration wizard</h1>\n");
-	$oP->add("<h2>Step 2: send an email</h2>\n");
-	$oP->add("<p>Sending an email to '".htmlentities($sTo, ENT_QUOTES, 'utf-8')."'... (From: '".htmlentities($sFrom, ENT_QUOTES, 'utf-8')."')</p>\n");
-	$oP->add("<form method=\"post\">\n");
-
-	$oEmail = new Email();
-	$oEmail->SetRecipientTO($sTo);
-	$oEmail->SetRecipientFrom($sFrom);
-	$oEmail->SetSubject("Test iTop");
-	$oEmail->SetBody("<p>Hello,</p><p>The email function is now working fine.</p><p>You may now be able to use the notification function.</p><p>iTop</p>");
-	$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
-	switch ($iRes)
-	{
-		case EMAIL_SEND_OK:
-			$sTransport = MetaModel::GetConfig()->Get('email_transport');
-			if ($sTransport == 'LogFile')
-			{
-				$oP->ok("The email has been logged into the file ".APPROOT."/log/mail.log.");
-			}
-			else
-			{
-				$oP->ok("The email has been sent, check your inbox for the incoming mail...");
-			}
-			$oP->add("<button onClick=\"window.history.back();\"><< Back</button>\n");
-			break;
-
-		case EMAIL_SEND_PENDING:
-			$oP->ok("Email queued");
-			$oP->add("<button onClick=\"window.history.back();\"><< Back</button>\n");
-			break;
-
-		case EMAIL_SEND_ERROR:
-			foreach ($aIssues as $sError)
-			{
-				$oP->error(htmlentities($sError, ENT_QUOTES, 'utf-8'));
-			}
-			$oP->add("<button onClick=\"window.history.back();\"><< Back</button>\n");
-			break;
-	}
-}
-
-/**
- * Main program
- */
-
-// #@# Init default timezone -> do not get a notice... to be improved !!!
-// duplicated from 'attributedef.class.inc.php', needed here because mail() does
-// generate a notice
-date_default_timezone_set('Europe/Paris');
-
-
-try
-{
-	switch($sOperation)
-	{
-		case 'step1':
-		DisplayStep1($oP);
-		break;
-		
-		case 'step2':
-		$oP->no_cache();
-		$sTo = Utils::ReadParam('to', '', false, 'raw_data');
-		$sFrom = Utils::ReadParam('from', '', false, 'raw_data');
-		DisplayStep2($oP, $sFrom, $sTo);
-		break;
-
-		default:
-		$oP->error("Error: unsupported operation '$sOperation'");
-		
-	}
-}
-catch(Exception $e)
-{
-	$oP->error("Error: '".htmlentities($e->getMessage(), ENT_QUOTES, 'utf-8')."'");
-}
-catch(CoreException $e)
-{
-	$oP->error("Error: '".$e->getHtmlDesc()."'");	
-}
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Emailing: helper for the admins to troubleshoot email issues
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Wizard to configure and initialize the iTop application
+ */
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/core/email.class.inc.php');
+require_once('./setuppage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+$sOperation = Utils::ReadParam('operation', 'step1');
+$oP = new SetupPage('iTop email test utility');
+
+
+/**
+ * Helper to check server setting required to send an email
+ */  
+function CheckEmailSetting($oP)
+{
+	$bRet = true;
+
+	if (function_exists('php_ini_loaded_file')) // PHP >= 5.2.4
+	{
+		$sPhpIniFile = php_ini_loaded_file();
+	}
+	else
+	{
+		$sPhpIniFile = 'php.ini';
+	}
+
+	$sTransport = MetaModel::GetConfig()->Get('email_transport');
+	switch($sTransport)
+	{
+		case 'PHPMail':
+		$oP->info("iTop is configured to use PHP's <a style=\"background:transparent;padding:0;color:#000;text-decoration:underline;\" href=\"http://www.php.net/manual/en/function.mail.php\" target=\"_blank\">mail</a> function to send emails.");
+		$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
+		if ($bIsWindows)
+		{	
+			$sSmtpServer = ini_get('SMTP');
+			if (empty($sSmtpServer))
+			{
+				$oP->error("The SMTP server is not defined. Please add the 'SMTP' directive into $sPhpIniFile");
+				$bRet = false;
+			}
+			else if (strcasecmp($sSmtpServer, 'localhost') == 0)
+			{
+				$oP->warning("Your SMTP server is configured to 'localhost'. You might want to set or change the 'SMTP' directive into $sPhpIniFile");
+			}
+			else
+			{
+				$oP->info("Your SMTP server: <strong>$sSmtpServer</strong>. To change this value, modify the 'SMTP' directive into $sPhpIniFile");
+			}
+	
+			$iSmtpPort = (int) ini_get('smtp_port');
+			if (empty($iSmtpPort))
+			{
+				$oP->info("The SMTP port is not defined. Please add the 'smtp_port' directive into $sPhpIniFile");
+				$bRet = false;
+			}
+			else if ($iSmtpPort == 25)
+			{
+				$oP->info("Your SMTP port is configured to the default value: 25. You might want to set or change the 'smtp_port' directive into $sPhpIniFile");
+			}
+			else
+			{
+				$oP->info("Your SMTP port is configured to $iSmtpPort. You might want to set or change the 'smtp_port' directive into $sPhpIniFile");
+			}
+		}
+		else
+		{
+			// Not a windows system
+			$sSendMail = ini_get('sendmail_path');
+			if (empty($sSendMail))
+			{
+				$oP->error("The command to send mail is not defined. Please add the 'sendmail_path' directive into $sPhpIniFile. A recommended setting is <em>sendmail_path=sendmail -t -i</em>");
+				$bRet = false;
+			}
+			else
+			{
+				$oP->info("The command to send mail is: <strong>$sSendMail</strong>. To change this value, modify the 'sendmail_path' directive into $sPhpIniFile");
+			}
+		}
+		break;
+		
+		case 'SMTP':
+		$oP->info("iTop is configured to use the <b>SMTP</b> transport.");
+		$sHost = MetaModel::GetConfig()->Get('email_transport_smtp.host');
+		$sPort = MetaModel::GetConfig()->Get('email_transport_smtp.port');
+		$sEncryption = MetaModel::GetConfig()->Get('email_transport_smtp.encryption');
+		$sDisplayEncryption = empty($sEncryption) ? '<em>no encryption</em> ' : $sEncryption;
+		$sUserName = MetaModel::GetConfig()->Get('email_transport_smtp.username');
+		$sDisplayUserName = empty($sUserName) ? '<em>no user</em> ' : $sUserName;
+		$sPassword = MetaModel::GetConfig()->Get('email_transport_smtp.password');
+		$sDisplayPassword = empty($sPassword) ? '<em>no password</em> ' : str_repeat('*', strlen($sPassword));
+		$oP->info("SMTP configuration (from config-itop.php): host: $sHost, port: $sPort, user: $sDisplayUserName, password: $sDisplayPassword, encryption: $sDisplayEncryption.");
+		if (($sHost == 'localhost') && ($sPort == '25') && ($sUserName == '') && ($sPassword == '') )
+		{
+			$oP->warning("The default settings may not be suitable for your environment. You may want to ajust these values by editing iTop's configuration file (".APPROOT."conf/production/config-itop.php).");
+		}
+		break;
+		
+		case 'Null':
+		$oP->warning("iTop is configured to use the <b>Null</b> transport: emails sending will have no effect.");
+		$bRet = false;
+		break;
+		
+		case 'LogFile':
+		$oP->warning("iTop is configured to use the <b>LogFile</b> transport: emails will <em>not</em> be sent but logged to the file: '".APPROOT."/log/mail.log'.");
+		$bRet = true;
+		break;
+		
+		default:
+		$oP->error("Unknown transport '$sTransport' configured.");
+		$bRet = false;
+	}
+	if ($bRet)
+	{
+		$oP->ok("PHP settings are ok to proceed with a test of the email");
+	}
+	$bConfigAsync = MetaModel::GetConfig()->Get('email_asynchronous');
+	if ($bConfigAsync)
+	{
+		$oP->warning("iTop is configured to send emails <em>asynchronously</em>. Make sure that cron.php is scheduled to run in the background, otherwise regular emails will <em>not</em> be sent. For the purpose of this test, the email will be sent <em>synchronously</em>.");
+	}
+	
+	return $bRet;
+}
+
+
+/**
+ * Display the form for the first step of the test wizard
+ * which consists in a basic check of the configuration and display of a form for testing
+ */  
+function DisplayStep1(SetupPage $oP)
+{
+	$sNextOperation = 'step2';
+	$oP->add("<h1>iTop email test</h1>\n");
+	$oP->add("<h2>Checking prerequisites</h2>\n");
+	if (CheckEmailSetting($oP))
+	{
+		$sRedStar = '<span class="hilite">*</span>';
+		$oP->add("<h2>Try to send an email</h2>\n");
+		$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Sending an email...', 10)\">\n");
+		// Form goes here
+		$oP->add("<fieldset><legend>Test recipient</legend>\n");
+		$aForm = array();
+		$aForm[] = array(
+			'label' => "To$sRedStar:",
+			'input' => "<input id=\"to\" type=\"text\" name=\"to\" value=\"\">",
+			'help' => ' email address (e.g. john.foo@worldcompany.com)',
+		);
+		$aForm[] = array(
+			'label' => "From:",
+			'input' => "<input id=\"from\" type=\"text\" name=\"from\" value=\"\">",
+			'help' => ' defaults to the configuration param "email_default_sender_address" or "To" field.',
+		);
+		$oP->form($aForm);
+		$oP->add("</fieldset>\n");
+		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"$sNextOperation\">\n");
+		$oP->add("<div>\n");
+		$oP->add("<button style=\"float:left\" type=\"button\" onclick=\"window.location.reload()\">Refresh</button>\n");
+		$oP->add("<button style=\"float:right\" type=\"submit\">Next >></button>\n");
+		$oP->add("<div style=\"clear:both;\"></div>\n");
+		$oP->add("</div>\n");
+		$oP->add("</form>\n");
+	}
+}
+
+/**
+ * Display the form for the second step of the configuration wizard
+ * which consists in sending an email, which maybe a problem under Windows
+ */  
+function DisplayStep2(SetupPage $oP, $sFrom, $sTo)
+{
+	//$sNextOperation = 'step3';
+	$oP->add("<h1>iTop configuration wizard</h1>\n");
+	$oP->add("<h2>Step 2: send an email</h2>\n");
+	$oP->add("<p>Sending an email to '".htmlentities($sTo, ENT_QUOTES, 'utf-8')."'... (From: '".htmlentities($sFrom, ENT_QUOTES, 'utf-8')."')</p>\n");
+	$oP->add("<form method=\"post\">\n");
+
+	$oEmail = new Email();
+	$oEmail->SetRecipientTO($sTo);
+	$oEmail->SetRecipientFrom($sFrom);
+	$oEmail->SetSubject("Test iTop");
+	$oEmail->SetBody("<p>Hello,</p><p>The email function is now working fine.</p><p>You may now be able to use the notification function.</p><p>iTop</p>");
+	$iRes = $oEmail->Send($aIssues, true /* force synchronous exec */);
+	switch ($iRes)
+	{
+		case EMAIL_SEND_OK:
+			$sTransport = MetaModel::GetConfig()->Get('email_transport');
+			if ($sTransport == 'LogFile')
+			{
+				$oP->ok("The email has been logged into the file ".APPROOT."/log/mail.log.");
+			}
+			else
+			{
+				$oP->ok("The email has been sent, check your inbox for the incoming mail...");
+			}
+			$oP->add("<button onClick=\"window.history.back();\"><< Back</button>\n");
+			break;
+
+		case EMAIL_SEND_PENDING:
+			$oP->ok("Email queued");
+			$oP->add("<button onClick=\"window.history.back();\"><< Back</button>\n");
+			break;
+
+		case EMAIL_SEND_ERROR:
+			foreach ($aIssues as $sError)
+			{
+				$oP->error(htmlentities($sError, ENT_QUOTES, 'utf-8'));
+			}
+			$oP->add("<button onClick=\"window.history.back();\"><< Back</button>\n");
+			break;
+	}
+}
+
+/**
+ * Main program
+ */
+
+// #@# Init default timezone -> do not get a notice... to be improved !!!
+// duplicated from 'attributedef.class.inc.php', needed here because mail() does
+// generate a notice
+date_default_timezone_set('Europe/Paris');
+
+
+try
+{
+	switch($sOperation)
+	{
+		case 'step1':
+		DisplayStep1($oP);
+		break;
+		
+		case 'step2':
+		$oP->no_cache();
+		$sTo = Utils::ReadParam('to', '', false, 'raw_data');
+		$sFrom = Utils::ReadParam('from', '', false, 'raw_data');
+		DisplayStep2($oP, $sFrom, $sTo);
+		break;
+
+		default:
+		$oP->error("Error: unsupported operation '$sOperation'");
+		
+	}
+}
+catch(Exception $e)
+{
+	$oP->error("Error: '".htmlentities($e->getMessage(), ENT_QUOTES, 'utf-8')."'");
+}
+catch(CoreException $e)
+{
+	$oP->error("Error: '".$e->getHtmlDesc()."'");	
+}
+$oP->output();
+?>
diff --git a/setup/modulediscovery.class.inc.php b/setup/modulediscovery.class.inc.php
index e1a2e7ef7..a77db0ecd 100644
--- a/setup/modulediscovery.class.inc.php
+++ b/setup/modulediscovery.class.inc.php
@@ -1,532 +1,532 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with iTop. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-class MissingDependencyException extends Exception
-{
-	public $aModulesInfo;
-}
-
-class ModuleDiscovery
-{
-	static $m_aModuleArgs = array(
-		'label' => 'One line description shown during the interactive setup',
-		'dependencies' => 'array of module ids',
-		'mandatory' => 'boolean',
-		'visible' => 'boolean',
-		'datamodel' =>  'array of data model files',
-		//'dictionary' => 'array of dictionary files', // No longer mandatory, now automated
-		'data.struct' => 'array of structural data files',
-		'data.sample' => 'array of sample data files',
-		'doc.manual_setup' => 'url',
-		'doc.more_information' => 'url',
-	);
-	
-
-	// Cache the results and the source directories
-	protected static $m_aSearchDirs = null;
-	protected static $m_aModules = array();
-	protected static $m_aModuleVersionByName = array();
-
-	// All the entries below are list of file paths relative to the module directory
-	protected static $m_aFilesList = array('datamodel', 'webservice', 'dictionary', 'data.struct', 'data.sample');
-
-
-	// ModulePath is used by AddModule to get the path of the module being included (in ListModuleFiles)
-	protected static $m_sModulePath = null;
-	protected static function SetModulePath($sModulePath)
-	{
-		self::$m_sModulePath = $sModulePath;
-	}
-
-	/**
-	 * @param string $sFilePath
-	 * @param string $sId
-	 * @param array $aArgs
-	 *
-	 * @throws \Exception for missing parameter
-	 */
-	public static function AddModule($sFilePath, $sId, $aArgs)
-	{
-		if (!array_key_exists('itop_version', $aArgs))
-		{
-			// Assume 1.0.2
-			$aArgs['itop_version'] = '1.0.2';
-		}
-		foreach (array_keys(self::$m_aModuleArgs) as $sArgName)
-		{
-			if (!array_key_exists($sArgName, $aArgs))
-			{
-				throw new Exception("Module '$sId': missing argument '$sArgName'");
-		   }
-		}
-
-		$aArgs['root_dir'] = dirname($sFilePath);
-		$aArgs['module_file'] = $sFilePath;
-
-		list($sModuleName, $sModuleVersion) = static::GetModuleName($sId);
-		if ($sModuleVersion == '')
-		{
-			$sModuleVersion = '1.0.0';
-		}
-
-		if (array_key_exists($sModuleName, self::$m_aModuleVersionByName))
-		{
-			if (version_compare($sModuleVersion, self::$m_aModuleVersionByName[$sModuleName]['version'], '>'))
-			{
-				// Newer version, let's upgrade
-				$sIdToRemove = self::$m_aModuleVersionByName[$sModuleName]['id'];
-				unset(self::$m_aModules[$sIdToRemove]);
-
-				self::$m_aModuleVersionByName[$sModuleName]['version'] = $sModuleVersion;
-				self::$m_aModuleVersionByName[$sModuleName]['id'] = $sId;
-			}
-			else
-			{
-				// Older (or equal) version, let's ignore it
-				return;
-			}
-		}
-		else
-		{
-			// First version to be loaded for this module, remember it
-			self::$m_aModuleVersionByName[$sModuleName]['version'] = $sModuleVersion;
-			self::$m_aModuleVersionByName[$sModuleName]['id'] = $sId;
-		}
-		
-		self::$m_aModules[$sId] = $aArgs;
-
-		// Now keep the relative paths, as provided
-		/*
-		foreach(self::$m_aFilesList as $sAttribute)
-		{
-			if (isset(self::$m_aModules[$sId][$sAttribute]))
-			{
-				// All the items below are list of files, that are relative to the current file
-				// being loaded, let's update their path to store path relative to the application directory
-				foreach(self::$m_aModules[$sId][$sAttribute] as $idx => $sRelativePath)
-				{
-					self::$m_aModules[$sId][$sAttribute][$idx] = self::$m_sModulePath.'/'.$sRelativePath;
-				}
-			}
-		}
-		*/
-		// Populate automatically the list of dictionary files
-		$aMatches = array();
-		if(preg_match('|^([^/]+)|', $sId, $aMatches)) // ModuleName = everything before the first forward slash
-		{
-			$sModuleName = $aMatches[1];
-			$sDir = dirname($sFilePath);
-			if ($hDir = opendir($sDir))
-			{
-				while (($sFile = readdir($hDir)) !== false)
-				{
-					$aMatches = array();
-					if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like <Lang>.dict.<ModuleName>.php are loaded automatically
-					{
-						self::$m_aModules[$sId]['dictionary'][] = self::$m_sModulePath.'/'.$sFile;
-					}
-				}
-				closedir($hDir);
-			}
-		}
-	}
-
-	/**
-	 * Get the list of "discovered" modules, ordered based on their (inter) dependencies
-	 *
-	 * @param bool $bAbortOnMissingDependency ...
-	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
-	 *
-	 * @return array
-	 * @throws \MissingDependencyException
-	 */
-	protected static function GetModules($bAbortOnMissingDependency = false, $aModulesToLoad = null)
-	{
-		// Order the modules to take into account their inter-dependencies
-		return self::OrderModulesByDependencies(self::$m_aModules, $bAbortOnMissingDependency, $aModulesToLoad);
-	}
-
-	/**
-	 * Arrange an list of modules, based on their (inter) dependencies
-	 * @param array $aModules The list of modules to process: 'id' => $aModuleInfo
-	 * @param bool $bAbortOnMissingDependency ...
-	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
-	 * @return array
-	 * @throws \MissingDependencyException
-*/
-	public static function OrderModulesByDependencies($aModules, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
-	{
-		// Order the modules to take into account their inter-dependencies
-		$aDependencies = array();
-		$aSelectedModules = array();
-		foreach($aModules as $sId => $aModule)
-		{
-			list($sModuleName, ) = self::GetModuleName($sId);
-			if (is_null($aModulesToLoad) || in_array($sModuleName, $aModulesToLoad))
-			{
-				$aDependencies[$sId] = $aModule['dependencies'];
-				$aSelectedModules[$sModuleName] = true;
-			}
-		}
-		ksort($aDependencies);
-		$aOrderedModules = array();
-		$iLoopCount = 1;
-		while(($iLoopCount < count($aModules)) && (count($aDependencies) > 0) )
-		{
-			foreach($aDependencies as $sId => $aRemainingDeps)
-			{
-				$bDependenciesSolved = true;
-				foreach($aRemainingDeps as $sDepId)
-				{
-					if (!self::DependencyIsResolved($sDepId, $aOrderedModules, $aSelectedModules))
-					{
-						$bDependenciesSolved = false;
-					}
-				}
-				if ($bDependenciesSolved)
-				{
-					$aOrderedModules[] = $sId;
-					unset($aDependencies[$sId]);
-				}
-			}
-			$iLoopCount++;
-		}
-		if ($bAbortOnMissingDependency && count($aDependencies) > 0)
-		{
-			$aModulesInfo = array();
-			$aModuleDeps = array();			
-			foreach($aDependencies as $sId => $aDeps)
-			{
-				$aModule = $aModules[$sId];
-				$aModuleDeps[] = "{$aModule['label']} (id: $sId) depends on ".implode(' + ', $aDeps);
-				$aModulesInfo[$sId] = array('module' => $aModule, 'dependencies' => $aDeps);
-			}
-			$sMessage = "The following modules have unmet dependencies: ".implode(', ', $aModuleDeps);
-			$oException = new MissingDependencyException($sMessage);
-			$oException->aModulesInfo = $aModulesInfo;
-			throw $oException;
-		}
-		// Return the ordered list, so that the dependencies are met...
-		$aResult = array();
-		foreach($aOrderedModules as $sId)
-		{
-			$aResult[$sId] = $aModules[$sId];
-		}
-		return $aResult;
-	}
-
-	/**
-	 * Remove the duplicate modules (i.e. modules with the same name but with a different version) from the supplied list of modules
-	 * @param array $aModules
-	 * @return array The ordered modules as a duplicate-free list of modules
-	 */
-	public static function RemoveDuplicateModules($aModules)
-	{
-		// No longer needed, kept only for compatibility
-		// The de-duplication is now done directly by the AddModule method
-		return $aModules;
-	}
-		
-	protected static function DependencyIsResolved($sDepString, $aOrderedModules, $aSelectedModules)
-	{
-		$bResult = false;
-		$aModuleVersions = array();
-		// Separate the module names from their version for an easier comparison later
-		foreach($aOrderedModules as $sModuleId)
-		{
-			$aMatches = array();
-			if (preg_match('|^([^/]+)/(.*)$|', $sModuleId, $aMatches))
-			{
-				$aModuleVersions[$aMatches[1]] = $aMatches[2];
-			}
-			else
-			{
-				// No version number found, assume 1.0.0
-				$aModuleVersions[$sModuleId] = '1.0.0';
-			}
-		}
-		if (preg_match_all('/([^\(\)&| ]+)/', $sDepString, $aMatches))
-		{
-			$aReplacements = array();
-			$aPotentialPrerequisites = array();
-			foreach($aMatches as $aMatch)
-			{
-				foreach($aMatch as $sModuleId)
-				{
-					// $sModuleId in the dependency string is made of a <name>/<optional_operator><version>
-					// where the operator is < <= = > >= (by default >=)
-					$aModuleMatches = array();
-					if(preg_match('|^([^/]+)/(<?>?=?)([^><=]+)$|', $sModuleId, $aModuleMatches))
-					{
-						$sModuleName = $aModuleMatches[1];
-						$aPotentialPrerequisites[$sModuleName] = true;
-						$sOperator = $aModuleMatches[2];
-						if ($sOperator == '')
-						{
-							$sOperator = '>=';
-						}
-						$sExpectedVersion = $aModuleMatches[3];
-						if (array_key_exists($sModuleName, $aModuleVersions))
-						{
-							// module is present, check the version
-							$sCurrentVersion = $aModuleVersions[$sModuleName];
-							if (version_compare($sCurrentVersion, $sExpectedVersion, $sOperator))
-							{
-								$aReplacements[$sModuleId] = '(true)'; // Add parentheses to protect against invalid condition causing
-																	   // a function call that results in a runtime fatal error								
-							}
-							else
-							{
-								$aReplacements[$sModuleId] = '(false)'; // Add parentheses to protect against invalid condition causing
-																	   // a function call that results in a runtime fatal error								
-							}
-						}
-						else
-						{
-							// module is not present
-							$aReplacements[$sModuleId] = '(false)'; // Add parentheses to protect against invalid condition causing
-																    // a function call that results in a runtime fatal error
-						}
-					}
-				}
-			}
-			$bMissingPrerequisite = false;
-			foreach (array_keys($aPotentialPrerequisites) as $sModuleName)
-			{
-				if (array_key_exists($sModuleName, $aSelectedModules))
-				{
-					// This module is actually a prerequisite
-					if (!array_key_exists($sModuleName, $aModuleVersions))
-					{
-						$bMissingPrerequisite = true;
-					}
-				}
-			}
-			if ($bMissingPrerequisite)
-			{
-				$bResult = false;
-			}
-			else
-			{
-				$sBooleanExpr = str_replace(array_keys($aReplacements), array_values($aReplacements), $sDepString);
-				$bOk = @eval('$bResult = '.$sBooleanExpr.'; return true;');
-				if ($bOk == false)
-				{
-					SetupPage::log_warning("Eval of '$sBooleanExpr' returned false");
-					echo "Failed to parse the boolean Expression = '$sBooleanExpr'<br/>";
-				}
-			}
-		}
-		return $bResult;
-	}
-
-	/**
-	 * Search (on the disk) for all defined iTop modules, load them and returns the list (as an array)
-	 * of the possible iTop modules to install
-	 *
-	 * @param $aSearchDirs array of directories to search (absolute paths)
-	 * @param bool $bAbortOnMissingDependency ...
-	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
-	 *
-	 * @return array A big array moduleID => ModuleData
-	 * @throws \Exception
-	 */
-	public static function GetAvailableModules($aSearchDirs, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
-	{
-		if (self::$m_aSearchDirs != $aSearchDirs)
-		{
-			self::ResetCache();
-		}
-		
-		if (is_null(self::$m_aSearchDirs))
-		{
-			self::$m_aSearchDirs = $aSearchDirs;
-			
-			// Not in cache, let's scan the disk
-			foreach($aSearchDirs as $sSearchDir)
-			{
-				$sLookupDir = realpath($sSearchDir);			
-				if ($sLookupDir == '')
-				{
-					throw new Exception("Invalid directory '$sSearchDir'");
-				}
-	
-				clearstatcache();
-				self::ListModuleFiles(basename($sSearchDir), dirname($sSearchDir));
-			}
-			return self::GetModules($bAbortOnMissingDependency, $aModulesToLoad);
-		}
-		else
-		{
-			// Reuse the previous results
-			return self::GetModules($bAbortOnMissingDependency, $aModulesToLoad);
-		}
-	}
-	
-	public static function ResetCache()
-	{
-		self::$m_aSearchDirs = null;
-		self::$m_aModules = array();
-		self::$m_aModuleVersionByName = array();
-	}
-
-	/**
-	 * Helper function to interpret the name of a module
-	 * @param $sModuleId string Identifier of the module, in the form 'name/version'
-	 * @return array(name, version)
-	 */    
-	public static function GetModuleName($sModuleId)
-	{
-		$aMatches = array();
-		if (preg_match('!^(.*)/(.*)$!', $sModuleId, $aMatches))
-		{
-			$sName = $aMatches[1];
-			$sVersion = $aMatches[2];
-		}
-		else
-		{
-			$sName = $sModuleId;
-			$sVersion = "";
-		}
-		return array($sName, $sVersion);
-	}
-
-	/**
-	 * Helper function to browse a directory and get the modules
-	 *
-	 * @param $sRelDir string Directory to start from
-	 * @param $sRootDir string The root directory path
-	 *
-	 * @throws \Exception
-	 */
-	protected static function ListModuleFiles($sRelDir, $sRootDir)
-	{
-		static $iDummyClassIndex = 0;
-		$sDirectory = $sRootDir.'/'.$sRelDir;
-		
-		if ($hDir = opendir($sDirectory))
-		{
-			// This is the correct way to loop over the directory. (according to the documentation)
-			while (($sFile = readdir($hDir)) !== false)
-			{
-				$aMatches = array();
-				if (is_dir($sDirectory.'/'.$sFile))
-				{
-					if (($sFile != '.') && ($sFile != '..') && ($sFile != '.svn'))
-					{
-						self::ListModuleFiles($sRelDir.'/'.$sFile, $sRootDir);
-					}
-				}
-				else if (preg_match('/^module\.(.*).php$/i', $sFile, $aMatches))
-				{
-					self::SetModulePath($sRelDir);
-					try
-					{
-						$sModuleFileContents = file_get_contents($sDirectory.'/'.$sFile);
-						$sModuleFileContents = str_replace(array('<?php', '?>'), '', $sModuleFileContents);
-						$sModuleFileContents = str_replace('__FILE__', "'".addslashes($sDirectory.'/'.$sFile)."'", $sModuleFileContents);
-						preg_match_all('/class ([A-Za-z0-9_]+) extends ([A-Za-z0-9_]+)/', $sModuleFileContents, $aMatches);
-						//print_r($aMatches);
-						$idx = 0;
-						foreach($aMatches[1] as $sClassName)
-						{
-							if (class_exists($sClassName))
-							{
-								// rename the class inside the code to prevent a "duplicate class" declaration
-								// and change its parent class as well so that nobody will find it and try to execute it
-								$sModuleFileContents = str_replace($sClassName.' extends '.$aMatches[2][$idx], $sClassName.'_'.($iDummyClassIndex++).' extends DummyHandler', $sModuleFileContents);
-							}
-							$idx++;
-						}
-						$bRet = eval($sModuleFileContents);
-						
-						if ($bRet === false)
-						{
-							SetupPage::log_warning("Eval of $sRelDir/$sFile returned false");
-						}
-						
-						//echo "<p>Done.</p>\n";
-					}
-					catch(ParseError $e)
-					{
-					    // PHP 7
-					    SetupPage::log_warning("Eval of $sRelDir/$sFile caused an exception: ".$e->getMessage()." at line ".$e->getLine());
-					}
-					catch(Exception $e)
-					{
-						// Continue...
-						SetupPage::log_warning("Eval of $sRelDir/$sFile caused an exception: ".$e->getMessage());
-					}
-				}
-			}
-			closedir($hDir);
-		}
-		else
-		{
-			throw new Exception("Data directory (".$sDirectory.") not found or not readable.");
-		}
-	}
-} // End of class
-
-
-/** Alias for backward compatibility with old module files in which
- *  the declaration of a module invokes SetupWebPage::AddModule()
- *  whereas the new form is ModuleDiscovery::AddModule()
- */  
-class SetupWebPage extends ModuleDiscovery
-{
-	// For backward compatibility with old modules...
-	public static function log_error($sText)
-	{
-		SetupPage::log_error($sText);
-	}
-
-	public static function log_warning($sText)
-	{
-		SetupPage::log_warning($sText);
-	}
-
-	public static function log_info($sText)
-	{
-		SetupPage::log_info($sText);
-	}
-
-	public static function log_ok($sText)
-	{
-		SetupPage::log_ok($sText);
-	}
-
-	public static function log($sText)
-	{
-		SetupPage::log($sText);
-	}	
-}
-		
-/** Ugly patch !!!
- * In order to be able to analyse / load several times
- * the same module file, we rename the class (to avoid duplicate class definitions)
- * and we make the class extends the dummy class below in order to "deactivate" completely
- * the class (in case some piece of code enumerate the classes derived from a well known class)
- * Note that this will not work if someone enumerates the classes that implement a given interface
- */
-class DummyHandler {
-}
-
+<?php
+/**
+ * Copyright (c) 2010-2018 Combodo SARL
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+class MissingDependencyException extends Exception
+{
+	public $aModulesInfo;
+}
+
+class ModuleDiscovery
+{
+	static $m_aModuleArgs = array(
+		'label' => 'One line description shown during the interactive setup',
+		'dependencies' => 'array of module ids',
+		'mandatory' => 'boolean',
+		'visible' => 'boolean',
+		'datamodel' =>  'array of data model files',
+		//'dictionary' => 'array of dictionary files', // No longer mandatory, now automated
+		'data.struct' => 'array of structural data files',
+		'data.sample' => 'array of sample data files',
+		'doc.manual_setup' => 'url',
+		'doc.more_information' => 'url',
+	);
+	
+
+	// Cache the results and the source directories
+	protected static $m_aSearchDirs = null;
+	protected static $m_aModules = array();
+	protected static $m_aModuleVersionByName = array();
+
+	// All the entries below are list of file paths relative to the module directory
+	protected static $m_aFilesList = array('datamodel', 'webservice', 'dictionary', 'data.struct', 'data.sample');
+
+
+	// ModulePath is used by AddModule to get the path of the module being included (in ListModuleFiles)
+	protected static $m_sModulePath = null;
+	protected static function SetModulePath($sModulePath)
+	{
+		self::$m_sModulePath = $sModulePath;
+	}
+
+	/**
+	 * @param string $sFilePath
+	 * @param string $sId
+	 * @param array $aArgs
+	 *
+	 * @throws \Exception for missing parameter
+	 */
+	public static function AddModule($sFilePath, $sId, $aArgs)
+	{
+		if (!array_key_exists('itop_version', $aArgs))
+		{
+			// Assume 1.0.2
+			$aArgs['itop_version'] = '1.0.2';
+		}
+		foreach (array_keys(self::$m_aModuleArgs) as $sArgName)
+		{
+			if (!array_key_exists($sArgName, $aArgs))
+			{
+				throw new Exception("Module '$sId': missing argument '$sArgName'");
+		   }
+		}
+
+		$aArgs['root_dir'] = dirname($sFilePath);
+		$aArgs['module_file'] = $sFilePath;
+
+		list($sModuleName, $sModuleVersion) = static::GetModuleName($sId);
+		if ($sModuleVersion == '')
+		{
+			$sModuleVersion = '1.0.0';
+		}
+
+		if (array_key_exists($sModuleName, self::$m_aModuleVersionByName))
+		{
+			if (version_compare($sModuleVersion, self::$m_aModuleVersionByName[$sModuleName]['version'], '>'))
+			{
+				// Newer version, let's upgrade
+				$sIdToRemove = self::$m_aModuleVersionByName[$sModuleName]['id'];
+				unset(self::$m_aModules[$sIdToRemove]);
+
+				self::$m_aModuleVersionByName[$sModuleName]['version'] = $sModuleVersion;
+				self::$m_aModuleVersionByName[$sModuleName]['id'] = $sId;
+			}
+			else
+			{
+				// Older (or equal) version, let's ignore it
+				return;
+			}
+		}
+		else
+		{
+			// First version to be loaded for this module, remember it
+			self::$m_aModuleVersionByName[$sModuleName]['version'] = $sModuleVersion;
+			self::$m_aModuleVersionByName[$sModuleName]['id'] = $sId;
+		}
+		
+		self::$m_aModules[$sId] = $aArgs;
+
+		// Now keep the relative paths, as provided
+		/*
+		foreach(self::$m_aFilesList as $sAttribute)
+		{
+			if (isset(self::$m_aModules[$sId][$sAttribute]))
+			{
+				// All the items below are list of files, that are relative to the current file
+				// being loaded, let's update their path to store path relative to the application directory
+				foreach(self::$m_aModules[$sId][$sAttribute] as $idx => $sRelativePath)
+				{
+					self::$m_aModules[$sId][$sAttribute][$idx] = self::$m_sModulePath.'/'.$sRelativePath;
+				}
+			}
+		}
+		*/
+		// Populate automatically the list of dictionary files
+		$aMatches = array();
+		if(preg_match('|^([^/]+)|', $sId, $aMatches)) // ModuleName = everything before the first forward slash
+		{
+			$sModuleName = $aMatches[1];
+			$sDir = dirname($sFilePath);
+			if ($hDir = opendir($sDir))
+			{
+				while (($sFile = readdir($hDir)) !== false)
+				{
+					$aMatches = array();
+					if (preg_match("/^[^\\.]+.dict.$sModuleName.php$/i", $sFile, $aMatches)) // Dictionary files named like <Lang>.dict.<ModuleName>.php are loaded automatically
+					{
+						self::$m_aModules[$sId]['dictionary'][] = self::$m_sModulePath.'/'.$sFile;
+					}
+				}
+				closedir($hDir);
+			}
+		}
+	}
+
+	/**
+	 * Get the list of "discovered" modules, ordered based on their (inter) dependencies
+	 *
+	 * @param bool $bAbortOnMissingDependency ...
+	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
+	 *
+	 * @return array
+	 * @throws \MissingDependencyException
+	 */
+	protected static function GetModules($bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	{
+		// Order the modules to take into account their inter-dependencies
+		return self::OrderModulesByDependencies(self::$m_aModules, $bAbortOnMissingDependency, $aModulesToLoad);
+	}
+
+	/**
+	 * Arrange an list of modules, based on their (inter) dependencies
+	 * @param array $aModules The list of modules to process: 'id' => $aModuleInfo
+	 * @param bool $bAbortOnMissingDependency ...
+	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
+	 * @return array
+	 * @throws \MissingDependencyException
+*/
+	public static function OrderModulesByDependencies($aModules, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	{
+		// Order the modules to take into account their inter-dependencies
+		$aDependencies = array();
+		$aSelectedModules = array();
+		foreach($aModules as $sId => $aModule)
+		{
+			list($sModuleName, ) = self::GetModuleName($sId);
+			if (is_null($aModulesToLoad) || in_array($sModuleName, $aModulesToLoad))
+			{
+				$aDependencies[$sId] = $aModule['dependencies'];
+				$aSelectedModules[$sModuleName] = true;
+			}
+		}
+		ksort($aDependencies);
+		$aOrderedModules = array();
+		$iLoopCount = 1;
+		while(($iLoopCount < count($aModules)) && (count($aDependencies) > 0) )
+		{
+			foreach($aDependencies as $sId => $aRemainingDeps)
+			{
+				$bDependenciesSolved = true;
+				foreach($aRemainingDeps as $sDepId)
+				{
+					if (!self::DependencyIsResolved($sDepId, $aOrderedModules, $aSelectedModules))
+					{
+						$bDependenciesSolved = false;
+					}
+				}
+				if ($bDependenciesSolved)
+				{
+					$aOrderedModules[] = $sId;
+					unset($aDependencies[$sId]);
+				}
+			}
+			$iLoopCount++;
+		}
+		if ($bAbortOnMissingDependency && count($aDependencies) > 0)
+		{
+			$aModulesInfo = array();
+			$aModuleDeps = array();			
+			foreach($aDependencies as $sId => $aDeps)
+			{
+				$aModule = $aModules[$sId];
+				$aModuleDeps[] = "{$aModule['label']} (id: $sId) depends on ".implode(' + ', $aDeps);
+				$aModulesInfo[$sId] = array('module' => $aModule, 'dependencies' => $aDeps);
+			}
+			$sMessage = "The following modules have unmet dependencies: ".implode(', ', $aModuleDeps);
+			$oException = new MissingDependencyException($sMessage);
+			$oException->aModulesInfo = $aModulesInfo;
+			throw $oException;
+		}
+		// Return the ordered list, so that the dependencies are met...
+		$aResult = array();
+		foreach($aOrderedModules as $sId)
+		{
+			$aResult[$sId] = $aModules[$sId];
+		}
+		return $aResult;
+	}
+
+	/**
+	 * Remove the duplicate modules (i.e. modules with the same name but with a different version) from the supplied list of modules
+	 * @param array $aModules
+	 * @return array The ordered modules as a duplicate-free list of modules
+	 */
+	public static function RemoveDuplicateModules($aModules)
+	{
+		// No longer needed, kept only for compatibility
+		// The de-duplication is now done directly by the AddModule method
+		return $aModules;
+	}
+		
+	protected static function DependencyIsResolved($sDepString, $aOrderedModules, $aSelectedModules)
+	{
+		$bResult = false;
+		$aModuleVersions = array();
+		// Separate the module names from their version for an easier comparison later
+		foreach($aOrderedModules as $sModuleId)
+		{
+			$aMatches = array();
+			if (preg_match('|^([^/]+)/(.*)$|', $sModuleId, $aMatches))
+			{
+				$aModuleVersions[$aMatches[1]] = $aMatches[2];
+			}
+			else
+			{
+				// No version number found, assume 1.0.0
+				$aModuleVersions[$sModuleId] = '1.0.0';
+			}
+		}
+		if (preg_match_all('/([^\(\)&| ]+)/', $sDepString, $aMatches))
+		{
+			$aReplacements = array();
+			$aPotentialPrerequisites = array();
+			foreach($aMatches as $aMatch)
+			{
+				foreach($aMatch as $sModuleId)
+				{
+					// $sModuleId in the dependency string is made of a <name>/<optional_operator><version>
+					// where the operator is < <= = > >= (by default >=)
+					$aModuleMatches = array();
+					if(preg_match('|^([^/]+)/(<?>?=?)([^><=]+)$|', $sModuleId, $aModuleMatches))
+					{
+						$sModuleName = $aModuleMatches[1];
+						$aPotentialPrerequisites[$sModuleName] = true;
+						$sOperator = $aModuleMatches[2];
+						if ($sOperator == '')
+						{
+							$sOperator = '>=';
+						}
+						$sExpectedVersion = $aModuleMatches[3];
+						if (array_key_exists($sModuleName, $aModuleVersions))
+						{
+							// module is present, check the version
+							$sCurrentVersion = $aModuleVersions[$sModuleName];
+							if (version_compare($sCurrentVersion, $sExpectedVersion, $sOperator))
+							{
+								$aReplacements[$sModuleId] = '(true)'; // Add parentheses to protect against invalid condition causing
+																	   // a function call that results in a runtime fatal error								
+							}
+							else
+							{
+								$aReplacements[$sModuleId] = '(false)'; // Add parentheses to protect against invalid condition causing
+																	   // a function call that results in a runtime fatal error								
+							}
+						}
+						else
+						{
+							// module is not present
+							$aReplacements[$sModuleId] = '(false)'; // Add parentheses to protect against invalid condition causing
+																    // a function call that results in a runtime fatal error
+						}
+					}
+				}
+			}
+			$bMissingPrerequisite = false;
+			foreach (array_keys($aPotentialPrerequisites) as $sModuleName)
+			{
+				if (array_key_exists($sModuleName, $aSelectedModules))
+				{
+					// This module is actually a prerequisite
+					if (!array_key_exists($sModuleName, $aModuleVersions))
+					{
+						$bMissingPrerequisite = true;
+					}
+				}
+			}
+			if ($bMissingPrerequisite)
+			{
+				$bResult = false;
+			}
+			else
+			{
+				$sBooleanExpr = str_replace(array_keys($aReplacements), array_values($aReplacements), $sDepString);
+				$bOk = @eval('$bResult = '.$sBooleanExpr.'; return true;');
+				if ($bOk == false)
+				{
+					SetupPage::log_warning("Eval of '$sBooleanExpr' returned false");
+					echo "Failed to parse the boolean Expression = '$sBooleanExpr'<br/>";
+				}
+			}
+		}
+		return $bResult;
+	}
+
+	/**
+	 * Search (on the disk) for all defined iTop modules, load them and returns the list (as an array)
+	 * of the possible iTop modules to install
+	 *
+	 * @param $aSearchDirs array of directories to search (absolute paths)
+	 * @param bool $bAbortOnMissingDependency ...
+	 * @param array $aModulesToLoad List of modules to search for, defaults to all if omitted
+	 *
+	 * @return array A big array moduleID => ModuleData
+	 * @throws \Exception
+	 */
+	public static function GetAvailableModules($aSearchDirs, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	{
+		if (self::$m_aSearchDirs != $aSearchDirs)
+		{
+			self::ResetCache();
+		}
+		
+		if (is_null(self::$m_aSearchDirs))
+		{
+			self::$m_aSearchDirs = $aSearchDirs;
+			
+			// Not in cache, let's scan the disk
+			foreach($aSearchDirs as $sSearchDir)
+			{
+				$sLookupDir = realpath($sSearchDir);			
+				if ($sLookupDir == '')
+				{
+					throw new Exception("Invalid directory '$sSearchDir'");
+				}
+	
+				clearstatcache();
+				self::ListModuleFiles(basename($sSearchDir), dirname($sSearchDir));
+			}
+			return self::GetModules($bAbortOnMissingDependency, $aModulesToLoad);
+		}
+		else
+		{
+			// Reuse the previous results
+			return self::GetModules($bAbortOnMissingDependency, $aModulesToLoad);
+		}
+	}
+	
+	public static function ResetCache()
+	{
+		self::$m_aSearchDirs = null;
+		self::$m_aModules = array();
+		self::$m_aModuleVersionByName = array();
+	}
+
+	/**
+	 * Helper function to interpret the name of a module
+	 * @param $sModuleId string Identifier of the module, in the form 'name/version'
+	 * @return array(name, version)
+	 */    
+	public static function GetModuleName($sModuleId)
+	{
+		$aMatches = array();
+		if (preg_match('!^(.*)/(.*)$!', $sModuleId, $aMatches))
+		{
+			$sName = $aMatches[1];
+			$sVersion = $aMatches[2];
+		}
+		else
+		{
+			$sName = $sModuleId;
+			$sVersion = "";
+		}
+		return array($sName, $sVersion);
+	}
+
+	/**
+	 * Helper function to browse a directory and get the modules
+	 *
+	 * @param $sRelDir string Directory to start from
+	 * @param $sRootDir string The root directory path
+	 *
+	 * @throws \Exception
+	 */
+	protected static function ListModuleFiles($sRelDir, $sRootDir)
+	{
+		static $iDummyClassIndex = 0;
+		$sDirectory = $sRootDir.'/'.$sRelDir;
+		
+		if ($hDir = opendir($sDirectory))
+		{
+			// This is the correct way to loop over the directory. (according to the documentation)
+			while (($sFile = readdir($hDir)) !== false)
+			{
+				$aMatches = array();
+				if (is_dir($sDirectory.'/'.$sFile))
+				{
+					if (($sFile != '.') && ($sFile != '..') && ($sFile != '.svn'))
+					{
+						self::ListModuleFiles($sRelDir.'/'.$sFile, $sRootDir);
+					}
+				}
+				else if (preg_match('/^module\.(.*).php$/i', $sFile, $aMatches))
+				{
+					self::SetModulePath($sRelDir);
+					try
+					{
+						$sModuleFileContents = file_get_contents($sDirectory.'/'.$sFile);
+						$sModuleFileContents = str_replace(array('<?php', '?>'), '', $sModuleFileContents);
+						$sModuleFileContents = str_replace('__FILE__', "'".addslashes($sDirectory.'/'.$sFile)."'", $sModuleFileContents);
+						preg_match_all('/class ([A-Za-z0-9_]+) extends ([A-Za-z0-9_]+)/', $sModuleFileContents, $aMatches);
+						//print_r($aMatches);
+						$idx = 0;
+						foreach($aMatches[1] as $sClassName)
+						{
+							if (class_exists($sClassName))
+							{
+								// rename the class inside the code to prevent a "duplicate class" declaration
+								// and change its parent class as well so that nobody will find it and try to execute it
+								$sModuleFileContents = str_replace($sClassName.' extends '.$aMatches[2][$idx], $sClassName.'_'.($iDummyClassIndex++).' extends DummyHandler', $sModuleFileContents);
+							}
+							$idx++;
+						}
+						$bRet = eval($sModuleFileContents);
+						
+						if ($bRet === false)
+						{
+							SetupPage::log_warning("Eval of $sRelDir/$sFile returned false");
+						}
+						
+						//echo "<p>Done.</p>\n";
+					}
+					catch(ParseError $e)
+					{
+					    // PHP 7
+					    SetupPage::log_warning("Eval of $sRelDir/$sFile caused an exception: ".$e->getMessage()." at line ".$e->getLine());
+					}
+					catch(Exception $e)
+					{
+						// Continue...
+						SetupPage::log_warning("Eval of $sRelDir/$sFile caused an exception: ".$e->getMessage());
+					}
+				}
+			}
+			closedir($hDir);
+		}
+		else
+		{
+			throw new Exception("Data directory (".$sDirectory.") not found or not readable.");
+		}
+	}
+} // End of class
+
+
+/** Alias for backward compatibility with old module files in which
+ *  the declaration of a module invokes SetupWebPage::AddModule()
+ *  whereas the new form is ModuleDiscovery::AddModule()
+ */  
+class SetupWebPage extends ModuleDiscovery
+{
+	// For backward compatibility with old modules...
+	public static function log_error($sText)
+	{
+		SetupPage::log_error($sText);
+	}
+
+	public static function log_warning($sText)
+	{
+		SetupPage::log_warning($sText);
+	}
+
+	public static function log_info($sText)
+	{
+		SetupPage::log_info($sText);
+	}
+
+	public static function log_ok($sText)
+	{
+		SetupPage::log_ok($sText);
+	}
+
+	public static function log($sText)
+	{
+		SetupPage::log($sText);
+	}	
+}
+		
+/** Ugly patch !!!
+ * In order to be able to analyse / load several times
+ * the same module file, we rename the class (to avoid duplicate class definitions)
+ * and we make the class extends the dummy class below in order to "deactivate" completely
+ * the class (in case some piece of code enumerate the classes derived from a well known class)
+ * Note that this will not work if someone enumerates the classes that implement a given interface
+ */
+class DummyHandler {
+}
+
diff --git a/setup/moduleinstallation.class.inc.php b/setup/moduleinstallation.class.inc.php
index fc5d2bb27..d64d23220 100644
--- a/setup/moduleinstallation.class.inc.php
+++ b/setup/moduleinstallation.class.inc.php
@@ -1,102 +1,102 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Persistent class ModuleInstallation to record the installed modules
- * Log of module installations
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ModuleInstallation extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_module_install",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("installed", array("allowed_values"=>null, "sql"=>"installed", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("comment", array("allowed_values"=>null, "sql"=>"comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"ModuleInstallation", "jointype"=> "", "allowed_values"=>null, "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('name', 'version', 'installed', 'comment', 'parent_id')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('name', 'version', 'installed', 'parent_id')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-/**
- * Persistent class ExtensionInstallation to record the installed extensions
- * Log of extensions installations
- *
- * @copyright   Copyright (C) 2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-class ExtensionInstallation extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-				"category" => "core,view_in_gui",
-				"key_type" => "autoincrement",
-				"name_attcode" => "",
-				"state_attcode" => "",
-				"reconc_keys" => array(),
-				"db_table" => "priv_extension_install",
-				"db_key_field" => "id",
-				"db_finalclass_field" => "",
-				"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("code", array("allowed_values"=>null, "sql"=>"code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("label", array("allowed_values"=>null, "sql"=>"label", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("source", array("allowed_values"=>null, "sql"=>"source", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("installed", array("allowed_values"=>null, "sql"=>"installed", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		
-		
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('code', 'label', 'version', 'installed', 'source')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('code', 'label', 'version', 'installed', 'source')); // Attributes to be displayed for a list
-		MetaModel::Init_SetZListItems('standard_search', array('code', 'label', 'version', 'installed', 'source')); // Attributes to be displayed in the search form
-	}
-}
-
-
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Persistent class ModuleInstallation to record the installed modules
+ * Log of module installations
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class ModuleInstallation extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_module_install",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("installed", array("allowed_values"=>null, "sql"=>"installed", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("comment", array("allowed_values"=>null, "sql"=>"comment", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"ModuleInstallation", "jointype"=> "", "allowed_values"=>null, "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('name', 'version', 'installed', 'comment', 'parent_id')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('name', 'version', 'installed', 'parent_id')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+/**
+ * Persistent class ExtensionInstallation to record the installed extensions
+ * Log of extensions installations
+ *
+ * @copyright   Copyright (C) 2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+class ExtensionInstallation extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+				"category" => "core,view_in_gui",
+				"key_type" => "autoincrement",
+				"name_attcode" => "",
+				"state_attcode" => "",
+				"reconc_keys" => array(),
+				"db_table" => "priv_extension_install",
+				"db_key_field" => "id",
+				"db_finalclass_field" => "",
+				"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("code", array("allowed_values"=>null, "sql"=>"code", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("label", array("allowed_values"=>null, "sql"=>"label", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("version", array("allowed_values"=>null, "sql"=>"version", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("source", array("allowed_values"=>null, "sql"=>"source", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("installed", array("allowed_values"=>null, "sql"=>"installed", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('code', 'label', 'version', 'installed', 'source')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('code', 'label', 'version', 'installed', 'source')); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('standard_search', array('code', 'label', 'version', 'installed', 'source')); // Attributes to be displayed in the search form
+	}
+}
+
+
diff --git a/setup/moduleinstaller.class.inc.php b/setup/moduleinstaller.class.inc.php
index 1f50dd7f8..bbe00e81b 100644
--- a/setup/moduleinstaller.class.inc.php
+++ b/setup/moduleinstaller.class.inc.php
@@ -1,227 +1,227 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-require_once(APPROOT.'setup/setuppage.class.inc.php');
-
-/**
- * Class ModuleInstaller
- * Defines the API to implement module specific actions during the setup 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-abstract class ModuleInstallerAPI
-{
-	public static function BeforeWritingConfig(Config $oConfiguration)
-	{
-		return $oConfiguration;
-	}
-
-	/**
-	 * Handler called before creating or upgrading the database schema
-	 * @param $oConfiguration Config The new configuration of the application
-	 * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
-	 * @param $sCurrentVersion string Current version number of the module
-	 */
-	public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-	{
-	}
-	
-	/**
-	 * Handler called after the creation/update of the database schema
-	 * @param $oConfiguration Config The new configuration of the application
-	 * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
-	 * @param $sCurrentVersion string Current version number of the module
-	 */
-	public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-	{
-	}
-
-    /**
-     * Handler called at the end of the setup of the database (profiles and admin accounts created), but before the data load
-     * @param $oConfiguration Config The new configuration of the application
-     * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
-     * @param $sCurrentVersion string Current version number of the module
-     */
-    public static function AfterDatabaseSetup(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-    {
-    }
-
-    /**
-     * Handler called at the end of the data load
-     * @param $oConfiguration Config The new configuration of the application
-     * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
-     * @param $sCurrentVersion string Current version number of the module
-     */
-    public static function AfterDataLoad(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
-    {
-    }
-	
-	/**
-	 * Helper to complete the renaming of a class
-	 * The renaming is made in the datamodel definition, but the name has to be changed in the DB as well	 	 
-	 * Must be called after DB update, i.e within an implementation of AfterDatabaseCreation()
-	 * 	 
-	 * @param string $sFrom Original name (already INVALID in the current datamodel)	 	
-	 * @param string $sTo New name (valid in the current datamodel)
-	 * @return void	 	 	
-	 */
-	public static function RenameClassInDB($sFrom, $sTo)
-	{
-		try
-		{
-			if (!MetaModel::IsStandaloneClass($sTo))
-			{
-				$sRootClass = MetaModel::GetRootClass($sTo);
-				$sTableName = MetaModel::DBGetTable($sRootClass);
-				$sFinalClassCol = MetaModel::DBGetClassField($sRootClass);
-				$sRepair = "UPDATE `$sTableName` SET `$sFinalClassCol` = '$sTo' WHERE `$sFinalClassCol` = BINARY '$sFrom'";
-				CMDBSource::Query($sRepair);
-				$iAffectedRows = CMDBSource::AffectedRows();
-				SetupPage::log_info("Renaming class in DB - final class from '$sFrom' to '$sTo': $iAffectedRows rows affected");
-			}
-		}
-		catch(Exception $e)
-		{
-			SetupPage::log_warning("Failed to rename class in DB - final class from '$sFrom' to '$sTo'. Reason: ".$e->getMessage());
-		} 
-	}
-
-	/**
-	 * Helper to modify an enum value	
-	 * The change is made in the datamodel definition, but the value has to be changed in the DB as well	 	 
-	 * Must be called BEFORE DB update, i.e within an implementation of BeforeDatabaseCreation()
-	 * This helper does change ONE value at a time	 
-	 * 	 
-	 * @param string $sClass A valid class name
-	 * @param string $sAttCode The enum attribute code
-	 * @param string $sFrom Original value (already INVALID in the current datamodel)	 	
-	 * @param string $sTo New value (valid in the current datamodel)
-	 * @return void	 	 	
-	 */
-	public static function RenameEnumValueInDB($sClass, $sAttCode, $sFrom, $sTo)
-	{
-		try
-		{
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - from '$sFrom' to '$sTo' failed. Reason '$sAttCode' is not a valid attribute of the class '$sClass'.");
-				return;
-			}
-			$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
-			$sTableName = MetaModel::DBGetTable($sOriginClass);
-	
-			$oAttDef = MetaModel::GetAttributeDef($sOriginClass, $sAttCode);
-			if ($oAttDef instanceof AttributeEnum)
-			{
-				$oValDef = $oAttDef->GetValuesDef();
-				if ($oValDef)
-				{
-					$aNewValues = array_keys($oValDef->GetValues(array(), ""));
-					if (in_array($sTo, $aNewValues))
-					{
-						$sEnumCol = $oAttDef->Get("sql");
-						$aFields = CMDBSource::QueryToArray("SHOW COLUMNS FROM `$sTableName` WHERE Field = '$sEnumCol'");
-						if (isset($aFields[0]['Type']))
-						{
-							$sColType = $aFields[0]['Type'];
-							// Note: the parsing should rely on str_getcsv (requires PHP 5.3) to cope with escaped string
-							if (preg_match("/^enum\(\'(.*)\'\)$/", $sColType, $aMatches))
-							{
-								$aCurrentValues = explode("','", $aMatches[1]);
-							}
-						}
-						if (!in_array($sFrom, $aNewValues))
-						{
-							if (!in_array($sTo, $aCurrentValues)) // if not already transformed!
-							{
-								$sNullSpec = $oAttDef->IsNullAllowed() ? 'NULL' : 'NOT NULL';
-		
-								if (strtolower($sTo) == strtolower($sFrom))
-								{
-									SetupPage::log_info("Changing enum in DB - $sClass::$sAttCode from '$sFrom' to '$sTo' (just a change in the case)"); 
-									$aTargetValues = array();
-									foreach ($aCurrentValues as $sValue)
-									{
-										if ($sValue == $sFrom)
-										{
-											$sValue = $sTo;
-										}
-										$aTargetValues[] = $sValue;
-									}
-									$sColumnDefinition = "ENUM(".implode(",", CMDBSource::Quote($aTargetValues)).") $sNullSpec";
-									$sRepair = "ALTER TABLE `$sTableName` MODIFY `$sEnumCol` $sColumnDefinition";
-									CMDBSource::Query($sRepair);
-								}
-								else
-								{
-									// 1st - Allow both values in the column definition
-									//
-									SetupPage::log_info("Changing enum in DB - $sClass::$sAttCode from '$sFrom' to '$sTo'"); 
-									$aAllValues = $aCurrentValues;
-									$aAllValues[] = $sTo;
-									$sColumnDefinition = "ENUM(".implode(",", CMDBSource::Quote($aAllValues)).") $sNullSpec";
-									$sRepair = "ALTER TABLE `$sTableName` MODIFY `$sEnumCol` $sColumnDefinition";
-									CMDBSource::Query($sRepair);
-					
-									// 2nd - Change the old value into the new value
-									//
-									$sRepair = "UPDATE `$sTableName` SET `$sEnumCol` = '$sTo' WHERE `$sEnumCol` = BINARY '$sFrom'";
-									CMDBSource::Query($sRepair);
-									$iAffectedRows = CMDBSource::AffectedRows();
-									SetupPage::log_info("Changing enum in DB - $iAffectedRows rows updated"); 
-					
-									// 3rd - Remove the useless value from the column definition
-									//
-									$aTargetValues = array();
-									foreach ($aCurrentValues as $sValue)
-									{
-										if ($sValue == $sFrom)
-										{
-											$sValue = $sTo;
-										}
-										$aTargetValues[] = $sValue;
-									}
-									$sColumnDefinition = "ENUM(".implode(",", CMDBSource::Quote($aTargetValues)).") $sNullSpec";
-									$sRepair = "ALTER TABLE `$sTableName` MODIFY `$sEnumCol` $sColumnDefinition";
-									CMDBSource::Query($sRepair);
-									SetupPage::log_info("Changing enum in DB - removed useless value '$sFrom'");
-								}
-							}
-						}
-						else
-						{
-							SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - '$sFrom' is still a valid value (".implode(', ', $aNewValues).")"); 
-						}
-					}
-					else
-					{
-						SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - '$sTo' is not a known value (".implode(', ', $aNewValues).")"); 
-					}
-				}
-			}
-		}
-		catch(Exception $e)
-		{
-			SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - '$sTo' failed. Reason ".$e->getMessage());
-		}
-	}
-
-}
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+require_once(APPROOT.'setup/setuppage.class.inc.php');
+
+/**
+ * Class ModuleInstaller
+ * Defines the API to implement module specific actions during the setup 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+abstract class ModuleInstallerAPI
+{
+	public static function BeforeWritingConfig(Config $oConfiguration)
+	{
+		return $oConfiguration;
+	}
+
+	/**
+	 * Handler called before creating or upgrading the database schema
+	 * @param $oConfiguration Config The new configuration of the application
+	 * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
+	 * @param $sCurrentVersion string Current version number of the module
+	 */
+	public static function BeforeDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+	{
+	}
+	
+	/**
+	 * Handler called after the creation/update of the database schema
+	 * @param $oConfiguration Config The new configuration of the application
+	 * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
+	 * @param $sCurrentVersion string Current version number of the module
+	 */
+	public static function AfterDatabaseCreation(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+	{
+	}
+
+    /**
+     * Handler called at the end of the setup of the database (profiles and admin accounts created), but before the data load
+     * @param $oConfiguration Config The new configuration of the application
+     * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
+     * @param $sCurrentVersion string Current version number of the module
+     */
+    public static function AfterDatabaseSetup(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+    {
+    }
+
+    /**
+     * Handler called at the end of the data load
+     * @param $oConfiguration Config The new configuration of the application
+     * @param $sPreviousVersion string Previous version number of the module (empty string in case of first install)
+     * @param $sCurrentVersion string Current version number of the module
+     */
+    public static function AfterDataLoad(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion)
+    {
+    }
+	
+	/**
+	 * Helper to complete the renaming of a class
+	 * The renaming is made in the datamodel definition, but the name has to be changed in the DB as well	 	 
+	 * Must be called after DB update, i.e within an implementation of AfterDatabaseCreation()
+	 * 	 
+	 * @param string $sFrom Original name (already INVALID in the current datamodel)	 	
+	 * @param string $sTo New name (valid in the current datamodel)
+	 * @return void	 	 	
+	 */
+	public static function RenameClassInDB($sFrom, $sTo)
+	{
+		try
+		{
+			if (!MetaModel::IsStandaloneClass($sTo))
+			{
+				$sRootClass = MetaModel::GetRootClass($sTo);
+				$sTableName = MetaModel::DBGetTable($sRootClass);
+				$sFinalClassCol = MetaModel::DBGetClassField($sRootClass);
+				$sRepair = "UPDATE `$sTableName` SET `$sFinalClassCol` = '$sTo' WHERE `$sFinalClassCol` = BINARY '$sFrom'";
+				CMDBSource::Query($sRepair);
+				$iAffectedRows = CMDBSource::AffectedRows();
+				SetupPage::log_info("Renaming class in DB - final class from '$sFrom' to '$sTo': $iAffectedRows rows affected");
+			}
+		}
+		catch(Exception $e)
+		{
+			SetupPage::log_warning("Failed to rename class in DB - final class from '$sFrom' to '$sTo'. Reason: ".$e->getMessage());
+		} 
+	}
+
+	/**
+	 * Helper to modify an enum value	
+	 * The change is made in the datamodel definition, but the value has to be changed in the DB as well	 	 
+	 * Must be called BEFORE DB update, i.e within an implementation of BeforeDatabaseCreation()
+	 * This helper does change ONE value at a time	 
+	 * 	 
+	 * @param string $sClass A valid class name
+	 * @param string $sAttCode The enum attribute code
+	 * @param string $sFrom Original value (already INVALID in the current datamodel)	 	
+	 * @param string $sTo New value (valid in the current datamodel)
+	 * @return void	 	 	
+	 */
+	public static function RenameEnumValueInDB($sClass, $sAttCode, $sFrom, $sTo)
+	{
+		try
+		{
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - from '$sFrom' to '$sTo' failed. Reason '$sAttCode' is not a valid attribute of the class '$sClass'.");
+				return;
+			}
+			$sOriginClass = MetaModel::GetAttributeOrigin($sClass, $sAttCode);
+			$sTableName = MetaModel::DBGetTable($sOriginClass);
+	
+			$oAttDef = MetaModel::GetAttributeDef($sOriginClass, $sAttCode);
+			if ($oAttDef instanceof AttributeEnum)
+			{
+				$oValDef = $oAttDef->GetValuesDef();
+				if ($oValDef)
+				{
+					$aNewValues = array_keys($oValDef->GetValues(array(), ""));
+					if (in_array($sTo, $aNewValues))
+					{
+						$sEnumCol = $oAttDef->Get("sql");
+						$aFields = CMDBSource::QueryToArray("SHOW COLUMNS FROM `$sTableName` WHERE Field = '$sEnumCol'");
+						if (isset($aFields[0]['Type']))
+						{
+							$sColType = $aFields[0]['Type'];
+							// Note: the parsing should rely on str_getcsv (requires PHP 5.3) to cope with escaped string
+							if (preg_match("/^enum\(\'(.*)\'\)$/", $sColType, $aMatches))
+							{
+								$aCurrentValues = explode("','", $aMatches[1]);
+							}
+						}
+						if (!in_array($sFrom, $aNewValues))
+						{
+							if (!in_array($sTo, $aCurrentValues)) // if not already transformed!
+							{
+								$sNullSpec = $oAttDef->IsNullAllowed() ? 'NULL' : 'NOT NULL';
+		
+								if (strtolower($sTo) == strtolower($sFrom))
+								{
+									SetupPage::log_info("Changing enum in DB - $sClass::$sAttCode from '$sFrom' to '$sTo' (just a change in the case)"); 
+									$aTargetValues = array();
+									foreach ($aCurrentValues as $sValue)
+									{
+										if ($sValue == $sFrom)
+										{
+											$sValue = $sTo;
+										}
+										$aTargetValues[] = $sValue;
+									}
+									$sColumnDefinition = "ENUM(".implode(",", CMDBSource::Quote($aTargetValues)).") $sNullSpec";
+									$sRepair = "ALTER TABLE `$sTableName` MODIFY `$sEnumCol` $sColumnDefinition";
+									CMDBSource::Query($sRepair);
+								}
+								else
+								{
+									// 1st - Allow both values in the column definition
+									//
+									SetupPage::log_info("Changing enum in DB - $sClass::$sAttCode from '$sFrom' to '$sTo'"); 
+									$aAllValues = $aCurrentValues;
+									$aAllValues[] = $sTo;
+									$sColumnDefinition = "ENUM(".implode(",", CMDBSource::Quote($aAllValues)).") $sNullSpec";
+									$sRepair = "ALTER TABLE `$sTableName` MODIFY `$sEnumCol` $sColumnDefinition";
+									CMDBSource::Query($sRepair);
+					
+									// 2nd - Change the old value into the new value
+									//
+									$sRepair = "UPDATE `$sTableName` SET `$sEnumCol` = '$sTo' WHERE `$sEnumCol` = BINARY '$sFrom'";
+									CMDBSource::Query($sRepair);
+									$iAffectedRows = CMDBSource::AffectedRows();
+									SetupPage::log_info("Changing enum in DB - $iAffectedRows rows updated"); 
+					
+									// 3rd - Remove the useless value from the column definition
+									//
+									$aTargetValues = array();
+									foreach ($aCurrentValues as $sValue)
+									{
+										if ($sValue == $sFrom)
+										{
+											$sValue = $sTo;
+										}
+										$aTargetValues[] = $sValue;
+									}
+									$sColumnDefinition = "ENUM(".implode(",", CMDBSource::Quote($aTargetValues)).") $sNullSpec";
+									$sRepair = "ALTER TABLE `$sTableName` MODIFY `$sEnumCol` $sColumnDefinition";
+									CMDBSource::Query($sRepair);
+									SetupPage::log_info("Changing enum in DB - removed useless value '$sFrom'");
+								}
+							}
+						}
+						else
+						{
+							SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - '$sFrom' is still a valid value (".implode(', ', $aNewValues).")"); 
+						}
+					}
+					else
+					{
+						SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - '$sTo' is not a known value (".implode(', ', $aNewValues).")"); 
+					}
+				}
+			}
+		}
+		catch(Exception $e)
+		{
+			SetupPage::log_warning("Changing enum in DB - $sClass::$sAttCode - '$sTo' failed. Reason ".$e->getMessage());
+		}
+	}
+
+}
diff --git a/setup/runtimeenv.class.inc.php b/setup/runtimeenv.class.inc.php
index ae0313d30..7aeaa3e6c 100644
--- a/setup/runtimeenv.class.inc.php
+++ b/setup/runtimeenv.class.inc.php
@@ -1,1248 +1,1248 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Manage a runtime environment
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."setup/modulediscovery.class.inc.php");
-require_once(APPROOT.'setup/modelfactory.class.inc.php');
-require_once(APPROOT.'setup/compiler.class.inc.php');
-require_once(APPROOT.'setup/extensionsmap.class.inc.php');
-require_once(APPROOT.'core/metamodel.class.php');
-
-define ('MODULE_ACTION_OPTIONAL', 1);
-define ('MODULE_ACTION_MANDATORY', 2);
-define ('MODULE_ACTION_IMPOSSIBLE', 3);
-define ('ROOT_MODULE', '_Root_'); // Convention to store IN MEMORY the name/version of the root module i.e. application
-define ('DATAMODEL_MODULE', 'datamodel'); // Convention to store the version of the datamodel
-
-
-
-class RunTimeEnvironment
-{
-	/**
-	 * The name of the environment that the caller wants to build
-	 * @var string sFinalEnv
-	 */
-	protected $sFinalEnv;
-
-	/**
-	 * Environment into which the build will be performed
-	 * @var string sTargetEnv
-	 */
-	protected $sTargetEnv;
-
-	/**
-	 * Extensions map of the source environment
-	 * @var iTopExtensionsMap
-	 */
-	protected $oExtensionsMap;
-
-	/**
-	 * Toolset for building a run-time environment
-	 *
-	 * @param string $sEnvironment (e.g. 'test')
-	 * @param bool $bAutoCommit (make the target environment directly, or build a temporary one)
-	 */
-	public function __construct($sEnvironment = 'production', $bAutoCommit = true)
-	{
-		$this->sFinalEnv = $sEnvironment;
-		if ($bAutoCommit)
-		{
-			// Build directly onto the requested environment
-			$this->sTargetEnv = $sEnvironment;
-		}
-		else
-		{
-			// Build into a temporary target
-			$this->sTargetEnv = $sEnvironment.'-build';
-		}
-		$this->oExtensionsMap = null;
-	}
-
-	/**
-	 * Return the full path to the compiled code (do not use after commit)
-	 * @return string
-	 */
-	public function GetBuildDir()
-	{
-		return APPROOT.'env-'.$this->sTargetEnv;
-	}
-
-	/**
-	 * Callback function for logging the queries run by the setup.
-	 * According to the documentation the function must be defined before passing it to call_user_func...
-	 * @param string $sQuery
-	 * @param float $fDuration
-	 * @return void
-	 */
-	public function LogQueryCallback($sQuery, $fDuration)
-	{
-		$this->log_info(sprintf('%.3fs - query: %s ', $fDuration, $sQuery));
-		$this->log_db_query($sQuery);
-	}
-	
-	/**
-	 * Helper function to initialize the ORM and load the data model
-	 * from the given file
-	 * @param $oConfig object The configuration (volatile, not necessarily already on disk)
-	 * @param $bModelOnly boolean Whether or not to allow loading a data model with no corresponding DB 
-	 * @return none
-	 */    
-	public function InitDataModel($oConfig, $bModelOnly = true, $bUseCache = false)
-	{
-		require_once(APPROOT.'/core/log.class.inc.php');
-		require_once(APPROOT.'/core/kpi.class.inc.php');
-		require_once(APPROOT.'/core/coreexception.class.inc.php');
-		require_once(APPROOT.'/core/dict.class.inc.php');
-		require_once(APPROOT.'/core/attributedef.class.inc.php');
-		require_once(APPROOT.'/core/filterdef.class.inc.php');
-		require_once(APPROOT.'/core/stimulus.class.inc.php');
-		require_once(APPROOT.'/core/MyHelpers.class.inc.php');
-		require_once(APPROOT.'/core/oql/expression.class.inc.php');
-		require_once(APPROOT.'/core/cmdbsource.class.inc.php');
-		require_once(APPROOT.'/core/sqlquery.class.inc.php');
-		require_once(APPROOT.'/core/sqlobjectquery.class.inc.php');
-		require_once(APPROOT.'/core/sqlunionquery.class.inc.php');
-		require_once(APPROOT.'/core/dbobject.class.php');
-		require_once(APPROOT.'/core/dbsearch.class.php');
-		require_once(APPROOT.'/core/dbobjectset.class.php');
-		require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
-		require_once(APPROOT.'/core/userrights.class.inc.php');
-		require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
-	
-		$sConfigFile = $oConfig->GetLoadedFile();
-		if (strlen($sConfigFile) > 0)
-		{
-			$this->log_info("MetaModel::Startup from $sConfigFile (ModelOnly = $bModelOnly)");
-		}
-		else
-		{
-			$this->log_info("MetaModel::Startup (ModelOnly = $bModelOnly)");
-		}
-	
-		if (!$bUseCache)
-		{
-			// Reset the cache for the first use !
-			MetaModel::ResetCache(md5(APPROOT).'-'.$this->sTargetEnv);
-		}
-	
-		MetaModel::Startup($oConfig, $bModelOnly, $bUseCache, false /* $bTraceSourceFiles */, $this->sTargetEnv);
-		
-		if ($this->oExtensionsMap === null)
-		{
-			$this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv);
-		}
-	}
-	
-	/**
-	 * Analyzes the current installation and the possibilities
-	 * 
-	 * @param Config $oConfig Defines the target environment (DB)
-	 * @param mixed $modulesPath Either a single string or an array of absolute paths
-	 * @param bool  $bAbortOnMissingDependency ...
-	 * @param hash $aModulesToLoad List of modules to search for, defaults to all if ommitted
-	 * @return hash Array with the following format:
-	 * array =>
-	 *     'iTop' => array(
-	 *         'version_db' => ... (could be empty in case of a fresh install)
-	 *         'version_code => ...
-	 *     )
-	 *     <module_name> => array(
-	 *         'version_db' => ...  
-	 *         'version_code' => ...  
-	 *         'install' => array(
-	 *             'flag' => SETUP_NEVER | SETUP_OPTIONAL | SETUP_MANDATORY
-	 *             'message' => ...  
-	 *         )   
-	 *         'uninstall' => array(
-	 *             'flag' => SETUP_NEVER | SETUP_OPTIONAL | SETUP_MANDATORY
-	 *             'message' => ...  
-	 *         )   
-	 *         'label' => ...  
-	 *         'dependencies' => array(<module1>, <module2>, ...)  
-	 *         'visible' => true | false
-	 *     )
-	 * )
-	 */     
-	public function AnalyzeInstallation($oConfig, $modulesPath, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
-	{
-		$aRes = array(
-			ROOT_MODULE => array(
-				'version_db' => '',
-				'name_db' => '',
-				'version_code' => ITOP_VERSION.'.'.ITOP_REVISION,
-				'name_code' => ITOP_APPLICATION,
-			)
-		);
-	
-		$aDirs = is_array($modulesPath) ? $modulesPath : array($modulesPath);
-		$aModules = ModuleDiscovery::GetAvailableModules($aDirs, $bAbortOnMissingDependency, $aModulesToLoad);
-		foreach($aModules as $sModuleId => $aModuleInfo)
-		{
-			list($sModuleName, $sModuleVersion) = ModuleDiscovery::GetModuleName($sModuleId);
-			if ($sModuleName == '')
-			{
-				throw new Exception("Missing name for the module: '$sModuleId'");
-			}
-			if ($sModuleVersion == '')
-			{
-				// The version must not be empty (it will be used as a criteria to determine wether a module has been installed or not)
-				//throw new Exception("Missing version for the module: '$sModuleId'");
-				$sModuleVersion  = '1.0.0';
-			}
-	
-			$sModuleAppVersion = $aModuleInfo['itop_version'];
-			$aModuleInfo['version_db'] = '';
-			$aModuleInfo['version_code'] = $sModuleVersion;
-	
-			if (!in_array($sModuleAppVersion, array('1.0.0', '1.0.1', '1.0.2')))
-			{
-				// This module is NOT compatible with the current version
-					$aModuleInfo['install'] = array(
-						'flag' => MODULE_ACTION_IMPOSSIBLE,
-						'message' => 'the module is not compatible with the current version of the application'
-					);
-			}
-			elseif ($aModuleInfo['mandatory'])
-			{
-				$aModuleInfo['install'] = array(
-					'flag' => MODULE_ACTION_MANDATORY,
-					'message' => 'the module is part of the application'
-				);
-			}
-			else
-			{
-				$aModuleInfo['install'] = array(
-					'flag' => MODULE_ACTION_OPTIONAL,
-					'message' => ''
-				);
-			}
-			$aRes[$sModuleName] = $aModuleInfo;
-		}
-	
-		try
-		{
-			require_once(APPROOT.'/core/cmdbsource.class.inc.php');
-			CMDBSource::InitFromConfig($oConfig);
-			$aSelectInstall = CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->Get('db_subname')."priv_module_install");
-		}
-		catch (MySQLException $e)
-		{
-			// No database or erroneous information
-			$aSelectInstall = array();
-		}
-	
-		// Build the list of installed module (get the latest installation)
-		//
-		$aInstallByModule = array(); // array of <module> => array ('installed' => timestamp, 'version' => <version>)
-		$iRootId = 0;
-		foreach ($aSelectInstall as $aInstall)
-		{
-			if (($aInstall['parent_id'] == 0) && ($aInstall['name'] != 'datamodel'))
-			{
-				// Root module, what is its ID ?
-				$iId = (int) $aInstall['id'];
-				if ($iId > $iRootId)
-				{
-					$iRootId = $iId;
-				}
-			}
-		}
-		
-		foreach ($aSelectInstall as $aInstall)
-		{
-			//$aInstall['comment']; // unsused
-			$iInstalled = strtotime($aInstall['installed']);
-			$sModuleName = $aInstall['name'];
-			$sModuleVersion = $aInstall['version'];
-			if ($sModuleVersion == '')
-			{
-				// Though the version cannot be empty in iTop 2.0, it used to be possible
-				// therefore we have to put something here or the module will not be considered
-				// as being installed
-				$sModuleVersion = '0.0.0';
-			}
-	
-			if ($aInstall['parent_id'] == 0)
-			{
-				$sModuleName = ROOT_MODULE;
-			}
-			else if($aInstall['parent_id'] != $iRootId)
-			{
-				// Skip all modules belonging to previous installations
-				continue;
-			}
-	
-			if (array_key_exists($sModuleName, $aInstallByModule))
-			{
-				if ($iInstalled < $aInstallByModule[$sModuleName]['installed'])
-				{
-					continue;
-				}
-			}
-	
-			if ($aInstall['parent_id'] == 0)
-			{
-				$aRes[$sModuleName]['version_db'] = $sModuleVersion;
-				$aRes[$sModuleName]['name_db'] = $aInstall['name'];
-			}
-	
-			$aInstallByModule[$sModuleName]['installed'] = $iInstalled;
-			$aInstallByModule[$sModuleName]['version'] = $sModuleVersion;
-		}
-	
-		// Adjust the list of proposed modules
-		//
-		foreach ($aInstallByModule as $sModuleName => $aModuleDB)
-		{
-			if ($sModuleName == ROOT_MODULE) continue; // Skip the main module
-				
-			if (!array_key_exists($sModuleName, $aRes))
-			{
-				// A module was installed, it is not proposed in the new build... skip 
-				continue;
-			}
-			$aRes[$sModuleName]['version_db'] = $aModuleDB['version'];
-	
-			if ($aRes[$sModuleName]['install']['flag'] == MODULE_ACTION_MANDATORY)
-			{
-				$aRes[$sModuleName]['uninstall'] = array(
-					'flag' => MODULE_ACTION_IMPOSSIBLE,
-					'message' => 'the module is part of the application'
-				);
-			}
-			else
-			{
-				$aRes[$sModuleName]['uninstall'] = array(
-					'flag' => MODULE_ACTION_OPTIONAL,
-					'message' => ''
-				);
-			}
-		}
-	
-		return $aRes;
-	}
-
-
-	public function WriteConfigFileSafe($oConfig)
-	{
-		self::MakeDirSafe(APPCONF);
-		self::MakeDirSafe(APPCONF.$this->sTargetEnv);
-		
-		$sTargetConfigFile = APPCONF.$this->sTargetEnv.'/'.ITOP_CONFIG_FILE;
-		
-		// Write the config file
-		@chmod($sTargetConfigFile, 0770); // In case it exists: RWX for owner and group, nothing for others
-		$oConfig->WriteToFile($sTargetConfigFile);
-		@chmod($sTargetConfigFile, 0440); // Read-only for owner and group, nothing for others
-	}
-
-	/**
-	 * Return an array with extra directories to scan for extensions/modules to install
-	 * @return string[]
-	 */
-	protected function GetExtraDirsToScan()
-	{
-		// Do nothing, overload this method if needed
-		return array();
-	}
-	
-	/**
-	 * Decide whether or not the given extension is selected for installation
-	 * @param iTopExtension $oExtension
-	 * @return boolean
-	 */
-	protected function IsExtensionSelected(iTopExtension $oExtension)
-	{
-		return ($oExtension->sSource == iTopExtension::SOURCE_REMOTE);
-	}
-	
-	/**
-	 * Get the installed modules (only the installed ones)	
-	 */	
-	protected function GetMFModulesToCompile($sSourceEnv, $sSourceDir)
-	{
-		$sSourceDirFull = APPROOT.$sSourceDir;
-		if (!is_dir($sSourceDirFull))
-		{
-			throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");
-		}
-		$aDirsToCompile = array($sSourceDirFull);
-		if (is_dir(APPROOT.'extensions'))
-		{
-			$aDirsToCompile[] = APPROOT.'extensions';
-		}
-		$sExtraDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/';
-		if (is_dir($sExtraDir))
-		{
-			$aDirsToCompile[] = $sExtraDir;
-		}
-
-		$aExtraDirs = $this->GetExtraDirsToScan($aDirsToCompile);
-		$aDirsToCompile = array_merge($aDirsToCompile, $aExtraDirs);
-				
-		$aRet = array();
-
-		// Determine the installed modules and extensions
-		//
-		$oSourceConfig = new Config(APPCONF.$sSourceEnv.'/'.ITOP_CONFIG_FILE);
-		$oSourceEnv = new RunTimeEnvironment($sSourceEnv);
-		$aAvailableModules = $oSourceEnv->AnalyzeInstallation($oSourceConfig, $aDirsToCompile);
-		
-		// Actually read the modules available for the target environment,
-		// but get the selection from the source environment and finally
-		// mark as (automatically) chosen alll the "remote" modules present in the
-		// target environment (data/<target-env>-modules)
-		// The actual choices will be recorded by RecordInstallation below
-		$this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv, true, $aExtraDirs);
-		$this->oExtensionsMap->LoadChoicesFromDatabase($oSourceConfig);
-		foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension)
-		{
-			if($this->IsExtensionSelected($oExtension))
-			{
-				$this->oExtensionsMap->MarkAsChosen($oExtension->sCode);
-			}
-		}
-
-		// Do load the required modules
-		//
-		$oDictModule = new MFDictModule('dictionaries', 'iTop Dictionaries', APPROOT.'dictionaries');
-		$aRet[$oDictModule->GetName()] = $oDictModule;
-		
-		$oFactory = new ModelFactory($aDirsToCompile);
-		$sDeltaFile = APPROOT.'core/datamodel.core.xml';
-		if (file_exists($sDeltaFile))
-		{
-			$oCoreModule = new MFCoreModule('core', 'Core Module', $sDeltaFile);
-			$aRet[$oCoreModule->GetName()] = $oCoreModule;
-		}
-		$sDeltaFile = APPROOT.'application/datamodel.application.xml';
-		if (file_exists($sDeltaFile))
-		{
-			$oApplicationModule = new MFCoreModule('application', 'Application Module', $sDeltaFile);
-			$aRet[$oApplicationModule->GetName()] = $oApplicationModule;
-		}
-		
-		$aModules = $oFactory->FindModules();
-		foreach($aModules as $oModule)
-		{
-			$sModule = $oModule->GetName();
-			$sModuleRootDir = $oModule->GetRootDir();
-			$bIsExtra = $this->oExtensionsMap->ModuleIsChosenAsPartOfAnExtension($sModule, iTopExtension::SOURCE_REMOTE);
-			if (array_key_exists($sModule, $aAvailableModules)) 
-			{
-				if (($aAvailableModules[$sModule]['version_db'] != '') ||  $bIsExtra && !$oModule->IsAutoSelect()) //Extra modules are always unless they are 'AutoSelect'
-				{
-					$aRet[$oModule->GetName()] = $oModule;
-				}
-			}
-		}
-		
-		// Now process the 'AutoSelect' modules
-		do
-		{
-			// Loop while new modules are added...
-			$bModuleAdded = false;
-			foreach($aModules as $oModule)
-			{
-				if (!array_key_exists($oModule->GetName(), $aRet) && $oModule->IsAutoSelect())
-				{
-					try
-					{
-						$bSelected = false;
-						SetupInfo::SetSelectedModules($aRet);
-						eval('$bSelected = ('.$oModule->GetAutoSelect().');');
-					}
-					catch(Exception $e)
-					{
-						$bSelected = false;
-					}
-					if ($bSelected)
-					{
-						$aRet[$oModule->GetName()] = $oModule; // store the Id of the selected module
-						$bModuleAdded  = true;
-					}
-				}
-			}
-		}
-		while($bModuleAdded);
-
-		$sDeltaFile = APPROOT.'data/'.$this->sTargetEnv.'.delta.xml';
-		if (file_exists($sDeltaFile))
-		{
-			$oDelta = new MFDeltaModule($sDeltaFile);
-			$aRet[$oDelta->GetName()] = $oDelta;
-		}
-
-		return $aRet;
-	}
-
-	/**
-	 * Compile the data model by imitating the given environment
-	 * The list of modules to be installed in the target environment is:
-	 *  - the list of modules present in the "source_dir" (defined by the source environment) which are marked as "installed" in the source environment's database
-	 *  - plus the list of modules present in the "extra" directory of the target environment: data/<target_environment>-modules/
-	 * @param string $sSourceEnv The name of the source environment to 'imitate'
-	 * @param bool $bUseSymLinks Whether to create symbolic links instead of copies
-	 * @return string[]
-	 */
-	public function CompileFrom($sSourceEnv, $bUseSymLinks = false)
-	{
-		$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
-		$sSourceDir = $oSourceConfig->Get('source_dir');
-
-		$sSourceDirFull = APPROOT.$sSourceDir;
-		// Do load the required modules
-		//
-		$oFactory = new ModelFactory($sSourceDirFull);
-		$aModulesToCompile = $this->GetMFModulesToCompile($sSourceEnv, $sSourceDir);
-		foreach($aModulesToCompile as $oModule)
-		{
-			if ($oModule instanceof MFDeltaModule)
-			{
-				// Just before loading the delta, let's save an image of the datamodel
-				// in case there is no delta the operation will be done after the end of the loop
-				$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml');
-			}
-			$oFactory->LoadModule($oModule);
-		}
-		
-
-		if ($oModule instanceof MFDeltaModule)
-		{
-			// A delta was loaded, let's save a second copy of the datamodel
-			$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'-with-delta.xml');
-		}
-		else
-		{
-			// No delta was loaded, let's save the datamodel now
-			$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml');
-		}
-
-		$sTargetDir = APPROOT.'env-'.$this->sTargetEnv;
-		self::MakeDirSafe($sTargetDir);
-		$bSkipTempDir = ($this->sFinalEnv != $this->sTargetEnv); // No need for a temporary directory if sTargetEnv is already a temporary directory
-		$oMFCompiler = new MFCompiler($oFactory);
-		$oMFCompiler->Compile($sTargetDir, null, $bUseSymLinks, $bSkipTempDir);
-
-		$sCacheDir = APPROOT.'data/cache-'.$this->sTargetEnv;
-		SetupUtils::builddir($sCacheDir);
-		SetupUtils::tidydir($sCacheDir);
-
-		MetaModel::ResetCache(md5(APPROOT).'-'.$this->sTargetEnv);
-
-		return array_keys($aModulesToCompile);
-	}
-
-	/**
-	 * Helper function to create the database structure
-	 * @return boolean true on success, false otherwise
-	 */
-	public function CreateDatabaseStructure(Config $oConfig, $sMode)
-	{
-		if (strlen($oConfig->Get('db_subname')) > 0)
-		{
-			$this->log_info("Creating the structure in '".$oConfig->Get('db_name')."' (table names prefixed by '".$oConfig->Get('db_subname')."').");
-		}
-		else
-		{
-			$this->log_info("Creating the structure in '".$oConfig->Get('db_subname')."'.");
-		}
-	
-		//MetaModel::CheckDefinitions();
-		if ($sMode == 'install')
-		{
-			if (!MetaModel::DBExists(/* bMustBeComplete */ false))
-			{
-				MetaModel::DBCreate(array($this, 'LogQueryCallback'));
-				$this->log_ok("Database structure successfully created.");
-			}
-			else
-			{
-				if (strlen($oConfig->Get('db_subname')) > 0)
-				{
-					throw new Exception("Error: found iTop tables into the database '".$oConfig->Get('db_name')."' (prefix: '".$oConfig->Get('db_subname')."'). Please, try selecting another database instance or specify another prefix to prevent conflicting table names.");
-				}
-				else
-				{
-					throw new Exception("Error: found iTop tables into the database '".$oConfig->Get('db_name')."'. Please, try selecting another database instance or specify a prefix to prevent conflicting table names.");
-				}
-			}
-		}
-		else
-		{
-			if (MetaModel::DBExists(/* bMustBeComplete */ false))
-			{
-				// Have it work fine even if the DB has been set in read-only mode for the users
-				// (fix copied from RunTimeEnvironment::RecordInstallation)
-				$iPrevAccessMode = $oConfig->Get('access_mode');
-				$oConfig->Set('access_mode', ACCESS_FULL);
-
-				MetaModel::DBCreate(array($this, 'LogQueryCallback'));
-				$this->log_ok("Database structure successfully updated.");
-	
-				// Check (and update only if it seems needed) the hierarchical keys
-				ob_start();
-				MetaModel::CheckHKeys(false /* bDiagnosticsOnly */, true /* bVerbose*/, true /* bForceUpdate */); // Since in 1.2-beta the detection was buggy, let's force the rebuilding of HKeys
-				$sFeedback = ob_get_clean();
-				$this->log_ok("Hierchical keys rebuilt: $sFeedback");
-	
-				// Check (and fix) data sync configuration
-				ob_start();
-				MetaModel::CheckDataSources(false /*$bDiagnostics*/, true/*$bVerbose*/);
-				$sFeedback = ob_get_clean();
-				$this->log_ok("Data sources checked: $sFeedback");
-
-				// Fix meta enums
-				ob_start();
-				MetaModel::RebuildMetaEnums(true /*bVerbose*/);
-				$sFeedback = ob_get_clean();
-				$this->log_ok("Meta enums rebuilt: $sFeedback");
-
-				// Restore the previous access mode
-				$oConfig->Set('access_mode', $iPrevAccessMode);
-			}
-			else
-			{
-				if (strlen($oConfig->Get('db_subname')) > 0)
-				{
-					throw new Exception("Error: No previous instance of iTop found into the database '".$oConfig->Get('db_name')."' (prefix: '".$oConfig->Get('db_subname')."'). Please, try selecting another database instance.");
-				}
-				else
-				{
-					throw new Exception("Error: No previous instance of iTop found into the database '".$oConfig->Get('db_name')."'. Please, try selecting another database instance.");
-				}
-			}
-		}
-		return true;
-	}
-
-	public function UpdatePredefinedObjects()
-	{
-		// Have it work fine even if the DB has been set in read-only mode for the users
-		$oConfig = MetaModel::GetConfig();
-		$iPrevAccessMode = $oConfig->Get('access_mode');
-		$oConfig->Set('access_mode', ACCESS_FULL);
-
-		// Constant classes (e.g. User profiles)
-		//
-		foreach (MetaModel::GetClasses() as $sClass)
-		{
-			$aPredefinedObjects = call_user_func(array(
-				$sClass,
-				'GetPredefinedObjects'
-			));
-			if ($aPredefinedObjects != null)
-			{
-				$this->log_info("$sClass::GetPredefinedObjects() returned " . count($aPredefinedObjects) . " elements.");
-				
-				// Create/Delete/Update objects of this class,
-				// according to the given constant values
-				//
-				$aDBIds = array();
-				$oAll = new DBObjectSet(new DBObjectSearch($sClass));
-				while ($oObj = $oAll->Fetch())
-				{
-					if (array_key_exists($oObj->GetKey(), $aPredefinedObjects))
-					{
-						$aObjValues = $aPredefinedObjects[$oObj->GetKey()];
-						foreach ($aObjValues as $sAttCode => $value)
-						{
-							$oObj->Set($sAttCode, $value);
-						}
-						$oObj->DBUpdate();
-						$aDBIds[$oObj->GetKey()] = true;
-					}
-					else
-					{
-						$oObj->DBDelete();
-					}
-				}
-				foreach ($aPredefinedObjects as $iRefId => $aObjValues)
-				{
-					if (! array_key_exists($iRefId, $aDBIds))
-					{
-						$oNewObj = MetaModel::NewObject($sClass);
-						$oNewObj->SetKey($iRefId);
-						foreach ($aObjValues as $sAttCode => $value)
-						{
-							$oNewObj->Set($sAttCode, $value);
-						}
-						$oNewObj->DBInsert();
-					}
-				}
-			}
-		}
-
-		// Restore the previous access mode
-		$oConfig->Set('access_mode', $iPrevAccessMode);
-	}
-	
-	public function RecordInstallation(Config $oConfig, $sDataModelVersion, $aSelectedModuleCodes, $aSelectedExtensionCodes, $sShortComment = null)
-	{
-		// Have it work fine even if the DB has been set in read-only mode for the users
-		$iPrevAccessMode = $oConfig->Get('access_mode');
-		$oConfig->Set('access_mode', ACCESS_FULL);
-
-		if (CMDBSource::DBName() == '')
-		{		
-			// In case this has not yet been done
-			CMDBSource::InitFromConfig($oConfig);
-		}
-
-		if ($sShortComment === null)
-		{
-			$sShortComment = 'Done by the setup program';
-		}
-		$sMainComment = $sShortComment."\nBuilt on ".ITOP_BUILD_DATE;
-		
-		// Record datamodel version
-		$aData = array(
-			'source_dir' => $oConfig->Get('source_dir'),
-		);
-		$iInstallationTime = time(); // Make sure that all modules record the same installation time
-		$oInstallRec = new ModuleInstallation();
-		$oInstallRec->Set('name', DATAMODEL_MODULE);
-		$oInstallRec->Set('version', $sDataModelVersion);
-		$oInstallRec->Set('comment', json_encode($aData));
-		$oInstallRec->Set('parent_id', 0); // root module
-		$oInstallRec->Set('installed', $iInstallationTime);
-		$iMainItopRecord = $oInstallRec->DBInsertNoReload();
-		
-		// Record main installation
-		$oInstallRec = new ModuleInstallation();
-		$oInstallRec->Set('name', ITOP_APPLICATION);
-		$oInstallRec->Set('version', ITOP_VERSION.'.'.ITOP_REVISION);
-		$oInstallRec->Set('comment', $sMainComment);
-		$oInstallRec->Set('parent_id', 0); // root module
-		$oInstallRec->Set('installed', $iInstallationTime);
-		$iMainItopRecord = $oInstallRec->DBInsertNoReload();
-	
-		
-		// Record installed modules and extensions
-		//
-		$aAvailableExtensions = array();
-		$aAvailableModules = $this->AnalyzeInstallation($oConfig, $this->GetBuildDir());
-		foreach($aSelectedModuleCodes as $sModuleId)
-		{
-			$aModuleData = $aAvailableModules[$sModuleId];
-			$sName = $sModuleId;
-			$sVersion = $aModuleData['version_code'];
-			$aComments = array();
-			$aComments[] = $sShortComment;
-			if ($aModuleData['mandatory'])
-			{
-				$aComments[] = 'Mandatory';
-			}
-			else
-			{
-				$aComments[] = 'Optional';
-			}
-			if ($aModuleData['visible'])
-			{
-				$aComments[] = 'Visible (during the setup)';
-			}
-			else
-			{
-				$aComments[] = 'Hidden (selected automatically)';
-			}
-			foreach ($aModuleData['dependencies'] as $sDependOn)
-			{
-				$aComments[] = "Depends on module: $sDependOn";
-			}
-			$sComment = implode("\n", $aComments);
-	
-			$oInstallRec = new ModuleInstallation();
-			$oInstallRec->Set('name', $sName);
-			$oInstallRec->Set('version', $sVersion);
-			$oInstallRec->Set('comment', $sComment);
-			$oInstallRec->Set('parent_id', $iMainItopRecord);
-			$oInstallRec->Set('installed', $iInstallationTime);
-			$oInstallRec->DBInsertNoReload();
-		}
-		
-		if ($this->oExtensionsMap)
-		{
-			// Mark as chosen the selected extensions code passed to us
-			// Note: some other extensions may already be marked as chosen
-			foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension)
-			{
-				if (in_array($oExtension->sCode, $aSelectedExtensionCodes))
-				{
-					$this->oExtensionsMap->MarkAsChosen($oExtension->sCode);
-				}
-			}
-			
-			foreach($this->oExtensionsMap->GetChoices() as $oExtension)
-			{
-				$oInstallRec = new ExtensionInstallation();
-				$oInstallRec->Set('code', $oExtension->sCode);
-				$oInstallRec->Set('label', $oExtension->sLabel);
-				$oInstallRec->Set('version', $oExtension->sVersion);
-				$oInstallRec->Set('source',  $oExtension->sSource);
-				$oInstallRec->Set('installed', $iInstallationTime);
-				$oInstallRec->DBInsertNoReload();
-			}
-		}
-
-		// Restore the previous access mode
-		$oConfig->Set('access_mode', $iPrevAccessMode);
-
-		// Database is created, installation has been tracked into it
-		return true;	
-	}
-	
-	public function GetApplicationVersion(Config $oConfig)
-	{
-		$aResult = false;
-		try
-		{
-			require_once(APPROOT.'/core/cmdbsource.class.inc.php');
-			CMDBSource::InitFromConfig($oConfig);
-			$sSQLQuery = "SELECT * FROM ".$oConfig->Get('db_subname')."priv_module_install";
-			$aSelectInstall = CMDBSource::QueryToArray($sSQLQuery);
-		}
-		catch (MySQLException $e)
-		{
-			// No database or erroneous information
-			$this->log_error('Can not connect to the database: host: '.$oConfig->Get('db_host').', user:'.$oConfig->Get('db_user').', pwd:'.$oConfig->Get('db_pwd').', db name:'.$oConfig->Get('db_name'));
-			$this->log_error('Exception '.$e->getMessage());
-			return false;
-		}
-	
-		// Scan the list of installed modules to get the version of the 'ROOT' module which holds the main application version
-		foreach ($aSelectInstall as $aInstall)
-		{
-			$sModuleVersion = $aInstall['version'];
-			if ($sModuleVersion == '')
-			{
-				// Though the version cannot be empty in iTop 2.0, it used to be possible
-				// therefore we have to put something here or the module will not be considered
-				// as being installed
-				$sModuleVersion = '0.0.0';
-			}
-			
-			if ($aInstall['parent_id'] == 0)
-			{
-				if ($aInstall['name'] == DATAMODEL_MODULE)
-				{
-					$aResult['datamodel_version'] = $sModuleVersion;
-					$aComments = json_decode($aInstall['comment'], true);
-					if (is_array($aComments))
-					{
-						$aResult = array_merge($aResult, $aComments);
-					}
-				}
-				else
-				{
-					$aResult['product_name'] = $aInstall['name'];
-					$aResult['product_version'] = $sModuleVersion;
-				}
-			}
-		}
-		if (!array_key_exists('datamodel_version', $aResult))
-		{
-			// Versions prior to 2.0 did not record the version of the datamodel
-			// so assume that the datamodel version is equal to the application version
-			$aResult['datamodel_version'] = $aResult['product_version'];
-		}
-		$this->log_info("GetApplicationVersion returns: product_name: ".$aResult['product_name'].', product_version: '.$aResult['product_version']);
-		return $aResult;	
-	}
-
-	public static function MakeDirSafe($sDir)
-	{
-		if (!is_dir($sDir))
-		{
-			if (!@mkdir($sDir))
-			{
-				throw new Exception("Failed to create directory '$sDir', please check that the web server process has enough rights to create the directory.");
-			}
-			@chmod($sDir, 0770); // RWX for owner and group, nothing for others
-		}
-	}
-
-	/**
-	 * Wrappers for logging into the setup log files	
-	 */	
-	protected function log_error($sText)
-	{
-		SetupPage::log_error($sText);
-	}
-	protected function log_warning($sText)
-	{
-		SetupPage::log_warning($sText);
-	}
-	protected function log_info($sText)
-	{
-		SetupPage::log_info($sText);
-	}
-	protected function log_ok($sText)
-	{
-		SetupPage::log_ok($sText);
-	}
-
-	/**
-	 * Writes queries run by the setup in a SQL file
-	 *
-	 * @param string $sQuery
-	 *
-	 * @since 2.5 #1001 utf8mb4 switch
-	 * @uses \SetupUtils::GetSetupQueriesFilePath()
-	 */
-	protected function log_db_query($sQuery)
-	{
-		$sSetupQueriesFilePath = SetupUtils::GetSetupQueriesFilePath();
-		$hSetupQueriesFile = @fopen($sSetupQueriesFilePath, 'a');
-		if ($hSetupQueriesFile !== false)
-		{
-			fwrite($hSetupQueriesFile, "$sQuery\n");
-			fclose($hSetupQueriesFile);
-		}
-	}
-	
-	public function GetCurrentDataModelVersion()
-	{
-		$oSearch = DBObjectSearch::FromOQL("SELECT ModuleInstallation WHERE name='".DATAMODEL_MODULE."'");
-		$oSet = new DBObjectSet($oSearch, array('installed' => false));
-		$oLatestDM = $oSet->Fetch();
-		if ($oLatestDM == null)
-		{
-			return '0.0.0';
-		}
-		return $oLatestDM->Get('version');
-	}
-
-	public function Commit()
-	{
-		if ($this->sFinalEnv != $this->sTargetEnv)
-		{
-			if (file_exists(APPROOT.'data/'.$this->sTargetEnv.'.delta.xml'))
-			{
-				if (file_exists(APPROOT.'data/'.$this->sFinalEnv.'.delta.xml'))
-				{
-					// Make a "previous" file
-					copy(
-						APPROOT.'data/'.$this->sTargetEnv.'.delta.xml',
-						APPROOT.'data/'.$this->sFinalEnv.'.delta.prev.xml'
-					);
-				}
-				$this->CommitFile(
-					APPROOT.'data/'.$this->sTargetEnv.'.delta.xml',
-					APPROOT.'data/'.$this->sFinalEnv.'.delta.xml'
-				);
-			}
-			$this->CommitFile(
-				APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml',
-				APPROOT.'data/datamodel-'.$this->sFinalEnv.'.xml'
-			);
-			$this->CommitFile(
-				APPROOT.'data/datamodel-'.$this->sTargetEnv.'-with-delta.xml',
-				APPROOT.'data/datamodel-'.$this->sFinalEnv.'-with-delta.xml',
-				false
-			);
-			$this->CommitDir(
-				APPROOT.'data/'.$this->sTargetEnv.'-modules/',
-				APPROOT.'data/'.$this->sFinalEnv.'-modules/',
-				false
-			);
-			$this->CommitDir(
-				APPROOT.'data/cache-'.$this->sTargetEnv,
-				APPROOT.'data/cache-'.$this->sFinalEnv,
-				false
-			);
-			$this->CommitDir(
-				APPROOT.'env-'.$this->sTargetEnv,
-				APPROOT.'env-'.$this->sFinalEnv,
-                true,
-                false
-			);
-
-			// Move the config file
-			//
-			$sTargetConfig = APPCONF.$this->sTargetEnv.'/config-itop.php';
-			$sFinalConfig = APPCONF.$this->sFinalEnv.'/config-itop.php';
-			@chmod($sFinalConfig, 0770); // In case it exists: RWX for owner and group, nothing for others
-			$this->CommitFile($sTargetConfig, $sFinalConfig);
-			@chmod($sFinalConfig, 0440); // Read-only for owner and group, nothing for others
-			@rmdir(dirname($sTargetConfig)); // Cleanup the temporary build dir if empty
-
-			MetaModel::ResetCache(md5(APPROOT).'-'.$this->sFinalEnv);
-		}
-	}
-
-	/**
-	 * Overwrite or create the destination file
-	 *
-	 * @param $sSource
-	 * @param $sDest
-	 * @param bool $bSourceMustExist
-	 * @throws Exception
-	 */
-	protected function CommitFile($sSource, $sDest, $bSourceMustExist = true)
-	{
-		if (file_exists($sSource))
-		{
-			SetupUtils::builddir(dirname($sDest));
-			if (file_exists($sDest))
-			{
-				$bRes = @unlink($sDest);
-				if (!$bRes)
-				{
-					throw new Exception('Commit - Failed to cleanup destination file: '.$sDest);
-				}
-			}
-			rename($sSource, $sDest);
-		}
-		else
-		{
-			// The file does not exist
-			if ($bSourceMustExist)
-			{
-				throw new Exception('Commit - Missing file: '.$sSource);
-			}
-			else
-			{
-				// Align the destination with the source... make sure there is NO file
-				if (file_exists($sDest))
-				{
-					$bRes = @unlink($sDest);
-					if (!$bRes)
-					{
-						throw new Exception('Commit - Failed to cleanup destination file: '.$sDest);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Overwrite or create the destination directory
-	 *
-	 * @param $sSource
-	 * @param $sDest
-	 * @param boolean $bSourceMustExist
-     * @param boolean $bRemoveSource If true $sSource will be removed, otherwise $sSource will just be emptied
-	 * @throws Exception
-	 */
-	protected function CommitDir($sSource, $sDest, $bSourceMustExist = true, $bRemoveSource = true)
-	{
-		if (file_exists($sSource))
-		{
-			SetupUtils::movedir($sSource, $sDest, $bRemoveSource);
-		}
-		else
-		{
-			// The file does not exist
-			if ($bSourceMustExist)
-			{
-				throw new Exception('Commit - Missing directory: '.$sSource);
-			}
-			else
-			{
-				// Align the destination with the source... make sure there is NO file
-				if (file_exists($sDest))
-				{
-					SetupUtils::rrmdir($sDest);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Call the given handler method for all selected modules having an installation handler
-	 * @param array[] $aAvailableModules
-	 * @param string[] $aSelectedModules
-	 * @param string $sHandlerName
-	 */
-	public function CallInstallerHandlers($aAvailableModules, $aSelectedModules, $sHandlerName)
-	{
-	    foreach($aAvailableModules as $sModuleId => $aModule)
-	    {
-	        if (($sModuleId != ROOT_MODULE) && in_array($sModuleId, $aSelectedModules) &&
-	            isset($aAvailableModules[$sModuleId]['installer']) )
-	        {
-	            $sModuleInstallerClass = $aAvailableModules[$sModuleId]['installer'];
-	            SetupPage::log_info("Calling Module Handler: $sModuleInstallerClass::$sHandlerName(oConfig, {$aModule['version_db']}, {$aModule['version_code']})");
-	            $aCallSpec = array($sModuleInstallerClass, $sHandlerName);
-	            if (is_callable($aCallSpec))
-	            {
-	               call_user_func_array($aCallSpec, array(MetaModel::GetConfig(), $aModule['version_db'], $aModule['version_code']));
-	            }
-	        }
-	    }
-	}
-	
-	/**
-	 * Load data from XML files for the selected modules (structural data and/or sample data)
-	 * @param array[] $aAvailableModules All available modules and their definition
-	 * @param string[] $aSelectedModules List of selected modules
-	 * @param bool $bSampleData Wether or not to load sample data
-	 */
-	public function LoadData($aAvailableModules, $aSelectedModules, $bSampleData)
-	{
-	    $oDataLoader = new XMLDataLoader();
-	    
-	    CMDBObject::SetTrackInfo("Initialization");
-	    $oMyChange = CMDBObject::GetCurrentChange();
-	    
-	    SetupPage::log_info("starting data load session");
-	    $oDataLoader->StartSession($oMyChange);
-	    
-	    $aFiles = array();
-	    $aPreviouslyLoadedFiles = array();
-	    foreach($aAvailableModules as $sModuleId => $aModule)
-	    {
-	        if (($sModuleId != ROOT_MODULE))
-	        {
-	            $sRelativePath = 'env-'.$this->sTargetEnv.'/'.basename($aModule['root_dir']);
-	            // Load data only for selected AND newly installed modules
-	            if (in_array($sModuleId, $aSelectedModules))
-	            {
-	                if ($aModule['version_db'] != '')
-	                {
-	                    // Simulate the load of the previously loaded XML files to get the mapping of the keys
-	                    if ($bSampleData)
-	                    {
-	                        $aPreviouslyLoadedFiles = static::MergeWithRelativeDir($aPreviouslyLoadedFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
-	                        $aPreviouslyLoadedFiles = static::MergeWithRelativeDir($aPreviouslyLoadedFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.sample']);
-	                    }
-	                    else
-	                    {
-	                        // Load only structural data
-	                        $aPreviouslyLoadedFiles = static::MergeWithRelativeDir($aPreviouslyLoadedFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
-	                    }
-	                }
-	                else
-	                {
-	                    if ($bSampleData)
-	                    {
-	                        $aFiles = static::MergeWithRelativeDir($aFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
-	                        $aFiles = static::MergeWithRelativeDir($aFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.sample']);
-	                    }
-	                    else
-	                    {
-	                        // Load only structural data
-	                        $aFiles = static::MergeWithRelativeDir($aFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
-	                    }
-	                }
-	            }
-	        }
-	    }
-	    
-	    // Simulate the load of the previously loaded files, in order to initialize
-	    // the mapping between the identifiers in the XML and the actual identifiers
-	    // in the current database
-	    foreach($aPreviouslyLoadedFiles as $sFileRelativePath)
-	    {
-	        $sFileName = APPROOT.$sFileRelativePath;
-	        SetupPage::log_info("Loading file: $sFileName (just to get the keys mapping)");
-	        if (empty($sFileName) || !file_exists($sFileName))
-	        {
-	            throw(new Exception("File $sFileName does not exist"));
-	        }
-	        
-	        $oDataLoader->LoadFile($sFileName, true);
-	        $sResult = sprintf("loading of %s done.", basename($sFileName));
-	        SetupPage::log_info($sResult);
-	    }
-	    
-	    foreach($aFiles as $sFileRelativePath)
-	    {
-	        $sFileName = APPROOT.$sFileRelativePath;
-	        SetupPage::log_info("Loading file: $sFileName");
-	        if (empty($sFileName) || !file_exists($sFileName))
-	        {
-	            throw(new Exception("File $sFileName does not exist"));
-	        }
-	        
-	        $oDataLoader->LoadFile($sFileName);
-	        $sResult = sprintf("loading of %s done.", basename($sFileName));
-	        SetupPage::log_info($sResult);
-	    }
-	    
-	    $oDataLoader->EndSession();
-	    SetupPage::log_info("ending data load session");
-	}
-	
-	/**
-	 * Merge two arrays of file names, adding the relative path to the files provided in the array to merge
-	 * @param string[] $aSourceArray
-	 * @param string $sBaseDir
-	 * @param string[] $aFilesToMerge
-	 * @return string[]
-	 */
-	protected static function MergeWithRelativeDir($aSourceArray, $sBaseDir, $aFilesToMerge)
-	{
-	    $aToMerge = array();
-	    foreach($aFilesToMerge as $sFile)
-	    {
-	        $aToMerge[] = $sBaseDir.'/'.$sFile;
-	    }
-	    return array_merge($aSourceArray, $aToMerge);
-	}
-	
-	/**
-	 * Check the MetaModel for some common pitfall (class name too long, classes requiring too many joins...)
-	 * The check takes about 900 ms for 200 classes
-	 * @throws Exception
-	 * @return string
-	 */
-    public function CheckMetaModel()
-    {
-        $iCount = 0;
-        $fStart = microtime(true);
-        foreach(MetaModel::GetClasses() as $sClass)
-        {
-            if (false == MetaModel::HasTable($sClass) && MetaModel::IsAbstract($sClass))
-            {
-                //if a class is not persisted and is abstract, the code below would crash. Needed by the class AbstractRessource. This is tolerable to skip this because we check the setup process integrity, not the datamodel integrity.
-                continue;
-            }
-
-            $oSearch = new DBObjectSearch($sClass);
-            $oSearch->SetShowObsoleteData(false);
-            $oSQLQuery = $oSearch->GetSQLQueryStructure(null, false);
-            $sViewName = MetaModel::DBGetView($sClass);
-            if (strlen($sViewName) > 64)
-            {
-                throw new Exception("Class name too long for class: '$sClass'. The name of the corresponding view ($sViewName) would exceed MySQL's limit for the name of a table (64 characters).");
-            }
-            $sTableName = MetaModel::DBGetTable($sClass);
-            if (strlen($sTableName) > 64)
-            {
-                throw new Exception("Table name too long for class: '$sClass'. The name of the corresponding MySQL table ($sTableName) would exceed MySQL's limit for the name of a table (64 characters).");
-            }
-            $iTableCount = $oSQLQuery->CountTables();
-            if ($iTableCount > 61)
-            {
-                throw new Exception("Class requiring too many tables: '$sClass'. The structure of the class ($sClass) would require a query with more than 61 JOINS (MySQL's limitation).");
-            }
-            $iCount++;
-        }
-        $fDuration = microtime(true) - $fStart;
-        
-        return sprintf("Checked %d classes in %.1f ms. No error found.\n", $iCount, $fDuration*1000.0);
-    }
-} // End of class
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Manage a runtime environment
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."setup/modulediscovery.class.inc.php");
+require_once(APPROOT.'setup/modelfactory.class.inc.php');
+require_once(APPROOT.'setup/compiler.class.inc.php');
+require_once(APPROOT.'setup/extensionsmap.class.inc.php');
+require_once(APPROOT.'core/metamodel.class.php');
+
+define ('MODULE_ACTION_OPTIONAL', 1);
+define ('MODULE_ACTION_MANDATORY', 2);
+define ('MODULE_ACTION_IMPOSSIBLE', 3);
+define ('ROOT_MODULE', '_Root_'); // Convention to store IN MEMORY the name/version of the root module i.e. application
+define ('DATAMODEL_MODULE', 'datamodel'); // Convention to store the version of the datamodel
+
+
+
+class RunTimeEnvironment
+{
+	/**
+	 * The name of the environment that the caller wants to build
+	 * @var string sFinalEnv
+	 */
+	protected $sFinalEnv;
+
+	/**
+	 * Environment into which the build will be performed
+	 * @var string sTargetEnv
+	 */
+	protected $sTargetEnv;
+
+	/**
+	 * Extensions map of the source environment
+	 * @var iTopExtensionsMap
+	 */
+	protected $oExtensionsMap;
+
+	/**
+	 * Toolset for building a run-time environment
+	 *
+	 * @param string $sEnvironment (e.g. 'test')
+	 * @param bool $bAutoCommit (make the target environment directly, or build a temporary one)
+	 */
+	public function __construct($sEnvironment = 'production', $bAutoCommit = true)
+	{
+		$this->sFinalEnv = $sEnvironment;
+		if ($bAutoCommit)
+		{
+			// Build directly onto the requested environment
+			$this->sTargetEnv = $sEnvironment;
+		}
+		else
+		{
+			// Build into a temporary target
+			$this->sTargetEnv = $sEnvironment.'-build';
+		}
+		$this->oExtensionsMap = null;
+	}
+
+	/**
+	 * Return the full path to the compiled code (do not use after commit)
+	 * @return string
+	 */
+	public function GetBuildDir()
+	{
+		return APPROOT.'env-'.$this->sTargetEnv;
+	}
+
+	/**
+	 * Callback function for logging the queries run by the setup.
+	 * According to the documentation the function must be defined before passing it to call_user_func...
+	 * @param string $sQuery
+	 * @param float $fDuration
+	 * @return void
+	 */
+	public function LogQueryCallback($sQuery, $fDuration)
+	{
+		$this->log_info(sprintf('%.3fs - query: %s ', $fDuration, $sQuery));
+		$this->log_db_query($sQuery);
+	}
+	
+	/**
+	 * Helper function to initialize the ORM and load the data model
+	 * from the given file
+	 * @param $oConfig object The configuration (volatile, not necessarily already on disk)
+	 * @param $bModelOnly boolean Whether or not to allow loading a data model with no corresponding DB 
+	 * @return none
+	 */    
+	public function InitDataModel($oConfig, $bModelOnly = true, $bUseCache = false)
+	{
+		require_once(APPROOT.'/core/log.class.inc.php');
+		require_once(APPROOT.'/core/kpi.class.inc.php');
+		require_once(APPROOT.'/core/coreexception.class.inc.php');
+		require_once(APPROOT.'/core/dict.class.inc.php');
+		require_once(APPROOT.'/core/attributedef.class.inc.php');
+		require_once(APPROOT.'/core/filterdef.class.inc.php');
+		require_once(APPROOT.'/core/stimulus.class.inc.php');
+		require_once(APPROOT.'/core/MyHelpers.class.inc.php');
+		require_once(APPROOT.'/core/oql/expression.class.inc.php');
+		require_once(APPROOT.'/core/cmdbsource.class.inc.php');
+		require_once(APPROOT.'/core/sqlquery.class.inc.php');
+		require_once(APPROOT.'/core/sqlobjectquery.class.inc.php');
+		require_once(APPROOT.'/core/sqlunionquery.class.inc.php');
+		require_once(APPROOT.'/core/dbobject.class.php');
+		require_once(APPROOT.'/core/dbsearch.class.php');
+		require_once(APPROOT.'/core/dbobjectset.class.php');
+		require_once(APPROOT.'/application/cmdbabstract.class.inc.php');
+		require_once(APPROOT.'/core/userrights.class.inc.php');
+		require_once(APPROOT.'/setup/moduleinstallation.class.inc.php');
+	
+		$sConfigFile = $oConfig->GetLoadedFile();
+		if (strlen($sConfigFile) > 0)
+		{
+			$this->log_info("MetaModel::Startup from $sConfigFile (ModelOnly = $bModelOnly)");
+		}
+		else
+		{
+			$this->log_info("MetaModel::Startup (ModelOnly = $bModelOnly)");
+		}
+	
+		if (!$bUseCache)
+		{
+			// Reset the cache for the first use !
+			MetaModel::ResetCache(md5(APPROOT).'-'.$this->sTargetEnv);
+		}
+	
+		MetaModel::Startup($oConfig, $bModelOnly, $bUseCache, false /* $bTraceSourceFiles */, $this->sTargetEnv);
+		
+		if ($this->oExtensionsMap === null)
+		{
+			$this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv);
+		}
+	}
+	
+	/**
+	 * Analyzes the current installation and the possibilities
+	 * 
+	 * @param Config $oConfig Defines the target environment (DB)
+	 * @param mixed $modulesPath Either a single string or an array of absolute paths
+	 * @param bool  $bAbortOnMissingDependency ...
+	 * @param hash $aModulesToLoad List of modules to search for, defaults to all if ommitted
+	 * @return hash Array with the following format:
+	 * array =>
+	 *     'iTop' => array(
+	 *         'version_db' => ... (could be empty in case of a fresh install)
+	 *         'version_code => ...
+	 *     )
+	 *     <module_name> => array(
+	 *         'version_db' => ...  
+	 *         'version_code' => ...  
+	 *         'install' => array(
+	 *             'flag' => SETUP_NEVER | SETUP_OPTIONAL | SETUP_MANDATORY
+	 *             'message' => ...  
+	 *         )   
+	 *         'uninstall' => array(
+	 *             'flag' => SETUP_NEVER | SETUP_OPTIONAL | SETUP_MANDATORY
+	 *             'message' => ...  
+	 *         )   
+	 *         'label' => ...  
+	 *         'dependencies' => array(<module1>, <module2>, ...)  
+	 *         'visible' => true | false
+	 *     )
+	 * )
+	 */     
+	public function AnalyzeInstallation($oConfig, $modulesPath, $bAbortOnMissingDependency = false, $aModulesToLoad = null)
+	{
+		$aRes = array(
+			ROOT_MODULE => array(
+				'version_db' => '',
+				'name_db' => '',
+				'version_code' => ITOP_VERSION.'.'.ITOP_REVISION,
+				'name_code' => ITOP_APPLICATION,
+			)
+		);
+	
+		$aDirs = is_array($modulesPath) ? $modulesPath : array($modulesPath);
+		$aModules = ModuleDiscovery::GetAvailableModules($aDirs, $bAbortOnMissingDependency, $aModulesToLoad);
+		foreach($aModules as $sModuleId => $aModuleInfo)
+		{
+			list($sModuleName, $sModuleVersion) = ModuleDiscovery::GetModuleName($sModuleId);
+			if ($sModuleName == '')
+			{
+				throw new Exception("Missing name for the module: '$sModuleId'");
+			}
+			if ($sModuleVersion == '')
+			{
+				// The version must not be empty (it will be used as a criteria to determine wether a module has been installed or not)
+				//throw new Exception("Missing version for the module: '$sModuleId'");
+				$sModuleVersion  = '1.0.0';
+			}
+	
+			$sModuleAppVersion = $aModuleInfo['itop_version'];
+			$aModuleInfo['version_db'] = '';
+			$aModuleInfo['version_code'] = $sModuleVersion;
+	
+			if (!in_array($sModuleAppVersion, array('1.0.0', '1.0.1', '1.0.2')))
+			{
+				// This module is NOT compatible with the current version
+					$aModuleInfo['install'] = array(
+						'flag' => MODULE_ACTION_IMPOSSIBLE,
+						'message' => 'the module is not compatible with the current version of the application'
+					);
+			}
+			elseif ($aModuleInfo['mandatory'])
+			{
+				$aModuleInfo['install'] = array(
+					'flag' => MODULE_ACTION_MANDATORY,
+					'message' => 'the module is part of the application'
+				);
+			}
+			else
+			{
+				$aModuleInfo['install'] = array(
+					'flag' => MODULE_ACTION_OPTIONAL,
+					'message' => ''
+				);
+			}
+			$aRes[$sModuleName] = $aModuleInfo;
+		}
+	
+		try
+		{
+			require_once(APPROOT.'/core/cmdbsource.class.inc.php');
+			CMDBSource::InitFromConfig($oConfig);
+			$aSelectInstall = CMDBSource::QueryToArray("SELECT * FROM ".$oConfig->Get('db_subname')."priv_module_install");
+		}
+		catch (MySQLException $e)
+		{
+			// No database or erroneous information
+			$aSelectInstall = array();
+		}
+	
+		// Build the list of installed module (get the latest installation)
+		//
+		$aInstallByModule = array(); // array of <module> => array ('installed' => timestamp, 'version' => <version>)
+		$iRootId = 0;
+		foreach ($aSelectInstall as $aInstall)
+		{
+			if (($aInstall['parent_id'] == 0) && ($aInstall['name'] != 'datamodel'))
+			{
+				// Root module, what is its ID ?
+				$iId = (int) $aInstall['id'];
+				if ($iId > $iRootId)
+				{
+					$iRootId = $iId;
+				}
+			}
+		}
+		
+		foreach ($aSelectInstall as $aInstall)
+		{
+			//$aInstall['comment']; // unsused
+			$iInstalled = strtotime($aInstall['installed']);
+			$sModuleName = $aInstall['name'];
+			$sModuleVersion = $aInstall['version'];
+			if ($sModuleVersion == '')
+			{
+				// Though the version cannot be empty in iTop 2.0, it used to be possible
+				// therefore we have to put something here or the module will not be considered
+				// as being installed
+				$sModuleVersion = '0.0.0';
+			}
+	
+			if ($aInstall['parent_id'] == 0)
+			{
+				$sModuleName = ROOT_MODULE;
+			}
+			else if($aInstall['parent_id'] != $iRootId)
+			{
+				// Skip all modules belonging to previous installations
+				continue;
+			}
+	
+			if (array_key_exists($sModuleName, $aInstallByModule))
+			{
+				if ($iInstalled < $aInstallByModule[$sModuleName]['installed'])
+				{
+					continue;
+				}
+			}
+	
+			if ($aInstall['parent_id'] == 0)
+			{
+				$aRes[$sModuleName]['version_db'] = $sModuleVersion;
+				$aRes[$sModuleName]['name_db'] = $aInstall['name'];
+			}
+	
+			$aInstallByModule[$sModuleName]['installed'] = $iInstalled;
+			$aInstallByModule[$sModuleName]['version'] = $sModuleVersion;
+		}
+	
+		// Adjust the list of proposed modules
+		//
+		foreach ($aInstallByModule as $sModuleName => $aModuleDB)
+		{
+			if ($sModuleName == ROOT_MODULE) continue; // Skip the main module
+				
+			if (!array_key_exists($sModuleName, $aRes))
+			{
+				// A module was installed, it is not proposed in the new build... skip 
+				continue;
+			}
+			$aRes[$sModuleName]['version_db'] = $aModuleDB['version'];
+	
+			if ($aRes[$sModuleName]['install']['flag'] == MODULE_ACTION_MANDATORY)
+			{
+				$aRes[$sModuleName]['uninstall'] = array(
+					'flag' => MODULE_ACTION_IMPOSSIBLE,
+					'message' => 'the module is part of the application'
+				);
+			}
+			else
+			{
+				$aRes[$sModuleName]['uninstall'] = array(
+					'flag' => MODULE_ACTION_OPTIONAL,
+					'message' => ''
+				);
+			}
+		}
+	
+		return $aRes;
+	}
+
+
+	public function WriteConfigFileSafe($oConfig)
+	{
+		self::MakeDirSafe(APPCONF);
+		self::MakeDirSafe(APPCONF.$this->sTargetEnv);
+		
+		$sTargetConfigFile = APPCONF.$this->sTargetEnv.'/'.ITOP_CONFIG_FILE;
+		
+		// Write the config file
+		@chmod($sTargetConfigFile, 0770); // In case it exists: RWX for owner and group, nothing for others
+		$oConfig->WriteToFile($sTargetConfigFile);
+		@chmod($sTargetConfigFile, 0440); // Read-only for owner and group, nothing for others
+	}
+
+	/**
+	 * Return an array with extra directories to scan for extensions/modules to install
+	 * @return string[]
+	 */
+	protected function GetExtraDirsToScan()
+	{
+		// Do nothing, overload this method if needed
+		return array();
+	}
+	
+	/**
+	 * Decide whether or not the given extension is selected for installation
+	 * @param iTopExtension $oExtension
+	 * @return boolean
+	 */
+	protected function IsExtensionSelected(iTopExtension $oExtension)
+	{
+		return ($oExtension->sSource == iTopExtension::SOURCE_REMOTE);
+	}
+	
+	/**
+	 * Get the installed modules (only the installed ones)	
+	 */	
+	protected function GetMFModulesToCompile($sSourceEnv, $sSourceDir)
+	{
+		$sSourceDirFull = APPROOT.$sSourceDir;
+		if (!is_dir($sSourceDirFull))
+		{
+			throw new Exception("The source directory '$sSourceDirFull' does not exist (or could not be read)");
+		}
+		$aDirsToCompile = array($sSourceDirFull);
+		if (is_dir(APPROOT.'extensions'))
+		{
+			$aDirsToCompile[] = APPROOT.'extensions';
+		}
+		$sExtraDir = APPROOT.'data/'.$this->sTargetEnv.'-modules/';
+		if (is_dir($sExtraDir))
+		{
+			$aDirsToCompile[] = $sExtraDir;
+		}
+
+		$aExtraDirs = $this->GetExtraDirsToScan($aDirsToCompile);
+		$aDirsToCompile = array_merge($aDirsToCompile, $aExtraDirs);
+				
+		$aRet = array();
+
+		// Determine the installed modules and extensions
+		//
+		$oSourceConfig = new Config(APPCONF.$sSourceEnv.'/'.ITOP_CONFIG_FILE);
+		$oSourceEnv = new RunTimeEnvironment($sSourceEnv);
+		$aAvailableModules = $oSourceEnv->AnalyzeInstallation($oSourceConfig, $aDirsToCompile);
+		
+		// Actually read the modules available for the target environment,
+		// but get the selection from the source environment and finally
+		// mark as (automatically) chosen alll the "remote" modules present in the
+		// target environment (data/<target-env>-modules)
+		// The actual choices will be recorded by RecordInstallation below
+		$this->oExtensionsMap = new iTopExtensionsMap($this->sTargetEnv, true, $aExtraDirs);
+		$this->oExtensionsMap->LoadChoicesFromDatabase($oSourceConfig);
+		foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension)
+		{
+			if($this->IsExtensionSelected($oExtension))
+			{
+				$this->oExtensionsMap->MarkAsChosen($oExtension->sCode);
+			}
+		}
+
+		// Do load the required modules
+		//
+		$oDictModule = new MFDictModule('dictionaries', 'iTop Dictionaries', APPROOT.'dictionaries');
+		$aRet[$oDictModule->GetName()] = $oDictModule;
+		
+		$oFactory = new ModelFactory($aDirsToCompile);
+		$sDeltaFile = APPROOT.'core/datamodel.core.xml';
+		if (file_exists($sDeltaFile))
+		{
+			$oCoreModule = new MFCoreModule('core', 'Core Module', $sDeltaFile);
+			$aRet[$oCoreModule->GetName()] = $oCoreModule;
+		}
+		$sDeltaFile = APPROOT.'application/datamodel.application.xml';
+		if (file_exists($sDeltaFile))
+		{
+			$oApplicationModule = new MFCoreModule('application', 'Application Module', $sDeltaFile);
+			$aRet[$oApplicationModule->GetName()] = $oApplicationModule;
+		}
+		
+		$aModules = $oFactory->FindModules();
+		foreach($aModules as $oModule)
+		{
+			$sModule = $oModule->GetName();
+			$sModuleRootDir = $oModule->GetRootDir();
+			$bIsExtra = $this->oExtensionsMap->ModuleIsChosenAsPartOfAnExtension($sModule, iTopExtension::SOURCE_REMOTE);
+			if (array_key_exists($sModule, $aAvailableModules)) 
+			{
+				if (($aAvailableModules[$sModule]['version_db'] != '') ||  $bIsExtra && !$oModule->IsAutoSelect()) //Extra modules are always unless they are 'AutoSelect'
+				{
+					$aRet[$oModule->GetName()] = $oModule;
+				}
+			}
+		}
+		
+		// Now process the 'AutoSelect' modules
+		do
+		{
+			// Loop while new modules are added...
+			$bModuleAdded = false;
+			foreach($aModules as $oModule)
+			{
+				if (!array_key_exists($oModule->GetName(), $aRet) && $oModule->IsAutoSelect())
+				{
+					try
+					{
+						$bSelected = false;
+						SetupInfo::SetSelectedModules($aRet);
+						eval('$bSelected = ('.$oModule->GetAutoSelect().');');
+					}
+					catch(Exception $e)
+					{
+						$bSelected = false;
+					}
+					if ($bSelected)
+					{
+						$aRet[$oModule->GetName()] = $oModule; // store the Id of the selected module
+						$bModuleAdded  = true;
+					}
+				}
+			}
+		}
+		while($bModuleAdded);
+
+		$sDeltaFile = APPROOT.'data/'.$this->sTargetEnv.'.delta.xml';
+		if (file_exists($sDeltaFile))
+		{
+			$oDelta = new MFDeltaModule($sDeltaFile);
+			$aRet[$oDelta->GetName()] = $oDelta;
+		}
+
+		return $aRet;
+	}
+
+	/**
+	 * Compile the data model by imitating the given environment
+	 * The list of modules to be installed in the target environment is:
+	 *  - the list of modules present in the "source_dir" (defined by the source environment) which are marked as "installed" in the source environment's database
+	 *  - plus the list of modules present in the "extra" directory of the target environment: data/<target_environment>-modules/
+	 * @param string $sSourceEnv The name of the source environment to 'imitate'
+	 * @param bool $bUseSymLinks Whether to create symbolic links instead of copies
+	 * @return string[]
+	 */
+	public function CompileFrom($sSourceEnv, $bUseSymLinks = false)
+	{
+		$oSourceConfig = new Config(utils::GetConfigFilePath($sSourceEnv));
+		$sSourceDir = $oSourceConfig->Get('source_dir');
+
+		$sSourceDirFull = APPROOT.$sSourceDir;
+		// Do load the required modules
+		//
+		$oFactory = new ModelFactory($sSourceDirFull);
+		$aModulesToCompile = $this->GetMFModulesToCompile($sSourceEnv, $sSourceDir);
+		foreach($aModulesToCompile as $oModule)
+		{
+			if ($oModule instanceof MFDeltaModule)
+			{
+				// Just before loading the delta, let's save an image of the datamodel
+				// in case there is no delta the operation will be done after the end of the loop
+				$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml');
+			}
+			$oFactory->LoadModule($oModule);
+		}
+		
+
+		if ($oModule instanceof MFDeltaModule)
+		{
+			// A delta was loaded, let's save a second copy of the datamodel
+			$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'-with-delta.xml');
+		}
+		else
+		{
+			// No delta was loaded, let's save the datamodel now
+			$oFactory->SaveToFile(APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml');
+		}
+
+		$sTargetDir = APPROOT.'env-'.$this->sTargetEnv;
+		self::MakeDirSafe($sTargetDir);
+		$bSkipTempDir = ($this->sFinalEnv != $this->sTargetEnv); // No need for a temporary directory if sTargetEnv is already a temporary directory
+		$oMFCompiler = new MFCompiler($oFactory);
+		$oMFCompiler->Compile($sTargetDir, null, $bUseSymLinks, $bSkipTempDir);
+
+		$sCacheDir = APPROOT.'data/cache-'.$this->sTargetEnv;
+		SetupUtils::builddir($sCacheDir);
+		SetupUtils::tidydir($sCacheDir);
+
+		MetaModel::ResetCache(md5(APPROOT).'-'.$this->sTargetEnv);
+
+		return array_keys($aModulesToCompile);
+	}
+
+	/**
+	 * Helper function to create the database structure
+	 * @return boolean true on success, false otherwise
+	 */
+	public function CreateDatabaseStructure(Config $oConfig, $sMode)
+	{
+		if (strlen($oConfig->Get('db_subname')) > 0)
+		{
+			$this->log_info("Creating the structure in '".$oConfig->Get('db_name')."' (table names prefixed by '".$oConfig->Get('db_subname')."').");
+		}
+		else
+		{
+			$this->log_info("Creating the structure in '".$oConfig->Get('db_subname')."'.");
+		}
+	
+		//MetaModel::CheckDefinitions();
+		if ($sMode == 'install')
+		{
+			if (!MetaModel::DBExists(/* bMustBeComplete */ false))
+			{
+				MetaModel::DBCreate(array($this, 'LogQueryCallback'));
+				$this->log_ok("Database structure successfully created.");
+			}
+			else
+			{
+				if (strlen($oConfig->Get('db_subname')) > 0)
+				{
+					throw new Exception("Error: found iTop tables into the database '".$oConfig->Get('db_name')."' (prefix: '".$oConfig->Get('db_subname')."'). Please, try selecting another database instance or specify another prefix to prevent conflicting table names.");
+				}
+				else
+				{
+					throw new Exception("Error: found iTop tables into the database '".$oConfig->Get('db_name')."'. Please, try selecting another database instance or specify a prefix to prevent conflicting table names.");
+				}
+			}
+		}
+		else
+		{
+			if (MetaModel::DBExists(/* bMustBeComplete */ false))
+			{
+				// Have it work fine even if the DB has been set in read-only mode for the users
+				// (fix copied from RunTimeEnvironment::RecordInstallation)
+				$iPrevAccessMode = $oConfig->Get('access_mode');
+				$oConfig->Set('access_mode', ACCESS_FULL);
+
+				MetaModel::DBCreate(array($this, 'LogQueryCallback'));
+				$this->log_ok("Database structure successfully updated.");
+	
+				// Check (and update only if it seems needed) the hierarchical keys
+				ob_start();
+				MetaModel::CheckHKeys(false /* bDiagnosticsOnly */, true /* bVerbose*/, true /* bForceUpdate */); // Since in 1.2-beta the detection was buggy, let's force the rebuilding of HKeys
+				$sFeedback = ob_get_clean();
+				$this->log_ok("Hierchical keys rebuilt: $sFeedback");
+	
+				// Check (and fix) data sync configuration
+				ob_start();
+				MetaModel::CheckDataSources(false /*$bDiagnostics*/, true/*$bVerbose*/);
+				$sFeedback = ob_get_clean();
+				$this->log_ok("Data sources checked: $sFeedback");
+
+				// Fix meta enums
+				ob_start();
+				MetaModel::RebuildMetaEnums(true /*bVerbose*/);
+				$sFeedback = ob_get_clean();
+				$this->log_ok("Meta enums rebuilt: $sFeedback");
+
+				// Restore the previous access mode
+				$oConfig->Set('access_mode', $iPrevAccessMode);
+			}
+			else
+			{
+				if (strlen($oConfig->Get('db_subname')) > 0)
+				{
+					throw new Exception("Error: No previous instance of iTop found into the database '".$oConfig->Get('db_name')."' (prefix: '".$oConfig->Get('db_subname')."'). Please, try selecting another database instance.");
+				}
+				else
+				{
+					throw new Exception("Error: No previous instance of iTop found into the database '".$oConfig->Get('db_name')."'. Please, try selecting another database instance.");
+				}
+			}
+		}
+		return true;
+	}
+
+	public function UpdatePredefinedObjects()
+	{
+		// Have it work fine even if the DB has been set in read-only mode for the users
+		$oConfig = MetaModel::GetConfig();
+		$iPrevAccessMode = $oConfig->Get('access_mode');
+		$oConfig->Set('access_mode', ACCESS_FULL);
+
+		// Constant classes (e.g. User profiles)
+		//
+		foreach (MetaModel::GetClasses() as $sClass)
+		{
+			$aPredefinedObjects = call_user_func(array(
+				$sClass,
+				'GetPredefinedObjects'
+			));
+			if ($aPredefinedObjects != null)
+			{
+				$this->log_info("$sClass::GetPredefinedObjects() returned " . count($aPredefinedObjects) . " elements.");
+				
+				// Create/Delete/Update objects of this class,
+				// according to the given constant values
+				//
+				$aDBIds = array();
+				$oAll = new DBObjectSet(new DBObjectSearch($sClass));
+				while ($oObj = $oAll->Fetch())
+				{
+					if (array_key_exists($oObj->GetKey(), $aPredefinedObjects))
+					{
+						$aObjValues = $aPredefinedObjects[$oObj->GetKey()];
+						foreach ($aObjValues as $sAttCode => $value)
+						{
+							$oObj->Set($sAttCode, $value);
+						}
+						$oObj->DBUpdate();
+						$aDBIds[$oObj->GetKey()] = true;
+					}
+					else
+					{
+						$oObj->DBDelete();
+					}
+				}
+				foreach ($aPredefinedObjects as $iRefId => $aObjValues)
+				{
+					if (! array_key_exists($iRefId, $aDBIds))
+					{
+						$oNewObj = MetaModel::NewObject($sClass);
+						$oNewObj->SetKey($iRefId);
+						foreach ($aObjValues as $sAttCode => $value)
+						{
+							$oNewObj->Set($sAttCode, $value);
+						}
+						$oNewObj->DBInsert();
+					}
+				}
+			}
+		}
+
+		// Restore the previous access mode
+		$oConfig->Set('access_mode', $iPrevAccessMode);
+	}
+	
+	public function RecordInstallation(Config $oConfig, $sDataModelVersion, $aSelectedModuleCodes, $aSelectedExtensionCodes, $sShortComment = null)
+	{
+		// Have it work fine even if the DB has been set in read-only mode for the users
+		$iPrevAccessMode = $oConfig->Get('access_mode');
+		$oConfig->Set('access_mode', ACCESS_FULL);
+
+		if (CMDBSource::DBName() == '')
+		{		
+			// In case this has not yet been done
+			CMDBSource::InitFromConfig($oConfig);
+		}
+
+		if ($sShortComment === null)
+		{
+			$sShortComment = 'Done by the setup program';
+		}
+		$sMainComment = $sShortComment."\nBuilt on ".ITOP_BUILD_DATE;
+		
+		// Record datamodel version
+		$aData = array(
+			'source_dir' => $oConfig->Get('source_dir'),
+		);
+		$iInstallationTime = time(); // Make sure that all modules record the same installation time
+		$oInstallRec = new ModuleInstallation();
+		$oInstallRec->Set('name', DATAMODEL_MODULE);
+		$oInstallRec->Set('version', $sDataModelVersion);
+		$oInstallRec->Set('comment', json_encode($aData));
+		$oInstallRec->Set('parent_id', 0); // root module
+		$oInstallRec->Set('installed', $iInstallationTime);
+		$iMainItopRecord = $oInstallRec->DBInsertNoReload();
+		
+		// Record main installation
+		$oInstallRec = new ModuleInstallation();
+		$oInstallRec->Set('name', ITOP_APPLICATION);
+		$oInstallRec->Set('version', ITOP_VERSION.'.'.ITOP_REVISION);
+		$oInstallRec->Set('comment', $sMainComment);
+		$oInstallRec->Set('parent_id', 0); // root module
+		$oInstallRec->Set('installed', $iInstallationTime);
+		$iMainItopRecord = $oInstallRec->DBInsertNoReload();
+	
+		
+		// Record installed modules and extensions
+		//
+		$aAvailableExtensions = array();
+		$aAvailableModules = $this->AnalyzeInstallation($oConfig, $this->GetBuildDir());
+		foreach($aSelectedModuleCodes as $sModuleId)
+		{
+			$aModuleData = $aAvailableModules[$sModuleId];
+			$sName = $sModuleId;
+			$sVersion = $aModuleData['version_code'];
+			$aComments = array();
+			$aComments[] = $sShortComment;
+			if ($aModuleData['mandatory'])
+			{
+				$aComments[] = 'Mandatory';
+			}
+			else
+			{
+				$aComments[] = 'Optional';
+			}
+			if ($aModuleData['visible'])
+			{
+				$aComments[] = 'Visible (during the setup)';
+			}
+			else
+			{
+				$aComments[] = 'Hidden (selected automatically)';
+			}
+			foreach ($aModuleData['dependencies'] as $sDependOn)
+			{
+				$aComments[] = "Depends on module: $sDependOn";
+			}
+			$sComment = implode("\n", $aComments);
+	
+			$oInstallRec = new ModuleInstallation();
+			$oInstallRec->Set('name', $sName);
+			$oInstallRec->Set('version', $sVersion);
+			$oInstallRec->Set('comment', $sComment);
+			$oInstallRec->Set('parent_id', $iMainItopRecord);
+			$oInstallRec->Set('installed', $iInstallationTime);
+			$oInstallRec->DBInsertNoReload();
+		}
+		
+		if ($this->oExtensionsMap)
+		{
+			// Mark as chosen the selected extensions code passed to us
+			// Note: some other extensions may already be marked as chosen
+			foreach($this->oExtensionsMap->GetAllExtensions() as $oExtension)
+			{
+				if (in_array($oExtension->sCode, $aSelectedExtensionCodes))
+				{
+					$this->oExtensionsMap->MarkAsChosen($oExtension->sCode);
+				}
+			}
+			
+			foreach($this->oExtensionsMap->GetChoices() as $oExtension)
+			{
+				$oInstallRec = new ExtensionInstallation();
+				$oInstallRec->Set('code', $oExtension->sCode);
+				$oInstallRec->Set('label', $oExtension->sLabel);
+				$oInstallRec->Set('version', $oExtension->sVersion);
+				$oInstallRec->Set('source',  $oExtension->sSource);
+				$oInstallRec->Set('installed', $iInstallationTime);
+				$oInstallRec->DBInsertNoReload();
+			}
+		}
+
+		// Restore the previous access mode
+		$oConfig->Set('access_mode', $iPrevAccessMode);
+
+		// Database is created, installation has been tracked into it
+		return true;	
+	}
+	
+	public function GetApplicationVersion(Config $oConfig)
+	{
+		$aResult = false;
+		try
+		{
+			require_once(APPROOT.'/core/cmdbsource.class.inc.php');
+			CMDBSource::InitFromConfig($oConfig);
+			$sSQLQuery = "SELECT * FROM ".$oConfig->Get('db_subname')."priv_module_install";
+			$aSelectInstall = CMDBSource::QueryToArray($sSQLQuery);
+		}
+		catch (MySQLException $e)
+		{
+			// No database or erroneous information
+			$this->log_error('Can not connect to the database: host: '.$oConfig->Get('db_host').', user:'.$oConfig->Get('db_user').', pwd:'.$oConfig->Get('db_pwd').', db name:'.$oConfig->Get('db_name'));
+			$this->log_error('Exception '.$e->getMessage());
+			return false;
+		}
+	
+		// Scan the list of installed modules to get the version of the 'ROOT' module which holds the main application version
+		foreach ($aSelectInstall as $aInstall)
+		{
+			$sModuleVersion = $aInstall['version'];
+			if ($sModuleVersion == '')
+			{
+				// Though the version cannot be empty in iTop 2.0, it used to be possible
+				// therefore we have to put something here or the module will not be considered
+				// as being installed
+				$sModuleVersion = '0.0.0';
+			}
+			
+			if ($aInstall['parent_id'] == 0)
+			{
+				if ($aInstall['name'] == DATAMODEL_MODULE)
+				{
+					$aResult['datamodel_version'] = $sModuleVersion;
+					$aComments = json_decode($aInstall['comment'], true);
+					if (is_array($aComments))
+					{
+						$aResult = array_merge($aResult, $aComments);
+					}
+				}
+				else
+				{
+					$aResult['product_name'] = $aInstall['name'];
+					$aResult['product_version'] = $sModuleVersion;
+				}
+			}
+		}
+		if (!array_key_exists('datamodel_version', $aResult))
+		{
+			// Versions prior to 2.0 did not record the version of the datamodel
+			// so assume that the datamodel version is equal to the application version
+			$aResult['datamodel_version'] = $aResult['product_version'];
+		}
+		$this->log_info("GetApplicationVersion returns: product_name: ".$aResult['product_name'].', product_version: '.$aResult['product_version']);
+		return $aResult;	
+	}
+
+	public static function MakeDirSafe($sDir)
+	{
+		if (!is_dir($sDir))
+		{
+			if (!@mkdir($sDir))
+			{
+				throw new Exception("Failed to create directory '$sDir', please check that the web server process has enough rights to create the directory.");
+			}
+			@chmod($sDir, 0770); // RWX for owner and group, nothing for others
+		}
+	}
+
+	/**
+	 * Wrappers for logging into the setup log files	
+	 */	
+	protected function log_error($sText)
+	{
+		SetupPage::log_error($sText);
+	}
+	protected function log_warning($sText)
+	{
+		SetupPage::log_warning($sText);
+	}
+	protected function log_info($sText)
+	{
+		SetupPage::log_info($sText);
+	}
+	protected function log_ok($sText)
+	{
+		SetupPage::log_ok($sText);
+	}
+
+	/**
+	 * Writes queries run by the setup in a SQL file
+	 *
+	 * @param string $sQuery
+	 *
+	 * @since 2.5 #1001 utf8mb4 switch
+	 * @uses \SetupUtils::GetSetupQueriesFilePath()
+	 */
+	protected function log_db_query($sQuery)
+	{
+		$sSetupQueriesFilePath = SetupUtils::GetSetupQueriesFilePath();
+		$hSetupQueriesFile = @fopen($sSetupQueriesFilePath, 'a');
+		if ($hSetupQueriesFile !== false)
+		{
+			fwrite($hSetupQueriesFile, "$sQuery\n");
+			fclose($hSetupQueriesFile);
+		}
+	}
+	
+	public function GetCurrentDataModelVersion()
+	{
+		$oSearch = DBObjectSearch::FromOQL("SELECT ModuleInstallation WHERE name='".DATAMODEL_MODULE."'");
+		$oSet = new DBObjectSet($oSearch, array('installed' => false));
+		$oLatestDM = $oSet->Fetch();
+		if ($oLatestDM == null)
+		{
+			return '0.0.0';
+		}
+		return $oLatestDM->Get('version');
+	}
+
+	public function Commit()
+	{
+		if ($this->sFinalEnv != $this->sTargetEnv)
+		{
+			if (file_exists(APPROOT.'data/'.$this->sTargetEnv.'.delta.xml'))
+			{
+				if (file_exists(APPROOT.'data/'.$this->sFinalEnv.'.delta.xml'))
+				{
+					// Make a "previous" file
+					copy(
+						APPROOT.'data/'.$this->sTargetEnv.'.delta.xml',
+						APPROOT.'data/'.$this->sFinalEnv.'.delta.prev.xml'
+					);
+				}
+				$this->CommitFile(
+					APPROOT.'data/'.$this->sTargetEnv.'.delta.xml',
+					APPROOT.'data/'.$this->sFinalEnv.'.delta.xml'
+				);
+			}
+			$this->CommitFile(
+				APPROOT.'data/datamodel-'.$this->sTargetEnv.'.xml',
+				APPROOT.'data/datamodel-'.$this->sFinalEnv.'.xml'
+			);
+			$this->CommitFile(
+				APPROOT.'data/datamodel-'.$this->sTargetEnv.'-with-delta.xml',
+				APPROOT.'data/datamodel-'.$this->sFinalEnv.'-with-delta.xml',
+				false
+			);
+			$this->CommitDir(
+				APPROOT.'data/'.$this->sTargetEnv.'-modules/',
+				APPROOT.'data/'.$this->sFinalEnv.'-modules/',
+				false
+			);
+			$this->CommitDir(
+				APPROOT.'data/cache-'.$this->sTargetEnv,
+				APPROOT.'data/cache-'.$this->sFinalEnv,
+				false
+			);
+			$this->CommitDir(
+				APPROOT.'env-'.$this->sTargetEnv,
+				APPROOT.'env-'.$this->sFinalEnv,
+                true,
+                false
+			);
+
+			// Move the config file
+			//
+			$sTargetConfig = APPCONF.$this->sTargetEnv.'/config-itop.php';
+			$sFinalConfig = APPCONF.$this->sFinalEnv.'/config-itop.php';
+			@chmod($sFinalConfig, 0770); // In case it exists: RWX for owner and group, nothing for others
+			$this->CommitFile($sTargetConfig, $sFinalConfig);
+			@chmod($sFinalConfig, 0440); // Read-only for owner and group, nothing for others
+			@rmdir(dirname($sTargetConfig)); // Cleanup the temporary build dir if empty
+
+			MetaModel::ResetCache(md5(APPROOT).'-'.$this->sFinalEnv);
+		}
+	}
+
+	/**
+	 * Overwrite or create the destination file
+	 *
+	 * @param $sSource
+	 * @param $sDest
+	 * @param bool $bSourceMustExist
+	 * @throws Exception
+	 */
+	protected function CommitFile($sSource, $sDest, $bSourceMustExist = true)
+	{
+		if (file_exists($sSource))
+		{
+			SetupUtils::builddir(dirname($sDest));
+			if (file_exists($sDest))
+			{
+				$bRes = @unlink($sDest);
+				if (!$bRes)
+				{
+					throw new Exception('Commit - Failed to cleanup destination file: '.$sDest);
+				}
+			}
+			rename($sSource, $sDest);
+		}
+		else
+		{
+			// The file does not exist
+			if ($bSourceMustExist)
+			{
+				throw new Exception('Commit - Missing file: '.$sSource);
+			}
+			else
+			{
+				// Align the destination with the source... make sure there is NO file
+				if (file_exists($sDest))
+				{
+					$bRes = @unlink($sDest);
+					if (!$bRes)
+					{
+						throw new Exception('Commit - Failed to cleanup destination file: '.$sDest);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Overwrite or create the destination directory
+	 *
+	 * @param $sSource
+	 * @param $sDest
+	 * @param boolean $bSourceMustExist
+     * @param boolean $bRemoveSource If true $sSource will be removed, otherwise $sSource will just be emptied
+	 * @throws Exception
+	 */
+	protected function CommitDir($sSource, $sDest, $bSourceMustExist = true, $bRemoveSource = true)
+	{
+		if (file_exists($sSource))
+		{
+			SetupUtils::movedir($sSource, $sDest, $bRemoveSource);
+		}
+		else
+		{
+			// The file does not exist
+			if ($bSourceMustExist)
+			{
+				throw new Exception('Commit - Missing directory: '.$sSource);
+			}
+			else
+			{
+				// Align the destination with the source... make sure there is NO file
+				if (file_exists($sDest))
+				{
+					SetupUtils::rrmdir($sDest);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Call the given handler method for all selected modules having an installation handler
+	 * @param array[] $aAvailableModules
+	 * @param string[] $aSelectedModules
+	 * @param string $sHandlerName
+	 */
+	public function CallInstallerHandlers($aAvailableModules, $aSelectedModules, $sHandlerName)
+	{
+	    foreach($aAvailableModules as $sModuleId => $aModule)
+	    {
+	        if (($sModuleId != ROOT_MODULE) && in_array($sModuleId, $aSelectedModules) &&
+	            isset($aAvailableModules[$sModuleId]['installer']) )
+	        {
+	            $sModuleInstallerClass = $aAvailableModules[$sModuleId]['installer'];
+	            SetupPage::log_info("Calling Module Handler: $sModuleInstallerClass::$sHandlerName(oConfig, {$aModule['version_db']}, {$aModule['version_code']})");
+	            $aCallSpec = array($sModuleInstallerClass, $sHandlerName);
+	            if (is_callable($aCallSpec))
+	            {
+	               call_user_func_array($aCallSpec, array(MetaModel::GetConfig(), $aModule['version_db'], $aModule['version_code']));
+	            }
+	        }
+	    }
+	}
+	
+	/**
+	 * Load data from XML files for the selected modules (structural data and/or sample data)
+	 * @param array[] $aAvailableModules All available modules and their definition
+	 * @param string[] $aSelectedModules List of selected modules
+	 * @param bool $bSampleData Wether or not to load sample data
+	 */
+	public function LoadData($aAvailableModules, $aSelectedModules, $bSampleData)
+	{
+	    $oDataLoader = new XMLDataLoader();
+	    
+	    CMDBObject::SetTrackInfo("Initialization");
+	    $oMyChange = CMDBObject::GetCurrentChange();
+	    
+	    SetupPage::log_info("starting data load session");
+	    $oDataLoader->StartSession($oMyChange);
+	    
+	    $aFiles = array();
+	    $aPreviouslyLoadedFiles = array();
+	    foreach($aAvailableModules as $sModuleId => $aModule)
+	    {
+	        if (($sModuleId != ROOT_MODULE))
+	        {
+	            $sRelativePath = 'env-'.$this->sTargetEnv.'/'.basename($aModule['root_dir']);
+	            // Load data only for selected AND newly installed modules
+	            if (in_array($sModuleId, $aSelectedModules))
+	            {
+	                if ($aModule['version_db'] != '')
+	                {
+	                    // Simulate the load of the previously loaded XML files to get the mapping of the keys
+	                    if ($bSampleData)
+	                    {
+	                        $aPreviouslyLoadedFiles = static::MergeWithRelativeDir($aPreviouslyLoadedFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
+	                        $aPreviouslyLoadedFiles = static::MergeWithRelativeDir($aPreviouslyLoadedFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.sample']);
+	                    }
+	                    else
+	                    {
+	                        // Load only structural data
+	                        $aPreviouslyLoadedFiles = static::MergeWithRelativeDir($aPreviouslyLoadedFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
+	                    }
+	                }
+	                else
+	                {
+	                    if ($bSampleData)
+	                    {
+	                        $aFiles = static::MergeWithRelativeDir($aFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
+	                        $aFiles = static::MergeWithRelativeDir($aFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.sample']);
+	                    }
+	                    else
+	                    {
+	                        // Load only structural data
+	                        $aFiles = static::MergeWithRelativeDir($aFiles, $sRelativePath, $aAvailableModules[$sModuleId]['data.struct']);
+	                    }
+	                }
+	            }
+	        }
+	    }
+	    
+	    // Simulate the load of the previously loaded files, in order to initialize
+	    // the mapping between the identifiers in the XML and the actual identifiers
+	    // in the current database
+	    foreach($aPreviouslyLoadedFiles as $sFileRelativePath)
+	    {
+	        $sFileName = APPROOT.$sFileRelativePath;
+	        SetupPage::log_info("Loading file: $sFileName (just to get the keys mapping)");
+	        if (empty($sFileName) || !file_exists($sFileName))
+	        {
+	            throw(new Exception("File $sFileName does not exist"));
+	        }
+	        
+	        $oDataLoader->LoadFile($sFileName, true);
+	        $sResult = sprintf("loading of %s done.", basename($sFileName));
+	        SetupPage::log_info($sResult);
+	    }
+	    
+	    foreach($aFiles as $sFileRelativePath)
+	    {
+	        $sFileName = APPROOT.$sFileRelativePath;
+	        SetupPage::log_info("Loading file: $sFileName");
+	        if (empty($sFileName) || !file_exists($sFileName))
+	        {
+	            throw(new Exception("File $sFileName does not exist"));
+	        }
+	        
+	        $oDataLoader->LoadFile($sFileName);
+	        $sResult = sprintf("loading of %s done.", basename($sFileName));
+	        SetupPage::log_info($sResult);
+	    }
+	    
+	    $oDataLoader->EndSession();
+	    SetupPage::log_info("ending data load session");
+	}
+	
+	/**
+	 * Merge two arrays of file names, adding the relative path to the files provided in the array to merge
+	 * @param string[] $aSourceArray
+	 * @param string $sBaseDir
+	 * @param string[] $aFilesToMerge
+	 * @return string[]
+	 */
+	protected static function MergeWithRelativeDir($aSourceArray, $sBaseDir, $aFilesToMerge)
+	{
+	    $aToMerge = array();
+	    foreach($aFilesToMerge as $sFile)
+	    {
+	        $aToMerge[] = $sBaseDir.'/'.$sFile;
+	    }
+	    return array_merge($aSourceArray, $aToMerge);
+	}
+	
+	/**
+	 * Check the MetaModel for some common pitfall (class name too long, classes requiring too many joins...)
+	 * The check takes about 900 ms for 200 classes
+	 * @throws Exception
+	 * @return string
+	 */
+    public function CheckMetaModel()
+    {
+        $iCount = 0;
+        $fStart = microtime(true);
+        foreach(MetaModel::GetClasses() as $sClass)
+        {
+            if (false == MetaModel::HasTable($sClass) && MetaModel::IsAbstract($sClass))
+            {
+                //if a class is not persisted and is abstract, the code below would crash. Needed by the class AbstractRessource. This is tolerable to skip this because we check the setup process integrity, not the datamodel integrity.
+                continue;
+            }
+
+            $oSearch = new DBObjectSearch($sClass);
+            $oSearch->SetShowObsoleteData(false);
+            $oSQLQuery = $oSearch->GetSQLQueryStructure(null, false);
+            $sViewName = MetaModel::DBGetView($sClass);
+            if (strlen($sViewName) > 64)
+            {
+                throw new Exception("Class name too long for class: '$sClass'. The name of the corresponding view ($sViewName) would exceed MySQL's limit for the name of a table (64 characters).");
+            }
+            $sTableName = MetaModel::DBGetTable($sClass);
+            if (strlen($sTableName) > 64)
+            {
+                throw new Exception("Table name too long for class: '$sClass'. The name of the corresponding MySQL table ($sTableName) would exceed MySQL's limit for the name of a table (64 characters).");
+            }
+            $iTableCount = $oSQLQuery->CountTables();
+            if ($iTableCount > 61)
+            {
+                throw new Exception("Class requiring too many tables: '$sClass'. The structure of the class ($sClass) would require a query with more than 61 JOINS (MySQL's limitation).");
+            }
+            $iCount++;
+        }
+        $fDuration = microtime(true) - $fStart;
+        
+        return sprintf("Checked %d classes in %.1f ms. No error found.\n", $iCount, $fDuration*1000.0);
+    }
+} // End of class
diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php
index a73fd38ea..b6210b469 100644
--- a/setup/setuppage.class.inc.php
+++ b/setup/setuppage.class.inc.php
@@ -1,305 +1,305 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Web page used for the setup
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT."/application/nicewebpage.class.inc.php");
-require_once(APPROOT."setup/modulediscovery.class.inc.php");
-require_once(APPROOT."setup/runtimeenv.class.inc.php");
-
-define('INSTALL_LOG_FILE', APPROOT.'/log/setup.log');
-
-class SetupPage extends NiceWebPage
-{
-    public function __construct($sTitle)
-    {
-        parent::__construct($sTitle);
-   		$this->add_linked_script("../js/jquery.blockUI.js");
-   		$this->add_linked_script("../setup/setup.js");
-        $this->add_style("
-body {
-	background-color: #eee;
-	margin: 0;
-	padding: 0;
-	font-size: 10pt;
-	overflow-y: auto;
-}
-#header {
-	width: 600px;
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 50px;
-	padding: 20px;
-	background: #f6f6f1;
-	height: 54px;
-	border-top: 1px solid #000;
-	border-left: 1px solid #000;
-	border-right: 1px solid #000;
-}
-#header img {
-	border: 0;
-	vertical-align: middle;
-	margin-right: 20px;
-}
-#header h1 {
-	vertical-align: middle;
-	height: 54px;
-	noline-height: 54px;
-	margin: 0;
-}
-#setup {
-	width: 600px;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 20px;
-	background-color: #fff;
-	border-left: 1px solid #000;
-	border-right: 1px solid #000;
-	border-bottom: 1px solid #000;
-}
-.center {
-	text-align: center;
-}
-
-h1 {
-	color: #555555;
-	font-size: 16pt;
-}
-h2 {
-	color: #000;
-	font-size: 14pt;
-}
-h3 {
-	color: #1C94C4;
-	font-size: 12pt;
-	font-weight: bold;
-}
-.next {
-	width: 100%;
-	text-align: right;
-}
-.v-spacer {
-	padding-top: 1em;
-}
-button {
-	margin-top: 1em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-p.info {
-	padding-left: 50px;
-	background: url(../images/info-mid.png) no-repeat left -5px;
-	min-height: 48px;
-}
-p.ok {
-	padding-left: 50px;
-	background: url(../images/clean-mid.png) no-repeat left -8px;
-	min-height: 48px;
-}
-p.warning {
-	padding-left: 50px;
-	background: url(../images/messagebox_warning-mid.png) no-repeat left -5px;
-	min-height: 48px;
-}
-p.error {
-	padding-left: 50px;
-	background: url(../images/stop-mid.png) no-repeat left -5px;
-	min-height: 48px;
-}
-td.label {
-	text-align: left;
-}
-label.read-only {
-	color: #666;
-	cursor: text;
-}
-td.input {
-	text-align: left;
-}
-table.formTable {
-	border: 0;
-	cellpadding: 2px;
-	cellspacing: 0;
-}
-.wizlabel, .wizinput {
-	color: #000;
-	font-size: 10pt;
-}
-.wizhelp {
-	color: #333;
-	font-size: 8pt;
-}
-#progress { 
-    border:1px solid #000000; 
-    width: 180px; 
-    height: 20px; 
-    line-height: 20px; 
-    text-align: center;
-    margin: 5px;
-}
-h3.clickable {
-	background: url(../images/plus.gif) no-repeat left;
-	padding-left:16px;
-	cursor: hand;	
-}
-h3.clickable.open {
-	background: url(../images/minus.gif) no-repeat left;
-	padding-left:16px;
-	cursor: hand;	
-}
-		");
-	}
-
-	/**
-	 * Overriden because the application is not fully loaded when the setup is being run
-	 */	 	
-	public function GetAbsoluteUrlAppRoot()
-	{
-		return '../';
-	}
-
-	/**
-	 * Overriden because the application is not fully loaded when the setup is being run
-	 */	 	
-	public function GetAbsoluteUrlModulesRoot()
-	{
-		return $this->GetAbsoluteUrlAppRoot().utils::GetCurrentEnvironment();
-	}
-
-	/**
-	 * Overriden because the application is not fully loaded when the setup is being run
-	 */	 	
-	function GetApplicationContext()
-	{
-		return '';
-	}
-
-	public function info($sText)
-	{
-		$this->add("<p class=\"info\">$sText</p>\n");
-		$this->log_info($sText);
-	}
-	
-	public function ok($sText)
-	{
-		$this->add("<p class=\"ok\">$sText</p>\n");
-		$this->log_ok($sText);
-	}
-	
-	public function warning($sText)
-	{
-		$this->add("<p class=\"warning\">$sText</p>\n");
-		$this->log_warning($sText);
-	}
-	
-	public function error($sText)
-	{
-		$this->add("<p class=\"error\">$sText</p>\n");
-		$this->log_error($sText);
-	}
-	
-	public function form($aData)
-	{
-		$this->add("<table class=\"formTable\">\n");
-		foreach($aData as $aRow)
-		{
-			$this->add("<tr>\n");
-			if (isset($aRow['label']) && isset($aRow['input']) && isset($aRow['help']))
-			{
-				$this->add("<td class=\"wizlabel\">{$aRow['label']}</td>\n");
-				$this->add("<td class=\"wizinput\">{$aRow['input']}</td>\n");
-				$this->add("<td class=\"wizhelp\">{$aRow['help']}</td>\n");
-			}
-			else if (isset($aRow['label']) && isset($aRow['help']))
-			{
-				$this->add("<td colspan=\"2\" class=\"wizlabel\">{$aRow['label']}</td>\n");
-				$this->add("<td class=\"wizhelp\">{$aRow['help']}</td>\n");
-			}
-			else if (isset($aRow['label']) && isset($aRow['input']))
-			{
-				$this->add("<td class=\"wizlabel\">{$aRow['label']}</td>\n");
-				$this->add("<td colspan=\"2\" class=\"wizinput\">{$aRow['input']}</td>\n");
-			}
-			else if (isset($aRow['label']))
-			{
-				$this->add("<td colspan=\"3\" class=\"wizlabel\">{$aRow['label']}</td>\n");
-			}
-			$this->add("</tr>\n");
-		}
-		$this->add("</table>\n");
-	}
-	
-	public function collapsible($sId, $sTitle, $aItems, $bOpen = true)
-	{
-		$this->add("<h3 class=\"clickable open\" id=\"{$sId}\">$sTitle</h3>");
-		$this->p('<ul id="'.$sId.'_list">');
-		foreach($aItems as $sItem)
-		{
-			$this->p("<li>$sItem</li>\n");
-		}		
-		$this->p('</ul>');
-		$this->add_ready_script("$('#{$sId}').click( function() { $(this).toggleClass('open'); $('#{$sId}_list').toggle();} );\n");
-		if (!$bOpen)
-		{
-			$this->add_ready_script("$('#{$sId}').toggleClass('open'); $('#{$sId}_list').toggle();\n");
-		}	
-	}
-	
-	public function output()
-	{
-		$this->s_content = "<div id=\"header\"><h1><a href=\"http://www.combodo.com/itop\" target=\"_blank\"><img title=\"iTop by Combodo\" src=\"../images/itop-logo.png?t=".utils::GetCacheBusterTimestamp()."\"></a>&nbsp;".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n</div><div id=\"setup\">{$this->s_content}\n</div>\n";
-		return parent::output();
-	}
-	
-	public static function log_error($sText)
-	{
-		self::log("Error - ".$sText);
-	}
-
-	public static function log_warning($sText)
-	{
-		self::log("Warning - ".$sText);
-	}
-
-	public static function log_info($sText)
-	{
-		self::log("Info - ".$sText);
-	}
-
-	public static function log_ok($sText)
-	{
-		self::log("Ok - ".$sText);
-	}
-
-	public static function log($sText)
-	{
-		$hLogFile = @fopen(INSTALL_LOG_FILE, 'a');
-		if ($hLogFile !== false)
-		{
-			$sDate = date('Y-m-d H:i:s');
-			fwrite($hLogFile, "$sDate - $sText\n");
-			fclose($hLogFile);
-		}
-	}
-} // End of class
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Web page used for the setup
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT."/application/nicewebpage.class.inc.php");
+require_once(APPROOT."setup/modulediscovery.class.inc.php");
+require_once(APPROOT."setup/runtimeenv.class.inc.php");
+
+define('INSTALL_LOG_FILE', APPROOT.'/log/setup.log');
+
+class SetupPage extends NiceWebPage
+{
+    public function __construct($sTitle)
+    {
+        parent::__construct($sTitle);
+   		$this->add_linked_script("../js/jquery.blockUI.js");
+   		$this->add_linked_script("../setup/setup.js");
+        $this->add_style("
+body {
+	background-color: #eee;
+	margin: 0;
+	padding: 0;
+	font-size: 10pt;
+	overflow-y: auto;
+}
+#header {
+	width: 600px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 50px;
+	padding: 20px;
+	background: #f6f6f1;
+	height: 54px;
+	border-top: 1px solid #000;
+	border-left: 1px solid #000;
+	border-right: 1px solid #000;
+}
+#header img {
+	border: 0;
+	vertical-align: middle;
+	margin-right: 20px;
+}
+#header h1 {
+	vertical-align: middle;
+	height: 54px;
+	noline-height: 54px;
+	margin: 0;
+}
+#setup {
+	width: 600px;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 20px;
+	background-color: #fff;
+	border-left: 1px solid #000;
+	border-right: 1px solid #000;
+	border-bottom: 1px solid #000;
+}
+.center {
+	text-align: center;
+}
+
+h1 {
+	color: #555555;
+	font-size: 16pt;
+}
+h2 {
+	color: #000;
+	font-size: 14pt;
+}
+h3 {
+	color: #1C94C4;
+	font-size: 12pt;
+	font-weight: bold;
+}
+.next {
+	width: 100%;
+	text-align: right;
+}
+.v-spacer {
+	padding-top: 1em;
+}
+button {
+	margin-top: 1em;
+	padding-left: 1em;
+	padding-right: 1em;
+}
+p.info {
+	padding-left: 50px;
+	background: url(../images/info-mid.png) no-repeat left -5px;
+	min-height: 48px;
+}
+p.ok {
+	padding-left: 50px;
+	background: url(../images/clean-mid.png) no-repeat left -8px;
+	min-height: 48px;
+}
+p.warning {
+	padding-left: 50px;
+	background: url(../images/messagebox_warning-mid.png) no-repeat left -5px;
+	min-height: 48px;
+}
+p.error {
+	padding-left: 50px;
+	background: url(../images/stop-mid.png) no-repeat left -5px;
+	min-height: 48px;
+}
+td.label {
+	text-align: left;
+}
+label.read-only {
+	color: #666;
+	cursor: text;
+}
+td.input {
+	text-align: left;
+}
+table.formTable {
+	border: 0;
+	cellpadding: 2px;
+	cellspacing: 0;
+}
+.wizlabel, .wizinput {
+	color: #000;
+	font-size: 10pt;
+}
+.wizhelp {
+	color: #333;
+	font-size: 8pt;
+}
+#progress { 
+    border:1px solid #000000; 
+    width: 180px; 
+    height: 20px; 
+    line-height: 20px; 
+    text-align: center;
+    margin: 5px;
+}
+h3.clickable {
+	background: url(../images/plus.gif) no-repeat left;
+	padding-left:16px;
+	cursor: hand;	
+}
+h3.clickable.open {
+	background: url(../images/minus.gif) no-repeat left;
+	padding-left:16px;
+	cursor: hand;	
+}
+		");
+	}
+
+	/**
+	 * Overriden because the application is not fully loaded when the setup is being run
+	 */	 	
+	public function GetAbsoluteUrlAppRoot()
+	{
+		return '../';
+	}
+
+	/**
+	 * Overriden because the application is not fully loaded when the setup is being run
+	 */	 	
+	public function GetAbsoluteUrlModulesRoot()
+	{
+		return $this->GetAbsoluteUrlAppRoot().utils::GetCurrentEnvironment();
+	}
+
+	/**
+	 * Overriden because the application is not fully loaded when the setup is being run
+	 */	 	
+	function GetApplicationContext()
+	{
+		return '';
+	}
+
+	public function info($sText)
+	{
+		$this->add("<p class=\"info\">$sText</p>\n");
+		$this->log_info($sText);
+	}
+	
+	public function ok($sText)
+	{
+		$this->add("<p class=\"ok\">$sText</p>\n");
+		$this->log_ok($sText);
+	}
+	
+	public function warning($sText)
+	{
+		$this->add("<p class=\"warning\">$sText</p>\n");
+		$this->log_warning($sText);
+	}
+	
+	public function error($sText)
+	{
+		$this->add("<p class=\"error\">$sText</p>\n");
+		$this->log_error($sText);
+	}
+	
+	public function form($aData)
+	{
+		$this->add("<table class=\"formTable\">\n");
+		foreach($aData as $aRow)
+		{
+			$this->add("<tr>\n");
+			if (isset($aRow['label']) && isset($aRow['input']) && isset($aRow['help']))
+			{
+				$this->add("<td class=\"wizlabel\">{$aRow['label']}</td>\n");
+				$this->add("<td class=\"wizinput\">{$aRow['input']}</td>\n");
+				$this->add("<td class=\"wizhelp\">{$aRow['help']}</td>\n");
+			}
+			else if (isset($aRow['label']) && isset($aRow['help']))
+			{
+				$this->add("<td colspan=\"2\" class=\"wizlabel\">{$aRow['label']}</td>\n");
+				$this->add("<td class=\"wizhelp\">{$aRow['help']}</td>\n");
+			}
+			else if (isset($aRow['label']) && isset($aRow['input']))
+			{
+				$this->add("<td class=\"wizlabel\">{$aRow['label']}</td>\n");
+				$this->add("<td colspan=\"2\" class=\"wizinput\">{$aRow['input']}</td>\n");
+			}
+			else if (isset($aRow['label']))
+			{
+				$this->add("<td colspan=\"3\" class=\"wizlabel\">{$aRow['label']}</td>\n");
+			}
+			$this->add("</tr>\n");
+		}
+		$this->add("</table>\n");
+	}
+	
+	public function collapsible($sId, $sTitle, $aItems, $bOpen = true)
+	{
+		$this->add("<h3 class=\"clickable open\" id=\"{$sId}\">$sTitle</h3>");
+		$this->p('<ul id="'.$sId.'_list">');
+		foreach($aItems as $sItem)
+		{
+			$this->p("<li>$sItem</li>\n");
+		}		
+		$this->p('</ul>');
+		$this->add_ready_script("$('#{$sId}').click( function() { $(this).toggleClass('open'); $('#{$sId}_list').toggle();} );\n");
+		if (!$bOpen)
+		{
+			$this->add_ready_script("$('#{$sId}').toggleClass('open'); $('#{$sId}_list').toggle();\n");
+		}	
+	}
+	
+	public function output()
+	{
+		$this->s_content = "<div id=\"header\"><h1><a href=\"http://www.combodo.com/itop\" target=\"_blank\"><img title=\"iTop by Combodo\" src=\"../images/itop-logo.png?t=".utils::GetCacheBusterTimestamp()."\"></a>&nbsp;".htmlentities($this->s_title, ENT_QUOTES, 'UTF-8')."</h1>\n</div><div id=\"setup\">{$this->s_content}\n</div>\n";
+		return parent::output();
+	}
+	
+	public static function log_error($sText)
+	{
+		self::log("Error - ".$sText);
+	}
+
+	public static function log_warning($sText)
+	{
+		self::log("Warning - ".$sText);
+	}
+
+	public static function log_info($sText)
+	{
+		self::log("Info - ".$sText);
+	}
+
+	public static function log_ok($sText)
+	{
+		self::log("Ok - ".$sText);
+	}
+
+	public static function log($sText)
+	{
+		$hLogFile = @fopen(INSTALL_LOG_FILE, 'a');
+		if ($hLogFile !== false)
+		{
+			$sDate = date('Y-m-d H:i:s');
+			fwrite($hLogFile, "$sDate - $sText\n");
+			fclose($hLogFile);
+		}
+	}
+} // End of class
diff --git a/setup/tar.php b/setup/tar.php
index 72c074bc5..7d39682a1 100644
--- a/setup/tar.php
+++ b/setup/tar.php
@@ -1,2362 +1,2362 @@
-<?php
-/**
- * File::CSV
- *
- * PHP versions 4 and 5
- *
- * Copyright (c) 1997-2008,
- * Vincent Blavet <vincent@phpconcept.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *     * Redistributions of source code must retain the above copyright notice,
- *       this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  File_Formats
- * @package   Archive_Tar
- * @author    Vincent Blavet <vincent@phpconcept.net>
- * @author    Combodo
- * @copyright 1997-2018 The Authors
- * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version   CVS: $Id$
- * @link      http://pear.php.net/package/Archive_Tar
- */
-
-define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
-define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
-
-if (!function_exists('gzopen') && function_exists('gzopen64')) {
-	function gzopen($filename, $mode, $use_include_path = 0)
-	{
-		return gzopen64($filename, $mode, $use_include_path);
-	}
-}
-
-if (!function_exists('gztell') && function_exists('gztell64')) {
-	function gztell($zp)
-	{
-		return gztell64($zp);
-	}
-}
-
-if (!function_exists('gzseek') && function_exists('gzseek64')) {
-	function gzseek($zp, $offset, $whence = SEEK_SET)
-	{
-		return gzseek64($zp, $offset, $whence);
-	}
-}
-
-/**
- * Creates a (compressed) Tar archive
- *
- * @package Archive_Tar
- * @author  Vincent Blavet <vincent@phpconcept.net>
- * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version $Revision$
- */
-class ArchiveTar
-{
-	/**
-	 * @var string Name of the Tar
-	 */
-	public $_tarname = '';
-
-	/**
-	 * @var boolean if true, the Tar file will be gzipped
-	 */
-	public $_compress = false;
-
-	/**
-	 * @var string Type of compression : 'none', 'gz', 'bz2' or 'lzma2'
-	 */
-	public $_compress_type = 'none';
-
-	/**
-	 * @var string Explode separator
-	 */
-	public $_separator = ' ';
-
-	/**
-	 * @var resource file descriptor
-	 */
-	public $_file = 0;
-
-	/**
-	 * @var string Local Tar name of a remote Tar (http:// or ftp://)
-	 */
-	public $_temp_tarname = '';
-
-	/**
-	 * @var string regular expression for ignoring files or directories
-	 */
-	public $_ignore_regexp = '';
-
-	/**
-	 * @var object PEAR_Error object
-	 */
-	public $error_object = null;
-
-	/**
-	 * Format for data extraction
-	 *
-	 * @var string
-	 */
-	public $_fmt ='';
-	/**
-	 * Archive_Tar Class constructor. This flavour of the constructor only
-	 * declare a new Archive_Tar object, identifying it by the name of the
-	 * tar file.
-	 * If the compress argument is set the tar will be read or created as a
-	 * gzip or bz2 compressed TAR file.
-	 *
-	 * @param string $p_tarname The name of the tar archive to create
-	 * @param string $p_compress can be null, 'gz', 'bz2' or 'lzma2'. This
-	 *               parameter indicates if gzip, bz2 or lzma2 compression
-	 *               is required.  For compatibility reason the
-	 *               boolean value 'true' means 'gz'.
-	 *
-	 */
-	public function __construct($p_tarname, $p_compress = null)
-	{
-		$this->_compress = false;
-		$this->_compress_type = 'none';
-		if (($p_compress === null) || ($p_compress == '')) {
-			if (@file_exists($p_tarname)) {
-				if ($fp = @fopen($p_tarname, "rb")) {
-					// look for gzip magic cookie
-					$data = fread($fp, 2);
-					fclose($fp);
-					if ($data == "\37\213") {
-						$this->_compress = true;
-						$this->_compress_type = 'gz';
-						// No sure it's enought for a magic code ....
-					} elseif ($data == "BZ") {
-						$this->_compress = true;
-						$this->_compress_type = 'bz2';
-					} elseif (file_get_contents($p_tarname, false, null, 1, 4) == '7zXZ') {
-						$this->_compress = true;
-						$this->_compress_type = 'lzma2';
-					}
-				}
-			} else {
-				// probably a remote file or some file accessible
-				// through a stream interface
-				if (substr($p_tarname, -2) == 'gz') {
-					$this->_compress = true;
-					$this->_compress_type = 'gz';
-				} elseif ((substr($p_tarname, -3) == 'bz2') ||
-					(substr($p_tarname, -2) == 'bz')
-				) {
-					$this->_compress = true;
-					$this->_compress_type = 'bz2';
-				} else {
-					if (substr($p_tarname, -2) == 'xz') {
-						$this->_compress = true;
-						$this->_compress_type = 'lzma2';
-					}
-				}
-			}
-		} else {
-			if (($p_compress === true) || ($p_compress == 'gz')) {
-				$this->_compress = true;
-				$this->_compress_type = 'gz';
-			} else {
-				if ($p_compress == 'bz2') {
-					$this->_compress = true;
-					$this->_compress_type = 'bz2';
-				} else {
-					if ($p_compress == 'lzma2') {
-						$this->_compress = true;
-						$this->_compress_type = 'lzma2';
-					} else {
-						$this->_error(
-							"Unsupported compression type '$p_compress'\n" .
-							"Supported types are 'gz', 'bz2' and 'lzma2'.\n"
-						);
-						return;
-					}
-				}
-			}
-		}
-		$this->_tarname = $p_tarname;
-
-		if (version_compare(PHP_VERSION, "5.5.0-dev") < 0) {
-			$this->_fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
-				"a8checksum/a1typeflag/a100link/a6magic/a2version/" .
-				"a32uname/a32gname/a8devmajor/a8devminor/a131prefix";
-		} else {
-			$this->_fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" .
-				"Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" .
-				"Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix";
-		}
-
-	}
-
-	public function __destruct()
-	{
-		$this->_close();
-		// ----- Look for a local copy to delete
-		if ($this->_temp_tarname != '') {
-			@unlink($this->_temp_tarname);
-		}
-	}
-
-	/**
-	 * This method creates the archive file and add the files / directories
-	 * that are listed in $p_filelist.
-	 * If a file with the same name exist and is writable, it is replaced
-	 * by the new tar.
-	 * The method return false and a PEAR error text.
-	 * The $p_filelist parameter can be an array of string, each string
-	 * representing a filename or a directory name with their path if
-	 * needed. It can also be a single string with names separated by a
-	 * single blank.
-	 * For each directory added in the archive, the files and
-	 * sub-directories are also added.
-	 * See also createModify() method for more details.
-	 *
-	 * @param array $p_filelist An array of filenames and directory names, or a
-	 *              single string with names separated by a single
-	 *              blank space.
-	 *
-	 * @return true on success, false on error.
-	 * @see    createModify()
-	 */
-	public function create($p_filelist)
-	{
-		return $this->createModify($p_filelist, '', '');
-	}
-
-	/**
-	 * This method add the files / directories that are listed in $p_filelist in
-	 * the archive. If the archive does not exist it is created.
-	 * The method return false and a PEAR error text.
-	 * The files and directories listed are only added at the end of the archive,
-	 * even if a file with the same name is already archived.
-	 * See also createModify() method for more details.
-	 *
-	 * @param array $p_filelist An array of filenames and directory names, or a
-	 *              single string with names separated by a single
-	 *              blank space.
-	 *
-	 * @return true on success, false on error.
-	 * @see    createModify()
-	 * @access public
-	 */
-	public function add($p_filelist)
-	{
-		return $this->addModify($p_filelist, '', '');
-	}
-
-	/**
-	 * @param string $p_path
-	 * @param bool $p_preserve
-	 * @return bool
-	 */
-	public function extract($p_path = '', $p_preserve = false)
-	{
-		return $this->extractModify($p_path, '', $p_preserve);
-	}
-
-	/**
-	 * @return array|int
-	 */
-	public function listContent()
-	{
-		$v_list_detail = array();
-
-		if ($this->_openRead()) {
-			if (!$this->_extractList('', $v_list_detail, "list", '', '')) {
-				unset($v_list_detail);
-				$v_list_detail = 0;
-			}
-			$this->_close();
-		}
-
-		return $v_list_detail;
-	}
-
-	/**
-	 * This method creates the archive file and add the files / directories
-	 * that are listed in $p_filelist.
-	 * If the file already exists and is writable, it is replaced by the
-	 * new tar. It is a create and not an add. If the file exists and is
-	 * read-only or is a directory it is not replaced. The method return
-	 * false and a PEAR error text.
-	 * The $p_filelist parameter can be an array of string, each string
-	 * representing a filename or a directory name with their path if
-	 * needed. It can also be a single string with names separated by a
-	 * single blank.
-	 * The path indicated in $p_remove_dir will be removed from the
-	 * memorized path of each file / directory listed when this path
-	 * exists. By default nothing is removed (empty path '')
-	 * The path indicated in $p_add_dir will be added at the beginning of
-	 * the memorized path of each file / directory listed. However it can
-	 * be set to empty ''. The adding of a path is done after the removing
-	 * of path.
-	 * The path add/remove ability enables the user to prepare an archive
-	 * for extraction in a different path than the origin files are.
-	 * See also addModify() method for file adding properties.
-	 *
-	 * @param array $p_filelist An array of filenames and directory names,
-	 *                             or a single string with names separated by
-	 *                             a single blank space.
-	 * @param string $p_add_dir A string which contains a path to be added
-	 *                             to the memorized path of each element in
-	 *                             the list.
-	 * @param string $p_remove_dir A string which contains a path to be
-	 *                             removed from the memorized path of each
-	 *                             element in the list, when relevant.
-	 *
-	 * @return boolean true on success, false on error.
-	 * @see addModify()
-	 */
-	public function createModify($p_filelist, $p_add_dir, $p_remove_dir = '')
-	{
-		$v_result = true;
-
-		if (!$this->_openWrite()) {
-			return false;
-		}
-
-		if ($p_filelist != '') {
-			if (is_array($p_filelist)) {
-				$v_list = $p_filelist;
-			} elseif (is_string($p_filelist)) {
-				$v_list = explode($this->_separator, $p_filelist);
-			} else {
-				$this->_cleanFile();
-				$this->_error('Invalid file list');
-				return false;
-			}
-
-			$v_result = $this->_addList($v_list, $p_add_dir, $p_remove_dir);
-		}
-
-		if ($v_result) {
-			$this->_writeFooter();
-			$this->_close();
-		} else {
-			$this->_cleanFile();
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * This method add the files / directories listed in $p_filelist at the
-	 * end of the existing archive. If the archive does not yet exists it
-	 * is created.
-	 * The $p_filelist parameter can be an array of string, each string
-	 * representing a filename or a directory name with their path if
-	 * needed. It can also be a single string with names separated by a
-	 * single blank.
-	 * The path indicated in $p_remove_dir will be removed from the
-	 * memorized path of each file / directory listed when this path
-	 * exists. By default nothing is removed (empty path '')
-	 * The path indicated in $p_add_dir will be added at the beginning of
-	 * the memorized path of each file / directory listed. However it can
-	 * be set to empty ''. The adding of a path is done after the removing
-	 * of path.
-	 * The path add/remove ability enables the user to prepare an archive
-	 * for extraction in a different path than the origin files are.
-	 * If a file/dir is already in the archive it will only be added at the
-	 * end of the archive. There is no update of the existing archived
-	 * file/dir. However while extracting the archive, the last file will
-	 * replace the first one. This results in a none optimization of the
-	 * archive size.
-	 * If a file/dir does not exist the file/dir is ignored. However an
-	 * error text is send to PEAR error.
-	 * If a file/dir is not readable the file/dir is ignored. However an
-	 * error text is send to PEAR error.
-	 *
-	 * @param array $p_filelist An array of filenames and directory
-	 *                             names, or a single string with names
-	 *                             separated by a single blank space.
-	 * @param string $p_add_dir A string which contains a path to be
-	 *                             added to the memorized path of each
-	 *                             element in the list.
-	 * @param string $p_remove_dir A string which contains a path to be
-	 *                             removed from the memorized path of
-	 *                             each element in the list, when
-	 *                             relevant.
-	 *
-	 * @return true on success, false on error.
-	 */
-	public function addModify($p_filelist, $p_add_dir, $p_remove_dir = '')
-	{
-		if (!$this->_isArchive()) {
-			$v_result = $this->createModify(
-				$p_filelist,
-				$p_add_dir,
-				$p_remove_dir
-			);
-		} else {
-			if (is_array($p_filelist)) {
-				$v_list = $p_filelist;
-			} elseif (is_string($p_filelist)) {
-				$v_list = explode($this->_separator, $p_filelist);
-			} else {
-				$this->_error('Invalid file list');
-				return false;
-			}
-
-			$v_result = $this->_append($v_list, $p_add_dir, $p_remove_dir);
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * This method add a single string as a file at the
-	 * end of the existing archive. If the archive does not yet exists it
-	 * is created.
-	 *
-	 * @param string $p_filename A string which contains the full
-	 *                           filename path that will be associated
-	 *                           with the string.
-	 * @param string $p_string The content of the file added in
-	 *                           the archive.
-	 * @param bool|int $p_datetime A custom date/time (unix timestamp)
-	 *                           for the file (optional).
-	 * @param array $p_params An array of optional params:
-	 *                               stamp => the datetime (replaces
-	 *                                   datetime above if it exists)
-	 *                               mode => the permissions on the
-	 *                                   file (600 by default)
-	 *                               type => is this a link?  See the
-	 *                                   tar specification for details.
-	 *                                   (default = regular file)
-	 *                               uid => the user ID of the file
-	 *                                   (default = 0 = root)
-	 *                               gid => the group ID of the file
-	 *                                   (default = 0 = root)
-	 *
-	 * @return true on success, false on error.
-	 */
-	public function addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
-	{
-		if (!$this->_isArchive()) {
-			if (!$this->_openWrite()) {
-				return false;
-			}
-			$this->_close();
-		}
-
-		if (!$this->_openAppend()) {
-			return false;
-		}
-
-		// Need to check the get back to the temporary file ? ....
-		$v_result = $this->_addString($p_filename, $p_string, $p_datetime, $p_params);
-
-		$this->_writeFooter();
-
-		$this->_close();
-
-		return $v_result;
-	}
-
-	/**
-	 * This method extract all the content of the archive in the directory
-	 * indicated by $p_path. When relevant the memorized path of the
-	 * files/dir can be modified by removing the $p_remove_path path at the
-	 * beginning of the file/dir path.
-	 * While extracting a file, if the directory path does not exists it is
-	 * created.
-	 * While extracting a file, if the file already exists it is replaced
-	 * without looking for last modification date.
-	 * While extracting a file, if the file already exists and is write
-	 * protected, the extraction is aborted.
-	 * While extracting a file, if a directory with the same name already
-	 * exists, the extraction is aborted.
-	 * While extracting a directory, if a file with the same name already
-	 * exists, the extraction is aborted.
-	 * While extracting a file/directory if the destination directory exist
-	 * and is write protected, or does not exist but can not be created,
-	 * the extraction is aborted.
-	 * If after extraction an extracted file does not show the correct
-	 * stored file size, the extraction is aborted.
-	 * When the extraction is aborted, a PEAR error text is set and false
-	 * is returned. However the result can be a partial extraction that may
-	 * need to be manually cleaned.
-	 *
-	 * @param string $p_path The path of the directory where the
-	 *                               files/dir need to by extracted.
-	 * @param string $p_remove_path Part of the memorized path that can be
-	 *                               removed if present at the beginning of
-	 *                               the file/dir path.
-	 * @param boolean $p_preserve Preserve user/group ownership of files
-	 *
-	 * @return boolean true on success, false on error.
-	 * @see    extractList()
-	 */
-	public function extractModify($p_path, $p_remove_path, $p_preserve = false)
-	{
-		$v_list_detail = array();
-
-		if ($v_result = $this->_openRead()) {
-			$v_result = $this->_extractList(
-				$p_path,
-				$v_list_detail,
-				"complete",
-				0,
-				$p_remove_path,
-				$p_preserve
-			);
-			$this->_close();
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * This method extract from the archive one file identified by $p_filename.
-	 * The return value is a string with the file content, or NULL on error.
-	 *
-	 * @param string $p_filename The path of the file to extract in a string.
-	 *
-	 * @return string with the file content or NULL.
-	 */
-	public function extractInString($p_filename)
-	{
-		if ($this->_openRead()) {
-			$v_result = $this->_extractInString($p_filename);
-			$this->_close();
-		} else {
-			$v_result = null;
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * This method extract from the archive only the files indicated in the
-	 * $p_filelist. These files are extracted in the current directory or
-	 * in the directory indicated by the optional $p_path parameter.
-	 * If indicated the $p_remove_path can be used in the same way as it is
-	 * used in extractModify() method.
-	 *
-	 * @param array|string $p_filelist An array of filenames and directory names,
-	 *                               or a single string with names separated
-	 *                               by a single blank space.
-	 * @param string $p_path The path of the directory where the
-	 *                               files/dir need to by extracted.
-	 * @param string $p_remove_path Part of the memorized path that can be
-	 *                               removed if present at the beginning of
-	 *                               the file/dir path.
-	 * @param boolean $p_preserve Preserve user/group ownership of files
-	 *
-	 * @return true on success, false on error.
-	 * @see    extractModify()
-	 */
-	public function extractList($p_filelist, $p_path = '', $p_remove_path = '', $p_preserve = false)
-	{
-		$v_list_detail = array();
-
-		if (is_array($p_filelist)) {
-			$v_list = $p_filelist;
-		} elseif (is_string($p_filelist)) {
-			$v_list = explode($this->_separator, $p_filelist);
-		} else {
-			$this->_error('Invalid string list');
-			return false;
-		}
-
-		if ($v_result = $this->_openRead()) {
-			$v_result = $this->_extractList(
-				$p_path,
-				$v_list_detail,
-				"partial",
-				$v_list,
-				$p_remove_path,
-				$p_preserve
-			);
-			$this->_close();
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * This method set specific attributes of the archive. It uses a variable
-	 * list of parameters, in the format attribute code + attribute values :
-	 * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
-	 *
-	 * @return true on success, false on error.
-	 */
-	public function setAttribute()
-	{
-		$v_result = true;
-
-		// ----- Get the number of variable list of arguments
-		if (($v_size = func_num_args()) == 0) {
-			return true;
-		}
-
-		// ----- Get the arguments
-		$v_att_list = func_get_args();
-
-		// ----- Read the attributes
-		$i = 0;
-		while ($i < $v_size) {
-
-			// ----- Look for next option
-			switch ($v_att_list[$i]) {
-				// ----- Look for options that request a string value
-				case ARCHIVE_TAR_ATT_SEPARATOR :
-					// ----- Check the number of parameters
-					if (($i + 1) >= $v_size) {
-						$this->_error(
-							'Invalid number of parameters for '
-							. 'attribute ARCHIVE_TAR_ATT_SEPARATOR'
-						);
-						return false;
-					}
-
-					// ----- Get the value
-					$this->_separator = $v_att_list[$i + 1];
-					$i++;
-					break;
-
-				default :
-					$this->_error('Unknown attribute code ' . $v_att_list[$i] . '');
-					return false;
-			}
-
-			// ----- Next attribute
-			$i++;
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * This method sets the regular expression for ignoring files and directories
-	 * at import, for example:
-	 * $arch->setIgnoreRegexp("#CVS|\.svn#");
-	 *
-	 * @param string $regexp regular expression defining which files or directories to ignore
-	 */
-	public function setIgnoreRegexp($regexp)
-	{
-		$this->_ignore_regexp = $regexp;
-	}
-
-	/**
-	 * This method sets the regular expression for ignoring all files and directories
-	 * matching the filenames in the array list at import, for example:
-	 * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
-	 *
-	 * @param array $list a list of file or directory names to ignore
-	 *
-	 * @access public
-	 */
-	public function setIgnoreList($list)
-	{
-		//$regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
-		$regexp = '#/' . join('$|/', $list) . '#';
-		$this->setIgnoreRegexp($regexp);
-	}
-
-	/**
-	 * @param string $p_message
-	 */
-	public function _error($p_message)
-	{
-		IssueLog::Error($p_message);
-	}
-
-	/**
-	 * @param string $p_message
-	 */
-	public function _warning($p_message)
-	{
-		IssueLog::Warning($p_message);
-	}
-
-	/**
-	 * @param string $p_filename
-	 * @return bool
-	 */
-	public function _isArchive($p_filename = null)
-	{
-		if ($p_filename == null) {
-			$p_filename = $this->_tarname;
-		}
-		clearstatcache();
-		return @is_file($p_filename) && !@is_link($p_filename);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _openWrite()
-	{
-		if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
-			$this->_file = @gzopen($this->_tarname, "wb9");
-		} else {
-			if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
-				$this->_file = @bzopen($this->_tarname, "w");
-			} else {
-				if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
-					$this->_file = @xzopen($this->_tarname, 'w');
-				} else {
-					if ($this->_compress_type == 'none') {
-						$this->_file = @fopen($this->_tarname, "wb");
-					} else {
-						$this->_error(
-							'Unknown or missing compression type ('
-							. $this->_compress_type . ')'
-						);
-						return false;
-					}
-				}
-			}
-		}
-
-		if ($this->_file == 0) {
-			$this->_error(
-				'Unable to open in write mode \''
-				. $this->_tarname . '\''
-			);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _openRead()
-	{
-		if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
-
-			// ----- Look if a local copy need to be done
-			if ($this->_temp_tarname == '') {
-				$this->_temp_tarname = uniqid('tar') . '.tmp';
-				if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
-					$this->_error(
-						'Unable to open in read mode \''
-						. $this->_tarname . '\''
-					);
-					$this->_temp_tarname = '';
-					return false;
-				}
-				if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
-					$this->_error(
-						'Unable to open in write mode \''
-						. $this->_temp_tarname . '\''
-					);
-					$this->_temp_tarname = '';
-					return false;
-				}
-				while ($v_data = @fread($v_file_from, 1024)) {
-					@fwrite($v_file_to, $v_data);
-				}
-				@fclose($v_file_from);
-				@fclose($v_file_to);
-			}
-
-			// ----- File to open if the local copy
-			$v_filename = $this->_temp_tarname;
-		} else {
-			// ----- File to open if the normal Tar file
-
-			$v_filename = $this->_tarname;
-		}
-
-		if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
-			$this->_file = @gzopen($v_filename, "rb");
-		} else {
-			if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
-				$this->_file = @bzopen($v_filename, "r");
-			} else {
-				if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
-					$this->_file = @xzopen($v_filename, "r");
-				} else {
-					if ($this->_compress_type == 'none') {
-						$this->_file = @fopen($v_filename, "rb");
-					} else {
-						$this->_error(
-							'Unknown or missing compression type ('
-							. $this->_compress_type . ')'
-						);
-						return false;
-					}
-				}
-			}
-		}
-
-		if ($this->_file == 0) {
-			$this->_error('Unable to open in read mode \'' . $v_filename . '\'');
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _openReadWrite()
-	{
-		if ($this->_compress_type == 'gz') {
-			$this->_file = @gzopen($this->_tarname, "r+b");
-		} else {
-			if ($this->_compress_type == 'bz2') {
-				$this->_error(
-					'Unable to open bz2 in read/write mode \''
-					. $this->_tarname . '\' (limitation of bz2 extension)'
-				);
-				return false;
-			} else {
-				if ($this->_compress_type == 'lzma2') {
-					$this->_error(
-						'Unable to open lzma2 in read/write mode \''
-						. $this->_tarname . '\' (limitation of lzma2 extension)'
-					);
-					return false;
-				} else {
-					if ($this->_compress_type == 'none') {
-						$this->_file = @fopen($this->_tarname, "r+b");
-					} else {
-						$this->_error(
-							'Unknown or missing compression type ('
-							. $this->_compress_type . ')'
-						);
-						return false;
-					}
-				}
-			}
-		}
-
-		if ($this->_file == 0) {
-			$this->_error(
-				'Unable to open in read/write mode \''
-				. $this->_tarname . '\''
-			);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _close()
-	{
-		//if (isset($this->_file)) {
-		if (is_resource($this->_file)) {
-			if ($this->_compress_type == 'gz') {
-				@gzclose($this->_file);
-			} else {
-				if ($this->_compress_type == 'bz2') {
-					@bzclose($this->_file);
-				} else {
-					if ($this->_compress_type == 'lzma2') {
-						@xzclose($this->_file);
-					} else {
-						if ($this->_compress_type == 'none') {
-							@fclose($this->_file);
-						} else {
-							$this->_error(
-								'Unknown or missing compression type ('
-								. $this->_compress_type . ')'
-							);
-						}
-					}
-				}
-			}
-
-			$this->_file = 0;
-		}
-
-		// ----- Look if a local copy need to be erase
-		// Note that it might be interesting to keep the url for a time.
-		if ($this->_temp_tarname != '') {
-			@unlink($this->_temp_tarname);
-			$this->_temp_tarname = '';
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _cleanFile()
-	{
-		$this->_close();
-
-		// ----- Look for a local copy
-		if ($this->_temp_tarname != '') {
-			// ----- Remove the local copy but not the remote tarname
-			@unlink($this->_temp_tarname);
-			$this->_temp_tarname = '';
-		} else {
-			// ----- Remove the local tarname file
-			@unlink($this->_tarname);
-		}
-		$this->_tarname = '';
-
-		return true;
-	}
-
-	/**
-	 * @param mixed $p_binary_data
-	 * @param integer $p_len
-	 * @return bool
-	 */
-	public function _writeBlock($p_binary_data, $p_len = null)
-	{
-		if (is_resource($this->_file)) {
-			if ($p_len === null) {
-				if ($this->_compress_type == 'gz') {
-					@gzputs($this->_file, $p_binary_data);
-				} else {
-					if ($this->_compress_type == 'bz2') {
-						@bzwrite($this->_file, $p_binary_data);
-					} else {
-						if ($this->_compress_type == 'lzma2') {
-							@xzwrite($this->_file, $p_binary_data);
-						} else {
-							if ($this->_compress_type == 'none') {
-								@fputs($this->_file, $p_binary_data);
-							} else {
-								$this->_error(
-									'Unknown or missing compression type ('
-									. $this->_compress_type . ')'
-								);
-							}
-						}
-					}
-				}
-			} else {
-				if ($this->_compress_type == 'gz') {
-					@gzputs($this->_file, $p_binary_data, $p_len);
-				} else {
-					if ($this->_compress_type == 'bz2') {
-						@bzwrite($this->_file, $p_binary_data, $p_len);
-					} else {
-						if ($this->_compress_type == 'lzma2') {
-							@xzwrite($this->_file, $p_binary_data, $p_len);
-						} else {
-							if ($this->_compress_type == 'none') {
-								@fputs($this->_file, $p_binary_data, $p_len);
-							} else {
-								$this->_error(
-									'Unknown or missing compression type ('
-									. $this->_compress_type . ')'
-								);
-							}
-						}
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @return null|string
-	 */
-	public function _readBlock()
-	{
-		$v_block = null;
-		if (is_resource($this->_file)) {
-			if ($this->_compress_type == 'gz') {
-				$v_block = @gzread($this->_file, 512);
-			} else {
-				if ($this->_compress_type == 'bz2') {
-					$v_block = @bzread($this->_file, 512);
-				} else {
-					if ($this->_compress_type == 'lzma2') {
-						$v_block = @xzread($this->_file, 512);
-					} else {
-						if ($this->_compress_type == 'none') {
-							$v_block = @fread($this->_file, 512);
-						} else {
-							$this->_error(
-								'Unknown or missing compression type ('
-								. $this->_compress_type . ')'
-							);
-						}
-					}
-				}
-			}
-		}
-		return $v_block;
-	}
-
-	/**
-	 * @param null $p_len
-	 * @return bool
-	 */
-	public function _jumpBlock($p_len = null)
-	{
-		if (is_resource($this->_file)) {
-			if ($p_len === null) {
-				$p_len = 1;
-			}
-
-			if ($this->_compress_type == 'gz') {
-				@gzseek($this->_file, gztell($this->_file) + ($p_len * 512));
-			} else {
-				if ($this->_compress_type == 'bz2') {
-					// ----- Replace missing bztell() and bzseek()
-					for ($i = 0; $i < $p_len; $i++) {
-						$this->_readBlock();
-					}
-				} else {
-					if ($this->_compress_type == 'lzma2') {
-						// ----- Replace missing xztell() and xzseek()
-						for ($i = 0; $i < $p_len; $i++) {
-							$this->_readBlock();
-						}
-					} else {
-						if ($this->_compress_type == 'none') {
-							@fseek($this->_file, $p_len * 512, SEEK_CUR);
-						} else {
-							$this->_error(
-								'Unknown or missing compression type ('
-								. $this->_compress_type . ')'
-							);
-						}
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _writeFooter()
-	{
-		if (is_resource($this->_file)) {
-			// ----- Write the last 0 filled block for end of archive
-			$v_binary_data = pack('a1024', '');
-			$this->_writeBlock($v_binary_data);
-		}
-		return true;
-	}
-
-	/**
-	 * @param array $p_list
-	 * @param string $p_add_dir
-	 * @param string $p_remove_dir
-	 * @return bool
-	 */
-	public function _addList($p_list, $p_add_dir, $p_remove_dir)
-	{
-		$v_result = true;
-		$v_header = array();
-
-		// ----- Remove potential windows directory separator
-		$p_add_dir = $this->_translateWinPath($p_add_dir);
-		$p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
-
-		if (!$this->_file) {
-			$this->_error('Invalid file descriptor');
-			return false;
-		}
-
-		if (sizeof($p_list) == 0) {
-			return true;
-		}
-
-		foreach ($p_list as $v_filename) {
-			if (!$v_result) {
-				break;
-			}
-
-			// ----- Skip the current tar name
-			if ($v_filename == $this->_tarname) {
-				continue;
-			}
-
-			if ($v_filename == '') {
-				continue;
-			}
-
-			// ----- ignore files and directories matching the ignore regular expression
-			if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/' . $v_filename)) {
-				$this->_warning("File '$v_filename' ignored");
-				continue;
-			}
-
-			if (!file_exists($v_filename) && !is_link($v_filename)) {
-				$this->_warning("File '$v_filename' does not exist");
-				continue;
-			}
-
-			// ----- Add the file or directory header
-			if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir)) {
-				return false;
-			}
-
-			if (@is_dir($v_filename) && !@is_link($v_filename)) {
-				if (!($p_hdir = opendir($v_filename))) {
-					$this->_warning("Directory '$v_filename' can not be read");
-					continue;
-				}
-				while (false !== ($p_hitem = readdir($p_hdir))) {
-					if (($p_hitem != '.') && ($p_hitem != '..')) {
-						if ($v_filename != ".") {
-							$p_temp_list[0] = $v_filename . '/' . $p_hitem;
-						} else {
-							$p_temp_list[0] = $p_hitem;
-						}
-
-						$v_result = $this->_addList(
-							$p_temp_list,
-							$p_add_dir,
-							$p_remove_dir
-						);
-					}
-				}
-
-				unset($p_temp_list);
-				unset($p_hdir);
-				unset($p_hitem);
-			}
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * @param string $p_filename
-	 * @param mixed $p_header
-	 * @param string $p_add_dir
-	 * @param string $p_remove_dir
-	 * @param null $v_stored_filename
-	 * @return bool
-	 */
-	public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_stored_filename = null)
-	{
-		if (!$this->_file) {
-			$this->_error('Invalid file descriptor');
-			return false;
-		}
-
-		if ($p_filename == '') {
-			$this->_error('Invalid file name');
-			return false;
-		}
-
-		if (is_null($v_stored_filename)) {
-			// ----- Calculate the stored filename
-			$p_filename = $this->_translateWinPath($p_filename, false);
-			$v_stored_filename = $p_filename;
-
-			if (strcmp($p_filename, $p_remove_dir) == 0) {
-				return true;
-			}
-
-			if ($p_remove_dir != '') {
-				if (substr($p_remove_dir, -1) != '/') {
-					$p_remove_dir .= '/';
-				}
-
-				if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir) {
-					$v_stored_filename = substr($p_filename, strlen($p_remove_dir));
-				}
-			}
-
-			$v_stored_filename = $this->_translateWinPath($v_stored_filename);
-			if ($p_add_dir != '') {
-				if (substr($p_add_dir, -1) == '/') {
-					$v_stored_filename = $p_add_dir . $v_stored_filename;
-				} else {
-					$v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
-				}
-			}
-
-			$v_stored_filename = $this->_pathReduction($v_stored_filename);
-		}
-
-		if ($this->_isArchive($p_filename)) {
-			if (($v_file = @fopen($p_filename, "rb")) == 0) {
-				$this->_warning(
-					"Unable to open file '" . $p_filename
-					. "' in binary read mode"
-				);
-				return true;
-			}
-
-			if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
-				return false;
-			}
-
-			$iLen = 1024*1024;
-			while (($v_buffer = fread($v_file, $iLen)) != '') {
-				$iBufferLen = strlen("$v_buffer");
-				if ($iBufferLen != $iLen)
-				{
-					$iPack = ((int)($iBufferLen / 512) + 1) * 512;
-					$sPack = sprintf('a%d', $iPack);
-				}
-				else
-				{
-					$sPack = sprintf('a%d', $iLen);
-				}
-				$v_binary_data = pack($sPack, "$v_buffer");
-				$this->_writeBlock($v_binary_data);
-			}
-
-			fclose($v_file);
-		} else {
-			// ----- Only header for dir
-			if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $p_filename
-	 * @param string $p_string
-	 * @param bool $p_datetime
-	 * @param array $p_params
-	 * @return bool
-	 */
-	public function _addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
-	{
-		$p_stamp = @$p_params["stamp"] ? $p_params["stamp"] : ($p_datetime ? $p_datetime : time());
-		$p_mode = @$p_params["mode"] ? $p_params["mode"] : 0600;
-		$p_type = @$p_params["type"] ? $p_params["type"] : "";
-		$p_uid = @$p_params["uid"] ? $p_params["uid"] : 0;
-		$p_gid = @$p_params["gid"] ? $p_params["gid"] : 0;
-		if (!$this->_file) {
-			$this->_error('Invalid file descriptor');
-			return false;
-		}
-
-		if ($p_filename == '') {
-			$this->_error('Invalid file name');
-			return false;
-		}
-
-		// ----- Calculate the stored filename
-		$p_filename = $this->_translateWinPath($p_filename, false);
-
-		if (!$this->_writeHeaderBlock(
-			$p_filename,
-			strlen($p_string),
-			$p_stamp,
-			$p_mode,
-			$p_type,
-			$p_uid,
-			$p_gid
-		)
-		) {
-			return false;
-		}
-
-		$i = 0;
-		while (($v_buffer = substr($p_string, (($i++) * 512), 512)) != '') {
-			$v_binary_data = pack("a512", $v_buffer);
-			$this->_writeBlock($v_binary_data);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param string $p_filename
-	 * @param string $p_stored_filename
-	 * @return bool
-	 */
-	public function _writeHeader($p_filename, $p_stored_filename)
-	{
-		if ($p_stored_filename == '') {
-			$p_stored_filename = $p_filename;
-		}
-		$v_reduce_filename = $this->_pathReduction($p_stored_filename);
-
-		if (strlen($v_reduce_filename) > 99) {
-			if (!$this->_writeLongHeader($v_reduce_filename)) {
-				return false;
-			}
-		}
-
-		$v_info = lstat($p_filename);
-		$v_uid = sprintf("%07s", DecOct($v_info[4]));
-		$v_gid = sprintf("%07s", DecOct($v_info[5]));
-		$v_perms = sprintf("%07s", DecOct($v_info['mode'] & 000777));
-
-		$v_mtime = sprintf("%011s", DecOct($v_info['mtime']));
-
-		$v_linkname = '';
-
-		if (@is_link($p_filename)) {
-			$v_typeflag = '2';
-			$v_linkname = readlink($p_filename);
-			$v_size = sprintf("%011s", DecOct(0));
-		} elseif (@is_dir($p_filename)) {
-			$v_typeflag = "5";
-			$v_size = sprintf("%011s", DecOct(0));
-		} else {
-			$v_typeflag = '0';
-			clearstatcache();
-			$v_size = sprintf("%011s", DecOct($v_info['size']));
-		}
-
-		$v_magic = 'ustar ';
-
-		$v_version = ' ';
-
-		if (function_exists('posix_getpwuid')) {
-			$userinfo = posix_getpwuid($v_info[4]);
-			$groupinfo = posix_getgrgid($v_info[5]);
-
-			$v_uname = $userinfo['name'];
-			$v_gname = $groupinfo['name'];
-		} else {
-			$v_uname = '';
-			$v_gname = '';
-		}
-
-		$v_devmajor = '';
-
-		$v_devminor = '';
-
-		$v_prefix = '';
-
-		$v_binary_data_first = pack(
-			"a100a8a8a8a12a12",
-			$v_reduce_filename,
-			$v_perms,
-			$v_uid,
-			$v_gid,
-			$v_size,
-			$v_mtime
-		);
-		$v_binary_data_last = pack(
-			"a1a100a6a2a32a32a8a8a155a12",
-			$v_typeflag,
-			$v_linkname,
-			$v_magic,
-			$v_version,
-			$v_uname,
-			$v_gname,
-			$v_devmajor,
-			$v_devminor,
-			$v_prefix,
-			''
-		);
-
-		// ----- Calculate the checksum
-		$v_checksum = 0;
-		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++) {
-			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
-		}
-		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++) {
-			$v_checksum += ord(' ');
-		}
-		// ..... Last part of the header
-		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
-			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
-		}
-
-		// ----- Write the first 148 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_first, 148);
-
-		// ----- Write the calculated checksum
-		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
-		$v_binary_data = pack("a8", $v_checksum);
-		$this->_writeBlock($v_binary_data, 8);
-
-		// ----- Write the last 356 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_last, 356);
-
-		return true;
-	}
-
-	/**
-	 * @param string $p_filename
-	 * @param int $p_size
-	 * @param int $p_mtime
-	 * @param int $p_perms
-	 * @param string $p_type
-	 * @param int $p_uid
-	 * @param int $p_gid
-	 * @return bool
-	 */
-	public function _writeHeaderBlock(
-		$p_filename,
-		$p_size,
-		$p_mtime = 0,
-		$p_perms = 0,
-		$p_type = '',
-		$p_uid = 0,
-		$p_gid = 0
-	) {
-		$p_filename = $this->_pathReduction($p_filename);
-
-		if (strlen($p_filename) > 99) {
-			if (!$this->_writeLongHeader($p_filename)) {
-				return false;
-			}
-		}
-
-		if ($p_type == "5") {
-			$v_size = sprintf("%011s", DecOct(0));
-		} else {
-			$v_size = sprintf("%011s", DecOct($p_size));
-		}
-
-		$v_uid = sprintf("%07s", DecOct($p_uid));
-		$v_gid = sprintf("%07s", DecOct($p_gid));
-		$v_perms = sprintf("%07s", DecOct($p_perms & 000777));
-
-		$v_mtime = sprintf("%11s", DecOct($p_mtime));
-
-		$v_linkname = '';
-
-		$v_magic = 'ustar ';
-
-		$v_version = ' ';
-
-		if (function_exists('posix_getpwuid')) {
-			$userinfo = posix_getpwuid($p_uid);
-			$groupinfo = posix_getgrgid($p_gid);
-
-			$v_uname = $userinfo['name'];
-			$v_gname = $groupinfo['name'];
-		} else {
-			$v_uname = '';
-			$v_gname = '';
-		}
-
-		$v_devmajor = '';
-
-		$v_devminor = '';
-
-		$v_prefix = '';
-
-		$v_binary_data_first = pack(
-			"a100a8a8a8a12A12",
-			$p_filename,
-			$v_perms,
-			$v_uid,
-			$v_gid,
-			$v_size,
-			$v_mtime
-		);
-		$v_binary_data_last = pack(
-			"a1a100a6a2a32a32a8a8a155a12",
-			$p_type,
-			$v_linkname,
-			$v_magic,
-			$v_version,
-			$v_uname,
-			$v_gname,
-			$v_devmajor,
-			$v_devminor,
-			$v_prefix,
-			''
-		);
-
-		// ----- Calculate the checksum
-		$v_checksum = 0;
-		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++) {
-			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
-		}
-		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++) {
-			$v_checksum += ord(' ');
-		}
-		// ..... Last part of the header
-		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
-			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
-		}
-
-		// ----- Write the first 148 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_first, 148);
-
-		// ----- Write the calculated checksum
-		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
-		$v_binary_data = pack("a8", $v_checksum);
-		$this->_writeBlock($v_binary_data, 8);
-
-		// ----- Write the last 356 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_last, 356);
-
-		return true;
-	}
-
-	/**
-	 * @param string $p_filename
-	 * @return bool
-	 */
-	public function _writeLongHeader($p_filename)
-	{
-		$v_size = sprintf("%11s ", DecOct(strlen($p_filename)));
-
-		$v_typeflag = 'L';
-
-		$v_linkname = '';
-
-		$v_magic = '';
-
-		$v_version = '';
-
-		$v_uname = '';
-
-		$v_gname = '';
-
-		$v_devmajor = '';
-
-		$v_devminor = '';
-
-		$v_prefix = '';
-
-		$v_binary_data_first = pack(
-			"a100a8a8a8a12a12",
-			'././@LongLink',
-			0,
-			0,
-			0,
-			$v_size,
-			0
-		);
-		$v_binary_data_last = pack(
-			"a1a100a6a2a32a32a8a8a155a12",
-			$v_typeflag,
-			$v_linkname,
-			$v_magic,
-			$v_version,
-			$v_uname,
-			$v_gname,
-			$v_devmajor,
-			$v_devminor,
-			$v_prefix,
-			''
-		);
-
-		// ----- Calculate the checksum
-		$v_checksum = 0;
-		// ..... First part of the header
-		for ($i = 0; $i < 148; $i++) {
-			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
-		}
-		// ..... Ignore the checksum value and replace it by ' ' (space)
-		for ($i = 148; $i < 156; $i++) {
-			$v_checksum += ord(' ');
-		}
-		// ..... Last part of the header
-		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
-			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
-		}
-
-		// ----- Write the first 148 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_first, 148);
-
-		// ----- Write the calculated checksum
-		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
-		$v_binary_data = pack("a8", $v_checksum);
-		$this->_writeBlock($v_binary_data, 8);
-
-		// ----- Write the last 356 bytes of the header in the archive
-		$this->_writeBlock($v_binary_data_last, 356);
-
-		// ----- Write the filename as content of the block
-		$i = 0;
-		while (($v_buffer = substr($p_filename, (($i++) * 512), 512)) != '') {
-			$v_binary_data = pack("a512", "$v_buffer");
-			$this->_writeBlock($v_binary_data);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param mixed $v_binary_data
-	 * @param mixed $v_header
-	 * @return bool
-	 */
-	public function _readHeader($v_binary_data, &$v_header)
-	{
-		if (strlen($v_binary_data) == 0) {
-			$v_header['filename'] = '';
-			return true;
-		}
-
-		if (strlen($v_binary_data) != 512) {
-			$v_header['filename'] = '';
-			$this->_error('Invalid block size : ' . strlen($v_binary_data));
-			return false;
-		}
-
-		if (!is_array($v_header)) {
-			$v_header = array();
-		}
-		// ----- Calculate the checksum
-		$v_checksum = 0;
-		// ..... First part of the header
-		$v_binary_split = str_split($v_binary_data);
-		$v_checksum += array_sum(array_map('ord', array_slice($v_binary_split, 0, 148)));
-		$v_checksum += array_sum(array_map('ord', array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',)));
-		$v_checksum += array_sum(array_map('ord', array_slice($v_binary_split, 156, 512)));
-
-
-		$v_data = unpack($this->_fmt, $v_binary_data);
-
-		if (strlen($v_data["prefix"]) > 0) {
-			$v_data["filename"] = "$v_data[prefix]/$v_data[filename]";
-		}
-
-		// ----- Extract the checksum
-		$v_header['checksum'] = OctDec(trim($v_data['checksum']));
-		if ($v_header['checksum'] != $v_checksum) {
-			$v_header['filename'] = '';
-
-			// ----- Look for last block (empty block)
-			if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
-				return true;
-			}
-
-			$this->_error(
-				'Invalid checksum for file "' . $v_data['filename']
-				. '" : ' . $v_checksum . ' calculated, '
-				. $v_header['checksum'] . ' expected'
-			);
-			return false;
-		}
-
-		// ----- Extract the properties
-		$v_header['filename'] = rtrim($v_data['filename'], "\0");
-		if ($this->_maliciousFilename($v_header['filename'])) {
-			$this->_error(
-				'Malicious .tar detected, file "' . $v_header['filename'] .
-				'" will not install in desired directory tree'
-			);
-			return false;
-		}
-		$v_header['mode'] = OctDec(trim($v_data['mode']));
-		$v_header['uid'] = OctDec(trim($v_data['uid']));
-		$v_header['gid'] = OctDec(trim($v_data['gid']));
-		$v_header['size'] = $this->_tarRecToSize($v_data['size']);
-		$v_header['mtime'] = OctDec(trim($v_data['mtime']));
-		if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-			$v_header['size'] = 0;
-		}
-		$v_header['link'] = trim($v_data['link']);
-		/* ----- All these fields are removed form the header because
-		they do not carry interesting info
-		$v_header[magic] = trim($v_data[magic]);
-		$v_header[version] = trim($v_data[version]);
-		$v_header[uname] = trim($v_data[uname]);
-		$v_header[gname] = trim($v_data[gname]);
-		$v_header[devmajor] = trim($v_data[devmajor]);
-		$v_header[devminor] = trim($v_data[devminor]);
-		*/
-
-		return true;
-	}
-
-	/**
-	 * Convert Tar record size to actual size
-	 *
-	 * @param string $tar_size
-	 * @return float|int size of tar record in bytes
-	 */
-	private function _tarRecToSize($tar_size)
-	{
-		/*
-		 * First byte of size has a special meaning if bit 7 is set.
-		 *
-		 * Bit 7 indicates base-256 encoding if set.
-		 * Bit 6 is the sign bit.
-		 * Bits 5:0 are most significant value bits.
-		 */
-		$ch = ord($tar_size[0]);
-		if ($ch & 0x80) {
-			// Full 12-bytes record is required.
-			$rec_str = $tar_size . "\x00";
-
-			$size = ($ch & 0x40) ? -1 : 0;
-			$size = ($size << 6) | ($ch & 0x3f);
-
-			for ($num_ch = 1; $num_ch < 12; ++$num_ch) {
-				$size = ($size * 256) + ord($rec_str[$num_ch]);
-			}
-
-			return $size;
-
-		} else {
-			return OctDec(trim($tar_size));
-		}
-	}
-
-	/**
-	 * Detect and report a malicious file name
-	 *
-	 * @param string $file
-	 *
-	 * @return bool
-	 */
-	private function _maliciousFilename($file)
-	{
-		if (strpos($file, '/../') !== false) {
-			return true;
-		}
-		if (strpos($file, '../') === 0) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param $v_header
-	 * @return bool
-	 */
-	public function _readLongHeader(&$v_header)
-	{
-		$v_filename = '';
-		$v_filesize = $v_header['size'];
-		$n = floor($v_header['size'] / 512);
-		for ($i = 0; $i < $n; $i++) {
-			$v_content = $this->_readBlock();
-			$v_filename .= $v_content;
-		}
-		if (($v_header['size'] % 512) != 0) {
-			$v_content = $this->_readBlock();
-			$v_filename .= $v_content;
-		}
-
-		// ----- Read the next header
-		$v_binary_data = $this->_readBlock();
-
-		if (!$this->_readHeader($v_binary_data, $v_header)) {
-			return false;
-		}
-
-		$v_filename = rtrim(substr($v_filename, 0, $v_filesize), "\0");
-		$v_header['filename'] = $v_filename;
-		if ($this->_maliciousFilename($v_filename)) {
-			$this->_error(
-				'Malicious .tar detected, file "' . $v_filename .
-				'" will not install in desired directory tree'
-			);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * This method extract from the archive one file identified by $p_filename.
-	 * The return value is a string with the file content, or null on error.
-	 *
-	 * @param string $p_filename The path of the file to extract in a string.
-	 *
-	 * @return string with the file content or null.
-	 */
-	private function _extractInString($p_filename)
-	{
-		$v_result_str = "";
-
-		while (strlen($v_binary_data = $this->_readBlock()) != 0) {
-			if (!$this->_readHeader($v_binary_data, $v_header)) {
-				return null;
-			}
-
-			if ($v_header['filename'] == '') {
-				continue;
-			}
-
-			// ----- Look for long filename
-			if ($v_header['typeflag'] == 'L') {
-				if (!$this->_readLongHeader($v_header)) {
-					return null;
-				}
-			}
-
-			if ($v_header['filename'] == $p_filename) {
-				if ($v_header['typeflag'] == "5") {
-					$this->_error(
-						'Unable to extract in string a directory '
-						. 'entry {' . $v_header['filename'] . '}'
-					);
-					return null;
-				} else {
-					$n = floor($v_header['size'] / 512);
-					for ($i = 0; $i < $n; $i++) {
-						$v_result_str .= $this->_readBlock();
-					}
-					if (($v_header['size'] % 512) != 0) {
-						$v_content = $this->_readBlock();
-						$v_result_str .= substr(
-							$v_content,
-							0,
-							($v_header['size'] % 512)
-						);
-					}
-					return $v_result_str;
-				}
-			} else {
-				$this->_jumpBlock(ceil(($v_header['size'] / 512)));
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param string $p_path
-	 * @param string|array $p_list_detail
-	 * @param string $p_mode
-	 * @param string|array $p_file_list
-	 * @param string $p_remove_path
-	 * @param bool $p_preserve
-	 * @return bool
-	 */
-	public function _extractList(
-		$p_path,
-		&$p_list_detail,
-		$p_mode,
-		$p_file_list,
-		$p_remove_path,
-		$p_preserve = false
-	) {
-		$v_nb = 0;
-
-		$p_path = $this->_translateWinPath($p_path, false);
-		if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-				&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))
-		) {
-			$p_path = "./" . $p_path;
-		}
-		$p_remove_path = $this->_translateWinPath($p_remove_path);
-
-		// ----- Look for path to remove format (should end by /)
-		if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
-			$p_remove_path .= '/';
-		}
-		$p_remove_path_size = strlen($p_remove_path);
-
-		switch ($p_mode) {
-			case "complete" :
-				$v_extract_all = true;
-				$v_listing = false;
-				break;
-			case "partial" :
-				$v_extract_all = false;
-				$v_listing = false;
-				break;
-			case "list" :
-				$v_extract_all = false;
-				$v_listing = true;
-				break;
-			default :
-				$this->_error('Invalid extract mode (' . $p_mode . ')');
-				return false;
-		}
-
-		clearstatcache();
-
-		while (strlen($v_binary_data = $this->_readBlock()) != 0) {
-			$v_extraction_stopped = 0;
-
-			if (!$this->_readHeader($v_binary_data, $v_header)) {
-				return false;
-			}
-
-			if ($v_header['filename'] == '') {
-				continue;
-			}
-
-			// ----- Look for long filename
-			if ($v_header['typeflag'] == 'L') {
-				if (!$this->_readLongHeader($v_header)) {
-					return false;
-				}
-			}
-
-			// ignore extended / pax headers
-			if ($v_header['typeflag'] == 'x' || $v_header['typeflag'] == 'g') {
-				$this->_jumpBlock(ceil(($v_header['size'] / 512)));
-				continue;
-			}
-
-			if ((!$v_extract_all) && (is_array($p_file_list))) {
-				// ----- By default no unzip if the file is not found
-				$v_extract_file = false;
-
-				for ($i = 0; $i < sizeof($p_file_list); $i++) {
-					// ----- Look if it is a directory
-					if (substr($p_file_list[$i], -1) == '/') {
-						// ----- Look if the directory is in the filename path
-						if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
-							&& (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
-								== $p_file_list[$i])
-						) {
-							$v_extract_file = true;
-							break;
-						}
-					} // ----- It is a file, so compare the file names
-					elseif ($p_file_list[$i] == $v_header['filename']) {
-						$v_extract_file = true;
-						break;
-					}
-				}
-			} else {
-				$v_extract_file = true;
-			}
-
-			// ----- Look if this file need to be extracted
-			if (($v_extract_file) && (!$v_listing)) {
-				if (($p_remove_path != '')
-					&& (substr($v_header['filename'] . '/', 0, $p_remove_path_size)
-						== $p_remove_path)
-				) {
-					$v_header['filename'] = substr(
-						$v_header['filename'],
-						$p_remove_path_size
-					);
-					if ($v_header['filename'] == '') {
-						continue;
-					}
-				}
-				if (($p_path != './') && ($p_path != '/')) {
-					while (substr($p_path, -1) == '/') {
-						$p_path = substr($p_path, 0, strlen($p_path) - 1);
-					}
-
-					if (substr($v_header['filename'], 0, 1) == '/') {
-						$v_header['filename'] = $p_path . $v_header['filename'];
-					} else {
-						$v_header['filename'] = $p_path . '/' . $v_header['filename'];
-					}
-				}
-				if (file_exists($v_header['filename'])) {
-					if ((@is_dir($v_header['filename']))
-						&& ($v_header['typeflag'] == '')
-					) {
-						$this->_error(
-							'File ' . $v_header['filename']
-							. ' already exists as a directory'
-						);
-						return false;
-					}
-					if (($this->_isArchive($v_header['filename']))
-						&& ($v_header['typeflag'] == "5")
-					) {
-						$this->_error(
-							'Directory ' . $v_header['filename']
-							. ' already exists as a file'
-						);
-						return false;
-					}
-					if (!is_writeable($v_header['filename'])) {
-						$this->_error(
-							'File ' . $v_header['filename']
-							. ' already exists and is write protected'
-						);
-						return false;
-					}
-				} // ----- Check the directory availability and create it if necessary
-				elseif (($v_result
-						= $this->_dirCheck(
-						($v_header['typeflag'] == "5"
-							? $v_header['filename']
-							: dirname($v_header['filename']))
-					)) != 1
-				) {
-					$this->_error('Unable to create path for ' . $v_header['filename']);
-					return false;
-				}
-
-				if ($v_extract_file) {
-					if ($v_header['typeflag'] == "5") {
-						if (!@file_exists($v_header['filename'])) {
-							if (!@mkdir($v_header['filename'], 0777)) {
-								$this->_error(
-									'Unable to create directory {'
-									. $v_header['filename'] . '}'
-								);
-								return false;
-							}
-						}
-					} elseif ($v_header['typeflag'] == "2") {
-						if (@file_exists($v_header['filename'])) {
-							@unlink($v_header['filename']);
-						}
-						if (!@symlink($v_header['link'], $v_header['filename'])) {
-							$this->_error(
-								'Unable to extract symbolic link {'
-								. $v_header['filename'] . '}'
-							);
-							return false;
-						}
-					} else {
-						if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-							$this->_error(
-								'Error while opening {' . $v_header['filename']
-								. '} in write binary mode'
-							);
-							return false;
-						} else {
-							$n = floor($v_header['size'] / 512);
-							for ($i = 0; $i < $n; $i++) {
-								$v_content = $this->_readBlock();
-								fwrite($v_dest_file, $v_content, 512);
-							}
-							if (($v_header['size'] % 512) != 0) {
-								$v_content = $this->_readBlock();
-								fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
-							}
-
-							@fclose($v_dest_file);
-
-							if ($p_preserve) {
-								@chown($v_header['filename'], $v_header['uid']);
-								@chgrp($v_header['filename'], $v_header['gid']);
-							}
-
-							// ----- Change the file mode, mtime
-							@touch($v_header['filename'], $v_header['mtime']);
-							if ($v_header['mode'] & 0111) {
-								// make file executable, obey umask
-								$mode = fileperms($v_header['filename']) | (~umask() & 0111);
-								@chmod($v_header['filename'], $mode);
-							}
-						}
-
-						// ----- Check the file size
-						clearstatcache();
-						if (!is_file($v_header['filename'])) {
-							$this->_error(
-								'Extracted file ' . $v_header['filename']
-								. 'does not exist. Archive may be corrupted.'
-							);
-							return false;
-						}
-
-						$filesize = filesize($v_header['filename']);
-						if ($filesize != $v_header['size']) {
-							$this->_error(
-								'Extracted file ' . $v_header['filename']
-								. ' does not have the correct file size \''
-								. $filesize
-								. '\' (' . $v_header['size']
-								. ' expected). Archive may be corrupted.'
-							);
-							return false;
-						}
-					}
-				} else {
-					$this->_jumpBlock(ceil(($v_header['size'] / 512)));
-				}
-			} else {
-				$this->_jumpBlock(ceil(($v_header['size'] / 512)));
-			}
-
-			/* TBC : Seems to be unused ...
-			if ($this->_compress)
-			  $v_end_of_file = @gzeof($this->_file);
-			else
-			  $v_end_of_file = @feof($this->_file);
-			  */
-
-			if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-				$p_list_detail[$v_nb++] = $v_header;
-				if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
-					return true;
-				}
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function _openAppend()
-	{
-		if (filesize($this->_tarname) == 0) {
-			return $this->_openWrite();
-		}
-
-		if ($this->_compress) {
-			$this->_close();
-
-			if (!@rename($this->_tarname, $this->_tarname . ".tmp")) {
-				$this->_error(
-					'Error while renaming \'' . $this->_tarname
-					. '\' to temporary file \'' . $this->_tarname
-					. '.tmp\''
-				);
-				return false;
-			}
-			$v_temp_tar = 0;
-			if ($this->_compress_type == 'gz') {
-				$v_temp_tar = @gzopen($this->_tarname . ".tmp", "rb");
-			} elseif ($this->_compress_type == 'bz2') {
-				$v_temp_tar = @bzopen($this->_tarname . ".tmp", "r");
-			} elseif ($this->_compress_type == 'lzma2') {
-				$v_temp_tar = @xzopen($this->_tarname . ".tmp", "r");
-			}
-
-
-			if ($v_temp_tar == 0) {
-				$this->_error(
-					'Unable to open file \'' . $this->_tarname
-					. '.tmp\' in binary read mode'
-				);
-				@rename($this->_tarname . ".tmp", $this->_tarname);
-				return false;
-			}
-
-			if (!$this->_openWrite()) {
-				@rename($this->_tarname . ".tmp", $this->_tarname);
-				return false;
-			}
-
-			if ($this->_compress_type == 'gz') {
-				$end_blocks = 0;
-
-				while (!@gzeof($v_temp_tar)) {
-					$v_buffer = @gzread($v_temp_tar, 512);
-					if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
-						$end_blocks++;
-						// do not copy end blocks, we will re-make them
-						// after appending
-						continue;
-					} elseif ($end_blocks > 0) {
-						for ($i = 0; $i < $end_blocks; $i++) {
-							$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
-						}
-						$end_blocks = 0;
-					}
-					$v_binary_data = pack("a512", $v_buffer);
-					$this->_writeBlock($v_binary_data);
-				}
-
-				@gzclose($v_temp_tar);
-			} elseif ($this->_compress_type == 'bz2') {
-				$end_blocks = 0;
-
-				while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) {
-					if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
-						$end_blocks++;
-						// do not copy end blocks, we will re-make them
-						// after appending
-						continue;
-					} elseif ($end_blocks > 0) {
-						for ($i = 0; $i < $end_blocks; $i++) {
-							$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
-						}
-						$end_blocks = 0;
-					}
-					$v_binary_data = pack("a512", $v_buffer);
-					$this->_writeBlock($v_binary_data);
-				}
-
-				@bzclose($v_temp_tar);
-			} elseif ($this->_compress_type == 'lzma2') {
-				$end_blocks = 0;
-
-				while (strlen($v_buffer = @xzread($v_temp_tar, 512)) > 0) {
-					if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
-						$end_blocks++;
-						// do not copy end blocks, we will re-make them
-						// after appending
-						continue;
-					} elseif ($end_blocks > 0) {
-						for ($i = 0; $i < $end_blocks; $i++) {
-							$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
-						}
-						$end_blocks = 0;
-					}
-					$v_binary_data = pack("a512", $v_buffer);
-					$this->_writeBlock($v_binary_data);
-				}
-
-				@xzclose($v_temp_tar);
-			}
-
-			if (!@unlink($this->_tarname . ".tmp")) {
-				$this->_error(
-					'Error while deleting temporary file \''
-					. $this->_tarname . '.tmp\''
-				);
-			}
-		} else {
-			// ----- For not compressed tar, just add files before the last
-			//       one or two 512 bytes block
-			if (!$this->_openReadWrite()) {
-				return false;
-			}
-
-			clearstatcache();
-			$v_size = filesize($this->_tarname);
-
-			// We might have zero, one or two end blocks.
-			// The standard is two, but we should try to handle
-			// other cases.
-			fseek($this->_file, $v_size - 1024);
-			if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
-				fseek($this->_file, $v_size - 1024);
-			} elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
-				fseek($this->_file, $v_size - 512);
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param $p_filelist
-	 * @param string $p_add_dir
-	 * @param string $p_remove_dir
-	 * @return bool
-	 */
-	public function _append($p_filelist, $p_add_dir = '', $p_remove_dir = '')
-	{
-		if (!$this->_openAppend()) {
-			return false;
-		}
-
-		if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir)) {
-			$this->_writeFooter();
-		}
-
-		$this->_close();
-
-		return true;
-	}
-
-	/**
-	 * Check if a directory exists and create it (including parent
-	 * dirs) if not.
-	 *
-	 * @param string $p_dir directory to check
-	 *
-	 * @return bool true if the directory exists or was created
-	 */
-	public function _dirCheck($p_dir)
-	{
-		clearstatcache();
-		if ((@is_dir($p_dir)) || ($p_dir == '')) {
-			return true;
-		}
-
-		$p_parent_dir = dirname($p_dir);
-
-		if (($p_parent_dir != $p_dir) &&
-			($p_parent_dir != '') &&
-			(!$this->_dirCheck($p_parent_dir))
-		) {
-			return false;
-		}
-
-		if (!@mkdir($p_dir, 0777)) {
-			$this->_error("Unable to create directory '$p_dir'");
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
-	 * rand emove double slashes.
-	 *
-	 * @param string $p_dir path to reduce
-	 *
-	 * @return string reduced path
-	 */
-	private function _pathReduction($p_dir)
-	{
-		$v_result = '';
-
-		// ----- Look for not empty path
-		if ($p_dir != '') {
-			// ----- Explode path by directory names
-			$v_list = explode('/', $p_dir);
-
-			// ----- Study directories from last to first
-			for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
-				// ----- Look for current path
-				if ($v_list[$i] == ".") {
-					// ----- Ignore this directory
-					// Should be the first $i=0, but no check is done
-				} else {
-					if ($v_list[$i] == "..") {
-						// ----- Ignore it and ignore the $i-1
-						$i--;
-					} else {
-						if (($v_list[$i] == '')
-							&& ($i != (sizeof($v_list) - 1))
-							&& ($i != 0)
-						) {
-							// ----- Ignore only the double '//' in path,
-							// but not the first and last /
-						} else {
-							$v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/'
-									. $v_result : '');
-						}
-					}
-				}
-			}
-		}
-
-		if (defined('OS_WINDOWS') && OS_WINDOWS) {
-			$v_result = strtr($v_result, '\\', '/');
-		}
-
-		return $v_result;
-	}
-
-	/**
-	 * @param $p_path
-	 * @param bool $p_remove_disk_letter
-	 * @return string
-	 */
-	public function _translateWinPath($p_path, $p_remove_disk_letter = true)
-	{
-		if (defined('OS_WINDOWS') && OS_WINDOWS) {
-			// ----- Look for potential disk letter
-			if (($p_remove_disk_letter)
-				&& (($v_position = strpos($p_path, ':')) != false)
-			) {
-				$p_path = substr($p_path, $v_position + 1);
-			}
-			// ----- Change potential windows directory separator
-			if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
-				$p_path = strtr($p_path, '\\', '/');
-			}
-		}
-		return $p_path;
-	}
-}
+<?php
+/**
+ * File::CSV
+ *
+ * PHP versions 4 and 5
+ *
+ * Copyright (c) 1997-2008,
+ * Vincent Blavet <vincent@phpconcept.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  File_Formats
+ * @package   Archive_Tar
+ * @author    Vincent Blavet <vincent@phpconcept.net>
+ * @author    Combodo
+ * @copyright 1997-2018 The Authors
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/Archive_Tar
+ */
+
+define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
+define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
+
+if (!function_exists('gzopen') && function_exists('gzopen64')) {
+	function gzopen($filename, $mode, $use_include_path = 0)
+	{
+		return gzopen64($filename, $mode, $use_include_path);
+	}
+}
+
+if (!function_exists('gztell') && function_exists('gztell64')) {
+	function gztell($zp)
+	{
+		return gztell64($zp);
+	}
+}
+
+if (!function_exists('gzseek') && function_exists('gzseek64')) {
+	function gzseek($zp, $offset, $whence = SEEK_SET)
+	{
+		return gzseek64($zp, $offset, $whence);
+	}
+}
+
+/**
+ * Creates a (compressed) Tar archive
+ *
+ * @package Archive_Tar
+ * @author  Vincent Blavet <vincent@phpconcept.net>
+ * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version $Revision$
+ */
+class ArchiveTar
+{
+	/**
+	 * @var string Name of the Tar
+	 */
+	public $_tarname = '';
+
+	/**
+	 * @var boolean if true, the Tar file will be gzipped
+	 */
+	public $_compress = false;
+
+	/**
+	 * @var string Type of compression : 'none', 'gz', 'bz2' or 'lzma2'
+	 */
+	public $_compress_type = 'none';
+
+	/**
+	 * @var string Explode separator
+	 */
+	public $_separator = ' ';
+
+	/**
+	 * @var resource file descriptor
+	 */
+	public $_file = 0;
+
+	/**
+	 * @var string Local Tar name of a remote Tar (http:// or ftp://)
+	 */
+	public $_temp_tarname = '';
+
+	/**
+	 * @var string regular expression for ignoring files or directories
+	 */
+	public $_ignore_regexp = '';
+
+	/**
+	 * @var object PEAR_Error object
+	 */
+	public $error_object = null;
+
+	/**
+	 * Format for data extraction
+	 *
+	 * @var string
+	 */
+	public $_fmt ='';
+	/**
+	 * Archive_Tar Class constructor. This flavour of the constructor only
+	 * declare a new Archive_Tar object, identifying it by the name of the
+	 * tar file.
+	 * If the compress argument is set the tar will be read or created as a
+	 * gzip or bz2 compressed TAR file.
+	 *
+	 * @param string $p_tarname The name of the tar archive to create
+	 * @param string $p_compress can be null, 'gz', 'bz2' or 'lzma2'. This
+	 *               parameter indicates if gzip, bz2 or lzma2 compression
+	 *               is required.  For compatibility reason the
+	 *               boolean value 'true' means 'gz'.
+	 *
+	 */
+	public function __construct($p_tarname, $p_compress = null)
+	{
+		$this->_compress = false;
+		$this->_compress_type = 'none';
+		if (($p_compress === null) || ($p_compress == '')) {
+			if (@file_exists($p_tarname)) {
+				if ($fp = @fopen($p_tarname, "rb")) {
+					// look for gzip magic cookie
+					$data = fread($fp, 2);
+					fclose($fp);
+					if ($data == "\37\213") {
+						$this->_compress = true;
+						$this->_compress_type = 'gz';
+						// No sure it's enought for a magic code ....
+					} elseif ($data == "BZ") {
+						$this->_compress = true;
+						$this->_compress_type = 'bz2';
+					} elseif (file_get_contents($p_tarname, false, null, 1, 4) == '7zXZ') {
+						$this->_compress = true;
+						$this->_compress_type = 'lzma2';
+					}
+				}
+			} else {
+				// probably a remote file or some file accessible
+				// through a stream interface
+				if (substr($p_tarname, -2) == 'gz') {
+					$this->_compress = true;
+					$this->_compress_type = 'gz';
+				} elseif ((substr($p_tarname, -3) == 'bz2') ||
+					(substr($p_tarname, -2) == 'bz')
+				) {
+					$this->_compress = true;
+					$this->_compress_type = 'bz2';
+				} else {
+					if (substr($p_tarname, -2) == 'xz') {
+						$this->_compress = true;
+						$this->_compress_type = 'lzma2';
+					}
+				}
+			}
+		} else {
+			if (($p_compress === true) || ($p_compress == 'gz')) {
+				$this->_compress = true;
+				$this->_compress_type = 'gz';
+			} else {
+				if ($p_compress == 'bz2') {
+					$this->_compress = true;
+					$this->_compress_type = 'bz2';
+				} else {
+					if ($p_compress == 'lzma2') {
+						$this->_compress = true;
+						$this->_compress_type = 'lzma2';
+					} else {
+						$this->_error(
+							"Unsupported compression type '$p_compress'\n" .
+							"Supported types are 'gz', 'bz2' and 'lzma2'.\n"
+						);
+						return;
+					}
+				}
+			}
+		}
+		$this->_tarname = $p_tarname;
+
+		if (version_compare(PHP_VERSION, "5.5.0-dev") < 0) {
+			$this->_fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
+				"a8checksum/a1typeflag/a100link/a6magic/a2version/" .
+				"a32uname/a32gname/a8devmajor/a8devminor/a131prefix";
+		} else {
+			$this->_fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" .
+				"Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" .
+				"Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix";
+		}
+
+	}
+
+	public function __destruct()
+	{
+		$this->_close();
+		// ----- Look for a local copy to delete
+		if ($this->_temp_tarname != '') {
+			@unlink($this->_temp_tarname);
+		}
+	}
+
+	/**
+	 * This method creates the archive file and add the files / directories
+	 * that are listed in $p_filelist.
+	 * If a file with the same name exist and is writable, it is replaced
+	 * by the new tar.
+	 * The method return false and a PEAR error text.
+	 * The $p_filelist parameter can be an array of string, each string
+	 * representing a filename or a directory name with their path if
+	 * needed. It can also be a single string with names separated by a
+	 * single blank.
+	 * For each directory added in the archive, the files and
+	 * sub-directories are also added.
+	 * See also createModify() method for more details.
+	 *
+	 * @param array $p_filelist An array of filenames and directory names, or a
+	 *              single string with names separated by a single
+	 *              blank space.
+	 *
+	 * @return true on success, false on error.
+	 * @see    createModify()
+	 */
+	public function create($p_filelist)
+	{
+		return $this->createModify($p_filelist, '', '');
+	}
+
+	/**
+	 * This method add the files / directories that are listed in $p_filelist in
+	 * the archive. If the archive does not exist it is created.
+	 * The method return false and a PEAR error text.
+	 * The files and directories listed are only added at the end of the archive,
+	 * even if a file with the same name is already archived.
+	 * See also createModify() method for more details.
+	 *
+	 * @param array $p_filelist An array of filenames and directory names, or a
+	 *              single string with names separated by a single
+	 *              blank space.
+	 *
+	 * @return true on success, false on error.
+	 * @see    createModify()
+	 * @access public
+	 */
+	public function add($p_filelist)
+	{
+		return $this->addModify($p_filelist, '', '');
+	}
+
+	/**
+	 * @param string $p_path
+	 * @param bool $p_preserve
+	 * @return bool
+	 */
+	public function extract($p_path = '', $p_preserve = false)
+	{
+		return $this->extractModify($p_path, '', $p_preserve);
+	}
+
+	/**
+	 * @return array|int
+	 */
+	public function listContent()
+	{
+		$v_list_detail = array();
+
+		if ($this->_openRead()) {
+			if (!$this->_extractList('', $v_list_detail, "list", '', '')) {
+				unset($v_list_detail);
+				$v_list_detail = 0;
+			}
+			$this->_close();
+		}
+
+		return $v_list_detail;
+	}
+
+	/**
+	 * This method creates the archive file and add the files / directories
+	 * that are listed in $p_filelist.
+	 * If the file already exists and is writable, it is replaced by the
+	 * new tar. It is a create and not an add. If the file exists and is
+	 * read-only or is a directory it is not replaced. The method return
+	 * false and a PEAR error text.
+	 * The $p_filelist parameter can be an array of string, each string
+	 * representing a filename or a directory name with their path if
+	 * needed. It can also be a single string with names separated by a
+	 * single blank.
+	 * The path indicated in $p_remove_dir will be removed from the
+	 * memorized path of each file / directory listed when this path
+	 * exists. By default nothing is removed (empty path '')
+	 * The path indicated in $p_add_dir will be added at the beginning of
+	 * the memorized path of each file / directory listed. However it can
+	 * be set to empty ''. The adding of a path is done after the removing
+	 * of path.
+	 * The path add/remove ability enables the user to prepare an archive
+	 * for extraction in a different path than the origin files are.
+	 * See also addModify() method for file adding properties.
+	 *
+	 * @param array $p_filelist An array of filenames and directory names,
+	 *                             or a single string with names separated by
+	 *                             a single blank space.
+	 * @param string $p_add_dir A string which contains a path to be added
+	 *                             to the memorized path of each element in
+	 *                             the list.
+	 * @param string $p_remove_dir A string which contains a path to be
+	 *                             removed from the memorized path of each
+	 *                             element in the list, when relevant.
+	 *
+	 * @return boolean true on success, false on error.
+	 * @see addModify()
+	 */
+	public function createModify($p_filelist, $p_add_dir, $p_remove_dir = '')
+	{
+		$v_result = true;
+
+		if (!$this->_openWrite()) {
+			return false;
+		}
+
+		if ($p_filelist != '') {
+			if (is_array($p_filelist)) {
+				$v_list = $p_filelist;
+			} elseif (is_string($p_filelist)) {
+				$v_list = explode($this->_separator, $p_filelist);
+			} else {
+				$this->_cleanFile();
+				$this->_error('Invalid file list');
+				return false;
+			}
+
+			$v_result = $this->_addList($v_list, $p_add_dir, $p_remove_dir);
+		}
+
+		if ($v_result) {
+			$this->_writeFooter();
+			$this->_close();
+		} else {
+			$this->_cleanFile();
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * This method add the files / directories listed in $p_filelist at the
+	 * end of the existing archive. If the archive does not yet exists it
+	 * is created.
+	 * The $p_filelist parameter can be an array of string, each string
+	 * representing a filename or a directory name with their path if
+	 * needed. It can also be a single string with names separated by a
+	 * single blank.
+	 * The path indicated in $p_remove_dir will be removed from the
+	 * memorized path of each file / directory listed when this path
+	 * exists. By default nothing is removed (empty path '')
+	 * The path indicated in $p_add_dir will be added at the beginning of
+	 * the memorized path of each file / directory listed. However it can
+	 * be set to empty ''. The adding of a path is done after the removing
+	 * of path.
+	 * The path add/remove ability enables the user to prepare an archive
+	 * for extraction in a different path than the origin files are.
+	 * If a file/dir is already in the archive it will only be added at the
+	 * end of the archive. There is no update of the existing archived
+	 * file/dir. However while extracting the archive, the last file will
+	 * replace the first one. This results in a none optimization of the
+	 * archive size.
+	 * If a file/dir does not exist the file/dir is ignored. However an
+	 * error text is send to PEAR error.
+	 * If a file/dir is not readable the file/dir is ignored. However an
+	 * error text is send to PEAR error.
+	 *
+	 * @param array $p_filelist An array of filenames and directory
+	 *                             names, or a single string with names
+	 *                             separated by a single blank space.
+	 * @param string $p_add_dir A string which contains a path to be
+	 *                             added to the memorized path of each
+	 *                             element in the list.
+	 * @param string $p_remove_dir A string which contains a path to be
+	 *                             removed from the memorized path of
+	 *                             each element in the list, when
+	 *                             relevant.
+	 *
+	 * @return true on success, false on error.
+	 */
+	public function addModify($p_filelist, $p_add_dir, $p_remove_dir = '')
+	{
+		if (!$this->_isArchive()) {
+			$v_result = $this->createModify(
+				$p_filelist,
+				$p_add_dir,
+				$p_remove_dir
+			);
+		} else {
+			if (is_array($p_filelist)) {
+				$v_list = $p_filelist;
+			} elseif (is_string($p_filelist)) {
+				$v_list = explode($this->_separator, $p_filelist);
+			} else {
+				$this->_error('Invalid file list');
+				return false;
+			}
+
+			$v_result = $this->_append($v_list, $p_add_dir, $p_remove_dir);
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * This method add a single string as a file at the
+	 * end of the existing archive. If the archive does not yet exists it
+	 * is created.
+	 *
+	 * @param string $p_filename A string which contains the full
+	 *                           filename path that will be associated
+	 *                           with the string.
+	 * @param string $p_string The content of the file added in
+	 *                           the archive.
+	 * @param bool|int $p_datetime A custom date/time (unix timestamp)
+	 *                           for the file (optional).
+	 * @param array $p_params An array of optional params:
+	 *                               stamp => the datetime (replaces
+	 *                                   datetime above if it exists)
+	 *                               mode => the permissions on the
+	 *                                   file (600 by default)
+	 *                               type => is this a link?  See the
+	 *                                   tar specification for details.
+	 *                                   (default = regular file)
+	 *                               uid => the user ID of the file
+	 *                                   (default = 0 = root)
+	 *                               gid => the group ID of the file
+	 *                                   (default = 0 = root)
+	 *
+	 * @return true on success, false on error.
+	 */
+	public function addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
+	{
+		if (!$this->_isArchive()) {
+			if (!$this->_openWrite()) {
+				return false;
+			}
+			$this->_close();
+		}
+
+		if (!$this->_openAppend()) {
+			return false;
+		}
+
+		// Need to check the get back to the temporary file ? ....
+		$v_result = $this->_addString($p_filename, $p_string, $p_datetime, $p_params);
+
+		$this->_writeFooter();
+
+		$this->_close();
+
+		return $v_result;
+	}
+
+	/**
+	 * This method extract all the content of the archive in the directory
+	 * indicated by $p_path. When relevant the memorized path of the
+	 * files/dir can be modified by removing the $p_remove_path path at the
+	 * beginning of the file/dir path.
+	 * While extracting a file, if the directory path does not exists it is
+	 * created.
+	 * While extracting a file, if the file already exists it is replaced
+	 * without looking for last modification date.
+	 * While extracting a file, if the file already exists and is write
+	 * protected, the extraction is aborted.
+	 * While extracting a file, if a directory with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a directory, if a file with the same name already
+	 * exists, the extraction is aborted.
+	 * While extracting a file/directory if the destination directory exist
+	 * and is write protected, or does not exist but can not be created,
+	 * the extraction is aborted.
+	 * If after extraction an extracted file does not show the correct
+	 * stored file size, the extraction is aborted.
+	 * When the extraction is aborted, a PEAR error text is set and false
+	 * is returned. However the result can be a partial extraction that may
+	 * need to be manually cleaned.
+	 *
+	 * @param string $p_path The path of the directory where the
+	 *                               files/dir need to by extracted.
+	 * @param string $p_remove_path Part of the memorized path that can be
+	 *                               removed if present at the beginning of
+	 *                               the file/dir path.
+	 * @param boolean $p_preserve Preserve user/group ownership of files
+	 *
+	 * @return boolean true on success, false on error.
+	 * @see    extractList()
+	 */
+	public function extractModify($p_path, $p_remove_path, $p_preserve = false)
+	{
+		$v_list_detail = array();
+
+		if ($v_result = $this->_openRead()) {
+			$v_result = $this->_extractList(
+				$p_path,
+				$v_list_detail,
+				"complete",
+				0,
+				$p_remove_path,
+				$p_preserve
+			);
+			$this->_close();
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * This method extract from the archive one file identified by $p_filename.
+	 * The return value is a string with the file content, or NULL on error.
+	 *
+	 * @param string $p_filename The path of the file to extract in a string.
+	 *
+	 * @return string with the file content or NULL.
+	 */
+	public function extractInString($p_filename)
+	{
+		if ($this->_openRead()) {
+			$v_result = $this->_extractInString($p_filename);
+			$this->_close();
+		} else {
+			$v_result = null;
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * This method extract from the archive only the files indicated in the
+	 * $p_filelist. These files are extracted in the current directory or
+	 * in the directory indicated by the optional $p_path parameter.
+	 * If indicated the $p_remove_path can be used in the same way as it is
+	 * used in extractModify() method.
+	 *
+	 * @param array|string $p_filelist An array of filenames and directory names,
+	 *                               or a single string with names separated
+	 *                               by a single blank space.
+	 * @param string $p_path The path of the directory where the
+	 *                               files/dir need to by extracted.
+	 * @param string $p_remove_path Part of the memorized path that can be
+	 *                               removed if present at the beginning of
+	 *                               the file/dir path.
+	 * @param boolean $p_preserve Preserve user/group ownership of files
+	 *
+	 * @return true on success, false on error.
+	 * @see    extractModify()
+	 */
+	public function extractList($p_filelist, $p_path = '', $p_remove_path = '', $p_preserve = false)
+	{
+		$v_list_detail = array();
+
+		if (is_array($p_filelist)) {
+			$v_list = $p_filelist;
+		} elseif (is_string($p_filelist)) {
+			$v_list = explode($this->_separator, $p_filelist);
+		} else {
+			$this->_error('Invalid string list');
+			return false;
+		}
+
+		if ($v_result = $this->_openRead()) {
+			$v_result = $this->_extractList(
+				$p_path,
+				$v_list_detail,
+				"partial",
+				$v_list,
+				$p_remove_path,
+				$p_preserve
+			);
+			$this->_close();
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * This method set specific attributes of the archive. It uses a variable
+	 * list of parameters, in the format attribute code + attribute values :
+	 * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
+	 *
+	 * @return true on success, false on error.
+	 */
+	public function setAttribute()
+	{
+		$v_result = true;
+
+		// ----- Get the number of variable list of arguments
+		if (($v_size = func_num_args()) == 0) {
+			return true;
+		}
+
+		// ----- Get the arguments
+		$v_att_list = func_get_args();
+
+		// ----- Read the attributes
+		$i = 0;
+		while ($i < $v_size) {
+
+			// ----- Look for next option
+			switch ($v_att_list[$i]) {
+				// ----- Look for options that request a string value
+				case ARCHIVE_TAR_ATT_SEPARATOR :
+					// ----- Check the number of parameters
+					if (($i + 1) >= $v_size) {
+						$this->_error(
+							'Invalid number of parameters for '
+							. 'attribute ARCHIVE_TAR_ATT_SEPARATOR'
+						);
+						return false;
+					}
+
+					// ----- Get the value
+					$this->_separator = $v_att_list[$i + 1];
+					$i++;
+					break;
+
+				default :
+					$this->_error('Unknown attribute code ' . $v_att_list[$i] . '');
+					return false;
+			}
+
+			// ----- Next attribute
+			$i++;
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * This method sets the regular expression for ignoring files and directories
+	 * at import, for example:
+	 * $arch->setIgnoreRegexp("#CVS|\.svn#");
+	 *
+	 * @param string $regexp regular expression defining which files or directories to ignore
+	 */
+	public function setIgnoreRegexp($regexp)
+	{
+		$this->_ignore_regexp = $regexp;
+	}
+
+	/**
+	 * This method sets the regular expression for ignoring all files and directories
+	 * matching the filenames in the array list at import, for example:
+	 * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
+	 *
+	 * @param array $list a list of file or directory names to ignore
+	 *
+	 * @access public
+	 */
+	public function setIgnoreList($list)
+	{
+		//$regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
+		$regexp = '#/' . join('$|/', $list) . '#';
+		$this->setIgnoreRegexp($regexp);
+	}
+
+	/**
+	 * @param string $p_message
+	 */
+	public function _error($p_message)
+	{
+		IssueLog::Error($p_message);
+	}
+
+	/**
+	 * @param string $p_message
+	 */
+	public function _warning($p_message)
+	{
+		IssueLog::Warning($p_message);
+	}
+
+	/**
+	 * @param string $p_filename
+	 * @return bool
+	 */
+	public function _isArchive($p_filename = null)
+	{
+		if ($p_filename == null) {
+			$p_filename = $this->_tarname;
+		}
+		clearstatcache();
+		return @is_file($p_filename) && !@is_link($p_filename);
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _openWrite()
+	{
+		if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
+			$this->_file = @gzopen($this->_tarname, "wb9");
+		} else {
+			if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
+				$this->_file = @bzopen($this->_tarname, "w");
+			} else {
+				if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
+					$this->_file = @xzopen($this->_tarname, 'w');
+				} else {
+					if ($this->_compress_type == 'none') {
+						$this->_file = @fopen($this->_tarname, "wb");
+					} else {
+						$this->_error(
+							'Unknown or missing compression type ('
+							. $this->_compress_type . ')'
+						);
+						return false;
+					}
+				}
+			}
+		}
+
+		if ($this->_file == 0) {
+			$this->_error(
+				'Unable to open in write mode \''
+				. $this->_tarname . '\''
+			);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _openRead()
+	{
+		if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
+
+			// ----- Look if a local copy need to be done
+			if ($this->_temp_tarname == '') {
+				$this->_temp_tarname = uniqid('tar') . '.tmp';
+				if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+					$this->_error(
+						'Unable to open in read mode \''
+						. $this->_tarname . '\''
+					);
+					$this->_temp_tarname = '';
+					return false;
+				}
+				if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+					$this->_error(
+						'Unable to open in write mode \''
+						. $this->_temp_tarname . '\''
+					);
+					$this->_temp_tarname = '';
+					return false;
+				}
+				while ($v_data = @fread($v_file_from, 1024)) {
+					@fwrite($v_file_to, $v_data);
+				}
+				@fclose($v_file_from);
+				@fclose($v_file_to);
+			}
+
+			// ----- File to open if the local copy
+			$v_filename = $this->_temp_tarname;
+		} else {
+			// ----- File to open if the normal Tar file
+
+			$v_filename = $this->_tarname;
+		}
+
+		if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
+			$this->_file = @gzopen($v_filename, "rb");
+		} else {
+			if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
+				$this->_file = @bzopen($v_filename, "r");
+			} else {
+				if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
+					$this->_file = @xzopen($v_filename, "r");
+				} else {
+					if ($this->_compress_type == 'none') {
+						$this->_file = @fopen($v_filename, "rb");
+					} else {
+						$this->_error(
+							'Unknown or missing compression type ('
+							. $this->_compress_type . ')'
+						);
+						return false;
+					}
+				}
+			}
+		}
+
+		if ($this->_file == 0) {
+			$this->_error('Unable to open in read mode \'' . $v_filename . '\'');
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _openReadWrite()
+	{
+		if ($this->_compress_type == 'gz') {
+			$this->_file = @gzopen($this->_tarname, "r+b");
+		} else {
+			if ($this->_compress_type == 'bz2') {
+				$this->_error(
+					'Unable to open bz2 in read/write mode \''
+					. $this->_tarname . '\' (limitation of bz2 extension)'
+				);
+				return false;
+			} else {
+				if ($this->_compress_type == 'lzma2') {
+					$this->_error(
+						'Unable to open lzma2 in read/write mode \''
+						. $this->_tarname . '\' (limitation of lzma2 extension)'
+					);
+					return false;
+				} else {
+					if ($this->_compress_type == 'none') {
+						$this->_file = @fopen($this->_tarname, "r+b");
+					} else {
+						$this->_error(
+							'Unknown or missing compression type ('
+							. $this->_compress_type . ')'
+						);
+						return false;
+					}
+				}
+			}
+		}
+
+		if ($this->_file == 0) {
+			$this->_error(
+				'Unable to open in read/write mode \''
+				. $this->_tarname . '\''
+			);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _close()
+	{
+		//if (isset($this->_file)) {
+		if (is_resource($this->_file)) {
+			if ($this->_compress_type == 'gz') {
+				@gzclose($this->_file);
+			} else {
+				if ($this->_compress_type == 'bz2') {
+					@bzclose($this->_file);
+				} else {
+					if ($this->_compress_type == 'lzma2') {
+						@xzclose($this->_file);
+					} else {
+						if ($this->_compress_type == 'none') {
+							@fclose($this->_file);
+						} else {
+							$this->_error(
+								'Unknown or missing compression type ('
+								. $this->_compress_type . ')'
+							);
+						}
+					}
+				}
+			}
+
+			$this->_file = 0;
+		}
+
+		// ----- Look if a local copy need to be erase
+		// Note that it might be interesting to keep the url for a time.
+		if ($this->_temp_tarname != '') {
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _cleanFile()
+	{
+		$this->_close();
+
+		// ----- Look for a local copy
+		if ($this->_temp_tarname != '') {
+			// ----- Remove the local copy but not the remote tarname
+			@unlink($this->_temp_tarname);
+			$this->_temp_tarname = '';
+		} else {
+			// ----- Remove the local tarname file
+			@unlink($this->_tarname);
+		}
+		$this->_tarname = '';
+
+		return true;
+	}
+
+	/**
+	 * @param mixed $p_binary_data
+	 * @param integer $p_len
+	 * @return bool
+	 */
+	public function _writeBlock($p_binary_data, $p_len = null)
+	{
+		if (is_resource($this->_file)) {
+			if ($p_len === null) {
+				if ($this->_compress_type == 'gz') {
+					@gzputs($this->_file, $p_binary_data);
+				} else {
+					if ($this->_compress_type == 'bz2') {
+						@bzwrite($this->_file, $p_binary_data);
+					} else {
+						if ($this->_compress_type == 'lzma2') {
+							@xzwrite($this->_file, $p_binary_data);
+						} else {
+							if ($this->_compress_type == 'none') {
+								@fputs($this->_file, $p_binary_data);
+							} else {
+								$this->_error(
+									'Unknown or missing compression type ('
+									. $this->_compress_type . ')'
+								);
+							}
+						}
+					}
+				}
+			} else {
+				if ($this->_compress_type == 'gz') {
+					@gzputs($this->_file, $p_binary_data, $p_len);
+				} else {
+					if ($this->_compress_type == 'bz2') {
+						@bzwrite($this->_file, $p_binary_data, $p_len);
+					} else {
+						if ($this->_compress_type == 'lzma2') {
+							@xzwrite($this->_file, $p_binary_data, $p_len);
+						} else {
+							if ($this->_compress_type == 'none') {
+								@fputs($this->_file, $p_binary_data, $p_len);
+							} else {
+								$this->_error(
+									'Unknown or missing compression type ('
+									. $this->_compress_type . ')'
+								);
+							}
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return null|string
+	 */
+	public function _readBlock()
+	{
+		$v_block = null;
+		if (is_resource($this->_file)) {
+			if ($this->_compress_type == 'gz') {
+				$v_block = @gzread($this->_file, 512);
+			} else {
+				if ($this->_compress_type == 'bz2') {
+					$v_block = @bzread($this->_file, 512);
+				} else {
+					if ($this->_compress_type == 'lzma2') {
+						$v_block = @xzread($this->_file, 512);
+					} else {
+						if ($this->_compress_type == 'none') {
+							$v_block = @fread($this->_file, 512);
+						} else {
+							$this->_error(
+								'Unknown or missing compression type ('
+								. $this->_compress_type . ')'
+							);
+						}
+					}
+				}
+			}
+		}
+		return $v_block;
+	}
+
+	/**
+	 * @param null $p_len
+	 * @return bool
+	 */
+	public function _jumpBlock($p_len = null)
+	{
+		if (is_resource($this->_file)) {
+			if ($p_len === null) {
+				$p_len = 1;
+			}
+
+			if ($this->_compress_type == 'gz') {
+				@gzseek($this->_file, gztell($this->_file) + ($p_len * 512));
+			} else {
+				if ($this->_compress_type == 'bz2') {
+					// ----- Replace missing bztell() and bzseek()
+					for ($i = 0; $i < $p_len; $i++) {
+						$this->_readBlock();
+					}
+				} else {
+					if ($this->_compress_type == 'lzma2') {
+						// ----- Replace missing xztell() and xzseek()
+						for ($i = 0; $i < $p_len; $i++) {
+							$this->_readBlock();
+						}
+					} else {
+						if ($this->_compress_type == 'none') {
+							@fseek($this->_file, $p_len * 512, SEEK_CUR);
+						} else {
+							$this->_error(
+								'Unknown or missing compression type ('
+								. $this->_compress_type . ')'
+							);
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _writeFooter()
+	{
+		if (is_resource($this->_file)) {
+			// ----- Write the last 0 filled block for end of archive
+			$v_binary_data = pack('a1024', '');
+			$this->_writeBlock($v_binary_data);
+		}
+		return true;
+	}
+
+	/**
+	 * @param array $p_list
+	 * @param string $p_add_dir
+	 * @param string $p_remove_dir
+	 * @return bool
+	 */
+	public function _addList($p_list, $p_add_dir, $p_remove_dir)
+	{
+		$v_result = true;
+		$v_header = array();
+
+		// ----- Remove potential windows directory separator
+		$p_add_dir = $this->_translateWinPath($p_add_dir);
+		$p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
+
+		if (!$this->_file) {
+			$this->_error('Invalid file descriptor');
+			return false;
+		}
+
+		if (sizeof($p_list) == 0) {
+			return true;
+		}
+
+		foreach ($p_list as $v_filename) {
+			if (!$v_result) {
+				break;
+			}
+
+			// ----- Skip the current tar name
+			if ($v_filename == $this->_tarname) {
+				continue;
+			}
+
+			if ($v_filename == '') {
+				continue;
+			}
+
+			// ----- ignore files and directories matching the ignore regular expression
+			if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/' . $v_filename)) {
+				$this->_warning("File '$v_filename' ignored");
+				continue;
+			}
+
+			if (!file_exists($v_filename) && !is_link($v_filename)) {
+				$this->_warning("File '$v_filename' does not exist");
+				continue;
+			}
+
+			// ----- Add the file or directory header
+			if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir)) {
+				return false;
+			}
+
+			if (@is_dir($v_filename) && !@is_link($v_filename)) {
+				if (!($p_hdir = opendir($v_filename))) {
+					$this->_warning("Directory '$v_filename' can not be read");
+					continue;
+				}
+				while (false !== ($p_hitem = readdir($p_hdir))) {
+					if (($p_hitem != '.') && ($p_hitem != '..')) {
+						if ($v_filename != ".") {
+							$p_temp_list[0] = $v_filename . '/' . $p_hitem;
+						} else {
+							$p_temp_list[0] = $p_hitem;
+						}
+
+						$v_result = $this->_addList(
+							$p_temp_list,
+							$p_add_dir,
+							$p_remove_dir
+						);
+					}
+				}
+
+				unset($p_temp_list);
+				unset($p_hdir);
+				unset($p_hitem);
+			}
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * @param string $p_filename
+	 * @param mixed $p_header
+	 * @param string $p_add_dir
+	 * @param string $p_remove_dir
+	 * @param null $v_stored_filename
+	 * @return bool
+	 */
+	public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_stored_filename = null)
+	{
+		if (!$this->_file) {
+			$this->_error('Invalid file descriptor');
+			return false;
+		}
+
+		if ($p_filename == '') {
+			$this->_error('Invalid file name');
+			return false;
+		}
+
+		if (is_null($v_stored_filename)) {
+			// ----- Calculate the stored filename
+			$p_filename = $this->_translateWinPath($p_filename, false);
+			$v_stored_filename = $p_filename;
+
+			if (strcmp($p_filename, $p_remove_dir) == 0) {
+				return true;
+			}
+
+			if ($p_remove_dir != '') {
+				if (substr($p_remove_dir, -1) != '/') {
+					$p_remove_dir .= '/';
+				}
+
+				if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir) {
+					$v_stored_filename = substr($p_filename, strlen($p_remove_dir));
+				}
+			}
+
+			$v_stored_filename = $this->_translateWinPath($v_stored_filename);
+			if ($p_add_dir != '') {
+				if (substr($p_add_dir, -1) == '/') {
+					$v_stored_filename = $p_add_dir . $v_stored_filename;
+				} else {
+					$v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
+				}
+			}
+
+			$v_stored_filename = $this->_pathReduction($v_stored_filename);
+		}
+
+		if ($this->_isArchive($p_filename)) {
+			if (($v_file = @fopen($p_filename, "rb")) == 0) {
+				$this->_warning(
+					"Unable to open file '" . $p_filename
+					. "' in binary read mode"
+				);
+				return true;
+			}
+
+			if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
+				return false;
+			}
+
+			$iLen = 1024*1024;
+			while (($v_buffer = fread($v_file, $iLen)) != '') {
+				$iBufferLen = strlen("$v_buffer");
+				if ($iBufferLen != $iLen)
+				{
+					$iPack = ((int)($iBufferLen / 512) + 1) * 512;
+					$sPack = sprintf('a%d', $iPack);
+				}
+				else
+				{
+					$sPack = sprintf('a%d', $iLen);
+				}
+				$v_binary_data = pack($sPack, "$v_buffer");
+				$this->_writeBlock($v_binary_data);
+			}
+
+			fclose($v_file);
+		} else {
+			// ----- Only header for dir
+			if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param string $p_filename
+	 * @param string $p_string
+	 * @param bool $p_datetime
+	 * @param array $p_params
+	 * @return bool
+	 */
+	public function _addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
+	{
+		$p_stamp = @$p_params["stamp"] ? $p_params["stamp"] : ($p_datetime ? $p_datetime : time());
+		$p_mode = @$p_params["mode"] ? $p_params["mode"] : 0600;
+		$p_type = @$p_params["type"] ? $p_params["type"] : "";
+		$p_uid = @$p_params["uid"] ? $p_params["uid"] : 0;
+		$p_gid = @$p_params["gid"] ? $p_params["gid"] : 0;
+		if (!$this->_file) {
+			$this->_error('Invalid file descriptor');
+			return false;
+		}
+
+		if ($p_filename == '') {
+			$this->_error('Invalid file name');
+			return false;
+		}
+
+		// ----- Calculate the stored filename
+		$p_filename = $this->_translateWinPath($p_filename, false);
+
+		if (!$this->_writeHeaderBlock(
+			$p_filename,
+			strlen($p_string),
+			$p_stamp,
+			$p_mode,
+			$p_type,
+			$p_uid,
+			$p_gid
+		)
+		) {
+			return false;
+		}
+
+		$i = 0;
+		while (($v_buffer = substr($p_string, (($i++) * 512), 512)) != '') {
+			$v_binary_data = pack("a512", $v_buffer);
+			$this->_writeBlock($v_binary_data);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param string $p_filename
+	 * @param string $p_stored_filename
+	 * @return bool
+	 */
+	public function _writeHeader($p_filename, $p_stored_filename)
+	{
+		if ($p_stored_filename == '') {
+			$p_stored_filename = $p_filename;
+		}
+		$v_reduce_filename = $this->_pathReduction($p_stored_filename);
+
+		if (strlen($v_reduce_filename) > 99) {
+			if (!$this->_writeLongHeader($v_reduce_filename)) {
+				return false;
+			}
+		}
+
+		$v_info = lstat($p_filename);
+		$v_uid = sprintf("%07s", DecOct($v_info[4]));
+		$v_gid = sprintf("%07s", DecOct($v_info[5]));
+		$v_perms = sprintf("%07s", DecOct($v_info['mode'] & 000777));
+
+		$v_mtime = sprintf("%011s", DecOct($v_info['mtime']));
+
+		$v_linkname = '';
+
+		if (@is_link($p_filename)) {
+			$v_typeflag = '2';
+			$v_linkname = readlink($p_filename);
+			$v_size = sprintf("%011s", DecOct(0));
+		} elseif (@is_dir($p_filename)) {
+			$v_typeflag = "5";
+			$v_size = sprintf("%011s", DecOct(0));
+		} else {
+			$v_typeflag = '0';
+			clearstatcache();
+			$v_size = sprintf("%011s", DecOct($v_info['size']));
+		}
+
+		$v_magic = 'ustar ';
+
+		$v_version = ' ';
+
+		if (function_exists('posix_getpwuid')) {
+			$userinfo = posix_getpwuid($v_info[4]);
+			$groupinfo = posix_getgrgid($v_info[5]);
+
+			$v_uname = $userinfo['name'];
+			$v_gname = $groupinfo['name'];
+		} else {
+			$v_uname = '';
+			$v_gname = '';
+		}
+
+		$v_devmajor = '';
+
+		$v_devminor = '';
+
+		$v_prefix = '';
+
+		$v_binary_data_first = pack(
+			"a100a8a8a8a12a12",
+			$v_reduce_filename,
+			$v_perms,
+			$v_uid,
+			$v_gid,
+			$v_size,
+			$v_mtime
+		);
+		$v_binary_data_last = pack(
+			"a1a100a6a2a32a32a8a8a155a12",
+			$v_typeflag,
+			$v_linkname,
+			$v_magic,
+			$v_version,
+			$v_uname,
+			$v_gname,
+			$v_devmajor,
+			$v_devminor,
+			$v_prefix,
+			''
+		);
+
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		for ($i = 0; $i < 148; $i++) {
+			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
+		}
+		// ..... Ignore the checksum value and replace it by ' ' (space)
+		for ($i = 148; $i < 156; $i++) {
+			$v_checksum += ord(' ');
+		}
+		// ..... Last part of the header
+		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
+		}
+
+		// ----- Write the first 148 bytes of the header in the archive
+		$this->_writeBlock($v_binary_data_first, 148);
+
+		// ----- Write the calculated checksum
+		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
+		$v_binary_data = pack("a8", $v_checksum);
+		$this->_writeBlock($v_binary_data, 8);
+
+		// ----- Write the last 356 bytes of the header in the archive
+		$this->_writeBlock($v_binary_data_last, 356);
+
+		return true;
+	}
+
+	/**
+	 * @param string $p_filename
+	 * @param int $p_size
+	 * @param int $p_mtime
+	 * @param int $p_perms
+	 * @param string $p_type
+	 * @param int $p_uid
+	 * @param int $p_gid
+	 * @return bool
+	 */
+	public function _writeHeaderBlock(
+		$p_filename,
+		$p_size,
+		$p_mtime = 0,
+		$p_perms = 0,
+		$p_type = '',
+		$p_uid = 0,
+		$p_gid = 0
+	) {
+		$p_filename = $this->_pathReduction($p_filename);
+
+		if (strlen($p_filename) > 99) {
+			if (!$this->_writeLongHeader($p_filename)) {
+				return false;
+			}
+		}
+
+		if ($p_type == "5") {
+			$v_size = sprintf("%011s", DecOct(0));
+		} else {
+			$v_size = sprintf("%011s", DecOct($p_size));
+		}
+
+		$v_uid = sprintf("%07s", DecOct($p_uid));
+		$v_gid = sprintf("%07s", DecOct($p_gid));
+		$v_perms = sprintf("%07s", DecOct($p_perms & 000777));
+
+		$v_mtime = sprintf("%11s", DecOct($p_mtime));
+
+		$v_linkname = '';
+
+		$v_magic = 'ustar ';
+
+		$v_version = ' ';
+
+		if (function_exists('posix_getpwuid')) {
+			$userinfo = posix_getpwuid($p_uid);
+			$groupinfo = posix_getgrgid($p_gid);
+
+			$v_uname = $userinfo['name'];
+			$v_gname = $groupinfo['name'];
+		} else {
+			$v_uname = '';
+			$v_gname = '';
+		}
+
+		$v_devmajor = '';
+
+		$v_devminor = '';
+
+		$v_prefix = '';
+
+		$v_binary_data_first = pack(
+			"a100a8a8a8a12A12",
+			$p_filename,
+			$v_perms,
+			$v_uid,
+			$v_gid,
+			$v_size,
+			$v_mtime
+		);
+		$v_binary_data_last = pack(
+			"a1a100a6a2a32a32a8a8a155a12",
+			$p_type,
+			$v_linkname,
+			$v_magic,
+			$v_version,
+			$v_uname,
+			$v_gname,
+			$v_devmajor,
+			$v_devminor,
+			$v_prefix,
+			''
+		);
+
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		for ($i = 0; $i < 148; $i++) {
+			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
+		}
+		// ..... Ignore the checksum value and replace it by ' ' (space)
+		for ($i = 148; $i < 156; $i++) {
+			$v_checksum += ord(' ');
+		}
+		// ..... Last part of the header
+		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
+		}
+
+		// ----- Write the first 148 bytes of the header in the archive
+		$this->_writeBlock($v_binary_data_first, 148);
+
+		// ----- Write the calculated checksum
+		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
+		$v_binary_data = pack("a8", $v_checksum);
+		$this->_writeBlock($v_binary_data, 8);
+
+		// ----- Write the last 356 bytes of the header in the archive
+		$this->_writeBlock($v_binary_data_last, 356);
+
+		return true;
+	}
+
+	/**
+	 * @param string $p_filename
+	 * @return bool
+	 */
+	public function _writeLongHeader($p_filename)
+	{
+		$v_size = sprintf("%11s ", DecOct(strlen($p_filename)));
+
+		$v_typeflag = 'L';
+
+		$v_linkname = '';
+
+		$v_magic = '';
+
+		$v_version = '';
+
+		$v_uname = '';
+
+		$v_gname = '';
+
+		$v_devmajor = '';
+
+		$v_devminor = '';
+
+		$v_prefix = '';
+
+		$v_binary_data_first = pack(
+			"a100a8a8a8a12a12",
+			'././@LongLink',
+			0,
+			0,
+			0,
+			$v_size,
+			0
+		);
+		$v_binary_data_last = pack(
+			"a1a100a6a2a32a32a8a8a155a12",
+			$v_typeflag,
+			$v_linkname,
+			$v_magic,
+			$v_version,
+			$v_uname,
+			$v_gname,
+			$v_devmajor,
+			$v_devminor,
+			$v_prefix,
+			''
+		);
+
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		for ($i = 0; $i < 148; $i++) {
+			$v_checksum += ord(substr($v_binary_data_first, $i, 1));
+		}
+		// ..... Ignore the checksum value and replace it by ' ' (space)
+		for ($i = 148; $i < 156; $i++) {
+			$v_checksum += ord(' ');
+		}
+		// ..... Last part of the header
+		for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+			$v_checksum += ord(substr($v_binary_data_last, $j, 1));
+		}
+
+		// ----- Write the first 148 bytes of the header in the archive
+		$this->_writeBlock($v_binary_data_first, 148);
+
+		// ----- Write the calculated checksum
+		$v_checksum = sprintf("%06s ", DecOct($v_checksum));
+		$v_binary_data = pack("a8", $v_checksum);
+		$this->_writeBlock($v_binary_data, 8);
+
+		// ----- Write the last 356 bytes of the header in the archive
+		$this->_writeBlock($v_binary_data_last, 356);
+
+		// ----- Write the filename as content of the block
+		$i = 0;
+		while (($v_buffer = substr($p_filename, (($i++) * 512), 512)) != '') {
+			$v_binary_data = pack("a512", "$v_buffer");
+			$this->_writeBlock($v_binary_data);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param mixed $v_binary_data
+	 * @param mixed $v_header
+	 * @return bool
+	 */
+	public function _readHeader($v_binary_data, &$v_header)
+	{
+		if (strlen($v_binary_data) == 0) {
+			$v_header['filename'] = '';
+			return true;
+		}
+
+		if (strlen($v_binary_data) != 512) {
+			$v_header['filename'] = '';
+			$this->_error('Invalid block size : ' . strlen($v_binary_data));
+			return false;
+		}
+
+		if (!is_array($v_header)) {
+			$v_header = array();
+		}
+		// ----- Calculate the checksum
+		$v_checksum = 0;
+		// ..... First part of the header
+		$v_binary_split = str_split($v_binary_data);
+		$v_checksum += array_sum(array_map('ord', array_slice($v_binary_split, 0, 148)));
+		$v_checksum += array_sum(array_map('ord', array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',)));
+		$v_checksum += array_sum(array_map('ord', array_slice($v_binary_split, 156, 512)));
+
+
+		$v_data = unpack($this->_fmt, $v_binary_data);
+
+		if (strlen($v_data["prefix"]) > 0) {
+			$v_data["filename"] = "$v_data[prefix]/$v_data[filename]";
+		}
+
+		// ----- Extract the checksum
+		$v_header['checksum'] = OctDec(trim($v_data['checksum']));
+		if ($v_header['checksum'] != $v_checksum) {
+			$v_header['filename'] = '';
+
+			// ----- Look for last block (empty block)
+			if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
+				return true;
+			}
+
+			$this->_error(
+				'Invalid checksum for file "' . $v_data['filename']
+				. '" : ' . $v_checksum . ' calculated, '
+				. $v_header['checksum'] . ' expected'
+			);
+			return false;
+		}
+
+		// ----- Extract the properties
+		$v_header['filename'] = rtrim($v_data['filename'], "\0");
+		if ($this->_maliciousFilename($v_header['filename'])) {
+			$this->_error(
+				'Malicious .tar detected, file "' . $v_header['filename'] .
+				'" will not install in desired directory tree'
+			);
+			return false;
+		}
+		$v_header['mode'] = OctDec(trim($v_data['mode']));
+		$v_header['uid'] = OctDec(trim($v_data['uid']));
+		$v_header['gid'] = OctDec(trim($v_data['gid']));
+		$v_header['size'] = $this->_tarRecToSize($v_data['size']);
+		$v_header['mtime'] = OctDec(trim($v_data['mtime']));
+		if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
+			$v_header['size'] = 0;
+		}
+		$v_header['link'] = trim($v_data['link']);
+		/* ----- All these fields are removed form the header because
+		they do not carry interesting info
+		$v_header[magic] = trim($v_data[magic]);
+		$v_header[version] = trim($v_data[version]);
+		$v_header[uname] = trim($v_data[uname]);
+		$v_header[gname] = trim($v_data[gname]);
+		$v_header[devmajor] = trim($v_data[devmajor]);
+		$v_header[devminor] = trim($v_data[devminor]);
+		*/
+
+		return true;
+	}
+
+	/**
+	 * Convert Tar record size to actual size
+	 *
+	 * @param string $tar_size
+	 * @return float|int size of tar record in bytes
+	 */
+	private function _tarRecToSize($tar_size)
+	{
+		/*
+		 * First byte of size has a special meaning if bit 7 is set.
+		 *
+		 * Bit 7 indicates base-256 encoding if set.
+		 * Bit 6 is the sign bit.
+		 * Bits 5:0 are most significant value bits.
+		 */
+		$ch = ord($tar_size[0]);
+		if ($ch & 0x80) {
+			// Full 12-bytes record is required.
+			$rec_str = $tar_size . "\x00";
+
+			$size = ($ch & 0x40) ? -1 : 0;
+			$size = ($size << 6) | ($ch & 0x3f);
+
+			for ($num_ch = 1; $num_ch < 12; ++$num_ch) {
+				$size = ($size * 256) + ord($rec_str[$num_ch]);
+			}
+
+			return $size;
+
+		} else {
+			return OctDec(trim($tar_size));
+		}
+	}
+
+	/**
+	 * Detect and report a malicious file name
+	 *
+	 * @param string $file
+	 *
+	 * @return bool
+	 */
+	private function _maliciousFilename($file)
+	{
+		if (strpos($file, '/../') !== false) {
+			return true;
+		}
+		if (strpos($file, '../') === 0) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param $v_header
+	 * @return bool
+	 */
+	public function _readLongHeader(&$v_header)
+	{
+		$v_filename = '';
+		$v_filesize = $v_header['size'];
+		$n = floor($v_header['size'] / 512);
+		for ($i = 0; $i < $n; $i++) {
+			$v_content = $this->_readBlock();
+			$v_filename .= $v_content;
+		}
+		if (($v_header['size'] % 512) != 0) {
+			$v_content = $this->_readBlock();
+			$v_filename .= $v_content;
+		}
+
+		// ----- Read the next header
+		$v_binary_data = $this->_readBlock();
+
+		if (!$this->_readHeader($v_binary_data, $v_header)) {
+			return false;
+		}
+
+		$v_filename = rtrim(substr($v_filename, 0, $v_filesize), "\0");
+		$v_header['filename'] = $v_filename;
+		if ($this->_maliciousFilename($v_filename)) {
+			$this->_error(
+				'Malicious .tar detected, file "' . $v_filename .
+				'" will not install in desired directory tree'
+			);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * This method extract from the archive one file identified by $p_filename.
+	 * The return value is a string with the file content, or null on error.
+	 *
+	 * @param string $p_filename The path of the file to extract in a string.
+	 *
+	 * @return string with the file content or null.
+	 */
+	private function _extractInString($p_filename)
+	{
+		$v_result_str = "";
+
+		while (strlen($v_binary_data = $this->_readBlock()) != 0) {
+			if (!$this->_readHeader($v_binary_data, $v_header)) {
+				return null;
+			}
+
+			if ($v_header['filename'] == '') {
+				continue;
+			}
+
+			// ----- Look for long filename
+			if ($v_header['typeflag'] == 'L') {
+				if (!$this->_readLongHeader($v_header)) {
+					return null;
+				}
+			}
+
+			if ($v_header['filename'] == $p_filename) {
+				if ($v_header['typeflag'] == "5") {
+					$this->_error(
+						'Unable to extract in string a directory '
+						. 'entry {' . $v_header['filename'] . '}'
+					);
+					return null;
+				} else {
+					$n = floor($v_header['size'] / 512);
+					for ($i = 0; $i < $n; $i++) {
+						$v_result_str .= $this->_readBlock();
+					}
+					if (($v_header['size'] % 512) != 0) {
+						$v_content = $this->_readBlock();
+						$v_result_str .= substr(
+							$v_content,
+							0,
+							($v_header['size'] % 512)
+						);
+					}
+					return $v_result_str;
+				}
+			} else {
+				$this->_jumpBlock(ceil(($v_header['size'] / 512)));
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @param string $p_path
+	 * @param string|array $p_list_detail
+	 * @param string $p_mode
+	 * @param string|array $p_file_list
+	 * @param string $p_remove_path
+	 * @param bool $p_preserve
+	 * @return bool
+	 */
+	public function _extractList(
+		$p_path,
+		&$p_list_detail,
+		$p_mode,
+		$p_file_list,
+		$p_remove_path,
+		$p_preserve = false
+	) {
+		$v_nb = 0;
+
+		$p_path = $this->_translateWinPath($p_path, false);
+		if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+				&& substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))
+		) {
+			$p_path = "./" . $p_path;
+		}
+		$p_remove_path = $this->_translateWinPath($p_remove_path);
+
+		// ----- Look for path to remove format (should end by /)
+		if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
+			$p_remove_path .= '/';
+		}
+		$p_remove_path_size = strlen($p_remove_path);
+
+		switch ($p_mode) {
+			case "complete" :
+				$v_extract_all = true;
+				$v_listing = false;
+				break;
+			case "partial" :
+				$v_extract_all = false;
+				$v_listing = false;
+				break;
+			case "list" :
+				$v_extract_all = false;
+				$v_listing = true;
+				break;
+			default :
+				$this->_error('Invalid extract mode (' . $p_mode . ')');
+				return false;
+		}
+
+		clearstatcache();
+
+		while (strlen($v_binary_data = $this->_readBlock()) != 0) {
+			$v_extraction_stopped = 0;
+
+			if (!$this->_readHeader($v_binary_data, $v_header)) {
+				return false;
+			}
+
+			if ($v_header['filename'] == '') {
+				continue;
+			}
+
+			// ----- Look for long filename
+			if ($v_header['typeflag'] == 'L') {
+				if (!$this->_readLongHeader($v_header)) {
+					return false;
+				}
+			}
+
+			// ignore extended / pax headers
+			if ($v_header['typeflag'] == 'x' || $v_header['typeflag'] == 'g') {
+				$this->_jumpBlock(ceil(($v_header['size'] / 512)));
+				continue;
+			}
+
+			if ((!$v_extract_all) && (is_array($p_file_list))) {
+				// ----- By default no unzip if the file is not found
+				$v_extract_file = false;
+
+				for ($i = 0; $i < sizeof($p_file_list); $i++) {
+					// ----- Look if it is a directory
+					if (substr($p_file_list[$i], -1) == '/') {
+						// ----- Look if the directory is in the filename path
+						if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+							&& (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+								== $p_file_list[$i])
+						) {
+							$v_extract_file = true;
+							break;
+						}
+					} // ----- It is a file, so compare the file names
+					elseif ($p_file_list[$i] == $v_header['filename']) {
+						$v_extract_file = true;
+						break;
+					}
+				}
+			} else {
+				$v_extract_file = true;
+			}
+
+			// ----- Look if this file need to be extracted
+			if (($v_extract_file) && (!$v_listing)) {
+				if (($p_remove_path != '')
+					&& (substr($v_header['filename'] . '/', 0, $p_remove_path_size)
+						== $p_remove_path)
+				) {
+					$v_header['filename'] = substr(
+						$v_header['filename'],
+						$p_remove_path_size
+					);
+					if ($v_header['filename'] == '') {
+						continue;
+					}
+				}
+				if (($p_path != './') && ($p_path != '/')) {
+					while (substr($p_path, -1) == '/') {
+						$p_path = substr($p_path, 0, strlen($p_path) - 1);
+					}
+
+					if (substr($v_header['filename'], 0, 1) == '/') {
+						$v_header['filename'] = $p_path . $v_header['filename'];
+					} else {
+						$v_header['filename'] = $p_path . '/' . $v_header['filename'];
+					}
+				}
+				if (file_exists($v_header['filename'])) {
+					if ((@is_dir($v_header['filename']))
+						&& ($v_header['typeflag'] == '')
+					) {
+						$this->_error(
+							'File ' . $v_header['filename']
+							. ' already exists as a directory'
+						);
+						return false;
+					}
+					if (($this->_isArchive($v_header['filename']))
+						&& ($v_header['typeflag'] == "5")
+					) {
+						$this->_error(
+							'Directory ' . $v_header['filename']
+							. ' already exists as a file'
+						);
+						return false;
+					}
+					if (!is_writeable($v_header['filename'])) {
+						$this->_error(
+							'File ' . $v_header['filename']
+							. ' already exists and is write protected'
+						);
+						return false;
+					}
+				} // ----- Check the directory availability and create it if necessary
+				elseif (($v_result
+						= $this->_dirCheck(
+						($v_header['typeflag'] == "5"
+							? $v_header['filename']
+							: dirname($v_header['filename']))
+					)) != 1
+				) {
+					$this->_error('Unable to create path for ' . $v_header['filename']);
+					return false;
+				}
+
+				if ($v_extract_file) {
+					if ($v_header['typeflag'] == "5") {
+						if (!@file_exists($v_header['filename'])) {
+							if (!@mkdir($v_header['filename'], 0777)) {
+								$this->_error(
+									'Unable to create directory {'
+									. $v_header['filename'] . '}'
+								);
+								return false;
+							}
+						}
+					} elseif ($v_header['typeflag'] == "2") {
+						if (@file_exists($v_header['filename'])) {
+							@unlink($v_header['filename']);
+						}
+						if (!@symlink($v_header['link'], $v_header['filename'])) {
+							$this->_error(
+								'Unable to extract symbolic link {'
+								. $v_header['filename'] . '}'
+							);
+							return false;
+						}
+					} else {
+						if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+							$this->_error(
+								'Error while opening {' . $v_header['filename']
+								. '} in write binary mode'
+							);
+							return false;
+						} else {
+							$n = floor($v_header['size'] / 512);
+							for ($i = 0; $i < $n; $i++) {
+								$v_content = $this->_readBlock();
+								fwrite($v_dest_file, $v_content, 512);
+							}
+							if (($v_header['size'] % 512) != 0) {
+								$v_content = $this->_readBlock();
+								fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+							}
+
+							@fclose($v_dest_file);
+
+							if ($p_preserve) {
+								@chown($v_header['filename'], $v_header['uid']);
+								@chgrp($v_header['filename'], $v_header['gid']);
+							}
+
+							// ----- Change the file mode, mtime
+							@touch($v_header['filename'], $v_header['mtime']);
+							if ($v_header['mode'] & 0111) {
+								// make file executable, obey umask
+								$mode = fileperms($v_header['filename']) | (~umask() & 0111);
+								@chmod($v_header['filename'], $mode);
+							}
+						}
+
+						// ----- Check the file size
+						clearstatcache();
+						if (!is_file($v_header['filename'])) {
+							$this->_error(
+								'Extracted file ' . $v_header['filename']
+								. 'does not exist. Archive may be corrupted.'
+							);
+							return false;
+						}
+
+						$filesize = filesize($v_header['filename']);
+						if ($filesize != $v_header['size']) {
+							$this->_error(
+								'Extracted file ' . $v_header['filename']
+								. ' does not have the correct file size \''
+								. $filesize
+								. '\' (' . $v_header['size']
+								. ' expected). Archive may be corrupted.'
+							);
+							return false;
+						}
+					}
+				} else {
+					$this->_jumpBlock(ceil(($v_header['size'] / 512)));
+				}
+			} else {
+				$this->_jumpBlock(ceil(($v_header['size'] / 512)));
+			}
+
+			/* TBC : Seems to be unused ...
+			if ($this->_compress)
+			  $v_end_of_file = @gzeof($this->_file);
+			else
+			  $v_end_of_file = @feof($this->_file);
+			  */
+
+			if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+				$p_list_detail[$v_nb++] = $v_header;
+				if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
+					return true;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function _openAppend()
+	{
+		if (filesize($this->_tarname) == 0) {
+			return $this->_openWrite();
+		}
+
+		if ($this->_compress) {
+			$this->_close();
+
+			if (!@rename($this->_tarname, $this->_tarname . ".tmp")) {
+				$this->_error(
+					'Error while renaming \'' . $this->_tarname
+					. '\' to temporary file \'' . $this->_tarname
+					. '.tmp\''
+				);
+				return false;
+			}
+			$v_temp_tar = 0;
+			if ($this->_compress_type == 'gz') {
+				$v_temp_tar = @gzopen($this->_tarname . ".tmp", "rb");
+			} elseif ($this->_compress_type == 'bz2') {
+				$v_temp_tar = @bzopen($this->_tarname . ".tmp", "r");
+			} elseif ($this->_compress_type == 'lzma2') {
+				$v_temp_tar = @xzopen($this->_tarname . ".tmp", "r");
+			}
+
+
+			if ($v_temp_tar == 0) {
+				$this->_error(
+					'Unable to open file \'' . $this->_tarname
+					. '.tmp\' in binary read mode'
+				);
+				@rename($this->_tarname . ".tmp", $this->_tarname);
+				return false;
+			}
+
+			if (!$this->_openWrite()) {
+				@rename($this->_tarname . ".tmp", $this->_tarname);
+				return false;
+			}
+
+			if ($this->_compress_type == 'gz') {
+				$end_blocks = 0;
+
+				while (!@gzeof($v_temp_tar)) {
+					$v_buffer = @gzread($v_temp_tar, 512);
+					if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+						$end_blocks++;
+						// do not copy end blocks, we will re-make them
+						// after appending
+						continue;
+					} elseif ($end_blocks > 0) {
+						for ($i = 0; $i < $end_blocks; $i++) {
+							$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+						}
+						$end_blocks = 0;
+					}
+					$v_binary_data = pack("a512", $v_buffer);
+					$this->_writeBlock($v_binary_data);
+				}
+
+				@gzclose($v_temp_tar);
+			} elseif ($this->_compress_type == 'bz2') {
+				$end_blocks = 0;
+
+				while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) {
+					if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+						$end_blocks++;
+						// do not copy end blocks, we will re-make them
+						// after appending
+						continue;
+					} elseif ($end_blocks > 0) {
+						for ($i = 0; $i < $end_blocks; $i++) {
+							$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+						}
+						$end_blocks = 0;
+					}
+					$v_binary_data = pack("a512", $v_buffer);
+					$this->_writeBlock($v_binary_data);
+				}
+
+				@bzclose($v_temp_tar);
+			} elseif ($this->_compress_type == 'lzma2') {
+				$end_blocks = 0;
+
+				while (strlen($v_buffer = @xzread($v_temp_tar, 512)) > 0) {
+					if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+						$end_blocks++;
+						// do not copy end blocks, we will re-make them
+						// after appending
+						continue;
+					} elseif ($end_blocks > 0) {
+						for ($i = 0; $i < $end_blocks; $i++) {
+							$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+						}
+						$end_blocks = 0;
+					}
+					$v_binary_data = pack("a512", $v_buffer);
+					$this->_writeBlock($v_binary_data);
+				}
+
+				@xzclose($v_temp_tar);
+			}
+
+			if (!@unlink($this->_tarname . ".tmp")) {
+				$this->_error(
+					'Error while deleting temporary file \''
+					. $this->_tarname . '.tmp\''
+				);
+			}
+		} else {
+			// ----- For not compressed tar, just add files before the last
+			//       one or two 512 bytes block
+			if (!$this->_openReadWrite()) {
+				return false;
+			}
+
+			clearstatcache();
+			$v_size = filesize($this->_tarname);
+
+			// We might have zero, one or two end blocks.
+			// The standard is two, but we should try to handle
+			// other cases.
+			fseek($this->_file, $v_size - 1024);
+			if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
+				fseek($this->_file, $v_size - 1024);
+			} elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
+				fseek($this->_file, $v_size - 512);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $p_filelist
+	 * @param string $p_add_dir
+	 * @param string $p_remove_dir
+	 * @return bool
+	 */
+	public function _append($p_filelist, $p_add_dir = '', $p_remove_dir = '')
+	{
+		if (!$this->_openAppend()) {
+			return false;
+		}
+
+		if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir)) {
+			$this->_writeFooter();
+		}
+
+		$this->_close();
+
+		return true;
+	}
+
+	/**
+	 * Check if a directory exists and create it (including parent
+	 * dirs) if not.
+	 *
+	 * @param string $p_dir directory to check
+	 *
+	 * @return bool true if the directory exists or was created
+	 */
+	public function _dirCheck($p_dir)
+	{
+		clearstatcache();
+		if ((@is_dir($p_dir)) || ($p_dir == '')) {
+			return true;
+		}
+
+		$p_parent_dir = dirname($p_dir);
+
+		if (($p_parent_dir != $p_dir) &&
+			($p_parent_dir != '') &&
+			(!$this->_dirCheck($p_parent_dir))
+		) {
+			return false;
+		}
+
+		if (!@mkdir($p_dir, 0777)) {
+			$this->_error("Unable to create directory '$p_dir'");
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
+	 * rand emove double slashes.
+	 *
+	 * @param string $p_dir path to reduce
+	 *
+	 * @return string reduced path
+	 */
+	private function _pathReduction($p_dir)
+	{
+		$v_result = '';
+
+		// ----- Look for not empty path
+		if ($p_dir != '') {
+			// ----- Explode path by directory names
+			$v_list = explode('/', $p_dir);
+
+			// ----- Study directories from last to first
+			for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
+				// ----- Look for current path
+				if ($v_list[$i] == ".") {
+					// ----- Ignore this directory
+					// Should be the first $i=0, but no check is done
+				} else {
+					if ($v_list[$i] == "..") {
+						// ----- Ignore it and ignore the $i-1
+						$i--;
+					} else {
+						if (($v_list[$i] == '')
+							&& ($i != (sizeof($v_list) - 1))
+							&& ($i != 0)
+						) {
+							// ----- Ignore only the double '//' in path,
+							// but not the first and last /
+						} else {
+							$v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/'
+									. $v_result : '');
+						}
+					}
+				}
+			}
+		}
+
+		if (defined('OS_WINDOWS') && OS_WINDOWS) {
+			$v_result = strtr($v_result, '\\', '/');
+		}
+
+		return $v_result;
+	}
+
+	/**
+	 * @param $p_path
+	 * @param bool $p_remove_disk_letter
+	 * @return string
+	 */
+	public function _translateWinPath($p_path, $p_remove_disk_letter = true)
+	{
+		if (defined('OS_WINDOWS') && OS_WINDOWS) {
+			// ----- Look for potential disk letter
+			if (($p_remove_disk_letter)
+				&& (($v_position = strpos($p_path, ':')) != false)
+			) {
+				$p_path = substr($p_path, $v_position + 1);
+			}
+			// ----- Change potential windows directory separator
+			if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+				$p_path = strtr($p_path, '\\', '/');
+			}
+		}
+		return $p_path;
+	}
+}
diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php
index d5f82a06c..25eeeac97 100644
--- a/setup/xmldataloader.class.inc.php
+++ b/setup/xmldataloader.class.inc.php
@@ -1,449 +1,449 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Load XML data from a set of files
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-define ('KEYS_CACHE_FILE', APPROOT.'data/keyscache.tmp');
-/**
- * Class to load sets of objects from XML files into the database
- * XML files can be produced by the 'export' web service or by any other means
- * Here is a simple example:
- * $oLoader  = new XMLDataLoader('../itop-config.php');
- * $oLoader->StartSession();
- * $oLoader->LoadFile('./organizations.xml');
- * $oLoader->LoadFile('./locations.xml');
- * $oLoader->EndSession();
- */
-class XMLDataLoader
-{
-	protected $m_aKeys;
-	protected $m_aObjectsCache;
-	protected $m_bSessionActive;
-	protected $m_oChange;
-	protected $m_sCacheFileName;
-
-	protected $m_aErrors;
-	protected $m_aWarnings;
-	protected $m_iCountCreated;
-
-	public function __construct()
-	{
-		$this->m_aKeys = array();
-		$this->m_aObjectsCache = array();
-		$this->m_oChange = null;
-		$this->m_sCacheFileName = KEYS_CACHE_FILE;
-		$this->LoadKeysCache();
-		$this->m_bSessionActive = true;
-		$this->m_aErrors = array();
-		$this->m_aWarnings = array();
-		$this->m_iCountCreated = 0;
-	}
-	
-	public function StartSession($oChange)
-	{
-		// Do cleanup any existing cache file (shall not be necessary unless a setup was interrupted abruptely)
-		$this->ClearKeysCache();
-
-		$this->m_oChange = $oChange;
-		$this->m_bSessionActive  = true;
-	}
-	
-	public function EndSession($bStrict = false)
-	{
-		$this->ResolveExternalKeys();
-		$this->m_bSessionActive  = false;
-
-		if (count($this->m_aErrors) > 0)
-		{
-			return false;
-		}
-		elseif ($bStrict && count($this->m_aWarnings) > 0)
-		{
-			return false;
-		}
-		else
-		{
-			return true;
-		}
-	}
-
-	public function GetErrors()
-	{
-		return $this->m_aErrors;
-	}
-
-	public function GetWarnings()
-	{
-		return $this->m_aWarnings;
-	}
-
-	public function GetCountCreated()
-	{
-		return $this->m_iCountCreated;
-	}
-	
-	public function __destruct()
-	{
-		// Stopping in the middle of a session, let's save the context information
-		if ($this->m_bSessionActive)
-		{
-			$this->SaveKeysCache();
-		}
-		else
-		{
-			$this->ClearKeysCache();
-		}
-	}
-			
-	/**
-	 * Stores the keys & object cache in a file
-	 */
-	protected function SaveKeysCache()
-	{
-		if (!is_dir(APPROOT.'data'))
-		{
-			mkdir(APPROOT.'data');
-		}
-		$hFile = @fopen($this->m_sCacheFileName, 'w');
-		if ($hFile !== false)
-		{
-			$sData = serialize( array('keys' => $this->m_aKeys,
-									'objects' => $this->m_aObjectsCache,
-									'change' => $this->m_oChange,
-									'errors' => $this->m_aErrors,
-									'warnings' => $this->m_aWarnings,
-									));
-			fwrite($hFile, $sData);
-			fclose($hFile);
-		}
-		else
-		{
-			throw new Exception("Cannot write to file: '{$this->m_sCacheFileName}'");
-		}
-	}
-		 	
-	/**
-	 * Loads the keys & object cache from the tmp file
-	 */
-	protected function LoadKeysCache()
-	{
-		$sFileContent = @file_get_contents($this->m_sCacheFileName);
-		if (!empty($sFileContent))
-		{
-			$aCache = unserialize($sFileContent);
-			$this->m_aKeys = $aCache['keys'];
-			$this->m_aObjectsCache = $aCache['objects']; 
-			$this->m_oChange = $aCache['change'];
-			$this->m_aErrors = $aCache['errors'];
-			$this->m_aWarnings = $aCache['warnings'];
-		}
-	}	 	
-	
-	/**
-	 * Remove the tmp file used to store the keys cache
-	 */
-	protected function ClearKeysCache()
-	{
-		if(is_file($this->m_sCacheFileName))
-		{
-			unlink($this->m_sCacheFileName);
-		}
-		else
-		{
-			//echo "<p>Hm, it looks like the file does not exist!!!</p>";
-		}
-		$this->m_aKeys = array();
-		$this->m_aObjectsCache = array(); 
-	}	 	
-	
-	/**
-	 * Helper function to load the objects from a standard XML file into the database
-	 * @param $sFilePath string The full path to the XML file to load
-	 * @param $bUpdateKeyCacheOnly bool Set to true to *just* update the keys cache but not reload the objects
-	 */
-	function LoadFile($sFilePath, $bUpdateKeyCacheOnly = false)
-	{
-		global $aKeys;
-		
-		$oXml = simplexml_load_file($sFilePath);
-		
-		$aReplicas  = array();
-		foreach($oXml as $sClass => $oXmlObj)
-		{
-			if (!MetaModel::IsValidClass($sClass))
-			{
-				SetupPage::log_error("Unknown class - $sClass");
-				throw(new Exception("Unknown class - $sClass"));
-			}
-
-			$iSrcId = (integer)$oXmlObj['id']; // Mandatory to cast
-			
-			// Import algorithm
-			// Here enumerate all the attributes of the object
-			// for all attribute that is neither an external field
-			// not an external key, assign it
-			// Store all external keys for further reference
-			// Create the object an store the correspondance between its newly created Id
-			// and its original Id
-			// Once all the objects have been created re-assign all the external keys to
-			// their actual Ids
-			$iExistingId = $this->GetObjectKey($sClass, $iSrcId);
-			if ($iExistingId != 0)
-			{
-				$oTargetObj = MetaModel::GetObject($sClass, $iExistingId);
-			}
-			else
-			{
-				$oTargetObj = MetaModel::NewObject($sClass);
-			}
-			foreach($oXmlObj as $sAttCode => $oSubNode)
-			{
-				if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-				{
-					$sMsg = "Unknown attribute code - $sClass/$sAttCode";
-					continue; // ignore silently...
-					//SetupPage::log_error($sMsg);
-					//throw(new Exception($sMsg));
-				}
-
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-				if (($oAttDef->IsWritable()) && ($oAttDef->IsScalar()))
-				{
-					if ($oAttDef->IsExternalKey())
-					{
-						if (substr(trim($oSubNode), 0, 6) == 'SELECT')
-						{
-							$sQuery = trim($oSubNode);
-							$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sQuery));
-							$iMatches = $oSet->Count();
-							if ($iMatches == 1)
-							{
-								$oFoundObject = $oSet->Fetch();
-								$iExtKey = $oFoundObject->GetKey();
-							}
-							else
-							{
-								$sMsg = "Ext key not reconcilied - $sClass/$iSrcId - $sAttCode: '".$sQuery."' - found $iMatches matche(s)";
-								SetupPage::log_error($sMsg);
-								$this->m_aErrors[] = $sMsg;
-								$iExtKey = 0;
-							}
-						}
-						else
-						{
-							$iDstObj = (integer)($oSubNode);
-							// Attempt to find the object in the list of loaded objects
-							$iExtKey = $this->GetObjectKey($oAttDef->GetTargetClass(), $iDstObj);
-							if ($iExtKey == 0)
-							{
-								$iExtKey = -$iDstObj; // Convention: Unresolved keys are stored as negative !
-								$oTargetObj->RegisterAsDirty();
-							}
-							// here we allow external keys to be invalid because we will resolve them later on...
-						}
-						//$oTargetObj->CheckValue($sAttCode, $iExtKey);
-						$oTargetObj->Set($sAttCode, $iExtKey);
-					}
-					elseif ($oAttDef instanceof AttributeBlob)
-					{
-						$sMimeType = (string) $oSubNode->mimetype;
-						$sFileName = (string) $oSubNode->filename;
-						$data = base64_decode((string) $oSubNode->data);
-						$oDoc = new ormDocument($data, $sMimeType, $sFileName);
-						$oTargetObj->Set($sAttCode, $oDoc);
-					}
-					else
-					{
-						$value = (string)$oSubNode;
-
-						if ($value == '')
-						{
-							$value = $oAttDef->GetNullValue();
-						}
-
-						$res = $oTargetObj->CheckValue($sAttCode, $value);
-						if ($res !== true)
-						{
-							// $res contains the error description
-							$sMsg = "Value not allowed - $sClass/$iSrcId - $sAttCode: '".$oSubNode."' ; $res";
-							SetupPage::log_error($sMsg);
-							$this->m_aErrors[] = $sMsg;
-						}
-						$oTargetObj->Set($sAttCode, $value);
-					}
-				}
-			}
-			$this->StoreObject($sClass, $oTargetObj, $iSrcId, $bUpdateKeyCacheOnly, $bUpdateKeyCacheOnly);
-		}
-		return true;
-	}
-	
-	/**
-	 * Get the new ID of an object in the database given its original ID
-	 * This may fail (return 0) if the object has not yet been created in the database
-	 * This is why the order of the import may be important  
-	 */ 
-	protected function GetObjectKey($sClass, $iSrcId)
-	{
-		if (isset($this->m_aKeys[$sClass]) && isset($this->m_aKeys[$sClass][$iSrcId]))
-		{
-			return $this->m_aKeys[$sClass][$iSrcId];
-		}
-		return 0;
-	}
-	
-	/**
-	 * Store an object in the database and remember the mapping
-	 * between its original ID and the newly created ID in the database
-	 */  
-	protected function StoreObject($sClass, $oTargetObj, $iSrcId, $bSearch = false, $bUpdateKeyCacheOnly = false)
-	{
-		$iObjId = 0;
-		try
-		{
-			if ($bSearch)
-			{
-				// Check if the object does not already exist, based on its usual reconciliation keys...
-				$aReconciliationKeys = MetaModel::GetReconcKeys($sClass);
-				if (count($aReconciliationKeys) > 0)
-				{
-					// Some reconciliation keys have been defined, use them to search for the object
-					$oSearch = new DBObjectSearch($sClass);
-					$iConditionsCount  = 0;
-					foreach($aReconciliationKeys as $sAttCode)
-					{
-						if ($oTargetObj->Get($sAttCode) != '')
-						{
-							$oSearch->AddCondition($sAttCode, $oTargetObj->Get($sAttCode), '=');
-							$iConditionsCount++;
-						}
-					}
-					if ($iConditionsCount > 0) // Search only if there are some valid conditions...
-					{
-						$oSet = new DBObjectSet($oSearch);
-						if ($oSet->count() == 1)
-						{
-							// The object already exists, reuse it
-							$oExistingObject = $oSet->Fetch();
-							$iObjId = $oExistingObject->GetKey();
-						}
-					}
-				}
-			}	
-			
-			if ($iObjId == 0)
-			{
-				if($oTargetObj->IsNew())
-				{
-					if (!$bUpdateKeyCacheOnly)
-					{
-			        	$iObjId = $oTargetObj->DBInsertNoReload();
-						$this->m_iCountCreated++;
-					}
-				}
-				else
-				{
-					$iObjId = $oTargetObj->GetKey();
-					if (!$bUpdateKeyCacheOnly)
-					{
-						$oTargetObj->DBUpdate();
-					}
-				}
-			}	        
-		}
-		catch(Exception $e)
-		{
-			SetupPage::log_error("An object could not be recorded - $sClass/$iSrcId - ".$e->getMessage());
-			$this->m_aErrors[] = "An object could not be recorded - $sClass/$iSrcId - ".$e->getMessage();
-		}
-		$aParentClasses = MetaModel::EnumParentClasses($sClass);
-		$aParentClasses[] = $sClass;
-		foreach($aParentClasses as $sObjClass)
-		{
-			$this->m_aKeys[$sObjClass][$iSrcId] = $iObjId;
-		}
-		$this->m_aObjectsCache[$sClass][$iObjId] = $oTargetObj;
-	}
-	
-	/**
-	 * Maps an external key to its (newly created) value
-	 */
-	 
-	protected function ResolveExternalKeys()
-	{
-		foreach($this->m_aObjectsCache as $sClass => $oObjList)
-		{
-			foreach($oObjList as $oTargetObj)
-			{	
-				$bChanged = false;
-				$sClass = get_class($oTargetObj);
-				foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
-				{
-					if ( ($oAttDef->IsExternalKey()) && ($oTargetObj->Get($sAttCode) < 0) ) // Convention unresolved key = negative
-					{
-						$sTargetClass = $oAttDef->GetTargetClass();
-						$iTempKey = $oTargetObj->Get($sAttCode);
-
-						$iExtKey = $this->GetObjectKey($sTargetClass, -$iTempKey);
-						if ($iExtKey == 0)
-						{
-							$sMsg = "unresolved extkey in $sClass::".$oTargetObj->GetKey()."(".$oTargetObj->GetName().")::$sAttCode=$sTargetClass::$iTempKey";
-							SetupPage::log_warning($sMsg);
-							$this->m_aWarnings[] = $sMsg;
-							//echo "<pre>aKeys[".$sTargetClass."]:\n";
-							//print_r($this->m_aKeys[$sTargetClass]);
-							//echo "</pre>\n";
-						}
-						else
-						{
-							$bChanged = true;
-							$oTargetObj->Set($sAttCode, $iExtKey);
-						}
-					}
-				}
-				if ($bChanged)
-				{
-					try
-					{
-						if (is_subclass_of($oTargetObj, 'CMDBObject'))
-						{
-					        $oTargetObj->DBUpdateTracked($this->m_oChange);
-						}
-						else
-						{
-					        $oTargetObj->DBUpdate();
-						}
-					}
-					catch(Exception $e)
-					{
-						$this->m_aErrors[] = "The object changes could not be tracked - $sClass/$iExtKey - ".$e->getMessage();
-					}
-				}
-			}
-		}
-	
-		return true;
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Load XML data from a set of files
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+define ('KEYS_CACHE_FILE', APPROOT.'data/keyscache.tmp');
+/**
+ * Class to load sets of objects from XML files into the database
+ * XML files can be produced by the 'export' web service or by any other means
+ * Here is a simple example:
+ * $oLoader  = new XMLDataLoader('../itop-config.php');
+ * $oLoader->StartSession();
+ * $oLoader->LoadFile('./organizations.xml');
+ * $oLoader->LoadFile('./locations.xml');
+ * $oLoader->EndSession();
+ */
+class XMLDataLoader
+{
+	protected $m_aKeys;
+	protected $m_aObjectsCache;
+	protected $m_bSessionActive;
+	protected $m_oChange;
+	protected $m_sCacheFileName;
+
+	protected $m_aErrors;
+	protected $m_aWarnings;
+	protected $m_iCountCreated;
+
+	public function __construct()
+	{
+		$this->m_aKeys = array();
+		$this->m_aObjectsCache = array();
+		$this->m_oChange = null;
+		$this->m_sCacheFileName = KEYS_CACHE_FILE;
+		$this->LoadKeysCache();
+		$this->m_bSessionActive = true;
+		$this->m_aErrors = array();
+		$this->m_aWarnings = array();
+		$this->m_iCountCreated = 0;
+	}
+	
+	public function StartSession($oChange)
+	{
+		// Do cleanup any existing cache file (shall not be necessary unless a setup was interrupted abruptely)
+		$this->ClearKeysCache();
+
+		$this->m_oChange = $oChange;
+		$this->m_bSessionActive  = true;
+	}
+	
+	public function EndSession($bStrict = false)
+	{
+		$this->ResolveExternalKeys();
+		$this->m_bSessionActive  = false;
+
+		if (count($this->m_aErrors) > 0)
+		{
+			return false;
+		}
+		elseif ($bStrict && count($this->m_aWarnings) > 0)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	public function GetErrors()
+	{
+		return $this->m_aErrors;
+	}
+
+	public function GetWarnings()
+	{
+		return $this->m_aWarnings;
+	}
+
+	public function GetCountCreated()
+	{
+		return $this->m_iCountCreated;
+	}
+	
+	public function __destruct()
+	{
+		// Stopping in the middle of a session, let's save the context information
+		if ($this->m_bSessionActive)
+		{
+			$this->SaveKeysCache();
+		}
+		else
+		{
+			$this->ClearKeysCache();
+		}
+	}
+			
+	/**
+	 * Stores the keys & object cache in a file
+	 */
+	protected function SaveKeysCache()
+	{
+		if (!is_dir(APPROOT.'data'))
+		{
+			mkdir(APPROOT.'data');
+		}
+		$hFile = @fopen($this->m_sCacheFileName, 'w');
+		if ($hFile !== false)
+		{
+			$sData = serialize( array('keys' => $this->m_aKeys,
+									'objects' => $this->m_aObjectsCache,
+									'change' => $this->m_oChange,
+									'errors' => $this->m_aErrors,
+									'warnings' => $this->m_aWarnings,
+									));
+			fwrite($hFile, $sData);
+			fclose($hFile);
+		}
+		else
+		{
+			throw new Exception("Cannot write to file: '{$this->m_sCacheFileName}'");
+		}
+	}
+		 	
+	/**
+	 * Loads the keys & object cache from the tmp file
+	 */
+	protected function LoadKeysCache()
+	{
+		$sFileContent = @file_get_contents($this->m_sCacheFileName);
+		if (!empty($sFileContent))
+		{
+			$aCache = unserialize($sFileContent);
+			$this->m_aKeys = $aCache['keys'];
+			$this->m_aObjectsCache = $aCache['objects']; 
+			$this->m_oChange = $aCache['change'];
+			$this->m_aErrors = $aCache['errors'];
+			$this->m_aWarnings = $aCache['warnings'];
+		}
+	}	 	
+	
+	/**
+	 * Remove the tmp file used to store the keys cache
+	 */
+	protected function ClearKeysCache()
+	{
+		if(is_file($this->m_sCacheFileName))
+		{
+			unlink($this->m_sCacheFileName);
+		}
+		else
+		{
+			//echo "<p>Hm, it looks like the file does not exist!!!</p>";
+		}
+		$this->m_aKeys = array();
+		$this->m_aObjectsCache = array(); 
+	}	 	
+	
+	/**
+	 * Helper function to load the objects from a standard XML file into the database
+	 * @param $sFilePath string The full path to the XML file to load
+	 * @param $bUpdateKeyCacheOnly bool Set to true to *just* update the keys cache but not reload the objects
+	 */
+	function LoadFile($sFilePath, $bUpdateKeyCacheOnly = false)
+	{
+		global $aKeys;
+		
+		$oXml = simplexml_load_file($sFilePath);
+		
+		$aReplicas  = array();
+		foreach($oXml as $sClass => $oXmlObj)
+		{
+			if (!MetaModel::IsValidClass($sClass))
+			{
+				SetupPage::log_error("Unknown class - $sClass");
+				throw(new Exception("Unknown class - $sClass"));
+			}
+
+			$iSrcId = (integer)$oXmlObj['id']; // Mandatory to cast
+			
+			// Import algorithm
+			// Here enumerate all the attributes of the object
+			// for all attribute that is neither an external field
+			// not an external key, assign it
+			// Store all external keys for further reference
+			// Create the object an store the correspondance between its newly created Id
+			// and its original Id
+			// Once all the objects have been created re-assign all the external keys to
+			// their actual Ids
+			$iExistingId = $this->GetObjectKey($sClass, $iSrcId);
+			if ($iExistingId != 0)
+			{
+				$oTargetObj = MetaModel::GetObject($sClass, $iExistingId);
+			}
+			else
+			{
+				$oTargetObj = MetaModel::NewObject($sClass);
+			}
+			foreach($oXmlObj as $sAttCode => $oSubNode)
+			{
+				if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+				{
+					$sMsg = "Unknown attribute code - $sClass/$sAttCode";
+					continue; // ignore silently...
+					//SetupPage::log_error($sMsg);
+					//throw(new Exception($sMsg));
+				}
+
+				$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+				if (($oAttDef->IsWritable()) && ($oAttDef->IsScalar()))
+				{
+					if ($oAttDef->IsExternalKey())
+					{
+						if (substr(trim($oSubNode), 0, 6) == 'SELECT')
+						{
+							$sQuery = trim($oSubNode);
+							$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sQuery));
+							$iMatches = $oSet->Count();
+							if ($iMatches == 1)
+							{
+								$oFoundObject = $oSet->Fetch();
+								$iExtKey = $oFoundObject->GetKey();
+							}
+							else
+							{
+								$sMsg = "Ext key not reconcilied - $sClass/$iSrcId - $sAttCode: '".$sQuery."' - found $iMatches matche(s)";
+								SetupPage::log_error($sMsg);
+								$this->m_aErrors[] = $sMsg;
+								$iExtKey = 0;
+							}
+						}
+						else
+						{
+							$iDstObj = (integer)($oSubNode);
+							// Attempt to find the object in the list of loaded objects
+							$iExtKey = $this->GetObjectKey($oAttDef->GetTargetClass(), $iDstObj);
+							if ($iExtKey == 0)
+							{
+								$iExtKey = -$iDstObj; // Convention: Unresolved keys are stored as negative !
+								$oTargetObj->RegisterAsDirty();
+							}
+							// here we allow external keys to be invalid because we will resolve them later on...
+						}
+						//$oTargetObj->CheckValue($sAttCode, $iExtKey);
+						$oTargetObj->Set($sAttCode, $iExtKey);
+					}
+					elseif ($oAttDef instanceof AttributeBlob)
+					{
+						$sMimeType = (string) $oSubNode->mimetype;
+						$sFileName = (string) $oSubNode->filename;
+						$data = base64_decode((string) $oSubNode->data);
+						$oDoc = new ormDocument($data, $sMimeType, $sFileName);
+						$oTargetObj->Set($sAttCode, $oDoc);
+					}
+					else
+					{
+						$value = (string)$oSubNode;
+
+						if ($value == '')
+						{
+							$value = $oAttDef->GetNullValue();
+						}
+
+						$res = $oTargetObj->CheckValue($sAttCode, $value);
+						if ($res !== true)
+						{
+							// $res contains the error description
+							$sMsg = "Value not allowed - $sClass/$iSrcId - $sAttCode: '".$oSubNode."' ; $res";
+							SetupPage::log_error($sMsg);
+							$this->m_aErrors[] = $sMsg;
+						}
+						$oTargetObj->Set($sAttCode, $value);
+					}
+				}
+			}
+			$this->StoreObject($sClass, $oTargetObj, $iSrcId, $bUpdateKeyCacheOnly, $bUpdateKeyCacheOnly);
+		}
+		return true;
+	}
+	
+	/**
+	 * Get the new ID of an object in the database given its original ID
+	 * This may fail (return 0) if the object has not yet been created in the database
+	 * This is why the order of the import may be important  
+	 */ 
+	protected function GetObjectKey($sClass, $iSrcId)
+	{
+		if (isset($this->m_aKeys[$sClass]) && isset($this->m_aKeys[$sClass][$iSrcId]))
+		{
+			return $this->m_aKeys[$sClass][$iSrcId];
+		}
+		return 0;
+	}
+	
+	/**
+	 * Store an object in the database and remember the mapping
+	 * between its original ID and the newly created ID in the database
+	 */  
+	protected function StoreObject($sClass, $oTargetObj, $iSrcId, $bSearch = false, $bUpdateKeyCacheOnly = false)
+	{
+		$iObjId = 0;
+		try
+		{
+			if ($bSearch)
+			{
+				// Check if the object does not already exist, based on its usual reconciliation keys...
+				$aReconciliationKeys = MetaModel::GetReconcKeys($sClass);
+				if (count($aReconciliationKeys) > 0)
+				{
+					// Some reconciliation keys have been defined, use them to search for the object
+					$oSearch = new DBObjectSearch($sClass);
+					$iConditionsCount  = 0;
+					foreach($aReconciliationKeys as $sAttCode)
+					{
+						if ($oTargetObj->Get($sAttCode) != '')
+						{
+							$oSearch->AddCondition($sAttCode, $oTargetObj->Get($sAttCode), '=');
+							$iConditionsCount++;
+						}
+					}
+					if ($iConditionsCount > 0) // Search only if there are some valid conditions...
+					{
+						$oSet = new DBObjectSet($oSearch);
+						if ($oSet->count() == 1)
+						{
+							// The object already exists, reuse it
+							$oExistingObject = $oSet->Fetch();
+							$iObjId = $oExistingObject->GetKey();
+						}
+					}
+				}
+			}	
+			
+			if ($iObjId == 0)
+			{
+				if($oTargetObj->IsNew())
+				{
+					if (!$bUpdateKeyCacheOnly)
+					{
+			        	$iObjId = $oTargetObj->DBInsertNoReload();
+						$this->m_iCountCreated++;
+					}
+				}
+				else
+				{
+					$iObjId = $oTargetObj->GetKey();
+					if (!$bUpdateKeyCacheOnly)
+					{
+						$oTargetObj->DBUpdate();
+					}
+				}
+			}	        
+		}
+		catch(Exception $e)
+		{
+			SetupPage::log_error("An object could not be recorded - $sClass/$iSrcId - ".$e->getMessage());
+			$this->m_aErrors[] = "An object could not be recorded - $sClass/$iSrcId - ".$e->getMessage();
+		}
+		$aParentClasses = MetaModel::EnumParentClasses($sClass);
+		$aParentClasses[] = $sClass;
+		foreach($aParentClasses as $sObjClass)
+		{
+			$this->m_aKeys[$sObjClass][$iSrcId] = $iObjId;
+		}
+		$this->m_aObjectsCache[$sClass][$iObjId] = $oTargetObj;
+	}
+	
+	/**
+	 * Maps an external key to its (newly created) value
+	 */
+	 
+	protected function ResolveExternalKeys()
+	{
+		foreach($this->m_aObjectsCache as $sClass => $oObjList)
+		{
+			foreach($oObjList as $oTargetObj)
+			{	
+				$bChanged = false;
+				$sClass = get_class($oTargetObj);
+				foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode=>$oAttDef)
+				{
+					if ( ($oAttDef->IsExternalKey()) && ($oTargetObj->Get($sAttCode) < 0) ) // Convention unresolved key = negative
+					{
+						$sTargetClass = $oAttDef->GetTargetClass();
+						$iTempKey = $oTargetObj->Get($sAttCode);
+
+						$iExtKey = $this->GetObjectKey($sTargetClass, -$iTempKey);
+						if ($iExtKey == 0)
+						{
+							$sMsg = "unresolved extkey in $sClass::".$oTargetObj->GetKey()."(".$oTargetObj->GetName().")::$sAttCode=$sTargetClass::$iTempKey";
+							SetupPage::log_warning($sMsg);
+							$this->m_aWarnings[] = $sMsg;
+							//echo "<pre>aKeys[".$sTargetClass."]:\n";
+							//print_r($this->m_aKeys[$sTargetClass]);
+							//echo "</pre>\n";
+						}
+						else
+						{
+							$bChanged = true;
+							$oTargetObj->Set($sAttCode, $iExtKey);
+						}
+					}
+				}
+				if ($bChanged)
+				{
+					try
+					{
+						if (is_subclass_of($oTargetObj, 'CMDBObject'))
+						{
+					        $oTargetObj->DBUpdateTracked($this->m_oChange);
+						}
+						else
+						{
+					        $oTargetObj->DBUpdate();
+						}
+					}
+					catch(Exception $e)
+					{
+						$this->m_aErrors[] = "The object changes could not be tracked - $sClass/$iExtKey - ".$e->getMessage();
+					}
+				}
+			}
+		}
+	
+		return true;
+	}
+}
+?>
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
index c0f8d5f83..949c9a3fa 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
@@ -1,69 +1,69 @@
-<?php
-// Copyright (C) 2016-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Renderer\Bootstrap\FieldRenderer;
-
-use Dict;
-use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
-use Combodo\iTop\Renderer\FieldRenderer;
-use Combodo\iTop\Renderer\RenderingOutput;
-
-class BsSubFormFieldRenderer extends FieldRenderer
-{
-	public function Render()
-	{
-		$oOutput = new RenderingOutput();
-		
-		// Showing subform if there are visible fields
-		if (!$this->oField->GetForm()->HasVisibleFields())
-		{
-			$oOutput->AddHtml('<div class="hidden">');
-		}
-		if (($this->oField->GetLabel() !== null) && ($this->oField->GetLabel() !== ''))
-		{
-			$oOutput->AddHtml('<fieldset><legend>' . $this->oField->GetLabel() . '</legend>');
-		}
-		$oOutput->AddHtml('<div id="fieldset_' . $this->oField->GetGlobalId() . '">');
-		$oOutput->AddHtml('</div>');
-		if (($this->oField->GetLabel() !== null) && ($this->oField->GetLabel() !== ''))
-		{
-			$oOutput->AddHtml('</fieldset>');
-		}
-		if (!$this->oField->GetForm()->HasVisibleFields())
-		{
-			$oOutput->AddHtml('</div>');
-		}
-		
-		$oRenderer = new BsFormRenderer($this->oField->GetForm());
-		$aRenderRes = $oRenderer->Render();
-		$aFieldSetOptions = array(
-			'fields_list' => $aRenderRes,
-			'fields_impacts' => $this->oField->GetForm()->GetFieldsImpacts(),
-			'form_path' => $this->oField->GetForm()->GetId()
-		);
-		
-		$sFieldSetOptions = json_encode($aFieldSetOptions);
-		$oOutput->AddJs(
-<<<EOF
-			$("#fieldset_{$this->oField->GetGlobalId()}").field_set($sFieldSetOptions);
-			$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").subform_field({field_set: $("#fieldset_{$this->oField->GetGlobalId()}")});
-EOF
-				);
-		return $oOutput;
-	}
+<?php
+// Copyright (C) 2016-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Renderer\Bootstrap\FieldRenderer;
+
+use Dict;
+use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
+use Combodo\iTop\Renderer\FieldRenderer;
+use Combodo\iTop\Renderer\RenderingOutput;
+
+class BsSubFormFieldRenderer extends FieldRenderer
+{
+	public function Render()
+	{
+		$oOutput = new RenderingOutput();
+		
+		// Showing subform if there are visible fields
+		if (!$this->oField->GetForm()->HasVisibleFields())
+		{
+			$oOutput->AddHtml('<div class="hidden">');
+		}
+		if (($this->oField->GetLabel() !== null) && ($this->oField->GetLabel() !== ''))
+		{
+			$oOutput->AddHtml('<fieldset><legend>' . $this->oField->GetLabel() . '</legend>');
+		}
+		$oOutput->AddHtml('<div id="fieldset_' . $this->oField->GetGlobalId() . '">');
+		$oOutput->AddHtml('</div>');
+		if (($this->oField->GetLabel() !== null) && ($this->oField->GetLabel() !== ''))
+		{
+			$oOutput->AddHtml('</fieldset>');
+		}
+		if (!$this->oField->GetForm()->HasVisibleFields())
+		{
+			$oOutput->AddHtml('</div>');
+		}
+		
+		$oRenderer = new BsFormRenderer($this->oField->GetForm());
+		$aRenderRes = $oRenderer->Render();
+		$aFieldSetOptions = array(
+			'fields_list' => $aRenderRes,
+			'fields_impacts' => $this->oField->GetForm()->GetFieldsImpacts(),
+			'form_path' => $this->oField->GetForm()->GetId()
+		);
+		
+		$sFieldSetOptions = json_encode($aFieldSetOptions);
+		$oOutput->AddJs(
+<<<EOF
+			$("#fieldset_{$this->oField->GetGlobalId()}").field_set($sFieldSetOptions);
+			$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").subform_field({field_set: $("#fieldset_{$this->oField->GetGlobalId()}")});
+EOF
+				);
+		return $oOutput;
+	}
 }
\ No newline at end of file
diff --git a/sources/renderer/console/consoleformrenderer.class.inc.php b/sources/renderer/console/consoleformrenderer.class.inc.php
index fa59c4c23..0b130f78a 100644
--- a/sources/renderer/console/consoleformrenderer.class.inc.php
+++ b/sources/renderer/console/consoleformrenderer.class.inc.php
@@ -1,46 +1,46 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Renderer\Console;
-
-use Combodo\iTop\Form\Form;
-use Combodo\iTop\Renderer\FormRenderer;
-use \Dict;
-
-require_once('fieldrenderer/consolesimplefieldrenderer.class.inc.php');
-require_once('fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php');
-require_once('fieldrenderer/consolesubformfieldrenderer.class.inc.php');
-
-class ConsoleFormRenderer extends FormRenderer
-{
-	const DEFAULT_RENDERER_NAMESPACE = 'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\';
-
-	public function __construct(Form $oForm)
-	{
-		parent::__construct($oForm);
-		$this->AddSupportedField('HiddenField', 'ConsoleSimpleFieldRenderer');
-		$this->AddSupportedField('StringField', 'ConsoleSimpleFieldRenderer');
-		$this->AddSupportedField('SelectField', 'ConsoleSimpleFieldRenderer');
-		$this->AddSupportedField('TextAreaField', 'ConsoleSimpleFieldRenderer');
-		$this->AddSupportedField('RadioField', 'ConsoleSimpleFieldRenderer');
-		$this->AddSupportedField('DurationField', 'ConsoleSimpleFieldRenderer');
-		$this->AddSupportedField('SelectObjectField', 'ConsoleSelectObjectFieldRenderer');
-		$this->AddSupportedField('SubFormField', 'ConsoleSubFormFieldRenderer');
-		$this->AddSupportedField('DateTimeField', 'ConsoleSimpleFieldRenderer');
-	}
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Renderer\Console;
+
+use Combodo\iTop\Form\Form;
+use Combodo\iTop\Renderer\FormRenderer;
+use \Dict;
+
+require_once('fieldrenderer/consolesimplefieldrenderer.class.inc.php');
+require_once('fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php');
+require_once('fieldrenderer/consolesubformfieldrenderer.class.inc.php');
+
+class ConsoleFormRenderer extends FormRenderer
+{
+	const DEFAULT_RENDERER_NAMESPACE = 'Combodo\\iTop\\Renderer\\Console\\FieldRenderer\\';
+
+	public function __construct(Form $oForm)
+	{
+		parent::__construct($oForm);
+		$this->AddSupportedField('HiddenField', 'ConsoleSimpleFieldRenderer');
+		$this->AddSupportedField('StringField', 'ConsoleSimpleFieldRenderer');
+		$this->AddSupportedField('SelectField', 'ConsoleSimpleFieldRenderer');
+		$this->AddSupportedField('TextAreaField', 'ConsoleSimpleFieldRenderer');
+		$this->AddSupportedField('RadioField', 'ConsoleSimpleFieldRenderer');
+		$this->AddSupportedField('DurationField', 'ConsoleSimpleFieldRenderer');
+		$this->AddSupportedField('SelectObjectField', 'ConsoleSelectObjectFieldRenderer');
+		$this->AddSupportedField('SubFormField', 'ConsoleSubFormFieldRenderer');
+		$this->AddSupportedField('DateTimeField', 'ConsoleSimpleFieldRenderer');
+	}
 }
\ No newline at end of file
diff --git a/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
index 935f9a21d..1b1336407 100644
--- a/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consoleselectobjectfieldrenderer.class.inc.php
@@ -1,254 +1,254 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Renderer\Console\FieldRenderer;
-
-use Combodo\iTop\Form\Validator\MandatoryValidator;
-use \Dict;
-use \DBObjectSet;
-use Combodo\iTop\Renderer\FieldRenderer;
-use Combodo\iTop\Renderer\RenderingOutput;
-use Combodo\iTop\Form\Field\SelectObjectField;
-
-
-class ConsoleSelectObjectFieldRenderer extends FieldRenderer
-{
-	public function Render()
-	{
-		$oOutput = new RenderingOutput();
-
-		$oOutput->AddHtml('<table class="form-field-container">');
-		$oOutput->AddHtml('<tr>');
-		if ($this->oField->GetLabel() != '')
-		{
-			$oOutput->AddHtml('<td class="form-field-label label"><span><label for="'.$this->oField->GetGlobalId().'">'.$this->oField->GetLabel().'</label></span></td>');
-		}
-		$oOutput->AddHtml('<td class="form-field-content">');
-		$sEditType = 'none';
-		if ($this->oField->GetReadOnly())
-		{
-			$oSearch = $this->oField->GetSearch()->DeepClone();
-			$oSearch->AddCondition('id', $this->oField->GetCurrentValue());
-			$oSet = new DBObjectSet($oSearch);
-			$oObject = $oSet->Fetch();
-			if ($oObject)
-			{
-				$sCurrentLabel = $oObject->Get('friendlyname');
-			}
-			else
-			{
-				$sCurrentLabel = '';
-			}
-			$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
-			$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').'</span>');
-		}
-		else
-		{
-			$oSearch = $this->oField->GetSearch()->DeepClone();
-			$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
-
-			$oSet = new \DBObjectSet($oSearch);
-			$oSet->ApplyParameters();
-			$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
-
-			$sTargetClass = $oSearch->GetClass();
-			$oAllowedValues = new DBObjectSet($oSearch);
-
-			$iMaxComboLength = $this->oField->GetMaximumComboLength();
-			$iCount = $oAllowedValues->Count();
-			if ($iCount > $iMaxComboLength)
-			{
-				// Auto-complete
-				//
-				$sEditType = 'autocomplete';
-				$aExtKeyParams = array();
-				$aExtKeyParams['iFieldSize'] = 10;
-				$aExtKeyParams['iMinChars'] = $this->oField->GetMinAutoCompleteChars();
-				$sFieldName = $this->oField->GetGlobalId();
-				$sFieldId = $sFieldName;
-				$sFormPrefix = '';
-				$oWidget = new \UIExtKeyWidget($sTargetClass, $sFieldId, '', true);
-				$aArgs = array();
-				$sDisplayStyle = 'select';
-				$sTitle = $this->oField->GetLabel();
-				require_once(APPROOT.'application/capturewebpage.class.inc.php');
-				$oPage = new \CaptureWebPage();
-				$sHTMLValue = $oWidget->Display($oPage, $iMaxComboLength, false /* $bAllowTargetCreation */, $sTitle, $oSet, $this->oField->GetCurrentValue(), $sFieldId, $this->oField->GetMandatory(), $sFieldName, $sFormPrefix, $aArgs, null, $sDisplayStyle);
-				$oOutput->AddHtml($sHTMLValue);
-				$oOutput->AddHtml($oPage->GetHtml());
-				$oOutput->AddJs($oPage->GetJS());
-				$oOutput->AddJs($oPage->GetReadyJS());
-				foreach ($oPage->GetCSS() as $sCss)
-				{
-					$oOutput->AddCss($sCss);
-				}
-				foreach ($oPage->GetJSFiles() as $sFile)
-				{
-					$oOutput->AddJsFile($sFile);
-				}
-				foreach ($oPage->GetCSSFiles() as $sFile)
-				{
-					$oOutput->AddCssFile($sFile);
-				}
-			}
-			elseif($this->oField->GetControlType() == SelectObjectField::CONTROL_RADIO_VERTICAL)
-			{
-				// Radio buttons (vertical)
-				//
-				$sEditType = 'radio';
-				$bVertical = true;
-				$idx = 0;
-				$bMandatory = $this->oField->GetMandatory();
-				$value = $this->oField->GetCurrentValue();
-				$sId = $this->oField->GetGlobalId();
-				$oOutput->AddHtml('<div>');
-				while ($oObject = $oSet->Fetch())
-				{
-					$iObject = $oObject->GetKey();
-					$sLabel = $oObject->Get('friendlyname');
-					if (($iCount == 1) && $bMandatory)
-					{
-						// When there is only once choice, select it by default
-						$sSelected = ' checked';
-					}
-					else
-					{
-						$sSelected = ($value == $iObject) ? ' checked' : '';
-					}
-					$oOutput->AddHtml("<input type=\"radio\" id=\"{$sId}_{$iObject}\" name=\"radio_$sId\" onChange=\"$('#{$sId}').val(this.value).trigger('change');\" value=\"$iObject\"$sSelected><label class=\"radio\" for=\"{$sId}_{$iObject}\">&nbsp;".htmlentities($sLabel, ENT_QUOTES, 'UTF-8')."</label>&nbsp;");
-					if ($bVertical)
-					{
-						$oOutput->AddHtml("<br>\n");
-					}
-					$idx++;
-				}
-				$oOutput->AddHtml('</div>');
-				$oOutput->AddHtml("<input type=\"hidden\" id=\"$sId\" name=\"$sId\" value=\"$value\"/>");
-			}
-			else
-			{
-				// Drop-down select
-				//
-				$sEditType = 'select';
-				$oOutput->AddHtml('<select class="form-field-data" id="'.$this->oField->GetGlobalId().'">');
-				$oOutput->AddHtml('<option value="">'.Dict::S('UI:SelectOne').'</option>');
-				while ($oObject = $oSet->Fetch())
-				{
-					$iObject = $oObject->GetKey();
-					$sLabel = $oObject->Get('friendlyname');
-					// Note : The test is a double equal on purpose as the type of the value received from the XHR is not always the same as the type of the allowed values. (eg : string vs int)
-					$sSelectedAtt = ($this->oField->GetCurrentValue() == $iObject) ? 'selected' : '';
-					$oOutput->AddHtml('<option value="'.$iObject.'" '.$sSelectedAtt.' >'.htmlentities($sLabel, ENT_QUOTES, 'UTF-8').'</option>');
-				}
-				$oOutput->AddHtml('</select>');
-			}
-			$oOutput->AddJs(
-				<<<EOF
-	                    $("#{$this->oField->GetGlobalId()}").off("change").on("change", function(){
-                    	var me = this;
-
-                        $(this).closest(".field_set").trigger("field_change", {
-                            id: $(me).attr("id"),
-                            name: $(me).closest(".form_field").attr("data-field-id"),
-                            value: $(me).val()
-                        })
-                        .closest('.form_handler').trigger('value_change');
-                    });
-EOF
-			);
-		}
-		$oOutput->AddHtml('<span class="form_validation"></span>');
-		$oOutput->AddHtml('</td>');
-
-		$oOutput->AddHtml('</tr>');
-		$oOutput->AddHtml('</table>');
-
-		// JS Form field widget construct
-		$aValidators = array();
-		foreach ($this->oField->GetValidators() as $oValidator)
-		{
-			if ($oValidator::GetName() == 'notemptyextkey')
-			{
-				// The autocomplete widget returns an empty string if the value is undefined (and the select has been aligned with this behavior)
-				$oValidator = new MandatoryValidator();
-			}
-			$aValidators[$oValidator::GetName()] = array(
-				'reg_exp' => $oValidator->GetRegExp(),
-				'message' => Dict::S($oValidator->GetErrorMessage())
-			);
-		}
-		$sValidators = json_encode($aValidators);
-		$sFormFieldOptions =
-<<<EOF
-{
-	validators: $sValidators,
-	on_validation_callback: function(me, oResult) {
-		var oValidationElement = $(me.element).find('span.form_validation');
-		if (oResult.is_valid)
-		{
-			oValidationElement.html('');
-		}
-		else
-		{
-			//TODO: escape html entities
-			var sExplain = oResult.error_messages.join(', ');
-			oValidationElement.html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
-			oValidationElement.tooltip({
-				items: 'span',
-				tooltipClass: 'form_field_error',
-				content: function() {
-					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
-				}
-			});
-		}
-	}
-}
-EOF
-			;
-
-		$oOutput->AddJs(
-			<<<EOF
-                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field($sFormFieldOptions);
-EOF
-		);
-		switch ($sEditType)
-		{
-			case 'autocomplete':
-			case 'radio':
-				$oOutput->AddJs(
-					<<<EOF
-	                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field('option', 'get_current_value_callback', function(me){ return $(me.element).find('#{$this->oField->GetGlobalId()}').val();});
-EOF
-				);
-				break;
-			case 'select':
-				$oOutput->AddJs(
-					<<<EOF
-	                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field('option', 'get_current_value_callback', function(me){ return $(me.element).find('select').val();});
-EOF
-				);
-				break;
-
-			case 'none':
-			default:
-				// Not editable
-		}
-
-		return $oOutput;
-	}
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Renderer\Console\FieldRenderer;
+
+use Combodo\iTop\Form\Validator\MandatoryValidator;
+use \Dict;
+use \DBObjectSet;
+use Combodo\iTop\Renderer\FieldRenderer;
+use Combodo\iTop\Renderer\RenderingOutput;
+use Combodo\iTop\Form\Field\SelectObjectField;
+
+
+class ConsoleSelectObjectFieldRenderer extends FieldRenderer
+{
+	public function Render()
+	{
+		$oOutput = new RenderingOutput();
+
+		$oOutput->AddHtml('<table class="form-field-container">');
+		$oOutput->AddHtml('<tr>');
+		if ($this->oField->GetLabel() != '')
+		{
+			$oOutput->AddHtml('<td class="form-field-label label"><span><label for="'.$this->oField->GetGlobalId().'">'.$this->oField->GetLabel().'</label></span></td>');
+		}
+		$oOutput->AddHtml('<td class="form-field-content">');
+		$sEditType = 'none';
+		if ($this->oField->GetReadOnly())
+		{
+			$oSearch = $this->oField->GetSearch()->DeepClone();
+			$oSearch->AddCondition('id', $this->oField->GetCurrentValue());
+			$oSet = new DBObjectSet($oSearch);
+			$oObject = $oSet->Fetch();
+			if ($oObject)
+			{
+				$sCurrentLabel = $oObject->Get('friendlyname');
+			}
+			else
+			{
+				$sCurrentLabel = '';
+			}
+			$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
+			$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').'</span>');
+		}
+		else
+		{
+			$oSearch = $this->oField->GetSearch()->DeepClone();
+			$oSearch->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', true);
+
+			$oSet = new \DBObjectSet($oSearch);
+			$oSet->ApplyParameters();
+			$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
+
+			$sTargetClass = $oSearch->GetClass();
+			$oAllowedValues = new DBObjectSet($oSearch);
+
+			$iMaxComboLength = $this->oField->GetMaximumComboLength();
+			$iCount = $oAllowedValues->Count();
+			if ($iCount > $iMaxComboLength)
+			{
+				// Auto-complete
+				//
+				$sEditType = 'autocomplete';
+				$aExtKeyParams = array();
+				$aExtKeyParams['iFieldSize'] = 10;
+				$aExtKeyParams['iMinChars'] = $this->oField->GetMinAutoCompleteChars();
+				$sFieldName = $this->oField->GetGlobalId();
+				$sFieldId = $sFieldName;
+				$sFormPrefix = '';
+				$oWidget = new \UIExtKeyWidget($sTargetClass, $sFieldId, '', true);
+				$aArgs = array();
+				$sDisplayStyle = 'select';
+				$sTitle = $this->oField->GetLabel();
+				require_once(APPROOT.'application/capturewebpage.class.inc.php');
+				$oPage = new \CaptureWebPage();
+				$sHTMLValue = $oWidget->Display($oPage, $iMaxComboLength, false /* $bAllowTargetCreation */, $sTitle, $oSet, $this->oField->GetCurrentValue(), $sFieldId, $this->oField->GetMandatory(), $sFieldName, $sFormPrefix, $aArgs, null, $sDisplayStyle);
+				$oOutput->AddHtml($sHTMLValue);
+				$oOutput->AddHtml($oPage->GetHtml());
+				$oOutput->AddJs($oPage->GetJS());
+				$oOutput->AddJs($oPage->GetReadyJS());
+				foreach ($oPage->GetCSS() as $sCss)
+				{
+					$oOutput->AddCss($sCss);
+				}
+				foreach ($oPage->GetJSFiles() as $sFile)
+				{
+					$oOutput->AddJsFile($sFile);
+				}
+				foreach ($oPage->GetCSSFiles() as $sFile)
+				{
+					$oOutput->AddCssFile($sFile);
+				}
+			}
+			elseif($this->oField->GetControlType() == SelectObjectField::CONTROL_RADIO_VERTICAL)
+			{
+				// Radio buttons (vertical)
+				//
+				$sEditType = 'radio';
+				$bVertical = true;
+				$idx = 0;
+				$bMandatory = $this->oField->GetMandatory();
+				$value = $this->oField->GetCurrentValue();
+				$sId = $this->oField->GetGlobalId();
+				$oOutput->AddHtml('<div>');
+				while ($oObject = $oSet->Fetch())
+				{
+					$iObject = $oObject->GetKey();
+					$sLabel = $oObject->Get('friendlyname');
+					if (($iCount == 1) && $bMandatory)
+					{
+						// When there is only once choice, select it by default
+						$sSelected = ' checked';
+					}
+					else
+					{
+						$sSelected = ($value == $iObject) ? ' checked' : '';
+					}
+					$oOutput->AddHtml("<input type=\"radio\" id=\"{$sId}_{$iObject}\" name=\"radio_$sId\" onChange=\"$('#{$sId}').val(this.value).trigger('change');\" value=\"$iObject\"$sSelected><label class=\"radio\" for=\"{$sId}_{$iObject}\">&nbsp;".htmlentities($sLabel, ENT_QUOTES, 'UTF-8')."</label>&nbsp;");
+					if ($bVertical)
+					{
+						$oOutput->AddHtml("<br>\n");
+					}
+					$idx++;
+				}
+				$oOutput->AddHtml('</div>');
+				$oOutput->AddHtml("<input type=\"hidden\" id=\"$sId\" name=\"$sId\" value=\"$value\"/>");
+			}
+			else
+			{
+				// Drop-down select
+				//
+				$sEditType = 'select';
+				$oOutput->AddHtml('<select class="form-field-data" id="'.$this->oField->GetGlobalId().'">');
+				$oOutput->AddHtml('<option value="">'.Dict::S('UI:SelectOne').'</option>');
+				while ($oObject = $oSet->Fetch())
+				{
+					$iObject = $oObject->GetKey();
+					$sLabel = $oObject->Get('friendlyname');
+					// Note : The test is a double equal on purpose as the type of the value received from the XHR is not always the same as the type of the allowed values. (eg : string vs int)
+					$sSelectedAtt = ($this->oField->GetCurrentValue() == $iObject) ? 'selected' : '';
+					$oOutput->AddHtml('<option value="'.$iObject.'" '.$sSelectedAtt.' >'.htmlentities($sLabel, ENT_QUOTES, 'UTF-8').'</option>');
+				}
+				$oOutput->AddHtml('</select>');
+			}
+			$oOutput->AddJs(
+				<<<EOF
+	                    $("#{$this->oField->GetGlobalId()}").off("change").on("change", function(){
+                    	var me = this;
+
+                        $(this).closest(".field_set").trigger("field_change", {
+                            id: $(me).attr("id"),
+                            name: $(me).closest(".form_field").attr("data-field-id"),
+                            value: $(me).val()
+                        })
+                        .closest('.form_handler').trigger('value_change');
+                    });
+EOF
+			);
+		}
+		$oOutput->AddHtml('<span class="form_validation"></span>');
+		$oOutput->AddHtml('</td>');
+
+		$oOutput->AddHtml('</tr>');
+		$oOutput->AddHtml('</table>');
+
+		// JS Form field widget construct
+		$aValidators = array();
+		foreach ($this->oField->GetValidators() as $oValidator)
+		{
+			if ($oValidator::GetName() == 'notemptyextkey')
+			{
+				// The autocomplete widget returns an empty string if the value is undefined (and the select has been aligned with this behavior)
+				$oValidator = new MandatoryValidator();
+			}
+			$aValidators[$oValidator::GetName()] = array(
+				'reg_exp' => $oValidator->GetRegExp(),
+				'message' => Dict::S($oValidator->GetErrorMessage())
+			);
+		}
+		$sValidators = json_encode($aValidators);
+		$sFormFieldOptions =
+<<<EOF
+{
+	validators: $sValidators,
+	on_validation_callback: function(me, oResult) {
+		var oValidationElement = $(me.element).find('span.form_validation');
+		if (oResult.is_valid)
+		{
+			oValidationElement.html('');
+		}
+		else
+		{
+			//TODO: escape html entities
+			var sExplain = oResult.error_messages.join(', ');
+			oValidationElement.html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
+			oValidationElement.tooltip({
+				items: 'span',
+				tooltipClass: 'form_field_error',
+				content: function() {
+					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
+				}
+			});
+		}
+	}
+}
+EOF
+			;
+
+		$oOutput->AddJs(
+			<<<EOF
+                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field($sFormFieldOptions);
+EOF
+		);
+		switch ($sEditType)
+		{
+			case 'autocomplete':
+			case 'radio':
+				$oOutput->AddJs(
+					<<<EOF
+	                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field('option', 'get_current_value_callback', function(me){ return $(me.element).find('#{$this->oField->GetGlobalId()}').val();});
+EOF
+				);
+				break;
+			case 'select':
+				$oOutput->AddJs(
+					<<<EOF
+	                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field('option', 'get_current_value_callback', function(me){ return $(me.element).find('select').val();});
+EOF
+				);
+				break;
+
+			case 'none':
+			default:
+				// Not editable
+		}
+
+		return $oOutput;
+	}
 }
\ No newline at end of file
diff --git a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
index 35f5af2bb..7b9ee5d3b 100644
--- a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
@@ -1,389 +1,389 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Renderer\Console\FieldRenderer;
-
-use AttributeDate;
-use AttributeDateTime;
-use AttributeDuration;
-use Combodo\iTop\Form\Field\TextAreaField;
-use Combodo\iTop\Renderer\FieldRenderer;
-use Combodo\iTop\Renderer\RenderingOutput;
-use DateTimeFormat;
-use Dict;
-use InlineImage;
-use UserRights;
-
-class ConsoleSimpleFieldRenderer extends FieldRenderer
-{
-	public function Render()
-	{
-		$oOutput = new RenderingOutput();
-		$sFieldClass = get_class($this->oField);
-
-		if ($sFieldClass == 'Combodo\\iTop\\Form\\Field\\HiddenField')
-		{
-			$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
-		}
-		else
-		{
-			$oOutput->AddHtml('<table class="form-field-container">');
-			$oOutput->AddHtml('<tr>');
-			if ($this->oField->GetLabel() != '')
-			{
-				$oOutput->AddHtml('<td class="form-field-label label"><span><label for="'.$this->oField->GetGlobalId().'">'.$this->oField->GetLabel().'</label></span></td>');
-			}
-			switch ($sFieldClass)
-			{
-				case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
-					$sDateTimeFormat = $this->oField->GetPHPDateTimeFormat();
-					$oFormat = new DateTimeFormat($sDateTimeFormat);
-					$sPlaceHolder = $oFormat->ToPlaceholder();
-					$oOutput->AddHtml('<td class="form-field-content">');
-					if ($this->oField->GetReadOnly())
-					{
-						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
-						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'</span>');
-					}
-					else
-					{
-						$oOutput->AddHtml('<input class="form-field-data datetime-pick" size="15" type="text" placeholder="'.htmlentities($sPlaceHolder, ENT_QUOTES, 'UTF-8').'" id="'.$this->oField->GetGlobalId().'" value="'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'" size="30"/>');
-					}
-					$oOutput->AddHtml('<span class="form_validation"></span>');
-					$oOutput->AddHtml('</td>');
-					break;
-
-				case 'Combodo\\iTop\\Form\\Field\\StringField':
-					$oOutput->AddHtml('<td class="form-field-content">');
-					if ($this->oField->GetReadOnly())
-					{
-						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
-						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'</span>');
-					}
-					else
-					{
-						$oOutput->AddHtml('<input class="form-field-data" type="text" id="'.$this->oField->GetGlobalId().'" value="'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'" size="30"/>');
-					}
-					$oOutput->AddHtml('<span class="form_validation"></span>');
-					$oOutput->AddHtml('</td>');
-					break;
-
-				case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
-					$bRichEditor = ($this->oField->GetFormat() === TextAreaField::ENUM_FORMAT_HTML);
-
-					$oOutput->AddHtml('<td class="form-field-content">');
-					if ($this->oField->GetReadOnly())
-					{
-						$oOutput->AddHtml('<textarea disabled="disabled" id="' . $this->oField->GetGlobalId() . '" class="form-field-data resizable" rows="8" cols="40">' . $this->oField->GetCurrentValue() . '</textarea>');
-					}
-					else
-					{
-						$oOutput->AddHtml('<textarea id="' . $this->oField->GetGlobalId() . '" class="form-field-data resizable" rows="8" cols="40">' . $this->oField->GetCurrentValue() . '</textarea>');
-						// Some additional stuff if we are displaying it with a rich editor
-						if ($bRichEditor)
-						{
-							$sEditorLanguage = strtolower(trim(UserRights::GetUserLanguage()));
-							$oOutput->AddJs(
-<<<EOF
-								$('#{$this->oField->GetGlobalId()}').addClass('htmlEditor');
-							$('#{$this->oField->GetGlobalId()}').ckeditor(function(){}, {language: '$sEditorLanguage', contentsLanguage: '$sEditorLanguage'});
-EOF
-							);
-							if (($this->oField->GetObject() !== null) && ($this->oField->GetTransactionId() !== null))
-							{
-								$oOutput->AddJs(InlineImage::EnableCKEditorImageUpload($this->oField->GetObject(), utils::GetUploadTempId($this->oField->GetTransactionId())));
-							}
-						}
-					}
-					$oOutput->AddHtml('<span class="form_validation"></span>');
-					$oOutput->AddHtml('</td>');
-					break;
-
-				case 'Combodo\\iTop\\Form\\Field\\SelectField':
-					$oOutput->AddHtml('<td class="form-field-content">');
-					if ($this->oField->GetReadOnly())
-					{
-						$aChoices = $this->oField->GetChoices();
-						$sCurrentLabel = isset($aChoices[$this->oField->GetCurrentValue()]) ? $aChoices[$this->oField->GetCurrentValue()] : '' ;
-						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
-						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').'</span>');
-					}
-					else
-					{
-						$oOutput->AddHtml('<select class="form-field-data" id="'.$this->oField->GetGlobalId().'" '.(($this->oField->GetMultipleValuesEnabled()) ? 'multiple' : '').'>');
-						foreach ($this->oField->GetChoices() as $sChoice => $sLabel)
-						{
-							// Note : The test is a double equal on purpose as the type of the value received from the XHR is not always the same as the type of the allowed values. (eg : string vs int)
-							$sSelectedAtt = ($this->oField->GetCurrentValue() == $sChoice) ? 'selected' : '';
-							$oOutput->AddHtml('<option value="'.htmlentities($sChoice, ENT_QUOTES, 'UTF-8').'" '.$sSelectedAtt.' >'.htmlentities($sLabel, ENT_QUOTES, 'UTF-8').'</option>');
-						}
-						$oOutput->AddHtml('</select>');
-					}
-					$oOutput->AddHtml('<span class="form_validation"></span>');
-					$oOutput->AddHtml('</td>');
-					break;
-
-				case 'Combodo\\iTop\\Form\\Field\\RadioField':
-					$oOutput->AddHtml('<td class="form-field-content">');
-					if ($this->oField->GetReadOnly())
-					{
-						$aChoices = $this->oField->GetChoices();
-						$sCurrentLabel = isset($aChoices[$this->oField->GetCurrentValue()]) ? $aChoices[$this->oField->GetCurrentValue()] : '' ;
-						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
-						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').'</span>');
-					}
-					else
-					{
-						$bVertical = true;
-						$idx = 0;
-						$bMandatory = $this->oField->GetMandatory();
-						$value = $this->oField->GetCurrentValue();
-						$sId = $this->oField->GetGlobalId();
-						$oOutput->AddHtml('<div>');
-						$aChoices = $this->oField->GetChoices();
-						foreach ($aChoices as $sChoice => $sLabel)
-						{
-							if ((count($aChoices)== 1) && $bMandatory)
-							{
-								// When there is only once choice, select it by default
-								$sSelected = ' checked';
-							}
-							else
-							{
-								$sSelected = ($value == $sChoice) ? ' checked' : '';
-							}
-							$oOutput->AddHtml("<input type=\"radio\" id=\"{$sId}_{$idx}\" name=\"radio_$sId\" onChange=\"$('#{$sId}').val(this.value).trigger('change');\" value=\"".htmlentities($sChoice, ENT_QUOTES, 'UTF-8')."\"$sSelected><label class=\"radio\" for=\"{$sId}_{$idx}\">&nbsp;".htmlentities($sLabel, ENT_QUOTES, 'UTF-8')."</label>&nbsp;");
-							if ($bVertical)
-							{
-								$oOutput->AddHtml("<br>\n");
-							}
-							$idx++;
-						}
-						$oOutput->AddHtml('</div>');
-						$oOutput->AddHtml("<input type=\"hidden\" id=\"$sId\" name=\"$sId\" value=\"$value\"/>");
-					}
-					$oOutput->AddHtml('<span class="form_validation"></span>');
-					$oOutput->AddHtml('</td>');
-					break;
-
-				case 'Combodo\\iTop\\Form\\Field\\DurationField':
-					$oOutput->AddHtml('<td class="form-field-content">');
-					$value = $this->oField->GetCurrentValue();
-					if ($this->oField->GetReadOnly())
-					{
-						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($value, ENT_QUOTES, 'UTF-8') . '"/>');
-						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities(\AttributeDuration::FormatDuration($value), ENT_QUOTES, 'UTF-8').'</span>');
-					}
-					else
-					{
-						$sId = $this->oField->GetGlobalId();
-
-						$aVal = AttributeDuration::SplitDuration($value);
-						$sDays = "<input type=\"text\" size=\"3\" name=\"{$sId}[d]\" value=\"{$aVal['days']}\" id=\"{$sId}_d\"/>";
-						$sHours = "<input type=\"text\" size=\"2\" name=\"{$sId}[h]\" value=\"{$aVal['hours']}\" id=\"{$sId}_h\"/>";
-						$sMinutes = "<input type=\"text\" size=\"2\" name=\"{$sId}[m]\" value=\"{$aVal['minutes']}\" id=\"{$sId}_m\"/>";
-						$sSeconds = "<input type=\"text\" size=\"2\" name=\"{$sId}[s]\" value=\"{$aVal['seconds']}\" id=\"{$sId}_s\"/>";
-						$oOutput->AddHtml(Dict::Format('UI:DurationForm_Days_Hours_Minutes_Seconds', $sDays, $sHours, $sMinutes, $sSeconds));
-						$oOutput->AddHtml("<input type=\"hidden\" id=\"{$sId}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\"/>");
-
-						$oOutput->AddJs("$('#{$sId}_d').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
-						$oOutput->AddJs("$('#{$sId}_h').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
-						$oOutput->AddJs("$('#{$sId}_m').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
-						$oOutput->AddJs("$('#{$sId}_s').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
-						$oOutput->AddJs("$('#{$sId}').bind('update', function(evt, sFormId) { return ToggleDurationField('$sId'); });");
-					}
-					$oOutput->AddHtml('<span class="form_validation"></span>');
-					$oOutput->AddHtml('</td>');
-					break;
-			}
-			$oOutput->AddHtml('</tr>');
-			$oOutput->AddHtml('</table>');
-		}
-
-		switch ($sFieldClass)
-		{
-			case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
-				$sDateTimeFormat = $this->oField->GetPHPDateTimeFormat();
-				$oFormat = new DateTimeFormat($sDateTimeFormat);
-				$sDatePickerFormat = $oFormat->ToDatePicker();
-				$sJSDaysMin = json_encode(array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
-								Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min')));
-				$sJSMonthsShort = json_encode(array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'), 
-													Dict::S('Month-07-Short'), Dict::S('Month-08-Short'), Dict::S('Month-09-Short'), Dict::S('Month-10-Short'), Dict::S('Month-11-Short'), Dict::S('Month-12-Short')));
-				$iFirstDayOfWeek = (int) Dict::S('Calendar-FirstDayOfWeek');
-				$sJSDateFormat = json_encode(AttributeDate::GetFormat()->ToDatePicker());
-				$sTimeFormat = AttributeDateTime::GetFormat()->ToTimeFormat();
-				$oTimeFormat = new DateTimeFormat($sTimeFormat);
-				$sJSTimeFormat = json_encode($oTimeFormat->ToDatePicker());
-				$sJSLangShort = json_encode(strtolower(substr(Dict::GetUserLanguage(), 0, 2)));
-				$sJSOk = json_encode(Dict::S('UI:Button:Ok'));
-				if ($this->oField->IsDateOnly())
-				{
-					$oOutput->AddJs(
-<<<EOF
-				$("#{$this->oField->GetGlobalId()}").datepicker({
-						showOn: 'button',
-						buttonImage: '../images/calendar.png',
-						buttonImageOnly: true,
-						dateFormat: $sJSDateFormat,
-						constrainInput: false,
-						changeMonth: true,
-						changeYear: true,
-						dayNamesMin: $sJSDaysMin,
-						monthNamesShort: $sJSMonthsShort,
-						firstDay: $iFirstDayOfWeek
-				});
-EOF
-					);
-				}
-				else
-				{
-					$oOutput->AddJs(
-<<<EOF
-				$("#{$this->oField->GetGlobalId()}").datetimepicker({
-						showOn: 'button',
-						buttonImage: '../images/calendar.png',
-						buttonImageOnly: true,
-						dateFormat: $sJSDateFormat,
-						constrainInput: false,
-						changeMonth: true,
-						changeYear: true,
-						dayNamesMin: $sJSDaysMin,
-						monthNamesShort: $sJSMonthsShort,
-						firstDay: $iFirstDayOfWeek,
-						// time picker options	
-						timeFormat: $sJSTimeFormat,
-						controlType: 'select',
-						closeText: $sJSOk
-				});
-EOF
-					);
-				}
-				
-				$oOutput->AddJs(
-<<<EOF
-                    $("#{$this->oField->GetGlobalId()}").off("change keyup").on("change keyup", function(){
-                    	var me = this;
-
-                        $(this).closest(".field_set").trigger("field_change", {
-                            id: $(me).attr("id"),
-                            name: $(me).closest(".form_field").attr("data-field-id"),
-                            value: $(me).val()
-                        })
-                        .closest('.form_handler').trigger('value_change');
-                    });
-EOF
-				);
-				break;				
-			break;
-			
-			case 'Combodo\\iTop\\Form\\Field\\StringField':
-			case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
-				$oOutput->AddJs(
-<<<EOF
-                    $("#{$this->oField->GetGlobalId()}").off("change keyup").on("change keyup", function(){
-                    	var me = this;
-
-                        $(this).closest(".field_set").trigger("field_change", {
-                            id: $(me).attr("id"),
-                            name: $(me).closest(".form_field").attr("data-field-id"),
-                            value: $(me).val()
-                        })
-                        .closest('.form_handler').trigger('value_change');
-                    });
-EOF
-				);
-				break;
-
-			case 'Combodo\\iTop\\Form\\Field\\SelectField':
-			case 'Combodo\\iTop\\Form\\Field\\RadioField':
-			case 'Combodo\\iTop\\Form\\Field\\DurationField':
-				$oOutput->AddJs(
-<<<EOF
-                    $("#{$this->oField->GetGlobalId()}").off("change").on("change", function(){
-                    	var me = this;
-
-                        $(this).closest(".field_set").trigger("field_change", {
-                            id: $(me).attr("id"),
-                            name: $(me).closest(".form_field").attr("data-field-id"),
-                            value: $(me).val()
-                        })
-                        .closest('.form_handler').trigger('value_change');
-                    });
-EOF
-				);
-				break;
-		}
-
-		// JS Form field widget construct
-		$aValidators = array();
-		foreach ($this->oField->GetValidators() as $oValidator)
-		{
-			$aValidators[$oValidator::GetName()] = array(
-				'reg_exp' => $oValidator->GetRegExp(),
-				'message' => Dict::S($oValidator->GetErrorMessage())
-			);
-		}
-		$sValidators = json_encode($aValidators);
-		$sFormFieldOptions =
-<<<EOF
-{
-	validators: $sValidators,
-	on_validation_callback: function(me, oResult) {
-		var oValidationElement = $(me.element).find('span.form_validation');
-		if (oResult.is_valid)
-		{
-			oValidationElement.html('');
-		}
-		else
-		{
-			//TODO: escape html entities
-			var sExplain = oResult.error_messages.join(', ');
-			oValidationElement.html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
-			oValidationElement.tooltip({
-				items: 'span',
-				tooltipClass: 'form_field_error',
-				content: function() {
-					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
-				}
-			});
-		}
-	}
-}
-EOF
-			;
-
-		$oOutput->AddJs(
-			<<<EOF
-                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field($sFormFieldOptions);
-EOF
-		);
-		switch ($sFieldClass)
-		{
-			case 'Combodo\\iTop\\Form\\Field\\SelectField':
-				$oOutput->AddJs(
-					<<<EOF
-	                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field('option', 'get_current_value_callback', function(me){ return $(me.element).find('select').val();});
-EOF
-				);
-				break;
-		}
-
-		return $oOutput;
-	}
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Renderer\Console\FieldRenderer;
+
+use AttributeDate;
+use AttributeDateTime;
+use AttributeDuration;
+use Combodo\iTop\Form\Field\TextAreaField;
+use Combodo\iTop\Renderer\FieldRenderer;
+use Combodo\iTop\Renderer\RenderingOutput;
+use DateTimeFormat;
+use Dict;
+use InlineImage;
+use UserRights;
+
+class ConsoleSimpleFieldRenderer extends FieldRenderer
+{
+	public function Render()
+	{
+		$oOutput = new RenderingOutput();
+		$sFieldClass = get_class($this->oField);
+
+		if ($sFieldClass == 'Combodo\\iTop\\Form\\Field\\HiddenField')
+		{
+			$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
+		}
+		else
+		{
+			$oOutput->AddHtml('<table class="form-field-container">');
+			$oOutput->AddHtml('<tr>');
+			if ($this->oField->GetLabel() != '')
+			{
+				$oOutput->AddHtml('<td class="form-field-label label"><span><label for="'.$this->oField->GetGlobalId().'">'.$this->oField->GetLabel().'</label></span></td>');
+			}
+			switch ($sFieldClass)
+			{
+				case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
+					$sDateTimeFormat = $this->oField->GetPHPDateTimeFormat();
+					$oFormat = new DateTimeFormat($sDateTimeFormat);
+					$sPlaceHolder = $oFormat->ToPlaceholder();
+					$oOutput->AddHtml('<td class="form-field-content">');
+					if ($this->oField->GetReadOnly())
+					{
+						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
+						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'</span>');
+					}
+					else
+					{
+						$oOutput->AddHtml('<input class="form-field-data datetime-pick" size="15" type="text" placeholder="'.htmlentities($sPlaceHolder, ENT_QUOTES, 'UTF-8').'" id="'.$this->oField->GetGlobalId().'" value="'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'" size="30"/>');
+					}
+					$oOutput->AddHtml('<span class="form_validation"></span>');
+					$oOutput->AddHtml('</td>');
+					break;
+
+				case 'Combodo\\iTop\\Form\\Field\\StringField':
+					$oOutput->AddHtml('<td class="form-field-content">');
+					if ($this->oField->GetReadOnly())
+					{
+						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
+						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'</span>');
+					}
+					else
+					{
+						$oOutput->AddHtml('<input class="form-field-data" type="text" id="'.$this->oField->GetGlobalId().'" value="'.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'" size="30"/>');
+					}
+					$oOutput->AddHtml('<span class="form_validation"></span>');
+					$oOutput->AddHtml('</td>');
+					break;
+
+				case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
+					$bRichEditor = ($this->oField->GetFormat() === TextAreaField::ENUM_FORMAT_HTML);
+
+					$oOutput->AddHtml('<td class="form-field-content">');
+					if ($this->oField->GetReadOnly())
+					{
+						$oOutput->AddHtml('<textarea disabled="disabled" id="' . $this->oField->GetGlobalId() . '" class="form-field-data resizable" rows="8" cols="40">' . $this->oField->GetCurrentValue() . '</textarea>');
+					}
+					else
+					{
+						$oOutput->AddHtml('<textarea id="' . $this->oField->GetGlobalId() . '" class="form-field-data resizable" rows="8" cols="40">' . $this->oField->GetCurrentValue() . '</textarea>');
+						// Some additional stuff if we are displaying it with a rich editor
+						if ($bRichEditor)
+						{
+							$sEditorLanguage = strtolower(trim(UserRights::GetUserLanguage()));
+							$oOutput->AddJs(
+<<<EOF
+								$('#{$this->oField->GetGlobalId()}').addClass('htmlEditor');
+							$('#{$this->oField->GetGlobalId()}').ckeditor(function(){}, {language: '$sEditorLanguage', contentsLanguage: '$sEditorLanguage'});
+EOF
+							);
+							if (($this->oField->GetObject() !== null) && ($this->oField->GetTransactionId() !== null))
+							{
+								$oOutput->AddJs(InlineImage::EnableCKEditorImageUpload($this->oField->GetObject(), utils::GetUploadTempId($this->oField->GetTransactionId())));
+							}
+						}
+					}
+					$oOutput->AddHtml('<span class="form_validation"></span>');
+					$oOutput->AddHtml('</td>');
+					break;
+
+				case 'Combodo\\iTop\\Form\\Field\\SelectField':
+					$oOutput->AddHtml('<td class="form-field-content">');
+					if ($this->oField->GetReadOnly())
+					{
+						$aChoices = $this->oField->GetChoices();
+						$sCurrentLabel = isset($aChoices[$this->oField->GetCurrentValue()]) ? $aChoices[$this->oField->GetCurrentValue()] : '' ;
+						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
+						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').'</span>');
+					}
+					else
+					{
+						$oOutput->AddHtml('<select class="form-field-data" id="'.$this->oField->GetGlobalId().'" '.(($this->oField->GetMultipleValuesEnabled()) ? 'multiple' : '').'>');
+						foreach ($this->oField->GetChoices() as $sChoice => $sLabel)
+						{
+							// Note : The test is a double equal on purpose as the type of the value received from the XHR is not always the same as the type of the allowed values. (eg : string vs int)
+							$sSelectedAtt = ($this->oField->GetCurrentValue() == $sChoice) ? 'selected' : '';
+							$oOutput->AddHtml('<option value="'.htmlentities($sChoice, ENT_QUOTES, 'UTF-8').'" '.$sSelectedAtt.' >'.htmlentities($sLabel, ENT_QUOTES, 'UTF-8').'</option>');
+						}
+						$oOutput->AddHtml('</select>');
+					}
+					$oOutput->AddHtml('<span class="form_validation"></span>');
+					$oOutput->AddHtml('</td>');
+					break;
+
+				case 'Combodo\\iTop\\Form\\Field\\RadioField':
+					$oOutput->AddHtml('<td class="form-field-content">');
+					if ($this->oField->GetReadOnly())
+					{
+						$aChoices = $this->oField->GetChoices();
+						$sCurrentLabel = isset($aChoices[$this->oField->GetCurrentValue()]) ? $aChoices[$this->oField->GetCurrentValue()] : '' ;
+						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8') . '"/>');
+						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').'</span>');
+					}
+					else
+					{
+						$bVertical = true;
+						$idx = 0;
+						$bMandatory = $this->oField->GetMandatory();
+						$value = $this->oField->GetCurrentValue();
+						$sId = $this->oField->GetGlobalId();
+						$oOutput->AddHtml('<div>');
+						$aChoices = $this->oField->GetChoices();
+						foreach ($aChoices as $sChoice => $sLabel)
+						{
+							if ((count($aChoices)== 1) && $bMandatory)
+							{
+								// When there is only once choice, select it by default
+								$sSelected = ' checked';
+							}
+							else
+							{
+								$sSelected = ($value == $sChoice) ? ' checked' : '';
+							}
+							$oOutput->AddHtml("<input type=\"radio\" id=\"{$sId}_{$idx}\" name=\"radio_$sId\" onChange=\"$('#{$sId}').val(this.value).trigger('change');\" value=\"".htmlentities($sChoice, ENT_QUOTES, 'UTF-8')."\"$sSelected><label class=\"radio\" for=\"{$sId}_{$idx}\">&nbsp;".htmlentities($sLabel, ENT_QUOTES, 'UTF-8')."</label>&nbsp;");
+							if ($bVertical)
+							{
+								$oOutput->AddHtml("<br>\n");
+							}
+							$idx++;
+						}
+						$oOutput->AddHtml('</div>');
+						$oOutput->AddHtml("<input type=\"hidden\" id=\"$sId\" name=\"$sId\" value=\"$value\"/>");
+					}
+					$oOutput->AddHtml('<span class="form_validation"></span>');
+					$oOutput->AddHtml('</td>');
+					break;
+
+				case 'Combodo\\iTop\\Form\\Field\\DurationField':
+					$oOutput->AddHtml('<td class="form-field-content">');
+					$value = $this->oField->GetCurrentValue();
+					if ($this->oField->GetReadOnly())
+					{
+						$oOutput->AddHtml('<input type="hidden" id="'.$this->oField->GetGlobalId().'" value="' . htmlentities($value, ENT_QUOTES, 'UTF-8') . '"/>');
+						$oOutput->AddHtml('<span class="form-field-data">'.htmlentities(\AttributeDuration::FormatDuration($value), ENT_QUOTES, 'UTF-8').'</span>');
+					}
+					else
+					{
+						$sId = $this->oField->GetGlobalId();
+
+						$aVal = AttributeDuration::SplitDuration($value);
+						$sDays = "<input type=\"text\" size=\"3\" name=\"{$sId}[d]\" value=\"{$aVal['days']}\" id=\"{$sId}_d\"/>";
+						$sHours = "<input type=\"text\" size=\"2\" name=\"{$sId}[h]\" value=\"{$aVal['hours']}\" id=\"{$sId}_h\"/>";
+						$sMinutes = "<input type=\"text\" size=\"2\" name=\"{$sId}[m]\" value=\"{$aVal['minutes']}\" id=\"{$sId}_m\"/>";
+						$sSeconds = "<input type=\"text\" size=\"2\" name=\"{$sId}[s]\" value=\"{$aVal['seconds']}\" id=\"{$sId}_s\"/>";
+						$oOutput->AddHtml(Dict::Format('UI:DurationForm_Days_Hours_Minutes_Seconds', $sDays, $sHours, $sMinutes, $sSeconds));
+						$oOutput->AddHtml("<input type=\"hidden\" id=\"{$sId}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\"/>");
+
+						$oOutput->AddJs("$('#{$sId}_d').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
+						$oOutput->AddJs("$('#{$sId}_h').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
+						$oOutput->AddJs("$('#{$sId}_m').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
+						$oOutput->AddJs("$('#{$sId}_s').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$sId'); });");
+						$oOutput->AddJs("$('#{$sId}').bind('update', function(evt, sFormId) { return ToggleDurationField('$sId'); });");
+					}
+					$oOutput->AddHtml('<span class="form_validation"></span>');
+					$oOutput->AddHtml('</td>');
+					break;
+			}
+			$oOutput->AddHtml('</tr>');
+			$oOutput->AddHtml('</table>');
+		}
+
+		switch ($sFieldClass)
+		{
+			case 'Combodo\\iTop\\Form\\Field\\DateTimeField':
+				$sDateTimeFormat = $this->oField->GetPHPDateTimeFormat();
+				$oFormat = new DateTimeFormat($sDateTimeFormat);
+				$sDatePickerFormat = $oFormat->ToDatePicker();
+				$sJSDaysMin = json_encode(array(Dict::S('DayOfWeek-Sunday-Min'), Dict::S('DayOfWeek-Monday-Min'), Dict::S('DayOfWeek-Tuesday-Min'), Dict::S('DayOfWeek-Wednesday-Min'),
+								Dict::S('DayOfWeek-Thursday-Min'), Dict::S('DayOfWeek-Friday-Min'), Dict::S('DayOfWeek-Saturday-Min')));
+				$sJSMonthsShort = json_encode(array(Dict::S('Month-01-Short'), Dict::S('Month-02-Short'), Dict::S('Month-03-Short'), Dict::S('Month-04-Short'), Dict::S('Month-05-Short'), Dict::S('Month-06-Short'), 
+													Dict::S('Month-07-Short'), Dict::S('Month-08-Short'), Dict::S('Month-09-Short'), Dict::S('Month-10-Short'), Dict::S('Month-11-Short'), Dict::S('Month-12-Short')));
+				$iFirstDayOfWeek = (int) Dict::S('Calendar-FirstDayOfWeek');
+				$sJSDateFormat = json_encode(AttributeDate::GetFormat()->ToDatePicker());
+				$sTimeFormat = AttributeDateTime::GetFormat()->ToTimeFormat();
+				$oTimeFormat = new DateTimeFormat($sTimeFormat);
+				$sJSTimeFormat = json_encode($oTimeFormat->ToDatePicker());
+				$sJSLangShort = json_encode(strtolower(substr(Dict::GetUserLanguage(), 0, 2)));
+				$sJSOk = json_encode(Dict::S('UI:Button:Ok'));
+				if ($this->oField->IsDateOnly())
+				{
+					$oOutput->AddJs(
+<<<EOF
+				$("#{$this->oField->GetGlobalId()}").datepicker({
+						showOn: 'button',
+						buttonImage: '../images/calendar.png',
+						buttonImageOnly: true,
+						dateFormat: $sJSDateFormat,
+						constrainInput: false,
+						changeMonth: true,
+						changeYear: true,
+						dayNamesMin: $sJSDaysMin,
+						monthNamesShort: $sJSMonthsShort,
+						firstDay: $iFirstDayOfWeek
+				});
+EOF
+					);
+				}
+				else
+				{
+					$oOutput->AddJs(
+<<<EOF
+				$("#{$this->oField->GetGlobalId()}").datetimepicker({
+						showOn: 'button',
+						buttonImage: '../images/calendar.png',
+						buttonImageOnly: true,
+						dateFormat: $sJSDateFormat,
+						constrainInput: false,
+						changeMonth: true,
+						changeYear: true,
+						dayNamesMin: $sJSDaysMin,
+						monthNamesShort: $sJSMonthsShort,
+						firstDay: $iFirstDayOfWeek,
+						// time picker options	
+						timeFormat: $sJSTimeFormat,
+						controlType: 'select',
+						closeText: $sJSOk
+				});
+EOF
+					);
+				}
+				
+				$oOutput->AddJs(
+<<<EOF
+                    $("#{$this->oField->GetGlobalId()}").off("change keyup").on("change keyup", function(){
+                    	var me = this;
+
+                        $(this).closest(".field_set").trigger("field_change", {
+                            id: $(me).attr("id"),
+                            name: $(me).closest(".form_field").attr("data-field-id"),
+                            value: $(me).val()
+                        })
+                        .closest('.form_handler').trigger('value_change');
+                    });
+EOF
+				);
+				break;				
+			break;
+			
+			case 'Combodo\\iTop\\Form\\Field\\StringField':
+			case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
+				$oOutput->AddJs(
+<<<EOF
+                    $("#{$this->oField->GetGlobalId()}").off("change keyup").on("change keyup", function(){
+                    	var me = this;
+
+                        $(this).closest(".field_set").trigger("field_change", {
+                            id: $(me).attr("id"),
+                            name: $(me).closest(".form_field").attr("data-field-id"),
+                            value: $(me).val()
+                        })
+                        .closest('.form_handler').trigger('value_change');
+                    });
+EOF
+				);
+				break;
+
+			case 'Combodo\\iTop\\Form\\Field\\SelectField':
+			case 'Combodo\\iTop\\Form\\Field\\RadioField':
+			case 'Combodo\\iTop\\Form\\Field\\DurationField':
+				$oOutput->AddJs(
+<<<EOF
+                    $("#{$this->oField->GetGlobalId()}").off("change").on("change", function(){
+                    	var me = this;
+
+                        $(this).closest(".field_set").trigger("field_change", {
+                            id: $(me).attr("id"),
+                            name: $(me).closest(".form_field").attr("data-field-id"),
+                            value: $(me).val()
+                        })
+                        .closest('.form_handler').trigger('value_change');
+                    });
+EOF
+				);
+				break;
+		}
+
+		// JS Form field widget construct
+		$aValidators = array();
+		foreach ($this->oField->GetValidators() as $oValidator)
+		{
+			$aValidators[$oValidator::GetName()] = array(
+				'reg_exp' => $oValidator->GetRegExp(),
+				'message' => Dict::S($oValidator->GetErrorMessage())
+			);
+		}
+		$sValidators = json_encode($aValidators);
+		$sFormFieldOptions =
+<<<EOF
+{
+	validators: $sValidators,
+	on_validation_callback: function(me, oResult) {
+		var oValidationElement = $(me.element).find('span.form_validation');
+		if (oResult.is_valid)
+		{
+			oValidationElement.html('');
+		}
+		else
+		{
+			//TODO: escape html entities
+			var sExplain = oResult.error_messages.join(', ');
+			oValidationElement.html('<img src="../images/validation_error.png" style="vertical-align:middle" data-tooltip="'+sExplain+'"/>');
+			oValidationElement.tooltip({
+				items: 'span',
+				tooltipClass: 'form_field_error',
+				content: function() {
+					return $(this).find('img').attr('data-tooltip'); // As opposed to the default 'content' handler, do not escape the contents of 'title'
+				}
+			});
+		}
+	}
+}
+EOF
+			;
+
+		$oOutput->AddJs(
+			<<<EOF
+                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field($sFormFieldOptions);
+EOF
+		);
+		switch ($sFieldClass)
+		{
+			case 'Combodo\\iTop\\Form\\Field\\SelectField':
+				$oOutput->AddJs(
+					<<<EOF
+	                    $("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").form_field('option', 'get_current_value_callback', function(me){ return $(me.element).find('select').val();});
+EOF
+				);
+				break;
+		}
+
+		return $oOutput;
+	}
 }
\ No newline at end of file
diff --git a/sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php
index 6ea393d99..6ae56635b 100644
--- a/sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consolesubformfieldrenderer.class.inc.php
@@ -1,52 +1,52 @@
-<?php
-// Copyright (C) 2016 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-namespace Combodo\iTop\Renderer\Console\FieldRenderer;
-
-use \Dict;
-use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
-use Combodo\iTop\Renderer\FieldRenderer;
-use Combodo\iTop\Renderer\RenderingOutput;
-
-class ConsoleSubFormFieldRenderer extends FieldRenderer
-{
-	public function Render()
-	{
-		$oOutput = new RenderingOutput();
-
-		$oOutput->AddHtml('<div id="fieldset_'.$this->oField->GetGlobalId().'">');
-		$oOutput->AddHtml('</div>');
-
-		$oRenderer = new ConsoleFormRenderer($this->oField->GetForm());
-		$aRenderRes = $oRenderer->Render();
-
-		$aFieldSetOptions = array(
-			'fields_list' => $aRenderRes,
-			'fields_impacts' => $this->oField->GetForm()->GetFieldsImpacts(),
-			'form_path' => $this->oField->GetForm()->GetId()
-		);
-		$sFieldSetOptions = json_encode($aFieldSetOptions);
-		$oOutput->AddJs(
-<<<EOF
-			$("#fieldset_{$this->oField->GetGlobalId()}").field_set($sFieldSetOptions);
-			$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").subform_field({field_set: $("#fieldset_{$this->oField->GetGlobalId()}")});
-EOF
-				);
-		return $oOutput;
-	}
+<?php
+// Copyright (C) 2016 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+namespace Combodo\iTop\Renderer\Console\FieldRenderer;
+
+use \Dict;
+use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
+use Combodo\iTop\Renderer\FieldRenderer;
+use Combodo\iTop\Renderer\RenderingOutput;
+
+class ConsoleSubFormFieldRenderer extends FieldRenderer
+{
+	public function Render()
+	{
+		$oOutput = new RenderingOutput();
+
+		$oOutput->AddHtml('<div id="fieldset_'.$this->oField->GetGlobalId().'">');
+		$oOutput->AddHtml('</div>');
+
+		$oRenderer = new ConsoleFormRenderer($this->oField->GetForm());
+		$aRenderRes = $oRenderer->Render();
+
+		$aFieldSetOptions = array(
+			'fields_list' => $aRenderRes,
+			'fields_impacts' => $this->oField->GetForm()->GetFieldsImpacts(),
+			'form_path' => $this->oField->GetForm()->GetId()
+		);
+		$sFieldSetOptions = json_encode($aFieldSetOptions);
+		$oOutput->AddJs(
+<<<EOF
+			$("#fieldset_{$this->oField->GetGlobalId()}").field_set($sFieldSetOptions);
+			$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").subform_field({field_set: $("#fieldset_{$this->oField->GetGlobalId()}")});
+EOF
+				);
+		return $oOutput;
+	}
 }
\ No newline at end of file
diff --git a/synchro/synchro_import.php b/synchro/synchro_import.php
index 8b242785d..fbab36289 100644
--- a/synchro/synchro_import.php
+++ b/synchro/synchro_import.php
@@ -1,803 +1,803 @@
-<?php
-// Copyright (C) 2011-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Data Exchange web service 
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//
-// Known limitations
-// - reconciliation is made on the column primary_key
-//
-
-if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/webpage.class.inc.php');
-require_once(APPROOT.'/application/csvpage.class.inc.php');
-require_once(APPROOT.'/application/clipage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-class ExchangeException extends Exception
-{
-}
-
-$aPageParams = array
-(
-	'auth_user' => array
-	(
-		'mandatory' => true,
-		'modes' => 'cli',
-		'default' => null,
-		'description' => 'login (must have enough rights to create objects of the given class)',
-	),
-	'auth_pwd' => array
-	(
-		'mandatory' => true,
-		'modes' => 'cli',
-		'default' => null,
-		'description' => 'password',
-	),
-	'data_source_id' => array
-	(
-		'mandatory' => true,
-		'modes' => 'http,cli',
-		'default' => null,
-		'description' => 'Synchro data source id',
-	),
-	'csvdata' => array
-	(
-		'mandatory' => true,
-		'modes' => 'http',
-		'default' => null,
-		'description' => 'data',
-	),
-	'csvfile' => array
-	(
-		'mandatory' => true,
-		'modes' => 'cli',
-		'default' => '',
-		'description' => 'local data file, replaces csvdata if specified',
-	),
-	'synchronize' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '1',
-		'description' => 'If set to 1, then the synchronization will be executed right after the data load',
-	),
-	'charset' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => 'UTF-8',
-		'description' => 'Character set encoding of the CSV data: UTF-8, ISO-8859-1, WINDOWS-1251, WINDOWS-1252, ISO-8859-15',
-	),
-	'date_format' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => 'Y-m-d H:i:s',
-		'description' => 'Input date format (used both for dates and datetimes) - Examples: Y-m-d, d/m/Y (Europe) - no transformation is applied if the argument is omitted. (note: old format specification using %Y %m %d is also supported for backward compatibility)',
-	),
-	'separator' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => ';',
-		'description' => 'column separator in CSV data (1 char, or \'tab\')',
-	),
-	'qualifier' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '"',
-		'description' => 'test qualifier in CSV data',
-	),
-	'output' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => 'summary',
-		'description' => '[retcode] to return the count of lines in error, [summary] to return a concise report, [details] to get a detailed report (each line listed)',
-	),
-	'max_chunk_size' => array
-	(
-		'mandatory' => false,
-		'modes' => 'cli',
-		'default' => '0',
-		'description' => 'Limit on the count of records that can be loaded at once while performing the synchronization',
-	),
-/*
-	'reportlevel' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => 'errors|warnings|created|changed|unchanged',
-		'description' => 'combination of flags to limit the detailed output',
-	),
-*/
-	'simulate' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '0',
-		'description' => 'If set to 1, then the load will not be executed, but the expected report will be produced',
-	),
-	'comment' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '',
-		'description' => 'Comment to be added into the change log',
-	),
-	'no_stop_on_import_error' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '0',
-		'description' => 'Don\'t stop the import in case of SQL import error. By default the import will stop at the first error (and rollback all changes). If this flag is set to 1 the import will continue anyway',
-	),
-);
-
-function UsageAndExit($oP)
-{
-	global $aPageParams;
-	$bModeCLI = utils::IsModeCLI();
-
-	$oP->p("USAGE:\n");
-	foreach($aPageParams as $sParam => $aParamData)
-	{
-		$aModes = explode(',', $aParamData['modes']);
-		if ($bModeCLI)
-		{
-			if (in_array('cli', $aModes))
-			{
-				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
-				$oP->p("$sParam = $sDesc");
-			}
-		}
-		else
-		{
-			if (in_array('http', $aModes))
-			{
-				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
-				$oP->p("$sParam = $sDesc");
-			}
-		}
-	}
-	$oP->output();
-	exit;
-}
-
-
-function ReadParam($oP, $sParam, $sSanitizationFilter = 'parameter')
-{
-	global $aPageParams;
-	assert(isset($aPageParams[$sParam]));
-	assert(!$aPageParams[$sParam]['mandatory']);
-	$sValue = utils::ReadParam($sParam, $aPageParams[$sParam]['default'], true /* Allow CLI */, $sSanitizationFilter);
-	return trim($sValue);
-}
-
-function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
-{
-	global $aPageParams;
-	assert(isset($aPageParams[$sParam]));
-	assert($aPageParams[$sParam]['mandatory']);
-
-	$sValue = utils::ReadParam($sParam, null, true /* Allow CLI */, $sSanitizationFilter);
-	if (is_null($sValue))
-	{
-		$oP->p("ERROR: Missing argument '$sParam'\n");
-		UsageAndExit($oP);
-	}
-	return trim($sValue);
-}
-
-function ChangeDateFormat($sProposedDate, $sFormat, $bDateOnly)
-{
-	if ($sProposedDate == '')
-	{
-		// An empty string means 'reset'
-		return '';
-	}
-	// Convert to a valid MySQL datetime
-	$oFormat = new DateTimeFormat($sFormat);
-	$sRegExpr = $oFormat->ToRegExpr('/');
-	if (!preg_match($sRegExpr, $sProposedDate))
-	{
-		return false;	
-	}
-	else
-	{
-		$oDate = $oFormat->Parse($sProposedDate);
-		if ($oDate !== null)
-		{
-			$oTargetFormat = $bDateOnly ? AttributeDate::GetInternalFormat() : AttributeDateTime::GetInternalFormat();
-			$sDate = $oDate->format($oTargetFormat);
-			return $sDate;
-		}
-		else
-		{
-			return false;
-		}
-	}
-}
-
-
-class CLILikeWebPage extends WebPage
-{
-	public function add_comment($sText)
-	{
-		$this->add('#'.$sText."<br/>\n");
-	}
-}
-
-/////////////////////////////////
-// Main program
-
-if (utils::IsModeCLI())
-{
-	$oP = new CLIPage(Dict::S("TitleSynchroExecution"));
-}
-else
-{
-	$oP = new CLILikeWebPage(Dict::S("TitleSynchroExecution"));
-}
-
-try
-{
-	utils::UseParamFile();
-}
-catch(Exception $e)
-{
-	$oP->p("Error: ".$e->GetMessage());
-	$oP->output();
-	exit -2;
-}
-
-if (utils::IsModeCLI())
-{
-	// Next steps:
-	//   specific arguments: 'csvfile'
-	//   
-	$sAuthUser = ReadMandatoryParam($oP, 'auth_user', 'raw_data');
-	$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd', 'raw_data');
-	$sCsvFile = ReadMandatoryParam($oP, 'csvfile', 'raw_data');
-	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
-	{
-		UserRights::Login($sAuthUser); // Login & set the user's language
-	}
-	else
-	{
-		$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
-		$oP->output();
-		exit -1;
-	}
-
-	if (!is_readable($sCsvFile))
-	{
-		$oP->p("Input file could not be found or could not be read: '$sCsvFile'");
-		$oP->output();
-		exit -1;
-	}
-	$sCSVData = file_get_contents($sCsvFile);
-
-}
-else
-{
-	$_SESSION['login_mode'] = 'basic';
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-
-	$sCSVData = utils::ReadPostedParam('csvdata', '', false, 'raw_data');
-}
-
-
-try
-{
-	//////////////////////////////////////////////////
-	//
-	// Read parameters
-	//
-	$iDataSourceId = ReadMandatoryParam($oP, 'data_source_id', 'raw_data');
-	$sSynchronize = ReadParam($oP, 'synchronize');
-	$sSep = ReadParam($oP, 'separator', 'raw_data');
-	$sQualifier = ReadParam($oP, 'qualifier', 'raw_data');
-	$sCharSet = ReadParam($oP, 'charset', 'raw_data');
-	$sDateTimeFormat = ReadParam($oP, 'date_format', 'raw_data');
-	if ($sDateTimeFormat == '')
-	{
-		$sDateTimeFormat = 'Y-m-d H:i:s'; // By default use the SQL date & time format
-	}
-	if (strpos($sDateTimeFormat, '%') !== false)
-	{
-		$sDateTimeFormat = utils::DateTimeFormatToPHP($sDateTimeFormat);
-	}
-	$oDateTimeFormat = new DateTimeFormat($sDateTimeFormat);
-	$sDateFormat = $oDateTimeFormat->ToDateFormat(); // Keep only the date part
-	$sOutput = ReadParam($oP, 'output');
-//	$sReportLevel = ReadParam($oP, 'reportlevel');
-	$sSimulate = ReadParam($oP, 'simulate');
-	$sComment = ReadParam($oP, 'comment', 'raw_data');
-	$sNoStopOnImportError = ReadParam($oP, 'no_stop_on_import_error');
-
-	if (strtolower(trim($sSep)) == 'tab')
-	{
-		$sSep = "\t";
-	}
-
-	// In case there is a difference between the web server time and the DB server time,
-	// use the DB server time as a reference since this date/time will be compared with the "status_last_seen"
-	// column, which is populated by MySQL triggers (and so based on the DB server time)
-	$oLoadStartDate = new DateTime(CMDBSource::QueryToScalar('SELECT NOW()')); // Now... but as read from the database 
-
-   // Note about date formatting: These MySQL settings are read-only... and in fact unused :-(
-	// SET SESSION date_format = '%d/%m/%Y';
-   // SET SESSION datetime_format = '%d/%m/%Y %H:%i:%s';
-   // Therefore, we have to allow users to transform the format according to a given specification: date_format
-
-
-	//////////////////////////////////////////////////
-	//
-	// Statistics
-	//
-	$iCountErrors = 0;
-	$iCountCreations = 0;
-	$iCountUpdates = 0;
-
-	//////////////////////////////////////////////////
-	//
-	// Check parameters format/consistency
-	//
-	if (strlen($sCSVData) == 0)
-	{
-		throw new ExchangeException("Missing data - at least one line is expected");
-	}
-
-	$oDataSource = MetaModel::GetObject('SynchroDataSource', $iDataSourceId, false);
-	if (is_null($oDataSource))
-	{
-		throw new ExchangeException("Unknown data source id: '$iDataSourceId'");
-	}
-	$sClass = $oDataSource->GetTargetClass();
-
-	if (strlen($sSep) > 1)
-	{
-		throw new ExchangeException("Separator is limited to one character, found '$sSep'");
-	}
-
-	if (strlen($sQualifier) > 1)
-	{
-		throw new ExchangeException("Text qualifier is limited to one character, found '$sQualifier'");
-	}
-
-	if (!in_array($sOutput, array('retcode', 'summary', 'details')))
-	{
-		throw new ExchangeException("Unknown output format: '$sOutput'");
-	}
-
-/*
-	$aReportLevels = explode('|', $sReportLevel);
-	foreach($aReportLevels as $sLevel)
-	{
-		if (!in_array($sLevel, explode('|', 'errors|warnings|created|changed|unchanged')))
-		{
-			throw new ExchangeException("Unknown level in reporting level: '$sLevel'");
-		}
-	}
-*/
-
-	if ($sSimulate == '1')
-	{
-		$bSimulate = true;
-	}
-	else
-	{
-		$bSimulate = false;
-	}
-
-	if ($sSynchronize == '1')
-	{
-		$bSynchronize = true;
-	}
-	else
-	{
-		$bSynchronize = false;
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Parse first line, check attributes, analyse the request
-	//
-	if ($sCharSet == 'UTF-8')
-	{
-		$sUTF8Data = $sCSVData;		
-	}
-	else
-	{
-		$sUTF8Data = iconv($sCharSet, 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
-	}
-	$oCSVParser = new CSVParser($sUTF8Data, $sSep, $sQualifier, MetaModel::GetConfig()->Get('max_execution_time_per_loop')); 
-
-	$aInputColumns = $oCSVParser->ListFields();
-	$iColCount = count($aInputColumns);
-
-	// Check columns
-	$aColumns = $oDataSource->GetSQLColumns();
-
-	$aDateColumns = array();
-	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-	{
-		if ($oAttDef instanceof AttributeDate)
-		{
-			$aDateColumns[$sAttCode] = 'DATE';
-		}
-		elseif ($oAttDef instanceof AttributeDateTime)
-		{
-			$aDateColumns[$sAttCode] = 'DATETIME';
-		}
-	}
-
-	$aIsDateToTransform = array();
-	$aDateToTransformReport = array();
-	foreach($aInputColumns as $iFieldId => $sInputColumn)
-	{
-		if (array_key_exists($sInputColumn, $aDateColumns))
-		{
-			$aIsDateToTransform[$iFieldId] = $aDateColumns[$sInputColumn]; // either DATE or DATETIME
-			$aDateToTransformReport[] = $sInputColumn;
-		}
-		else
-		{
-			$aIsDateToTransform[$iFieldId] = false;
-		}
-
-		if ($sInputColumn == 'primary_key')
-		{
-			$iPrimaryKeyCol = $iFieldId;
-			continue;
-		}
-		if (!array_key_exists($sInputColumn, $aColumns))
-		{
-			throw new ExchangeException("Unknown column '$sInputColumn' (class: '$sClass')");
-		}
-	}
-	if (!isset($iPrimaryKeyCol))
-	{
-		throw new ExchangeException("Missing reconciliation column 'primary_key'");
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Go for parsing and interpretation
-	//
-	try
-	{
-		if ($sOutput == 'details')
-		{
-			$oP->add_comment('------------------------------------------------------------');
-			$oP->add_comment(' Import phase');
-			$oP->add_comment('------------------------------------------------------------');
-		}
-		
-		if ($bSimulate)
-		{
-			CMDBSource::Query('START TRANSACTION');
-		}
-		$aData = $oCSVParser->ToArray();
-		$iLineCount = count($aData);
-	
-		$sTable = $oDataSource->GetDataTable();
-	
-	   // Prepare insert columns
-		$sInsertColumns = '`'.implode('`, `', $aInputColumns).'`';
-	
-		$iPreviousTimeLimit = ini_get('max_execution_time');
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey());
-		$oMutex->Lock();
-		foreach($aData as $iRow => $aRow)
-	  	{
-	  		set_time_limit($iLoopTimeLimit);
-	      	$sReconciliationCondition = "`primary_key` = ".CMDBSource::Quote($aRow[$iPrimaryKeyCol]);
-			$sSelect = "SELECT COUNT(*) FROM `$sTable` WHERE $sReconciliationCondition"; 
-			$aRes = CMDBSource::QueryToArray($sSelect);
-			$iCount = $aRes[0]['COUNT(*)'];
-	
-			if ($iCount == 0)
-			{
-				// No record... create it
-				//
-				$iCountCreations++;
-				if ($sOutput == 'details')
-				{
-					$oP->add("$iRow: New entry, reconciliation: '$sReconciliationCondition'\n");
-				}
-	
-				$aValues = array(); // Used to build the insert query
-				foreach ($aRow as $iCol => $value)
-				{
-					if (is_null($value))
-					{
-						$aValues[] = 'NULL';
-					}
-					elseif ($aIsDateToTransform[$iCol] !== false)
-					{
-						$bDateOnly = false;
-						$sFormat = $sDateTimeFormat;
-						if ($aIsDateToTransform[$iCol] == 'DATE')
-						{
-							$bDateOnly = true;
-							$sFormat = $sDateFormat;
-						}
-						$sDate = ChangeDateFormat($value, $sFormat, $bDateOnly);
-						if ($sDate === false)
-						{
-							$aValues[] = CMDBSource::Quote('');
-							if ($sOutput == 'details')
-							{
-								$oP->add("$iRow: Wrong format for {$aIsDateToTransform[$iCol]} column $iCol: '$value' does not match the expected format: '$sFormat' (column skipped)\n");
-							}
-						}
-						else
-						{
-							$aValues[] = CMDBSource::Quote($sDate);
-						}
-					}
-					else
-					{
-						$aValues[] = CMDBSource::Quote($value);
-					}
-				}
-				$sValues = implode(', ', $aValues);
-				$sInsert = "INSERT INTO `$sTable` ($sInsertColumns) VALUES ($sValues)";
-				try
-				{
-					CMDBSource::Query($sInsert);
-				}
-				catch(Exception $e)
-				{
-					if ($sNoStopOnImportError == '1')
-					{
-						$iCountErrors++;
-						$oP->add("$iRow: Import error '".$e->getMessage()."' (continuing)...\n");
-					}
-					else // Fatal error
-					{
-						throw $e;
-					}
-				}
-			}
-			elseif ($iCount == 1)
-			{
-				// Found a match... update it
-				//
-				$iCountUpdates++;
-				if ($sOutput == 'details')
-				{
-					$oP->add("$iRow: Update entry, reconciliation: '$sReconciliationCondition'\n");
-				}
-	
-				$aValuePairs = array(); // Used to build the update query
-				foreach ($aRow as $iCol => $value)
-				{
-					// Skip reconciliation column
-					if ($iCol == $iPrimaryKeyCol) continue;
-		
-					$sCol = $aInputColumns[$iCol];
-					if ($aIsDateToTransform[$iCol] !== false)
-					{
-						$bDateOnly = false;
-						$sFormat = $sDateTimeFormat;
-						if ($aIsDateToTransform[$iCol] == 'DATE')
-						{
-							$bDateOnly = true;
-							$sFormat = $sDateFormat;
-						}
-						$sDate = ChangeDateFormat($value, $sFormat, $bDateOnly);
-						if ($sDate === false)
-						{
-							if ($sOutput == 'details')
-							{
-								$oP->add("$iRow: Wrong format for {$aIsDateToTransform[$iCol]} column $iCol: '$value' does not match the expected format: '$sFormat' (column skipped)\n");
-							}
-						}
-						else
-						{
-							$aValuePairs[] = "`$sCol` = ".CMDBSource::Quote($sDate);
-						}
-					}
-					else
-					{
-						$aValuePairs[] = "`$sCol` = ".CMDBSource::Quote($aRow[$iCol]);
-					}
-				}
-				$sValuePairs = implode(', ', $aValuePairs);
-				$sUpdateQuery = "UPDATE `$sTable` SET $sValuePairs WHERE $sReconciliationCondition";
-				try
-				{
-					CMDBSource::Query($sUpdateQuery);
-				}
-				catch(Exception $e)
-				{
-					if ($sNoStopOnImportError == '1')
-					{
-						$iCountErrors++;
-						$oP->add("$iRow: Import error '".$e->getMessage()."' (continuing)...\n");
-					}
-					else // Fatal error
-					{
-						throw $e;
-					}
-				}
-			}
-			else
-			{
-				// Too many records... ambiguity
-				//
-				$iCountErrors++;
-				$oP->add("$iRow: Error - Failed to reconcile, found $iCount rows having '$sReconciliationCondition'\n");
-			}
-		}
-		$oMutex->Unlock();
-		set_time_limit($iPreviousTimeLimit);
-		
-		if (($sOutput == "summary") || ($sOutput == 'details'))
-		{
-			$oP->add_comment('------------------------------------------------------------');
-			$oP->add_comment(' Import phase summary');
-			$oP->add_comment('------------------------------------------------------------');
-			$oP->add_comment("Data Source: ".$iDataSourceId);
-			$oP->add_comment("Synchronize: ".($bSynchronize ? '1' : '0'));
-			$oP->add_comment("Class: ".$sClass);
-			$oP->add_comment("Separator: ".$sSep);
-			$oP->add_comment("Qualifier: ".$sQualifier);
-			$oP->add_comment("Charset Encoding:".$sCharSet);
-
-			if (strlen($sDateTimeFormat) > 0)
-			{
-				$aDateTimeColumns = array();
-				$aDateColumns = array();
-				foreach($aIsDateToTransform as $iCol => $sType)
-				{
-					if ($sType !== false)
-					{
-						$sCol = $aInputColumns[$iCol];
-						if ($sType == 'DATE')
-						{
-							$aDateColumns[] = $sCol;
-						}
-						else
-						{
-							$aDateTimeColumns[] = $sCol;
-						}
-					}
-				}
-				$sFormatedDateTimeColumns = (count($aDateTimeColumns) > 0) ? ', applied to columns ['.implode(', ', $aDateTimeColumns).']' : '';
-				$sFormatedDateColumns = (count($aDateColumns) > 0) ? ', applied to columns ['.implode(', ', $aDateColumns).']' : '';
-				$oP->add_comment("Date and time format: '$sDateTimeFormat' $sFormatedDateTimeColumns");
-				$oP->add_comment("Date only format: '$sDateFormat' $sFormatedDateColumns");
-			}
-			else
-			{
-				// shall never get there
-				$oP->add_comment("Date format: <none>");
-			}
-			$oP->add_comment("Data Size: ".strlen($sCSVData));
-			$oP->add_comment("Data Lines: ".$iLineCount);
-			$oP->add_comment("Columns: ".implode(', ', $aInputColumns));
-			$oP->add_comment("Output format: ".$sOutput);
-	//		$oP->add_comment("Report level: ".$sReportLevel);
-			$oP->add_comment("Simulate: ".($bSimulate ? '1' : '0'));
-			$oP->add_comment("Change tracking comment: ".$sComment);
-			$oP->add_comment("Issues (before synchro): ".$iCountErrors);
-	//		$oP->add_comment("Warnings: ".$iCountWarnings);
-			$oP->add_comment("Created (before synchro): ".$iCountCreations);
-			$oP->add_comment("Updated (before synchro): ".$iCountUpdates);
-		}
-
-		//////////////////////////////////////////////////
-		//
-		// Synchronize
-		//
-		if ($bSynchronize)
-		{
-			$oSynchroExec = new SynchroExecution($oDataSource, $oLoadStartDate);
-			$oStatLog = $oSynchroExec->Process();
-			if ($sOutput == 'details')
-			{
-				$oP->add_comment('------------------------------------------------------------');
-				$oP->add_comment(' Synchronization phase');
-				$oP->add_comment('------------------------------------------------------------');
-				$iCount = 0;
-				foreach ($oStatLog->GetTraces() as $sMessage)
-				{
-					$iCount++;
-					$oP->add_comment($sMessage);
-				}
-				if ($iCount == 0)
-				{
-					$oP->add_comment(' No traces. (To activate the traces set "synchro_trace" => true in the configuration file)');
-				}
-			}
-			if ($oStatLog->Get('status') == 'error')
-			{
-				$oP->p("ERROR: ".$oStatLog->Get('last_error'));
-			}
-			$oP->add_comment('------------------------------------------------------------');
-			$oP->add_comment(' Synchronization phase summary');
-			$oP->add_comment('------------------------------------------------------------');
-			$oP->add_comment("Replicas: ".$oStatLog->Get('stats_nb_replica_total'));
-			$oP->add_comment("Replicas touched since last synchro: ".$oStatLog->Get('stats_nb_replica_seen'));
-			$oP->add_comment("Objects deleted: ".$oStatLog->Get('stats_nb_obj_deleted'));
-			$oP->add_comment("Objects deletion errors: ".$oStatLog->Get('stats_nb_obj_deleted_errors'));
-			$oP->add_comment("Objects obsoleted: ".$oStatLog->Get('stats_nb_obj_obsoleted'));
-			$oP->add_comment("Objects obsolescence errors: ".$oStatLog->Get('stats_nb_obj_obsoleted_errors'));
-			$oP->add_comment("Objects created: ".$oStatLog->Get('stats_nb_obj_created')." (".$oStatLog->Get('stats_nb_obj_created_warnings')." warnings)");
-			$oP->add_comment("Objects creation errors: ".$oStatLog->Get('stats_nb_obj_created_errors'));
-			$oP->add_comment("Objects updated: ".$oStatLog->Get('stats_nb_obj_updated')." (".$oStatLog->Get('stats_nb_obj_updated_warnings')." warnings)");
-			$oP->add_comment("Objects update errors: ".$oStatLog->Get('stats_nb_obj_updated_errors'));
-			$oP->add_comment("Objects reconciled (updated): ".$oStatLog->Get('stats_nb_obj_new_updated')." (".$oStatLog->Get('stats_nb_obj_new_updated_warnings')." warnings)");
-			$oP->add_comment("Objects reconciled (unchanged): ".$oStatLog->Get('stats_nb_obj_new_unchanged')." (".$oStatLog->Get('stats_nb_obj_new_updated_warnings')." warnings)");
-			$oP->add_comment("Objects reconciliation errors: ".$oStatLog->Get('stats_nb_replica_reconciled_errors'));
-			$oP->add_comment("Replica disappeared, no action taken: ".$oStatLog->Get('stats_nb_replica_disappeared_no_action'));
-		}
-	}
-	catch(Exception $e)
-	{
-		if ($bSimulate)
-		{
-			CMDBSource::Query('ROLLBACK');
-		}
-		throw $e;
-	}
-	if ($bSimulate)
-	{
-		CMDBSource::Query('ROLLBACK');
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Summary of settings and results
-	//
-	if ($sOutput == 'retcode')
-	{
-		$oP->add($iCountErrors);
-	}
-}
-catch(ExchangeException $e)
-{
-	$oP->add_comment($e->getMessage());		
-}
-catch(SecurityException $e)
-{
-	$oP->add_comment($e->getMessage());		
-}
-catch(Exception $e)
-{
-	$oP->add_comment((string)$e);		
-}
-
-$oP->output();
-?>
+<?php
+// Copyright (C) 2011-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Data Exchange web service 
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Known limitations
+// - reconciliation is made on the column primary_key
+//
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/csvpage.class.inc.php');
+require_once(APPROOT.'/application/clipage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+class ExchangeException extends Exception
+{
+}
+
+$aPageParams = array
+(
+	'auth_user' => array
+	(
+		'mandatory' => true,
+		'modes' => 'cli',
+		'default' => null,
+		'description' => 'login (must have enough rights to create objects of the given class)',
+	),
+	'auth_pwd' => array
+	(
+		'mandatory' => true,
+		'modes' => 'cli',
+		'default' => null,
+		'description' => 'password',
+	),
+	'data_source_id' => array
+	(
+		'mandatory' => true,
+		'modes' => 'http,cli',
+		'default' => null,
+		'description' => 'Synchro data source id',
+	),
+	'csvdata' => array
+	(
+		'mandatory' => true,
+		'modes' => 'http',
+		'default' => null,
+		'description' => 'data',
+	),
+	'csvfile' => array
+	(
+		'mandatory' => true,
+		'modes' => 'cli',
+		'default' => '',
+		'description' => 'local data file, replaces csvdata if specified',
+	),
+	'synchronize' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '1',
+		'description' => 'If set to 1, then the synchronization will be executed right after the data load',
+	),
+	'charset' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => 'UTF-8',
+		'description' => 'Character set encoding of the CSV data: UTF-8, ISO-8859-1, WINDOWS-1251, WINDOWS-1252, ISO-8859-15',
+	),
+	'date_format' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => 'Y-m-d H:i:s',
+		'description' => 'Input date format (used both for dates and datetimes) - Examples: Y-m-d, d/m/Y (Europe) - no transformation is applied if the argument is omitted. (note: old format specification using %Y %m %d is also supported for backward compatibility)',
+	),
+	'separator' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => ';',
+		'description' => 'column separator in CSV data (1 char, or \'tab\')',
+	),
+	'qualifier' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '"',
+		'description' => 'test qualifier in CSV data',
+	),
+	'output' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => 'summary',
+		'description' => '[retcode] to return the count of lines in error, [summary] to return a concise report, [details] to get a detailed report (each line listed)',
+	),
+	'max_chunk_size' => array
+	(
+		'mandatory' => false,
+		'modes' => 'cli',
+		'default' => '0',
+		'description' => 'Limit on the count of records that can be loaded at once while performing the synchronization',
+	),
+/*
+	'reportlevel' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => 'errors|warnings|created|changed|unchanged',
+		'description' => 'combination of flags to limit the detailed output',
+	),
+*/
+	'simulate' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '0',
+		'description' => 'If set to 1, then the load will not be executed, but the expected report will be produced',
+	),
+	'comment' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '',
+		'description' => 'Comment to be added into the change log',
+	),
+	'no_stop_on_import_error' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '0',
+		'description' => 'Don\'t stop the import in case of SQL import error. By default the import will stop at the first error (and rollback all changes). If this flag is set to 1 the import will continue anyway',
+	),
+);
+
+function UsageAndExit($oP)
+{
+	global $aPageParams;
+	$bModeCLI = utils::IsModeCLI();
+
+	$oP->p("USAGE:\n");
+	foreach($aPageParams as $sParam => $aParamData)
+	{
+		$aModes = explode(',', $aParamData['modes']);
+		if ($bModeCLI)
+		{
+			if (in_array('cli', $aModes))
+			{
+				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
+				$oP->p("$sParam = $sDesc");
+			}
+		}
+		else
+		{
+			if (in_array('http', $aModes))
+			{
+				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
+				$oP->p("$sParam = $sDesc");
+			}
+		}
+	}
+	$oP->output();
+	exit;
+}
+
+
+function ReadParam($oP, $sParam, $sSanitizationFilter = 'parameter')
+{
+	global $aPageParams;
+	assert(isset($aPageParams[$sParam]));
+	assert(!$aPageParams[$sParam]['mandatory']);
+	$sValue = utils::ReadParam($sParam, $aPageParams[$sParam]['default'], true /* Allow CLI */, $sSanitizationFilter);
+	return trim($sValue);
+}
+
+function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
+{
+	global $aPageParams;
+	assert(isset($aPageParams[$sParam]));
+	assert($aPageParams[$sParam]['mandatory']);
+
+	$sValue = utils::ReadParam($sParam, null, true /* Allow CLI */, $sSanitizationFilter);
+	if (is_null($sValue))
+	{
+		$oP->p("ERROR: Missing argument '$sParam'\n");
+		UsageAndExit($oP);
+	}
+	return trim($sValue);
+}
+
+function ChangeDateFormat($sProposedDate, $sFormat, $bDateOnly)
+{
+	if ($sProposedDate == '')
+	{
+		// An empty string means 'reset'
+		return '';
+	}
+	// Convert to a valid MySQL datetime
+	$oFormat = new DateTimeFormat($sFormat);
+	$sRegExpr = $oFormat->ToRegExpr('/');
+	if (!preg_match($sRegExpr, $sProposedDate))
+	{
+		return false;	
+	}
+	else
+	{
+		$oDate = $oFormat->Parse($sProposedDate);
+		if ($oDate !== null)
+		{
+			$oTargetFormat = $bDateOnly ? AttributeDate::GetInternalFormat() : AttributeDateTime::GetInternalFormat();
+			$sDate = $oDate->format($oTargetFormat);
+			return $sDate;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+
+
+class CLILikeWebPage extends WebPage
+{
+	public function add_comment($sText)
+	{
+		$this->add('#'.$sText."<br/>\n");
+	}
+}
+
+/////////////////////////////////
+// Main program
+
+if (utils::IsModeCLI())
+{
+	$oP = new CLIPage(Dict::S("TitleSynchroExecution"));
+}
+else
+{
+	$oP = new CLILikeWebPage(Dict::S("TitleSynchroExecution"));
+}
+
+try
+{
+	utils::UseParamFile();
+}
+catch(Exception $e)
+{
+	$oP->p("Error: ".$e->GetMessage());
+	$oP->output();
+	exit -2;
+}
+
+if (utils::IsModeCLI())
+{
+	// Next steps:
+	//   specific arguments: 'csvfile'
+	//   
+	$sAuthUser = ReadMandatoryParam($oP, 'auth_user', 'raw_data');
+	$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd', 'raw_data');
+	$sCsvFile = ReadMandatoryParam($oP, 'csvfile', 'raw_data');
+	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
+	{
+		UserRights::Login($sAuthUser); // Login & set the user's language
+	}
+	else
+	{
+		$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
+		$oP->output();
+		exit -1;
+	}
+
+	if (!is_readable($sCsvFile))
+	{
+		$oP->p("Input file could not be found or could not be read: '$sCsvFile'");
+		$oP->output();
+		exit -1;
+	}
+	$sCSVData = file_get_contents($sCsvFile);
+
+}
+else
+{
+	$_SESSION['login_mode'] = 'basic';
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+
+	$sCSVData = utils::ReadPostedParam('csvdata', '', false, 'raw_data');
+}
+
+
+try
+{
+	//////////////////////////////////////////////////
+	//
+	// Read parameters
+	//
+	$iDataSourceId = ReadMandatoryParam($oP, 'data_source_id', 'raw_data');
+	$sSynchronize = ReadParam($oP, 'synchronize');
+	$sSep = ReadParam($oP, 'separator', 'raw_data');
+	$sQualifier = ReadParam($oP, 'qualifier', 'raw_data');
+	$sCharSet = ReadParam($oP, 'charset', 'raw_data');
+	$sDateTimeFormat = ReadParam($oP, 'date_format', 'raw_data');
+	if ($sDateTimeFormat == '')
+	{
+		$sDateTimeFormat = 'Y-m-d H:i:s'; // By default use the SQL date & time format
+	}
+	if (strpos($sDateTimeFormat, '%') !== false)
+	{
+		$sDateTimeFormat = utils::DateTimeFormatToPHP($sDateTimeFormat);
+	}
+	$oDateTimeFormat = new DateTimeFormat($sDateTimeFormat);
+	$sDateFormat = $oDateTimeFormat->ToDateFormat(); // Keep only the date part
+	$sOutput = ReadParam($oP, 'output');
+//	$sReportLevel = ReadParam($oP, 'reportlevel');
+	$sSimulate = ReadParam($oP, 'simulate');
+	$sComment = ReadParam($oP, 'comment', 'raw_data');
+	$sNoStopOnImportError = ReadParam($oP, 'no_stop_on_import_error');
+
+	if (strtolower(trim($sSep)) == 'tab')
+	{
+		$sSep = "\t";
+	}
+
+	// In case there is a difference between the web server time and the DB server time,
+	// use the DB server time as a reference since this date/time will be compared with the "status_last_seen"
+	// column, which is populated by MySQL triggers (and so based on the DB server time)
+	$oLoadStartDate = new DateTime(CMDBSource::QueryToScalar('SELECT NOW()')); // Now... but as read from the database 
+
+   // Note about date formatting: These MySQL settings are read-only... and in fact unused :-(
+	// SET SESSION date_format = '%d/%m/%Y';
+   // SET SESSION datetime_format = '%d/%m/%Y %H:%i:%s';
+   // Therefore, we have to allow users to transform the format according to a given specification: date_format
+
+
+	//////////////////////////////////////////////////
+	//
+	// Statistics
+	//
+	$iCountErrors = 0;
+	$iCountCreations = 0;
+	$iCountUpdates = 0;
+
+	//////////////////////////////////////////////////
+	//
+	// Check parameters format/consistency
+	//
+	if (strlen($sCSVData) == 0)
+	{
+		throw new ExchangeException("Missing data - at least one line is expected");
+	}
+
+	$oDataSource = MetaModel::GetObject('SynchroDataSource', $iDataSourceId, false);
+	if (is_null($oDataSource))
+	{
+		throw new ExchangeException("Unknown data source id: '$iDataSourceId'");
+	}
+	$sClass = $oDataSource->GetTargetClass();
+
+	if (strlen($sSep) > 1)
+	{
+		throw new ExchangeException("Separator is limited to one character, found '$sSep'");
+	}
+
+	if (strlen($sQualifier) > 1)
+	{
+		throw new ExchangeException("Text qualifier is limited to one character, found '$sQualifier'");
+	}
+
+	if (!in_array($sOutput, array('retcode', 'summary', 'details')))
+	{
+		throw new ExchangeException("Unknown output format: '$sOutput'");
+	}
+
+/*
+	$aReportLevels = explode('|', $sReportLevel);
+	foreach($aReportLevels as $sLevel)
+	{
+		if (!in_array($sLevel, explode('|', 'errors|warnings|created|changed|unchanged')))
+		{
+			throw new ExchangeException("Unknown level in reporting level: '$sLevel'");
+		}
+	}
+*/
+
+	if ($sSimulate == '1')
+	{
+		$bSimulate = true;
+	}
+	else
+	{
+		$bSimulate = false;
+	}
+
+	if ($sSynchronize == '1')
+	{
+		$bSynchronize = true;
+	}
+	else
+	{
+		$bSynchronize = false;
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Parse first line, check attributes, analyse the request
+	//
+	if ($sCharSet == 'UTF-8')
+	{
+		$sUTF8Data = $sCSVData;		
+	}
+	else
+	{
+		$sUTF8Data = iconv($sCharSet, 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
+	}
+	$oCSVParser = new CSVParser($sUTF8Data, $sSep, $sQualifier, MetaModel::GetConfig()->Get('max_execution_time_per_loop')); 
+
+	$aInputColumns = $oCSVParser->ListFields();
+	$iColCount = count($aInputColumns);
+
+	// Check columns
+	$aColumns = $oDataSource->GetSQLColumns();
+
+	$aDateColumns = array();
+	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+	{
+		if ($oAttDef instanceof AttributeDate)
+		{
+			$aDateColumns[$sAttCode] = 'DATE';
+		}
+		elseif ($oAttDef instanceof AttributeDateTime)
+		{
+			$aDateColumns[$sAttCode] = 'DATETIME';
+		}
+	}
+
+	$aIsDateToTransform = array();
+	$aDateToTransformReport = array();
+	foreach($aInputColumns as $iFieldId => $sInputColumn)
+	{
+		if (array_key_exists($sInputColumn, $aDateColumns))
+		{
+			$aIsDateToTransform[$iFieldId] = $aDateColumns[$sInputColumn]; // either DATE or DATETIME
+			$aDateToTransformReport[] = $sInputColumn;
+		}
+		else
+		{
+			$aIsDateToTransform[$iFieldId] = false;
+		}
+
+		if ($sInputColumn == 'primary_key')
+		{
+			$iPrimaryKeyCol = $iFieldId;
+			continue;
+		}
+		if (!array_key_exists($sInputColumn, $aColumns))
+		{
+			throw new ExchangeException("Unknown column '$sInputColumn' (class: '$sClass')");
+		}
+	}
+	if (!isset($iPrimaryKeyCol))
+	{
+		throw new ExchangeException("Missing reconciliation column 'primary_key'");
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Go for parsing and interpretation
+	//
+	try
+	{
+		if ($sOutput == 'details')
+		{
+			$oP->add_comment('------------------------------------------------------------');
+			$oP->add_comment(' Import phase');
+			$oP->add_comment('------------------------------------------------------------');
+		}
+		
+		if ($bSimulate)
+		{
+			CMDBSource::Query('START TRANSACTION');
+		}
+		$aData = $oCSVParser->ToArray();
+		$iLineCount = count($aData);
+	
+		$sTable = $oDataSource->GetDataTable();
+	
+	   // Prepare insert columns
+		$sInsertColumns = '`'.implode('`, `', $aInputColumns).'`';
+	
+		$iPreviousTimeLimit = ini_get('max_execution_time');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		$oMutex = new iTopMutex('synchro_import_'.$oDataSource->GetKey());
+		$oMutex->Lock();
+		foreach($aData as $iRow => $aRow)
+	  	{
+	  		set_time_limit($iLoopTimeLimit);
+	      	$sReconciliationCondition = "`primary_key` = ".CMDBSource::Quote($aRow[$iPrimaryKeyCol]);
+			$sSelect = "SELECT COUNT(*) FROM `$sTable` WHERE $sReconciliationCondition"; 
+			$aRes = CMDBSource::QueryToArray($sSelect);
+			$iCount = $aRes[0]['COUNT(*)'];
+	
+			if ($iCount == 0)
+			{
+				// No record... create it
+				//
+				$iCountCreations++;
+				if ($sOutput == 'details')
+				{
+					$oP->add("$iRow: New entry, reconciliation: '$sReconciliationCondition'\n");
+				}
+	
+				$aValues = array(); // Used to build the insert query
+				foreach ($aRow as $iCol => $value)
+				{
+					if (is_null($value))
+					{
+						$aValues[] = 'NULL';
+					}
+					elseif ($aIsDateToTransform[$iCol] !== false)
+					{
+						$bDateOnly = false;
+						$sFormat = $sDateTimeFormat;
+						if ($aIsDateToTransform[$iCol] == 'DATE')
+						{
+							$bDateOnly = true;
+							$sFormat = $sDateFormat;
+						}
+						$sDate = ChangeDateFormat($value, $sFormat, $bDateOnly);
+						if ($sDate === false)
+						{
+							$aValues[] = CMDBSource::Quote('');
+							if ($sOutput == 'details')
+							{
+								$oP->add("$iRow: Wrong format for {$aIsDateToTransform[$iCol]} column $iCol: '$value' does not match the expected format: '$sFormat' (column skipped)\n");
+							}
+						}
+						else
+						{
+							$aValues[] = CMDBSource::Quote($sDate);
+						}
+					}
+					else
+					{
+						$aValues[] = CMDBSource::Quote($value);
+					}
+				}
+				$sValues = implode(', ', $aValues);
+				$sInsert = "INSERT INTO `$sTable` ($sInsertColumns) VALUES ($sValues)";
+				try
+				{
+					CMDBSource::Query($sInsert);
+				}
+				catch(Exception $e)
+				{
+					if ($sNoStopOnImportError == '1')
+					{
+						$iCountErrors++;
+						$oP->add("$iRow: Import error '".$e->getMessage()."' (continuing)...\n");
+					}
+					else // Fatal error
+					{
+						throw $e;
+					}
+				}
+			}
+			elseif ($iCount == 1)
+			{
+				// Found a match... update it
+				//
+				$iCountUpdates++;
+				if ($sOutput == 'details')
+				{
+					$oP->add("$iRow: Update entry, reconciliation: '$sReconciliationCondition'\n");
+				}
+	
+				$aValuePairs = array(); // Used to build the update query
+				foreach ($aRow as $iCol => $value)
+				{
+					// Skip reconciliation column
+					if ($iCol == $iPrimaryKeyCol) continue;
+		
+					$sCol = $aInputColumns[$iCol];
+					if ($aIsDateToTransform[$iCol] !== false)
+					{
+						$bDateOnly = false;
+						$sFormat = $sDateTimeFormat;
+						if ($aIsDateToTransform[$iCol] == 'DATE')
+						{
+							$bDateOnly = true;
+							$sFormat = $sDateFormat;
+						}
+						$sDate = ChangeDateFormat($value, $sFormat, $bDateOnly);
+						if ($sDate === false)
+						{
+							if ($sOutput == 'details')
+							{
+								$oP->add("$iRow: Wrong format for {$aIsDateToTransform[$iCol]} column $iCol: '$value' does not match the expected format: '$sFormat' (column skipped)\n");
+							}
+						}
+						else
+						{
+							$aValuePairs[] = "`$sCol` = ".CMDBSource::Quote($sDate);
+						}
+					}
+					else
+					{
+						$aValuePairs[] = "`$sCol` = ".CMDBSource::Quote($aRow[$iCol]);
+					}
+				}
+				$sValuePairs = implode(', ', $aValuePairs);
+				$sUpdateQuery = "UPDATE `$sTable` SET $sValuePairs WHERE $sReconciliationCondition";
+				try
+				{
+					CMDBSource::Query($sUpdateQuery);
+				}
+				catch(Exception $e)
+				{
+					if ($sNoStopOnImportError == '1')
+					{
+						$iCountErrors++;
+						$oP->add("$iRow: Import error '".$e->getMessage()."' (continuing)...\n");
+					}
+					else // Fatal error
+					{
+						throw $e;
+					}
+				}
+			}
+			else
+			{
+				// Too many records... ambiguity
+				//
+				$iCountErrors++;
+				$oP->add("$iRow: Error - Failed to reconcile, found $iCount rows having '$sReconciliationCondition'\n");
+			}
+		}
+		$oMutex->Unlock();
+		set_time_limit($iPreviousTimeLimit);
+		
+		if (($sOutput == "summary") || ($sOutput == 'details'))
+		{
+			$oP->add_comment('------------------------------------------------------------');
+			$oP->add_comment(' Import phase summary');
+			$oP->add_comment('------------------------------------------------------------');
+			$oP->add_comment("Data Source: ".$iDataSourceId);
+			$oP->add_comment("Synchronize: ".($bSynchronize ? '1' : '0'));
+			$oP->add_comment("Class: ".$sClass);
+			$oP->add_comment("Separator: ".$sSep);
+			$oP->add_comment("Qualifier: ".$sQualifier);
+			$oP->add_comment("Charset Encoding:".$sCharSet);
+
+			if (strlen($sDateTimeFormat) > 0)
+			{
+				$aDateTimeColumns = array();
+				$aDateColumns = array();
+				foreach($aIsDateToTransform as $iCol => $sType)
+				{
+					if ($sType !== false)
+					{
+						$sCol = $aInputColumns[$iCol];
+						if ($sType == 'DATE')
+						{
+							$aDateColumns[] = $sCol;
+						}
+						else
+						{
+							$aDateTimeColumns[] = $sCol;
+						}
+					}
+				}
+				$sFormatedDateTimeColumns = (count($aDateTimeColumns) > 0) ? ', applied to columns ['.implode(', ', $aDateTimeColumns).']' : '';
+				$sFormatedDateColumns = (count($aDateColumns) > 0) ? ', applied to columns ['.implode(', ', $aDateColumns).']' : '';
+				$oP->add_comment("Date and time format: '$sDateTimeFormat' $sFormatedDateTimeColumns");
+				$oP->add_comment("Date only format: '$sDateFormat' $sFormatedDateColumns");
+			}
+			else
+			{
+				// shall never get there
+				$oP->add_comment("Date format: <none>");
+			}
+			$oP->add_comment("Data Size: ".strlen($sCSVData));
+			$oP->add_comment("Data Lines: ".$iLineCount);
+			$oP->add_comment("Columns: ".implode(', ', $aInputColumns));
+			$oP->add_comment("Output format: ".$sOutput);
+	//		$oP->add_comment("Report level: ".$sReportLevel);
+			$oP->add_comment("Simulate: ".($bSimulate ? '1' : '0'));
+			$oP->add_comment("Change tracking comment: ".$sComment);
+			$oP->add_comment("Issues (before synchro): ".$iCountErrors);
+	//		$oP->add_comment("Warnings: ".$iCountWarnings);
+			$oP->add_comment("Created (before synchro): ".$iCountCreations);
+			$oP->add_comment("Updated (before synchro): ".$iCountUpdates);
+		}
+
+		//////////////////////////////////////////////////
+		//
+		// Synchronize
+		//
+		if ($bSynchronize)
+		{
+			$oSynchroExec = new SynchroExecution($oDataSource, $oLoadStartDate);
+			$oStatLog = $oSynchroExec->Process();
+			if ($sOutput == 'details')
+			{
+				$oP->add_comment('------------------------------------------------------------');
+				$oP->add_comment(' Synchronization phase');
+				$oP->add_comment('------------------------------------------------------------');
+				$iCount = 0;
+				foreach ($oStatLog->GetTraces() as $sMessage)
+				{
+					$iCount++;
+					$oP->add_comment($sMessage);
+				}
+				if ($iCount == 0)
+				{
+					$oP->add_comment(' No traces. (To activate the traces set "synchro_trace" => true in the configuration file)');
+				}
+			}
+			if ($oStatLog->Get('status') == 'error')
+			{
+				$oP->p("ERROR: ".$oStatLog->Get('last_error'));
+			}
+			$oP->add_comment('------------------------------------------------------------');
+			$oP->add_comment(' Synchronization phase summary');
+			$oP->add_comment('------------------------------------------------------------');
+			$oP->add_comment("Replicas: ".$oStatLog->Get('stats_nb_replica_total'));
+			$oP->add_comment("Replicas touched since last synchro: ".$oStatLog->Get('stats_nb_replica_seen'));
+			$oP->add_comment("Objects deleted: ".$oStatLog->Get('stats_nb_obj_deleted'));
+			$oP->add_comment("Objects deletion errors: ".$oStatLog->Get('stats_nb_obj_deleted_errors'));
+			$oP->add_comment("Objects obsoleted: ".$oStatLog->Get('stats_nb_obj_obsoleted'));
+			$oP->add_comment("Objects obsolescence errors: ".$oStatLog->Get('stats_nb_obj_obsoleted_errors'));
+			$oP->add_comment("Objects created: ".$oStatLog->Get('stats_nb_obj_created')." (".$oStatLog->Get('stats_nb_obj_created_warnings')." warnings)");
+			$oP->add_comment("Objects creation errors: ".$oStatLog->Get('stats_nb_obj_created_errors'));
+			$oP->add_comment("Objects updated: ".$oStatLog->Get('stats_nb_obj_updated')." (".$oStatLog->Get('stats_nb_obj_updated_warnings')." warnings)");
+			$oP->add_comment("Objects update errors: ".$oStatLog->Get('stats_nb_obj_updated_errors'));
+			$oP->add_comment("Objects reconciled (updated): ".$oStatLog->Get('stats_nb_obj_new_updated')." (".$oStatLog->Get('stats_nb_obj_new_updated_warnings')." warnings)");
+			$oP->add_comment("Objects reconciled (unchanged): ".$oStatLog->Get('stats_nb_obj_new_unchanged')." (".$oStatLog->Get('stats_nb_obj_new_updated_warnings')." warnings)");
+			$oP->add_comment("Objects reconciliation errors: ".$oStatLog->Get('stats_nb_replica_reconciled_errors'));
+			$oP->add_comment("Replica disappeared, no action taken: ".$oStatLog->Get('stats_nb_replica_disappeared_no_action'));
+		}
+	}
+	catch(Exception $e)
+	{
+		if ($bSimulate)
+		{
+			CMDBSource::Query('ROLLBACK');
+		}
+		throw $e;
+	}
+	if ($bSimulate)
+	{
+		CMDBSource::Query('ROLLBACK');
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Summary of settings and results
+	//
+	if ($sOutput == 'retcode')
+	{
+		$oP->add($iCountErrors);
+	}
+}
+catch(ExchangeException $e)
+{
+	$oP->add_comment($e->getMessage());		
+}
+catch(SecurityException $e)
+{
+	$oP->add_comment($e->getMessage());		
+}
+catch(Exception $e)
+{
+	$oP->add_comment((string)$e);		
+}
+
+$oP->output();
+?>
diff --git a/synchro/synchrodatasource.class.inc.php b/synchro/synchrodatasource.class.inc.php
index ee7647a9c..1969285b5 100644
--- a/synchro/synchrodatasource.class.inc.php
+++ b/synchro/synchrodatasource.class.inc.php
@@ -1,2956 +1,2956 @@
-<?php
-// Copyright (C) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Data Exchange - synchronization with external applications (incoming data)
- *
- * @copyright   Copyright (C) 2010-2018 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-class SynchroExceptionNotStarted extends CoreException
-{
-}
-
-class SynchroDataSource extends cmdbAbstractObject
-{	
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => array('name'),
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_sync_datasource",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "realclass",
-			"display_template" => "",
-			"icon" => "../images/synchro.png",
-		);
-		MetaModel::Init_Params($aParams);
-		//MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('implementation,production,obsolete'), "sql"=>"status", "default_value"=>"implementation", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=>null, "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("notify_contact_id", array("targetclass"=>"Contact", "jointype"=>null, "allowed_values"=>null, "sql"=>"notify_contact_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("scope_class", array("class_category"=>"bizmodel,addon/authentication,application", "more_values"=>"", "sql"=>"scope_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("database_table_name", array("allowed_values"=>null, "sql"=>"database_table_name", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array(), "validation_pattern" => "^[A-Za-z0-9_]*$")));
-				
-		// Declared here for a future usage, but ignored so far
-		MetaModel::Init_AddAttribute(new AttributeString("scope_restriction", array("allowed_values"=>null, "sql"=>"scope_restriction", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		
-		//MetaModel::Init_AddAttribute(new AttributeDateTime("last_synchro_date", array("allowed_values"=>null, "sql"=>"last_synchro_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Format: seconds (int)
-		MetaModel::Init_AddAttribute(new AttributeDuration("full_load_periodicity", array("allowed_values"=>null, "sql"=>"full_load_periodicity", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		
-//		MetaModel::Init_AddAttribute(new AttributeString("reconciliation_list", array("allowed_values"=>null, "sql"=>"reconciliation_list", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("reconciliation_policy", array("allowed_values"=>new ValueSetEnum('use_primary_key,use_attributes'), "sql"=>"reconciliation_policy", "default_value"=>"use_attributes", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("action_on_zero", array("allowed_values"=>new ValueSetEnum('create,error'), "sql"=>"action_on_zero", "default_value"=>"create", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("action_on_one", array("allowed_values"=>new ValueSetEnum('update,error'), "sql"=>"action_on_one", "default_value"=>"update", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("action_on_multiple", array("allowed_values"=>new ValueSetEnum('take_first,create,error'), "sql"=>"action_on_multiple", "default_value"=>"error", "is_null_allowed"=>false, "depends_on"=>array())));
-		
-		MetaModel::Init_AddAttribute(new AttributeEnum("delete_policy", array("allowed_values"=>new ValueSetEnum('ignore,delete,update,update_then_delete'), "sql"=>"delete_policy", "default_value"=>"ignore", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("delete_policy_update", array("allowed_values"=>null, "sql"=>"delete_policy_update", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Format: seconds (unsigned int)
-		MetaModel::Init_AddAttribute(new AttributeDuration("delete_policy_retention", array("allowed_values"=>null, "sql"=>"delete_policy_retention", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeLinkedSet("attribute_list", array("linked_class"=>"SynchroAttribute", "ext_key_to_me"=>"sync_source_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), 'tracking_level' => LINKSET_TRACKING_DETAILS)));
-		// Not used yet !
-		MetaModel::Init_AddAttribute(new AttributeEnum("user_delete_policy", array("allowed_values"=>new ValueSetEnum('everybody,administrators,nobody'), "sql"=>"user_delete_policy", "default_value"=>"nobody", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeURL("url_icon", array("allowed_values"=>null, "sql"=>"url_icon", "default_value"=>null, "is_null_allowed"=>true, "target"=> '_top', "depends_on"=>array())));
-		// The field below is not a real URL since it can contain placeholders like $replica->primary_key$ which are not syntactically allowed in a real URL
-		MetaModel::Init_AddAttribute(new AttributeString("url_application", array("allowed_values"=>null, "sql"=>"url_application", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array(
-			'col:0'=> array(
-				'fieldset:SynchroDataSource:Description' => array('name','description','status','scope_class','user_id','notify_contact_id','url_icon','url_application', 'database_table_name')),
-			'col:1'=> array(
-				'fieldset:SynchroDataSource:Reconciliation' => array('reconciliation_policy','action_on_zero','action_on_one','action_on_multiple'),
-				'fieldset:SynchroDataSource:Deletion' => array('user_delete_policy','full_load_periodicity','delete_policy','delete_policy_update','delete_policy_retention'))
-			)
-		);		
-		MetaModel::Init_SetZListItems('list', array('scope_class', 'status', 'user_id', 'full_load_periodicity')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'scope_class', 'user_id')); // Criteria of the std search form
-		MetaModel::Init_SetZListItems('default_search', array('name', 'status', 'scope_class')); // Criteria of the defaut search form
-		//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		if (!$this->IsNew())
-		{
-			$this->Set('database_table_name', $this->GetDataTable());
-		}
-		return parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
-	}
-		
-	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
-	{
-		if (!$this->IsNew())
-		{
-			$oPage->SetCurrentTab(Dict::S('Core:SynchroAttributes'));
-			$oAttributeSet = $this->Get('attribute_list');
-			$aAttributes = array();
-
-			while($oAttribute = $oAttributeSet->Fetch())
-			{
-				$aAttributes[$oAttribute->Get('attcode')] = $oAttribute;
-			}
-			// Columns of the form
-			$aAttribs = array();
-			foreach(array('attcode', 'reconciliation', 'update', 'update_policy', 'reconciliation_attcode') as $s )
-			{
-				$aAttribs[$s] = array( 'label' => Dict::S("Core:SynchroAtt:$s"), "description" => Dict::S("Core:SynchroAtt:$s+"));
-			}
-			// Rows of the form
-			$aValues = array();
-			foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode=>$oAttDef)
-			{
-				if ($oAttDef->IsWritable())
-				{
-					if (isset($aAttributes[$sAttCode]))
-					{
-						$oAttribute = $aAttributes[$sAttCode];
-					}
-					else
-					{
-						if ($oAttDef->IsExternalKey())
-						{
-							$oAttribute = new SynchroAttExtKey();
-							$oAttribute->Set('reconciliation_attcode', ''); // Blank means by pkey
-						}
-						elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
-						{
-							$oAttribute = new SynchroAttLinkSet();
-							// Todo - add these settings into the form
-							$oAttribute->Set('row_separator', MetaModel::GetConfig()->Get('link_set_item_separator'));
-							$oAttribute->Set('attribute_separator', MetaModel::GetConfig()->Get('link_set_attribute_separator'));
-							$oAttribute->Set('value_separator', MetaModel::GetConfig()->Get('link_set_value_separator'));
-							$oAttribute->Set('attribute_qualifier', MetaModel::GetConfig()->Get('link_set_attribute_qualifier'));
-						}
-						elseif ($oAttDef->IsScalar())
-						{
-							$oAttribute = new SynchroAttribute();
-						}
-						else
-						{
-							$oAttribute = null;
-						}
-
-						if (!is_null($oAttribute))
-						{
-							$oAttribute->Set('sync_source_id', $this->GetKey());
-							$oAttribute->Set('attcode', $sAttCode);
-							$oAttribute->Set('reconcile', MetaModel::IsReconcKey($this->GetTargetClass(), $sAttCode) ? 1 : 0);
-							$oAttribute->Set('update', 1);
-							$oAttribute->Set('update_policy', 'master_locked');
-						}
-					}
-					if (!is_null($oAttribute))
-					{
-						if (!$bEditMode)
-						{
-							// Read-only mode
-							$aRow['reconciliation'] = $oAttribute->Get('reconcile') == 1 ? Dict::S('Core:SynchroReconcile:Yes') :  Dict::S('Core:SynchroReconcile:No'); 
-							$aRow['update'] = $oAttribute->Get('update') == 1 ?  Dict::S('Core:SynchroUpdate:Yes') :  Dict::S('Core:SynchroUpdate:No');
-							$aRow['attcode'] = MetaModel::GetLabel($this->GetTargetClass(), $oAttribute->Get('attcode')).' ('.$oAttribute->Get('attcode').')';
-							$aRow['update_policy'] = $oAttribute->GetAsHTML('update_policy');
-							if ($oAttDef->IsExternalKey())
-							{
-								$sReconciliationAttCode = $oAttribute->Get('reconciliation_attcode');
-								switch($sReconciliationAttCode)
-								{
-									case '':
-									$sDisplayReconciliationAttCode = Dict::S('Core:SynchroAttExtKey:ReconciliationById');
-									break;
-									
-									default:
-									$sDisplayReconciliationAttCode = MetaModel::GetLabel($oAttDef->GetTargetClass(), $sReconciliationAttCode);
-								}
-								$aRow['reconciliation_attcode'] = $sDisplayReconciliationAttCode;
-							}
-							else
-							{
-								$aRow['reconciliation_attcode'] = '&nbsp;';
-							}
-						}
-						else
-						{
-							// Edit mode
-							$sAttCode = $oAttribute->Get('attcode');
-							$sChecked = $oAttribute->Get('reconcile') == 1 ? 'checked' : '';
-							$aRow['reconciliation'] = "<input type=\"checkbox\" name=\"reconciliation[$sAttCode]\" $sChecked/>"; 
-							$sChecked = $oAttribute->Get('update') == 1 ? 'checked' : '';
-							$aRow['update'] = "<input type=\"checkbox\" name=\"update[$sAttCode]\" $sChecked/>"; 
-							$aRow['attcode'] = MetaModel::GetLabel($this->GetTargetClass(), $oAttribute->Get('attcode')).' ('.$oAttribute->Get('attcode').')';
-							$oUpdateAttDef = MetaModel::GetAttributeDef(get_class($oAttribute), 'update_policy'); 
-							$aRow['update_policy'] = cmdbAbstractObject::GetFormElementForField($oPage, get_class($oAttribute), 'update_policy', $oUpdateAttDef, $oAttribute->Get('update_policy'), '', 'update_policy_'.$sAttCode, "[$sAttCode]");
-							if ($oAttDef->IsExternalKey())
-							{
-								$aRow['reconciliation_attcode'] = $oAttribute->GetReconciliationFormElement($oAttDef->GetTargetClass(), "attr_reconciliation_attcode[$sAttCode]");
-							}
-							else
-							{
-								$aRow['reconciliation_attcode'] = '&nbsp;';
-							}
-						}
-						$aValues[] = $aRow;
-					}
-				}
-			}
-			$oPage->p(Dict::Format('Class:SynchroDataSource:DataTable', $this->GetDataTable()));
-			$oPage->Table($aAttribs, $aValues);
-			$this->DisplayStatusTab($oPage);
-		}
-		parent::DisplayBareRelations($oPage, $bEditMode);
-	}
-	
-	/**
-	 * Displays the status (SynchroLog) of the datasource in a graphical manner
-	 * @param $oPage WebPage
-	 * @return void
-	 */
-	protected function DisplayStatusTab(WebPage $oPage)
-	{
-		$oPage->SetCurrentTab(Dict::S('Core:SynchroStatus'));
-		
-		$sSelectSynchroLog = 'SELECT SynchroLog WHERE sync_source_id = :source_id';
-		$oSetSynchroLog = new CMDBObjectSet(DBObjectSearch::FromOQL($sSelectSynchroLog), array('start_date' => false) /* order by*/, array('source_id' => $this->GetKey()));
-		$oSetSynchroLog->SetLimit(100); // Display only the 100 latest runs
-		
-		if ($oSetSynchroLog->Count() > 0)
-		{
-			$oLastLog = $oSetSynchroLog->Fetch();
-			$sStartDate = $oLastLog->GetAsHTML('start_date');
-			$oLastLog->Get('stats_nb_replica_seen');
-			$iLastLog = 0;
-			$iDSid = $this->GetKey();
-			if ($oLastLog->Get('status') == 'running')
-			{
-				// Still running !
-				$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroRunningStartedOn_Date', $sStartDate).'</h2>');
-			}
-			else
-			{
-				$sEndDate = $oLastLog->GetAsHTML('end_date');
-				$iLastLog = $oLastLog->GetKey();
-				$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroEndedOn_Date', $sEndDate).'</h2>');
-				$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid";
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
-				$iCountAllReplicas = $oSet->Count();
-				$sAllReplicas = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllReplicas</a>";
-				$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid AND status_last_error !=''";
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
-				$iCountAllErrors = $oSet->Count();
-				$sAllErrors = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllErrors</a>";
-				$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid AND status_last_warning !=''";
-				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
-				$iCountAllWarnings = $oSet->Count();
-				$sAllWarnings = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllWarnings</a>";
-				$oPage->p('<h2>'.Dict::Format('Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings', $sAllReplicas, $sAllErrors, $sAllWarnings).'</h2>');
-			}
-
-			$oPage->add('<table class="synoptics"><tr><td style="color:#333;vertical-align:top">');
-
-			// List all the log entries for the user to select
-			$oPage->add('<h2 style="line-height:55px;">'.Dict::S('Core:Synchro:History').'</h2>');
-			$oSetSynchroLog->Rewind();
-			$oPage->add('<select size="25" onChange="UpdateSynoptics(this.value);">');
-			$sSelected = ' selected'; // First log is selected by default
-			$sScript = "var aSynchroLog = {\n";
-			while($oLog = $oSetSynchroLog->Fetch())
-			{
-				$sLogTitle = Dict::Format('Core:SynchroLogTitle', $oLog->Get('status'), $oLog->GetEditValue('start_date'));
-				$oPage->add('<option value="'.$oLog->GetKey().'" '.$sSelected.'>'.$sLogTitle.'</option>');
-				$sSelected = ''; // only the first log is selected by default
-				$aData = $this->ProcessLog($oLog);
-				$sScript .= '"'.$oLog->GetKey().'": '.json_encode($aData).",\n";
-			}
-			$sScript .= "end: 'Done'";
-			$sScript .= "};\n";
-			$sScript .= <<<EOF
-			var sLastLog = '$iLastLog';
-	function ToggleSynoptics(sId, bShow)
-	{
-		if (bShow)
-		{
-			$(sId).show();
-		}
-		else
-		{
-			$(sId).hide();
-		}
-	}
-	
-	function UpdateSynoptics(id)
-	{
-		var aValues = aSynchroLog[id];
-		if (aValues == undefined) return;
-		
-		for (var sKey in aValues)
-		{
-			$('#c_'+sKey).html(aValues[sKey]);
-			var fOpacity = (aValues[sKey] == 0) ? 0.3 : 1;
-			$('#'+sKey).fadeTo("slow", fOpacity);
-		}
-		//alert('id = '+id+', lastLog='+sLastLog+', id==sLastLog: '+(id==sLastLog)+' obj_updated_errors:  '+aValues['obj_updated_errors']);
-		if ( (id == sLastLog) && (aValues['obj_new_errors'] > 0) )
-		{
-			$('#new_errors_link').show();
-		}
-		else
-		{
-			$('#new_errors_link').hide();
-		}
-		
-		if ( (id == sLastLog) && (aValues['obj_updated_errors'] > 0) )
-		{
-			$('#updated_errors_link').show();
-		}
-		else
-		{
-			$('#updated_errors_link').hide();
-		}
-		
-		if ( (id == sLastLog) && (aValues['obj_disappeared_errors'] > 0) )
-		{
-			$('#disappeared_errors_link').show();
-		}
-		else
-		{
-			$('#disappeared_errors_link').hide();
-		}
-		
-		ToggleSynoptics('#cw_obj_created_warnings', aValues['obj_created_warnings'] > 0);
-		ToggleSynoptics('#cw_obj_new_updated_warnings', aValues['obj_new_updated_warnings'] > 0);
-		ToggleSynoptics('#cw_obj_new_unchanged_warnings', aValues['obj_new_unchanged_warnings'] > 0);
-		ToggleSynoptics('#cw_obj_updated_warnings', aValues['obj_updated_warnings'] > 0);
-		ToggleSynoptics('#cw_obj_unchanged_warnings', aValues['obj_unchanged_warnings'] > 0);
-		$('#status_traces').html(aValues['traces']);
-	}
-EOF
-;
-			$oPage->add_script($sScript);
-			$oPage->add('</select>');
-			
-			$oPage->add('</td><td style="vertical-align:top;">');
-			
-			// Now build the big "synoptics" view
-			$aData = $this->ProcessLog($oLastLog);
-
-			$sNbReplica = $this->GetIcon()."&nbsp;".Dict::Format('Core:Synchro:Nb_Replica', "<span id=\"c_nb_replica_total\">{$aData['nb_replica_total']}</span>");
-			$sNbObjects = MetaModel::GetClassIcon($this->GetTargetClass())."&nbsp;".Dict::Format('Core:Synchro:Nb_Class:Objects', $this->GetTargetClass(), "<span id=\"c_nb_obj_total\">{$aData['nb_obj_total']}</span>");
-			$oPage->add(
-<<<EOF
-	<table class="synoptics">
-	<tr class="synoptics_header">
-	<td>$sNbReplica</td><td>&nbsp;</td><td>$sNbObjects</td>
-	</tr>
-	<tr>
-EOF
-);
-			$sBaseOQL = "SELECT SynchroReplica WHERE sync_source_id=".$this->GetKey()." AND status_last_error!=''";
-			$oPage->add($this->HtmlBox('repl_ignored', $aData, '#999').'<td colspan="2">&nbsp;</td>');
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('repl_disappeared', $aData, '#630', 'rowspan="4"').'<td rowspan="4" class="arrow">=&gt;</td>'.$this->HtmlBox('obj_disappeared_no_action', $aData, '#333'));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('obj_deleted', $aData, '#000'));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('obj_obsoleted', $aData, '#630'));
-			$oPage->add("</tr>\n<tr>");
-			$sOQL = urlencode($sBaseOQL." AND status='obsolete'");
-			$oPage->add($this->HtmlBox('obj_disappeared_errors', $aData, '#C00', '', " <a style=\"color:#fff\" href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\" id=\"disappeared_errors_link\">Show</a>"));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('repl_existing', $aData, '#093', 'rowspan="3"').'<td rowspan="3" class="arrow">=&gt;</td>'.$this->HtmlBox('obj_unchanged', $aData, '#393'));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('obj_updated', $aData, '#3C3'));
-			$oPage->add("</tr>\n<tr>");
-			$sOQL = urlencode($sBaseOQL." AND status='modified'");
-			$oPage->add($this->HtmlBox('obj_updated_errors', $aData, '#C00', '', " <a style=\"color:#fff\" href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\" id=\"updated_errors_link\">Show</a>"));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('repl_new', $aData, '#339', 'rowspan="4"').'<td rowspan="4" class="arrow">=&gt;</td>'.$this->HtmlBox('obj_new_unchanged', $aData, '#393'));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('obj_new_updated', $aData, '#3C3'));
-			$oPage->add("</tr>\n<tr>");
-			$oPage->add($this->HtmlBox('obj_created', $aData, '#339'));
-			$oPage->add("</tr>\n<tr>");
-			$sOQL = urlencode($sBaseOQL." AND status='new'");
-			$oPage->add($this->HtmlBox('obj_new_errors', $aData, '#C00', '', " <a style=\"color:#fff\" href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\" id=\"new_errors_link\">Show</a>"));
-			$oPage->add("</tr>\n</table>\n");
-			$oPage->add('</td></tr></table>');
-			$oPage->add('<div id="status_traces" style="overflow-x:auto"></div>');
-			$oPage->add_ready_script("UpdateSynoptics('$iLastLog')");
-		}
-		else
-		{
-			$oPage->p('<h2>'.Dict::S('Core:Synchro:NeverRun').'</h2>');
-		}
-	}
-	
-	protected function HtmlBox($sId, $aData, $sColor, $sHTMLAttribs = '', $sErrorLink = '')
-	{
-		$iCount = $aData[$sId];
-		$sCount = "<span id=\"c_{$sId}\">$iCount</span>";
-		$sLabel = Dict::Format('Core:Synchro:label_'.$sId, $sCount);
-		$sOpacity = ($iCount==0) ? "opacity:0.3;" : "";
-		if (isset($aData[$sId.'_warnings']))
-		{
-			$sLabel .= " <span id=\"cw_{$sId}_warnings\"><img src=\"../images/error.png\" style=\"vertical-align:middle\"/>  (<span id=\"c_{$sId}_warnings\">".$aData[$sId.'_warnings']."</span>)</span>";
-		}
-
-		return "<td id=\"$sId\" style=\"background-color:$sColor;$sOpacity;\" {$sHTMLAttribs}>{$sLabel}{$sErrorLink}</td>";
-	}
-	
-	protected function ProcessLog($oLastLog)
-	{
-		$aData = array(
-			'obj_deleted' => $oLastLog->Get('stats_nb_obj_deleted'),
-			'obj_obsoleted' => $oLastLog->Get('stats_nb_obj_obsoleted'),
-			'obj_disappeared_errors' => $oLastLog->Get('stats_nb_obj_obsoleted_errors') + $oLastLog->Get('stats_nb_obj_deleted_errors'),
-			'obj_disappeared_no_action' => $oLastLog->Get('stats_nb_replica_disappeared_no_action'),
-			'obj_updated' => $oLastLog->Get('stats_nb_obj_updated'),
-			'obj_updated_warnings' => $oLastLog->Get('stats_nb_obj_updated_warnings'),
-			'obj_updated_errors' => $oLastLog->Get('stats_nb_obj_updated_errors'),
-			'obj_new_updated' => $oLastLog->Get('stats_nb_obj_new_updated'),
-			'obj_new_updated_warnings' => $oLastLog->Get('stats_nb_obj_new_updated_warnings'),
-			'obj_new_unchanged' => $oLastLog->Get('stats_nb_obj_new_unchanged'),
-			'obj_created' => $oLastLog->Get('stats_nb_obj_created'),
-			'obj_created_warnings' => $oLastLog->Get('stats_nb_obj_created_warnings'),
-			'obj_created_errors' => $oLastLog->Get('stats_nb_obj_created_errors'),
-			'obj_unchanged_warnings' => $oLastLog->Get('stats_nb_obj_unchanged_warnings'),
-		);
-		$oLastLog->Get('stats_nb_replica_reconciled_errors');
-		$iDisappeared = $aData['obj_disappeared_errors'] + $aData['obj_obsoleted'] + $aData['obj_deleted'] + $aData['obj_disappeared_no_action'];
-		$aData['repl_disappeared'] = $iDisappeared;
-		$iNewErrors = $aData['obj_created_errors'] + $oLastLog->Get('stats_nb_replica_reconciled_errors');
-		$aData['obj_new_errors'] = $iNewErrors;
-		$iNew = $aData['obj_created'] + $iNewErrors + $aData['obj_new_updated'] + $aData['obj_new_unchanged'];
-		$aData['repl_new'] = $iNew;
-		$iExisting = $oLastLog->Get('stats_nb_replica_seen') - $iNew;
-		$aData['repl_existing'] = $iExisting;
-		$aData['obj_unchanged'] = $iExisting - $aData['obj_updated'] - $aData['obj_updated_errors'];
-		$iIgnored = $oLastLog->Get('stats_nb_replica_total') - $iNew - $iExisting - $iDisappeared;
-		$aData['repl_ignored'] = $iIgnored;
-		$aData['nb_obj_total'] = $iNew + $iExisting + $iDisappeared;
-		$aData['nb_replica_total'] = $aData['nb_obj_total'] + $iIgnored;
-		if(strlen($oLastLog->Get('traces')) > 0)
-		{
-			$aData['traces'] = '<fieldset><legend>Debug traces</legend><pre>'.htmlentities($oLastLog->Get('traces'), ENT_QUOTES, 'UTF-8').'</pre></fieldset>';
-		}
-		else
-		{
-			$aData['traces'] = '';
-		}
-		return $aData;
-	}
-	
-	public function GetIcon($bImgTag = true, $sMoreStyles = '')
-	{
-		if ($this->Get('url_icon') == '') return MetaModel::GetClassIcon(get_class($this), $bImgTag);
-		if ($bImgTag)
-		{
-			return 	"<img src=\"".$this->Get('url_icon')."\" style=\"vertical-align:middle;$sMoreStyles\"/>";
-			
-		}
-		return $this->Get('url_icon');
-	}
-
-	/**
-	 * Get the actual hyperlink to the remote application for the given replica and dest object
-	 *
-	 * @param \DBObject $oDestObj
-	 * @param \SynchroReplica $oReplica
-	 *
-	 * @return string
-	 */
-	public function GetApplicationUrl(DBObject $oDestObj, SynchroReplica $oReplica)
-	{
-		if ($this->Get('url_application') == '') return '';
-		$aSearches = array();
-		$aReplacements = array();
-		foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode=>$oAttDef)
-		{
-			if ($oAttDef->IsScalar())
-			{
-				$aSearches[] = '$this->'.$sAttCode.'$';
-				$aReplacements[] = $oDestObj->Get($sAttCode);
-			}
-		}
-		$aData = $oReplica->LoadExtendedDataFromTable($this->GetDataTable());
-
-		foreach($aData as $sColumn => $value)
-		{
-			$aSearches[] = '$replica->'.$sColumn.'$';
-			$aReplacements[] = $value;
-		}
-		return str_replace($aSearches, $aReplacements, $this->Get('url_application'));
-	}
-	
-	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
-	{
-		if ( (($sAttCode == 'scope_class') || ($sAttCode == 'database_table_name')) && (!$this->IsNew()))
-		{
-			return OPT_ATT_READONLY;
-		}
-		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
-	}
-		
-	public function UpdateObjectFromPostedForm($sFormPrefix = '', $sAttList = null, $aAttFlags = array())
-	{
-		parent::UpdateObjectFromPostedForm($sFormPrefix, $sAttList, $aAttFlags);
-		// And now read the other post parameters...
-		$oAttributeSet = $this->Get('attribute_list');
-		$aAttributes = array();
-		while($oAttribute = $oAttributeSet->Fetch())
-		{
-			$aAttributes[$oAttribute->Get('attcode')] = $oAttribute;
-		}
-		$aReconcile = utils::ReadPostedParam('reconciliation', array());
-		$aUpdate = utils::ReadPostedParam('update', array());
-		$aUpdatePolicy = utils::ReadPostedParam('attr_update_policy', array());
-		$aReconciliation = utils::ReadPostedParam('attr_reconciliation_attcode', array());
-		// update_policy cannot be empty, so there is one entry per attribute, use this to iterate
-		// through all the writable attributes
-		foreach($aUpdatePolicy as $sAttCode => $sValue)
-		{
-			if(!isset($aAttributes[$sAttCode]))
-			{
-				$oAttribute = $this->CreateSynchroAtt($sAttCode);
-			}
-			else
-			{
-				$oAttribute = $aAttributes[$sAttCode];
-			}
-			$bReconcile = 0;
-			if (isset($aReconcile[$sAttCode]))
-			{
-				$bReconcile = $aReconcile[$sAttCode] == 'on' ? 1 : 0;
-			}
-			$bUpdate =  0 ; // Default / initial value
-			if (isset($aUpdate[$sAttCode]))
-			{
-				$bUpdate = $aUpdate[$sAttCode] == 'on' ? 1 : 0;
-			}
-			$oAttribute->Set('reconcile', $bReconcile);
-			$oAttribute->Set('update', $bUpdate);
-			$oAttribute->Set('update_policy', $sValue);
-			if ($oAttribute instanceof SynchroAttExtKey)
-			{
-				$oAttribute->Set('reconciliation_attcode', $aReconciliation[$sAttCode]);
-			}
-			elseif ($oAttribute instanceof SynchroAttLinkSet)
-			{
-			}
-			$oAttributeSet->AddItem($oAttribute);
-		}
-		$this->Set('attribute_list', $oAttributeSet);
-	}
-
-	/**
-	 * Creates a new SynchroAttXXX object in memory with the default values
-	 *
-	 * @param string $sAttCode
-	 *
-	 * @return \SynchroAttExtKey|\SynchroAttLinkSet|\SynchroAttribute
-	 */
-	protected function CreateSynchroAtt($sAttCode)
-	{
-		$oAttDef = MetaModel::GetAttributeDef($this->GetTargetClass(), $sAttCode);
-		if ($oAttDef->IsExternalKey())
-		{
-			$oAttribute = new SynchroAttExtKey();
-			$oAttribute->Set('reconciliation_attcode', ''); // Blank means by pkey
-		}
-		elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
-		{
-			$oAttribute = new SynchroAttLinkSet();
-			// Todo - set those value from the form
-			$oAttribute->Set('row_separator', MetaModel::GetConfig()->Get('link_set_item_separator'));
-			$oAttribute->Set('attribute_separator', MetaModel::GetConfig()->Get('link_set_attribute_separator'));
-			$oAttribute->Set('value_separator', MetaModel::GetConfig()->Get('link_set_value_separator'));
-			$oAttribute->Set('attribute_qualifier', MetaModel::GetConfig()->Get('link_set_attribute_qualifier'));
-		}
-		else
-		{
-			$oAttribute = new SynchroAttribute();
-		}
-		$oAttribute->Set('sync_source_id', $this->GetKey());
-		$oAttribute->Set('attcode', $sAttCode);
-		$oAttribute->Set('reconcile', 0);
-		$oAttribute->Set('update', 0);
-		$oAttribute->Set('update_policy', 'master_locked');
-		return $oAttribute;
-	}
-	/**
-	 * Overload the standard behavior
-	 */	
-	public function ComputeValues()
-	{
-		parent::ComputeValues();
-
-		if ($this->IsNew())
-		{
-			// Compute the database_table_name
-			$sDataTable = $this->Get('database_table_name');
-			if (!empty($sDataTable))
-			{
-				$this->Set('database_table_name', $this->ComputeDataTableName());
-			}
-			
-			// When inserting a new datasource object, also create the SynchroAttribute objects
-			// for each field of the target class
-			// Create all the SynchroAttribute records
-			$oAttributeSet = $this->Get('attribute_list');
-			if ($oAttributeSet->Count() == 0)
-			{
-				foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode=>$oAttDef)
-				{
-					if ($oAttDef->IsWritable())
-					{
-						$oAttDef = MetaModel::GetAttributeDef($this->GetTargetClass(), $sAttCode);
-						if ($oAttDef->IsExternalKey())
-						{
-							$oAttribute = new SynchroAttExtKey();
-							$oAttribute->Set('reconciliation_attcode', ''); // Blank means by pkey
-						}
-						elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
-						{
-							$oAttribute = new SynchroAttLinkSet();
-							// Todo - set those value from the form
-							$oAttribute->Set('row_separator', MetaModel::GetConfig()->Get('link_set_item_separator'));
-							$oAttribute->Set('attribute_separator', MetaModel::GetConfig()->Get('link_set_attribute_separator'));
-							$oAttribute->Set('value_separator', MetaModel::GetConfig()->Get('link_set_value_separator'));
-							$oAttribute->Set('attribute_qualifier', MetaModel::GetConfig()->Get('link_set_attribute_qualifier'));
-						}
-						elseif ($oAttDef->IsScalar())
-						{
-							$oAttribute = new SynchroAttribute();
-						}
-						else
-						{
-							$oAttribute = null;
-						}
-
-						if (!is_null($oAttribute))
-						{
-							$oAttribute->Set('attcode', $sAttCode);
-							$oAttribute->Set('reconcile', MetaModel::IsReconcKey($this->GetTargetClass(), $sAttCode) ? 1 : 0);
-							$oAttribute->Set('update', 1);
-							$oAttribute->Set('update_policy', 'master_locked');
-							$oAttributeSet->AddItem($oAttribute);
-						}
-					}
-				}
-				$this->Set('attribute_list', $oAttributeSet);
-			}
-		}
-		else
-		{
-			$sDataTable = $this->Get('database_table_name');
-			if (empty($sDataTable))
-			{
-				$this->Set('database_table_name', $this->ComputeDataTableName());
-			}
-		}
-	}
-	public function DoCheckToWrite()
-	{
-		parent::DoCheckToWrite();
-
-		// Check that there is at least one reconciliation key defined
-		if ($this->Get('reconciliation_policy') == 'use_attributes')
-		{
-			$oSet = $this->Get('attribute_list');
-			$bReconciliationKey = false;
-			foreach($oSet as $oSynchroAttribute)
-			{
-				if ($oSynchroAttribute->Get('reconcile') == 1)
-				{
-					$bReconciliationKey = true; // At least one key is defined
-					break;
-				}
-			}
-			if (!$bReconciliationKey)
-			{
-				$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified');			
-			}
-		}
-		
-		// If 'update_then_delete' is specified there must be a delete_retention_period
-		if (($this->Get('delete_policy') == 'update_then_delete') && ($this->Get('delete_policy_retention') == 0))
-		{
-			$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified');			
-		}
-
-		// If update is specified, then something to update must be defined
-		if ((($this->Get('delete_policy') == 'update_then_delete') ||  ($this->Get('delete_policy') == 'update'))
-		    && ($this->Get('delete_policy_update') == ''))
-		{
-			$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified');			
-		}
-		
-		// When creating the data source with a specified database_table_name, this table must NOT exist
-		if ($this->IsNew())
-		{
-			$sDataTable = $this->GetDataTable();
-			if (!empty($sDataTable) && CMDBSource::IsTable($this->GetDataTable()))
-			{
-				// Hmm, the synchro_data_xxx table already exists !!
-				$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:DataTableAlreadyExists', $this->GetDataTable());			
-			}
-		}
-	}
-	
-	public function GetTargetClass()
-	{
-		return $this->Get('scope_class');
-	}
-
-	public function GetDataTable()
-	{
-		$sTable = $this->Get('database_table_name');
-		if (empty($sTable))
-		{
-			$sTable = $this->ComputeDataTableName();
-		}
-		return $sTable;
-	}
-	
-	protected function ComputeDataTableName()
-	{
-		$sDBTableName = $this->Get('database_table_name');
-		if (empty($sDBTableName))
-		{
-			$sDBTableName = strtolower($this->GetTargetClass());
-			$sDBTableName = preg_replace('/[^A-za-z0-9_]/', '_', $sDBTableName); // Remove forbidden characters from the table name
-			$sDBTableName .= '_'.$this->GetKey(); // Add a suffix for unicity
-		}
-		else
-		{
-			$sDBTableName = preg_replace('/[^A-za-z0-9_]/', '_', $sDBTableName); // Remove forbidden characters from the table name
-		}
-		$sPrefix = MetaModel::GetConfig()->Get('db_subname')."synchro_data_";
-		if (strpos($sDBTableName, $sPrefix) !== 0)
-		{
-			$sDBTableName = $sPrefix.$sDBTableName;
-		}
-		return $sDBTableName;		
-	}
-
-	/**
-	 * When the new datasource has been created, let's create the synchro_data table
-	 * that will hold the data records and the correspoding triggers which will maintain
-	 * both tables in sync
-	 */
-	protected function AfterInsert()
-	{
-		parent::AfterInsert();
-
-		$sTable = $this->GetDataTable();
-
-		$aColumns = $this->GetSQLColumns();
-		
-		$aFieldDefs = array();
-		// Allow '0', otherwise mysql will render an error when the id is not given
-		// (the trigger is expected to set the value, but it is not executed soon enough)
-		$aFieldDefs[] = "id INTEGER(11) NOT NULL DEFAULT 0 ";
-		$aFieldDefs[] = "`primary_key` VARCHAR(255) NULL DEFAULT NULL";
-		foreach($aColumns as $sColumn => $ColSpec)
-		{
-			$aFieldDefs[] = "`$sColumn` $ColSpec NULL DEFAULT NULL";
-		}
-		$aFieldDefs[] = "INDEX (id)";
-		$aFieldDefs[] = "INDEX (primary_key)";
-		$sFieldDefs = implode(', ', $aFieldDefs);
-
-		$sDbCharset = DEFAULT_CHARACTER_SET;
-		$sDbCollation = DEFAULT_COLLATION;
-		$sCreateTable = "CREATE TABLE `$sTable` ($sFieldDefs) ENGINE = ".MYSQL_ENGINE." CHARACTER SET ".$sDbCharset." COLLATE ".$sDbCollation.";";
-		CMDBSource::Query($sCreateTable);
-
-		$aTriggers = $this->GetTriggersDefinition();
-		foreach($aTriggers as $key => $sTriggerSQL)
-		{
-			CMDBSource::Query($sTriggerSQL);
-		}
-		
-		$sDataTable = $this->Get('database_table_name');
-		if (empty($sDataTable))
-		{
-			$this->Set('database_table_name', $this->ComputeDataTableName());
-			$this->DBUpdate();
-		}
-		
-	}
-
-	/**
-	 * Gets the definitions of the 3 triggers: before insert, before update and after delete
-	 * @return array An array with 3 entries, one for each of the SQL queries
-	 */
-	protected function GetTriggersDefinition()
-	{
-		$sTable = $this->GetDataTable();
-		$sReplicaTable = MetaModel::DBGetTable('SynchroReplica');
-		$aColumns = $this->GetSQLColumns();
-		$aResult = array();
-
-		$sTriggerInsert = "CREATE TRIGGER `{$sTable}_bi` BEFORE INSERT ON `$sTable`";
-		$sTriggerInsert .= "   FOR EACH ROW";
-		$sTriggerInsert .= "   BEGIN";
-		$sTriggerInsert .= "      INSERT INTO `{$sReplicaTable}` (`sync_source_id`, `status_last_seen`, `status`) VALUES ({$this->GetKey()}, NOW(), 'new');";
-		$sTriggerInsert .= "      SET NEW.id = LAST_INSERT_ID();";
-		$sTriggerInsert .= "   END;";
-		$aResult['bi'] = $sTriggerInsert;
-
-		$aModified = array();
-		foreach($aColumns as $sColumn => $ColSpec)
-		{
-			// <=> is a null-safe 'EQUALS' operator (there is no equivalent for "DIFFERS FROM")
-			$aModified[] = "NOT(NEW.`$sColumn` <=> OLD.`$sColumn`)";
-		}
-		$sIsModified = '('.implode(') OR (', $aModified).')';
-
-		// Update the replica
-		//
-		// status is forced to "new" if the replica was obsoleted directly from the state "new" (dest_id = null)
-		// otherwise, if status was either 'obsolete' or 'synchronized' it is turned into 'modified' or 'synchronized' depending on the changes
-		// otherwise, the status is left as is
-		$sTriggerUpdate = "CREATE TRIGGER `{$sTable}_bu` BEFORE UPDATE ON `$sTable`";
-		$sTriggerUpdate .= "   FOR EACH ROW";
-		$sTriggerUpdate .= "   BEGIN";
-		$sTriggerUpdate .= "      IF @itopuser is null THEN";
-		$sTriggerUpdate .= "         UPDATE `{$sReplicaTable}` SET status_last_seen = NOW(), `status` = IF(`status` = 'obsolete', IF(`dest_id` IS NULL, 'new', 'modified'), IF(`status` IN ('synchronized') AND ($sIsModified), 'modified', `status`)) WHERE sync_source_id = {$this->GetKey()} AND id = OLD.id;";
-		$sTriggerUpdate .= "         SET NEW.id = OLD.id;"; // make sure this id won't change
-		$sTriggerUpdate .= "      END IF;";
-		$sTriggerUpdate .= "   END;";
-		$aResult['bu'] = $sTriggerUpdate;
-
-		$sTriggerDelete = "CREATE TRIGGER `{$sTable}_ad` AFTER DELETE ON `$sTable`";
-		$sTriggerDelete .= "   FOR EACH ROW";
-		$sTriggerDelete .= "   BEGIN";
-		$sTriggerDelete .= "      DELETE FROM `{$sReplicaTable}` WHERE id = OLD.id;";
-		$sTriggerDelete .= "   END;";
-		$aResult['ad'] = $sTriggerDelete;
-		return $aResult;
-	}
-	
-	protected function AfterDelete()
-	{
-		parent::AfterDelete();
-
-		$sTable = $this->GetDataTable();
-
-		$sDropTable = "DROP TABLE IF EXISTS `$sTable`"; // Do not fail if the table is already deleted (corrupted database)
-		CMDBSource::Query($sDropTable);
-		// TO DO - check that triggers get dropped with the table
-	}
-
-	/**
-	 * Checks if the data source definition is consistent with the schema of the target class
-	 *
-	 * @param boolean $bDiagnostics boolean True to only diagnose the consistency, false to actually apply some changes
-	 * @param boolean $bVerbose boolean True to get some information in the std output (echo)
-	 * @param null $oChange //FIXME never used, should we drop this ?
-	 *
-	 * @return bool Whether or not the database needs fixing for this data source
-	 */
-	public function CheckDBConsistency($bDiagnostics, $bVerbose, $oChange = null)
-	{
-		$bFixNeeded = false;
-		$bTriggerRebuildNeeded = false;
-		$aMissingFields = array();
-		$oAttributeSet = $this->Get('attribute_list');
-		$aAttributes = array();
-
-		while($oAttribute = $oAttributeSet->Fetch())
-		{
-			$sAttCode = $oAttribute->Get('attcode');
-			if (MetaModel::IsValidAttCode($this->GetTargetClass(), $sAttCode))
-			{ 
-				$aAttributes[$sAttCode] = $oAttribute;
-			}
-			else
-			{
-				// Old field remaining
-				$bTriggerRebuildNeeded = true;
-				if ($bVerbose)
-				{
-					echo "Irrelevant field description for the field '$sAttCode', for the data synchro task ".$this->GetName()." (".$this->GetKey()."), will be removed.\n";
-				}
-				$bFixNeeded = true;
-				if (!$bDiagnostics)
-				{
-					// Fix the issue
-					$oAttribute->DBDelete();
-				}
-			}
-		}
-
-		$sTable = $this->GetDataTable();
-		foreach($this->ListTargetAttributes() as $sAttCode=>$oAttDef)
-		{
-			if (!isset($aAttributes[$sAttCode]))
-			{
-				$bFixNeeded = true;
-				$aMissingFields[] = $sAttCode;
-				$bTriggerRebuildNeeded = true;
-				// New field missing...
-				if ($bVerbose)
-				{
-					echo "Missing field description for the field '$sAttCode', for the data synchro task ".$this->GetName()." (".$this->GetKey()."), will be created with default values.\n";
-				}
-				if (!$bDiagnostics)
-				{
-					// Fix the issue
-					$oAttribute = $this->CreateSynchroAtt($sAttCode);
-					$oAttribute->DBInsert();
-				}
-			}
-			else
-			{
-				$aColumns = $this->GetSQLColumns(array($sAttCode));
-				foreach($aColumns as $sColName => $sColumnDef)
-				{
-					$bOneColIsMissing = false;
-					if (!CMDBSource::IsField($sTable, $sColName))
-					{
-						$bFixNeeded = true;
-						$bOneColIsMissing = true;
-						if ($bVerbose)
-						{
-							if (count($aColumns) > 1)
-							{
-								echo "Missing column '$sColName', in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The columns '".implode("', '", $aColumns )." will be re-created.'.\n";
-							}
-							else
-							{
-								echo "Missing column '$sColName', in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The column '$sColName' will be added.\n";
-							}
-						}
-					}
-					else if (strcasecmp(CMDBSource::GetFieldType($sTable, $sColName), $sColumnDef) != 0)
-					{
-						$bFixNeeded = true;
-						$bOneColIsMissing = true;
-						if (count($aColumns) > 1)
-						{
-							echo "Incorrect column '$sColName' (".CMDBSource::GetFieldType($sTable, $sColName)." instead of ".$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The columns '".implode("', '", $aColumns )." will be re-created.'.\n";
-						}
-						else
-						{
-							echo "Incorrect column '$sColName' (".CMDBSource::GetFieldType($sTable, $sColName)." instead of ".$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The column '$sColName' will be added.\n";
-						}
-					}
-					if ($bOneColIsMissing)
-					{
-						$bTriggerRebuildNeeded = true;
-						$aMissingFields[] = $sAttCode;
-					}
-				}
-			}
-		}
-
-		$sDBName = MetaModel::GetConfig()->Get('db_name');
-		try
-		{
-			// Note: as per the MySQL documentation, using information_schema behaves exactly like SHOW TRIGGERS (user privileges)
-			//       and this is in fact the recommended way for better portability
-			$iTriggerCount = CMDBSource::QueryToScalar("select count(*) from information_schema.triggers where EVENT_OBJECT_SCHEMA='$sDBName' and EVENT_OBJECT_TABLE='$sTable'");
-		}
-		catch (Exception $e)
-		{
-			if ($bVerbose)
-			{
-				echo "Failed to investigate on the synchro triggers (skipping the check): ".$e->getMessage().".\n";
-			}
-			// Ignore this error: consider that the trigger are there
-			$iTriggerCount = 3;
-		}
-		if ($iTriggerCount < 3)
-		{
-			$bFixNeeded = true;
-			$bTriggerRebuildNeeded = true;
-			if ($bVerbose)
-			{
-				echo "Missing trigger(s) for the data synchro task ".$this->GetName()." (table {$sTable}).\n";
-			}
-		}
-
-		$aRepairQueries = array();
-
-		if (count($aMissingFields) > 0)
-		{
-			// The structure of the table needs adjusting
-			$aColumns = $this->GetSQLColumns($aMissingFields);
-			$aFieldDefs = array();
-			foreach($aColumns as $sAttCode => $sColumnDef)
-			{
-				if (CMDBSource::IsField($sTable, $sAttCode))
-				{
-					$aRepairQueries[] = "ALTER TABLE `$sTable` CHANGE `$sAttCode` `$sAttCode` $sColumnDef";
-				}
-				else
-				{
-					$aFieldDefs[] = "`$sAttCode` $sColumnDef";
-				}
-
-			}
-			if (count($aFieldDefs) > 0)
-			{
-				$aRepairQueries[] = "ALTER TABLE `$sTable` ADD (".implode(',', $aFieldDefs).");";
-			}
-
-			if ($bDiagnostics)
-			{
-				if ($bVerbose)
-				{
-					echo "The structure of the table $sTable for the data synchro task ".$this->GetName()." (".$this->GetKey().") must be altered (missing or incorrect fields: ".implode(',', $aMissingFields).").\n";
-				}
-			}
-		}
-
-		// Repair the triggers
-		// Must be done after updating the columns because MySQL does check the validity of the query found into the procedure!
-		if ($bTriggerRebuildNeeded)
-		{
-			// The triggers as well must be adjusted
-			$aTriggersDefs = $this->GetTriggersDefinition();
-			$aTriggerRepair = array();
-			$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_bi`;";
-			$aTriggerRepair[] = $aTriggersDefs['bi'];
-			$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_bu`;";
-			$aTriggerRepair[] = $aTriggersDefs['bu'];
-			$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_ad`;";
-			$aTriggerRepair[] = $aTriggersDefs['ad'];
-			
-			if ($bDiagnostics)
-			{
-				if ($bVerbose)
-				{
-					echo "The triggers {$sTable}_bi, {$sTable}_bu, {$sTable}_ad for the data synchro task ".$this->GetName()." (".$this->GetKey().") must be re-created.\n";
-					echo implode("\n", $aTriggerRepair)."\n";
-				}
-			}
-			$aRepairQueries = array_merge($aRepairQueries, $aTriggerRepair); // The order matters!
-		}
-
-		// Execute the repair statements
-		//
-		if (!$bDiagnostics && (count($aRepairQueries) > 0))
-		{
-			// Fix the issue
-			foreach($aRepairQueries as $sSQL)
-			{
-				CMDBSource::Query($sSQL);
-				if ($bVerbose)
-				{
-					echo "$sSQL\n";
-				}
-			}
-		}
-		return $bFixNeeded;
-	}
-
-	public function SendNotification($sSubject, $sBody)
-	{
-		$iContact = $this->Get('notify_contact_id');
-		if ($iContact == 0)
-		{
-			// Leave silently...
-			return;
-		}
-		$oContact = MetaModel::GetObject('Contact', $iContact);
-
-		// Determine the email attribute (the first one will be our choice)
-		$sEmailAttCode = null;
-		foreach (MetaModel::ListAttributeDefs(get_class($oContact)) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeEmailAddress)
-			{
-				$sEmailAttCode = $sAttCode;
-				// we've got one, exit the loop
-				break;
-			}
-		}
-		if (is_null($sEmailAttCode))
-		{
-			// Leave silently...
-			return;
-		}
-
-		$sTo = $oContact->Get($sEmailAttCode);
-		$sBody = '<p>Data synchronization: '.$this->GetHyperlink().'</p>'.$sBody;
-
-		$sSubject = 'iTop Data Sync - '.$this->GetName().' - '.$sSubject;
-
-		$oEmail = new Email();
-		$oEmail->SetRecipientTO($sTo);
-		$oEmail->SetSubject($sSubject);
-		$oEmail->SetBody($sBody);
-		if ($oEmail->Send($aIssues) == EMAIL_SEND_ERROR)
-		{
-			// mmmm, what can I do?
-		}
-	}
-
-	/**
-	 * Get the list of attributes eligible to the synchronization	 
-	 */
-	public function ListTargetAttributes()
-	{
-		$aRet = array();
-		foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode => $oAttDef)
-		{
-			if ($sAttCode == 'finalclass') continue;
-			if (!$oAttDef->IsWritable()) continue;
-			if ($oAttDef->IsLinkSet() && !$oAttDef->IsIndirect()) continue;
-
-			$aRet[$sAttCode] = $oAttDef;
-		}
-		return $aRet;
-	}
-
-
-	/**
-	 * @param null|string[] $aAttributeCodes attribute codes list
-	 *
-	 * @return string[] corresponding current class SQL columns, all of the table columns if null was provided
-	 */
-	public function GetSQLColumns($aAttributeCodes = null)
-	{
-		$aColumns = array();
-		$sClass = $this->GetTargetClass();
-
-		if (is_null($aAttributeCodes))
-		{
-			$aAttributeCodes = array();
-			foreach($this->ListTargetAttributes() as $sAttCode => $oAttDef)
-			{
-				$aAttributeCodes[] = $sAttCode;
-			}
-		}
-
-		foreach($aAttributeCodes as $sAttCode)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			
-			if ($oAttDef->IsExternalKey())
-			{
-				// The pkey might be used as well as any other key column
-				$aColumns[$sAttCode] = 'VARCHAR(255)';
-			}
-			else
-			{
-				foreach($oAttDef->GetImportColumns() as $sField => $sDBFieldType)
-				{
-					$aColumns[$sField] = $sDBFieldType;
-				}
-			}
-		}
-		return $aColumns;
-	}
-	
-	/**
-	 * DEPRECATED - Get the list of Date and Datetime SQL columns
-	 */
-	public function GetDateSQLColumns()
-	{
-		$aDateAttributes = array();
-		
-		$sClass = $this->GetTargetClass();
-		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef instanceof AttributeDateTime)
-			{
-				$aDateAttributes[] = $sAttCode;
-			}
-		}
-		return $this->GetSQLColumns($aDateAttributes);
-	}
-
-	public function IsRunning()
-	{
-		$sOQL = "SELECT SynchroLog WHERE sync_source_id = :source_id AND status='running'";
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array('start_date' => false) /* order by*/, array('source_id' => $this->GetKey()) /* aArgs */, array(), 1 /* limitCount */, 0 /* limitStart */);
-		if ($oSet->Count() < 1)
-		{
-			$bRet = false;
-		}
-		else
-		{
-			$bRet = true;
-		}
-		return $bRet;
-	}
-	
-	public function GetLatestLog()
-	{
-		$oLog = null;
-		
-		$sOQL = "SELECT SynchroLog WHERE sync_source_id = :source_id";
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array('start_date' => false) /* order by*/, array('source_id' => $this->GetKey()) /* aArgs */, array(), 1 /* limitCount */, 0 /* limitStart */);
-		if ($oSet->Count() >= 1)
-		{
-			$oLog = $oSet->Fetch();
-		}
-		return $oLog;
-	}
-	
-	// TO DO: remove if still unused
-	/**
-	 * Retrieve from the log, the date of the last completed import
-	 * @return DateTime
-	 */
-	public function GetLastCompletedImportDate()
-	{
-		$date = null;
-		$sOQL = "SELECT SynchroLog WHERE sync_source_id = :source_id AND status='completed'";
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array('end_date' => false) /* order by*/, array('source_id' => $this->GetKey()) /* aArgs */, array(), 0 /* limitCount */, 0 /* limitStart */);
-		if ($oSet->Count() >= 1)
-		{
-			$oLog = $oSet->Fetch();
-			$date = $oLog->Get('end_date');
-		}
-		return $date;
-	}
-}
-
-class SynchroAttribute extends cmdbAbstractObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "attcode",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_sync_att",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("sync_source_id", array("targetclass"=>"SynchroDataSource", "jointype"=> "", "allowed_values"=>null, "sql"=>"sync_source_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("sync_source_name", array("allowed_values"=>null, "extkey_attcode"=> 'sync_source_id', "target_attcode"=>"name")));
-		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeBoolean("update", array("allowed_values"=>null, "sql"=>"update", "default_value"=>true, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeBoolean("reconcile", array("allowed_values"=>null, "sql"=>"reconcile", "default_value"=>false, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("update_policy", array("allowed_values"=>new ValueSetEnum('master_locked,master_unlocked,write_if_empty'), "sql"=>"update_policy", "default_value"=>"master_locked", "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-}
-
-class SynchroAttExtKey extends SynchroAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "attcode",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_sync_att_extkey",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("reconciliation_attcode", array("allowed_values"=>null, "sql"=>"reconciliation_attcode", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy', 'reconciliation_attcode')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for a list
-
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-	
-	public function GetReconciliationFormElement($sTargetClass, $sFieldName)
-	{
-		$sHtml = "<select name=\"$sFieldName\">\n";
-		// Id
-		$sSelected = (''== $this->Get('reconciliation_attcode')) ? ' selected' : '';
-		$sHtml .= "<option value=\"\" $sSelected>".Dict::S('Core:SynchroAttExtKey:ReconciliationById')."</option>\n";
-		
-		// Friendly name
-		$sSelected = ('friendlyname' == $this->Get('reconciliation_attcode')) ? ' selected' : '';
-		$sHtml .= "<option value=\"friendlyname\" $sSelected>".MetaModel::GetLabel($sTargetClass, 'friendlyname')."</option>\n";
-		
-		// Separator
-		$sHtml .= '<option value="" disabled>———————————</option>'; // Note: using the em-dash character which has no space between 2 characters
-		
-		// Then add all remaining scalar attributes, sorted alphabetically
-		$aMoreOptions = array();
-		foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
-		{
-			if ($oAttDef->IsScalar() && ($sAttCode != 'friendlyname'))
-			{
-				$sSelected = ($sAttCode == $this->Get('reconciliation_attcode')) ? ' selected' : '';
-				$aMoreOptions[MetaModel::GetLabel($sTargetClass, $sAttCode)] = "<option value=\"$sAttCode\" $sSelected>".MetaModel::GetLabel($sTargetClass, $sAttCode)."</option>\n";	
-			}
-		}
-		ksort($aMoreOptions);
-		foreach($aMoreOptions as $sOption)
-		{
-			$sHtml .= $sOption;
-		}
-		
-		$sHtml .= "</select>\n";
-		return $sHtml;
-	}
-
-}
-
-class SynchroAttLinkSet extends SynchroAttribute
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui,grant_by_profile",
-			"key_type" => "autoincrement",
-			"name_attcode" => "attcode",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_sync_att_linkset",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-		MetaModel::Init_AddAttribute(new AttributeString("row_separator", array("allowed_values"=>null, "sql"=>"row_separator", "default_value"=>'|', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attribute_separator", array("allowed_values"=>null, "sql"=>"attribute_separator", "default_value"=>';', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("value_separator", array("allowed_values"=>null, "sql"=>"value_separator", "default_value"=>':', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("attribute_qualifier", array("allowed_values"=>null, "sql"=>"attribute_qualifier", "default_value"=>'\'', "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy', 'row_separator', 'attribute_separator', 'value_separator', 'attribute_qualifier')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for a list
-
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-
-}
-
-//class SynchroLog extends Event
-class SynchroLog extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_sync_log",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-//		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("sync_source_id", array("targetclass"=>"SynchroDataSource", "jointype"=> "", "allowed_values"=>null, "sql"=>"sync_source_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("start_date", array("allowed_values"=>null, "sql"=>"start_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("end_date", array("allowed_values"=>null, "sql"=>"end_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('running,completed,error'), "sql"=>"status", "default_value"=>"running", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("status_curr_job", array("allowed_values"=>null, "sql"=>"status_curr_job", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("status_curr_pos", array("allowed_values"=>null, "sql"=>"status_curr_pos", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_seen", array("allowed_values"=>null, "sql"=>"stats_nb_replica_seen", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_total", array("allowed_values"=>null, "sql"=>"stats_nb_replica_total", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_deleted", array("allowed_values"=>null, "sql"=>"stats_nb_obj_deleted", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_deleted_errors", array("allowed_values"=>null, "sql"=>"stats_deleted_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_obsoleted", array("allowed_values"=>null, "sql"=>"stats_nb_obj_obsoleted", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_obsoleted_errors", array("allowed_values"=>null, "sql"=>"stats_nb_obj_obsoleted_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_created", array("allowed_values"=>null, "sql"=>"stats_nb_obj_created", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_created_errors", array("allowed_values"=>null, "sql"=>"stats_nb_obj_created_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_created_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_created_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_updated", array("allowed_values"=>null, "sql"=>"stats_nb_obj_updated", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_updated_errors", array("allowed_values"=>null, "sql"=>"stats_nb_obj_updated_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_updated_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_updated_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_unchanged_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_unchanged_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		//		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_reconciled", array("allowed_values"=>null, "sql"=>"stats_nb_replica_reconciled", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_reconciled_errors", array("allowed_values"=>null, "sql"=>"stats_nb_replica_reconciled_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_disappeared_no_action", array("allowed_values"=>null, "sql"=>"stats_nb_replica_disappeared_no_action", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_updated", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_updated", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_updated_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_updated_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_unchanged", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_unchanged", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_unchanged_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_unchanged_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-		
-		MetaModel::Init_AddAttribute(new AttributeText("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeLongText("traces", array("allowed_values"=>null, "sql"=>"traces", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeInteger("memory_usage_peak", array("allowed_values"=>null, "sql"=>"memory_usage_peak", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'start_date', 'end_date', 'status', 'stats_nb_replica_total', 'stats_nb_replica_seen', 'stats_nb_obj_created', /*'stats_nb_replica_reconciled',*/ 'stats_nb_obj_updated', 'stats_nb_obj_obsoleted', 'stats_nb_obj_deleted',
-														'stats_nb_obj_created_errors', 'stats_nb_replica_reconciled_errors', 'stats_nb_replica_disappeared_no_action', 'stats_nb_obj_updated_errors', 'stats_nb_obj_obsoleted_errors', 'stats_nb_obj_deleted_errors', 'stats_nb_obj_new_unchanged', 'stats_nb_obj_new_updated', 'traces')); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'start_date', 'end_date', 'status', 'stats_nb_replica_seen')); // Attributes to be displayed for a list
-		// Search criteria
-//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-	
-	/**
-	 * Helper
-	 */
-	 function GetErrorCount()
-	 {
-	 	return $this->Get('stats_nb_obj_deleted_errors')
-	 			+ $this->Get('stats_nb_obj_obsoleted_errors')
-	 			+ $this->Get('stats_nb_obj_created_errors')
-	 			+ $this->Get('stats_nb_obj_updated_errors')
-	 			+ $this->Get('stats_nb_replica_reconciled_errors');
-	 }
-
-	/**
-	 * Increments a statistics counter
-	 *
-	 * @param string $sCode
-	 */
-	function Inc($sCode)
-	{
-		$this->Set($sCode, 1+$this->Get($sCode));
-	}
-
-
-	/**
-	 * Implement traces management
-	 */
-	protected $m_aTraces = array();
-	public function AddTrace($sMsg, $oReplica = null)
-	{
-		if (MetaModel::GetConfig()->Get('synchro_trace') == 'none')
-		{
-			return;
-		}
-
-		if ($oReplica)
-		{
-			$sDestClass = $oReplica->Get('dest_class');
-			if (!empty($sDestClass))
-			{
-				$sPrefix = $oReplica->GetKey().','.$sDestClass.'::'.$oReplica->Get('dest_id').',';
-			}
-			else
-			{
-				$sPrefix = $oReplica->GetKey().',,';
-			}
-		}
-		else
-		{
-			$sPrefix = ',,';
-		}
-		$this->m_aTraces[] = $sPrefix.$sMsg;
-	}
-
-	public function GetTraces()
-	{
-		return $this->m_aTraces;
-	}
-
-	protected function TraceToText()
-	{
-		if (MetaModel::GetConfig()->Get('synchro_trace') != 'save')
-		{
-			// none, or display only
-			return;
-		}
-
-		$sPrevTrace = $this->Get('traces');
-
-		$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'traces');
-		$iMaxSize = $oAttDef->GetMaxSize();
-		if (strlen($sPrevTrace) > 0)
-		{
-			$sTrace = $sPrevTrace."\n".implode("\n", $this->m_aTraces);
-		}
-		else
-		{
-			$sTrace = implode("\n", $this->m_aTraces);
-		}
-		if (strlen($sTrace) >= $iMaxSize)
-		{
-			$sTrace = substr($sTrace, 0, $iMaxSize - 255)."...\nTruncated (size: ".strlen($sTrace).')';
-		}
-		$this->Set('traces', $sTrace);
-
-		//DBUpdate may be called many times... the operation should not be repeated
-		$this->m_aTraces = array();
-	}
-
-	protected function OnInsert()
-	{
-		$this->TraceToText();
-		parent::OnInsert();
-	}
-
-	protected function OnUpdate()
-	{
-		$this->TraceToText();
-		$sMemPeak = max($this->Get('memory_usage_peak'), ExecutionKPI::memory_get_peak_usage());
-		$this->Set('memory_usage_peak', $sMemPeak);
-		parent::OnUpdate();
-	}
-}
-
-
-class SynchroReplica extends DBObject implements iDisplay
-{
-	static $aSearches = array(); // Cache of OQL queries used for reconciliation (per data source)
-	protected $aWarnings;
-	
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb,view_in_gui",
-			"key_type" => "autoincrement",
-			"name_attcode" => "",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_sync_replica",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-			"indexes" => array( array ('dest_class', 'dest_id'), ),
-		);
-		MetaModel::Init_Params($aParams);
-		MetaModel::Init_InheritAttributes();
-
-		MetaModel::Init_AddAttribute(new AttributeExternalKey("sync_source_id", array("targetclass"=>"SynchroDataSource", "jointype"=> "", "allowed_values"=>null, "sql"=>"sync_source_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeExternalField("base_class", array("allowed_values"=>null, "extkey_attcode"=> 'sync_source_id', "target_attcode"=>"scope_class")));
-
-		MetaModel::Init_AddAttribute(new AttributeObjectKey("dest_id", array("allowed_values"=>null, "class_attcode"=>"dest_class", "sql"=>"dest_id", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeClass("dest_class", array("class_category"=>"", "more_values"=>"", "sql"=>"dest_class", "default_value"=>'Organization', "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeDateTime("status_last_seen", array("allowed_values"=>null, "sql"=>"status_last_seen", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('new,synchronized,modified,orphan,obsolete'), "sql"=>"status", "default_value"=>"new", "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeBoolean("status_dest_creator", array("allowed_values"=>null, "sql"=>"status_dest_creator", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("status_last_error", array("allowed_values"=>null, "sql"=>"status_last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("status_last_warning", array("allowed_values"=>null, "sql"=>"status_last_warning", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
-		
-		MetaModel::Init_AddAttribute(new AttributeDateTime("info_creation_date", array("allowed_values"=>null, "sql"=>"info_creation_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("info_last_modified", array("allowed_values"=>null, "sql"=>"info_last_modified", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		// Display lists
-		MetaModel::Init_SetZListItems('details', array('' .
-			'col:0'=> array(
-				'fieldset:SynchroDataSource:Definition' => array('sync_source_id','dest_id','dest_class'),
-				'fieldset:SynchroDataSource:Status' => array('status','status_last_seen','status_dest_creator','status_last_error','status_last_warning'),
-				'fieldset:SynchroDataSource:Information' => array('info_creation_date','info_last_modified'))
-			)
-		);
-		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'dest_id', 'dest_class', 'status_last_seen', 'status', 'status_dest_creator', 'status_last_error', 'status_last_warning')); // Attributes to be displayed for a list
-		// Search criteria
-		MetaModel::Init_SetZListItems('standard_search', array('sync_source_id', 'status_last_seen', 'status', 'status_dest_creator', 'dest_class', 'dest_id', 'status_last_error', 'status_last_warning')); // Criteria of the std search form
-//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
-	}
-	
-	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
-	{
-		parent::__construct($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
-		$this->aWarnings = array();
-	}
-
- 	protected function AddWarning($sWarningMessage)
-	{
-		$this->aWarnings[] = $sWarningMessage;
-	}
-
- 	protected function ResetWarnings()
-	{
-		$this->aWarnings = array();
-	}
-
-	protected function HasWarnings()
-	{
-		return (count($this->aWarnings) > 0);
-	}
-
-	protected function RecordWarnings()
-	{
-		$MAX_WARNING_LENGTH = 255;
-		switch(count($this->aWarnings))
-		{
-			case 0:
-			$sWarningMessage = '';
-			break;
-			
-			case 1:
-			$sWarningMessage = $this->aWarnings[0];
-			break;
-			
-			default:
-			$sWarningMessage = count($this->aWarnings)." warnings: ".implode(' ', $this->aWarnings);
-			break;
-		}
-
-		if (strlen($sWarningMessage) > $MAX_WARNING_LENGTH)
-		{
-			$sWarningMessage = substr($sWarningMessage, 0, $MAX_WARNING_LENGTH - 3).'...';
-		}
-		
-		$this->Set('status_last_warning', $sWarningMessage);
-	}
-
-	public function DBInsert()
-	{
-		throw new CoreException('A synchronization replica must be created only by the mean of triggers');
-	}
-
-	// Overload the deletion -> the replica has been created by the mean of a trigger,
-	//                          it will be deleted by the mean of a trigger too
-	protected function DBDeleteSingleObject()
-	{
-		$this->OnDelete();
-
-		if (!MetaModel::DBIsReadOnly())
-		{
-			$oDataSource = MetaModel::GetObject('SynchroDataSource', $this->Get('sync_source_id'), false);
-			if ($oDataSource)
-			{
-				$sTable = $oDataSource->GetDataTable();
-	
-				$sSQL = "DELETE FROM `$sTable` WHERE id = '{$this->GetKey()}'";
-				CMDBSource::Query($sSQL);
-			}
-			// else the whole datasource has probably been already deleted
-		}
-
-		$this->AfterDelete();
-
-		$this->m_bIsInDB = false;
-		$this->m_iKey = null;
-	}
-
-	public function SetLastError($sMessage, $oException = null)
-	{
-		if ($oException)
-		{
-			$sText = $sMessage.$oException->getMessage();
-		}
-		else
-		{
-			$sText = $sMessage;
-		}
-		if (strlen($sText) > 255)
-		{
-			$sText = substr($sText, 0, 200).'...('.strlen($sText).' chars)...';
-		}
-		$this->Set('status_last_error', $sText);
-	}
-
-	
-	public function Synchro($oDataSource, $aReconciliationKeys, $aAttributes, $oChange, &$oStatLog)
-	{
-		$oStatLog->AddTrace(">>> Beginning of SynchroReplica::Synchro, replica status is '".$this->Get('status')."'.", $this);
-		$this->ResetWarnings();
-		switch($this->Get('status'))
-		{
-			case 'new':
-			$this->Set('status_dest_creator', false);
-			// If needed, construct the query used for the reconciliation
-			if (!isset(self::$aSearches[$oDataSource->GetKey()]))
-			{
-				$aCriterias = array();
-				foreach($aReconciliationKeys as $sFilterCode => $oSyncAtt)
-				{
-					$aCriterias[] = ($sFilterCode == 'primary_key' ? 'id' : $sFilterCode).' = :'.$sFilterCode;
-				}
-				$sOQL = "SELECT ".$oDataSource->GetTargetClass()." WHERE ".implode(' AND ', $aCriterias);
-				self::$aSearches[$oDataSource->GetKey()] = DBObjectSearch::FromOQL($sOQL);
-			}
-			// Get the criterias for the search
-			$aFilterValues = array();
-			foreach($aReconciliationKeys as $sFilterCode => $oSyncAtt)
-			{
-				$value = $this->GetValueFromExtData($sFilterCode, $oSyncAtt, $oStatLog);
-				if (!is_null($value))
-				{
-					$aFilterValues[$sFilterCode] = $value;
-				}
-				else
-				{
-					// TO DO: can we retry this ??
-					// Reconciliation could not be performed - log and EXIT
-					$oStatLog->AddTrace("Could not reconcile on null value for attribute '$sFilterCode'", $this);
-					$this->SetLastError("Could not reconcile on null value for attribute '$sFilterCode'");
-					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
-					$oStatLog->AddTrace("<<< End of SyncroReplica::Synchro (error could not reconcile on null value for attribute '$sFilterCode').", $this);
-					return;
-				}
-			}
-			$oDestSet = new DBObjectSet(self::$aSearches[$oDataSource->GetKey()], array(), $aFilterValues);
-			$iCount = $oDestSet->Count();
-			$sDebugOQL = $oDestSet->GetFilter()->ToOQL(true);
-			$oStatLog->AddTrace("Reconciliation query: '$sDebugOQL' returned $iCount object(s).", $this);		
-			$aConditions = array();
-			foreach($aFilterValues as $sCode => $sValue)
-			{
-				$aConditions[] = $sCode.'='.$sValue;
-			}
-			$sConditionDesc = implode(' AND ', $aConditions);
-			// How many objects match the reconciliation criterias
-			switch($iCount)
-			{
-				case 0:
-				$oStatLog->AddTrace("Nothing found on: $sConditionDesc", $this);
-				if ($oDataSource->Get('action_on_zero') == 'create')
-				{
-					$oStatLog->AddTrace("Calling CreateObjectFromReplica", $this);
-					$bCreated = $this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
-					if ($bCreated)
-					{
-						if ($this->HasWarnings())
-						{
-							$oStatLog->Inc('stats_nb_obj_created_warnings');
-						}
-					}
-					else
-					{
-						// Creation error has precedence over any warning
-						$this->ResetWarnings();
-					}
-				}
-				else // assumed to be 'error'
-				{
-					$oStatLog->AddTrace("Failed to reconcile (no match)", $this);
-					// Recoverable error
-					$this->SetLastError('Could not find a match for reconciliation');
-					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
-				}
-				break;
-				
-				case 1:
-				$oStatLog->AddTrace("Found 1 object on: $sConditionDesc", $this);
-				if ($oDataSource->Get('action_on_one') == 'update')
-				{
-					$oDestObj = $oDestSet->Fetch();
-					$oStatLog->AddTrace("Calling UpdateObjectFromReplica(".(get_class($oDestObj).'::'.$oDestObj->GetKey()).")", $this);
-					$bModified = $this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj_new', 'stats_nb_replica_reconciled_errors');
-					$this->Set('dest_id', $oDestObj->GetKey());
-					$this->Set('dest_class', get_class($oDestObj));
-					if ($this->HasWarnings())
-					{
-						if ($bModified)
-						{
-							$oStatLog->Inc('stats_nb_obj_new_updated_warnings');
-						}
-						else
-						{
-							$oStatLog->Inc('stats_nb_obj_new_unchanged_warnings');
-						}
-					}
-				}
-				else
-				{
-					// assumed to be 'error'
-					$oStatLog->AddTrace("Failed to reconcile (1 match)", $this);
-					// Recoverable error
-					$this->SetLastError('Found a match while expecting several');
-					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
-				}
-				break;
-				
-				default:
-				$oStatLog->AddTrace("Found $iCount objects on: $sConditionDesc", $this);
-				if ($oDataSource->Get('action_on_multiple') == 'error')
-				{
-					$oStatLog->AddTrace("Failed to reconcile (N>1 matches)", $this);
-					// Recoverable error
-					$this->SetLastError($iCount.' destination objects match the reconciliation criterias: '.$sConditionDesc);
-					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
-				}
-				elseif ($oDataSource->Get('action_on_multiple') == 'create')
-				{
-					$bCreated = $this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
-					if ($bCreated)
-					{
-						if ($this->HasWarnings())
-						{
-							$oStatLog->Inc('stats_nb_obj_created_warnings');
-						}
-					}
-					else
-					{
-						// Creation error has precedence over any warning
-						$this->ResetWarnings();
-					}
-				}
-				else
-				{
-					// assumed to be 'take_first'
-					$oDestObj = $oDestSet->Fetch();
-					$bModified = $this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj_new', 'stats_nb_replica_reconciled_errors');
-					$this->Set('dest_id', $oDestObj->GetKey());
-					$this->Set('dest_class', get_class($oDestObj));
-					if ($this->HasWarnings())
-					{
-						if ($bModified)
-						{
-							$oStatLog->Inc('stats_nb_obj_new_updated_warnings');
-						}
-						else
-						{
-							$oStatLog->Inc('stats_nb_obj_new_unchanged_warnings');
-						}
-					}
-				}
-			}
-			$this->RecordWarnings();
-			break;
-			
-			case 'synchronized': // try to recover synchronized replicas with warnings
-			case 'modified':
-				$oDestObj = MetaModel::GetObject($oDataSource->GetTargetClass(), $this->Get('dest_id'));
-			if ($oDestObj == null)
-			{
-				$this->Set('status', 'orphan'); // The destination object has been deleted !
-				$this->SetLastError('Destination object deleted unexpectedly');
-				$oStatLog->Inc('stats_nb_obj_updated_errors');
-			}
-			else
-			{
-				$bModified = $this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj', 'stats_nb_obj_updated_errors');
-				if ($this->HasWarnings())
-				{
-					if ($bModified)
-					{
-						$oStatLog->Inc('stats_nb_obj_updated_warnings');
-					}
-					else
-					{
-						$oStatLog->Inc('stats_nb_obj_unchanged_warnings');
-					}
-				}
-			}
-			$this->RecordWarnings();
-			break;
-			
-			default: // Do nothing in all other cases
-		}
-		$oStatLog->AddTrace("<<< End of SynchroReplica::Synchro.", $this);
-	}
-
-	/**
-	 * Updates the destination object with the Extended data found in the synchro_data_XXXX table
-	 *
-	 * @param $oDestObj
-	 * @param string[] $aAttributes
-	 * @param $oChange
-	 * @param $oStatLog
-	 * @param string $sStatsCode
-	 * @param string $sStatsCodeError
-	 *
-	 * @return bool
-	 */
-	protected function UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, &$oStatLog, $sStatsCode, $sStatsCodeError)
-	{
-		$aValueTrace = array();
-		$bModified = false;
-		try
-		{
-			foreach($aAttributes as $sAttCode => $oSyncAtt)
-			{
-				$value = $this->GetValueFromExtData($sAttCode, $oSyncAtt, $oStatLog);
-				if (!is_null($value))
-				{
-					if ($oSyncAtt->Get('update_policy') == 'write_if_empty')
-					{
-						$oAttDef = MetaModel::GetAttributeDef(get_class($oDestObj), $sAttCode);
-						if ($oAttDef->IsNull($oDestObj->Get($sAttCode)))
-						{
-							// The value is still "empty" in the target object, we are allowed to write the new value
-							$oDestObj->Set($sAttCode, $value);
-							$aValueTrace[] = "$sAttCode: $value";
-						}
-					}
-					else
-					{
-						$oDestObj->Set($sAttCode, $value);
-						$aValueTrace[] = "$sAttCode: $value";
-					}
-				}
-			}
-			// Really modified ?
-			if ($oDestObj->IsModified())
-			{
-				$oDestObj->DBUpdateTracked($oChange);
-				$bModified = true;
-				$oStatLog->AddTrace('Updated object - Values: {'.implode(', ', $aValueTrace).'}', $this);
-				if (($sStatsCode != '') &&(MetaModel::IsValidAttCode(get_class($oStatLog), $sStatsCode.'_updated')))
-				{
-					$oStatLog->Inc($sStatsCode.'_updated');
-				}
-				$this->Set('info_last_modified', date(AttributeDateTime::GetSQLFormat()));
-			}
-			else
-			{
-				$oStatLog->AddTrace('Unchanged object', $this);
-				if (($sStatsCode != '') &&(MetaModel::IsValidAttCode(get_class($oStatLog), $sStatsCode.'_unchanged')))
-				{
-					$oStatLog->Inc($sStatsCode.'_unchanged');
-				}
-			}
-
-			$this->Set('status_last_error', '');
-			$this->Set('status', 'synchronized');
-		}
-		catch(Exception $e)
-		{
-			$oStatLog->AddTrace("Failed to update destination object: {$e->getMessage()}", $this);
-			$this->SetLastError('Unable to update destination object: ', $e);
-			$oStatLog->Inc($sStatsCodeError);
-		}
-		return $bModified;
-	}
-
-	/**
-	 * Creates the destination object populating it with the Extended data found in the synchro_data_XXXX table
-	 *
-	 * @param string $sClass
-	 * @param string[] $aAttributes
-	 * @param $oChange
-	 * @param $oStatLog
-	 *
-	 * @return bool Whether or not the object was created
-	 */
-	protected function CreateObjectFromReplica($sClass, $aAttributes, $oChange, &$oStatLog)
-	{
-		$bCreated = false;
-		$oDestObj = MetaModel::NewObject($sClass);
-		try
-		{
-			$aValueTrace = array();
-			foreach($aAttributes as $sAttCode => $oSyncAtt)
-			{
-				$value = $this->GetValueFromExtData($sAttCode, $oSyncAtt, $oStatLog);
-				if (!is_null($value))
-				{
-					$oDestObj->Set($sAttCode, $value);
-					$aValueTrace[] = "$sAttCode: $value";
-				}
-			}
-			$iNew = $oDestObj->DBInsertTracked($oChange);
-
-			$this->Set('dest_id', $oDestObj->GetKey());
-			$this->Set('dest_class', get_class($oDestObj));
-			$this->Set('status_dest_creator', true);
-			$this->Set('status_last_error', '');
-			$this->Set('status', 'synchronized');
-			$this->Set('info_creation_date', date(AttributeDateTime::GetSQLFormat()));
-			$bCreated = true;
-
-			$oStatLog->AddTrace("Created (".implode(', ', $aValueTrace).")", $this);
-			$oStatLog->Inc('stats_nb_obj_created');
-		}
-		catch(Exception $e)
-		{
-			$oStatLog->AddTrace("Failed to create $sClass ({$e->getMessage()})", $this);
-			$this->SetLastError('Unable to create destination object: ', $e);
-			$oStatLog->Inc('stats_nb_obj_created_errors');
-		}
-		return $bCreated;
-	}
-	
-	/**
-	 * Update the destination object with given values
-	 */	
-	public function UpdateDestObject($aValues, $oChange, &$oStatLog)
-	{
-		try
-		{
-			if ($this->Get('dest_class') == '')
-			{
-				$this->SetLastError('No destination object to update');
-				$oStatLog->Inc('stats_nb_obj_obsoleted_errors');
-			}
-			else
-			{
-				$oDestObj = MetaModel::GetObject($this->Get('dest_class'), $this->Get('dest_id'));
-				foreach($aValues as $sAttCode => $value)
-				{
-					if (!MetaModel::IsValidAttCode(get_class($oDestObj), $sAttCode))
-					{
-						throw new Exception("Unknown attribute code '$sAttCode'");
-					} 
-					$oDestObj->Set($sAttCode, $value);
-				}
-				$this->Set('info_last_modified', date(AttributeDateTime::GetSQLFormat()));
-				$oDestObj->DBUpdateTracked($oChange);
-				$oStatLog->AddTrace("Replica marked as obsolete", $this);
-				$oStatLog->Inc('stats_nb_obj_obsoleted');
-			}
-		}
-		catch(Exception $e)
-		{
-			$this->SetLastError('Unable to update the destination object: ', $e);
-			$oStatLog->Inc('stats_nb_obj_obsoleted_errors');
-		}
-	}
-
-	/**
-	 * Delete the destination object
-	 */	
-	public function DeleteDestObject($oChange, &$oStatLog)
-	{
-		if($this->Get('status_dest_creator'))
-		{
-			try
-			{
-				$oDestObj = MetaModel::GetObject($this->Get('dest_class'), $this->Get('dest_id'));
-				$oCheckDeletionPlan = new DeletionPlan();
-				if ($oDestObj->CheckToDelete($oCheckDeletionPlan))
-				{
-					$oActualDeletionPlan = new DeletionPlan();
-					$oDestObj->DBDeleteTracked($oChange, null, $oActualDeletionPlan);
-					$this->DBDeleteTracked($oChange);
-					$oStatLog->Inc('stats_nb_obj_deleted');
-				}
-				else
-				{
-					$sIssues = implode("\n", $oCheckDeletionPlan->GetIssues());
-					throw(new Exception($sIssues));
-				}
-			}
-			catch(Exception $e)
-			{
-				$this->SetLastError('Unable to delete the destination object: ', $e);
-				$this->Set('status', 'obsolete');
-				$this->DBUpdateTracked($oChange);
-				$oStatLog->Inc('stats_nb_obj_deleted_errors');
-			}
-		}
-		else
-		{
-			$this->DBDeleteTracked($oChange);
-			$oStatLog->Inc('stats_nb_replica_disappeared_no_action');
-		}
-	}
-
-	/**
-	 * Get the value from the 'Extended Data' located in the synchro_data_xxx table for this replica
-	 *
-	 * @param string $sExtAttCode could be a standard attcode, or 'primary_key'
-	 * @param $oSyncAtt
-	 * @param $oStatLog
-	 *
-	 * @return mixed , or null (leave unchanged), or '' (reset)
-	 */
-	protected function GetValueFromExtData($sExtAttCode, $oSyncAtt, &$oStatLog)
-	{
-		// $aData should contain attributes defined either for reconciliation or create/update
-		$aData = $this->GetExtendedData();
-
-		if ($sExtAttCode == 'primary_key')
-		{
-			return $aData['primary_key'];
-		}
-
-		// $sExtAttCode is a valid attribute code
-		// 
-		$sClass = $this->Get('base_class');
-
-		$oAttDef = MetaModel::GetAttributeDef($sClass, $sExtAttCode);
-
-		if (!is_null($oSyncAtt) && ($oSyncAtt instanceof SynchroAttExtKey))
-		{
-			$rawValue = $aData[$sExtAttCode];
-			if (is_null($rawValue))
-			{
-				// Null means "ignore" this attribute
-				return null;
-			}
-
-			$sReconcAttCode = $oSyncAtt->Get('reconciliation_attcode');
-			if (!empty($sReconcAttCode))
-			{
-				$sRemoteClass = $oAttDef->GetTargetClass();
-				$oObj = MetaModel::GetObjectByColumn($sRemoteClass, $sReconcAttCode, $rawValue, false);
-				if ($oObj)
-				{
-					 $retValue = $oObj->GetKey();
-				}
-				else
-				{
-					if ($rawValue != '')
-					{
-						// Note: differs from null (in which case the value would be left unchanged)
-						$oStatLog->AddTrace("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'", $this);
-						$this->AddWarning("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'");
-					}
-					$retValue = 0;
-				}
-			}
-			else
-			{
-				$retValue = $rawValue;
-			}
-		}
-		elseif (!is_null($oSyncAtt) && ($oSyncAtt instanceof SynchroAttLinkSet))
-		{
-			$rawValue = $aData[$sExtAttCode];
-			if (is_null($rawValue))
-			{
-				// Null means "ignore" this attribute
-				return null;
-			}
-			// MakeValueFromString() throws an exception in case of failure
-			$bLocalizedValue = false;
-			$retValue = $oAttDef->MakeValueFromString($rawValue, $bLocalizedValue, $oSyncAtt->Get('row_separator'), $oSyncAtt->Get('attribute_separator'), $oSyncAtt->Get('value_separator'), $oSyncAtt->Get('attribute_qualifier'));
-		}
-		else
-		{
-			$aColumns = $oAttDef->GetImportColumns();
-			foreach($aColumns as $sColumn => $sFormat)
-			{
-				// In any case, a null column means "ignore this attribute"
-				//
-				if (is_null($aData[$sColumn]))
-				{
-					return null;
-				}
-			}
-			// No null column has been found
-			$retValue = $oAttDef->FromImportToValue($aData, $sExtAttCode);
-			if (is_null($retValue))
-			{
-				// This is a reset
-				$retValue = '';
-			}
-		}
-
-		return $retValue;
-	}
-	
-	/**
-	 * Maps the given context parameter name to the appropriate filter/search code for this class
-	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
-	 * @return string Filter code, i.e. 'customer_id'
-	 */
-	public static function MapContextParam($sContextParam)
-	{
-		if ($sContextParam == 'menu')
-		{
-			return null;
-		}
-		else
-		{
-			return $sContextParam;
-		}
-	}
-
-	/**
-	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
-	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
-	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
-	 * To Be overridden by derived classes
-	 * @param void
-	 * @return String The desired higlight class for the object/row
-	 */
-	public function GetHilightClass()
-	{
-		// Possible return values are:
-		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
-		return HILIGHT_CLASS_NONE; // Not hilighted by default
-	}
-
-	public static function GetUIPage()
-	{
-		return '../synchro/replica.php';
-	}
-
-	function DisplayDetails(WebPage $oPage, $bEditMode = false)
-	{
-		// Object's details
-		//$this->DisplayBareHeader($oPage, $bEditMode);
-		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
-		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
-		$this->DisplayBareProperties($oPage, $bEditMode);
-	}
-	
-	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		if ($bEditMode) return; // Not editable
-		
-		$oPage->add('<table style="vertical-align:top"><tr style="vertical-align:top"><td>');
-		$aDetails = array();
-		$sClass = get_class($this);
-		$oPage->add('<fieldset>');
-		$oPage->add('<legend>'.Dict::S('Core:SynchroReplica:PrivateDetails').'</legend>');
-		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
-		foreach( $aZList as $sAttCode)
-		{
-			$sDisplayValue = $this->GetAsHTML($sAttCode);	
-			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
-		}
-		$oPage->Details($aDetails);
-		$oPage->add('</fieldset>');
-		if (strlen($this->Get('dest_class')) > 0)
-		{
-			$oDestObj = MetaModel::GetObject($this->Get('dest_class'), $this->Get('dest_id'), false);
-			if (is_object($oDestObj))
-			{
-				$oPage->add('<fieldset>');
-				$oPage->add('<legend>'.Dict::Format('Core:SynchroReplica:TargetObject', $oDestObj->GetHyperlink()).'</legend>');
-					$oDestObj->DisplayBareProperties($oPage, false, $sPrefix, $aExtraParams);
-				$oPage->add('<fieldset>');
-			}
-		}
-		$oPage->add('</td><td>');
-		$oPage->add('<fieldset>');
-		$oPage->add('<legend>'.Dict::S('Core:SynchroReplica:PublicData').'</legend>');
-		$oSource = MetaModel::GetObject('SynchroDataSource', $this->Get('sync_source_id'));
-		
-		$sSQLTable = $oSource->GetDataTable();
-		$aData = $this->LoadExtendedDataFromTable($sSQLTable);
-
-		$aHeaders = array('attcode' => array('label' => 'Attribute Code', 'description' => ''),
-						  'data'    => array('label' => 'Value', 'description' => ''));
-		$aRows = array();
-		foreach($aData as $sKey => $value)
-		{
-			$aRows[] = array('attcode' => $sKey, 'data' => $value);
-		}
-		$oPage->Table($aHeaders, $aRows);
-		$oPage->add('</fieldset>');
-		$oPage->add('</td></tr></table>');
-		
-	}
-	
-	public function LoadExtendedDataFromTable($sSQLTable)
-	{
-		$sSQL = "SELECT * FROM $sSQLTable WHERE id=".$this->GetKey();
-
-		$rQuery = CMDBSource::Query($sSQL);
-		return CMDBSource::FetchArray($rQuery);
-	}
-}
-
-/**
- * Context of an ongoing synchronization
- * Two usages:
- * 1) Public usage: execute the synchronization
- *    $oSynchroExec = new SynchroExecution($oDataSource[, $iLastFullLoad]);
- *    $oSynchroExec->Process($iMaxChunkSize); 
- *      
- * 2) Internal usage: continue the synchronization (split into chunks, each performed in a separate process)
- *    This is implemented in the page priv_sync_chunk.php 
- *    $oSynchroExec = SynchroExecution::Resume($oDataSource, $iLastFullLoad, $iSynchroLog, $iChange, $iMaxToProcess, $iJob, $iNextInJob);    
- *    $oSynchroExec->Process() 
- */	
-class SynchroExecution
-{
-	protected $m_oDataSource = null;
-	protected $m_oLastFullLoadStartDate = null;
-
-	protected $m_oChange = null;
-	/** @var SynchroLog */
-	protected $m_oStatLog = null;
-
-	// Context computed one for optimization and report inconsistencies ASAP
-	protected $m_aExtDataSpec = array();
-	protected $m_aReconciliationKeys = array();
-	protected $m_aAttributes = array();
-	protected $m_iCountAllReplicas = 0;
-	protected $m_oCtx;
-	protected $m_oCtx1;
-	
-	/**
-	 * Constructor
-	 * @param SynchroDataSource $oDataSource Synchronization task
-	 * @param DateTime $oLastFullLoadStartDate Date of the last full load (start date/time), if known
-	 */
-	public function __construct($oDataSource, $oLastFullLoadStartDate = null)
-	{
-		$this->m_oDataSource = $oDataSource;
-		$this->m_oLastFullLoadStartDate = $oLastFullLoadStartDate;
-		$this->m_oCtx = new ContextTag('Synchro');
-		$this->m_oCtx1 = new ContextTag('Synchro:'.$oDataSource->GetRawName()); // More precise context information
-	}
-
-	/**
-	* Create the persistant information records, for the current synchronization
-	* In fact, those records ARE defining what is the "current" synchronization	
-	*/	
-	protected function PrepareLogs()
-	{
-		if (!is_null($this->m_oChange))
-		{
-			return;
-		}
-
-		// Create a change used for logging all the modifications/creations happening during the synchro
-		$this->m_oChange = MetaModel::NewObject("CMDBChange");
-		$this->m_oChange->Set("date", time());
-		$sUserString = CMDBChange::GetCurrentUserName();
-		$this->m_oChange->Set("userinfo", $sUserString.' '.Dict::S('Core:SyncDataExchangeComment'));
-		$this->m_oChange->Set("origin", 'synchro-data-source');
-		$this->m_oChange->DBInsert();
-
-		// Start logging this execution (stats + protection against reentrance)
-		//
-		$this->m_oStatLog = new SynchroLog();
-		$this->m_oStatLog->Set('sync_source_id', $this->m_oDataSource->GetKey());
-		$this->m_oStatLog->Set('start_date', time());
-		$this->m_oStatLog->Set('status', 'running');
-		$this->m_oStatLog->Set('stats_nb_replica_seen', 0);
-		$this->m_oStatLog->Set('stats_nb_replica_total', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_deleted', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_deleted_errors', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_obsoleted', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_obsoleted_errors', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_created', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_created_errors', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_created_warnings', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_updated', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_updated_warnings', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_updated_errors', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_unchanged_warnings', 0);
-		//		$this->m_oStatLog->Set('stats_nb_replica_reconciled', 0);
-		$this->m_oStatLog->Set('stats_nb_replica_reconciled_errors', 0);
-		$this->m_oStatLog->Set('stats_nb_replica_disappeared_no_action', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_new_updated', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_new_updated_warnings', 0);
-		$this->m_oStatLog->Set('stats_nb_obj_new_unchanged',0);
-		$this->m_oStatLog->Set('stats_nb_obj_new_unchanged_warnings',0);
-		
-		$sSelectTotal  = "SELECT SynchroReplica WHERE sync_source_id = :source_id";
-		$oSetTotal = new DBObjectSet(DBObjectSearch::FromOQL($sSelectTotal), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey()));
-		$this->m_iCountAllReplicas = $oSetTotal->Count();
-		$this->m_oStatLog->Set('stats_nb_replica_total', $this->m_iCountAllReplicas);
-
-		$this->m_oStatLog->DBInsertTracked($this->m_oChange);
-		$sLastFullLoad = is_object($this->m_oLastFullLoadStartDate) ? $this->m_oLastFullLoadStartDate->format('Y-m-d H:i:s') : 'not specified';
-		$this->m_oStatLog->AddTrace("###### STARTING SYNCHRONIZATION ##### Total: {$this->m_iCountAllReplicas} replica(s). Last full load: '$sLastFullLoad' ");
-		$sSql = 'SELECT NOW();';
-		$sDBNow = CMDBSource::QueryToScalar($sSql);
-		$this->m_oStatLog->AddTrace("Database server current date/time is '$sDBNow', web server current date/time is: '".date('Y-m-d H:i:s')."'");		
-	}
-
-	/**
-	* Prevent against the reentrance... or allow the current task to do things forbidden by the others !
-	*/	
-	public static $m_oCurrentTask = null;
-	public static function GetCurrentTaskId()
-	{
-		if (is_object(self::$m_oCurrentTask))
-		{
-			return self::$m_oCurrentTask->GetKey();
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Prepare structures in memory, to speedup the processing of a given replica
-	 *
-	 * @param bool $bFirstPass
-	 *
-	 * @throws \SynchroExceptionNotStarted
-	 */
-	public function PrepareProcessing($bFirstPass = true)
-	{
-		if ($this->m_oDataSource->Get('status') == 'obsolete')
-		{
-			throw new SynchroExceptionNotStarted(Dict::S('Core:SyncDataSourceObsolete'));
-		}
-		if (!UserRights::IsAdministrator() && $this->m_oDataSource->Get('user_id') != UserRights::GetUserId())
-		{
-			throw new SynchroExceptionNotStarted(Dict::S('Core:SyncDataSourceAccessRestriction'));
-		}
-
-		// Get the list of SQL columns
-		$aAttCodesExpected = array();
-		$aAttCodesToReconcile = array();
-		$aAttCodesToUpdate = array();
-		$sSelectAtt  = "SELECT SynchroAttribute WHERE sync_source_id = :source_id AND (update = 1 OR reconcile = 1)";
-		$oSetAtt = new DBObjectSet(DBObjectSearch::FromOQL($sSelectAtt), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey()) /* aArgs */);
-		while ($oSyncAtt = $oSetAtt->Fetch())
-		{
-			if ($oSyncAtt->Get('update'))
-			{
-				$aAttCodesToUpdate[$oSyncAtt->Get('attcode')] = $oSyncAtt;
-			}
-			if ($oSyncAtt->Get('reconcile'))
-			{
-				$aAttCodesToReconcile[$oSyncAtt->Get('attcode')] = $oSyncAtt;
-			}
-			$aAttCodesExpected[$oSyncAtt->Get('attcode')] = $oSyncAtt;
-		}
-		$aColumns = $this->m_oDataSource->GetSQLColumns(array_keys($aAttCodesExpected));
-		$aExtDataFields = array_keys($aColumns);
-		$aExtDataFields[] = 'primary_key';
-
-		$this->m_aExtDataSpec = array(
-			'table' => $this->m_oDataSource->GetDataTable(),
-			'join_key' => 'id',
-			'fields' => $aExtDataFields
-		);
-
-		// Get the list of attributes, determine reconciliation keys and update targets
-		//
-		if ($this->m_oDataSource->Get('reconciliation_policy') == 'use_attributes')
-		{
-			$this->m_aReconciliationKeys = $aAttCodesToReconcile;
-		}
-		elseif ($this->m_oDataSource->Get('reconciliation_policy') == 'use_primary_key')
-		{
-			// Override the settings made at the attribute level !
-			$this->m_aReconciliationKeys = array("primary_key" => null);
-		}
-
-		if ($bFirstPass)
-		{
-			$this->m_oStatLog->AddTrace("Update of: {".implode(', ', array_keys($aAttCodesToUpdate))."}");
-			$this->m_oStatLog->AddTrace("Reconciliation on: {".implode(', ', array_keys($this->m_aReconciliationKeys))."}");
-		}
-
-		if (count($aAttCodesToUpdate) == 0)
-		{
-			$this->m_oStatLog->AddTrace("No attribute to update");
-			throw new SynchroExceptionNotStarted('There is no attribute to update');
-		}
-		if (count($this->m_aReconciliationKeys) == 0)
-		{
-			$this->m_oStatLog->AddTrace("No attribute for reconciliation");
-			throw new SynchroExceptionNotStarted('No attribute for reconciliation');
-		}
-		
-		$this->m_aAttributes = array();
-		foreach($aAttCodesToUpdate as $sAttCode => $oSyncAtt)
-		{
-			$oAttDef = MetaModel::GetAttributeDef($this->m_oDataSource->GetTargetClass(), $sAttCode);
-			if ($oAttDef->IsWritable())
-			{
-				$this->m_aAttributes[$sAttCode] = $oSyncAtt;
-			}
-		}
-
-		// Compute and keep track of the limit date taken into account for obsoleting replicas
-		//
-		if ($this->m_oLastFullLoadStartDate == null)
-		{
-			// No previous import known, use the full_load_periodicity value... and the current date
-			$this->m_oLastFullLoadStartDate = new DateTime(); // Now
-			$iLoadPeriodicity = $this->m_oDataSource->Get('full_load_periodicity'); // Duration in seconds
-			if ($iLoadPeriodicity > 0)
-			{
-				$sInterval = "-$iLoadPeriodicity seconds";
-				$this->m_oLastFullLoadStartDate->Modify($sInterval);
-			}
-			else
-			{
-				$this->m_oLastFullLoadStartDate = new DateTime('1970-01-01');
-			}
-		}
-		if ($bFirstPass)
-		{
-			$this->m_oStatLog->AddTrace("Limit Date: ".$this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s'));
-		}
-	}
-
-
-	/**
-	 * Perform a synchronization between the data stored in the replicas (&synchro_data_xxx_xx table)
-	 * and the iTop objects. If the lastFullLoadStartDate is NOT specified then the full_load_periodicity
-	 * is used to determine which records are obsolete.
-	 *
-	 * @return SynchroLog
-	 */
-	public function Process()
-	{
-		$this->PrepareLogs();
-
-		self::$m_oCurrentTask = $this->m_oDataSource;
-
-		$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey());
-		try
-		{
-			$oMutex->Lock();
-			$this->DoSynchronize();
-			$oMutex->Unlock();
-				
-			$this->m_oStatLog->Set('end_date', time());
-			$this->m_oStatLog->Set('status', 'completed');
-			$this->m_oStatLog->DBUpdateTracked($this->m_oChange);
-
-			$iErrors = $this->m_oStatLog->GetErrorCount();
-			if ($iErrors > 0)
-			{
-				$sIssuesOQL = "SELECT SynchroReplica WHERE sync_source_id=".$this->m_oDataSource->GetKey()." AND status_last_error!=''";
-				$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
-				$sIssuesURL = "{$sAbsoluteUrl}synchro/replica.php?operation=oql&datasource=".$this->m_oDataSource->GetKey()."&oql=".urlencode($sIssuesOQL);
-
-				$sStatistics = "<h1>Statistics</h1>\n";
-				$sStatistics .= "<ul>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('start_date').": ".$this->m_oStatLog->Get('start_date')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('end_date').": ".$this->m_oStatLog->Get('end_date')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_seen').": ".$this->m_oStatLog->Get('stats_nb_replica_seen')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_total').": ".$this->m_oStatLog->Get('stats_nb_replica_total')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_deleted').": ".$this->m_oStatLog->Get('stats_nb_obj_deleted')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_deleted_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_deleted_errors')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_obsoleted').": ".$this->m_oStatLog->Get('stats_nb_obj_obsoleted')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_obsoleted_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_obsoleted_errors')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_created').": ".$this->m_oStatLog->Get('stats_nb_obj_created')." (".$this->m_oStatLog->Get('stats_nb_obj_created_warnings')." warnings)"."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_created_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_created_errors')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_updated').": ".$this->m_oStatLog->Get('stats_nb_obj_updated')." (".$this->m_oStatLog->Get('stats_nb_obj_updated_warnings')." warnings)"."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_updated_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_updated_errors')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_reconciled_errors').": ".$this->m_oStatLog->Get('stats_nb_replica_reconciled_errors')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_disappeared_no_action').": ".$this->m_oStatLog->Get('stats_nb_replica_disappeared_no_action')."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_new_updated').": ".$this->m_oStatLog->Get('stats_nb_obj_new_updated')." (".$this->m_oStatLog->Get('stats_nb_obj_new_updated_warnings')." warnings)"."</li>\n";
-				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_new_unchanged').": ".$this->m_oStatLog->Get('stats_nb_obj_new_unchanged')." (".$this->m_oStatLog->Get('stats_nb_obj_new_unchanged_warnings')." warnings)"."</li>\n";
-				$sStatistics .= "</ul>\n";
-
-				$this->m_oDataSource->SendNotification("errors ($iErrors)", "<p>The synchronization has been executed, $iErrors errors have been encountered. Click <a href=\"$sIssuesURL\">here</a> to see the records being currently in error.</p>".$sStatistics);
-			}
-			else
-			{
-				//$this->m_oDataSource->SendNotification('success', '<p>The synchronization has been successfully executed.</p>');
-			}
-		}
-		catch (SynchroExceptionNotStarted $e)
-		{
-			$oMutex->Unlock();
-			// Set information for reporting... but delete the object in DB
-			$this->m_oStatLog->Set('end_date', time());
-			$this->m_oStatLog->Set('status', 'error');
-			$this->m_oStatLog->Set('last_error', $e->getMessage());
-			$this->m_oStatLog->DBDeleteTracked($this->m_oChange);
-			$this->m_oDataSource->SendNotification('fatal error', '<p>The synchronization could not start: \''.$e->getMessage().'\'</p><p>Please check its configuration</p>');
-		}
-		catch (Exception $e)
-		{
-			$oMutex->Unlock();
-			$this->m_oStatLog->Set('end_date', time());
-			$this->m_oStatLog->Set('status', 'error');
-			$this->m_oStatLog->Set('last_error', $e->getMessage());
-			$this->m_oStatLog->DBUpdateTracked($this->m_oChange);
-			$this->m_oDataSource->SendNotification('exception', '<p>The synchronization has been interrupted: \''.$e->getMessage().'\'</p><p>Please contact the application support team</p>');
-		}
-		self::$m_oCurrentTask = null;
-
-		return $this->m_oStatLog;
-	}
-
-	/**
-	 * Do the entire synchronization job
-	 */
-	protected function DoSynchronize()
-	{
-		$this->m_oStatLog->Set('status_curr_job', 1);
-		$this->m_oStatLog->Set('status_curr_pos', -1);
-
-		$iMaxChunkSize = utils::ReadParam('max_chunk_size', 0, true /* allow CLI */);
-		if ($iMaxChunkSize > 0)
-		{
-			// Split the execution into several processes
-			// Each process will call DoSynchronizeChunk()
-			// The loop will end when a process does not reply "continue" on the last line of its output
-			if (!utils::IsModeCLI())
-			{
-				throw new SynchroExceptionNotStarted(Dict::S('Core:SyncSplitModeCLIOnly'));
-			}
-			$aArguments = array();
-			$aArguments['source'] = $this->m_oDataSource->GetKey();
-			$aArguments['log'] = $this->m_oStatLog->GetKey();
-			$aArguments['change'] = $this->m_oChange->GetKey();
-			$aArguments['chunk'] = $iMaxChunkSize;
-			if ($this->m_oLastFullLoadStartDate)
-			{
-				$aArguments['last_full_load'] = $this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s');
-			}
-			else
-			{
-				$aArguments['last_full_load'] = '';
-			}
-
-			$this->m_oStatLog->DBUpdate($this->m_oChange);
-
-			$iStepCount = 0;
-			do
-			{
-				$aArguments['step_count'] = $iStepCount;
-				$iStepCount++;
-
-				set_time_limit(0); // On Linux the time spent outside of the script does not count, but on Windows it does, so let give us time !
-				list ($iRes, $aOut) = utils::ExecITopScript('synchro/priv_sync_chunk.php', $aArguments);
-
-				// Reload the log that has been modified by the processes
-				$this->m_oStatLog->Reload();
-
-				$sLastRes = strtolower(trim(end($aOut)));
-				switch($sLastRes)
-				{
-				case 'continue':
-					$bContinue = true;
-					break;
-
-				case 'finished':
-					$bContinue = false;
-					break;
-
-				default:
-					$this->m_oStatLog->AddTrace("The script did not reply with the expected keywords:");
-					$aIndentedOut = array();
-					foreach ($aOut as $sOut)
-					{
-						$aIndentedOut[] = "-> $sOut";
-						$this->m_oStatLog->AddTrace(">>> $sOut");
-					}
-					throw new Exception("Encountered an error in an underspinned process:\n".implode("\n", $aIndentedOut));
-				}
-			}
-			while ($bContinue);
-		}
-		else
-		{
-			$this->PrepareProcessing(/* first pass */);
-			$this->DoJob1();
-			$this->DoJob2();
-			$this->DoJob3();
-		}
-	}
-
-	/**
-	 * Do the synchronization job, limited to some amount of work
-	 * This verb has been designed to be called from within a separate process	 
-	 * @return true if the process has to be continued
-	 */
-	public function DoSynchronizeChunk($oLog, $oChange, $iMaxChunkSize)
-	{
-		// Initialize the structures...
-		self::$m_oCurrentTask = $this->m_oDataSource;
-		$this->m_oStatLog = $oLog;
-		$this->m_oChange = $oChange;
-
-		// Prepare internal structures (not the first pass)
-		$this->PrepareProcessing(false);
-
-		$iCurrJob = $this->m_oStatLog->Get('status_curr_job');
-		$iCurrPos = $this->m_oStatLog->Get('status_curr_pos');
-
-		$this->m_oStatLog->AddTrace("Synchronizing chunk - curr_job:$iCurrJob, curr_pos:$iCurrPos, max_chunk_size:$iMaxChunkSize");
-
-		switch ($iCurrJob)
-		{
-			case 1:
-			default:
-				$this->DoJob1($iMaxChunkSize, $iCurrPos);
-				$bContinue = true;
-				break;
-
-			case 2:
-				$this->DoJob2($iMaxChunkSize, $iCurrPos);
-				$bContinue = true;
-				break;
-
-			case 3:
-				$bContinue = $this->DoJob3($iMaxChunkSize, $iCurrPos);
-				break;
-		}
-		$this->m_oStatLog->DBUpdate($this->m_oChange);
-		self::$m_oCurrentTask = null;
-		return $bContinue;
-	}
-
-	/**
-	 * Do the synchronization job #1: Obsolete replica "untouched" for some time
-	 * @param integer $iMaxReplica Limit the number of replicas to process 
-	 * @param integer $iCurrPos Current position where to resume the processing 
-	 * @return true if the process must be continued
-	 */
-	protected function DoJob1($iMaxReplica = null, $iCurrPos = -1)
-	{
-		$this->m_oStatLog->AddTrace(">>> Beginning of DoJob1(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos)");
-		$sLimitDate = $this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s');
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-
-		// Get all the replicas that were not seen in the last import and mark them as obsolete
-		$sDeletePolicy = $this->m_oDataSource->Get('delete_policy');
-		if ($sDeletePolicy != 'ignore')
-		{
-			$sSelectToObsolete  = "SELECT SynchroReplica WHERE id > :curr_pos AND sync_source_id = :source_id AND status IN ('new', 'synchronized', 'modified', 'orphan') AND status_last_seen < :last_import";
-			$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToObsolete), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos));
-			$iCountScope = $oSetScope->Count();
-			$sDebugOql = $oSetScope->GetFilter()->ToOQL(true);
-			$this->m_oStatLog->AddTrace("Searching for replicas to mark as obsolete using query: '$sDebugOql', returned $iCountScope replica(s).");
-			if (($this->m_iCountAllReplicas > 10) && ($this->m_iCountAllReplicas == $iCountScope) && MetaModel::GetConfig()->Get('synchro_prevent_delete_all'))
-			{
-				throw new SynchroExceptionNotStarted(Dict::S('Core:SyncTooManyMissingReplicas'));
-			} 
-
-			if ($iMaxReplica)
-			{
-				// Consider a given subset, starting from replica iCurrPos, limited to the count of iMaxReplica
-				// The replica have to be ordered by id
-				$oSetToProcess = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToObsolete), array('id'=>true) /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos));
-				$oSetToProcess->SetLimit($iMaxReplica);
-			}
-			else
-			{
-				$oSetToProcess = $oSetScope;
-			}
-
-			$iLastReplicaProcessed = -1;
-			while($oReplica = $oSetToProcess->Fetch())
-			{
-				set_time_limit($iLoopTimeLimit);
-				$iLastReplicaProcessed = $oReplica->GetKey();
-				switch ($sDeletePolicy)
-				{
-				case 'update':
-				case 'update_then_delete':
-					$this->m_oStatLog->AddTrace("Destination object to be updated", $oReplica);
-					$aToUpdate = array();
-					$aToUpdateSpec = explode(';', $this->m_oDataSource->Get('delete_policy_update')); //ex: 'status:obsolete;description:stopped',
-					foreach($aToUpdateSpec as $sUpdateSpec)
-					{
-						$aUpdateSpec = explode(':', $sUpdateSpec);
-						if (count($aUpdateSpec) == 2)
-						{
-							$sAttCode = $aUpdateSpec[0];
-							$sValue = $aUpdateSpec[1];
-							$aToUpdate[$sAttCode] = $sValue;
-						}
-					}
-					$oReplica->Set('status_last_error', '');
-					if ($oReplica->Get('dest_id') == '')
-					{
-						$oReplica->Set('status', 'obsolete');
-						$this->m_oStatLog->Inc('stats_nb_replica_disappeared_no_action');
-					}
-					else
-					{
-						$oReplica->UpdateDestObject($aToUpdate, $this->m_oChange, $this->m_oStatLog);
-						if ($oReplica->Get('status_last_error') == '')
-						{
-							// Change the status of the replica IIF
-							$oReplica->Set('status', 'obsolete');
-						}
-					}
-					$oReplica->DBUpdateTracked($this->m_oChange);
-					break;
-	
-	         	case 'delete':
-	         	default:
-					$this->m_oStatLog->AddTrace("Destination object to be DELETED", $oReplica);
-					$oReplica->DeleteDestObject($this->m_oChange, $this->m_oStatLog);
-				}
-			}
-			if ($iMaxReplica)
-			{
-				if ($iMaxReplica < $iCountScope)
-				{
-					// Continue with this job!
-					$this->m_oStatLog->Set('status_curr_pos', $iLastReplicaProcessed);
-					$this->m_oStatLog->AddTrace("<<< End of DoJob1(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (returning true => more replicas to process)");
-					return true;
-				}
-			}
-		} // if ($sDeletePolicy != 'ignore'
-
-		//Count "seen" objects
-		$sSelectSeen  = "SELECT SynchroReplica WHERE sync_source_id = :source_id AND status IN ('new', 'synchronized', 'modified', 'orphan') AND status_last_seen >= :last_import";
-		$oSetSeen = new DBObjectSet(DBObjectSearch::FromOQL($sSelectSeen), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate));
-		$this->m_oStatLog->Set('stats_nb_replica_seen', $oSetSeen->Count());
-
-
-		// Job complete!
-		$this->m_oStatLog->Set('status_curr_job', 2);
-		$this->m_oStatLog->Set('status_curr_pos', -1);
-		$this->m_oStatLog->AddTrace("<<< End of DoJob1(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
-		return false;
-	}
-
-	/**
-	 * Do the synchronization job #2: Create and modify object for new/modified replicas
-	 * @param integer $iMaxReplica Limit the number of replicas to process 
-	 * @param integer $iCurrPos Current position where to resume the processing 
-	 * @return true if the process must be continued
-	 */
-	protected function DoJob2($iMaxReplica = null, $iCurrPos = -1)
-	{
-		$this->m_oStatLog->AddTrace(">>> Beginning of DoJob2(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos)");
-		$sLimitDate = $this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s');
-		$this->m_oStatLog->AddTrace("\$sLimitDate = '$sLimitDate'");
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-
-		// Get all the replicas that are 'new' or modified or synchronized with a warning
-		//
-		$sSelectToSync  = "SELECT SynchroReplica WHERE id > :curr_pos AND (status = 'new' OR status = 'modified' OR (status = 'synchronized' AND status_last_warning != '')) AND sync_source_id = :source_id AND status_last_seen >= :last_import";
-		$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToSync), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos), $this->m_aExtDataSpec);
-		$iCountScope = $oSetScope->Count();
-		$sDebugOQL = $oSetScope->GetFilter()->ToOQL(true);
-		$this->m_oStatLog->AddTrace("Looking for - new, modified or synchonized with a warning - replicas using the OQL query: '$sDebugOQL', returned $iCountScope replicas.");
-
-		if ($iMaxReplica)
-		{
-			// Consider a given subset, starting from replica iCurrPos, limited to the count of iMaxReplica
-			// The replica have to be ordered by id
-			$oSetToProcess = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToSync), array('id'=>true) /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos), $this->m_aExtDataSpec);
-			$oSetToProcess->SetLimit($iMaxReplica);
-		}
-		else
-		{
-			$oSetToProcess = $oSetScope;
-		}
-
-		$iLastReplicaProcessed = -1;
-		while($oReplica = $oSetToProcess->Fetch())
-		{
-			set_time_limit($iLoopTimeLimit);
-			$iLastReplicaProcessed = $oReplica->GetKey();
-			$this->m_oStatLog->AddTrace("Synchronizing replica id=$iLastReplicaProcessed.");
-			$oReplica->Synchro($this->m_oDataSource, $this->m_aReconciliationKeys, $this->m_aAttributes, $this->m_oChange, $this->m_oStatLog);
-			$this->m_oStatLog->AddTrace("Updating replica id=$iLastReplicaProcessed.");
-			$oReplica->DBUpdateTracked($this->m_oChange);			
-		}
-		
-		if ($iMaxReplica)
-		{
-			if ($iMaxReplica < $iCountScope)
-			{
-				// Continue with this job!
-				$this->m_oStatLog->Set('status_curr_pos', $iLastReplicaProcessed);
-				$this->m_oStatLog->AddTrace("<<< End of DoJob2(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (returning true => more replicas to process)");
-				return true;
-			}
-		}
-
-		// Job complete!
-		$this->m_oStatLog->Set('status_curr_job', 3);
-		$this->m_oStatLog->Set('status_curr_pos', -1);
-		$this->m_oStatLog->AddTrace("<<< End of DoJob2(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
-		return false;
-	}
-
-	/**
-	 * Do the synchronization job #3: Delete replica depending on the obsolescence scheme
-	 * @param integer $iMaxReplica Limit the number of replicas to process 
-	 * @param integer $iCurrPos Current position where to resume the processing 
-	 * @return true if the process must be continued
-	 */
-	protected function DoJob3($iMaxReplica = null, $iCurrPos = -1)
-	{
-		$this->m_oStatLog->AddTrace(">>> Beginning of DoJob3(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos)");
-		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
-		
-		$sDeletePolicy = $this->m_oDataSource->Get('delete_policy');
-		if ($sDeletePolicy != 'update_then_delete')
-		{
-			$this->m_oStatLog->AddTrace("\$sDeletePoliciy = $sDeletePolicy != 'update_then_delete', nothing to do!");
-			// Job complete!
-			$this->m_oStatLog->Set('status_curr_job', 0);
-			$this->m_oStatLog->Set('status_curr_pos', -1);
-			$this->m_oStatLog->AddTrace("<<< End of DoJob3(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
-			return false;
-		}
-
-		$bFirstPass = ($iCurrPos == -1);
-
-		// Get all the replicas that are to be deleted
-		//
-		$oDeletionDate = $this->m_oLastFullLoadStartDate;
-		$iDeleteRetention = $this->m_oDataSource->Get('delete_policy_retention'); // Duration in seconds
-		if ($iDeleteRetention > 0)
-		{
-			$sInterval = "-$iDeleteRetention seconds";
-			$oDeletionDate->Modify($sInterval);
-		}
-		$sDeletionDate = $oDeletionDate->Format('Y-m-d H:i:s');	
-		if ($bFirstPass)
-		{
-			$this->m_oStatLog->AddTrace("Deletion date: $sDeletionDate");
-		}
-		$sSelectToDelete = "SELECT SynchroReplica WHERE id > :curr_pos AND sync_source_id = :source_id AND status IN ('obsolete') AND status_last_seen < :last_import";
-		$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToDelete), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sDeletionDate, 'curr_pos' => $iCurrPos));
-		$iCountScope = $oSetScope->Count();
-
-		if ($iMaxReplica)
-		{
-			// Consider a given subset, starting from replica iCurrPos, limited to the count of iMaxReplica
-			// The replica have to be ordered by id
-			$oSetToProcess = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToDelete), array('id'=>true) /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sDeletionDate, 'curr_pos' => $iCurrPos));
-			$oSetToProcess->SetLimit($iMaxReplica);
-		}
-		else
-		{
-			$oSetToProcess = $oSetScope;
-		}
-
-		$iLastReplicaProcessed = -1;
-		while($oReplica = $oSetToProcess->Fetch())
-		{
-			set_time_limit($iLoopTimeLimit);
-			$iLastReplicaProcessed = $oReplica->GetKey();
-			$this->m_oStatLog->AddTrace("Destination object to be DELETED", $oReplica);
-			$oReplica->DeleteDestObject($this->m_oChange, $this->m_oStatLog);
-		}
-
-		if ($iMaxReplica)
-		{
-			if ($iMaxReplica < $iCountScope)
-			{
-				// Continue with this job!
-				$this->m_oStatLog->Set('status_curr_pos', $iLastReplicaProcessed);
-				$this->m_oStatLog->AddTrace("<<< End of DoJob3\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (returning true => more replicas to process)");
-				return true;
-			}
-		}
-		// Job complete!
-		$this->m_oStatLog->Set('status_curr_job', 0);
-		$this->m_oStatLog->Set('status_curr_pos', -1);
-		$this->m_oStatLog->AddTrace("<<< End of DoJob3(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
-		return false;
-	}
-}
+<?php
+// Copyright (C) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Data Exchange - synchronization with external applications (incoming data)
+ *
+ * @copyright   Copyright (C) 2010-2018 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+class SynchroExceptionNotStarted extends CoreException
+{
+}
+
+class SynchroDataSource extends cmdbAbstractObject
+{	
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => array('name'),
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_sync_datasource",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "realclass",
+			"display_template" => "",
+			"icon" => "../images/synchro.png",
+		);
+		MetaModel::Init_Params($aParams);
+		//MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('implementation,production,obsolete'), "sql"=>"status", "default_value"=>"implementation", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("user_id", array("targetclass"=>"User", "jointype"=>null, "allowed_values"=>null, "sql"=>"user_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("notify_contact_id", array("targetclass"=>"Contact", "jointype"=>null, "allowed_values"=>null, "sql"=>"notify_contact_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("scope_class", array("class_category"=>"bizmodel,addon/authentication,application", "more_values"=>"", "sql"=>"scope_class", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("database_table_name", array("allowed_values"=>null, "sql"=>"database_table_name", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array(), "validation_pattern" => "^[A-Za-z0-9_]*$")));
+				
+		// Declared here for a future usage, but ignored so far
+		MetaModel::Init_AddAttribute(new AttributeString("scope_restriction", array("allowed_values"=>null, "sql"=>"scope_restriction", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		
+		//MetaModel::Init_AddAttribute(new AttributeDateTime("last_synchro_date", array("allowed_values"=>null, "sql"=>"last_synchro_date", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Format: seconds (int)
+		MetaModel::Init_AddAttribute(new AttributeDuration("full_load_periodicity", array("allowed_values"=>null, "sql"=>"full_load_periodicity", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		
+//		MetaModel::Init_AddAttribute(new AttributeString("reconciliation_list", array("allowed_values"=>null, "sql"=>"reconciliation_list", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("reconciliation_policy", array("allowed_values"=>new ValueSetEnum('use_primary_key,use_attributes'), "sql"=>"reconciliation_policy", "default_value"=>"use_attributes", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("action_on_zero", array("allowed_values"=>new ValueSetEnum('create,error'), "sql"=>"action_on_zero", "default_value"=>"create", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("action_on_one", array("allowed_values"=>new ValueSetEnum('update,error'), "sql"=>"action_on_one", "default_value"=>"update", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("action_on_multiple", array("allowed_values"=>new ValueSetEnum('take_first,create,error'), "sql"=>"action_on_multiple", "default_value"=>"error", "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		MetaModel::Init_AddAttribute(new AttributeEnum("delete_policy", array("allowed_values"=>new ValueSetEnum('ignore,delete,update,update_then_delete'), "sql"=>"delete_policy", "default_value"=>"ignore", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("delete_policy_update", array("allowed_values"=>null, "sql"=>"delete_policy_update", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Format: seconds (unsigned int)
+		MetaModel::Init_AddAttribute(new AttributeDuration("delete_policy_retention", array("allowed_values"=>null, "sql"=>"delete_policy_retention", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeLinkedSet("attribute_list", array("linked_class"=>"SynchroAttribute", "ext_key_to_me"=>"sync_source_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array(), 'tracking_level' => LINKSET_TRACKING_DETAILS)));
+		// Not used yet !
+		MetaModel::Init_AddAttribute(new AttributeEnum("user_delete_policy", array("allowed_values"=>new ValueSetEnum('everybody,administrators,nobody'), "sql"=>"user_delete_policy", "default_value"=>"nobody", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeURL("url_icon", array("allowed_values"=>null, "sql"=>"url_icon", "default_value"=>null, "is_null_allowed"=>true, "target"=> '_top', "depends_on"=>array())));
+		// The field below is not a real URL since it can contain placeholders like $replica->primary_key$ which are not syntactically allowed in a real URL
+		MetaModel::Init_AddAttribute(new AttributeString("url_application", array("allowed_values"=>null, "sql"=>"url_application", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array(
+			'col:0'=> array(
+				'fieldset:SynchroDataSource:Description' => array('name','description','status','scope_class','user_id','notify_contact_id','url_icon','url_application', 'database_table_name')),
+			'col:1'=> array(
+				'fieldset:SynchroDataSource:Reconciliation' => array('reconciliation_policy','action_on_zero','action_on_one','action_on_multiple'),
+				'fieldset:SynchroDataSource:Deletion' => array('user_delete_policy','full_load_periodicity','delete_policy','delete_policy_update','delete_policy_retention'))
+			)
+		);		
+		MetaModel::Init_SetZListItems('list', array('scope_class', 'status', 'user_id', 'full_load_periodicity')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'scope_class', 'user_id')); // Criteria of the std search form
+		MetaModel::Init_SetZListItems('default_search', array('name', 'status', 'scope_class')); // Criteria of the defaut search form
+		//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		if (!$this->IsNew())
+		{
+			$this->Set('database_table_name', $this->GetDataTable());
+		}
+		return parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+	}
+		
+	public function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
+	{
+		if (!$this->IsNew())
+		{
+			$oPage->SetCurrentTab(Dict::S('Core:SynchroAttributes'));
+			$oAttributeSet = $this->Get('attribute_list');
+			$aAttributes = array();
+
+			while($oAttribute = $oAttributeSet->Fetch())
+			{
+				$aAttributes[$oAttribute->Get('attcode')] = $oAttribute;
+			}
+			// Columns of the form
+			$aAttribs = array();
+			foreach(array('attcode', 'reconciliation', 'update', 'update_policy', 'reconciliation_attcode') as $s )
+			{
+				$aAttribs[$s] = array( 'label' => Dict::S("Core:SynchroAtt:$s"), "description" => Dict::S("Core:SynchroAtt:$s+"));
+			}
+			// Rows of the form
+			$aValues = array();
+			foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode=>$oAttDef)
+			{
+				if ($oAttDef->IsWritable())
+				{
+					if (isset($aAttributes[$sAttCode]))
+					{
+						$oAttribute = $aAttributes[$sAttCode];
+					}
+					else
+					{
+						if ($oAttDef->IsExternalKey())
+						{
+							$oAttribute = new SynchroAttExtKey();
+							$oAttribute->Set('reconciliation_attcode', ''); // Blank means by pkey
+						}
+						elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
+						{
+							$oAttribute = new SynchroAttLinkSet();
+							// Todo - add these settings into the form
+							$oAttribute->Set('row_separator', MetaModel::GetConfig()->Get('link_set_item_separator'));
+							$oAttribute->Set('attribute_separator', MetaModel::GetConfig()->Get('link_set_attribute_separator'));
+							$oAttribute->Set('value_separator', MetaModel::GetConfig()->Get('link_set_value_separator'));
+							$oAttribute->Set('attribute_qualifier', MetaModel::GetConfig()->Get('link_set_attribute_qualifier'));
+						}
+						elseif ($oAttDef->IsScalar())
+						{
+							$oAttribute = new SynchroAttribute();
+						}
+						else
+						{
+							$oAttribute = null;
+						}
+
+						if (!is_null($oAttribute))
+						{
+							$oAttribute->Set('sync_source_id', $this->GetKey());
+							$oAttribute->Set('attcode', $sAttCode);
+							$oAttribute->Set('reconcile', MetaModel::IsReconcKey($this->GetTargetClass(), $sAttCode) ? 1 : 0);
+							$oAttribute->Set('update', 1);
+							$oAttribute->Set('update_policy', 'master_locked');
+						}
+					}
+					if (!is_null($oAttribute))
+					{
+						if (!$bEditMode)
+						{
+							// Read-only mode
+							$aRow['reconciliation'] = $oAttribute->Get('reconcile') == 1 ? Dict::S('Core:SynchroReconcile:Yes') :  Dict::S('Core:SynchroReconcile:No'); 
+							$aRow['update'] = $oAttribute->Get('update') == 1 ?  Dict::S('Core:SynchroUpdate:Yes') :  Dict::S('Core:SynchroUpdate:No');
+							$aRow['attcode'] = MetaModel::GetLabel($this->GetTargetClass(), $oAttribute->Get('attcode')).' ('.$oAttribute->Get('attcode').')';
+							$aRow['update_policy'] = $oAttribute->GetAsHTML('update_policy');
+							if ($oAttDef->IsExternalKey())
+							{
+								$sReconciliationAttCode = $oAttribute->Get('reconciliation_attcode');
+								switch($sReconciliationAttCode)
+								{
+									case '':
+									$sDisplayReconciliationAttCode = Dict::S('Core:SynchroAttExtKey:ReconciliationById');
+									break;
+									
+									default:
+									$sDisplayReconciliationAttCode = MetaModel::GetLabel($oAttDef->GetTargetClass(), $sReconciliationAttCode);
+								}
+								$aRow['reconciliation_attcode'] = $sDisplayReconciliationAttCode;
+							}
+							else
+							{
+								$aRow['reconciliation_attcode'] = '&nbsp;';
+							}
+						}
+						else
+						{
+							// Edit mode
+							$sAttCode = $oAttribute->Get('attcode');
+							$sChecked = $oAttribute->Get('reconcile') == 1 ? 'checked' : '';
+							$aRow['reconciliation'] = "<input type=\"checkbox\" name=\"reconciliation[$sAttCode]\" $sChecked/>"; 
+							$sChecked = $oAttribute->Get('update') == 1 ? 'checked' : '';
+							$aRow['update'] = "<input type=\"checkbox\" name=\"update[$sAttCode]\" $sChecked/>"; 
+							$aRow['attcode'] = MetaModel::GetLabel($this->GetTargetClass(), $oAttribute->Get('attcode')).' ('.$oAttribute->Get('attcode').')';
+							$oUpdateAttDef = MetaModel::GetAttributeDef(get_class($oAttribute), 'update_policy'); 
+							$aRow['update_policy'] = cmdbAbstractObject::GetFormElementForField($oPage, get_class($oAttribute), 'update_policy', $oUpdateAttDef, $oAttribute->Get('update_policy'), '', 'update_policy_'.$sAttCode, "[$sAttCode]");
+							if ($oAttDef->IsExternalKey())
+							{
+								$aRow['reconciliation_attcode'] = $oAttribute->GetReconciliationFormElement($oAttDef->GetTargetClass(), "attr_reconciliation_attcode[$sAttCode]");
+							}
+							else
+							{
+								$aRow['reconciliation_attcode'] = '&nbsp;';
+							}
+						}
+						$aValues[] = $aRow;
+					}
+				}
+			}
+			$oPage->p(Dict::Format('Class:SynchroDataSource:DataTable', $this->GetDataTable()));
+			$oPage->Table($aAttribs, $aValues);
+			$this->DisplayStatusTab($oPage);
+		}
+		parent::DisplayBareRelations($oPage, $bEditMode);
+	}
+	
+	/**
+	 * Displays the status (SynchroLog) of the datasource in a graphical manner
+	 * @param $oPage WebPage
+	 * @return void
+	 */
+	protected function DisplayStatusTab(WebPage $oPage)
+	{
+		$oPage->SetCurrentTab(Dict::S('Core:SynchroStatus'));
+		
+		$sSelectSynchroLog = 'SELECT SynchroLog WHERE sync_source_id = :source_id';
+		$oSetSynchroLog = new CMDBObjectSet(DBObjectSearch::FromOQL($sSelectSynchroLog), array('start_date' => false) /* order by*/, array('source_id' => $this->GetKey()));
+		$oSetSynchroLog->SetLimit(100); // Display only the 100 latest runs
+		
+		if ($oSetSynchroLog->Count() > 0)
+		{
+			$oLastLog = $oSetSynchroLog->Fetch();
+			$sStartDate = $oLastLog->GetAsHTML('start_date');
+			$oLastLog->Get('stats_nb_replica_seen');
+			$iLastLog = 0;
+			$iDSid = $this->GetKey();
+			if ($oLastLog->Get('status') == 'running')
+			{
+				// Still running !
+				$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroRunningStartedOn_Date', $sStartDate).'</h2>');
+			}
+			else
+			{
+				$sEndDate = $oLastLog->GetAsHTML('end_date');
+				$iLastLog = $oLastLog->GetKey();
+				$oPage->p('<h2>'.Dict::Format('Core:Synchro:SynchroEndedOn_Date', $sEndDate).'</h2>');
+				$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid";
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
+				$iCountAllReplicas = $oSet->Count();
+				$sAllReplicas = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllReplicas</a>";
+				$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid AND status_last_error !=''";
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
+				$iCountAllErrors = $oSet->Count();
+				$sAllErrors = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllErrors</a>";
+				$sOQL = "SELECT SynchroReplica WHERE sync_source_id=$iDSid AND status_last_warning !=''";
+				$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
+				$iCountAllWarnings = $oSet->Count();
+				$sAllWarnings = "<a href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\">$iCountAllWarnings</a>";
+				$oPage->p('<h2>'.Dict::Format('Core:Synchro:ListReplicas_AllReplicas_Errors_Warnings', $sAllReplicas, $sAllErrors, $sAllWarnings).'</h2>');
+			}
+
+			$oPage->add('<table class="synoptics"><tr><td style="color:#333;vertical-align:top">');
+
+			// List all the log entries for the user to select
+			$oPage->add('<h2 style="line-height:55px;">'.Dict::S('Core:Synchro:History').'</h2>');
+			$oSetSynchroLog->Rewind();
+			$oPage->add('<select size="25" onChange="UpdateSynoptics(this.value);">');
+			$sSelected = ' selected'; // First log is selected by default
+			$sScript = "var aSynchroLog = {\n";
+			while($oLog = $oSetSynchroLog->Fetch())
+			{
+				$sLogTitle = Dict::Format('Core:SynchroLogTitle', $oLog->Get('status'), $oLog->GetEditValue('start_date'));
+				$oPage->add('<option value="'.$oLog->GetKey().'" '.$sSelected.'>'.$sLogTitle.'</option>');
+				$sSelected = ''; // only the first log is selected by default
+				$aData = $this->ProcessLog($oLog);
+				$sScript .= '"'.$oLog->GetKey().'": '.json_encode($aData).",\n";
+			}
+			$sScript .= "end: 'Done'";
+			$sScript .= "};\n";
+			$sScript .= <<<EOF
+			var sLastLog = '$iLastLog';
+	function ToggleSynoptics(sId, bShow)
+	{
+		if (bShow)
+		{
+			$(sId).show();
+		}
+		else
+		{
+			$(sId).hide();
+		}
+	}
+	
+	function UpdateSynoptics(id)
+	{
+		var aValues = aSynchroLog[id];
+		if (aValues == undefined) return;
+		
+		for (var sKey in aValues)
+		{
+			$('#c_'+sKey).html(aValues[sKey]);
+			var fOpacity = (aValues[sKey] == 0) ? 0.3 : 1;
+			$('#'+sKey).fadeTo("slow", fOpacity);
+		}
+		//alert('id = '+id+', lastLog='+sLastLog+', id==sLastLog: '+(id==sLastLog)+' obj_updated_errors:  '+aValues['obj_updated_errors']);
+		if ( (id == sLastLog) && (aValues['obj_new_errors'] > 0) )
+		{
+			$('#new_errors_link').show();
+		}
+		else
+		{
+			$('#new_errors_link').hide();
+		}
+		
+		if ( (id == sLastLog) && (aValues['obj_updated_errors'] > 0) )
+		{
+			$('#updated_errors_link').show();
+		}
+		else
+		{
+			$('#updated_errors_link').hide();
+		}
+		
+		if ( (id == sLastLog) && (aValues['obj_disappeared_errors'] > 0) )
+		{
+			$('#disappeared_errors_link').show();
+		}
+		else
+		{
+			$('#disappeared_errors_link').hide();
+		}
+		
+		ToggleSynoptics('#cw_obj_created_warnings', aValues['obj_created_warnings'] > 0);
+		ToggleSynoptics('#cw_obj_new_updated_warnings', aValues['obj_new_updated_warnings'] > 0);
+		ToggleSynoptics('#cw_obj_new_unchanged_warnings', aValues['obj_new_unchanged_warnings'] > 0);
+		ToggleSynoptics('#cw_obj_updated_warnings', aValues['obj_updated_warnings'] > 0);
+		ToggleSynoptics('#cw_obj_unchanged_warnings', aValues['obj_unchanged_warnings'] > 0);
+		$('#status_traces').html(aValues['traces']);
+	}
+EOF
+;
+			$oPage->add_script($sScript);
+			$oPage->add('</select>');
+			
+			$oPage->add('</td><td style="vertical-align:top;">');
+			
+			// Now build the big "synoptics" view
+			$aData = $this->ProcessLog($oLastLog);
+
+			$sNbReplica = $this->GetIcon()."&nbsp;".Dict::Format('Core:Synchro:Nb_Replica', "<span id=\"c_nb_replica_total\">{$aData['nb_replica_total']}</span>");
+			$sNbObjects = MetaModel::GetClassIcon($this->GetTargetClass())."&nbsp;".Dict::Format('Core:Synchro:Nb_Class:Objects', $this->GetTargetClass(), "<span id=\"c_nb_obj_total\">{$aData['nb_obj_total']}</span>");
+			$oPage->add(
+<<<EOF
+	<table class="synoptics">
+	<tr class="synoptics_header">
+	<td>$sNbReplica</td><td>&nbsp;</td><td>$sNbObjects</td>
+	</tr>
+	<tr>
+EOF
+);
+			$sBaseOQL = "SELECT SynchroReplica WHERE sync_source_id=".$this->GetKey()." AND status_last_error!=''";
+			$oPage->add($this->HtmlBox('repl_ignored', $aData, '#999').'<td colspan="2">&nbsp;</td>');
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('repl_disappeared', $aData, '#630', 'rowspan="4"').'<td rowspan="4" class="arrow">=&gt;</td>'.$this->HtmlBox('obj_disappeared_no_action', $aData, '#333'));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('obj_deleted', $aData, '#000'));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('obj_obsoleted', $aData, '#630'));
+			$oPage->add("</tr>\n<tr>");
+			$sOQL = urlencode($sBaseOQL." AND status='obsolete'");
+			$oPage->add($this->HtmlBox('obj_disappeared_errors', $aData, '#C00', '', " <a style=\"color:#fff\" href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\" id=\"disappeared_errors_link\">Show</a>"));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('repl_existing', $aData, '#093', 'rowspan="3"').'<td rowspan="3" class="arrow">=&gt;</td>'.$this->HtmlBox('obj_unchanged', $aData, '#393'));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('obj_updated', $aData, '#3C3'));
+			$oPage->add("</tr>\n<tr>");
+			$sOQL = urlencode($sBaseOQL." AND status='modified'");
+			$oPage->add($this->HtmlBox('obj_updated_errors', $aData, '#C00', '', " <a style=\"color:#fff\" href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\" id=\"updated_errors_link\">Show</a>"));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('repl_new', $aData, '#339', 'rowspan="4"').'<td rowspan="4" class="arrow">=&gt;</td>'.$this->HtmlBox('obj_new_unchanged', $aData, '#393'));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('obj_new_updated', $aData, '#3C3'));
+			$oPage->add("</tr>\n<tr>");
+			$oPage->add($this->HtmlBox('obj_created', $aData, '#339'));
+			$oPage->add("</tr>\n<tr>");
+			$sOQL = urlencode($sBaseOQL." AND status='new'");
+			$oPage->add($this->HtmlBox('obj_new_errors', $aData, '#C00', '', " <a style=\"color:#fff\" href=\"../synchro/replica.php?operation=oql&datasource=$iDSid&oql=$sOQL\" id=\"new_errors_link\">Show</a>"));
+			$oPage->add("</tr>\n</table>\n");
+			$oPage->add('</td></tr></table>');
+			$oPage->add('<div id="status_traces" style="overflow-x:auto"></div>');
+			$oPage->add_ready_script("UpdateSynoptics('$iLastLog')");
+		}
+		else
+		{
+			$oPage->p('<h2>'.Dict::S('Core:Synchro:NeverRun').'</h2>');
+		}
+	}
+	
+	protected function HtmlBox($sId, $aData, $sColor, $sHTMLAttribs = '', $sErrorLink = '')
+	{
+		$iCount = $aData[$sId];
+		$sCount = "<span id=\"c_{$sId}\">$iCount</span>";
+		$sLabel = Dict::Format('Core:Synchro:label_'.$sId, $sCount);
+		$sOpacity = ($iCount==0) ? "opacity:0.3;" : "";
+		if (isset($aData[$sId.'_warnings']))
+		{
+			$sLabel .= " <span id=\"cw_{$sId}_warnings\"><img src=\"../images/error.png\" style=\"vertical-align:middle\"/>  (<span id=\"c_{$sId}_warnings\">".$aData[$sId.'_warnings']."</span>)</span>";
+		}
+
+		return "<td id=\"$sId\" style=\"background-color:$sColor;$sOpacity;\" {$sHTMLAttribs}>{$sLabel}{$sErrorLink}</td>";
+	}
+	
+	protected function ProcessLog($oLastLog)
+	{
+		$aData = array(
+			'obj_deleted' => $oLastLog->Get('stats_nb_obj_deleted'),
+			'obj_obsoleted' => $oLastLog->Get('stats_nb_obj_obsoleted'),
+			'obj_disappeared_errors' => $oLastLog->Get('stats_nb_obj_obsoleted_errors') + $oLastLog->Get('stats_nb_obj_deleted_errors'),
+			'obj_disappeared_no_action' => $oLastLog->Get('stats_nb_replica_disappeared_no_action'),
+			'obj_updated' => $oLastLog->Get('stats_nb_obj_updated'),
+			'obj_updated_warnings' => $oLastLog->Get('stats_nb_obj_updated_warnings'),
+			'obj_updated_errors' => $oLastLog->Get('stats_nb_obj_updated_errors'),
+			'obj_new_updated' => $oLastLog->Get('stats_nb_obj_new_updated'),
+			'obj_new_updated_warnings' => $oLastLog->Get('stats_nb_obj_new_updated_warnings'),
+			'obj_new_unchanged' => $oLastLog->Get('stats_nb_obj_new_unchanged'),
+			'obj_created' => $oLastLog->Get('stats_nb_obj_created'),
+			'obj_created_warnings' => $oLastLog->Get('stats_nb_obj_created_warnings'),
+			'obj_created_errors' => $oLastLog->Get('stats_nb_obj_created_errors'),
+			'obj_unchanged_warnings' => $oLastLog->Get('stats_nb_obj_unchanged_warnings'),
+		);
+		$oLastLog->Get('stats_nb_replica_reconciled_errors');
+		$iDisappeared = $aData['obj_disappeared_errors'] + $aData['obj_obsoleted'] + $aData['obj_deleted'] + $aData['obj_disappeared_no_action'];
+		$aData['repl_disappeared'] = $iDisappeared;
+		$iNewErrors = $aData['obj_created_errors'] + $oLastLog->Get('stats_nb_replica_reconciled_errors');
+		$aData['obj_new_errors'] = $iNewErrors;
+		$iNew = $aData['obj_created'] + $iNewErrors + $aData['obj_new_updated'] + $aData['obj_new_unchanged'];
+		$aData['repl_new'] = $iNew;
+		$iExisting = $oLastLog->Get('stats_nb_replica_seen') - $iNew;
+		$aData['repl_existing'] = $iExisting;
+		$aData['obj_unchanged'] = $iExisting - $aData['obj_updated'] - $aData['obj_updated_errors'];
+		$iIgnored = $oLastLog->Get('stats_nb_replica_total') - $iNew - $iExisting - $iDisappeared;
+		$aData['repl_ignored'] = $iIgnored;
+		$aData['nb_obj_total'] = $iNew + $iExisting + $iDisappeared;
+		$aData['nb_replica_total'] = $aData['nb_obj_total'] + $iIgnored;
+		if(strlen($oLastLog->Get('traces')) > 0)
+		{
+			$aData['traces'] = '<fieldset><legend>Debug traces</legend><pre>'.htmlentities($oLastLog->Get('traces'), ENT_QUOTES, 'UTF-8').'</pre></fieldset>';
+		}
+		else
+		{
+			$aData['traces'] = '';
+		}
+		return $aData;
+	}
+	
+	public function GetIcon($bImgTag = true, $sMoreStyles = '')
+	{
+		if ($this->Get('url_icon') == '') return MetaModel::GetClassIcon(get_class($this), $bImgTag);
+		if ($bImgTag)
+		{
+			return 	"<img src=\"".$this->Get('url_icon')."\" style=\"vertical-align:middle;$sMoreStyles\"/>";
+			
+		}
+		return $this->Get('url_icon');
+	}
+
+	/**
+	 * Get the actual hyperlink to the remote application for the given replica and dest object
+	 *
+	 * @param \DBObject $oDestObj
+	 * @param \SynchroReplica $oReplica
+	 *
+	 * @return string
+	 */
+	public function GetApplicationUrl(DBObject $oDestObj, SynchroReplica $oReplica)
+	{
+		if ($this->Get('url_application') == '') return '';
+		$aSearches = array();
+		$aReplacements = array();
+		foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode=>$oAttDef)
+		{
+			if ($oAttDef->IsScalar())
+			{
+				$aSearches[] = '$this->'.$sAttCode.'$';
+				$aReplacements[] = $oDestObj->Get($sAttCode);
+			}
+		}
+		$aData = $oReplica->LoadExtendedDataFromTable($this->GetDataTable());
+
+		foreach($aData as $sColumn => $value)
+		{
+			$aSearches[] = '$replica->'.$sColumn.'$';
+			$aReplacements[] = $value;
+		}
+		return str_replace($aSearches, $aReplacements, $this->Get('url_application'));
+	}
+	
+	public function GetAttributeFlags($sAttCode, &$aReasons = array(), $sTargetState = '')
+	{
+		if ( (($sAttCode == 'scope_class') || ($sAttCode == 'database_table_name')) && (!$this->IsNew()))
+		{
+			return OPT_ATT_READONLY;
+		}
+		return parent::GetAttributeFlags($sAttCode, $aReasons, $sTargetState);
+	}
+		
+	public function UpdateObjectFromPostedForm($sFormPrefix = '', $sAttList = null, $aAttFlags = array())
+	{
+		parent::UpdateObjectFromPostedForm($sFormPrefix, $sAttList, $aAttFlags);
+		// And now read the other post parameters...
+		$oAttributeSet = $this->Get('attribute_list');
+		$aAttributes = array();
+		while($oAttribute = $oAttributeSet->Fetch())
+		{
+			$aAttributes[$oAttribute->Get('attcode')] = $oAttribute;
+		}
+		$aReconcile = utils::ReadPostedParam('reconciliation', array());
+		$aUpdate = utils::ReadPostedParam('update', array());
+		$aUpdatePolicy = utils::ReadPostedParam('attr_update_policy', array());
+		$aReconciliation = utils::ReadPostedParam('attr_reconciliation_attcode', array());
+		// update_policy cannot be empty, so there is one entry per attribute, use this to iterate
+		// through all the writable attributes
+		foreach($aUpdatePolicy as $sAttCode => $sValue)
+		{
+			if(!isset($aAttributes[$sAttCode]))
+			{
+				$oAttribute = $this->CreateSynchroAtt($sAttCode);
+			}
+			else
+			{
+				$oAttribute = $aAttributes[$sAttCode];
+			}
+			$bReconcile = 0;
+			if (isset($aReconcile[$sAttCode]))
+			{
+				$bReconcile = $aReconcile[$sAttCode] == 'on' ? 1 : 0;
+			}
+			$bUpdate =  0 ; // Default / initial value
+			if (isset($aUpdate[$sAttCode]))
+			{
+				$bUpdate = $aUpdate[$sAttCode] == 'on' ? 1 : 0;
+			}
+			$oAttribute->Set('reconcile', $bReconcile);
+			$oAttribute->Set('update', $bUpdate);
+			$oAttribute->Set('update_policy', $sValue);
+			if ($oAttribute instanceof SynchroAttExtKey)
+			{
+				$oAttribute->Set('reconciliation_attcode', $aReconciliation[$sAttCode]);
+			}
+			elseif ($oAttribute instanceof SynchroAttLinkSet)
+			{
+			}
+			$oAttributeSet->AddItem($oAttribute);
+		}
+		$this->Set('attribute_list', $oAttributeSet);
+	}
+
+	/**
+	 * Creates a new SynchroAttXXX object in memory with the default values
+	 *
+	 * @param string $sAttCode
+	 *
+	 * @return \SynchroAttExtKey|\SynchroAttLinkSet|\SynchroAttribute
+	 */
+	protected function CreateSynchroAtt($sAttCode)
+	{
+		$oAttDef = MetaModel::GetAttributeDef($this->GetTargetClass(), $sAttCode);
+		if ($oAttDef->IsExternalKey())
+		{
+			$oAttribute = new SynchroAttExtKey();
+			$oAttribute->Set('reconciliation_attcode', ''); // Blank means by pkey
+		}
+		elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
+		{
+			$oAttribute = new SynchroAttLinkSet();
+			// Todo - set those value from the form
+			$oAttribute->Set('row_separator', MetaModel::GetConfig()->Get('link_set_item_separator'));
+			$oAttribute->Set('attribute_separator', MetaModel::GetConfig()->Get('link_set_attribute_separator'));
+			$oAttribute->Set('value_separator', MetaModel::GetConfig()->Get('link_set_value_separator'));
+			$oAttribute->Set('attribute_qualifier', MetaModel::GetConfig()->Get('link_set_attribute_qualifier'));
+		}
+		else
+		{
+			$oAttribute = new SynchroAttribute();
+		}
+		$oAttribute->Set('sync_source_id', $this->GetKey());
+		$oAttribute->Set('attcode', $sAttCode);
+		$oAttribute->Set('reconcile', 0);
+		$oAttribute->Set('update', 0);
+		$oAttribute->Set('update_policy', 'master_locked');
+		return $oAttribute;
+	}
+	/**
+	 * Overload the standard behavior
+	 */	
+	public function ComputeValues()
+	{
+		parent::ComputeValues();
+
+		if ($this->IsNew())
+		{
+			// Compute the database_table_name
+			$sDataTable = $this->Get('database_table_name');
+			if (!empty($sDataTable))
+			{
+				$this->Set('database_table_name', $this->ComputeDataTableName());
+			}
+			
+			// When inserting a new datasource object, also create the SynchroAttribute objects
+			// for each field of the target class
+			// Create all the SynchroAttribute records
+			$oAttributeSet = $this->Get('attribute_list');
+			if ($oAttributeSet->Count() == 0)
+			{
+				foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode=>$oAttDef)
+				{
+					if ($oAttDef->IsWritable())
+					{
+						$oAttDef = MetaModel::GetAttributeDef($this->GetTargetClass(), $sAttCode);
+						if ($oAttDef->IsExternalKey())
+						{
+							$oAttribute = new SynchroAttExtKey();
+							$oAttribute->Set('reconciliation_attcode', ''); // Blank means by pkey
+						}
+						elseif ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
+						{
+							$oAttribute = new SynchroAttLinkSet();
+							// Todo - set those value from the form
+							$oAttribute->Set('row_separator', MetaModel::GetConfig()->Get('link_set_item_separator'));
+							$oAttribute->Set('attribute_separator', MetaModel::GetConfig()->Get('link_set_attribute_separator'));
+							$oAttribute->Set('value_separator', MetaModel::GetConfig()->Get('link_set_value_separator'));
+							$oAttribute->Set('attribute_qualifier', MetaModel::GetConfig()->Get('link_set_attribute_qualifier'));
+						}
+						elseif ($oAttDef->IsScalar())
+						{
+							$oAttribute = new SynchroAttribute();
+						}
+						else
+						{
+							$oAttribute = null;
+						}
+
+						if (!is_null($oAttribute))
+						{
+							$oAttribute->Set('attcode', $sAttCode);
+							$oAttribute->Set('reconcile', MetaModel::IsReconcKey($this->GetTargetClass(), $sAttCode) ? 1 : 0);
+							$oAttribute->Set('update', 1);
+							$oAttribute->Set('update_policy', 'master_locked');
+							$oAttributeSet->AddItem($oAttribute);
+						}
+					}
+				}
+				$this->Set('attribute_list', $oAttributeSet);
+			}
+		}
+		else
+		{
+			$sDataTable = $this->Get('database_table_name');
+			if (empty($sDataTable))
+			{
+				$this->Set('database_table_name', $this->ComputeDataTableName());
+			}
+		}
+	}
+	public function DoCheckToWrite()
+	{
+		parent::DoCheckToWrite();
+
+		// Check that there is at least one reconciliation key defined
+		if ($this->Get('reconciliation_policy') == 'use_attributes')
+		{
+			$oSet = $this->Get('attribute_list');
+			$bReconciliationKey = false;
+			foreach($oSet as $oSynchroAttribute)
+			{
+				if ($oSynchroAttribute->Get('reconcile') == 1)
+				{
+					$bReconciliationKey = true; // At least one key is defined
+					break;
+				}
+			}
+			if (!$bReconciliationKey)
+			{
+				$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:AtLeastOneReconciliationKeyMustBeSpecified');			
+			}
+		}
+		
+		// If 'update_then_delete' is specified there must be a delete_retention_period
+		if (($this->Get('delete_policy') == 'update_then_delete') && ($this->Get('delete_policy_retention') == 0))
+		{
+			$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:DeleteRetentionDurationMustBeSpecified');			
+		}
+
+		// If update is specified, then something to update must be defined
+		if ((($this->Get('delete_policy') == 'update_then_delete') ||  ($this->Get('delete_policy') == 'update'))
+		    && ($this->Get('delete_policy_update') == ''))
+		{
+			$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified');			
+		}
+		
+		// When creating the data source with a specified database_table_name, this table must NOT exist
+		if ($this->IsNew())
+		{
+			$sDataTable = $this->GetDataTable();
+			if (!empty($sDataTable) && CMDBSource::IsTable($this->GetDataTable()))
+			{
+				// Hmm, the synchro_data_xxx table already exists !!
+				$this->m_aCheckIssues[] = Dict::Format('Class:SynchroDataSource/Error:DataTableAlreadyExists', $this->GetDataTable());			
+			}
+		}
+	}
+	
+	public function GetTargetClass()
+	{
+		return $this->Get('scope_class');
+	}
+
+	public function GetDataTable()
+	{
+		$sTable = $this->Get('database_table_name');
+		if (empty($sTable))
+		{
+			$sTable = $this->ComputeDataTableName();
+		}
+		return $sTable;
+	}
+	
+	protected function ComputeDataTableName()
+	{
+		$sDBTableName = $this->Get('database_table_name');
+		if (empty($sDBTableName))
+		{
+			$sDBTableName = strtolower($this->GetTargetClass());
+			$sDBTableName = preg_replace('/[^A-za-z0-9_]/', '_', $sDBTableName); // Remove forbidden characters from the table name
+			$sDBTableName .= '_'.$this->GetKey(); // Add a suffix for unicity
+		}
+		else
+		{
+			$sDBTableName = preg_replace('/[^A-za-z0-9_]/', '_', $sDBTableName); // Remove forbidden characters from the table name
+		}
+		$sPrefix = MetaModel::GetConfig()->Get('db_subname')."synchro_data_";
+		if (strpos($sDBTableName, $sPrefix) !== 0)
+		{
+			$sDBTableName = $sPrefix.$sDBTableName;
+		}
+		return $sDBTableName;		
+	}
+
+	/**
+	 * When the new datasource has been created, let's create the synchro_data table
+	 * that will hold the data records and the correspoding triggers which will maintain
+	 * both tables in sync
+	 */
+	protected function AfterInsert()
+	{
+		parent::AfterInsert();
+
+		$sTable = $this->GetDataTable();
+
+		$aColumns = $this->GetSQLColumns();
+		
+		$aFieldDefs = array();
+		// Allow '0', otherwise mysql will render an error when the id is not given
+		// (the trigger is expected to set the value, but it is not executed soon enough)
+		$aFieldDefs[] = "id INTEGER(11) NOT NULL DEFAULT 0 ";
+		$aFieldDefs[] = "`primary_key` VARCHAR(255) NULL DEFAULT NULL";
+		foreach($aColumns as $sColumn => $ColSpec)
+		{
+			$aFieldDefs[] = "`$sColumn` $ColSpec NULL DEFAULT NULL";
+		}
+		$aFieldDefs[] = "INDEX (id)";
+		$aFieldDefs[] = "INDEX (primary_key)";
+		$sFieldDefs = implode(', ', $aFieldDefs);
+
+		$sDbCharset = DEFAULT_CHARACTER_SET;
+		$sDbCollation = DEFAULT_COLLATION;
+		$sCreateTable = "CREATE TABLE `$sTable` ($sFieldDefs) ENGINE = ".MYSQL_ENGINE." CHARACTER SET ".$sDbCharset." COLLATE ".$sDbCollation.";";
+		CMDBSource::Query($sCreateTable);
+
+		$aTriggers = $this->GetTriggersDefinition();
+		foreach($aTriggers as $key => $sTriggerSQL)
+		{
+			CMDBSource::Query($sTriggerSQL);
+		}
+		
+		$sDataTable = $this->Get('database_table_name');
+		if (empty($sDataTable))
+		{
+			$this->Set('database_table_name', $this->ComputeDataTableName());
+			$this->DBUpdate();
+		}
+		
+	}
+
+	/**
+	 * Gets the definitions of the 3 triggers: before insert, before update and after delete
+	 * @return array An array with 3 entries, one for each of the SQL queries
+	 */
+	protected function GetTriggersDefinition()
+	{
+		$sTable = $this->GetDataTable();
+		$sReplicaTable = MetaModel::DBGetTable('SynchroReplica');
+		$aColumns = $this->GetSQLColumns();
+		$aResult = array();
+
+		$sTriggerInsert = "CREATE TRIGGER `{$sTable}_bi` BEFORE INSERT ON `$sTable`";
+		$sTriggerInsert .= "   FOR EACH ROW";
+		$sTriggerInsert .= "   BEGIN";
+		$sTriggerInsert .= "      INSERT INTO `{$sReplicaTable}` (`sync_source_id`, `status_last_seen`, `status`) VALUES ({$this->GetKey()}, NOW(), 'new');";
+		$sTriggerInsert .= "      SET NEW.id = LAST_INSERT_ID();";
+		$sTriggerInsert .= "   END;";
+		$aResult['bi'] = $sTriggerInsert;
+
+		$aModified = array();
+		foreach($aColumns as $sColumn => $ColSpec)
+		{
+			// <=> is a null-safe 'EQUALS' operator (there is no equivalent for "DIFFERS FROM")
+			$aModified[] = "NOT(NEW.`$sColumn` <=> OLD.`$sColumn`)";
+		}
+		$sIsModified = '('.implode(') OR (', $aModified).')';
+
+		// Update the replica
+		//
+		// status is forced to "new" if the replica was obsoleted directly from the state "new" (dest_id = null)
+		// otherwise, if status was either 'obsolete' or 'synchronized' it is turned into 'modified' or 'synchronized' depending on the changes
+		// otherwise, the status is left as is
+		$sTriggerUpdate = "CREATE TRIGGER `{$sTable}_bu` BEFORE UPDATE ON `$sTable`";
+		$sTriggerUpdate .= "   FOR EACH ROW";
+		$sTriggerUpdate .= "   BEGIN";
+		$sTriggerUpdate .= "      IF @itopuser is null THEN";
+		$sTriggerUpdate .= "         UPDATE `{$sReplicaTable}` SET status_last_seen = NOW(), `status` = IF(`status` = 'obsolete', IF(`dest_id` IS NULL, 'new', 'modified'), IF(`status` IN ('synchronized') AND ($sIsModified), 'modified', `status`)) WHERE sync_source_id = {$this->GetKey()} AND id = OLD.id;";
+		$sTriggerUpdate .= "         SET NEW.id = OLD.id;"; // make sure this id won't change
+		$sTriggerUpdate .= "      END IF;";
+		$sTriggerUpdate .= "   END;";
+		$aResult['bu'] = $sTriggerUpdate;
+
+		$sTriggerDelete = "CREATE TRIGGER `{$sTable}_ad` AFTER DELETE ON `$sTable`";
+		$sTriggerDelete .= "   FOR EACH ROW";
+		$sTriggerDelete .= "   BEGIN";
+		$sTriggerDelete .= "      DELETE FROM `{$sReplicaTable}` WHERE id = OLD.id;";
+		$sTriggerDelete .= "   END;";
+		$aResult['ad'] = $sTriggerDelete;
+		return $aResult;
+	}
+	
+	protected function AfterDelete()
+	{
+		parent::AfterDelete();
+
+		$sTable = $this->GetDataTable();
+
+		$sDropTable = "DROP TABLE IF EXISTS `$sTable`"; // Do not fail if the table is already deleted (corrupted database)
+		CMDBSource::Query($sDropTable);
+		// TO DO - check that triggers get dropped with the table
+	}
+
+	/**
+	 * Checks if the data source definition is consistent with the schema of the target class
+	 *
+	 * @param boolean $bDiagnostics boolean True to only diagnose the consistency, false to actually apply some changes
+	 * @param boolean $bVerbose boolean True to get some information in the std output (echo)
+	 * @param null $oChange //FIXME never used, should we drop this ?
+	 *
+	 * @return bool Whether or not the database needs fixing for this data source
+	 */
+	public function CheckDBConsistency($bDiagnostics, $bVerbose, $oChange = null)
+	{
+		$bFixNeeded = false;
+		$bTriggerRebuildNeeded = false;
+		$aMissingFields = array();
+		$oAttributeSet = $this->Get('attribute_list');
+		$aAttributes = array();
+
+		while($oAttribute = $oAttributeSet->Fetch())
+		{
+			$sAttCode = $oAttribute->Get('attcode');
+			if (MetaModel::IsValidAttCode($this->GetTargetClass(), $sAttCode))
+			{ 
+				$aAttributes[$sAttCode] = $oAttribute;
+			}
+			else
+			{
+				// Old field remaining
+				$bTriggerRebuildNeeded = true;
+				if ($bVerbose)
+				{
+					echo "Irrelevant field description for the field '$sAttCode', for the data synchro task ".$this->GetName()." (".$this->GetKey()."), will be removed.\n";
+				}
+				$bFixNeeded = true;
+				if (!$bDiagnostics)
+				{
+					// Fix the issue
+					$oAttribute->DBDelete();
+				}
+			}
+		}
+
+		$sTable = $this->GetDataTable();
+		foreach($this->ListTargetAttributes() as $sAttCode=>$oAttDef)
+		{
+			if (!isset($aAttributes[$sAttCode]))
+			{
+				$bFixNeeded = true;
+				$aMissingFields[] = $sAttCode;
+				$bTriggerRebuildNeeded = true;
+				// New field missing...
+				if ($bVerbose)
+				{
+					echo "Missing field description for the field '$sAttCode', for the data synchro task ".$this->GetName()." (".$this->GetKey()."), will be created with default values.\n";
+				}
+				if (!$bDiagnostics)
+				{
+					// Fix the issue
+					$oAttribute = $this->CreateSynchroAtt($sAttCode);
+					$oAttribute->DBInsert();
+				}
+			}
+			else
+			{
+				$aColumns = $this->GetSQLColumns(array($sAttCode));
+				foreach($aColumns as $sColName => $sColumnDef)
+				{
+					$bOneColIsMissing = false;
+					if (!CMDBSource::IsField($sTable, $sColName))
+					{
+						$bFixNeeded = true;
+						$bOneColIsMissing = true;
+						if ($bVerbose)
+						{
+							if (count($aColumns) > 1)
+							{
+								echo "Missing column '$sColName', in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The columns '".implode("', '", $aColumns )." will be re-created.'.\n";
+							}
+							else
+							{
+								echo "Missing column '$sColName', in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The column '$sColName' will be added.\n";
+							}
+						}
+					}
+					else if (strcasecmp(CMDBSource::GetFieldType($sTable, $sColName), $sColumnDef) != 0)
+					{
+						$bFixNeeded = true;
+						$bOneColIsMissing = true;
+						if (count($aColumns) > 1)
+						{
+							echo "Incorrect column '$sColName' (".CMDBSource::GetFieldType($sTable, $sColName)." instead of ".$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The columns '".implode("', '", $aColumns )." will be re-created.'.\n";
+						}
+						else
+						{
+							echo "Incorrect column '$sColName' (".CMDBSource::GetFieldType($sTable, $sColName)." instead of ".$sColumnDef."), in the table '$sTable' for the data synchro task ".$this->GetName()." (".$this->GetKey()."). The column '$sColName' will be added.\n";
+						}
+					}
+					if ($bOneColIsMissing)
+					{
+						$bTriggerRebuildNeeded = true;
+						$aMissingFields[] = $sAttCode;
+					}
+				}
+			}
+		}
+
+		$sDBName = MetaModel::GetConfig()->Get('db_name');
+		try
+		{
+			// Note: as per the MySQL documentation, using information_schema behaves exactly like SHOW TRIGGERS (user privileges)
+			//       and this is in fact the recommended way for better portability
+			$iTriggerCount = CMDBSource::QueryToScalar("select count(*) from information_schema.triggers where EVENT_OBJECT_SCHEMA='$sDBName' and EVENT_OBJECT_TABLE='$sTable'");
+		}
+		catch (Exception $e)
+		{
+			if ($bVerbose)
+			{
+				echo "Failed to investigate on the synchro triggers (skipping the check): ".$e->getMessage().".\n";
+			}
+			// Ignore this error: consider that the trigger are there
+			$iTriggerCount = 3;
+		}
+		if ($iTriggerCount < 3)
+		{
+			$bFixNeeded = true;
+			$bTriggerRebuildNeeded = true;
+			if ($bVerbose)
+			{
+				echo "Missing trigger(s) for the data synchro task ".$this->GetName()." (table {$sTable}).\n";
+			}
+		}
+
+		$aRepairQueries = array();
+
+		if (count($aMissingFields) > 0)
+		{
+			// The structure of the table needs adjusting
+			$aColumns = $this->GetSQLColumns($aMissingFields);
+			$aFieldDefs = array();
+			foreach($aColumns as $sAttCode => $sColumnDef)
+			{
+				if (CMDBSource::IsField($sTable, $sAttCode))
+				{
+					$aRepairQueries[] = "ALTER TABLE `$sTable` CHANGE `$sAttCode` `$sAttCode` $sColumnDef";
+				}
+				else
+				{
+					$aFieldDefs[] = "`$sAttCode` $sColumnDef";
+				}
+
+			}
+			if (count($aFieldDefs) > 0)
+			{
+				$aRepairQueries[] = "ALTER TABLE `$sTable` ADD (".implode(',', $aFieldDefs).");";
+			}
+
+			if ($bDiagnostics)
+			{
+				if ($bVerbose)
+				{
+					echo "The structure of the table $sTable for the data synchro task ".$this->GetName()." (".$this->GetKey().") must be altered (missing or incorrect fields: ".implode(',', $aMissingFields).").\n";
+				}
+			}
+		}
+
+		// Repair the triggers
+		// Must be done after updating the columns because MySQL does check the validity of the query found into the procedure!
+		if ($bTriggerRebuildNeeded)
+		{
+			// The triggers as well must be adjusted
+			$aTriggersDefs = $this->GetTriggersDefinition();
+			$aTriggerRepair = array();
+			$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_bi`;";
+			$aTriggerRepair[] = $aTriggersDefs['bi'];
+			$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_bu`;";
+			$aTriggerRepair[] = $aTriggersDefs['bu'];
+			$aTriggerRepair[] = "DROP TRIGGER IF EXISTS `{$sTable}_ad`;";
+			$aTriggerRepair[] = $aTriggersDefs['ad'];
+			
+			if ($bDiagnostics)
+			{
+				if ($bVerbose)
+				{
+					echo "The triggers {$sTable}_bi, {$sTable}_bu, {$sTable}_ad for the data synchro task ".$this->GetName()." (".$this->GetKey().") must be re-created.\n";
+					echo implode("\n", $aTriggerRepair)."\n";
+				}
+			}
+			$aRepairQueries = array_merge($aRepairQueries, $aTriggerRepair); // The order matters!
+		}
+
+		// Execute the repair statements
+		//
+		if (!$bDiagnostics && (count($aRepairQueries) > 0))
+		{
+			// Fix the issue
+			foreach($aRepairQueries as $sSQL)
+			{
+				CMDBSource::Query($sSQL);
+				if ($bVerbose)
+				{
+					echo "$sSQL\n";
+				}
+			}
+		}
+		return $bFixNeeded;
+	}
+
+	public function SendNotification($sSubject, $sBody)
+	{
+		$iContact = $this->Get('notify_contact_id');
+		if ($iContact == 0)
+		{
+			// Leave silently...
+			return;
+		}
+		$oContact = MetaModel::GetObject('Contact', $iContact);
+
+		// Determine the email attribute (the first one will be our choice)
+		$sEmailAttCode = null;
+		foreach (MetaModel::ListAttributeDefs(get_class($oContact)) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeEmailAddress)
+			{
+				$sEmailAttCode = $sAttCode;
+				// we've got one, exit the loop
+				break;
+			}
+		}
+		if (is_null($sEmailAttCode))
+		{
+			// Leave silently...
+			return;
+		}
+
+		$sTo = $oContact->Get($sEmailAttCode);
+		$sBody = '<p>Data synchronization: '.$this->GetHyperlink().'</p>'.$sBody;
+
+		$sSubject = 'iTop Data Sync - '.$this->GetName().' - '.$sSubject;
+
+		$oEmail = new Email();
+		$oEmail->SetRecipientTO($sTo);
+		$oEmail->SetSubject($sSubject);
+		$oEmail->SetBody($sBody);
+		if ($oEmail->Send($aIssues) == EMAIL_SEND_ERROR)
+		{
+			// mmmm, what can I do?
+		}
+	}
+
+	/**
+	 * Get the list of attributes eligible to the synchronization	 
+	 */
+	public function ListTargetAttributes()
+	{
+		$aRet = array();
+		foreach(MetaModel::ListAttributeDefs($this->GetTargetClass()) as $sAttCode => $oAttDef)
+		{
+			if ($sAttCode == 'finalclass') continue;
+			if (!$oAttDef->IsWritable()) continue;
+			if ($oAttDef->IsLinkSet() && !$oAttDef->IsIndirect()) continue;
+
+			$aRet[$sAttCode] = $oAttDef;
+		}
+		return $aRet;
+	}
+
+
+	/**
+	 * @param null|string[] $aAttributeCodes attribute codes list
+	 *
+	 * @return string[] corresponding current class SQL columns, all of the table columns if null was provided
+	 */
+	public function GetSQLColumns($aAttributeCodes = null)
+	{
+		$aColumns = array();
+		$sClass = $this->GetTargetClass();
+
+		if (is_null($aAttributeCodes))
+		{
+			$aAttributeCodes = array();
+			foreach($this->ListTargetAttributes() as $sAttCode => $oAttDef)
+			{
+				$aAttributeCodes[] = $sAttCode;
+			}
+		}
+
+		foreach($aAttributeCodes as $sAttCode)
+		{
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			
+			if ($oAttDef->IsExternalKey())
+			{
+				// The pkey might be used as well as any other key column
+				$aColumns[$sAttCode] = 'VARCHAR(255)';
+			}
+			else
+			{
+				foreach($oAttDef->GetImportColumns() as $sField => $sDBFieldType)
+				{
+					$aColumns[$sField] = $sDBFieldType;
+				}
+			}
+		}
+		return $aColumns;
+	}
+	
+	/**
+	 * DEPRECATED - Get the list of Date and Datetime SQL columns
+	 */
+	public function GetDateSQLColumns()
+	{
+		$aDateAttributes = array();
+		
+		$sClass = $this->GetTargetClass();
+		foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef instanceof AttributeDateTime)
+			{
+				$aDateAttributes[] = $sAttCode;
+			}
+		}
+		return $this->GetSQLColumns($aDateAttributes);
+	}
+
+	public function IsRunning()
+	{
+		$sOQL = "SELECT SynchroLog WHERE sync_source_id = :source_id AND status='running'";
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array('start_date' => false) /* order by*/, array('source_id' => $this->GetKey()) /* aArgs */, array(), 1 /* limitCount */, 0 /* limitStart */);
+		if ($oSet->Count() < 1)
+		{
+			$bRet = false;
+		}
+		else
+		{
+			$bRet = true;
+		}
+		return $bRet;
+	}
+	
+	public function GetLatestLog()
+	{
+		$oLog = null;
+		
+		$sOQL = "SELECT SynchroLog WHERE sync_source_id = :source_id";
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array('start_date' => false) /* order by*/, array('source_id' => $this->GetKey()) /* aArgs */, array(), 1 /* limitCount */, 0 /* limitStart */);
+		if ($oSet->Count() >= 1)
+		{
+			$oLog = $oSet->Fetch();
+		}
+		return $oLog;
+	}
+	
+	// TO DO: remove if still unused
+	/**
+	 * Retrieve from the log, the date of the last completed import
+	 * @return DateTime
+	 */
+	public function GetLastCompletedImportDate()
+	{
+		$date = null;
+		$sOQL = "SELECT SynchroLog WHERE sync_source_id = :source_id AND status='completed'";
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL), array('end_date' => false) /* order by*/, array('source_id' => $this->GetKey()) /* aArgs */, array(), 0 /* limitCount */, 0 /* limitStart */);
+		if ($oSet->Count() >= 1)
+		{
+			$oLog = $oSet->Fetch();
+			$date = $oLog->Get('end_date');
+		}
+		return $date;
+	}
+}
+
+class SynchroAttribute extends cmdbAbstractObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "attcode",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_sync_att",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("sync_source_id", array("targetclass"=>"SynchroDataSource", "jointype"=> "", "allowed_values"=>null, "sql"=>"sync_source_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("sync_source_name", array("allowed_values"=>null, "extkey_attcode"=> 'sync_source_id', "target_attcode"=>"name")));
+		MetaModel::Init_AddAttribute(new AttributeString("attcode", array("allowed_values"=>null, "sql"=>"attcode", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBoolean("update", array("allowed_values"=>null, "sql"=>"update", "default_value"=>true, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBoolean("reconcile", array("allowed_values"=>null, "sql"=>"reconcile", "default_value"=>false, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("update_policy", array("allowed_values"=>new ValueSetEnum('master_locked,master_unlocked,write_if_empty'), "sql"=>"update_policy", "default_value"=>"master_locked", "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+}
+
+class SynchroAttExtKey extends SynchroAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "attcode",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_sync_att_extkey",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("reconciliation_attcode", array("allowed_values"=>null, "sql"=>"reconciliation_attcode", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy', 'reconciliation_attcode')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for a list
+
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+	
+	public function GetReconciliationFormElement($sTargetClass, $sFieldName)
+	{
+		$sHtml = "<select name=\"$sFieldName\">\n";
+		// Id
+		$sSelected = (''== $this->Get('reconciliation_attcode')) ? ' selected' : '';
+		$sHtml .= "<option value=\"\" $sSelected>".Dict::S('Core:SynchroAttExtKey:ReconciliationById')."</option>\n";
+		
+		// Friendly name
+		$sSelected = ('friendlyname' == $this->Get('reconciliation_attcode')) ? ' selected' : '';
+		$sHtml .= "<option value=\"friendlyname\" $sSelected>".MetaModel::GetLabel($sTargetClass, 'friendlyname')."</option>\n";
+		
+		// Separator
+		$sHtml .= '<option value="" disabled>———————————</option>'; // Note: using the em-dash character which has no space between 2 characters
+		
+		// Then add all remaining scalar attributes, sorted alphabetically
+		$aMoreOptions = array();
+		foreach(MetaModel::ListAttributeDefs($sTargetClass) as $sAttCode => $oAttDef)
+		{
+			if ($oAttDef->IsScalar() && ($sAttCode != 'friendlyname'))
+			{
+				$sSelected = ($sAttCode == $this->Get('reconciliation_attcode')) ? ' selected' : '';
+				$aMoreOptions[MetaModel::GetLabel($sTargetClass, $sAttCode)] = "<option value=\"$sAttCode\" $sSelected>".MetaModel::GetLabel($sTargetClass, $sAttCode)."</option>\n";	
+			}
+		}
+		ksort($aMoreOptions);
+		foreach($aMoreOptions as $sOption)
+		{
+			$sHtml .= $sOption;
+		}
+		
+		$sHtml .= "</select>\n";
+		return $sHtml;
+	}
+
+}
+
+class SynchroAttLinkSet extends SynchroAttribute
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui,grant_by_profile",
+			"key_type" => "autoincrement",
+			"name_attcode" => "attcode",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_sync_att_linkset",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+		MetaModel::Init_AddAttribute(new AttributeString("row_separator", array("allowed_values"=>null, "sql"=>"row_separator", "default_value"=>'|', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attribute_separator", array("allowed_values"=>null, "sql"=>"attribute_separator", "default_value"=>';', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("value_separator", array("allowed_values"=>null, "sql"=>"value_separator", "default_value"=>':', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("attribute_qualifier", array("allowed_values"=>null, "sql"=>"attribute_qualifier", "default_value"=>'\'', "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy', 'row_separator', 'attribute_separator', 'value_separator', 'attribute_qualifier')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'attcode', 'update', 'reconcile', 'update_policy')); // Attributes to be displayed for a list
+
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+
+}
+
+//class SynchroLog extends Event
+class SynchroLog extends DBObject
+{
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_sync_log",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+//		MetaModel::Init_AddAttribute(new AttributeString("userinfo", array("allowed_values"=>null, "sql"=>"userinfo", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("sync_source_id", array("targetclass"=>"SynchroDataSource", "jointype"=> "", "allowed_values"=>null, "sql"=>"sync_source_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("start_date", array("allowed_values"=>null, "sql"=>"start_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("end_date", array("allowed_values"=>null, "sql"=>"end_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('running,completed,error'), "sql"=>"status", "default_value"=>"running", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("status_curr_job", array("allowed_values"=>null, "sql"=>"status_curr_job", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("status_curr_pos", array("allowed_values"=>null, "sql"=>"status_curr_pos", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_seen", array("allowed_values"=>null, "sql"=>"stats_nb_replica_seen", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_total", array("allowed_values"=>null, "sql"=>"stats_nb_replica_total", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_deleted", array("allowed_values"=>null, "sql"=>"stats_nb_obj_deleted", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_deleted_errors", array("allowed_values"=>null, "sql"=>"stats_deleted_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_obsoleted", array("allowed_values"=>null, "sql"=>"stats_nb_obj_obsoleted", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_obsoleted_errors", array("allowed_values"=>null, "sql"=>"stats_nb_obj_obsoleted_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_created", array("allowed_values"=>null, "sql"=>"stats_nb_obj_created", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_created_errors", array("allowed_values"=>null, "sql"=>"stats_nb_obj_created_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_created_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_created_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_updated", array("allowed_values"=>null, "sql"=>"stats_nb_obj_updated", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_updated_errors", array("allowed_values"=>null, "sql"=>"stats_nb_obj_updated_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_updated_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_updated_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_unchanged_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_unchanged_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		//		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_reconciled", array("allowed_values"=>null, "sql"=>"stats_nb_replica_reconciled", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_reconciled_errors", array("allowed_values"=>null, "sql"=>"stats_nb_replica_reconciled_errors", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_replica_disappeared_no_action", array("allowed_values"=>null, "sql"=>"stats_nb_replica_disappeared_no_action", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_updated", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_updated", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_updated_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_updated_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_unchanged", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_unchanged", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeInteger("stats_nb_obj_new_unchanged_warnings", array("allowed_values"=>null, "sql"=>"stats_nb_obj_new_unchanged_warnings", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+		
+		MetaModel::Init_AddAttribute(new AttributeText("last_error", array("allowed_values"=>null, "sql"=>"last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeLongText("traces", array("allowed_values"=>null, "sql"=>"traces", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeInteger("memory_usage_peak", array("allowed_values"=>null, "sql"=>"memory_usage_peak", "default_value"=>0, "is_null_allowed"=>false, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('sync_source_id', 'start_date', 'end_date', 'status', 'stats_nb_replica_total', 'stats_nb_replica_seen', 'stats_nb_obj_created', /*'stats_nb_replica_reconciled',*/ 'stats_nb_obj_updated', 'stats_nb_obj_obsoleted', 'stats_nb_obj_deleted',
+														'stats_nb_obj_created_errors', 'stats_nb_replica_reconciled_errors', 'stats_nb_replica_disappeared_no_action', 'stats_nb_obj_updated_errors', 'stats_nb_obj_obsoleted_errors', 'stats_nb_obj_deleted_errors', 'stats_nb_obj_new_unchanged', 'stats_nb_obj_new_updated', 'traces')); // Attributes to be displayed for the complete details
+		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'start_date', 'end_date', 'status', 'stats_nb_replica_seen')); // Attributes to be displayed for a list
+		// Search criteria
+//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+	
+	/**
+	 * Helper
+	 */
+	 function GetErrorCount()
+	 {
+	 	return $this->Get('stats_nb_obj_deleted_errors')
+	 			+ $this->Get('stats_nb_obj_obsoleted_errors')
+	 			+ $this->Get('stats_nb_obj_created_errors')
+	 			+ $this->Get('stats_nb_obj_updated_errors')
+	 			+ $this->Get('stats_nb_replica_reconciled_errors');
+	 }
+
+	/**
+	 * Increments a statistics counter
+	 *
+	 * @param string $sCode
+	 */
+	function Inc($sCode)
+	{
+		$this->Set($sCode, 1+$this->Get($sCode));
+	}
+
+
+	/**
+	 * Implement traces management
+	 */
+	protected $m_aTraces = array();
+	public function AddTrace($sMsg, $oReplica = null)
+	{
+		if (MetaModel::GetConfig()->Get('synchro_trace') == 'none')
+		{
+			return;
+		}
+
+		if ($oReplica)
+		{
+			$sDestClass = $oReplica->Get('dest_class');
+			if (!empty($sDestClass))
+			{
+				$sPrefix = $oReplica->GetKey().','.$sDestClass.'::'.$oReplica->Get('dest_id').',';
+			}
+			else
+			{
+				$sPrefix = $oReplica->GetKey().',,';
+			}
+		}
+		else
+		{
+			$sPrefix = ',,';
+		}
+		$this->m_aTraces[] = $sPrefix.$sMsg;
+	}
+
+	public function GetTraces()
+	{
+		return $this->m_aTraces;
+	}
+
+	protected function TraceToText()
+	{
+		if (MetaModel::GetConfig()->Get('synchro_trace') != 'save')
+		{
+			// none, or display only
+			return;
+		}
+
+		$sPrevTrace = $this->Get('traces');
+
+		$oAttDef = MetaModel::GetAttributeDef(get_class($this), 'traces');
+		$iMaxSize = $oAttDef->GetMaxSize();
+		if (strlen($sPrevTrace) > 0)
+		{
+			$sTrace = $sPrevTrace."\n".implode("\n", $this->m_aTraces);
+		}
+		else
+		{
+			$sTrace = implode("\n", $this->m_aTraces);
+		}
+		if (strlen($sTrace) >= $iMaxSize)
+		{
+			$sTrace = substr($sTrace, 0, $iMaxSize - 255)."...\nTruncated (size: ".strlen($sTrace).')';
+		}
+		$this->Set('traces', $sTrace);
+
+		//DBUpdate may be called many times... the operation should not be repeated
+		$this->m_aTraces = array();
+	}
+
+	protected function OnInsert()
+	{
+		$this->TraceToText();
+		parent::OnInsert();
+	}
+
+	protected function OnUpdate()
+	{
+		$this->TraceToText();
+		$sMemPeak = max($this->Get('memory_usage_peak'), ExecutionKPI::memory_get_peak_usage());
+		$this->Set('memory_usage_peak', $sMemPeak);
+		parent::OnUpdate();
+	}
+}
+
+
+class SynchroReplica extends DBObject implements iDisplay
+{
+	static $aSearches = array(); // Cache of OQL queries used for reconciliation (per data source)
+	protected $aWarnings;
+	
+	public static function Init()
+	{
+		$aParams = array
+		(
+			"category" => "core/cmdb,view_in_gui",
+			"key_type" => "autoincrement",
+			"name_attcode" => "",
+			"state_attcode" => "",
+			"reconc_keys" => array(),
+			"db_table" => "priv_sync_replica",
+			"db_key_field" => "id",
+			"db_finalclass_field" => "",
+			"display_template" => "",
+			"indexes" => array( array ('dest_class', 'dest_id'), ),
+		);
+		MetaModel::Init_Params($aParams);
+		MetaModel::Init_InheritAttributes();
+
+		MetaModel::Init_AddAttribute(new AttributeExternalKey("sync_source_id", array("targetclass"=>"SynchroDataSource", "jointype"=> "", "allowed_values"=>null, "sql"=>"sync_source_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_SILENT, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeExternalField("base_class", array("allowed_values"=>null, "extkey_attcode"=> 'sync_source_id', "target_attcode"=>"scope_class")));
+
+		MetaModel::Init_AddAttribute(new AttributeObjectKey("dest_id", array("allowed_values"=>null, "class_attcode"=>"dest_class", "sql"=>"dest_id", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeClass("dest_class", array("class_category"=>"", "more_values"=>"", "sql"=>"dest_class", "default_value"=>'Organization', "is_null_allowed"=>true, "depends_on"=>array())));
+
+		MetaModel::Init_AddAttribute(new AttributeDateTime("status_last_seen", array("allowed_values"=>null, "sql"=>"status_last_seen", "default_value"=>"", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('new,synchronized,modified,orphan,obsolete'), "sql"=>"status", "default_value"=>"new", "is_null_allowed"=>false, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeBoolean("status_dest_creator", array("allowed_values"=>null, "sql"=>"status_dest_creator", "default_value"=>0, "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("status_last_error", array("allowed_values"=>null, "sql"=>"status_last_error", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeString("status_last_warning", array("allowed_values"=>null, "sql"=>"status_last_warning", "default_value"=>'', "is_null_allowed"=>true, "depends_on"=>array())));
+		
+		MetaModel::Init_AddAttribute(new AttributeDateTime("info_creation_date", array("allowed_values"=>null, "sql"=>"info_creation_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeDateTime("info_last_modified", array("allowed_values"=>null, "sql"=>"info_last_modified", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+
+		// Display lists
+		MetaModel::Init_SetZListItems('details', array('' .
+			'col:0'=> array(
+				'fieldset:SynchroDataSource:Definition' => array('sync_source_id','dest_id','dest_class'),
+				'fieldset:SynchroDataSource:Status' => array('status','status_last_seen','status_dest_creator','status_last_error','status_last_warning'),
+				'fieldset:SynchroDataSource:Information' => array('info_creation_date','info_last_modified'))
+			)
+		);
+		MetaModel::Init_SetZListItems('list', array('sync_source_id', 'dest_id', 'dest_class', 'status_last_seen', 'status', 'status_dest_creator', 'status_last_error', 'status_last_warning')); // Attributes to be displayed for a list
+		// Search criteria
+		MetaModel::Init_SetZListItems('standard_search', array('sync_source_id', 'status_last_seen', 'status', 'status_dest_creator', 'dest_class', 'dest_id', 'status_last_error', 'status_last_warning')); // Criteria of the std search form
+//		MetaModel::Init_SetZListItems('advanced_search', array('name')); // Criteria of the advanced search form
+	}
+	
+	public function __construct($aRow = null, $sClassAlias = '', $aAttToLoad = null, $aExtendedDataSpec = null)
+	{
+		parent::__construct($aRow, $sClassAlias, $aAttToLoad, $aExtendedDataSpec);
+		$this->aWarnings = array();
+	}
+
+ 	protected function AddWarning($sWarningMessage)
+	{
+		$this->aWarnings[] = $sWarningMessage;
+	}
+
+ 	protected function ResetWarnings()
+	{
+		$this->aWarnings = array();
+	}
+
+	protected function HasWarnings()
+	{
+		return (count($this->aWarnings) > 0);
+	}
+
+	protected function RecordWarnings()
+	{
+		$MAX_WARNING_LENGTH = 255;
+		switch(count($this->aWarnings))
+		{
+			case 0:
+			$sWarningMessage = '';
+			break;
+			
+			case 1:
+			$sWarningMessage = $this->aWarnings[0];
+			break;
+			
+			default:
+			$sWarningMessage = count($this->aWarnings)." warnings: ".implode(' ', $this->aWarnings);
+			break;
+		}
+
+		if (strlen($sWarningMessage) > $MAX_WARNING_LENGTH)
+		{
+			$sWarningMessage = substr($sWarningMessage, 0, $MAX_WARNING_LENGTH - 3).'...';
+		}
+		
+		$this->Set('status_last_warning', $sWarningMessage);
+	}
+
+	public function DBInsert()
+	{
+		throw new CoreException('A synchronization replica must be created only by the mean of triggers');
+	}
+
+	// Overload the deletion -> the replica has been created by the mean of a trigger,
+	//                          it will be deleted by the mean of a trigger too
+	protected function DBDeleteSingleObject()
+	{
+		$this->OnDelete();
+
+		if (!MetaModel::DBIsReadOnly())
+		{
+			$oDataSource = MetaModel::GetObject('SynchroDataSource', $this->Get('sync_source_id'), false);
+			if ($oDataSource)
+			{
+				$sTable = $oDataSource->GetDataTable();
+	
+				$sSQL = "DELETE FROM `$sTable` WHERE id = '{$this->GetKey()}'";
+				CMDBSource::Query($sSQL);
+			}
+			// else the whole datasource has probably been already deleted
+		}
+
+		$this->AfterDelete();
+
+		$this->m_bIsInDB = false;
+		$this->m_iKey = null;
+	}
+
+	public function SetLastError($sMessage, $oException = null)
+	{
+		if ($oException)
+		{
+			$sText = $sMessage.$oException->getMessage();
+		}
+		else
+		{
+			$sText = $sMessage;
+		}
+		if (strlen($sText) > 255)
+		{
+			$sText = substr($sText, 0, 200).'...('.strlen($sText).' chars)...';
+		}
+		$this->Set('status_last_error', $sText);
+	}
+
+	
+	public function Synchro($oDataSource, $aReconciliationKeys, $aAttributes, $oChange, &$oStatLog)
+	{
+		$oStatLog->AddTrace(">>> Beginning of SynchroReplica::Synchro, replica status is '".$this->Get('status')."'.", $this);
+		$this->ResetWarnings();
+		switch($this->Get('status'))
+		{
+			case 'new':
+			$this->Set('status_dest_creator', false);
+			// If needed, construct the query used for the reconciliation
+			if (!isset(self::$aSearches[$oDataSource->GetKey()]))
+			{
+				$aCriterias = array();
+				foreach($aReconciliationKeys as $sFilterCode => $oSyncAtt)
+				{
+					$aCriterias[] = ($sFilterCode == 'primary_key' ? 'id' : $sFilterCode).' = :'.$sFilterCode;
+				}
+				$sOQL = "SELECT ".$oDataSource->GetTargetClass()." WHERE ".implode(' AND ', $aCriterias);
+				self::$aSearches[$oDataSource->GetKey()] = DBObjectSearch::FromOQL($sOQL);
+			}
+			// Get the criterias for the search
+			$aFilterValues = array();
+			foreach($aReconciliationKeys as $sFilterCode => $oSyncAtt)
+			{
+				$value = $this->GetValueFromExtData($sFilterCode, $oSyncAtt, $oStatLog);
+				if (!is_null($value))
+				{
+					$aFilterValues[$sFilterCode] = $value;
+				}
+				else
+				{
+					// TO DO: can we retry this ??
+					// Reconciliation could not be performed - log and EXIT
+					$oStatLog->AddTrace("Could not reconcile on null value for attribute '$sFilterCode'", $this);
+					$this->SetLastError("Could not reconcile on null value for attribute '$sFilterCode'");
+					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
+					$oStatLog->AddTrace("<<< End of SyncroReplica::Synchro (error could not reconcile on null value for attribute '$sFilterCode').", $this);
+					return;
+				}
+			}
+			$oDestSet = new DBObjectSet(self::$aSearches[$oDataSource->GetKey()], array(), $aFilterValues);
+			$iCount = $oDestSet->Count();
+			$sDebugOQL = $oDestSet->GetFilter()->ToOQL(true);
+			$oStatLog->AddTrace("Reconciliation query: '$sDebugOQL' returned $iCount object(s).", $this);		
+			$aConditions = array();
+			foreach($aFilterValues as $sCode => $sValue)
+			{
+				$aConditions[] = $sCode.'='.$sValue;
+			}
+			$sConditionDesc = implode(' AND ', $aConditions);
+			// How many objects match the reconciliation criterias
+			switch($iCount)
+			{
+				case 0:
+				$oStatLog->AddTrace("Nothing found on: $sConditionDesc", $this);
+				if ($oDataSource->Get('action_on_zero') == 'create')
+				{
+					$oStatLog->AddTrace("Calling CreateObjectFromReplica", $this);
+					$bCreated = $this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
+					if ($bCreated)
+					{
+						if ($this->HasWarnings())
+						{
+							$oStatLog->Inc('stats_nb_obj_created_warnings');
+						}
+					}
+					else
+					{
+						// Creation error has precedence over any warning
+						$this->ResetWarnings();
+					}
+				}
+				else // assumed to be 'error'
+				{
+					$oStatLog->AddTrace("Failed to reconcile (no match)", $this);
+					// Recoverable error
+					$this->SetLastError('Could not find a match for reconciliation');
+					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
+				}
+				break;
+				
+				case 1:
+				$oStatLog->AddTrace("Found 1 object on: $sConditionDesc", $this);
+				if ($oDataSource->Get('action_on_one') == 'update')
+				{
+					$oDestObj = $oDestSet->Fetch();
+					$oStatLog->AddTrace("Calling UpdateObjectFromReplica(".(get_class($oDestObj).'::'.$oDestObj->GetKey()).")", $this);
+					$bModified = $this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj_new', 'stats_nb_replica_reconciled_errors');
+					$this->Set('dest_id', $oDestObj->GetKey());
+					$this->Set('dest_class', get_class($oDestObj));
+					if ($this->HasWarnings())
+					{
+						if ($bModified)
+						{
+							$oStatLog->Inc('stats_nb_obj_new_updated_warnings');
+						}
+						else
+						{
+							$oStatLog->Inc('stats_nb_obj_new_unchanged_warnings');
+						}
+					}
+				}
+				else
+				{
+					// assumed to be 'error'
+					$oStatLog->AddTrace("Failed to reconcile (1 match)", $this);
+					// Recoverable error
+					$this->SetLastError('Found a match while expecting several');
+					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
+				}
+				break;
+				
+				default:
+				$oStatLog->AddTrace("Found $iCount objects on: $sConditionDesc", $this);
+				if ($oDataSource->Get('action_on_multiple') == 'error')
+				{
+					$oStatLog->AddTrace("Failed to reconcile (N>1 matches)", $this);
+					// Recoverable error
+					$this->SetLastError($iCount.' destination objects match the reconciliation criterias: '.$sConditionDesc);
+					$oStatLog->Inc('stats_nb_replica_reconciled_errors');
+				}
+				elseif ($oDataSource->Get('action_on_multiple') == 'create')
+				{
+					$bCreated = $this->CreateObjectFromReplica($oDataSource->GetTargetClass(), $aAttributes, $oChange, $oStatLog);
+					if ($bCreated)
+					{
+						if ($this->HasWarnings())
+						{
+							$oStatLog->Inc('stats_nb_obj_created_warnings');
+						}
+					}
+					else
+					{
+						// Creation error has precedence over any warning
+						$this->ResetWarnings();
+					}
+				}
+				else
+				{
+					// assumed to be 'take_first'
+					$oDestObj = $oDestSet->Fetch();
+					$bModified = $this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj_new', 'stats_nb_replica_reconciled_errors');
+					$this->Set('dest_id', $oDestObj->GetKey());
+					$this->Set('dest_class', get_class($oDestObj));
+					if ($this->HasWarnings())
+					{
+						if ($bModified)
+						{
+							$oStatLog->Inc('stats_nb_obj_new_updated_warnings');
+						}
+						else
+						{
+							$oStatLog->Inc('stats_nb_obj_new_unchanged_warnings');
+						}
+					}
+				}
+			}
+			$this->RecordWarnings();
+			break;
+			
+			case 'synchronized': // try to recover synchronized replicas with warnings
+			case 'modified':
+				$oDestObj = MetaModel::GetObject($oDataSource->GetTargetClass(), $this->Get('dest_id'));
+			if ($oDestObj == null)
+			{
+				$this->Set('status', 'orphan'); // The destination object has been deleted !
+				$this->SetLastError('Destination object deleted unexpectedly');
+				$oStatLog->Inc('stats_nb_obj_updated_errors');
+			}
+			else
+			{
+				$bModified = $this->UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, $oStatLog, 'stats_nb_obj', 'stats_nb_obj_updated_errors');
+				if ($this->HasWarnings())
+				{
+					if ($bModified)
+					{
+						$oStatLog->Inc('stats_nb_obj_updated_warnings');
+					}
+					else
+					{
+						$oStatLog->Inc('stats_nb_obj_unchanged_warnings');
+					}
+				}
+			}
+			$this->RecordWarnings();
+			break;
+			
+			default: // Do nothing in all other cases
+		}
+		$oStatLog->AddTrace("<<< End of SynchroReplica::Synchro.", $this);
+	}
+
+	/**
+	 * Updates the destination object with the Extended data found in the synchro_data_XXXX table
+	 *
+	 * @param $oDestObj
+	 * @param string[] $aAttributes
+	 * @param $oChange
+	 * @param $oStatLog
+	 * @param string $sStatsCode
+	 * @param string $sStatsCodeError
+	 *
+	 * @return bool
+	 */
+	protected function UpdateObjectFromReplica($oDestObj, $aAttributes, $oChange, &$oStatLog, $sStatsCode, $sStatsCodeError)
+	{
+		$aValueTrace = array();
+		$bModified = false;
+		try
+		{
+			foreach($aAttributes as $sAttCode => $oSyncAtt)
+			{
+				$value = $this->GetValueFromExtData($sAttCode, $oSyncAtt, $oStatLog);
+				if (!is_null($value))
+				{
+					if ($oSyncAtt->Get('update_policy') == 'write_if_empty')
+					{
+						$oAttDef = MetaModel::GetAttributeDef(get_class($oDestObj), $sAttCode);
+						if ($oAttDef->IsNull($oDestObj->Get($sAttCode)))
+						{
+							// The value is still "empty" in the target object, we are allowed to write the new value
+							$oDestObj->Set($sAttCode, $value);
+							$aValueTrace[] = "$sAttCode: $value";
+						}
+					}
+					else
+					{
+						$oDestObj->Set($sAttCode, $value);
+						$aValueTrace[] = "$sAttCode: $value";
+					}
+				}
+			}
+			// Really modified ?
+			if ($oDestObj->IsModified())
+			{
+				$oDestObj->DBUpdateTracked($oChange);
+				$bModified = true;
+				$oStatLog->AddTrace('Updated object - Values: {'.implode(', ', $aValueTrace).'}', $this);
+				if (($sStatsCode != '') &&(MetaModel::IsValidAttCode(get_class($oStatLog), $sStatsCode.'_updated')))
+				{
+					$oStatLog->Inc($sStatsCode.'_updated');
+				}
+				$this->Set('info_last_modified', date(AttributeDateTime::GetSQLFormat()));
+			}
+			else
+			{
+				$oStatLog->AddTrace('Unchanged object', $this);
+				if (($sStatsCode != '') &&(MetaModel::IsValidAttCode(get_class($oStatLog), $sStatsCode.'_unchanged')))
+				{
+					$oStatLog->Inc($sStatsCode.'_unchanged');
+				}
+			}
+
+			$this->Set('status_last_error', '');
+			$this->Set('status', 'synchronized');
+		}
+		catch(Exception $e)
+		{
+			$oStatLog->AddTrace("Failed to update destination object: {$e->getMessage()}", $this);
+			$this->SetLastError('Unable to update destination object: ', $e);
+			$oStatLog->Inc($sStatsCodeError);
+		}
+		return $bModified;
+	}
+
+	/**
+	 * Creates the destination object populating it with the Extended data found in the synchro_data_XXXX table
+	 *
+	 * @param string $sClass
+	 * @param string[] $aAttributes
+	 * @param $oChange
+	 * @param $oStatLog
+	 *
+	 * @return bool Whether or not the object was created
+	 */
+	protected function CreateObjectFromReplica($sClass, $aAttributes, $oChange, &$oStatLog)
+	{
+		$bCreated = false;
+		$oDestObj = MetaModel::NewObject($sClass);
+		try
+		{
+			$aValueTrace = array();
+			foreach($aAttributes as $sAttCode => $oSyncAtt)
+			{
+				$value = $this->GetValueFromExtData($sAttCode, $oSyncAtt, $oStatLog);
+				if (!is_null($value))
+				{
+					$oDestObj->Set($sAttCode, $value);
+					$aValueTrace[] = "$sAttCode: $value";
+				}
+			}
+			$iNew = $oDestObj->DBInsertTracked($oChange);
+
+			$this->Set('dest_id', $oDestObj->GetKey());
+			$this->Set('dest_class', get_class($oDestObj));
+			$this->Set('status_dest_creator', true);
+			$this->Set('status_last_error', '');
+			$this->Set('status', 'synchronized');
+			$this->Set('info_creation_date', date(AttributeDateTime::GetSQLFormat()));
+			$bCreated = true;
+
+			$oStatLog->AddTrace("Created (".implode(', ', $aValueTrace).")", $this);
+			$oStatLog->Inc('stats_nb_obj_created');
+		}
+		catch(Exception $e)
+		{
+			$oStatLog->AddTrace("Failed to create $sClass ({$e->getMessage()})", $this);
+			$this->SetLastError('Unable to create destination object: ', $e);
+			$oStatLog->Inc('stats_nb_obj_created_errors');
+		}
+		return $bCreated;
+	}
+	
+	/**
+	 * Update the destination object with given values
+	 */	
+	public function UpdateDestObject($aValues, $oChange, &$oStatLog)
+	{
+		try
+		{
+			if ($this->Get('dest_class') == '')
+			{
+				$this->SetLastError('No destination object to update');
+				$oStatLog->Inc('stats_nb_obj_obsoleted_errors');
+			}
+			else
+			{
+				$oDestObj = MetaModel::GetObject($this->Get('dest_class'), $this->Get('dest_id'));
+				foreach($aValues as $sAttCode => $value)
+				{
+					if (!MetaModel::IsValidAttCode(get_class($oDestObj), $sAttCode))
+					{
+						throw new Exception("Unknown attribute code '$sAttCode'");
+					} 
+					$oDestObj->Set($sAttCode, $value);
+				}
+				$this->Set('info_last_modified', date(AttributeDateTime::GetSQLFormat()));
+				$oDestObj->DBUpdateTracked($oChange);
+				$oStatLog->AddTrace("Replica marked as obsolete", $this);
+				$oStatLog->Inc('stats_nb_obj_obsoleted');
+			}
+		}
+		catch(Exception $e)
+		{
+			$this->SetLastError('Unable to update the destination object: ', $e);
+			$oStatLog->Inc('stats_nb_obj_obsoleted_errors');
+		}
+	}
+
+	/**
+	 * Delete the destination object
+	 */	
+	public function DeleteDestObject($oChange, &$oStatLog)
+	{
+		if($this->Get('status_dest_creator'))
+		{
+			try
+			{
+				$oDestObj = MetaModel::GetObject($this->Get('dest_class'), $this->Get('dest_id'));
+				$oCheckDeletionPlan = new DeletionPlan();
+				if ($oDestObj->CheckToDelete($oCheckDeletionPlan))
+				{
+					$oActualDeletionPlan = new DeletionPlan();
+					$oDestObj->DBDeleteTracked($oChange, null, $oActualDeletionPlan);
+					$this->DBDeleteTracked($oChange);
+					$oStatLog->Inc('stats_nb_obj_deleted');
+				}
+				else
+				{
+					$sIssues = implode("\n", $oCheckDeletionPlan->GetIssues());
+					throw(new Exception($sIssues));
+				}
+			}
+			catch(Exception $e)
+			{
+				$this->SetLastError('Unable to delete the destination object: ', $e);
+				$this->Set('status', 'obsolete');
+				$this->DBUpdateTracked($oChange);
+				$oStatLog->Inc('stats_nb_obj_deleted_errors');
+			}
+		}
+		else
+		{
+			$this->DBDeleteTracked($oChange);
+			$oStatLog->Inc('stats_nb_replica_disappeared_no_action');
+		}
+	}
+
+	/**
+	 * Get the value from the 'Extended Data' located in the synchro_data_xxx table for this replica
+	 *
+	 * @param string $sExtAttCode could be a standard attcode, or 'primary_key'
+	 * @param $oSyncAtt
+	 * @param $oStatLog
+	 *
+	 * @return mixed , or null (leave unchanged), or '' (reset)
+	 */
+	protected function GetValueFromExtData($sExtAttCode, $oSyncAtt, &$oStatLog)
+	{
+		// $aData should contain attributes defined either for reconciliation or create/update
+		$aData = $this->GetExtendedData();
+
+		if ($sExtAttCode == 'primary_key')
+		{
+			return $aData['primary_key'];
+		}
+
+		// $sExtAttCode is a valid attribute code
+		// 
+		$sClass = $this->Get('base_class');
+
+		$oAttDef = MetaModel::GetAttributeDef($sClass, $sExtAttCode);
+
+		if (!is_null($oSyncAtt) && ($oSyncAtt instanceof SynchroAttExtKey))
+		{
+			$rawValue = $aData[$sExtAttCode];
+			if (is_null($rawValue))
+			{
+				// Null means "ignore" this attribute
+				return null;
+			}
+
+			$sReconcAttCode = $oSyncAtt->Get('reconciliation_attcode');
+			if (!empty($sReconcAttCode))
+			{
+				$sRemoteClass = $oAttDef->GetTargetClass();
+				$oObj = MetaModel::GetObjectByColumn($sRemoteClass, $sReconcAttCode, $rawValue, false);
+				if ($oObj)
+				{
+					 $retValue = $oObj->GetKey();
+				}
+				else
+				{
+					if ($rawValue != '')
+					{
+						// Note: differs from null (in which case the value would be left unchanged)
+						$oStatLog->AddTrace("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'", $this);
+						$this->AddWarning("Could not find [unique] object for '$sExtAttCode': searched on $sReconcAttCode = '$rawValue'");
+					}
+					$retValue = 0;
+				}
+			}
+			else
+			{
+				$retValue = $rawValue;
+			}
+		}
+		elseif (!is_null($oSyncAtt) && ($oSyncAtt instanceof SynchroAttLinkSet))
+		{
+			$rawValue = $aData[$sExtAttCode];
+			if (is_null($rawValue))
+			{
+				// Null means "ignore" this attribute
+				return null;
+			}
+			// MakeValueFromString() throws an exception in case of failure
+			$bLocalizedValue = false;
+			$retValue = $oAttDef->MakeValueFromString($rawValue, $bLocalizedValue, $oSyncAtt->Get('row_separator'), $oSyncAtt->Get('attribute_separator'), $oSyncAtt->Get('value_separator'), $oSyncAtt->Get('attribute_qualifier'));
+		}
+		else
+		{
+			$aColumns = $oAttDef->GetImportColumns();
+			foreach($aColumns as $sColumn => $sFormat)
+			{
+				// In any case, a null column means "ignore this attribute"
+				//
+				if (is_null($aData[$sColumn]))
+				{
+					return null;
+				}
+			}
+			// No null column has been found
+			$retValue = $oAttDef->FromImportToValue($aData, $sExtAttCode);
+			if (is_null($retValue))
+			{
+				// This is a reset
+				$retValue = '';
+			}
+		}
+
+		return $retValue;
+	}
+	
+	/**
+	 * Maps the given context parameter name to the appropriate filter/search code for this class
+	 * @param string $sContextParam Name of the context parameter, i.e. 'org_id'
+	 * @return string Filter code, i.e. 'customer_id'
+	 */
+	public static function MapContextParam($sContextParam)
+	{
+		if ($sContextParam == 'menu')
+		{
+			return null;
+		}
+		else
+		{
+			return $sContextParam;
+		}
+	}
+
+	/**
+	 * This function returns a 'hilight' CSS class, used to hilight a given row in a table
+	 * There are currently (i.e defined in the CSS) 4 possible values HILIGHT_CLASS_CRITICAL,
+	 * HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE
+	 * To Be overridden by derived classes
+	 * @param void
+	 * @return String The desired higlight class for the object/row
+	 */
+	public function GetHilightClass()
+	{
+		// Possible return values are:
+		// HILIGHT_CLASS_CRITICAL, HILIGHT_CLASS_WARNING, HILIGHT_CLASS_OK, HILIGHT_CLASS_NONE	
+		return HILIGHT_CLASS_NONE; // Not hilighted by default
+	}
+
+	public static function GetUIPage()
+	{
+		return '../synchro/replica.php';
+	}
+
+	function DisplayDetails(WebPage $oPage, $bEditMode = false)
+	{
+		// Object's details
+		//$this->DisplayBareHeader($oPage, $bEditMode);
+		$oPage->AddTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTabContainer(OBJECT_PROPERTIES_TAB);
+		$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
+		$this->DisplayBareProperties($oPage, $bEditMode);
+	}
+	
+	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
+	{
+		if ($bEditMode) return; // Not editable
+		
+		$oPage->add('<table style="vertical-align:top"><tr style="vertical-align:top"><td>');
+		$aDetails = array();
+		$sClass = get_class($this);
+		$oPage->add('<fieldset>');
+		$oPage->add('<legend>'.Dict::S('Core:SynchroReplica:PrivateDetails').'</legend>');
+		$aZList = MetaModel::FlattenZlist(MetaModel::GetZListItems($sClass, 'details'));
+		foreach( $aZList as $sAttCode)
+		{
+			$sDisplayValue = $this->GetAsHTML($sAttCode);	
+			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
+		}
+		$oPage->Details($aDetails);
+		$oPage->add('</fieldset>');
+		if (strlen($this->Get('dest_class')) > 0)
+		{
+			$oDestObj = MetaModel::GetObject($this->Get('dest_class'), $this->Get('dest_id'), false);
+			if (is_object($oDestObj))
+			{
+				$oPage->add('<fieldset>');
+				$oPage->add('<legend>'.Dict::Format('Core:SynchroReplica:TargetObject', $oDestObj->GetHyperlink()).'</legend>');
+					$oDestObj->DisplayBareProperties($oPage, false, $sPrefix, $aExtraParams);
+				$oPage->add('<fieldset>');
+			}
+		}
+		$oPage->add('</td><td>');
+		$oPage->add('<fieldset>');
+		$oPage->add('<legend>'.Dict::S('Core:SynchroReplica:PublicData').'</legend>');
+		$oSource = MetaModel::GetObject('SynchroDataSource', $this->Get('sync_source_id'));
+		
+		$sSQLTable = $oSource->GetDataTable();
+		$aData = $this->LoadExtendedDataFromTable($sSQLTable);
+
+		$aHeaders = array('attcode' => array('label' => 'Attribute Code', 'description' => ''),
+						  'data'    => array('label' => 'Value', 'description' => ''));
+		$aRows = array();
+		foreach($aData as $sKey => $value)
+		{
+			$aRows[] = array('attcode' => $sKey, 'data' => $value);
+		}
+		$oPage->Table($aHeaders, $aRows);
+		$oPage->add('</fieldset>');
+		$oPage->add('</td></tr></table>');
+		
+	}
+	
+	public function LoadExtendedDataFromTable($sSQLTable)
+	{
+		$sSQL = "SELECT * FROM $sSQLTable WHERE id=".$this->GetKey();
+
+		$rQuery = CMDBSource::Query($sSQL);
+		return CMDBSource::FetchArray($rQuery);
+	}
+}
+
+/**
+ * Context of an ongoing synchronization
+ * Two usages:
+ * 1) Public usage: execute the synchronization
+ *    $oSynchroExec = new SynchroExecution($oDataSource[, $iLastFullLoad]);
+ *    $oSynchroExec->Process($iMaxChunkSize); 
+ *      
+ * 2) Internal usage: continue the synchronization (split into chunks, each performed in a separate process)
+ *    This is implemented in the page priv_sync_chunk.php 
+ *    $oSynchroExec = SynchroExecution::Resume($oDataSource, $iLastFullLoad, $iSynchroLog, $iChange, $iMaxToProcess, $iJob, $iNextInJob);    
+ *    $oSynchroExec->Process() 
+ */	
+class SynchroExecution
+{
+	protected $m_oDataSource = null;
+	protected $m_oLastFullLoadStartDate = null;
+
+	protected $m_oChange = null;
+	/** @var SynchroLog */
+	protected $m_oStatLog = null;
+
+	// Context computed one for optimization and report inconsistencies ASAP
+	protected $m_aExtDataSpec = array();
+	protected $m_aReconciliationKeys = array();
+	protected $m_aAttributes = array();
+	protected $m_iCountAllReplicas = 0;
+	protected $m_oCtx;
+	protected $m_oCtx1;
+	
+	/**
+	 * Constructor
+	 * @param SynchroDataSource $oDataSource Synchronization task
+	 * @param DateTime $oLastFullLoadStartDate Date of the last full load (start date/time), if known
+	 */
+	public function __construct($oDataSource, $oLastFullLoadStartDate = null)
+	{
+		$this->m_oDataSource = $oDataSource;
+		$this->m_oLastFullLoadStartDate = $oLastFullLoadStartDate;
+		$this->m_oCtx = new ContextTag('Synchro');
+		$this->m_oCtx1 = new ContextTag('Synchro:'.$oDataSource->GetRawName()); // More precise context information
+	}
+
+	/**
+	* Create the persistant information records, for the current synchronization
+	* In fact, those records ARE defining what is the "current" synchronization	
+	*/	
+	protected function PrepareLogs()
+	{
+		if (!is_null($this->m_oChange))
+		{
+			return;
+		}
+
+		// Create a change used for logging all the modifications/creations happening during the synchro
+		$this->m_oChange = MetaModel::NewObject("CMDBChange");
+		$this->m_oChange->Set("date", time());
+		$sUserString = CMDBChange::GetCurrentUserName();
+		$this->m_oChange->Set("userinfo", $sUserString.' '.Dict::S('Core:SyncDataExchangeComment'));
+		$this->m_oChange->Set("origin", 'synchro-data-source');
+		$this->m_oChange->DBInsert();
+
+		// Start logging this execution (stats + protection against reentrance)
+		//
+		$this->m_oStatLog = new SynchroLog();
+		$this->m_oStatLog->Set('sync_source_id', $this->m_oDataSource->GetKey());
+		$this->m_oStatLog->Set('start_date', time());
+		$this->m_oStatLog->Set('status', 'running');
+		$this->m_oStatLog->Set('stats_nb_replica_seen', 0);
+		$this->m_oStatLog->Set('stats_nb_replica_total', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_deleted', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_deleted_errors', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_obsoleted', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_obsoleted_errors', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_created', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_created_errors', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_created_warnings', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_updated', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_updated_warnings', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_updated_errors', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_unchanged_warnings', 0);
+		//		$this->m_oStatLog->Set('stats_nb_replica_reconciled', 0);
+		$this->m_oStatLog->Set('stats_nb_replica_reconciled_errors', 0);
+		$this->m_oStatLog->Set('stats_nb_replica_disappeared_no_action', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_new_updated', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_new_updated_warnings', 0);
+		$this->m_oStatLog->Set('stats_nb_obj_new_unchanged',0);
+		$this->m_oStatLog->Set('stats_nb_obj_new_unchanged_warnings',0);
+		
+		$sSelectTotal  = "SELECT SynchroReplica WHERE sync_source_id = :source_id";
+		$oSetTotal = new DBObjectSet(DBObjectSearch::FromOQL($sSelectTotal), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey()));
+		$this->m_iCountAllReplicas = $oSetTotal->Count();
+		$this->m_oStatLog->Set('stats_nb_replica_total', $this->m_iCountAllReplicas);
+
+		$this->m_oStatLog->DBInsertTracked($this->m_oChange);
+		$sLastFullLoad = is_object($this->m_oLastFullLoadStartDate) ? $this->m_oLastFullLoadStartDate->format('Y-m-d H:i:s') : 'not specified';
+		$this->m_oStatLog->AddTrace("###### STARTING SYNCHRONIZATION ##### Total: {$this->m_iCountAllReplicas} replica(s). Last full load: '$sLastFullLoad' ");
+		$sSql = 'SELECT NOW();';
+		$sDBNow = CMDBSource::QueryToScalar($sSql);
+		$this->m_oStatLog->AddTrace("Database server current date/time is '$sDBNow', web server current date/time is: '".date('Y-m-d H:i:s')."'");		
+	}
+
+	/**
+	* Prevent against the reentrance... or allow the current task to do things forbidden by the others !
+	*/	
+	public static $m_oCurrentTask = null;
+	public static function GetCurrentTaskId()
+	{
+		if (is_object(self::$m_oCurrentTask))
+		{
+			return self::$m_oCurrentTask->GetKey();
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Prepare structures in memory, to speedup the processing of a given replica
+	 *
+	 * @param bool $bFirstPass
+	 *
+	 * @throws \SynchroExceptionNotStarted
+	 */
+	public function PrepareProcessing($bFirstPass = true)
+	{
+		if ($this->m_oDataSource->Get('status') == 'obsolete')
+		{
+			throw new SynchroExceptionNotStarted(Dict::S('Core:SyncDataSourceObsolete'));
+		}
+		if (!UserRights::IsAdministrator() && $this->m_oDataSource->Get('user_id') != UserRights::GetUserId())
+		{
+			throw new SynchroExceptionNotStarted(Dict::S('Core:SyncDataSourceAccessRestriction'));
+		}
+
+		// Get the list of SQL columns
+		$aAttCodesExpected = array();
+		$aAttCodesToReconcile = array();
+		$aAttCodesToUpdate = array();
+		$sSelectAtt  = "SELECT SynchroAttribute WHERE sync_source_id = :source_id AND (update = 1 OR reconcile = 1)";
+		$oSetAtt = new DBObjectSet(DBObjectSearch::FromOQL($sSelectAtt), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey()) /* aArgs */);
+		while ($oSyncAtt = $oSetAtt->Fetch())
+		{
+			if ($oSyncAtt->Get('update'))
+			{
+				$aAttCodesToUpdate[$oSyncAtt->Get('attcode')] = $oSyncAtt;
+			}
+			if ($oSyncAtt->Get('reconcile'))
+			{
+				$aAttCodesToReconcile[$oSyncAtt->Get('attcode')] = $oSyncAtt;
+			}
+			$aAttCodesExpected[$oSyncAtt->Get('attcode')] = $oSyncAtt;
+		}
+		$aColumns = $this->m_oDataSource->GetSQLColumns(array_keys($aAttCodesExpected));
+		$aExtDataFields = array_keys($aColumns);
+		$aExtDataFields[] = 'primary_key';
+
+		$this->m_aExtDataSpec = array(
+			'table' => $this->m_oDataSource->GetDataTable(),
+			'join_key' => 'id',
+			'fields' => $aExtDataFields
+		);
+
+		// Get the list of attributes, determine reconciliation keys and update targets
+		//
+		if ($this->m_oDataSource->Get('reconciliation_policy') == 'use_attributes')
+		{
+			$this->m_aReconciliationKeys = $aAttCodesToReconcile;
+		}
+		elseif ($this->m_oDataSource->Get('reconciliation_policy') == 'use_primary_key')
+		{
+			// Override the settings made at the attribute level !
+			$this->m_aReconciliationKeys = array("primary_key" => null);
+		}
+
+		if ($bFirstPass)
+		{
+			$this->m_oStatLog->AddTrace("Update of: {".implode(', ', array_keys($aAttCodesToUpdate))."}");
+			$this->m_oStatLog->AddTrace("Reconciliation on: {".implode(', ', array_keys($this->m_aReconciliationKeys))."}");
+		}
+
+		if (count($aAttCodesToUpdate) == 0)
+		{
+			$this->m_oStatLog->AddTrace("No attribute to update");
+			throw new SynchroExceptionNotStarted('There is no attribute to update');
+		}
+		if (count($this->m_aReconciliationKeys) == 0)
+		{
+			$this->m_oStatLog->AddTrace("No attribute for reconciliation");
+			throw new SynchroExceptionNotStarted('No attribute for reconciliation');
+		}
+		
+		$this->m_aAttributes = array();
+		foreach($aAttCodesToUpdate as $sAttCode => $oSyncAtt)
+		{
+			$oAttDef = MetaModel::GetAttributeDef($this->m_oDataSource->GetTargetClass(), $sAttCode);
+			if ($oAttDef->IsWritable())
+			{
+				$this->m_aAttributes[$sAttCode] = $oSyncAtt;
+			}
+		}
+
+		// Compute and keep track of the limit date taken into account for obsoleting replicas
+		//
+		if ($this->m_oLastFullLoadStartDate == null)
+		{
+			// No previous import known, use the full_load_periodicity value... and the current date
+			$this->m_oLastFullLoadStartDate = new DateTime(); // Now
+			$iLoadPeriodicity = $this->m_oDataSource->Get('full_load_periodicity'); // Duration in seconds
+			if ($iLoadPeriodicity > 0)
+			{
+				$sInterval = "-$iLoadPeriodicity seconds";
+				$this->m_oLastFullLoadStartDate->Modify($sInterval);
+			}
+			else
+			{
+				$this->m_oLastFullLoadStartDate = new DateTime('1970-01-01');
+			}
+		}
+		if ($bFirstPass)
+		{
+			$this->m_oStatLog->AddTrace("Limit Date: ".$this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s'));
+		}
+	}
+
+
+	/**
+	 * Perform a synchronization between the data stored in the replicas (&synchro_data_xxx_xx table)
+	 * and the iTop objects. If the lastFullLoadStartDate is NOT specified then the full_load_periodicity
+	 * is used to determine which records are obsolete.
+	 *
+	 * @return SynchroLog
+	 */
+	public function Process()
+	{
+		$this->PrepareLogs();
+
+		self::$m_oCurrentTask = $this->m_oDataSource;
+
+		$oMutex = new iTopMutex('synchro_process_'.$this->m_oDataSource->GetKey());
+		try
+		{
+			$oMutex->Lock();
+			$this->DoSynchronize();
+			$oMutex->Unlock();
+				
+			$this->m_oStatLog->Set('end_date', time());
+			$this->m_oStatLog->Set('status', 'completed');
+			$this->m_oStatLog->DBUpdateTracked($this->m_oChange);
+
+			$iErrors = $this->m_oStatLog->GetErrorCount();
+			if ($iErrors > 0)
+			{
+				$sIssuesOQL = "SELECT SynchroReplica WHERE sync_source_id=".$this->m_oDataSource->GetKey()." AND status_last_error!=''";
+				$sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot();
+				$sIssuesURL = "{$sAbsoluteUrl}synchro/replica.php?operation=oql&datasource=".$this->m_oDataSource->GetKey()."&oql=".urlencode($sIssuesOQL);
+
+				$sStatistics = "<h1>Statistics</h1>\n";
+				$sStatistics .= "<ul>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('start_date').": ".$this->m_oStatLog->Get('start_date')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('end_date').": ".$this->m_oStatLog->Get('end_date')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_seen').": ".$this->m_oStatLog->Get('stats_nb_replica_seen')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_total').": ".$this->m_oStatLog->Get('stats_nb_replica_total')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_deleted').": ".$this->m_oStatLog->Get('stats_nb_obj_deleted')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_deleted_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_deleted_errors')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_obsoleted').": ".$this->m_oStatLog->Get('stats_nb_obj_obsoleted')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_obsoleted_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_obsoleted_errors')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_created').": ".$this->m_oStatLog->Get('stats_nb_obj_created')." (".$this->m_oStatLog->Get('stats_nb_obj_created_warnings')." warnings)"."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_created_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_created_errors')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_updated').": ".$this->m_oStatLog->Get('stats_nb_obj_updated')." (".$this->m_oStatLog->Get('stats_nb_obj_updated_warnings')." warnings)"."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_updated_errors').": ".$this->m_oStatLog->Get('stats_nb_obj_updated_errors')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_reconciled_errors').": ".$this->m_oStatLog->Get('stats_nb_replica_reconciled_errors')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_replica_disappeared_no_action').": ".$this->m_oStatLog->Get('stats_nb_replica_disappeared_no_action')."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_new_updated').": ".$this->m_oStatLog->Get('stats_nb_obj_new_updated')." (".$this->m_oStatLog->Get('stats_nb_obj_new_updated_warnings')." warnings)"."</li>\n";
+				$sStatistics .= "<li>".$this->m_oStatLog->GetLabel('stats_nb_obj_new_unchanged').": ".$this->m_oStatLog->Get('stats_nb_obj_new_unchanged')." (".$this->m_oStatLog->Get('stats_nb_obj_new_unchanged_warnings')." warnings)"."</li>\n";
+				$sStatistics .= "</ul>\n";
+
+				$this->m_oDataSource->SendNotification("errors ($iErrors)", "<p>The synchronization has been executed, $iErrors errors have been encountered. Click <a href=\"$sIssuesURL\">here</a> to see the records being currently in error.</p>".$sStatistics);
+			}
+			else
+			{
+				//$this->m_oDataSource->SendNotification('success', '<p>The synchronization has been successfully executed.</p>');
+			}
+		}
+		catch (SynchroExceptionNotStarted $e)
+		{
+			$oMutex->Unlock();
+			// Set information for reporting... but delete the object in DB
+			$this->m_oStatLog->Set('end_date', time());
+			$this->m_oStatLog->Set('status', 'error');
+			$this->m_oStatLog->Set('last_error', $e->getMessage());
+			$this->m_oStatLog->DBDeleteTracked($this->m_oChange);
+			$this->m_oDataSource->SendNotification('fatal error', '<p>The synchronization could not start: \''.$e->getMessage().'\'</p><p>Please check its configuration</p>');
+		}
+		catch (Exception $e)
+		{
+			$oMutex->Unlock();
+			$this->m_oStatLog->Set('end_date', time());
+			$this->m_oStatLog->Set('status', 'error');
+			$this->m_oStatLog->Set('last_error', $e->getMessage());
+			$this->m_oStatLog->DBUpdateTracked($this->m_oChange);
+			$this->m_oDataSource->SendNotification('exception', '<p>The synchronization has been interrupted: \''.$e->getMessage().'\'</p><p>Please contact the application support team</p>');
+		}
+		self::$m_oCurrentTask = null;
+
+		return $this->m_oStatLog;
+	}
+
+	/**
+	 * Do the entire synchronization job
+	 */
+	protected function DoSynchronize()
+	{
+		$this->m_oStatLog->Set('status_curr_job', 1);
+		$this->m_oStatLog->Set('status_curr_pos', -1);
+
+		$iMaxChunkSize = utils::ReadParam('max_chunk_size', 0, true /* allow CLI */);
+		if ($iMaxChunkSize > 0)
+		{
+			// Split the execution into several processes
+			// Each process will call DoSynchronizeChunk()
+			// The loop will end when a process does not reply "continue" on the last line of its output
+			if (!utils::IsModeCLI())
+			{
+				throw new SynchroExceptionNotStarted(Dict::S('Core:SyncSplitModeCLIOnly'));
+			}
+			$aArguments = array();
+			$aArguments['source'] = $this->m_oDataSource->GetKey();
+			$aArguments['log'] = $this->m_oStatLog->GetKey();
+			$aArguments['change'] = $this->m_oChange->GetKey();
+			$aArguments['chunk'] = $iMaxChunkSize;
+			if ($this->m_oLastFullLoadStartDate)
+			{
+				$aArguments['last_full_load'] = $this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s');
+			}
+			else
+			{
+				$aArguments['last_full_load'] = '';
+			}
+
+			$this->m_oStatLog->DBUpdate($this->m_oChange);
+
+			$iStepCount = 0;
+			do
+			{
+				$aArguments['step_count'] = $iStepCount;
+				$iStepCount++;
+
+				set_time_limit(0); // On Linux the time spent outside of the script does not count, but on Windows it does, so let give us time !
+				list ($iRes, $aOut) = utils::ExecITopScript('synchro/priv_sync_chunk.php', $aArguments);
+
+				// Reload the log that has been modified by the processes
+				$this->m_oStatLog->Reload();
+
+				$sLastRes = strtolower(trim(end($aOut)));
+				switch($sLastRes)
+				{
+				case 'continue':
+					$bContinue = true;
+					break;
+
+				case 'finished':
+					$bContinue = false;
+					break;
+
+				default:
+					$this->m_oStatLog->AddTrace("The script did not reply with the expected keywords:");
+					$aIndentedOut = array();
+					foreach ($aOut as $sOut)
+					{
+						$aIndentedOut[] = "-> $sOut";
+						$this->m_oStatLog->AddTrace(">>> $sOut");
+					}
+					throw new Exception("Encountered an error in an underspinned process:\n".implode("\n", $aIndentedOut));
+				}
+			}
+			while ($bContinue);
+		}
+		else
+		{
+			$this->PrepareProcessing(/* first pass */);
+			$this->DoJob1();
+			$this->DoJob2();
+			$this->DoJob3();
+		}
+	}
+
+	/**
+	 * Do the synchronization job, limited to some amount of work
+	 * This verb has been designed to be called from within a separate process	 
+	 * @return true if the process has to be continued
+	 */
+	public function DoSynchronizeChunk($oLog, $oChange, $iMaxChunkSize)
+	{
+		// Initialize the structures...
+		self::$m_oCurrentTask = $this->m_oDataSource;
+		$this->m_oStatLog = $oLog;
+		$this->m_oChange = $oChange;
+
+		// Prepare internal structures (not the first pass)
+		$this->PrepareProcessing(false);
+
+		$iCurrJob = $this->m_oStatLog->Get('status_curr_job');
+		$iCurrPos = $this->m_oStatLog->Get('status_curr_pos');
+
+		$this->m_oStatLog->AddTrace("Synchronizing chunk - curr_job:$iCurrJob, curr_pos:$iCurrPos, max_chunk_size:$iMaxChunkSize");
+
+		switch ($iCurrJob)
+		{
+			case 1:
+			default:
+				$this->DoJob1($iMaxChunkSize, $iCurrPos);
+				$bContinue = true;
+				break;
+
+			case 2:
+				$this->DoJob2($iMaxChunkSize, $iCurrPos);
+				$bContinue = true;
+				break;
+
+			case 3:
+				$bContinue = $this->DoJob3($iMaxChunkSize, $iCurrPos);
+				break;
+		}
+		$this->m_oStatLog->DBUpdate($this->m_oChange);
+		self::$m_oCurrentTask = null;
+		return $bContinue;
+	}
+
+	/**
+	 * Do the synchronization job #1: Obsolete replica "untouched" for some time
+	 * @param integer $iMaxReplica Limit the number of replicas to process 
+	 * @param integer $iCurrPos Current position where to resume the processing 
+	 * @return true if the process must be continued
+	 */
+	protected function DoJob1($iMaxReplica = null, $iCurrPos = -1)
+	{
+		$this->m_oStatLog->AddTrace(">>> Beginning of DoJob1(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos)");
+		$sLimitDate = $this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s');
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+
+		// Get all the replicas that were not seen in the last import and mark them as obsolete
+		$sDeletePolicy = $this->m_oDataSource->Get('delete_policy');
+		if ($sDeletePolicy != 'ignore')
+		{
+			$sSelectToObsolete  = "SELECT SynchroReplica WHERE id > :curr_pos AND sync_source_id = :source_id AND status IN ('new', 'synchronized', 'modified', 'orphan') AND status_last_seen < :last_import";
+			$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToObsolete), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos));
+			$iCountScope = $oSetScope->Count();
+			$sDebugOql = $oSetScope->GetFilter()->ToOQL(true);
+			$this->m_oStatLog->AddTrace("Searching for replicas to mark as obsolete using query: '$sDebugOql', returned $iCountScope replica(s).");
+			if (($this->m_iCountAllReplicas > 10) && ($this->m_iCountAllReplicas == $iCountScope) && MetaModel::GetConfig()->Get('synchro_prevent_delete_all'))
+			{
+				throw new SynchroExceptionNotStarted(Dict::S('Core:SyncTooManyMissingReplicas'));
+			} 
+
+			if ($iMaxReplica)
+			{
+				// Consider a given subset, starting from replica iCurrPos, limited to the count of iMaxReplica
+				// The replica have to be ordered by id
+				$oSetToProcess = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToObsolete), array('id'=>true) /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos));
+				$oSetToProcess->SetLimit($iMaxReplica);
+			}
+			else
+			{
+				$oSetToProcess = $oSetScope;
+			}
+
+			$iLastReplicaProcessed = -1;
+			while($oReplica = $oSetToProcess->Fetch())
+			{
+				set_time_limit($iLoopTimeLimit);
+				$iLastReplicaProcessed = $oReplica->GetKey();
+				switch ($sDeletePolicy)
+				{
+				case 'update':
+				case 'update_then_delete':
+					$this->m_oStatLog->AddTrace("Destination object to be updated", $oReplica);
+					$aToUpdate = array();
+					$aToUpdateSpec = explode(';', $this->m_oDataSource->Get('delete_policy_update')); //ex: 'status:obsolete;description:stopped',
+					foreach($aToUpdateSpec as $sUpdateSpec)
+					{
+						$aUpdateSpec = explode(':', $sUpdateSpec);
+						if (count($aUpdateSpec) == 2)
+						{
+							$sAttCode = $aUpdateSpec[0];
+							$sValue = $aUpdateSpec[1];
+							$aToUpdate[$sAttCode] = $sValue;
+						}
+					}
+					$oReplica->Set('status_last_error', '');
+					if ($oReplica->Get('dest_id') == '')
+					{
+						$oReplica->Set('status', 'obsolete');
+						$this->m_oStatLog->Inc('stats_nb_replica_disappeared_no_action');
+					}
+					else
+					{
+						$oReplica->UpdateDestObject($aToUpdate, $this->m_oChange, $this->m_oStatLog);
+						if ($oReplica->Get('status_last_error') == '')
+						{
+							// Change the status of the replica IIF
+							$oReplica->Set('status', 'obsolete');
+						}
+					}
+					$oReplica->DBUpdateTracked($this->m_oChange);
+					break;
+	
+	         	case 'delete':
+	         	default:
+					$this->m_oStatLog->AddTrace("Destination object to be DELETED", $oReplica);
+					$oReplica->DeleteDestObject($this->m_oChange, $this->m_oStatLog);
+				}
+			}
+			if ($iMaxReplica)
+			{
+				if ($iMaxReplica < $iCountScope)
+				{
+					// Continue with this job!
+					$this->m_oStatLog->Set('status_curr_pos', $iLastReplicaProcessed);
+					$this->m_oStatLog->AddTrace("<<< End of DoJob1(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (returning true => more replicas to process)");
+					return true;
+				}
+			}
+		} // if ($sDeletePolicy != 'ignore'
+
+		//Count "seen" objects
+		$sSelectSeen  = "SELECT SynchroReplica WHERE sync_source_id = :source_id AND status IN ('new', 'synchronized', 'modified', 'orphan') AND status_last_seen >= :last_import";
+		$oSetSeen = new DBObjectSet(DBObjectSearch::FromOQL($sSelectSeen), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate));
+		$this->m_oStatLog->Set('stats_nb_replica_seen', $oSetSeen->Count());
+
+
+		// Job complete!
+		$this->m_oStatLog->Set('status_curr_job', 2);
+		$this->m_oStatLog->Set('status_curr_pos', -1);
+		$this->m_oStatLog->AddTrace("<<< End of DoJob1(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
+		return false;
+	}
+
+	/**
+	 * Do the synchronization job #2: Create and modify object for new/modified replicas
+	 * @param integer $iMaxReplica Limit the number of replicas to process 
+	 * @param integer $iCurrPos Current position where to resume the processing 
+	 * @return true if the process must be continued
+	 */
+	protected function DoJob2($iMaxReplica = null, $iCurrPos = -1)
+	{
+		$this->m_oStatLog->AddTrace(">>> Beginning of DoJob2(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos)");
+		$sLimitDate = $this->m_oLastFullLoadStartDate->Format('Y-m-d H:i:s');
+		$this->m_oStatLog->AddTrace("\$sLimitDate = '$sLimitDate'");
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+
+		// Get all the replicas that are 'new' or modified or synchronized with a warning
+		//
+		$sSelectToSync  = "SELECT SynchroReplica WHERE id > :curr_pos AND (status = 'new' OR status = 'modified' OR (status = 'synchronized' AND status_last_warning != '')) AND sync_source_id = :source_id AND status_last_seen >= :last_import";
+		$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToSync), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos), $this->m_aExtDataSpec);
+		$iCountScope = $oSetScope->Count();
+		$sDebugOQL = $oSetScope->GetFilter()->ToOQL(true);
+		$this->m_oStatLog->AddTrace("Looking for - new, modified or synchonized with a warning - replicas using the OQL query: '$sDebugOQL', returned $iCountScope replicas.");
+
+		if ($iMaxReplica)
+		{
+			// Consider a given subset, starting from replica iCurrPos, limited to the count of iMaxReplica
+			// The replica have to be ordered by id
+			$oSetToProcess = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToSync), array('id'=>true) /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sLimitDate, 'curr_pos' => $iCurrPos), $this->m_aExtDataSpec);
+			$oSetToProcess->SetLimit($iMaxReplica);
+		}
+		else
+		{
+			$oSetToProcess = $oSetScope;
+		}
+
+		$iLastReplicaProcessed = -1;
+		while($oReplica = $oSetToProcess->Fetch())
+		{
+			set_time_limit($iLoopTimeLimit);
+			$iLastReplicaProcessed = $oReplica->GetKey();
+			$this->m_oStatLog->AddTrace("Synchronizing replica id=$iLastReplicaProcessed.");
+			$oReplica->Synchro($this->m_oDataSource, $this->m_aReconciliationKeys, $this->m_aAttributes, $this->m_oChange, $this->m_oStatLog);
+			$this->m_oStatLog->AddTrace("Updating replica id=$iLastReplicaProcessed.");
+			$oReplica->DBUpdateTracked($this->m_oChange);			
+		}
+		
+		if ($iMaxReplica)
+		{
+			if ($iMaxReplica < $iCountScope)
+			{
+				// Continue with this job!
+				$this->m_oStatLog->Set('status_curr_pos', $iLastReplicaProcessed);
+				$this->m_oStatLog->AddTrace("<<< End of DoJob2(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (returning true => more replicas to process)");
+				return true;
+			}
+		}
+
+		// Job complete!
+		$this->m_oStatLog->Set('status_curr_job', 3);
+		$this->m_oStatLog->Set('status_curr_pos', -1);
+		$this->m_oStatLog->AddTrace("<<< End of DoJob2(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
+		return false;
+	}
+
+	/**
+	 * Do the synchronization job #3: Delete replica depending on the obsolescence scheme
+	 * @param integer $iMaxReplica Limit the number of replicas to process 
+	 * @param integer $iCurrPos Current position where to resume the processing 
+	 * @return true if the process must be continued
+	 */
+	protected function DoJob3($iMaxReplica = null, $iCurrPos = -1)
+	{
+		$this->m_oStatLog->AddTrace(">>> Beginning of DoJob3(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos)");
+		$iLoopTimeLimit = MetaModel::GetConfig()->Get('max_execution_time_per_loop');
+		
+		$sDeletePolicy = $this->m_oDataSource->Get('delete_policy');
+		if ($sDeletePolicy != 'update_then_delete')
+		{
+			$this->m_oStatLog->AddTrace("\$sDeletePoliciy = $sDeletePolicy != 'update_then_delete', nothing to do!");
+			// Job complete!
+			$this->m_oStatLog->Set('status_curr_job', 0);
+			$this->m_oStatLog->Set('status_curr_pos', -1);
+			$this->m_oStatLog->AddTrace("<<< End of DoJob3(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
+			return false;
+		}
+
+		$bFirstPass = ($iCurrPos == -1);
+
+		// Get all the replicas that are to be deleted
+		//
+		$oDeletionDate = $this->m_oLastFullLoadStartDate;
+		$iDeleteRetention = $this->m_oDataSource->Get('delete_policy_retention'); // Duration in seconds
+		if ($iDeleteRetention > 0)
+		{
+			$sInterval = "-$iDeleteRetention seconds";
+			$oDeletionDate->Modify($sInterval);
+		}
+		$sDeletionDate = $oDeletionDate->Format('Y-m-d H:i:s');	
+		if ($bFirstPass)
+		{
+			$this->m_oStatLog->AddTrace("Deletion date: $sDeletionDate");
+		}
+		$sSelectToDelete = "SELECT SynchroReplica WHERE id > :curr_pos AND sync_source_id = :source_id AND status IN ('obsolete') AND status_last_seen < :last_import";
+		$oSetScope = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToDelete), array() /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sDeletionDate, 'curr_pos' => $iCurrPos));
+		$iCountScope = $oSetScope->Count();
+
+		if ($iMaxReplica)
+		{
+			// Consider a given subset, starting from replica iCurrPos, limited to the count of iMaxReplica
+			// The replica have to be ordered by id
+			$oSetToProcess = new DBObjectSet(DBObjectSearch::FromOQL($sSelectToDelete), array('id'=>true) /* order by*/, array('source_id' => $this->m_oDataSource->GetKey(), 'last_import' => $sDeletionDate, 'curr_pos' => $iCurrPos));
+			$oSetToProcess->SetLimit($iMaxReplica);
+		}
+		else
+		{
+			$oSetToProcess = $oSetScope;
+		}
+
+		$iLastReplicaProcessed = -1;
+		while($oReplica = $oSetToProcess->Fetch())
+		{
+			set_time_limit($iLoopTimeLimit);
+			$iLastReplicaProcessed = $oReplica->GetKey();
+			$this->m_oStatLog->AddTrace("Destination object to be DELETED", $oReplica);
+			$oReplica->DeleteDestObject($this->m_oChange, $this->m_oStatLog);
+		}
+
+		if ($iMaxReplica)
+		{
+			if ($iMaxReplica < $iCountScope)
+			{
+				// Continue with this job!
+				$this->m_oStatLog->Set('status_curr_pos', $iLastReplicaProcessed);
+				$this->m_oStatLog->AddTrace("<<< End of DoJob3\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (returning true => more replicas to process)");
+				return true;
+			}
+		}
+		// Job complete!
+		$this->m_oStatLog->Set('status_curr_job', 0);
+		$this->m_oStatLog->Set('status_curr_pos', -1);
+		$this->m_oStatLog->AddTrace("<<< End of DoJob3(\$iMaxReplica = $iMaxReplica, \$iCurrPos = $iCurrPos) (completed)");
+		return false;
+	}
+}
diff --git a/test/GroupByAndFunctions.php b/test/GroupByAndFunctions.php
index 015b8b673..7c43e158d 100644
--- a/test/GroupByAndFunctions.php
+++ b/test/GroupByAndFunctions.php
@@ -1,343 +1,343 @@
-<?php
-// Copyright (c) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-require_once ('../approot.inc.php');
-require_once(APPROOT.'application/application.inc.php');
-require_once(APPROOT.'application/itopwebpage.class.inc.php');
-require_once(APPROOT.'application/startup.inc.php');
-require_once(APPROOT.'application/loginwebpage.class.inc.php');
-
-
-/////////////////////////////////////////////////////////////////////
-// Main program
-//
-LoginWebPage::DoLogin(true); // Check user rights and prompt if needed
-
-
-$sSubmit = utils::ReadParam('submit', '', false, 'raw_data');
-if ($sSubmit != 'Reset')
-{
-	$sOQL = utils::ReadParam('OQL_Request', '', false, 'raw_data');
-}
-else
-{
-	$sOQL = '';
-}
-$bError = false;
-$oP = new iTopWebPage('Database inconsistencies');
-$oP->set_base(utils::GetAbsoluteUrlAppRoot().'test/');
-$oP->set_title('Grouping with functions');
-$oP->add('<div style="padding: 15px;"><h2>Grouping with functions</h2>');
-$oP->add('<div style="padding: 15px; background: #ddd;">');
-try
-{
-	if (!empty($sOQL))
-	{
-		// Getting class attributes
-		$oSearch = DBSearch::FromOQL($sOQL);
-		$aSearches = $oSearch->GetSearches();
-		if ($oSearch instanceof DBUnionSearch)
-		{
-			$sClass = $aSearches[0]->GetClassAlias();
-			$sRealClass = $aSearches[0]->GetClass();
-		}
-		else
-		{
-			$sClass = $oSearch->GetClassAlias();
-			$sRealClass = $oSearch->GetClass();
-		}
-
-		$sGroupBy1 = utils::ReadParam('groupby_1', '');
-		$sGroupBy2 = utils::ReadParam('groupby_2', '');
-		$sOrderBy1 = utils::ReadParam('orderby_1', '');
-		$sOrderBy2 = utils::ReadParam('orderby_2', '');
-
-		$sAttributesOptions1 = '';
-		$sAttributesOptions2 = '';
-		$sAttributesOptions3 = '';
-		$sAttributesOptions4 = '';
-
-		foreach(array('_itop_sum_', '_itop_avg_', '_itop_min_', '_itop_max_', '_itop_count_', 'group1', 'group2') as $sAttCode)
-		{
-			$sAttributesOptions3 .= '<option value="'.$sAttCode.'" '.($sOrderBy1 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
-			$sAttributesOptions4 .= '<option value="'.$sAttCode.'" '.($sOrderBy2 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
-		}
-
-		foreach(MetaModel::ListAttributeDefs($sRealClass) as $sAttCode => $oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if ($oSearch instanceof DBUnionSearch)
-			{
-				foreach($aSearches as $oSubQuery)
-				{
-					$sSubClass = $oSubQuery->GetClass();
-					if (!MetaModel::IsValidAttCode($sSubClass, $sAttCode))
-					{
-						continue 2;
-					}
-				}
-			}
-			$sAttributesOptions1 .= '<option value="'.$sAttCode.'" '.($sGroupBy1 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
-			$sAttributesOptions2 .= '<option value="'.$sAttCode.'" '.($sGroupBy2 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
-		}
-
-		$iLimit = intval(utils::ReadParam('top', '0'));
-
-		$sInvOrder1 = utils::ReadParam('desc1', '');
-		$sCheck1 = ($sInvOrder1 == 'on' ? 'checked' : '');
-
-		$sInvOrder2 = utils::ReadParam('desc2', '');
-		$sCheck2 = ($sInvOrder2 == 'on' ? 'checked' : '');
-
-		$sFuncField = utils::ReadParam('funcfield', '');
-
-		$sFuncFieldOption = '';
-		foreach(MetaModel::ListAttributeDefs($sRealClass) as $sAttCode => $oAttDef)
-		{
-			// Skip this attribute if not defined in this table
-			if ($oSearch instanceof DBUnionSearch)
-			{
-				foreach($aSearches as $oSubQuery)
-				{
-					$sSubClass = $oSubQuery->GetClass();
-					if (!MetaModel::IsValidAttCode($sSubClass, $sAttCode))
-					{
-						continue 2;
-					}
-				}
-			}
-			switch (get_class($oAttDef))
-			{
-				case 'Integer':
-				case 'AttributeDecimal':
-				case 'AttributeDuration':
-				case 'AttributeSubItem':
-				case 'AttributePercentage':
-					$sFuncFieldOption .= '<option value="'.$sAttCode.'" '.($sFuncField == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
-					break;
-			}
-		}
-	}
-}
-catch (Exception $e)
-{
-	$oP->p('<div class="header_message message_error">'.$e->getMessage().'</div>');
-	$bError = true;
-}
-$oP->add("<div><form>");
-$oP->add("<input type=\"submit\" name=\"submit\" value=\"Reset\">\n");
-$oP->add("</form></div>");
-
-$oP->add("<form>");
-
-$oP->add(
-	<<<EOF
-	<div>
-		<label>Search OQL:</label>
-		<div>
-			<textarea id='OQL_Request' name='OQL_Request' cols='60' rows='5'>$sOQL</textarea>
-		</div>
-	</div>
-EOF
-);
-
-if (!empty($sOQL) && !$bError)
-{
-	$oP->add(
-		<<<EOF
-	<div>
-		<label>Group by:</label>
-		<div>
-			<select id="groupby_1" name="groupby_1">
-				$sAttributesOptions1
-			</select>
-			<select id="groupby_2" name="groupby_2">
-				<option></option>
-				$sAttributesOptions2
-			</select>
-		</div>
-	</div>
-	<div>
-		<label>Order by:</label>
-		<div>
-			<select id="orderby_1" name="orderby_1">$sAttributesOptions3</select>
-			<label>Inv order</label><input type="checkbox" name="desc1" $sCheck1/>
-		</div>
-		<div>
-			<select id="orderby_2" name="orderby_2">
-				<option></option>
-				$sAttributesOptions4
-			</select>
-			<label>Inv order</label><input type="checkbox" name="desc2" $sCheck2/>
-		</div>
-	</div>
-	<div>
-		<label>Functions on:</label>
-		<div>
-			<select id="funcfield" name="funcfield">$sFuncFieldOption</select>
-		</div>
-	</div>
-	<div>
-		<label>Top:</label>
-		<div><input type="text" id="top" name="top" value="$iLimit"/>
-		</div>
-	</div>
-
-EOF
-	);
-}
-
-$oP->add("<input type=\"submit\" name=\"submit\" value=\"Search\">\n");
-
-$oP->add("</form>");
-
-$sSQL = '';
-
-
-if (empty($sOQL) || empty($sGroupBy1))
-{
-	$oP->output();
-	return;
-}
-try
-{
-	$iLimitStart = 0;
-	$aOrderBy = array();
-	if (!empty($sOrderBy1))
-	{
-		$aOrderBy[$sOrderBy1] = ($sInvOrder1 != 'on');
-	}
-	if (!empty($sOrderBy2))
-	{
-		$aOrderBy[$sOrderBy2] = ($sInvOrder2 != 'on');
-	}
-
-	$aGroupBy = array();
-	$oExpr1 = Expression::FromOQL($sClass.'.'.$sGroupBy1);
-	$aGroupBy["group1"] = $oExpr1;
-
-	if (!empty($sGroupBy2))
-	{
-		$oExpr2 = Expression::FromOQL($sClass.'.'.$sGroupBy2);
-		$aGroupBy["group2"] = $oExpr2;
-	}
-
-	$aArgs = array();
-
-	if (empty($sFuncField))
-	{
-		$aFunctions = array();
-	}
-	else
-	{
-		$oTimeExpr = Expression::FromOQL($sClass.'.'.$sFuncField);
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-	}
-
-	$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy, $iLimit, $iLimitStart);
-
-	$aRes = CMDBSource::QueryToArray($sSQL);
-
-	// Display results
-	if (!empty($aRes))
-	{
-		$oP->add('<div>');
-		$oP->add('<table class="listResults">');
-		$aLine = $aRes[0];
-		$aCols = array();
-		$oP->add('<tr>');
-		foreach(array_keys($aLine) as $item)
-		{
-			if (!is_numeric($item))
-			{
-				$aCols[] = $item;
-				$oP->add("<th>$item</th>");
-			}
-		}
-		$oP->add('</tr>');
-
-		foreach($aRes as $aLine)
-		{
-			$oP->add('<tr>');
-			foreach($aCols as $sCol)
-			{
-				$oP->add("<td>".$aLine[$sCol]."</td>");
-			}
-			$oP->add('</tr>');
-		}
-
-		$oP->add('</table>');
-		$oP->add('</div>');
-	}
-	else
-	{
-		$oP->add("<p>No Result</p>\n");
-	}
-}
-catch (Exception $e)
-{
-	$oP->p('<div class="header_message message_error">'.$e->getMessage().'</div>');
-	$bError = true;
-}
-
-$oP->add("<div class=\"header_message message_info\">$sSQL</div>\n");
-
-$oP->output();
-
-return;
-
-/*
-echo "<pre>";
-$aClassSelection = MetaModel::GetClasses();
-foreach($aClassSelection as $sClass)
-{
-	if (!MetaModel::HasTable($sClass))
-	{
-		continue;
-	}
-	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-	{
-		// Skip this attribute if not defined in this table
-		if (!MetaModel::IsAttributeOrigin($sClass, $sAttCode))
-		{
-			continue;
-		}
-		switch (get_class($oAttDef))
-		{
-			case 'Integer':
-			case 'AttributeDecimal':
-			case 'AttributeDuration':
-			case 'AttributeSubItem':
-			case 'AttributePercentage':
-			echo "$sClass:$sAttCode = ".get_class($oAttDef)."\n";
-				break;
-		}
-	}
-}
+<?php
+// Copyright (c) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+require_once ('../approot.inc.php');
+require_once(APPROOT.'application/application.inc.php');
+require_once(APPROOT.'application/itopwebpage.class.inc.php');
+require_once(APPROOT.'application/startup.inc.php');
+require_once(APPROOT.'application/loginwebpage.class.inc.php');
+
+
+/////////////////////////////////////////////////////////////////////
+// Main program
+//
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed
+
+
+$sSubmit = utils::ReadParam('submit', '', false, 'raw_data');
+if ($sSubmit != 'Reset')
+{
+	$sOQL = utils::ReadParam('OQL_Request', '', false, 'raw_data');
+}
+else
+{
+	$sOQL = '';
+}
+$bError = false;
+$oP = new iTopWebPage('Database inconsistencies');
+$oP->set_base(utils::GetAbsoluteUrlAppRoot().'test/');
+$oP->set_title('Grouping with functions');
+$oP->add('<div style="padding: 15px;"><h2>Grouping with functions</h2>');
+$oP->add('<div style="padding: 15px; background: #ddd;">');
+try
+{
+	if (!empty($sOQL))
+	{
+		// Getting class attributes
+		$oSearch = DBSearch::FromOQL($sOQL);
+		$aSearches = $oSearch->GetSearches();
+		if ($oSearch instanceof DBUnionSearch)
+		{
+			$sClass = $aSearches[0]->GetClassAlias();
+			$sRealClass = $aSearches[0]->GetClass();
+		}
+		else
+		{
+			$sClass = $oSearch->GetClassAlias();
+			$sRealClass = $oSearch->GetClass();
+		}
+
+		$sGroupBy1 = utils::ReadParam('groupby_1', '');
+		$sGroupBy2 = utils::ReadParam('groupby_2', '');
+		$sOrderBy1 = utils::ReadParam('orderby_1', '');
+		$sOrderBy2 = utils::ReadParam('orderby_2', '');
+
+		$sAttributesOptions1 = '';
+		$sAttributesOptions2 = '';
+		$sAttributesOptions3 = '';
+		$sAttributesOptions4 = '';
+
+		foreach(array('_itop_sum_', '_itop_avg_', '_itop_min_', '_itop_max_', '_itop_count_', 'group1', 'group2') as $sAttCode)
+		{
+			$sAttributesOptions3 .= '<option value="'.$sAttCode.'" '.($sOrderBy1 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
+			$sAttributesOptions4 .= '<option value="'.$sAttCode.'" '.($sOrderBy2 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
+		}
+
+		foreach(MetaModel::ListAttributeDefs($sRealClass) as $sAttCode => $oAttDef)
+		{
+			// Skip this attribute if not defined in this table
+			if ($oSearch instanceof DBUnionSearch)
+			{
+				foreach($aSearches as $oSubQuery)
+				{
+					$sSubClass = $oSubQuery->GetClass();
+					if (!MetaModel::IsValidAttCode($sSubClass, $sAttCode))
+					{
+						continue 2;
+					}
+				}
+			}
+			$sAttributesOptions1 .= '<option value="'.$sAttCode.'" '.($sGroupBy1 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
+			$sAttributesOptions2 .= '<option value="'.$sAttCode.'" '.($sGroupBy2 == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
+		}
+
+		$iLimit = intval(utils::ReadParam('top', '0'));
+
+		$sInvOrder1 = utils::ReadParam('desc1', '');
+		$sCheck1 = ($sInvOrder1 == 'on' ? 'checked' : '');
+
+		$sInvOrder2 = utils::ReadParam('desc2', '');
+		$sCheck2 = ($sInvOrder2 == 'on' ? 'checked' : '');
+
+		$sFuncField = utils::ReadParam('funcfield', '');
+
+		$sFuncFieldOption = '';
+		foreach(MetaModel::ListAttributeDefs($sRealClass) as $sAttCode => $oAttDef)
+		{
+			// Skip this attribute if not defined in this table
+			if ($oSearch instanceof DBUnionSearch)
+			{
+				foreach($aSearches as $oSubQuery)
+				{
+					$sSubClass = $oSubQuery->GetClass();
+					if (!MetaModel::IsValidAttCode($sSubClass, $sAttCode))
+					{
+						continue 2;
+					}
+				}
+			}
+			switch (get_class($oAttDef))
+			{
+				case 'Integer':
+				case 'AttributeDecimal':
+				case 'AttributeDuration':
+				case 'AttributeSubItem':
+				case 'AttributePercentage':
+					$sFuncFieldOption .= '<option value="'.$sAttCode.'" '.($sFuncField == $sAttCode ? 'selected' : '').'>'.$sAttCode.'</option>';
+					break;
+			}
+		}
+	}
+}
+catch (Exception $e)
+{
+	$oP->p('<div class="header_message message_error">'.$e->getMessage().'</div>');
+	$bError = true;
+}
+$oP->add("<div><form>");
+$oP->add("<input type=\"submit\" name=\"submit\" value=\"Reset\">\n");
+$oP->add("</form></div>");
+
+$oP->add("<form>");
+
+$oP->add(
+	<<<EOF
+	<div>
+		<label>Search OQL:</label>
+		<div>
+			<textarea id='OQL_Request' name='OQL_Request' cols='60' rows='5'>$sOQL</textarea>
+		</div>
+	</div>
+EOF
+);
+
+if (!empty($sOQL) && !$bError)
+{
+	$oP->add(
+		<<<EOF
+	<div>
+		<label>Group by:</label>
+		<div>
+			<select id="groupby_1" name="groupby_1">
+				$sAttributesOptions1
+			</select>
+			<select id="groupby_2" name="groupby_2">
+				<option></option>
+				$sAttributesOptions2
+			</select>
+		</div>
+	</div>
+	<div>
+		<label>Order by:</label>
+		<div>
+			<select id="orderby_1" name="orderby_1">$sAttributesOptions3</select>
+			<label>Inv order</label><input type="checkbox" name="desc1" $sCheck1/>
+		</div>
+		<div>
+			<select id="orderby_2" name="orderby_2">
+				<option></option>
+				$sAttributesOptions4
+			</select>
+			<label>Inv order</label><input type="checkbox" name="desc2" $sCheck2/>
+		</div>
+	</div>
+	<div>
+		<label>Functions on:</label>
+		<div>
+			<select id="funcfield" name="funcfield">$sFuncFieldOption</select>
+		</div>
+	</div>
+	<div>
+		<label>Top:</label>
+		<div><input type="text" id="top" name="top" value="$iLimit"/>
+		</div>
+	</div>
+
+EOF
+	);
+}
+
+$oP->add("<input type=\"submit\" name=\"submit\" value=\"Search\">\n");
+
+$oP->add("</form>");
+
+$sSQL = '';
+
+
+if (empty($sOQL) || empty($sGroupBy1))
+{
+	$oP->output();
+	return;
+}
+try
+{
+	$iLimitStart = 0;
+	$aOrderBy = array();
+	if (!empty($sOrderBy1))
+	{
+		$aOrderBy[$sOrderBy1] = ($sInvOrder1 != 'on');
+	}
+	if (!empty($sOrderBy2))
+	{
+		$aOrderBy[$sOrderBy2] = ($sInvOrder2 != 'on');
+	}
+
+	$aGroupBy = array();
+	$oExpr1 = Expression::FromOQL($sClass.'.'.$sGroupBy1);
+	$aGroupBy["group1"] = $oExpr1;
+
+	if (!empty($sGroupBy2))
+	{
+		$oExpr2 = Expression::FromOQL($sClass.'.'.$sGroupBy2);
+		$aGroupBy["group2"] = $oExpr2;
+	}
+
+	$aArgs = array();
+
+	if (empty($sFuncField))
+	{
+		$aFunctions = array();
+	}
+	else
+	{
+		$oTimeExpr = Expression::FromOQL($sClass.'.'.$sFuncField);
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+	}
+
+	$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy, $iLimit, $iLimitStart);
+
+	$aRes = CMDBSource::QueryToArray($sSQL);
+
+	// Display results
+	if (!empty($aRes))
+	{
+		$oP->add('<div>');
+		$oP->add('<table class="listResults">');
+		$aLine = $aRes[0];
+		$aCols = array();
+		$oP->add('<tr>');
+		foreach(array_keys($aLine) as $item)
+		{
+			if (!is_numeric($item))
+			{
+				$aCols[] = $item;
+				$oP->add("<th>$item</th>");
+			}
+		}
+		$oP->add('</tr>');
+
+		foreach($aRes as $aLine)
+		{
+			$oP->add('<tr>');
+			foreach($aCols as $sCol)
+			{
+				$oP->add("<td>".$aLine[$sCol]."</td>");
+			}
+			$oP->add('</tr>');
+		}
+
+		$oP->add('</table>');
+		$oP->add('</div>');
+	}
+	else
+	{
+		$oP->add("<p>No Result</p>\n");
+	}
+}
+catch (Exception $e)
+{
+	$oP->p('<div class="header_message message_error">'.$e->getMessage().'</div>');
+	$bError = true;
+}
+
+$oP->add("<div class=\"header_message message_info\">$sSQL</div>\n");
+
+$oP->output();
+
+return;
+
+/*
+echo "<pre>";
+$aClassSelection = MetaModel::GetClasses();
+foreach($aClassSelection as $sClass)
+{
+	if (!MetaModel::HasTable($sClass))
+	{
+		continue;
+	}
+	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+	{
+		// Skip this attribute if not defined in this table
+		if (!MetaModel::IsAttributeOrigin($sClass, $sAttCode))
+		{
+			continue;
+		}
+		switch (get_class($oAttDef))
+		{
+			case 'Integer':
+			case 'AttributeDecimal':
+			case 'AttributeDuration':
+			case 'AttributeSubItem':
+			case 'AttributePercentage':
+			echo "$sClass:$sAttCode = ".get_class($oAttDef)."\n";
+				break;
+		}
+	}
+}
 */
\ No newline at end of file
diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php
index 0123f3bae..b542f2c62 100644
--- a/test/ItopDataTestCase.php
+++ b/test/ItopDataTestCase.php
@@ -1,577 +1,577 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-namespace Combodo\iTop\Test\UnitTest;
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 20/11/2017
- * Time: 11:21
- */
-
-use ArchivedObjectException;
-use CMDBSource;
-use Contact;
-use DBObject;
-use DBObjectSet;
-use Exception;
-use Farm;
-use FunctionalCI;
-use Hypervisor;
-use lnkContactToFunctionalCI;
-use MetaModel;
-use Person;
-use Server;
-use Ticket;
-use URP_UserProfile;
-use VirtualHost;
-use VirtualMachine;
-
-
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class ItopDataTestCase extends ItopTestCase
-{
-	protected $testOrgId;
-
-	/**
-	 * @throws Exception
-	 */
-	protected function setUp()
-	{
-		parent::setUp();
-		//require_once(APPROOT.'/application/startup.inc.php');
-
-        require_once(APPROOT.'/core/cmdbobject.class.inc.php');
-        require_once(APPROOT.'/application/utils.inc.php');
-        require_once(APPROOT.'/core/contexttag.class.inc.php');
-        $sEnv = 'production';
-        $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
-        MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv);
-
-		CMDBSource::Query('START TRANSACTION');
-
-		// Create a specific organization for the tests
-		$oOrg = $this->CreateOrganization('UnitTestOrganization');
-		$this->testOrgId = $oOrg->GetKey();
-	}
-
-    /**
-     * @throws Exception
-     */
-	protected  function tearDown()
-	{
-		CMDBSource::Query('ROLLBACK');
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getTestOrgId()
-	{
-		return $this->testOrgId;
-	}
-
-    /////////////////////////////////////////////////////////////////////////////
-    /// Database Utilities
-    /////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param string $sClass
-     * @param array $aParams
-     * @return DBObject
-     * @throws Exception
-     */
-    protected static function createObject($sClass, $aParams)
-    {
-        $oMyObj = MetaModel::NewObject($sClass);
-        foreach($aParams as $sAttCode => $oValue)
-        {
-            $oMyObj->Set($sAttCode, $oValue);
-        }
-        $oMyObj->DBInsert();
-        return $oMyObj;
-    }
-
-	/**
-	 * @param string $sClass
-	 * @param $iKey
-	 * @param array $aParams
-	 *
-	 * @return DBObject
-	 * @throws \ArchivedObjectException
-	 * @throws \CoreException
-	 * @throws \CoreUnexpectedValue
-	 */
-	protected static function updateObject($sClass, $iKey, $aParams)
-	{
-		$oMyObj = MetaModel::GetObject($sClass, $iKey);
-		foreach($aParams as $sAttCode => $oValue)
-		{
-			$oMyObj->Set($sAttCode, $oValue);
-		}
-		$oMyObj->DBUpdate();
-		return $oMyObj;
-	}
-
-	/**
-	 * Create an Organization in database
-	 *
-	 * @param string $sName
-	 * @return Organization
-	 * @throws Exception
-	 */
-	protected function CreateOrganization($sName)
-	{
-		/** @var Organization $oObj */
-		$oObj = self::createObject('Organization', array(
-			'name' => $sName,
-		));
-		$this->debug("\nCreated Organization {$oObj->Get('name')}");
-		return $oObj;
-	}
-
-    /**
-     * Create a Ticket in database
-     *
-     * @param int $iNum
-     * @return Ticket
-     * @throws Exception
-     */
-    protected function CreateTicket($iNum)
-    {
-        /** @var Ticket $oTicket */
-        $oTicket = self::createObject('UserRequest', array(
-            'ref' => 'Ticket_'.$iNum,
-            'title' => 'BUG 789_'.$iNum,
-	        //'request_type' => 'incident',
-            'description' => 'method UpdateImpactedItems() reconstruit le lnkContactToTicket donc impossible de rajouter des champs dans cette classe',
-            'org_id' => $this->getTestOrgId(),
-        ));
-        $this->debug("\nCreated {$oTicket->Get('title')} ({$oTicket->Get('ref')})");
-        return $oTicket;
-    }
-
-	/**
-	 * Create a UserRequest in database
-	 *
-	 * @param int $iNum
-	 * @param int $iTimeSpent
-	 * @param int $iOrgId
-	 * @param int $iCallerId
-	 * @return UserRequest
-	 * @throws Exception
-	 */
-	protected function CreateUserRequest($iNum, $iTimeSpent = 0, $iOrgId = 0, $iCallerId = 0)
-	{
-		/** @var UserRequest $oTicket */
-		$oTicket = self::createObject('UserRequest', array(
-			'ref' => 'Ticket_'.$iNum,
-			'title' => 'BUG 1161_'.$iNum,
-			//'request_type' => 'incident',
-			'description' => 'Add aggregate functions',
-			'time_spent' => $iTimeSpent,
-			'caller_id' => $iCallerId,
-			'org_id' => ($iOrgId == 0 ? $this->getTestOrgId() : $iOrgId),
-		));
-		$this->debug("\nCreated {$oTicket->Get('title')} ({$oTicket->Get('ref')})");
-		return $oTicket;
-	}
-
-	/**
-	 * Create a Server in database
-	 *
-	 * @param int $iNum
-	 * @param null $iRackUnit
-	 *
-	 * @return Server
-	 * @throws \Exception
-	 */
-	protected function CreateServer($iNum, $iRackUnit = null)
-	{
-		/** @var Server $oServer */
-		$oServer = self::createObject('Server', array(
-			'name' => 'Server_'.$iNum,
-			'org_id' => $this->getTestOrgId(),
-			'nb_u' => $iRackUnit,
-		));
-		$this->debug("Created {$oServer->GetName()} ({$oServer->GetKey()})");
-		return $oServer;
-	}
-
-	/**
-	 * Create a PhysicalInterface in database
-	 * @param int $iNum
-	 * @param int $iSpeed
-	 * @param int $iConnectableCiId
-	 * @return DBObject
-	 * @throws Exception
-	 */
-	protected function CreatePhysicalInterface($iNum, $iSpeed, $iConnectableCiId)
-	{
-		$oObj = self::createObject('PhysicalInterface', array(
-			'name' => "$iNum",
-			'speed' => $iSpeed,
-			'connectableci_id' => $iConnectableCiId,
-		));
-		$this->debug("Created {$oObj->GetName()} ({$oObj->GetKey()})");
-		return $oObj;
-	}
-
-	/**
-	 * Create a FiberChannelInterface in database
-	 * @param int $iNum
-	 * @param int $iSpeed
-	 * @param int $iConnectableCiId
-	 * @return DBObject
-	 * @throws Exception
-	 */
-	protected function CreateFiberChannelInterface($iNum, $iSpeed, $iConnectableCiId)
-	{
-		$oObj = self::createObject('FiberChannelInterface', array(
-			'name' => "$iNum",
-			'speed' => $iSpeed,
-			'datacenterdevice_id' => $iConnectableCiId,
-		));
-		$this->debug("Created {$oObj->GetName()} ({$oObj->GetKey()})");
-		return $oObj;
-	}
-
-	/**
-	 * Create a Person in database
-	 * @param int $iNum
-	 * @param int $iOrgId
-	 * @return Person
-	 * @throws Exception
-	 */
-    protected function CreatePerson($iNum, $iOrgId = 0)
-    {
-        /** @var Person $oPerson */
-        $oPerson = self::createObject('Person', array(
-            'name' => 'Person_'.$iNum,
-            'first_name' => 'Test',
-            'org_id' => ($iOrgId == 0 ? $this->getTestOrgId() : $iOrgId),
-        ));
-        $this->debug("Created {$oPerson->GetName()} ({$oPerson->GetKey()})");
-        return $oPerson;
-    }
-
-	/**
-	 * @param string $sLogin
-	 * @param int $iProfileId
-	 * @return \DBObject
-	 * @throws Exception
-	 */
-	protected function CreateUser($sLogin, $iProfileId)
-    {
-	    $oUserProfile = new URP_UserProfile();
-	    $oUserProfile->Set('profileid', $iProfileId);
-	    $oUserProfile->Set('reason', 'UNIT Tests');
-	    $oSet = DBObjectSet::FromObject($oUserProfile);
-    	$oUser = self::createObject('UserLocal', array(
-		    'contactid' => 2,
-		    'login' => $sLogin,
-		    'password' => $sLogin,
-		    'language' => 'EN US',
-		    'profile_list' => $oSet,
-	    ));
-	    $this->debug("Created {$oUser->GetName()} ({$oUser->GetKey()})");
-	    return $oUser;
-    }
-
-
-    /**
-     * Create a Hypervisor in database
-     * @param int $iNum
-     * @param Server $oServer
-     * @param Farm $oFarm
-     * @return Hypervisor
-     * @throws Exception
-     */
-    protected function CreateHypervisor($iNum, $oServer, $oFarm = null)
-    {
-        /** @var Hypervisor $oHypervisor */
-        $oHypervisor = self::createObject('Hypervisor', array(
-            'name' => 'Hypervisor_'.$iNum,
-            'org_id' => $this->getTestOrgId(),
-            'server_id' => $oServer->GetKey(),
-            'farm_id' => is_null($oFarm) ? 0 : $oFarm->GetKey(),
-        ));
-        if (is_null($oFarm))
-        {
-            $this->debug("Created {$oHypervisor->GetName()} ({$oHypervisor->GetKey()}) on {$oServer->GetName()}");
-        }
-        else
-        {
-            $this->debug("Created {$oHypervisor->GetName()} ({$oHypervisor->GetKey()}) on {$oServer->GetName()} part of {$oFarm->GetName()}");
-        }
-        return $oHypervisor;
-    }
-
-    /**
-     * Create a Farm in database
-     * @param int $iNum
-     * @param string $sRedundancy
-     * @return Farm
-     * @throws Exception
-     */
-    protected function CreateFarm($iNum, $sRedundancy = '1')
-    {
-        /** @var Farm $oFarm */
-        $oFarm = self::createObject('Farm', array(
-            'name' => 'Farm_'.$iNum,
-            'org_id' => $this->getTestOrgId(),
-            'redundancy' => $sRedundancy,
-        ));
-        $this->debug("Created {$oFarm->GetName()} ({$oFarm->GetKey()}) redundancy $sRedundancy");
-        return $oFarm;
-    }
-
-    /**
-     * Create a VM in database
-     * @param int $iNum
-     * @param VirtualHost $oVirtualHost
-     * @return VirtualMachine
-     * @throws Exception
-     */
-    protected function CreateVirtualMachine($iNum, $oVirtualHost)
-    {
-        /** @var VirtualMachine $oVirtualMachine */
-        $oVirtualMachine = self::createObject('VirtualMachine', array(
-            'name' => 'VirtualMachine_'.$iNum,
-            'org_id' => $this->getTestOrgId(),
-            'virtualhost_id' => $oVirtualHost->GetKey(),
-        ));
-        $this->debug("Created {$oVirtualMachine->GetName()} ({$oVirtualMachine->GetKey()}) on {$oVirtualHost->GetName()}");
-        return $oVirtualMachine;
-    }
-
-
-    /**
-     * Add a link between a contact and a CI.
-     * The database is not updated.
-     *
-     * @param Contact $oContact
-     * @param FunctionalCI $oCI
-     * @return lnkContactToFunctionalCI
-     * @throws Exception
-     */
-    protected function AddContactToCI($oContact, $oCI)
-    {
-        $oNewLink = new lnkContactToFunctionalCI();
-        $oNewLink->Set('contact_id', $oContact->GetKey());
-        $oContacts = $oCI->Get('contacts_list');
-        $oContacts->AddItem($oNewLink);
-        $oCI->Set('contacts_list', $oContacts);
-
-        $this->debug("Added {$oContact->GetName()} to {$oCI->GetName()}");
-        return $oNewLink;
-    }
-
-    /**
-     * Remove a link between a contact and a CI.
-     * The database is not updated.
-     *
-     * @param Contact $oContact
-     * @param FunctionalCI $oCI
-     * @throws Exception
-     */
-    protected function RemoveContactFromCI($oContact, $oCI)
-    {
-        $oContacts = $oCI->Get('contacts_list');
-        foreach($oContacts as $oLnk)
-        {
-            if ($oLnk->Get('contact_id') == $oContact->GetKey())
-            {
-                $oContacts->RemoveItem($oLnk->GetKey());
-                $oCI->Set('contacts_list', $oContacts);
-                $this->debug("Removed {$oContact->GetName()} from {$oCI->Get('name')}");
-                return;
-            }
-        }
-    }
-
-    /**
-     * Add a link between a CI and a Ticket.
-     * The database is not updated.
-     *
-     * @param FunctionalCI $oCI
-     * @param Ticket $oTicket
-     * @param string $sImpactCode
-     * @throws Exception
-     */
-    protected function AddCIToTicket($oCI, $oTicket, $sImpactCode)
-    {
-        $oNewLink = new \lnkFunctionalCIToTicket();
-        $oNewLink->Set('functionalci_id', $oCI->GetKey());
-        $oNewLink->Set('impact_code', $sImpactCode);
-        $oCIs = $oTicket->Get('functionalcis_list');
-        $oCIs->AddItem($oNewLink);
-        $oTicket->Set('functionalcis_list', $oCIs);
-
-        $this->debug("Added {$oCI->GetName()} to {$oTicket->Get('ref')} with {$sImpactCode}");
-        return array($oCI->GetKey() => $sImpactCode);
-    }
-
-    /**
-     * Remove a link between a CI and a Ticket.
-     * The database is not updated.
-     *
-     * @param FunctionalCI $oCI
-     * @param Ticket $oTicket
-     * @throws Exception
-     */
-    protected function RemoveCIFromTicket($oCI, $oTicket)
-    {
-        $oCIs = $oTicket->Get('functionalcis_list');
-        foreach($oCIs as $oLnk)
-        {
-            if ($oLnk->Get('functionalci_id') == $oCI->GetKey())
-            {
-                $sImpactCode = $oLnk->Get('impact_code');
-                $oCIs->RemoveItem($oLnk->GetKey());
-                $oTicket->Set('functionalcis_list', $oCIs);
-                $this->debug("Removed {$oCI->GetName()} from {$oTicket->Get('ref')} ({$sImpactCode})");
-                return;
-            }
-        }
-        $this->debug("ERROR: {$oCI->GetName()} not attached to {$oTicket->Get('ref')}");
-        $this->assertTrue(false);
-    }
-
-    /**
-     * Add a link between a Contact and a Ticket.
-     * The database is not updated.
-     *
-     * @param Contact $oContact
-     * @param Ticket $oTicket
-     * @param string $sRoleCode
-     * @param array $aParams
-     * @throws Exception
-     */
-    protected function AddContactToTicket($oContact, $oTicket, $sRoleCode, $aParams = array())
-    {
-        $oNewLink = new \lnkContactToTicket();
-        $oNewLink->Set('contact_id', $oContact->GetKey());
-        $oNewLink->Set('role_code', $sRoleCode);
-        foreach($aParams as $sAttCode => $oValue)
-        {
-            $oNewLink->Set($sAttCode, $oValue);
-        }
-        $oCIs = $oTicket->Get('contacts_list');
-        $oCIs->AddItem($oNewLink);
-        $oTicket->Set('contacts_list', $oCIs);
-
-        $this->debug("Added {$oContact->GetName()} to {$oTicket->Get('ref')} with {$sRoleCode}");
-        return array($oContact->GetKey() => $sRoleCode);
-    }
-
-    /**
-     * Remove a link between a Contact and a Ticket.
-     * The database is not updated.
-     *
-     * @param Contact $oContact
-     * @param Ticket $oTicket
-     * @throws Exception
-     */
-    protected function RemoveContactFromTicket($oContact, $oTicket)
-    {
-        $oContacts = $oTicket->Get('contacts_list');
-        foreach($oContacts as $oLnk)
-        {
-            if ($oLnk->Get('contact_id') == $oContact->GetKey())
-            {
-                $sRoleCode = $oLnk->Get('role_code');
-                $oContacts->RemoveItem($oLnk->GetKey());
-                $oTicket->Set('contacts_list', $oContacts);
-                $this->debug("Removed {$oContact->GetName()} from {$oTicket->Get('ref')} ({$sRoleCode})");
-                return;
-            }
-        }
-    }
-
-    /**
-     * Reload a Ticket from the database.
-     *
-     * @param DBObject $oObject
-     * @throws ArchivedObjectException
-     * @throws Exception
-     */
-    protected function ReloadObject(&$oObject)
-    {
-        $oObject = MetaModel::GetObject(get_class($oObject), $oObject->GetKey());
-        return $oObject;
-    }
-
-    /**
-     * Check or Display the CI list of a Ticket.
-     *
-     * @param Ticket $oTicket
-     * @param array $aWaitedCIList { iCIId => sImpactCode }
-     * @throws Exception
-     */
-    protected function CheckFunctionalCIList($oTicket, $aWaitedCIList = array())
-    {
-        $this->debug("\nResulting functionalcis_list {$oTicket->Get('ref')} ({$oTicket->Get('functionalcis_list')->Count()}):");
-        foreach($oTicket->Get('functionalcis_list') as $oLnk)
-        {
-            $this->debug($oLnk->Get('functionalci_name')." => ".$oLnk->Get('impact_code')."");
-            $iId = $oLnk->Get('functionalci_id');
-            if (!empty($aWaitedCIList))
-            {
-                $this->assertTrue(array_key_exists($iId, $aWaitedCIList));
-                $this->assertEquals($aWaitedCIList[$iId], $oLnk->Get('impact_code'));
-            }
-        }
-    }
-
-    /**
-     * Check or Display the Contact list of a DBObject (having a contacts_list).
-     * Can also control other attributes of the link.
-     *
-     * @param Ticket $oTicket
-     * @param array $aWaitedContactList { iContactId => array(attcode => value) }
-     * @throws Exception
-     */
-    protected function CheckContactList($oTicket, $aWaitedContactList = array())
-    {
-        $this->debug("\nResulting contacts_list {$oTicket->Get('ref')} ({$oTicket->Get('contacts_list')->Count()}):");
-        foreach($oTicket->Get('contacts_list') as $oLnk)
-        {
-            $this->debug($oLnk->Get('contact_id_friendlyname')." => ".$oLnk->Get('role_code'));
-            $iId = $oLnk->Get('contact_id');
-            if (!empty($aWaitedContactList))
-            {
-                $this->assertTrue(array_key_exists($iId, $aWaitedContactList));
-                foreach($aWaitedContactList[$iId] as $sAttCode => $oValue)
-                {
-                    if (MetaModel::IsValidAttCode(get_class($oTicket), $sAttCode))
-                    {
-                        $this->assertEquals($oValue, $oLnk->Get($sAttCode));
-                    }
-                }
-            }
-        }
-    }
-
-
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+namespace Combodo\iTop\Test\UnitTest;
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 20/11/2017
+ * Time: 11:21
+ */
+
+use ArchivedObjectException;
+use CMDBSource;
+use Contact;
+use DBObject;
+use DBObjectSet;
+use Exception;
+use Farm;
+use FunctionalCI;
+use Hypervisor;
+use lnkContactToFunctionalCI;
+use MetaModel;
+use Person;
+use Server;
+use Ticket;
+use URP_UserProfile;
+use VirtualHost;
+use VirtualMachine;
+
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class ItopDataTestCase extends ItopTestCase
+{
+	protected $testOrgId;
+
+	/**
+	 * @throws Exception
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+		//require_once(APPROOT.'/application/startup.inc.php');
+
+        require_once(APPROOT.'/core/cmdbobject.class.inc.php');
+        require_once(APPROOT.'/application/utils.inc.php');
+        require_once(APPROOT.'/core/contexttag.class.inc.php');
+        $sEnv = 'production';
+        $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE;
+        MetaModel::Startup($sConfigFile, false /* $bModelOnly */, true /* $bAllowCache */, false /* $bTraceSourceFiles */, $sEnv);
+
+		CMDBSource::Query('START TRANSACTION');
+
+		// Create a specific organization for the tests
+		$oOrg = $this->CreateOrganization('UnitTestOrganization');
+		$this->testOrgId = $oOrg->GetKey();
+	}
+
+    /**
+     * @throws Exception
+     */
+	protected  function tearDown()
+	{
+		CMDBSource::Query('ROLLBACK');
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getTestOrgId()
+	{
+		return $this->testOrgId;
+	}
+
+    /////////////////////////////////////////////////////////////////////////////
+    /// Database Utilities
+    /////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * @param string $sClass
+     * @param array $aParams
+     * @return DBObject
+     * @throws Exception
+     */
+    protected static function createObject($sClass, $aParams)
+    {
+        $oMyObj = MetaModel::NewObject($sClass);
+        foreach($aParams as $sAttCode => $oValue)
+        {
+            $oMyObj->Set($sAttCode, $oValue);
+        }
+        $oMyObj->DBInsert();
+        return $oMyObj;
+    }
+
+	/**
+	 * @param string $sClass
+	 * @param $iKey
+	 * @param array $aParams
+	 *
+	 * @return DBObject
+	 * @throws \ArchivedObjectException
+	 * @throws \CoreException
+	 * @throws \CoreUnexpectedValue
+	 */
+	protected static function updateObject($sClass, $iKey, $aParams)
+	{
+		$oMyObj = MetaModel::GetObject($sClass, $iKey);
+		foreach($aParams as $sAttCode => $oValue)
+		{
+			$oMyObj->Set($sAttCode, $oValue);
+		}
+		$oMyObj->DBUpdate();
+		return $oMyObj;
+	}
+
+	/**
+	 * Create an Organization in database
+	 *
+	 * @param string $sName
+	 * @return Organization
+	 * @throws Exception
+	 */
+	protected function CreateOrganization($sName)
+	{
+		/** @var Organization $oObj */
+		$oObj = self::createObject('Organization', array(
+			'name' => $sName,
+		));
+		$this->debug("\nCreated Organization {$oObj->Get('name')}");
+		return $oObj;
+	}
+
+    /**
+     * Create a Ticket in database
+     *
+     * @param int $iNum
+     * @return Ticket
+     * @throws Exception
+     */
+    protected function CreateTicket($iNum)
+    {
+        /** @var Ticket $oTicket */
+        $oTicket = self::createObject('UserRequest', array(
+            'ref' => 'Ticket_'.$iNum,
+            'title' => 'BUG 789_'.$iNum,
+	        //'request_type' => 'incident',
+            'description' => 'method UpdateImpactedItems() reconstruit le lnkContactToTicket donc impossible de rajouter des champs dans cette classe',
+            'org_id' => $this->getTestOrgId(),
+        ));
+        $this->debug("\nCreated {$oTicket->Get('title')} ({$oTicket->Get('ref')})");
+        return $oTicket;
+    }
+
+	/**
+	 * Create a UserRequest in database
+	 *
+	 * @param int $iNum
+	 * @param int $iTimeSpent
+	 * @param int $iOrgId
+	 * @param int $iCallerId
+	 * @return UserRequest
+	 * @throws Exception
+	 */
+	protected function CreateUserRequest($iNum, $iTimeSpent = 0, $iOrgId = 0, $iCallerId = 0)
+	{
+		/** @var UserRequest $oTicket */
+		$oTicket = self::createObject('UserRequest', array(
+			'ref' => 'Ticket_'.$iNum,
+			'title' => 'BUG 1161_'.$iNum,
+			//'request_type' => 'incident',
+			'description' => 'Add aggregate functions',
+			'time_spent' => $iTimeSpent,
+			'caller_id' => $iCallerId,
+			'org_id' => ($iOrgId == 0 ? $this->getTestOrgId() : $iOrgId),
+		));
+		$this->debug("\nCreated {$oTicket->Get('title')} ({$oTicket->Get('ref')})");
+		return $oTicket;
+	}
+
+	/**
+	 * Create a Server in database
+	 *
+	 * @param int $iNum
+	 * @param null $iRackUnit
+	 *
+	 * @return Server
+	 * @throws \Exception
+	 */
+	protected function CreateServer($iNum, $iRackUnit = null)
+	{
+		/** @var Server $oServer */
+		$oServer = self::createObject('Server', array(
+			'name' => 'Server_'.$iNum,
+			'org_id' => $this->getTestOrgId(),
+			'nb_u' => $iRackUnit,
+		));
+		$this->debug("Created {$oServer->GetName()} ({$oServer->GetKey()})");
+		return $oServer;
+	}
+
+	/**
+	 * Create a PhysicalInterface in database
+	 * @param int $iNum
+	 * @param int $iSpeed
+	 * @param int $iConnectableCiId
+	 * @return DBObject
+	 * @throws Exception
+	 */
+	protected function CreatePhysicalInterface($iNum, $iSpeed, $iConnectableCiId)
+	{
+		$oObj = self::createObject('PhysicalInterface', array(
+			'name' => "$iNum",
+			'speed' => $iSpeed,
+			'connectableci_id' => $iConnectableCiId,
+		));
+		$this->debug("Created {$oObj->GetName()} ({$oObj->GetKey()})");
+		return $oObj;
+	}
+
+	/**
+	 * Create a FiberChannelInterface in database
+	 * @param int $iNum
+	 * @param int $iSpeed
+	 * @param int $iConnectableCiId
+	 * @return DBObject
+	 * @throws Exception
+	 */
+	protected function CreateFiberChannelInterface($iNum, $iSpeed, $iConnectableCiId)
+	{
+		$oObj = self::createObject('FiberChannelInterface', array(
+			'name' => "$iNum",
+			'speed' => $iSpeed,
+			'datacenterdevice_id' => $iConnectableCiId,
+		));
+		$this->debug("Created {$oObj->GetName()} ({$oObj->GetKey()})");
+		return $oObj;
+	}
+
+	/**
+	 * Create a Person in database
+	 * @param int $iNum
+	 * @param int $iOrgId
+	 * @return Person
+	 * @throws Exception
+	 */
+    protected function CreatePerson($iNum, $iOrgId = 0)
+    {
+        /** @var Person $oPerson */
+        $oPerson = self::createObject('Person', array(
+            'name' => 'Person_'.$iNum,
+            'first_name' => 'Test',
+            'org_id' => ($iOrgId == 0 ? $this->getTestOrgId() : $iOrgId),
+        ));
+        $this->debug("Created {$oPerson->GetName()} ({$oPerson->GetKey()})");
+        return $oPerson;
+    }
+
+	/**
+	 * @param string $sLogin
+	 * @param int $iProfileId
+	 * @return \DBObject
+	 * @throws Exception
+	 */
+	protected function CreateUser($sLogin, $iProfileId)
+    {
+	    $oUserProfile = new URP_UserProfile();
+	    $oUserProfile->Set('profileid', $iProfileId);
+	    $oUserProfile->Set('reason', 'UNIT Tests');
+	    $oSet = DBObjectSet::FromObject($oUserProfile);
+    	$oUser = self::createObject('UserLocal', array(
+		    'contactid' => 2,
+		    'login' => $sLogin,
+		    'password' => $sLogin,
+		    'language' => 'EN US',
+		    'profile_list' => $oSet,
+	    ));
+	    $this->debug("Created {$oUser->GetName()} ({$oUser->GetKey()})");
+	    return $oUser;
+    }
+
+
+    /**
+     * Create a Hypervisor in database
+     * @param int $iNum
+     * @param Server $oServer
+     * @param Farm $oFarm
+     * @return Hypervisor
+     * @throws Exception
+     */
+    protected function CreateHypervisor($iNum, $oServer, $oFarm = null)
+    {
+        /** @var Hypervisor $oHypervisor */
+        $oHypervisor = self::createObject('Hypervisor', array(
+            'name' => 'Hypervisor_'.$iNum,
+            'org_id' => $this->getTestOrgId(),
+            'server_id' => $oServer->GetKey(),
+            'farm_id' => is_null($oFarm) ? 0 : $oFarm->GetKey(),
+        ));
+        if (is_null($oFarm))
+        {
+            $this->debug("Created {$oHypervisor->GetName()} ({$oHypervisor->GetKey()}) on {$oServer->GetName()}");
+        }
+        else
+        {
+            $this->debug("Created {$oHypervisor->GetName()} ({$oHypervisor->GetKey()}) on {$oServer->GetName()} part of {$oFarm->GetName()}");
+        }
+        return $oHypervisor;
+    }
+
+    /**
+     * Create a Farm in database
+     * @param int $iNum
+     * @param string $sRedundancy
+     * @return Farm
+     * @throws Exception
+     */
+    protected function CreateFarm($iNum, $sRedundancy = '1')
+    {
+        /** @var Farm $oFarm */
+        $oFarm = self::createObject('Farm', array(
+            'name' => 'Farm_'.$iNum,
+            'org_id' => $this->getTestOrgId(),
+            'redundancy' => $sRedundancy,
+        ));
+        $this->debug("Created {$oFarm->GetName()} ({$oFarm->GetKey()}) redundancy $sRedundancy");
+        return $oFarm;
+    }
+
+    /**
+     * Create a VM in database
+     * @param int $iNum
+     * @param VirtualHost $oVirtualHost
+     * @return VirtualMachine
+     * @throws Exception
+     */
+    protected function CreateVirtualMachine($iNum, $oVirtualHost)
+    {
+        /** @var VirtualMachine $oVirtualMachine */
+        $oVirtualMachine = self::createObject('VirtualMachine', array(
+            'name' => 'VirtualMachine_'.$iNum,
+            'org_id' => $this->getTestOrgId(),
+            'virtualhost_id' => $oVirtualHost->GetKey(),
+        ));
+        $this->debug("Created {$oVirtualMachine->GetName()} ({$oVirtualMachine->GetKey()}) on {$oVirtualHost->GetName()}");
+        return $oVirtualMachine;
+    }
+
+
+    /**
+     * Add a link between a contact and a CI.
+     * The database is not updated.
+     *
+     * @param Contact $oContact
+     * @param FunctionalCI $oCI
+     * @return lnkContactToFunctionalCI
+     * @throws Exception
+     */
+    protected function AddContactToCI($oContact, $oCI)
+    {
+        $oNewLink = new lnkContactToFunctionalCI();
+        $oNewLink->Set('contact_id', $oContact->GetKey());
+        $oContacts = $oCI->Get('contacts_list');
+        $oContacts->AddItem($oNewLink);
+        $oCI->Set('contacts_list', $oContacts);
+
+        $this->debug("Added {$oContact->GetName()} to {$oCI->GetName()}");
+        return $oNewLink;
+    }
+
+    /**
+     * Remove a link between a contact and a CI.
+     * The database is not updated.
+     *
+     * @param Contact $oContact
+     * @param FunctionalCI $oCI
+     * @throws Exception
+     */
+    protected function RemoveContactFromCI($oContact, $oCI)
+    {
+        $oContacts = $oCI->Get('contacts_list');
+        foreach($oContacts as $oLnk)
+        {
+            if ($oLnk->Get('contact_id') == $oContact->GetKey())
+            {
+                $oContacts->RemoveItem($oLnk->GetKey());
+                $oCI->Set('contacts_list', $oContacts);
+                $this->debug("Removed {$oContact->GetName()} from {$oCI->Get('name')}");
+                return;
+            }
+        }
+    }
+
+    /**
+     * Add a link between a CI and a Ticket.
+     * The database is not updated.
+     *
+     * @param FunctionalCI $oCI
+     * @param Ticket $oTicket
+     * @param string $sImpactCode
+     * @throws Exception
+     */
+    protected function AddCIToTicket($oCI, $oTicket, $sImpactCode)
+    {
+        $oNewLink = new \lnkFunctionalCIToTicket();
+        $oNewLink->Set('functionalci_id', $oCI->GetKey());
+        $oNewLink->Set('impact_code', $sImpactCode);
+        $oCIs = $oTicket->Get('functionalcis_list');
+        $oCIs->AddItem($oNewLink);
+        $oTicket->Set('functionalcis_list', $oCIs);
+
+        $this->debug("Added {$oCI->GetName()} to {$oTicket->Get('ref')} with {$sImpactCode}");
+        return array($oCI->GetKey() => $sImpactCode);
+    }
+
+    /**
+     * Remove a link between a CI and a Ticket.
+     * The database is not updated.
+     *
+     * @param FunctionalCI $oCI
+     * @param Ticket $oTicket
+     * @throws Exception
+     */
+    protected function RemoveCIFromTicket($oCI, $oTicket)
+    {
+        $oCIs = $oTicket->Get('functionalcis_list');
+        foreach($oCIs as $oLnk)
+        {
+            if ($oLnk->Get('functionalci_id') == $oCI->GetKey())
+            {
+                $sImpactCode = $oLnk->Get('impact_code');
+                $oCIs->RemoveItem($oLnk->GetKey());
+                $oTicket->Set('functionalcis_list', $oCIs);
+                $this->debug("Removed {$oCI->GetName()} from {$oTicket->Get('ref')} ({$sImpactCode})");
+                return;
+            }
+        }
+        $this->debug("ERROR: {$oCI->GetName()} not attached to {$oTicket->Get('ref')}");
+        $this->assertTrue(false);
+    }
+
+    /**
+     * Add a link between a Contact and a Ticket.
+     * The database is not updated.
+     *
+     * @param Contact $oContact
+     * @param Ticket $oTicket
+     * @param string $sRoleCode
+     * @param array $aParams
+     * @throws Exception
+     */
+    protected function AddContactToTicket($oContact, $oTicket, $sRoleCode, $aParams = array())
+    {
+        $oNewLink = new \lnkContactToTicket();
+        $oNewLink->Set('contact_id', $oContact->GetKey());
+        $oNewLink->Set('role_code', $sRoleCode);
+        foreach($aParams as $sAttCode => $oValue)
+        {
+            $oNewLink->Set($sAttCode, $oValue);
+        }
+        $oCIs = $oTicket->Get('contacts_list');
+        $oCIs->AddItem($oNewLink);
+        $oTicket->Set('contacts_list', $oCIs);
+
+        $this->debug("Added {$oContact->GetName()} to {$oTicket->Get('ref')} with {$sRoleCode}");
+        return array($oContact->GetKey() => $sRoleCode);
+    }
+
+    /**
+     * Remove a link between a Contact and a Ticket.
+     * The database is not updated.
+     *
+     * @param Contact $oContact
+     * @param Ticket $oTicket
+     * @throws Exception
+     */
+    protected function RemoveContactFromTicket($oContact, $oTicket)
+    {
+        $oContacts = $oTicket->Get('contacts_list');
+        foreach($oContacts as $oLnk)
+        {
+            if ($oLnk->Get('contact_id') == $oContact->GetKey())
+            {
+                $sRoleCode = $oLnk->Get('role_code');
+                $oContacts->RemoveItem($oLnk->GetKey());
+                $oTicket->Set('contacts_list', $oContacts);
+                $this->debug("Removed {$oContact->GetName()} from {$oTicket->Get('ref')} ({$sRoleCode})");
+                return;
+            }
+        }
+    }
+
+    /**
+     * Reload a Ticket from the database.
+     *
+     * @param DBObject $oObject
+     * @throws ArchivedObjectException
+     * @throws Exception
+     */
+    protected function ReloadObject(&$oObject)
+    {
+        $oObject = MetaModel::GetObject(get_class($oObject), $oObject->GetKey());
+        return $oObject;
+    }
+
+    /**
+     * Check or Display the CI list of a Ticket.
+     *
+     * @param Ticket $oTicket
+     * @param array $aWaitedCIList { iCIId => sImpactCode }
+     * @throws Exception
+     */
+    protected function CheckFunctionalCIList($oTicket, $aWaitedCIList = array())
+    {
+        $this->debug("\nResulting functionalcis_list {$oTicket->Get('ref')} ({$oTicket->Get('functionalcis_list')->Count()}):");
+        foreach($oTicket->Get('functionalcis_list') as $oLnk)
+        {
+            $this->debug($oLnk->Get('functionalci_name')." => ".$oLnk->Get('impact_code')."");
+            $iId = $oLnk->Get('functionalci_id');
+            if (!empty($aWaitedCIList))
+            {
+                $this->assertTrue(array_key_exists($iId, $aWaitedCIList));
+                $this->assertEquals($aWaitedCIList[$iId], $oLnk->Get('impact_code'));
+            }
+        }
+    }
+
+    /**
+     * Check or Display the Contact list of a DBObject (having a contacts_list).
+     * Can also control other attributes of the link.
+     *
+     * @param Ticket $oTicket
+     * @param array $aWaitedContactList { iContactId => array(attcode => value) }
+     * @throws Exception
+     */
+    protected function CheckContactList($oTicket, $aWaitedContactList = array())
+    {
+        $this->debug("\nResulting contacts_list {$oTicket->Get('ref')} ({$oTicket->Get('contacts_list')->Count()}):");
+        foreach($oTicket->Get('contacts_list') as $oLnk)
+        {
+            $this->debug($oLnk->Get('contact_id_friendlyname')." => ".$oLnk->Get('role_code'));
+            $iId = $oLnk->Get('contact_id');
+            if (!empty($aWaitedContactList))
+            {
+                $this->assertTrue(array_key_exists($iId, $aWaitedContactList));
+                foreach($aWaitedContactList[$iId] as $sAttCode => $oValue)
+                {
+                    if (MetaModel::IsValidAttCode(get_class($oTicket), $sAttCode))
+                    {
+                        $this->assertEquals($oValue, $oLnk->Get($sAttCode));
+                    }
+                }
+            }
+        }
+    }
+
+
 }
\ No newline at end of file
diff --git a/test/ItopTestCase.php b/test/ItopTestCase.php
index 100298a13..0cd67ceee 100644
--- a/test/ItopTestCase.php
+++ b/test/ItopTestCase.php
@@ -1,59 +1,59 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-namespace Combodo\iTop\Test\UnitTest;
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 20/11/2017
- * Time: 11:21
- */
-
-use PHPUnit\Framework\TestCase;
-
-define('DEBUG_UNIT_TEST', true);
-
-class ItopTestCase extends TestCase
-{
-    protected function setUp()
-	{
-		@include_once '../approot.inc.php';
-        @include_once '../../approot.inc.php';
-		@include_once '../../../approot.inc.php';
-		@include_once '../../../../approot.inc.php';
-
-        $this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");
-
-	}
-
-	protected function debug($sMsg)
-    {
-        if (DEBUG_UNIT_TEST)
-        {
-        	if (is_string($sMsg))
-	        {
-	        	echo "$sMsg\n";
-	        }
-	        else
-	        {
-	        	print_r($sMsg);
-	        }
-        }
-    }
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+namespace Combodo\iTop\Test\UnitTest;
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 20/11/2017
+ * Time: 11:21
+ */
+
+use PHPUnit\Framework\TestCase;
+
+define('DEBUG_UNIT_TEST', true);
+
+class ItopTestCase extends TestCase
+{
+    protected function setUp()
+	{
+		@include_once '../approot.inc.php';
+        @include_once '../../approot.inc.php';
+		@include_once '../../../approot.inc.php';
+		@include_once '../../../../approot.inc.php';
+
+        $this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");
+
+	}
+
+	protected function debug($sMsg)
+    {
+        if (DEBUG_UNIT_TEST)
+        {
+        	if (is_string($sMsg))
+	        {
+	        	echo "$sMsg\n";
+	        }
+	        else
+	        {
+	        	print_r($sMsg);
+	        }
+        }
+    }
 }
\ No newline at end of file
diff --git a/test/benchmark.php b/test/benchmark.php
index d4b802330..e448eff6e 100644
--- a/test/benchmark.php
+++ b/test/benchmark.php
@@ -1,871 +1,871 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Page designed to help in benchmarkink the scalability of itop
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/itopwebpage.class.inc.php');
-require_once(APPROOT.'/application/wizardhelper.class.inc.php');
-require_once(APPROOT.'/application/startup.inc.php');
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once(APPROOT.'/setup/setuppage.class.inc.php');
-
-//ini_set('memory_limit', '2048M');
-
-class BenchmarkDataCreation
-{
-	var $m_iIfByServer;
-	var $m_iIfByNWDevice;
-	var $m_aRequested;
-	var $m_aPlanned;
-	var $m_aCreatedByClass = array();
-	var $m_aCreatedByDesc = array();
-
-	var $m_aStatsByClass = array();
-
-	var $m_oChange;
-	public function __construct()
-	{
-		$this->m_oChange = MetaModel::NewObject("CMDBChange");
-		$this->m_oChange->Set("date", time());
-		$this->m_oChange->Set("userinfo", "Benchmark setup");
-		$iChangeId = $this->m_oChange->DBInsertNoReload();
-	}
-
-	public function PlanStructure($iPlannedContacts, $iPlannedContracts)
-	{
-		$this->m_aRequested = array(
-			'plannedcontacts' => $iPlannedContacts,
-			'plannedcontracts' => $iPlannedContracts,
-		);
-		$this->m_aPlanned = array(
-			'Contacts' => $iPlannedContacts,
-			'Contracts' => $iPlannedContracts,
-			'Documents' => $iPlannedContracts * 2,
-		);
-	}
-
-	public function PlanCis($iPlannedCIs)
-	{
-		$this->m_aRequested = array(
-			'plannedcis' => $iPlannedCIs,
-		);
-
-		$this->m_iIfByServer = 2;
-		$this->m_iIfByNWDevice = 10;
-
-		$iServers = ceil($iPlannedCIs * 9 / 10);
-		$iNWDevices = ceil($iPlannedCIs / 10);
-		$iInterfaces = $iServers * $this->m_iIfByServer + $iNWDevices * $this->m_iIfByNWDevice;
-		$iApplications = $iServers * 5;
-		$iSolutions = ceil($iApplications / 2);
-		$iProcesses = ceil($iSolutions / 2);
-
-		$this->m_aPlanned = array(
-			'Network devices' => $iNWDevices,
-			'Servers' => $iServers,
-			'Interfaces' => $iInterfaces,
-			'Application SW' => 2,
-			'Applications' => $iApplications,
-			'Solutions' => $iSolutions,
-			'Processes' => $iProcesses,
-		);
-	}
-
-	public function PlanTickets($iPlannedTickets, $iBigTicketCis)
-	{
-		$this->m_aRequested = array(
-			'plannedtickets' => $iPlannedTickets,
-			'plannedbigticketcis' => $iBigTicketCis,
-		);
-
-		$this->m_aPlanned = array(
-			'Incidents' => ceil($iPlannedTickets / 2),
-			'Changes' => ceil($iPlannedTickets / 2),
-			'Big ticket: CIs' => $iBigTicketCis,
-		);
-	}
-
-	public function ShowPlans($oP)
-	{
-		$oP->add("<h2>Planned creations</h2>\n");
-		$aPlanned = $this->m_aPlanned;
-		$aForm = array();
-		foreach ($aPlanned as $sKey => $iCount)
-		{
-			$aForm[] = array(
-				'label' => $sKey,
-				'input' => $iCount,
-			);
-		}
-		$oP->form($aForm);
-	}
-	
-	public function ShowForm($oP, $sNextOperation)
-	{
-		$aRequested = $this->m_aRequested;
-		$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Loading data...', 10)\">\n");
-		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"$sNextOperation\">\n");
-		foreach($this->m_aRequested as $sName => $sValue)
-		{
-			$oP->add("<input type=\"hidden\" name=\"$sName\" value=\"$sValue\">\n");
-		}
-		$oP->add("<button type=\"submit\">Next >></button>\n");
-		$oP->add("</form>\n");
-	}
-
-	protected function CreateObject($sClass, $aData, $sClassDesc = '')
-	{
-		$mu_t1 = MyHelpers::getmicrotime();
-
-		$oMyObject = MetaModel::NewObject($sClass);
-		foreach($aData as $sProp => $value)
-		{
-			if (is_array($value))
-			{
-				// transform into a link set
-				$sCSVSpec = implode('|', $value);
-				$oAttDef = MetaModel::GetAttributeDef($sClass, $sProp);
-				$value = $oAttDef->MakeValueFromString($sCSVSpec, $bLocalizedValue = false, $sSepItem = '|', $sSepAttribute = ';', $sSepValue = ':', $sAttributeQualifier = '"');
-			}
-			$oMyObject->Set($sProp, $value);
-		}
-
-		$iId = $oMyObject->DBInsertTrackedNoReload($this->m_oChange, true /* skip security */);
-
-		$sClassId = "$sClass ($sClassDesc)";
-		$this->m_aCreatedByDesc[$sClassId][] = $iId;
-		$this->m_aCreatedByClass[$sClass][] = $iId;
-
-		$mu_t2 = MyHelpers::getmicrotime();
-		$this->m_aStatsByClass[$sClass][] = $mu_t2 - $mu_t1;
-		
-		return $iId;
-	}
-
-	static $m_aClassIdCache = array();
-	protected function GetClassIds($sClass)
-	{
-		if (!isset(self::$m_aClassIdCache[$sClass]))
-		{
-			// Load the cache now
-			self::$m_aClassIdCache[$sClass] = array();
-			
-			$oSet = new DBObjectSet(new DBObjectSearch($sClass));
-			while($oObj = $oSet->Fetch())
-			{
-				self::$m_aClassIdCache[$sClass][] = $oObj->GetKey();
-			}
-		}
-		return self::$m_aClassIdCache[$sClass];
-	}
-
-	protected function RandomId($sClass, $sClassDesc = '')
-	{
-		$sClassId = "$sClass ($sClassDesc)";
-		if (isset($this->m_aCreatedByDesc[$sClassId]))
-		{
-			return $this->m_aCreatedByDesc[$sClassId][array_rand($this->m_aCreatedByDesc[$sClassId])];
-		}
-		
-		$aIds = self::GetClassIds($sClass);
-		return $aIds[array_rand($aIds)];
-	}
-
-	static protected function FindId($sClass)
-	{
-		$oSet = new DBObjectSet(new DBObjectSearch($sClass));
-		if ($oSet->Count() < 1)
-		{
-			return null;
-		}
-
-		$oObj = $oSet->Fetch();
-		return $oObj->GetKey();
-	}
-
-	static protected function FindIdFromOQL($sOQL)
-	{
-		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
-		if ($oSet->Count() < 1)
-		{
-			return null;
-		}
-
-		$oObj = $oSet->Fetch();
-		return $oObj->GetKey();
-	}
-
-	protected function my_array_rand($aData, $iCount)
-	{
-		if ($iCount == 0)
-		{
-			return array();
-		}
-		elseif ($iCount == 1)
-		{
-			// array_rand() for one item returns only the key
-			$key = array_rand($aData);
-			$aSample = array($key);
-		}
-		elseif ($iCount <= count($aData))
-		{
-			$aSample = array_rand($aData, $iCount);
-		}
-		else
-		{
-			$aSample = array_merge(array_keys($aData), self::my_array_rand($aData, $iCount - count($aData)));
-		}
-		return $aSample;
-	}
-
-	protected function CreateLinks($iFrom, $iCount, $sLinkClass, $sAttCodeFrom, $sAttCodeTo)
-	{
-		$oAttTo = MetaModel::GetAttributeDef($sLinkClass, $sAttCodeTo);
-		$sToClass = $oAttTo->GetTargetClass();
-
-		$aTargets = self::GetClassIds($sToClass);
-		$aSample = self::my_array_rand($aTargets, $iCount);
-
-		foreach($aSample as $key)
-		{
-			$aData = array(
-				$sAttCodeFrom => $iFrom,
-				$sAttCodeTo => $aTargets[$key],
-			);
-			$this->CreateObject($sLinkClass, $aData);
-		}
-	}
-
-	public function CreateStructure($oP)
-	{
-		$aClasses = MetaModel::GetClasses();
-		$aActions = array('Read', 'Bulk Read', 'Delete', 'Bulk Delete', 'Modify', 'Bulk Modify');
-		$aStdProfiles = array(2, 3, 4, 5, 6, 7, 8, 9);
-
-		////////////////////////////////////////
-		// New specific profile, giving access to everything
-		//
-		$aData = array(
-			'name' => 'Data guru',
-			'description' => 'Could do anything, because everything is granted',
-		);
-		$iGuruProfile = $this->CreateObject('URP_Profiles', $aData);
-		foreach($aClasses as $sClass)
-		{
-			foreach($aActions as $sAction)
-			{
-				$aData = array(
-					'profileid' => $iGuruProfile,
-					'class' => $sClass,
-					'permission' => 'yes',
-					'action' => $sAction,
-				);
-				$this->CreateObject('URP_ActionGrant', $aData);
-			}
-		}
-
-		// User login with super access rights
-		//
-		$aData = array(
-			'org_id' => self::FindId('Organization'),
-			'location_id' => self::FindId('Location'),
-			'first_name' => 'Jesus',
-			'name' => 'Deus',
-			'email' => 'guru@combodo.com',
-		);
-		$iPerson = $this->CreateObject('Person', $aData);
-		$aData = array(
-			'contactid' => $iPerson,
-			'login' => 'guru',
-			'password' => 'guru',
-			'language' => 'EN US',
-			'profile_list' => array("profileid:$iGuruProfile;reason:he is the one"),
-		);
-		$iLogin = $this->CreateObject('UserLocal', $aData);
-
-		////////////////////////////////////////
-		// User login having all std profiles
-		//
-		$aData = array(
-			'org_id' => self::FindId('Organization'),
-			'location_id' => self::FindId('Location'),
-			'first_name' => 'Little ze',
-			'name' => 'Foo',
-			'email' => 'foo@combodo.com',
-		);
-		$iPerson = $this->CreateObject('Person', $aData);
-
-		$aProfileSet = array();
-		foreach($aStdProfiles as $iProfileId)
-		{
-			$aProfileSet[] = "profileid:$iProfileId;reason:xxx";
-		}
-		$aData = array(
-			'contactid' => $iPerson,
-			'login' => 'foo',
-			'password' => 'foo',
-			'language' => 'EN US',
-			'profile_list' => $aProfileSet,
-		);
-		$iLogin = $this->CreateObject('UserLocal', $aData);
-
-		/////////////////////////
-		//
-		// Organizations
-		//
-		$aData = array(
-			'name' => 'Benchmark',
-		);
-		$iOrg = $this->CreateObject('Organization', $aData);
-	
-		/////////////////////////
-		//
-		// Locations
-		//
-		$aData = array(
-			'org_id' => $iOrg,
-			'name' => 'Rio de Janeiro',
-		);
-		$iLoc = $this->CreateObject('Location', $aData);
-		
-		/////////////////////////
-		//
-		// Teams
-		//
-		$aData = array(
-			'org_id' => $iOrg,
-			'location_id' => $iLoc,
-			'name' => 'Fluminense',
-			'email' => 'fluminense@combodo.com',
-		);
-		$iTeam = $this->CreateObject('Team', $aData);
-	
-		/////////////////////////
-		//
-		// Persons
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Contacts'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'location_id' => $iLoc,
-				'first_name' => 'Joaõ',
-				'name' => 'Ningem #'.$i,
-				'email' => 'foo'.$i.'@nowhere.fr',
-			);
-			$iPerson = $this->CreateObject('Person', $aData);
-
-			// Contract/Infra
-			//
-			$aData = array(
-				'contact_id' => $iPerson,
-				'team_id' => $this->RandomId('Team'),
-			);
-			$this->CreateObject('lnkTeamToContact', $aData);
-		}
-		
-		/////////////////////////
-		//
-		// Services
-		//
-		$aData = array(
-			'org_id' => $iOrg,
-			'name' => 'My Service',
-		);
-		$iService = $this->CreateObject('Service', $aData);
-
-		/////////////////////////
-		//
-		// Service subcategories
-		//
-		$aData = array(
-			'name' => 'My subcategory',
-			'service_id' => $iService,
-		);
-		$iOrg = $this->CreateObject('ServiceSubcategory', $aData);
-
-		/////////////////////////
-		//
-		// Contracts
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Contracts'] ; $i++)
-		{
-			$aData = array(
-				'name' => "Contract #$i",
-				'description' => 'Created for benchmarking purposes',
-				'org_id' => $this->RandomId('Organization'),
-				'provider_id' => $this->RandomId('Organization'),
-				'start_date' => '2009-12-25',
-				'end_date' => '2019-08-01',
-				'support_team_id' => $this->RandomId('Team'),
-			);
-			$iContract = $this->CreateObject('CustomerContract', $aData);
-
-			// Contract/Contact (10% of contacts)
-			//
-			$iContactCount = ceil($this->m_aPlanned['Contracts'] / 10);
-			for($iLinked = 0 ; $iLinked < $iContactCount ; $iLinked++)
-			{
-				$aData = array(
-					'contact_id' => $this->RandomId('Person'),
-					'contract_id' => $iContract,
-					'role' => 'role '.$iLinked,
-				);
-				$this->CreateObject('lnkContractToContact', $aData);
-			}
-		}
-
-		/////////////////////////
-		//
-		// Documents
-		//
-		$sMyDoc = '';
-		for($i = 0 ; $i < 1000 ; $i++)
-		{
-			// 100 chars
-			$sMyDoc .= "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678\n";
-		}
-		$oRefDoc = new ormDocument($sMyDoc, 'text/plain');
-
-		for($i = 0 ; $i < $this->m_aPlanned['Documents'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'name' => "document$i",
-				'contents' => $oRefDoc,
-			);
-			$this->CreateObject('FileDoc', $aData);
-		}
-	}
-
-	public function CreateCis($oP)
-	{
-		$iOrg = $this->FindIdFromOQL("SELECT Organization WHERE name = 'Benchmark'");
-		$iLoc = $this->FindIdFromOQL("SELECT Location WHERE org_id = $iOrg");
-
-		/////////////////////////
-		//
-		// Servers
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Servers'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'location_id' => $iLoc,
-				'name' => 'server'.$i,
-				'status' => 'production',
-			);
-			$iServer = $this->CreateObject('Server', $aData);
-
-			// Contract/Infra
-			$this->CreateLinks($iServer, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
-
-			// Interfaces
-			for($iLinked = 0 ; $iLinked < $this->m_iIfByServer ; $iLinked++)
-			{
-				$aData = array(
-					'name' => "eth$iLinked",
-					'status' => 'implementation',
-					'org_id' => $iOrg,
-					'device_id' => $iServer,
-					'status' => 'production',
-				);
-				$this->CreateObject('NetworkInterface', $aData, 'server if');
-			}
-		}
-
-		/////////////////////////
-		//
-		// Network devices
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Network devices'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'location_id' => $iLoc,
-				'name' => 'equipment #'.$i,
-				'status' => 'production',
-			);
-			$iNWDevice = $this->CreateObject('NetworkDevice', $aData);
-
-			// Contract/Infra
-			$this->CreateLinks($iNWDevice, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
-
-			// Interfaces
-			//
-			for($iLinked = 0 ; $iLinked < $this->m_iIfByNWDevice ; $iLinked++)
-			{
-				$aData = array(
-					'name' => "eth$iLinked",
-					'status' => 'implementation',
-					'org_id' => $iOrg,
-					'device_id' => $iNWDevice,
-					'connected_if' => $this->RandomId('NetworkInterface', 'server if'),
-					'status' => 'production',
-				);
-				$this->CreateObject('NetworkInterface', $aData, 'equipment if');
-			}
-		}
-
-		/////////////////////////
-		//
-		// Application Software
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Application SW'] ; $i++)
-		{
-			$aData = array(
-				'name' => 'Software #'.$i,
-			);
-			$iNWDevice = $this->CreateObject('Application', $aData);
-		}
-
-		/////////////////////////
-		//
-		// Applications
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Applications'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'device_id' => $this->RandomId('Server'),
-				'software_id' => $this->RandomId('Application'),
-				'name' => 'Application #'.$i,
-				'status' => 'production',
-			);
-			$iAppInstance = $this->CreateObject('ApplicationInstance', $aData);
-
-			// Contract/Infra
-			$this->CreateLinks($iAppInstance, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
-		}
-
-		/////////////////////////
-		//
-		// Application Solution
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Solutions'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'name' => 'Solution #'.$i,
-				'status' => 'production',
-			);
-			$iAppSolution = $this->CreateObject('ApplicationSolution', $aData);
-
-			// Contract/Infra
-			$this->CreateLinks($iAppSolution, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
-		}
-
-		/////////////////////////
-		//
-		// Business Process
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Processes'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'name' => 'Process #'.$i,
-				'status' => 'production',
-			);
-			$iProcess = $this->CreateObject('BusinessProcess', $aData);
-
-			// Contract/Infra
-			$this->CreateLinks($iProcess, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
-		}
-	}
-
-	public function CreateTickets($oP)
-	{
-		$iOrg = $this->FindIdFromOQL("SELECT Organization WHERE name = 'Benchmark'");
-		$iLoc = $this->FindIdFromOQL("SELECT Location WHERE org_id = $iOrg");
-
-		/////////////////////////
-		//
-		// Incident Tickets
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Incidents'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'caller_id' => $this->RandomId('Person'),
-				'workgroup_id' => $this->RandomId('Team'),
-				'agent_id' => $this->RandomId('Person'),
-				'service_id' => $this->RandomId('Service'),
-				'servicesubcategory_id' => $this->RandomId('ServiceSubcategory'),
-				'title' => 'Incident #'.$i,
-				'description' => 'O que aconteceu?',
-				'ticket_log' => 'Testing...',
-			);
-			$iTicket = $this->CreateObject('Incident', $aData);
-
-			// Incident/Infra
-			$iInfraCount = rand(1, 6);
-			$this->CreateLinks($iTicket, $iInfraCount, 'lnkTicketToCI', 'ticket_id', 'ci_id');
-
-			// Incident/Infra
-			$iContactCount = rand(1, 6);
-			$this->CreateLinks($iTicket, $iContactCount, 'lnkTicketToContact', 'ticket_id', 'contact_id');
-		}
-
-		/////////////////////////
-		//
-		// Big Ticket
-		//
-		$aData = array(
-			'org_id' => $iOrg,
-			'caller_id' => $this->RandomId('Person'),
-			'workgroup_id' => $this->RandomId('Team'),
-			'agent_id' => $this->RandomId('Person'),
-			'service_id' => $this->RandomId('Service'),
-			'servicesubcategory_id' => $this->RandomId('ServiceSubcategory'),
-			'title' => 'Big ticket',
-			'description' => 'O que aconteceu?',
-			'ticket_log' => 'Testing...',
-		);
-		$iTicket = $this->CreateObject('Incident', $aData);
-
-		// Incident/Infra
-		$iInfraCount = $this->m_aPlanned['Big ticket: CIs'];
-		$this->CreateLinks($iTicket, $iInfraCount, 'lnkTicketToCI', 'ticket_id', 'ci_id');
-
-		// Incident/Infra
-		$iContactCount = rand(1, 6);
-		$this->CreateLinks($iTicket, $iContactCount, 'lnkTicketToContact', 'ticket_id', 'contact_id');
-
-		/////////////////////////
-		//
-		// Change Tickets
-		//
-		for($i = 0 ; $i < $this->m_aPlanned['Changes'] ; $i++)
-		{
-			$aData = array(
-				'org_id' => $iOrg,
-				'requestor_id' => $this->RandomId('Person'),
-				'workgroup_id' => $this->RandomId('Team'),
-				'agent_id' => $this->RandomId('Person'),
-				'supervisor_group_id' => $this->RandomId('Team'),
-				'supervisor_id' => $this->RandomId('Person'),
-				'manager_group_id' => $this->RandomId('Team'),
-				'manager_id' => $this->RandomId('Person'),
-				'title' => 'change #'.$i,
-				'description' => "Let's do something there",
-			);
-			$iTicket = $this->CreateObject('NormalChange', $aData);
-
-			// Incident/Infra
-			$iInfraCount = rand(1, 6);
-			$this->CreateLinks($iTicket, $iInfraCount, 'lnkTicketToCI', 'ticket_id', 'ci_id');
-	
-			// Incident/Infra
-			$iContactCount = rand(1, 6);
-			$this->CreateLinks($iTicket, $iContactCount, 'lnkTicketToContact', 'ticket_id', 'contact_id');
-		}
-	}
-
-	public function MakeFeedback($oP)
-	{
-		foreach($this->m_aCreatedByClass as $sClass => $aClassIds)
-		{
-			$iSample = reset($aClassIds);
-			$sSample = "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=details&class=$sClass&id=$iSample\">sample</a>";
-	
-			$iDuration = number_format(array_sum($this->m_aStatsByClass[$sClass]), 3);
-			$fDurationMin = number_format(min($this->m_aStatsByClass[$sClass]), 3);
-			$fDurationMax = number_format(max($this->m_aStatsByClass[$sClass]), 3);
-			$fDurationAverage = number_format(array_sum($this->m_aStatsByClass[$sClass]) / count($this->m_aStatsByClass[$sClass]), 3);
-	
-			$oP->add("<ul>");
-			$oP->add("<li>");
-			$oP->add("$sClass: ".count($this->m_aStatsByClass[$sClass])." - $sSample<br/>");
-			$oP->add("Duration: $fDurationMin =&gt; $fDurationMax; Avg:$fDurationAverage; Total: $iDuration");
-			$oP->add("</li>");
-			$oP->add("</ul>");
-		}
-	}
-}
-
-/**
- * Ask the user what are the settings for the data load
- */  
-function DisplayStep1(SetupPage $oP)
-{
-	$sNextOperation = 'step2';
-	$oP->add("<h1>iTop benchmarking</h1>\n");
-
-	$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Evaluating real plans...', 10)\">\n");
-	$oP->add("<fieldset><legend>Data load configuration</legend>\n");
-	$aForm = array();
-	$aForm[] = array(
-		'label' => "Contacts:",
-		'input' => "<input id=\"from\" type=\"text\" name=\"plannedcontacts\" value=\"100\">",
-		'help' => '',
-	);
-	$aForm[] = array(
-		'label' => "Contracts:",
-		'input' => "<input id=\"from\" type=\"text\" name=\"plannedcontracts\" value=\"10\">",
-		'help' => '',
-	);
-	$oP->form($aForm);
-	$oP->add("</fieldset>\n");
-	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_structure\">\n");
-	$oP->add("<button type=\"submit\">Next >></button>\n");
-	$oP->add("</form>\n");
-
-	$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Evaluating real plans...', 10)\">\n");
-	$oP->add("<fieldset><legend>Data load configuration</legend>\n");
-	$aForm = array();
-	$aForm[] = array(
-		'label' => "Main CIs:",
-		'input' => "<input id=\"to\" type=\"text\" name=\"plannedcis\" value=\"70\">",
-		'help' => ' exclude interfaces, subnets or any other type of secondary CI',
-	);
-	$oP->form($aForm);
-	$oP->add("</fieldset>\n");
-	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_cis\">\n");
-	$oP->add("<button type=\"submit\">Next >></button>\n");
-	$oP->add("</form>\n");
-
-	$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Evaluating real plans...', 10)\">\n");
-	$oP->add("<fieldset><legend>Data load configuration</legend>\n");
-	$aForm = array();
-	$aForm[] = array(
-		'label' => "Tickets:",
-		'input' => "<input id=\"to\" type=\"text\" name=\"plannedtickets\" value=\"200\">",
-		'help' => ' 50% incidents, 50% changes',
-	);
-	$aForm[] = array(
-		'label' => "CIs for the big ticket:",
-		'input' => "<input id=\"to\" type=\"text\" name=\"plannedbigticketcis\" value=\"200\">",
-		'help' => 'Number of CI for the single big ticket',
-	);
-	$oP->form($aForm);
-	$oP->add("</fieldset>\n");
-	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_tickets\">\n");
-	$oP->add("<button type=\"submit\">Next >></button>\n");
-	$oP->add("</form>\n");
-}
-
-
-/**
- * Main program
- */
-
-LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-
-$sOperation = Utils::ReadParam('operation', 'step1');
-$oP = new SetupPage('iTop benchmark utility');
-
-ExecutionKPI::EnableDuration();
-$oKPI = new ExecutionKPI();
-
-try
-{
-	switch($sOperation)
-	{
-		case 'step1':
-		DisplayStep1($oP);
-		break;
-
-		case 'create_structure':
-		$oP->no_cache();
-		$iPlannedContacts = Utils::ReadParam('plannedcontacts');
-		$iPlannedContracts = Utils::ReadParam('plannedcontracts');
-
-		$oDataCreation = new BenchmarkDataCreation();
-		$oDataCreation->PlanStructure($iPlannedContacts, $iPlannedContracts);
-		$oDataCreation->ShowPlans($oP);
-		$oDataCreation->ShowForm($oP, 'create_structure_go');
-		break;
-
-		case 'create_structure_go':
-		$oP->no_cache();
-		$iPlannedContacts = Utils::ReadParam('plannedcontacts');
-		$iPlannedContracts = Utils::ReadParam('plannedcontracts');
-
-		$oDataCreation = new BenchmarkDataCreation();
-		$oDataCreation->PlanStructure($iPlannedContacts, $iPlannedContracts);
-		$oDataCreation->CreateStructure($oP);
-		$oDataCreation->MakeFeedback($oP);
-		break;
-
-		case 'create_cis':
-		$oP->no_cache();
-		$iPlannedCIs = Utils::ReadParam('plannedcis');
-
-		$oDataCreation = new BenchmarkDataCreation();
-		$oDataCreation->PlanCis($iPlannedCIs);
-		$oDataCreation->ShowPlans($oP);
-		$oDataCreation->ShowForm($oP, 'create_cis_go');
-		break;
-
-		case 'create_cis_go':
-		$oP->no_cache();
-		$iPlannedCIs = Utils::ReadParam('plannedcis');
-
-		$oDataCreation = new BenchmarkDataCreation();
-		$oDataCreation->PlanCis($iPlannedCIs);
-		$oDataCreation->CreateCis($oP);
-		$oDataCreation->MakeFeedback($oP);
-		break;
-
-		case 'create_tickets':
-		$oP->no_cache();
-		$iPlannedTickets = Utils::ReadParam('plannedtickets');
-		$iBigTicketCis = Utils::ReadParam('plannedbigticketcis');
-
-		$oDataCreation = new BenchmarkDataCreation();
-		$oDataCreation->PlanTickets($iPlannedTickets, $iBigTicketCis);
-		$oDataCreation->ShowPlans($oP);
-		$oDataCreation->ShowForm($oP, 'create_tickets_go');
-		break;
-
-		case 'create_tickets_go':
-		$oP->no_cache();
-		$iPlannedTickets = Utils::ReadParam('plannedtickets');
-		$iBigTicketCis = Utils::ReadParam('plannedbigticketcis');
-
-		$oDataCreation = new BenchmarkDataCreation();
-		$oDataCreation->PlanTickets($iPlannedTickets, $iBigTicketCis);
-		$oDataCreation->CreateTickets($oP);
-		$oDataCreation->MakeFeedback($oP);
-		break;
-
-		default:
-		$oP->error("Error: unsupported operation '$sOperation'");
-	}
-}
-catch(ZZException $e)
-{
-	$oP->error("Error: '".$e->getMessage()."'");	
-}
-catch(ZZCoreException $e)
-{
-	$oP->error("Error: '".$e->getHtmlDesc()."'");	
-}
-$oKPI->ComputeAndReport('Total execution');
-//DBSearch::RecordQueryTrace();
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Page designed to help in benchmarkink the scalability of itop
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/itopwebpage.class.inc.php');
+require_once(APPROOT.'/application/wizardhelper.class.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once(APPROOT.'/setup/setuppage.class.inc.php');
+
+//ini_set('memory_limit', '2048M');
+
+class BenchmarkDataCreation
+{
+	var $m_iIfByServer;
+	var $m_iIfByNWDevice;
+	var $m_aRequested;
+	var $m_aPlanned;
+	var $m_aCreatedByClass = array();
+	var $m_aCreatedByDesc = array();
+
+	var $m_aStatsByClass = array();
+
+	var $m_oChange;
+	public function __construct()
+	{
+		$this->m_oChange = MetaModel::NewObject("CMDBChange");
+		$this->m_oChange->Set("date", time());
+		$this->m_oChange->Set("userinfo", "Benchmark setup");
+		$iChangeId = $this->m_oChange->DBInsertNoReload();
+	}
+
+	public function PlanStructure($iPlannedContacts, $iPlannedContracts)
+	{
+		$this->m_aRequested = array(
+			'plannedcontacts' => $iPlannedContacts,
+			'plannedcontracts' => $iPlannedContracts,
+		);
+		$this->m_aPlanned = array(
+			'Contacts' => $iPlannedContacts,
+			'Contracts' => $iPlannedContracts,
+			'Documents' => $iPlannedContracts * 2,
+		);
+	}
+
+	public function PlanCis($iPlannedCIs)
+	{
+		$this->m_aRequested = array(
+			'plannedcis' => $iPlannedCIs,
+		);
+
+		$this->m_iIfByServer = 2;
+		$this->m_iIfByNWDevice = 10;
+
+		$iServers = ceil($iPlannedCIs * 9 / 10);
+		$iNWDevices = ceil($iPlannedCIs / 10);
+		$iInterfaces = $iServers * $this->m_iIfByServer + $iNWDevices * $this->m_iIfByNWDevice;
+		$iApplications = $iServers * 5;
+		$iSolutions = ceil($iApplications / 2);
+		$iProcesses = ceil($iSolutions / 2);
+
+		$this->m_aPlanned = array(
+			'Network devices' => $iNWDevices,
+			'Servers' => $iServers,
+			'Interfaces' => $iInterfaces,
+			'Application SW' => 2,
+			'Applications' => $iApplications,
+			'Solutions' => $iSolutions,
+			'Processes' => $iProcesses,
+		);
+	}
+
+	public function PlanTickets($iPlannedTickets, $iBigTicketCis)
+	{
+		$this->m_aRequested = array(
+			'plannedtickets' => $iPlannedTickets,
+			'plannedbigticketcis' => $iBigTicketCis,
+		);
+
+		$this->m_aPlanned = array(
+			'Incidents' => ceil($iPlannedTickets / 2),
+			'Changes' => ceil($iPlannedTickets / 2),
+			'Big ticket: CIs' => $iBigTicketCis,
+		);
+	}
+
+	public function ShowPlans($oP)
+	{
+		$oP->add("<h2>Planned creations</h2>\n");
+		$aPlanned = $this->m_aPlanned;
+		$aForm = array();
+		foreach ($aPlanned as $sKey => $iCount)
+		{
+			$aForm[] = array(
+				'label' => $sKey,
+				'input' => $iCount,
+			);
+		}
+		$oP->form($aForm);
+	}
+	
+	public function ShowForm($oP, $sNextOperation)
+	{
+		$aRequested = $this->m_aRequested;
+		$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Loading data...', 10)\">\n");
+		$oP->add("<input type=\"hidden\" name=\"operation\" value=\"$sNextOperation\">\n");
+		foreach($this->m_aRequested as $sName => $sValue)
+		{
+			$oP->add("<input type=\"hidden\" name=\"$sName\" value=\"$sValue\">\n");
+		}
+		$oP->add("<button type=\"submit\">Next >></button>\n");
+		$oP->add("</form>\n");
+	}
+
+	protected function CreateObject($sClass, $aData, $sClassDesc = '')
+	{
+		$mu_t1 = MyHelpers::getmicrotime();
+
+		$oMyObject = MetaModel::NewObject($sClass);
+		foreach($aData as $sProp => $value)
+		{
+			if (is_array($value))
+			{
+				// transform into a link set
+				$sCSVSpec = implode('|', $value);
+				$oAttDef = MetaModel::GetAttributeDef($sClass, $sProp);
+				$value = $oAttDef->MakeValueFromString($sCSVSpec, $bLocalizedValue = false, $sSepItem = '|', $sSepAttribute = ';', $sSepValue = ':', $sAttributeQualifier = '"');
+			}
+			$oMyObject->Set($sProp, $value);
+		}
+
+		$iId = $oMyObject->DBInsertTrackedNoReload($this->m_oChange, true /* skip security */);
+
+		$sClassId = "$sClass ($sClassDesc)";
+		$this->m_aCreatedByDesc[$sClassId][] = $iId;
+		$this->m_aCreatedByClass[$sClass][] = $iId;
+
+		$mu_t2 = MyHelpers::getmicrotime();
+		$this->m_aStatsByClass[$sClass][] = $mu_t2 - $mu_t1;
+		
+		return $iId;
+	}
+
+	static $m_aClassIdCache = array();
+	protected function GetClassIds($sClass)
+	{
+		if (!isset(self::$m_aClassIdCache[$sClass]))
+		{
+			// Load the cache now
+			self::$m_aClassIdCache[$sClass] = array();
+			
+			$oSet = new DBObjectSet(new DBObjectSearch($sClass));
+			while($oObj = $oSet->Fetch())
+			{
+				self::$m_aClassIdCache[$sClass][] = $oObj->GetKey();
+			}
+		}
+		return self::$m_aClassIdCache[$sClass];
+	}
+
+	protected function RandomId($sClass, $sClassDesc = '')
+	{
+		$sClassId = "$sClass ($sClassDesc)";
+		if (isset($this->m_aCreatedByDesc[$sClassId]))
+		{
+			return $this->m_aCreatedByDesc[$sClassId][array_rand($this->m_aCreatedByDesc[$sClassId])];
+		}
+		
+		$aIds = self::GetClassIds($sClass);
+		return $aIds[array_rand($aIds)];
+	}
+
+	static protected function FindId($sClass)
+	{
+		$oSet = new DBObjectSet(new DBObjectSearch($sClass));
+		if ($oSet->Count() < 1)
+		{
+			return null;
+		}
+
+		$oObj = $oSet->Fetch();
+		return $oObj->GetKey();
+	}
+
+	static protected function FindIdFromOQL($sOQL)
+	{
+		$oSet = new DBObjectSet(DBObjectSearch::FromOQL($sOQL));
+		if ($oSet->Count() < 1)
+		{
+			return null;
+		}
+
+		$oObj = $oSet->Fetch();
+		return $oObj->GetKey();
+	}
+
+	protected function my_array_rand($aData, $iCount)
+	{
+		if ($iCount == 0)
+		{
+			return array();
+		}
+		elseif ($iCount == 1)
+		{
+			// array_rand() for one item returns only the key
+			$key = array_rand($aData);
+			$aSample = array($key);
+		}
+		elseif ($iCount <= count($aData))
+		{
+			$aSample = array_rand($aData, $iCount);
+		}
+		else
+		{
+			$aSample = array_merge(array_keys($aData), self::my_array_rand($aData, $iCount - count($aData)));
+		}
+		return $aSample;
+	}
+
+	protected function CreateLinks($iFrom, $iCount, $sLinkClass, $sAttCodeFrom, $sAttCodeTo)
+	{
+		$oAttTo = MetaModel::GetAttributeDef($sLinkClass, $sAttCodeTo);
+		$sToClass = $oAttTo->GetTargetClass();
+
+		$aTargets = self::GetClassIds($sToClass);
+		$aSample = self::my_array_rand($aTargets, $iCount);
+
+		foreach($aSample as $key)
+		{
+			$aData = array(
+				$sAttCodeFrom => $iFrom,
+				$sAttCodeTo => $aTargets[$key],
+			);
+			$this->CreateObject($sLinkClass, $aData);
+		}
+	}
+
+	public function CreateStructure($oP)
+	{
+		$aClasses = MetaModel::GetClasses();
+		$aActions = array('Read', 'Bulk Read', 'Delete', 'Bulk Delete', 'Modify', 'Bulk Modify');
+		$aStdProfiles = array(2, 3, 4, 5, 6, 7, 8, 9);
+
+		////////////////////////////////////////
+		// New specific profile, giving access to everything
+		//
+		$aData = array(
+			'name' => 'Data guru',
+			'description' => 'Could do anything, because everything is granted',
+		);
+		$iGuruProfile = $this->CreateObject('URP_Profiles', $aData);
+		foreach($aClasses as $sClass)
+		{
+			foreach($aActions as $sAction)
+			{
+				$aData = array(
+					'profileid' => $iGuruProfile,
+					'class' => $sClass,
+					'permission' => 'yes',
+					'action' => $sAction,
+				);
+				$this->CreateObject('URP_ActionGrant', $aData);
+			}
+		}
+
+		// User login with super access rights
+		//
+		$aData = array(
+			'org_id' => self::FindId('Organization'),
+			'location_id' => self::FindId('Location'),
+			'first_name' => 'Jesus',
+			'name' => 'Deus',
+			'email' => 'guru@combodo.com',
+		);
+		$iPerson = $this->CreateObject('Person', $aData);
+		$aData = array(
+			'contactid' => $iPerson,
+			'login' => 'guru',
+			'password' => 'guru',
+			'language' => 'EN US',
+			'profile_list' => array("profileid:$iGuruProfile;reason:he is the one"),
+		);
+		$iLogin = $this->CreateObject('UserLocal', $aData);
+
+		////////////////////////////////////////
+		// User login having all std profiles
+		//
+		$aData = array(
+			'org_id' => self::FindId('Organization'),
+			'location_id' => self::FindId('Location'),
+			'first_name' => 'Little ze',
+			'name' => 'Foo',
+			'email' => 'foo@combodo.com',
+		);
+		$iPerson = $this->CreateObject('Person', $aData);
+
+		$aProfileSet = array();
+		foreach($aStdProfiles as $iProfileId)
+		{
+			$aProfileSet[] = "profileid:$iProfileId;reason:xxx";
+		}
+		$aData = array(
+			'contactid' => $iPerson,
+			'login' => 'foo',
+			'password' => 'foo',
+			'language' => 'EN US',
+			'profile_list' => $aProfileSet,
+		);
+		$iLogin = $this->CreateObject('UserLocal', $aData);
+
+		/////////////////////////
+		//
+		// Organizations
+		//
+		$aData = array(
+			'name' => 'Benchmark',
+		);
+		$iOrg = $this->CreateObject('Organization', $aData);
+	
+		/////////////////////////
+		//
+		// Locations
+		//
+		$aData = array(
+			'org_id' => $iOrg,
+			'name' => 'Rio de Janeiro',
+		);
+		$iLoc = $this->CreateObject('Location', $aData);
+		
+		/////////////////////////
+		//
+		// Teams
+		//
+		$aData = array(
+			'org_id' => $iOrg,
+			'location_id' => $iLoc,
+			'name' => 'Fluminense',
+			'email' => 'fluminense@combodo.com',
+		);
+		$iTeam = $this->CreateObject('Team', $aData);
+	
+		/////////////////////////
+		//
+		// Persons
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Contacts'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'location_id' => $iLoc,
+				'first_name' => 'Joaõ',
+				'name' => 'Ningem #'.$i,
+				'email' => 'foo'.$i.'@nowhere.fr',
+			);
+			$iPerson = $this->CreateObject('Person', $aData);
+
+			// Contract/Infra
+			//
+			$aData = array(
+				'contact_id' => $iPerson,
+				'team_id' => $this->RandomId('Team'),
+			);
+			$this->CreateObject('lnkTeamToContact', $aData);
+		}
+		
+		/////////////////////////
+		//
+		// Services
+		//
+		$aData = array(
+			'org_id' => $iOrg,
+			'name' => 'My Service',
+		);
+		$iService = $this->CreateObject('Service', $aData);
+
+		/////////////////////////
+		//
+		// Service subcategories
+		//
+		$aData = array(
+			'name' => 'My subcategory',
+			'service_id' => $iService,
+		);
+		$iOrg = $this->CreateObject('ServiceSubcategory', $aData);
+
+		/////////////////////////
+		//
+		// Contracts
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Contracts'] ; $i++)
+		{
+			$aData = array(
+				'name' => "Contract #$i",
+				'description' => 'Created for benchmarking purposes',
+				'org_id' => $this->RandomId('Organization'),
+				'provider_id' => $this->RandomId('Organization'),
+				'start_date' => '2009-12-25',
+				'end_date' => '2019-08-01',
+				'support_team_id' => $this->RandomId('Team'),
+			);
+			$iContract = $this->CreateObject('CustomerContract', $aData);
+
+			// Contract/Contact (10% of contacts)
+			//
+			$iContactCount = ceil($this->m_aPlanned['Contracts'] / 10);
+			for($iLinked = 0 ; $iLinked < $iContactCount ; $iLinked++)
+			{
+				$aData = array(
+					'contact_id' => $this->RandomId('Person'),
+					'contract_id' => $iContract,
+					'role' => 'role '.$iLinked,
+				);
+				$this->CreateObject('lnkContractToContact', $aData);
+			}
+		}
+
+		/////////////////////////
+		//
+		// Documents
+		//
+		$sMyDoc = '';
+		for($i = 0 ; $i < 1000 ; $i++)
+		{
+			// 100 chars
+			$sMyDoc .= "012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678\n";
+		}
+		$oRefDoc = new ormDocument($sMyDoc, 'text/plain');
+
+		for($i = 0 ; $i < $this->m_aPlanned['Documents'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'name' => "document$i",
+				'contents' => $oRefDoc,
+			);
+			$this->CreateObject('FileDoc', $aData);
+		}
+	}
+
+	public function CreateCis($oP)
+	{
+		$iOrg = $this->FindIdFromOQL("SELECT Organization WHERE name = 'Benchmark'");
+		$iLoc = $this->FindIdFromOQL("SELECT Location WHERE org_id = $iOrg");
+
+		/////////////////////////
+		//
+		// Servers
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Servers'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'location_id' => $iLoc,
+				'name' => 'server'.$i,
+				'status' => 'production',
+			);
+			$iServer = $this->CreateObject('Server', $aData);
+
+			// Contract/Infra
+			$this->CreateLinks($iServer, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
+
+			// Interfaces
+			for($iLinked = 0 ; $iLinked < $this->m_iIfByServer ; $iLinked++)
+			{
+				$aData = array(
+					'name' => "eth$iLinked",
+					'status' => 'implementation',
+					'org_id' => $iOrg,
+					'device_id' => $iServer,
+					'status' => 'production',
+				);
+				$this->CreateObject('NetworkInterface', $aData, 'server if');
+			}
+		}
+
+		/////////////////////////
+		//
+		// Network devices
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Network devices'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'location_id' => $iLoc,
+				'name' => 'equipment #'.$i,
+				'status' => 'production',
+			);
+			$iNWDevice = $this->CreateObject('NetworkDevice', $aData);
+
+			// Contract/Infra
+			$this->CreateLinks($iNWDevice, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
+
+			// Interfaces
+			//
+			for($iLinked = 0 ; $iLinked < $this->m_iIfByNWDevice ; $iLinked++)
+			{
+				$aData = array(
+					'name' => "eth$iLinked",
+					'status' => 'implementation',
+					'org_id' => $iOrg,
+					'device_id' => $iNWDevice,
+					'connected_if' => $this->RandomId('NetworkInterface', 'server if'),
+					'status' => 'production',
+				);
+				$this->CreateObject('NetworkInterface', $aData, 'equipment if');
+			}
+		}
+
+		/////////////////////////
+		//
+		// Application Software
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Application SW'] ; $i++)
+		{
+			$aData = array(
+				'name' => 'Software #'.$i,
+			);
+			$iNWDevice = $this->CreateObject('Application', $aData);
+		}
+
+		/////////////////////////
+		//
+		// Applications
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Applications'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'device_id' => $this->RandomId('Server'),
+				'software_id' => $this->RandomId('Application'),
+				'name' => 'Application #'.$i,
+				'status' => 'production',
+			);
+			$iAppInstance = $this->CreateObject('ApplicationInstance', $aData);
+
+			// Contract/Infra
+			$this->CreateLinks($iAppInstance, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
+		}
+
+		/////////////////////////
+		//
+		// Application Solution
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Solutions'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'name' => 'Solution #'.$i,
+				'status' => 'production',
+			);
+			$iAppSolution = $this->CreateObject('ApplicationSolution', $aData);
+
+			// Contract/Infra
+			$this->CreateLinks($iAppSolution, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
+		}
+
+		/////////////////////////
+		//
+		// Business Process
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Processes'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'name' => 'Process #'.$i,
+				'status' => 'production',
+			);
+			$iProcess = $this->CreateObject('BusinessProcess', $aData);
+
+			// Contract/Infra
+			$this->CreateLinks($iProcess, 1, 'lnkContractToCI', 'ci_id', 'contract_id');
+		}
+	}
+
+	public function CreateTickets($oP)
+	{
+		$iOrg = $this->FindIdFromOQL("SELECT Organization WHERE name = 'Benchmark'");
+		$iLoc = $this->FindIdFromOQL("SELECT Location WHERE org_id = $iOrg");
+
+		/////////////////////////
+		//
+		// Incident Tickets
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Incidents'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'caller_id' => $this->RandomId('Person'),
+				'workgroup_id' => $this->RandomId('Team'),
+				'agent_id' => $this->RandomId('Person'),
+				'service_id' => $this->RandomId('Service'),
+				'servicesubcategory_id' => $this->RandomId('ServiceSubcategory'),
+				'title' => 'Incident #'.$i,
+				'description' => 'O que aconteceu?',
+				'ticket_log' => 'Testing...',
+			);
+			$iTicket = $this->CreateObject('Incident', $aData);
+
+			// Incident/Infra
+			$iInfraCount = rand(1, 6);
+			$this->CreateLinks($iTicket, $iInfraCount, 'lnkTicketToCI', 'ticket_id', 'ci_id');
+
+			// Incident/Infra
+			$iContactCount = rand(1, 6);
+			$this->CreateLinks($iTicket, $iContactCount, 'lnkTicketToContact', 'ticket_id', 'contact_id');
+		}
+
+		/////////////////////////
+		//
+		// Big Ticket
+		//
+		$aData = array(
+			'org_id' => $iOrg,
+			'caller_id' => $this->RandomId('Person'),
+			'workgroup_id' => $this->RandomId('Team'),
+			'agent_id' => $this->RandomId('Person'),
+			'service_id' => $this->RandomId('Service'),
+			'servicesubcategory_id' => $this->RandomId('ServiceSubcategory'),
+			'title' => 'Big ticket',
+			'description' => 'O que aconteceu?',
+			'ticket_log' => 'Testing...',
+		);
+		$iTicket = $this->CreateObject('Incident', $aData);
+
+		// Incident/Infra
+		$iInfraCount = $this->m_aPlanned['Big ticket: CIs'];
+		$this->CreateLinks($iTicket, $iInfraCount, 'lnkTicketToCI', 'ticket_id', 'ci_id');
+
+		// Incident/Infra
+		$iContactCount = rand(1, 6);
+		$this->CreateLinks($iTicket, $iContactCount, 'lnkTicketToContact', 'ticket_id', 'contact_id');
+
+		/////////////////////////
+		//
+		// Change Tickets
+		//
+		for($i = 0 ; $i < $this->m_aPlanned['Changes'] ; $i++)
+		{
+			$aData = array(
+				'org_id' => $iOrg,
+				'requestor_id' => $this->RandomId('Person'),
+				'workgroup_id' => $this->RandomId('Team'),
+				'agent_id' => $this->RandomId('Person'),
+				'supervisor_group_id' => $this->RandomId('Team'),
+				'supervisor_id' => $this->RandomId('Person'),
+				'manager_group_id' => $this->RandomId('Team'),
+				'manager_id' => $this->RandomId('Person'),
+				'title' => 'change #'.$i,
+				'description' => "Let's do something there",
+			);
+			$iTicket = $this->CreateObject('NormalChange', $aData);
+
+			// Incident/Infra
+			$iInfraCount = rand(1, 6);
+			$this->CreateLinks($iTicket, $iInfraCount, 'lnkTicketToCI', 'ticket_id', 'ci_id');
+	
+			// Incident/Infra
+			$iContactCount = rand(1, 6);
+			$this->CreateLinks($iTicket, $iContactCount, 'lnkTicketToContact', 'ticket_id', 'contact_id');
+		}
+	}
+
+	public function MakeFeedback($oP)
+	{
+		foreach($this->m_aCreatedByClass as $sClass => $aClassIds)
+		{
+			$iSample = reset($aClassIds);
+			$sSample = "<a href=\"".utils::GetAbsoluteUrlAppRoot()."pages/UI.php?operation=details&class=$sClass&id=$iSample\">sample</a>";
+	
+			$iDuration = number_format(array_sum($this->m_aStatsByClass[$sClass]), 3);
+			$fDurationMin = number_format(min($this->m_aStatsByClass[$sClass]), 3);
+			$fDurationMax = number_format(max($this->m_aStatsByClass[$sClass]), 3);
+			$fDurationAverage = number_format(array_sum($this->m_aStatsByClass[$sClass]) / count($this->m_aStatsByClass[$sClass]), 3);
+	
+			$oP->add("<ul>");
+			$oP->add("<li>");
+			$oP->add("$sClass: ".count($this->m_aStatsByClass[$sClass])." - $sSample<br/>");
+			$oP->add("Duration: $fDurationMin =&gt; $fDurationMax; Avg:$fDurationAverage; Total: $iDuration");
+			$oP->add("</li>");
+			$oP->add("</ul>");
+		}
+	}
+}
+
+/**
+ * Ask the user what are the settings for the data load
+ */  
+function DisplayStep1(SetupPage $oP)
+{
+	$sNextOperation = 'step2';
+	$oP->add("<h1>iTop benchmarking</h1>\n");
+
+	$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Evaluating real plans...', 10)\">\n");
+	$oP->add("<fieldset><legend>Data load configuration</legend>\n");
+	$aForm = array();
+	$aForm[] = array(
+		'label' => "Contacts:",
+		'input' => "<input id=\"from\" type=\"text\" name=\"plannedcontacts\" value=\"100\">",
+		'help' => '',
+	);
+	$aForm[] = array(
+		'label' => "Contracts:",
+		'input' => "<input id=\"from\" type=\"text\" name=\"plannedcontracts\" value=\"10\">",
+		'help' => '',
+	);
+	$oP->form($aForm);
+	$oP->add("</fieldset>\n");
+	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_structure\">\n");
+	$oP->add("<button type=\"submit\">Next >></button>\n");
+	$oP->add("</form>\n");
+
+	$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Evaluating real plans...', 10)\">\n");
+	$oP->add("<fieldset><legend>Data load configuration</legend>\n");
+	$aForm = array();
+	$aForm[] = array(
+		'label' => "Main CIs:",
+		'input' => "<input id=\"to\" type=\"text\" name=\"plannedcis\" value=\"70\">",
+		'help' => ' exclude interfaces, subnets or any other type of secondary CI',
+	);
+	$oP->form($aForm);
+	$oP->add("</fieldset>\n");
+	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_cis\">\n");
+	$oP->add("<button type=\"submit\">Next >></button>\n");
+	$oP->add("</form>\n");
+
+	$oP->add("<form method=\"post\" onSubmit=\"return DoSubmit('Evaluating real plans...', 10)\">\n");
+	$oP->add("<fieldset><legend>Data load configuration</legend>\n");
+	$aForm = array();
+	$aForm[] = array(
+		'label' => "Tickets:",
+		'input' => "<input id=\"to\" type=\"text\" name=\"plannedtickets\" value=\"200\">",
+		'help' => ' 50% incidents, 50% changes',
+	);
+	$aForm[] = array(
+		'label' => "CIs for the big ticket:",
+		'input' => "<input id=\"to\" type=\"text\" name=\"plannedbigticketcis\" value=\"200\">",
+		'help' => 'Number of CI for the single big ticket',
+	);
+	$oP->form($aForm);
+	$oP->add("</fieldset>\n");
+	$oP->add("<input type=\"hidden\" name=\"operation\" value=\"create_tickets\">\n");
+	$oP->add("<button type=\"submit\">Next >></button>\n");
+	$oP->add("</form>\n");
+}
+
+
+/**
+ * Main program
+ */
+
+LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+
+$sOperation = Utils::ReadParam('operation', 'step1');
+$oP = new SetupPage('iTop benchmark utility');
+
+ExecutionKPI::EnableDuration();
+$oKPI = new ExecutionKPI();
+
+try
+{
+	switch($sOperation)
+	{
+		case 'step1':
+		DisplayStep1($oP);
+		break;
+
+		case 'create_structure':
+		$oP->no_cache();
+		$iPlannedContacts = Utils::ReadParam('plannedcontacts');
+		$iPlannedContracts = Utils::ReadParam('plannedcontracts');
+
+		$oDataCreation = new BenchmarkDataCreation();
+		$oDataCreation->PlanStructure($iPlannedContacts, $iPlannedContracts);
+		$oDataCreation->ShowPlans($oP);
+		$oDataCreation->ShowForm($oP, 'create_structure_go');
+		break;
+
+		case 'create_structure_go':
+		$oP->no_cache();
+		$iPlannedContacts = Utils::ReadParam('plannedcontacts');
+		$iPlannedContracts = Utils::ReadParam('plannedcontracts');
+
+		$oDataCreation = new BenchmarkDataCreation();
+		$oDataCreation->PlanStructure($iPlannedContacts, $iPlannedContracts);
+		$oDataCreation->CreateStructure($oP);
+		$oDataCreation->MakeFeedback($oP);
+		break;
+
+		case 'create_cis':
+		$oP->no_cache();
+		$iPlannedCIs = Utils::ReadParam('plannedcis');
+
+		$oDataCreation = new BenchmarkDataCreation();
+		$oDataCreation->PlanCis($iPlannedCIs);
+		$oDataCreation->ShowPlans($oP);
+		$oDataCreation->ShowForm($oP, 'create_cis_go');
+		break;
+
+		case 'create_cis_go':
+		$oP->no_cache();
+		$iPlannedCIs = Utils::ReadParam('plannedcis');
+
+		$oDataCreation = new BenchmarkDataCreation();
+		$oDataCreation->PlanCis($iPlannedCIs);
+		$oDataCreation->CreateCis($oP);
+		$oDataCreation->MakeFeedback($oP);
+		break;
+
+		case 'create_tickets':
+		$oP->no_cache();
+		$iPlannedTickets = Utils::ReadParam('plannedtickets');
+		$iBigTicketCis = Utils::ReadParam('plannedbigticketcis');
+
+		$oDataCreation = new BenchmarkDataCreation();
+		$oDataCreation->PlanTickets($iPlannedTickets, $iBigTicketCis);
+		$oDataCreation->ShowPlans($oP);
+		$oDataCreation->ShowForm($oP, 'create_tickets_go');
+		break;
+
+		case 'create_tickets_go':
+		$oP->no_cache();
+		$iPlannedTickets = Utils::ReadParam('plannedtickets');
+		$iBigTicketCis = Utils::ReadParam('plannedbigticketcis');
+
+		$oDataCreation = new BenchmarkDataCreation();
+		$oDataCreation->PlanTickets($iPlannedTickets, $iBigTicketCis);
+		$oDataCreation->CreateTickets($oP);
+		$oDataCreation->MakeFeedback($oP);
+		break;
+
+		default:
+		$oP->error("Error: unsupported operation '$sOperation'");
+	}
+}
+catch(ZZException $e)
+{
+	$oP->error("Error: '".$e->getMessage()."'");	
+}
+catch(ZZCoreException $e)
+{
+	$oP->error("Error: '".$e->getHtmlDesc()."'");	
+}
+$oKPI->ComputeAndReport('Total execution');
+//DBSearch::RecordQueryTrace();
+$oP->output();
+?>
diff --git a/test/config-test-farm.php b/test/config-test-farm.php
index 46d16d941..aec9a1916 100644
--- a/test/config-test-farm.php
+++ b/test/config-test-farm.php
@@ -1,38 +1,38 @@
-<?php
-
-//
-// phpMyORM configuration file
-//
-// To be manually edited (or generated by the configuration wizard)
-//
-// The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
-//
-
-$MySettings = array(
-	'db_host' => 'localhost',
-	'db_user' => 'root',
-	'db_pwd' => '',
-	'db_name' => 'TestFarm',
-	'db_subname' => '', // use it to differentiate two applications instances running on the same DB
-);
-
-// Modules: file names should be specified as a absolute paths
-
-$MyModules = array(
-	'application' => array (
-//		'../core/event.class.inc.php',
-//		'../core/action.class.inc.php',
-//		'../core/trigger.class.inc.php',
-		// to be continued...
-	),
-	'business' => array (
-		'../business/test_farm.class.inc.php',
-		// to be continued...
-	),
-	'addons' => array (
-		//'user rights' => '/addons/userrights/userrightsnull.class.inc.php', // or userrightsmatrix.class.inc.php
-		// other modules to come later
-	)
-);
-
-?>
+<?php
+
+//
+// phpMyORM configuration file
+//
+// To be manually edited (or generated by the configuration wizard)
+//
+// The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+//
+
+$MySettings = array(
+	'db_host' => 'localhost',
+	'db_user' => 'root',
+	'db_pwd' => '',
+	'db_name' => 'TestFarm',
+	'db_subname' => '', // use it to differentiate two applications instances running on the same DB
+);
+
+// Modules: file names should be specified as a absolute paths
+
+$MyModules = array(
+	'application' => array (
+//		'../core/event.class.inc.php',
+//		'../core/action.class.inc.php',
+//		'../core/trigger.class.inc.php',
+		// to be continued...
+	),
+	'business' => array (
+		'../business/test_farm.class.inc.php',
+		// to be continued...
+	),
+	'addons' => array (
+		//'user rights' => '/addons/userrights/userrightsnull.class.inc.php', // or userrightsmatrix.class.inc.php
+		// other modules to come later
+	)
+);
+
+?>
diff --git a/test/core/DBObjectTest.php b/test/core/DBObjectTest.php
index a6e2ea25c..da44178e0 100644
--- a/test/core/DBObjectTest.php
+++ b/test/core/DBObjectTest.php
@@ -1,89 +1,89 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 02/10/2017
- * Time: 13:58
- */
-
-namespace Combodo\iTop\Test\UnitTest\Core;
-
-use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use DBObject;
-
-
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class DBObjectTest extends ItopDataTestCase
-{
-	protected function setUp()
-	{
-		parent::setUp();
-		require_once(APPROOT.'core/coreexception.class.inc.php');
-		require_once(APPROOT.'core/dbobject.class.php');
-	}
-
-	/**
-	 * Test default page name
-	 */
-	public function testGetUIPage()
-	{
-		static::assertEquals('UI.php', DBObject::GetUIPage());
-	}
-
-	/**
-	 * Test PKey validation
-	 * @dataProvider keyProviderOK
-	 * @param $key
-	 * @param $res
-	 */
-	public function testIsValidPKeyOK($key, $res)
-	{
-		static::assertEquals(DBObject::IsValidPKey($key), $res);
-	}
-
-	public function keyProviderOK()
-	{
-		return array(
-			array(1, true),
-			array('255', true),
-			array(-24576, true),
-			array(0123, true),
-			array(0xCAFE, true),
-			array(PHP_INT_MIN, true),
-			array(PHP_INT_MAX, true),
-			array('test', false),
-			array('', false),
-			array('a255', false),
-			array('PHP_INT_MIN', false));
-	}
-
-	public function testGetOriginal()
-	{
-		$oObject = $this->CreateUserRequest(190664);
-
-		static::assertNull($oObject->GetOriginal('sla_tto_passed'));
-	}
-
-}
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 02/10/2017
+ * Time: 13:58
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use DBObject;
+
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class DBObjectTest extends ItopDataTestCase
+{
+	protected function setUp()
+	{
+		parent::setUp();
+		require_once(APPROOT.'core/coreexception.class.inc.php');
+		require_once(APPROOT.'core/dbobject.class.php');
+	}
+
+	/**
+	 * Test default page name
+	 */
+	public function testGetUIPage()
+	{
+		static::assertEquals('UI.php', DBObject::GetUIPage());
+	}
+
+	/**
+	 * Test PKey validation
+	 * @dataProvider keyProviderOK
+	 * @param $key
+	 * @param $res
+	 */
+	public function testIsValidPKeyOK($key, $res)
+	{
+		static::assertEquals(DBObject::IsValidPKey($key), $res);
+	}
+
+	public function keyProviderOK()
+	{
+		return array(
+			array(1, true),
+			array('255', true),
+			array(-24576, true),
+			array(0123, true),
+			array(0xCAFE, true),
+			array(PHP_INT_MIN, true),
+			array(PHP_INT_MAX, true),
+			array('test', false),
+			array('', false),
+			array('a255', false),
+			array('PHP_INT_MIN', false));
+	}
+
+	public function testGetOriginal()
+	{
+		$oObject = $this->CreateUserRequest(190664);
+
+		static::assertNull($oObject->GetOriginal('sla_tto_passed'));
+	}
+
+}
diff --git a/test/core/DBSearchTest.php b/test/core/DBSearchTest.php
index 41962e498..4464db005 100644
--- a/test/core/DBSearchTest.php
+++ b/test/core/DBSearchTest.php
@@ -1,521 +1,521 @@
-<?php
-// Copyright (c) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 06/02/2018
- * Time: 09:58
- */
-
-namespace Combodo\iTop\Test\UnitTest\Core;
-
-
-use CMDBSource;
-use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use DBSearch;
-use Exception;
-use Expression;
-use FunctionExpression;
-
-
-/**
- * Tests of the DBSearch class.
- * <ul>
- * <li>MakeGroupByQuery</li>
- * </ul>
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class DBSearchTest extends ItopDataTestCase
-{
-
-	/**
-	 * @throws \Exception
-	 */
-	protected function setUp()
-	{
-		parent::setUp();
-	}
-
-	/**
-	 * @dataProvider UReqProvider
-	 * @param $iOrgNb
-	 * @param $iPersonNb
-	 * @param $aReq
-	 * @param $iLimit
-	 * @param $aCountRes
-	 * @throws Exception
-	 */
-	public function testMakeGroupByQuery($iOrgNb, $iPersonNb, $aReq, $iLimit, $aCountRes)
-	{
-		$sOrgs = $this->init_db($iOrgNb, $iPersonNb, $aReq);
-
-		$oSearch = DBSearch::FromOQL("SELECT UserRequest WHERE org_id IN ($sOrgs)");
-		self::assertNotNull($oSearch);
-		$oExpr1 = Expression::FromOQL('UserRequest.org_id');
-
-		// Alias => Expression
-		$aGroupBy = array('org_id' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('UserRequest.time_spent');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-			);
-
-		// Alias => Order
-		$aOrderBy = array('_itop_sum_' => true, '_itop_count_' => true);
-
-		$aArgs = array();
-
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy, $iLimit);
-		$this->debug($sSQL);
-
-		$aRes = CMDBSource::QueryToArray($sSQL);
-		$this->debug($aRes);
-
-		self::assertEquals(count($aCountRes), count($aRes));
-		for ($i = 0; $i < count($aCountRes); $i++)
-		{
-			self::assertEquals($aCountRes[$i], $aRes[$i]['_itop_count_']);
-		}
-	}
-
-
-	public function UReqProvider()
-	{
-		return array(
-			"1 line" => array(1, 1, array(array(1, 0, 0)), 0, array('1')),
-			"2 same lines" => array(1, 1, array(array(1, 0, 0), array(1, 0, 0)), 0, array('2')),
-			"2 diff lines" => array(2, 2, array(array(1, 0, 0), array(1, 1, 1)), 0, array('1', '1')),
-			"4 lines" => array(2, 2, array(array(1, 0, 0), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1)), 0, array('2', '2')),
-			"5 lines" => array(2, 2, array(array(1, 0, 0), array(1, 0, 0), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1)), 0, array('2', '3')),
-			"6 lines" => array(2, 4, array(array(1, 0, 0), array(1, 1, 3), array(1, 1, 1), array(1, 1, 3), array(1, 0, 2), array(1, 1, 1)), 0, array('2', '4')),
-			"6 lines limit" => array(2, 4, array(array(1, 0, 0), array(1, 1, 3), array(1, 1, 1), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1)), 1, array('2')),
-		);
-	}
-
-	/**
-	 * @param int $iOrgNb Number of Organization to create
-	 * @param int $iPersonNb Number of Person to create
-	 * @param array $aReq  UserRequests to create: array(array([time_spent value], [org index], [person index]))
-	 * @return string organization list for select
-	 * @throws Exception
-	 */
-	private function init_db($iOrgNb, $iPersonNb, $aReq)
-	{
-		$aOrgIds = array();
-		$sOrgs = '';
-		for($i = 0; $i < $iOrgNb; $i++)
-		{
-			$oObj = $this->CreateOrganization('UnitTest_Org'.$i);
-			$sKey = $oObj->GetKey();
-			$aOrgIds[] = $sKey;
-			if ($i > 0)
-			{
-				$sOrgs .= ",";
-			}
-			$sOrgs .= $sKey;
-		}
-		self::assertEquals($iOrgNb, count($aOrgIds));
-
-		$aPersonIds = array();
-		for($i = 0; $i < $iPersonNb; $i++)
-		{
-			$oObj = $this->CreatePerson($i, $aOrgIds[$i % $iOrgNb]);
-			$aPersonIds[] = $oObj->GetKey();
-		}
-		self::assertEquals($iPersonNb, count($aPersonIds));
-
-		$i = 0;
-		foreach($aReq as $aParams)
-		{
-			$oObj = $this->CreateUserRequest($i, $aParams[0], $aOrgIds[$aParams[1]], $aPersonIds[$aParams[2]]);
-			self::assertNotNull($oObj);
-			$i++;
-		}
-		return $sOrgs;
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testGroupByUnion()
-	{
-		$oServer = $this->CreateServer(1);
-
-		$this->CreatePhysicalInterface(1, 1000, $oServer->GetKey());
-		$this->CreateFiberChannelInterface(1, 1000, $oServer->GetKey());
-
-
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
-		self::assertNotNull($oSearch);
-		$oExpr1 = Expression::FromOQL('FCI.name');
-
-		// Alias => Expression (first select reference)
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FCI.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-
-		// Alias => Order
-		$aOrderBy = array('group1' => true, '_itop_count_' => true);
-
-		$aArgs = array();
-
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-		$this->debug($sSQL);
-
-		$aRes = CMDBSource::QueryToArray($sSQL);
-		$this->debug($aRes);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testOrderBy_1()
-	{
-
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface");
-		self::assertNotNull($oSearch);
-
-		// Alias => Expression (first select reference)
-		$oExpr1 = Expression::FromOQL('FiberChannelInterface.name');
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FiberChannelInterface.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-		$aArgs = array();
-
-		// Alias => Order
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => true,
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-		self::assertNotEmpty($sSQL);
-
-		// Alias => Order
-		$aOrderBy = array('nothing_good' => true);
-		$this->expectException("CoreException");
-		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-
-		self::assertTrue(false);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testSanity_1()
-	{
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
-		self::assertNotNull($oSearch);
-		$oExpr1 = Expression::FromOQL('FCI.name');
-
-		// Alias => Expression (first select reference)
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FCI.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'group1' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-		$aArgs = array();
-
-		// Alias => Order
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => true,
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-
-		$this->expectException("CoreException");
-		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-
-		self::assertTrue(false);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testSanity_2()
-	{
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
-		self::assertNotNull($oSearch);
-
-		// Alias => Expression (first select reference)
-		$oExpr1 = Expression::FromOQL('FCI.name');
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FCI.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-		$aArgs = array();
-
-		// Alias => Order
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => true,
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-		self::assertNotEmpty($sSQL);
-
-		$aGroupBy = array('group1' => 'FCI.name');
-		$this->expectException("CoreException");
-		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-
-		self::assertTrue(false);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testSanity_3()
-	{
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
-		self::assertNotNull($oSearch);
-
-		// Alias => Expression (first select reference)
-		$oExpr1 = Expression::FromOQL('FCI.name');
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FCI.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-		$aArgs = array();
-
-		// Alias => Order
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => true,
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-		self::assertNotEmpty($sSQL);
-
-		$aFunctions = array(
-			'_itop_sum_' => 'SumExpr',
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-
-		$this->expectException("CoreException");
-		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-
-		self::assertTrue(false);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testSanity_4()
-	{
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
-		self::assertNotNull($oSearch);
-
-		// Alias => Expression (first select reference)
-		$oExpr1 = Expression::FromOQL('FCI.name');
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FCI.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-		$aArgs = array();
-
-		// Alias => Order
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => true,
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-		self::assertNotEmpty($sSQL);
-
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => 'ASC',
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-
-		$this->expectException("CoreException");
-		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-
-		self::assertTrue(false);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function testSanity_5()
-	{
-		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
-		self::assertNotNull($oSearch);
-
-		// Alias => Expression (first select reference)
-		$oExpr1 = Expression::FromOQL('FCI.name');
-		$aGroupBy = array('group1' => $oExpr1);
-
-		$oTimeExpr = Expression::FromOQL('FCI.speed');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-		$aArgs = array();
-
-		// Alias => Order
-		$aOrderBy = array(
-			'group1' => true,
-			'_itop_sum_' => true,
-			'_itop_avg_' => true,
-			'_itop_min_' => true,
-			'_itop_max_' => true);
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-		self::assertNotEmpty($sSQL);
-
-		// Alias => Order
-		$aOrderBy = array('nothing_good' => true);
-		$this->expectException("CoreException");
-		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
-
-		self::assertTrue(false);
-	}
-
-	/**
-	 * @throws \MySQLException
-	 * @throws \OQLException
-	 */
-	public function testNoGroupBy()
-	{
-		$aReq = array(array(1, 0, 0), array(1, 1, 3), array(1, 1, 1), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1));
-		$sOrgs = $this->init_db(2, 4, $aReq);
-
-		$oSearch = DBSearch::FromOQL("SELECT UserRequest WHERE org_id IN ($sOrgs)");
-		self::assertNotNull($oSearch);
-
-
-		$oTimeExpr = Expression::FromOQL('UserRequest.time_spent');
-		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
-		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
-		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
-		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
-		// Alias => Expression
-		$aFunctions = array(
-			'_itop_sum_' => $oSumExpr,
-			'_itop_avg_' => $oAvgExpr,
-			'_itop_min_' => $oMinExpr,
-			'_itop_max_' => $oMaxExpr,
-		);
-
-		$aGroupBy = array();
-		$aOrderBy = array();
-		$aArgs = array();
-
-		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy, 0);
-		$this->debug($sSQL);
-
-		$aRes = CMDBSource::QueryToArray($sSQL);
-		$this->debug($aRes);
-
-		self::assertEquals(1, count($aRes));
-	}
-
-}
+<?php
+// Copyright (c) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 06/02/2018
+ * Time: 09:58
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+
+use CMDBSource;
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use DBSearch;
+use Exception;
+use Expression;
+use FunctionExpression;
+
+
+/**
+ * Tests of the DBSearch class.
+ * <ul>
+ * <li>MakeGroupByQuery</li>
+ * </ul>
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class DBSearchTest extends ItopDataTestCase
+{
+
+	/**
+	 * @throws \Exception
+	 */
+	protected function setUp()
+	{
+		parent::setUp();
+	}
+
+	/**
+	 * @dataProvider UReqProvider
+	 * @param $iOrgNb
+	 * @param $iPersonNb
+	 * @param $aReq
+	 * @param $iLimit
+	 * @param $aCountRes
+	 * @throws Exception
+	 */
+	public function testMakeGroupByQuery($iOrgNb, $iPersonNb, $aReq, $iLimit, $aCountRes)
+	{
+		$sOrgs = $this->init_db($iOrgNb, $iPersonNb, $aReq);
+
+		$oSearch = DBSearch::FromOQL("SELECT UserRequest WHERE org_id IN ($sOrgs)");
+		self::assertNotNull($oSearch);
+		$oExpr1 = Expression::FromOQL('UserRequest.org_id');
+
+		// Alias => Expression
+		$aGroupBy = array('org_id' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('UserRequest.time_spent');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+			);
+
+		// Alias => Order
+		$aOrderBy = array('_itop_sum_' => true, '_itop_count_' => true);
+
+		$aArgs = array();
+
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy, $iLimit);
+		$this->debug($sSQL);
+
+		$aRes = CMDBSource::QueryToArray($sSQL);
+		$this->debug($aRes);
+
+		self::assertEquals(count($aCountRes), count($aRes));
+		for ($i = 0; $i < count($aCountRes); $i++)
+		{
+			self::assertEquals($aCountRes[$i], $aRes[$i]['_itop_count_']);
+		}
+	}
+
+
+	public function UReqProvider()
+	{
+		return array(
+			"1 line" => array(1, 1, array(array(1, 0, 0)), 0, array('1')),
+			"2 same lines" => array(1, 1, array(array(1, 0, 0), array(1, 0, 0)), 0, array('2')),
+			"2 diff lines" => array(2, 2, array(array(1, 0, 0), array(1, 1, 1)), 0, array('1', '1')),
+			"4 lines" => array(2, 2, array(array(1, 0, 0), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1)), 0, array('2', '2')),
+			"5 lines" => array(2, 2, array(array(1, 0, 0), array(1, 0, 0), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1)), 0, array('2', '3')),
+			"6 lines" => array(2, 4, array(array(1, 0, 0), array(1, 1, 3), array(1, 1, 1), array(1, 1, 3), array(1, 0, 2), array(1, 1, 1)), 0, array('2', '4')),
+			"6 lines limit" => array(2, 4, array(array(1, 0, 0), array(1, 1, 3), array(1, 1, 1), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1)), 1, array('2')),
+		);
+	}
+
+	/**
+	 * @param int $iOrgNb Number of Organization to create
+	 * @param int $iPersonNb Number of Person to create
+	 * @param array $aReq  UserRequests to create: array(array([time_spent value], [org index], [person index]))
+	 * @return string organization list for select
+	 * @throws Exception
+	 */
+	private function init_db($iOrgNb, $iPersonNb, $aReq)
+	{
+		$aOrgIds = array();
+		$sOrgs = '';
+		for($i = 0; $i < $iOrgNb; $i++)
+		{
+			$oObj = $this->CreateOrganization('UnitTest_Org'.$i);
+			$sKey = $oObj->GetKey();
+			$aOrgIds[] = $sKey;
+			if ($i > 0)
+			{
+				$sOrgs .= ",";
+			}
+			$sOrgs .= $sKey;
+		}
+		self::assertEquals($iOrgNb, count($aOrgIds));
+
+		$aPersonIds = array();
+		for($i = 0; $i < $iPersonNb; $i++)
+		{
+			$oObj = $this->CreatePerson($i, $aOrgIds[$i % $iOrgNb]);
+			$aPersonIds[] = $oObj->GetKey();
+		}
+		self::assertEquals($iPersonNb, count($aPersonIds));
+
+		$i = 0;
+		foreach($aReq as $aParams)
+		{
+			$oObj = $this->CreateUserRequest($i, $aParams[0], $aOrgIds[$aParams[1]], $aPersonIds[$aParams[2]]);
+			self::assertNotNull($oObj);
+			$i++;
+		}
+		return $sOrgs;
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testGroupByUnion()
+	{
+		$oServer = $this->CreateServer(1);
+
+		$this->CreatePhysicalInterface(1, 1000, $oServer->GetKey());
+		$this->CreateFiberChannelInterface(1, 1000, $oServer->GetKey());
+
+
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
+		self::assertNotNull($oSearch);
+		$oExpr1 = Expression::FromOQL('FCI.name');
+
+		// Alias => Expression (first select reference)
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FCI.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+
+		// Alias => Order
+		$aOrderBy = array('group1' => true, '_itop_count_' => true);
+
+		$aArgs = array();
+
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+		$this->debug($sSQL);
+
+		$aRes = CMDBSource::QueryToArray($sSQL);
+		$this->debug($aRes);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testOrderBy_1()
+	{
+
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface");
+		self::assertNotNull($oSearch);
+
+		// Alias => Expression (first select reference)
+		$oExpr1 = Expression::FromOQL('FiberChannelInterface.name');
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FiberChannelInterface.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+		$aArgs = array();
+
+		// Alias => Order
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => true,
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+		self::assertNotEmpty($sSQL);
+
+		// Alias => Order
+		$aOrderBy = array('nothing_good' => true);
+		$this->expectException("CoreException");
+		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+
+		self::assertTrue(false);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testSanity_1()
+	{
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
+		self::assertNotNull($oSearch);
+		$oExpr1 = Expression::FromOQL('FCI.name');
+
+		// Alias => Expression (first select reference)
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FCI.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'group1' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+		$aArgs = array();
+
+		// Alias => Order
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => true,
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+
+		$this->expectException("CoreException");
+		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+
+		self::assertTrue(false);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testSanity_2()
+	{
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
+		self::assertNotNull($oSearch);
+
+		// Alias => Expression (first select reference)
+		$oExpr1 = Expression::FromOQL('FCI.name');
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FCI.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+		$aArgs = array();
+
+		// Alias => Order
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => true,
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+		self::assertNotEmpty($sSQL);
+
+		$aGroupBy = array('group1' => 'FCI.name');
+		$this->expectException("CoreException");
+		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+
+		self::assertTrue(false);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testSanity_3()
+	{
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
+		self::assertNotNull($oSearch);
+
+		// Alias => Expression (first select reference)
+		$oExpr1 = Expression::FromOQL('FCI.name');
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FCI.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+		$aArgs = array();
+
+		// Alias => Order
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => true,
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+		self::assertNotEmpty($sSQL);
+
+		$aFunctions = array(
+			'_itop_sum_' => 'SumExpr',
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+
+		$this->expectException("CoreException");
+		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+
+		self::assertTrue(false);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testSanity_4()
+	{
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
+		self::assertNotNull($oSearch);
+
+		// Alias => Expression (first select reference)
+		$oExpr1 = Expression::FromOQL('FCI.name');
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FCI.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+		$aArgs = array();
+
+		// Alias => Order
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => true,
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+		self::assertNotEmpty($sSQL);
+
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => 'ASC',
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+
+		$this->expectException("CoreException");
+		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+
+		self::assertTrue(false);
+	}
+
+	/**
+	 * @throws Exception
+	 */
+	public function testSanity_5()
+	{
+		$oSearch = DBSearch::FromOQL("SELECT FiberChannelInterface AS FCI WHERE FCI.name = '1' UNION SELECT PhysicalInterface AS PHI WHERE PHI.name = '1'");
+		self::assertNotNull($oSearch);
+
+		// Alias => Expression (first select reference)
+		$oExpr1 = Expression::FromOQL('FCI.name');
+		$aGroupBy = array('group1' => $oExpr1);
+
+		$oTimeExpr = Expression::FromOQL('FCI.speed');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+		$aArgs = array();
+
+		// Alias => Order
+		$aOrderBy = array(
+			'group1' => true,
+			'_itop_sum_' => true,
+			'_itop_avg_' => true,
+			'_itop_min_' => true,
+			'_itop_max_' => true);
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+		self::assertNotEmpty($sSQL);
+
+		// Alias => Order
+		$aOrderBy = array('nothing_good' => true);
+		$this->expectException("CoreException");
+		$oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy);
+
+		self::assertTrue(false);
+	}
+
+	/**
+	 * @throws \MySQLException
+	 * @throws \OQLException
+	 */
+	public function testNoGroupBy()
+	{
+		$aReq = array(array(1, 0, 0), array(1, 1, 3), array(1, 1, 1), array(1, 1, 1), array(1, 0, 0), array(1, 1, 1));
+		$sOrgs = $this->init_db(2, 4, $aReq);
+
+		$oSearch = DBSearch::FromOQL("SELECT UserRequest WHERE org_id IN ($sOrgs)");
+		self::assertNotNull($oSearch);
+
+
+		$oTimeExpr = Expression::FromOQL('UserRequest.time_spent');
+		$oSumExpr = new FunctionExpression('SUM', array($oTimeExpr));
+		$oAvgExpr = new FunctionExpression('AVG', array($oTimeExpr));
+		$oMinExpr = new FunctionExpression('MIN', array($oTimeExpr));
+		$oMaxExpr = new FunctionExpression('MAX', array($oTimeExpr));
+		// Alias => Expression
+		$aFunctions = array(
+			'_itop_sum_' => $oSumExpr,
+			'_itop_avg_' => $oAvgExpr,
+			'_itop_min_' => $oMinExpr,
+			'_itop_max_' => $oMaxExpr,
+		);
+
+		$aGroupBy = array();
+		$aOrderBy = array();
+		$aArgs = array();
+
+		$sSQL = $oSearch->MakeGroupByQuery($aArgs, $aGroupBy, false, $aFunctions, $aOrderBy, 0);
+		$this->debug($sSQL);
+
+		$aRes = CMDBSource::QueryToArray($sSQL);
+		$this->debug($aRes);
+
+		self::assertEquals(1, count($aRes));
+	}
+
+}
diff --git a/test/core/UserRightsTest.php b/test/core/UserRightsTest.php
index 384804494..d6741ac96 100644
--- a/test/core/UserRightsTest.php
+++ b/test/core/UserRightsTest.php
@@ -1,236 +1,236 @@
-<?php
-// Copyright (c) 2010-2018 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 25/01/2018
- * Time: 11:12
- */
-
-namespace Combodo\iTop\Test\UnitTest\Core;
-
-use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use PHPUnit\Framework\TestCase;
-use UserRights;
-
-class UserRightsTest extends ItopDataTestCase
-{
-
-	public static $aClasses = array(
-		'FunctionalCI' => array('class' => 'FunctionalCI', 'attcode' => 'name'),
-		'URP_UserProfile' => array('class' => 'URP_UserProfile', 'attcode' => 'reason'),
-		'UserLocal' => array('class' => 'UserLocal', 'attcode' => 'login'),
-		'UserRequest' => array('class' => 'UserRequest', 'attcode' => 'title'),
-		'ModuleInstallation' => array('class' => 'ModuleInstallation', 'attcode' => 'name'),
-	);
-
-
-	public function testIsLoggedIn()
-	{
-		$this->assertFalse(UserRights::IsLoggedIn());
-	}
-
-	/**
-	 * Test Login validation
-	 * @dataProvider LoginProvider
-	 * @param $sLogin
-	 * @param $bResult
-	 */
-	public function testLogin($sLogin, $bResult)
-	{
-		$_SESSION = array();
-		$this->assertEquals($bResult, UserRights::Login($sLogin));
-		$this->assertEquals($bResult, UserRights::IsLoggedIn());
-	}
-
-	public function LoginProvider()
-	{
-		return array(
-			array('admin', true),
-			array('NotALoginForUnitTests', false),
-			array('', false),
-		);
-	}
-
-	/**
-	 * @param string $sLogin
-	 * @param int $iProfileId initial profile
-	 * @return \DBObject
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	protected function AddUser($sLogin, $iProfileId)
-	{
-		$oUser = self::CreateUser('test1', $iProfileId);
-		$oUser->DBUpdate();
-		return $oUser;
-	}
-
-	/** Test IsActionAllowed when not logged => always true
-	 * @dataProvider ActionAllowedNotLoggedProvider
-	 * @param $aClassAction
-	 */
-	public function testIsActionAllowedNotLogged($aClassAction)
-	{
-		$bRes = (UserRights::IsActionAllowed($aClassAction['class'], $aClassAction['action'])) ? true : false;
-		$this->assertEquals(true, $bRes);
-	}
-
-	public function ActionAllowedNotLoggedProvider()
-	{
-		$aClassActions = array();
-
-		foreach(array_keys(self::$aClasses) as $sClass)
-		{
-			for ($i = 1; $i < 8; $i++)
-			{
-				$aClassAction = array('class' => $sClass, 'action' => $i);
-				$aClassActions[] = array($aClassAction);
-			}
-		}
-		return $aClassActions;
-	}
-
-	/** Test IsActionAllowed
-	 * @dataProvider ActionAllowedProvider
-	 * @param $iProfileId
-	 * @param $aClassActionResult
-	 * @throws \CoreException
-	 * @throws \Exception
-	 */
-	public function testIsActionAllowed($iProfileId, $aClassActionResult)
-	{
-		$this->AddUser('test1', $iProfileId);
-		$_SESSION = array();
-		$this->assertTrue(UserRights::Login('test1'));
-		$bRes = (UserRights::IsActionAllowed($aClassActionResult['class'], $aClassActionResult['action'])) ? true : false;
-		$this->assertEquals($aClassActionResult['res'], $bRes);
-	}
-
-	/*
-	 * FunctionalCI       => bizmodel	searchable
-	 * UserRequest        => bizmodel	searchable	requestmgmt
-	 * URP_UserProfile    => addon/userrights
-	 * UserLocal          => addon/authentication
-	 * ModuleInstallation => core	view_in_gui
-	 *
-	 */
-	public function ActionAllowedProvider()
-	{
-		return array(
-			/* Administrator (7 = UR_ACTION_CREATE)  */
-			'Administrator FunctionalCI write' => array(1 , array('class' => 'FunctionalCI', 'action' => 7, 'res' => true)),
-			'Administrator UserRequest write' => array(1 , array('class' => 'UserRequest', 'action' => 7, 'res' => true)),
-			'Administrator URP_UserProfile write' => array(1 , array('class' => 'URP_UserProfile', 'action' => 7, 'res' => true)),
-			'Administrator UserLocal write' => array(1 , array('class' => 'UserLocal', 'action' => 7, 'res' => true)),
-			'Administrator ModuleInstallation write' => array(1 , array('class' => 'ModuleInstallation', 'action' => 7, 'res' => true)),
-
-			/* User Portal  (7 = UR_ACTION_CREATE) */
-			'User Portal FunctionalCI write' => array(2 , array('class' => 'FunctionalCI', 'action' => 7, 'res' => false)),
-			'User Portal UserRequest write' => array(2 , array('class' => 'UserRequest', 'action' => 7, 'res' => true)),
-			'User Portal URP_UserProfile write' => array(2 , array('class' => 'URP_UserProfile', 'action' => 7, 'res' => false)),
-			'User Portal UserLocal write' => array(2 , array('class' => 'UserLocal', 'action' => 7, 'res' => false)),
-			'User Portal ModuleInstallation write' => array(2 , array('class' => 'ModuleInstallation', 'action' => 7, 'res' => false)),
-
-			/* Configuration manager (7 = UR_ACTION_CREATE) */
-			'Configuration manager FunctionalCI write' => array(3 , array('class' => 'FunctionalCI', 'action' => 7, 'res' => true)),
-			'Configuration manager UserRequest write' => array(3 , array('class' => 'UserRequest', 'action' => 7, 'res' => false)),
-			'Configuration manager URP_UserProfile write' => array(3 , array('class' => 'URP_UserProfile', 'action' => 7, 'res' => false)),
-			'Configuration manager UserLocal write' => array(3 , array('class' => 'UserLocal', 'action' => 7, 'res' => false)),
-			'Configuration manager ModuleInstallation write' => array(3 , array('class' => 'ModuleInstallation', 'action' => 7, 'res' => false)),
-
-			/* Administrator (1 = UR_ACTION_READ)  */
-			'Administrator FunctionalCI read' => array(1 , array('class' => 'FunctionalCI', 'action' => 1, 'res' => true)),
-			'Administrator UserRequest read' => array(1 , array('class' => 'UserRequest', 'action' => 1, 'res' => true)),
-			'Administrator URP_UserProfile read' => array(1 , array('class' => 'URP_UserProfile', 'action' => 1, 'res' => true)),
-			'Administrator UserLocal read' => array(1 , array('class' => 'UserLocal', 'action' => 1, 'res' => true)),
-			'Administrator ModuleInstallation read' => array(1 , array('class' => 'ModuleInstallation', 'action' => 1, 'res' => true)),
-
-			/* User Portal  (1 = UR_ACTION_READ) */
-			'User Portal FunctionalCI read' => array(2 , array('class' => 'FunctionalCI', 'action' => 1, 'res' => true)),
-			'User Portal UserRequest read' => array(2 , array('class' => 'UserRequest', 'action' => 1, 'res' => true)),
-			'User Portal URP_UserProfile read' => array(2 , array('class' => 'URP_UserProfile', 'action' => 1, 'res' => false)),
-			'User Portal UserLocal read' => array(2 , array('class' => 'UserLocal', 'action' => 1, 'res' => false)),
-			'User Portal ModuleInstallation read' => array(2 , array('class' => 'ModuleInstallation', 'action' => 1, 'res' => true)),
-
-			/* Configuration manager (1 = UR_ACTION_READ) */
-			'Configuration manager FunctionalCI read' => array(3 , array('class' => 'FunctionalCI', 'action' => 1, 'res' => true)),
-			'Configuration manager UserRequest read' => array(3 , array('class' => 'UserRequest', 'action' => 1, 'res' => true)),
-			'Configuration manager URP_UserProfile read' => array(3 , array('class' => 'URP_UserProfile', 'action' => 1, 'res' => false)),
-			'Configuration manager UserLocal read' => array(3 , array('class' => 'UserLocal', 'action' => 1, 'res' => false)),
-			'Configuration manager ModuleInstallation read' =>array(3 , array('class' => 'ModuleInstallation', 'action' => 1, 'res' => true)),
-		);
-	}
-
-
-	/** Test IsActionAllowedOnAttribute
-	 * @dataProvider ActionAllowedOnAttributeProvider
-	 * @param $iProfileId
-	 * @param $aClassActionResult
-	 * @throws \Exception
-	 */
-	public function testIsActionAllowedOnAttribute($iProfileId, $aClassActionResult)
-	{
-		$this->AddUser('test1', $iProfileId);
-		$_SESSION = array();
-		$this->assertTrue(UserRights::Login('test1'));
-		$sClass = $aClassActionResult['class'];
-		$bRes = (UserRights::IsActionAllowedOnAttribute($sClass, self::$aClasses[$sClass]['attcode'], $aClassActionResult['action'])) ? true : false;
-		$this->assertEquals($aClassActionResult['res'], $bRes);
-
-	}
-
-	/*
-	 * FunctionalCI       => bizmodel	searchable
-	 * UserRequest        => bizmodel	searchable	requestmgmt
-	 * URP_UserProfile    => addon/userrights   grant_by_profile
-	 * UserLocal          => addon/authentication   grant_by_profile
-	 * ModuleInstallation => core	view_in_gui
-	 *
-	 */
-	public function ActionAllowedOnAttributeProvider()
-	{
-		$aClassActionResult = array(
-			/* Administrator (2 = UR_ACTION_MODIFY)  */
-			'Administrator FunctionalCI' => array(1 , array('class' => 'FunctionalCI', 'action' => 2, 'res' => true)),
-			'Administrator UserRequest' => array(1 , array('class' => 'UserRequest', 'action' => 2, 'res' => true)),
-			'Administrator URP_UserProfile' => array(1 , array('class' => 'URP_UserProfile', 'action' => 2, 'res' => true)),
-			'Administrator UserLocal' => array(1 , array('class' => 'UserLocal', 'action' => 2, 'res' => true)),
-			'Administrator ModuleInstallation' => array(1 , array('class' => 'ModuleInstallation', 'action' => 2, 'res' => true)),
-
-			/* User Portal  (2 = UR_ACTION_MODIFY) */
-			'User Portal FunctionalCI' => array(2 , array('class' => 'FunctionalCI', 'action' => 2, 'res' => false)),
-			'User Portal UserRequest' => array(2 , array('class' => 'UserRequest', 'action' => 2, 'res' => true)),
-			'User Portal URP_UserProfile' => array(2 , array('class' => 'URP_UserProfile', 'action' => 2, 'res' => false)),
-			'User Portal UserLocal' => array(2 , array('class' => 'UserLocal', 'action' => 2, 'res' => false)),
-			'User Portal ModuleInstallation' => array(2 , array('class' => 'ModuleInstallation', 'action' => 2, 'res' => true)),
-
-			/* Configuration manager (2 = UR_ACTION_MODIFY) */
-			'Configuration manager FunctionalCI' => array(3 , array('class' => 'FunctionalCI', 'action' => 2, 'res' => true)),
-			'Configuration manager UserRequest' => array(3 , array('class' => 'UserRequest', 'action' => 2, 'res' => false)),
-			'Configuration manager URP_UserProfile' => array(3 , array('class' => 'URP_UserProfile', 'action' => 2, 'res' => false)),
-			'Configuration manager UserLocal' => array(3 , array('class' => 'UserLocal', 'action' => 2, 'res' => false)),
-			'Configuration manager ModuleInstallation' => array(3 , array('class' => 'ModuleInstallation', 'action' => 2, 'res' => true)),
-		);
-
-		return $aClassActionResult;
-	}
-
-}
+<?php
+// Copyright (c) 2010-2018 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 25/01/2018
+ * Time: 11:12
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use PHPUnit\Framework\TestCase;
+use UserRights;
+
+class UserRightsTest extends ItopDataTestCase
+{
+
+	public static $aClasses = array(
+		'FunctionalCI' => array('class' => 'FunctionalCI', 'attcode' => 'name'),
+		'URP_UserProfile' => array('class' => 'URP_UserProfile', 'attcode' => 'reason'),
+		'UserLocal' => array('class' => 'UserLocal', 'attcode' => 'login'),
+		'UserRequest' => array('class' => 'UserRequest', 'attcode' => 'title'),
+		'ModuleInstallation' => array('class' => 'ModuleInstallation', 'attcode' => 'name'),
+	);
+
+
+	public function testIsLoggedIn()
+	{
+		$this->assertFalse(UserRights::IsLoggedIn());
+	}
+
+	/**
+	 * Test Login validation
+	 * @dataProvider LoginProvider
+	 * @param $sLogin
+	 * @param $bResult
+	 */
+	public function testLogin($sLogin, $bResult)
+	{
+		$_SESSION = array();
+		$this->assertEquals($bResult, UserRights::Login($sLogin));
+		$this->assertEquals($bResult, UserRights::IsLoggedIn());
+	}
+
+	public function LoginProvider()
+	{
+		return array(
+			array('admin', true),
+			array('NotALoginForUnitTests', false),
+			array('', false),
+		);
+	}
+
+	/**
+	 * @param string $sLogin
+	 * @param int $iProfileId initial profile
+	 * @return \DBObject
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	protected function AddUser($sLogin, $iProfileId)
+	{
+		$oUser = self::CreateUser('test1', $iProfileId);
+		$oUser->DBUpdate();
+		return $oUser;
+	}
+
+	/** Test IsActionAllowed when not logged => always true
+	 * @dataProvider ActionAllowedNotLoggedProvider
+	 * @param $aClassAction
+	 */
+	public function testIsActionAllowedNotLogged($aClassAction)
+	{
+		$bRes = (UserRights::IsActionAllowed($aClassAction['class'], $aClassAction['action'])) ? true : false;
+		$this->assertEquals(true, $bRes);
+	}
+
+	public function ActionAllowedNotLoggedProvider()
+	{
+		$aClassActions = array();
+
+		foreach(array_keys(self::$aClasses) as $sClass)
+		{
+			for ($i = 1; $i < 8; $i++)
+			{
+				$aClassAction = array('class' => $sClass, 'action' => $i);
+				$aClassActions[] = array($aClassAction);
+			}
+		}
+		return $aClassActions;
+	}
+
+	/** Test IsActionAllowed
+	 * @dataProvider ActionAllowedProvider
+	 * @param $iProfileId
+	 * @param $aClassActionResult
+	 * @throws \CoreException
+	 * @throws \Exception
+	 */
+	public function testIsActionAllowed($iProfileId, $aClassActionResult)
+	{
+		$this->AddUser('test1', $iProfileId);
+		$_SESSION = array();
+		$this->assertTrue(UserRights::Login('test1'));
+		$bRes = (UserRights::IsActionAllowed($aClassActionResult['class'], $aClassActionResult['action'])) ? true : false;
+		$this->assertEquals($aClassActionResult['res'], $bRes);
+	}
+
+	/*
+	 * FunctionalCI       => bizmodel	searchable
+	 * UserRequest        => bizmodel	searchable	requestmgmt
+	 * URP_UserProfile    => addon/userrights
+	 * UserLocal          => addon/authentication
+	 * ModuleInstallation => core	view_in_gui
+	 *
+	 */
+	public function ActionAllowedProvider()
+	{
+		return array(
+			/* Administrator (7 = UR_ACTION_CREATE)  */
+			'Administrator FunctionalCI write' => array(1 , array('class' => 'FunctionalCI', 'action' => 7, 'res' => true)),
+			'Administrator UserRequest write' => array(1 , array('class' => 'UserRequest', 'action' => 7, 'res' => true)),
+			'Administrator URP_UserProfile write' => array(1 , array('class' => 'URP_UserProfile', 'action' => 7, 'res' => true)),
+			'Administrator UserLocal write' => array(1 , array('class' => 'UserLocal', 'action' => 7, 'res' => true)),
+			'Administrator ModuleInstallation write' => array(1 , array('class' => 'ModuleInstallation', 'action' => 7, 'res' => true)),
+
+			/* User Portal  (7 = UR_ACTION_CREATE) */
+			'User Portal FunctionalCI write' => array(2 , array('class' => 'FunctionalCI', 'action' => 7, 'res' => false)),
+			'User Portal UserRequest write' => array(2 , array('class' => 'UserRequest', 'action' => 7, 'res' => true)),
+			'User Portal URP_UserProfile write' => array(2 , array('class' => 'URP_UserProfile', 'action' => 7, 'res' => false)),
+			'User Portal UserLocal write' => array(2 , array('class' => 'UserLocal', 'action' => 7, 'res' => false)),
+			'User Portal ModuleInstallation write' => array(2 , array('class' => 'ModuleInstallation', 'action' => 7, 'res' => false)),
+
+			/* Configuration manager (7 = UR_ACTION_CREATE) */
+			'Configuration manager FunctionalCI write' => array(3 , array('class' => 'FunctionalCI', 'action' => 7, 'res' => true)),
+			'Configuration manager UserRequest write' => array(3 , array('class' => 'UserRequest', 'action' => 7, 'res' => false)),
+			'Configuration manager URP_UserProfile write' => array(3 , array('class' => 'URP_UserProfile', 'action' => 7, 'res' => false)),
+			'Configuration manager UserLocal write' => array(3 , array('class' => 'UserLocal', 'action' => 7, 'res' => false)),
+			'Configuration manager ModuleInstallation write' => array(3 , array('class' => 'ModuleInstallation', 'action' => 7, 'res' => false)),
+
+			/* Administrator (1 = UR_ACTION_READ)  */
+			'Administrator FunctionalCI read' => array(1 , array('class' => 'FunctionalCI', 'action' => 1, 'res' => true)),
+			'Administrator UserRequest read' => array(1 , array('class' => 'UserRequest', 'action' => 1, 'res' => true)),
+			'Administrator URP_UserProfile read' => array(1 , array('class' => 'URP_UserProfile', 'action' => 1, 'res' => true)),
+			'Administrator UserLocal read' => array(1 , array('class' => 'UserLocal', 'action' => 1, 'res' => true)),
+			'Administrator ModuleInstallation read' => array(1 , array('class' => 'ModuleInstallation', 'action' => 1, 'res' => true)),
+
+			/* User Portal  (1 = UR_ACTION_READ) */
+			'User Portal FunctionalCI read' => array(2 , array('class' => 'FunctionalCI', 'action' => 1, 'res' => true)),
+			'User Portal UserRequest read' => array(2 , array('class' => 'UserRequest', 'action' => 1, 'res' => true)),
+			'User Portal URP_UserProfile read' => array(2 , array('class' => 'URP_UserProfile', 'action' => 1, 'res' => false)),
+			'User Portal UserLocal read' => array(2 , array('class' => 'UserLocal', 'action' => 1, 'res' => false)),
+			'User Portal ModuleInstallation read' => array(2 , array('class' => 'ModuleInstallation', 'action' => 1, 'res' => true)),
+
+			/* Configuration manager (1 = UR_ACTION_READ) */
+			'Configuration manager FunctionalCI read' => array(3 , array('class' => 'FunctionalCI', 'action' => 1, 'res' => true)),
+			'Configuration manager UserRequest read' => array(3 , array('class' => 'UserRequest', 'action' => 1, 'res' => true)),
+			'Configuration manager URP_UserProfile read' => array(3 , array('class' => 'URP_UserProfile', 'action' => 1, 'res' => false)),
+			'Configuration manager UserLocal read' => array(3 , array('class' => 'UserLocal', 'action' => 1, 'res' => false)),
+			'Configuration manager ModuleInstallation read' =>array(3 , array('class' => 'ModuleInstallation', 'action' => 1, 'res' => true)),
+		);
+	}
+
+
+	/** Test IsActionAllowedOnAttribute
+	 * @dataProvider ActionAllowedOnAttributeProvider
+	 * @param $iProfileId
+	 * @param $aClassActionResult
+	 * @throws \Exception
+	 */
+	public function testIsActionAllowedOnAttribute($iProfileId, $aClassActionResult)
+	{
+		$this->AddUser('test1', $iProfileId);
+		$_SESSION = array();
+		$this->assertTrue(UserRights::Login('test1'));
+		$sClass = $aClassActionResult['class'];
+		$bRes = (UserRights::IsActionAllowedOnAttribute($sClass, self::$aClasses[$sClass]['attcode'], $aClassActionResult['action'])) ? true : false;
+		$this->assertEquals($aClassActionResult['res'], $bRes);
+
+	}
+
+	/*
+	 * FunctionalCI       => bizmodel	searchable
+	 * UserRequest        => bizmodel	searchable	requestmgmt
+	 * URP_UserProfile    => addon/userrights   grant_by_profile
+	 * UserLocal          => addon/authentication   grant_by_profile
+	 * ModuleInstallation => core	view_in_gui
+	 *
+	 */
+	public function ActionAllowedOnAttributeProvider()
+	{
+		$aClassActionResult = array(
+			/* Administrator (2 = UR_ACTION_MODIFY)  */
+			'Administrator FunctionalCI' => array(1 , array('class' => 'FunctionalCI', 'action' => 2, 'res' => true)),
+			'Administrator UserRequest' => array(1 , array('class' => 'UserRequest', 'action' => 2, 'res' => true)),
+			'Administrator URP_UserProfile' => array(1 , array('class' => 'URP_UserProfile', 'action' => 2, 'res' => true)),
+			'Administrator UserLocal' => array(1 , array('class' => 'UserLocal', 'action' => 2, 'res' => true)),
+			'Administrator ModuleInstallation' => array(1 , array('class' => 'ModuleInstallation', 'action' => 2, 'res' => true)),
+
+			/* User Portal  (2 = UR_ACTION_MODIFY) */
+			'User Portal FunctionalCI' => array(2 , array('class' => 'FunctionalCI', 'action' => 2, 'res' => false)),
+			'User Portal UserRequest' => array(2 , array('class' => 'UserRequest', 'action' => 2, 'res' => true)),
+			'User Portal URP_UserProfile' => array(2 , array('class' => 'URP_UserProfile', 'action' => 2, 'res' => false)),
+			'User Portal UserLocal' => array(2 , array('class' => 'UserLocal', 'action' => 2, 'res' => false)),
+			'User Portal ModuleInstallation' => array(2 , array('class' => 'ModuleInstallation', 'action' => 2, 'res' => true)),
+
+			/* Configuration manager (2 = UR_ACTION_MODIFY) */
+			'Configuration manager FunctionalCI' => array(3 , array('class' => 'FunctionalCI', 'action' => 2, 'res' => true)),
+			'Configuration manager UserRequest' => array(3 , array('class' => 'UserRequest', 'action' => 2, 'res' => false)),
+			'Configuration manager URP_UserProfile' => array(3 , array('class' => 'URP_UserProfile', 'action' => 2, 'res' => false)),
+			'Configuration manager UserLocal' => array(3 , array('class' => 'UserLocal', 'action' => 2, 'res' => false)),
+			'Configuration manager ModuleInstallation' => array(3 , array('class' => 'ModuleInstallation', 'action' => 2, 'res' => true)),
+		);
+
+		return $aClassActionResult;
+	}
+
+}
diff --git a/test/core/apcEmulationTest.php b/test/core/apcEmulationTest.php
index 2da1647ea..65a1d6f13 100644
--- a/test/core/apcEmulationTest.php
+++ b/test/core/apcEmulationTest.php
@@ -1,195 +1,195 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 31/10/2017
- * Time: 14:10
- */
-
-namespace Combodo\iTop\Test\UnitTest\Core;
-
-use Combodo\iTop\Test\UnitTest\ItopTestCase;
-use PHPUnit\Framework\TestCase;
-
-define('UNIT_MAX_CACHE_FILES', 10);
-
-
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class apcEmulationTest extends ItopTestCase
-{
-
-	protected function setUp()
-	{
-		parent::setUp();
-		require_once(APPROOT.'core/apc-emulation.php');
-		require_once 'mockApcEmulation.incphp';
-		apc_clear_cache();
-	}
-
-	public function tearDown()
-	{
-		apc_clear_cache();
-	}
-
-	public function testBasic()
-	{
-		$this->assertTrue(apc_store('test-ttl', 'This is a test with TTL', 100));
-		$this->assertTrue(apc_store('test-nottl', 'This is a test without TTL'));
-
-		$this->assertEquals('This is a test with TTL', apc_fetch('test-ttl'));
-		$this->assertEquals('This is a test without TTL', apc_fetch('test-nottl'));
-	}
-
-	public function testMultiple()
-	{
-		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
-		{
-			$this->assertTrue(apc_store('testMultiple'.$i, 'This is a test', 100));
-		}
-		$aInfo = apc_cache_info();
-		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
-	}
-
-	public function testNumberOfFilesTTL()
-	{
-		for($i = 0; $i < 2 * UNIT_MAX_CACHE_FILES; $i++)
-		{
-			$this->assertTrue(apc_store('testNumberOfFilesTTL'.$i, 'This is a test', 100));
-		}
-		$aInfo = apc_cache_info();
-		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
-
-		$this->assertFalse(apc_fetch('testNumberOfFilesTTL0'));
-	}
-
-	public function testNumberOfFilesNoTTL()
-	{
-		for($i = 0; $i < 2 * UNIT_MAX_CACHE_FILES; $i++)
-		{
-			$this->assertTrue(apc_store('testNumberOfFilesNoTTL'.$i, 'This is a test'));
-		}
-		$aInfo = apc_cache_info();
-		$this->assertEquals(2 * UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
-
-		$this->assertTrue(apc_fetch('testNumberOfFilesNoTTL0') !== false);
-	}
-
-	public function testArray()
-	{
-		$aStoredEntries = array();
-		$aFetchedEntries = array();
-		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
-		{
-			$sKey = 'testArray'.$i;
-			$aStoredEntries[$sKey] = 'This is a test ARRAY'.rand();
-			$aFetchedEntries[] = $sKey;
-		}
-		$aResStore = apc_store($aStoredEntries);
-		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aResStore));
-		foreach($aResStore as $bValue)
-		{
-			$this->assertTrue($bValue);
-		}
-
-		$aInfo = apc_cache_info();
-		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
-
-		$aResFetch = apc_fetch($aFetchedEntries);
-		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aResFetch));
-
-		foreach($aResFetch as $sKey => $sValue)
-		{
-			$this->assertEquals($aStoredEntries[$sKey], $sValue);
-		}
-	}
-
-
-	public function testSanity()
-	{
-		$this->assertTrue(apc_store('testSanity', null, 100));
-		$this->assertTrue(is_null(apc_fetch('testSanity')));
-
-		$this->assertFalse(apc_store(null, 'testSanity', 100));
-		$this->assertFalse(apc_fetch(null));
-
-		$this->assertTrue(apc_store('testSanity2', null));
-		$this->assertFalse(apc_store(null, 'testSanity2'));
-		$this->assertFalse(apc_store('', 'testSanity2'));
-
-		$this->assertFalse(apc_delete(null));
-		$this->assertFalse(apc_delete(''));
-	}
-
-	public function testDelete()
-	{
-		$this->assertTrue(apc_store('test-ttl', 'This is a test with TTL', 100));
-		$this->assertTrue(apc_store('test-nottl', 'This is a test without TTL'));
-
-		$this->assertTrue(apc_delete('test-ttl'));
-		$this->assertFalse(apc_delete('test-ttl'));
-		$this->assertTrue(apc_delete('test-nottl'));
-
-		$this->assertFalse(apc_fetch('test-ttl'));
-		$this->assertFalse(apc_fetch('test-nottl'));
-	}
-
-	public function testReuseSameKey()
-	{
-		// first use of the key
-		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test with TTL', 100));
-		$this->assertEquals('This is a test with TTL', apc_fetch('testReuseSameKey'));
-		// same key but no ttl
-		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test without TTL'));
-		$this->assertEquals('This is a test without TTL', apc_fetch('testReuseSameKey'));
-		// same key with ttl
-		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test with TTL', 100));
-		$this->assertEquals('This is a test with TTL', apc_fetch('testReuseSameKey'));
-		// same key with ttl but other content
-		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test', 100));
-		$this->assertEquals('This is a test', apc_fetch('testReuseSameKey'));
-		// remove entry
-		$this->assertTrue(apc_delete('testReuseSameKey'));
-		// check entry is removed
-		$this->assertFalse(apc_fetch('testReuseSameKey'));
-	}
-
-	public function testHuge()
-	{
-		$ilen = 20000000;
-		$sContent = str_pad(' TEST ', $ilen, "-=", STR_PAD_BOTH);
-		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
-		{
-			$this->assertTrue(apc_store('testHuge'.$i, $sContent, 100));
-		}
-		$aInfo = apc_cache_info();
-		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
-
-		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
-		{
-			$this->assertEquals($ilen, strlen(apc_fetch('testHuge'.$i)));
-		}
-	}
-
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 31/10/2017
+ * Time: 14:10
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use PHPUnit\Framework\TestCase;
+
+define('UNIT_MAX_CACHE_FILES', 10);
+
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class apcEmulationTest extends ItopTestCase
+{
+
+	protected function setUp()
+	{
+		parent::setUp();
+		require_once(APPROOT.'core/apc-emulation.php');
+		require_once 'mockApcEmulation.incphp';
+		apc_clear_cache();
+	}
+
+	public function tearDown()
+	{
+		apc_clear_cache();
+	}
+
+	public function testBasic()
+	{
+		$this->assertTrue(apc_store('test-ttl', 'This is a test with TTL', 100));
+		$this->assertTrue(apc_store('test-nottl', 'This is a test without TTL'));
+
+		$this->assertEquals('This is a test with TTL', apc_fetch('test-ttl'));
+		$this->assertEquals('This is a test without TTL', apc_fetch('test-nottl'));
+	}
+
+	public function testMultiple()
+	{
+		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
+		{
+			$this->assertTrue(apc_store('testMultiple'.$i, 'This is a test', 100));
+		}
+		$aInfo = apc_cache_info();
+		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
+	}
+
+	public function testNumberOfFilesTTL()
+	{
+		for($i = 0; $i < 2 * UNIT_MAX_CACHE_FILES; $i++)
+		{
+			$this->assertTrue(apc_store('testNumberOfFilesTTL'.$i, 'This is a test', 100));
+		}
+		$aInfo = apc_cache_info();
+		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
+
+		$this->assertFalse(apc_fetch('testNumberOfFilesTTL0'));
+	}
+
+	public function testNumberOfFilesNoTTL()
+	{
+		for($i = 0; $i < 2 * UNIT_MAX_CACHE_FILES; $i++)
+		{
+			$this->assertTrue(apc_store('testNumberOfFilesNoTTL'.$i, 'This is a test'));
+		}
+		$aInfo = apc_cache_info();
+		$this->assertEquals(2 * UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
+
+		$this->assertTrue(apc_fetch('testNumberOfFilesNoTTL0') !== false);
+	}
+
+	public function testArray()
+	{
+		$aStoredEntries = array();
+		$aFetchedEntries = array();
+		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
+		{
+			$sKey = 'testArray'.$i;
+			$aStoredEntries[$sKey] = 'This is a test ARRAY'.rand();
+			$aFetchedEntries[] = $sKey;
+		}
+		$aResStore = apc_store($aStoredEntries);
+		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aResStore));
+		foreach($aResStore as $bValue)
+		{
+			$this->assertTrue($bValue);
+		}
+
+		$aInfo = apc_cache_info();
+		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
+
+		$aResFetch = apc_fetch($aFetchedEntries);
+		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aResFetch));
+
+		foreach($aResFetch as $sKey => $sValue)
+		{
+			$this->assertEquals($aStoredEntries[$sKey], $sValue);
+		}
+	}
+
+
+	public function testSanity()
+	{
+		$this->assertTrue(apc_store('testSanity', null, 100));
+		$this->assertTrue(is_null(apc_fetch('testSanity')));
+
+		$this->assertFalse(apc_store(null, 'testSanity', 100));
+		$this->assertFalse(apc_fetch(null));
+
+		$this->assertTrue(apc_store('testSanity2', null));
+		$this->assertFalse(apc_store(null, 'testSanity2'));
+		$this->assertFalse(apc_store('', 'testSanity2'));
+
+		$this->assertFalse(apc_delete(null));
+		$this->assertFalse(apc_delete(''));
+	}
+
+	public function testDelete()
+	{
+		$this->assertTrue(apc_store('test-ttl', 'This is a test with TTL', 100));
+		$this->assertTrue(apc_store('test-nottl', 'This is a test without TTL'));
+
+		$this->assertTrue(apc_delete('test-ttl'));
+		$this->assertFalse(apc_delete('test-ttl'));
+		$this->assertTrue(apc_delete('test-nottl'));
+
+		$this->assertFalse(apc_fetch('test-ttl'));
+		$this->assertFalse(apc_fetch('test-nottl'));
+	}
+
+	public function testReuseSameKey()
+	{
+		// first use of the key
+		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test with TTL', 100));
+		$this->assertEquals('This is a test with TTL', apc_fetch('testReuseSameKey'));
+		// same key but no ttl
+		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test without TTL'));
+		$this->assertEquals('This is a test without TTL', apc_fetch('testReuseSameKey'));
+		// same key with ttl
+		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test with TTL', 100));
+		$this->assertEquals('This is a test with TTL', apc_fetch('testReuseSameKey'));
+		// same key with ttl but other content
+		$this->assertTrue(apc_store('testReuseSameKey', 'This is a test', 100));
+		$this->assertEquals('This is a test', apc_fetch('testReuseSameKey'));
+		// remove entry
+		$this->assertTrue(apc_delete('testReuseSameKey'));
+		// check entry is removed
+		$this->assertFalse(apc_fetch('testReuseSameKey'));
+	}
+
+	public function testHuge()
+	{
+		$ilen = 20000000;
+		$sContent = str_pad(' TEST ', $ilen, "-=", STR_PAD_BOTH);
+		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
+		{
+			$this->assertTrue(apc_store('testHuge'.$i, $sContent, 100));
+		}
+		$aInfo = apc_cache_info();
+		$this->assertEquals(UNIT_MAX_CACHE_FILES, count($aInfo['cache_list']));
+
+		for($i = 0; $i < UNIT_MAX_CACHE_FILES; $i++)
+		{
+			$this->assertEquals($ilen, strlen(apc_fetch('testHuge'.$i)));
+		}
+	}
+
 }
\ No newline at end of file
diff --git a/test/core/dictTest.php b/test/core/dictTest.php
index 3d4de9cb4..f2f779c44 100644
--- a/test/core/dictTest.php
+++ b/test/core/dictTest.php
@@ -1,58 +1,58 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 30/10/2017
- * Time: 13:43
- */
-
-namespace Combodo\iTop\Test\UnitTest\Core;
-
-use Combodo\iTop\Test\UnitTest\ItopTestCase;
-use Dict;
-use Exception;
-use PHPUnit\Framework\TestCase;
-
-
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class dictTest extends ItopTestCase
-{
-	protected function setUp()
-	{
-		parent::setUp();
-		require_once (APPROOT.'core/coreexception.class.inc.php');
-		require_once (APPROOT.'core/dict.class.inc.php');
-		require_once 'mockDict.incphp';
-	}
-
-    /**
-     * @throws Exception
-     */
-    public function testType()
-	{
-		$this->assertInternalType('string', Dict::S('Core:AttributeURL'));
-		$this->assertInternalType('string', Dict::Format('Change:AttName_SetTo', '1', '2'));
-	}
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 30/10/2017
+ * Time: 13:43
+ */
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Dict;
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class dictTest extends ItopTestCase
+{
+	protected function setUp()
+	{
+		parent::setUp();
+		require_once (APPROOT.'core/coreexception.class.inc.php');
+		require_once (APPROOT.'core/dict.class.inc.php');
+		require_once 'mockDict.incphp';
+	}
+
+    /**
+     * @throws Exception
+     */
+    public function testType()
+	{
+		$this->assertInternalType('string', Dict::S('Core:AttributeURL'));
+		$this->assertInternalType('string', Dict::Format('Change:AttName_SetTo', '1', '2'));
+	}
 }
\ No newline at end of file
diff --git a/test/core/mockApcEmulation.incphp b/test/core/mockApcEmulation.incphp
index ff9730305..46a6ed8a8 100644
--- a/test/core/mockApcEmulation.incphp
+++ b/test/core/mockApcEmulation.incphp
@@ -1,52 +1,52 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 03/11/2017
- * Time: 09:55
- */
-
-// --------------- Mock
-class utils
-{
-	public static function GetCachePath()
-	{
-		return APPROOT.'data/cache-unittest/';
-	}
-}
-
-class UnitConfig
-{
-	public function Get($sPropCode)
-	{
-		return UNIT_MAX_CACHE_FILES;
-	}
-}
-
-class MetaModel
-{
-	public static function GetConfig()
-	{
-		return new UnitConfig;
-	}
-}
-
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 03/11/2017
+ * Time: 09:55
+ */
+
+// --------------- Mock
+class utils
+{
+	public static function GetCachePath()
+	{
+		return APPROOT.'data/cache-unittest/';
+	}
+}
+
+class UnitConfig
+{
+	public function Get($sPropCode)
+	{
+		return UNIT_MAX_CACHE_FILES;
+	}
+}
+
+class MetaModel
+{
+	public static function GetConfig()
+	{
+		return new UnitConfig;
+	}
+}
+
 // --------------- End Mock
\ No newline at end of file
diff --git a/test/core/mockDict.incphp b/test/core/mockDict.incphp
index c50c1a5a9..7111450db 100644
--- a/test/core/mockDict.incphp
+++ b/test/core/mockDict.incphp
@@ -1,26 +1,26 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-class utils
-{
-    public static function GetCurrentEnvironment()
-    {
-        return 'production';
-    }
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+class utils
+{
+    public static function GetCurrentEnvironment()
+    {
+        return 'production';
+    }
 }
\ No newline at end of file
diff --git a/test/core/ormLinkSetTest.php b/test/core/ormLinkSetTest.php
index 9d62ac70b..2c319b48c 100644
--- a/test/core/ormLinkSetTest.php
+++ b/test/core/ormLinkSetTest.php
@@ -1,245 +1,245 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 20/12/2017
- * Time: 11:56
- */
-
-
-namespace Combodo\iTop\Test\UnitTest\Core;
-
-use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use Exception;
-use ormLinkSet;
-use PHPUnit\Framework\TestCase;
-
-
-/**
- * Tests of the ormLinkSet class using N-N links between FunctionalCI and Contact
- *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class ormLinkSetTest extends ItopDataTestCase
-{
-
-    /**
-     * @throws Exception
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-    }
-
-    /**
-     *
-     */
-    public function testConstruct()
-    {
-        $oOrmLink = new ormLinkSet('UserRequest', 'contacts_list');
-        $this->assertNotNull($oOrmLink);
-    }
-
-    /**
-     *
-     */
-    public function testConstruct2()
-    {
-        $this->expectException('Exception');
-
-        new ormLinkSet('UserRequest', 'ref');
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function testBasic()
-    {
-        $oServer = $this->CreateServer(1);
-        $aPersons = array();
-        for ($i = 0; $i < 3; $i++)
-        {
-            $oPerson = $this->CreatePerson($i);
-            $aPersons[] = $oPerson;
-            $this->AddContactToCI($oPerson, $oServer);
-        }
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function testSuccesiveAdds()
-    {
-        $oServer = $this->CreateServer(1);
-        $aPersons = array();
-        for ($i = 0; $i < 3; $i++)
-        {
-            $oPerson = $this->CreatePerson($i);
-            $aPersons[] = $oPerson;
-            $this->AddContactToCI($oPerson, $oServer);
-        }
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-
-        $this->AddContactToCI($this->CreatePerson($i), $oServer);
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(4, $oContactsSet->Count());
-
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(4, $oContactsSet->Count());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function testRemove()
-    {
-        $oServer = $this->CreateServer(1);
-        $aPersons = array();
-        for ($i = 0; $i < 3; $i++)
-        {
-            $oPerson = $this->CreatePerson($i);
-            $aPersons[] = $oPerson;
-            $this->AddContactToCI($oPerson, $oServer);
-        }
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-
-        for ($i = 0; $i < 3; $i++)
-        {
-            $this->RemoveContactFromCI($aPersons[$i], $oServer);
-        }
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(0, $oContactsSet->Count());
-
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(0, $oContactsSet->Count());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function testAddThenRemove()
-    {
-        $oServer = $this->CreateServer(1);
-        for ($i = 0; $i < 3; $i++)
-        {
-            $oPerson = $this->CreatePerson($i);
-            $this->AddContactToCI($oPerson, $oServer);
-            $this->RemoveContactFromCI($oPerson, $oServer);
-        }
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(0, $oContactsSet->Count());
-
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(0, $oContactsSet->Count());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function testRemoveThenAdd()
-    {
-        $oServer = $this->CreateServer(1);
-        $aPersons = array();
-        for ($i = 0; $i < 3; $i++)
-        {
-            $oPerson = $this->CreatePerson($i);
-            $aPersons[] = $oPerson;
-            $this->AddContactToCI($oPerson, $oServer);
-        }
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-
-        for ($i = 0; $i < 3; $i++)
-        {
-            $this->RemoveContactFromCI($aPersons[$i], $oServer);
-            $this->AddContactToCI($aPersons[$i], $oServer);
-        }
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function testAddDuplicate()
-    {
-        $oServer = $this->CreateServer(1);
-        $aPersons = array();
-        for ($i = 0; $i < 3; $i++)
-        {
-            $oPerson = $this->CreatePerson($i);
-            $aPersons[] = $oPerson;
-            $this->AddContactToCI($oPerson, $oServer);
-        }
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-
-        for ($i = 0; $i < 3; $i++)
-        {
-            $this->AddContactToCI($aPersons[$i], $oServer);
-        }
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(6, $oContactsSet->Count());
-
-        $oServer->DBUpdate();
-        $this->ReloadObject($oServer);
-
-        $oContactsSet = $oServer->Get('contacts_list');
-        $this->assertEquals(3, $oContactsSet->Count());
-    }
-}
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 20/12/2017
+ * Time: 11:56
+ */
+
+
+namespace Combodo\iTop\Test\UnitTest\Core;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use Exception;
+use ormLinkSet;
+use PHPUnit\Framework\TestCase;
+
+
+/**
+ * Tests of the ormLinkSet class using N-N links between FunctionalCI and Contact
+ *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class ormLinkSetTest extends ItopDataTestCase
+{
+
+    /**
+     * @throws Exception
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+    }
+
+    /**
+     *
+     */
+    public function testConstruct()
+    {
+        $oOrmLink = new ormLinkSet('UserRequest', 'contacts_list');
+        $this->assertNotNull($oOrmLink);
+    }
+
+    /**
+     *
+     */
+    public function testConstruct2()
+    {
+        $this->expectException('Exception');
+
+        new ormLinkSet('UserRequest', 'ref');
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testBasic()
+    {
+        $oServer = $this->CreateServer(1);
+        $aPersons = array();
+        for ($i = 0; $i < 3; $i++)
+        {
+            $oPerson = $this->CreatePerson($i);
+            $aPersons[] = $oPerson;
+            $this->AddContactToCI($oPerson, $oServer);
+        }
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testSuccesiveAdds()
+    {
+        $oServer = $this->CreateServer(1);
+        $aPersons = array();
+        for ($i = 0; $i < 3; $i++)
+        {
+            $oPerson = $this->CreatePerson($i);
+            $aPersons[] = $oPerson;
+            $this->AddContactToCI($oPerson, $oServer);
+        }
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+
+        $this->AddContactToCI($this->CreatePerson($i), $oServer);
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(4, $oContactsSet->Count());
+
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(4, $oContactsSet->Count());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testRemove()
+    {
+        $oServer = $this->CreateServer(1);
+        $aPersons = array();
+        for ($i = 0; $i < 3; $i++)
+        {
+            $oPerson = $this->CreatePerson($i);
+            $aPersons[] = $oPerson;
+            $this->AddContactToCI($oPerson, $oServer);
+        }
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+
+        for ($i = 0; $i < 3; $i++)
+        {
+            $this->RemoveContactFromCI($aPersons[$i], $oServer);
+        }
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(0, $oContactsSet->Count());
+
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(0, $oContactsSet->Count());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testAddThenRemove()
+    {
+        $oServer = $this->CreateServer(1);
+        for ($i = 0; $i < 3; $i++)
+        {
+            $oPerson = $this->CreatePerson($i);
+            $this->AddContactToCI($oPerson, $oServer);
+            $this->RemoveContactFromCI($oPerson, $oServer);
+        }
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(0, $oContactsSet->Count());
+
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(0, $oContactsSet->Count());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testRemoveThenAdd()
+    {
+        $oServer = $this->CreateServer(1);
+        $aPersons = array();
+        for ($i = 0; $i < 3; $i++)
+        {
+            $oPerson = $this->CreatePerson($i);
+            $aPersons[] = $oPerson;
+            $this->AddContactToCI($oPerson, $oServer);
+        }
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+
+        for ($i = 0; $i < 3; $i++)
+        {
+            $this->RemoveContactFromCI($aPersons[$i], $oServer);
+            $this->AddContactToCI($aPersons[$i], $oServer);
+        }
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function testAddDuplicate()
+    {
+        $oServer = $this->CreateServer(1);
+        $aPersons = array();
+        for ($i = 0; $i < 3; $i++)
+        {
+            $oPerson = $this->CreatePerson($i);
+            $aPersons[] = $oPerson;
+            $this->AddContactToCI($oPerson, $oServer);
+        }
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+
+        for ($i = 0; $i < 3; $i++)
+        {
+            $this->AddContactToCI($aPersons[$i], $oServer);
+        }
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(6, $oContactsSet->Count());
+
+        $oServer->DBUpdate();
+        $this->ReloadObject($oServer);
+
+        $oContactsSet = $oServer->Get('contacts_list');
+        $this->assertEquals(3, $oContactsSet->Count());
+    }
+}
diff --git a/test/display_cache_content.php b/test/display_cache_content.php
index 3e2a87751..28fe18d9b 100644
--- a/test/display_cache_content.php
+++ b/test/display_cache_content.php
@@ -1,104 +1,104 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Date: 06/10/2017
- */
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'application/startup.inc.php');
-
-
-$sEnvironment = MetaModel::GetEnvironmentId();
-$aEntries = array();
-$aCacheUserData = apc_cache_info_compat();
-if (is_array($aCacheUserData) && isset($aCacheUserData['cache_list']))
-{
-	$sPrefix = 'itop-'.$sEnvironment.'-query-cache-';
-
-	foreach($aCacheUserData['cache_list'] as $i => $aEntry)
-	{
-		$sEntryKey = array_key_exists('info', $aEntry) ? $aEntry['info'] : $aEntry['key'];
-		if (strpos($sEntryKey, $sPrefix) === 0)
-		{
-			$aEntries[] = $sEntryKey;
-		}
-	}
-}
-
-echo "<pre>";
-
-if (empty($aEntries))
-{
-	echo "No Data";
-	return;
-}
-
-$sKey = $aEntries[0];
-$result = apc_fetch($sKey);
-if (!is_object($result))
-{
-	return;
-}
-$oSQLQuery = $result;
-
-echo "NB Tables before;NB Tables after;";
-foreach($oSQLQuery->m_aContextData as $sField => $oValue)
-{
-	echo $sField.';';
-}
-echo "\n";
-
-sort($aEntries);
-
-foreach($aEntries as $sKey)
-{
-	$result = apc_fetch($sKey);
-	if (is_object($result))
-	{
-		$oSQLQuery = $result;
-		if (isset($oSQLQuery->m_aContextData))
-		{
-			echo $oSQLQuery->m_iOriginalTableCount.";".$oSQLQuery->CountTables().';';
-			foreach($oSQLQuery->m_aContextData as $oValue)
-			{
-				if (is_array($oValue))
-				{
-					$sVal = json_encode($oValue);
-				}
-				else
-				{
-					if (empty($oValue))
-					{
-						$sVal = '';
-					}
-					else
-					{
-						$sVal = $oValue;
-					}
-				}
-				echo $sVal.';';
-			}
-			echo "\n";
-		}
-	}
-}
-
-echo "</pre>";
-
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Date: 06/10/2017
+ */
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'application/startup.inc.php');
+
+
+$sEnvironment = MetaModel::GetEnvironmentId();
+$aEntries = array();
+$aCacheUserData = apc_cache_info_compat();
+if (is_array($aCacheUserData) && isset($aCacheUserData['cache_list']))
+{
+	$sPrefix = 'itop-'.$sEnvironment.'-query-cache-';
+
+	foreach($aCacheUserData['cache_list'] as $i => $aEntry)
+	{
+		$sEntryKey = array_key_exists('info', $aEntry) ? $aEntry['info'] : $aEntry['key'];
+		if (strpos($sEntryKey, $sPrefix) === 0)
+		{
+			$aEntries[] = $sEntryKey;
+		}
+	}
+}
+
+echo "<pre>";
+
+if (empty($aEntries))
+{
+	echo "No Data";
+	return;
+}
+
+$sKey = $aEntries[0];
+$result = apc_fetch($sKey);
+if (!is_object($result))
+{
+	return;
+}
+$oSQLQuery = $result;
+
+echo "NB Tables before;NB Tables after;";
+foreach($oSQLQuery->m_aContextData as $sField => $oValue)
+{
+	echo $sField.';';
+}
+echo "\n";
+
+sort($aEntries);
+
+foreach($aEntries as $sKey)
+{
+	$result = apc_fetch($sKey);
+	if (is_object($result))
+	{
+		$oSQLQuery = $result;
+		if (isset($oSQLQuery->m_aContextData))
+		{
+			echo $oSQLQuery->m_iOriginalTableCount.";".$oSQLQuery->CountTables().';';
+			foreach($oSQLQuery->m_aContextData as $oValue)
+			{
+				if (is_array($oValue))
+				{
+					$sVal = json_encode($oValue);
+				}
+				else
+				{
+					if (empty($oValue))
+					{
+						$sVal = '';
+					}
+					else
+					{
+						$sVal = $oValue;
+					}
+				}
+				echo $sVal.';';
+			}
+			echo "\n";
+		}
+	}
+}
+
+echo "</pre>";
+
diff --git a/test/itop-tickets/itopTicketTest.php b/test/itop-tickets/itopTicketTest.php
index 1c157d843..272af294e 100644
--- a/test/itop-tickets/itopTicketTest.php
+++ b/test/itop-tickets/itopTicketTest.php
@@ -1,928 +1,928 @@
-<?php
-// Copyright (c) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-//
-
-/**
- * Created by PhpStorm.
- * User: Eric
- * Date: 18/12/2017
- * Time: 13:34
- */
-
-namespace Combodo\iTop\Test\UnitTest\iTopTickets;
-
-use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use Exception;
-
-
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
-class ItopTicketTest extends ItopDataTestCase
-{
-    /**
-     * @throws Exception
-     */
-    protected function setUp()
-	{
-		parent::setUp();
-	}
-
-	/**
-     * <pre>
-	 * Given:
-	 *
-	 * Server1+---->Hypervisor1+---->Person1
-	 *
-	 * Ticket+---->Server1 (manual)
-	 *
-	 * Result:
-	 *
-	 * Ticket+====>Server1,Hypervisor1
-	 *       |
-	 *       +====>Person1
-	 * </pre>
-     *
-	 * @throws Exception
-	 */
-	public function testUpdateImpactedItems_Basic()
-	{
-		$oTicket = $this->CreateTicket(1);
-		$oServer1 = $this->CreateServer(1);
-		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
-		$oPerson1 = $this->CreatePerson(1);
-		$this->AddContactToCI($oPerson1, $oHypervisor1);
-		$oHypervisor1->DBUpdate();
-
-		$aAwaitedCIs = $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-		$oTicket->DBUpdate(); // trigger the impact update
-		$this->ReloadObject($oTicket); // reload the links
-
-        // Add the computed CIs
-        $aAwaitedCIs = $aAwaitedCIs + array($oHypervisor1->GetKey() => 'computed');
-
-        $this->CheckFunctionalCIList($oTicket, $aAwaitedCIs);
-
-        // Computed Contacts
-        $aAwaitedContacts = array($oPerson1->GetKey() => array('role_code' => 'computed'));
-        $this->CheckContactList($oTicket, $aAwaitedContacts);
-        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-	}
-
-    /**
-     * <pre>
-     * Given:
-     *
-     * Server1+---->Hypervisor1+---->Person1
-     *
-     * Ticket+---->Server1 (manual)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1
-     *       |
-     *       +====>Person1
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Basic2()
-    {
-        $oTicket = $this->CreateTicket(1);
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
-        $oPerson1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oPerson1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $oTicket->DBUpdate(); // trigger the impact update
-
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-
-        // Try removing computed entries
-        $this->RemoveCIFromTicket($oHypervisor1, $oTicket);
-        $this->RemoveContactFromTicket($oPerson1, $oTicket);
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-     * <pre>
-     * Given:
-     *
-     * Server1+---->Hypervisor1+---->Person1
-     *
-     * Server2    Person2
-     *
-     * Ticket+---->Server1 (manual), Server2 (computed)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1
-     *       |
-     *       +====>Person1
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_RemoveUnecessaryEntries()
-    {
-        $oTicket = $this->CreateTicket(1);
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
-        $oPerson1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oPerson1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oPerson2 = $this->CreatePerson(2);
-
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $this->AddCIToTicket($oServer2, $oTicket, 'computed');
-        $this->AddContactToTicket($oPerson2, $oTicket, 'computed');
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-     * Create a first impact chain then remove the root cause, all the chain should be removed.
-     *
-     * <pre>
-     * Given:
-     *
-     * Server1+---->Hypervisor1+---->Person1
-     *
-     * Ticket+---->Server1 (manual)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1
-     *       |
-     *       +====>Person1
-     *
-     * Then remove Server1
-     *
-     * Result:
-     *
-     * Ticket+====>
-     *       |
-     *       +====>
-     *
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_RemoveUnecessaryEntries2()
-    {
-        $oTicket = $this->CreateTicket(1);
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
-        $oPerson1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oPerson1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-
-        $this->RemoveCIFromTicket($oServer1, $oTicket);
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(0, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(0, $oTicket->Get('contacts_list')->Count());
-    }
-
-
-    /**
-     * <pre>
-     *
-     * Server2+---->Hypervisor2+---->Person2
-     *
-     * Ticket+---->(empty)
-     *
-     * Result:
-     *
-     * Ticket+====>(empty)
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_NoImpact()
-    {
-        $oTicket = $this->CreateTicket(1);
-        $oServer2 = $this->CreateServer(2);
-        $oPerson2 = $this->CreatePerson(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2);
-        $this->AddContactToCI($oPerson2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(0, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(0, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-	 * <pre>
-	 * Server1
-	 *
-	 * Server2+---->Hypervisor2+---->Person2
-	 *
-	 * Ticket+---->Server1 (manual)
-	 *
-	 * Result:
-	 *
-	 * Ticket+====>Server1
-	 * </pre>
-	 *
-	 * @throws Exception
-	 */
-	public function testUpdateImpactedItems_NoImpact2()
-	{
-		$oTicket = $this->CreateTicket(1);
-		$oServer1 = $this->CreateServer(1);
-		$oServer2 = $this->CreateServer(2);
-		$oPerson2 = $this->CreatePerson(2);
-		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2);
-		$this->AddContactToCI($oPerson2, $oHypervisor2);
-		$oHypervisor2->DBUpdate();
-
-		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
-		$oTicket->DBUpdate(); // trigger the impact update
-		$this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(1, $oTicket->Get('functionalcis_list')->Count());
-		$this->assertEquals(0, $oTicket->Get('contacts_list')->Count());
-	}
-
-	/**
-	 * <pre>
-	 *                    +-->Person1
-	 *                    |
-	 *                    +
-	 * Server1+---->Hypervisor1+--+
-	 *                            |
-	 *                            v
-	 *                            Farm (1)
-	 *                            ^
-	 *                            |
-	 * Server2+---->Hypervisor2+--+
-	 *                    +
-	 *                    |
-	 *                    +-->Person2
-	 *
-	 * Ticket+---->Server1 (manual)
-	 *
-	 * Result:
-	 *
-	 * Ticket+====>Server1,Hypervisor1
-	 *       |
-	 *       +====>Person1
-	 * </pre>
-	 *
-	 * @throws Exception
-	 */
-	public function testUpdateImpactedItems_Redundancy()
-	{
-		$oFarm = $this->CreateFarm(1);
-
-		$oServer1 = $this->CreateServer(1);
-		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-		$oContact1 = $this->CreatePerson(1);
-		$this->AddContactToCI($oContact1, $oHypervisor1);
-		$oHypervisor1->DBUpdate();
-
-		$oServer2 = $this->CreateServer(2);
-		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-		$oContact2 = $this->CreatePerson(2);
-		$this->AddContactToCI($oContact2, $oHypervisor2);
-		$oHypervisor2->DBUpdate();
-
-		$oTicket = $this->CreateTicket(1);
-		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
-		$oTicket->DBUpdate(); // trigger the impact update
-		$this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-    }
-
-	/**
-	 * <pre>
-	 *                    +-->Person1
-	 *                    |
-	 *                    +
-	 * Server1+---->Hypervisor1+--+
-	 *                            |
-	 *                            v
-	 *                            Farm (1)
-	 *                            ^
-	 *                            |
-	 * Server2+---->Hypervisor2+--+
-	 *                    +
-	 *                    |
-	 *                    +-->Person2
-	 *
-	 * Ticket+---->Server1 (manual), Hypervisor2 (manual)
-	 *
-	 * Result:
-	 *
-	 * Ticket+====>Server1,Hypervisor1,Farm,Hypervisor2
-	 *       |
-	 *       +====>Person1,Person2
-	 * </pre>
-	 *
-	 * @throws Exception
-	 */
-	public function testUpdateImpactedItems_Redundancy2()
-	{
-        $oFarm = $this->CreateFarm(1);
-
-		$oServer1 = $this->CreateServer(1);
-		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-		$oContact1 = $this->CreatePerson(1);
-		$this->AddContactToCI($oContact1, $oHypervisor1);
-		$oHypervisor1->DBUpdate();
-
-		$oServer2 = $this->CreateServer(2);
-		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-		$oContact2 = $this->CreatePerson(2);
-		$this->AddContactToCI($oContact2, $oHypervisor2);
-		$oHypervisor2->DBUpdate();
-
-		$oTicket = $this->CreateTicket(1);
-		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
-		$this->AddCIToTicket($oHypervisor2, $oTicket, 'manual');
-		$oTicket->DBUpdate(); // trigger the impact update
-		$this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(4, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
-	}
-
-
-	/**
-	 * <pre>
-	 *                    +-->Person1
-	 *                    |
-	 *                    +
-	 * Server1+---->Hypervisor1+--+  +-->VM1
-	 *                            |  |
-	 *                            v  +
-	 *                            Farm (1)
-	 *                            ^  +
-	 *                            |  |
-	 * Server2+---->Hypervisor2+--+  +-->VM2
-	 *                    +
-	 *                    |
-	 *                    +-->Person2
-	 *
-	 * Ticket+---->Server1 (manual), Hypervisor2 (manual)
-	 *
-	 * Result:
-	 *
-	 * Ticket+====>Server1,Hypervisor1,Farm,Hypervisor2,VM1,VM2
-	 *       |
-	 *       +====>Person1,Person2
-	 * </pre>
-	 *
-	 * @throws Exception
-	 */
-	public function testUpdateImpactedItems_Redundancy3()
-	{
-        $oFarm = $this->CreateFarm(1);
-
-		$oServer1 = $this->CreateServer(1);
-		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-		$oContact1 = $this->CreatePerson(1);
-		$this->AddContactToCI($oContact1, $oHypervisor1);
-		$oHypervisor1->DBUpdate();
-
-		$oServer2 = $this->CreateServer(2);
-		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-		$oContact2 = $this->CreatePerson(2);
-		$this->AddContactToCI($oContact2, $oHypervisor2);
-		$oHypervisor2->DBUpdate();
-
-		$this->CreateVirtualMachine(1, $oFarm);
-		$this->CreateVirtualMachine(2, $oFarm);
-
-		$oTicket = $this->CreateTicket(1);
-		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
-		$this->AddCIToTicket($oHypervisor2, $oTicket, 'manual');
-		$oTicket->DBUpdate(); // trigger the impact update
-		$this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(6, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
-	}
-
-    /**
-     * <pre>
-     *                    +-->Person1
-     *                    |
-     *                    +
-     * Server1+---->Hypervisor1+--+  +-->VM1
-     *                            |  |
-     *                            v  +
-     *                            Farm (1)
-     *                            ^  +
-     *                            |  |
-     * Server2+---->Hypervisor2+--+  +-->VM2
-     *                    +
-     *                    |
-     *                    +-->Person2
-     *
-     * Ticket+---->Server1 (manual), Server2 (manual), Hypervisor2 (not_impacted)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1,Server2,Hypervisor2
-     *       |
-     *       +====>Person1
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Exclusion()
-    {
-        $oFarm = $this->CreateFarm(1);
-
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-        $oContact1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oContact1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-        $oContact2 = $this->CreatePerson(2);
-        $this->AddContactToCI($oContact2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $this->CreateVirtualMachine(1, $oFarm);
-        $this->CreateVirtualMachine(2, $oFarm);
-
-        $oTicket = $this->CreateTicket(1);
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $this->AddCIToTicket($oServer2, $oTicket, 'manual');
-        $this->AddCIToTicket($oHypervisor2, $oTicket, 'not_impacted');
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(4, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-     * <pre>
-     *                    +-->Person1
-     *                    |
-     *                    +
-     * Server1+---->Hypervisor1+--+  +-->VM1
-     *                            |  |
-     *                            v  +
-     *                            Farm (1)
-     *                            ^  +
-     *                            |  |
-     * Server2+---->Hypervisor2+--+  +-->VM2
-     *                    +
-     *                    |
-     *                    +-->Person2
-     *
-     * Ticket+---->Server1 (manual), Server2 (manual)
-     *       |
-     *       +---->Person2 (do_not_notify)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1,Server2,Hypervisor2,Farm,VM1,VM2
-     *       |
-     *       +====>Person1,Person2 (do_not_notify)
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Exclusion2()
-    {
-        $oFarm = $this->CreateFarm(1);
-
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-        $oContact1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oContact1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-        $oContact2 = $this->CreatePerson(2);
-        $this->AddContactToCI($oContact2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $this->CreateVirtualMachine(1, $oFarm);
-        $this->CreateVirtualMachine(2, $oFarm);
-
-        $oTicket = $this->CreateTicket(1);
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $this->AddCIToTicket($oServer2, $oTicket, 'manual');
-        $this->AddContactToTicket($oContact2, $oTicket, 'do_not_notify');
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(7, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-     * <pre>
-     *                    +-->Person1
-     *                    |
-     *                    +
-     * Server1+---->Hypervisor1+--+  +-->VM1
-     *                            |  |
-     *                            v  +
-     *                            Farm (1)
-     *                            ^  +
-     *                            |  |
-     * Server2+---->Hypervisor2+--+  +-->VM2
-     *                    +
-     *                    |
-     *                    +-->Person2
-     *
-     * Ticket+---->Server1 (manual), Server2 (manual), Hypervisor2 (not_impacted)
-     *       |
-     *       +---->Person2 (do_not_notify)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1,Server2,Hypervisor2
-     *       |
-     *       +====>Person1,Person2 (do_not_notify)
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Exclusion3()
-    {
-        $oFarm = $this->CreateFarm(1);
-
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-        $oContact1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oContact1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-        $oContact2 = $this->CreatePerson(2);
-        $this->AddContactToCI($oContact2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $this->CreateVirtualMachine(1, $oFarm);
-        $this->CreateVirtualMachine(2, $oFarm);
-
-        $oTicket = $this->CreateTicket(1);
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $this->AddCIToTicket($oServer2, $oTicket, 'manual');
-        $this->AddCIToTicket($oHypervisor2, $oTicket, 'not_impacted');
-        $this->AddContactToTicket($oContact2, $oTicket, 'do_not_notify');
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(4, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-     * <pre>
-     *                    +-->Person1
-     *                    |
-     *                    +
-     * Server1+---->Hypervisor1+--+  +-->VM1
-     *                            |  |
-     *                            v  +
-     *                            Farm (1)
-     *                            ^  +
-     *                            |  |
-     * Server2+---->Hypervisor2+--+  +-->VM2
-     *                    +
-     *                    |
-     *                    +-->Person2
-     *
-     * Ticket+---->Server1 (manual), Hypervisor2 (not_impacted)
-     *
-     * Result:
-     *
-     * Ticket+====>Server1,Hypervisor1, Hypervisor2 (not_impacted)
-     *       |
-     *       +====>Person1
-     * </pre>
-     *
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Exclusion4()
-    {
-        $oFarm = $this->CreateFarm(1);
-
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-        $oContact1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oContact1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-        $oContact2 = $this->CreatePerson(2);
-        $this->AddContactToCI($oContact2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $this->CreateVirtualMachine(1, $oFarm);
-        $this->CreateVirtualMachine(2, $oFarm);
-
-        $oTicket = $this->CreateTicket(1);
-        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
-        $this->AddCIToTicket($oHypervisor2, $oTicket, 'not_impacted');
-        $oTicket->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket); // reload the links
-
-        $this->CheckFunctionalCIList($oTicket);
-        $this->CheckContactList($oTicket);
-        $this->assertEquals(3, $oTicket->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
-    }
-
-    /**
-     * <pre>
-     *                    +-->Person1
-     *                    |
-     *                    +
-     * Server1+---->Hypervisor1+--+  +-->VM1
-     *                            |  |
-     *                            v  +
-     *                            Farm (1)
-     *                            ^  +
-     *                            |  |
-     * Server2+---->Hypervisor2+--+  +-->VM2
-     *                    +
-     *                    |
-     *                    +-->Person2
-     *
-     * Ticket1+---->Server1 (manual)
-     *
-     * Result:
-     *
-     * Ticket1+====>Server1,Hypervisor1
-     *        |
-     *        +====>Person1
-     *
-     * Then:
-     *
-     * Ticket2+---->Server2 (manual)
-     *
-     * Result:
-     *
-     * Ticket2+====>Server2,Hypervisor2,Farm,VM1,VM2
-     *        |
-     *        +====>Person2
-     * </pre>
-     *
-     * @throws ArchivedObjectException
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Redundancy_two_tickets()
-    {
-        $oFarm = $this->CreateFarm(1);
-
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-        $oContact1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oContact1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-        $oContact2 = $this->CreatePerson(2);
-        $this->AddContactToCI($oContact2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $oVM1 = $this->CreateVirtualMachine(1, $oFarm);
-        $oVM2 = $this->CreateVirtualMachine(2, $oFarm);
-
-        // Ticket1+---->Server1 (manual)
-        $oTicket1 = $this->CreateTicket(1);
-        $this->AddCIToTicket($oServer1, $oTicket1, 'manual');
-        $oTicket1->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket1); // reload the links
-
-        // Ticket1+====>Server1,Hypervisor1
-        // 	      |
-        //        +====>Person1
-        $this->CheckFunctionalCIList($oTicket1);
-        $this->CheckContactList($oTicket1);
-        $this->assertEquals(2, $oTicket1->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket1->Get('contacts_list')->Count());
-
-        // Ticket2+---->Hypervisor2 (manual)
-        $oTicket2 = $this->CreateTicket(2);
-        $this->AddCIToTicket($oServer2, $oTicket2, 'manual');
-        $oTicket2->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket2); // reload the links
-
-        // Ticket2+====>Farm,Hypervisor2,VM1,VM2,Server2
-        //        |
-        //        +====>Person2
-        $aWaitedCIList = array(
-            $oFarm->GetKey() => 'computed',
-            $oVM1->GetKey() => 'computed',
-            $oVM2->GetKey() => 'computed',
-            $oHypervisor2->GetKey() => 'computed',
-            $oServer2->GetKey() => 'manual');
-        $this->CheckFunctionalCIList($oTicket2, $aWaitedCIList);
-        $this->CheckContactList($oTicket2);
-	    $this->assertEquals(2, $oTicket2->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket2->Get('contacts_list')->Count());
-
-        // The first ticket is not impacted
-        $this->debug("\nCheck that the first ticket has not changed.");
-        $this->ReloadObject($oTicket1); // reload the links
-
-        // Ticket1+====>Server1,Hypervisor1
-        // 	      |
-        //        +====>Person1
-        $this->CheckFunctionalCIList($oTicket1);
-        $this->CheckContactList($oTicket1);
-        $this->assertEquals(2, $oTicket1->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket1->Get('contacts_list')->Count());
-    }
-
-    /**
-     * <pre>
-     *                    +-->Person1
-     *                    |
-     *                    +
-     * Server1+---->Hypervisor1+--+  +-->VM1
-     *                            |  |
-     *                            v  +
-     * Server3+---->Hypervisor3+->Farm (1)
-     *                            ^  +
-     *                            |  |
-     * Server2+---->Hypervisor2+--+  +-->VM2
-     *                    +
-     *                    |
-     *                    +-->Person2
-     *
-     * Ticket1+---->Server1 (manual), Hypervisor2(manual)
-     *
-     * Result:
-     *
-     * Ticket1+====>Server1,Hypervisor1, Hypervisor2
-     *        |
-     *        +====>Person1, Person2
-     *
-     * Then:
-     *
-     * Ticket2+---->Server2 (manual), Hypervisor3 (manual)
-     *
-     * Result:
-     *
-     * Ticket2+====>Server2,Hypervisor2,Hypervisor3,Farm,VM1,VM2
-     *        |
-     *        +====>Person2
-     * </pre>
-     *
-     * @throws ArchivedObjectException
-     * @throws Exception
-     */
-    public function testUpdateImpactedItems_Redundancy_two_tickets2()
-    {
-        $oFarm = $this->CreateFarm(1);
-
-        $oServer1 = $this->CreateServer(1);
-        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
-        $oContact1 = $this->CreatePerson(1);
-        $this->AddContactToCI($oContact1, $oHypervisor1);
-        $oHypervisor1->DBUpdate();
-
-        $oServer2 = $this->CreateServer(2);
-        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
-        $oContact2 = $this->CreatePerson(2);
-        $this->AddContactToCI($oContact2, $oHypervisor2);
-        $oHypervisor2->DBUpdate();
-
-        $oServer3 = $this->CreateServer(3);
-        $oHypervisor3 = $this->CreateHypervisor(3, $oServer3, $oFarm);
-
-
-        $oVM1 = $this->CreateVirtualMachine(1, $oFarm);
-        $oVM2 = $this->CreateVirtualMachine(2, $oFarm);
-
-        // Ticket1+---->Server1 (manual), Hypervisor2(manual)
-        $oTicket1 = $this->CreateTicket(1);
-        $this->AddCIToTicket($oServer1, $oTicket1, 'manual');
-        $this->AddCIToTicket($oHypervisor2, $oTicket1, 'manual');
-        $oTicket1->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket1); // reload the links
-
-        // Ticket1+====>Server1,Hypervisor1,Hypervisor2
-        // 	      |
-        //        +====>Person1,Person2
-        $this->CheckFunctionalCIList($oTicket1);
-        $this->CheckContactList($oTicket1);
-        $this->assertEquals(3, $oTicket1->Get('functionalcis_list')->Count());
-        $this->assertEquals(2, $oTicket1->Get('contacts_list')->Count());
-
-        // Ticket2+---->Server2 (manual)
-        $oTicket2 = $this->CreateTicket(2);
-        $this->AddCIToTicket($oServer2, $oTicket2, 'manual');
-        $this->AddCIToTicket($oHypervisor3, $oTicket2, 'manual');
-        $oTicket2->DBUpdate(); // trigger the impact update
-        $this->ReloadObject($oTicket2); // reload the links
-
-        // Ticket2+====>Farm,Hypervisor2,VM1,VM2,Server2
-        //        |
-        //        +====>Person2
-        $aWaitedCIList = array(
-            $oFarm->GetKey() => 'computed',
-            $oVM1->GetKey() => 'computed',
-            $oVM2->GetKey() => 'computed',
-            $oHypervisor2->GetKey() => 'computed',
-            $oHypervisor3->GetKey() => 'manual',
-            $oServer2->GetKey() => 'manual');
-        $this->CheckFunctionalCIList($oTicket2, $aWaitedCIList);
-        $this->CheckContactList($oTicket2);
-	    $this->assertEquals(3, $oTicket2->Get('functionalcis_list')->Count());
-        $this->assertEquals(1, $oTicket2->Get('contacts_list')->Count());
-
-        // The first ticket is not impacted
-        $this->debug("\nCheck that the first ticket has not changed.");
-        $this->ReloadObject($oTicket1); // reload the links
-
-        // Ticket1+====>Server1,Hypervisor1,Hypervisor2
-        // 	      |
-        //        +====>Person1,Person2
-        $this->CheckFunctionalCIList($oTicket1);
-        $this->CheckContactList($oTicket1);
-        $this->assertEquals(3, $oTicket1->Get('functionalcis_list')->Count());
-        $this->assertEquals(2, $oTicket1->Get('contacts_list')->Count());
-    }
-
-}
+<?php
+// Copyright (c) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+//
+
+/**
+ * Created by PhpStorm.
+ * User: Eric
+ * Date: 18/12/2017
+ * Time: 13:34
+ */
+
+namespace Combodo\iTop\Test\UnitTest\iTopTickets;
+
+use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
+use Exception;
+
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ * @backupGlobals disabled
+ */
+class ItopTicketTest extends ItopDataTestCase
+{
+    /**
+     * @throws Exception
+     */
+    protected function setUp()
+	{
+		parent::setUp();
+	}
+
+	/**
+     * <pre>
+	 * Given:
+	 *
+	 * Server1+---->Hypervisor1+---->Person1
+	 *
+	 * Ticket+---->Server1 (manual)
+	 *
+	 * Result:
+	 *
+	 * Ticket+====>Server1,Hypervisor1
+	 *       |
+	 *       +====>Person1
+	 * </pre>
+     *
+	 * @throws Exception
+	 */
+	public function testUpdateImpactedItems_Basic()
+	{
+		$oTicket = $this->CreateTicket(1);
+		$oServer1 = $this->CreateServer(1);
+		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
+		$oPerson1 = $this->CreatePerson(1);
+		$this->AddContactToCI($oPerson1, $oHypervisor1);
+		$oHypervisor1->DBUpdate();
+
+		$aAwaitedCIs = $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+		$oTicket->DBUpdate(); // trigger the impact update
+		$this->ReloadObject($oTicket); // reload the links
+
+        // Add the computed CIs
+        $aAwaitedCIs = $aAwaitedCIs + array($oHypervisor1->GetKey() => 'computed');
+
+        $this->CheckFunctionalCIList($oTicket, $aAwaitedCIs);
+
+        // Computed Contacts
+        $aAwaitedContacts = array($oPerson1->GetKey() => array('role_code' => 'computed'));
+        $this->CheckContactList($oTicket, $aAwaitedContacts);
+        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+	}
+
+    /**
+     * <pre>
+     * Given:
+     *
+     * Server1+---->Hypervisor1+---->Person1
+     *
+     * Ticket+---->Server1 (manual)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1
+     *       |
+     *       +====>Person1
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Basic2()
+    {
+        $oTicket = $this->CreateTicket(1);
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
+        $oPerson1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oPerson1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $oTicket->DBUpdate(); // trigger the impact update
+
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+
+        // Try removing computed entries
+        $this->RemoveCIFromTicket($oHypervisor1, $oTicket);
+        $this->RemoveContactFromTicket($oPerson1, $oTicket);
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+     * <pre>
+     * Given:
+     *
+     * Server1+---->Hypervisor1+---->Person1
+     *
+     * Server2    Person2
+     *
+     * Ticket+---->Server1 (manual), Server2 (computed)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1
+     *       |
+     *       +====>Person1
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_RemoveUnecessaryEntries()
+    {
+        $oTicket = $this->CreateTicket(1);
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
+        $oPerson1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oPerson1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oPerson2 = $this->CreatePerson(2);
+
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $this->AddCIToTicket($oServer2, $oTicket, 'computed');
+        $this->AddContactToTicket($oPerson2, $oTicket, 'computed');
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+     * Create a first impact chain then remove the root cause, all the chain should be removed.
+     *
+     * <pre>
+     * Given:
+     *
+     * Server1+---->Hypervisor1+---->Person1
+     *
+     * Ticket+---->Server1 (manual)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1
+     *       |
+     *       +====>Person1
+     *
+     * Then remove Server1
+     *
+     * Result:
+     *
+     * Ticket+====>
+     *       |
+     *       +====>
+     *
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_RemoveUnecessaryEntries2()
+    {
+        $oTicket = $this->CreateTicket(1);
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1);
+        $oPerson1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oPerson1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+
+        $this->RemoveCIFromTicket($oServer1, $oTicket);
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(0, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(0, $oTicket->Get('contacts_list')->Count());
+    }
+
+
+    /**
+     * <pre>
+     *
+     * Server2+---->Hypervisor2+---->Person2
+     *
+     * Ticket+---->(empty)
+     *
+     * Result:
+     *
+     * Ticket+====>(empty)
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_NoImpact()
+    {
+        $oTicket = $this->CreateTicket(1);
+        $oServer2 = $this->CreateServer(2);
+        $oPerson2 = $this->CreatePerson(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2);
+        $this->AddContactToCI($oPerson2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(0, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(0, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+	 * <pre>
+	 * Server1
+	 *
+	 * Server2+---->Hypervisor2+---->Person2
+	 *
+	 * Ticket+---->Server1 (manual)
+	 *
+	 * Result:
+	 *
+	 * Ticket+====>Server1
+	 * </pre>
+	 *
+	 * @throws Exception
+	 */
+	public function testUpdateImpactedItems_NoImpact2()
+	{
+		$oTicket = $this->CreateTicket(1);
+		$oServer1 = $this->CreateServer(1);
+		$oServer2 = $this->CreateServer(2);
+		$oPerson2 = $this->CreatePerson(2);
+		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2);
+		$this->AddContactToCI($oPerson2, $oHypervisor2);
+		$oHypervisor2->DBUpdate();
+
+		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
+		$oTicket->DBUpdate(); // trigger the impact update
+		$this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(1, $oTicket->Get('functionalcis_list')->Count());
+		$this->assertEquals(0, $oTicket->Get('contacts_list')->Count());
+	}
+
+	/**
+	 * <pre>
+	 *                    +-->Person1
+	 *                    |
+	 *                    +
+	 * Server1+---->Hypervisor1+--+
+	 *                            |
+	 *                            v
+	 *                            Farm (1)
+	 *                            ^
+	 *                            |
+	 * Server2+---->Hypervisor2+--+
+	 *                    +
+	 *                    |
+	 *                    +-->Person2
+	 *
+	 * Ticket+---->Server1 (manual)
+	 *
+	 * Result:
+	 *
+	 * Ticket+====>Server1,Hypervisor1
+	 *       |
+	 *       +====>Person1
+	 * </pre>
+	 *
+	 * @throws Exception
+	 */
+	public function testUpdateImpactedItems_Redundancy()
+	{
+		$oFarm = $this->CreateFarm(1);
+
+		$oServer1 = $this->CreateServer(1);
+		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+		$oContact1 = $this->CreatePerson(1);
+		$this->AddContactToCI($oContact1, $oHypervisor1);
+		$oHypervisor1->DBUpdate();
+
+		$oServer2 = $this->CreateServer(2);
+		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+		$oContact2 = $this->CreatePerson(2);
+		$this->AddContactToCI($oContact2, $oHypervisor2);
+		$oHypervisor2->DBUpdate();
+
+		$oTicket = $this->CreateTicket(1);
+		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
+		$oTicket->DBUpdate(); // trigger the impact update
+		$this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(2, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+    }
+
+	/**
+	 * <pre>
+	 *                    +-->Person1
+	 *                    |
+	 *                    +
+	 * Server1+---->Hypervisor1+--+
+	 *                            |
+	 *                            v
+	 *                            Farm (1)
+	 *                            ^
+	 *                            |
+	 * Server2+---->Hypervisor2+--+
+	 *                    +
+	 *                    |
+	 *                    +-->Person2
+	 *
+	 * Ticket+---->Server1 (manual), Hypervisor2 (manual)
+	 *
+	 * Result:
+	 *
+	 * Ticket+====>Server1,Hypervisor1,Farm,Hypervisor2
+	 *       |
+	 *       +====>Person1,Person2
+	 * </pre>
+	 *
+	 * @throws Exception
+	 */
+	public function testUpdateImpactedItems_Redundancy2()
+	{
+        $oFarm = $this->CreateFarm(1);
+
+		$oServer1 = $this->CreateServer(1);
+		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+		$oContact1 = $this->CreatePerson(1);
+		$this->AddContactToCI($oContact1, $oHypervisor1);
+		$oHypervisor1->DBUpdate();
+
+		$oServer2 = $this->CreateServer(2);
+		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+		$oContact2 = $this->CreatePerson(2);
+		$this->AddContactToCI($oContact2, $oHypervisor2);
+		$oHypervisor2->DBUpdate();
+
+		$oTicket = $this->CreateTicket(1);
+		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
+		$this->AddCIToTicket($oHypervisor2, $oTicket, 'manual');
+		$oTicket->DBUpdate(); // trigger the impact update
+		$this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(4, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
+	}
+
+
+	/**
+	 * <pre>
+	 *                    +-->Person1
+	 *                    |
+	 *                    +
+	 * Server1+---->Hypervisor1+--+  +-->VM1
+	 *                            |  |
+	 *                            v  +
+	 *                            Farm (1)
+	 *                            ^  +
+	 *                            |  |
+	 * Server2+---->Hypervisor2+--+  +-->VM2
+	 *                    +
+	 *                    |
+	 *                    +-->Person2
+	 *
+	 * Ticket+---->Server1 (manual), Hypervisor2 (manual)
+	 *
+	 * Result:
+	 *
+	 * Ticket+====>Server1,Hypervisor1,Farm,Hypervisor2,VM1,VM2
+	 *       |
+	 *       +====>Person1,Person2
+	 * </pre>
+	 *
+	 * @throws Exception
+	 */
+	public function testUpdateImpactedItems_Redundancy3()
+	{
+        $oFarm = $this->CreateFarm(1);
+
+		$oServer1 = $this->CreateServer(1);
+		$oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+		$oContact1 = $this->CreatePerson(1);
+		$this->AddContactToCI($oContact1, $oHypervisor1);
+		$oHypervisor1->DBUpdate();
+
+		$oServer2 = $this->CreateServer(2);
+		$oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+		$oContact2 = $this->CreatePerson(2);
+		$this->AddContactToCI($oContact2, $oHypervisor2);
+		$oHypervisor2->DBUpdate();
+
+		$this->CreateVirtualMachine(1, $oFarm);
+		$this->CreateVirtualMachine(2, $oFarm);
+
+		$oTicket = $this->CreateTicket(1);
+		$this->AddCIToTicket($oServer1, $oTicket, 'manual');
+		$this->AddCIToTicket($oHypervisor2, $oTicket, 'manual');
+		$oTicket->DBUpdate(); // trigger the impact update
+		$this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(6, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
+	}
+
+    /**
+     * <pre>
+     *                    +-->Person1
+     *                    |
+     *                    +
+     * Server1+---->Hypervisor1+--+  +-->VM1
+     *                            |  |
+     *                            v  +
+     *                            Farm (1)
+     *                            ^  +
+     *                            |  |
+     * Server2+---->Hypervisor2+--+  +-->VM2
+     *                    +
+     *                    |
+     *                    +-->Person2
+     *
+     * Ticket+---->Server1 (manual), Server2 (manual), Hypervisor2 (not_impacted)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1,Server2,Hypervisor2
+     *       |
+     *       +====>Person1
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Exclusion()
+    {
+        $oFarm = $this->CreateFarm(1);
+
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+        $oContact1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oContact1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+        $oContact2 = $this->CreatePerson(2);
+        $this->AddContactToCI($oContact2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $this->CreateVirtualMachine(1, $oFarm);
+        $this->CreateVirtualMachine(2, $oFarm);
+
+        $oTicket = $this->CreateTicket(1);
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $this->AddCIToTicket($oServer2, $oTicket, 'manual');
+        $this->AddCIToTicket($oHypervisor2, $oTicket, 'not_impacted');
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(4, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+     * <pre>
+     *                    +-->Person1
+     *                    |
+     *                    +
+     * Server1+---->Hypervisor1+--+  +-->VM1
+     *                            |  |
+     *                            v  +
+     *                            Farm (1)
+     *                            ^  +
+     *                            |  |
+     * Server2+---->Hypervisor2+--+  +-->VM2
+     *                    +
+     *                    |
+     *                    +-->Person2
+     *
+     * Ticket+---->Server1 (manual), Server2 (manual)
+     *       |
+     *       +---->Person2 (do_not_notify)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1,Server2,Hypervisor2,Farm,VM1,VM2
+     *       |
+     *       +====>Person1,Person2 (do_not_notify)
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Exclusion2()
+    {
+        $oFarm = $this->CreateFarm(1);
+
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+        $oContact1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oContact1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+        $oContact2 = $this->CreatePerson(2);
+        $this->AddContactToCI($oContact2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $this->CreateVirtualMachine(1, $oFarm);
+        $this->CreateVirtualMachine(2, $oFarm);
+
+        $oTicket = $this->CreateTicket(1);
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $this->AddCIToTicket($oServer2, $oTicket, 'manual');
+        $this->AddContactToTicket($oContact2, $oTicket, 'do_not_notify');
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(7, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+     * <pre>
+     *                    +-->Person1
+     *                    |
+     *                    +
+     * Server1+---->Hypervisor1+--+  +-->VM1
+     *                            |  |
+     *                            v  +
+     *                            Farm (1)
+     *                            ^  +
+     *                            |  |
+     * Server2+---->Hypervisor2+--+  +-->VM2
+     *                    +
+     *                    |
+     *                    +-->Person2
+     *
+     * Ticket+---->Server1 (manual), Server2 (manual), Hypervisor2 (not_impacted)
+     *       |
+     *       +---->Person2 (do_not_notify)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1,Server2,Hypervisor2
+     *       |
+     *       +====>Person1,Person2 (do_not_notify)
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Exclusion3()
+    {
+        $oFarm = $this->CreateFarm(1);
+
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+        $oContact1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oContact1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+        $oContact2 = $this->CreatePerson(2);
+        $this->AddContactToCI($oContact2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $this->CreateVirtualMachine(1, $oFarm);
+        $this->CreateVirtualMachine(2, $oFarm);
+
+        $oTicket = $this->CreateTicket(1);
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $this->AddCIToTicket($oServer2, $oTicket, 'manual');
+        $this->AddCIToTicket($oHypervisor2, $oTicket, 'not_impacted');
+        $this->AddContactToTicket($oContact2, $oTicket, 'do_not_notify');
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(4, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(2, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+     * <pre>
+     *                    +-->Person1
+     *                    |
+     *                    +
+     * Server1+---->Hypervisor1+--+  +-->VM1
+     *                            |  |
+     *                            v  +
+     *                            Farm (1)
+     *                            ^  +
+     *                            |  |
+     * Server2+---->Hypervisor2+--+  +-->VM2
+     *                    +
+     *                    |
+     *                    +-->Person2
+     *
+     * Ticket+---->Server1 (manual), Hypervisor2 (not_impacted)
+     *
+     * Result:
+     *
+     * Ticket+====>Server1,Hypervisor1, Hypervisor2 (not_impacted)
+     *       |
+     *       +====>Person1
+     * </pre>
+     *
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Exclusion4()
+    {
+        $oFarm = $this->CreateFarm(1);
+
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+        $oContact1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oContact1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+        $oContact2 = $this->CreatePerson(2);
+        $this->AddContactToCI($oContact2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $this->CreateVirtualMachine(1, $oFarm);
+        $this->CreateVirtualMachine(2, $oFarm);
+
+        $oTicket = $this->CreateTicket(1);
+        $this->AddCIToTicket($oServer1, $oTicket, 'manual');
+        $this->AddCIToTicket($oHypervisor2, $oTicket, 'not_impacted');
+        $oTicket->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket); // reload the links
+
+        $this->CheckFunctionalCIList($oTicket);
+        $this->CheckContactList($oTicket);
+        $this->assertEquals(3, $oTicket->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket->Get('contacts_list')->Count());
+    }
+
+    /**
+     * <pre>
+     *                    +-->Person1
+     *                    |
+     *                    +
+     * Server1+---->Hypervisor1+--+  +-->VM1
+     *                            |  |
+     *                            v  +
+     *                            Farm (1)
+     *                            ^  +
+     *                            |  |
+     * Server2+---->Hypervisor2+--+  +-->VM2
+     *                    +
+     *                    |
+     *                    +-->Person2
+     *
+     * Ticket1+---->Server1 (manual)
+     *
+     * Result:
+     *
+     * Ticket1+====>Server1,Hypervisor1
+     *        |
+     *        +====>Person1
+     *
+     * Then:
+     *
+     * Ticket2+---->Server2 (manual)
+     *
+     * Result:
+     *
+     * Ticket2+====>Server2,Hypervisor2,Farm,VM1,VM2
+     *        |
+     *        +====>Person2
+     * </pre>
+     *
+     * @throws ArchivedObjectException
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Redundancy_two_tickets()
+    {
+        $oFarm = $this->CreateFarm(1);
+
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+        $oContact1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oContact1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+        $oContact2 = $this->CreatePerson(2);
+        $this->AddContactToCI($oContact2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $oVM1 = $this->CreateVirtualMachine(1, $oFarm);
+        $oVM2 = $this->CreateVirtualMachine(2, $oFarm);
+
+        // Ticket1+---->Server1 (manual)
+        $oTicket1 = $this->CreateTicket(1);
+        $this->AddCIToTicket($oServer1, $oTicket1, 'manual');
+        $oTicket1->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket1); // reload the links
+
+        // Ticket1+====>Server1,Hypervisor1
+        // 	      |
+        //        +====>Person1
+        $this->CheckFunctionalCIList($oTicket1);
+        $this->CheckContactList($oTicket1);
+        $this->assertEquals(2, $oTicket1->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket1->Get('contacts_list')->Count());
+
+        // Ticket2+---->Hypervisor2 (manual)
+        $oTicket2 = $this->CreateTicket(2);
+        $this->AddCIToTicket($oServer2, $oTicket2, 'manual');
+        $oTicket2->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket2); // reload the links
+
+        // Ticket2+====>Farm,Hypervisor2,VM1,VM2,Server2
+        //        |
+        //        +====>Person2
+        $aWaitedCIList = array(
+            $oFarm->GetKey() => 'computed',
+            $oVM1->GetKey() => 'computed',
+            $oVM2->GetKey() => 'computed',
+            $oHypervisor2->GetKey() => 'computed',
+            $oServer2->GetKey() => 'manual');
+        $this->CheckFunctionalCIList($oTicket2, $aWaitedCIList);
+        $this->CheckContactList($oTicket2);
+	    $this->assertEquals(2, $oTicket2->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket2->Get('contacts_list')->Count());
+
+        // The first ticket is not impacted
+        $this->debug("\nCheck that the first ticket has not changed.");
+        $this->ReloadObject($oTicket1); // reload the links
+
+        // Ticket1+====>Server1,Hypervisor1
+        // 	      |
+        //        +====>Person1
+        $this->CheckFunctionalCIList($oTicket1);
+        $this->CheckContactList($oTicket1);
+        $this->assertEquals(2, $oTicket1->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket1->Get('contacts_list')->Count());
+    }
+
+    /**
+     * <pre>
+     *                    +-->Person1
+     *                    |
+     *                    +
+     * Server1+---->Hypervisor1+--+  +-->VM1
+     *                            |  |
+     *                            v  +
+     * Server3+---->Hypervisor3+->Farm (1)
+     *                            ^  +
+     *                            |  |
+     * Server2+---->Hypervisor2+--+  +-->VM2
+     *                    +
+     *                    |
+     *                    +-->Person2
+     *
+     * Ticket1+---->Server1 (manual), Hypervisor2(manual)
+     *
+     * Result:
+     *
+     * Ticket1+====>Server1,Hypervisor1, Hypervisor2
+     *        |
+     *        +====>Person1, Person2
+     *
+     * Then:
+     *
+     * Ticket2+---->Server2 (manual), Hypervisor3 (manual)
+     *
+     * Result:
+     *
+     * Ticket2+====>Server2,Hypervisor2,Hypervisor3,Farm,VM1,VM2
+     *        |
+     *        +====>Person2
+     * </pre>
+     *
+     * @throws ArchivedObjectException
+     * @throws Exception
+     */
+    public function testUpdateImpactedItems_Redundancy_two_tickets2()
+    {
+        $oFarm = $this->CreateFarm(1);
+
+        $oServer1 = $this->CreateServer(1);
+        $oHypervisor1 = $this->CreateHypervisor(1, $oServer1, $oFarm);
+        $oContact1 = $this->CreatePerson(1);
+        $this->AddContactToCI($oContact1, $oHypervisor1);
+        $oHypervisor1->DBUpdate();
+
+        $oServer2 = $this->CreateServer(2);
+        $oHypervisor2 = $this->CreateHypervisor(2, $oServer2, $oFarm);
+        $oContact2 = $this->CreatePerson(2);
+        $this->AddContactToCI($oContact2, $oHypervisor2);
+        $oHypervisor2->DBUpdate();
+
+        $oServer3 = $this->CreateServer(3);
+        $oHypervisor3 = $this->CreateHypervisor(3, $oServer3, $oFarm);
+
+
+        $oVM1 = $this->CreateVirtualMachine(1, $oFarm);
+        $oVM2 = $this->CreateVirtualMachine(2, $oFarm);
+
+        // Ticket1+---->Server1 (manual), Hypervisor2(manual)
+        $oTicket1 = $this->CreateTicket(1);
+        $this->AddCIToTicket($oServer1, $oTicket1, 'manual');
+        $this->AddCIToTicket($oHypervisor2, $oTicket1, 'manual');
+        $oTicket1->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket1); // reload the links
+
+        // Ticket1+====>Server1,Hypervisor1,Hypervisor2
+        // 	      |
+        //        +====>Person1,Person2
+        $this->CheckFunctionalCIList($oTicket1);
+        $this->CheckContactList($oTicket1);
+        $this->assertEquals(3, $oTicket1->Get('functionalcis_list')->Count());
+        $this->assertEquals(2, $oTicket1->Get('contacts_list')->Count());
+
+        // Ticket2+---->Server2 (manual)
+        $oTicket2 = $this->CreateTicket(2);
+        $this->AddCIToTicket($oServer2, $oTicket2, 'manual');
+        $this->AddCIToTicket($oHypervisor3, $oTicket2, 'manual');
+        $oTicket2->DBUpdate(); // trigger the impact update
+        $this->ReloadObject($oTicket2); // reload the links
+
+        // Ticket2+====>Farm,Hypervisor2,VM1,VM2,Server2
+        //        |
+        //        +====>Person2
+        $aWaitedCIList = array(
+            $oFarm->GetKey() => 'computed',
+            $oVM1->GetKey() => 'computed',
+            $oVM2->GetKey() => 'computed',
+            $oHypervisor2->GetKey() => 'computed',
+            $oHypervisor3->GetKey() => 'manual',
+            $oServer2->GetKey() => 'manual');
+        $this->CheckFunctionalCIList($oTicket2, $aWaitedCIList);
+        $this->CheckContactList($oTicket2);
+	    $this->assertEquals(3, $oTicket2->Get('functionalcis_list')->Count());
+        $this->assertEquals(1, $oTicket2->Get('contacts_list')->Count());
+
+        // The first ticket is not impacted
+        $this->debug("\nCheck that the first ticket has not changed.");
+        $this->ReloadObject($oTicket1); // reload the links
+
+        // Ticket1+====>Server1,Hypervisor1,Hypervisor2
+        // 	      |
+        //        +====>Person1,Person2
+        $this->CheckFunctionalCIList($oTicket1);
+        $this->CheckContactList($oTicket1);
+        $this->assertEquals(3, $oTicket1->Get('functionalcis_list')->Count());
+        $this->assertEquals(2, $oTicket1->Get('contacts_list')->Count());
+    }
+
+}
diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist
index de2a6a30e..5a5f70729 100644
--- a/test/phpunit.xml.dist
+++ b/test/phpunit.xml.dist
@@ -1,64 +1,64 @@
-<!-- Copyright (c) 2010-2017 Combodo SARL -->
-<!-- -->
-<!--   This file is part of iTop. -->
-<!-- -->
-<!--   iTop is free software; you can redistribute it and/or modify	 -->
-<!--   it under the terms of the GNU Affero General Public License as published by -->
-<!--   the Free Software Foundation, either version 3 of the License, or -->
-<!--   (at your option) any later version. -->
-<!-- -->
-<!--   iTop is distributed in the hope that it will be useful, -->
-<!--   but WITHOUT ANY WARRANTY; without even the implied warranty of -->
-<!--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -->
-<!--   GNU Affero General Public License for more details. -->
-<!-- -->
-<!--   You should have received a copy of the GNU Affero General Public License -->
-<!--   along with iTop. If not, see <http://www.gnu.org/licenses/> -->
-<!-- -->
-
-<phpunit bootstrap="unittestautoload.php"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         cacheTokens="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
-         mapTestClassNameToCoveredClassName="false"
-         printerClass="\PHPUnit\TextUI\ResultPrinter"
-         processIsolation="true"
-         stopOnError="false"
-         stopOnFailure="false"
-         stopOnIncomplete="false"
-         stopOnSkipped="false"
-         stopOnRisky="false"
-         timeoutForSmallTests="1"
-         timeoutForMediumTests="10"
-         timeoutForLargeTests="60"
-         verbose="false">
-
-    <testsuites>
-        <testsuite name="Core">
-            <directory>core</directory>
-        </testsuite>
-        <testsuite name="Tickets">
-            <directory>itop-tickets</directory>
-        </testsuite>
-        <testsuite name="Application">
-            <directory>application</directory>
-        </testsuite>
-    </testsuites>
-
-    <!-- Code coverage white list -->
-    <filter>
-        <whitelist>
-            <file>../core/apc-emulation.php</file>
-            <file>../core/ormlinkset.class.inc.php</file>
-            <file>../datamodels/2.x/itop-tickets/main.itop-tickets.php</file>
-        </whitelist>
-    </filter>
-
-</phpunit>
+<!-- Copyright (c) 2010-2017 Combodo SARL -->
+<!-- -->
+<!--   This file is part of iTop. -->
+<!-- -->
+<!--   iTop is free software; you can redistribute it and/or modify	 -->
+<!--   it under the terms of the GNU Affero General Public License as published by -->
+<!--   the Free Software Foundation, either version 3 of the License, or -->
+<!--   (at your option) any later version. -->
+<!-- -->
+<!--   iTop is distributed in the hope that it will be useful, -->
+<!--   but WITHOUT ANY WARRANTY; without even the implied warranty of -->
+<!--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the -->
+<!--   GNU Affero General Public License for more details. -->
+<!-- -->
+<!--   You should have received a copy of the GNU Affero General Public License -->
+<!--   along with iTop. If not, see <http://www.gnu.org/licenses/> -->
+<!-- -->
+
+<phpunit bootstrap="unittestautoload.php"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/6.3/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         cacheTokens="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         forceCoversAnnotation="false"
+         mapTestClassNameToCoveredClassName="false"
+         printerClass="\PHPUnit\TextUI\ResultPrinter"
+         processIsolation="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         stopOnRisky="false"
+         timeoutForSmallTests="1"
+         timeoutForMediumTests="10"
+         timeoutForLargeTests="60"
+         verbose="false">
+
+    <testsuites>
+        <testsuite name="Core">
+            <directory>core</directory>
+        </testsuite>
+        <testsuite name="Tickets">
+            <directory>itop-tickets</directory>
+        </testsuite>
+        <testsuite name="Application">
+            <directory>application</directory>
+        </testsuite>
+    </testsuites>
+
+    <!-- Code coverage white list -->
+    <filter>
+        <whitelist>
+            <file>../core/apc-emulation.php</file>
+            <file>../core/ormlinkset.class.inc.php</file>
+            <file>../datamodels/2.x/itop-tickets/main.itop-tickets.php</file>
+        </whitelist>
+    </filter>
+
+</phpunit>
diff --git a/test/test.php b/test/test.php
index b062d7ec3..a8783c55a 100644
--- a/test/test.php
+++ b/test/test.php
@@ -1,169 +1,169 @@
-<?php
-// Copyright (C) 2010-2014 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Core test page
- *
- * @copyright   Copyright (C) 2010-2014 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-?>
-<style>
-.vardump {
-font-size:8pt;
-line-height:100%;
-}
-</style>
-<?php
-
-///////////////////////////////////////////////////////////////////////////////
-// Helpers
-///////////////////////////////////////////////////////////////////////////////
-
-function ReadMandatoryParam($sName)
-{
-	$value = utils::ReadParam($sName, null);
-	if (is_null($value))
-	{
-		echo "<p>Missing mandatory argument <b>$sName</b></p>";
-		exit;
-	}
-	return $value;
-}
-
-function IsAValidTestClass($sClassName)
-{
-	// Must be a child of TestHandler
-	//
-	if (!is_subclass_of($sClassName, 'TestHandler')) return false;
-
-	// Must not be abstract
-	//
-	$oReflectionClass = new ReflectionClass($sClassName);
-	if (!$oReflectionClass->isInstantiable()) return false;
-
-	return true;
-}
-
-function GetTestClassLine($sClassName)
-{
-	$oReflectionClass = new ReflectionClass($sClassName);
-	return $oReflectionClass->getStartLine();
-}
-
-function DisplayEvents($aEvents, $sTitle)
-{
-	echo "<h4>$sTitle</h4>\n";
-	if (count($aEvents) > 0)
-	{
-		echo "<ul>\n";
-		foreach ($aEvents as $sEvent)
-		{
-			echo "<li>$sEvent</li>\n";
-		}
-		echo "</ul>\n";
-	}
-	else
-	{
-		echo "<p>none</p>\n";
-	}
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Main
-///////////////////////////////////////////////////////////////////////////////
-
-date_default_timezone_set('Europe/Paris');
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/utils.inc.php');
-require_once('./test.class.inc.php');
-require_once('./testlist.inc.php');
-
-require_once(APPROOT.'/core/cmdbobject.class.inc.php');
-
-
-$sTodo = utils::ReadParam("todo", "");
-if ($sTodo == '')
-{
-	// Show the list of tests
-	//
-	echo "<h3>Existing tests</h3>\n";
-	echo "<ul>\n";
-	foreach (get_declared_classes() as $sClassName)
-	{
-		if (!IsAValidTestClass($sClassName)) continue;
-		
-		$sName = call_user_func(array($sClassName, 'GetName'));
-		$sDescription = call_user_func(array($sClassName, 'GetDescription'));
-		echo "<li><a href=\"?todo=exec&testid=$sClassName\">$sName</a> ($sDescription)</li>\n";
-	}
-	echo "</ul>\n";
-}
-else if ($sTodo == 'exec')
-{
-	// Execute a test
-	//
-	$sTestClass = ReadMandatoryParam("testid");
-
-	if (!IsAValidTestClass($sTestClass))
-	{
-		echo "<p>Wrong value for testid, expecting a valid class name</p>\n";
-	}
-	else
-	{
-		$oTest  = new $sTestClass();
-		$iStartLine = GetTestClassLine($sTestClass);
-		echo "<h3>Testing: ".$oTest->GetName()."</h3>\n";
-		echo "<h6>testlist.inc.php: $iStartLine</h6>\n";
-		$bRes = $oTest->Execute();
-	}
-
-/*
-MyHelpers::var_dump_html($oTest->GetResults());
-MyHelpers::var_dump_html($oTest->GetWarnings());
-MyHelpers::var_dump_html($oTest->GetErrors());
-*/
-
-	if ($bRes)
-	{
-		echo "<p>Success :-)</p>\n";
-		DisplayEvents($oTest->GetResults(), 'Results');
-	}
-	else
-	{
-		echo "<p>Failure :-(</p>\n";
-	}
-	DisplayEvents($oTest->GetErrors(), 'Errors');
-	DisplayEvents($oTest->GetWarnings(), 'Warnings');
-
-	// Render the output
-	//
-	echo "<h4>Actual output</h4>\n";
-	echo "<div style=\"border: dashed; background-color:light-grey;\">\n";
-	echo $oTest->GetOutput();
-	echo "</div>\n";
-}
-else
-{
-}
-
-
-?>
+<?php
+// Copyright (C) 2010-2014 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Core test page
+ *
+ * @copyright   Copyright (C) 2010-2014 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+?>
+<style>
+.vardump {
+font-size:8pt;
+line-height:100%;
+}
+</style>
+<?php
+
+///////////////////////////////////////////////////////////////////////////////
+// Helpers
+///////////////////////////////////////////////////////////////////////////////
+
+function ReadMandatoryParam($sName)
+{
+	$value = utils::ReadParam($sName, null);
+	if (is_null($value))
+	{
+		echo "<p>Missing mandatory argument <b>$sName</b></p>";
+		exit;
+	}
+	return $value;
+}
+
+function IsAValidTestClass($sClassName)
+{
+	// Must be a child of TestHandler
+	//
+	if (!is_subclass_of($sClassName, 'TestHandler')) return false;
+
+	// Must not be abstract
+	//
+	$oReflectionClass = new ReflectionClass($sClassName);
+	if (!$oReflectionClass->isInstantiable()) return false;
+
+	return true;
+}
+
+function GetTestClassLine($sClassName)
+{
+	$oReflectionClass = new ReflectionClass($sClassName);
+	return $oReflectionClass->getStartLine();
+}
+
+function DisplayEvents($aEvents, $sTitle)
+{
+	echo "<h4>$sTitle</h4>\n";
+	if (count($aEvents) > 0)
+	{
+		echo "<ul>\n";
+		foreach ($aEvents as $sEvent)
+		{
+			echo "<li>$sEvent</li>\n";
+		}
+		echo "</ul>\n";
+	}
+	else
+	{
+		echo "<p>none</p>\n";
+	}
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// Main
+///////////////////////////////////////////////////////////////////////////////
+
+date_default_timezone_set('Europe/Paris');
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/utils.inc.php');
+require_once('./test.class.inc.php');
+require_once('./testlist.inc.php');
+
+require_once(APPROOT.'/core/cmdbobject.class.inc.php');
+
+
+$sTodo = utils::ReadParam("todo", "");
+if ($sTodo == '')
+{
+	// Show the list of tests
+	//
+	echo "<h3>Existing tests</h3>\n";
+	echo "<ul>\n";
+	foreach (get_declared_classes() as $sClassName)
+	{
+		if (!IsAValidTestClass($sClassName)) continue;
+		
+		$sName = call_user_func(array($sClassName, 'GetName'));
+		$sDescription = call_user_func(array($sClassName, 'GetDescription'));
+		echo "<li><a href=\"?todo=exec&testid=$sClassName\">$sName</a> ($sDescription)</li>\n";
+	}
+	echo "</ul>\n";
+}
+else if ($sTodo == 'exec')
+{
+	// Execute a test
+	//
+	$sTestClass = ReadMandatoryParam("testid");
+
+	if (!IsAValidTestClass($sTestClass))
+	{
+		echo "<p>Wrong value for testid, expecting a valid class name</p>\n";
+	}
+	else
+	{
+		$oTest  = new $sTestClass();
+		$iStartLine = GetTestClassLine($sTestClass);
+		echo "<h3>Testing: ".$oTest->GetName()."</h3>\n";
+		echo "<h6>testlist.inc.php: $iStartLine</h6>\n";
+		$bRes = $oTest->Execute();
+	}
+
+/*
+MyHelpers::var_dump_html($oTest->GetResults());
+MyHelpers::var_dump_html($oTest->GetWarnings());
+MyHelpers::var_dump_html($oTest->GetErrors());
+*/
+
+	if ($bRes)
+	{
+		echo "<p>Success :-)</p>\n";
+		DisplayEvents($oTest->GetResults(), 'Results');
+	}
+	else
+	{
+		echo "<p>Failure :-(</p>\n";
+	}
+	DisplayEvents($oTest->GetErrors(), 'Errors');
+	DisplayEvents($oTest->GetWarnings(), 'Warnings');
+
+	// Render the output
+	//
+	echo "<h4>Actual output</h4>\n";
+	echo "<div style=\"border: dashed; background-color:light-grey;\">\n";
+	echo $oTest->GetOutput();
+	echo "</div>\n";
+}
+else
+{
+}
+
+
+?>
diff --git a/test/unittestautoload.php b/test/unittestautoload.php
index 1dbfed3b2..4c523c2e8 100644
--- a/test/unittestautoload.php
+++ b/test/unittestautoload.php
@@ -1,7 +1,7 @@
-<?php
-
-@include_once('ItopTestCase.php');
-@include_once('ItopDataTestCase.php');
-
-
+<?php
+
+@include_once('ItopTestCase.php');
+@include_once('ItopDataTestCase.php');
+
+
 @include_once('./vendor/autoload.php');
\ No newline at end of file
diff --git a/web.config b/web.config
index bc353ffed..9295d57c4 100644
--- a/web.config
+++ b/web.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <system.webServer>
-    <staticContent>
-        <remove fileExtension=".woff" />
-        <remove fileExtension=".woff2" />
-        <remove fileExtension=".ttf" />
-        <remove fileExtension=".svg" />
-        <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
-        <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
-        <mimeMap fileExtension=".ttf" mimeType="application/x-font-ttf" />
-        <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
-    </staticContent>
-  </system.webServer>
-</configuration>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <system.webServer>
+    <staticContent>
+        <remove fileExtension=".woff" />
+        <remove fileExtension=".woff2" />
+        <remove fileExtension=".ttf" />
+        <remove fileExtension=".svg" />
+        <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
+        <mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
+        <mimeMap fileExtension=".ttf" mimeType="application/x-font-ttf" />
+        <mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
+    </staticContent>
+  </system.webServer>
+</configuration>
diff --git a/webservices/backoffice.dataloader.php b/webservices/backoffice.dataloader.php
index ece7b67f6..601b90b95 100644
--- a/webservices/backoffice.dataloader.php
+++ b/webservices/backoffice.dataloader.php
@@ -1,170 +1,170 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Does load data from XML files (currently used in the setup and the backoffice data loader utility)
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * This page is called to load an XML file into the database
- * parameters
- * 'file' string Name of the file to load
- */ 
-define('SAFE_MINIMUM_MEMORY', 256*1024*1024);
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
-
-// required because the class xmldataloader is reporting errors in the setup.log file
-require_once(APPROOT.'/setup/setuppage.class.inc.php');
-require_once(APPROOT.'/setup/xmldataloader.class.inc.php');
-
-
-function SetMemoryLimit($oP)
-{
-	$sMemoryLimit = trim(ini_get('memory_limit'));
-	if (empty($sMemoryLimit))
-	{
-		// On some PHP installations, memory_limit does not exist as a PHP setting!
-		// (encountered on a 5.2.0 under Windows)
-		// In that case, ini_set will not work, let's keep track of this and proceed with the data load
-		$oP->p("No memory limit has been defined in this instance of PHP");		
-	}
-	else
-	{
-		// Check that the limit will allow us to load the data
-		//
-		$iMemoryLimit = utils::ConvertToBytes($sMemoryLimit);
-		if ($iMemoryLimit < SAFE_MINIMUM_MEMORY)
-		{
-			if (ini_set('memory_limit', SAFE_MINIMUM_MEMORY) === FALSE)
-			{
-				$oP->p("memory_limit is too small: $iMemoryLimit and can not be increased by the script itself.");		
-			}
-			else
-			{
-				$oP->p("memory_limit increased from $iMemoryLimit to ".SAFE_MINIMUM_MEMORY.".");		
-			}
-		}
-	}
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Main
-//
-////////////////////////////////////////////////////////////////////////////////
-
-// Never cache this page
-header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
-header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
-
-/**
- * Main program
- */
-$sFileName = Utils::ReadParam('file', '', false, 'raw_data');
-
-$oP = new WebPage("iTop - Backoffice data loader");
-
-
-try
-{
-	// Note: the data model must be loaded first
-	$oDataLoader = new XMLDataLoader();
-
-	if (empty($sFileName))
-	{
-		throw(new Exception("Missing argument 'file'"));
-	}
-	if (!file_exists($sFileName))
-	{
-		throw(new Exception("File $sFileName does not exist"));
-	}
-
-	SetMemoryLimit($oP);
-	
-
-	// The XMLDataLoader constructor has initialized the DB, let's start a transaction 
-	CMDBSource::Query('START TRANSACTION');
-	
-	$oChange = MetaModel::NewObject("CMDBChange");
-	$oChange->Set("date", time());
-	$oChange->Set("userinfo", "Initialization");
-	$iChangeId = $oChange->DBInsert();
-	$oP->p("Starting data load.");		
-	$oDataLoader->StartSession($oChange);
-	
-	$oDataLoader->LoadFile($sFileName);
-	
-	$oP->p("Ending data load session");
-	if ($oDataLoader->EndSession(true /* strict */))
-	{
-		$iCountCreated = $oDataLoader->GetCountCreated();
-		CMDBSource::Query('COMMIT');
-
-		$oP->p("Data successfully written into the DB: $iCountCreated objects created");
-	}
-	else
-	{
-		CMDBSource::Query('ROLLBACK');
-		$oP->p("Some issues have been encountered, changes will not be recorded, please review the source data");
-		$aErrors = $oDataLoader->GetErrors();
-		if (count($aErrors) > 0)
-		{
-			$oP->p('Errors ('.count($aErrors).')');
-			foreach ($aErrors as $sMsg)
-			{
-				$oP->p(' * '.$sMsg);
-			}
-		}
-		$aWarnings = $oDataLoader->GetWarnings();
-		if (count($aWarnings) > 0)
-		{
-			$oP->p('Warnings ('.count($aWarnings).')');
-			foreach ($aWarnings as $sMsg)
-			{
-				$oP->p(' * '.$sMsg);
-			}
-		}
-	}
-
-}
-catch(Exception $e)
-{
-	$oP->p("An error happened while loading the data: ".$e->getMessage());		
-	$oP->p("Aborting (no data written)...");		
-	CMDBSource::Query('ROLLBACK');
-}
-
-if (function_exists('memory_get_peak_usage'))
-{
-	$oP->p("Information: memory peak usage: ".memory_get_peak_usage());
-}
-
-$oP->Output();
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Does load data from XML files (currently used in the setup and the backoffice data loader utility)
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * This page is called to load an XML file into the database
+ * parameters
+ * 'file' string Name of the file to load
+ */ 
+define('SAFE_MINIMUM_MEMORY', 256*1024*1024);
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+LoginWebPage::DoLogin(true); // Check user rights and prompt if needed (must be admin)
+
+// required because the class xmldataloader is reporting errors in the setup.log file
+require_once(APPROOT.'/setup/setuppage.class.inc.php');
+require_once(APPROOT.'/setup/xmldataloader.class.inc.php');
+
+
+function SetMemoryLimit($oP)
+{
+	$sMemoryLimit = trim(ini_get('memory_limit'));
+	if (empty($sMemoryLimit))
+	{
+		// On some PHP installations, memory_limit does not exist as a PHP setting!
+		// (encountered on a 5.2.0 under Windows)
+		// In that case, ini_set will not work, let's keep track of this and proceed with the data load
+		$oP->p("No memory limit has been defined in this instance of PHP");		
+	}
+	else
+	{
+		// Check that the limit will allow us to load the data
+		//
+		$iMemoryLimit = utils::ConvertToBytes($sMemoryLimit);
+		if ($iMemoryLimit < SAFE_MINIMUM_MEMORY)
+		{
+			if (ini_set('memory_limit', SAFE_MINIMUM_MEMORY) === FALSE)
+			{
+				$oP->p("memory_limit is too small: $iMemoryLimit and can not be increased by the script itself.");		
+			}
+			else
+			{
+				$oP->p("memory_limit increased from $iMemoryLimit to ".SAFE_MINIMUM_MEMORY.".");		
+			}
+		}
+	}
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Main
+//
+////////////////////////////////////////////////////////////////////////////////
+
+// Never cache this page
+header("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
+header("Expires: Fri, 17 Jul 1970 05:00:00 GMT");    // Date in the past
+
+/**
+ * Main program
+ */
+$sFileName = Utils::ReadParam('file', '', false, 'raw_data');
+
+$oP = new WebPage("iTop - Backoffice data loader");
+
+
+try
+{
+	// Note: the data model must be loaded first
+	$oDataLoader = new XMLDataLoader();
+
+	if (empty($sFileName))
+	{
+		throw(new Exception("Missing argument 'file'"));
+	}
+	if (!file_exists($sFileName))
+	{
+		throw(new Exception("File $sFileName does not exist"));
+	}
+
+	SetMemoryLimit($oP);
+	
+
+	// The XMLDataLoader constructor has initialized the DB, let's start a transaction 
+	CMDBSource::Query('START TRANSACTION');
+	
+	$oChange = MetaModel::NewObject("CMDBChange");
+	$oChange->Set("date", time());
+	$oChange->Set("userinfo", "Initialization");
+	$iChangeId = $oChange->DBInsert();
+	$oP->p("Starting data load.");		
+	$oDataLoader->StartSession($oChange);
+	
+	$oDataLoader->LoadFile($sFileName);
+	
+	$oP->p("Ending data load session");
+	if ($oDataLoader->EndSession(true /* strict */))
+	{
+		$iCountCreated = $oDataLoader->GetCountCreated();
+		CMDBSource::Query('COMMIT');
+
+		$oP->p("Data successfully written into the DB: $iCountCreated objects created");
+	}
+	else
+	{
+		CMDBSource::Query('ROLLBACK');
+		$oP->p("Some issues have been encountered, changes will not be recorded, please review the source data");
+		$aErrors = $oDataLoader->GetErrors();
+		if (count($aErrors) > 0)
+		{
+			$oP->p('Errors ('.count($aErrors).')');
+			foreach ($aErrors as $sMsg)
+			{
+				$oP->p(' * '.$sMsg);
+			}
+		}
+		$aWarnings = $oDataLoader->GetWarnings();
+		if (count($aWarnings) > 0)
+		{
+			$oP->p('Warnings ('.count($aWarnings).')');
+			foreach ($aWarnings as $sMsg)
+			{
+				$oP->p(' * '.$sMsg);
+			}
+		}
+	}
+
+}
+catch(Exception $e)
+{
+	$oP->p("An error happened while loading the data: ".$e->getMessage());		
+	$oP->p("Aborting (no data written)...");		
+	CMDBSource::Query('ROLLBACK');
+}
+
+if (function_exists('memory_get_peak_usage'))
+{
+	$oP->p("Information: memory peak usage: ".memory_get_peak_usage());
+}
+
+$oP->Output();
+?>
diff --git a/webservices/cron.cmd b/webservices/cron.cmd
index c46fa3dbe..170e18d52 100644
--- a/webservices/cron.cmd
+++ b/webservices/cron.cmd
@@ -1,18 +1,18 @@
-@echo off
-REM
-REM To be scheduled by the following command:
-REM
-REM schtasks /create /tn "iTop Cron" /sc minute /tr "\"C:\Program Files\EasyPHP-5.3.6.0\www\iTop-trunk\webservices\cron.cmd\""
-REM
-REM
-REM PHP_PATH must point to php.exe, adjust the path to suit your own installation
-SET PHP_PATH=C:\Program Files\EasyPHP-5.3.6.0\php\php.exe
-REM PHP_INI must contain the full path to a PHP.ini file suitable for Command Line mode execution
-SET PHP_INI=C:\Program Files\EasyPHP-5.3.6.0\php\php-cli.ini
-REM The double dash (--) separates the parameters parsed by php.exe from the script's specific parameters
-REM %~p0 expands to the path to this file (including the trailing backslash)
-SET CRON_SCRIPT=%~p0cron.php
-REM Adjust the path below if you use a param files stored in a different location
-SET PARAMS_FILE=%~p0cron.params
-REM Actual PHP invocation
-"%PHP_PATH%" -c "%PHP_INI%" -f "%CRON_SCRIPT%" -- --param_file="%PARAMS_FILE%" --verbose=1 >> "%~p0log.txt"
+@echo off
+REM
+REM To be scheduled by the following command:
+REM
+REM schtasks /create /tn "iTop Cron" /sc minute /tr "\"C:\Program Files\EasyPHP-5.3.6.0\www\iTop-trunk\webservices\cron.cmd\""
+REM
+REM
+REM PHP_PATH must point to php.exe, adjust the path to suit your own installation
+SET PHP_PATH=C:\Program Files\EasyPHP-5.3.6.0\php\php.exe
+REM PHP_INI must contain the full path to a PHP.ini file suitable for Command Line mode execution
+SET PHP_INI=C:\Program Files\EasyPHP-5.3.6.0\php\php-cli.ini
+REM The double dash (--) separates the parameters parsed by php.exe from the script's specific parameters
+REM %~p0 expands to the path to this file (including the trailing backslash)
+SET CRON_SCRIPT=%~p0cron.php
+REM Adjust the path below if you use a param files stored in a different location
+SET PARAMS_FILE=%~p0cron.params
+REM Actual PHP invocation
+"%PHP_PATH%" -c "%PHP_INI%" -f "%CRON_SCRIPT%" -- --param_file="%PARAMS_FILE%" --verbose=1 >> "%~p0log.txt"
diff --git a/webservices/cron.distrib b/webservices/cron.distrib
index 4f29e97f6..2e3240149 100644
--- a/webservices/cron.distrib
+++ b/webservices/cron.distrib
@@ -1,6 +1,6 @@
-# CRON parameters file used by cron.cmd
-#
-# Warning: make sure that this file is NOT readable by the web server
-
-auth_user=admin
+# CRON parameters file used by cron.cmd
+#
+# Warning: make sure that this file is NOT readable by the web server
+
+auth_user=admin
 auth_pwd=admin
\ No newline at end of file
diff --git a/webservices/export.php b/webservices/export.php
index 495522166..c2863ad40 100644
--- a/webservices/export.php
+++ b/webservices/export.php
@@ -1,365 +1,365 @@
-<?php
-// Copyright (C) 2010-2017 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Export data specified by an OQL
- *
- * @copyright   Copyright (C) 2010-2017 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/nicewebpage.class.inc.php');
-require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
-require_once(APPROOT.'/application/csvpage.class.inc.php');
-require_once(APPROOT.'/application/xmlpage.class.inc.php');
-require_once(APPROOT.'/application/clipage.class.inc.php');
-require_once(APPROOT.'/application/excelexporter.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-try
-{
-	// Do this before loging, in order to allow setting user credentials from within the file
-	utils::UseParamFile();
-}
-catch(Exception $e)
-{
-	echo "Error: ".$e->GetMessage()."<br/>\n";
-	exit -2;
-}
-
-if (utils::IsModeCLI()) 
-{
-	$sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data'); 
-	$sAuthPwd = utils::ReadParam('auth_pwd', null, true /* Allow CLI */, 'raw_data'); 
-
-	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) 
-	{ 
-		UserRights::Login($sAuthUser); // Login & set the user's language 
-	} 
-	else 
-	{ 
-		$oP = new CLIPage("iTop - Export"); 
-		$oP->p("Access restricted or wrong credentials ('$sAuthUser')"); 
-		$oP->output(); 
-		exit -1; 
-	}
-} 
-else 
-{
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php'); 
-	LoginWebPage::DoLogin(); // Check user rights and prompt if needed 
-}
-ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
-
-
-$oAppContext = new ApplicationContext();
-$iActiveNodeId = utils::ReadParam('menu', -1);
-$currentOrganization = utils::ReadParam('org_id', '');
-
-if (utils::IsArchiveMode() && !UserRights::CanBrowseArchive())
-{
-	$oP = new CLIPage("iTop - Export");
-	$oP->p("The user account is not authorized to access the archives");
-	$oP->output();
-	exit -1;
-}
-
-$bLocalize = (utils::ReadParam('no_localize', 0) != 1);
-$sFileName = utils::ReadParam('filename', '', true, 'string');
-
-// Main program
-$sExpression = utils::ReadParam('expression', '', true /* Allow CLI */, 'raw_data');
-$sFields = trim(utils::ReadParam('fields', '', true, 'raw_data')); // CSV field list (allows to specify link set attributes, still not taken into account for XML export)
-$bFieldsAdvanced = utils::ReadParam('fields_advanced', 0);
-
-if (strlen($sExpression) == 0)
-{
-	$sQueryId = trim(utils::ReadParam('query', '', true /* Allow CLI */, 'raw_data'));
-	if (strlen($sQueryId) > 0)
-	{
-		$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
-		$oQueries = new DBObjectSet($oSearch);
-		if ($oQueries->Count() > 0)
-		{
-			$oQuery = $oQueries->Fetch();
-			$sExpression = $oQuery->Get('oql');
-			if (strlen($sFields) == 0)
-			{
-				$sFields = trim($oQuery->Get('fields'));
-			} 
-		}
-	}
-}
-
-$sFormat = strtolower(utils::ReadParam('format', 'html', true /* Allow CLI */));
-
-
-$aFields = explode(',', $sFields);
-// Clean the list of columns (empty it if every string is empty)
-foreach($aFields as $index => $sField)
-{
-	$aFields[$index] = trim($sField);
-	if(strlen($aFields[$index]) == 0)
-	{
-		unset($aFields[$index]);
-	}
-}
-
-$oP = null;
-
-if (!empty($sExpression))
-{
-	try
-	{
-		$oFilter = DBObjectSearch::FromOQL($sExpression);
-
-		// Check and adjust column names
-		//
-		$aAliasToFields = array();
-		foreach($aFields as $index => $sField)
-		{
-			if (preg_match('/^(.*)\.(.*)$/', $sField, $aMatches))
-			{
-				$sClassAlias = $aMatches[1];
-				$sAttCode = $aMatches[2];
-			}
-			else
-			{
-				$sClassAlias = $oFilter->GetClassAlias();
-				$sAttCode = $sField;
-				// Disambiguate the class alias
-				$aFields[$index] = $sClassAlias.'.'.$sAttCode;
-			}
-			$aAliasToFields[$sClassAlias][] = $sAttCode;
-
-			$sClass = $oFilter->GetClassName($sClassAlias);
-			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
-			{
-				throw new CoreException("Invalid field specification $sField: $sAttCode is not a valid attribute for $sClass");
-			}
-			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
-			if ($oAttDef instanceof AttributeSubItem)
-			{
-				$aAliasToFields[$sClassAlias][] = $oAttDef->GetParentAttCode();
-			}
-			else if($oAttDef instanceof AttributeExternalField && $oAttDef->IsFriendlyName())
-			{
-				$aAliasToFields[$sClassAlias][] = $sKeyAttCode;
-			}
-		}
-
-		// Read query parameters
-		//
-		$aArgs = array();
-		foreach($oFilter->GetQueryParams() as $sParam => $foo)
-		{
-			$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
-			if (!is_null($value))
-			{
-				$aArgs[$sParam] = $value;
-			}
-		}
-		$oFilter->SetInternalParams($aArgs);
-		foreach ($oFilter->GetSelectedClasses() as $sAlias => $sClass)
-		{
-			if ((UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_READ) && UR_ALLOWED_YES) == 0)
-			{
-				throw new Exception("The current user does not have permission for exporting data of class $sClass");
-			}
-		}
-
-		if ($oFilter)
-		{
-			$oSet = new CMDBObjectSet($oFilter, array(), $aArgs);
-			$oSet->OptimizeColumnLoad($aAliasToFields);
-			switch($sFormat)
-			{
-				case 'html':
-				$oP = new NiceWebPage("iTop - Export");
-				$oP->add_style('body { overflow: auto; }'); // Show scroll bars if needed
-				
-				// Integration within MS-Excel web queries + HTTPS + IIS:
-				// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
-				// Then the fix is to force the reset of header values Pragma and Cache-control 
-				header("Pragma:", true);
-				header("Cache-control:", true);
-
-				// The HTML output is made for pages located in the /pages/ folder
-				// since this page is in a different folder, let's adjust the HTML 'base' attribute
-				// to make the relative hyperlinks in the page work
-				$sUrl = utils::GetAbsoluteUrlAppRoot();
-				$oP->set_base($sUrl.'pages/');
-
-				if(count($aFields) > 0)
-				{
-					$iSearch = array_search('id', $aFields);
-					if ($iSearch !== false)
-					{
-						$bViewLink = true;
-						unset($aFields[$iSearch]);
-					}
-					else
-					{
-						$bViewLink = false;
-					}
-					$sFields = implode(',', $aFields);
-					$aExtraParams = array('menu' => false, 'toolkit_menu' => false, 'display_limit' => false, 'localize_values' => $bLocalize, 'zlist' => false, 'extra_fields' => $sFields, 'view_link' => $bViewLink);
-				}
-				else
-				{
-					$aExtraParams = array('menu' => false, 'toolkit_menu' => false, 'display_limit' => false, 'localize_values' => $bLocalize, 'zlist' => 'details');
-				}
-
-				$oResultBlock = new DisplayBlock($oFilter, 'list', false, $aExtraParams);
-				$oResultBlock->Display($oP, 'expresult');
-				break;
-				
-				case 'csv':
-				$oP = new CSVPage("iTop - Export");
-				$sFields = implode(',', $aFields);
-				$sCharset = utils::ReadParam('charset', MetaModel::GetConfig()->Get('csv_file_default_charset'), true /* Allow CLI */, 'raw_data');
-				$sCSVData = cmdbAbstractObject::GetSetAsCSV($oSet, array('fields' => $sFields, 'fields_advanced' => $bFieldsAdvanced, 'localize_values' => $bLocalize), $sCharset);
-				if ($sCharset == 'UTF-8')
-				{
-					$sOutputData = UTF8_BOM.$sCSVData;
-				}
-				else
-				{
-					$sOutputData = $sCSVData;
-				}
-				if ($sFileName == '')
-				{
-					// Plain text => Firefox will NOT propose to download the file
-					$oP->add_header("Content-type: text/plain; charset=$sCharset");
-				}
-				else
-				{
-					$oP->add_header("Content-type: text/csv; charset=$sCharset");
-				}
-				$oP->add($sOutputData);
-				break;
-				
-				case 'spreadsheet':
-				$oP = new WebPage("iTop - Export for spreadsheet");
-
-				// Integration within MS-Excel web queries + HTTPS + IIS:
-				// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
-				// Then the fix is to force the reset of header values Pragma and Cache-control 
-				header("Pragma:", true);
-				header("Cache-control:", true);
-
-				$sFields = implode(',', $aFields);
-				$oP->add_style('table br {mso-data-placement:same-cell;}'); // Trick for Excel: keep line breaks inside the same cell !
-				cmdbAbstractObject::DisplaySetAsHTMLSpreadsheet($oP, $oSet, array('fields' => $sFields, 'fields_advanced' => $bFieldsAdvanced, 'localize_values' => $bLocalize));
-				break;
-
-				case 'xml':
-				$oP = new XMLPage("iTop - Export", true /* passthrough */);
-				cmdbAbstractObject::DisplaySetAsXML($oP, $oSet, array('localize_values' => $bLocalize));
-				break;
-				
-				case 'xlsx':
-				$oP = new ajax_page('');
-				$oExporter = new ExcelExporter();
-				$oExporter->SetObjectList($oFilter);
-				
-				// Run the export by chunk of 1000 objects to limit memory usage
-				$oExporter->SetChunkSize(1000);
-				do
-				{
-					$aStatus = $oExporter->Run(); // process one chunk
-				}
-				while( ($aStatus['code'] != 'done') && ($aStatus['code'] != 'error'));
-				
-				if ($aStatus['code'] == 'done')
-				{
-					$oP->SetContentType('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-					$oP->SetContentDisposition('attachment', $oFilter->GetClass().'.xlsx');
-					$oP->add(file_get_contents($oExporter->GetExcelFilePath()));
-					$oExporter->Cleanup();
-				}
-				else
-				{
-					$oP->add('Error, xlsx export failed: '.$aStatus['message']);
-				}
-				break;
-				
-				default:
-				$oP = new WebPage("iTop - Export");
-				$oP->add("Unsupported format '$sFormat'. Possible values are: html, csv, spreadsheet or xml.");
-			}
-		}
-	}
-	catch(Exception $e)
-	{
-		$oP = new WebPage("iTop - Export");
-		$oP->p("Error the query can not be executed.");
-		if ($e instanceof CoreException)
-		{		
-			$oP->p($e->GetHtmlDesc());
-		}
-		else
-		{
-			$oP->p($e->getMessage());
-		}		
-	}
-}
-if (!$oP)
-{
-	// Display a short message about how to use this page
-	$bModeCLI = utils::IsModeCLI();
-	if ($bModeCLI)
-	{
-		$oP = new CLIPage("iTop - Export");
-	}
-	else
-	{
-		$oP = new WebPage("iTop - Export");
-	} 
-	$oP->p("General purpose export page.");
-	$oP->p("Parameters:");
-	$oP->p(" * expression: an OQL expression (URL encoded if needed)");
-	$oP->p(" * query: (alternative to 'expression') the id of an entry from the query phrasebook");
-	if (Utils::IsModeCLI())
-	{
-		$oP->p(" * with_archive: (optional, defaults to 0) if set to 1 then the result set will include archived objects");
-	}
-	else
-	{
-		$oP->p(" * with_archive: (optional, defaults to the current mode) if set to 1 then the result set will include archived objects");
-	}
-	$oP->p(" * arg_xxx: (needed if the query has parameters) the value of the parameter 'xxx'");
-	$oP->p(" * format: (optional, default is html) the desired output format. Can be one of 'html', 'spreadsheet', 'csv', 'xlsx' or 'xml'");
-	$oP->p(" * fields: (optional, no effect on XML format) list of fields (attribute codes, or alias.attcode) separated by a coma");
-	$oP->p(" * fields_advanced: (optional, no effect on XML/HTML formats ; ignored is fields is specified) If set to 1, the default list of fields will include the external keys and their reconciliation keys");
-	$oP->p(" * filename: (optional, no effect in CLI mode) if set then the results will be downloaded as a file");
-}
-
-if ($sFileName != '')
-{
-	$oP->add_header('Content-Disposition: attachment; filename="'.$sFileName.'"');
-}
-
-$oP->TrashUnexpectedOutput();
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2017 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Export data specified by an OQL
+ *
+ * @copyright   Copyright (C) 2010-2017 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/nicewebpage.class.inc.php');
+require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
+require_once(APPROOT.'/application/csvpage.class.inc.php');
+require_once(APPROOT.'/application/xmlpage.class.inc.php');
+require_once(APPROOT.'/application/clipage.class.inc.php');
+require_once(APPROOT.'/application/excelexporter.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+try
+{
+	// Do this before loging, in order to allow setting user credentials from within the file
+	utils::UseParamFile();
+}
+catch(Exception $e)
+{
+	echo "Error: ".$e->GetMessage()."<br/>\n";
+	exit -2;
+}
+
+if (utils::IsModeCLI()) 
+{
+	$sAuthUser = utils::ReadParam('auth_user', null, true /* Allow CLI */, 'raw_data'); 
+	$sAuthPwd = utils::ReadParam('auth_pwd', null, true /* Allow CLI */, 'raw_data'); 
+
+	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd)) 
+	{ 
+		UserRights::Login($sAuthUser); // Login & set the user's language 
+	} 
+	else 
+	{ 
+		$oP = new CLIPage("iTop - Export"); 
+		$oP->p("Access restricted or wrong credentials ('$sAuthUser')"); 
+		$oP->output(); 
+		exit -1; 
+	}
+} 
+else 
+{
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php'); 
+	LoginWebPage::DoLogin(); // Check user rights and prompt if needed 
+}
+ApplicationContext::SetUrlMakerClass('iTopStandardURLMaker');
+
+
+$oAppContext = new ApplicationContext();
+$iActiveNodeId = utils::ReadParam('menu', -1);
+$currentOrganization = utils::ReadParam('org_id', '');
+
+if (utils::IsArchiveMode() && !UserRights::CanBrowseArchive())
+{
+	$oP = new CLIPage("iTop - Export");
+	$oP->p("The user account is not authorized to access the archives");
+	$oP->output();
+	exit -1;
+}
+
+$bLocalize = (utils::ReadParam('no_localize', 0) != 1);
+$sFileName = utils::ReadParam('filename', '', true, 'string');
+
+// Main program
+$sExpression = utils::ReadParam('expression', '', true /* Allow CLI */, 'raw_data');
+$sFields = trim(utils::ReadParam('fields', '', true, 'raw_data')); // CSV field list (allows to specify link set attributes, still not taken into account for XML export)
+$bFieldsAdvanced = utils::ReadParam('fields_advanced', 0);
+
+if (strlen($sExpression) == 0)
+{
+	$sQueryId = trim(utils::ReadParam('query', '', true /* Allow CLI */, 'raw_data'));
+	if (strlen($sQueryId) > 0)
+	{
+		$oSearch = DBObjectSearch::FromOQL('SELECT QueryOQL WHERE id = :query_id', array('query_id' => $sQueryId));
+		$oQueries = new DBObjectSet($oSearch);
+		if ($oQueries->Count() > 0)
+		{
+			$oQuery = $oQueries->Fetch();
+			$sExpression = $oQuery->Get('oql');
+			if (strlen($sFields) == 0)
+			{
+				$sFields = trim($oQuery->Get('fields'));
+			} 
+		}
+	}
+}
+
+$sFormat = strtolower(utils::ReadParam('format', 'html', true /* Allow CLI */));
+
+
+$aFields = explode(',', $sFields);
+// Clean the list of columns (empty it if every string is empty)
+foreach($aFields as $index => $sField)
+{
+	$aFields[$index] = trim($sField);
+	if(strlen($aFields[$index]) == 0)
+	{
+		unset($aFields[$index]);
+	}
+}
+
+$oP = null;
+
+if (!empty($sExpression))
+{
+	try
+	{
+		$oFilter = DBObjectSearch::FromOQL($sExpression);
+
+		// Check and adjust column names
+		//
+		$aAliasToFields = array();
+		foreach($aFields as $index => $sField)
+		{
+			if (preg_match('/^(.*)\.(.*)$/', $sField, $aMatches))
+			{
+				$sClassAlias = $aMatches[1];
+				$sAttCode = $aMatches[2];
+			}
+			else
+			{
+				$sClassAlias = $oFilter->GetClassAlias();
+				$sAttCode = $sField;
+				// Disambiguate the class alias
+				$aFields[$index] = $sClassAlias.'.'.$sAttCode;
+			}
+			$aAliasToFields[$sClassAlias][] = $sAttCode;
+
+			$sClass = $oFilter->GetClassName($sClassAlias);
+			if (!MetaModel::IsValidAttCode($sClass, $sAttCode))
+			{
+				throw new CoreException("Invalid field specification $sField: $sAttCode is not a valid attribute for $sClass");
+			}
+			$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+			if ($oAttDef instanceof AttributeSubItem)
+			{
+				$aAliasToFields[$sClassAlias][] = $oAttDef->GetParentAttCode();
+			}
+			else if($oAttDef instanceof AttributeExternalField && $oAttDef->IsFriendlyName())
+			{
+				$aAliasToFields[$sClassAlias][] = $sKeyAttCode;
+			}
+		}
+
+		// Read query parameters
+		//
+		$aArgs = array();
+		foreach($oFilter->GetQueryParams() as $sParam => $foo)
+		{
+			$value = utils::ReadParam('arg_'.$sParam, null, true, 'raw_data');
+			if (!is_null($value))
+			{
+				$aArgs[$sParam] = $value;
+			}
+		}
+		$oFilter->SetInternalParams($aArgs);
+		foreach ($oFilter->GetSelectedClasses() as $sAlias => $sClass)
+		{
+			if ((UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_READ) && UR_ALLOWED_YES) == 0)
+			{
+				throw new Exception("The current user does not have permission for exporting data of class $sClass");
+			}
+		}
+
+		if ($oFilter)
+		{
+			$oSet = new CMDBObjectSet($oFilter, array(), $aArgs);
+			$oSet->OptimizeColumnLoad($aAliasToFields);
+			switch($sFormat)
+			{
+				case 'html':
+				$oP = new NiceWebPage("iTop - Export");
+				$oP->add_style('body { overflow: auto; }'); // Show scroll bars if needed
+				
+				// Integration within MS-Excel web queries + HTTPS + IIS:
+				// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
+				// Then the fix is to force the reset of header values Pragma and Cache-control 
+				header("Pragma:", true);
+				header("Cache-control:", true);
+
+				// The HTML output is made for pages located in the /pages/ folder
+				// since this page is in a different folder, let's adjust the HTML 'base' attribute
+				// to make the relative hyperlinks in the page work
+				$sUrl = utils::GetAbsoluteUrlAppRoot();
+				$oP->set_base($sUrl.'pages/');
+
+				if(count($aFields) > 0)
+				{
+					$iSearch = array_search('id', $aFields);
+					if ($iSearch !== false)
+					{
+						$bViewLink = true;
+						unset($aFields[$iSearch]);
+					}
+					else
+					{
+						$bViewLink = false;
+					}
+					$sFields = implode(',', $aFields);
+					$aExtraParams = array('menu' => false, 'toolkit_menu' => false, 'display_limit' => false, 'localize_values' => $bLocalize, 'zlist' => false, 'extra_fields' => $sFields, 'view_link' => $bViewLink);
+				}
+				else
+				{
+					$aExtraParams = array('menu' => false, 'toolkit_menu' => false, 'display_limit' => false, 'localize_values' => $bLocalize, 'zlist' => 'details');
+				}
+
+				$oResultBlock = new DisplayBlock($oFilter, 'list', false, $aExtraParams);
+				$oResultBlock->Display($oP, 'expresult');
+				break;
+				
+				case 'csv':
+				$oP = new CSVPage("iTop - Export");
+				$sFields = implode(',', $aFields);
+				$sCharset = utils::ReadParam('charset', MetaModel::GetConfig()->Get('csv_file_default_charset'), true /* Allow CLI */, 'raw_data');
+				$sCSVData = cmdbAbstractObject::GetSetAsCSV($oSet, array('fields' => $sFields, 'fields_advanced' => $bFieldsAdvanced, 'localize_values' => $bLocalize), $sCharset);
+				if ($sCharset == 'UTF-8')
+				{
+					$sOutputData = UTF8_BOM.$sCSVData;
+				}
+				else
+				{
+					$sOutputData = $sCSVData;
+				}
+				if ($sFileName == '')
+				{
+					// Plain text => Firefox will NOT propose to download the file
+					$oP->add_header("Content-type: text/plain; charset=$sCharset");
+				}
+				else
+				{
+					$oP->add_header("Content-type: text/csv; charset=$sCharset");
+				}
+				$oP->add($sOutputData);
+				break;
+				
+				case 'spreadsheet':
+				$oP = new WebPage("iTop - Export for spreadsheet");
+
+				// Integration within MS-Excel web queries + HTTPS + IIS:
+				// MS-IIS set these header values with no-cache... while Excel fails to do the job if using HTTPS
+				// Then the fix is to force the reset of header values Pragma and Cache-control 
+				header("Pragma:", true);
+				header("Cache-control:", true);
+
+				$sFields = implode(',', $aFields);
+				$oP->add_style('table br {mso-data-placement:same-cell;}'); // Trick for Excel: keep line breaks inside the same cell !
+				cmdbAbstractObject::DisplaySetAsHTMLSpreadsheet($oP, $oSet, array('fields' => $sFields, 'fields_advanced' => $bFieldsAdvanced, 'localize_values' => $bLocalize));
+				break;
+
+				case 'xml':
+				$oP = new XMLPage("iTop - Export", true /* passthrough */);
+				cmdbAbstractObject::DisplaySetAsXML($oP, $oSet, array('localize_values' => $bLocalize));
+				break;
+				
+				case 'xlsx':
+				$oP = new ajax_page('');
+				$oExporter = new ExcelExporter();
+				$oExporter->SetObjectList($oFilter);
+				
+				// Run the export by chunk of 1000 objects to limit memory usage
+				$oExporter->SetChunkSize(1000);
+				do
+				{
+					$aStatus = $oExporter->Run(); // process one chunk
+				}
+				while( ($aStatus['code'] != 'done') && ($aStatus['code'] != 'error'));
+				
+				if ($aStatus['code'] == 'done')
+				{
+					$oP->SetContentType('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+					$oP->SetContentDisposition('attachment', $oFilter->GetClass().'.xlsx');
+					$oP->add(file_get_contents($oExporter->GetExcelFilePath()));
+					$oExporter->Cleanup();
+				}
+				else
+				{
+					$oP->add('Error, xlsx export failed: '.$aStatus['message']);
+				}
+				break;
+				
+				default:
+				$oP = new WebPage("iTop - Export");
+				$oP->add("Unsupported format '$sFormat'. Possible values are: html, csv, spreadsheet or xml.");
+			}
+		}
+	}
+	catch(Exception $e)
+	{
+		$oP = new WebPage("iTop - Export");
+		$oP->p("Error the query can not be executed.");
+		if ($e instanceof CoreException)
+		{		
+			$oP->p($e->GetHtmlDesc());
+		}
+		else
+		{
+			$oP->p($e->getMessage());
+		}		
+	}
+}
+if (!$oP)
+{
+	// Display a short message about how to use this page
+	$bModeCLI = utils::IsModeCLI();
+	if ($bModeCLI)
+	{
+		$oP = new CLIPage("iTop - Export");
+	}
+	else
+	{
+		$oP = new WebPage("iTop - Export");
+	} 
+	$oP->p("General purpose export page.");
+	$oP->p("Parameters:");
+	$oP->p(" * expression: an OQL expression (URL encoded if needed)");
+	$oP->p(" * query: (alternative to 'expression') the id of an entry from the query phrasebook");
+	if (Utils::IsModeCLI())
+	{
+		$oP->p(" * with_archive: (optional, defaults to 0) if set to 1 then the result set will include archived objects");
+	}
+	else
+	{
+		$oP->p(" * with_archive: (optional, defaults to the current mode) if set to 1 then the result set will include archived objects");
+	}
+	$oP->p(" * arg_xxx: (needed if the query has parameters) the value of the parameter 'xxx'");
+	$oP->p(" * format: (optional, default is html) the desired output format. Can be one of 'html', 'spreadsheet', 'csv', 'xlsx' or 'xml'");
+	$oP->p(" * fields: (optional, no effect on XML format) list of fields (attribute codes, or alias.attcode) separated by a coma");
+	$oP->p(" * fields_advanced: (optional, no effect on XML/HTML formats ; ignored is fields is specified) If set to 1, the default list of fields will include the external keys and their reconciliation keys");
+	$oP->p(" * filename: (optional, no effect in CLI mode) if set then the results will be downloaded as a file");
+}
+
+if ($sFileName != '')
+{
+	$oP->add_header('Content-Disposition: attachment; filename="'.$sFileName.'"');
+}
+
+$oP->TrashUnexpectedOutput();
+$oP->output();
+?>
diff --git a/webservices/import.php b/webservices/import.php
index 10d70f721..e67a7a95f 100644
--- a/webservices/import.php
+++ b/webservices/import.php
@@ -1,909 +1,909 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Import web service 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-//
-// Known limitations
-// - reconciliation is made on the first column
-//
-// Known issues
-// - ALMOST impossible to troubleshoot when an externl key has a wrong value
-// - no character escaping in the xml output (yes !?!?!)
-// - not outputing xml when a wrong input is given (class, attribute names)
-//
-
-if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/webpage.class.inc.php');
-require_once(APPROOT.'/application/csvpage.class.inc.php');
-require_once(APPROOT.'/application/clipage.class.inc.php');
-
-require_once(APPROOT.'/application/startup.inc.php');
-
-class BulkLoadException extends Exception
-{
-}
-
-$aPageParams = array
-(
-	'auth_user' => array
-	(
-		'mandatory' => true,
-		'modes' => 'cli',
-		'default' => null,
-		'description' => 'login (must have enough rights to create objects of the given class)',
-	),
-	'auth_pwd' => array
-	(
-		'mandatory' => true,
-		'modes' => 'cli',
-		'default' => null,
-		'description' => 'password',
-	),
-	'class' => array
-	(
-		'mandatory' => true,
-		'modes' => 'http,cli',
-		'default' => null,
-		'description' => 'class of loaded objects',
-	),
-	'csvdata' => array
-	(
-		'mandatory' => true,
-		'modes' => 'http',
-		'default' => null,
-		'description' => 'data',
-	),
-	'csvfile' => array
-	(
-		'mandatory' => true,
-		'modes' => 'cli',
-		'default' => '',
-		'description' => 'local data file, replaces csvdata if specified',
-	),
-	'charset' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '',
-		'description' => 'Character set encoding of the CSV data: UTF-8, ISO-8859-1, WINDOWS-1251, WINDOWS-1252, ISO-8859-15, If blank, then the charset is set to config(csv_file_default_charset)',
-	),
-	'date_format' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '',
-		'description' => 'Input date format (used both for dates and datetimes) - Examples: Y-m-d H:i:s, d/m/Y H:i:s (Europe) - no transformation is applied if the argument is omitted. (note: old format specification using %Y %m %d is also supported for backward compatibility)',
-	),
-	'separator' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => ',',
-		'description' => 'column separator in CSV data (1 char, or \'tab\')',
-	),
-	'qualifier' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '"',
-		'description' => 'test qualifier in CSV data',
-	),
-	'output' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => 'summary',
-		'description' => '[retcode] to return the count of lines in error, [summary] to return a concise report, [details] to get a detailed report (each line listed)',
-	),
-/*
-	'reportlevel' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => 'errors|warnings|created|changed|unchanged',
-		'description' => 'combination of flags to limit the detailed output',
-	),
-*/
-	'reconciliationkeys' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '',
-		'description' => 'name of the columns used to identify existing objects and update them, or create a new one',
-	),
-	'simulate' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '0',
-		'description' => 'If set to 1, then the load will not be executed, but the expected report will be produced',
-	),
-	'comment' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '',
-		'description' => 'Comment to be added into the change log',
-	),
-	'no_localize' => array
-	(
-		'mandatory' => false,
-		'modes' => 'http,cli',
-		'default' => '0',
-		'description' => 'If set to 0, then header and values are supposed to be localized in the language of the logged in user. Set to 1 to use internal attribute codes and values (enums)',
-	),
-);
-
-function UsageAndExit($oP)
-{
-	global $aPageParams;
-	$bModeCLI = utils::IsModeCLI();
-
-	$oP->p("USAGE:\n");
-	foreach($aPageParams as $sParam => $aParamData)
-	{
-		$aModes = explode(',', $aParamData['modes']);
-		if ($bModeCLI)
-		{
-			if (in_array('cli', $aModes))
-			{
-				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
-				$oP->p("$sParam = $sDesc");
-			}
-		}
-		else
-		{
-			if (in_array('http', $aModes))
-			{
-				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
-				$oP->p("$sParam = $sDesc");
-			}
-		}
-	}
-	$oP->output();
-	exit;
-}
-
-
-function ReadParam($oP, $sParam, $sSanitizationFilter = 'parameter')
-{
-	global $aPageParams;
-	assert(isset($aPageParams[$sParam]));
-	assert(!$aPageParams[$sParam]['mandatory']);
-	$sValue = utils::ReadParam($sParam, $aPageParams[$sParam]['default'], true /* Allow CLI */, $sSanitizationFilter);
-	return trim($sValue);
-}
-
-function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
-{
-	global $aPageParams;
-	assert(isset($aPageParams[$sParam]));
-	assert($aPageParams[$sParam]['mandatory']);
-
-	$sValue = utils::ReadParam($sParam, null, true /* Allow CLI */, $sSanitizationFilter);
-	if (is_null($sValue))
-	{
-		$oP->p("ERROR: Missing argument '$sParam'\n");
-		UsageAndExit($oP);
-	}
-	return trim($sValue);
-}
-
-/////////////////////////////////
-// Main program
-
-if (utils::IsModeCLI())
-{
-	$oP = new CLIPage("iTop - Bulk import");
-}
-else
-{
-	$oP = new CSVPage("iTop - Bulk import");
-}
-
-try
-{
-	utils::UseParamFile();
-}
-catch(Exception $e)
-{
-	$oP->p("Error: ".$e->GetMessage());
-	$oP->output();
-	exit -2;
-}
-
-if (utils::IsModeCLI())
-{
-	// Next steps:
-	//   specific arguments: 'csvfile'
-	//   
-	$sAuthUser = ReadMandatoryParam($oP, 'auth_user', 'raw_data');
-	$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd', 'raw_data');
-	$sCsvFile = ReadMandatoryParam($oP, 'csvfile', 'raw_data');
-	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
-	{
-		UserRights::Login($sAuthUser); // Login & set the user's language
-	}
-	else
-	{
-		$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
-		$oP->output();
-		exit -1;
-	}
-
-	if (!is_readable($sCsvFile))
-	{
-		$oP->p("Input file could not be found or could not be read: '$sCsvFile'");
-		$oP->output();
-		exit -1;
-	}
-	$sCSVData = file_get_contents($sCsvFile);
-
-}
-else
-{
-	$_SESSION['login_mode'] = 'basic';
-	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
-
-	$sCSVData = utils::ReadPostedParam('csvdata', '', 'raw_data');
-}
-
-
-try
-{
-	$aWarnings = array();
-
-	//////////////////////////////////////////////////
-	//
-	// Read parameters
-	//
-	$sClass = ReadMandatoryParam($oP, 'class', 'raw_data'); // do not filter as a valid class, we want to produce the report "wrong class" ourselves 
-	$sSep = ReadParam($oP, 'separator', 'raw_data');
-	$sQualifier = ReadParam($oP, 'qualifier', 'raw_data');
-	$sCharSet = ReadParam($oP, 'charset', 'raw_data');
-	$sDateFormat = ReadParam($oP, 'date_format', 'raw_data');
-	if (strpos($sDateFormat, '%') !== false)
-	{
-		$sDateFormat = utils::DateTimeFormatToPHP($sDateFormat);
-	}
-	$sOutput = ReadParam($oP, 'output', 'string');
-	$sReconcKeys = ReadParam($oP, 'reconciliationkeys', 'raw_data');
-	$sSimulate = ReadParam($oP, 'simulate');
-	$sComment = ReadParam($oP, 'comment', 'raw_data');
-	$bLocalize = (ReadParam($oP, 'no_localize') != 1);
-
-	if (strtolower(trim($sSep)) == 'tab')
-	{
-		$sSep = "\t";
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Check parameters format/consistency
-	//
-	if (strlen($sCSVData) == 0)
-	{
-		throw new BulkLoadException("Missing data - at least one line is expected");
-	}
-
-	if (!MetaModel::IsValidClass($sClass))
-	{
-		throw new BulkLoadException("Unknown class: '$sClass'");
-	}
-
-	if (strlen($sSep) > 1)
-	{
-		throw new BulkLoadException("Separator is limited to one character, found '$sSep'");
-	}
-
-	if (strlen($sQualifier) > 1)
-	{
-		throw new BulkLoadException("Text qualifier is limited to one character, found '$sQualifier'");
-	}
-
-	if (!in_array($sOutput, array('retcode', 'summary', 'details')))
-	{
-		throw new BulkLoadException("Unknown output format: '$sOutput'");
-	}
-
-	if (strlen($sDateFormat) == 0)
-	{
-		$sDateFormat = null;
-	}
-	
-	if ($sCharSet == '')
-	{
-		$sCharSet = MetaModel::GetConfig()->Get('csv_file_default_charset');
-	}
-
-	if ($sSimulate == '1')
-	{
-		$bSimulate = true;
-	}
-	else
-	{
-		$bSimulate = false;
-	}
-
-	if (($sOutput == "summary") || ($sOutput == 'details'))
-	{
-		$oP->add_comment("Output format: ".$sOutput);
-		$oP->add_comment("Class: ".$sClass);
-		$oP->add_comment("Separator: ".$sSep);
-		$oP->add_comment("Qualifier: ".$sQualifier);
-		$oP->add_comment("Charset Encoding:".$sCharSet);
-		if (($sDateFormat !== null) && (strlen($sDateFormat) > 0))
-		{
-			$oP->add_comment("Date and time format: '$sDateFormat'");
-			$oDateTimeFormat = new DateTimeFormat($sDateFormat);
-			$sDateOnlyFormat = $oDateTimeFormat->ToDateFormat();
-			$oP->add_comment("Date format: '$sDateOnlyFormat'");
-		}
-		else
-		{
-			$oP->add_comment("Date format: <none>");
-		}
-		$oP->add_comment("Localize: ".($bLocalize?'yes':'no'));
-		$oP->add_comment("Data Size: ".strlen($sCSVData));
-	}
-	//////////////////////////////////////////////////
-	//
-	// Security
-	//
-	if (!UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY))
-	{
-		throw new SecurityException(Dict::Format('UI:Error:BulkModifyNotAllowedOn_Class', $sClass));
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Create an index of the known column names (in lower case)
-	// If data is localized, an array of <TranslatedName> => array of <ExtendedAttCode> (several leads to ambiguity)
-	// Otherwise             an array of <ExtendedAttCode> => array of <ExtendedAttCode> (1 element by construction)
-	//
-	// Examples (localized in french):
-	//   'lieu' => 'location_id'
-	//   'lieu->name' => 'location_id->name'
-	//
-	// Note: it may happen that an external field has the same label as the external key
-	//       in that case, we consider that the external key has precedence
-	//
-	$aKnownColumnNames = array();
-	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
-	{
-		if ($bLocalize)
-		{
-	  		$sColName = strtolower(MetaModel::GetLabel($sClass, $sAttCode));
-	  	}
-	  	else
-	  	{
-	  		$sColName = strtolower($sAttCode);
-	  	}
-	  	if (!$oAttDef->IsExternalField() || !array_key_exists($sColName, $aKnownColumnNames))
-	  	{
-		  	$aKnownColumnNames[$sColName][] = $sAttCode;
-		}
-	  	if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE))
-	  	{
-	  		$sRemoteClass = $oAttDef->GetTargetClass();
-			foreach(MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
-		  	{
-	  			$sAttCodeEx = $sAttCode.'->'.$sRemoteAttCode;
-				if ($bLocalize)
-				{
-		  			$sColName = strtolower(MetaModel::GetLabel($sClass, $sAttCodeEx));
-			  	}
-			  	else
-			  	{
-			  		$sColName = strtolower($sAttCodeEx);
-			  	}
-		  		if (!array_key_exists($sColName, $aKnownColumnNames))
-		  		{
-		  			$aKnownColumnNames[$sColName][] = $sAttCodeEx;
-		  		}
-		  	}
-		}
-   }
-
-	//print_r($aKnownColumnNames);
-	//print_r(array_keys($aKnownColumnNames));
-	//exit;
-
-	//////////////////////////////////////////////////
-	//
-	// Parse first line, check attributes, analyse the request
-	//
-	if ($sCharSet == 'UTF-8')
-	{
-		// Remove the BOM if any
-		if (substr($sCSVData, 0, 3) == UTF8_BOM)
-		{
-			$sCSVData = substr($sCSVData, 3);
-		}
-		// Clean the input
-		// Todo: warn the user if some characters are lost/substituted
-		$sUTF8Data = iconv('UTF-8', 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
-	}
-	else
-	{
-		$sUTF8Data = iconv($sCharSet, 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
-	}
-	$oCSVParser = new CSVParser($sUTF8Data, $sSep, $sQualifier); 
-
-	// Limitation: as the attribute list is in the first line, we can not match external key by a third-party attribute
-	$aRawFieldList = $oCSVParser->ListFields();
-	$iColCount = count($aRawFieldList);
-
-	// Translate into internal names
-	$aFieldList = array();
-	foreach($aRawFieldList as $iFieldId => $sFieldName)
-	{
-		$sFieldName = trim($sFieldName);
-		$aMatches = array();
-		if (preg_match('/^(.+)\*$/', $sFieldName, $aMatches))
-		{
-			// Ignore any trailing "star" (*) that simply indicates a mandatory field
-			$sFieldName = $aMatches[1];
-		}
-		else if (preg_match('/^(.+)\*->(.+)$/', $sFieldName, $aMatches))
-		{
-			// Remove any trailing "star" character before the arrow (->)
-			// A star character at the end can be used to indicate a mandatory field
-			$sFieldName = $aMatches[1].'->'.$aMatches[2];
-		}	
-		if (array_key_exists(strtolower($sFieldName), $aKnownColumnNames))
-		{
-			$aColumns = $aKnownColumnNames[strtolower($sFieldName)];
-			if (count($aColumns) > 1)
-			{
-				$aCompetitors = array();
-				foreach ($aColumns as $sAttCodeEx)
-				{
-					$aCompetitors[] = $sAttCodeEx;
-				}
-				$aWarnings[] = "Input column '$sFieldName' is ambiguous. Could be related to ".implode (' or ', $aCompetitors).". The first one will be used: ".$aColumns[0];
-			}
-			$aFieldList[$iFieldId] = $aColumns[0];
-		}
-		else
-		{
-			// Protect against XSS injection
-			$sSafeName = str_replace(array('"', '<', '>'), '', $sFieldName);
-			throw new BulkLoadException("Unknown column: '$sSafeName'. Possible columns: ".implode(', ', array_keys($aKnownColumnNames)));
-		}
-	}
-	// Note: at this stage the list of fields is supposed to be made of attcodes (and the symbol '->')	
-
-	$aAttList = array();
-	$aExtKeys = array();
-	foreach($aFieldList as $iFieldId => $sFieldName)
-	{
-		$aMatches = array();
-		if (preg_match('/^(.+)->(.+)$/', trim($sFieldName), $aMatches))
-		{
-			// The column has been specified as "extkey->attcode"
-			//
-			$sExtKeyAttCode = $aMatches[1];
-			$sRemoteAttCode = $aMatches[2];
-			if (!MetaModel::IsValidAttCode($sClass, $sExtKeyAttCode))
-			{
-				// Safety net - should not happen now that column names are checked against known names
-				throw new BulkLoadException("Unknown attribute '$sExtKeyAttCode' (class: '$sClass')");
-			}
-			$oAtt = MetaModel::GetAttributeDef($sClass, $sExtKeyAttCode);
-			if (!$oAtt->IsExternalKey())
-			{
-				// Safety net - should not happen now that column names are checked against known names
-				throw new BulkLoadException("Not an external key '$sExtKeyAttCode' (class: '$sClass')");
-			}
-			$sTargetClass = $oAtt->GetTargetClass();
-			if (!MetaModel::IsValidAttCode($sTargetClass, $sRemoteAttCode))
-			{
-				// Safety net - should not happen now that column names are checked against known names
-				throw new BulkLoadException("Unknown attribute '$sRemoteAttCode' (key: '$sExtKeyAttCode', class: '$sTargetClass')");
-			}
-			$aExtKeys[$sExtKeyAttCode][$sRemoteAttCode] = $iFieldId;
-		}
-		elseif ($sFieldName == 'id')
-		{
-			$aAttList[$sFieldName] = $iFieldId;
-		}
-		else
-		{
-			// The column has been specified as "attcode"
-			//
-			if (!MetaModel::IsValidAttCode($sClass, $sFieldName))
-			{
-				// Safety net - should not happen now that column names are checked against known names
-				throw new BulkLoadException("Unknown attribute '$sFieldName' (class: '$sClass')");
-			}
-			$oAtt = MetaModel::GetAttributeDef($sClass, $sFieldName);
-			if ($oAtt->IsExternalKey())
-			{
-				$aExtKeys[$sFieldName]['id'] = $iFieldId;
-				$aAttList[$sFieldName] = $iFieldId;
-			}
-			elseif ($oAtt->IsExternalField())
-			{
-				$sExtKeyAttCode = $oAtt->GetKeyAttCode();
-				$sRemoteAttCode = $oAtt->GetExtAttCode();
-				$aExtKeys[$sExtKeyAttCode][$sRemoteAttCode] = $iFieldId;
-			}
-			else
-			{
-				$aAttList[$sFieldName] = $iFieldId;
-			}
-		}
-	}
-
-	// Make sure there are some reconciliation keys
-	//
-	if (empty($sReconcKeys))
-	{
-		$aReconcSpec = array();
-		// Base reconciliation scheme on the default one
-		// The reconciliation attributes not present in the data will be ignored
-		foreach(MetaModel::GetReconcKeys($sClass) as $sReconcKeyAttCode)
-		{
-			if (in_array($sReconcKeyAttCode, $aFieldList))
-			{
-				if ($bLocalize)
-				{
-					$aReconcSpec[] = MetaModel::GetLabel($sClass, $sReconcKeyAttCode);
-				}
-				else
-				{
-					$aReconcSpec[] = $sReconcKeyAttCode;
-				}
-			}
-		}
-		if (count($aReconcSpec) == 0)
-		{
-			throw new BulkLoadException("No reconciliation scheme could be defined, please add a column corresponding to one defined reconciliation key (class: '$sClass', reconciliation:".implode(',', MetaModel::GetReconcKeys($sClass)).")");
-		}
-		$sReconcKeys = implode(',', $aReconcSpec);
-	}
-
-	// Interpret the list of reconciliation keys
-	//
-	$aFinalReconcilKeys = array();
-	$aReconcilKeysReport = array();
-	foreach (explode(',', $sReconcKeys) as $sReconcKey)
-	{
-		$sReconcKey = trim($sReconcKey);
-		if (empty($sReconcKey)) continue; // skip empty spec
-
-		if (array_key_exists(strtolower($sReconcKey), $aKnownColumnNames))
-		{
-			// Translate from a translated name to codes
-			$aColumns = $aKnownColumnNames[strtolower($sReconcKey)];
-			if (count($aColumns) > 1)
-			{
-				$aCompetitors = array();
-				foreach ($aColumns as $sAttCodeEx)
-				{
-					$aCompetitors[] = $sAttCodeEx;
-				}
-				$aWarnings[] = "Reconciliation key '$sReconcKey' is ambiguous. Could be related to ".implode (' or ', $aCompetitors).". The first one will be used: ".$aColumns[0];
-			}
-			$sReconcKey = $aColumns[0];
-		}
-		else
-		{
-			// Protect against XSS injection
-			$sSafeName = str_replace(array('"', '<', '>'), '', $sReconcKey);
-			throw new BulkLoadException("Unknown reconciliation key: '$sSafeName'");
-		}
-
-		// Check that the reconciliation key is either a given column, or an external key
-		if (!in_array($sReconcKey, $aFieldList))
-		{
-			if (!array_key_exists($sReconcKey, $aExtKeys))
-			{
-				// Protect against XSS injection
-				$sSafeName = str_replace(array('"', '<', '>'), '', $sReconcKey);
-				throw new BulkLoadException("Reconciliation key not found in the input columns: '$sSafeName'");
-			}
-		}
-
-		if (preg_match('/^(.+)->(.+)$/', trim($sReconcKey), $aMatches))
-		{
-			// The column has been specified as "extkey->attcode"
-			//
-			$sExtKeyAttCode = $aMatches[1];
-			$sRemoteAttCode = $aMatches[2];
-
-			$aFinalReconcilKeys[] = $sExtKeyAttCode;
-			$aReconcilKeysReport[$sExtKeyAttCode][] = $sRemoteAttCode;
-		}
-		else
-		{
-			if (!MetaModel::IsValidAttCode($sClass, $sReconcKey))
-			{
-				// Safety net - should not happen now that column names are checked against known names
-				throw new BulkLoadException("Unknown reconciliation attribute '$sReconcKey' (class: '$sClass')");
-			}
-			$oAtt = MetaModel::GetAttributeDef($sClass, $sReconcKey);
-			if ($oAtt->IsExternalKey())
-			{
-				$aFinalReconcilKeys[] = $sReconcKey;
-				$aReconcilKeysReport[$sReconcKey][] = 'id';
-			}
-			elseif ($oAtt->IsExternalField())
-			{
-				$sReconcAttCode = $oAtt->GetKeyAttCode();
-				$sReconcKeyReport = "$sReconcAttCode ($sReconcKey)";
-
-				$aFinalReconcilKeys[] = $sReconcAttCode;
-				$aReconcilKeysReport[$sReconcAttCode][] = $sReconcKeyReport;
-			}
-			else
-			{
-				$aFinalReconcilKeys[] = $sReconcKey;
-				$aReconcilKeysReport[$sReconcKey] = array();
-			}
-		}
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Go for parsing and interpretation
-	//
-
-	$aData = $oCSVParser->ToArray();
-	$iLineCount = count($aData);
-
-	if (($sOutput == "summary") || ($sOutput == 'details'))
-	{
-		$oP->add_comment("Data Lines: ".$iLineCount);
-		$oP->add_comment("Simulate: ".($bSimulate ? '1' : '0'));
-		$oP->add_comment("Columns: ".implode(', ', $aFieldList));
-
-		$aReconciliationReport = array();
-		foreach($aReconcilKeysReport as $sKey => $aKeyDetails)
-		{
-			if (count($aKeyDetails) > 0)
-			{
-				$aReconciliationReport[] = $sKey.' ('.implode(',', $aKeyDetails).')';
-			}
-			else
-			{
-				$aReconciliationReport[] = $sKey;
-			}
-		}
-		$oP->add_comment("Reconciliation Keys: ".implode(', ', $aReconciliationReport));
-
-		foreach ($aWarnings as $sWarning)
-		{
-			$oP->add_comment("Warning: ".$sWarning);
-		}
-	}
-
-	$oBulk = new BulkChange(
-		$sClass,
-		$aData,
-		$aAttList,
-		$aExtKeys,
-		$aFinalReconcilKeys,
-		null, // synchro scope
-		null, // on delete
-		$sDateFormat,
-		$bLocalize
-	);
-
-	if ($bSimulate)
-	{
-		$oMyChange = null;
-	}
-	else
-	{
-		if (strlen($sComment) > 0)
-		{
-			$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV) - '.$sComment;
-		}
-		else
-		{
-			$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV)';
-		}
-		CMDBObject::SetTrackInfo($sMoreInfo);
-		CMDBObject::SetTrackOrigin('csv-import.php');
-		
-		$oMyChange = CMDBObject::GetCurrentChange();
-	}
-
-	$aRes = $oBulk->Process($oMyChange);
-
-	//////////////////////////////////////////////////
-	//
-	// Compute statistics
-	//
-	$iCountErrors = 0;
-	$iCountWarnings = 0;
-	$iCountCreations = 0;
-	$iCountUpdates = 0;
-	$iCountUnchanged = 0;
-	foreach($aRes as $iRow => $aRowData)
-	{
-		$bWritten = false;
-
-		$oStatus = $aRowData["__STATUS__"];
-		switch(get_class($oStatus))
-		{
-		case 'RowStatus_NoChange':
-			$iCountUnchanged++;
-			break;
-		case 'RowStatus_Modify':
-			$iCountUpdates++;
-			$bWritten = true;
-			break;
-		case 'RowStatus_NewObj':
-			$iCountCreations++;
-			$bWritten = true;
-			break;
-		case 'RowStatus_Issue':
-			$iCountErrors++;
-			break;		
-		}
-
-		if ($bWritten)
-		{
-			// Something has been done, still there may be some issues to report
-			foreach($aRowData as $key => $value)
-			{
-				if (!is_object($value)) continue;
-
-				switch (get_class($value))
-				{
-					case 'CellStatus_Void':
-					case 'CellStatus_Modify':
-						break;
-					case 'CellStatus_Issue':
-					case 'CellStatus_SearchIssue':
-					case 'CellStatus_NullIssue':
-					case 'CellStatus_Ambiguous':
-						$iCountWarnings++;
-						break;
-				}
-			}
-		}
-	}
-
-	//////////////////////////////////////////////////
-	//
-	// Summary of settings and results
-	//
-	if ($sOutput == 'retcode')
-	{
-		$oP->add($iCountErrors);
-	}
-
-	if (($sOutput == "summary") || ($sOutput == 'details'))
-	{
-		$oP->add_comment("Change tracking comment: ".$sComment);
-		$oP->add_comment("Issues: ".$iCountErrors);
-		$oP->add_comment("Warnings: ".$iCountWarnings);
-		$oP->add_comment("Created: ".$iCountCreations);
-		$oP->add_comment("Updated: ".$iCountUpdates);
-		$oP->add_comment("Unchanged: ".$iCountUnchanged);
-	}
-
-
-	if ($sOutput == 'details')
-	{
-		// Setup result presentation
-		//
-		$aDisplayConfig = array();
-		$aDisplayConfig["__LINE__"] = array("label"=>"Line", "description"=>"");
-		$aDisplayConfig["__STATUS__"] = array("label"=>"Status", "description"=>"");
-		$aDisplayConfig["__OBJECT_CLASS__"] = array("label"=>"Object Class", "description"=>"");
-		$aDisplayConfig["__OBJECT_ID__"] = array("label"=>"Object Id", "description"=>"");
-		foreach($aExtKeys as $sExtKeyAttCode => $aRemoteAtt)
-		{
-			$sLabel = MetaModel::GetAttributeDef($sClass, $sExtKeyAttCode)->GetLabel();
-			$aDisplayConfig["$sExtKeyAttCode"] = array("label"=>$sExtKeyAttCode, "description"=>$sLabel." - ext key");
-		}
-		foreach($aFinalReconcilKeys as $iCol => $sAttCode)
-		{
-	//		$sLabel = MetaModel::GetAttributeDef($sClass, $sAttCode)->GetLabel();
-	//		$aDisplayConfig["$iCol"] = array("label"=>"$sLabel", "description"=>"");
-		}
-		foreach ($aAttList as $sAttCode => $iCol)
-		{
-			if ($sAttCode == 'id')
-			{
-				$sLabel = Dict::S('UI:CSVImport:idField');
-
-				$aDisplayConfig["$iCol"] = array("label"=>$sAttCode, "description"=>$sLabel);
-			}
-			else
-			{
-				$sLabel = MetaModel::GetAttributeDef($sClass, $sAttCode)->GetLabel();
-				$aDisplayConfig["$iCol"] = array("label"=>$sAttCode, "description"=>$sLabel);
-			}
-		}
-	
-		$aResultDisp = array(); // to be displayed
-		foreach($aRes as $iRow => $aRowData)
-		{
-			$aRowDisp = array();
-			$aRowDisp["__LINE__"] = $iRow;
-			if (is_object($aRowData["__STATUS__"]))
-			{
-				$aRowDisp["__STATUS__"] = $aRowData["__STATUS__"]->GetDescription();
-			}
-			else
-			{
-				$aRowDisp["__STATUS__"] = "*No status available*";
-			}
-			if (isset($aRowData["finalclass"]) && isset($aRowData["id"]))
-			{
-				$aRowDisp["__OBJECT_CLASS__"] = $aRowData["finalclass"];
-				$aRowDisp["__OBJECT_ID__"] = $aRowData["id"]->GetDisplayableValue();
-			}
-			else
-			{
-				$aRowDisp["__OBJECT_CLASS__"] = "n/a";
-				$aRowDisp["__OBJECT_ID__"] = "n/a";
-			}
-			foreach($aRowData as $key => $value)
-			{
-				$sKey = (string) $key;
-	
-				if ($sKey == '__STATUS__') continue;
-				if ($sKey == 'finalclass') continue;
-				if ($sKey == 'id') continue;
-	
-				if (is_object($value))
-				{
-					$aRowDisp["$sKey"] = $value->GetDisplayableValue().$value->GetDescription();
-				}
-				else
-				{
-					$aRowDisp["$sKey"] = $value;
-				}
-			}
-			$aResultDisp[$iRow] = $aRowDisp;
-		}
-		$oP->table($aDisplayConfig, $aResultDisp);
-	}
-}
-catch(BulkLoadException $e)
-{
-	$oP->add_comment($e->getMessage());		
-}
-catch(SecurityException $e)
-{
-	$oP->add_comment($e->getMessage());		
-}
-catch(Exception $e)
-{
-	$oP->add_comment((string)$e);		
-}
-
-$oP->output();
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Import web service 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+//
+// Known limitations
+// - reconciliation is made on the first column
+//
+// Known issues
+// - ALMOST impossible to troubleshoot when an externl key has a wrong value
+// - no character escaping in the xml output (yes !?!?!)
+// - not outputing xml when a wrong input is given (class, attribute names)
+//
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/webpage.class.inc.php');
+require_once(APPROOT.'/application/csvpage.class.inc.php');
+require_once(APPROOT.'/application/clipage.class.inc.php');
+
+require_once(APPROOT.'/application/startup.inc.php');
+
+class BulkLoadException extends Exception
+{
+}
+
+$aPageParams = array
+(
+	'auth_user' => array
+	(
+		'mandatory' => true,
+		'modes' => 'cli',
+		'default' => null,
+		'description' => 'login (must have enough rights to create objects of the given class)',
+	),
+	'auth_pwd' => array
+	(
+		'mandatory' => true,
+		'modes' => 'cli',
+		'default' => null,
+		'description' => 'password',
+	),
+	'class' => array
+	(
+		'mandatory' => true,
+		'modes' => 'http,cli',
+		'default' => null,
+		'description' => 'class of loaded objects',
+	),
+	'csvdata' => array
+	(
+		'mandatory' => true,
+		'modes' => 'http',
+		'default' => null,
+		'description' => 'data',
+	),
+	'csvfile' => array
+	(
+		'mandatory' => true,
+		'modes' => 'cli',
+		'default' => '',
+		'description' => 'local data file, replaces csvdata if specified',
+	),
+	'charset' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '',
+		'description' => 'Character set encoding of the CSV data: UTF-8, ISO-8859-1, WINDOWS-1251, WINDOWS-1252, ISO-8859-15, If blank, then the charset is set to config(csv_file_default_charset)',
+	),
+	'date_format' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '',
+		'description' => 'Input date format (used both for dates and datetimes) - Examples: Y-m-d H:i:s, d/m/Y H:i:s (Europe) - no transformation is applied if the argument is omitted. (note: old format specification using %Y %m %d is also supported for backward compatibility)',
+	),
+	'separator' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => ',',
+		'description' => 'column separator in CSV data (1 char, or \'tab\')',
+	),
+	'qualifier' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '"',
+		'description' => 'test qualifier in CSV data',
+	),
+	'output' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => 'summary',
+		'description' => '[retcode] to return the count of lines in error, [summary] to return a concise report, [details] to get a detailed report (each line listed)',
+	),
+/*
+	'reportlevel' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => 'errors|warnings|created|changed|unchanged',
+		'description' => 'combination of flags to limit the detailed output',
+	),
+*/
+	'reconciliationkeys' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '',
+		'description' => 'name of the columns used to identify existing objects and update them, or create a new one',
+	),
+	'simulate' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '0',
+		'description' => 'If set to 1, then the load will not be executed, but the expected report will be produced',
+	),
+	'comment' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '',
+		'description' => 'Comment to be added into the change log',
+	),
+	'no_localize' => array
+	(
+		'mandatory' => false,
+		'modes' => 'http,cli',
+		'default' => '0',
+		'description' => 'If set to 0, then header and values are supposed to be localized in the language of the logged in user. Set to 1 to use internal attribute codes and values (enums)',
+	),
+);
+
+function UsageAndExit($oP)
+{
+	global $aPageParams;
+	$bModeCLI = utils::IsModeCLI();
+
+	$oP->p("USAGE:\n");
+	foreach($aPageParams as $sParam => $aParamData)
+	{
+		$aModes = explode(',', $aParamData['modes']);
+		if ($bModeCLI)
+		{
+			if (in_array('cli', $aModes))
+			{
+				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
+				$oP->p("$sParam = $sDesc");
+			}
+		}
+		else
+		{
+			if (in_array('http', $aModes))
+			{
+				$sDesc = $aParamData['description'].', '.($aParamData['mandatory'] ? 'mandatory' : 'optional, defaults to ['.$aParamData['default'].']');
+				$oP->p("$sParam = $sDesc");
+			}
+		}
+	}
+	$oP->output();
+	exit;
+}
+
+
+function ReadParam($oP, $sParam, $sSanitizationFilter = 'parameter')
+{
+	global $aPageParams;
+	assert(isset($aPageParams[$sParam]));
+	assert(!$aPageParams[$sParam]['mandatory']);
+	$sValue = utils::ReadParam($sParam, $aPageParams[$sParam]['default'], true /* Allow CLI */, $sSanitizationFilter);
+	return trim($sValue);
+}
+
+function ReadMandatoryParam($oP, $sParam, $sSanitizationFilter)
+{
+	global $aPageParams;
+	assert(isset($aPageParams[$sParam]));
+	assert($aPageParams[$sParam]['mandatory']);
+
+	$sValue = utils::ReadParam($sParam, null, true /* Allow CLI */, $sSanitizationFilter);
+	if (is_null($sValue))
+	{
+		$oP->p("ERROR: Missing argument '$sParam'\n");
+		UsageAndExit($oP);
+	}
+	return trim($sValue);
+}
+
+/////////////////////////////////
+// Main program
+
+if (utils::IsModeCLI())
+{
+	$oP = new CLIPage("iTop - Bulk import");
+}
+else
+{
+	$oP = new CSVPage("iTop - Bulk import");
+}
+
+try
+{
+	utils::UseParamFile();
+}
+catch(Exception $e)
+{
+	$oP->p("Error: ".$e->GetMessage());
+	$oP->output();
+	exit -2;
+}
+
+if (utils::IsModeCLI())
+{
+	// Next steps:
+	//   specific arguments: 'csvfile'
+	//   
+	$sAuthUser = ReadMandatoryParam($oP, 'auth_user', 'raw_data');
+	$sAuthPwd = ReadMandatoryParam($oP, 'auth_pwd', 'raw_data');
+	$sCsvFile = ReadMandatoryParam($oP, 'csvfile', 'raw_data');
+	if (UserRights::CheckCredentials($sAuthUser, $sAuthPwd))
+	{
+		UserRights::Login($sAuthUser); // Login & set the user's language
+	}
+	else
+	{
+		$oP->p("Access restricted or wrong credentials ('$sAuthUser')");
+		$oP->output();
+		exit -1;
+	}
+
+	if (!is_readable($sCsvFile))
+	{
+		$oP->p("Input file could not be found or could not be read: '$sCsvFile'");
+		$oP->output();
+		exit -1;
+	}
+	$sCSVData = file_get_contents($sCsvFile);
+
+}
+else
+{
+	$_SESSION['login_mode'] = 'basic';
+	require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+	LoginWebPage::DoLogin(); // Check user rights and prompt if needed
+
+	$sCSVData = utils::ReadPostedParam('csvdata', '', 'raw_data');
+}
+
+
+try
+{
+	$aWarnings = array();
+
+	//////////////////////////////////////////////////
+	//
+	// Read parameters
+	//
+	$sClass = ReadMandatoryParam($oP, 'class', 'raw_data'); // do not filter as a valid class, we want to produce the report "wrong class" ourselves 
+	$sSep = ReadParam($oP, 'separator', 'raw_data');
+	$sQualifier = ReadParam($oP, 'qualifier', 'raw_data');
+	$sCharSet = ReadParam($oP, 'charset', 'raw_data');
+	$sDateFormat = ReadParam($oP, 'date_format', 'raw_data');
+	if (strpos($sDateFormat, '%') !== false)
+	{
+		$sDateFormat = utils::DateTimeFormatToPHP($sDateFormat);
+	}
+	$sOutput = ReadParam($oP, 'output', 'string');
+	$sReconcKeys = ReadParam($oP, 'reconciliationkeys', 'raw_data');
+	$sSimulate = ReadParam($oP, 'simulate');
+	$sComment = ReadParam($oP, 'comment', 'raw_data');
+	$bLocalize = (ReadParam($oP, 'no_localize') != 1);
+
+	if (strtolower(trim($sSep)) == 'tab')
+	{
+		$sSep = "\t";
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Check parameters format/consistency
+	//
+	if (strlen($sCSVData) == 0)
+	{
+		throw new BulkLoadException("Missing data - at least one line is expected");
+	}
+
+	if (!MetaModel::IsValidClass($sClass))
+	{
+		throw new BulkLoadException("Unknown class: '$sClass'");
+	}
+
+	if (strlen($sSep) > 1)
+	{
+		throw new BulkLoadException("Separator is limited to one character, found '$sSep'");
+	}
+
+	if (strlen($sQualifier) > 1)
+	{
+		throw new BulkLoadException("Text qualifier is limited to one character, found '$sQualifier'");
+	}
+
+	if (!in_array($sOutput, array('retcode', 'summary', 'details')))
+	{
+		throw new BulkLoadException("Unknown output format: '$sOutput'");
+	}
+
+	if (strlen($sDateFormat) == 0)
+	{
+		$sDateFormat = null;
+	}
+	
+	if ($sCharSet == '')
+	{
+		$sCharSet = MetaModel::GetConfig()->Get('csv_file_default_charset');
+	}
+
+	if ($sSimulate == '1')
+	{
+		$bSimulate = true;
+	}
+	else
+	{
+		$bSimulate = false;
+	}
+
+	if (($sOutput == "summary") || ($sOutput == 'details'))
+	{
+		$oP->add_comment("Output format: ".$sOutput);
+		$oP->add_comment("Class: ".$sClass);
+		$oP->add_comment("Separator: ".$sSep);
+		$oP->add_comment("Qualifier: ".$sQualifier);
+		$oP->add_comment("Charset Encoding:".$sCharSet);
+		if (($sDateFormat !== null) && (strlen($sDateFormat) > 0))
+		{
+			$oP->add_comment("Date and time format: '$sDateFormat'");
+			$oDateTimeFormat = new DateTimeFormat($sDateFormat);
+			$sDateOnlyFormat = $oDateTimeFormat->ToDateFormat();
+			$oP->add_comment("Date format: '$sDateOnlyFormat'");
+		}
+		else
+		{
+			$oP->add_comment("Date format: <none>");
+		}
+		$oP->add_comment("Localize: ".($bLocalize?'yes':'no'));
+		$oP->add_comment("Data Size: ".strlen($sCSVData));
+	}
+	//////////////////////////////////////////////////
+	//
+	// Security
+	//
+	if (!UserRights::IsActionAllowed($sClass, UR_ACTION_BULK_MODIFY))
+	{
+		throw new SecurityException(Dict::Format('UI:Error:BulkModifyNotAllowedOn_Class', $sClass));
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Create an index of the known column names (in lower case)
+	// If data is localized, an array of <TranslatedName> => array of <ExtendedAttCode> (several leads to ambiguity)
+	// Otherwise             an array of <ExtendedAttCode> => array of <ExtendedAttCode> (1 element by construction)
+	//
+	// Examples (localized in french):
+	//   'lieu' => 'location_id'
+	//   'lieu->name' => 'location_id->name'
+	//
+	// Note: it may happen that an external field has the same label as the external key
+	//       in that case, we consider that the external key has precedence
+	//
+	$aKnownColumnNames = array();
+	foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
+	{
+		if ($bLocalize)
+		{
+	  		$sColName = strtolower(MetaModel::GetLabel($sClass, $sAttCode));
+	  	}
+	  	else
+	  	{
+	  		$sColName = strtolower($sAttCode);
+	  	}
+	  	if (!$oAttDef->IsExternalField() || !array_key_exists($sColName, $aKnownColumnNames))
+	  	{
+		  	$aKnownColumnNames[$sColName][] = $sAttCode;
+		}
+	  	if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE))
+	  	{
+	  		$sRemoteClass = $oAttDef->GetTargetClass();
+			foreach(MetaModel::ListAttributeDefs($sRemoteClass) as $sRemoteAttCode => $oRemoteAttDef)
+		  	{
+	  			$sAttCodeEx = $sAttCode.'->'.$sRemoteAttCode;
+				if ($bLocalize)
+				{
+		  			$sColName = strtolower(MetaModel::GetLabel($sClass, $sAttCodeEx));
+			  	}
+			  	else
+			  	{
+			  		$sColName = strtolower($sAttCodeEx);
+			  	}
+		  		if (!array_key_exists($sColName, $aKnownColumnNames))
+		  		{
+		  			$aKnownColumnNames[$sColName][] = $sAttCodeEx;
+		  		}
+		  	}
+		}
+   }
+
+	//print_r($aKnownColumnNames);
+	//print_r(array_keys($aKnownColumnNames));
+	//exit;
+
+	//////////////////////////////////////////////////
+	//
+	// Parse first line, check attributes, analyse the request
+	//
+	if ($sCharSet == 'UTF-8')
+	{
+		// Remove the BOM if any
+		if (substr($sCSVData, 0, 3) == UTF8_BOM)
+		{
+			$sCSVData = substr($sCSVData, 3);
+		}
+		// Clean the input
+		// Todo: warn the user if some characters are lost/substituted
+		$sUTF8Data = iconv('UTF-8', 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
+	}
+	else
+	{
+		$sUTF8Data = iconv($sCharSet, 'UTF-8//IGNORE//TRANSLIT', $sCSVData);
+	}
+	$oCSVParser = new CSVParser($sUTF8Data, $sSep, $sQualifier); 
+
+	// Limitation: as the attribute list is in the first line, we can not match external key by a third-party attribute
+	$aRawFieldList = $oCSVParser->ListFields();
+	$iColCount = count($aRawFieldList);
+
+	// Translate into internal names
+	$aFieldList = array();
+	foreach($aRawFieldList as $iFieldId => $sFieldName)
+	{
+		$sFieldName = trim($sFieldName);
+		$aMatches = array();
+		if (preg_match('/^(.+)\*$/', $sFieldName, $aMatches))
+		{
+			// Ignore any trailing "star" (*) that simply indicates a mandatory field
+			$sFieldName = $aMatches[1];
+		}
+		else if (preg_match('/^(.+)\*->(.+)$/', $sFieldName, $aMatches))
+		{
+			// Remove any trailing "star" character before the arrow (->)
+			// A star character at the end can be used to indicate a mandatory field
+			$sFieldName = $aMatches[1].'->'.$aMatches[2];
+		}	
+		if (array_key_exists(strtolower($sFieldName), $aKnownColumnNames))
+		{
+			$aColumns = $aKnownColumnNames[strtolower($sFieldName)];
+			if (count($aColumns) > 1)
+			{
+				$aCompetitors = array();
+				foreach ($aColumns as $sAttCodeEx)
+				{
+					$aCompetitors[] = $sAttCodeEx;
+				}
+				$aWarnings[] = "Input column '$sFieldName' is ambiguous. Could be related to ".implode (' or ', $aCompetitors).". The first one will be used: ".$aColumns[0];
+			}
+			$aFieldList[$iFieldId] = $aColumns[0];
+		}
+		else
+		{
+			// Protect against XSS injection
+			$sSafeName = str_replace(array('"', '<', '>'), '', $sFieldName);
+			throw new BulkLoadException("Unknown column: '$sSafeName'. Possible columns: ".implode(', ', array_keys($aKnownColumnNames)));
+		}
+	}
+	// Note: at this stage the list of fields is supposed to be made of attcodes (and the symbol '->')	
+
+	$aAttList = array();
+	$aExtKeys = array();
+	foreach($aFieldList as $iFieldId => $sFieldName)
+	{
+		$aMatches = array();
+		if (preg_match('/^(.+)->(.+)$/', trim($sFieldName), $aMatches))
+		{
+			// The column has been specified as "extkey->attcode"
+			//
+			$sExtKeyAttCode = $aMatches[1];
+			$sRemoteAttCode = $aMatches[2];
+			if (!MetaModel::IsValidAttCode($sClass, $sExtKeyAttCode))
+			{
+				// Safety net - should not happen now that column names are checked against known names
+				throw new BulkLoadException("Unknown attribute '$sExtKeyAttCode' (class: '$sClass')");
+			}
+			$oAtt = MetaModel::GetAttributeDef($sClass, $sExtKeyAttCode);
+			if (!$oAtt->IsExternalKey())
+			{
+				// Safety net - should not happen now that column names are checked against known names
+				throw new BulkLoadException("Not an external key '$sExtKeyAttCode' (class: '$sClass')");
+			}
+			$sTargetClass = $oAtt->GetTargetClass();
+			if (!MetaModel::IsValidAttCode($sTargetClass, $sRemoteAttCode))
+			{
+				// Safety net - should not happen now that column names are checked against known names
+				throw new BulkLoadException("Unknown attribute '$sRemoteAttCode' (key: '$sExtKeyAttCode', class: '$sTargetClass')");
+			}
+			$aExtKeys[$sExtKeyAttCode][$sRemoteAttCode] = $iFieldId;
+		}
+		elseif ($sFieldName == 'id')
+		{
+			$aAttList[$sFieldName] = $iFieldId;
+		}
+		else
+		{
+			// The column has been specified as "attcode"
+			//
+			if (!MetaModel::IsValidAttCode($sClass, $sFieldName))
+			{
+				// Safety net - should not happen now that column names are checked against known names
+				throw new BulkLoadException("Unknown attribute '$sFieldName' (class: '$sClass')");
+			}
+			$oAtt = MetaModel::GetAttributeDef($sClass, $sFieldName);
+			if ($oAtt->IsExternalKey())
+			{
+				$aExtKeys[$sFieldName]['id'] = $iFieldId;
+				$aAttList[$sFieldName] = $iFieldId;
+			}
+			elseif ($oAtt->IsExternalField())
+			{
+				$sExtKeyAttCode = $oAtt->GetKeyAttCode();
+				$sRemoteAttCode = $oAtt->GetExtAttCode();
+				$aExtKeys[$sExtKeyAttCode][$sRemoteAttCode] = $iFieldId;
+			}
+			else
+			{
+				$aAttList[$sFieldName] = $iFieldId;
+			}
+		}
+	}
+
+	// Make sure there are some reconciliation keys
+	//
+	if (empty($sReconcKeys))
+	{
+		$aReconcSpec = array();
+		// Base reconciliation scheme on the default one
+		// The reconciliation attributes not present in the data will be ignored
+		foreach(MetaModel::GetReconcKeys($sClass) as $sReconcKeyAttCode)
+		{
+			if (in_array($sReconcKeyAttCode, $aFieldList))
+			{
+				if ($bLocalize)
+				{
+					$aReconcSpec[] = MetaModel::GetLabel($sClass, $sReconcKeyAttCode);
+				}
+				else
+				{
+					$aReconcSpec[] = $sReconcKeyAttCode;
+				}
+			}
+		}
+		if (count($aReconcSpec) == 0)
+		{
+			throw new BulkLoadException("No reconciliation scheme could be defined, please add a column corresponding to one defined reconciliation key (class: '$sClass', reconciliation:".implode(',', MetaModel::GetReconcKeys($sClass)).")");
+		}
+		$sReconcKeys = implode(',', $aReconcSpec);
+	}
+
+	// Interpret the list of reconciliation keys
+	//
+	$aFinalReconcilKeys = array();
+	$aReconcilKeysReport = array();
+	foreach (explode(',', $sReconcKeys) as $sReconcKey)
+	{
+		$sReconcKey = trim($sReconcKey);
+		if (empty($sReconcKey)) continue; // skip empty spec
+
+		if (array_key_exists(strtolower($sReconcKey), $aKnownColumnNames))
+		{
+			// Translate from a translated name to codes
+			$aColumns = $aKnownColumnNames[strtolower($sReconcKey)];
+			if (count($aColumns) > 1)
+			{
+				$aCompetitors = array();
+				foreach ($aColumns as $sAttCodeEx)
+				{
+					$aCompetitors[] = $sAttCodeEx;
+				}
+				$aWarnings[] = "Reconciliation key '$sReconcKey' is ambiguous. Could be related to ".implode (' or ', $aCompetitors).". The first one will be used: ".$aColumns[0];
+			}
+			$sReconcKey = $aColumns[0];
+		}
+		else
+		{
+			// Protect against XSS injection
+			$sSafeName = str_replace(array('"', '<', '>'), '', $sReconcKey);
+			throw new BulkLoadException("Unknown reconciliation key: '$sSafeName'");
+		}
+
+		// Check that the reconciliation key is either a given column, or an external key
+		if (!in_array($sReconcKey, $aFieldList))
+		{
+			if (!array_key_exists($sReconcKey, $aExtKeys))
+			{
+				// Protect against XSS injection
+				$sSafeName = str_replace(array('"', '<', '>'), '', $sReconcKey);
+				throw new BulkLoadException("Reconciliation key not found in the input columns: '$sSafeName'");
+			}
+		}
+
+		if (preg_match('/^(.+)->(.+)$/', trim($sReconcKey), $aMatches))
+		{
+			// The column has been specified as "extkey->attcode"
+			//
+			$sExtKeyAttCode = $aMatches[1];
+			$sRemoteAttCode = $aMatches[2];
+
+			$aFinalReconcilKeys[] = $sExtKeyAttCode;
+			$aReconcilKeysReport[$sExtKeyAttCode][] = $sRemoteAttCode;
+		}
+		else
+		{
+			if (!MetaModel::IsValidAttCode($sClass, $sReconcKey))
+			{
+				// Safety net - should not happen now that column names are checked against known names
+				throw new BulkLoadException("Unknown reconciliation attribute '$sReconcKey' (class: '$sClass')");
+			}
+			$oAtt = MetaModel::GetAttributeDef($sClass, $sReconcKey);
+			if ($oAtt->IsExternalKey())
+			{
+				$aFinalReconcilKeys[] = $sReconcKey;
+				$aReconcilKeysReport[$sReconcKey][] = 'id';
+			}
+			elseif ($oAtt->IsExternalField())
+			{
+				$sReconcAttCode = $oAtt->GetKeyAttCode();
+				$sReconcKeyReport = "$sReconcAttCode ($sReconcKey)";
+
+				$aFinalReconcilKeys[] = $sReconcAttCode;
+				$aReconcilKeysReport[$sReconcAttCode][] = $sReconcKeyReport;
+			}
+			else
+			{
+				$aFinalReconcilKeys[] = $sReconcKey;
+				$aReconcilKeysReport[$sReconcKey] = array();
+			}
+		}
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Go for parsing and interpretation
+	//
+
+	$aData = $oCSVParser->ToArray();
+	$iLineCount = count($aData);
+
+	if (($sOutput == "summary") || ($sOutput == 'details'))
+	{
+		$oP->add_comment("Data Lines: ".$iLineCount);
+		$oP->add_comment("Simulate: ".($bSimulate ? '1' : '0'));
+		$oP->add_comment("Columns: ".implode(', ', $aFieldList));
+
+		$aReconciliationReport = array();
+		foreach($aReconcilKeysReport as $sKey => $aKeyDetails)
+		{
+			if (count($aKeyDetails) > 0)
+			{
+				$aReconciliationReport[] = $sKey.' ('.implode(',', $aKeyDetails).')';
+			}
+			else
+			{
+				$aReconciliationReport[] = $sKey;
+			}
+		}
+		$oP->add_comment("Reconciliation Keys: ".implode(', ', $aReconciliationReport));
+
+		foreach ($aWarnings as $sWarning)
+		{
+			$oP->add_comment("Warning: ".$sWarning);
+		}
+	}
+
+	$oBulk = new BulkChange(
+		$sClass,
+		$aData,
+		$aAttList,
+		$aExtKeys,
+		$aFinalReconcilKeys,
+		null, // synchro scope
+		null, // on delete
+		$sDateFormat,
+		$bLocalize
+	);
+
+	if ($bSimulate)
+	{
+		$oMyChange = null;
+	}
+	else
+	{
+		if (strlen($sComment) > 0)
+		{
+			$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV) - '.$sComment;
+		}
+		else
+		{
+			$sMoreInfo = CMDBChange::GetCurrentUserName().', Web Service (CSV)';
+		}
+		CMDBObject::SetTrackInfo($sMoreInfo);
+		CMDBObject::SetTrackOrigin('csv-import.php');
+		
+		$oMyChange = CMDBObject::GetCurrentChange();
+	}
+
+	$aRes = $oBulk->Process($oMyChange);
+
+	//////////////////////////////////////////////////
+	//
+	// Compute statistics
+	//
+	$iCountErrors = 0;
+	$iCountWarnings = 0;
+	$iCountCreations = 0;
+	$iCountUpdates = 0;
+	$iCountUnchanged = 0;
+	foreach($aRes as $iRow => $aRowData)
+	{
+		$bWritten = false;
+
+		$oStatus = $aRowData["__STATUS__"];
+		switch(get_class($oStatus))
+		{
+		case 'RowStatus_NoChange':
+			$iCountUnchanged++;
+			break;
+		case 'RowStatus_Modify':
+			$iCountUpdates++;
+			$bWritten = true;
+			break;
+		case 'RowStatus_NewObj':
+			$iCountCreations++;
+			$bWritten = true;
+			break;
+		case 'RowStatus_Issue':
+			$iCountErrors++;
+			break;		
+		}
+
+		if ($bWritten)
+		{
+			// Something has been done, still there may be some issues to report
+			foreach($aRowData as $key => $value)
+			{
+				if (!is_object($value)) continue;
+
+				switch (get_class($value))
+				{
+					case 'CellStatus_Void':
+					case 'CellStatus_Modify':
+						break;
+					case 'CellStatus_Issue':
+					case 'CellStatus_SearchIssue':
+					case 'CellStatus_NullIssue':
+					case 'CellStatus_Ambiguous':
+						$iCountWarnings++;
+						break;
+				}
+			}
+		}
+	}
+
+	//////////////////////////////////////////////////
+	//
+	// Summary of settings and results
+	//
+	if ($sOutput == 'retcode')
+	{
+		$oP->add($iCountErrors);
+	}
+
+	if (($sOutput == "summary") || ($sOutput == 'details'))
+	{
+		$oP->add_comment("Change tracking comment: ".$sComment);
+		$oP->add_comment("Issues: ".$iCountErrors);
+		$oP->add_comment("Warnings: ".$iCountWarnings);
+		$oP->add_comment("Created: ".$iCountCreations);
+		$oP->add_comment("Updated: ".$iCountUpdates);
+		$oP->add_comment("Unchanged: ".$iCountUnchanged);
+	}
+
+
+	if ($sOutput == 'details')
+	{
+		// Setup result presentation
+		//
+		$aDisplayConfig = array();
+		$aDisplayConfig["__LINE__"] = array("label"=>"Line", "description"=>"");
+		$aDisplayConfig["__STATUS__"] = array("label"=>"Status", "description"=>"");
+		$aDisplayConfig["__OBJECT_CLASS__"] = array("label"=>"Object Class", "description"=>"");
+		$aDisplayConfig["__OBJECT_ID__"] = array("label"=>"Object Id", "description"=>"");
+		foreach($aExtKeys as $sExtKeyAttCode => $aRemoteAtt)
+		{
+			$sLabel = MetaModel::GetAttributeDef($sClass, $sExtKeyAttCode)->GetLabel();
+			$aDisplayConfig["$sExtKeyAttCode"] = array("label"=>$sExtKeyAttCode, "description"=>$sLabel." - ext key");
+		}
+		foreach($aFinalReconcilKeys as $iCol => $sAttCode)
+		{
+	//		$sLabel = MetaModel::GetAttributeDef($sClass, $sAttCode)->GetLabel();
+	//		$aDisplayConfig["$iCol"] = array("label"=>"$sLabel", "description"=>"");
+		}
+		foreach ($aAttList as $sAttCode => $iCol)
+		{
+			if ($sAttCode == 'id')
+			{
+				$sLabel = Dict::S('UI:CSVImport:idField');
+
+				$aDisplayConfig["$iCol"] = array("label"=>$sAttCode, "description"=>$sLabel);
+			}
+			else
+			{
+				$sLabel = MetaModel::GetAttributeDef($sClass, $sAttCode)->GetLabel();
+				$aDisplayConfig["$iCol"] = array("label"=>$sAttCode, "description"=>$sLabel);
+			}
+		}
+	
+		$aResultDisp = array(); // to be displayed
+		foreach($aRes as $iRow => $aRowData)
+		{
+			$aRowDisp = array();
+			$aRowDisp["__LINE__"] = $iRow;
+			if (is_object($aRowData["__STATUS__"]))
+			{
+				$aRowDisp["__STATUS__"] = $aRowData["__STATUS__"]->GetDescription();
+			}
+			else
+			{
+				$aRowDisp["__STATUS__"] = "*No status available*";
+			}
+			if (isset($aRowData["finalclass"]) && isset($aRowData["id"]))
+			{
+				$aRowDisp["__OBJECT_CLASS__"] = $aRowData["finalclass"];
+				$aRowDisp["__OBJECT_ID__"] = $aRowData["id"]->GetDisplayableValue();
+			}
+			else
+			{
+				$aRowDisp["__OBJECT_CLASS__"] = "n/a";
+				$aRowDisp["__OBJECT_ID__"] = "n/a";
+			}
+			foreach($aRowData as $key => $value)
+			{
+				$sKey = (string) $key;
+	
+				if ($sKey == '__STATUS__') continue;
+				if ($sKey == 'finalclass') continue;
+				if ($sKey == 'id') continue;
+	
+				if (is_object($value))
+				{
+					$aRowDisp["$sKey"] = $value->GetDisplayableValue().$value->GetDescription();
+				}
+				else
+				{
+					$aRowDisp["$sKey"] = $value;
+				}
+			}
+			$aResultDisp[$iRow] = $aRowDisp;
+		}
+		$oP->table($aDisplayConfig, $aResultDisp);
+	}
+}
+catch(BulkLoadException $e)
+{
+	$oP->add_comment($e->getMessage());		
+}
+catch(SecurityException $e)
+{
+	$oP->add_comment($e->getMessage());		
+}
+catch(Exception $e)
+{
+	$oP->add_comment((string)$e);		
+}
+
+$oP->output();
+?>
diff --git a/webservices/itoprest.examples.php b/webservices/itoprest.examples.php
index 4cda07991..280e4a839 100644
--- a/webservices/itoprest.examples.php
+++ b/webservices/itoprest.examples.php
@@ -1,320 +1,320 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Shows a usage of the SOAP queries 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Helper to execute an HTTP POST request
- * Source: http://netevil.org/blog/2006/nov/http-post-from-php-without-curl
- *         originaly named after do_post_request
- */ 
-function DoPostRequest($sUrl, $aData, $sOptionnalHeaders = null)
-{
-	// $sOptionnalHeaders is a string containing additional HTTP headers that you would like to send in your request.
-
-	$sData = http_build_query($aData);
-
-	$aParams = array('http' => array(
-							'method' => 'POST',
-							'content' => $sData,
-							'header'=> "Content-type: application/x-www-form-urlencoded\r\nContent-Length: ".strlen($sData)."\r\n",
-							));
-	if ($sOptionnalHeaders !== null)
-	{
-		$aParams['http']['header'] .= $sOptionnalHeaders;
-	}
-	$ctx = stream_context_create($aParams);
-
-	$fp = @fopen($sUrl, 'rb', false, $ctx);
-	if (!$fp)
-	{
-		global $php_errormsg;
-		if (isset($php_errormsg))
-		{
-			throw new Exception("Problem with $sUrl, $php_errormsg");
-		}
-		else
-		{
-			throw new Exception("Problem with $sUrl");
-		}
-	}
-	$response = @stream_get_contents($fp);
-	if ($response === false)
-	{
-		throw new Exception("Problem reading data from $sUrl, $php_errormsg");
-	}
-	return $response;
-}
-
-// If the library curl is installed.... use this function
-//
-function DoPostRequest_curl($sUrl, $aData)
-{
-	$curl = curl_init($sUrl);
-	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt($curl, CURLOPT_POST, true);
-	curl_setopt($curl, CURLOPT_POSTFIELDS, $aData);
-	$response = curl_exec($curl);
-	curl_close($curl);
-
-	return $response;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Main program
-//
-////////////////////////////////////////////////////////////////////////////////
-
-// Define the operations to perform (one operation per call the rest service)
-//
-
-$aOperations = array(
-	array(
-		'operation' => 'list_operations', // operation code
-	),
-	array(
-		'operation' => 'core/create', // operation code
-		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'output_fields' => 'id, friendlyname', // list of fields to show in the results (* or a,b,c)
-		// Values for the object to create
-		'fields' => array(
-			'org_id' => "SELECT Organization WHERE name = 'Demo'",
-			'caller_id' => array('name' => 'monet', 'first_name' => 'claude'),
-			'title' => 'issue blah',
-			'description' => 'something happened'
-		),
-	),
-	array(
-		'operation' => 'core/update', // operation code
-		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'key' => 'SELECT UserRequest WHERE id=1',
-		'output_fields' => 'id, friendlyname, title', // list of fields to show in the results (* or a,b,c)
-		// Values for the object to create
-		'fields' => array(
-			'title' => 'Issue #'.rand(0, 100),
-			'contacts_list' => array(
-				array(
-					'role' => 'fireman #'.rand(0, 100),
-					'contact_id' => array('finalclass' => 'Person', 'name' => 'monet', 'first_name' => 'claude'),
-				),
-			),
-		),
-	),
-	// Rewrite the full CaseLog on an existing UserRequest with id=1, setting date and user (optional)
-	array(
-		'operation' => 'core/update',
-		'comment' => 'Synchronization from ServiceFirst', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'key' => 'SELECT UserRequest WHERE id=1',
-		'output_fields' => 'id, friendlyname, title',
-		'fields' => array(
-			'public_log' => array(
-				'items' => array(
-					0 => array(
-						'date' => '2001-02-01 23:59:59', //Allow to set the date of a true event, an alarm for eg.
-						'user_login' => 'Alarm monitoring', //Free text
-						'user_id' => 0, //0 is required for the user_login to be taken into account
-						'message' => 'This is 1st entry as an <b>HTML</b> formatted<br>text',
-					),
-					1 => array(
-						'date' => '2001-02-02 00:00:00', //If ommitted set automatically.
-						'user_login' => 'Alarm monitoring', //user=id=0 is missing so will be ignored
-						'message' => 'Second entry in text format:
-with new line, but format not specified, so treated as HTML!, user_id=0 missing, so user_login ignored',
-					),
-				),
-			),
-		),
-	),
-	// Add a Text entry in the HTML CaseLog of the UserRequest with id=1, setting date and user (optional)
-	array(
-		'operation' => 'core/update', // operation code
-		'comment' => 'Synchronization from Alarm Monitoring', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'key' => 1, // object id or OQL
-		'output_fields' => 'id, friendlyname, title', // list of fields to show in the results (* or a,b,c)
-		// Example of adding an entry into a CaseLog on an existing UserRequest
-		'fields' => array(
-			'public_log' => array(
-			'add_item' => array(
-				'user_login' => 'New Entry', //Free text
-				'user_id' => 0, //0 is required for the user_login to be taken into account
-				'format' => 'text', //If ommitted, source is expected to be HTML
-				'message' => 'This text is not HTML formatted with 3 lines:
-new line
-3rd and last line',
-				),
-			),
-		),
-	),
-	array(
-		'operation' => 'core/get', // operation code
-		'class' => 'UserRequest',
-		'key' => 'SELECT UserRequest',
-		'output_fields' => 'id, friendlyname, title, contacts_list', // list of fields to show in the results (* or a,b,c)
-	),
-	array(
-		'operation' => 'core/delete', // operation code
-		'comment' => 'Cleanup for synchro with...', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'key' => 'SELECT UserRequest WHERE org_id = 2',
-		'simulate' => true,
-	),
-	array(
-		'operation' => 'core/apply_stimulus', // operation code
-		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'key' => 1,
-		'stimulus' => 'ev_assign',
-		// Values to set
-		'fields' => array(
-			'team_id' => 15, // Helpdesk
-			'agent_id' => 9 // Jules Verne
-		),
-		'output_fields' => 'id, friendlyname, title, contacts_list', // list of fields to show in the results (* or a,b,c)
-	),
-	array(
-		'operation' => 'core/get_related', // operation code
-		'class' => 'Server',
-		'key' => 'SELECT Server',
-		'relation' => 'impacts', // relation code
-		'depth' => 4, // max recursion depth
-	),
-);
-$aOperations = array(
-	array(
-		'operation' => 'core/create', // operation code
-		'comment' => 'Automatic creation of attachment blah blah...', // comment recorded in the change tracking log
-		'class' => 'Attachment',
-		'output_fields' => 'id, friendlyname', // list of fields to show in the results (* or a,b,c)
-		// Values for the object to create
-		'fields' => array(
-			'item_class' => 'UserRequest',
-			'item_id' => 1,
-			'item_org_id' => 3,
-			'contents' => array(
-				'data' => 'iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACmSURBVChTfZHRDYMwDESzQ2fqhHx3C3ao+MkW/WlnaFxfzk7sEnE6JHJ+NgaKZN2zLHVN2ssfkae0Da7FQ5PRk/ve4Hcx19Ie6CEGuh/6vMgNhwanHVUNbt73lUDbYJ+6pg8b3+m2RehsVPdMXyvQY+OVkB+Rrv64lUjb3nq+aCA6v4leRqtfaIgimr53atBy9PlfUhoh3fFCNDmErv9FWR6ylBL5AREbmHBnFj5lAAAAAElFTkSuQmCC',
-				'filename' => 'myself.png',
-				'mimetype' => 'image/png'
-			),
-		),
-	),
-	array(
-		'operation' => 'core/get', // operation code
-		'class' => 'Attachment',
-		'key' => 'SELECT Attachment',
-		'output_fields' => '*',
-	)
-);
-$aOperations = array(
-	array(
-		'operation' => 'core/update', // operation code
-		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
-		'class' => 'Server',
-		'key' => 'SELECT Server WHERE name="Server1"',
-		'output_fields' => 'id, friendlyname, description', // list of fields to show in the results (* or a,b,c)
-		// Values for the object to create
-		'fields' => array(
-			'description' => 'Issue #'.time(),
-		),
-	),
-);
-$aOperations = array(
-	array(
-		'operation' => 'core/create', // operation code
-		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
-		'class' => 'UserRequest',
-		'output_fields' => 'id, friendlyname', // list of fields to show in the results (* or a,b,c)
-		// Values for the object to create
-		'fields' => array(
-			'org_id' => "SELECT Organization WHERE name = 'Demo'",
-			'caller_id' => array('name' => 'monet', 'first_name' => 'claude'),
-			'title' => 'issue blah',
-			'description' => 'something happened'
-		),
-	),
-);
-$aXXXOperations = array(
-	array(
-		'operation' => 'core/check_credentials', // operation code
-		'user' => 'admin',
-		'password' => 'admin',
-	),
-);
-$aOperations = array(
-	array(
-		'operation' => 'core/delete', // operation code
-		'comment' => 'Cleanup for synchro with...', // comment recorded in the change tracking log
-		'class' => 'Server',
-		'key' => 'SELECT Server',
-		'simulate' => false,
-	),
-);
-
-if (false)
-{
-	echo "Please edit the sample script and configure the server URL";
-	exit;
-}
-else
-{
-	$sUrl = "http://localhost/trunk/webservices/rest.php?version=1.1";
-}
-
-$aData = array();
-$aData['auth_user'] = 'no-export';
-$aData['auth_pwd'] = 'no-export';
-//$aData['auth_user'] = 'admin';
-//$aData['auth_pwd'] = 'admin';
-
-
-foreach ($aOperations as $iOp => $aOperation)
-{
-	echo "======================================\n";
-	echo "Operation #$iOp: ".$aOperation['operation']."\n";
-	$aData['json_data'] = json_encode($aOperation);
-
-	echo "--------------------------------------\n";
-	echo "Input:\n";
-	print_r($aOperation);
-
-	$response = DoPostRequest($sUrl, $aData);
-	$aResults = json_decode($response);
-	if ($aResults)
-	{
-		echo "--------------------------------------\n";
-		echo "Reply:\n";
-		print_r($aResults);
-	}
-	else
-	{
-		echo "ERROR rest.php replied:\n";
-		echo $response;
-	}
-}
-
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Shows a usage of the SOAP queries 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+/**
+ * Helper to execute an HTTP POST request
+ * Source: http://netevil.org/blog/2006/nov/http-post-from-php-without-curl
+ *         originaly named after do_post_request
+ */ 
+function DoPostRequest($sUrl, $aData, $sOptionnalHeaders = null)
+{
+	// $sOptionnalHeaders is a string containing additional HTTP headers that you would like to send in your request.
+
+	$sData = http_build_query($aData);
+
+	$aParams = array('http' => array(
+							'method' => 'POST',
+							'content' => $sData,
+							'header'=> "Content-type: application/x-www-form-urlencoded\r\nContent-Length: ".strlen($sData)."\r\n",
+							));
+	if ($sOptionnalHeaders !== null)
+	{
+		$aParams['http']['header'] .= $sOptionnalHeaders;
+	}
+	$ctx = stream_context_create($aParams);
+
+	$fp = @fopen($sUrl, 'rb', false, $ctx);
+	if (!$fp)
+	{
+		global $php_errormsg;
+		if (isset($php_errormsg))
+		{
+			throw new Exception("Problem with $sUrl, $php_errormsg");
+		}
+		else
+		{
+			throw new Exception("Problem with $sUrl");
+		}
+	}
+	$response = @stream_get_contents($fp);
+	if ($response === false)
+	{
+		throw new Exception("Problem reading data from $sUrl, $php_errormsg");
+	}
+	return $response;
+}
+
+// If the library curl is installed.... use this function
+//
+function DoPostRequest_curl($sUrl, $aData)
+{
+	$curl = curl_init($sUrl);
+	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($curl, CURLOPT_POST, true);
+	curl_setopt($curl, CURLOPT_POSTFIELDS, $aData);
+	$response = curl_exec($curl);
+	curl_close($curl);
+
+	return $response;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Main program
+//
+////////////////////////////////////////////////////////////////////////////////
+
+// Define the operations to perform (one operation per call the rest service)
+//
+
+$aOperations = array(
+	array(
+		'operation' => 'list_operations', // operation code
+	),
+	array(
+		'operation' => 'core/create', // operation code
+		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'output_fields' => 'id, friendlyname', // list of fields to show in the results (* or a,b,c)
+		// Values for the object to create
+		'fields' => array(
+			'org_id' => "SELECT Organization WHERE name = 'Demo'",
+			'caller_id' => array('name' => 'monet', 'first_name' => 'claude'),
+			'title' => 'issue blah',
+			'description' => 'something happened'
+		),
+	),
+	array(
+		'operation' => 'core/update', // operation code
+		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'key' => 'SELECT UserRequest WHERE id=1',
+		'output_fields' => 'id, friendlyname, title', // list of fields to show in the results (* or a,b,c)
+		// Values for the object to create
+		'fields' => array(
+			'title' => 'Issue #'.rand(0, 100),
+			'contacts_list' => array(
+				array(
+					'role' => 'fireman #'.rand(0, 100),
+					'contact_id' => array('finalclass' => 'Person', 'name' => 'monet', 'first_name' => 'claude'),
+				),
+			),
+		),
+	),
+	// Rewrite the full CaseLog on an existing UserRequest with id=1, setting date and user (optional)
+	array(
+		'operation' => 'core/update',
+		'comment' => 'Synchronization from ServiceFirst', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'key' => 'SELECT UserRequest WHERE id=1',
+		'output_fields' => 'id, friendlyname, title',
+		'fields' => array(
+			'public_log' => array(
+				'items' => array(
+					0 => array(
+						'date' => '2001-02-01 23:59:59', //Allow to set the date of a true event, an alarm for eg.
+						'user_login' => 'Alarm monitoring', //Free text
+						'user_id' => 0, //0 is required for the user_login to be taken into account
+						'message' => 'This is 1st entry as an <b>HTML</b> formatted<br>text',
+					),
+					1 => array(
+						'date' => '2001-02-02 00:00:00', //If ommitted set automatically.
+						'user_login' => 'Alarm monitoring', //user=id=0 is missing so will be ignored
+						'message' => 'Second entry in text format:
+with new line, but format not specified, so treated as HTML!, user_id=0 missing, so user_login ignored',
+					),
+				),
+			),
+		),
+	),
+	// Add a Text entry in the HTML CaseLog of the UserRequest with id=1, setting date and user (optional)
+	array(
+		'operation' => 'core/update', // operation code
+		'comment' => 'Synchronization from Alarm Monitoring', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'key' => 1, // object id or OQL
+		'output_fields' => 'id, friendlyname, title', // list of fields to show in the results (* or a,b,c)
+		// Example of adding an entry into a CaseLog on an existing UserRequest
+		'fields' => array(
+			'public_log' => array(
+			'add_item' => array(
+				'user_login' => 'New Entry', //Free text
+				'user_id' => 0, //0 is required for the user_login to be taken into account
+				'format' => 'text', //If ommitted, source is expected to be HTML
+				'message' => 'This text is not HTML formatted with 3 lines:
+new line
+3rd and last line',
+				),
+			),
+		),
+	),
+	array(
+		'operation' => 'core/get', // operation code
+		'class' => 'UserRequest',
+		'key' => 'SELECT UserRequest',
+		'output_fields' => 'id, friendlyname, title, contacts_list', // list of fields to show in the results (* or a,b,c)
+	),
+	array(
+		'operation' => 'core/delete', // operation code
+		'comment' => 'Cleanup for synchro with...', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'key' => 'SELECT UserRequest WHERE org_id = 2',
+		'simulate' => true,
+	),
+	array(
+		'operation' => 'core/apply_stimulus', // operation code
+		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'key' => 1,
+		'stimulus' => 'ev_assign',
+		// Values to set
+		'fields' => array(
+			'team_id' => 15, // Helpdesk
+			'agent_id' => 9 // Jules Verne
+		),
+		'output_fields' => 'id, friendlyname, title, contacts_list', // list of fields to show in the results (* or a,b,c)
+	),
+	array(
+		'operation' => 'core/get_related', // operation code
+		'class' => 'Server',
+		'key' => 'SELECT Server',
+		'relation' => 'impacts', // relation code
+		'depth' => 4, // max recursion depth
+	),
+);
+$aOperations = array(
+	array(
+		'operation' => 'core/create', // operation code
+		'comment' => 'Automatic creation of attachment blah blah...', // comment recorded in the change tracking log
+		'class' => 'Attachment',
+		'output_fields' => 'id, friendlyname', // list of fields to show in the results (* or a,b,c)
+		// Values for the object to create
+		'fields' => array(
+			'item_class' => 'UserRequest',
+			'item_id' => 1,
+			'item_org_id' => 3,
+			'contents' => array(
+				'data' => 'iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAIAAAC0tAIdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACmSURBVChTfZHRDYMwDESzQ2fqhHx3C3ao+MkW/WlnaFxfzk7sEnE6JHJ+NgaKZN2zLHVN2ssfkae0Da7FQ5PRk/ve4Hcx19Ie6CEGuh/6vMgNhwanHVUNbt73lUDbYJ+6pg8b3+m2RehsVPdMXyvQY+OVkB+Rrv64lUjb3nq+aCA6v4leRqtfaIgimr53atBy9PlfUhoh3fFCNDmErv9FWR6ylBL5AREbmHBnFj5lAAAAAElFTkSuQmCC',
+				'filename' => 'myself.png',
+				'mimetype' => 'image/png'
+			),
+		),
+	),
+	array(
+		'operation' => 'core/get', // operation code
+		'class' => 'Attachment',
+		'key' => 'SELECT Attachment',
+		'output_fields' => '*',
+	)
+);
+$aOperations = array(
+	array(
+		'operation' => 'core/update', // operation code
+		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
+		'class' => 'Server',
+		'key' => 'SELECT Server WHERE name="Server1"',
+		'output_fields' => 'id, friendlyname, description', // list of fields to show in the results (* or a,b,c)
+		// Values for the object to create
+		'fields' => array(
+			'description' => 'Issue #'.time(),
+		),
+	),
+);
+$aOperations = array(
+	array(
+		'operation' => 'core/create', // operation code
+		'comment' => 'Synchronization from blah...', // comment recorded in the change tracking log
+		'class' => 'UserRequest',
+		'output_fields' => 'id, friendlyname', // list of fields to show in the results (* or a,b,c)
+		// Values for the object to create
+		'fields' => array(
+			'org_id' => "SELECT Organization WHERE name = 'Demo'",
+			'caller_id' => array('name' => 'monet', 'first_name' => 'claude'),
+			'title' => 'issue blah',
+			'description' => 'something happened'
+		),
+	),
+);
+$aXXXOperations = array(
+	array(
+		'operation' => 'core/check_credentials', // operation code
+		'user' => 'admin',
+		'password' => 'admin',
+	),
+);
+$aOperations = array(
+	array(
+		'operation' => 'core/delete', // operation code
+		'comment' => 'Cleanup for synchro with...', // comment recorded in the change tracking log
+		'class' => 'Server',
+		'key' => 'SELECT Server',
+		'simulate' => false,
+	),
+);
+
+if (false)
+{
+	echo "Please edit the sample script and configure the server URL";
+	exit;
+}
+else
+{
+	$sUrl = "http://localhost/trunk/webservices/rest.php?version=1.1";
+}
+
+$aData = array();
+$aData['auth_user'] = 'no-export';
+$aData['auth_pwd'] = 'no-export';
+//$aData['auth_user'] = 'admin';
+//$aData['auth_pwd'] = 'admin';
+
+
+foreach ($aOperations as $iOp => $aOperation)
+{
+	echo "======================================\n";
+	echo "Operation #$iOp: ".$aOperation['operation']."\n";
+	$aData['json_data'] = json_encode($aOperation);
+
+	echo "--------------------------------------\n";
+	echo "Input:\n";
+	print_r($aOperation);
+
+	$response = DoPostRequest($sUrl, $aData);
+	$aResults = json_decode($response);
+	if ($aResults)
+	{
+		echo "--------------------------------------\n";
+		echo "Reply:\n";
+		print_r($aResults);
+	}
+	else
+	{
+		echo "ERROR rest.php replied:\n";
+		echo $response;
+	}
+}
+
 ?>
\ No newline at end of file
diff --git a/webservices/itopsoap.examples.php b/webservices/itopsoap.examples.php
index e20cd494b..03812fd50 100644
--- a/webservices/itopsoap.examples.php
+++ b/webservices/itopsoap.examples.php
@@ -1,145 +1,145 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Shows a usage of the SOAP queries 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once('itopsoaptypes.class.inc.php');
-$sItopRoot = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
-$sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php';
-//$sWsdlUri .= '?service_category=';
-
-$aSOAPMapping = SOAPMapping::GetMapping();
-
-ini_set("soap.wsdl_cache_enabled","0");
-$oSoapClient = new SoapClient(
-	$sWsdlUri,
-	array(
-		'trace' => 1,
-		'classmap' => $aSOAPMapping, // defined in itopsoaptypes.class.inc.php
-	)
-);
-
-try
-{
-	// The most simple service, returning a string
-	//
-	$sServerVersion = $oSoapClient->GetVersion();
-	echo "<p>GetVersion() returned <em>$sServerVersion</em></p>";
-
-	// More complex ones, returning a SOAPResult structure
-	// (run the page to know more about the returned data)
-	//
-	$oRes = $oSoapClient->CreateIncidentTicket
-	(
-		'admin', /* login */
-		'admin', /* password */
-		'Email server down', /* title */
-		'HW found shutdown', /* description */
-		null, /* caller */
-		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Demo'))), /* customer */
-		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW Management'))), /* service */
-		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Troubleshooting'))), /* service subcategory */
-		'', /* product */
-		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW support'))), /* workgroup */
-		array(
-			new SOAPLinkCreationSpec(
-				'Device',
-				array(new SOAPSearchCondition('name', 'switch01')),
-				array()
-			),
-			new SOAPLinkCreationSpec(
-				'Server',
-				array(new SOAPSearchCondition('name', 'dbserver1.demo.com')),
-				array()
-			),
-		), /* impacted cis */
-		'1', /* impact */
-		'1' /* urgency */
-	);
-
-	echo "<p>CreateIncidentTicket() returned:\n";
-	echo "<pre>\n";
-	print_r($oRes);
-	echo "</pre>\n";
-	echo "</p>\n";
-
-	$oRes = $oSoapClient->SearchObjects
-	(
-		'admin', /* login */
-		'admin', /* password */
-		'SELECT URP_Profiles' /* oql */
-	);
-
-	echo "<p>SearchObjects() returned:\n";
-	if ($oRes->status)
-	{
-		$aResults = $oRes->result;
-
-		echo "<table>\n";
-
-		// Header made after the first line
-		echo "<tr>\n";
-		foreach ($aResults[0]->values as $aKeyValuePair)
-		{
-			echo "   <th>".$aKeyValuePair->key."</th>\n";
-		}
-		echo "</tr>\n";
-
-		foreach ($aResults as $iRow => $aData)
-		{
-			echo "<tr>\n";
-			foreach ($aData->values as $aKeyValuePair)
-			{
-				echo "   <td>".$aKeyValuePair->value."</td>\n";
-			}
-			echo "</tr>\n";
-		}
-		echo "</table>\n";
-	}
-	else
-	{
-		$aErrors = array();
-		foreach ($oRes->errors->messages as $oMessage)
-		{
-			$aErrors[] = $oMessage->text;
-		}
-		$sErrorMsg = implode(', ', $aErrors);
-		echo "<p>SearchObjects() failed with message: $sErrorMsg</p>\n";
-		//echo "<pre>\n";
-		//print_r($oRes);
-		//echo "</pre>\n";
-	}
-	echo "</p>\n";
-}
-catch(SoapFault $e)
-{
-	echo "<h1>SoapFault Exception: {$e->getMessage()}</h1>\n"; 
-	echo "<h2>Request</h2>\n"; 
-	echo "<pre>\n"; 
-	echo htmlspecialchars($oSoapClient->__getLastRequest())."\n"; 
-	echo "</pre>"; 
-	echo "<h2>Response</h2>";
-	echo $oSoapClient->__getLastResponse()."\n";
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Shows a usage of the SOAP queries 
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once('itopsoaptypes.class.inc.php');
+$sItopRoot = 'http'.(utils::IsConnectionSecure() ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/..';
+$sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php';
+//$sWsdlUri .= '?service_category=';
+
+$aSOAPMapping = SOAPMapping::GetMapping();
+
+ini_set("soap.wsdl_cache_enabled","0");
+$oSoapClient = new SoapClient(
+	$sWsdlUri,
+	array(
+		'trace' => 1,
+		'classmap' => $aSOAPMapping, // defined in itopsoaptypes.class.inc.php
+	)
+);
+
+try
+{
+	// The most simple service, returning a string
+	//
+	$sServerVersion = $oSoapClient->GetVersion();
+	echo "<p>GetVersion() returned <em>$sServerVersion</em></p>";
+
+	// More complex ones, returning a SOAPResult structure
+	// (run the page to know more about the returned data)
+	//
+	$oRes = $oSoapClient->CreateIncidentTicket
+	(
+		'admin', /* login */
+		'admin', /* password */
+		'Email server down', /* title */
+		'HW found shutdown', /* description */
+		null, /* caller */
+		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Demo'))), /* customer */
+		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW Management'))), /* service */
+		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'Troubleshooting'))), /* service subcategory */
+		'', /* product */
+		new SOAPExternalKeySearch(array(new SOAPSearchCondition('name', 'NW support'))), /* workgroup */
+		array(
+			new SOAPLinkCreationSpec(
+				'Device',
+				array(new SOAPSearchCondition('name', 'switch01')),
+				array()
+			),
+			new SOAPLinkCreationSpec(
+				'Server',
+				array(new SOAPSearchCondition('name', 'dbserver1.demo.com')),
+				array()
+			),
+		), /* impacted cis */
+		'1', /* impact */
+		'1' /* urgency */
+	);
+
+	echo "<p>CreateIncidentTicket() returned:\n";
+	echo "<pre>\n";
+	print_r($oRes);
+	echo "</pre>\n";
+	echo "</p>\n";
+
+	$oRes = $oSoapClient->SearchObjects
+	(
+		'admin', /* login */
+		'admin', /* password */
+		'SELECT URP_Profiles' /* oql */
+	);
+
+	echo "<p>SearchObjects() returned:\n";
+	if ($oRes->status)
+	{
+		$aResults = $oRes->result;
+
+		echo "<table>\n";
+
+		// Header made after the first line
+		echo "<tr>\n";
+		foreach ($aResults[0]->values as $aKeyValuePair)
+		{
+			echo "   <th>".$aKeyValuePair->key."</th>\n";
+		}
+		echo "</tr>\n";
+
+		foreach ($aResults as $iRow => $aData)
+		{
+			echo "<tr>\n";
+			foreach ($aData->values as $aKeyValuePair)
+			{
+				echo "   <td>".$aKeyValuePair->value."</td>\n";
+			}
+			echo "</tr>\n";
+		}
+		echo "</table>\n";
+	}
+	else
+	{
+		$aErrors = array();
+		foreach ($oRes->errors->messages as $oMessage)
+		{
+			$aErrors[] = $oMessage->text;
+		}
+		$sErrorMsg = implode(', ', $aErrors);
+		echo "<p>SearchObjects() failed with message: $sErrorMsg</p>\n";
+		//echo "<pre>\n";
+		//print_r($oRes);
+		//echo "</pre>\n";
+	}
+	echo "</p>\n";
+}
+catch(SoapFault $e)
+{
+	echo "<h1>SoapFault Exception: {$e->getMessage()}</h1>\n"; 
+	echo "<h2>Request</h2>\n"; 
+	echo "<pre>\n"; 
+	echo htmlspecialchars($oSoapClient->__getLastRequest())."\n"; 
+	echo "</pre>"; 
+	echo "<h2>Response</h2>";
+	echo $oSoapClient->__getLastResponse()."\n";
+}
+?>
diff --git a/webservices/itopsoaptypes.class.inc.php b/webservices/itopsoaptypes.class.inc.php
index 852763311..442bff575 100644
--- a/webservices/itopsoaptypes.class.inc.php
+++ b/webservices/itopsoaptypes.class.inc.php
@@ -1,188 +1,188 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Declarations required for the WSDL
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-// Note: the attributes must have the same names (case sensitive) as in the WSDL specification
-//
-
-class SOAPSearchCondition
-{
-	public $attcode; // string
-	public $value; // mixed
-
-	public function __construct($sAttCode, $value)
-	{
-		$this->attcode = $sAttCode;
-		$this->value = $value;
-	}
-}
-
-
-class SOAPExternalKeySearch
-{
-	public $conditions; // array of SOAPSearchCondition
-
-	public function __construct($aConditions = null)
-	{
-		$this->conditions = $aConditions;
-	}
-
-	public function IsVoid()
-	{
-		if (is_null($this->conditions)) return true;
-		if (count($this->conditions) == 0) return true;
-	}
-}
-
-
-class SOAPAttributeValue
-{
-	public $attcode; // string
-	public $value; // mixed
-
-	public function __construct($sAttCode, $value)
-	{
-		$this->attcode = $sAttCode;
-		$this->value = $value;
-	}
-}
-
-
-class SOAPLinkCreationSpec
-{
-	public $class;
-	public $conditions; // array of SOAPSearchCondition
-	public $attributes; // array of SOAPAttributeValue
-
-	public function __construct($sClass, $aConditions, $aAttributes)
-	{
-		$this->class = $sClass;
-		$this->conditions = $aConditions;
-		$this->attributes = $aAttributes;
-	}
-}
-
-
-class SOAPLogMessage
-{
-	public $text; // string
-
-	public function __construct($sText)
-	{
-		$this->text = $sText;
-	}
-}
-
-
-class SOAPResultLog
-{
-	public $messages; // array of SOAPLogMessage
-
-	public function __construct($aMessages)
-	{
-		$this->messages = $aMessages;
-	}
-}
-
-
-class SOAPKeyValue
-{
-	public $key; // string
-	public $value; // string
-
-	public function __construct($sKey, $sValue)
-	{
-		$this->key = $sKey;
-		$this->value = $sValue;
-	}
-}
-
-class SOAPResultMessage
-{
-	public $label; // string
-	public $values; // array of SOAPKeyValue
-
-	public function __construct($sLabel, $aValues)
-	{
-		$this->label = $sLabel;
-		$this->values = $aValues;
-	}
-}
-
-
-class SOAPResult
-{
-	public $status; // boolean
-	public $result; // array of SOAPResultMessage
-	public $errors; // array of SOAPResultLog
-	public $warnings; // array of SOAPResultLog
-	public $infos; // array of SOAPResultLog
-
-	public function __construct($bStatus, $aResult, $aErrors, $aWarnings, $aInfos)
-	{
-		$this->status = $bStatus;
-		$this->result = $aResult;
-		$this->errors = $aErrors;
-		$this->warnings = $aWarnings;
-		$this->infos = $aInfos;
-	}
-}
-
-class SOAPSimpleResult
-{
-	public $status; // boolean
-	public $message; // string
-
-	public function __construct($bStatus, $sMessage)
-	{
-		$this->status = $bStatus;
-		$this->message = $sMessage;
-	}
-}
-
-
-class SOAPMapping
-{
-	static function GetMapping()
-	{
-		$aSOAPMapping = array(
-			'SearchCondition' => 'SOAPSearchCondition',
-			'ExternalKeySearch' => 'SOAPExternalKeySearch',
-			'AttributeValue' => 'SOAPAttributeValue',
-			'LinkCreationSpec' => 'SOAPLinkCreationSpec',
-			'KeyValue' => 'SOAPKeyValue',
-			'LogMessage' => 'SOAPLogMessage',
-			'ResultLog' => 'SOAPResultLog',
-			'ResultData' => 'SOAPKeyValue',
-			'ResultMessage' => 'SOAPResultMessage',
-			'Result' => 'SOAPResult',
-			'SimpleResult' => 'SOAPSimpleResult',
-		);
-		return $aSOAPMapping;
-	}
-}
-
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Declarations required for the WSDL
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+// Note: the attributes must have the same names (case sensitive) as in the WSDL specification
+//
+
+class SOAPSearchCondition
+{
+	public $attcode; // string
+	public $value; // mixed
+
+	public function __construct($sAttCode, $value)
+	{
+		$this->attcode = $sAttCode;
+		$this->value = $value;
+	}
+}
+
+
+class SOAPExternalKeySearch
+{
+	public $conditions; // array of SOAPSearchCondition
+
+	public function __construct($aConditions = null)
+	{
+		$this->conditions = $aConditions;
+	}
+
+	public function IsVoid()
+	{
+		if (is_null($this->conditions)) return true;
+		if (count($this->conditions) == 0) return true;
+	}
+}
+
+
+class SOAPAttributeValue
+{
+	public $attcode; // string
+	public $value; // mixed
+
+	public function __construct($sAttCode, $value)
+	{
+		$this->attcode = $sAttCode;
+		$this->value = $value;
+	}
+}
+
+
+class SOAPLinkCreationSpec
+{
+	public $class;
+	public $conditions; // array of SOAPSearchCondition
+	public $attributes; // array of SOAPAttributeValue
+
+	public function __construct($sClass, $aConditions, $aAttributes)
+	{
+		$this->class = $sClass;
+		$this->conditions = $aConditions;
+		$this->attributes = $aAttributes;
+	}
+}
+
+
+class SOAPLogMessage
+{
+	public $text; // string
+
+	public function __construct($sText)
+	{
+		$this->text = $sText;
+	}
+}
+
+
+class SOAPResultLog
+{
+	public $messages; // array of SOAPLogMessage
+
+	public function __construct($aMessages)
+	{
+		$this->messages = $aMessages;
+	}
+}
+
+
+class SOAPKeyValue
+{
+	public $key; // string
+	public $value; // string
+
+	public function __construct($sKey, $sValue)
+	{
+		$this->key = $sKey;
+		$this->value = $sValue;
+	}
+}
+
+class SOAPResultMessage
+{
+	public $label; // string
+	public $values; // array of SOAPKeyValue
+
+	public function __construct($sLabel, $aValues)
+	{
+		$this->label = $sLabel;
+		$this->values = $aValues;
+	}
+}
+
+
+class SOAPResult
+{
+	public $status; // boolean
+	public $result; // array of SOAPResultMessage
+	public $errors; // array of SOAPResultLog
+	public $warnings; // array of SOAPResultLog
+	public $infos; // array of SOAPResultLog
+
+	public function __construct($bStatus, $aResult, $aErrors, $aWarnings, $aInfos)
+	{
+		$this->status = $bStatus;
+		$this->result = $aResult;
+		$this->errors = $aErrors;
+		$this->warnings = $aWarnings;
+		$this->infos = $aInfos;
+	}
+}
+
+class SOAPSimpleResult
+{
+	public $status; // boolean
+	public $message; // string
+
+	public function __construct($bStatus, $sMessage)
+	{
+		$this->status = $bStatus;
+		$this->message = $sMessage;
+	}
+}
+
+
+class SOAPMapping
+{
+	static function GetMapping()
+	{
+		$aSOAPMapping = array(
+			'SearchCondition' => 'SOAPSearchCondition',
+			'ExternalKeySearch' => 'SOAPExternalKeySearch',
+			'AttributeValue' => 'SOAPAttributeValue',
+			'LinkCreationSpec' => 'SOAPLinkCreationSpec',
+			'KeyValue' => 'SOAPKeyValue',
+			'LogMessage' => 'SOAPLogMessage',
+			'ResultLog' => 'SOAPResultLog',
+			'ResultData' => 'SOAPKeyValue',
+			'ResultMessage' => 'SOAPResultMessage',
+			'Result' => 'SOAPResult',
+			'SimpleResult' => 'SOAPSimpleResult',
+		);
+		return $aSOAPMapping;
+	}
+}
+
+?>
diff --git a/webservices/rest.php b/webservices/rest.php
index 5b3ef1ac2..849e5e2a7 100644
--- a/webservices/rest.php
+++ b/webservices/rest.php
@@ -1,291 +1,291 @@
-<?php
-// Copyright (C) 2010-2013 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-/**
- * Entry point for all the REST services
- *
- * -------------------------------------------------- 
- * Create an object
- * -------------------------------------------------- 
- * POST itop/webservices/rest.php
- * {
- * 	operation: 'object_create',
- * 	comment: 'Synchronization from blah...',
- * 	class: 'UserRequest',
- * 	results: 'id, friendlyname',
- * 	fields:
- * 	{
- * 		org_id: 'SELECT Organization WHERE name = "Demo"',
- * 		caller_id:
- * 		{
- * 			name: 'monet',
- * 			first_name: 'claude',
- * 		}
- * 		title: 'Houston, got a problem!',
- * 		description: 'The fridge is empty'
- * 		contacts_list:
- * 		[
- * 			{
- * 				role: 'pizza delivery',
- * 				contact_id:
- * 				{
- * 					finalclass: 'Person',
- * 					name: 'monet',
- * 					first_name: 'claude'
- * 				}
- * 			}
- * 		]
- * 	}
- * }
- *
- *
- * @copyright   Copyright (C) 2010-2013 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
-require_once(__DIR__.'/../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/loginwebpage.class.inc.php');
-require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
-require_once(APPROOT.'/application/startup.inc.php');
-
-require_once(APPROOT.'core/restservices.class.inc.php');
-
-
-/**
- * Result structure that is specific to the hardcoded verb 'list_operations'
- */ 
-class RestResultListOperations extends RestResult
-{
-	public $version;
-	public $operations;
-
-	public function AddOperation($sVerb, $sDescription, $sServiceProviderClass)
-	{
-		$this->operations[] = array(
-			'verb' => $sVerb,
-			'description' => $sDescription,
-			'extension' => $sServiceProviderClass
-		);
-	}
-}
-
-if (!function_exists('json_last_error_msg')) {
-	function json_last_error_msg() {
-		static $ERRORS = array(
-			JSON_ERROR_NONE => 'No error',
-			JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
-			JSON_ERROR_STATE_MISMATCH => 'State mismatch (invalid or malformed JSON)',
-			JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded',
-			JSON_ERROR_SYNTAX => 'Syntax error',
-			JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded'
-		);
-
-		$error = json_last_error();
-		return isset($ERRORS[$error]) ? $ERRORS[$error] : 'Unknown error';
-	}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Main
-//
-$oP = new ajax_page('rest');
-$oCtx = new ContextTag('REST/JSON');
-
-$sVersion = utils::ReadParam('version', null, false, 'raw_data');
-$sOperation = utils::ReadParam('operation', null);
-$sJsonString = utils::ReadParam('json_data', null, false, 'raw_data');
-$sProvider = '';
-try
-{
-	utils::UseParamFile();
-
-	$iRet = LoginWebPage::DoLogin(false, false, LoginWebPage::EXIT_RETURN); // Starting with iTop 2.2.0 portal users are no longer allowed to access the REST/JSON API
-	if ($iRet == LoginWebPage::EXIT_CODE_OK)
-	{
-		// Extra validation of the profile
-		if ((MetaModel::GetConfig()->Get('secure_rest_services') == true) && !UserRights::HasProfile('REST Services User'))
-		{
-			// Web services access is limited to the users with the profile REST Web Services
-			$iRet = LoginWebPage::EXIT_CODE_NOTAUTHORIZED;
-		}
-	}
-	if ($iRet != LoginWebPage::EXIT_CODE_OK)
-	{
-		switch($iRet)
-		{
-			case LoginWebPage::EXIT_CODE_MISSINGLOGIN:
-			throw new Exception("Missing parameter 'auth_user'", RestResult::MISSING_AUTH_USER);
-			break;
-			
-			case LoginWebPage::EXIT_CODE_MISSINGPASSWORD:
-			throw new Exception("Missing parameter 'auth_pwd'", RestResult::MISSING_AUTH_PWD);
-			break;
-			
-			case LoginWebPage::EXIT_CODE_WRONGCREDENTIALS:
-			throw new Exception("Invalid login", RestResult::UNAUTHORIZED);
-			break;
-			
-			case LoginWebPage::EXIT_CODE_PORTALUSERNOTAUTHORIZED:
-			throw new Exception("Portal user is not allowed", RestResult::UNAUTHORIZED);
-			break;
-				
-			case LoginWebPage::EXIT_CODE_NOTAUTHORIZED:
-			throw new Exception("This user is not authorized to use the web services. (The profile REST Services User is required to access the REST web services)", RestResult::UNAUTHORIZED);
-			break;
-				
-			default:
-			throw new Exception("Unknown authentication error (retCode=$iRet)", RestResult::UNAUTHORIZED);
-		}
-	}
-
-	if ($sVersion == null)
-	{
-		throw new Exception("Missing parameter 'version' (e.g. '1.0')", RestResult::MISSING_VERSION);
-	}
-	
-	if ($sJsonString == null)
-	{
-		throw new Exception("Missing parameter 'json_data", RestResult::MISSING_JSON);
-	}
-	$aJsonData = @json_decode($sJsonString);
-	if ($aJsonData == null)
-	{
-		throw new Exception("Parameter json_data is not a valid JSON structure", RestResult::INVALID_JSON);
-	}
-
-
-	$aProviders = array();
-	foreach(get_declared_classes() as $sPHPClass)
-	{
-		$oRefClass = new ReflectionClass($sPHPClass);
-		if ($oRefClass->implementsInterface('iRestServiceProvider'))
-		{
-			$aProviders[] = new $sPHPClass;
-		}
-	}
-
-	$aOpToRestService = array(); // verb => $oRestServiceProvider
-	foreach ($aProviders as $oRestSP)
-	{
-		$aOperations = $oRestSP->ListOperations($sVersion);
-		foreach ($aOperations as $aOpData)
-		{
-			$aOpToRestService[$aOpData['verb']] = array
-			(
-				'service_provider' => $oRestSP,
-				'description' => $aOpData['description'],
-			);
-		}
-	}
-
-	if (count($aOpToRestService) == 0)
-	{
-		throw new Exception("There is no service available for version '$sVersion'", RestResult::UNSUPPORTED_VERSION);
-	}
-
-
-	$sOperation = RestUtils::GetMandatoryParam($aJsonData, 'operation');
-	if ($sOperation == 'list_operations')
-	{
-		$oResult = new RestResultListOperations();
-		$oResult->message = "Operations: ".count($aOpToRestService);
-		$oResult->version = $sVersion;
-		foreach ($aOpToRestService as $sVerb => $aOpData)
-		{
-			$oResult->AddOperation($sVerb, $aOpData['description'], get_class($aOpData['service_provider']));
-		}
-	}
-	else
-	{
-		if (!array_key_exists($sOperation, $aOpToRestService))
-		{
-			throw new Exception("Unknown verb '$sOperation' in version '$sVersion'", RestResult::UNKNOWN_OPERATION);
-		}
-		$oRS = $aOpToRestService[$sOperation]['service_provider'];
-		$sProvider = get_class($oRS);
-	
-		CMDBObject::SetTrackOrigin('webservice-rest');
-		$oResult = $oRS->ExecOperation($sVersion, $sOperation, $aJsonData);
-	}
-}
-catch(Exception $e)
-{
-	$oResult = new RestResult();
-	if ($e->GetCode() == 0)
-	{
-		$oResult->code = RestResult::INTERNAL_ERROR;
-	}
-	else
-	{
-		$oResult->code = $e->GetCode();
-	}
-	$oResult->message = "Error: ".$e->GetMessage();
-}
-
-// Output the results
-//
-$sResponse = json_encode($oResult);
-
-if ($sResponse === false)
-{
-	$oJsonIssue = new RestResult();
-	$oJsonIssue->code = RestResult::INTERNAL_ERROR;
-	$oJsonIssue->message = 'json encoding failed with message: '.json_last_error_msg().'. Full response structure for debugging purposes (print_r+bin2hex): '.bin2hex(print_r($oResult, true));
-	$sResponse = json_encode($oJsonIssue);
-}
-
-$oP->add_header('Access-Control-Allow-Origin: *');
-
-$sCallback = utils::ReadParam('callback', null);
-if ($sCallback == null)
-{
-	$oP->SetContentType('application/json');
-	$oP->add($sResponse);
-}
-else
-{
-	$oP->SetContentType('application/javascript');
-	$oP->add($sCallback.'('.$sResponse.')');
-}
-$oP->Output();
-
-// Log usage
-//
-if (MetaModel::GetConfig()->Get('log_rest_service'))
-{
-	$oLog = new EventRestService();
-	$oLog->SetTrim('userinfo', UserRights::GetUser());
-	$oLog->Set('version', $sVersion);
-	$oLog->Set('operation', $sOperation);
-	$oLog->SetTrim('json_input', $sJsonString);
-
-	$oLog->Set('provider', $sProvider);
-	$sMessage = $oResult->message;
-	if (empty($oResult->message))
-	{
-		$sMessage = 'Ok';
-	}
-	$oLog->SetTrim('message', $sMessage);
-	$oLog->Set('code', $oResult->code);
-	$oLog->SetTrim('json_output', $sResponse);
-
-	$oLog->DBInsertNoReload();
-}
+<?php
+// Copyright (C) 2010-2013 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+/**
+ * Entry point for all the REST services
+ *
+ * -------------------------------------------------- 
+ * Create an object
+ * -------------------------------------------------- 
+ * POST itop/webservices/rest.php
+ * {
+ * 	operation: 'object_create',
+ * 	comment: 'Synchronization from blah...',
+ * 	class: 'UserRequest',
+ * 	results: 'id, friendlyname',
+ * 	fields:
+ * 	{
+ * 		org_id: 'SELECT Organization WHERE name = "Demo"',
+ * 		caller_id:
+ * 		{
+ * 			name: 'monet',
+ * 			first_name: 'claude',
+ * 		}
+ * 		title: 'Houston, got a problem!',
+ * 		description: 'The fridge is empty'
+ * 		contacts_list:
+ * 		[
+ * 			{
+ * 				role: 'pizza delivery',
+ * 				contact_id:
+ * 				{
+ * 					finalclass: 'Person',
+ * 					name: 'monet',
+ * 					first_name: 'claude'
+ * 				}
+ * 			}
+ * 		]
+ * 	}
+ * }
+ *
+ *
+ * @copyright   Copyright (C) 2010-2013 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
+require_once(__DIR__.'/../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/loginwebpage.class.inc.php');
+require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+
+require_once(APPROOT.'core/restservices.class.inc.php');
+
+
+/**
+ * Result structure that is specific to the hardcoded verb 'list_operations'
+ */ 
+class RestResultListOperations extends RestResult
+{
+	public $version;
+	public $operations;
+
+	public function AddOperation($sVerb, $sDescription, $sServiceProviderClass)
+	{
+		$this->operations[] = array(
+			'verb' => $sVerb,
+			'description' => $sDescription,
+			'extension' => $sServiceProviderClass
+		);
+	}
+}
+
+if (!function_exists('json_last_error_msg')) {
+	function json_last_error_msg() {
+		static $ERRORS = array(
+			JSON_ERROR_NONE => 'No error',
+			JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
+			JSON_ERROR_STATE_MISMATCH => 'State mismatch (invalid or malformed JSON)',
+			JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded',
+			JSON_ERROR_SYNTAX => 'Syntax error',
+			JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded'
+		);
+
+		$error = json_last_error();
+		return isset($ERRORS[$error]) ? $ERRORS[$error] : 'Unknown error';
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Main
+//
+$oP = new ajax_page('rest');
+$oCtx = new ContextTag('REST/JSON');
+
+$sVersion = utils::ReadParam('version', null, false, 'raw_data');
+$sOperation = utils::ReadParam('operation', null);
+$sJsonString = utils::ReadParam('json_data', null, false, 'raw_data');
+$sProvider = '';
+try
+{
+	utils::UseParamFile();
+
+	$iRet = LoginWebPage::DoLogin(false, false, LoginWebPage::EXIT_RETURN); // Starting with iTop 2.2.0 portal users are no longer allowed to access the REST/JSON API
+	if ($iRet == LoginWebPage::EXIT_CODE_OK)
+	{
+		// Extra validation of the profile
+		if ((MetaModel::GetConfig()->Get('secure_rest_services') == true) && !UserRights::HasProfile('REST Services User'))
+		{
+			// Web services access is limited to the users with the profile REST Web Services
+			$iRet = LoginWebPage::EXIT_CODE_NOTAUTHORIZED;
+		}
+	}
+	if ($iRet != LoginWebPage::EXIT_CODE_OK)
+	{
+		switch($iRet)
+		{
+			case LoginWebPage::EXIT_CODE_MISSINGLOGIN:
+			throw new Exception("Missing parameter 'auth_user'", RestResult::MISSING_AUTH_USER);
+			break;
+			
+			case LoginWebPage::EXIT_CODE_MISSINGPASSWORD:
+			throw new Exception("Missing parameter 'auth_pwd'", RestResult::MISSING_AUTH_PWD);
+			break;
+			
+			case LoginWebPage::EXIT_CODE_WRONGCREDENTIALS:
+			throw new Exception("Invalid login", RestResult::UNAUTHORIZED);
+			break;
+			
+			case LoginWebPage::EXIT_CODE_PORTALUSERNOTAUTHORIZED:
+			throw new Exception("Portal user is not allowed", RestResult::UNAUTHORIZED);
+			break;
+				
+			case LoginWebPage::EXIT_CODE_NOTAUTHORIZED:
+			throw new Exception("This user is not authorized to use the web services. (The profile REST Services User is required to access the REST web services)", RestResult::UNAUTHORIZED);
+			break;
+				
+			default:
+			throw new Exception("Unknown authentication error (retCode=$iRet)", RestResult::UNAUTHORIZED);
+		}
+	}
+
+	if ($sVersion == null)
+	{
+		throw new Exception("Missing parameter 'version' (e.g. '1.0')", RestResult::MISSING_VERSION);
+	}
+	
+	if ($sJsonString == null)
+	{
+		throw new Exception("Missing parameter 'json_data", RestResult::MISSING_JSON);
+	}
+	$aJsonData = @json_decode($sJsonString);
+	if ($aJsonData == null)
+	{
+		throw new Exception("Parameter json_data is not a valid JSON structure", RestResult::INVALID_JSON);
+	}
+
+
+	$aProviders = array();
+	foreach(get_declared_classes() as $sPHPClass)
+	{
+		$oRefClass = new ReflectionClass($sPHPClass);
+		if ($oRefClass->implementsInterface('iRestServiceProvider'))
+		{
+			$aProviders[] = new $sPHPClass;
+		}
+	}
+
+	$aOpToRestService = array(); // verb => $oRestServiceProvider
+	foreach ($aProviders as $oRestSP)
+	{
+		$aOperations = $oRestSP->ListOperations($sVersion);
+		foreach ($aOperations as $aOpData)
+		{
+			$aOpToRestService[$aOpData['verb']] = array
+			(
+				'service_provider' => $oRestSP,
+				'description' => $aOpData['description'],
+			);
+		}
+	}
+
+	if (count($aOpToRestService) == 0)
+	{
+		throw new Exception("There is no service available for version '$sVersion'", RestResult::UNSUPPORTED_VERSION);
+	}
+
+
+	$sOperation = RestUtils::GetMandatoryParam($aJsonData, 'operation');
+	if ($sOperation == 'list_operations')
+	{
+		$oResult = new RestResultListOperations();
+		$oResult->message = "Operations: ".count($aOpToRestService);
+		$oResult->version = $sVersion;
+		foreach ($aOpToRestService as $sVerb => $aOpData)
+		{
+			$oResult->AddOperation($sVerb, $aOpData['description'], get_class($aOpData['service_provider']));
+		}
+	}
+	else
+	{
+		if (!array_key_exists($sOperation, $aOpToRestService))
+		{
+			throw new Exception("Unknown verb '$sOperation' in version '$sVersion'", RestResult::UNKNOWN_OPERATION);
+		}
+		$oRS = $aOpToRestService[$sOperation]['service_provider'];
+		$sProvider = get_class($oRS);
+	
+		CMDBObject::SetTrackOrigin('webservice-rest');
+		$oResult = $oRS->ExecOperation($sVersion, $sOperation, $aJsonData);
+	}
+}
+catch(Exception $e)
+{
+	$oResult = new RestResult();
+	if ($e->GetCode() == 0)
+	{
+		$oResult->code = RestResult::INTERNAL_ERROR;
+	}
+	else
+	{
+		$oResult->code = $e->GetCode();
+	}
+	$oResult->message = "Error: ".$e->GetMessage();
+}
+
+// Output the results
+//
+$sResponse = json_encode($oResult);
+
+if ($sResponse === false)
+{
+	$oJsonIssue = new RestResult();
+	$oJsonIssue->code = RestResult::INTERNAL_ERROR;
+	$oJsonIssue->message = 'json encoding failed with message: '.json_last_error_msg().'. Full response structure for debugging purposes (print_r+bin2hex): '.bin2hex(print_r($oResult, true));
+	$sResponse = json_encode($oJsonIssue);
+}
+
+$oP->add_header('Access-Control-Allow-Origin: *');
+
+$sCallback = utils::ReadParam('callback', null);
+if ($sCallback == null)
+{
+	$oP->SetContentType('application/json');
+	$oP->add($sResponse);
+}
+else
+{
+	$oP->SetContentType('application/javascript');
+	$oP->add($sCallback.'('.$sResponse.')');
+}
+$oP->Output();
+
+// Log usage
+//
+if (MetaModel::GetConfig()->Get('log_rest_service'))
+{
+	$oLog = new EventRestService();
+	$oLog->SetTrim('userinfo', UserRights::GetUser());
+	$oLog->Set('version', $sVersion);
+	$oLog->Set('operation', $sOperation);
+	$oLog->SetTrim('json_input', $sJsonString);
+
+	$oLog->Set('provider', $sProvider);
+	$sMessage = $oResult->message;
+	if (empty($oResult->message))
+	{
+		$sMessage = 'Ok';
+	}
+	$oLog->SetTrim('message', $sMessage);
+	$oLog->Set('code', $oResult->code);
+	$oLog->SetTrim('json_output', $sResponse);
+
+	$oLog->DBInsertNoReload();
+}
diff --git a/webservices/soapserver.php b/webservices/soapserver.php
index 2b294ec49..72bea3cbc 100644
--- a/webservices/soapserver.php
+++ b/webservices/soapserver.php
@@ -1,109 +1,109 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Handling of SOAP queries
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-// Important note: if some required includes are missing, this might result
-// in the error "looks like we got no XML document"...
-
-require_once('../approot.inc.php');
-require_once(APPROOT.'/application/application.inc.php');
-require_once(APPROOT.'/application/startup.inc.php');
-
-// this file is generated dynamically with location = here
-$sWsdlUri = utils::GetAbsoluteUrlAppRoot().'webservices/itop.wsdl.php';
-if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
-{
-	$sWsdlUri .= "?service_category=".$_REQUEST['service_category'];
-}
-
-
-ini_set("soap.wsdl_cache_enabled","0");
-
-$aSOAPMapping = SOAPMapping::GetMapping();
-$oSoapServer = new SoapServer
-(
-	$sWsdlUri,
-	array(
-		'classmap' => $aSOAPMapping
-	)
-);
-// $oSoapServer->setPersistence(SOAP_PERSISTENCE_SESSION);
-if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
-{
-	$sServiceClass = $_REQUEST['service_category'];
-	if (!class_exists($sServiceClass))
-	{
-		// not a valid class name (not a PHP class at all)
-		throw new SoapFault("iTop SOAP server", "Invalid argument service_category: '$sServiceClass' is not a PHP class");
-	}
-	elseif (!is_subclass_of($sServiceClass, 'WebServicesBase'))
-	{
-		// not a valid class name (not deriving from WebServicesBase)
-		throw new SoapFault("iTop SOAP server", "Invalid argument service_category: '$sServiceClass' is not derived from WebServicesBase");
-	}
-	else
-	{
-		$oSoapServer->setClass($sServiceClass, null);
-	}
-}
-else
-{
-	$oSoapServer->setClass('BasicServices', null);
-}
-
-if ($_SERVER["REQUEST_METHOD"] == "POST")
-{
-	CMDBObject::SetTrackOrigin('webservice-soap');
-	$oSoapServer->handle();
-}
-else
-{
-	echo "This SOAP server can handle the following functions: ";
-	$aFunctions = $oSoapServer->getFunctions();
-	echo "<ul>\n";
-	foreach($aFunctions as $sFunc)
-	{
-		if ($sFunc == 'GetWSDLContents') continue;
-
-		echo "<li>$sFunc</li>\n";
-	}
-	echo "</ul>\n";
-	echo "<p>Here the <a href=\"$sWsdlUri\">WSDL file</a><p>";
-
-	echo "You may also want to try the following service categories: ";
-	echo "<ul>\n";
-	foreach(get_declared_classes() as $sPHPClass)
-	{
-		if (is_subclass_of($sPHPClass, 'WebServicesBase'))
-		{
-			$sServiceCategory = $sPHPClass;
-			$sSoapServerUri = utils::GetAbsoluteUrlAppRoot().'webservices/soapserver.php';
-			$sSoapServerUri .= "?service_category=$sServiceCategory";
-			echo "<li><a href=\"$sSoapServerUri\">$sServiceCategory</a></li>\n";
-		}
-	}
-	echo "</ul>\n";
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Handling of SOAP queries
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+// Important note: if some required includes are missing, this might result
+// in the error "looks like we got no XML document"...
+
+require_once('../approot.inc.php');
+require_once(APPROOT.'/application/application.inc.php');
+require_once(APPROOT.'/application/startup.inc.php');
+
+// this file is generated dynamically with location = here
+$sWsdlUri = utils::GetAbsoluteUrlAppRoot().'webservices/itop.wsdl.php';
+if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
+{
+	$sWsdlUri .= "?service_category=".$_REQUEST['service_category'];
+}
+
+
+ini_set("soap.wsdl_cache_enabled","0");
+
+$aSOAPMapping = SOAPMapping::GetMapping();
+$oSoapServer = new SoapServer
+(
+	$sWsdlUri,
+	array(
+		'classmap' => $aSOAPMapping
+	)
+);
+// $oSoapServer->setPersistence(SOAP_PERSISTENCE_SESSION);
+if (isset($_REQUEST['service_category']) && (!empty($_REQUEST['service_category'])))
+{
+	$sServiceClass = $_REQUEST['service_category'];
+	if (!class_exists($sServiceClass))
+	{
+		// not a valid class name (not a PHP class at all)
+		throw new SoapFault("iTop SOAP server", "Invalid argument service_category: '$sServiceClass' is not a PHP class");
+	}
+	elseif (!is_subclass_of($sServiceClass, 'WebServicesBase'))
+	{
+		// not a valid class name (not deriving from WebServicesBase)
+		throw new SoapFault("iTop SOAP server", "Invalid argument service_category: '$sServiceClass' is not derived from WebServicesBase");
+	}
+	else
+	{
+		$oSoapServer->setClass($sServiceClass, null);
+	}
+}
+else
+{
+	$oSoapServer->setClass('BasicServices', null);
+}
+
+if ($_SERVER["REQUEST_METHOD"] == "POST")
+{
+	CMDBObject::SetTrackOrigin('webservice-soap');
+	$oSoapServer->handle();
+}
+else
+{
+	echo "This SOAP server can handle the following functions: ";
+	$aFunctions = $oSoapServer->getFunctions();
+	echo "<ul>\n";
+	foreach($aFunctions as $sFunc)
+	{
+		if ($sFunc == 'GetWSDLContents') continue;
+
+		echo "<li>$sFunc</li>\n";
+	}
+	echo "</ul>\n";
+	echo "<p>Here the <a href=\"$sWsdlUri\">WSDL file</a><p>";
+
+	echo "You may also want to try the following service categories: ";
+	echo "<ul>\n";
+	foreach(get_declared_classes() as $sPHPClass)
+	{
+		if (is_subclass_of($sPHPClass, 'WebServicesBase'))
+		{
+			$sServiceCategory = $sPHPClass;
+			$sSoapServerUri = utils::GetAbsoluteUrlAppRoot().'webservices/soapserver.php';
+			$sSoapServerUri .= "?service_category=$sServiceCategory";
+			echo "<li><a href=\"$sSoapServerUri\">$sServiceCategory</a></li>\n";
+		}
+	}
+	echo "</ul>\n";
+}
+?>
diff --git a/webservices/webservices.basic.php b/webservices/webservices.basic.php
index dd6a2eb73..af469aa9d 100644
--- a/webservices/webservices.basic.php
+++ b/webservices/webservices.basic.php
@@ -1,295 +1,295 @@
-<?php
-// Copyright (C) 2010-2012 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Implementation of iTop SOAP services
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/webservices/webservices.class.inc.php');
-
-
-class BasicServices extends WebServicesBase
-{
-	static protected function GetWSDLFilePath()
-	{
-		return APPROOT.'/webservices/itop.wsdl.tpl';
-	}
-
-	/**
-	 * Get the server version (TODO: get it dynamically, where ?)
-	 *	 
-	 * @return WebServiceResult
-	 */
-	static public function GetVersion()
-	{
-		if (ITOP_REVISION == '$WCREV$')
-		{
-			$sVersionString = ITOP_VERSION.' [dev]';
-		}
-		else
-		{
-			// This is a build made from SVN, let display the full information
-			$sVersionString = ITOP_VERSION."-".ITOP_REVISION." ".ITOP_BUILD_DATE;
-		}
-
-		return $sVersionString;
-	}
-
-	public function CreateRequestTicket($sLogin, $sPassword, $sTitle, $sDescription, $oCallerDesc, $oCustomerDesc, $oServiceDesc, $oServiceSubcategoryDesc, $sProduct, $oWorkgroupDesc, $aSOAPImpactedCIs, $sImpact, $sUrgency)
-	{
-		if (!UserRights::CheckCredentials($sLogin, $sPassword))
-		{
-			$oRes = new WebServiceResultFailedLogin($sLogin);
-			$this->LogUsage(__FUNCTION__, $oRes);
-
-			return $oRes->ToSoapStructure();
-		}
-		UserRights::Login($sLogin);
-
-		$aCallerDesc = self::SoapStructToExternalKeySearch($oCallerDesc);
-		$aCustomerDesc = self::SoapStructToExternalKeySearch($oCustomerDesc);
-		$aServiceDesc = self::SoapStructToExternalKeySearch($oServiceDesc);
-		$aServiceSubcategoryDesc = self::SoapStructToExternalKeySearch($oServiceSubcategoryDesc);
-		$aWorkgroupDesc = self::SoapStructToExternalKeySearch($oWorkgroupDesc);
-
-		$aImpactedCIs = array();
-		if (is_null($aSOAPImpactedCIs)) $aSOAPImpactedCIs = array();
-		foreach($aSOAPImpactedCIs as $oImpactedCIs)
-		{
-			$aImpactedCIs[] = self::SoapStructToLinkCreationSpec($oImpactedCIs);
-		}
-
-		$oRes = $this->_CreateResponseTicket
-		(
-			'UserRequest',
-			$sTitle,
-			$sDescription,
-			$aCallerDesc,
-			$aCustomerDesc,
-			$aServiceDesc,
-			$aServiceSubcategoryDesc,
-			$sProduct,
-			$aWorkgroupDesc,
-			$aImpactedCIs,
-			$sImpact,
-			$sUrgency
-		);
-		return $oRes->ToSoapStructure();
-	}
-
-	public function CreateIncidentTicket($sLogin, $sPassword, $sTitle, $sDescription, $oCallerDesc, $oCustomerDesc, $oServiceDesc, $oServiceSubcategoryDesc, $sProduct, $oWorkgroupDesc, $aSOAPImpactedCIs, $sImpact, $sUrgency)
-	{
-		if (!UserRights::CheckCredentials($sLogin, $sPassword))
-		{
-			$oRes = new WebServiceResultFailedLogin($sLogin);
-			$this->LogUsage(__FUNCTION__, $oRes);
-
-			return $oRes->ToSoapStructure();
-		}
-		UserRights::Login($sLogin);
-
-		
-		if (!class_exists('Incident'))
-		{
-			$oRes = new WebServiceResult();
-			$oRes->LogError("The class Incident does not exist. Did you install the Incident Management (ITIL) module ?");
-			return $oRes->ToSoapStructure();
-		}
-		
-		$aCallerDesc = self::SoapStructToExternalKeySearch($oCallerDesc);
-		$aCustomerDesc = self::SoapStructToExternalKeySearch($oCustomerDesc);
-		$aServiceDesc = self::SoapStructToExternalKeySearch($oServiceDesc);
-		$aServiceSubcategoryDesc = self::SoapStructToExternalKeySearch($oServiceSubcategoryDesc);
-		$aWorkgroupDesc = self::SoapStructToExternalKeySearch($oWorkgroupDesc);
-
-		$aImpactedCIs = array();
-		if (is_null($aSOAPImpactedCIs)) $aSOAPImpactedCIs = array();
-		foreach($aSOAPImpactedCIs as $oImpactedCIs)
-		{
-			$aImpactedCIs[] = self::SoapStructToLinkCreationSpec($oImpactedCIs);
-		}
-
-		$oRes = $this->_CreateResponseTicket
-		(
-			'Incident',
-			$sTitle,
-			$sDescription,
-			$aCallerDesc,
-			$aCustomerDesc,
-			$aServiceDesc,
-			$aServiceSubcategoryDesc,
-			$sProduct,
-			$aWorkgroupDesc,
-			$aImpactedCIs,
-			$sImpact,
-			$sUrgency
-		);
-		return $oRes->ToSoapStructure();
-	}
-	
-	/**
-	 * Create an ResponseTicket (Incident or UserRequest) from an external system
-	 * Some CIs might be specified (by their name/IP)
-	 *	 
-	 * @param string sClass The class of the ticket: Incident or UserRequest
-	 * @param string sTitle
-	 * @param string sDescription
-	 * @param array aCallerDesc
-	 * @param array aCustomerDesc
-	 * @param array aServiceDesc
-	 * @param array aServiceSubcategoryDesc
-	 * @param string sProduct
-	 * @param array aWorkgroupDesc
-	 * @param array aImpactedCIs
-	 * @param string sImpact
-	 * @param string sUrgency
-	 *
-	 * @return WebServiceResult
-	 */
-	protected function _CreateResponseTicket($sClass, $sTitle, $sDescription, $aCallerDesc, $aCustomerDesc, $aServiceDesc, $aServiceSubcategoryDesc, $sProduct, $aWorkgroupDesc, $aImpactedCIs, $sImpact, $sUrgency)
-	{
-
-		$oRes = new WebServiceResult();
-
-		try
-		{
-			$oMyChange = MetaModel::NewObject("CMDBChange");
-			$oMyChange->Set("date", time());
-			$oMyChange->Set("userinfo", "Administrator");
-			$iChangeId = $oMyChange->DBInsertNoReload();
-	
-			$oNewTicket = MetaModel::NewObject($sClass);
-			$this->MyObjectSetScalar('title', 'title', $sTitle, $oNewTicket, $oRes);
-			$this->MyObjectSetScalar('description', 'description', $sDescription, $oNewTicket, $oRes);
-
-			$this->MyObjectSetExternalKey('org_id', 'customer', $aCustomerDesc, $oNewTicket, $oRes);
-			$this->MyObjectSetExternalKey('caller_id', 'caller', $aCallerDesc, $oNewTicket, $oRes);
-	
-			$this->MyObjectSetExternalKey('service_id', 'service', $aServiceDesc, $oNewTicket, $oRes);
-			if (!array_key_exists('service_id', $aServiceSubcategoryDesc))
-			{
-				$aServiceSubcategoryDesc['service_id'] = $oNewTicket->Get('service_id');
-			}
-			$this->MyObjectSetExternalKey('servicesubcategory_id', 'servicesubcategory', $aServiceSubcategoryDesc, $oNewTicket, $oRes);
-			if (MetaModel::IsValidAttCode($sClass, 'product'))
-			{
-				// 1.x data models
-				$this->MyObjectSetScalar('product', 'product', $sProduct, $oNewTicket, $oRes);
-			}
-
-			if (MetaModel::IsValidAttCode($sClass, 'workgroup_id'))
-			{
-				// 1.x data models
-				$this->MyObjectSetExternalKey('workgroup_id', 'workgroup', $aWorkgroupDesc, $oNewTicket, $oRes);
-			}
-			else if (MetaModel::IsValidAttCode($sClass, 'team_id'))
-			{
-				// 2.x data models
-				$this->MyObjectSetExternalKey('team_id', 'workgroup', $aWorkgroupDesc, $oNewTicket, $oRes);
-			}
-
-
-			if (MetaModel::IsValidAttCode($sClass, 'ci_list'))
-			{
-				// 1.x data models
-				$aDevicesNotFound = $this->AddLinkedObjects('ci_list', 'impacted_cis', 'FunctionalCI', $aImpactedCIs, $oNewTicket, $oRes);
-			}
-			else if (MetaModel::IsValidAttCode($sClass, 'functionalcis_list'))
-			{
-				// 2.x data models
-				$aDevicesNotFound = $this->AddLinkedObjects('functionalcis_list', 'impacted_cis', 'FunctionalCI', $aImpactedCIs, $oNewTicket, $oRes);
-			}
-			
-			if (count($aDevicesNotFound) > 0)
-			{
-				$this->MyObjectSetScalar('description', 'n/a', $sDescription.' - Related CIs: '.implode(', ', $aDevicesNotFound), $oNewTicket, $oRes);
-			}
-			else
-			{
-				$this->MyObjectSetScalar('description', 'n/a', $sDescription, $oNewTicket, $oRes);
-			}
-
-			$this->MyObjectSetScalar('impact', 'impact', $sImpact, $oNewTicket, $oRes);
-			$this->MyObjectSetScalar('urgency', 'urgency', $sUrgency, $oNewTicket, $oRes);
-
-			$this->MyObjectInsert($oNewTicket, 'created', $oMyChange, $oRes);
-		}
-		catch (CoreException $e)
-		{
-			$oRes->LogError($e->getMessage());
-		}
-		catch (Exception $e)
-		{
-			$oRes->LogError($e->getMessage());
-		}
-
-		$this->LogUsage(__FUNCTION__, $oRes);
-		return $oRes;
-	}
-
-	/**
-	 * Given an OQL, returns a set of objects (several objects could be on the same row)
-	 *	 
-	 * @param string sOQL
-	 */	 
-	public function SearchObjects($sLogin, $sPassword, $sOQL)
-	{
-		if (!UserRights::CheckCredentials($sLogin, $sPassword))
-		{
-			$oRes = new WebServiceResultFailedLogin($sLogin);
-			$this->LogUsage(__FUNCTION__, $oRes);
-
-			return $oRes->ToSoapStructure();
-		}
-		UserRights::Login($sLogin);
-
-		$oRes = $this->_SearchObjects($sOQL);
-		return $oRes->ToSoapStructure();
-	}
-
-	protected function _SearchObjects($sOQL)
-	{
-		$oRes = new WebServiceResult();
-		try
-		{
-			$oSearch = DBObjectSearch::FromOQL($sOQL);
-			$oSet = new DBObjectSet($oSearch);
-			$aData = $oSet->ToArrayOfValues();
-			foreach($aData as $iRow => $aRow)
-			{
-				$oRes->AddResultRow("row_$iRow", $aRow);
-			}
-		}
-		catch (CoreException $e)
-		{
-			$oRes->LogError($e->getMessage());
-		}
-		catch (Exception $e)
-		{
-			$oRes->LogError($e->getMessage());
-		}
-
-		$this->LogUsage(__FUNCTION__, $oRes);
-		return $oRes;
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2012 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Implementation of iTop SOAP services
+ *
+ * @copyright   Copyright (C) 2010-2012 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+require_once(APPROOT.'/webservices/webservices.class.inc.php');
+
+
+class BasicServices extends WebServicesBase
+{
+	static protected function GetWSDLFilePath()
+	{
+		return APPROOT.'/webservices/itop.wsdl.tpl';
+	}
+
+	/**
+	 * Get the server version (TODO: get it dynamically, where ?)
+	 *	 
+	 * @return WebServiceResult
+	 */
+	static public function GetVersion()
+	{
+		if (ITOP_REVISION == '$WCREV$')
+		{
+			$sVersionString = ITOP_VERSION.' [dev]';
+		}
+		else
+		{
+			// This is a build made from SVN, let display the full information
+			$sVersionString = ITOP_VERSION."-".ITOP_REVISION." ".ITOP_BUILD_DATE;
+		}
+
+		return $sVersionString;
+	}
+
+	public function CreateRequestTicket($sLogin, $sPassword, $sTitle, $sDescription, $oCallerDesc, $oCustomerDesc, $oServiceDesc, $oServiceSubcategoryDesc, $sProduct, $oWorkgroupDesc, $aSOAPImpactedCIs, $sImpact, $sUrgency)
+	{
+		if (!UserRights::CheckCredentials($sLogin, $sPassword))
+		{
+			$oRes = new WebServiceResultFailedLogin($sLogin);
+			$this->LogUsage(__FUNCTION__, $oRes);
+
+			return $oRes->ToSoapStructure();
+		}
+		UserRights::Login($sLogin);
+
+		$aCallerDesc = self::SoapStructToExternalKeySearch($oCallerDesc);
+		$aCustomerDesc = self::SoapStructToExternalKeySearch($oCustomerDesc);
+		$aServiceDesc = self::SoapStructToExternalKeySearch($oServiceDesc);
+		$aServiceSubcategoryDesc = self::SoapStructToExternalKeySearch($oServiceSubcategoryDesc);
+		$aWorkgroupDesc = self::SoapStructToExternalKeySearch($oWorkgroupDesc);
+
+		$aImpactedCIs = array();
+		if (is_null($aSOAPImpactedCIs)) $aSOAPImpactedCIs = array();
+		foreach($aSOAPImpactedCIs as $oImpactedCIs)
+		{
+			$aImpactedCIs[] = self::SoapStructToLinkCreationSpec($oImpactedCIs);
+		}
+
+		$oRes = $this->_CreateResponseTicket
+		(
+			'UserRequest',
+			$sTitle,
+			$sDescription,
+			$aCallerDesc,
+			$aCustomerDesc,
+			$aServiceDesc,
+			$aServiceSubcategoryDesc,
+			$sProduct,
+			$aWorkgroupDesc,
+			$aImpactedCIs,
+			$sImpact,
+			$sUrgency
+		);
+		return $oRes->ToSoapStructure();
+	}
+
+	public function CreateIncidentTicket($sLogin, $sPassword, $sTitle, $sDescription, $oCallerDesc, $oCustomerDesc, $oServiceDesc, $oServiceSubcategoryDesc, $sProduct, $oWorkgroupDesc, $aSOAPImpactedCIs, $sImpact, $sUrgency)
+	{
+		if (!UserRights::CheckCredentials($sLogin, $sPassword))
+		{
+			$oRes = new WebServiceResultFailedLogin($sLogin);
+			$this->LogUsage(__FUNCTION__, $oRes);
+
+			return $oRes->ToSoapStructure();
+		}
+		UserRights::Login($sLogin);
+
+		
+		if (!class_exists('Incident'))
+		{
+			$oRes = new WebServiceResult();
+			$oRes->LogError("The class Incident does not exist. Did you install the Incident Management (ITIL) module ?");
+			return $oRes->ToSoapStructure();
+		}
+		
+		$aCallerDesc = self::SoapStructToExternalKeySearch($oCallerDesc);
+		$aCustomerDesc = self::SoapStructToExternalKeySearch($oCustomerDesc);
+		$aServiceDesc = self::SoapStructToExternalKeySearch($oServiceDesc);
+		$aServiceSubcategoryDesc = self::SoapStructToExternalKeySearch($oServiceSubcategoryDesc);
+		$aWorkgroupDesc = self::SoapStructToExternalKeySearch($oWorkgroupDesc);
+
+		$aImpactedCIs = array();
+		if (is_null($aSOAPImpactedCIs)) $aSOAPImpactedCIs = array();
+		foreach($aSOAPImpactedCIs as $oImpactedCIs)
+		{
+			$aImpactedCIs[] = self::SoapStructToLinkCreationSpec($oImpactedCIs);
+		}
+
+		$oRes = $this->_CreateResponseTicket
+		(
+			'Incident',
+			$sTitle,
+			$sDescription,
+			$aCallerDesc,
+			$aCustomerDesc,
+			$aServiceDesc,
+			$aServiceSubcategoryDesc,
+			$sProduct,
+			$aWorkgroupDesc,
+			$aImpactedCIs,
+			$sImpact,
+			$sUrgency
+		);
+		return $oRes->ToSoapStructure();
+	}
+	
+	/**
+	 * Create an ResponseTicket (Incident or UserRequest) from an external system
+	 * Some CIs might be specified (by their name/IP)
+	 *	 
+	 * @param string sClass The class of the ticket: Incident or UserRequest
+	 * @param string sTitle
+	 * @param string sDescription
+	 * @param array aCallerDesc
+	 * @param array aCustomerDesc
+	 * @param array aServiceDesc
+	 * @param array aServiceSubcategoryDesc
+	 * @param string sProduct
+	 * @param array aWorkgroupDesc
+	 * @param array aImpactedCIs
+	 * @param string sImpact
+	 * @param string sUrgency
+	 *
+	 * @return WebServiceResult
+	 */
+	protected function _CreateResponseTicket($sClass, $sTitle, $sDescription, $aCallerDesc, $aCustomerDesc, $aServiceDesc, $aServiceSubcategoryDesc, $sProduct, $aWorkgroupDesc, $aImpactedCIs, $sImpact, $sUrgency)
+	{
+
+		$oRes = new WebServiceResult();
+
+		try
+		{
+			$oMyChange = MetaModel::NewObject("CMDBChange");
+			$oMyChange->Set("date", time());
+			$oMyChange->Set("userinfo", "Administrator");
+			$iChangeId = $oMyChange->DBInsertNoReload();
+	
+			$oNewTicket = MetaModel::NewObject($sClass);
+			$this->MyObjectSetScalar('title', 'title', $sTitle, $oNewTicket, $oRes);
+			$this->MyObjectSetScalar('description', 'description', $sDescription, $oNewTicket, $oRes);
+
+			$this->MyObjectSetExternalKey('org_id', 'customer', $aCustomerDesc, $oNewTicket, $oRes);
+			$this->MyObjectSetExternalKey('caller_id', 'caller', $aCallerDesc, $oNewTicket, $oRes);
+	
+			$this->MyObjectSetExternalKey('service_id', 'service', $aServiceDesc, $oNewTicket, $oRes);
+			if (!array_key_exists('service_id', $aServiceSubcategoryDesc))
+			{
+				$aServiceSubcategoryDesc['service_id'] = $oNewTicket->Get('service_id');
+			}
+			$this->MyObjectSetExternalKey('servicesubcategory_id', 'servicesubcategory', $aServiceSubcategoryDesc, $oNewTicket, $oRes);
+			if (MetaModel::IsValidAttCode($sClass, 'product'))
+			{
+				// 1.x data models
+				$this->MyObjectSetScalar('product', 'product', $sProduct, $oNewTicket, $oRes);
+			}
+
+			if (MetaModel::IsValidAttCode($sClass, 'workgroup_id'))
+			{
+				// 1.x data models
+				$this->MyObjectSetExternalKey('workgroup_id', 'workgroup', $aWorkgroupDesc, $oNewTicket, $oRes);
+			}
+			else if (MetaModel::IsValidAttCode($sClass, 'team_id'))
+			{
+				// 2.x data models
+				$this->MyObjectSetExternalKey('team_id', 'workgroup', $aWorkgroupDesc, $oNewTicket, $oRes);
+			}
+
+
+			if (MetaModel::IsValidAttCode($sClass, 'ci_list'))
+			{
+				// 1.x data models
+				$aDevicesNotFound = $this->AddLinkedObjects('ci_list', 'impacted_cis', 'FunctionalCI', $aImpactedCIs, $oNewTicket, $oRes);
+			}
+			else if (MetaModel::IsValidAttCode($sClass, 'functionalcis_list'))
+			{
+				// 2.x data models
+				$aDevicesNotFound = $this->AddLinkedObjects('functionalcis_list', 'impacted_cis', 'FunctionalCI', $aImpactedCIs, $oNewTicket, $oRes);
+			}
+			
+			if (count($aDevicesNotFound) > 0)
+			{
+				$this->MyObjectSetScalar('description', 'n/a', $sDescription.' - Related CIs: '.implode(', ', $aDevicesNotFound), $oNewTicket, $oRes);
+			}
+			else
+			{
+				$this->MyObjectSetScalar('description', 'n/a', $sDescription, $oNewTicket, $oRes);
+			}
+
+			$this->MyObjectSetScalar('impact', 'impact', $sImpact, $oNewTicket, $oRes);
+			$this->MyObjectSetScalar('urgency', 'urgency', $sUrgency, $oNewTicket, $oRes);
+
+			$this->MyObjectInsert($oNewTicket, 'created', $oMyChange, $oRes);
+		}
+		catch (CoreException $e)
+		{
+			$oRes->LogError($e->getMessage());
+		}
+		catch (Exception $e)
+		{
+			$oRes->LogError($e->getMessage());
+		}
+
+		$this->LogUsage(__FUNCTION__, $oRes);
+		return $oRes;
+	}
+
+	/**
+	 * Given an OQL, returns a set of objects (several objects could be on the same row)
+	 *	 
+	 * @param string sOQL
+	 */	 
+	public function SearchObjects($sLogin, $sPassword, $sOQL)
+	{
+		if (!UserRights::CheckCredentials($sLogin, $sPassword))
+		{
+			$oRes = new WebServiceResultFailedLogin($sLogin);
+			$this->LogUsage(__FUNCTION__, $oRes);
+
+			return $oRes->ToSoapStructure();
+		}
+		UserRights::Login($sLogin);
+
+		$oRes = $this->_SearchObjects($sOQL);
+		return $oRes->ToSoapStructure();
+	}
+
+	protected function _SearchObjects($sOQL)
+	{
+		$oRes = new WebServiceResult();
+		try
+		{
+			$oSearch = DBObjectSearch::FromOQL($sOQL);
+			$oSet = new DBObjectSet($oSearch);
+			$aData = $oSet->ToArrayOfValues();
+			foreach($aData as $iRow => $aRow)
+			{
+				$oRes->AddResultRow("row_$iRow", $aRow);
+			}
+		}
+		catch (CoreException $e)
+		{
+			$oRes->LogError($e->getMessage());
+		}
+		catch (Exception $e)
+		{
+			$oRes->LogError($e->getMessage());
+		}
+
+		$this->LogUsage(__FUNCTION__, $oRes);
+		return $oRes;
+	}
+}
+?>
diff --git a/webservices/webservices.class.inc.php b/webservices/webservices.class.inc.php
index ef7f9611f..33008e11b 100644
--- a/webservices/webservices.class.inc.php
+++ b/webservices/webservices.class.inc.php
@@ -1,594 +1,594 @@
-<?php
-// Copyright (C) 2010-2015 Combodo SARL
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Implementation of iTop SOAP services
- *
- * @copyright   Copyright (C) 2010-2015 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-
-require_once(APPROOT.'/webservices/itopsoaptypes.class.inc.php');
-
-/**
- * Generic response of iTop SOAP services
- *
- * @package     iTopORM
- */
-class WebServiceResult
-{
-	
-	/**
-	 * Overall status
-	 *
-	 * @var m_bStatus
-	 */
-	public $m_bStatus;
-
-	/**
-	 * Error log
-	 *
-	 * @var m_aErrors
-	 */
-	public $m_aErrors;
-
-	/**
-	 * Warning log
-	 *
-	 * @var m_aWarnings
-	 */
-	public $m_aWarnings;
-
-	/**
-	 * Information log
-	 *
-	 * @var m_aInfos
-	 */
-	public $m_aInfos;
-
-	/**
-	 * Constructor
-	 *
-	 * @param status $bStatus
-	 */
-	public function __construct()
-	{
-		$this->m_bStatus = true;
-		$this->m_aResult = array();
-		$this->m_aErrors = array();
-		$this->m_aWarnings = array();
-		$this->m_aInfos = array();
-	}
-
-	public function ToSoapStructure()
-	{
-		$aResults = array();
-		foreach($this->m_aResult as $sLabel => $aData)
-		{
-			$aValues = array();
-			foreach($aData as $sKey => $value)
-			{
-				$aValues[] = new SOAPKeyValue($sKey, $value);
-			}
-			$aResults[] = new SoapResultMessage($sLabel, $aValues);
-		}
-		$aInfos = array();
-		foreach($this->m_aInfos as $sMessage)
-		{
-			$aInfos[] = new SoapLogMessage($sMessage);
-		}
-		$aWarnings = array();
-		foreach($this->m_aWarnings as $sMessage)
-		{
-			$aWarnings[] = new SoapLogMessage($sMessage);
-		}
-		$aErrors = array();
-		foreach($this->m_aErrors as $sMessage)
-		{
-			$aErrors[] = new SoapLogMessage($sMessage);
-		}
-
-		$oRet = new SOAPResult(
-			$this->m_bStatus,
-			$aResults,
-			new SOAPResultLog($aErrors),
-			new SOAPResultLog($aWarnings),
-			new SOAPResultLog($aInfos)
-		);
-
-		return $oRet;
-	}
-
-	/**
-	 * Did the current processing encounter a stopper issue ?
-	 *
-	 * @return bool
-	 */
-	public function IsOk()
-	{
-		return $this->m_bStatus;
-	}
-
-	/**
-	 * Add result details - object reference
-	 *
-	 * @param string sLabel
-	 * @param object oObject
-	 */
-	public function AddResultObject($sLabel, $oObject)
-	{
-		$oAppContext = new ApplicationContext();
-		$this->m_aResult[$sLabel] = array(
-			'id' => $oObject->GetKey(),
-			'name' => $oObject->GetRawName(),
-			'url' => $oAppContext->MakeObjectUrl(get_class($oObject), $oObject->GetKey(), null, false), // Raw URL without HTML tags
-		);
-	}
-
-	/**
-	 * Add result details - a table row
-	 *
-	 * @param string sLabel
-	 * @param object oObject
-	 */
-	public function AddResultRow($sLabel, $aRow)
-	{
-		$this->m_aResult[$sLabel] = $aRow;
-	}
-
-	/**
-	 * Log an error
-	 *
-	 * @param string sDescription
-	 */
-	public function LogError($sDescription)
-	{
-		$this->m_aErrors[] = $sDescription;
-		// Note: SOAP do transform false into null
-		$this->m_bStatus = 0;
-	}
-
-	/**
-	 * Log a warning
-	 *
-	 * @param string sDescription
-	 */
-	public function LogWarning($sDescription)
-	{
-		$this->m_aWarnings[] = $sDescription;
-	}
-
-	/**
-	 * Log an error or a warning
-	 *
-	 * @param string sDescription
-	 * @param boolean bIsStopper
-	 */
-	public function LogIssue($sDescription, $bIsStopper = true)
-	{
-		if ($bIsStopper) $this->LogError($sDescription);
-		else             $this->LogWarning($sDescription);
-	}
-
-	/**
-	 * Log operation details
-	 *
-	 * @param description $sDescription
-	 */
-	public function LogInfo($sDescription)
-	{
-		$this->m_aInfos[] = $sDescription;
-	}
-
-	protected static function LogToText($aLog)
-	{
-		return implode("\n", $aLog);
-	}
-
-	public function GetInfoAsText()
-	{
-		return self::LogToText($this->m_aInfos);
-	}
-
-	public function GetWarningsAsText()
-	{
-		return self::LogToText($this->m_aWarnings);
-	}
-
-	public function GetErrorsAsText()
-	{
-		return self::LogToText($this->m_aErrors);
-	}
-
-	public function GetReturnedDataAsText()
-	{
-		$sRet = '';
-		foreach ($this->m_aResult as $sKey => $value)
-		{
-			$sRet .= "===== $sKey =====\n";
-			$sRet .= print_r($value, true);
-		}
-		return $sRet;
-	}
-}
-
-
-/**
- * Generic response of iTop SOAP services - failed login
- *
- * @package     iTopORM
- */
-class WebServiceResultFailedLogin extends WebServiceResult
-{
-	public function __construct($sLogin)
-	{
-		parent::__construct();
-		$this->LogError("Wrong credentials: '$sLogin'");
-	}
-}
-
-/**
- * Implementation of the Services
- *
- * @package     iTopORM
- */
-abstract class WebServicesBase
-{
-	static public function GetWSDLContents($sServiceCategory = '')
-	{
-		if ($sServiceCategory == '')
-		{
-			$sServiceCategory = 'BasicServices';
-		}
-		$sWsdlFilePath = call_user_func(array($sServiceCategory, 'GetWSDLFilePath'));
-		return file_get_contents($sWsdlFilePath);
-	}
-
-	/**
-	 * Helper to log a service delivery
-	 *
-	 * @param string sVerb
-	 * @param array aArgs
-	 * @param WebServiceResult oRes
-	 *
-	 */
-	protected function LogUsage($sVerb, $oRes)
-	{
-		if (!MetaModel::IsLogEnabledWebService()) return;
-
-		$oLog = new EventWebService();
-		if ($oRes->IsOk())
-		{
-			$oLog->Set('message', $sVerb.' was successfully invoked');
-		}
-		else
-		{
-			$oLog->Set('message', $sVerb.' returned errors');
-		}
-		$oLog->Set('userinfo', UserRights::GetUser());
-		$oLog->Set('verb', $sVerb);
-		$oLog->Set('result', $oRes->IsOk());
-		$this->TrimAndSetValue($oLog, 'log_info', (string)$oRes->GetInfoAsText());
-		$this->TrimAndSetValue($oLog, 'log_warning', (string)$oRes->GetWarningsAsText());
-		$this->TrimAndSetValue($oLog, 'log_error', (string)$oRes->GetErrorsAsText());
-		$this->TrimAndSetValue($oLog, 'data', (string)$oRes->GetReturnedDataAsText());
-		$oLog->DBInsertNoReload();
-	}
-	
-	protected function TrimAndSetValue($oLog, $sAttCode, $sValue)
-	{
-		$oAttDef = MetaModel::GetAttributeDef(get_class($oLog), $sAttCode);
-		if (is_object($oAttDef))
-		{
-			$iMaxSize = $oAttDef->GetMaxSize();
-			if ($iMaxSize && (strlen($sValue) > $iMaxSize))
-			{
-				$sValue = substr($sValue, 0, $iMaxSize);
-			}
-			$oLog->Set($sAttCode, $sValue);
-		}
-	}
-
-	/**
-	 * Helper to set a scalar attribute
-	 *
-	 * @param string sAttCode
-	 * @param scalar value
-	 * @param DBObject oTargetObj
-	 * @param WebServiceResult oRes
-	 *
-	 */
-	protected function MyObjectSetScalar($sAttCode, $sParamName, $value, &$oTargetObj, &$oRes)
-	{
-		$res = $oTargetObj->CheckValue($sAttCode, $value);
-		if ($res === true)
-		{
-			$oTargetObj->Set($sAttCode, $value);
-		}
-		else
-		{
-			// $res contains the error description
-			$oRes->LogError("Unexpected value for parameter $sParamName: $res");
-		}
-	}
-
-	/**
-	 * Helper to set an external key
-	 *
-	 * @param string sAttCode
-	 * @param array aExtKeyDesc
-	 * @param DBObject oTargetObj
-	 * @param WebServiceResult oRes
-	 *
-	 */
-	protected function MyObjectSetExternalKey($sAttCode, $sParamName, $aExtKeyDesc, &$oTargetObj, &$oRes)
-	{
-		$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
-
-		$bIsMandatory = !$oExtKey->IsNullAllowed();
-
-		if (is_null($aExtKeyDesc))
-		{
-			if ($bIsMandatory)
-			{
-				$oRes->LogError("Parameter $sParamName: found null for a mandatory key");
-			}
-			else
-			{
-				// skip silently
-				return;
-			}
-		}
-
-		if (count($aExtKeyDesc) == 0)
-		{
-			$oRes->LogIssue("Parameter $sParamName: no search condition has been specified", $bIsMandatory);
-			return;
-		}
-
-		$sKeyClass = $oExtKey->GetTargetClass();
-		$oReconFilter = new DBObjectSearch($sKeyClass);
-		foreach ($aExtKeyDesc as $sForeignAttCode => $value)
-		{
-			if (!MetaModel::IsValidFilterCode($sKeyClass, $sForeignAttCode))
-			{
-				$aCodes = array_keys(MetaModel::GetClassFilterDefs($sKeyClass));
-				$sMsg = "Parameter $sParamName: '$sForeignAttCode' is not a valid filter code for class '$sKeyClass', expecting a value in {".implode(', ', $aCodes)."}";
-				$oRes->LogIssue($sMsg, $bIsMandatory);
-			}
-			// The foreign attribute is one of our reconciliation key
-			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
-		}
-		$oExtObjects = new CMDBObjectSet($oReconFilter);
-		switch($oExtObjects->Count())
-		{
-		case 0:
-			$sMsg = "Parameter $sParamName: no match (searched: '".$oReconFilter->ToOQL(true)."')";
-			$oRes->LogIssue($sMsg, $bIsMandatory);
-			break;
-		case 1:
-			// Do change the external key attribute
-			$oForeignObj = $oExtObjects->Fetch();
-			$oTargetObj->Set($sAttCode, $oForeignObj->GetKey());
-
-			// Report it (no need to report if the object already had this value
-			if (array_key_exists($sAttCode, $oTargetObj->ListChanges()))
-			{
-				$oRes->LogInfo("Parameter $sParamName: found match ".get_class($oForeignObj)."::".$oForeignObj->GetKey()." '".$oForeignObj->GetName()."'");
-			}
-			break;
-		default:
-			$sMsg = "Parameter $sParamName: Found ".$oExtObjects->Count()." matches (searched: '".$oReconFilter->ToOQL(true)."')";
-			$oRes->LogIssue($sMsg, $bIsMandatory);
-		}
-	}
-
-	/**
-	 * Helper to link objects
-	 *
-	 * @param string sLinkAttCode
-	 * @param string sLinkedClass
-	 * @param array $aLinkList
-	 * @param DBObject oTargetObj
-	 * @param WebServiceResult oRes
-	 *
-	 * @return array List of objects that could not be found
-	 */
-	protected function AddLinkedObjects($sLinkAttCode, $sParamName, $sLinkedClass, $aLinkList, &$oTargetObj, &$oRes)
-	{
-		$oLinkAtt = MetaModel::GetAttributeDef(get_class($oTargetObj), $sLinkAttCode);
-		$sLinkClass = $oLinkAtt->GetLinkedClass();
-		$sExtKeyToItem = $oLinkAtt->GetExtKeyToRemote();
-
-		$aItemsFound = array();
-		$aItemsNotFound = array();
-		
-		if (is_null($aLinkList))
-		{
-			return $aItemsNotFound;
-		}
-
-		foreach ($aLinkList as $aItemData)
-		{
-			if (!array_key_exists('class', $aItemData))
-			{
-				$oRes->LogWarning("Parameter $sParamName: missing 'class' specification");
-				continue; // skip
-			}
-			$sTargetClass = $aItemData['class'];
-			if (!MetaModel::IsValidClass($sTargetClass))
-			{
-				$oRes->LogError("Parameter $sParamName: invalid class '$sTargetClass'");
-				continue; // skip
-			}
-			if (!MetaModel::IsParentClass($sLinkedClass, $sTargetClass))
-			{
-				$oRes->LogError("Parameter $sParamName: '$sTargetClass' is not a child class of '$sLinkedClass'");
-				continue; // skip
-			}
-			$oReconFilter = new DBObjectSearch($sTargetClass);
-			$aCIStringDesc = array();
-			foreach ($aItemData['search'] as $sAttCode => $value)
-			{
-				if (!MetaModel::IsValidFilterCode($sTargetClass, $sAttCode))
-				{
-					$aCodes = array_keys(MetaModel::GetClassFilterDefs($sTargetClass));
-					$oRes->LogError("Parameter $sParamName: '$sAttCode' is not a valid filter code for class '$sTargetClass', expecting a value in {".implode(', ', $aCodes)."}");
-					continue 2; // skip the entire item
-				}
-				$aCIStringDesc[] = "$sAttCode: $value";
-
-				// The attribute is one of our reconciliation key
-				$oReconFilter->AddCondition($sAttCode, $value, '=');
-			}
-			if (count($aCIStringDesc) == 1)
-			{
-				// take the last and unique value to describe the object
-				$sItemDesc = $value;
-			}
-			else
-			{
-				// describe the object by the given keys
-				$sItemDesc = $sTargetClass.'('.implode('/', $aCIStringDesc).')';
-			}
-
-			$oExtObjects = new CMDBObjectSet($oReconFilter);
-			switch($oExtObjects->Count())
-			{
-			case 0:
-				$oRes->LogWarning("Parameter $sParamName: object to link $sLinkedClass / $sItemDesc could not be found (searched: '".$oReconFilter->ToOQL(true)."')");
-				$aItemsNotFound[] = $sItemDesc;
-				break;
-			case 1:
-				$aItemsFound[] = array (
-					'object' => $oExtObjects->Fetch(),
-					'link_values' => @$aItemData['link_values'],
-					'desc' => $sItemDesc,
-				);
-				break;
-			default:
-				$oRes->LogWarning("Parameter $sParamName: Found ".$oExtObjects->Count()." matches for item '$sItemDesc' (searched: '".$oReconFilter->ToOQL(true)."')");
-				$aItemsNotFound[] = $sItemDesc;
-			}
-		}
-
-		if (count($aItemsFound) > 0)
-		{
-			$aLinks = array();
-			foreach($aItemsFound as $aItemData)
-			{
-				$oLink = MetaModel::NewObject($sLinkClass);
-				$oLink->Set($sExtKeyToItem, $aItemData['object']->GetKey());
-				foreach($aItemData['link_values'] as $sKey => $value)
-				{
-					if(!MetaModel::IsValidAttCode($sLinkClass, $sKey))
-					{
-						$oRes->LogWarning("Parameter $sParamName: Attaching item '".$aItemData['desc']."', the attribute code '$sKey' is not valid ; check the class '$sLinkClass'");
-					}
-					else
-					{
-						$oLink->Set($sKey, $value);
-					}
-				}
-				$aLinks[] = $oLink;
-			}
-			$oImpactedInfraSet = DBObjectSet::FromArray($sLinkClass, $aLinks);
-			$oTargetObj->Set($sLinkAttCode, $oImpactedInfraSet);
-		}
-
-		return $aItemsNotFound;
-	}
-
-	protected function MyObjectInsert($oTargetObj, $sResultLabel, $oChange, &$oRes)
-	{
-		if ($oRes->IsOk())
-		{
-			list($bRes, $aIssues) = $oTargetObj->CheckToWrite();
-			if ($bRes)
-			{
-				$iId = $oTargetObj->DBInsertTrackedNoReload($oChange);
-				$oRes->LogInfo("Created object ".get_class($oTargetObj)."::$iId");
-				$oRes->AddResultObject($sResultLabel, $oTargetObj);
-			}
-			else
-			{
-				$oRes->LogError("The ticket could not be created due to forbidden values (or inconsistent values)");
-				foreach($aIssues as $iIssue => $sIssue)
-				{
-					$oRes->LogError("Issue #$iIssue: $sIssue");
-				}
-			}
-		}
-	}
-
-
-	static protected function SoapStructToExternalKeySearch($oExternalKeySearch)
-	{
-		if (is_null($oExternalKeySearch)) return null;
-		if ($oExternalKeySearch->IsVoid()) return null;
-
-		$aRes = array();
-		foreach($oExternalKeySearch->conditions as $oSearchCondition)
-		{
-			$aRes[$oSearchCondition->attcode] = $oSearchCondition->value;
-		}
-		return $aRes;
-	}
-
-	static protected function SoapStructToLinkCreationSpec(SoapLinkCreationSpec $oLinkCreationSpec)
-	{
-		$aRes = array
-		(
-			'class' => $oLinkCreationSpec->class,
-			'search' => array(),
-			'link_values' => array(),
-		);
-
-		foreach($oLinkCreationSpec->conditions as $oSearchCondition)
-		{
-			$aRes['search'][$oSearchCondition->attcode] = $oSearchCondition->value;
-		}
-
-		foreach($oLinkCreationSpec->attributes as $oAttributeValue)
-		{
-			$aRes['link_values'][$oAttributeValue->attcode] = $oAttributeValue->value;
-		}
-
-		return $aRes;
-	}
-
-	static protected function SoapStructToAssociativeArray($aArrayOfAssocArray)
-	{
-		if (is_null($aArrayOfAssocArray)) return array();
-
-		$aRes = array();
-		foreach($aArrayOfAssocArray as $aAssocArray)
-		{
-			$aRow = array();
-			foreach ($aAssocArray as $oKeyValuePair)
-			{
-				$aRow[$oKeyValuePair->key] = $oKeyValuePair->value;
-			}
-			$aRes[] = $aRow;		
-		}
-		return $aRes;
-	}
-}
-?>
+<?php
+// Copyright (C) 2010-2015 Combodo SARL
+//
+//   This file is part of iTop.
+//
+//   iTop is free software; you can redistribute it and/or modify	
+//   it under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   iTop is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU Affero General Public License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with iTop. If not, see <http://www.gnu.org/licenses/>
+
+
+/**
+ * Implementation of iTop SOAP services
+ *
+ * @copyright   Copyright (C) 2010-2015 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+
+require_once(APPROOT.'/webservices/itopsoaptypes.class.inc.php');
+
+/**
+ * Generic response of iTop SOAP services
+ *
+ * @package     iTopORM
+ */
+class WebServiceResult
+{
+	
+	/**
+	 * Overall status
+	 *
+	 * @var m_bStatus
+	 */
+	public $m_bStatus;
+
+	/**
+	 * Error log
+	 *
+	 * @var m_aErrors
+	 */
+	public $m_aErrors;
+
+	/**
+	 * Warning log
+	 *
+	 * @var m_aWarnings
+	 */
+	public $m_aWarnings;
+
+	/**
+	 * Information log
+	 *
+	 * @var m_aInfos
+	 */
+	public $m_aInfos;
+
+	/**
+	 * Constructor
+	 *
+	 * @param status $bStatus
+	 */
+	public function __construct()
+	{
+		$this->m_bStatus = true;
+		$this->m_aResult = array();
+		$this->m_aErrors = array();
+		$this->m_aWarnings = array();
+		$this->m_aInfos = array();
+	}
+
+	public function ToSoapStructure()
+	{
+		$aResults = array();
+		foreach($this->m_aResult as $sLabel => $aData)
+		{
+			$aValues = array();
+			foreach($aData as $sKey => $value)
+			{
+				$aValues[] = new SOAPKeyValue($sKey, $value);
+			}
+			$aResults[] = new SoapResultMessage($sLabel, $aValues);
+		}
+		$aInfos = array();
+		foreach($this->m_aInfos as $sMessage)
+		{
+			$aInfos[] = new SoapLogMessage($sMessage);
+		}
+		$aWarnings = array();
+		foreach($this->m_aWarnings as $sMessage)
+		{
+			$aWarnings[] = new SoapLogMessage($sMessage);
+		}
+		$aErrors = array();
+		foreach($this->m_aErrors as $sMessage)
+		{
+			$aErrors[] = new SoapLogMessage($sMessage);
+		}
+
+		$oRet = new SOAPResult(
+			$this->m_bStatus,
+			$aResults,
+			new SOAPResultLog($aErrors),
+			new SOAPResultLog($aWarnings),
+			new SOAPResultLog($aInfos)
+		);
+
+		return $oRet;
+	}
+
+	/**
+	 * Did the current processing encounter a stopper issue ?
+	 *
+	 * @return bool
+	 */
+	public function IsOk()
+	{
+		return $this->m_bStatus;
+	}
+
+	/**
+	 * Add result details - object reference
+	 *
+	 * @param string sLabel
+	 * @param object oObject
+	 */
+	public function AddResultObject($sLabel, $oObject)
+	{
+		$oAppContext = new ApplicationContext();
+		$this->m_aResult[$sLabel] = array(
+			'id' => $oObject->GetKey(),
+			'name' => $oObject->GetRawName(),
+			'url' => $oAppContext->MakeObjectUrl(get_class($oObject), $oObject->GetKey(), null, false), // Raw URL without HTML tags
+		);
+	}
+
+	/**
+	 * Add result details - a table row
+	 *
+	 * @param string sLabel
+	 * @param object oObject
+	 */
+	public function AddResultRow($sLabel, $aRow)
+	{
+		$this->m_aResult[$sLabel] = $aRow;
+	}
+
+	/**
+	 * Log an error
+	 *
+	 * @param string sDescription
+	 */
+	public function LogError($sDescription)
+	{
+		$this->m_aErrors[] = $sDescription;
+		// Note: SOAP do transform false into null
+		$this->m_bStatus = 0;
+	}
+
+	/**
+	 * Log a warning
+	 *
+	 * @param string sDescription
+	 */
+	public function LogWarning($sDescription)
+	{
+		$this->m_aWarnings[] = $sDescription;
+	}
+
+	/**
+	 * Log an error or a warning
+	 *
+	 * @param string sDescription
+	 * @param boolean bIsStopper
+	 */
+	public function LogIssue($sDescription, $bIsStopper = true)
+	{
+		if ($bIsStopper) $this->LogError($sDescription);
+		else             $this->LogWarning($sDescription);
+	}
+
+	/**
+	 * Log operation details
+	 *
+	 * @param description $sDescription
+	 */
+	public function LogInfo($sDescription)
+	{
+		$this->m_aInfos[] = $sDescription;
+	}
+
+	protected static function LogToText($aLog)
+	{
+		return implode("\n", $aLog);
+	}
+
+	public function GetInfoAsText()
+	{
+		return self::LogToText($this->m_aInfos);
+	}
+
+	public function GetWarningsAsText()
+	{
+		return self::LogToText($this->m_aWarnings);
+	}
+
+	public function GetErrorsAsText()
+	{
+		return self::LogToText($this->m_aErrors);
+	}
+
+	public function GetReturnedDataAsText()
+	{
+		$sRet = '';
+		foreach ($this->m_aResult as $sKey => $value)
+		{
+			$sRet .= "===== $sKey =====\n";
+			$sRet .= print_r($value, true);
+		}
+		return $sRet;
+	}
+}
+
+
+/**
+ * Generic response of iTop SOAP services - failed login
+ *
+ * @package     iTopORM
+ */
+class WebServiceResultFailedLogin extends WebServiceResult
+{
+	public function __construct($sLogin)
+	{
+		parent::__construct();
+		$this->LogError("Wrong credentials: '$sLogin'");
+	}
+}
+
+/**
+ * Implementation of the Services
+ *
+ * @package     iTopORM
+ */
+abstract class WebServicesBase
+{
+	static public function GetWSDLContents($sServiceCategory = '')
+	{
+		if ($sServiceCategory == '')
+		{
+			$sServiceCategory = 'BasicServices';
+		}
+		$sWsdlFilePath = call_user_func(array($sServiceCategory, 'GetWSDLFilePath'));
+		return file_get_contents($sWsdlFilePath);
+	}
+
+	/**
+	 * Helper to log a service delivery
+	 *
+	 * @param string sVerb
+	 * @param array aArgs
+	 * @param WebServiceResult oRes
+	 *
+	 */
+	protected function LogUsage($sVerb, $oRes)
+	{
+		if (!MetaModel::IsLogEnabledWebService()) return;
+
+		$oLog = new EventWebService();
+		if ($oRes->IsOk())
+		{
+			$oLog->Set('message', $sVerb.' was successfully invoked');
+		}
+		else
+		{
+			$oLog->Set('message', $sVerb.' returned errors');
+		}
+		$oLog->Set('userinfo', UserRights::GetUser());
+		$oLog->Set('verb', $sVerb);
+		$oLog->Set('result', $oRes->IsOk());
+		$this->TrimAndSetValue($oLog, 'log_info', (string)$oRes->GetInfoAsText());
+		$this->TrimAndSetValue($oLog, 'log_warning', (string)$oRes->GetWarningsAsText());
+		$this->TrimAndSetValue($oLog, 'log_error', (string)$oRes->GetErrorsAsText());
+		$this->TrimAndSetValue($oLog, 'data', (string)$oRes->GetReturnedDataAsText());
+		$oLog->DBInsertNoReload();
+	}
+	
+	protected function TrimAndSetValue($oLog, $sAttCode, $sValue)
+	{
+		$oAttDef = MetaModel::GetAttributeDef(get_class($oLog), $sAttCode);
+		if (is_object($oAttDef))
+		{
+			$iMaxSize = $oAttDef->GetMaxSize();
+			if ($iMaxSize && (strlen($sValue) > $iMaxSize))
+			{
+				$sValue = substr($sValue, 0, $iMaxSize);
+			}
+			$oLog->Set($sAttCode, $sValue);
+		}
+	}
+
+	/**
+	 * Helper to set a scalar attribute
+	 *
+	 * @param string sAttCode
+	 * @param scalar value
+	 * @param DBObject oTargetObj
+	 * @param WebServiceResult oRes
+	 *
+	 */
+	protected function MyObjectSetScalar($sAttCode, $sParamName, $value, &$oTargetObj, &$oRes)
+	{
+		$res = $oTargetObj->CheckValue($sAttCode, $value);
+		if ($res === true)
+		{
+			$oTargetObj->Set($sAttCode, $value);
+		}
+		else
+		{
+			// $res contains the error description
+			$oRes->LogError("Unexpected value for parameter $sParamName: $res");
+		}
+	}
+
+	/**
+	 * Helper to set an external key
+	 *
+	 * @param string sAttCode
+	 * @param array aExtKeyDesc
+	 * @param DBObject oTargetObj
+	 * @param WebServiceResult oRes
+	 *
+	 */
+	protected function MyObjectSetExternalKey($sAttCode, $sParamName, $aExtKeyDesc, &$oTargetObj, &$oRes)
+	{
+		$oExtKey = MetaModel::GetAttributeDef(get_class($oTargetObj), $sAttCode);
+
+		$bIsMandatory = !$oExtKey->IsNullAllowed();
+
+		if (is_null($aExtKeyDesc))
+		{
+			if ($bIsMandatory)
+			{
+				$oRes->LogError("Parameter $sParamName: found null for a mandatory key");
+			}
+			else
+			{
+				// skip silently
+				return;
+			}
+		}
+
+		if (count($aExtKeyDesc) == 0)
+		{
+			$oRes->LogIssue("Parameter $sParamName: no search condition has been specified", $bIsMandatory);
+			return;
+		}
+
+		$sKeyClass = $oExtKey->GetTargetClass();
+		$oReconFilter = new DBObjectSearch($sKeyClass);
+		foreach ($aExtKeyDesc as $sForeignAttCode => $value)
+		{
+			if (!MetaModel::IsValidFilterCode($sKeyClass, $sForeignAttCode))
+			{
+				$aCodes = array_keys(MetaModel::GetClassFilterDefs($sKeyClass));
+				$sMsg = "Parameter $sParamName: '$sForeignAttCode' is not a valid filter code for class '$sKeyClass', expecting a value in {".implode(', ', $aCodes)."}";
+				$oRes->LogIssue($sMsg, $bIsMandatory);
+			}
+			// The foreign attribute is one of our reconciliation key
+			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
+		}
+		$oExtObjects = new CMDBObjectSet($oReconFilter);
+		switch($oExtObjects->Count())
+		{
+		case 0:
+			$sMsg = "Parameter $sParamName: no match (searched: '".$oReconFilter->ToOQL(true)."')";
+			$oRes->LogIssue($sMsg, $bIsMandatory);
+			break;
+		case 1:
+			// Do change the external key attribute
+			$oForeignObj = $oExtObjects->Fetch();
+			$oTargetObj->Set($sAttCode, $oForeignObj->GetKey());
+
+			// Report it (no need to report if the object already had this value
+			if (array_key_exists($sAttCode, $oTargetObj->ListChanges()))
+			{
+				$oRes->LogInfo("Parameter $sParamName: found match ".get_class($oForeignObj)."::".$oForeignObj->GetKey()." '".$oForeignObj->GetName()."'");
+			}
+			break;
+		default:
+			$sMsg = "Parameter $sParamName: Found ".$oExtObjects->Count()." matches (searched: '".$oReconFilter->ToOQL(true)."')";
+			$oRes->LogIssue($sMsg, $bIsMandatory);
+		}
+	}
+
+	/**
+	 * Helper to link objects
+	 *
+	 * @param string sLinkAttCode
+	 * @param string sLinkedClass
+	 * @param array $aLinkList
+	 * @param DBObject oTargetObj
+	 * @param WebServiceResult oRes
+	 *
+	 * @return array List of objects that could not be found
+	 */
+	protected function AddLinkedObjects($sLinkAttCode, $sParamName, $sLinkedClass, $aLinkList, &$oTargetObj, &$oRes)
+	{
+		$oLinkAtt = MetaModel::GetAttributeDef(get_class($oTargetObj), $sLinkAttCode);
+		$sLinkClass = $oLinkAtt->GetLinkedClass();
+		$sExtKeyToItem = $oLinkAtt->GetExtKeyToRemote();
+
+		$aItemsFound = array();
+		$aItemsNotFound = array();
+		
+		if (is_null($aLinkList))
+		{
+			return $aItemsNotFound;
+		}
+
+		foreach ($aLinkList as $aItemData)
+		{
+			if (!array_key_exists('class', $aItemData))
+			{
+				$oRes->LogWarning("Parameter $sParamName: missing 'class' specification");
+				continue; // skip
+			}
+			$sTargetClass = $aItemData['class'];
+			if (!MetaModel::IsValidClass($sTargetClass))
+			{
+				$oRes->LogError("Parameter $sParamName: invalid class '$sTargetClass'");
+				continue; // skip
+			}
+			if (!MetaModel::IsParentClass($sLinkedClass, $sTargetClass))
+			{
+				$oRes->LogError("Parameter $sParamName: '$sTargetClass' is not a child class of '$sLinkedClass'");
+				continue; // skip
+			}
+			$oReconFilter = new DBObjectSearch($sTargetClass);
+			$aCIStringDesc = array();
+			foreach ($aItemData['search'] as $sAttCode => $value)
+			{
+				if (!MetaModel::IsValidFilterCode($sTargetClass, $sAttCode))
+				{
+					$aCodes = array_keys(MetaModel::GetClassFilterDefs($sTargetClass));
+					$oRes->LogError("Parameter $sParamName: '$sAttCode' is not a valid filter code for class '$sTargetClass', expecting a value in {".implode(', ', $aCodes)."}");
+					continue 2; // skip the entire item
+				}
+				$aCIStringDesc[] = "$sAttCode: $value";
+
+				// The attribute is one of our reconciliation key
+				$oReconFilter->AddCondition($sAttCode, $value, '=');
+			}
+			if (count($aCIStringDesc) == 1)
+			{
+				// take the last and unique value to describe the object
+				$sItemDesc = $value;
+			}
+			else
+			{
+				// describe the object by the given keys
+				$sItemDesc = $sTargetClass.'('.implode('/', $aCIStringDesc).')';
+			}
+
+			$oExtObjects = new CMDBObjectSet($oReconFilter);
+			switch($oExtObjects->Count())
+			{
+			case 0:
+				$oRes->LogWarning("Parameter $sParamName: object to link $sLinkedClass / $sItemDesc could not be found (searched: '".$oReconFilter->ToOQL(true)."')");
+				$aItemsNotFound[] = $sItemDesc;
+				break;
+			case 1:
+				$aItemsFound[] = array (
+					'object' => $oExtObjects->Fetch(),
+					'link_values' => @$aItemData['link_values'],
+					'desc' => $sItemDesc,
+				);
+				break;
+			default:
+				$oRes->LogWarning("Parameter $sParamName: Found ".$oExtObjects->Count()." matches for item '$sItemDesc' (searched: '".$oReconFilter->ToOQL(true)."')");
+				$aItemsNotFound[] = $sItemDesc;
+			}
+		}
+
+		if (count($aItemsFound) > 0)
+		{
+			$aLinks = array();
+			foreach($aItemsFound as $aItemData)
+			{
+				$oLink = MetaModel::NewObject($sLinkClass);
+				$oLink->Set($sExtKeyToItem, $aItemData['object']->GetKey());
+				foreach($aItemData['link_values'] as $sKey => $value)
+				{
+					if(!MetaModel::IsValidAttCode($sLinkClass, $sKey))
+					{
+						$oRes->LogWarning("Parameter $sParamName: Attaching item '".$aItemData['desc']."', the attribute code '$sKey' is not valid ; check the class '$sLinkClass'");
+					}
+					else
+					{
+						$oLink->Set($sKey, $value);
+					}
+				}
+				$aLinks[] = $oLink;
+			}
+			$oImpactedInfraSet = DBObjectSet::FromArray($sLinkClass, $aLinks);
+			$oTargetObj->Set($sLinkAttCode, $oImpactedInfraSet);
+		}
+
+		return $aItemsNotFound;
+	}
+
+	protected function MyObjectInsert($oTargetObj, $sResultLabel, $oChange, &$oRes)
+	{
+		if ($oRes->IsOk())
+		{
+			list($bRes, $aIssues) = $oTargetObj->CheckToWrite();
+			if ($bRes)
+			{
+				$iId = $oTargetObj->DBInsertTrackedNoReload($oChange);
+				$oRes->LogInfo("Created object ".get_class($oTargetObj)."::$iId");
+				$oRes->AddResultObject($sResultLabel, $oTargetObj);
+			}
+			else
+			{
+				$oRes->LogError("The ticket could not be created due to forbidden values (or inconsistent values)");
+				foreach($aIssues as $iIssue => $sIssue)
+				{
+					$oRes->LogError("Issue #$iIssue: $sIssue");
+				}
+			}
+		}
+	}
+
+
+	static protected function SoapStructToExternalKeySearch($oExternalKeySearch)
+	{
+		if (is_null($oExternalKeySearch)) return null;
+		if ($oExternalKeySearch->IsVoid()) return null;
+
+		$aRes = array();
+		foreach($oExternalKeySearch->conditions as $oSearchCondition)
+		{
+			$aRes[$oSearchCondition->attcode] = $oSearchCondition->value;
+		}
+		return $aRes;
+	}
+
+	static protected function SoapStructToLinkCreationSpec(SoapLinkCreationSpec $oLinkCreationSpec)
+	{
+		$aRes = array
+		(
+			'class' => $oLinkCreationSpec->class,
+			'search' => array(),
+			'link_values' => array(),
+		);
+
+		foreach($oLinkCreationSpec->conditions as $oSearchCondition)
+		{
+			$aRes['search'][$oSearchCondition->attcode] = $oSearchCondition->value;
+		}
+
+		foreach($oLinkCreationSpec->attributes as $oAttributeValue)
+		{
+			$aRes['link_values'][$oAttributeValue->attcode] = $oAttributeValue->value;
+		}
+
+		return $aRes;
+	}
+
+	static protected function SoapStructToAssociativeArray($aArrayOfAssocArray)
+	{
+		if (is_null($aArrayOfAssocArray)) return array();
+
+		$aRes = array();
+		foreach($aArrayOfAssocArray as $aAssocArray)
+		{
+			$aRow = array();
+			foreach ($aAssocArray as $oKeyValuePair)
+			{
+				$aRow[$oKeyValuePair->key] = $oKeyValuePair->value;
+			}
+			$aRes[] = $aRow;		
+		}
+		return $aRes;
+	}
+}
+?>